[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-52-g9d9cfb7
José Manuel Santamar?==?UTF-8?Q?ía Lema
panfaust at gmail.com
Fri Jun 8 20:39:42 UTC 2012
The following commit has been merged in the master branch:
commit ea7e9ced573ec886542b815420f2a141b9679f43
Author: José Manuel SantamarÃa Lema <panfaust at gmail.com>
Date: Fri Jun 8 21:24:17 2012 +0200
Imported Upstream version 6.1.4+dfsg1
diff --git a/CREDITS b/CREDITS
index d67c41c..5eff8e3 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,12 +1,12 @@
#
-# $Id: CREDITS,v 1.8.2.7 2012/03/08 12:54:54 source Exp $
+# $Id: CREDITS,v 1.8.2.6 2010/02/03 15:08:59 source Exp $
#
# CREDITS
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 OpenLink Software
#
Included Functionality
diff --git a/ChangeLog b/ChangeLog
index 923c411..e516b4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16716 +1,8130 @@
-2012-03-15 17:16 source
-
- * Updated version to 6.1.5 for final release
-
-2012-03-15 16:41 source
-
- * Fixed labels
-
-2012-03-15 16:41 source
-
- * Fixed minor issues to xbrl
-
-2012-03-15 16:35 source
-
- * Fixed minor issues
-
-2012-03-15 14:44 source
-
- * Fixed column name back to __ask_retval for odbc/jdbc connections
-
-2012-03-15 13:57 source
+2011-10-28 23:28 source
- * Moved define to more logical place
+ * Updated version to 6.1.4 for final release
-2012-03-15 13:41 source
+2011-10-28 23:22 source
- * Fixed set default catalog name to %
+ * Enabled check for bad index due to XML fragment
-2012-03-15 13:06 source
+2011-10-28 23:21 source
- * Fixed enabled tests to run on jdk4
+ * Added information about upgrading from previous 6.1.x to 6.1.4
-2012-03-15 12:56 source
+2011-10-28 21:46 source
- * Removed old _JAVA_ pragma
+ * Fixed prototype
-2012-03-15 12:00 source
+2011-10-28 21:41 source
- * Fixed unhandled rdf type
+ * Fixed datetime fraction
-2012-03-15 11:48 source
+2011-10-28 21:10 source
* Rebuild drivers
-2012-03-15 11:17 source
-
- * Fixed leak with statement handles
-
-2012-03-15 11:08 source
+2011-10-28 16:09 source
- * Added stub isgeometry so point data can be inserted normally
+ * Fixed disable strict void var checking as /fct sometimes generates
+ undefined vars
-2012-03-15 10:32 source
+2011-10-28 16:00 source
- * Fixed check for odbc/jdbc connection
+ * Added support for setting syslog facility
-2012-03-14 20:46 source
+2011-10-28 15:56 source
- * Added missing files to distribution
+ * Fixed call auth check only when needed
-2012-03-14 19:47 source
+2011-10-28 15:55 source
- * Fixed meta information on ANY type
+ * Fixed flags for ods
-2012-03-14 14:12 source
+2011-10-28 13:16 source
- * Updated documentation
+ * Added common function for testing extensions for rdfxml
-2012-03-14 14:07 source
+2011-10-28 13:14 source
- * Fixed allow http client session to be put on hold and leave thread free
+ * Fixed encoding issues
-2012-03-14 13:59 source
+2011-10-26 15:38 source
- * Updated version to 6.1.5-rc3
+ * Added new UI for conditionals like = < > ranges and IN
+ * Added initial UI for geo based conditionals
+ * Added support for proper permalink
+ * Added Twitter, Facebook and Google+ share buttons to footer
+ * Added version info to footer
-2012-03-14 13:58 source
+2011-10-26 15:22 source
- * Updated SSL support
+ * Added AddThis share buttons
-2012-03-14 12:50 source
+2011-10-26 09:34 source
+ * Fixed Compiled for line in usage
* Fixed compiler warning
-2012-03-14 12:46 source
+2011-10-26 00:21 source
- * Fixed set default value for CheckExtentFreePages to 1
+ * Updated documentation
-2012-03-14 11:40 source
+2011-10-26 00:00 source
- * Added option to accept pragma
+ * Fixed run check init on local
-2012-03-14 11:39 source
+2011-10-25 23:56 source
- * Added entries for entity types and scores
+ * Fixed package uninstall
-2012-03-14 11:17 source
+2011-10-25 23:54 source
- * Fixed version of vad package
+ * Added async rdf extraction
-2012-03-14 11:10 source
+2011-10-25 23:36 source
- * Fixed use new xlat cb
+ * Added opl:mentions and opl:NamedEntity class to OpenLink Attribution
-2012-03-14 11:06 source
+2011-10-25 23:31 source
- * Fixed small issue
+ * Added missing location support
-2012-03-14 11:05 source
+2011-10-25 23:28 source
- * Fixed issue awol:content on stackoverflow.com
+ * Added finger print from twitter entry
+ * Fixed minor issues
-2012-03-14 00:46 source
+2011-10-25 23:25 source
- * Added new SPARQL DESCRIBE modes OBJCBD and SCBD
+ * Added support for Google+ comments
-2012-03-14 00:43 source
+2011-10-25 23:20 source
- * Fixed issue with Oracle double which should be decimal
+ * Fixed when dropping a graph, also check if there is a quad map for it
+ * Fixed move all cols in pk rdf view sel
+ * Fixed handling of syncml functionality
+ * Fixed labels
-2012-03-14 00:42 source
+2011-10-25 19:36 source
- * Fixed call to xlat_cbk to detect rdf:type etc
+ * Added new implementation of search_excerpt that can handle both
+ ANSI/UTF8 and Wide strings
-2012-03-13 12:07 source
+2011-10-25 10:54 source
- * Fixed metadata for S, P and O
+ * Fixed problems re-creating quad map
-2012-03-13 12:05 source
+2011-10-21 12:03 source
- * Fixed set default output:format to _UDBC_ for ODBC/JDBC/.NET apps
+ * Fixed drop stmt gr
-2012-03-13 11:51 source
+2011-10-21 11:53 source
- * Fixed typo in subcode
+ * Fixed bad conversion of utf8 in rdf/xml
-2012-03-13 11:50 source
+2011-10-19 15:22 source
- * Fixed when row is deleted, place the single bm entry over it
+ * Fixed dtp check
-2012-03-13 11:48 source
+2011-10-19 15:18 source
- * Fixed issue when codegen takes dtp from 1st param and no ssl exists yet
+ * Fixed reset bitmap flag as previous insert might have set it to true
-2012-03-13 11:46 source
+2011-10-19 15:14 source
- * Fixed issue with union
+ * Fixed missing cast
-2012-03-12 22:50 source
+2011-10-18 12:45 source
- * Updated version to 6.1.5-rc2
+ * Fixed if one column cannot fit into available space, then instead
+ of guessing how much space is needed we calculate space for all
+ columns which cannot fit
-2012-03-12 22:45 source
+2011-10-18 12:41 source
- * Added additional tests
- * Fixed building/checking vads on VOS
+ * Fixed error adding inherited roles as they can overlap
-2012-03-12 17:43 source
+2011-10-18 09:15 source
- * Fixed ignore log files
+ * Updated default settings file
-2012-03-12 17:41 source
+2011-10-17 15:50 source
- * Fixed issue with Bookmark app that caused user to be logged out
+ * Fixed issue building with Mono
-2012-03-12 14:28 source
+2011-10-17 14:06 source
- * Fixed issue with semaphores on Mac OS X 10.7
+ * Fixed log info about row state
-2012-03-12 14:25 source
+2011-10-17 09:55 source
- * Fixed wrong function name
+ * Fixed labels
-2012-03-12 14:24 source
+2011-10-17 09:48 source
- * FIxed typo in function name
+ * Fixed issue with SPASQL and ADONET3 named parameters
+ * Fixed ADO.Net Provider failure retrieving RDF datetime literal values
+ * Removed duplicate functions
-2012-03-12 10:28 source
+2011-10-14 17:02 source
- * Added SET EXPLAIN ON and SET SPARQL_TRANSLATE ON options
+ * Fixed issue with rdfview generation
-2012-03-12 10:28 source
+2011-10-14 12:54 source
- * Fixed issue with fd in binary mode
+ * Fixed if BeginTransaction is called with an Unspecified isolation
+ level, use a default of ReadCommitted
-2012-03-12 10:18 source
+2011-10-14 12:47 source
- * Added alias _UDBC_ for _JAVA_
+ * Fixed recompile all qr's cached on cli connection when dropping
+ a group or creating new graph group
-2012-03-12 10:17 source
+2011-10-14 10:33 source
- * Fixed issue if dfe is not initialized yet and used inside gdb
+ * Fixed labels
-2012-03-11 13:30 source
+2011-10-14 00:32 source
- * Updated vad version
+ * Fixed missing Diagnostic
-2012-03-11 13:26 source
+2011-10-13 22:14 source
- * Fixed use of foaf_check_ssl function
+ * Rebuild driver
-2012-03-09 17:33 source
+2011-10-13 22:07 source
- * Fixed issue with uninitialized variables
+ * Upgraded driver to Sesame 2.5.1
-2012-03-09 15:07 source
+2011-10-13 18:36 source
- * Fixed do not output NULL triples
+ * Added new Google+ cartridge
+ * Added new Jigsaw cartridge
+ * Added gr:Brand information to Ebay cartridge
+ * Added money class similar to GoodRelations prices for Crunchbase
+ * Fixed handling of HTTPS Groupon URIs
+ * Fixed do not immediately index in normal mode
+ * Fixed eBay URL-schemes
+ * Fixed MIME type for JSON-LD
+ * Fixed documentation
+ * Removed CRLF
-2012-03-09 14:42 source
+2011-10-13 18:33 source
- * Added README.GIT
- * Added discontinuation notice to README.CVS
+ * Added new tabs to Linked Data
+ * Added PSH tabs
+ * Fixed labels and texts
-2012-03-09 14:41 source
+2011-10-13 18:32 source
- * Added information for Mac OS X 10.7
+ * Fixed issue displayong characters in isql.vspx
-2012-03-09 13:42 source
+2011-10-13 18:29 source
- * Fixed compiler warnings
+ * Fixed uninitialized var
-2012-03-08 16:22 source
+2011-10-13 18:28 source
- * Fixed CRLF
+ * Added support for ms-author-va : sparql header
+ * Fixed use new virtuoso_ini_item_value
+ * Fixed set id of current user
+ * Fixed issue compiling stored procedure
-2012-03-08 15:52 source
+2011-10-13 17:08 source
- * Fixed list of files to distribute for Windows build
+ * Added support for VirtuosoDateTime, VirtuosoDateTimeOffset and
+ VirtuosoTimeSpan
+ * Fixed issue with dropped connection after multiple bad login attempts
+ * Fixed dispose methods should never throw an exception
+ * Fixed drop statement in Virtuoso when it is disposed in the provider
-2012-03-08 13:52 source
+2011-10-13 16:52 source
- * Fixed use portable method for escaping symbol for gawk 3 and 4
+ * Fixed copyright year to 2011
-2012-03-08 13:30 source
+2011-10-13 16:50 source
- * Updated vad_version
+ * Fixed buggy comparison when installing VAD packages
-2012-03-08 13:25 source
+2011-10-13 16:48 source
- * Updated version to 6.1.5-rc1
+ * Added stats for time waiting on a mutex
-2012-03-08 12:14 source
+2011-10-13 16:29 source
- * Added CalDAV
- * Added ACLs
- * Added ACL editing for DETs
- * Added new procedures for WebDAV
- * Updated private graphs data
- * Updated to latest SIOC functions
- * Fixed data generated by SIOC
- * Fixed 'Create and New' button
- * Fixed drag and drop
- * Fixed authentication functions
- * Fixed issue registering CalDAV links
- * Fixed check for nulls
- * Fixed issues with validate
- * Fixed SyncML owner resources
- * Fixed issue importing file without timezone info
- * Fixed CSS load
- * Fixed clear button in settings
- * Fixed issue with JSON
- * Fixed error reporting
+ * Removed duplicate stored procedures
-2012-03-08 12:08 source
+2011-10-13 14:39 source
- * Added CardDAV
- * Added VCARD Property Grouping
- * Added new procedures for WebDAV
- * Added ACLs
- * Added ACL editing for DETs
- * Added folder selecton for SyncML
- * Updated private graphs data
- * Updated ACL items list
- * Updated latest SIOC functions
- * Fixed issues importing contacts
- * Fixed user's image on profile page
- * Fixed issue with syncML
- * Fixed issue with validate
- * Fixed syncML owner resources
- * Fixed issue with progress bar after loading contacts
- * Fixed CSS loading
- * Fixed clear button in settings
- * Fixed CSS in footer
- * Fixed error reporting
+ * Fixed use openssl md5 where available
-2012-03-08 12:03 source
+2011-10-13 14:24 source
- * Fixed issues with patching versions automatically
- * Fixed wrong ctype
- * Fixed bad url
- * Fixed all columns in the table def
+ * Fixed check for min async queue size
-2012-03-08 12:00 source
+2011-10-13 14:21 source
- * Added 'create' to store in RDF
- * Added ACLs
- * Added ACL editing for DETs
- * Added option to import rdf data from file
- * Added folder types for CalDAV and CardDAV
- * Added rule for briefcase folder IRIs
- * Updated private graphs data
- * Fixed about dialog
- * Fixed issue with edit file content
- * Fixed issue with resource not found on delete
- * Fixed rdf_sink folder creation
- * Fixed typos
- * Fixed DET folder sharing
- * Fixed syntax checks
- * Fixed IMAP DET folder params
- * Fixed IMAP and webmail DETs support
- * Fixed syncML folders
- * Fixed versions view
- * Fixed RDF upload
- * Fixed linked upload folder
- * Fixed CSS load
- * Fixed issue after rename
- * Fixed issue with group settings
- * Fixed clear button in settings
- * Fixed issue with JSON
- * Fixed error reporting
+ * Added new setting RdfFreeTextRulesSize
-2012-03-08 11:52 source
-
- * Updated ACL items list
- * Updated private graphs data
- * Updated to latest SIOC functions
- * Fixed folder creation with bookmark update
- * Fixed syntax checks
- * Fixed issue with text index
- * Fixed pre tag show
- * Fixed validate bug
- * Fixed issue with progress bar after loading bookmarks
- * Fixed CSS loading
- * Fixed clear button in settings
- * Fixed issue with JSON
- * Fixed error reporting
+2011-10-13 14:08 source
-2012-03-08 11:48 source
+ * Fixed execute on all partitions at same time
- * Updated private graphs data
- * Fixed about dialog
- * Fixed generated SIOC data
- * Fixed validate bug
- * Fixed issue with progress bar after loading contacts
- * Fixed CSS loading
- * Fixed clear button in settings
- * Fixed issue with JSON
- * Fixed error reporting
+2011-10-13 14:06 source
-2012-03-08 11:46 source
+ * Fixed undefined Inference rule error when rule created from graph
+ created from SPARUL insert statement
+ * Fixed issue loading inf rules on cluster
- * Fixed whitespace
+2011-10-13 14:00 source
-2012-03-08 11:46 source
+ * Added support to sql_bif_excerpt for using wide string
- * Fixed minor issues
+2011-10-13 13:59 source
-2012-03-08 11:44 source
+ * Fixed memleak
- * Updated private graphs data
- * Fixed about dialog
- * Fixed generated SIOC data
- * Fixed validate bug
- * Fixed clear button in settings
- * Fixed footer CSS
- * Fixed error reporting
+2011-10-13 13:58 source
-2012-03-08 11:41 source
+ * Fixed issue with fulltext indexing
- * Fixed html encoding in title
+2011-10-13 13:56 source
-2012-03-08 11:19 source
+ * Fixed issue with bif:contains
- * Fixed issue with vad_version
+2011-10-13 13:54 source
-2012-03-08 11:18 source
+ * Fixed deadlock on attempt of qr_recompile during the run of
+ SPARQL-to_SQL front-end
- * Added files to ignore
+2011-10-13 13:28 source
-2012-03-08 10:49 source
+ * Fixed http recording
- * Fixed attachemt problem with rights
- * Fixed upstream URL
- * Fixed ordering of acl triggers
- * Fixed issue with blobs in triggers
+2011-10-13 13:27 source
-2012-03-08 10:46 source
+ * Fixed crash when array is bad
- * Fixed copyright year
+2011-10-13 13:26 source
-2012-03-08 10:39 source
+ * Fixed function name in argument
- * Fixed use monospace font for textedit area
+2011-10-13 13:11 source
-2012-03-07 23:45 source
+ * Fixed SSL verification context
- * Added function xenc_pubkey_ssh_export
+2011-10-13 13:00 source
-2012-03-07 21:14 source
+ * Added inproved support for inference and RDF views to "non-default"
+ storages
+ * Added option to register pos-processing callbacks to DESCRIBE
- * Fixed encoding problems
+2011-10-13 12:54 source
-2012-03-07 16:16 source
+ * Added new BIF functions for handling dictionaries of triples
- * Added function xenc_pubkey_DER_export
+2011-10-13 12:15 source
-2012-03-07 15:28 source
+ * Added iri range size setting
- * Updated documentation
+2011-10-13 12:14 source
-2012-03-07 14:57 source
+ * Added new "mode" flag to TURTLE parser, so it adds source line
+ numbers (and source text labels) to blank nodes of the parsed
+ document
- * Added missing file
+2011-10-13 12:12 source
-2012-03-07 13:16 source
+ * Fixed check for DAV
- * Fixed use vad_version when generating vad packages in VOS
+2011-10-13 11:09 source
-2012-03-07 11:37 source
+ * Added dbs id hash to log
- * Fixed indentation and whitespace
+2011-10-13 11:05 source
-2012-03-07 11:29 source
+ * Fixed compiler warning
- * Fixed typo in json-ld output
+2011-10-13 11:04 source
-2012-03-07 11:28 source
+ * Fixed private key protection
- * Fixed debug lines
+2011-10-13 11:03 source
-2012-03-07 11:27 source
+ * Fixed checks
- * Added empty RDF_TRIPLES_BATCH_COMPLETE
+2011-10-13 11:03 source
-2012-03-07 11:23 source
+ * Fixed inlist to mean equality, not a lt of the one_of_these call
+ comparison
- * Fixed compiler warnings on trigraphs in generated code
+2011-10-13 11:01 source
-2012-03-07 11:16 source
+ * Fixed label
- * Fixed initialization on db creation
+2011-10-13 11:00 source
-2012-03-07 10:56 source
+ * Fixed use cartridge if such is defined
- * Fixed windows build
+2011-10-13 10:59 source
-2012-03-07 10:47 source
+ * Fixed moved assignment before loop, as sqlerror can lead to a
+ double free
- * Added new Visual Studio 11 project files containing rules for both
- 32bit and 64bit builds
- * Removed old win32 and win64 build environments
+2011-10-13 10:58 source
-2012-03-07 02:16 source
+ * Fixed issue with foreignkey handling inside rdfview
- * Fixed missing var decl
+2011-09-28 17:04 source
-2012-03-07 02:16 source
+ * Rewrite HTML generation for /sparql endpoint
- * Updated vad version
+2011-09-28 17:01 source
-2012-03-07 02:09 source
+ * Added new function virtuoso_ini_item_value which can read settings
+ from the virtuoso.ini, without having to open/parse it for every
+ request
- * Updated vad version to 1.85.83
+2011-09-27 09:42 source
-2012-03-07 02:09 source
+ * Fixed sql codegen for combination of SERVICE {} that binds a
+ variable and OPTIONAL {} that uses it later, and the binding in
+ SERVICE is the only non-nullable binding of that variable
- * Fixed demo
+2011-09-27 09:40 source
-2012-03-07 02:08 source
+ * Fixed do not cache samples indefinitely
- * Fixed remove duplicate lines
-
-2012-03-07 02:02 source
+2011-09-23 19:22 source
- * Fixed use of common WebID verifier
+ * Added initial support for filtering on value ranges
+ * Added new export formats
+ * Fixed MIME type for JSON-LD
+ * Fixed use lang for properties labels
+ * Fixed pretty-print query
+ * Fixed check for owl:Class
+ * Fixed label prefs and metadata
+ * Fixed footer
-2012-03-07 02:00 source
+2011-09-23 19:12 source
- * Fixed bad code
+ * Added extra mime types to accept header
-2012-03-07 01:59 source
+2011-09-23 15:20 source
- * Added /sparql-oauth
+ * Fixed overflow in bif_date_diff
-2012-03-07 01:59 source
+2011-09-21 15:23 source
- * Fixed sparql-webid
+ * FIxed do not make UNAMEs in SQL texts immortal
-2012-03-07 01:59 source
+2011-09-21 15:22 source
- * Fixed JS errors
+ * Fixed must save IN list as it will be reset to 0 inside
-2012-03-07 01:58 source
+2011-09-21 13:27 source
- * Fixed WebID check procedure
+ * Fixed use len of the N leading chars represented as UTF8
-2012-03-07 01:57 source
+2011-09-21 13:23 source
- * Fixed graph issues
+ * Added support for DV_BIN
-2012-03-07 01:56 source
+2011-09-20 12:03 source
- * Fixed return on sparql errors
+ * Fixed issues detecting images
-2012-03-07 01:56 source
+2011-09-20 11:58 source
- * Fixed grant permission for API to sponge
+ * Fixed handling of sparql endpoint in Pivot permalink generation
-2012-03-07 01:55 source
+2011-09-19 13:37 source
- * Fixed output from verifier
+ * Fixed do not check byte-order on crash recovery replay
-2012-03-07 01:54 source
+2011-09-15 16:02 source
- * Fixed new param in WebID verifier
+ * Updated version to 6.1.4-rc1
-2012-03-07 01:54 source
+2011-09-15 10:42 source
- * Fixed return if no user
+ * Fixed mem leaks
-2012-03-07 01:53 source
+2011-09-14 19:06 source
- * Fixed openid registration
+ * Fixed uninitialized variable
-2012-03-07 01:53 source
+2011-09-14 15:38 source
- * Fixed date check
+ * Fixed memory leaks
-2012-03-07 01:52 source
+2011-09-14 15:38 source
- * Fixed selecting identifier
+ * Fixed valgrind warning when using DEBUG
-2012-03-07 01:51 source
+2011-09-13 14:50 source
- * Fixed use 15s timeout
+ * Fixed memory leaks
-2012-03-07 01:51 source
+2011-09-12 21:05 source
- * Fixed error condition checks
+ * Fixed GPF on optimization of DELETE/INSERT/MODIFY due to lists
+ of known vars that were not deALIASed properly
-2012-03-07 01:51 source
+2011-09-12 20:08 source
- * Fixed use vector of vectors
+ * Added log when built-in procedure has duplicate in the db
-2012-03-07 01:50 source
+2011-09-12 20:04 source
- * Fixed handling of di:
+ * Fixed removed duplicate procedures
-2012-03-07 01:50 source
+2011-09-12 20:01 source
- * Fixed copyright year to include 2012
+ * Fixed crash
-2012-03-07 01:49 source
+2011-09-12 12:30 source
- * Fixed rdf_sink folder creation for new users
+ * Fixed mime type of JSON-ld to application/ld+json
-2012-03-07 01:49 source
+2011-09-12 11:02 source
- * Fixed expiration check
+ * Updated documentation
-2012-03-07 01:49 source
+2011-09-12 10:52 source
- * Fixed get WebID function
+ * Fixed use available non-expiring access token
+ * Fixed drilldown through Posts (including posted links) to show
+ associated comments
+ * Fixed removed oplcb:competitor property from its oplcb:competition
+ wrapper and dropped latter
+ * Fixed use dbpedia:author property when handling books
+ * Fixed use string session with serialized XML for large csv files
-2012-03-07 01:48 source
+2011-09-12 10:47 source
- * Fixed copyright year to 2012
+ * Added initial support for PHP 5.3
-2012-03-07 01:48 source
+2011-09-12 10:36 source
- * Fixed DI URI
+ * Fixed indentation
-2012-03-07 01:47 source
+2011-09-12 10:28 source
- * Fixed small issue
+ * Fixed use shorter names
-2012-03-07 01:47 source
+2011-09-12 10:21 source
- * Fixed same-as
+ * Fixed WebID demo pages
-2012-03-07 01:46 source
+2011-09-09 14:09 source
- * Fixed to preserve content
+ * Updated documentation
-2012-03-07 01:46 source
+2011-09-09 13:30 source
- * Added new rule for /mv
+ * Fixed warning about uninitialized data
-2012-03-07 01:46 source
+2011-09-09 13:21 source
- * Added void to graph
+ * Added option for explicit graph
+ * Fixed SyncML Folder Types in drop-down list
+ * Fixed labels
-2012-03-07 01:45 source
+2011-09-09 13:20 source
- * Fixed image show in login
+ * Fixed do not remove trailing cr/lf
-2012-03-07 01:44 source
+2011-09-09 13:19 source
- * Fixed multiple values in SAN
+ * Fixed issue when dirname is a blob
-2012-03-07 01:44 source
+2011-09-09 13:12 source
- * Fixed VAD upgrade
+ * Added dbpedia:author property when handling books
+ * Fixed ACL rule */* allows everybody
+ * Fixed Facebook auth
+ * Fixed use string session with serialized XML for large csv files
+ * Fixed map OpenLink Zillow ontology to geo:lat/long
+ * Fixed map oplog:likes_XXX property to like:likes
-2012-03-07 01:44 source
+2011-09-09 13:11 source
- * Added support to enable automatic login
+ * Added support for switchable favicon to Sponger front page
-2012-03-07 01:43 source
+2011-09-09 12:51 source
- * Fixed grant
+ * Fixed issues with linked data upload
-2012-03-07 01:43 source
+2011-09-09 11:16 source
- * FIxed key usage
+ * Added HTTP status codes in SPARQL graph store protocol
-2012-03-07 01:42 source
+2011-09-09 11:13 source
- * Fixed primary topic should be the profile
+ * Fixed issue with SPARUL LOAD INTO command creating duplicate graphs
-2012-03-07 01:41 source
+2011-09-09 00:10 source
- * Fixed VAD install problem
+ * Fixed issue when pragma list was empty
+ * Fixed issues generating Pivot Permalink
+ * Fixed whitespace and stray > char from Raw formats line
-2012-03-07 01:41 source
+2011-09-08 18:54 source
- * Added private graphs data
+ * Fixed handling of GROUP BY and ORDER BY using expressions
-2012-03-07 01:39 source
+2011-09-08 15:29 source
- * Fixed use get:soft "add"
+ * Fixed re-definition of a quad map that is a single user of a quad
+ map format
-2012-03-07 01:38 source
+2011-09-08 15:28 source
- * Fixed vhosts define
+ * Fixed codegeneration issue with awk 4.0
-2012-03-07 01:37 source
+2011-09-08 12:51 source
- * Fixed typo
+ * Fixed UI for sponger options
-2012-03-07 01:37 source
+2011-09-08 12:19 source
- * Fixed twitter sha1 post
+ * Fixed issue with sparql LOAD from file
-2012-03-07 01:36 source
+2011-09-07 22:44 source
- * Added private data in graph
+ * Fixed crash running FILTER query containing IN clause with only
+ one item in it
+ * Fixed issue with ORDER BY expression optimization
-2012-03-07 01:34 source
+2011-09-05 15:27 source
- * Fixed try sha1 for fingerprint
+ * Added test for empty graph result
+ * Added margins for RDF mini browser container
+ * Added check for existence of sparql_cxml to enable display of CXML
+ result link
+ * Replaced default AJAX throbber with new OAT Notify
+ * Fixed undef variable causing dereference control malfunction
+ * Fixed layout bug causing the dereference mode control hiding behind
+ a block
-2012-03-07 01:33 source
+2011-09-05 15:26 source
- * Added rule for briefcase folder IRIs
+ * Added support for replacing existing content on OAT.Notify.send
-2012-03-07 01:32 source
+2011-08-30 15:02 source
- * Fixed user's image on profile page
+ * Fixed issue with code generation using gawk 4
-2012-03-07 01:32 source
+2011-08-29 10:37 source
- * Fixed use proper digest
+ * Added Google Place cartridge
+ * Added Seatgeek cartridge
+ * Added API for selective sponging
+ * Added Google+ button
+ * Added menu item linking direct to 'How it Works'
+ * Fixed bug when offline_access=1 not present in OpenGraph cartridge
+ * Fixed access token requests now request permission to read user and
+ friend checkins
+ * Fixed complete rdf boxes when looking for label
+ * Fixed lang use for comment
+ * Fixed missing block op
+ * Fixed minor issues
-2012-03-07 01:32 source
+2011-08-29 10:27 source
- * Fixed proper namespace
+ * Added support for anytime query (timeout) on virtuoso
+ * Added CSS for pushbar notify
+ * Fixed bug with updated maxrow value not being passed
+ * Fixed dereferencing preference dropdown disappearing when paging
+ between results
+ * Fixed cosmetics
-2012-03-07 01:31 source
+2011-08-29 10:23 source
- * Fixed use new property
+ * Added support for oplzilw:latitude and longitude
+ * Fixed rdftabs notification to use PUSHBAR
+ * Fixed problem in geo coordinates detection
-2012-03-07 01:30 source
+2011-08-29 10:22 source
- * Added option to ask to delete data
+ * Added new option to rdfmini to facilitate placing of view control
+ outside its container
-2012-03-07 01:29 source
+2011-08-29 10:21 source
- * Fixed use sponger
+ * Added new notification widget types PUSHBAR and BAR
+ * Added target class for notify content for skinning
-2012-03-07 01:28 source
+2011-08-29 10:19 source
- * Fixed verification
+ * Added support for HEAD requests in AJAX
-2012-03-07 01:28 source
+2011-08-29 10:18 source
- * Added more checks
+ * Added limit to number of open statements
-2012-03-07 01:27 source
+2011-08-26 19:34 source
- * Fixed search twitter for tweet
+ * Fixed if we have a wide string and want typed string we cast to utf-8
-2012-03-07 01:26 source
+2011-08-26 18:04 source
- * Fixed check for fingerprint
+ * Fixed /sparql/ endpoint to produce more accurate diagnostics for
+ failed INSERT DATA statements
-2012-03-07 01:26 source
+2011-08-26 18:03 source
- * Fixed page show and SIOC data
+ * Fixed timeout should be specified in miliseconds according to docs
-2012-03-07 01:25 source
+2011-08-26 17:59 source
- * Fixed labels
+ * Added limit to number of open statements
-2012-03-07 01:25 source
+2011-08-26 17:57 source
- * Fixed ampersand
+ * Added mem debug support for sqlp_box_id_upcase
-2012-03-07 01:24 source
+2011-08-26 17:55 source
- * Fixed MIME type for JSON-LD to application/ld+json
+ * Fixed memory leak
-2012-03-07 01:24 source
+2011-08-26 10:58 source
- * Fixed ODS upgrade proc
+ * Fixed crash when un-expected array is passed as argument
-2012-03-07 01:23 source
+2011-08-26 10:57 source
- * Fixed row selection style
+ * Fixed loading member functions of UDT that refer to XML namespace
+ declarations and other items loaded after the loading of the UTD
+ declaration
-2012-03-07 01:23 source
+2011-08-26 10:54 source
- * Fixed issues with session expire in new ODS UI
+ * Fixed issue with trim('test', null)
-2012-03-07 01:21 source
+2011-08-21 12:54 source
- * Fixed SPARQL clear graph
+ * Added initial code for timeout handling
+ * Added param to control the anchor mode, persisted in permalinks.
+ * Added anchor mode to pass the URL to /describe
+ * Added missing URI encoding in some generated links/queries
+ * Fixed "aliased" qtxt URL param
+ * Fixed re-enabled anchor mode to control what to do when dereferencing links.
+ * Fixed try to set values of nonexisting UI objects in /view
+ * Fixed visibility of footer in /view
-2012-03-07 01:20 source
+2011-08-21 12:52 source
- * Fixed path to OAT style sheets
+ * Fixed display of RDF store stats
-2012-03-07 01:19 source
+2011-08-21 12:51 source
- * Fixed missing CSS file
+ * Fixed set default anchorMode back to 0
-2012-03-07 01:18 source
+2011-08-21 12:50 source
- * Fixed call to obsolete hostip
+ * Fixed footer background
-2012-03-07 01:17 source
+2011-08-21 12:50 source
- * Upgraded ODS css
+ * Added MSG MAP_NOTHING_TO_SHOW to rdftabs Map widget
+ * Added MAP_NOTHING_TO_SHOW to rdfmini by switching to default viewer
+ * Added references in map popups
+ * Added function to detect nodes that only contain coordinates
+ * Fixed bugs in getContent link generation
+ * Fixed removed attempt to resolve item references throught recursion
+ * Fixed drawMarker to extract properties from referencing node when node contains only
+ coordinate data
+ * Fixed structure of rdftabs marker popups
+ * Fixed make properties list scrollable instead of whole window
-2012-03-07 01:16 source
+2011-08-21 12:34 source
- * Fixed JS table API
+ * Rebuild drivers
-2012-03-07 01:16 source
+2011-08-21 12:33 source
- * Fixed photo value
+ * Removed deprecated functions and files
-2012-03-07 01:16 source
+2011-08-18 09:16 source
- * Fixed deactivate user
+ * Fixed connection leak in connection pool during long checkpoints
-2012-03-07 01:15 source
+2011-08-17 17:46 source
- * Fixed photo show
+ * Fixed memory leak in statement when using connectionpooling
-2012-03-07 01:14 source
+2011-08-17 17:36 source
- * Fixed triggers
+ * Rebuild drivers
-2012-03-07 01:13 source
+2011-08-17 17:20 source
- * Added option to deactivate user
+ * Rebuild driver
-2012-03-07 01:12 source
+2011-08-17 17:20 source
- * Fixed common applications CSS
+ * Updated hibernate support to work with Hibernate 3.6.6-Final
-2012-03-07 01:11 source
+2011-08-15 15:30 source
- * Fixed tab labels
+ * Fixed bad merge
-2012-03-07 01:10 source
+2011-08-14 14:48 source
- * Fixed WebID login
+ * Fixed check for NULL IRI before printing
-2012-03-07 01:09 source
+2011-08-09 11:19 source
- * Fixed login dialog with unregistered users
+ * Fixed indentation and whitespace
-2012-03-07 01:09 source
+2011-08-09 11:17 source
- * Fixed labels and CSS for Firefox
+ * Fixed missing namespave declarations
-2012-03-07 01:07 source
+2011-08-09 11:11 source
- * Added new verification proc
+ * Fixed minor issue
-2012-03-07 01:06 source
+2011-08-09 10:58 source
- * Added QRCode
+ * Added SimpleGeo cartridge
+ * Added Eventful cartridge
+ * Fixed use standard properties for Latitude and Longitude
+ * Fixed use /about to sponge URL
-2012-03-07 01:05 source
+2011-08-03 11:36 source
- * Updated WebID demo pages
+ * Added show photo in WebID login/registrer
+ * Fixed typo in messages
+ * Fixed facebook accounts
-2012-03-07 01:04 source
+2011-08-03 11:34 source
- * Added WebID WaterMark
+ * Added missing files
-2012-03-07 00:57 source
+2011-08-01 14:19 source
- * Fixed HREF to not need proxy
+ * Added Twitter cartridge using OAuth and Twitter REST api
+ * Added XRD cartridge
+ * Added Google Profile cartridge
+ * Fixed use OG community page as starting point for facebook OpenGraph
+ cartridge
+ * Fixed minor issues
-2012-03-07 00:56 source
+2011-08-01 14:17 source
- * Added proxy url
-
-2012-03-07 00:56 source
-
- * Added data graph associated with the WebID
- * Fixed present WebID as link
- * Fixed syntax
+ * Added check for XML
+ * Fixed update must do delta and remove all entries which are not
+ from this source
-2012-03-07 00:54 source
+2011-08-01 14:15 source
- * Fixed WebID to be presented as link
+ * Fixed SIOC data
-2012-03-07 00:53 source
+2011-08-01 14:13 source
- * Fixed warning if no key found
+ * Updated CKeditor to version 3.6.1
-2012-03-07 00:52 source
+2011-08-01 14:12 source
- * Removed fixed link from webid_demo pages
+ * Added RDF links in header and head
-2012-03-07 00:49 source
+2011-08-01 14:12 source
- * Added new /ods/webid endpoint
+ * FIxed Delicious publish
-2012-03-07 00:47 source
+2011-08-01 14:09 source
- * Updated WebID 1.0 spec
+ * Fixed undefined function
-2012-03-07 00:44 source
+2011-08-01 14:08 source
- * Added callback
+ * Added user/mail availablitiy action
+ * Added mail verification service
+ * Fixed WebID login and registration
+ * Fixed Facebook accounts
+ * Fixed order tabs and labels
+ * Fixed SIOC RDF links API functions
-2012-03-07 00:42 source
+2011-08-01 14:05 source
- * Fixed webid_demo https requirements
+ * Added ACL eXecute flag
+ * Fixed ACl issue with editing .acl file
+ * Fixed API functions
-2012-03-07 00:41 source
+2011-08-01 14:04 source
- * Fixed photo url
+ * Fixed encryption and signing
+ * Fixed security properties
+ * Fixed mail parameters
-2012-03-07 00:38 source
+2011-08-01 13:18 source
- * Added WebID demo pages
+ * Fixed throw away old content before starting execute
-2012-03-06 23:46 source
+2011-07-29 10:04 source
- * Fixed SPARQL initialization
+ * Fixed debug code
-2012-03-06 20:12 source
+2011-07-29 10:03 source
- * Added extra MALLOC_DEBUG checks
+ * Fixed must redirect on OPTIONS
-2012-03-06 17:10 source
+2011-07-29 10:03 source
- * Fixed MALLOC_DEBUG support for box_iri_id()
+ * Fixed calculate lenght before inserting the row
-2012-03-06 16:54 source
+2011-07-29 10:00 source
- * Updated vad_version to 1.34.22
+ * Fixed unnamed GPF
-2012-03-06 16:48 source
+2011-07-20 15:56 source
- * Fixed copyright comment
+ * Added check for %nn
-2012-03-06 16:32 source
+2011-07-20 09:50 source
- * Added StackOverflow cartridge
+ * Added Idp
+ * Added Domain check
+ * Added WebID
-2012-03-06 16:31 source
+2011-07-20 08:58 source
- * Added support for DI: in mail address
+ * Added Hyperpublic cartridge
-2012-03-06 16:28 source
+2011-07-20 08:56 source
- * Fixed tsuite failure
+ * Added configuration option for page title
-2012-03-06 16:28 source
+2011-07-20 08:51 source
- * Fixed qualify opl:mentions with cartridge identifier
+ * Added webid_check option to control execution flag
-2012-03-06 16:27 source
+2011-07-20 08:51 source
- * Added function dbpedia_url_label
+ * Fixed problems with big tokens
-2012-03-06 16:26 source
+2011-07-20 08:29 source
- * Fixed issues with RM_CLEAN_DEST
+ * Added support for dumping v5 in v6 log format
-2012-03-06 16:25 source
+2011-07-20 00:01 source
- * Added logging to NYT Article cartridge
+ * Reverted merge from wrong branch
-2012-03-06 16:25 source
+2011-07-19 23:58 source
- * Added Angellist ontology and cartridge
- * Added generic blog-URL links to oplbase
+ * Fixed DV_RDF serialization
-2012-03-06 16:23 source
+2011-07-19 23:43 source
- * Added oplbase ontology
+ * Fixed small issue for single engine
-2012-03-06 16:22 source
+2011-07-19 23:40 source
- * Added binding subproperty in new oplbase: ontology
- * Aligned social-profile-url property across some social cartridges
+ * Added new aggregate DB.DBA.GROUP_DIGEST which makes it possible
+ to return part of big output of DB.DBA.GROUP_CONCAT without
+ running out of row length limits
-2012-03-06 16:21 source
+2011-07-19 23:38 source
- * Added Crunchbase ontology
- * Added DBpedia Spotlight ontology
+ * Added support to call XPath/XQuery functions in SPARQL
+ * Added bif functions xpath_funcall and xpath_apply
-2012-03-06 16:16 source
+2011-07-19 23:34 source
- * Fixed LinkedIn cartridge
+ * Fixed moved macros isdatechar, isfloatchar and inplainURIchar
-2012-03-06 16:15 source
+2011-07-19 23:33 source
- * Fixed Amazon cartridge to work with new Product Advertising API
+ * Added option 'exec_as_get' to http map
+ * Added support for SPARQL Graph CRUD
-2012-03-06 16:14 source
+2011-07-19 23:30 source
- * Added support for extracting all meta and link head-element data from
- XHTML documents
+ * Added function isfinitenumeric()
-2012-03-06 16:13 source
+2011-07-19 23:30 source
- * Fixed handling of # in About header
+ * Fixed memleak
-2012-03-06 16:08 source
+2011-07-19 23:29 source
- * Fixed DI: handling
+ * Fixed compiler warnings
-2012-03-06 16:07 source
+2011-07-19 23:27 source
- * Addded webid via DI: text link
+ * Added optimized codegen for built-in aggregate functions
-2012-03-06 16:07 source
+2011-07-19 23:26 source
- * Fixed DI: like mask
+ * Fixed DV_RDF serializationo
+ * Added upgrade procedure for RDF_QUAD
-2012-03-06 16:06 source
+2011-07-19 19:36 source
- * Fixed DI: detection
+ * Added generic function to describe objects
+ * Fixed check to see if ssl is in effect
+ * Fixed use proper case as sparql is always using quoted identifiers
-2012-03-06 16:06 source
+2011-07-19 19:27 source
- * Fixed twitter profile
+ * Fixed bug in endpoint setting persistence
+ * Fixed visibility of pager in navigator
+ * Improved recovery from some proxy-AJAX-related errors
-2012-03-06 16:06 source
+2011-07-19 19:25 source
- * Added post-processing script for generating owl:sameAs links for
- co-reference resolution
+ * Changed handling of anchors in map bubbles
-2012-03-06 15:41 source
+2011-07-15 11:17 source
- * Fixed typos
+ * Added missing opl:provided by property
-2012-03-06 15:35 source
+2011-07-15 11:16 source
- * Added DI spoort for certs
- * Fixed xslt, no xmlns
+ * Added option to set site logo in banner text
+ * Added new serialization format examples
-2012-03-06 15:34 source
+2011-07-15 11:15 source
- * Fixed copyright year
+ * Added Seevl cartridge
+ * Added Guardian cartridge
-2012-03-06 15:33 source
+2011-07-15 11:15 source
- * Added support for ld+json and microdata+json
+ * Fixed minor issue
-2012-03-06 15:32 source
+2011-07-15 11:07 source
- * Added curl examples for other structured data formats
+ * Added new export formats
-2012-03-06 15:32 source
+2011-07-15 11:06 source
- * Fixed rdf mapper logging
+ * Added generation of CV from LinkedIn using the oplcv ontology
-2012-03-06 15:31 source
+2011-07-15 11:02 source
- * Fixed bad fmt
+ * Added OpenLink CV/Resume ontology
-2012-03-06 15:31 source
+2011-07-14 19:14 source
- * Fixed extraction of a cert:key from sioc:content
+ * Fixed use the actual length of the string in cli_utf82narrow not max len
-2012-03-06 15:29 source
+2011-07-13 19:09 source
- * Fixed key in vcard
+ * Added check for cert
-2012-03-06 15:29 source
+2011-07-12 14:46 source
- * Fixed link to the dataset
+ * Fixed extra debugging
-2012-03-06 15:28 source
+2011-07-08 13:44 source
- * Added Klout extractor cartridge
+ * Merged first part of V7
-2012-03-06 15:28 source
+2011-07-05 21:09 source
- * Added New York Times Article cartridge
+ * Fixed GPF as stmt not available at this point
-2012-03-06 15:27 source
+2011-07-04 09:59 source
- * Added get:cartridge option
+ * Fixed XML escape data
+ * Fixed issues with mail addresses and encrypted mails
-2012-03-06 15:21 source
+2011-07-04 09:57 source
- * Fixed sponger front pages
+ * Added header and head links for IRIs
-2012-03-06 15:21 source
+2011-07-04 09:56 source
- * Added NTY ontology
+ * Added header and head procedures for IRI URLs
+ * Added new ODS rewrite rules
+ * Fixed get CA from connection if not set
+ * Fixed ACL using patterns
+ * Fixed default cert login
+ * FIxed take relevant webid
+ * Fixed Offers
-2012-03-06 15:20 source
+2011-07-04 09:54 source
- * Fixed check to ensure only access tokens granted to sponger are used
+ * Added LinkedIn cartridge
+ * Added linkedIn access token
+ * Added Zoopla cartridge
+ * Added new pattern for Eventbrite
+ * Added support for acct scheme
+ * Adjustments to OpenGraph RDF mappings and additions to OpenGraph ontology
+ * Fixed Yelp cartridge
+ * Fixed minor issuesdded additional checks for RDFa
+ * Fixed use origin as a base, not graph
+ * Fixed protection against bad datetime offsets returned by OpenGraph
-2012-03-06 15:19 source
+2011-07-04 09:33 source
- * Added Klout ontology
+ * Added loading NS prefixes into IRIDB through virtuoso defaults page
-2012-03-06 15:19 source
+2011-06-29 10:10 source
- * Added twitter v2 screen_name
+ * Fixed cannot perform file_stat as it runs on a different node
-2012-03-06 15:18 source
+2011-06-27 19:45 source
- * Fixed sponger frontpage
- * Added Foursquare button
+ * Added nsprefix and rulelist pages
-2012-03-06 15:13 source
+2011-06-27 11:24 source
- * Added support for flagging access tokens as invalid in FB cartridge
+ * Fixed do not perform keyset update on non pk ref
-2012-03-06 15:13 source
+2011-06-24 19:05 source
- * Added sponger param
+ * Added initial support for HTML+Microformat, Microformat/JSON and
+ JSON-LD output formats
-2012-03-06 15:13 source
+2011-06-24 11:25 source
- * Fixed Facebook cartridge
+ * Added result type detection
+ * Fixed SVG capability detection
-2012-03-06 15:12 source
+2011-06-24 11:25 source
- * Fixed equivproperties etc
+ * Fixed .isparql serialization in FF4 and IE9
-2012-03-06 15:12 source
+2011-06-24 11:24 source
- * Fixed long descs
+ * Fixed JSON output for native parsers
-2012-03-06 15:11 source
+2011-06-24 11:22 source
- * Added OpenGraph mapping
+ * Added prefix for http://www.w3.org/2002/07/owl# (owl:)
+ * Added prefix for http://www.openlinksw.com/schemas/rdfs/ (oplrdfs:)
+ * Fixed prefix handling in IRIDB, rdfstore and rdftabs
-2012-03-06 15:10 source
+2011-06-24 11:20 source
- * Added FB Parrot specification classes/properties
+ * Fixed MSIE detection in opacity anim
-2012-03-06 15:10 source
+2011-06-24 11:20 source
- * Fixed ordering needs an int
+ * Fixed handling of decoding url values with + instead of spaces
-2012-03-06 15:09 source
+2011-06-22 13:30 source
- * Added code to delete orig triples
+ * Fixed no not crash when key is empty
-2012-03-06 15:08 source
+2011-06-22 13:29 source
- * Fixed minor issues
+ * Fixed check for NULL pred
-2012-03-06 15:06 source
+2011-06-21 18:11 source
- * Added support for paging over large collections to FB cartridge
+ * Fixed make sure all required dfe are placed before making a decision
-2012-03-06 15:05 source
+2011-06-20 19:27 source
- * Fixed shadow var
+ * Fixed replay as we need to take into account non txn mode
-2012-03-06 15:04 source
+2011-06-20 19:25 source
- * Fixed use triple dict
+ * Fixed memory leak
-2012-03-06 15:04 source
+2011-06-20 14:15 source
- * Added cert ontology
+ * Fixed cast to uint32 instead of long as this is a serialized type
-2012-03-06 15:03 source
+2011-06-17 15:21 source
- * Fixed cert in html
+ * Fixed when sas, O is considered to be an iri
-2012-03-06 15:03 source
+2011-06-17 15:20 source
- * Fixed syntax
+ * Fixed if result is empty but input is same variable as input then
+ pesumable we have distinct and have to send input
-2012-03-06 15:02 source
+2011-06-17 00:11 source
- * Added equivalence triples for linkedin
+ * Fixed placement of ifdef
-2012-03-06 15:02 source
+2011-06-16 22:53 source
- * Fixed use batch request for facebook
- * Added hasCertificate property in relevant cartridges
+ * Added check for errors on bitmap insert
-2012-03-06 15:01 source
+2011-06-13 14:25 source
- * Fixed run fb only on facebook uri
+ * Fixed if too many cursors, do not crash server, just kill txn
-2012-03-06 15:00 source
+2011-06-13 09:31 source
- * Fixed cert property
- * Fixed opengraph returns 1/-1 depending on mime type
+ * Fixed "delayed" filters like
+ ?x p1 ?o1 ; p2 ?o2 . optional { ... } . filter (?o1 = ?o2)
-2012-03-06 14:59 source
+2011-06-13 09:29 source
- * Fixed favour activity_title over providerTitle for Google+
+ * Added function to backup index to log
-2012-03-06 14:58 source
+2011-06-11 16:41 source
- * Fixed wrong property
+ * Added support for SQLQUERY syntax in declaration of RDF views
+ * Fixed SQL codegen bug in SPARQL queries of R2RML rewriter
-2012-03-06 14:58 source
+2011-06-11 16:39 source
- * Fixed google plus cartridge
+ * Fixed issue with variable argument list
-2012-03-06 14:52 source
+2011-06-11 16:28 source
- * Added Twitter ontology to dbpedia, foaf, sioc, vcard etc ontologies
+ * Fixed fill can get out of bounds
-2012-03-06 14:52 source
+2011-06-10 22:45 source
- * Removed equivalent triples
+ * Fixed disable debug code from standard binary
-2012-03-06 14:51 source
+2011-06-10 22:44 source
- * Fixed check if operation returned triples and set flag appropriately
+ * Fixed skip rules which perform http redirect when doing a POST
-2012-03-06 14:50 source
+2011-06-10 21:39 source
- * Fixed use uppercase proedure names
+ * Fixed check if instance has trx and it has thread, else we do not
+ run
-2012-03-06 14:49 source
+2011-06-09 17:41 source
- * Identify application agent used for posting to twitter v2 cartridge
+ * Fixed problem with non-existing item and get API function
+ * Fixed myA JS error
-2012-03-06 14:48 source
+2011-06-09 17:39 source
- * Moved mappings from google plus
+ * Added tooltop for 'Language' property
+ * Fixed 'My Offers' typo
+ * Fixex get CA from connection if not set
+ * Fixed myA JS error
+ * Fixed error message
+ * Fixed check name when uload private key
-2012-03-06 14:47 source
+2011-06-09 17:26 source
- * Added mappings to BIBO, Dublin Core, FOAF, vCard, SIOC, Dbpedia
+ * Fixed crash when trying to unbox non-boxed item from tree
-2012-03-06 14:44 source
+2011-06-09 15:32 source
- * Fixed bad expression
+ * Added sponger splash page
-2012-03-06 14:44 source
+2011-06-09 15:29 source
- * Added check for RDF content-type
- * Added doc links
+ * Added sponger splash page
+ * Fixed minor issues
-2012-03-06 14:42 source
+2011-06-09 13:27 source
- * Changed datatype of oplgp:published/oplgp:updated to xsd:dateTime
+ * Added option to enable/disable ?P statistics
-2012-03-06 14:41 source
+2011-06-09 13:25 source
- * Fixed status handling
+ * FIxed added option to enable/disable ?P statistics
-2012-03-06 14:37 source
+2011-06-09 13:24 source
- * Fixed missing stop timer
+ * Fixed memory leak
-2012-03-06 14:33 source
+2011-06-07 18:53 source
- * Fixed status
+ * Fixed compiler warning
-2012-03-06 14:33 source
+2011-06-07 18:52 source
- * Added status
+ * Added new functions
-2012-03-06 14:29 source
+2011-06-07 18:51 source
- * Fixed minor issue
+ * Fixed if cannot ensure sas then return proper error not null
-2012-03-06 14:28 source
+2011-06-07 12:30 source
- * Fixed do not use bnodes for labels
+ * Fixed print ins options
-2012-03-06 14:27 source
+2011-06-07 12:29 source
- * Fixed need triple dict as 1st argument
+ * Fixed issue with int32 stats
-2012-03-06 14:27 source
+2011-06-06 08:06 source
- * Fixed use dictionary
+ * Added function to create certificate from CSR
-2012-03-06 14:22 source
+2011-06-06 08:02 source
- * Fixed SocialStatistics
+ * Fixed memory leaks
-2012-03-06 14:22 source
+2011-06-03 15:13 source
- * Added function XSLT_SANEURI
+ * Fixed memory leak
-2012-03-06 14:21 source
+2011-06-02 12:32 source
- * Added support for sponging Albums in Facebook cartridge
-
-2012-03-06 14:20 source
-
- * Replaced namedEntityConcept by entityType property
-
-2012-03-06 14:18 source
-
- * Fixed date parsing
+ * Fixed bad URL in typeahead.css
+ * Fixed issue with external ccount creation
+ * Fixed WebDAV selection
-2012-03-06 14:18 source
+2011-06-02 12:25 source
- * Added SocialStatistics cartridge
+ * Fixed iCalendar parser
-2012-03-06 14:16 source
+2011-06-02 12:24 source
- * Fixed make html default choice
+ * Added daylight saving time
+ * Fixed issue with validation
+ * Fixed WebDAV selection
-2012-03-06 14:16 source
+2011-06-02 12:22 source
- * Added Linkedin Shares cartridge
+ * Fixed WebDAV selection
-2012-03-06 14:15 source
+2011-06-02 12:22 source
- * Added new FP signature
+ * Fixed issue with validation
+ * Fixed WebDAV selection
-2012-03-06 14:09 source
+2011-06-02 12:21 source
- * Fixed match mime type
+ * Fixed issue with validation
+ * Fixed WebDAV selection
+ * Fixed uninstall some views
-2012-03-06 14:08 source
+2011-06-02 12:20 source
- * Fixed deprecated items
+ * Added user's rewrite rules
+ * Added WebID verify service
-2012-03-06 12:45 source
+2011-06-02 12:08 source
- * Added option to specify the accept header
+ * Added ProgrammableWeb cartridge
-2012-03-06 12:43 source
+2011-06-02 12:08 source
- * Added support for XHTML+Microdata
- * Added common infrastructure for RDF-specific XML parsers
- * Fixed memory leaks
+ * Fixed minor issue
-2012-03-06 12:40 source
+2011-06-02 11:18 source
- * Fixed redundant self-comparison in min_nonnull and max_nonnull
+ * Fixed check vdb col for nullable
-2012-03-06 12:34 source
+2011-06-01 09:20 source
- * Fixed compiler warnings
+ * Fixed signal error instead of GPF in normal build
-2012-03-06 12:30 source
+2011-05-31 15:34 source
- * Fixed permission check reading XML file
+ * Fixed set rehash factor if expecting large number of inserts in hash
-2012-03-06 12:28 source
+2011-05-31 15:33 source
- * Fixed MALLOC_DEBUG support
+ * Added function for CSR generation
-2012-03-06 10:43 source
+2011-05-31 15:32 source
- * Added function to get local filename from "path" portion of IRIs
+ * Fixed use max number to avoid buffer overrun
-2012-03-06 10:22 source
+2011-05-30 20:19 source
- * Ignore generated files
+ * Fixed translation from nodeiD://xxx to _:xxx
-2012-03-06 10:21 source
+2011-05-30 20:17 source
- * Fixed integer overflow
+ * Fixed issue with cost based optimizer
-2012-03-06 10:20 source
+2011-05-24 18:57 source
- * Fixed build dependancy
+ * Fixed when iri exceeds 2KB limit and flag is enabled then shorten
+ the iri, instead of rejecting it
-2012-03-05 17:38 source
+2011-05-24 18:56 source
- * Fixed whitespace
+ * Fixed loop so it only uses local files
-2012-03-05 17:25 source
+2011-05-23 13:44 source
- * Fixed issue saving state
+ * Added initial support for SPARQL 1.1. build-in IF and COALISCE
-2012-03-05 17:22 source
+2011-05-23 11:24 source
- * Fixed typo
+ * Fixed minor issue
-2012-03-05 17:21 source
+2011-05-23 11:23 source
- * Added XSL for setting location in COND
+ * Fixed LastFM cartridge
-2012-03-05 17:14 source
+2011-05-23 09:02 source
- * Fixed missing image
+ * Added support for CREATE LITERAL CLASS "format string" ...
-2012-03-05 17:11 source
+2011-05-20 16:20 source
- * Updated vad version to 1.11.70
+ * Fixed WebID selection
-2012-03-05 17:10 source
+2011-05-20 16:20 source
- * Fixed issue distinguishing lables between various NLP cartridges
+ * Fixed use certificate to verify the signature as an option
+ * Fixed use ldap&webid login
-2012-03-05 17:09 source
+2011-05-20 16:11 source
- * Fixed keep info in permalink
+ * Fixed add sponger ACL when installed
-2012-03-05 17:08 source
+2011-05-20 12:01 source
- * Added oplweb ontology
+ * Fixed comments
-2012-03-05 17:07 source
+2011-05-20 12:00 source
- * Fixed suppress errors if any
+ * Added support for WebID idp
+ * Fixed WebID selection
-2012-03-05 17:07 source
+2011-05-20 11:51 source
- * Fixed functionality between /about and /describe
+ * Added csv bulk loader script
-2012-03-05 17:06 source
+2011-05-20 11:46 source
- * Added generation of Pivot link for entities-list view type
+ * Fixed CSV import failed importing NULL values
-2012-03-05 17:06 source
+2011-05-20 11:44 source
- * Added registry setting for CSS stylesheet
- * Fixed copyright statements
- * Fixed map initialization
- * Fixed problem with Class URIs
+ * Fixed dav_enable should not be touched for dba account
-2012-03-05 17:04 source
+2011-05-19 18:32 source
- * Fixed debug statements
+ * Fixed NULL value is not an error in lax mode
-2012-03-05 17:03 source
+2011-05-19 18:22 source
- * Fixed check if data is returned as it can timeout transaction without
- any data
+ * Fixed wrong arg
-2012-03-05 17:02 source
+2011-05-19 13:34 source
- * Added check for wide labels
+ * Added ldap schema support to WebID
-2012-03-05 17:01 source
+2011-05-19 13:15 source
- * Fixed copyright statement on describe page
+ * Added version and timeout argument
-2012-03-05 17:00 source
+2011-05-19 13:11 source
- * Added more labels in the ontology
+ * Fixed duplicate symbol
-2012-03-05 17:00 source
+2011-05-19 10:17 source
- * Added registry key for data license markup
- * Fixed missing datatype in some conditionals
- * Fixed datatype selector to reflect last clicked value dtp
+ * Fixed API contact edit function
-2012-03-05 16:55 source
+2011-05-19 09:58 source
- * Fixed missing initialization
+ * Fixed compiler warning
-2012-03-05 16:54 source
+2011-05-19 09:57 source
- * Fixed initialization of the main page
+ * Fixed add user to bootstrap as it can run procs in this context
-2012-03-05 16:54 source
+2011-05-18 21:15 source
- * Added encoding page in permalink in describe
- * Fixed regression disabling the COND UI
+ * Fixed SIOC object services
-2012-03-05 16:53 source
+2011-05-18 21:12 source
- * Added permalink for usage stats page
+ * Fixed install/uninstall bugs
-2012-03-05 16:52 source
+2011-05-18 09:19 source
- * Fixed small bug
+ * Added Eventbrite cartridge
+ * Fixed guard against using revoked long-lived FB access token
-2012-03-05 16:51 source
+2011-05-18 09:10 source
- * Fixed missing menu on Metadata page
- * Fixed header on Metadata and Settings pages
- * Fixed formatting of SID in sponger link
+ * Added instructions on revoking access tokens to FB on retrieval
+ confirmation page
-2012-03-05 16:50 source
+2011-05-18 09:09 source
- * Fixed qrcode link
+ * Fixed issue with properties
-2012-03-05 16:49 source
+2011-05-18 09:01 source
- * Added support for AddThis
- * Added registry keys to override debug output
- * Fixed bad icons by using text links
- * Small CSS tweaks
+ * Added Upcoming cartridge
+ * Added Plancast cartridge
+ * Fixed use labels by default
+ * Fixed remove pro
+ * Fixed minor issues
-2012-03-05 13:15 source
+2011-05-17 22:53 source
- * Fixed handing of wide/narrow labels
+ * Added SIOC object services
+ * Fixed problem with edit command and Wiki version folders
+ * Fixed version history properties
+ * Fixed move/copy API with wrong source/destination
+ * Fixed problems with WebID
-2012-03-05 13:15 source
+2011-05-17 22:51 source
- * Fixed label order
+ * Added SIOC object services
+ * Fixed IE JS problems
+ * Fixed UI bug
-2012-03-05 13:14 source
+2011-05-17 22:50 source
- * Fixed guessing Type label for entities
- * Fixed rendering of set class UI when no class is found
+ * Added SIOC object services
+ * Fixed changing/deleting events does not trigger re-sync with publication
+ * Fixed import/export bug
+ * Fixed IE JS problems
-2012-03-05 13:13 source
+2011-05-17 22:48 source
- * Fixed sponger parameter
+ * Added SIOC object services
+ * Added annotation rules
+ * Fixed navigation and UI
+ * Fixed css
+ * Fixed IE bug
+ * Fixed UI bug
-2012-03-05 13:13 source
+2011-05-17 22:46 source
- * Added prefixes
- * Fixed sponger call
+ * Added SIOC object services
+ * Fixed IE bug
+ * Fixed UI bug
-2012-03-05 13:12 source
+2011-05-17 22:45 source
- * Added better indication of current focus in query description
- * Fixed display of entities list when focused on e1
- * Fixed display of "Describe" link for URIs
- * Removed extra page elems when query has no result
- * Minor typography and colour tweaks.
+ * Fixed IE JS problems
+ * Fixed UI bugs
-2012-03-05 13:01 source
+2011-05-17 22:44 source
- * Fixed permalink
+ * Added SIOC object services
-2012-03-05 13:00 source
+2011-05-17 22:43 source
- * Fixed description page to not generate a sid in sponger link
+ * Fixed issue with Wiki after delete and restore VVC folder
-2012-03-05 13:00 source
+2011-05-17 22:42 source
- * Fixed default mode in /about
+ * Added SIOC object services
+ * Fixed a++
-2012-03-05 12:59 source
+2011-05-17 21:14 source
- * Added mode for sponger
+ * Fixed compiler warnings
-2012-03-05 12:59 source
+2011-05-17 14:06 source
- * Fixed pager button
+ * Added optimization for %g specifier for "Decimal" types in RDFViews
-2012-03-05 12:58 source
+2011-05-17 13:51 source
- * Fixed check for lang
+ * Rebuild drivers
-2012-03-05 12:57 source
+2011-05-17 13:48 source
- * Added new pager to allow change page lenght and jump to row number
+ * Added function to get/set Query timeout (default = 0 = unlimited)
-2012-03-05 12:56 source
+2011-05-16 09:04 source
- * Fixed description page when encountering labels of numeric DTP
+ * Added initial support for SPARQL 1.1 Graph Store HTTP Protocol
-2012-03-05 12:56 source
+2011-05-16 08:51 source
- * Added better remore debug logging facility
+ * Fixed usage of http_request_header
+ * Fixed useage of last modified
-2012-03-05 12:54 source
+2011-05-16 08:50 source
- * Fixed use EN if no language specified
+ * Fixed empty subject
+ * Fixed WebID selection
+ * Fixed problem with certificate generation using Safari on windows
+ * Fixed topic of interests
+ * Fixed a++
-2012-03-05 12:54 source
+2011-05-16 08:35 source
- * Fixed use short summary when available
+ * Fixed setting name
-2012-03-05 12:53 source
+2011-05-16 08:34 source
- * Fixed description page dropdown to show distinct IRI
- * Fixed description page to show curie of page resource uri in title
+ * Fixed entry page for sponged Facebook user's profile to top level
+ container document
-2012-03-05 12:52 source
+2011-05-12 20:53 source
- * Fixed description page to use CURIEs in the constrain facet to type
- dropdown
+ * Fixed compiler warning
-2012-03-05 12:51 source
+2011-05-12 20:53 source
- * Fixed description page to allow selection of class as FCT starting
- point when the entity is member of many classes
+ * Added more system unames
-2012-03-05 12:50 source
+2011-05-11 14:49 source
- * Fixed layout of demo queries page
- * Fixed display of detailed information in error handler
- * Fixed setting empty default graph in SPARQL query link
+ * Fixed small issue
-2012-03-05 12:47 source
+2011-05-11 13:32 source
- * Fixed check lenght
+ * Fixed issue compiling zip support on Mac OS X
-2012-03-05 12:46 source
+2011-05-11 13:19 source
- * Added better handling of strings with LAND for BETWEEN condition
+ * Fixed typo in Content-Type header
-2012-03-05 12:46 source
+2011-05-11 13:15 source
- * Added workaround for narrow cset in literals
+ * Added missing file
-2012-03-05 12:45 source
+2011-05-11 13:11 source
- * Added check for bnodes
+ * Fixed rdf_sink is not a DET
-2012-03-05 12:45 source
+2011-05-11 13:09 source
- * Fixed typo in locating throbber file name
- * Fixed display of autolocating NEAR cond in query description
- * Fixed generation of conditionals in UI
- * Fixed missing hyphen in pager indicator for range of results
+ * Added more parameters for crawling
+ * Fixed top proc must run as dba
+ * Fixed use array for values
-2012-03-05 12:43 source
+2011-05-11 09:39 source
- * Added xsl to strip lat/long from autoacquire cond permalinks
+ * Added WebID support to dynares
+ * Added optional async mode for dav meta extraction
-2012-03-05 12:42 source
+2011-05-11 08:08 source
- * Fixed bug causing addig NEAR COND in Firefox to fail
+ * Added missing files
-2012-03-05 12:41 source
+2011-05-10 18:57 source
- * Fixed bug adding location marker
+ * Fixed write processing status to sponger queue
+ * Fixed access tokens for OpenGraph cartridge save/restore from table
+ instead of the API key
-2012-03-05 12:39 source
+2011-05-10 18:43 source
- * Added support for autolocating proximity queries
+ * Fixed access tokens for OpenGraph cartridge save/restore from table
+ instead of the API key
-2012-03-05 12:32 source
+2011-05-10 18:42 source
- * Fixed small bugs
+ * Fixed minor issues
-2012-03-05 12:30 source
+2011-05-10 18:40 source
- * Fixed datatype field showing up in contains cond UX
- * Fixed generation of conds without enclosing property pattern
+ * Fixed disabled pg_check_map by default to make cpt faster
-2012-03-05 12:28 source
+2011-05-10 18:37 source
- * Fixed fct_view_pos to return value 0 in case of an empty tree
+ * Fixed disable pg_check_map by default to make cpt faster
-2012-03-05 12:06 source
+2011-05-10 12:20 source
- * Updated vad version
+ * Fixed myust set sl_owner before cpt_rollback in order to know which
+ thread owns the process, otherwise other threads may wrongly go
+ inside the wait_checkpoint
-2012-03-05 12:05 source
+2011-05-10 12:18 source
- * Merged replication pages
+ * Added initial support for B.C. datetimes
+ * Added new functions to convert datetime from/to NASA Truncated
+ Julian Day
+ * Fixed bug in date2num and num2date
-2012-03-05 12:04 source
+2011-05-09 12:06 source
- * Added option to browse table definitions
+ * Fixed internal error in sparql_detalize on SPARUL statement
-2012-03-05 12:03 source
+2011-05-09 12:05 source
- * Fixed message
+ * Added new statistic counters
-2012-03-05 12:02 source
+2011-05-08 22:24 source
- * Added option to scope ACL to a VD
+ * Added GROUP_CONCAT and SAMPLE
-2012-03-05 12:01 source
+2011-05-08 22:23 source
- * Fixed rdfmapper logging
+ * Added common function to set certificate server-side
-2012-03-05 12:01 source
+2011-05-08 22:18 source
- * Added support for r2rml graph generation
+ * Added option to use certificates stored in the db
-2012-03-05 12:00 source
+2011-05-06 11:34 source
- * Fixed do not use autoritykeyid
+ * Fixed call to sponger status procedure
-2012-03-05 11:59 source
+2011-05-05 12:55 source
- * Added initial pages for r2rml
+ * Fixed do not use aq if in sponger queue
-2012-03-05 11:57 source
+2011-05-05 12:54 source
- * Added support for unicode strings in password
+ * Fixed print literals with meta info only when html is requested
-2012-03-05 11:47 source
+2011-05-03 18:00 source
- * Fixed copyright to include 2012
+ * Fixed workaround for missing offers
-2012-03-05 11:45 source
+2011-05-03 18:00 source
- * Updated copyright to include 2012
+ * Fixed minor issue
-2012-03-05 11:45 source
+2011-05-03 17:55 source
- * Fixed use dbpedia url for testing
+ * Fixed compiling on VC10
-2012-03-05 11:43 source
+2011-05-03 17:51 source
- * Added asynchronous connection detection for DAV
+ * Fixed function signature for windows build
-2012-03-05 11:42 source
+2011-05-03 17:50 source
- * Fixed use Grid View as initial tab
- * Fixed use raw iris instead of shortened
+ * Fixed error checking
-2012-03-05 11:40 source
+2011-05-03 14:03 source
- * Fixed copyright year to include 2012
+ * Added check for native JSON serializer/deserializer when available
+ * Fixed detection of buggy XML serializer in IE9
+ * Fixed MSIE detection
+ * Fixed SVG detection in OAT.Browser
-2012-03-05 11:37 source
+2011-05-03 11:50 source
- * Fixed issue with rdf_mappers
+ * Fixed set rehash pct
-2012-03-05 11:34 source
+2011-05-03 11:15 source
- * Added more types to check
+ * Fixed SPARQL OPTIONAL keyword sometimes causing queries to not
+ return graph matches
-2012-03-05 11:33 source
+2011-05-02 14:16 source
- * Fixed use new WebiD module
-
-2012-03-05 11:32 source
-
- * Fixed issue with sink folder
+ * Added app discussion rules
+ * Added annotation rules
+ * Added common css
+ * Fixed navigation and standardize UI
+ * Fixed updating external URIs access rights in UI profile
+ * Fixed missing webfinger lookup
+ * Fixed OpenId not registered id message
+ * Fixed user selection page size
+ * Fixed popup windows
+ * Fixed security tab
-2012-03-05 11:31 source
+2011-05-02 14:09 source
- * Fixed return http status 500 when execution fails
+ * Added support for social bookmarking
+ * Fixed use 404 when no data is found
+ * Fixed links in footer
+ * Fixed escape the single quote char
-2012-03-05 00:08 source
+2011-05-02 14:06 source
- * Updated version to 3.60
+ * Fixed labels
-2012-03-04 23:58 source
+2011-05-02 14:02 source
- * Fixed problem with blobs when using getString()
+ * Fixed links
-2012-03-03 10:36 source
+2011-05-02 12:48 source
- * Fixed XMLA Columns, PrimaryKey and Foreignkey
+ * Fixed popup windows
-2012-03-03 09:56 source
+2011-05-02 12:44 source
- * Fixed ignore generated files
+ * Added annotation rules
+ * Added discussion IRIs
+ * Fixed navigation and standardize UI
+ * Fixed popup windows
-2012-03-03 09:55 source
+2011-05-02 12:30 source
- * Removed bad symbol
+ * Added option to obtain a Facebook OAuth access token for use with
+ sponger cartridge
+ * Fixed group export and delete of crawling targets
+ * Fixed crawling feeds, parameters for crawling
+ * Fixed disable config if no https
+ * Fixed shorten queue description
-2012-03-03 02:09 source
+2011-05-02 12:22 source
- * Added function virt_mbrlen
+ * Added Gowalla cartridge
+ * Added Productontology
+ * Added Google Product
+ * Updated Facebook cartridge with multiple access tokens
+ * Fixed do not print empty container string if there is no name
-2012-03-03 02:08 source
+2011-05-02 08:24 source
- * Fixed skip internal options
+ * Fixed col_default to be same dtp as col_dtp to prevent default value
+ misuse
-2012-03-03 02:07 source
+2011-05-02 08:23 source
- * Fixed memleak
+ * Fixed wrong deref of default int value
-2012-03-03 02:06 source
+2011-04-29 11:56 source
- * Fixed potential filedesc leak
+ * Fixed when redirect is to secure site, setup the appropriate flags
-2012-03-03 02:05 source
+2011-04-26 12:16 source
- * Added function strses_wide_string
+ * Fixed loading TriG
-2012-03-03 00:03 source
+2011-04-26 12:14 source
- * Added TRIG formatter
- * Updated TRIG parser to comply with latest draft spec
+ * Fixed loading NQuads
-2012-03-02 23:57 source
+2011-04-26 12:13 source
- * Added support for SPARQL 1.1 WITH, USING, NAMED
- * Added support for SPARQL 1.1 Update
+ * Fixed check webid only if not uathenticated
-2012-03-02 23:37 source
+2011-04-21 13:09 source
- * Added human-readable HTML output for DESCRIBE (list and table)
+ * Added session counters for read/write/seek on gzip file
-2012-03-02 23:10 source
+2011-04-21 11:41 source
- * Added functionnumeric_rescale_noround
+ * Upgraded to zlib 1.2.5
-2012-03-02 22:48 source
+2011-04-20 15:12 source
- * Added support for long nvarchar
+ * FIxed hang or crash after cpt over
-2012-03-02 22:34 source
+2011-04-20 15:12 source
- * Fixed dump of all subject entries
+ * Fixed disable dep cols check
-2012-03-02 22:33 source
+2011-04-20 15:11 source
- * Fixed use graph in the r2rml graph
+ * Added debug code to detect mutex hang on same thread
-2012-03-02 22:32 source
+2011-04-19 20:50 source
- * Fixed FOAF query
+ * Fixed lock status report
-2012-03-02 22:15 source
+2011-04-19 20:49 source
- * Updated version of sparql internals to match cached resources
+ * Fixed key dep cols check for sample
-2012-03-02 22:11 source
+2011-04-19 16:16 source
- * Fixed warning from gperf by using different way to calculate hash key
+ * Fixed bad bnode syntax in output
-2012-03-02 22:09 source
+2011-04-19 16:15 source
- * Applied missing patch
+ * Added session read waits statistic
-2012-03-02 21:53 source
+2011-04-18 16:03 source
- * Small cleanups
+ * Fixed default mode for sponger should be sync instead of async
-2012-03-02 21:52 source
+2011-04-18 16:03 source
- * Added support for SELECT scalar_expression subqueries without FROM
- clause to avoid extra lock on fake subqueries like:
- (SELECT TOP 1 scalar_expression FROM nonempty_table) AS alias
+ * Fixed http_lock requires that maintenance page is set
-2012-03-02 21:48 source
+2011-04-18 16:02 source
- * Fixed additional case of SPARQL OPTIONAL bug
+ * Added statistics on read/write/seek session via file/gzip counters
-2012-03-02 21:45 source
+2011-04-15 12:42 source
- * Fixed buildin call to IN
+ * Added deadlock retry handler
+ * Added support to use redirect and timeout options
-2012-03-02 21:42 source
+2011-04-15 12:39 source
- * Fixed problem where /sparql endpoint seems to retain graph data
- after deletion
+ * Added Foursquare cartridge
+ * Added Zappos cartridge
+ * Added enhancements to Facebook OpenGraph cartridge
+ * Fixed minor issues
-2012-03-02 21:37 source
+2011-04-15 12:33 source
- * Added difference between DB.DBA.rdf_...impl() stored procedures
- and rdf_.._impl() BIFs for SPARQL 1.1
+ * Added "Raw linked data format" permalinks
+ * Fixed CSS
-2012-03-02 21:32 source
+2011-04-15 12:05 source
- * Added additional checking if two variables are equal
+ * Fixed codegen for service invocation for case of IN parameter
+ that is not bound in SINV subquery (used only in filter) and is
+ neither external/global nor fixed in parent group pattern
-2012-03-02 21:26 source
+2011-04-15 12:04 source
- * Added nice syntax for declarations of macro libraries
+ * Fixed support for xsd:time() in sparql when the argument value
+ is safe for SQL CASET instead of function call
-2012-03-02 21:22 source
+2011-04-13 22:51 source
- * Added support for SPARQL 1.1 ISNUMERIC()
- * Added enhancements to codegen to speed up fake subqueries
- * Fixed checks in ISREF() and ISLITERAL for nullable arguments
+ * Added initial variant for estimate taking dep cols in account
+ (by default disabled)
-2012-03-02 19:23 source
+2011-04-13 22:50 source
- * Fixed debug code
+ * Added missing param for http_get
-2012-03-02 18:54 source
+2011-04-13 10:16 source
- * Fixed JSON-LD syntax to match recent draft of the spec
+ * Fixed if tf_xx signals an error, xn_children were released twice
-2012-03-02 18:51 source
+2011-04-12 18:29 source
+ * Fixed check bnode subject
+ * Fixed clear avalues array before possible jump
* Fixed compiler warnings
-2012-03-02 18:49 source
+2011-04-11 21:44 source
- * Fixed need to escape amp etc in rdf/xml
+ * Fixed do not report a frequent error re unescaped "&&" in <SCRIPT>
+ HTML tag
+ * Fixed can jump over buffer boundary if you have an &xx not ending
+ in a semicolon
-2012-03-02 18:48 source
+2011-04-11 21:42 source
- * Fixed mixed declarations and code
+ * Added option top copy/clone crawler target
+ * Added option for crawl-delay
-2012-03-02 18:47 source
+2011-04-11 21:39 source
- * Added support for wide strings in all SPARQL serializers
- (Turtle-like, NT, JSONs and SPARQL-XML result set)
+ * Added support for crawl-delay
-2012-03-02 18:45 source
+2011-04-11 21:01 source
- * Fixed output of bnodes in RDF/XML format
+ * Fixed removed leading CRLF
-2012-03-02 18:42 source
+2011-04-11 21:01 source
- * Fixed warnings
+ * Fixed wrong function call
+ * Fixed bad inference tag
-2012-03-02 18:40 source
+2011-04-11 20:55 source
- * Fixed CONTRUCT with constant "string"@lang
+ * Fixed error message in spar_find_sc_for_big_ssl_const
-2012-03-02 18:37 source
+2011-04-11 20:54 source
- * Added new RDF/XML printer (fater + pretty print)
- * Fixed CONSTRUCT with constant string objects with language
- * FIxed bad TTL output for DV_WIDE objects
+ * Added support for RDFa 1.1
-2012-03-02 18:32 source
+2011-04-11 20:53 source
- * Fixed memory leak
+ * Fixed compiler warnings
-2012-03-02 18:24 source
+2011-04-11 15:36 source
- * Fixed whitespace
+ * Added DB.DBA.RDF_RDFA11_FETCH_PROFILES() to sponge and return
+ RDFa 1.1 external profile data
-2012-03-02 18:23 source
+2011-04-11 15:35 source
- * Fixed do not use etag when using no-cache
+ * Added rdfa: namespace prefix
-2012-03-02 18:19 source
+2011-04-11 15:05 source
- * Added support for base64url encode/decode functions
+ * Added w3-1999-xhtml/vocab for RDFa 1.1
-2012-03-02 18:14 source
+2011-04-11 09:15 source
- * Added missing setting for ShortenLongURIs in SPARQL section
+ * Fxed issue with rdf_type attr
-2012-03-02 12:43 source
+2011-04-11 08:28 source
- * Removed debug code
+ * Fixed double free
-2012-03-02 11:13 source
+2011-04-11 08:27 source
- * Added DBpedia vad package to VOS release
+ * Added support for trig
-2012-02-27 01:16 source
+2011-04-11 08:27 source
- * Added initial r2rml generator
+ * Fixed check if file is present on local fs
-2012-02-27 01:13 source
+2011-04-07 21:19 source
- * Fixed whitespace
+ * Added function to validate rdfxml
-2012-02-27 01:08 source
+2011-04-07 21:17 source
- * Added support for new SPARQL 1.1 BIFs
+ * Fixed do not flush immediately, as client may ask for gzip later
-2012-02-26 17:11 source
+2011-04-07 21:16 source
- * Added initial implementation of SPARQL 1.1 functions
+ * FIxed if bitmap error on a cursor, kill the transaction instead of GPF
-2012-02-26 15:28 source
+2011-04-07 11:11 source
- * Added support of comparions of DV_WIDE with DV_STRINGs flaged by
- BF_UTF8 or BF_IRI
+ * Fixed if process is swapping do not try to signal self as lock reaper
+ may decide to kill this transaction where it may wait for select
+ thread to run its signal function
-2012-02-26 15:17 source
+2011-04-06 12:09 source
- * Fixed show http threads vs. internal calls
+ * Fixed issue with multiple transitive subqueries in sql optimizer
-2012-02-26 15:16 source
+2011-04-06 12:01 source
- * Fixed get full name for procedure
+ * Fixed when doing subseq, session will return session handle, which
+ needs to be converted to string
-2012-02-26 15:07 source
+2011-04-05 14:38 source
- * Added support of comparision of DV_WIDE with DV_STRING flagged
- by BF_URF8 or BF_IRI
+ * Fixed issues with RDFa 1.1 test
-2012-02-26 15:04 source
+2011-04-05 14:37 source
- * Added different digest for fingerprint
+ * Fixed possible mutex deadlock
-2012-02-26 15:03 source
+2011-04-04 12:32 source
- * Added hex2bin function
+ * Added support for javascript-like hrefs in RDFa
-2012-02-26 15:01 source
+2011-04-04 12:31 source
- * Fixed low selectivity of min bnode call
+ * Fixed when not a string, use a cast to string
-2012-02-26 15:00 source
+2011-04-04 12:31 source
- * Fixed copyright year to 2012
+ * Fixed use mtx in proper order
-2012-02-26 14:59 source
+2011-03-31 21:33 source
- * Fixed issue with ORDER BY
+ * Fixed issues with RDFa parsing
-2012-02-26 14:56 source
+2011-03-31 21:32 source
- * Added flag for binary blob in sqlgetdata
+ * Added check for MacDataSourceSize with default of 20MB
-2012-02-26 14:52 source
+2011-03-29 23:20 source
- * Added check for rd & tmp key when page check is enabled
+ * Updated version to 6.1.3 for final release
-2012-02-26 14:49 source
+2011-03-29 22:55 source
- * Added optional digest for x509 generator
+ * Fixed do not check immutable graph when dba is running
-2012-02-26 13:54 source
+2011-03-29 22:52 source
- * Extended SPARQL macro syntax to allow any IRI syntax
+ * FIxed minor issue
-2012-02-26 13:16 source
+2011-03-29 22:52 source
- * Fixed invalid SQL
+ * FIxed ACL
-2012-02-26 13:15 source
+2011-03-29 22:49 source
- * Fixed resultSet of xmla_dbschema_columns
- * Fixed call parameters to xmla_dbchema_tables
+ * Fixed minor issue with prices
-2012-02-26 13:13 source
+2011-03-29 22:46 source
- * Fixed describe should return 3 rows
+ * Fixed swapped menu items
-2012-02-15 13:46 source
+2011-03-29 22:43 source
- * Added check for out slots
+ * Fixed use INFORMATION_SCHEMA.TABLES
-2012-02-15 01:16 source
+2011-03-29 21:08 source
- * Added flag to create text index in silent mode
+ * Fixed menu layout
-2012-02-15 01:14 source
+2011-03-29 20:14 source
- * Fixed do not check preds are placed when there is no from clause
+ * Fixed JS IE bug on profile page
+ * Small code cleanup
-2012-01-31 13:50 source
+2011-03-29 14:06 source
- * Fixed handling of primarykeys and foreignkeys in XMLA
+ * Fixed typo in Makefile.am
-2012-01-24 00:43 source
+2011-03-29 12:45 source
- * Added alt link in header
+ * Fixed put absolute path for database in default virtuoso.ini
-2012-01-24 00:39 source
+2011-03-29 11:02 source
- * Fixed DET ACLs
+ * Added alt to images in rdftab
-2012-01-24 00:34 source
+2011-03-29 10:58 source
- * Fixed issues with CalDav and Mac OS X 10.6
+ * Fixed tuned handling of page params
+ * Fixed permalinks now encode information of which editor was used
+ to produce the query
-2012-01-18 20:46 source
+2011-03-29 10:53 source
- * Added ld+json
+ * Fixed must return error when cast fails
-2012-01-17 12:15 source
+2011-03-29 10:53 source
- * Fixed cannot use inline macro as it may read past end of buffer
+ * Fixed issue with sparql filter with two optionals
-2012-01-12 19:15 source
+2011-03-29 00:31 source
- * Added support for scoping ACL to a virtual dir
+ * FIxed issue locating jvm runtime library location on linux x86_64
-2012-01-12 11:21 source
+2011-03-29 00:09 source
- * Added flag to know if conten-len actually is read
+ * Fixed build issue when prerequisite support .jar files not present
-2012-01-10 14:22 source
+2011-03-28 23:11 source
- * Added pragma "get:cartridge"
+ * Fixed check for demo data before continuing
-2012-01-10 14:21 source
+2011-03-28 17:29 source
- * Added support for "define get:..." options in SPARUL LOAD
+ * Added configure option for enabling mutex debugging
-2012-01-10 14:17 source
+2011-03-28 16:04 source
- * Fixed debug output
+ * Fixed dependency for VOS
-2012-01-10 14:16 source
+2011-03-28 15:56 source
- * Fixed allow underline in ?actor_name as part of regular SPARQL
+ * Rolled back previous patch
-2012-01-10 14:04 source
+2011-03-28 13:52 source
- * Fixed indentation
+ * Added missing files to distribution
-2012-01-10 14:02 source
+2011-03-28 12:57 source
- * Fixed do not write end of message to output
+ * Fixed minor layout issue
-2012-01-10 13:57 source
+2011-03-28 12:53 source
- * Fixed should not kill transactions when checkpoint is pending
+ * Added support for posh triples
-2012-01-10 13:54 source
+2011-03-28 12:52 source
- * Added support functions for SPARQL Macro library syntax
+ * Fixed labels
-2012-01-10 13:53 source
+2011-03-28 12:22 source
- * Fixed minor issues
+ * Fixed allow varbinary as input for obj
-2012-01-10 13:50 source
+2011-03-26 14:22 source
- * Added support for get:soft add to proxy service
+ * Fixed user's pages to start with profile page
-2012-01-09 14:42 source
+2011-03-26 14:21 source
- * Added support for CardDAV
- * Fixed updating Apple calendars
+ * Fixed skin handling
-2012-01-09 14:41 source
+2011-03-25 21:33 source
- * Fixed must have certain permissions to do cleanup
+ * Updated version
-2011-12-14 16:05 source
+2011-03-25 21:29 source
- * Added human readable HTML outputs for DESCRIBE (list and table)
+ * Updated build environment for win32 and win64
-2011-12-14 15:57 source
+2011-03-25 17:47 source
- * Fixed check for scope
+ * Fixed possible copy overlap on some newer C libs
-2011-12-14 15:56 source
+2011-03-25 16:23 source
- * Fixed support for sparql load <file:///....> i.e. with absolute path
- from system root
+ * Fixed vcard handling
-2011-12-14 15:52 source
+2011-03-25 16:19 source
- * Added support for wide and long-wide blobs
+ * Fixed encoding
-2011-12-14 15:50 source
+2011-03-25 15:10 source
- * Added atomic mode
- * Added log mode parameter
+ * Updated testsuite
-2011-12-14 15:48 source
+2011-03-25 12:20 source
- * Fixed crash if stmt is invalid
+ * Fixed if there is no subclass/property but there is an equivalent,
+ then use that as the statrt point, otherwise we would not get a
+ result
-2011-12-08 21:25 source
+2011-03-24 16:15 source
- * Added support for get:soft "add"
+ * Added bulk-loader to virtuoso binary
-2011-12-08 21:23 source
+2011-03-24 16:04 source
- * Fixed RDF/XML parser to pass w3c tests dated 2003-Nov.
+ * Updated documentation
-2011-12-08 21:19 source
+2011-03-24 15:50 source
- * Fixed if ssl session, make it regular as an error can leave it as ssl
+ * Fixed do now use daq because rdf_label has two keys and soft
+ does not work
+ * Fixed use labels if not curie or uri
+ * Fixed issue with recent dbpedia onthology
+ * Fixed labels
+ * Fixed auto-complete failed when exact match & prefix found
-2011-12-08 21:16 source
+2011-03-24 15:47 source
- * Added new function RDF_VIEW_DROP_STMT_BY_GRAPH
+ * Fixed use labels for IRIs only
+ * Fixed use special describe mode to avoid empty results
+ * Fixed error handling
+ * Fixed keep sas & inf
+ * Fixed bad encoding
+ * Fixed proper escape for uris
+ * Fixed wrong labels
-2011-12-08 21:15 source
+2011-03-24 13:48 source
- * Fixed only kill txn when we have the lt, else we should wait
+ * Fixed additional xml document parser error handling for Opera
-2011-12-08 21:11 source
+2011-03-23 16:45 source
- * Fixed issue in IRI splitter used by RDFa serializer when namespace
- ends in '%' if the last char of the original IRI was %nn
+ * Added function to format rdf object for printing in html
-2011-12-08 21:08 source
+2011-03-23 12:25 source
- * Added new function DB.DBA.RDF_GRAPH_USER_PERMS_DEL
+ * Fixed typo
-2011-11-29 14:31 source
+2011-03-23 12:17 source
- * Fixed reduntant lock on DB.DBA.RDF_QUAD is removed in cases where
- RDF_QUAD was used as a stub
+ * Added LinkedIn import
+ * Fixed duplicate addressbook entries issue
-2011-11-29 14:14 source
+2011-03-23 12:13 source
- * Fixed labels
+ * Added rdfs schema
+ * Fixed datetime format
+ * Fixed minor issues
-2011-11-29 14:14 source
+2011-03-23 12:13 source
- * Fixed use different physical graphs
+ * Added more properties
-2011-11-29 13:53 source
+2011-03-23 12:13 source
- * Added message OAT_MAP_API_LOADED in map API
- * Added detection of right click in ghostdrag.js
- * Added option raw-irix that disables URI shortning (namespave systhesis)
- in the rdf viewer components
- * Updated version to 2.9.3
+ * Fixed minor issues
-2011-11-29 13:35 source
+2011-03-23 12:03 source
- * Fixed conditional on long/short in mutex_try_enter
- * Fixed problem with MTX_DEBUG
+ * Added more options for exporting a site
+ * Added more delimiters
+ * Fixed folder DET type presentation
+ * Fixed export as text
-2011-11-29 10:11 source
+2011-03-23 12:01 source
- * Fixed webid
+ * Fixed wrong serialization of VirtuosoExplicitString when it is
+ binding with DV_ANY parameter
-2011-11-29 10:10 source
+2011-03-23 11:05 source
- * Removed duplicate procedure
+ * Rebuild drivers
-2011-11-29 10:06 source
+2011-03-23 11:04 source
- * Updated sparql metadata version
+ * Fixed issue with using _JAVA_ on sparql select
-2011-11-29 00:01 source
+2011-03-23 10:49 source
- * Fixed int64 comparision
+ * Fixed duplicate addressbook entries issue
-2011-11-28 21:18 source
+2011-03-23 10:48 source
- * Added initial support for SPARQL MACRO
+ * Fixed broken show filter
-2011-11-28 21:15 source
+2011-03-23 10:48 source
- * Fixed types
+ * Fixed feeds aggregator
-2011-11-28 20:59 source
+2011-03-23 10:47 source
- * Fixed expression logic
+ * Updated folder type list with 'Dynamic Resource'
-2011-11-28 12:15 source
+2011-03-23 10:37 source
- * Added RDF_VIEW_SYNC_TO_PHYSICAL API call
+ * Added support for DV_RDF in v:isql rendering
-2011-11-28 10:11 source
+2011-03-23 10:35 source
- * Added extra alias E_MAIL to options field
+ * Added custom UA
+ * Fixed gunzip the zipped rdfs
+ * Fixed large pages in results
-2011-11-28 10:10 source
+2011-03-23 10:33 source
- * Added support for nvarchar passwords
+ * Improved session persistence
+ * Fixed handling of XML+RDF parsing errors
+ * Fixed bugs in query cache handling/paging
+ * Fixed Cosmetics in "Raw triples" view
+ * Fixed Default view set as "Advanced" in query permalinks
+ * Fixed URL params handling so they always take precedence from
+ persisted session
+ * Fixed bug in menu item to Reset session
-2011-11-28 10:09 source
+2011-03-23 10:28 source
- * Fixed show maintenance page when database is in atomic lock
+ * Added code to facilitate better error recovery when parsing
+ invalid RDF+XML
+ * Fixed small code cosmetics
-2011-11-28 10:07 source
+2011-03-22 23:50 source
- * Fixed crash on passing NULLs to xpath_funcall with functions that
- do not support NULLs
+ * Fixed missing globals
-2011-11-28 09:58 source
+2011-03-21 13:30 source
- * Fixed issue with bad characters in long doublequoted strings
+ * Fixed missing variable initialization
-2011-11-21 14:13 source
+2011-03-21 10:44 source
- * Added support function for sponger to use dictionary for loading
- the main stream
+ * Fixed check if subselect has a recursive ref
-2011-11-21 14:10 source
+2011-03-18 10:51 source
- * Added argument to sparql_rdb2rdf_codegen() that describes the
- translation of graph IRIs
+ * Fixed use new pages & disk reads to trigger the startup values
-2011-11-21 13:43 source
+2011-03-17 16:30 source
- * Fixed use options to make a physical graph different than a virtual
+ * Added lax mode in csv import
-2011-11-17 14:41 source
+2011-03-17 13:55 source
- * Added aq_max_threads to sys_stat
+ * Fixed when removing a join from outer's branches, do that repeatedly
+ to remove all not needed. The recursion is done via sqlo_scope in
+ order to get new labels for columns in select list, so process does
+ not get confused by moving left part into FROM
-2011-11-17 14:39 source
+2011-03-17 13:53 source
- * Fixed do not reset memcache flag for non-numeric dtps
+ * Fixed when compiling a shared query, we must have a reset context
+ as it may jump from compiler outside of shared cache and leave
+ a mutex locked, thus eventually can get hang
-2011-11-16 15:27 source
+2011-03-16 10:34 source
- * Fixed expressions should use NOT NULL
+ * Fixed issue with partial index when no path is followed
-2011-11-16 10:24 source
+2011-03-14 15:52 source
- * FIxed if arg is already an XML entity, just copy it
+ * Fixed return byte[] data from column with datatype = DV_ANY
-2011-11-16 10:23 source
+2011-03-14 15:47 source
- * Fixed if dfe_tree is changed we cannot find the dfe later, so
- make full copy, modify and pass it on
+ * Fixed disable debug messages
-2011-11-16 10:21 source
+2011-03-14 15:46 source
- * Fixed integrity of graph security objects
+ * Fixed use dv_bin where needed like for dav-res
-2011-11-16 10:18 source
+2011-03-12 00:17 source
- * Fixed when left hand side of expr returns unknown, test the right hand
- side for false, if so then return false
+ * Fixed increase delay on sequential deadlock
-2011-10-28 23:28 source
+2011-03-12 00:17 source
- * Updated version to 6.1.4 for final release
+ * Fixed labels
-2011-10-28 23:22 source
+2011-03-11 18:26 source
- * Enabled check for bad index due to XML fragment
+ * Fixed use exclusive locks when doing sparul ops
-2011-10-28 23:21 source
+2011-03-11 13:08 source
- * Added information about upgrading from previous 6.1.x to 6.1.4
+ * Fixed comment about missing io sect
-2011-10-28 21:46 source
+2011-03-11 13:08 source
- * Fixed prototype
+ * Added retry deadlock if session is not flushed
-2011-10-28 21:41 source
+2011-03-11 13:07 source
- * Fixed datetime fraction
+ * Fixed do not do read ahead with less than 10k buffers available
-2011-10-28 21:10 source
+2011-03-11 12:17 source
- * Rebuild drivers
+ * Fixed if no free buffer available, signal an error
-2011-10-28 16:09 source
+2011-03-11 11:28 source
- * Fixed disable strict void var checking as /fct sometimes generates
- undefined vars
+ * Fixed do not do read-ahead on extent map
-2011-10-28 16:00 source
+2011-03-10 23:24 source
- * Added support for setting syslog facility
+ * Added index to search over label text
-2011-10-28 15:56 source
+2011-03-09 16:41 source
- * Fixed call auth check only when needed
+ * FIxed _java_ should not have effect on select
-2011-10-28 15:55 source
+2011-03-08 15:46 source
- * Fixed flags for ods
+ * Fixed labels in value side
+ * Fixed pages to pass W3C validator (mostly)
+ * Fixed check for integers
+ * FIxed xml excape will happen on <?V use
-2011-10-28 13:16 source
+2011-03-08 15:44 source
- * Added common function for testing extensions for rdfxml
+ * Fixed hide value ranges option for now
-2011-10-28 13:14 source
+2011-03-08 15:43 source
- * Fixed encoding issues
+ * Fixed copyright year
-2011-10-26 15:38 source
+2011-03-08 14:32 source
- * Added new UI for conditionals like = < > ranges and IN
- * Added initial UI for geo based conditionals
- * Added support for proper permalink
- * Added Twitter, Facebook and Google+ share buttons to footer
- * Added version info to footer
+ * Added missing files to distribution
-2011-10-26 15:22 source
+2011-03-08 13:56 source
- * Added AddThis share buttons
+ * Added workaround to tell _JAVA_ driver the input is string as it is
+ confused on DV_ANY and breaks utf-8 support
-2011-10-26 09:34 source
+2011-03-08 13:44 source
- * Fixed Compiled for line in usage
- * Fixed compiler warning
+ * Added quick rule to check version string
-2011-10-26 00:21 source
+2011-03-08 13:44 source
- * Updated documentation
+ * Rebuild driver
-2011-10-26 00:00 source
+2011-03-08 13:44 source
- * Fixed run check init on local
+ * Fixed only allow URI or Blank nodes as subjects
-2011-10-25 23:56 source
+2011-03-08 13:38 source
- * Fixed package uninstall
+ * Added additional crawler params
+ * Fixed show status without errors
+ * Fixed label
-2011-10-25 23:56 source
+2011-03-08 13:36 source
- file syncml_drop.sql was added on branch V6_0_0-DEVEL on 2011-10-25 23:58:36 +0000
+ * Added Described By
+ * Added ProductWiki cartridge
+ * Fixed do not use triple dicts on long files
+ * Fixed OWL
+ * Fixed labels
+ * Fixed minor issues
-2011-10-25 23:54 source
+2011-03-08 13:24 source
- * Added async rdf extraction
+ * Updated to CKeditor version 3.5.2
-2011-10-25 23:36 source
+2011-03-08 13:08 source
- * Added opl:mentions and opl:NamedEntity class to OpenLink Attribution
+ * Added map markers for various types of things
+ * Added a smaller throbber animated gif
+ * Fixed resizing issue for mobile browsers
+ * Fixed bug in processing item title HREFs in map popup
+ * Fixed bugs in marker selection code using rtb:useMarker
-2011-10-25 23:31 source
+2011-03-08 12:48 source
- file location.js was added on branch V6_0_0-DEVEL on 2011-10-25 23:37:37 +0000
+ * Fixed mime types
+ * Fixed mail rendering
-2011-10-25 23:31 source
+2011-03-08 12:47 source
- * Added missing location support
+ * Fixed attendees
-2011-10-25 23:28 source
+2011-03-08 12:47 source
- * Added finger print from twitter entry
- * Fixed minor issues
+ * Fixed Twitter and LinkedIn registration/login
+ * Fixed RDF object properties
+ * Fixed UI
+ * Fixed escape params
+ * Fixed scroll bars
-2011-10-25 23:28 source
+2011-03-08 12:35 source
- file twitter_fp2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-10-25 23:36:21 +0000
+ * Added support for AddThis
+ * Added manual mode for entering location when automatic location fails
+ * Added more geocoding support
+ * Fixed location timeout to 10 sec
+ * Fixed location popup
+ * Fixed text when Javascript is not enabled
+ * Fixed bug in management of user settings
+ * Fixed bugs in session persistance
-2011-10-25 23:25 source
+2011-03-08 12:24 source
- * Added support for Google+ comments
+ * Fixed debug defines
-2011-10-25 23:20 source
+2011-03-08 12:19 source
- * Fixed when dropping a graph, also check if there is a quad map for it
- * Fixed move all cols in pk rdf view sel
- * Fixed handling of syncml functionality
- * Fixed labels
+ * Added support for robots.txt
-2011-10-25 19:36 source
+2011-03-08 12:18 source
- * Added new implementation of search_excerpt that can handle both
- ANSI/UTF8 and Wide strings
+ * Fixed update crawler entries using id and avoid table scans
-2011-10-25 10:54 source
+2011-03-08 11:52 source
- * Fixed problems re-creating quad map
+ * Fixed size of input buffer of an XML parser is now adaptive
-2011-10-21 12:03 source
+2011-03-08 10:38 source
- * Fixed drop stmt gr
-
-2011-10-21 11:53 source
-
- * Fixed bad conversion of utf8 in rdf/xml
-
-2011-10-19 15:22 source
-
- * Fixed dtp check
-
-2011-10-19 15:18 source
-
- * Fixed reset bitmap flag as previous insert might have set it to true
-
-2011-10-19 15:14 source
-
- * Fixed missing cast
-
-2011-10-18 12:45 source
-
- * Fixed if one column cannot fit into available space, then instead
- of guessing how much space is needed we calculate space for all
- columns which cannot fit
-
-2011-10-18 12:41 source
-
- * Fixed error adding inherited roles as they can overlap
-
-2011-10-18 09:15 source
-
- * Updated default settings file
-
-2011-10-17 15:50 source
-
- * Fixed issue building with Mono
-
-2011-10-17 14:06 source
-
- * Fixed log info about row state
-
-2011-10-17 09:55 source
-
- * Fixed labels
-
-2011-10-17 09:48 source
-
- * Fixed issue with SPASQL and ADONET3 named parameters
- * Fixed ADO.Net Provider failure retrieving RDF datetime literal values
- * Removed duplicate functions
-
-2011-10-14 17:02 source
-
- * Fixed issue with rdfview generation
-
-2011-10-14 12:54 source
-
- * Fixed if BeginTransaction is called with an Unspecified isolation
- level, use a default of ReadCommitted
-
-2011-10-14 12:47 source
-
- * Fixed recompile all qr's cached on cli connection when dropping
- a group or creating new graph group
-
-2011-10-14 10:33 source
-
- * Fixed labels
-
-2011-10-14 00:32 source
-
- * Fixed missing Diagnostic
-
-2011-10-13 22:14 source
-
- * Rebuild driver
-
-2011-10-13 22:07 source
-
- * Upgraded driver to Sesame 2.5.1
-
-2011-10-13 22:07 source
-
- file VirtuosoOperation.java was added on branch V6_0_0-DEVEL on 2011-10-13 22:49:22 +0000
-
-2011-10-13 22:07 source
-
- file VirtuosoUpdate.java was added on branch V6_0_0-DEVEL on 2011-10-13 22:49:22 +0000
-
-2011-10-13 18:36 source
-
- * Added new Google+ cartridge
- * Added new Jigsaw cartridge
- * Added gr:Brand information to Ebay cartridge
- * Added money class similar to GoodRelations prices for Crunchbase
- * Fixed handling of HTTPS Groupon URIs
- * Fixed do not immediately index in normal mode
- * Fixed eBay URL-schemes
- * Fixed MIME type for JSON-LD
- * Fixed documentation
- * Removed CRLF
-
-2011-10-13 18:33 source
-
- * Added new tabs to Linked Data
- * Added PSH tabs
- * Fixed labels and texts
-
-2011-10-13 18:32 source
-
- * Fixed issue displayong characters in isql.vspx
-
-2011-10-13 18:29 source
-
- * Fixed uninitialized var
-
-2011-10-13 18:28 source
-
- * Added support for ms-author-va : sparql header
- * Fixed use new virtuoso_ini_item_value
- * Fixed set id of current user
- * Fixed issue compiling stored procedure
-
-2011-10-13 17:09 source
-
- file VirtuosoDateTime.cs was added on branch V6_0_0-DEVEL on 2011-10-13 18:26:27 +0000
-
-2011-10-13 17:09 source
-
- file VirtuosoDateTimeOffset.cs was added on branch V6_0_0-DEVEL on 2011-10-13 18:26:27 +0000
-
-2011-10-13 17:09 source
-
- file VirtuosoTimeSpan.cs was added on branch V6_0_0-DEVEL on 2011-10-13 18:26:27 +0000
-
-2011-10-13 17:08 source
-
- * Added support for VirtuosoDateTime, VirtuosoDateTimeOffset and
- VirtuosoTimeSpan
- * Fixed issue with dropped connection after multiple bad login attempts
- * Fixed dispose methods should never throw an exception
- * Fixed drop statement in Virtuoso when it is disposed in the provider
-
-2011-10-13 16:52 source
-
- * Fixed copyright year to 2011
-
-2011-10-13 16:50 source
-
- * Fixed buggy comparison when installing VAD packages
-
-2011-10-13 16:48 source
-
- * Added stats for time waiting on a mutex
-
-2011-10-13 16:35 source
-
- file googleplus2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-10-13 18:36:28 +0000
-
-2011-10-13 16:35 source
-
- file oplgoogleplus.owl was added on branch V6_0_0-DEVEL on 2011-10-13 18:36:28 +0000
-
-2011-10-13 16:29 source
-
- * Removed duplicate stored procedures
-
-2011-10-13 14:39 source
-
- * Fixed use openssl md5 where available
-
-2011-10-13 14:24 source
-
- * Fixed check for min async queue size
-
-2011-10-13 14:21 source
-
- * Added new setting RdfFreeTextRulesSize
-
-2011-10-13 14:08 source
-
- * Fixed execute on all partitions at same time
-
-2011-10-13 14:06 source
-
- * Fixed undefined Inference rule error when rule created from graph
- created from SPARUL insert statement
- * Fixed issue loading inf rules on cluster
-
-2011-10-13 14:00 source
-
- * Added support to sql_bif_excerpt for using wide string
-
-2011-10-13 13:59 source
-
- * Fixed memleak
-
-2011-10-13 13:58 source
-
- * Fixed issue with fulltext indexing
-
-2011-10-13 13:56 source
-
- * Fixed issue with bif:contains
-
-2011-10-13 13:54 source
-
- * Fixed deadlock on attempt of qr_recompile during the run of
- SPARQL-to_SQL front-end
-
-2011-10-13 13:28 source
-
- * Fixed http recording
-
-2011-10-13 13:27 source
-
- * Fixed crash when array is bad
-
-2011-10-13 13:26 source
-
- * Fixed function name in argument
-
-2011-10-13 13:11 source
-
- * Fixed SSL verification context
-
-2011-10-13 13:00 source
-
- * Added inproved support for inference and RDF views to "non-default"
- storages
- * Added option to register pos-processing callbacks to DESCRIBE
-
-2011-10-13 12:54 source
-
- * Added new BIF functions for handling dictionaries of triples
-
-2011-10-13 12:15 source
-
- * Added iri range size setting
-
-2011-10-13 12:14 source
-
- * Added new "mode" flag to TURTLE parser, so it adds source line
- numbers (and source text labels) to blank nodes of the parsed
- document
-
-2011-10-13 12:12 source
-
- * Fixed check for DAV
-
-2011-10-13 11:09 source
-
- * Added dbs id hash to log
-
-2011-10-13 11:05 source
-
- * Fixed compiler warning
-
-2011-10-13 11:04 source
-
- * Fixed private key protection
-
-2011-10-13 11:03 source
-
- * Fixed checks
-
-2011-10-13 11:03 source
-
- * Fixed inlist to mean equality, not a lt of the one_of_these call
- comparison
-
-2011-10-13 11:01 source
-
- * Fixed label
-
-2011-10-13 11:00 source
-
- * Fixed use cartridge if such is defined
-
-2011-10-13 10:59 source
-
- * Fixed moved assignment before loop, as sqlerror can lead to a
- double free
-
-2011-10-13 10:58 source
-
- * Fixed issue with foreignkey handling inside rdfview
-
-2011-09-28 17:04 source
-
- * Rewrite HTML generation for /sparql endpoint
-
-2011-09-28 17:01 source
-
- * Added new function virtuoso_ini_item_value which can read settings
- from the virtuoso.ini, without having to open/parse it for every
- request
-
-2011-09-27 12:14 source
-
- file sec_acl_edit_sp.vspx was added on branch V6_0_0-DEVEL on 2011-10-13 18:33:27 +0000
-
-2011-09-27 12:14 source
-
- file sec_auth_serv_sp.vspx was added on branch V6_0_0-DEVEL on 2011-10-13 18:33:27 +0000
-
-2011-09-27 09:42 source
-
- * Fixed sql codegen for combination of SERVICE {} that binds a
- variable and OPTIONAL {} that uses it later, and the binding in
- SERVICE is the only non-nullable binding of that variable
- cvs: ----------------------------------------------------------------------
-
-2011-09-27 09:40 source
-
- * Fixed do not cache samples indefinitely
-
-2011-09-23 19:22 source
-
- * Added initial support for filtering on value ranges
- * Added new export formats
- * Fixed MIME type for JSON-LD
- * Fixed use lang for properties labels
- * Fixed pretty-print query
- * Fixed check for owl:Class
- * Fixed label prefs and metadata
- * Fixed footer
-
-2011-09-23 19:12 source
-
- * Added extra mime types to accept header
-
-2011-09-23 15:20 source
-
- * Fixed overflow in bif_date_diff
-
-2011-09-22 18:57 source
-
- file jigsaw2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-10-13 18:36:28 +0000
-
-2011-09-22 18:57 source
-
- file oplmoney.owl was added on branch V6_0_0-DEVEL on 2011-10-13 18:36:28 +0000
-
-2011-09-21 15:23 source
-
- * FIxed do not make UNAMEs in SQL texts immortal
-
-2011-09-21 15:22 source
-
- * Fixed must save IN list as it will be reset to 0 inside
-
-2011-09-21 13:27 source
-
- * Fixed use len of the N leading chars represented as UTF8
-
-2011-09-21 13:23 source
-
- * Added support for DV_BIN
-
-2011-09-20 12:03 source
-
- * Fixed issues detecting images
-
-2011-09-20 11:58 source
-
- * Fixed handling of sparql endpoint in Pivot permalink generation
-
-2011-09-19 13:37 source
-
- * Fixed do not check byte-order on crash recovery replay
-
-2011-09-15 16:02 source
-
- * Updated version to 6.1.4-rc1
-
-2011-09-15 10:42 source
-
- * Fixed mem leaks
-
-2011-09-14 19:06 source
-
- * Fixed uninitialized variable
-
-2011-09-14 15:38 source
-
- * Fixed memory leaks
-
-2011-09-14 15:38 source
-
- * Fixed valgrind warning when using DEBUG
-
-2011-09-13 14:50 source
-
- * Fixed memory leaks
-
-2011-09-12 21:05 source
-
- * Fixed GPF on optimization of DELETE/INSERT/MODIFY due to lists
- of known vars that were not deALIASed properly
-
-2011-09-12 20:08 source
-
- * Added log when built-in procedure has duplicate in the db
-
-2011-09-12 20:04 source
-
- * Fixed removed duplicate procedures
-
-2011-09-12 20:01 source
-
- * Fixed crash
-
-2011-09-12 12:30 source
-
- * Fixed mime type of JSON-ld to application/ld+json
-
-2011-09-12 11:02 source
-
- * Updated documentation
-
-2011-09-12 10:52 source
-
- * Fixed use available non-expiring access token
- * Fixed drilldown through Posts (including posted links) to show
- associated comments
- * Fixed removed oplcb:competitor property from its oplcb:competition
- wrapper and dropped latter
- * Fixed use dbpedia:author property when handling books
- * Fixed use string session with serialized XML for large csv files
-
-2011-09-12 10:47 source
-
- * Added initial support for PHP 5.3
-
-2011-09-12 10:36 source
-
- * Fixed indentation
-
-2011-09-12 10:28 source
-
- * Fixed use shorter names
-
-2011-09-12 10:21 source
-
- * Fixed WebID demo pages
-
-2011-09-09 14:09 source
-
- * Updated documentation
-
-2011-09-09 13:30 source
-
- * Fixed warning about uninitialized data
-
-2011-09-09 13:21 source
-
- * Added option for explicit graph
- * Fixed SyncML Folder Types in drop-down list
- * Fixed labels
-
-2011-09-09 13:20 source
-
- * Fixed do not remove trailing cr/lf
-
-2011-09-09 13:19 source
-
- * Fixed issue when dirname is a blob
-
-2011-09-09 13:12 source
-
- * Added dbpedia:author property when handling books
- * Fixed ACL rule */* allows everybody
- * Fixed Facebook auth
- * Fixed use string session with serialized XML for large csv files
- * Fixed map OpenLink Zillow ontology to geo:lat/long
- * Fixed map oplog:likes_XXX property to like:likes
-
-2011-09-09 13:11 source
-
- * Added support for switchable favicon to Sponger front page
-
-2011-09-09 12:51 source
-
- * Fixed issues with linked data upload
-
-2011-09-09 11:16 source
-
- * Added HTTP status codes in SPARQL graph store protocol
-
-2011-09-09 11:13 source
-
- * Fixed issue with SPARUL LOAD INTO command creating duplicate graphs
-
-2011-09-09 00:10 source
-
- * Fixed issue when pragma list was empty
- * Fixed issues generating Pivot Permalink
- * Fixed whitespace and stray > char from Raw formats line
-
-2011-09-08 18:54 source
-
- * Fixed handling of GROUP BY and ORDER BY using expressions
-
-2011-09-08 15:29 source
-
- * Fixed re-definition of a quad map that is a single user of a quad
- map format
-
-2011-09-08 15:28 source
-
- * Fixed codegeneration issue with awk 4.0
-
-2011-09-08 12:51 source
-
- * Fixed UI for sponger options
-
-2011-09-08 12:19 source
-
- * Fixed issue with sparql LOAD from file
-
-2011-09-07 22:44 source
-
- * Fixed crash running FILTER query containing IN clause with only
- one item in it
- * Fixed issue with ORDER BY expression optimization
-
-2011-09-05 15:27 source
-
- * Added test for empty graph result
- * Added margins for RDF mini browser container
- * Added check for existence of sparql_cxml to enable display of CXML
- result link
- * Replaced default AJAX throbber with new OAT Notify
- * Fixed undef variable causing dereference control malfunction
- * Fixed layout bug causing the dereference mode control hiding behind
- a block
-
-2011-09-05 15:26 source
-
- * Added support for replacing existing content on OAT.Notify.send
-
-2011-09-05 15:23 source
-
- file notify-throbber.gif was added on branch V6_0_0-DEVEL on 2011-09-05 15:27:50 +0000
-
-2011-08-30 15:02 source
-
- * Fixed issue with code generation using gawk 4
-
-2011-08-29 10:37 source
-
- * Added Google Place cartridge
- * Added Seatgeek cartridge
- * Added API for selective sponging
- * Added Google+ button
- * Added menu item linking direct to 'How it Works'
- * Fixed bug when offline_access=1 not present in OpenGraph cartridge
- * Fixed access token requests now request permission to read user and
- friend checkins
- * Fixed complete rdf boxes when looking for label
- * Fixed lang use for comment
- * Fixed missing block op
- * Fixed minor issues
-
-2011-08-29 10:27 source
-
- * Added support for anytime query (timeout) on virtuoso
- * Added CSS for pushbar notify
- * Fixed bug with updated maxrow value not being passed
- * Fixed dereferencing preference dropdown disappearing when paging
- between results
- * Fixed cosmetics
-
-2011-08-29 10:23 source
-
- * Added support for oplzilw:latitude and longitude
- * Fixed rdftabs notification to use PUSHBAR
- * Fixed problem in geo coordinates detection
-
-2011-08-29 10:22 source
-
- * Added new option to rdfmini to facilitate placing of view control
- outside its container
-
-2011-08-29 10:21 source
-
- * Added new notification widget types PUSHBAR and BAR
- * Added target class for notify content for skinning
-
-2011-08-29 10:19 source
-
- * Added support for HEAD requests in AJAX
-
-2011-08-29 10:18 source
-
- * Added limit to number of open statements
-
-2011-08-26 19:34 source
-
- * Fixed if we have a wide string and want typed string we cast to utf-8
-
-2011-08-26 18:04 source
-
- * Fixed /sparql/ endpoint to produce more accurate diagnostics for
- failed INSERT DATA statements
-
-2011-08-26 18:03 source
-
- * Fixed timeout should be specified in miliseconds according to docs
-
-2011-08-26 17:59 source
-
- * Added limit to number of open statements
-
-2011-08-26 17:57 source
-
- * Added mem debug support for sqlp_box_id_upcase
-
-2011-08-26 17:55 source
-
- * Fixed memory leak
-
-2011-08-26 10:58 source
-
- * Fixed crash when un-expected array is passed as argument
-
-2011-08-26 10:57 source
-
- * Fixed loading member functions of UDT that refer to XML namespace
- declarations and other items loaded after the loading of the UTD
- declaration
-
-2011-08-26 10:54 source
-
- * Fixed issue with trim('test', null)
-
-2011-08-23 12:24 source
-
- file google_place2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-08-29 10:37:48 +0000
-
-2011-08-23 12:24 source
-
- file seatgeek2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-08-29 10:37:48 +0000
-
-2011-08-21 12:54 source
-
- * Added initial code for timeout handling
- * Added param to control the anchor mode, persisted in permalinks.
- * Added anchor mode to pass the URL to /describe
- * Added missing URI encoding in some generated links/queries
- * Fixed "aliased" qtxt URL param
- * Fixed re-enabled anchor mode to control what to do when dereferencing links.
- * Fixed try to set values of nonexisting UI objects in /view
- * Fixed visibility of footer in /view
-
-2011-08-21 12:52 source
-
- * Fixed display of RDF store stats
-
-2011-08-21 12:51 source
-
- * Fixed set default anchorMode back to 0
-
-2011-08-21 12:50 source
-
- * Fixed footer background
-
-2011-08-21 12:50 source
-
- * Added MSG MAP_NOTHING_TO_SHOW to rdftabs Map widget
- * Added MAP_NOTHING_TO_SHOW to rdfmini by switching to default viewer
- * Added references in map popups
- * Added function to detect nodes that only contain coordinates
- * Fixed bugs in getContent link generation
- * Fixed removed attempt to resolve item references throught recursion
- * Fixed drawMarker to extract properties from referencing node when node contains only
- coordinate data
- * Fixed structure of rdftabs marker popups
- * Fixed make properties list scrollable instead of whole window
-
-2011-08-21 12:34 source
-
- * Rebuild drivers
-
-2011-08-21 12:33 source
-
- * Removed deprecated functions and files
-
-2011-08-18 09:16 source
-
- * Fixed connection leak in connection pool during long checkpoints
-
-2011-08-17 17:46 source
-
- * Fixed memory leak in statement when using connectionpooling
-
-2011-08-17 17:36 source
-
- * Rebuild drivers
-
-2011-08-17 17:20 source
-
- * Rebuild driver
-
-2011-08-17 17:20 source
-
- * Updated hibernate support to work with Hibernate 3.6.6-Final
-
-2011-08-15 15:30 source
-
- * Fixed bad merge
-
-2011-08-14 14:48 source
-
- * Fixed check for NULL IRI before printing
-
-2011-08-09 11:19 source
-
- * Fixed indentation and whitespace
-
-2011-08-09 11:17 source
-
- * Fixed missing namespave declarations
-
-2011-08-09 11:11 source
-
- * Fixed minor issue
-
-2011-08-09 10:58 source
-
- * Added SimpleGeo cartridge
- * Added Eventful cartridge
- * Fixed use standard properties for Latitude and Longitude
- * Fixed use /about to sponge URL
-
-2011-08-05 21:33 source
-
- file simplegeo2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-08-09 10:58:33 +0000
-
-2011-08-03 11:36 source
-
- * Added show photo in WebID login/registrer
- * Fixed typo in messages
- * Fixed facebook accounts
-
-2011-08-03 11:34 source
-
- * Added missing files
-
-2011-08-03 11:34 source
-
- file mc.vsp was added on branch V6_0_0-DEVEL on 2011-08-03 11:42:19 +0000
-
-2011-08-03 11:34 source
-
- file mv.vsp was added on branch V6_0_0-DEVEL on 2011-08-03 11:42:19 +0000
-
-2011-08-02 12:05 source
-
- file eventful2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-08-09 10:58:33 +0000
-
-2011-08-01 14:19 source
-
- * Added Twitter cartridge using OAuth and Twitter REST api
- * Added XRD cartridge
- * Added Google Profile cartridge
- * Fixed use OG community page as starting point for facebook OpenGraph
- cartridge
- * Fixed minor issues
-
-2011-08-01 14:17 source
-
- * Added check for XML
- * Fixed update must do delta and remove all entries which are not
- from this source
-
-2011-08-01 14:15 source
-
- * Fixed SIOC data
-
-2011-08-01 14:13 source
-
- * Updated CKeditor to version 3.6.1
-
-2011-08-01 14:12 source
-
- * Added RDF links in header and head
-
-2011-08-01 14:12 source
-
- * FIxed Delicious publish
-
-2011-08-01 14:09 source
-
- * Fixed undefined function
-
-2011-08-01 14:08 source
-
- * Added user/mail availablitiy action
- * Added mail verification service
- * Fixed WebID login and registration
- * Fixed Facebook accounts
- * Fixed order tabs and labels
- * Fixed SIOC RDF links API functions
-
-2011-08-01 14:05 source
-
- * Added ACL eXecute flag
- * Fixed ACl issue with editing .acl file
- * Fixed API functions
-
-2011-08-01 14:04 source
-
- * Fixed encryption and signing
- * Fixed security properties
- * Fixed mail parameters
-
-2011-08-01 13:18 source
-
- * Fixed throw away old content before starting execute
-
-2011-08-01 13:14 source
-
- file google_profile2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-08-01 14:19:28 +0000
-
-2011-08-01 13:14 source
-
- file xrd-generic.xsl was added on branch V6_0_0-DEVEL on 2011-08-01 14:19:28 +0000
-
-2011-08-01 13:11 source
-
- file opltwitter.owl was added on branch V6_0_0-DEVEL on 2011-08-01 14:19:28 +0000
-
-2011-08-01 13:11 source
-
- file twitter_access_token.vsp was added on branch V6_0_0-DEVEL on 2011-08-01 14:19:28 +0000
-
-2011-08-01 13:11 source
-
- file twitter_rest_api2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-08-01 14:19:28 +0000
-
-2011-07-29 10:04 source
-
- * Fixed debug code
-
-2011-07-29 10:03 source
-
- * Fixed must redirect on OPTIONS
-
-2011-07-29 10:03 source
-
- * Fixed calculate lenght before inserting the row
-
-2011-07-29 10:00 source
-
- * Fixed unnamed GPF
-
-2011-07-20 15:56 source
-
- * Added check for %nn
-
-2011-07-20 09:50 source
-
- * Added Idp
- * Added Domain check
- * Added WebID
-
-2011-07-20 09:26 source
-
- file idp_s_1.xml was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:19 +0000
-
-2011-07-20 09:26 source
-
- file webid_demo.html was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:19 +0000
-
-2011-07-20 09:26 source
-
- file webid_demo.html was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:20 +0000
-
-2011-07-20 09:26 source
-
- file webid_demo.php was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:20 +0000
-
-2011-07-20 09:26 source
-
- file webid_demo.vsp was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:20 +0000
-
-2011-07-20 09:26 source
-
- file dc_s_1.sql was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:19 +0000
-
-2011-07-20 09:26 source
-
- file dc_s_1.xml was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:19 +0000
-
-2011-07-20 09:26 source
-
- file dc_s_1_sample.vsp was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:19 +0000
-
-2011-07-20 09:26 source
-
- file idp_s_1.vsp was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:19 +0000
-
-2011-07-20 09:26 source
-
- file options.xml was added on branch V6_0_0-DEVEL on 2011-07-20 09:50:19 +0000
-
-2011-07-20 08:58 source
-
- * Added Hyperpublic cartridge
-
-2011-07-20 08:58 source
-
- file hyperpublic2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-07-20 09:55:07 +0000
-
-2011-07-20 08:56 source
-
- * Added configuration option for page title
-
-2011-07-20 08:51 source
-
- * Added webid_check option to control execution flag
-
-2011-07-20 08:51 source
-
- * Fixed problems with big tokens
-
-2011-07-20 08:29 source
-
- * Added support for dumping v5 in v6 log format
-
-2011-07-20 00:01 source
-
- * Reverted merge from wrong branch
-
-2011-07-19 23:58 source
-
- * Fixed DV_RDF serialization
-
-2011-07-19 23:43 source
-
- * Fixed small issue for single engine
-
-2011-07-19 23:40 source
-
- * Added new aggregate DB.DBA.GROUP_DIGEST which makes it possible
- to return part of big output of DB.DBA.GROUP_CONCAT without
- running out of row length limits
-
-2011-07-19 23:38 source
-
- * Added support to call XPath/XQuery functions in SPARQL
- * Added bif functions xpath_funcall and xpath_apply
-
-2011-07-19 23:34 source
-
- * Fixed moved macros isdatechar, isfloatchar and inplainURIchar
-
-2011-07-19 23:33 source
-
- * Added option 'exec_as_get' to http map
- * Added support for SPARQL Graph CRUD
-
-2011-07-19 23:30 source
-
- * Added function isfinitenumeric()
-
-2011-07-19 23:30 source
-
- * Fixed memleak
-
-2011-07-19 23:29 source
-
- * Fixed compiler warnings
-
-2011-07-19 23:27 source
-
- * Added optimized codegen for built-in aggregate functions
-
-2011-07-19 23:26 source
-
- * Fixed DV_RDF serializationo
- * Added upgrade procedure for RDF_QUAD
-
-2011-07-19 19:36 source
-
- * Added generic function to describe objects
- * Fixed check to see if ssl is in effect
- * Fixed use proper case as sparql is always using quoted identifiers
-
-2011-07-19 19:27 source
-
- * Fixed bug in endpoint setting persistence
- * Fixed visibility of pager in navigator
- * Improved recovery from some proxy-AJAX-related errors
-
-2011-07-19 19:25 source
-
- * Changed handling of anchors in map bubbles
-
-2011-07-15 11:17 source
-
- * Added missing opl:provided by property
-
-2011-07-15 11:16 source
-
- * Added option to set site logo in banner text
- * Added new serialization format examples
-
-2011-07-15 11:15 source
-
- * Added Seevl cartridge
- * Added Guardian cartridge
-
-2011-07-15 11:15 source
-
- * Fixed minor issue
-
-2011-07-15 11:07 source
-
- * Added new export formats
-
-2011-07-15 11:06 source
-
- * Added generation of CV from LinkedIn using the oplcv ontology
-
-2011-07-15 11:05 source
-
- file guardian2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-07-15 11:15:47 +0000
-
-2011-07-15 11:05 source
-
- file seevl2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-07-15 11:15:47 +0000
-
-2011-07-15 11:02 source
-
- * Added OpenLink CV/Resume ontology
-
-2011-07-15 11:02 source
-
- file oplcv.owl was added on branch V6_0_0-DEVEL on 2011-07-15 11:14:01 +0000
-
-2011-07-14 19:14 source
-
- * Fixed use the actual length of the string in cli_utf82narrow not max len
-
-2011-07-13 19:09 source
-
- * Added check for cert
-
-2011-07-12 14:46 source
-
- * Fixed extra debugging
-
-2011-07-08 13:44 source
-
- * Merged first part of V7
-
-2011-07-05 21:09 source
-
- * Fixed GPF as stmt not available at this point
-
-2011-07-04 09:59 source
-
- * Fixed XML escape data
- * Fixed issues with mail addresses and encrypted mails
-
-2011-07-04 09:57 source
-
- * Added header and head links for IRIs
-
-2011-07-04 09:56 source
-
- * Added header and head procedures for IRI URLs
- * Added new ODS rewrite rules
- * Fixed get CA from connection if not set
- * Fixed ACL using patterns
- * Fixed default cert login
- * FIxed take relevant webid
- * Fixed Offers
-
-2011-07-04 09:54 source
-
- * Added LinkedIn cartridge
- * Added linkedIn access token
- * Added Zoopla cartridge
- * Added new pattern for Eventbrite
- * Added support for acct scheme
- * Adjustments to OpenGraph RDF mappings and additions to OpenGraph ontology
- * Fixed Yelp cartridge
- * Fixed minor issuesdded additional checks for RDFa
- * Fixed use origin as a base, not graph
- * Fixed protection against bad datetime offsets returned by OpenGraph
- CV: ----------------------------------------------------------------------
-
-2011-07-04 09:33 source
-
- * Added loading NS prefixes into IRIDB through virtuoso defaults page
-
-2011-07-04 09:31 source
-
- file linkedin2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-07-04 09:54:06 +0000
-
-2011-07-04 09:31 source
-
- file linkedin_access_token.vsp was added on branch V6_0_0-DEVEL on 2011-07-04 09:54:05 +0000
-
-2011-07-04 09:31 source
-
- file opllinkedin.owl was added on branch V6_0_0-DEVEL on 2011-07-04 09:54:04 +0000
-
-2011-07-04 09:31 source
-
- file zoopla2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-07-04 09:54:06 +0000
-
-2011-06-29 10:10 source
-
- * Fixed cannot perform file_stat as it runs on a different node
-
-2011-06-27 19:45 source
-
- * Added nsprefix and rulelist pages
-
-2011-06-27 11:24 source
-
- * Fixed do not perform keyset update on non pk ref
-
-2011-06-24 19:05 source
-
- * Added initial support for HTML+Microformat, Microformat/JSON and
- JSON-LD output formats
-
-2011-06-24 11:25 source
-
- * Added result type detection
- * Fixed SVG capability detection
-
-2011-06-24 11:25 source
-
- * Fixed .isparql serialization in FF4 and IE9
-
-2011-06-24 11:24 source
-
- * Fixed JSON output for native parsers
-
-2011-06-24 11:22 source
-
- * Added prefix for http://www.w3.org/2002/07/owl# (owl:)
- * Added prefix for http://www.openlinksw.com/schemas/rdfs/ (oplrdfs:)
- * Fixed prefix handling in IRIDB, rdfstore and rdftabs
-
-2011-06-24 11:20 source
-
- * Fixed MSIE detection in opacity anim
-
-2011-06-24 11:20 source
-
- * Fixed handling of decoding url values with + instead of spaces
-
-2011-06-22 13:30 source
-
- * Fixed no not crash when key is empty
-
-2011-06-22 13:29 source
-
- * Fixed check for NULL pred
-
-2011-06-21 18:11 source
-
- * Fixed make sure all required dfe are placed before making a decision
-
-2011-06-20 19:27 source
-
- * Fixed replay as we need to take into account non txn mode
-
-2011-06-20 19:25 source
-
- * Fixed memory leak
-
-2011-06-20 14:15 source
-
- * Fixed cast to uint32 instead of long as this is a serialized type
-
-2011-06-17 15:21 source
-
- * Fixed when sas, O is considered to be an iri
-
-2011-06-17 15:20 source
-
- * Fixed if result is empty but input is same variable as input then
- pesumable we have distinct and have to send input
-
-2011-06-17 00:11 source
-
- * Fixed placement of ifdef
-
-2011-06-16 22:53 source
-
- * Added check for errors on bitmap insert
-
-2011-06-13 14:25 source
-
- * Fixed if too many cursors, do not crash server, just kill txn
-
-2011-06-13 09:31 source
-
- * Fixed "delayed" filters like
- ?x p1 ?o1 ; p2 ?o2 . optional { ... } . filter (?o1 = ?o2)
-
-2011-06-13 09:29 source
-
- * Added function to backup index to log
-
-2011-06-11 16:41 source
-
- * Added support for SQLQUERY syntax in declaration of RDF views
- * Fixed SQL codegen bug in SPARQL queries of R2RML rewriter
-
-2011-06-11 16:39 source
-
- * Fixed issue with variable argument list
-
-2011-06-11 16:28 source
-
- * Fixed fill can get out of bounds
-
-2011-06-10 22:45 source
-
- * Fixed disable debug code from standard binary
-
-2011-06-10 22:44 source
-
- * Fixed skip rules which perform http redirect when doing a POST
-
-2011-06-10 21:39 source
-
- * Fixed check if instance has trx and it has thread, else we do not
- run
-
-2011-06-09 17:41 source
-
- * Fixed problem with non-existing item and get API function
- * Fixed myA JS error
-
-2011-06-09 17:39 source
-
- * Added tooltop for 'Language' property
- * Fixed 'My Offers' typo
- * Fixex get CA from connection if not set
- * Fixed myA JS error
- * Fixed error message
- * Fixed check name when uload private key
-
-2011-06-09 17:26 source
-
- * Fixed crash when trying to unbox non-boxed item from tree
-
-2011-06-09 15:32 source
-
- * Added sponger splash page
-
-2011-06-09 15:29 source
-
- file linked_data_gen_opts3a.png was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file linkeddata.jpg was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file linkedin.jpg was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file openlinklogo_wstrap_2008_100h.png was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file sponger_frontpage.css was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file twitter.jpg was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file webfinger.png was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file webid_icon.png was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file cartridge_config.jpg was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- file delicious.png was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- file facebook_icon.jpg was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- file flickr.jpg was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- file google.jpg was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- file help_button.gif was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:38 +0000
-
-2011-06-09 15:29 source
-
- file sponge_uri.vsp was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- file sponger_architecture.vsp was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- file sponger_setup.vsp was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- file examples.vsp was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:36 +0000
-
-2011-06-09 15:29 source
-
- file fb_access_token_popup.vsp was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:36 +0000
-
-2011-06-09 15:29 source
-
- file index.vsp was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:36 +0000
-
-2011-06-09 15:29 source
-
- file jquery.js was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:36 +0000
-
-2011-06-09 15:29 source
-
- file sponge_flickr.vsp was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:36 +0000
-
-2011-06-09 15:29 source
-
- file sponge_social_profile.vsp was added on branch V6_0_0-DEVEL on 2011-06-09 15:35:37 +0000
-
-2011-06-09 15:29 source
-
- * Added sponger splash page
- * Fixed minor issues
-
-2011-06-09 13:27 source
-
- * Added option to enable/disable ?P statistics
-
-2011-06-09 13:25 source
-
- * FIxed added option to enable/disable ?P statistics
-
-2011-06-09 13:24 source
-
- * Fixed memory leak
-
-2011-06-07 18:53 source
-
- * Fixed compiler warning
-
-2011-06-07 18:52 source
-
- * Added new functions
-
-2011-06-07 18:51 source
-
- * Fixed if cannot ensure sas then return proper error not null
-
-2011-06-07 12:30 source
-
- * Fixed print ins options
-
-2011-06-07 12:29 source
-
- * Fixed issue with int32 stats
-
-2011-06-06 08:06 source
-
- * Added function to create certificate from CSR
-
-2011-06-06 08:02 source
-
- * Fixed memory leaks
-
-2011-06-03 15:13 source
-
- * Fixed memory leak
-
-2011-06-02 12:32 source
-
- * Fixed bad URL in typeahead.css
- * Fixed issue with external ccount creation
- * Fixed WebDAV selection
-
-2011-06-02 12:25 source
-
- * Fixed iCalendar parser
-
-2011-06-02 12:24 source
-
- * Added daylight saving time
- * Fixed issue with validation
- * Fixed WebDAV selection
-
-2011-06-02 12:22 source
-
- * Fixed WebDAV selection
-
-2011-06-02 12:22 source
-
- * Fixed issue with validation
- * Fixed WebDAV selection
-
-2011-06-02 12:21 source
-
- * Fixed issue with validation
- * Fixed WebDAV selection
- * Fixed uninstall some views
-
-2011-06-02 12:20 source
-
- * Added user's rewrite rules
- * Added WebID verify service
-
-2011-06-02 12:20 source
-
- file webid_verify.vsp was added on branch V6_0_0-DEVEL on 2011-06-02 12:34:01 +0000
-
-2011-06-02 12:08 source
-
- * Added ProgrammableWeb cartridge
-
-2011-06-02 12:08 source
-
- file programmableweb2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-06-02 12:30:21 +0000
-
-2011-06-02 12:08 source
-
- * Fixed minor issue
-
-2011-06-02 11:18 source
-
- * Fixed check vdb col for nullable
-
-2011-06-01 09:20 source
-
- * Fixed signal error instead of GPF in normal build
-
-2011-05-31 15:34 source
-
- * Fixed set rehash factor if expecting large number of inserts in hash
-
-2011-05-31 15:33 source
-
- * Added function for CSR generation
-
-2011-05-31 15:32 source
-
- * Fixed use max number to avoid buffer overrun
-
-2011-05-30 20:19 source
-
- * Fixed translation from nodeiD://xxx to _:xxx
-
-2011-05-30 20:17 source
-
- * Fixed issue with cost based optimizer
-
-2011-05-24 18:57 source
-
- * Fixed when iri exceeds 2KB limit and flag is enabled then shorten
- the iri, instead of rejecting it
-
-2011-05-24 18:56 source
-
- * Fixed loop so it only uses local files
-
-2011-05-23 13:44 source
-
- * Added initial support for SPARQL 1.1. build-in IF and COALISCE
-
-2011-05-23 11:24 source
-
- * Fixed minor issue
-
-2011-05-23 11:23 source
-
- * Fixed LastFM cartridge
-
-2011-05-23 09:02 source
-
- * Added support for CREATE LITERAL CLASS "format string" ...
-
-2011-05-20 16:20 source
-
- * Fixed WebID selection
-
-2011-05-20 16:20 source
-
- * Fixed use certificate to verify the signature as an option
- * Fixed use ldap&webid login
-
-2011-05-20 16:11 source
-
- * Fixed add sponger ACL when installed
-
-2011-05-20 12:01 source
-
- * Fixed comments
-
-2011-05-20 12:00 source
-
- file webid_check.vsp was added on branch V6_0_0-DEVEL on 2011-05-20 12:02:32 +0000
-
-2011-05-20 12:00 source
-
- * Added support for WebID idp
- * Fixed WebID selection
-
-2011-05-20 11:51 source
-
- * Added csv bulk loader script
-
-2011-05-20 11:46 source
-
- * Fixed CSV import failed importing NULL values
-
-2011-05-20 11:44 source
-
- * Fixed dav_enable should not be touched for dba account
-
-2011-05-19 18:32 source
-
- * Fixed NULL value is not an error in lax mode
-
-2011-05-19 18:22 source
-
- * Fixed wrong arg
-
-2011-05-19 13:34 source
-
- * Added ldap schema support to WebID
-
-2011-05-19 13:15 source
-
- * Added version and timeout argument
-
-2011-05-19 13:11 source
-
- * Fixed duplicate symbol
-
-2011-05-19 10:17 source
-
- * Fixed API contact edit function
-
-2011-05-19 09:58 source
-
- * Fixed compiler warning
-
-2011-05-19 09:57 source
-
- * Fixed add user to bootstrap as it can run procs in this context
-
-2011-05-18 21:15 source
-
- * Fixed SIOC object services
-
-2011-05-18 21:12 source
-
- * Fixed install/uninstall bugs
-
-2011-05-18 09:19 source
-
- * Added Eventbrite cartridge
- * Fixed guard against using revoked long-lived FB access token
-
-2011-05-18 09:10 source
-
- * Added instructions on revoking access tokens to FB on retrieval
- confirmation page
-
-2011-05-18 09:09 source
-
- * Fixed issue with properties
-
-2011-05-18 09:06 source
-
- file eventbrite2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-05-18 09:19:11 +0000
-
-2011-05-18 09:01 source
-
- * Added Upcoming cartridge
- * Added Plancast cartridge
- * Fixed use labels by default
- * Fixed remove pro
- * Fixed minor issues
-
-2011-05-17 22:53 source
-
- * Added SIOC object services
- * Fixed problem with edit command and Wiki version folders
- * Fixed version history properties
- * Fixed move/copy API with wrong source/destination
- * Fixed problems with WebID
-
-2011-05-17 22:51 source
-
- * Added SIOC object services
- * Fixed IE JS problems
- * Fixed UI bug
-
-2011-05-17 22:50 source
-
- * Added SIOC object services
- * Fixed changing/deleting events does not trigger re-sync with publication
- * Fixed import/export bug
- * Fixed IE JS problems
-
-2011-05-17 22:48 source
-
- * Added SIOC object services
- * Added annotation rules
- * Fixed navigation and UI
- * Fixed css
- * Fixed IE bug
- * Fixed UI bug
-
-2011-05-17 22:46 source
-
- * Added SIOC object services
- * Fixed IE bug
- * Fixed UI bug
-
-2011-05-17 22:45 source
-
- * Fixed IE JS problems
- * Fixed UI bugs
-
-2011-05-17 22:44 source
-
- * Added SIOC object services
-
-2011-05-17 22:43 source
-
- * Fixed issue with Wiki after delete and restore VVC folder
-
-2011-05-17 22:42 source
-
- * Added SIOC object services
- * Fixed a++
-
-2011-05-17 21:14 source
-
- * Fixed compiler warnings
-
-2011-05-17 14:06 source
-
- * Added optimization for %g specifier for "Decimal" types in RDFViews
-
-2011-05-17 13:51 source
-
- * Rebuild drivers
-
-2011-05-17 13:48 source
-
- * Added function to get/set Query timeout (default = 0 = unlimited)
-
-2011-05-16 23:12 source
-
- file upcoming2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-05-18 09:01:49 +0000
-
-2011-05-16 09:04 source
-
- * Added initial support for SPARQL 1.1 Graph Store HTTP Protocol
-
-2011-05-16 08:51 source
-
- * Fixed usage of http_request_header
- * Fixed useage of last modified
-
-2011-05-16 08:50 source
-
- * Fixed empty subject
- * Fixed WebID selection
- * Fixed problem with certificate generation using Safari on windows
- * Fixed topic of interests
- * Fixed a++
-
-2011-05-16 08:42 source
-
- file plancast2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-05-18 09:01:49 +0000
-
-2011-05-16 08:35 source
-
- * Fixed setting name
-
-2011-05-16 08:34 source
-
- * Fixed entry page for sponged Facebook user's profile to top level
- container document
-
-2011-05-12 20:53 source
-
- * Fixed compiler warning
-
-2011-05-12 20:53 source
-
- * Added more system unames
-
-2011-05-11 14:49 source
-
- * Fixed small issue
-
-2011-05-11 13:32 source
-
- * Fixed issue compiling zip support on Mac OS X
-
-2011-05-11 13:19 source
-
- * Fixed typo in Content-Type header
-
-2011-05-11 13:15 source
-
- * Added missing file
-
-2011-05-11 13:11 source
-
- * Fixed rdf_sink is not a DET
-
-2011-05-11 13:09 source
-
- * Added more parameters for crawling
- * Fixed top proc must run as dba
- * Fixed use array for values
-
-2011-05-11 09:39 source
-
- * Added WebID support to dynares
- * Added optional async mode for dav meta extraction
-
-2011-05-11 08:08 source
-
- * Added missing files
-
-2011-05-10 18:57 source
-
- * Fixed write processing status to sponger queue
- * Fixed access tokens for OpenGraph cartridge save/restore from table
- instead of the API key
-
-2011-05-10 18:43 source
-
- * Fixed access tokens for OpenGraph cartridge save/restore from table
- instead of the API key
-
-2011-05-10 18:42 source
-
- * Fixed minor issues
-
-2011-05-10 18:40 source
-
- * Fixed disabled pg_check_map by default to make cpt faster
-
-2011-05-10 18:37 source
-
- * Fixed disable pg_check_map by default to make cpt faster
-
-2011-05-10 12:20 source
-
- * Fixed myust set sl_owner before cpt_rollback in order to know which
- thread owns the process, otherwise other threads may wrongly go
- inside the wait_checkpoint
-
-2011-05-10 12:18 source
-
- * Added initial support for B.C. datetimes
- * Added new functions to convert datetime from/to NASA Truncated
- Julian Day
- * Fixed bug in date2num and num2date
-
-2011-05-09 12:06 source
-
- * Fixed internal error in sparql_detalize on SPARUL statement
-
-2011-05-09 12:05 source
-
- * Added new statistic counters
-
-2011-05-08 22:24 source
-
- * Added GROUP_CONCAT and SAMPLE
-
-2011-05-08 22:23 source
-
- * Added common function to set certificate server-side
-
-2011-05-08 22:18 source
-
- * Added option to use certificates stored in the db
-
-2011-05-06 11:34 source
-
- * Fixed call to sponger status procedure
-
-2011-05-05 12:55 source
-
- * Fixed do not use aq if in sponger queue
-
-2011-05-05 12:54 source
-
- * Fixed print literals with meta info only when html is requested
-
-2011-05-03 18:00 source
-
- * Fixed workaround for missing offers
-
-2011-05-03 18:00 source
-
- * Fixed minor issue
-
-2011-05-03 17:55 source
-
- * Fixed compiling on VC10
-
-2011-05-03 17:51 source
-
- * Fixed function signature for windows build
-
-2011-05-03 17:50 source
-
- * Fixed error checking
-
-2011-05-03 14:03 source
-
- * Added check for native JSON serializer/deserializer when available
- * Fixed detection of buggy XML serializer in IE9
- * Fixed MSIE detection
- * Fixed SVG detection in OAT.Browser
-
-2011-05-03 11:50 source
-
- * Fixed set rehash pct
-
-2011-05-03 11:15 source
-
- * Fixed SPARQL OPTIONAL keyword sometimes causing queries to not
- return graph matches
-
-2011-05-02 14:16 source
-
- * Added app discussion rules
- * Added annotation rules
- * Added common css
- * Fixed navigation and standardize UI
- * Fixed updating external URIs access rights in UI profile
- * Fixed missing webfinger lookup
- * Fixed OpenId not registered id message
- * Fixed user selection page size
- * Fixed popup windows
- * Fixed security tab
-
-2011-05-02 14:09 source
-
- * Added support for social bookmarking
- * Fixed use 404 when no data is found
- * Fixed links in footer
- * Fixed escape the single quote char
-
-2011-05-02 14:06 source
-
- * Fixed labels
-
-2011-05-02 14:02 source
-
- * Fixed links
-
-2011-05-02 12:48 source
-
- * Fixed popup windows
-
-2011-05-02 12:44 source
-
- * Added annotation rules
- * Added discussion IRIs
- * Fixed navigation and standardize UI
- * Fixed popup windows
-
-2011-05-02 12:43 source
-
- file common.css was added on branch V6_0_0-DEVEL on 2011-05-02 14:16:01 +0000
-
-2011-05-02 12:30 source
-
- * Added option to obtain a Facebook OAuth access token for use with
- sponger cartridge
- * Fixed group export and delete of crawling targets
- * Fixed crawling feeds, parameters for crawling
- * Fixed disable config if no https
- * Fixed shorten queue description
-
-2011-05-02 12:30 source
-
- file fb_access_token_popup.vsp was added on branch V6_0_0-DEVEL on 2011-05-02 14:13:40 +0000
-
-2011-05-02 12:22 source
-
- file google_store2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-05-02 14:10:54 +0000
-
-2011-05-02 12:22 source
-
- file gowalla2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-05-02 14:10:54 +0000
-
-2011-05-02 12:22 source
-
- * Added Gowalla cartridge
- * Added Productontology
- * Added Google Product
- * Updated Facebook cartridge with multiple access tokens
- * Fixed do not print empty container string if there is no name
-
-2011-05-02 08:24 source
-
- * Fixed col_default to be same dtp as col_dtp to prevent default value
- misuse
-
-2011-05-02 08:23 source
-
- * Fixed wrong deref of default int value
-
-2011-04-29 11:56 source
-
- * Fixed when redirect is to secure site, setup the appropriate flags
-
-2011-04-26 12:16 source
-
- * Fixed loading TriG
-
-2011-04-26 12:14 source
-
- * Fixed loading NQuads
-
-2011-04-26 12:13 source
-
- * Fixed check webid only if not uathenticated
-
-2011-04-21 13:09 source
-
- * Added session counters for read/write/seek on gzip file
-
-2011-04-21 11:42 source
-
- file README-WIN32.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:13 +0000
-
-2011-04-21 11:42 source
-
- file watcom_f.mak was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:13 +0000
-
-2011-04-21 11:42 source
-
- file watcom_l.mak was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:13 +0000
-
-2011-04-21 11:42 source
-
- file zlib.dsw was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:12 +0000
-
-2011-04-21 11:42 source
-
- file README.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:12 +0000
-
-2011-04-21 11:42 source
-
- file bndsrc was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:11 +0000
-
-2011-04-21 11:42 source
-
- file compile.clp was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:11 +0000
-
-2011-04-21 11:42 source
-
- file example.dsp was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:12 +0000
-
-2011-04-21 11:42 source
-
- file minigzip.dsp was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:12 +0000
-
-2011-04-21 11:42 source
-
- file readme.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:12 +0000
-
-2011-04-21 11:42 source
-
- file zlib.dsp was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:12 +0000
-
-2011-04-21 11:42 source
-
- file zlib.inc was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:12 +0000
-
-2011-04-21 11:42 source
-
- file README was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:11 +0000
-
-2011-04-21 11:41 source
-
- file algorithm.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file enough.c was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:10 +0000
-
-2011-04-21 11:41 source
-
- file rfc1950.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:10 +0000
-
-2011-04-21 11:41 source
-
- file rfc1951.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:10 +0000
-
-2011-04-21 11:41 source
-
- file rfc1952.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:10 +0000
-
-2011-04-21 11:41 source
-
- file txtvsbin.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:10 +0000
-
-2011-04-21 11:41 source
-
- file zlibvc.vcproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file miniunz.vcproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:08 +0000
-
-2011-04-21 11:41 source
-
- file minizip.vcproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file testzlib.vcproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file testzlibdll.vcproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file zlib.rc was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file zlibstat.vcproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file zlibvc.def was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file zlibvc.sln was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:09 +0000
-
-2011-04-21 11:41 source
-
- file zlibvc.sln was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file zlibvc.vcxproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file zlibvc.vcxproj.filters was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:08 +0000
-
-2011-04-21 11:41 source
-
- file zlibvc.vcxproj.user was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:08 +0000
-
-2011-04-21 11:41 source
-
- file testzlibdll.vcxproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file testzlibdll.vcxproj.filters was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file testzlibdll.vcxproj.user was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file zlib.rc was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file zlibstat.vcxproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file zlibstat.vcxproj.filters was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file zlibstat.vcxproj.user was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file zlibvc.def was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:07 +0000
-
-2011-04-21 11:41 source
-
- file miniunz.vcxproj.filters was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file miniunz.vcxproj.user was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file minizip.vcxproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file minizip.vcxproj.filters was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file minizip.vcxproj.user was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file testzlib.vcxproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file testzlib.vcxproj.filters was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file testzlib.vcxproj.user was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:06 +0000
-
-2011-04-21 11:41 source
-
- file miniunz.vcxproj was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:05 +0000
-
-2011-04-21 11:41 source
-
- file MiniZip64_Changes.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:04 +0000
-
-2011-04-21 11:41 source
-
- file MiniZip64_info.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:04 +0000
-
-2011-04-21 11:41 source
-
- file make_vms.com was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:04 +0000
-
-2011-04-21 11:41 source
-
- file match686.asm was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:04 +0000
-
-2011-04-21 11:41 source
-
- file gvmat64.S was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:02 +0000
-
-2011-04-21 11:41 source
-
- file amd64-match.S was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:01 +0000
-
-2011-04-21 11:41 source
-
- file zconf.h.cmakein was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:59 +0000
-
-2011-04-21 11:41 source
-
- file zconf.h.in was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:59 +0000
-
-2011-04-21 11:41 source
-
- file zlib.3.pdf was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:59 +0000
-
-2011-04-21 11:41 source
-
- file zlib.map was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:59 +0000
-
-2011-04-21 11:41 source
-
- file zlib.pc.in was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:59 +0000
-
-2011-04-21 11:41 source
-
- file zlib2ansi was added on branch V6_0_0-DEVEL on 2011-04-21 11:43:00 +0000
-
-2011-04-21 11:41 source
-
- file gzwrite.c was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:58 +0000
-
-2011-04-21 11:41 source
-
- file treebuild.xml was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:58 +0000
-
-2011-04-21 11:41 source
-
- file gzclose.c was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:57 +0000
-
-2011-04-21 11:41 source
-
- file gzguts.h was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:57 +0000
-
-2011-04-21 11:41 source
-
- file gzlib.c was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:58 +0000
-
-2011-04-21 11:41 source
-
- file gzread.c was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:58 +0000
-
-2011-04-21 11:41 source
-
- * Upgraded to zlib 1.2.5
-
-2011-04-21 11:41 source
-
- file CMakeLists.txt was added on branch V6_0_0-DEVEL on 2011-04-21 11:42:56 +0000
-
-2011-04-20 15:12 source
-
- * FIxed hang or crash after cpt over
-
-2011-04-20 15:12 source
-
- * Fixed disable dep cols check
-
-2011-04-20 15:11 source
-
- * Added debug code to detect mutex hang on same thread
-
-2011-04-19 20:50 source
-
- * Fixed lock status report
-
-2011-04-19 20:49 source
-
- * Fixed key dep cols check for sample
-
-2011-04-19 16:16 source
-
- * Fixed bad bnode syntax in output
-
-2011-04-19 16:15 source
-
- * Added session read waits statistic
-
-2011-04-18 16:03 source
-
- * Fixed default mode for sponger should be sync instead of async
-
-2011-04-18 16:03 source
-
- * Fixed http_lock requires that maintenance page is set
-
-2011-04-18 16:02 source
-
- * Added statistics on read/write/seek session via file/gzip counters
-
-2011-04-15 12:42 source
-
- * Added deadlock retry handler
- * Added support to use redirect and timeout options
-
-2011-04-15 12:39 source
-
- * Added Foursquare cartridge
- * Added Zappos cartridge
- * Added enhancements to Facebook OpenGraph cartridge
- * Fixed minor issues
-
-2011-04-15 12:33 source
-
- * Added "Raw linked data format" permalinks
- * Fixed CSS
-
-2011-04-15 12:05 source
-
- * Fixed codegen for service invocation for case of IN parameter
- that is not bound in SINV subquery (used only in filter) and is
- neither external/global nor fixed in parent group pattern
-
-2011-04-15 12:04 source
-
- * Fixed support for xsd:time() in sparql when the argument value
- is safe for SQL CASET instead of function call
-
-2011-04-14 12:09 source
-
- file zappos2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-04-15 12:39:05 +0000
-
-2011-04-13 22:51 source
-
- * Added initial variant for estimate taking dep cols in account
- (by default disabled)
-
-2011-04-13 22:50 source
-
- * Added missing param for http_get
-
-2011-04-13 10:16 source
-
- * Fixed if tf_xx signals an error, xn_children were released twice
-
-2011-04-12 18:29 source
-
- * Fixed check bnode subject
- * Fixed clear avalues array before possible jump
- * Fixed compiler warnings
-
-2011-04-11 21:44 source
-
- * Fixed do not report a frequent error re unescaped "&&" in <SCRIPT>
- HTML tag
- * Fixed can jump over buffer boundary if you have an &xx not ending
- in a semicolon
-
-2011-04-11 21:42 source
-
- file copy_16.png was added on branch V6_0_0-DEVEL on 2011-04-11 21:45:59 +0000
-
-2011-04-11 21:42 source
-
- * Added option top copy/clone crawler target
- * Added option for crawl-delay
-
-2011-04-11 21:39 source
-
- * Added support for crawl-delay
-
-2011-04-11 21:01 source
-
- * Fixed removed leading CRLF
-
-2011-04-11 21:01 source
-
- * Fixed wrong function call
- * Fixed bad inference tag
-
-2011-04-11 20:55 source
-
- * Fixed error message in spar_find_sc_for_big_ssl_const
-
-2011-04-11 20:54 source
-
- * Added support for RDFa 1.1
-
-2011-04-11 20:53 source
-
- * Fixed compiler warnings
-
-2011-04-11 15:36 source
-
- * Added DB.DBA.RDF_RDFA11_FETCH_PROFILES() to sponge and return
- RDFa 1.1 external profile data
-
-2011-04-11 15:35 source
-
- * Added rdfa: namespace prefix
-
-2011-04-11 15:05 source
-
- * Added w3-1999-xhtml/vocab for RDFa 1.1
-
-2011-04-11 12:40 source
-
- file foursquare2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-04-15 12:39:04 +0000
-
-2011-04-11 12:40 source
-
- file oplopengraph.owl was added on branch V6_0_0-DEVEL on 2011-04-15 12:39:03 +0000
-
-2011-04-11 09:15 source
-
- * Fxed issue with rdf_type attr
-
-2011-04-11 08:28 source
-
- * Fixed double free
-
-2011-04-11 08:27 source
-
- * Added support for trig
-
-2011-04-11 08:27 source
-
- * Fixed check if file is present on local fs
-
-2011-04-07 21:19 source
-
- * Added function to validate rdfxml
-
-2011-04-07 21:17 source
-
- * Fixed do not flush immediately, as client may ask for gzip later
-
-2011-04-07 21:16 source
-
- * FIxed if bitmap error on a cursor, kill the transaction instead of GPF
-
-2011-04-07 11:11 source
-
- * Fixed if process is swapping do not try to signal self as lock reaper
- may decide to kill this transaction where it may wait for select
- thread to run its signal function
-
-2011-04-06 12:09 source
-
- * Fixed issue with multiple transitive subqueries in sql optimizer
-
-2011-04-06 12:01 source
-
- * Fixed when doing subseq, session will return session handle, which
- needs to be converted to string
-
-2011-04-05 14:38 source
-
- * Fixed issues with RDFa 1.1 test
-
-2011-04-05 14:37 source
-
- * Fixed possible mutex deadlock
-
-2011-04-04 12:32 source
-
- * Added support for javascript-like hrefs in RDFa
-
-2011-04-04 12:31 source
-
- * Fixed when not a string, use a cast to string
-
-2011-04-04 12:31 source
-
- * Fixed use mtx in proper order
-
-2011-03-31 21:33 source
-
- * Fixed issues with RDFa parsing
-
-2011-03-31 21:32 source
-
- * Added check for MacDataSourceSize with default of 20MB
-
-2011-03-29 23:20 source
-
- * Updated version to 6.1.3 for final release
-
-2011-03-29 22:55 source
-
- * Fixed do not check immutable graph when dba is running
-
-2011-03-29 22:52 source
-
- * FIxed minor issue
-
-2011-03-29 22:52 source
-
- * FIxed ACL
-
-2011-03-29 22:49 source
-
- * Fixed minor issue with prices
-
-2011-03-29 22:46 source
-
- * Fixed swapped menu items
-
-2011-03-29 22:43 source
-
- * Fixed use INFORMATION_SCHEMA.TABLES
-
-2011-03-29 21:08 source
-
- * Fixed menu layout
-
-2011-03-29 20:14 source
-
- * Fixed JS IE bug on profile page
- * Small code cleanup
-
-2011-03-29 14:06 source
-
- * Fixed typo in Makefile.am
-
-2011-03-29 12:45 source
-
- * Fixed put absolute path for database in default virtuoso.ini
-
-2011-03-29 11:02 source
-
- * Added alt to images in rdftab
-
-2011-03-29 10:58 source
-
- * Fixed tuned handling of page params
- * Fixed permalinks now encode information of which editor was used
- to produce the query
-
-2011-03-29 10:53 source
-
- * Fixed must return error when cast fails
-
-2011-03-29 10:53 source
-
- * Fixed issue with sparql filter with two optionals
-
-2011-03-29 00:31 source
-
- * FIxed issue locating jvm runtime library location on linux x86_64
-
-2011-03-29 00:09 source
-
- * Fixed build issue when prerequisite support .jar files not present
-
-2011-03-28 23:11 source
-
- * Fixed check for demo data before continuing
-
-2011-03-28 17:29 source
-
- * Added configure option for enabling mutex debugging
-
-2011-03-28 16:04 source
-
- * Fixed dependency for VOS
-
-2011-03-28 15:56 source
-
- * Rolled back previous patch
-
-2011-03-28 13:52 source
-
- * Added missing files to distribution
-
-2011-03-28 12:57 source
-
- * Fixed minor layout issue
-
-2011-03-28 12:53 source
-
- * Added support for posh triples
-
-2011-03-28 12:52 source
-
- * Fixed labels
-
-2011-03-28 12:22 source
-
- * Fixed allow varbinary as input for obj
-
-2011-03-26 14:22 source
-
- * Fixed user's pages to start with profile page
-
-2011-03-26 14:21 source
-
- * Fixed skin handling
-
-2011-03-25 21:33 source
-
- * Updated version
-
-2011-03-25 17:47 source
-
- * Fixed possible copy overlap on some newer C libs
-
-2011-03-25 16:23 source
-
- * Fixed vcard handling
-
-2011-03-25 16:19 source
-
- * Fixed encoding
-
-2011-03-25 15:10 source
-
- * Updated testsuite
-
-2011-03-25 12:20 source
-
- * Fixed if there is no subclass/property but there is an equivalent,
- then use that as the statrt point, otherwise we would not get a
- result
-
-2011-03-24 16:15 source
-
- * Added bulk-loader to virtuoso binary
-
-2011-03-24 16:04 source
-
- * Updated documentation
-
-2011-03-24 15:50 source
-
- * Fixed do now use daq because rdf_label has two keys and soft
- does not work
- * Fixed use labels if not curie or uri
- * Fixed issue with recent dbpedia onthology
- * Fixed labels
- * Fixed auto-complete failed when exact match & prefix found
-
-2011-03-24 15:47 source
-
- * Fixed use labels for IRIs only
- * Fixed use special describe mode to avoid empty results
- * Fixed error handling
- * Fixed keep sas & inf
- * Fixed bad encoding
- * Fixed proper escape for uris
- * Fixed wrong labels
-
-2011-03-24 13:48 source
-
- * Fixed additional xml document parser error handling for Opera
-
-2011-03-23 16:45 source
-
- * Added function to format rdf object for printing in html
-
-2011-03-23 12:25 source
-
- * Fixed typo
-
-2011-03-23 12:17 source
-
- * Added LinkedIn import
- * Fixed duplicate addressbook entries issue
-
-2011-03-23 12:13 source
-
- * Added rdfs schema
- * Fixed datetime format
- * Fixed minor issues
-
-2011-03-23 12:13 source
-
- * Added more properties
-
-2011-03-23 12:13 source
-
- * Fixed minor issues
-
-2011-03-23 12:03 source
-
- * Added more options for exporting a site
- * Added more delimiters
- * Fixed folder DET type presentation
- * Fixed export as text
-
-2011-03-23 12:01 source
-
- * Fixed wrong serialization of VirtuosoExplicitString when it is
- binding with DV_ANY parameter
-
-2011-03-23 11:05 source
-
- * Rebuild drivers
-
-2011-03-23 11:04 source
-
- * Fixed issue with using _JAVA_ on sparql select
-
-2011-03-23 10:49 source
-
- * Fixed duplicate addressbook entries issue
-
-2011-03-23 10:48 source
-
- * Fixed broken show filter
-
-2011-03-23 10:48 source
-
- * Fixed feeds aggregator
-
-2011-03-23 10:47 source
-
- * Updated folder type list with 'Dynamic Resource'
-
-2011-03-23 10:37 source
-
- * Added support for DV_RDF in v:isql rendering
-
-2011-03-23 10:35 source
-
- * Added custom UA
- * Fixed gunzip the zipped rdfs
- * Fixed large pages in results
-
-2011-03-23 10:33 source
-
- * Improved session persistence
- * Fixed handling of XML+RDF parsing errors
- * Fixed bugs in query cache handling/paging
- * Fixed Cosmetics in "Raw triples" view
- * Fixed Default view set as "Advanced" in query permalinks
- * Fixed URL params handling so they always take precedence from
- persisted session
- * Fixed bug in menu item to Reset session
-
-2011-03-23 10:28 source
-
- * Added code to facilitate better error recovery when parsing
- invalid RDF+XML
- * Fixed small code cosmetics
-
-2011-03-22 23:50 source
-
- * Fixed missing globals
-
-2011-03-21 13:30 source
-
- * Fixed missing variable initialization
-
-2011-03-21 10:44 source
-
- * Fixed check if subselect has a recursive ref
-
-2011-03-18 10:51 source
-
- * Fixed use new pages & disk reads to trigger the startup values
-
-2011-03-17 16:30 source
-
- * Added lax mode in csv import
-
-2011-03-17 13:55 source
-
- * Fixed when removing a join from outer's branches, do that repeatedly
- to remove all not needed. The recursion is done via sqlo_scope in
- order to get new labels for columns in select list, so process does
- not get confused by moving left part into FROM
-
-2011-03-17 13:53 source
-
- * Fixed when compiling a shared query, we must have a reset context
- as it may jump from compiler outside of shared cache and leave
- a mutex locked, thus eventually can get hang
-
-2011-03-16 10:34 source
-
- * Fixed issue with partial index when no path is followed
-
-2011-03-14 15:52 source
-
- * Fixed return byte[] data from column with datatype = DV_ANY
-
-2011-03-14 15:47 source
-
- * Fixed disable debug messages
-
-2011-03-14 15:46 source
-
- * Fixed use dv_bin where needed like for dav-res
-
-2011-03-12 00:17 source
-
- * Fixed increase delay on sequential deadlock
-
-2011-03-12 00:17 source
-
- * Fixed labels
-
-2011-03-11 18:26 source
-
- * Fixed use exclusive locks when doing sparul ops
-
-2011-03-11 13:08 source
-
- * Fixed comment about missing io sect
-
-2011-03-11 13:08 source
-
- * Added retry deadlock if session is not flushed
-
-2011-03-11 13:07 source
-
- * Fixed do not do read ahead with less than 10k buffers available
-
-2011-03-11 12:17 source
-
- * Fixed if no free buffer available, signal an error
-
-2011-03-11 11:28 source
-
- * Fixed do not do read-ahead on extent map
-
-2011-03-10 23:24 source
-
- * Added index to search over label text
-
-2011-03-09 16:41 source
-
- * FIxed _java_ should not have effect on select
-
-2011-03-08 15:46 source
-
- * Fixed labels in value side
- * Fixed pages to pass W3C validator (mostly)
- * Fixed check for integers
- * FIxed xml excape will happen on <?V use
-
-2011-03-08 15:44 source
-
- * Fixed hide value ranges option for now
-
-2011-03-08 15:43 source
-
- * Fixed copyright year
-
-2011-03-08 14:32 source
-
- * Added missing files to distribution
-
-2011-03-08 13:56 source
-
- * Added workaround to tell _JAVA_ driver the input is string as it is
- confused on DV_ANY and breaks utf-8 support
-
-2011-03-08 13:44 source
-
- * Added quick rule to check version string
-
-2011-03-08 13:44 source
-
- * Rebuild driver
-
-2011-03-08 13:44 source
-
- * Fixed only allow URI or Blank nodes as subjects
-
-2011-03-08 13:38 source
-
- * Added additional crawler params
- * Fixed show status without errors
- * Fixed label
-
-2011-03-08 13:36 source
-
- * Added Described By
- * Added ProductWiki cartridge
- * Fixed do not use triple dicts on long files
- * Fixed OWL
- * Fixed labels
- * Fixed minor issues
-
-2011-03-08 13:24 source
-
- * Updated to CKeditor version 3.5.2
-
-2011-03-08 13:08 source
-
- * Added map markers for various types of things
- * Added a smaller throbber animated gif
- * Fixed resizing issue for mobile browsers
- * Fixed bug in processing item title HREFs in map popup
- * Fixed bugs in marker selection code using rtb:useMarker
-
-2011-03-08 12:48 source
-
- * Fixed mime types
- * Fixed mail rendering
-
-2011-03-08 12:47 source
-
- * Fixed attendees
-
-2011-03-08 12:47 source
-
- * Fixed Twitter and LinkedIn registration/login
- * Fixed RDF object properties
- * Fixed UI
- * Fixed escape params
- * Fixed scroll bars
-
-2011-03-08 12:44 source
-
- file en.js was added on branch V6_0_0-DEVEL on 2011-03-08 13:24:39 +0000
-
-2011-03-08 12:35 source
-
- * Added support for AddThis
- * Added manual mode for entering location when automatic location fails
- * Added more geocoding support
- * Fixed location timeout to 10 sec
- * Fixed location popup
- * Fixed text when Javascript is not enabled
- * Fixed bug in management of user settings
- * Fixed bugs in session persistance
-
-2011-03-08 12:30 source
-
- file football.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file house.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file info.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file mail.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file shield.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:17 +0000
-
-2011-03-08 12:30 source
-
- file shoppingcart.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:17 +0000
-
-2011-03-08 12:30 source
-
- file star.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:17 +0000
-
-2011-03-08 12:30 source
-
- file book.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file camera.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file car.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file coffee.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file creditcards.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file dollar.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file drink.png was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:16 +0000
-
-2011-03-08 12:30 source
-
- file throbber_small.gif was added on branch V6_0_0-DEVEL on 2011-03-08 13:08:15 +0000
-
-2011-03-08 12:24 source
-
- * Fixed debug defines
-
-2011-03-08 12:19 source
-
- * Added support for robots.txt
-
-2011-03-08 12:18 source
-
- * Fixed update crawler entries using id and avoid table scans
-
-2011-03-08 11:52 source
-
- * Fixed size of input buffer of an XML parser is now adaptive
-
-2011-03-08 10:38 source
-
- * Updated version to 6.1.3-rc7
-
-2011-03-07 21:49 source
-
- * Fixed when there is a gb node, test the sort node for dep part in
- the sort spec
-
-2011-03-07 12:48 source
-
- file powder-s.owl was added on branch V6_0_0-DEVEL on 2011-03-08 13:36:27 +0000
-
-2011-03-05 00:03 source
-
- * Updated documentation
-
-2011-03-04 14:46 source
-
- * Fixed moved mutex lock/unlock calls to avoid deadlock
-
-2011-03-03 22:34 source
-
- file productwiki2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-03-08 13:36:28 +0000
-
-2011-03-03 17:12 source
-
- * Added read-ahead on extent
-
-2011-03-03 17:10 source
-
- * Fixed immutable graph setting can be a pattern, so we can disable
- sponging on all graphs
-
-2011-03-03 11:56 source
-
- * Fixed DATETIME to DATE conversions
-
-2011-03-02 12:24 source
-
- * Fixed issue with special sparql variables
-
-2011-03-02 12:24 source
-
- * Fixed issue with qualifier in SQLForeignKeys
-
-2011-03-01 19:35 source
-
- * Fixed initialization of defaults
-
-2011-03-01 19:32 source
-
- * Fixed set HTTP status to 503 when showing maintenance page and
- added a Retry-After: 1800 (seconds) header as a hint to the remote
-
-2011-02-28 17:02 source
-
- * Fixed issue if data did not generate prefix2iri hash
-
-2011-02-28 13:47 source
-
- * Fixed check for 5xx or 4xx status codes
-
-2011-02-26 08:35 source
-
- * Added http maintenance functions
-
-2011-02-25 17:31 source
-
- * Fixed only start from the beginning when there is a thread else we
- could get into a busy loop
-
-2011-02-23 21:35 source
-
- * Fixed bad regexp
-
-2011-02-23 17:31 source
-
- * Fixed size of input buffer of an XML parser is made adaptive
-
-2011-02-21 13:36 source
-
- * Added support for named parameters
-
-2011-02-20 16:14 source
-
- * Fixed increase the size of the input buffer of the TURTLE lexer
- for file resources, in order to improve disk access pattern if many
- resources are loaded in parallel
-
-2011-02-18 15:49 source
-
- * Updated version to 6.1.3-rc6
-
-2011-02-18 15:49 source
-
- * Fixed issue with scalar subq with SSG_VALMODE_NUM output as in TPCD
-
-2011-02-18 15:37 source
-
- * Updated version
-
-2011-02-18 15:36 source
-
- * Added language and type options for offers
-
-2011-02-18 15:32 source
-
- * Fixed issues with map sizing
-
-2011-02-18 15:30 source
-
- * Fixed rdftab height for maps
-
-2011-02-18 11:19 source
-
- * Added initial codegen for ASK subquery
- * Fixed issue with sponging options and DESCRIBE on /sparql endpoint
-
-2011-02-18 11:16 source
-
- * Fixed "serialize" debugging output of many threads and label
- messages of different threads
-
-2011-02-18 11:14 source
-
- * Added better support of "seealso" predicate in case of recursive
- sponging
-
-2011-02-18 10:37 source
-
- * Fixed use mem pool to release all objects if an error occurs
-
-2011-02-18 10:24 source
-
- * Regenerated drivers
-
-2011-02-18 10:24 source
-
- * Fixed issue with closing XAConnection and connectionpool
-
-2011-02-17 15:23 source
-
- * Fixed more log info
-
-2011-02-16 21:08 source
-
- * Updated documentation
-
-2011-02-16 20:55 source
-
- * Fixed iSPARQL icons placed on Home screen on iPhone/iPod now have the
- WebApp appearance (i.e. no URL bar, etc. controls.)
- * Fixed a regression causing reappearance of Ubiq gem on non-firefox browsers
- * Fixed missing message candlers for geocoding module
- * Disabled buggy location UI absorbing into statusui
- * Improved formatting of errors in response tab somewhat
-
-2011-02-16 20:53 source
-
- * FIxed avoid long URLs to generate wacky error
-
-2011-02-16 20:51 source
-
- * Fixed missing line
-
-2011-02-16 17:33 source
-
- * Fixed offers SIOC data
-
-2011-02-16 17:33 source
-
- file login_keys.vspx was added on branch V6_0_0-DEVEL on 2011-02-16 20:58:16 +0000
-
-2011-02-16 17:32 source
-
- * Fixed if no svc and FF then show generator page
-
-2011-02-16 17:32 source
-
- * Fixed typo
-
-2011-02-16 17:31 source
-
- * Fixed missing case
-
-2011-02-16 17:25 source
-
- * Fixed status controls
-
-2011-02-16 17:25 source
-
- * Fixed proper position
-
-2011-02-16 17:20 source
-
- * Added support for map marker URLs in OAT.RDFTabs.map
- * Fixed OAT.RDFTab.map control height on iPhone
- * Fixed bug causing OAT.RDFTABs.navigator layout flowing into footer
- * Fixed navigator layout
-
-2011-02-16 17:16 source
-
- * Fixed separate virtrdf:label into own file
-
-2011-02-16 17:16 source
-
- file virt_rdf_label.sql was added on branch V6_0_0-DEVEL on 2011-02-16 20:53:22 +0000
-
-2011-02-16 17:08 source
-
- * Fixed ADO.NET datatype handling
- * Fixed null pointer exception
-
-2011-02-15 14:45 source
-
- * Fixed memory leaks
-
-2011-02-15 14:11 source
-
- * Fixed signal errors other than deadlock
-
-2011-02-15 14:05 source
-
- * Fixed issues with --with-debug and setting CFLAGS
-
-2011-02-15 10:11 source
-
- * Fixed missing prototype
- * Fixed after free data_col make sure it is nil
-
-2011-02-14 13:05 source
-
- * Updated version to 6.1.3-rc5
-
-2011-02-14 13:04 source
-
- * Fixed certificates
-
-2011-02-14 13:03 source
-
- * Fixed page load bug
-
-2011-02-14 13:03 source
-
- * Added RSS and Atom imports
-
-2011-02-14 13:03 source
-
- * Fixed issue with dashboard
-
-2011-02-14 13:03 source
-
- * Fixed mail selection from private instances
- * Fixed encrypted emails
-
-2011-02-14 12:51 source
-
- * Added rudimentary geocoder support module
- * Fixed endpoints options tolle menu
- * Fixed title to "Sponger"
- * Fixed header margins
- * Fixed ordering of Sponger and Query Metadata
- * Fixed location error handler failure to change aquire state
- * Fixed statement help popup window
-
-2011-02-14 12:49 source
-
- * Fixed try to resize map in a more mobile friendly way
-
-2011-02-14 12:48 source
-
- * Added more properties to virtlabel ontology
- * Fixed issues reported by W3C Validator
-
-2011-02-14 12:33 source
-
- * Fixed compiler warnings on SOlaris with openssl 1.0
-
-2011-02-14 11:48 source
-
- * Fixed when P is known get stats on it to make better decision on
- execution plan
-
-2011-02-14 11:48 source
-
- * Fixed infinite loop when dealing with string like abc&def and no token
-
-2011-02-14 01:25 source
-
- * Fixed dump all mem references before dying
-
-2011-02-14 01:14 source
-
- * Fixed issue when client disconnects inside compile where no reset ctx
-
-2011-02-11 13:19 source
-
- * Added ssl const decoration in explain
-
-2011-02-10 20:58 source
-
- * Added new bif getenv
-
-2011-02-07 15:07 source
-
- * Fixed attribution
-
-2011-02-04 15:36 source
-
- * Added check for max number of elements
-
-2011-02-03 13:30 source
-
- * Fixed check if there is dpipes to be placed before trans node
-
-2011-02-03 11:27 source
-
- * Fixed when compiling statement with sparqre_qi == CALLER_LOCAL, do
- not pass this value to box_cast
-
-2011-02-03 10:32 source
-
- * Fixed issue with namespace pollution in FireFox
-
-2011-02-03 10:30 source
-
- * Added separate sponge and ack for rdf flags
- * Fixed copyright year
-
-2011-02-03 10:29 source
-
- * Added pure RDFa cartridge
- * Fixed copyright year
-
-2011-02-03 10:28 source
-
- * Fixed geolocation to automatically use a location if a minimum
- accuracy is reached. Default=500m
- * Fixed creation of options in anchor which did not work with FireFox
- * Fixed copyright year
-
-2011-02-03 09:26 source
-
- * Fixed box_cast when qst is CALLER_LOCAL
-
-2011-02-03 09:25 source
-
- * Fixed copyright year
-
-2011-02-02 15:36 source
-
- * Fixed make sure boxlen is within limits
-
-2011-02-02 12:06 source
-
- * Added separate sponge and ack for rdf flags
-
-2011-02-02 11:28 source
-
- * Added new location properties and datatypes
-
-2011-02-01 00:07 source
-
- * Fixed use origin as base
-
-2011-02-01 00:07 source
-
- * Added support for virtrdf:image
-
-2011-01-31 20:47 source
-
- * Fixed declaration after statement
-
-2011-01-31 15:23 source
-
- * Fixed to follow http redirects
-
-2011-01-31 15:23 source
-
- * Fixed memory leak if QUIETCAST query operates with ill formed
- data such as invalid date/time
-
-2011-01-31 11:17 source
-
- * Fixed problem with upstreaming of updated and deleted posts
- * Fixed problem with triggers
-
-2011-01-31 11:16 source
-
- * Added virtrdf-label for iCalendar
-
-2011-01-31 11:15 source
-
- * Fixed CSS of execution grid
-
-2011-01-31 10:48 source
-
- * Fixed RDFa cartridge
-
-2011-01-31 10:45 source
-
- * Added UI for Login Authentication Keys
-
-2011-01-30 15:23 source
-
- * Fixed box_cast so QUIETCAST mode returns NULL instead of error
- even if the problem is detected in some nested function
-
-2011-01-28 17:34 source
-
- * Fixed when on a queue, i.e. waiting for compile to finish, we freeze
- the thread so cpt can proceed
-
-2011-01-28 13:35 source
-
- * Added namespace prefix 'fn' for 'http://www.w3.org/2005/xpath-functions/#'
- for XPATH 2.0 and XQuery 1.0 Core Functions library
-
-2011-01-28 13:34 source
-
- * Fixed detection of bad blank nodes
-
-2011-01-28 13:32 source
-
- * Fixed compiler warnings
-
-2011-01-28 13:31 source
-
- * Added numeric_from_string_is_ok to do quick syntax check on string
- without actual parsing
-
-2011-01-28 13:29 source
-
- * Added support for "xpath:function_IRI" syntax, which is usally an
- internal syntax for functions automatically recognized as XPATH
-
-2011-01-28 13:28 source
-
- * Fixed compiler warning
-
-2011-01-28 13:28 source
-
- * Added xqr_stub_for_funcall
- * Fixed memory leak
-
-2011-01-28 13:26 source
-
- * Fixed cast to xsd:float
-
-2011-01-28 13:26 source
-
- * Fixed moved free inside of semaphore
-
-2011-01-27 14:19 source
-
- * Fixed use default smime
-
-2011-01-27 13:30 source
-
- * Fixed wrong condition check
-
-2011-01-27 12:43 source
-
- * Added support for S/MIME encrypt and decrypt
-
-2011-01-26 17:52 source
-
- * Fixed missing namespace in </results>
-
-2011-01-25 19:15 source
-
- * Fixed cost model to count inx cond and scale card at end
-
-2011-01-25 18:54 source
-
- * Fixed in log replay we can drop the old objects to free memory
-
-2011-01-25 14:51 source
-
- * Updated version to 6.1.3-rc4
-
-2011-01-25 14:39 source
-
- * Fixed allocate space for \0 terminator
-
-2011-01-25 14:38 source
-
- * Fixed memory leak
-
-2011-01-25 14:36 source
-
- * Fixed compiler warning
-
-2011-01-25 14:35 source
-
- * Added configurable normalization of accented characters
-
-2011-01-25 14:33 source
-
- * Fixed compiler warnings
-
-2011-01-25 14:32 source
-
- * Fixed wrong buffer
-
-2011-01-25 14:30 source
-
- * Fixed crawling aside of the target
- * Fixed no more need of dummy targets
- * Fixed decrease use of lock on site table
-
-2011-01-25 14:29 source
-
- * Fixed python initialization
-
-2011-01-25 14:11 source
-
- * Aded linkedIn login/register
- * Fixed bad profile UI
- * FIxed hyperlink session expire issue
-
-2011-01-25 14:09 source
-
- * Fixed use base as origin on zillow
-
-2011-01-25 14:09 source
-
- * Fixed do not try to put headers when an error is detected
-
-2011-01-25 14:07 source
-
- * Fixed connection check page
- * Fixed error message generation in execute
- * Fixed Preferences dialog
-
-2011-01-25 14:00 source
-
- * Fixed cosmetics and layout
-
-2011-01-25 13:53 source
-
- * Added RDF graph property for links
-
-2011-01-25 13:52 source
-
- * Added IMAP support
-
-2011-01-25 13:51 source
-
- * Fixed install issue with new DB
- * Fixed parent
-
-2011-01-25 13:50 source
-
- * Fixed UI
-
-2011-01-25 13:17 source
-
- * Updated documentation
-
-2011-01-22 14:12 source
-
- * Fixed check for blank node in wrong places
-
-2011-01-21 13:43 source
-
- * Fixed no need to access .cfg file for plain ?query= call
-
-2011-01-19 13:17 source
-
- * Fixed codegen for xsd:decimal() and similar cast operations
-
-2011-01-18 14:36 source
-
- * Added configurable normalization of accented characters
-
-2011-01-18 14:32 source
-
- file unicode3_basechars.h was added on branch V6_0_0-DEVEL on 2011-01-18 14:36:37 +0000
-
-2011-01-18 10:41 source
-
- * Added normalization of accented characters
-
-2011-01-18 10:32 source
-
- * Fixed debug code
-
-2011-01-18 10:31 source
-
- * Fixed more debug output for xte_word_range
-
-2011-01-11 22:41 source
-
- * Fixed compiler warnings
-
-2011-01-11 22:38 source
-
- * Fixed whitespace
-
-2011-01-11 13:18 source
-
- * Added mime_header function to parse rfc header of mail message
-
-2011-01-11 13:14 source
-
- * Fixed commented out bogus help button
-
-2011-01-11 13:13 source
-
- * Added more prefixes
-
-2011-01-11 13:12 source
-
- * Added new entries to virtrdf-label
-
-2011-01-11 10:33 source
-
- * Added new SPARQL-to-SQL codegen for type cast functions
-
-2011-01-11 10:32 source
-
- * Fixed set box flags to BF_IRI in this special case as graphs are IRIs
-
-2011-01-10 20:49 source
-
- * Added transitivity cache
-
-2011-01-10 16:56 source
-
- * Fixed bifs returning int or date should use same cast as auto
-
-2011-01-10 13:23 source
-
- * Fixed width of users, capabilities listings
-
-2011-01-10 13:22 source
-
- * Fixed use sitemaps for default crawling, option for depth
- * Fixed links conversion should be off by default
- * Fixed issue with listing
-
-2011-01-10 11:51 source
-
- * FIxed missing initialization
-
-2011-01-07 17:18 source
-
- * Fixed set timeout only when non empty
-
-2011-01-07 15:42 source
-
- * Fixed when explicit output format is give, make it part of the
- query text so don't cache eventual internal guess to turtle output
-
-2011-01-07 15:08 source
-
- * Added cxml and csv links
- * Fixed link layout
-
-2011-01-07 14:12 source
-
- * Fixed allow bigger header values to be returned
-
-2011-01-05 20:58 source
-
- * Added optional QRcode
- * Added CXML link typing dropdowns to fct UI
- * Added search query limit of 100 words
- * Added CXML and CSV links on describe page
-
-2011-01-05 20:14 source
-
- * Fixed declaration after statement warning
-
-2011-01-05 13:58 source
-
- * Fixed search and page load behaviour
- * Fixed RefByAll result page
-
-2011-01-05 12:45 source
-
- * Fixed align at 8 when double align defined
- * Fixed always return NULL when allocation failed
-
-2011-01-05 12:44 source
-
- * Fixed compiler warnings
-
-2011-01-05 12:36 source
-
- * Added OWL mime type
-
-2011-01-05 01:58 source
-
- * Fixed stats on inference
-
-2011-01-03 23:37 source
-
- * Added client-based HTTP auth support in OAT.Ajax
- * Fixed bug in RDFStore handling of hasNamespacePrefix that caused
- corruption
- * Fixed error in dialog button handler
- * Fixed typo in insertIRIArr
- * Fixed several issues in RDFTabs related to RDFStore changes
-
-2011-01-03 21:23 source
-
- * Fixed json tcn
-
-2011-01-03 21:22 source
-
- * Added optional vCal QRCode
- * Fixed date change in events/tasks
-
-2011-01-03 21:21 source
-
- * Added optional vCard QRCode
-
-2011-01-03 21:21 source
-
- * Fixed UI of maintenance page
- * Fixed ref-by command output
-
-2011-01-03 21:14 source
-
- * Fixed detect iSPARQL Server Connection using PROPFIND
- * Fixed link behaviour in SPARQL result set view is now
- controlled by dropdown
- * Fixed Save/serialize in .ldr/.isparql file types
-
-2011-01-03 21:11 source
-
- * Added option for crawl depth
- * Added check for gzip magic header
- * Fixed use sitemaps for default crawling
- * Fixed no clean opt
- * Fixed optmimize queue recovery
- * Fixed when */xml reported butthe content is gziped, the client
- will decode on the fly
-
-2011-01-03 21:09 source
-
- * Added properties to enable HTTP DIGEST auth on some browsers
-
-2011-01-03 21:02 source
-
- file eol2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-01-03 23:40:02 +0000
-
-2011-01-03 21:02 source
-
- file groupon2rdf.xsl was added on branch V6_0_0-DEVEL on 2011-01-03 23:40:02 +0000
-
-2011-01-03 21:02 source
-
- * Added Groupon cartridge
- * Added RDFohloh cartridge
- * Added EOL cartridge
- * Fixed use common API to delete target
- * Fixed minor issues
-
-2011-01-03 10:21 source
-
- * Added support for FILTER EXISTST and FILTER NOT EXISTS
- * Added partial support for MINUS
-
-2011-01-03 10:18 source
-
- * FIxed minor issues
-
-2011-01-03 10:17 source
-
- * Fixed issue with large number of namespace declarations
-
-2010-12-23 16:33 source
-
- * Fixed JSON tcn for host-meta
-
-2010-12-22 20:58 source
-
- * Fixed default options
-
-2010-12-22 10:31 source
-
- * Fixed issue with aggregates and ORDER BY
-
-2010-12-22 10:27 source
-
- * Fixed issue with DATATYPE
-
-2010-12-22 10:25 source
-
- * Fixed string is aligned to 8
- * Fixed wide data must be presented as UTF8 before hash chksum
-
-2010-12-21 12:27 source
-
- * Fixed whitespace
-
-2010-12-21 10:42 source
-
- * Added retry on deadlock when sponging on multiple threads
-
-2010-12-20 21:43 source
-
- * Updated version to 6.1.3-rc2
-
-2010-12-20 19:12 source
-
- * Fixed minor issue
-
-2010-12-20 18:20 source
-
- * Fixed layout to make optional qrcode fit without wasting space
- * Fixed tabs CSS and overall margins etc
-
-2010-12-20 18:09 source
-
- * Fixed sqltype and display size of DV_IRI_ID column
-
-2010-12-20 13:26 source
-
- * Fixed merge error
-
-2010-12-20 12:31 source
-
- * Fixed missing column error in SPARQL-to-SQL preprocessor
-
-2010-12-20 12:27 source
-
- * Added support for Twitter
- * Added JSON format for webfinger
- * Added optional qrcode
-
-2010-12-20 12:26 source
-
- * Fixed missing files from vad
-
-2010-12-20 12:26 source
-
- * Added progress bar, ping and ACL
-
-2010-12-20 12:22 source
-
- * Added option to use tidy before loading rdfa
-
-2010-12-20 11:34 source
-
- * Fixed minor issues
-
-2010-12-17 17:40 source
-
- * Added support for connection string parameters with or without
- spaces in name
- * Fixed removed workaround for rollback msg
-
-2010-12-17 11:27 source
-
- * Fixed must not return error during rollback on killed txn
-
-2010-12-16 19:47 source
-
- * Fixed sparql select (1) { { ?:sss ?p ?o } optional { ?s1 ?p1 ?o1 }}
- (t1.S=sss condition was lost before)
-
-2010-12-15 15:25 source
-
- * Fixed index_only on partial can return has data even if main row
- does not
-
-2010-12-15 12:47 source
-
- * Added small optimizations
-
-2010-12-15 12:19 source
-
- * Added optimization to look at GS index only
-
-2010-12-15 10:42 source
-
- * Added support for define input:inference in SAPRQL DESCRIBE
-
-2010-12-14 19:18 source
-
- * Added JSON format for /.well-known/host-meta
-
-2010-12-14 13:22 source
-
- * Fixed cxml generation options
-
-2010-12-14 13:22 source
-
- * Fixed compiler warning
-
-2010-12-14 12:10 source
-
- * Fixed use CURI to make smaller footprint
-
-2010-12-14 12:07 source
-
- * Fixed hreview aggreates
- * Fixed use CURI to make smaller qrcode
- * Fixed CRLF
-
-2010-12-14 11:50 source
-
- file hreview_aggregate2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-12-14 12:07:57 +0000
-
-2010-12-13 21:32 source
-
- * Fixed 'none' is a special case with value 1
-
-2010-12-13 15:08 source
-
- * Fixed crash when only option inference is given without define
-
-2010-12-13 15:08 source
-
- * Fixed cxml
-
-2010-12-13 11:17 source
-
- * Fixed utf8_exec server issue
-
-2010-12-13 10:24 source
-
- * Fixed comparison of VARCHAR and UNAME box whith identical content
-
-2010-12-13 10:23 source
-
- * Added three new aggregates mostly for use with SPARQL-BI
-
-2010-12-13 10:22 source
-
- * Added support for passing NVARCHAR arguments to thread-safe dicts
-
-2010-12-13 10:20 source
-
- * Fixed check for mobile devices
-
-2010-12-12 18:09 source
-
- * Added RDFa W3c validation button
- * Added missing default XSL setting classes as view
- * Added optional qrcode in page
- * Added scrolling to use stop skip/N
- * Added link to /sparql endpoint
- * Fixed sid
- * Fixed shortened uri if too long
- * Fixed bookmarable urls
-
-2010-12-10 16:12 source
-
- * Updated documentation
-
-2010-12-10 16:02 source
-
- * Removed extra debugging
- * Fixed comments
-
-2010-12-10 15:43 source
-
- * Fixed minor issues
-
-2010-12-10 15:28 source
-
- * Added new settings to execute.html
- * Added hrefs to breadcrumbs in rdftab
- * Added a pager for queries.
- * Added URI shortener detection and user preference (persisted in
- HTML5 localStorage on compatible browsers)
- * Changed the way results are cached.
- Each query owns its results store, which is passed to the RDFMini
- for display.
-
-2010-12-10 15:27 source
-
- * Altered the order of preference for subject labels.
- * Fixed rdfs:label and skos:prefLabel now take preference over
- foaf:name.
- * Changed OAT.Dialog to accept a bitmap for buttons to include
- Should be (sort-of) backwards compatible (default value and setting
- to zero causes same behavior as before)
-
-2010-12-10 15:19 source
-
- * Merged from V5
-
-2010-12-10 15:18 source
-
- * Fixed do not do row autocommit when uploading with DAV api
- as this will break trigger logic
-
-2010-12-10 12:24 source
-
- * Added new testcases
-
-2010-12-10 12:00 source
-
- * Fixed deref of uninitialized memory
-
-2010-12-10 11:59 source
-
- * FIxed uninitialized variable
-
-2010-12-10 11:58 source
-
- * Fixed deref of uninited memory
-
-2010-12-09 14:00 source
-
- * Fixed FOAF import
-
-2010-12-09 13:57 source
-
- * Fixed convert link option
-
-2010-12-09 12:16 source
-
- file hrecipe2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-12-09 12:36:06 +0000
-
-2010-12-09 12:16 source
-
- * Added hRecipe cartridge
-
-2010-12-09 09:53 source
-
- * Fixed NULL case in patch_restricted_xml_chars()
-
-2010-12-08 16:08 source
-
- * Fixed sparql aggregate
-
-2010-12-08 16:04 source
-
- * Added RDFa W3c validation button
- * Added expiration header
- * Fixed DOI and RDFa
- * Fixed use doi proxy if no hslookup plugin
- * Fixed datatype for twitter
- * Fixed tidy for overstock cartridge
- * Fixed enable xlat iris
- * Fixed small bugs
-
-2010-12-07 11:30 source
-
- * Updated version of adapter
-
-2010-12-07 11:11 source
-
- * Added 'Owns', 'Knows' and 'Social Network'
- * Added profile security for offers, likes etc
- * Enhanced import procedure
- * Fixed small issues
-
-2010-12-07 10:38 source
-
- file index.vspx was added on branch V6_0_0-DEVEL on 2010-12-07 10:59:24 +0000
-
-2010-12-07 10:38 source
-
- * Added microblog template
-
-2010-12-07 10:38 source
-
- file default.css was added on branch V6_0_0-DEVEL on 2010-12-07 10:59:24 +0000
-
-2010-12-07 10:35 source
-
- file uiedit_knows.vspx was added on branch V6_0_0-DEVEL on 2010-12-07 11:11:31 +0000
-
-2010-12-07 10:35 source
-
- file uiedit_others.vspx was added on branch V6_0_0-DEVEL on 2010-12-07 11:11:31 +0000
-
-2010-12-07 10:35 source
-
- file uiedit_owns.vspx was added on branch V6_0_0-DEVEL on 2010-12-07 11:11:31 +0000
-
-2010-12-07 10:32 source
-
- * Added 'Knows' to the import
- * Enhanced import procedure
-
-2010-12-06 17:10 source
-
- * Added MinExpiration param for sponger
-
-2010-12-06 17:09 source
-
- * Fixed minor issues
-
-2010-12-06 17:08 source
-
- * FIxed show better message instead of error on url parse
-
-2010-12-06 10:34 source
-
- * Fixed max dns name is 250 chars
-
-2010-12-06 10:34 source
-
- * Added copy_list_to_array and revlist_to_array for plugins
-
-2010-12-06 10:33 source
-
- * Fixed if we have bad fd in saved sessions, check which one and
- remove, to avoid busy loop on unix
-
-2010-11-30 12:34 source
-
- * Fixed use char flags instead of bitfield
-
-2010-11-30 12:33 source
-
- * Added optimization for case when there is no locality
-
-2010-11-30 12:33 source
-
- * Fixed must lock mtx before reading cache
-
-2010-11-29 14:37 source
-
- * FIxed minor issues
-
-2010-11-29 14:36 source
-
- * Added statistics on how many remaps are free
-
-2010-11-26 21:23 source
-
- * Fixed busy loop when no free remaps
-
-2010-11-26 10:47 source
-
- * Added extra debugging on shared cache
-
-2010-11-26 10:46 source
-
- * Fixed issue compiling extensions in debug mode
-
-2010-11-25 19:53 source
-
- * Fixed must cut before print else will return wrong error
-
-2010-11-24 11:41 source
-
- * Fixed use external bif_tidy in the crawler
-
-2010-11-24 11:36 source
-
- * Fixed mark transaction as ended in provider if virtuoso server kills
- the transaction
-
-2010-11-23 19:30 source
-
- * FIxed issue with DISTINCT and ORDER BY
-
-2010-11-23 19:28 source
-
- * FIxed "delayed" crash in case of passing wrong argument
-
-2010-11-23 19:27 source
-
- * Added check for tidy in crawler
-
-2010-11-23 19:26 source
-
- * Fixed minor issue
-
-2010-11-23 10:20 source
-
- * Fixed bad test
-
-2010-11-22 20:40 source
-
- * Fixed issue with sparql-fed
-
-2010-11-22 20:39 source
-
- * Fixed prevent assert on large box
-
-2010-11-22 14:26 source
-
- * Fixed issue with bnode
-
-2010-11-22 11:28 source
-
- * Added VirtuosoQueryEngine auto registration was added to VirtGraph
- static initilization
-
-2010-11-22 11:06 source
-
- * Rebuild driver
-
-2010-11-22 11:00 source
-
- * Rebuild drivers
-
-2010-11-22 10:59 source
-
- * Fixed JDBC driver lost prepared data after execution query, so next
- execute of prepared query throws exception
-
-2010-11-20 10:57 source
-
- * Added bif patch_restrictec_xml_chars()
-
-2010-11-19 16:50 source
-
- * Added Likes and DisLikes
-
-2010-11-19 16:49 source
-
- * Added group sharing
- * Fixed extended user's select
-
-2010-11-19 16:47 source
-
- * Updated to ckeditor version 3.4.2
-
-2010-11-19 16:45 source
-
- * Added optimizations
- * Added checking for rdfa dtd
-
-2010-11-19 16:43 source
-
- * Fixed use integer for https_verity and https_cv_depth
- * Fixed use uppercase for SSL auth
-
-2010-11-19 16:41 source
-
- * Added setup for DET on collections
-
-2010-11-19 14:25 source
-
- * Fixed wrong number of params
-
-2010-11-19 14:25 source
-
- * Fixed busy loop
-
-2010-11-18 12:09 source
-
- file uiedit_likes.vspx was added on branch V6_0_0-DEVEL on 2010-11-19 16:50:49 +0000
-
-2010-11-18 12:07 source
-
- file icons_rtl.png was added on branch V6_0_0-DEVEL on 2010-11-19 16:47:48 +0000
-
-2010-11-17 21:30 source
-
- * Added function to get DTD identifiers
-
-2010-11-17 21:29 source
-
- * Fixed dimension is not in triples
-
-2010-11-17 21:29 source
-
- * Fixed page debug
-
-2010-11-17 21:28 source
-
- * Fixed name in footer
-
-2010-11-17 21:27 source
-
- * Added initialize query text option for /sparql
-
-2010-11-16 20:17 source
-
- * Fixed do not try to close bad filedescriptor as windows does not
- like this
-
-2010-11-16 14:30 source
-
- * Added imap client support
-
-2010-11-15 20:12 source
-
- * Fixed if we have a qr with no params at all, exec should signal error
-
-2010-11-15 16:51 source
-
- * Fixed issue with combination of UNION in the argument of IN causing
- General internal Optimized compiler error
-
-2010-11-15 16:47 source
-
- * Fixed record the thread which entered/left the buffer in debug mode
-
-2010-11-15 10:13 source
-
- * Fixed do not attempt to parse empty content
-
-2010-11-12 21:01 source
-
- * Fixed only check pages in online backup
-
-2010-11-12 21:00 source
-
- * Fixed recovery mode
-
-2010-11-12 21:00 source
-
- * Fixed send body of 509 bandwidth error
-
-2010-11-11 16:06 source
-
- * Updated version to 6.1.3-rc1
-
-2010-11-11 15:53 source
-
- * Fixed check for sql disabled flag
-
-2010-11-11 12:38 source
-
- * Fixed group editing
- * Fixed WebID for Briefcase instances
-
-2010-11-11 12:34 source
-
- * Added group sharing
-
-2010-11-11 11:23 source
-
- * Added special immutable setting for inf rules
-
-2010-11-10 15:59 source
-
- * Fixed use dsn from content-location when it exists
-
-2010-11-10 15:45 source
-
- * Fixed pass headers as options so every cartridge can read
-
-2010-11-10 12:00 source
-
- * Added magic key export
-
-2010-11-10 11:59 source
-
- * Fixed stack corruption on 64bit
-
-2010-11-09 21:47 source
-
- * Fixed memleak when error is signalled
-
-2010-11-09 21:44 source
-
- * Fixed avoid re-define
-
-2010-11-09 21:42 source
-
- * Fixed remove call to SP before it is defined
-
-2010-11-09 20:19 source
-
- * Fixed https access
- * Fixed ACL UI
-
-2010-11-09 20:18 source
-
- * Added support for SWD
- * Added support for Salmon
- * Added RDFa info
- * Fixed key removal not working
- * Fixed bad permissions for user's home directory creation
- * Fixed no validator at this point
- * Fixed sync user's pages
- * Fixed salmon api
- * Fixed move groups from briefcase into framework
-
-2010-11-09 20:15 source
-
- * Added initial support for Salmon protocol
- * Fixed check for email
- * Fixed uninstall problem
-
-2010-11-09 20:12 source
-
- * Added signed mails
- * Fixed https access
-
-2010-11-09 20:12 source
-
- * Fixed move groups from briefcase into ODS framework
- * Fixed https access
-
-2010-11-09 20:11 source
-
- * Fixed https access
- * Fixed labels
-
-2010-11-09 20:11 source
-
- * Fixed https access
-
-2010-11-09 20:01 source
-
- * Fixed properly encode the query before passing it to PivotViewer
-
-2010-11-09 19:59 source
-
- * Fixed more labels
-
-2010-11-09 10:59 source
-
- * Fixed split part of MTX_DEBUG into PAGE_DEBUG
-
-2010-11-08 15:42 source
-
- * Fixed prevent bad data to crash system during deserialization
-
-2010-11-08 12:37 source
-
- * Added http://loc.openlinksw.com/sparql as registered endpoint
- * Fixed URIs in resultview anchors
-
-2010-11-08 12:35 source
-
- * Fixed return string session, rather than allocate string so it will
- handle large resources
- * Fixed possible double free of temp filename
- * Fixed issue with MALLOC_DEBUG
-
-2010-11-08 12:21 source
-
- * Fixed ACL update
-
-2010-11-08 11:46 source
-
- * Fixed minor issue
-
-2010-11-08 11:45 source
-
- * Added ACL settings
- * Added new type
- * Added CORS options
- * Fixed layout of cert generation form
- * Fixed label of cartridges
-
-2010-11-08 11:26 source
-
- file construct_body.xsl was added on branch V6_0_0-DEVEL on 2010-11-09 20:12:59 +0000
-
-2010-11-08 11:25 source
-
- file SWD.sql was added on branch V6_0_0-DEVEL on 2010-11-09 20:18:21 +0000
-
-2010-11-08 11:08 source
-
- * Added check by entity type
-
-2010-11-05 20:23 source
-
- * Fixed check dp before processing
-
-2010-11-05 10:57 source
-
- * Fixed explanation of rdf inf failures
-
-2010-11-05 10:56 source
-
- * Fixed bad condition of extension, do not push local imports
-
-2010-11-05 10:54 source
-
- * Fixed /sparql/ endpoint to show/hide controls
- * Fixed show supported formats depending on configuration
-
-2010-11-05 10:53 source
-
- * Fixed CXML desc support
-
-2010-11-04 18:18 source
-
- * Fixed typo
-
-2010-11-02 19:14 source
-
- * Added cxml det
-
-2010-11-02 19:12 source
-
- * Fixed top/skip should only work for non-multistate
- * Fixed recover when itc is unregistered
-
-2010-11-01 14:15 source
-
- * FIxed only skip when initialized
-
-2010-10-29 14:12 source
-
- * Fixed when pl stats collection is enabled, the hash must be
- protected in order to avoid crash
-
-2010-10-29 14:11 source
-
- * Fixed when count/sum/avg and other aggregates make columns to be the
- respective type e.g. int or double, except when performing min/max
- on string, we turn off mem_cache_only, so they can goto disk
-
-2010-10-29 14:09 source
-
- * Fixed unbalanced } outside ifdef
-
-2010-10-29 14:08 source
-
- * Added function alias
-
-2010-10-29 14:08 source
-
- * Fixed when selection list contains expressions with constants do
- not inline OJ
-
-2010-10-27 12:59 source
-
- * Fixed issues with sparql fed
-
-2010-10-27 12:56 source
-
- * Added new bif functions dict_iter_hash and dict_key_eq
-
-2010-10-27 12:55 source
-
- * Added page enter debugging
-
-2010-10-27 12:53 source
-
- * Added support for CORS
-
-2010-10-27 12:52 source
-
- * Fixed check all the cos in gby to be numeric types
-
-2010-10-27 12:51 source
-
- * Added debug line pragmas
-
-2010-10-27 12:50 source
-
- * Fixed debug assert for itc_is_registered
-
-2010-10-25 13:23 source
-
- * Fixed compiler warnings
-
-2010-10-25 13:19 source
-
- * Fixed rdf boxes cmp
- * Fixed rdf inf loading
-
-2010-10-25 13:15 source
-
- * Fixed allow all users to have user_t so they can have their own
- encryption keys
-
-2010-10-25 12:38 source
-
- file salmon.sql was added on branch V6_0_0-DEVEL on 2010-11-09 20:18:22 +0000
-
-2010-10-25 12:38 source
-
- file uiedit_acl.vspx was added on branch V6_0_0-DEVEL on 2010-11-09 20:18:22 +0000
-
-2010-10-25 12:38 source
-
- file uiedit_acls.vspx was added on branch V6_0_0-DEVEL on 2010-11-09 20:18:23 +0000
-
-2010-10-22 21:12 source
-
- * Added contols to add text filters
- * Added support for creating new ses with class iri filter
- * Added choose type and start/continue facets browsing session to rdfdesc
- * Fixed drop text constraint
- * Fixed view types
-
-2010-10-22 16:34 source
-
- * Fixed link warning
-
-2010-10-22 16:31 source
-
- * Fixed issue with shadowing local variable in java hosting
-
-2010-10-22 14:58 source
-
- * Fixed temporary disabled code
-
-2010-10-22 12:31 source
-
- * Fixed single does not have a dpipe
-
-2010-10-22 10:28 source
-
- * FIxed if dpipe before outer section, put the dpipe before the set
- ctr of the outer section and not after, else it may mess with the
- output of the dpipe
-
-2010-10-22 09:52 source
-
- * Fixed missing symbol
-
-2010-10-22 09:50 source
-
- * Fixed rb can be twice as it is a ref
-
-2010-10-20 16:04 source
-
- * Fixed problem with extremely large XML doc
-
-2010-10-19 12:38 source
-
- * Added dynamic resizing of result block
-
-2010-10-18 18:50 source
-
- * Fixed issue with SPARQL CONSTRUCT/INSERT/DELETE/MODIFY queries
-
-2010-10-18 12:18 source
-
- * Fixed when a page with free remap is found, indicate the trx should be killed
- rather than getting infinite loop
- * Fixed extra debugging for page access
-
-2010-10-18 12:14 source
-
- * Fixed when operation is count etc, aggregate returning a number
- does not do memcache only in order to avoid running out of memory
-
-2010-10-18 12:01 source
-
- * Added new functions to ImageMagick plugin
-
-2010-10-15 11:37 source
-
- * Fixed fct_label on v6 single
-
-2010-10-13 13:59 source
-
- * Fixed the xe_make_copy is valid only for XMLTYPE, not for every UDT
-
-2010-10-13 13:59 source
-
- * Fixed gpf
-
-2010-10-13 12:12 source
-
- * Added rsh-sha256
- * Added xenc_dsig_verify, xenc_dsig_sign and xenc_key_RDA_construct
-
-2010-10-13 12:11 source
-
- * Removed old upgrade code
-
-2010-10-13 12:09 source
-
- * Fixed BestBuy cartridge
-
-2010-10-13 12:07 source
-
- * Added checks for value ranges
- * Added paging through 'Related Collections' links
-
-2010-10-13 12:02 source
-
- * Fixed minor issues
-
-2010-10-13 12:00 source
-
- * Added ACL semantic ping
- * Fixed encoding problems
- * Fixed JS error
-
-2010-10-13 11:59 source
-
- * Added ACL semantic ping
- * Fixed encoding problems
- * Optimized page load
-
-2010-10-13 11:58 source
-
- * Fixed encoding problems
- * Fixed and optimized users and webIDs
- * Fixed sharings
- * Optimized page load
-
-2010-10-13 10:36 source
-
- * Added ACL semantic ping
- * Fixed and optimized users and webIDs
- * Fixed empty lists
- * Fixed encoding problems
- * Optimized page load
-
-2010-10-13 10:35 source
-
- * Added ACL semantic ping
- * Fixed encoding problems
-
-2010-10-13 10:34 source
-
- * Added ACL semantic ping
- * Fixed and optimized users and webIDs
- * Fixed encoding problems
- * Fixed empty lists
- * Optimized page load
-
-2010-10-13 10:33 source
-
- * Added ACL semantic ping
- * Fixed and optimized users and webIDs
- * Fixed JS map error
- * Fixed JS errors
- * Fixed tabs
- * Fixed encoding problems
-
-2010-10-12 17:35 source
-
- * Fixed bug when filer (num <>= (subq))
-
-2010-10-12 12:23 source
-
- * Added support for latest tidylib
-
-2010-10-07 23:31 source
-
- * Fixed some issues with dsig_verify
-
-2010-10-07 13:29 source
-
- * Fixed new debug macro DK_ALLOC_BOX_DEBUG for basic integrety checks
- without overhead of full MALLOC_DEBUG
-
-2010-10-07 13:24 source
-
- * Added item ACL
- * Added ACL Inheritance
- * Fixed update
- * Fixed tag bug
-
-2010-10-07 13:07 source
-
- * Fixed minor issue
-
-2010-10-07 13:02 source
-
- file disconnect_16.png was added on branch V6_0_0-DEVEL on 2010-10-07 13:22:39 +0000
-
-2010-10-07 13:02 source
-
- file link_16.png was added on branch V6_0_0-DEVEL on 2010-10-07 13:22:39 +0000
-
-2010-10-07 13:02 source
-
- file ods_upstream.sql was added on branch V6_0_0-DEVEL on 2010-10-07 13:22:38 +0000
-
-2010-10-07 13:00 source
-
- * Added ACL Inheritance
- * Fixed updated UI
-
-2010-10-07 13:00 source
-
- * Added ACL Inheritance
- * Fixed binding the twitter and linkedin with their API
- * Fixed IE password field size bug
- * Fixed must quote vars from sparql
- * Fixed swat0
-
-2010-10-07 12:58 source
-
- * Added ACL Inheritance
- * Fixed optimized progress bar
- * Fixed read/unread actions
- * Fixed encoding problem
- * Fixed updated UI
- * Removed deprecated icons
-
-2010-10-07 12:56 source
-
- * Added ACL Inheritance
- * Fixed ACL recalc bug
- * Fixed updated UI
-
-2010-10-07 12:55 source
-
- * Added ACL Inheritance
- * Fixed optimized update
- * Fixed sharing problem
- * Fixed updated UI
-
-2010-10-07 12:54 source
-
- * Added ACL Inheritance
- * Fixed ACL recalc bug
- * Fixed optimize progress bar
- * Removed deprecated images
-
-2010-10-07 12:53 source
-
- * Fixed swat0
-
-2010-10-07 12:44 source
-
- * Updated documentation
-
-2010-10-07 12:20 source
-
- * Added option not to convert HTML pages
-
-2010-10-06 21:39 source
-
- * Added initial attribute/property value ranges conditional
- * Added new XML element <value-range hi="" lo="" /> for facet browser
- * Fixed make pivot bridge link conditional
-
-2010-10-06 21:37 source
-
- * Fixed prevent buggy IRI to hit compiler
-
-2010-10-06 09:40 source
-
- * Fixed problem compiling certain SPARQL constructions
-
-2010-10-06 09:35 source
-
- * Added some new functions to XPATH virtual table
- * Added optimizations to boolean expression evaluation
-
-2010-10-06 09:27 source
-
- * Fixed added qualifier to stored proc creation
-
-2010-10-06 09:26 source
-
- * Fixed moved some checks to header file for macro expansion
-
-2010-10-06 09:15 source
-
- * Added support for CSV output mode
-
-2010-10-06 09:15 source
-
- * Fixed compatibility with openssl 0.9.7
-
-2010-10-05 09:39 source
-
- * Fixed when enlist starts we should have new xid or not listed
-
-2010-10-04 18:39 source
-
- * Fixed if resource is not free e.q. count = 2 we most restore as other
- thread can kill it in the middle
-
-2010-10-04 14:40 source
-
- * Fixed save should happen after checks, as jump would leave members
- NULL
-
-2010-09-27 22:37 source
-
- * Fixed missing text from cache
-
-2010-09-27 19:41 source
-
- * FIxed label
-
-2010-09-27 14:45 source
-
- * Added linkblog pages
- * Fixed smaller tweet me button on bottom
- * Fixed template list
-
-2010-09-27 14:44 source
-
- * Added ACL inheritance
-
-2010-09-27 14:44 source
-
- * Fixed date update change in events/tasks
-
-2010-09-27 14:37 source
-
- * Rebuild drivers
-
-2010-09-27 14:29 source
-
- * Fixed issue with connection timeout
-
-2010-09-27 14:24 source
-
- file linkblog.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:09 +0000
-
-2010-09-27 14:23 source
-
- file uiedit_sec.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:40 +0000
-
-2010-09-27 14:23 source
-
- file uiedit_val.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:41 +0000
-
-2010-09-27 14:23 source
-
- file uiedit_ws.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:41 +0000
-
-2010-09-27 14:23 source
-
- file uiedit_ann.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:39 +0000
-
-2010-09-27 14:23 source
-
- file uiedit_bz.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:40 +0000
-
-2010-09-27 14:23 source
-
- file uiedit_grp.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:40 +0000
-
-2010-09-27 14:23 source
-
- file uiedit_ldap_include.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:40 +0000
-
-2010-09-27 14:23 source
-
- file uiedit_nav.vspx was added on branch V6_0_0-DEVEL on 2010-09-27 14:45:40 +0000
-
-2010-09-27 14:23 source
-
- * Fixed split uiedit into separate pages to get better response time
- when compiling
- * Fixed 'Generate Certificate'
-
-2010-09-27 14:13 source
-
- * Fixed minor issues
-
-2010-09-27 14:11 source
-
- * Fixed ACL implementation
-
-2010-09-27 14:11 source
-
- * Fixed take DynamicLocal into account
-
-2010-09-27 13:51 source
-
- * FIxed client must not redefine mutex_enter as this will crash single
-
-2010-09-27 08:58 source
-
- * Fixed use x-forwarded-for and remember it is forwarded
-
-2010-09-27 08:57 source
-
- * Fixed use the redirect link for base when supplied
-
-2010-09-27 08:56 source
-
- * Fixed check if m2 is a box
-
-2010-09-22 15:11 source
-
- * Reverted patch
-
-2010-09-22 14:01 source
-
- * Added xml_sign() for making pure XML signatures
- * Added signature in host-meta xrd
- * FIxed memleaks when doing xml signatures
-
-2010-09-22 13:56 source
-
- * Fixed bad procedure name
-
-2010-09-22 13:06 source
-
- * Fixed unified login pages
- * Fixed upgraded ACL implementation
- * Fixed Linkedin link
-
-2010-09-22 13:03 source
-
- * Fixed upgraded ACL implementation
-
-2010-09-22 13:02 source
-
- file summary.vspx was added on branch V6_0_0-DEVEL on 2010-09-22 13:56:50 +0000
-
-2010-09-22 13:02 source
-
- * Added archive and summary pages
- * Added new templates to vad
-
-2010-09-22 13:02 source
-
- file archive.vspx was added on branch V6_0_0-DEVEL on 2010-09-22 13:56:49 +0000
-
-2010-09-22 13:02 source
-
- file summary.vspx was added on branch V6_0_0-DEVEL on 2010-09-22 13:56:49 +0000
-
-2010-09-22 12:50 source
-
- * Fixed minor issues
-
-2010-09-22 12:48 source
-
- * Fixed vcard and vcal file import
-
-2010-09-22 12:48 source
-
- * Fixed group ACL access
-
-2010-09-21 13:12 source
-
- * Fixed load demo vad after tutorial
-
-2010-09-21 13:11 source
-
- * Added missing file
-
-2010-09-21 11:34 source
-
- * Fixed focus issue
- * Fixed typo
- * Fixed XRDS
-
-2010-09-21 11:33 source
-
- file bg.png was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:52 +0000
-
-2010-09-21 11:33 source
-
- file bg_page_title.png was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:51 +0000
-
-2010-09-21 11:33 source
-
- file bg_page_title_inner.jpg was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:51 +0000
-
-2010-09-21 11:33 source
-
- file default.css was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:52 +0000
-
-2010-09-21 11:33 source
-
- file index.vspx was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:52 +0000
-
-2010-09-21 11:33 source
-
- * Added new templates
-
-2010-09-21 11:33 source
-
- file bg_content.png was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:51 +0000
-
-2010-09-21 11:33 source
-
- file bg_header.png was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:51 +0000
-
-2010-09-21 11:33 source
-
- file default.css was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:51 +0000
-
-2010-09-21 11:33 source
-
- file index.vspx was added on branch V6_0_0-DEVEL on 2010-09-21 11:38:51 +0000
-
-2010-09-21 11:20 source
-
- * Fixed serialize access to connection struct
-
-2010-09-20 10:14 source
-
- * Fixed Id
-
-2010-09-20 09:51 source
-
- * Added RDFa doctype
- * Added new feature of fct to show certain graph
-
-2010-09-20 09:50 source
-
- * Fixed http://dbpedia.org/property/name is not the name of the subject
-
-2010-09-20 09:23 source
-
- * Added new feature of fct to show certain graph when fct is installed
-
-2010-09-20 09:20 source
-
- file linkedin-large.png was added on branch V6_0_0-DEVEL on 2010-09-20 09:25:56 +0000
-
-2010-09-20 09:20 source
-
- file sign-in-with-twitter-d.png was added on branch V6_0_0-DEVEL on 2010-09-20 09:25:56 +0000
-
-2010-09-20 09:20 source
-
- file register.js was added on branch V6_0_0-DEVEL on 2010-09-20 09:25:54 +0000
-
-2010-09-20 09:20 source
-
- file twitter_login.vsp was added on branch V6_0_0-DEVEL on 2010-09-20 09:25:55 +0000
-
-2010-09-20 09:20 source
-
- file linkedin_login.vsp was added on branch V6_0_0-DEVEL on 2010-09-20 09:25:53 +0000
-
-2010-09-20 09:20 source
-
- file login.js was added on branch V6_0_0-DEVEL on 2010-09-20 09:25:53 +0000
-
-2010-09-20 09:20 source
-
- * Added new login and register library
- * Added WebID to 'My Profile'
- * Added linkedin login
- * Added new inde on OL accounts
- * Added twitter login page
- * Added login with Google account
- * Fixed WebFinder to look at sameas
- * Fixed X.509 certificates in user pages
- * Fixed password problem
- * Fixed group ACL access
- * Fixed validation ACLs
- * Fixed openID server parameters extraction
- * Fixed create instance defaults
- * Fixed use of timezone
- * Fixed Safari and Chrome bug
- * Fixed biographical date input
-
-2010-09-20 09:14 source
-
- * Fixed filter problem with WebID
-
-2010-09-20 09:13 source
-
- * Added ACL support for tasks
- * Fixed group ACL access
- * Fixed ACL table UI
- * Fixed private access
- * Fixed validation ACLs
-
-2010-09-20 09:12 source
-
- * Fixed group ACL access
- * Fixed ACL group select
- * Fixed ACL UI
- * Fixed validation ACLs
-
-2010-09-20 09:11 source
-
- * Added ACLs
- * Fixed group ACL access
- * Fixed private access
-
-2010-09-20 09:09 source
-
- * Fixed group ACL access
- * Fixed ACL table UI
- * Fixed private access
- * Fixed validation ACLs
-
-2010-09-20 08:55 source
-
- * Added refresh=clean mode, to drop cache even if it is in the middle
- of sponging on another threads
- * Added scheduler task to keep volume under some limit
-
-2010-09-20 08:27 source
-
- * Fixed ACL testing now http returns 509
-
-2010-09-17 23:11 source
-
- * Fixed when fct is installed, use the new feature of fct to show
- certain graphs
-
-2010-09-17 23:10 source
-
- * Fixed hang in prefix check if there is single dot in prefix
-
-2010-09-17 23:10 source
-
- * Fixed check log text should always be DV_STRING
-
-2010-09-17 23:08 source
-
- * Added support for CXML
-
-2010-09-17 23:03 source
-
- * Added strong optimization of SPARQL arithmatic and numerical
- comparisons
-
-2010-09-17 22:49 source
-
- * Added initial support for RDB2RDF
-
-2010-09-17 22:05 source
-
- * Added improvements for SPARQL-FED esp. to let XSLT access data
- from remote SPARQL endpoint
-
-2010-09-17 20:49 source
-
- * Fixed rendezvous thread should never handle any signals
-
-2010-09-17 16:50 source
-
- * Fixed moved include file to more appropriate place
-
-2010-09-17 16:48 source
-
- * Fixed do not try when in V6 single mode
-
-2010-09-17 16:45 source
-
- * Added new bifs that print start element, end elemend and empty
- element with some number of attributes. Attribute values are
- checked for NULL and print only non-NULLs to eliminate numerous
- IF statements in Virtuoso/PL
-
-2010-09-17 16:42 source
-
- * Added bif that checks if some value is stored in given dictionary
- for a given key, without returning it. This is usefull if value is
- potentially big as it does not copy anything.
-
-2010-09-17 16:40 source
-
- * Fixed let some string BIFs accept UNAME arguments
-
-2010-09-17 16:35 source
-
- * Removed deprecated repl code
-
-2010-09-17 11:18 source
-
- * Fixed isalnum needs unsigned char as negative values might trip asserts
- on some systems like Windows
-
-2010-09-15 23:54 source
-
- * Fixed handling format like 2010-09-15T14:24:28Z without fraction part
- * Fixed set local timezone
-
-2010-09-15 08:10 source
-
- * Fixed redirects for tcn
- * Fixed set default to html
- * Fixed in order of browser preference
-
-2010-09-13 16:03 source
-
- * Fixed issue with xs_q_4/foaf.vsp demo
-
-2010-09-09 19:19 source
-
- * Added check
-
-2010-09-09 19:18 source
-
- * FIxed print dict in dbg_* functions
-
-2010-09-09 16:02 source
-
- * Fixed minor issue
-
-2010-09-09 15:32 source
-
- * Added MIME types for .NET click-once, MS Office and MS WPF applications
- * Added additional MIME types based on apache mime.types.txt
-
-2010-09-07 21:56 source
-
- * Added geo for dbpedia
- * Fixed wrong var names
- * Fixed issue with IE
- * Fixed deprecated call to OAT.Dom.applyStyle into OAT.Style.set
- * Removed unused background
-
-2010-09-07 21:37 source
-
- * Added fingerpoint hook
-
-2010-09-07 21:28 source
-
- * Added oauth+openid hybrid
- * Added JS validation routines
- * Added fingerpoint hooks
- * Fixed x509 order
- * Fixed use ssl login if accessed via https
- * Fixed https on endpoint
- * Fixed openid for fingerpoint
- * Fixed seeAlso lookups via WF/FP
- * Fixed Facebook issues
- * Fixed validation ACLs
- * Fixed Gallery pane
-
-2010-09-07 21:28 source
-
- file openid_oauth_test.vsp was added on branch V6_0_0-DEVEL on 2010-09-07 22:00:53 +0000
-
-2010-09-07 21:28 source
-
- file validate.js was added on branch V6_0_0-DEVEL on 2010-09-07 22:00:54 +0000
-
-2010-09-07 21:24 source
-
- * Fixed ACL
-
-2010-09-07 21:24 source
-
- * Added ACL
-
-2010-09-07 21:23 source
-
- * Fixed private access error
-
-2010-09-07 21:23 source
-
- * Fixed private access error
- * Fixed typo
-
-2010-09-07 19:55 source
-
- * Minor fixes
-
-2010-09-07 19:55 source
-
- * Added XRD meta
-
-2010-09-07 19:54 source
-
- * Added attribution ontology
-
-2010-09-07 19:54 source
-
- file attribution.owl was added on branch V6_0_0-DEVEL on 2010-09-07 21:58:11 +0000
-
-2010-09-01 12:57 source
-
- file uiedit_groups.vspx was added on branch V6_0_0-DEVEL on 2010-09-07 22:00:53 +0000
-
-2010-09-01 12:57 source
-
- file webid_select.vspx was added on branch V6_0_0-DEVEL on 2010-09-07 22:00:54 +0000
-
-2010-09-01 10:15 source
-
- * Added support headers from url rewrite for static resources such
- as files
-
-2010-09-01 10:11 source
-
- * Fixed link headers
-
-2010-08-31 12:12 source
-
- * Added missing function
-
-2010-08-31 12:12 source
-
- * Added support for IUD ops to XMLA endpoint
-
-2010-08-31 12:09 source
-
- * Fixed return appropriate message based on the type of ACL result
-
-2010-08-31 11:45 source
-
- * Added support for host-meta
-
-2010-08-30 13:46 source
-
- * Updated documentation
-
-2010-08-30 13:37 source
-
- * Fixed use short representations to make sorted by
-
-2010-08-30 13:35 source
-
- * Fixed missing prototype
-
-2010-08-30 12:34 source
-
- * Fixed use webfinger to do ssl authentication
-
-2010-08-30 12:21 source
-
- * Fixed error message generation in execute
- * Fixed encoding issue in directory listings generated from
- filesystem-hosted virtual directories
-
-2010-08-26 22:49 source
-
- * FIxed i18n support for subject and address list
-
-2010-08-26 22:41 source
-
- * Fixed typo
-
-2010-08-26 22:40 source
-
- * Added Evri cartridge and ontology
- * Added hNews cartridge
-
-2010-08-26 22:40 source
-
- file evri2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-08-26 22:46:12 +0000
-
-2010-08-26 22:40 source
-
- file hnews2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-08-26 22:46:12 +0000
-
-2010-08-26 22:40 source
-
- file oplevri.owl was added on branch V6_0_0-DEVEL on 2010-08-26 22:46:12 +0000
-
-2010-08-26 22:34 source
-
- * Added support for acct: scheme
-
-2010-08-26 22:33 source
-
- * Added support for webfinger + OpenID
- * Fixed login with webfinger
- * Fixed login popup page
- * Fixed sameAs validation values
- * Fixed Facebook link
- * Fixed iframe number
- * Fixed certificate generator
-
-2010-08-26 22:30 source
-
- * Fixed application settings page url
-
-2010-08-26 18:04 source
-
- * Added support for host-meta
-
-2010-08-26 18:03 source
-
- * Fixed if position is not valid, skip the iob and go to next
-
-2010-08-24 22:34 source
-
- * Fixed set to NULL after free
-
-2010-08-22 16:04 source
-
- * Added option for to validate in hours
-
-2010-08-22 13:06 source
-
- * Added new SQL optimization trick to convert
- sprintf ('format', col0, col1, ..., colN) = exnp
- into more index friendly:
- ( col0 = sprintf_inverse ('format', expn, 2)[0] and
- col1 = sprintf_inverse ('format', expn, 2)[1] and ...
- colN = sprintf_inverse ('format', expn, 2)[N] )
-
-2010-08-20 10:12 source
-
- * Fixed typo in BIF name
- * Fixed SPARQL resultset output if some objects of an RDF storage are
- corrupted
-
-2010-08-20 10:10 source
-
- * Fixed error on INSERT DATA with literals of non-default types
-
-2010-08-20 10:09 source
-
- * Fixed issue with ill formed SPARQL requests send by SPARQL SERVICE
- clause with dynamic parameters
-
-2010-08-20 10:07 source
-
- * Fixed issue parsing sparql function calls with zero arguments
-
-2010-08-18 08:41 source
-
- * Fixed check dirsallowed before loading file
-
-2010-08-17 21:40 source
-
- * Fixed use webfinger to do SSL authentication
-
-2010-08-17 18:29 source
-
- * Added support to use webfinger for SSL authentication
- * Disabled rel=me tweak
-
-2010-08-17 18:05 source
-
- * Added Google Book cartridge
-
-2010-08-17 18:05 source
-
- file google_book2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-08-17 18:32:24 +0000
-
-2010-08-17 18:05 source
-
- * Fixed use foaf ssl procedure
-
-2010-08-17 18:01 source
-
- * Added get-certificate_info (10,cert,type, pass, 'subject field name
- e.g. emailAddress, OU etc.')
-
-2010-08-17 11:06 source
-
- * FIxed sparql parse bug with NOT FROM NAMED queries like
- select distinct ?g ?p not from named virtrdf: where
- { graph ?g { ?s ?p ?o }}
-
-2010-08-17 10:23 source
-
- * Fixed security issue in SPARQL
- A compiled and cached query may stay in its old state (not
- recompiled) after global security changes like
- DB.DBA.RDF_DEFAULT_USER_PERMS_SET ('nobody', 0) that should
- recompile most of queries cached for all users but it does not.
-
-2010-08-17 10:22 source
-
- * Fixed build rules
-
-2010-08-17 09:25 source
-
- * Fixed moved constant declarations of commonly used UNAMEs into
- separate file
-
-2010-08-16 10:10 source
-
- * Added webfinger protocol
- * Fixed cert gen on firefox with .net addon
-
-2010-08-16 10:09 source
-
- * Fixed bug in re-install
-
-2010-08-16 10:07 source
-
- * Fixed labels
-
-2010-08-16 10:07 source
-
- * FIxed missing data for interval column
-
-2010-08-11 11:24 source
-
- file webfinger.sql was added on branch V6_0_0-DEVEL on 2010-08-16 10:10:07 +0000
-
-2010-08-11 11:07 source
-
- * Added support for define output:format "NT"
-
-2010-08-11 10:53 source
-
- * Fixed issue with sparql subcode gen
-
-2010-08-10 18:47 source
-
- * Fixed should not use escape here
-
-2010-08-10 18:45 source
-
- * Added WebID share
- * Fixed secure sponged VD setup
-
-2010-08-10 14:52 source
-
- * Fixed wrong URL
-
-2010-08-10 07:04 source
-
- file rdf_conf.vspx was added on branch V6_0_0-DEVEL on 2010-08-10 18:45:56 +0000
-
-2010-08-10 07:04 source
-
- file tbl.js was added on branch V6_0_0-DEVEL on 2010-08-10 18:45:56 +0000
-
-2010-08-09 20:08 source
-
- * Fixed some URL links
-
-2010-08-09 19:44 source
-
- * Fixed support for source_uri attribute in sticker
-
-2010-08-08 11:55 source
-
- * Fixed enhanced type recognition
- * Fixed return errors when loading fails
-
-2010-08-08 11:55 source
-
- * Fixed TOP has argument order of offset, limit
-
-2010-08-06 10:29 source
-
- * Fixed issues with Rename
- * Fixed issues with Upstreaming
-
-2010-08-06 10:04 source
-
- file tbl.js was added on branch V6_0_0-DEVEL on 2010-08-06 10:30:03 +0000
-
-2010-08-06 10:03 source
-
- * Added support for SSL and WebID
-
-2010-08-06 09:46 source
-
- * Fixed skip constant ssl returned from temp table output
-
-2010-08-04 18:50 source
-
- * Fixed clear conn vars after trx replay
-
-2010-08-04 09:34 source
-
- * Updated documentation
-
-2010-08-04 07:37 source
-
- * Added UI for rdb2rdf
-
-2010-08-04 07:37 source
-
- * Fixed use subseq to handle blobs
-
-2010-08-04 07:35 source
-
- * Fixed Activity log
- * Fixed /about virtual dir
- * Fixed rewrite http header in cert output
-
-2010-08-04 07:33 source
-
- * Fixed Activity log
- * Fixed file view
- * Fixed filenames with .acl extension properties editing
-
-2010-08-04 07:32 source
-
- * Fixed encoding problem
-
-2010-08-04 07:30 source
-
- * Fixed Activity log
-
-2010-08-04 07:30 source
-
- * Fixed Activity log
- * Fixed uninstall DET folders
- * Fixed 'ResFolder' type filters
-
-2010-08-04 07:10 source
-
- * Added persistent xmlns UI
-
-2010-08-04 07:10 source
-
- file persistent_xmlns.vspx was added on branch V6_0_0-DEVEL on 2010-08-04 07:38:10 +0000
-
-2010-08-04 07:03 source
-
- * Added WebID based ACL support via https
-
-2010-08-04 07:02 source
-
- * Fixed Tesco cartridge
-
-2010-08-04 07:02 source
-
- file opltesco.owl was added on branch V6_0_0-DEVEL on 2010-08-04 07:39:47 +0000
-
-2010-08-04 06:58 source
-
- * Fixed avoid errors later in process
-
-2010-08-04 06:53 source
-
- * FIxed use X-Forwarded-Host when the instance is behind gateway
-
-2010-08-02 11:31 source
-
- * Fixed when result from authentication is negative then return
- else WebID fals
- * Fixed http auth checks
-
-2010-08-02 11:25 source
-
- * Fixed keep mime hash in sync
-
-2010-08-02 11:23 source
-
- * Fixed do not allow sponger to change log mode explicitly to no-lock and
- row-autocommit
-
-2010-08-02 11:20 source
-
- * Added support for POP3 over SSL
-
-2010-08-02 07:40 source
-
- * Added global X509 CA repository
-
-2010-07-29 16:25 source
-
- * Updated documentation
-
-2010-07-29 16:17 source
-
- * Fixed dynlocal format must be replaced by host as in host header
-
-2010-07-29 16:14 source
-
- * Added common api FOAF_SSL_WEBID_GET
- * Added setting for online certificate service
- * Added https link in header
- * Fixed online accounts
- * Fixed WebID
- * Fixed alt name can have multiple values
-
-2010-07-28 12:26 source
-
- * Fixed size of res column to fit side menu on smaller screens like
- iPhone
-
-2010-07-28 12:10 source
-
- * Fixed minor issues
-
-2010-07-26 21:01 source
-
- * Fixed when http auth fails, must keep the http status as 401
-
-2010-07-26 12:59 source
-
- * Fixed alt names can have multiple values
- * Fixed paths creation
- * Fixed users select
- * Fixed renamed User Login to Identify Yourself
-
-2010-07-26 12:58 source
-
- * Fixed path creation
- * Fixed URLs
- * Fixed users select
-
-2010-07-26 12:58 source
-
- * Fixed path creation
- * Fixed URLs
-
-2010-07-26 09:25 source
-
- file select.gif was added on branch V6_0_0-DEVEL on 2010-07-26 12:59:16 +0000
-
-2010-07-23 19:44 source
-
- * Fixed bug with WebDAVFS client
-
-2010-07-23 19:43 source
-
- * Added continue handler to catch missing graph group signal
-
-2010-07-23 19:42 source
-
- * Fixed URL after login
- * FIxed view.vsp not found problem
-
-2010-07-23 19:39 source
-
- * Adde additional endpoint
- * Fixed splash screen
- * Fixed error message when JavaScript is not available
- * Fixed geo location
-
-2010-07-23 19:36 source
-
- * Added new lock icon ref
- * Fixed online services validation
- * Fixed IE UI profile view
- * Fixed multiple certificates in UI profile
- * Fixed issue with "Creator of"
- * Fixed image button for users pages
- * Fixed browser related problems
- * Fixed labels
-
-2010-07-23 19:31 source
-
- * Removed deprecated files
-
-2010-07-23 15:56 source
-
- * Fixed auth bug with WebDAVFS client
-
-2010-07-20 13:08 source
-
- * Fixed minor issues
-
-2010-07-20 13:01 source
-
- * Fixed WebKit problems with UI profile
-
-2010-07-20 13:01 source
-
- * Fixed sync security profile
-
-2010-07-19 14:50 source
-
- * Added discussion page rewrite rules
- * Fixed change Member ID to User ID
- * Fixed ODS to Digest in Login/Register form
- * Fixed X.509 page for IE
-
-2010-07-19 14:48 source
-
- * Fixed URLs
-
-2010-07-19 14:39 source
-
- * Fixed missing dependency
-
-2010-07-19 14:39 source
-
- * Fixed ordering to work with IE 7/8
-
-2010-07-19 07:12 source
-
- * Fixed version
-
-2010-07-19 07:11 source
-
- * Fixed some issues with sparql queries returning strings instead of IRIs
-
-2010-07-19 07:08 source
-
- * Added explain if params are copied
-
-2010-07-19 07:08 source
-
- * Fixed dir listing to use UTF-8 to show chars other than latin1
-
-2010-07-19 06:59 source
-
- * Fixed issue with inferencing
-
-2010-07-19 06:59 source
-
- * Fixed compiler warnings
-
-2010-07-14 21:18 source
-
- * Fixed following checkpoint kill recovery remap extents may have
- allocated pages with no correspoinding logical page because recovery
- performs unremap. Therefor if em remap page is allocated in em but
- free in dbs freemap, disregards and reset em allocation, if no logical
- page. If logical page, concider the dbs freeset in errror and mark page
- as allocated.
-
-2010-07-09 15:57 source
-
- * Updated version to 6.1.2 for final release
-
-2010-07-09 15:57 source
-
- * Fixed version string ODBC driver
-
-2010-07-09 15:36 source
-
- * Updated debian packaging files
-
-2010-07-09 15:29 source
-
- * Fixed free data in wrong order
-
-2010-07-09 14:17 source
-
- * Rebuild drivers
-
-2010-07-09 14:16 source
-
- * Fixed performance issue loading LANG/TYPE info from empty db
-
-2010-07-09 13:32 source
-
- * Fixed do not run tpc-h create on vad install
-
-2010-07-09 13:01 source
-
- * Added UI support for SSL/TLS connection to LDAP server
-
-2010-07-09 12:59 source
-
- * Added new tutorials
-
-2010-07-08 20:41 source
-
- * Fixed application URLs
-
-2010-07-08 20:40 source
-
- * Fixed application URL rewrite rules
-
-2010-07-08 13:40 source
-
- * FIxed OpenID and SSL login
-
-2010-07-08 13:37 source
-
- * Fixed VTIMEZONE component in export
-
-2010-07-08 13:27 source
-
- * Fixed minor issue
-
-2010-07-08 13:23 source
-
- * Added optimization for large descriptions
-
-2010-07-08 13:21 source
-
- * Fixed add escape to CR/LF in JSON format
-
-2010-07-07 18:53 source
-
- * Fixed openid to work with personal iri
-
-2010-07-07 18:42 source
-
- * Updated documentation
-
-2010-07-07 12:43 source
-
- * Fixed create list of unique graphs
-
-2010-07-06 23:07 source
-
- * Added Tumblr cartridge
-
-2010-07-06 23:06 source
-
- * Added description for property value in offers
-
-2010-07-06 23:04 source
-
- * Added shared files using FOAF+SSL
-
-2010-07-06 22:58 source
-
- * Fixed minor issue
-
-2010-07-06 14:30 source
-
- * Updated version to 6.1.2-rc3
-
-2010-07-06 14:24 source
-
- * Added new setting WideAsUTF16 to ODBC driver to return UTF-16LE
- when using SQLWCHAR
- * Fixed setting for UTF-8 when db keeps UTF-8 in varchars
-
-2010-07-06 14:06 source
-
- * Fixed declaration after statement
-
-2010-07-06 10:40 source
-
- * Fixed yac_list_keys output is changed
-
-2010-07-06 10:39 source
-
- * Fixed examine lastmod ts before updating
-
-2010-07-06 10:34 source
-
- * Fixed as col_default is always a serialized value, zero can appear
- as default integer zero
-
-2010-07-06 09:56 source
-
- * Fixed move alloc/free of descriptor handles into SQLAllocStmt
-
-2010-07-05 22:21 source
-
- file tumblr2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-07-06 23:07:47 +0000
-
-2010-07-05 19:30 source
-
- * Added information for building on Mac OS X 10.6
-
-2010-07-05 19:25 source
-
- * Added missing test for memcpy
-
-2010-07-05 15:01 source
-
- * Fixed wikiWord ("." is not yet part of the name)
-
-2010-07-05 14:59 source
-
- * Fixed when importing keys, let user decide which on to use as his
- webid for ODBC/SQL login
-
-2010-07-05 14:48 source
-
- * Added support for FOAF+SSL authentication
-
-2010-07-05 14:11 source
-
- * Updated documentation
-
-2010-07-05 14:05 source
-
- * Fixed upgrade procedure, more checks
-
-2010-07-05 14:04 source
-
- * Moved to conductor
-
-2010-07-05 13:24 source
-
- * Fixed handling multiple certs
-
-2010-07-05 13:23 source
-
- * FIxed can have many certs in FOAF
-
-2010-07-05 13:17 source
-
- * Mover ACL UI into conductor
- * Fixed dependency on ODS Framework
-
-2010-07-05 13:11 source
-
- file sparql_acl.vspx was added on branch V6_0_0-DEVEL on 2010-07-05 13:17:25 +0000
-
-2010-07-05 13:04 source
-
- * Fixed use label ontology to extract geo coordinates
-
-2010-07-05 12:47 source
-
- file manifest2.main was added on branch V6_0_0-DEVEL on 2010-07-05 12:56:21 +0000
-
-2010-07-05 12:47 source
-
- file manifest3.main was added on branch V6_0_0-DEVEL on 2010-07-05 12:56:21 +0000
-
-2010-07-05 12:47 source
-
- file manifest4.main was added on branch V6_0_0-DEVEL on 2010-07-05 12:56:21 +0000
-
-2010-07-05 12:42 source
-
- * Added driver versioning
- * Fixed issue with batch commit
-
-2010-07-05 12:41 source
-
- * Added driver versioning
- * FIxed issue with batch commit
-
-2010-07-05 12:40 source
-
- * Rebuild driver
-
-2010-07-05 12:40 source
-
- * Added driver versioning
- * Fixed force jena's lazy initialization when Graph is created
- * Fixed ignore warning on Binding.add NULL value
-
-2010-07-05 12:21 source
-
- * Rebuild drivers
-
-2010-07-05 12:16 source
-
- * Added driver versioning
-
-2010-07-05 12:16 source
-
- file Version.java was added on branch V6_0_0-DEVEL on 2010-07-05 12:40:15 +0000
-
-2010-07-05 12:16 source
-
- file Version.java was added on branch V6_0_0-DEVEL on 2010-07-05 12:41:21 +0000
-
-2010-07-05 12:16 source
-
- file Version.java was added on branch V6_0_0-DEVEL on 2010-07-05 12:42:23 +0000
-
-2010-07-05 12:16 source
-
- file manifest.main was added on branch V6_0_0-DEVEL on 2010-07-05 12:40:15 +0000
-
-2010-07-05 12:16 source
-
- file manifest.main was added on branch V6_0_0-DEVEL on 2010-07-05 12:41:21 +0000
-
-2010-07-05 12:16 source
-
- file manifest.main was added on branch V6_0_0-DEVEL on 2010-07-05 12:42:23 +0000
-
-2010-07-05 08:30 source
-
- * Added more assertations to facets ontology
-
-2010-07-05 08:29 source
-
- * Added label as IPF
-
-2010-07-05 08:29 source
-
- * Remove tags from comment, label etc
-
-2010-07-05 08:26 source
-
- * Added support for multiple certificates in user profile
- * Added semantic pingback log
- * Fixed GoodsRelation SIOC data
- * Fixed Offers
-
-2010-07-05 08:25 source
-
- * FIxed JS error showing unlogged users
-
-2010-07-05 08:22 source
-
- file semping_log.vspx was added on branch V6_0_0-DEVEL on 2010-07-05 08:26:09 +0000
-
-2010-07-05 08:20 source
-
- * Fixed RSS data
-
-2010-07-05 08:13 source
-
- * Fixed minor issue
-
-2010-07-01 11:52 source
-
- * Fixed namespace issues
-
-2010-07-01 11:49 source
-
- * Fixed IE problem with negative size on box
- * Fixed do not rewrite existing href on a++ links
-
-2010-06-30 14:32 source
-
- * Fixed handing of items in alt name
-
-2010-06-30 14:31 source
-
- * Fixed UI profile edit
- * Fixed Favorites
-
-2010-06-30 14:29 source
-
- * Fixed when distinct, should use one or the other ssl depending on which
- is non null
-
-2010-06-30 09:58 source
-
- * Fixed minor issues
-
-2010-06-30 09:47 source
-
- * Added UI semantic ping
-
-2010-06-30 09:47 source
-
- file semping_app.vspx was added on branch V6_0_0-DEVEL on 2010-06-30 14:31:42 +0000
-
-2010-06-30 09:47 source
-
- * Fixed handling of items in alt name
-
-2010-06-29 22:55 source
-
- * Fixed handling of alt name
-
-2010-06-29 12:50 source
-
- * Fixed semantic pingback
-
-2010-06-29 11:53 source
-
- * Updated version to 6.1.2-rc2
-
-2010-06-28 11:14 source
-
- * Fixed ontology label
-
-2010-06-28 10:34 source
-
- * Fixed sparql union selections, added ANY decl on relevant section
- list bits
-
-2010-06-28 10:30 source
-
- * Rebuild driver
-
-2010-06-28 10:19 source
-
- * Added support for creating ruleset
- * Fixed handling of quotes in literals
-
-2010-06-28 10:14 source
-
- * Added support for using VirtuosoDataSource
- * Fixed handling of quote chars in literals
-
-2010-06-28 09:49 source
-
- * Updated documentation
-
-2010-06-28 09:48 source
-
- * Added new images
-
-2010-06-28 09:35 source
-
- * Added new RDF framework
- * Added JS XPATH library
- * Added browser checks
- * Added logging/debugging helper functions
- * FIxed rdftabs navigation and maps cosmetics
- * Fixed DOM parser initialization issue with IE
-
-2010-06-28 09:23 source
-
- * Added support for new RDF framework
- * Fixed cosmetics
- * Fixed extraneous comma in object def for IE7 compatibility
- * Fixed small bugs
-
-2010-06-28 09:19 source
-
- file xpath.js was added on branch V6_0_0-DEVEL on 2010-06-28 09:35:57 +0000
-
-2010-06-28 09:08 source
-
- * Updated Favorites
-
-2010-06-28 09:07 source
-
- * Added Semantic Pingback client/server
-
-2010-06-28 09:07 source
-
- file semping.sql was added on branch V6_0_0-DEVEL on 2010-06-28 09:46:12 +0000
-
-2010-06-28 09:06 source
-
- * Updated to CKEditor v3.3.1
-
-2010-06-25 16:41 source
-
- * Added support for following http redirects automatically
-
-2010-06-25 16:39 source
-
- * Fixed compiler warnings
-
-2010-06-25 11:22 source
-
- * Added extra functions for graph diff, iteration over dictionary and
- obtaining biggest possible IRI_ID on given 32/64bit platform
-
-2010-06-25 11:19 source
-
- * Added etsy cartridge
- * Fixed minor issues
-
-2010-06-25 11:18 source
-
- * Added new Link headers
-
-2010-06-25 11:16 source
-
- * Fixed ACL file to have some permissions using foaf+ssl
- * Fixed check it is not det
-
-2010-06-25 11:11 source
-
- file users.xsl was added on branch V6_0_0-DEVEL on 2010-06-25 11:13:27 +0000
-
-2010-06-25 11:11 source
-
- * Added OpenID 2.0 login and registration
-
-2010-06-25 11:10 source
-
- * Added downstream using PSH subscription
-
-2010-06-25 10:46 source
-
- * Fixed text
-
-2010-06-25 10:45 source
-
- * Fixed problem with latest versions of libtool
-
-2010-06-24 23:08 source
-
- * Updated documentation
-
-2010-06-24 15:34 source
-
- * Fixed text labels
-
-2010-06-24 15:34 source
-
- * Added more properties for inference
-
-2010-06-24 15:13 source
-
- * Fixed check proxy and remove if host is an exception
-
-2010-06-24 08:20 source
-
- * Fixed listener serialization
- * Fixed hash
-
-2010-06-24 08:14 source
-
- * Fixed reorganized rdf tab
-
-2010-06-24 08:14 source
-
- file rdf_import.vspx was added on branch V6_0_0-DEVEL on 2010-06-24 15:32:12 +0000
-
-2010-06-24 08:14 source
-
- file rdf_psh_subs.vspx was added on branch V6_0_0-DEVEL on 2010-06-24 15:32:12 +0000
-
-2010-06-22 23:07 source
-
- file etsy2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-06-25 11:19:15 +0000
-
-2010-06-22 15:50 source
-
- * Fixed rdfa failing to parse both rel/rev
-
-2010-06-22 15:50 source
-
- * Fixed normalize_modulus
-
-2010-06-18 11:08 source
-
- * Fixed url rewrite should happen before parsing parameters in order
- to check if we are dealing with php or proxy page when we use raw
- request body
-
-2010-06-16 10:50 source
-
- * Added more properties for inferencing
-
-2010-06-16 10:50 source
-
- * Fixed minor UI issue
-
-2010-06-15 20:06 source
-
- * Fixed merged missing file
-
-2010-06-15 20:00 source
-
- * Fixed calling wrong pl
-
-2010-06-15 19:59 source
-
- file db_repl_rdf_pub_edit.vspx was added on branch V6_0_0-DEVEL on 2010-06-15 20:06:10 +0000
-
-2010-06-12 12:59 source
-
- * Fixed do not free on SQL_SUCCESS, as this will be done at end of loop
-
-2010-06-12 12:57 source
-
- * Fixed do not explicitly set header if it is already set; in proxy
- remove content-type as it will be set from sparql
-
-2010-06-11 12:48 source
-
- * Fixed bad condition check
-
-2010-06-10 18:48 source
-
- * FIxed ignore special properties such as virt:xx when printing
-
-2010-06-10 18:46 source
-
- * Fixed fd can be 0 in background mode
-
-2010-06-10 12:41 source
-
- * Fixed RDF trx replication UI
-
-2010-06-09 13:42 source
-
- * Added ACL rules
- * Added FOAF+SSL based authentication using ACL
- * Added PubSubHub Feeds support
-
-2010-06-09 13:40 source
-
- * Added PubSubHub Feeds support
-
-2010-06-09 13:29 source
-
- * Added FOAF+SSL based authentication
-
-2010-06-09 13:28 source
-
- * Fixed minor issues
-
-2010-06-09 12:31 source
-
- * Added check for automatic repair
-
-2010-06-09 12:30 source
-
- * Added check for automatic repair
- * Fixed when taking a dp from extent map, must decrease the free
- pages accordingly
-
-2010-06-09 10:15 source
-
- * Fixed VDB/DB2 stats procedure
-
-2010-06-08 21:58 source
-
- * Added EAV and SPO labeling modes
-
-2010-06-07 13:29 source
-
- * Fixed missing label
- * Fixed label consistency
- * Fixed check for iri type
- * Fixed limit the result set
-
-2010-06-07 13:27 source
-
- * Fixed use explicit format if supplied
-
-2010-06-07 13:26 source
-
- * Fixed ODATA feed title locality
-
-2010-06-07 10:59 source
-
- * Added wine cartridge
- * Added youtube cartridge
- * Fixed minor issues
-
-2010-06-07 10:59 source
-
- file wine2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-06-07 13:25:38 +0000
-
-2010-06-07 10:59 source
-
- file youtube2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-06-07 13:25:38 +0000
-
-2010-06-07 10:58 source
-
- * Added support for ODATA formats
- * Fixed webcal/feed in rewrite rules
-
-2010-06-01 15:26 source
-
- * Added support for odata/json in describe and construct
-
-2010-06-01 14:06 source
-
- * Fixed issues with variable binding
- * Fixed examples
-
-2010-05-31 23:20 source
-
- * Commented out old tutorial pages
-
-2010-05-31 23:18 source
-
- * Added extra tutorials
-
-2010-05-31 22:04 source
-
- * Updated version to 6.1.2-rc1
-
-2010-05-31 21:55 source
-
- * Added common PubSubHub procedures
- * Fixed use notify services for PubSubHub settings
- * Fixed publish atom feed too
- * Fixed PHP ssl
-
-2010-05-31 21:53 source
-
- * Fixed link re=hub
- * Fixed check individual settings
-
-2010-05-31 21:49 source
-
- * Added support for PubSubHub
-
-2010-05-31 20:49 source
-
- * Added setting for GatewayIpAddress
-
-2010-05-31 20:48 source
-
- * Fixed missing external
-
-2010-05-31 20:47 source
-
- * Fixed incomplete check condition as locks with pos at end do not
- count
-
-2010-05-31 20:45 source
-
- * Fixed use request line for ID
-
-2010-05-31 14:27 source
-
- * Merged enhancements from sesame2
-
-2010-05-31 14:26 source
-
- * Rebuild driver
-
-2010-05-31 14:26 source
-
- * Fixed isue with variable binding
-
-2010-05-31 14:07 source
-
- file VirtuosoRepositoryConfig.java was added on branch V6_0_0-DEVEL on 2010-05-31 14:27:52 +0000
-
-2010-05-31 14:07 source
-
- file VirtuosoRepositoryFactory.java was added on branch V6_0_0-DEVEL on 2010-05-31 14:27:52 +0000
-
-2010-05-31 14:07 source
-
- file VirtuosoRepositorySchema.java was added on branch V6_0_0-DEVEL on 2010-05-31 14:27:52 +0000
-
-2010-05-31 14:07 source
-
- file org.openrdf.repository.config.RepositoryFactory was added on branch V6_0_0-DEVEL on 2010-05-31 14:27:52 +0000
-
-2010-05-31 14:07 source
-
- file org.openrdf.repository.templates was added on branch V6_0_0-DEVEL on 2010-05-31 14:27:52 +0000
-
-2010-05-31 14:07 source
-
- file org.openrdf.store.schemas was added on branch V6_0_0-DEVEL on 2010-05-31 14:27:52 +0000
-
-2010-05-31 14:07 source
-
- file virtuoso-schema.ttl was added on branch V6_0_0-DEVEL on 2010-05-31 14:27:52 +0000
-
-2010-05-31 14:07 source
-
- file virtuoso.ttl was added on branch V6_0_0-DEVEL on 2010-05-31 14:27:52 +0000
-
-2010-05-31 11:08 source
-
- * Added initial support for OData atom serialization
- * Use CBG describe for OData format
- * Use EMD types for generic types
-
-2010-05-31 11:00 source
-
- * Added option DensePageAllocation which offers up some near page
- locality so resulting db uses less disk space
-
-2010-05-31 11:00 source
-
- * Fixed issue with ?? with sparql compiler inside sql query
-
-2010-05-29 12:25 source
-
- * Fixed when traverse foreigh sites, check if they add something
- more, such as redirects back to origin
-
-2010-05-29 12:09 source
-
- * Rebuild driver
-
-2010-05-29 12:07 source
-
- * Added check for inline string flag
-
-2010-05-29 12:00 source
-
- * Fixed minor issues
-
-2010-05-28 16:56 source
-
- * Fixed small issues
-
-2010-05-26 21:48 source
-
- * Fixed use distinct as many graphs can be in same rule
- * Minor UI tweaks
-
-2010-05-26 21:41 source
-
- * Fixed report proper version
- * Fixed compatibility with later JRE
- * Fixed buffer length
-
-2010-05-26 21:37 source
-
- * Fixed RM_XLAT_CONCAT
-
-2010-05-26 15:23 source
-
- * Added Vimeo cartridge
- * Fixed Tesco cartridge
- * Fixed html2 cartridge
-
-2010-05-26 15:21 source
-
- * Added support to export queues
- * Fixed view in crawler UI
-
-2010-05-26 15:21 source
-
- * Fixed incorrect check for VDB functionality
-
-2010-05-26 08:16 source
-
- file vimeo2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-05-26 15:23:14 +0000
-
-2010-05-26 08:11 source
-
- * Added automatic FOAF+SSL
- * Added ping service to do PubSubHub
- * Added PubSubHub settings in ODS
- * Fixed collecting FOAF data
- * Fixed casemode problem
- * Fixed bad join
- * Fixed typo
-
-2010-05-26 08:08 source
-
- * Fixed group IRI
-
-2010-05-26 08:07 source
-
- * Added PubSubHub setting in ODS
-
-2010-05-26 08:07 source
-
- * Fixed upstreaming
-
-2010-05-26 07:57 source
-
- file vfs_export.vspx was added on branch V6_0_0-DEVEL on 2010-05-26 15:21:53 +0000
-
-2010-05-24 22:36 source
-
- * Fixed memleak
-
-2010-05-24 18:02 source
-
- * Added improvements in inference handling
- * FIxed support for subproperties of inverse functional properties
- * Fixed support for loading aaa ruleset from multiple contology graphs
-
-2010-05-22 19:18 source
-
- * Added support for gunzip session
-
-2010-05-21 12:40 source
-
- * Fixed checking return code from fd_open call
-
-2010-05-21 12:27 source
-
- * Added automatic error correction for some common typos in
- decode_b32_num
-
-2010-05-21 12:26 source
-
- * Fixed when doing log replay, we should remove old roots to free
- memory as at this time the grim reaper is not available
-
-2010-05-21 12:24 source
-
- * Fixed allow reset of xslt in PP hook
-
-2010-05-19 10:19 source
-
- * Merged b32 encoding/decoding from HEAD
-
-2010-05-19 10:13 source
-
- * Added support for editing update interval from site settings
-
-2010-05-19 10:04 source
-
- * Fixed urchinTracker setting
-
-2010-05-18 22:29 source
-
- * Added support for editline
-
-2010-05-18 19:33 source
-
- * Added Google API
-
-2010-05-18 19:22 source
-
- * Fixed minor issue
-
-2010-05-18 19:21 source
-
- * Added support for additional types
- * Fixed do not decode variants as we do not know if sender encoded
- special symbols or not
-
-2010-05-18 19:18 source
-
- * Added more ctypes
-
-2010-05-18 13:01 source
-
- * Fixed dependency list
-
-2010-05-18 10:52 source
-
- * Fixed remove FACEBOOK_OPENGRAPH from tests as it is not related
- to RDFA
-
-2010-05-18 10:42 source
-
- * Added FOAF+SSL registration for users pages (jsp, php, vsp etc)
- * Fixed FOAF+SSL registration code
- * Fixed modulus should be cleaned from garbage
- * Fixed function to test w/o sparql acl table
-
-2010-05-18 10:41 source
-
- * Updated SIOC service procedures
-
-2010-05-18 10:41 source
-
- * Fixed get responce back so it can be traced if needed
-
-2010-05-18 10:40 source
-
- * Updated SIOC services procedures
-
-2010-05-18 10:40 source
-
- * Added FeedManager callback
-
-2010-05-18 10:39 source
-
- * Fixed problem with atom feed
-
-2010-05-18 10:30 source
-
- * Added Facebook Open Graph cartridge
-
-2010-05-18 10:30 source
-
- file fb_og2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-05-18 10:44:45 +0000
-
-2010-05-18 10:30 source
-
- file fb_ogs2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-05-18 10:44:45 +0000
-
-2010-05-18 10:30 source
-
- * Fixed minor issues
-
-2010-05-18 09:08 source
-
- * Fixed when statement has implicit group by, do not remove order by
-
-2010-05-17 08:21 source
-
- * Fixed error messages
-
-2010-05-17 08:21 source
-
- * Fixed wrong dv_compare on boxes with box flags
-
-2010-05-16 18:57 source
-
- * Fixed page footer and labels
-
-2010-05-16 18:56 source
-
- * Added missing grant
-
-2010-05-16 17:56 source
-
- * Fixed index for better queue ordering
-
-2010-05-13 19:38 source
-
- * Fixed do not decode anything. We just match what is in and print
- it out, if source is bad encoded, the result is bad encoded,
- otherwise can not figure-out what was it before and what should
- be after, so we keep it simple
-
-2010-05-12 22:46 source
-
- * Fixed GPF when weird (but formally legal) head of composite XML contains
- two declarations of external entities with different entity names but
- same URI to resolve
-
-2010-05-12 12:24 source
-
- * Fixed use special cl_non_logged_write_mode used to load extrememly
- large datasets needs to ensure no log will be made at all. If one
- node dies, the rest will do same. Use this flag only in safe
- environment
-
-2010-05-12 12:17 source
-
- * Fixed GPF in SPARUL INSERT optimization that happens when an
- auxiliary retval with vector of variables is wrapped in alias
-
-2010-05-12 12:16 source
-
- * Fixed when looking at free set from disk must stop at last, as
- the dbs pages can be out of sync. Do this only when reading from
- disk otherwise error
-
-2010-05-11 16:53 source
-
- * Added option to skip sponger and do RDFa along with other rdf
- formats
-
-2010-05-11 12:46 source
-
- * Fixed modulus should be cleaned from garbage
-
-2010-05-11 11:15 source
-
- * Fixed check magic to make sure data is gzip compressed
-
-2010-05-10 10:02 source
-
- * Optimized FOAF+SSL login
- * Updated SIOC service procedures
- * Fixed CR/LF to make proper N3 syntax
- * Fixed bad email in WebID
-
-2010-05-10 09:55 source
-
- * Added Idiomag cartridge
- * Added HTML5 Microdata cartridge
-
-2010-05-10 09:55 source
-
- file html5md2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-05-10 12:20:23 +0000
-
-2010-05-10 09:55 source
-
- file idiomag2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-05-10 12:20:23 +0000
-
-2010-05-10 09:54 source
-
- * Fixed minor issues
-
-2010-05-10 09:49 source
-
- * Updated documentation
-
-2010-05-10 09:39 source
-
- * Fixed keep dashes in words and use escape whenever it occurs;
- words starting with numbers should also be escaped
-
-2010-05-07 09:14 source
-
- * Added new bifs for graph diff functionality, iteration over
- dictionary and obtaining biggest possible IRI_ID on 32/64bit
- platforms
-
-2010-05-03 23:54 source
-
- * FIxed use X-Forwarded-Host to handle proxy
-
-2010-05-03 19:31 source
-
- * Added support for logging x-forwarded-for when instance is using
- a proxy
-
-2010-05-03 08:54 source
-
- * Added shortcut for debugging variables
-
-2010-04-29 10:54 source
-
- * Fixed cleaning new schema properly
-
-2010-04-29 10:00 source
-
- * Added type
- * Fixed labels
- * Minor fixes
-
-2010-04-29 09:59 source
-
- * Fixed print string without waiting for error
-
-2010-04-29 08:29 source
-
- * Added more properties
-
-2010-04-29 08:28 source
-
- * Fixed About header
-
-2010-04-28 15:21 source
-
- * Fixed if Host header is present use that, and do not add port as may be
- behind proxy
-
-2010-04-26 14:41 source
-
- * Fixed when a signal error arrives, pop the bad instruction so the
- free is not confused by dk_set when IS_NULL
-
-2010-04-26 07:57 source
-
- * Fixed crawling of RDFa
-
-2010-04-26 07:56 source
-
- * Added FOAF+SSL client demo
-
-2010-04-26 07:53 source
-
- * Fixed if no DefaultGraph, do not assume anything about /dataspace
-
-2010-04-26 07:51 source
-
- * Fixed minor issue
-
-2010-04-24 14:01 source
-
- * Added import/export support using Yahoo Contacts API
-
-2010-04-24 13:56 source
-
- * Fixed obj2json function
-
-2010-04-23 20:03 source
-
- * Fixed do not continue when missing part of key, as it is uninitialized
- and needs to be dropped before causing a gpf
-
-2010-04-23 20:02 source
-
- * Fixed only serialize box flags for dependant part
-
-2010-04-22 14:12 source
-
- * Added cset to render function to recode string results
-
-2010-04-22 12:41 source
-
- * FIxed url must end in slash or hash
-
-2010-04-22 12:40 source
-
- * Fixed unicode handling in isql and sparql UI
-
-2010-04-22 12:35 source
-
- * Fixed minor issue
-
-2010-04-22 12:35 source
-
- * Removed debugging
-
-2010-04-22 11:12 source
-
- * Fixed http header ends with proper CRLF sequence
-
-2010-04-21 16:18 source
-
- * Fixed when doing something that may reference the control_exp
- private elements set the so_df_private_elts, otherwise may get a
- new df which is in global so df hash
-
-2010-04-21 12:44 source
-
- * Fixed treat sort read node like a ts in tracking ssl refs, else
- partitioned top oby goes wrong
-
-2010-04-20 19:27 source
-
- * Fixed resize map width to width of result div
-
-2010-04-20 19:24 source
-
- * Fixed when gby serialize box flag if any
-
-2010-04-17 23:23 source
-
- * Fixed can have uninitialized null flag in hash temp; can be extra
- nulls in gby or hash join
-
-2010-04-16 12:35 source
-
- * Added hook to execute secondary statement
-
-2010-04-16 12:33 source
-
- * FIxed missing definition for bigint
-
-2010-04-16 11:40 source
-
- * Fix for <![CDATA[ inside <script> in HTML and dirty HTML modes.
-
-2010-04-15 18:46 source
-
- * Fixed export to Del.icio.us
-
-2010-04-15 18:42 source
-
- * Fixed use global list of prefixes for advanced query helper as well
- as other parts
-
-2010-04-15 18:24 source
-
- * Fixed minor issues
-
-2010-04-15 18:23 source
-
- * Fixed support for foaf:maker
-
-2010-04-15 18:20 source
-
- * Updated CSS for buttons
-
-2010-04-15 18:20 source
-
- * Updated toolbar
-
-2010-04-15 14:05 source
-
- * Fixed memleak when error in bif and no error var given
-
-2010-04-15 14:03 source
-
- * Fixed memleak when client drops conneciton before prepare
-
-2010-04-14 13:47 source
-
- * Added initial support for bif_python_exec
-
-2010-04-14 13:19 source
-
- * Fixed export check to call in plugins
-
-2010-04-14 10:48 source
-
- * Fixed support for bigint in parameter marshalling
-
-2010-04-14 10:47 source
-
- * Fixed UI profile
-
-2010-04-13 12:19 source
-
- * Fixed issue with ckeditor
-
-2010-04-13 12:18 source
-
- * Fixed login with non WebDav accounts
-
-2010-04-13 12:17 source
-
- * Updated CKEditor to version 3.2.1
-
-2010-04-13 12:17 source
-
- file default.js was added on branch V6_0_0-DEVEL on 2010-04-14 10:47:31 +0000
-
-2010-04-12 19:42 source
-
- * Added possibility to do URL encoding in TCN rules
-
-2010-04-12 19:41 source
-
- * FIxed odata cartridge
-
-2010-04-12 19:39 source
-
- * Fixed extra replacements
-
-2010-04-12 19:39 source
-
- * Minor fix
-
-2010-04-12 12:37 source
-
- * Fixed use UTF-8 as source and dest charsets when doing urls
-
-2010-04-12 07:28 source
-
- * Fixed check for third argument
-
-2010-04-12 07:26 source
-
- * Fixed query string for product description from BestBuy API
- * Minor fixes
-
-2010-04-09 14:46 source
-
- * Fixed use default MaxMemPoolSize of 200000000
- * Fixed double MaxMemPoolSize on 64bit systems
-
-2010-04-09 14:43 source
-
- * Fixed if we got a single ts as first and it is outer, put a dummy in
- front
-
-2010-04-09 14:36 source
-
- * Fixed problem with Chrome browser and JS loading
-
-2010-04-09 14:34 source
-
- * Fixed problem with Chrome browser and JS loading
- * Fixed Relation ontology data
-
-2010-04-09 13:01 source
-
- * Added Relation ontology
- * Updated UI profile for vsp, php etc
-
-2010-04-09 13:01 source
-
- * Fixed check for unique email address
-
-2010-04-08 14:40 source
-
- * Added CSV parser mode option
- * Fixed error reporting
-
-2010-04-08 14:30 source
-
- * Added CSV parser lax mode
- * FIxed log errors from loading
-
-2010-04-07 21:48 source
-
- * Fixed issue with tab and space handling
-
-2010-04-07 19:27 source
-
- * Fixed abnormal long RDFa parsing of document with i18n URIs
-
-2010-04-07 19:25 source
-
- * Fixed memleak
-
-2010-04-07 19:25 source
-
- * Fixed release it_maps as it is allocated dynamic
-
-2010-04-07 07:56 source
-
- * Fixed wrong TTL output of CONSTRUCT of wierd IRIs
-
-2010-04-06 16:47 source
-
- * Fixed shortcut comparing version numbers during package upgrade
-
-2010-04-06 16:41 source
-
- * Updated documentation
-
-2010-04-06 16:33 source
-
- * Added photo and audio upload for jtml, vsp, php and jsp pages
-
-2010-04-06 16:31 source
-
- * Added CSV cartridge
- * Fixed odata cartridge
- * Fixed webcal support
- * Fixed geo coords
-
-2010-04-06 16:29 source
-
- * Added support for encodings
- * Added support for gz and zip compressed CSV
- * Fixed view to have col names
- * Fixed catch db nulls
- * Fixed crawling opts
-
-2010-04-06 15:51 source
-
- file csvxml2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-04-06 16:31:40 +0000
-
-2010-04-06 15:51 source
-
- file odata2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-04-06 16:31:40 +0000
-
-2010-04-06 14:43 source
-
- * Fixed find const iri when nested call of i2id is used
-
-2010-04-06 13:47 source
-
- * Rebuild driver
-
-2010-04-06 13:46 source
-
- * Added additional support for inferencing
- * Added new inferencing sample
-
-2010-04-06 13:46 source
-
- file VirtuosoSPARQLExample13.java was added on branch V6_0_0-DEVEL on 2010-04-06 14:35:46 +0000
-
-2010-04-06 13:38 source
-
- * Added rdftabs timeline support for ical properties
- * Added ical:summary as one of recognized title properties
- * Added support for ATOM feeds
- * Fixed copy of defaults
- * Fixed url encoding
- * Fixed move OAT.Dom.decodeImage to OAT.Formobject
- * Fixed use new OAT.Dom.create (..., {className:"XXX"}) method
- * Fixed JSON serialize/deserialize
- * Fixed rename find to indexOf
-
-2010-04-06 12:16 source
-
- * Added support for listing content of zip file
- * Fixed memleak in unzip_file
-
-2010-04-01 10:44 source
-
- * Rebuild provider
-
-2010-04-01 10:43 source
-
- file VirtuosoSPARQLExample12.java was added on branch V6_0_0-DEVEL on 2010-04-01 10:54:36 +0000
-
-2010-04-01 10:43 source
-
- * Added support for inference graph
- * Added support for inference and query execution
- * Added support for QueryEngine interface, so now Jena provider support
- next query execution mode:
- a) parse and execute query via ARQ
- b) parse query via ARQ and execute query directly via Virtuoso(new mode)
- c) parse and execute query directly via Virtuoso
- * Fixed small bugs
-
-2010-04-01 10:43 source
-
- file VirtInfGraph.java was added on branch V6_0_0-DEVEL on 2010-04-01 10:54:36 +0000
-
-2010-04-01 10:43 source
-
- file VirtuosoQueryEngine.java was added on branch V6_0_0-DEVEL on 2010-04-01 10:54:36 +0000
-
-2010-03-31 22:45 source
-
- file foaf_ssl_client.vsp was added on branch V6_0_0-DEVEL on 2010-04-26 07:56:09 +0000
-
-2010-03-31 22:45 source
-
- file fs_s_1.xml was added on branch V6_0_0-DEVEL on 2010-04-26 07:56:09 +0000
-
-2010-03-31 22:45 source
-
- file register_cert.vsp was added on branch V6_0_0-DEVEL on 2010-04-26 07:56:09 +0000
-
-2010-03-31 22:07 source
-
- * Fixed insecure https client connections
- * Fixed memleaks on connection error
-
-2010-03-31 22:06 source
-
- * Fixed no value is null
-
-2010-03-30 17:59 source
-
- * Updated documentation
-
-2010-03-30 15:34 source
-
- * Updated version to 6.1.1 for final release
-
-2010-03-30 15:33 source
-
- * Fixed compiler warning
-
-2010-03-30 15:28 source
-
- * Added import from URL
- * Fixed use escape to handle hash based IRIs
-
-2010-03-30 13:08 source
-
- * Fixed minor issue
- * Removed deprecated file
-
-2010-03-30 13:07 source
-
- * Added missing file to distribution
-
-2010-03-30 12:42 source
-
- * Fixed extra define for linux on sparc
-
-2010-03-29 13:56 source
-
- * Added support for oData
-
-2010-03-29 13:37 source
-
- * Fixed skip identity columns
-
-2010-03-29 13:33 source
-
- * Fixed changed default map to Google Maps API v3
-
-2010-03-29 13:32 source
-
- * Added options page for parser options, preview etc
- * Fixed IDN col
-
-2010-03-29 13:32 source
-
- file import_csv_opts.vspx was added on branch V6_0_0-DEVEL on 2010-03-29 13:36:12 +0000
-
-2010-03-28 23:21 source
-
- * Fixed object properties in favorites
-
-2010-03-28 23:21 source
-
- * Fixed a++ links
-
-2010-03-26 23:08 source
-
- * Updated documentation
-
-2010-03-26 23:02 source
-
- * Added image
-
-2010-03-26 22:53 source
-
- * Added user's ontologies in favorites
- * FIxed ontology API
-
-2010-03-26 22:50 source
-
- * Fixed image preview
-
-2010-03-26 19:46 source
-
- * Rebuild drivers
-
-2010-03-26 19:43 source
-
- * Fixed memory leak
-
-2010-03-26 19:43 source
-
- * Fixed missing check for ROLLEDBACK
-
-2010-03-26 19:35 source
-
- * Added options to CSV parser for delimiter and quote char
-
-2010-03-26 16:14 source
-
- * Added support for CSV import
-
-2010-03-26 16:14 source
-
- file import_csv_1.vspx was added on branch V6_0_0-DEVEL on 2010-03-26 19:31:51 +0000
-
-2010-03-26 16:14 source
-
- file import_csv_2.vspx was added on branch V6_0_0-DEVEL on 2010-03-26 19:31:51 +0000
-
-2010-03-26 16:14 source
-
- file import_csv_3.vspx was added on branch V6_0_0-DEVEL on 2010-03-26 19:31:51 +0000
-
-2010-03-25 19:31 source
-
- * Added csv_parse function
-
-2010-03-24 22:31 source
-
- * Fixed preserve content-type field
-
-2010-03-24 22:21 source
-
- * Added support for reading CSV files into tables
-
-2010-03-24 22:18 source
-
- * Added support for setMaxRows
- * Fixed check argument values
-
-2010-03-24 21:47 source
-
- * Regenerated drivers
-
-2010-03-24 16:43 source
-
- * Fixed typo
-
-2010-03-24 10:23 source
-
- * Added options for /sparql
- * Added function http_header_array_get to retrieve headers as an
- array of strings
-
-2010-03-24 01:03 source
-
- * Added optimization of sprintf_inverse(const)
-
-2010-03-24 01:02 source
-
- * Fixed save the jt before doing ts; this is needed because ic_after_pos
- expects in jt but because of in_list it can be modified
-
-2010-03-24 01:00 source
-
- * Fixed compiler warning
-
-2010-03-23 10:07 source
-
- * Fixed use globally known dfe for a select even in cond exp, else it
- ruins the dt by repeatedly adding the same items when making a second
- dfe for the same select
-
-2010-03-23 10:01 source
-
- * Fixed incorrect codegen of formatter in ssg_select_known_graphs_codegen
-
-2010-03-22 22:29 source
-
- * Updated documentation
-
-2010-03-22 22:01 source
-
- * Added a++ otion in user's pages
- * Fixed ontology APIs
- * Fixed 'Creator of'
- * Fixed nickName
- * Fixed php POST request
-
-2010-03-22 21:48 source
-
- * Fixed also check for ctype
-
-2010-03-22 21:46 source
-
- * Fixed Back button
-
-2010-03-22 21:46 source
-
- * Added support for WebID
-
-2010-03-22 21:43 source
-
- * Fixed fetching img id
- * Fixed issue with multiple URL params
-
-2010-03-22 13:40 source
-
- * Fixed use sk_X509_ALGOR_* macros
-
-2010-03-22 12:36 source
-
- * Fixed X509ClientVerify flag of 0/1/2/3 to accept self signed or
- optional certificates
-
-2010-03-22 12:35 source
-
- * Added support for FOAF+SSL login for SQL connections
-
-2010-03-22 11:54 source
-
- * Fixed do not encode default graph
-
-2010-03-22 11:54 source
-
- * Fixed SPARQL 1.1 compatibility in result set syntax
-
-2010-03-19 14:59 source
-
- * Fixed use newer OAT functions
-
-2010-03-19 10:08 source
-
- * Added improved version of xsl:for-each-row for both SPARQL and SQL
-
-2010-03-19 10:05 source
-
- * FIxed issue with backup
-
-2010-03-18 15:45 source
-
- * Fixed when transaction is prepared but not committed before commit
- we must check if cpt is pending. If so we must wait as xa trx has
- special processing in cpt_rollback and log_cpt
- * Fixed compiler warning
-
-2010-03-18 15:43 source
-
- * Fixed better serialization on lt_lock_mtx
-
-2010-03-18 10:59 source
-
- * Fixed enter mtx before truncating log
- * Fixed when a 2pc transaction as finished, invalidate its commit
- flag offset since the log is rewritten already. The trx must already
- be in cpt state.
-
-2010-03-18 10:50 source
-
- * Fixed use new OAT toolkit
-
-2010-03-18 10:48 source
-
- * Fixed check if datadump is gz too
- * Fixed the next site needs to copy all props from initial
- * Fixed use log mode 3 as dump can be large
-
-2010-03-18 10:47 source
-
- * Fixed deadlock retry
-
-2010-03-18 10:46 source
-
- * Fixed missing date conversion
-
-2010-03-18 10:45 source
-
- * Fixed alert text
- * Fixed typo in styles path
- * Fixed use new API functions
- * Fixed support for Google map v3
-
-2010-03-18 10:20 source
-
- * Fixed rebuild driver
-
-2010-03-18 09:58 source
-
- * Fixed user's login
- * Fixed UI buttons
- * Fixed unique name message
- * Fixed wishlist UI pages
- * Fixed rename FOAF+SSL to WebID
-
-2010-03-18 09:56 source
-
- * Fixed rename FOAF+SSL to WebID
-
-2010-03-17 14:54 source
-
- * Fixed check proper prefetch value
-
-2010-03-16 23:53 source
-
- * Fixed check lt
-
-2010-03-16 18:21 source
-
- * Fixed when txn error remove trx from global pool. It cannot be
- committed anyway
-
-2010-03-16 18:20 source
-
- * Fixed properly set lt_threads
-
-2010-03-16 11:39 source
-
- * Fixed when writing log entries always check the mtx
-
-2010-03-16 11:39 source
-
- * Fixed when setting up a XA trx wait for any checkpoint in progress
- to finish before proceeding
-
-2010-03-16 10:54 source
-
- * Fixed if not box or dfe false, skip rest
-
-2010-03-16 10:51 source
-
- * Added virtuoso.ttl to sesame jar
- * Added csl pages for Sesame HTTP repository configuration
- * Rebuild driver
-
-2010-03-16 10:44 source
-
- file create-virtuoso.xsl was added on branch V6_0_0-DEVEL on 2010-03-16 10:51:14 +0000
-
-2010-03-16 10:44 source
-
- file create.xsl was added on branch V6_0_0-DEVEL on 2010-03-16 10:51:14 +0000
-
-2010-03-16 10:26 source
-
- * Added support for vad_version
- * FIxed use new OAT toolkit
- * Removed debug code
-
-2010-03-16 10:24 source
-
- * FIxed encoding of URL params
-
-2010-03-16 10:16 source
-
- file vad_version was added on branch V6_0_0-DEVEL on 2010-03-16 10:26:11 +0000
-
-2010-03-15 16:46 source
-
- * Fixed resume waiting
-
-2010-03-15 15:51 source
-
- * Fixed check array index not out of bound
-
-2010-03-15 15:50 source
-
- * Fixdd FOAF+SSL user pages
-
-2010-03-15 15:49 source
-
- * FIxed removed debugging code
-
-2010-03-15 15:27 source
-
- * Fixed use new OAT toolkit
- * Fixed version check for ODS Framework
-
-2010-03-15 13:16 source
-
- * Fixed missing case for LT_PREPARE_PENDING
-
-2010-03-12 14:04 source
-
- * Fixed invitation problem with multiple users
-
-2010-03-12 13:34 source
-
- * Merged new version of OAT toolkit
- * Fixed Google Maps v3 support
-
-2010-03-12 13:34 source
-
- * FIxed IRIs
-
-2010-03-12 09:13 source
-
- * Merged newer version of OAT toolkit
- * Fixed dependency to later version of ODS Framework
- * Fixed SIOC subscriptions
-
-2010-03-12 09:13 source
-
- * Merged newer version of OAT toolkit
- * Fixed dependency to later version of ODS Framework
-
-2010-03-12 09:12 source
-
- * Merged new version of OAT toolkit
- * Fixed icons - delete and add
- * Fixed dependency to later version of ODS framework
-
-2010-03-12 09:10 source
-
- * Added Register to vsp, php etc users pages
- * Added X.509 create certificate to users pages
- * Merged new version of OAT toolkit
- * Fixed UI profile
- * Fixed delete action
- * Fixed new foaf+ssl schema support
-
-2010-03-12 09:04 source
-
- * Added uStream cartridge
- * Fixed PPTX cartridge to work with latest description.vsp
-
-2010-03-12 09:01 source
-
- * Merged new version of OAT toolkit
- * Added location macro support
- * Fixed numerous issues
-
-2010-03-11 17:20 source
-
- file error.js was added on branch V6_0_0-DEVEL on 2010-03-12 09:01:02 +0000
-
-2010-03-11 17:20 source
-
- file location.js was added on branch V6_0_0-DEVEL on 2010-03-12 09:01:02 +0000
-
-2010-03-11 17:20 source
-
- file mob_home_icon.png was added on branch V6_0_0-DEVEL on 2010-03-12 09:01:02 +0000
-
-2010-03-11 17:20 source
-
- file mobile.css was added on branch V6_0_0-DEVEL on 2010-03-12 09:01:02 +0000
-
-2010-03-11 17:20 source
-
- file statusui.js was added on branch V6_0_0-DEVEL on 2010-03-12 09:01:02 +0000
-
-2010-03-11 17:02 source
-
- * Merged new version of OAT toolkit
-
-2010-03-10 20:28 source
-
- * Fixed JSON support
-
-2010-03-10 15:09 source
-
- * Fixed wide character when getting procedure columns information
-
-2010-03-10 15:08 source
-
- * Added OPTIONS for http server
- * Added trace method
-
-2010-03-10 14:43 source
-
- * Fixed support of old and new schema for FOAF+SSL
-
-2010-03-10 10:34 source
-
- * Fixed allow nulls, DV_C_STRING and memleak
-
-2010-03-09 20:14 source
-
- * Added support for nvarchar to __like_min and __like_max
-
-2010-03-09 20:12 source
-
- * Fixed possible dfe_false in context
-
-2010-03-08 20:39 source
-
- * Fixed setting pooling params
-
-2010-03-08 20:37 source
-
- * Rebuild driver
-
-2010-03-08 14:20 source
-
- * Fixed allow chunked content to be read as strses
-
-2010-03-08 12:04 source
-
- * Fixed typos
-
-2010-03-08 12:02 source
-
- * Fixed typo in tag MusicianCreditsList
-
-2010-03-08 11:54 source
-
- * Added wide char support to set_qualifier
-
-2010-03-08 11:53 source
-
- * Fixed issue when no content len is give but content is sent as
- http/1.0 protocol e.g. with connection-close
-
-2010-03-08 09:21 source
-
- * Fixed typo in scovo:dimension
-
-2010-03-07 08:20 source
-
- * Fixed typo
-
-2010-03-07 08:18 source
-
- * Fixed SERVICE parameter passing
- * Fixed (!ask(...)) in filters
-
-2010-03-05 10:17 source
-
- file ustream2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-03-12 09:04:54 +0000
-
-2010-03-04 23:49 source
-
- * Added tests
-
-2010-03-04 23:44 source
-
- * Fixed improved codegen for FILTER (?local = IRI(?:global)) .
-
-2010-03-04 23:43 source
-
- * Added support for fractions of second in bif_dateadd
-
-2010-03-04 23:38 source
-
- * Fixed tests
-
-2010-03-04 20:45 source
-
- * Updated docs
-
-2010-03-04 16:39 source
-
- * Fixed memory leaks
- * Fixed read memory after free
- * Fixed when one connection does prepare and then uses another
- connection to commit/rollback, must reset 1st cli's trx
- * Fixed when writing to log enter mutex to avoid concurrent writing
-
-2010-03-04 14:15 source
-
- * Fixed typo
-
-2010-03-04 14:14 source
-
- file virt_dialect.jar was added on branch V6_0_0-DEVEL on 2010-03-04 14:14:39 +0000
-
-2010-03-04 13:39 source
-
- * Added initial support for JDBC hibernate
-
-2010-03-04 13:39 source
-
- file .cvsignore was added on branch V6_0_0-DEVEL on 2010-03-04 14:12:58 +0000
-
-2010-03-04 13:39 source
-
- file Makefile.am was added on branch V6_0_0-DEVEL on 2010-03-04 14:12:58 +0000
-
-2010-03-04 13:39 source
-
- file README.hibernate was added on branch V6_0_0-DEVEL on 2010-03-04 14:12:57 +0000
-
-2010-03-04 13:39 source
-
- file VirtuosoDialect.java was added on branch V6_0_0-DEVEL on 2010-03-04 14:12:58 +0000
-
-2010-03-04 12:18 source
-
- * Rebuild driver
-
-2010-03-04 12:18 source
-
- * Fixed driver version
-
-2010-03-04 12:12 source
-
- * Fixed connection pooling
-
-2010-03-04 12:11 source
-
- * Fixed remove xa transaction
-
-2010-03-03 22:55 source
-
- * Fixed do not setup unknown for special methods
-
-2010-03-03 09:21 source
-
- * Rebuild driver
-
-2010-03-03 09:20 source
-
- * Fixed problem with jar packaging
-
-2010-03-02 10:01 source
-
- * Added OPTIONS support for http server
-
-2010-03-01 21:05 source
-
- * Added initial support for basic SPARQL federation
-
-2010-03-01 20:46 source
-
- * Added DefaultServiceMap and DefaultServiceStorage
-
-2010-03-01 20:42 source
-
- * Fixed support for positional and named parameters from exec() or
- similar in SPARQL, as if they where global variables of other
- sorts
-
-2010-03-01 10:26 source
-
- * Fixed use unzip_file function
-
-2010-03-01 10:18 source
-
- * Fixed Import
-
-2010-03-01 10:16 source
-
- * Fixed CSS
-
-2010-03-01 10:15 source
-
- * Fixed minor issues
-
-2010-03-01 10:12 source
-
- * Fixed compatiblity with jdk1.5
-
-2010-03-01 10:07 source
-
- * Upgraded to Jena 2.6.2
- * Fixed backward compatiblity with jdk 1.5
-
-2010-03-01 10:06 source
-
- * Fixed make sesame2 backward compatible with jdk1.5
-
-2010-03-01 09:31 source
-
- * Regenerated driver
-
-2010-03-01 09:17 source
-
- * Rebuild driver
-
-2010-03-01 01:03 source
-
- * Added immortal IRI for uname_virtrdf_ns_uri_DefaultServiceStorage
-
-2010-03-01 01:01 source
-
- * Added support for unzip_file ()
-
-2010-03-01 00:50 source
-
- * Updated documentation
-
-2010-03-01 00:39 source
-
- * Upgraded to Sesame 2.3.1
-
-2010-03-01 00:38 source
-
- * Fixed typo
-
-2010-03-01 00:35 source
-
- * Added swapguard option
-
-2010-03-01 00:28 source
-
- * Added columns for api type and id
-
-2010-03-01 00:03 source
-
- * Added support for saving history to disk
-
-2010-02-28 23:58 source
-
- * Fixed geo:point matching
- * Fixed regex to remove default ns from XML - single quotes are valid
- for enclosed attribute values
-
-2010-02-28 23:57 source
-
- * Fixed positioned update problem on cluster
-
-2010-02-28 23:55 source
-
- * Added refresh parameter
-
-2010-02-28 23:52 source
-
- * Added setting for RoundRobin scheduling
-
-2010-02-27 22:21 source
-
- * Fixed diagnosics of async_queue specific errors like aq invocation
- on log replay or security issues
-
-2010-02-26 17:31 source
-
- * Fixed missing label
-
-2010-02-26 17:28 source
-
- * Fixed use union for local automatic variables to avoid alignment
- problems
-
-2010-02-26 10:24 source
-
- * Regenerated driver
-
-2010-02-26 10:05 source
-
- * Upgraded to Sesame 2.3.1
- * Removed deprecated file
- * Fixed inference support
-
-2010-02-25 20:24 source
-
- * Updated to Sesame 2.2.4
-
-2010-02-25 20:23 source
-
- * Added support for Sesame 2 HTTP respository
- * Updated toSesame 2.2.4
-
-2010-02-25 20:21 source
-
- * Rebuild driver
-
-2010-02-25 20:20 source
-
- file VirtuosoRepositoryConfig.java was added on branch V6_0_0-DEVEL on 2010-02-25 20:23:04 +0000
-
-2010-02-25 20:20 source
-
- file VirtuosoRepositoryFactory.java was added on branch V6_0_0-DEVEL on 2010-02-25 20:23:05 +0000
-
-2010-02-25 20:20 source
-
- file VirtuosoRepositorySchema.java was added on branch V6_0_0-DEVEL on 2010-02-25 20:23:05 +0000
-
-2010-02-25 20:20 source
-
- file org.openrdf.repository.config.RepositoryFactory was added on branch V6_0_0-DEVEL on 2010-02-25 20:23:02 +0000
-
-2010-02-25 20:20 source
-
- file virtuoso.ttl was added on branch V6_0_0-DEVEL on 2010-02-25 20:23:02 +0000
-
-2010-02-25 16:09 source
-
- * FIxed url param for metadata selection
-
-2010-02-25 16:09 source
-
- * Added 'Import' to user pages (vsp, php etc)
- * Fixed pass interface too
-
-2010-02-25 16:08 source
-
- * Added tweet gizmo
-
-2010-02-25 16:07 source
-
- * Fixed groups
-
-2010-02-24 20:55 source
-
- * Added proper ASK support in web service endpoing
- * Fixed faster loading of inference sets
- * Fixed loading of inference sets from graph groups, not only from
- single graphs
- * Fixed creation of graph groups on cluster
-
-2010-02-24 20:53 source
-
- * Added swap guard to kill trx and log ws when swapping is over 300 pages
-
-2010-02-24 13:02 source
-
- * Fixed use unsigned for lower parts else we risk sign extent on large
- numbers
-
-2010-02-23 22:35 source
-
- * Fixed metadata
-
-2010-02-23 14:50 source
-
- * Fixed when looking at col_preds and seeking for column, make sure cp
- dfe is a column
-
-2010-02-23 14:49 source
-
- * Added prototype
-
-2010-02-23 14:49 source
-
- * Fixed when unbox iri make sure value is of type DV_IRI_ID
-
-2010-02-23 14:48 source
-
- * FIxed 2pc file name does not change with log file if log trail on
-
-2010-02-23 10:44 source
-
- * Fixed rewriting of group patterns with filters replaced with restrictions on
- equivs
-
-2010-02-23 10:21 source
-
- * Fixed stop compilation where comp time over run time
-
-2010-02-19 00:22 source
-
- * Fixed when doing a log replay, mark prepared XA trx as such
-
-2010-02-19 00:22 source
-
- * Fixed more macros for 64bit fs
-
-2010-02-18 21:37 source
-
- * Use macros for file calls for 64bit fs
-
-2010-02-18 21:36 source
-
- * Merged XA fixes from HEAD
-
-2010-02-18 20:46 source
-
- * FIxed mem leak
-
-2010-02-18 14:22 source
-
- * Fixed minor issue
-
-2010-02-18 14:13 source
-
- * Fixed if avail always use ro_id for hash
-
-2010-02-18 14:12 source
-
- * Fixed text for NOT pred
-
-2010-02-18 10:57 source
-
- * Fixed use separate macro for COL_DOTTED
-
-2010-02-18 10:01 source
-
- * Fixed SIOC subscriptions
- * Fixed bad item descriptions
-
-2010-02-18 10:00 source
-
- * Fixed groups
- * Fixed bookmarklet
- * Fixed typo
-
-2010-02-17 22:06 source
-
- * Fixed order must be greater than 0
-
-2010-02-17 16:58 source
-
- * Fixed remove null in gby as it is not needed
- * Fixed jts to check for call
-
-2010-02-17 16:56 source
-
- * Fixed do not print default port for http and https in urls
-
-2010-02-17 10:21 source
-
- * Fixed labels and added new columns
-
-2010-02-16 15:03 source
-
- * Fixed IN pred as iterator before index path
-
-2010-02-16 13:49 source
-
- * Added slidesix cartridge
- * Fixed run microformats independent of rdfa
-
-2010-02-16 13:48 source
-
- * Fixed owl:sameAS is not a:id
-
-2010-02-16 13:48 source
-
- * Fixed minor issues
-
-2010-02-16 13:48 source
-
- * Rolled back fix for GR data
-
-2010-02-16 13:46 source
-
- file slidesix2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-02-16 13:49:30 +0000
-
-2010-02-16 12:47 source
-
- * Fixed leave semaphore before jump
-
-2010-02-16 11:58 source
-
- * Fixed detection of n3 and nt formats
-
-2010-02-15 21:23 source
-
- * Fixed use macro
-
-2010-02-15 19:46 source
-
- * FIxed GPF when 2nd argument is not a string
-
-2010-02-15 19:46 source
-
- * Fixed inx int not applicable to keys with no pk ref
-
-2010-02-15 10:05 source
-
- * Fixed problem with shared files
-
-2010-02-12 22:14 source
-
- * Fixed bad array index check
-
-2010-02-12 22:13 source
-
- * Added option for user WebID
-
-2010-02-12 22:12 source
-
- * Fixed table editing fields
-
-2010-02-12 20:05 source
-
- * Fixed NT serializations (_:_ is not a valid bnode in NT so it is
- replaced with _:ResultSet2053 )
-
-2010-02-12 13:00 source
-
- * Updated version to 3127
-
-2010-02-12 12:56 source
-
- * Rebuild driver
-
-2010-02-12 12:56 source
-
- * Fixed use bitmask check
-
-2010-02-12 11:53 source
-
- * Fixed combination of RDF_OBJ_OF_LONG(RDF_LONG_OF_SQLVAL(string))
- that screwed up RDF_DELETE_TRIPLES_AGG()
-
-2010-02-12 11:20 source
-
- * Added "Create New Resource" option
-
-2010-02-12 11:20 source
-
- * Fixed always refresh robot status
-
-2010-02-12 10:34 source
-
- * Regenerated drivers
-
-2010-02-12 10:26 source
-
- * Fixed issues with Literal data
- * Small bugfixes
-
-2010-02-11 23:23 source
-
- * Updated documentation
-
-2010-02-11 23:17 source
-
- * Fixed serialize ha_hits hash lookups
-
-2010-02-11 16:25 source
-
- * Fixed bug with ITF-8 encoded strings in box
-
-2010-02-11 14:00 source
-
- * Fixed codegen in LIMIT ?:global-variable and OFFSET ?:global-variable
-
-2010-02-11 13:19 source
-
- * Added new demo queries
-
-2010-02-11 13:16 source
-
- * Added 'create file' action
-
-2010-02-11 13:16 source
-
- file filenew_32.png was added on branch V6_0_0-DEVEL on 2010-02-11 13:17:24 +0000
-
-2010-02-11 13:16 source
-
- file gray_filenew_32.png was added on branch V6_0_0-DEVEL on 2010-02-11 13:17:24 +0000
-
-2010-02-11 13:15 source
-
- * Fixed removed status bar
-
-2010-02-10 22:18 source
-
- * Fixed DAV path normalize
- * Fixed Feeds rights
- * Fixed UI Profile JS
- * Fixed UI Profile pages
-
-2010-02-10 22:17 source
-
- * Fixed WebID selection
- * Fixed calling proc from packages other than Framework
-
-2010-02-10 22:11 source
-
- file tbl.js was added on branch V6_0_0-DEVEL on 2010-02-10 22:17:52 +0000
-
-2010-02-10 22:11 source
-
- file webid_select.vspx was added on branch V6_0_0-DEVEL on 2010-02-10 22:17:52 +0000
-
-2010-02-10 22:09 source
-
- * Fixed Anotea, CSS
- * Fixed Annotation SIOC Data
-
-2010-02-10 22:06 source
-
- file tbl.js was added on branch V6_0_0-DEVEL on 2010-02-10 22:18:53 +0000
-
-2010-02-10 16:10 source
-
- * Fixed move assignment of oplval_len before jump since we know
- oplval_strval is a string box already
-
-2010-02-10 16:09 source
-
- * Fixed whitespace
-
-2010-02-10 16:08 source
-
- * Fixed compiler warning about possible uninitialized vars
-
-2010-02-10 16:05 source
-
- * Fixed typo in if expression
-
-2010-02-10 16:05 source
-
- * Fixed use err_ret
-
-2010-02-10 16:04 source
-
- * Fixed should use int64 type
-
-2010-02-10 14:05 source
-
- * Fixed SPARQL_SELECT_KNOWN_GRAPHS
-
-2010-02-10 14:04 source
-
- * Fixed define dpipe before anything else is called
-
-2010-02-10 12:58 source
-
- * Fixed check for array boundary
-
-2010-02-10 12:57 source
-
- * Fixed compiler warnings
-
-2010-02-10 11:03 source
-
- * Added DKS box serialization flag DKS_TO_HA_DISK_ROW to preserve
- box flags in procedure views temp tables
-
-2010-02-10 11:03 source
-
- * Fixed missing initialization in calculation of cost and cardinality
-
-2010-02-09 17:38 source
-
- * Fixed workaround for non-iri g1
-
-2010-02-09 17:37 source
-
- * Fixed check to include iri_to_id
-
-2010-02-09 16:11 source
-
- * Fixed bug with UTF-8 encoded strings
-
-2010-02-09 15:13 source
-
- * Added new SPARQL endpoints
- * Added missing file
- * FIxed missing execute permalink
- * Fixed css to make tab effect more consistent
-
-2010-02-09 15:11 source
-
- * Fixed do not make an artm op 0-n for neg literal -n
-
-2010-02-09 14:47 source
-
- * Fixed check against abnormally big number of distinct datatypes
- or languages
-
-2010-02-09 14:46 source
-
- file defaults.vsp was added on branch V6_0_0-DEVEL on 2010-02-09 15:13:31 +0000
-
-2010-02-09 14:34 source
-
- * Fixed version number in http headers
-
-2010-02-09 14:33 source
-
- * Fixed check trans node max mem when reading rows
-
-2010-02-09 14:23 source
-
- * Fixed mem leaks in client
-
-2010-02-09 11:39 source
-
- * Fixed memory leak in trans node compilation
-
-2010-02-08 21:24 source
-
- * Added protection against abnormally bif number of distinct datatypes
- or languages
-
-2010-02-08 21:22 source
-
- * Fixed SQL codegen for NOT() retval expression
-
-2010-02-08 21:22 source
-
- * Fixed memory leak
-
-2010-02-08 12:38 source
-
- * FIxed gpf in serializer when using default constand
- * Fixed gpf when type is bad or zero
-
-2010-02-08 12:34 source
-
- * Fixed log replay for rdfs_load_schema on cluster
-
-2010-02-08 12:33 source
-
- * Fixed loading literals of type xsd:Token
-
-2010-02-03 20:49 source
-
- * Updated version to 6.1.0 for final release
-
-2010-02-03 20:37 source
-
- * Removed deprecated directory
-
-2010-02-03 19:39 source
-
- * Updated version to 06.01
-
-2010-02-03 19:38 source
-
- * Updated version number
-
-2010-02-03 19:37 source
-
- * Updated version to 6.1.0-rc1
-
-2010-02-03 19:17 source
-
- * Fixed missing include files
-
-2010-02-03 19:06 source
-
- * Regenerated drivers
-
-2010-02-03 18:37 source
-
- * Fixed comment
-
-2010-02-03 18:34 source
-
- * Added missing file to distribution
-
-2010-02-03 18:03 source
-
- * Fixed building with external zlib
-
-2010-02-03 17:09 source
-
- * Fixed no need to build this dir when using external zlib
-
-2010-02-03 17:06 source
-
- * Fixed generated by comment
-
-2010-02-03 16:58 source
-
- * Fixed CRLF
-
-2010-02-03 16:53 source
-
- * Fixed make clean
-
-2010-02-03 15:46 source
-
- * Fixed changelog
-
-2010-02-03 15:44 source
-
- * Fixed dependency
-
-2010-02-03 15:40 source
-
- * Added correct handling of standard SPARQL (non-RDF) result sets.
- * Server defaults are now loaded through a web service - /isparq/defaults/
- * Resulting HTML is more valid
- - no <script> outside <html>, etc.
- - FireFox now in standards-compliance mode.
- * Numerous layout tweaks.
- * Fixed badly rendered toggler indicators in FireFox.
- * Added more endpoint detection code
-
- NOTE: sites which have multiple virtual directories hosting iSPARQL will
- all need the new /d efaults VHOST added manually.
-
-2010-02-03 15:40 source
-
- file ctl_toggler_bkg.png was added on branch V6_0_0-DEVEL on 2010-02-03 15:42:58 +0000
-
-2010-02-03 15:40 source
-
- file toolbar_bkg.png was added on branch V6_0_0-DEVEL on 2010-02-03 15:42:58 +0000
-
-2010-02-03 15:28 source
-
- * Updated version
-
-2010-02-03 15:21 source
-
- * Fixed changelog rule
-
-2010-02-03 15:05 source
-
- * Added support for CKEditor
-
-2010-02-03 15:05 source
-
- * Added new examples
-
-2010-02-03 15:04 source
-
- * Added new SKOS-trans inference rule
-
-2010-02-03 14:54 source
-
- * Fixed do not put sort node as ks_stp if the sort node has precode that
- hs a dpipe part
-
-2010-02-03 13:54 source
-
- * Fixed setting
-
-2010-02-03 10:29 source
-
- * Added DB.DBA.BEST_LANGMATCH() and bif_langmatches_pct_http()
-
-2010-02-03 10:29 source
-
- * Fixed bad init in trans node if multiple inputs or step output values
-
-2010-02-03 00:41 source
-
- * Fixed CREDITS
-
-2010-02-02 23:57 source
-
- * Fixed install LICENSE, CREDITS, AUTHORS, READMEs etc in doc dir
-
-2010-02-02 23:24 source
-
- * Fixed redundant trailing '>' in results of TTL load when IRIs contain
- special chars
-
-2010-02-02 23:04 source
-
- * Added support for Virtuoso JDBC Driver documentation
-
-2010-02-02 22:52 source
-
- * Fixed comments
-
-2010-02-02 20:24 source
-
- * Removed support for deprecated JDK1.0, JDK1.1 and JDK1.2
- * Removed Virtuoso JDBC 2.0 SSL driver and JSSE runtime and
- added instructions how to build it if someone still needs
- it using JDK 1.3
-
-2010-02-02 20:20 source
-
- file README.jsse was added on branch V6_0_0-DEVEL on 2010-02-02 20:24:38 +0000
-
-2010-02-02 19:38 source
-
- * Fixed windows math.h needs this define for M_PI etc
-
-2010-02-02 17:59 source
-
- * Fixed php, jsp and vsp users update pages
-
-2010-02-02 14:32 source
-
- * Fixed bug in Doc and Main wiki clusters
-
-2010-02-02 14:20 source
-
- * Fixed "option (score ...)" in a gp with multiple OPTIONAL (...)
-
-2010-02-02 14:18 source
-
- * Fixed align buffer to sizeof pointer to avoid crash on strict
- checking platforms like sparc
-
-2010-02-02 14:17 source
-
- * FIxed memleak when cache is used
-
-2010-02-02 14:16 source
-
- * Fixed compiler warnings
-
-2010-02-02 14:15 source
-
- * Fixed problem with rfc1808_expand_uri not using proper macros
- and allocate byte extra for strings
-
-2010-02-01 23:16 source
-
- * Updated windows project file
-
-2010-02-01 23:14 source
-
- * Fixed compiler warning
-
-2010-02-01 23:13 source
-
- * Fixed bad cast
-
-2010-02-01 23:10 source
-
- * Fixed typo
-
-2010-02-01 15:15 source
-
- * Added conversion code to migrate DB to 2+3 index
-
-2010-02-01 15:10 source
-
- * Added check for XA ROLLBACKONLY
-
-2010-02-01 14:59 source
-
- * Rebuild drivers
-
-2010-02-01 14:58 source
-
- * Fixed when different TZ is used, must find offset and transform via GMT
-
-2010-02-01 13:08 source
-
- * Fixed missing prototype
-
-2010-02-01 13:02 source
-
- * Added missing file
-
-2010-02-01 12:54 source
-
- * Updated version to 6.0.1-pre2
-
-2010-02-01 12:53 source
-
- * Merged 2+3 index into VOS
- * Merged new inlined string code into VOS
- * Added support for owl:inverseOf, owl:SymmetricProperty and
- owl:TransitiveProperty.
- * Fixed graph-level security in cluster
- * Fixed loading XMLs into single via RDF/XML
- * Fixed SPARQL select distinct ?g where { graph ?g { ...}}
-
-2010-02-01 12:44 source
-
- * Merged 2+3 index into VOS
- * Added new sample queries
- * Fixed text recoding to UTF8
-
-2010-02-01 12:40 source
-
- * Merged 2+3 index code into VOS
- * Fixed DB.DBA.RDF_DATATYPE_OF_OBJ and DB.DBA.RDF_LANGUAGE_OF_OBJ
- are now used with __ro2sq of the argument, due to new format of
- incomplete rdf boxes.
- * Fixed redundant equalities in case of multiple OPTIONALs with
- same variable
- * Fixed BOOLEAN_OF_OBJ in case of incomplete boxes
-
-2010-02-01 12:36 source
-
- * Added stubs
-
-2010-02-01 12:35 source
-
- * Fixed check db size and exit if not correct
- * Fixed text of version mismatch messages
-
-2010-02-01 09:26 source
-
- * Removed unused variables
-
-2010-02-01 02:45 source
-
- * Fixed function prototypes
-
-2010-02-01 02:43 source
-
- * Fixed xper not supported in cluster
-
-2010-02-01 02:39 source
-
- * Improved SPARQL parsing and SQL codegen for negative numbers
-
-2010-02-01 02:36 source
-
- * Fixed explicit rb not allowed in cl tx branch
- * Fixed when rdf box then must take dtp1 and sizeof char one more time
- * Fixed support of literals with languages in SPARQL INSERT DATA
- with data in state slot
-
-2010-02-01 02:32 source
-
- * Added new rdf box function
-
-2010-02-01 02:18 source
-
- * Fixed inside cpt do not notice anytimes and disconnects
-
-2010-02-01 02:16 source
-
- * Fixed security in cluster
-
-2010-02-01 02:10 source
-
- * Partial rollback of patch
-
-2010-02-01 02:08 source
-
- * Fixed look up rdf lit ids in cost model to get the card
-
-2010-02-01 02:00 source
-
- * Added initial support for owl:inverseOf, owl:SymmetricProperty
- and owl:TransitiveProperty
-
-2010-02-01 01:45 source
-
- * Fixed index path outer join
-
-2010-02-01 01:45 source
-
- * Fixed if cls rollback during cpt, it would not wait and would rb
- a tx while it had uncommitted state that was restored by the cpt
- at the end. This would make trxs in trx rc have locks which is
- impossible. So check for thread continues during cpt if simultaneous
- cpt freeze and rb. Check txns in trx rc don't get locks.
-
-2010-02-01 01:08 source
-
- * Fixed gpf during rfwd containing XA transaction
-
-2010-02-01 01:00 source
-
- * Fixed atomic must proceed even if uncommitted 2pc prepared
-
-2010-02-01 00:53 source
-
- * Added function __uname
-
-2010-01-31 23:07 source
-
- * Added new function __rdf_rng_min
-
-2010-01-31 23:06 source
-
- * Added new implementation of log_text and log_text_array
-
-2010-01-31 23:04 source
-
- * Fixed compiler warnings
-
-2010-01-31 20:48 source
-
- * Fixed reading of last chunk
-
-2010-01-31 20:46 source
-
- * Added debug flag for sponger
-
-2010-01-31 20:44 source
-
- * Fixed declare iri to ir et all as no cluster
-
-2010-01-31 20:43 source
-
- * Fixed missing externals
-
-2010-01-31 20:41 source
-
- * Fixed checkpoint messages in log
-
-2010-01-31 20:37 source
-
- * Fixed do not run dav init on cluster before cluster is up
-
-2010-01-31 20:36 source
-
- * Fixed rdf init on dav does not need to be done on empty db, thus run
- only in single when update is needed
-
-2010-01-31 20:32 source
-
- * Fixed fault tolerance
-
-2010-01-31 20:18 source
-
- * Updated testsuite
-
-2010-01-31 16:47 source
-
- * Updated documentation
-
-2010-01-31 12:43 source
-
- * Fixed if negative numeric literal, do not make it 0 - litt
-
-2010-01-30 01:12 source
-
- * Added debug flag for sponger
- * Fixed use http_host connection var in aq mode
-
-2010-01-29 23:59 source
-
- * Fixed whitespace
-
-2010-01-29 21:29 source
-
- * Removed deprecated file
-
-2010-01-29 20:54 source
-
- * Fixed for building without SSL
-
-2010-01-29 20:21 source
-
- * Added support for ckeditor
- * Removed deprecated rte and kupu editors
-
-2010-01-29 19:47 source
-
- file vad_version was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file angel_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file angry_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file broken_heart.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file ciframe.html was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file confused_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file cry_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file default.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file devil_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file dialog.css was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file dialog_sides.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file dialog_sides.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file dialog_sides_rtl.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file editor.css was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file embaressed_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file envelope.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file heart.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file icons.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file kiss.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file lightbulb.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file mini.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file noimage.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file omg_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file regular_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file sad_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file shades_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file skin.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file specialchar.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file sprites.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file sprites_ie6.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file table.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file tableCell.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file teeth_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file template1.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file template2.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file template3.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file templates.css was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file templates.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file theme.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file thumbs_down.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file thumbs_up.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file tmpFrameset.html was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file toolbar_start.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file tounge_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file whatchutalkingabout_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file wink_smile.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file wsc.css was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file wsc.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file LICENSE.html was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:29 +0000
-
-2010-01-29 19:44 source
-
- file anchor.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file anchor.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_address.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_blockquote.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_div.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_h1.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_h2.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_h3.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_h4.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_h5.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_h6.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_p.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file block_pre.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file ckeditor.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:29 +0000
-
-2010-01-29 19:44 source
-
- file colordialog.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:29 +0000
-
-2010-01-29 19:44 source
-
- file config.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:29 +0000
-
-2010-01-29 19:44 source
-
- file dialogDefinition.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file en.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:29 +0000
-
-2010-01-29 19:44 source
-
- file find.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file flash.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file image.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file link.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file options.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file paste.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:29 +0000
-
-2010-01-29 19:44 source
-
- file pastetext.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file placeholder.png was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file smiley.js was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 19:44 source
-
- file spacer.gif was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:29 +0000
-
-2010-01-29 19:44 source
-
- file toolbar.css was added on branch V6_0_0-DEVEL on 2010-01-29 20:21:30 +0000
-
-2010-01-29 16:18 source
-
- * Fixed library version
-
-2010-01-29 16:16 source
-
- * Removed unused include file
-
-2010-01-29 15:21 source
-
- * Fixed minor issues
-
-2010-01-29 15:09 source
-
- * Fixed use sparql load instead of soft
-
-2010-01-29 15:07 source
-
- * Removed support for IE 5 and 6 compatibility
-
-2010-01-29 15:00 source
-
- * Fixed crawler pages
-
-2010-01-29 14:52 source
-
- * Fixed use newer version of wsa
-
-2010-01-29 13:23 source
-
- * Fixed removed deprecated samples
-
-2010-01-29 13:20 source
-
- * Fixed build issue with md5
-
-2010-01-29 11:34 source
-
- * Removed deprecated samples/demos
-
-2010-01-29 02:41 source
-
- * Fixed uploading large files
-
-2010-01-29 01:56 source
-
- * Fixed use MD5 from OpenSSL when possible
-
-2010-01-29 00:15 source
-
- * Fixed build to use generate script
- * Removed deprecated file
-
-2010-01-28 17:08 source
-
- * Fixed make sure version is intact as changes to .ttl file must
- reflect in sparql.sql
-
-2010-01-28 14:33 source
-
- * Fixed non-portable sleep argument
-
-2010-01-28 14:19 source
-
- * Fixed API rename
-
-2010-01-28 14:19 source
-
- * Fixed typo
-
-2010-01-28 13:36 source
-
- * Fixed missing qualification of aggregate
-
-2010-01-28 01:14 source
-
- * Fixed make new aqt in io sect
- * Fixed return error when no cli
- * Fixed if aq called and no aq thread available, signal error
-
-2010-01-28 01:11 source
-
- * Fixed automatically allocate bufs
-
-2010-01-28 00:36 source
-
- * Added option BuffersAllocation
- * Added option AsyncQueueMaxThreads
-
-2010-01-28 00:31 source
-
- * Fixed default sitemap crawling functions
- * Fixed wrong variable
- * Fixed wait before update
-
-2010-01-28 00:30 source
-
- * Updated php, jsp and vsp user pages
-
-2010-01-27 20:43 source
-
- * Added FOAF+SSL groups
-
-2010-01-27 20:31 source
-
- * Added support for Google Base items types 'wanted ads', 'business
- location' and 'product catalogs'
-
-2010-01-27 20:31 source
-
- * Fixed virtrdf_label
-
-2010-01-27 12:55 source
-
- * Fixed use DV_SHORT_STRING_SERIAL tag when serializing short strings
-
-2010-01-27 12:54 source
-
- * Fixed varlgrind warning about using uninitialized memory read
-
-2010-01-27 12:52 source
-
- * Fixed in getting page_row reset rd leaf if not a leaf.
-
-2010-01-27 12:51 source
-
- * Fixed do not POST when no post parameters
-
-2010-01-27 01:29 source
-
- * Fixed read after allocated memory
-
-2010-01-25 23:46 source
-
- * Removed deprecated files
-
-2010-01-25 22:42 source
-
- * Fixed copyright and license clarification
+ * Updated version to 6.1.3-rc7
-2010-01-25 20:45 source
+2011-03-07 21:49 source
- * Fixed must commit before aq_wait
+ * Fixed when there is a gb node, test the sort node for dep part in
+ the sort spec
-2010-01-25 16:20 source
+2011-03-05 00:03 source
* Updated documentation
-2010-01-25 16:10 source
-
- * Added php, jsp and vsp users update
- * Fixed problem with activity pages
-
-2010-01-25 16:09 source
-
- * FIxed copyright
-
-2010-01-25 16:09 source
-
- * Fixed SSL check
-
-2010-01-25 16:05 source
-
- * Fixed bug in permissions
-
-2010-01-25 15:42 source
-
- * Fixed problem with MaxMempoolSize
- * Fixed problem with driver properties
-
-2010-01-25 15:41 source
+2011-03-04 14:46 source
- * Fixed shortened long URLs in the crawlers view to avoid UI breakage
+ * Fixed moved mutex lock/unlock calls to avoid deadlock
-2010-01-25 15:12 source
+2011-03-03 17:12 source
- file googlebase2rdf.xsl was added on branch V6_0_0-DEVEL on 2010-01-25 15:36:26 +0000
+ * Added read-ahead on extent
-2010-01-25 15:12 source
+2011-03-03 17:10 source
- file oplgooglebase.owl was added on branch V6_0_0-DEVEL on 2010-01-25 15:36:26 +0000
+ * Fixed immutable graph setting can be a pattern, so we can disable
+ sponging on all graphs
-2010-01-25 15:12 source
+2011-03-03 11:56 source
- * Fixed support for Google Base 'products' item type
- * Fixed headers
+ * Fixed DATETIME to DATE conversions
-2010-01-25 14:57 source
+2011-03-02 12:24 source
- * Fixed use pipeline client in crawler
+ * Fixed issue with special sparql variables
-2010-01-25 10:39 source
+2011-03-02 12:24 source
- * Fixed accept different headers in pipeline request; add header only if
- it contains something
+ * Fixed issue with qualifier in SQLForeignKeys
-2010-01-15 13:47 source
+2011-03-01 19:35 source
- * Fixed crash when timeout was sent using dv_array_of_long
+ * Fixed initialization of defaults
-2010-01-15 13:02 source
+2011-03-01 19:32 source
- * Fixed small lang conversion issue
+ * Fixed set HTTP status to 503 when showing maintenance page and
+ added a Retry-After: 1800 (seconds) header as a hint to the remote
-2010-01-15 12:16 source
+2011-02-28 17:02 source
- * Rebuild driver
+ * Fixed issue if data did not generate prefix2iri hash
-2010-01-15 12:15 source
+2011-02-28 13:47 source
- * Fixed issue with disconnect
- * Fixed issue with XA exception
+ * Fixed check for 5xx or 4xx status codes
-2010-01-14 16:21 source
+2011-02-26 08:35 source
- * Fixed bug calculating todays date
+ * Added http maintenance functions
-2010-01-14 16:06 source
+2011-02-25 17:31 source
- * Fixed use current OAT API function names
- * Fixed bug in query execute permalink encoding
- * Removed explicit reference to ymaps
- * Temp fix for DESCRIBE popup query
+ * Fixed only start from the beginning when there is a thread else we
+ could get into a busy loop
-2010-01-14 16:04 source
+2011-02-23 21:35 source
- * Added new popup calendar based on OAT
- * Fixed use current OAT API function names
- * FIxed explicit references to ymaps, gmaps
+ * Fixed bad regexp
-2010-01-14 15:57 source
+2011-02-23 17:31 source
- * Added LICENSE and COPYING from OAT project
- * Removed custom map loaders
- * Fixed use current OAT API function names instead of backward compat
+ * Fixed size of input buffer of an XML parser is made adaptive
-2010-01-14 01:49 source
+2011-02-21 13:36 source
- file COPYING was added on branch V6_0_0-DEVEL on 2010-01-14 15:57:39 +0000
+ * Added support for named parameters
-2010-01-14 01:49 source
+2011-02-20 16:14 source
- file LICENSE was added on branch V6_0_0-DEVEL on 2010-01-14 15:57:39 +0000
+ * Fixed increase the size of the input buffer of the TURTLE lexer
+ for file resources, in order to improve disk access pattern if many
+ resources are loaded in parallel
-2010-01-13 15:05 source
+2011-02-18 15:49 source
- * Fixed non-rfc method to make URL
+ * Updated version to 6.1.3-rc6
-2010-01-13 15:02 source
+2011-02-18 15:49 source
- * Fixed missing type cast
+ * Fixed issue with scalar subq with SSG_VALMODE_NUM output as in TPCD
-2010-01-13 08:51 source
+2011-02-18 15:37 source
- * Fixed user UI login pages
- * Fixed user UI pages
- * Fixed user home page field size
+ * Updated version
-2010-01-12 23:21 source
+2011-02-18 15:36 source
- * Fixed decoding unicode escape sequences in post request
+ * Added language and type options for offers
-2010-01-12 12:19 source
+2011-02-18 15:32 source
- * Fixed automated labels extraction
+ * Fixed issues with map sizing
-2010-01-12 12:15 source
+2011-02-18 15:30 source
- * Fixed memory leak
+ * Fixed rdftab height for maps
-2010-01-12 11:06 source
+2011-02-18 11:19 source
- * Added doap:name for labeling
+ * Added initial codegen for ASK subquery
+ * Fixed issue with sponging options and DESCRIBE on /sparql endpoint
-2010-01-11 16:02 source
+2011-02-18 11:16 source
- * Fixed primary topic from Offering to Product
+ * Fixed "serialize" debugging output of many threads and label
+ messages of different threads
-2010-01-11 14:19 source
+2011-02-18 11:14 source
- * Fixed missing dcterms:publisher
+ * Added better support of "seealso" predicate in case of recursive
+ sponging
-2010-01-07 17:09 source
+2011-02-18 10:37 source
- * Imported docbook-xsl-1.75.2
+ * Fixed use mem pool to release all objects if an error occurs
-2010-01-07 16:56 source
+2011-02-18 10:24 source
- * Fixed copyright year to 2010
+ * Regenerated drivers
-2010-01-07 16:55 source
+2011-02-18 10:24 source
- * Fixed sync Contact UI with Profile UI
- * Fixed copyright year to 2010
+ * Fixed issue with closing XAConnection and connectionpool
-2010-01-07 16:55 source
+2011-02-17 15:23 source
- * Added VSP and REST implementation for user API
- * Added new API functions
- * Fixed users paths to physical location
- * Fixed API bug with tag rules
- * Updated copyright year to 2010
- * Fixed issue mising quoted and unquoted identifiers
+ * Fixed more log info
-2010-01-06 21:33 source
+2011-02-16 21:08 source
* Updated documentation
-2010-01-06 17:33 source
+2011-02-16 20:55 source
- * Fixed bad transformation in feed when author has no name
- * Fixed process media:contain properly re images
+ * Fixed iSPARQL icons placed on Home screen on iPhone/iPod now have the
+ WebApp appearance (i.e. no URL bar, etc. controls.)
+ * Fixed a regression causing reappearance of Ubiq gem on non-firefox browsers
+ * Fixed missing message candlers for geocoding module
+ * Disabled buggy location UI absorbing into statusui
+ * Improved formatting of errors in response tab somewhat
-2010-01-06 16:49 source
+2011-02-16 20:53 source
- * Added flag (DuplicateCheckpointRemaps) which should ONLY be used
- in recovery mode when a bad db can have cpt remap page which links
- back to itself. In this situation as last chance to recover we can
- look if remap already is registered and at that point stop looking.
- Further DBA must check for inconsistencies.
+ * FIxed avoid long URLs to generate wacky error
-2010-01-06 16:47 source
+2011-02-16 20:51 source
- * Fixed default log mode in SPARUL MDW operations to distinquish
- between NULL and 0 log mode
+ * Fixed missing line
-2010-01-06 16:45 source
+2011-02-16 17:33 source
- * Fixed check if qi is actually available in this context
+ * Fixed offers SIOC data
-2010-01-06 12:12 source
+2011-02-16 17:32 source
- * Fixed handling of default graph URI param
+ * Fixed if no svc and FF then show generator page
-2010-01-05 19:12 source
+2011-02-16 17:32 source
- * Added extra tests
+ * Fixed typo
-2010-01-05 18:24 source
+2011-02-16 17:31 source
- * Fixed moved commit work else async exec might generate new rdf_obj
+ * Fixed missing case
-2010-01-04 11:54 source
+2011-02-16 17:25 source
- * Fixed if null box then use 0 to prevent core dump
+ * Fixed status controls
-2010-01-04 11:47 source
+2011-02-16 17:25 source
- * Fixed dependency
+ * Fixed proper position
-2010-01-04 11:42 source
+2011-02-16 17:20 source
- * Removed deprecated file
+ * Added support for map marker URLs in OAT.RDFTabs.map
+ * Fixed OAT.RDFTab.map control height on iPhone
+ * Fixed bug causing OAT.RDFTABs.navigator layout flowing into footer
+ * Fixed navigator layout
-2010-01-04 11:25 source
+2011-02-16 17:16 source
- * Fixed typo
+ * Fixed separate virtrdf:label into own file
+
+2011-02-16 17:08 source
-2010-01-04 11:01 source
+ * Fixed ADO.NET datatype handling
+ * Fixed null pointer exception
- file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-15 14:45 source
-2010-01-04 11:01 source
+ * Fixed memory leaks
- file autoidx-ng.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-15 14:11 source
-2010-01-04 11:01 source
+ * Fixed signal errors other than deadlock
- file autoidx.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-15 14:05 source
-2010-01-04 11:01 source
+ * Fixed issues with --with-debug and setting CFLAGS
- file autotoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-15 10:11 source
-2010-01-04 11:01 source
+ * Fixed missing prototype
+ * Fixed after free data_col make sure it is nil
- file biblio-iso690.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 13:05 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.3-rc5
- file biblio.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 13:04 source
-2010-01-04 11:01 source
+ * Fixed certificates
- file block.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 13:03 source
-2010-01-04 11:01 source
+ * Fixed page load bug
- file callout.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 13:03 source
-2010-01-04 11:01 source
+ * Added RSS and Atom imports
- file changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 13:03 source
-2010-01-04 11:01 source
+ * Fixed issue with dashboard
- file chunk-changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 13:03 source
-2010-01-04 11:01 source
+ * Fixed mail selection from private instances
+ * Fixed encrypted emails
- file chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 12:51 source
-2010-01-04 11:01 source
+ * Added rudimentary geocoder support module
+ * Fixed endpoints options tolle menu
+ * Fixed title to "Sponger"
+ * Fixed header margins
+ * Fixed ordering of Sponger and Query Metadata
+ * Fixed location error handler failure to change aquire state
+ * Fixed statement help popup window
- file chunk-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 12:49 source
-2010-01-04 11:01 source
+ * Fixed try to resize map in a more mobile friendly way
- file chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 12:48 source
-2010-01-04 11:01 source
+ * Added more properties to virtlabel ontology
+ * Fixed issues reported by W3C Validator
- file chunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 12:33 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings on SOlaris with openssl 1.0
- file chunkfast.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 11:48 source
-2010-01-04 11:01 source
+ * Fixed when P is known get stats on it to make better decision on
+ execution plan
- file chunktoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 11:48 source
-2010-01-04 11:01 source
+ * Fixed infinite loop when dealing with string like abc&def and no token
- file component.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 01:25 source
-2010-01-04 11:01 source
+ * Fixed dump all mem references before dying
- file division.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-14 01:14 source
-2010-01-04 11:01 source
+ * Fixed issue when client disconnects inside compile where no reset ctx
- file docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-11 13:19 source
-2010-01-04 11:01 source
+ * Added ssl const decoration in explain
- file ebnf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-10 20:58 source
-2010-01-04 11:01 source
+ * Added new bif getenv
- file footnote.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-07 15:07 source
-2010-01-04 11:01 source
+ * Fixed attribution
- file formal.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-04 15:36 source
-2010-01-04 11:01 source
+ * Added check for max number of elements
- file glossary.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-03 13:30 source
-2010-01-04 11:01 source
+ * Fixed check if there is dpipes to be placed before trans node
- file graphics.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-03 11:27 source
-2010-01-04 11:01 source
+ * Fixed when compiling statement with sparqre_qi == CALLER_LOCAL, do
+ not pass this value to box_cast
- file highlight.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-03 10:32 source
-2010-01-04 11:01 source
+ * Fixed issue with namespace pollution in FireFox
- file html-rtf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-03 10:30 source
-2010-01-04 11:01 source
+ * Added separate sponge and ack for rdf flags
+ * Fixed copyright year
- file html.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-03 10:29 source
-2010-01-04 11:01 source
+ * Added pure RDFa cartridge
+ * Fixed copyright year
- file htmltbl.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-03 10:28 source
-2010-01-04 11:01 source
+ * Fixed geolocation to automatically use a location if a minimum
+ accuracy is reached. Default=500m
+ * Fixed creation of options in anchor which did not work with FireFox
+ * Fixed copyright year
- file index.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-03 09:26 source
-2010-01-04 11:01 source
+ * Fixed box_cast when qst is CALLER_LOCAL
- file info.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-03 09:25 source
-2010-01-04 11:01 source
+ * Fixed copyright year
- file inline.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-02 15:36 source
-2010-01-04 11:01 source
+ * Fixed make sure boxlen is within limits
- file keywords.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-02 12:06 source
-2010-01-04 11:01 source
+ * Added separate sponge and ack for rdf flags
- file lists.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-02 11:28 source
-2010-01-04 11:01 source
+ * Added new location properties and datatypes
- file maketoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-01 00:07 source
-2010-01-04 11:01 source
+ * Fixed use origin as base
- file manifest.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-02-01 00:07 source
-2010-01-04 11:01 source
+ * Added support for virtrdf:image
- file math.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-31 20:47 source
-2010-01-04 11:01 source
+ * Fixed declaration after statement
- file oldchunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-31 15:23 source
-2010-01-04 11:01 source
+ * Fixed to follow http redirects
- file onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-31 15:23 source
-2010-01-04 11:01 source
+ * Fixed memory leak if QUIETCAST query operates with ill formed
+ data such as invalid date/time
- file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-31 11:17 source
-2010-01-04 11:01 source
+ * Fixed problem with upstreaming of updated and deleted posts
+ * Fixed problem with triggers
- file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-31 11:16 source
-2010-01-04 11:01 source
+ * Added virtrdf-label for iCalendar
- file profile-chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-31 11:15 source
-2010-01-04 11:01 source
+ * Fixed CSS of execution grid
- file profile-chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-31 10:48 source
-2010-01-04 11:01 source
+ * Fixed RDFa cartridge
- file profile-chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-31 10:45 source
-2010-01-04 11:01 source
+ * Added UI for Login Authentication Keys
- file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-30 15:23 source
-2010-01-04 11:01 source
+ * Fixed box_cast so QUIETCAST mode returns NULL instead of error
+ even if the problem is detected in some nested function
- file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-28 17:34 source
-2010-01-04 11:01 source
+ * Fixed when on a queue, i.e. waiting for compile to finish, we freeze
+ the thread so cpt can proceed
- file profile-onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-28 13:35 source
-2010-01-04 11:01 source
+ * Added namespace prefix 'fn' for 'http://www.w3.org/2005/xpath-functions/#'
+ for XPATH 2.0 and XQuery 1.0 Core Functions library
- file profile-onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-28 13:34 source
-2010-01-04 11:01 source
+ * Fixed detection of bad blank nodes
- file qandaset.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-28 13:32 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings
- file qandaset.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-28 13:31 source
-2010-01-04 11:01 source
+ * Added numeric_from_string_is_ok to do quick syntax check on string
+ without actual parsing
- file refentry.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-28 13:29 source
-2010-01-04 11:01 source
+ * Added support for "xpath:function_IRI" syntax, which is usally an
+ internal syntax for functions automatically recognized as XPATH
- file refentry.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-28 13:28 source
-2010-01-04 11:01 source
+ * Fixed compiler warning
- file sections.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-28 13:28 source
-2010-01-04 11:01 source
+ * Added xqr_stub_for_funcall
+ * Fixed memory leak
- file sections.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-28 13:26 source
-2010-01-04 11:01 source
+ * Fixed cast to xsd:float
- file synop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-28 13:26 source
-2010-01-04 11:01 source
+ * Fixed moved free inside of semaphore
- file synop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-27 14:19 source
-2010-01-04 11:01 source
+ * Fixed use default smime
- file table.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-27 13:30 source
-2010-01-04 11:01 source
+ * Fixed wrong condition check
- file table.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-27 12:43 source
-2010-01-04 11:01 source
+ * Added support for S/MIME encrypt and decrypt
- file task.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-26 17:52 source
-2010-01-04 11:01 source
+ * Fixed missing namespace in </results>
- file task.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-25 19:15 source
-2010-01-04 11:01 source
+ * Fixed cost model to count inx cond and scale card at end
- file titlepage.templates.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 18:54 source
-2010-01-04 11:01 source
+ * Fixed in log replay we can drop the old objects to free memory
- file titlepage.templates.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-25 14:51 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.3-rc4
- file titlepage.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 14:39 source
-2010-01-04 11:01 source
+ * Fixed allocate space for \0 terminator
- file titlepage.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-25 14:38 source
-2010-01-04 11:01 source
+ * Fixed memory leak
- file toc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 14:36 source
-2010-01-04 11:01 source
+ * Fixed compiler warning
- file toc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-25 14:35 source
-2010-01-04 11:01 source
+ * Added configurable normalization of accented characters
- file verbatim.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 14:33 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings
- file verbatim.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-25 14:32 source
-2010-01-04 11:01 source
+ * Fixed wrong buffer
- file xref.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 14:30 source
-2010-01-04 11:01 source
+ * Fixed crawling aside of the target
+ * Fixed no more need of dummy targets
+ * Fixed decrease use of lock on site table
- file xref.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:57 +0000
+2011-01-25 14:29 source
-2010-01-04 11:01 source
+ * Fixed python initialization
- file Makefile.DocBook was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-25 14:11 source
-2010-01-04 11:01 source
+ * Aded linkedIn login/register
+ * Fixed bad profile UI
+ * FIxed hyperlink session expire issue
- file Makefile.combine was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-25 14:09 source
-2010-01-04 11:01 source
+ * Fixed use base as origin on zillow
- file Makefile.docParam was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-25 14:09 source
-2010-01-04 11:01 source
+ * Fixed do not try to put headers when an error is detected
- file admon.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 14:07 source
-2010-01-04 11:01 source
+ * Fixed connection check page
+ * Fixed error message generation in execute
+ * Fixed Preferences dialog
- file annotations.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 14:00 source
-2010-01-04 11:01 source
+ * Fixed cosmetics and layout
- file autoidx-kimber.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 13:53 source
-2010-01-04 11:01 source
+ * Added RDF graph property for links
- file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 13:52 source
-2010-01-04 11:01 source
+ * Added IMAP support
- file autoidx-ng.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 13:51 source
-2010-01-04 11:01 source
+ * Fixed install issue with new DB
+ * Fixed parent
- file autoidx.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-25 13:50 source
-2010-01-04 11:01 source
+ * Fixed UI
- file autolayout.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-25 13:17 source
-2010-01-04 11:01 source
+ * Updated documentation
- file autotoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-22 14:12 source
-2010-01-04 11:01 source
+ * Fixed check for blank node in wrong places
- file biblio-iso690.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-21 13:43 source
-2010-01-04 11:01 source
+ * Fixed no need to access .cfg file for plain ?query= call
- file biblio.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-19 13:17 source
-2010-01-04 11:01 source
+ * Fixed codegen for xsd:decimal() and similar cast operations
- file block.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-18 14:36 source
-2010-01-04 11:01 source
+ * Added configurable normalization of accented characters
- file callout.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-18 10:41 source
-2010-01-04 11:01 source
+ * Added normalization of accented characters
- file changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-18 10:32 source
-2010-01-04 11:01 source
+ * Fixed debug code
- file chunk-changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-18 10:31 source
-2010-01-04 11:01 source
+ * Fixed more debug output for xte_word_range
- file chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-11 22:41 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings
- file chunk-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-11 22:38 source
-2010-01-04 11:01 source
+ * Fixed whitespace
- file chunk-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-11 13:18 source
-2010-01-04 11:01 source
+ * Added mime_header function to parse rfc header of mail message
- file chunk-tabular.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-11 13:14 source
-2010-01-04 11:01 source
+ * Fixed commented out bogus help button
- file chunk-website.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-11 13:13 source
-2010-01-04 11:01 source
+ * Added more prefixes
- file chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-11 13:12 source
-2010-01-04 11:01 source
+ * Added new entries to virtrdf-label
- file chunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-11 10:33 source
-2010-01-04 11:01 source
+ * Added new SPARQL-to-SQL codegen for type cast functions
- file chunkfast.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-11 10:32 source
-2010-01-04 11:01 source
+ * Fixed set box flags to BF_IRI in this special case as graphs are IRIs
- file chunktoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-10 20:49 source
-2010-01-04 11:01 source
+ * Added transitivity cache
- file component.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-10 16:56 source
-2010-01-04 11:01 source
+ * Fixed bifs returning int or date should use same cast as auto
- file division.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-10 13:23 source
-2010-01-04 11:01 source
+ * Fixed width of users, capabilities listings
- file docbook-xsl-update was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-10 13:22 source
-2010-01-04 11:01 source
+ * Fixed use sitemaps for default crawling, option for depth
+ * Fixed links conversion should be off by default
+ * Fixed issue with listing
- file ebnf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-10 11:51 source
-2010-01-04 11:01 source
+ * FIxed missing initialization
- file footnote.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-07 17:18 source
-2010-01-04 11:01 source
+ * Fixed set timeout only when non empty
- file formal.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-07 15:42 source
-2010-01-04 11:01 source
+ * Fixed when explicit output format is give, make it part of the
+ query text so don't cache eventual internal guess to turtle output
- file glossary.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-07 15:08 source
-2010-01-04 11:01 source
+ * Added cxml and csv links
+ * Fixed link layout
- file graphics.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-07 14:12 source
-2010-01-04 11:01 source
+ * Fixed allow bigger header values to be returned
- file head.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-05 20:58 source
-2010-01-04 11:01 source
+ * Added optional QRcode
+ * Added CXML link typing dropdowns to fct UI
+ * Added search query limit of 100 words
+ * Added CXML and CSV links on describe page
- file highlight.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-05 20:14 source
-2010-01-04 11:01 source
+ * Fixed declaration after statement warning
- file html-rtf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-05 13:58 source
-2010-01-04 11:01 source
+ * Fixed search and page load behaviour
+ * Fixed RefByAll result page
- file html.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-05 12:45 source
-2010-01-04 11:01 source
+ * Fixed align at 8 when double align defined
+ * Fixed always return NULL when allocation failed
- file htmltbl.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-05 12:44 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings
- file index.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-05 12:36 source
-2010-01-04 11:01 source
+ * Added OWL mime type
- file info.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-05 01:58 source
-2010-01-04 11:01 source
+ * Fixed stats on inference
- file inline.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 23:37 source
-2010-01-04 11:01 source
+ * Added client-based HTTP auth support in OAT.Ajax
+ * Fixed bug in RDFStore handling of hasNamespacePrefix that caused
+ corruption
+ * Fixed error in dialog button handler
+ * Fixed typo in insertIRIArr
+ * Fixed several issues in RDFTabs related to RDFStore changes
- file keywords.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 21:23 source
-2010-01-04 11:01 source
+ * Fixed json tcn
- file lists.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 21:22 source
-2010-01-04 11:01 source
+ * Added optional vCal QRCode
+ * Fixed date change in events/tasks
- file makefile-dep.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-03 21:21 source
-2010-01-04 11:01 source
+ * Added optional vCard QRCode
- file maketoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 21:21 source
-2010-01-04 11:01 source
+ * Fixed UI of maintenance page
+ * Fixed ref-by command output
- file manifest.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 21:14 source
-2010-01-04 11:01 source
+ * Fixed detect iSPARQL Server Connection using PROPFIND
+ * Fixed link behaviour in SPARQL result set view is now
+ controlled by dropdown
+ * Fixed Save/serialize in .ldr/.isparql file types
- file math.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 21:11 source
-2010-01-04 11:01 source
+ * Added option for crawl depth
+ * Added check for gzip magic header
+ * Fixed use sitemaps for default crawling
+ * Fixed no clean opt
+ * Fixed optmimize queue recovery
+ * Fixed when */xml reported butthe content is gziped, the client
+ will decode on the fly
- file oldchunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 21:09 source
-2010-01-04 11:01 source
+ * Added properties to enable HTTP DIGEST auth on some browsers
- file olink.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2011-01-03 21:02 source
-2010-01-04 11:01 source
+ * Added Groupon cartridge
+ * Added RDFohloh cartridge
+ * Added EOL cartridge
+ * Fixed use common API to delete target
+ * Fixed minor issues
- file onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 10:21 source
-2010-01-04 11:01 source
+ * Added support for FILTER EXISTST and FILTER NOT EXISTS
+ * Added partial support for MINUS
- file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 10:18 source
-2010-01-04 11:01 source
+ * FIxed minor issues
- file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2011-01-03 10:17 source
-2010-01-04 11:01 source
+ * Fixed issue with large number of namespace declarations
- file profile-chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2010-12-23 16:33 source
-2010-01-04 11:01 source
+ * Fixed JSON tcn for host-meta
- file refentry.007.ns.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-22 20:58 source
-2010-01-04 11:01 source
+ * Fixed default options
- file refentry.007.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-22 10:31 source
-2010-01-04 11:01 source
+ * Fixed issue with aggregates and ORDER BY
- file rss.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-22 10:27 source
-2010-01-04 11:01 source
+ * Fixed issue with DATATYPE
- file tabular.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-22 10:25 source
-2010-01-04 11:01 source
+ * Fixed string is aligned to 8
+ * Fixed wide data must be presented as UTF8 before hash chksum
- file titlepage.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-21 12:27 source
-2010-01-04 11:01 source
+ * Fixed whitespace
- file titlepage.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-21 10:42 source
-2010-01-04 11:01 source
+ * Added retry on deadlock when sponging on multiple threads
- file toc-tabular.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-20 21:43 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.3-rc2
- file toc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-20 19:12 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file website-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2010-12-20 18:20 source
-2010-01-04 11:01 source
+ * Fixed layout to make optional qrcode fit without wasting space
+ * Fixed tabs CSS and overall margins etc
- file website-targets.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2010-12-20 18:09 source
-2010-01-04 11:01 source
+ * Fixed sqltype and display size of DV_IRI_ID column
- file website.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2010-12-20 13:26 source
-2010-01-04 11:01 source
+ * Fixed merge error
- file xbel.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:56 +0000
+2010-12-20 12:31 source
-2010-01-04 11:01 source
+ * Fixed missing column error in SPARQL-to-SQL preprocessor
- file CTOCWidget.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-20 12:27 source
-2010-01-04 11:01 source
+ * Added support for Twitter
+ * Added JSON format for webfinger
+ * Added optional qrcode
- file arr-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-20 12:26 source
-2010-01-04 11:01 source
+ * Fixed missing files from vad
- file arr-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-20 12:26 source
-2010-01-04 11:01 source
+ * Added progress bar, ping and ACL
- file arrow.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-20 12:22 source
-2010-01-04 11:01 source
+ * Added option to use tidy before loading rdfa
- file blank.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-20 11:34 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file blank.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-17 17:40 source
-2010-01-04 11:01 source
+ * Added support for connection string parameters with or without
+ spaces in name
+ * Fixed removed workaround for rollback msg
- file blocks-spec.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-17 11:27 source
-2010-01-04 11:01 source
+ * Fixed must not return error during rollback on killed txn
- file blocks2dbk.dtd was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-16 19:47 source
-2010-01-04 11:01 source
+ * Fixed sparql select (1) { { ?:sss ?p ?o } optional { ?s1 ?p1 ?o1 }}
+ (t1.S=sss condition was lost before)
- file blocks2dbk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-15 15:25 source
-2010-01-04 11:01 source
+ * Fixed index_only on partial can return has data even if main row
+ does not
- file bullet.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-15 12:47 source
-2010-01-04 11:01 source
+ * Added small optimizations
- file but-fforward.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-15 12:19 source
-2010-01-04 11:01 source
+ * Added optimization to look at GS index only
- file but-info.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-15 10:42 source
-2010-01-04 11:01 source
+ * Added support for define input:inference in SAPRQL DESCRIBE
- file but-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-14 19:18 source
-2010-01-04 11:01 source
+ * Added JSON format for /.well-known/host-meta
- file but-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-14 13:22 source
-2010-01-04 11:01 source
+ * Fixed cxml generation options
- file but-rewind.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-14 13:22 source
-2010-01-04 11:01 source
+ * Fixed compiler warning
- file closed.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-14 12:10 source
-2010-01-04 11:01 source
+ * Fixed use CURI to make smaller footprint
- file cmp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-14 12:07 source
-2010-01-04 11:01 source
+ * Fixed hreview aggreates
+ * Fixed use CURI to make smaller qrcode
+ * Fixed CRLF
- file css.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-13 21:32 source
-2010-01-04 11:01 source
+ * Fixed 'none' is a special case with value 1
- file date-time.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-13 15:08 source
-2010-01-04 11:01 source
+ * Fixed crash when only option inference is given without define
- file dbk2ooo.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-13 15:08 source
-2010-01-04 11:01 source
+ * Fixed cxml
- file dbk2pages.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-13 11:17 source
-2010-01-04 11:01 source
+ * Fixed utf8_exec server issue
- file dbk2wordml.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-13 10:24 source
-2010-01-04 11:01 source
+ * Fixed comparison of VARCHAR and UNAME box whith identical content
- file dbk2wp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-13 10:23 source
-2010-01-04 11:01 source
+ * Added three new aggregates mostly for use with SPARQL-BI
- file default.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-13 10:22 source
-2010-01-04 11:01 source
+ * Added support for passing NVARCHAR arguments to thread-safe dicts
- file example.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-13 10:20 source
-2010-01-04 11:01 source
+ * Fixed check for mobile devices
- file flat.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-12 18:09 source
-2010-01-04 11:01 source
+ * Added RDFa W3c validation button
+ * Added missing default XSL setting classes as view
+ * Added optional qrcode in page
+ * Added scrolling to use stop skip/N
+ * Added link to /sparql endpoint
+ * Fixed sid
+ * Fixed shortened uri if too long
+ * Fixed bookmarable urls
- file frames.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-10 16:12 source
-2010-01-04 11:01 source
+ * Updated documentation
- file graphics.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-10 16:02 source
-2010-01-04 11:01 source
+ * Removed extra debugging
+ * Fixed comments
- file hidetoc.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-10 15:43 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file htmlhelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-10 15:28 source
-2010-01-04 11:01 source
+ * Added new settings to execute.html
+ * Added hrefs to breadcrumbs in rdftab
+ * Added a pager for queries.
+ * Added URI shortener detection and user preference (persisted in
+ HTML5 localStorage on compatible browsers)
+ * Changed the way results are cached.
+ Each query owns its results store, which is passed to the RDFMini
+ for display.
- file jscript.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-10 15:27 source
-2010-01-04 11:01 source
+ * Altered the order of preference for subject labels.
+ * Fixed rdfs:label and skos:prefLabel now take preference over
+ foaf:name.
+ * Changed OAT.Dialog to accept a bitmap for buttons to include
+ Should be (sort-of) backwards compatible (default value and setting
+ to zero causes same behavior as before)
- file markup.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-10 15:19 source
-2010-01-04 11:01 source
+ * Merged from V5
- file math.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-10 15:18 source
-2010-01-04 11:01 source
+ * Fixed do not do row autocommit when uploading with DAV api
+ as this will break trigger logic
- file nav-home.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-10 12:24 source
-2010-01-04 11:01 source
+ * Added new testcases
- file nav-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-10 12:00 source
-2010-01-04 11:01 source
+ * Fixed deref of uninitialized memory
- file nav-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-10 11:59 source
-2010-01-04 11:01 source
+ * FIxed uninitialized variable
- file nav-toc.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-10 11:58 source
-2010-01-04 11:01 source
+ * Fixed deref of uninited memory
- file nav-toc.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-09 14:00 source
-2010-01-04 11:01 source
+ * Fixed FOAF import
- file nav-up.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-09 13:57 source
-2010-01-04 11:01 source
+ * Fixed convert link option
- file nav-up.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-09 12:16 source
-2010-01-04 11:01 source
+ * Added hRecipe cartridge
- file node.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-09 09:53 source
-2010-01-04 11:01 source
+ * Fixed NULL case in patch_restricted_xml_chars()
- file normalise-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-08 16:08 source
-2010-01-04 11:01 source
+ * Fixed sparql aggregate
- file normalise2sections.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-08 16:04 source
-2010-01-04 11:01 source
+ * Added RDFa W3c validation button
+ * Added expiration header
+ * Fixed DOI and RDFa
+ * Fixed use doi proxy if no hslookup plugin
+ * Fixed datatype for twitter
+ * Fixed tidy for overstock cartridge
+ * Fixed enable xlat iris
+ * Fixed small bugs
- file open.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-07 11:30 source
-2010-01-04 11:01 source
+ * Updated version of adapter
- file overlay.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-07 11:11 source
-2010-01-04 11:01 source
+ * Added 'Owns', 'Knows' and 'Social Network'
+ * Added profile security for offers, likes etc
+ * Enhanced import procedure
+ * Fixed small issues
- file pages2normalise.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-07 10:38 source
-2010-01-04 11:01 source
+ * Added microblog template
- file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-07 10:32 source
-2010-01-04 11:01 source
+ * Added 'Knows' to the import
+ * Enhanced import procedure
- file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-06 17:10 source
-2010-01-04 11:01 source
+ * Added MinExpiration param for sponger
- file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-06 17:09 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-12-06 17:08 source
-2010-01-04 11:01 source
+ * FIxed show better message instead of error on url parse
- file plain-titlepage.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-06 10:34 source
-2010-01-04 11:01 source
+ * Fixed max dns name is 250 chars
- file plain-titlepage.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-06 10:34 source
-2010-01-04 11:01 source
+ * Added copy_list_to_array and revlist_to_array for plugins
- file plain.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-12-06 10:33 source
-2010-01-04 11:01 source
+ * Fixed if we have bad fd in saved sessions, check which one and
+ remove, to avoid busy loop on unix
- file plain.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-30 12:34 source
-2010-01-04 11:01 source
+ * Fixed use char flags instead of bitfield
- file plus.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-30 12:33 source
-2010-01-04 11:01 source
+ * Added optimization for case when there is no locality
- file pointer.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-30 12:33 source
-2010-01-04 11:01 source
+ * Fixed must lock mtx before reading cache
- file profile-mode.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-29 14:37 source
-2010-01-04 11:01 source
+ * FIxed minor issues
- file profile.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-29 14:36 source
-2010-01-04 11:01 source
+ * Added statistics on how many remaps are free
- file sections-spec.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-26 21:23 source
-2010-01-04 11:01 source
+ * Fixed busy loop when no free remaps
- file sections2blocks.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-26 10:47 source
-2010-01-04 11:01 source
+ * Added extra debugging on shared cache
- file showtoc.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-26 10:46 source
-2010-01-04 11:01 source
+ * Fixed issue compiling extensions in debug mode
- file slides-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-25 19:53 source
-2010-01-04 11:01 source
+ * Fixed must cut before print else will return wrong error
- file slides-default.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-24 11:41 source
-2010-01-04 11:01 source
+ * Fixed use external bif_tidy in the crawler
- file slides-frames.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-24 11:36 source
-2010-01-04 11:01 source
+ * Fixed mark transaction as ended in provider if virtuoso server kills
+ the transaction
- file slides-plain.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-23 19:30 source
-2010-01-04 11:01 source
+ * FIxed issue with DISTINCT and ORDER BY
- file slides-table.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-23 19:28 source
-2010-01-04 11:01 source
+ * FIxed "delayed" crash in case of passing wrong argument
- file slides-w3c.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-23 19:27 source
-2010-01-04 11:01 source
+ * Added check for tidy in crawler
- file slides.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-23 19:26 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file slides.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-23 10:20 source
-2010-01-04 11:01 source
+ * Fixed bad test
- file specifications.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-22 20:40 source
-2010-01-04 11:01 source
+ * Fixed issue with sparql-fed
- file stdlib.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-22 20:39 source
-2010-01-04 11:01 source
+ * Fixed prevent assert on large box
- file string.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-22 14:26 source
-2010-01-04 11:01 source
+ * Fixed issue with bnode
- file strip-attributes.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-22 11:28 source
-2010-01-04 11:01 source
+ * Added VirtuosoQueryEngine auto registration was added to VirtGraph
+ static initilization
- file svg.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-22 11:06 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file tables.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-22 11:00 source
-2010-01-04 11:01 source
+ * Rebuild drivers
- file template-pages.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-22 10:59 source
-2010-01-04 11:01 source
+ * Fixed JDBC driver lost prepared data after execution query, so next
+ execute of prepared query throws exception
- file template.dot was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-20 10:57 source
-2010-01-04 11:01 source
+ * Added bif patch_restrictec_xml_chars()
- file template.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-19 16:50 source
-2010-01-04 11:01 source
+ * Added Likes and DisLikes
- file ua.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-19 16:49 source
-2010-01-04 11:01 source
+ * Added group sharing
+ * Fixed extended user's select
- file uri.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-19 16:47 source
-2010-01-04 11:01 source
+ * Updated to ckeditor version 3.4.2
- file use.local.olink.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-11-19 16:45 source
-2010-01-04 11:01 source
+ * Added optimizations
+ * Added checking for rdfa dtd
- file use.role.as.xrefstyle.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-11-19 16:43 source
-2010-01-04 11:01 source
+ * Fixed use integer for https_verity and https_cv_depth
+ * Fixed use uppercase for SSL auth
- file use.role.for.mediaobject.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-11-19 16:41 source
-2010-01-04 11:01 source
+ * Added setup for DET on collections
- file use.svg.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-11-19 14:25 source
-2010-01-04 11:01 source
+ * Fixed wrong number of params
- file variablelist.as.blocks.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-19 14:25 source
-2010-01-04 11:01 source
+ * Fixed busy loop
- file variablelist.as.table.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-17 21:30 source
-2010-01-04 11:01 source
+ * Added function to get DTD identifiers
- file variablelist.max.termlength.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-17 21:29 source
-2010-01-04 11:01 source
+ * Fixed dimension is not in triples
- file variablelist.term.break.after.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-17 21:29 source
-2010-01-04 11:01 source
+ * Fixed page debug
- file variablelist.term.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-17 21:28 source
-2010-01-04 11:01 source
+ * Fixed name in footer
- file variablelist.term.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-17 21:27 source
-2010-01-04 11:01 source
+ * Added initialize query text option for /sparql
- file verbatim.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-16 20:17 source
-2010-01-04 11:01 source
+ * Fixed do not try to close bad filedescriptor as windows does not
+ like this
- file vslides.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-16 14:30 source
-2010-01-04 11:01 source
+ * Added imap client support
- file w3c-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-15 20:12 source
-2010-01-04 11:01 source
+ * Fixed if we have a qr with no params at all, exec should signal error
- file w3c-next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-15 16:51 source
-2010-01-04 11:01 source
+ * Fixed issue with combination of UNION in the argument of IN causing
+ General internal Optimized compiler error
- file w3c-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-15 16:47 source
-2010-01-04 11:01 source
+ * Fixed record the thread which entered/left the buffer in debug mode
- file w3c-prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-15 10:13 source
-2010-01-04 11:01 source
+ * Fixed do not attempt to parse empty content
- file w3c-toc.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-12 21:01 source
-2010-01-04 11:01 source
+ * Fixed only check pages in online backup
- file w3c-toc.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-12 21:00 source
-2010-01-04 11:01 source
+ * Fixed recovery mode
- file w3c.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:55 +0000
+2010-11-12 21:00 source
-2010-01-04 11:01 source
+ * Fixed send body of 509 bandwidth error
- file wordml.template.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-11 16:06 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.3-rc1
- file wordml2normalise.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-11 15:53 source
-2010-01-04 11:01 source
+ * Fixed check for sql disabled flag
- file writing.mode.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-11 12:38 source
-2010-01-04 11:01 source
+ * Fixed group editing
+ * Fixed WebID for Briefcase instances
- file xbCollapsibleLists.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-11 12:34 source
-2010-01-04 11:01 source
+ * Added group sharing
- file xbCollapsibleLists.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-11 11:23 source
-2010-01-04 11:01 source
+ * Added special immutable setting for inf rules
- file xbDOM.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-10 15:59 source
-2010-01-04 11:01 source
+ * Fixed use dsn from content-location when it exists
- file xbDOM.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-10 15:45 source
-2010-01-04 11:01 source
+ * Fixed pass headers as options so every cartridge can read
- file xbDebug.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-10 12:00 source
-2010-01-04 11:01 source
+ * Added magic key export
- file xbLibrary.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-10 11:59 source
-2010-01-04 11:01 source
+ * Fixed stack corruption on 64bit
- file xbLibrary.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 21:47 source
-2010-01-04 11:01 source
+ * Fixed memleak when error is signalled
- file xbStyle-css.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 21:44 source
-2010-01-04 11:01 source
+ * Fixed avoid re-define
- file xbStyle-nn4.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 21:42 source
-2010-01-04 11:01 source
+ * Fixed remove call to SP before it is defined
- file xbStyle-not-supported.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 20:19 source
-2010-01-04 11:01 source
+ * Fixed https access
+ * Fixed ACL UI
- file xbStyle.js was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 20:18 source
-2010-01-04 11:01 source
+ * Added support for SWD
+ * Added support for Salmon
+ * Added RDFa info
+ * Fixed key removal not working
+ * Fixed bad permissions for user's home directory creation
+ * Fixed no validator at this point
+ * Fixed sync user's pages
+ * Fixed salmon api
+ * Fixed move groups from briefcase into framework
- file xbStyle.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 20:15 source
-2010-01-04 11:01 source
+ * Added initial support for Salmon protocol
+ * Fixed check for email
+ * Fixed uninstall problem
- file xep.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 20:12 source
-2010-01-04 11:01 source
+ * Added signed mails
+ * Fixed https access
- file xep.index.item.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 20:12 source
-2010-01-04 11:01 source
+ * Fixed move groups from briefcase into ODS framework
+ * Fixed https access
- file xref.label-page.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 20:11 source
-2010-01-04 11:01 source
+ * Fixed https access
+ * Fixed labels
- file xref.label-title.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 20:11 source
-2010-01-04 11:01 source
+ * Fixed https access
- file xref.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 20:01 source
-2010-01-04 11:01 source
+ * Fixed properly encode the query before passing it to PivotViewer
- file xref.title-page.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 19:59 source
-2010-01-04 11:01 source
+ * Fixed more labels
- file xref.with.number.and.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-09 10:59 source
-2010-01-04 11:01 source
+ * Fixed split part of MTX_DEBUG into PAGE_DEBUG
- file xsl2profile.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:54 +0000
+2010-11-08 15:42 source
-2010-01-04 11:01 source
+ * Fixed prevent bad data to crash system during deserialization
- file qanda.title.level5.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-08 12:37 source
-2010-01-04 11:01 source
+ * Added http://loc.openlinksw.com/sparql as registered endpoint
+ * Fixed URIs in resultview anchors
- file qanda.title.level6.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-08 12:35 source
-2010-01-04 11:01 source
+ * Fixed return string session, rather than allocate string so it will
+ handle large resources
+ * Fixed possible double free of temp filename
+ * Fixed issue with MALLOC_DEBUG
- file qanda.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-08 12:21 source
-2010-01-04 11:01 source
+ * Fixed ACL update
- file qandadiv.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-08 11:46 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file rebuild-all.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-08 11:45 source
-2010-01-04 11:01 source
+ * Added ACL settings
+ * Added new type
+ * Added CORS options
+ * Fixed layout of cert generation form
+ * Fixed label of cartridges
- file refclass.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-08 11:08 source
-2010-01-04 11:01 source
+ * Added check by entity type
- file refentry.date.profile.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-05 20:23 source
-2010-01-04 11:01 source
+ * Fixed check dp before processing
- file refentry.date.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-05 10:57 source
-2010-01-04 11:01 source
+ * Fixed explanation of rdf inf failures
- file refentry.generate.name.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-05 10:56 source
-2010-01-04 11:01 source
+ * Fixed bad condition of extension, do not push local imports
- file refentry.generate.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-05 10:54 source
-2010-01-04 11:01 source
+ * Fixed /sparql/ endpoint to show/hide controls
+ * Fixed show supported formats depending on configuration
- file refentry.manual.fallback.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-05 10:53 source
-2010-01-04 11:01 source
+ * Fixed CXML desc support
- file refentry.manual.profile.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-04 18:18 source
-2010-01-04 11:01 source
+ * Fixed typo
- file refentry.manual.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-02 19:14 source
-2010-01-04 11:01 source
+ * Added cxml det
- file refentry.meta.get.quietly.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-02 19:12 source
-2010-01-04 11:01 source
+ * Fixed top/skip should only work for non-multistate
+ * Fixed recover when itc is unregistered
- file refentry.pagebreak.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-11-01 14:15 source
-2010-01-04 11:01 source
+ * FIxed only skip when initialized
- file refentry.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-10-29 14:12 source
-2010-01-04 11:01 source
+ * Fixed when pl stats collection is enabled, the hash must be
+ protected in order to avoid crash
- file refentry.source.fallback.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-10-29 14:11 source
-2010-01-04 11:01 source
+ * Fixed when count/sum/avg and other aggregates make columns to be the
+ respective type e.g. int or double, except when performing min/max
+ on string, we turn off mem_cache_only, so they can goto disk
- file refentry.source.name.profile.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-10-29 14:09 source
-2010-01-04 11:01 source
+ * Fixed unbalanced } outside ifdef
- file refentry.source.name.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-10-29 14:08 source
-2010-01-04 11:01 source
+ * Added function alias
- file refentry.source.name.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-10-29 14:08 source
-2010-01-04 11:01 source
+ * Fixed when selection list contains expressions with constants do
+ not inline OJ
- file refentry.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-10-27 12:59 source
-2010-01-04 11:01 source
+ * Fixed issues with sparql fed
- file refentry.version.profile.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-27 12:56 source
-2010-01-04 11:01 source
+ * Added new bif functions dict_iter_hash and dict_key_eq
- file refentry.version.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-27 12:55 source
-2010-01-04 11:01 source
+ * Added page enter debugging
- file refentry.version.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-27 12:53 source
-2010-01-04 11:01 source
+ * Added support for CORS
- file refentry.xref.manvolnum.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-27 12:52 source
-2010-01-04 11:01 source
+ * Fixed check all the cos in gby to be numeric types
- file reference.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-27 12:51 source
-2010-01-04 11:01 source
+ * Added debug line pragmas
- file region.after.extent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-27 12:50 source
-2010-01-04 11:01 source
+ * Fixed debug assert for itc_is_registered
- file region.before.extent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-25 13:23 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings
- file revhistory.table.cell.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-25 13:19 source
-2010-01-04 11:01 source
+ * Fixed rdf boxes cmp
+ * Fixed rdf inf loading
- file revhistory.table.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-25 13:15 source
-2010-01-04 11:01 source
+ * Fixed allow all users to have user_t so they can have their own
+ encryption keys
- file revhistory.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-22 21:12 source
-2010-01-04 11:01 source
+ * Added contols to add text filters
+ * Added support for creating new ses with class iri filter
+ * Added choose type and start/continue facets browsing session to rdfdesc
+ * Fixed drop text constraint
+ * Fixed view types
- file root.filename.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-22 16:34 source
-2010-01-04 11:01 source
+ * Fixed link warning
- file root.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-22 16:31 source
-2010-01-04 11:01 source
+ * Fixed issue with shadowing local variable in java hosting
- file rootid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-22 14:58 source
-2010-01-04 11:01 source
+ * Fixed temporary disabled code
- file runinhead.default.title.end.punct.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-22 12:31 source
-2010-01-04 11:01 source
+ * Fixed single does not have a dpipe
- file runinhead.title.end.punct.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-22 10:28 source
-2010-01-04 11:01 source
+ * FIxed if dpipe before outer section, put the dpipe before the set
+ ctr of the outer section and not after, else it may mess with the
+ output of the dpipe
- file running.foot.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-22 09:52 source
-2010-01-04 11:01 source
+ * Fixed missing symbol
- file sans.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-22 09:50 source
-2010-01-04 11:01 source
+ * Fixed rb can be twice as it is a ref
- file saxon.callouts.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-20 16:04 source
-2010-01-04 11:01 source
+ * Fixed problem with extremely large XML doc
- file saxon.character.representation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-19 12:38 source
-2010-01-04 11:01 source
+ * Added dynamic resizing of result block
- file saxon.linenumbering.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-18 18:50 source
-2010-01-04 11:01 source
+ * Fixed issue with SPARQL CONSTRUCT/INSERT/DELETE/MODIFY queries
- file saxon.tablecolumns.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-18 12:18 source
-2010-01-04 11:01 source
+ * Fixed when a page with free remap is found, indicate the trx should be killed
+ rather than getting infinite loop
+ * Fixed extra debugging for page access
- file script.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-18 12:14 source
-2010-01-04 11:01 source
+ * Fixed when operation is count etc, aggregate returning a number
+ does not do memcache only in order to avoid running out of memory
- file section.autolabel.max.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-18 12:01 source
-2010-01-04 11:01 source
+ * Added new functions to ImageMagick plugin
- file section.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-15 11:37 source
-2010-01-04 11:01 source
+ * Fixed fct_label on v6 single
- file section.container.element.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 13:59 source
-2010-01-04 11:01 source
+ * Fixed the xe_make_copy is valid only for XMLTYPE, not for every UDT
- file section.label.includes.component.label.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 13:59 source
-2010-01-04 11:01 source
+ * Fixed gpf
- file section.level1.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 12:12 source
-2010-01-04 11:01 source
+ * Added rsh-sha256
+ * Added xenc_dsig_verify, xenc_dsig_sign and xenc_key_RDA_construct
- file section.level2.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 12:11 source
-2010-01-04 11:01 source
+ * Removed old upgrade code
- file section.level3.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 12:09 source
-2010-01-04 11:01 source
+ * Fixed BestBuy cartridge
- file section.level4.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 12:07 source
-2010-01-04 11:01 source
+ * Added checks for value ranges
+ * Added paging through 'Related Collections' links
- file section.level5.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 12:02 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file section.level6.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 12:00 source
-2010-01-04 11:01 source
+ * Added ACL semantic ping
+ * Fixed encoding problems
+ * Fixed JS error
- file section.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 11:59 source
-2010-01-04 11:01 source
+ * Added ACL semantic ping
+ * Fixed encoding problems
+ * Optimized page load
- file section.title.level1.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 11:58 source
-2010-01-04 11:01 source
+ * Fixed encoding problems
+ * Fixed and optimized users and webIDs
+ * Fixed sharings
+ * Optimized page load
- file section.title.level2.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 10:36 source
-2010-01-04 11:01 source
+ * Added ACL semantic ping
+ * Fixed and optimized users and webIDs
+ * Fixed empty lists
+ * Fixed encoding problems
+ * Optimized page load
- file section.title.level3.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 10:35 source
-2010-01-04 11:01 source
+ * Added ACL semantic ping
+ * Fixed encoding problems
- file section.title.level4.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 10:34 source
-2010-01-04 11:01 source
+ * Added ACL semantic ping
+ * Fixed and optimized users and webIDs
+ * Fixed encoding problems
+ * Fixed empty lists
+ * Optimized page load
- file section.title.level5.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-13 10:33 source
-2010-01-04 11:01 source
+ * Added ACL semantic ping
+ * Fixed and optimized users and webIDs
+ * Fixed JS map error
+ * Fixed JS errors
+ * Fixed tabs
+ * Fixed encoding problems
- file section.title.level6.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-12 17:35 source
-2010-01-04 11:01 source
+ * Fixed bug when filer (num <>= (subq))
- file section.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-12 12:23 source
-2010-01-04 11:01 source
+ * Added support for latest tidylib
- file segmentedlist.as.table.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 23:31 source
-2010-01-04 11:01 source
+ * Fixed some issues with dsig_verify
- file sequential.links.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 13:29 source
-2010-01-04 11:01 source
+ * Fixed new debug macro DK_ALLOC_BOX_DEBUG for basic integrety checks
+ without overhead of full MALLOC_DEBUG
- file shade.verbatim.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 13:24 source
-2010-01-04 11:01 source
+ * Added item ACL
+ * Added ACL Inheritance
+ * Fixed update
+ * Fixed tag bug
- file shade.verbatim.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 13:07 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file show.comments.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 13:00 source
-2010-01-04 11:01 source
+ * Added ACL Inheritance
+ * Fixed updated UI
- file show.foil.number.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 13:00 source
-2010-01-04 11:01 source
+ * Added ACL Inheritance
+ * Fixed binding the twitter and linkedin with their API
+ * Fixed IE password field size bug
+ * Fixed must quote vars from sparql
+ * Fixed swat0
- file show.revisionflag.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 12:58 source
-2010-01-04 11:01 source
+ * Added ACL Inheritance
+ * Fixed optimized progress bar
+ * Fixed read/unread actions
+ * Fixed encoding problem
+ * Fixed updated UI
+ * Removed deprecated icons
- file showtoc.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 12:56 source
-2010-01-04 11:01 source
+ * Added ACL Inheritance
+ * Fixed ACL recalc bug
+ * Fixed updated UI
- file side.float.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 12:55 source
-2010-01-04 11:01 source
+ * Added ACL Inheritance
+ * Fixed optimized update
+ * Fixed sharing problem
+ * Fixed updated UI
- file sidebar.float.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 12:54 source
-2010-01-04 11:01 source
+ * Added ACL Inheritance
+ * Fixed ACL recalc bug
+ * Fixed optimize progress bar
+ * Removed deprecated images
- file sidebar.float.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 12:53 source
-2010-01-04 11:01 source
+ * Fixed swat0
- file sidebar.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 12:44 source
-2010-01-04 11:01 source
+ * Updated documentation
- file sidebar.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-07 12:20 source
-2010-01-04 11:01 source
+ * Added option not to convert HTML pages
- file simplesect.in.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-06 21:39 source
-2010-01-04 11:01 source
+ * Added initial attribute/property value ranges conditional
+ * Added new XML element <value-range hi="" lo="" /> for facet browser
+ * Fixed make pivot bridge link conditional
- file slide.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-06 21:37 source
-2010-01-04 11:01 source
+ * Fixed prevent buggy IRI to hit compiler
- file slide.title.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-06 09:40 source
-2010-01-04 11:01 source
+ * Fixed problem compiling certain SPARQL constructions
- file slides.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-06 09:35 source
-2010-01-04 11:01 source
+ * Added some new functions to XPATH virtual table
+ * Added optimizations to boolean expression evaluation
- file slides.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-06 09:27 source
-2010-01-04 11:01 source
+ * Fixed added qualifier to stored proc creation
- file spacing.paras.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-06 09:26 source
-2010-01-04 11:01 source
+ * Fixed moved some checks to header file for macro expansion
- file speakernote.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-06 09:15 source
-2010-01-04 11:01 source
+ * Added support for CSV output mode
- file subscript.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-06 09:15 source
-2010-01-04 11:01 source
+ * Fixed compatibility with openssl 0.9.7
- file superscript.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-05 09:39 source
-2010-01-04 11:01 source
+ * Fixed when enlist starts we should have new xid or not listed
- file suppress.footer.navigation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-04 18:39 source
-2010-01-04 11:01 source
+ * Fixed if resource is not free e.q. count = 2 we most restore as other
+ thread can kill it in the middle
- file suppress.header.navigation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-10-04 14:40 source
-2010-01-04 11:01 source
+ * Fixed save should happen after checks, as jump would leave members
+ NULL
- file suppress.homepage.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 22:37 source
-2010-01-04 11:01 source
+ * Fixed missing text from cache
- file suppress.navigation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 19:41 source
-2010-01-04 11:01 source
+ * FIxed label
- file symbol.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:45 source
-2010-01-04 11:01 source
+ * Added linkblog pages
+ * Fixed smaller tweet me button on bottom
+ * Fixed template list
- file table.borders.with.css.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:44 source
-2010-01-04 11:01 source
+ * Added ACL inheritance
- file table.cell.border.color.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:44 source
-2010-01-04 11:01 source
+ * Fixed date update change in events/tasks
- file table.cell.border.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:37 source
-2010-01-04 11:01 source
+ * Rebuild drivers
- file table.cell.border.thickness.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:29 source
-2010-01-04 11:01 source
+ * Fixed issue with connection timeout
- file table.cell.padding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:23 source
-2010-01-04 11:01 source
+ * Fixed split uiedit into separate pages to get better response time
+ when compiling
+ * Fixed 'Generate Certificate'
- file table.entry.padding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:13 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file table.footnote.number.format.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:11 source
-2010-01-04 11:01 source
+ * Fixed ACL implementation
- file table.footnote.number.symbols.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 14:11 source
-2010-01-04 11:01 source
+ * Fixed take DynamicLocal into account
- file table.footnote.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 13:51 source
-2010-01-04 11:01 source
+ * FIxed client must not redefine mutex_enter as this will crash single
- file table.frame.border.color.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 08:58 source
-2010-01-04 11:01 source
+ * Fixed use x-forwarded-for and remember it is forwarded
- file table.frame.border.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 08:57 source
-2010-01-04 11:01 source
+ * Fixed use the redirect link for base when supplied
- file table.frame.border.thickness.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-27 08:56 source
-2010-01-04 11:01 source
+ * Fixed check if m2 is a box
- file table.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 15:11 source
-2010-01-04 11:01 source
+ * Reverted patch
- file table.spacer.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 14:01 source
-2010-01-04 11:01 source
+ * Added xml_sign() for making pure XML signatures
+ * Added signature in host-meta xrd
+ * FIxed memleaks when doing xml signatures
- file table.table.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 13:56 source
-2010-01-04 11:01 source
+ * Fixed bad procedure name
- file tablecolumns.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 13:06 source
-2010-01-04 11:01 source
+ * Fixed unified login pages
+ * Fixed upgraded ACL implementation
+ * Fixed Linkedin link
- file target.database.document.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 13:03 source
-2010-01-04 11:01 source
+ * Fixed upgraded ACL implementation
- file targets.filename.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 13:02 source
-2010-01-04 11:01 source
+ * Added archive and summary pages
+ * Added new templates to vad
- file template.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 12:50 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file tex.math.delims.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 12:48 source
-2010-01-04 11:01 source
+ * Fixed vcard and vcal file import
- file tex.math.file.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-22 12:48 source
-2010-01-04 11:01 source
+ * Fixed group ACL access
- file tex.math.in.alt.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-21 13:12 source
-2010-01-04 11:01 source
+ * Fixed load demo vad after tutorial
- file text.home.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-21 13:11 source
-2010-01-04 11:01 source
+ * Added missing file
- file text.next.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-21 11:34 source
-2010-01-04 11:01 source
+ * Fixed focus issue
+ * Fixed typo
+ * Fixed XRDS
- file text.prev.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-21 11:33 source
-2010-01-04 11:01 source
+ * Added new templates
- file text.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-21 11:20 source
-2010-01-04 11:01 source
+ * Fixed serialize access to connection struct
- file text.up.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 10:14 source
-2010-01-04 11:01 source
+ * Fixed Id
- file textbgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:51 source
-2010-01-04 11:01 source
+ * Added RDFa doctype
+ * Added new feature of fct to show certain graph
- file textdata.default.encoding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:50 source
-2010-01-04 11:01 source
+ * Fixed http://dbpedia.org/property/name is not the name of the subject
- file textinsert.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:23 source
-2010-01-04 11:01 source
+ * Added new feature of fct to show certain graph when fct is installed
- file title.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:20 source
-2010-01-04 11:01 source
+ * Added new login and register library
+ * Added WebID to 'My Profile'
+ * Added linkedin login
+ * Added new inde on OL accounts
+ * Added twitter login page
+ * Added login with Google account
+ * Fixed WebFinder to look at sameas
+ * Fixed X.509 certificates in user pages
+ * Fixed password problem
+ * Fixed group ACL access
+ * Fixed validation ACLs
+ * Fixed openID server parameters extraction
+ * Fixed create instance defaults
+ * Fixed use of timezone
+ * Fixed Safari and Chrome bug
+ * Fixed biographical date input
- file title.margin.left.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:14 source
-2010-01-04 11:01 source
+ * Fixed filter problem with WebID
- file titlefoil.html.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:13 source
-2010-01-04 11:01 source
+ * Added ACL support for tasks
+ * Fixed group ACL access
+ * Fixed ACL table UI
+ * Fixed private access
+ * Fixed validation ACLs
- file toc.bg.color.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:12 source
-2010-01-04 11:01 source
+ * Fixed group ACL access
+ * Fixed ACL group select
+ * Fixed ACL UI
+ * Fixed validation ACLs
- file toc.blank.graphic.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:11 source
-2010-01-04 11:01 source
+ * Added ACLs
+ * Fixed group ACL access
+ * Fixed private access
- file toc.blank.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 09:09 source
-2010-01-04 11:01 source
+ * Fixed group ACL access
+ * Fixed ACL table UI
+ * Fixed private access
+ * Fixed validation ACLs
- file toc.blank.text.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 08:55 source
-2010-01-04 11:01 source
+ * Added refresh=clean mode, to drop cache even if it is in the middle
+ of sponging on another threads
+ * Added scheduler task to keep volume under some limit
- file toc.hide.show.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-20 08:27 source
-2010-01-04 11:01 source
+ * Fixed ACL testing now http returns 509
- file toc.html.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 23:11 source
-2010-01-04 11:01 source
+ * Fixed when fct is installed, use the new feature of fct to show
+ certain graphs
- file toc.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 23:10 source
-2010-01-04 11:01 source
+ * Fixed hang in prefix check if there is single dot in prefix
- file toc.indent.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 23:10 source
-2010-01-04 11:01 source
+ * Fixed check log text should always be DV_STRING
- file toc.line.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 23:08 source
-2010-01-04 11:01 source
+ * Added support for CXML
- file toc.list.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 23:03 source
-2010-01-04 11:01 source
+ * Added strong optimization of SPARQL arithmatic and numerical
+ comparisons
- file toc.margin.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 22:49 source
-2010-01-04 11:01 source
+ * Added initial support for RDB2RDF
- file toc.max.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 22:05 source
-2010-01-04 11:01 source
+ * Added improvements for SPARQL-FED esp. to let XSLT access data
+ from remote SPARQL endpoint
- file toc.pointer.graphic.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 20:49 source
-2010-01-04 11:01 source
+ * Fixed rendezvous thread should never handle any signals
- file toc.pointer.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 16:50 source
-2010-01-04 11:01 source
+ * Fixed moved include file to more appropriate place
- file toc.pointer.text.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 16:48 source
-2010-01-04 11:01 source
+ * Fixed do not try when in V6 single mode
- file toc.row.height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 16:45 source
-2010-01-04 11:01 source
+ * Added new bifs that print start element, end elemend and empty
+ element with some number of attributes. Attribute values are
+ checked for NULL and print only non-NULLs to eliminate numerous
+ IF statements in Virtuoso/PL
- file toc.section.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 16:42 source
-2010-01-04 11:01 source
+ * Added bif that checks if some value is stored in given dictionary
+ for a given key, without returning it. This is usefull if value is
+ potentially big as it does not copy anything.
- file toc.spacer.graphic.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 16:40 source
-2010-01-04 11:01 source
+ * Fixed let some string BIFs accept UNAME arguments
- file toc.spacer.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 16:35 source
-2010-01-04 11:01 source
+ * Removed deprecated repl code
- file toc.spacer.text.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-17 11:18 source
-2010-01-04 11:01 source
+ * Fixed isalnum needs unsigned char as negative values might trip asserts
+ on some systems like Windows
- file toc.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-15 23:54 source
-2010-01-04 11:01 source
+ * Fixed handling format like 2010-09-15T14:24:28Z without fraction part
+ * Fixed set local timezone
- file ua.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-15 08:10 source
-2010-01-04 11:01 source
+ * Fixed redirects for tcn
+ * Fixed set default to html
+ * Fixed in order of browser preference
- file ulink.footnotes.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-13 16:03 source
-2010-01-04 11:01 source
+ * Fixed issue with xs_q_4/foaf.vsp demo
- file ulink.hyphenate.chars.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-09 19:19 source
-2010-01-04 11:01 source
+ * Added check
- file ulink.hyphenate.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-09 19:18 source
-2010-01-04 11:01 source
+ * FIxed print dict in dbg_* functions
- file ulink.show.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-09 16:02 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file ulink.target.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-09 15:32 source
-2010-01-04 11:01 source
+ * Added MIME types for .NET click-once, MS Office and MS WPF applications
+ * Added additional MIME types based on apache mime.types.txt
- file up.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-07 21:56 source
-2010-01-04 11:01 source
+ * Added geo for dbpedia
+ * Fixed wrong var names
+ * Fixed issue with IE
+ * Fixed deprecated call to OAT.Dom.applyStyle into OAT.Style.set
+ * Removed unused background
- file use.embed.for.svg.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-07 21:37 source
-2010-01-04 11:01 source
+ * Added fingerpoint hook
- file use.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-07 21:28 source
-2010-01-04 11:01 source
+ * Added oauth+openid hybrid
+ * Added JS validation routines
+ * Added fingerpoint hooks
+ * Fixed x509 order
+ * Fixed use ssl login if accessed via https
+ * Fixed https on endpoint
+ * Fixed openid for fingerpoint
+ * Fixed seeAlso lookups via WF/FP
+ * Fixed Facebook issues
+ * Fixed validation ACLs
+ * Fixed Gallery pane
- file use.id.as.filename.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-07 21:24 source
-2010-01-04 11:01 source
+ * Fixed ACL
- file use.id.function.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:53 +0000
+2010-09-07 21:24 source
-2010-01-04 11:01 source
+ * Added ACL
- file man.string.subst.map.local.pre.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-09-07 21:23 source
-2010-01-04 11:01 source
+ * Fixed private access error
- file man.string.subst.map.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-09-07 21:23 source
-2010-01-04 11:01 source
+ * Fixed private access error
+ * Fixed typo
- file man.subheading.divider.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-09-07 19:55 source
-2010-01-04 11:01 source
+ * Minor fixes
- file man.subheading.divider.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-09-07 19:55 source
-2010-01-04 11:01 source
+ * Added XRD meta
- file man.table.footnotes.divider.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-09-07 19:54 source
-2010-01-04 11:01 source
+ * Added attribution ontology
- file man.th.extra1.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-09-01 10:15 source
-2010-01-04 11:01 source
+ * Added support headers from url rewrite for static resources such
+ as files
- file man.th.extra2.max.length.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-09-01 10:11 source
-2010-01-04 11:01 source
+ * Fixed link headers
- file man.th.extra2.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-31 12:12 source
-2010-01-04 11:01 source
+ * Added missing function
- file man.th.extra3.max.length.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-31 12:12 source
-2010-01-04 11:01 source
+ * Added support for IUD ops to XMLA endpoint
- file man.th.extra3.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-31 12:09 source
-2010-01-04 11:01 source
+ * Fixed return appropriate message based on the type of ACL result
- file man.th.title.max.length.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-31 11:45 source
-2010-01-04 11:01 source
+ * Added support for host-meta
- file manifest.in.base.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-30 13:46 source
-2010-01-04 11:01 source
+ * Updated documentation
- file manifest.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-30 13:37 source
-2010-01-04 11:01 source
+ * Fixed use short representations to make sorted by
- file manual.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-30 13:35 source
-2010-01-04 11:01 source
+ * Fixed missing prototype
- file margin.note.float.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-30 12:34 source
-2010-01-04 11:01 source
+ * Fixed use webfinger to do ssl authentication
- file margin.note.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-30 12:21 source
-2010-01-04 11:01 source
+ * Fixed error message generation in execute
+ * Fixed encoding issue in directory listings generated from
+ filesystem-hosted virtual directories
- file margin.note.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-26 22:49 source
-2010-01-04 11:01 source
+ * FIxed i18n support for subject and address list
- file margin.note.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-26 22:41 source
-2010-01-04 11:01 source
+ * Fixed typo
- file marker.section.level.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-26 22:40 source
-2010-01-04 11:01 source
+ * Added Evri cartridge and ontology
+ * Added hNews cartridge
- file menuchoice.menu.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-26 22:34 source
-2010-01-04 11:01 source
+ * Added support for acct: scheme
- file menuchoice.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-26 22:33 source
-2010-01-04 11:01 source
+ * Added support for webfinger + OpenID
+ * Fixed login with webfinger
+ * Fixed login popup page
+ * Fixed sameAs validation values
+ * Fixed Facebook link
+ * Fixed iframe number
+ * Fixed certificate generator
- file minus.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-26 22:30 source
-2010-01-04 11:01 source
+ * Fixed application settings page url
- file monospace.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-26 18:04 source
-2010-01-04 11:01 source
+ * Added support for host-meta
- file monospace.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-26 18:03 source
-2010-01-04 11:01 source
+ * Fixed if position is not valid, skip the iob and go to next
- file monospace.verbatim.font.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-24 22:34 source
-2010-01-04 11:01 source
+ * Fixed set to NULL after free
- file monospace.verbatim.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-22 16:04 source
-2010-01-04 11:01 source
+ * Added option for to validate in hours
- file multiframe.bottom.bgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-22 13:06 source
-2010-01-04 11:01 source
+ * Added new SQL optimization trick to convert
+ sprintf ('format', col0, col1, ..., colN) = exnp
+ into more index friendly:
+ ( col0 = sprintf_inverse ('format', expn, 2)[0] and
+ col1 = sprintf_inverse ('format', expn, 2)[1] and ...
+ colN = sprintf_inverse ('format', expn, 2)[N] )
- file multiframe.navigation.height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-20 10:12 source
-2010-01-04 11:01 source
+ * Fixed typo in BIF name
+ * Fixed SPARQL resultset output if some objects of an RDF storage are
+ corrupted
- file multiframe.top.bgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-20 10:10 source
-2010-01-04 11:01 source
+ * Fixed error on INSERT DATA with literals of non-default types
- file multiframe.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-20 10:09 source
-2010-01-04 11:01 source
+ * Fixed issue with ill formed SPARQL requests send by SPARQL SERVICE
+ clause with dynamic parameters
- file nav.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-20 10:07 source
-2010-01-04 11:01 source
+ * Fixed issue parsing sparql function calls with zero arguments
- file nav.table.summary.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-18 08:41 source
-2010-01-04 11:01 source
+ * Fixed check dirsallowed before loading file
- file navbgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 21:40 source
-2010-01-04 11:01 source
+ * Fixed use webfinger to do SSL authentication
- file navbodywidth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 18:29 source
-2010-01-04 11:01 source
+ * Added support to use webfinger for SSL authentication
+ * Disabled rel=me tweak
- file navig.graphics.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 18:05 source
-2010-01-04 11:01 source
+ * Added Google Book cartridge
- file navig.graphics.path.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 18:05 source
-2010-01-04 11:01 source
+ * Fixed use foaf ssl procedure
- file navig.graphics.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 18:01 source
-2010-01-04 11:01 source
+ * Added get-certificate_info (10,cert,type, pass, 'subject field name
+ e.g. emailAddress, OU etc.')
- file navig.showtitles.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 11:06 source
-2010-01-04 11:01 source
+ * FIxed sparql parse bug with NOT FROM NAMED queries like
+ select distinct ?g ?p not from named virtrdf: where
+ { graph ?g { ?s ?p ?o }}
- file navtocwidth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 10:23 source
-2010-01-04 11:01 source
+ * Fixed security issue in SPARQL
+ A compiled and cached query may stay in its old state (not
+ recompiled) after global security changes like
+ DB.DBA.RDF_DEFAULT_USER_PERMS_SET ('nobody', 0) that should
+ recompile most of queries cached for all users but it does not.
- file next.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 10:22 source
-2010-01-04 11:01 source
+ * Fixed build rules
- file no.home.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-17 09:25 source
-2010-01-04 11:01 source
+ * Fixed moved constant declarations of commonly used UNAMEs into
+ separate file
- file no.next.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-16 10:10 source
-2010-01-04 11:01 source
+ * Added webfinger protocol
+ * Fixed cert gen on firefox with .net addon
- file no.prev.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-16 10:09 source
-2010-01-04 11:01 source
+ * Fixed bug in re-install
- file no.toc.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-16 10:07 source
-2010-01-04 11:01 source
+ * Fixed labels
- file no.up.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-16 10:07 source
-2010-01-04 11:01 source
+ * FIxed missing data for interval column
- file nominal.image.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-11 11:07 source
-2010-01-04 11:01 source
+ * Added support for define output:format "NT"
- file nominal.image.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-11 10:53 source
-2010-01-04 11:01 source
+ * Fixed issue with sparql subcode gen
- file nominal.table.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-10 18:47 source
-2010-01-04 11:01 source
+ * Fixed should not use escape here
- file nongraphical.admonition.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-10 18:45 source
-2010-01-04 11:01 source
+ * Added WebID share
+ * Fixed secure sponged VD setup
- file normal.para.spacing.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-10 14:52 source
-2010-01-04 11:01 source
+ * Fixed wrong URL
- file olink.base.uri.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-09 20:08 source
-2010-01-04 11:01 source
+ * Fixed some URL links
- file olink.debug.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-09 19:44 source
-2010-01-04 11:01 source
+ * Fixed support for source_uri attribute in sticker
- file olink.doctitle.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-08 11:55 source
-2010-01-04 11:01 source
+ * Fixed enhanced type recognition
+ * Fixed return errors when loading fails
- file olink.fragid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-08 11:55 source
-2010-01-04 11:01 source
+ * Fixed TOP has argument order of offset, limit
- file olink.lang.fallback.sequence.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-06 10:29 source
-2010-01-04 11:01 source
+ * Fixed issues with Rename
+ * Fixed issues with Upstreaming
- file olink.outline.ext.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-06 10:03 source
-2010-01-04 11:01 source
+ * Added support for SSL and WebID
- file olink.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-06 09:46 source
-2010-01-04 11:01 source
+ * Fixed skip constant ssl returned from temp table output
- file olink.pubid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 18:50 source
-2010-01-04 11:01 source
+ * Fixed clear conn vars after trx replay
- file olink.resolver.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 09:34 source
-2010-01-04 11:01 source
+ * Updated documentation
- file olink.sysid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:37 source
-2010-01-04 11:01 source
+ * Added UI for rdb2rdf
- file orderedlist.label.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:37 source
-2010-01-04 11:01 source
+ * Fixed use subseq to handle blobs
- file orderedlist.label.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:35 source
-2010-01-04 11:01 source
+ * Fixed Activity log
+ * Fixed /about virtual dir
+ * Fixed rewrite http header in cert output
- file orderedlist.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:33 source
-2010-01-04 11:01 source
+ * Fixed Activity log
+ * Fixed file view
+ * Fixed filenames with .acl extension properties editing
- file othercredit.like.author.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:32 source
-2010-01-04 11:01 source
+ * Fixed encoding problem
- file output-root.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:30 source
-2010-01-04 11:01 source
+ * Fixed Activity log
- file output.indent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:30 source
-2010-01-04 11:01 source
+ * Fixed Activity log
+ * Fixed uninstall DET folders
+ * Fixed 'ResFolder' type filters
- file overlay.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:10 source
-2010-01-04 11:01 source
+ * Added persistent xmlns UI
- file overlay.logo.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:03 source
-2010-01-04 11:01 source
+ * Added WebID based ACL support via https
- file overlay.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 07:02 source
-2010-01-04 11:01 source
+ * Fixed Tesco cartridge
- file page.height.portrait.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 06:58 source
-2010-01-04 11:01 source
+ * Fixed avoid errors later in process
- file page.height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-04 06:53 source
-2010-01-04 11:01 source
+ * FIxed use X-Forwarded-Host when the instance is behind gateway
- file page.margin.bottom.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-02 11:31 source
-2010-01-04 11:01 source
+ * Fixed when result from authentication is negative then return
+ else WebID fals
+ * Fixed http auth checks
- file page.margin.inner.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-02 11:25 source
-2010-01-04 11:01 source
+ * Fixed keep mime hash in sync
- file page.margin.outer.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-02 11:23 source
-2010-01-04 11:01 source
+ * Fixed do not allow sponger to change log mode explicitly to no-lock and
+ row-autocommit
- file page.margin.top.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-02 11:20 source
-2010-01-04 11:01 source
+ * Added support for POP3 over SSL
- file page.orientation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-08-02 07:40 source
-2010-01-04 11:01 source
+ * Added global X509 CA repository
- file page.width.portrait.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-29 16:25 source
-2010-01-04 11:01 source
+ * Updated documentation
- file page.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-29 16:17 source
-2010-01-04 11:01 source
+ * Fixed dynlocal format must be replaced by host as in host header
- file pages.template.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-29 16:14 source
-2010-01-04 11:01 source
+ * Added common api FOAF_SSL_WEBID_GET
+ * Added setting for online certificate service
+ * Added https link in header
+ * Fixed online accounts
+ * Fixed WebID
+ * Fixed alt name can have multiple values
- file paper.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-28 12:26 source
-2010-01-04 11:01 source
+ * Fixed size of res column to fit side menu on smaller screens like
+ iPhone
- file para.propagates.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-28 12:10 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file part.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-26 21:01 source
-2010-01-04 11:01 source
+ * Fixed when http auth fails, must keep the http status as 401
- file passivetex.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-26 12:59 source
-2010-01-04 11:01 source
+ * Fixed alt names can have multiple values
+ * Fixed paths creation
+ * Fixed users select
+ * Fixed renamed User Login to Identify Yourself
- file pgwide.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-26 12:58 source
-2010-01-04 11:01 source
+ * Fixed path creation
+ * Fixed URLs
+ * Fixed users select
- file phrase.propagates.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-26 12:58 source
-2010-01-04 11:01 source
+ * Fixed path creation
+ * Fixed URLs
- file pixels.per.inch.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-23 19:44 source
-2010-01-04 11:01 source
+ * Fixed bug with WebDAVFS client
- file plus.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-23 19:43 source
-2010-01-04 11:01 source
+ * Added continue handler to catch missing graph group signal
- file points.per.em.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-23 19:42 source
-2010-01-04 11:01 source
+ * Fixed URL after login
+ * FIxed view.vsp not found problem
- file preface.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-23 19:39 source
-2010-01-04 11:01 source
+ * Adde additional endpoint
+ * Fixed splash screen
+ * Fixed error message when JavaScript is not available
+ * Fixed geo location
- file prefer.internal.olink.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-23 19:36 source
-2010-01-04 11:01 source
+ * Added new lock icon ref
+ * Fixed online services validation
+ * Fixed IE UI profile view
+ * Fixed multiple certificates in UI profile
+ * Fixed issue with "Creator of"
+ * Fixed image button for users pages
+ * Fixed browser related problems
+ * Fixed labels
- file preferred.mediaobject.role.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-23 19:31 source
-2010-01-04 11:01 source
+ * Removed deprecated files
- file prev.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-23 15:56 source
-2010-01-04 11:01 source
+ * Fixed auth bug with WebDAVFS client
- file procedure.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-20 13:08 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file process.empty.source.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-20 13:01 source
-2010-01-04 11:01 source
+ * Fixed WebKit problems with UI profile
- file process.source.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-20 13:01 source
-2010-01-04 11:01 source
+ * Fixed sync security profile
- file profile.arch.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 14:50 source
-2010-01-04 11:01 source
+ * Added discussion page rewrite rules
+ * Fixed change Member ID to User ID
+ * Fixed ODS to Digest in Login/Register form
+ * Fixed X.509 page for IE
- file profile.attribute.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 14:48 source
-2010-01-04 11:01 source
+ * Fixed URLs
- file profile.audience.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 14:39 source
-2010-01-04 11:01 source
+ * Fixed missing dependency
- file profile.condition.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 14:39 source
-2010-01-04 11:01 source
+ * Fixed ordering to work with IE 7/8
- file profile.conformance.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 07:12 source
-2010-01-04 11:01 source
+ * Fixed version
- file profile.lang.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 07:11 source
-2010-01-04 11:01 source
+ * Fixed some issues with sparql queries returning strings instead of IRIs
- file profile.os.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 07:08 source
-2010-01-04 11:01 source
+ * Added explain if params are copied
- file profile.revision.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 07:08 source
-2010-01-04 11:01 source
+ * Fixed dir listing to use UTF-8 to show chars other than latin1
- file profile.revisionflag.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 06:59 source
-2010-01-04 11:01 source
+ * Fixed issue with inferencing
- file profile.role.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-19 06:59 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings
- file profile.security.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-14 21:18 source
-2010-01-04 11:01 source
+ * Fixed following checkpoint kill recovery remap extents may have
+ allocated pages with no correspoinding logical page because recovery
+ performs unremap. Therefor if em remap page is allocated in em but
+ free in dbs freemap, disregards and reset em allocation, if no logical
+ page. If logical page, concider the dbs freeset in errror and mark page
+ as allocated.
- file profile.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 15:57 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.2 for final release
- file profile.status.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 15:57 source
-2010-01-04 11:01 source
+ * Fixed version string ODBC driver
- file profile.userlevel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 15:36 source
-2010-01-04 11:01 source
+ * Updated debian packaging files
- file profile.value.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 15:29 source
-2010-01-04 11:01 source
+ * Fixed free data in wrong order
- file profile.vendor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 14:17 source
-2010-01-04 11:01 source
+ * Rebuild drivers
- file profile.wordsize.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 14:16 source
-2010-01-04 11:01 source
+ * Fixed performance issue loading LANG/TYPE info from empty db
- file punct.honorific.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 13:32 source
-2010-01-04 11:01 source
+ * Fixed do not run tpc-h create on vad install
- file qanda.defaultlabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 13:01 source
-2010-01-04 11:01 source
+ * Added UI support for SSL/TLS connection to LDAP server
- file qanda.in.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-09 12:59 source
-2010-01-04 11:01 source
+ * Added new tutorials
- file qanda.inherit.numeration.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-08 20:41 source
-2010-01-04 11:01 source
+ * Fixed application URLs
- file qanda.nested.in.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-08 20:40 source
-2010-01-04 11:01 source
+ * Fixed application URL rewrite rules
- file qanda.title.level1.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-08 13:40 source
-2010-01-04 11:01 source
+ * FIxed OpenID and SSL login
- file qanda.title.level2.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-08 13:37 source
-2010-01-04 11:01 source
+ * Fixed VTIMEZONE component in export
- file qanda.title.level3.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-08 13:27 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file qanda.title.level4.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-07-08 13:23 source
-2010-01-04 11:01 source
+ * Added optimization for large descriptions
- file htmlhelp.hhc.binary.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-08 13:21 source
-2010-01-04 11:01 source
+ * Fixed add escape to CR/LF in JSON format
- file htmlhelp.hhc.folders.instead.books.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-07 18:53 source
-2010-01-04 11:01 source
+ * Fixed openid to work with personal iri
- file htmlhelp.hhc.section.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-07 18:42 source
-2010-01-04 11:01 source
+ * Updated documentation
- file htmlhelp.hhc.show.root.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-07 12:43 source
-2010-01-04 11:01 source
+ * Fixed create list of unique graphs
- file htmlhelp.hhc.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 23:07 source
-2010-01-04 11:01 source
+ * Added Tumblr cartridge
- file htmlhelp.hhc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 23:06 source
-2010-01-04 11:01 source
+ * Added description for property value in offers
- file htmlhelp.hhk.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 23:04 source
-2010-01-04 11:01 source
+ * Added shared files using FOAF+SSL
- file htmlhelp.hhp.tail.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 22:58 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file htmlhelp.hhp.window.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 14:30 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.2-rc3
- file htmlhelp.hhp.windows.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 14:24 source
-2010-01-04 11:01 source
+ * Added new setting WideAsUTF16 to ODBC driver to return UTF-16LE
+ when using SQLWCHAR
+ * Fixed setting for UTF-8 when db keeps UTF-8 in varchars
- file htmlhelp.hhp.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 14:06 source
-2010-01-04 11:01 source
+ * Fixed declaration after statement
- file htmlhelp.map.file.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 10:40 source
-2010-01-04 11:01 source
+ * Fixed yac_list_keys output is changed
- file htmlhelp.only.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 10:39 source
-2010-01-04 11:01 source
+ * Fixed examine lastmod ts before updating
- file htmlhelp.remember.window.position.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 10:34 source
-2010-01-04 11:01 source
+ * Fixed as col_default is always a serialized value, zero can appear
+ as default integer zero
- file htmlhelp.show.advanced.search.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-06 09:56 source
-2010-01-04 11:01 source
+ * Fixed move alloc/free of descriptor handles into SQLAllocStmt
- file htmlhelp.show.favorities.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 19:30 source
-2010-01-04 11:01 source
+ * Added information for building on Mac OS X 10.6
- file htmlhelp.show.menu.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 19:25 source
-2010-01-04 11:01 source
+ * Added missing test for memcpy
- file htmlhelp.show.toolbar.text.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 15:01 source
-2010-01-04 11:01 source
+ * Fixed wikiWord ("." is not yet part of the name)
- file htmlhelp.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 14:59 source
-2010-01-04 11:01 source
+ * Fixed when importing keys, let user decide which on to use as his
+ webid for ODBC/SQL login
- file htmlhelp.use.hhk.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 14:48 source
-2010-01-04 11:01 source
+ * Added support for FOAF+SSL authentication
- file htmlhelp.window.geometry.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 14:11 source
-2010-01-04 11:01 source
+ * Updated documentation
- file hyphenate.verbatim.characters.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 14:05 source
-2010-01-04 11:01 source
+ * Fixed upgrade procedure, more checks
- file hyphenate.verbatim.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 14:04 source
-2010-01-04 11:01 source
+ * Moved to conductor
- file hyphenate.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 13:24 source
-2010-01-04 11:01 source
+ * Fixed handling multiple certs
- file id.warnings.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 13:23 source
-2010-01-04 11:01 source
+ * FIxed can have many certs in FOAF
- file ignore.image.scaling.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 13:17 source
-2010-01-04 11:01 source
+ * Mover ACL UI into conductor
+ * Fixed dependency on ODS Framework
- file img.src.path.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 13:04 source
-2010-01-04 11:01 source
+ * Fixed use label ontology to extract geo coordinates
- file index.div.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 12:42 source
-2010-01-04 11:01 source
+ * Added driver versioning
+ * Fixed issue with batch commit
- file index.entry.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 12:41 source
-2010-01-04 11:01 source
+ * Added driver versioning
+ * FIxed issue with batch commit
- file index.links.to.section.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 12:40 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file index.method.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 12:40 source
-2010-01-04 11:01 source
+ * Added driver versioning
+ * Fixed force jena's lazy initialization when Graph is created
+ * Fixed ignore warning on Binding.add NULL value
- file index.number.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 12:21 source
-2010-01-04 11:01 source
+ * Rebuild drivers
- file index.on.role.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 12:16 source
-2010-01-04 11:01 source
+ * Added driver versioning
- file index.on.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 08:30 source
-2010-01-04 11:01 source
+ * Added more assertations to facets ontology
- file index.page.number.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 08:29 source
-2010-01-04 11:01 source
+ * Added label as IPF
- file index.prefer.titleabbrev.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 08:29 source
-2010-01-04 11:01 source
+ * Remove tags from comment, label etc
- file index.preferred.page.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 08:26 source
-2010-01-04 11:01 source
+ * Added support for multiple certificates in user profile
+ * Added semantic pingback log
+ * Fixed GoodsRelation SIOC data
+ * Fixed Offers
- file index.range.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 08:25 source
-2010-01-04 11:01 source
+ * FIxed JS error showing unlogged users
- file index.term.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 08:20 source
-2010-01-04 11:01 source
+ * Fixed RSS data
- file informal.object.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-05 08:13 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file informalequation.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-01 11:52 source
-2010-01-04 11:01 source
+ * Fixed namespace issues
- file informalexample.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-07-01 11:49 source
-2010-01-04 11:01 source
+ * Fixed IE problem with negative size on box
+ * Fixed do not rewrite existing href on a++ links
- file informalfigure.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-30 14:32 source
-2010-01-04 11:01 source
+ * Fixed handing of items in alt name
- file informaltable.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-30 14:31 source
-2010-01-04 11:01 source
+ * Fixed UI profile edit
+ * Fixed Favorites
- file inherit.keywords.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-30 14:29 source
-2010-01-04 11:01 source
+ * Fixed when distinct, should use one or the other ssl depending on which
+ is non null
- file insert.link.page.number.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-30 09:58 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file insert.olink.page.number.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-30 09:47 source
-2010-01-04 11:01 source
+ * Added UI semantic ping
- file insert.olink.pdf.frag.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-30 09:47 source
-2010-01-04 11:01 source
+ * Fixed handling of items in alt name
- file insert.xref.page.number.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-29 22:55 source
-2010-01-04 11:01 source
+ * Fixed handling of alt name
- file itemizedlist.label.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-29 12:50 source
-2010-01-04 11:01 source
+ * Fixed semantic pingback
- file itemizedlist.label.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-29 11:53 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.2-rc2
- file itemizedlist.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 11:14 source
-2010-01-04 11:01 source
+ * Fixed ontology label
- file javahelp.encoding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 10:34 source
-2010-01-04 11:01 source
+ * Fixed sparql union selections, added ANY decl on relevant section
+ list bits
- file keep.relative.image.uris.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 10:30 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file keyboard.nav.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 10:19 source
-2010-01-04 11:01 source
+ * Added support for creating ruleset
+ * Fixed handling of quotes in literals
- file l10n.gentext.default.language.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 10:14 source
-2010-01-04 11:01 source
+ * Added support for using VirtuosoDataSource
+ * Fixed handling of quote chars in literals
- file l10n.gentext.language.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 09:49 source
-2010-01-04 11:01 source
+ * Updated documentation
- file l10n.gentext.use.xref.language.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 09:48 source
-2010-01-04 11:01 source
+ * Added new images
- file l10n.lang.value.rfc.compliant.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 09:35 source
-2010-01-04 11:01 source
+ * Added new RDF framework
+ * Added JS XPATH library
+ * Added browser checks
+ * Added logging/debugging helper functions
+ * FIxed rdftabs navigation and maps cosmetics
+ * Fixed DOM parser initialization issue with IE
- file label.from.part.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 09:23 source
-2010-01-04 11:01 source
+ * Added support for new RDF framework
+ * Fixed cosmetics
+ * Fixed extraneous comma in object def for IE7 compatibility
+ * Fixed small bugs
- file line-height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 09:08 source
-2010-01-04 11:01 source
+ * Updated Favorites
- file linenumbering.everyNth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 09:07 source
-2010-01-04 11:01 source
+ * Added Semantic Pingback client/server
- file linenumbering.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-28 09:06 source
-2010-01-04 11:01 source
+ * Updated to CKEditor v3.3.1
- file linenumbering.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 16:41 source
-2010-01-04 11:01 source
+ * Added support for following http redirects automatically
- file linenumbering.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 16:39 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings
- file link.mailto.url.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 11:22 source
-2010-01-04 11:01 source
+ * Added extra functions for graph diff, iteration over dictionary and
+ obtaining biggest possible IRI_ID on given 32/64bit platform
- file list.block.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 11:19 source
-2010-01-04 11:01 source
+ * Added etsy cartridge
+ * Fixed minor issues
- file list.block.spacing.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 11:18 source
-2010-01-04 11:01 source
+ * Added new Link headers
- file list.item.spacing.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 11:16 source
-2010-01-04 11:01 source
+ * Fixed ACL file to have some permissions using foaf+ssl
+ * Fixed check it is not det
- file make.graphic.viewport.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 11:11 source
-2010-01-04 11:01 source
+ * Added OpenID 2.0 login and registration
- file make.index.markup.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 11:10 source
-2010-01-04 11:01 source
+ * Added downstream using PSH subscription
- file make.single.year.ranges.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 10:46 source
-2010-01-04 11:01 source
+ * Fixed text
- file make.valid.html.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-25 10:45 source
-2010-01-04 11:01 source
+ * Fixed problem with latest versions of libtool
- file make.year.ranges.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-24 23:08 source
-2010-01-04 11:01 source
+ * Updated documentation
- file man.authors.section.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-24 15:34 source
-2010-01-04 11:01 source
+ * Fixed text labels
- file man.base.url.for.relative.links.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-24 15:34 source
-2010-01-04 11:01 source
+ * Added more properties for inference
- file man.break.after.slash.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-24 15:13 source
-2010-01-04 11:01 source
+ * Fixed check proxy and remove if host is an exception
- file man.charmap.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-24 08:20 source
-2010-01-04 11:01 source
+ * Fixed listener serialization
+ * Fixed hash
- file man.charmap.subset.profile.english.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-24 08:14 source
-2010-01-04 11:01 source
+ * Fixed reorganized rdf tab
- file man.charmap.subset.profile.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-22 15:50 source
-2010-01-04 11:01 source
+ * Fixed rdfa failing to parse both rel/rev
- file man.charmap.uri.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-22 15:50 source
-2010-01-04 11:01 source
+ * Fixed normalize_modulus
- file man.charmap.use.subset.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-18 11:08 source
-2010-01-04 11:01 source
+ * Fixed url rewrite should happen before parsing parameters in order
+ to check if we are dealing with php or proxy page when we use raw
+ request body
- file man.copyright.section.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-16 10:50 source
-2010-01-04 11:01 source
+ * Added more properties for inferencing
- file man.endnotes.are.numbered.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-16 10:50 source
-2010-01-04 11:01 source
+ * Fixed minor UI issue
- file man.endnotes.list.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-15 20:06 source
-2010-01-04 11:01 source
+ * Fixed merged missing file
- file man.endnotes.list.heading.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-15 20:00 source
-2010-01-04 11:01 source
+ * Fixed calling wrong pl
- file man.font.funcprototype.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-12 12:59 source
-2010-01-04 11:01 source
+ * Fixed do not free on SQL_SUCCESS, as this will be done at end of loop
- file man.font.funcsynopsisinfo.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-12 12:57 source
-2010-01-04 11:01 source
+ * Fixed do not explicitly set header if it is already set; in proxy
+ remove content-type as it will be set from sparql
- file man.font.links.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-11 12:48 source
-2010-01-04 11:01 source
+ * Fixed bad condition check
- file man.font.table.headings.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-10 18:48 source
-2010-01-04 11:01 source
+ * FIxed ignore special properties such as virt:xx when printing
- file man.font.table.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-10 18:46 source
-2010-01-04 11:01 source
+ * Fixed fd can be 0 in background mode
- file man.funcsynopsis.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-10 12:41 source
-2010-01-04 11:01 source
+ * Fixed RDF trx replication UI
- file man.hyphenate.computer.inlines.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-09 13:42 source
-2010-01-04 11:01 source
+ * Added ACL rules
+ * Added FOAF+SSL based authentication using ACL
+ * Added PubSubHub Feeds support
- file man.hyphenate.filenames.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-09 13:40 source
-2010-01-04 11:01 source
+ * Added PubSubHub Feeds support
- file man.hyphenate.urls.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-09 13:29 source
-2010-01-04 11:01 source
+ * Added FOAF+SSL based authentication
- file man.hyphenate.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-09 13:28 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file man.indent.blurbs.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-09 12:31 source
-2010-01-04 11:01 source
+ * Added check for automatic repair
- file man.indent.lists.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-09 12:30 source
-2010-01-04 11:01 source
+ * Added check for automatic repair
+ * Fixed when taking a dp from extent map, must decrease the free
+ pages accordingly
- file man.indent.refsect.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-09 10:15 source
-2010-01-04 11:01 source
+ * Fixed VDB/DB2 stats procedure
- file man.indent.verbatims.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-08 21:58 source
-2010-01-04 11:01 source
+ * Added EAV and SPO labeling modes
- file man.indent.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-07 13:29 source
-2010-01-04 11:01 source
+ * Fixed missing label
+ * Fixed label consistency
+ * Fixed check for iri type
+ * Fixed limit the result set
- file man.justify.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-07 13:27 source
-2010-01-04 11:01 source
+ * Fixed use explicit format if supplied
- file man.output.base.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-07 13:26 source
-2010-01-04 11:01 source
+ * Fixed ODATA feed title locality
- file man.output.better.ps.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-07 10:59 source
-2010-01-04 11:01 source
+ * Added wine cartridge
+ * Added youtube cartridge
+ * Fixed minor issues
- file man.output.encoding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-07 10:58 source
-2010-01-04 11:01 source
+ * Added support for ODATA formats
+ * Fixed webcal/feed in rewrite rules
- file man.output.in.separate.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-01 15:26 source
-2010-01-04 11:01 source
+ * Added support for odata/json in describe and construct
- file man.output.lang.in.name.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-06-01 14:06 source
-2010-01-04 11:01 source
+ * Fixed issues with variable binding
+ * Fixed examples
- file man.output.manifest.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-05-31 23:20 source
-2010-01-04 11:01 source
+ * Commented out old tutorial pages
- file man.output.manifest.filename.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-05-31 23:18 source
-2010-01-04 11:01 source
+ * Added extra tutorials
- file man.output.quietly.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-05-31 22:04 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.2-rc1
- file man.output.subdirs.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-05-31 21:55 source
-2010-01-04 11:01 source
+ * Added common PubSubHub procedures
+ * Fixed use notify services for PubSubHub settings
+ * Fixed publish atom feed too
+ * Fixed PHP ssl
- file man.segtitle.suppress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-05-31 21:53 source
-2010-01-04 11:01 source
+ * Fixed link re=hub
+ * Fixed check individual settings
- file man.string.subst.map.local.post.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:52 +0000
+2010-05-31 21:49 source
-2010-01-04 11:01 source
+ * Added support for PubSubHub
- file chunker.output.omit-xml-declaration.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 20:49 source
-2010-01-04 11:01 source
+ * Added setting for GatewayIpAddress
- file chunker.output.standalone.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 20:48 source
-2010-01-04 11:01 source
+ * Fixed missing external
- file citerefentry.link.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 20:47 source
-2010-01-04 11:01 source
+ * Fixed incomplete check condition as locks with pos at end do not
+ count
- file collect.xref.targets.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 20:45 source
-2010-01-04 11:01 source
+ * Fixed use request line for ID
- file column.count.back.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 14:27 source
-2010-01-04 11:01 source
+ * Merged enhancements from sesame2
- file column.count.body.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 14:26 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file column.count.front.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 14:26 source
-2010-01-04 11:01 source
+ * Fixed isue with variable binding
- file column.count.index.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 11:08 source
-2010-01-04 11:01 source
+ * Added initial support for OData atom serialization
+ * Use CBG describe for OData format
+ * Use EMD types for generic types
- file column.count.lot.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 11:00 source
-2010-01-04 11:01 source
+ * Added option DensePageAllocation which offers up some near page
+ locality so resulting db uses less disk space
- file column.count.titlepage.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-31 11:00 source
-2010-01-04 11:01 source
+ * Fixed issue with ?? with sparql compiler inside sql query
- file column.gap.back.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-29 12:25 source
-2010-01-04 11:01 source
+ * Fixed when traverse foreigh sites, check if they add something
+ more, such as redirects back to origin
- file column.gap.body.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-29 12:09 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file column.gap.front.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-29 12:07 source
-2010-01-04 11:01 source
+ * Added check for inline string flag
- file column.gap.index.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-29 12:00 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file column.gap.lot.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-28 16:56 source
-2010-01-04 11:01 source
+ * Fixed small issues
- file column.gap.titlepage.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 21:48 source
-2010-01-04 11:01 source
+ * Fixed use distinct as many graphs can be in same rule
+ * Minor UI tweaks
- file compact.list.item.spacing.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 21:41 source
-2010-01-04 11:01 source
+ * Fixed report proper version
+ * Fixed compatibility with later JRE
+ * Fixed buffer length
- file component.label.includes.part.label.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 21:37 source
-2010-01-04 11:01 source
+ * Fixed RM_XLAT_CONCAT
- file component.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 15:23 source
-2010-01-04 11:01 source
+ * Added Vimeo cartridge
+ * Fixed Tesco cartridge
+ * Fixed html2 cartridge
- file component.titlepage.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 15:21 source
-2010-01-04 11:01 source
+ * Added support to export queues
+ * Fixed view in crawler UI
- file contrib.inline.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 15:21 source
-2010-01-04 11:01 source
+ * Fixed incorrect check for VDB functionality
- file crop.mark.bleed.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 08:11 source
-2010-01-04 11:01 source
+ * Added automatic FOAF+SSL
+ * Added ping service to do PubSubHub
+ * Added PubSubHub settings in ODS
+ * Fixed collecting FOAF data
+ * Fixed casemode problem
+ * Fixed bad join
+ * Fixed typo
- file crop.mark.offset.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 08:08 source
-2010-01-04 11:01 source
+ * Fixed group IRI
- file crop.mark.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 08:07 source
-2010-01-04 11:01 source
+ * Added PubSubHub setting in ODS
- file crop.marks.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-26 08:07 source
-2010-01-04 11:01 source
+ * Fixed upstreaming
- file css.decoration.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-24 22:36 source
-2010-01-04 11:01 source
+ * Fixed memleak
- file css.stylesheet.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-24 18:02 source
-2010-01-04 11:01 source
+ * Added improvements in inference handling
+ * FIxed support for subproperties of inverse functional properties
+ * Fixed support for loading aaa ruleset from multiple contology graphs
- file css.stylesheet.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-22 19:18 source
-2010-01-04 11:01 source
+ * Added support for gunzip session
- file current.docid.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-21 12:40 source
-2010-01-04 11:01 source
+ * Fixed checking return code from fd_open call
- file currentpage.marker.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-21 12:27 source
-2010-01-04 11:01 source
+ * Added automatic error correction for some common typos in
+ decode_b32_num
- file default.float.class.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-21 12:26 source
-2010-01-04 11:01 source
+ * Fixed when doing log replay, we should remove old roots to free
+ memory as at this time the grim reaper is not available
- file default.image.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-21 12:24 source
-2010-01-04 11:01 source
+ * Fixed allow reset of xslt in PP hook
- file default.table.frame.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-19 10:19 source
-2010-01-04 11:01 source
+ * Merged b32 encoding/decoding from HEAD
- file default.table.rules.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-19 10:13 source
-2010-01-04 11:01 source
+ * Added support for editing update interval from site settings
- file default.table.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-19 10:04 source
-2010-01-04 11:01 source
+ * Fixed urchinTracker setting
- file default.units.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-18 22:29 source
-2010-01-04 11:01 source
+ * Added support for editline
- file dingbat.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-18 19:33 source
-2010-01-04 11:01 source
+ * Added Google API
- file double.sided.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-18 19:22 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file draft.mode.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-18 19:21 source
-2010-01-04 11:01 source
+ * Added support for additional types
+ * Fixed do not decode variants as we do not know if sender encoded
+ special symbols or not
- file draft.watermark.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-18 19:18 source
-2010-01-04 11:01 source
+ * Added more ctypes
- file dry-run.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-05-18 13:01 source
-2010-01-04 11:01 source
+ * Fixed dependency list
- file dynamic.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:52 source
-2010-01-04 11:01 source
+ * Fixed remove FACEBOOK_OPENGRAPH from tests as it is not related
+ to RDFA
- file ebnf.assignment.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:42 source
-2010-01-04 11:01 source
+ * Added FOAF+SSL registration for users pages (jsp, php, vsp etc)
+ * Fixed FOAF+SSL registration code
+ * Fixed modulus should be cleaned from garbage
+ * Fixed function to test w/o sparql acl table
- file ebnf.statement.terminator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:41 source
-2010-01-04 11:01 source
+ * Updated SIOC service procedures
- file ebnf.table.bgcolor.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:41 source
-2010-01-04 11:01 source
+ * Fixed get responce back so it can be traced if needed
- file ebnf.table.border.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:40 source
-2010-01-04 11:01 source
+ * Updated SIOC services procedures
- file eclipse.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:40 source
-2010-01-04 11:01 source
+ * Added FeedManager callback
- file eclipse.plugin.id.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:39 source
-2010-01-04 11:01 source
+ * Fixed problem with atom feed
- file eclipse.plugin.name.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:30 source
-2010-01-04 11:01 source
+ * Added Facebook Open Graph cartridge
- file eclipse.plugin.provider.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 10:30 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file editedby.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-18 09:08 source
-2010-01-04 11:01 source
+ * Fixed when statement has implicit group by, do not remove order by
- file email.delimiters.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-17 08:21 source
-2010-01-04 11:01 source
+ * Fixed error messages
- file email.mailto.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-17 08:21 source
-2010-01-04 11:01 source
+ * Fixed wrong dv_compare on boxes with box flags
- file emphasis.propagates.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-16 18:57 source
-2010-01-04 11:01 source
+ * Fixed page footer and labels
- file entry.propagates.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-16 18:56 source
-2010-01-04 11:01 source
+ * Added missing grant
- file epub.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-16 17:56 source
-2010-01-04 11:01 source
+ * Fixed index for better queue ordering
- file equation.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-13 19:38 source
-2010-01-04 11:01 source
+ * Fixed do not decode anything. We just match what is in and print
+ it out, if source is bad encoded, the result is bad encoded,
+ otherwise can not figure-out what was it before and what should
+ be after, so we keep it simple
- file example.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-12 22:46 source
-2010-01-04 11:01 source
+ * Fixed GPF when weird (but formally legal) head of composite XML contains
+ two declarations of external entities with different entity names but
+ same URI to resolve
- file exsl.node.set.available.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-12 12:24 source
-2010-01-04 11:01 source
+ * Fixed use special cl_non_logged_write_mode used to load extrememly
+ large datasets needs to ensure no log will be made at all. If one
+ node dies, the rest will do same. Use this flag only in safe
+ environment
- file feedback.href.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-12 12:17 source
-2010-01-04 11:01 source
+ * Fixed GPF in SPARUL INSERT optimization that happens when an
+ auxiliary retval with vector of variables is wrapped in alias
- file feedback.link.text.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-12 12:16 source
-2010-01-04 11:01 source
+ * Fixed when looking at free set from disk must stop at last, as
+ the dbs pages can be out of sync. Do this only when reading from
+ disk otherwise error
- file feedback.with.ids.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-11 16:53 source
-2010-01-04 11:01 source
+ * Added option to skip sponger and do RDFa along with other rdf
+ formats
- file figure.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-11 12:46 source
-2010-01-04 11:01 source
+ * Fixed modulus should be cleaned from garbage
- file filename-prefix.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-11 11:15 source
-2010-01-04 11:01 source
+ * Fixed check magic to make sure data is gzip compressed
- file firstterm.only.link.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-10 10:02 source
-2010-01-04 11:01 source
+ * Optimized FOAF+SSL login
+ * Updated SIOC service procedures
+ * Fixed CR/LF to make proper N3 syntax
+ * Fixed bad email in WebID
- file foil.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-10 09:55 source
-2010-01-04 11:01 source
+ * Added Idiomag cartridge
+ * Added HTML5 Microdata cartridge
- file foil.subtitle.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-10 09:54 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file foil.title.master.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-10 09:49 source
-2010-01-04 11:01 source
+ * Updated documentation
- file foil.title.size.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-10 09:39 source
-2010-01-04 11:01 source
+ * Fixed keep dashes in words and use escape whenever it occurs;
+ words starting with numbers should also be escaped
- file foilgroup.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-07 09:14 source
-2010-01-04 11:01 source
+ * Added new bifs for graph diff functionality, iteration over
+ dictionary and obtaining biggest possible IRI_ID on 32/64bit
+ platforms
- file foilgroup.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-03 23:54 source
-2010-01-04 11:01 source
+ * FIxed use X-Forwarded-Host to handle proxy
- file footer.column.widths.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-03 19:31 source
-2010-01-04 11:01 source
+ * Added support for logging x-forwarded-for when instance is using
+ a proxy
- file footer.content.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-05-03 08:54 source
-2010-01-04 11:01 source
+ * Added shortcut for debugging variables
- file footer.hr.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-29 10:54 source
-2010-01-04 11:01 source
+ * Fixed cleaning new schema properly
- file footer.rule.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-29 10:00 source
-2010-01-04 11:01 source
+ * Added type
+ * Fixed labels
+ * Minor fixes
- file footer.table.height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-29 09:59 source
-2010-01-04 11:01 source
+ * Fixed print string without waiting for error
- file footer.table.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-29 08:29 source
-2010-01-04 11:01 source
+ * Added more properties
- file footers.on.blank.pages.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-29 08:28 source
-2010-01-04 11:01 source
+ * Fixed About header
- file footnote.font.size.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-28 15:21 source
-2010-01-04 11:01 source
+ * Fixed if Host header is present use that, and do not add port as may be
+ behind proxy
- file footnote.mark.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-26 14:41 source
-2010-01-04 11:01 source
+ * Fixed when a signal error arrives, pop the bad instruction so the
+ free is not confused by dk_set when IS_NULL
- file footnote.number.format.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-26 07:57 source
-2010-01-04 11:01 source
+ * Fixed crawling of RDFa
- file footnote.number.symbols.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-26 07:56 source
-2010-01-04 11:01 source
+ * Added FOAF+SSL client demo
- file footnote.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-26 07:53 source
-2010-01-04 11:01 source
+ * Fixed if no DefaultGraph, do not assume anything about /dataspace
- file footnote.sep.leader.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-26 07:51 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file fop.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-24 14:01 source
-2010-01-04 11:01 source
+ * Added import/export support using Yahoo Contacts API
- file fop1.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-24 13:56 source
-2010-01-04 11:01 source
+ * Fixed obj2json function
- file formal.object.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-23 20:03 source
-2010-01-04 11:01 source
+ * Fixed do not continue when missing part of key, as it is uninitialized
+ and needs to be dropped before causing a gpf
- file formal.procedures.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-23 20:02 source
-2010-01-04 11:01 source
+ * Fixed only serialize box flags for dependant part
- file formal.title.placement.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-22 14:12 source
-2010-01-04 11:01 source
+ * Added cset to render function to recode string results
- file formal.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-22 12:41 source
-2010-01-04 11:01 source
+ * FIxed url must end in slash or hash
- file funcsynopsis.decoration.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-22 12:40 source
-2010-01-04 11:01 source
+ * Fixed unicode handling in isql and sparql UI
- file funcsynopsis.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-22 12:35 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file function.parens.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-22 12:35 source
-2010-01-04 11:01 source
+ * Removed debugging
- file generate.id.attributes.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-22 11:12 source
-2010-01-04 11:01 source
+ * Fixed http header ends with proper CRLF sequence
- file generate.index.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-21 16:18 source
-2010-01-04 11:01 source
+ * Fixed when doing something that may reference the control_exp
+ private elements set the so_df_private_elts, otherwise may get a
+ new df which is in global so df hash
- file generate.legalnotice.link.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-21 12:44 source
-2010-01-04 11:01 source
+ * Fixed treat sort read node like a ts in tracking ssl refs, else
+ partitioned top oby goes wrong
- file generate.manifest.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-20 19:27 source
-2010-01-04 11:01 source
+ * Fixed resize map width to width of result div
- file generate.meta.abstract.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-20 19:24 source
-2010-01-04 11:01 source
+ * Fixed when gby serialize box flag if any
- file generate.revhistory.link.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-17 23:23 source
-2010-01-04 11:01 source
+ * Fixed can have uninitialized null flag in hash temp; can be extra
+ nulls in gby or hash join
- file generate.section.toc.level.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-16 12:35 source
-2010-01-04 11:01 source
+ * Added hook to execute secondary statement
- file generate.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-16 12:33 source
-2010-01-04 11:01 source
+ * FIxed missing definition for bigint
- file glossary.as.blocks.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-16 11:40 source
-2010-01-04 11:01 source
+ * Fix for <![CDATA[ inside <script> in HTML and dirty HTML modes.
- file glossary.collection.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-15 18:46 source
-2010-01-04 11:01 source
+ * Fixed export to Del.icio.us
- file glossary.sort.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-15 18:42 source
-2010-01-04 11:01 source
+ * Fixed use global list of prefixes for advanced query helper as well
+ as other parts
- file glossdef.block.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-15 18:24 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file glossdef.list.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-15 18:23 source
-2010-01-04 11:01 source
+ * Fixed support for foaf:maker
- file glossentry.list.item.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-15 18:20 source
-2010-01-04 11:01 source
+ * Updated CSS for buttons
- file glossentry.show.acronym.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-15 18:20 source
-2010-01-04 11:01 source
+ * Updated toolbar
- file glosslist.as.blocks.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-15 14:05 source
-2010-01-04 11:01 source
+ * Fixed memleak when error in bif and no error var given
- file glossterm.auto.link.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-15 14:03 source
-2010-01-04 11:01 source
+ * Fixed memleak when client drops conneciton before prepare
- file glossterm.block.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-14 13:47 source
-2010-01-04 11:01 source
+ * Added initial support for bif_python_exec
- file glossterm.list.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-14 13:19 source
-2010-01-04 11:01 source
+ * Fixed export check to call in plugins
- file glossterm.separation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-14 10:48 source
-2010-01-04 11:01 source
+ * Fixed support for bigint in parameter marshalling
- file glossterm.width.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-14 10:47 source
-2010-01-04 11:01 source
+ * Fixed UI profile
- file graphic.default.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-13 12:19 source
-2010-01-04 11:01 source
+ * Fixed issue with ckeditor
- file graphical.admonition.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-13 12:18 source
-2010-01-04 11:01 source
+ * Fixed login with non WebDav accounts
- file graphics.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-13 12:17 source
-2010-01-04 11:01 source
+ * Updated CKEditor to version 3.2.1
- file graphicsize.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-12 19:42 source
-2010-01-04 11:01 source
+ * Added possibility to do URL encoding in TCN rules
- file graphicsize.use.img.src.path.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-12 19:41 source
-2010-01-04 11:01 source
+ * FIxed odata cartridge
- file header.column.widths.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-12 19:39 source
-2010-01-04 11:01 source
+ * Fixed extra replacements
- file header.content.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-12 19:39 source
-2010-01-04 11:01 source
+ * Minor fix
- file header.hr.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-12 12:37 source
-2010-01-04 11:01 source
+ * Fixed use UTF-8 as source and dest charsets when doing urls
- file header.rule.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-12 07:28 source
-2010-01-04 11:01 source
+ * Fixed check for third argument
- file header.table.height.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-12 07:26 source
-2010-01-04 11:01 source
+ * Fixed query string for product description from BestBuy API
+ * Minor fixes
- file header.table.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-09 14:46 source
-2010-01-04 11:01 source
+ * Fixed use default MaxMemPoolSize of 200000000
+ * Fixed double MaxMemPoolSize on 64bit systems
- file headers.on.blank.pages.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-09 14:43 source
-2010-01-04 11:01 source
+ * Fixed if we got a single ts as first and it is outer, put a dummy in
+ front
- file hidetoc.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-09 14:36 source
-2010-01-04 11:01 source
+ * Fixed problem with Chrome browser and JS loading
- file highlight.default.language.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-09 14:34 source
-2010-01-04 11:01 source
+ * Fixed problem with Chrome browser and JS loading
+ * Fixed Relation ontology data
- file highlight.source.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-09 13:01 source
-2010-01-04 11:01 source
+ * Added Relation ontology
+ * Updated UI profile for vsp, php etc
- file highlight.xslthl.config.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-09 13:01 source
-2010-01-04 11:01 source
+ * Fixed check for unique email address
- file home.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-08 14:40 source
-2010-01-04 11:01 source
+ * Added CSV parser mode option
+ * Fixed error reporting
- file html.append.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-08 14:30 source
-2010-01-04 11:01 source
+ * Added CSV parser lax mode
+ * FIxed log errors from loading
- file html.base.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-07 21:48 source
-2010-01-04 11:01 source
+ * Fixed issue with tab and space handling
- file html.cellpadding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-07 19:27 source
-2010-01-04 11:01 source
+ * Fixed abnormal long RDFa parsing of document with i18n URIs
- file html.cellspacing.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-07 19:25 source
-2010-01-04 11:01 source
+ * Fixed memleak
- file html.cleanup.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-07 19:25 source
-2010-01-04 11:01 source
+ * Fixed release it_maps as it is allocated dynamic
- file html.ext.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-07 07:56 source
-2010-01-04 11:01 source
+ * Fixed wrong TTL output of CONSTRUCT of wierd IRIs
- file html.extra.head.links.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-06 16:47 source
-2010-01-04 11:01 source
+ * Fixed shortcut comparing version numbers during package upgrade
- file html.head.legalnotice.link.multiple.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-06 16:41 source
-2010-01-04 11:01 source
+ * Updated documentation
- file html.head.legalnotice.link.types.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:50 +0000
+2010-04-06 16:33 source
-2010-01-04 11:01 source
+ * Added photo and audio upload for jtml, vsp, php and jsp pages
- file html.longdesc.link.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-06 16:31 source
-2010-01-04 11:01 source
+ * Added CSV cartridge
+ * Fixed odata cartridge
+ * Fixed webcal support
+ * Fixed geo coords
- file html.longdesc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-06 16:29 source
-2010-01-04 11:01 source
+ * Added support for encodings
+ * Added support for gz and zip compressed CSV
+ * Fixed view to have col names
+ * Fixed catch db nulls
+ * Fixed crawling opts
- file html.stylesheet.type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-06 14:43 source
-2010-01-04 11:01 source
+ * Fixed find const iri when nested call of i2id is used
- file html.stylesheet.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-06 13:47 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file htmlhelp.alias.file.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-06 13:46 source
-2010-01-04 11:01 source
+ * Added additional support for inferencing
+ * Added new inferencing sample
- file htmlhelp.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-06 13:38 source
-2010-01-04 11:01 source
+ * Added rdftabs timeline support for ical properties
+ * Added ical:summary as one of recognized title properties
+ * Added support for ATOM feeds
+ * Fixed copy of defaults
+ * Fixed url encoding
+ * Fixed move OAT.Dom.decodeImage to OAT.Formobject
+ * Fixed use new OAT.Dom.create (..., {className:"XXX"}) method
+ * Fixed JSON serialize/deserialize
+ * Fixed rename find to indexOf
- file htmlhelp.button.back.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-06 12:16 source
-2010-01-04 11:01 source
+ * Added support for listing content of zip file
+ * Fixed memleak in unzip_file
- file htmlhelp.button.forward.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-01 10:44 source
-2010-01-04 11:01 source
+ * Rebuild provider
- file htmlhelp.button.hideshow.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-04-01 10:43 source
-2010-01-04 11:01 source
+ * Added support for inference graph
+ * Added support for inference and query execution
+ * Added support for QueryEngine interface, so now Jena provider support
+ next query execution mode:
+ a) parse and execute query via ARQ
+ b) parse query via ARQ and execute query directly via Virtuoso(new mode)
+ c) parse and execute query directly via Virtuoso
+ * Fixed small bugs
- file htmlhelp.button.home.url.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-31 22:07 source
-2010-01-04 11:01 source
+ * Fixed insecure https client connections
+ * Fixed memleaks on connection error
- file htmlhelp.button.home.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-31 22:06 source
-2010-01-04 11:01 source
+ * Fixed no value is null
- file htmlhelp.button.jump1.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-30 20:52 source
-2010-01-04 11:01 source
+ * Fixed PACKAGE_VERSION
- file htmlhelp.button.jump1.url.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-30 17:59 source
-2010-01-04 11:01 source
+ * Updated documentation
- file htmlhelp.button.jump1.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-30 15:34 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.1 for final release
- file htmlhelp.button.jump2.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-30 15:33 source
-2010-01-04 11:01 source
+ * Fixed compiler warning
- file htmlhelp.button.jump2.url.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-30 15:28 source
-2010-01-04 11:01 source
+ * Added import from URL
+ * Fixed use escape to handle hash based IRIs
- file htmlhelp.button.jump2.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-30 13:08 source
-2010-01-04 11:01 source
+ * Fixed minor issue
+ * Removed deprecated file
- file htmlhelp.button.locate.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-30 13:07 source
-2010-01-04 11:01 source
+ * Added missing file to distribution
- file htmlhelp.button.next.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-30 12:42 source
-2010-01-04 11:01 source
+ * Fixed extra define for linux on sparc
- file htmlhelp.button.options.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-29 13:56 source
-2010-01-04 11:01 source
+ * Added support for oData
- file htmlhelp.button.prev.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-29 13:37 source
-2010-01-04 11:01 source
+ * Fixed skip identity columns
- file htmlhelp.button.print.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-29 13:33 source
-2010-01-04 11:01 source
+ * Fixed changed default map to Google Maps API v3
- file htmlhelp.button.refresh.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-29 13:32 source
-2010-01-04 11:01 source
+ * Added options page for parser options, preview etc
+ * Fixed IDN col
- file htmlhelp.button.stop.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-28 23:21 source
-2010-01-04 11:01 source
+ * Fixed object properties in favorites
- file htmlhelp.button.zoom.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-28 23:21 source
-2010-01-04 11:01 source
+ * Fixed a++ links
- file htmlhelp.chm.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-26 23:08 source
-2010-01-04 11:01 source
+ * Updated documentation
- file htmlhelp.default.topic.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-26 23:02 source
-2010-01-04 11:01 source
+ * Added image
- file htmlhelp.display.progress.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-26 22:53 source
-2010-01-04 11:01 source
+ * Added user's ontologies in favorites
+ * FIxed ontology API
- file htmlhelp.encoding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-26 22:50 source
-2010-01-04 11:01 source
+ * Fixed image preview
- file htmlhelp.enhanced.decompilation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-26 19:46 source
-2010-01-04 11:01 source
+ * Rebuild drivers
- file htmlhelp.enumerate.images.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-26 19:43 source
-2010-01-04 11:01 source
+ * Fixed memory leak
- file htmlhelp.force.map.and.alias.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:51 +0000
+2010-03-26 19:43 source
-2010-01-04 11:01 source
+ * Fixed missing check for ROLLEDBACK
- file 20.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-26 19:35 source
-2010-01-04 11:01 source
+ * Added options to CSV parser for delimiter and quote char
- file 21.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-26 16:14 source
-2010-01-04 11:01 source
+ * Added support for CSV import
- file 22.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-25 19:31 source
-2010-01-04 11:01 source
+ * Added csv_parse function
- file 23.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 22:31 source
-2010-01-04 11:01 source
+ * Fixed preserve content-type field
- file 24.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 22:21 source
-2010-01-04 11:01 source
+ * Added support for reading CSV files into tables
- file 25.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 22:18 source
-2010-01-04 11:01 source
+ * Added support for setMaxRows
+ * Fixed check argument values
- file 26.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 21:47 source
-2010-01-04 11:01 source
+ * Regenerated drivers
- file 27.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 16:43 source
-2010-01-04 11:01 source
+ * Fixed typo
- file 28.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 10:23 source
-2010-01-04 11:01 source
+ * Added options for /sparql
+ * Added function http_header_array_get to retrieve headers as an
+ array of strings
- file 29.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 01:03 source
-2010-01-04 11:01 source
+ * Added optimization of sprintf_inverse(const)
- file 3.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 01:02 source
-2010-01-04 11:01 source
+ * Fixed save the jt before doing ts; this is needed because ic_after_pos
+ expects in jt but because of in_list it can be modified
- file 3.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-24 01:00 source
-2010-01-04 11:01 source
+ * Fixed compiler warning
- file 3.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-23 10:07 source
-2010-01-04 11:01 source
+ * Fixed use globally known dfe for a select even in cond exp, else it
+ ruins the dt by repeatedly adding the same items when making a second
+ dfe for the same select
- file 30.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-23 10:01 source
-2010-01-04 11:01 source
+ * Fixed incorrect codegen of formatter in ssg_select_known_graphs_codegen
- file 4.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 22:29 source
-2010-01-04 11:01 source
+ * Updated documentation
- file 4.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 22:01 source
-2010-01-04 11:01 source
+ * Added a++ otion in user's pages
+ * Fixed ontology APIs
+ * Fixed 'Creator of'
+ * Fixed nickName
+ * Fixed php POST request
- file 4.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 21:48 source
-2010-01-04 11:01 source
+ * Fixed also check for ctype
- file 5.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 21:46 source
-2010-01-04 11:01 source
+ * Fixed Back button
- file 5.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 21:46 source
-2010-01-04 11:01 source
+ * Added support for WebID
- file 5.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 21:43 source
-2010-01-04 11:01 source
+ * Fixed fetching img id
+ * Fixed issue with multiple URL params
- file 6.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 13:40 source
-2010-01-04 11:01 source
+ * Fixed use sk_X509_ALGOR_* macros
- file 6.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 12:36 source
-2010-01-04 11:01 source
+ * Fixed X509ClientVerify flag of 0/1/2/3 to accept self signed or
+ optional certificates
- file 6.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 12:35 source
-2010-01-04 11:01 source
+ * Added support for FOAF+SSL login for SQL connections
- file 7.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 11:54 source
-2010-01-04 11:01 source
+ * Fixed do not encode default graph
- file 7.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-22 11:54 source
-2010-01-04 11:01 source
+ * Fixed SPARQL 1.1 compatibility in result set syntax
- file 7.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-19 14:59 source
-2010-01-04 11:01 source
+ * Fixed use newer OAT functions
- file 8.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-19 10:08 source
-2010-01-04 11:01 source
+ * Added improved version of xsl:for-each-row for both SPARQL and SQL
- file 8.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-19 10:05 source
-2010-01-04 11:01 source
+ * FIxed issue with backup
- file 8.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 15:45 source
-2010-01-04 11:01 source
+ * Fixed when transaction is prepared but not committed before commit
+ we must check if cpt is pending. If so we must wait as xa trx has
+ special processing in cpt_rollback and log_cpt
+ * Fixed compiler warning
- file 9.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 15:43 source
-2010-01-04 11:01 source
+ * Fixed better serialization on lt_lock_mtx
- file 9.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 10:59 source
-2010-01-04 11:01 source
+ * Fixed enter mtx before truncating log
+ * Fixed when a 2pc transaction as finished, invalidate its commit
+ flag offset since the log is rewritten already. The trx must already
+ be in cpt state.
- file 9.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 10:50 source
-2010-01-04 11:01 source
+ * Fixed use new OAT toolkit
- file ChangeLog.20020917 was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 10:48 source
-2010-01-04 11:01 source
+ * Fixed check if datadump is gz too
+ * Fixed the next site needs to copy all props from initial
+ * Fixed use log mode 3 as dump can be large
- file abstract.notitle.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 10:47 source
-2010-01-04 11:01 source
+ * Fixed deadlock retry
- file abstract.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 10:46 source
-2010-01-04 11:01 source
+ * Fixed missing date conversion
- file abstract.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 10:45 source
-2010-01-04 11:01 source
+ * Fixed alert text
+ * Fixed typo in styles path
+ * Fixed use new API functions
+ * Fixed support for Google map v3
- file active.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 10:20 source
-2010-01-04 11:01 source
+ * Fixed rebuild driver
- file ade.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 09:58 source
-2010-01-04 11:01 source
+ * Fixed user's login
+ * Fixed UI buttons
+ * Fixed unique name message
+ * Fixed wishlist UI pages
+ * Fixed rename FOAF+SSL to WebID
- file admon.graphics.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-18 09:56 source
-2010-01-04 11:01 source
+ * Fixed rename FOAF+SSL to WebID
- file admon.graphics.path.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-17 14:54 source
-2010-01-04 11:01 source
+ * Fixed check proper prefetch value
- file admon.graphics.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 23:53 source
-2010-01-04 11:01 source
+ * Fixed check lt
- file admon.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 18:21 source
-2010-01-04 11:01 source
+ * Fixed when txn error remove trx from global pool. It cannot be
+ committed anyway
- file admon.textlabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 18:20 source
-2010-01-04 11:01 source
+ * Fixed properly set lt_threads
- file admonition.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 11:39 source
-2010-01-04 11:01 source
+ * Fixed when writing log entries always check the mtx
- file admonition.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 11:39 source
-2010-01-04 11:01 source
+ * Fixed when setting up a XA trx wait for any checkpoint in progress
+ to finish before proceeding
- file alignment.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 10:54 source
-2010-01-04 11:01 source
+ * Fixed if not box or dfe false, skip rest
- file annotate.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 10:51 source
-2010-01-04 11:01 source
+ * Added virtuoso.ttl to sesame jar
+ * Added csl pages for Sesame HTTP repository configuration
+ * Rebuild driver
- file annotation.css.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 10:26 source
-2010-01-04 11:01 source
+ * Added support for vad_version
+ * FIxed use new OAT toolkit
+ * Removed debug code
- file annotation.graphic.close.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-16 10:24 source
-2010-01-04 11:01 source
+ * FIxed encoding of URL params
- file annotation.graphic.open.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-15 16:46 source
-2010-01-04 11:01 source
+ * Fixed resume waiting
- file annotation.js.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-15 15:51 source
-2010-01-04 11:01 source
+ * Fixed check array index not out of bound
- file annotation.support.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-15 15:50 source
-2010-01-04 11:01 source
+ * Fixdd FOAF+SSL user pages
- file appendix.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-15 15:49 source
-2010-01-04 11:01 source
+ * FIxed removed debugging code
- file arbortext.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-15 15:27 source
-2010-01-04 11:01 source
+ * Fixed use new OAT toolkit
+ * Fixed version check for ODS Framework
- file article.appendix.title.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-15 13:16 source
-2010-01-04 11:01 source
+ * Fixed missing case for LT_PREPARE_PENDING
- file author.othername.in.middle.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 14:04 source
-2010-01-04 11:01 source
+ * Fixed invitation problem with multiple users
- file autolayout-file.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 13:34 source
-2010-01-04 11:01 source
+ * Merged new version of OAT toolkit
+ * Fixed Google Maps v3 support
- file autotoc.label.in.hyperlink.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 13:34 source
-2010-01-04 11:01 source
+ * FIxed IRIs
- file autotoc.label.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 09:13 source
-2010-01-04 11:01 source
+ * Merged newer version of OAT toolkit
+ * Fixed dependency to later version of ODS Framework
+ * Fixed SIOC subscriptions
- file axf.extensions.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 09:13 source
-2010-01-04 11:01 source
+ * Merged newer version of OAT toolkit
+ * Fixed dependency to later version of ODS Framework
- file banner.before.navigation.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 09:12 source
-2010-01-04 11:01 source
+ * Merged new version of OAT toolkit
+ * Fixed icons - delete and add
+ * Fixed dependency to later version of ODS framework
- file base.dir.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 09:10 source
-2010-01-04 11:01 source
+ * Added Register to vsp, php etc users pages
+ * Added X.509 create certificate to users pages
+ * Merged new version of OAT toolkit
+ * Fixed UI profile
+ * Fixed delete action
+ * Fixed new foaf+ssl schema support
- file biblioentry.item.separator.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 09:04 source
-2010-01-04 11:01 source
+ * Added uStream cartridge
+ * Fixed PPTX cartridge to work with latest description.vsp
- file biblioentry.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-12 09:01 source
-2010-01-04 11:01 source
+ * Merged new version of OAT toolkit
+ * Added location macro support
+ * Fixed numerous issues
- file bibliography.collection.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-11 17:02 source
-2010-01-04 11:01 source
+ * Merged new version of OAT toolkit
- file bibliography.numbered.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-10 20:28 source
-2010-01-04 11:01 source
+ * Fixed JSON support
- file bibliography.style.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-10 15:09 source
-2010-01-04 11:01 source
+ * Fixed wide character when getting procedure columns information
- file block.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-10 15:08 source
-2010-01-04 11:01 source
+ * Added OPTIONS for http server
+ * Added trace method
- file blockquote.properties.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-10 14:43 source
-2010-01-04 11:01 source
+ * Fixed support of old and new schema for FOAF+SSL
- file blurb.on.titlepage.enabled.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-10 10:34 source
-2010-01-04 11:01 source
+ * Fixed allow nulls, DV_C_STRING and memleak
- file body.attributes.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-09 20:14 source
-2010-01-04 11:01 source
+ * Added support for nvarchar to __like_min and __like_max
- file body.bg.color.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-09 20:12 source
-2010-01-04 11:01 source
+ * Fixed possible dfe_false in context
- file body.end.indent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-08 20:39 source
-2010-01-04 11:01 source
+ * Fixed setting pooling params
- file body.font.family.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-08 20:37 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file body.font.master.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-08 14:20 source
-2010-01-04 11:01 source
+ * Fixed allow chunked content to be read as strses
- file body.font.size.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-08 12:04 source
-2010-01-04 11:01 source
+ * Fixed typos
- file body.margin.bottom.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-08 12:02 source
-2010-01-04 11:01 source
+ * Fixed typo in tag MusicianCreditsList
- file body.margin.top.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-08 11:54 source
-2010-01-04 11:01 source
+ * Added wide char support to set_qualifier
- file body.start.indent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-08 11:53 source
-2010-01-04 11:01 source
+ * Fixed issue when no content len is give but content is sent as
+ http/1.0 protocol e.g. with connection-close
- file bookmarks.collapse.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-08 09:21 source
-2010-01-04 11:01 source
+ * Fixed typo in scovo:dimension
- file bridgehead.in.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-07 08:20 source
-2010-01-04 11:01 source
+ * Fixed typo
- file bullet.image.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-07 08:18 source
-2010-01-04 11:01 source
+ * Fixed SERVICE parameter passing
+ * Fixed (!ask(...)) in filters
- file callout.defaultcolumn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 23:49 source
-2010-01-04 11:01 source
+ * Added tests
- file callout.graphics.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 23:44 source
-2010-01-04 11:01 source
+ * Fixed improved codegen for FILTER (?local = IRI(?:global)) .
- file callout.graphics.number.limit.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 23:43 source
-2010-01-04 11:01 source
+ * Added support for fractions of second in bif_dateadd
- file callout.graphics.path.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 23:38 source
-2010-01-04 11:01 source
+ * Fixed tests
- file callout.graphics.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 20:45 source
-2010-01-04 11:01 source
+ * Updated docs
- file callout.icon.size.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 16:39 source
-2010-01-04 11:01 source
+ * Fixed memory leaks
+ * Fixed read memory after free
+ * Fixed when one connection does prepare and then uses another
+ connection to commit/rollback, must reset 1st cli's trx
+ * Fixed when writing to log enter mutex to avoid concurrent writing
- file callout.list.table.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 14:15 source
-2010-01-04 11:01 source
+ * Fixed typo
- file callout.unicode.font.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 13:39 source
-2010-01-04 11:01 source
+ * Added initial support for JDBC hibernate
- file callout.unicode.number.limit.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 12:18 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file callout.unicode.start.character.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 12:18 source
-2010-01-04 11:01 source
+ * Fixed driver version
- file callout.unicode.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 12:12 source
-2010-01-04 11:01 source
+ * Fixed connection pooling
- file callouts.extension.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-04 12:11 source
-2010-01-04 11:01 source
+ * Fixed remove xa transaction
- file caution.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-03 22:55 source
-2010-01-04 11:01 source
+ * Fixed do not setup unknown for special methods
- file chapter.autolabel.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-03 09:21 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file charmap.groff.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-03 09:20 source
-2010-01-04 11:01 source
+ * Fixed problem with jar packaging
- file chunk.append.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-02 10:01 source
-2010-01-04 11:01 source
+ * Added OPTIONS support for http server
- file chunk.first.sections.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 21:05 source
-2010-01-04 11:01 source
+ * Added initial support for basic SPARQL federation
- file chunk.quietly.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 20:46 source
-2010-01-04 11:01 source
+ * Added DefaultServiceMap and DefaultServiceStorage
- file chunk.section.depth.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 20:42 source
-2010-01-04 11:01 source
+ * Fixed support for positional and named parameters from exec() or
+ similar in SPARQL, as if they where global variables of other
+ sorts
- file chunk.sections.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 10:26 source
-2010-01-04 11:01 source
+ * Fixed use unzip_file function
- file chunk.separate.lots.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 10:18 source
-2010-01-04 11:01 source
+ * Fixed Import
- file chunk.toc.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 10:16 source
-2010-01-04 11:01 source
+ * Fixed CSS
- file chunk.tocs.and.lots.has.title.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 10:15 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file chunk.tocs.and.lots.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 10:12 source
-2010-01-04 11:01 source
+ * Fixed compatiblity with jdk1.5
- file chunker.output.cdata-section-elements.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 10:07 source
-2010-01-04 11:01 source
+ * Upgraded to Jena 2.6.2
+ * Fixed backward compatiblity with jdk 1.5
- file chunker.output.doctype-public.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 10:06 source
-2010-01-04 11:01 source
+ * Fixed make sesame2 backward compatible with jdk1.5
- file chunker.output.doctype-system.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 09:31 source
-2010-01-04 11:01 source
+ * Regenerated driver
- file chunker.output.encoding.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 09:17 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file chunker.output.indent.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 01:03 source
-2010-01-04 11:01 source
+ * Added immortal IRI for uname_virtrdf_ns_uri_DefaultServiceStorage
- file chunker.output.media-type.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 01:01 source
-2010-01-04 11:01 source
+ * Added support for unzip_file ()
- file chunker.output.method.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:49 +0000
+2010-03-01 00:50 source
-2010-01-04 11:01 source
+ * Updated documentation
- file docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-01 00:39 source
-2010-01-04 11:01 source
+ * Upgraded to Sesame 2.3.1
- file endnotes.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-01 00:38 source
-2010-01-04 11:01 source
+ * Fixed typo
- file home.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-01 00:35 source
-2010-01-04 11:01 source
+ * Added swapguard option
- file html-synop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-01 00:28 source
-2010-01-04 11:01 source
+ * Added columns for api type and id
- file important.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-03-01 00:03 source
-2010-01-04 11:01 source
+ * Added support for saving history to disk
- file info.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-28 23:58 source
-2010-01-04 11:01 source
+ * Fixed geo:point matching
+ * Fixed regex to remove default ns from XML - single quotes are valid
+ for enclosed attribute values
- file inline.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-28 23:57 source
-2010-01-04 11:01 source
+ * Fixed positioned update problem on cluster
- file javahelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-28 23:55 source
-2010-01-04 11:01 source
+ * Added refresh parameter
- file lists.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-28 23:52 source
-2010-01-04 11:01 source
+ * Added setting for RoundRobin scheduling
- file next.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-27 22:21 source
-2010-01-04 11:01 source
+ * Fixed diagnosics of async_queue specific errors like aq invocation
+ on log replay or security issues
- file note.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-26 17:31 source
-2010-01-04 11:01 source
+ * Fixed missing label
- file other.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-26 17:28 source
-2010-01-04 11:01 source
+ * Fixed use union for local automatic variables to avoid alignment
+ problems
- file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-26 10:24 source
-2010-01-04 11:01 source
+ * Regenerated driver
- file param.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-26 10:05 source
-2010-01-04 11:01 source
+ * Upgraded to Sesame 2.3.1
+ * Removed deprecated file
+ * Fixed inference support
- file pi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-25 20:24 source
-2010-01-04 11:01 source
+ * Updated to Sesame 2.2.4
- file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-25 20:23 source
-2010-01-04 11:01 source
+ * Added support for Sesame 2 HTTP respository
+ * Updated toSesame 2.2.4
- file prev.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-25 20:21 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-25 16:09 source
-2010-01-04 11:01 source
+ * FIxed url param for metadata selection
- file profile-javahelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-25 16:09 source
-2010-01-04 11:01 source
+ * Added 'Import' to user pages (vsp, php etc)
+ * Fixed pass interface too
- file refentry.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-25 16:08 source
-2010-01-04 11:01 source
+ * Added tweet gizmo
- file synop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-25 16:07 source
-2010-01-04 11:01 source
+ * Fixed groups
- file table.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-24 20:55 source
-2010-01-04 11:01 source
+ * Added proper ASK support in web service endpoing
+ * Fixed faster loading of inference sets
+ * Fixed loading of inference sets from graph groups, not only from
+ single graphs
+ * Fixed creation of graph groups on cluster
- file tip.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-24 20:53 source
-2010-01-04 11:01 source
+ * Added swap guard to kill trx and log ws when swapping is over 300 pages
- file up.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-24 13:02 source
-2010-01-04 11:01 source
+ * Fixed use unsigned for lower parts else we risk sign extent on large
+ numbers
- file utility.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-23 22:35 source
-2010-01-04 11:01 source
+ * Fixed metadata
- file warning.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-23 14:50 source
-2010-01-04 11:01 source
+ * Fixed when looking at col_preds and seeking for column, make sure cp
+ dfe is a column
- file 1.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-23 14:49 source
-2010-01-04 11:01 source
+ * Added prototype
- file 1.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-23 14:49 source
-2010-01-04 11:01 source
+ * Fixed when unbox iri make sure value is of type DV_IRI_ID
- file 1.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-23 14:48 source
-2010-01-04 11:01 source
+ * FIxed 2pc file name does not change with log file if log trail on
- file 10.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-23 10:44 source
-2010-01-04 11:01 source
+ * Fixed rewriting of group patterns with filters replaced with restrictions on
+ equivs
- file 10.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-23 10:21 source
-2010-01-04 11:01 source
+ * Fixed stop compilation where comp time over run time
- file 10.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-19 00:22 source
-2010-01-04 11:01 source
+ * Fixed when doing a log replay, mark prepared XA trx as such
- file 11.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-19 00:22 source
-2010-01-04 11:01 source
+ * Fixed more macros for 64bit fs
- file 11.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 21:37 source
-2010-01-04 11:01 source
+ * Use macros for file calls for 64bit fs
- file 11.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 21:36 source
-2010-01-04 11:01 source
+ * Merged XA fixes from HEAD
- file 12.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 20:46 source
-2010-01-04 11:01 source
+ * FIxed mem leak
- file 12.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 14:22 source
-2010-01-04 11:01 source
+ * Fixed minor issue
- file 12.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 14:13 source
-2010-01-04 11:01 source
+ * Fixed if avail always use ro_id for hash
- file 13.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 14:12 source
-2010-01-04 11:01 source
+ * Fixed text for NOT pred
- file 13.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 10:57 source
-2010-01-04 11:01 source
+ * Fixed use separate macro for COL_DOTTED
- file 13.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 10:01 source
-2010-01-04 11:01 source
+ * Fixed SIOC subscriptions
+ * Fixed bad item descriptions
- file 14.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-18 10:00 source
-2010-01-04 11:01 source
+ * Fixed groups
+ * Fixed bookmarklet
+ * Fixed typo
- file 14.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-17 22:06 source
-2010-01-04 11:01 source
+ * Fixed order must be greater than 0
- file 14.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-17 16:58 source
-2010-01-04 11:01 source
+ * Fixed remove null in gby as it is not needed
+ * Fixed jts to check for call
- file 15.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-17 16:56 source
-2010-01-04 11:01 source
+ * Fixed do not print default port for http and https in urls
- file 15.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-17 10:21 source
-2010-01-04 11:01 source
+ * Fixed labels and added new columns
- file 15.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-16 15:03 source
-2010-01-04 11:01 source
+ * Fixed IN pred as iterator before index path
- file 16.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-16 13:49 source
-2010-01-04 11:01 source
+ * Added slidesix cartridge
+ * Fixed run microformats independent of rdfa
- file 17.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-16 13:48 source
-2010-01-04 11:01 source
+ * Fixed owl:sameAS is not a:id
- file 18.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-16 13:48 source
-2010-01-04 11:01 source
+ * Fixed minor issues
- file 19.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-16 13:48 source
-2010-01-04 11:01 source
+ * Rolled back fix for GR data
- file 2.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-16 12:47 source
-2010-01-04 11:01 source
+ * Fixed leave semaphore before jump
- file 2.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-16 11:58 source
-2010-01-04 11:01 source
+ * Fixed detection of n3 and nt formats
- file 2.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:48 +0000
+2010-02-15 21:23 source
-2010-01-04 11:01 source
+ * Fixed use macro
- file annot-close.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-15 19:46 source
-2010-01-04 11:01 source
+ * FIxed GPF when 2nd argument is not a string
- file annot-open.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-15 19:46 source
-2010-01-04 11:01 source
+ * Fixed inx int not applicable to keys with no pk ref
- file biblio-iso690.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-15 10:05 source
-2010-01-04 11:01 source
+ * Fixed problem with shared files
- file blank.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-12 22:14 source
-2010-01-04 11:01 source
+ * Fixed bad array index check
- file caution.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-12 22:13 source
-2010-01-04 11:01 source
+ * Added option for user WebID
- file caution.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-12 22:12 source
-2010-01-04 11:01 source
+ * Fixed table editing fields
- file caution.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-12 20:05 source
-2010-01-04 11:01 source
+ * Fixed NT serializations (_:_ is not a valid bnode in NT so it is
+ replaced with _:ResultSet2053 )
- file caution.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-12 13:00 source
-2010-01-04 11:01 source
+ * Updated version to 3127
- file changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-12 12:56 source
-2010-01-04 11:01 source
+ * Rebuild driver
- file chunk-changebars.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-12 12:56 source
-2010-01-04 11:01 source
+ * Fixed use bitmask check
- file chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-12 11:53 source
-2010-01-04 11:01 source
+ * Fixed combination of RDF_OBJ_OF_LONG(RDF_LONG_OF_SQLVAL(string))
+ that screwed up RDF_DELETE_TRIPLES_AGG()
- file chunk-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-12 11:20 source
-2010-01-04 11:01 source
+ * Added "Create New Resource" option
- file chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-12 11:20 source
-2010-01-04 11:01 source
+ * Fixed always refresh robot status
- file chunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-12 10:34 source
-2010-01-04 11:01 source
+ * Regenerated drivers
- file chunkfast.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-12 10:26 source
-2010-01-04 11:01 source
+ * Fixed issues with Literal data
+ * Small bugfixes
- file chunktoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-11 23:23 source
-2010-01-04 11:01 source
+ * Updated documentation
- file draft.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-11 23:17 source
-2010-01-04 11:01 source
+ * Fixed serialize ha_hits hash lookups
- file highlight.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-11 16:25 source
-2010-01-04 11:01 source
+ * Fixed bug with ITF-8 encoded strings in box
- file home.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-11 14:00 source
-2010-01-04 11:01 source
+ * Fixed codegen in LIMIT ?:global-variable and OFFSET ?:global-variable
- file home.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-11 13:19 source
-2010-01-04 11:01 source
+ * Added new demo queries
- file home.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-11 13:16 source
-2010-01-04 11:01 source
+ * Added 'create file' action
- file html-rtf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-11 13:15 source
-2010-01-04 11:01 source
+ * Fixed removed status bar
- file htmlhelp-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 22:18 source
-2010-01-04 11:01 source
+ * Fixed DAV path normalize
+ * Fixed Feeds rights
+ * Fixed UI Profile JS
+ * Fixed UI Profile pages
- file htmlhelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 22:17 source
-2010-01-04 11:01 source
+ * Fixed WebID selection
+ * Fixed calling proc from packages other than Framework
- file htmltbl.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-10 22:09 source
-2010-01-04 11:01 source
+ * Fixed Anotea, CSS
+ * Fixed Annotation SIOC Data
- file important.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 16:10 source
-2010-01-04 11:01 source
+ * Fixed move assignment of oplval_len before jump since we know
+ oplval_strval is a string box already
- file important.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 16:09 source
-2010-01-04 11:01 source
+ * Fixed whitespace
- file important.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 16:08 source
-2010-01-04 11:01 source
+ * Fixed compiler warning about possible uninitialized vars
- file important.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 16:05 source
-2010-01-04 11:01 source
+ * Fixed typo in if expression
- file maketoc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 16:05 source
-2010-01-04 11:01 source
+ * Fixed use err_ret
- file manifest.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 16:04 source
-2010-01-04 11:01 source
+ * Fixed should use int64 type
- file next.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 14:05 source
-2010-01-04 11:01 source
+ * Fixed SPARQL_SELECT_KNOWN_GRAPHS
- file next.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 14:04 source
-2010-01-04 11:01 source
+ * Fixed define dpipe before anything else is called
- file next.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 12:58 source
-2010-01-04 11:01 source
+ * Fixed check for array boundary
- file note.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 12:57 source
-2010-01-04 11:01 source
+ * Fixed compiler warnings
- file note.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 11:03 source
-2010-01-04 11:01 source
+ * Added DKS box serialization flag DKS_TO_HA_DISK_ROW to preserve
+ box flags in procedure views temp tables
- file note.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-10 11:03 source
-2010-01-04 11:01 source
+ * Fixed missing initialization in calculation of cost and cardinality
- file note.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 17:38 source
-2010-01-04 11:01 source
+ * Fixed workaround for non-iri g1
- file oldchunker.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 17:37 source
-2010-01-04 11:01 source
+ * Fixed check to include iri_to_id
- file onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 16:11 source
-2010-01-04 11:01 source
+ * Fixed bug with UTF-8 encoded strings
- file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 15:13 source
-2010-01-04 11:01 source
+ * Added new SPARQL endpoints
+ * Added missing file
+ * FIxed missing execute permalink
+ * Fixed css to make tab effect more consistent
- file pi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 15:11 source
-2010-01-04 11:01 source
+ * Fixed do not make an artm op 0-n for neg literal -n
- file prev.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 14:47 source
-2010-01-04 11:01 source
+ * Fixed check against abnormally big number of distinct datatypes
+ or languages
- file prev.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 14:34 source
-2010-01-04 11:01 source
+ * Fixed version number in http headers
- file prev.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 14:33 source
-2010-01-04 11:01 source
+ * Fixed check trans node max mem when reading rows
- file profile-chunk-code.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 14:23 source
-2010-01-04 11:01 source
+ * Fixed mem leaks in client
- file profile-chunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-09 11:39 source
-2010-01-04 11:01 source
+ * Fixed memory leak in trans node compilation
- file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-08 21:24 source
-2010-01-04 11:01 source
+ * Added protection against abnormally bif number of distinct datatypes
+ or languages
- file profile-htmlhelp-common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-08 21:22 source
-2010-01-04 11:01 source
+ * Fixed SQL codegen for NOT() retval expression
- file profile-htmlhelp.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-08 21:22 source
-2010-01-04 11:01 source
+ * Fixed memory leak
- file profile-onechunk.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-08 12:38 source
-2010-01-04 11:01 source
+ * FIxed gpf in serializer when using default constand
+ * Fixed gpf when type is bad or zero
- file task.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-08 12:34 source
-2010-01-04 11:01 source
+ * Fixed log replay for rdfs_load_schema on cluster
- file tip.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-08 12:33 source
-2010-01-04 11:01 source
+ * Fixed loading literals of type xsd:Token
- file tip.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 20:49 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.0 for final release
- file tip.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 20:37 source
-2010-01-04 11:01 source
+ * Removed deprecated directory
- file tip.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 19:39 source
-2010-01-04 11:01 source
+ * Updated version to 06.01
- file toc-blank.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 19:38 source
-2010-01-04 11:01 source
+ * Updated version number
- file toc-minus.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 19:37 source
-2010-01-04 11:01 source
+ * Updated version to 6.1.0-rc1
- file toc-plus.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 19:17 source
-2010-01-04 11:01 source
+ * Fixed missing include files
- file up.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 19:06 source
-2010-01-04 11:01 source
+ * Regenerated drivers
- file up.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 18:37 source
-2010-01-04 11:01 source
+ * Fixed comment
- file up.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 18:34 source
-2010-01-04 11:01 source
+ * Added missing file to distribution
- file warning.gif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 18:03 source
-2010-01-04 11:01 source
+ * Fixed building with external zlib
- file warning.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 17:09 source
-2010-01-04 11:01 source
+ * Fixed no need to build this dir when using external zlib
- file warning.svg was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 17:06 source
-2010-01-04 11:01 source
+ * Fixed generated by comment
- file warning.tif was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:47 +0000
+2010-02-03 16:58 source
-2010-01-04 11:01 source
+ * Fixed CRLF
- file README was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-03 16:53 source
-2010-01-04 11:01 source
+ * Fixed make clean
- file annotations.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-03 15:46 source
-2010-01-04 11:01 source
+ * Fixed changelog
- file autoidx-kimber.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-03 15:44 source
-2010-01-04 11:01 source
+ * Fixed dependency
- file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+2010-02-03 15:40 source
-2010-01-04 11:01 source
+ * Added correct handling of standard SPARQL (non-RDF) result sets.
+ * Server defaults are now loaded through a web service - /isparq/defaults/
+ * Resulting HTML is more valid
+ - no <script> outside <html>, etc.
+ - FireFox now in standards-compliance mode.
+ * Numerous layout tweaks.
+ * Fixed badly rendered toggler indicators in FireFox.
+ * Added more endpoint detection code
- file autoidx-ng.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ NOTE: sites which have multiple virtual directories hosting iSPARQL will
+ all need the new /d efaults VHOST added manually.
-2010-01-04 11:01 source
+2010-02-03 15:28 source
- file autoidx.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Updated version
-2010-01-04 11:01 source
+2010-02-03 15:21 source
- file c-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed changelog rule
-2010-01-04 11:01 source
+2010-02-03 15:05 source
- file common.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Added support for CKEditor
-2010-01-04 11:01 source
+2010-02-03 15:05 source
- file cpp-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Added new examples
-2010-01-04 11:01 source
+2010-02-03 15:04 source
- file csharp-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Added new SKOS-trans inference rule
-2010-01-04 11:01 source
+2010-02-03 14:54 source
- file delphi-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed do not put sort node as ks_stp if the sort node has precode that
+ hs a dpipe part
-2010-01-04 11:01 source
+2010-02-03 13:54 source
- file fop.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed setting
-2010-01-04 11:01 source
+2010-02-03 10:29 source
- file fop1.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Added DB.DBA.BEST_LANGMATCH() and bif_langmatches_pct_http()
-2010-01-04 11:01 source
+2010-02-03 10:29 source
- file highlight.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed bad init in trans node if multiple inputs or step output values
-2010-01-04 11:01 source
+2010-02-03 00:41 source
- file htmltbl.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed CREDITS
-2010-01-04 11:01 source
+2010-02-02 23:57 source
- file ini-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed install LICENSE, CREDITS, AUTHORS, READMEs etc in doc dir
-2010-01-04 11:01 source
+2010-02-02 23:24 source
- file java-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed redundant trailing '>' in results of TTL load when IRIs contain
+ special chars
-2010-01-04 11:01 source
+2010-02-02 23:04 source
- file javascript-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Added support for Virtuoso JDBC Driver documentation
-2010-01-04 11:01 source
+2010-02-02 22:52 source
- file m2-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed comments
-2010-01-04 11:01 source
+2010-02-02 20:24 source
- file myxml-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Removed support for deprecated JDK1.0, JDK1.1 and JDK1.2
+ * Removed Virtuoso JDBC 2.0 SSL driver and JSSE runtime and
+ added instructions how to build it if someone still needs
+ it using JDK 1.3
-2010-01-04 11:01 source
+2010-02-02 19:38 source
- file pagesetup.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed windows math.h needs this define for M_PI etc
-2010-01-04 11:01 source
+2010-02-02 17:59 source
- file param.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed php, jsp and vsp users update pages
-2010-01-04 11:01 source
+2010-02-02 14:32 source
- file passivetex.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed bug in Doc and Main wiki clusters
-2010-01-04 11:01 source
+2010-02-02 14:20 source
- file pdf2index was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed "option (score ...)" in a gp with multiple OPTIONAL (...)
-2010-01-04 11:01 source
+2010-02-02 14:18 source
- file perl-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed align buffer to sizeof pointer to avoid crash on strict
+ checking platforms like sparc
-2010-01-04 11:01 source
+2010-02-02 14:17 source
- file php-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * FIxed memleak when cache is used
-2010-01-04 11:01 source
+2010-02-02 14:16 source
- file pi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed compiler warnings
-2010-01-04 11:01 source
+2010-02-02 14:15 source
- file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed problem with rfc1808_expand_uri not using proper macros
+ and allocate byte extra for strings
-2010-01-04 11:01 source
+2010-02-01 23:16 source
- file profile-docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Updated windows project file
-2010-01-04 11:01 source
+2010-02-01 23:15 source
- file ptc.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Updated win32 and win64 build scripts
-2010-01-04 11:01 source
+2010-02-01 23:14 source
- file python-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed compiler warning
-2010-01-04 11:01 source
+2010-02-01 23:13 source
- file qandaset.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed bad cast
-2010-01-04 11:01 source
+2010-02-01 23:10 source
- file ruby-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed typo
-2010-01-04 11:01 source
+2010-02-01 15:15 source
- file spaces.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Added conversion code to migrate DB to 2+3 index
-2010-01-04 11:01 source
+2010-02-01 15:10 source
- file table.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Added check for XA ROLLBACKONLY
-2010-01-04 11:01 source
+2010-02-01 14:59 source
- file task.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Rebuild drivers
-2010-01-04 11:01 source
+2010-02-01 14:58 source
- file tcl-hl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed when different TZ is used, must find offset and transform via GMT
-2010-01-04 11:01 source
+2010-02-01 13:08 source
- file titlepage.templates.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Fixed missing prototype
-2010-01-04 11:01 source
+2010-02-01 13:02 source
- file titlepage.templates.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Added missing file
-2010-01-04 11:01 source
+2010-02-01 12:54 source
- file xep.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Updated version to 6.0.1-pre2
-2010-01-04 11:01 source
+2010-02-01 12:53 source
- file xslthl-config.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:46 +0000
+ * Merged 2+3 index into VOS
+ * Merged new inlined string code into VOS
+ * Added support for owl:inverseOf, owl:SymmetricProperty and
+ owl:TransitiveProperty.
+ * Fixed graph-level security in cluster
+ * Fixed loading XMLs into single via RDF/XML
+ * Fixed SPARQL select distinct ?g where { graph ?g { ...}}
-2010-01-04 11:01 source
+2010-02-01 12:44 source
- file README was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Merged 2+3 index into VOS
+ * Added new sample queries
+ * Fixed text recoding to UTF8
-2010-01-04 11:01 source
+2010-02-01 12:40 source
- file README.LIBXSLT was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Merged 2+3 index code into VOS
+ * Fixed DB.DBA.RDF_DATATYPE_OF_OBJ and DB.DBA.RDF_LANGUAGE_OF_OBJ
+ are now used with __ro2sq of the argument, due to new format of
+ incomplete rdf boxes.
+ * Fixed redundant equalities in case of multiple OPTIONALs with
+ same variable
+ * Fixed BOOLEAN_OF_OBJ in case of incomplete boxes
-2010-01-04 11:01 source
+2010-02-01 12:36 source
- file annotations.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Added stubs
-2010-01-04 11:01 source
+2010-02-01 12:35 source
- file authors.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed check db size and exit if not correct
+ * Fixed text of version mismatch messages
-2010-01-04 11:01 source
+2010-02-01 09:26 source
- file autoidx-kimber.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Removed unused variables
-2010-01-04 11:01 source
+2010-02-01 02:45 source
- file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed function prototypes
-2010-01-04 11:01 source
+2010-02-01 02:43 source
- file autoidx-ng.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed xper not supported in cluster
-2010-01-04 11:01 source
+2010-02-01 02:39 source
- file autoidx.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Improved SPARQL parsing and SQL codegen for negative numbers
-2010-01-04 11:01 source
+2010-02-01 02:36 source
- file axf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed explicit rb not allowed in cl tx branch
+ * Fixed when rdf box then must take dtp1 and sizeof char one more time
+ * Fixed support of literals with languages in SPARQL INSERT DATA
+ with data in state slot
-2010-01-04 11:01 source
+2010-02-01 02:32 source
- file biblio-iso690.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Added new rdf box function
-2010-01-04 11:01 source
+2010-02-01 02:18 source
- file copyright.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed inside cpt do not notice anytimes and disconnects
-2010-01-04 11:01 source
+2010-02-01 02:16 source
- file dbtoepub was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed security in cluster
-2010-01-04 11:01 source
+2010-02-01 02:10 source
- file docbook.py was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Partial rollback of patch
-2010-01-04 11:01 source
+2010-02-01 02:08 source
- file docbook.rb was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed look up rdf lit ids in cost model to get the card
-2010-01-04 11:01 source
+2010-02-01 02:00 source
- file docbook.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Added initial support for owl:inverseOf, owl:SymmetricProperty
+ and owl:TransitiveProperty
-2010-01-04 11:01 source
+2010-02-01 01:45 source
- file ebnf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed index path outer join
-2010-01-04 11:01 source
+2010-02-01 01:45 source
- file eclipse.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed if cls rollback during cpt, it would not wait and would rb
+ a tx while it had uncommitted state that was restored by the cpt
+ at the end. This would make trxs in trx rc have locks which is
+ impossible. So check for thread continues during cpt if simultaneous
+ cpt freeze and rb. Check txns in trx rc don't get locks.
-2010-01-04 11:01 source
+2010-02-01 01:08 source
- file fo-rtf.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed gpf during rfwd containing XA transaction
-2010-01-04 11:01 source
+2010-02-01 01:00 source
- file license.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed atomic must proceed even if uncommitted 2pc prepared
-2010-01-04 11:01 source
+2010-02-01 00:53 source
- file page.png was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Added function __uname
-2010-01-04 11:01 source
+2010-01-31 23:07 source
- file profile-eclipse.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Added new function __rdf_rng_min
-2010-01-04 11:01 source
+2010-01-31 23:06 source
- file reference.css was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Added new implementation of log_text and log_text_array
-2010-01-04 11:01 source
+2010-01-31 23:04 source
- file reference.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed compiler warnings
-2010-01-04 11:01 source
+2010-01-31 20:48 source
- file reference.xml.included was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed reading of last chunk
-2010-01-04 11:01 source
+2010-01-31 20:46 source
- file saxon65.jar was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Added debug flag for sponger
-2010-01-04 11:01 source
+2010-01-31 20:44 source
- file ta.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed declare iri to ir et all as no cluster
-2010-01-04 11:01 source
+2010-01-31 20:43 source
- file table.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed missing externals
-2010-01-04 11:01 source
+2010-01-31 20:41 source
- file targetdatabase.dtd was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed checkpoint messages in log
-2010-01-04 11:01 source
+2010-01-31 20:37 source
- file targets.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed do not run dav init on cluster before cluster is up
-2010-01-04 11:01 source
+2010-01-31 20:36 source
- file th.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed rdf init on dav does not need to be done on empty db, thus run
+ only in single when update is needed
-2010-01-04 11:01 source
+2010-01-31 20:32 source
- file titles.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed fault tolerance
-2010-01-04 11:01 source
+2010-01-31 20:18 source
- file tl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Updated testsuite
-2010-01-04 11:01 source
+2010-01-31 16:47 source
- file tr.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Updated documentation
-2010-01-04 11:01 source
+2010-01-31 12:43 source
- file uk.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed if negative numeric literal, do not make it 0 - litt
-2010-01-04 11:01 source
+2010-01-30 01:12 source
- file utility.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Added debug flag for sponger
+ * Fixed use http_host connection var in aq mode
-2010-01-04 11:01 source
+2010-01-29 23:59 source
- file utility.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed whitespace
-2010-01-04 11:01 source
+2010-01-29 21:29 source
- file vi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Removed deprecated file
-2010-01-04 11:01 source
+2010-01-29 20:54 source
- file warranty.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Fixed for building without SSL
-2010-01-04 11:01 source
+2010-01-29 20:21 source
- file xalan27.jar was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Added support for ckeditor
+ * Removed deprecated rte and kupu editors
-2010-01-04 11:01 source
+2010-01-29 16:18 source
- file xh.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed library version
-2010-01-04 11:01 source
+2010-01-29 16:16 source
- file xslt.py was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:45 +0000
+ * Removed unused include file
-2010-01-04 11:01 source
+2010-01-29 15:21 source
- file zh.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed minor issues
-2010-01-04 11:01 source
+2010-01-29 15:09 source
- file zh_cn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed use sparql load instead of soft
-2010-01-04 11:01 source
+2010-01-29 15:07 source
- file zh_tw.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Removed support for IE 5 and 6 compatibility
-2010-01-04 11:01 source
+2010-01-29 15:00 source
- file eu.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed crawler pages
-2010-01-04 11:01 source
+2010-01-29 14:52 source
- file fa.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed use newer version of wsa
-2010-01-04 11:01 source
+2010-01-29 13:23 source
- file ga.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed removed deprecated samples
-2010-01-04 11:01 source
+2010-01-29 13:20 source
- file gentext.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed build issue with md5
-2010-01-04 11:01 source
+2010-01-29 11:34 source
- file gl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Removed deprecated samples/demos
-2010-01-04 11:01 source
+2010-01-29 02:41 source
- file gu.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed uploading large files
-2010-01-04 11:01 source
+2010-01-29 01:56 source
- file he.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed use MD5 from OpenSSL when possible
-2010-01-04 11:01 source
+2010-01-29 00:15 source
- file hi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed build to use generate script
+ * Removed deprecated file
-2010-01-04 11:01 source
+2010-01-28 17:08 source
- file hr.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed make sure version is intact as changes to .ttl file must
+ reflect in sparql.sql
-2010-01-04 11:01 source
+2010-01-28 14:33 source
- file hu.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed non-portable sleep argument
-2010-01-04 11:01 source
+2010-01-28 14:19 source
- file id.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed API rename
-2010-01-04 11:01 source
+2010-01-28 14:19 source
- file insertfile.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed typo
-2010-01-04 11:01 source
+2010-01-28 13:36 source
- file is.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed missing qualification of aggregate
-2010-01-04 11:01 source
+2010-01-28 01:14 source
- file kn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed make new aqt in io sect
+ * Fixed return error when no cli
+ * Fixed if aq called and no aq thread available, signal error
-2010-01-04 11:01 source
+2010-01-28 01:11 source
- file ko.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed automatically allocate bufs
-2010-01-04 11:01 source
+2010-01-28 00:36 source
- file ky.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Added option BuffersAllocation
+ * Added option AsyncQueueMaxThreads
-2010-01-04 11:01 source
+2010-01-28 00:31 source
- file l10n.dtd was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed default sitemap crawling functions
+ * Fixed wrong variable
+ * Fixed wait before update
-2010-01-04 11:01 source
+2010-01-28 00:30 source
- file la.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Updated php, jsp and vsp user pages
-2010-01-04 11:01 source
+2010-01-27 20:43 source
- file labels.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Added FOAF+SSL groups
-2010-01-04 11:01 source
+2010-01-27 20:31 source
- file lt.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Added support for Google Base items types 'wanted ads', 'business
+ location' and 'product catalogs'
-2010-01-04 11:01 source
+2010-01-27 20:31 source
- file lv.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed virtrdf_label
-2010-01-04 11:01 source
+2010-01-27 12:55 source
- file mn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed use DV_SHORT_STRING_SERIAL tag when serializing short strings
-2010-01-04 11:01 source
+2010-01-27 12:54 source
- file nb.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed varlgrind warning about using uninitialized memory read
-2010-01-04 11:01 source
+2010-01-27 12:52 source
- file nn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed in getting page_row reset rd leaf if not a leaf.
-2010-01-04 11:01 source
+2010-01-27 12:51 source
- file olink.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed do not POST when no post parameters
-2010-01-04 11:01 source
+2010-01-27 01:29 source
- file or.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed read after allocated memory
-2010-01-04 11:01 source
+2010-01-25 23:46 source
- file pa.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Removed deprecated files
-2010-01-04 11:01 source
+2010-01-25 22:42 source
- file pi.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:43 +0000
+ * Fixed copyright and license clarification
-2010-01-04 11:01 source
+2010-01-25 20:45 source
- file pi.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed must commit before aq_wait
-2010-01-04 11:01 source
+2010-01-25 16:20 source
- file refentry.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Updated documentation
-2010-01-04 11:01 source
+2010-01-25 16:10 source
- file refentry.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Added php, jsp and vsp users update
+ * Fixed problem with activity pages
-2010-01-04 11:01 source
+2010-01-25 16:09 source
- file sl.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * FIxed copyright
-2010-01-04 11:01 source
+2010-01-25 16:09 source
- file sq.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed SSL check
-2010-01-04 11:01 source
+2010-01-25 16:05 source
- file sr.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed bug in permissions
-2010-01-04 11:01 source
+2010-01-25 15:42 source
- file sr_Latn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed problem with MaxMempoolSize
+ * Fixed problem with driver properties
-2010-01-04 11:01 source
+2010-01-25 15:41 source
- file stripns.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed shortened long URLs in the crawlers view to avoid UI breakage
-2010-01-04 11:01 source
+2010-01-25 15:12 source
- file subtitles.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:44 +0000
+ * Fixed support for Google Base 'products' item type
+ * Fixed headers
-2010-01-04 11:01 source
+2010-01-25 14:57 source
- * Imported docbook-xsl-1.75.2
+ * Fixed use pipeline client in crawler
-2010-01-04 11:01 source
+2010-01-25 10:39 source
- file .CatalogManager.properties.example was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:41 +0000
+ * Fixed accept different headers in pipeline request; add header only if
+ it contains something
-2010-01-04 11:01 source
+2010-01-15 13:47 source
- file .cshrc.incl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:41 +0000
+ * Fixed crash when timeout was sent using dv_array_of_long
-2010-01-04 11:01 source
+2010-01-15 13:02 source
- file .emacs.el was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:41 +0000
+ * Fixed small lang conversion issue
-2010-01-04 11:01 source
+2010-01-15 12:16 source
- file .profile.incl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:41 +0000
+ * Rebuild driver
-2010-01-04 11:01 source
+2010-01-15 12:15 source
- file .urilist was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed issue with disconnect
+ * Fixed issue with XA exception
-2010-01-04 11:01 source
+2010-01-14 16:21 source
- file AUTHORS was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed bug calculating todays date
-2010-01-04 11:01 source
+2010-01-14 16:06 source
- file COPYING was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed use current OAT API function names
+ * Fixed bug in query execute permalink encoding
+ * Removed explicit reference to ymaps
+ * Temp fix for DESCRIBE popup query
-2010-01-04 11:01 source
+2010-01-14 16:04 source
- file INSTALL was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Added new popup calendar based on OAT
+ * Fixed use current OAT API function names
+ * FIxed explicit references to ymaps, gmaps
-2010-01-04 11:01 source
+2010-01-14 15:57 source
- file NEWS was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Added LICENSE and COPYING from OAT project
+ * Removed custom map loaders
+ * Fixed use current OAT API function names instead of backward compat
-2010-01-04 11:01 source
+2010-01-13 15:05 source
- file NEWS.html was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed non-rfc method to make URL
-2010-01-04 11:01 source
+2010-01-13 15:02 source
- file NEWS.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed missing type cast
-2010-01-04 11:01 source
+2010-01-13 08:51 source
- file RELEASE-NOTES.html was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed user UI login pages
+ * Fixed user UI pages
+ * Fixed user home page field size
-2010-01-04 11:01 source
+2010-01-12 23:21 source
- file RELEASE-NOTES.txt was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed decoding unicode escape sequences in post request
-2010-01-04 11:01 source
+2010-01-12 12:19 source
- file RELEASE-NOTES.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed automated labels extraction
-2010-01-04 11:01 source
+2010-01-12 12:15 source
- file af.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed memory leak
-2010-01-04 11:01 source
+2010-01-12 11:06 source
- file am.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Added doap:name for labeling
-2010-01-04 11:01 source
+2010-01-11 16:02 source
- file ar.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed primary topic from Offering to Product
-2010-01-04 11:01 source
+2010-01-11 14:19 source
- file autoidx-kimber.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed missing dcterms:publisher
-2010-01-04 11:01 source
+2010-01-07 17:09 source
- file autoidx-kosek.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Imported docbook-xsl-1.75.2
-2010-01-04 11:01 source
+2010-01-07 16:56 source
- file az.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed copyright year to 2010
-2010-01-04 11:01 source
+2010-01-07 16:55 source
- file bg.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed sync Contact UI with Profile UI
+ * Fixed copyright year to 2010
-2010-01-04 11:01 source
+2010-01-07 16:55 source
- file bn.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Added VSP and REST implementation for user API
+ * Added new API functions
+ * Fixed users paths to physical location
+ * Fixed API bug with tag rules
+ * Updated copyright year to 2010
+ * Fixed issue mising quoted and unquoted identifiers
-2010-01-04 11:01 source
+2010-01-06 21:33 source
- file bs.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Updated documentation
-2010-01-04 11:01 source
+2010-01-06 17:33 source
- file catalog.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed bad transformation in feed when author has no name
+ * Fixed process media:contain properly re images
-2010-01-04 11:01 source
+2010-01-06 16:49 source
- file charmap.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Added flag (DuplicateCheckpointRemaps) which should ONLY be used
+ in recovery mode when a bad db can have cpt remap page which links
+ back to itself. In this situation as last chance to recover we can
+ look if remap already is registered and at that point stop looking.
+ Further DBA must check for inconsistencies.
-2010-01-04 11:01 source
+2010-01-06 16:47 source
- file charmap.xsl was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed default log mode in SPARUL MDW operations to distinquish
+ between NULL and 0 log mode
-2010-01-04 11:01 source
+2010-01-06 16:45 source
- file common.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed check if qi is actually available in this context
-2010-01-04 11:01 source
+2010-01-06 12:12 source
- file cy.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed handling of default graph URI param
-2010-01-04 11:01 source
+2010-01-05 19:12 source
- file entities.ent was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Added extra tests
-2010-01-04 11:01 source
+2010-01-05 18:24 source
- file eo.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed moved commit work else async exec might generate new rdf_obj
-2010-01-04 11:01 source
+2010-01-04 11:54 source
- file et.xml was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed if null box then use 0 to prevent core dump
-2010-01-04 11:01 source
+2010-01-04 11:47 source
- file install.sh was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed dependency
-2010-01-04 11:01 source
+2010-01-04 11:42 source
- file test.sh was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Removed deprecated file
-2010-01-04 11:01 source
+2010-01-04 11:25 source
- file uninstall.sh was added on branch V6_0_0-DEVEL on 2010-01-04 11:24:42 +0000
+ * Fixed typo
2010-01-04 08:33 source
@@ -16718,14 +8132,6 @@
2009-12-31 12:45 source
- file ods_api_users.sql was added on branch V6_0_0-DEVEL on 2009-12-31 12:47:57 +0000
-
-2009-12-31 12:45 source
-
- file users.vsp was added on branch V6_0_0-DEVEL on 2009-12-31 12:47:57 +0000
-
-2009-12-31 12:45 source
-
* Added VSP and REST implementation for user API
* Added new API functions
* Fixed users paths to physical location
@@ -16776,10 +8182,6 @@
* Fixed issues with dynamic local
* Fixed use chache for speedup
-2009-12-24 13:48 source
-
- file revyu2rdf.xsl was added on branch V6_0_0-DEVEL on 2009-12-24 13:53:31 +0000
-
2009-12-24 13:36 source
* Fixed dav initialization
@@ -16846,9 +8248,6 @@
* Fixed no offering
* Fixed back to go out icon
-2009-12-22 10:37 source
-
- file trdfrng.sql was added on branch V6_0_0-DEVEL on 2009-12-22 10:37:52 +0000
2009-12-22 10:28 source
@@ -16959,9 +8358,6 @@
* Added ithalia ontology
-2009-12-15 22:41 source
-
- file thalia.owl was added on branch V6_0_0-DEVEL on 2009-12-15 23:01:44 +0000
2009-12-15 22:39 source
@@ -16990,22 +8386,6 @@
* Moved data files into separate directory
* Minor fixes
-2009-12-14 14:39 source
-
- file iso_country_codes.sql was added on branch V6_0_0-DEVEL on 2009-12-14 14:42:12 +0000
-
-2009-12-14 14:39 source
-
- file oai_servers.sql was added on branch V6_0_0-DEVEL on 2009-12-14 14:42:12 +0000
-
-2009-12-14 14:39 source
-
- file yelp_categories.sql was added on branch V6_0_0-DEVEL on 2009-12-14 14:42:12 +0000
-
-2009-12-14 14:38 source
-
- file nyt_people.nt.gz was added on branch V6_0_0-DEVEL on 2009-12-14 14:42:12 +0000
-
2009-12-13 23:28 source
* Fixed upstreaming
@@ -17014,10 +8394,6 @@
* Added Bookmarklet
-2009-12-13 23:24 source
-
- file bmklet_32.png was added on branch V6_0_0-DEVEL on 2009-12-13 23:28:18 +0000
-
2009-12-12 23:31 source
* Fixed issue withclosing gzip session
@@ -17257,10 +8633,6 @@
* Added support for sql export linked tables
-2009-12-02 14:37 source
-
- file vdb_export.vspx was added on branch V6_0_0-DEVEL on 2009-12-02 14:48:42 +0000
-
2009-12-02 14:33 source
* Fixed API methods
@@ -17301,10 +8673,6 @@
* Added API commands
-2009-12-01 14:19 source
-
- file proc_on_api.sql was added on branch V6_0_0-DEVEL on 2009-12-01 14:21:18 +0000
-
2009-12-01 14:18 source
* Removed deprecated files
@@ -17325,10 +8693,6 @@
* Added debug log to meta cartridges
-2009-11-30 23:40 source
-
- file rdf_console.vspx was added on branch V6_0_0-DEVEL on 2009-11-30 23:44:07 +0000
-
2009-11-30 23:39 source
* Fixed button alignment
@@ -17359,10 +8723,6 @@
* Moved Briefcase API from ODS, adding new commands
-2009-11-26 14:36 source
-
- file od-a-api.sql was added on branch V6_0_0-DEVEL on 2009-11-26 14:37:21 +0000
-
2009-11-26 14:32 source
* Fixed handling of proc names with dots
@@ -17623,10 +8983,6 @@
2009-11-06 16:09 source
- file oplzillow.owl was added on branch V6_0_0-DEVEL on 2009-11-06 16:49:02 +0000
-
-2009-11-06 16:09 source
-
* Fixed Zillow cartridge
2009-11-06 12:09 source
@@ -17694,14 +9050,6 @@
* Fixed broken FOAF generation
-2009-11-04 01:52 source
-
- file ms_spreadsheet2rdf.xsl was added on branch V6_0_0-DEVEL on 2009-11-04 09:45:46 +0000
-
-2009-11-04 01:52 source
-
- file ms_document2rdf.xsl was added on branch V6_0_0-DEVEL on 2009-11-04 09:45:46 +0000
-
2009-11-04 01:50 source
* Added more checks for CN, hostname and keys
@@ -17761,14 +9109,6 @@
2009-10-29 21:06 source
- file typeahead.css was added on branch V6_0_0-DEVEL on 2009-10-29 21:08:03 +0000
-
-2009-10-29 21:06 source
-
- file typeahead.js was added on branch V6_0_0-DEVEL on 2009-10-29 21:08:03 +0000
-
-2009-10-29 21:06 source
-
* Fixed UI profile full name
* Fixed UI profile address
* Fixed suggestions lookup
@@ -17813,22 +9153,6 @@
* Added rule for bin objects
-2009-10-29 19:34 source
-
- file chrome-logo.png was added on branch V6_0_0-DEVEL on 2009-10-29 20:10:10 +0000
-
-2009-10-29 19:34 source
-
- file firefox-logo.png was added on branch V6_0_0-DEVEL on 2009-10-29 20:10:10 +0000
-
-2009-10-29 19:34 source
-
- file opera-logo.png was added on branch V6_0_0-DEVEL on 2009-10-29 20:10:10 +0000
-
-2009-10-29 19:34 source
-
- file safari-logo.png was added on branch V6_0_0-DEVEL on 2009-10-29 20:10:10 +0000
-
2009-10-28 21:34 source
* Rebuild drivers
@@ -17849,10 +9173,6 @@
* Fixed navigation
* Fixed scheme support for feed
-2009-10-28 21:25 source
-
- file oplebay.owl was added on branch V6_0_0-DEVEL on 2009-10-28 21:30:15 +0000
-
2009-10-28 21:20 source
* Fixed problems with UI of RDF views
@@ -17900,34 +9220,10 @@
* Added support for comparison of XML trees
-2009-10-26 16:27 source
-
- file conversation.js was added on branch V6_0_0-DEVEL on 2009-10-28 21:32:14 +0000
-
-2009-10-26 16:00 source
-
- file html.png was added on branch V6_0_0-DEVEL on 2009-10-28 21:30:16 +0000
-
-2009-10-26 16:00 source
-
- file mail.png was added on branch V6_0_0-DEVEL on 2009-10-28 21:30:16 +0000
-
-2009-10-26 16:00 source
-
- file oplamazon.owl was added on branch V6_0_0-DEVEL on 2009-10-28 21:30:15 +0000
-
-2009-10-26 16:00 source
-
- file phone.gif was added on branch V6_0_0-DEVEL on 2009-10-28 21:30:16 +0000
-
2009-10-26 09:29 source
* Added missing image
-2009-10-26 09:29 source
-
- file virt_power_no_border.png was added on branch V6_0_0-DEVEL on 2009-10-26 09:29:40 +0000
-
2009-10-26 09:26 source
* Fixed menus
diff --git a/LICENSE b/LICENSE
index 4e83c45..33f11a8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
OpenLink Software's Virtuoso Open-Source (VOS) project
-Copyright (C) 1998-2012 OpenLink Software
+Copyright (C) 1998-2010 OpenLink Software
This software is licensed under the GNU General Public License (see
COPYING).
diff --git a/Makefile.am b/Makefile.am
index 15f4826..8e5e9fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -103,6 +103,10 @@ EXTRA_DIST = \
debian/virtuoso-opensource.postrm.debhelper \
debian/virtuoso-opensource.prerm.debhelper \
debian/virtuoso-opensource.substvars \
- windows/*.bat \
- windows/*.sln \
- windows/*.vcxproj
+ win32/mkperlenv.pl \
+ win32/mkpythonenv.py \
+ win32/*.bat \
+ win32/*.vcproj \
+ win32/*.sln \
+ win64/*.vcproj \
+ win64/*.sln
diff --git a/Makefile.in b/Makefile.in
index 6e70e18..4e4e784 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -180,7 +180,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -229,7 +228,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -281,7 +279,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -328,6 +325,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -397,9 +395,13 @@ EXTRA_DIST = \
debian/virtuoso-opensource.postrm.debhelper \
debian/virtuoso-opensource.prerm.debhelper \
debian/virtuoso-opensource.substvars \
- windows/*.bat \
- windows/*.sln \
- windows/*.vcxproj
+ win32/mkperlenv.pl \
+ win32/mkpythonenv.py \
+ win32/*.bat \
+ win32/*.vcproj \
+ win32/*.sln \
+ win64/*.vcproj \
+ win64/*.sln
all: all-recursive
diff --git a/NEWS b/NEWS
index d1e106c..0e39f69 100644
--- a/NEWS
+++ b/NEWS
@@ -1,66 +1,3 @@
-Mar 15, 2012, V6.1.5:
- * Database engine
- - Added support for SPARQL 1.1 WITH, USING, NAMED
- - Added support for SPARQL 1.1 Update
- - Added support for SPARQL 1.1 Functions
- - Added support for SPARQL Macro Library syntax
- - Added support for SPARQL DESCRIBE modes OBJCBD and SCBD
- - Added support for SPARQL DESCRIBE/CONSTRUCT to return 3 column
- resultset when using ODBC/JDBC/.NET by default
- - Added support for wide strings in all SPARQL serializers
- - Added common infrastructure for RDF-specific XML parsers
- - Added new RDF/XML printer (faster + pretty print)
- - Added TRIG formatter
- - Added support for r2rml graph generation
- - Added support for XHTML+Microdata
- - Added human-readable HTML output for DESCRIBE (list and table)
- - Added support for SELECT scalar_expression subqueries without FROM
- clause to avoid extra lock on fake subqueries
- - Added DBpedia vad package
- - Added support for scoping ACL to a virtual dir
- - Added new Visual Studio 11 project files for both 32bit and 64bit builds
- - Fixed RDF/XML parser to pass w3c tests dated 2003-Nov.
- - Fixed JSON-LD syntax to match recent draft of the spec
- - Fixed CONSTRUCT with constant string objects with language
- - Fixed output of bnodes in RDF/XML format
- - Fixed support for sparql load <file:///....> i.e. with absolute path
- from system root
- - Fixed issue with uninitialized variables
- - Fixed use portable method for escaping symbol for gawk 3 and 4
- - Fixed issue with semaphores on Mac OS X 10.7
- - Fixed compiler warnings
- - Fixed memory leaks
- - Updated documentation
-
- * SPARQL and RDF
- - Added new cartridges for Angellis. Klout, New York Times Article,
- Social Statistics and Stackoverflow
- - Added new ontolgies for Angellis, Cert, Crunchbase, DBpedia
- Spotlight, NYT, LinkedIn, oplbase, oplweb
- - Added Linkedin Shares cartridge
- - Added support for extracting all meta and link head-element data from XHTML documents
- - Added post-processing script for generating owl:sameAs links for
- co-reference resolution
- - Added support for get:soft "add" and get:cartridge
- - Added support for paging over large collections to FB cartridge
- - Fixed Amazon cartridge to work with new Product Advertising API
- - Fixed handling of # in About header
- - Fixed qualify opl:mentions with cartridge identifier
- - Fixed social-profile-url property across social cartridges
-
- * ODS Applications
- - Added support for WebID 1.0 spec
- - Added WebID WaterMark
- - Added support for CalDAV and CardDAV
- - Added ACL editing for DETs
- - Added folder selecton for SyncML
- - Added option to import rdf data from file
- - Added rule for briefcase folder IRIs
- - Added VCARD Property Grouping
- - Added private graphs data
- - Added option to deactivate user
-
-
Oct 31, 2011, V6.1.4:
* Upgrading from previous versions
- Added information about upgrading from previous 6.1.x to 6.1.4
diff --git a/README b/README
index 32302d5..5899fe4 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
Virtuoso Open-Source Edition: Building
======================================
-Copyright (C) 1998-2012 OpenLink Software <vos.admin at openlinksw.com>
+Copyright (C) 1998-2010 OpenLink Software <vos.admin at openlinksw.com>
Table of Contents
@@ -34,9 +34,6 @@ Table of Contents
* .... Mac OS X 10.6 32-bit
* .... Mac OS X 10.6 64-bit
* .... Mac OS X 10.6 Universal
- * .... Mac OS X 10.7 32-bit
- * .... Mac OS X 10.7 64-bit
- * .... Mac OS X 10.7 Universal
* .... Solaris 2.x i386 32-bit
* .... Solaris 2.10 Opteron 32-bit
* .... Solaris 2.10 Opteron 64-bit
@@ -316,24 +313,6 @@ Mac OS X 10.6 Universal
export CFLAGS
./configure --disable-dependency-tracking ...
-Mac OS X 10.7 32-bit
---------------------
- CFLAGS="-O -m32 -mmacosx-version-min=10.7"
- export CFLAGS
- ./configure ...
-
-Mac OS X 10.7 64-bit
---------------------
- CFLAGS="-O -m64 -mmacosx-version-min=10.7"
- export CFLAGS
- ./configure ...
-
-Mac OS X 10.7 Universal
------------------------
- CFLAGS="-O -arch i386 -arch x86_64 -mmacosx-version-min=10.7"
- export CFLAGS
- ./configure --disable-dependency-tracking ...
-
Solaris 2.x i386 32-bit
-----------------------
Note: on Solaris or Open Solaris we recommend you use gmake either from
diff --git a/README.CVS b/README.CVS
index 93f435a..40b42a3 100644
--- a/README.CVS
+++ b/README.CVS
@@ -1,21 +1,7 @@
Using Virtuoso Open Source Edition CVS Tree
===========================================
-Copyright (C) 1998-2012 OpenLink Software <vos.admin at openlinksw.com>
-
-
-NOTICE
-======
-
-The Virtuoso Open Source development team has decided to stop using
-CVS in favour of GIT. The VOS 6.1.5 version will be the last version
-in CVS tree on sourceforge.net. Users who are tracking the Virtuoso
-Open Source project or want to aid in it's development are encouraged
-to move with us to github via:
-
- https://github.com/openlink/virtuoso-opensource
-
-For information about GIT see also README.GIT
+Copyright (C) 1998-2010 by OpenLink Software <vos.admin at openlinksw.com>
Introduction
diff --git a/README.GIT b/README.GIT
deleted file mode 100644
index 8cf774e..0000000
--- a/README.GIT
+++ /dev/null
@@ -1,152 +0,0 @@
-Using Virtuoso Open Source Edition GIT Tree
-===========================================
-
-Copyright (C) 1998-2012 OpenLink Software <vos.admin at openlinksw.com>
-
-
-Introduction
-============
-
-This document describes how to checkout a copy of the git tree for
-development purposes. It also lists the packages that need to be
-installed prior to generating the necessary scripts and Makefiles to
-build the project.
-
-Git access is only needed for developers who want to actively track
-progress of the Virtuoso source code and contribute bugfixes or
-enhancements to the project. It requires basic knowledge of git
-itself, the general layout of open source and GNU projects, the use
-of autoconf and automake etc, which is beyond the scope of this
-document.
-
-If you have any questions, please email us at <vos.admin at openlinksw.com>.
-
-
-Git Archive Server Access
-=========================
-
-For main development OpenLink Software will publish the Virtuoso
-Open Source tree to GitHub and encourage everyone who is interested
-in tracking the project, to make an account there.
-
-Users who mainly just want to track the code can use the following
-command to get a copy of the tree:
-
- $ git clone git://github.com/openlink/virtuoso-opensource.git
-
-
-At this point you can create your own work branch based on any of
-the branches available, create bugfixes and commit them to your own
-branch and then use the 'git format-patch' command to generate the
-appropriate diffs to send to:
-
- vos.admin at openlinksw.com
-
-
-Developers are encouraged to fork the project using GitHub, create
-their own branches to make enhancements/bugfixes and then send pull
-requests using the excellent GitHub interface for the OpenLink team
-to examine and incorporate the fixes into the master tree for an
-upcoming release.
-
-Github has excellent documentation on how to fork a project, send
-pull requests, track the project etc. on:
-
- http://help.github.com/
-
-
-OpenLink Software will continue to use sourceforge.net for the
-source tarball releases and certain binary releases, and for
-completenes will also provides read-only Git Archive access.
-
-For more information read:
-
- https://sourceforge.net/scm/?type=git&group_id=161622
-
-
-
-
-Package Dependencies
-====================
-
-To generate the configure script and all other build files necessary,
-please make sure the following packages and recommended versions are
-installed on your system.
-
- Package Version From
- autoconf 2.57 http://www.gnu.org/software/autoconf/
- automake 1.9 http://www.gnu.org/software/automake/
- libtool 1.5 http://www.gnu.org/software/libtool/
- flex 2.5.33 http://flex.sourceforge.net/
- bison 2.3 http://www.gnu.org/software/bison/
- gperf 2.7.2 http://www.gnu.org/software/gperf/
- gawk 3.1.1 http://www.gnu.org/software/gawk/
- m4 1.4.1 http://www.gnu.org/software/m4/
- make 3.79.1 http://www.gnu.org/software/make/
- OpenSSL 0.9.7 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
-components.
-
-The above version are the minimum recommended versions of these
-packages. Older version of these packages can sometimes be used, but
-could cause build problems.
-
-To check the version number of the tools installed on your system,
-use one of the following commands:
-
- * autoconf --version
- * automake --version
- * libtoolize --version
- * flex --version
- * bison --version
- * gperf --version
- * gawk --version
- * m4 --version
- * make --version
- * openssl version
-
-If you have an older version than automake version 1.9 you can edit
-the configure.in script around line 47 using the examples provided for
-each version.
-
-
-Diskspace Requirements
-======================
-
-The build produces a demo database and Virtuoso application packages
-that are quite large. At least 800 MB of free space should be available
-in the build file system.
-
-When running `make install', the target file system should have about 460
-MB free. By default, the install target directories are under /usr/local/,
-but you can specify
-
- ./configure --prefix=/path/to/dir
-
-instead.
-
-The minimum working configuration consists of the server executable
-and config files plus database, no more than a few MB for the server
-executable, depending on platform and options.
-
-
-Generate build files
-====================
-
-To generate the configure script and all related build files, use use
-the supplied script in your CVS checkout directory:
-
- $ ./autogen.sh
-
-If the above command succeed without any error messages, please use the
-following command to check out all the options you can use:
-
- $ ./configure --help
-
-Certain build targets are only enabled when the --enable-maintainer-mode
-flag is added to configure.
-
-Please read the files INSTALL and README in this directory for further
-information on how to configure the package and install it on your system.
diff --git a/appsrc/Makefile.am b/appsrc/Makefile.am
index 80e4fc4..d271b54 100644
--- a/appsrc/Makefile.am
+++ b/appsrc/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/appsrc/Makefile.in b/appsrc/Makefile.in
index 63585ba..ef7a5fe 100644
--- a/appsrc/Makefile.in
+++ b/appsrc/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -139,7 +139,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -188,7 +187,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -240,7 +238,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -287,6 +284,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/appsrc/ODS-Addressbook/Makefile.am b/appsrc/ODS-Addressbook/Makefile.am
index 46acc3e..b4ce644 100644
--- a/appsrc/ODS-Addressbook/Makefile.am
+++ b/appsrc/ODS-Addressbook/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -46,7 +46,6 @@ clean-local:
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Addressbook/Makefile.in b/appsrc/ODS-Addressbook/Makefile.in
index 5b483db..356db60 100644
--- a/appsrc/ODS-Addressbook/Makefile.in
+++ b/appsrc/ODS-Addressbook/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -311,7 +309,6 @@ CLEANFILES = \
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Addressbook/make_vad.sh b/appsrc/ODS-Addressbook/make_vad.sh
index e09d5d1..325abc6 100755
--- a/appsrc/ODS-Addressbook/make_vad.sh
+++ b/appsrc/ODS-Addressbook/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.47.2.36 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.47.2.34 2011/07/04 10:04:00 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -30,7 +30,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.0.0"
+VERSION="1.4.71"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -87,56 +87,6 @@ else
myrm=$RM
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
- done
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
- rm -f version.tmp
- echo "$VERSION" > vad_version
- fi
-}
-
virtuoso_start() {
echo "Starting $SERVER"
echo $BUILD
@@ -272,7 +222,7 @@ sticker_init() {
echo " <name package=\"AddressBook\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS AddressBook Manager\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -284,8 +234,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.85.05\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-12-29 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.82.42\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -313,7 +263,6 @@ sticker_init() {
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/AddressBook/sql/ab-a-update.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/AddressBook/sql/ab-a-api.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/AddressBook/sql/sioc_ab.sql', 1, 'report', $ISDAV);" >> $STICKER
- echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/AddressBook/sql/DET_CardDAV.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " ]]>" >> $STICKER
echo " </sql>" >> $STICKER
echo " <sql purpose=\"pre-uninstall\">" >> $STICKER
@@ -428,7 +377,6 @@ echo '----------------------'
STOP_SERVER
directory_clean
-version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -445,6 +393,7 @@ virtuoso_shutdown
STOP_SERVER
chmod 644 ods_addressbook_dav.vad
chmod 644 ods_addressbook_filesystem.vad
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -454,7 +403,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Addressbook/sql/DET_CardDAV.sql b/appsrc/ODS-Addressbook/sql/DET_CardDAV.sql
deleted file mode 100755
index 59bb619..0000000
--- a/appsrc/ODS-Addressbook/sql/DET_CardDAV.sql
+++ /dev/null
@@ -1,833 +0,0 @@
---
---
--- $Id: DET_CardDAV.sql,v 1.1.2.1 2012/03/08 12:08:38 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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
---
-use DB
-;
-
-create function "CardDAV_FIXNAME" (in mailname any) returns varchar
-{
- return
- replace (
- replace (
- replace (
- replace (
- replace (
- replace (
- replace (
- replace (
- replace (mailname, '/', '_'), '\\', '_'), ':', '_'), '+', '_'), '\"', '_'), '[', '_'), ']', '_'), '''', '_'), ' ', '_');
-}
-;
-
-create function "CardDAV_COMPOSE_ICS_NAME" (in uid varchar) returns varchar
-{
- return replace(sprintf('%s.vcf', uid), '@', '-');
-}
-;
-
-create function "CardDAV_ACCESS_PARAMS" (
- in detcol_id any,
- out access varchar,
- out gid integer,
- out uid integer)
-{
- whenever not found goto ret;
-
- access := '110000000NN';
- gid := http_nogroup_gid ();
- uid := http_nobody_uid ();
- if (isinteger (detcol_id))
- select COL_PERMS, COL_GROUP, COL_OWNER into access, gid, uid from WS.WS.SYS_DAV_COL where COL_ID = detcol_id;
-
- ret: ;
-}
-;
-
---| This matches DAV_AUTHENTICATE (in id any, in what char(1), in req varchar, in a_uname varchar, in a_pwd varchar, in a_uid integer := null)
---| The difference is that the DET function should not check whether the pair of name and password is valid; the auth_uid is not a null already.
-create function "CardDAV_DAV_AUTHENTICATE" (
- in id any,
- in what char(1),
- in req varchar,
- in auth_uname varchar,
- in auth_pwd varchar,
- in auth_uid integer)
-{
- -- dbg_obj_princ ('CardDAV_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, http_dav_uid(), ')');
- declare domain_id, item_id integer;
- declare rc any;
-
- rc := '';
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return -1;
-
- if ('R' = what)
- {
- item_id := id[4];
- if (not exists (select 1 from AB.WA.PERSONS where P_ID = item_id))
- return -1;
-
- rc := AB.WA.acl_check (domain_id, item_id);
- }
- else
- {
- rc := AB.WA.acl_check (domain_id);
- }
- if (rc <> '')
- {
- if ((rc = 'R') and (req = '1__'))
- return http_nobody_uid ();
-
- if ((rc = 'W') and (req = '11_'))
- return http_nobody_uid ();
- }
- return -20;
-}
-;
-
---| This exactly matches DAV_AUTHENTICATE_HTTP (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer
---| The function should fully check access because DAV_AUTHENTICATE_HTTP do nothing with auth data either before or after calling this DET function.
---| Unlike DAV_AUTHENTICATE, user name passed to DAV_AUTHENTICATE_HTTP header may not match real DAV user.
---| If DET call is successful, DAV_AUTHENTICATE_HTTP checks whether the user have read permission on mount point collection.
---| Thus even if DET function allows anonymous access, the whole request may fail if mountpoint is not readable by public.
-create function "CardDAV_DAV_AUTHENTICATE_HTTP" (
- in id any,
- in what char(1),
- in req varchar,
- in can_write_http integer,
- inout a_lines any,
- inout a_uname varchar,
- inout a_pwd varchar,
- inout a_uid integer,
- inout a_gid integer,
- inout _perms varchar) returns integer
-{
- -- dbg_obj_princ ('CardDAV_DAV_AUTHENTICATE_HTTP (', id, what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
- declare domain_id, item_id integer;
- declare rc any;
-
- rc := '';
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return -1;
-
- if ('R' = what)
- {
- item_id := id[4];
- if (not exists (select 1 from AB.WA.PERSONS where P_ID = item_id))
- return -1;
-
- rc := AB.WA.acl_check (domain_id, item_id);
- }
- else
- {
- rc := AB.WA.acl_check (domain_id);
- }
- if (rc <> '')
- {
- a_uid := http_nobody_uid ();
- a_gid := http_nogroup_gid ();
- if (rc = 'R')
- _perms := '1__';
- else if (rc = 'W')
- _perms := '11_';
-
- return a_uid;
- }
- return -20;
-}
-;
-
---| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
-create function "CardDAV_DAV_GET_PARENT" (in id any, in st char(1), in path varchar) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_GET_PARENT (', id, st, path, ')');
- return -20;
-}
-;
-
---| When DAV_COL_CREATE_INT calls DET function, authentication, check for lock and check for overwrite are passed, uid and gid are translated from strings to IDs.
---| Check for overwrite, but the deletion of previously existing collection should be made by DET function.
-create function "CardDAV_DAV_COL_CREATE" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_COL_CREATE (', detcol_id, path_parts, permissions, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| It looks like that this is redundant and should be removed at all.
-create function "CardDAV_DAV_COL_MOUNT" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_COL_MOUNT (', detcol_id, path_parts, full_mount_path, mount_det, permissions, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| It looks like that this is redundant and should be removed at all.
-create function "CardDAV_DAV_COL_MOUNT_HERE" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_COL_MOUNT_HERE (', parent_id, full_mount_path, permissions, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| When DAV_DELETE_INT calls DET function, authentication and check for lock are passed.
-create function "CardDAV_DAV_DELETE" (in detcol_id any, in path_parts any, in what char(1), in silent integer, in auth_uid integer) returns integer
-{
- --dbg_obj_princ ('CardDAV_DAV_DELETE (', detcol_id, path_parts, what, silent, auth_uid, ')');
- declare top_id any;
- declare rc, muser_id, domain_id integer;
-
- top_id := "CardDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, 'R', muser_id, domain_id);
- if (top_id = -1)
- return -20;
-
- AB.WA.contact_delete (top_id[4], domain_id);
- return 1;
-}
-;
-
---| When DAV_RES_UPLOAD_STRSES_INT calls DET function, authentication and check for locks are performed before the call.
---| There's a special problem, known as 'Transaction deadlock after reading from HTTP session'.
---| The DET function should do only one INSERT of the 'content' into the table and do it as late as possible.
---| The function should return -29 if deadlocked or otherwise broken after reading blob from HTTP.
-create function "CardDAV_DAV_RES_UPLOAD" (in detcol_id any, in path_parts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- --dbg_obj_princ ('CardDAV_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', content, type, permissions, uid, gid, auth_uid, ')');
- declare top_id, res any;
- declare muser_id, domain_id, rc integer;
-
- top_id := "CardDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, 'R', muser_id, domain_id);
- if (top_id = -1)
- {
- ;
- }
- else
- {
- AB.WA.contact_delete (top_id[4], domain_id);
- }
- declare real_content any;
- if (__tag (content) = 126)
- {
- real_content := http_body_read (1);
- real_content := string_output_string (real_content); -- check if bellow code can work with string session and if so remove this line
- content := real_content;
- }
- res := AB.WA.import_vcard (domain_id, content);
- if (length(res) > 0)
- return vector (UNAME'CardDAV', detcol_id, uid, domain_id, path_parts[1], 0);
-
- return -20;
-}
-;
-
---| When DAV_PROP_REMOVE_INT calls DET function, authentication and check for locks are performed before the call.
---| The check whether it's a system name or not is _not_ permitted.
-create function "CardDAV_DAV_PROP_REMOVE" (in id any, in what char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer
-{
- -- dbg_obj_princ ('CardDAV_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
- return -20;
-}
-;
-
---| When DAV_PROP_SET_INT calls DET function, authentication and check for locks are performed before the call.
---| The check whether it's a system property or not is _not_ permitted and the function should return -16 for live system properties.
-create function "CardDAV_DAV_PROP_SET" (
- in id any,
- in what char(0),
- in propname varchar,
- in propvalue any,
- in overwrite integer,
- in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
- if (propname = 'virt:aci_meta')
- {
- declare domain_id, item_id integer;
-
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return -1;
-
- if ('R' = what)
- {
- item_id := id[4];
- if (not exists (select 1 from AB.WA.PERSONS where P_ID = item_id))
- return -1;
-
- AB.WA.contact_update2 (item_id, domain_id, 'P_ACL', serialize (propvalue));
- return 1;
- }
- else
- {
- update DB.DBA.WA_INSTANCE
- set WAI_ACL = serialize (propvalue)
- where WAI_ID = domain_id;
- return 1;
- }
- return -16;
- }
- if (propname[0] = 58)
- return -16;
-
- return -20;
-}
-;
-
---| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
-create function "CardDAV_DAV_PROP_GET" (
- in id any,
- in what char(0),
- in propname varchar,
- in auth_uid integer)
-{
- -- dbg_obj_princ ('CardDAV_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
- if ('virt:aci_meta' = propname)
- {
- declare domain_id, item_id integer;
-
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return -1;
-
- if ('R' = what)
- {
- item_id := id[4];
- if (not exists (select 1 from AB.WA.PERSONS where P_ID = item_id))
- return -1;
-
- return (select deserialize (P_ACL) from AB.WA.PERSONS where P_DOMAIN_ID = domain_id and P_ID = item_id);
- }
- else
- {
- return (select deserialize (WAI_ACL) from DB.DBA.WA_INSTANCE where WAI_ID = domain_id);
- }
- }
- if (':virtdet' = propname)
- {
- if ('R' = what)
- return null;
-
- return '';
- }
- return -11;
-}
-;
-
---| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
---| The returned list should contain only user properties.
-create function "CardDAV_DAV_PROP_LIST" (in id any, in what char(0), in propmask varchar, in auth_uid integer)
-{
- -- dbg_obj_princ ('CardDAV_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
- return vector ();
-}
-;
-
---| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
-create function "CardDAV_DAV_DIR_SINGLE" (in id any, in what char(0), in path any, in auth_uid integer) returns any
-{
- declare domain_id integer;
- declare colname, fullpath, rightcol varchar;
- declare maxrcvdate datetime;
- declare owner_gid, owner_uid integer;
- declare access varchar;
-
- "CardDAV_ACCESS_PARAMS" (id[1], access, owner_gid, owner_uid);
-
- domain_id := id[3];
- if (maxrcvdate is null)
- maxrcvdate := coalesce ( (select max(P_UPDATED) from AB.WA.PERSONS where P_DOMAIN_ID = domain_id), cast ('1980-01-01' as datetime));
-
- if (cast (maxrcvdate as integer) = 0)
- maxrcvdate := cast ('1980-01-01' as datetime);
-
- colname := (select "CardDAV_FIXNAME" (C.WAI_NAME)
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = id[2]
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_TYPE_NAME = 'AddressBook'
- and C.WAI_ID = domain_id);
- if (DAV_HIDE_ERROR (colname) is null)
- return -1;
-
- if (path is not null)
- {
- rightcol := path[length(path) - 2];
- if ('C' = what)
- return vector (DAV_CONCAT_PATH ('/', path), 'C', 0, maxrcvdate, id, access, 0, id[2], maxrcvdate, 'dav/unix-directory', rightcol );
- }
- fullpath := DAV_CONCAT_PATH (DAV_SEARCH_PATH (id[1], 'C'), colname || '/');
- if ('C' = what)
- {
- if (id[4] > 0)
- return -1;
-
- return vector (fullpath, 'C', 0, maxrcvdate, id, access, 0, id[2], maxrcvdate, 'dav/unix-directory', colname );
- }
- for (select "CardDAV_COMPOSE_ICS_NAME"(P_UID) as orig_mname, P_UPDATED from AB.WA.PERSONS where P_ID = id[4]) do
- return vector (fullpath || orig_mname, 'R', 1024, P_UPDATED, id, access, 0, id[2], P_UPDATED, 'text/vcard', orig_mname);
-
- return -1;
-}
-;
-
---| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
-create function "CardDAV_DAV_DIR_LIST" (
- in detcol_id any,
- in path_parts any,
- in detcol_path varchar,
- in name_mask varchar,
- in recursive integer,
- in auth_uid integer) returns any
-{
- --dbg_obj_princ ('CardDAV_DAV_DIR_LIST (', detcol_id, path_parts, detcol_path, name_mask, recursive, auth_uid, ')');
- declare domain_id, owner_gid, owner_uid integer;
- declare top_davpath, access varchar;
- declare res any;
- declare top_id, descnames any;
- declare what char (1);
-
- "CardDAV_ACCESS_PARAMS" (detcol_id, access, owner_gid, owner_uid);
- what := case when ((0 = length (path_parts)) or ('' = path_parts[length (path_parts) - 1])) then 'C' else 'R' end;
- if (isarray (detcol_id) and (recursive = -1))
- return "CardDAV_DAV_DIR_SINGLE" (detcol_id, what, CardDAV_DAV_SEARCH_PATH (detcol_id, what), auth_uid);
-
- domain_id := 0;
- if ('C' = what and 1 = length(path_parts))
- {
- top_id := vector (UNAME'CardDAV', detcol_id, owner_uid, 0, 0, 0); -- may be a fake id because top_id[3] may be NULL
- } else {
- top_id := "CardDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, what, owner_uid, domain_id);
- }
- if (DAV_HIDE_ERROR (top_id) is null)
- return vector();
-
- top_davpath := DAV_CONCAT_PATH (detcol_path, path_parts);
- if ('R' = what)
- return vector ("CardDAV_DAV_DIR_SINGLE" (top_id, what, top_davpath, auth_uid));
-
- res := vector();
- if ('C' = what)
- {
- -- Top level
- if (top_id[3] = 0)
- {
- for select "CardDAV_FIXNAME"(C.WAI_NAME) as orig_name,
- C.WAI_ID as dom_id
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = owner_uid
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_TYPE_NAME = 'AddressBook'
- do
- {
- res := vector_concat (res, vector (vector (DAV_CONCAT_PATH (top_davpath, orig_name) || '/', 'C', 0, now(),
- vector (UNAME'CardDAV', detcol_id, owner_uid, dom_id, 0, 0),
- access, owner_gid, owner_uid, now(), 'dav/unix-directory', orig_name) ) );
- }
- return res;
- }
- }
- for select "CardDAV_COMPOSE_ICS_NAME"(P_UID) as orig_mname, P_ID, P_UPDATED
- from AB.WA.PERSONS
- where P_DOMAIN_ID = top_id[3]
- do
- {
- res := vector_concat (res, vector (vector (DAV_CONCAT_PATH (top_davpath, orig_mname), 'R', 1024, P_UPDATED,
- vector (UNAME'CardDAV', detcol_id, owner_uid, top_id[3], P_ID, 0),
- access, owner_gid, owner_uid, P_UPDATED, 'text/vcard', orig_mname) ) );
- }
- return res;
-}
-;
-
-create procedure "CardDAV_DAV_FC_PRED_METAS" (inout pred_metas any)
-{
- pred_metas := vector(
- 'P_ID', vector ('EVENTS' , 0, 'integer', 'P_ID' ),
- 'P_DOMAIN_ID', vector ('EVENTS' , 0, 'integer', 'P_DOMAIN_ID' ),
- 'RES_NAME', vector ('EVENTS' , 0, 'varchar' , '"CardDAV_COMPOSE_ICS_NAME"(_top.P_UID)'),
- 'RES_FULL_PATH', vector ('EVENTS' , 0, 'varchar' , 'concat (DAV_CONCAT_PATH (_param.detcolpath, ''addressbook''), "CardDAV_FIXNAME" (WAI_NAME), ''/'', "CardDAV_COMPOSE_ICS_NAME" (_top.P_UID)'),
- 'RES_TYPE', vector ('EVENTS' , 0, 'varchar' , '(''text/vcard'')'),
- 'RES_OWNER_ID', vector ('SYS_USERS' , 0, 'integer' , 'U_ID' ),
- 'RES_OWNER_NAME', vector ('SYS_USERS' , 0, 'varchar' , 'U_NAME' ),
- 'RES_GROUP_ID', vector ('SYS_USERS' , 0, 'integer' , 'http_nogroup_gid()' ),
- 'RES_GROUP_NAME', vector ('SYS_USERS' , 0, 'varchar' , '(''nogroup'')' ),
- 'RES_COL_FULL_PATH', vector ('EVENTS' , 0, 'varchar' , 'concat (DAV_CONCAT_PATH (_param.detcolpath, ''addressbook''), "CardDAV_FIXNAME" (WAI_NAME), ''/'')' ),
- 'RES_COL_NAME', vector ('EVENTS' , 0, 'varchar' , '"CardDAV_FIXNAME" (WAI_NAME)' ),
- 'RES_CR_TIME', vector ('EVENTS' , 0, 'datetime' , 'P_UPDATED' ),
- 'RES_MOD_TIME', vector ('EVENTS' , 0, 'datetime' , 'P_UPDATED' ),
- 'RES_PERMS', vector ('EVENTS' , 0, 'varchar' , '(''110100000RR'')' ),
- 'RES_CONTENT', vector ('EVENTS' , 0, 'text' , 'P_INTERESTS' ),
- 'PROP_NAME', vector ('EVENTS' , 0, 'varchar' , '(''P_INTERESTS'')' ),
- 'PROP_VALUE', vector ('SYS_DAV_PROP' , 1, 'text' , 'P_INTERESTS' ),
- 'RES_TAGS', vector ('all-tags' , 0, 'varchar' , 'P_TAGS' ), -- 'varchar', not 'text-tag' because there's no free-text on union
- 'RES_PUBLIC_TAGS', vector ('public-tags' , 0, 'varchar' , 'P_TAGS' ), -- 'varchar', not 'text-tag' because there's no free-text in table!
- 'RES_PRIVATE_TAGS', vector ('private-tags' , 0, 'varchar' , 'P_TAGS' ), -- 'varchar', not 'text-tag' because there's no free-text in table!
- 'RDF_PROP', vector ('fake-prop' , 1, 'varchar' , NULL ),
- 'RDF_VALUE', vector ('fake-prop' , 2, 'XML' , NULL ),
- 'RDF_OBJ_VALUE', vector ('fake-prop' , 3, 'XML' , NULL )
- );
-}
-;
-
-create procedure "CardDAV_DAV_FC_TABLE_METAS" (inout table_metas any)
-{
- table_metas := vector (
- 'PERSONS' , vector ( '' ,
- '' ,
- 'P_NAME' , 'P_NAME' , '[__quiet] /' ),
- 'WA_INSTANCE' , vector ( '' ,
- '' ,
- 'WAI_NAME' , 'WAI_NAME' , '[__quiet] /' ),
- 'WA_MEMBER' , vector ( '' ,
- '' ,
- 'WAM_INST' , 'WAM_INST' , '[__quiet] /' ),
-
- 'SYS_USERS' , vector ( '' ,
- '' ,
- NULL , NULL , NULL ),
- 'public-tags' , vector ( ' ' ,
- '' ,
- 'P_TAGS' , 'P_TAGS' , NULL ),
- 'private-tags' , vector ( ' ' ,
- ' ' ,
- 'P_TAGS' , 'P_TAGS' , NULL ),
- 'all-tags' , vector ( ' ' ,
- ' ' ,
- 'P_TAGS' , 'P_TAGS' , NULL ),
- 'fake-prop' , vector ( '\n inner join WS.WS.SYS_DAV_PROP as ^{alias}^ on ((^{alias}^.PROP_PARENT_ID is null) and (^{alias}^.PROP_TYPE = ''R'')^{andpredicates}^)' ,
- '\n exists (select 1 from WS.WS.SYS_DAV_PROP as ^{alias}^ where (^{alias}^.PROP_PARENT_ID is null) and (^{alias}^.PROP_TYPE = ''R'')^{andpredicates}^)' ,
- 'PROP_VALUE' , 'PROP_VALUE' , '[__quiet __davprop xmlns:virt="virt"] fakepropthatprobablyneverexists' )
- );
-}
-;
-
-create function "CardDAV_DAV_FC_PRINT_WHERE" (inout filter any, in param_uid integer) returns varchar
-{
- declare pred_metas, cmp_metas, table_metas any;
- declare used_tables any;
- -- dbg_obj_princ ('Blog_POST_DAV_FC_PRINT_WHERE (', filter, param_uid, ')');
- "CardDAV_DAV_FC_PRED_METAS" (pred_metas);
- DAV_FC_CMP_METAS (cmp_metas);
- "CardDAV_DAV_FC_TABLE_METAS" (table_metas);
- used_tables := vector(
- 'PERSONS', vector ('PERSONS', '_top', null, vector (), vector (), vector ()),
- 'WA_INSTANCE', vector ('WA_INSTANCE', '_instances', null, vector (), vector (), vector ()),
- 'WA_MEMBER', vector ('WA_MEMBER', '_members', null, vector (), vector (), vector ()),
- 'SYS_USERS', vector ('SYS_USERS', '_users', null, vector (), vector (), vector ())
- );
- return DAV_FC_PRINT_WHERE_INT (filter, pred_metas, cmp_metas, table_metas, used_tables, param_uid);
-}
-;
-
---| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
-create function "CardDAV_DAV_DIR_FILTER" (in detcol_id any, in path_parts any, in detcol_path any, inout compilation any, in recursive integer, in auth_uid integer) returns any
-{
- --dbg_obj_princ ('CardDAV_DAV_DIR_FILTER (', detcol_id, path_parts, detcol_path, compilation, recursive, auth_uid, ')');
- declare st, access, qry_text, execstate, execmessage varchar;
- declare res any;
- declare cond_list, execmeta, execrows any;
- declare sub, post_id, condtext, cond_key varchar;
- declare owner_gid, owner_uid, domain_id integer;
- "CardDAV_ACCESS_PARAMS" (detcol_id, access, owner_gid, owner_uid);
- vectorbld_init (res);
- sub := null;
- post_id := null;
- if (((length (path_parts) <= 1) and (recursive <> 1)) or (length (path_parts) > 2))
- {
- -- dbg_obj_princ ('\r\nGoto skip_post_level\r\n');
- goto finalize;
- }
- if (length (path_parts) >= 2)
- {
- sub := path_parts[0];
- if (sub = 'addressbooks')
- {
- domain_id := coalesce ((select C.WAI_ID
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = owner_uid
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_TYPE_NAME = 'AddressBook'
- and "CardDAV_FIXNAME"(C.WAI_NAME) = path_parts[1]));
- if (domain_id is null)
- goto finalize;
- }
- else
- goto finalize;
- }
- cond_key := sprintf ('AddressBook&%d', coalesce (domain_id, 0));
- condtext := get_keyword (cond_key, compilation);
- if (condtext is null and 0)
- {
- cond_list := get_keyword ('', compilation);
- if (sub is not null)
- cond_list := vector_concat (cond_list, vector ( vector ('P_DOMAIN_ID', '=', domain_id)));
- condtext := "CardDAV_DAV_FC_PRINT_WHERE" (cond_list, auth_uid);
- compilation := vector_concat (compilation, vector (cond_key, condtext));
- }
- execstate := '00000';
- qry_text := 'select concat (DAV_CONCAT_PATH (_param.detcolpath, ''addressbook''), ''/'', "CardDAV_FIXNAME" (WAI_NAME), ''/'', "CardDAV_COMPOSE_ICS_NAME" (_top.P_UID)),
- ''R'', 1024, _top.P_UPDATED,
- vector (UNAME_ADDRESSBOOK(), ?, _users.U_ID, 3, _top.P_DOMAIN_ID, 0, 0, 0, 0),
- ''110100000RR'', http_nogroup_gid(), _users.U_ID, _top.P_UPDATED, ''text/vcard'', "CardDAV_COMPOSE_ICS_NAME" (_top.P_UID)
- from
- (select top 1 ? as detcolpath from WS.WS.SYS_DAV_COL) as _param,
- AB.WA.PERSONS as _top
- join DB.DBA.WA_INSTANCE as _instances on (WAI_ID = P_DOMAIN_ID and WAI_TYPE_NAME = ''AddressBook'')
- join DB.DBA.WA_MEMBER as _members on (WAM_MEMBER_TYPE = 1 and WAM_INST = WAI_NAME)
- join DB.DBA.SYS_USERS as _users on (WAM_USER = U_ID and U_ID = ?)
- ' || condtext;
- exec (qry_text, execstate, execmessage,
- vector (detcol_id, detcol_path, owner_uid),
- 100000000, execmeta, execrows );
- if ('00000' <> execstate)
- signal (execstate, execmessage || ' in ' || qry_text);
- vectorbld_concat_acc (res, execrows);
-finalize:
- vectorbld_final (res);
- return res;
-}
-;
-
-create function UNAME_ADDRESSBOOK () returns any
-{
- return UNAME'CardDAV';
-}
-;
-
-create function "CardDAV_DAV_SEARCH_ID_IMPL" (in detcol_id any, in path_parts any, in what char(1), inout muser_id integer, inout domain_id integer) returns any
-{
- --dbg_obj_princ ('CardDAV_DAV_SEARCH_ID_IMPL (', detcol_id, path_parts, what, muser_id, domain_id, ')');
- declare owner_gid, owner_uid, ctr, len integer;
- declare hitlist any;
- declare access, colpath varchar;
- "CardDAV_ACCESS_PARAMS" (detcol_id, access, owner_gid, owner_uid);
- muser_id := owner_uid;
- if (0 = length(path_parts))
- {
- if ('C' <> what)
- return -1;
- return vector (UNAME'CardDAV', detcol_id, owner_uid, domain_id, 0, 0);
- }
- if ('' = path_parts[length(path_parts) - 1])
- {
- if ('C' <> what)
- return -1;
- }
- else
- {
- if ('R' <> what)
- return -1;
- }
- len := length (path_parts) - 1;
- ctr := 0;
- while (ctr < len)
- {
- if (ctr = 0)
- {
- hitlist := vector ();
- for select C.WAI_ID as D_ID
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = owner_uid
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_TYPE_NAME = 'AddressBook'
- and "CardDAV_FIXNAME"(C.WAI_NAME) = path_parts[ctr]
- do
- {
- hitlist := vector_concat (hitlist, vector (D_ID));
- }
- if (length (hitlist) <> 1)
- return -1;
- domain_id := hitlist[0];
- }
- else if (ctr = 1 and len > 1)
- {
- return -1;
- }
- ctr := ctr + 1;
- }
- if ('C' = what)
- return vector (UNAME'CardDAV', detcol_id, owner_uid, domain_id, 0, 0);
- hitlist := vector ();
- for select distinct P_ID
- from AB.WA.PERSONS
- where "CardDAV_COMPOSE_ICS_NAME" (P_UID) = path_parts[ctr] and P_DOMAIN_ID = domain_id
- do
- {
- hitlist := vector_concat (hitlist, vector (P_ID));
- }
- if (length (hitlist) <> 1)
- return -1;
- return vector (UNAME'CardDAV', detcol_id, owner_uid, domain_id, hitlist[0], 0);
-}
-;
-
---| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
-create function "CardDAV_DAV_SEARCH_ID" (in detcol_id any, in path_parts any, in what char(1)) returns any
-{
- declare u_id, domain_id integer;
- domain_id := 0;
- --dbg_obj_princ ('CardDAV_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
- return "CardDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, what, u_id, domain_id);
-}
-;
-
---| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
-create function "CardDAV_DAV_SEARCH_PATH" (
- in id any,
- in what char(1)) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_SEARCH_PATH (', id, what, ')');
- declare path varchar;
- declare domain_id, item_id integer;
-
- path := DAV_SEARCH_PATH (id[1], 'C');
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return null;
-
- path := path || "CardDAV_FIXNAME" (AB.WA.domain_name (domain_id)) || '/';
- if ('C' = what)
- return path;
-
- item_id := id[4];
- for (select P_UID from AB.WA.PERSONS where P_ID = item_id) do
- return path || "CardDAV_COMPOSE_ICS_NAME" (P_UID);
-
- return null;
-}
-;
-
---| When DAV_COPY_INT calls DET function, authentication and check for locks are performed before the call, but no check for existing/overwrite.
-create function "CardDAV_DAV_RES_UPLOAD_COPY" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_RES_UPLOAD_COPY (', detcol_id, path_parts, source_id, what, overwrite_flags, permissions, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| When DAV_COPY_INT calls DET function, authentication and check for locks are performed before the call, but no check for existing/overwrite.
-create function "CardDAV_DAV_RES_UPLOAD_MOVE" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_RES_UPLOAD_MOVE (', detcol_id, path_parts, source_id, what, overwrite_flags, auth_uid, ')');
- return -20;
-}
-;
-
-
---| When DAV_RES_CONTENT or DAV_RES_COPY_INT or DAV_RES_MOVE_INT calls DET function, authentication is made.
---| If content_mode is 1 then content is a valid output stream before the call.
-create function "CardDAV_DAV_RES_CONTENT" (
- in id any,
- inout content any,
- out type varchar,
- in content_mode integer) returns integer
-{
- --dbg_obj_princ ('CardDAV_DAV_RES_CONTENT (', id, ', content, type, ', content_mode, ')');
- declare tz integer;
-
- type := 'text/vcard';
- whenever not found goto endline;
- if (id[4] is not null)
- content := AB.WA.export_vcard (id[3], vector(id[4]));
-
-endline:
- return 0;
-}
-;
-
---| This adds an extra access path to the existing resource or collection.
-create function "CardDAV_DAV_SYMLINK" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_SYMLINK (', detcol_id, path_parts, source_id, overwrite, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| This gets a list of resources and/or collections as it is returned by DAV_DIR_LIST and and writes the list of quads (old_id, 'what', old_full_path, dereferenced_id, dereferenced_full_path).
-create function "CardDAV_DAV_DEREFERENCE_LIST" (in detcol_id any, inout report_array any) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_DEREFERENCE_LIST (', detcol_id, report_array, ')');
- return -20;
-}
-;
-
---| This gets one of reference quads returned by ..._DAV_REREFERENCE_LIST() and returns a record (new_full_path, new_dereferenced_full_path, name_may_vary).
-create function "CardDAV_DAV_RESOLVE_PATH" (in detcol_id any, inout reference_item any, inout old_base varchar, inout new_base varchar) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_RESOLVE_PATH (', detcol_id, reference_item, old_base, new_base, ')');
- return -20;
-}
-;
-
---| There's no API function to lock for a while (do we need such?) The "LOCK" DAV method checks that all parameters are valid but does not check for existing locks.
-create function "CardDAV_DAV_LOCK" (in path any, in id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_LOCK (', id, type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, owner_name, auth_uid, ')');
- return -20;
-}
-;
-
-
---| There's no API function to unlock for a while (do we need such?) The "UNLOCK" DAV method checks that all parameters are valid but does not check for existing locks.
-create function "CardDAV_DAV_UNLOCK" (in id any, in type char(1), in token varchar, in auth_uid integer)
-{
- -- dbg_obj_princ ('CardDAV_DAV_UNLOCK (', id, type, token, auth_uid, ')');
- return -27;
-}
-;
-
---| The caller does not check if id is valid.
---| This returns -1 if id is not valid, 0 if all existing locks are listed in owned_tokens whitespace-delimited list, 1 for soft 2 for hard lock.
-create function "CardDAV_DAV_IS_LOCKED" (inout id any, inout type char(1), in owned_tokens varchar) returns integer
-{
- -- dbg_obj_princ ('CardDAV_DAV_IS_LOCKED (', id, type, owned_tokens, ')');
- return 0;
-}
-;
-
-
---| The caller does not check if id is valid.
---| This returns -1 if id is not valid, list of tuples (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO) otherwise.
-create function "CardDAV_DAV_LIST_LOCKS" (in id any, in type char(1), in recursive integer) returns any
-{
- -- dbg_obj_princ ('CardDAV_DAV_LIST_LOCKS" (', id, type, recursive);
- return vector ();
-}
-;
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-api.sql b/appsrc/ODS-Addressbook/sql/ab-a-api.sql
index 603c846..bf48adb 100644
--- a/appsrc/ODS-Addressbook/sql/ab-a-api.sql
+++ b/appsrc/ODS-Addressbook/sql/ab-a-api.sql
@@ -1,10 +1,10 @@
--
--- $Id: ab-a-api.sql,v 1.16.2.7 2012/03/08 10:46:12 source Exp $
+-- $Id: ab-a-api.sql,v 1.16.2.6 2011/06/09 17:43:16 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-code.sql b/appsrc/ODS-Addressbook/sql/ab-a-code.sql
index b66393e..02b39c7 100644
--- a/appsrc/ODS-Addressbook/sql/ab-a-code.sql
+++ b/appsrc/ODS-Addressbook/sql/ab-a-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: ab-a-code.sql,v 1.50.2.28 2012/03/08 12:08:38 source Exp $
+-- $Id: ab-a-code.sql,v 1.50.2.26 2011/06/02 12:33:25 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
@@ -119,7 +119,7 @@ _end:;
create procedure AB.WA.session_restore(
inout params any)
{
- declare domain_id, account_id any;
+ declare domain_id, account_id, account_rights any;
domain_id := AB.WA.session_domain (params);
account_id := -1;
@@ -135,11 +135,11 @@ create procedure AB.WA.session_restore(
{
account_id := U_ID;
}
+ account_rights := AB.WA.access_rights (domain_id, account_id);
return vector (
'domain_id', domain_id,
'account_id', account_id,
- 'account_rights', AB.WA.account_rights (domain_id, account_id),
- 'person_rights', AB.WA.person_rights (domain_id, account_id)
+ 'account_rights', account_rights
);
}
;
@@ -218,7 +218,7 @@ create procedure AB.WA.check_grants (
-------------------------------------------------------------------------------
--
-create procedure AB.WA.person_rights (
+create procedure AB.WA.access_rights (
in domain_id integer,
in account_id integer)
{
@@ -284,62 +284,6 @@ create procedure AB.WA.person_rights (
-------------------------------------------------------------------------------
--
-create procedure AB.WA.account_rights (
- in domain_id integer,
- in account_id integer)
-{
- declare rc varchar;
-
- if (domain_id <= 0)
- return null;
-
- if (AB.WA.check_admin (account_id))
- return 'W';
-
- if (exists (select 1
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = account_id
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_ID = domain_id))
- return 'W';
-
- if (exists (select 1
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = account_id
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 2
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_ID = domain_id))
- return 'W';
-
- if (exists (select 1
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = account_id
- and B.WAM_USER = A.U_ID
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_ID = domain_id))
- return 'R';
-
- if (exists (select 1
- from DB.DBA.WA_INSTANCE
- where WAI_ID = domain_id
- and WAI_IS_PUBLIC = 1))
- return 'R';
-
- return null;
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure AB.WA.wa_home_link ()
{
return case when registry_get ('wa_home_link') = 0 then '/ods/' else registry_get ('wa_home_link') end;
@@ -765,12 +709,6 @@ create procedure AB.WA.domain_update (
AB.WA.domain_gems_delete (domain_id, account_id, 'AddressBook', AB.WA.domain_gems_name (domain_id) || '_Gems');
AB.WA.domain_gems_create (domain_id, account_id);
- declare home, path varchar;
- home := AB.WA.dav_home (account_id);
- path := home || 'addressbooks' || '/';
- DB.DBA.DAV_MAKE_DIR (path, account_id, null, '110100000N');
- update WS.WS.SYS_DAV_COL set COL_DET = 'CardDAV' where COL_ID = DAV_SEARCH_ID (path, 'C');
-
return 1;
}
;
@@ -1699,18 +1637,6 @@ create procedure AB.WA.stringCut (
-------------------------------------------------------------------------------
--
-create procedure AB.WA.isVector (
- inout aVector any)
-{
- if (isarray (aVector) and not isstring (aVector))
- return 1;
-
- return 0;
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure AB.WA.vector_unique(
inout aVector any,
in minLength integer := 0)
@@ -2499,10 +2425,9 @@ create procedure AB.WA.dt_iso8601 (
create procedure AB.WA.test_clear (
in S any)
{
- S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
- S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
+ declare N integer;
- return S;
+ return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
}
;
@@ -2568,7 +2493,7 @@ create procedure AB.WA.test (
return value;
}
- value := AB.WA.validate2 (valueClass, cast (value as varchar));
+ value := OMAIL.WA.validate2 (valueClass, cast (value as varchar));
if (valueType = 'integer')
{
tmp := get_keyword('minValue', params);
@@ -2653,7 +2578,7 @@ create procedure AB.WA.validate2 (
if (isnull (regexp_match('^[^\\\/\?\*\"\'\>\<\:\|]*\$', propertyValue)))
goto _error;
} else if ((propertyType = 'uri') or (propertyType = 'anyuri')) {
- if (isnull (regexp_match('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:~]*)?\$', propertyValue)))
+ if (isnull (regexp_match('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:]*)?\$', propertyValue)))
goto _error;
} else if (propertyType = 'email') {
if (isnull (regexp_match('^([a-zA-Z0-9_\-])+(\.([a-zA-Z0-9_\-])+)*@((\[(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5]))\]))|((([a-zA-Z0-9])+(([\-])+([a-zA-Z0-9])+)*\.)+([a-zA-Z])+(([\-])+([a-zA-Z0-9])+)*))\$', propertyValue)))
@@ -2837,10 +2762,7 @@ create procedure AB.WA.ab_sparql (
create procedure AB.WA.ab_graph_delete (
in graph varchar)
{
- if (is_empty_or_null (graph))
- return;
-
- SPARQL clear graph ?:graph;
+ AB.WA.ab_sparql (sprintf ('SPARQL clear graph <%s>', graph));
}
;
@@ -3246,7 +3168,7 @@ create procedure AB.WA.contact_update2 (
if (pName = 'P_FULL_NAME')
update AB.WA.PERSONS set P_FULL_NAME = pValue where P_ID = id;
if (pName = 'P_GENDER')
- update AB.WA.PERSONS set P_GENDER = lcase (pValue) where P_ID = id;
+ update AB.WA.PERSONS set P_GENDER = pValue where P_ID = id;
if (pName = 'P_BIRTHDAY')
update AB.WA.PERSONS set P_BIRTHDAY = pValue where P_ID = id;
if (pName = 'P_FOAF')
@@ -3399,11 +3321,12 @@ create procedure AB.WA.contact_update4 (
if (not isnull (tmp))
{
if (length (pFields) = 0)
- return vector ();
+ return 0;
id := tmp;
}
- if (isinteger (id) and (id = -1))
+
+ if ((isinteger (id)) and (id = -1))
{
L := length (pFields);
for (N := 0; N < L; N := N + 1)
@@ -3448,10 +3371,13 @@ create procedure AB.WA.contact_update4 (
pValues := V;
}
if (isinteger (id))
+ {
id := vector (id);
-
+ }
for (N := 0; N < length (id); N := N + 1)
+ {
AB.WA.contact_update3 (id[N], domain_id, pFields, pValues, tags);
+ }
return id;
}
@@ -3498,11 +3424,10 @@ create procedure AB.WA.contact_validation (
declare id, st, msg, meta, rows, F, V, T any;
id := null;
- if (isnull (validation) or (length (validation) = 0))
- goto _exit;
-
- S := 'select P_ID from AB.WA.PERSONS where P_DOMAIN_ID = ?';
- V := vector (domain_id);
+ if (not isnull (validation) and length (validation))
+ {
+ S := sprintf ('select P_ID from AB.WA.PERSONS where P_DOMAIN_ID = %d', domain_id);
+ V := vector ();
for (N := 0; N < length (validation); N := N + 1)
{
M := AB.WA.vector_index (pFields, validation [N]);
@@ -3512,14 +3437,10 @@ create procedure AB.WA.contact_validation (
V := vector_concat (V, vector (pValues [M]));
}
}
- if (length (V) = 1)
- goto _exit;
-
st := '00000';
exec (S, st, msg, V, vector ('use_cache', 1), meta, rows);
- if ((st <> '00000') or (length (rows) <> 1))
- goto _exit;
-
+ if ((st = '00000') and (length (rows) > 0))
+ {
declare validationMode varchar;
id := vector ();
@@ -3606,8 +3527,8 @@ create procedure AB.WA.contact_validation (
}
pFields := F;
pValues := V;
-
-_exit:;
+ }
+ }
return id;
}
;
@@ -3617,19 +3538,16 @@ _exit:;
create procedure AB.WA.contact_rights (
in domain_id integer,
in id integer,
- in account_rights varchar,
- in person_rights varchar)
+ in access_role varchar)
{
declare retValue varchar;
retValue := '';
if (exists (select 1 from AB.WA.PERSONS where P_ID = id and P_DOMAIN_ID = domain_id))
{
- if (account_rights < person_rights)
retValue := AB.WA.acl_check (domain_id, id);
-
if (retValue = '')
- retValue := account_rights;
+ retValue := access_role;
}
return retValue;
}
@@ -3927,15 +3845,6 @@ create procedure AB.WA.import (
-------------------------------------------------------------------------------
--
-create procedure AB.WA.import_vcard_decode (
- in S varchar)
-{
- return replace (S, '\\:', ':');
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure AB.WA.import_vcard (
in domain_id integer,
in content any,
@@ -3943,9 +3852,9 @@ create procedure AB.WA.import_vcard (
in validation any := null,
in progress_id varchar := null)
{
- declare M, N, pos, mLength, mGroupLength, id integer;
- declare tmp, T, uid, data, pFields, pValues, pField any;
- declare xmlData, xmlItems, xmlSubItems, itemSubName, itemPrefix, itemName, Meta, MetaGroup any;
+ declare L, M, N, nLength, mLength, id integer;
+ declare tmp, uid, data, pFields, pValues, pField, pField2 any;
+ declare xmlData, xmlItems, itemName, Meta, V any;
declare mode, externalUID, updatedBefore, vcardImported any;
vcardImported := vector ();
@@ -3962,53 +3871,27 @@ create procedure AB.WA.import_vcard (
Meta := vector
(
- 'P_UID', vector ('UID/val'),
- 'P_NAME', vector ('NICKNAME/val', 'N/fld[1]', 'N/fld[2]', 'N/val'),
- 'P_TITLE', vector ('N/fld[4]'),
- 'P_FIRST_NAME', vector ('N/fld[2]'),
- 'P_MIDDLE_NAME', vector ('N/fld[3]'),
- 'P_LAST_NAME', vector ('N/fld[1]', 'N/val'),
- 'P_FULL_NAME', vector ('FN/val'),
- 'P_BIRTHDAY', vector ('BDAY/val'),
- 'P_GENDER', vector ('X-GENDER/val'),
- 'P_B_ORGANIZATION', vector ('ORG/val', 'ORG/fld[1]'),
- 'P_B_JOB', vector ('TITLE/val'),
- 'P_ICQ', vector ('X-ICQ/val'),
- 'P_MSN', vector ('X-MSN/val'),
- 'P_AIM', vector ('X-AIM/val'),
- 'P_YAHOO', vector ('X-YAHOO/val'),
- 'P_SKYPE', vector ('X-SKYPE/val'),
- 'P_MAIL', vector ('EMAIL[TYPE="PREF"]/val'),
- 'P_WEB', vector ('URL[TYPE="PREF"]/val'),
- 'P_H_ADDRESS1', vector ('ADR[TYPE="HOME" or TYPE!="WORK"]/fld[3]'),
- 'P_H_ADDRESS2', vector ('ADR[TYPE="HOME" or TYPE!="WORK"]/fld[2]'),
- 'P_H_CITY', vector ('ADR[TYPE="HOME" or TYPE!="WORK"]/fld[4]'),
- 'P_H_CODE', vector ('ADR[TYPE="HOME" or TYPE!="WORK"]/fld[6]'),
- 'P_H_STATE', vector ('ADR[TYPE="HOME" or TYPE!="WORK"]/fld[5]'),
- 'P_H_COUNTRY', vector ('ADR[TYPE="HOME" or TYPE!="WORK"]/fld[7]'),
- 'P_H_PHONE', vector ('TEL[TYPE="HOME" or TYPE!="WORK"]/val'),
- 'P_H_FAX', vector ('TEL[TYPE="HOME" and TYPE="FAX"]/val'),
- 'P_H_MOBILE', vector ('TEL[TYPE="MOBILE"]/val'),
- 'P_H_MAIL', vector ('EMAIL[TYPE="HOME"]/val'),
- 'P_H_WEB', vector ('URL[TYPE="HOME"]/val'),
- 'P_H_ADDRESS1', vector ('ADR[TYPE="WORK"]/fld[3]'),
- 'P_H_ADDRESS2', vector ('ADR[TYPE="WORK"]/fld[2]'),
- 'P_H_CITY', vector ('ADR[TYPE="WORK"]/fld[4]'),
- 'P_H_CODE', vector ('ADR[TYPE="WORK"]/fld[6]'),
- 'P_H_STATE', vector ('ADR[TYPE="WORK"]/fld[5]'),
- 'P_H_COUNTRY', vector ('ADR[TYPE="WORK"]/fld[7]'),
- 'P_B_PHONE', vector ('TEL[TYPE="WORK"]/val'),
- 'P_B_FAX', vector ('TEL[TYPE="WORK" and TYPE="FAX"]/val'),
- 'P_B_MOBILE', vector ('TEL[TYPE="WORK" and TYPE="MOBILE"]/val'),
- 'P_B_MAIL', vector ('EMAIL[TYPE="WORK"]/val'),
- 'P_B_WEB', vector ('URL[TYPE="WORK"]/val')
+ 'P_UID', null, 'UID/val',
+ 'P_NAME', null, 'NICKNAME/val|N/fld[1]|N/fld[2]|N/val',
+ 'P_TITLE', null, 'N/fld[4]',
+ 'P_FIRST_NAME', null, 'N/fld[2]',
+ 'P_MIDDLE_NAME', null, 'N/fld[3]',
+ 'P_LAST_NAME', null, 'N/fld[1]|N/val',
+ 'P_FULL_NAME', null, 'FN/val',
+ 'P_BIRTHDAY', null, 'BDAY/val',
+ 'P_B_ORGANIZATION', null, 'ORG/val|ORG/fld[1]',
+ 'P_B_JOB', null, 'TITLE/val',
+ 'P_H_ADDRESS1', vector ('*', 'P_H_ADDRESS1', 'HOME', 'P_H_ADDRESS1', 'WORK', 'P_B_ADDRESS1'), 'for \044v in ADR/fld[3] return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))',
+ 'P_H_ADDRESS2', vector ('*', 'P_H_ADDRESS2', 'HOME', 'P_H_ADDRESS2', 'WORK', 'P_B_ADDRESS2'), 'for \044v in ADR/fld[2] return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))',
+ 'P_H_CITY', vector ('*', 'P_H_CITY', 'HOME', 'P_H_CITY', 'WORK', 'P_B_CITY'), 'for \044v in ADR/fld[4] return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))',
+ 'P_H_CODE', vector ('*', 'P_H_CODE', 'HOME', 'P_H_CODE', 'WORK', 'P_B_CODE'), 'for \044v in ADR/fld[6] return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))',
+ 'P_H_STATE', vector ('*', 'P_H_STATE', 'HOME', 'P_H_STATE', 'WORK', 'P_B_STATE'), 'for \044v in ADR/fld[5] return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))',
+ 'P_H_COUNTRY', vector ('*', 'P_H_COUNTRY', 'HOME', 'P_H_COUNTRY', 'WORK', 'P_B_COUNTRY'), 'for \044v in ADR/fld[7] return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))',
+ 'P_MAIL', vector ('*', 'P_MAIL', 'HOME', 'P_H_MAIL', 'WORK', 'P_B_MAIL', 'PREF', 'P_MAIL'), 'for \044v in EMAIL/val return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))',
+ 'P_H_PHONE', vector ('*', 'P_H_PHONE', 'HOME,FAX', 'P_H_FAX', 'WORK,FAX', 'P_B_FAX', 'FAX', 'P_H_FAX', 'HOME', 'P_H_PHONE', 'WORK', 'P_B_PHONE', 'CELL', 'P_H_MOBILE'), 'for \044v in TEL/val return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))',
+ 'P_WEB', vector ('*', 'P_WEB', 'HOME', 'P_H_WEB', 'WORK', 'P_B_WEB'), 'for \044v in URL/val return concat (\044v, for \044t in \044v/../TYPE return concat (" @TYPE_", \044t))'
);
mLength := length (Meta);
- MetaGroup := vector
- (
- 'P_IRI', vector ('URL/val', 'X-ABLabel[val="PROFILE"]/val')
- );
- mGroupLength := length (MetaGroup);
-- using DAV parser
if (not isstring (content))
@@ -4019,7 +3902,9 @@ create procedure AB.WA.import_vcard (
xmlItems := xpath_eval ('/*', xmlData, 0);
foreach (any xmlItem in xmlItems) do
{
- xmlItem := xml_cut (xmlItem);
+ itemName := xpath_eval ('name(.)', xmlItem);
+ if (itemName = 'IMC-VCARD')
+ {
if (not AB.WA.import_check_progress_id (progress_id))
return;
@@ -4027,55 +3912,54 @@ create procedure AB.WA.import_vcard (
uid := null;
pFields := vector ();
pValues := vector ();
- for (N := 0; N < mLength; N := N + 2)
+ for (N := 0; N < mLength; N := N + 3)
{
pField := Meta [N];
- for (M := 0; M < length (Meta[N+1]); M := M + 1)
+ tmp := xquery_eval (Meta [N+2], xmlItem, 0);
+ foreach (any T in tmp) do
{
- T := serialize_to_UTF8_xml (xpath_eval ('/IMC-VCARD/' || Meta[N+1][M] || '/text()', xmlItem, 1));
+ T := cast (T as varchar);
if (not is_empty_or_null (T))
{
- if (pField = 'P_UID')
+ pField2 := pField;
+ if (pField2 = 'P_UID')
+ {
uid := T;
-
- if (not AB.WA.vector_contains (pFields, pField))
+ }
+ if (not isnull (Meta [N+1]))
+ {
+ if (strstr (T, ' @TYPE_') <> 0)
+ {
+ pField2 := '';
+ for (M := 0; M < length (Meta [N+1]); M := M + 2)
+ {
+ if ((Meta [N+1][M] = '*') and isnull (strstr (T, ' @TYPE_')))
+ {
+ pField2 := Meta [N+1][M+1];
+ } else {
+ V := split_and_decode (Meta [N+1][M], 0, '\0\0,');
+ for (L := 0; L < length (V); L := L + 1)
{
- pFields := vector_concat (pFields, vector (pField));
- pValues := vector_concat (pValues, vector (AB.WA.import_vcard_decode (T)));
+ if (isnull (strstr (T, ' @TYPE_' || V[L])))
+ goto _exit;
+ }
+ pField2 := Meta [N+1][M+1];
+ _exit:;
}
}
+ M := strstr (T, ' @TYPE_');
+ if (not isnull (M))
+ T := subseq (T, 0, M);
}
}
- xmlSubItems := xpath_eval ('/IMC-VCARD/*', xmlItem, 0);
- foreach (any xmlSubItem in xmlSubItems) do
- {
- itemSubName := cast (xpath_eval ('name(.)', xmlSubItem) as varchar);
- pos := strchr (itemSubName, '.');
- if (pos is not NULL)
- {
- itemName := subseq (itemSubName, pos+1);
- itemPrefix := subseq (itemSubName, 0, pos);
- for (N := 0; N < mGroupLength; N := N + 2)
- {
- if (strstr (MetaGroup[N+1][0], itemName) = 0)
- {
- T := xpath_eval ('/IMC-VCARD/' || itemPrefix || '.' || MetaGroup[N+1][1] || '/text()', xmlItem, 1);
- if (not isnull (T))
- {
- pField := MetaGroup[N];
- T := serialize_to_UTF8_xml (xpath_eval ('./val/text()', xmlSubItem));
- if (not AB.WA.vector_contains (pFields, pField))
+ if (not AB.WA.vector_contains (pFields, pField2))
{
- pFields := vector_concat (pFields, vector (pField));
- pValues := vector_concat (pValues, vector (AB.WA.import_vcard_decode (T)));
+ pFields := vector_concat (pFields, vector (pField2));
+ pValues := vector_concat (pValues, vector (T));
}
- goto _1;
}
}
}
- _1:;
- }
- }
if (isnull (uid) and not isnull (externalUID))
{
N := strchr (externalUID, '_');
@@ -4100,6 +3984,7 @@ create procedure AB.WA.import_vcard (
_skip:;
AB.WA.import_inc_progress_id (progress_id);
}
+ }
return vcardImported;
}
;
@@ -4436,7 +4321,8 @@ create procedure AB.WA.import_foaf_content (
if (length (Items))
{
personIRI := Items[0][0];
- Persons := vector_concat (Persons, vector (vector (1, personIRI, coalesce (Items[0][2], Items[0][1]), replace (Items[0][3], 'mailto:', ''))));
+ tmp := replace (Items[N][3], 'mailto:', '');
+ Persons := vector_concat (Persons, vector (vector (1, personIRI, coalesce (Items[N][2], Items[N][1]), tmp)));
S := sprintf (' sparql
define input:storage ""
prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -4469,20 +4355,21 @@ create procedure AB.WA.import_foaf_content (
}', contentIRI);
}
Items := AB.WA.ab_sparql (S);
- foreach (any Item in Items) do
+ for (N := 0; N < length (Items); N := N + 1)
+ {
+ if (not isnull (coalesce (Items[N][2], Items[N][1])))
{
- if (isnull (coalesce (Item[2], Item[1])))
- goto _skip;
-
for (M := 0; M < length (Persons); M := M + 1)
{
- if (Persons[M][1] = Item[0])
+ if (Persons[M][1] = Items[N][0])
goto _skip;
}
- Persons := vector_concat (Persons, vector (vector (0, Item[0], coalesce (Item[2], Item[1]), replace (Item[3], 'mailto:', ''))));
-
+ tmp := replace (Items[N][3], 'mailto:', '');
+ Persons := vector_concat (Persons, vector (vector (0, Items[N][0], coalesce (Items[N][2], Items[N][1]), tmp)));
_skip:;
}
+ }
+
_exit:;
return Persons;
}
@@ -4745,15 +4632,6 @@ create procedure AB.WA.import_contact_update (
----------------------------------------------------------------------
--
-create procedure AB.WA.export_vcard_encode (
- in S varchar)
-{
- return replace (S, ':', '\\:');
-}
-;
-
-----------------------------------------------------------------------
---
create procedure AB.WA.export_vcard_line (
in property varchar,
in value any,
@@ -4766,24 +4644,6 @@ create procedure AB.WA.export_vcard_line (
}
;
-----------------------------------------------------------------------
---
-create procedure AB.WA.export_vcard_group (
- in prefix varchar,
- in property varchar,
- in value any,
- in label varchar,
- in labelValue any,
- inout sStream any)
-{
- if (not is_empty_or_null (value))
- {
- http (sprintf ('%s:%s\r\n', prefix || '.' || property, AB.WA.export_vcard_encode (cast (value as varchar))), sStream);
- http (sprintf ('%s:%s\r\n', prefix || '.' || label, cast (labelValue as varchar)), sStream);
- }
-}
-;
-
-------------------------------------------------------------------------------
--
create procedure AB.WA.export_vcard (
@@ -4808,7 +4668,7 @@ create procedure AB.WA.export_vcard (
if (AB.WA.tags_exchangeTest (P_TAGS, oTagsInclude, oTagsExclude))
{
http ('BEGIN:VCARD\r\n', sStream);
- http ('VERSION:3.0\r\n', sStream);
+ http ('VERSION:2.1\r\n', sStream);
AB.WA.export_vcard_line ('REV', AB.WA.dt_iso8601 (P_UPDATED), sStream);
@@ -4827,7 +4687,6 @@ create procedure AB.WA.export_vcard (
AB.WA.export_vcard_line ('N', S, sStream);
}
AB.WA.export_vcard_line ('BDAY', AB.WA.dt_format (P_BIRTHDAY, 'Y-M-D'), sStream);
- AB.WA.export_vcard_line ('X-GENDER', initcap (P_GENDER), sStream);
-- mail
AB.WA.export_vcard_line ('EMAIL;TYPE=PREF;TYPE=INTERNET', P_MAIL, sStream);
@@ -4869,14 +4728,6 @@ create procedure AB.WA.export_vcard (
AB.WA.export_vcard_line ('ORG', P_B_ORGANIZATION, sStream);
AB.WA.export_vcard_line ('TITLE', P_B_JOB, sStream);
- AB.WA.export_vcard_line ('X-ICQ', P_ICQ, sStream);
- AB.WA.export_vcard_line ('X-MSN', P_MSN, sStream);
- AB.WA.export_vcard_line ('X-AIM', P_AIM, sStream);
- AB.WA.export_vcard_line ('X-YAHOO', P_YAHOO, sStream);
- AB.WA.export_vcard_line ('X-SKYPE', P_SKYPE, sStream);
-
- AB.WA.export_vcard_group ('item1', 'URL', P_IRI, 'X-ABLabel', 'PROFILE', sStream);
-
http ('END:VCARD\r\n', sStream);
}
}
@@ -5429,10 +5280,6 @@ create procedure AB.WA.syncml_check (
return 0;
if (VAD.DBA.version_compare (syncmlVersion, '1.05.75') < 0)
return 0;
- if (__proc_exists ('DB.DBA.yac_syncml_version_get') is null)
- return 0;
- if (__proc_exists ('DB.DBA.yac_syncml_type_get') is null)
- return 0;
if (isnull (syncmlPath))
return 1;
if (DB.DBA.yac_syncml_version_get (syncmlPath) = 'N')
@@ -5460,8 +5307,11 @@ create procedure AB.WA.syncml_entry_update (
for (select deserialize (EX_OPTIONS) as _options from AB.WA.EXCHANGE where EX_DOMAIN_ID = _domain_id and EX_TYPE = 2) do
{
_syncmlPath := get_keyword ('name', _options);
+
if (not AB.WA.syncml_check (_syncmlPath))
goto _skip;
+ if (DB.DBA.yac_syncml_type_get (_syncmlPath) not in ('vcard_11', 'vcard_12'))
+ goto _skip;
oTagsInclude := null;
oTagsExclude := null;
@@ -5501,15 +5351,17 @@ create procedure AB.WA.syncml_entry_update_internal (
_content := AB.WA.entry2syncml (_entry_id);
_permissions := USER_GET_OPTION (_user, 'PERMISSIONS');
if (isnull (_permissions))
+ {
_permissions := '110100000RR';
-
+ }
connection_set ('__sync_dav_upl', '1');
connection_set ('__sync_ods', '1');
- DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_path, _content, 'text/x-vcard', _permissions, _user, _user, null, null, 0);
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_path, _content, 'text/x-vcard', _permissions, http_dav_uid (), http_dav_uid () + 1, null, null, 0);
connection_set ('__sync_ods', '0');
connection_set ('__sync_dav_upl', '0');
}
- else if (_action = 'D')
+
+ if (_action = 'D')
{
declare _id integer;
@@ -5517,7 +5369,7 @@ create procedure AB.WA.syncml_entry_update_internal (
if (isinteger(_id) and (_id > 0))
{
connection_set ('__sync_ods', '1');
- DB.DBA.DAV_DELETE_INT (_path, 1, _user, _password, 0);
+ DB.DBA.DAV_DELETE (_path, 1, _user, _password);
connection_set ('__sync_ods', '0');
}
}
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-table.sql b/appsrc/ODS-Addressbook/sql/ab-a-table.sql
index 051f4c8..a8d00ee 100644
--- a/appsrc/ODS-Addressbook/sql/ab-a-table.sql
+++ b/appsrc/ODS-Addressbook/sql/ab-a-table.sql
@@ -1,10 +1,10 @@
--
--- $Id: ab-a-table.sql,v 1.21.2.5 2012/03/08 10:46:12 source Exp $
+-- $Id: ab-a-table.sql,v 1.21.2.4 2010/11/11 12:37:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-update.sql b/appsrc/ODS-Addressbook/sql/ab-a-update.sql
index 4c66791..6be1745 100644
--- a/appsrc/ODS-Addressbook/sql/ab-a-update.sql
+++ b/appsrc/ODS-Addressbook/sql/ab-a-update.sql
@@ -1,10 +1,10 @@
--
--- $Id: ab-a-update.sql,v 1.3.2.5 2012/03/08 10:46:12 source Exp $
+-- $Id: ab-a-update.sql,v 1.3.2.4 2010/10/07 13:24:45 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Addressbook/sql/ab-a-wa.sql b/appsrc/ODS-Addressbook/sql/ab-a-wa.sql
index 5fbc20e..749213e 100644
--- a/appsrc/ODS-Addressbook/sql/ab-a-wa.sql
+++ b/appsrc/ODS-Addressbook/sql/ab-a-wa.sql
@@ -1,10 +1,10 @@
--
--- $Id: ab-a-wa.sql,v 1.8.2.10 2012/03/08 10:46:12 source Exp $
+-- $Id: ab-a-wa.sql,v 1.8.2.9 2011/05/17 23:00:21 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/sql/ab-d.sql b/appsrc/ODS-Addressbook/sql/ab-d.sql
index 2a33949..6037065 100644
--- a/appsrc/ODS-Addressbook/sql/ab-d.sql
+++ b/appsrc/ODS-Addressbook/sql/ab-d.sql
@@ -1,10 +1,10 @@
--
--- $Id: ab-d.sql,v 1.13.2.9 2012/03/08 10:46:12 source Exp $
+-- $Id: ab-d.sql,v 1.13.2.8 2011/06/02 12:33:25 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/sql/sioc_ab.sql b/appsrc/ODS-Addressbook/sql/sioc_ab.sql
index 8abe82d..cc1e4dc 100644
--- a/appsrc/ODS-Addressbook/sql/sioc_ab.sql
+++ b/appsrc/ODS-Addressbook/sql/sioc_ab.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_ab.sql,v 1.33.2.17 2012/03/08 12:08:39 source Exp $
+-- $Id: sioc_ab.sql,v 1.33.2.15 2011/08/01 14:15:23 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
@@ -120,7 +120,6 @@ create procedure fill_ods_addressbook_sioc2 (
fill_ods_addressbook_services ();
for (select WAI_ID,
- WAI_IS_PUBLIC,
WAI_TYPE_NAME,
WAI_NAME,
WAI_ACL
@@ -130,7 +129,7 @@ create procedure fill_ods_addressbook_sioc2 (
{
graph_iri := SIOC..acl_graph (WAI_TYPE_NAME, WAI_NAME);
exec (sprintf ('sparql clear graph <%s>', graph_iri));
- SIOC..wa_instance_acl_insert (WAI_IS_PUBLIC, WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
+ SIOC..wa_instance_acl_insert (WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
for (select P_DOMAIN_ID, P_ID, P_ACL
from AB.WA.PERSONS
where P_DOMAIN_ID = WAI_ID and P_ACL is not null) do
@@ -217,7 +216,7 @@ create procedure fill_ods_addressbook_sioc2 (
order by P_ID) do
{
contact_iri := SIOC..addressbook_contact_iri (P_DOMAIN_ID, P_ID);
- graph_iri := SIOC..get_graph_new (coalesce (_access_mode, WAI_IS_PUBLIC), contact_iri);
+ graph_iri := SIOC..get_graph_new (null, coalesce (_access_mode, WAI_IS_PUBLIC), contact_iri);
addressbook_iri := addressbook_iri (WAI_NAME);
socialnetwork_iri := socialnetwork_iri (WAI_NAME);
creator_iri := user_iri (WAM_USER);
@@ -319,7 +318,7 @@ create procedure fill_ods_addressbook_services ()
-------------------------------------------------------------------------------
--
-create procedure clean_ods_addressbook_sioc (
+create procedure clean_ods_addressbook_sioc2 (
in _wai_name varchar := null,
in _access_mode integer := null)
{
@@ -356,7 +355,7 @@ create procedure clean_ods_addressbook_sioc (
order by P_ID) do
{
contact_iri := SIOC..addressbook_contact_iri (P_DOMAIN_ID, P_ID);
- graph_iri := SIOC..get_graph_new (coalesce (_access_mode, WAI_IS_PUBLIC), contact_iri);
+ graph_iri := SIOC..get_graph_new (null, coalesce (_access_mode, WAI_IS_PUBLIC), contact_iri);
contact_delete (graph_iri,
P_DOMAIN_ID,
@@ -457,7 +456,7 @@ create procedure contact_insert (
and WAI_IS_PUBLIC > 0) do
{
iri := addressbook_contact_iri (domain_id, contact_id);
- graph_iri := SIOC..get_graph_new (WAI_IS_PUBLIC, iri);
+ graph_iri := SIOC..get_graph_new (domain_id, WAI_IS_PUBLIC, iri);
addressbook_iri := addressbook_iri (WAI_NAME);
socialnetwork_iri := socialnetwork_iri (WAI_NAME);
creator_iri := user_iri (WAM_USER);
@@ -707,7 +706,7 @@ create procedure contact_delete (
iri := SIOC..addressbook_contact_iri (domain_id, contact_id);
if (isnull (graph_iri))
{
- graph_iri := SIOC..get_graph_new (AB.WA.domain_is_public (domain_id), iri);
+ graph_iri := SIOC..get_graph_new (domain_id, null, iri);
if (isnull (graph_iri))
return;
}
@@ -1044,7 +1043,7 @@ create procedure contact_comment_insert (
master_id := cast (master_id as integer);
master_iri := SIOC..addressbook_contact_iri (domain_id, master_id);
if (isnull (graph_iri))
- graph_iri := get_graph_new (AB.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
@@ -1084,7 +1083,7 @@ create procedure contact_comment_delete (
master_id := cast (master_id as integer);
master_iri := SIOC..addressbook_contact_iri (domain_id, master_id);
if (isnull (graph_iri))
- graph_iri := SIOC..get_graph_new (AB.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := SIOC..get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
@@ -1232,7 +1231,7 @@ create procedure contact_annotation_insert (
master_iri := SIOC..addressbook_contact_iri (domain_id, master_id);
if (isnull (graph_iri))
{
- graph_iri := get_graph_new (AB.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
}
@@ -1269,7 +1268,7 @@ create procedure contact_annotation_delete (
master_iri := SIOC..addressbook_contact_iri (domain_id, master_id);
if (isnull (graph_iri))
{
- graph_iri := SIOC..get_graph_new (AB.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := SIOC..get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
}
diff --git a/appsrc/ODS-Addressbook/vad_version b/appsrc/ODS-Addressbook/vad_version
deleted file mode 100644
index 030dea2..0000000
--- a/appsrc/ODS-Addressbook/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.9.52
diff --git a/appsrc/ODS-Addressbook/www/ab_login.vspx b/appsrc/ODS-Addressbook/www/ab_login.vspx
index 4cec85c..023b3cf 100644
--- a/appsrc/ODS-Addressbook/www/ab_login.vspx
+++ b/appsrc/ODS-Addressbook/www/ab_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ab_login.vspx,v 1.2.2.6 2012/03/08 12:08:39 source Exp $
+ - $Id: ab_login.vspx,v 1.2.2.4 2010/10/07 13:24:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -34,16 +34,16 @@
if (page_name = 'error.vspx')
return;
- if (AB.WA.check_grants (self.person_rights, page_name))
+ if (AB.WA.check_grants (self.account_rights, page_name))
return;
- if (isnull (self.person_rights) and not is_empty_or_null (self.sid))
+ if (isnull (self.account_rights) and not is_empty_or_null (self.sid))
{
self.vc_redirect (sprintf ('/ods/error.vspx?__PAGE=%U&__SQL_STATE=%U&__SQL_MESSAGE=%U', 'home.vspx', '23023', 'You have no access rights for the application!'));
return;
}
- if (isnull (self.person_rights))
+ if (isnull (self.account_rights))
{
vh := http_map_get ('vhost');
lh := http_map_get ('lhost');
diff --git a/appsrc/ODS-Addressbook/www/ajax.vsp b/appsrc/ODS-Addressbook/www/ajax.vsp
index 95bb784..79b1996 100644
--- a/appsrc/ODS-Addressbook/www/ajax.vsp
+++ b/appsrc/ODS-Addressbook/www/ajax.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ajax.vsp,v 1.1.2.6 2012/03/08 10:46:12 source Exp $
+-- $Id: ajax.vsp,v 1.1.2.5 2011/06/09 17:43:16 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Addressbook/www/annotea.vspx b/appsrc/ODS-Addressbook/www/annotea.vspx
index 8274eb8..c59d0c6 100644
--- a/appsrc/ODS-Addressbook/www/annotea.vspx
+++ b/appsrc/ODS-Addressbook/www/annotea.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: annotea.vspx,v 1.7.2.7 2012/03/08 10:46:12 source Exp $
+ - $Id: annotea.vspx,v 1.7.2.6 2011/07/04 10:04:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/www/conversation.vspx b/appsrc/ODS-Addressbook/www/conversation.vspx
index 4da2e1f..c69ff42 100644
--- a/appsrc/ODS-Addressbook/www/conversation.vspx
+++ b/appsrc/ODS-Addressbook/www/conversation.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: conversation.vspx,v 1.2.2.4 2012/03/08 10:46:12 source Exp $
+ - $Id: conversation.vspx,v 1.2.2.3 2011/05/02 14:16:24 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/www/css/style.css b/appsrc/ODS-Addressbook/www/css/style.css
index 48fff8e..0dedb90 100644
--- a/appsrc/ODS-Addressbook/www/css/style.css
+++ b/appsrc/ODS-Addressbook/www/css/style.css
@@ -1,10 +1,10 @@
/*
- * $Id: style.css,v 1.18.2.13 2012/03/08 12:08:39 source Exp $
+ * $Id: style.css,v 1.18.2.11 2011/05/17 23:00:21 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
@@ -28,29 +28,11 @@ body {
font-size: 9pt;
}
-pre {
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
form {
margin: 0;
padding: 0;
}
-abbr {
- border: none;
-}
-
-input[type="text"], input[type="password"], select {
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
-}
-
a {
text-decoration: none;
}
@@ -89,7 +71,46 @@ a:hover {
vertical-align: top;
}
+/* Footer */
+
+#FT {
+ width: 100%;
+ position: relative;
+ bottom: 0px;
+ font-size: 8pt;
+ float: left;
+ clear: both;
+ text-align: right;
+ border-top: 2px solid #fff;
+ margin-right: 10px;
+ background-color: #fff;
+ background-image: url(../image/ods_main_footer.png);
+}
+
+#FT_L {
+ float: left;
+ clear: left;
+ margin-top: 10px;
+ margin-left: 8px;
+ border: 1px solid #788;
+}
+
+#FT_R {
+ float: right;
+ clear: right;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ margin-right: 5px;
+ color: #788;
+}
+
+#FT_R a {
+ text-decoration: none;
+ color: inherit;
+}
+
/* Left side within MT */
+
.page_head {
width: 100%;
background-color: #b0cde4;
diff --git a/appsrc/ODS-Addressbook/www/error.vspx b/appsrc/ODS-Addressbook/www/error.vspx
index 4eacb95..8824500 100644
--- a/appsrc/ODS-Addressbook/www/error.vspx
+++ b/appsrc/ODS-Addressbook/www/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.3.2.3 2012/03/08 10:46:12 source Exp $
+ - $Id: error.vspx,v 1.3.2.2 2010/09/20 10:14:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/www/export.vspx b/appsrc/ODS-Addressbook/www/export.vspx
index c409e74..fe1b7ae 100644
--- a/appsrc/ODS-Addressbook/www/export.vspx
+++ b/appsrc/ODS-Addressbook/www/export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: export.vspx,v 1.5.2.5 2012/03/08 10:46:12 source Exp $
+ - $Id: export.vspx,v 1.5.2.4 2010/10/07 13:24:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Addressbook/www/gems.vsp b/appsrc/ODS-Addressbook/www/gems.vsp
index b8e4a49..ba2e53f 100644
--- a/appsrc/ODS-Addressbook/www/gems.vsp
+++ b/appsrc/ODS-Addressbook/www/gems.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: gems.vsp,v 1.1.2.4 2012/03/08 10:46:12 source Exp $
+-- $Id: gems.vsp,v 1.1.2.3 2010/10/07 13:24:46 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Addressbook/www/home.vspx b/appsrc/ODS-Addressbook/www/home.vspx
index 7588175..810c43e 100644
--- a/appsrc/ODS-Addressbook/www/home.vspx
+++ b/appsrc/ODS-Addressbook/www/home.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: home.vspx,v 1.58.2.31 2012/03/08 12:08:39 source Exp $
+ - $Id: home.vspx,v 1.58.2.29 2011/07/04 10:04:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -51,7 +51,7 @@
self.v_id := atoi(self.abContact);
if (self.v_id = -1)
{
- if (self.person_rights = 'W')
+ if (self.account_rights = 'W')
{
self.abAction := 'create';
self.v_name := trim (get_keyword ('name', params, ''));
@@ -93,11 +93,11 @@
<v:method name="toolbarEnable" arglist="in cmd varchar">
<![CDATA[
- if ((cmd = 'create') and ((self.person_rights <> 'W') or (self.abScope = 'MySharedContacts')))
+ if ((cmd = 'create') and ((self.account_rights <> 'W') or (self.abScope = 'MySharedContacts')))
return 0;
- if ((cmd = 'import') and ((self.person_rights <> 'W') or (self.abScope = 'MySharedContacts')))
+ if ((cmd = 'import') and ((self.account_rights <> 'W') or (self.abScope = 'MySharedContacts')))
return 0;
- if ((cmd = 'export') and ((self.person_rights <> 'W') or (self.abScope = 'MySharedContacts')))
+ if ((cmd = 'export') and ((self.account_rights <> 'W') or (self.abScope = 'MySharedContacts')))
return 0;
return 1;
]]>
@@ -247,7 +247,7 @@
{
http (' ');
} else {
- http (sprintf ('<img class="resize" src="%s" />', fValue));
+ http (sprintf ('<img class="photo" src="%s"/>', fValue));
}
]]>
</v:method>
@@ -641,7 +641,7 @@
self.abSubAction := '';
self.abValue := '';
}
- if ((self.person_rights <> 'W') and (self.abAction = 'settings'))
+ if ((self.account_rights <> 'W') and (self.abAction = 'settings'))
self.abAction := 'browse';
self.mode_test();
@@ -1125,7 +1125,7 @@
if (not is_empty_or_null (cast (self.abValue as integer)))
AB.WA.xml_set('category', data, self.abValue);
}
- control.ds_sql := AB.WA.search_sql (self.domain_id, self.account_id, self.person_rights, data);
+ control.ds_sql := AB.WA.search_sql (self.domain_id, self.account_id, self.account_rights, data);
}
else if (self.abScope = 'MySharedContacts')
{
@@ -1181,7 +1181,7 @@
<table class="ODS_grid" style="border: 0px;">
<thead>
<tr>
- <v:template name="t2" type="simple" enabled="--case when ((self.person_rights <> 'W') or (self.abScope = 'MySharedContacts')) then 0 else 1 end">
+ <v:template name="t2" type="simple" enabled="--case when ((self.account_rights <> 'W') or (self.abScope = 'MySharedContacts')) then 0 else 1 end">
<th class="checkbox">
<input type="checkbox" name="cb_all" value="Select All" onclick="selectAllCheckboxes(this, 'cb_item')" />
</th>
@@ -1200,11 +1200,11 @@
declare permissions any;
id := (control as vspx_row_template).te_column_value('P_ID');
- permissions := AB.WA.contact_rights (self.domain_id, id, self.account_rights, self.person_rights);
+ permissions := AB.WA.contact_rights (self.domain_id, id, self.account_rights);
?>
<table>
<tr>
- <vm:if test="(self.person_rights = 'W') and (self.abScope <> 'MySharedContacts')">
+ <vm:if test="(self.account_rights = 'W') and (self.abScope <> 'MySharedContacts')">
<td class="checkbox" valign="top">
<?vsp
if (permissions = 'W')
@@ -2945,7 +2945,7 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" name="ab_edit" value="Edit" enabled="--case when (AB.WA.contact_rights (self.domain_id, self.v_id, self.account_rights, self.person_rights) = 'W') and (self.abAction = 'view') then 1 else 0 end" xhtml_class="form-button">
+ <v:button action="simple" name="ab_edit" value="Edit" enabled="--case when (AB.WA.contact_rights (self.domain_id, self.v_id, self.account_rights) = 'W') and (self.abAction = 'view') then 1 else 0 end" xhtml_class="form-button">
<v:on-post>
<![CDATA[
self.abAction := 'edit';
@@ -3510,7 +3510,7 @@
self.i_number := AB.WA.import_count (self.i_type, self.i_data);
}
if (self.i_number = 0)
- signal ('TEST', 'Import target data not found!<>');
+ signal ('TEST', 'No persons founded!<>');
-- next step
if (self.i_type = 0)
@@ -3552,7 +3552,7 @@
<thead>
<tr>
<th class="checkbox">
- <input type="checkbox" name="cb_all" value="Select All" onclick="selectAllCheckboxes(this, 'cb_item', true)" />
+ <input type="checkbox" name="cb_all" value="Select All" onclick="selectAllCheckboxes(this, 'cb_item')" />
</th>
<th>Name</th>
<th>Mail</th>
@@ -3572,7 +3572,7 @@
<td class="checkbox">
<?vsp
if (item[0] = 0)
- http (sprintf ('<input type="checkbox" name="cb_item" value="%s" onclick="selectCheck(this, \'cb_item\', true)" />', item[1]));
+ http (sprintf ('<input type="checkbox" name="cb_item" value="%s" onclick="selectCheck(this, \'cb_item\')" />', item[1]));
?>
</td>
<td>
@@ -4019,7 +4019,7 @@
declare N, M integer;
declare data, fields any;
- data := coalesce ((select deserialize (LV_FIELDS) from LDAP..LDAP_VALIDATION where LV_USER_ID = self.account_id), vector('P_NAME', '1'));
+ data := coalesce ((select deserialize (LV_FIELDS) from LDAP..LDAP_VALIDATION where LV_USER_ID = self.account_id), vector());
fields := LDAP..contact_fields ();
M := length (fields) / 2;
for (N := 0; N < M; N := N + 2)
@@ -4556,13 +4556,12 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Clear" xhtml_onclick="javascript: return confirm (\'Do you want to reset settings to default?\');" xhtml_class="form-button">
+ <v:button action="simple" value="Clear" xhtml_class="form-button">
<v:on-post>
<![CDATA[
delete from AB.WA.SETTINGS where S_ACCOUNT_ID = self.account_id;
AB.WA.nntp_update (self.domain_id, null, null, 1, 0);
- self.settings := vector_concat (vector ('app', DB.DBA.WA_USER_APP_ENABLE (self.account_id)), AB.WA.settings (self.domain_id));
self.vc_data_bind(e);
]]>
</v:on-post>
@@ -5085,12 +5084,14 @@
</th>
<td>
<v:text name="exc_options_name" xhtml_id="exc_options_name" value="--get_keyword ('name', self.ve_options)" xhtml_size="60" />
- <input type="button" id="exc_options_name_button" value="Browse..." onclick="davBrowse ('exc_options_name', <?V case when (self.abSubAction in ('syncmlCreate', 'syncmlUpdate')) then 'true' else 'false' end ?>);" style="display: <?V case when (get_keyword ('type', self.ve_options, 1) <> 1) then 'none' else '' end ?>" />
+ <vm:if test="self.abSubAction not in ('syncmlCreate', 'syncmlUpdate')">
+ <input type="button" id="exc_options_name_button" value="Browse..." onclick="davBrowse ('exc_options_name');" style="display: <?V case when (get_keyword ('type', self.ve_options, 1) <> 1) then 'none' else '' end ?>" />
<![CDATA[
<script type="text/javascript">
OAT.Loader.load(['dav'], function(){OAT.WebDav.init(davOptions);});
</script>
]]>
+ </vm:if>
</td>
</tr>
<tr>
@@ -5370,7 +5371,7 @@
</table>
</div>
<div class="new-form-footer">
- <v:button action="simple" value="--case when isnull (self.ve_result) then 'Sync' else 'New Sync' end" name="exc_sync_exec" xhtml_class="form-button">
+ <v:button action="simple" value="Sync" name="exc_sync_exec" xhtml_class="form-button">
<v:on-post>
<![CDATA[
declare _mode any;
@@ -5382,7 +5383,7 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="--case when isnull (self.ve_result) then 'Cancel' else 'Exit' end" name="exc_sync_cancel" xhtml_class="form-button">
+ <v:button action="simple" value="Cancel" name="exc_sync_cancel" xhtml_class="form-button">
<v:on-post>
<![CDATA[
self.abSubAction := 'syncmlBrowse';
diff --git a/appsrc/ODS-Addressbook/www/invite.vspx b/appsrc/ODS-Addressbook/www/invite.vspx
index 02fbf88..d5c2b73 100644
--- a/appsrc/ODS-Addressbook/www/invite.vspx
+++ b/appsrc/ODS-Addressbook/www/invite.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: invite.vspx,v 1.3.2.2 2012/03/08 10:46:12 source Exp $
+ - $Id: invite.vspx,v 1.3.2.1 2010/09/20 10:14:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/www/js/ab.js b/appsrc/ODS-Addressbook/www/js/ab.js
index 55898ef..0707271 100644
--- a/appsrc/ODS-Addressbook/www/js/ab.js
+++ b/appsrc/ODS-Addressbook/www/js/ab.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
@@ -198,10 +198,8 @@ function confirmAction(confirmMsq, form, txt, selectionMsq) {
return false;
}
-function selectCheck(obj, prefix, noToolbars) {
+function selectCheck(obj, prefix) {
coloriseRow(getParent(obj, 'tr'), obj.checked);
- if (noToolbars)
- return;
enableToolbars(obj.form, prefix);
}
@@ -229,7 +227,7 @@ function enableElement(id, id_gray, showFlag) {
}
}
-function selectAllCheckboxes(obj, prefix, noToolbars) {
+function selectAllCheckboxes (obj, prefix) {
var objForm = obj.form;
for (var i = 0; i < objForm.elements.length; i++) {
var o = objForm.elements[i];
@@ -241,15 +239,12 @@ function selectAllCheckboxes(obj, prefix, noToolbars) {
coloriseRow(getParent(o, 'tr'), o.checked);
}
}
- obj.focus();
if (obj.value == 'Select All')
obj.value = 'Unselect All';
else
obj.value = 'Select All';
-
- if (noToolbars)
- return;
- enableToolbars(objForm, prefix);
+ selectCheck (obj, prefix);
+ obj.focus();
}
function anySelected (form, txt, selectionMsq) {
@@ -546,17 +541,11 @@ function updateGeodata(mode) {
OAT.AJAX.GET(S, '', function(arg) {cb(arg, mode);});
}
-function davBrowse(fld, folders) {
- /* load stylesheets */
- OAT.Style.include("grid.css");
- OAT.Style.include("webdav.css");
-
+function davBrowse(fld) {
var options = {
mode: 'browser',
onConfirmClick: function(path, fname) {$(fld).value = '/DAV' + path + fname;}
};
- if (!folders) {folders = false;}
- OAT.WebDav.options.foldersOnly = folders;
OAT.WebDav.open(options);
}
@@ -705,9 +694,7 @@ function checkState()
} else {
progressTimer = null;
progressPollTimer = null;
- $('btn_Stop').value = 'Close';
- OAT.Dom.hide('btn_Background');
- doPost ('F1', 'btn_Background');
+ $('btn_Stop').click();
}
}
OAT.AJAX.POST('ajax.vsp', "a=load&sa=state&id="+progressID+urlParam("sid")+urlParam("realm"), x);
@@ -884,12 +871,21 @@ AB.setFOAFValue = function(fValue, fName) {
AB.aboutDialog = function() {
var aboutDiv = $('aboutDiv');
- if (aboutDiv)
+ if (aboutDiv) {
OAT.Dom.unlink(aboutDiv);
-
- aboutDiv = OAT.Dom.create('div', {height: '160px', overflow: 'hidden'});
+ }
+ aboutDiv = OAT.Dom.create('div', {
+ width : '430px',
+ height: '170px',
+ overflow: 'hidden'
+ });
aboutDiv.id = 'aboutDiv';
- aboutDialog = new OAT.Dialog('About ODS AddressBook', aboutDiv, {width:445, buttons: 0, resize:0, modal:1});
+ aboutDialog = new OAT.Dialog('About ODS AddressBook', aboutDiv, {
+ width : 445,
+ buttons : 0,
+ resize : 0,
+ modal : 1
+ });
aboutDialog.cancel = aboutDialog.hide;
var x = function (txt) {
diff --git a/appsrc/ODS-Addressbook/www/message.vspx b/appsrc/ODS-Addressbook/www/message.vspx
index feab63e..1e0fd63 100644
--- a/appsrc/ODS-Addressbook/www/message.vspx
+++ b/appsrc/ODS-Addressbook/www/message.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: message.vspx,v 1.1.2.2 2012/03/08 10:46:12 source Exp $
+ - $Id: message.vspx,v 1.1.2.1 2010/09/20 10:14:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/www/search.vspx b/appsrc/ODS-Addressbook/www/search.vspx
index 32b25c1..49a7422 100644
--- a/appsrc/ODS-Addressbook/www/search.vspx
+++ b/appsrc/ODS-Addressbook/www/search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.vspx,v 1.15.2.13 2012/03/08 12:08:39 source Exp $
+ - $Id: search.vspx,v 1.15.2.11 2011/05/17 23:00:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -91,7 +91,7 @@
state := '00000';
sqlParams := vector();
- sql := AB.WA.search_sql (self.domain_id, self.account_id, self.person_rights, data, self.v_max);
+ sql := AB.WA.search_sql (self.domain_id, self.account_id, self.account_rights, data, self.v_max);
sql := concat (sql, ' order by ', self.v_order, ' ', self.v_direction);
exec(sql, state, msg, sqlParams, 0, meta, result);
if (state = '00000')
diff --git a/appsrc/ODS-Addressbook/www/tags.vspx b/appsrc/ODS-Addressbook/www/tags.vspx
index 329aced..e8c6f15 100644
--- a/appsrc/ODS-Addressbook/www/tags.vspx
+++ b/appsrc/ODS-Addressbook/www/tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tags.vspx,v 1.2.2.4 2012/03/08 10:46:12 source Exp $
+ - $Id: tags.vspx,v 1.2.2.3 2011/05/02 14:16:25 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/www/template/popup.vspx b/appsrc/ODS-Addressbook/www/template/popup.vspx
index 687c4c0..59f1787 100644
--- a/appsrc/ODS-Addressbook/www/template/popup.vspx
+++ b/appsrc/ODS-Addressbook/www/template/popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: popup.vspx,v 1.7.2.13 2012/03/08 12:08:39 source Exp $
+ - $Id: popup.vspx,v 1.7.2.11 2011/07/04 10:04:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -68,7 +68,6 @@
<v:variable persist="0" name="domain_id" type="integer" default="-1"/>
<v:variable persist="0" name="account_id" type="integer" default="-1"/>
<v:variable persist="0" name="account_rights" type="varchar" default="''"/>
- <v:variable persist="0" name="person_rights" type="varchar" default="''" />
<v:variable persist="0" name="settings" type="any" />
<v:variable persist="0" name="rdf_iri" type="varchar" default="null" />
<v:on-init>
@@ -83,7 +82,6 @@
self.domain_id := cast(get_keyword('domain_id', aSessInfo, '-1') as integer);
self.account_id := cast (get_keyword ('account_id', aSessInfo, '-1') as integer);
self.account_rights := get_keyword ('account_rights', aSessInfo, '');
- self.person_rights := get_keyword ('person_rights', aSessInfo);
self.settings := AB.WA.settings (self.domain_id);
]]>
</v:on-init>
diff --git a/appsrc/ODS-Addressbook/www/template/template.vspx b/appsrc/ODS-Addressbook/www/template/template.vspx
index 8e1037f..148c510 100644
--- a/appsrc/ODS-Addressbook/www/template/template.vspx
+++ b/appsrc/ODS-Addressbook/www/template/template.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.vspx,v 1.26.2.18 2012/03/08 12:08:39 source Exp $
+ - $Id: template.vspx,v 1.26.2.16 2011/07/04 10:04:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -65,6 +65,11 @@
connectionHeaders: {Authorization: '<?V AB.WA.account_basicAuthorization (self.account_id) ?>'}
};
+ /* load stylesheets */
+ OAT.Style.include("grid.css");
+ OAT.Style.include("webdav.css");
+ OAT.Style.include("winms.css");
+
var featureList=["ajax", "json", "anchor", "dialog", "panelbar", "combolist", "calendar"];
OAT.Loader.load(featureList);
</script>
@@ -150,7 +155,6 @@
<v:variable persist="0" name="domain_id" type="integer" default="-1" />
<v:variable persist="0" name="account_id" type="integer" default="-1" />
<v:variable persist="0" name="account_rights" type="varchar" default="''" />
- <v:variable persist="0" name="person_rights" type="varchar" default="''" />
<v:variable persist="0" name="settings" type="any" />
<v:variable persist="0" name="rdf_iri" type="varchar" default="null" />
<v:on-init>
@@ -165,7 +169,6 @@
self.domain_id := cast(get_keyword('domain_id', aSessInfo, '-1') as integer);
self.account_id := cast (get_keyword ('account_id', aSessInfo, '-1') as integer);
self.account_rights := get_keyword ('account_rights', aSessInfo);
- self.person_rights := get_keyword ('person_rights', aSessInfo);
self.settings := vector_concat (vector ('app', DB.DBA.WA_USER_APP_ENABLE (self.account_id)), AB.WA.settings (self.domain_id));
self.vc_add_attribute ('xmlns:foaf', 'http://xmlns.com/foaf/0.1/');
diff --git a/appsrc/ODS-Addressbook/www/template/template.xsl b/appsrc/ODS-Addressbook/www/template/template.xsl
index a74eeda..2702bfe 100644
--- a/appsrc/ODS-Addressbook/www/template/template.xsl
+++ b/appsrc/ODS-Addressbook/www/template/template.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.xsl,v 1.16.2.12 2012/03/08 12:08:39 source Exp $
+ - $Id: template.xsl,v 1.16.2.10 2011/05/02 14:16:25 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -190,7 +190,7 @@
<?vsp http (AB.WA.utf2wide (AB.WA.banner_links (self.domain_id, self.sid, self.realm))); ?>
</div>
<div style="float: right; padding-right: 0.5em;">
- <vm:if test="self.person_rights = 'W'">
+ <vm:if test="self.account_rights = 'W'">
<a href="<?vsp http (AB.WA.utf2wide (AB.WA.page_url (self.domain_id, 'home.vspx?action=settings', self.sid, self.realm))); ?>" title="Preferences">Preferences</a>
|
</vm:if>
diff --git a/appsrc/ODS-Addressbook/xslt/rss2atom.xsl b/appsrc/ODS-Addressbook/xslt/rss2atom.xsl
index 1482750..641213c 100644
--- a/appsrc/ODS-Addressbook/xslt/rss2atom.xsl
+++ b/appsrc/ODS-Addressbook/xslt/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.2.2.3 2012/03/08 10:46:13 source Exp $
+ - $Id: rss2atom.xsl,v 1.2.2.2 2010/09/20 10:14:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl b/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl
index ef6d140..2505311 100644
--- a/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl
+++ b/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: rss2atom03.xsl,v 1.2.2.1 2010/09/20 10:14:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl b/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl
index 548b32d..6556b06 100644
--- a/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl
+++ b/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: rss2rdf.xsl,v 1.2.2.1 2010/09/20 10:14:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl b/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl
index 4183969..59a9eeb 100644
--- a/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl
+++ b/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.1.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: rss2xbel.xsl,v 1.1.2.1 2010/09/20 10:14:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Blog/Makefile.am b/appsrc/ODS-Blog/Makefile.am
index d133381..e2d15e3 100644
--- a/appsrc/ODS-Blog/Makefile.am
+++ b/appsrc/ODS-Blog/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/Makefile.in b/appsrc/ODS-Blog/Makefile.in
index 6ca93f2..d0d0767 100644
--- a/appsrc/ODS-Blog/Makefile.in
+++ b/appsrc/ODS-Blog/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/appsrc/ODS-Blog/atom_pub.sql b/appsrc/ODS-Blog/atom_pub.sql
index 87dc12c..2eaa139 100644
--- a/appsrc/ODS-Blog/atom_pub.sql
+++ b/appsrc/ODS-Blog/atom_pub.sql
@@ -1,12 +1,12 @@
--
--- $Id: atom_pub.sql,v 1.3.2.3 2012/03/08 12:03:12 source Exp $
+-- $Id: atom_pub.sql,v 1.3.2.1 2010/09/20 10:14:42 source Exp $
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -288,11 +288,11 @@ atom_req_headers (in req "blogRequest", in what int := 0)
if (req.user_name is not null)
{
b := encode_base64 (req.user_name||':'||req.passwd);
- return sprintf ('%s: application/atom+xml\r\nAuthorization: Basic %s', case when what = 0 then 'Content-Type' else 'Accept' end, b);
+ return sprintf ('%s: application/x.atom+xml\r\nAuthorization: Basic %s', case when what = 0 then 'Content-Type' else 'Accept' end, b);
}
else
{
- return sprintf ('%s: application/atom+xml', case when what = 0 then 'Content-Type' else 'Accept' end);
+ return sprintf ('%s: application/x.atom+xml', case when what = 0 then 'Content-Type' else 'Accept' end);
}
}
;
diff --git a/appsrc/ODS-Blog/blog.sql b/appsrc/ODS-Blog/blog.sql
index 59c7592..167c022 100644
--- a/appsrc/ODS-Blog/blog.sql
+++ b/appsrc/ODS-Blog/blog.sql
@@ -1,12 +1,12 @@
--
--- $Id: blog.sql,v 1.20.2.9 2012/03/08 12:03:12 source Exp $
+-- $Id: blog.sql,v 1.20.2.7 2010/12/07 10:59:24 source Exp $
--
-- Blogger API support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -666,7 +666,6 @@ blog2_exec_no_error ('create table SYS_BLOG_CHANNEL_FEEDS
CF_PUBDATE datetime,
CF_COMMENT_API varchar,
CF_COMMENT_RSS varchar,
- CF_READ int,
primary key (CF_CHANNEL_URI, CF_ID)
)')
;
@@ -885,7 +884,7 @@ insert soft SYS_ROUTING_TYPE (RT_ID, RT_NAME, RT_TYPE_DESCRIPTION) values (3, 'd
insert soft SYS_ROUTING_TYPE (RT_ID, RT_NAME, RT_TYPE_DESCRIPTION) values (4, 'Ping', 'Weblog ping')
;
--- Routing Protocol Table Structure:
+-- Routing Procotol Table Structure:
blog2_exec_no_error ('create table SYS_ROUTING_PROTOCOL
(
RP_ID int primary key,
diff --git a/appsrc/ODS-Blog/conv.sql b/appsrc/ODS-Blog/conv.sql
index 2520a1b..1cc1bbc 100644
--- a/appsrc/ODS-Blog/conv.sql
+++ b/appsrc/ODS-Blog/conv.sql
@@ -1,10 +1,10 @@
--
--- $Id: conv.sql,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+-- $Id: conv.sql,v 1.4.2.1 2010/09/20 10:14:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/dav_browser.sql b/appsrc/ODS-Blog/dav_browser.sql
index 257a463..0d5a620 100644
--- a/appsrc/ODS-Blog/dav_browser.sql
+++ b/appsrc/ODS-Blog/dav_browser.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_browser.sql,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+-- $Id: dav_browser.sql,v 1.3.2.1 2010/09/20 10:14:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/gdata.sql b/appsrc/ODS-Blog/gdata.sql
index e55cacc..4765976 100644
--- a/appsrc/ODS-Blog/gdata.sql
+++ b/appsrc/ODS-Blog/gdata.sql
@@ -1,12 +1,12 @@
--
--- $Id: gdata.sql,v 1.4.2.3 2012/03/08 12:03:12 source Exp $
+-- $Id: gdata.sql,v 1.4.2.1 2010/09/20 10:14:42 source Exp $
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -121,8 +121,8 @@ create procedure ATOM.ATOM.gdata
id := path [5];
ver := null;
- --if (length (path) > 6 and atoi (id) > 0)
- -- ver := atoi (path [6]);
+ if (length (path) > 6 and atoi (id) > 0)
+ ver := atoi (path [6]);
if (blogid is null)
{
diff --git a/appsrc/ODS-Blog/index.vsp b/appsrc/ODS-Blog/index.vsp
index 6eeb9c8..9f71613 100644
--- a/appsrc/ODS-Blog/index.vsp
+++ b/appsrc/ODS-Blog/index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index.vsp,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+-- $Id: index.vsp,v 1.3.2.1 2010/09/20 10:14:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/index.vspx b/appsrc/ODS-Blog/index.vspx
index 7e1a1fb..ed4abd3 100644
--- a/appsrc/ODS-Blog/index.vspx
+++ b/appsrc/ODS-Blog/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.3.2.1 2010/09/20 10:14:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/install.sql b/appsrc/ODS-Blog/install.sql
index 64f92b9..72f8670 100644
--- a/appsrc/ODS-Blog/install.sql
+++ b/appsrc/ODS-Blog/install.sql
@@ -1,10 +1,10 @@
--
--- $Id: install.sql,v 1.25.2.9 2012/03/08 10:46:13 source Exp $
+-- $Id: install.sql,v 1.25.2.8 2010/11/09 20:15:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/make_vad.sh b/appsrc/ODS-Blog/make_vad.sh
index 44cc689..7bd3462 100755
--- a/appsrc/ODS-Blog/make_vad.sh
+++ b/appsrc/ODS-Blog/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.22.2.12 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.22.2.10 2011/05/18 21:17:54 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -59,7 +59,6 @@ TEMPFILE=/tmp/isql.$$
LN="ln -fs"
RM="rm -f"
fi
-
VOS=0
if [ -f ../../autogen.sh ]
then
@@ -85,7 +84,7 @@ else
myrm=rm
fi
-version_init()
+VERSION_INIT()
{
if [ $VOS -eq 1 ]
then
@@ -282,7 +281,7 @@ sticker_init() {
echo " <name package=\"Weblog\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Weblog\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso/blog2/download\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso/blog2/download\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -463,7 +462,7 @@ BANNER "STARTED PACKAGING BLOG VAD"
STOP_SERVER
$myrm $LOGFILE 2>/dev/null
directory_clean
-version_init
+VERSION_INIT
directory_init
virtuoso_init
sticker_init
@@ -471,6 +470,7 @@ vad_create
virtuoso_shutdown
chmod 644 ods_blog_dav.vad
#chmod 644 virtuoso.trx
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -480,7 +480,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Blog/public/back_nav.vspx b/appsrc/ODS-Blog/public/back_nav.vspx
index e80c82b..a4586ef 100644
--- a/appsrc/ODS-Blog/public/back_nav.vspx
+++ b/appsrc/ODS-Blog/public/back_nav.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: back_nav.vspx,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: back_nav.vspx,v 1.3.2.1 2010/09/20 10:14:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/c_confirm.vspx b/appsrc/ODS-Blog/public/c_confirm.vspx
index 9beeab4..34727bd 100644
--- a/appsrc/ODS-Blog/public/c_confirm.vspx
+++ b/appsrc/ODS-Blog/public/c_confirm.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: c_confirm.vspx,v 1.5.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: c_confirm.vspx,v 1.5.2.1 2010/09/20 10:14:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/css/dav.css b/appsrc/ODS-Blog/public/css/dav.css
index 90c94df..0ac3769 100644
--- a/appsrc/ODS-Blog/public/css/dav.css
+++ b/appsrc/ODS-Blog/public/css/dav.css
@@ -1,10 +1,10 @@
/*
- * $Id: dav.css,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: dav.css,v 1.2.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/css/default.css b/appsrc/ODS-Blog/public/css/default.css
index f112105..bdd10b3 100644
--- a/appsrc/ODS-Blog/public/css/default.css
+++ b/appsrc/ODS-Blog/public/css/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.2.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/css/rte.css b/appsrc/ODS-Blog/public/css/rte.css
index 1f3844c..0dadda8 100644
--- a/appsrc/ODS-Blog/public/css/rte.css
+++ b/appsrc/ODS-Blog/public/css/rte.css
@@ -1,10 +1,10 @@
/*
- * $Id: rte.css,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: rte.css,v 1.3.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/css/webdav.css b/appsrc/ODS-Blog/public/css/webdav.css
index 6ed567f..df4618a 100644
--- a/appsrc/ODS-Blog/public/css/webdav.css
+++ b/appsrc/ODS-Blog/public/css/webdav.css
@@ -1,9 +1,9 @@
/*
- * $Id: webdav.css,v 1.1.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: webdav.css,v 1.1.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2007 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/appsrc/ODS-Blog/public/openid_helper.vsp b/appsrc/ODS-Blog/public/openid_helper.vsp
index 06e121f..a645a2e 100644
--- a/appsrc/ODS-Blog/public/openid_helper.vsp
+++ b/appsrc/ODS-Blog/public/openid_helper.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: openid_helper.vsp,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+-- $Id: openid_helper.vsp,v 1.3.2.1 2010/09/20 10:14:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/popup_browser.vspx b/appsrc/ODS-Blog/public/popup_browser.vspx
index 55996be..cf48ffc 100644
--- a/appsrc/ODS-Blog/public/popup_browser.vspx
+++ b/appsrc/ODS-Blog/public/popup_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: popup_browser.vspx,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: popup_browser.vspx,v 1.3.2.1 2010/09/20 10:14:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/r_unsubscribe.vspx b/appsrc/ODS-Blog/public/r_unsubscribe.vspx
index dd92687..76ca18a 100644
--- a/appsrc/ODS-Blog/public/r_unsubscribe.vspx
+++ b/appsrc/ODS-Blog/public/r_unsubscribe.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: r_unsubscribe.vspx,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: r_unsubscribe.vspx,v 1.3.2.1 2010/09/20 10:14:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/scripts/browserdetect.js b/appsrc/ODS-Blog/public/scripts/browserdetect.js
index 60ce5e8..d3b717a 100644
--- a/appsrc/ODS-Blog/public/scripts/browserdetect.js
+++ b/appsrc/ODS-Blog/public/scripts/browserdetect.js
@@ -1,10 +1,10 @@
/*
- * $Id: browserdetect.js,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: browserdetect.js,v 1.2.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/scripts/entry.js b/appsrc/ODS-Blog/public/scripts/entry.js
index 5144a35..38a2bb8 100644
--- a/appsrc/ODS-Blog/public/scripts/entry.js
+++ b/appsrc/ODS-Blog/public/scripts/entry.js
@@ -1,10 +1,10 @@
/*
- * $Id: entry.js,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: entry.js,v 1.2.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/scripts/form.js b/appsrc/ODS-Blog/public/scripts/form.js
index 7b923dc..985191f 100644
--- a/appsrc/ODS-Blog/public/scripts/form.js
+++ b/appsrc/ODS-Blog/public/scripts/form.js
@@ -1,10 +1,10 @@
/*
- * $Id: form.js,v 1.6.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: form.js,v 1.6.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/scripts/openid.js b/appsrc/ODS-Blog/public/scripts/openid.js
index 28ab248..2bc7e9b 100644
--- a/appsrc/ODS-Blog/public/scripts/openid.js
+++ b/appsrc/ODS-Blog/public/scripts/openid.js
@@ -1,10 +1,10 @@
/*
- * $Id: openid.js,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: openid.js,v 1.2.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/scripts/plugins.js b/appsrc/ODS-Blog/public/scripts/plugins.js
index 414cab0..934dd03 100644
--- a/appsrc/ODS-Blog/public/scripts/plugins.js
+++ b/appsrc/ODS-Blog/public/scripts/plugins.js
@@ -1,10 +1,10 @@
/*
- * $Id: plugins.js,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: plugins.js,v 1.2.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/search.vspx b/appsrc/ODS-Blog/public/search.vspx
index 767ee23..123203c 100644
--- a/appsrc/ODS-Blog/public/search.vspx
+++ b/appsrc/ODS-Blog/public/search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.vspx,v 1.11.2.4 2012/03/08 12:03:12 source Exp $
+ - $Id: search.vspx,v 1.11.2.2 2010/09/20 10:14:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1285,9 +1285,7 @@
http ('<title>');
http_value (BLOG..blog_utf2wide(elm[2]));
http ('</title>');
- http ('<link>');
- if (elm[1] not like '%://%')
- http (sprintf ('http://%s', BLOG.DBA.BLOG_GET_HOST ()));
+ http (sprintf ('<link>http://%s', BLOG.DBA.BLOG_GET_HOST ()));
http_value (elm[1]);
http ('</link>');
http ('<pubDate>');
diff --git a/appsrc/ODS-Blog/public/view.vspx b/appsrc/ODS-Blog/public/view.vspx
index 459b25e..d2e46a6 100644
--- a/appsrc/ODS-Blog/public/view.vspx
+++ b/appsrc/ODS-Blog/public/view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: view.vspx,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: view.vspx,v 1.3.2.1 2010/09/20 10:14:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/public/view_file.vspx b/appsrc/ODS-Blog/public/view_file.vspx
index f88f1ed..0e6300a 100644
--- a/appsrc/ODS-Blog/public/view_file.vspx
+++ b/appsrc/ODS-Blog/public/view_file.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: view_file.vspx,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: view_file.vspx,v 1.3.2.1 2010/09/20 10:14:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/sioc_blog.sql b/appsrc/ODS-Blog/sioc_blog.sql
index 259127b..a4f7882 100644
--- a/appsrc/ODS-Blog/sioc_blog.sql
+++ b/appsrc/ODS-Blog/sioc_blog.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_blog.sql,v 1.14.2.5 2012/03/08 10:46:13 source Exp $
+-- $Id: sioc_blog.sql,v 1.14.2.4 2011/05/18 21:17:54 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/template.sql b/appsrc/ODS-Blog/template.sql
index 91303ad..9dcb8d7 100644
--- a/appsrc/ODS-Blog/template.sql
+++ b/appsrc/ODS-Blog/template.sql
@@ -1,10 +1,10 @@
--
--- $Id: template.sql,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+-- $Id: template.sql,v 1.4.2.1 2010/09/20 10:14:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/atlantis/default.css b/appsrc/ODS-Blog/templates/atlantis/default.css
index 01777bf..3734382 100644
--- a/appsrc/ODS-Blog/templates/atlantis/default.css
+++ b/appsrc/ODS-Blog/templates/atlantis/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.2 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.2.2.1 2010/09/20 10:14:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/atlantis/index.vspx b/appsrc/ODS-Blog/templates/atlantis/index.vspx
index a49d555..0030e47 100644
--- a/appsrc/ODS-Blog/templates/atlantis/index.vspx
+++ b/appsrc/ODS-Blog/templates/atlantis/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/autumn/default.css b/appsrc/ODS-Blog/templates/autumn/default.css
index 04ea96a..159215d 100644
--- a/appsrc/ODS-Blog/templates/autumn/default.css
+++ b/appsrc/ODS-Blog/templates/autumn/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:45 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/autumn/index.vspx b/appsrc/ODS-Blog/templates/autumn/index.vspx
index 92bbc39..76baed3 100644
--- a/appsrc/ODS-Blog/templates/autumn/index.vspx
+++ b/appsrc/ODS-Blog/templates/autumn/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/blue_left/default.css b/appsrc/ODS-Blog/templates/blue_left/default.css
index 7762bb0..e71a434 100644
--- a/appsrc/ODS-Blog/templates/blue_left/default.css
+++ b/appsrc/ODS-Blog/templates/blue_left/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:45 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/blue_left/index.vspx b/appsrc/ODS-Blog/templates/blue_left/index.vspx
index fb9dbd0..c137b74 100644
--- a/appsrc/ODS-Blog/templates/blue_left/index.vspx
+++ b/appsrc/ODS-Blog/templates/blue_left/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/archive.vspx b/appsrc/ODS-Blog/templates/columns_clean/archive.vspx
index 7633b44..6fe7b69 100644
--- a/appsrc/ODS-Blog/templates/columns_clean/archive.vspx
+++ b/appsrc/ODS-Blog/templates/columns_clean/archive.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: archive.vspx,v 1.1.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: archive.vspx,v 1.1.2.1 2010/09/20 10:14:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/default.css b/appsrc/ODS-Blog/templates/columns_clean/default.css
index 27acca1..de79bef 100644
--- a/appsrc/ODS-Blog/templates/columns_clean/default.css
+++ b/appsrc/ODS-Blog/templates/columns_clean/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.1.2.3 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.1.2.2 2010/09/20 10:14:45 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/index.vspx b/appsrc/ODS-Blog/templates/columns_clean/index.vspx
index cfac4df..ef1a0ac 100644
--- a/appsrc/ODS-Blog/templates/columns_clean/index.vspx
+++ b/appsrc/ODS-Blog/templates/columns_clean/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.1.2.3 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.1.2.2 2010/09/20 10:14:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx b/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx
index 01be51c..1260422 100644
--- a/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx
+++ b/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: linkblog.vspx,v 1.1.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: linkblog.vspx,v 1.1.2.1 2010/09/20 10:14:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/columns_clean/summary.vspx b/appsrc/ODS-Blog/templates/columns_clean/summary.vspx
index 80893af..744e85f 100644
--- a/appsrc/ODS-Blog/templates/columns_clean/summary.vspx
+++ b/appsrc/ODS-Blog/templates/columns_clean/summary.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: summary.vspx,v 1.1.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: summary.vspx,v 1.1.2.1 2010/09/20 10:14:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/default/default.css b/appsrc/ODS-Blog/templates/default/default.css
index 414c2c0..41c6c5d 100644
--- a/appsrc/ODS-Blog/templates/default/default.css
+++ b/appsrc/ODS-Blog/templates/default/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:45 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/default/index.vspx b/appsrc/ODS-Blog/templates/default/index.vspx
index b1f34a2..6c6ac7c 100644
--- a/appsrc/ODS-Blog/templates/default/index.vspx
+++ b/appsrc/ODS-Blog/templates/default/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/default/red.css b/appsrc/ODS-Blog/templates/default/red.css
index c17dc71..0c1c97e 100644
--- a/appsrc/ODS-Blog/templates/default/red.css
+++ b/appsrc/ODS-Blog/templates/default/red.css
@@ -1,10 +1,10 @@
/*
- * $Id: red.css,v 1.3.2.3 2012/03/08 10:46:13 source Exp $
+ * $Id: red.css,v 1.3.2.2 2010/09/20 10:14:45 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx
index ae5cb05..19dbf9c 100755
--- a/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx
+++ b/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
-- $Id: archive.vspx,v 1.1.4.3 2012/03/08 10:46:13 source Exp $
+- $Id: archive.vspx,v 1.1.4.2 2010/09/22 13:56:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
-- Copyright (C) 1998-2012 OpenLink Software
+- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/default.css b/appsrc/ODS-Blog/templates/digital_bazaar/default.css
index 44075b4..a79512d 100755
--- a/appsrc/ODS-Blog/templates/digital_bazaar/default.css
+++ b/appsrc/ODS-Blog/templates/digital_bazaar/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.1.4.4 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.1.4.3 2010/09/22 13:56:49 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx
index 23b2e59..5ef5716 100755
--- a/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx
+++ b/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
-- $Id: index.vspx,v 1.1.4.5 2012/03/08 10:46:13 source Exp $
+- $Id: index.vspx,v 1.1.4.4 2010/10/07 13:24:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx
index f3a741e..c6794c6 100755
--- a/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx
+++ b/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: linkblog.vspx,v 1.1.4.3 2012/03/08 10:46:13 source Exp $
+ - $Id: linkblog.vspx,v 1.1.4.2 2010/09/27 14:45:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx
index 0f55bdd..4761607 100755
--- a/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx
+++ b/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
-- $Id: summary.vspx,v 1.1.4.3 2012/03/08 10:46:13 source Exp $
+- $Id: summary.vspx,v 1.1.4.2 2010/09/22 13:56:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
-- Copyright (C) 1998-2012 OpenLink Software
+- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/main.vspx b/appsrc/ODS-Blog/templates/main.vspx
index 5af574a..46f2a92 100644
--- a/appsrc/ODS-Blog/templates/main.vspx
+++ b/appsrc/ODS-Blog/templates/main.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: main.vspx,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: main.vspx,v 1.4.2.1 2010/09/20 10:14:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/micro/default.css b/appsrc/ODS-Blog/templates/micro/default.css
index dff5034..f29b355 100644
--- a/appsrc/ODS-Blog/templates/micro/default.css
+++ b/appsrc/ODS-Blog/templates/micro/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.1.4.3 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.1.4.2 2010/12/07 10:59:24 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-Blog/templates/micro/index.vspx b/appsrc/ODS-Blog/templates/micro/index.vspx
index fd2a01b..8f85d8b 100644
--- a/appsrc/ODS-Blog/templates/micro/index.vspx
+++ b/appsrc/ODS-Blog/templates/micro/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.1.4.3 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.1.4.2 2010/12/07 10:59:24 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-Blog/templates/modern/default.css b/appsrc/ODS-Blog/templates/modern/default.css
index 333cdc7..70376aa 100644
--- a/appsrc/ODS-Blog/templates/modern/default.css
+++ b/appsrc/ODS-Blog/templates/modern/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:45 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/modern/index.vspx b/appsrc/ODS-Blog/templates/modern/index.vspx
index ca17703..9b8a651 100644
--- a/appsrc/ODS-Blog/templates/modern/index.vspx
+++ b/appsrc/ODS-Blog/templates/modern/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/modern/red.css b/appsrc/ODS-Blog/templates/modern/red.css
index 31c7cbc..2a9839f 100644
--- a/appsrc/ODS-Blog/templates/modern/red.css
+++ b/appsrc/ODS-Blog/templates/modern/red.css
@@ -1,10 +1,10 @@
/*
- * $Id: red.css,v 1.3.2.3 2012/03/08 10:46:13 source Exp $
+ * $Id: red.css,v 1.3.2.2 2010/09/20 10:14:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx b/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx
index abbee15..d536cde 100755
--- a/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx
+++ b/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: archive.vspx,v 1.1.4.3 2012/03/08 10:46:13 source Exp $
+ - $Id: archive.vspx,v 1.1.4.2 2010/09/22 13:56:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/default.css b/appsrc/ODS-Blog/templates/newspaper_view/default.css
index 988c81b..ff29242 100755
--- a/appsrc/ODS-Blog/templates/newspaper_view/default.css
+++ b/appsrc/ODS-Blog/templates/newspaper_view/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.1.4.4 2012/03/08 10:46:13 source Exp $
+ * $Id: default.css,v 1.1.4.3 2010/09/22 13:56:49 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/index.vspx b/appsrc/ODS-Blog/templates/newspaper_view/index.vspx
index af6c3e6..752b6ae 100755
--- a/appsrc/ODS-Blog/templates/newspaper_view/index.vspx
+++ b/appsrc/ODS-Blog/templates/newspaper_view/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.1.4.4 2012/03/08 10:46:13 source Exp $
+ - $Id: index.vspx,v 1.1.4.3 2010/09/22 13:56:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx b/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx
index 11fc413..31b03dd 100755
--- a/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx
+++ b/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: linkblog.vspx,v 1.1.4.3 2012/03/08 10:46:13 source Exp $
+ - $Id: linkblog.vspx,v 1.1.4.2 2010/09/27 14:45:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx b/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx
index 7295642..3f028ef 100755
--- a/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx
+++ b/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: summary.vspx,v 1.1.4.3 2012/03/08 10:46:13 source Exp $
+ - $Id: summary.vspx,v 1.1.4.2 2010/09/22 13:56:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/about.vspx b/appsrc/ODS-Blog/templates/openlink/about.vspx
index 02094aa..a3907d5 100644
--- a/appsrc/ODS-Blog/templates/openlink/about.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/about.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: about.vspx,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: about.vspx,v 1.3.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/archive.vspx b/appsrc/ODS-Blog/templates/openlink/archive.vspx
index d62c34a..332f3ee 100644
--- a/appsrc/ODS-Blog/templates/openlink/archive.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/archive.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: archive.vspx,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: archive.vspx,v 1.4.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/bridge.vspx b/appsrc/ODS-Blog/templates/openlink/bridge.vspx
index 0517302..6f76089 100644
--- a/appsrc/ODS-Blog/templates/openlink/bridge.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/bridge.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bridge.vspx,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: bridge.vspx,v 1.4.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/category.vspx b/appsrc/ODS-Blog/templates/openlink/category.vspx
index 2f35feb..4623ca3 100644
--- a/appsrc/ODS-Blog/templates/openlink/category.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/category.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: category.vspx,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: category.vspx,v 1.4.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/channel_list.vspx b/appsrc/ODS-Blog/templates/openlink/channel_list.vspx
index 5b9b522..a2fcb2a 100644
--- a/appsrc/ODS-Blog/templates/openlink/channel_list.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/channel_list.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: channel_list.vspx,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: channel_list.vspx,v 1.4.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/channels.vspx b/appsrc/ODS-Blog/templates/openlink/channels.vspx
index 5f28d17..ac8d7f8 100644
--- a/appsrc/ODS-Blog/templates/openlink/channels.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/channels.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: channels.vspx,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: channels.vspx,v 1.4.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx b/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx
index 2a7aa49..9794126 100644
--- a/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: channels_ctgs.vspx,v 1.4.2.2 2012/03/08 10:46:13 source Exp $
+ - $Id: channels_ctgs.vspx,v 1.4.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/comments.vspx b/appsrc/ODS-Blog/templates/openlink/comments.vspx
index e04dde8..0ee2c8c 100644
--- a/appsrc/ODS-Blog/templates/openlink/comments.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/comments.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: comments.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: comments.vspx,v 1.4.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/community.vspx b/appsrc/ODS-Blog/templates/openlink/community.vspx
index ddbc0ac..cac3f11 100644
--- a/appsrc/ODS-Blog/templates/openlink/community.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/community.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: community.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: community.vspx,v 1.4.2.1 2010/09/20 10:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/contacts.vspx b/appsrc/ODS-Blog/templates/openlink/contacts.vspx
index 9f9ef32..0ad9454 100644
--- a/appsrc/ODS-Blog/templates/openlink/contacts.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/contacts.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: contacts.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: contacts.vspx,v 1.4.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/default.css b/appsrc/ODS-Blog/templates/openlink/default.css
index 776c62c..1320fe6 100644
--- a/appsrc/ODS-Blog/templates/openlink/default.css
+++ b/appsrc/ODS-Blog/templates/openlink/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.10.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.10.2.2 2010/09/20 10:14:47 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/edit.vspx b/appsrc/ODS-Blog/templates/openlink/edit.vspx
index e4677e2..4564ff9 100644
--- a/appsrc/ODS-Blog/templates/openlink/edit.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: edit.vspx,v 1.4.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: edit.vspx,v 1.4.2.2 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx b/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx
index 53dfed5..6e0d74f 100644
--- a/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: edit_comments.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: edit_comments.vspx,v 1.4.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/edit_post.vspx b/appsrc/ODS-Blog/templates/openlink/edit_post.vspx
index 2010bc5..43e249f 100644
--- a/appsrc/ODS-Blog/templates/openlink/edit_post.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/edit_post.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: edit_post.vspx,v 1.5.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: edit_post.vspx,v 1.5.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx b/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx
index 65914a6..bacb7b0 100644
--- a/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: edit_tb.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: edit_tb.vspx,v 1.4.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/errors.vspx b/appsrc/ODS-Blog/templates/openlink/errors.vspx
index 5f95181..5f4f3c4 100644
--- a/appsrc/ODS-Blog/templates/openlink/errors.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/errors.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: errors.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: errors.vspx,v 1.3.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/feed_list.vspx b/appsrc/ODS-Blog/templates/openlink/feed_list.vspx
index b36d9c2..f68cad2 100644
--- a/appsrc/ODS-Blog/templates/openlink/feed_list.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/feed_list.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: feed_list.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: feed_list.vspx,v 1.3.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/feed_view.vspx b/appsrc/ODS-Blog/templates/openlink/feed_view.vspx
index a70cbe6..d1a812d 100644
--- a/appsrc/ODS-Blog/templates/openlink/feed_view.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/feed_view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: feed_view.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: feed_view.vspx,v 1.3.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx b/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx
index efa4c9e..b5b4cf5 100644
--- a/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: get_blogs.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: get_blogs.vspx,v 1.3.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/get_tags.vspx b/appsrc/ODS-Blog/templates/openlink/get_tags.vspx
index 0bbf904..0a2a0e4 100644
--- a/appsrc/ODS-Blog/templates/openlink/get_tags.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/get_tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: get_tags.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: get_tags.vspx,v 1.3.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/import.vspx b/appsrc/ODS-Blog/templates/openlink/import.vspx
index d4d09dc..79e8611 100644
--- a/appsrc/ODS-Blog/templates/openlink/import.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/import.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: import.vspx,v 1.1.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: import.vspx,v 1.1.2.1 2010/09/20 10:14:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/index.vspx b/appsrc/ODS-Blog/templates/openlink/index.vspx
index 5402c18..c94cf8e 100644
--- a/appsrc/ODS-Blog/templates/openlink/index.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.14.2.6 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.14.2.5 2010/09/27 14:45:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/linkblog.vspx b/appsrc/ODS-Blog/templates/openlink/linkblog.vspx
index bb17223..6eed82c 100644
--- a/appsrc/ODS-Blog/templates/openlink/linkblog.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/linkblog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: linkblog.vspx,v 1.5.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: linkblog.vspx,v 1.5.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/list_comments.vspx b/appsrc/ODS-Blog/templates/openlink/list_comments.vspx
index 20c2979..d056a89 100644
--- a/appsrc/ODS-Blog/templates/openlink/list_comments.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/list_comments.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: list_comments.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: list_comments.vspx,v 1.4.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/login.vspx b/appsrc/ODS-Blog/templates/openlink/login.vspx
index 796b7de..1ea5a5d 100644
--- a/appsrc/ODS-Blog/templates/openlink/login.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: login.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: login.vspx,v 1.3.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/logout.vspx b/appsrc/ODS-Blog/templates/openlink/logout.vspx
index 663c7bd..d57ed60 100644
--- a/appsrc/ODS-Blog/templates/openlink/logout.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/logout.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logout.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: logout.vspx,v 1.3.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/member_data.vspx b/appsrc/ODS-Blog/templates/openlink/member_data.vspx
index 268ce98..4267f1d 100644
--- a/appsrc/ODS-Blog/templates/openlink/member_data.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/member_data.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: member_data.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: member_data.vspx,v 1.4.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/membership.vspx b/appsrc/ODS-Blog/templates/openlink/membership.vspx
index eed381d..68c65d9 100644
--- a/appsrc/ODS-Blog/templates/openlink/membership.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/membership.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: membership.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: membership.vspx,v 1.4.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx b/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx
index c97b039..4d36575 100644
--- a/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: moblog_mime_select.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: moblog_mime_select.vspx,v 1.3.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx b/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx
index 3d3c9f3..bac7b61 100644
--- a/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: moblog_msg.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: moblog_msg.vspx,v 1.4.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx b/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx
index b71108d..8d370c0 100644
--- a/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: moblogimage.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: moblogimage.vspx,v 1.4.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/ping.vspx b/appsrc/ODS-Blog/templates/openlink/ping.vspx
index c3c2720..4776b24 100644
--- a/appsrc/ODS-Blog/templates/openlink/ping.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/ping.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ping.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: ping.vspx,v 1.4.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx b/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx
index f8ae40e..b50e03a 100644
--- a/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ping_queue.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: ping_queue.vspx,v 1.4.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/posts.vspx b/appsrc/ODS-Blog/templates/openlink/posts.vspx
index 5a9a977..c3d8915 100644
--- a/appsrc/ODS-Blog/templates/openlink/posts.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/posts.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: posts.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: posts.vspx,v 1.4.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/register.vspx b/appsrc/ODS-Blog/templates/openlink/register.vspx
index ef0c07b..734b500 100644
--- a/appsrc/ODS-Blog/templates/openlink/register.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/register.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: register.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: register.vspx,v 1.3.2.1 2010/09/20 10:14:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx b/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx
index 5eb7b67..c181626 100644
--- a/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: routing_queue.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: routing_queue.vspx,v 1.4.2.1 2010/09/20 10:14:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx b/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx
index 6f458be..c11be22 100644
--- a/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: suggest_kwd.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: suggest_kwd.vspx,v 1.3.2.1 2010/09/20 10:14:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx b/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx
index f0d7ee5..5f06703 100644
--- a/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: suggest_tb.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: suggest_tb.vspx,v 1.3.2.1 2010/09/20 10:14:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/summary.vspx b/appsrc/ODS-Blog/templates/openlink/summary.vspx
index 9e39461..5115582 100644
--- a/appsrc/ODS-Blog/templates/openlink/summary.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/summary.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: summary.vspx,v 1.5.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: summary.vspx,v 1.5.2.1 2010/09/20 10:14:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/tags.vspx b/appsrc/ODS-Blog/templates/openlink/tags.vspx
index 80a4e76..0785aa7 100644
--- a/appsrc/ODS-Blog/templates/openlink/tags.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tags.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: tags.vspx,v 1.4.2.1 2010/09/20 10:14:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/templates.vspx b/appsrc/ODS-Blog/templates/openlink/templates.vspx
index 7300891..63b8ab9 100644
--- a/appsrc/ODS-Blog/templates/openlink/templates.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/templates.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: templates.vspx,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: templates.vspx,v 1.4.2.1 2010/09/20 10:14:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/wa.vspx b/appsrc/ODS-Blog/templates/openlink/wa.vspx
index 0aa6165..18ce034 100644
--- a/appsrc/ODS-Blog/templates/openlink/wa.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/wa.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wa.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: wa.vspx,v 1.3.2.1 2010/09/20 10:14:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/wa_left.vspx b/appsrc/ODS-Blog/templates/openlink/wa_left.vspx
index 386f163..5d74377 100644
--- a/appsrc/ODS-Blog/templates/openlink/wa_left.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/wa_left.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wa_left.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: wa_left.vspx,v 1.3.2.1 2010/09/20 10:14:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink/wa_right.vspx b/appsrc/ODS-Blog/templates/openlink/wa_right.vspx
index ed068b7..7b266bc 100644
--- a/appsrc/ODS-Blog/templates/openlink/wa_right.vspx
+++ b/appsrc/ODS-Blog/templates/openlink/wa_right.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wa_right.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: wa_right.vspx,v 1.3.2.1 2010/09/20 10:14:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/openlink_classic/default.css b/appsrc/ODS-Blog/templates/openlink_classic/default.css
index 92c1e38..2942fb6 100644
--- a/appsrc/ODS-Blog/templates/openlink_classic/default.css
+++ b/appsrc/ODS-Blog/templates/openlink_classic/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.3.2.1 2010/09/20 10:14:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/round_the_corner/default.css b/appsrc/ODS-Blog/templates/round_the_corner/default.css
index 7c6a5a9..15d91fd 100644
--- a/appsrc/ODS-Blog/templates/round_the_corner/default.css
+++ b/appsrc/ODS-Blog/templates/round_the_corner/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/round_the_corner/index.vspx b/appsrc/ODS-Blog/templates/round_the_corner/index.vspx
index 7c264aa..c8c5c3d 100644
--- a/appsrc/ODS-Blog/templates/round_the_corner/index.vspx
+++ b/appsrc/ODS-Blog/templates/round_the_corner/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/round_wheat/default.css b/appsrc/ODS-Blog/templates/round_wheat/default.css
index 350f0a9..00c74bb 100644
--- a/appsrc/ODS-Blog/templates/round_wheat/default.css
+++ b/appsrc/ODS-Blog/templates/round_wheat/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/round_wheat/index.vspx b/appsrc/ODS-Blog/templates/round_wheat/index.vspx
index 35d6b1a..e588a7d 100644
--- a/appsrc/ODS-Blog/templates/round_wheat/index.vspx
+++ b/appsrc/ODS-Blog/templates/round_wheat/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/seattle/default.css b/appsrc/ODS-Blog/templates/seattle/default.css
index 5d33aa5..d1d2002 100644
--- a/appsrc/ODS-Blog/templates/seattle/default.css
+++ b/appsrc/ODS-Blog/templates/seattle/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.2.2.1 2010/09/20 10:14:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/seattle/index.vspx b/appsrc/ODS-Blog/templates/seattle/index.vspx
index 4d40251..c3929bb 100644
--- a/appsrc/ODS-Blog/templates/seattle/index.vspx
+++ b/appsrc/ODS-Blog/templates/seattle/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/spring/default.css b/appsrc/ODS-Blog/templates/spring/default.css
index 8490eb5..41da667 100644
--- a/appsrc/ODS-Blog/templates/spring/default.css
+++ b/appsrc/ODS-Blog/templates/spring/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.2.2.1 2010/09/20 10:14:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/spring/index.vspx b/appsrc/ODS-Blog/templates/spring/index.vspx
index 64276a6..1a22c18 100644
--- a/appsrc/ODS-Blog/templates/spring/index.vspx
+++ b/appsrc/ODS-Blog/templates/spring/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx
index c4c3f31..830938e 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx
+++ b/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: archive.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: archive.vspx,v 1.3.2.1 2010/09/20 10:14:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/default.css b/appsrc/ODS-Blog/templates/squeaky_clean/default.css
index e535612..fa12836 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean/default.css
+++ b/appsrc/ODS-Blog/templates/squeaky_clean/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx
index 9a6902d..56d5b28 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx
+++ b/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx
index da290bc..5309bd0 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx
+++ b/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: linkblog.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: linkblog.vspx,v 1.3.2.1 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/mr_green_genes.css b/appsrc/ODS-Blog/templates/squeaky_clean/mr_green_genes.css
index 434048f..1053cfd 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean/mr_green_genes.css
+++ b/appsrc/ODS-Blog/templates/squeaky_clean/mr_green_genes.css
@@ -1,10 +1,10 @@
/*
- * $Id: mr_green_genes.css,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: mr_green_genes.css,v 1.2.2.2 2010/09/20 10:14:51 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx
index 19455b7..750c846 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx
+++ b/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: summary.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: summary.vspx,v 1.3.2.1 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx
index 02ae2b9..669eff7 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx
+++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: archive.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: archive.vspx,v 1.3.2.1 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css b/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css
index 277dbcb..7a512b1 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css
+++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:51 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx
index d1beb71..4e0ed4f 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx
+++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx
index 82a0b39..b8fb4a4 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx
+++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: linkblog.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: linkblog.vspx,v 1.3.2.1 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/mr_green_genes.css b/appsrc/ODS-Blog/templates/squeaky_clean_2col/mr_green_genes.css
index 434048f..1053cfd 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/mr_green_genes.css
+++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/mr_green_genes.css
@@ -1,10 +1,10 @@
/*
- * $Id: mr_green_genes.css,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: mr_green_genes.css,v 1.2.2.2 2010/09/20 10:14:51 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx
index b1bb4e8..63df308 100644
--- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx
+++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: summary.vspx,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: summary.vspx,v 1.3.2.1 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/thin_clean/default.css b/appsrc/ODS-Blog/templates/thin_clean/default.css
index 200b441..9ad5c12 100644
--- a/appsrc/ODS-Blog/templates/thin_clean/default.css
+++ b/appsrc/ODS-Blog/templates/thin_clean/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:51 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/thin_clean/index.vspx b/appsrc/ODS-Blog/templates/thin_clean/index.vspx
index 8099fb5..c5470e4 100644
--- a/appsrc/ODS-Blog/templates/thin_clean/index.vspx
+++ b/appsrc/ODS-Blog/templates/thin_clean/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/thin_pastel/default.css b/appsrc/ODS-Blog/templates/thin_pastel/default.css
index 1bb292f..615b5ae 100644
--- a/appsrc/ODS-Blog/templates/thin_pastel/default.css
+++ b/appsrc/ODS-Blog/templates/thin_pastel/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ * $Id: default.css,v 1.2.2.2 2010/09/20 10:14:51 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/templates/thin_pastel/index.vspx b/appsrc/ODS-Blog/templates/thin_pastel/index.vspx
index 58aec2e..5485074 100644
--- a/appsrc/ODS-Blog/templates/thin_pastel/index.vspx
+++ b/appsrc/ODS-Blog/templates/thin_pastel/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: index.vspx,v 1.3.2.2 2010/09/20 10:14:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/trackback.sql b/appsrc/ODS-Blog/trackback.sql
index dbf2dbb..feaa61b 100644
--- a/appsrc/ODS-Blog/trackback.sql
+++ b/appsrc/ODS-Blog/trackback.sql
@@ -1,12 +1,12 @@
--
--- $Id: trackback.sql,v 1.5.2.2 2012/03/08 10:46:13 source Exp $
+-- $Id: trackback.sql,v 1.5.2.1 2010/09/20 10:14:43 source Exp $
--
-- MT Trackback support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/uninst.sql b/appsrc/ODS-Blog/uninst.sql
index fbb02cd..4a4fdc9 100644
--- a/appsrc/ODS-Blog/uninst.sql
+++ b/appsrc/ODS-Blog/uninst.sql
@@ -1,10 +1,10 @@
--
--- $Id: uninst.sql,v 1.5.2.3 2012/03/08 10:46:13 source Exp $
+-- $Id: uninst.sql,v 1.5.2.2 2010/11/09 20:15:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/vad_version b/appsrc/ODS-Blog/vad_version
index bb536bd..31c140b 100644
--- a/appsrc/ODS-Blog/vad_version
+++ b/appsrc/ODS-Blog/vad_version
@@ -1 +1 @@
-1.34.78
+1.34.72
diff --git a/appsrc/ODS-Blog/wa_integration.sql b/appsrc/ODS-Blog/wa_integration.sql
index 3f0adb1..f2dbcce 100644
--- a/appsrc/ODS-Blog/wa_integration.sql
+++ b/appsrc/ODS-Blog/wa_integration.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_integration.sql,v 1.12.2.4 2012/03/08 10:46:13 source Exp $
+-- $Id: wa_integration.sql,v 1.12.2.3 2010/10/07 13:24:15 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/wa_search_blog.sql b/appsrc/ODS-Blog/wa_search_blog.sql
index 0b46de1..fdf3f90 100644
--- a/appsrc/ODS-Blog/wa_search_blog.sql
+++ b/appsrc/ODS-Blog/wa_search_blog.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_search_blog.sql,v 1.3.2.2 2012/03/08 10:46:13 source Exp $
+-- $Id: wa_search_blog.sql,v 1.3.2.1 2010/09/20 10:14:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/blog_template_check.xsl b/appsrc/ODS-Blog/widgets/blog_template_check.xsl
index 435bf15..534317d 100644
--- a/appsrc/ODS-Blog/widgets/blog_template_check.xsl
+++ b/appsrc/ODS-Blog/widgets/blog_template_check.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog_template_check.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: blog_template_check.xsl,v 1.2.2.1 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/blog_tidy.xsl b/appsrc/ODS-Blog/widgets/blog_tidy.xsl
index 15ed01c..d5b8ed1 100644
--- a/appsrc/ODS-Blog/widgets/blog_tidy.xsl
+++ b/appsrc/ODS-Blog/widgets/blog_tidy.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog_tidy.xsl,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: blog_tidy.xsl,v 1.4.2.1 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/calendar.xsl b/appsrc/ODS-Blog/widgets/calendar.xsl
index 0b00bf7..47433be 100644
--- a/appsrc/ODS-Blog/widgets/calendar.xsl
+++ b/appsrc/ODS-Blog/widgets/calendar.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: calendar.xsl,v 1.17.2.10 2012/03/08 10:46:14 source Exp $
+ - $Id: calendar.xsl,v 1.17.2.9 2010/12/07 10:59:24 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/comment_check.xsl b/appsrc/ODS-Blog/widgets/comment_check.xsl
index 993e386..612bb25 100644
--- a/appsrc/ODS-Blog/widgets/comment_check.xsl
+++ b/appsrc/ODS-Blog/widgets/comment_check.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: comment_check.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: comment_check.xsl,v 1.2.2.1 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/compat.xsl b/appsrc/ODS-Blog/widgets/compat.xsl
index 4325998..5d8708c 100644
--- a/appsrc/ODS-Blog/widgets/compat.xsl
+++ b/appsrc/ODS-Blog/widgets/compat.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: compat.xsl,v 1.3.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: compat.xsl,v 1.3.2.2 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/dav_browser.xsl b/appsrc/ODS-Blog/widgets/dav_browser.xsl
index 60ae7cf..798e2ec 100644
--- a/appsrc/ODS-Blog/widgets/dav_browser.xsl
+++ b/appsrc/ODS-Blog/widgets/dav_browser.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dav_browser.xsl,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: dav_browser.xsl,v 1.3.2.1 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/error.xsl b/appsrc/ODS-Blog/widgets/error.xsl
index c484214..51e5073 100644
--- a/appsrc/ODS-Blog/widgets/error.xsl
+++ b/appsrc/ODS-Blog/widgets/error.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: error.xsl,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: error.xsl,v 1.3.2.1 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/foaf.xsl b/appsrc/ODS-Blog/widgets/foaf.xsl
index a4c9043..a37d6b9 100644
--- a/appsrc/ODS-Blog/widgets/foaf.xsl
+++ b/appsrc/ODS-Blog/widgets/foaf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: foaf.xsl,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: foaf.xsl,v 1.3.2.1 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/main.xsl b/appsrc/ODS-Blog/widgets/main.xsl
index c90fa6e..41b7cfc 100644
--- a/appsrc/ODS-Blog/widgets/main.xsl
+++ b/appsrc/ODS-Blog/widgets/main.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: main.xsl,v 1.39.2.16 2012/03/08 12:03:12 source Exp $
+ - $Id: main.xsl,v 1.39.2.14 2011/08/01 14:12:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -653,7 +653,6 @@ else if (length (self.catid))
self.vc_add_attribute ('xmlns:rdfs', 'http://www.w3.org/2000/01/rdf-schema#');
self.vc_add_attribute ('xmlns:sioct', 'http://rdfs.org/sioc/types#');
self.vc_add_attribute ('xmlns:sioc', 'http://rdfs.org/sioc/ns#');
- self.vc_add_attribute ('xmlns:cert', 'http://www.w3.org/ns/auth/cert#');
]]>
<xsl:if test="//vm:keep-variable">
self.restore_vars ();
@@ -1280,8 +1279,16 @@ window.onload = function (e)
<xsl:attribute name="hspace">3</xsl:attribute>
<xsl:attribute name="src">
<xsl:choose>
- <xsl:when test="@image"><?vsp http(self.custom_img_loc || '<xsl:value-of select="@image"/>'); ?></xsl:when>
- <xsl:otherwise><?vsp http(self.custom_img_loc || <xsl:value-of select="$default"/>); ?></xsl:otherwise>
+ <xsl:when test="@image">
+ <?vsp
+ http(self.custom_img_loc || '<xsl:value-of select="@image"/>');
+ ?>
+ </xsl:when>
+ <xsl:otherwise>
+ <?vsp
+ http(self.custom_img_loc || <xsl:value-of select="$default"/>);
+ ?>
+ </xsl:otherwise>
</xsl:choose>
</xsl:attribute>
</xsl:template>
diff --git a/appsrc/ODS-Blog/widgets/make_sp.xsl b/appsrc/ODS-Blog/widgets/make_sp.xsl
index 4b404cf..a688c7c 100644
--- a/appsrc/ODS-Blog/widgets/make_sp.xsl
+++ b/appsrc/ODS-Blog/widgets/make_sp.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: make_sp.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: make_sp.xsl,v 1.2.2.1 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/opml2ocs.xsl b/appsrc/ODS-Blog/widgets/opml2ocs.xsl
index 7e0f767..7eaa131 100644
--- a/appsrc/ODS-Blog/widgets/opml2ocs.xsl
+++ b/appsrc/ODS-Blog/widgets/opml2ocs.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: opml2ocs.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: opml2ocs.xsl,v 1.2.2.1 2010/09/20 10:14:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/opml2ocs03.xsl b/appsrc/ODS-Blog/widgets/opml2ocs03.xsl
index 0384b0d..72ad9b8 100644
--- a/appsrc/ODS-Blog/widgets/opml2ocs03.xsl
+++ b/appsrc/ODS-Blog/widgets/opml2ocs03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: opml2ocs03.xsl,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: opml2ocs03.xsl,v 1.3.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/render.xsl b/appsrc/ODS-Blog/widgets/render.xsl
index 11a3d14..e10258c 100644
--- a/appsrc/ODS-Blog/widgets/render.xsl
+++ b/appsrc/ODS-Blog/widgets/render.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: render.xsl,v 1.2.2.3 2012/03/08 10:46:14 source Exp $
+ - $Id: render.xsl,v 1.2.2.2 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/rss11.xsl b/appsrc/ODS-Blog/widgets/rss11.xsl
index 1341ab6..e0b5e43 100644
--- a/appsrc/ODS-Blog/widgets/rss11.xsl
+++ b/appsrc/ODS-Blog/widgets/rss11.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss11.xsl,v 1.3.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: rss11.xsl,v 1.3.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/rss2atom.xsl b/appsrc/ODS-Blog/widgets/rss2atom.xsl
index a0d3743..9278af5 100644
--- a/appsrc/ODS-Blog/widgets/rss2atom.xsl
+++ b/appsrc/ODS-Blog/widgets/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.4.2.5 2012/03/08 10:46:14 source Exp $
+ - $Id: rss2atom.xsl,v 1.4.2.4 2010/11/09 20:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/rss2atom03.xsl b/appsrc/ODS-Blog/widgets/rss2atom03.xsl
index 6e875a6..da34dfb 100644
--- a/appsrc/ODS-Blog/widgets/rss2atom03.xsl
+++ b/appsrc/ODS-Blog/widgets/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: rss2atom03.xsl,v 1.4.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/rss2mrss.xsl b/appsrc/ODS-Blog/widgets/rss2mrss.xsl
index 3e0f41b..4272176 100644
--- a/appsrc/ODS-Blog/widgets/rss2mrss.xsl
+++ b/appsrc/ODS-Blog/widgets/rss2mrss.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2mrss.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: rss2mrss.xsl,v 1.2.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/rss2rdf.xsl b/appsrc/ODS-Blog/widgets/rss2rdf.xsl
index 473d9ab..12e9541 100644
--- a/appsrc/ODS-Blog/widgets/rss2rdf.xsl
+++ b/appsrc/ODS-Blog/widgets/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.6.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: rss2rdf.xsl,v 1.6.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/rss2wml.xsl b/appsrc/ODS-Blog/widgets/rss2wml.xsl
index 8e62c4c..582d481 100644
--- a/appsrc/ODS-Blog/widgets/rss2wml.xsl
+++ b/appsrc/ODS-Blog/widgets/rss2wml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2wml.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: rss2wml.xsl,v 1.2.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/rss2xbel.xsl b/appsrc/ODS-Blog/widgets/rss2xbel.xsl
index 066481f..ea17d33 100644
--- a/appsrc/ODS-Blog/widgets/rss2xbel.xsl
+++ b/appsrc/ODS-Blog/widgets/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/store.xsl b/appsrc/ODS-Blog/widgets/store.xsl
index fafb5da..0d27f75 100644
--- a/appsrc/ODS-Blog/widgets/store.xsl
+++ b/appsrc/ODS-Blog/widgets/store.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: store.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: store.xsl,v 1.2.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/store_post.xsl b/appsrc/ODS-Blog/widgets/store_post.xsl
index 322a306..2dcf17c 100644
--- a/appsrc/ODS-Blog/widgets/store_post.xsl
+++ b/appsrc/ODS-Blog/widgets/store_post.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: store_post.xsl,v 1.4.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: store_post.xsl,v 1.4.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Blog/widgets/xbel.xsl b/appsrc/ODS-Blog/widgets/xbel.xsl
index 272b30a..0cee1ee 100644
--- a/appsrc/ODS-Blog/widgets/xbel.xsl
+++ b/appsrc/ODS-Blog/widgets/xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xbel.xsl,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+ - $Id: xbel.xsl,v 1.2.2.1 2010/09/20 10:14:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/Makefile.am b/appsrc/ODS-Bookmark/Makefile.am
index b08373d..d67f527 100644
--- a/appsrc/ODS-Bookmark/Makefile.am
+++ b/appsrc/ODS-Bookmark/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -46,7 +46,6 @@ clean-local:
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Bookmark/Makefile.in b/appsrc/ODS-Bookmark/Makefile.in
index ac177b5..b2942be 100644
--- a/appsrc/ODS-Bookmark/Makefile.in
+++ b/appsrc/ODS-Bookmark/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -311,7 +309,6 @@ CLEANFILES = \
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Bookmark/make_vad.sh b/appsrc/ODS-Bookmark/make_vad.sh
index 735f132..49776d0 100755
--- a/appsrc/ODS-Bookmark/make_vad.sh
+++ b/appsrc/ODS-Bookmark/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.58.2.29 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.58.2.27 2011/07/04 10:04:01 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -30,7 +30,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.0.0"
+VERSION="1.7.98"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -63,6 +63,11 @@ else
LN="ln -fs"
RM="rm -f"
fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
if [ "z$SERVER" = "z" ]
then
@@ -86,57 +91,6 @@ else
myrm=$RM
fi
-
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
- done
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
- rm -f version.tmp
- echo "$VERSION" > vad_version
- fi
-}
-
virtuoso_start() {
echo "Starting $SERVER"
echo $BUILD
@@ -272,7 +226,7 @@ sticker_init() {
echo " <name package=\"Bookmarks\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Bookmark Manager\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -284,8 +238,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.85.05\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-12-29 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.82.42\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -426,7 +380,6 @@ echo '----------------------'
STOP_SERVER
directory_clean
-version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -443,6 +396,7 @@ virtuoso_shutdown
STOP_SERVER
chmod 644 ods_bookmark_dav.vad
chmod 644 ods_bookmark_filesystem.vad
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -452,7 +406,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Bookmark/sql/DET_Bookmark.sql b/appsrc/ODS-Bookmark/sql/DET_Bookmark.sql
index ed3772e..ae5aba3 100644
--- a/appsrc/ODS-Bookmark/sql/DET_Bookmark.sql
+++ b/appsrc/ODS-Bookmark/sql/DET_Bookmark.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Bookmark.sql,v 1.11.2.2 2012/03/08 10:46:14 source Exp $
+-- $Id: DET_Bookmark.sql,v 1.11.2.1 2010/09/20 10:14:54 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-api.sql b/appsrc/ODS-Bookmark/sql/bmk-a-api.sql
index 8e92160..ce34d91 100644
--- a/appsrc/ODS-Bookmark/sql/bmk-a-api.sql
+++ b/appsrc/ODS-Bookmark/sql/bmk-a-api.sql
@@ -1,10 +1,10 @@
--
--- $Id: bmk-a-api.sql,v 1.10.2.6 2012/03/08 10:46:14 source Exp $
+-- $Id: bmk-a-api.sql,v 1.10.2.5 2011/06/09 17:43:16 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-code.sql b/appsrc/ODS-Bookmark/sql/bmk-a-code.sql
index 432391d..963c431 100644
--- a/appsrc/ODS-Bookmark/sql/bmk-a-code.sql
+++ b/appsrc/ODS-Bookmark/sql/bmk-a-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: bmk-a-code.sql,v 1.56.2.23 2012/03/12 14:24:11 source Exp $
+-- $Id: bmk-a-code.sql,v 1.56.2.20 2011/08/01 14:12:15 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -140,11 +140,11 @@ create procedure BMK.WA.session_restore(
{
account_id := U_ID;
}
+ account_rights := BMK.WA.access_rights (domain_id, account_id);
return vector (
'domain_id', domain_id,
'account_id', account_id,
- 'account_rights', BMK.WA.account_rights (domain_id, account_id),
- 'person_rights', BMK.WA.person_rights (domain_id, account_id)
+ 'account_rights', account_rights
);
}
;
@@ -219,7 +219,7 @@ create procedure BMK.WA.check_grants (in role_name varchar, in page_name varchar
-------------------------------------------------------------------------------
--
-create procedure BMK.WA.person_rights (
+create procedure BMK.WA.access_rights (
in domain_id integer,
in account_id integer)
{
@@ -288,65 +288,6 @@ create procedure BMK.WA.person_rights (
-------------------------------------------------------------------------------
--
-create procedure BMK.WA.account_rights (
- in domain_id integer,
- in account_id integer)
-{
- declare rc varchar;
-
- if (domain_id = -1)
- return 'R';
-
- if (domain_id = -2)
- return null;
-
- if (BMK.WA.check_admin (account_id))
- return 'W';
-
- if (exists (select 1
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = account_id
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_ID = domain_id))
- return 'W';
-
- if (exists (select 1
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = account_id
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 2
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_ID = domain_id))
- return 'W';
-
- if (exists (select 1
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = account_id
- and B.WAM_USER = A.U_ID
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_ID = domain_id))
- return 'R';
-
- if (exists (select 1
- from DB.DBA.WA_INSTANCE
- where WAI_ID = domain_id
- and WAI_IS_PUBLIC = 1))
- return 'R';
-
- return null;
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure BMK.WA.wa_home_link ()
{
return case when registry_get ('wa_home_link') = 0 then '/ods/' else registry_get ('wa_home_link') end;
@@ -1222,7 +1163,7 @@ create procedure BMK.WA.bookmark_import_atom (
{
D := '<div>';
foreach (any content in contents) do
- D := concat(D, BMK.WA.xml2string(content));
+ D := concat(D, ENEWS.WA.xml2string(content));
D := concat(D, '</div>');
}
@@ -1383,19 +1324,16 @@ create procedure BMK.WA.bookmark_export_tmp (
create procedure BMK.WA.bookmark_rights (
in domain_id integer,
in id integer,
- in account_rights varchar,
- in person_rights varchar)
+ in access_role varchar)
{
declare retValue varchar;
retValue := '';
if (exists (select 1 from BMK.WA.BOOKMARK_DOMAIN where BD_ID = id and BD_DOMAIN_ID = domain_id))
{
- if (account_rights < person_rights)
retValue := BMK.WA.acl_check (domain_id, id);
-
if (retValue = '')
- retValue := account_rights;
+ retValue := access_role;
}
return retValue;
}
@@ -1485,17 +1423,16 @@ create procedure BMK.WA.folder_id(
declare aPath any;
folder_id := null;
- if (not is_empty_or_null (trim (folder_name)))
+ if (not is_empty_or_null(folder_name))
{
aPath := split_and_decode(trim(folder_name, '/'),0,'\0\0/');
for (i := 0; i < length(aPath); i := i + 1)
{
if (i = 0)
{
- if (not exists (select 1 from BMK.WA.FOLDER where F_DOMAIN_ID = domain_id and F_NAME = aPath[i] and coalesce (F_PARENT_ID, -1) = -1))
- insert into BMK.WA.FOLDER (F_DOMAIN_ID, F_PARENT_ID, F_NAME, F_PATH) values (domain_id, -1, aPath[i], '');
-
- folder_id := (select F_ID from BMK.WA.FOLDER where F_DOMAIN_ID = domain_id and F_NAME = aPath[i] and coalesce (F_PARENT_ID, -1) = -1);
+ if (not exists (select 1 from BMK.WA.FOLDER where F_DOMAIN_ID = domain_id and F_NAME = aPath[i] and F_PARENT_ID is null))
+ insert into BMK.WA.FOLDER (F_DOMAIN_ID, F_NAME, F_PATH) values (domain_id, aPath[i], '');
+ folder_id := (select F_ID from BMK.WA.FOLDER where F_DOMAIN_ID = domain_id and F_NAME = aPath[i] and F_PARENT_ID is null);
}
else
{
@@ -1512,9 +1449,9 @@ create procedure BMK.WA.folder_id(
-------------------------------------------------------------------------------
--
create procedure BMK.WA.folder_create(
- inout domain_id integer,
- in folder_name varchar,
- in folder_id integer)
+ inout domain_id varchar,
+ in folder_name any,
+ in folder_id any)
{
folder_name := trim(folder_name);
if (folder_name <> '')
@@ -1533,8 +1470,8 @@ create procedure BMK.WA.folder_create(
-------------------------------------------------------------------------------
--
create procedure BMK.WA.folder_create2(
- in domain_id integer,
- in parent_id integer,
+ in domain_id varchar,
+ in parent_id varchar,
in folder_name any)
{
declare folder_id integer;
@@ -1749,8 +1686,7 @@ create procedure BMK.WA.sfolder_sql(
in maxRows varchar := '',
in nodeType varchar := 'b')
{
- declare tmp any;
- declare S, T, where2, delimiter2 varchar;
+ declare S, T, tmp, where2, delimiter2 varchar;
where2 := ' \n ';
delimiter2 := '\n and ';
@@ -3271,9 +3207,10 @@ create procedure BMK.WA.xtree_doc (
create procedure BMK.WA.xml_set(
in id varchar,
inout pXml varchar,
- in value any)
+ in value varchar)
{
declare aEntity any;
+
{
declare exit handler for SQLSTATE '*' {
pXml := xtree_doc('<?xml version="1.0" encoding="UTF-8"?><settings />');
@@ -3442,18 +3379,6 @@ create procedure BMK.WA.stringCut (
-------------------------------------------------------------------------------
--
-create procedure BMK.WA.isVector (
- inout aVector any)
-{
- if (isarray (aVector) and not isstring (aVector))
- return 1;
-
- return 0;
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure BMK.WA.vector_unique(
inout aVector any,
in minLength integer := 0)
@@ -3990,7 +3915,7 @@ create procedure BMK.WA.dt_user2gmt(
--
create procedure BMK.WA.dt_value(
in pDate datetime,
- in pUser varchar := null)
+ in pUser datetime := null)
{
if (isnull(pDate))
return pDate;
@@ -4090,23 +4015,21 @@ create procedure BMK.WA.dt_deformat(
d := 0;
m := 0;
y := 0;
- while (N <= length (pFormat))
- {
+ while (N <= length(pFormat)) {
ch := upper(substring(pFormat, N, 1));
if (ch = 'M')
m := BMK.WA.dt_deformat_tmp(pString, I);
if (ch = 'D')
d := BMK.WA.dt_deformat_tmp(pString, I);
- if (ch = 'Y')
- {
+ if (ch = 'Y') {
y := BMK.WA.dt_deformat_tmp(pString, I);
if (y < 50)
y := 2000 + y;
if (y < 100)
y := 1900 + y;
- }
+ };
N := N + 1;
- }
+ };
return stringdate(concat(cast(m as varchar), '.', cast(d as varchar), '.', cast(y as varchar)));
}
;
@@ -4115,16 +4038,16 @@ create procedure BMK.WA.dt_deformat(
--
create procedure BMK.WA.dt_deformat_tmp(
in S varchar,
- inout N integer)
+ inout N varchar)
{
- declare V any;
+ declare
+ V any;
V := regexp_parse('[0-9]+', S, N);
- if (length(V) > 1)
- {
- N := V[1];
- return atoi (subseq (S, V[0], V[1]));
- }
+ if (length(V) > 1) {
+ N := aref(V,1);
+ return atoi(subseq(S, aref(V, 0), aref(V,1)));
+ };
N := N + 1;
return 0;
}
@@ -4138,8 +4061,7 @@ create procedure BMK.WA.dt_reformat(
in pOutFormat varchar := 'm.d.Y')
{
return BMK.WA.dt_format(BMK.WA.dt_deformat(pString, pInFormat), pOutFormat);
-}
-;
+};
-----------------------------------------------------------------------------------------
--
@@ -4193,10 +4115,9 @@ create procedure BMK.WA.data (
create procedure BMK.WA.test_clear (
in S any)
{
- S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
- S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
+ declare N integer;
- return S;
+ return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
}
;
@@ -4207,8 +4128,8 @@ create procedure BMK.WA.test (
in params any := null)
{
declare valueType, valueClass, valueName, valueMessage, tmp any;
- declare exit handler for SQLSTATE '*'
- {
+
+ declare exit handler for SQLSTATE '*' {
if (not is_empty_or_null(valueMessage))
signal ('TEST', valueMessage);
if (__SQL_STATE = 'EMPTY')
@@ -4262,7 +4183,7 @@ create procedure BMK.WA.test (
return value;
}
- value := BMK.WA.validate2 (valueClass, cast (value as varchar));
+ value := OMAIL.WA.validate2 (valueClass, cast (value as varchar));
if (valueType = 'integer')
{
tmp := get_keyword('minValue', params);
@@ -5196,3 +5117,63 @@ create procedure BMK.WA.news_comment_get_cn_type (in f_name varchar)
return ext;
}
;
+
+-------------------------------------------------------------------------------
+--
+create procedure BMK.WA.obj2json (
+ in o any,
+ in d integer := 2)
+{
+ declare N, Nn, M, Mm integer;
+ declare R, T any;
+ declare retValue any;
+
+ if (d = 0)
+ return '[maximum depth achieved]';
+
+ T := vector ('\b', '\\b', '\t', '\\t', '\n', '\\n', '\f', '\\f', '\r', '\\r', '"', '\\"', '\\', '\\\\');
+ retValue := '';
+ if (isnumeric (o))
+ {
+ retValue := cast (o as varchar);
+ }
+ else if (isstring (o))
+ {
+ Nn := length(o);
+ for (N := 0; N < Nn; N := N + 1)
+ {
+ R := chr (o[N]);
+ Mm := length(T);
+ for (M := 0; M < Mm; M := M + 2)
+ {
+ if (R = T[M])
+ R := T[M+1];
+ }
+ retValue := retValue || R;
+ }
+ retValue := '"' || retValue || '"';
+ }
+ else if (isarray (o))
+ {
+ retValue := '[';
+ Nn := length(o);
+ for (N := 0; N < Nn; N := N + 1)
+ {
+ retValue := retValue || BMK.WA.obj2json (o[N], d-1);
+ if (N <> length(o)-1)
+ retValue := retValue || ',';
+ }
+ retValue := retValue || ']';
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure BMK.WA.json2obj (
+ in o any)
+{
+ return json_parse (o);
+}
+;
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-ods.sql b/appsrc/ODS-Bookmark/sql/bmk-a-ods.sql
index f0e13c9..a1c502c 100644
--- a/appsrc/ODS-Bookmark/sql/bmk-a-ods.sql
+++ b/appsrc/ODS-Bookmark/sql/bmk-a-ods.sql
@@ -1,10 +1,10 @@
--
--- $Id: bmk-a-ods.sql,v 1.2.2.2 2012/03/08 10:46:14 source Exp $
+-- $Id: bmk-a-ods.sql,v 1.2.2.1 2010/09/20 10:14:54 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-table.sql b/appsrc/ODS-Bookmark/sql/bmk-a-table.sql
index 52bcfb5..18eac17 100644
--- a/appsrc/ODS-Bookmark/sql/bmk-a-table.sql
+++ b/appsrc/ODS-Bookmark/sql/bmk-a-table.sql
@@ -1,10 +1,10 @@
--
--- $Id: bmk-a-table.sql,v 1.22.2.5 2012/03/08 11:52:37 source Exp $
+-- $Id: bmk-a-table.sql,v 1.22.2.3 2011/05/20 16:24:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -694,17 +694,17 @@ BMK.WA.exec_no_error ('
--
create procedure BMK.WA.drop_index ()
{
- if (registry_get ('bmk_index_version') = '3')
+ if (registry_get ('bmk_index_version') = '2')
return;
BMK.WA.exec_no_error ('drop table BMK.WA.BOOKMARK_DOMAIN_BD_DESCRIPTION_WORDS');
- registry_set ('bmk_index_version', '3');
+ registry_set ('bmk_index_version', '2');
}
;
BMK.WA.drop_index ();
BMK.WA.exec_no_error('
- create text index on BMK.WA.BOOKMARK_DOMAIN (BD_DESCRIPTION) with key BD_ID not insert clustered with (BD_ID, BD_UPDATED) using function language \'x-ViDoc\'
+ create text index on BMK.WA.BOOKMARK_DOMAIN (BD_DESCRIPTION) with key BD_ID not insert clustered with (BD_ID, BD_UPDATED) using function
');
-------------------------------------------------------------------------------
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-update.sql b/appsrc/ODS-Bookmark/sql/bmk-a-update.sql
index 63a8322..2803c8e 100644
--- a/appsrc/ODS-Bookmark/sql/bmk-a-update.sql
+++ b/appsrc/ODS-Bookmark/sql/bmk-a-update.sql
@@ -1,10 +1,10 @@
--
--- $Id: bmk-a-update.sql,v 1.2.2.4 2012/03/08 10:46:14 source Exp $
+-- $Id: bmk-a-update.sql,v 1.2.2.3 2010/10/07 13:24:04 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql b/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql
index 2a3b423..7eb0e25 100644
--- a/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql
+++ b/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql
@@ -1,10 +1,10 @@
--
--- $Id: bmk-a-wa.sql,v 1.14.2.7 2012/03/08 10:46:14 source Exp $
+-- $Id: bmk-a-wa.sql,v 1.14.2.6 2011/05/17 22:59:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/sql/bmk-d.sql b/appsrc/ODS-Bookmark/sql/bmk-d.sql
index 8aa2117..0f47353 100644
--- a/appsrc/ODS-Bookmark/sql/bmk-d.sql
+++ b/appsrc/ODS-Bookmark/sql/bmk-d.sql
@@ -1,10 +1,10 @@
--
--- $Id: bmk-d.sql,v 1.15.2.9 2012/03/08 13:13:47 source Exp $
+-- $Id: bmk-d.sql,v 1.15.2.7 2011/05/20 16:24:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -22,6 +22,7 @@
------------------------------------------------------------------------------
-- bmk-d.sql
-- script for cleaning wa installation.
+-- Copyright (C) 2004 OpenLink Software
------------------------------------------------------------------------------
create procedure BMK.WA.uninstall ()
diff --git a/appsrc/ODS-Bookmark/sql/sioc_bmk.sql b/appsrc/ODS-Bookmark/sql/sioc_bmk.sql
index a9e9781..525174f 100644
--- a/appsrc/ODS-Bookmark/sql/sioc_bmk.sql
+++ b/appsrc/ODS-Bookmark/sql/sioc_bmk.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_bmk.sql,v 1.19.2.13 2012/03/08 11:52:37 source Exp $
+-- $Id: sioc_bmk.sql,v 1.19.2.11 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -111,7 +111,6 @@ create procedure fill_ods_bookmark_sioc2 (
SIOC..fill_ods_bookmark_services ();
for (select WAI_ID,
- WAI_IS_PUBLIC,
WAI_TYPE_NAME,
WAI_NAME,
WAI_ACL
@@ -121,7 +120,7 @@ create procedure fill_ods_bookmark_sioc2 (
{
graph_iri := SIOC..acl_graph (WAI_TYPE_NAME, WAI_NAME);
exec (sprintf ('sparql clear graph <%s>', graph_iri));
- SIOC..wa_instance_acl_insert (WAI_IS_PUBLIC, WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
+ SIOC..wa_instance_acl_insert (WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
for (select BD_DOMAIN_ID, BD_ID, BD_ACL
from BMK..BOOKMARK_DOMAIN
where BD_DOMAIN_ID = WAI_ID and BD_ACL is not null) do
@@ -166,7 +165,7 @@ create procedure fill_ods_bookmark_sioc2 (
order by BD_ID) do
{
bookmark_iri := SIOC..bmk_post_iri (BD_DOMAIN_ID, BD_ID);
- graph_iri := SIOC..get_graph_new (coalesce (_access_mode, WAI_IS_PUBLIC), bookmark_iri);
+ graph_iri := SIOC..get_graph_new (null, coalesce (_access_mode, WAI_IS_PUBLIC), bookmark_iri);
forum_iri := SIOC..bmk_iri (coalesce (_wai_name, WAI_NAME));
creator_iri := SIOC..user_iri (WAM_USER);
@@ -223,7 +222,7 @@ create procedure fill_ods_bookmark_services ()
-------------------------------------------------------------------------------
--
-create procedure clean_ods_bookmark_sioc (
+create procedure clean_ods_bookmark_sioc2 (
in _wai_name varchar := null,
in _access_mode integer := null)
{
@@ -261,9 +260,9 @@ create procedure clean_ods_bookmark_sioc (
order by BD_ID) do
{
bookmark_iri := SIOC..bmk_post_iri (BD_DOMAIN_ID, BD_ID);
- graph_iri := SIOC..get_graph_new (coalesce (_access_mode, WAI_IS_PUBLIC), bookmark_iri);
+ graph_iri := SIOC..get_graph_new (WAI_ID, coalesce (_access_mode, WAI_IS_PUBLIC), bookmark_iri);
- SIOC..bookmark_domain_delete (graph_iri, BD_DOMAIN_ID, BD_ID);
+ bookmark_domain_delete (graph_iri, BD_DOMAIN_ID, BD_ID);
cnt := cnt + 1;
if (mod (cnt, 500) = 0)
@@ -316,7 +315,7 @@ create procedure bookmark_domain_insert (
and WAM_INST = WAI_NAME
and U_ID = WAM_USER) do
{
- graph_iri := SIOC..get_graph_new (WAI_IS_PUBLIC, bookmark_iri);
+ graph_iri := SIOC..get_graph_new (WAI_ID, WAI_IS_PUBLIC, bookmark_iri);
forum_iri := SIOC..bmk_iri (WAI_NAME);
creator_iri := SIOC..user_iri (WAM_USER);
@@ -356,7 +355,7 @@ create procedure bookmark_domain_delete (
bookmark_iri := SIOC..bmk_post_iri (domain_id, bookmark_id);
if (isnull (graph_iri))
{
- graph_iri := SIOC..get_graph_new (BMK.WA.domain_is_public (domain_id), bookmark_iri);
+ graph_iri := SIOC..get_graph_new (domain_id, null, bookmark_iri);
if (isnull (graph_iri))
return;
}
@@ -589,7 +588,7 @@ create procedure bmk_comment_insert (
master_iri := SIOC..bmk_post_iri (domain_id, master_id);
if (isnull (graph_iri))
{
- graph_iri := get_graph_new (BMK.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
}
@@ -630,7 +629,7 @@ create procedure bmk_comment_delete (
master_iri := SIOC..bmk_post_iri (domain_id, master_id);
if (isnull (graph_iri))
{
- graph_iri := SIOC..get_graph_new (BMK.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := SIOC..get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
}
@@ -775,7 +774,7 @@ create procedure bmk_annotation_insert (
master_iri := SIOC..bmk_post_iri (domain_id, master_id);
if (isnull (graph_iri))
{
- graph_iri := get_graph_new (BMK.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
}
@@ -812,7 +811,7 @@ create procedure bmk_annotation_delete (
if (isnull (graph_iri))
{
master_iri := SIOC..bmk_post_iri (domain_id, master_id);
- graph_iri := SIOC..get_graph_new (BMK.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := SIOC..get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
}
diff --git a/appsrc/ODS-Bookmark/vad_version b/appsrc/ODS-Bookmark/vad_version
deleted file mode 100644
index 8704603..0000000
--- a/appsrc/ODS-Bookmark/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.12.43
diff --git a/appsrc/ODS-Bookmark/www/ajax.vsp b/appsrc/ODS-Bookmark/www/ajax.vsp
index be01a43..66606f6 100644
--- a/appsrc/ODS-Bookmark/www/ajax.vsp
+++ b/appsrc/ODS-Bookmark/www/ajax.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ajax.vsp,v 1.9.2.9 2012/03/08 11:52:37 source Exp $
+-- $Id: ajax.vsp,v 1.9.2.7 2011/05/02 14:16:25 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -21,13 +21,14 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
- declare N, M, _domain_id, _account_id integer;
+ declare N, M, id, _domain_id, _account_id integer;
declare sid, realm, action, subAction, node, nodePath varchar;
declare nodes, parts, sessionData, returnData any;
sid := get_keyword ('sid', params, '');
realm := get_keyword ('realm', params, '');
+ id := cast (get_keyword ('id', params, '0') as integer);
action := get_keyword ('a', params, '');
subAction := get_keyword ('sa', params, '');
@@ -37,9 +38,6 @@
if (action = 'visited')
{
- declare id integer;
-
- id := cast (get_keyword ('id', params, '0') as integer);
BMK.WA.bookmark_visited_set (_domain_id, id, now ());
}
else if (action = 'load')
@@ -152,7 +150,7 @@
}
http_rewrite ();
http_header ('Content-Type: text/plain\r\n');
- http (ODS..obj2json (returnData, 5));
+ http (BMK.WA.obj2json(returnData, 3));
}
else if (action = 'tags')
{
@@ -206,7 +204,7 @@
tmp := split_and_decode (trim (params[N+1]), 0, '\0\0,');
for (M := 0; M < length (tmp); M := M + 1)
{
- if (not isnull (BMK.WA.account_id (trim (tmp[M]))))
+ if (ODRIVE.WA.odrive_user_id (trim (tmp[M])) <> -1)
grants := grants || ',' || tmp[M];
}
}
@@ -415,7 +413,7 @@
_formExit:;
http_rewrite ();
http_header ('Content-Type: text/plain\r\n');
- http (ODS..obj2json(returnData, 5));
+ http (BMK.WA.obj2json(returnData));
}
else if (action = 'about')
{
diff --git a/appsrc/ODS-Bookmark/www/annotea.vspx b/appsrc/ODS-Bookmark/www/annotea.vspx
index fe9c847..a42887c 100644
--- a/appsrc/ODS-Bookmark/www/annotea.vspx
+++ b/appsrc/ODS-Bookmark/www/annotea.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: annotea.vspx,v 1.8.2.8 2012/03/08 10:46:15 source Exp $
+ - $Id: annotea.vspx,v 1.8.2.7 2011/07/04 10:04:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Bookmark/www/bmk_login.vspx b/appsrc/ODS-Bookmark/www/bmk_login.vspx
index f11e8ef..ea98db6 100644
--- a/appsrc/ODS-Bookmark/www/bmk_login.vspx
+++ b/appsrc/ODS-Bookmark/www/bmk_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bmk_login.vspx,v 1.9.2.6 2012/03/08 11:52:37 source Exp $
+ - $Id: bmk_login.vspx,v 1.9.2.4 2010/10/07 13:24:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -34,7 +34,7 @@
if (page_name = 'error.vspx')
return;
- if (isnull (self.person_rights) and not is_empty_or_null (self.sid))
+ if (isnull (self.account_rights) and not is_empty_or_null (self.sid))
{
self.vc_redirect (sprintf ('/ods/error.vspx?__PAGE=%U&__SQL_STATE=%U&__SQL_MESSAGE=%U', 'home.vspx', '23023', 'You have no access rights for the application!'));
return;
@@ -56,10 +56,10 @@
return;
}
- if (BMK.WA.check_grants (self.person_rights, page_name))
+ if (BMK.WA.check_grants (self.account_rights, page_name))
return;
- if (isnull (self.person_rights))
+ if (isnull (self.account_rights))
{
self.vc_redirect (sprintf ('%slogin.vspx?URL=%U', ods_path, HTTP_REQUESTED_URL()));;
return;
diff --git a/appsrc/ODS-Bookmark/www/bookmarks.vspx b/appsrc/ODS-Bookmark/www/bookmarks.vspx
index 87a9607..125e207 100644
--- a/appsrc/ODS-Bookmark/www/bookmarks.vspx
+++ b/appsrc/ODS-Bookmark/www/bookmarks.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bookmarks.vspx,v 1.40.2.8 2012/03/08 11:52:37 source Exp $
+ - $Id: bookmarks.vspx,v 1.40.2.6 2011/05/17 22:59:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -65,7 +65,7 @@
self.tbLabels := cast (get_keyword ('tbLabels', self.settings, '1') as integer);
self.bNodeAction := '';
- if ((get_keyword ('URI', params, '') <> '') and (self.person_rights = 'W'))
+ if ((get_keyword ('URI', params, '') <> '') and (self.account_rights = 'W'))
{
self.bNodeAction := 'Bookmark/Create';
self.bNodeParams := sprintf('&URI=%U&TITLE=%U', get_keyword ('URI', params, ''), get_keyword ('TITLE', params, ''));
@@ -95,7 +95,7 @@
{
self.bNode := BMK.WA.make_node ('b', get_keyword ('id', params));
self.bNodeAction := 'Bookmark/Edit';
- if ((self.person_rights <> 'W') or (grant_id >= 0))
+ if ((self.account_rights <> 'W') or (grant_id >= 0))
self.bNodeAction := 'Bookmark/View';
}
}
@@ -111,7 +111,7 @@
self.bNodePath := BMK.WA.bmk_path2 (BMK.WA.make_node ('f', BD_FOLDER_ID));
}
}
- else if ((get_keyword ('action', params, '') = 'Smart Folder/Create') and (self.person_rights = 'W'))
+ else if ((get_keyword ('action', params, '') = 'Smart Folder/Create') and (self.account_rights = 'W'))
{
self.bNodeAction := 'Smart Folder/Create';
for (N := 0; N < length (params); N := N + 1)
@@ -143,7 +143,7 @@
toolbarWidth := '';
?>
<div>
- <vm:if test="self.person_rights = 'W'">
+ <vm:if test="self.account_rights = 'W'">
<span class="toolbar" style="cursor: pointer;<?V toolbarWidth ?>" onclick="javascript: BMK.formShow('import');" alt="Import">
<img src="image/impt_32.png" border="0" alt="Import" /><?vsp http(self.toolbarLabel('Import'));?>
</span>
diff --git a/appsrc/ODS-Bookmark/www/conversation.vspx b/appsrc/ODS-Bookmark/www/conversation.vspx
index d314767..3b79f58 100644
--- a/appsrc/ODS-Bookmark/www/conversation.vspx
+++ b/appsrc/ODS-Bookmark/www/conversation.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: conversation.vspx,v 1.3.2.4 2012/03/08 10:46:15 source Exp $
+ - $Id: conversation.vspx,v 1.3.2.3 2011/05/02 14:16:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Bookmark/www/css/style.css b/appsrc/ODS-Bookmark/www/css/style.css
index 64ae59d..8acb610 100644
--- a/appsrc/ODS-Bookmark/www/css/style.css
+++ b/appsrc/ODS-Bookmark/www/css/style.css
@@ -1,10 +1,10 @@
/*
- * $Id: style.css,v 1.24.2.13 2012/03/08 11:52:37 source Exp $
+ * $Id: style.css,v 1.24.2.11 2011/05/17 22:59:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -27,23 +27,11 @@ body {
font-size: 9pt;
}
-pre {
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
form {
margin: 0;
padding: 0;
}
-abbr {
- border: none;
-}
-
a {
text-decoration: none;
}
@@ -94,6 +82,43 @@ a:hover, .link:hover
vertical-align: top;
}
+/* Footer */
+#FT {
+ width: 100%;
+ position: relative;
+ bottom: 0px;
+ font-size: 8pt;
+ float: left;
+ clear: both;
+ text-align: right;
+ border-top: 2px solid #fff;
+ margin-right: 10px;
+ background-color: #fff;
+ background-image: url(../image/ods_main_footer.png);
+}
+
+#FT_L {
+ float: left;
+ clear: left;
+ margin-top: 10px;
+ margin-left: 8px;
+ border: 1px solid #788;
+}
+
+#FT_R {
+ float: right;
+ clear: right;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ margin-right: 5px;
+ color: #788;
+}
+
+#FT_R a {
+ text-decoration: none;
+ color: inherit;
+}
+
/* Left side within MT */
.page_head {
width: 100%;
diff --git a/appsrc/ODS-Bookmark/www/error.vspx b/appsrc/ODS-Bookmark/www/error.vspx
index 667de97..c209c44 100644
--- a/appsrc/ODS-Bookmark/www/error.vspx
+++ b/appsrc/ODS-Bookmark/www/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.5.2.3 2012/03/08 10:46:15 source Exp $
+ - $Id: error.vspx,v 1.5.2.2 2010/09/20 10:14:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/www/export.vspx b/appsrc/ODS-Bookmark/www/export.vspx
index f992557..c10a1d6 100644
--- a/appsrc/ODS-Bookmark/www/export.vspx
+++ b/appsrc/ODS-Bookmark/www/export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: export.vspx,v 1.15.2.4 2012/03/08 10:46:15 source Exp $
+ - $Id: export.vspx,v 1.15.2.3 2010/09/20 10:14:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/www/forms.vspx b/appsrc/ODS-Bookmark/www/forms.vspx
index 642c1df..4a26af8 100644
--- a/appsrc/ODS-Bookmark/www/forms.vspx
+++ b/appsrc/ODS-Bookmark/www/forms.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: forms.vspx,v 1.12.2.20 2012/03/08 11:52:37 source Exp $
+ - $Id: forms.vspx,v 1.12.2.18 2011/07/04 10:04:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -55,7 +55,7 @@
if (lcase (BMK.WA.node_type (node)) <> 'b')
return 'visited';
- if (self.person_rights <> 'W')
+ if (self.account_rights <> 'W')
return 'unvisited';
return either (isnull (BMK.WA.bookmark_visited (self.domain_id, BMK.WA.node_id (node))), 'unvisited', 'visited');
@@ -155,7 +155,7 @@
<v:variable name="v_tags" type="varchar" default="''"/>
<v:variable name="v_folder_name" type="varchar" default="''"/>
<v:variable name="v_own" type="integer" default="0"/>
- <v:variable name="v_folder_id" type="integer" default="0"/>
+ <v:variable name="v_folder_id" type="varchar" default="'0'"/>
<v:variable name="v_shared" type="integer" default="0"/>
<v:variable name="v_grants" type="any" default="null"/>
<v:variable name="v_acl" type="any" default="null"/>
@@ -234,7 +234,7 @@
mt := '';
st := '';
- if ((self.person_rights = 'W') and (not (((node_type = 's') and (node_id = -1)) or (node_type = 'u') or (node_type = 'F'))))
+ if ((self.account_rights = 'W') and (not (((node_type = 's') and (node_id = -1)) or (node_type = 'u') or (node_type = 'F'))))
{
mt := sprintf('Selected as <select name="mark" onchange="javascript: if (anySelected(this.form, \'cb_item\', \'No posts were selected to mark as \'+this.options[this.selectedIndex].text+\'.\')) {this.form.submit();} else {this.selectedIndex = 0}"><option/><option>visited</option><option>unvisited</option></select>');
st := sprintf('View <select name="show" onchange="javascript: this.form.submit();"><option value="">all</option><option value="visited">visited</option><option value="unvisited">unvisited</option></select>');
@@ -330,7 +330,7 @@
) x
where 1 = 1';
BMK.WA.xml_set('folderID', data, BMK.WA.node_suffix(self.bNode));
- tmp := BMK.WA.sfolder_sql (self.domain_id, self.account_id, self.person_rights, data);
+ tmp := BMK.WA.sfolder_sql (self.domain_id, self.account_id, self.account_rights, data);
sql := replace(sql, '<BOOKMARKS>', tmp);
sql := replace(sql, '<ID>', BMK.WA.node_suffix(self.bNode));
}
@@ -379,14 +379,14 @@
sql := 'select distinct rs.* from BMK.WA.shared_sql (rs0, rs1, rs2, rs3)(_TYPE integer, _ID integer, _NODE varchar, _NAME varchar, _URI varchar, _VISITED datetime, _UPDATED datetime, _CREATED datetime, _FOLDER_ID integer, _FOLDER_NAME varchar, _GRANT_ID integer) rs where rs0 = ? and rs1 = ? and rs2 = ? and rs3 = ?';
control.add_parameter (self.domain_id);
control.add_parameter (self.account_id);
- control.add_parameter (self.person_rights);
+ control.add_parameter (self.account_rights);
control.add_parameter (data);
}
else if ((node_type = 't') and not is_empty_or_null (BMK.WA.node_suffix (self.bNode)))
{
BMK.WA.xml_set('tags', data, BMK.WA.node_suffix(self.bNode));
- sql := BMK.WA.sfolder_sql (self.domain_id, self.account_id, self.person_rights, data);
+ sql := BMK.WA.sfolder_sql (self.domain_id, self.account_id, self.account_rights, data);
}
else if ((node_type = 'u') and (node_id = -1))
{
@@ -533,9 +533,9 @@
node := (control as vspx_row_template).te_column_value('_NODE');
node_type := BMK.WA.node_type (node);
node_id := BMK.WA.node_id (node);
- permissions := self.person_rights;
+ permissions := self.account_rights;
if (node_type = 'b')
- permissions := BMK.WA.bookmark_rights (self.domain_id, node_id, self.person_rights, self.account_rights);
+ permissions := BMK.WA.bookmark_rights (self.domain_id, node_id, self.account_rights);
?>
<td class="checkbox">
@@ -1044,7 +1044,7 @@
<v:on-post>
<![CDATA[
-- check / create folder
- self.v_folder_id := cast (self.i_folder_id.ufl_value as integer);
+ self.v_folder_id := self.i_folder_id.ufl_value;
self.v_folder_name := trim (self.i_folder_name.ufl_value);
if ((self.v_folder_name <> '') and (not BMK.WA.folder_check_name(self.v_folder_name, 1)))
{
@@ -1184,12 +1184,12 @@
<v:label for="e_format" value="Format"/>
</th>
<td>
- <input type="radio" name="e_format" id="e_format_0" value="Netscape" checked="checked" onclick="changeExportName('e_file', '.xbel', '.html');"/> <label for="e_format_0">Netscape</label>
+ <input type="radio" name="e_format" id="e_format_0" value="Netscape" checked="checked" onclick="changeExportName('e_file', '.xbel', '.html');"/><xsl:call-template name="nbsp"/><label for="e_format_0">Netscape</label>
</td>
</tr>
<tr>
<td>
- <input type="radio" name="e_format" id="e_format_1" value="XBEL" onclick="changeExportName('e_file', '.html', '.xbel');"/> <label for="e_format_1">XBEL</label>
+ <input type="radio" name="e_format" id="e_format_1" value="XBEL" onclick="changeExportName('e_file', '.html', '.xbel');"/><xsl:call-template name="nbsp"/><label for="e_format_1">XBEL</label>
</td>
</tr>
<tr>
diff --git a/appsrc/ODS-Bookmark/www/gems.vsp b/appsrc/ODS-Bookmark/www/gems.vsp
index a02315b..8055702 100644
--- a/appsrc/ODS-Bookmark/www/gems.vsp
+++ b/appsrc/ODS-Bookmark/www/gems.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: gems.vsp,v 1.1.2.4 2012/03/08 10:46:15 source Exp $
+-- $Id: gems.vsp,v 1.1.2.3 2010/10/07 13:24:04 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Bookmark/www/js/bookmark.js b/appsrc/ODS-Bookmark/www/js/bookmark.js
index 5793483..df2dcf3 100644
--- a/appsrc/ODS-Bookmark/www/js/bookmark.js
+++ b/appsrc/ODS-Bookmark/www/js/bookmark.js
@@ -1,10 +1,10 @@
/*
- * $Id: bookmark.js,v 1.27.2.17 2012/03/08 11:52:37 source Exp $
+ * $Id: bookmark.js,v 1.27.2.15 2011/06/09 17:43:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -677,8 +677,7 @@ function checkState()
setTimeout("checkState()", 500);
} else {
progressTimer = null;
- $('btn_Stop').value = 'Close';
- OAT.Dom.hide('btn_Background');
+ $('btn_Stop').click();
}
}
OAT.AJAX.POST('ajax.vsp', "a=load&sa=state&id="+progressID+urlParam("sid")+urlParam("realm"), x);
@@ -752,17 +751,12 @@ function readBookmark (id)
OAT.AJAX.POST ('ajax.vsp', "sid="+sid+"&realm="+realm+"&id="+id+"&a=visited", function(){}, {onstart:function(){}, onerror:function(){}});
}
-function davBrowse(fld, folders) {
- /* load stylesheets */
- OAT.Style.include("grid.css");
- OAT.Style.include("webdav.css");
-
+function davBrowse (fld)
+{
var options = {
mode: 'browser',
onConfirmClick: function(path, fname) {$(fld).value = '/DAV' + path + fname;}
};
- if (!folders) {folders = false;}
- OAT.WebDav.options.foldersOnly = folders;
OAT.WebDav.open(options);
}
@@ -1299,7 +1293,7 @@ BMK.loadItems = function(nodeID, nodePath)
nodePath = nodeID;
var pane = $('pane_right_top');
pane.innerHTML = '';
- var URL = 'forms.vspx?sa=browse&node='+encodeURIComponent(nodeID)+'&path='+encodeURIComponent('/'+BMK.trim(nodePath, '/'))+BMK.sessionParams();
+ var URL = 'forms.vspx?sa=browse&node='+encodeURIComponent(nodeID)+'&path='+encodeURIComponent(nodePath)+BMK.sessionParams();
var v = $('nodeItem');
if (v && (v.value != '')) {
URL += '&item=' + v.value;
@@ -1432,10 +1426,12 @@ BMK.formPostAfter = function (action)
BMK.aboutDialog = function ()
{
var aboutDiv = $('aboutDiv');
- if (aboutDiv)
- OAT.Dom.unlink(aboutDiv);
-
- aboutDiv = OAT.Dom.create('div', {height: '160px', overflow: 'hidden'});
+ if (aboutDiv) {OAT.Dom.unlink(aboutDiv);}
+ aboutDiv = OAT.Dom.create('div', {
+ width:'430px',
+ height: '170px',
+ overflow: 'hidden'
+ });
aboutDiv.id = 'aboutDiv';
aboutDialog = new OAT.Dialog('About ODS Booomarks', aboutDiv, {width:445, buttons: 0, resize:0, modal:1});
aboutDialog.cancel = aboutDialog.hide;
diff --git a/appsrc/ODS-Bookmark/www/message.vspx b/appsrc/ODS-Bookmark/www/message.vspx
index 370ef31..f6d68a6 100644
--- a/appsrc/ODS-Bookmark/www/message.vspx
+++ b/appsrc/ODS-Bookmark/www/message.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: message.vspx,v 1.1.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: message.vspx,v 1.1.2.1 2010/09/20 10:14:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Bookmark/www/search.vspx b/appsrc/ODS-Bookmark/www/search.vspx
index 9acbc50..2d159fc 100644
--- a/appsrc/ODS-Bookmark/www/search.vspx
+++ b/appsrc/ODS-Bookmark/www/search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.vspx,v 1.30.2.14 2012/03/08 11:52:37 source Exp $
+ - $Id: search.vspx,v 1.30.2.12 2011/05/02 14:16:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -138,7 +138,7 @@
if (maxRows <> '')
maxRows := 'TOP ' || maxRows;
sql := replace(sql, '<MAX>', maxRows);
- sqlParams := vector (self.domain_id, self.account_id, self.person_rights, data, self.v_max);
+ sqlParams := vector (self.domain_id, self.account_id, self.account_rights, data, self.v_max);
sql := concat(sql, 'order by ', self.v_order, ' ', self.v_direction);
exec(sql, state, msg, sqlParams, 0, meta, result);
if (state = '00000')
@@ -668,7 +668,7 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Save" enabled="-- case when self.person_rights = 'W' then 1 else 0 end" xhtml_class="form-button">
+ <v:button action="simple" value="Save" enabled="-- case when self.account_rights = 'W' then 1 else 0 end" xhtml_class="form-button">
<v:on-post>
<![CDATA[
self.update_params();
diff --git a/appsrc/ODS-Bookmark/www/settings.vspx b/appsrc/ODS-Bookmark/www/settings.vspx
index 334c98b..46c1018 100644
--- a/appsrc/ODS-Bookmark/www/settings.vspx
+++ b/appsrc/ODS-Bookmark/www/settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: settings.vspx,v 1.19.2.12 2012/03/08 11:52:37 source Exp $
+ - $Id: settings.vspx,v 1.19.2.10 2011/05/17 22:59:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -90,11 +90,11 @@
<tr>
<td id="LC">
<div class="lc lc_close">
- <vm:if test="self.person_rights = 'W'">
+ <vm:if test="self.account_rights = 'W'">
<span onclick="javascript: vspxPost('command', 'action', 'settings', 'mode', '');" title="Settings" class="gems2">Settings</span>
</vm:if>
<span onclick="javascript: vspxPost('command', 'action', 'settings', 'mode', 'bookmarklet');" title="Bookmarklet" class="gems2">Bookmarklet</span>
- <vm:if test="self.person_rights = 'W'">
+ <vm:if test="self.account_rights = 'W'">
<span onclick="javascript: vspxPost('command', 'action', 'settings', 'mode', 'publishBrowse');" title="Publications" class="gems2">Publications</span>
<span onclick="javascript: vspxPost('command', 'action', 'settings', 'mode', 'subscribeBrowse');" title="Subscriptions" class="gems2">Subscriptions</span>
</vm:if>
@@ -424,13 +424,12 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Clear" xhtml_onclick="javascript: return confirm (\'Do you want to reset settings to default?\');" xhtml_class="form-button">
+ <v:button action="simple" value="Clear" xhtml_class="form-button">
<v:on-post>
<![CDATA[
delete from BMK.WA.SETTINGS where S_ACCOUNT_ID = self.account_id;
BMK.WA.nntp_update (self.domain_id, null, null, 1, 0);
- self.settings := vector_concat (vector ('app', DB.DBA.WA_USER_APP_ENABLE (self.account_id)), BMK.WA.settings (self.domain_id));
self.vc_data_bind(e);
]]>
</v:on-post>
diff --git a/appsrc/ODS-Bookmark/www/tags.vspx b/appsrc/ODS-Bookmark/www/tags.vspx
index 78737cb..d50feb8 100644
--- a/appsrc/ODS-Bookmark/www/tags.vspx
+++ b/appsrc/ODS-Bookmark/www/tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tags.vspx,v 1.4.2.4 2012/03/08 10:46:15 source Exp $
+ - $Id: tags.vspx,v 1.4.2.3 2011/05/02 14:16:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/www/template/popup.vspx b/appsrc/ODS-Bookmark/www/template/popup.vspx
index f497fba..821a860 100644
--- a/appsrc/ODS-Bookmark/www/template/popup.vspx
+++ b/appsrc/ODS-Bookmark/www/template/popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: popup.vspx,v 1.7.2.11 2012/03/08 11:52:37 source Exp $
+ - $Id: popup.vspx,v 1.7.2.9 2011/07/04 10:04:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -83,7 +83,6 @@
<v:variable persist="0" name="domain_id" type="integer" default="-1"/>
<v:variable persist="0" name="account_id" type="integer" default="-1"/>
<v:variable persist="0" name="account_rights" type="varchar" default="''"/>
- <v:variable persist="0" name="person_rights" type="varchar" default="''" />
<v:variable persist="0" name="settings" type="any" />
<v:variable persist="0" name="rdf_iri" type="varchar" default="null" />
<v:on-init>
@@ -97,8 +96,7 @@
aSessInfo := BMK.WA.session_restore (params);
self.domain_id := cast(get_keyword('domain_id', aSessInfo, '-1') as integer);
self.account_id := cast (get_keyword ('account_id', aSessInfo, '-1') as integer);
- self.account_rights := get_keyword ('account_rights', aSessInfo);
- self.person_rights := get_keyword ('person_rights', aSessInfo);
+ self.account_rights := get_keyword ('account_rights', aSessInfo, '');
self.settings := BMK.WA.settings (self.domain_id);
]]>
</v:on-init>
diff --git a/appsrc/ODS-Bookmark/www/template/template.vspx b/appsrc/ODS-Bookmark/www/template/template.vspx
index 58b2ad3..c8a5bc6 100644
--- a/appsrc/ODS-Bookmark/www/template/template.vspx
+++ b/appsrc/ODS-Bookmark/www/template/template.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.vspx,v 1.33.2.17 2012/03/08 11:52:38 source Exp $
+ - $Id: template.vspx,v 1.33.2.15 2011/07/04 10:04:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -66,6 +66,11 @@
connectionHeaders: {Authorization: '<?V BMK.WA.account_basicAuthorization (self.account_id) ?>'}
};
+ /* load stylesheets */
+ OAT.Style.include("grid.css");
+ OAT.Style.include("webdav.css");
+ OAT.Style.include("winms.css");
+
var featureList=["ajax", "json", "anchor", "dialog", "tree", "calendar"];
OAT.Loader.load(featureList);
</script>
@@ -111,7 +116,6 @@
<v:variable persist="0" name="domain_id" type="integer" default="-1"/>
<v:variable persist="0" name="account_id" type="integer" default="-1"/>
<v:variable persist="0" name="account_rights" type="varchar" default="''" />
- <v:variable persist="0" name="person_rights" type="varchar" default="''" />
<v:variable persist="0" name="settings" type="any" />
<v:variable persist="0" name="rdf_iri" type="varchar" default="null" />
<v:on-init>
@@ -120,13 +124,12 @@
set http_charset = 'utf-8';
-- Initialize variables
- declare aSessInfo any;
+ declare sessionData any;
- aSessInfo := BMK.WA.session_restore (params);
- self.domain_id := cast (get_keyword('domain_id', aSessInfo, '-1') as integer);
- self.account_id := cast (get_keyword('account_id', aSessInfo, '-1') as integer);
- self.account_rights := get_keyword ('account_rights', aSessInfo);
- self.person_rights := get_keyword ('person_rights', aSessInfo);
+ sessionData := BMK.WA.session_restore (params);
+ self.domain_id := cast (get_keyword('domain_id', sessionData, '-1') as integer);
+ self.account_id := cast (get_keyword('account_id', sessionData, '-1') as integer);
+ self.account_rights := get_keyword ('account_rights', sessionData, '');
self.settings := vector_concat (vector ('app', DB.DBA.WA_USER_APP_ENABLE (self.account_id)), BMK.WA.settings (self.domain_id));
self.vc_add_attribute ('xmlns:foaf', 'http://xmlns.com/foaf/0.1/');
diff --git a/appsrc/ODS-Bookmark/www/template/template.xsl b/appsrc/ODS-Bookmark/www/template/template.xsl
index 16b3ba0..903f6c7 100644
--- a/appsrc/ODS-Bookmark/www/template/template.xsl
+++ b/appsrc/ODS-Bookmark/www/template/template.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.xsl,v 1.29.2.9 2012/03/08 11:52:38 source Exp $
+ - $Id: template.xsl,v 1.29.2.7 2011/05/02 14:16:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -181,7 +181,7 @@
<?vsp http (BMK.WA.utf2wide (BMK.WA.banner_links (self.domain_id, self.sid, self.realm))); ?>
</div>
<div style="float: right; padding-right: 0.5em;">
- <vm:if test="self.person_rights = 'W'">
+ <vm:if test="self.account_rights = 'W'">
<a href="<?vsp http (BMK.WA.utf2wide (BMK.WA.page_url (self.domain_id, 'settings.vspx', self.sid, self.realm))); ?>" title="Preferences">Preferences</a>
|
</vm:if>
diff --git a/appsrc/ODS-Bookmark/xslt/Netscape.xsl b/appsrc/ODS-Bookmark/xslt/Netscape.xsl
index 8509111..d7cf727 100644
--- a/appsrc/ODS-Bookmark/xslt/Netscape.xsl
+++ b/appsrc/ODS-Bookmark/xslt/Netscape.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: Netscape.xsl,v 1.4.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: Netscape.xsl,v 1.4.2.1 2010/09/20 10:14:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/xslt/XBEL.xsl b/appsrc/ODS-Bookmark/xslt/XBEL.xsl
index 3dba782..b4b5f39 100644
--- a/appsrc/ODS-Bookmark/xslt/XBEL.xsl
+++ b/appsrc/ODS-Bookmark/xslt/XBEL.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: XBEL.xsl,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: XBEL.xsl,v 1.2.2.1 2010/09/20 10:14:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/xslt/rss2atom.xsl b/appsrc/ODS-Bookmark/xslt/rss2atom.xsl
index 96adc95..a8f5bee 100644
--- a/appsrc/ODS-Bookmark/xslt/rss2atom.xsl
+++ b/appsrc/ODS-Bookmark/xslt/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.4.2.3 2012/03/08 10:46:15 source Exp $
+ - $Id: rss2atom.xsl,v 1.4.2.2 2010/09/20 10:14:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl b/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl
index da72f9d..53f03df 100644
--- a/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl
+++ b/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.4.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: rss2atom03.xsl,v 1.4.2.1 2010/09/20 10:14:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl b/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl
index 667a0d2..032e4d8 100644
--- a/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl
+++ b/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.5.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: rss2rdf.xsl,v 1.5.2.1 2010/09/20 10:14:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl b/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl
index a5047ac..3ac603e 100644
--- a/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl
+++ b/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2.2.1 2010/09/20 10:14:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/Makefile.am b/appsrc/ODS-Briefcase/Makefile.am
index bbda7ef..5ea20c0 100644
--- a/appsrc/ODS-Briefcase/Makefile.am
+++ b/appsrc/ODS-Briefcase/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -47,7 +47,6 @@ EXTRA_DIST = \
make_vad.sh \
new/*.sql \
schemas/*.rdf \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Briefcase/Makefile.in b/appsrc/ODS-Briefcase/Makefile.in
index c4e2821..74dab77 100644
--- a/appsrc/ODS-Briefcase/Makefile.in
+++ b/appsrc/ODS-Briefcase/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -312,7 +310,6 @@ EXTRA_DIST = \
make_vad.sh \
new/*.sql \
schemas/*.rdf \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Briefcase/make_vad.sh b/appsrc/ODS-Briefcase/make_vad.sh
index 030ff4d..1fec14c 100755
--- a/appsrc/ODS-Briefcase/make_vad.sh
+++ b/appsrc/ODS-Briefcase/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.49.2.44 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.49.2.42 2011/08/01 14:14:42 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -30,7 +30,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.0.0"
+VERSION="1.3.311"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -63,6 +63,16 @@ else
LN="ln -fs"
RM="rm -f"
fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
if [ "z$SERVER" = "z" ]
then
@@ -97,57 +107,6 @@ else
myrm=$RM
fi
-
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
- done
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
- rm -f version.tmp
- echo "$VERSION" > vad_version
- fi
-}
-
virtuoso_start() {
echo "Starting $SERVER"
echo $BUILD
@@ -283,7 +242,7 @@ sticker_init() {
echo " <name package=\"Briefcase\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Briefcase\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -295,8 +254,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.85.05\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-12-29 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.82.62\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2011-07-12 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -443,7 +402,6 @@ echo '----------------------'
STOP_SERVER
directory_clean
-version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -469,7 +427,6 @@ then
$myrm -f *.vad
exit 1
fi
-
directory_clean
BANNER "COMPLETED VAD PACKAGING"
diff --git a/appsrc/ODS-Briefcase/new/od-a-api.sql b/appsrc/ODS-Briefcase/new/od-a-api.sql
index 24deaf6..d61a16e 100644
--- a/appsrc/ODS-Briefcase/new/od-a-api.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-api.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-api.sql,v 1.1.2.8 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-api.sql,v 1.1.2.7 2011/08/01 14:14:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-code.sql b/appsrc/ODS-Briefcase/new/od-a-code.sql
index 377b0d3..9e474ab 100644
--- a/appsrc/ODS-Briefcase/new/od-a-code.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-code.sql,v 1.36.2.26 2012/03/08 12:00:18 source Exp $
+-- $Id: od-a-code.sql,v 1.36.2.24 2011/08/01 14:14:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -377,7 +377,7 @@ create procedure ODRIVE.WA.dashboard_rs(
in p0 integer)
{
declare account_id, vspxUser any;
- declare waiName, link varchar;
+ declare wai_name, link varchar;
declare c0 integer;
declare c1 varchar;
@@ -401,8 +401,8 @@ create procedure ODRIVE.WA.dashboard_rs(
and substring (RES_PERMS, 7, 1) = '1'
order by RES_MOD_TIME desc) do
{
- waiName := (select top 1 WAI_NAME from DB.DBA.WA_INSTANCE, DB.DBA.WA_MEMBER where WAI_TYPE_NAME = 'oDrive' and WAI_NAME = WAM_INST and WAM_MEMBER_TYPE = 1 and WAM_USER = RES_OWNER);
- link := case when isnull (waiName) then RES_FULL_PATH else SIOC..post_iri_ex (SIOC..briefcase_iri (waiName), RES_ID) end;
+ wai_name := (select top 1 WAI_NAME from DB.DBA.WA_INSTANCE, DB.DBA.WA_MEMBER where WAI_TYPE_NAME = 'oDrive' and WAI_NAME = WAM_INST and WAM_MEMBER_TYPE = 1 and WAM_USER = RES_OWNER);
+ link := case when isnull (wai_name) then RES_FULL_PATH else SIOC..post_iri_ex (SIOC..briefcase_iri (wai_name), RES_ID) end;
result (RES_ID, RES_NAME, link, RES_MOD_TIME, RES_OWNER);
}
}
@@ -440,8 +440,8 @@ create procedure ODRIVE.WA.dashboard_rs(
) sub
order by RES_MOD_TIME desc) do
{
- waiName := (select top 1 WAI_NAME from DB.DBA.WA_INSTANCE, DB.DBA.WA_MEMBER where WAI_TYPE_NAME = 'oDrive' and WAI_NAME = WAM_INST and WAM_MEMBER_TYPE = 1 and WAM_USER = RES_OWNER);
- link := case when isnull (waiName) then RES_FULL_PATH else SIOC..post_iri_ex (SIOC..briefcase_iri (waiName), RES_ID) end;
+ wai_name := (select top 1 WAI_NAME from DB.DBA.WA_INSTANCE, DB.DBA.WA_MEMBER where WAI_TYPE_NAME = 'oDrive' and WAI_NAME = WAM_INST and WAM_MEMBER_TYPE = 1 and WAM_USER = RES_OWNER);
+ link := case when isnull (wai_name) then RES_FULL_PATH else SIOC..post_iri_ex (SIOC..briefcase_iri (wai_name), RES_ID) end;
result (RES_ID, RES_NAME, link, RES_MOD_TIME, RES_OWNER);
}
}
@@ -798,25 +798,13 @@ create procedure ODRIVE.WA.xml2string(
;
-------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.isVector (
- inout aVector any)
-{
- if (isarray (aVector) and not isstring (aVector))
- return 1;
-
- return 0;
-}
-;
-
--------------------------------------------------------------------------------
-- Returns:
-- N - if pAny is in pArray
-- -1 - otherwise
-------------------------------------------------------------------------------
create procedure ODRIVE.WA.vector_contains (
inout aVector any,
- in value any)
+ in value varchar)
{
declare N integer;
@@ -831,7 +819,7 @@ create procedure ODRIVE.WA.vector_contains (
--
create procedure ODRIVE.WA.vector_index (
inout aVector any,
- in value any)
+ in value varchar)
{
declare N integer;
@@ -1322,15 +1310,15 @@ create procedure ODRIVE.WA.odrive_proc(
{
if (((item[1] = 'C') or (item[10] like dirFilter)) and (ODRIVE.WA.hiddens_check (dirHiddens, item[10]) = 0))
{
- if (user_id <> coalesce (item[7], -1))
+ if (user_id <> item[7])
{
- user_id := coalesce (item[7], -1);
- user_name := ODRIVE.WA.odrive_user_name (user_id, '');
+ user_id := item[7];
+ user_name := ODRIVE.WA.odrive_user_name(user_id);
}
- if (group_id <> coalesce (item[6], -1))
+ if (group_id <> item[6])
{
- group_id := coalesce (item[6], -1);
- group_name := ODRIVE.WA.odrive_user_name (group_id, '');
+ group_id := item[6];
+ group_name := ODRIVE.WA.odrive_user_name(group_id);
}
tmp := coalesce((select RS_CATNAME from WS.WS.SYS_RDF_SCHEMAS, WS.WS.SYS_MIME_RDFS where RS_URI = MR_RDF_URI and MR_MIME_IDENT = item[9]), '~unknown~');
result(item[either(gte(dir_mode,2),0,10)], item[1], item[2], left(cast(item[3] as varchar), 19), item[9], user_name, group_name, adm_dav_format_perms(item[5]), item[0], tmp);
@@ -1350,7 +1338,6 @@ create procedure ODRIVE.WA.odrive_effective_permissions (
declare N, I, nPermission integer;
declare rc, id, type, item any;
declare lines, name, pwd, uid, gid, permissions any;
- declare auth_name varchar;
if (isstring(permission))
permission := vector(permission);
@@ -1369,6 +1356,9 @@ create procedure ODRIVE.WA.odrive_effective_permissions (
if (isinteger(item))
return 0;
+ declare uid, gid integer;
+ declare auth_name varchar;
+
auth_name := ODRIVE.WA.account();
uid := (select U_ID from DB.DBA.SYS_USERS where U_NAME = auth_name);
gid := (select U_GROUP from DB.DBA.SYS_USERS where U_NAME = auth_name);
@@ -1632,7 +1622,7 @@ create procedure ODRIVE.WA.account_iri (
-------------------------------------------------------------------------------
--
create procedure ODRIVE.WA.account_inverse_iri (
- in account_iri varchar)
+ in account_iri integer)
{
declare params any;
@@ -1785,7 +1775,6 @@ create procedure ODRIVE.WA.host_url ()
hp := sys_connected_server_address ();
hpa := split_and_decode ( hp , 0 , '\0\0:');
- if (hpa [1] <> '80')
host := host || ':' || hpa [1];
}
goto _exit;
@@ -2516,6 +2505,8 @@ create procedure ODRIVE.WA.odrive_sharing_dir_list (
exec (S, st, msg, vector (), vector ('use_cache', 1), meta, data);
if (st = '00000' and length (data))
{
+ declare V any;
+
for (N := 0; N < length (data); N := N + 1)
{
name := '';
@@ -2761,28 +2752,13 @@ create procedure ODRIVE.WA.auto_version_short (
-------------------------------------------------------------------------------
--
-create procedure ODRIVE.WA.det_type (
- in path varchar,
- in type varchar := 'C')
-{
- declare id any;
-
- id := DB.DBA.DAV_SEARCH_ID (path, type);
- if (ODRIVE.WA.DAV_ERROR (id))
- return '';
- return cast (coalesce (DB.DBA.DAV_PROP_GET_INT (id, type, ':virtdet', 0), '') as varchar);
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure ODRIVE.WA.det_class(
in path varchar,
in type varchar := 'C')
{
declare id any;
- id := ODRIVE.WA.DAV_SEARCH_ID (path, type);
+ id := ODRIVE.WA.DAV_SEARCH_ID (path);
if (not ODRIVE.WA.DAV_ERROR (id) and isarray (id))
return cast (id[0] as varchar);
return '';
@@ -2808,6 +2784,41 @@ create procedure ODRIVE.WA.det_category(
-------------------------------------------------------------------------------
--
+create procedure ODRIVE.WA.det_action_enable(
+ in path varchar,
+ in action varchar)
+{
+ declare retValue integer;
+ declare det_category varchar;
+
+ retValue := 1;
+ det_category := ODRIVE.WA.det_category (path, either (equ (right (path, 1), '/'), 'C', 'R'));
+ if ((det_category <> '') and (action in ('share', 'version')))
+ {
+ retValue := 0;
+ }
+ else if ((det_category = 'Versioning') and (action in ('new', 'upload', 'edit', 'rename', 'version', 'share')))
+ {
+ retValue := 0;
+ }
+ else if ((det_category = 'S3') and (action in ('version', 'rename', 'tag', 'share')))
+ {
+ retValue := 0;
+ }
+ else if ((det_category = 'HostFs') and (action in ('version', 'tag', 'share')))
+ {
+ retValue := 0;
+ }
+ else if ((lcase(det_category) in ('blog', 'omail', 'news3', 'bookmark', 'calendar', 'nntp')) and (action in ('new', 'upload', 'delete', 'rename', 'move', 'version', 'share')))
+ {
+ retValue := 0;
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
create procedure ODRIVE.WA.DAV_GET_INFO(
in path varchar,
in info varchar,
@@ -2990,7 +3001,7 @@ create procedure ODRIVE.WA.DAV_GET_VERSION_CONTROL (
-------------------------------------------------------------------------------
--
create procedure ODRIVE.WA.path_parent (
- in path varchar)
+ in path value)
{
path := trim(path, '/');
if (isnull(strrchr(path, '/')))
@@ -3002,7 +3013,7 @@ create procedure ODRIVE.WA.path_parent (
-------------------------------------------------------------------------------
--
create procedure ODRIVE.WA.path_name (
- in path varchar)
+ in path value)
{
path := trim(path, '/');
if (isnull(strrchr(path, '/')))
@@ -3172,8 +3183,7 @@ create procedure ODRIVE.WA.DAV_INIT_INT (
in auth_pwd varchar := null)
{
declare uid, gid integer;
- declare uname, gname varchar;
- declare permissions any;
+ declare permissions, uname, gname varchar;
DB.DBA.DAV_OWNER_ID(ODRIVE.WA.account (), null, uid, gid);
ODRIVE.WA.DAV_API_PARAMS (uid, gid, uname, gname, auth_name, auth_pwd);
@@ -3257,7 +3267,7 @@ create procedure ODRIVE.WA.DAV_GET (
return resource[2];
if (property = 'modificationTime')
- return case when is_empty_or_null (resource[3]) then now () else resource[3] end;
+ return resource[3];
if (property = 'id')
return resource[4];
@@ -3293,7 +3303,7 @@ create procedure ODRIVE.WA.DAV_GET (
return ODRIVE.WA.odrive_user_name(resource[7]);
if (property = 'creationTime')
- return case when is_empty_or_null (resource[8]) then now () else resource[8] end;
+ return resource[8];
if (property = 'mimeType')
return coalesce(resource[9], '');
@@ -3317,10 +3327,8 @@ create procedure ODRIVE.WA.DAV_GET (
{
if (ODRIVE.WA.DAV_PROP_GET (resource[0], 'virt:rdf_graph', '') <> '')
detType := 'rdfSink';
- else if (ODRIVE.WA.DAV_PROP_GET (resource[0], 'virt:Versioning-History', '') <> '')
+ if (ODRIVE.WA.DAV_PROP_GET (resource[0], 'virt:Versioning-History', '') <> '')
detType := 'UnderVersioning';
- else if (ODRIVE.WA.syncml_detect (resource[0]))
- detType := 'SyncML';
}
return detType;
}
@@ -3358,7 +3366,7 @@ create procedure ODRIVE.WA.DAV_GET (
if (property = 'permissions-inheritance')
{
- if (isnull (resource[0]) or (resource[1] = 'R') or ODRIVE.WA.isVector (resource[1]))
+ if ((isnull (resource[0])) or (resource[1] = 'R') or isarray(resource[1]))
return null;
return (select COL_INHERIT from WS.WS.SYS_DAV_COL where COL_ID = resource[4]);
}
@@ -3642,28 +3650,9 @@ create procedure ODRIVE.WA.DAV_DELETE (
in auth_name varchar := null,
in auth_pwd varchar := null)
{
- declare id any;
- declare owner, uname, gname, detType varchar;
+ declare uname, gname varchar;
ODRIVE.WA.DAV_API_PARAMS (null, null, uname, gname, auth_name, auth_pwd);
- if (path[length (path)-1] = ascii('/'))
- {
- detType := ODRIVE.WA.det_type (path, 'C');
- if (detType = 'SyncML')
- {
- ODRIVE.WA.exec ('delete from DB.DBA.SYNC_COLS_TYPES where CT_COL_ID = ?', vector (DB.DBA.DAV_SEARCH_ID (path, 'C')));
- }
- else if (detType = 'IMAP')
- {
- id := DB.DBA.DAV_SEARCH_ID (path, 'C');
- if (not ODRIVE.WA.DAV_ERROR (id) and not isarray(id))
- {
- owner := sprintf ('IMAP_%d', id);
- ODRIVE.WA.exec ('delete from DB.DBA.MAIL_FOLDER where MF_OWN = ?', vector (owner));
- ODRIVE.WA.exec ('delete from DB.DBA.MAIL_MESSAGE where MM_OWN = ?', vector (owner));
- }
- }
- }
return DB.DBA.DAV_DELETE(path, silent, auth_name, auth_pwd);
}
;
@@ -3689,24 +3678,6 @@ create procedure ODRIVE.WA.DAV_RES_UPLOAD (
-------------------------------------------------------------------------------
--
-create procedure ODRIVE.WA.DAV_RDF_UPLOAD (
- inout content any,
- in type varchar,
- in graph varchar)
-{
- declare retValue integer;
- declare graph2 varchar;
-
- graph2 := 'http://local.virt/temp';
- retValue := DB.DBA.RDF_SINK_UPLOAD ('/temp', content, type, graph, 'on', '', '');
- SPARQL clear graph ?:graph2;
-
- return retValue;
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure ODRIVE.WA.DAV_RES_CONTENT (
in path varchar,
in auth_name varchar := null,
@@ -3825,15 +3796,13 @@ create procedure ODRIVE.WA.DAV_PROP_SET (
in auth_pwd varchar := null,
in removeBefore integer := 1)
{
- -- dbg_obj_princ ('ODRIVE.WA.DAV_PROP_SET (', path, propName, propValue, ')');
+ -- dbg_obj_princ ('ODRIVE.WA.DAV_PROP_SET (', path, propName, ')');
declare uname, gname varchar;
- declare retValue any;
ODRIVE.WA.DAV_API_PARAMS (null, null, uname, gname, auth_name, auth_pwd);
if (removeBefore)
- retValue := DB.DBA.DAV_PROP_REMOVE (path, propName, auth_name, auth_pwd);
-
- return DB.DBA.DAV_PROP_SET (path, propName, propValue, auth_name, auth_pwd);
+ DB.DBA.DAV_PROP_REMOVE(path, propname, auth_name, auth_pwd);
+ return DB.DBA.DAV_PROP_SET(path, propname, propvalue, auth_name, auth_pwd);
}
;
@@ -3982,10 +3951,7 @@ create procedure ODRIVE.WA.get_rdf (
create procedure ODRIVE.WA.test_clear (
in S any)
{
- S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
- S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
-
- return S;
+ return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
}
;
@@ -4056,9 +4022,8 @@ create procedure ODRIVE.WA.test (
tmp := get_keyword('maxValue', params);
if (not isnull(tmp) and (value > tmp))
signal('MAX', cast(tmp as varchar));
- }
- else if (valueType = 'float')
- {
+
+ } else if (valueType = 'float') {
tmp := get_keyword('minValue', params);
if (not isnull(tmp) and (value < tmp))
signal('MIN', cast(tmp as varchar));
@@ -4066,9 +4031,8 @@ create procedure ODRIVE.WA.test (
tmp := get_keyword('maxValue', params);
if (not isnull(tmp) and (value > tmp))
signal('MAX', cast(tmp as varchar));
- }
- else if (valueType = 'varchar')
- {
+
+ } else if (valueType = 'varchar') {
tmp := get_keyword('minLength', params);
if (not isnull(tmp) and (length(value) < tmp))
signal('MINLENGTH', cast(tmp as varchar));
@@ -4262,6 +4226,63 @@ ODRIVE.WA.version_update()
-------------------------------------------------------------------------------
--
+create procedure ODRIVE.WA.obj2json (
+ in o any,
+ in d integer := 2)
+{
+ declare N, M integer;
+ declare R, T any;
+ declare retValue any;
+
+ if (d = 0)
+ return '[maximum depth achieved]';
+
+ T := vector ('\b', '\\b', '\t', '\\t', '\n', '\\n', '\f', '\\f', '\r', '\\r', '"', '\\"', '\\', '\\\\');
+ retValue := '';
+ if (isnumeric (o))
+ {
+ retValue := cast (o as varchar);
+ }
+ else if (isstring (o))
+ {
+ for (N := 0; N < length(o); N := N + 1)
+ {
+ R := chr (o[N]);
+ for (M := 0; M < length(T); M := M + 2)
+ {
+ if (R = T[M])
+ R := T[M+1];
+ }
+ retValue := retValue || R;
+ }
+ retValue := '"' || retValue || '"';
+ }
+ else if (isarray (o))
+ {
+ retValue := '[';
+ for (N := 0; N < length(o); N := N + 1)
+ {
+ retValue := retValue || ODRIVE.WA.obj2json (o[N], d-1);
+ if (N <> length(o)-1)
+ retValue := retValue || ',\n';
+ }
+ retValue := retValue || ']';
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ODRIVE.WA.json2obj (
+ in o any)
+{
+ return json_parse (o);
+}
+;
+
+-------------------------------------------------------------------------------
+--
create procedure ODRIVE.WA.ui_image (
in itemPath varchar,
in itemType varchar,
@@ -4269,22 +4290,19 @@ create procedure ODRIVE.WA.ui_image (
{
if (itemType = 'C')
{
- declare det_type varchar;
-
- det_type := ODRIVE.WA.det_type (itemPath, itemType);
- if (det_type = 'CatFilter')
+ if (ODRIVE.WA.det_category(itemPath) = 'CatFilter')
return 'image/dav/category_16.png';
- if (det_type = 'PropFilter')
+ if (ODRIVE.WA.det_category(itemPath) = 'PropFilter')
return 'image/dav/property_16.png';
- if (det_type = 'HostFs')
+ if (ODRIVE.WA.det_category(itemPath) = 'HostFs')
return 'image/dav/hostfs_16.png';
- if (det_type = 'Versioning')
+ if (ODRIVE.WA.det_category(itemPath) = 'Versioning')
return 'image/dav/versions_16.png';
- if (det_type = 'News3')
+ if (ODRIVE.WA.det_category(itemPath) = 'News3')
return 'image/dav/enews_16.png';
- if (det_type = 'Blog')
+ if (ODRIVE.WA.det_category(itemPath) = 'Blog')
return 'image/dav/blog_16.png';
- if (det_type = 'oMail')
+ if (ODRIVE.WA.det_category(itemPath) = 'oMail')
return 'image/dav/omail_16.png';
return 'image/dav/foldr_16.png';
}
@@ -4390,8 +4408,6 @@ create procedure ODRIVE.WA.send_mail (
{
_iri := SIOC..briefcase_iri (ODRIVE.WA.domain_name (_instance));
_what := case when (_path[length (_path)-1] <> ascii('/')) then 'R' else 'C' end;
- if (_what = 'C')
- _iri := _iri || '/folder';
_id := DB.DBA.DAV_SEARCH_ID (_path, _what);
if (exists (select 1 from SYS_USERS where U_ID = _to and U_IS_ROLE = 1))
@@ -4493,19 +4509,9 @@ create procedure ODRIVE.WA.aci_parents (
create procedure ODRIVE.WA.aci_load (
in path varchar)
{
- declare id, what, retValue, graph any;
+ declare retValue, graph any;
declare S, st, msg, data, meta any;
- what := case when (path[length (path)-1] <> ascii('/')) then 'R' else 'C' end;
- id := ODRIVE.WA.DAV_SEARCH_ID (path, what);
- if (isarray (id))
- {
- retValue := ODRIVE.WA.DAV_PROP_GET (path, 'virt:aci_meta');
- if (ODRIVE.WA.DAV_ERROR (retValue))
- retValue := vector ();
- }
- else
- {
retValue := vector ();
graph := WS.WS.DAV_IRI (path);
@@ -4570,27 +4576,6 @@ create procedure ODRIVE.WA.aci_load (
if (not isnull (V))
retValue := vector_concat (retValue, vector (V));
}
- }
- return retValue;
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.aci_save (
- in path varchar,
- inout aci any)
-{
- declare id, what, retValue, tmp any;
-
- what := case when (path[length (path)-1] <> ascii('/')) then 'R' else 'C' end;
- id := ODRIVE.WA.DAV_SEARCH_ID (path, what);
- if (isarray (id))
- retValue := ODRIVE.WA.DAV_PROP_SET (path, 'virt:aci_meta', aci);
-
- if (not isarray (id))
- retValue := ODRIVE.WA.DAV_PROP_SET (path, 'virt:aci_meta_n3', ODRIVE.WA.aci_n3 (aci));
-
return retValue;
}
;
@@ -4598,7 +4583,7 @@ create procedure ODRIVE.WA.aci_save (
-------------------------------------------------------------------------------
--
create procedure ODRIVE.WA.aci_params (
- inout params any)
+ in params any)
{
declare N, M integer;
declare aclNo, retValue, V any;
@@ -4701,118 +4686,3 @@ create procedure ODRIVE.WA.path_normalize (
return path;
}
;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.path2ssl (
- in path varchar)
-{
- declare pos any;
- declare V, sslData, sslPort any;
-
- sslData := ODS.ODS_API."server.getInfo"('sslPort');
- if (not isnull (sslData))
- {
- sslPort := get_keyword ('sslPort', sslData, 443);
- V := rfc1808_parse_uri (path);
- V[0] := 'https';
-
- pos := strrchr (V[1], ':');
- if (pos is not null)
- V[1] := subseq (V[1], 0, pos);
- V[1] := V[1] || case when sslPort <> 443 then ':' || cast (sslPort as varchar) else '' end;
- path := DB.DBA.vspx_uri_compose (V);
-
- }
- return path;
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.syncml_detect (
- in path varchar)
-{
- if (__proc_exists ('DB.DBA.yac_syncml_detect') is not null)
- return DB.DBA.yac_syncml_detect (path);
-
- return 0;
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.syncml_versions ()
-{
- if (__proc_exists ('DB.DBA.yac_syncml_version') is not null)
- return DB.DBA.yac_syncml_version ();
-
- return vector ();
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.syncml_version (
- in path varchar)
-{
- if (__proc_exists ('DB.DBA.yac_syncml_version_get') is not null)
- return DB.DBA.yac_syncml_version_get (path);
-
- return 'N';
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.syncml_types ()
-{
- if (__proc_exists ('DB.DBA.yac_syncml_type') is not null)
- return DB.DBA.yac_syncml_type ();
-
- return vector ();
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.syncml_type (
- in path varchar)
-{
- if (__proc_exists ('DB.DBA.yac_syncml_type_get') is not null)
- return DB.DBA.yac_syncml_type_get (path);
-
- return 'N';
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.cartridges_get ()
-{
- declare retValue any;
-
- retValue := vector ();
- for (select RM_ID, RM_DESCRIPTION, ucase (cast (RM_DESCRIPTION as varchar (128))) as RM_SORT from DB.DBA.SYS_RDF_MAPPERS where RM_ENABLED = 1 order by 3) do
- {
- retValue := vector_concat (retValue, vector (vector (RM_ID, RM_DESCRIPTION)));
- }
- return retValue;
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure ODRIVE.WA.metaCartridges_get ()
-{
- declare items, retValue any;
-
- retValue := vector ();
- items := ODRIVE.WA.exec ('select MC_ID, MC_DESC, ucase (cast (MC_DESC as varchar (128))) as MC_SORT from DB.DBA.RDF_META_CARTRIDGES where MC_ENABLED = 1 order by 3');
- foreach (any item in items) do
- {
- retValue := vector_concat (retValue, vector (vector (item[0], item[1])));
- }
- return retValue;
-}
-;
diff --git a/appsrc/ODS-Briefcase/new/od-a-dc-data.sql b/appsrc/ODS-Briefcase/new/od-a-dc-data.sql
index 64f80f7..88f50ff 100644
--- a/appsrc/ODS-Briefcase/new/od-a-dc-data.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-dc-data.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-dc-data.sql,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-dc-data.sql,v 1.2.2.1 2010/09/20 10:14:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-dc.sql b/appsrc/ODS-Briefcase/new/od-a-dc.sql
index e223ff0..7d389d6 100644
--- a/appsrc/ODS-Briefcase/new/od-a-dc.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-dc.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-dc.sql,v 1.7.2.5 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-dc.sql,v 1.7.2.4 2010/09/20 10:14:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-ddk.sql b/appsrc/ODS-Briefcase/new/od-a-ddk.sql
index 1ad6b29..df5d42a 100644
--- a/appsrc/ODS-Briefcase/new/od-a-ddk.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-ddk.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-ddk.sql,v 1.5.2.6 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-ddk.sql,v 1.5.2.5 2010/11/09 20:12:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-ods.sql b/appsrc/ODS-Briefcase/new/od-a-ods.sql
index 69adb4f..a85ed89 100644
--- a/appsrc/ODS-Briefcase/new/od-a-ods.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-ods.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-ods.sql,v 1.1.2.2 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-ods.sql,v 1.1.2.1 2010/09/20 10:14:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql b/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql
index c68dae6..f6f60a2 100644
--- a/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-rdf-data.sql,v 1.7.2.2 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-rdf-data.sql,v 1.7.2.1 2010/09/20 10:14:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-rdf.sql b/appsrc/ODS-Briefcase/new/od-a-rdf.sql
index 10424c6..255bfed 100644
--- a/appsrc/ODS-Briefcase/new/od-a-rdf.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-rdf.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-rdf.sql,v 1.6.2.2 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-rdf.sql,v 1.6.2.1 2010/09/20 10:14:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-update.sql b/appsrc/ODS-Briefcase/new/od-a-update.sql
index bd44d00..9668f5f 100644
--- a/appsrc/ODS-Briefcase/new/od-a-update.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-update.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-update.sql,v 1.1.2.3 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-update.sql,v 1.1.2.2 2010/09/20 10:14:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Briefcase/new/od-a-wa.sql b/appsrc/ODS-Briefcase/new/od-a-wa.sql
index a62a24c..72d7099 100644
--- a/appsrc/ODS-Briefcase/new/od-a-wa.sql
+++ b/appsrc/ODS-Briefcase/new/od-a-wa.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-a-wa.sql,v 1.13.2.6 2012/03/08 10:46:15 source Exp $
+-- $Id: od-a-wa.sql,v 1.13.2.5 2011/05/17 22:59:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/new/od-d.sql b/appsrc/ODS-Briefcase/new/od-d.sql
index d83eb7d..27fded3 100644
--- a/appsrc/ODS-Briefcase/new/od-d.sql
+++ b/appsrc/ODS-Briefcase/new/od-d.sql
@@ -1,10 +1,10 @@
--
--- $Id: od-d.sql,v 1.7.2.7 2012/03/08 10:46:15 source Exp $
+-- $Id: od-d.sql,v 1.7.2.6 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/new/sioc_briefcase.sql b/appsrc/ODS-Briefcase/new/sioc_briefcase.sql
index be96700..c6c57a4 100644
--- a/appsrc/ODS-Briefcase/new/sioc_briefcase.sql
+++ b/appsrc/ODS-Briefcase/new/sioc_briefcase.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_briefcase.sql,v 1.16.2.14 2012/03/08 10:46:15 source Exp $
+-- $Id: sioc_briefcase.sql,v 1.16.2.13 2011/07/04 10:04:02 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/DOAP.rdf b/appsrc/ODS-Briefcase/schemas/DOAP.rdf
index b491a83..4c06515 100644
--- a/appsrc/ODS-Briefcase/schemas/DOAP.rdf
+++ b/appsrc/ODS-Briefcase/schemas/DOAP.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: DOAP.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: DOAP.rdf,v 1.2.2.1 2010/09/20 10:14:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/EML.rdf b/appsrc/ODS-Briefcase/schemas/EML.rdf
index 8d502f9..47574cd 100644
--- a/appsrc/ODS-Briefcase/schemas/EML.rdf
+++ b/appsrc/ODS-Briefcase/schemas/EML.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: EML.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: EML.rdf,v 1.2.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/FOAF.rdf b/appsrc/ODS-Briefcase/schemas/FOAF.rdf
index 131f7c4..df88f9f 100644
--- a/appsrc/ODS-Briefcase/schemas/FOAF.rdf
+++ b/appsrc/ODS-Briefcase/schemas/FOAF.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: FOAF.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: FOAF.rdf,v 1.3.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/ICS.rdf b/appsrc/ODS-Briefcase/schemas/ICS.rdf
index 4d75abc..2f17927 100644
--- a/appsrc/ODS-Briefcase/schemas/ICS.rdf
+++ b/appsrc/ODS-Briefcase/schemas/ICS.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ICS.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: ICS.rdf,v 1.2.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/MODS.rdf b/appsrc/ODS-Briefcase/schemas/MODS.rdf
index bc1d786..a38f2ab 100644
--- a/appsrc/ODS-Briefcase/schemas/MODS.rdf
+++ b/appsrc/ODS-Briefcase/schemas/MODS.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: MODS.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: MODS.rdf,v 1.2.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/OPML.rdf b/appsrc/ODS-Briefcase/schemas/OPML.rdf
index f179bc2..e6a4204 100644
--- a/appsrc/ODS-Briefcase/schemas/OPML.rdf
+++ b/appsrc/ODS-Briefcase/schemas/OPML.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: OPML.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: OPML.rdf,v 1.3.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/Office.rdf b/appsrc/ODS-Briefcase/schemas/Office.rdf
index e8559cc..ccc9fd7 100644
--- a/appsrc/ODS-Briefcase/schemas/Office.rdf
+++ b/appsrc/ODS-Briefcase/schemas/Office.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: Office.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: Office.rdf,v 1.3.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/RDF.rdf b/appsrc/ODS-Briefcase/schemas/RDF.rdf
index 6fdd750..3de764d 100644
--- a/appsrc/ODS-Briefcase/schemas/RDF.rdf
+++ b/appsrc/ODS-Briefcase/schemas/RDF.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: RDF.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: RDF.rdf,v 1.3.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/RSS.rdf b/appsrc/ODS-Briefcase/schemas/RSS.rdf
index 7213138..18c6bca 100644
--- a/appsrc/ODS-Briefcase/schemas/RSS.rdf
+++ b/appsrc/ODS-Briefcase/schemas/RSS.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: RSS.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: RSS.rdf,v 1.3.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/Spotlight.rdf b/appsrc/ODS-Briefcase/schemas/Spotlight.rdf
index e1fa852..c318369 100644
--- a/appsrc/ODS-Briefcase/schemas/Spotlight.rdf
+++ b/appsrc/ODS-Briefcase/schemas/Spotlight.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: Spotlight.rdf,v 1.4.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: Spotlight.rdf,v 1.4.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/VAD.rdf b/appsrc/ODS-Briefcase/schemas/VAD.rdf
index 8620378..a7579e5 100644
--- a/appsrc/ODS-Briefcase/schemas/VAD.rdf
+++ b/appsrc/ODS-Briefcase/schemas/VAD.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: VAD.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: VAD.rdf,v 1.2.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/VSPX.rdf b/appsrc/ODS-Briefcase/schemas/VSPX.rdf
index 7a4f61f..d50d849 100644
--- a/appsrc/ODS-Briefcase/schemas/VSPX.rdf
+++ b/appsrc/ODS-Briefcase/schemas/VSPX.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: VSPX.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: VSPX.rdf,v 1.2.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/WSDL.rdf b/appsrc/ODS-Briefcase/schemas/WSDL.rdf
index 53c0b85..e3b44f9 100644
--- a/appsrc/ODS-Briefcase/schemas/WSDL.rdf
+++ b/appsrc/ODS-Briefcase/schemas/WSDL.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: WSDL.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: WSDL.rdf,v 1.2.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/Wiki.rdf b/appsrc/ODS-Briefcase/schemas/Wiki.rdf
index 35d11ed..2d142f7 100644
--- a/appsrc/ODS-Briefcase/schemas/Wiki.rdf
+++ b/appsrc/ODS-Briefcase/schemas/Wiki.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: Wiki.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: Wiki.rdf,v 1.2.2.1 2010/09/20 10:14:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/XBEL.rdf b/appsrc/ODS-Briefcase/schemas/XBEL.rdf
index 2d97099..cd4c638 100644
--- a/appsrc/ODS-Briefcase/schemas/XBEL.rdf
+++ b/appsrc/ODS-Briefcase/schemas/XBEL.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: XBEL.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: XBEL.rdf,v 1.2.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/XBRL.rdf b/appsrc/ODS-Briefcase/schemas/XBRL.rdf
index 8d13df5..1b0506c 100644
--- a/appsrc/ODS-Briefcase/schemas/XBRL.rdf
+++ b/appsrc/ODS-Briefcase/schemas/XBRL.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: XBRL.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: XBRL.rdf,v 1.3.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/XDDL.rdf b/appsrc/ODS-Briefcase/schemas/XDDL.rdf
index dc7b0bd..f276273 100644
--- a/appsrc/ODS-Briefcase/schemas/XDDL.rdf
+++ b/appsrc/ODS-Briefcase/schemas/XDDL.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: XDDL.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: XDDL.rdf,v 1.2.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/XHTML.rdf b/appsrc/ODS-Briefcase/schemas/XHTML.rdf
index 73572bd..85d1ec2 100644
--- a/appsrc/ODS-Briefcase/schemas/XHTML.rdf
+++ b/appsrc/ODS-Briefcase/schemas/XHTML.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: XHTML.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: XHTML.rdf,v 1.2.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/annotea.rdf b/appsrc/ODS-Briefcase/schemas/annotea.rdf
index 5bc77f5..21a3275 100644
--- a/appsrc/ODS-Briefcase/schemas/annotea.rdf
+++ b/appsrc/ODS-Briefcase/schemas/annotea.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: annotea.rdf,v 1.1.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: annotea.rdf,v 1.1.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Briefcase/schemas/archive.rdf b/appsrc/ODS-Briefcase/schemas/archive.rdf
index a1206ac..3e4009f 100644
--- a/appsrc/ODS-Briefcase/schemas/archive.rdf
+++ b/appsrc/ODS-Briefcase/schemas/archive.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: archive.rdf,v 1.1.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: archive.rdf,v 1.1.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/audio.rdf b/appsrc/ODS-Briefcase/schemas/audio.rdf
index 870d57a..bda3c9b 100644
--- a/appsrc/ODS-Briefcase/schemas/audio.rdf
+++ b/appsrc/ODS-Briefcase/schemas/audio.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: audio.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: audio.rdf,v 1.2.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Briefcase/schemas/google-kinds.rdf b/appsrc/ODS-Briefcase/schemas/google-kinds.rdf
index e6f1741..97c2c48 100644
--- a/appsrc/ODS-Briefcase/schemas/google-kinds.rdf
+++ b/appsrc/ODS-Briefcase/schemas/google-kinds.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: google-kinds.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: google-kinds.rdf,v 1.3.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/image.rdf b/appsrc/ODS-Briefcase/schemas/image.rdf
index ab09693..75cb810 100644
--- a/appsrc/ODS-Briefcase/schemas/image.rdf
+++ b/appsrc/ODS-Briefcase/schemas/image.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: image.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: image.rdf,v 1.3.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/opl-lic.rdf b/appsrc/ODS-Briefcase/schemas/opl-lic.rdf
index 9351be4..c7a71b8 100644
--- a/appsrc/ODS-Briefcase/schemas/opl-lic.rdf
+++ b/appsrc/ODS-Briefcase/schemas/opl-lic.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: opl-lic.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: opl-lic.rdf,v 1.3.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/photo.rdf b/appsrc/ODS-Briefcase/schemas/photo.rdf
index bf5074d..b8e2cf2 100644
--- a/appsrc/ODS-Briefcase/schemas/photo.rdf
+++ b/appsrc/ODS-Briefcase/schemas/photo.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: photo.rdf,v 1.3.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: photo.rdf,v 1.3.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf b/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf
index 8bcdbf4..9ccb708 100644
--- a/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf
+++ b/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vcard-rdf.rdf,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: vcard-rdf.rdf,v 1.2.2.1 2010/09/20 10:14:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/vad_version b/appsrc/ODS-Briefcase/vad_version
deleted file mode 100644
index a63f96d..0000000
--- a/appsrc/ODS-Briefcase/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.19.40
diff --git a/appsrc/ODS-Briefcase/www/ajax.vsp b/appsrc/ODS-Briefcase/www/ajax.vsp
index 6ddfd9d..1fd2268 100644
--- a/appsrc/ODS-Briefcase/www/ajax.vsp
+++ b/appsrc/ODS-Briefcase/www/ajax.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ajax.vsp,v 1.2.2.3 2012/03/08 12:00:18 source Exp $
+-- $Id: ajax.vsp,v 1.2.2.1 2010/09/20 10:14:59 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
@@ -71,17 +71,7 @@
}
http_rewrite ();
http_header ('Content-Type: text/plain\r\n');
- http (ODS..obj2json (returnData, 5));
- return;
- }
- if (action = 'cartridges')
- {
- http (ODS..obj2json (ODRIVE.WA.cartridges_get (), 5));
- return;
- }
- if (action = 'metaCartridges')
- {
- http (ODS..obj2json (ODRIVE.WA.metaCartridges_get (), 5));
+ http (ODRIVE.WA.obj2json(returnData, 5));
return;
}
if (action = 'about')
diff --git a/appsrc/ODS-Briefcase/www/css/style.css b/appsrc/ODS-Briefcase/www/css/style.css
index b613cd3..a504b69 100644
--- a/appsrc/ODS-Briefcase/www/css/style.css
+++ b/appsrc/ODS-Briefcase/www/css/style.css
@@ -1,10 +1,10 @@
/*
- * $Id: style.css,v 1.10.2.12 2012/03/08 12:00:18 source Exp $
+ * $Id: style.css,v 1.10.2.10 2011/05/17 22:59:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -28,29 +28,11 @@ body {
font-size: 9pt;
}
-pre {
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
form {
margin: 0;
padding: 0;
}
-abbr {
- border: none;
-}
-
-input[type="text"], input[type="password"], select {
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
-}
-
.pointer {
cursor: pointer;
}
@@ -107,6 +89,43 @@ a:hover {
#RCT_body {
}
+/* Footer */
+#FT {
+ width: 100%;
+ position: relative;
+ bottom: 0px;
+ font-size: 8pt;
+ float: left;
+ clear: both;
+ text-align: right;
+ border-top: 2px solid #fff;
+ margin-right: 10px;
+ background-color: #fff;
+ background-image: url(../image/ods_main_footer.png);
+}
+
+#FT_L {
+ float: left;
+ clear: left;
+ margin-top: 10px;
+ margin-left: 8px;
+ border: 1px solid #788;
+}
+
+#FT_R {
+ float: right;
+ clear: right;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ margin-right: 5px;
+ color: #788;
+}
+
+#FT_R a {
+ text-decoration: none;
+ color: inherit;
+}
+
#MTB2 {
width: 100%;
left: 0px;
@@ -129,8 +148,6 @@ a:hover {
.lc {
background-color: #EFEFEF;
border: 1px solid #7f94a5;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
padding: 5px;
margin-top: 6px;
width: auto;
@@ -388,11 +405,11 @@ table#list th {
/* Fields */
.field-text {
- width: 500px;
+ width: 40em;
}
.field-short {
- width: 250px;
+ width: 20em;
}
.field-max {
diff --git a/appsrc/ODS-Briefcase/www/error.vspx b/appsrc/ODS-Briefcase/www/error.vspx
index b637a1c..417e7e4 100644
--- a/appsrc/ODS-Briefcase/www/error.vspx
+++ b/appsrc/ODS-Briefcase/www/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.6.2.3 2012/03/08 10:46:15 source Exp $
+ - $Id: error.vspx,v 1.6.2.2 2010/09/20 10:15:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/www/export.vspx b/appsrc/ODS-Briefcase/www/export.vspx
index c7fae82..7661975 100644
--- a/appsrc/ODS-Briefcase/www/export.vspx
+++ b/appsrc/ODS-Briefcase/www/export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: export.vspx,v 1.13.2.5 2012/03/08 10:46:15 source Exp $
+ - $Id: export.vspx,v 1.13.2.4 2010/09/20 10:15:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/www/forms.vspx b/appsrc/ODS-Briefcase/www/forms.vspx
index 750bd05..d3f8974 100644
--- a/appsrc/ODS-Briefcase/www/forms.vspx
+++ b/appsrc/ODS-Briefcase/www/forms.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: forms.vspx,v 1.6.2.18 2012/03/08 12:00:18 source Exp $
+ - $Id: forms.vspx,v 1.6.2.16 2011/08/01 14:14:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -57,8 +57,7 @@
for (i := 0; i < length (self.items); i := i + 2)
{
item := ODRIVE.WA.DAV_INIT (self.items[i]);
- if (not ODRIVE.WA.DAV_ERROR (item))
- {
+
http (' <tr>');
http (sprintf ('<td nowrap="nowrap"><img src="%s" alt="%s"> %s</td>', ODRIVE.WA.ui_image (ODRIVE.WA.DAV_GET (item, 'fullPath'), ODRIVE.WA.DAV_GET (item, 'type'), ODRIVE.WA.DAV_GET (item, 'mimeType')), ODRIVE.WA.ui_alt (ODRIVE.WA.DAV_GET (item, 'name'), ODRIVE.WA.DAV_GET (item, 'type')), self.items[i]));
http (sprintf ('<td class="number" nowrap="nowrap">%s</td>', ODRIVE.WA.ui_size (ODRIVE.WA.DAV_GET (item, 'length'), ODRIVE.WA.DAV_GET (item, 'type'))));
@@ -72,7 +71,6 @@
}
http (' </tr>');
}
- }
http (' </table>');
http ('</div>');
http ('<br />');
@@ -269,7 +267,7 @@
-- aci - WebAccess
item := ODRIVE.WA.DAV_INIT(self.items[I]);
- if (not ODRIVE.WA.DAV_ERROR (item) and (ODRIVE.WA.DAV_GET (item, 'type') = 'R') and length (aci_value))
+ if ((ODRIVE.WA.DAV_GET (item, 'type') = 'R') and length (aci_value))
{
ODRIVE.WA.DAV_PROP_SET (self.items[I], 'virt:aci_meta_n3', aci_value);
}
@@ -280,12 +278,10 @@
else if (self.v_form in ('edit', 'view'))
{
item := ODRIVE.WA.DAV_INIT (self.v_path);
- if (not ODRIVE.WA.DAV_ERROR (item))
- {
returnData := ODRIVE.WA.DAV_RES_UPLOAD (self.v_path, get_keyword ('f_content', params, ''), ODRIVE.WA.DAV_GET (item, 'mimeType'), ODRIVE.WA.DAV_GET (item, 'permissions'), ODRIVE.WA.DAV_GET (item, 'ownerID'), ODRIVE.WA.DAV_GET (item, 'groupID'));
if (ODRIVE.WA.DAV_ERROR (returnData))
signal('TEST', ODRIVE.WA.DAV_PERROR (returnData) || '<>');
- }
+
self.v_step := 'end';
}
else if (self.v_form = 'rename')
@@ -631,13 +627,8 @@
<div class="new-form-header">
<?V initcap (self.v_form) ?> resource <?V self.v_path ?>
</div>
- <div style="padding-right: 6px;">
- <?vsp
- declare disabled varchar;
-
- disabled := case when self.v_form = 'view' then 'disabled="disabled"' else '' end;
- http (sprintf ('<textarea id="f_content" name="f_content" style="width: 100%%; height: 360px" %s>%V</textarea>', disabled, cast (ODRIVE.WA.DAV_RES_CONTENT (self.v_path) as varchar)));
- ?>
+ <div style="padding-right: 12px;">
+ <textarea id="f_content" name="f_content" style="width: 100%; height: 360px" disabled="<?V case when self.v_form = 'view' then 'disabled' else 'false' end ?>"><?vsp http (ODRIVE.WA.DAV_RES_CONTENT (self.v_path)); ?></textarea>
<vm:if test="self.mimeType like 'text/html'">
<![CDATA[
<script type="text/javascript" src="/ods/ckeditor/ckeditor.js"></script>
diff --git a/appsrc/ODS-Briefcase/www/home.vspx b/appsrc/ODS-Briefcase/www/home.vspx
index 8495731..403fc33 100644
--- a/appsrc/ODS-Briefcase/www/home.vspx
+++ b/appsrc/ODS-Briefcase/www/home.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: home.vspx,v 1.30.2.33 2012/03/08 12:00:18 source Exp $
+ - $Id: home.vspx,v 1.30.2.31 2011/08/01 14:14:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -141,10 +141,6 @@
{
return 1;
}
- if (cmd = 'shared')
- {
- return 1;
- }
if (is_empty_or_null(self.dir_path))
{
return 0;
@@ -178,7 +174,7 @@
if (not ODRIVE.WA.odrive_write_permission(ODRIVE.WA.odrive_real_path(self.dir_path)))
return 0;
}
- if (not self.commandRights (ODRIVE.WA.det_type (ODRIVE.WA.odrive_real_path (self.dir_path)), ODRIVE.WA.det_class (ODRIVE.WA.odrive_real_path (self.dir_path)), cmd))
+ if (not ODRIVE.WA.det_action_enable (ODRIVE.WA.odrive_real_path (self.dir_path), cmd))
{
return 0;
}
@@ -347,158 +343,12 @@
]]>
</v:method>
- <v:method name="commandRights" arglist="in detType varchar, in detClass varchar, in action varchar">
- <![CDATA[
- declare retValue integer;
-
- retValue := 0;
- if (detClass = '')
- {
- if (action = 'edit')
- {
- retValue := 1;
- }
- else if (action = 'new')
- {
- if ((detType = '') or detType in ('HostFS', 'S3'))
- retValue := 1;
- }
- else if (action = 'create')
- {
- if ((detType = '') or detType in ('HostFS', 'S3'))
- retValue := 1;
- }
- else if (action = 'upload')
- {
- if ((detType = '') or detType in ('HostFS', 'S3'))
- retValue := 1;
- }
- else if (action = 'rename')
- {
- if ((detType = '') or detType in ('HostFS', 'S3'))
- retValue := 1;
- }
- else if (action = 'copy')
- {
- if ((detType = '') or detType in ('HostFS', 'S3'))
- retValue := 1;
- }
- else if (action = 'move')
- {
- if ((detType = '') or detType in ('HostFS', 'S3'))
- retValue := 1;
- }
- if (action = 'delete')
- {
- if ((detType = '') or detType in ('HostFS', 'S3'))
- retValue := 1;
- }
- else if (action = 'tag')
- {
- if ((detType = '') or detType in ('CalDAV', 'CardDAV'))
- retValue := 1;
- }
- else if (action = 'version')
- {
- if (detType = '')
- retValue := 1;
- }
- }
- else
- {
- if (action = 'upload')
- {
- if (detType in ('', 'CalDAV', 'CardDAV'))
- retValue := 1;
- }
- else if (action = 'create')
- {
- if (detType in ('', 'CalDAV', 'CardDAV'))
- retValue := 1;
- }
- else if (action = 'tag')
- {
- if (detType in ('', 'CalDAV', 'CardDAV'))
- retValue := 1;
- }
- }
- -- dbg_obj_print (detType, detClass, action, retValue);
- return retValue;
- ]]>
- </v:method>
-
- <v:method name="fieldRights" arglist="in action varchar">
- <![CDATA[
- declare retValue integer;
- declare detType, detClass varchar;
-
- detType := self.dav_detType;
- detClass := self.dav_detClass;
- retValue := 0;
- if (detClass = '')
- {
- if (action = 'edit')
- {
- retValue := 1;
- }
- else if (action = 'tag')
- {
- retValue := 1;
- }
- else if (action = 'metadata')
- {
- if ((detType = '') and ODRIVE.WA.dav_rdf_has_metadata (self.dav_path))
- retValue := 1;
- }
- else if (action = 'permissions')
- {
- retValue := 1;
- }
- else if (action = 'properties')
- {
- retValue := self.fieldRights ('edit');
- if (retValue and not isnull (DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT (ODRIVE.WA.DAV_GET (self.dav_item, 'id'), 'R', 'DAV:checked-in', 0))))
- retValue := 0;
- }
- else if (action in ('sharing', 'sharing_acl', 'sharing_aci'))
- {
- retValue := 1;
- }
- }
- else
- {
- if (action = 'permissions')
- {
- if ((detClass not in ('CalDAV', 'CardDAV')) and detType in ('', 'HostFS', 'S3'))
- retValue := 1;
- }
- else if (action = 'tag')
- {
- if (detClass in ('CalDAV', 'CardDAV'))
- retValue := 1;
- }
- else if (action = 'sharing')
- {
- if (detClass in ('CalDAV', 'CardDAV') or detType in (''))
- retValue := 1;
- }
- else if (action = 'sharing_aci')
- {
- if (detClass in ('CalDAV', 'CardDAV') or detType in (''))
- retValue := 1;
- }
- }
- -- dbg_obj_print (detType, detClass, action, retValue);
- return retValue;
- ]]>
- </v:method>
-
<v:on-init>
<![CDATA[
declare N, M, retValue, dav_id, dav_owner, dav_group integer;
declare dav_detType, dav_mime, dav_name, dav_fullPath, dav_perms, msg, _p varchar;
declare properties, c_properties any;
- declare dav_acl, dav_filename, dav_file, rdf_content any;
+ declare dav_aci, dav_acl, dav_filename, dav_file, rdf_content any;
declare params, itemList any;
params := self.vc_page.vc_event.ve_params;
@@ -550,20 +400,15 @@
{
msg := 'Can not update resource. ';
}
- self.dav_destination := cast (get_keyword ('dav_destination', params, '0') as integer);
+
self.dav_source := cast (get_keyword ('dav_source', params, '-1') as integer);
- if ((self.command_mode in (5, 6)) and (get_keyword ('dav_destination', params, '') = '1'))
+ if ((self.command_mode = 5) and (get_keyword('dav_destination', params, '') = '1'))
{
-- RDF Triple Store
- declare rdf_data, rdf_type, rdf_graph any;
- if (self.command_mode = 6)
- {
- rdf_type := trim (get_keyword ('dav_mime', params, ''));
- rdf_data := get_keyword (case when rdf_type = 'text/html' then 'dav_content_html' else 'dav_content_plain' end, params, '');
- }
- else
- {
+ declare pos integer;
+ declare is_ttl, is_xml, rdf_data, rdf_xml, rdf_name, rdf_graph any;
+
if (self.dav_source = 0)
{
dav_filename := get_keyword('filename', get_keyword_ucase('attr-dav_file', params));
@@ -573,8 +418,6 @@
}
else
{
- declare pos integer;
-
pos := position ('dav_file', params);
rdf_data := aref_set_0 (params, pos);
}
@@ -584,34 +427,48 @@
dav_filename := get_keyword('dav_url', params, '');
rdf_data := http_get(dav_filename);
}
- rdf_type := http_mime_type (dav_filename);
+ rdf_graph := trim (get_keyword('dav_name_rdf', params));
+ {
+ declare continue handler for SQLSTATE '*' {
+ is_ttl := 0;
+ };
+ is_ttl := 1;
+ DB.DBA.RDF_TTL2HASH (rdf_data, rdf_graph, rdf_graph);
}
- rdf_graph := trim (get_keyword ('dav_name_rdf', params));
- retValue := ODRIVE.WA.DAV_RDF_UPLOAD (rdf_data, rdf_type, rdf_graph);
- if (not retValue)
+ if (not is_ttl)
+ {
+ {
+ declare continue handler for SQLSTATE '*' {
+ is_xml := 0;
+ };
+ is_xml := 1;
+ xtree_doc (rdf_data, 0, rdf_graph);
+ }
+ }
+ if (is_xml = 0 and is_ttl = 0)
{
- self.vc_error_message := 'You have attempted to upload invalid data to the RDF Data Store.';
- self.vc_is_valid := 0;
- return;
+ signal ('TEST', 'You have attempted to upload invalid data. You can only upload RDF, Turtle, N3 serializations of RDF Data to the RDF Data Store.<>');
+ }
+ if (is_ttl)
+ {
+ retValue := DB.DBA.TTLP (rdf_data, '', rdf_graph);
+ }
+ else
+ {
+ retValue := DB.DBA.RDF_LOAD_RDFXML (rdf_data, '', rdf_graph);
}
}
else
{
-- WebDAV
- -- Action test
+
if (self.command_mode = 10)
{
self.dav_id := ODRIVE.WA.DAV_GET(self.dav_item, 'id');
- self.dav_type := ODRIVE.WA.DAV_GET (self.dav_item, 'type');
- self.dav_detClass := coalesce (ODRIVE.WA.det_class (self.dav_path, self.dav_type) , '');
if (ODRIVE.WA.DAV_ERROR(self.dav_id))
signal('TEST', 'Folder/File could not be found!<>');
}
- if ((self.command_mode = 10) and not self.fieldRights ('edit'))
- goto _nextTest_1;
-
- -- file/folde name
dav_name := trim (get_keyword('dav_name', params));
if (is_empty_or_null(dav_name))
signal('TEST', 'Folder/File name can not be empty!<>');
@@ -622,10 +479,6 @@
if ((self.command_mode = 5) and (self.dav_type = 'R') and (dav_name like '%,acl'))
signal('TEST', 'The file names like ''*,acl'' are used for system purposes!<>');
- _nextTest_1:;
- if ((self.command_mode = 10) and not self.fieldRights ('tag'))
- goto _nextTest_2;
-
-- validate tags
self.dav_tags_public := trim (get_keyword ('f_tags_public', params, ''));
if (not ODRIVE.WA.validate_tags (self.dav_tags_public))
@@ -635,12 +488,8 @@
if (not ODRIVE.WA.validate_tags (self.dav_tags_private))
signal('TEST', 'The expression contains no valid tag(s)!<>');
- _nextTest_2:;
- if ((self.command_mode = 10) and not self.fieldRights ('metadata'))
- goto _nextTest_3;
-
-- validate metadata
- if (self.command_mode = 10)
+ if ((self.command_mode = 10) and ODRIVE.WA.dav_rdf_has_metadata (self.dav_path))
{
declare param, uri, property, value any;
declare delim integer;
@@ -659,15 +508,6 @@
}
}
}
-
- _nextTest_3:;
- if (self.command_mode = 10)
- {
- dav_fullPath := ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath');
- if (not self.fieldRights ('edit'))
- goto _nextTest_4;
- }
-
dav_fullPath := rtrim (self.dir_path, '/') || '/' || dav_name;
if (self.dav_type = 'C')
dav_fullPath := dav_fullPath || '/';
@@ -678,11 +518,6 @@
if (not ODRIVE.WA.DAV_ERROR(retValue))
signal('TEST', 'Folder/File with such name already exists!<>');
}
-
- _nextTest_4:;
- if ((self.command_mode = 10) and not self.fieldRights ('edit'))
- goto _nextTest_5;
-
if (self.dav_type = 'C')
{
dav_detType := get_keyword ('dav_det', params);
@@ -694,7 +529,8 @@
if (search_path between dav_fullPath and (dav_fullPath || '\255\255\255\255'))
signal('TEST', sprintf('Search path (%s) can not contains in folder full path (%s)!<>', search_path, dav_fullPath));
}
- else if (dav_detType = 'PropFilter')
+
+ if (dav_detType = 'PropFilter')
{
declare search_path varchar;
@@ -703,15 +539,6 @@
if (ODRIVE.WA.DAV_ERROR(retValue))
signal('TEST', 'Search path does not exists!<>');
}
- else if (dav_detType = 'IMAP')
- {
- declare tmp varchar;
-
- tmp := get_keyword ('dav_IMAP_server', params);
- ODRIVE.WA.test (tmp, vector('name', 'IMAP Server', 'class', 'varchar', 'minLength', 1, 'maxLength', 255));
- tmp := get_keyword ('dav_IMAP_user', params);
- ODRIVE.WA.test (tmp, vector('name', 'IMAP User', 'class', 'varchar', 'minLength', 1, 'maxLength', 255));
- }
}
if (self.command_mode = 5)
{
@@ -739,11 +566,6 @@
dav_file := ODRIVE.WA.get_rdf (dav_filename);
}
}
-
- _nextTest_5:;
- if ((self.command_mode = 10) and not self.fieldRights ('edit'))
- goto _nextTest_6;
-
if (self.dav_type = 'R')
{
dav_mime := trim(get_keyword('dav_mime', params, ''));
@@ -755,28 +577,18 @@
dav_file := get_keyword (case when dav_mime = 'text/html' then 'dav_content_html' else 'dav_content_plain' end, params, '');
}
- _nextTest_6:;
- if ((self.command_mode = 10) and not self.fieldRights ('edit'))
- goto _nextTest_7;
-
dav_owner := ODRIVE.WA.odrive_user_id(trim(get_keyword('dav_owner', params, '')));
if (dav_owner < 0)
dav_owner := null;
- _nextTest_7:;
- if ((self.command_mode = 10) and not self.fieldRights ('edit'))
- goto _nextTest_8;
-
dav_group := ODRIVE.WA.odrive_user_id(trim(get_keyword('dav_group', params, '')));
if (dav_group < 0)
dav_group := null;
- if (not ODRIVE.WA.check_admin (self.account_id) and not ODRIVE.WA.odrive_group_own (dav_group) and (coalesce (ODRIVE.WA.DAV_GET (self.dav_item, 'groupID'), -1) <> coalesce (dav_group, -1)))
+ if (not ODRIVE.WA.check_admin (self.account_id))
+ if ((ODRIVE.WA.DAV_GET(self.dav_item, 'groupID') <> dav_group) or isnull(dav_group))
+ if (not ODRIVE.WA.odrive_group_own(trim(get_keyword('dav_group', params, ''))))
signal('TEST', 'Only own groups or ''dba'' group are allowed!<>');
- _nextTest_8:;
- if ((self.command_mode = 10) and not self.fieldRights ('edit'))
- goto _nextTest_9;
-
dav_perms := '';
for (N := 0; N < 9; N := N + 1)
{
@@ -791,69 +603,40 @@
}
dav_perms := concat (dav_perms, get_keyword ('dav_index', params, 'N'), get_keyword ('dav_metagrab', params, 'N'));
- _nextTest_9:;
-- changing properties
c_properties := ODRIVE.WA.prop_params (params, self.account_id);
- -- Action execute
-- Update
if (self.command_mode = 10)
{
- if (not self.fieldRights ('edit'))
- goto _nextExec_1;
-
if (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath') <> dav_fullPath)
- {
ODRIVE.WA.DAV_SET (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'), 'name', dav_name);
- self.dav_path := dav_fullPath;
- }
-
- _nextExec_1:;
- if (not self.fieldRights ('edit'))
- goto _nextExec_2;
-
if ((self.dav_type = 'R') and (ODRIVE.WA.DAV_GET(self.dav_item, 'mimeType') <> dav_mime))
ODRIVE.WA.DAV_SET(self.dav_path, 'mimeType', dav_mime);
- _nextExec_2:;
- if (not self.fieldRights ('permissions'))
- goto _nextExec_3;
-
if (ODRIVE.WA.DAV_GET(self.dav_item, 'permissions') <> dav_perms)
ODRIVE.WA.DAV_SET(self.dav_path, 'permissions', dav_perms);
- _nextExec_3:;
- if (not self.fieldRights ('edit'))
- goto _nextExec_4;
-
if ((ODRIVE.WA.DAV_GET(self.dav_item, 'ownerID') <> dav_owner) or isnull(dav_owner))
ODRIVE.WA.DAV_SET(self.dav_path, 'ownerID', dav_owner);
- _nextExec_4:;
- if (not self.fieldRights ('edit'))
- goto _nextExec_5;
-
if ((ODRIVE.WA.DAV_GET(self.dav_item, 'groupID') <> dav_group) or isnull(dav_group))
ODRIVE.WA.DAV_SET(self.dav_path, 'groupID', dav_group);
- _nextExec_5:;
- if (not self.fieldRights ('sharing_acl'))
- goto _nextExec_6;
-
-- ACL
dav_acl := ODRIVE.WA.DAV_GET (self.dav_item, 'acl');
self.dav_acl := ODRIVE.WA.acl_params (params, dav_acl);
- if ((dav_acl <> self.dav_acl) and not ODRIVE.WA.DAV_ERROR (ODRIVE.WA.DAV_SET (self.dav_path, 'acl', self.dav_acl)))
+ if (dav_acl <> self.dav_acl)
+ {
+ if (not ODRIVE.WA.DAV_ERROR (ODRIVE.WA.DAV_SET (self.dav_path, 'acl', self.dav_acl)))
+ {
ODRIVE.WA.acl_send_mail (self.domain_id, self.account_id, self.dav_path, dav_acl, self.dav_acl);
-
- _nextExec_6:;
- if (not self.fieldRights ('sharing_aci'))
- goto _nextExec_7;
+ }
+ }
-- ACI (Web Access)
- ODRIVE.WA.aci_save (dav_fullPath, ODRIVE.WA.aci_params (params));
-
- _nextExec_7:;
+ dav_aci := ODRIVE.WA.aci_n3 (ODRIVE.WA.aci_params (params));
+ ODRIVE.WA.DAV_PROP_SET (dav_fullPath, 'virt:aci_meta_n3', dav_aci);
}
-- Folder
@@ -869,24 +652,36 @@
else
{
if (get_keyword ('dav_recursive', params, '') <> '')
+ {
ODRIVE.WA.DAV_SET_RECURSIVE (self.dav_path, dav_perms, dav_owner, dav_group);
-
+ }
if (dav_detType <> 'Versioning')
{
-- clear old properties
itemList := DB.DBA.DAV_PROP_LIST_INT (DB.DBA.DAV_SEARCH_ID (dav_fullPath, 'C'), 'C', 'virt:%', 0);
foreach (any item in itemList) do
{
- if (item[0] not like ('virt:aci_meta%'))
+ if (item[0] <> 'virt:aci_meta_n3')
DB.DBA.DAV_PROP_REMOVE_INT (dav_fullPath, item[0], null, null, 0, 0, 0);
}
- ODRIVE.WA.exec ('delete from DB.DBA.SYNC_COLS_TYPES where CT_COL_ID = ?', vector (DB.DBA.DAV_SEARCH_ID (self.dav_path, 'C')));
}
}
- ODRIVE.WA.DAV_SET (dav_fullPath, 'permissions-inheritance', get_keyword('dav_permissions_inheritance', params, 'N'));
+ if (__proc_exists ('DB.DBA.SYNC_MAKE_DAV_DIR'))
+ {
+ declare sync_version, sync_type any;
+
+ sync_version := get_keyword ('s_v', params, 'N');
+ sync_type := get_keyword ('s_t', params, 'N');
+
+ if (self.command_mode = 10)
+ {
+ ODRIVE.WA.exec ('delete from DB.DBA.SYNC_COLS_TYPES where CT_PATH = ?', vector (ODRIVE.WA.DAV_GET(self.dav_item, 'fullPath')));
+ }
+
+ DB.DBA.SYNC_MAKE_DAV_DIR (sync_type, DB.DBA.DAV_SEARCH_ID (dav_fullPath, 'C'), dav_name, dav_fullPath, sync_version);
+ }
- if (not self.fieldRights ('edit'))
- goto _nextExec_8;
+ ODRIVE.WA.DAV_SET (dav_fullPath, 'permissions-inheritance', get_keyword('dav_permissions_inheritance', params, 'N'));
-- set new properties
if (dav_detType in ('ResFilter', 'CatFilter'))
@@ -909,66 +704,25 @@
retValue := ODRIVE.WA.CatFilter_CONFIGURE(self.dav_path, self.search_dc);
}
if (ODRIVE.WA.DAV_ERROR(retValue))
+ {
signal('TEST', concat(ODRIVE.WA.DAV_PERROR(retValue), '<>'));
}
+ }
else if (dav_detType = 'rdfSink')
{
- declare tmp any;
- declare cartridges, metaCartridges varchar;
-
- cartridges := '';
- metaCartridges := '';
- tmp := get_keyword ('dav_rdfSink_rdfSponger', params, 'off');
- if (tmp = 'on')
- {
- for (N := 0; N < length (params); N := N + 2)
- {
- if (params[N] = 'ca_item')
- cartridges := cartridges || ',' || trim (params[N+1]);
- else if (params[N] = 'mca_item')
- metaCartridges := metaCartridges || ',' || trim (params[N+1]);
- }
- cartridges := ltrim (cartridges, ',');
- metaCartridges := ltrim (metaCartridges, ',');
- }
ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:rdf_graph', get_keyword('dav_rdfSink_rdfGraph', params));
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:rdf_sponger', tmp);
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:rdf_cartridges', cartridges);
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:rdf_metaCartridges', metaCartridges);
- }
- else if (dav_detType = 'SyncML')
- {
- if (__proc_exists ('DB.DBA.SYNC_MAKE_DAV_DIR'))
- {
- declare sync_version, sync_type any;
-
- sync_version := get_keyword ('syncml_version', params, 'N');
- sync_type := get_keyword ('syncml_type', params, 'N');
- DB.DBA.SYNC_MAKE_DAV_DIR (sync_type, DB.DBA.DAV_SEARCH_ID (dav_fullPath, 'C'), dav_name, dav_fullPath, sync_version);
- }
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:rdf_sponger', get_keyword('dav_rdfSink_rdfSponger', params));
}
else if (dav_detType <> 'Versioning')
{
retValue := ODRIVE.WA.DAV_SET(self.dav_path, 'detType', either(equ(dav_detType, ''), null, dav_detType));
if (dav_detType = 'oMail')
{
- declare tmp any;
-
- tmp := trim (get_keyword ('dav_oMail_FolderName', params, ''));
- if (tmp = '')
- tmp := 'NULL';
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:oMail-DomainId', '1');
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:oMail-UserName', ODRIVE.WA.account_name (self.account_id));
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:oMail-FolderName', tmp);
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:oMail-DomainId', get_keyword('dav_oMail_DomainId', params));
+ ODRIVE.WA.DAV_PROP_SET(self.dav_path, 'virt:oMail-UserName', ODRIVE.WA.account());
+ ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:oMail-FolderName', get_keyword('dav_oMail_FolderName', params));
ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:oMail-NameFormat', get_keyword('dav_oMail_NameFormat', params));
}
- else if (dav_detType = 'IMAP')
- {
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:IMAP-connection', get_keyword ('dav_IMAP_connection', params));
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:IMAP-server', get_keyword ('dav_IMAP_server', params));
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:IMAP-user', get_keyword ('dav_IMAP_user', params));
- ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:IMAP-password', get_keyword ('dav_IMAP_password', params));
- }
else if (dav_detType = 'PropFilter')
{
ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:PropFilter-SearchPath', ODRIVE.WA.odrive_real_path(get_keyword('dav_PropFilter_SearchPath', params, '/DAV/')));
@@ -982,7 +736,6 @@
ODRIVE.WA.DAV_PROP_SET (self.dav_path, 'virt:S3-SecretKey', get_keyword ('dav_S3_SecretKey', params));
}
}
- _nextExec_8:;
}
-- File
@@ -1008,7 +761,7 @@
}
else
{
- if (self.fieldRights ('metadata'))
+ if (ODRIVE.WA.dav_rdf_has_metadata(self.dav_path))
{
declare param, property any;
declare delim integer;
@@ -1027,16 +780,12 @@
}
}
-- Tags
- if (not self.fieldRights ('tag'))
- goto _nextExec_9;
-
ODRIVE.WA.DAV_SET (dav_fullPath, 'privatetags', self.dav_tags_private);
ODRIVE.WA.DAV_SET (dav_fullPath, 'publictags', self.dav_tags_public);
- _nextExec_9:;
}
-- properties
- if (self.fieldRights ('properties'))
+ if (get_keyword ('dav_propEnable', params, '0') <> '0')
{
properties := ODRIVE.WA.DAV_PROP_LIST (dav_fullPath, '%', vector ('virt:%', 'http://www.openlinksw.com/schemas/%', 'http://local.virt/DAV-RDF%'));
for (N := 0; N < length (properties); N := N + 1)
@@ -1097,15 +846,14 @@
<v:variable name="dav_vector" persist="0" type="any" default="null" />
<v:variable name="tabNo" param-name="tabNo" type="varchar" default="'1'" />
<v:variable name="dav_id" type="integer" default="-1" />
- <v:variable name="dav_destination" type="integer" default="0" />
<v:variable name="dav_source" type="integer" default="0" />
<v:variable name="dav_path" type="varchar" default="''" />
<v:variable name="dav_category" type="varchar" default="''" />
<v:variable name="dav_type" type="varchar" default="''" />
<v:variable name="dav_detType" type="varchar" default="''" />
- <v:variable name="dav_detClass" type="varchar" default="''" />
<v:variable name="dav_item" type="any" default="null" />
<v:variable name="dav_enable" type="integer" default="1" />
+ <v:variable name="dav_propEnable" type="integer" default="1" />
<v:variable name="dav_acl" persist="0" type="varbinary" />
<v:variable name="dav_tags_private" persist="0" type="varchar" />
<v:variable name="dav_tags_public" persist="0" type="varchar" />
@@ -1182,7 +930,7 @@
<?vsp http (sprintf ('<input type="hidden" name="tabNo" id="tabNo" value="%s" />', self.tabNo)); ?>
<div class="toolbar">
<?vsp
- self.toolbarShow ('refresh', 'Refresh', 'onclick="javascript: vspxPost(\'action\', \'_cmd\', \'refresh\');"', 'ref_32.png', '', 0);
+ self.toolbarShow ('refresh', 'Refresh', 'onclick="javascript: document.forms[0].submit();"', 'ref_32.png', '', 0);
self.toolbarShow ('up', 'Up', 'onclick="javascript: vspxPost(\'action\', \'_cmd\', \'up\');"', 'up_32.png', 'grey_up_32.png', 0);
http ('<img src="image/c.gif" height="32" width="2" border="0" class="toolbar" />');
@@ -1302,7 +1050,6 @@
else if (_action = 'upload')
{
self.command_push (10, 5);
- self.dav_destination := 0;
self.dav_source := 0;
}
else if (_action = 'create')
@@ -1318,9 +1065,6 @@
else if (_action = 'select')
{
_path := get_keyword ('_path', params, '');
- _item := ODRIVE.WA.dav_init (_path);
- if (ODRIVE.WA.isVector (_item) and (_path <> ''))
- {
if (self.dir_path = '')
{
if (trim (_path, '/') = ODRIVE.WA.odrive_name_home ())
@@ -1330,6 +1074,8 @@
goto _shared;
}
+ if (_path <> '')
+ {
if (ODRIVE.WA.odrive_permission (_path) = '')
{
self.vc_error_message := 'You have not rights to read this folder/file!';
@@ -1337,21 +1083,25 @@
self.vc_data_bind (e);
return;
}
+ _item := ODRIVE.WA.dav_init (_path);
if (ODRIVE.WA.dav_get (_item, 'type') = 'R')
{
http_request_status ('HTTP/1.1 302 Found');
http_header (sprintf ('Location: %s&mode=download&file=%U\r\n', ODRIVE.WA.page_url (self.domain_id, 'view.vsp', self.sid , self.realm), _path));
- return;
}
-
+ else
+ {
if (self.dir_path <> '')
+ {
self.dir_path := rtrim (self.dir_path, '/') || '/';
+ }
+ self.dir_path := self.dir_path || ODRIVE.WA.dav_get (_item, 'name');
- self.dir_path := self.dir_path || ODRIVE.WA.dav_get (_item, 'name');
- }
self.ds_items.vc_reset();
self.vc_data_bind (e);
}
+ }
+ }
else if (_action = 'tag_search')
{
declare _mode, tag, tags, tagType, tagsID any;
@@ -1600,14 +1350,20 @@
<v:template name="tform_4" type="simple" enabled="-- equ(self.command, 10)">
<v:before-data-bind>
<![CDATA[
- declare params any;
-
- params := self.vc_page.vc_event.ve_params;
self.search_dc := null;
self.dav_path := ODRIVE.WA.odrive_real_resource (self.source);
self.dav_enable := 1;
+ self.dav_propEnable := self.dav_enable;
if (self.command_mode = 10)
{
+ if (equ(self.dav_type, 'R') and (self.dav_path like '%,acl'))
+ {
+ self.dav_enable := 0;
+ } else {
+ self.dav_enable := ODRIVE.WA.odrive_write_permission (self.dav_path);
+ }
+ if (self.dav_enable)
+ ODRIVE.WA.det_action_enable (self.dav_path, 'edit');
self.dav_item := ODRIVE.WA.DAV_INIT(self.dav_path);
if (ODRIVE.WA.DAV_ERROR(self.dav_item))
{
@@ -1615,8 +1371,11 @@
self.vc_data_bind (e);
return;
}
- self.dav_type := ODRIVE.WA.DAV_GET (self.dav_item, 'type');
- self.dav_detClass := coalesce (ODRIVE.WA.det_class (self.dav_path, self.dav_type) , '');
+ self.dav_propEnable := self.dav_enable;
+ if (self.dav_propEnable and
+ not isnull (DB.DBA.DAV_HIDE_ERROR(DB.DBA.DAV_PROP_GET_INT (ODRIVE.WA.DAV_GET (self.dav_item, 'id'), 'R', 'DAV:checked-in', 0))))
+ self.dav_propEnable := 0;
+ self.dav_category := coalesce (ODRIVE.WA.det_category (self.dav_path, ODRIVE.WA.DAV_GET (self.dav_item, 'type')) , '');
}
else if (self.command_mode in (5, 6))
{
@@ -1625,38 +1384,25 @@
V := ODRIVE.WA.DAV_INIT_RESOURCE (self.dir_path);
if (self.command_mode = 6)
aset (V, 9, 'text/html');
-
self.dav_item := V;
- self.dav_type := 'R';
- self.dav_detClass := coalesce (ODRIVE.WA.det_class (ODRIVE.WA.odrive_real_path_int (self.dir_path, 1, 'C'), 'C') , '');
+ self.dav_category := coalesce (ODRIVE.WA.det_category (ODRIVE.WA.odrive_real_path_int (self.dir_path, 1, 'C'), 'C') , '');
}
else
{
self.dav_item := ODRIVE.WA.DAV_INIT_COLLECTION (self.dir_path);
if (self.command_mode = 1)
- params := vector_concat (params, vector ('dav_det', 'ResFilter', 'attr_dav_det', ''));
-
- self.dav_type := 'C';
- self.dav_detClass := coalesce (ODRIVE.WA.det_class (ODRIVE.WA.odrive_real_path_int (self.dir_path, 1, 'C'), 'C') , '');
+ self.vc_page.vc_event.ve_params := vector_concat(self.vc_page.vc_event.ve_params, vector ('dav_det', 'ResFilter', 'attr_dav_det', ''));
+ self.dav_category := coalesce (ODRIVE.WA.det_category (ODRIVE.WA.odrive_real_path_int (self.dir_path, 1, 'C'), 'C') , '');
}
- self.dav_detType := cast (coalesce (get_keyword ('dav_det', params, ODRIVE.WA.DAV_GET (self.dav_item, 'detType')), '') as varchar);
- if (self.command_mode = 10)
+ self.dav_type := ODRIVE.WA.DAV_GET (self.dav_item, 'type');
+ self.dav_detType := coalesce (get_keyword ('dav_det', self.vc_page.vc_event.ve_params, ODRIVE.WA.DAV_GET (self.dav_item, 'detType')), '');
+ if (isnull(get_keyword ('dav_group', self.vc_page.vc_event.ve_params)))
{
- if (equ (self.dav_type, 'R') and (self.dav_path like '%,acl'))
- {
- self.dav_enable := 0;
- } else {
- self.dav_enable := ODRIVE.WA.odrive_write_permission (self.dav_path);
- }
- if (self.dav_enable)
- self.dav_enable := self.commandRights (self.dav_detType, self.dav_detClass, 'edit');
- }
- if (isnull (get_keyword ('dav_group', params)))
self.dav_acl := ODRIVE.WA.DAV_GET (self.dav_item, 'acl');
-
+ }
if (self.command_mode = 10)
{
- if (isnull (get_keyword ('dav_group', params)))
+ if (isnull(get_keyword ('dav_group', self.vc_page.vc_event.ve_params)))
{
self.dav_tags_private := '';
self.dav_tags_public := '';
@@ -1671,7 +1417,7 @@
self.search_dc := ODRIVE.WA.DAV_PROP_GET (self.dav_path, 'virt:Filter-Params');
}
}
- if (not isnull (get_keyword ('dav_group', params)))
+ if (not isnull(get_keyword ('dav_group', self.vc_page.vc_event.ve_params)))
self.dc_prepare();
self.rdf_iri := SIOC..briefcase_resource_iri (self.dav_path);
@@ -1694,78 +1440,87 @@
</div>
<div id="c1">
<div class="tabs">
- <vm:tabCaption tab="1" tabs="12" caption="Main" />
- <v:template name="tform_5" type="simple" enabled="-- case when (equ (self.command_mode, 10) and self.fieldRights ('sharing') and not (equ (self.dav_type, 'R') and (ODRIVE.WA.DAV_GET (self.dav_item, 'name') like '%,acl'))) then 1 else 0 end">
- <vm:tabCaption tab="2" tabs="12" caption="Sharing" />
+ <vm:tabCaption tab="1" tabs="10" caption="Main" />
+ <v:template name="tform_5" type="simple" enabled="-- case when (equ (self.command_mode, 10) and ODRIVE.WA.det_action_enable (self.dav_path, 'share') and not (equ(self.dav_type, 'R') and (ODRIVE.WA.DAV_GET (self.dav_item, 'name') like '%,acl'))) then 1 else 0 end">
+ <vm:tabCaption tab="2" tabs="10" caption="Sharing" />
</v:template>
- <v:template name="tform_6" type="simple" enabled="-- case when (equ (self.command_mode, 10) and self.fieldRights ('metadata')) then 1 else 0 end">
- <vm:tabCaption tab="3" tabs="12" caption="Metadata" />
+ <v:template name="tform_6" type="simple" enabled="-- case when (equ (self.command_mode, 10) and ODRIVE.WA.dav_rdf_has_metadata (self.dav_path)) then 1 else 0 end">
+ <vm:tabCaption tab="3" tabs="10" caption="Metadata" />
</v:template>
- <v:template name="tform_7" type="simple" enabled="-- case when (equ (self.command_mode, 10) and equ (self.dav_type, 'R') and self.fieldRights ('version') and not (equ (self.dav_type, 'R') and (ODRIVE.WA.DAV_GET (self.dav_item, 'name') like '%,acl'))) then 1 else 0 end">
- <vm:tabCaption tab="9" tabs="12" caption="Versions" />
+ <v:template name="tform_7" type="simple" enabled="-- case when (equ (self.command_mode, 10) and equ(self.dav_type, 'R') and ODRIVE.WA.det_action_enable (self.dav_path, 'version') and not (equ(self.dav_type, 'R') and (ODRIVE.WA.DAV_GET (self.dav_item, 'name') like '%,acl'))) then 1 else 0 end">
+ <vm:tabCaption tab="9" tabs="10" caption="Versions" />
</v:template>
<v:template name="tform_8" type="simple" enabled="-- equ(self.dav_type, 'C')">
- <vm:tabCaption tab="4" tabs="12" caption="WebMail" />
- <vm:tabCaption tab="5" tabs="12" caption="Filter" />
- <vm:tabCaption tab="6" tabs="12" caption="S3 Properties" />
- <vm:tabCaption tab="7" tabs="12" caption="Criteria" />
- <vm:tabCaption tab="8" tabs="12" caption="Linked Data Import" />
- <v:template name="tform_17" type="simple" enabled="-- case when (isstring (DB.DBA.vad_check_version ('SyncML'))) then 1 else 0 end">
- <vm:tabCaption tab="10" tabs="12" caption="SyncML" />
- </v:template>
- <vm:tabCaption tab="11" tabs="12" caption="IMAP Account" />
+ <vm:tabCaption tab="4" tabs="10" caption="WebMail" />
+ <vm:tabCaption tab="5" tabs="10" caption="Filter" />
+ <vm:tabCaption tab="6" tabs="10" caption="S3 Properties" />
+ <vm:tabCaption tab="7" tabs="10" caption="Criteria" />
+ <vm:tabCaption tab="8" tabs="10" caption="RDF Upload" />
</v:template>
</div>
<div class="contents">
<div id="1" class="tabContent">
<table class="form-body" cellspacing="0">
- <v:template name="tform_9" type="simple" enabled="-- case when (self.command_mode in (5, 6)) then 1 else 0 end">
+ <v:template name="tform_9" type="simple" enabled="-- equ(self.command_mode, 5)">
<tr>
- <th width="30%" valign="top">
+ <th width="30%">
<vm:label for="dav_file" value="--'Destination'" />
</th>
<td style="padding-left: 4px">
- <label><?vsp http (sprintf ('<input type="radio" name="dav_destination" id="dav_destination_0" value="0" %s onchange="javascript: toggleDavRows();" title="WebDAV" />', case when self.dav_destination = 0 then 'checked="checked"' else '' end)); ?> <b>WebDAV</b></label><br />
- <label><?vsp http (sprintf ('<input type="radio" name="dav_destination" id="dav_destination_1" value="1" %s onchange="javascript: toggleDavRows();" title="WebDAV" />', case when self.dav_destination = 1 then 'checked="checked"' else '' end)); ?> <b>Quad Store</b></label>
- <![CDATA[
- <script type="text/javascript">
- OAT.MSG.attach(OAT, "PAGE_LOADED", function(){toggleDavRows();});
- </script>
- ]]>
+ <input type="radio" name="dav_destination" id="dav_destination_0" value="0" checked="checked" onchange="javascript: toggleDavRows();" title="WebDAV" /><b><vm:label for="dav_destination_0" value="--'WebDAV'" /></b>
+ <input type="radio" name="dav_destination" id="dav_destination_1" value="1" onchange="javascript: toggleDavRows();" title="RDF Store" /><b><vm:label for="dav_destination_1" value="--'RDF Store'" /></b>
</td>
</tr>
- </v:template>
- <v:template name="tform_9_1" type="simple" enabled="-- equ (self.command_mode, 5)">
<tr>
<th valign="top">
- <v:label for="dav_source" value="--'Source'" />
+ <v:label for="dav_file" value="--'Source'" />
</th>
<td>
- <label id="dav_source_0"><?vsp http (sprintf ('<input type="radio" name="dav_source" value="0" %s onchange="javascript: toggleDavSource();" title="File" />', case when self.dav_source = 0 then 'checked="checked"' else '' end)); ?><b>File</b></label><br />
- <label id="dav_source_1"><?vsp http (sprintf ('<input type="radio" name="dav_source" value="1" %s onchange="javascript: toggleDavSource();" title="URL" />', case when self.dav_source = 1 then 'checked="checked"' else '' end)); ?><b>URL</b></label><br />
- <label id="dav_source_2"><?vsp http (sprintf ('<input type="radio" name="dav_source" value="2" %s onchange="javascript: toggleDavSource();" title="Quad Store Named Graph IRI" />', case when self.dav_source = 2 then 'checked="checked"' else '' end)); ?><b>Quad Store Named Graph IRI</b></label>
+ <table cellspacing="0" cellpadding="0">
+ <tr>
+ <td>
+ <?vsp http (sprintf ('<input type="radio" name="dav_source" id="dav_source_0" value="0" %s title="File" />', case when self.dav_source = 0 then 'checked="checked"' else '' end)); ?>
+ </td>
+ <td>
+ <b><vm:label for="dav_source_0" value="--'File'" /></b>
+ </td>
+ <td>
+ <input type="file" name="dav_file" onchange="javascript: F1.dav_source[0].checked=true; getFileName(this);" onblur="javascript: getFileName(this);" onFocus="javascript: F1.dav_source[0].checked=true;" size="40" />
</td>
</tr>
<tr>
- <th valign="top">
- <label id="dav_file_label">File</label>
- </th>
<td>
- <input type="file" name="dav_file" id="dav_file" onchange="javascript: F1.dav_source[0].checked=true; getFileName(this);" onblur="javascript: getFileName(this);" onfocus="javascript: F1.dav_source[0].checked=true;" size="60" />
- <input type="text" name="dav_url" id="dav_url" value="<?V get_keyword ('dav_url', self.vc_page.vc_event.ve_params, get_keyword ('URI', self.vc_page.vc_event.ve_params, '')) ?>" onblur="javascript: getFileName(this);" onfocus="javascript: F1.dav_source[1].checked=true;" size="60" style="display: none;"/>
- <input type="text" name="dav_rdf" id="dav_rdf" value="<?V get_keyword ('dav_rdf', self.vc_page.vc_event.ve_params, '') ?>" onblur="javascript: getFileName(this);" onfocus="javascript: F1.dav_source[2].checked=true;" size="60" style="display: none;"/>
+ <?vsp http (sprintf ('<input type="radio" name="dav_source" id="dav_source_1" value="1" %s title="URL" />', case when self.dav_source = 1 then 'checked="checked"' else '' end)); ?>
+ </td>
+ <td>
+ <b><vm:label for="dav_source_1" value="--'URL'" /></b>
+ </td>
+ <td>
+ <input type="text" name="dav_url" value="<?V get_keyword ('dav_url', self.vc_page.vc_event.ve_params, get_keyword ('URI', self.vc_page.vc_event.ve_params, '')) ?>" onblur="javascript: getFileName(this);" onFocus="javascript: F1.dav_source[1].checked=true;" size="40" />
+ </td>
+ </tr>
+ <tr id="rdf_store">
+ <td>
+ <?vsp http (sprintf ('<input type="radio" name="dav_source" id="dav_source_2" value="2" %s title="RDF Store" />', case when self.dav_source = 2 then 'checked="checked"' else '' end)); ?>
+ </td>
+ <td>
+ <b><vm:label for="dav_source_2" value="--'RDF Store'" /></b>
+ </td>
+ <td>
+ <input type="text" name="dav_rdf" value="<?V get_keyword ('dav_rdf', self.vc_page.vc_event.ve_params, '') ?>" onblur="javascript: getFileName(this);" onFocus="javascript: F1.dav_source[2].checked=true;" size="40" />
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</v:template>
- <tr id="davRow_name">
+ <tr>
<th width="30%">
<span id="label_dav"><v:label for="dav_name" value="--either(equ(self.dav_type, 'R'), 'File name (*)', 'Folder name (*)')" /></span>
- <span id="label_dav_rdf" style="display: none;"><v:label for="label_dav_rdf" value="--'RDF graph name'" /></span>
+ <span id="label_dav_rdf" style="display: none;"><v:label for="dav_name" value="--'RDF graph name'" /></span>
</th>
<td>
- <v:text name="rdfGraph_prefix" xhtml_id="rdfGraph_prefix" type="hidden" value="--ODRIVE.WA.host_url () || WS.WS.FIXPATH (ODRIVE.WA.odrive_real_path (self.dir_path))" />
- <v:text name="dav_name" xhtml_id="dav_name" value="--get_keyword ('dav_name', self.vc_page.vc_event.ve_params, get_keyword ('TITLE', self.vc_page.vc_event.ve_params, ODRIVE.WA.DAV_GET (self.dav_item, 'name')))" format="%s" fmt-function="ODRIVE.WA.utf2wide" xhtml_disabled="disabled" xhtml_class="field-short" xhtml_onkeyup="javascript: ODRIVE.updateRdfGraph();" />
- <v:text name="dav_name_save" xhtml_id="dav_name_save" type="hidden" value="--get_keyword ('dav_name', self.vc_page.vc_event.ve_params, get_keyword ('TITLE', self.vc_page.vc_event.ve_params, ODRIVE.WA.DAV_GET (self.dav_item, 'name')))" />
+ <v:text name="dav_name" xhtml_id="dav_name" value="--get_keyword ('dav_name', self.vc_page.vc_event.ve_params, get_keyword ('TITLE', self.vc_page.vc_event.ve_params, ODRIVE.WA.DAV_GET (self.dav_item, 'name')))" format="%s" fmt-function="ODRIVE.WA.utf2wide" xhtml_disabled="disabled" xhtml_class="field-short" />
<v:text name="dav_name_rdf" xhtml_id="dav_name_rdf" value="--get_keyword ('dav_name', self.vc_page.vc_event.ve_params, ODRIVE.WA.host_url() || WS.WS.FIXPATH(ODRIVE.WA.odrive_real_path(self.dir_path)))" format="%s" fmt-function="ODRIVE.WA.utf2wide" xhtml_disabled="disabled" xhtml_class="field-text" xhtml_style="display: none;" />
</td>
</tr>
@@ -1803,7 +1558,7 @@
</td>
</tr>
</v:template>
- <v:template name="tform_12" type="simple" enabled="-- case when (((self.dav_type = 'C') and (self.dav_detType = '') and (self.dav_detClass = '')) or (self.command_mode <> 10)) then 1 else 0 end">
+ <v:template name="tform_12" type="simple" enabled="-- case when (((self.dav_type = 'C') and (self.dav_detType <> 'Versioning')) or (self.command_mode <> 10)) then 1 else 0 end">
<vm:autoVersion />
</v:template>
<v:template name="tform_13" type="simple" enabled="-- equ(self.dav_type, 'C')">
@@ -1818,58 +1573,23 @@
{
http (self.option_prepare('ResFilter', 'Smart Folder', 'ResFilter'));
}
- else
+ else if ((self.command_mode = 10) and (self.dav_detType = 'Versioning'))
{
- declare N, M, V any;
-
- -- dbg_obj_print ('', self.dav_detType);
- V := vector (
- 0, '', 'Normal',
- 1, 'ResFilter', 'Smart Folder',
- 1, 'CatFilter', 'Category Folder',
- 1, 'PropFilter', 'Property Filter Folder',
- 1, 'HostFs', 'Host FS Folders',
- 0, 'rdfSink', 'Linked Data Import',
- 1, 'RDFData', 'RDF Data',
- 1, 'DynaRes', 'Dynamic Resources',
- 2, 'SyncML', 'SyncML Folder',
- 1, 'Versioning', 'Version Control Folder',
- 1, 'S3', 'Amazon S3',
- 1, 'CardDAV', 'CardDAV Folder',
- 1, 'Blog', 'Blog Folder',
- 1, 'Bookmark', 'Bookmark Folder',
- 1, 'calendar', 'Calendar Folder',
- 1, 'CalDAV', 'CalDAV Folder',
- 1, 'News3', 'Feed Subscriptions',
- 1, 'oMail', 'WebMail Folders',
- 1, 'IMAP', 'IMAP Mail Account');
-
- M := 0;
- for (N := 0; N < length (V); N := N + 3)
- {
- if ((V[N] = 1) and (__proc_exists (sprintf ('DB.DBA.%s_DAV_AUTHENTICATE', V[N+1])) is null))
- goto _0;
-
- if ((V[N] = 2) and not isstring (DB.DBA.vad_check_version ('SyncML')))
- goto _0;
-
- if (self.command_mode = 10)
- {
- if (self.dav_detType = V[N+1])
- {
- M := 1;
- http (self.option_prepare(V[N+1], V[N+2], self.dav_detType));
- }
+ http (self.option_prepare('Versioning', 'Version Control Folder', self.dav_detType));
}
else
{
- M := 1;
- http (self.option_prepare(V[N+1], V[N+2], self.dav_detType));
- }
- _0:;
- }
- if (not M)
- http (self.option_prepare(V[1], V[2], self.dav_detType));
+ http (self.option_prepare('', 'Normal', self.dav_detType));
+ http (self.option_prepare('ResFilter', 'Smart Folder', self.dav_detType));
+ http (self.option_prepare('CatFilter', 'Category Folder', self.dav_detType));
+ http (self.option_prepare('PropFilter', 'Property Filter Folder', self.dav_detType));
+ http (self.option_prepare('HostFs', 'Host FS Folders', self.dav_detType));
+ http (self.option_prepare('oMail', 'WebMail Folders', self.dav_detType));
+ http (self.option_prepare('News3', 'OFM Subscriptions', self.dav_detType));
+ http (self.option_prepare('rdfSink', 'RDF Upload Folder', self.dav_detType));
+ http (self.option_prepare('RDFData', 'RDF Data', self.dav_detType));
+ http (self.option_prepare('S3', 'Amazon S3', self.dav_detType));
+ http (self.option_prepare('DynaRes', 'Dynamic Resources', self.dav_detType));
}
?>
</select>
@@ -1906,11 +1626,11 @@
</td>
</tr>
<tr id="davRow_perms">
- <th valign="top">
+ <th>
<v:label for="dav_group" value="--'Permissions'" />
</th>
<td>
- <table class="permissions-list" cellspacing="0" style="width: 250px;">
+ <table class="permissions-list" cellspacing="0">
<vm:permissions-header1 />
<vm:permissions-header2 />
<tr>
@@ -1936,7 +1656,7 @@
</table>
</td>
</tr>
- <v:template name="tform_120" type="simple" enabled="-- case when not length (self.dav_detClass) then 1 else 0 end">
+ <v:template name="tform_120" type="simple" enabled="-- case when (self.dav_category = '') then 1 else 0 end">
<tr id="davRow_text">
<th>
<vm:label for="dav_index" value="--'Full Text Search'" />
@@ -1976,7 +1696,45 @@
</td>
</tr>
</v:template>
- <v:template name="tform_16" type="simple" enabled="--case when ((self.dav_type = 'C') and (self.command_mode = 10) and not length (self.dav_detClass)) then 1 else 0 end">
+ <v:template name="tform_16" type="simple" enabled="-- case when ((self.dav_type = 'C') and (self.dav_category = '') and isstring (DB.DBA.vad_check_version ('SyncML')) and ((self.command_mode = 0) or ((self.command_mode = 10) and (DB.DBA.yac_syncml_detect (self.dav_path) = 1)))) then 1 else 0 end">
+ <tr>
+ <th>SyncML version</th>
+ <td>
+ <select name="s_v">
+ <?vsp
+ declare aValues, aValue any;
+ declare N integer;
+
+ aValue := case when (self.command_mode = 0) then 'N' else DB.DBA.yac_syncml_version_get (self.dav_path) end;
+ aValues := DB.DBA.yac_syncml_version ();
+ for (N := 0; N < length (aValues); N := N + 2)
+ {
+ http(sprintf('<option value="%s" %s>%s</option>', aValues[N], select_if(aValue, aValues[N]), aValues[N+1]));
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <th>SyncML type</th>
+ <td>
+ <select name="s_t">
+ <?vsp
+ declare aValues, aValue any;
+ declare N integer;
+
+ aValue := case when (self.command_mode = 0) then 'N' else DB.DBA.yac_syncml_type_get (self.dav_path) end;
+ aValues := DB.DBA.yac_syncml_type ();
+ for (N := 0; N < length (aValues); N := N + 2)
+ {
+ http(sprintf('<option value="%s" %s>%s</option>', aValues[N], select_if (aValue, aValues[N]), aValues[N+1]));
+ }
+ ?>
+ </select>
+ </td>
+ </tr>
+ </v:template>
+ <v:template name="tform_17" type="simple" enabled="-- case when ((self.dav_type = 'C') and (self.command_mode = 10)) then 1 else 0 end">
<tr>
<th> </th>
<td>
@@ -2009,7 +1767,7 @@
</td>
</tr>
</v:template>
- <v:template name="tform_19" type="simple" enabled="-- case when gte(self.command_mode, 10) and not length (self.dav_detClass) then 1 else 0 end">
+ <v:template name="tform_19" type="simple" enabled="-- gte(self.command_mode, 10)">
<tr>
<th valign="top">WebDAV Properties</th>
<td>
@@ -2021,13 +1779,14 @@
declare properties any;
properties := ODRIVE.WA.DAV_PROP_LIST (self.dav_path, '%', vector ('virt:%', 'http://www.openlinksw.com/schemas/%', 'http://local.virt/DAV-RDF%'));
+ http (sprintf ('<input type="hidden" name="dav_propEnable" id="dav_propEnable" value="%d" />', self.dav_propEnable));
?>
<table id="c_tbl" class="form-list" cellspacing="0">
<tr>
<th width="50%">Property</th>
<th width="50%">Value</th>
- <vm:if test="self.fieldRights ('properties')">
- <th>Action</th>
+ <vm:if test="self.dav_propEnable">
+ <th> </th>
</vm:if>
</tr>
<![CDATA[
@@ -2039,7 +1798,7 @@
for (N := 0; N < length (properties); N := N + 1)
{
M := M + 1;
- if (self.dav_enable or self.fieldRights ('sharing_acl'))
+ if (self.dav_propEnable)
{
http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("c", null, {fld_1: {mode: 40, value: "%s", className: "_validate_", onbBlur: function(){validateField(this);}}, fld_2: {mode: 0, value: "%s"}});});', properties[N][0], properties[N][1]));
} else {
@@ -2049,10 +1808,10 @@
?>
</script>
]]>
- <tr id="c_tr_no" style="display: <?V case when M=0 then '' else 'none' end ?>;"><td colspan="<?V (2 + self.fieldRights ('properties')) ?>"><b>No Properties</b></td></tr>
+ <tr id="c_tr_no" style="display: <?V case when M=0 then '' else 'none' end ?>;"><td colspan="<?V case when self.dav_propEnable then 2 else 3 end ?>"><b>No Properties</b></td></tr>
</table>
</td>
- <vm:if test="self.fieldRights ('properties')">
+ <vm:if test="self.dav_propEnable">
<td valign="top" nowrap="nowrap">
<span class="button pointer" onclick="javascript: TBL.createRow('c', null, {fld_1: {mode: 40, className: '_validate_', onblur: function(){validateField(this);}}, fld_2: {mode: 0}});"><img src="image/add_16.png" border="0" class="button" alt="Add Property" title="Add Property" /> Add</span><br /><br />
</td>
@@ -2067,10 +1826,9 @@
<v:template name="tform_20" type="simple" enabled="-- gte(self.command_mode, 10)">
<div id="2" class="tabContent">
- <vm:if test='not isnull (ODS.ODS_API."server.getInfo"('sslPort')) and self.fieldRights ('sharing_acl')'>
<fieldset>
<legend><b>ODS users/groups</b></legend>
- <table width="100%">
+ <table>
<tr>
<td width="100%">
<table id="s_tbl" class="form-list" style="width: 100%;" cellspacing="0">
@@ -2096,9 +1854,9 @@
acl := acl_values[N];
if (self.dav_enable and (acl[1] <> 3))
{
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 51, value: "%s", formMode: "u", nrows: %d, tdCssText: "white-space: nowrap;", className: "_validate_"}, fld_2: {mode: 43, value: %d, tdCssText: "white-space: nowrap;", objectType: "%s"}, fld_3: {mode: 42, value: [%d, %d, %d], suffix: "_grant", onclick: function(){TBL.clickCell42(this);}, tdCssText: "width: 1%%; text-align: center;"}, fld_4: {mode: 42, value: [%d, %d, %d], suffix: "_deny", onclick: function(){TBL.clickCell42(this);}, tdCssText: "width: 1%%; text-align: center;"}});});', ODRIVE.WA.account_iri (acl[0]), ODRIVE.WA.settings_rows (self.settings), acl[1], self.dav_type, bit_and (acl[2], 4), bit_and (acl[2], 2), bit_and (acl[2], 1), bit_and (acl[3], 4), bit_and (acl[3], 2), bit_and (acl[3], 1)));
+ http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("s", null, {fld_1: {mode: 51, value: "%s", formMode: "u", nrows: %d, tdCssText: "white-space: nowrap;", className: "_validate_"}, fld_2: {mode: 43, value: %d, objectType: "%s"}, fld_3: {mode: 42, value: [%d, %d, %d], suffix: "_grant", onclick: function(){TBL.clickCell42(this);}, tdCssText: "width: 1%%; text-align: center;"}, fld_4: {mode: 42, value: [%d, %d, %d], suffix: "_deny", onclick: function(){TBL.clickCell42(this);}, tdCssText: "width: 1%%; text-align: center;"}});});', ODRIVE.WA.account_iri (acl[0]), ODRIVE.WA.settings_rows (self.settings), acl[1], self.dav_type, bit_and (acl[2], 4), bit_and (acl[2], 2), bit_and (acl[2], 1), bit_and (acl[3], 4), bit_and (acl[3], 2), bit_and (acl[3], 1)));
} else {
- http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {value: "%s"}, fld_2: {value: "%s", tdCssText: "white-space: nowrap;"}, fld_3: {mode: 42, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}, fld_4: {mode: 42, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', ODRIVE.WA.account_iri (acl[0]), get_keyword (acl[1], V, ''), bit_and (acl[2], 4), bit_and (acl[2], 2), bit_and (acl[2], 1), bit_and (acl[3], 4), bit_and (acl[3], 2), bit_and (acl[3], 1)));
+ http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("s", {fld_1: {value: "%s"}, fld_2: {value: "%s"}, fld_3: {mode: 42, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}, fld_4: {mode: 42, value: [%d, %d, %d], tdCssText: "width: 1%%; text-align: center;"}});});', ODRIVE.WA.account_iri (acl[0]), get_keyword (acl[1], V, ''), bit_and (acl[2], 4), bit_and (acl[2], 2), bit_and (acl[2], 1), bit_and (acl[3], 4), bit_and (acl[3], 2), bit_and (acl[3], 1)));
}
}
?>
@@ -2108,18 +1866,17 @@
</table>
</td>
<td valign="top" nowrap="nowrap">
- <vm:if test="self.dav_enable or self.fieldRights ('sharing_acl')">
+ <vm:if test="self.dav_enable">
<span class="button pointer" onclick="javascript: TBL.createRow('s', null, {fld_1: {mode: 51, formMode: 'u', nrows: <?V ODRIVE.WA.settings_rows (self.settings) ?>, tdCssText: 'white-space: nowrap;', className: '_validate_'}, fld_2: {mode: 43, value: 1, objectType: '<?V self.dav_type ?>'}, fld_3: {mode: 42, value: [1, 1, 0], suffix: '_grant', onclick: function(){TBL.clickCell42(this);}, tdCssText: 'width: 1%; text-align: center;'}, fld_4: {mode: 42, suffix: '_deny', onclick: function(){TBL.clickCell42(this);}, tdCssText: 'width: 1%; text-align: center;'}});"><img src="image/add_16.png" border="0" class="button" alt="Add Security" title="Add Security" /> Add</span><br /><br />
</vm:if>
</td>
</tr>
</table>
</fieldset>
- </vm:if>
- <vm:if test='not isnull (ODS.ODS_API."server.getInfo"('sslPort')) and self.fieldRights ('sharing_aci')'>
+ <vm:if test='not isnull (ODS.ODS_API."server.getInfo"('sslPort'))'>
<fieldset>
<legend><b>WebID users</b></legend>
- <table width="100%">
+ <table>
<tr>
<td width="100%">
<table id="f_tbl" class="form-list" style="width: 100%;" cellspacing="0">
@@ -2127,7 +1884,9 @@
<th width="1%" nowrap="nowrap">Access Type</th>
<th nowrap="nowrap">WebID</th>
<th width="1%" align="center" nowrap="nowrap">Allow<br />(R)ead, (W)rite, e(X)ecute</th>
+ <vm:if test="self.dav_enable">
<th width="1%" >Action</th>
+ </vm:if>
</tr>
<![CDATA[
<script type="text/javascript">
@@ -2147,7 +1906,7 @@
aci_values := ODRIVE.WA.aci_load (self.dav_path);
for (N := 0; N < length (aci_values); N := N + 1)
{
- if (self.dav_enable or self.fieldRights ('sharing_aci'))
+ if (self.dav_enable)
{
http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("f", null, {fld_1: {mode: 50, value: "%s", onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, value: "%s", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], execute: true, tdCssText: "width: 1%%; text-align: center;"}});});', aci_values[N][2], aci_values[N][1], case when aci_values[N][2] = 'public' then 'true' else 'false' end, case when aci_values[N][2] = 'public' then 'display: none;' else '' end, aci_values[N][3], aci_values[N][4], aci_values[N][5]));
} else {
@@ -2157,10 +1916,10 @@
?>
</script>
]]>
- <tr id="f_tr_no"><td colspan="4"><b>No WebID Security</b></td></tr>
+ <tr id="f_tr_no"><td colspan="<?V case when self.dav_enable then 3 else 4 end ?>"><b>No WebID Security</b></td></tr>
</table>
</td>
- <vm:if test="self.dav_enable or self.fieldRights ('sharing_aci')">
+ <vm:if test="self.dav_enable">
<td valign="top" nowrap="nowrap">
<span class="button pointer" onclick="javascript: TBL.createRow('f', null, {fld_1: {mode: 50, onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, tdCssText: 'white-space: nowrap;', className: '_validate_ _webid_'}, fld_3: {mode: 52, value: [1, 0, 0], execute: true, tdCssText: 'width: 1%; text-align: center;'}});"><img src="image/add_16.png" border="0" class="button" alt="Add Security" title="Add Security" /> Add</span><br /><br />
</td>
@@ -2172,7 +1931,7 @@
</div>
</v:template>
- <v:template name="tform_21" type="simple" enabled="-- case when (gte(self.command_mode, 10) and self.fieldRights ('metadata')) then 1 else 0 end">
+ <v:template name="tform_21" type="simple" enabled="-- case when (gte(self.command_mode, 10) and ODRIVE.WA.dav_rdf_has_metadata (self.dav_path)) then 1 else 0 end">
<div id="3" class="tabContent" style="display: none;">
<table id="schema" class="ODS_grid">
<thead>
@@ -2257,8 +2016,6 @@
<vm:search-dc-template6 />
<vm:search-dc-template7 />
<vm:search-dc-template8 />
- <vm:search-dc-template11 />
- <vm:search-dc-template12 />
</v:template>
<v:template type="simple" enabled="-- equ(self.dav_type, 'R')">
<vm:search-dc-template9 />
@@ -2267,7 +2024,7 @@
</div>
</div>
<div class="new-form-footer">
- <v:button action="simple" name="cCreate" value="--case when (self.command_mode >= 10) then 'Update' else case when (self.command_mode = 5) then 'Upload' else 'Create' end end" enabled="--case when (self.dav_enable or self.fieldRights ('sharing')) then 1 else 0 end" xhtml_onclick="return validateInputs(this);"/>
+ <v:button action="simple" name="cCreate" value="--case when (self.command_mode >= 10) then 'Update' else case when (self.command_mode = 5) then 'Upload' else 'Create' end end" enabled="--self.dav_enable" xhtml_onclick="return validateInputs(this);"/>
<v:button action="simple" name="cCancel" value="Cancel" >
<v:on-post>
<![CDATA[
@@ -2282,7 +2039,7 @@
if (document.F1.elements['dav_det'])
updateLabel(document.F1.dav_det.options[document.F1.dav_det.selectedIndex].value);
initDisabled();
- initTab(11, 1);
+ initTab(10, 1);
]]>
</script>
</v:template>
diff --git a/appsrc/ODS-Briefcase/www/js/odrive.js b/appsrc/ODS-Briefcase/www/js/odrive.js
index 8b66108..31adf14 100644
--- a/appsrc/ODS-Briefcase/www/js/odrive.js
+++ b/appsrc/ODS-Briefcase/www/js/odrive.js
@@ -1,10 +1,10 @@
/*
- * $Id: odrive.js,v 1.15.2.24 2012/03/08 12:00:18 source Exp $
+ * $Id: odrive.js,v 1.15.2.22 2011/08/01 14:14:42 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -29,46 +29,6 @@ function setFooter() {
}
}
-function destinationChange(obj, changes) {
- function destinationChangeInternal(actions) {
- if (actions.hide) {
- var a = actions.hide;
- for ( var i = 0; i < a.length; i++) {
- var o = $(a[i])
- if (o) {
- OAT.Dom.hide(o);
- }
- }
- }
- if (actions.show) {
- var a = actions.show;
- for ( var i = 0; i < a.length; i++) {
- var o = $(a[i])
- if (o) {
- OAT.Dom.show(o);
- }
- }
- }
- if (actions.clear) {
- var a = actions.clear;
- for ( var i = 0; i < a.length; i++) {
- var o = $(a[i])
- if (o && o.value) {
- o.value = '';
- }
- }
- }
- }
- if (!changes)
- return;
-
- if (obj.checked && changes.checked)
- destinationChangeInternal(changes.checked);
-
- if (!obj.checked && changes.unchecked)
- destinationChangeInternal(changes.unchecked);
-}
-
function urlParam(fldName) {
var O = document.forms[0].elements[fldName];
if (O && O.value != '')
@@ -224,7 +184,7 @@ function selectAllCheckboxes (obj, prefix, toolbarsFlag) {
for (var i = 0; i < objForm.elements.length; i++)
{
var o = objForm.elements[i];
- if (o != null && o.type == "checkbox" && !o.disabled && o.name.indexOf (prefix) == 0)
+ if (o != null && o.type == "checkbox" && !o.disabled && o.name.indexOf (prefix) != -1)
{
o.checked = (obj.value == 'Select All');
coloriseRow(getParent(o, 'tr'), o.checked);
@@ -271,7 +231,7 @@ function enableToolbars (objForm, prefix, doc)
enableElement('tb_delete', 'tb_delete_gray', oCount>0, doc);
enableElement('tb_tag', 'tb_tag_gray', tCount>0, doc);
- enableElement('tb_properties', 'tb_properties_gray', oCount>1, doc);
+ enableElement('tb_properties', 'tb_properties_gray', oCount>0, doc);
}
function getParent (o, tag)
@@ -437,23 +397,19 @@ function chkbx(bx1, bx2)
function updateLabel(value)
{
- hideLabel(4, 11);
+ hideLabel(4, 10);
if (value == 'oMail')
showLabel(4, 4);
- else if (value == 'PropFilter')
+ if (value == 'PropFilter')
showLabel(5, 5);
- else if (value == 'S3')
+ if (value == 'S3')
showLabel(6, 6);
- else if (value == 'ResFilter')
+ if (value == 'ResFilter')
showLabel(7, 7);
- else if (value == 'CatFilter')
+ if (value == 'CatFilter')
showLabel(7, 7);
- else if (value == 'rdfSink')
+ if (value == 'rdfSink')
showLabel(8, 8);
- else if (value == 'SyncML')
- showLabel(10, 10);
- else if (value == 'IMAP')
- showLabel(11, 11);
}
function showLabel(from, to)
@@ -584,10 +540,9 @@ function mailShow(myForm, myPrefix, myPage, width, height)
}
function coloriseRow(obj, checked) {
+ obj.className = (obj.className).replace('tr_select', '');
if (checked)
- OAT.Dom.addClass(obj, 'selected');
- else
- OAT.Dom.removeClass(obj, 'selected');
+ obj.className = obj.className + ' ' + 'tr_select';
}
function coloriseTable(id)
@@ -808,9 +763,8 @@ function hideCell(cell)
function toggleDavRows()
{
- if (!document.forms['F1'].elements['dav_destination'])
- return;
-
+ if (document.forms['F1'].elements['dav_destination'])
+ {
if (document.forms['F1'].elements['dav_destination'][0].checked == '1')
{
showTableRow('davRow_mime');
@@ -823,13 +777,14 @@ function toggleDavRows()
showTableRow('davRow_tagsPublic');
showTableRow('davRow_tagsPrivate');
- showCell('dav_source_2');
+ showTableRow('rdf_store');
+
showCell('label_dav');
hideCell('label_dav_rdf');
showCell('dav_name');
hideCell('dav_name_rdf');
}
- else if (document.forms['F1'].elements['dav_destination'][1].checked == '1')
+ if (document.forms['F1'].elements['dav_destination'][1].checked == '1')
{
hideCell('davRow_tagsPrivate');
hideCell('davRow_tagsPublic');
@@ -840,11 +795,9 @@ function toggleDavRows()
hideCell('davRow_owner');
hideCell('davRow_version');
hideCell('davRow_mime');
- if ($('dav_content_plain'))
- showCell('davRow_mime');
- hideCell('dav_source_2');
- if (document.forms['F1'].elements['dav_source'] && (document.forms['F1'].elements['dav_source'][2].checked == '1'))
+ hideCell('rdf_store');
+ if (document.forms['F1'].elements['dav_source'][2].checked == '1')
document.forms['F1'].elements['dav_source'][0].checked = '1';
hideCell('label_dav');
@@ -852,34 +805,6 @@ function toggleDavRows()
hideCell('dav_name');
showCell('dav_name_rdf');
}
- toggleDavSource();
-}
-
-function toggleDavSource()
-{
- if (!document.forms['F1'].elements['dav_source'])
- return;
-
- if (document.forms['F1'].elements['dav_source'][0].checked == '1')
- {
- $('dav_file_label').innerHTML = 'File';
- showCell('dav_file');
- hideCell('dav_url');
- hideCell('dav_rdf');
- }
- else if (document.forms['F1'].elements['dav_source'][1].checked == '1')
- {
- $('dav_file_label').innerHTML = 'URL';
- hideCell('dav_file');
- showCell('dav_url');
- hideCell('dav_rdf');
- }
- else if (document.forms['F1'].elements['dav_source'][2].checked == '1')
- {
- $('dav_file_label').innerHTML = 'Quad Store Named Graph IRI';
- hideCell('dav_file');
- hideCell('dav_url');
- showCell('dav_rdf');
}
}
@@ -887,7 +812,7 @@ var ODRIVE = new Object();
ODRIVE.forms = new Object();
ODRIVE.forms['properties'] = {params: {items: true}, width: '900', height: '700', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
-ODRIVE.forms['edit'] = {params: {items: true}, height: '430', postActions:['ODRIVE.formSubmit()']};
+ODRIVE.forms['edit'] = {params: {items: true}, height: '430'};
ODRIVE.forms['view'] = {params: {items: true}, height: '430'};
ODRIVE.forms['copy'] = {params: {items: true}, height: '380', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
ODRIVE.forms['move'] = {params: {items: true}, height: '380', postActions:['ODRIVE.formSubmit()', 'ODRIVE.resetToolbars()']};
@@ -1050,10 +975,6 @@ ODRIVE.resetToolbars = function ()
ODRIVE.formShow = function (action, id, params)
{
- var cmd = $('_cmd');
- if (cmd)
- cmd.value = '';
-
var formParams = action.split('/')[0].toLowerCase();
var form = ODRIVE.forms[formParams];
if (form)
@@ -1475,29 +1396,20 @@ ODRIVE.searchGetCompares = function (predicate)
ODRIVE.davFolderSelect = function (fld)
{
- /* load stylesheets */
- OAT.Style.include("grid.css");
- OAT.Style.include("webdav.css");
-
var options = {
mode: 'browser',
+ foldersOnly: true,
onConfirmClick: function(path) {$(fld).value = '/DAV' + path;}
};
- OAT.WebDav.options.foldersOnly = true;
OAT.WebDav.open(options);
}
ODRIVE.davFileSelect = function (fld)
{
- /* load stylesheets */
- OAT.Style.include("grid.css");
- OAT.Style.include("webdav.css");
-
var options = {
mode: 'browser',
onConfirmClick: function(path, fname) {$(fld).value = '/DAV' + path + fname;}
};
- OAT.WebDav.options.foldersOnly = false;
OAT.WebDav.open(options);
}
@@ -1518,10 +1430,12 @@ ODRIVE.coloriseTables = function ()
ODRIVE.aboutDialog = function ()
{
var aboutDiv = $('aboutDiv');
- if (aboutDiv)
- OAT.Dom.unlink(aboutDiv);
-
- aboutDiv = OAT.Dom.create('div', {height: '160px', overflow: 'hidden'});
+ if (aboutDiv) {OAT.Dom.unlink(aboutDiv);}
+ aboutDiv = OAT.Dom.create('div', {
+ width:'430px',
+ height: '170px',
+ overflow: 'hidden'
+ });
aboutDiv.id = 'aboutDiv';
aboutDialog = new OAT.Dialog('About ODS Briefcase', aboutDiv, {width:445, buttons: 0, resize:0, modal:1});
aboutDialog.cancel = aboutDialog.hide;
@@ -1570,14 +1484,3 @@ ODRIVE.toggleEditor = function ()
$('dav_content_plain').value = $v('dav_content_html');
}
}
-
-ODRIVE.updateRdfGraph = function ()
-{
- if (
- ($v('dav_rdfSink_rdfGraph') == '') ||
- ($v('dav_rdfSink_rdfGraph') == ($v('rdfGraph_prefix')+$v('dav_name_save')+'#this'))
- )
- $('dav_rdfSink_rdfGraph').value = $v('rdfGraph_prefix') + $v('dav_name') + '#this';
-
- $('dav_name_save').value = $v('dav_name');
-}
\ No newline at end of file
diff --git a/appsrc/ODS-Briefcase/www/js/tbl.js b/appsrc/ODS-Briefcase/www/js/tbl.js
index ab4ac6f..6bda4f5 100644
--- a/appsrc/ODS-Briefcase/www/js/tbl.js
+++ b/appsrc/ODS-Briefcase/www/js/tbl.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -78,7 +78,9 @@ TBL.createCell42 = function (td, prefix, fldName, No, fldOptions, disabled)
TBL.createCell43 = function (td, prefix, fldName, No, fldOptions)
{
- var fld = TBL.createCellSelect(fldName, fldOptions);
+ var fld = OAT.Dom.create("select");
+ fld.name = fldName;
+ fld.id = fldName;
TBL.selectOption(fld, fldOptions.value, 'This object only', 0);
if (fldOptions.objectType == 'C') {
TBL.selectOption(fld, fldOptions.value, 'This object, subfolders and files', 1);
@@ -107,53 +109,3 @@ TBL.clickCell42 = function (fld)
}
$(fldName).checked = false;
}
-
-var Cartridges;
-TBL.createCell45 = function (td, prefix, fldName, No, fldOptions)
-{
- var fld = TBL.createCellSelect(fldName, fldOptions);
- if (Cartridges) {
- TBL.createCell45Options(fld, fldOptions.value);
- } else {
- var x = function (data) {
- try {
- Cartridges = OAT.JSON.parse(data);
- TBL.createCell45Options(fld, fldOptions.value);
- } catch (e) {Cartridges = null;}
- }
- OAT.AJAX.GET('ajax.vsp?a=cartridges', '', x);
- }
- td.appendChild(fld);
- return fld;
-}
-
-TBL.createCell45Options = function (fld, fldValue)
-{
- for (var i = 0; i < Cartridges.length; i++)
- TBL.selectOption(fld, fldValue, Cartridges[i][1], Cartridges[i][0]);
-}
-
-var MetaCartridges;
-TBL.createCell46 = function (td, prefix, fldName, No, fldOptions)
-{
- var fld = TBL.createCellSelect(fldName, fldOptions);
- if (MetaCartridges) {
- TBL.createCell46Options(fld, fldOptions.value);
- } else {
- var x = function (data) {
- try {
- MetaCartridges = OAT.JSON.parse(data);
- TBL.createCell46Options(fld, fldOptions.value);
- } catch (e) {MetaCartridges = null;}
- }
- OAT.AJAX.GET('ajax.vsp?a=metaCartridges', '', x);
- }
- td.appendChild(fld);
- return fld;
-}
-
-TBL.createCell46Options = function (fld, fldValue)
-{
- for (var i = 0; i < MetaCartridges.length; i++)
- TBL.selectOption(fld, fldValue, MetaCartridges[i][1], MetaCartridges[i][0]);
-}
diff --git a/appsrc/ODS-Briefcase/www/mimes.vspx b/appsrc/ODS-Briefcase/www/mimes.vspx
index 0f9675e..7ec5b96 100644
--- a/appsrc/ODS-Briefcase/www/mimes.vspx
+++ b/appsrc/ODS-Briefcase/www/mimes.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: mimes.vspx,v 1.8.2.6 2012/03/08 10:46:15 source Exp $
+ - $Id: mimes.vspx,v 1.8.2.5 2011/05/02 14:16:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/www/mimes_select.vspx b/appsrc/ODS-Briefcase/www/mimes_select.vspx
index 4f4278a..b9f4eda 100644
--- a/appsrc/ODS-Briefcase/www/mimes_select.vspx
+++ b/appsrc/ODS-Briefcase/www/mimes_select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: mimes_select.vspx,v 1.8.2.4 2012/03/08 10:46:15 source Exp $
+ - $Id: mimes_select.vspx,v 1.8.2.3 2011/05/02 14:16:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/www/odrive_login.vspx b/appsrc/ODS-Briefcase/www/odrive_login.vspx
index 33108da..4ad4f24 100644
--- a/appsrc/ODS-Briefcase/www/odrive_login.vspx
+++ b/appsrc/ODS-Briefcase/www/odrive_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: odrive_login.vspx,v 1.6.2.10 2012/03/08 12:00:18 source Exp $
+ - $Id: odrive_login.vspx,v 1.6.2.8 2010/10/07 13:23:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -44,11 +44,6 @@
params := self.vc_page.vc_event.ve_params;
domain_id := ODRIVE.WA.session_domain (params);
path := rtrim (case when (domain_id <> -1) then ODRIVE.WA.iri_fix (ODRIVE.WA.forum_iri (domain_id)) else HTTP_REQUESTED_URL() end, '/');
- if ((page_name = 'home.vspx') and (get_keyword ('id', params, '') <> '') and (lcase (get_keyword ('what', params)) = 'c') and (domain_id <> -1))
- {
- self.vc_redirect (sprintf ('%s/home.vspx?dir=%U', path, DB.DBA.DAV_SEARCH_PATH (atoi(get_keyword ('id', params)), 'C')));
- return;
- }
if ((page_name = 'home.vspx') and (get_keyword ('id', params, '') <> '') and (domain_id <> -1))
{
self.vc_redirect (sprintf ('%s/view.vsp?file=%U&mode=download', path, DB.DBA.DAV_SEARCH_PATH (atoi(get_keyword ('id', params)), 'R')));
diff --git a/appsrc/ODS-Briefcase/www/settings.vspx b/appsrc/ODS-Briefcase/www/settings.vspx
index f6fcd2a..ff1d596 100644
--- a/appsrc/ODS-Briefcase/www/settings.vspx
+++ b/appsrc/ODS-Briefcase/www/settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: settings.vspx,v 1.11.2.8 2012/03/08 12:00:18 source Exp $
+ - $Id: settings.vspx,v 1.11.2.6 2010/10/13 12:15:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -96,9 +96,9 @@
<v:text name="tabNo" xhtml_id="tabNo" type="hidden" value="--self.v_tabNo"/>
<div id="c1">
<div class="tabs">
- <vm:tabCaption tab="1" tabs="3" caption="Main"/>
- <vm:tabCaption tab="2" tabs="3" caption="Grid"/>
- <vm:tabCaption tab="3" tabs="3" caption="Mail Settings"/>
+ <vm:tabCaption tab="1" tabs="3" caption="Main"/>
+ <vm:tabCaption tab="2" tabs="3" caption="Grid"/>
+ <vm:tabCaption tab="3" tabs="3" caption="Mail Settings"/>
</div>
<div class="contents">
<div id="1" class="tabContent" style="display: none;">
@@ -114,7 +114,7 @@
S := case when (ODRIVE.WA.settings_chars (self.settings) = 0) then 'checked="checked"' else '' end;
http(sprintf('<input type="radio" name="r_chars" id="r_chars_0" value="0" %s />', S));
?>
- <vm:label for="r_chars_0" value="--'show everything'" />
+ <xsl:call-template name="nbsp"/><vm:label for="r_chars_0" value="--'show everything'" />
</td>
</tr>
<tr>
@@ -126,9 +126,9 @@
S := case when (ODRIVE.WA.settings_chars (self.settings) <> 0) then 'checked="checked"' else '' end;
http(sprintf('<input type="radio" name="r_chars" id="r_chars_1" value="1" %s />', S));
?>
- <vm:label for="r_chars_1" value="--'show no more than'" />
+ <xsl:call-template name="nbsp"/><vm:label for="r_chars_1" value="--'show no more than'" /><xsl:call-template name="nbsp"/>
<v:text name="f_chars" null-value="--''" value="--ODRIVE.WA.settings_chars (self.settings)" xhtml_size="3"/>
- <vm:label for="r_chars_1" value="--'characters'" />
+ <xsl:call-template name="nbsp"/><vm:label for="r_chars_1" value="--'characters'" /><xsl:call-template name="nbsp"/>
</td>
</tr>
<tr>
@@ -300,12 +300,11 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Clear" xhtml_onclick="javascript: return confirm (\'Do you want to reset settings to default?\');" xhtml_class="form-button">
+ <v:button action="simple" value="Clear" xhtml_class="form-button">
<v:on-post>
<![CDATA[
delete from ODRIVE.WA.SETTINGS where USER_ID = self.account_id;
- self.settings := vector_concat (vector ('app', DB.DBA.WA_USER_APP_ENABLE (self.account_id)), BMK.WA.settings (self.domain_id));
-
+ self.settings := vector_concat (vector ('app', DB.DBA.WA_USER_APP_ENABLE (self.account_id)), ODRIVE.WA.settings (self.account_id));
self.vc_data_bind(e);
]]>
</v:on-post>
diff --git a/appsrc/ODS-Briefcase/www/subscriptions.vspx b/appsrc/ODS-Briefcase/www/subscriptions.vspx
index 641bb49..d081fd2 100644
--- a/appsrc/ODS-Briefcase/www/subscriptions.vspx
+++ b/appsrc/ODS-Briefcase/www/subscriptions.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: subscriptions.vspx,v 1.5.2.5 2012/03/08 10:46:15 source Exp $
+ - $Id: subscriptions.vspx,v 1.5.2.4 2011/05/02 14:16:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/www/template/popup.vspx b/appsrc/ODS-Briefcase/www/template/popup.vspx
index cb61559..409855a 100644
--- a/appsrc/ODS-Briefcase/www/template/popup.vspx
+++ b/appsrc/ODS-Briefcase/www/template/popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: popup.vspx,v 1.4.2.9 2012/03/08 12:00:18 source Exp $
+ - $Id: popup.vspx,v 1.4.2.7 2011/07/04 10:04:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -46,6 +46,15 @@
<script type="text/javascript" src="js/odrive.js"></script>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript">
+ function myInit()
+ {
+ OAT.Preferences.imagePath = '/ods/images/oat/';
+ OAT.Preferences.stylePath = '/ods/oat/styles/';
+ OAT.Preferences.showAjax = false;
+
+ ODRIVE.coloriseTables();
+ }
+ OAT.MSG.attach(OAT, 'PAGE_LOADED', myInit);
window.onload = function(){OAT.MSG.send(OAT, 'PAGE_LOADED');};
window.onkeyup = function (event) {
if (event.keyCode == 27) {
diff --git a/appsrc/ODS-Briefcase/www/template/template.vspx b/appsrc/ODS-Briefcase/www/template/template.vspx
index 503005f..2bf8780 100644
--- a/appsrc/ODS-Briefcase/www/template/template.vspx
+++ b/appsrc/ODS-Briefcase/www/template/template.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.vspx,v 1.25.2.15 2012/03/08 12:00:18 source Exp $
+ - $Id: template.vspx,v 1.25.2.13 2011/07/04 10:04:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -57,6 +57,12 @@
user: '<?V ODRIVE.WA.account_name (self.account_id) ?>',
connectionHeaders: {Authorization: '<?V ODRIVE.WA.account_basicAuthorization (self.account_id) ?>'}
};
+
+ /* load stylesheets */
+ OAT.Style.include("grid.css");
+ OAT.Style.include("webdav.css");
+ OAT.Style.include("winms.css");
+
var featureList=["ajax", "json", "anchor", "dialog", "combolist", "calendar"];
OAT.Loader.load(featureList);
</script>
diff --git a/appsrc/ODS-Briefcase/www/template/template.xsl b/appsrc/ODS-Briefcase/www/template/template.xsl
index 45cc740..f41009b 100644
--- a/appsrc/ODS-Briefcase/www/template/template.xsl
+++ b/appsrc/ODS-Briefcase/www/template/template.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.xsl,v 1.18.2.12 2012/03/08 12:00:18 source Exp $
+ - $Id: template.xsl,v 1.18.2.10 2011/05/02 14:16:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -128,7 +128,7 @@
<xsl:apply-templates select="vm:init"/>
<v:form name="F1" method="POST" type="simple" action="--ODRIVE.WA.utf2wide (ODRIVE.WA.page_url (self.domain_id))" xhtml_enctype="multipart/form-data">
<ods:ods-bar app_type='oDrive'/>
- <div id="app_area" style="clear: right; min-width: 1008px;">
+ <div id="app_area" style="clear: right;">
<div style="background-color: #fff;">
<div style="float: left;">
<?vsp
@@ -516,17 +516,30 @@
<div id="4" class="tabContent" style="display: none;">
<table class="form-body" cellspacing="0">
<tr>
- <th width="30%">
- <v:label for="dav_oMail_FolderName" value="--'WebMail folder name'" />
+ <th>
+ <v:label for="dav_oMail_DomainId" value="--'oMail domain'" />
+ </th>
+ <td>
+ <v:text name="dav_oMail_DomainId" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:validator test="regexp" regexp="^[0-9]+$" message="Number is expected" runat="client" />
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_oMail_DomainId', self.dav_path, 'virt:oMail-DomainId', '1');
+ ]]>
+ </v:before-data-bind>
+ </v:text>
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <v:label for="dav_oMail_FolderName" value="--'oMail folder name'" />
</th>
<td>
<v:text name="dav_oMail_FolderName" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
<v:validator test="length" min="1" max="255" message="The input can not be empty." runat="client" />
<v:before-data-bind>
<![CDATA[
- control.ufl_value := self.get_fieldProperty ('dav_oMail_FolderName', self.dav_path, 'virt:oMail-FolderName', 'NULL');
- if (control.ufl_value = 'NULL')
- control.ufl_value := '';
+ control.ufl_value := self.get_fieldProperty ('dav_oMail_FolderName', self.dav_path, 'virt:oMail-FolderName', 'Inbox');
]]>
</v:before-data-bind>
</v:text>
@@ -534,7 +547,7 @@
</tr>
<tr>
<th>
- <v:label for="dav_oMail_NameFormat" value="--'WebMail name format'" />
+ <v:label for="dav_oMail_NameFormat" value="--'oMail name format'" />
</th>
<td>
<v:text name="dav_oMail_NameFormat" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
@@ -728,17 +741,15 @@
<div id="8" class="tabContent" style="display: none;">
<table class="form-body" cellspacing="0">
<tr>
- <th width="30%">
+ <th>
<v:label for="dav_rdfSink_rdfGraph" value="--'Graph name'" />
</th>
<td>
- <v:text name="dav_rdfSink_rdfGraph" xhtml_id="dav_rdfSink_rdfGraph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
+ <v:text name="dav_rdfSink_rdfGraph" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
<v:validator test="length" min="1" max="255" message="The input can not be empty." runat="client" />
<v:before-data-bind>
<![CDATA[
control.ufl_value := self.get_fieldProperty ('dav_rdfSink_rdfGraph', self.dav_path, 'virt:rdf_graph', '');
- if ((control.ufl_value = '') and (self.command = 10))
- control.ufl_value := ODRIVE.WA.host_url () || rtrim (WS.WS.FIXPATH (ODRIVE.WA.odrive_real_path (self.dav_path)), '/') || '/#this';
]]>
</v:before-data-bind>
</v:text>
@@ -749,91 +760,17 @@
<v:label for="dav_rdfSink_rdfSponger" value="--'Sponger (on/off)'" />
</th>
<td>
- <?vsp
- declare S varchar;
-
- S := self.get_fieldProperty ('dav_rdfSink_rdfSponger', self.dav_path, 'virt:rdf_sponger', 'off');
- http (sprintf ('<input type="checkbox" name="dav_rdfSink_rdfSponger" id="dav_rdfSink_rdfSponger" %s disabled="disabled" onchange="javascript: destinationChange(this, {checked: {show: [\'dav_cartridge\', \'dav_metaCartridge\']}, unchecked: {hide: [\'dav_cartridge\', \'dav_metaCartridge\']}});" value="on" />', case when S = 'on' then 'checked="checked"' else '' end));
- ?>
- </td>
- </tr>
- <tr id="dav_cartridge" style="display: none;">
- <th valign="top">Sponger Extractor Cartridges</th>
- <td>
- <div style="margin-bottom: 6px; max-height: 200px; overflow: auto;">
- <?vsp
- declare N integer;
- declare cartridges, selectedCartridges any;
-
- selectedCartridges := self.get_fieldProperty ('dav_rdfSink_rdfCartridges', self.dav_path, 'virt:rdf_cartridges', '');
- selectedCartridges := split_and_decode (selectedCartridges, 0, '\0\0,');
- cartridges := ODRIVE.WA.cartridges_get ();
- ?>
- <table id="ca_tbl" class="ODS_grid" cellspacing="0">
- <thead>
- <tr>
- <th><input type="checkbox" name="ca_select" value="Select All" onclick="selectAllCheckboxes (this, 'ca_item', true)" title="Select All" /></th>
- <th width="100%">Cartridge</th>
- </tr>
- </thead>
- <?vsp
- for (N := 0; N < length (cartridges); N := N + 1)
- {
- http ('<tr>');
- http (sprintf ('<td class="checkbox"><input type="checkbox" name="ca_item" value="%d" disabled="disabled" %s /></td>', cartridges[N][0], case when ODRIVE.WA.vector_contains (selectedCartridges, cast (cartridges[N][0] as varchar)) then 'checked="checked"' else '' end));
- http (sprintf ('<td>%V</td>', cartridges[N][1]));
- http ('</tr>');
- }
- if (length (cartridges) = 0)
- http ('<tr><td colspan="2"><b>No available cartridges</b></td></tr>');
- ?>
- </table>
- </div>
+ <v:text name="dav_rdfSink_rdfSponger" format="%s" xhtml_disabled="disabled" xhtml_class="field-short">
+ <v:before-data-bind>
+ <![CDATA[
+ control.ufl_value := self.get_fieldProperty ('dav_rdfSink_rdfSponger', self.dav_path, 'virt:rdf_sponger', '');
+ ]]>
+ </v:before-data-bind>
+ </v:text>
</td>
</tr>
- <vm:if test="DB.DBA.wa_check_package ('rdf_mappers')">
- <tr id="dav_metaCartridge" style="display: none;">
- <th valign="top">Sponger Meta Cartridges</th>
- <td>
- <div style="margin-bottom: 6px; max-height: 200px; overflow: auto;">
- <?vsp
- declare N integer;
- declare cartridges, selectedCartridges any;
-
- selectedCartridges := self.get_fieldProperty ('dav_rdfSink_rdfMetaCartridges', self.dav_path, 'virt:rdf_metaCartridges', '');
- selectedCartridges := split_and_decode (selectedCartridges, 0, '\0\0,');
- cartridges := ODRIVE.WA.metaCartridges_get ();
- ?>
- <table id="mca_tbl" class="ODS_grid" cellspacing="0">
- <thead>
- <tr>
- <th><input type="checkbox" name="mca_select" value="Select All" onclick="selectAllCheckboxes (this, 'mca_item', true)" title="Select All" /></th>
- <th width="100%">Meta Cartridge</th>
- </tr>
- </thead>
- <?vsp
- for (N := 0; N < length (cartridges); N := N + 1)
- {
- http ('<tr>');
- http (sprintf ('<td class="checkbox"><input type="checkbox" name="mca_item" value="%d" disabled="disabled" %s /></td>', cartridges[N][0], case when ODRIVE.WA.vector_contains (selectedCartridges, cast (cartridges[N][0] as varchar)) then 'checked="checked"' else '' end));
- http (sprintf ('<td>%V</td>', cartridges[N][1]));
- http ('</tr>');
- }
- if (length (cartridges) = 0)
- http ('<tr><td colspan="2"><b>No available cartridges</b></td></tr>');
- ?>
</table>
</div>
- </td>
- </tr>
- </vm:if>
- </table>
- <![CDATA[
- <script type="text/javascript">
- OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_rdfSink_rdfSponger'), {checked: {show: ['dav_cartridge', 'dav_metaCartridge']}})});
- </script>
- ]]>
- </div>
</xsl:template>
<!--=========================================================================-->
@@ -846,10 +783,10 @@
</th>
<td>
<?vsp
- http (sprintf ('Lock is <b>%s</b>, ', ODRIVE.WA.DAV_GET_INFO (self.dav_path, 'lockState')));
- http (sprintf ('Version Control is <b>%s</b>, ', ODRIVE.WA.DAV_GET_INFO (self.dav_path, 'vc')));
- http (sprintf ('Auto Versioning is <b>%s</b>, ', ODRIVE.WA.DAV_GET_INFO (self.dav_path, 'avcState')));
- http (sprintf ('Version State is <b>%s</b>', ODRIVE.WA.DAV_GET_INFO (self.dav_path, 'vcState')));
+ http (sprintf ('Lock is <b>%s</b>, ', ODRIVE.WA.DAV_GET_INFO (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'), 'lockState')));
+ http (sprintf ('Version Control is <b>%s</b>, ', ODRIVE.WA.DAV_GET_INFO (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'), 'vc')));
+ http (sprintf ('Auto Versioning is <b>%s</b>, ', ODRIVE.WA.DAV_GET_INFO (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'), 'avcState')));
+ http (sprintf ('Version State is <b>%s</b>', ODRIVE.WA.DAV_GET_INFO (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'), 'vcState')));
?>
</td>
</tr>
@@ -864,12 +801,11 @@
<![CDATA[
declare retValue any;
- dbg_obj_print ('self.dav_path', self.dav_path);
if (ODRIVE.WA.DAV_GET (self.dav_item, 'versionControl'))
{
- retValue := ODRIVE.WA.DAV_REMOVE_VERSION_CONTROL (self.dav_path);
+ retValue := ODRIVE.WA.DAV_REMOVE_VERSION_CONTROL (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
} else {
- retValue := ODRIVE.WA.DAV_VERSION_CONTROL (self.dav_path);
+ retValue := ODRIVE.WA.DAV_VERSION_CONTROL (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
}
if (ODRIVE.WA.DAV_ERROR(retValue))
{
@@ -891,12 +827,12 @@
File commands
</th>
<td>
- <v:button name="tepmpate_lock" action="simple" value="Lock" enabled="-- case when (ODRIVE.WA.DAV_IS_LOCKED (self.dav_path)) then 0 else 1 end" xhtml_class="button">
+ <v:button name="tepmpate_lock" action="simple" value="Lock" enabled="-- case when (ODRIVE.WA.DAV_IS_LOCKED(ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'))) then 0 else 1 end" xhtml_class="button">
<v:on-post>
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_LOCK (self.dav_path);
+ retValue := ODRIVE.WA.DAV_LOCK (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
if (ODRIVE.WA.DAV_ERROR(retValue))
{
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
@@ -907,12 +843,12 @@
]]>
</v:on-post>
</v:button>
- <v:button name="tepmpate_unlock" action="simple" value="Unlock" enabled="-- case when (ODRIVE.WA.DAV_IS_LOCKED (self.dav_path)) then 1 else 0 end" xhtml_class="button">
+ <v:button name="tepmpate_unlock" action="simple" value="Unlock" enabled="-- case when (ODRIVE.WA.DAV_IS_LOCKED(ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'))) then 1 else 0 end" xhtml_class="button">
<v:on-post>
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_UNLOCK (self.dav_path);
+ retValue := ODRIVE.WA.DAV_UNLOCK (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
if (ODRIVE.WA.DAV_ERROR(retValue))
{
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
@@ -935,9 +871,8 @@
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_CHECKIN (self.dav_path);
- if (ODRIVE.WA.DAV_ERROR (retValue))
- {
+ retValue := ODRIVE.WA.DAV_CHECKIN (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
+ if (ODRIVE.WA.DAV_ERROR(retValue)) {
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
self.vc_is_valid := 0;
return;
@@ -951,7 +886,7 @@
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_CHECKOUT (self.dav_path);
+ retValue := ODRIVE.WA.DAV_CHECKOUT (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
if (ODRIVE.WA.DAV_ERROR(retValue))
{
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
@@ -967,7 +902,7 @@
<![CDATA[
declare retValue any;
- retValue := ODRIVE.WA.DAV_UNCHECKOUT (self.dav_path);
+ retValue := ODRIVE.WA.DAV_UNCHECKOUT (ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
if (ODRIVE.WA.DAV_ERROR(retValue))
{
self.vc_error_message := ODRIVE.WA.DAV_PERROR(retValue);
@@ -985,7 +920,7 @@
Number of Versions in History
</th>
<td>
- <v:label value="--ODRIVE.WA.DAV_GET_VERSION_COUNT (self.dav_path)" format="%d" />
+ <v:label value="--ODRIVE.WA.DAV_GET_VERSION_COUNT(ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'))" format="%d" />
</td>
</tr>
<tr>
@@ -993,12 +928,12 @@
Root version
</th>
<td>
- <v:button style="url" action="simple" value="--ODRIVE.WA.DAV_GET_VERSION_ROOT (self.dav_path)" format="%s">
+ <v:button style="url" action="simple" value="--ODRIVE.WA.DAV_GET_VERSION_ROOT(ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'))" format="%s">
<v:on-post>
<![CDATA[
declare path varchar;
- path := ODRIVE.WA.DAV_GET_VERSION_ROOT (self.dav_path);
+ path := ODRIVE.WA.DAV_GET_VERSION_ROOT(ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath'));
if (ODRIVE.WA.odrive_permission(path) = '')
{
self.vc_error_message := 'You have not rights to read this folder/file!';
@@ -1016,7 +951,7 @@
</td>
</tr>
<tr>
- <th valign="top">Versions</th>
+ <th>Versions</th>
<td>
<v:data-set name="ds_versions" sql="select rs.* from ODRIVE.WA.DAV_GET_VERSION_SET(rs0)(c0 varchar, c1 integer) rs where rs0 = :p0" nrows="0" scrollable="1">
<v:param name="p0" value="--ODRIVE.WA.DAV_GET (self.dav_item, 'fullPath')" />
@@ -1062,7 +997,7 @@
}
http_request_status ('HTTP/1.1 302 Found');
- http_header (sprintf ('Location: %s&mode=download&file=%U\r\n', ODRIVE.WA.page_url (self.domain_id, 'view.vsp', self.sid , self.realm), path));
+ http_header (sprintf ('Location: view.vsp?sid=%s&realm=%s&file=%U&mode=download\r\n', self.sid , self.realm, path));
self.vc_data_bind (e);
]]>
</v:on-post>
@@ -1201,112 +1136,9 @@
</xsl:template>
<!--=========================================================================-->
- <xsl:template match="vm:search-dc-template11">
- <div id="10" class="tabContent" style="display: none;">
- <table class="form-body" cellspacing="0">
- <tr>
- <th width="30%">SyncML version</th>
- <td>
- <select name="syncml_version">
- <?vsp
- declare aValues, aValue any;
- declare N integer;
-
- aValue := case when (self.command_mode = 0) then 'N' else ODRIVE.WA.syncml_version (self.dav_path) end;
- aValues := ODRIVE.WA.syncml_versions ();
- for (N := 2; N < length (aValues); N := N + 2)
- {
- http(sprintf('<option value="%s" %s>%s</option>', aValues[N], select_if(aValue, aValues[N]), aValues[N+1]));
- }
- ?>
- </select>
- </td>
- </tr>
- <tr>
- <th>SyncML type</th>
- <td>
- <select name="syncml_type">
- <?vsp
- declare aValues, aValue any;
- declare N integer;
-
- aValue := case when (self.command_mode = 0) then 'N' else ODRIVE.WA.syncml_type (self.dav_path) end;
- aValues := ODRIVE.WA.syncml_types ();
- for (N := 2; N < length (aValues); N := N + 2)
- {
- http(sprintf('<option value="%s" %s>%s</option>', aValues[N], select_if (aValue, aValues[N]), aValues[N+1]));
- }
- ?>
- </select>
- </td>
- </tr>
- </table>
- </div>
- </xsl:template>
-
- <!--=========================================================================-->
- <xsl:template match="vm:search-dc-template12">
- <div id="11" class="tabContent" style="display: none;">
- <table class="form-body" cellspacing="0">
- <tr>
- <th width="30%">Connection Type</th>
- <td>
- <select name="dav_IMAP_connection">
- <?vsp
- declare aValues, aValue any;
- declare N integer;
-
- aValue := self.get_fieldProperty ('dav_IMAP_connection', self.dav_path, 'virt:IMAP-connection', '');
- aValues := vector ('none', 'None', 'ssl', 'SSL/TSL');
- for (N := 0; N < length (aValues); N := N + 2)
- http (sprintf ('<option value="%s" %s>%s</option>', aValues[N], select_if(aValue, aValues[N]), aValues[N+1]));
- ?>
- </select>
- </td>
- </tr>
- <tr>
- <th>Server Address</th>
- <td>
- <v:text name="dav_IMAP_server" format="%s" xhtml_disabled="disabled" xhtml_class="field-text">
- <v:before-data-bind>
- <![CDATA[
- control.ufl_value := self.get_fieldProperty ('dav_IMAP_server', self.dav_path, 'virt:IMAP-server', '');
- ]]>
- </v:before-data-bind>
- </v:text>
- </td>
- </tr>
- <tr>
- <th>User Name</th>
- <td>
- <v:text name="dav_IMAP_user" format="%s" xhtml_disabled="disabled" xhtml_class="field-short">
- <v:before-data-bind>
- <![CDATA[
- control.ufl_value := self.get_fieldProperty ('dav_IMAP_user', self.dav_path, 'virt:IMAP-user', '');
- ]]>
- </v:before-data-bind>
- </v:text>
- </td>
- </tr>
- <tr>
- <th>User Password</th>
- <td>
- <v:text type="password" name="dav_IMAP_password" format="%s" xhtml_disabled="disabled" xhtml_class="field-short">
- <v:before-data-bind>
- <![CDATA[
- control.ufl_value := self.get_fieldProperty ('dav_IMAP_password', self.dav_path, 'virt:IMAP-password', '');
- ]]>
- </v:before-data-bind>
- </v:text>
- </td>
- </tr>
- </table>
- </div>
- </xsl:template>
-
- <!--=========================================================================-->
<!-- Auto Versioning -->
<xsl:template match="vm:autoVersion">
+ <vm:if test="self.dav_category = ''">
<tr id="davRow_version">
<th>
<v:label for="dav_autoversion" value="--'Auto Versioning Content'" />
@@ -1318,7 +1150,7 @@
tmp := '';
if ((self.dav_type = 'R') and (self.command_mode = 10))
tmp := 'onchange="javascript: window.document.F1.submit();"';
- http (sprintf ('<select name="dav_autoversion" %s disabled="disabled" class="field-short">', tmp));
+ http (sprintf ('<select name="dav_autoversion" %s disabled="disabled">', tmp));
tmp := ODRIVE.WA.DAV_GET (self.dav_item, 'autoversion');
if (isnull(tmp) and (self.dav_type = 'R'))
@@ -1333,6 +1165,7 @@
?>
</td>
</tr>
+ </vm:if>
</xsl:template>
</xsl:stylesheet>
diff --git a/appsrc/ODS-Briefcase/www/view.vsp b/appsrc/ODS-Briefcase/www/view.vsp
index 9f99bc3..b090da9 100644
--- a/appsrc/ODS-Briefcase/www/view.vsp
+++ b/appsrc/ODS-Briefcase/www/view.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: view.vsp,v 1.8.2.6 2012/03/08 10:46:15 source Exp $
+-- $Id: view.vsp,v 1.8.2.5 2010/09/20 10:15:01 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/www/vmds.vspx b/appsrc/ODS-Briefcase/www/vmds.vspx
index b79fcc9..91bfcd2 100644
--- a/appsrc/ODS-Briefcase/www/vmds.vspx
+++ b/appsrc/ODS-Briefcase/www/vmds.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vmds.vspx,v 1.7.2.7 2012/03/08 10:46:15 source Exp $
+ - $Id: vmds.vspx,v 1.7.2.6 2011/05/02 14:16:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/xslt/rss2atom.xsl b/appsrc/ODS-Briefcase/xslt/rss2atom.xsl
index fd157d9..817d839 100644
--- a/appsrc/ODS-Briefcase/xslt/rss2atom.xsl
+++ b/appsrc/ODS-Briefcase/xslt/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.3.2.3 2012/03/08 10:46:15 source Exp $
+ - $Id: rss2atom.xsl,v 1.3.2.2 2010/09/20 10:15:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl b/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl
index 2ff6636..4ff5b07 100644
--- a/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl
+++ b/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.3.2.3 2012/03/08 10:46:15 source Exp $
+ - $Id: rss2atom03.xsl,v 1.3.2.2 2010/09/20 10:15:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl b/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl
index dc5f7f5..98067ea 100644
--- a/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl
+++ b/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.4.2.3 2012/03/08 10:46:15 source Exp $
+ - $Id: rss2rdf.xsl,v 1.4.2.2 2010/09/20 10:15:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl b/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl
index a5047ac..efb62a9 100644
--- a/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl
+++ b/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2.2.1 2010/09/20 10:15:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Calendar/Makefile.am b/appsrc/ODS-Calendar/Makefile.am
index 0f6cc45..f1921bb 100644
--- a/appsrc/ODS-Calendar/Makefile.am
+++ b/appsrc/ODS-Calendar/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -46,7 +46,6 @@ clean-local:
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Calendar/Makefile.in b/appsrc/ODS-Calendar/Makefile.in
index b468cdf..cc39cca 100644
--- a/appsrc/ODS-Calendar/Makefile.in
+++ b/appsrc/ODS-Calendar/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -311,7 +309,6 @@ CLEANFILES = \
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Calendar/make_vad.sh b/appsrc/ODS-Calendar/make_vad.sh
index ed2d485..aca9740 100755
--- a/appsrc/ODS-Calendar/make_vad.sh
+++ b/appsrc/ODS-Calendar/make_vad.sh
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -28,7 +28,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.0.0"
+VERSION="1.6.76"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -62,6 +62,11 @@ else
LN="ln -fs"
RM="rm -f"
fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
if [ "z$SERVER" = "z" ]
then
@@ -85,57 +90,6 @@ else
myrm=$RM
fi
-
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
- done
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
- rm -f version.tmp
- echo "$VERSION" > vad_version
- fi
-}
-
virtuoso_start() {
echo "Starting $SERVER"
echo $BUILD
@@ -271,7 +225,7 @@ sticker_init() {
echo " <name package=\"Calendar\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Calendar Manager\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -283,8 +237,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.85.05\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-12-29 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.82.42\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -313,7 +267,6 @@ sticker_init() {
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/Calendar/sql/calendar-a-api.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/Calendar/sql/sioc_calendar.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/Calendar/sql/DET_Calendar.sql', 1, 'report', $ISDAV);" >> $STICKER
- echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"/Calendar/sql/DET_CalDAV.sql', 1, 'report', $ISDAV);" >> $STICKER
echo " ]]>" >> $STICKER
echo " </sql>" >> $STICKER
echo " <sql purpose=\"pre-uninstall\">" >> $STICKER
@@ -428,7 +381,6 @@ echo '----------------------'
STOP_SERVER
directory_clean
-version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -445,6 +397,7 @@ virtuoso_shutdown
STOP_SERVER
chmod 644 ods_calendar_dav.vad
chmod 644 ods_calendar_filesystem.vad
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -454,7 +407,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Calendar/sql/DET_CalDAV.sql b/appsrc/ODS-Calendar/sql/DET_CalDAV.sql
deleted file mode 100755
index 947b454..0000000
--- a/appsrc/ODS-Calendar/sql/DET_CalDAV.sql
+++ /dev/null
@@ -1,1020 +0,0 @@
---
---
--- $Id: DET_CalDAV.sql,v 1.1.2.1 2012/03/08 12:14:09 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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
---
-use DB
-;
-
---| This matches DAV_AUTHENTICATE (in id any, in what char(1), in req varchar, in a_uname varchar, in a_pwd varchar, in a_uid integer := null)
---| The difference is that the DET function should not check whether the pair of name and password is valid; the auth_uid is not a null already.
-create function "CalDAV_DAV_AUTHENTICATE" (
- in id any,
- in what char(1),
- in req varchar,
- in auth_uname varchar,
- in auth_pwd varchar,
- in auth_uid integer)
-{
- -- dbg_obj_princ ('CalDAV_DAV_AUTHENTICATE (', id, what, req, auth_uname, auth_pwd, auth_uid, http_dav_uid(), ')');
- declare domain_id, item_id integer;
- declare rc any;
-
- rc := '';
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return -1;
-
- if ('R' = what)
- {
- item_id := id[4];
- if (not exists (select 1 from CAL.WA.EVENTS where E_ID = item_id))
- return -1;
-
- rc := CAL.WA.acl_check (domain_id, item_id);
- }
- else
- {
- rc := CAL.WA.acl_check (domain_id);
- }
- if (rc <> '')
- {
- if ((rc = 'R') and (req = '1__'))
- return http_nobody_uid ();
-
- if ((rc = 'W') and (req = '11_'))
- return http_nobody_uid ();
- }
- return -20;
-}
-;
-
---| This exactly matches DAV_AUTHENTICATE_HTTP (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer
---| The function should fully check access because DAV_AUTHENTICATE_HTTP do nothing with auth data either before or after calling this DET function.
---| Unlike DAV_AUTHENTICATE, user name passed to DAV_AUTHENTICATE_HTTP header may not match real DAV user.
---| If DET call is successful, DAV_AUTHENTICATE_HTTP checks whether the user have read permission on mount point collection.
---| Thus even if DET function allows anonymous access, the whole request may fail if mountpoint is not readable by public.
-create function "CalDAV_DAV_AUTHENTICATE_HTTP" (
- in id any,
- in what char(1),
- in req varchar,
- in can_write_http integer,
- inout a_lines any,
- inout a_uname varchar,
- inout a_pwd varchar,
- inout a_uid integer,
- inout a_gid integer,
- inout _perms varchar) returns integer
-{
- -- dbg_obj_princ ('CalDAV_DAV_AUTHENTICATE_HTTP (', id, what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms, ')');
- declare domain_id, item_id integer;
- declare rc any;
-
- rc := '';
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return -1;
-
- if ('R' = what)
- {
- item_id := id[4];
- if (not exists (select 1 from CAL.WA.EVENTS where E_ID = item_id))
- return -1;
-
- rc := CAL.WA.acl_check (domain_id, item_id);
- }
- else
- {
- rc := CAL.WA.acl_check (domain_id);
- }
- if (rc <> '')
- {
- a_uid := http_nobody_uid ();
- a_gid := http_nogroup_gid ();
- if (rc = 'R')
- _perms := '1__';
- else if (rc = 'W')
- _perms := '11_';
-
- return a_uid;
- }
- return -20;
-}
-;
-
---| This matches DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any
-create function "CalDAV_DAV_GET_PARENT" (in id any, in st char(1), in path varchar) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_GET_PARENT (', id, st, path, ')');
- return -20;
-}
-;
-
---| When DAV_COL_CREATE_INT calls DET function, authentication, check for lock and check for overwrite are passed, uid and gid are translated from strings to IDs.
---| Check for overwrite, but the deletion of previously existing collection should be made by DET function.
-create function "CalDAV_DAV_COL_CREATE" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_COL_CREATE (', detcol_id, path_parts, permissions, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| It looks like that this is redundant and should be removed at all.
-create function "CalDAV_DAV_COL_MOUNT" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_COL_MOUNT (', detcol_id, path_parts, full_mount_path, mount_det, permissions, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| It looks like that this is redundant and should be removed at all.
-create function "CalDAV_DAV_COL_MOUNT_HERE" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_COL_MOUNT_HERE (', parent_id, full_mount_path, permissions, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| When DAV_DELETE_INT calls DET function, authentication and check for lock are passed.
-create function "CalDAV_DAV_DELETE" (
- in detcol_id any,
- in path_parts any,
- in what char(1),
- in silent integer,
- in auth_uid integer) returns integer
-{
- -- dbg_obj_princ ('CalDAV_DAV_DELETE (', detcol_id, path_parts, what, silent, auth_uid, ')');
- declare top_id any;
- declare rc, owner_uid, domain_id integer;
-
- if ('C' = what)
- return -20;
-
- top_id := "CalDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, what, owner_uid, domain_id);
- if (top_id = -1)
- return -20;
-
- rc := CAL.WA.event_delete (top_id[4]);
- return rc;
-}
-;
-
---| When DAV_RES_UPLOAD_STRSES_INT calls DET function, authentication and check for locks are performed before the call.
---| There's a special problem, known as 'Transaction deadlock after reading from HTTP session'.
---| The DET function should do only one INSERT of the 'content' into the table and do it as late as possible.
---| The function should return -29 if deadlocked or otherwise broken after reading blob from HTTP.
-create function "CalDAV_DAV_RES_UPLOAD" (
- in detcol_id any,
- in path_parts any,
- inout content any,
- in type varchar,
- in permissions varchar,
- in uid integer,
- in gid integer,
- in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', content, type, permissions, uid, gid, auth_uid, ')');
- declare top_id, res any;
- declare owner_uid, domain_id, rc integer;
-
- top_id := "CalDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, 'R', owner_uid, domain_id);
- if (top_id <> -1)
- {
- rc := CAL.WA.event_delete (top_id[4]);
- if (rc < 1)
- return -20;
- }
- if (__tag (content) = 126)
- {
- declare real_content any;
-
- real_content := http_body_read (1);
- content := string_output_string (real_content); -- check if bellow code can work with string session and if so remove this line
- }
- res := CAL.WA.import_vcal (domain_id, content);
- if (length (res) > 0)
- return vector (CalDAV__UNAME(), detcol_id, uid, domain_id, path_parts[1], 0);
-
- return -20;
-}
-;
-
-
---| When DAV_PROP_REMOVE_INT calls DET function, authentication and check for locks are performed before the call.
---| The check whether it's a system name or not is _not_ permitted.
-create function "CalDAV_DAV_PROP_REMOVE" (in id any, in what char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer
-{
- -- dbg_obj_princ ('CalDAV_DAV_PROP_REMOVE (', id, what, propname, silent, auth_uid, ')');
- return -20;
-}
-;
-
---| When DAV_PROP_SET_INT calls DET function, authentication and check for locks are performed before the call.
---| The check whether it's a system property or not is _not_ permitted and the function should return -16 for live system properties.
-create function "CalDAV_DAV_PROP_SET" (
- in id any,
- in what char(0),
- in propname varchar,
- in propvalue any,
- in overwrite integer,
- in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_PROP_SET (', id, what, propname, propvalue, overwrite, auth_uid, ')');
- if (propname = 'virt:aci_meta')
- {
- declare domain_id, item_id integer;
-
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return -1;
-
- if ('R' = what)
- {
- item_id := id[4];
- if (not exists (select 1 from CAL.WA.EVENTS where E_ID = item_id))
- return -1;
-
- update CAL.WA.EVENTS set E_PRIVACY = 2 where E_DOMAIN_ID = domain_id and E_ID = item_id;
- CAL.WA.event_update_acl (item_id, serialize (propvalue));
- }
- else
- {
- update DB.DBA.WA_INSTANCE
- set WAI_ACL = serialize (propvalue)
- where WAI_ID = domain_id;
- }
- return 1;
- }
- if (propname[0] = 58)
- return -16;
-
- return -20;
-}
-;
-
---| When DAV_PROP_GET_INT calls DET function, authentication and check whether it's a system property are performed before the call.
-create function "CalDAV_DAV_PROP_GET" (
- in id any,
- in what char(0),
- in propname varchar,
- in auth_uid integer)
-{
- -- dbg_obj_princ ('CalDAV_DAV_PROP_GET (', id, what, propname, auth_uid, ')');
- if ('virt:aci_meta' = propname)
- {
- declare domain_id, item_id integer;
-
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return -1;
-
- if ('R' = what)
- {
- item_id := id[4];
- if (not exists (select 1 from CAL.WA.EVENTS where E_ID = item_id))
- return -1;
-
- return (select deserialize (E_ACL) from CAL.WA.EVENTS where E_DOMAIN_ID = domain_id and E_ID = item_id and E_PRIVACY = 2);
- }
- else
- {
- return (select deserialize (WAI_ACL) from DB.DBA.WA_INSTANCE where WAI_ID = domain_id);
- }
- }
- if (':virtdet' = propname)
- {
- return CalDAV__UNAME();
- }
- return -11;
-}
-;
-
---| When DAV_PROP_LIST_INT calls DET function, authentication is performed before the call.
---| The returned list should contain only user properties.
-create function "CalDAV_DAV_PROP_LIST" (in id any, in what char(0), in propmask varchar, in auth_uid integer)
-{
- -- dbg_obj_princ ('CalDAV_DAV_PROP_LIST (', id, what, propmask, auth_uid, ')');
- return vector ();
-}
-;
-
---| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
-create function "CalDAV_DAV_DIR_SINGLE" (
- in id any,
- in what char(0),
- in path any,
- in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_DIR_SINGLE (', id, what, path, auth_uid, ')');
- declare domain_id integer;
- declare colname, fullpath, rightcol varchar;
- declare maxrcvdate datetime;
- declare owner_gid, owner_uid integer;
- declare access varchar;
-
- CalDAV__ACCESS_PARAMS (id[1], access, owner_gid, owner_uid);
-
- domain_id := id[3];
- if (maxrcvdate is null)
- maxrcvdate := coalesce ( (select max(E_UPDATED) from CAL.WA.EVENTS where E_DOMAIN_ID = domain_id), cast ('1980-01-01' as datetime));
-
- if (cast (maxrcvdate as integer) = 0)
- maxrcvdate := cast ('1980-01-01' as datetime);
-
- colname := (select CalDAV__FIXNAME (C.WAI_NAME)
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = id[2]
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_TYPE_NAME = 'Calendar'
- and C.WAI_ID = domain_id);
- if (DAV_HIDE_ERROR (colname) is null)
- return -1;
-
- if (path is not null)
- {
- rightcol := path[length(path) - 2];
- if ('C' = what)
- return vector (DAV_CONCAT_PATH ('/', path), 'C', 0, maxrcvdate, id, access, 0, id[2], maxrcvdate, 'dav/unix-directory', rightcol );
- }
- fullpath := DAV_CONCAT_PATH (DAV_SEARCH_PATH (id[1], 'C'), colname || '/');
- if ('C' = what)
- {
- if (id[4] > 0)
- return -1;
-
- return vector (fullpath, 'C', 0, maxrcvdate, id, access, 0, id[2], maxrcvdate, 'dav/unix-directory', colname );
- }
- for (select CalDAV__COMPOSE_ICS_NAME(E_UID) as orig_mname, E_UPDATED from CAL.WA.EVENTS where E_ID = id[4]) do
- return vector (fullpath || orig_mname, 'R', 1024, E_UPDATED, id, access, 0, id[2], E_UPDATED, 'text/calendar', orig_mname);
-
- return -1;
-}
-;
-
---| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
-create function "CalDAV_DAV_DIR_LIST" (
- in detcol_id any,
- in path_parts any,
- in detcol_path varchar,
- in name_mask varchar,
- in recursive integer,
- in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_DIR_LIST (', detcol_id, path_parts, detcol_path, name_mask, recursive, auth_uid, ')');
- declare domain_id, owner_gid, owner_uid integer;
- declare top_davpath, access varchar;
- declare res any;
- declare top_id any;
- declare what char (1);
-
- CalDAV__ACCESS_PARAMS (detcol_id, access, owner_gid, owner_uid);
- what := case when ((0 = length (path_parts)) or ('' = path_parts[length (path_parts) - 1])) then 'C' else 'R' end;
- if (isarray (detcol_id) and (recursive = -1))
- return "CalDAV_DAV_DIR_SINGLE" (detcol_id, what, CalDAV_DAV_SEARCH_PATH (detcol_id, what), auth_uid);
-
- domain_id := 0;
- if (('C' = what) and (1 = length (path_parts)))
- {
- top_id := vector (CalDAV__UNAME(), detcol_id, owner_uid, 0, 0, 0); -- may be a fake id because top_id[3] may be NULL
- } else {
- top_id := "CalDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, what, owner_uid, domain_id);
- }
- if (DAV_HIDE_ERROR (top_id) is null)
- return vector();
-
- top_davpath := DAV_CONCAT_PATH (detcol_path, path_parts);
- if ('R' = what)
- return vector ("CalDAV_DAV_DIR_SINGLE" (top_id, what, top_davpath, auth_uid));
-
- res := vector();
- if ('C' = what)
- {
- -- Top level
- if (top_id[3] = 0)
- {
- for select CalDAV__FIXNAME(C.WAI_NAME) as orig_name,
- C.WAI_ID as dom_id
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = owner_uid
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_TYPE_NAME = 'Calendar'
- do
- {
- res := vector_concat (res, vector (vector (DAV_CONCAT_PATH (top_davpath, orig_name) || '/', 'C', 0, now(),
- vector (CalDAV__UNAME(), detcol_id, owner_uid, dom_id, 0, 0),
- access, owner_gid, owner_uid, now(), 'dav/unix-directory', orig_name) ) );
- }
- return res;
- }
- }
- for (select CalDAV__COMPOSE_ICS_NAME(E_UID) as orig_mname, E_ID, E_UPDATED
- from CAL.WA.EVENTS
- where E_DOMAIN_ID = top_id[3]) do
- {
- res := vector_concat (res, vector (vector (DAV_CONCAT_PATH (top_davpath, orig_mname), 'R', 1024, E_UPDATED,
- vector (CalDAV__UNAME(), detcol_id, owner_uid, top_id[3], E_ID, 0),
- access, owner_gid, owner_uid, E_UPDATED, 'text/calendar', orig_mname) ) );
- }
- return res;
-}
-;
-
-create procedure "CalDAV_DAV_FC_PRED_METAS" (inout pred_metas any)
-{
- pred_metas := vector (
- 'E_ID', vector ('EVENTS' , 0, 'integer' , 'E_ID' ),
- 'E_DOMAIN_ID', vector ('EVENTS' , 0, 'integer' , 'E_DOMAIN_ID' ),
- 'RES_NAME', vector ('EVENTS' , 0, 'varchar' , 'CalDAV__COMPOSE_ICS_NAME(_top.E_UID)'),
- 'RES_FULL_PATH', vector ('EVENTS' , 0, 'varchar' , 'concat (DAV_CONCAT_PATH (_param.detcolpath, ''calendar''), CalDAV__FIXNAME (WAI_NAME), ''/'', CalDAV__COMPOSE_ICS_NAME (_top.E_UID)'),
- 'RES_TYPE', vector ('EVENTS' , 0, 'varchar' , '(''text/calendar'')'),
- 'RES_OWNER_ID', vector ('SYS_USERS' , 0, 'integer' , 'U_ID' ),
- 'RES_OWNER_NAME', vector ('SYS_USERS' , 0, 'varchar' , 'U_NAME' ),
- 'RES_GROUP_ID', vector ('SYS_USERS' , 0, 'integer' , 'http_nogroup_gid()' ),
- 'RES_GROUP_NAME', vector ('SYS_USERS' , 0, 'varchar' , '(''nogroup'')' ),
- 'RES_COL_FULL_PATH',vector ('EVENTS' , 0, 'varchar' , 'concat (DAV_CONCAT_PATH (_param.detcolpath, ''calendar''), CalDAV__FIXNAME (WAI_NAME), ''/'')' ),
- 'RES_COL_NAME', vector ('EVENTS' , 0, 'varchar' , 'CalDAV__FIXNAME (WAI_NAME)' ),
- 'RES_CR_TIME', vector ('EVENTS' , 0, 'datetime' , 'E_UPDATED' ),
- 'RES_MOD_TIME', vector ('EVENTS' , 0, 'datetime' , 'E_UPDATED' ),
- 'RES_PERMS', vector ('EVENTS' , 0, 'varchar' , '(''110100000RR'')' ),
- 'RES_CONTENT', vector ('EVENTS' , 0, 'text' , 'E_DESCRIPTION' ),
- 'PROP_NAME', vector ('EVENTS' , 0, 'varchar' , '(''E_DESCRIPTION'')' ),
- 'PROP_VALUE', vector ('SYS_DAV_PROP', 1, 'text' , 'E_DESCRIPTION' ),
- 'RES_TAGS', vector ('all-tags' , 0, 'varchar' , 'E_TAGS' ), -- 'varchar', not 'text-tag' because there's no free-text on union
- 'RES_PUBLIC_TAGS', vector ('public-tags' , 0, 'varchar' , 'E_TAGS' ), -- 'varchar', not 'text-tag' because there's no free-text in table!
- 'RES_PRIVATE_TAGS', vector ('private-tags', 0, 'varchar' , 'E_TAGS' ), -- 'varchar', not 'text-tag' because there's no free-text in table!
- 'RDF_PROP', vector ('fake-prop' , 1, 'varchar' , NULL ),
- 'RDF_VALUE', vector ('fake-prop' , 2, 'XML' , NULL ),
- 'RDF_OBJ_VALUE', vector ('fake-prop' , 3, 'XML' , NULL )
- );
-}
-;
-
-create procedure "CalDAV_DAV_FC_TABLE_METAS" (inout table_metas any)
-{
- table_metas := vector (
- 'EVENTS' , vector ( '' ,
- '' ,
- 'E_SUBJECT' , 'E_SUBJECT' , '[__quiet] /' ),
- 'WA_INSTANCE' , vector ( '' ,
- '' ,
- 'WAI_NAME' , 'WAI_NAME' , '[__quiet] /' ),
- 'WA_MEMBER' , vector ( '' ,
- '' ,
- 'WAM_INST' , 'WAM_INST' , '[__quiet] /' ),
-
- 'SYS_USERS' , vector ( '' ,
- '' ,
- NULL , NULL , NULL ),
- 'public-tags' , vector ( ' ' ,
- '' ,
- 'E_TAGS' , 'E_TAGS' , NULL ),
- 'private-tags' , vector ( ' ' ,
- ' ' ,
- 'E_TAGS' , 'E_TAGS' , NULL ),
- 'all-tags' , vector ( ' ' ,
- ' ' ,
- 'E_TAGS' , 'E_TAGS' , NULL ),
- 'fake-prop' , vector ( '\n inner join WS.WS.SYS_DAV_PROP as ^{alias}^ on ((^{alias}^.PROP_PARENT_ID is null) and (^{alias}^.PROP_TYPE = ''R'')^{andpredicates}^)' ,
- '\n exists (select 1 from WS.WS.SYS_DAV_PROP as ^{alias}^ where (^{alias}^.PROP_PARENT_ID is null) and (^{alias}^.PROP_TYPE = ''R'')^{andpredicates}^)' ,
- 'PROP_VALUE' , 'PROP_VALUE' , '[__quiet __davprop xmlns:virt="virt"] fakepropthatprobablyneverexists' )
- );
-}
-;
-
-create function "CalDAV_DAV_FC_PRINT_WHERE" (inout filter any, in param_uid integer) returns varchar
-{
- -- dbg_obj_princ ('Blog_POST_DAV_FC_PRINT_WHERE (', filter, param_uid, ')');
- declare pred_metas, cmp_metas, table_metas any;
- declare used_tables any;
-
- "CalDAV_DAV_FC_PRED_METAS" (pred_metas);
- DAV_FC_CMP_METAS (cmp_metas);
- "CalDAV_DAV_FC_TABLE_METAS" (table_metas);
- used_tables := vector(
- 'EVENTS', vector ('EVENTS', '_top', null, vector (), vector (), vector ()),
- 'WA_INSTANCE', vector ('WA_INSTANCE', '_instances', null, vector (), vector (), vector ()),
- 'WA_MEMBER', vector ('WA_MEMBER', '_members', null, vector (), vector (), vector ()),
- 'SYS_USERS', vector ('SYS_USERS', '_users', null, vector (), vector (), vector ())
- );
- return DAV_FC_PRINT_WHERE_INT (filter, pred_metas, cmp_metas, table_metas, used_tables, param_uid);
-}
-;
-
---| When DAV_DIR_FILTER_INT calls DET function, authentication is performed before the call and compilation is initialized.
-create function "CalDAV_DAV_DIR_FILTER" (in detcol_id any, in path_parts any, in detcol_path any, inout compilation any, in recursive integer, in auth_uid integer) returns any
-{
- --dbg_obj_princ ('CalDAV_DAV_DIR_FILTER (', detcol_id, path_parts, detcol_path, compilation, recursive, auth_uid, ')');
- declare st, access, qry_text, execstate, execmessage varchar;
- declare res any;
- declare cond_list, execmeta, execrows any;
- declare sub, post_id, condtext, cond_key varchar;
- declare owner_gid, owner_uid, domain_id integer;
- CalDAV__ACCESS_PARAMS (detcol_id, access, owner_gid, owner_uid);
- vectorbld_init (res);
- sub := null;
- post_id := null;
- if (((length (path_parts) <= 1) and (recursive <> 1)) or (length (path_parts) > 2))
- {
- -- dbg_obj_princ ('\r\nGoto skip_post_level\r\n');
- goto finalize;
- }
- if (length (path_parts) >= 2)
- {
- sub := path_parts[0];
- if (sub = 'calendars')
- {
- domain_id := coalesce ((select C.WAI_ID
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = owner_uid
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_TYPE_NAME = 'Calendar'
- and CalDAV__FIXNAME(C.WAI_NAME) = path_parts[1]));
- if (domain_id is null)
- goto finalize;
- }
- else
- goto finalize;
- }
- cond_key := sprintf ('Calendar&%d', coalesce (domain_id, 0));
- condtext := get_keyword (cond_key, compilation);
- if (condtext is null and 0)
- {
- cond_list := get_keyword ('', compilation);
- if (sub is not null)
- cond_list := vector_concat (cond_list, vector ( vector ('E_DOMAIN_ID', '=', domain_id)));
- condtext := "CalDAV_DAV_FC_PRINT_WHERE" (cond_list, auth_uid);
- compilation := vector_concat (compilation, vector (cond_key, condtext));
- }
- execstate := '00000';
- qry_text := 'select concat (DAV_CONCAT_PATH (_param.detcolpath, ''calendar''), ''/'', CalDAV__FIXNAME (WAI_NAME), ''/'', CalDAV__COMPOSE_ICS_NAME (_top.E_UID)),
- ''R'', 1024, _top.E_UPDATED,
- vector (CalDAV__UNAME(), ?, _users.U_ID, 3, _top.E_DOMAIN_ID, 0, 0, 0, 0),
- ''110100000RR'', http_nogroup_gid(), _users.U_ID, _top.E_UPDATED, ''text/calendar'', CalDAV__COMPOSE_ICS_NAME (_top.E_UID)
- from
- (select top 1 ? as detcolpath from WS.WS.SYS_DAV_COL) as _param,
- CAL.WA.EVENTS as _top
- join DB.DBA.WA_INSTANCE as _instances on (WAI_ID = E_DOMAIN_ID and WAI_TYPE_NAME = ''Calendar'')
- join DB.DBA.WA_MEMBER as _members on (WAM_MEMBER_TYPE = 1 and WAM_INST = WAI_NAME)
- join DB.DBA.SYS_USERS as _users on (WAM_USER = U_ID and U_ID = ?)
- ' || condtext;
- exec (qry_text, execstate, execmessage,
- vector (detcol_id, detcol_path, owner_uid),
- 110100000, execmeta, execrows );
- if ('00000' <> execstate)
- signal (execstate, execmessage || ' in ' || qry_text);
- vectorbld_concat_acc (res, execrows);
-finalize:
- vectorbld_final (res);
- return res;
-}
-;
-
-create function "CalDAV_DAV_SEARCH_ID_IMPL" (
- in detcol_id any,
- in path_parts any,
- in what char(1),
- inout owner_uid integer,
- inout domain_id integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_SEARCH_ID_IMPL (', detcol_id, path_parts, what, owner_uid, domain_id, ')');
- declare owner_gid, ctr, len integer;
- declare hitlist any;
- declare access, colpath varchar;
-
- CalDAV__ACCESS_PARAMS (detcol_id, access, owner_gid, owner_uid);
- if (0 = length (path_parts))
- {
- if ('C' <> what)
- return -1;
-
- return vector (CalDAV__UNAME(), detcol_id, owner_uid, domain_id, 0, 0);
- }
- if ('' = path_parts[length (path_parts) - 1])
- {
- if ('C' <> what)
- return -1;
- }
- else
- {
- if ('R' <> what)
- return -1;
- }
- len := length (path_parts) - 1;
- ctr := 0;
- while (ctr < len)
- {
- if (ctr = 0)
- {
- hitlist := vector ();
- for (select C.WAI_ID as D_ID
- from SYS_USERS A,
- WA_MEMBER B,
- WA_INSTANCE C
- where A.U_ID = owner_uid
- and B.WAM_USER = A.U_ID
- and B.WAM_MEMBER_TYPE = 1
- and B.WAM_INST = C.WAI_NAME
- and C.WAI_TYPE_NAME = 'Calendar'
- and CalDAV__FIXNAME (C.WAI_NAME) = path_parts[ctr]) do
- {
- hitlist := vector_concat (hitlist, vector (D_ID));
- }
- if (length (hitlist) <> 1)
- return -1;
-
- domain_id := hitlist[0];
- }
- else if (ctr = 1 and len > 1)
- {
- return -1;
- }
- ctr := ctr + 1;
- }
- if ('C' = what)
- return vector (CalDAV__UNAME(), detcol_id, owner_uid, domain_id, 0, 0);
-
- hitlist := vector ();
- for (select distinct E_ID from CAL.WA.EVENTS where CalDAV__COMPOSE_ICS_NAME (E_UID) = path_parts[ctr] and E_DOMAIN_ID = domain_id) do
- {
- hitlist := vector_concat (hitlist, vector (E_ID));
- }
- if (length (hitlist) <> 1)
- return -1;
-
- return vector (CalDAV__UNAME(), detcol_id, owner_uid, domain_id, hitlist[0], 0);
-}
-;
-
---| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call.
-create function "CalDAV_DAV_SEARCH_ID" (in detcol_id any, in path_parts any, in what char(1)) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')');
- declare owner_uid, domain_id integer;
-
- return "CalDAV_DAV_SEARCH_ID_IMPL" (detcol_id, path_parts, what, owner_uid, domain_id);
-}
-;
-
---| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call.
-create function "CalDAV_DAV_SEARCH_PATH" (
- in id any,
- in what char(1)) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_SEARCH_PATH (', id, what, ')');
- declare path varchar;
- declare domain_id, item_id integer;
-
- path := DAV_SEARCH_PATH (id[1], 'C');
- domain_id := id[3];
- if (not exists (select 1 from DB.DBA.WA_INSTANCE where WAI_ID = domain_id))
- return null;
-
- path := path || CalDAV__FIXNAME (CAL.WA.domain_name (domain_id)) || '/';
- if ('C' = what)
- return path;
-
- item_id := id[4];
- for (select E_UID from CAL.WA.EVENTS where E_ID = item_id) do
- return path || CalDAV__COMPOSE_ICS_NAME (E_UID);
-
- return null;
-}
-;
-
---| When DAV_COPY_INT calls DET function, authentication and check for locks are performed before the call, but no check for existing/overwrite.
-create function "CalDAV_DAV_RES_UPLOAD_COPY" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_RES_UPLOAD_COPY (', detcol_id, path_parts, source_id, what, overwrite_flags, permissions, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| When DAV_COPY_INT calls DET function, authentication and check for locks are performed before the call, but no check for existing/overwrite.
-create function "CalDAV_DAV_RES_UPLOAD_MOVE" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_RES_UPLOAD_MOVE (', detcol_id, path_parts, source_id, what, overwrite_flags, auth_uid, ')');
- return -20;
-}
-;
-
---| When DAV_RES_CONTENT or DAV_RES_COPY_INT or DAV_RES_MOVE_INT calls DET function, authentication is made.
---| If content_mode is 1 then content is a valid output stream before the call.
-create function "CalDAV_DAV_RES_CONTENT" (in id any, inout content any, out type varchar, in content_mode integer) returns integer
-{
- --dbg_obj_princ ('CalDAV_DAV_RES_CONTENT (', id, ', content, type, ', content_mode, ')');
- if (id[4] < 0)
- {
- type := 'text/xml';
- if (id[4] = -1)
- content := CAL.WA.export_rss_sqlx_for_det (id[3], id[2]);
- if (id[4] = -2)
- content := CAL.WA.export_atom_sqlx_for_det (id[3], id[2]);
- if (id[4] = -3)
- content := CAL.WA.export_rdf_sqlx_for_det (id[3], id[2]);
- return 0;
- }
- declare tz integer;
-
- type := 'text/calendar';
- whenever not found goto endline;
- tz := timezone(now());
- if (id[4] is not null)
- {
- content := CAL.WA.det_export_vcal (id[3], tz, id[4]);
- }
-endline:
- return 0;
-}
-;
-
---| This adds an extra access path to the existing resource or collection.
-create function "CalDAV_DAV_SYMLINK" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_SYMLINK (', detcol_id, path_parts, source_id, overwrite, uid, gid, auth_uid, ')');
- return -20;
-}
-;
-
---| This gets a list of resources and/or collections as it is returned by DAV_DIR_LIST and and writes the list of quads (old_id, 'what', old_full_path, dereferenced_id, dereferenced_full_path).
-create function "CalDAV_DAV_DEREFERENCE_LIST" (in detcol_id any, inout report_array any) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_DEREFERENCE_LIST (', detcol_id, report_array, ')');
- return -20;
-}
-;
-
---| This gets one of reference quads returned by ..._DAV_REREFERENCE_LIST() and returns a record (new_full_path, new_dereferenced_full_path, name_may_vary).
-create function "CalDAV_DAV_RESOLVE_PATH" (in detcol_id any, inout reference_item any, inout old_base varchar, inout new_base varchar) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_RESOLVE_PATH (', detcol_id, reference_item, old_base, new_base, ')');
- return -20;
-}
-;
-
---| There's no API function to lock for a while (do we need such?) The "LOCK" DAV method checks that all parameters are valid but does not check for existing locks.
-create function "CalDAV_DAV_LOCK" (in path any, in id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_LOCK (', path, id, type, locktype, scope, token, owner_name, owned_tokens, depth, timeout_sec, owner_name, auth_uid, ')');
- if (isinteger (id) and (id = -1))
- return 1;
-
- return -20;
-}
-;
-
---| There's no API function to unlock for a while (do we need such?) The "UNLOCK" DAV method checks that all parameters are valid but does not check for existing locks.
-create function "CalDAV_DAV_UNLOCK" (in id any, in type char(1), in token varchar, in auth_uid integer)
-{
- -- dbg_obj_princ ('CalDAV_DAV_UNLOCK (', id, type, token, auth_uid, ')');
- return -27;
-}
-;
-
---| The caller does not check if id is valid.
---| This returns -1 if id is not valid, 0 if all existing locks are listed in owned_tokens whitespace-delimited list, 1 for soft 2 for hard lock.
-create function "CalDAV_DAV_IS_LOCKED" (inout id any, inout type char(1), in owned_tokens varchar) returns integer
-{
- -- dbg_obj_princ ('CalDAV_DAV_IS_LOCKED (', id, type, owned_tokens, ')');
- return 0;
-}
-;
-
---| The caller does not check if id is valid.
---| This returns -1 if id is not valid, list of tuples (LOCK_TYPE, LOCK_SCOPE, LOCK_TOKEN, LOCK_TIMEOUT, LOCK_OWNER, LOCK_OWNER_INFO) otherwise.
-create function "CalDAV_DAV_LIST_LOCKS" (in id any, in type char(1), in recursive integer) returns any
-{
- -- dbg_obj_princ ('CalDAV_DAV_LIST_LOCKS" (', id, type, recursive);
- return vector ();
-}
-;
-
-create function CalDAV__UNAME () returns any
-{
- return UNAME'CalDAV';
-}
-;
-
-create function CalDAV__FIXNAME (
- in name any) returns varchar
-{
- return
- replace (
- replace (
- replace (
- replace (
- replace (
- replace (
- replace (
- replace (
- replace (name, '/', '_'), '\\', '_'), ':', '_'), '+', '_'), '\"', '_'), '[', '_'), ']', '_'), '''', '_'), ' ', '_');
-}
-;
-
-create function CalDAV__COMPOSE_ICS_NAME (
- in uid varchar) returns varchar
-{
- return replace(sprintf('%s.ics', uid), '@', '-');
-}
-;
-
-create function CalDAV__ACCESS_PARAMS (
- in detcol_id any,
- out access varchar,
- out gid integer,
- out uid integer)
-{
- whenever not found goto ret;
-
- access := '110000000NN';
- gid := http_nogroup_gid ();
- uid := http_nobody_uid ();
- if (isinteger (detcol_id))
- select COL_PERMS, COL_GROUP, COL_OWNER into access, gid, uid from WS.WS.SYS_DAV_COL where COL_ID = detcol_id;
-
-ret: ;
-}
-;
-
-create procedure CAL.WA.det_export_vcal(
- in domain_id integer,
- in tz integer,
- in event_id integer)
-{
- declare S, url, tzID, tzName varchar;
- declare sStream any;
-
- tzID := sprintf ('GMT%s%04d', case when cast (tz as integer) < 0 then '-' else '+' end, tz);
- tzName := sprintf ('GMT %s%02d:00', case when cast (tz as integer) < 0 then '-' else '+' end, abs(floor (tz / 60)));
- sStream := string_output();
- -- start
- http ('BEGIN:VCALENDAR\r\n', sStream);
- http ('PRODID:-//OpenLink Software//OpenLink ODS Calendar 0.1//EN\r\n', sStream);
- http ('VERSION:2.0\r\n', sStream);
- http ('CALSCALE:GREGORIAN\r\n', sStream);
- http ('BEGIN:VTIMEZONE\r\n', sStream);
- http (sprintf ('TZID:%s\r\n', tzID), sStream);
- http ('BEGIN:STANDARD\r\n', sStream);
- http (sprintf ('TZOFFSETTO:%s\r\n', CAL.WA.tz_string (tz)), sStream);
- http (sprintf ('TZNAME:%s\r\n', tzName), sStream);
- http ('END:STANDARD\r\n', sStream);
- http ('END:VTIMEZONE\r\n', sStream);
- -- events
- for (select * from CAL.WA.EVENTS where E_DOMAIN_ID = domain_id and E_KIND = 0 and E_ID = event_id) do
- {
- http ('BEGIN:VEVENT\r\n', sStream);
- url := sprintf ('http://%s%s/%U/calendar/%U/Event/', SIOC.DBA.get_cname(), SIOC.DBA.get_base_path (), CAL.WA.domain_owner_name (domain_id), CAL.WA.domain_name (domain_id));
- CAL.WA.export_vcal_line ('UID', cast (E_UID as varchar), sStream);
- --CAL.WA.export_vcal_line ('URL', url || cast (E_ID as varchar), sStream);
- CAL.WA.export_vcal_line ('DTSTAMP', CAL.WA.vcal_date2utc (now ()), sStream);
- CAL.WA.export_vcal_line ('CREATED', CAL.WA.vcal_date2utc (E_CREATED), sStream);
- CAL.WA.export_vcal_line ('LAST-MODIFIED', CAL.WA.vcal_date2utc (E_UPDATED), sStream);
- CAL.WA.export_vcal_line ('SUMMARY', E_SUBJECT, sStream);
- CAL.WA.export_vcal_line ('DESCRIPTION', E_DESCRIPTION, sStream);
- CAL.WA.export_vcal_line ('LOCATION', E_LOCATION, sStream);
- --CAL.WA.export_vcal_line ('CATEGORIES', replace (E_TAGS, ',', ';'), sStream);
- if (E_EVENT_START is not null)
- CAL.WA.export_vcal_line ('DTSTART', CAL.WA.vcal_date2utc (E_EVENT_START), sStream);
- if (E_EVENT_END is not null)
- CAL.WA.export_vcal_line ('DTEND', CAL.WA.vcal_date2utc (E_EVENT_END), sStream);
- CAL.WA.export_vcal_line ('RRULE', CAL.WA.vcal_recurrence2str (E_REPEAT, E_REPEAT_PARAM1, E_REPEAT_PARAM2, E_REPEAT_PARAM3, E_REPEAT_UNTIL), sStream);
- --CAL.WA.export_vcal_line ('DALARM', CAL.WA.vcal_reminder2str (E_REMINDER), sStream);
- http ('END:VEVENT\r\n', sStream);
- }
- -- tasks
- for (select * from CAL.WA.EVENTS where E_DOMAIN_ID = domain_id and E_KIND = 1 and E_ID = event_id) do
- {
- http ('BEGIN:VTODO\r\n', sStream);
- url := sprintf ('http://%s%s/%U/calendar/%U/Task/', SIOC.DBA.get_cname(), SIOC.DBA.get_base_path (), CAL.WA.domain_owner_name (domain_id), CAL.WA.domain_name (domain_id));
- CAL.WA.export_vcal_line ('UID', cast (E_UID as varchar), sStream);
- --CAL.WA.export_vcal_line ('URL', url || cast (E_ID as varchar), sStream);
- CAL.WA.export_vcal_line ('DTSTAMP', CAL.WA.vcal_date2utc (now ()), sStream);
- CAL.WA.export_vcal_line ('CREATED', CAL.WA.vcal_date2utc (E_CREATED), sStream);
- CAL.WA.export_vcal_line ('LAST-MODIFIED', CAL.WA.vcal_date2utc (E_UPDATED), sStream);
- CAL.WA.export_vcal_line ('SUMMARY', E_SUBJECT, sStream);
- CAL.WA.export_vcal_line ('DESCRIPTION', E_DESCRIPTION, sStream);
- --CAL.WA.export_vcal_line ('CATEGORIES', replace (E_TAGS, ',', ';'), sStream);
- if (E_EVENT_START is not null)
- CAL.WA.export_vcal_line ('DTSTART', CAL.WA.vcal_date2utc (E_EVENT_START), sStream);
- if (E_EVENT_END is not null)
- CAL.WA.export_vcal_line ('DTEND', CAL.WA.vcal_date2utc (E_EVENT_END), sStream);
- CAL.WA.export_vcal_line ('PRIORITY', E_PRIORITY, sStream);
- CAL.WA.export_vcal_line ('STATUS', E_STATUS, sStream);
- http ('END:VTODO\r\n', sStream);
- }
- -- end
- http ('END:VCALENDAR\r\n', sStream);
- return string_output_string(sStream);
-}
-;
-
-create procedure CAL.WA.export_rss_sqlx_for_det (
- in domain_id integer,
- in account_id integer)
-{
- declare retValue any;
- declare qry_text any;
- retValue := string_output ();
-
- http ('<?xml version ="1.0" encoding="UTF-8"?>\n', retValue);
- http ('<rss version="2.0">\n', retValue);
- http ('<channel>\n', retValue);
-
- qry_text := (select
- XMLELEMENT('title', CAL.WA.utf2wide(CAL.WA.domain_name (domain_id))),
- XMLELEMENT('description', CAL.WA.utf2wide(CAL.WA.domain_description (domain_id))),
- XMLELEMENT('managingEditor', U_E_MAIL),
- XMLELEMENT('pubDate', CAL.WA.dt_rfc1123(now ())),
- XMLELEMENT('generator', 'Virtuoso Universal Server ' || sys_stat('st_dbms_ver')),
- XMLELEMENT('webMaster', U_E_MAIL),
- XMLELEMENT('link', CAL.WA.CalDAV_url (domain_id))
- from DB.DBA.SYS_USERS where U_ID = account_id);
-
- http (serialize_to_UTF8_xml(qry_text), retValue);
-
- qry_text := (select
- XMLAGG(XMLELEMENT('item',
- XMLELEMENT('title', CAL.WA.utf2wide (E_SUBJECT)),
- XMLELEMENT('description', CAL.WA.utf2wide (E_DESCRIPTION)),
- XMLELEMENT('guid', E_ID),
- XMLELEMENT('link', CAL.WA.event_url (domain_id, E_ID)),
- XMLELEMENT('pubDate', CAL.WA.dt_rfc1123 (E_UPDATED)),
- (select XMLAGG (XMLELEMENT ('category', TV_TAG)) from CAL..TAGS_VIEW where tags = E_TAGS),
- XMLELEMENT('http://www.openlinksw.com/ods/:modified', CAL.WA.dt_iso8601 (E_UPDATED))))
- from (select top 15
- E_SUBJECT,
- E_DESCRIPTION,
- E_UPDATED,
- E_TAGS,
- E_ID
- from
- CAL.WA.EVENTS
- where E_DOMAIN_ID = domain_id
- order by E_UPDATED desc) x );
-
- http (serialize_to_UTF8_xml(qry_text), retValue);
-
- http ('</channel>\n', retValue);
- http ('</rss>\n', retValue);
-
- retValue := string_output_string (retValue);
- return retValue;
-}
-;
-
-create procedure CAL.WA.export_atom_sqlx_for_det (
- in domain_id integer,
- in account_id integer)
-{
- declare xml_entity, xsltTemplate any;
- xsltTemplate := CAL.WA.xslt_full ('rss2atom03.xsl');
- if (CAL.WA.settings_atomVersion (CAL.WA.settings (account_id)) = '1.0')
- xsltTemplate := CAL.WA.xslt_full ('rss2atom.xsl');
-
- xml_entity := xtree_doc(CAL.WA.export_rss_sqlx_for_det (domain_id, account_id));
-
- xml_entity := xslt(xsltTemplate, xml_entity);
- return serialize_to_UTF8_xml(xml_entity);
-}
-;
-
-create procedure CAL.WA.export_rdf_sqlx_for_det (
- in domain_id integer,
- in account_id integer)
-{
- declare xml_entity, xsltTemplate any;
- xsltTemplate := CAL.WA.xslt_full ('rss2rdf.xsl');
- xml_entity := xtree_doc(CAL.WA.export_rss_sqlx_for_det (domain_id, account_id));
- xml_entity := xslt(xsltTemplate, xml_entity);
- return serialize_to_UTF8_xml(xml_entity);
-}
-;
-
diff --git a/appsrc/ODS-Calendar/sql/DET_Calendar.sql b/appsrc/ODS-Calendar/sql/DET_Calendar.sql
index d392caf..13b18fa 100644
--- a/appsrc/ODS-Calendar/sql/DET_Calendar.sql
+++ b/appsrc/ODS-Calendar/sql/DET_Calendar.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Calendar.sql,v 1.7.2.3 2012/03/08 10:46:15 source Exp $
+-- $Id: DET_Calendar.sql,v 1.7.2.2 2010/09/20 10:15:02 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/sql/calendar-a-api.sql b/appsrc/ODS-Calendar/sql/calendar-a-api.sql
index 749aa6c..d074cfd 100644
--- a/appsrc/ODS-Calendar/sql/calendar-a-api.sql
+++ b/appsrc/ODS-Calendar/sql/calendar-a-api.sql
@@ -1,10 +1,10 @@
--
--- $Id: calendar-a-api.sql,v 1.10.2.7 2012/03/08 10:46:15 source Exp $
+-- $Id: calendar-a-api.sql,v 1.10.2.6 2011/06/09 17:43:16 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Calendar/sql/calendar-a-code.sql b/appsrc/ODS-Calendar/sql/calendar-a-code.sql
index 9b148cf..f2cadb2 100644
--- a/appsrc/ODS-Calendar/sql/calendar-a-code.sql
+++ b/appsrc/ODS-Calendar/sql/calendar-a-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: calendar-a-code.sql,v 1.64.2.36 2012/03/12 14:25:17 source Exp $
+-- $Id: calendar-a-code.sql,v 1.64.2.33 2011/08/01 14:12:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
@@ -732,11 +732,6 @@ create procedure CAL.WA.domain_update (
path := home || 'Calendar' || '/';
DB.DBA.DAV_MAKE_DIR (path, account_id, null, '110100000N');
update WS.WS.SYS_DAV_COL set COL_DET = 'Calendar' where COL_ID = DAV_SEARCH_ID (path, 'C');
-
- path := home || 'calendars' || '/';
- DB.DBA.DAV_MAKE_DIR (path, account_id, null, '110100000N');
- update WS.WS.SYS_DAV_COL set COL_DET = 'CalDAV' where COL_ID = DAV_SEARCH_ID (path, 'C');
-
return 1;
}
;
@@ -892,15 +887,6 @@ create procedure CAL.WA.domain_sioc_url (
-------------------------------------------------------------------------------
--
-create procedure CAL.WA.domain_calDav_url (
- in domain_id integer)
-{
- return sprintf ('%s/DAV/home/%s/calendars/%s', CAL.WA.host_url (), CAL.WA.domain_owner_name (domain_id), DB.DBA.CalDAV__FIXNAME (CAL.WA.domain_name (domain_id)));
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure CAL.WA.page_url (
in domain_id integer,
in page varchar := null,
@@ -1770,18 +1756,6 @@ create procedure CAL.WA.strDecode (
-------------------------------------------------------------------------------
--
-create procedure CAL.WA.isVector (
- inout aVector any)
-{
- if (isarray (aVector) and not isstring (aVector))
- return 1;
-
- return 0;
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure CAL.WA.vector_unique(
inout aVector any,
in minLength integer := 0)
@@ -3354,10 +3328,9 @@ create procedure CAL.WA.d_encode (
create procedure CAL.WA.test_clear (
in S any)
{
- S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
- S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
+ declare N integer;
- return S;
+ return substring (S, 1, coalesce(strstr(S, '<>'), length (S)));
}
;
@@ -3521,7 +3494,7 @@ create procedure CAL.WA.validate2 (
if (isnull (regexp_match('^[^\\\/\?\*\"\'\>\<\:\|]*\$', propertyValue)))
goto _error;
} else if ((propertyType = 'uri') or (propertyType = 'anyuri')) {
- if (isnull (regexp_match('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:~]*)?\$', propertyValue)))
+ if (isnull (regexp_match('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:]*)?\$', propertyValue)))
goto _error;
} else if (propertyType = 'email') {
if (isnull (regexp_match('^([a-zA-Z0-9_\-])+(\.([a-zA-Z0-9_\-])+)*@((\[(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5]))\]))|((([a-zA-Z0-9])+(([\-])+([a-zA-Z0-9])+)*\.)+([a-zA-Z])+(([\-])+([a-zA-Z0-9])+)*))\$', propertyValue)))
@@ -4221,8 +4194,7 @@ create procedure CAL.WA.event_update_acl (
{
update CAL.WA.EVENTS
set E_ACL = acl
- where E_ID = id
- and E_PRIVACY = 2;
+ where E_ID = id;
}
;
@@ -5578,26 +5550,18 @@ create procedure CAL.WA.vcal_str2date (
tzID := cast (xquery_eval (xmlPath || '/TZID', xmlItem, 1) as varchar);
if (not isnull (tzID))
{
- tzObject := dict_get (tzDict, tzID, null);
- if (isnull (tzObject))
- goto _exit;
-
+ tzObject := dict_get (tzDict, tzID, 0);
tzOffset := get_keyword ('standartTo', tzObject);
- if (isnull (tzOffset))
- goto _exit;
-
tzStartRRule := get_keyword ('daylightRRule', tzObject);
- if (isnull (tzStartRRule))
- goto _exit;
-
+ if (not isnull (tzStartRRule))
+ {
tzEndRRule := get_keyword ('standartRRule', tzObject);
if (CAL.WA.event_daylightCheck (dt, tzStartRRule, tzEndRRule))
tzOffset := get_keyword ('daylightTo', tzObject);
-
+ }
dt := dateadd ('minute', tzOffset, dt);
}
}
-_exit:;
return dt;
}
;
@@ -5697,8 +5661,7 @@ create procedure CAL.WA.vcal_datetime2str (
create procedure CAL.WA.vcal_date2utc (
in dt datetime)
{
- return CAL.WA.dt_format (dt, 'YMDTHNSZ');
- --return CAL.WA.dt_format (dateadd ('minute', -timezone (now ()), dt), 'YMDTHNSZ');
+ return CAL.WA.dt_format (dateadd ('minute', -timezone (now ()), dt), 'YMDTHNSZ');
}
;
@@ -6071,24 +6034,16 @@ create procedure CAL.WA.export_vcal_line (
inout sStream any)
{
declare prefix varchar;
- declare tmp any;
if (is_empty_or_null (value))
return;
prefix := '';
- tmp := CAL.WA.utf2wide(sprintf ('%s:%s', property, replace(replace (cast (value as varchar), '\n', '\\n'), '\r', '')));
- while (length (tmp) > length (prefix))
+ value := sprintf ('%s:%s', property, replace (cast (value as varchar), '\n', '\\n'));
+ while (length (value) > length (prefix))
{
- http_escape(CAL.WA.wide2utf(subseq (tmp, 0, 60)) || '\r\n', 1, sStream, 1, 1);
- if (length (tmp) > 60)
- {
- tmp := prefix || subseq (tmp, 60);
- }
- else
- {
- tmp := '';
- }
+ http (subseq (value, 0, 73) || '\r\n', sStream);
+ value := prefix || subseq (value, 73);
prefix := ' ';
}
}
@@ -7087,10 +7042,6 @@ create procedure CAL.WA.syncml_check (
return 0;
if (VAD.DBA.version_compare (syncmlVersion, '1.05.75') < 0)
return 0;
- if (__proc_exists ('DB.DBA.yac_syncml_version_get') is null)
- return 0;
- if (__proc_exists ('DB.DBA.yac_syncml_type_get') is null)
- return 0;
if (isnull (syncmlPath))
return 1;
if (DB.DBA.yac_syncml_version_get (syncmlPath) = 'N')
@@ -7120,8 +7071,6 @@ create procedure CAL.WA.syncml_entry_update (
_syncmlPath := get_keyword ('name', _options);
if (not CAL.WA.syncml_check (_syncmlPath))
goto _skip;
- if ((_event_kind = 0) and (get_keyword ('events', _options, 0) = 0))
- goto _skip;
if ((_event_kind = 1) and (get_keyword ('tasks', _options, 0) = 0))
goto _skip;
@@ -7153,15 +7102,17 @@ create procedure CAL.WA.syncml_entry_update_internal (
_content := CAL.WA.entry2syncml (_domain_id, _event_id);
_permissions := USER_GET_OPTION (_user, 'PERMISSIONS');
if (isnull (_permissions))
+ {
_permissions := '110100000RR';
-
+ }
connection_set ('__sync_dav_upl', '1');
connection_set ('__sync_ods', '1');
- DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_path, _content, 'text/x-vcalendar', _permissions, _user, _user, null, null, 0);
+ DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_path, _content, 'text/x-vcalendar', _permissions, http_dav_uid (), http_dav_uid () + 1, null, null, 0);
connection_set ('__sync_ods', '0');
connection_set ('__sync_dav_upl', '0');
}
- else if (_action = 'D')
+
+ if (_action = 'D')
{
declare _id integer;
@@ -7169,7 +7120,7 @@ create procedure CAL.WA.syncml_entry_update_internal (
if (isinteger(_id) and (_id > 0))
{
connection_set ('__sync_ods', '1');
- DB.DBA.DAV_DELETE_INT (_path, 1, _user, _password, 0);
+ DB.DBA.DAV_DELETE (_path, 1, _user, _password);
connection_set ('__sync_ods', '0');
}
}
@@ -8490,3 +8441,60 @@ create procedure CAL.WA.news_comment_get_cn_type (in f_name varchar)
return ext;
}
;
+
+-------------------------------------------------------------------------------
+--
+create procedure CAL.WA.obj2json (
+ in o any,
+ in d integer := 2)
+{
+ declare N, M integer;
+ declare R, T any;
+ declare retValue any;
+
+ if (d = 0)
+ return '[maximum depth achieved]';
+
+ T := vector ('\b', '\\b', '\t', '\\t', '\n', '\\n', '\f', '\\f', '\r', '\\r', '"', '\\"', '\\', '\\\\');
+ retValue := '';
+ if (isnumeric (o))
+ {
+ retValue := cast (o as varchar);
+ }
+ else if (isstring (o))
+ {
+ for (N := 0; N < length(o); N := N + 1)
+ {
+ R := chr (o[N]);
+ for (M := 0; M < length(T); M := M + 2)
+ {
+ if (R = T[M])
+ R := T[M+1];
+ }
+ retValue := retValue || R;
+ }
+ retValue := '"' || retValue || '"';
+ }
+ else if (isarray (o))
+ {
+ retValue := '[';
+ for (N := 0; N < length(o); N := N + 1)
+ {
+ retValue := retValue || CAL.WA.obj2json (o[N], d-1);
+ if (N <> length(o)-1)
+ retValue := retValue || ',\n';
+ }
+ retValue := retValue || ']';
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure CAL.WA.json2obj (
+ in o any)
+{
+ return json_parse (o);
+}
+;
diff --git a/appsrc/ODS-Calendar/sql/calendar-a-table.sql b/appsrc/ODS-Calendar/sql/calendar-a-table.sql
index 920172c..f2a7536 100644
--- a/appsrc/ODS-Calendar/sql/calendar-a-table.sql
+++ b/appsrc/ODS-Calendar/sql/calendar-a-table.sql
@@ -1,10 +1,10 @@
--
--- $Id: calendar-a-table.sql,v 1.26.2.8 2012/03/08 12:14:09 source Exp $
+-- $Id: calendar-a-table.sql,v 1.26.2.6 2011/05/17 22:59:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
@@ -111,7 +111,7 @@ CAL.WA.exec_no_error ('
--
create procedure CAL.WA.my_calendars (
in domain_id any,
- in privacy integer)
+ in privacy varchar)
{
declare calendar_id, calendar_privacy integer;
@@ -475,7 +475,6 @@ CAL.WA.exec_no_error ('
CAL.WA.upstream_event_update (N.E_DOMAIN_ID, N.E_ID, _uid, N.E_TAGS, \'U\');
CAL.WA.exchange_event_update (N.E_DOMAIN_ID);
CAL.WA.syncml_entry_update (N.E_DOMAIN_ID, N.E_ID, _uid, N.E_KIND, \'U\');
- CAL.WA.domain_ping (N.E_DOMAIN_ID);
}
');
@@ -486,9 +485,8 @@ CAL.WA.exec_no_error ('
delete from CAL.WA.ALARMS where A_EVENT_ID = O.E_ID;
CAL.WA.upstream_event_update (O.E_DOMAIN_ID, O.E_ID, O.E_UID, O.E_TAGS, \'D\');
- CAL.WA.exchange_event_update (O.E_DOMAIN_ID);
+ CAL.WA.exchange_event_update (N.E_DOMAIN_ID);
CAL.WA.syncml_entry_update (O.E_DOMAIN_ID, O.E_ID, O.E_UID, O.E_KIND, \'D\');
- CAL.WA.domain_ping (O.E_DOMAIN_ID);
}
');
diff --git a/appsrc/ODS-Calendar/sql/calendar-a-update.sql b/appsrc/ODS-Calendar/sql/calendar-a-update.sql
index 54a45ab..83d3693 100644
--- a/appsrc/ODS-Calendar/sql/calendar-a-update.sql
+++ b/appsrc/ODS-Calendar/sql/calendar-a-update.sql
@@ -1,10 +1,10 @@
--
--- $Id: calendar-a-update.sql,v 1.1.2.4 2012/03/08 10:46:15 source Exp $
+-- $Id: calendar-a-update.sql,v 1.1.2.3 2010/10/07 13:23:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Calendar/sql/calendar-a-wa.sql b/appsrc/ODS-Calendar/sql/calendar-a-wa.sql
index 3229f24..8438653 100644
--- a/appsrc/ODS-Calendar/sql/calendar-a-wa.sql
+++ b/appsrc/ODS-Calendar/sql/calendar-a-wa.sql
@@ -1,10 +1,10 @@
--
--- $Id: calendar-a-wa.sql,v 1.8.2.6 2012/03/08 10:46:15 source Exp $
+-- $Id: calendar-a-wa.sql,v 1.8.2.5 2010/09/22 13:57:03 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/sql/calendar-d.sql b/appsrc/ODS-Calendar/sql/calendar-d.sql
index 811f90c..6523f8a 100644
--- a/appsrc/ODS-Calendar/sql/calendar-d.sql
+++ b/appsrc/ODS-Calendar/sql/calendar-d.sql
@@ -1,10 +1,10 @@
--
--- $Id: calendar-d.sql,v 1.12.2.8 2012/03/08 10:46:15 source Exp $
+-- $Id: calendar-d.sql,v 1.12.2.7 2011/06/02 12:32:02 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/sql/sioc_calendar.sql b/appsrc/ODS-Calendar/sql/sioc_calendar.sql
index e95a87b..2c328fd 100644
--- a/appsrc/ODS-Calendar/sql/sioc_calendar.sql
+++ b/appsrc/ODS-Calendar/sql/sioc_calendar.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_calendar.sql,v 1.19.2.13 2012/03/08 12:14:09 source Exp $
+-- $Id: sioc_calendar.sql,v 1.19.2.11 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
@@ -106,14 +106,13 @@ create procedure fill_ods_calendar_sioc (
in _wai_name varchar := null)
{
declare id, deadl, cnt integer;
- declare acl_graph_iri, c_iri, creator_iri, iri varchar;
+ declare c_iri, creator_iri, iri varchar;
{
-- init services
SIOC..fill_ods_calendar_services ();
for (select WAI_ID,
- WAI_IS_PUBLIC,
WAI_TYPE_NAME,
WAI_NAME,
WAI_ACL
@@ -121,9 +120,9 @@ create procedure fill_ods_calendar_sioc (
where ((_wai_name is null) or (WAI_NAME = _wai_name))
and WAI_TYPE_NAME = 'Calendar') do
{
- acl_graph_iri := SIOC..acl_graph (WAI_TYPE_NAME, WAI_NAME);
- exec (sprintf ('sparql clear graph <%s>', acl_graph_iri));
- SIOC..wa_instance_acl_insert (WAI_IS_PUBLIC, WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
+ graph_iri := SIOC..acl_graph (WAI_TYPE_NAME, WAI_NAME);
+ exec (sprintf ('sparql clear graph <%s>', graph_iri));
+ SIOC..wa_instance_acl_insert (WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
for (select E_DOMAIN_ID, E_ID, E_ACL
from CAL.WA.EVENTS
where E_DOMAIN_ID = WAI_ID and E_ACL is not null) do
@@ -202,7 +201,51 @@ create procedure fill_ods_calendar_sioc (
E_UPDATED,
E_TAGS,
E_NOTES);
-
+ for (select EC_ID,
+ EC_DOMAIN_ID,
+ EC_EVENT_ID,
+ EC_TITLE,
+ EC_COMMENT,
+ EC_UPDATED,
+ EC_U_NAME,
+ EC_U_MAIL,
+ EC_U_URL
+ from CAL.WA.EVENT_COMMENTS
+ where EC_EVENT_ID = E_ID) do
+ {
+ calendar_comment_insert (graph_iri,
+ c_iri,
+ EC_ID,
+ EC_DOMAIN_ID,
+ EC_EVENT_ID,
+ EC_TITLE,
+ EC_COMMENT,
+ EC_UPDATED,
+ EC_U_NAME,
+ EC_U_MAIL,
+ EC_U_URL);
+ }
+ for (select A_ID,
+ A_DOMAIN_ID,
+ A_OBJECT_ID,
+ A_AUTHOR,
+ A_BODY,
+ A_CLAIMS,
+ A_CREATED,
+ A_UPDATED
+ from CAL.WA.ANNOTATIONS
+ where A_OBJECT_ID = E_ID) do
+ {
+ cal_annotation_insert (graph_iri,
+ A_ID,
+ A_DOMAIN_ID,
+ A_OBJECT_ID,
+ A_AUTHOR,
+ A_BODY,
+ A_CLAIMS,
+ A_CREATED,
+ A_UPDATED);
+ }
cnt := cnt + 1;
if (mod (cnt, 500) = 0)
{
@@ -280,57 +323,6 @@ create procedure fill_ods_calendar_services ()
-------------------------------------------------------------------------------
--
-create procedure clean_ods_calendar_sioc (
- in _wai_name varchar := null,
- in _access_mode integer := null)
-{
- declare id, deadl, cnt integer;
- declare acl_graph_iri, c_iri, creator_iri, iri varchar;
-
- {
- id := -1;
- deadl := 3;
- cnt := 0;
- declare exit handler for sqlstate '40001'
- {
- if (deadl <= 0)
- resignal;
- rollback work;
- deadl := deadl - 1;
- goto L0;
- };
- L0:
-
- for (select E_ID,
- E_DOMAIN_ID,
- E_TAGS
- from DB.DBA.WA_INSTANCE,
- DB.DBA.WA_MEMBER,
- CAL.WA.EVENTS
- where WAM_INST = WAI_NAME
- and ((WAM_IS_PUBLIC = 1 and _wai_name is null) or WAI_NAME = _wai_name)
- and E_DOMAIN_ID = WAI_ID
- and E_PRIVACY = 1
- order by E_ID) do
- {
- event_delete (E_ID,
- E_DOMAIN_ID,
- E_TAGS);
-
- cnt := cnt + 1;
- if (mod (cnt, 500) = 0)
- {
- commit work;
- id := E_ID;
- }
- }
- commit work;
- }
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure ods_calendar_services (
in graph_iri varchar,
in forum_iri varchar,
@@ -463,9 +455,6 @@ create procedure event_insert (
-- task services
SIOC..ods_object_services_attach (graph_iri, iri, 'calendar/task');
-
- SIOC..calendar_comments_insert (graph_iri, c_iri, domain_id, event_id);
- SIOC..cal_annotations_insert (graph_iri, domain_id, event_id);
}
}
;
@@ -493,9 +482,6 @@ create procedure event_delete (
-- event services
SIOC..ods_object_services_dettach (graph_iri, iri, 'calendar/event');
SIOC..ods_object_services_dettach (graph_iri, iri, 'calendar/task');
-
- SIOC..calendar_comments_delete (graph_iri, domain_id, event_id);
- SIOC..cal_annotations_delete (graph_iri, domain_id, event_id);
}
;
@@ -666,62 +652,6 @@ create trigger EVENTS_SIOC_ACL_D before delete on CAL.WA.EVENTS order 100 refere
-------------------------------------------------------------------------------
--
-create procedure calendar_comments_insert (
- in graph_iri varchar,
- in forum_iri varchar,
- inout domain_id integer,
- inout master_id integer)
-{
- for (select EC_ID,
- EC_DOMAIN_ID,
- EC_EVENT_ID,
- EC_TITLE,
- EC_COMMENT,
- EC_UPDATED,
- EC_U_NAME,
- EC_U_MAIL,
- EC_U_URL
- from CAL.WA.EVENT_COMMENTS
- where EC_EVENT_ID = master_id) do
- {
- calendar_comment_insert (graph_iri,
- forum_iri,
- EC_ID,
- EC_DOMAIN_ID,
- EC_EVENT_ID,
- EC_TITLE,
- EC_COMMENT,
- EC_UPDATED,
- EC_U_NAME,
- EC_U_MAIL,
- EC_U_URL);
- }
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure calendar_comments_delete (
- in graph_iri varchar,
- inout domain_id integer,
- inout master_id integer)
-{
- for (select EC_ID,
- EC_DOMAIN_ID,
- EC_EVENT_ID
- from CAL.WA.EVENT_COMMENTS
- where EC_EVENT_ID = master_id) do
- {
- calendar_comment_delete (graph_iri,
- EC_DOMAIN_ID,
- EC_EVENT_ID,
- EC_ID);
- }
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure calendar_comment_insert (
in graph_iri varchar,
in forum_iri varchar,
@@ -792,7 +722,7 @@ create procedure calendar_comment_delete (
};
master_iri := SIOC..calendar_event_iri (domain_id, master_id);
if (isnull (graph_iri))
- graph_iri := SIOC..get_graph_new (CAL.WA.domain_is_public (domain_id), master_iri);
+ graph_iri := SIOC..get_graph_new (domain_id, null, master_iri);
if (isnull (graph_iri))
return;
@@ -860,61 +790,6 @@ create trigger EVENT_COMMENTS_SIOC_D before delete on CAL.WA.EVENT_COMMENTS refe
-------------------------------------------------------------------------------
--
-create procedure cal_annotations_insert (
- in graph_iri varchar,
- inout domain_id integer,
- inout master_id integer)
-{
- for (select A_ID,
- A_DOMAIN_ID,
- A_OBJECT_ID,
- A_AUTHOR,
- A_BODY,
- A_CLAIMS,
- A_CREATED,
- A_UPDATED
- from CAL.WA.ANNOTATIONS
- where A_OBJECT_ID = master_id) do
- {
- cal_annotation_insert (graph_iri,
- A_ID,
- A_DOMAIN_ID,
- A_OBJECT_ID,
- A_AUTHOR,
- A_BODY,
- A_CLAIMS,
- A_CREATED,
- A_UPDATED);
- }
-}
-;
-
--------------------------------------------------------------------------------
---
-create procedure cal_annotations_delete (
- in graph_iri varchar,
- inout domain_id integer,
- inout master_id integer)
-{
- for (select A_ID,
- A_DOMAIN_ID,
- A_OBJECT_ID,
- A_CLAIMS
- from CAL.WA.ANNOTATIONS
- where A_OBJECT_ID = master_id) do
- {
- cal_annotation_delete (graph_iri,
- A_DOMAIN_ID,
- A_OBJECT_ID,
- A_ID,
- A_CLAIMS
- );
- }
-}
-;
-
--------------------------------------------------------------------------------
---
create procedure cal_annotation_insert (
in graph_iri varchar,
inout annotation_id integer,
diff --git a/appsrc/ODS-Calendar/vad_version b/appsrc/ODS-Calendar/vad_version
deleted file mode 100644
index 59c4af2..0000000
--- a/appsrc/ODS-Calendar/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.10.52
diff --git a/appsrc/ODS-Calendar/www/ajax.vsp b/appsrc/ODS-Calendar/www/ajax.vsp
index b93dea2..a045bc7 100644
--- a/appsrc/ODS-Calendar/www/ajax.vsp
+++ b/appsrc/ODS-Calendar/www/ajax.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ajax.vsp,v 1.2.2.4 2012/03/08 12:14:09 source Exp $
+-- $Id: ajax.vsp,v 1.2.2.2 2010/09/20 10:15:03 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
@@ -38,8 +38,8 @@
{
if (subAction = 'list')
{
- declare id, cTimeZone integer;
- declare cDateFormat, cTimeFormat varchar;
+ declare id integer;
+ declare cTimeZone, cDateFormat, cTimeFormat varchar;
declare cTimeNow datetime;
declare settings, sStream, x any;
diff --git a/appsrc/ODS-Calendar/www/annotea.vspx b/appsrc/ODS-Calendar/www/annotea.vspx
index 03429e5..7d5f0cf 100644
--- a/appsrc/ODS-Calendar/www/annotea.vspx
+++ b/appsrc/ODS-Calendar/www/annotea.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: annotea.vspx,v 1.7.2.9 2012/03/08 12:14:09 source Exp $
+ - $Id: annotea.vspx,v 1.7.2.7 2011/07/04 10:05:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -106,7 +106,7 @@
declare id, iri any;
id := row.te_column_value('A_ID');
- iri := CAL.WA.url_fix (SIOC..calendar_annotation_iri (self.domain_id, self.v_oid, id), self.v_sid, self.v_realm);
+ iri := AB.WA.url_fix (SIOC..calendar_annotation_iri (self.domain_id, self.v_oid, id), self.v_sid, self.v_realm);
http (sprintf ('<a href="%V">', iri));
self.showTDValue (id, row.te_column_value('A_AUTHOR'));
http ('</a>');
diff --git a/appsrc/ODS-Calendar/www/attendees.vspx b/appsrc/ODS-Calendar/www/attendees.vspx
index 804bfd0..c3f4d76 100644
--- a/appsrc/ODS-Calendar/www/attendees.vspx
+++ b/appsrc/ODS-Calendar/www/attendees.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: attendees.vspx,v 1.2.2.5 2012/03/08 10:46:15 source Exp $
+ - $Id: attendees.vspx,v 1.2.2.4 2011/03/08 13:25:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Calendar/www/calendar_login.vspx b/appsrc/ODS-Calendar/www/calendar_login.vspx
index 296e5e7..09c162b 100644
--- a/appsrc/ODS-Calendar/www/calendar_login.vspx
+++ b/appsrc/ODS-Calendar/www/calendar_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: calendar_login.vspx,v 1.4.2.6 2012/03/08 10:46:15 source Exp $
+ - $Id: calendar_login.vspx,v 1.4.2.5 2010/10/07 13:23:19 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/calendars.vspx b/appsrc/ODS-Calendar/www/calendars.vspx
index 9d0fc0d..44ea3af 100644
--- a/appsrc/ODS-Calendar/www/calendars.vspx
+++ b/appsrc/ODS-Calendar/www/calendars.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: calendars.vspx,v 1.3.2.6 2012/03/08 10:46:15 source Exp $
+ - $Id: calendars.vspx,v 1.3.2.5 2011/05/17 22:59:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/contacts.vspx b/appsrc/ODS-Calendar/www/contacts.vspx
index c25c147..830ec44 100644
--- a/appsrc/ODS-Calendar/www/contacts.vspx
+++ b/appsrc/ODS-Calendar/www/contacts.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: contacts.vspx,v 1.2.2.6 2012/03/08 10:46:15 source Exp $
+ - $Id: contacts.vspx,v 1.2.2.5 2011/05/17 22:59:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/conversation.vspx b/appsrc/ODS-Calendar/www/conversation.vspx
index a30d5fb..058fb7c 100644
--- a/appsrc/ODS-Calendar/www/conversation.vspx
+++ b/appsrc/ODS-Calendar/www/conversation.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: conversation.vspx,v 1.3.2.5 2012/03/08 10:46:15 source Exp $
+ - $Id: conversation.vspx,v 1.3.2.4 2011/05/02 14:16:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/css/style.css b/appsrc/ODS-Calendar/www/css/style.css
index 5c64600..3fe74a7 100644
--- a/appsrc/ODS-Calendar/www/css/style.css
+++ b/appsrc/ODS-Calendar/www/css/style.css
@@ -1,10 +1,10 @@
/*
- * $Id: style.css,v 1.23.2.15 2012/03/08 12:14:09 source Exp $
+ * $Id: style.css,v 1.23.2.13 2011/05/17 22:59:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
@@ -27,14 +27,6 @@ body {
font-size: 9pt;
}
-pre {
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
form {
margin: 0;
padding: 0;
@@ -82,7 +74,45 @@ a:hover {
vertical-align: top;
}
+/* Footer */
+#FT {
+ width: 100%;
+ position: relative;
+ bottom: 0px;
+ font-size: 8pt;
+ float: left;
+ clear: both;
+ text-align: right;
+ border-top: 2px solid #fff;
+ margin-right: 10px;
+ background-color: #fff;
+ background-image: url(../image/ods_main_footer.png);
+}
+
+#FT_L {
+ float: left;
+ clear: left;
+ margin-top: 10px;
+ margin-left: 8px;
+ border: 1px solid #788;
+}
+
+#FT_R {
+ float: right;
+ clear: right;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ margin-right: 5px;
+ color: #788;
+}
+
+#FT_R a {
+ text-decoration: none;
+ color: inherit;
+}
+
/* Left side within MT */
+
.page_head {
width: 100%;
background-color: #b0cde4;
diff --git a/appsrc/ODS-Calendar/www/error.vspx b/appsrc/ODS-Calendar/www/error.vspx
index ec50181..133517f 100644
--- a/appsrc/ODS-Calendar/www/error.vspx
+++ b/appsrc/ODS-Calendar/www/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.5.2.3 2012/03/08 10:46:15 source Exp $
+ - $Id: error.vspx,v 1.5.2.2 2010/09/20 10:15:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/export.vspx b/appsrc/ODS-Calendar/www/export.vspx
index 39887bb..1a44d27 100644
--- a/appsrc/ODS-Calendar/www/export.vspx
+++ b/appsrc/ODS-Calendar/www/export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: export.vspx,v 1.1.2.5 2012/03/08 10:46:15 source Exp $
+ - $Id: export.vspx,v 1.1.2.4 2010/09/20 10:15:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/gems.vsp b/appsrc/ODS-Calendar/www/gems.vsp
index 5b16c28..4e16a86 100644
--- a/appsrc/ODS-Calendar/www/gems.vsp
+++ b/appsrc/ODS-Calendar/www/gems.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: gems.vsp,v 1.3.2.4 2012/03/08 10:46:15 source Exp $
+-- $Id: gems.vsp,v 1.3.2.3 2010/10/07 13:23:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Calendar/www/help.vspx b/appsrc/ODS-Calendar/www/help.vspx
index 17a8328..66b1701 100644
--- a/appsrc/ODS-Calendar/www/help.vspx
+++ b/appsrc/ODS-Calendar/www/help.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: help.vspx,v 1.2.2.2 2012/03/08 10:46:15 source Exp $
+ - $Id: help.vspx,v 1.2.2.1 2010/09/20 10:15:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/home.vspx b/appsrc/ODS-Calendar/www/home.vspx
index 25b9d5a..dd4851d 100644
--- a/appsrc/ODS-Calendar/www/home.vspx
+++ b/appsrc/ODS-Calendar/www/home.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: home.vspx,v 1.60.2.38 2012/03/08 12:14:09 source Exp $
+ - $Id: home.vspx,v 1.60.2.36 2011/07/04 10:05:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -3140,7 +3140,7 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" name="e_create_new" value="Create and New" enabled="--case when (self.cAction = 'create') then 1 else 0 end" xhtml_class="form-button" xhtml_onclick="return validateInputs(this);">
+ <v:button action="simple" name="e_create_new" value="Create and New" enabled="--case when ((self.cScope = 'events') and (self.cAction = 'create')) then 1 else 0 end" xhtml_class="form-button" xhtml_onclick="return validateInputs(this);">
<v:on-post>
<![CDATA[
self.saveEvent ();
@@ -3739,7 +3739,7 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" name="t_create_new" value="Create and New" enabled="--case when (self.cAction = 'create') then 1 else 0 end" xhtml_class="form-button">
+ <v:button action="simple" name="t_create_new" value="Create and New" enabled="--case when ((self.cScope = 'tasks') and (self.cAction = 'create')) then 1 else 0 end" xhtml_class="form-button">
<v:on-post>
<![CDATA[
self.saveTask ();
@@ -4844,12 +4844,14 @@
</th>
<td>
<v:text name="exc_options_name" xhtml_id="exc_options_name" value="--get_keyword ('name', self.ve_options)" xhtml_size="60" />
- <input type="button" id="exc_options_name_button" value="Browse..." onclick="davBrowse ('exc_options_name', <?V case when (self.cAction in ('syncmlCreate', 'syncmlUpdate')) then 'true' else 'false' end ?>);" style="display: <?V case when (get_keyword ('type', self.ve_options, 1) <> 1) then 'none' else '' end ?>" />
+ <vm:if test="self.cAction not in ('syncmlCreate', 'syncmlUpdate')">
+ <input type="button" id="exc_options_name_button" value="Browse..." onclick="davBrowse ('exc_options_name');" style="display: <?V case when (get_keyword ('type', self.ve_options, 1) <> 1) then 'none' else '' end ?>;" />
<![CDATA[
<script type="text/javascript">
OAT.Loader.load(['dav'], function(){OAT.WebDav.init(davOptions);});
</script>
]]>
+ </vm:if>
</td>
</tr>
<tr>
@@ -5798,20 +5800,15 @@
]]>
</v:on-post>
</v:button>
- <v:button name="sp_clear" action="simple" value="Clear" xhtml_onclick="javascript: return confirm (\'Do you want to reset settings to default?\');" xhtml_class="form-button">
+ <v:button name="sp_clear" action="simple" value="Clear" xhtml_class="form-button">
<v:on-post>
<![CDATA[
- declare tmp any;
-
delete from CAL.WA.SETTINGS where S_DOMAIN_ID = self.domain_id;
CAL.WA.nntp_update (self.domain_id, null, null, 1, 0);
- commit work;
- self.settings := CAL.WA.settings (self.domain_id);
- CAL.WA.settings_init (self.settings);
- self.settings := CAL.WA.set_keyword ('app', self.settings, DB.DBA.WA_USER_APP_ENABLE (self.account_id));
- tmp := CAL.WA.settings_usedTimeZone (self.domain_id, self.owner_id);
- CAL.WA.set_keyword ('usedTimeZone', self.settings, tmp);
+ commit work;
+ self.settings := vector ();
+ self.initData ();
self.vc_data_bind(e);
]]>
diff --git a/appsrc/ODS-Calendar/www/js/calendar.js b/appsrc/ODS-Calendar/www/js/calendar.js
index 5d307ea..fbba868 100644
--- a/appsrc/ODS-Calendar/www/js/calendar.js
+++ b/appsrc/ODS-Calendar/www/js/calendar.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
@@ -826,17 +826,13 @@ function dismissReminder(prefix, mode) {
reminderDialog.hide ();
}
-function davBrowse(fld, folders) {
- /* load stylesheets */
- OAT.Style.include("grid.css");
- OAT.Style.include("webdav.css");
-
+function davBrowse(fld) {
var options = {
mode : 'browser',
- onConfirmClick: function(path, fname) {$(fld).value = '/DAV' + path + fname;}
+ onConfirmClick : function(path, fname) {
+ $(fld).value = '/DAV' + path + fname;
+ }
};
- if (!folders) {folders = false;}
- OAT.WebDav.options.foldersOnly = folders;
OAT.WebDav.open(options);
}
diff --git a/appsrc/ODS-Calendar/www/logs.vspx b/appsrc/ODS-Calendar/www/logs.vspx
index 597c7fe..9959f49 100644
--- a/appsrc/ODS-Calendar/www/logs.vspx
+++ b/appsrc/ODS-Calendar/www/logs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: logs.vspx,v 1.1.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: logs.vspx,v 1.1.2.2 2011/05/17 22:59:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/message.vspx b/appsrc/ODS-Calendar/www/message.vspx
index 12dcf0a..e9cb110 100644
--- a/appsrc/ODS-Calendar/www/message.vspx
+++ b/appsrc/ODS-Calendar/www/message.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: message.vspx,v 1.1.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: message.vspx,v 1.1.2.1 2010/09/20 10:15:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/tags.vspx b/appsrc/ODS-Calendar/www/tags.vspx
index 8fd41c2..37bf330 100644
--- a/appsrc/ODS-Calendar/www/tags.vspx
+++ b/appsrc/ODS-Calendar/www/tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tags.vspx,v 1.3.2.5 2012/03/08 10:46:16 source Exp $
+ - $Id: tags.vspx,v 1.3.2.4 2011/05/17 22:59:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/template/popup.vspx b/appsrc/ODS-Calendar/www/template/popup.vspx
index d58252e..ae26a34 100644
--- a/appsrc/ODS-Calendar/www/template/popup.vspx
+++ b/appsrc/ODS-Calendar/www/template/popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: popup.vspx,v 1.11.2.12 2012/03/08 10:46:16 source Exp $
+ - $Id: popup.vspx,v 1.11.2.11 2011/07/04 10:05:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/www/template/template.vspx b/appsrc/ODS-Calendar/www/template/template.vspx
index 0e75f6f..3b87ba4 100644
--- a/appsrc/ODS-Calendar/www/template/template.vspx
+++ b/appsrc/ODS-Calendar/www/template/template.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.vspx,v 1.29.2.21 2012/03/08 12:14:09 source Exp $
+ - $Id: template.vspx,v 1.29.2.19 2011/07/04 10:05:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -40,7 +40,6 @@
http (sprintf('\n <link rel="alternate" type="application/atom+xml" title="%V Atom" href="%s" />', domainName, CAL.WA.gems_url (self.domain_id)||'Calendar.atom'));
http (sprintf('\n <link rel="alternate" type="application/atomserv+xml" title="%V" href="%s/intro" />', domainName, CAL.WA.atom_lpath2 (self.domain_id)));
http (sprintf('\n <link rel="alternate" type="text/calendar" title="%V" href="%s/gems/calendar.ics" />', domainName, CAL.WA.domain_sioc_url (self.domain_id)));
- http (sprintf('\n <link rel="alternate" type="text/icalendar" title="%V CalDAV" href="%s" />', domainName, CAL.WA.domain_calDav_url (self.domain_id)));
http (CAL.WA.geo_url (self.domain_id, self.account_id));
SIOC..rdf_links_header (self.rdf_iri);
@@ -68,6 +67,11 @@
connectionHeaders: {Authorization: '<?V CAL.WA.account_basicAuthorization (self.account_id) ?>'}
};
+ /* load stylesheets */
+ OAT.Style.include("grid.css");
+ OAT.Style.include("webdav.css");
+ OAT.Style.include("winms.css");
+
var featureList=["ajax", "json", "anchor", "dialog", "color", "calendar"];
OAT.Loader.load(featureList);
</script>
diff --git a/appsrc/ODS-Calendar/www/template/template.xsl b/appsrc/ODS-Calendar/www/template/template.xsl
index 3c338d5..ff62fde 100644
--- a/appsrc/ODS-Calendar/www/template/template.xsl
+++ b/appsrc/ODS-Calendar/www/template/template.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.xsl,v 1.38.2.12 2012/03/08 10:46:16 source Exp $
+ - $Id: template.xsl,v 1.38.2.11 2011/05/02 14:16:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/xslt/rss2atom.xsl b/appsrc/ODS-Calendar/xslt/rss2atom.xsl
index b5c19ef..e998236 100644
--- a/appsrc/ODS-Calendar/xslt/rss2atom.xsl
+++ b/appsrc/ODS-Calendar/xslt/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.2.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: rss2atom.xsl,v 1.2.2.2 2010/09/20 10:15:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/xslt/rss2atom03.xsl b/appsrc/ODS-Calendar/xslt/rss2atom03.xsl
index 6d8e77f..fff9714 100644
--- a/appsrc/ODS-Calendar/xslt/rss2atom03.xsl
+++ b/appsrc/ODS-Calendar/xslt/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: rss2atom03.xsl,v 1.2.2.1 2010/09/20 10:15:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/xslt/rss2rdf.xsl b/appsrc/ODS-Calendar/xslt/rss2rdf.xsl
index 44386dd..84757c1 100644
--- a/appsrc/ODS-Calendar/xslt/rss2rdf.xsl
+++ b/appsrc/ODS-Calendar/xslt/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: rss2rdf.xsl,v 1.2.2.1 2010/09/20 10:15:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Calendar/xslt/rss2xbel.xsl b/appsrc/ODS-Calendar/xslt/rss2xbel.xsl
index fa079c2..d03224d 100644
--- a/appsrc/ODS-Calendar/xslt/rss2xbel.xsl
+++ b/appsrc/ODS-Calendar/xslt/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.1.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: rss2xbel.xsl,v 1.1.2.1 2010/09/20 10:15:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Community/Makefile.am b/appsrc/ODS-Community/Makefile.am
index a76d9fa..4522f5a 100644
--- a/appsrc/ODS-Community/Makefile.am
+++ b/appsrc/ODS-Community/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -48,7 +48,6 @@ EXTRA_DIST = \
sql/*.sql \
sql/install.bat \
sql/uninstall.bat \
- vad_version \
www-root/*.vsp \
www-root/*.vspx \
www-root/public/*.html \
diff --git a/appsrc/ODS-Community/Makefile.in b/appsrc/ODS-Community/Makefile.in
index a340a84..ba2502c 100644
--- a/appsrc/ODS-Community/Makefile.in
+++ b/appsrc/ODS-Community/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -313,7 +311,6 @@ EXTRA_DIST = \
sql/*.sql \
sql/install.bat \
sql/uninstall.bat \
- vad_version \
www-root/*.vsp \
www-root/*.vspx \
www-root/public/*.html \
diff --git a/appsrc/ODS-Community/make_vad.sh b/appsrc/ODS-Community/make_vad.sh
index 70b833b..8123297 100755
--- a/appsrc/ODS-Community/make_vad.sh
+++ b/appsrc/ODS-Community/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.14.2.5 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.14.2.3 2011/02/03 10:26:14 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -28,9 +28,8 @@ LANG=C
LC_ALL=POSIX
export LANG LC_ALL
-
LOGDIR=`pwd`
-VERSION="1.0.0"
+VERSION="0.0.996"
LOGFILE="${LOGDIR}/make_vad.log"
STICKER="make_vad.xml"
PACKDATE=`date +"%Y-%m-%d %H:%M"`
@@ -59,6 +58,11 @@ else
LN="ln -fs"
RM="rm -f"
fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
if [ "z$SERVER" = "z" ]
then
@@ -81,58 +85,16 @@ else
myrm=$RM
fi
-
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
-
-version_init()
+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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> 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
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
+ VERSION=`cat version.tmp | awk ' BEGIN { cnt=100 } { cnt = cnt + $1 } END { printf "1.%02.02f", cnt/100 }'`
rm -f version.tmp
- echo "$VERSION" > vad_version
- fi
}
-
virtuoso_start() {
echo "Starting $SERVER"
ddate=`date`
@@ -263,7 +225,7 @@ sticker_init() {
echo " <name package=\"Community\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Community\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -408,7 +370,7 @@ echo '------------------------'
STOP_SERVER
directory_clean
-version_init
+VERSION_INIT
directory_init
virtuoso_init
sticker_init
@@ -416,6 +378,7 @@ vad_create
virtuoso_shutdown
STOP_SERVER
chmod 644 ods_community_dav.vad
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -425,7 +388,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Community/sql/exec_no_error.sql b/appsrc/ODS-Community/sql/exec_no_error.sql
index 293dced..0b0d0e3 100644
--- a/appsrc/ODS-Community/sql/exec_no_error.sql
+++ b/appsrc/ODS-Community/sql/exec_no_error.sql
@@ -1,10 +1,10 @@
--
--- $Id: exec_no_error.sql,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: exec_no_error.sql,v 1.3.2.1 2010/09/20 10:15:04 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/sql/install.bat b/appsrc/ODS-Community/sql/install.bat
index be6c75e..5e42f94 100644
--- a/appsrc/ODS-Community/sql/install.bat
+++ b/appsrc/ODS-Community/sql/install.bat
@@ -1,11 +1,11 @@
@echo off
rem
-rem $Id: install.bat,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+rem $Id: install.bat,v 1.2.2.1 2010/09/20 10:15:05 source Exp $
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/appsrc/ODS-Community/sql/procedures.sql b/appsrc/ODS-Community/sql/procedures.sql
index 0ce8f00..8fc1fc6 100644
--- a/appsrc/ODS-Community/sql/procedures.sql
+++ b/appsrc/ODS-Community/sql/procedures.sql
@@ -1,10 +1,10 @@
--
--- $Id: procedures.sql,v 1.11.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: procedures.sql,v 1.11.2.1 2010/09/20 10:15:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/sql/run_install.sql b/appsrc/ODS-Community/sql/run_install.sql
index d7a7f0c..227ccfe 100644
--- a/appsrc/ODS-Community/sql/run_install.sql
+++ b/appsrc/ODS-Community/sql/run_install.sql
@@ -1,10 +1,10 @@
--
--- $Id: run_install.sql,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: run_install.sql,v 1.3.2.1 2010/09/20 10:15:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/sql/run_uninstall.sql b/appsrc/ODS-Community/sql/run_uninstall.sql
index 4939f74..d1428a8 100644
--- a/appsrc/ODS-Community/sql/run_uninstall.sql
+++ b/appsrc/ODS-Community/sql/run_uninstall.sql
@@ -1,10 +1,10 @@
--
--- $Id: run_uninstall.sql,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: run_uninstall.sql,v 1.3.2.1 2010/09/20 10:15:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/sql/sioc_xd.sql b/appsrc/ODS-Community/sql/sioc_xd.sql
index bb50fa2..fc1d0c1 100644
--- a/appsrc/ODS-Community/sql/sioc_xd.sql
+++ b/appsrc/ODS-Community/sql/sioc_xd.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_xd.sql,v 1.7.2.3 2012/03/08 10:46:16 source Exp $
+-- $Id: sioc_xd.sql,v 1.7.2.2 2010/09/20 10:15:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/sql/tables.sql b/appsrc/ODS-Community/sql/tables.sql
index 8231b3b..99847ca 100644
--- a/appsrc/ODS-Community/sql/tables.sql
+++ b/appsrc/ODS-Community/sql/tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: tables.sql,v 1.5.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: tables.sql,v 1.5.2.1 2010/09/20 10:15:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/sql/uninstall.bat b/appsrc/ODS-Community/sql/uninstall.bat
index b233cef..a6fc51d 100644
--- a/appsrc/ODS-Community/sql/uninstall.bat
+++ b/appsrc/ODS-Community/sql/uninstall.bat
@@ -1,11 +1,11 @@
@echo off
rem
-rem $Id: uninstall.bat,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+rem $Id: uninstall.bat,v 1.2.2.1 2010/09/20 10:15:05 source Exp $
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/appsrc/ODS-Community/sql/wa_install.sql b/appsrc/ODS-Community/sql/wa_install.sql
index 88a4dde..57899fa 100644
--- a/appsrc/ODS-Community/sql/wa_install.sql
+++ b/appsrc/ODS-Community/sql/wa_install.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_install.sql,v 1.10.2.3 2012/03/08 11:46:01 source Exp $
+-- $Id: wa_install.sql,v 1.10.2.1 2010/09/20 10:15:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -743,14 +743,6 @@ create method apply_custom_settings ( in template_path varchar, in logoimg_path
where
CI_COMMUNITY_ID = self.wa_name;
--- update ODS.COMMUNITY.SYS_COMMUNITY_INFO
--- set
--- CI_TEMPLATE=template_path ,
--- CI_CSS=template_path ||'/default.css'
--- where
--- CI_COMMUNITY_ID = self.wa_name;
-
-
return;
};
diff --git a/appsrc/ODS-Community/sql/wa_uninstall.sql b/appsrc/ODS-Community/sql/wa_uninstall.sql
index 7ae2936..b0c8bb0 100644
--- a/appsrc/ODS-Community/sql/wa_uninstall.sql
+++ b/appsrc/ODS-Community/sql/wa_uninstall.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_uninstall.sql,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: wa_uninstall.sql,v 1.3.2.1 2010/09/20 10:15:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/vad_version b/appsrc/ODS-Community/vad_version
deleted file mode 100644
index 773e9fd..0000000
--- a/appsrc/ODS-Community/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.8.46
diff --git a/appsrc/ODS-Community/www-root/index.vsp b/appsrc/ODS-Community/www-root/index.vsp
index c345b8c..ee3fd4b 100644
--- a/appsrc/ODS-Community/www-root/index.vsp
+++ b/appsrc/ODS-Community/www-root/index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index.vsp,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: index.vsp,v 1.4.2.1 2010/09/20 10:15:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/index.vspx b/appsrc/ODS-Community/www-root/index.vspx
index fea4f42..37dbbc5 100644
--- a/appsrc/ODS-Community/www-root/index.vspx
+++ b/appsrc/ODS-Community/www-root/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: index.vspx,v 1.3.2.1 2010/09/20 10:15:05 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/public/aboutcommunity.html b/appsrc/ODS-Community/www-root/public/aboutcommunity.html
index 66800f7..fbb565e 100644
--- a/appsrc/ODS-Community/www-root/public/aboutcommunity.html
+++ b/appsrc/ODS-Community/www-root/public/aboutcommunity.html
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: aboutcommunity.html,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: aboutcommunity.html,v 1.2.2.1 2010/09/20 10:15:05 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/public/css/default.css b/appsrc/ODS-Community/www-root/public/css/default.css
index 4c5385d..252d7f2 100644
--- a/appsrc/ODS-Community/www-root/public/css/default.css
+++ b/appsrc/ODS-Community/www-root/public/css/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.9.2.2 2012/03/08 10:46:16 source Exp $
+ * $Id: default.css,v 1.9.2.1 2010/09/20 10:15:05 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/public/images/lightblue/myopenlink.css b/appsrc/ODS-Community/www-root/public/images/lightblue/myopenlink.css
index 8d92340..8e7c733 100644
--- a/appsrc/ODS-Community/www-root/public/images/lightblue/myopenlink.css
+++ b/appsrc/ODS-Community/www-root/public/images/lightblue/myopenlink.css
@@ -1,10 +1,10 @@
/*
- * $Id: myopenlink.css,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ * $Id: myopenlink.css,v 1.2.2.1 2010/09/20 10:15:05 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/public/js/map_control.js b/appsrc/ODS-Community/www-root/public/js/map_control.js
index d19159d..35a9924 100644
--- a/appsrc/ODS-Community/www-root/public/js/map_control.js
+++ b/appsrc/ODS-Community/www-root/public/js/map_control.js
@@ -1,10 +1,10 @@
/*
- * $Id: map_control.js,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ * $Id: map_control.js,v 1.3.2.1 2010/09/20 10:15:06 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/app_inst.vspx b/appsrc/ODS-Community/www-root/templates/openlink/app_inst.vspx
index 7c0c838..431ef30 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/app_inst.vspx
+++ b/appsrc/ODS-Community/www-root/templates/openlink/app_inst.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: app_inst.vspx,v 1.10.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: app_inst.vspx,v 1.10.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/default.css b/appsrc/ODS-Community/www-root/templates/openlink/default.css
index d55e90f..99dac85 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/default.css
+++ b/appsrc/ODS-Community/www-root/templates/openlink/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.9.2.2 2012/03/08 10:46:16 source Exp $
+ * $Id: default.css,v 1.9.2.1 2010/09/20 10:15:06 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx b/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx
index 1075dac..5ca605f 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx
+++ b/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: errors.vspx,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: errors.vspx,v 1.4.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/index.vspx b/appsrc/ODS-Community/www-root/templates/openlink/index.vspx
index 018f043..c92ed44 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/index.vspx
+++ b/appsrc/ODS-Community/www-root/templates/openlink/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: index.vspx,v 1.12.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: index.vspx,v 1.12.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/login.vspx b/appsrc/ODS-Community/www-root/templates/openlink/login.vspx
index 6fb3f9e..6c1c2b3 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/login.vspx
+++ b/appsrc/ODS-Community/www-root/templates/openlink/login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: login.vspx,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: login.vspx,v 1.3.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx b/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx
index e863f59..2b35468 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx
+++ b/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logout.vspx,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: logout.vspx,v 1.3.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx b/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx
index a651774..d9a840a 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx
+++ b/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: settings.vspx,v 1.6.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: settings.vspx,v 1.6.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/settings_app.vspx b/appsrc/ODS-Community/www-root/templates/openlink/settings_app.vspx
index ef4cb33..239edf1 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/settings_app.vspx
+++ b/appsrc/ODS-Community/www-root/templates/openlink/settings_app.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: settings_app.vspx,v 1.9.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: settings_app.vspx,v 1.9.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/templates/openlink/wa_maps.vspx b/appsrc/ODS-Community/www-root/templates/openlink/wa_maps.vspx
index 5e15d3a..0d0c232 100644
--- a/appsrc/ODS-Community/www-root/templates/openlink/wa_maps.vspx
+++ b/appsrc/ODS-Community/www-root/templates/openlink/wa_maps.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: wa_maps.vspx,v 1.9.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: wa_maps.vspx,v 1.9.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/widgets/app_inst_menu.xsl b/appsrc/ODS-Community/www-root/widgets/app_inst_menu.xsl
index d8a0f71..def1810 100644
--- a/appsrc/ODS-Community/www-root/widgets/app_inst_menu.xsl
+++ b/appsrc/ODS-Community/www-root/widgets/app_inst_menu.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: app_inst_menu.xsl,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: app_inst_menu.xsl,v 1.4.2.1 2010/09/20 10:15:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/widgets/apply_custom_settings.xsl b/appsrc/ODS-Community/www-root/widgets/apply_custom_settings.xsl
index 33cba72..dbd3151 100644
--- a/appsrc/ODS-Community/www-root/widgets/apply_custom_settings.xsl
+++ b/appsrc/ODS-Community/www-root/widgets/apply_custom_settings.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: apply_custom_settings.xsl,v 1.1.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: apply_custom_settings.xsl,v 1.1.2.1 2010/09/20 10:15:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/widgets/dashboard.xsl b/appsrc/ODS-Community/www-root/widgets/dashboard.xsl
index 7fea2d3..b03b548 100644
--- a/appsrc/ODS-Community/www-root/widgets/dashboard.xsl
+++ b/appsrc/ODS-Community/www-root/widgets/dashboard.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dashboard.xsl,v 1.7.2.3 2012/03/08 11:46:01 source Exp $
+ - $Id: dashboard.xsl,v 1.7.2.1 2010/09/20 10:15:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -539,7 +539,6 @@
declare inst_url_local varchar;
inst_url_local :='not specified';
inst_url_local := wa_expand_url ((select top 1 WAM_HOME_PAGE from WA_MEMBER where WAM_INST=inst_name), self.login_pars);
--- inst_url_local:=wa_expand_url (sprintf('/dataspace/%V/%s/%U',uname,app_dataspace,inst_name_org), self.login_pars);
declare insttype_from_xsl varchar;
insttype_from_xsl:='';
diff --git a/appsrc/ODS-Community/www-root/widgets/error.xsl b/appsrc/ODS-Community/www-root/widgets/error.xsl
index 0faed86..aeec633 100644
--- a/appsrc/ODS-Community/www-root/widgets/error.xsl
+++ b/appsrc/ODS-Community/www-root/widgets/error.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: error.xsl,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: error.xsl,v 1.4.2.1 2010/09/20 10:15:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/widgets/main.xsl b/appsrc/ODS-Community/www-root/widgets/main.xsl
index af585e9..f2b8808 100644
--- a/appsrc/ODS-Community/www-root/widgets/main.xsl
+++ b/appsrc/ODS-Community/www-root/widgets/main.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: main.xsl,v 1.21.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: main.xsl,v 1.21.2.2 2010/09/20 10:15:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/widgets/map_control.xsl b/appsrc/ODS-Community/www-root/widgets/map_control.xsl
index 308edc4..a9edb25 100644
--- a/appsrc/ODS-Community/www-root/widgets/map_control.xsl
+++ b/appsrc/ODS-Community/www-root/widgets/map_control.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: map_control.xsl,v 1.5.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: map_control.xsl,v 1.5.2.1 2010/09/20 10:15:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Community/www-root/widgets/template_check.xsl b/appsrc/ODS-Community/www-root/widgets/template_check.xsl
index cc97651..9223985 100644
--- a/appsrc/ODS-Community/www-root/widgets/template_check.xsl
+++ b/appsrc/ODS-Community/www-root/widgets/template_check.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: template_check.xsl,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: template_check.xsl,v 1.2.2.1 2010/09/20 10:15:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/DET_nntp.sql b/appsrc/ODS-Discussion/DET_nntp.sql
index f2b4877..0fea09b 100644
--- a/appsrc/ODS-Discussion/DET_nntp.sql
+++ b/appsrc/ODS-Discussion/DET_nntp.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_nntp.sql,v 1.1.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: DET_nntp.sql,v 1.1.2.1 2010/09/20 10:15:07 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/Makefile.am b/appsrc/ODS-Discussion/Makefile.am
index 2994495..be5c7b5 100644
--- a/appsrc/ODS-Discussion/Makefile.am
+++ b/appsrc/ODS-Discussion/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/Makefile.in b/appsrc/ODS-Discussion/Makefile.in
index aaf91d8..ea9e243 100644
--- a/appsrc/ODS-Discussion/Makefile.in
+++ b/appsrc/ODS-Discussion/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/appsrc/ODS-Discussion/attachment.vsp b/appsrc/ODS-Discussion/attachment.vsp
index b3a737a..d18476c 100644
--- a/appsrc/ODS-Discussion/attachment.vsp
+++ b/appsrc/ODS-Discussion/attachment.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: attachment.vsp,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: attachment.vsp,v 1.2.2.1 2010/09/20 10:15:07 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/adv_srh.xsl b/appsrc/ODS-Discussion/comp/adv_srh.xsl
index 6ba2b7d..d0fd5bd 100644
--- a/appsrc/ODS-Discussion/comp/adv_srh.xsl
+++ b/appsrc/ODS-Discussion/comp/adv_srh.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: adv_srh.xsl,v 1.5.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: adv_srh.xsl,v 1.5.2.1 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/attach.xsl b/appsrc/ODS-Discussion/comp/attach.xsl
index 4e548f6..bb83562 100644
--- a/appsrc/ODS-Discussion/comp/attach.xsl
+++ b/appsrc/ODS-Discussion/comp/attach.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: attach.xsl,v 1.6.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: attach.xsl,v 1.6.2.1 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/common.xsl b/appsrc/ODS-Discussion/comp/common.xsl
index af21fa4..efe9f68 100644
--- a/appsrc/ODS-Discussion/comp/common.xsl
+++ b/appsrc/ODS-Discussion/comp/common.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: common.xsl,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: common.xsl,v 1.2.2.1 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/dialog.xsl b/appsrc/ODS-Discussion/comp/dialog.xsl
index 8553a69..91bc3bb 100644
--- a/appsrc/ODS-Discussion/comp/dialog.xsl
+++ b/appsrc/ODS-Discussion/comp/dialog.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dialog.xsl,v 1.1.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: dialog.xsl,v 1.1.2.1 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/group_list.xsl b/appsrc/ODS-Discussion/comp/group_list.xsl
index 24020bd..ef96c7b 100644
--- a/appsrc/ODS-Discussion/comp/group_list.xsl
+++ b/appsrc/ODS-Discussion/comp/group_list.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: group_list.xsl,v 1.13.2.4 2012/03/08 10:46:16 source Exp $
+ - $Id: group_list.xsl,v 1.13.2.3 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/group_view.xsl b/appsrc/ODS-Discussion/comp/group_view.xsl
index dd6ba5a..72d6acb 100644
--- a/appsrc/ODS-Discussion/comp/group_view.xsl
+++ b/appsrc/ODS-Discussion/comp/group_view.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: group_view.xsl,v 1.9.2.5 2012/03/08 10:46:16 source Exp $
+ - $Id: group_view.xsl,v 1.9.2.4 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/login.xsl b/appsrc/ODS-Discussion/comp/login.xsl
index 4eb0871..17c631e 100644
--- a/appsrc/ODS-Discussion/comp/login.xsl
+++ b/appsrc/ODS-Discussion/comp/login.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.xsl,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: login.xsl,v 1.3.2.1 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/menubar.xsl b/appsrc/ODS-Discussion/comp/menubar.xsl
index 4681eca..04726d7 100644
--- a/appsrc/ODS-Discussion/comp/menubar.xsl
+++ b/appsrc/ODS-Discussion/comp/menubar.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: menubar.xsl,v 1.10.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: menubar.xsl,v 1.10.2.2 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/nntp_cal.xsl b/appsrc/ODS-Discussion/comp/nntp_cal.xsl
index c7a0cdf..dab3a4a 100644
--- a/appsrc/ODS-Discussion/comp/nntp_cal.xsl
+++ b/appsrc/ODS-Discussion/comp/nntp_cal.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntp_cal.xsl,v 1.6.2.4 2012/03/08 10:46:16 source Exp $
+ - $Id: nntp_cal.xsl,v 1.6.2.3 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/nntpf_tags.xsl b/appsrc/ODS-Discussion/comp/nntpf_tags.xsl
index 1b42155..33321ba 100644
--- a/appsrc/ODS-Discussion/comp/nntpf_tags.xsl
+++ b/appsrc/ODS-Discussion/comp/nntpf_tags.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_tags.xsl,v 1.5.2.5 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_tags.xsl,v 1.5.2.4 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/page.xsl b/appsrc/ODS-Discussion/comp/page.xsl
index e50b3f3..141afe0 100644
--- a/appsrc/ODS-Discussion/comp/page.xsl
+++ b/appsrc/ODS-Discussion/comp/page.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: page.xsl,v 1.16.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: page.xsl,v 1.16.2.2 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/post.xsl b/appsrc/ODS-Discussion/comp/post.xsl
index 23e6841..59064ee 100644
--- a/appsrc/ODS-Discussion/comp/post.xsl
+++ b/appsrc/ODS-Discussion/comp/post.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: post.xsl,v 1.14.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: post.xsl,v 1.14.2.2 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/register.xsl b/appsrc/ODS-Discussion/comp/register.xsl
index ab1a031..1b35200 100644
--- a/appsrc/ODS-Discussion/comp/register.xsl
+++ b/appsrc/ODS-Discussion/comp/register.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: register.xsl,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: register.xsl,v 1.4.2.1 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/rss_del.xsl b/appsrc/ODS-Discussion/comp/rss_del.xsl
index 3524da8..dccc2f7 100644
--- a/appsrc/ODS-Discussion/comp/rss_del.xsl
+++ b/appsrc/ODS-Discussion/comp/rss_del.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss_del.xsl,v 1.1.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: rss_del.xsl,v 1.1.2.1 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/rss_group.xsl b/appsrc/ODS-Discussion/comp/rss_group.xsl
index aecb970..d59d3c0 100644
--- a/appsrc/ODS-Discussion/comp/rss_group.xsl
+++ b/appsrc/ODS-Discussion/comp/rss_group.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss_group.xsl,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: rss_group.xsl,v 1.2.2.1 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/rss_list.xsl b/appsrc/ODS-Discussion/comp/rss_list.xsl
index 3b4959c..1644e23 100644
--- a/appsrc/ODS-Discussion/comp/rss_list.xsl
+++ b/appsrc/ODS-Discussion/comp/rss_list.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss_list.xsl,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: rss_list.xsl,v 1.2.2.1 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/search.xsl b/appsrc/ODS-Discussion/comp/search.xsl
index c80203f..c14508c 100644
--- a/appsrc/ODS-Discussion/comp/search.xsl
+++ b/appsrc/ODS-Discussion/comp/search.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.xsl,v 1.6.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: search.xsl,v 1.6.2.1 2010/09/20 10:15:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/search_res.xsl b/appsrc/ODS-Discussion/comp/search_res.xsl
index c5ce435..3db1460 100644
--- a/appsrc/ODS-Discussion/comp/search_res.xsl
+++ b/appsrc/ODS-Discussion/comp/search_res.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search_res.xsl,v 1.9.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: search_res.xsl,v 1.9.2.1 2010/09/20 10:15:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/settings.xsl b/appsrc/ODS-Discussion/comp/settings.xsl
index c272254..2f52f5a 100644
--- a/appsrc/ODS-Discussion/comp/settings.xsl
+++ b/appsrc/ODS-Discussion/comp/settings.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: settings.xsl,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: settings.xsl,v 1.2.2.1 2010/09/20 10:15:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/thread_view.xsl b/appsrc/ODS-Discussion/comp/thread_view.xsl
index 14a1d41..917dcfc 100644
--- a/appsrc/ODS-Discussion/comp/thread_view.xsl
+++ b/appsrc/ODS-Discussion/comp/thread_view.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: thread_view.xsl,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: thread_view.xsl,v 1.4.2.1 2010/09/20 10:15:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/comp/title.xsl b/appsrc/ODS-Discussion/comp/title.xsl
index 8a57cf6..e4f8169 100644
--- a/appsrc/ODS-Discussion/comp/title.xsl
+++ b/appsrc/ODS-Discussion/comp/title.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: title.xsl,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: title.xsl,v 1.3.2.1 2010/09/20 10:15:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/drop.sql b/appsrc/ODS-Discussion/drop.sql
index b95e13e..f834746 100644
--- a/appsrc/ODS-Discussion/drop.sql
+++ b/appsrc/ODS-Discussion/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: drop.sql,v 1.3.2.1 2010/09/20 10:15:07 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/login.vspx b/appsrc/ODS-Discussion/login.vspx
index b742b08..7ecf541 100644
--- a/appsrc/ODS-Discussion/login.vspx
+++ b/appsrc/ODS-Discussion/login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.vspx,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: login.vspx,v 1.3.2.1 2010/09/20 10:15:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/mail_notify.sql b/appsrc/ODS-Discussion/mail_notify.sql
index 4b08acf..2bf9031 100644
--- a/appsrc/ODS-Discussion/mail_notify.sql
+++ b/appsrc/ODS-Discussion/mail_notify.sql
@@ -1,10 +1,10 @@
--
--- $Id: mail_notify.sql,v 1.1.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: mail_notify.sql,v 1.1.2.1 2010/09/20 10:15:07 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/main.xsl b/appsrc/ODS-Discussion/main.xsl
index d956659..dd0eed6 100644
--- a/appsrc/ODS-Discussion/main.xsl
+++ b/appsrc/ODS-Discussion/main.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: main.xsl,v 1.3.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: main.xsl,v 1.3.2.2 2010/09/20 10:15:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/make_vad.sh b/appsrc/ODS-Discussion/make_vad.sh
index 7ea5a42..874b6e2 100755
--- a/appsrc/ODS-Discussion/make_vad.sh
+++ b/appsrc/ODS-Discussion/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.23.2.7 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.23.2.5 2011/02/03 10:26:14 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -57,6 +57,11 @@ 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
@@ -78,13 +83,8 @@ else
myrm=rm
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
-version_init()
+VERSION_INIT()
{
if [ $VOS -eq 1 ]
then
@@ -239,7 +239,7 @@ sticker_init() {
echo " <name package=\"Discussion\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Discussion\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -407,13 +407,15 @@ vad_create() {
STOP_SERVER
directory_clean
-version_init
+VERSION_INIT
directory_init
virtuoso_init
sticker_init
vad_create
virtuoso_shutdown
chmod 644 ods_discussion_dav.vad
+directory_clean
+
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -423,7 +425,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Discussion/nntpf.css b/appsrc/ODS-Discussion/nntpf.css
index 4157df6..bd67a4f 100644
--- a/appsrc/ODS-Discussion/nntpf.css
+++ b/appsrc/ODS-Discussion/nntpf.css
@@ -1,10 +1,10 @@
/*
- * $Id: nntpf.css,v 1.9.2.3 2012/03/08 10:46:16 source Exp $
+ * $Id: nntpf.css,v 1.9.2.2 2010/09/20 10:15:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_addtorss.vspx b/appsrc/ODS-Discussion/nntpf_addtorss.vspx
index 23aa72c..f520a4c 100644
--- a/appsrc/ODS-Discussion/nntpf_addtorss.vspx
+++ b/appsrc/ODS-Discussion/nntpf_addtorss.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_addtorss.vspx,v 1.5.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_addtorss.vspx,v 1.5.2.2 2010/09/20 10:15:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_adv_search.vspx b/appsrc/ODS-Discussion/nntpf_adv_search.vspx
index 2a16122..b7f7cc0 100644
--- a/appsrc/ODS-Discussion/nntpf_adv_search.vspx
+++ b/appsrc/ODS-Discussion/nntpf_adv_search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_adv_search.vspx,v 1.3.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_adv_search.vspx,v 1.3.2.2 2010/09/20 10:15:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_api.sql b/appsrc/ODS-Discussion/nntpf_api.sql
index bbf7fe4..94e0550 100644
--- a/appsrc/ODS-Discussion/nntpf_api.sql
+++ b/appsrc/ODS-Discussion/nntpf_api.sql
@@ -1,10 +1,10 @@
--
--- $Id: nntpf_api.sql,v 1.4.2.4 2012/03/08 10:46:16 source Exp $
+-- $Id: nntpf_api.sql,v 1.4.2.3 2010/09/20 10:15:08 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_browser.vspx b/appsrc/ODS-Discussion/nntpf_browser.vspx
index 977e7af..7f9940b 100644
--- a/appsrc/ODS-Discussion/nntpf_browser.vspx
+++ b/appsrc/ODS-Discussion/nntpf_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_browser.vspx,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_browser.vspx,v 1.2.2.1 2010/09/20 10:15:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_ddl.sql b/appsrc/ODS-Discussion/nntpf_ddl.sql
index 3263d39..daeaf47 100644
--- a/appsrc/ODS-Discussion/nntpf_ddl.sql
+++ b/appsrc/ODS-Discussion/nntpf_ddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: nntpf_ddl.sql,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: nntpf_ddl.sql,v 1.3.2.1 2010/09/20 10:15:08 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_disp_article.vspx b/appsrc/ODS-Discussion/nntpf_disp_article.vspx
index ee7fb71..5ee5e56 100644
--- a/appsrc/ODS-Discussion/nntpf_disp_article.vspx
+++ b/appsrc/ODS-Discussion/nntpf_disp_article.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_disp_article.vspx,v 1.7.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_disp_article.vspx,v 1.7.2.1 2010/09/20 10:15:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_edit_rss.vspx b/appsrc/ODS-Discussion/nntpf_edit_rss.vspx
index 5660d7d..9c8cc8a 100644
--- a/appsrc/ODS-Discussion/nntpf_edit_rss.vspx
+++ b/appsrc/ODS-Discussion/nntpf_edit_rss.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_edit_rss.vspx,v 1.5.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_edit_rss.vspx,v 1.5.2.1 2010/09/20 10:15:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_error.vsp b/appsrc/ODS-Discussion/nntpf_error.vsp
index aa90c2a..eb7e694 100644
--- a/appsrc/ODS-Discussion/nntpf_error.vsp
+++ b/appsrc/ODS-Discussion/nntpf_error.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: nntpf_error.vsp,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: nntpf_error.vsp,v 1.3.2.1 2010/09/20 10:15:08 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_error.vspx b/appsrc/ODS-Discussion/nntpf_error.vspx
index be9bdab..7256f6e 100644
--- a/appsrc/ODS-Discussion/nntpf_error.vspx
+++ b/appsrc/ODS-Discussion/nntpf_error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: nntpf_error.vspx,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_error.vspx,v 1.2.2.1 2010/09/20 10:15:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -25,12 +25,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_error.vspx,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_error.vspx,v 1.2.2.1 2010/09/20 10:15:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_logout.vspx b/appsrc/ODS-Discussion/nntpf_logout.vspx
index 0178449..c34505e 100644
--- a/appsrc/ODS-Discussion/nntpf_logout.vspx
+++ b/appsrc/ODS-Discussion/nntpf_logout.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_logout.vspx,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_logout.vspx,v 1.3.2.1 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_main.vspx b/appsrc/ODS-Discussion/nntpf_main.vspx
index 63deda2..f1fc9b0 100644
--- a/appsrc/ODS-Discussion/nntpf_main.vspx
+++ b/appsrc/ODS-Discussion/nntpf_main.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_main.vspx,v 1.9.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_main.vspx,v 1.9.2.1 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_nthread_view.vspx b/appsrc/ODS-Discussion/nntpf_nthread_view.vspx
index eaedfa7..2ef3904 100644
--- a/appsrc/ODS-Discussion/nntpf_nthread_view.vspx
+++ b/appsrc/ODS-Discussion/nntpf_nthread_view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_nthread_view.vspx,v 1.7.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_nthread_view.vspx,v 1.7.2.1 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx b/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx
index 8de3490..df80eee 100644
--- a/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx
+++ b/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_odsnewsgroups_admin.vspx,v 1.8.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_odsnewsgroups_admin.vspx,v 1.8.2.2 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_post.vspx b/appsrc/ODS-Discussion/nntpf_post.vspx
index 85c7fc1..a5c321b 100644
--- a/appsrc/ODS-Discussion/nntpf_post.vspx
+++ b/appsrc/ODS-Discussion/nntpf_post.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_post.vspx,v 1.8.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_post.vspx,v 1.8.2.1 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_preferences.vspx b/appsrc/ODS-Discussion/nntpf_preferences.vspx
index 4641702..ac608df 100644
--- a/appsrc/ODS-Discussion/nntpf_preferences.vspx
+++ b/appsrc/ODS-Discussion/nntpf_preferences.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_preferences.vspx,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_preferences.vspx,v 1.4.2.1 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_rss_del.vspx b/appsrc/ODS-Discussion/nntpf_rss_del.vspx
index ec0db88..a64d186 100644
--- a/appsrc/ODS-Discussion/nntpf_rss_del.vspx
+++ b/appsrc/ODS-Discussion/nntpf_rss_del.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_rss_del.vspx,v 1.3.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_rss_del.vspx,v 1.3.2.2 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_rss_group.vspx b/appsrc/ODS-Discussion/nntpf_rss_group.vspx
index ed6d57b..0dd8fc3 100644
--- a/appsrc/ODS-Discussion/nntpf_rss_group.vspx
+++ b/appsrc/ODS-Discussion/nntpf_rss_group.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_rss_group.vspx,v 1.3.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_rss_group.vspx,v 1.3.2.2 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_rss_list.vspx b/appsrc/ODS-Discussion/nntpf_rss_list.vspx
index 4f430e6..57697df 100644
--- a/appsrc/ODS-Discussion/nntpf_rss_list.vspx
+++ b/appsrc/ODS-Discussion/nntpf_rss_list.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_rss_list.vspx,v 1.3.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_rss_list.vspx,v 1.3.2.2 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_subs.vspx b/appsrc/ODS-Discussion/nntpf_subs.vspx
index 9e1095f..10536e4 100644
--- a/appsrc/ODS-Discussion/nntpf_subs.vspx
+++ b/appsrc/ODS-Discussion/nntpf_subs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_subs.vspx,v 1.7.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_subs.vspx,v 1.7.2.1 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_subs_edit.vspx b/appsrc/ODS-Discussion/nntpf_subs_edit.vspx
index 48bc507..9b8a16f 100644
--- a/appsrc/ODS-Discussion/nntpf_subs_edit.vspx
+++ b/appsrc/ODS-Discussion/nntpf_subs_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_subs_edit.vspx,v 1.5.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_subs_edit.vspx,v 1.5.2.2 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_subs_group.vspx b/appsrc/ODS-Discussion/nntpf_subs_group.vspx
index 26f2eb6..8e4d70d 100644
--- a/appsrc/ODS-Discussion/nntpf_subs_group.vspx
+++ b/appsrc/ODS-Discussion/nntpf_subs_group.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_subs_group.vspx,v 1.3.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_subs_group.vspx,v 1.3.2.2 2010/09/20 10:15:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_subs_remove.vspx b/appsrc/ODS-Discussion/nntpf_subs_remove.vspx
index b0b5c22..9836c10 100644
--- a/appsrc/ODS-Discussion/nntpf_subs_remove.vspx
+++ b/appsrc/ODS-Discussion/nntpf_subs_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_subs_remove.vspx,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_subs_remove.vspx,v 1.4.2.1 2010/09/20 10:15:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_tags.sql b/appsrc/ODS-Discussion/nntpf_tags.sql
index 9eabfb9..10251aa 100644
--- a/appsrc/ODS-Discussion/nntpf_tags.sql
+++ b/appsrc/ODS-Discussion/nntpf_tags.sql
@@ -1,10 +1,10 @@
--
--- $Id: nntpf_tags.sql,v 1.2.2.3 2012/03/08 10:46:16 source Exp $
+-- $Id: nntpf_tags.sql,v 1.2.2.2 2010/09/20 10:15:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_thread_view.vspx b/appsrc/ODS-Discussion/nntpf_thread_view.vspx
index b3135ba..9c1c801 100644
--- a/appsrc/ODS-Discussion/nntpf_thread_view.vspx
+++ b/appsrc/ODS-Discussion/nntpf_thread_view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_thread_view.vspx,v 1.4.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_thread_view.vspx,v 1.4.2.2 2010/09/20 10:15:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_warning.vsp b/appsrc/ODS-Discussion/nntpf_warning.vsp
index 182ce84..935ad7e 100644
--- a/appsrc/ODS-Discussion/nntpf_warning.vsp
+++ b/appsrc/ODS-Discussion/nntpf_warning.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: nntpf_warning.vsp,v 1.2.2.3 2012/03/08 10:46:16 source Exp $
+-- $Id: nntpf_warning.vsp,v 1.2.2.2 2010/09/20 10:15:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/nntpf_yacutia.vspx b/appsrc/ODS-Discussion/nntpf_yacutia.vspx
index 7cce4dd..fe9f930 100644
--- a/appsrc/ODS-Discussion/nntpf_yacutia.vspx
+++ b/appsrc/ODS-Discussion/nntpf_yacutia.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: nntpf_yacutia.vspx,v 1.4.2.3 2012/03/08 10:46:16 source Exp $
+ - $Id: nntpf_yacutia.vspx,v 1.4.2.2 2010/09/20 10:15:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/openid.js b/appsrc/ODS-Discussion/openid.js
index 96453b8..0115420 100644
--- a/appsrc/ODS-Discussion/openid.js
+++ b/appsrc/ODS-Discussion/openid.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/openid_helper.vsp b/appsrc/ODS-Discussion/openid_helper.vsp
index 987deaa..b10e92c 100644
--- a/appsrc/ODS-Discussion/openid_helper.vsp
+++ b/appsrc/ODS-Discussion/openid_helper.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: openid_helper.vsp,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: openid_helper.vsp,v 1.2.2.1 2010/09/20 10:15:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/register.vspx b/appsrc/ODS-Discussion/register.vspx
index e2142ed..b1e4d01 100644
--- a/appsrc/ODS-Discussion/register.vspx
+++ b/appsrc/ODS-Discussion/register.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: register.vspx,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: register.vspx,v 1.3.2.1 2010/09/20 10:15:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/rss.vsp b/appsrc/ODS-Discussion/rss.vsp
index 98dd093..24e1078 100644
--- a/appsrc/ODS-Discussion/rss.vsp
+++ b/appsrc/ODS-Discussion/rss.vsp
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="<?= current_charset () ?>"?>
<?vsp
--
--- $Id: rss.vsp,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: rss.vsp,v 1.3.2.1 2010/09/20 10:15:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/rsscomments.vsp b/appsrc/ODS-Discussion/rsscomments.vsp
index 821eee6..2a23fb9 100644
--- a/appsrc/ODS-Discussion/rsscomments.vsp
+++ b/appsrc/ODS-Discussion/rsscomments.vsp
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="<?= current_charset () ?>"?>
<?vsp
--
--- $Id: rsscomments.vsp,v 1.3.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: rsscomments.vsp,v 1.3.2.1 2010/09/20 10:15:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/setup.sql b/appsrc/ODS-Discussion/setup.sql
index ee7492d..6df545e 100644
--- a/appsrc/ODS-Discussion/setup.sql
+++ b/appsrc/ODS-Discussion/setup.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup.sql,v 1.27.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: setup.sql,v 1.27.2.1 2010/09/20 10:15:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/sioc_nntp.sql b/appsrc/ODS-Discussion/sioc_nntp.sql
index b2b4bf6..f32ea32 100644
--- a/appsrc/ODS-Discussion/sioc_nntp.sql
+++ b/appsrc/ODS-Discussion/sioc_nntp.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_nntp.sql,v 1.14.2.4 2012/03/08 10:46:16 source Exp $
+-- $Id: sioc_nntp.sql,v 1.14.2.3 2010/09/20 10:15:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/vad_version b/appsrc/ODS-Discussion/vad_version
index d12a887..a0903c6 100644
--- a/appsrc/ODS-Discussion/vad_version
+++ b/appsrc/ODS-Discussion/vad_version
@@ -1 +1 @@
-1.10.71
+1.10.70
diff --git a/appsrc/ODS-Discussion/virtuoso_app_links.xhtml b/appsrc/ODS-Discussion/virtuoso_app_links.xhtml
index 644d2fb..8cfeafd 100644
--- a/appsrc/ODS-Discussion/virtuoso_app_links.xhtml
+++ b/appsrc/ODS-Discussion/virtuoso_app_links.xhtml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: virtuoso_app_links.xhtml,v 1.1.2.2 2012/03/08 10:46:16 source Exp $
+ - $Id: virtuoso_app_links.xhtml,v 1.1.2.1 2010/09/20 10:15:11 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Discussion/wa_install.sql b/appsrc/ODS-Discussion/wa_install.sql
index 56d5f40..35911d9 100644
--- a/appsrc/ODS-Discussion/wa_install.sql
+++ b/appsrc/ODS-Discussion/wa_install.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_install.sql,v 1.4.2.3 2012/03/08 10:46:16 source Exp $
+-- $Id: wa_install.sql,v 1.4.2.2 2010/09/20 10:15:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/Makefile.am b/appsrc/ODS-FeedManager/Makefile.am
index 462be1a..5c6792e 100644
--- a/appsrc/ODS-FeedManager/Makefile.am
+++ b/appsrc/ODS-FeedManager/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -46,7 +46,6 @@ clean-local:
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-FeedManager/Makefile.in b/appsrc/ODS-FeedManager/Makefile.in
index a969291..51abc9f 100644
--- a/appsrc/ODS-FeedManager/Makefile.in
+++ b/appsrc/ODS-FeedManager/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -311,7 +309,6 @@ CLEANFILES = \
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-FeedManager/make_vad.sh b/appsrc/ODS-FeedManager/make_vad.sh
index af73552..f49cda7 100755
--- a/appsrc/ODS-FeedManager/make_vad.sh
+++ b/appsrc/ODS-FeedManager/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.44.2.32 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.44.2.30 2011/07/04 10:04:01 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -30,7 +30,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.0.0"
+VERSION="1.8.181"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -63,6 +63,11 @@ else
LN="ln -fs"
RM="rm -f"
fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
if [ "z$SERVER" = "z" ]
then
@@ -85,57 +90,6 @@ else
myrm=$RM
fi
-
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
- done
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
- rm -f version.tmp
- echo "$VERSION" > vad_version
- fi
-}
-
virtuoso_start() {
echo "Starting $SERVER"
echo $BUILD
@@ -271,7 +225,7 @@ sticker_init() {
echo " <name package=\"Feed Manager\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Feed Manager\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -283,8 +237,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.85.05\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-12-29 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.82.42\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -443,7 +397,6 @@ echo '----------------------'
STOP_SERVER
directory_clean
-version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -460,6 +413,7 @@ virtuoso_shutdown
STOP_SERVER
chmod 644 $VAD_DAV
chmod 644 $VAD_FS
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -469,7 +423,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-FeedManager/sql/DET_News3.sql b/appsrc/ODS-FeedManager/sql/DET_News3.sql
index e886fa8..a00f403 100644
--- a/appsrc/ODS-FeedManager/sql/DET_News3.sql
+++ b/appsrc/ODS-FeedManager/sql/DET_News3.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_News3.sql,v 1.4.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: DET_News3.sql,v 1.4.2.1 2010/09/20 10:15:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-api.sql b/appsrc/ODS-FeedManager/sql/nws-a-api.sql
index 36fe7eb..76b0ef8 100644
--- a/appsrc/ODS-FeedManager/sql/nws-a-api.sql
+++ b/appsrc/ODS-FeedManager/sql/nws-a-api.sql
@@ -6,12 +6,12 @@
--
--- $Id: nws-a-api.sql,v 1.7.2.4 2012/03/08 10:46:16 source Exp $
+-- $Id: nws-a-api.sql,v 1.7.2.3 2010/09/20 10:15:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-code.sql b/appsrc/ODS-FeedManager/sql/nws-a-code.sql
index adb6eea..d0563ff 100644
--- a/appsrc/ODS-FeedManager/sql/nws-a-code.sql
+++ b/appsrc/ODS-FeedManager/sql/nws-a-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: nws-a-code.sql,v 1.44.2.29 2012/03/08 11:48:57 source Exp $
+-- $Id: nws-a-code.sql,v 1.44.2.27 2011/03/23 12:19:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -6152,10 +6152,7 @@ create procedure ENEWS.WA.data (
create procedure ENEWS.WA.test_clear (
in S any)
{
- S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
- S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
-
- return S;
+ return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
}
;
@@ -6311,7 +6308,7 @@ create procedure ENEWS.WA.validate2 (
if (isnull(regexp_match('^[^\\\/\?\*\"\'\>\<\:\|]*\$', propertyValue)))
goto _error;
} else if ((propertyType = 'uri') or (propertyType = 'anyuri')) {
- if (isnull (regexp_match('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:~]*)?\$', propertyValue)))
+ if (isnull(regexp_match('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:]*)?\$', propertyValue)))
goto _error;
} else if (propertyType = 'email') {
if (isnull(regexp_match('^([a-zA-Z0-9_\-])+(\.([a-zA-Z0-9_\-])+)*@((\[(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5]))\]))|((([a-zA-Z0-9])+(([\-])+([a-zA-Z0-9])+)*\.)+([a-zA-Z])+(([\-])+([a-zA-Z0-9])+)*))\$', propertyValue)))
@@ -7469,6 +7466,63 @@ registry_set ('news_table_version', '1');
-------------------------------------------------------------------------------
--
+create procedure ENEWS.WA.obj2json (
+ in o any,
+ in d integer := 2)
+{
+ declare N, M integer;
+ declare R, T any;
+ declare retValue any;
+
+ if (d = 0)
+ return '[maximum depth achieved]';
+
+ T := vector ('\b', '\\b', '\t', '\\t', '\n', '\\n', '\f', '\\f', '\r', '\\r', '"', '\\"', '\\', '\\\\');
+ retValue := '';
+ if (isnumeric (o))
+ {
+ retValue := cast (o as varchar);
+ }
+ else if (isstring (o))
+ {
+ for (N := 0; N < length(o); N := N + 1)
+ {
+ R := chr (o[N]);
+ for (M := 0; M < length(T); M := M + 2)
+ {
+ if (R = T[M])
+ R := T[M+1];
+ }
+ retValue := retValue || R;
+ }
+ retValue := '"' || retValue || '"';
+ }
+ else if (isarray (o))
+ {
+ retValue := '[';
+ for (N := 0; N < length(o); N := N + 1)
+ {
+ retValue := retValue || ENEWS.WA.obj2json (o[N], d-1);
+ if (N <> length(o)-1)
+ retValue := retValue || ',\n';
+ }
+ retValue := retValue || ']';
+ }
+ return retValue;
+}
+;
+
+-------------------------------------------------------------------------------
+--
+create procedure ENEWS.WA.json2obj (
+ in o any)
+{
+ return json_parse (o);
+}
+;
+
+-------------------------------------------------------------------------------
+--
create procedure ENEWS.WA.pshCheck ()
{
return case when isnull (DB.DBA.VAD_CHECK_VERSION ('pubsubhub')) or ((select top 1 coalesce (WS_FEEDS_HUB_CALLBACK, 1) from DB.DBA.WA_SETTINGS) = 0) then 0 else 1 end;
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-ods.sql b/appsrc/ODS-FeedManager/sql/nws-a-ods.sql
index 5af37c5..2bcc5e7 100644
--- a/appsrc/ODS-FeedManager/sql/nws-a-ods.sql
+++ b/appsrc/ODS-FeedManager/sql/nws-a-ods.sql
@@ -1,10 +1,10 @@
--
--- $Id: nws-a-ods.sql,v 1.2.2.2 2012/03/08 10:46:16 source Exp $
+-- $Id: nws-a-ods.sql,v 1.2.2.1 2010/09/20 10:15:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-table.sql b/appsrc/ODS-FeedManager/sql/nws-a-table.sql
index 7eec6c4..6affc20 100644
--- a/appsrc/ODS-FeedManager/sql/nws-a-table.sql
+++ b/appsrc/ODS-FeedManager/sql/nws-a-table.sql
@@ -1,10 +1,10 @@
--
--- $Id: nws-a-table.sql,v 1.16.2.10 2012/03/08 10:46:16 source Exp $
+-- $Id: nws-a-table.sql,v 1.16.2.9 2011/05/20 16:24:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-a-wa.sql b/appsrc/ODS-FeedManager/sql/nws-a-wa.sql
index 695e16d..69654ce 100644
--- a/appsrc/ODS-FeedManager/sql/nws-a-wa.sql
+++ b/appsrc/ODS-FeedManager/sql/nws-a-wa.sql
@@ -1,10 +1,10 @@
--
--- $Id: nws-a-wa.sql,v 1.7.2.5 2012/03/08 10:46:16 source Exp $
+-- $Id: nws-a-wa.sql,v 1.7.2.4 2010/09/22 13:57:03 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/sql/nws-d.sql b/appsrc/ODS-FeedManager/sql/nws-d.sql
index 4185546..c9f156c 100644
--- a/appsrc/ODS-FeedManager/sql/nws-d.sql
+++ b/appsrc/ODS-FeedManager/sql/nws-d.sql
@@ -1,10 +1,10 @@
--
--- $Id: nws-d.sql,v 1.13.2.6 2012/03/08 10:46:16 source Exp $
+-- $Id: nws-d.sql,v 1.13.2.5 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/sql/sioc_feeds.sql b/appsrc/ODS-FeedManager/sql/sioc_feeds.sql
index 16bd725..3b23b6a 100644
--- a/appsrc/ODS-FeedManager/sql/sioc_feeds.sql
+++ b/appsrc/ODS-FeedManager/sql/sioc_feeds.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_feeds.sql,v 1.20.2.12 2012/03/08 11:48:57 source Exp $
+-- $Id: sioc_feeds.sql,v 1.20.2.10 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -232,7 +232,7 @@ create procedure fill_ods_subscriptions_sioc (in graph_iri varchar, in site_iri
--
create procedure fill_ods_feeds_sioc (in graph_iri varchar, in site_iri varchar, in _wai_name varchar := null)
{
- declare acl_graph_iri, iri, m_iri, f_iri, t_iri, u_iri, c_iri varchar;
+ declare iri, m_iri, f_iri, t_iri, u_iri, c_iri varchar;
declare tags, linksTo any;
declare id, deadl, cnt any;
@@ -241,7 +241,6 @@ create procedure fill_ods_feeds_sioc (in graph_iri varchar, in site_iri varchar,
fill_ods_feeds_services ();
for (select WAI_ID,
- WAI_IS_PUBLIC,
WAI_TYPE_NAME,
WAI_NAME,
WAI_ACL
@@ -249,9 +248,9 @@ create procedure fill_ods_feeds_sioc (in graph_iri varchar, in site_iri varchar,
where ((_wai_name is null) or (WAI_NAME = _wai_name))
and WAI_TYPE_NAME = 'eNews2') do
{
- acl_graph_iri := SIOC..acl_graph (WAI_TYPE_NAME, WAI_NAME);
- exec (sprintf ('sparql clear graph <%s>', acl_graph_iri));
- SIOC..wa_instance_acl_insert (WAI_IS_PUBLIC, WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
+ graph_iri := SIOC..acl_graph (WAI_TYPE_NAME, WAI_NAME);
+ exec (sprintf ('sparql clear graph <%s>', graph_iri));
+ SIOC..wa_instance_acl_insert (WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
for (select EFD_DOMAIN_ID, EFD_FEED_ID, EFD_ACL
from ENEWS.WA.FEED_DOMAIN
where EFD_DOMAIN_ID = WAI_ID and EFD_ACL is not null) do
diff --git a/appsrc/ODS-FeedManager/vad_version b/appsrc/ODS-FeedManager/vad_version
deleted file mode 100644
index 5d855c7..0000000
--- a/appsrc/ODS-FeedManager/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.19.64
diff --git a/appsrc/ODS-FeedManager/www/ajax.vsp b/appsrc/ODS-FeedManager/www/ajax.vsp
index 21ee0ef..ecf874a 100644
--- a/appsrc/ODS-FeedManager/www/ajax.vsp
+++ b/appsrc/ODS-FeedManager/www/ajax.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ajax.vsp,v 1.3.2.5 2012/03/08 11:48:57 source Exp $
+-- $Id: ajax.vsp,v 1.3.2.3 2010/10/07 13:23:02 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2007 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
@@ -107,7 +107,7 @@
}
http_rewrite ();
http_header ('Content-Type: text/plain\r\n');
- http (ODS..obj2json(returnData, 5));
+ http (ENEWS.WA.obj2json(returnData, 3));
}
else if (action = 'tags')
{
diff --git a/appsrc/ODS-FeedManager/www/annotea.vspx b/appsrc/ODS-FeedManager/www/annotea.vspx
index 4e7d967..ee65796 100644
--- a/appsrc/ODS-FeedManager/www/annotea.vspx
+++ b/appsrc/ODS-FeedManager/www/annotea.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: annotea.vspx,v 1.8.2.8 2012/03/08 10:46:16 source Exp $
+ - $Id: annotea.vspx,v 1.8.2.7 2011/07/04 10:04:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-FeedManager/www/attachment.vsp b/appsrc/ODS-FeedManager/www/attachment.vsp
index dd8eb9e..e1e3bc7 100644
--- a/appsrc/ODS-FeedManager/www/attachment.vsp
+++ b/appsrc/ODS-FeedManager/www/attachment.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: attachment.vsp,v 1.1.2.2 2012/03/08 10:46:17 source Exp $
+-- $Id: attachment.vsp,v 1.1.2.1 2010/09/20 10:15:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/blog.vspx b/appsrc/ODS-FeedManager/www/blog.vspx
index 89ac65f..2bcbed2 100644
--- a/appsrc/ODS-FeedManager/www/blog.vspx
+++ b/appsrc/ODS-FeedManager/www/blog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog.vspx,v 1.7.2.4 2012/03/08 10:46:17 source Exp $
+ - $Id: blog.vspx,v 1.7.2.3 2010/10/07 13:23:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/bookmark.vspx b/appsrc/ODS-FeedManager/www/bookmark.vspx
index 72c2fa4..dbb21b2 100644
--- a/appsrc/ODS-FeedManager/www/bookmark.vspx
+++ b/appsrc/ODS-FeedManager/www/bookmark.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bookmark.vspx,v 1.5.2.4 2012/03/08 10:46:17 source Exp $
+ - $Id: bookmark.vspx,v 1.5.2.3 2010/09/20 10:15:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/channels.vspx b/appsrc/ODS-FeedManager/www/channels.vspx
index 3332095..1cb69fc 100644
--- a/appsrc/ODS-FeedManager/www/channels.vspx
+++ b/appsrc/ODS-FeedManager/www/channels.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: channels.vspx,v 1.12.2.15 2012/03/08 10:46:17 source Exp $
+ - $Id: channels.vspx,v 1.12.2.14 2011/07/04 10:04:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/channels_create.vspx b/appsrc/ODS-FeedManager/www/channels_create.vspx
index 353ff7f..cc53d2d 100644
--- a/appsrc/ODS-FeedManager/www/channels_create.vspx
+++ b/appsrc/ODS-FeedManager/www/channels_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: channels_create.vspx,v 1.14.2.8 2012/03/08 10:46:17 source Exp $
+ - $Id: channels_create.vspx,v 1.14.2.7 2011/05/17 23:00:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/channels_select.vspx b/appsrc/ODS-FeedManager/www/channels_select.vspx
index b05ba51..bfa2b21 100644
--- a/appsrc/ODS-FeedManager/www/channels_select.vspx
+++ b/appsrc/ODS-FeedManager/www/channels_select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: channels_select.vspx,v 1.6.2.4 2012/03/08 10:46:17 source Exp $
+ - $Id: channels_select.vspx,v 1.6.2.3 2011/05/02 14:16:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/conversation.vspx b/appsrc/ODS-FeedManager/www/conversation.vspx
index 4f48d9e..21de8d2 100644
--- a/appsrc/ODS-FeedManager/www/conversation.vspx
+++ b/appsrc/ODS-FeedManager/www/conversation.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: conversation.vspx,v 1.13.2.5 2012/03/08 10:46:17 source Exp $
+ - $Id: conversation.vspx,v 1.13.2.4 2011/05/02 14:16:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/css/style.css b/appsrc/ODS-FeedManager/www/css/style.css
index 22bd88c..a9ff58c 100644
--- a/appsrc/ODS-FeedManager/www/css/style.css
+++ b/appsrc/ODS-FeedManager/www/css/style.css
@@ -1,10 +1,10 @@
/*
- * $Id: style.css,v 1.26.2.12 2012/03/08 11:48:57 source Exp $
+ * $Id: style.css,v 1.26.2.10 2011/05/17 23:00:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -27,23 +27,11 @@ body {
font-size: 9pt;
}
-pre {
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
form {
margin: 0;
padding: 0;
}
-abbr {
- border: none;
-}
-
.pointer {
cursor: pointer;
}
@@ -123,6 +111,43 @@ div.app_hdr_cmds_ctr {
margin: 0 5px 0 0;
}
+/* Footer */
+#FT {
+ width: 100%;
+ position: relative;
+ bottom: 0px;
+ font-size: 8pt;
+ float: left;
+ clear: both;
+ text-align: right;
+ border-top: 2px solid #fff;
+ margin-right: 10px;
+ background-color: #fff;
+ background-image: url(../image/ods_main_footer.png);
+}
+
+#FT_L {
+ float: left;
+ clear: left;
+ margin-top: 10px;
+ margin-left: 8px;
+ border: 1px solid #788;
+}
+
+#FT_R {
+ float: right;
+ clear: right;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ margin-right: 5px;
+ color: #788;
+}
+
+#FT_R a {
+ text-decoration: none;
+ color: inherit;
+}
+
#MTB {
width: 100%;
left: 0px;
diff --git a/appsrc/ODS-FeedManager/www/directories.vspx b/appsrc/ODS-FeedManager/www/directories.vspx
index d749ac4..aa7a575 100644
--- a/appsrc/ODS-FeedManager/www/directories.vspx
+++ b/appsrc/ODS-FeedManager/www/directories.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: directories.vspx,v 1.6.2.7 2012/03/08 10:46:17 source Exp $
+ - $Id: directories.vspx,v 1.6.2.6 2011/05/02 14:16:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/enews_login.vspx b/appsrc/ODS-FeedManager/www/enews_login.vspx
index ce74d64..dce8090 100644
--- a/appsrc/ODS-FeedManager/www/enews_login.vspx
+++ b/appsrc/ODS-FeedManager/www/enews_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: enews_login.vspx,v 1.5.2.6 2012/03/08 10:46:17 source Exp $
+ - $Id: enews_login.vspx,v 1.5.2.5 2010/10/07 13:23:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/error.vspx b/appsrc/ODS-FeedManager/www/error.vspx
index 4825a69..b69ea73 100644
--- a/appsrc/ODS-FeedManager/www/error.vspx
+++ b/appsrc/ODS-FeedManager/www/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.5.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: error.vspx,v 1.5.2.1 2010/09/20 10:15:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/export.vspx b/appsrc/ODS-FeedManager/www/export.vspx
index e7b8180..9411552 100644
--- a/appsrc/ODS-FeedManager/www/export.vspx
+++ b/appsrc/ODS-FeedManager/www/export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: export.vspx,v 1.10.2.6 2012/03/08 10:46:17 source Exp $
+ - $Id: export.vspx,v 1.10.2.5 2010/10/07 13:23:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/folders.vspx b/appsrc/ODS-FeedManager/www/folders.vspx
index 8bb5f8a..cb81e0d 100644
--- a/appsrc/ODS-FeedManager/www/folders.vspx
+++ b/appsrc/ODS-FeedManager/www/folders.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: folders.vspx,v 1.6.2.5 2012/03/08 10:46:17 source Exp $
+ - $Id: folders.vspx,v 1.6.2.4 2010/10/13 12:14:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/gems.vsp b/appsrc/ODS-FeedManager/www/gems.vsp
index 07db596..a4d5e12 100644
--- a/appsrc/ODS-FeedManager/www/gems.vsp
+++ b/appsrc/ODS-FeedManager/www/gems.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: gems.vsp,v 1.1.2.4 2012/03/08 10:46:17 source Exp $
+-- $Id: gems.vsp,v 1.1.2.3 2010/10/07 13:23:03 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-FeedManager/www/item.vspx b/appsrc/ODS-FeedManager/www/item.vspx
index f8303fb..25cbd58 100644
--- a/appsrc/ODS-FeedManager/www/item.vspx
+++ b/appsrc/ODS-FeedManager/www/item.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: item.vspx,v 1.4.2.7 2012/03/08 10:46:17 source Exp $
+ - $Id: item.vspx,v 1.4.2.6 2011/07/04 10:04:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-FeedManager/www/items.vspx b/appsrc/ODS-FeedManager/www/items.vspx
index e90637d..6820823 100644
--- a/appsrc/ODS-FeedManager/www/items.vspx
+++ b/appsrc/ODS-FeedManager/www/items.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: items.vspx,v 1.3.2.8 2012/03/08 10:46:17 source Exp $
+ - $Id: items.vspx,v 1.3.2.7 2011/07/04 10:04:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-FeedManager/www/js/enews.js b/appsrc/ODS-FeedManager/www/js/enews.js
index e018e0a..6139ceb 100644
--- a/appsrc/ODS-FeedManager/www/js/enews.js
+++ b/appsrc/ODS-FeedManager/www/js/enews.js
@@ -1,10 +1,10 @@
/*
- * $Id: enews.js,v 1.21.2.16 2012/03/08 11:48:58 source Exp $
+ * $Id: enews.js,v 1.21.2.14 2011/06/09 17:43:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -508,10 +508,12 @@ Feeds.listFavourites = function ()
Feeds.aboutDialog = function ()
{
var aboutDiv = $('aboutDiv');
- if (aboutDiv)
- OAT.Dom.unlink(aboutDiv);
-
- aboutDiv = OAT.Dom.create('div', {height: '160px', overflow: 'hidden'});
+ if (aboutDiv) {OAT.Dom.unlink(aboutDiv);}
+ aboutDiv = OAT.Dom.create('div', {
+ width:'430px',
+ height: '170px',
+ overflow: 'hidden'
+ });
aboutDiv.id = 'aboutDiv';
aboutDialog = new OAT.Dialog('About ODS FeedsManager', aboutDiv, {width:445, buttons: 0, resize:0, modal:1});
aboutDialog.cancel = aboutDialog.hide;
@@ -1115,8 +1117,7 @@ function checkState()
setTimeout("checkState()", 1000);
} else {
progressTimer = null;
- $('btn_Stop').value = 'Close';
- OAT.Dom.hide('btn_Background');
+ doPost ('F1', 'btn_Stop');
}
}
OAT.AJAX.POST('ajax.vsp', "a=load&sa=state&id="+progressID+urlParams("sid")+urlParams("realm"), x);
@@ -1185,17 +1186,12 @@ function showProgress(progressIndex)
}
}
-function davBrowse(fld, folders) {
- /* load stylesheets */
- OAT.Style.include("grid.css");
- OAT.Style.include("webdav.css");
-
+function davBrowse (fld)
+{
var options = {
mode: 'browser',
onConfirmClick: function(path, fname){$(fld).value = '/DAV' + path + fname;}
};
- if (!folders) {folders = false;}
- OAT.WebDav.options.foldersOnly = folders;
OAT.WebDav.open(options);
}
diff --git a/appsrc/ODS-FeedManager/www/news.vsp b/appsrc/ODS-FeedManager/www/news.vsp
index 2b11cac..e0b357a 100644
--- a/appsrc/ODS-FeedManager/www/news.vsp
+++ b/appsrc/ODS-FeedManager/www/news.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news.vsp,v 1.7.2.3 2012/03/08 10:46:17 source Exp $
+-- $Id: news.vsp,v 1.7.2.2 2010/09/20 10:15:15 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/news.vspx b/appsrc/ODS-FeedManager/www/news.vspx
index d48cb31..e41364f 100644
--- a/appsrc/ODS-FeedManager/www/news.vspx
+++ b/appsrc/ODS-FeedManager/www/news.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: news.vspx,v 1.21.2.5 2012/03/08 10:46:17 source Exp $
+ - $Id: news.vspx,v 1.21.2.4 2010/10/07 13:23:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/search.vspx b/appsrc/ODS-FeedManager/www/search.vspx
index 67f2625..e709fad 100644
--- a/appsrc/ODS-FeedManager/www/search.vspx
+++ b/appsrc/ODS-FeedManager/www/search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: search.vspx,v 1.18.2.10 2012/03/08 10:46:17 source Exp $
+ - $Id: search.vspx,v 1.18.2.9 2010/10/13 12:14:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/settings.vspx b/appsrc/ODS-FeedManager/www/settings.vspx
index 0b60e61..5cb7eff 100644
--- a/appsrc/ODS-FeedManager/www/settings.vspx
+++ b/appsrc/ODS-FeedManager/www/settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: settings.vspx,v 1.13.2.6 2012/03/08 11:48:57 source Exp $
+ - $Id: settings.vspx,v 1.13.2.4 2010/10/13 12:14:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -212,17 +212,6 @@
]]>
</v:on-post>
</v:button>
- <v:button name="clear" action="simple" value="Clear" xhtml_onclick="javascript: return confirm (\'Do you want to reset settings to default?\');" xhtml_class="form-button">
- <v:on-post>
- <![CDATA[
- delete from ENEWS.WA.SETTINGS where ES_DOMAIN_ID = self.domain_id;
- ENEWS.WA.nntp_update (self.domain_id, null, null, 1, 0);
- commit work;
-
- self.vc_data_bind(e);
- ]]>
- </v:on-post>
- </v:button>
<v:button action="simple" value="Cancel" xhtml_class="form-button">
<v:on-post>
<![CDATA[
diff --git a/appsrc/ODS-FeedManager/www/sfolders.vspx b/appsrc/ODS-FeedManager/www/sfolders.vspx
index 692cdbf..3eec723 100644
--- a/appsrc/ODS-FeedManager/www/sfolders.vspx
+++ b/appsrc/ODS-FeedManager/www/sfolders.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sfolders.vspx,v 1.7.2.8 2012/03/08 10:46:17 source Exp $
+ - $Id: sfolders.vspx,v 1.7.2.7 2011/05/02 14:16:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/tags.vspx b/appsrc/ODS-FeedManager/www/tags.vspx
index d9656a4..6d4ca4a 100644
--- a/appsrc/ODS-FeedManager/www/tags.vspx
+++ b/appsrc/ODS-FeedManager/www/tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tags.vspx,v 1.6.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: tags.vspx,v 1.6.2.1 2010/09/20 10:15:16 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/template/popup.vspx b/appsrc/ODS-FeedManager/www/template/popup.vspx
index ebcb3a0..0ad03ea 100644
--- a/appsrc/ODS-FeedManager/www/template/popup.vspx
+++ b/appsrc/ODS-FeedManager/www/template/popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: popup.vspx,v 1.10.2.9 2012/03/08 10:46:17 source Exp $
+ - $Id: popup.vspx,v 1.10.2.8 2011/07/04 10:04:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/template/template.vspx b/appsrc/ODS-FeedManager/www/template/template.vspx
index 92d1b17..d1ad474 100644
--- a/appsrc/ODS-FeedManager/www/template/template.vspx
+++ b/appsrc/ODS-FeedManager/www/template/template.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.vspx,v 1.33.2.14 2012/03/08 11:48:58 source Exp $
+ - $Id: template.vspx,v 1.33.2.12 2011/07/04 10:04:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -66,6 +66,11 @@
connectionHeaders: {Authorization: '<?V ENEWS.WA.account_basicAuthorization (self.account_id) ?>'}
};
+ /* load stylesheets */
+ OAT.Style.include("grid.css");
+ OAT.Style.include("webdav.css");
+ OAT.Style.include("winms.css");
+
var featureList=["ajax", "json", "anchor", "dialog", "tree", "calendar"];
OAT.Loader.load(featureList);
</script>
diff --git a/appsrc/ODS-FeedManager/www/template/template.xsl b/appsrc/ODS-FeedManager/www/template/template.xsl
index d072c5b..5a3ccec 100644
--- a/appsrc/ODS-FeedManager/www/template/template.xsl
+++ b/appsrc/ODS-FeedManager/www/template/template.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.xsl,v 1.29.2.10 2012/03/08 10:46:17 source Exp $
+ - $Id: template.xsl,v 1.29.2.9 2011/05/02 14:16:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/www/weblog.vspx b/appsrc/ODS-FeedManager/www/weblog.vspx
index 1dc7e09..a538aaa 100644
--- a/appsrc/ODS-FeedManager/www/weblog.vspx
+++ b/appsrc/ODS-FeedManager/www/weblog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: weblog.vspx,v 1.9.2.5 2012/03/08 10:46:17 source Exp $
+ - $Id: weblog.vspx,v 1.9.2.4 2010/10/13 12:14:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/xslt/foaf.xsl b/appsrc/ODS-FeedManager/xslt/foaf.xsl
index 26f2d8f..41798cc 100644
--- a/appsrc/ODS-FeedManager/xslt/foaf.xsl
+++ b/appsrc/ODS-FeedManager/xslt/foaf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: foaf.xsl,v 1.2.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: foaf.xsl,v 1.2.2.1 2010/09/20 10:15:16 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/xslt/rss2atom.xsl b/appsrc/ODS-FeedManager/xslt/rss2atom.xsl
index 54f25c1..86d363d 100644
--- a/appsrc/ODS-FeedManager/xslt/rss2atom.xsl
+++ b/appsrc/ODS-FeedManager/xslt/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.3.2.4 2012/03/08 10:46:17 source Exp $
+ - $Id: rss2atom.xsl,v 1.3.2.3 2010/09/20 10:15:16 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl b/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl
index 44ac8c9..3f7456d 100644
--- a/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl
+++ b/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.3.2.3 2012/03/08 10:46:17 source Exp $
+ - $Id: rss2atom03.xsl,v 1.3.2.2 2010/09/20 10:15:16 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl b/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl
index 9a730d1..26c06dc 100644
--- a/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl
+++ b/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.4.2.3 2012/03/08 10:46:17 source Exp $
+ - $Id: rss2rdf.xsl,v 1.4.2.2 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl b/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl
index cce3e11..99f98d6 100644
--- a/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl
+++ b/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/Makefile.am b/appsrc/ODS-Framework/Makefile.am
index c4597f4..55b20bd 100644
--- a/appsrc/ODS-Framework/Makefile.am
+++ b/appsrc/ODS-Framework/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -47,14 +47,12 @@ EXTRA_DIST = \
*.css \
*.html \
*.js \
- *.php \
*.sql \
*.txt \
*.vsp \
*.vspx \
*.xml \
*.xsl \
- ckeditor/*.css \
ckeditor/*.html \
ckeditor/*.js \
ckeditor/images/*.gif \
@@ -137,4 +135,6 @@ EXTRA_DIST = \
users/js/*.js \
users/users.jsp \
users/users.rb \
- vad_version
+ vad_version \
+ version.base \
+ version.curr
diff --git a/appsrc/ODS-Framework/Makefile.in b/appsrc/ODS-Framework/Makefile.in
index b71ca82..d57c5da 100644
--- a/appsrc/ODS-Framework/Makefile.in
+++ b/appsrc/ODS-Framework/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -312,14 +310,12 @@ EXTRA_DIST = \
*.css \
*.html \
*.js \
- *.php \
*.sql \
*.txt \
*.vsp \
*.vspx \
*.xml \
*.xsl \
- ckeditor/*.css \
ckeditor/*.html \
ckeditor/*.js \
ckeditor/images/*.gif \
@@ -402,7 +398,9 @@ EXTRA_DIST = \
users/js/*.js \
users/users.jsp \
users/users.rb \
- vad_version
+ vad_version \
+ version.base \
+ version.curr
all: all-am
diff --git a/appsrc/ODS-Framework/aboutus.html b/appsrc/ODS-Framework/aboutus.html
index 3e930bb..b2abf52 100644
--- a/appsrc/ODS-Framework/aboutus.html
+++ b/appsrc/ODS-Framework/aboutus.html
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: aboutus.html,v 1.2.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: aboutus.html,v 1.2.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/accounts.vspx b/appsrc/ODS-Framework/accounts.vspx
index 81a9138..6fd0a2e 100644
--- a/appsrc/ODS-Framework/accounts.vspx
+++ b/appsrc/ODS-Framework/accounts.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: accounts.vspx,v 1.7.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: accounts.vspx,v 1.7.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/add_rule.vspx b/appsrc/ODS-Framework/add_rule.vspx
index 4733b0e..25bf19a 100644
--- a/appsrc/ODS-Framework/add_rule.vspx
+++ b/appsrc/ODS-Framework/add_rule.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: add_rule.vspx,v 1.4.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: add_rule.vspx,v 1.4.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/admin.vspx b/appsrc/ODS-Framework/admin.vspx
index b3e7ca0..580da4a 100644
--- a/appsrc/ODS-Framework/admin.vspx
+++ b/appsrc/ODS-Framework/admin.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: admin.vspx,v 1.4.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: admin.vspx,v 1.4.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/advertise.html b/appsrc/ODS-Framework/advertise.html
index 86a4f5b..d8e99b7 100644
--- a/appsrc/ODS-Framework/advertise.html
+++ b/appsrc/ODS-Framework/advertise.html
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: advertise.html,v 1.2.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: advertise.html,v 1.2.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/afoaf.xml b/appsrc/ODS-Framework/afoaf.xml
index e7167aa..9d4a134 100644
--- a/appsrc/ODS-Framework/afoaf.xml
+++ b/appsrc/ODS-Framework/afoaf.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: afoaf.xml,v 1.5.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: afoaf.xml,v 1.5.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/app.js b/appsrc/ODS-Framework/app.js
index 3e62452..528b78b 100644
--- a/appsrc/ODS-Framework/app.js
+++ b/appsrc/ODS-Framework/app.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Framework/app.vspx b/appsrc/ODS-Framework/app.vspx
index dadb873..80974f6 100644
--- a/appsrc/ODS-Framework/app.vspx
+++ b/appsrc/ODS-Framework/app.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: app.vspx,v 1.6.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: app.vspx,v 1.6.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/app_inst.vspx b/appsrc/ODS-Framework/app_inst.vspx
index 5e89de1..bbccd52 100644
--- a/appsrc/ODS-Framework/app_inst.vspx
+++ b/appsrc/ODS-Framework/app_inst.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: app_inst.vspx,v 1.19.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: app_inst.vspx,v 1.19.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/app_instance_limits.vspx b/appsrc/ODS-Framework/app_instance_limits.vspx
index 444c2fb..a2758ca 100644
--- a/appsrc/ODS-Framework/app_instance_limits.vspx
+++ b/appsrc/ODS-Framework/app_instance_limits.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: app_instance_limits.vspx,v 1.4.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: app_instance_limits.vspx,v 1.4.2.1 2010/09/20 10:15:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/app_menu.js b/appsrc/ODS-Framework/app_menu.js
index 8a11ce4..96ec3b7 100644
--- a/appsrc/ODS-Framework/app_menu.js
+++ b/appsrc/ODS-Framework/app_menu.js
@@ -1,10 +1,10 @@
/*
- * $Id: app_menu.js,v 1.3.2.2 2012/03/08 10:46:17 source Exp $
+ * $Id: app_menu.js,v 1.3.2.1 2010/09/20 10:15:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/app_menu_settings.vspx b/appsrc/ODS-Framework/app_menu_settings.vspx
index 98c5762..2d4b353 100644
--- a/appsrc/ODS-Framework/app_menu_settings.vspx
+++ b/appsrc/ODS-Framework/app_menu_settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: app_menu_settings.vspx,v 1.7.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: app_menu_settings.vspx,v 1.7.2.1 2010/09/20 10:15:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/app_my_inst.vspx b/appsrc/ODS-Framework/app_my_inst.vspx
index 409c73e..85613d7 100644
--- a/appsrc/ODS-Framework/app_my_inst.vspx
+++ b/appsrc/ODS-Framework/app_my_inst.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: app_my_inst.vspx,v 1.21.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: app_my_inst.vspx,v 1.21.2.1 2010/09/20 10:15:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/app_sent_inv.vspx b/appsrc/ODS-Framework/app_sent_inv.vspx
index 707f745..834fedd 100644
--- a/appsrc/ODS-Framework/app_sent_inv.vspx
+++ b/appsrc/ODS-Framework/app_sent_inv.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: app_sent_inv.vspx,v 1.4.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: app_sent_inv.vspx,v 1.4.2.1 2010/09/20 10:15:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/app_settings.vspx b/appsrc/ODS-Framework/app_settings.vspx
index be6c5e3..b269ffd 100644
--- a/appsrc/ODS-Framework/app_settings.vspx
+++ b/appsrc/ODS-Framework/app_settings.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: app_settings.vspx,v 1.10.2.4 2012/03/08 10:46:17 source Exp $
+ - $Id: app_settings.vspx,v 1.10.2.3 2011/03/08 13:28:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/back_nav.vspx b/appsrc/ODS-Framework/back_nav.vspx
index c15a512..d2f27be 100644
--- a/appsrc/ODS-Framework/back_nav.vspx
+++ b/appsrc/ODS-Framework/back_nav.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: back_nav.vspx,v 1.5.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: back_nav.vspx,v 1.5.2.1 2010/09/20 10:15:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/cert.vsp b/appsrc/ODS-Framework/cert.vsp
index 87a27e6..df7bede 100644
--- a/appsrc/ODS-Framework/cert.vsp
+++ b/appsrc/ODS-Framework/cert.vsp
@@ -18,14 +18,14 @@
sid := {?'sid'};
if (get_keyword ('pubkey', params) is not null)
{
- declare exts, login any;
+ declare exts any;
whenever not found goto nf;
select U_NAME, U_FULL_NAME, U_E_MAIL, WAUI_BORG, WAUI_BCOUNTRY, U_ID
into uname, cn, mail, o, c, uid
from SYS_USERS, WA_USER_INFO, VSPX_SESSION
where VS_SID = sid and VS_REALM = 'wa' and VS_UID = U_NAME and U_ID = WAUI_U_ID;
webid := sioc..person_iri (sioc..user_obj_iri (uname));
-
+
pk := replace (get_keyword ('pubkey', params), '\r\n', '');
pk := replace (pk, '\n', '');
pk := replace (pk, '\r', '');
@@ -36,7 +36,7 @@
mail := get_keyword ('email', params, mail);
webid := get_keyword ('webid', params, webid);
if (length (webid))
- {
+ {
webid := 'URI:' || replace (webid, ',', '%2C');
exts := vector ('subjectAltName', webid, 'nsComment', 'Virtuoso Generated Certificate');
}
@@ -44,8 +44,6 @@
{
exts := vector ('nsComment', 'Virtuoso Generated Certificate');
}
- exts := vector_concat (exts, vector ('keyUsage', 'critical, digitalSignature,keyEncipherment',
- 'extendedKeyUsage', 'critical, clientAuth,emailProtection'));
days := atoi (get_keyword ('days', params, '365'));
hours := atof (get_keyword ('hours', params, '0.0'));
xenc_x509_generate ('id_rsa', kname, sequence_next ('ca_id_rsa'), days,
@@ -58,12 +56,9 @@
exts,
hours);
cvalue := xenc_pem_export (kname);
- login := 1;
- if (exists (select 1 from WA_USER_CERTS where UC_U_ID = uid and UC_LOGIN = 1))
- login := 0;
insert into WA_USER_CERTS (UC_U_ID, UC_CERT, UC_FINGERPRINT, UC_LOGIN, UC_TS)
- values (uid, cvalue, get_certificate_info (6, cvalue, 0, ''), login, now ());
- http_rewrite ();
+ values (uid, cvalue, get_certificate_info (6, cvalue, 0, ''), 0, now ());
+ http_rewrite ();
http_header ('Content-Type: application/x-x509-user-cert\r\n');
http (decode_base64 (xenc_X509_certificate_serialize (kname)));
xenc_key_remove (kname);
@@ -79,40 +74,40 @@
svc_url := (select top 1 WS_CERT_GEN_URL from DB.DBA.WA_SETTINGS);
if (length (svc_url)) {
for select U_NAME, U_FULL_NAME, U_E_MAIL, WAUI_BORG, WAUI_BCOUNTRY from SYS_USERS, VSPX_SESSION, WA_USER_INFO
- where VS_SID = sid and VS_REALM = 'wa' and VS_UID = U_NAME and U_ID = WAUI_U_ID do
+ where VS_SID = sid and VS_REALM = 'wa' and VS_UID = U_NAME and U_ID = WAUI_U_ID do
{
declare url varchar;
webid := sioc..person_iri (sioc..user_obj_iri (U_NAME));
url := sprintf ('%s?uri=%U&name=%U&email=%U&organization=%U',
- svc_url, webid, coalesce (U_FULL_NAME, U_NAME), coalesce (U_E_MAIL, ''), coalesce (WAUI_BORG, ''));
-
+ svc_url, webid, coalesce (U_FULL_NAME, U_NAME), coalesce (U_E_MAIL, ''), coalesce (WAUI_BORG, ''));
+
?>
<form>
<div>
- <a class="button" href='<?vsp http (url); ?>'>Generate</a>
+ <a class="button" href='<?vsp http (url); ?>'>Generate</a>
</div>
</form>
-
+
<?vsp
- }
- }
+ }
+ }
else if (regexp_match ('Mozilla.*Windows.*Firefox.*\.NET CLR .*', ua) is not null)
goto make_cert;
- else
- { ?>Certificate & Key Generation Not Supported. You can export a PKCS12 file produced by other browsers instead <?vsp }
+ else
+ { ?>Certificate & Key Generation Not Supported. You can export a PKCS12 file produced by other browsers instead <?vsp }
}
else
{
make_cert:;
for select U_NAME, U_FULL_NAME, U_E_MAIL, WAUI_BORG, WAUI_BCOUNTRY from SYS_USERS, VSPX_SESSION, WA_USER_INFO
- where VS_SID = sid and VS_REALM = 'wa' and VS_UID = U_NAME and U_ID = WAUI_U_ID do
+ where VS_SID = sid and VS_REALM = 'wa' and VS_UID = U_NAME and U_ID = WAUI_U_ID do
{
cn := coalesce (U_FULL_NAME, U_NAME);
webid := sioc..person_iri (sioc..user_obj_iri (U_NAME));
mail := coalesce (U_E_MAIL, '');
o := WAUI_BORG;
c := WAUI_BCOUNTRY;
-
+
}
?>
<form>
@@ -120,7 +115,7 @@
<table border="0">
<tr>
<td nowrap="1">
- Common Name:
+ Common Name:
</td>
<td>
<input type="text" name="cn" value="<?V cn ?>" size="50"/>
@@ -128,7 +123,7 @@
</tr>
<tr>
<td nowrap="1">
- Country:
+ Country:
</td>
<td>
<input type="text" name="c" value="<?V c ?>" size="50"/>
@@ -136,7 +131,7 @@
</tr>
<tr>
<td nowrap="1">
- Organization:
+ Organization:
</td>
<td>
<input type="text" name="o" value="<?V o ?>" size="50"/>
@@ -152,7 +147,7 @@
</tr>
<tr>
<td>
- WebID:
+ WebID:
</td>
<td>
<input type="text" name="webid" value="<?V webid ?>" size="80" />
@@ -160,7 +155,7 @@
</tr>
<tr>
<td>
- Key strength:
+ Key strength:
</td>
<td>
<keygen name="pubkey" />
@@ -168,7 +163,7 @@
</tr>
<tr>
<td rowspan="2">
- Valid for
+ Valid for
</td>
<td>
<input type="text" name="hours" value="0.0" size="4"/> hours
diff --git a/appsrc/ODS-Framework/ckeditor/contents.css b/appsrc/ODS-Framework/ckeditor/contents.css
deleted file mode 100644
index 98fe2d1..0000000
--- a/appsrc/ODS-Framework/ckeditor/contents.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
-*/
-
-body
-{
- /* Font */
- font-family: Arial, Verdana, sans-serif;
- font-size: 12px;
-
- /* Text color */
- color: #222;
-
- /* Remove the background color to make it transparent */
- background-color: #fff;
-}
-
-ol,ul,dl
-{
- /* IE7: reset rtl list margin. (#7334) */
- *margin-right:0px;
- /* preserved spaces for rtl list item bullets. (#6249)*/
- padding-right:40px;
-}
diff --git a/appsrc/ODS-Framework/common.css b/appsrc/ODS-Framework/common.css
index eecc5ba..673fd2e 100644
--- a/appsrc/ODS-Framework/common.css
+++ b/appsrc/ODS-Framework/common.css
@@ -1,10 +1,10 @@
/*
- * $Id: common.css,v 1.1.4.9 2012/03/08 10:46:17 source Exp $
+ * $Id: common.css,v 1.1.4.3 2011/05/16 08:53:55 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -21,43 +21,6 @@
*
*/
-/* Footer */
-#FT {
- width: 100%;
- position: relative;
- bottom: 0px;
- font-size: 8pt;
- float: left;
- clear: both;
- text-align: right;
- border-top: 2px solid #fff;
- margin-right: 10px;
- background-color: #fff;
- background-image: url(/ods/images/ods_main_footer.png);
-}
-
-#FT_L {
- float: left;
- clear: left;
- margin-top: 10px;
- margin-left: 8px;
- border: 1px solid #788;
-}
-
-#FT_R {
- float: right;
- clear: right;
- margin-top: 10px;
- margin-bottom: 10px;
- margin-right: 5px;
- color: #788;
-}
-
-#FT_R a {
- text-decoration: none;
- color: inherit;
-}
-
/* ODS grids */
table.ODS_grid {
width: 100%;
@@ -80,7 +43,7 @@ table.ODS_grid tbody tr:nth-child(even) {
}
table.ODS_grid thead tr th {
- height: 20px;
+ height: 18px;
text-align: left !important;
white-space: nowrap;
padding: 0px 2px 1px 2px !important;
@@ -98,11 +61,6 @@ table.ODS_grid thead tr th:last-child {
border-width: 0px 0px 1px 0px;
}
-
-table.ODS_grid tbody tr.selected {
- background-color: #FFFFCC;
-}
-
table.ODS_grid th.checkbox, table.ODS_grid td.checkbox {
width: 1px;
text-align: center;
@@ -228,130 +186,3 @@ td.calendar_selected {
background-color: #eec;
}
-/* Tabs */
-div.ODS_tabMain {
- width: 100%;
-}
-
-div.ODS_tabs {
- top: 0px;
- font-size: 100%;
- padding: 0px 0px 3px 0px;
-}
-
-div.ODS_tabContents {
- padding: 0.5em;
- border: 1px solid #7f94a5;
- background-color: #EFEFEF;
-}
-
-div.ODS_tabContent {
- border: 0px;
- font-size: 1em;
- padding: 6px;
-}
-
-div.ODS_tabLabel {
- cursor: pointer;
- display: inline;
- font-weight: bold;
- background-color: #b0cde4;
- border: 1px solid #000;
- border-bottom-width: 0px;
- border-color: #7f94a5;
- -moz-border-radius-topleft: 3px;
- -moz-border-radius-topright: 3px;
- -webkit-border-top-left-radius: 3px;
- -webkit-border-top-right-radius: 3px;
- padding: 2px 10px 2px 10px;
- margin-right: 3px;
- position: relative;
- text-decoration: none;
- top: 2px;
- z-index: 100;
-}
-
-div.ODS_tabLabelActive {
- background-color: #EFEFEF;
- border-color: #7f94a5;
-}
-
-/* Forms */
-.ODS_formHeader
-{
- font-size: 13px;
- font-weight: bold;
- margin: 0 0 8px 0;
- padding: 0px 0px 3px 4px;
- border: solid #7f94a5;
- border-width: 1px 1px 1px 10px;
- background-color: #B0CDE4;
-}
-
-.ODS_formFooter
-{
- margin: 6px 0px;
- text-align: center;
- border: solid 1px #7f94a5;
- background-color: #B0CDE4;
- height: 20px;
- padding-top: 0px;
- padding-bottom: 2px;
-}
-
-.ODS_formBody {
- font-size: 1em;
- padding: 6px;
- border: solid #7f94a5;
- border-width: 1px 1px 1px 1px;
- background-color: #EFEFEF;
-}
-
-.ODS_formBody table {
- width: 100%;
- background-color: #EFEFEF;
-}
-
-.ODS_formBody table td {
- padding: 2px;
-}
-
-.ODS_formBody table th {
- text-align: right;
- white-space: nowrap;
- padding: 2px 4px 2px 4px;
-}
-
-.ODS_formList {
- width: 100%;
- border: solid #7f94a5;
- border-width: 1px 1px 1px 1px;
- background-color: #fff;
-}
-
-.ODS_formList tr th {
- text-align: center;
- white-space: nowrap;
- font-size: 1em;
- font-weight: bold;
- padding: 2px 4px 2px 4px;
- border: solid #7f94a5;
- background-color: #b0cde4;
- border-width: 0px 1px 1px 0px;
-}
-
-.ODS_formList th:last-child {
- border-width: 0px 0px 1px 0px;
-}
-
-.ODS_formList td {
- border: solid #7f94a5;
- border-width: 0px 0px 0px 0px;
- padding: 2px 4px 2px 4px;
- background-color: #FFF;
-}
-
-/* OAT patches */
-div.oat_winms_close_b {
- background-image: url("/ods/images/oat/MsWin_close.png");
-}
\ No newline at end of file
diff --git a/appsrc/ODS-Framework/common.js b/appsrc/ODS-Framework/common.js
index 1a80cfe..def7fb8 100644
--- a/appsrc/ODS-Framework/common.js
+++ b/appsrc/ODS-Framework/common.js
@@ -1,10 +1,10 @@
/*
- * $Id: common.js,v 1.13.2.45 2012/03/08 10:46:17 source Exp $
+ * $Id: common.js,v 1.13.2.43 2011/08/01 14:14:20 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -570,25 +570,6 @@ function pageFocus(tab) {
}
}
-function accountDisable(userName)
-{
- var S = '/ods/api/user.disable?name='+encodeURIComponent($v(userName))
- + '&sid=' + document.forms[0].elements['sid'].value
- + '&realm=' + document.forms[0].elements['realm'].value;
- var x = function(data) {
- var xml = OAT.Xml.createXmlDoc(data);
- if (!hasError(xml, false)) {
- alert('User\'s account is disabled!');
- if (parent) {
- parent.document.location = document.location.protocol + '//' + document.location.host + '/ods';
- } else {
- document.location = document.location.protocol + '//' + document.location.host + '/ods';
- }
- }
- }
- OAT.AJAX.GET(S, '', x);
-}
-
// RDF Relations
// ---------------------------------------------------------------------------
var rdfDialog
diff --git a/appsrc/ODS-Framework/community.vspx b/appsrc/ODS-Framework/community.vspx
index 703a1ef..61d7ce3 100644
--- a/appsrc/ODS-Framework/community.vspx
+++ b/appsrc/ODS-Framework/community.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: community.vspx,v 1.4.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: community.vspx,v 1.4.2.1 2010/09/20 10:15:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/app_inst_menu.xsl b/appsrc/ODS-Framework/comp/app_inst_menu.xsl
index c9b87de..cbc3ce0 100644
--- a/appsrc/ODS-Framework/comp/app_inst_menu.xsl
+++ b/appsrc/ODS-Framework/comp/app_inst_menu.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: app_inst_menu.xsl,v 1.6.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: app_inst_menu.xsl,v 1.6.2.1 2010/09/20 10:15:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/app_search.xsl b/appsrc/ODS-Framework/comp/app_search.xsl
index a16a913..4c1a3f1 100644
--- a/appsrc/ODS-Framework/comp/app_search.xsl
+++ b/appsrc/ODS-Framework/comp/app_search.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: app_search.xsl,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: app_search.xsl,v 1.4.2.1 2010/09/20 10:15:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/apps.xsl b/appsrc/ODS-Framework/comp/apps.xsl
index 2f333c4..76c1754 100644
--- a/appsrc/ODS-Framework/comp/apps.xsl
+++ b/appsrc/ODS-Framework/comp/apps.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: apps.xsl,v 1.8.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: apps.xsl,v 1.8.2.1 2010/09/20 10:15:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/check.xsl b/appsrc/ODS-Framework/comp/check.xsl
index 8125977..3004b50 100644
--- a/appsrc/ODS-Framework/comp/check.xsl
+++ b/appsrc/ODS-Framework/comp/check.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: check.xsl,v 1.3.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: check.xsl,v 1.3.2.1 2010/09/20 10:15:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/check_register.xsl b/appsrc/ODS-Framework/comp/check_register.xsl
index c9882be..b9dc2c7 100644
--- a/appsrc/ODS-Framework/comp/check_register.xsl
+++ b/appsrc/ODS-Framework/comp/check_register.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: check_register.xsl,v 1.3.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: check_register.xsl,v 1.3.2.1 2010/09/20 10:15:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/dashboard.xsl b/appsrc/ODS-Framework/comp/dashboard.xsl
index c51994f..94c9ca7 100644
--- a/appsrc/ODS-Framework/comp/dashboard.xsl
+++ b/appsrc/ODS-Framework/comp/dashboard.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dashboard.xsl,v 1.39.2.12 2012/03/08 10:46:19 source Exp $
+ - $Id: dashboard.xsl,v 1.39.2.9 2011/07/04 10:04:38 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1399,7 +1399,7 @@
function generateDSLinks()
{
- OAT.Preferences.stylePath = '/ods/oat/styles/';
+ OAT.Preferences.stylePath = '/ods/';
OAT.Anchor.imagePath = '/ods/images/oat/';
OAT.Anchor.zIndex = 1001;
@@ -2405,10 +2405,16 @@
</div>
<div class="w_pane content_pane">
<?vsp
+
declare q_str, rc, dta, h any;
- q_str := 'select count (*) as ALL_CNT, sum (mod (MM_IS_READED+1,2)) as NEW_CNT from DB.DBA.MAIL_MESSAGE where MM_OWN = ?';
- rc := exec (q_str, null, null, vector (self.u_name), 0, null, null, h);
+ q_str := sprintf('select COUNT(*) as ALL_CNT,
+ SUM(either(MSTATUS,0,1)) as NEW_CNT
+ from OMAIL.WA.MESSAGES
+ where USER_ID = %d',
+ self.u_id);
+
+ rc := exec (q_str, null, null, vector (), 0, null, null, h);
while (0 = exec_next (h, null, null, dta))
{
exec_result (dta);
diff --git a/appsrc/ODS-Framework/comp/dashboard_style.xsl b/appsrc/ODS-Framework/comp/dashboard_style.xsl
index 7a3bb9a..5d72982 100644
--- a/appsrc/ODS-Framework/comp/dashboard_style.xsl
+++ b/appsrc/ODS-Framework/comp/dashboard_style.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dashboard_style.xsl,v 1.4.2.3 2012/03/08 10:46:19 source Exp $
+ - $Id: dashboard_style.xsl,v 1.4.2.2 2010/09/20 10:15:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/dav_browser.xsl b/appsrc/ODS-Framework/comp/dav_browser.xsl
index 2bdc591..912f84f 100644
--- a/appsrc/ODS-Framework/comp/dav_browser.xsl
+++ b/appsrc/ODS-Framework/comp/dav_browser.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: dav_browser.xsl,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: dav_browser.xsl,v 1.5.2.1 2010/09/20 10:15:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/help.xml b/appsrc/ODS-Framework/comp/help.xml
index e8869df..3189422 100644
--- a/appsrc/ODS-Framework/comp/help.xml
+++ b/appsrc/ODS-Framework/comp/help.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" standalone="yes" ?>
<!--
-
- - $Id: help.xml,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: help.xml,v 1.4.2.1 2010/09/20 10:15:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/help.xsl b/appsrc/ODS-Framework/comp/help.xsl
index 296363e..668931b 100644
--- a/appsrc/ODS-Framework/comp/help.xsl
+++ b/appsrc/ODS-Framework/comp/help.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: help.xsl,v 1.2.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: help.xsl,v 1.2.2.1 2010/09/20 10:15:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/home.xsl b/appsrc/ODS-Framework/comp/home.xsl
index 0a6b40f..581e7fe 100644
--- a/appsrc/ODS-Framework/comp/home.xsl
+++ b/appsrc/ODS-Framework/comp/home.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: home.xsl,v 1.21.2.7 2012/03/08 10:46:19 source Exp $
+ - $Id: home.xsl,v 1.21.2.6 2010/12/20 12:27:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/inst.xsl b/appsrc/ODS-Framework/comp/inst.xsl
index 4ccb922..0b6718e 100644
--- a/appsrc/ODS-Framework/comp/inst.xsl
+++ b/appsrc/ODS-Framework/comp/inst.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: inst.xsl,v 1.13.2.4 2012/03/08 10:46:19 source Exp $
+ - $Id: inst.xsl,v 1.13.2.3 2010/11/11 12:38:19 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/login.xsl b/appsrc/ODS-Framework/comp/login.xsl
index 6824547..43e4d34 100644
--- a/appsrc/ODS-Framework/comp/login.xsl
+++ b/appsrc/ODS-Framework/comp/login.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.xsl,v 1.21.2.12 2012/03/08 10:46:19 source Exp $
+ - $Id: login.xsl,v 1.21.2.10 2011/08/01 14:14:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -62,7 +62,7 @@
<td valign="top">
<div id="lf" class="form">
<div class="header">
- Please identify yourself <img id="lf_throbber" src="/ods/images/oat/Ajax_throbber.gif" style="float: right; margin-right: 10px; display: none" />
+ Identify Yourself <img id="lf_throbber" src="/ods/images/oat/Ajax_throbber.gif" style="float: right; margin-right: 10px; display: none" />
</div>
<ul id="lf_tabs" class="tabs">
<li id="lf_tab_0" title="Digest">Digest</li>
diff --git a/appsrc/ODS-Framework/comp/make_sp.xsl b/appsrc/ODS-Framework/comp/make_sp.xsl
index f42e917..8578e12 100644
--- a/appsrc/ODS-Framework/comp/make_sp.xsl
+++ b/appsrc/ODS-Framework/comp/make_sp.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: make_sp.xsl,v 1.3.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: make_sp.xsl,v 1.3.2.1 2010/09/20 10:15:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/map_control.js b/appsrc/ODS-Framework/comp/map_control.js
index 7ca220a..e64ccbb 100644
--- a/appsrc/ODS-Framework/comp/map_control.js
+++ b/appsrc/ODS-Framework/comp/map_control.js
@@ -1,10 +1,10 @@
/*
- * $Id: map_control.js,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ * $Id: map_control.js,v 1.5.2.1 2010/09/20 10:15:33 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/map_control.xsl b/appsrc/ODS-Framework/comp/map_control.xsl
index d1188c1..520a47e 100644
--- a/appsrc/ODS-Framework/comp/map_control.xsl
+++ b/appsrc/ODS-Framework/comp/map_control.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: map_control.xsl,v 1.12.2.4 2012/03/08 10:46:19 source Exp $
+ - $Id: map_control.xsl,v 1.12.2.3 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/members.xsl b/appsrc/ODS-Framework/comp/members.xsl
index 38ce404..61c0c19 100644
--- a/appsrc/ODS-Framework/comp/members.xsl
+++ b/appsrc/ODS-Framework/comp/members.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: members.xsl,v 1.3.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: members.xsl,v 1.3.2.1 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/membership.xsl b/appsrc/ODS-Framework/comp/membership.xsl
index 56e0035..0cc7a03 100644
--- a/appsrc/ODS-Framework/comp/membership.xsl
+++ b/appsrc/ODS-Framework/comp/membership.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: membership.xsl,v 1.3.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: membership.xsl,v 1.3.2.1 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/ods_bar.xsl b/appsrc/ODS-Framework/comp/ods_bar.xsl
index 52dc75e..616f378 100644
--- a/appsrc/ODS-Framework/comp/ods_bar.xsl
+++ b/appsrc/ODS-Framework/comp/ods_bar.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ods_bar.xsl,v 1.40.2.14 2012/03/08 10:46:19 source Exp $
+ - $Id: ods_bar.xsl,v 1.40.2.12 2011/03/08 13:28:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -236,9 +236,11 @@ if (typeof (OAT) == 'undefined')
OAT.Loader.load(["ajax","xml"],function(){});
OAT.Preferences.imagePath="<?V self.odsbar_ods_gpath ?>images/oat/";
- OAT.Preferences.stylePath="<?V self.odsbar_ods_gpath ?>oat/styles/";
+ OAT.Preferences.stylePath="<?V self.odsbar_ods_gpath ?>";
+
OAT.Style.include('winrect.css');
+
if (typeof ODSInitArray != 'undefined')
{
for (var i = 0; i < ODSInitArray.length; i++)
diff --git a/appsrc/ODS-Framework/comp/page.xsl b/appsrc/ODS-Framework/comp/page.xsl
index 29835c4..f2d89cd 100644
--- a/appsrc/ODS-Framework/comp/page.xsl
+++ b/appsrc/ODS-Framework/comp/page.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: page.xsl,v 1.34.2.19 2012/03/08 10:46:19 source Exp $
+ - $Id: page.xsl,v 1.34.2.18 2011/05/02 14:16:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/register.xsl b/appsrc/ODS-Framework/comp/register.xsl
index 1052773..88ebd9a 100644
--- a/appsrc/ODS-Framework/comp/register.xsl
+++ b/appsrc/ODS-Framework/comp/register.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: register.xsl,v 1.31.2.20 2012/03/08 10:46:19 source Exp $
+ - $Id: register.xsl,v 1.31.2.19 2011/08/01 14:14:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/render.xsl b/appsrc/ODS-Framework/comp/render.xsl
index f448a14..5cb52b7 100644
--- a/appsrc/ODS-Framework/comp/render.xsl
+++ b/appsrc/ODS-Framework/comp/render.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: render.xsl,v 1.3.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: render.xsl,v 1.3.2.1 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/rss2atom.xsl b/appsrc/ODS-Framework/comp/rss2atom.xsl
index 28a6b12..3a1b0e5 100644
--- a/appsrc/ODS-Framework/comp/rss2atom.xsl
+++ b/appsrc/ODS-Framework/comp/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.6.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: rss2atom.xsl,v 1.6.2.1 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/rss2rdf.xsl b/appsrc/ODS-Framework/comp/rss2rdf.xsl
index a128225..83fedad 100644
--- a/appsrc/ODS-Framework/comp/rss2rdf.xsl
+++ b/appsrc/ODS-Framework/comp/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.2.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: rss2rdf.xsl,v 1.2.2.1 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/rss2xbel.xsl b/appsrc/ODS-Framework/comp/rss2xbel.xsl
index d4f707a..d36cf89 100644
--- a/appsrc/ODS-Framework/comp/rss2xbel.xsl
+++ b/appsrc/ODS-Framework/comp/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2.2.1 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/services.xsl b/appsrc/ODS-Framework/comp/services.xsl
index 12b1f68..db9479e 100644
--- a/appsrc/ODS-Framework/comp/services.xsl
+++ b/appsrc/ODS-Framework/comp/services.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: services.xsl,v 1.7.2.3 2012/03/08 10:46:19 source Exp $
+ - $Id: services.xsl,v 1.7.2.2 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/settings.xsl b/appsrc/ODS-Framework/comp/settings.xsl
index c99be0b..7f56644 100644
--- a/appsrc/ODS-Framework/comp/settings.xsl
+++ b/appsrc/ODS-Framework/comp/settings.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: settings.xsl,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: settings.xsl,v 1.4.2.1 2010/09/20 10:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/site_home.xsl b/appsrc/ODS-Framework/comp/site_home.xsl
index 79c00f1..03bfb0f 100644
--- a/appsrc/ODS-Framework/comp/site_home.xsl
+++ b/appsrc/ODS-Framework/comp/site_home.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: site_home.xsl,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: site_home.xsl,v 1.4.2.1 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/store.xsl b/appsrc/ODS-Framework/comp/store.xsl
index 77e6d6e..760d25d 100644
--- a/appsrc/ODS-Framework/comp/store.xsl
+++ b/appsrc/ODS-Framework/comp/store.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: store.xsl,v 1.3.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: store.xsl,v 1.3.2.1 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/comp/tagging.xsl b/appsrc/ODS-Framework/comp/tagging.xsl
index bb6114e..e60f8e7 100644
--- a/appsrc/ODS-Framework/comp/tagging.xsl
+++ b/appsrc/ODS-Framework/comp/tagging.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tagging.xsl,v 1.9.2.3 2012/03/08 10:46:20 source Exp $
+ - $Id: tagging.xsl,v 1.9.2.2 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/conf.vspx b/appsrc/ODS-Framework/conf.vspx
index 60437b2..5d551db 100644
--- a/appsrc/ODS-Framework/conf.vspx
+++ b/appsrc/ODS-Framework/conf.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: conf.vspx,v 1.5.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: conf.vspx,v 1.5.2.1 2010/09/20 10:15:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/conf_app.vspx b/appsrc/ODS-Framework/conf_app.vspx
index 58fabcd..29d9e27 100644
--- a/appsrc/ODS-Framework/conf_app.vspx
+++ b/appsrc/ODS-Framework/conf_app.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: conf_app.vspx,v 1.5.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: conf_app.vspx,v 1.5.2.1 2010/09/20 10:15:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/contact.html b/appsrc/ODS-Framework/contact.html
index 85bd565..9e386b3 100644
--- a/appsrc/ODS-Framework/contact.html
+++ b/appsrc/ODS-Framework/contact.html
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: contact.html,v 1.2.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: contact.html,v 1.2.2.1 2010/09/20 10:15:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/dashboard.sql b/appsrc/ODS-Framework/dashboard.sql
index 0fd9eec..cf59f92 100644
--- a/appsrc/ODS-Framework/dashboard.sql
+++ b/appsrc/ODS-Framework/dashboard.sql
@@ -1,12 +1,12 @@
--
--- $Id: dashboard.sql,v 1.13.2.4 2012/03/08 10:46:17 source Exp $
+-- $Id: dashboard.sql,v 1.13.2.3 2010/11/09 20:18:21 source Exp $
--
-- WA Dashboard support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/dav.css b/appsrc/ODS-Framework/dav.css
index fb364e3..6af0a52 100644
--- a/appsrc/ODS-Framework/dav.css
+++ b/appsrc/ODS-Framework/dav.css
@@ -1,10 +1,10 @@
/*
- * $Id: dav.css,v 1.3.2.2 2012/03/08 10:46:17 source Exp $
+ * $Id: dav.css,v 1.3.2.1 2010/09/20 10:15:19 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/default.css b/appsrc/ODS-Framework/default.css
index 8b004b1..b2907f3 100644
--- a/appsrc/ODS-Framework/default.css
+++ b/appsrc/ODS-Framework/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.26.2.22 2012/03/08 10:46:17 source Exp $
+ * $Id: default.css,v 1.26.2.20 2011/08/03 11:42:29 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1023,7 +1023,7 @@ table.form td {
.tabs {
margin-top: 1.5em;
list-style-type: none;
- padding-bottom: 0px;
+ padding-bottom: 1px;
padding-left: 0.5em;
}
diff --git a/appsrc/ODS-Framework/delete_inst.vspx b/appsrc/ODS-Framework/delete_inst.vspx
index b820a9c..ca9416d 100644
--- a/appsrc/ODS-Framework/delete_inst.vspx
+++ b/appsrc/ODS-Framework/delete_inst.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: delete_inst.vspx,v 1.9.2.3 2012/03/08 10:46:17 source Exp $
+ - $Id: delete_inst.vspx,v 1.9.2.1 2010/09/20 10:15:19 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -34,35 +34,32 @@
<v:on-init>
<![CDATA[
declare apps, v, i any;
-
if (self.iid is not null)
- {
- select WAI_MEMBER_MODEL, WAI_IS_PUBLIC, WAI_MEMBERS_VISIBLE, WAI_INST, WAI_NAME, WAI_DESCRIPTION, WAI_TYPE_NAME
- into self.imodel, self.is_public, self.is_visible, self.inst, self.iname, self.idesc, self.wa_type
- from DB.DBA.WA_INSTANCE
- where WAI_ID = self.iid;
- self.instance_descr := self.idesc;
- self.ihome := self.inst.wa_home_url();
- }
- v := null;
- if (self.apps_ids is not null)
- {
- apps := split_and_decode (self.apps_ids, 0, '\0\0,');
- v := make_array (length (apps), 'any');
- i := 0;
- foreach (any id in apps) do
{
- v[i] := atoi (id);
- i := i + 1;
- }
- }
- self.apps := v;
+ select WAI_MEMBER_MODEL, WAI_IS_PUBLIC, WAI_MEMBERS_VISIBLE, WAI_INST, WAI_NAME, WAI_DESCRIPTION, WAI_TYPE_NAME into
+ self.imodel, self.is_public, self.is_visible, self.inst, self.iname, self.idesc, self.wa_type from
+ DB.DBA.WA_INSTANCE where WAI_ID = self.iid;
+ self.instance_descr := self.idesc;
+ self.ihome := self.inst.wa_home_url();
+ }
+ v := null;
+ if (self.apps_ids is not null)
+ {
+ apps := split_and_decode (self.apps_ids, 0, '\0\0,');
+ v := make_array (length (apps), 'any');
+ i := 0;
+ foreach (any id in apps) do
+ {
+ v[i] := atoi (id);
+ i := i + 1;
+ }
+ }
+ self.apps := v;
]]>
</v:on-init>
<v:after-data-bind>
<![CDATA[
declare freeze varchar;
-
freeze := (select WAI_IS_FROZEN from DB.DBA.WA_INSTANCE where WAI_ID = self.iid);
if (freeze = 1 and not wa_user_is_dba (self.u_name, self.u_group))
{
@@ -101,107 +98,80 @@
<div class="box">
<v:form type="simple" method="POST" name="eform1">
<h3>You are about to delete following application(s). This operation cannot be undone. Please confirm.</h3>
- <?vsp
- if (self.iid is not null)
- {
- ?>
- <h2>Application Details</h2>
- <?vsp
- }
- else
- {
- declare wai_nam varchar;
- foreach (any v in self.apps) do
- {
- wai_nam := (select WAI_NAME from WA_INSTANCE where WAI_ID = v);
- http (wai_nam); http ('<br />');
- }
- }
- ?>
- <table class="ctl_grp">
- <?vsp
- if (self.iid is not null)
- {
- ?>
- <vm:instance-settings readonly="yes"/>
- <?vsp
- }
- ?>
- <?vsp
- if (self.wa_type = 'oMail')
- {
- ?>
- <tr>
- <th>
- Do you like to delete a content of mailboxes?
- </th>
- <td>
- <v:check-box name="iDeleteAll" xhtml_id="iDeleteAll" value="1" />
- </td>
- </tr>
- <?vsp
- }
- ?>
- <tr>
- <td colspan="2">
- <span class="fm_ctl_btn">
- <v:button action="simple" name="cancel1" value="Cancel">
- <v:on-post>
- <![CDATA[
- if (self.redir = 'security')
- self.vc_redirect ('security.vspx');
- else
- self.vc_redirect ('services.vspx');
- ]]>
- </v:on-post>
- </v:button>
- <v:button action="simple" name="accept1" value="Delete">
- <v:on-post>
- <![CDATA[
- declare inst web_app;
- declare h, id any;
- declare freeze varchar;
+ <?vsp if (self.iid is not null) { ?>
+ <h2>Application Details</h2>
+ <?vsp } else {
+ declare wai_nam varchar;
+ foreach (any v in self.apps) do
+ {
+ wai_nam := (select WAI_NAME from WA_INSTANCE where WAI_ID = v);
+ http (wai_nam); http ('<br />');
+ }
+ } ?>
+ <table class="ctl_grp">
+ <?vsp if (self.iid is not null) { ?>
+ <vm:instance-settings readonly="yes"/>
+ <?vsp } ?>
+ <tr>
+ <td colspan="2">
+ <span class="fm_ctl_btn">
+ <v:button action="simple" name="cancel1" value="Cancel">
+ <v:on-post>
+ <![CDATA[
+ if (self.redir = 'security')
+ self.vc_redirect ('security.vspx');
+ else
+ self.vc_redirect ('services.vspx');
+ ]]>
+ </v:on-post>
+ </v:button>
+ <v:button action="simple" name="accept1" value="Delete">
+ <v:on-post>
+ <![CDATA[
+ declare inst web_app;
+ declare h, id any;
+ declare freeze varchar;
- if (self.apps is null)
- self.apps := vector (self.iid);
+ if (self.apps is null)
+ self.apps := vector (self.iid);
- foreach (any iid in self.apps) do
- {
- declare exit handler for not found {
+ foreach (any iid in self.apps) do
+ {
+ declare exit handler for not found {
rollback work;
signal ('22023', 'No such application');
- };
+ };
select WAI_IS_FROZEN, WAI_INST into freeze, inst from DB.DBA.WA_INSTANCE where WAI_ID = iid;
- if (freeze = 1 and not wa_user_is_dba (self.u_name, self.u_group))
- {
- self.vc_error_message := 'Application is frozen';
- self.vc_is_valid := 0;
- goto done;
- }
- h := udt_implements_method(inst, 'wa_drop_instance');
- declare exit handler for sqlstate '*'
- {
- self.vc_error_message := WA_RETRIEVE_MESSAGE (concat (__SQL_STATE, ' ', __SQL_MESSAGE));
- self.vc_is_valid := 0;
- rollback work;
- return;
- };
- commit work;
- connection_set ('deleteAll', self.iDeleteAll.ufl_selected);
- id := call (h) (inst);
- }
+
+ if (freeze = 1 and not wa_user_is_dba (self.u_name, self.u_group))
+ {
+ self.vc_error_message := 'Application is frozen';
+ self.vc_is_valid := 0;
+ goto done;
+ }
+ h := udt_implements_method(inst, 'wa_drop_instance');
+ declare exit handler for sqlstate '*'
+ {
+ self.vc_error_message := WA_RETRIEVE_MESSAGE(concat(__SQL_STATE,' ',__SQL_MESSAGE));
+ self.vc_is_valid := 0;
+ rollback work;
+ return;
+ };
+ commit work;
+ id := call (h) (inst);
+ }
done:;
- if (self.redir = 'security')
- self.vc_redirect ('security.vspx');
- else
- self.vc_redirect ('services.vspx');
- ]]>
- </v:on-post>
- </v:button>
- </span>
- </td>
- </tr>
- </table>
+ if (self.redir = 'security')
+ self.vc_redirect ('security.vspx');
+ else
+ self.vc_redirect ('services.vspx');
+ ]]>
+ </v:on-post>
+ </v:button>
+ </span>
+ </td>
+ </tr>
+ </table>
</v:form>
</div>
</vm:body>
diff --git a/appsrc/ODS-Framework/drop.sql b/appsrc/ODS-Framework/drop.sql
index 7c3436e..60b5a04 100644
--- a/appsrc/ODS-Framework/drop.sql
+++ b/appsrc/ODS-Framework/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.4.2.8 2012/03/08 10:46:17 source Exp $
+-- $Id: drop.sql,v 1.4.2.6 2010/09/20 10:15:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -28,7 +28,6 @@ vhost_remove (lpath=>'/php/users');
vhost_remove (lpath=>'/jsp/users');
vhost_remove (lpath=>'/ruby/users');
vhost_remove (lpath=>'/vsp/users');
-vhost_remove (lpath=>'/ods/webid');
drop procedure WA_GET_EMAIL_TEMPLATE;
drop procedure WA_SET_EMAIL_TEMPLATE;
diff --git a/appsrc/ODS-Framework/drop_sioc_proc.sql b/appsrc/ODS-Framework/drop_sioc_proc.sql
index 6b98098..9b34c1d 100644
--- a/appsrc/ODS-Framework/drop_sioc_proc.sql
+++ b/appsrc/ODS-Framework/drop_sioc_proc.sql
@@ -1,14 +1,14 @@
--
-- drop_sioc_proc
--
--- $Id: drop_sioc_proc.sql,v 1.1.2.2 2012/03/08 10:46:17 source Exp $
+-- $Id: drop_sioc_proc.sql,v 1.1.2.1 2010/09/20 10:15:19 source Exp $
--
-- script to clean the old variant of the ODS RDF data support : triggers over the apps
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/drop_sioc_trig.sql b/appsrc/ODS-Framework/drop_sioc_trig.sql
index 0dbdba0..bba8e00 100644
--- a/appsrc/ODS-Framework/drop_sioc_trig.sql
+++ b/appsrc/ODS-Framework/drop_sioc_trig.sql
@@ -1,14 +1,14 @@
--
-- sioc.sql
--
--- $Id: drop_sioc_trig.sql,v 1.1.2.2 2012/03/08 10:46:17 source Exp $
+-- $Id: drop_sioc_trig.sql,v 1.1.2.1 2010/09/20 10:15:19 source Exp $
--
-- script to clean the old variant of the ODS RDF data support : triggers over the apps
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/edit_inst.vspx b/appsrc/ODS-Framework/edit_inst.vspx
index e2fef70..3ed11d8 100644
--- a/appsrc/ODS-Framework/edit_inst.vspx
+++ b/appsrc/ODS-Framework/edit_inst.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: edit_inst.vspx,v 1.14.2.3 2012/03/08 10:46:17 source Exp $
+ - $Id: edit_inst.vspx,v 1.14.2.2 2010/09/20 10:15:19 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/edit_interests_popup.vspx b/appsrc/ODS-Framework/edit_interests_popup.vspx
index c028f04..e8b7c48 100644
--- a/appsrc/ODS-Framework/edit_interests_popup.vspx
+++ b/appsrc/ODS-Framework/edit_interests_popup.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: edit_interests_popup.vspx,v 1.2.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: edit_interests_popup.vspx,v 1.2.2.1 2010/09/20 10:15:19 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/edit_rule.vspx b/appsrc/ODS-Framework/edit_rule.vspx
index 9d667c2..1da184a 100644
--- a/appsrc/ODS-Framework/edit_rule.vspx
+++ b/appsrc/ODS-Framework/edit_rule.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: edit_rule.vspx,v 1.4.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: edit_rule.vspx,v 1.4.2.1 2010/09/20 10:15:19 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/error.vspx b/appsrc/ODS-Framework/error.vspx
index 26c9dac..7e72df3 100644
--- a/appsrc/ODS-Framework/error.vspx
+++ b/appsrc/ODS-Framework/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.5.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: error.vspx,v 1.5.2.1 2010/09/20 10:15:19 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/facebook.sql b/appsrc/ODS-Framework/facebook.sql
index 6741ca9..b5954b8 100644
--- a/appsrc/ODS-Framework/facebook.sql
+++ b/appsrc/ODS-Framework/facebook.sql
@@ -1,10 +1,10 @@
--
--- $Id: facebook.sql,v 1.14.2.10 2012/03/08 10:46:17 source Exp $
+-- $Id: facebook.sql,v 1.14.2.8 2011/05/02 14:16:01 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -186,9 +186,8 @@ create method post_request(
post_string:=string_output_string(aResult);
declare ret_header, rq_header any;
-
- commit work;
rq_header := 'Content-type: application/x-www-form-urlencoded \r\nUser-Agent: Facebook API VSP Client 1.1';
+
_result:=http_get ('http://api.facebook.com/restserver.php', ret_header, 'POST', rq_header, post_string); --'127.0.0.1:8888'
return _result;
}
diff --git a/appsrc/ODS-Framework/facebook_helper.vsp b/appsrc/ODS-Framework/facebook_helper.vsp
index 5aed350..ec0487a 100644
--- a/appsrc/ODS-Framework/facebook_helper.vsp
+++ b/appsrc/ODS-Framework/facebook_helper.vsp
@@ -1,14 +1,14 @@
<?vsp
-- search_ajax.vsp
--
--- $Id: facebook_helper.vsp,v 1.6.2.2 2012/03/08 10:46:17 source Exp $
+-- $Id: facebook_helper.vsp,v 1.6.2.1 2010/09/20 10:15:20 source Exp $
--
-- AJAX Handler for the google map control
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/faq.html b/appsrc/ODS-Framework/faq.html
index ee5bace..5dda372 100644
--- a/appsrc/ODS-Framework/faq.html
+++ b/appsrc/ODS-Framework/faq.html
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: faq.html,v 1.6.2.2 2012/03/08 10:46:17 source Exp $
+ - $Id: faq.html,v 1.6.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/fb_front.vspx b/appsrc/ODS-Framework/fb_front.vspx
index dcd9e51..c102b5b 100644
--- a/appsrc/ODS-Framework/fb_front.vspx
+++ b/appsrc/ODS-Framework/fb_front.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: fb_front.vspx,v 1.15.2.9 2012/03/08 10:46:17 source Exp $
+ - $Id: fb_front.vspx,v 1.15.2.8 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/fb_popup.vspx b/appsrc/ODS-Framework/fb_popup.vspx
index 7a8506f..a6e82c1 100644
--- a/appsrc/ODS-Framework/fb_popup.vspx
+++ b/appsrc/ODS-Framework/fb_popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: fb_popup.vspx,v 1.2.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: fb_popup.vspx,v 1.2.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/foaf.xml b/appsrc/ODS-Framework/foaf.xml
index ac4a1ec..a75c1ed 100644
--- a/appsrc/ODS-Framework/foaf.xml
+++ b/appsrc/ODS-Framework/foaf.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: foaf.xml,v 1.3.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: foaf.xml,v 1.3.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/foaf.xsl b/appsrc/ODS-Framework/foaf.xsl
index eec6e8a..cea3066 100644
--- a/appsrc/ODS-Framework/foaf.xsl
+++ b/appsrc/ODS-Framework/foaf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: foaf.xsl,v 1.7.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: foaf.xsl,v 1.7.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/freeze.vspx b/appsrc/ODS-Framework/freeze.vspx
index 112cd29..cf08978 100644
--- a/appsrc/ODS-Framework/freeze.vspx
+++ b/appsrc/ODS-Framework/freeze.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: freeze.vspx,v 1.4.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: freeze.vspx,v 1.4.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/gdata.sql b/appsrc/ODS-Framework/gdata.sql
index bed1c21..57e2a76 100644
--- a/appsrc/ODS-Framework/gdata.sql
+++ b/appsrc/ODS-Framework/gdata.sql
@@ -1,13 +1,13 @@
--
--
--- $Id: gdata.sql,v 1.36.2.2 2012/03/08 10:46:18 source Exp $
+-- $Id: gdata.sql,v 1.36.2.1 2010/09/20 10:15:20 source Exp $
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/generic.vspx b/appsrc/ODS-Framework/generic.vspx
index 27b6aad..5b2428b 100644
--- a/appsrc/ODS-Framework/generic.vspx
+++ b/appsrc/ODS-Framework/generic.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: generic.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: generic.vspx,v 1.5.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/get_tags_popup.vspx b/appsrc/ODS-Framework/get_tags_popup.vspx
index 952a97e..133448c 100644
--- a/appsrc/ODS-Framework/get_tags_popup.vspx
+++ b/appsrc/ODS-Framework/get_tags_popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: get_tags_popup.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: get_tags_popup.vspx,v 1.5.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/gtags.vspx b/appsrc/ODS-Framework/gtags.vspx
index 3176e17..27871e5 100644
--- a/appsrc/ODS-Framework/gtags.vspx
+++ b/appsrc/ODS-Framework/gtags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: gtags.vspx,v 1.6.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: gtags.vspx,v 1.6.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/help.vspx b/appsrc/ODS-Framework/help.vspx
index 9f7121b..5e97707 100644
--- a/appsrc/ODS-Framework/help.vspx
+++ b/appsrc/ODS-Framework/help.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: help.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: help.vspx,v 1.5.2.1 2010/09/20 10:15:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/home.vspx b/appsrc/ODS-Framework/home.vspx
index c4957c7..d84c5d9 100644
--- a/appsrc/ODS-Framework/home.vspx
+++ b/appsrc/ODS-Framework/home.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: home.vspx,v 1.16.2.3 2012/03/08 10:46:18 source Exp $
+ - $Id: home.vspx,v 1.16.2.2 2010/09/20 10:15:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/home.xsl b/appsrc/ODS-Framework/home.xsl
index 7b123dc..67913da 100644
--- a/appsrc/ODS-Framework/home.xsl
+++ b/appsrc/ODS-Framework/home.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: home.xsl,v 1.3.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: home.xsl,v 1.3.2.1 2010/09/20 10:15:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/hosted_services.sql b/appsrc/ODS-Framework/hosted_services.sql
index bd0f438..e0eac68 100644
--- a/appsrc/ODS-Framework/hosted_services.sql
+++ b/appsrc/ODS-Framework/hosted_services.sql
@@ -1,10 +1,10 @@
--
--- $Id: hosted_services.sql,v 1.79.2.55 2012/03/12 17:41:17 source Exp $
+-- $Id: hosted_services.sql,v 1.79.2.44 2011/08/01 14:14:20 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -485,21 +485,6 @@ wa_member_upgrade()
drop procedure wa_member_upgrade
;
-create procedure wa_instance_upgrade() {
-
- if (registry_get ('__wa_instance_upgrade') = 'done')
- return;
-
- delete from DB.DBA.WA_INSTANCE where wai_name not in (select WAM_INST from DB.DBA.WA_MEMBER);
- registry_set ('__wa_instance_upgrade', 'done');
-}
-;
-
-wa_instance_upgrade()
-;
-drop procedure wa_instance_upgrade
-;
-
wa_exec_no_error(
'CREATE TABLE WA_MEMBER_INSTCOUNT
@@ -1747,24 +1732,12 @@ create procedure wa_vad_check (in pname varchar)
}
;
-create trigger SYS_USERS_WA_AU after update on "DB"."DBA"."SYS_USERS" order 66 referencing old as O, new as N
-{
- declare name varchar;
-
- name := connection_get ('WA_USER_DISABLED');
- if (not isnull (name))
- return;
-
- if (O.U_ACCOUNT_DISABLED <> N.U_ACCOUNT_DISABLED)
- DB.DBA.WA_USER_SETTING_SET (N.U_NAME, 'DISABLED_BY', 'dav');
-}
-;
-create trigger SYS_USERS_ON_DELETE_WA_FK before delete on "DB"."DBA"."SYS_USERS" order 66 referencing old as O
+create trigger SYS_USERS_ON_DELETE_WA_FK before delete
+ on "DB"."DBA"."SYS_USERS" order 66 referencing old as O
{
- ODS_DELETE_USER_DATA(O.U_NAME);
-}
-;
+ ODS_DELETE_USER_DATA(O.U_NAME);
+};
insert soft WA_MEMBER_MODEL (WMM_ID, WMM_NAME) values (0, 'Open')
;
@@ -2096,13 +2069,13 @@ create procedure INIT_SERVER_SETTINGS ()
'Enter your User ID and Password',
'',
'',
- 'Copyright © 1998-2012 OpenLink Software',
+ 'Copyright © 1998-2011 OpenLink Software',
'',
sys_stat ('st_host_name'),
1
);
}
- update WA_SETTINGS set WS_COPYRIGHT = 'Copyright © 1998-2012 OpenLink Software';
+ update WA_SETTINGS set WS_COPYRIGHT = 'Copyright © 1998-2011 OpenLink Software';
update WA_SETTINGS
set WS_WELCOME_MESSAGE =
@@ -3384,7 +3357,6 @@ wa_exec_no_error_log(
WAUI_CERT long varbinary, -- same as above
WAUI_ACL LONG VARCHAR,
WAUI_SALMON_KEY varchar,
- WAUI_SETTINGS LONG VARCHAR,
primary key (WAUI_U_ID)
)'
@@ -3438,8 +3410,6 @@ wa_add_col ('DB.DBA.WA_USER_INFO', 'WAUI_HPHONE_EXT', 'varchar(5)');
wa_add_col ('DB.DBA.WA_USER_INFO', 'WAUI_ACL', 'LONG VARCHAR');
wa_add_col ('DB.DBA.WA_USER_INFO', 'WAUI_SALMON_KEY', 'VARCHAR');
-wa_add_col ('DB.DBA.WA_USER_INFO', 'WAUI_SETTINGS', 'LONG VARCHAR');
-
wa_exec_no_error ('create index WA_USER_INFO_CERT_FINGERPRINT on DB.DBA.WA_USER_INFO (WAUI_CERT_FINGERPRINT)');
create procedure WA_USER_INFO_WAUI_FOAF_UPGRADE ()
@@ -3780,34 +3750,17 @@ create procedure WA_USER_OL_ACCOUNTS_SET_UP ()
registry_set ('__WA_USER_OL_ACCOUNTS_SET_UP', 'done');
update WA_USER_OL_ACCOUNTS set WUO_TYPE = 'P' where WUO_TYPE is null;
-}
-;
+};
WA_USER_OL_ACCOUNTS_SET_UP ();
-create procedure WA_USER_OL_ACCOUNTS_URI (
- in url varchar)
-{
- declare rc varchar;
-
- rc := null;
- if (__proc_exists ('DB.DBA.RDF_PROXY_ENTITY_IRI'))
- rc := DB.DBA.RDF_PROXY_ENTITY_IRI(url);
- if (isnull (rc))
- rc := url || '#this';
-
- return rc;
-}
-;
-
create procedure WA_USER_OL_ACCOUNTS_SET_UP ()
{
if (registry_get ('__WA_USER_OL_ACCOUNTS_SET_UP2') = 'done')
return;
registry_set ('__WA_USER_OL_ACCOUNTS_SET_UP2', 'done');
- update WA_USER_OL_ACCOUNTS set WUO_URI = WA_USER_OL_ACCOUNTS_URI (WUO_URL) where WUO_URI is null;
-}
-;
+ update WA_USER_OL_ACCOUNTS set WUO_URI = ODS.ODS_API."user.onlineAccounts.uri"(WUO_URL) where WUO_URI is null;
+};
WA_USER_OL_ACCOUNTS_SET_UP ();
create procedure WA_USER_OL_ACCOUNTS_SET_UP ()
@@ -4203,7 +4156,7 @@ create procedure WA_USER_SET_INFO (in _name varchar,in _fname varchar,in _lname
}
;
-create procedure WA_USER_EDIT (in _name varchar, in _key varchar, in _data any)
+create procedure WA_USER_EDIT (in _name varchar,in _key varchar,in _data any)
{
declare _uid any;
declare i int;
@@ -4375,9 +4328,6 @@ create procedure WA_USER_EDIT (in _name varchar, in _key varchar, in _data any)
else if (_key = 'WAUI_ACL')
UPDATE WA_USER_INFO SET WAUI_ACL = _data WHERE WAUI_U_ID = _uid;
- else if (_key = 'WAUI_SETTINGS')
- UPDATE WA_USER_INFO SET WAUI_SETTINGS = _data WHERE WAUI_U_ID = _uid;
-
return row_count ();
nf:
@@ -4443,35 +4393,6 @@ create procedure WA_USER_VISIBILITY (in _name varchar, in _arr any default null,
}
;
-create procedure WA_USER_SETTING_SET (in _name varchar, in _key varchar, in _data any)
-{
- declare _uid any;
- declare _settings any;
-
- _uid := (select U_ID from DB.DBA.SYS_USERS where U_NAME = _name);
- _settings := (select deserialize (WAUI_SETTINGS) from DB.DBA.WA_USER_INFO where WAUI_U_ID = _uid);
- if (isnull (_settings))
- _settings := vector ();
-
- ODS.ODS_API.set_keyword (_key, _settings, _data);
- WA_USER_EDIT (_name, 'WAUI_SETTINGS', serialize (_data));
-}
-;
-
-create procedure WA_USER_SETTING_GET (in _name varchar, in _key varchar)
-{
- declare _uid any;
- declare _settings any;
-
- _uid := (select U_ID from DB.DBA.SYS_USERS where U_NAME = _name);
- _settings := (select deserialize (WAUI_SETTINGS) from DB.DBA.WA_USER_INFO where WAUI_U_ID = _uid);
- if (isnull(_settings))
- return null;
-
- return get_keyword (_key, _settings);
-}
-;
-
create procedure WA_REPLACE_ARR ( inout _vector any, in _pos integer,in _val varchar )
{
declare _ind integer;
@@ -5862,18 +5783,15 @@ create procedure WA_FOAF_UPGRADE ()
for (select WAUI_U_ID, WAUI_FOAF from DB.DBA.WA_USER_INFO) do
{
- uname := (select U_NAME from DB.DBA.SYS_USERS where U_ID = WAUI_U_ID);
- if (not isnull (uname))
- {
- visibility := WA_USER_VISIBILITY (uname);
- access := visibility[8];
- tmp := '';
- for (select interest from DB.DBA.WA_USER_INTERESTS (txt) (interest varchar) P where txt = WAUI_FOAF) do
- {
- tmp := tmp || interest || ';' || cast (access as varchar) || '\n';
- }
- WA_USER_EDIT (uname, 'WAUI_FOAF', tmp);
- }
+ uname := (select U_NAME from DB.DBA.SYS_USERS where U_ID = WAUI_U_ID);
+ visibility := WA_USER_VISIBILITY (uname);
+ access := visibility[8];
+ tmp := '';
+ for (select interest from DB.DBA.WA_USER_INTERESTS (txt) (interest varchar) P where txt = WAUI_FOAF) do
+ {
+ tmp := tmp || interest || ';' || cast (access as varchar) || '\n';
+ }
+ WA_USER_EDIT (uname, 'WAUI_FOAF', tmp);
}
registry_set ('WA_FOAF_UPGRADE', 'done');
@@ -7550,18 +7468,6 @@ DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
DB.DBA.URLREWRITE_CREATE_RULELIST ('ods_user_home_rulelist', 1, vector ('ods_user_home_rule', 'ods_user_public_home_rule', 'ods_root_rule'));
-create procedure ods_mv_desc ()
-{
- declare str any;
- str := sprintf ('%U', 'describe ?o from <http://localhost/mv>
- where { ?s ?p ?o option (transitive, t_in (?o), t_out (?s)) .
- filter (?s = <http://HOST/mv/data/LOCAL> ) }');
- str := replace (str, 'HOST', '^{URIQADefaultHost}^');
- str := replace (str, '%', '%%');
- str := replace (str, 'LOCAL', '%s');
- return str;
-};
-
create procedure ods_define_common_vd (in _host varchar, in _lhost varchar, in isdav int := 1)
{
@@ -7726,11 +7632,6 @@ create procedure ods_define_common_vd (in _host varchar, in _lhost varchar, in i
DB.DBA.VHOST_DEFINE (vhost=>_host,lhost=>_lhost,lpath=>'/vsp/users',
ppath=>'/vad/vsp/wa/users', def_page=>'users.vsp', vsp_user=>'dba', is_dav=>0, is_brws=>0, opts=>vector ('url_rewrite', 'ods_vsp_users_list'), sec=>_sec, auth_opts=>_opts);
- -- WebID pages
- DB.DBA.VHOST_REMOVE (vhost=>_host,lhost=>_lhost,lpath=>'/ods/webid');
- DB.DBA.VHOST_DEFINE (vhost=>_host,lhost=>_lhost,lpath=>'/ods/webid',
- ppath=>'/vad/vsp/wa/webid', is_dav=>0, vsp_user=>'dba', sec=>_sec, auth_opts=>_opts);
-
-- RDF folder
DB.DBA.VHOST_REMOVE (vhost=>_host,lhost=>_lhost,lpath=>'/ods/data/rdf');
DB.DBA.VHOST_DEFINE (vhost=>_host,lhost=>_lhost,lpath=>'/ods/data/rdf',
@@ -7784,7 +7685,7 @@ create procedure ods_define_common_vd (in _host varchar, in _lhost varchar, in i
DB.DBA.URLREWRITE_CREATE_RULELIST ( 'ods_mv_rule_list_1', 1, vector ('ods_mv_rule_1'));
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'ods_mv_rule_1', 1, '/mv/data/(.*)\x24', vector ('par_1'), 1,
- '/sparql?query='||ods_mv_desc()||'&format=%U',
+ '/sparql?query=construct%%20%%7B%%20%%3Fs%%20%%3Fp%%20%%3Fo%%20.%%20%%3Ft%%20%%3Ftp%%20%%3Fto%%20.%%20%%7D%%20%%20from%%20%%3Chttp%%3A%%2F%%2Flocalhost%%2Fmv%%3E%%20where%%20%%7B%%20%%3Fs%%20%%3Fp%%20%%3Fo%%20%%20.%%20%%3Fs%%20foaf%%3AprimaryTopic%%20%%3Ft%%20.%%20%%3Ft%%20%%3Ftp%%20%%3Fto%%20.%%20filter%%20%%28%%3Fs%%20%%3D%%20%%3Chttp%%3A%%2F%%2F^{URIQADefaultHost}^%%2Fmv%%2Fdata%%2F%s%%3E%%20%%29%%20%%7D%%20&format=%U',
vector ('par_1', '*accept*'), NULL, NULL, 2, 303, '');
diff --git a/appsrc/ODS-Framework/href_export.xml b/appsrc/ODS-Framework/href_export.xml
index f04b889..5f34e26 100644
--- a/appsrc/ODS-Framework/href_export.xml
+++ b/appsrc/ODS-Framework/href_export.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: href_export.xml,v 1.1.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: href_export.xml,v 1.1.2.1 2010/09/20 10:15:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/image.vsp b/appsrc/ODS-Framework/image.vsp
index 3538eba..ed3a022 100644
--- a/appsrc/ODS-Framework/image.vsp
+++ b/appsrc/ODS-Framework/image.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: image.vsp,v 1.3.2.2 2012/03/08 10:46:18 source Exp $
+-- $Id: image.vsp,v 1.3.2.1 2010/09/20 10:15:21 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/images/yacutia_style_alt.htm b/appsrc/ODS-Framework/images/yacutia_style_alt.htm
index d66697b..5d42c52 100644
--- a/appsrc/ODS-Framework/images/yacutia_style_alt.htm
+++ b/appsrc/ODS-Framework/images/yacutia_style_alt.htm
@@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<!--
-
- - $Id: yacutia_style_alt.htm,v 1.2.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: yacutia_style_alt.htm,v 1.2.2.1 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/index.html b/appsrc/ODS-Framework/index.html
index d5bd3b7..2e60c7b 100644
--- a/appsrc/ODS-Framework/index.html
+++ b/appsrc/ODS-Framework/index.html
@@ -26,7 +26,6 @@
<title>Personal Data Space Explorer</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
- <link rel="stylesheet" href="default.css" type="text/css"/>
<link rel="stylesheet" href="nav_framework.css" type="text/css"/>
<!-- #META# -->
<script type="text/javascript">
@@ -424,12 +423,12 @@ if ((document.location.href.indexOf ('/dataspace/person/') >- 1 ||
</div> <!-- widget -->
<!-- Profile Page end-->
<!-- Connections Page start-->
- <div id="contacts_interface" style="display: none;">
+ <div id="contacts_interface" style="display:none;">
<div class="widget w_contact">
<div class="w_content">
<ul class="tab_bar">
- <li id="csiT1"><a href="javascript: void(0)">Connections List</a></li>
- <li id="csiT2"><a href="javascript: void(0)">Status Updates</a></li>
+ <li id="csiT1"><a href="javascript:void(0)">Connections List</a></li>
+ <li id="csiT2"><a href="javascript:void(0)">Status Updates</a></li>
</ul>
<div class="tab_deck">
<div id="cisPCtr" class="tab_page">
@@ -448,17 +447,17 @@ if ((document.location.href.indexOf ('/dataspace/person/') >- 1 ||
<div id="connectionsTemplate" style="display:none;">
<table border="0" cellspacing="0" width="98%">
<tr>
- <td class="image" style="width: 150px;">
- <img src="images/profile.png" style="width: 40px; cursor: pointer"/>
+ <td class="image" style="width:150px;">
+ <img src="{connImgSRC}" style="width:40px;cursor:pointer"/>
<br/>
- <span style="cursor: pointer; text-decoration: underline;">{connProfileFullName}</span>
+ <span style="cursor:pointer;text-decoration: underline;">{connProfileFullName}</span>
</td>
<td class="info">
</td>
- <td class="actions" style="width: 120px; text-align: left;">
- <a id="{sendMsg}" style="cursor: pointer; text-decoration:underline;">Send Message</a><br/>
- <a id="{viewConnections}" style="cursor: pointer; text-decoration: underline;">View Connections</a><br/>
- <a id="{doConnection}" style="cursor: pointer; text-decoration: underline;">Connection/Disconnect</a>
+ <td class="actions" style="width:120px;text-align:left;">
+ <a id="{sendMsg}" style="cursor:pointer;text-decoration:underline;">Send Message</a><br/>
+ <a id="{viewConnections}" style="cursor:pointer;text-decoration:underline;">View Connections</a><br/>
+ <a id="{doConnection}" style="cursor:pointer;text-decoration:underline;">Connection/Disconnect</a>
</td>
</tr>
</table>
@@ -887,7 +886,7 @@ if ((document.location.href.indexOf ('/dataspace/person/') >- 1 ||
<div id="FT">
<img alt="Powered by OpenLink Virtuoso" src="images/skin/default/virt_power_no_border.png"/>
<div id="FT_RC">
- Copyright © 1998-2012 OpenLink Software<br/>
+ Copyright © 1998-2011 OpenLink Software<br/>
<a href="#">About</a> <a href="#">Privacy</a> <a href="#">FAQ</a> <a href="#">Developers</a>
</div><!-- #FT_RC -->
</div> <!-- #FT -->
@@ -1026,7 +1025,7 @@ if ((document.location.href.indexOf ('/dataspace/person/') >- 1 ||
<td valign="top">
<div id="lf" class="form">
<div class="header">
- Please identify yourself <img id="lf_throbber" src="/ods/images/oat/Ajax_throbber.gif" style="float: right; margin-right: 10px; display: none" />
+ Identify Yourself <img id="lf_throbber" src="/ods/images/oat/Ajax_throbber.gif" style="float: right; margin-right: 10px; display: none" />
</div>
<ul id="lf_tabs" class="tabs">
<li id="lf_tab_0" title="Digest">Digest</li>
diff --git a/appsrc/ODS-Framework/index.vsp b/appsrc/ODS-Framework/index.vsp
index a775488..5c99c4d 100644
--- a/appsrc/ODS-Framework/index.vsp
+++ b/appsrc/ODS-Framework/index.vsp
@@ -1,14 +1,14 @@
<?vsp
-- search_ajax.vsp
--
--- $Id: index.vsp,v 1.9.2.9 2012/03/08 10:46:18 source Exp $
+-- $Id: index.vsp,v 1.9.2.7 2010/09/20 10:15:21 source Exp $
--
-- AJAX Handler for the google map control
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -90,7 +90,7 @@
else
_country_code:=null;
- https := ODS.ODS_API.getDefaultHttps ();
+ https := ODS..getDefaultHttps ();
if (exists (select 1 from WA_SETTINGS where WS_HTTPS = 1) and https is not null)
_openid_server := 'https://' || https;
else
@@ -158,11 +158,11 @@ skip_meta:
declare html_content, links varchar;
declare exts any;
- exts :=
+ exts :=
vector (
- vector ('rdf', 'RDF/XML', 'application/rdf+xml'),
- vector ('nt', 'N3/Turtle', 'text/n3'),
- vector ('n3', 'N3/Turtle', 'text/rdf+n3'),
+ vector ('rdf', 'RDF/XML', 'application/rdf+xml'),
+ vector ('nt', 'N3/Turtle', 'text/n3'),
+ vector ('n3', 'N3/Turtle', 'text/rdf+n3'),
vector ('json', 'RDF/JSON', 'application/json')
);
@@ -185,7 +185,7 @@ skip_meta:
links := links || sprintf (' <%s/sparql?default-graph-uri=%s/dataspace>; title="Public SPARQL Service"; rel="http://ontologi.es/sparql#fingerpoint", ', server_root, server_root);
foreach (any ss in exts) do
{
- links := links || sprintf (' <%s%s%s/about.%s>; rel="alternate"; type="%s"; title="Structured Descriptor Document (%s format)",',
+ links := links || sprintf (' <%s%s%s/about.%s>; rel="alternate"; type="%s"; title="Structured Descriptor Document (%s format)",',
server_dataspace, utype, uname, ss[0], ss[2], ss[1]);
}
for select U_E_MAIL from DB.DBA.SYS_USERS where U_NAME = uname do
diff --git a/appsrc/ODS-Framework/index.vspx b/appsrc/ODS-Framework/index.vspx
index 835ab72..b2959a2 100644
--- a/appsrc/ODS-Framework/index.vspx
+++ b/appsrc/ODS-Framework/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: index.vspx,v 1.4.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: index.vspx,v 1.4.2.1 2010/09/20 10:15:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/index.xsl b/appsrc/ODS-Framework/index.xsl
index b72058a..825d177 100644
--- a/appsrc/ODS-Framework/index.xsl
+++ b/appsrc/ODS-Framework/index.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: index.xsl,v 1.4.2.3 2012/03/08 10:46:18 source Exp $
+ - $Id: index.xsl,v 1.4.2.2 2010/09/20 10:15:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/index_inst.vspx b/appsrc/ODS-Framework/index_inst.vspx
index 34661e2..5440bde 100644
--- a/appsrc/ODS-Framework/index_inst.vspx
+++ b/appsrc/ODS-Framework/index_inst.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: index_inst.vspx,v 1.6.2.3 2012/03/08 10:46:18 source Exp $
+ - $Id: index_inst.vspx,v 1.6.2.2 2010/09/20 10:15:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/init.sql b/appsrc/ODS-Framework/init.sql
index c1e0b53..0efe103 100644
--- a/appsrc/ODS-Framework/init.sql
+++ b/appsrc/ODS-Framework/init.sql
@@ -1,10 +1,10 @@
--
--- $Id: init.sql,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+-- $Id: init.sql,v 1.5.2.1 2010/09/20 10:15:22 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/inst.vspx b/appsrc/ODS-Framework/inst.vspx
index 1bf2051..86e4c8d 100644
--- a/appsrc/ODS-Framework/inst.vspx
+++ b/appsrc/ODS-Framework/inst.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: inst.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: inst.vspx,v 1.5.2.1 2010/09/20 10:15:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/inst_ping.vspx b/appsrc/ODS-Framework/inst_ping.vspx
index 560d945..1763e79 100644
--- a/appsrc/ODS-Framework/inst_ping.vspx
+++ b/appsrc/ODS-Framework/inst_ping.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inst_ping.vspx,v 1.1.2.3 2012/03/08 10:46:18 source Exp $
+ - $Id: inst_ping.vspx,v 1.1.2.2 2011/03/08 13:28:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/join.vspx b/appsrc/ODS-Framework/join.vspx
index a7fd0c1..9f886fc 100644
--- a/appsrc/ODS-Framework/join.vspx
+++ b/appsrc/ODS-Framework/join.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: join.vspx,v 1.8.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: join.vspx,v 1.8.2.1 2010/09/20 10:15:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/ldap.sql b/appsrc/ODS-Framework/ldap.sql
index e107e10..6efa54c 100644
--- a/appsrc/ODS-Framework/ldap.sql
+++ b/appsrc/ODS-Framework/ldap.sql
@@ -1,12 +1,12 @@
--
--- $Id: ldap.sql,v 1.5.2.3 2012/03/08 10:46:18 source Exp $
+-- $Id: ldap.sql,v 1.5.2.2 2011/03/23 12:18:30 source Exp $
--
-- OpenID protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/ldap_search.vspx b/appsrc/ODS-Framework/ldap_search.vspx
index ea5c936..ec533b8 100644
--- a/appsrc/ODS-Framework/ldap_search.vspx
+++ b/appsrc/ODS-Framework/ldap_search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ldap_search.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: ldap_search.vspx,v 1.5.2.1 2010/09/20 10:15:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/login.js b/appsrc/ODS-Framework/login.js
index 4308aff..13a1951 100644
--- a/appsrc/ODS-Framework/login.js
+++ b/appsrc/ODS-Framework/login.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -21,8 +21,6 @@
*/
var lfTab;
-var lfHeigh = 280;
-var lsRegData;
var lfSslData;
var lfFacebookData;
var lfOptions;
@@ -31,15 +29,7 @@ var lfNotReturn = true;
var lfAttempts = 0;
var lfSslLinks = {"in": [], "up": []};
-function lfPaneGrow (h) {
- lfHeigh += h;
- var loginPage = $('login_page');
- if (loginPage)
- loginPage.style.height = lfHeigh+'px';
- OAT.Dom.center('loginDiv', 1, 1);
-}
-
-function lfRowText(tbl, txt, txtCSSText, h) {
+function lfRowText(tbl, txt, txtCSSText) {
var tr = OAT.Dom.create('tr');
var td = OAT.Dom.create('td');
td.colSpan = 2;
@@ -47,7 +37,6 @@ function lfRowText(tbl, txt, txtCSSText, h) {
td.innerHTML = txt;
tr.appendChild(td);
tbl.appendChild(tr);
- if (h) {lfPaneGrow (h);}
return td;
}
@@ -108,7 +97,7 @@ function lfRowValue(tbl, label, value, leftTag) {
tbl.appendChild(tr);
}
-function lfRowImage(tbl, label, value, leftTag, h) {
+function lfRowImage(tbl, label, value, leftTag) {
if (!leftTag)
leftTag = 'th';
@@ -125,35 +114,33 @@ function lfRowImage(tbl, label, value, leftTag, h) {
tr.appendChild(td);
}
tbl.appendChild(tr);
- if (h) {lfPaneGrow (h);}
}
function lfInit() {
if (!$("lf")) {return;}
lfOptrions = {onstart: lfStart, onend: lfEnd};
- if (!lsRegData) {
- var x = function (data) {
- try {
- lsRegData = OAT.JSON.parse(data);
- } catch (e) { lsRegData = {}; }
- }
- OAT.AJAX.GET ('/ods/api/server.getInfo?info=regData', false, x, {async: false});
+ var regData;
+ var x = function (data) {
+ try {
+ regData = OAT.JSON.parse(data);
+ } catch (e) { regData = {}; }
}
+ OAT.AJAX.GET ('/ods/api/server.getInfo?info=regData', false, x, {async: false});
lfTab = new OAT.Tab("lf_content", {goCallback: lfCallback});
lfTab.add("lf_tab_0", "lf_page_0");
- if (lsRegData.openidEnable)
+ if (regData.openidEnable)
OAT.Dom.show('lf_tab_1');
lfTab.add("lf_tab_1", "lf_page_1");
lfTab.add("lf_tab_2", "lf_page_2");
- if (lsRegData.sslEnable)
+ if (regData.sslEnable)
OAT.Dom.show('lf_tab_3');
lfTab.add("lf_tab_3", "lf_page_3");
- if (lsRegData.twitterEnable)
+ if (regData.twitterEnable)
OAT.Dom.show('lf_tab_4');
lfTab.add("lf_tab_4", "lf_page_4");
- if (lsRegData.linkedinEnable)
+ if (regData.linkedinEnable)
OAT.Dom.show('lf_tab_5');
lfTab.add("lf_tab_5", "lf_page_5");
lfTab.go(0);
@@ -177,7 +164,7 @@ function lfInit() {
}
}
- if (lsRegData.facebookEnable) {
+ if (regData.facebookEnable) {
lfLoadFacebookData(function() {
if (lfFacebookData)
FB.init(lfFacebookData.api_key, "/ods/fb_dummy.vsp", {
@@ -191,23 +178,22 @@ function lfInit() {
});
}
- if (lsRegData.sslEnable) {
- var x1 = function(data) {
- if (!lfSslData)
- try {
- lfSslData = OAT.JSON.parse(data);
- } catch (e) {
- lfSslData = null;
- }
- var prefix = 'lf';
- var tbl = $(prefix+'_table_3');
- if (tbl) {
- OAT.Dom.unlink(prefix+'_table_3_throbber');
- if (lfSslData && lfSslData.iri) {
- OAT.Dom.show(prefix+"_tab_3");
+ if (regData.sslEnable) {
+ var x = function(data) {
+ try {
+ lfSslData = OAT.JSON.parse(data);
+ } catch (e) {
+ lfSslData = null;
+ }
+ if (lfSslData && lfSslData.iri && lfSslData.certLogin) {
+ var prefix = 'lf';
+ OAT.Dom.show(prefix+"_tab_3");
+ var tbl = $(prefix+'_table_3');
+ if (tbl) {
+ OAT.Dom.unlink(prefix+'_table_3_throbber');
lfRowValue(tbl, 'WebID', lfSslData.iri);
if (lfSslData.depiction)
- lfRowImage(tbl, 'Photo', lfSslData.depiction, null, 150);
+ lfRowImage(tbl, 'Photo', lfSslData.depiction);
if (lfSslData.loginName)
lfRowValue(tbl, 'Login Name', lfSslData.loginName);
@@ -222,36 +208,30 @@ function lfInit() {
lfRowValue(tbl, 'Family Name', lfSslData.family_name);
if (!lfSslData.certLogin) {
- var td = lfRowText(tbl, 'Sign up for an ODS account using your existing WebID - ', 'font-weight: bold;', 17);
+ var td = lfRowText(tbl, 'Sign up for an ODS account using your existing WebID - ', 'font-weight: bold;');
lfRowButton2(td, 'sign_up_1');
}
lfTab.go(3);
- } else {
- lfRowText(tbl, 'You must have cerificate with WebID to use this option', 'font-weight: bold;', 17);
}
}
}
if (document.location.protocol == 'https:') {
- if (!lfSslData) {
- OAT.AJAX.GET('/ods/api/user.getFOAFSSLData?sslFOAFCheck=1', '', x1);
- } else {
- x1();
- }
+ OAT.AJAX.GET('/ods/api/user.getFOAFSSLData?sslFOAFCheck=1', '', x);
} else {
OAT.Dom.show('lf_tab_3');
var tbl = $('lf_table_3');
if (tbl) {
OAT.Dom.unlink('lf_table_3_throbber');
- var td = lfRowText(tbl, 'Have you registered WebID? Sign in with it - ', 'font-weight: bold;', 17);
+ var td = lfRowText(tbl, 'Have you registered WebID? Sign in with it - ', 'font-weight: bold;');
lfRowButton(td, 'sign_in_2');
- var td2 = lfRowText(tbl, 'Sign up for an ODS account using your existing WebID - ', 'font-weight: bold;', 17);
+ var td2 = lfRowText(tbl, 'Sign up for an ODS account using your existing WebID - ', 'font-weight: bold;');
lfRowButton2(td2, 'sign_up_2');
}
}
}
if (document.location.protocol != 'https:')
{
- var x2 = function (data) {
+ var x = function (data) {
var o = null;
try {
o = OAT.JSON.parse(data);
@@ -269,7 +249,7 @@ function lfInit() {
links[i].href = ref + '/ods/register.vspx';
}
}
- OAT.AJAX.GET ('/ods/api/server.getInfo?info=sslPort', false, x2);
+ OAT.AJAX.GET ('/ods/api/server.getInfo?info=sslPort', false, x);
}
}
@@ -427,7 +407,7 @@ function lfOpenIdAuthenticate(prefix) {
var xml = OAT.Xml.createXmlDoc(data);
var error = OAT.Xml.xpath (xml, '//error_response', {});
if (error.length)
- showError('Invalid OpenID Server');
+ showError('Invalied OpenID Server');
var oidServer = OAT.Xml.textValue (OAT.Xml.xpath (xml, '/openIdServer_response/server', {})[0]);
if (!oidServer || !oidServer.length)
diff --git a/appsrc/ODS-Framework/login.vspx b/appsrc/ODS-Framework/login.vspx
index 49ce651..82275a1 100644
--- a/appsrc/ODS-Framework/login.vspx
+++ b/appsrc/ODS-Framework/login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.vspx,v 1.7.2.4 2012/03/08 10:46:18 source Exp $
+ - $Id: login.vspx,v 1.7.2.3 2010/09/22 13:55:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/login_keys.vspx b/appsrc/ODS-Framework/login_keys.vspx
index 5ca6b13..b96f0d6 100644
--- a/appsrc/ODS-Framework/login_keys.vspx
+++ b/appsrc/ODS-Framework/login_keys.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: login_keys.vspx,v 1.1.4.5 2012/03/08 10:46:18 source Exp $
+ - $Id: login_keys.vspx,v 1.1.4.4 2011/05/02 14:16:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/mail.vspx b/appsrc/ODS-Framework/mail.vspx
index fe76c2c..c4426b2 100644
--- a/appsrc/ODS-Framework/mail.vspx
+++ b/appsrc/ODS-Framework/mail.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: mail.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: mail.vspx,v 1.5.2.1 2010/09/20 10:15:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/mail_preview.vspx b/appsrc/ODS-Framework/mail_preview.vspx
index b631d29..0452207 100644
--- a/appsrc/ODS-Framework/mail_preview.vspx
+++ b/appsrc/ODS-Framework/mail_preview.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: mail_preview.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: mail_preview.vspx,v 1.5.2.1 2010/09/20 10:15:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/make_ods_vad.xml b/appsrc/ODS-Framework/make_ods_vad.xml
index 15baf4a..c4424a5 100644
--- a/appsrc/ODS-Framework/make_ods_vad.xml
+++ b/appsrc/ODS-Framework/make_ods_vad.xml
@@ -5,12 +5,12 @@
<name package="Framework">
<prop name="Title" value="ODS Framework"/>
<prop name="Developer" value="OpenLink Software"/>
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software"/>
<prop name="Download" value="http://www.openlinksw.com/virtuoso"/>
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso"/>
</name>
- <version package="1.85.92">
- <prop name="Release Date" value="2012-03-13 10:33"/>
+ <version package="1.83.49">
+ <prop name="Release Date" value="2011-10-28 19:37"/>
<prop name="Build" value="Release, optimized"/>
</version>
</caption>
@@ -49,8 +49,8 @@
<![CDATA[
declare rc any;
registry_set('_wa_path_', '/DAV/VAD/wa/');
- registry_set('_wa_version_', '1.85.92');
- registry_set('_wa_build_', '2012-03-13 10:33');
+ registry_set('_wa_version_', '1.83.49');
+ registry_set('_wa_build_', '2011-10-28 19:37');
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/sn.sql', 1, 'report', 1);
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/hosted_services.sql', 1, 'report', 1);
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/registration_xml.sql', 1, 'report', 1);
@@ -86,6 +86,7 @@
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/sql_rdf.sql', 1, 'report', 1);
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/user_rdf.sql', 1, 'report', 1);
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/sioc_priv.sql', 1, 'report', 1);
+ DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/DET_RDFData.sql', 1, 'report', 1);
DB.DBA."RDFData_MAKE_DET_COL" ('/DAV/VAD/wa/RDFData/', sioc..get_graph (), NULL);
DB.DBA.wa_users_rdf_data_det_upgrade ();
DB.DBA.VHOST_REMOVE (lpath=>'/ods/data/rdf');
@@ -98,7 +99,7 @@
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/ods_upstream.sql', 1, 'report', 1);
DB.DBA.VHOST_REMOVE (lpath=>'/oauth');
DB.DBA.VHOST_DEFINE (lpath=>'/oauth', ppath=>'/DAV/VAD/wa/oauth/', vsp_user=>'dba', is_dav=>1, is_brws=>0, def_page=>'index.vsp');
- if (ODS.ODS_API.getDefaultHttps () is not null)
+ if (server_https_port () is not null)
DB.DBA.wa_redefine_vhosts ();
DB.DBA.WA_USER_OL_ACCOUNTS_SET_UP ();
]]>
@@ -110,6 +111,7 @@
</sql>
</ddls>
<resources>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/DET_RDFData.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/SWD.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/aboutus.html" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/accounts.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
@@ -132,7 +134,6 @@
<file overwrite="yes" type="dav" source="data" target_uri="wa/ckeditor/LICENSE.html" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/ckeditor/ckeditor.js" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/ckeditor/config.js" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="dav" source="data" target_uri="wa/ckeditor/contents.css" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/ckeditor/images/spacer.gif" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/ckeditor/lang/en.js" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/ckeditor/plugins/clipboard/dialogs/paste.js" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
@@ -1083,15 +1084,15 @@
<file overwrite="yes" type="dav" source="data" target_uri="wa/url_rule.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/user_rdf.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/user_template.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/Readme.txt" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/css/users.css" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/js/users.js" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/users.html" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/users.jsp" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/users.php" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/users.rb" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/users.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/users/users.xsl" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/Readme.txt" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/css/users.css" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/js/users.js" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/users.html" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/users.jsp" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/users.php" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/users.rb" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/users.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
+ <file overwrite="yes" type="dav" source="data" target_uri="wa/users/users.xsl" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/users_select.js" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/users_select.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/validate.js" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
@@ -1107,14 +1108,7 @@
<file overwrite="yes" type="dav" source="data" target_uri="wa/web_header.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/web_svc.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/webfinger.sql" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/webid/webid_check.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/webid/webid_demo.html" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/webid/webid_demo.php" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/webid/webid_demo.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
- <file overwrite="yes" type="http" source="data" target_uri="wa/webid/webid_verify.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/webid_check.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
- <file overwrite="yes" type="dav" source="data" target_uri="wa/webid_demo.html" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
- <file overwrite="yes" type="dav" source="data" target_uri="wa/webid_demo.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/webid_select.vspx" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/webid_verify.vsp" dav_owner="dav" dav_grp="administrators" dav_perm="111101101NN" makepath="yes"/>
<file overwrite="yes" type="dav" source="data" target_uri="wa/winrect.css" dav_owner="dav" dav_grp="administrators" dav_perm="110100100NN" makepath="yes"/>
diff --git a/appsrc/ODS-Framework/make_vad.sh b/appsrc/ODS-Framework/make_vad.sh
index 5ef590b..2604ef1 100755
--- a/appsrc/ODS-Framework/make_vad.sh
+++ b/appsrc/ODS-Framework/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.57.2.22 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.57.2.16 2011/06/02 12:34:01 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -60,6 +60,11 @@ else
LN="ln -fs"
RM="rm -f"
fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
if [ "z$SERVER" = "z" ]
then
@@ -80,14 +85,7 @@ else
myrm=$RM
fi
-
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
-
-version_init()
+VERSION_INIT()
{
if [ $VOS -eq 1 ]
then
@@ -258,7 +256,6 @@ directory_init() {
mkdir vad/data/wa/users
mkdir vad/data/wa/users/css
mkdir vad/data/wa/users/js
- mkdir vad/data/wa/webid
for dir in `find ckeditor -type d -print | LC_ALL=C sort | grep -v CVS`
do
mkdir vad/data/wa/$dir
@@ -277,7 +274,7 @@ directory_init() {
cp *.css vad/data/wa
cp *.html vad/data/wa
cp *.sql vad/data/wa
- #cp $HOME/binsrc/dav/DET_RDFData.sql vad/data/wa
+ cp $HOME/binsrc/dav/DET_RDFData.sql vad/data/wa
cp *.js vad/data/wa
cp comp/*.xsl vad/data/wa/comp
cp comp/*.js vad/data/wa/comp
@@ -321,10 +318,6 @@ directory_init() {
do
cp $file vad/data/wa/$file
done
- cp webid_demo.php vad/data/wa/webid
- cp vad/data/wa/webid_demo.* vad/data/wa/webid
- cp vad/data/wa/webid_check.* vad/data/wa/webid
- cp vad/data/wa/webid_verify.* vad/data/wa/webid
cp oauth/* vad/data/wa/oauth
cp oauth/images/* vad/data/wa/oauth/images
}
@@ -344,7 +337,7 @@ sticker_init() {
echo " <name package=\"Framework\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Framework\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -428,7 +421,7 @@ sticker_init() {
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/sql_rdf.sql', 1, 'report', 1);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/user_rdf.sql', 1, 'report', 1);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/sioc_priv.sql', 1, 'report', 1);" >> $STICKER
- #echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/DET_RDFData.sql', 1, 'report', 1);" >> $STICKER
+ echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/DET_RDFData.sql', 1, 'report', 1);" >> $STICKER
echo " DB.DBA.\"RDFData_MAKE_DET_COL\" ('/DAV/VAD/wa/RDFData/', sioc..get_graph (), NULL);" >> $STICKER
echo " DB.DBA.wa_users_rdf_data_det_upgrade ();" >> $STICKER
echo " DB.DBA.VHOST_REMOVE (lpath=>'/ods/data/rdf');" >> $STICKER
@@ -441,7 +434,7 @@ sticker_init() {
echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/wa/ods_upstream.sql', 1, 'report', 1);" >> $STICKER
echo " DB.DBA.VHOST_REMOVE (lpath=>'/oauth');" >> $STICKER
echo " DB.DBA.VHOST_DEFINE (lpath=>'/oauth', ppath=>'/DAV/VAD/wa/oauth/', vsp_user=>'dba', is_dav=>1, is_brws=>0, def_page=>'index.vsp');" >> $STICKER
- echo " if (ODS.ODS_API.getDefaultHttps () is not null) " >> $STICKER
+ echo " if (server_https_port () is not null) " >> $STICKER
echo " DB.DBA.wa_redefine_vhosts (); " >> $STICKER
echo " DB.DBA.WA_USER_OL_ACCOUNTS_SET_UP (); " >> $STICKER
echo " ]]>" >> $STICKER
@@ -469,19 +462,8 @@ sticker_init() {
else
perms="111101101NN"
fi
- if echo "$file" | grep -v "/users/" > /dev/null
- then
- if echo "$file" | grep -v "/webid/" > /dev/null
- then
- TYPE="dav"
- else
- TYPE="http"
- fi
- else
- TYPE="http"
- fi
name=`echo "$file" | cut -b10-`
- echo " <file overwrite=\"yes\" type=\"$TYPE\" source=\"data\" target_uri=\"$name\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"$perms\" makepath=\"yes\"/>" >> $STICKER
+ echo " <file overwrite=\"yes\" type=\"dav\" source=\"data\" target_uri=\"$name\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"$perms\" makepath=\"yes\"/>" >> $STICKER
done
echo "</resources>" >> $STICKER
@@ -565,7 +547,7 @@ vad_create() {
STOP_SERVER
$myrm $LOGFILE 2>/dev/null
directory_clean
-version_init
+VERSION_INIT
directory_init
virtuoso_init
sticker_init
@@ -573,6 +555,7 @@ vad_create
virtuoso_shutdown
chmod 644 ods_framework_dav.vad
#chmod 644 virtuoso.trx
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -582,7 +565,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Framework/map_svc.vspx b/appsrc/ODS-Framework/map_svc.vspx
index 7272175..6e16078 100644
--- a/appsrc/ODS-Framework/map_svc.vspx
+++ b/appsrc/ODS-Framework/map_svc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: map_svc.vspx,v 1.6.2.3 2012/03/08 10:46:18 source Exp $
+ - $Id: map_svc.vspx,v 1.6.2.2 2011/03/08 13:28:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/mc.vsp b/appsrc/ODS-Framework/mc.vsp
index 9023df0..3cb1ed2 100644
--- a/appsrc/ODS-Framework/mc.vsp
+++ b/appsrc/ODS-Framework/mc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mc.vsp,v 1.1.4.6 2012/03/08 10:46:18 source Exp $
+-- $Id: mc.vsp,v 1.1.4.2 2011/08/03 11:42:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2011 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
@@ -21,8 +21,7 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
- declare sid, mbox, digest, id, mu, rc, webid, accept, fmt, cb, ep any;
-
+ declare sid, mbox, digest, id, mu, rc, webid, accept, fmt any;
rc := 0;
accept := http_request_header_full (lines, 'Accept', '*/*');
fmt := DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (accept);
@@ -34,32 +33,12 @@
webid := FOAF_SSL_WEBID_GET ();
rc := WEBID_AUTH_GEN (null, 0, '', 1, 0);
mbox := (select VS_UID from VSPX_SESSION where VS_SID = sid and VS_REALM = 'mv');
- cb := (select VS_STATE from VSPX_SESSION where VS_SID = sid and VS_REALM = 'mv');
- if (cb is not null)
- cb := get_keyword ('callback', deserialize (cb));
- else
- cb := null;
if (rc and mbox is not null)
{
digest := sha1_digest (mbox);
id := sprintf ('http://%{URIQADefaultHost}s/mv/data/') || bin2hex (cast (decode_base64 (digest) as varbinary));
mu := 'mailto:' || mbox;
- ep := sprintf ('http://%{URIQADefaultHost}s/sparql/');
- sparql insert into graph iri ('http://localhost/mv')
- {
- `iri (?:id)` <http://vocab.deri.ie/void#inDataset> <http://localhost/mv> .
- <http://localhost/mv> <http://rdfs.org/ns/void#sparqlEndpoint> `iri(?:ep)` .
- `iri (?:id)` foaf:primaryTopic `iri(?:webid)` .
- `iri(?:webid)` foaf:mbox_sha1sum ?:digest .
- };
- if (length (cb))
- {
- declare c any;
- c := case when strchr (cb, '?') is null then '?' else '&' end;
- http_status_set (302);
- http_header (sprintf ('Location: %s%sid=%U\r\n', cb, c, id));
- return;
- }
+ sparql insert into graph iri ('http://localhost/mv') { `iri (?:id)` foaf:primaryTopic `iri(?:webid)` . `iri(?:webid)` foaf:mbox_sha1sum ?:digest . };
if (fmt = 'application/json')
{
http (sprintf ('{"status":"verified", "document_url":"%s"}', id));
diff --git a/appsrc/ODS-Framework/member.vspx b/appsrc/ODS-Framework/member.vspx
index 539c7b8..2ca2972 100644
--- a/appsrc/ODS-Framework/member.vspx
+++ b/appsrc/ODS-Framework/member.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: member.vspx,v 1.6.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: member.vspx,v 1.6.2.1 2010/09/20 10:15:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/member_edit.vspx b/appsrc/ODS-Framework/member_edit.vspx
index 35a4b20..9ba1494 100644
--- a/appsrc/ODS-Framework/member_edit.vspx
+++ b/appsrc/ODS-Framework/member_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: member_edit.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: member_edit.vspx,v 1.5.2.1 2010/09/20 10:15:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/members.vspx b/appsrc/ODS-Framework/members.vspx
index 25aba1b..8f9fecf 100644
--- a/appsrc/ODS-Framework/members.vspx
+++ b/appsrc/ODS-Framework/members.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: members.vspx,v 1.12.2.8 2012/03/08 10:46:18 source Exp $
+ - $Id: members.vspx,v 1.12.2.6 2010/11/11 12:38:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -32,8 +32,6 @@
<vm:page>
<vm:header>
<script type="text/javascript" src="tbl.js">;</script>
- <script type="text/javascript" src="typeahead.js">;</script>
- <link rel="stylesheet" href="typeahead.css" type="text/css" />
<vm:title>Application Members</vm:title>
</vm:header>
<v:on-init>
@@ -48,6 +46,14 @@
{
self.ihome := self.inst.wa_home_url();
}
+ else if (self.wa_type in ('oMail'))
+ {
+ declare tmp varchar;
+
+ tmp := self.iname;
+ self.iname := subseq(tmp, 0, strstr(tmp, '@'));
+ self.wa_domain := subseq(tmp, strstr(tmp, '@'));
+ }
]]>
</v:on-init>
<v:after-data-bind>
@@ -94,7 +100,6 @@
self.vc_redirect ('services.vspx');
</v:on-post>
</v:button>
- <br /><br />
<v:template name="template_01" type="simple" enabled="--case when self.wa_type in ('oDrive', 'oMail', 'IM') or (self.imodel = 1) then 0 else 1 end">
<fieldset>
<legend><b>Members</b></legend>
diff --git a/appsrc/ODS-Framework/members_inv.vspx b/appsrc/ODS-Framework/members_inv.vspx
index 7590b1c..a25aa9f 100644
--- a/appsrc/ODS-Framework/members_inv.vspx
+++ b/appsrc/ODS-Framework/members_inv.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: members_inv.vspx,v 1.7.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: members_inv.vspx,v 1.7.2.1 2010/09/20 10:15:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/moat_ruleset_tags.vspx b/appsrc/ODS-Framework/moat_ruleset_tags.vspx
index 706540d..0a8f2ca 100644
--- a/appsrc/ODS-Framework/moat_ruleset_tags.vspx
+++ b/appsrc/ODS-Framework/moat_ruleset_tags.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: moat_ruleset_tags.vspx,v 1.1.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: moat_ruleset_tags.vspx,v 1.1.2.1 2010/09/20 10:15:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/moat_tags.vspx b/appsrc/ODS-Framework/moat_tags.vspx
index 99cecd4..89fb0f5 100644
--- a/appsrc/ODS-Framework/moat_tags.vspx
+++ b/appsrc/ODS-Framework/moat_tags.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: moat_tags.vspx,v 1.3.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: moat_tags.vspx,v 1.3.2.1 2010/09/20 10:15:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/mv.vsp b/appsrc/ODS-Framework/mv.vsp
index 6127631..343b5fb 100644
--- a/appsrc/ODS-Framework/mv.vsp
+++ b/appsrc/ODS-Framework/mv.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mv.vsp,v 1.1.4.5 2012/03/08 10:46:18 source Exp $
+-- $Id: mv.vsp,v 1.1.4.2 2011/08/03 11:42:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2011 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
@@ -23,20 +23,19 @@
declare ms int;
ms := 0;
- http_rewrite ();
+ http_rewrite ();
if (length ({?'mbox'}))
{
- declare mbox, digest, id, mu, https, sender, sid, accept, fmt, cb any;
+ declare mbox, digest, id, mu, https, sender, sid, accept, fmt any;
accept := http_request_header_full (lines, 'Accept', '*/*');
- fmt := DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (accept);
+ fmt := DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (accept);
if (fmt = 'application/json')
http_header ('Content-Type: application/json\r\n');
- mbox := {?'mbox'};
- cb := {?'cb'};
- https := ODS.ODS_API.getDefaultHttps ();
- sender := (select U_E_MAIL from SYS_USERS where U_NAME = 'dav');
+ mbox := {?'mbox'};
+ https := ODS..getDefaultHttps ();
+ sender := (select U_E_MAIL from SYS_USERS where U_NAME = 'dav');
sid := vspx_sid_generate ();
- insert into VSPX_SESSION (VS_SID, VS_REALM, VS_UID, VS_EXPIRY, VS_STATE) values (sid, 'mv', mbox, now (), serialize (vector ('callback', cb)));
+ insert into VSPX_SESSION (VS_SID, VS_REALM, VS_UID, VS_EXPIRY) values (sid, 'mv', mbox, now ());
declare exit handler for sqlstate '*'
{
if (fmt = 'application/json')
@@ -48,7 +47,7 @@
goto error;
};
smtp_send (null, sender, mbox,
- sprintf ('Subject: Mail verification service\r\nPlease click on the link below to confirm your email.\r\nhttps://%s/mv/mc.vsp?confirm=%U', https, sid));
+ sprintf ('Subject: Mail verification service\r\nPlease click on the link bellow to confirm your email.\r\nhttps://%s/mv/mc.vsp?confirm=%U', https, sid));
ms := 1;
if (fmt = 'application/json')
{
@@ -65,19 +64,19 @@
<?vsp if (ms = 0) { ?>
<h1>Enter your mail address</h1>
<form name="f" method="post" action="mv.vsp">
- <input type="text" size="70" name="mbox" value=""/>
- <input type="submit" value="Verify" name="go" />
+ <input type="text" size="70" name="mbox" value=""/>
+ <input type="submit" value="Verify" name="go" />
</form>
<?vsp } else { ?>
<div>A confirmation mail was sent, please check your mail box.</div>
- <?vsp }
+ <?vsp }
if (0)
{
error:
?>
<div>Error in processing your request.</div>
- <?vsp
- }
+ <?vsp
+ }
?>
</body>
</html>
diff --git a/appsrc/ODS-Framework/myhome.vspx b/appsrc/ODS-Framework/myhome.vspx
index cfa81a9..dca5edd 100644
--- a/appsrc/ODS-Framework/myhome.vspx
+++ b/appsrc/ODS-Framework/myhome.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: myhome.vspx,v 1.15.2.4 2012/03/08 10:46:18 source Exp $
+ - $Id: myhome.vspx,v 1.15.2.3 2010/09/20 10:15:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/nav_framework.css b/appsrc/ODS-Framework/nav_framework.css
index f3ab88a..a911aeb 100644
--- a/appsrc/ODS-Framework/nav_framework.css
+++ b/appsrc/ODS-Framework/nav_framework.css
@@ -1095,6 +1095,37 @@ table.form td {
white-space: nowrap;
}
+.tabs {
+ margin-top: 24px;
+ list-style-type: none;
+ padding-bottom: 1px;
+ padding-left: 0.5em;
+}
+
+.tabs li {
+ display: inline;
+ padding: 1px 3px;
+ margin-left: 0.1em;
+ cursor: pointer;
+ border-top: 1px solid #aaa;
+ border-left: 1px solid #aaa;
+ border-right: 1px solid #aaa;
+ -moz-border-radius-topleft: 3px;
+ -moz-border-radius-topright: 3px;
+ -webkit-border-top-left-radius: 3px;
+ -webkit-border-top-right-radius: 3px;
+ background-color: #EFEFEF;
+ z-index: 10;
+}
+
+.tabs li.tab_selected {
+ background-color: #FFF;
+}
+
+.tabs li.tab:hover {
+ background-color: #FFF;
+}
+
#lf_close {
float: right;
cursor: pointer;
diff --git a/appsrc/ODS-Framework/nav_framework.js b/appsrc/ODS-Framework/nav_framework.js
index bb58da0..4b629b1 100644
--- a/appsrc/ODS-Framework/nav_framework.js
+++ b/appsrc/ODS-Framework/nav_framework.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -55,9 +55,12 @@ function _getChildElemsByClassName(elm, class_name, max_depth,
return elm_arr;
}
-function getChildElemsByClassName(elm, class_name, max_depth, stop_at_first_match) {
+function getChildElemsByClassName(elm, class_name, max_depth,
+ stop_at_first_match) {
var elm_arr = new Array ();
- return _getChildElemsByClassName(elm, class_name, max_depth, stop_at_first_match, elm_arr);
+
+ return _getChildElemsByClassName(elm, class_name, max_depth,
+ stop_at_first_match, elm_arr);
}
function replaceTemplateClass(elm, class_name, content) {
@@ -208,7 +211,7 @@ function inverseSelected(parentDiv) {
}
OAT.Preferences.imagePath = "/ods/images/oat/";
-OAT.Preferences.stylePath = "/ods/oat/styles/";
+OAT.Preferences.stylePath = "/ods/";
window.ODS = {};
@@ -1096,7 +1099,7 @@ ODS.Nav = function(navOptions) {
}, 'menu_link profile_edit shortcut');
profileMenuAProfileEdit.innerHTML = 'edit';
OAT.Event.attach (profileMenuAProfileEdit, "click", function () {
- self.loadCheckedVspx(self.expandURL(self.ods + 'uiedit.vspx'));
+ self.loadVspx (self.expandURL (self.ods + 'uiedit.vspx'));
});
if (self.session.userName)
@@ -1232,9 +1235,11 @@ ODS.Nav = function(navOptions) {
var messagesMenu = new OAT.Menu ();
messagesMenu.noCloseFilter = 'menu_separator';
+
messagesMenu.createFromUL ("messages_menu");
- OAT.Style.include(location.protocol + '//' + location.host + '/ods/dock.css');
+ OAT.Style.include ('dock.css');
+
OAT.Dom.show ($('messages_menu').parentNode);
OAT.Loader.load( [ "dock" ], function() {
@@ -1868,7 +1873,7 @@ ODS.Nav = function(navOptions) {
var aSettings = OAT.Dom.create("a", {cursor: 'pointer'});
OAT.Event.attach(aSettings, "click", function() {
- self.loadCheckedVspx(self.expandURL(self.ods + 'app_settings.vspx'));
+ self.loadVspx (self.expandURL (self.ods + 'app_settings.vspx'));
});
aSettings.innerHTML = 'Application Settings';
@@ -1876,7 +1881,7 @@ ODS.Nav = function(navOptions) {
var aSiteSettings = OAT.Dom.create("a", {cursor: 'pointer'});
OAT.Event.attach(aSiteSettings, "click", function() {
- self.loadCheckedVspx(self.expandURL(self.ods + 'site_settings.vspx'));
+ self.loadVspx (self.expandURL (self.ods + 'site_settings.vspx'));
});
aSiteSettings.innerHTML = 'Site Settings';
@@ -1942,8 +1947,6 @@ ODS.Nav = function(navOptions) {
try {
self.regData = OAT.JSON.parse(data);
} catch (e) { self.regData = {}; }
- if (!lsRegData)
- lsRegData = self.regData;
}
OAT.AJAX.GET ('/ods/api/server.getInfo?info=regData', false, x, {async: false});
@@ -1982,9 +1985,6 @@ ODS.Nav = function(navOptions) {
} catch (e) {
o = null;
}
- if (!lfSslData)
- lfSslData = o;
-
if (o && o.iri) {
self.sslData = o;
if (o.certLogin && !self.userLogged) {
@@ -1997,7 +1997,7 @@ ODS.Nav = function(navOptions) {
}
}
}
- OAT.AJAX.GET('/ods/api/user.getFOAFSSLData?sslFOAFCheck=1', false, x, {async: false});
+ OAT.AJAX.GET('/ods/api/user.getFOAFSSLData?sslFOAFCheck=1&sslLoginCheck=1', false, x);
}
}
@@ -2744,7 +2744,7 @@ ODS.Nav = function(navOptions) {
var connHTML = templateHtml;
- connHTML = connHTML.replace('images/profile.png', conn.photo.length > 0 ? conn.photo : 'images/profile.png');
+ connHTML = connHTML.replace('{connImgSRC}', conn.photo.length > 0 ? conn.photo : 'images/missing_profile_picture.png'); // images/profile.png
connHTML = connHTML.replace ('{connProfileFullName}', conn.fullName);
connHTML = connHTML.replace ('{sendMsg}', 'sendMsg_' + conn.uid);
connHTML = connHTML.replace ('{viewConnections}', 'viewConnections_' + conn.uid);
@@ -3020,7 +3020,6 @@ ODS.Nav = function(navOptions) {
img.src = userProfilePhoto;
img.alt = userDisplayName;
img.rel = 'foaf:depiction';
- OAT.Dom.clear('userProfilePhoto');
$('userProfilePhoto').appendChild(img);
} else {
$('userProfilePhoto').innerHTML = '<br /><b>Photo Not Available</b><br /><br />';
@@ -4006,18 +4005,6 @@ ODS.Nav = function(navOptions) {
return this.expandURL(this.ods + 'sfront.vspx');
};
- this.loadCheckedVspx = function(url) {
- var x = function (data) {
- var xml = OAT.Xml.createXmlDoc(data);
- if (hasError(xml, false)) {
- self.session.end();
- } else {
- self.loadVspx(url);
- }
- }
- OAT.AJAX.GET('/ods/api/user.validate?sid='+self.session.sid+'&realm='+self.session.realm, false, x);
- };
-
this.loadRDFB = function(url, useFrame) {
if (typeof (url) == 'undefined')
return;
@@ -4157,7 +4144,7 @@ ODS.Nav = function(navOptions) {
if (applicationType == 'FeedManager')
applicationType = 'Feed Manager';
- else if (applicationType == 'InstantMessenger')
+ if (applicationType == 'InstantMessenger')
applicationType = 'Instant Messenger';
var data = 'sid=' + self.session.sid + '&application=' + encodeURIComponent(applicationType);
@@ -4167,8 +4154,7 @@ ODS.Nav = function(navOptions) {
if (typeof (callbackFunction) == "function")
callbackFunction (xmlDoc);
} else {
- self.session.end();
- // self.wait();
+ self.wait();
}
}
OAT.AJAX.POST(self.session.endpoint + "checkApplication", data, callback, ajaxOptions);
diff --git a/appsrc/ODS-Framework/nav_framework_api.sql b/appsrc/ODS-Framework/nav_framework_api.sql
index c265a46..da6cffb 100644
--- a/appsrc/ODS-Framework/nav_framework_api.sql
+++ b/appsrc/ODS-Framework/nav_framework_api.sql
@@ -1,10 +1,10 @@
--
--- $Id: nav_framework_api.sql,v 1.23.2.21 2012/03/08 10:46:18 source Exp $
+-- $Id: nav_framework_api.sql,v 1.23.2.20 2011/05/16 08:53:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/new_inst.vspx b/appsrc/ODS-Framework/new_inst.vspx
index 49f19be..481d086 100644
--- a/appsrc/ODS-Framework/new_inst.vspx
+++ b/appsrc/ODS-Framework/new_inst.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: new_inst.vspx,v 1.21.2.5 2012/03/08 10:46:18 source Exp $
+ - $Id: new_inst.vspx,v 1.21.2.4 2010/09/20 10:15:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/default.css b/appsrc/ODS-Framework/oauth/default.css
index 08cec36..4dbec62 100644
--- a/appsrc/ODS-Framework/oauth/default.css
+++ b/appsrc/ODS-Framework/oauth/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.1.2.2 2012/03/08 10:46:20 source Exp $
+ * $Id: default.css,v 1.1.2.1 2010/09/20 10:15:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/error.vspx b/appsrc/ODS-Framework/oauth/error.vspx
index 0935c01..59ad67f 100644
--- a/appsrc/ODS-Framework/oauth/error.vspx
+++ b/appsrc/ODS-Framework/oauth/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.1.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: error.vspx,v 1.1.2.1 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/foaf_ssl.sql b/appsrc/ODS-Framework/oauth/foaf_ssl.sql
index a78f503..54092cc 100644
--- a/appsrc/ODS-Framework/oauth/foaf_ssl.sql
+++ b/appsrc/ODS-Framework/oauth/foaf_ssl.sql
@@ -1,43 +1,21 @@
DB.DBA.EXEC_STMT ('create table FOAF_SSL_ACL (FS_URI varchar primary key, FS_UID varchar not null)', 0)
;
-create procedure FOAF_WEBID_USER (
- inout webID varchar,
- inout createMode integer := 0)
+create procedure FOAF_SSL_QR (in gr varchar, in agent varchar)
{
- declare uid varchar;
-
- uid := (select FS_UID from DB.DBA.FOAF_SSL_ACL where FS_URI = webID);
- if (createMode and isnull (uid))
- {
- uid := sprintf ('SPUID%d', sequence_next ('__SPUID'));
- USER_CREATE (uid, uuid());
- USER_GRANT_ROLE (uid, 'SPARQL_SELECT');
- USER_SET_OPTION (uid, 'DISABLED', 1);
- insert into DB.DBA.FOAF_SSL_ACL (FS_URI, FS_UID)
- values (webID, uid);
- }
- return uid;
-}
-;
-
-create procedure FOAF_SSL_QR (in gr varchar, in uri varchar)
-{
- return sprintf ('sparql
- define input:storage ""
- define input:same-as "yes"
- prefix cert: <http://www.w3.org/ns/auth/cert#>
- prefix rsa: <http://www.w3.org/ns/auth/rsa#>
- select (str (?exp)) (str (?mod))
- from <%S>
- where
- {
- { ?id cert:identity <%S> ; rsa:public_exponent ?exp ; rsa:modulus ?mod . }
- union
- { ?id cert:identity <%S> ; rsa:public_exponent ?exp1 ; rsa:modulus ?mod1 . ?exp1 cert:decimal ?exp . ?mod1 cert:hex ?mod . }
- union
- { <%S> cert:key ?key . ?key cert:exponent ?exp . ?key cert:modulus ?mod . }
- }', gr, uri, uri, uri);
+ declare qr any;
+ qr := sprintf (
+ 'sparql define input:storage "" '||
+ ' prefix cert: <http://www.w3.org/ns/auth/cert#> '||
+ ' prefix rsa: <http://www.w3.org/ns/auth/rsa#> ' ||
+ ' select (str (bif:coalesce (?exp_val, ?exp))) (str (bif:coalesce (?mod_val, ?mod))) '||
+ ' from <%S> '||
+ ' where { '||
+ ' ?id cert:identity <%S> ; rsa:public_exponent ?exp ; rsa:modulus ?mod . ' ||
+ ' optional { ?exp cert:decimal ?exp_val . ?mod cert:hex ?mod_val . } '||
+ ' } ',
+ gr, agent);
+ return qr;
}
;
@@ -52,7 +30,7 @@ create procedure FOAF_SSL_QR_BY_ACCOUNT (in gr varchar, in agent varchar)
' where { <%S> <http://xmlns.com/foaf/0.1/holdsAccount> ?acc . ?id cert:identity ?acc ; rsa:public_exponent ?exp ; rsa:modulus ?mod . '||
' optional { ?exp cert:decimal ?exp_val . ?mod cert:hex ?mod_val . } } ',
gr, agent);
- return qr;
+ return qr;
}
;
@@ -72,27 +50,6 @@ create procedure FOAF_SSL_WEBID_GET (in cert any := null, in cert_type int := 0)
}
;
-create procedure FOAF_SSL_WEBID_GET_ALL (in cert any := null, in cert_type int := 0)
-{
- declare agents, agent, tmp, alts any;
- agent := get_certificate_info (7, cert, cert_type, '', '2.5.29.17');
- agents := null;
- if (agent is not null)
- {
- declare inx int;
- alts := regexp_replace (agent, ',[ ]*', ',', 1, null);
- alts := split_and_decode (alts, 0, '\0\0,:');
- if (alts is null)
- return null;
- while (0 <> (tmp := adm_next_keyword ('URI', alts, inx)))
- {
- agents := vector_concat (agents, vector (tmp));
- }
- }
- return agents;
-}
-;
-
create procedure FOAF_SSL_MAIL_GET (in cert any := null, in cert_type int := 0)
{
declare alts, mail any;
@@ -111,36 +68,18 @@ create procedure FOAF_SSL_MAIL_GET (in cert any := null, in cert_type int := 0)
}
;
-create procedure FOAF_SSL_MAIL_GET_ALL (in cert any := null, in cert_type int := 0)
-{
- declare alts, mail, ret any;
- ret := vector ();
- mail := get_certificate_info (10, cert, cert_type, '', 'emailAddress');
- if (mail is not null)
- ret := vector_concat (ret, vector (mail));
- alts := get_certificate_info (7, cert, cert_type, '', '2.5.29.17');
- if (alts is not null)
- {
- alts := regexp_replace (alts, ',[ ]*', ',', 1, null);
- alts := split_and_decode (alts, 0, '\0\0,:');
- mail := get_keyword ('email', alts);
- if (mail is not null and not position (mail, ret))
- ret := vector_concat (ret, vector (mail));
- }
- return ret;
-}
-;
-
--
-- WHEN USE try_loading_webid must clear the graph named as webid
---
+--
create procedure FOAF_SSL_WEBFINGER (in cert any := null, in try_loading_webid int := 0, in cert_type int := 0)
{
- declare mails, webid, domain, host_info, xrd, template, url, h any;
+ declare mail, webid, domain, host_info, xrd, template, url any;
declare xt, xd, tmpcert any;
- mails := FOAF_SSL_MAIL_GET_ALL (cert, cert_type);
+ mail := FOAF_SSL_MAIL_GET (cert, cert_type);
+ if (mail is null)
+ return null;
declare exit handler for sqlstate '*'
{
@@ -148,47 +87,40 @@ create procedure FOAF_SSL_WEBFINGER (in cert any := null, in try_loading_webid i
return null;
};
- foreach (varchar mail in mails) do
- {
- domain := subseq (mail, position ('@', mail));
- h := null;
- host_info := http_get (sprintf ('http://%s/.well-known/host-meta', domain), h, 'GET', null, null, null, 10, 15);
- if (h is null or h[0] not like 'HTTP/1._ 200')
- goto next_mail;
- xd := xtree_doc (host_info);
- template := cast (xpath_eval ('/XRD/Link[@rel="lrdd"]/@template', xd) as varchar);
- url := replace (template, '{uri}', 'acct:' || mail);
- xrd := http_get (url);
- xd := xtree_doc (xrd);
- xt := xpath_eval ('/XRD/Property[@type="certificate"]/@href', xd, 0);
- foreach (any x in xt) do
+ domain := subseq (mail, position ('@', mail));
+ host_info := http_get (sprintf ('http://%s/.well-known/host-meta', domain));
+ xd := xtree_doc (host_info);
+ template := cast (xpath_eval ('/XRD/Link[@rel="lrdd"]/@template', xd) as varchar);
+ url := replace (template, '{uri}', 'acct:' || mail);
+ xrd := http_get (url);
+ xd := xtree_doc (xrd);
+ xt := xpath_eval ('/XRD/Property[@type="certificate"]/@href', xd, 0);
+ foreach (any x in xt) do
+ {
+ x := cast (x as varchar);
+ tmpcert := http_get (x);
+ if (get_certificate_info (6, cert, cert_type, '') = get_certificate_info (6, tmpcert, 0, ''))
{
- x := cast (x as varchar);
- tmpcert := http_get (x);
- if (get_certificate_info (6, cert, cert_type, '') = get_certificate_info (6, tmpcert, 0, ''))
+ webid := null;
+ if (try_loading_webid)
{
- webid := null;
- if (try_loading_webid)
- {
- declare hf, gr, graph, qr, stat, msg any;
- webid := cast (xpath_eval ('/XRD/Property[@type="webid"]/@href', xd) as varchar);
- hf := rfc1808_parse_uri (webid);
- hf[5] := '';
- gr := DB.DBA.vspx_uri_compose (hf);
- graph := uuid ();
- qr := sprintf ('sparql load <%S> into graph <%S>', gr, graph);
- stat := '00000';
- exec (qr, stat, msg);
- commit work;
- if (stat = '00000')
- return graph;
- else
- return null;
- }
- return coalesce (webid, 'acct:' || mail);
+ declare hf, gr, graph, qr, stat, msg any;
+ webid := cast (xpath_eval ('/XRD/Property[@type="webid"]/@href', xd) as varchar);
+ hf := rfc1808_parse_uri (webid);
+ hf[5] := '';
+ gr := DB.DBA.vspx_uri_compose (hf);
+ graph := uuid ();
+ qr := sprintf ('sparql load <%S> into graph <%S>', gr, graph);
+ stat := '00000';
+ exec (qr, stat, msg);
+ commit work;
+ if (stat = '00000')
+ return graph;
+ else
+ return null;
}
+ return coalesce (webid, 'acct:' || mail);
}
- next_mail:;
}
return null;
}
@@ -197,15 +129,12 @@ create procedure FOAF_SSL_WEBFINGER (in cert any := null, in try_loading_webid i
create procedure DB.DBA.FOAF_MOD (in m any)
{
declare modulus any;
- modulus := lower (regexp_replace (m, '[^A-Z0-9a-f]', '', 1, null));
+ modulus := lower (regexp_replace (m, '[^A-Z0-9a-f]', '', 1, null));
--dbg_obj_print_vars (modulus);
return modulus;
}
;
-grant execute on DB.DBA.FOAF_MOD to SPARQL_SELECT
-;
-
create procedure FOAF_SSL_AUTH (in realm varchar)
{
return FOAF_SSL_AUTH_GEN (realm, 0);
@@ -217,11 +146,7 @@ create procedure WEBID_AUTH_GEN (in cert any, in ctype int, in realm varchar, in
declare stat, msg, meta, data, info, qr, hf, graph, fing, gr, modulus, alts, dummy any;
declare agent varchar;
declare acc int;
- declare ret_code, done int;
-
- ret_code := 0;
acc := 0;
- done := 0;
declare exit handler for sqlstate '*'
{
rollback work;
@@ -267,7 +192,7 @@ create procedure WEBID_AUTH_GEN (in cert any, in ctype int, in realm varchar, in
stat := '00000';
exec (qr, stat, msg);
commit work;
- qr := FOAF_SSL_QR (gr, agent);
+ qr := FOAF_SSL_QR (gr, agent);
stat := '00000';
-- dbg_printf ('%s', qr);
exec (qr, stat, msg, vector (), 0, meta, data);
@@ -302,433 +227,18 @@ create procedure WEBID_AUTH_GEN (in cert any, in ctype int, in realm varchar, in
goto again_check;
}
err_ret:
--- dbg_obj_print (stat, data);
exec (sprintf ('sparql clear graph <%S>', gr), stat, msg);
commit work;
- {
- declare page, xt, xp varchar;
- declare exit handler for sqlstate '*'
- {
- goto ret;
- };
- page := http_client (url=>graph, n_redirects=>15);
- verify:
- xt := xtree_doc (page, 2);
- xp := xpath_eval ('string (.)', xt);
- xp := cast (xp as varchar);
- -- try DI
- if (strstr (xp, '#SHA1') is not null)
- fing := get_certificate_info (6, cert, ctype, null, 'sha1');
- fing := replace (fing, ':', '');
- if (strstr (xp, sprintf ('Fingerprint:%s', fing)) is not null)
- {
- ret_code := 1;
- goto ret;
- }
- if (graph like 'http://twitter.com/%')
- {
- declare acco, arr, json, res any;
- arr := sprintf_inverse (graph, 'http://twitter.com/%s', 1);
- acco := arr[0];
- json := http_get (sprintf ('http://search.twitter.com/search.json?q=%%40Fingerprint%%3A%U%%20from%%3A%U', fing, acco));
- arr := json_parse (json);
- res := get_keyword ('results', arr);
- if (length (res) > 0)
- {
- ret_code := 1;
- goto ret;
- }
- fing := get_certificate_info (6, cert, ctype, null, 'sha1');
- fing := replace (fing, ':', '');
- json := http_get (sprintf ('http://search.twitter.com/search.json?q=%%40Fingerprint%%3A%U%%20from%%3A%U', fing, acco));
- arr := json_parse (json);
- res := get_keyword ('results', arr);
- if (length (res) > 0)
- {
- ret_code := 1;
- goto ret;
- }
- }
- if (not done and graph like 'http://graph.facebook.com/%')
- {
- declare tok, og_id, tree, nick any;
- tree := json_parse (page);
- og_id := get_keyword ('id', tree);
- nick := get_keyword ('username', tree);
- tok := DB.DBA.OPENGRAPH_GET_ACCESS_TOKEN (og_id);
- if (tok is null)
- goto ret;
- page := http_get (sprintf ('https://graph.facebook.com/%U/feed?access_token=%U', nick, tok));
- done := 1;
- goto verify;
- }
- if (not done and graph like 'http://%.linkedin.com/in/%')
- {
- declare oauth_keys, arr, opts, url, api_url, cnt any;
- declare consumer_key, consumer_secret, oauth_token, oauth_secret, person_id varchar;
- opts := (select RM_OPTIONS from DB..SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_LINKEDIN');
- oauth_keys := DB.DBA.LINKEDIN_GET_ACCESS_TOKEN (graph);
- oauth_token := oauth_keys[0];
- oauth_secret := oauth_keys[1];
- consumer_key := get_keyword ('consumer_key', opts);
- consumer_secret := get_keyword ('consumer_secret', opts);
- api_url := sprintf ('https://api.linkedin.com/v1/people/url=%U:(id)', graph);
- url := DB.DBA.sign_request ('GET', api_url, '', consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
- cnt := http_get (url);
- xt := xtree_doc (cnt);
- person_id := cast (xpath_eval ('/person/id/text()', xt) as varchar);
- url := DB.DBA.sign_request ('GET', sprintf ('http://api.linkedin.com/v1/people/%s/network', person_id), 'type=SHAR&scope=self', consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
- page := http_get (url);
- done := 1;
- goto verify;
- }
- exec (sprintf (
- 'sparql define get:soft "add" prefix opl: <http://www.openlinksw.com/schemas/cert#> select ?f ?dgst from <%S> { ?s opl:hasCertificate ?c . ?c opl:fingerprint ?f ; opl:fingerprint-digest ?dgst . }',
- graph), stat, msg, vector (), 0, meta, data);
- if (length (data))
- {
- foreach (any x in data) do
- {
- declare fng, fng2 any;
- fng := get_certificate_info (6, cert, ctype, null, x[1]);
- fng := replace (fng, ':', '');
- fng2 := x[0];
- fng2 := replace (fng2, ':', '');
- if (lower (fng2) = lower (fng))
- {
- ret_code := 1;
- goto ret;
- }
- }
- }
-
- }
- ret:
- return ret_code;
-}
-;
-
-create procedure WEBID_DI_SPLIT (in str varchar)
-{
- declare di, h, dgst varchar;
- declare ret any;
- ret := vector ();
- while (di := regexp_match ('di:[^ <>]+', str, 1) is not null)
- {
- h := WS.WS.PARSE_URI (di);
- dgst := bin2hex (cast (decode_base64 (replace (replace (h[3], '-', '+'), '_', '/')) as varbinary));
- ret := vector_concat (ret, vector (vector (h[2], dgst)));
- }
- return ret;
-}
-;
-
-create procedure DB.DBA.X509_STRING_DATE (in val varchar)
-{
- declare ret, tmp any;
- ret := NULL;
- declare exit handler for sqlstate '*'
- {
- return null;
- };
- val := regexp_replace (val, '[ ]+', ' ', 1, null);
- -- Jan 11 14:36:33 2012 GMT
- if (val is not null and regexp_match ('[[:upper:]][[:lower:]]{2} [0-9]{1,} [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]{4,} GMT', val) is not null)
- {
- tmp := sprintf_inverse (val, '%s %s %s %s GMT', 0);
- if (tmp is not null and length (tmp) > 3)
- {
- ret := http_string_date (sprintf ('Wee, %s %s %s %s GMT', tmp[1], tmp[0], tmp[3], tmp[2]));
- ret := dt_set_tz (ret, 0);
- }
- }
- return ret;
-}
-;
-
-create procedure WEBID_AUTH_GEN_2 (
- in cert any, -- certificate
- in ctype int, -- certificate type see get_certificate_info for details
- in realm varchar, -- application realm
- in allow_nobody int := 0, -- anonymous access
- in use_session int := 1, -- use session table
- out ag any, -- detected webid URI
- inout _gr any, -- if non null data from webid URI will be loaded in the graph name in _gr
- in check_expiration int := 0,
- out validation_type int -- if valid, the way it was done : 0 - rdf graph, 1 - webfinger, 2 - DI, 3 - search, 4 - sponge
- )
-{
- declare stat, msg, meta, data, info, qr, hf, graph, fing, gr, modulus, alts, dummy any;
- declare agent varchar;
- declare acc int;
- declare ret_code, done, is_di int;
- declare agents, di_arr, dgst, dhash, fing_b64u any;
- declare valid_from, valid_to datetime;
-
- ret_code := 0;
- acc := 0;
- done := 0;
- is_di := 0;
- ag := null;
- validation_type := null;
- declare exit handler for sqlstate '*'
- {
- rollback work;
- goto ret;
- }
- ;
-
- if (cert is null and client_attr ('client_certificate') = 0)
- return 0;
-
- if (_gr is null)
- gr := 'http:' || uuid ();
- else
- gr := _gr;
- info := get_certificate_info (9, cert, ctype);
- fing := get_certificate_info (6, cert, ctype);
- valid_from := X509_STRING_DATE (get_certificate_info (4, cert, ctype));
- valid_to := X509_STRING_DATE (get_certificate_info (5, cert, ctype));
- if (check_expiration = 1 and (valid_to < now () or valid_from > now ()))
- return 0;
- agents := FOAF_SSL_WEBID_GET_ALL (cert, ctype);
- if (not isarray (info))
- return 0;
- if (use_session)
- {
- for select VS_UID, VS_STATE from VSPX_SESSION where VS_SID = fing and VS_REALM = 'FOAF+SSL' do
- {
- declare st any;
- st := deserialize (VS_STATE);
- ag := get_keyword ('agent', st);
- validation_type := get_keyword ('vtype', st);
- connection_set ('SPARQLUserId', VS_UID);
- return 1;
- }
- }
-
- if (agents is null)
- goto verify_mails;
-
- foreach (any _agent in agents) do
- {
- agent := _agent;
- agent_fp:
- ag := agent;
- if (agent like 'ldap://%' and DB.DBA.FOAF_SSL_LDAP_CHECK_CERT_INT (agent, cert, ctype, dummy))
- {
- validation_type := 5;
- goto authenticated;
- }
-
- hf := rfc1808_parse_uri (agent);
- hf[5] := '';
- graph := DB.DBA.vspx_uri_compose (hf);
- qr := sprintf ('sparql define get:soft "add" define get:uri <%S> select count(*) from <%S> { ?s ?p ?o }', graph, gr);
- stat := '00000';
- exec (qr, stat, msg);
- commit work;
- qr := FOAF_SSL_QR (gr, agent);
- stat := '00000';
- -- dbg_printf ('%s', qr);
- exec (qr, stat, msg, vector (), 0, meta, data);
- validation_type := 0;
- again_check:;
- if (stat = '00000' and length (data))
- {
- foreach (any _row in data) do
- {
- declare mod any;
- mod := bin2hex (info[2]);
- --dbg_obj_print (_row[0], cast (info[1] as varchar), DB.DBA.FOAF_MOD (_row[1]), bin2hex (info[2]));
- if (_row[0] = cast (info[1] as varchar) and DB.DBA.FOAF_MOD (_row[1]) = bin2hex (info[2]))
- {
- declare arr, uid any;
- authenticated:
- ag := agent;
- --_gr := graph;
- uid := coalesce ((select FS_UID from FOAF_SSL_ACL where agent like FS_URI), 'nobody');
- if ('nobody' = uid and allow_nobody = 0)
- goto ret;
- connection_set ('SPARQLUserId', uid);
- if (use_session)
- insert replacing VSPX_SESSION (VS_SID, VS_REALM, VS_UID, VS_EXPIRY, VS_STATE)
- values (fing, 'FOAF+SSL', uid, now (), serialize (vector ('agent', ag, 'vtype', validation_type)));
- if (_gr is null)
- exec (sprintf ('sparql clear graph <%S>', gr), stat, msg);
- commit work;
- return 1;
- }
- }
- }
- else if (acc = 0)
- {
- qr := FOAF_SSL_QR_BY_ACCOUNT (gr, agent);
- stat := '00000';
- -- dbg_printf ('%s', qr);
- exec (qr, stat, msg, vector (), 0, meta, data);
- acc := 1;
- goto again_check;
- }
- }
- verify_mails:
- agent := FOAF_SSL_WEBFINGER (cert, 0, ctype);
- if (agent is not null)
- {
- validation_type := 1;
- goto authenticated;
- }
- validation_type := null;
- {
- ag := graph;
- declare page, xt, xp varchar;
- declare exit handler for sqlstate '*'
- {
- goto ret;
- };
- page := http_client (url=>graph, n_redirects=>15);
-
- verify:
- xt := xtree_doc (page, 2);
- xp := xpath_eval ('string (.)', xt);
- xp := cast (xp as varchar);
- di_arr := WEBID_DI_SPLIT (xp);
- if (length (di_arr) > 1)
- {
- foreach (any elm in di_arr) do
- {
- dgst := elm [0];
- dhash := elm [1];
- fing := get_certificate_info (6, cert, ctype, null, dgst);
- fing := lower (replace (fing, ':', ''));
- fing_b64u := encode_base64url (cast (hex2bin (fing) as varchar));
- if (fing = dhash)
- {
- validation_type := 2;
- ret_code := 1;
- goto ret;
- }
- is_di := 1;
- }
- }
- else
- {
- if (strstr (xp, '#SHA1') is not null)
- fing := get_certificate_info (6, cert, ctype, null, 'sha1');
- fing := replace (fing, ':', '');
- }
- if (strstr (xp, sprintf ('Fingerprint:%s', fing)) is not null)
- {
- validation_type := 2;
- ret_code := 1;
- goto ret;
- }
- if (graph like 'http://twitter.com/%')
- {
- declare acco, arr, json, res, url any;
- arr := sprintf_inverse (graph, 'http://twitter.com/%s', 1);
- acco := arr[0];
- if (is_di)
- {
- url := sprintf ('http://search.twitter.com/search.json?q=%%40%%23X509Cert%%20di:%s;%s%%20from%%3A%U', dgst, fing_b64u, acco);
- }
- else
- {
- url := sprintf ('http://search.twitter.com/search.json?q=%%40Fingerprint%%3A%U%%20from%%3A%U', fing, acco);
- }
- json := http_get (url);
- arr := json_parse (json);
- res := get_keyword ('results', arr);
- if (length (res) > 0)
- {
- validation_type := 3;
- ret_code := 1;
- goto ret;
- }
- if (not is_di)
- {
- fing := get_certificate_info (6, cert, ctype, null, 'sha1');
- fing := replace (fing, ':', '');
- json := http_get (sprintf ('http://search.twitter.com/search.json?q=%%40Fingerprint%%3A%U%%20from%%3A%U', fing, acco));
- arr := json_parse (json);
- res := get_keyword ('results', arr);
- if (length (res) > 0)
- {
- validation_type := 3;
- ret_code := 1;
- goto ret;
- }
- }
- }
- if (not done and graph like 'http://graph.facebook.com/%')
- {
- declare tok, og_id, tree, nick any;
- tree := json_parse (page);
- og_id := get_keyword ('id', tree);
- nick := get_keyword ('username', tree);
- tok := DB.DBA.OPENGRAPH_GET_ACCESS_TOKEN (og_id);
- if (tok is null)
- goto ret;
- page := http_get (sprintf ('https://graph.facebook.com/%U/feed?access_token=%U', nick, tok));
- done := 1;
- goto verify;
- }
- if (not done and graph like 'http://%.linkedin.com/in/%')
- {
- declare oauth_keys, arr, opts, url, api_url, cnt any;
- declare consumer_key, consumer_secret, oauth_token, oauth_secret, person_id varchar;
- opts := (select RM_OPTIONS from DB..SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_LINKEDIN');
- oauth_keys := DB.DBA.LINKEDIN_GET_ACCESS_TOKEN (graph);
- oauth_token := oauth_keys[0];
- oauth_secret := oauth_keys[1];
- consumer_key := get_keyword ('consumer_key', opts);
- consumer_secret := get_keyword ('consumer_secret', opts);
- api_url := sprintf ('https://api.linkedin.com/v1/people/url=%U:(id)', graph);
- url := DB.DBA.sign_request ('GET', api_url, '', consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
- cnt := http_get (url);
- xt := xtree_doc (cnt);
- person_id := cast (xpath_eval ('/person/id/text()', xt) as varchar);
- url := DB.DBA.sign_request ('GET', sprintf ('http://api.linkedin.com/v1/people/%s/network', person_id), 'type=SHAR&scope=self', consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
- page := http_get (url);
- done := 1;
- goto verify;
- }
- exec (sprintf (
- 'sparql define get:soft "add" prefix opl: <http://www.openlinksw.com/schemas/cert#> select ?f ?dgst from <%S> { ?s opl:hasCertificate ?c . ?c opl:fingerprint ?f ; opl:fingerprint-digest ?dgst . }',
- graph), stat, msg, vector (), 0, meta, data);
- if (length (data))
- {
- foreach (any x in data) do
- {
- declare fng, fng2 any;
- fng := get_certificate_info (6, cert, ctype, null, x[1]);
- fng := replace (fng, ':', '');
- fng2 := x[0];
- fng2 := replace (fng2, ':', '');
- if (lower (fng2) = lower (fng))
- {
- validation_type := 4;
- ret_code := 1;
- goto ret;
- }
- }
- }
-
- }
- ret:
- if (_gr is null)
- exec (sprintf ('sparql clear graph <%S>', gr), stat, msg);
- commit work;
- return ret_code;
+-- dbg_obj_print (stat, data);
+ return 0;
}
;
create procedure FOAF_SSL_AUTH_GEN (in realm varchar, in allow_nobody int := 0, in use_session int := 1)
{
- declare cert, gr, w, vtype any;
+ declare cert any;
cert := client_attr ('client_certificate');
- gr := null;
- return WEBID_AUTH_GEN_2 (cert, 0, realm, allow_nobody, use_session, w, gr, 0, vtype);
+ return WEBID_AUTH_GEN (cert, 0, realm, allow_nobody, use_session);
}
;
@@ -758,7 +268,7 @@ create procedure FOAF_CHECK_WEBID (in agent varchar)
stat := '00000';
exec (qr, stat, msg);
commit work;
- qr := FOAF_SSL_QR (gr, agent);
+ qr := FOAF_SSL_QR (gr, agent);
stat := '00000';
-- dbg_printf ('%s', qr);
exec (qr, stat, msg, vector (), 0, meta, data);
@@ -790,10 +300,6 @@ DB.DBA.VHOST_REMOVE (vhost=>'*sslini*', lhost=>'*sslini*', lpath=>'/sparql-ssl')
DB.DBA.VHOST_DEFINE (vhost=>'*sslini*', lhost=>'*sslini*', lpath=>'/sparql-ssl',
ppath => '/!sparql/', is_dav => 1, vsp_user => 'dba', opts => vector('noinherit', 1), auth_fn=>'DB.DBA.FOAF_SSL_AUTH');
-DB.DBA.VHOST_REMOVE (vhost=>'*sslini*', lhost=>'*sslini*', lpath=>'/sparql-webid');
-DB.DBA.VHOST_DEFINE (vhost=>'*sslini*', lhost=>'*sslini*', lpath=>'/sparql-webid',
- ppath => '/!sparql/', is_dav => 1, vsp_user => 'dba', opts => vector('noinherit', 1), auth_fn=>'DB.DBA.FOAF_SSL_AUTH');
-
create procedure FOAF_SSL_AUTH_ACL (in acl varchar, in realm varchar)
{
declare stat, msg, meta, data, info, qr, hf, graph, fing, gr, modulus, alts any;
@@ -835,7 +341,7 @@ create procedure FOAF_SSL_AUTH_ACL (in acl varchar, in realm varchar)
gr := uuid ();
- if (wf)
+ if (wf)
goto authenticated;
hf := rfc1808_parse_uri (agent);
@@ -845,11 +351,11 @@ create procedure FOAF_SSL_AUTH_ACL (in acl varchar, in realm varchar)
stat := '00000';
exec (qr, stat, msg);
commit work;
- qr := FOAF_SSL_QR (gr, agent);
+ qr := FOAF_SSL_QR (gr, agent);
stat := '00000';
exec (qr, stat, msg, vector (), 0, meta, data);
- again_check:;
- if (stat = '00000' and length (data))
+ again_check:;
+ if (stat = '00000' and length (data))
{
foreach (any _row in data) do
{
@@ -904,7 +410,7 @@ create procedure DB.DBA.FOAF_SSL_LDAP_CHECK_CERT_INT (in agent varchar := null,
if (agent is null or agent not like 'ldap://%')
goto failed;
arr := sprintf_inverse (agent, 'ldap://%s/%s', 1);
- if (length (arr) <> 2)
+ if (length (arr) <> 2)
goto failed;
host := arr[0];
if (strchr (host, ':') is null)
@@ -923,7 +429,7 @@ create procedure DB.DBA.FOAF_SSL_LDAP_CHECK_CERT_INT (in agent varchar := null,
declare exit handler for sqlstate '*' { goto failed; };
rc := ldap_search (host, LS_TRY_SSL, LS_BASE, ss, sprintf('%s=%s, %s', LS_UID_FLD, LS_ACCOUNT, LS_BIND_DN), LS_PASSWORD);
if (isvector (rc) and length (rc) > 1)
- {
+ {
cert := get_keyword ('userCertificate;binary', rc[1]);
if (isvector (cert) and length (cert) and get_certificate_info (6, incert, incert_type) = get_certificate_info (6, cert[0], 1))
{
diff --git a/appsrc/ODS-Framework/oauth/login.vspx b/appsrc/ODS-Framework/oauth/login.vspx
index 2a2435b..9fe1086 100644
--- a/appsrc/ODS-Framework/oauth/login.vspx
+++ b/appsrc/ODS-Framework/oauth/login.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: login.vspx,v 1.1.2.3 2012/03/08 10:46:20 source Exp $
+ - $Id: login.vspx,v 1.1.2.2 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/make_vad.sh b/appsrc/ODS-Framework/oauth/make_vad.sh
index c716ffd..0b4ab7f 100755
--- a/appsrc/ODS-Framework/oauth/make_vad.sh
+++ b/appsrc/ODS-Framework/oauth/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.7.2.7 2012/03/08 10:46:20 source Exp $
+# $Id: make_vad.sh,v 1.7.2.4 2011/02/03 10:26:15 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -252,7 +252,7 @@ sticker_init() {
echo " <name package=\"$VAD_NAME\">" >> $STICKER
echo " <prop name=\"Title\" value=\"$VAD_DESC\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -294,14 +294,14 @@ fi
# OAuth server endpoint
echo " DB.DBA.VHOST_REMOVE (lpath=>'/oauth');" >> $STICKER
echo " DB.DBA.VHOST_DEFINE (lpath=>'/oauth', ppath=>_ppath, vsp_user=>'dba', is_dav=>$ISDAV, is_brws=>0, def_page=>'index.vsp');" >> $STICKER
+ # SPARQL + OAUTH
+ echo " DB.DBA.VHOST_REMOVE (lpath=>'/sparql-oauth');" >> $STICKER
+ echo " DB.DBA.VHOST_DEFINE (lpath=>'/sparql-oauth', ppath=>_ppath, vsp_user=>'dba', is_dav=>$ISDAV, is_brws=>0, def_page=>'sparql.vsp');" >> $STICKER
# UI for settings etc.
echo " DB.DBA.VHOST_REMOVE (lpath=>'/$VAD_NAME');" >> $STICKER
echo " DB.DBA.VHOST_DEFINE (lpath=>'/$VAD_NAME', ppath=>_ppath, vsp_user=>'dba', is_dav=>$ISDAV, is_brws=>0, def_page=>'index.vsp');" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/oauth.sql', 0, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/foaf_ssl.sql', 0, 'report', $ISDAV);" >> $STICKER
- # SPARQL + OAUTH
- echo " DB.DBA.VHOST_REMOVE (lpath=>'/sparql-oauth');" >> $STICKER
- echo " DB.DBA.VHOST_DEFINE (lpath=>'/sparql-oauth', ppath=>_ppath, vsp_user=>'dba', is_dav=>$ISDAV, is_brws=>0, def_page=>'sparql.vsp');" >> $STICKER
echo " ]]>" >> $STICKER
echo " </sql>" >> $STICKER
echo " <sql purpose='pre-uninstall'>" >> $STICKER
diff --git a/appsrc/ODS-Framework/oauth/oauth.sql b/appsrc/ODS-Framework/oauth/oauth.sql
index 75bbae0..1c22175 100644
--- a/appsrc/ODS-Framework/oauth/oauth.sql
+++ b/appsrc/ODS-Framework/oauth/oauth.sql
@@ -1,12 +1,12 @@
--
--- $Id: oauth.sql,v 1.2.2.8 2012/03/08 10:46:20 source Exp $
+-- $Id: oauth.sql,v 1.2.2.5 2011/05/02 14:16:04 source Exp $
--
-- OAuth protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -97,9 +97,6 @@ create procedure OAUTH..OAUTH_INIT ()
DB.DBA.VHOST_REMOVE (lpath=>'/OAuth');
DB.DBA.VHOST_DEFINE (lpath=>'/OAuth', ppath=>'/SOAP/Http', soap_user=>'OAuth');
-DB.DBA.VHOST_REMOVE (lpath=>'/sparql-oauth');
-DB.DBA.VHOST_DEFINE (lpath=>'/sparql-oauth', ppath=>'/DAV/VAD/wa/oauth/', vsp_user=>'dba', is_dav=>1, is_brws=>0, def_page=>'sparql.vsp');
-
OAUTH..OAUTH_INIT ();
create procedure OAUTH..normalize_params (
diff --git a/appsrc/ODS-Framework/oauth/oauth_apps.vspx b/appsrc/ODS-Framework/oauth/oauth_apps.vspx
index 933d03f..c4c49f1 100644
--- a/appsrc/ODS-Framework/oauth/oauth_apps.vspx
+++ b/appsrc/ODS-Framework/oauth/oauth_apps.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: oauth_apps.vspx,v 1.1.2.3 2012/03/08 10:46:20 source Exp $
+ - $Id: oauth_apps.vspx,v 1.1.2.2 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/oauth_authorize.vspx b/appsrc/ODS-Framework/oauth/oauth_authorize.vspx
index 772de88..ccc1c71 100644
--- a/appsrc/ODS-Framework/oauth/oauth_authorize.vspx
+++ b/appsrc/ODS-Framework/oauth/oauth_authorize.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: oauth_authorize.vspx,v 1.1.2.4 2012/03/08 10:46:20 source Exp $
+ - $Id: oauth_authorize.vspx,v 1.1.2.3 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/oauth_error.vspx b/appsrc/ODS-Framework/oauth/oauth_error.vspx
index 4dc2e9a..66b54b6 100644
--- a/appsrc/ODS-Framework/oauth/oauth_error.vspx
+++ b/appsrc/ODS-Framework/oauth/oauth_error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: oauth_error.vspx,v 1.1.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: oauth_error.vspx,v 1.1.2.1 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/sel_user.vspx b/appsrc/ODS-Framework/oauth/sel_user.vspx
index 154e832..8db41de 100644
--- a/appsrc/ODS-Framework/oauth/sel_user.vspx
+++ b/appsrc/ODS-Framework/oauth/sel_user.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: sel_user.vspx,v 1.1.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: sel_user.vspx,v 1.1.2.1 2010/09/20 10:15:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/sparql_acl.vspx b/appsrc/ODS-Framework/oauth/sparql_acl.vspx
index 4fc65e8..e0b79d7 100644
--- a/appsrc/ODS-Framework/oauth/sparql_acl.vspx
+++ b/appsrc/ODS-Framework/oauth/sparql_acl.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sparql_acl.vspx,v 1.3.2.5 2012/03/08 10:46:20 source Exp $
+ - $Id: sparql_acl.vspx,v 1.3.2.4 2010/09/20 10:15:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth/vad_version b/appsrc/ODS-Framework/oauth/vad_version
index 9ea63db..9d8637c 100644
--- a/appsrc/ODS-Framework/oauth/vad_version
+++ b/appsrc/ODS-Framework/oauth/vad_version
@@ -1 +1 @@
-1.1.13
+1.0.70
diff --git a/appsrc/ODS-Framework/oauth_apps.vspx b/appsrc/ODS-Framework/oauth_apps.vspx
index 5b7c42d..e684796 100644
--- a/appsrc/ODS-Framework/oauth_apps.vspx
+++ b/appsrc/ODS-Framework/oauth_apps.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: oauth_apps.vspx,v 1.3.2.3 2012/03/08 10:46:18 source Exp $
+ - $Id: oauth_apps.vspx,v 1.3.2.2 2011/03/08 13:28:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/oauth_sid.vsp b/appsrc/ODS-Framework/oauth_sid.vsp
index 644d5d9..fdebdd1 100644
--- a/appsrc/ODS-Framework/oauth_sid.vsp
+++ b/appsrc/ODS-Framework/oauth_sid.vsp
@@ -146,7 +146,7 @@
<a href="/ods/privacy.html">Privacy</a> |
<a href="/ods/rabuse.vspx">Report Abuse</a>
<div class="copyright">
- Copyright © 1998-2012 OpenLink Software
+ Copyright © 1998-2011 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/ods_api.sql b/appsrc/ODS-Framework/ods_api.sql
index 01040df..a12c15c 100644
--- a/appsrc/ODS-Framework/ods_api.sql
+++ b/appsrc/ODS-Framework/ods_api.sql
@@ -312,7 +312,8 @@ create procedure ODS_CREATE_USER (
'DAV_ENABLE' , 1,
'SQL_ENABLE', 0));
update SYS_USERS set U_ACCOUNT_DISABLED = _mail_verify_on where U_ID = uid;
- DB.DBA.DAV_HOME_DIR_CREATE (_username);
+ DAV_MAKE_DIR ('/DAV/home/', http_dav_uid (), http_admin_gid (), '110100100R');
+ DAV_MAKE_DIR ('/DAV/home/' || _username || '/', uid, http_nogroup_gid (), '110100000R');
declare _det_col_id integer;
_det_col_id := DB.DBA.DAV_MAKE_DIR ('/DAV/home/'||_username||'/RDFData/', uid, http_nogroup_gid (), '110100100N');
@@ -324,7 +325,7 @@ create procedure ODS_CREATE_USER (
WA_USER_EDIT (_username, 'WAUI_SEARCHABLE', _is_searchable);
WA_USER_EDIT (_username, 'WAUI_SHOWACTIVE', _show_activity);
- if (0) -- don't use IP location service, since this api can be run locally
+
{
declare coords any;
declare exit handler for sqlstate '*';
diff --git a/appsrc/ODS-Framework/ods_bar.vspx b/appsrc/ODS-Framework/ods_bar.vspx
index b571e2f..d9dab29 100644
--- a/appsrc/ODS-Framework/ods_bar.vspx
+++ b/appsrc/ODS-Framework/ods_bar.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ods_bar.vspx,v 1.4.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: ods_bar.vspx,v 1.4.2.1 2010/09/20 10:15:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/ods_controllers.sql b/appsrc/ODS-Framework/ods_controllers.sql
index 3f6a63d..ae353a0 100644
--- a/appsrc/ODS-Framework/ods_controllers.sql
+++ b/appsrc/ODS-Framework/ods_controllers.sql
@@ -1,10 +1,10 @@
--
--- $Id: ods_controllers.sql,v 1.19.2.85 2012/03/11 13:26:24 source Exp $
+-- $Id: ods_controllers.sql,v 1.19.2.69 2011/08/03 11:42:30 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -457,13 +457,6 @@ create procedure params2json (in o any)
}
;
-create procedure json2obj (
- in o any)
-{
- return json_parse (o);
-}
-;
-
create procedure dav_path_normalize (
in path varchar,
in path_type varchar := 'P')
@@ -518,7 +511,7 @@ create procedure ODS.ODS_API."qrcode" (
in data any,
in width int := 120,
in height int := 120,
- in scale int := 3) __soap_http 'text/plain'
+ in scale int := 4) __soap_http 'text/plain'
{
declare qrcode_bytes, mixed_content, content varchar;
declare qrcode any;
@@ -539,13 +532,6 @@ create procedure ODS.ODS_API."qrcode" (
}
;
-create procedure ODS.ODS_API."iri2proxy" (
- in iri any) __soap_http 'text/plain'
-{
- return DB.DBA.RDF_PROXY_ENTITY_IRI (rtrim (iri, '#this'));
-}
-;
-
-- Ontology Info
create procedure ODS.ODS_API."ontology.classes" (
in ontology varchar,
@@ -762,6 +748,7 @@ create procedure ODS.ODS_API."ontology.sparql" (
commit work;
st := '00000';
exec (S, st, msg, V, vector ('use_cache', 1), meta, data);
+ --exec (S, st, msg, V, 0, meta, data);
if (debug)
dbg_obj_princ (S, st, msg);
if (st = '00000')
@@ -1212,45 +1199,36 @@ create procedure ODS.ODS_API."lookup.list" (
}
;
-create procedure ODS.ODS_API.getDefaultHttps () __SOAP_HTTP 'text/plain'
+create procedure ODS..getDefaultHttps ()
{
declare host, port, tmp varchar;
-
- host := null;
- port := null;
- for select top 1 HP_HOST, HP_LISTEN_HOST
- from DB.DBA.HTTP_PATH, DB.DBA.WA_DOMAINS
- where HP_PPATH like '/DAV/VAD/wa/%'
- and WD_HOST = HP_HOST
- and WD_LISTEN_HOST = HP_LISTEN_HOST
- and WD_LPATH = HP_LPATH
- and HP_HOST not like '*sslini*'
- and HP_SECURITY = 'SSL'
- and length (HP_HOST) do
- {
- tmp := split_and_decode (HP_LISTEN_HOST, 0, '\0\0:');
- if (length (tmp) = 2)
- tmp := tmp[1];
- else
- tmp := HP_LISTEN_HOST;
- host := HP_HOST;
- port := tmp;
- if (port <> '443')
- host := host || ':' || port;
- }
+ host := null; port := null;
+ for select top 1 HP_HOST, HP_LISTEN_HOST from DB.DBA.HTTP_PATH, DB.DBA.WA_DOMAINS
+ where HP_PPATH like '/DAV/VAD/wa/%' and WD_HOST = HP_HOST and WD_LISTEN_HOST = HP_LISTEN_HOST
+ and WD_LPATH = HP_LPATH and HP_HOST not like '*sslini*' and HP_SECURITY = 'SSL' and length (HP_HOST) do
+ {
+ tmp := split_and_decode (HP_LISTEN_HOST, 0, '\0\0:');
+ if (length (tmp) = 2)
+ tmp := tmp[1];
+ else
+ tmp := HP_LISTEN_HOST;
+ host := HP_HOST;
+ port := tmp;
+ if (port <> '443')
+ host := host || ':' || port;
+ }
if (server_https_port () is not null and host is null)
- {
- host := registry_get ('URIQADefaultHost');
- tmp := split_and_decode (host, 0, '\0\0:');
- if (length (tmp) = 2)
- tmp := tmp[0];
- else
- tmp := host;
-
- port := server_https_port ();
- if (port <> '443')
- host := tmp || ':' || port;
- }
+ {
+ host := registry_get ('URIQADefaultHost');
+ tmp := split_and_decode (host, 0, '\0\0:');
+ if (length (tmp) = 2)
+ tmp := tmp[0];
+ else
+ tmp := host;
+ port := server_https_port ();
+ if (port <> '443')
+ host := host || ':' || port;
+ }
return host;
}
;
@@ -1518,7 +1496,6 @@ create procedure ODS.ODS_API."user.register" (
DB.DBA.WA_USER_EDIT (name, 'WAUI_BORG_HOMEPAGE', get_keyword ('organizationHomepage', data));
DB.DBA.WA_USER_EDIT (name, 'WAUI_BORG' , get_keyword ('organizationTitle', data));
DB.DBA.WA_USER_EDIT (name, 'WAUI_FOAF' , get_keyword ('iri', data));
- DB.DBA.WA_USER_EDIT (name, 'WAUI_PHOTO_URL' , get_keyword ('depiction', data));
declare cert any;
cert := client_attr ('client_certificate');
@@ -1758,10 +1735,6 @@ create procedure ODS.ODS_API."user.authenticate" (
if (isnull (uname))
return ods_auth_failed ();
-
- if ((select U_ACCOUNT_DISABLED from DB.DBA.SYS_USERS where U_NAME = uname) = 1)
- signal ('22000', 'The ODS account is deactivated<>');
-
sid := DB.DBA.vspx_sid_generate ();
insert into DB.DBA.VSPX_SESSION (VS_SID, VS_REALM, VS_UID, VS_STATE, VS_EXPIRY)
values (sid, 'wa', uname, serialize (vector ('vspx_user', uname)), now ());
@@ -2389,34 +2362,22 @@ create procedure ODS.ODS_API."user.delete" (
create procedure ODS.ODS_API."user.enable" (
in name varchar) __soap_http 'text/xml'
{
- declare rc, allow integer;
declare uname varchar;
+ declare rc integer;
declare exit handler for sqlstate '*'
{
rollback work;
return ods_serialize_sql_error (__SQL_STATE, __SQL_MESSAGE);
};
-
if (not ods_check_auth (uname))
return ods_auth_failed ();
-
if (not exists (select 1 from DB.DBA.SYS_USERS where U_NAME = name))
return ods_serialize_sql_error ('37000', 'The item is not found');
-
- allow := 0;
if (uname in ('dav', 'dba'))
- allow := 1;
-
- if ((not allow) and (uname = DB.DBA.WA_USER_SETTING_GET (name, 'DISABLED_BY')))
- allow := 1;
-
- if (allow)
{
update DB.DBA.WA_INSTANCE
set WAI_IS_FROZEN = 0
where WAI_NAME in (select WAM_INST from DB.DBA.WA_MEMBER, DB.DBA.SYS_USERS where WAM_USER = U_ID and U_NAME = name and WAM_MEMBER_TYPE = 1);
- DB.DBA.WA_USER_SETTING_SET (name, 'DISABLED_BY', null);
- connection_set ('WA_USER_DISABLED', name);
DB.DBA.USER_SET_OPTION (name, 'DISABLED', 0);
rc := 1;
} else {
@@ -2429,28 +2390,23 @@ create procedure ODS.ODS_API."user.enable" (
create procedure ODS.ODS_API."user.disable" (
in name varchar) __soap_http 'text/xml'
{
- declare rc integer;
declare uname varchar;
+ declare rc integer;
declare exit handler for sqlstate '*'
{
rollback work;
return ods_serialize_sql_error (__SQL_STATE, __SQL_MESSAGE);
};
-
if (not ods_check_auth (uname))
return ods_auth_failed ();
-
if (not exists (select 1 from DB.DBA.SYS_USERS where U_NAME = name))
return ods_serialize_sql_error ('37000', 'The item is not found');
-
- if ((uname in ('dav', 'dba')) or (uname = name))
+ if (uname in ('dav', 'dba'))
{
delete from DB.DBA.VSPX_SESSION where VS_UID = name;
update DB.DBA.WA_INSTANCE
set WAI_IS_FROZEN = 1
where WAI_NAME in (select WAM_INST from DB.DBA.WA_MEMBER, DB.DBA.SYS_USERS where WAM_USER = U_ID and U_NAME = name and WAM_MEMBER_TYPE = 1);
- DB.DBA.WA_USER_SETTING_SET (name, 'DISABLED_BY', uname);
- connection_set ('WA_USER_DISABLED', name);
DB.DBA.USER_SET_OPTION (name, 'DISABLED', 1);
rc := 1;
} else {
@@ -2469,7 +2425,6 @@ create procedure ODS.ODS_API."user.get" (
rollback work;
return ods_serialize_sql_error (__SQL_STATE, __SQL_MESSAGE);
};
-
q := sprintf ('select * from <%s> where { ?user a sioc:User ; sioc:id "%s" ; ?property ?value } ', ods_graph(), name);
exec_sparql (q);
return '';
@@ -3884,7 +3839,7 @@ create procedure ODS.ODS_API."user.mades.update" (
{
declare exit handler for sqlstate '*'
{
- SPARQL clear graph ?:tmp;
+ exec (sprintf ('sparql clear graph <%s>', tmp), stat, msg);
goto _next;
};
qrs := vector (0,0,0);
@@ -3931,7 +3886,7 @@ create procedure ODS.ODS_API."user.mades.update" (
}
}
_found:
- SPARQL clear graph ?:tmp;
+ exec (sprintf ('sparql clear graph <%s>', tmp), stat, msg);
}
_next:;
@@ -4589,7 +4544,7 @@ create procedure ODS.ODS_API."user.certificates.get" (
for (select UC_ID, UC_CERT, UC_LOGIN, UC_FINGERPRINT from DB.DBA.WA_USER_CERTS where UC_ID = id and UC_U_ID = _u_id) do
{
subject := get_certificate_info (2, UC_CERT, 0, '');
- agentID := DB.DBA.FOAF_SSL_WEBID_GET (UC_CERT);
+ agentID := ODS.ODS_API.SSL_WEBID_GET (UC_CERT);
fingerPrint := get_certificate_info (6, UC_CERT, 0, '');
certificate := UC_CERT;
enableLogin := UC_LOGIN;
@@ -4624,7 +4579,7 @@ create procedure ODS.ODS_API."user.certificates.update" (
_u_id := (select U_ID from DB.DBA.SYS_USERS where U_NAME = uname);
- agent := DB.DBA.FOAF_SSL_WEBID_GET (certificate);
+ agent := ODS.ODS_API.SSL_WEBID_GET (certificate);
if ((agent is null and length (certificate)) or (0 = length (certificate)))
signal ('', 'The certificate must be in PEM format and must have Alternate Name attribute.');
@@ -4865,7 +4820,7 @@ create procedure ODS.ODS_API.graph_clear (
in graph varchar)
{
commit work;
- SPARQL clear graph ?:graph;
+ exec (sprintf ('SPARQL clear graph <%s>', graph));
}
;
@@ -4920,8 +4875,7 @@ create procedure ODS.ODS_API.getFOAFDataArray (
select ?iri
from <%s>
where {
- [] foaf:primaryTopic ?iri .
- ?iri a foaf:Person .
+ ?iri a foaf:Person.
} ', foafGraph)
);
@@ -5006,6 +4960,7 @@ _loginIn:
_exit:;
ODS.ODS_API.graph_clear (foafGraph);
+ -- dbg_obj_print ('V', V);
return V;
}
;
@@ -5045,23 +5000,9 @@ create procedure ODS.ODS_API.extractFOAFDataArray (
in iri varchar,
in graph varchar)
{
- declare V any;
-
- V := vector ();
- ODS.ODS_API.extractPersonData (V, iri, graph);
-
- return V;
-}
-;
-
-
-create procedure ODS.ODS_API.extractPersonData (
- inout V any,
- in iri varchar,
- in graph varchar)
-{
declare N integer;
- declare S, st, msg, rows, meta any;
+ declare S varchar;
+ declare V, S, st, msg, rows, meta any;
S := sprintf ('sparql
define input:storage ""
@@ -5105,7 +5046,6 @@ create procedure ODS.ODS_API.extractPersonData (
?onlineAccount_url
?sameAs_array
?knows_array
- ?knows_name
?knows_nick
from <%s>
where {
@@ -5156,12 +5096,13 @@ create procedure ODS.ODS_API.extractPersonData (
} .
filter (?iri = iri(?::0)).
}', graph);
+ V := vector ();
st := '00000';
commit work;
exec (S, st, msg, vector (iri), vector ('use_cache', 1), meta, rows);
if (st = '00000')
{
- meta := ODS.ODS_API.simplifyMeta (meta);
+ meta := ODS.ODS_API.simplifyMeta(meta);
foreach (any row in rows) do
{
N := 0;
@@ -5177,6 +5118,7 @@ create procedure ODS.ODS_API.extractPersonData (
}
}
}
+ return V;
}
;
@@ -5197,33 +5139,9 @@ create procedure ODS.ODS_API."user.getFOAFData" (
}
;
-create procedure ODS.ODS_API.SSL_WEBID_GET (
- in cert any := null)
+create procedure ODS.ODS_API.SSL_WEBID_GET (in cert any := null)
{
- declare rc, webid, webidType, graph any;
-
- graph := null;
- rc := ODS.ODS_API.SSL_WEBID_GET_2 (cert, webid, webidType, graph);
- if (rc)
- return webid;
-
- return null;
-}
-;
-
-create procedure ODS.ODS_API.SSL_WEBID_GET_2 (
- in cert any,
- inout webid varchar,
- inout webidType integer,
- inout graph varchar)
-{
- declare rc any;
-
- if (isnull (cert))
- cert := client_attr ('client_certificate');
-
- rc := DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 0, webid, graph, 0, webidType);
- return rc;
+ return DB.DBA.FOAF_SSL_WEBID_GET (cert);
}
;
@@ -5232,82 +5150,70 @@ create procedure ODS.ODS_API."user.getFOAFSSLData" (
in outputMode integer := 1,
in sslLoginCheck integer := 0) __soap_http 'application/json'
{
- declare rc, webid, webidType, graph, alts any;
+ declare foafIRI, alts any;
declare V any;
- declare cert, loginName, certLogin, certLoginEnable any;
+ declare certLogin, certLoginEnable any;
- set_user_id ('dba');
- graph := 'http://' || uuid ();
- cert := client_attr ('client_certificate');
- rc := ODS.ODS_API.SSL_WEBID_GET_2 (cert, webid, webidType, graph);
- if (not rc)
- return obj2json (null);
-
- V := vector ();
- appendProperty (V, 'iri', webid);
-
- loginName := '';
- certLogin := 0;
+ certLogin := 0;
certLoginEnable := 0;
- for (select UC_U_ID, UC_LOGIN from DB.DBA.WA_USER_CERTS where UC_FINGERPRINT = get_certificate_info (6, cert, 0, '')) do
- {
- certLogin := 1;
- certLoginEnable := coalesce (UC_LOGIN, 0);
- loginName := (select U_NAME from DB.DBA.SYS_USERS where U_ID = UC_U_ID);
- appendProperty (V, 'certLogin', cast (certLogin as varchar));
- appendProperty (V, 'certLoginEnable', cast (certLoginEnable as varchar));
- }
- if (webidType = 0)
- {
- -- FOAF
- ODS.ODS_API.extractPersonData (V, webid, graph);
- }
- else if (webidType = 1)
- {
- -- WEBFINGER
- appendProperty (V, 'mbox', get_certificate_info (10, cert, 0, '', 'emailAddress'));
- appendProperty (V, 'name', get_certificate_info (10, cert, 0, '', 'CN'));
- }
- else if (webidType = 2)
- {
- -- DI
- ;
- }
- else if (webidType = 3)
+ foafIRI := ODS.ODS_API.SSL_WEBID_GET ();
+ if (not isnull (foafIRI))
{
- -- SEARCH
- ;
- }
- else if (webidType = 4)
- {
- -- SPONGE
- ODS.ODS_API.extractPersonData (V, webid, graph);
+ try_auth:
+ if (foafIRI like 'ldap://%')
+ {
+ declare i, arr, rc any;
+ V := vector ();
+ rc := DB.DBA.FOAF_SSL_LDAP_CHECK_INT (foafIRI, arr);
+ arr := arr[1];
+ for (i := 0; i < length (arr); i := i + 2)
+ {
+ if (arr[i] = 'mail')
+ appendProperty (V, 'mbox', cast (arr[i+1][0] as varchar));
+ else if (arr[i] = 'cn')
+ appendProperty (V, 'name', cast (arr[i+1][0] as varchar));
+ }
+ if (rc)
+ {
+ appendProperty (V, 'iri', foafIRI);
+ }
+ for (select UC_LOGIN from DB.DBA.WA_USER_CERTS where UC_FINGERPRINT = get_certificate_info (6)) do
+ {
+ certLogin := 1;
+ appendProperty (V, 'certLogin', cast (certLogin as varchar));
+ }
+ }
+ else
+ V := ODS.ODS_API.getFOAFDataArray (foafIRI, sslFOAFCheck, sslLoginCheck);
+ return case when outputMode then params2json (V) else V end;
}
- else if (webidType = 5)
+ else if (is_https_ctx ()) -- try webfinger
{
- -- LDAP
- declare i, items any;
-
- if (DB.DBA.FOAF_SSL_LDAP_CHECK_INT (webid, items))
- {
- items := items[1];
- for (i := 0; i < length (items); i := i + 2)
+ declare agent any;
+ agent := DB.DBA.FOAF_SSL_WEBFINGER ();
+ if (agent is not null)
{
- if (items[i] = 'mail')
- appendProperty (V, 'mbox', cast (items[i+1][0] as varchar));
- else if (items[i] = 'cn')
- appendProperty (V, 'name', cast (items[i+1][0] as varchar));
+ V := vector ();
+ for (select UC_LOGIN from DB.DBA.WA_USER_CERTS where UC_FINGERPRINT = get_certificate_info (6)) do
+ {
+ certLogin := 1;
+ certLoginEnable := coalesce (UC_LOGIN, 0);
+ appendProperty (V, 'iri', agent);
+ appendProperty (V, 'mbox', get_certificate_info (10, null, 0, '', 'emailAddress'));
+ appendProperty (V, 'name', get_certificate_info (10, null, 0, '', 'CN'));
+ appendProperty (V, 'certLogin', cast (certLogin as varchar));
+ --appendProperty (V, 'certLoginEnable', certLoginEnable);
+ return case when outputMode then params2json (V) else V end;
+ }
}
+ else
+ {
+ foafIRI := ODS..FINGERPOINT_WEBID_GET ();
+ if (foafIRI is not null)
+ goto try_auth;
}
}
- if (loginName = '')
- loginName := DB.DBA.WA_MAKE_NICK2 (get_keyword ('nick', V), get_keyword ('name', V), get_keyword ('firstName', V), get_keyword ('family_name', V));
-
- if (loginName <> '')
- appendProperty (V, 'loginName', loginName);
-
-
- return params2json (V);
+ return case when outputMode then obj2json (null) else null end;
}
;
@@ -5452,7 +5358,7 @@ create procedure ODS.ODS_API."user.getKnowsData" (
}
_exit:;
- SPARQL clear graph ?:foafGraph;
+ exec (sprintf ('SPARQL clear graph <%s>', foafGraph), st, msg, vector (), 0);
return obj2json (V);
}
;
@@ -5865,16 +5771,12 @@ create procedure ODS.ODS_API.error_handler () __soap_http 'text/xml'
;
DB.DBA.USER_CREATE ('ODS_API', uuid(), vector ('DISABLED', 1, 'LOGIN_QUALIFIER', 'ODS'));
-DB.DBA.EXEC_STMT ('grant SPARQL_UPDATE to ODS_API', 0);
DB.DBA.VHOST_REMOVE (lpath=>'/ods/api');
DB.DBA.VHOST_DEFINE (lpath=>'/ods/api', ppath=>'/SOAP/Http', soap_user=>'ODS_API', opts=>vector ('500_page', 'error_handler'));
grant execute on ODS.ODS_API.error_handler to ODS_API;
-grant execute on ODS.ODS_API."iri2proxy" to ODS_API;
-
grant execute on ODS.ODS_API."qrcode" to ODS_API;
-grant execute on ODS.ODS_API."getDefaultHttps" to ODS_API;
grant execute on ODS.ODS_API."ontology.classes" to ODS_API;
grant execute on ODS.ODS_API."ontology.classProperties" to ODS_API;
diff --git a/appsrc/ODS-Framework/ods_ubiquity.html b/appsrc/ODS-Framework/ods_ubiquity.html
index e51d8f1..3bab0c3 100644
--- a/appsrc/ODS-Framework/ods_ubiquity.html
+++ b/appsrc/ODS-Framework/ods_ubiquity.html
@@ -18,7 +18,7 @@
</p>
</div>
<div id="footer">
- <div id="ft_t">Copyright © 1998-2012 OpenLink Software</div>
+ <div id="ft_t">Copyright © 1998-2011 OpenLink Software</div>
<div id="ft_b">
<a href="http://virtuoso.openlinksw.com" title="OpenLink Virtuoso"><img class="powered_by" src="/ods/images/PoweredByVirtuoso.gif" alt="Powered by OpenLink Virtuoso"/></a>
</div>
diff --git a/appsrc/ODS-Framework/ods_ubiquity.js b/appsrc/ODS-Framework/ods_ubiquity.js
index cfd17d1..e5e30bd 100644
--- a/appsrc/ODS-Framework/ods_ubiquity.js
+++ b/appsrc/ODS-Framework/ods_ubiquity.js
@@ -1,10 +1,10 @@
/*
- * $Id: ods_ubiquity.js,v 1.23.2.8 2012/03/08 10:46:18 source Exp $
+ * $Id: ods_ubiquity.js,v 1.23.2.7 2010/09/20 10:15:23 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Framework/openid.js b/appsrc/ODS-Framework/openid.js
index 77469dd..d2ff19c 100644
--- a/appsrc/ODS-Framework/openid.js
+++ b/appsrc/ODS-Framework/openid.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/openid.sql b/appsrc/ODS-Framework/openid.sql
index 44d7338..5d73996 100644
--- a/appsrc/ODS-Framework/openid.sql
+++ b/appsrc/ODS-Framework/openid.sql
@@ -1,12 +1,12 @@
--
--- $Id: openid.sql,v 1.17.2.8 2012/03/08 10:46:18 source Exp $
+-- $Id: openid.sql,v 1.17.2.6 2010/09/20 10:15:24 source Exp $
--
-- OpenID protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -62,10 +62,10 @@ create procedure yadis (in uname varchar, in tp varchar := null)
if (tp not in ('person/', 'organization/'))
tp := '';
url := db.dba.wa_link (1, '/dataspace/'||tp||uname);
- ssl := ODS.ODS_API.getDefaultHttps ();
+ ssl := ODS..getDefaultHttps ();
if (exists (select 1 from DB..WA_SETTINGS where WS_HTTPS = 1) and ssl is not null)
srv := 'https://' || ssl || '/openid';
- else
+ else
srv := db.dba.wa_link (1, '/openid');
for select WAUI_OPENID_URL, WAUI_OPENID_SERVER, WAUI_NICK
from DB.DBA.WA_USER_INFO, DB.DBA.SYS_USERS where WAUI_U_ID = U_ID and U_NAME = uname
@@ -151,7 +151,7 @@ create procedure server
cookies_vec := DB.DBA.vsp_ua_get_cookie_vec (lines);
oid_sid := get_keyword ('openid.sid', cookies_vec);
ns := get_keyword ('openid.ns', params, 'http://openid.net/signon/1.1');
- oauth_ns := 'openid.oauth.';
+ oauth_ns := 'openid.oauth.';
pos := position (oauth_ns (), params);
if (pos > 1)
{
@@ -168,7 +168,7 @@ create procedure server
ver := 1;
if (is_https_ctx ())
op := sprintf ('https://%{WSHost}s/openid');
- else
+ else
op := sprintf ('http://%{WSHost}s/openid');
if ("openid.mode" = 'associate')
@@ -431,7 +431,7 @@ create procedure get_user_details (in gr varchar, in _identity varchar)
if (regexp_match ('http://[^/]+/dataspace/(person|organization)/.+', _identity) is not null)
{
arr1 := sprintf_inverse (_identity, '%s://%s/dataspace/%s/%s', 1);
- if (length (arr1) = 4 and length (arr2) = 3 and arr1[0] = arr2[0] and arr1[1] = arr2[1] and
+ if (length (arr1) = 4 and length (arr2) = 3 and arr1[0] = arr2[0] and arr1[1] = arr2[1] and
exists (select 1 from DB.DBA.SYS_USERS, DB.DBA.WA_USER_INFO where WAUI_U_ID = U_ID and U_NAME = arr1[3]))
goto verified;
}
@@ -510,7 +510,7 @@ create procedure checkid_immediate
--dbg_obj_print_vars ('checkid_immediate', sid, ver);
ns := '';
ns_sign := '';
- oauthf := '';
+ oauthf := '';
oauth_resp := '';
if (isstring (ver))
ver := atoi (ver);
@@ -535,7 +535,7 @@ create procedure checkid_immediate
if (length (oauth_consumer))
{
login := login || sprintf ('&oauth_consumer=%U&oauth_scope=%U', oauth_consumer, oauth_scope);
- }
+ }
--dbg_obj_print (sprintf ('Location: %s?openid.mode=id_res&openid.user_setup_url=%U\r\n', return_to, login));
http_header (http_header_get () || sprintf ('Location: %s%sopenid.mode=id_res%s&openid.user_setup_url=%U\r\n',
return_to, delim, ns, login));
@@ -631,11 +631,11 @@ create procedure checkid_immediate
values (assoc_handle, ss_key, ss_key_data, '3DES', dateadd ('hour', 1, now()));
}
}
- -- make OAuth request_token call
- if (length (oauth_consumer) > 0)
- tok := OAUTH..hybrid_request_token (sid, oauth_consumer);
+ -- make OAuth request_token call
+ if (length (oauth_consumer) > 0)
+ tok := OAUTH..hybrid_request_token (sid, oauth_consumer);
else
- tok := null;
+ tok := null;
rhf := WS.WS.PARSE_URI (return_to);
if (rhf[4] <> '')
@@ -660,7 +660,7 @@ create procedure checkid_immediate
{
if (is_https_ctx ())
op := sprintf ('https://%{WSHost}s/openid');
- else
+ else
op := sprintf ('http://%{WSHost}s/openid');
}
nonce := DB.DBA.date_iso8601 (dt_set_tz (curdatetime (0), 0)) || cast (msec_time () as varchar);
@@ -706,7 +706,7 @@ create procedure checkid_immediate
http (sprintf ('oauth.scope:%s\x0A', oauth_scope), ses);
oauth_resp := oauth_resp || sprintf ('&openid.oauth.scope=%U', oauth_scope);
}
- }
+ }
if (user <> 'OpenID')
set_user_id ('OpenID');
@@ -764,12 +764,12 @@ create procedure checkid_setup
if (length (oauth_consumer))
{
login := login || sprintf ('&oauth_consumer=%U&oauth_scope=%U', oauth_consumer, oauth_scope);
- }
+ }
http_header (http_header_get () || sprintf ('Location: %s\r\n', login));
--http_header (http_header_get () || sprintf ('Location: %s%sopenid.mode=cancel\r\n', return_to, delim));
return '';
}
- return checkid_immediate (ver, _identity, assoc_handle, return_to, trust_root, sid, 1, sreg_required, sreg_optional, policy_url,
+ return checkid_immediate (ver, _identity, assoc_handle, return_to, trust_root, sid, 1, sreg_required, sreg_optional, policy_url,
oauth_consumer, oauth_scope, op);
};
@@ -813,19 +813,19 @@ create procedure oid_set_sid (in sid varchar, in pars any)
create procedure oid_get_user_id (in _identity any)
{
declare iarr, uname, webid any;
- declare webid, gr varchar;
+ declare webid, gr varchar;
uname := null;
--dbg_obj_print_vars (_identity);
if (strchr (_identity, '@') is not null)
- {
+ {
gr := sioc..get_graph ();
- webid := (SPARQL
- PREFIX owl: <http://www.w3.org/2002/07/owl#>
- PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+ webid := (SPARQL
+ PREFIX owl: <http://www.w3.org/2002/07/owl#>
+ PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT ?openid WHERE { graph `iri(?:gr)` { ?webid owl:sameAs `iri(?:_identity)` ; foaf:openid ?openid . }});
if (webid is not null)
- _identity := webid;
- }
+ _identity := webid;
+ }
if (regexp_match ('http://[^/]+/dataspace/(person|organization)/.+', _identity) is not null)
{
iarr := sprintf_inverse (_identity, 'http://%s/dataspace/%s/%s', 1);
diff --git a/appsrc/ODS-Framework/openid_helper.vsp b/appsrc/ODS-Framework/openid_helper.vsp
index 483b0e9..602ec02 100644
--- a/appsrc/ODS-Framework/openid_helper.vsp
+++ b/appsrc/ODS-Framework/openid_helper.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: openid_helper.vsp,v 1.3.2.2 2012/03/08 10:46:18 source Exp $
+-- $Id: openid_helper.vsp,v 1.3.2.1 2010/09/20 10:15:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/openid_login.vspx b/appsrc/ODS-Framework/openid_login.vspx
index 8efc4bd..8c9b43b 100644
--- a/appsrc/ODS-Framework/openid_login.vspx
+++ b/appsrc/ODS-Framework/openid_login.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: openid_login.vspx,v 1.8.2.12 2012/03/08 10:46:18 source Exp $
+ - $Id: openid_login.vspx,v 1.8.2.8 2011/02/03 10:26:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -53,7 +53,6 @@
<v:on-init><![CDATA[
declare cookie_vec, sid any;
declare pos, tmp any;
- declare real_uid varchar;
set http_charset='UTF-8';
@@ -61,14 +60,6 @@
{
signal ('42000', 'Unknown identity.');
}
- if (self._identity = 'http://specs.openid.net/auth/2.0/identifier_select' and get_keyword ('username', self.vc_event.ve_params) is not null)
- {
- for select U_NAME, WAUI_IS_ORG from SYS_USERS join WA_USER_INFO on (WAUI_U_ID = U_ID) where WAUI_NICK = self._uname do
- {
- self._uname := U_NAME;
- self._identity := db.dba.wa_link (1, '/dataspace/' || case WAUI_IS_ORG when 1 then 'organization/' else 'person/' end || U_NAME);
- }
- }
if (self._uname is null)
{
tmp := self._identity;
@@ -77,12 +68,11 @@
pos := strrchr (tmp, '/');
if (pos is not null)
{
+ declare real_uid varchar;
self._uname := subseq (tmp, pos + 1);
real_uid := (select U_NAME from SYS_USERS join WA_USER_INFO on (WAUI_U_ID = U_ID) where WAUI_NICK = self._uname);
if (length (real_uid))
self._uname := real_uid;
- else
- self._uname := null;
}
else if (strchr (tmp, '@') is not null)
{
@@ -112,12 +102,14 @@
}
if (get_keyword ('sid', self.vc_event.ve_params) is null and is_https_ctx ())
{
- declare gr, stat, msg, webid, vtype varchar;
+ declare gr, stat, msg varchar;
declare rc int;
declare vec any;
- gr := 'http:' || uuid ();
- rc := WEBID_AUTH_GEN_2 (null, 0, null, 1, 0, webid, gr, 0, vtype);
- if (rc)
+ gr := null;
+ rc := sioc.DBA.foaf_check_ssl_int (null, gr);
+ if (not rc)
+ gr := FOAF_SSL_WEBFINGER (null, 1);
+ if (gr is not null)
{
vec := OPENID.DBA.get_user_details (gr, self._identity);
if (vec is not null)
@@ -165,12 +157,7 @@
<div id="login_form">
<form> <!-- just to keep validator happy on this mockup -->
<label for="login_frm_username">User ID</label>
- <?vsp if (self._identity <> 'http://specs.openid.net/auth/2.0/identifier_select') { ?>
- <input type="hidden" name="username" value="<?V self._uname ?>" id="login_frm_username" /><?V self._uname ?><?vsp
- } else {
- ?><v:text name="username" value="--self._uname" xhtml_id="login_frm_username" />
- <?vsp } ?>
- <br />
+ <v:text name="username" type="hidden" value="--self._uname" xhtml_id="login_frm_username" /><?V self._uname ?><br />
<label for="password">Password</label>
<v:text name="password" value="" xhtml_id="login_frm_password" type="password" />
<div class="login_frm_button_row">
@@ -293,7 +280,7 @@
<a href="/ods/privacy.html">Privacy</a> |
<a href="/ods/rabuse.vspx">Report Abuse</a>
<div class="copyright">
- Copyright © 1998-2012 OpenLink Software
+ Copyright © 1998-2011 OpenLink Software
</div>
</div> <!-- FT_R -->
</div>
diff --git a/appsrc/ODS-Framework/pass_recovery.vspx b/appsrc/ODS-Framework/pass_recovery.vspx
index e934b88..165d86a 100644
--- a/appsrc/ODS-Framework/pass_recovery.vspx
+++ b/appsrc/ODS-Framework/pass_recovery.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: pass_recovery.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: pass_recovery.vspx,v 1.5.2.1 2010/09/20 10:15:24 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/ping_log.vspx b/appsrc/ODS-Framework/ping_log.vspx
index b5f3d37..b32bf60 100644
--- a/appsrc/ODS-Framework/ping_log.vspx
+++ b/appsrc/ODS-Framework/ping_log.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ping_log.vspx,v 1.2.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: ping_log.vspx,v 1.2.2.1 2010/09/20 10:15:24 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/ping_svc.vspx b/appsrc/ODS-Framework/ping_svc.vspx
index a812a18..dff8f92 100644
--- a/appsrc/ODS-Framework/ping_svc.vspx
+++ b/appsrc/ODS-Framework/ping_svc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ping_svc.vspx,v 1.3.2.5 2012/03/08 10:46:18 source Exp $
+ - $Id: ping_svc.vspx,v 1.3.2.4 2011/03/08 13:28:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/popup_browser.vspx b/appsrc/ODS-Framework/popup_browser.vspx
index f4c5b1a..3eb42f0 100644
--- a/appsrc/ODS-Framework/popup_browser.vspx
+++ b/appsrc/ODS-Framework/popup_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: popup_browser.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: popup_browser.vspx,v 1.5.2.1 2010/09/20 10:15:24 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/privacy.html b/appsrc/ODS-Framework/privacy.html
index 167d66a..c555b0b 100644
--- a/appsrc/ODS-Framework/privacy.html
+++ b/appsrc/ODS-Framework/privacy.html
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: privacy.html,v 1.6.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: privacy.html,v 1.6.2.1 2010/09/20 10:15:24 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/provinces.sql b/appsrc/ODS-Framework/provinces.sql
index 75c69d3..51128ab 100644
--- a/appsrc/ODS-Framework/provinces.sql
+++ b/appsrc/ODS-Framework/provinces.sql
@@ -1,5 +1,5 @@
--
--- $Id: provinces.sql,v 1.4.2.3 2012/03/08 10:46:18 source Exp $
+-- $Id: provinces.sql,v 1.4.2.2 2010/12/10 16:04:14 source Exp $
--
-- Provinces list
@@ -7,7 +7,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/rabuse.vspx b/appsrc/ODS-Framework/rabuse.vspx
index f0c13d3..b136f10 100644
--- a/appsrc/ODS-Framework/rabuse.vspx
+++ b/appsrc/ODS-Framework/rabuse.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rabuse.vspx,v 1.4.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: rabuse.vspx,v 1.4.2.1 2010/09/20 10:15:25 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/rdf_storage.vspx b/appsrc/ODS-Framework/rdf_storage.vspx
index 4110852..35bd121 100644
--- a/appsrc/ODS-Framework/rdf_storage.vspx
+++ b/appsrc/ODS-Framework/rdf_storage.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_storage.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: rdf_storage.vspx,v 1.5.2.1 2010/09/20 10:15:25 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/rdfb.css b/appsrc/ODS-Framework/rdfb.css
index c980ad5..3478cd9 100644
--- a/appsrc/ODS-Framework/rdfb.css
+++ b/appsrc/ODS-Framework/rdfb.css
@@ -3,7 +3,7 @@
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
-* Copyright (C) 2005-2012 OpenLink Software
+* Copyright (C) 2005-2007 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/appsrc/ODS-Framework/rdfb.js b/appsrc/ODS-Framework/rdfb.js
index 419b31a..d88e949 100644
--- a/appsrc/ODS-Framework/rdfb.js
+++ b/appsrc/ODS-Framework/rdfb.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdfb.js,v 1.13.2.6 2012/03/08 10:46:18 source Exp $
+ * $Id: rdfb.js,v 1.13.2.5 2010/10/13 12:16:48 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2007 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -289,7 +289,7 @@ OAT.Dereference = {
IO.doLoadWQX(obj.load,true);
} else {
$('about_oat_version').innerHTML = OAT.Preferences.version;
- var ver = "$Id: rdfb.js,v 1.13.2.6 2012/03/08 10:46:18 source Exp $";
+ var ver = "$Id: rdfb.js,v 1.13.2.5 2010/10/13 12:16:48 source Exp $";
var r = ver.match(/main\.js,v ([^ ]+)/);
$('about_version').innerHTML = r[1];
dialogs.connection.show();
diff --git a/appsrc/ODS-Framework/register.js b/appsrc/ODS-Framework/register.js
index 84fa7c0..2b5ef5c 100644
--- a/appsrc/ODS-Framework/register.js
+++ b/appsrc/ODS-Framework/register.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -130,8 +130,6 @@ function rfRowInput(tbl, label, fName, fOptions) {
fld.type = 'text';
fld.id = fName;
fld.name = fld.id;
- if (fld.value == 'undefined')
- fld.value = '';
td.appendChild(fld);
tbl.appendChild(tr);
@@ -218,7 +216,7 @@ function rfInit() {
rfTab.go(1);
if (typeof (uriParams['openid.signed']) != 'undefined' && uriParams['openid.signed'] != '') {
var x = function (params, param, data, property) {
- if (params[param] && params[param].length != 0 && params[param] != 'undefined')
+ if (params[param] && params[param].length != 0)
data[property] = params[param];
}
var data = {};
@@ -234,7 +232,6 @@ function rfInit() {
x(uriParams, 'openid.'+ns+'.value.email', data, 'mbox');
x(uriParams, 'openid.'+ns+'.value.firstname', data, 'firstName');
x(uriParams, 'openid.'+ns+'.value.fname', data, 'name');
- x(uriParams, 'openid.'+ns+'.value.fullname', data, 'name');
x(uriParams, 'openid.'+ns+'.value.language', data, 'language');
x(uriParams, 'openid.'+ns+'.value.lastname', data, 'family_name');
x(uriParams, 'openid.'+ns+'.value.fname', data, 'nick');
@@ -258,10 +255,8 @@ function rfInit() {
if (!data['nick'] || !data['mbox']) {
hiddenCreate('oid-data', null, OAT.JSON.stringify(data));
var tbl = $('rf_table_1');
- rfRowInput(tbl, 'Login Name', 'rf_uid_1', {value: data['nick'], width: '150px'});
- rfRowInput(tbl, 'E-Mail', 'rf_email_1', {value: data['mbox'], width: '300px'});
- if (data['name'])
- rfRowValue(tbl, 'Full Name', data['name']);
+ addProfileRowInput(tbl, 'Login Name', 'rf_uid_1', {value: data['nick'], width: '150px'});
+ addProfileRowInput(tbl, 'E-Mail', 'rf_email_1', {value: data['mbox'], width: '300px'});
rfCheckUpdate(1);
} else {
var q = 'mode=1&data=' + encodeURIComponent(OAT.JSON.stringify(data));
@@ -315,7 +310,7 @@ function rfInit() {
rfRowInput(tbl, 'Login Name', 'rf_uid_3', {value: rfSslData.loginName, width: '150px'});
if (rfSslData.mbox && rfSslData.certLogin)
- rfRowValue(tbl, 'E-Mail', rfSslData.mbox);
+ rfRowValue(tbl, 'E-Mail', sslData.mbox);
if (!rfSslData.certLogin)
rfRowInput(tbl, 'E-Mail', 'rf_email_3', {value: rfSslData.mbox, width: '300px'});
@@ -404,7 +399,6 @@ function rfCheckUpdate(idx, mode) {
function rfStart() {
rfAjaxs++;
- $('rf_check').disabled = true;
$('rf_signup').disabled = true;
OAT.Dom.hide('rf_close');
OAT.Dom.show('rf_throbber');
@@ -415,7 +409,6 @@ function rfEnd() {
if (rfAjaxs == 0) {
OAT.Dom.hide('rf_throbber');
OAT.Dom.show('rf_close');
- $('rf_check').disabled = false;
$('rf_signup').disabled = false;
}
}
@@ -527,7 +520,7 @@ function rfOpenIdAuthenticate(prefix) {
var xml = OAT.Xml.createXmlDoc(data);
var error = OAT.Xml.xpath (xml, '//error_response', {});
if (error.length)
- showError('Invalid OpenID Server');
+ showError('Invalied OpenID Server');
var oidServer = OAT.Xml.textValue (OAT.Xml.xpath (xml, '/openIdServer_response/server', {})[0]);
if (!oidServer || !oidServer.length)
diff --git a/appsrc/ODS-Framework/register.vspx b/appsrc/ODS-Framework/register.vspx
index 2bcbf33..4bac869 100644
--- a/appsrc/ODS-Framework/register.vspx
+++ b/appsrc/ODS-Framework/register.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: register.vspx,v 1.6.2.4 2012/03/08 10:46:18 source Exp $
+ - $Id: register.vspx,v 1.6.2.3 2010/09/22 13:55:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/registration_xml.sql b/appsrc/ODS-Framework/registration_xml.sql
index e9c7db6..bcd40e5 100644
--- a/appsrc/ODS-Framework/registration_xml.sql
+++ b/appsrc/ODS-Framework/registration_xml.sql
@@ -1,10 +1,10 @@
--
--- $Id: registration_xml.sql,v 1.3.2.2 2012/03/08 10:46:18 source Exp $
+-- $Id: registration_xml.sql,v 1.3.2.1 2010/09/20 10:15:25 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/related_apps.vspx b/appsrc/ODS-Framework/related_apps.vspx
index 58d9cce..52a42fd 100644
--- a/appsrc/ODS-Framework/related_apps.vspx
+++ b/appsrc/ODS-Framework/related_apps.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: related_apps.vspx,v 1.1.2.3 2012/03/08 10:46:18 source Exp $
+ - $Id: related_apps.vspx,v 1.1.2.2 2010/11/11 12:38:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/scot.sql b/appsrc/ODS-Framework/scot.sql
index 3759ae8..8354b3d 100644
--- a/appsrc/ODS-Framework/scot.sql
+++ b/appsrc/ODS-Framework/scot.sql
@@ -1,14 +1,14 @@
--
-- scot.sql
--
--- $Id: scot.sql,v 1.7.2.3 2012/03/08 10:46:18 source Exp $
+-- $Id: scot.sql,v 1.7.2.2 2010/09/20 10:15:25 source Exp $
--
-- Procedures to support the SCOT Ontology RDF data in ODS.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/search.vspx b/appsrc/ODS-Framework/search.vspx
index 7c635ef..58146a7 100644
--- a/appsrc/ODS-Framework/search.vspx
+++ b/appsrc/ODS-Framework/search.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: search.vspx,v 1.28.2.9 2012/03/08 13:13:47 source Exp $
+ - $Id: search.vspx,v 1.28.2.7 2010/10/13 12:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1675,7 +1675,7 @@ if (self.on_type = 'discussion' or self.on_type = 'nntpf')
end) ?></SampleSearch>
<Developer>OpenLink Software</Developer>
<Contact>OpenLink Software</Contact>
- <Attribution>Copyright (C) 1998-2012 OpenLink Software</Attribution>
+ <Attribution>Copyright OpenLink Software</Attribution>
<SyndicationRight>open</SyndicationRight>
<AdultContent>false</AdultContent>
</OpenSearchDescription><?vsp
diff --git a/appsrc/ODS-Framework/search_ajax.vsp b/appsrc/ODS-Framework/search_ajax.vsp
index 419dcac..25c5875 100644
--- a/appsrc/ODS-Framework/search_ajax.vsp
+++ b/appsrc/ODS-Framework/search_ajax.vsp
@@ -1,13 +1,13 @@
<?vsp
--
--- $Id: search_ajax.vsp,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+-- $Id: search_ajax.vsp,v 1.5.2.1 2010/09/20 10:15:25 source Exp $
--
-- AJAX Handler for the google map control
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/security.vspx b/appsrc/ODS-Framework/security.vspx
index bbbab07..b5cbc48 100644
--- a/appsrc/ODS-Framework/security.vspx
+++ b/appsrc/ODS-Framework/security.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: security.vspx,v 1.4.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: security.vspx,v 1.4.2.1 2010/09/20 10:15:25 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/semping.sql b/appsrc/ODS-Framework/semping.sql
index 666e3e2..ccb9c5d 100644
--- a/appsrc/ODS-Framework/semping.sql
+++ b/appsrc/ODS-Framework/semping.sql
@@ -111,7 +111,7 @@ create procedure CLI_PING_SRV (in src varchar, in tgt varchar)
pserv := (sparql prefix pingback: <http://purl.org/net/pingback/> select ?ps where { graph ?:gr { ?:tgt pingback:to ?ps }});
proto := 'RPC';
}
- sparql clear graph ?:gr;
+ sparql clear ?:gr;
update CLI_QUEUE set CQ_SERVER = pserv, CQ_PROTO = proto, CQ_STATE = 1 where CQ_SOURCE = src and CQ_TARGET = tgt;
commit work;
if (pserv is not null)
diff --git a/appsrc/ODS-Framework/semping_app.vspx b/appsrc/ODS-Framework/semping_app.vspx
index 6eeecb7..b7dc4f9 100644
--- a/appsrc/ODS-Framework/semping_app.vspx
+++ b/appsrc/ODS-Framework/semping_app.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: semping_app.vspx,v 1.1.4.7 2012/03/08 10:46:18 source Exp $
+ - $Id: semping_app.vspx,v 1.1.4.6 2011/03/08 13:28:16 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/semping_log.vspx b/appsrc/ODS-Framework/semping_log.vspx
index 871b076..f36002f 100644
--- a/appsrc/ODS-Framework/semping_log.vspx
+++ b/appsrc/ODS-Framework/semping_log.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: semping_log.vspx,v 1.1.4.4 2012/03/08 10:46:18 source Exp $
+ - $Id: semping_log.vspx,v 1.1.4.3 2010/09/20 10:15:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/server.vspx b/appsrc/ODS-Framework/server.vspx
index 90f5358..ff8a823 100644
--- a/appsrc/ODS-Framework/server.vspx
+++ b/appsrc/ODS-Framework/server.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: server.vspx,v 1.5.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: server.vspx,v 1.5.2.1 2010/09/20 10:15:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/services.vspx b/appsrc/ODS-Framework/services.vspx
index ba5fa20..23fd767 100644
--- a/appsrc/ODS-Framework/services.vspx
+++ b/appsrc/ODS-Framework/services.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: services.vspx,v 1.9.2.6 2012/03/08 10:46:18 source Exp $
+ - $Id: services.vspx,v 1.9.2.4 2010/11/11 12:38:18 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -454,7 +454,8 @@
<v:after-data-bind>
<![CDATA[
control.ufl_value := '<img src="images/icons/group_16.png" border="0" alt="Members (application)" title="Members (application)"/> Members';
- if ((control.vc_parent as vspx_row_template).te_rowset[7] = 1)
+ if ((control.vc_parent as vspx_row_template).te_rowset[7] = 1 or
+ (control.vc_parent as vspx_row_template).te_rowset[6] in ('oMail', 'IM'))
control.vc_enabled := 0;
]]>
</v:after-data-bind>
diff --git a/appsrc/ODS-Framework/settings.vspx b/appsrc/ODS-Framework/settings.vspx
index aef7133..8aed575 100644
--- a/appsrc/ODS-Framework/settings.vspx
+++ b/appsrc/ODS-Framework/settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: settings.vspx,v 1.4.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: settings.vspx,v 1.4.2.1 2010/09/20 10:15:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sfoaf.xml b/appsrc/ODS-Framework/sfoaf.xml
index 491d896..fc50daa 100644
--- a/appsrc/ODS-Framework/sfoaf.xml
+++ b/appsrc/ODS-Framework/sfoaf.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: sfoaf.xml,v 1.3.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: sfoaf.xml,v 1.3.2.1 2010/09/20 10:15:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sfront.vspx b/appsrc/ODS-Framework/sfront.vspx
index 37958c7..53ba84a 100644
--- a/appsrc/ODS-Framework/sfront.vspx
+++ b/appsrc/ODS-Framework/sfront.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sfront.vspx,v 1.6.2.2 2012/03/08 10:46:18 source Exp $
+ - $Id: sfront.vspx,v 1.6.2.1 2010/09/20 10:15:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sioc.sql b/appsrc/ODS-Framework/sioc.sql
index 3d2679d..525622a 100644
--- a/appsrc/ODS-Framework/sioc.sql
+++ b/appsrc/ODS-Framework/sioc.sql
@@ -1,14 +1,14 @@
--
-- sioc.sql
--
--- $Id: sioc.sql,v 1.79.2.66 2012/03/12 17:41:17 source Exp $
+-- $Id: sioc.sql,v 1.79.2.53 2011/08/01 14:14:21 source Exp $
--
-- Procedures to support the SIOC Ontology RDF data in ODS.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -41,8 +41,7 @@ create procedure get_graph ()
return sprintf ('http://%s%s', get_cname (), get_base_path ());
};
-create procedure get_graph_ext (
- in access_mode integer)
+create procedure get_graph_ext (in access_mode integer)
{
declare graph varchar;
@@ -54,18 +53,32 @@ create procedure get_graph_ext (
};
create procedure get_graph_new (
+ in instance_id integer := null,
in access_mode integer := null,
in object_iri varchar := null)
{
- declare V any;
+ declare arr any;
+ declare exit handler for not found { return null; };
+
+ if (isnull (access_mode))
+ access_mode := coalesce((select WAI_IS_PUBLIC from DB.DBA.WA_INSTANCE where WAI_ID = instance_id), 0);
+
+ if (access_mode = 0)
+ return null;
if (access_mode = 1)
return get_graph ();
- V := sprintf_inverse (object_iri, 'http://%s/dataspace/%s', 1);
- if (length (V) <> 2)
- return null;
- return sprintf ('http://%s/dataspace/protected/%s', V[0], V[1]);
+ if (access_mode = 2)
+ {
+ if (isnull (object_iri))
+ object_iri := get_graph ();
+ arr := sprintf_inverse (object_iri, 'http://%s/dataspace/%s', 1);
+ if (length (arr) <> 2)
+ return null;
+ return sprintf ('http://%s/dataspace/protected/%s',arr[0],arr[1]);
+ }
+ return null;
};
create procedure get_ods_link ()
@@ -211,21 +224,11 @@ create procedure opl_iri (in s varchar)
};
-create procedure oplmail_iri (in s varchar)
-{
- return concat ('http://www.openlinksw.com/schemas/mail#', s);
-};
-
create procedure cert_iri (in s varchar)
{
return concat ('http://www.w3.org/ns/auth/cert#', s);
};
-create procedure xsd_iri (in s varchar)
-{
- return concat ('http://www.w3.org/2001/XMLSchema#', s);
-};
-
create procedure rev_iri (in s varchar)
{
return concat ('http://purl.org/stuff/rev#', s);
@@ -817,11 +820,11 @@ create procedure sioc_user_cert (in graph_iri varchar, in person_iri varchar, in
modulus := info[2];
exponent := info[1];
crt_iri := replace (person_iri, '#this', sprintf ('#cert%d', cert_id));
- DB.DBA.ODS_QUAD_URI (graph_iri, person_iri, cert_iri ('key'), crt_iri);
- DB.DBA.ODS_QUAD_URI (graph_iri, crt_iri, rdf_iri ('type'), cert_iri ('RSAPublicKey'));
+ DB.DBA.ODS_QUAD_URI (graph_iri, crt_iri, cert_iri ('identity'), person_iri);
+ DB.DBA.ODS_QUAD_URI (graph_iri, crt_iri, rdf_iri ('type'), rsa_iri ('RSAPublicKey'));
- DB.DBA.ODS_QUAD_URI_L_TYPED (graph_iri,crt_iri, cert_iri ('modulus'), bin2hex (modulus), xsd_iri ('hexBinary'), null);
- DB.DBA.ODS_QUAD_URI_L_TYPED (graph_iri,crt_iri, cert_iri ('exponent'), cast (exponent as varchar), xsd_iri ('int'), null);
+ DB.DBA.ODS_QUAD_URI_L_TYPED (graph_iri,crt_iri, rsa_iri ('modulus'), bin2hex (modulus), cert_iri ('hex'), null);
+ DB.DBA.ODS_QUAD_URI_L_TYPED (graph_iri,crt_iri, rsa_iri ('public_exponent'), cast (exponent as varchar), cert_iri ('int'), null);
}
return;
}
@@ -1105,6 +1108,26 @@ create procedure sioc_user_info (
if (protected is not null)
DB.DBA.ODS_QUAD_URI (public_graph_iri, iri, rdfs_iri ('seeAlso'), protected);
+ -- disabled, see above function
+ if (0 and length (cert))
+ {
+ declare info, modulus, exponent any;
+
+ info := get_certificate_info (9, cast (cert as varchar), 0);
+ if (info is not null and isarray (info) and cast (info[0] as varchar) = 'RSAPublicKey')
+ {
+ DB.DBA.ODS_QUAD_URI (public_graph_iri, crt_iri, cert_iri ('identity'), iri);
+ modulus := info[2];
+ exponent := info[1];
+ DB.DBA.ODS_QUAD_URI (public_graph_iri, crt_iri, rdf_iri ('type'), rsa_iri ('RSAPublicKey'));
+ DB.DBA.ODS_QUAD_URI_L_TYPED (public_graph_iri, crt_iri, rsa_iri ('modulus'), bin2hex (modulus), cert_iri ('hex'), null);
+ DB.DBA.ODS_QUAD_URI_L_TYPED (public_graph_iri, crt_iri, rsa_iri ('public_exponent'), cast (exponent as varchar), cert_iri ('int'), null);
+ --DB.DBA.ODS_QUAD_URI (graph_iri, crt_iri, rsa_iri ('modulus'), crt_mod);
+ --DB.DBA.ODS_QUAD_URI (graph_iri, crt_iri, rsa_iri ('public_exponent'), crt_exp);
+ --DB.DBA.ODS_QUAD_URI_L (graph_iri, crt_mod, cert_iri ('hex'), bin2hex (modulus));
+ --DB.DBA.ODS_QUAD_URI_L (graph_iri, crt_exp, cert_iri ('decimal'), cast (exponent as varchar));
+ }
+ }
-- contact services
SIOC..ods_object_services_attach (public_graph_iri, iri, 'user');
};
@@ -1243,7 +1266,7 @@ create procedure sioc_user_offerlist (in user_id integer, in ol_id integer, in o
sioc_log_message (__SQL_MESSAGE);
return;
};
- user_iri := person_iri (user_iri (user_id));
+ user_iri := user_iri (user_id);
user_name := (select U_NAME from DB.DBA.SYS_USERS where U_ID = user_id);
graph_iri := sioc_user_graph (user_name, ol_flag);
if (isnull (graph_iri))
@@ -1324,7 +1347,7 @@ create procedure sioc_user_likes (in user_id integer, in l_id integer, in l_flag
sioc_log_message (__SQL_MESSAGE);
return;
};
- user_iri := person_iri (user_iri (user_id));
+ user_iri := user_iri (user_id);
user_name := (select U_NAME from DB.DBA.SYS_USERS where U_ID = user_id);
graph_iri := sioc_user_graph (user_name, l_flag);
if (isnull (graph_iri))
@@ -1386,7 +1409,7 @@ create procedure sioc_user_knows (in user_id integer, in k_id integer, in k_flag
sioc_log_message (__SQL_MESSAGE);
return;
};
- user_iri := person_iri (user_iri (user_id));
+ user_iri := user_iri (user_id);
user_name := (select U_NAME from DB.DBA.SYS_USERS where U_ID = user_id);
graph_iri := sioc_user_graph (user_name, k_flag);
if (isnull (graph_iri))
@@ -1405,7 +1428,7 @@ create procedure sioc_user_knows_delete (in user_id integer, in k_id integer, in
sioc_log_message (__SQL_MESSAGE);
return;
};
- user_iri := person_iri (user_iri (user_id));
+ user_iri := user_iri (user_id);
user_name := (select U_NAME from DB.DBA.SYS_USERS where U_ID = user_id);
graph_iri := sioc_user_graph (user_name, k_flag);
if (isnull (graph_iri))
@@ -1425,7 +1448,7 @@ create procedure sioc_user_favorite (in user_id integer, in f_id integer, in f_f
sioc_log_message (__SQL_MESSAGE);
return;
};
- user_iri := person_iri (user_iri (user_id));
+ user_iri := user_iri (user_id);
user_name := (select U_NAME from DB.DBA.SYS_USERS where U_ID = user_id);
forum_name := forum_name (user_name, 'FavoriteThings');
@@ -1948,11 +1971,11 @@ create procedure ods_sioc_post (
if (__tag (content) = __tag of XML)
content := serialize_to_UTF8_xml (content);
content := subseq (content, 0, 10000000);
- --content := regexp_replace (content, '<[^>]+>', '', 1, null);
- --ses := string_output ();
- --http_value (content, null, ses);
- --ses := string_output_string (ses);
- DB.DBA.ODS_QUAD_URI_L (graph_iri, iri, sioc_iri ('content'), content);
+ content := regexp_replace (content, '<[^>]+>', '', 1, null);
+ ses := string_output ();
+ http_value (content, null, ses);
+ ses := string_output_string (ses);
+ DB.DBA.ODS_QUAD_URI_L (graph_iri, iri, sioc_iri ('content'), ses);
}
if (do_ann)
{
@@ -2248,7 +2271,7 @@ create procedure fill_ods_sioc_online (in doall int := 0, in iri_result int := 1
create procedure fill_ods_sioc (in doall int := 0)
{
- declare iri, site_iri, graph_iri, tmp_graph_iri, forum_iri, sioc_version varchar;
+ declare iri, site_iri, graph_iri, sioc_version varchar;
declare fCreate, cpt, deadl, cnt int;
declare exit handler for sqlstate '*', not found
@@ -2280,30 +2303,6 @@ create procedure fill_ods_sioc (in doall int := 0)
l0:
delete from DB.DBA.RDF_QUAD where G = DB.DBA.RDF_IID_OF_QNAME (fix_graph (graph_iri));
-
- -- clean private graphs
- for select WAI_ID,
- WAI_TYPE_NAME,
- WAI_NAME,
- WAI_IS_PUBLIC
- from DB.DBA.WA_INSTANCE
- where WAI_IS_PUBLIC = 0 do
- {
- forum_iri := forum_iri (WAI_TYPE_NAME, WAI_NAME);
- tmp_graph_iri := get_graph_new (WAI_IS_PUBLIC, forum_iri);
- if (length (tmp_graph_iri))
- {
- delete from DB.DBA.RDF_QUAD where G = DB.DBA.RDF_IID_OF_QNAME (tmp_graph_iri);
-
- -- remove user's rights for private graphs
- for select WAM_USER
- from DB.DBA.WA_MEMBER
- where WAM_INST = WAI_NAME do
- {
- SIOC..private_user_remove (tmp_graph_iri, WAM_USER);
- }
- }
- }
commit work;
set isolation='committed';
ods_graph_init ();
@@ -2341,7 +2340,7 @@ create procedure fill_ods_sioc (in doall int := 0)
else -- sioc:User
{
declare u_site_iri, person_iri any;
- declare forum_name any;
+ declare forum_name, forum_iri any;
iri := user_iri (u_id);
if (iri is not null)
@@ -2500,7 +2499,7 @@ create procedure fill_ods_sioc (in doall int := 0)
DB.DBA.WA_INSTANCE
where WAM_USER = U_ID
and WAM_INST = WAI_NAME
- and SIOC..instance_sioc_check (WAI_IS_PUBLIC, WAI_TYPE_NAME) = 1 do
+ and ((WAI_IS_PUBLIC = 1) or (WAI_TYPE_NAME = 'oDrive')) do
{
instance_sioc_data (
WAM_INST,
@@ -3628,24 +3627,14 @@ create trigger WA_RELATED_APPS_SIOC_D after delete on DB.DBA.WA_RELATED_APPS ref
};
-create procedure instance_sioc_check (
- in _WA_IS_PUBLIC integer,
- in _WA_TYPE varchar)
-{
- if ((_WA_IS_PUBLIC > 0) or (_WA_TYPE in ('oDrive', 'oMail')))
- return 1;
-
- return 0;
-};
-
create procedure instance_sioc_data (
- in _WAM_INST varchar,
- in _WAM_APP_TYPE varchar,
- in _WAM_USER integer,
- in _WAM_MEMBER_TYPE integer,
- in _WAM_IS_PUBLIC integer,
- in _WAM_DESCRIPTION varchar := null,
- in _WAM_LICENSE varchar := null)
+ in N_WAM_INST varchar,
+ in N_WAM_APP_TYPE varchar,
+ in N_WAM_USER integer,
+ in N_WAM_MEMBER_TYPE integer,
+ in N_WAM_IS_PUBLIC integer,
+ in N_WAM_DESCRIPTION varchar := null,
+ in N_WAM_LICENSE varchar := null)
{
declare graph_iri, user_iri, role_iri, forum_iri, site_iri, svc_proc_name varchar;
declare exit handler for sqlstate '*'
@@ -3654,37 +3643,28 @@ create procedure instance_sioc_data (
return;
};
- if (not SIOC..instance_sioc_check (_WAM_IS_PUBLIC, _WAM_APP_TYPE))
- return;
-
- forum_iri := forum_iri (_WAM_APP_TYPE, _WAM_INST);
- graph_iri := get_graph_new (_WAM_IS_PUBLIC, forum_iri);
- if (_WAM_MEMBER_TYPE = 1)
- {
- if (not _WAM_IS_PUBLIC)
+ if ((N_WAM_MEMBER_TYPE = 1) and ((N_WAM_IS_PUBLIC > 0) or (N_WAM_APP_TYPE = 'oDrive')))
{
- SIOC..private_init ();
- SIOC..private_graph_add (graph_iri);
- }
-
site_iri := get_graph ();
- sioc_forum (graph_iri, site_iri, forum_iri, _WAM_INST, _WAM_APP_TYPE, _WAM_DESCRIPTION);
- if (not isnull (_WAM_LICENSE))
- cc_work_lic (graph_iri, forum_iri, _WAM_LICENSE);
+ forum_iri := forum_iri (N_WAM_APP_TYPE, N_WAM_INST);
+ graph_iri := get_graph_new (null, N_WAM_IS_PUBLIC, forum_iri);
+ sioc_forum (graph_iri, site_iri, forum_iri, N_WAM_INST, N_WAM_APP_TYPE, N_WAM_DESCRIPTION);
+ if (not isnull (N_WAM_LICENSE))
+ cc_work_lic (graph_iri, forum_iri, N_WAM_LICENSE);
-- add services here
- svc_proc_name := sprintf ('SIOC.DBA.ods_%s_services', DB.DBA.wa_type_to_app (_WAM_APP_TYPE));
+ svc_proc_name := sprintf ('SIOC.DBA.ods_%s_services', DB.DBA.wa_type_to_app (N_WAM_APP_TYPE));
if (__proc_exists (svc_proc_name))
- call (svc_proc_name) (graph_iri, forum_iri, _WAM_USER, _WAM_INST);
+ call (svc_proc_name) (graph_iri, forum_iri, N_WAM_USER, N_WAM_INST);
}
- if (not _WAM_IS_PUBLIC)
- SIOC..private_user_add (graph_iri, _WAM_USER);
- user_iri := user_iri (_WAM_USER);
- role_iri := role_iri_by_name (_WAM_INST, _WAM_USER);
+ user_iri := user_iri (N_WAM_USER);
+ role_iri := role_iri_by_name (N_WAM_INST, N_WAM_USER);
-_social:
- if ((user_iri is not null) and (role_iri is not null) and (forum_iri is not null))
+ do_social:
+ forum_iri := forum_iri (N_WAM_APP_TYPE, N_WAM_INST);
+ graph_iri := get_graph_new (null, N_WAM_IS_PUBLIC, forum_iri);
+ if (user_iri is not null and role_iri is not null and forum_iri is not null and ((N_WAM_IS_PUBLIC > 0) or (N_WAM_APP_TYPE = 'oDrive')))
{
DB.DBA.ODS_QUAD_URI (graph_iri, user_iri, sioc_iri ('has_function'), role_iri);
DB.DBA.ODS_QUAD_URI (graph_iri, role_iri, sioc_iri ('function_of'), user_iri);
@@ -3695,26 +3675,33 @@ _social:
DB.DBA.ODS_QUAD_URI (graph_iri, forum_iri, sioc_iri ('has_owner'), user_iri);
DB.DBA.ODS_QUAD_URI (graph_iri, user_iri, sioc_iri ('owner_of'), forum_iri);
}
- if (_WAM_APP_TYPE = 'Community')
- DB.DBA.ODS_QUAD_URI (graph_iri, group_iri (forum_iri), foaf_iri ('member'), person_iri (user_iri));
+ if (N_WAM_APP_TYPE = 'Community')
+ {
+ declare person_iri any;
- if (_WAM_APP_TYPE = 'AddressBook')
+ person_iri := person_iri (user_iri);
+ DB.DBA.ODS_QUAD_URI (graph_iri, group_iri (forum_iri), foaf_iri ('member'), person_iri);
+ }
+ if (N_WAM_APP_TYPE = 'AddressBook')
{
- _WAM_APP_TYPE := 'SocialNetwork';
- forum_iri := forum_iri ('SocialNetwork', _WAM_INST);
- graph_iri := get_graph_new (_WAM_IS_PUBLIC, forum_iri);
- goto _social;
+ N_WAM_APP_TYPE := 'SocialNetwork';
+ goto do_social;
}
}
-}
-;
+};
+
+-- DB.DBA.WA_MEMBER
+create trigger WA_MEMBER_SIOC_I after insert on DB.DBA.WA_MEMBER referencing new as N
+{
+ SIOC..instance_sioc_data (
+ N.WAM_INST,
+ N.WAM_APP_TYPE,
+ N.WAM_USER,
+ N.WAM_MEMBER_TYPE,
+ N.WAM_IS_PUBLIC);
+};
-create procedure instance_sioc_data_delete (
- in _WAM_INST varchar,
- in _WAM_APP_TYPE varchar,
- in _WAM_USER integer,
- in _WAM_MEMBER_TYPE integer,
- in _WAM_IS_PUBLIC integer)
+create trigger WA_MEMBER_SIOC_D before delete on DB.DBA.WA_MEMBER referencing old as O
{
declare p_name varchar;
declare user_iri, graph_iri, role_iri, forum_iri varchar;
@@ -3724,272 +3711,132 @@ create procedure instance_sioc_data_delete (
return;
};
- if (not SIOC..instance_sioc_check (_WAM_IS_PUBLIC, _WAM_APP_TYPE))
- return;
-
- forum_iri := SIOC..forum_iri (_WAM_APP_TYPE, _WAM_INST);
- graph_iri := SIOC..get_graph_new (_WAM_IS_PUBLIC, forum_iri);
- if (_WAM_MEMBER_TYPE = 1)
+ forum_iri := SIOC..forum_iri (O.WAM_APP_TYPE, O.WAM_INST);
+ graph_iri := SIOC..get_graph_new (null, O.WAM_IS_PUBLIC, forum_iri);
+ if ((O.WAM_MEMBER_TYPE = 1) and (O.WAM_IS_PUBLIC > 0)) -- instance drop
{
- if (not _WAM_IS_PUBLIC)
- SIOC..private_graph_remove (graph_iri);
-
- -- instance drop
SIOC..delete_quad_s_or_o (graph_iri, forum_iri, forum_iri);
- p_name := sprintf ('SIOC.DBA.clean_ods_%s_sioc', DB.DBA.wa_type_to_app (_WAM_APP_TYPE));
+ p_name := sprintf ('SIOC.DBA.clean_ods_%s_sioc2', DB.DBA.wa_type_to_app (O.WAM_APP_TYPE));
if (__proc_exists (p_name))
- call (p_name) (_WAM_INST, _WAM_IS_PUBLIC);
+ call (p_name) (O.WAM_INST, O.WAM_IS_PUBLIC);
SIOC..ods_object_services_dettach (graph_iri, forum_iri, 'instance');
- SIOC..ods_object_services_dettach (graph_iri, forum_iri, DB.DBA.wa_type_to_app (_WAM_APP_TYPE));
+ SIOC..ods_object_services_dettach (graph_iri, forum_iri, DB.DBA.wa_type_to_app (O.WAM_APP_TYPE));
}
- if (not _WAM_IS_PUBLIC)
- SIOC..private_user_remove (graph_iri, _WAM_USER);
-
- user_iri := user_iri (_WAM_USER);
- role_iri := role_iri_by_name (_WAM_INST, _WAM_USER);
+ user_iri := user_iri (O.WAM_USER);
+ role_iri := role_iri_by_name (O.WAM_INST, O.WAM_USER);
if (user_iri is not null and role_iri is not null)
+ {
delete_quad_s_or_o (graph_iri, role_iri, role_iri);
+ }
+ if (O.WAM_APP_TYPE = 'Community')
+ {
+ declare person_iri any;
- if (_WAM_APP_TYPE = 'Community')
- delete_quad_po (graph_iri, foaf_iri ('member'), person_iri (user_iri));
-}
-;
-
--- DB.DBA.WA_MEMBER
-create trigger WA_MEMBER_SIOC_I after insert on DB.DBA.WA_MEMBER referencing new as N
-{
- SIOC..instance_sioc_data (
- N.WAM_INST,
- N.WAM_APP_TYPE,
- N.WAM_USER,
- N.WAM_MEMBER_TYPE,
- N.WAM_IS_PUBLIC);
-}
-;
-
-create trigger WA_MEMBER_SIOC_D before delete on DB.DBA.WA_MEMBER referencing old as O
-{
- SIOC..instance_sioc_data_delete (
- O.WAM_INST,
- O.WAM_APP_TYPE,
- O.WAM_USER,
- O.WAM_MEMBER_TYPE,
- O.WAM_IS_PUBLIC);
-}
-;
+ person_iri := person_iri (user_iri);
+ delete_quad_po (graph_iri, foaf_iri ('member'), person_iri);
+ }
+};
-- DB.DBA.WA_INSTANCE
-- INSERT and delete are DONE IN THE WA_MEMBER WHEN INSERT THE OWNER
create trigger WA_INSTANCE_SIOC_U before update on DB.DBA.WA_INSTANCE referencing old as O, new as N
{
- declare p_name, wam_user varchar;
- declare site_iri, o_graph_iri, n_graph_iri, o_forum_iri, n_forum_iri, n_role_iri, o_role_iri varchar;
+ declare p_name varchar;
+ declare o_graph_iri, n_graph_iri, site_iri, o_forum_iri, n_forum_iri, role_iri, o_role_iri varchar;
declare exit handler for sqlstate '*'
{
sioc_log_message (__SQL_MESSAGE);
return;
};
- n_forum_iri := SIOC..forum_iri_n (O.WAI_TYPE_NAME, O.WAI_NAME, N.WAI_NAME);
- n_graph_iri := SIOC..get_graph_new (N.WAI_IS_PUBLIC, n_forum_iri);
- o_forum_iri := SIOC..forum_iri (O.WAI_TYPE_NAME, O.WAI_NAME);
- o_graph_iri := SIOC..get_graph_new (O.WAI_IS_PUBLIC, o_forum_iri);
-
- -- no SIOC related changes
- if ((n_graph_iri = o_graph_iri) and (n_forum_iri = o_forum_iri))
- return;
-
- -- delete old
- wam_user := (select WAM_USER from DB.DBA.WA_MEMBER where WAM_INST = O.WAI_NAME and WAM_MEMBER_TYPE = 1);
- SIOC..instance_sioc_data_delete (
- O.WAI_NAME,
- O.WAI_TYPE_NAME,
- wam_user,
- 1,
- O.WAI_IS_PUBLIC);
-
- if (not SIOC..instance_sioc_check (N.WAI_IS_PUBLIC, N.WAI_TYPE_NAME))
+ if ((N.WAI_IS_PUBLIC = 0) and (O.WAI_IS_PUBLIC = 0))
return;
- -- create new
- SIOC..instance_sioc_data (
- N.WAI_NAME,
- N.WAI_TYPE_NAME,
- wam_user,
- 1,
- N.WAI_IS_PUBLIC,
- N.WAI_DESCRIPTION,
- N.WAI_LICENSE);
-
- delete_quad_sp (o_graph_iri, o_forum_iri, sioc_iri ('id'));
- delete_quad_sp (o_graph_iri, o_forum_iri, sioc_iri ('link'));
- DB.DBA.ODS_QUAD_URI_L (n_graph_iri, n_forum_iri, sioc_iri ('id'), N.WAI_NAME);
- DB.DBA.ODS_QUAD_URI (n_graph_iri, n_forum_iri, sioc_iri ('link'), n_forum_iri);
- update_quad_g_s_o (o_graph_iri, n_graph_iri, o_forum_iri, n_forum_iri);
-
- delete_quad_sp (o_graph_iri, o_forum_iri, cc_iri ('license'));
- cc_work_lic (n_graph_iri, n_forum_iri, N.WAI_LICENSE);
-
- if (o_graph_iri <> n_graph_iri)
- {
- for select distinct WAM_MEMBER_TYPE as tp from DB.DBA.WA_MEMBER where WAM_INST = O.WAI_NAME and SIOC..instance_sioc_check (WAM_IS_PUBLIC, WAM_APP_TYPE) = 1 do
+ n_forum_iri := SIOC..forum_iri_n (O.WAI_TYPE_NAME, O.WAI_NAME, N.WAI_NAME);
+ n_graph_iri := SIOC..get_graph_new (null, N.WAI_IS_PUBLIC, n_forum_iri);
+ o_forum_iri := SIOC..forum_iri (O.WAI_TYPE_NAME, O.WAI_NAME);
+ o_graph_iri := SIOC..get_graph_new (null, O.WAI_IS_PUBLIC, o_forum_iri);
+ if (N.WAI_TYPE_NAME = 'Community')
{
- declare _role varchar;
-
- _role := (select WMT_NAME from DB.DBA.WA_MEMBER_TYPE where WMT_APP = O.WAI_NAME and WMT_ID = tp);
- if (_role is null and tp = 1)
- _role := 'owner';
+ declare group_iri any;
- n_role_iri := n_forum_iri || '#' || _role;
- o_role_iri := o_forum_iri || '#' || _role;
- update_quad_g_s_o (o_graph_iri, n_graph_iri, o_role_iri, n_role_iri);
+ group_iri := group_iri (o_forum_iri);
+ delete_quad_sp (o_graph_iri, group_iri, foaf_iri ('name'));
}
- }
-
- -- update instanse item's data
- p_name := sprintf ('sioc.DBA.clean_ods_%s_sioc', DB.DBA.wa_type_to_app (N.WAI_TYPE_NAME));
- if (__proc_exists (p_name))
- call (p_name) (O.WAI_NAME, O.WAI_IS_PUBLIC);
- p_name := sprintf ('sioc.DBA.fill_ods_%s_sioc', DB.DBA.wa_type_to_app (N.WAI_TYPE_NAME));
- if (__proc_exists (p_name))
- call (p_name) (n_graph_iri, site_iri, N.WAI_NAME);
- p_name := sprintf ('sioc.DBA.fill_ods_%s_sioc2', DB.DBA.wa_type_to_app (N.WAI_TYPE_NAME));
- if (__proc_exists (p_name))
- call (p_name) (N.WAI_NAME, N.WAI_IS_PUBLIC);
-}
-;
-
---
--- Private graphs
---
-create procedure SIOC..private_graph ()
-{
- return 'http://www.openlinksw.com/schemas/virtrdf#PrivateGraphs';
-}
-;
-
-create procedure SIOC..private_init ()
-{
- -- create private graph group (if not exists)
- DB.DBA.RDF_GRAPH_GROUP_CREATE (SIOC..private_graph (), 1);
-
- -- set default rights for private graphs
- DB.DBA.RDF_DEFAULT_USER_PERMS_SET ('nobody', 0, 1);
- DB.DBA.RDF_DEFAULT_USER_PERMS_SET ('dba', 511, 1);
-}
-;
-
-create procedure SIOC..private_graph_add (
- inout graph_iri varchar)
-{
- DB.DBA.RDF_GRAPH_GROUP_INS (SIOC..private_graph (), graph_iri);
-}
-;
-
-create procedure SIOC..private_graph_remove (
- inout graph_iri varchar)
-{
- DB.DBA.RDF_GRAPH_GROUP_DEL (SIOC..private_graph (), graph_iri);
-}
-;
-
-create procedure SIOC..private_user_add (
- in graph_iri varchar,
- in uid any,
- in rights integer := 1)
-{
- declare exit handler for sqlstate '*' {return 0;};
-
- if (isinteger (uid))
- uid := (select U_NAME from DB.DBA.SYS_USERS where U_ID = uid);
- DB.DBA.RDF_GRAPH_USER_PERMS_SET (graph_iri, uid, rights);
-}
-;
-
-create procedure SIOC..private_user_remove (
- in graph_iri varchar,
- in uid any)
-{
- declare exit handler for sqlstate '*' {return 0;};
- if (isinteger (uid))
- uid := (select U_NAME from DB.DBA.SYS_USERS where U_ID = uid);
- DB.DBA.RDF_GRAPH_USER_PERMS_DEL (graph_iri, uid);
-}
-;
+ -- new: private data
+ if (N.WAI_IS_PUBLIC = 0)
+ {
+ for select O as post
+ from DB.DBA.RDF_QUAD
+ where G = DB.DBA.RDF_IID_OF_QNAME (o_graph_iri)
+ and S = DB.DBA.RDF_IID_OF_QNAME (o_forum_iri)
+ and P = DB.DBA.RDF_IID_OF_QNAME (sioc_iri ('container_of')) do
+ {
+ SIOC..delete_quad_s_or_o (o_graph_iri, post, post);
+ }
+ SIOC..delete_quad_s_or_o (o_graph_iri, o_forum_iri, o_forum_iri);
+ p_name := sprintf ('sioc.DBA.clean_ods_%s_sioc', DB.DBA.wa_type_to_app (N.WAI_TYPE_NAME));
+ if (__proc_exists (p_name))
+ call (p_name) (O.WAI_NAME, O.WAI_IS_PUBLIC);
---
--- Private WebID rights
---
-create procedure SIOC..private_acl_insert (
- inout graph_iri varchar,
- inout acl any)
-{
- declare uid, rights any;
- declare N, aclArray any;
+ SIOC..ods_object_services_dettach (o_graph_iri, o_forum_iri, 'instance');
+ SIOC..ods_object_services_dettach (o_graph_iri, o_forum_iri, DB.DBA.wa_type_to_app (O.WAI_TYPE_NAME));
+ return;
+ }
- aclArray := deserialize (acl);
- for (N := 0; N < length (aclArray); N := N + 1)
+ -- old: private data - must be created forum
+ if (O.WAI_IS_PUBLIC = 0)
{
- uid := null;
- if (aclArray[N][2] = 'person')
- {
- uid := DB.DBA.FOAF_WEBID_USER (aclArray[N][1], 1);
- }
- else if (aclArray[N][2] = 'group')
- {
- ;
- }
- else if (aclArray[N][2] = 'public')
- {
- uid := 'nobody';
+ SIOC..instance_sioc_data (
+ N.WAI_NAME,
+ N.WAI_TYPE_NAME,
+ (select WAM_USER from DB.DBA.WA_MEMBER where WAM_INST = O.WAI_NAME and WAM_MEMBER_TYPE = 1),
+ 1,
+ N.WAI_IS_PUBLIC,
+ N.WAI_DESCRIPTION,
+ N.WAI_LICENSE);
}
- if (not isnull (uid))
+ else if (N.WAI_IS_PUBLIC <> O.WAI_IS_PUBLIC)
{
- rights := 0;
- -- read
- if (aclArray[N][3])
- rights := rights + 1;
- -- write
- if (aclArray[N][4])
- rights := rights + 2;
-
- SIOC..private_user_add (graph_iri, uid, rights);
- }
- }
-}
-;
+ delete_quad_sp (o_graph_iri, o_forum_iri, sioc_iri ('id'));
+ delete_quad_sp (o_graph_iri, o_forum_iri, sioc_iri ('link'));
+ update_quad_g_s_o (o_graph_iri, n_graph_iri, o_forum_iri, n_forum_iri);
+ delete_quad_sp (o_graph_iri, o_forum_iri, cc_iri ('license'));
+ cc_work_lic (n_graph_iri, n_forum_iri, N.WAI_LICENSE);
-create procedure SIOC..private_acl_delete (
- inout graph_iri varchar,
- inout acl any)
-{
- declare uid any;
- declare N, aclArray any;
+ for select distinct WAM_MEMBER_TYPE as tp from DB.DBA.WA_MEMBER where WAM_INST = O.WAI_NAME and ((WAM_IS_PUBLIC > 0) or (WAM_APP_TYPE = 'oDrive')) do
+ {
+ declare _role varchar;
- aclArray := deserialize (acl);
- for (N := 0; N < length (aclArray); N := N + 1)
+ _role := (select WMT_NAME from DB.DBA.WA_MEMBER_TYPE where WMT_APP = O.WAI_NAME and WMT_ID = tp);
+ if (_role is null and tp = 1)
+ _role := 'owner';
+
+ role_iri := n_forum_iri || '#' || _role;
+ o_role_iri := o_forum_iri || '#' || _role;
+ update_quad_g_s_o (o_graph_iri, n_graph_iri, o_role_iri, role_iri);
+ }
+ DB.DBA.ODS_QUAD_URI_L (n_graph_iri, n_forum_iri, sioc_iri ('id'), N.WAI_NAME);
+ DB.DBA.ODS_QUAD_URI (n_graph_iri, n_forum_iri, sioc_iri ('link'), n_forum_iri);
+ }
+
+ -- refresh be created forum
+ if (N.WAI_IS_PUBLIC <> O.WAI_IS_PUBLIC)
{
- uid := null;
- if (aclArray[N][2] = 'person')
- {
- uid := DB.DBA.FOAF_WEBID_USER (aclArray[N][1]);
- }
- else if (aclArray[N][2] = 'group')
- {
- ;
- }
- else if (aclArray[N][2] = 'public')
- {
- uid := 'nobody';
+ p_name := sprintf ('sioc.DBA.clean_ods_%s_sioc', DB.DBA.wa_type_to_app (N.WAI_TYPE_NAME));
+ if (__proc_exists (p_name))
+ call (p_name) (O.WAI_NAME, O.WAI_IS_PUBLIC);
+ p_name := sprintf ('sioc.DBA.fill_ods_%s_sioc', DB.DBA.wa_type_to_app (N.WAI_TYPE_NAME));
+ if (__proc_exists (p_name))
+ call (p_name) (n_graph_iri, site_iri, N.WAI_NAME);
+ p_name := sprintf ('sioc.DBA.fill_ods_%s_sioc2', DB.DBA.wa_type_to_app (N.WAI_TYPE_NAME));
+ if (__proc_exists (p_name))
+ call (p_name) (N.WAI_NAME, N.WAI_IS_PUBLIC);
}
- if (not isnull (uid))
- SIOC..private_user_remove (graph_iri, uid);
- }
-}
-;
+};
--
-- ACL
@@ -4098,33 +3945,96 @@ create procedure SIOC..acl_delete (
}
;
-create procedure SIOC..acl_webid ()
+create procedure SIOC..acl_webID ()
{
- declare webid varchar;
- declare cert, dummy, vtype any;
+ declare retIRI varchar;
+ declare foafIRI, foafGraph, loadIRI, localIRI any;
+ declare S, V, info, st, msg, data, meta any;
if (not is_https_ctx ())
{
- webid := null;
+ retIRI := null;
goto _exit;
}
- webid := connection_get ('vspx_vebid');
- if (not isnull (webid))
+ retIRI := connection_get ('vspx_vebid');
+ if (not isnull (retIRI))
{
- if (webid = '')
- webid := null;
+ if (retIRI = '')
+ retIRI := null;
goto _exit;
}
- set_user_id ('dba');
- cert := client_attr ('client_certificate');
- dummy := null;
- DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 0, webid, dummy, 0, vtype);
- connection_set ('vspx_vebid', coalesce (webid, ''));
+ foafIRI := trim (get_certificate_info (7, null, null, null, '2.5.29.17'));
+ V := regexp_replace (foafIRI, ',[ ]*', ',', 1, null);
+ V := split_and_decode (V, 0, '\0\0,:');
+ if (V is null)
+ V := vector ();
+ foafIRI := get_keyword ('URI', V);
+ if (isnull (foafIRI))
+ {
+ retIRI := DB.DBA.FOAF_SSL_WEBFINGER ();
+ if (not isnull (retIRI))
+ goto _set;
+ retIRI := ODS.DBA.FINGERPOINT_WEBID_GET ();
+ goto _set;
+ }
+
+ foafGraph := 'http://local.virt/FOAF/' || cast (rnd (1000) as varchar);
+ localIRI := foafIRI;
+ V := rfc1808_parse_uri (localIRI);
+ if (cfg_item_value (virtuoso_ini_path (), 'URIQA', 'DynamicLocal') = '1' and V[1] = registry_get ('URIQADefaultHost'))
+ {
+ V [0] := 'local';
+ V [1] := '';
+ localIRI := db.dba.vspx_uri_compose (V);
+ }
+ V := rfc1808_parse_uri (foafIRI);
+ V[5] := '';
+ loadIRI := DB.DBA.vspx_uri_compose (V);
+
+ S := sprintf ('sparql load <%s> into graph <%s>', loadIRI, foafGraph);
+ st := '00000';
+ exec (S, st, msg, vector (), 0);
+ if (st = '00000')
+ {
+ S := sprintf (' sparql define input:storage "" ' ||
+ ' prefix cert: <http://www.w3.org/ns/auth/cert#> ' ||
+ ' prefix rsa: <http://www.w3.org/ns/auth/rsa#> ' ||
+ ' select (str (bif:coalesce (?exp_val, ?exp))) ' ||
+ ' (str (bif:coalesce (?mod_val, ?mod))) ' ||
+ ' from <%s> ' ||
+ ' where { ' ||
+ ' ?id cert:identity <%s> ; ' ||
+ ' rsa:public_exponent ?exp ; ' ||
+ ' rsa:modulus ?mod . ' ||
+ ' optional { ?exp cert:decimal ?exp_val . ' ||
+ ' ?mod cert:hex ?mod_val . } ' ||
+ ' }',
+ foafGraph,
+ localIRI);
+ exec (S, st, msg, vector (), 0, meta, data);
+ if (st = '00000')
+ {
+ info := get_certificate_info (9);
+ foreach (any _row in data) do
+ {
+ if (_row[0] = cast (info[1] as varchar) and lower (regexp_replace (_row[1], '[^A-Z0-9a-f]', '', 1, null)) = bin2hex (info[2]))
+ {
+ retIRI := foafIRI;
+ goto _break;
+ }
+ }
+ }
+ }
+_break:;
+ exec (sprintf ('SPARQL clear graph <%s>', foafGraph), st, msg, vector (), 0);
+
+_set:;
+ connection_set ('vspx_vebid', coalesce (retIRI, ''));
_exit:;
- return webid;
+ return retIRI;
}
;
@@ -4348,7 +4258,6 @@ create procedure SIOC..acl_ping2 (
;
create procedure SIOC..wa_instance_acl_insert (
- inout is_public integer,
inout type_name varchar,
inout name varchar,
inout acl any)
@@ -4363,14 +4272,10 @@ create procedure SIOC..wa_instance_acl_insert (
graph_iri := SIOC..acl_graph (type_name, name);
SIOC..acl_insert (graph_iri, iri, acl);
-
- if (not is_public and SIOC..instance_sioc_check (is_public, type_name))
- SIOC..private_acl_insert (SIOC..get_graph_new (is_public, iri), acl);
}
;
create procedure SIOC..wa_instance_acl_delete (
- inout is_public integer,
inout type_name varchar,
inout name varchar,
inout acl any)
@@ -4386,32 +4291,29 @@ create procedure SIOC..wa_instance_acl_delete (
graph_iri := SIOC..acl_graph (type_name, name);
SIOC..acl_delete (graph_iri, iri, acl);
-
- if (not is_public and SIOC..instance_sioc_check (is_public, type_name))
- SIOC..private_acl_delete (SIOC..get_graph_new (is_public, iri), acl);
}
;
create trigger WA_INSTANCE_ACL_I after insert on DB.DBA.WA_INSTANCE order 100 referencing new as N
{
if (coalesce (N.WAI_ACL, '') <> '')
- SIOC..wa_instance_acl_insert (N.WAI_IS_PUBLIC, N.WAI_TYPE_NAME, N.WAI_NAME, N.WAI_ACL);
+ SIOC..wa_instance_acl_insert (N.WAI_TYPE_NAME, N.WAI_NAME, N.WAI_ACL);
}
;
create trigger WA_INSTANCE_ACL_U after update on DB.DBA.WA_INSTANCE order 100 referencing old as O, new as N
{
if ((coalesce (O.WAI_ACL, '') <> '') and (coalesce (O.WAI_ACL, '') <> coalesce (N.WAI_ACL, '')))
- SIOC..wa_instance_acl_delete (O.WAI_IS_PUBLIC, O.WAI_TYPE_NAME, O.WAI_NAME, O.WAI_ACL);
+ SIOC..wa_instance_acl_delete (O.WAI_TYPE_NAME, O.WAI_NAME, O.WAI_ACL);
if ((coalesce (N.WAI_ACL, '') <> '') and (coalesce (O.WAI_ACL, '') <> coalesce (N.WAI_ACL, '')))
- SIOC..wa_instance_acl_insert (N.WAI_IS_PUBLIC, N.WAI_TYPE_NAME, N.WAI_NAME, N.WAI_ACL);
+ SIOC..wa_instance_acl_insert (N.WAI_TYPE_NAME, N.WAI_NAME, N.WAI_ACL);
}
;
create trigger WA_INSTANCE_ACL_D before delete on DB.DBA.WA_INSTANCE order 100 referencing old as O
{
if (coalesce (O.WAI_ACL, '') <> '')
- SIOC..wa_instance_acl_delete (O.WAI_IS_PUBLIC, O.WAI_TYPE_NAME, O.WAI_NAME, O.WAI_ACL);
+ SIOC..wa_instance_acl_delete (O.WAI_TYPE_NAME, O.WAI_NAME, O.WAI_ACL);
}
;
@@ -5066,11 +4968,50 @@ create procedure foaf_check_friend (in iri varchar, in agent varchar)
}
;
-create procedure foaf_check_ssl (in iri varchar)
+create procedure foaf_check_ssl_int (in iri varchar, out graph varchar)
+{
+ declare stat, msg, meta, data, info, qr, hf, gr any;
+ declare agent varchar;
+ declare rc int;
+ declare groups_iri, arr any;
+
+ graph := null;
+ rc := 0;
+ declare exit handler for sqlstate '*'
{
- declare arr, groups_iri, msg, webid varchar;
+ rollback work;
+ return 0;
+ };
set_user_id ('dba');
+ info := get_certificate_info (9);
+ agent := ODS.ODS_API.SSL_WEBID_GET ();
+
+ if (agent is not null and agent like 'ldap://%')
+ {
+ return DB.DBA.FOAF_SSL_LDAP_CHECK (agent);
+ }
+ if (agent is null)
+ {
+ agent := DB.DBA.FOAF_SSL_WEBFINGER ();
+ -- when no webid asked the webfinder already did check for certitificate
+ if (agent is not null and iri is null)
+ {
+ graph := uuid ();
+ return 1;
+ }
+ }
+ if (agent is null)
+ agent := ODS..FINGERPOINT_WEBID_GET ();
+
+-- dbg_obj_print (info, agent);
+ if (not isarray (info) or agent is null)
+ return 0;
+
+ -- old check
+ -- if (iri is not null and not foaf_check_friend (iri, agent))
+ -- return 0;
+
if (iri is not null)
{
-- ACL check
@@ -5082,14 +5023,45 @@ create procedure foaf_check_ssl (in iri varchar)
if (SIOC..acl_check (SIOC..acl_clean_iri (iri) || '/webaccess', groups_iri, vector (iri)) = '')
return 0;
}
- webid := SIOC..acl_webid ();
+
+ -- agent := fix_uri (agent);
+ hf := rfc1808_parse_uri (agent);
+ hf[5] := '';
+ gr := DB.DBA.vspx_uri_compose (hf);
+ graph := uuid ();
+ qr := sprintf ('sparql load <%S> into graph <%S>', gr, graph);
+ stat := '00000';
+ exec (qr, stat, msg);
commit work;
- if (isnull (webid))
- return 0;
- return 1;
+ qr := DB.DBA.FOAF_SSL_QR (graph, agent);
+ stat := '00000';
+-- dbg_printf ('%s', qr);
+ exec (qr, stat, msg, vector (), 0, meta, data);
+-- dbg_obj_print (data);
+ if (stat = '00000' and length (data))
+ {
+ foreach (any _row in data) do
+ {
+ if (_row[0] = cast (info[1] as varchar) and DB.DBA.FOAF_MOD (_row[1]) = bin2hex (info[2]))
+ rc := 1;
+ }
+ }
+ return rc;
}
;
+create procedure foaf_check_ssl (in iri varchar)
+{
+ declare rc int;
+ declare graph, stat, msg varchar;
+
+ set_user_id ('dba');
+ rc := foaf_check_ssl_int (iri, graph);
+ exec (sprintf ('sparql clear graph <%S>', graph), stat, msg);
+ commit work;
+ return rc;
+}
+;
create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p int := 0)
{
@@ -5336,10 +5308,10 @@ create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p i
?interest rdfs:label ?interest_label .
?person foaf:topic_interest ?topic_interest .
?topic_interest rdfs:label ?topic_interest_label .
- ?person cert:key ?key .
- ?key rdf:type cert:RSAPublicKey .
- ?key cert:exponent ?exp .
- ?key cert:modulus ?mod .
+ ?idn cert:identity ?person .
+ ?idn rdf:type rsa:RSAPublicKey .
+ ?idn rsa:public_exponent ?exp .
+ ?idn rsa:modulus ?mod .
?event_iri rdf:type ?bioEvent .
?event_iri bio:date ?bioDate .
?event_iri bio:place ?bioPlace .
@@ -5359,7 +5331,7 @@ create procedure compose_foaf (in u_name varchar, in fmt varchar := 'n3', in p i
optional { ?interest rdfs:label ?interest_label } .
optional { ?person foaf:topic_interest ?topic_interest } .
optional { ?topic_interest rdfs:label ?topic_interest_label } .
- optional { ?person cert:key ?key . ?key cert:exponent ?exp ; cert:modulus ?mod . } .
+ optional { ?idn cert:identity ?person ; rsa:public_exponent ?exp ; rsa:modulus ?mod . } .
optional { ?person bio:event ?event_iri . ?event_iri rdf:type ?bioEvent . ?event_iri bio:date ?bioDate . ?event_iri bio:place ?bioPlace } .
optional { ?person pingback:to ?pb } .
optional { ?person pingback:service ?psvc } .
@@ -6536,9 +6508,6 @@ create procedure SIOC..rdf_links_head_internal (in iri any)
--
create procedure SIOC..rdf_links_head (in iri any)
{
- if (iri is null)
- return;
-
http (SIOC..rdf_links_head_internal(iri));
}
;
@@ -6555,11 +6524,8 @@ create procedure WA_INTEREST_UPGRADE ()
for (select WAUI_U_ID, WAUI_INTERESTS as F1, WAUI_INTEREST_TOPICS as F2 from DB.DBA.WA_USER_INFO) do
{
uname := (select U_NAME from DB.DBA.SYS_USERS where U_ID = WAUI_U_ID);
- if (not isnull (uname))
- {
- WA_USER_EDIT (uname, 'WAUI_INTERESTS', F2);
- WA_USER_EDIT (uname, 'WAUI_INTEREST_TOPICS', F1);
- }
+ WA_USER_EDIT (uname, 'WAUI_INTERESTS', F2);
+ WA_USER_EDIT (uname, 'WAUI_INTEREST_TOPICS', F1);
}
registry_set ('WA_INTEREST_UPGRADE', 'done');
diff --git a/appsrc/ODS-Framework/site_settings.vspx b/appsrc/ODS-Framework/site_settings.vspx
index f5cc704..fa8c12c 100644
--- a/appsrc/ODS-Framework/site_settings.vspx
+++ b/appsrc/ODS-Framework/site_settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: site_settings.vspx,v 1.8.2.4 2012/03/08 10:46:19 source Exp $
+ - $Id: site_settings.vspx,v 1.8.2.3 2011/01/31 11:17:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn.sql b/appsrc/ODS-Framework/sn.sql
index 755bcf6..aa68acd 100644
--- a/appsrc/ODS-Framework/sn.sql
+++ b/appsrc/ODS-Framework/sn.sql
@@ -1,10 +1,10 @@
--
--- $Id: sn.sql,v 1.6.2.4 2012/03/08 10:46:19 source Exp $
+-- $Id: sn.sql,v 1.6.2.3 2010/09/20 10:15:26 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_connections.vspx b/appsrc/ODS-Framework/sn_connections.vspx
index c8987ca..0a3375b 100644
--- a/appsrc/ODS-Framework/sn_connections.vspx
+++ b/appsrc/ODS-Framework/sn_connections.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: sn_connections.vspx,v 1.9.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_connections.vspx,v 1.9.2.1 2010/09/20 10:15:26 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_delete.vspx b/appsrc/ODS-Framework/sn_delete.vspx
index a81ecd4..e932da4 100644
--- a/appsrc/ODS-Framework/sn_delete.vspx
+++ b/appsrc/ODS-Framework/sn_delete.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sn_delete.vspx,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_delete.vspx,v 1.4.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_export.vspx b/appsrc/ODS-Framework/sn_export.vspx
index 06503f8..f36b6da 100644
--- a/appsrc/ODS-Framework/sn_export.vspx
+++ b/appsrc/ODS-Framework/sn_export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sn_export.vspx,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_export.vspx,v 1.5.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_make_inv.vspx b/appsrc/ODS-Framework/sn_make_inv.vspx
index ff26f9d..5b68bf3 100644
--- a/appsrc/ODS-Framework/sn_make_inv.vspx
+++ b/appsrc/ODS-Framework/sn_make_inv.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sn_make_inv.vspx,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_make_inv.vspx,v 1.5.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_profile.vspx b/appsrc/ODS-Framework/sn_profile.vspx
index 13da60b..facabcb 100644
--- a/appsrc/ODS-Framework/sn_profile.vspx
+++ b/appsrc/ODS-Framework/sn_profile.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sn_profile.vspx,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_profile.vspx,v 1.4.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_rec_inv.vspx b/appsrc/ODS-Framework/sn_rec_inv.vspx
index 0a34432..ed11abe 100644
--- a/appsrc/ODS-Framework/sn_rec_inv.vspx
+++ b/appsrc/ODS-Framework/sn_rec_inv.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sn_rec_inv.vspx,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_rec_inv.vspx,v 1.5.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_sent_inv.vspx b/appsrc/ODS-Framework/sn_sent_inv.vspx
index e884db0..6109dc0 100644
--- a/appsrc/ODS-Framework/sn_sent_inv.vspx
+++ b/appsrc/ODS-Framework/sn_sent_inv.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sn_sent_inv.vspx,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_sent_inv.vspx,v 1.5.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_settings.vspx b/appsrc/ODS-Framework/sn_settings.vspx
index 52ce0a5..9fe98e2 100644
--- a/appsrc/ODS-Framework/sn_settings.vspx
+++ b/appsrc/ODS-Framework/sn_settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sn_settings.vspx,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_settings.vspx,v 1.4.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sn_user_export.vspx b/appsrc/ODS-Framework/sn_user_export.vspx
index debc1fa..727043a 100644
--- a/appsrc/ODS-Framework/sn_user_export.vspx
+++ b/appsrc/ODS-Framework/sn_user_export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sn_user_export.vspx,v 1.6.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sn_user_export.vspx,v 1.6.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sparql_load.vspx b/appsrc/ODS-Framework/sparql_load.vspx
index bd10e5c..6ae2e45 100644
--- a/appsrc/ODS-Framework/sparql_load.vspx
+++ b/appsrc/ODS-Framework/sparql_load.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: sparql_load.vspx,v 1.7.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sparql_load.vspx,v 1.7.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sparql_save.vspx b/appsrc/ODS-Framework/sparql_save.vspx
index 219f2e5..13279f3 100644
--- a/appsrc/ODS-Framework/sparql_save.vspx
+++ b/appsrc/ODS-Framework/sparql_save.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: sparql_save.vspx,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: sparql_save.vspx,v 1.5.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/sql_rdf.sql b/appsrc/ODS-Framework/sql_rdf.sql
index 77b08ab..8c53b34 100644
--- a/appsrc/ODS-Framework/sql_rdf.sql
+++ b/appsrc/ODS-Framework/sql_rdf.sql
@@ -1,10 +1,10 @@
--
--- $Id: sql_rdf.sql,v 1.18.2.2 2012/03/08 10:46:19 source Exp $
+-- $Id: sql_rdf.sql,v 1.18.2.1 2010/09/20 10:15:27 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/stat.vspx b/appsrc/ODS-Framework/stat.vspx
index 6667123..2933917 100644
--- a/appsrc/ODS-Framework/stat.vspx
+++ b/appsrc/ODS-Framework/stat.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: stat.vspx,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: stat.vspx,v 1.4.2.1 2010/09/20 10:15:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/tags.sql b/appsrc/ODS-Framework/tags.sql
index 7a76950..ddbbebd 100644
--- a/appsrc/ODS-Framework/tags.sql
+++ b/appsrc/ODS-Framework/tags.sql
@@ -1,10 +1,10 @@
--
--- $Id: tags.sql,v 1.7.2.2 2012/03/08 10:46:19 source Exp $
+-- $Id: tags.sql,v 1.7.2.1 2010/09/20 10:15:27 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/tags.vspx b/appsrc/ODS-Framework/tags.vspx
index 05a4165..87ea615 100644
--- a/appsrc/ODS-Framework/tags.vspx
+++ b/appsrc/ODS-Framework/tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tags.vspx,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: tags.vspx,v 1.4.2.1 2010/09/20 10:15:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/tbl.js b/appsrc/ODS-Framework/tbl.js
index 94236a9..6404c47 100644
--- a/appsrc/ODS-Framework/tbl.js
+++ b/appsrc/ODS-Framework/tbl.js
@@ -1,10 +1,10 @@
/*
- * $Id: tbl.js,v 1.2.2.33 2012/03/08 10:46:19 source Exp $
+ * $Id: tbl.js,v 1.2.2.30 2011/08/01 14:14:21 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -177,7 +177,7 @@ TBL.createRow = function (prefix, No, optionObject, viewMode) {
// actions
var td = OAT.Dom.create('td');
td.id = prefix+'_td_'+ No+'_btn';
- td.style.cssText = 'white-space: nowrap; verical-align: top;';
+ td.style.whiteSpace = 'nowrap';
tr.appendChild(td);
if (options.id) {
var fld = OAT.Dom.create("input");
@@ -275,25 +275,10 @@ TBL.clean = function (prefix) {
return true;
}
-TBL.createCellOptions = function (fld, fldOptions) {
- if (fldOptions) {
- if (fldOptions.className)
- fld.className = fldOptions.className;
- if (fldOptions.onblur)
- fld.onblur = fldOptions.onblur;
- if (fldOptions.cssText)
- fld.style.cssText = fldOptions.cssText;
- if (fldOptions.readOnly)
- fld.readOnly = fldOptions.readOnly;
- }
-}
-
-TBL.createCellSelect = function (fldName, fldOptions) {
+TBL.createCellSelect = function (fldName) {
var fld = OAT.Dom.create("select");
fld.name = fldName;
fld.id = fldName;
- TBL.createCellOptions(fld, fldOptions);
-
return fld;
}
@@ -318,8 +303,15 @@ TBL.createCell0 = function (td, prefix, fldName, No, fldOptions) {
fld.value = fldOptions.value;
fld.defaultValue = fld.value;
}
- TBL.createCellOptions(fld, fldOptions);
+ if (fldOptions.className)
+ fld.className = fldOptions.className;
+ if (fldOptions.onblur)
+ fld.onblur = fldOptions.onblur;
fld.style.width = '95%';
+ if (fldOptions.cssText)
+ fld.style.cssText = fldOptions.cssText;
+ if (fldOptions.readOnly)
+ fld.readOnly = fldOptions.readOnly;
td.appendChild(fld);
return fld;
diff --git a/appsrc/ODS-Framework/terms.html b/appsrc/ODS-Framework/terms.html
index eed03fb..ea83148 100644
--- a/appsrc/ODS-Framework/terms.html
+++ b/appsrc/ODS-Framework/terms.html
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: terms.html,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: terms.html,v 1.5.2.1 2010/09/20 10:15:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/tools.vspx b/appsrc/ODS-Framework/tools.vspx
index 4e2e097..ed7a7ba 100644
--- a/appsrc/ODS-Framework/tools.vspx
+++ b/appsrc/ODS-Framework/tools.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tools.vspx,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: tools.vspx,v 1.4.2.1 2010/09/20 10:15:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/trs_export.xml b/appsrc/ODS-Framework/trs_export.xml
index 9e364c6..4f026a1 100644
--- a/appsrc/ODS-Framework/trs_export.xml
+++ b/appsrc/ODS-Framework/trs_export.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: trs_export.xml,v 1.3.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: trs_export.xml,v 1.3.2.1 2010/09/20 10:15:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/trs_export_all.xml b/appsrc/ODS-Framework/trs_export_all.xml
index bcef35f..5dc11cb 100644
--- a/appsrc/ODS-Framework/trs_export_all.xml
+++ b/appsrc/ODS-Framework/trs_export_all.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: trs_export_all.xml,v 1.1.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: trs_export_all.xml,v 1.1.2.1 2010/09/20 10:15:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/ufoaf.xml b/appsrc/ODS-Framework/ufoaf.xml
index a4a8e94..2cdfcf1 100644
--- a/appsrc/ODS-Framework/ufoaf.xml
+++ b/appsrc/ODS-Framework/ufoaf.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: ufoaf.xml,v 1.14.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: ufoaf.xml,v 1.14.2.1 2010/09/20 10:15:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uhome.vspx b/appsrc/ODS-Framework/uhome.vspx
index fcc46bc..a3a896c 100644
--- a/appsrc/ODS-Framework/uhome.vspx
+++ b/appsrc/ODS-Framework/uhome.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: uhome.vspx,v 1.7.2.4 2012/03/08 10:46:19 source Exp $
+ - $Id: uhome.vspx,v 1.7.2.3 2010/09/20 10:15:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit.vspx b/appsrc/ODS-Framework/uiedit.vspx
index 89f3ca5..9ad391e 100644
--- a/appsrc/ODS-Framework/uiedit.vspx
+++ b/appsrc/ODS-Framework/uiedit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit.vspx,v 1.23.2.23 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit.vspx,v 1.23.2.22 2011/05/02 14:16:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_acl.vspx b/appsrc/ODS-Framework/uiedit_acl.vspx
index 750ef06..2ab2d31 100644
--- a/appsrc/ODS-Framework/uiedit_acl.vspx
+++ b/appsrc/ODS-Framework/uiedit_acl.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit_acl.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_acl.vspx,v 1.1.4.2 2010/11/09 20:18:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_acls.vspx b/appsrc/ODS-Framework/uiedit_acls.vspx
index 22bb6db..354b36f 100644
--- a/appsrc/ODS-Framework/uiedit_acls.vspx
+++ b/appsrc/ODS-Framework/uiedit_acls.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_acls.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_acls.vspx,v 1.1.4.2 2010/11/09 20:18:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-Framework/uiedit_ann.vspx b/appsrc/ODS-Framework/uiedit_ann.vspx
index 91da3dd..ae1ee54 100644
--- a/appsrc/ODS-Framework/uiedit_ann.vspx
+++ b/appsrc/ODS-Framework/uiedit_ann.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit_ann.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_ann.vspx,v 1.1.4.2 2010/09/27 14:45:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_buss.vspx b/appsrc/ODS-Framework/uiedit_buss.vspx
index 91bb85d..a2e9fb0 100644
--- a/appsrc/ODS-Framework/uiedit_buss.vspx
+++ b/appsrc/ODS-Framework/uiedit_buss.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_buss.vspx,v 1.19.2.8 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_buss.vspx,v 1.19.2.7 2010/09/27 14:45:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_buss_0.vspx b/appsrc/ODS-Framework/uiedit_buss_0.vspx
index a446761..0d1a289 100644
--- a/appsrc/ODS-Framework/uiedit_buss_0.vspx
+++ b/appsrc/ODS-Framework/uiedit_buss_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_buss_0.vspx,v 1.1.2.5 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_buss_0.vspx,v 1.1.2.4 2010/11/09 20:18:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_buss_1.vspx b/appsrc/ODS-Framework/uiedit_buss_1.vspx
index 6c010af..5d13957 100644
--- a/appsrc/ODS-Framework/uiedit_buss_1.vspx
+++ b/appsrc/ODS-Framework/uiedit_buss_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_buss_1.vspx,v 1.2.2.9 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_buss_1.vspx,v 1.2.2.8 2011/01/25 14:11:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_buss_2.vspx b/appsrc/ODS-Framework/uiedit_buss_2.vspx
index aac11d3..6fc5046 100644
--- a/appsrc/ODS-Framework/uiedit_buss_2.vspx
+++ b/appsrc/ODS-Framework/uiedit_buss_2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_buss_2.vspx,v 1.1.2.12 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_buss_2.vspx,v 1.1.2.11 2010/09/21 11:46:16 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_buss_3.vspx b/appsrc/ODS-Framework/uiedit_buss_3.vspx
index fea8aa7..dfd12ac 100644
--- a/appsrc/ODS-Framework/uiedit_buss_3.vspx
+++ b/appsrc/ODS-Framework/uiedit_buss_3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_buss_3.vspx,v 1.1.2.8 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_buss_3.vspx,v 1.1.2.7 2010/11/09 20:18:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_bz.vspx b/appsrc/ODS-Framework/uiedit_bz.vspx
index a05cd9d..ae8c87a 100644
--- a/appsrc/ODS-Framework/uiedit_bz.vspx
+++ b/appsrc/ODS-Framework/uiedit_bz.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit_bz.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_bz.vspx,v 1.1.4.2 2010/09/27 14:45:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_groups.vspx b/appsrc/ODS-Framework/uiedit_groups.vspx
index e5af8e7..e8d3a28 100644
--- a/appsrc/ODS-Framework/uiedit_groups.vspx
+++ b/appsrc/ODS-Framework/uiedit_groups.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_groups.vspx,v 1.1.4.9 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_groups.vspx,v 1.1.4.8 2011/05/20 12:02:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-Framework/uiedit_grp.vspx b/appsrc/ODS-Framework/uiedit_grp.vspx
index dfecd2e..a28484b 100644
--- a/appsrc/ODS-Framework/uiedit_grp.vspx
+++ b/appsrc/ODS-Framework/uiedit_grp.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit_grp.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_grp.vspx,v 1.1.4.2 2010/09/27 14:45:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_knows.vspx b/appsrc/ODS-Framework/uiedit_knows.vspx
index 56294c1..90fd70e 100644
--- a/appsrc/ODS-Framework/uiedit_knows.vspx
+++ b/appsrc/ODS-Framework/uiedit_knows.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_knows.vspx,v 1.1.4.5 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_knows.vspx,v 1.1.4.2 2010/12/07 11:11:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
@@ -90,7 +90,7 @@
sql="select WUK_ID, WUK_URI, WUK_LABEL from DB.DBA.WA_USER_KNOWS where WUK_U_ID = :self.u_id"
scrollable="1"
editable="1"
- nrows="0">
+ nrows="10">
<v:template name="k_ds_header" type="simple" name-to-remove="table" set-to-remove="bottom">
<table class="listing" rules="groups">
@@ -197,7 +197,7 @@
</th>
<td>
<input type="text" name="k_import" id="k_import" value="" size="100" class="_validate_ _uri_" />
- <input type="button" value="Retrieve" onclick="javascript: knowsData(); return false;" class="button" />
+ <input type="button" value="Download" onclick="javascript: knowsData(); return false;" class="button" />
<img id="k_import_image" alt="Import knows URIs" src="/ods/images/oat/Ajax_throbber.gif" style="display: none" />
</td>
</tr>
@@ -221,7 +221,7 @@
</th>
</tr>
</thead>
- <tr id="k_tr_no"><td colspan="3"><b>No retrieved items</b></td></tr>
+ <tr id="k_tr_no"><td colspan="3"><b>No downloaded items</b></td></tr>
</table>
</td>
</tr>
diff --git a/appsrc/ODS-Framework/uiedit_ldap.vspx b/appsrc/ODS-Framework/uiedit_ldap.vspx
index aaea227..cb1b972 100644
--- a/appsrc/ODS-Framework/uiedit_ldap.vspx
+++ b/appsrc/ODS-Framework/uiedit_ldap.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_ldap.vspx,v 1.5.2.8 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_ldap.vspx,v 1.5.2.7 2010/09/27 14:45:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_ldap_include.vspx b/appsrc/ODS-Framework/uiedit_ldap_include.vspx
index f6ff7f5..2b6e5b0 100644
--- a/appsrc/ODS-Framework/uiedit_ldap_include.vspx
+++ b/appsrc/ODS-Framework/uiedit_ldap_include.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_ldap_include.vspx,v 1.1.4.5 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_ldap_include.vspx,v 1.1.4.3 2010/12/07 11:11:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -101,7 +101,7 @@
<h3>LDAP Servers Addministration</h3>
<vm:if test="self.v_mode = 'LDAP/browse'">
- <v:data-source name="dsrc" expression-type="sql" nrows="0" initial-offset="0">
+ <v:data-source name="dsrc" expression-type="sql" nrows="10" initial-offset="0">
<v:before-data-bind>
<![CDATA[
control.ds_sql := sprintf ('select * from LDAP..LDAP_SERVERS where LS_USER_ID = %d', self.u_id);
diff --git a/appsrc/ODS-Framework/uiedit_likes.vspx b/appsrc/ODS-Framework/uiedit_likes.vspx
index 650a224..9fe7265 100644
--- a/appsrc/ODS-Framework/uiedit_likes.vspx
+++ b/appsrc/ODS-Framework/uiedit_likes.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_likes.vspx,v 1.1.4.5 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_likes.vspx,v 1.1.4.4 2011/05/02 14:16:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-Framework/uiedit_offerlist.vspx b/appsrc/ODS-Framework/uiedit_offerlist.vspx
index 077eb9f..fa5a241 100644
--- a/appsrc/ODS-Framework/uiedit_offerlist.vspx
+++ b/appsrc/ODS-Framework/uiedit_offerlist.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_offerlist.vspx,v 1.1.2.17 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_offerlist.vspx,v 1.1.2.15 2011/06/09 17:43:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -81,7 +81,7 @@
sql="select WUOL_ID, WUOL_OFFER, WUOL_COMMENT from DB.DBA.WA_USER_OFFERLIST where WUOL_U_ID = :self.u_id and WUOL_TYPE = :self.ol_type"
scrollable="1"
editable="1"
- nrows="0">
+ nrows="10">
<v:template name="ol_ds_header" type="simple" name-to-remove="table" set-to-remove="bottom">
<table class="listing" rules="groups">
diff --git a/appsrc/ODS-Framework/uiedit_others.vspx b/appsrc/ODS-Framework/uiedit_others.vspx
index 8384a4c..2e2aef5 100644
--- a/appsrc/ODS-Framework/uiedit_others.vspx
+++ b/appsrc/ODS-Framework/uiedit_others.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_others.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_others.vspx,v 1.1.4.2 2010/12/07 11:11:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_owns.vspx b/appsrc/ODS-Framework/uiedit_owns.vspx
index 66fb852..ff10bc1 100644
--- a/appsrc/ODS-Framework/uiedit_owns.vspx
+++ b/appsrc/ODS-Framework/uiedit_owns.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_owns.vspx,v 1.1.4.5 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_owns.vspx,v 1.1.4.3 2011/02/16 20:58:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
@@ -81,7 +81,7 @@
sql="select WUOL_ID, WUOL_OFFER, WUOL_COMMENT from DB.DBA.WA_USER_OFFERLIST where WUOL_U_ID = :self.u_id and WUOL_TYPE = :self.ow_type"
scrollable="1"
editable="1"
- nrows="0">
+ nrows="10">
<v:template name="ow_ds_header" type="simple" name-to-remove="table" set-to-remove="bottom">
<table class="listing" rules="groups">
diff --git a/appsrc/ODS-Framework/uiedit_personal.vspx b/appsrc/ODS-Framework/uiedit_personal.vspx
index 22d4fff..a017245 100644
--- a/appsrc/ODS-Framework/uiedit_personal.vspx
+++ b/appsrc/ODS-Framework/uiedit_personal.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_personal.vspx,v 1.33.2.26 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_personal.vspx,v 1.33.2.25 2011/05/02 14:16:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_0.vspx b/appsrc/ODS-Framework/uiedit_personal_0.vspx
index dbc78c5..9e98333 100644
--- a/appsrc/ODS-Framework/uiedit_personal_0.vspx
+++ b/appsrc/ODS-Framework/uiedit_personal_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_personal_0.vspx,v 1.1.2.11 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_personal_0.vspx,v 1.1.2.9 2011/08/03 11:42:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -619,7 +619,7 @@
<tr>
<td valign="top"><input type="checkbox" name="cb_item_iKnows" id="cb_item_iKnows" value="1" /></td>
<td valign="top">Knows URIs</td>
- <td><?vsp self.show_data (self.iKnows, vector ('value', 'name')); ?></td>
+ <td><?vsp self.show_data (self.iKnows, vector ('value')); ?></td>
</tr>
</v:template>
</table>
diff --git a/appsrc/ODS-Framework/uiedit_personal_1.vspx b/appsrc/ODS-Framework/uiedit_personal_1.vspx
index 84c67af..01ec4ad 100644
--- a/appsrc/ODS-Framework/uiedit_personal_1.vspx
+++ b/appsrc/ODS-Framework/uiedit_personal_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_personal_1.vspx,v 1.1.2.21 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_personal_1.vspx,v 1.1.2.18 2011/05/16 08:53:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -133,7 +133,7 @@
self.s_photo.ufl_value := '';
return;
}
- if ((get_keyword ('up_photo', params, '') <> '') or (self.previe_path <> '' and self.s_photo.ufl_value <> ''))
+ if (get_keyword ('up_photo', params, '') <> '' or (self.previe_path <> '' and self.s_photo.ufl_value <> ''))
{
declare dir, p_path, p_path_org, dotpos, up_cont any;
declare p_path_size2 any;
@@ -195,13 +195,10 @@
p_path := subseq (p_path, 4);
WA_USER_EDIT (self.u_name, 'WAUI_PHOTO_URL', p_path);
}
- else if ((get_keyword ('s_photo', params) like 'http://%') or (get_keyword ('s_photo', params) like 'https://%'))
+ else
{
- WA_USER_EDIT (self.u_name, 'WAUI_PHOTO_URL', get_keyword ('s_photo', params));
- }
- else if (get_keyword ('s_photo', params) = '')
- {
- WA_USER_EDIT (self.u_name, 'WAUI_PHOTO_URL', '');
+ if (get_keyword ('s_photo', params, '') = '')
+ WA_USER_EDIT (self.u_name, 'WAUI_PHOTO_URL', '');
}
if (get_keyword ('up_audio', params, '') <> '')
{
@@ -266,28 +263,28 @@
]]>
</v:method>
- <v:variable persist="0" name="utitle" type="varchar" default="''" />
- <v:variable persist="0" name="nick" type="varchar" default="''" />
- <v:variable persist="0" name="ftname" type="varchar" default="''" />
- <v:variable persist="0" name="lname" type="varchar" default="''" />
- <v:variable persist="0" name="fullname" type="varchar" default="''" />
- <v:variable persist="0" name="gender" type="varchar" default="''" />
- <v:variable persist="0" name="bdate" type="datetime" default="null" />
-
- <v:variable persist="0" name="wpage" type="varchar" default="''" />
- <v:variable persist="0" name="efoaf" type="varchar" default="''" />
- <v:variable persist="0" name="msign" type="varchar" default="''" />
- <v:variable persist="0" name="summ" type="varchar" default="''" />
- <v:variable persist="0" name="email" type="varchar" default="''" />
- <v:variable persist="0" name="photo" type="varchar" default="''" />
- <v:variable persist="0" name="audio" type="varchar" default="''" />
-
- <v:variable persist="0" name="inSearch" type="int" default="1" />
- <v:variable persist="0" name="showactive" type="int" default="1" />
- <v:variable persist="0" name="interests" type="varchar" default="''" />
- <v:variable persist="0" name="interestTopics" type="varchar" default="''" />
- <v:variable persist="0" name="appEnable" type="integer" default="0" />
- <v:variable persist="0" name="spbEnable" type="integer" default="0" />
+ <v:variable persist="0" name="utitle" type="varchar" default="''"/>
+ <v:variable persist="0" name="nick" type="varchar" default="''"/>
+ <v:variable persist="0" name="ftname" type="varchar" default="''"/>
+ <v:variable persist="0" name="lname" type="varchar" default="''"/>
+ <v:variable persist="0" name="fullname" type="varchar" default="''"/>
+ <v:variable persist="0" name="gender" type="varchar" default="''"/>
+ <v:variable persist="0" name="bdate" type="datetime" default="null"/>
+
+ <v:variable persist="0" name="wpage" type="varchar" default="''"/>
+ <v:variable persist="0" name="efoaf" type="varchar" default="''"/>
+ <v:variable persist="0" name="msign" type="varchar" default="''"/>
+ <v:variable persist="0" name="summ" type="varchar" default="''"/>
+ <v:variable persist="0" name="email" type="varchar" default="''"/>
+ <v:variable persist="0" name="photo" type="varchar" default="''"/>
+ <v:variable persist="0" name="audio" type="varchar" default="''"/>
+
+ <v:variable persist="0" name="inSearch" type="int" default="1"/>
+ <v:variable persist="0" name="showactive" type="int" default="1"/>
+ <v:variable persist="0" name="interests" type="varchar" default="''"/>
+ <v:variable persist="0" name="interestTopics" type="varchar" default="''"/>
+ <v:variable persist="0" name="appEnable" type="integer" default="0"/>
+ <v:variable persist="0" name="spbEnable" type="integer" default="0"/>
<v:variable name="sav0" type="varchar" default="'1'" />
<v:variable name="sav1" type="varchar" default="'1'" />
@@ -409,23 +406,16 @@
<div>
<table class="ctl_grp">
<tr>
- <th>Account deactivation</th>
- <td class="listing_col" nowrap="1">
- <input type="button" value="Deactivate" onclick="return accountDisable('x_name');" />
- </td>
- </tr>
- <tr>
<th><label for="labelww">Login name</label></th>
<td class="listing_col" nowrap="1">
- <v:label value="--self.u_name" format="%s" />
- <v:text name="x_name" xhtml_id="x_name" type="hidden" value="--self.u_name" />
+ <v:label value="--self.u_name" format="%s"/>
</td>
</tr>
<tr>
<th><label for="labelwwn">Nick name</label></th>
<td class="listing_col" nowrap="1">
<v:text name="nickn" value="--self.nick" format="%s">
- <v:validator test="length" min="3" max="100" name="vv_nickn" message="Nick name cannot be shorter than 3 chars or longer than 100 chars" />
+ <v:validator test="length" min="3" max="100" name="vv_nickn" message="Nick name cannot be shorter than 3 chars or longer than 100 chars"/>
</v:text>
</td>
</tr>
@@ -447,12 +437,12 @@
<th><label for="regtitle">Title</label></th>
<td class="listing_col" nowrap="1">
<v:select-list name="regtitle">
- <v:item name="" value="" />
- <v:item name="Mr" value="Mr" />
- <v:item name="Mrs" value="Mrs" />
- <v:item name="Dr" value="Dr" />
- <v:item name="Ms" value="Ms" />
- <v:item name="Sir" value="Sir" />
+ <v:item name="" value=""/>
+ <v:item name="Mr" value="Mr"/>
+ <v:item name="Mrs" value="Mrs"/>
+ <v:item name="Dr" value="Dr"/>
+ <v:item name="Ms" value="Ms"/>
+ <v:item name="Sir" value="Sir"/>
<v:before-data-bind>
<![CDATA[
@@ -468,8 +458,8 @@
<th><label for="f_name">First Name</label></th>
<td class="listing_col" nowrap="1">
<v:text name="f_name" error-glyph="*" value="--self.ftname" xhtml_style="width:216px" fmt-function="wa_utf8_to_wide" xhtml_onblur="javascript: fillFullName (this.form.full_name, this.form.f_name, this.form.l_name, false)">
- <v:validator test="length" min="0" max="50" name="vv_f_name1" message="First name cannot be longer then 50 chars" empty-allowed="1" />
- <v:validator test="sql" name="vv_f_name2" expression="length(trim(self.f_name.ufl_value)) > 50" message="First name cannot be longer then 50 chars" empty-allowed="1" />
+ <v:validator test="length" min="0" max="50" name="vv_f_name1" message="First name cannot be longer then 50 chars" empty-allowed="1"/>
+ <v:validator test="sql" name="vv_f_name2" expression="length(trim(self.f_name.ufl_value)) > 50" message="First name cannot be longer then 50 chars" empty-allowed="1"/>
</v:text>
<div style="display:inline; color:red;"><v:error-summary match="f_name" /></div>
<vm:u-prop-select name="sel_1" value="self.sav1" />
@@ -479,8 +469,8 @@
<th><label for="l_name">Last Name</label></th>
<td class="listing_col" nowrap="1">
<v:text name="l_name" error-glyph="*" value="--self.lname" xhtml_style="width:216px" fmt-function="wa_utf8_to_wide" xhtml_onblur="javascript: fillFullName (this.form.full_name, this.form.f_name, this.form.l_name, false)">
- <v:validator test="length" min="0" max="50" message="Last name cannot be longer then 50 chars" empty-allowed="1" name="vv_lname1" />
- <v:validator test="sql" expression="length(trim(self.l_name.ufl_value)) > 50" name="vv_lname2" message="Last name cannot be longer then 50 chars" empty-allowed="1" />
+ <v:validator test="length" min="0" max="50" message="Last name cannot be longer then 50 chars" empty-allowed="1" name="vv_lname1"/>
+ <v:validator test="sql" expression="length(trim(self.l_name.ufl_value)) > 50" name="vv_lname2" message="Last name cannot be longer then 50 chars" empty-allowed="1"/>
</v:text>
<div style="display:inline; color:red;"><v:error-summary match="l_name" /></div>
<vm:u-prop-select name="sel_2" value="self.sav2" />
@@ -491,7 +481,7 @@
<td class="listing_col" nowrap="1">
<v:text name="full_name" error-glyph="*" value="--self.fullname" xhtml_style="width:216px" fmt-function="wa_utf8_to_wide" xhtml_onfocus="javascript: fillFullName (this.form.full_name, this.form.f_name, this.form.l_name, true)">
<v:validator test="length" min="0" max="100" name="vv_fulname1" message="Full name cannot be longer then 100 chars" empty-allowed="1" />
- <v:validator test="sql" expression="length(trim(self.full_name.ufl_value)) > 100" name="vv_fulname2" message="Full name cannot be longer then 100 chars" mpty-allowed="1" />
+ <v:validator test="sql" expression="length(trim(self.full_name.ufl_value)) > 100" name="vv_fulname2" message="Full name cannot be longer then 100 chars" mpty-allowed="1"/>
</v:text>
<div style="display:inline; color:red;"><v:error-summary match="full_name" /></div>
<vm:u-prop-select name="sel_3" value="self.sav3" />
@@ -510,9 +500,9 @@
<th><label for="regender">Gender</label></th>
<td class="listing_col" nowrap="1">
<v:select-list name="regender">
- <v:item name="Not Specified" value="unknown" />
- <v:item name="Male" value="male" />
- <v:item name="Female" value="female" />
+ <v:item name="Not Specified" value="unknown"/>
+ <v:item name="Male" value="male"/>
+ <v:item name="Female" value="female"/>
<v:before-data-bind>
<v:script><![CDATA[
control.ufl_value := self.gender;
@@ -526,14 +516,14 @@
<tr id="pers_5" class="initial_hidden">
<th><label for="regbday">Birthday</label></th>
<td class="listing_col" nowrap="1">
- <v:text name="regbdate" xhtml_id="regbdate" value="--case when isnull (self.bdate) then '' else left (datestring (self.bdate), 10) end" xhtml_size="10" xhtml_onclick="javascript: datePopup(\'regbdate\');" />
+ <v:text name="regbdate" xhtml_id="regbdate" value="--case when isnull (self.bdate) then '' else left (datestring (self.bdate), 10) end" xhtml_size="10" xhtml_onclick="javascript: datePopup(\'regbdate\');"/>
<vm:u-prop-select name="sel_6" value="self.sav6" />
</td>
</tr>
<tr>
<th><label for="w_page" id="lb_1">Personal Webpage</label></th>
<td class="listing_col" nowrap="1">
- <v:text name="w_page" value="--self.wpage" xhtml_class="_validate_ _url_ _canEmpty_" xhtml_style="width:216px" xhtml_onblur="javascript: validateField(this);" />
+ <v:text name="w_page" value="--self.wpage" xhtml_class="_validate_ _url_ _canEmpty_" xhtml_style="width:216px" xhtml_onblur="javascript: validateField(this);"/>
<vm:u-prop-select name="sel_7" value="self.sav7" />
</td>
</tr>
@@ -583,15 +573,15 @@
<th><label for="m_sign">Mail Signature<span class="small">Automatically added to mails sent by you</span></label></th>
<td class="listing_col" nowrap="1">
<v:textarea name="m_sign" value="--self.msign" xhtml_rows="4" xhtml_cols="80" fmt-function="wa_utf8_to_wide" error-glyph="*">
- <v:validator test="length" min="0" max="255" name="vv_m_sign1" message="Mail Signature cannot be longer then 255 chars" empty-allowed="1" />
+ <v:validator test="length" min="0" max="255" name="vv_m_sign1" message="Mail Signature cannot be longer then 255 chars" empty-allowed="1"/>
</v:textarea>
- <v:text type="hidden" name="sel_9" value="3" />
+ <v:text type="hidden" name="sel_9" value="3"/>
</td>
</tr>
<tr>
<th><label for="s_summ">Summary</label></th>
<td class="listing_col" nowrap="1">
- <v:textarea name="s_summ" value="--self.summ" xhtml_rows="4" xhtml_cols="80" fmt-function="wa_utf8_to_wide" error-glyph="*" />
+ <v:textarea name="s_summ" value="--self.summ" xhtml_rows="4" xhtml_cols="80" fmt-function="wa_utf8_to_wide" error-glyph="*"/>
<vm:u-prop-select name="sel_33" value="self.sav33" />
</td>
</tr>
@@ -602,7 +592,7 @@
<td class="listing_col" nowrap="1">
<v:textarea name="s_tag" value="--WA_USER_TAG_GET(self.u_name)" xhtml_cols="50" xhtml_rows="5" />
<v:button action="browse" name="tagsbt" value="Import Tags..." selector="get_tags_popup.vspx" child-window-options="scrollbar=yes,resizable=yes,menubar=no,height=600,width=800">
- <v:field name="s_tag" />
+ <v:field name="s_tag"/>
</v:button>
</td>
</tr>
@@ -799,9 +789,9 @@
</th>
<td>
<v:select-list xhtml_class="select" name="app_enable" xhtml_id="app_enable">
- <v:item value="0" name="disabled" />
- <v:item value="1" name="click" />
- <v:item value="2" name="hover" />
+ <v:item value="0" name="disabled"/>
+ <v:item value="1" name="click"/>
+ <v:item value="2" name="hover"/>
<v:before-data-bind>
<v:script>
<![CDATA[
diff --git a/appsrc/ODS-Framework/uiedit_personal_2.vspx b/appsrc/ODS-Framework/uiedit_personal_2.vspx
index 9901fd5..3d12873 100644
--- a/appsrc/ODS-Framework/uiedit_personal_2.vspx
+++ b/appsrc/ODS-Framework/uiedit_personal_2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_personal_2.vspx,v 1.2.2.8 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_personal_2.vspx,v 1.2.2.7 2011/01/25 14:11:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_3.vspx b/appsrc/ODS-Framework/uiedit_personal_3.vspx
index ad26c11..793214a 100644
--- a/appsrc/ODS-Framework/uiedit_personal_3.vspx
+++ b/appsrc/ODS-Framework/uiedit_personal_3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_personal_3.vspx,v 1.1.2.12 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_personal_3.vspx,v 1.1.2.11 2010/10/07 13:22:38 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_4.vspx b/appsrc/ODS-Framework/uiedit_personal_4.vspx
index 1198486..973e2dc 100644
--- a/appsrc/ODS-Framework/uiedit_personal_4.vspx
+++ b/appsrc/ODS-Framework/uiedit_personal_4.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_personal_4.vspx,v 1.1.2.11 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_personal_4.vspx,v 1.1.2.10 2010/11/09 20:18:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_5.vspx b/appsrc/ODS-Framework/uiedit_personal_5.vspx
index bb9b2f3..3ce2fa0 100644
--- a/appsrc/ODS-Framework/uiedit_personal_5.vspx
+++ b/appsrc/ODS-Framework/uiedit_personal_5.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_personal_5.vspx,v 1.1.2.10 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_personal_5.vspx,v 1.1.2.9 2010/09/20 10:15:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_personal_6.vspx b/appsrc/ODS-Framework/uiedit_personal_6.vspx
index d90c863..d7b028d 100644
--- a/appsrc/ODS-Framework/uiedit_personal_6.vspx
+++ b/appsrc/ODS-Framework/uiedit_personal_6.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_personal_6.vspx,v 1.1.2.12 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_personal_6.vspx,v 1.1.2.10 2010/12/07 11:11:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -78,7 +78,7 @@
sql="select WUF_ID, WUF_LABEL, WUF_URI from DB.DBA.WA_USER_FAVORITES where WUF_U_ID = :self.u_id"
scrollable="1"
editable="1"
- nrows="0">
+ nrows="10">
<v:template name="r_ds_header" type="simple" name-to-remove="table" set-to-remove="bottom">
<table class="listing" rules="groups">
diff --git a/appsrc/ODS-Framework/uiedit_prj.vspx b/appsrc/ODS-Framework/uiedit_prj.vspx
index f21318b..c816f43 100644
--- a/appsrc/ODS-Framework/uiedit_prj.vspx
+++ b/appsrc/ODS-Framework/uiedit_prj.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_prj.vspx,v 1.12.2.9 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_prj.vspx,v 1.12.2.7 2011/05/16 08:53:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -76,7 +76,7 @@
sql="select WUP_ID, WUP_NAME, WUP_URL, WUP_DESC from DB.DBA.WA_USER_PROJECTS where WUP_U_ID = :self.u_id"
scrollable="1"
editable="1"
- nrows="0">
+ nrows="10">
<v:template name="m_ds_header" type="simple" name-to-remove="table" set-to-remove="bottom">
<table class="listing" rules="groups">
diff --git a/appsrc/ODS-Framework/uiedit_pwd.vspx b/appsrc/ODS-Framework/uiedit_pwd.vspx
index 9d2dddd..678ec90 100644
--- a/appsrc/ODS-Framework/uiedit_pwd.vspx
+++ b/appsrc/ODS-Framework/uiedit_pwd.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_pwd.vspx,v 1.15.2.21 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_pwd.vspx,v 1.15.2.19 2011/08/01 14:14:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -121,7 +121,7 @@
}
?>
<v:url name="sec_url_5" value="X.509 Certificates" url="--sprintf('uiedit_sec.vspx?page=3&tabNo=5')" xhtml_class="--case when self.tabNo = 5 then 'tabX activeTabX' else 'tabX' end"/>
- <v:url name="sec_url_6" value="Certificate & Private Key" url="--sprintf('uiedit_sec.vspx?page=3&tabNo=7')" xhtml_class="--case when self.tabNo = 7 then 'tabX activeTabX' else 'tabX' end"/>
+ <v:url name="sec_url_6" value="Private Keys" url="--sprintf('uiedit_sec.vspx?page=3&tabNo=7')" xhtml_class="--case when self.tabNo = 7 then 'tabX activeTabX' else 'tabX' end"/>
</div>
<div class="contents">
<v:form name="usr_pwd" type="simple" method="POST" action="uiedit_sec.vspx?page=3">
diff --git a/appsrc/ODS-Framework/uiedit_related.vspx b/appsrc/ODS-Framework/uiedit_related.vspx
index 1e50780..85b94a1 100644
--- a/appsrc/ODS-Framework/uiedit_related.vspx
+++ b/appsrc/ODS-Framework/uiedit_related.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_related.vspx,v 1.9.2.8 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_related.vspx,v 1.9.2.6 2010/09/27 14:45:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -43,7 +43,7 @@
sql="select WUR_ID, WUR_LABEL, WUR_SEEALSO_IRI, WUR_P_IRI from WA_USER_RELATED_RES where WUR_U_ID = :self.u_id"
scrollable="1"
editable="1"
- nrows="0">
+ nrows="1000">
<v:before-data-bind>
if (not e.ve_is_post and self.del_related is not null)
{
@@ -135,7 +135,7 @@ if (not e.ve_is_post and control.te_rowset[0] = self.edit_related)
<v:validator test="sql" expression="length(trim(control.ufl_value)) < 2" message="Label can not be empty"/>
</v:text>
<br/>
- <v:check-box name="spb" value="1" xhtml_id="spb"/>
+ <v:check-box name="spb" value="1" xhtml_id="spb"/>
<label for="spb">Issue Semantic Pingback</label>
<br/>
<span class="fm_ctl_btn">
diff --git a/appsrc/ODS-Framework/uiedit_sec.vspx b/appsrc/ODS-Framework/uiedit_sec.vspx
index 5600165..afee9ad 100644
--- a/appsrc/ODS-Framework/uiedit_sec.vspx
+++ b/appsrc/ODS-Framework/uiedit_sec.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit_sec.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_sec.vspx,v 1.1.4.2 2010/09/27 14:45:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_svc.vspx b/appsrc/ODS-Framework/uiedit_svc.vspx
index b8f93bf..5665358 100644
--- a/appsrc/ODS-Framework/uiedit_svc.vspx
+++ b/appsrc/ODS-Framework/uiedit_svc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_svc.vspx,v 1.14.2.9 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_svc.vspx,v 1.14.2.7 2011/05/02 14:16:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -39,7 +39,7 @@
<th>URI</th>
<th width="50px">Action</th>
</tr>
- <v:data-set name="svc" sql="select US_ID, US_SVC, US_IRI, US_KEY from WA_USER_SVC where US_U_ID = :self.u_id" scrollable="1" editable="1" nrows="0">
+ <v:data-set name="svc" sql="select US_ID, US_SVC, US_IRI, US_KEY from WA_USER_SVC where US_U_ID = :self.u_id" scrollable="1" editable="1" nrows="1000">
<v:before-data-bind>
if (not e.ve_is_post and self.del_svc is not null)
{
diff --git a/appsrc/ODS-Framework/uiedit_val.vspx b/appsrc/ODS-Framework/uiedit_val.vspx
index e7b138e..719dacc 100644
--- a/appsrc/ODS-Framework/uiedit_val.vspx
+++ b/appsrc/ODS-Framework/uiedit_val.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit_val.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_val.vspx,v 1.1.4.2 2010/09/27 14:45:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_validation.vspx b/appsrc/ODS-Framework/uiedit_validation.vspx
index a0ffa27..b99c6ce 100644
--- a/appsrc/ODS-Framework/uiedit_validation.vspx
+++ b/appsrc/ODS-Framework/uiedit_validation.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_validation.vspx,v 1.3.2.6 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_validation.vspx,v 1.3.2.5 2011/03/23 12:18:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_visb.vspx b/appsrc/ODS-Framework/uiedit_visb.vspx
index 69cacc9..19b45eb 100644
--- a/appsrc/ODS-Framework/uiedit_visb.vspx
+++ b/appsrc/ODS-Framework/uiedit_visb.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit_visb.vspx,v 1.4.2.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_visb.vspx,v 1.4.2.2 2010/11/09 20:18:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/uiedit_wishlist.vspx b/appsrc/ODS-Framework/uiedit_wishlist.vspx
index ebc4b36..88c0079 100644
--- a/appsrc/ODS-Framework/uiedit_wishlist.vspx
+++ b/appsrc/ODS-Framework/uiedit_wishlist.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uiedit_wishlist.vspx,v 1.1.2.18 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_wishlist.vspx,v 1.1.2.16 2011/06/09 17:43:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -81,7 +81,7 @@
sql="select WUOL_ID, WUOL_OFFER, WUOL_COMMENT from DB.DBA.WA_USER_OFFERLIST where WUOL_U_ID = :self.u_id and WUOL_TYPE = :self.wl_type"
scrollable="1"
editable="1"
- nrows="0">
+ nrows="10">
<v:template name="wl_ds_header" type="simple" name-to-remove="table" set-to-remove="bottom">
<table class="listing" rules="groups">
diff --git a/appsrc/ODS-Framework/uiedit_ws.vspx b/appsrc/ODS-Framework/uiedit_ws.vspx
index a56a44c..caf1cf2 100644
--- a/appsrc/ODS-Framework/uiedit_ws.vspx
+++ b/appsrc/ODS-Framework/uiedit_ws.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: uiedit_ws.vspx,v 1.1.4.3 2012/03/08 10:46:19 source Exp $
+ - $Id: uiedit_ws.vspx,v 1.1.4.2 2010/09/27 14:45:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/url_rew.sql b/appsrc/ODS-Framework/url_rew.sql
index cb5a87f..5ab5c43 100644
--- a/appsrc/ODS-Framework/url_rew.sql
+++ b/appsrc/ODS-Framework/url_rew.sql
@@ -1,14 +1,14 @@
--
-- url_rev.sql
--
--- $Id: url_rew.sql,v 1.35.2.14 2012/03/08 10:46:19 source Exp $
+-- $Id: url_rew.sql,v 1.35.2.11 2011/08/01 14:14:21 source Exp $
--
-- URL rewrite rules for ODS
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -402,14 +402,6 @@ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ods_item_html', 1,
NULL,
2);
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ods_item_briefcase_html', 1,
- '/dataspace/doc/([^/]*)/(briefcase)/([^/]*)/folder/([^/\\?]*)',
- vector('uname', 'app', 'inst', 'item'), 3,
- '%s?id=%s&what=c', vector('inst', 'item'),
- 'DB.DBA.ODS_ITEM_PAGE',
- NULL,
- 2);
-
-- Wiki item is special case
DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ods_wiki_item_html', 1,
'/dataspace/doc/([^/]*)/wiki/([^/]*)/([^\\?]*)',
@@ -618,7 +610,7 @@ DB.DBA.HTTP_VARIANT_ADD ('ods_rule_list1', 'sioc\x24', 'sioc.n3', 'text/rdf+
DB.DBA.HTTP_VARIANT_ADD ('ods_rule_list1', 'sioc\x24', 'sioc.nt', 'text/n3', 1.0, location_hook=>null);
DB.DBA.HTTP_VARIANT_ADD ('ods_rule_list1', 'sioc\x24', 'sioc.rdf', 'application/rdf+xml', 1.0, location_hook=>null);
DB.DBA.HTTP_VARIANT_ADD ('ods_rule_list1', 'sioc\x24', 'sioc.jmd', 'application/microdata+json', 1.0, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('ods_rule_list1', 'sioc\x24', 'sioc.jld', 'application/ld+json', 1.0, location_hook=>null);
+DB.DBA.HTTP_VARIANT_ADD ('ods_rule_list1', 'sioc\x24', 'sioc.jld', 'application/x-json+ld', 1.0, location_hook=>null);
create procedure DB.DBA.ODS_URLREW_HDR (in in_path varchar)
{
@@ -641,7 +633,7 @@ create procedure DB.DBA.ODS_URLREW_HDR (in in_path varchar)
vector ('turtle','N3/Turtle', 'text/turtle'),
vector ('ttl', 'N3/Turtle', 'text/rdf+ttl'),
vector ('jmd', 'Microdata+JSON', 'application/microdata+json'),
- vector ('jld', 'JSON-LD', 'application/ld+json')
+ vector ('jld', 'JSON-LD', 'application/x-json+ld')
);
path := regexp_replace (in_path, '/(about|foaf|sioc)\\.([a-z0-9]+)\x24', '', 1, null);
if (regexp_match ('/dataspace/(person|organization)/([^/]+)\x24', path) is not null)
@@ -702,7 +694,7 @@ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ods_rdf', 1,
'/dataspace/([^\\?]*)', vector('path'), 1,
'/dataspace/raw/%s/sioc', vector('path'),
null, --'DB.DBA.ODS_DET_REF',
- '(application/rdf.xml)|(text/rdf.n3)|(text/rdf.turtle)|(text/rdf.ttl)|([a-z]+/turtle)|(application/x-turtle)|(text/n3)|(application/json)|(application/microdata+json)|(application/ld+json)',
+ '(application/rdf.xml)|(text/rdf.n3)|(text/rdf.turtle)|(text/rdf.ttl)|([a-z]+/turtle)|(application/x-turtle)|(text/n3)|(application/json)|(application/microdata+json)|(application/x-json+ld)',
2,
303,
null --'^{sql:DB.DBA.ODS_URLREW_HDR}^'
@@ -713,7 +705,7 @@ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ods_rdf_next', 1,
'/dataspace/(.*)/page/([0-9]*)', vector('path', 'page'), 1,
'/ods/data/rdf/%U.%U?page=%U', vector('path', '*accept*', 'page'),
'DB.DBA.ODS_DET_REF',
- '(application/rdf.xml)|(text/rdf.n3)|(text/rdf.turtle)|(text/rdf.ttl)|([a-z]+/turtle)|(application/x-turtle)|(text/n3)|(application/json)|(application/microdata+json)|(application/ld+json)',
+ '(application/rdf.xml)|(text/rdf.n3)|(text/rdf.turtle)|(text/rdf.ttl)|([a-z]+/turtle)|(application/x-turtle)|(text/n3)|(application/json)|(application/microdata+json)|(application/x-json+ld)',
2,
303,
null --'^{sql:DB.DBA.ODS_URLREW_HDR}^'
@@ -774,7 +766,6 @@ DB.DBA.URLREWRITE_CREATE_RULELIST ('ods_rule_list1', 1,
'ods_discussion_home_html',
'ods_discussion_html',
'ods_item_html',
- 'ods_item_briefcase_html',
'ods_item_discussion_html',
'ods_item_annotation_html',
'ods_wiki_item_html',
diff --git a/appsrc/ODS-Framework/url_rule.vspx b/appsrc/ODS-Framework/url_rule.vspx
index d94c05c..2994bd3 100644
--- a/appsrc/ODS-Framework/url_rule.vspx
+++ b/appsrc/ODS-Framework/url_rule.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: url_rule.vspx,v 1.2.2.3 2012/03/08 10:46:19 source Exp $
+ - $Id: url_rule.vspx,v 1.2.2.2 2011/01/25 14:11:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/user_rdf.sql b/appsrc/ODS-Framework/user_rdf.sql
index 83929e9..8829dfe 100644
--- a/appsrc/ODS-Framework/user_rdf.sql
+++ b/appsrc/ODS-Framework/user_rdf.sql
@@ -1,10 +1,10 @@
--
--- $Id: user_rdf.sql,v 1.8.2.2 2012/03/08 10:46:19 source Exp $
+-- $Id: user_rdf.sql,v 1.8.2.1 2010/09/20 10:15:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/user_template.vspx b/appsrc/ODS-Framework/user_template.vspx
index c831e3f..8f41751 100644
--- a/appsrc/ODS-Framework/user_template.vspx
+++ b/appsrc/ODS-Framework/user_template.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: user_template.vspx,v 1.6.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: user_template.vspx,v 1.6.2.1 2010/09/20 10:15:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/users/css/users.css b/appsrc/ODS-Framework/users/css/users.css
index 573247c..e73d441 100644
--- a/appsrc/ODS-Framework/users/css/users.css
+++ b/appsrc/ODS-Framework/users/css/users.css
@@ -1,10 +1,10 @@
/*
- * $Id: users.css,v 1.2.2.10 2012/03/08 10:46:20 source Exp $
+ * $Id: users.css,v 1.2.2.9 2010/12/20 12:27:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-Framework/users/js/users.js b/appsrc/ODS-Framework/users/js/users.js
index 7e55e76..937e23e 100644
--- a/appsrc/ODS-Framework/users/js/users.js
+++ b/appsrc/ODS-Framework/users/js/users.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
@@ -647,14 +647,14 @@ function init()
rfTab.go(1);
if (typeof (uriParams['openid.signed']) != 'undefined' && uriParams['openid.signed'] != '') {
var x = function (params, param, data, property) {
- if (params[param] && params[param].length != 0 && params[param] != 'undefined')
+ if (params[param] && params[param].length != 0)
data[property] = params[param];
}
var data = {};
var ns;
for (var prop in uriParams) {
if (uriParams.hasOwnProperty(prop) && (uriParams[prop] == 'http://openid.net/srv/ax/1.0')) {
- ns = prop.replace('openid.ns.', '');
+ ns = prop.replace('openid.ax.', '');
break;
}
}
@@ -663,7 +663,6 @@ function init()
x(uriParams, 'openid.'+ns+'.value.email', data, 'mbox');
x(uriParams, 'openid.'+ns+'.value.firstname', data, 'firstName');
x(uriParams, 'openid.'+ns+'.value.fname', data, 'name');
- x(uriParams, 'openid.'+ns+'.value.fullname', data, 'name');
x(uriParams, 'openid.'+ns+'.value.language', data, 'language');
x(uriParams, 'openid.'+ns+'.value.lastname', data, 'family_name');
x(uriParams, 'openid.'+ns+'.value.fname', data, 'nick');
@@ -689,8 +688,6 @@ function init()
var tbl = $('rf_table_1');
addProfileRowInput(tbl, 'Login Name', 'rf_uid_1', {value: data['nick'], width: '150px'});
addProfileRowInput(tbl, 'E-Mail', 'rf_email_1', {value: data['mbox'], width: '300px'});
- if (data['name'])
- addProfileRowValue(tbl, 'Full Name', data['name']);
rfCheckUpdate(1);
}
else if (typeof (uriParams['openid.mode']) != 'undefined' && uriParams['openid.mode'] == 'cancel')
@@ -2127,8 +2124,6 @@ function addProfileRowInput(tbl, label, fName, fOptions) {
fld.type = 'type';
fld.id = fName;
fld.name = fld.id;
- if (fld.value == 'undefined')
- fld.value = '';
td.appendChild(fld);
tbl.appendChild(tr);
@@ -2423,6 +2418,7 @@ function ufProfileCallback(data) {
// main
hiddenCreate('c_nick', null, tagValue(user, 'nickName'));
$('ob_left_name').innerHTML = tagValue(user, 'fullName');
+ fieldUpdate(user, 'nickName', 'pf_nickName');
fieldUpdate(user, 'name', 'pf_loginName');
fieldUpdate(user, 'nickName', 'pf_nickName');
fieldUpdate(user, 'mail', 'pf_mail', aclData);
@@ -3531,17 +3527,3 @@ function knowsData() {
}
OAT.AJAX.GET(S, '', x, {onstart : function() {OAT.Dom.show('k_import_image')}, onend : function() {OAT.Dom.hide('k_import_image')}});
}
-
-function userDisable(userName)
-{
- var S = '/ods/api/user.disable?name='+encodeURIComponent($v(userName)) + '&sid=' + $v('sid') + '&realm=wa';
- var x = function(data) {
- var xml = OAT.Xml.createXmlDoc(data);
- if (!hasError(xml, false)) {
- alert('User\'s account is disabled!');
- logoutUrl();
- }
- }
- OAT.AJAX.GET(S, '', x);
-}
-
diff --git a/appsrc/ODS-Framework/users/users.html b/appsrc/ODS-Framework/users/users.html
index 3c95c99..bdfef47 100644
--- a/appsrc/ODS-Framework/users/users.html
+++ b/appsrc/ODS-Framework/users/users.html
@@ -79,7 +79,7 @@
<div id="lf_page_0" class="tabContent" >
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="lf_uid">User ID</label>
</th>
<td nowrap="nowrap">
@@ -99,7 +99,7 @@
<div id="lf_page_1" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="lf_openId">OpenID URL</label>
</th>
<td nowrap="nowrap">
@@ -111,7 +111,7 @@
<div id="lf_page_2" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td nowrap="nowrap">
<span id="lf_facebookData" style="min-height: 20px;"></span>
@@ -136,7 +136,7 @@
<div id="lf_page_4" class="tabContent" style="display: none">
<table id="lf_table_4" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="lf_twitter" style="min-height: 20px;"></span>
@@ -219,7 +219,7 @@
<div id="rf_page_1" class="tabContent" >
<table id="rf_table_1" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="rf_openId">OpenID</label>
</th>
<td nowrap="nowrap">
@@ -231,7 +231,7 @@
<div id="rf_page_2" class="tabContent" >
<table id="rf_table_2" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td nowrap="nowrap">
<span id="rf_facebookData" style="min-height: 20px;"></span>
@@ -256,7 +256,7 @@
<div id="rf_page_4" class="tabContent" style="display: none">
<table id="rf_table_4" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="rf_twitter" style="min-height: 20px;"></span>
@@ -283,7 +283,7 @@
<div>
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td nowrap="nowrap">
<input type="checkbox" name="rf_is_agreed" value="1" id="rf_is_agreed"/><label for="rf_is_agreed">I agree to the <a href="/ods/terms.html" target="_blank">Terms of Service</a>.</label>
@@ -354,12 +354,6 @@
<div id="pf_page_0_1" class="tabContent" style="display:none;">
<table class="form" cellspacing="5">
<tr>
- <th>Account deactivation</th>
- <td>
- <input type="button" value="Deactivate" onclick="return userDisable('pf_loginName');" />
- </td>
- </tr>
- <tr>
<th>
<label for="pf_loginName">Login Name</label>
</th>
@@ -1507,7 +1501,7 @@
</th>
<td>
<input type="text" class="_validate_ _uri_" size="100" value="" id="k_import" name="k_import">
- <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Retrieve">
+ <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Download">
<img style="display: none;" src="/ods/images/oat/Ajax_throbber.gif" alt="Import knows URIs" id="k_import_image">
</td>
</tr>
@@ -1534,7 +1528,7 @@
<tbody>
<tr id="k_tr_no">
<td colspan="3">
- <b>No retrieved items</b>
+ <b>No downloaded items</b>
</td>
</tr>
</tbody>
@@ -2250,7 +2244,7 @@
<div id="FT_R">
<a href="/ods/faq.html">FAQ</a> | <a href="/ods/privacy.html">Privacy</a> | <a href="/ods/rabuse.vspx">Report Abuse</a>
<div>
- Copyright © 1999-2012 OpenLink Software
+ Copyright © 1999-2011 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.jsp b/appsrc/ODS-Framework/users/users.jsp
index 5978e0d..61db09a 100644
--- a/appsrc/ODS-Framework/users/users.jsp
+++ b/appsrc/ODS-Framework/users/users.jsp
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: users.jsp,v 1.5.2.48 2012/03/08 10:46:20 source Exp $
+ - $Id: users.jsp,v 1.5.2.43 2011/08/03 11:42:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -1090,7 +1090,7 @@
<div id="lf_page_0" class="tabContent" >
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="lf_uid">User ID</label>
</th>
<td>
@@ -1110,7 +1110,7 @@
<div id="lf_page_1" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="lf_openId">OpenID URL</label>
</th>
<td>
@@ -1122,7 +1122,7 @@
<div id="lf_page_2" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="lf_facebookData" style="min-height: 20px;"></span>
@@ -1147,7 +1147,7 @@
<div id="lf_page_4" class="tabContent" style="display: none">
<table id="lf_table_4" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="lf_twitter" style="min-height: 20px;"></span>
@@ -1198,7 +1198,7 @@
<div id="rf_page_0" class="tabContent" >
<table id="rf_table_0" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="rf_uid_0">Login Name<div style="font-weight: normal; display:inline; color:red;"> *</div></label>
</th>
<td>
@@ -1234,7 +1234,7 @@
<div id="rf_page_1" class="tabContent" style="display: none">
<table id="rf_table_1" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="rf_openId">OpenID</label>
</th>
<td>
@@ -1246,7 +1246,7 @@
<div id="rf_page_2" class="tabContent" style="display: none">
<table id="rf_table_2" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="rf_facebookData" style="min-height: 20px;"></span>
@@ -1271,7 +1271,7 @@
<div id="rf_page_4" class="tabContent" style="display: none">
<table id="rf_table_4" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="rf_twitter" style="min-height: 20px;"></span>
@@ -1298,7 +1298,7 @@
<div>
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<input type="checkbox" name="rf_is_agreed" value="1" id="rf_is_agreed"/><label for="rf_is_agreed">I agree to the <a href="/ods/terms.html" target="_blank">Terms of Service</a>.</label>
@@ -1400,12 +1400,6 @@
<div id="pf_page_0_1" class="tabContent" style="display:none;">
<table class="form" cellspacing="5">
<tr>
- <th>Account deactivation</th>
- <td>
- <input type="button" value="Deactivate" onclick="return userDisable('pf_loginName');" />
- </td>
- </tr>
- <tr>
<th>
<label for="pf_loginName">Login Name</label>
</th>
@@ -2850,7 +2844,7 @@
</th>
<td>
<input type="text" class="_validate_ _uri_" size="100" value="" id="k_import" name="k_import">
- <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Retrieve">
+ <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Download">
<img style="display: none;" src="/ods/images/oat/Ajax_throbber.gif" alt="Import knows URIs" id="k_import_image">
</td>
</tr>
@@ -2877,7 +2871,7 @@
<tbody>
<tr id="k_tr_no">
<td colspan="3">
- <b>No retrieved items</b>
+ <b>No downloaded items</b>
</td>
</tr>
</tbody>
@@ -3803,7 +3797,7 @@
<div id="FT_R">
<a href="/ods/faq.html">FAQ</a> | <a href="/ods/privacy.html">Privacy</a> | <a href="/ods/rabuse.vspx">Report Abuse</a>
<div>
- Copyright © 1999-2012 OpenLink Software
+ Copyright © 1999-2011 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.php b/appsrc/ODS-Framework/users/users.php
index ba4f908..dfe4930 100644
--- a/appsrc/ODS-Framework/users/users.php
+++ b/appsrc/ODS-Framework/users/users.php
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: users.php,v 1.6.2.50 2012/03/08 10:46:20 source Exp $
+ - $Id: users.php,v 1.6.2.45 2011/08/03 11:42:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2008 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
@@ -915,7 +915,7 @@
<div id="lf_page_0" class="tabContent" >
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="lf_uid">User ID</label>
</th>
<td>
@@ -935,7 +935,7 @@
<div id="lf_page_1" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="lf_openId">OpenID URL</label>
</th>
<td>
@@ -947,7 +947,7 @@
<div id="lf_page_2" class="tabContent" style="display: none">
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="lf_facebookData" style="min-height: 20px;"></span>
@@ -972,7 +972,7 @@
<div id="lf_page_4" class="tabContent" style="display: none">
<table id="lf_table_4" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="lf_twitter" style="min-height: 20px;"></span>
@@ -1023,7 +1023,7 @@
<div id="rf_page_0" class="tabContent" style="display: none">
<table id="rf_table_0" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="rf_uid_0">Login Name<div style="font-weight: normal; display:inline; color:red;"> *</div></label>
</th>
<td>
@@ -1059,7 +1059,7 @@
<div id="rf_page_1" class="tabContent" style="display: none">
<table id="rf_table_1" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
<label for="rf_openId">OpenID</label>
</th>
<td>
@@ -1071,7 +1071,7 @@
<div id="rf_page_2" class="tabContent" style="display: none">
<table id="rf_table_2" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="rf_facebookData" style="min-height: 20px;"></span>
@@ -1096,7 +1096,7 @@
<div id="rf_page_4" class="tabContent" style="display: none">
<table id="rf_table_4" class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<span id="rf_twitter" style="min-height: 20px;"></span>
@@ -1123,7 +1123,7 @@
<div>
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<input type="checkbox" name="rf_is_agreed" value="1" id="rf_is_agreed"/><label for="rf_is_agreed">I agree to the <a href="/ods/terms.html" target="_blank">Terms of Service</a>.</label>
@@ -1226,18 +1226,11 @@
<div id="pf_page_0_1" class="tabContent" style="display:none;">
<table class="form" cellspacing="5">
<tr>
- <th>Account deactivation</th>
- <td>
- <input type="button" value="Deactivate" onclick="return userDisable('pf_loginName');" />
- </td>
- </tr>
- <tr>
- <th width="30%">
+ <th>
<label for="pf_loginName">Login Name</label>
</th>
<td>
<?php print($_xml->name); ?>
- <input type="hidden" name="pf_loginName" value="<?php print($_xml->name); ?>" id="pf_loginName" />
</td>
</tr>
<tr>
@@ -1249,7 +1242,7 @@
</td>
</tr>
<tr>
- <th>
+ <th width="30%">
<label for="pf_title">Title</label>
</th>
<td>
@@ -2680,7 +2673,7 @@
</th>
<td>
<input type="text" class="_validate_ _uri_" size="100" value="" id="k_import" name="k_import">
- <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Retrieve">
+ <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Download">
<img style="display: none;" src="/ods/images/oat/Ajax_throbber.gif" alt="Import knows URIs" id="k_import_image">
</td>
</tr>
@@ -2707,7 +2700,7 @@
<tbody>
<tr id="k_tr_no">
<td colspan="3">
- <b>No retrieved items</b>
+ <b>No downloaded items</b>
</td>
</tr>
</tbody>
@@ -3652,7 +3645,7 @@
<div id="FT_R">
<a href="/ods/faq.html">FAQ</a> | <a href="/ods/privacy.html">Privacy</a> | <a href="/ods/rabuse.vspx">Report Abuse</a>
<div>
- Copyright © 1999-2012 OpenLink Software
+ Copyright © 1999-2011 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.rb b/appsrc/ODS-Framework/users/users.rb
index 019beb3..93441bf 100644
--- a/appsrc/ODS-Framework/users/users.rb
+++ b/appsrc/ODS-Framework/users/users.rb
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -1012,7 +1012,7 @@ def main()
<div id="FT_R">
<a href="/ods/faq.html">FAQ</a> | <a href="/ods/privacy.html">Privacy</a> | <a href="/ods/rabuse.vspx">Report Abuse</a>
<div>
- Copyright © 1999-2012 OpenLink Software
+ Copyright © 1999-2011 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.vsp b/appsrc/ODS-Framework/users/users.vsp
index 1a1f82e..723ac04 100644
--- a/appsrc/ODS-Framework/users/users.vsp
+++ b/appsrc/ODS-Framework/users/users.vsp
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- - $Id: users.vsp,v 1.1.2.49 2012/03/08 10:46:20 source Exp $
+ - $Id: users.vsp,v 1.1.2.44 2011/08/03 11:42:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2008 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
@@ -1256,7 +1256,7 @@
<div>
<table class="form" cellspacing="5">
<tr>
- <th width="20%">
+ <th width="30%">
</th>
<td>
<input type="checkbox" name="rf_is_agreed" value="1" id="rf_is_agreed"/><label for="rf_is_agreed">I agree to the <a href="/ods/terms.html" target="_blank">Terms of Service</a>.</label>
@@ -1373,18 +1373,11 @@
<div id="pf_page_0_1" class="tabContent" style="display:none;">
<table class="form" cellspacing="5">
<tr>
- <th>Account deactivation</th>
- <td>
- <input type="button" value="Deactivate" onclick="return userDisable('pf_loginName');" />
- </td>
- </tr>
- <tr>
- <th width="30%">
+ <th>
<label for="pf_loginName">Login Name</label>
</th>
<td>
<?V xpath_eval ('string (/user/name)', vXml) ?>
- <input type="hidden" name="pf_loginName" value="<?V xpath_eval ('string (/user/name)', vXml) ?>" id="pf_loginName" />
</td>
</tr>
<tr>
@@ -1396,7 +1389,7 @@
</td>
</tr>
<tr>
- <th>
+ <th width="30%">
<label for="pf_title">Title</label>
</th>
<td>
@@ -2831,7 +2824,7 @@
</th>
<td>
<input type="text" class="_validate_ _uri_" size="100" value="" id="k_import" name="k_import">
- <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Retrieve">
+ <input type="button" class="button" onclick="javascript: knowsData(); return false;" value="Download">
<img style="display: none;" src="/ods/images/oat/Ajax_throbber.gif" alt="Import knows URIs" id="k_import_image">
</td>
</tr>
@@ -2858,7 +2851,7 @@
<tbody>
<tr id="k_tr_no">
<td colspan="3">
- <b>No retrieved items</b>
+ <b>No downloaded items</b>
</td>
</tr>
</tbody>
@@ -3795,7 +3788,7 @@
<div id="FT_R">
<a href="/ods/faq.html">FAQ</a> | <a href="/ods/privacy.html">Privacy</a> | <a href="/ods/rabuse.vspx">Report Abuse</a>
<div>
- Copyright © 1999-2012 OpenLink Software
+ Copyright © 1999-2011 OpenLink Software
</div>
</div>
</div>
diff --git a/appsrc/ODS-Framework/users/users.xsl b/appsrc/ODS-Framework/users/users.xsl
index 8c1ae15..40f7364 100644
--- a/appsrc/ODS-Framework/users/users.xsl
+++ b/appsrc/ODS-Framework/users/users.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: users.xsl,v 1.1.4.8 2012/03/08 10:46:20 source Exp $
+ - $Id: users.xsl,v 1.1.4.6 2010/12/20 12:27:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -200,11 +200,11 @@
<tr>
<th><xsl:value-of select="$label"/></th>
<td>
- <img border="0" width="64" class="resize">
+ <image>
<xsl:attribute name="src">
<xsl:value-of select="$value"/>
</xsl:attribute>
- </img>
+ </image>
</td>
</tr>
</xsl:template>
diff --git a/appsrc/ODS-Framework/users_select.js b/appsrc/ODS-Framework/users_select.js
index 330b28f..f7e1f7b 100644
--- a/appsrc/ODS-Framework/users_select.js
+++ b/appsrc/ODS-Framework/users_select.js
@@ -1,10 +1,10 @@
/*
- * $Id: users_select.js,v 1.3.2.5 2012/03/08 10:46:19 source Exp $
+ * $Id: users_select.js,v 1.3.2.4 2010/10/13 12:16:49 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/users_select.vspx b/appsrc/ODS-Framework/users_select.vspx
index 06b6ab0..8004e63 100644
--- a/appsrc/ODS-Framework/users_select.vspx
+++ b/appsrc/ODS-Framework/users_select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: users_select.vspx,v 1.5.2.9 2012/03/08 10:46:19 source Exp $
+ - $Id: users_select.vspx,v 1.5.2.8 2011/05/02 14:16:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/vad_version b/appsrc/ODS-Framework/vad_version
index 6186365..af01f23 100644
--- a/appsrc/ODS-Framework/vad_version
+++ b/appsrc/ODS-Framework/vad_version
@@ -1 +1 @@
-1.85.92
+1.83.49
diff --git a/appsrc/ODS-Framework/validate.js b/appsrc/ODS-Framework/validate.js
index 0efbc53..a886d6a 100644
--- a/appsrc/ODS-Framework/validate.js
+++ b/appsrc/ODS-Framework/validate.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-Framework/version.base b/appsrc/ODS-Framework/version.base
new file mode 100644
index 0000000..7facc89
--- /dev/null
+++ b/appsrc/ODS-Framework/version.base
@@ -0,0 +1 @@
+36
diff --git a/appsrc/ODS-Framework/version.curr b/appsrc/ODS-Framework/version.curr
new file mode 100644
index 0000000..c24db41
--- /dev/null
+++ b/appsrc/ODS-Framework/version.curr
@@ -0,0 +1 @@
+8349
diff --git a/appsrc/ODS-Framework/vhost.vspx b/appsrc/ODS-Framework/vhost.vspx
index ed54354..0b91419 100644
--- a/appsrc/ODS-Framework/vhost.vspx
+++ b/appsrc/ODS-Framework/vhost.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vhost.vspx,v 1.10.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: vhost.vspx,v 1.10.2.1 2010/09/20 10:15:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/vhost_simple.vspx b/appsrc/ODS-Framework/vhost_simple.vspx
index fd31c09..3ff94dc 100644
--- a/appsrc/ODS-Framework/vhost_simple.vspx
+++ b/appsrc/ODS-Framework/vhost_simple.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vhost_simple.vspx,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: vhost_simple.vspx,v 1.4.2.1 2010/09/20 10:15:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/view.vspx b/appsrc/ODS-Framework/view.vspx
index 0959f14..994683d 100644
--- a/appsrc/ODS-Framework/view.vspx
+++ b/appsrc/ODS-Framework/view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: view.vspx,v 1.5.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: view.vspx,v 1.5.2.1 2010/09/20 10:15:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/view_file.vspx b/appsrc/ODS-Framework/view_file.vspx
index 24d3cbe..fcf4f6b 100644
--- a/appsrc/ODS-Framework/view_file.vspx
+++ b/appsrc/ODS-Framework/view_file.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: view_file.vspx,v 1.6.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: view_file.vspx,v 1.6.2.1 2010/09/20 10:15:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/wa_login.vspx b/appsrc/ODS-Framework/wa_login.vspx
index e5d182d..e328fb2 100644
--- a/appsrc/ODS-Framework/wa_login.vspx
+++ b/appsrc/ODS-Framework/wa_login.vspx
@@ -1,11 +1,11 @@
<!--
-
- - $Id: wa_login.vspx,v 1.4.2.3 2012/03/08 10:46:19 source Exp $
+ - $Id: wa_login.vspx,v 1.4.2.2 2011/03/23 12:18:30 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/wa_maps.sql b/appsrc/ODS-Framework/wa_maps.sql
index ff81b48..d4295da 100644
--- a/appsrc/ODS-Framework/wa_maps.sql
+++ b/appsrc/ODS-Framework/wa_maps.sql
@@ -1,12 +1,12 @@
--
--- $Id: wa_maps.sql,v 1.7.2.4 2012/03/08 10:46:19 source Exp $
+-- $Id: wa_maps.sql,v 1.7.2.3 2010/12/10 16:04:14 source Exp $
--
-- Procedures to support the WA maps handling.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/wa_maps.vspx b/appsrc/ODS-Framework/wa_maps.vspx
index 765deb1..5df9ce8 100644
--- a/appsrc/ODS-Framework/wa_maps.vspx
+++ b/appsrc/ODS-Framework/wa_maps.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wa_maps.vspx,v 1.8.2.2 2012/03/08 10:46:19 source Exp $
+ - $Id: wa_maps.vspx,v 1.8.2.1 2010/09/20 10:15:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/wa_search_procs.sql b/appsrc/ODS-Framework/wa_search_procs.sql
index 06b1e73..3fbf2f3 100644
--- a/appsrc/ODS-Framework/wa_search_procs.sql
+++ b/appsrc/ODS-Framework/wa_search_procs.sql
@@ -1,12 +1,12 @@
--
--- $Id: wa_search_procs.sql,v 1.25.2.3 2012/03/08 10:46:19 source Exp $
+-- $Id: wa_search_procs.sql,v 1.25.2.1 2010/09/20 10:15:32 source Exp $
--
-- Procedures to support the WA search.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -2160,7 +2160,7 @@ where WAUI_PHOTO_URL is not null and length (WAUI_PHOTO_URL) = 0
update WA_USER_INFO set
WAUI_PHOTO_URL =
DAV_HOME_DIR ((select U_NAME from SYS_USERS where U_ID = WAUI_U_ID))||'/wa/images/'||WAUI_PHOTO_URL
-where WAUI_PHOTO_URL is not null and blob_to_string (WAUI_PHOTO_URL) not like '/%' and blob_to_string (WAUI_PHOTO_URL) not like 'http://%'
+where WAUI_PHOTO_URL is not null and blob_to_string (WAUI_PHOTO_URL) not like '/%'
;
create function WA_SEARCH_CHECK_FT_QUERY (in text varchar, in is_tags integer := 0) returns varchar
diff --git a/appsrc/ODS-Framework/wa_template.sql b/appsrc/ODS-Framework/wa_template.sql
index 2448716..f3764f9 100644
--- a/appsrc/ODS-Framework/wa_template.sql
+++ b/appsrc/ODS-Framework/wa_template.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_template.sql,v 1.4.2.2 2012/03/08 10:46:19 source Exp $
+-- $Id: wa_template.sql,v 1.4.2.1 2010/09/20 10:15:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/web_header.vspx b/appsrc/ODS-Framework/web_header.vspx
index cef44d0..8301205 100644
--- a/appsrc/ODS-Framework/web_header.vspx
+++ b/appsrc/ODS-Framework/web_header.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: web_header.vspx,v 1.5.2.3 2012/03/08 10:46:19 source Exp $
+ - $Id: web_header.vspx,v 1.5.2.2 2010/09/20 10:15:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/web_svc.sql b/appsrc/ODS-Framework/web_svc.sql
index a2168d6..aa8e7ab 100644
--- a/appsrc/ODS-Framework/web_svc.sql
+++ b/appsrc/ODS-Framework/web_svc.sql
@@ -1,10 +1,10 @@
--
--- $Id: web_svc.sql,v 1.7.2.7 2012/03/08 10:46:19 source Exp $
+-- $Id: web_svc.sql,v 1.7.2.6 2010/11/19 16:50:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Framework/webfinger.sql b/appsrc/ODS-Framework/webfinger.sql
index e50b0bf..3c09162 100644
--- a/appsrc/ODS-Framework/webfinger.sql
+++ b/appsrc/ODS-Framework/webfinger.sql
@@ -1,12 +1,12 @@
--
--- $Id: webfinger.sql,v 1.1.4.15 2012/03/08 10:46:19 source Exp $
+-- $Id: webfinger.sql,v 1.1.4.14 2011/06/02 12:34:01 source Exp $
--
-- Webfinger & fingerpoint protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-Framework/webid_check.vsp b/appsrc/ODS-Framework/webid_check.vsp
index d37a111..36133b6 100644
--- a/appsrc/ODS-Framework/webid_check.vsp
+++ b/appsrc/ODS-Framework/webid_check.vsp
@@ -48,24 +48,9 @@ html:
<html>
<head>
<title>WebId Identity Provider</title>
- <style type="text/css">
- #qrcode {
- float: right;
- clear: right;
- margin-right: 20px;
- }
- </style>
</head>
<body>
<h1>WebId Identity Provider</h1>
- <?vsp declare qrimg, ua any;
- ua := http_request_header (lines, 'User-Agent');
- qrimg := ODS.ODS_API.qrcode (sprintf ('http://%{WSHost}s%s', http_path ()));
- if (qrimg is not null and strcasestr (ua, 'Mobile') is null) {
- ?>
- <div id="qrcode"><img alt="QRcode image" src="data:image/jpg;base64,<?V qrimg ?>"/></div>
- <?vsp
- } ?>
<div>
This will send a redirection to the URL you have specified in the input, including a signed assertion by this service about your WebID.
</div>
diff --git a/appsrc/ODS-Framework/webid_demo.html b/appsrc/ODS-Framework/webid_demo.html
deleted file mode 100644
index 7dfa243..0000000
--- a/appsrc/ODS-Framework/webid_demo.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<html>
- <head>
- <title>WebID Verification Demo</title>
- <style type="text/css">
- body {
- background-color: white;
- color: black;
- font-size: 10pt;
- font-family: Verdana, Helvetica, sans-serif;
- }
- ul {
- font-family: Verdana, Helvetica, sans-serif;
- list-style-type: none;
- }
- #qrcode {
- float: right;
- clear: right;
- margin-right: 20px;
- }
- </style>
- <script type="text/javascript" src="/ods/oat/loader.js"></script>
- <script type="text/javascript">
- OAT.Preferences.imagePath = '/ods/images/oat/';
- OAT.Preferences.stylePath = '/ods/oat/styles/';
- OAT.Preferences.showAjax = false;
-
- var featureList=["ajax", "json"];
- OAT.Loader.load(featureList);
- </script>
- <script type="text/javascript">
- function check() {
- var x = function (data) {
- var expiration = $('expiration').checked ? '&expiration=true' : '';
- var callback = document.location.protocol + '//' + document.location.host + document.location.pathname;
- document.location = 'https://' + data + '/ods/webid_verify.vsp?callback=' + encodeURIComponent(callback) + expiration;
- }
- OAT.AJAX.GET ('/ods/api/getDefaultHttps', false, x, {async: false});
- }
- function getObject(id) {
- return document.getElementById(id)
- }
- function hide(id) {
- var obj = getObject(id);
- obj.style.display = "none";
- }
- function show(id) {
- var obj = getObject(id);
- obj.style.display = "";
- }
- function getParam(name)
- {
- name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
- var regexS = "[\\?&]"+name+"=([^&#]*)";
- var regex = new RegExp( regexS );
- var results = regex.exec( window.location.href );
- if( results == null )
- return "";
- else
- return decodeURIComponent(results[1]);
- }
- function showQR()
- {
- var hostURL = document.location.protocol + '//' + document.location.host + document.location.pathname;
- var x = function (data) {
- var img = getObject('qrcodeImg');
- img.src = 'data:image/jpg;base64,'+data;
- show(img);
- }
- OAT.AJAX.GET ('/ods/api/qrcode?data='+encodeURIComponent(hostURL), false, x, {async: false});
- }
- </script>
- </head>
- <body>
- <h1>WebID Verification Demo</h1>
- <div id="qrcode"><img id="qrcodeImg" alt="QRcode image" src="" /></div>
- <script type="text/javascript">
- OAT.Loader.load(['ajax'], showQR);
- </script>
- <div>
- This will check the WebID watermark in your X.509 Certificate.<br/><br/>
- This service supports WebIDs based on the following URI schemes (more to come):
- <ul>
- <li>* <b>acct</b>, e.g: <span style="font-size: 80%; color: #1DA237;">acct:ExampleUser at id.example.com</span></li>
- <li>* <b>http</b>, e.g: <span style="font-size: 80%; color: #1DA237;">http://id.example.com/person/ExampleUser#this</span></li>
- <li>* <b>ldap</b>, e.g: <span style="font-size: 80%; color: #1DA237;">ldap://ldap.example.com/o=An%20Example%5C2C%20Inc.,c=US</span></li>
- <li>* <b>mailto</b>, e.g: <span style="font-size: 80%; color: #1DA237;">mailto:ExampleUser at id.example.com</span></li>
- </ul>
- </div>
- <br/>
- <br/>
- <div>
- <form method="get">
- <input type="checkbox" value="true" name="expiration" id="expiration" /> <label for="expiration">Check Certificate Expiration</label><br />
- <input type="button" name="go" value="Check" id="go" onclick="javascript: return check();" />
- </form>
- </div>
- <div id="result" style="display: none;">
- The return values are:
- <ul id="result_webid" style="display: none;">
- <li>WebID - <script language="javascript" type="text/javascript">
- document.write('<a href="" id="link"><span id="webid"></span><\/a>')
- </script></li>
- <li>Subject - <span id="subj"></span></li>
- <li>MD5 - <span id="md5"></span></li>
- <li>SHA1 - <span id="sha1"></span></li>
- <li>Timestamp in ISO 8601 format - <span id="ts"></span></li>
- </ul>
- <ul id="result_error" style="display: none;">
- <li>Error - <span id="error"></span></li>
- </ul>
- </div>
- <script type="text/javascript">
- var webid = getParam('webid');
- var error = getParam('error');
- if ((webid != '') || (error != '')) {
- show('result');
- if (webid != '') {
- show('result_webid');
- getObject('webid').innerHTML = getParam('webid');
- getObject('link').href = getParam('webid');
- getObject('ts').innerHTML = getParam('ts');
- getObject('md5').innerHTML = getParam('md5');
- getObject('sha1').innerHTML = getParam('sha1');
- getObject('subj').innerHTML = getParam('subj');
- } else {
- hide('result_webid');
- }
- if (error != '') {
- show('result_error');
- getObject('error').innerHTML = getParam('error');;
- } else {
- hide('result_error');
- }
- } else {
- hide('result');
- }
- </script>
- </body>
-</html>
diff --git a/appsrc/ODS-Framework/webid_demo.php b/appsrc/ODS-Framework/webid_demo.php
deleted file mode 100644
index d46cb37..0000000
--- a/appsrc/ODS-Framework/webid_demo.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
- function parseUrl($url)
- {
- // parse the given URL
- $url = parse_url($url);
- if (!isset($url['port'])) {
- if ($url['scheme'] == 'http') {
- $url['port'] = 80;
- }
- elseif ($url['scheme'] == 'https') {
- $url['port'] = 443;
- }
- }
- if ($url['scheme'] == 'https')
- $url['scheme'] = 'ssl';
-
- elseif ($url['scheme'] == 'http')
- $url['scheme'] = 'tcp';
-
- $url['query'] = isset($url['query'])? $url['query']: '';
- $url['protocol'] = $url['scheme'] . '://';
-
- return $url;
- }
- function makeRequest($url, $headers) {
- // parse the given URL
- $content = "";
- $fp = fsockopen($url['protocol'] . $url['host'], $url['port'], $errno, $errstr, 30);
- if ($fp) {
- if (fwrite($fp, $headers)) {
- while (!feof($fp)) {
- $result .= fgets($fp, 128);
- }
- fclose($fp);
-
- // split the result header from the content
- $result = explode("\r\n\r\n", $result, 2);
-
- $header = isset($result[0]) ? $result[0] : '';
- $content = isset($result[1]) ? $result[1] : '';
- } else {
- fclose($fp);
- }
- }
- return $content;
- }
- function getRequest($url)
- {
- $url = parseUrl($url);
- $eol = "\r\n";
- $headers = "GET " . $url['path'] . "?" . $url['query'] . " HTTP/1.1" . $eol .
- "Host: " . $url['host'].":".$url['port'] . $eol .
- "Connection: close" . $eol . $eol;
- return makeRequest ($url, $headers);
- }
- function apiURL()
- {
- $pageURL = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
- $pageURL .= $_SERVER['SERVER_PORT'] <> '80' ? $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"] : $_SERVER['SERVER_NAME'];
- return $pageURL.'/ods/api';
- }
- function httpURL()
- {
- $pageURL = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
- $pageURL .= $_SERVER['SERVER_PORT'] <> '80' ? $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] : $_SERVER['SERVER_NAME'];
- return $pageURL . '/ods/webid/webid_demo.php';
- }
- $_webid = isset ($_REQUEST['webid']) ? $_REQUEST['webid'] : '';
- $_error = isset ($_REQUEST['error']) ? $_REQUEST['error'] : '';
- $_action = isset ($_REQUEST['go']) ? $_REQUEST['go'] : '';
- if (($_webid == '') && ($_error == ''))
- {
- if ($_action <> '')
- {
- $_url = getRequest (sprintf ("%s/getDefaultHttps", apiURL()));
- $_url = sprintf ('https://%s/ods/webid_verify.vsp?callback=%s', $_url, urlencode(httpURL()));
- header (sprintf ('Location: %s', $_url));
- return;
- }
- }
-?>
-<html>
- <head>
- <title>WebID Verification Demo</title>
- <style type="text/css">
- body {
- background-color: white;
- color: black;
- font-size: 10pt;
- font-family: Verdana, Helvetica, sans-serif;
- }
- ul {
- font-family: Verdana, Helvetica, sans-serif;
- list-style-type: none;
- }
- #qrcode {
- float: right;
- clear: right;
- margin-right: 20px;
- }
- </style>
- </head>
- <body>
- <h1>WebID Verification Demo</h1>
- <?php
- $_QR = getRequest (sprintf ("%s/qrcode?data=%s", apiURL(), urlencode(httpURL())));
- if ($_QR <> '')
- {
- ?>
- <div id="qrcode"><img alt="QRcode image" src="data:image/jpg;base64,<?php print ($_QR); ?>" /></div>
- <?php
- }
- ?>
- <div>
- This will check the WebID watermark in your X.509 Certificate.<br/><br/>
- This service supports WebIDs based on the following URI schemes (more to come):
- <ul>
- <li>* <b>acct</b>, e.g: <span style="font-size: 80%; color: #1DA237;">acct:ExampleUser at id.example.com</span></li>
- <li>* <b>http</b>, e.g: <span style="font-size: 80%; color: #1DA237;">http://id.example.com/person/ExampleUser#this</span></li>
- <li>* <b>ldap</b>, e.g: <span style="font-size: 80%; color: #1DA237;">ldap://ldap.example.com/o=An%20Example%5C2C%20Inc.,c=US</span></li>
- <li>* <b>mailto</b>, e.g: <span style="font-size: 80%; color: #1DA237;">mailto:ExampleUser at id.example.com</span></li>
- </ul>
- </div>
- <br/>
- <br/>
- <div>
- <form method="get">
- <input type="submit" name="go" value="Check"/>
- </form>
- </div>
- <?php
- if (($_webid <> '') || ($_error <> ''))
- {
- ?>
- <div>
- The return values are:
- <ul>
- <?php
- if ($_webid <> '')
- {
- $_proxyIri = getRequest (sprintf ("%s/iri2proxy?iri=%s", apiURL(), urlencode($_webid)));
- ?>
- <li>WebID - <?php print (sprintf('<a href="%s">%s</a>', $_proxyIri, $_proxyIri)); ?></li>
- <li>Timestamp in ISO 8601 format - <?php print ($_REQUEST['ts']); ?></li>
- <?php
- }
- else if ($_error <> '')
- {
- ?>
- <li>Error - <?php print ($_error); ?></li>
- <?php
- }
- ?>
- </ul>
- </div>
- <?php
- }
- ?>
- </body>
-</html>
diff --git a/appsrc/ODS-Framework/webid_demo.vsp b/appsrc/ODS-Framework/webid_demo.vsp
deleted file mode 100644
index 5954df8..0000000
--- a/appsrc/ODS-Framework/webid_demo.vsp
+++ /dev/null
@@ -1,121 +0,0 @@
-<?vsp
- declare webid, error, action, hostUrl, httpsUrl, url, callback, certificate any;
-
- webid := get_keyword ('webid', params);
- error := get_keyword ('error', params);
- action := get_keyword ('go', params);
- if (length (webid) or length (error))
- goto html;
-
- if (not length (action))
- goto html;
-
- if (is_https_ctx ())
- {
- hostUrl := 'https://' || ODS.ODS_API.getDefaultHttps ();
- }
- else
- {
- hostUrl := cfg_item_value (virtuoso_ini_path (), 'URIQA', 'DefaultHost');
- if (hostUrl is null)
- {
- hostUrl := sys_stat ('st_host_name');
- if (server_http_port () <> '80')
- hostUrl := hostUrl || ':' || server_http_port ();
- }
- hostUrl := 'http://' || hostUrl;
- }
- if (isnull (hostUrl))
- {
- error := 'No certificate';
- goto html;
- }
- httpsUrl := ODS..getDefaultHttps();
- if (isnull (httpsUrl))
- httpsUrl := 'id.myopenlink.net';
-
- callback := hostUrl || '/ods/webid/webid_demo.vsp';
- url := sprintf ('https://%s/ods/webid_verify.vsp?callback=%U', httpsUrl, callback);
- http_status_set (302);
- http_header (sprintf ('Location: %s\r\n', url));
- return;
-
-html:
-?>
-<html>
- <head>
- <title>WebID Verification Demo</title>
- <style type="text/css">
- body {
- background-color: white;
- color: black;
- font-size: 10pt;
- font-family: Verdana, Helvetica, sans-serif;
- }
- ul {
- font-family: Verdana, Helvetica, sans-serif;
- list-style-type: none;
- }
- #qrcode {
- float: right;
- clear: right;
- margin-right: 20px;
- }
- </style>
- </head>
- <body>
- <h1>WebID Verification Demo</h1>
- <?vsp declare qrimg, ua any;
- ua := http_request_header (lines, 'User-Agent');
- qrimg := ODS.ODS_API.qrcode (sprintf ('http://%{WSHost}s%s', http_path ()));
- if (qrimg is not null and strcasestr (ua, 'Mobile') is null) {
- ?>
- <div id="qrcode"><img alt="QRcode image" src="data:image/jpg;base64,<?V qrimg ?>"/></div>
- <?vsp
- } ?>
- <div>
- This will check the WebID watermark in your X.509 Certificate.<br/><br/>
- This service supports WebIDs based on the following URI schemes (more to come):
- <ul>
- <li>* <b>acct</b>, e.g: <span style="font-size: 80%; color: #1DA237;">acct:ExampleUser at id.example.com</span></li>
- <li>* <b>http</b>, e.g: <span style="font-size: 80%; color: #1DA237;">http://id.example.com/person/ExampleUser#this</span></li>
- <li>* <b>ldap</b>, e.g: <span style="font-size: 80%; color: #1DA237;">ldap://ldap.example.com/o=An%20Example%5C2C%20Inc.,c=US</span></li>
- <li>* <b>mailto</b>, e.g: <span style="font-size: 80%; color: #1DA237;">mailto:ExampleUser at id.example.com</span></li>
- </ul>
- </div>
- <br/>
- <br/>
- <div>
- <form method="get">
- <input type="submit" name="go" value="Check"/>
- </form>
- </div>
- <?vsp
- if (length (webid) or length (error))
- {
- ?>
- <div>
- The return values are:
- <ul>
- <?vsp
- if (length (webid))
- {
- ?>
- <li>WebID - <?vsp http(sprintf('<a href="%s">%s</a>', DB.DBA.RDF_PROXY_ENTITY_IRI (rtrim (webid, '#this')), DB.DBA.RDF_PROXY_ENTITY_IRI (rtrim (webid, '#this')) )); ?></li>
- <li>Timestamp in ISO 8601 format - <?V get_keyword ('ts', params) ?></li>
- <?vsp
- }
- if (length (error))
- {
- ?>
- <li>Error - <?V error ?></li>
- <?vsp
- }
- ?>
- </ul>
- </div>
- <?vsp
- }
- ?>
- </body>
-</html>
diff --git a/appsrc/ODS-Framework/webid_select.vspx b/appsrc/ODS-Framework/webid_select.vspx
index 88f56b2..fd7e700 100644
--- a/appsrc/ODS-Framework/webid_select.vspx
+++ b/appsrc/ODS-Framework/webid_select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: webid_select.vspx,v 1.1.4.9 2012/03/08 10:46:19 source Exp $
+ - $Id: webid_select.vspx,v 1.1.4.8 2011/05/20 12:02:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/appsrc/ODS-Framework/webid_verify.vsp b/appsrc/ODS-Framework/webid_verify.vsp
index 68baacd..45064f0 100644
--- a/appsrc/ODS-Framework/webid_verify.vsp
+++ b/appsrc/ODS-Framework/webid_verify.vsp
@@ -1,14 +1,7 @@
<?vsp
- declare info, res, cb, mod, exp, webid, ret_url, cert, ctype, err, dummy, expiry_verify, vtype, md5, sha1, subj any;
+ declare info, res, cb, mod, exp, webid, ret_url, cert, ctype any;
cb := {?'callback'};
cert := {?'certificate'};
- err := '';
- dummy := null;
- if (not xenc_key_exists ('id_rsa'))
- {
- err := 'Must configure CA on this host.';
- goto html;
- }
if ((length (cb) = 0) or ((length (cert) = 0) and not is_http_ctx ()))
{
goto html;
@@ -18,43 +11,41 @@
{
cert := client_attr ('client_certificate');
ctype := 0;
- }
- else
- {
- if (strstr (cert, '-----BEGIN CERTIFICATE-----') is null)
+ } else {
+ if (strstr (cert, '-----BEGIN CERTIFICATE-----') is null)
cert := decode_base64 (cert);
else
ctype := 0;
}
- if ({?'expiration'} = 'true')
- expiry_verify := 1;
- else
- expiry_verify := 0;
-
if (strchr (cb, '?') is null)
cb := cb || '?';
else
cb := cb || '&';
mod := exp := '';
- md5 := ''; sha1 := ''; subj := '';
- if (not is_http_ctx () or cert = 0)
+ if (not is_http_ctx ())
res := 'noCert';
else
{
info := get_certificate_info (9, cert, ctype);
if (info is null)
res := 'noCert';
- else if (WEBID_AUTH_GEN_2 (cert, ctype, null, 1, 0, webid, dummy, expiry_verify, vtype))
- res := 'success';
+ else if (WEBID_AUTH_GEN (cert, ctype, null, 1, 0))
+ {
+ webid := FOAF_SSL_WEBID_GET (cert, ctype);
+ if (webid is null)
+ {
+ webid := FOAF_SSL_WEBFINGER (cert, 0, ctype);
+ if (webid is null)
+ webid := ODS..FINGERPOINT_WEBID_GET (cert, null, ctype);
+ }
+ res := 'success';
+ }
else
res := 'noVerified';
if (info is not null)
{
mod := info[1];
exp := bin2hex (info[2]);
- md5 := get_certificate_info (6, cert, ctype, null, 'md5');
- sha1 := get_certificate_info (6, cert, ctype, null, 'sha1');
- subj := get_certificate_info (2, cert, ctype);
}
}
if (res = 'success')
@@ -65,7 +56,7 @@
{
ret_url := sprintf ('%serror=%U', cb, res);
}
- ret_url := ret_url || sprintf ('&ts=%U&md5=%U&sha1=%U&subj=%U', date_iso8601 (now ()), md5, sha1, subj);
+ ret_url := ret_url || sprintf ('&ts=%U', date_iso8601 (now ()));
ret_url := ret_url || sprintf ('&signature=%U', xenc_dsig_sign (ret_url, 'id_rsa', xenc_get_key_algo ('id_rsa')));
http_status_set (302);
http_header (sprintf ('Location: %s\r\n', ret_url));
@@ -75,46 +66,11 @@ html:
<html>
<head>
<title>WebID Verification Service</title>
- <style type="text/css">
- body {
- background-color: white;
- color: black;
- font-size: 10pt;
- font-family: Verdana, Helvetica, sans-serif;
- }
- ul {
- font-family: Verdana, Helvetica, sans-serif;
- list-style-type: none;
- }
- #qrcode {
- float: right;
- clear: right;
- margin-right: 20px;
- }
- </style>
</head>
<body>
<h1>WebID Verification Service</h1>
- <div class="msg"><?V err ?></div>
- <?vsp declare qrimg, ua any;
- ua := http_request_header (lines, 'User-Agent');
- qrimg := ODS.ODS_API.qrcode (sprintf ('http://%{WSHost}s%s', http_path ()));
- if (qrimg is not null and strcasestr (ua, 'Mobile') is null) {
- ?>
- <div id="qrcode"><img alt="QRcode image" src="data:image/jpg;base64,<?V qrimg ?>"/></div>
- <?vsp
- } ?>
<div>
- This will send a redirection to the URL you have specified in the input, including a signed assertion by this service about your X.509 Certificate's WebID watermark.
- <br/>
- This service supports WebIDs based on the following URI schemes (more to come):
- <ul>
- <li>* <b>ldap</b>, for e.g: <span style="font-size: 80%; color: #1DA237;">ldap://ldap.example.com/o=An%20Example%5C2C%20Inc.,c=US</span></li>
- <li>* <b>http</b>, for e.g: <span style="font-size: 80%; color: #1DA237;">http://id.example.com/person/ExampleUser#this</span></li>
-
- <li>* <b>mailto</b>, for e.g: <span style="font-size: 80%; color: #1DA237;">mailto:ExampleUser at id.example.com</span></li>
- <li>* <b>acct</b>, for e.g: <span style="font-size: 80%; color: #1DA237;">acct:ExampleUser at id.example.com</span></li>
- </ul>
+This will send a redirection to the URL you have specified in the input, including a signed assertion by this service about your X.509 Certificate's WebID watermark. <br/>Also note this service supports ldap, http, mailto, acct scheme based WebIDs.
</div>
<br/>
<br/>
diff --git a/appsrc/ODS-Gallery/Makefile.am b/appsrc/ODS-Gallery/Makefile.am
index 64311b0..36d2ecb 100644
--- a/appsrc/ODS-Gallery/Makefile.am
+++ b/appsrc/ODS-Gallery/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -47,7 +47,6 @@ EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
sql/procedures/*.sql \
- vad_version \
www-root/*.vsp \
www-root/*.vspx \
www-root/css/*.css \
diff --git a/appsrc/ODS-Gallery/Makefile.in b/appsrc/ODS-Gallery/Makefile.in
index db5f0a3..10a3d10 100644
--- a/appsrc/ODS-Gallery/Makefile.in
+++ b/appsrc/ODS-Gallery/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -312,7 +310,6 @@ EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
sql/procedures/*.sql \
- vad_version \
www-root/*.vsp \
www-root/*.vspx \
www-root/css/*.css \
diff --git a/appsrc/ODS-Gallery/make_vad.sh b/appsrc/ODS-Gallery/make_vad.sh
index a9a268b..e7a86a4 100755
--- a/appsrc/ODS-Gallery/make_vad.sh
+++ b/appsrc/ODS-Gallery/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.22.2.12 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.22.2.10 2011/05/17 22:58:51 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -29,7 +29,7 @@ LC_ALL=POSIX
export LANG LC_ALL
LOGDIR=`pwd`
-VERSION="1.0.0"
+VERSION="0.3.59"
LOGFILE="${LOGDIR}/make_vad.log"
STICKER="make_vad.xml"
PACKDATE=`date +"%Y-%m-%d %H:%M"`
@@ -58,6 +58,21 @@ else
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
rm -rf vad
@@ -70,55 +85,14 @@ else
myrm=$RM
fi
-
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
-
-version_init()
+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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> 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
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
+ VERSION=`cat version.tmp | awk ' BEGIN { cnt=78 } { cnt = cnt + $1} END { printf "1.%02.02f", cnt/100 + 1}'`
rm -f version.tmp
- echo "$VERSION" > vad_version
- fi
}
virtuoso_start() {
@@ -251,7 +225,7 @@ sticker_init() {
echo " <name package=\"Gallery\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Gallery\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -426,7 +400,7 @@ echo '----------------------'
STOP_SERVER
directory_clean
-version_init
+VERSION_INIT
directory_init
virtuoso_init
sticker_init
@@ -434,6 +408,7 @@ vad_create
virtuoso_shutdown
STOP_SERVER
chmod 644 ods_gallery_dav.vad
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -443,7 +418,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Gallery/sql/create_tables.sql b/appsrc/ODS-Gallery/sql/create_tables.sql
index 07572d4..653e9dc 100644
--- a/appsrc/ODS-Gallery/sql/create_tables.sql
+++ b/appsrc/ODS-Gallery/sql/create_tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: create_tables.sql,v 1.9.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: create_tables.sql,v 1.9.2.1 2010/09/20 10:15:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/create_triggers.sql b/appsrc/ODS-Gallery/sql/create_triggers.sql
index b048146..a8baa67 100644
--- a/appsrc/ODS-Gallery/sql/create_triggers.sql
+++ b/appsrc/ODS-Gallery/sql/create_triggers.sql
@@ -1,10 +1,10 @@
--
--- $Id: create_triggers.sql,v 1.4.2.3 2012/03/08 10:46:20 source Exp $
+-- $Id: create_triggers.sql,v 1.4.2.2 2010/09/20 10:15:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/photo-wa-install.sql b/appsrc/ODS-Gallery/sql/photo-wa-install.sql
index 184ce26..54abba6 100644
--- a/appsrc/ODS-Gallery/sql/photo-wa-install.sql
+++ b/appsrc/ODS-Gallery/sql/photo-wa-install.sql
@@ -1,10 +1,10 @@
--
--- $Id: photo-wa-install.sql,v 1.16.2.4 2012/03/08 10:46:20 source Exp $
+-- $Id: photo-wa-install.sql,v 1.16.2.3 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql b/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql
index 367aeac..0cb4ecc 100644
--- a/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql
+++ b/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql
@@ -1,10 +1,10 @@
--
--- $Id: photo-wa-uninstall.sql,v 1.8.2.3 2012/03/08 10:46:20 source Exp $
+-- $Id: photo-wa-uninstall.sql,v 1.8.2.2 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/comments.sql b/appsrc/ODS-Gallery/sql/procedures/comments.sql
index 574bbb5..3953fe6 100644
--- a/appsrc/ODS-Gallery/sql/procedures/comments.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/comments.sql
@@ -1,10 +1,10 @@
--
--- $Id: comments.sql,v 1.10.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: comments.sql,v 1.10.2.1 2010/09/20 10:15:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/common.sql b/appsrc/ODS-Gallery/sql/procedures/common.sql
index b2e00f2..3753377 100644
--- a/appsrc/ODS-Gallery/sql/procedures/common.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/common.sql
@@ -1,10 +1,10 @@
--
--- $Id: common.sql,v 1.5.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: common.sql,v 1.5.2.1 2010/09/20 10:15:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/dav_api.sql b/appsrc/ODS-Gallery/sql/procedures/dav_api.sql
index ac84f8f..c9c1353 100644
--- a/appsrc/ODS-Gallery/sql/procedures/dav_api.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/dav_api.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_api.sql,v 1.13.2.4 2012/03/08 10:46:20 source Exp $
+-- $Id: dav_api.sql,v 1.13.2.3 2011/05/20 12:02:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql b/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql
index 2a1c074..b425a86 100644
--- a/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql
@@ -1,10 +1,10 @@
--
--- $Id: exec_no_error.sql,v 1.5.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: exec_no_error.sql,v 1.5.2.1 2010/09/20 10:15:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/images.sql b/appsrc/ODS-Gallery/sql/procedures/images.sql
index 0a4db34..d817496 100644
--- a/appsrc/ODS-Gallery/sql/procedures/images.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/images.sql
@@ -1,10 +1,10 @@
--
--- $Id: images.sql,v 1.9.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: images.sql,v 1.9.2.1 2010/09/20 10:15:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/nntp.sql b/appsrc/ODS-Gallery/sql/procedures/nntp.sql
index 5c9360c..cf341b3 100644
--- a/appsrc/ODS-Gallery/sql/procedures/nntp.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/nntp.sql
@@ -1,10 +1,10 @@
--
--- $Id: nntp.sql,v 1.2.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: nntp.sql,v 1.2.2.1 2010/09/20 10:15:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/photo_api.sql b/appsrc/ODS-Gallery/sql/procedures/photo_api.sql
index 59a902e..73f992f 100644
--- a/appsrc/ODS-Gallery/sql/procedures/photo_api.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/photo_api.sql
@@ -1,10 +1,10 @@
--
--- $Id: photo_api.sql,v 1.4.2.5 2012/03/08 10:46:20 source Exp $
+-- $Id: photo_api.sql,v 1.4.2.4 2011/05/17 22:58:51 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/procedures.sql b/appsrc/ODS-Gallery/sql/procedures/procedures.sql
index fe1fa28..c92acc7 100644
--- a/appsrc/ODS-Gallery/sql/procedures/procedures.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/procedures.sql
@@ -1,10 +1,10 @@
--
--- $Id: procedures.sql,v 1.14.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: procedures.sql,v 1.14.2.1 2010/09/20 10:15:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/rss.sql b/appsrc/ODS-Gallery/sql/procedures/rss.sql
index f272f20..df9dd69 100644
--- a/appsrc/ODS-Gallery/sql/procedures/rss.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/rss.sql
@@ -1,10 +1,10 @@
--
--- $Id: rss.sql,v 1.3.2.5 2012/03/08 10:46:20 source Exp $
+-- $Id: rss.sql,v 1.3.2.4 2011/05/20 12:02:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/sioc.sql b/appsrc/ODS-Gallery/sql/procedures/sioc.sql
index eed5d17..2a1eef6 100644
--- a/appsrc/ODS-Gallery/sql/procedures/sioc.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/sioc.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc.sql,v 1.19.2.7 2012/03/08 10:46:20 source Exp $
+-- $Id: sioc.sql,v 1.19.2.6 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/sql/procedures/types.sql b/appsrc/ODS-Gallery/sql/procedures/types.sql
index 1bd7a4b..98ba241 100644
--- a/appsrc/ODS-Gallery/sql/procedures/types.sql
+++ b/appsrc/ODS-Gallery/sql/procedures/types.sql
@@ -1,10 +1,10 @@
--
--- $Id: types.sql,v 1.8.2.3 2012/03/08 10:46:20 source Exp $
+-- $Id: types.sql,v 1.8.2.2 2010/09/20 10:15:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/vad_version b/appsrc/ODS-Gallery/vad_version
deleted file mode 100644
index 0604715..0000000
--- a/appsrc/ODS-Gallery/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.10.65
diff --git a/appsrc/ODS-Gallery/www-root/css/gallery.css b/appsrc/ODS-Gallery/www-root/css/gallery.css
index e9afdb9..93ba432 100644
--- a/appsrc/ODS-Gallery/www-root/css/gallery.css
+++ b/appsrc/ODS-Gallery/www-root/css/gallery.css
@@ -1,10 +1,10 @@
/*
- * $Id: gallery.css,v 1.13.2.2 2012/03/08 10:46:20 source Exp $
+ * $Id: gallery.css,v 1.13.2.1 2010/09/20 10:15:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/css/timeline.css b/appsrc/ODS-Gallery/www-root/css/timeline.css
index 683b897..c105a20 100644
--- a/appsrc/ODS-Gallery/www-root/css/timeline.css
+++ b/appsrc/ODS-Gallery/www-root/css/timeline.css
@@ -1,9 +1,9 @@
/*
- * $Id: timeline.css,v 1.2.2.2 2012/03/08 10:46:20 source Exp $
+ * $Id: timeline.css,v 1.2.2.1 2010/09/20 10:15:38 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2007 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/appsrc/ODS-Gallery/www-root/css/upload.css b/appsrc/ODS-Gallery/www-root/css/upload.css
index 9dbb4c0..f9c099e 100644
--- a/appsrc/ODS-Gallery/www-root/css/upload.css
+++ b/appsrc/ODS-Gallery/www-root/css/upload.css
@@ -1,10 +1,10 @@
/*
- * $Id: upload.css,v 1.2.2.2 2012/03/08 10:46:20 source Exp $
+ * $Id: upload.css,v 1.2.2.1 2010/09/20 10:15:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/image.vsp b/appsrc/ODS-Gallery/www-root/image.vsp
index 19a0e6f..bae7120 100644
--- a/appsrc/ODS-Gallery/www-root/image.vsp
+++ b/appsrc/ODS-Gallery/www-root/image.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: image.vsp,v 1.5.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: image.vsp,v 1.5.2.1 2010/09/20 10:15:38 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/index.vspx b/appsrc/ODS-Gallery/www-root/index.vspx
index 788b428..21ac1d3 100644
--- a/appsrc/ODS-Gallery/www-root/index.vspx
+++ b/appsrc/ODS-Gallery/www-root/index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: index.vspx,v 1.4.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: index.vspx,v 1.4.2.1 2010/09/20 10:15:38 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/js/calendar.js b/appsrc/ODS-Gallery/www-root/js/calendar.js
index cd42edf..7d991fa 100644
--- a/appsrc/ODS-Gallery/www-root/js/calendar.js
+++ b/appsrc/ODS-Gallery/www-root/js/calendar.js
@@ -1,10 +1,10 @@
/*
- * $Id: calendar.js,v 1.1.2.4 2012/03/08 10:46:20 source Exp $
+ * $Id: calendar.js,v 1.1.2.3 2010/09/20 10:15:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/js/dataset.js b/appsrc/ODS-Gallery/www-root/js/dataset.js
index 99d6d8d..a41e1e3 100644
--- a/appsrc/ODS-Gallery/www-root/js/dataset.js
+++ b/appsrc/ODS-Gallery/www-root/js/dataset.js
@@ -1,10 +1,10 @@
/*
- * $Id: dataset.js,v 1.6.2.2 2012/03/08 10:46:20 source Exp $
+ * $Id: dataset.js,v 1.6.2.1 2010/09/20 10:15:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/js/gallery.js b/appsrc/ODS-Gallery/www-root/js/gallery.js
index 3ba8f68..e053c4f 100644
--- a/appsrc/ODS-Gallery/www-root/js/gallery.js
+++ b/appsrc/ODS-Gallery/www-root/js/gallery.js
@@ -1,10 +1,10 @@
/*
- * $Id: gallery.js,v 1.23.2.4 2012/03/08 10:46:20 source Exp $
+ * $Id: gallery.js,v 1.23.2.3 2010/09/20 10:15:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/js/map.js b/appsrc/ODS-Gallery/www-root/js/map.js
index 73e8e68..133cc23 100644
--- a/appsrc/ODS-Gallery/www-root/js/map.js
+++ b/appsrc/ODS-Gallery/www-root/js/map.js
@@ -1,10 +1,10 @@
/*
- * $Id: map.js,v 1.3.2.3 2012/03/08 10:46:20 source Exp $
+ * $Id: map.js,v 1.3.2.2 2010/09/20 10:15:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/js/ui.js b/appsrc/ODS-Gallery/www-root/js/ui.js
index d7032af..62d3897 100644
--- a/appsrc/ODS-Gallery/www-root/js/ui.js
+++ b/appsrc/ODS-Gallery/www-root/js/ui.js
@@ -1,10 +1,10 @@
/*
- * $Id: ui.js,v 1.10.2.2 2012/03/08 10:46:20 source Exp $
+ * $Id: ui.js,v 1.10.2.1 2010/09/20 10:15:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/portal/index.vsp b/appsrc/ODS-Gallery/www-root/portal/index.vsp
index f24c760..fea776d 100644
--- a/appsrc/ODS-Gallery/www-root/portal/index.vsp
+++ b/appsrc/ODS-Gallery/www-root/portal/index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index.vsp,v 1.19.2.5 2012/03/08 11:41:23 source Exp $
+-- $Id: index.vsp,v 1.19.2.3 2011/05/20 12:02:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -174,7 +174,7 @@
http(sprintf('<aplus>%d</aplus>',DB.DBA.WA_USER_APP_ENABLE (current_instance.owner_id)),_xml);
http(sprintf('<instance>%U</instance>', current_instance.name),_xml);
http(sprintf('<home_url>%s</home_url>',current_instance.home_url),_xml);
- http (sprintf ('<wa_home_title>%V</wa_home_title>', wa_home_title), _xml);
+ http(sprintf('<wa_home_title>%s</wa_home_title>',wa_home_title),_xml);
http(sprintf('<wa_home_link>%s</wa_home_link>',wa_home_link),_xml);
http(sprintf('<gallery_id>%d</gallery_id>',current_instance.gallery_id),_xml);
http(sprintf('<instance_owner>%s</instance_owner>',current_instance.owner_name),_xml);
diff --git a/appsrc/ODS-Gallery/www-root/proxy.vsp b/appsrc/ODS-Gallery/www-root/proxy.vsp
index cca47ea..e9d5c4d 100644
--- a/appsrc/ODS-Gallery/www-root/proxy.vsp
+++ b/appsrc/ODS-Gallery/www-root/proxy.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: proxy.vsp,v 1.4.2.2 2012/03/08 10:46:20 source Exp $
+-- $Id: proxy.vsp,v 1.4.2.1 2010/09/20 10:15:38 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/www-root/upload.vspx b/appsrc/ODS-Gallery/www-root/upload.vspx
index 9b46de9..bc28029 100644
--- a/appsrc/ODS-Gallery/www-root/upload.vspx
+++ b/appsrc/ODS-Gallery/www-root/upload.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: upload.vspx,v 1.9.2.3 2012/03/08 10:46:20 source Exp $
+ - $Id: upload.vspx,v 1.9.2.2 2010/09/20 10:15:38 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/index.xsl b/appsrc/ODS-Gallery/xslt/index.xsl
index 2a7bcb1..5372471 100644
--- a/appsrc/ODS-Gallery/xslt/index.xsl
+++ b/appsrc/ODS-Gallery/xslt/index.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: index.xsl,v 1.20.2.4 2012/03/08 10:46:20 source Exp $
+ - $Id: index.xsl,v 1.20.2.3 2010/09/20 10:15:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/rss11.xsl b/appsrc/ODS-Gallery/xslt/rss11.xsl
index f0b732c..001b1cb 100644
--- a/appsrc/ODS-Gallery/xslt/rss11.xsl
+++ b/appsrc/ODS-Gallery/xslt/rss11.xsl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2atom.xsl b/appsrc/ODS-Gallery/xslt/rss2atom.xsl
index ba11e62..bb2537d 100644
--- a/appsrc/ODS-Gallery/xslt/rss2atom.xsl
+++ b/appsrc/ODS-Gallery/xslt/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.3.2.3 2012/03/08 10:46:20 source Exp $
+ - $Id: rss2atom.xsl,v 1.3.2.2 2010/09/20 10:15:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2atom03.xsl b/appsrc/ODS-Gallery/xslt/rss2atom03.xsl
index 85c2a67..831f2e6 100644
--- a/appsrc/ODS-Gallery/xslt/rss2atom03.xsl
+++ b/appsrc/ODS-Gallery/xslt/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.2.2.3 2012/03/08 10:46:20 source Exp $
+ - $Id: rss2atom03.xsl,v 1.2.2.2 2010/09/20 10:15:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2mrss.xsl b/appsrc/ODS-Gallery/xslt/rss2mrss.xsl
index 7e1b96f..b47f42b 100644
--- a/appsrc/ODS-Gallery/xslt/rss2mrss.xsl
+++ b/appsrc/ODS-Gallery/xslt/rss2mrss.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2mrss.xsl,v 1.2.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: rss2mrss.xsl,v 1.2.2.1 2010/09/20 10:15:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2rdf.xsl b/appsrc/ODS-Gallery/xslt/rss2rdf.xsl
index 8c66cf7..217b089 100644
--- a/appsrc/ODS-Gallery/xslt/rss2rdf.xsl
+++ b/appsrc/ODS-Gallery/xslt/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.2.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: rss2rdf.xsl,v 1.2.2.1 2010/09/20 10:15:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2wml.xsl b/appsrc/ODS-Gallery/xslt/rss2wml.xsl
index 28ae8fb..865d718 100644
--- a/appsrc/ODS-Gallery/xslt/rss2wml.xsl
+++ b/appsrc/ODS-Gallery/xslt/rss2wml.xsl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/rss2xbel.xsl b/appsrc/ODS-Gallery/xslt/rss2xbel.xsl
index 15744aa..854bfd2 100644
--- a/appsrc/ODS-Gallery/xslt/rss2xbel.xsl
+++ b/appsrc/ODS-Gallery/xslt/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2.2.1 2010/09/20 10:15:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/upload.xsl b/appsrc/ODS-Gallery/xslt/upload.xsl
index da5d4d3..6c7b72a 100644
--- a/appsrc/ODS-Gallery/xslt/upload.xsl
+++ b/appsrc/ODS-Gallery/xslt/upload.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: upload.xsl,v 1.3.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: upload.xsl,v 1.3.2.1 2010/09/20 10:15:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Gallery/xslt/wsdl2js.xsl b/appsrc/ODS-Gallery/xslt/wsdl2js.xsl
index dd4a361..6cada8a 100644
--- a/appsrc/ODS-Gallery/xslt/wsdl2js.xsl
+++ b/appsrc/ODS-Gallery/xslt/wsdl2js.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: wsdl2js.xsl,v 1.3.2.2 2012/03/08 10:46:20 source Exp $
+ - $Id: wsdl2js.xsl,v 1.3.2.1 2010/09/20 10:15:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/Makefile.am b/appsrc/ODS-Polls/Makefile.am
index 6266ee0..7c68d2e 100644
--- a/appsrc/ODS-Polls/Makefile.am
+++ b/appsrc/ODS-Polls/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -46,7 +46,6 @@ clean-local:
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Polls/Makefile.in b/appsrc/ODS-Polls/Makefile.in
index 9e8ecf1..76ce073 100644
--- a/appsrc/ODS-Polls/Makefile.in
+++ b/appsrc/ODS-Polls/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -311,7 +309,6 @@ CLEANFILES = \
EXTRA_DIST = \
make_vad.sh \
sql/*.sql \
- vad_version \
www/*.vsp \
www/*.vspx \
www/css/*.css \
diff --git a/appsrc/ODS-Polls/make_vad.sh b/appsrc/ODS-Polls/make_vad.sh
index 00e008e..a860ea7 100755
--- a/appsrc/ODS-Polls/make_vad.sh
+++ b/appsrc/ODS-Polls/make_vad.sh
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -28,7 +28,7 @@ export LANG LC_ALL
MODE=$1
LOGDIR=`pwd`
-VERSION="1.0.0"
+VERSION="1.1.37"
LOGFILE="${LOGDIR}/vad_make.log"
STICKER_DAV="vad_dav.xml"
STICKER_FS="vad_filesystem.xml"
@@ -62,6 +62,22 @@ else
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
+
rm -rf vad
. $HOME/binsrc/tests/suite/test_fn.sh
@@ -73,57 +89,6 @@ else
myrm=$RM
fi
-
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
- done
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
- rm -f version.tmp
- echo "$VERSION" > vad_version
-fi
-}
-
virtuoso_start() {
echo "Starting $SERVER"
echo $BUILD
@@ -259,7 +224,7 @@ sticker_init() {
echo " <name package=\"Polls\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Polls Manager\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -271,8 +236,8 @@ sticker_init() {
echo "<dependencies>" >> $STICKER
echo " <require>" >> $STICKER
echo " <name package=\"Framework\"/>" >> $STICKER
- echo " <versions_later package=\"1.85.05\">" >> $STICKER
- echo " <prop name=\"Date\" value=\"2011-12-29 12:00\" />" >> $STICKER
+ echo " <versions_later package=\"1.82.42\">" >> $STICKER
+ echo " <prop name=\"Date\" value=\"2011-06-15 12:00\" />" >> $STICKER
echo " <prop name=\"Comment\" value=\"An incompatible version of the ODS Framework\" />" >> $STICKER
echo " </versions_later>" >> $STICKER
echo " </require>" >> $STICKER
@@ -400,7 +365,6 @@ echo '----------------------'
STOP_SERVER
directory_clean
-version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -417,6 +381,7 @@ virtuoso_shutdown
STOP_SERVER
chmod 644 ods_polls_dav.vad
chmod 644 ods_polls_filesystem.vad
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -426,7 +391,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Polls/sql/polls-a-api.sql b/appsrc/ODS-Polls/sql/polls-a-api.sql
index b3f6231..47efcd3 100644
--- a/appsrc/ODS-Polls/sql/polls-a-api.sql
+++ b/appsrc/ODS-Polls/sql/polls-a-api.sql
@@ -1,10 +1,10 @@
--
--- $Id: polls-a-api.sql,v 1.8.2.6 2012/03/08 10:46:20 source Exp $
+-- $Id: polls-a-api.sql,v 1.8.2.5 2011/06/09 17:43:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Polls/sql/polls-a-code.sql b/appsrc/ODS-Polls/sql/polls-a-code.sql
index c0d2f4d..df768f3 100644
--- a/appsrc/ODS-Polls/sql/polls-a-code.sql
+++ b/appsrc/ODS-Polls/sql/polls-a-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: polls-a-code.sql,v 1.20.2.18 2012/03/08 11:44:22 source Exp $
+-- $Id: polls-a-code.sql,v 1.20.2.16 2011/05/17 23:00:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -2158,10 +2158,9 @@ create procedure POLLS.WA.dt_iso8601 (
create procedure POLLS.WA.test_clear (
in S any)
{
- S := substring (S, 1, coalesce (strstr (S, '<>'), length (S)));
- S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S)));
+ declare N integer;
- return S;
+ return substring(S, 1, coalesce(strstr(S, '<>'), length(S)));
}
;
@@ -2306,7 +2305,7 @@ create procedure POLLS.WA.validate2 (
if (isnull(regexp_match('^[^\\\/\?\*\"\'\>\<\:\|]*\$', propertyValue)))
goto _error;
} else if ((propertyType = 'uri') or (propertyType = 'anyuri')) {
- if (isnull (regexp_match ('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:~]*)?\$', propertyValue)))
+ if (isnull(regexp_match('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:]*)?\$', propertyValue)))
goto _error;
} else if (propertyType = 'email') {
if (isnull(regexp_match('^([a-zA-Z0-9_\-])+(\.([a-zA-Z0-9_\-])+)*@((\[(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5]))\]))|((([a-zA-Z0-9])+(([\-])+([a-zA-Z0-9])+)*\.)+([a-zA-Z])+(([\-])+([a-zA-Z0-9])+)*))\$', propertyValue)))
diff --git a/appsrc/ODS-Polls/sql/polls-a-table.sql b/appsrc/ODS-Polls/sql/polls-a-table.sql
index d84a9f0..41fb4a8 100644
--- a/appsrc/ODS-Polls/sql/polls-a-table.sql
+++ b/appsrc/ODS-Polls/sql/polls-a-table.sql
@@ -1,10 +1,10 @@
--
--- $Id: polls-a-table.sql,v 1.5.2.3 2012/03/08 10:46:21 source Exp $
+-- $Id: polls-a-table.sql,v 1.5.2.2 2010/09/22 13:57:04 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/sql/polls-a-wa.sql b/appsrc/ODS-Polls/sql/polls-a-wa.sql
index 4a5ffc2..da1713e 100644
--- a/appsrc/ODS-Polls/sql/polls-a-wa.sql
+++ b/appsrc/ODS-Polls/sql/polls-a-wa.sql
@@ -1,10 +1,10 @@
--
--- $Id: polls-a-wa.sql,v 1.3.2.5 2012/03/08 10:46:21 source Exp $
+-- $Id: polls-a-wa.sql,v 1.3.2.4 2010/09/22 13:57:04 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/sql/polls-d.sql b/appsrc/ODS-Polls/sql/polls-d.sql
index 378616e..216c2dc 100644
--- a/appsrc/ODS-Polls/sql/polls-d.sql
+++ b/appsrc/ODS-Polls/sql/polls-d.sql
@@ -1,10 +1,10 @@
--
--- $Id: polls-d.sql,v 1.6.2.5 2012/03/08 10:46:21 source Exp $
+-- $Id: polls-d.sql,v 1.6.2.4 2011/05/18 21:18:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/sql/sioc_polls.sql b/appsrc/ODS-Polls/sql/sioc_polls.sql
index 1511593..d3584d8 100644
--- a/appsrc/ODS-Polls/sql/sioc_polls.sql
+++ b/appsrc/ODS-Polls/sql/sioc_polls.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_polls.sql,v 1.9.2.12 2012/03/08 11:44:22 source Exp $
+-- $Id: sioc_polls.sql,v 1.9.2.10 2011/05/20 16:24:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -58,20 +58,16 @@ create procedure poll_comment_iri (
-------------------------------------------------------------------------------
--
-create procedure fill_ods_polls_sioc (
- in graph_iri varchar,
- in site_iri varchar,
- in _wai_name varchar := null)
+create procedure fill_ods_polls_sioc (in graph_iri varchar, in site_iri varchar, in _wai_name varchar := null)
{
declare id, deadl, cnt integer;
- declare acl_graph_iri, c_iri, creator_iri varchar;
+ declare c_iri, creator_iri varchar;
{
-- init services
SIOC..fill_ods_polls_services ();
for (select WAI_ID,
- WAI_IS_PUBLIC,
WAI_TYPE_NAME,
WAI_NAME,
WAI_ACL
@@ -79,9 +75,9 @@ create procedure fill_ods_polls_sioc (
where ((_wai_name is null) or (WAI_NAME = _wai_name))
and WAI_TYPE_NAME = 'Polls') do
{
- acl_graph_iri := SIOC..acl_graph (WAI_TYPE_NAME, WAI_NAME);
- exec (sprintf ('sparql clear graph <%s>', acl_graph_iri));
- SIOC..wa_instance_acl_insert (WAI_IS_PUBLIC, WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
+ graph_iri := SIOC..acl_graph (WAI_TYPE_NAME, WAI_NAME);
+ exec (sprintf ('sparql clear graph <%s>', graph_iri));
+ SIOC..wa_instance_acl_insert (WAI_TYPE_NAME, WAI_NAME, WAI_ACL);
for (select P_DOMAIN_ID, P_ID, P_ACL
from POLLS.WA.POLL
where P_DOMAIN_ID = WAI_ID and P_ACL is not null) do
diff --git a/appsrc/ODS-Polls/vad_version b/appsrc/ODS-Polls/vad_version
deleted file mode 100644
index a7ccabd..0000000
--- a/appsrc/ODS-Polls/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.5.20
diff --git a/appsrc/ODS-Polls/www/ajax.vsp b/appsrc/ODS-Polls/www/ajax.vsp
index 762d02e..5a53ec9 100644
--- a/appsrc/ODS-Polls/www/ajax.vsp
+++ b/appsrc/ODS-Polls/www/ajax.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ajax.vsp,v 1.1.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: ajax.vsp,v 1.1.2.1 2010/09/20 10:15:40 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/appsrc/ODS-Polls/www/conversation.vspx b/appsrc/ODS-Polls/www/conversation.vspx
index 7c60dfa..5352898 100644
--- a/appsrc/ODS-Polls/www/conversation.vspx
+++ b/appsrc/ODS-Polls/www/conversation.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: conversation.vspx,v 1.3.2.4 2012/03/08 10:46:21 source Exp $
+ - $Id: conversation.vspx,v 1.3.2.3 2011/05/02 14:16:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Polls/www/css/style.css b/appsrc/ODS-Polls/www/css/style.css
index 08eb69d..d75a0f8 100644
--- a/appsrc/ODS-Polls/www/css/style.css
+++ b/appsrc/ODS-Polls/www/css/style.css
@@ -1,10 +1,10 @@
/*
- * $Id: style.css,v 1.8.2.11 2012/03/08 11:44:22 source Exp $
+ * $Id: style.css,v 1.8.2.9 2011/05/17 23:00:37 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -27,23 +27,11 @@ body {
font-size: 9pt;
}
-pre {
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
form {
margin: 0;
padding: 0;
}
-abbr {
- border: none;
-}
-
a {
text-decoration: none;
}
@@ -82,6 +70,43 @@ a:hover {
vertical-align: top;
}
+/* Footer */
+#FT {
+ width: 100%;
+ position: relative;
+ bottom: 0px;
+ font-size: 8pt;
+ float: left;
+ clear: both;
+ text-align: right;
+ border-top: 2px solid #fff;
+ margin-right: 10px;
+ background-color: #fff;
+ background-image: url(../image/ods_main_footer.png);
+}
+
+#FT_L {
+ float: left;
+ clear: left;
+ margin-top: 10px;
+ margin-left: 8px;
+ border: 1px solid #788;
+}
+
+#FT_R {
+ float: right;
+ clear: right;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ margin-right: 5px;
+ color: #788;
+}
+
+#FT_R a {
+ text-decoration: none;
+ color: inherit;
+}
+
/* Left side within MT */
.page_head {
width: 100%;
diff --git a/appsrc/ODS-Polls/www/error.vspx b/appsrc/ODS-Polls/www/error.vspx
index 9e56f00..bac2697 100644
--- a/appsrc/ODS-Polls/www/error.vspx
+++ b/appsrc/ODS-Polls/www/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: error.vspx,v 1.2.2.1 2010/09/20 10:15:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/www/export.vspx b/appsrc/ODS-Polls/www/export.vspx
index 09a9d31..9e6ff99 100644
--- a/appsrc/ODS-Polls/www/export.vspx
+++ b/appsrc/ODS-Polls/www/export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: export.vspx,v 1.4.2.5 2012/03/08 10:46:21 source Exp $
+ - $Id: export.vspx,v 1.4.2.4 2010/10/07 13:22:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/www/gems.vsp b/appsrc/ODS-Polls/www/gems.vsp
index b487894..40f55f2 100644
--- a/appsrc/ODS-Polls/www/gems.vsp
+++ b/appsrc/ODS-Polls/www/gems.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: gems.vsp,v 1.1.2.4 2012/03/08 10:46:21 source Exp $
+-- $Id: gems.vsp,v 1.1.2.3 2010/10/07 13:22:06 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-Polls/www/image/c.gif b/appsrc/ODS-Polls/www/image/c.gif
deleted file mode 100644
index 35d42e8..0000000
Binary files a/appsrc/ODS-Polls/www/image/c.gif and /dev/null differ
diff --git a/appsrc/ODS-Polls/www/js/polls.js b/appsrc/ODS-Polls/www/js/polls.js
index 3bbee00..787dcec 100644
--- a/appsrc/ODS-Polls/www/js/polls.js
+++ b/appsrc/ODS-Polls/www/js/polls.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -754,10 +754,14 @@ POLLS.trim = function(sString, sChar) {
POLLS.aboutDialog = function() {
var aboutDiv = $('aboutDiv');
- if (aboutDiv)
+ if (aboutDiv) {
OAT.Dom.unlink(aboutDiv);
-
- aboutDiv = OAT.Dom.create('div', {height: '160px', overflow: 'hidden'});
+ }
+ aboutDiv = OAT.Dom.create('div', {
+ width:'430px',
+ height: '170px',
+ overflow: 'hidden'
+ });
aboutDiv.id = 'aboutDiv';
aboutDialog = new OAT.Dialog('About ODS Polls', aboutDiv, {width: 445, buttons: 0, resize: 0, modal: 1});
aboutDialog.cancel = aboutDialog.hide;
diff --git a/appsrc/ODS-Polls/www/polls.vspx b/appsrc/ODS-Polls/www/polls.vspx
index d362630..a33dd04 100644
--- a/appsrc/ODS-Polls/www/polls.vspx
+++ b/appsrc/ODS-Polls/www/polls.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: polls.vspx,v 1.18.2.9 2012/03/08 10:46:21 source Exp $
+ - $Id: polls.vspx,v 1.18.2.8 2011/07/04 10:04:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/www/polls_login.vspx b/appsrc/ODS-Polls/www/polls_login.vspx
index 9ba4341..12d6215 100644
--- a/appsrc/ODS-Polls/www/polls_login.vspx
+++ b/appsrc/ODS-Polls/www/polls_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: polls_login.vspx,v 1.2.2.4 2012/03/08 10:46:21 source Exp $
+ - $Id: polls_login.vspx,v 1.2.2.3 2010/10/07 13:22:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/www/search.vspx b/appsrc/ODS-Polls/www/search.vspx
index 4d90608..0b0a397 100644
--- a/appsrc/ODS-Polls/www/search.vspx
+++ b/appsrc/ODS-Polls/www/search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.vspx,v 1.12.2.9 2012/03/08 10:46:21 source Exp $
+ - $Id: search.vspx,v 1.12.2.8 2011/05/02 14:16:31 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/www/settings.vspx b/appsrc/ODS-Polls/www/settings.vspx
index 3d94735..b93450f 100644
--- a/appsrc/ODS-Polls/www/settings.vspx
+++ b/appsrc/ODS-Polls/www/settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: settings.vspx,v 1.6.2.7 2012/03/08 11:44:22 source Exp $
+ - $Id: settings.vspx,v 1.6.2.5 2010/10/13 12:15:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -215,7 +215,7 @@
]]>
</v:on-post>
</v:button>
- <v:button action="simple" value="Clear" xhtml_onclick="javascript: return confirm (\'Do you want to reset settings to default?\');" xhtml_class="form-button">
+ <v:button action="simple" value="Clear" xhtml_class="form-button">
<v:on-post>
<![CDATA[
delete from POLLS.WA.SETTINGS where S_DOMAIN_ID = self.domain_id;
diff --git a/appsrc/ODS-Polls/www/tags.vspx b/appsrc/ODS-Polls/www/tags.vspx
index 31144d0..c5d2a6b 100644
--- a/appsrc/ODS-Polls/www/tags.vspx
+++ b/appsrc/ODS-Polls/www/tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tags.vspx,v 1.2.2.3 2012/03/08 10:46:21 source Exp $
+ - $Id: tags.vspx,v 1.2.2.2 2010/09/20 10:15:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/www/template/popup.vspx b/appsrc/ODS-Polls/www/template/popup.vspx
index a670974..05ff91d 100644
--- a/appsrc/ODS-Polls/www/template/popup.vspx
+++ b/appsrc/ODS-Polls/www/template/popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: popup.vspx,v 1.4.2.9 2012/03/08 10:46:21 source Exp $
+ - $Id: popup.vspx,v 1.4.2.8 2011/07/04 10:04:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/www/template/template.vspx b/appsrc/ODS-Polls/www/template/template.vspx
index f81a267..de710e7 100644
--- a/appsrc/ODS-Polls/www/template/template.vspx
+++ b/appsrc/ODS-Polls/www/template/template.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.vspx,v 1.17.2.14 2012/03/08 11:44:22 source Exp $
+ - $Id: template.vspx,v 1.17.2.12 2011/07/04 10:04:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -68,6 +68,7 @@
/* load stylesheets */
OAT.Style.include("grid.css");
OAT.Style.include("webdav.css");
+ OAT.Style.include("winms.css");
var featureList=["ajax", "json", "anchor", "dialog", "barchart", "piechart", "calendar"];
OAT.Loader.load(featureList);
diff --git a/appsrc/ODS-Polls/www/template/template.xsl b/appsrc/ODS-Polls/www/template/template.xsl
index 1e6a76b..1056d90 100644
--- a/appsrc/ODS-Polls/www/template/template.xsl
+++ b/appsrc/ODS-Polls/www/template/template.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: template.xsl,v 1.15.2.8 2012/03/08 10:46:21 source Exp $
+ - $Id: template.xsl,v 1.15.2.7 2011/05/02 14:16:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/xslt/rss2atom.xsl b/appsrc/ODS-Polls/xslt/rss2atom.xsl
index 4e1803f..d23445d 100644
--- a/appsrc/ODS-Polls/xslt/rss2atom.xsl
+++ b/appsrc/ODS-Polls/xslt/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.2.2.3 2012/03/08 10:46:21 source Exp $
+ - $Id: rss2atom.xsl,v 1.2.2.2 2010/09/20 10:15:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/xslt/rss2atom03.xsl b/appsrc/ODS-Polls/xslt/rss2atom03.xsl
index dd53d5b..8dfd327 100644
--- a/appsrc/ODS-Polls/xslt/rss2atom03.xsl
+++ b/appsrc/ODS-Polls/xslt/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: rss2atom03.xsl,v 1.2.2.1 2010/09/20 10:15:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/xslt/rss2rdf.xsl b/appsrc/ODS-Polls/xslt/rss2rdf.xsl
index f55bf84..1620653 100644
--- a/appsrc/ODS-Polls/xslt/rss2rdf.xsl
+++ b/appsrc/ODS-Polls/xslt/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: rss2rdf.xsl,v 1.2.2.1 2010/09/20 10:15:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Polls/xslt/rss2xbel.xsl b/appsrc/ODS-Polls/xslt/rss2xbel.xsl
index a265cb5..408ccf1 100644
--- a/appsrc/ODS-Polls/xslt/rss2xbel.xsl
+++ b/appsrc/ODS-Polls/xslt/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.1.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: rss2xbel.xsl,v 1.1.2.1 2010/09/20 10:15:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/Makefile.am b/appsrc/ODS-WebMail/Makefile.am
index 40a5649..607b6d4 100644
--- a/appsrc/ODS-WebMail/Makefile.am
+++ b/appsrc/ODS-WebMail/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -49,7 +49,6 @@ EXTRA_DIST = \
sql/eml/*.sql \
sql/res/*.sql \
sql/utl/*.sql \
- vad_version \
www-root/*.vsp \
www-root/mail/i/*.gif \
www-root/mail/i/*.jpg \
diff --git a/appsrc/ODS-WebMail/Makefile.in b/appsrc/ODS-WebMail/Makefile.in
index 424fcb8..771ffc8 100644
--- a/appsrc/ODS-WebMail/Makefile.in
+++ b/appsrc/ODS-WebMail/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -314,7 +312,6 @@ EXTRA_DIST = \
sql/eml/*.sql \
sql/res/*.sql \
sql/utl/*.sql \
- vad_version \
www-root/*.vsp \
www-root/mail/i/*.gif \
www-root/mail/i/*.jpg \
diff --git a/appsrc/ODS-WebMail/install/odbc_mail.ini b/appsrc/ODS-WebMail/install/odbc_mail.ini
index 9ff46e2..1231fbd 100644
--- a/appsrc/ODS-WebMail/install/odbc_mail.ini
+++ b/appsrc/ODS-WebMail/install/odbc_mail.ini
@@ -3,7 +3,7 @@
;
; Configuration file for the ODBC Mail Delivery Agent
;
-; Copyright (C) 1998-2012 OpenLink Software.
+; (C)Copyright 2002 OpenLink Software.
;
; To learn more about this product, or any other product in our
; portfolio, please check out our web site at:
diff --git a/appsrc/ODS-WebMail/make_vad.sh b/appsrc/ODS-WebMail/make_vad.sh
index c25f51f..7f30865 100755
--- a/appsrc/ODS-WebMail/make_vad.sh
+++ b/appsrc/ODS-WebMail/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.34.2.31 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.34.2.29 2011/08/01 14:13:35 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -63,6 +63,11 @@ else
LN="ln -fs"
RM="rm -f"
fi
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
if [ "z$SERVER" = "z" ]
then
@@ -85,56 +90,6 @@ else
myrm=$RM
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-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/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
- done
- LANG=POSIX
- export LANG
-
- BASE="0"
-# echo $BASE
- if [ -f version.base ] ; then
- BASE=`cat version.base`
- fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
- VERSION=`expr $BASE + $VERSION`
- CURR_VERSION=$VERSION
- if [ -f version.curr ] ; then
- CURR_VERSION=`cat version.curr`
- fi
- if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
- echo $BASE > version.base
- VERSION=$CURR_VERSION
- fi
- echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
- rm -f version.tmp
- echo "$VERSION" > vad_version
- fi
-}
-
virtuoso_start() {
echo "Starting $SERVER"
echo $BUILD
@@ -270,7 +225,7 @@ sticker_init() {
echo " <name package=\"Mail\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Mail\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -430,7 +385,6 @@ echo '----------------------'
STOP_SERVER
directory_clean
-version_init
directory_init
virtuoso_init
if [ "$MODE" = "" ] || [ "$MODE" = "1" ]
@@ -447,6 +401,7 @@ virtuoso_shutdown
STOP_SERVER
chmod 644 ods_webmail_dav.vad
chmod 644 ods_webmail_filesystem.vad
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -456,7 +411,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-WebMail/sql/DET_oMail.sql b/appsrc/ODS-WebMail/sql/DET_oMail.sql
index 4d20568..b0c5d1c 100644
--- a/appsrc/ODS-WebMail/sql/DET_oMail.sql
+++ b/appsrc/ODS-WebMail/sql/DET_oMail.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_oMail.sql,v 1.6.2.3 2012/03/08 10:46:21 source Exp $
+-- $Id: DET_oMail.sql,v 1.6.2.2 2010/09/20 10:15:41 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql b/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql
index 50bfa46..a86217d 100644
--- a/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql
+++ b/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: eml-create-code.sql,v 1.42.2.28 2012/03/08 10:46:21 source Exp $
+-- $Id: eml-create-code.sql,v 1.42.2.27 2011/08/01 14:13:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql b/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql
index e2995b8..e9ea418 100644
--- a/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql
+++ b/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: eml-create-tables.sql,v 1.9.2.7 2012/03/08 10:46:21 source Exp $
+-- $Id: eml-create-tables.sql,v 1.9.2.6 2011/01/25 14:12:06 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql b/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql
index 58883cc..8bcd3a2 100644
--- a/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql
+++ b/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: eml-dev-code.sql,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: eml-dev-code.sql,v 1.2.2.1 2010/09/20 10:15:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/omail-api.sql b/appsrc/ODS-WebMail/sql/omail-api.sql
index 5103d93..12885b7 100644
--- a/appsrc/ODS-WebMail/sql/omail-api.sql
+++ b/appsrc/ODS-WebMail/sql/omail-api.sql
@@ -1,10 +1,10 @@
--
--- $Id: omail-api.sql,v 1.2.2.3 2012/03/08 10:46:21 source Exp $
+-- $Id: omail-api.sql,v 1.2.2.2 2010/09/20 10:15:41 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2008 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
diff --git a/appsrc/ODS-WebMail/sql/omail-wa-install.sql b/appsrc/ODS-WebMail/sql/omail-wa-install.sql
index 880b198..a838be2 100644
--- a/appsrc/ODS-WebMail/sql/omail-wa-install.sql
+++ b/appsrc/ODS-WebMail/sql/omail-wa-install.sql
@@ -1,10 +1,10 @@
--
--- $Id: omail-wa-install.sql,v 1.6.2.5 2012/03/08 10:46:21 source Exp $
+-- $Id: omail-wa-install.sql,v 1.6.2.4 2011/01/25 14:12:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql b/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql
index a751394..c1ea912 100644
--- a/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql
+++ b/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql
@@ -1,10 +1,10 @@
--
--- $Id: omail-wa-uninstall.sql,v 1.11.2.6 2012/03/08 10:46:21 source Exp $
+-- $Id: omail-wa-uninstall.sql,v 1.11.2.5 2011/05/18 21:18:30 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/res/res-create-code-data.sql b/appsrc/ODS-WebMail/sql/res/res-create-code-data.sql
index 494fae5..e5db713 100644
--- a/appsrc/ODS-WebMail/sql/res/res-create-code-data.sql
+++ b/appsrc/ODS-WebMail/sql/res/res-create-code-data.sql
@@ -1,10 +1,10 @@
--
--- $Id: res-create-code-data.sql,v 1.3.2.4 2012/03/08 10:46:21 source Exp $
+-- $Id: res-create-code-data.sql,v 1.3.2.3 2011/03/08 13:25:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/res/res-create-code.sql b/appsrc/ODS-WebMail/sql/res/res-create-code.sql
index 4b7d893..77eb772 100644
--- a/appsrc/ODS-WebMail/sql/res/res-create-code.sql
+++ b/appsrc/ODS-WebMail/sql/res/res-create-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: res-create-code.sql,v 1.3.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: res-create-code.sql,v 1.3.2.1 2010/09/20 10:15:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/res/res-create-tables.sql b/appsrc/ODS-WebMail/sql/res/res-create-tables.sql
index f64fe2a..d11393e 100644
--- a/appsrc/ODS-WebMail/sql/res/res-create-tables.sql
+++ b/appsrc/ODS-WebMail/sql/res/res-create-tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: res-create-tables.sql,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: res-create-tables.sql,v 1.2.2.1 2010/09/20 10:15:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/sioc_mail.sql b/appsrc/ODS-WebMail/sql/sioc_mail.sql
index 2fa4d93..aff79cf 100644
--- a/appsrc/ODS-WebMail/sql/sioc_mail.sql
+++ b/appsrc/ODS-WebMail/sql/sioc_mail.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc_mail.sql,v 1.7.2.5 2012/03/08 10:46:21 source Exp $
+-- $Id: sioc_mail.sql,v 1.7.2.4 2011/05/18 21:18:30 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql b/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql
index 5f4365c..0ae703c 100644
--- a/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql
+++ b/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql
@@ -1,10 +1,10 @@
--
--- $Id: utl-create-code.sql,v 1.4.2.5 2012/03/08 10:46:21 source Exp $
+-- $Id: utl-create-code.sql,v 1.4.2.4 2010/09/20 10:15:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/sql/wa_search_mail.sql b/appsrc/ODS-WebMail/sql/wa_search_mail.sql
index 4ce01e0..982217e 100644
--- a/appsrc/ODS-WebMail/sql/wa_search_mail.sql
+++ b/appsrc/ODS-WebMail/sql/wa_search_mail.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_search_mail.sql,v 1.3.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: wa_search_mail.sql,v 1.3.2.1 2010/09/20 10:15:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/vad_version b/appsrc/ODS-WebMail/vad_version
deleted file mode 100644
index 295fd07..0000000
--- a/appsrc/ODS-WebMail/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.5.122
diff --git a/appsrc/ODS-WebMail/www-root/mail/i/css/print.css b/appsrc/ODS-WebMail/www-root/mail/i/css/print.css
index e8dfefb..44e59a9 100644
--- a/appsrc/ODS-WebMail/www-root/mail/i/css/print.css
+++ b/appsrc/ODS-WebMail/www-root/mail/i/css/print.css
@@ -1,10 +1,10 @@
/*
- * $Id: print.css,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ * $Id: print.css,v 1.2.2.1 2010/09/20 10:15:43 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/i/css/styles.css b/appsrc/ODS-WebMail/www-root/mail/i/css/styles.css
index 50d08c1..e582e43 100644
--- a/appsrc/ODS-WebMail/www-root/mail/i/css/styles.css
+++ b/appsrc/ODS-WebMail/www-root/mail/i/css/styles.css
@@ -1,10 +1,10 @@
/*
- * $Id: styles.css,v 1.9.2.6 2012/03/08 10:46:21 source Exp $
+ * $Id: styles.css,v 1.9.2.5 2010/09/20 10:15:43 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/i/js/script.js b/appsrc/ODS-WebMail/www-root/mail/i/js/script.js
index a6bf71a..bad649b 100644
--- a/appsrc/ODS-WebMail/www-root/mail/i/js/script.js
+++ b/appsrc/ODS-WebMail/www-root/mail/i/js/script.js
@@ -1,10 +1,10 @@
/*
- * $Id: script.js,v 1.11.2.15 2012/03/08 10:46:21 source Exp $
+ * $Id: script.js,v 1.11.2.14 2011/08/01 14:13:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/i/js/tbl.js b/appsrc/ODS-WebMail/www-root/mail/i/js/tbl.js
index 6641b61..fab74bf 100644
--- a/appsrc/ODS-WebMail/www-root/mail/i/js/tbl.js
+++ b/appsrc/ODS-WebMail/www-root/mail/i/js/tbl.js
@@ -1,10 +1,10 @@
/*
- * $Id: tbl.js,v 1.1.4.4 2012/03/08 10:46:21 source Exp $
+ * $Id: tbl.js,v 1.1.4.3 2010/09/20 10:15:43 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/p/p.vsp b/appsrc/ODS-WebMail/www-root/mail/p/p.vsp
index 352d77c..93889ab 100644
--- a/appsrc/ODS-WebMail/www-root/mail/p/p.vsp
+++ b/appsrc/ODS-WebMail/www-root/mail/p/p.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: p.vsp,v 1.3.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: p.vsp,v 1.3.2.1 2010/09/20 10:15:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/p/tags.xml b/appsrc/ODS-WebMail/www-root/mail/p/tags.xml
index 693f106..e6c1ad0 100644
--- a/appsrc/ODS-WebMail/www-root/mail/p/tags.xml
+++ b/appsrc/ODS-WebMail/www-root/mail/p/tags.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tags.xml,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: tags.xml,v 1.2.2.1 2010/09/20 10:15:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl b/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl
index af64b1c..ef13f96 100644
--- a/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl
+++ b/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tags.xsl,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: tags.xsl,v 1.2.2.1 2010/09/20 10:15:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/portal.vsp b/appsrc/ODS-WebMail/www-root/portal.vsp
index 69ad72c..9a538af 100644
--- a/appsrc/ODS-WebMail/www-root/portal.vsp
+++ b/appsrc/ODS-WebMail/www-root/portal.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: portal.vsp,v 1.21.2.4 2012/03/08 10:46:21 source Exp $
+-- $Id: portal.vsp,v 1.21.2.3 2011/07/04 10:03:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/res/export.vsp b/appsrc/ODS-WebMail/www-root/res/export.vsp
index 3938a75..f28bfd2 100644
--- a/appsrc/ODS-WebMail/www-root/res/export.vsp
+++ b/appsrc/ODS-WebMail/www-root/res/export.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: export.vsp,v 1.5.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: export.vsp,v 1.5.2.1 2010/09/20 10:15:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/res/flush.vsp b/appsrc/ODS-WebMail/www-root/res/flush.vsp
index 45f1238..5073770 100644
--- a/appsrc/ODS-WebMail/www-root/res/flush.vsp
+++ b/appsrc/ODS-WebMail/www-root/res/flush.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: flush.vsp,v 1.5.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: flush.vsp,v 1.5.2.1 2010/09/20 10:15:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/www-root/res/image.vsp b/appsrc/ODS-WebMail/www-root/res/image.vsp
index 2c509ac..f68e30a 100644
--- a/appsrc/ODS-WebMail/www-root/res/image.vsp
+++ b/appsrc/ODS-WebMail/www-root/res/image.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: image.vsp,v 1.3.2.2 2012/03/08 10:46:21 source Exp $
+-- $Id: image.vsp,v 1.3.2.1 2010/09/20 10:15:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/addr.xsl b/appsrc/ODS-WebMail/xslt/addr.xsl
index 9f6dded..b412fb9 100644
--- a/appsrc/ODS-WebMail/xslt/addr.xsl
+++ b/appsrc/ODS-WebMail/xslt/addr.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: addr.xsl,v 1.2.2.3 2012/03/08 10:46:21 source Exp $
+ - $Id: addr.xsl,v 1.2.2.2 2010/09/20 10:15:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/attach.xsl b/appsrc/ODS-WebMail/xslt/attach.xsl
index 818e995..eae0295 100644
--- a/appsrc/ODS-WebMail/xslt/attach.xsl
+++ b/appsrc/ODS-WebMail/xslt/attach.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: attach.xsl,v 1.3.2.5 2012/03/08 10:46:21 source Exp $
+ - $Id: attach.xsl,v 1.3.2.4 2011/05/17 23:01:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/base.xsl b/appsrc/ODS-WebMail/xslt/base.xsl
index 650ba56..3513e92 100644
--- a/appsrc/ODS-WebMail/xslt/base.xsl
+++ b/appsrc/ODS-WebMail/xslt/base.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: base.xsl,v 1.3.2.6 2012/03/08 10:46:21 source Exp $
+ - $Id: base.xsl,v 1.3.2.5 2011/05/02 14:15:25 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/box.xsl b/appsrc/ODS-WebMail/xslt/box.xsl
index 49820c0..bb544d5 100644
--- a/appsrc/ODS-WebMail/xslt/box.xsl
+++ b/appsrc/ODS-WebMail/xslt/box.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: box.xsl,v 1.5.2.9 2012/03/08 10:46:21 source Exp $
+ - $Id: box.xsl,v 1.5.2.8 2011/02/14 13:03:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/ch_pop3.xsl b/appsrc/ODS-WebMail/xslt/ch_pop3.xsl
index 37e5c55..433a732 100644
--- a/appsrc/ODS-WebMail/xslt/ch_pop3.xsl
+++ b/appsrc/ODS-WebMail/xslt/ch_pop3.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ch_pop3.xsl,v 1.6.2.7 2012/03/08 10:46:21 source Exp $
+ - $Id: ch_pop3.xsl,v 1.6.2.6 2011/01/25 14:12:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/common.xsl b/appsrc/ODS-WebMail/xslt/common.xsl
index dfca527..18594f3 100644
--- a/appsrc/ODS-WebMail/xslt/common.xsl
+++ b/appsrc/ODS-WebMail/xslt/common.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: common.xsl,v 1.25.2.15 2012/03/08 10:46:21 source Exp $
+ - $Id: common.xsl,v 1.25.2.14 2011/08/01 14:13:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/common_folders.xsl b/appsrc/ODS-WebMail/xslt/common_folders.xsl
index f84f15a..c173996 100644
--- a/appsrc/ODS-WebMail/xslt/common_folders.xsl
+++ b/appsrc/ODS-WebMail/xslt/common_folders.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: common_folders.xsl,v 1.3.2.7 2012/03/08 10:46:21 source Exp $
+ - $Id: common_folders.xsl,v 1.3.2.6 2011/01/25 14:12:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/construct_body.xsl b/appsrc/ODS-WebMail/xslt/construct_body.xsl
index e84d56c..581694b 100644
--- a/appsrc/ODS-WebMail/xslt/construct_body.xsl
+++ b/appsrc/ODS-WebMail/xslt/construct_body.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: construct_body.xsl,v 1.1.4.3 2012/03/08 10:46:21 source Exp $
+ - $Id: construct_body.xsl,v 1.1.4.2 2010/11/09 20:12:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/appsrc/ODS-WebMail/xslt/construct_mail.xsl b/appsrc/ODS-WebMail/xslt/construct_mail.xsl
index f04fd58..2cd0957 100644
--- a/appsrc/ODS-WebMail/xslt/construct_mail.xsl
+++ b/appsrc/ODS-WebMail/xslt/construct_mail.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: construct_mail.xsl,v 1.2.2.3 2012/03/08 10:46:21 source Exp $
+ - $Id: construct_mail.xsl,v 1.2.2.2 2010/11/09 20:12:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl b/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl
index 272f573..06ce1f1 100644
--- a/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl
+++ b/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: construct_mail_pop3.xsl,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: construct_mail_pop3.xsl,v 1.2.2.1 2010/09/20 10:15:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/construct_recip.xsl b/appsrc/ODS-WebMail/xslt/construct_recip.xsl
index c78c5ba..1ca1e61 100644
--- a/appsrc/ODS-WebMail/xslt/construct_recip.xsl
+++ b/appsrc/ODS-WebMail/xslt/construct_recip.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: construct_recip.xsl,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: construct_recip.xsl,v 1.2.2.1 2010/09/20 10:15:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/date_time.xsl b/appsrc/ODS-WebMail/xslt/date_time.xsl
index f6d9591..60f5448 100644
--- a/appsrc/ODS-WebMail/xslt/date_time.xsl
+++ b/appsrc/ODS-WebMail/xslt/date_time.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: date_time.xsl,v 1.2.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: date_time.xsl,v 1.2.2.1 2010/09/20 10:15:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/err.xsl b/appsrc/ODS-WebMail/xslt/err.xsl
index 7ff2788..6fb8b16 100644
--- a/appsrc/ODS-WebMail/xslt/err.xsl
+++ b/appsrc/ODS-WebMail/xslt/err.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: err.xsl,v 1.3.2.2 2012/03/08 10:46:21 source Exp $
+ - $Id: err.xsl,v 1.3.2.1 2010/09/20 10:15:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/errors.xml b/appsrc/ODS-WebMail/xslt/errors.xml
index 0608d3c..e7b419b 100644
--- a/appsrc/ODS-WebMail/xslt/errors.xml
+++ b/appsrc/ODS-WebMail/xslt/errors.xml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: errors.xml,v 1.5.2.4 2012/03/08 10:46:21 source Exp $
+ - $Id: errors.xml,v 1.5.2.3 2011/07/04 10:03:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl b/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl
index e23cb3a..f70655f 100644
--- a/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl
+++ b/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom.xsl,v 1.3.2.3 2012/03/08 10:46:22 source Exp $
+ - $Id: rss2atom.xsl,v 1.3.2.2 2010/09/20 10:15:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl b/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl
index 0b094cb..9c19759 100644
--- a/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl
+++ b/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2atom03.xsl,v 1.3.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: rss2atom03.xsl,v 1.3.2.1 2010/09/20 10:15:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl b/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl
index 506f610..1120bf7 100644
--- a/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl
+++ b/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.5.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: rss2rdf.xsl,v 1.5.2.1 2010/09/20 10:15:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl b/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl
index 6057e73..b3ae4c6 100644
--- a/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl
+++ b/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2.2.1 2010/09/20 10:15:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/filters.xsl b/appsrc/ODS-WebMail/xslt/filters.xsl
index c5b18b2..e4e1c0b 100644
--- a/appsrc/ODS-WebMail/xslt/filters.xsl
+++ b/appsrc/ODS-WebMail/xslt/filters.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: filters.xsl,v 1.1.2.6 2012/03/08 10:46:21 source Exp $
+ - $Id: filters.xsl,v 1.1.2.5 2010/09/20 10:15:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-WebMail/xslt/folders.xsl b/appsrc/ODS-WebMail/xslt/folders.xsl
index dd2970a..01dd3b4 100644
--- a/appsrc/ODS-WebMail/xslt/folders.xsl
+++ b/appsrc/ODS-WebMail/xslt/folders.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: folders.xsl,v 1.3.2.6 2012/03/08 10:46:21 source Exp $
+ - $Id: folders.xsl,v 1.3.2.5 2010/09/20 10:15:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/handlers.xsl b/appsrc/ODS-WebMail/xslt/handlers.xsl
index bf3721d..0c8bf0e 100644
--- a/appsrc/ODS-WebMail/xslt/handlers.xsl
+++ b/appsrc/ODS-WebMail/xslt/handlers.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: handlers.xsl,v 1.2.2.3 2012/03/08 10:46:21 source Exp $
+ - $Id: handlers.xsl,v 1.2.2.2 2011/05/02 14:15:25 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/html_parse.xsl b/appsrc/ODS-WebMail/xslt/html_parse.xsl
index 687d52f..55811a7 100644
--- a/appsrc/ODS-WebMail/xslt/html_parse.xsl
+++ b/appsrc/ODS-WebMail/xslt/html_parse.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: html_parse.xsl,v 1.3.2.3 2012/03/08 10:46:21 source Exp $
+ - $Id: html_parse.xsl,v 1.3.2.2 2011/03/08 13:25:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/html_parse2.xsl b/appsrc/ODS-WebMail/xslt/html_parse2.xsl
index c6c97e8..11a03f6 100644
--- a/appsrc/ODS-WebMail/xslt/html_parse2.xsl
+++ b/appsrc/ODS-WebMail/xslt/html_parse2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: html_parse2.xsl,v 1.2.2.3 2012/03/08 10:46:21 source Exp $
+ - $Id: html_parse2.xsl,v 1.2.2.2 2011/03/08 13:25:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/mails.xsl b/appsrc/ODS-WebMail/xslt/mails.xsl
index 59f1d6c..d658edf 100644
--- a/appsrc/ODS-WebMail/xslt/mails.xsl
+++ b/appsrc/ODS-WebMail/xslt/mails.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: mails.xsl,v 1.1.2.3 2012/03/08 10:46:21 source Exp $
+ - $Id: mails.xsl,v 1.1.2.2 2011/08/01 14:13:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-WebMail/xslt/open.xsl b/appsrc/ODS-WebMail/xslt/open.xsl
index c966419..edab24d 100644
--- a/appsrc/ODS-WebMail/xslt/open.xsl
+++ b/appsrc/ODS-WebMail/xslt/open.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: open.xsl,v 1.11.2.7 2012/03/08 10:46:21 source Exp $
+ - $Id: open.xsl,v 1.11.2.6 2011/01/25 14:12:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/search.xsl b/appsrc/ODS-WebMail/xslt/search.xsl
index f6dbeef..6cc2018 100644
--- a/appsrc/ODS-WebMail/xslt/search.xsl
+++ b/appsrc/ODS-WebMail/xslt/search.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.xsl,v 1.6.2.8 2012/03/08 10:46:21 source Exp $
+ - $Id: search.xsl,v 1.6.2.7 2010/09/20 10:15:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/sendok.xsl b/appsrc/ODS-WebMail/xslt/sendok.xsl
index a00bfb2..fcd36dd 100644
--- a/appsrc/ODS-WebMail/xslt/sendok.xsl
+++ b/appsrc/ODS-WebMail/xslt/sendok.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sendok.xsl,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: sendok.xsl,v 1.2.2.1 2010/09/20 10:15:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/set_mail.xsl b/appsrc/ODS-WebMail/xslt/set_mail.xsl
index fb99121..90a8830 100644
--- a/appsrc/ODS-WebMail/xslt/set_mail.xsl
+++ b/appsrc/ODS-WebMail/xslt/set_mail.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: set_mail.xsl,v 1.9.2.7 2012/03/08 10:46:22 source Exp $
+ - $Id: set_mail.xsl,v 1.9.2.6 2011/08/01 14:13:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/tools.xsl b/appsrc/ODS-WebMail/xslt/tools.xsl
index a5393ae..8b888ba 100644
--- a/appsrc/ODS-WebMail/xslt/tools.xsl
+++ b/appsrc/ODS-WebMail/xslt/tools.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tools.xsl,v 1.2.2.4 2012/03/08 10:46:22 source Exp $
+ - $Id: tools.xsl,v 1.2.2.3 2010/09/20 10:15:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-WebMail/xslt/write.xsl b/appsrc/ODS-WebMail/xslt/write.xsl
index 720224d..c065fac 100644
--- a/appsrc/ODS-WebMail/xslt/write.xsl
+++ b/appsrc/ODS-WebMail/xslt/write.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: write.xsl,v 1.8.2.8 2012/03/08 10:46:22 source Exp $
+ - $Id: write.xsl,v 1.8.2.7 2011/08/01 14:13:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/Makefile.am b/appsrc/ODS-Wiki/Makefile.am
index 04c6c3e..a491046 100644
--- a/appsrc/ODS-Wiki/Makefile.am
+++ b/appsrc/ODS-Wiki/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -77,4 +77,6 @@ EXTRA_DIST = \
Skins/default/*.png \
Skins/default/*.xslt \
Template/*.txt \
+ version.base \
+ version.curr \
vad_version
diff --git a/appsrc/ODS-Wiki/Makefile.in b/appsrc/ODS-Wiki/Makefile.in
index a0b459e..1407247 100644
--- a/appsrc/ODS-Wiki/Makefile.in
+++ b/appsrc/ODS-Wiki/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -163,7 +163,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -212,7 +211,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -264,7 +262,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -311,6 +308,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -381,6 +379,8 @@ EXTRA_DIST = \
Skins/default/*.png \
Skins/default/*.xslt \
Template/*.txt \
+ version.base \
+ version.curr \
vad_version
all: all-recursive
diff --git a/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt b/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt
index 387d4da..5dcc925 100644
--- a/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt
+++ b/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -28,7 +28,7 @@
xmlns:wv="http://www.openlinksw.com/Virtuoso/WikiV/"
xmlns:fn2="http://www.w3.org/2004/07/xpath-functions">
-<!-- $Id: PostProcess.xslt,v 1.20.2.3 2012/03/08 10:46:22 source Exp $ -->
+<!-- $Id: PostProcess.xslt,v 1.20.2.2 2011/08/01 14:12:53 source Exp $ -->
<xsl:output
method="html"
diff --git a/appsrc/ODS-Wiki/Skins/default/default.css b/appsrc/ODS-Wiki/Skins/default/default.css
index 418f8b0..fb5ce7d 100644
--- a/appsrc/ODS-Wiki/Skins/default/default.css
+++ b/appsrc/ODS-Wiki/Skins/default/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.9.2.9 2012/03/08 10:46:22 source Exp $
+ * $Id: default.css,v 1.9.2.7 2011/03/26 14:21:52 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -943,7 +943,6 @@ div.working-area
height: 500px;
margin-bottom: 5px;
width: 100%;
- font-family: monospace;
}
#page_help_ctr
{
diff --git a/appsrc/ODS-Wiki/atom.sql b/appsrc/ODS-Wiki/atom.sql
index 522cc6f..a5d5be6 100644
--- a/appsrc/ODS-Wiki/atom.sql
+++ b/appsrc/ODS-Wiki/atom.sql
@@ -1,14 +1,14 @@
--
-- atom.sql
--
--- $Id: atom.sql,v 1.9.2.8 2012/03/08 10:46:22 source Exp $
+-- $Id: atom.sql,v 1.9.2.7 2011/03/26 14:21:51 source Exp $
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/conv.sql b/appsrc/ODS-Wiki/conv.sql
index 3b91bbf..068f4c1 100644
--- a/appsrc/ODS-Wiki/conv.sql
+++ b/appsrc/ODS-Wiki/conv.sql
@@ -1,10 +1,10 @@
--
--- $Id: conv.sql,v 1.10.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: conv.sql,v 1.10.2.1 2010/09/20 10:15:46 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/drop.sql b/appsrc/ODS-Wiki/drop.sql
index 4de4f5c..8f7c0dd 100644
--- a/appsrc/ODS-Wiki/drop.sql
+++ b/appsrc/ODS-Wiki/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.16.2.5 2012/03/08 10:46:22 source Exp $
+-- $Id: drop.sql,v 1.16.2.4 2011/08/01 14:12:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/export.sql b/appsrc/ODS-Wiki/export.sql
index cb0991a..febd8c6 100644
--- a/appsrc/ODS-Wiki/export.sql
+++ b/appsrc/ODS-Wiki/export.sql
@@ -1,10 +1,10 @@
--
--- $Id: export.sql,v 1.8.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: export.sql,v 1.8.2.1 2010/09/20 10:15:46 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/generate_drop_proc.sh b/appsrc/ODS-Wiki/generate_drop_proc.sh
index 2fe1991..8110367 100755
--- a/appsrc/ODS-Wiki/generate_drop_proc.sh
+++ b/appsrc/ODS-Wiki/generate_drop_proc.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: generate_drop_proc.sh,v 1.3.2.3 2012/03/08 10:46:22 source Exp $
+# $Id: generate_drop_proc.sh,v 1.3.2.2 2010/09/20 10:15:46 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt b/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt
index 7c7f234..2912633 100644
--- a/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt
+++ b/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: HTMLtoWiki.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: HTMLtoWiki.xslt,v 1.2.2.1 2010/09/20 10:15:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt b/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt
index 8d0b859..804cf8e 100644
--- a/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt
+++ b/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspAttachmentDeleteConfirm.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspAttachmentDeleteConfirm.xslt,v 1.2.2.1 2010/09/20 10:15:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspChangeLog.xslt b/appsrc/ODS-Wiki/http/VspChangeLog.xslt
index 177ca56..f31f80f 100644
--- a/appsrc/ODS-Wiki/http/VspChangeLog.xslt
+++ b/appsrc/ODS-Wiki/http/VspChangeLog.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspChangeLog.xslt,v 1.3.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspChangeLog.xslt,v 1.3.2.1 2010/09/20 10:15:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspMail.xslt b/appsrc/ODS-Wiki/http/VspMail.xslt
index ab3e220..b2a0cc2 100644
--- a/appsrc/ODS-Wiki/http/VspMail.xslt
+++ b/appsrc/ODS-Wiki/http/VspMail.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspMail.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspMail.xslt,v 1.2.2.1 2010/09/20 10:15:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspNoteCompile.xslt b/appsrc/ODS-Wiki/http/VspNoteCompile.xslt
index 1d5cc57..a3e0aaa 100644
--- a/appsrc/ODS-Wiki/http/VspNoteCompile.xslt
+++ b/appsrc/ODS-Wiki/http/VspNoteCompile.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspNoteCompile.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspNoteCompile.xslt,v 1.2.2.1 2010/09/20 10:15:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspReportError.xslt b/appsrc/ODS-Wiki/http/VspReportError.xslt
index 806f6bf..faf37ed 100644
--- a/appsrc/ODS-Wiki/http/VspReportError.xslt
+++ b/appsrc/ODS-Wiki/http/VspReportError.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspReportError.xslt,v 1.4.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspReportError.xslt,v 1.4.2.1 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspSearch.xslt b/appsrc/ODS-Wiki/http/VspSearch.xslt
index a5aa78e..f1e050a 100644
--- a/appsrc/ODS-Wiki/http/VspSearch.xslt
+++ b/appsrc/ODS-Wiki/http/VspSearch.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspSearch.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspSearch.xslt,v 1.2.2.1 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicAttach.xslt b/appsrc/ODS-Wiki/http/VspTopicAttach.xslt
index 2981575..986ecbf 100644
--- a/appsrc/ODS-Wiki/http/VspTopicAttach.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicAttach.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicAttach.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicAttach.xslt,v 1.2.2.1 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt b/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt
index d995eec..9fb4b00 100644
--- a/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicAttachManage.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicAttachManage.xslt,v 1.2.2.1 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicCreate.xslt b/appsrc/ODS-Wiki/http/VspTopicCreate.xslt
index 2541420..272023e 100644
--- a/appsrc/ODS-Wiki/http/VspTopicCreate.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicCreate.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicCreate.xslt,v 1.3.2.3 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicCreate.xslt,v 1.3.2.2 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicDelete.xslt b/appsrc/ODS-Wiki/http/VspTopicDelete.xslt
index d5bf97a..7866055 100644
--- a/appsrc/ODS-Wiki/http/VspTopicDelete.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicDelete.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicDelete.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicDelete.xslt,v 1.2.2.1 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicEdit.xslt b/appsrc/ODS-Wiki/http/VspTopicEdit.xslt
index aec720d..2c10952 100644
--- a/appsrc/ODS-Wiki/http/VspTopicEdit.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicEdit.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicEdit.xslt,v 1.2.2.3 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicEdit.xslt,v 1.2.2.2 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicHistory.xslt b/appsrc/ODS-Wiki/http/VspTopicHistory.xslt
index c4af8db..79ed5a8 100644
--- a/appsrc/ODS-Wiki/http/VspTopicHistory.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicHistory.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicHistory.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicHistory.xslt,v 1.2.2.1 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt b/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt
index 4cb35b9..f75e558 100644
--- a/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicMoreOps.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicMoreOps.xslt,v 1.2.2.1 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicRename.xslt b/appsrc/ODS-Wiki/http/VspTopicRename.xslt
index d58dcd3..3ed769f 100644
--- a/appsrc/ODS-Wiki/http/VspTopicRename.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicRename.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicRename.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicRename.xslt,v 1.2.2.1 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicReports.xslt b/appsrc/ODS-Wiki/http/VspTopicReports.xslt
index 3a9a70e..752229e 100644
--- a/appsrc/ODS-Wiki/http/VspTopicReports.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicReports.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicReports.xslt,v 1.3.2.5 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicReports.xslt,v 1.3.2.4 2011/01/05 14:01:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/VspTopicView.xslt b/appsrc/ODS-Wiki/http/VspTopicView.xslt
index dacac2e..4c7d184 100644
--- a/appsrc/ODS-Wiki/http/VspTopicView.xslt
+++ b/appsrc/ODS-Wiki/http/VspTopicView.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: VspTopicView.xslt,v 1.21.2.3 2012/03/08 10:46:22 source Exp $
+ - $Id: VspTopicView.xslt,v 1.21.2.2 2010/09/20 10:15:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt b/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt
index 737c8f2..b6eeee7 100644
--- a/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt
+++ b/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: XmlAtomFeed.xslt,v 1.3.2.5 2012/03/08 10:49:48 source Exp $
+ - $Id: XmlAtomFeed.xslt,v 1.3.2.3 2011/02/03 10:26:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -41,7 +41,7 @@
<title >oWiki <xsl:value-of select="@cluster"/> Weblog</title>
</xsl:if>
<link rel="alternate"><xsl:value-of select="@home"/></link>
- <copyright >Copyright (c) 1998-2012, OpenLink Software</copyright>
+ <copyright >Copyright (c) 1998-2011, OpenLink Software</copyright>
<author >
<name><xsl:value-of select="@name"/></name>
<email><xsl:value-of select="@email"/></email>
diff --git a/appsrc/ODS-Wiki/http/XmlRDFFeed.xslt b/appsrc/ODS-Wiki/http/XmlRDFFeed.xslt
index 35c1d13..bff9695 100644
--- a/appsrc/ODS-Wiki/http/XmlRDFFeed.xslt
+++ b/appsrc/ODS-Wiki/http/XmlRDFFeed.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: XmlRDFFeed.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: XmlRDFFeed.xslt,v 1.2.2.1 2010/09/20 10:15:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/XmlRssFeed.xslt b/appsrc/ODS-Wiki/http/XmlRssFeed.xslt
index 6535ddd..7544d48 100644
--- a/appsrc/ODS-Wiki/http/XmlRssFeed.xslt
+++ b/appsrc/ODS-Wiki/http/XmlRssFeed.xslt
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: XmlRssFeed.xslt,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: XmlRssFeed.xslt,v 1.2.2.1 2010/09/20 10:15:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/advanced_search.vspx b/appsrc/ODS-Wiki/http/advanced_search.vspx
index bb986d9..d93a170 100644
--- a/appsrc/ODS-Wiki/http/advanced_search.vspx
+++ b/appsrc/ODS-Wiki/http/advanced_search.vspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -23,7 +23,7 @@
<?vsp WV.WIKI.VSPHEADER (path,params,lines, 'Advanced Search');
?>
-<!-- $Id: advanced_search.vspx,v 1.15.2.3 2012/03/08 10:46:22 source Exp $ -->
+<!-- $Id: advanced_search.vspx,v 1.15.2.2 2010/09/20 10:15:50 source Exp $ -->
<v:page name="main"
style="comp.xsl"
on-error-redirect="../main/"
diff --git a/appsrc/ODS-Wiki/http/attachment.vsp b/appsrc/ODS-Wiki/http/attachment.vsp
index 5445f90..3ffe8e8 100644
--- a/appsrc/ODS-Wiki/http/attachment.vsp
+++ b/appsrc/ODS-Wiki/http/attachment.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: attachment.vsp,v 1.1.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: attachment.vsp,v 1.1.2.1 2010/09/20 10:15:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/common.css b/appsrc/ODS-Wiki/http/common.css
index 05f5240..a6a3bd5 100644
--- a/appsrc/ODS-Wiki/http/common.css
+++ b/appsrc/ODS-Wiki/http/common.css
@@ -1,10 +1,10 @@
/*
- * $Id: common.css,v 1.6.2.2 2012/03/08 10:46:22 source Exp $
+ * $Id: common.css,v 1.6.2.1 2010/09/20 10:15:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/common.xsl b/appsrc/ODS-Wiki/http/common.xsl
index af50e34..d6869e9 100644
--- a/appsrc/ODS-Wiki/http/common.xsl
+++ b/appsrc/ODS-Wiki/http/common.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: common.xsl,v 1.14.2.4 2012/03/08 10:46:22 source Exp $
+ - $Id: common.xsl,v 1.14.2.3 2011/01/25 14:13:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/comp.xsl b/appsrc/ODS-Wiki/http/comp.xsl
index 8de3aff..ac7792a 100644
--- a/appsrc/ODS-Wiki/http/comp.xsl
+++ b/appsrc/ODS-Wiki/http/comp.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: comp.xsl,v 1.14.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: comp.xsl,v 1.14.2.1 2010/09/20 10:15:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/conversation.vspx b/appsrc/ODS-Wiki/http/conversation.vspx
index 0a80a5f..7b0c977 100644
--- a/appsrc/ODS-Wiki/http/conversation.vspx
+++ b/appsrc/ODS-Wiki/http/conversation.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: conversation.vspx,v 1.10.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: conversation.vspx,v 1.10.2.1 2010/09/20 10:15:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/default.css b/appsrc/ODS-Wiki/http/default.css
index f54c7de..e385e95 100644
--- a/appsrc/ODS-Wiki/http/default.css
+++ b/appsrc/ODS-Wiki/http/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ * $Id: default.css,v 1.2.2.1 2010/09/20 10:15:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/export.vspx b/appsrc/ODS-Wiki/http/export.vspx
index 3261a86..c7e5b7b 100644
--- a/appsrc/ODS-Wiki/http/export.vspx
+++ b/appsrc/ODS-Wiki/http/export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: export.vspx,v 1.7.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: export.vspx,v 1.7.2.1 2010/09/20 10:15:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/export.xsl b/appsrc/ODS-Wiki/http/export.xsl
index 083c12e..ae6efc8 100644
--- a/appsrc/ODS-Wiki/http/export.xsl
+++ b/appsrc/ODS-Wiki/http/export.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: export.xsl,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: export.xsl,v 1.2.2.1 2010/09/20 10:15:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/fault.vspx b/appsrc/ODS-Wiki/http/fault.vspx
index 85bc43c..a66a7dd 100644
--- a/appsrc/ODS-Wiki/http/fault.vspx
+++ b/appsrc/ODS-Wiki/http/fault.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: fault.vspx,v 1.1.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: fault.vspx,v 1.1.2.1 2010/09/20 10:15:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/gems.vsp b/appsrc/ODS-Wiki/http/gems.vsp
index 2b41e6d..40714c4 100644
--- a/appsrc/ODS-Wiki/http/gems.vsp
+++ b/appsrc/ODS-Wiki/http/gems.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: gems.vsp,v 1.10.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: gems.vsp,v 1.10.2.1 2010/09/20 10:15:51 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/history.vspx b/appsrc/ODS-Wiki/http/history.vspx
index 7a02d4d..32b9189 100644
--- a/appsrc/ODS-Wiki/http/history.vspx
+++ b/appsrc/ODS-Wiki/http/history.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: history.vspx,v 1.6.2.3 2012/03/08 10:46:22 source Exp $
+ - $Id: history.vspx,v 1.6.2.2 2010/09/20 10:15:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/html2docbook.xsl b/appsrc/ODS-Wiki/http/html2docbook.xsl
index 8f1a283..a16b641 100644
--- a/appsrc/ODS-Wiki/http/html2docbook.xsl
+++ b/appsrc/ODS-Wiki/http/html2docbook.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: html2docbook.xsl,v 1.6.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: html2docbook.xsl,v 1.6.2.1 2010/09/20 10:15:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/login.vsp b/appsrc/ODS-Wiki/http/login.vsp
index 4b87aa8..53de825 100644
--- a/appsrc/ODS-Wiki/http/login.vsp
+++ b/appsrc/ODS-Wiki/http/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.5.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: login.vsp,v 1.5.2.1 2010/09/20 10:15:51 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/login.vspx b/appsrc/ODS-Wiki/http/login.vspx
index 12b66d6..0a7977c 100644
--- a/appsrc/ODS-Wiki/http/login.vspx
+++ b/appsrc/ODS-Wiki/http/login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.vspx,v 1.4.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: login.vspx,v 1.4.2.1 2010/09/20 10:15:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/macros.xml b/appsrc/ODS-Wiki/http/macros.xml
index 43aaccf..3b032c1 100644
--- a/appsrc/ODS-Wiki/http/macros.xml
+++ b/appsrc/ODS-Wiki/http/macros.xml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: macros.xml,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: macros.xml,v 1.2.2.1 2010/09/20 10:15:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/appsrc/ODS-Wiki/http/main.vsp b/appsrc/ODS-Wiki/http/main.vsp
index b550a0c..0bcf149 100644
--- a/appsrc/ODS-Wiki/http/main.vsp
+++ b/appsrc/ODS-Wiki/http/main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: main.vsp,v 1.26.2.10 2012/03/08 10:49:48 source Exp $
+-- $Id: main.vsp,v 1.26.2.8 2011/08/01 14:12:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -27,7 +27,6 @@
declare _sid, _realm, _user varchar;
declare cookie_vec any;
declare _parent varchar;
- declare _filename varchar;
_parent := get_keyword ('parent', params, '');
if (_parent <> '')
@@ -316,12 +315,11 @@ cont:
return;
};
- declare _retval any;
-
+ declare _filename, _retval any;
_text := coalesce(_text, '');
- if ((length (_text) > 0) and (_text[length (_text)-1] = ascii('\n')))
+ if (length (_text) > 0)
+ if (_text[length (_text)-1] = ascii('\n'))
_text := subseq(_text, 0, length (_text)- 2);
-
_text := WV.WIKI.DELETE_SYSINFO_FOR (_text, NULL);
_topic.ti_text := _text;
_filename := coalesce ((select RES_NAME from WS.WS.SYS_DAV_RES where RES_ID = _topic.ti_res_id), concat (_topic.ti_local_name,'.txt'));
@@ -410,9 +408,7 @@ content:
if (_attachment is not null)
{
if (_cmd = 'manage')
- {
WV.WIKI.VSPATTACHMENTMANAGE (path, lines, _topic,_attachment, WV.WIKI.MAKE_PARAMS (_user, _uid, params, _base_adjust));
- }
else if (_cmd = 'delete')
{
if ({?'submit'} = 'Yes')
@@ -463,17 +459,17 @@ content:
-- http_header (http_header_get() || sprintf('Location: %s/login.vspx?URL=%U\r\n', WV..ODS_LINK(lines), 'http://' || DB.DBA.WA_GET_HOST() || http_path() || '?command=edit&' || _parent));
return;
};
+ declare _filename varchar;
_topic.ti_text := _text;
_filename := coalesce ((select RES_NAME from WS.WS.SYS_DAV_RES where RES_ID = _topic.ti_res_id), concat (_topic.ti_local_name,'.txt'));
WV.WIKI.CHECKWRITEACCESS (_uid, _topic.ti_res_id, _topic.ti_cluster_id, _topic.ti_col_id, 'Edit is not allowed by owner of this cluster.');
+ declare _lock_uid int;
if (_topic.ti_id = 0)
- {
WV.WIKI.VSPTOPICCREATE (path, lines, _cluster, _topic.ti_raw_title, WV.WIKI.MAKE_PARAMS (_user, _uid, params, _base_adjust));
- }
else
{
- if (0 = WV.WIKI.GETLOCK (WS.WS.COL_PATH(_topic.ti_col_id) || _filename, _user))
+ if (0 = (_lock_uid := WV.WIKI.GETLOCK (WS.WS.COL_PATH(_topic.ti_col_id) || _filename, _user)))
WV.WIKI.VSPTOPICEDIT (path, lines, _topic, WV.WIKI.MAKE_PARAMS (_user, _uid, params, _base_adjust));
else
WV.WIKI.APPSIGNAL (11001, 'The resource &path; is locked', vector ('path', WS.WS.COL_PATH(_topic.ti_col_id) || _filename));
@@ -492,27 +488,25 @@ content:
WV.WIKI.redirect (sprintf('%s/login.vspx?URL=%U', WV..ODS_LINK(lines), 'http://' || DB.DBA.WA_GET_HOST() || http_path() || '?command=upstream_now&' || _parent));
return;
};
+ declare _filename varchar;
+
_filename := coalesce ((select RES_NAME from WS.WS.SYS_DAV_RES where RES_ID = _topic.ti_res_id), concat (_topic.ti_local_name,'.txt'));
WV.WIKI.CHECKWRITEACCESS (_uid, _topic.ti_res_id, _topic.ti_cluster_id, _topic.ti_col_id, 'Upstream is not allowed by owner of this cluster.');
+ declare _lock_uid int;
if (_topic.ti_id <> 0)
{
- if (0 = WV.WIKI.GETLOCK (WS.WS.COL_PATH(_topic.ti_col_id) || _filename, _user))
+ if (0 = (_lock_uid := WV.WIKI.GETLOCK (WS.WS.COL_PATH(_topic.ti_col_id) || _filename, _user)))
{
if (WV.WIKI.VSPTOPICVIEW (path, lines, _topic, WV.WIKI.MAKE_PARAMS (_user, _uid, params, _base_adjust)))
WV.WIKI.VSPFOOTER (path, params, lines);
-
http_flush();
- commit work;
-
WV.WIKI.UPSTREAM_TOPIC_NOW (_topic.ti_id);
WV.WIKI.RELEASELOCK (WS.WS.COL_PATH(_topic.ti_col_id) || _filename, _user);
return;
}
else
- {
WV.WIKI.APPSIGNAL (11001, 'The resource &path; is locked', vector ('path', WS.WS.COL_PATH(_topic.ti_col_id) || _filename));
}
- }
goto make_footer;
}
diff --git a/appsrc/ODS-Wiki/http/ops.vspx b/appsrc/ODS-Wiki/http/ops.vspx
index 8095c62..2e279ad 100644
--- a/appsrc/ODS-Wiki/http/ops.vspx
+++ b/appsrc/ODS-Wiki/http/ops.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ops.vspx,v 1.12.2.4 2012/03/08 10:46:22 source Exp $
+ - $Id: ops.vspx,v 1.12.2.3 2011/01/25 14:13:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/owiki.css b/appsrc/ODS-Wiki/http/owiki.css
index 1ca53ee..ba7647d 100644
--- a/appsrc/ODS-Wiki/http/owiki.css
+++ b/appsrc/ODS-Wiki/http/owiki.css
@@ -1,10 +1,10 @@
/*
- * $Id: owiki.css,v 1.3.2.2 2012/03/08 10:46:22 source Exp $
+ * $Id: owiki.css,v 1.3.2.1 2010/09/20 10:15:52 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/permissions.vspx b/appsrc/ODS-Wiki/http/permissions.vspx
index 5513ba5..bbf0ad9 100644
--- a/appsrc/ODS-Wiki/http/permissions.vspx
+++ b/appsrc/ODS-Wiki/http/permissions.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: permissions.vspx,v 1.4.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: permissions.vspx,v 1.4.2.1 2010/09/20 10:15:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/redirect.vsp b/appsrc/ODS-Wiki/http/redirect.vsp
index fa81510..ac8516a 100644
--- a/appsrc/ODS-Wiki/http/redirect.vsp
+++ b/appsrc/ODS-Wiki/http/redirect.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: redirect.vsp,v 1.4.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: redirect.vsp,v 1.4.2.1 2010/09/20 10:15:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/remove_tag.vspx b/appsrc/ODS-Wiki/http/remove_tag.vspx
index 876f2df..f2c8eae 100644
--- a/appsrc/ODS-Wiki/http/remove_tag.vspx
+++ b/appsrc/ODS-Wiki/http/remove_tag.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: remove_tag.vspx,v 1.1.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: remove_tag.vspx,v 1.1.2.1 2010/09/20 10:15:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/revision_delete.vspx b/appsrc/ODS-Wiki/http/revision_delete.vspx
index dad770f..6dc649a 100644
--- a/appsrc/ODS-Wiki/http/revision_delete.vspx
+++ b/appsrc/ODS-Wiki/http/revision_delete.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: revision_delete.vspx,v 1.5.2.2 2012/03/08 10:46:22 source Exp $
+ - $Id: revision_delete.vspx,v 1.5.2.1 2010/09/20 10:15:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/revision_rollback.vspx b/appsrc/ODS-Wiki/http/revision_rollback.vspx
index 4b7b89b..6f51a7f 100644
--- a/appsrc/ODS-Wiki/http/revision_rollback.vspx
+++ b/appsrc/ODS-Wiki/http/revision_rollback.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: revision_rollback.vspx,v 1.6.2.2 2012/03/08 10:46:23 source Exp $
+ - $Id: revision_rollback.vspx,v 1.6.2.1 2010/09/20 10:15:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/search.vsp b/appsrc/ODS-Wiki/http/search.vsp
index 7da5c37..36b67ed 100644
--- a/appsrc/ODS-Wiki/http/search.vsp
+++ b/appsrc/ODS-Wiki/http/search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: search.vsp,v 1.3.2.2 2012/03/08 10:46:23 source Exp $
+-- $Id: search.vsp,v 1.3.2.1 2010/09/20 10:15:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/search.vspx b/appsrc/ODS-Wiki/http/search.vspx
index a78d206..dadbc63 100644
--- a/appsrc/ODS-Wiki/http/search.vspx
+++ b/appsrc/ODS-Wiki/http/search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.vspx,v 1.3.2.2 2012/03/08 10:46:23 source Exp $
+ - $Id: search.vspx,v 1.3.2.1 2010/09/20 10:15:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/settings.vspx b/appsrc/ODS-Wiki/http/settings.vspx
index daf5d89..611d79a 100644
--- a/appsrc/ODS-Wiki/http/settings.vspx
+++ b/appsrc/ODS-Wiki/http/settings.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: settings.vspx,v 1.17.2.4 2012/03/08 10:46:23 source Exp $
+ - $Id: settings.vspx,v 1.17.2.3 2011/03/26 14:21:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/tag.vspx b/appsrc/ODS-Wiki/http/tag.vspx
index f847a0b..aef31cc 100644
--- a/appsrc/ODS-Wiki/http/tag.vspx
+++ b/appsrc/ODS-Wiki/http/tag.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tag.vspx,v 1.6.2.2 2012/03/08 10:46:23 source Exp $
+ - $Id: tag.vspx,v 1.6.2.1 2010/09/20 10:15:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/tags.vspx b/appsrc/ODS-Wiki/http/tags.vspx
index 18e74d4..a53b5d4 100644
--- a/appsrc/ODS-Wiki/http/tags.vspx
+++ b/appsrc/ODS-Wiki/http/tags.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tags.vspx,v 1.7.2.2 2012/03/08 10:46:23 source Exp $
+ - $Id: tags.vspx,v 1.7.2.1 2010/09/20 10:15:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -22,7 +22,7 @@
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-->
-<!-- $Id: tags.vspx,v 1.7.2.2 2012/03/08 10:46:23 source Exp $ -->
+<!-- $Id: tags.vspx,v 1.7.2.1 2010/09/20 10:15:53 source Exp $ -->
<v:page
name="main"
style="comp.xsl"
diff --git a/appsrc/ODS-Wiki/http/template.xsl b/appsrc/ODS-Wiki/http/template.xsl
index 6ad8d83..42fcbc8 100644
--- a/appsrc/ODS-Wiki/http/template.xsl
+++ b/appsrc/ODS-Wiki/http/template.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: template.xsl,v 1.3.2.2 2012/03/08 10:46:23 source Exp $
+ - $Id: template.xsl,v 1.3.2.1 2010/09/20 10:15:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/toolbar.vspx b/appsrc/ODS-Wiki/http/toolbar.vspx
index 07f8809..79bc1d5 100644
--- a/appsrc/ODS-Wiki/http/toolbar.vspx
+++ b/appsrc/ODS-Wiki/http/toolbar.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: toolbar.vspx,v 1.3.2.2 2012/03/08 10:46:23 source Exp $
+ - $Id: toolbar.vspx,v 1.3.2.1 2010/09/20 10:15:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/wiki_decor.vspx b/appsrc/ODS-Wiki/http/wiki_decor.vspx
index a3e6945..fcf5e1f 100644
--- a/appsrc/ODS-Wiki/http/wiki_decor.vspx
+++ b/appsrc/ODS-Wiki/http/wiki_decor.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: wiki_decor.vspx,v 1.3.2.2 2012/03/08 10:46:23 source Exp $
+ - $Id: wiki_decor.vspx,v 1.3.2.1 2010/09/20 10:15:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/http/wiki_style.xsl b/appsrc/ODS-Wiki/http/wiki_style.xsl
index bd5cfe2..64b8ef5 100644
--- a/appsrc/ODS-Wiki/http/wiki_style.xsl
+++ b/appsrc/ODS-Wiki/http/wiki_style.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: wiki_style.xsl,v 1.2.2.5 2012/03/08 10:46:23 source Exp $
+ - $Id: wiki_style.xsl,v 1.2.2.4 2011/02/03 10:26:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -107,7 +107,7 @@
</tr>
</table>
</table>
- <div class="copyright">Copyright © 1998-2012 OpenLink Software</div>-->
+ <div class="copyright">Copyright © 1998-2011 OpenLink Software</div>-->
<xsl:processing-instruction name="vsp">
declare ht_stat varchar;
ht_stat := http_request_status_get ();
diff --git a/appsrc/ODS-Wiki/http/wikiview.vsp b/appsrc/ODS-Wiki/http/wikiview.vsp
index 95e81f9..2f593a5 100644
--- a/appsrc/ODS-Wiki/http/wikiview.vsp
+++ b/appsrc/ODS-Wiki/http/wikiview.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wikiview.vsp,v 1.3.2.2 2012/03/08 10:46:23 source Exp $
+-- $Id: wikiview.vsp,v 1.3.2.1 2010/09/20 10:15:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/make_vad.sh b/appsrc/ODS-Wiki/make_vad.sh
index 93ce174..5d37a7c 100755
--- a/appsrc/ODS-Wiki/make_vad.sh
+++ b/appsrc/ODS-Wiki/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.30.2.10 2012/03/08 11:19:38 source Exp $
+# $Id: make_vad.sh,v 1.30.2.8 2011/08/01 14:12:53 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -68,6 +68,13 @@ then
fi
fi
+
+VOS=0
+if [ -f ../../autogen.sh ]
+then
+ VOS=1
+fi
+
. $HOME/binsrc/tests/suite/test_fn.sh
if [ -f /usr/xpg4/bin/rm ]
@@ -78,14 +85,8 @@ else
fi
-VOS=0
-if [ -f ../../autogen.sh ]
-then
- VOS=1
-fi
-version_init()
-{
+version_init() {
if [ $VOS -eq 1 ]
then
if [ -f vad_version ]
@@ -97,34 +98,32 @@ version_init()
fi
else
rm -f version.tmp
- for i in `find . -name 'Entries' | grep -v "vad/" | grep -v "/tests/"`; do
- cat "$i" | grep -v "version\."| grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp
+ file_list=`find ./ -name Entries`
+ for i in $file_list; do
+ cat $i | grep -v "version\." | grep '^/' | cut -d '/' -f 3 | sed -e 's/1\.//g' >> version.tmp
+ echo $i
done
- LANG=POSIX
- export LANG
-
BASE="0"
-# echo $BASE
if [ -f version.base ] ; then
BASE=`cat version.base`
fi
-
- VERSION=`cat version.tmp | awk ' BEGIN { cnt=10 } { cnt = cnt + $1 } END { print cnt }'`
-
+ VERSION=`cat version.tmp | awk ' BEGIN { cnt=0 } { cnt = cnt + $1 } END { print cnt }'`
+ CALC_VERSION=$VERSION
VERSION=`expr $BASE + $VERSION`
CURR_VERSION=$VERSION
if [ -f version.curr ] ; then
CURR_VERSION=`cat version.curr`
fi
if [ $CURR_VERSION -gt $VERSION ] ; then
- BASE=`expr $CURR_VERSION - $VERSION + 1`
+ BASE=`expr $CURR_VERSION - $CALC_VERSION + 1`
+ echo "new base: " $BASE
echo $BASE > version.base
VERSION=$CURR_VERSION
fi
echo $VERSION > version.curr
- VERSION=`echo $VERSION | awk ' { printf "1.%02.02f", $1/100 }'`
- rm -f version.tmp
- echo "$VERSION" > vad_version
+ VERSION="1.05.$VERSION"
+ echo $VERSION > vad_version
+ # rm -f version.tmp
fi
}
@@ -256,7 +255,7 @@ sticker_init() {
echo " <name package=\"Wiki\">" >> $STICKER
echo " <prop name=\"Title\" value=\"ODS Wiki\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -505,14 +504,15 @@ vad_check() {
virtuoso_shutdown
directory_clean
-version_init
directory_init
virtuoso_init
+version_init
sticker_init
vad_create
virtuoso_shutdown
echo `pwd`
chmod 644 ods_wiki_dav.vad
+directory_clean
CHECK_LOG
RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE"
@@ -522,7 +522,5 @@ then
exit 1
fi
-directory_clean
-
BANNER "COMPLETED VAD PACKAGING"
exit 0
diff --git a/appsrc/ODS-Wiki/plugin/Makefile.am b/appsrc/ODS-Wiki/plugin/Makefile.am
index 6b03504..9b79c90 100644
--- a/appsrc/ODS-Wiki/plugin/Makefile.am
+++ b/appsrc/ODS-Wiki/plugin/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugin/Makefile.in b/appsrc/ODS-Wiki/plugin/Makefile.in
index e8650aa..a8bb96a 100644
--- a/appsrc/ODS-Wiki/plugin/Makefile.in
+++ b/appsrc/ODS-Wiki/plugin/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -166,7 +166,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -215,7 +214,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -267,7 +265,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -314,6 +311,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/appsrc/ODS-Wiki/plugin/creole_maclex.c b/appsrc/ODS-Wiki/plugin/creole_maclex.c
index bfeb0fe..0834c38 100644
--- a/appsrc/ODS-Wiki/plugin/creole_maclex.c
+++ b/appsrc/ODS-Wiki/plugin/creole_maclex.c
@@ -503,12 +503,12 @@ char *creolemacyytext;
#line 1 "./creole_maclex.l"
#line 2 "./creole_maclex.l"
/*
- * $Id: creole_maclex.l,v 1.2.2.2 2012/03/08 10:46:23 source Exp $
+ * $Id: creole_maclex.l,v 1.2.2.1 2010/09/20 10:15:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -687,7 +687,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( creolemacyytext, creolemacyyleng, 1, creolemacyyout )) {} } while (0)
+#define ECHO fwrite( creolemacyytext, creolemacyyleng, 1, creolemacyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -698,7 +698,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( creolemacyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/appsrc/ODS-Wiki/plugin/creole_maclex.l b/appsrc/ODS-Wiki/plugin/creole_maclex.l
index 68ee7bd..b03d622 100644
--- a/appsrc/ODS-Wiki/plugin/creole_maclex.l
+++ b/appsrc/ODS-Wiki/plugin/creole_maclex.l
@@ -1,11 +1,11 @@
%{
/*
- * $Id: creole_maclex.l,v 1.2.2.2 2012/03/08 10:46:23 source Exp $
+ * $Id: creole_maclex.l,v 1.2.2.1 2010/09/20 10:15:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugin/creole_wikilex.c b/appsrc/ODS-Wiki/plugin/creole_wikilex.c
index 13e79ca..25772b8 100644
--- a/appsrc/ODS-Wiki/plugin/creole_wikilex.c
+++ b/appsrc/ODS-Wiki/plugin/creole_wikilex.c
@@ -11459,12 +11459,12 @@ char *creolewikiyytext;
#line 1 "./creole_wikilex.l"
#line 2 "./creole_wikilex.l"
/*
- * $Id: creole_wikilex.l,v 1.4.2.3 2012/03/08 10:46:23 source Exp $
+ * $Id: creole_wikilex.l,v 1.4.2.2 2010/09/20 10:15:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -12258,7 +12258,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( creolewikiyytext, creolewikiyyleng, 1, creolewikiyyout )) {} } while (0)
+#define ECHO fwrite( creolewikiyytext, creolewikiyyleng, 1, creolewikiyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -12269,7 +12269,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( creolewikiyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/appsrc/ODS-Wiki/plugin/creole_wikilex.l b/appsrc/ODS-Wiki/plugin/creole_wikilex.l
index 71db429..ff7fad9 100644
--- a/appsrc/ODS-Wiki/plugin/creole_wikilex.l
+++ b/appsrc/ODS-Wiki/plugin/creole_wikilex.l
@@ -1,11 +1,11 @@
%{
/*
- * $Id: creole_wikilex.l,v 1.4.2.3 2012/03/08 10:46:23 source Exp $
+ * $Id: creole_wikilex.l,v 1.4.2.2 2010/09/20 10:15:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugin/creolewiki.c b/appsrc/ODS-Wiki/plugin/creolewiki.c
index 29cb55a..d5dff6e 100644
--- a/appsrc/ODS-Wiki/plugin/creolewiki.c
+++ b/appsrc/ODS-Wiki/plugin/creolewiki.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugin/maclex.c b/appsrc/ODS-Wiki/plugin/maclex.c
index 95c5d5e..ba5abcb 100644
--- a/appsrc/ODS-Wiki/plugin/maclex.c
+++ b/appsrc/ODS-Wiki/plugin/maclex.c
@@ -503,12 +503,12 @@ char *macyytext;
#line 1 "./maclex.l"
#line 2 "./maclex.l"
/*
- * $Id: maclex.l,v 1.4.2.2 2012/03/08 10:46:23 source Exp $
+ * $Id: maclex.l,v 1.4.2.1 2010/09/20 10:15:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -687,7 +687,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( macyytext, macyyleng, 1, macyyout )) {} } while (0)
+#define ECHO fwrite( macyytext, macyyleng, 1, macyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -698,7 +698,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( macyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/appsrc/ODS-Wiki/plugin/maclex.l b/appsrc/ODS-Wiki/plugin/maclex.l
index 51212d8..8128586 100644
--- a/appsrc/ODS-Wiki/plugin/maclex.l
+++ b/appsrc/ODS-Wiki/plugin/maclex.l
@@ -1,11 +1,11 @@
%{
/*
- * $Id: maclex.l,v 1.4.2.2 2012/03/08 10:46:23 source Exp $
+ * $Id: maclex.l,v 1.4.2.1 2010/09/20 10:15:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugin/media_maclex.c b/appsrc/ODS-Wiki/plugin/media_maclex.c
index 4ee74d6..ce79773 100644
--- a/appsrc/ODS-Wiki/plugin/media_maclex.c
+++ b/appsrc/ODS-Wiki/plugin/media_maclex.c
@@ -503,12 +503,12 @@ char *mediamacyytext;
#line 1 "./media_maclex.l"
#line 2 "./media_maclex.l"
/*
- * $Id: media_maclex.l,v 1.3.2.2 2012/03/08 10:46:23 source Exp $
+ * $Id: media_maclex.l,v 1.3.2.1 2010/09/20 10:15:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -687,7 +687,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( mediamacyytext, mediamacyyleng, 1, mediamacyyout )) {} } while (0)
+#define ECHO fwrite( mediamacyytext, mediamacyyleng, 1, mediamacyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -698,7 +698,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( mediamacyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/appsrc/ODS-Wiki/plugin/media_maclex.l b/appsrc/ODS-Wiki/plugin/media_maclex.l
index ba3fb4c..0d1591a 100644
--- a/appsrc/ODS-Wiki/plugin/media_maclex.l
+++ b/appsrc/ODS-Wiki/plugin/media_maclex.l
@@ -1,11 +1,11 @@
%{
/*
- * $Id: media_maclex.l,v 1.3.2.2 2012/03/08 10:46:23 source Exp $
+ * $Id: media_maclex.l,v 1.3.2.1 2010/09/20 10:15:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugin/media_wikilex.c b/appsrc/ODS-Wiki/plugin/media_wikilex.c
index 8907753..22d4ada 100644
--- a/appsrc/ODS-Wiki/plugin/media_wikilex.c
+++ b/appsrc/ODS-Wiki/plugin/media_wikilex.c
@@ -14450,12 +14450,12 @@ char *mediawikiyytext;
#line 1 "./media_wikilex.l"
#line 2 "./media_wikilex.l"
/*
- * $Id: media_wikilex.l,v 1.7.2.3 2012/03/08 10:46:23 source Exp $
+ * $Id: media_wikilex.l,v 1.7.2.2 2010/09/20 10:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -15178,7 +15178,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( mediawikiyytext, mediawikiyyleng, 1, mediawikiyyout )) {} } while (0)
+#define ECHO fwrite( mediawikiyytext, mediawikiyyleng, 1, mediawikiyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -15189,7 +15189,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( mediawikiyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/appsrc/ODS-Wiki/plugin/media_wikilex.l b/appsrc/ODS-Wiki/plugin/media_wikilex.l
index d178ecc..6139eee 100644
--- a/appsrc/ODS-Wiki/plugin/media_wikilex.l
+++ b/appsrc/ODS-Wiki/plugin/media_wikilex.l
@@ -1,11 +1,11 @@
%{
/*
- * $Id: media_wikilex.l,v 1.7.2.3 2012/03/08 10:46:23 source Exp $
+ * $Id: media_wikilex.l,v 1.7.2.2 2010/09/20 10:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugin/mediawiki.c b/appsrc/ODS-Wiki/plugin/mediawiki.c
index b2c9914..640271d 100644
--- a/appsrc/ODS-Wiki/plugin/mediawiki.c
+++ b/appsrc/ODS-Wiki/plugin/mediawiki.c
@@ -1,10 +1,10 @@
/*
- * $Id: mediawiki.c,v 1.5.2.2 2012/03/08 10:46:23 source Exp $
+ * $Id: mediawiki.c,v 1.5.2.1 2010/09/20 10:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugin/wikilex.c b/appsrc/ODS-Wiki/plugin/wikilex.c
index f1da0e8..e863e1c 100644
--- a/appsrc/ODS-Wiki/plugin/wikilex.c
+++ b/appsrc/ODS-Wiki/plugin/wikilex.c
@@ -11348,12 +11348,12 @@ char *wikiyytext;
#line 1 "./wikilex.l"
#line 2 "./wikilex.l"
/*
- * $Id: wikilex.l,v 1.15.2.4 2012/03/08 11:46:20 source Exp $
+ * $Id: wikilex.l,v 1.15.2.2 2010/09/20 10:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -11367,6 +11367,7 @@ char *wikiyytext;
* 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
+ *
*/
#include <ctype.h>
@@ -11930,7 +11931,7 @@ int wlex_count_header_level (char * line)
/* Wiktology */
-#line 11934 "wikilex.c"
+#line 11935 "wikilex.c"
#define INITIAL 0
#define VERBATIM 1
@@ -12024,7 +12025,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( wikiyytext, wikiyyleng, 1, wikiyyout )) {} } while (0)
+#define ECHO fwrite( wikiyytext, wikiyyleng, 1, wikiyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -12035,7 +12036,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( wikiyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -12120,11 +12121,11 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 649 "./wikilex.l"
+#line 650 "./wikilex.l"
/* Verbatim */
-#line 12128 "wikilex.c"
+#line 12129 "wikilex.c"
if ( !(yy_init) )
{
@@ -12240,346 +12241,346 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
-#line 652 "./wikilex.l"
+#line 653 "./wikilex.l"
{ BEGIN(VERBATIM); wlex_verbatim(1); }
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 653 "./wikilex.l"
+#line 654 "./wikilex.l"
{ BEGIN(INITIAL); wlex_verbatim(0); }
YY_BREAK
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
-#line 654 "./wikilex.l"
+#line 655 "./wikilex.l"
{ BEGIN(INITIAL); wlex_verbatim(0); }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 655 "./wikilex.l"
+#line 656 "./wikilex.l"
{ PRINT ("<"); }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 656 "./wikilex.l"
+#line 657 "./wikilex.l"
{ PRINT (">"); }
YY_BREAK
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 657 "./wikilex.l"
+#line 658 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 658 "./wikilex.l"
+#line 659 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 659 "./wikilex.l"
+#line 660 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 660 "./wikilex.l"
+#line 661 "./wikilex.l"
{ PRINT ("<?"); }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 661 "./wikilex.l"
+#line 662 "./wikilex.l"
{ PRINT(wikiyytext); }
YY_BREAK
/* Wiktology */
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 664 "./wikilex.l"
+#line 665 "./wikilex.l"
{ PRINT("<p><b>Wikitology detected:</b><br><div id='wiktology'>"); BEGIN(WIKTOLOGY); wlex_verbatim(1); }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 665 "./wikilex.l"
+#line 666 "./wikilex.l"
{ PRINT ("<"); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 666 "./wikilex.l"
+#line 667 "./wikilex.l"
{ PRINT (">"); }
YY_BREAK
case 14:
/* rule 14 can match eol */
YY_RULE_SETUP
-#line 667 "./wikilex.l"
+#line 668 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 668 "./wikilex.l"
+#line 669 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 669 "./wikilex.l"
+#line 670 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 670 "./wikilex.l"
+#line 671 "./wikilex.l"
{ PRINT ("<?"); }
YY_BREAK
case 18:
/* rule 18 can match eol */
YY_RULE_SETUP
-#line 671 "./wikilex.l"
+#line 672 "./wikilex.l"
{ PRINT("</div></p><b>End of Wikitology</b><br>"); BEGIN(INITIAL); wlex_verbatim(0); }
YY_BREAK
/* WikiLinks. This is the core :) They are of highest possible priority */
case 19:
YY_RULE_SETUP
-#line 675 "./wikilex.l"
+#line 676 "./wikilex.l"
{ if (STATE(wlex_noautolink)) COPYTEXT; else wlex_ahref (wlex_wikiwordnorm (STATEPTR, wikiyytext), "wikiword", wikiyytext); }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 676 "./wikilex.l"
+#line 677 "./wikilex.l"
{ if (STATE(wlex_noautolink)) COPYTEXT; else wlex_ahref (wlex_wikiwordnorm (STATEPTR, wikiyytext), "qwikiword", strchr (wikiyytext, '.') + 1); }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 677 "./wikilex.l"
+#line 678 "./wikilex.l"
{ if (STATE(wlex_noautolink)) COPYTEXT; else wlex_ahref (wlex_wikiwordnorm (STATEPTR, wikiyytext), "interwiki", wikiyytext); }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 678 "./wikilex.l"
+#line 679 "./wikilex.l"
{ PRINT("<NOP />"); PRINTTEXT(strchr(wikiyytext,'>')+1); }
YY_BREAK
/* xmlns must be removed for <html tag. this is workaround and must be replaced by proper handling XHTML */
case 23:
YY_RULE_SETUP
-#line 681 "./wikilex.l"
+#line 682 "./wikilex.l"
{ PRINT ("<html>"); BEGIN(PLAINHTML); }
YY_BREAK
case 24:
/* rule 24 can match eol */
YY_RULE_SETUP
-#line 682 "./wikilex.l"
+#line 683 "./wikilex.l"
{ ; }
YY_BREAK
/* PlainHtml */
case 25:
/* rule 25 can match eol */
YY_RULE_SETUP
-#line 687 "./wikilex.l"
+#line 688 "./wikilex.l"
{ BEGIN(PLAINHTML); }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 688 "./wikilex.l"
+#line 689 "./wikilex.l"
{ BEGIN(PLAINHTML); STATE(wlex_noautolink) = 1; STATE(wlex_nowiki) = 1; STATE(wlex_in_any_text) = 1; STATE(wlex_prevst) = INITIAL; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 689 "./wikilex.l"
+#line 690 "./wikilex.l"
{ BEGIN(PLAINHTML); STATE(wlex_noautolink) = 1; STATE(wlex_nowiki) = 1; STATE(wlex_in_any_text) = 1; STATE(wlex_prevst) = TABLELINE; }
YY_BREAK
case 28:
/* rule 28 can match eol */
YY_RULE_SETUP
-#line 690 "./wikilex.l"
+#line 691 "./wikilex.l"
{ BEGIN(INITIAL); }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 691 "./wikilex.l"
+#line 692 "./wikilex.l"
{ if ((STATE(wlex_prevst)) == TABLELINE) { BEGIN(TABLELINE);} else { BEGIN(INITIAL);} STATE(wlex_noautolink) = 0; STATE (wlex_nowiki) = 0; }
YY_BREAK
case 30:
/* rule 30 can match eol */
YY_RULE_SETUP
-#line 692 "./wikilex.l"
+#line 693 "./wikilex.l"
{ BEGIN(INITIAL); }
YY_BREAK
case 31:
/* rule 31 can match eol */
YY_RULE_SETUP
-#line 693 "./wikilex.l"
+#line 694 "./wikilex.l"
{ if (STATE(wlex_nowiki)) PRINT ("<BR/>"); }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 694 "./wikilex.l"
+#line 695 "./wikilex.l"
{ PRINT (wikiyytext); }
YY_BREAK
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
-#line 696 "./wikilex.l"
+#line 697 "./wikilex.l"
{ STATE(wlex_noautolink) = 1; }
YY_BREAK
case 34:
/* rule 34 can match eol */
YY_RULE_SETUP
-#line 697 "./wikilex.l"
+#line 698 "./wikilex.l"
{ STATE(wlex_noautolink) = 0; }
YY_BREAK
/* Other links. Their priorities are higher than anything else except <verbatim> */
case 35:
YY_RULE_SETUP
-#line 700 "./wikilex.l"
+#line 701 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) wlex_ahref (wikiyytext, "mailto", wikiyytext+7); else COPYTEXT; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 701 "./wikilex.l"
+#line 702 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) wlex_ahref (wikiyytext, "mailto", wikiyytext); else COPYTEXT; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 702 "./wikilex.l"
+#line 703 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) wlex_ahref (wikiyytext, "absuri", wikiyytext); else COPYTEXT; }
YY_BREAK
case 38:
/* rule 38 can match eol */
YY_RULE_SETUP
-#line 703 "./wikilex.l"
+#line 704 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, NULL, 1, "forcedwikiword"); }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 704 "./wikilex.l"
+#line 705 "./wikilex.l"
{ wlex_forced_link_with_pred (STATEPTR, wikiyytext, "::", NULL, "forcedwikiword"); }
YY_BREAK
case 40:
/* rule 40 can match eol */
YY_RULE_SETUP
-#line 705 "./wikilex.l"
+#line 706 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "mailto"); }
YY_BREAK
case 41:
/* rule 41 can match eol */
YY_RULE_SETUP
-#line 706 "./wikilex.l"
+#line 707 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "mailto"); }
YY_BREAK
case 42:
/* rule 42 can match eol */
YY_RULE_SETUP
-#line 707 "./wikilex.l"
+#line 708 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "wikiword"); }
YY_BREAK
case 43:
/* rule 43 can match eol */
YY_RULE_SETUP
-#line 708 "./wikilex.l"
+#line 709 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "wikiword"); }
YY_BREAK
case 44:
/* rule 44 can match eol */
YY_RULE_SETUP
-#line 709 "./wikilex.l"
+#line 710 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "qwikiword"); }
YY_BREAK
case 45:
/* rule 45 can match eol */
YY_RULE_SETUP
-#line 710 "./wikilex.l"
+#line 711 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "qwikiword"); }
YY_BREAK
case 46:
/* rule 46 can match eol */
YY_RULE_SETUP
-#line 711 "./wikilex.l"
+#line 712 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "interwiki"); }
YY_BREAK
case 47:
/* rule 47 can match eol */
YY_RULE_SETUP
-#line 712 "./wikilex.l"
+#line 713 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "interwiki"); }
YY_BREAK
case 48:
/* rule 48 can match eol */
YY_RULE_SETUP
-#line 713 "./wikilex.l"
+#line 714 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "absuri"); }
YY_BREAK
case 49:
/* rule 49 can match eol */
YY_RULE_SETUP
-#line 714 "./wikilex.l"
+#line 715 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "absuri"); }
YY_BREAK
case 50:
/* rule 50 can match eol */
YY_RULE_SETUP
-#line 715 "./wikilex.l"
+#line 716 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, " ", 0, "anchorhere"); }
YY_BREAK
case 51:
/* rule 51 can match eol */
YY_RULE_SETUP
-#line 716 "./wikilex.l"
+#line 717 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "anchorhere"); }
YY_BREAK
case 52:
/* rule 52 can match eol */
YY_RULE_SETUP
-#line 717 "./wikilex.l"
+#line 718 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, NULL, 1, "forcedwikiword"); }
YY_BREAK
case 53:
/* rule 53 can match eol */
YY_RULE_SETUP
-#line 718 "./wikilex.l"
+#line 719 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 1, "forcedwikiword"); }
YY_BREAK
case 54:
/* rule 54 can match eol */
YY_RULE_SETUP
-#line 719 "./wikilex.l"
+#line 720 "./wikilex.l"
{ wlex_forced_link (STATEPTR, wikiyytext, "][", 0, "reluri"); }
YY_BREAK
case 55:
/* rule 55 can match eol */
YY_RULE_SETUP
-#line 720 "./wikilex.l"
+#line 721 "./wikilex.l"
{ wlex_forced_link_with_pred (STATEPTR, wikiyytext, "::", "|", "forcedwikiword"); }
YY_BREAK
case 56:
/* rule 56 can match eol */
YY_RULE_SETUP
-#line 721 "./wikilex.l"
+#line 722 "./wikilex.l"
{ wlex_div_with_pred (STATEPTR, wikiyytext, ":=", "|", "semanticvalue"); }
YY_BREAK
/* HTML tags */
case 57:
YY_RULE_SETUP
-#line 724 "./wikilex.l"
+#line 725 "./wikilex.l"
{ if (!STATE(wlex_xmp_depth)) STATE(wlex_format_lock) += 1; PRINT(wikiyytext); }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 725 "./wikilex.l"
+#line 726 "./wikilex.l"
{ if (!STATE(wlex_xmp_depth) && (0 < STATE(wlex_format_lock))) STATE(wlex_format_lock) -= 1; PRINT(wikiyytext); }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 726 "./wikilex.l"
+#line 727 "./wikilex.l"
{ STATE(wlex_xmp_depth) += 1; STATE(wlex_format_lock) += 1; PRINT(wikiyytext); }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 727 "./wikilex.l"
+#line 728 "./wikilex.l"
{ if (0 < STATE(wlex_xmp_depth)) { STATE(wlex_xmp_depth) -= 1; STATE(wlex_format_lock) -= 1; } PRINT(wikiyytext); }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 728 "./wikilex.l"
+#line 729 "./wikilex.l"
{
if (!STATE(wlex_in_para) && !STATE(wlex_in_any_text))
STATE(wlex_in_para) = STATE(wlex_in_any_text) = STATE(wlex_para_depressed) = 1;
@@ -12588,25 +12589,25 @@ YY_RULE_SETUP
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 733 "./wikilex.l"
+#line 734 "./wikilex.l"
{ PRINT(wikiyytext); }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 734 "./wikilex.l"
+#line 735 "./wikilex.l"
{ PRINT("<!-- nop -->"); }
YY_BREAK
/* Ends of lines and ends of paragraphs */
case 64:
/* rule 64 can match eol */
YY_RULE_SETUP
-#line 737 "./wikilex.l"
+#line 738 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else PRINTTEXT("."); wlex_reset (~0); }
YY_BREAK
case 65:
/* rule 65 can match eol */
YY_RULE_SETUP
-#line 738 "./wikilex.l"
+#line 739 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else PRINTTEXT(".\n"); }
YY_BREAK
case 66:
@@ -12615,7 +12616,7 @@ case 66:
(yy_c_buf_p) = yy_cp = yy_bp + 2;
YY_DO_BEFORE_ACTION; /* set up wikiyytext again */
YY_RULE_SETUP
-#line 739 "./wikilex.l"
+#line 740 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else PRINTTEXT(".\n"); }
YY_BREAK
case 67:
@@ -12624,24 +12625,24 @@ case 67:
(yy_c_buf_p) = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up wikiyytext again */
YY_RULE_SETUP
-#line 740 "./wikilex.l"
+#line 741 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else PRINTTEXT(".\n"); }
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 741 "./wikilex.l"
+#line 742 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else COPYTEXT; }
YY_BREAK
case 69:
/* rule 69 can match eol */
YY_RULE_SETUP
-#line 742 "./wikilex.l"
+#line 743 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock)) PRINT(wikiyytext); else wlex_reset (~0); }
YY_BREAK
case 70:
/* rule 70 can match eol */
YY_RULE_SETUP
-#line 743 "./wikilex.l"
+#line 744 "./wikilex.l"
{ if (0 < STATE(wlex_format_lock))
PRINT(wikiyytext);
else
@@ -12655,157 +12656,157 @@ YY_RULE_SETUP
/* Titles */
case 71:
YY_RULE_SETUP
-#line 754 "./wikilex.l"
+#line 755 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (wlex_count_header_level(wikiyytext)); }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 755 "./wikilex.l"
+#line 756 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (1); }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 756 "./wikilex.l"
+#line 757 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (wlex_count_header_level(wikiyytext)); }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 757 "./wikilex.l"
+#line 758 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (1); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 758 "./wikilex.l"
+#line 759 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (wlex_count_header_level(wikiyytext)); }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 759 "./wikilex.l"
+#line 760 "./wikilex.l"
{ BEGIN(INITIAL); wlex_headerlevel (1); }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 760 "./wikilex.l"
+#line 761 "./wikilex.l"
{ if (STATE(wlex_headerlevel)) PRINT("<NOTOC />"); else PRINT(wikiyytext); }
YY_BREAK
/* Lists */
case 78:
YY_RULE_SETUP
-#line 763 "./wikilex.l"
+#line 764 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list ((strchr(wikiyytext, '*') - wikiyytext) / 3, WLEX_LIST_UL, NULL); }
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 764 "./wikilex.l"
+#line 765 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list ((strdigit(wikiyytext) - wikiyytext) / 3, WLEX_LIST_OL, NULL); }
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 765 "./wikilex.l"
+#line 766 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list ((strnonws(wikiyytext) - wikiyytext) / 3, WLEX_LIST_DL, wikiyytext); }
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 766 "./wikilex.l"
+#line 767 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list (strchr(wikiyytext, '*') - wikiyytext, WLEX_LIST_UL, NULL); }
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 767 "./wikilex.l"
+#line 768 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list (strdigit(wikiyytext) - wikiyytext, WLEX_LIST_OL, NULL); }
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 768 "./wikilex.l"
+#line 769 "./wikilex.l"
{ BEGIN(INITIAL); wlex_list (strnonws(wikiyytext) - wikiyytext, WLEX_LIST_DL, wikiyytext); }
YY_BREAK
/* Font processing */
case 84:
YY_RULE_SETUP
-#line 771 "./wikilex.l"
+#line 772 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
case 85:
/* rule 85 can match eol */
YY_RULE_SETUP
-#line 773 "./wikilex.l"
+#line 774 "./wikilex.l"
{ if (WLEX_FONT_BU == STATE(wlex_font)) wlex_font (WLEX_FONT_DEFAULT); else COPYTEXT;}
YY_BREAK
case 86:
/* rule 86 can match eol */
YY_RULE_SETUP
-#line 774 "./wikilex.l"
+#line 775 "./wikilex.l"
{ if (WLEX_FONT_B == STATE(wlex_font)) wlex_font (WLEX_FONT_DEFAULT); else COPYTEXT;}
YY_BREAK
case 87:
/* rule 87 can match eol */
YY_RULE_SETUP
-#line 775 "./wikilex.l"
+#line 776 "./wikilex.l"
{ if (WLEX_FONT_U == STATE(wlex_font)) wlex_font (WLEX_FONT_DEFAULT); else COPYTEXT;}
YY_BREAK
case 88:
/* rule 88 can match eol */
YY_RULE_SETUP
-#line 776 "./wikilex.l"
+#line 777 "./wikilex.l"
{ if (WLEX_FONT_BTT == STATE(wlex_font)) wlex_font (WLEX_FONT_DEFAULT); else COPYTEXT;}
YY_BREAK
case 89:
/* rule 89 can match eol */
YY_RULE_SETUP
-#line 777 "./wikilex.l"
+#line 778 "./wikilex.l"
{ if (WLEX_FONT_TT == STATE(wlex_font)) wlex_font (WLEX_FONT_DEFAULT); else COPYTEXT;}
YY_BREAK
case 90:
/* rule 90 can match eol */
YY_RULE_SETUP
-#line 778 "./wikilex.l"
+#line 779 "./wikilex.l"
{ if (WLEX_FONT_I == STATE(wlex_font)) wlex_font (WLEX_FONT_DEFAULT); else COPYTEXT;}
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 780 "./wikilex.l"
+#line 781 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) { PRINT(" "); wlex_font (WLEX_FONT_BU); } else COPYTEXT; }
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 781 "./wikilex.l"
+#line 782 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) { PRINT(" "); wlex_font (WLEX_FONT_B); } else COPYTEXT; }
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 782 "./wikilex.l"
+#line 783 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) { PRINT(" "); wlex_font (WLEX_FONT_U); } else COPYTEXT; }
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 783 "./wikilex.l"
+#line 784 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) { PRINT(" "); wlex_font (WLEX_FONT_BTT); } else COPYTEXT; }
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 784 "./wikilex.l"
+#line 785 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) { PRINT(" "); wlex_font (WLEX_FONT_TT); } else COPYTEXT; }
YY_BREAK
case 96:
/* rule 96 can match eol */
YY_RULE_SETUP
-#line 785 "./wikilex.l"
+#line 786 "./wikilex.l"
{ if (WLEX_FONT_DEFAULT == STATE(wlex_font)) { PRINT(" "); wlex_font (WLEX_FONT_I); } else COPYTEXT; }
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 787 "./wikilex.l"
+#line 788 "./wikilex.l"
{ STATE(wlex_in_any_text) = 1; }
YY_BREAK
/* Other formatting */
case 98:
YY_RULE_SETUP
-#line 790 "./wikilex.l"
+#line 791 "./wikilex.l"
{ PRINT("<HR />"); }
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 791 "./wikilex.l"
+#line 792 "./wikilex.l"
{
PRINT("<A NAME=\"");
PRINT(strchr (wikiyytext, '#')+1);
@@ -12815,13 +12816,13 @@ YY_RULE_SETUP
/* Variables and macro calls */
case 100:
YY_RULE_SETUP
-#line 798 "./wikilex.l"
+#line 799 "./wikilex.l"
{ PRINT("<?"); NPRINT(wikiyytext+1,strlen(wikiyytext)-2); PRINT("?>"); }
YY_BREAK
case 101:
/* rule 101 can match eol */
YY_RULE_SETUP
-#line 799 "./wikilex.l"
+#line 800 "./wikilex.l"
{
char *lbrace = strchr (wikiyytext, '{');
char *rbrace = strchr (wikiyytext, '}');
@@ -12832,7 +12833,7 @@ YY_RULE_SETUP
case 102:
/* rule 102 can match eol */
YY_RULE_SETUP
-#line 805 "./wikilex.l"
+#line 806 "./wikilex.l"
{
char *lbrace = strchr (wikiyytext, '{');
char *rbrace = strchr (wikiyytext, '}');
@@ -12843,31 +12844,31 @@ YY_RULE_SETUP
case 103:
/* rule 103 can match eol */
YY_RULE_SETUP
-#line 811 "./wikilex.l"
+#line 812 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
/* Tables */
case 104:
/* rule 104 can match eol */
YY_RULE_SETUP
-#line 815 "./wikilex.l"
+#line 816 "./wikilex.l"
{ wlex_reset(~WLEX_RESET_LIST); BEGIN(TABLEHEADER); STATE(wlex_in_any_text) = 1; PRINT("\n<TABLE class=\"wikitable\">"); }
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 816 "./wikilex.l"
+#line 817 "./wikilex.l"
{ PRINT("\n<TR><TH"); wlex_id_print (STATEPTR); PRINT (">"); }
YY_BREAK
case 106:
/* rule 106 can match eol */
YY_RULE_SETUP
-#line 817 "./wikilex.l"
+#line 818 "./wikilex.l"
{ PRINT("</TH></TR>"); BEGIN(TABLELINE); }
YY_BREAK
case 107:
/* rule 107 can match eol */
YY_RULE_SETUP
-#line 818 "./wikilex.l"
+#line 819 "./wikilex.l"
{ PRINT("</TH></TR>"); }
YY_BREAK
case 108:
@@ -12876,33 +12877,33 @@ case 108:
(yy_c_buf_p) = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up wikiyytext again */
YY_RULE_SETUP
-#line 819 "./wikilex.l"
+#line 820 "./wikilex.l"
{ PRINT("</TH></TR>\n</TABLE>\n"); BEGIN(INITIAL); wlex_reset(~WLEX_RESET_LIST); }
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 820 "./wikilex.l"
+#line 821 "./wikilex.l"
{ PRINT("</TH><TH"); wlex_id_print (STATEPTR); PRINT (">"); }
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 821 "./wikilex.l"
+#line 822 "./wikilex.l"
{ PRINT("<"); }
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 822 "./wikilex.l"
+#line 823 "./wikilex.l"
{ ; }
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 823 "./wikilex.l"
+#line 824 "./wikilex.l"
{ PRINT(wikiyytext); }
YY_BREAK
case 113:
/* rule 113 can match eol */
YY_RULE_SETUP
-#line 826 "./wikilex.l"
+#line 827 "./wikilex.l"
{ wlex_reset(~WLEX_RESET_LIST); BEGIN(TABLELINE); STATE(wlex_in_any_text) = 1; PRINT("\n<TABLE class=\"wikitable\">"); }
YY_BREAK
case 114:
@@ -12910,18 +12911,18 @@ case 114:
(yy_c_buf_p) = yy_cp -= 2;
YY_DO_BEFORE_ACTION; /* set up wikiyytext again */
YY_RULE_SETUP
-#line 827 "./wikilex.l"
+#line 828 "./wikilex.l"
{ PRINT("\n<TR><TD ALIGN=\"center\">"); }
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 828 "./wikilex.l"
+#line 829 "./wikilex.l"
{ PRINT("\n<TR><TD>"); }
YY_BREAK
case 116:
/* rule 116 can match eol */
YY_RULE_SETUP
-#line 829 "./wikilex.l"
+#line 830 "./wikilex.l"
{ PRINT("</TD></TR>"); }
YY_BREAK
case 117:
@@ -12930,7 +12931,7 @@ case 117:
(yy_c_buf_p) = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up wikiyytext again */
YY_RULE_SETUP
-#line 830 "./wikilex.l"
+#line 831 "./wikilex.l"
{ PRINT("</TD></TR>\n</TABLE>\n"); BEGIN(INITIAL); wlex_reset(~WLEX_RESET_LIST); }
YY_BREAK
case 118:
@@ -12938,7 +12939,7 @@ case 118:
(yy_c_buf_p) = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up wikiyytext again */
YY_RULE_SETUP
-#line 831 "./wikilex.l"
+#line 832 "./wikilex.l"
{ PRINT("</TD><TD ALIGN=\"center\">"); }
YY_BREAK
case 119:
@@ -12946,33 +12947,33 @@ case 119:
(yy_c_buf_p) = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up wikiyytext again */
YY_RULE_SETUP
-#line 832 "./wikilex.l"
+#line 833 "./wikilex.l"
{ PRINT("</TD><TD STYLE=\"colspanstub\">"); }
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 833 "./wikilex.l"
+#line 834 "./wikilex.l"
{ PRINT("</TD><TD>"); }
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 834 "./wikilex.l"
+#line 835 "./wikilex.l"
{ PRINT("</TD><TD>"); }
YY_BREAK
case 122:
/* rule 122 can match eol */
YY_RULE_SETUP
-#line 835 "./wikilex.l"
+#line 836 "./wikilex.l"
{ ; }
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 836 "./wikilex.l"
+#line 837 "./wikilex.l"
{ PRINT("<"); }
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 837 "./wikilex.l"
+#line 838 "./wikilex.l"
{ PRINT(wikiyytext); }
YY_BREAK
/* Inlined verbatims
@@ -12983,22 +12984,22 @@ YY_RULE_SETUP
/* Others */
case 125:
YY_RULE_SETUP
-#line 847 "./wikilex.l"
+#line 848 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 848 "./wikilex.l"
+#line 849 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 849 "./wikilex.l"
+#line 850 "./wikilex.l"
{ PRINTTEXT("<"); }
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 850 "./wikilex.l"
+#line 851 "./wikilex.l"
{ COPYTEXT; }
YY_BREAK
case YY_STATE_EOF(INITIAL):
@@ -13007,15 +13008,15 @@ case YY_STATE_EOF(PLAINHTML):
case YY_STATE_EOF(TABLELINE):
case YY_STATE_EOF(TABLEHEADER):
case YY_STATE_EOF(WIKTOLOGY):
-#line 851 "./wikilex.l"
+#line 852 "./wikilex.l"
{ wlex_reset (~0); return 0; }
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 853 "./wikilex.l"
+#line 854 "./wikilex.l"
ECHO;
YY_BREAK
-#line 13019 "wikilex.c"
+#line 13020 "wikilex.c"
case YY_END_OF_BUFFER:
{
@@ -13988,7 +13989,7 @@ void wikiyyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 853 "./wikilex.l"
+#line 854 "./wikilex.l"
/*<INITIAL>.([^ \t\r\n\[\]#*_=<A-Z1-9-]*) { COPYTEXT; }*/
diff --git a/appsrc/ODS-Wiki/plugin/wikilex.l b/appsrc/ODS-Wiki/plugin/wikilex.l
index 913255a..2a34ab9 100644
--- a/appsrc/ODS-Wiki/plugin/wikilex.l
+++ b/appsrc/ODS-Wiki/plugin/wikilex.l
@@ -1,11 +1,11 @@
%{
/*
- * $Id: wikilex.l,v 1.15.2.4 2012/03/08 11:46:20 source Exp $
+ * $Id: wikilex.l,v 1.15.2.2 2010/09/20 10:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -19,6 +19,7 @@
* 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
+ *
*/
#include <ctype.h>
diff --git a/appsrc/ODS-Wiki/plugin/wikiv.c b/appsrc/ODS-Wiki/plugin/wikiv.c
index 5657478..3a64f6e 100644
--- a/appsrc/ODS-Wiki/plugin/wikiv.c
+++ b/appsrc/ODS-Wiki/plugin/wikiv.c
@@ -1,10 +1,10 @@
/*
- * $Id: wikiv.c,v 1.6.2.2 2012/03/08 10:46:23 source Exp $
+ * $Id: wikiv.c,v 1.6.2.1 2010/09/20 10:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/plugins.sql b/appsrc/ODS-Wiki/plugins.sql
index 6fe521d..bf8b6e0 100644
--- a/appsrc/ODS-Wiki/plugins.sql
+++ b/appsrc/ODS-Wiki/plugins.sql
@@ -1,12 +1,12 @@
--
--- $Id: plugins.sql,v 1.4.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: plugins.sql,v 1.4.2.1 2010/09/20 10:15:46 source Exp $
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/postinstall.sql b/appsrc/ODS-Wiki/postinstall.sql
index d6a5efa..f8fd51b 100644
--- a/appsrc/ODS-Wiki/postinstall.sql
+++ b/appsrc/ODS-Wiki/postinstall.sql
@@ -1,10 +1,10 @@
--
--- $Id: postinstall.sql,v 1.15.2.4 2012/03/08 10:49:48 source Exp $
+-- $Id: postinstall.sql,v 1.15.2.2 2011/05/18 21:17:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -42,7 +42,7 @@ WV.WIKI.SET_WIKI_MAIN();
WV.WIKI.SANITY_CHECK();
WV.WIKI.CREATEINSTANCE('Main', http_dav_uid(), WV.Wiki.WikiAdminGId(), 0);
WV.WIKI.CREATEINSTANCE('Doc', http_dav_uid(), WV.Wiki.WikiAdminGId(), 0);
-SIOC..fill_comments();
+sioc..fill_comments();
WV.WIKI.PUT_NEW_FILES('Main');
WV.WIKI.PUT_NEW_FILES('Doc',1);
WV.WIKI.PUT_NEW_FILES('Main',1,'WikiUsers');
@@ -57,8 +57,7 @@ create procedure WV.WIKI.temp ()
declare _content, _type any;
_topic_id := (select TopicId from WV.Wiki.CLUSTERS a, WV.Wiki.TOPIC b where a.ClusterId = b.ClusterId and a.ClusterName = 'Main' and b.LocalName = 'WMacros');
- if (not isnull (_topic_id))
- {
+ if (not isnull (_topic_id)) {
DB.DBA.DAV_RES_CONTENT_INT (DAV_SEARCH_ID ('/DAV/VAD/wiki/Main/Attachments/WikiMacroSources.sql', 'R'), _content, _type, 0, 0);
WV.WIKI.ATTACH2 (http_dav_uid(), 'WikiMacroSources.sql', _type, _topic_id, _content, '');
}
@@ -76,24 +75,8 @@ create procedure WV.WIKI.temp ()
registry_set ('wiki_services_update', '1');
}
;
-WV.WIKI.temp ();
-
-create procedure WV.WIKI.temp ()
-{
- if (registry_get ('wiki_acl_update') = '1')
- return;
- for (select ClusterId as _ClusterId, ClusterName as _ClusterName, ColId as _ColId from WV.WIKI.CLUSTERS) do
- {
- for (select TopicId as _TopicId, ResId as _ResId from WV.WIKI.TOPIC where ClusterId = _ClusterId) do
- {
- WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (_ClusterName, _ResId, 'R', 0);
- }
- WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (_ClusterName, _ColId, 'C', 0);
- }
- registry_set ('wiki_acl_update', '1');
-}
-;
WV.WIKI.temp ();
+
drop procedure WV.WIKI.temp;
diff --git a/appsrc/ODS-Wiki/proc_on.sql b/appsrc/ODS-Wiki/proc_on.sql
index 5cfaff1..d15eef1 100644
--- a/appsrc/ODS-Wiki/proc_on.sql
+++ b/appsrc/ODS-Wiki/proc_on.sql
@@ -1,10 +1,10 @@
--
--- $Id: proc_on.sql,v 1.44.2.17 2012/03/08 10:49:48 source Exp $
+-- $Id: proc_on.sql,v 1.44.2.15 2011/05/20 12:02:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -1065,8 +1065,7 @@ wiki_exec_no_error ('drop trigger WS.WS.Wiki_AttachmentDelete')
-- new triggers
wiki_exec_no_error ('drop trigger WS.WS.WIKI_SYS_DAV_RES_AI')
;
-
-create trigger "WIKI_SYS_DAV_RES_AI" after insert on WS.WS.SYS_DAV_RES order 10 referencing new as N
+create trigger "WIKI_SYS_DAV_RES_AI" after insert on WS.WS.SYS_DAV_RES order 1 referencing new as N
{
declare _id any;
declare _cluster_name varchar;
@@ -1109,9 +1108,9 @@ create trigger "WIKI_SYS_DAV_RES_AI" after insert on WS.WS.SYS_DAV_RES order 10
}
-- Topic Update Permissions
- -- SET TRIGGERS OFF;
- -- WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL ( _cluster_name, N.RES_ID, 'R');
- -- SET TRIGGERS ON;
+ SET TRIGGERS OFF;
+ WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL ( _cluster_name, N.RES_ID, 'R');
+ SET TRIGGERS ON;
-- Topic Sparql
if (N.RES_TYPE = 'application/sparql-query')
@@ -1137,29 +1136,12 @@ create trigger "WIKI_SYS_DAV_RES_AI" after insert on WS.WS.SYS_DAV_RES order 10
}
;
-wiki_exec_no_error ('drop trigger WS.WS.WIKI_SYS_DAV_RES_BU')
-;
-
-create trigger "WIKI_SYS_DAV_RES_BU" before update on WS.WS.SYS_DAV_RES order 1 referencing old as O, new as N
-{
- declare exit handler for sqlstate '*'
- {
- --dbg_obj_princ (__SQL_STATE, __SQL_MESSAGE);
- resignal;
- };
- if (O.RES_NAME like '%.txt' and O.RES_CONTENT is not null)
- connection_set ('DAV_RES_CONTENT_MD5', md5 (cast (O.RES_CONTENT as varchar)));
-}
-;
-
-
wiki_exec_no_error ('drop trigger WS.WS.WIKI_SYS_DAV_RES_AU')
;
-
-create trigger "WIKI_SYS_DAV_RES_AU" after update on WS.WS.SYS_DAV_RES order 10 referencing old as O, new as N
+create trigger "WIKI_SYS_DAV_RES_AU" after update on WS.WS.SYS_DAV_RES order 1 referencing old as O, new as N
{
declare _id integer;
- declare _o_res_content_md5, _cluster_name, _local_name varchar;
+ declare _cluster_name, _local_name varchar;
declare _topic WV.WIKI.TOPICINFO;
declare exit handler for sqlstate '*'
{
@@ -1175,8 +1157,7 @@ create trigger "WIKI_SYS_DAV_RES_AU" after update on WS.WS.SYS_DAV_RES order 10
_cluster_name := (select ClusterName from WV.WIKI.CLUSTERS where ColId = N.RES_COL);
if (not isnull (_cluster_name))
{
- _o_res_content_md5 := connection_get ('DAV_RES_CONTENT_MD5');
- if (_o_res_content_md5 <> md5 (cast (N.RES_CONTENT as varchar)))
+ if (O.RES_CONTENT <> N.RES_CONTENT)
{
_topic := WV.WIKI.TOPICINFO();
_topic.ti_cluster_name := _cluster_name;
@@ -1203,9 +1184,9 @@ create trigger "WIKI_SYS_DAV_RES_AU" after update on WS.WS.SYS_DAV_RES order 10
}
-- Topic Update Permissions
- -- SET TRIGGERS OFF;
- -- WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL ( _cluster_name, N.RES_ID, 'R');
- -- SET TRIGGERS ON;
+ SET TRIGGERS OFF;
+ WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL ( _cluster_name, N.RES_ID, 'R');
+ SET TRIGGERS ON;
-- Topic Sparql
if (N.RES_TYPE = 'application/sparql-query')
@@ -1789,102 +1770,97 @@ create procedure WV.WIKI.CREATEROLES (in _cname varchar)
}
;
-create procedure WV.WIKI.UPDATEACL (
- in _path varchar,
- in _type varchar,
- in _gid integer,
- in _bitmask integer,
- in _auth_name varchar,
- in _auth_pwd varchar)
+create procedure WV.WIKI.UPDATEACL (in _article varchar, in _gid integer, in _bitmask integer, in _auth_name varchar, in _auth_pwd varchar)
{
+ --dbg_obj_princ ('UPDATEACL: ', _article, ' ', _gid, ' ', '_bitmask', ' ');
declare _acl any;
- declare _res integer;
- declare _new_acl any;
-
- _acl := DB.DBA.DAV_PROP_GET_INT (DB.DBA.DAV_SEARCH_ID (_path, _type), _type, ':virtacl', 0);
+ _acl := DB.DBA.DAV_PROP_GET(_article, ':virtacl', _auth_name, _auth_pwd);
if (not isinteger (_acl))
{
+ declare _res integer;
+ declare _new_acl, _old_acl any;
_acl := cast (_acl as varbinary);
- _new_acl := _acl;
- WS.WS.ACL_REMOVE_ENTRY(_new_acl, _gid, _bitmask, 0);
- if (_type = 'C')
- WS.WS.ACL_ADD_ENTRY(_new_acl, _gid, _bitmask, 1, 1);
+ _old_acl := _acl;
+ _new_acl := WS.WS.ACL_ADD_ENTRY(_old_acl, _gid, _bitmask, 1);
+ --dbg_obj_print (ws.ws.ACL_PARSE(_acl), ws.ws.acl_parse(_new_acl));
if (1 or _acl <> _new_acl)
{
- _res := DB.DBA.DAV_PROP_SET_INT (_path, ':virtacl', _new_acl, null, null, 0, 0, 0, http_dav_uid ());
+ _acl := _new_acl;
+ --dbg_obj_princ (_article, _gid, _auth_name, _auth_pwd, _acl);
+ _res := DB.DBA.DAV_PROP_SET_INT(_article, ':virtacl', _acl, null, null, 0, 0, 0, http_dav_uid ());
if (_res < 0)
- signal ('WIKI00', sprintf ('Can not update ACL: %d %d', _res, coalesce ((select top 1 RES_OWNER from WS.WS.SYS_DAV_RES where RES_ID = (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _path)), 0)));
+ signal ('WIKI00', sprintf ('Can not update ACL: %d %d',_res,coalesce ((select top 1 RES_OWNER from WS.WS.SYS_DAV_RES where RES_ID = (select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _article)), 0)));
}
}
+ else
+ signal ('WIKI01', ':virtacl property retrieval failed: ' || DAV_PERROR (_acl));
}
;
-create procedure WV.WIKI.UPDATEGRANTS (
- in _cname varchar,
- in _signal integer := 0)
+create procedure WV.WIKI.UPDATEGRANTS (in _cname varchar, in signalerror int:=0)
{
declare _readers, _writers integer;
-
- _readers := (select U_ID from DB.DBA.SYS_USERS where U_NAME = _cname || 'Readers' and U_IS_ROLE = 1);
- _writers := (select U_ID from DB.DBA.SYS_USERS where U_NAME = _cname || 'Writers' and U_IS_ROLE = 1);
+ _readers := ( select U_ID from DB.DBA.SYS_USERS where U_NAME = _cname || 'Readers'
+ and U_IS_ROLE = 1 );
+ _writers := ( select U_ID from DB.DBA.SYS_USERS where U_NAME = _cname || 'Writers'
+ and U_IS_ROLE = 1 );
if ( (_readers is null) or (_writers is null) )
{
- if (_signal)
+ if (signalerror)
signal ('WK002', 'No readers or writers group for ' || _cname);
-
+ else
return;
}
- for (select DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_PATH (ResId, 'R')) as _path
- from WV.WIKI.TOPIC natural
- inner join WV.WIKI.CLUSTERS
- where clustername = _cname) do
- {
+ for select DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_PATH (ResId, 'R')) as _path
+ from WV.WIKI.TOPIC natural inner join WV.WIKI.CLUSTERS
+ where clustername = _cname
+ do {
if (_path is not null)
{
declare _owner, _pwd varchar;
-
_owner := WV.WIKI.CLUSTERPARAM (_cname, 'creator', 'dav');
- select U_NAME, pwd_magic_calc (U_NAME, U_PASSWORD, 1) into _owner, _pwd from DB.DBA.SYS_USERS where U_NAME = _owner;
+ select U_NAME, pwd_magic_calc (U_NAME, U_PASSWORD, 1) into _owner, _pwd
+ from DB.DBA.SYS_USERS
+ where U_NAME = _owner;
- WV.WIKI.UPDATEACL (_path, 'R', _writers, 6, _owner, _pwd);
- WV.WIKI.UPDATEACL (_path, 'R', _readers, 4, _owner, _pwd);
+ WV.WIKI.UPDATEACL (_path, _writers, 6, _owner, _pwd);
+ WV.WIKI.UPDATEACL (_path, _readers, 4, _owner, _pwd);
}
}
}
;
-create procedure WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (
- in _cname varchar,
- in _id integer,
- in _type varchar(1) := 'R',
- in _signal integer := 1)
+create procedure WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (in _cname varchar, in _res_id integer, in _type varchar(1):='R')
{
declare _readers, _writers integer;
declare _path varchar;
declare _owner, _pwd varchar;
- _readers := ( select U_ID from DB.DBA.SYS_USERS where U_NAME = _cname || 'Readers' and U_IS_ROLE = 1 );
- _writers := ( select U_ID from DB.DBA.SYS_USERS where U_NAME = _cname || 'Writers' and U_IS_ROLE = 1 );
+ _readers := ( select U_ID from DB.DBA.SYS_USERS where U_NAME = _cname || 'Readers'
+ and U_IS_ROLE = 1 );
+ _writers := ( select U_ID from DB.DBA.SYS_USERS where U_NAME = _cname || 'Writers'
+ and U_IS_ROLE = 1 );
if ( (_readers is null) or (_writers is null) )
- {
- if (_signal)
signal ('XXXXX', 'No readers or writers group for ' || _cname);
- return;
- }
-
- _path := DB.DBA.DAV_SEARCH_PATH (_id, _type);
- if (isinteger (_path))
+ _path := DB.DBA.DAV_SEARCH_PATH (_res_id, _type);
+ --dbg_obj_princ (':::' , _path);
+ if (not isinteger (_path))
{
- if (_signal)
- signal ('XXXXX', 'path is unknown');
- return;
- }
-
- _owner := WV.WIKI.CLUSTERPARAM (_cname, 'creator', 'dav');
- select U_NAME, pwd_magic_calc (U_NAME, U_PASSWORD, 1) into _owner, _pwd from DB.DBA.SYS_USERS where U_NAME = _owner;
-
- WV.WIKI.UPDATEACL (_path, _type, _writers, 6, _owner, _pwd);
- WV.WIKI.UPDATEACL (_path, _type, _readers, 4, _owner, _pwd);
+ _owner := WV.WIKI.CLUSTERPARAM (_cname, 'creator', 'dav');
+ select U_NAME, pwd_magic_calc (U_NAME, U_PASSWORD, 1) into _owner, _pwd
+ from DB.DBA.SYS_USERS
+ where U_NAME = _owner;
+
+
+-- declare _cluster_id integer;
+-- _cluster_id := (select ClusterId from WV.WIKI.CLUSTERS where ClusterName = _cname);
+-- update WS.WS.SYS_DAV_COL set COL_PERMS = WV.WIKI.GETDEFAULTPERMS (_cluster_id)
+-- where COL_ID = _res_id;
+ WV.WIKI.UPDATEACL (_path, _writers, 6, _owner, _pwd);
+ WV.WIKI.UPDATEACL (_path, _readers, 4, _owner, _pwd);
+ }
+ else
+ signal ('XXXX', 'path is unknown');
}
;
@@ -1892,14 +1868,14 @@ create procedure WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (
-- create all parent collections
create procedure WV.WIKI.ENSURE_DIR_REC (in _paths any, in _last_index integer)
{
+ --dbg_obj_princ ('WV.WIKI.ENSURE_DIR_REC ', _paths, _last_index);
if (_last_index <= 2) -- /DAV
return 1;
-
declare _col_id integer;
declare _full_path varchar;
-
_full_path := WV.WIKI.STRJOIN ('/', subseq (_paths, 0, _last_index)) || '/';
_col_id := DAV_SEARCH_ID (_full_path, 'C');
+ --dbg_obj_princ ('col_id: ', _col_id, _full_path);
if (DAV_HIDE_ERROR(_col_id) is null)
{
if (WV.WIKI.ENSURE_DIR_REC (_paths, _last_index - 1) < 0)
@@ -1910,6 +1886,8 @@ create procedure WV.WIKI.ENSURE_DIR_REC (in _paths any, in _last_index integer)
}
;
+
+
create procedure WV.WIKI.DAV_HOME_CREATE(in user_name varchar) returns varchar
{
declare user_id varchar;
@@ -1958,7 +1936,9 @@ error:
create procedure WV.WIKI.CREATECLUSTER (in _cname varchar, in _src_col integer, in _owner integer, in _group integer, in signal_err int:=1)
{
+ --dbg_obj_print ('1');
declare exit handler for sqlstate '42WV9' {
+ --dbg_obj_print ('1err');
if (signal_err = 1)
resignal;
return;
@@ -1970,27 +1950,33 @@ create procedure WV.WIKI.CREATECLUSTER (in _cname varchar, in _src_col integer,
-- Preparing user name
_uname := coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = _owner and U_IS_ROLE = 0), NULL);
if (_uname is null)
- WV.WIKI.APPSIGNAL (11001, 'User ID "&UId;" is invalid; can not create cluster "&ClusterName;"', vector ('UId', _owner, 'ClusterName', _cname) );
+ WV.WIKI.APPSIGNAL (11001, 'User ID "&UId;" is invalid; can not create cluster "&ClusterName;"',
+ vector ('UId', _owner, 'ClusterName', _cname) );
+ --dbg_obj_print ('2');
if (exists (select 1 from DB.DBA.SYS_USERS where U_ID = _owner and U_ACCOUNT_DISABLED <> 0))
- WV.WIKI.APPSIGNAL (11001, 'Account "&UName;" is disabled; can not create cluster "&ClusterName;"', vector ('UName', _uname, 'ClusterName', _cname) );
+ WV.WIKI.APPSIGNAL (11001, 'Account "&UName;" is disabled; can not create cluster "&ClusterName;"',
+ vector ('UName', _uname, 'ClusterName', _cname) );
+ --dbg_obj_print ('4');
if (exists (select 1 from DB.DBA.SYS_USERS where U_ID = _owner and U_DAV_ENABLE = 0))
- WV.WIKI.APPSIGNAL (11001, 'Account "&UName;" has no right to use DAV; can not create cluster "&ClusterName;"', vector ('UName', _uname, 'ClusterName', _cname) );
-
+ WV.WIKI.APPSIGNAL (11001, 'Account "&UName;" has no right to use DAV; can not create cluster "&ClusterName;"',
+ vector ('UName', _uname, 'ClusterName', _cname) );
_wikiuname := coalesce ((select UserName from WV.WIKI.USERS where UserId = _owner), NULL);
if (_wikiuname is null)
- WV.WIKI.APPSIGNAL (11001, 'User "&UserName;" is not a registered Wiki user; can not create cluster "&ClusterName;"', vector ('UserName', _uname, 'ClusterName', _cname) );
-
+ WV.WIKI.APPSIGNAL (11001, 'User "&UserName;" is not a registered Wiki user; can not create cluster "&ClusterName;"',
+ vector ('UserName', _uname, 'ClusterName', _cname) );
-- Preparing group name
_gname := coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = _group and U_IS_ROLE = 1), NULL);
if (_gname is null)
- WV.WIKI.APPSIGNAL (11001, 'Group ID "&GId;" is invalid; can not create cluster "&ClusterName;"', vector ('GId', _group, 'ClusterName', _cname) );
+ WV.WIKI.APPSIGNAL (11001, 'Group ID "&GId;" is invalid; can not create cluster "&ClusterName;"',
+ vector ('GId', _group, 'ClusterName', _cname) );
+ --dbg_obj_print ('5');
_wikigname := coalesce ((select GroupName from WV.WIKI.GROUPS where GroupId = _group), NULL);
if (_wikigname is null)
- WV.WIKI.APPSIGNAL (11001, 'Group "&UserName;" is not a valid Wiki group; can not create cluster "&ClusterName;"', vector ('GName', _gname, 'ClusterName', _cname) );
-
+ WV.WIKI.APPSIGNAL (11001, 'Group "&UserName;" is not a valid Wiki group; can not create cluster "&ClusterName;"',
+ vector ('GName', _gname, 'ClusterName', _cname) );
-- Preparing parent for internal files
_home := (select U_HOME from DB.DBA.SYS_USERS where U_ID = _owner and U_IS_ROLE = 0);
if (_home is not null)
@@ -2006,8 +1992,11 @@ create procedure WV.WIKI.CREATECLUSTER (in _cname varchar, in _src_col integer,
-- Check if a cluster is already registered.
if (exists (select * from WV.WIKI.CLUSTERS where ClusterName = _cname))
{
+ --dbg_obj_print ('7');
+
if (signal_err = 1)
- WV.WIKI.APPSIGNAL (11001, 'Cluster "&ClusterName;" already exists', vector ('ClusterName', _cname) );
+ WV.WIKI.APPSIGNAL (11001, 'Cluster "&ClusterName;" already exists',
+ vector ('ClusterName', _cname) );
else
return;
}
@@ -2015,23 +2004,27 @@ create procedure WV.WIKI.CREATECLUSTER (in _cname varchar, in _src_col integer,
if (_src_col <> 0)
{
if (DB.DBA.DAV_SEARCH_PATH (_src_col, 'C') < 0)
- WV.WIKI.APPSIGNAL (11001, 'Invalid DAV collection ID "&ColId;"; can not create cluster "&ClusterName;"', vector ('ColId', _src_col, 'ClusterName', _cname) );
+ WV.WIKI.APPSIGNAL (11001, 'Invalid DAV collection ID "&ColId;"; can not create cluster "&ClusterName;"',
+ vector ('ColId', _src_col, 'ClusterName', _cname) );
_main := _src_col;
}
else
{
_main := WV.WIKI.CREATEDAVCOLLECTION (_parent, _cname, _owner, _group);
}
+ --dbg_obj_print ('8');
if (__proc_exists('DB.DBA.Versioning_DAV_SEARCH_ID'))
{
_histcol := WV.WIKI.CREATEDAVCOLLECTION (_main, 'VVC', _owner, _group);
DB.DBA.DAV_SET_VERSIONING_CONTROL (DAV_SEARCH_PATH (_main, 'C'), NULL, 'A', 'dav', (select pwd_magic_calc (U_NAME, U_PWD, 1) from WS.WS.SYS_DAV_USER where U_ID = http_dav_uid() ));
}
-
next:
- declare _cluster_id integer;
+ --dbg_obj_print ('9');
+ -- _xmlcol := WV.WIKI.CREATEDAVCOLLECTION (_main, 'xml', _owner, _group);
+ -- _attachcol := WV.WIKI.CREATEDAVCOLLECTION (_main, 'attach', _owner, _group);
+ declare _cluster_id integer;
_cluster_id := WV.WIKI.NEWCLUSTERID();
insert into WV.WIKI.CLUSTERS (ClusterId, ClusterName, ColId, ColHistoryId, ColXmlId, ColAttachId, AdminId, C_NEWS_ID)
values (_cluster_id, _cname, _main, _histcol, _xmlcol, _attachcol, _owner, 'oWiki-' || _cname);
@@ -2051,15 +2044,21 @@ next:
NULL,
NULL);
WV.WIKI.GETLOCK (_full_path, 'dav');
- _res := WV.WIKI.UPLOADPAGE (_col_id, _name, blob_to_string (_content) || ' ', _uname, _cluster_id, 'dav');
+ _res := WV.WIKI.UPLOADPAGE (_col_id, _name, blob_to_string (_content) || ' ',
+ _uname, _cluster_id, 'dav');
+-- DB.DBA.DAV_CHECKIN_INT (_full_path, null, null, 0);
WV.WIKI.RELEASELOCK (_full_path, 'dav');
}
WV.WIKI.CREATEROLES (_cname);
+ --dbg_obj_print ('11');
- if ((_cname <> 'Main') and (_cname <> 'Doc'))
+ if ( (_cname <> 'Main') and
+ (_cname <> 'Doc'))
{
WV.WIKI.UPDATEGRANTS_FOR_RES_OR_COL (_cname, _main, 'C');
WV.WIKI.IMPORT(_cname, '/DAV/VAD/wiki/Template/', '/DAV/VAD/wiki/Template/', 'dav');
+-- WV.WIKI.CREATEINITIALPAGE ('ClusterSummary.txt', _main, _owner, 'Template');
+-- WV.WIKI.CREATEINITIALPAGE ('WelcomeVisitors.txt', _main, _owner, 'Template');
}
else
{
@@ -2071,6 +2070,8 @@ next:
}
WV.WIKI.SETCLUSTERPARAM (_cname, 'creator', _uname);
+ --dbg_obj_print ('12');
+
}
;
@@ -2108,16 +2109,15 @@ create procedure WV.WIKI.UPLOADPAGE (
connection_set ('oWiki_cluster_id', null);
declare wiki_user varchar;
declare user_id integer;
-
user_id := (select U_ID from DB.DBA.SYS_USERS where U_NAME = _user);
wiki_user := WV.WIKI.USER_WIKI_NAME_2 (user_id);
- update WV.WIKI.TOPIC
- set AuthorName = 'Main.' || wiki_user,
- AuthorId = user_id
+ update WV.WIKI.TOPIC set AuthorName = 'Main.' || wiki_user
+ , AuthorId = user_id
where ResId = _res_id;
if (_res_id < 0)
WV.WIKI.APPSIGNAL (11001, 'Cannot upload content at &path;', vector ('path', _path));
+ --dbg_obj_princ ('perms=', _perms, ' res= ', _res_id);
return _res_id;
}
;
@@ -2138,15 +2138,19 @@ create procedure WV.WIKI.CREATEINITIALPAGE (in _page varchar,
{
declare _fullpath varchar;
_fullpath := DB.DBA.DAV_SEARCH_PATH (_main, 'C') || _page;
+-- WV.WIKI.GETLOCK (_fullpath, 'dav');
WV.WIKI.UPLOADPAGE (_main, _page, _content, _owner, 0, 'dav', _overwrite);
+-- DB.DBA.DAV_CHECKIN_INT (_fullpath, null, null, 0);
+-- WV.WIKI.RELEASELOCK (_fullpath, 'dav');
}
-fin:;
+fin:
+ ;
}
;
-
create procedure WV.WIKI.DELETETOPIC (in _id integer)
{
+ --dbg_obj_princ ('DELETETOPIC: ', _id);
delete from WV.WIKI.TOPIC where TopicId = _id;
if (__proc_exists ('DB.DBA.WA_NEW_WIKI_RM'))
WA_NEW_WIKI_RM (_id);
diff --git a/appsrc/ODS-Wiki/proc_on_api.sql b/appsrc/ODS-Wiki/proc_on_api.sql
index a9990d0..96b4afc 100644
--- a/appsrc/ODS-Wiki/proc_on_api.sql
+++ b/appsrc/ODS-Wiki/proc_on_api.sql
@@ -1,10 +1,10 @@
--
--- $Id: proc_on_api.sql,v 1.1.2.7 2012/03/08 10:46:22 source Exp $
+-- $Id: proc_on_api.sql,v 1.1.2.6 2011/03/26 14:21:51 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/proc_on_macro.sql b/appsrc/ODS-Wiki/proc_on_macro.sql
index 80c9176..9344a03 100644
--- a/appsrc/ODS-Wiki/proc_on_macro.sql
+++ b/appsrc/ODS-Wiki/proc_on_macro.sql
@@ -1,10 +1,10 @@
--
--- $Id: proc_on_macro.sql,v 1.22.2.7 2012/03/08 13:13:48 source Exp $
+-- $Id: proc_on_macro.sql,v 1.22.2.5 2011/01/31 11:17:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -914,7 +914,7 @@ create function WV.WIKI.MACRO_COMMUNITYTABS (inout _data varchar, inout _context
};
create function WV.WIKI.MACRO_BLOGNAV (inout _data varchar, inout _context any, inout _env any) {
- return '<div style="width: 100%; clear: both; float: none; margin-top: 5em"><hr /></div><div id="blognav" style="width: 100%; padding: 3px; background: #2CBCEF; color: white; font-family: helvetica; font-size: 10pt; text-align: left; float:none; clear:both">Copyright (C) 1998-2012 [[http://www.openlinksw.com/][OpenLink Software]]</div>';
+ return '<div style="width: 100%; clear: both; float: none; margin-top: 5em"><hr /></div><div id="blognav" style="width: 100%; padding: 3px; background: #2CBCEF; color: white; font-family: helvetica; font-size: 10pt; text-align: left; float:none; clear:both">Copyright (C) 1998-2010 [[http://www.openlinksw.com/][OpenLink Software]]</div>';
};
create function WV.WIKI.MACRO_VSREALM (inout _data varchar, inout _context any, inout _env any) {
diff --git a/appsrc/ODS-Wiki/proc_on_vsp.sql b/appsrc/ODS-Wiki/proc_on_vsp.sql
index a5088a8..daa7a6d 100644
--- a/appsrc/ODS-Wiki/proc_on_vsp.sql
+++ b/appsrc/ODS-Wiki/proc_on_vsp.sql
@@ -1,10 +1,10 @@
--
--- $Id: proc_on_vsp.sql,v 1.44.2.13 2012/03/08 10:46:22 source Exp $
+-- $Id: proc_on_vsp.sql,v 1.44.2.12 2011/08/01 14:12:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/proc_tmp.sql b/appsrc/ODS-Wiki/proc_tmp.sql
index 265be23..6fc975c 100644
--- a/appsrc/ODS-Wiki/proc_tmp.sql
+++ b/appsrc/ODS-Wiki/proc_tmp.sql
@@ -1,10 +1,10 @@
--
--- $Id: proc_tmp.sql,v 1.6.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: proc_tmp.sql,v 1.6.2.1 2010/09/20 10:15:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/retry.sh b/appsrc/ODS-Wiki/retry.sh
index bfe35bb..26c89f1 100755
--- a/appsrc/ODS-Wiki/retry.sh
+++ b/appsrc/ODS-Wiki/retry.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: retry.sh,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+# $Id: retry.sh,v 1.2.2.1 2010/09/20 10:15:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/schema_on.sql b/appsrc/ODS-Wiki/schema_on.sql
index bfa629b..3303402 100644
--- a/appsrc/ODS-Wiki/schema_on.sql
+++ b/appsrc/ODS-Wiki/schema_on.sql
@@ -1,10 +1,10 @@
--
--- $Id: schema_on.sql,v 1.16.2.3 2012/03/08 10:46:22 source Exp $
+-- $Id: schema_on.sql,v 1.16.2.2 2011/01/31 11:17:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/semantics.sql b/appsrc/ODS-Wiki/semantics.sql
index 7d17a60..02a33ff 100644
--- a/appsrc/ODS-Wiki/semantics.sql
+++ b/appsrc/ODS-Wiki/semantics.sql
@@ -1,10 +1,10 @@
--
--- $Id: semantics.sql,v 1.3.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: semantics.sql,v 1.3.2.1 2010/09/20 10:15:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/setup.isql b/appsrc/ODS-Wiki/setup.isql
index 0471f90..c76a689 100644
--- a/appsrc/ODS-Wiki/setup.isql
+++ b/appsrc/ODS-Wiki/setup.isql
@@ -1,10 +1,10 @@
--
--- $Id: setup.isql,v 1.2.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: setup.isql,v 1.2.2.1 2010/09/20 10:15:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/setup_vad.sql b/appsrc/ODS-Wiki/setup_vad.sql
index 72205e1..a01e19d 100644
--- a/appsrc/ODS-Wiki/setup_vad.sql
+++ b/appsrc/ODS-Wiki/setup_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup_vad.sql,v 1.7.2.4 2012/03/08 10:46:22 source Exp $
+-- $Id: setup_vad.sql,v 1.7.2.3 2011/05/20 12:02:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/sioc.sql b/appsrc/ODS-Wiki/sioc.sql
index c70d4b0..f53348f 100644
--- a/appsrc/ODS-Wiki/sioc.sql
+++ b/appsrc/ODS-Wiki/sioc.sql
@@ -1,10 +1,10 @@
--
--- $Id: sioc.sql,v 1.14.2.6 2012/03/08 10:49:48 source Exp $
+-- $Id: sioc.sql,v 1.14.2.4 2011/05/18 21:17:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -148,7 +148,7 @@ create procedure fill_ods_wiki_sioc (in graph_iri varchar, in site_iri varchar,
order by WAI_ID) do
{
w_iri := wiki_iri (WAI_NAME);
- iri := sprintf ('http://%s/dataspace/doc/%s/wiki/%s/atom-pub/', get_cname(), U_NAME, WAI_NAME);
+ iri := sprintf ('http://%s/dataspace/%s/wiki/%s/atom-pub/', get_cname(), U_NAME, WAI_NAME);
ods_sioc_service (graph_iri, iri, w_iri, null, null, null, iri, 'Atom');
cnt := cnt + 1;
if (mod (cnt, 500) = 0)
diff --git a/appsrc/ODS-Wiki/upstream.sql b/appsrc/ODS-Wiki/upstream.sql
index 5156675..618f98a 100644
--- a/appsrc/ODS-Wiki/upstream.sql
+++ b/appsrc/ODS-Wiki/upstream.sql
@@ -1,14 +1,14 @@
--
-- upstream.sql
--
--- $Id: upstream.sql,v 1.9.2.9 2012/03/08 10:46:22 source Exp $
+-- $Id: upstream.sql,v 1.9.2.8 2011/01/31 11:17:53 source Exp $
--
-- Atom publishing protocol support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/vad_version b/appsrc/ODS-Wiki/vad_version
index d03b9b9..dcdf900 100644
--- a/appsrc/ODS-Wiki/vad_version
+++ b/appsrc/ODS-Wiki/vad_version
@@ -1 +1 @@
-1.05.4550
+1.05.4531
diff --git a/appsrc/ODS-Wiki/version.base b/appsrc/ODS-Wiki/version.base
new file mode 100644
index 0000000..b9e5dd7
--- /dev/null
+++ b/appsrc/ODS-Wiki/version.base
@@ -0,0 +1 @@
+540
diff --git a/appsrc/ODS-Wiki/version.curr b/appsrc/ODS-Wiki/version.curr
new file mode 100644
index 0000000..2850d73
--- /dev/null
+++ b/appsrc/ODS-Wiki/version.curr
@@ -0,0 +1 @@
+4531
diff --git a/appsrc/ODS-Wiki/wa_integration.sql b/appsrc/ODS-Wiki/wa_integration.sql
index 6db6ce5..97a69b6 100644
--- a/appsrc/ODS-Wiki/wa_integration.sql
+++ b/appsrc/ODS-Wiki/wa_integration.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_integration.sql,v 1.26.2.4 2012/03/08 10:49:48 source Exp $
+-- $Id: wa_integration.sql,v 1.26.2.2 2010/09/20 10:15:48 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -278,7 +278,7 @@ create method wa_new_inst (in login varchar) for wa_wikiv {
-- SIOC service
declare graph_iri, iri, w_iri varchar;
graph_iri := SIOC..get_graph ();
- iri := sprintf ('http://%s/dataspace/doc/%s/wiki/%s/atom-pub/', SIOC..get_cname(), login, inst_name);
+ iri := sprintf ('http://%s/dataspace/%s/wiki/%s/atom-pub/', SIOC..get_cname(), login, inst_name);
w_iri := SIOC..wiki_iri (inst_name);
SIOC..ods_sioc_service (graph_iri, iri, w_iri, null, null, null, iri, 'Atom');
diff --git a/appsrc/ODS-Wiki/wa_search_wiki.sql b/appsrc/ODS-Wiki/wa_search_wiki.sql
index 174cd60..7456cef 100644
--- a/appsrc/ODS-Wiki/wa_search_wiki.sql
+++ b/appsrc/ODS-Wiki/wa_search_wiki.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_search_wiki.sql,v 1.4.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: wa_search_wiki.sql,v 1.4.2.1 2010/09/20 10:15:48 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/appsrc/ODS-Wiki/webmail.sql b/appsrc/ODS-Wiki/webmail.sql
index f7c5e1f..0b7fd24 100644
--- a/appsrc/ODS-Wiki/webmail.sql
+++ b/appsrc/ODS-Wiki/webmail.sql
@@ -1,10 +1,10 @@
--
--- $Id: webmail.sql,v 1.5.2.2 2012/03/08 10:46:22 source Exp $
+-- $Id: webmail.sql,v 1.5.2.1 2010/09/20 10:15:48 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/autogen.sh b/autogen.sh
index 46f83df..4512168 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
diff --git a/bin/generate b/bin/generate
index 24cd416..805b493 100755
--- a/bin/generate
+++ b/bin/generate
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: generate,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+# $Id: generate,v 1.3 2008/09/17 08:35:51 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/bin/makever b/bin/makever
index ece4326..920d799 100755
--- a/bin/makever
+++ b/bin/makever
@@ -5,7 +5,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -93,7 +93,7 @@ then
OpenLink Version Information
Version $PRODUCT_VERSION as of $DATE.
Compiled for $UNAME_SYSTEM $UNAME_RELEASE
- Copyright (C) 1998-2012 OpenLink Software.
+ Copyright (C) OpenLink Software.
Usage: makever [OPTIONS]
@@ -118,7 +118,7 @@ cat >$OUTPUT_FILE <<-EOF_VERSION
$PRODUCT_NAME\\n\\
Version $PRODUCT_VERSION as of $DATE.\\n\\
Compiled for $UNAME_SYSTEM $UNAME_RELEASE\\n\\
- Copyright (C) 1998-2012 OpenLink Software.\\n";
+ Copyright (C) OpenLink Software.\\n";
EOF_VERSION
exit 0
diff --git a/binsrc/Makefile.am b/binsrc/Makefile.am
index f8225fc..275c481 100644
--- a/binsrc/Makefile.am
+++ b/binsrc/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
#
#
-SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel b3s tutorial yacutia samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena sesame sesame2 sesame3 redland hibernate dbpedia
+SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel b3s tutorial yacutia samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena sesame sesame2 sesame3 redland hibernate
# ----------------------------------------------------------------------
diff --git a/binsrc/Makefile.in b/binsrc/Makefile.in
index 18c4fa8..98c4828 100644
--- a/binsrc/Makefile.in
+++ b/binsrc/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -139,7 +139,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -188,7 +187,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -240,7 +238,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -287,6 +284,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -311,7 +309,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
vaddir = @vaddir@
-SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel b3s tutorial yacutia samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena sesame sesame2 sesame3 redland hibernate dbpedia
+SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel b3s tutorial yacutia samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena sesame sesame2 sesame3 redland hibernate
# ----------------------------------------------------------------------
#
diff --git a/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs b/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs
index 1c2c7e4..d1335cb 100644
--- a/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs
+++ b/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ArrayOfLongPacked.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: ArrayOfLongPacked.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/AssemblyInfo.cs b/binsrc/VirtuosoClient.Net/AssemblyInfo.cs
index 08422e7..57489bc 100644
--- a/binsrc/VirtuosoClient.Net/AssemblyInfo.cs
+++ b/binsrc/VirtuosoClient.Net/AssemblyInfo.cs
@@ -1,5 +1,5 @@
//
-// $Id: AssemblyInfo.cs,v 1.3.2.1 2012/03/08 13:13:48 source Exp $
+// $Id: AssemblyInfo.cs,v 1.3 2007/05/29 12:13:12 source Exp $
//
using System.Reflection;
@@ -25,7 +25,7 @@ using System.Runtime.CompilerServices;
#endif
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("OpenLink Software")]
-[assembly: AssemblyCopyright("Copyright (C) 1998-2012 OpenLink Software. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright (C) OpenLink Software 2007. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/binsrc/VirtuosoClient.Net/BlobHandle.cs b/binsrc/VirtuosoClient.Net/BlobHandle.cs
index 54bb5aa..2328d0d 100644
--- a/binsrc/VirtuosoClient.Net/BlobHandle.cs
+++ b/binsrc/VirtuosoClient.Net/BlobHandle.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: BlobHandle.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: BlobHandle.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/BufferType.cs b/binsrc/VirtuosoClient.Net/BufferType.cs
index ac524e2..9e49898 100644
--- a/binsrc/VirtuosoClient.Net/BufferType.cs
+++ b/binsrc/VirtuosoClient.Net/BufferType.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: BufferType.cs,v 1.3.2.4 2012/03/08 12:54:55 source Exp $
+// $Id: BufferType.cs,v 1.3.2.3 2011/10/17 09:48:25 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/CLI.cs b/binsrc/VirtuosoClient.Net/CLI.cs
index 7dd3f96..65872e6 100644
--- a/binsrc/VirtuosoClient.Net/CLI.cs
+++ b/binsrc/VirtuosoClient.Net/CLI.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: CLI.cs,v 1.3.2.2 2012/03/08 12:54:55 source Exp $
+// $Id: CLI.cs,v 1.3.2.1 2009/06/15 13:24:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ConnectionOptions.cs b/binsrc/VirtuosoClient.Net/ConnectionOptions.cs
index 895e4ea..d2b5700 100644
--- a/binsrc/VirtuosoClient.Net/ConnectionOptions.cs
+++ b/binsrc/VirtuosoClient.Net/ConnectionOptions.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ConnectionOptions.cs,v 1.3.2.5 2012/03/08 12:54:55 source Exp $
+// $Id: ConnectionOptions.cs,v 1.3.2.4 2010/12/21 12:29:58 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ConnectionPool.cs b/binsrc/VirtuosoClient.Net/ConnectionPool.cs
index afbeb85..8762237 100644
--- a/binsrc/VirtuosoClient.Net/ConnectionPool.cs
+++ b/binsrc/VirtuosoClient.Net/ConnectionPool.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ConnectionPool.cs,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: ConnectionPool.cs,v 1.2 2007/02/01 12:11:57 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs b/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs
index afd5191..400f4eb 100644
--- a/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs
+++ b/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ConnectionStringParser.cs,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: ConnectionStringParser.cs,v 1.2 2008/12/15 10:10:45 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/DTC.cs b/binsrc/VirtuosoClient.Net/DTC.cs
index bf30777..00ee69d 100644
--- a/binsrc/VirtuosoClient.Net/DTC.cs
+++ b/binsrc/VirtuosoClient.Net/DTC.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: DTC.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: DTC.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/DataType.cs b/binsrc/VirtuosoClient.Net/DataType.cs
index 314cffd..98dc078 100644
--- a/binsrc/VirtuosoClient.Net/DataType.cs
+++ b/binsrc/VirtuosoClient.Net/DataType.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: DataType.cs,v 1.3.2.2 2012/03/08 12:54:55 source Exp $
+// $Id: DataType.cs,v 1.3.2.1 2009/06/15 13:24:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs b/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs
index 10bba68..8c03f5a 100644
--- a/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs
+++ b/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: DateTimeMarshaler.cs,v 1.3.2.4 2012/03/08 12:54:55 source Exp $
+// $Id: DateTimeMarshaler.cs,v 1.3.2.3 2011/10/28 21:41:48 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Diagnostics.cs b/binsrc/VirtuosoClient.Net/Diagnostics.cs
index 76b6386..c16c0fe 100644
--- a/binsrc/VirtuosoClient.Net/Diagnostics.cs
+++ b/binsrc/VirtuosoClient.Net/Diagnostics.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Diagnostics.cs,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: Diagnostics.cs,v 1.3 2007/05/21 15:45:43 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ExplicitString.cs b/binsrc/VirtuosoClient.Net/ExplicitString.cs
index c746ea1..468ab10 100644
--- a/binsrc/VirtuosoClient.Net/ExplicitString.cs
+++ b/binsrc/VirtuosoClient.Net/ExplicitString.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ExplicitString.cs,v 1.1.1.1.2.3 2012/03/08 12:54:55 source Exp $
+// $Id: ExplicitString.cs,v 1.1.1.1.2.2 2010/02/11 16:25:01 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Future.cs b/binsrc/VirtuosoClient.Net/Future.cs
index 8016e24..70222ff 100644
--- a/binsrc/VirtuosoClient.Net/Future.cs
+++ b/binsrc/VirtuosoClient.Net/Future.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Future.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: Future.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/FutureList.cs b/binsrc/VirtuosoClient.Net/FutureList.cs
index 5ed8db3..6fbf2ce 100644
--- a/binsrc/VirtuosoClient.Net/FutureList.cs
+++ b/binsrc/VirtuosoClient.Net/FutureList.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: FutureList.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: FutureList.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IConvertData.cs b/binsrc/VirtuosoClient.Net/IConvertData.cs
index 6fc4bb8..d92dbde 100644
--- a/binsrc/VirtuosoClient.Net/IConvertData.cs
+++ b/binsrc/VirtuosoClient.Net/IConvertData.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IConvertData.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: IConvertData.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ICreateErrors.cs b/binsrc/VirtuosoClient.Net/ICreateErrors.cs
index 234e0bb..edf1b46 100644
--- a/binsrc/VirtuosoClient.Net/ICreateErrors.cs
+++ b/binsrc/VirtuosoClient.Net/ICreateErrors.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ICreateErrors.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: ICreateErrors.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IInnerCommand.cs b/binsrc/VirtuosoClient.Net/IInnerCommand.cs
index f52446f..5f4a95e 100644
--- a/binsrc/VirtuosoClient.Net/IInnerCommand.cs
+++ b/binsrc/VirtuosoClient.Net/IInnerCommand.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IInnerCommand.cs,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: IInnerCommand.cs,v 1.2 2007/02/01 12:11:57 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IInnerConnection.cs b/binsrc/VirtuosoClient.Net/IInnerConnection.cs
index 3b675fc..01a02ad 100644
--- a/binsrc/VirtuosoClient.Net/IInnerConnection.cs
+++ b/binsrc/VirtuosoClient.Net/IInnerConnection.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IInnerConnection.cs,v 1.3.2.3 2012/03/08 12:54:55 source Exp $
+// $Id: IInnerConnection.cs,v 1.3.2.2 2010/12/17 17:40:44 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IMarshal.cs b/binsrc/VirtuosoClient.Net/IMarshal.cs
index 846a89b..f2e92cd 100644
--- a/binsrc/VirtuosoClient.Net/IMarshal.cs
+++ b/binsrc/VirtuosoClient.Net/IMarshal.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IMarshal.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: IMarshal.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ISession.cs b/binsrc/VirtuosoClient.Net/ISession.cs
index 74b3b52..7ffd605 100644
--- a/binsrc/VirtuosoClient.Net/ISession.cs
+++ b/binsrc/VirtuosoClient.Net/ISession.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ISession.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: ISession.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/IVirtuosoError.cs b/binsrc/VirtuosoClient.Net/IVirtuosoError.cs
index cbcd430..881c3d5 100644
--- a/binsrc/VirtuosoClient.Net/IVirtuosoError.cs
+++ b/binsrc/VirtuosoClient.Net/IVirtuosoError.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: IVirtuosoError.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: IVirtuosoError.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs b/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs
index aff8d32..80f2314 100644
--- a/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs
+++ b/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: InnerConnectionBase.cs,v 1.3.2.3 2012/03/08 12:54:55 source Exp $
+// $Id: InnerConnectionBase.cs,v 1.3.2.2 2010/12/17 17:40:44 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/MD5.cs b/binsrc/VirtuosoClient.Net/MD5.cs
index 9785921..ae1fe8e 100644
--- a/binsrc/VirtuosoClient.Net/MD5.cs
+++ b/binsrc/VirtuosoClient.Net/MD5.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: MD5.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: MD5.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Makefile.am b/binsrc/VirtuosoClient.Net/Makefile.am
index ad2c69a..3bbcd36 100644
--- a/binsrc/VirtuosoClient.Net/Makefile.am
+++ b/binsrc/VirtuosoClient.Net/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/VirtuosoClient.Net/Makefile.in b/binsrc/VirtuosoClient.Net/Makefile.in
index 7dae565..abe6297 100644
--- a/binsrc/VirtuosoClient.Net/Makefile.in
+++ b/binsrc/VirtuosoClient.Net/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/VirtuosoClient.Net/ManagedCommand.cs b/binsrc/VirtuosoClient.Net/ManagedCommand.cs
index 4e6c226..545ac65 100644
--- a/binsrc/VirtuosoClient.Net/ManagedCommand.cs
+++ b/binsrc/VirtuosoClient.Net/ManagedCommand.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ManagedCommand.cs,v 1.3.2.6 2012/03/08 12:54:55 source Exp $
+// $Id: ManagedCommand.cs,v 1.3.2.5 2011/10/13 18:26:27 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ManagedConnection.cs b/binsrc/VirtuosoClient.Net/ManagedConnection.cs
index 87f0f6d..7e7b36a 100644
--- a/binsrc/VirtuosoClient.Net/ManagedConnection.cs
+++ b/binsrc/VirtuosoClient.Net/ManagedConnection.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ManagedConnection.cs,v 1.5.2.4 2012/03/08 12:54:55 source Exp $
+// $Id: ManagedConnection.cs,v 1.5.2.3 2010/12/17 17:40:44 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ManagedErrors.cs b/binsrc/VirtuosoClient.Net/ManagedErrors.cs
index dc02357..3238dff 100644
--- a/binsrc/VirtuosoClient.Net/ManagedErrors.cs
+++ b/binsrc/VirtuosoClient.Net/ManagedErrors.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ManagedErrors.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: ManagedErrors.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Marshaler.cs b/binsrc/VirtuosoClient.Net/Marshaler.cs
index 78ef399..dff9bd2 100644
--- a/binsrc/VirtuosoClient.Net/Marshaler.cs
+++ b/binsrc/VirtuosoClient.Net/Marshaler.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Marshaler.cs,v 1.5.2.7 2012/03/08 12:54:55 source Exp $
+// $Id: Marshaler.cs,v 1.5.2.6 2011/10/17 15:51:19 source Exp $
//
//#define IGNORE_ENCODING
diff --git a/binsrc/VirtuosoClient.Net/MemoryHandle.cs b/binsrc/VirtuosoClient.Net/MemoryHandle.cs
index b3533c3..9f71f6b 100644
--- a/binsrc/VirtuosoClient.Net/MemoryHandle.cs
+++ b/binsrc/VirtuosoClient.Net/MemoryHandle.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: MemoryHandle.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: MemoryHandle.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/OdbcCommand.cs b/binsrc/VirtuosoClient.Net/OdbcCommand.cs
index c216cf5..ed620d6 100644
--- a/binsrc/VirtuosoClient.Net/OdbcCommand.cs
+++ b/binsrc/VirtuosoClient.Net/OdbcCommand.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: OdbcCommand.cs,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: OdbcCommand.cs,v 1.2 2007/02/01 12:11:57 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/OdbcConnection.cs b/binsrc/VirtuosoClient.Net/OdbcConnection.cs
index 4f4da92..a68550c 100644
--- a/binsrc/VirtuosoClient.Net/OdbcConnection.cs
+++ b/binsrc/VirtuosoClient.Net/OdbcConnection.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: OdbcConnection.cs,v 1.3.2.2 2012/03/08 12:54:55 source Exp $
+// $Id: OdbcConnection.cs,v 1.3.2.1 2011/10/13 18:26:27 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/OdbcErrors.cs b/binsrc/VirtuosoClient.Net/OdbcErrors.cs
index 9fe1d44..170c5e3 100644
--- a/binsrc/VirtuosoClient.Net/OdbcErrors.cs
+++ b/binsrc/VirtuosoClient.Net/OdbcErrors.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: OdbcErrors.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: OdbcErrors.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/ParameterData.cs b/binsrc/VirtuosoClient.Net/ParameterData.cs
index d70b9b3..120745c 100644
--- a/binsrc/VirtuosoClient.Net/ParameterData.cs
+++ b/binsrc/VirtuosoClient.Net/ParameterData.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: ParameterData.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: ParameterData.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Platform.cs b/binsrc/VirtuosoClient.Net/Platform.cs
index 078575f..01382f3 100644
--- a/binsrc/VirtuosoClient.Net/Platform.cs
+++ b/binsrc/VirtuosoClient.Net/Platform.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Platform.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: Platform.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/RPC.cs b/binsrc/VirtuosoClient.Net/RPC.cs
index 044ab1f..efb8a4a 100644
--- a/binsrc/VirtuosoClient.Net/RPC.cs
+++ b/binsrc/VirtuosoClient.Net/RPC.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: RPC.cs,v 1.5.2.2 2012/03/08 12:54:55 source Exp $
+// $Id: RPC.cs,v 1.5.2.1 2011/02/16 20:44:36 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Service.cs b/binsrc/VirtuosoClient.Net/Service.cs
index 96fd7c7..5dd9106 100644
--- a/binsrc/VirtuosoClient.Net/Service.cs
+++ b/binsrc/VirtuosoClient.Net/Service.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Service.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: Service.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/SqlExtendedString.cs b/binsrc/VirtuosoClient.Net/SqlExtendedString.cs
index 06e54c4..0521389 100644
--- a/binsrc/VirtuosoClient.Net/SqlExtendedString.cs
+++ b/binsrc/VirtuosoClient.Net/SqlExtendedString.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: SqlExtendedString.cs,v 1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: SqlExtendedString.cs,v 1.1 2009/02/06 15:37:37 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/SqlRdfBox.cs b/binsrc/VirtuosoClient.Net/SqlRdfBox.cs
index 0908d1f..3d436dc 100644
--- a/binsrc/VirtuosoClient.Net/SqlRdfBox.cs
+++ b/binsrc/VirtuosoClient.Net/SqlRdfBox.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: SqlRdfBox.cs,v 1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: SqlRdfBox.cs,v 1.1 2009/02/06 15:37:37 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/SqlXml.cs b/binsrc/VirtuosoClient.Net/SqlXml.cs
index da98020..23f1228 100644
--- a/binsrc/VirtuosoClient.Net/SqlXml.cs
+++ b/binsrc/VirtuosoClient.Net/SqlXml.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: SqlXml.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: SqlXml.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/StatementList.cs b/binsrc/VirtuosoClient.Net/StatementList.cs
index d9b9ba0..b184e3f 100644
--- a/binsrc/VirtuosoClient.Net/StatementList.cs
+++ b/binsrc/VirtuosoClient.Net/StatementList.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: StatementList.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: StatementList.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
#if false
diff --git a/binsrc/VirtuosoClient.Net/TcpConnection.cs b/binsrc/VirtuosoClient.Net/TcpConnection.cs
index 0624563..727fc58 100644
--- a/binsrc/VirtuosoClient.Net/TcpConnection.cs
+++ b/binsrc/VirtuosoClient.Net/TcpConnection.cs
@@ -1,10 +1,10 @@
//
-// $Id: TcpConnection.cs,v 1.2.2.5 2012/03/08 12:54:55 source Exp $
+// $Id: TcpConnection.cs,v 1.2.2.4 2011/10/13 18:26:27 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -21,7 +21,7 @@
//
//
//
-// $Id: TcpConnection.cs,v 1.2.2.5 2012/03/08 12:54:55 source Exp $
+// $Id: TcpConnection.cs,v 1.2.2.4 2011/10/13 18:26:27 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/TcpSession.cs b/binsrc/VirtuosoClient.Net/TcpSession.cs
index 042c0cd..c061fce 100644
--- a/binsrc/VirtuosoClient.Net/TcpSession.cs
+++ b/binsrc/VirtuosoClient.Net/TcpSession.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: TcpSession.cs,v 1.2.2.2 2012/03/08 12:54:55 source Exp $
+// $Id: TcpSession.cs,v 1.2.2.1 2011/10/13 18:26:27 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Unix.cs b/binsrc/VirtuosoClient.Net/Unix.cs
index 1ac9355..f262d77 100644
--- a/binsrc/VirtuosoClient.Net/Unix.cs
+++ b/binsrc/VirtuosoClient.Net/Unix.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Unix.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: Unix.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtDbType.cs b/binsrc/VirtuosoClient.Net/VirtDbType.cs
index 63ca394..6c6cf04 100644
--- a/binsrc/VirtuosoClient.Net/VirtDbType.cs
+++ b/binsrc/VirtuosoClient.Net/VirtDbType.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtDbType.cs,v 1.1.1.1.2.2 2012/03/08 12:54:55 source Exp $
+// $Id: VirtDbType.cs,v 1.1.1.1.2.1 2009/06/15 13:24:12 source Exp $
//
#if ODBC_CLIENT
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj b/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj
index e4f9a2b..b934564 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj
+++ b/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{50E2DD3F-5B5E-4E62-9206-A41824905CD7}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,8 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\</OutputPath>
@@ -53,13 +51,13 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\win64\Release\</OutputPath>
+ <OutputPath>.\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>FROMIDE;ADONET2;ADONET3</DefineConstants>
+ <DefineConstants>FROMIDE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
@@ -86,7 +84,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>..\..\win64\Release\</OutputPath>
+ <OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>FROMIDE</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -108,7 +106,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>..\..\win64\Release\</OutputPath>
+ <OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>FROMIDE</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -124,9 +122,6 @@
<Name>System</Name>
</Reference>
<Reference Include="System.configuration" />
- <Reference Include="System.Core">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
@@ -269,8 +264,6 @@
<Compile Include="VirtuosoDataReader.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="VirtuosoDateTime.cs" />
- <Compile Include="VirtuosoDateTimeOffset.cs" />
<Compile Include="VirtuosoError.cs">
<SubType>Code</SubType>
</Compile>
@@ -295,7 +288,6 @@
<Compile Include="VirtuosoPermissionAttribute.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="VirtuosoTimeSpan.cs" />
<Compile Include="VirtuosoTransaction.cs">
<SubType>Code</SubType>
</Compile>
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoClientFactory.cs b/binsrc/VirtuosoClient.Net/VirtuosoClientFactory.cs
index c478769..d39cbab 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoClientFactory.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoClientFactory.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoClientFactory.cs,v 1.2.2.2 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoClientFactory.cs,v 1.2.2.1 2011/10/28 21:41:48 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs b/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs
index a9325d6..497112f 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoCodeAccessPermission.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoCodeAccessPermission.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs b/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs
index 2725555..1e9772d 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoCommand.cs,v 1.7.2.5 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoCommand.cs,v 1.7.2.4 2011/10/17 09:48:25 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs b/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs
index ef88597..f01304d 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoCommandBuilder.cs,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoCommandBuilder.cs,v 1.2 2007/02/01 12:11:57 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs b/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs
index 69579c6..51d083b 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoConnection.cs,v 1.10.2.7 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoConnection.cs,v 1.10.2.6 2011/10/14 12:54:20 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs b/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs
index c6f0e0d..20de9b9 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoConnectionStringBuilder.cs,v 1.3.2.3 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoConnectionStringBuilder.cs,v 1.3.2.2 2010/12/17 17:40:44 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs b/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs
index cb4f599..e20de4f 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDataAdapter.cs,v 1.4.2.2 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoDataAdapter.cs,v 1.4.2.1 2010/12/07 11:31:19 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs b/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs
index 97448ca..f8b8df4 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDataReader.cs,v 1.7.2.6 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoDataReader.cs,v 1.7.2.5 2011/10/13 18:26:27 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs b/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs
index 0d8d005..d8968b8 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2011 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDateTime.cs,v 1.1.4.4 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoDateTime.cs,v 1.1.4.3 2011/10/17 09:48:25 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs b/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs
index 3c28418..593e55d 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2011 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDateTimeOffset.cs,v 1.1.4.4 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoDateTimeOffset.cs,v 1.1.4.3 2011/10/17 09:48:25 source Exp $
//
#if ADONET3
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoError.cs b/binsrc/VirtuosoClient.Net/VirtuosoError.cs
index 09ce572..316b6fe 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoError.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoError.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoError.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoError.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs b/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs
index 66980ce..419fe07 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoErrorCollection.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoErrorCollection.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoException.cs b/binsrc/VirtuosoClient.Net/VirtuosoException.cs
index f42d9c3..e8dccf4 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoException.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoException.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoException.cs,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoException.cs,v 1.2 2007/02/01 12:11:57 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs b/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs
index 47696f4..677db91 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoInfoMessage.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoInfoMessage.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs b/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs
index d464462..8874dd2 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoParameter.cs,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoParameter.cs,v 1.3 2008/09/30 16:30:56 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs b/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs
index f6b9aa5..236eb22 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoParameterCollection.cs,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoParameterCollection.cs,v 1.3 2008/09/30 16:30:56 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs b/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs
index c3472c6..460f66a 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoPermission.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoPermission.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs b/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs
index aeb35da..e624ef3 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoPermissionAttribute.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoPermissionAttribute.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs b/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs
index 41198a5..f906a64 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2011 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoTimeSpan.cs,v 1.1.4.4 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoTimeSpan.cs,v 1.1.4.3 2011/10/17 09:48:25 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs b/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs
index 7ef0fc5..f75a694 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoTransaction.cs,v 1.3.2.5 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoTransaction.cs,v 1.3.2.4 2011/10/14 00:32:32 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs b/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs
index 3ea2373..0ba8b8d 100644
--- a/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs
+++ b/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoWarning.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoWarning.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/Win32.cs b/binsrc/VirtuosoClient.Net/Win32.cs
index 2cd51d8..c596cf3 100644
--- a/binsrc/VirtuosoClient.Net/Win32.cs
+++ b/binsrc/VirtuosoClient.Net/Win32.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: Win32.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: Win32.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs b/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs
index f4fffa0..9fbac19 100644
--- a/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs
+++ b/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs
@@ -1,5 +1,5 @@
//
-// $Id: AssemblyInfo.cs,v 1.2.2.1 2012/03/08 13:13:48 source Exp $
+// $Id: AssemblyInfo.cs,v 1.2 2007/05/29 12:13:12 source Exp $
//
using System.Reflection;
@@ -25,7 +25,7 @@ using System.Runtime.CompilerServices;
#endif
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("OpenLink Software")]
-[assembly: AssemblyCopyright("Copyright (C) 1998-2012 OpenLink Software. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright (C) OpenLink Software 2007. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs
index d34d224..5b62014 100644
--- a/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs
+++ b/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoConnectionStringEditor.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoConnectionStringEditor.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
#if (!MONO)
diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs
index 78f4ff9..01601a2 100644
--- a/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs
+++ b/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoDataAdapterDesigner.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoDataAdapterDesigner.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
#if (!MONO)
diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs
index dc50f1e..8785d44 100644
--- a/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs
+++ b/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs
index 62863a6..a9d4fff 100644
--- a/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs
+++ b/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
//
//
//
-// $Id: VirtuosoGenerateDataSet.cs,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+// $Id: VirtuosoGenerateDataSet.cs,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
//
using System;
diff --git a/binsrc/b3s/Makefile.am b/binsrc/b3s/Makefile.am
index 2bfdd03..eadad28 100644
--- a/binsrc/b3s/Makefile.am
+++ b/binsrc/b3s/Makefile.am
@@ -1,10 +1,10 @@
#
-# $Id: Makefile.am,v 1.1.2.5 2012/03/05 12:08:06 source Exp $
+# $Id: Makefile.am,v 1.1.2.4 2009/07/09 13:24:35 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/b3s/Makefile.in b/binsrc/b3s/Makefile.in
index f08998e..72dbf57 100644
--- a/binsrc/b3s/Makefile.in
+++ b/binsrc/b3s/Makefile.in
@@ -16,12 +16,12 @@
@SET_MAKE@
#
-# $Id: Makefile.am,v 1.1.2.5 2012/03/05 12:08:06 source Exp $
+# $Id: Makefile.am,v 1.1.2.4 2009/07/09 13:24:35 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -125,7 +125,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -174,7 +173,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -226,7 +224,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -273,6 +270,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/b3s/VirtTripleLoader/.classpath b/binsrc/b3s/VirtTripleLoader/.classpath
index f1887fa..c35fe25 100644
--- a/binsrc/b3s/VirtTripleLoader/.classpath
+++ b/binsrc/b3s/VirtTripleLoader/.classpath
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
--
--- $Id: .classpath,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+-- $Id: .classpath,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/VirtTripleLoader/.project b/binsrc/b3s/VirtTripleLoader/.project
index 7b40835..3cdd176 100644
--- a/binsrc/b3s/VirtTripleLoader/.project
+++ b/binsrc/b3s/VirtTripleLoader/.project
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
--
--- $Id: .project,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+-- $Id: .project,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java b/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java
index 3791c0f..adab9cf 100644
--- a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java
+++ b/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java
@@ -1,10 +1,10 @@
/*
- * $Id: Logger.java,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+ * $Id: Logger.java,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java b/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java
index 29ad3fe..c0b2426 100644
--- a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java
+++ b/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtTripleLoaderInit.java,v 1.1.2.5 2012/03/05 17:38:05 source Exp $
+ * $Id: VirtTripleLoaderInit.java,v 1.1.2.3 2011/03/08 15:43:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -84,7 +84,7 @@ public class VirtTripleLoaderInit {
private static final Integer myMajorVer = 0;
private static final Integer myMinorVer = 1;
private static final Integer myBuild = 0;
- private static final String myCopyright = "Copyright (c) 2008-2012 OpenLink Software";
+ private static final String myCopyright = "Copyright (c) 2008-2011 OpenLink Software";
private static final String virtConnectUrlDef = "jdbc:virtuoso://neo:1111";
private static final String virtUserDef = "dba";
@@ -126,7 +126,7 @@ public class VirtTripleLoaderInit {
while ((c = _block.read()) != -1) {
bytesInFile ++;
- outStream.write(c);
+ outStream.write(c);
}
diff --git a/binsrc/b3s/b3s_cl_rexec.sql b/binsrc/b3s/b3s_cl_rexec.sql
index a1a3966..75cb776 100644
--- a/binsrc/b3s/b3s_cl_rexec.sql
+++ b/binsrc/b3s/b3s_cl_rexec.sql
@@ -1,12 +1,12 @@
--
--- $Id: b3s_cl_rexec.sql,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+-- $Id: b3s_cl_rexec.sql,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
--
-- Executes query on b3s cluster and returns serialized array
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/b3sq.sql b/binsrc/b3s/b3sq.sql
index 244b37e..562dd25 100644
--- a/binsrc/b3s/b3sq.sql
+++ b/binsrc/b3s/b3sq.sql
@@ -1,10 +1,10 @@
--
--- $Id: b3sq.sql,v 1.1.2.5 2012/03/05 17:38:05 source Exp $
+-- $Id: b3sq.sql,v 1.1.2.3 2009/08/27 22:15:49 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -760,7 +760,7 @@ where
-select "path", xmlelement ('path', xmlagg (xmlelement ('step', "via"))) from
+select "path", xmlelement ('path', xmlagg (xmlelement ('step', "via"))) from
(sparql select ?o ?via ?dist ?path where
{
{select ?s ?o
diff --git a/binsrc/b3s/bbc_demo_queries.vsp b/binsrc/b3s/bbc_demo_queries.vsp
index 0517ac4..60eff72 100644
--- a/binsrc/b3s/bbc_demo_queries.vsp
+++ b/binsrc/b3s/bbc_demo_queries.vsp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "-//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">
<head>
@@ -33,7 +33,7 @@ function get_and_encode_query (q_elm)
</script>
</head>
-<body>
+<body>
<div id="PG">
<div id="HD">
<a class="logo" href="/fct/facet.vsp">
@@ -43,7 +43,7 @@ function get_and_encode_query (q_elm)
<div id="MD">
<div id="demo_queries_ctr">
<h1>BBC Dataset Sample Queries</h1>
- <p>These queries demonstrate some of the types of queries that can be done over the BBC dataset</p>
+ <p>These queries demonstrate some of the types of queries that can be done over the BBC dataset</p>
<ul class="demo_qry_list">
<li>
<h2>EastEnders episodes</h2>
@@ -52,18 +52,18 @@ function get_and_encode_query (q_elm)
<pre id="q1">
PREFIX po: <http://purl.org/ontology/po/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
-
-select distinct ?title ?short_syn
-where {
- <http://www.bbc.co.uk/programmes/b006m86d#programme> po:episode ?e .
- ?e a po:Episode .
+
+select distinct ?title ?short_syn
+where {
+ <http://www.bbc.co.uk/programmes/b006m86d#programme> po:episode ?e .
+ ?e a po:Episode .
?e po:short_synopsis ?short_syn .
?e dc:title ?title
}
</pre>
</div>
<div class="actions">
- <a onclick="javascript:sparql_qry('q1');" href="#">Run in SPARQL endpoint</a>
+ <a onclick="javascript:sparql_qry('q1');" href="#">Run in SPARQL endpoint</a>
<a onclick="javascript:isparql_qry('q1');" href="#">Open in iSPARQL</a>
</div>
</li>
@@ -92,7 +92,7 @@ where {
</pre>
</div>
<div class="actions">
- <a onclick="javascript:sparql_qry('q2');" href="#">Run in SPARQL endpoint</a>
+ <a onclick="javascript:sparql_qry('q2');" href="#">Run in SPARQL endpoint</a>
<a onclick="javascript:isparql_qry('q2');" href="#">Open in iSPARQL</a>
</div>
</li>
@@ -108,8 +108,8 @@ PREFIX rev: <http://purl.org/stuff/rev#>
PREFIX po: <http://purl.org/ontology/po/>
select distinct ?r_name, ?rev
-where {
- {
+where {
+ {
<http://www.bbc.co.uk/music/artists/4490113a-3880-4f5b-a39b-105bfceaed04#artist> foaf:made ?r1 .
?r1 a mo:Record .
?r1 dc:title ?r_name .
@@ -121,11 +121,11 @@ where {
?r1 dc:title ?r_name .
?r1 rev:hasReview ?rev
}
- }
+ }
</pre>
</div>
<div class="actions">
- <a onclick="javascript:sparql_qry('q3');" href="#">Run in SPARQL endpoint</a>
+ <a onclick="javascript:sparql_qry('q3');" href="#">Run in SPARQL endpoint</a>
<a onclick="javascript:isparql_qry('q3');" href="#">Open in iSPARQL</a>
</div>
</li>
@@ -140,7 +140,7 @@ where {
<img alt="Linked Data" src="/fct/images/LoDLogo.gif"/>
</a>
<br/>
- <span class="copyright">Copyright © 2009-2012 OpenLink Software</span>
+ <span class="copyright">Copyright © 2009-2011 OpenLink Software</span>
<div id="FT_L"/>
<div id="FT_R"/>
</div> <!-- #FT -->
diff --git a/binsrc/b3s/cl_prx.sql b/binsrc/b3s/cl_prx.sql
index e37fdac..862675b 100644
--- a/binsrc/b3s/cl_prx.sql
+++ b/binsrc/b3s/cl_prx.sql
@@ -1,10 +1,10 @@
--
--- $Id: cl_prx.sql,v 1.1.2.7 2012/03/05 17:38:05 source Exp $
+-- $Id: cl_prx.sql,v 1.1.2.5 2010/09/20 09:51:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -242,10 +242,10 @@ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_fctabout_http_proxy_rule_5', 1,
'/describe/\\?uri=([^\&]*)\&graph=([^\&]*)', vector ('g', 'graph'), 2,
'/fct/rdfdesc/description.vsp?g=%s&graph=%s', vector ('g', 'graph'), null, null, 2);
-DB.DBA.URLREWRITE_CREATE_RULELIST ('ext_fctabout_http_proxy_rule_list1', 1,
- vector ('ext_fctabout_http_proxy_rule_1',
- 'ext_fctabout_http_proxy_rule_2',
- 'ext_fctabout_http_proxy_rule_3',
+DB.DBA.URLREWRITE_CREATE_RULELIST ('ext_fctabout_http_proxy_rule_list1', 1,
+ vector ('ext_fctabout_http_proxy_rule_1',
+ 'ext_fctabout_http_proxy_rule_2',
+ 'ext_fctabout_http_proxy_rule_3',
'ext_fctabout_http_proxy_rule_4',
'ext_fctabout_http_proxy_rule_5'
));
diff --git a/binsrc/b3s/complete.sql b/binsrc/b3s/complete.sql
index dbd4420..639b37d 100644
--- a/binsrc/b3s/complete.sql
+++ b/binsrc/b3s/complete.sql
@@ -1,10 +1,10 @@
--
--- $Id: complete.sql,v 1.1.2.11 2012/03/05 17:38:05 source Exp $
+-- $Id: complete.sql,v 1.1.2.9 2011/09/23 19:22:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -20,9 +20,9 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
--- URI completion
+-- URI completion
-create procedure
+create procedure
num_str (in n int)
{
declare s varchar;
@@ -38,7 +38,7 @@ num_str (in n int)
}
;
-create procedure
+create procedure
str_inc (in str varchar, in pref int := 0)
{
-- increment by one for range cmp
@@ -66,7 +66,7 @@ str_inc (in str varchar, in pref int := 0)
--}
-create procedure
+create procedure
cmp_find_iri (in str varchar, in no_name int := 0)
{
/* We look for iris, assuming the full ns is in the name */
@@ -80,11 +80,11 @@ cmp_find_iri (in str varchar, in no_name int := 0)
pref := str;
name := '1111';
}
- else
+ else
pref := iri_split (str, name, 1);
- id := (select rp_id
- from rdf_prefix
+ id := (select rp_id
+ from rdf_prefix
where rp_name = pref);
if (id is null)
@@ -98,34 +98,34 @@ cmp_find_iri (in str varchar, in no_name int := 0)
if (no_name)
{
- iris := (select vector_agg (ri_name)
- from (select top 20 ri_name
- from rdf_iri
- where ri_name >= name and
+ iris := (select vector_agg (ri_name)
+ from (select top 20 ri_name
+ from rdf_iri
+ where ri_name >= name and
ri_name < num_str (id + 1)) ir);
if (length (iris) < 20 and length (iris) > 1)
- iris := (select vector_agg (ri_name)
- from (select ri_name
- from rdf_iri
- where ri_name >= name and
+ iris := (select vector_agg (ri_name)
+ from (select ri_name
+ from rdf_iri
+ where ri_name >= name and
ri_name < num_str (id + 1)
order by iri_rank (ri_id) desc) ir);
}
- else
+ else
{
- iris := (select vector_agg (ri_name)
- from (select top 20 ri_name
- from rdf_iri
- where ri_name >= name and
+ iris := (select vector_agg (ri_name)
+ from (select top 20 ri_name
+ from rdf_iri
+ where ri_name >= name and
ri_name < str_inc (name, 4)) ir);
if (length (iris) < 20 and length (iris) > 1)
- iris := (select vector_agg (ri_name)
- from (select ri_name
- from rdf_iri
- where ri_name >= name and
- ri_name < str_inc (name, 4)
+ iris := (select vector_agg (ri_name)
+ from (select ri_name
+ from rdf_iri
+ where ri_name >= name and
+ ri_name < str_inc (name, 4)
order by iri_rank (ri_id) desc) ir);
}
@@ -138,14 +138,15 @@ cmp_find_iri (in str varchar, in no_name int := 0)
}
;
-create procedure
+create procedure
cmp_find_ns (in str varchar)
{
declare nss any;
- nss := (select vector_agg (rp_name)
- from (select top 20 rp_name
- from rdf_prefix
- where rp_name >= str and
+
+ nss := (select vector_agg (rp_name)
+ from (select top 20 rp_name
+ from rdf_prefix
+ where rp_name >= str and
rp_name < str_inc (str)) ns);
return nss;
@@ -153,7 +154,7 @@ cmp_find_ns (in str varchar)
;
-create procedure
+create procedure
cmp_with_ns (in str varchar)
{
declare pref_str varchar;
@@ -164,8 +165,8 @@ cmp_with_ns (in str varchar)
if (col = 0)
return null;
- pref_str := (select ns_url
- from SYS_XML_PERSISTENT_NS_DECL
+ pref_str := (select ns_url
+ from SYS_XML_PERSISTENT_NS_DECL
where ns_prefix = subseq (str, 0, col - 1));
if (pref_str is null)
return null;
@@ -176,7 +177,7 @@ cmp_with_ns (in str varchar)
;
-create procedure
+create procedure
cmp_uri (in str varchar)
{
declare with_ns varchar;
@@ -217,7 +218,7 @@ cmp_uri (in str varchar)
}
;
-create procedure
+create procedure
urilbl_ac_ruin_label (in lbl varchar)
{
declare tmp any;
@@ -229,7 +230,7 @@ urilbl_ac_ruin_label (in lbl varchar)
}
;
-create procedure
+create procedure
urilbl_ac_init_log (in msg varchar)
{
-- dbg_printf(msg);
@@ -241,7 +242,7 @@ urilbl_ac_init_log (in msg varchar)
-- Originally from rdf_mappers/rdfdesc.sql
-- Determine q of given lang based on value of Accept-Language hdr
-create procedure
+create procedure
cmp_get_lang_by_q (in accept varchar, in lang varchar)
{
declare format, itm, q varchar;
diff --git a/binsrc/b3s/complete_cl.sql b/binsrc/b3s/complete_cl.sql
index b54f76e..e678ce2 100644
--- a/binsrc/b3s/complete_cl.sql
+++ b/binsrc/b3s/complete_cl.sql
@@ -1,6 +1,6 @@
create procedure
-urilbl_ac_init_db ()
+urilbl_ac_init_db ()
{
--pl_debug+
declare n, n_ins, n_strange integer;
@@ -21,24 +21,24 @@ urilbl_ac_init_db ()
-- XXX check if the unresolved literal problem still needs a workaround
daq := daq (1);
- for (sparql
- define output:valmode 'LONG'
- define input:inference 'facets'
- select ?s ?o where { ?s virtrdf:label ?o }) do
+ for (sparql
+ define output:valmode 'LONG'
+ define input:inference 'facets'
+ select ?s ?o where { ?s virtrdf:label ?o }) do
{
declare lng, id int;
lng := 257;
- if (__tag of rdf_box = __tag(o))
- {
+ if (__tag of rdf_box = __tag(o))
+ {
o_str := cast (o as varchar);
lng := rdf_box_lang (o);
id := rdf_box_ro_id (o);
- }
+ }
else
{
n_strange := n_strange + 1;
goto cont;
- }
+ }
n_ins := n_ins + 1;
@@ -48,15 +48,15 @@ urilbl_ac_init_db ()
--insert into rdf_label option (into daq) (rl_o, rl_ro_id, rl_text, rl_lang) values (o, id, urilbl_ac_ruin_label (o_str), lng);
insert soft rdf_label (rl_o, rl_ro_id, rl_text, rl_lang) values (o, id, urilbl_ac_ruin_label (o_str), lng);
- cont:;
+ cont:;
n := n + 1;
- if (mod (n, 1000000) = 0)
- urilbl_ac_init_log (sprintf ('urilbl_ac_init_db: %d rows, %d ins, %d strange...\n',
- n, n_ins, n_strange));
+ if (mod (n, 1000000) = 0)
+ urilbl_ac_init_log (sprintf ('urilbl_ac_init_db: %d rows, %d ins, %d strange...\n',
+ n, n_ins, n_strange));
if (0 = mod (n, 10000))
{
daq_results (daq);
- daq := daq (1);
+ daq := daq (1);
commit work;
}
}
@@ -85,11 +85,11 @@ cmp_label (in lbl_str varchar, in langs varchar)
best_q := 0;
{
- declare exit handler for sqlstate 'S1TAT' {
+ declare exit handler for sqlstate 'S1TAT' {
goto done;
};
- for (select rl_lang, s as ull_iid, __ro2sq (o) as ull_label from rdf_label, rdf_quad
+ for (select rl_lang, s as ull_iid, __ro2sq (o) as ull_label from rdf_label, rdf_quad
where rl_text like urilbl_ac_ruin_label (lbl_str) || '%' and rl_o = o) do
{
declare ull_label_lang varchar;
@@ -107,7 +107,7 @@ cmp_label (in lbl_str varchar, in langs varchar)
cur_iid := ull_iid;
q := cmp_get_lang_by_q (langs, ull_label_lang);
- if (q >= best_q)
+ if (q >= best_q)
{
best_q := q;
if (__tag (ull_label) = 246)
diff --git a/binsrc/b3s/complete_ddl.sql b/binsrc/b3s/complete_ddl.sql
index 895adec..ab15032 100644
--- a/binsrc/b3s/complete_ddl.sql
+++ b/binsrc/b3s/complete_ddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: complete_ddl.sql,v 1.1.2.7 2012/03/05 17:38:05 source Exp $
+-- $Id: complete_ddl.sql,v 1.1.2.5 2009/10/07 10:27:20 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -34,7 +34,7 @@ urilbl_complete_lookup_2 (
EXEC_STMT ('alter index urilbl_complete_lookup_2 on urilbl_complete_lookup_2 partition (ull_label_ruined varchar (6,0hexffff))', 0);
EXEC_STMT (
-'create table
+'create table
urilbl_cpl_log (
ullog_ts timestamp,
ullog_msg varchar,
diff --git a/binsrc/b3s/complete_single.sql b/binsrc/b3s/complete_single.sql
index 7d7f623..34c9649 100644
--- a/binsrc/b3s/complete_single.sql
+++ b/binsrc/b3s/complete_single.sql
@@ -1,6 +1,6 @@
create procedure
-urilbl_ac_init_db ()
+urilbl_ac_init_db ()
{
declare n, n_ins, n_strange integer;
declare o_str varchar;
@@ -18,35 +18,35 @@ urilbl_ac_init_db ()
-- XXX test that this inference graph exists a priori
-- XXX check if the unresolved literal problem still needs a workaround
- for (sparql
- define output:valmode 'LONG'
- define input:inference 'facets'
- select ?s ?o (lang(?o)) as ?lng where { ?s virtrdf:label ?o }) do
+ for (sparql
+ define output:valmode 'LONG'
+ define input:inference 'facets'
+ select ?s ?o (lang(?o)) as ?lng where { ?s virtrdf:label ?o }) do
{
- if (__tag of rdf_box = __tag(o))
+ if (__tag of rdf_box = __tag(o))
o_str := cast (o as varchar);
else if (isstring(o) and o not like 'Unresolved literal for ID%')
- {
+ {
o_str := o;
}
else
{
n_strange := n_strange + 1;
goto cont;
- }
+ }
n_ins := n_ins + 1;
o_str := "LEFT"(o_str, 512);
- insert soft urilbl_complete_lookup_2
- (ull_label_lang, ull_label_ruined, ull_iid, ull_label)
+ insert soft urilbl_complete_lookup_2
+ (ull_label_lang, ull_label_ruined, ull_iid, ull_label)
values (lng, urilbl_ac_ruin_label (o_str), s, o_str);
cont:;
n := n + 1;
- if (mod (n, 1000000) = 0)
- urilbl_ac_init_log (sprintf ('urilbl_ac_init_db: %d rows, %d ins, %d strange...\n',
+ if (mod (n, 1000000) = 0)
+ urilbl_ac_init_log (sprintf ('urilbl_ac_init_db: %d rows, %d ins, %d strange...\n',
n, n_ins, n_strange));
if (0 = mod (n, 10000))
{
@@ -77,12 +77,12 @@ cmp_label (in lbl_str varchar, in langs varchar)
best_q := 0;
{
- declare exit handler for sqlstate 'S1TAT' {
+ declare exit handler for sqlstate 'S1TAT' {
goto done;
};
for (select ull_label_lang, ull_label, ull_iid
- from urilbl_complete_lookup_2
+ from urilbl_complete_lookup_2
where ull_label_ruined like urilbl_ac_ruin_label (lbl_str) || '%') do
{
if (cur_iid is not null and ull_iid <> cur_iid)
@@ -96,7 +96,7 @@ cmp_label (in lbl_str varchar, in langs varchar)
cur_iid := ull_iid;
q := cmp_get_lang_by_q (langs, ull_label_lang);
- if (q >= best_q)
+ if (q >= best_q)
{
best_q := q;
cur_lbl := ull_label;
diff --git a/binsrc/b3s/complete_svc.sql b/binsrc/b3s/complete_svc.sql
index 000f854..bf318e7 100644
--- a/binsrc/b3s/complete_svc.sql
+++ b/binsrc/b3s/complete_svc.sql
@@ -1,10 +1,10 @@
--
--- $Id: complete_svc.sql,v 1.1.2.7 2012/03/05 17:38:05 source Exp $
+-- $Id: complete_svc.sql,v 1.1.2.5 2010/05/16 18:56:48 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -20,7 +20,7 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
-create procedure
+create procedure
isvector (in x any)
{
if (x is null) return null;
@@ -42,19 +42,19 @@ json_out_vec_tst (in v any)
}
;
-create procedure
+create procedure
json_esc_str (in s any)
{
return sprintf ('"%s"', replace (replace (replace (s, '\\', '\\\\'), '"', '\\"'), '\n', '\\n'));
}
;
-create procedure
+create procedure
json_out_vec (in v any, inout ses any)
{
declare s varchar;
s := string_output();
-
+
http ('[', s);
-- dbg_obj_print (v[0]);
@@ -80,10 +80,10 @@ json_out_vec (in v any, inout ses any)
;
DB.DBA.VHOST_REMOVE (lpath=>'/services/rdf/iriautocomplete.get');
-DB.DBA.VHOST_DEFINE (lpath=>'/services/rdf/iriautocomplete.get',
+DB.DBA.VHOST_DEFINE (lpath=>'/services/rdf/iriautocomplete.get',
ppath=>'/SOAP/Http/IRI_AUTOCOMPLETE', soap_user=>'PROXY');
-create procedure
+create procedure
DB.DBA.IRI_AUTOCOMPLETE () __SOAP_HTTP 'text/json'
{
declare params any;
@@ -92,7 +92,7 @@ DB.DBA.IRI_AUTOCOMPLETE () __SOAP_HTTP 'text/json'
declare len int;
declare iri_str, lbl_str varchar;
declare langs varchar;
-
+
iri_str := lbl_str := null;
ses := string_output();
@@ -129,11 +129,11 @@ DB.DBA.IRI_AUTOCOMPLETE () __SOAP_HTTP 'text/json'
}
{
- declare exit handler for sqlstate '*'
+ declare exit handler for sqlstate '*'
{
- http ('{"error": {"sqlstate" : ' ||
- json_esc_str(__SQL_STATE) ||
- ',"sqlmessage":' ||
+ http ('{"error": {"sqlstate" : ' ||
+ json_esc_str(__SQL_STATE) ||
+ ',"sqlmessage":' ||
json_esc_str(__SQL_MESSAGE) || '},"results":[]}', ses);
return ses;
};
@@ -142,7 +142,7 @@ DB.DBA.IRI_AUTOCOMPLETE () __SOAP_HTTP 'text/json'
res := DB.DBA.cmp_uri (iri_str);
else if (lbl_str is not null)
res := DB.DBA.cmp_label (lbl_str, langs);
- else
+ else
goto empty;
-- dbg_obj_print (res);
@@ -153,7 +153,7 @@ DB.DBA.IRI_AUTOCOMPLETE () __SOAP_HTTP 'text/json'
if (isvector (res[0]))
http ('"restype":"multiple",', ses);
- else
+ else
http ('"restype":"single",', ses);
if (iri_str)
diff --git a/binsrc/b3s/demo_queries.vsp b/binsrc/b3s/demo_queries.vsp
index 2d4cf33..416548e 100644
--- a/binsrc/b3s/demo_queries.vsp
+++ b/binsrc/b3s/demo_queries.vsp
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "-//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">
<head>
<title>BBC demo queries</title>
<link rel="stylesheet" type="text/css" href="styles/default.css"/>
+<script type="text/javascript" src="s/main.js"></script>
<script type="text/javascript" src="oat/toolkit/loader.js"></script>
<!--
@@ -14,13 +15,13 @@ FACET DEMO PAGE CUSTOMIZATION:
Registry keys:
-'fct_demo_uri' controls generation of "Demo Queries" link on Facet Browser's front page. If not set, this page is used.
+'fct_demo_uri' controls generation of "Demo Queries" link on Facet Browser's front page. If not set, this page is used.
See facet_view.sql.
-'sparql_demo_query_path' should point to a DAV collection with .isparql files to display. If not set,
+'sparql_demo_query_path' should point to a DAV collection with .isparql files to display. If not set,
'/DAV/home/dav/sparql_demo_queries' will be used.
-'sparql_demo_xsl_uri' should point to XSL used to extract information and display entries in the list of queries.
+'sparql_demo_xsl_uri' should point to XSL used to extract information and display entries in the list of queries.
If not set, '/fct/isparql_describe.xsl' is used.
-->
@@ -76,40 +77,32 @@ function get_and_encode_query (q_elm)
</script>
</head>
-<body>
+<body>
<div id="PG">
<div id="HD">
<a class="logo" href="/fct/facet.vsp">
<img id="opl_logo" alt="OpenLink Software" src="/fct/images/openlink_site_logo.png"/>
</a>
- <h2>Demo SPARQL Queries</h2>
</div> <!-- #HD -->
<div id="MD">
<div id="demo_queries_ctr">
- <table class="demo_qry_list">
+ <ul class="demo_qry_list">
<?vsp
declare ct_tree,xst any;
- declare num_r int;
- num_r := 0;
- for select res_content, res_name, res_full_path
- from WS.WS.SYS_DAV_RES
+ for select res_content, res_name, res_full_path
+ from WS.WS.SYS_DAV_RES
where RES_FULL_PATH like demo_dav_path || '%.isparql' do
{
-
+
ct_tree := xml_tree_doc (xml_tree (res_content));
http_value (xslt (demo_xsl_uri,
ct_tree,
vector ('name', res_name, 'full_path', 'http://' || uriqa_str || res_full_path)));
- num_r := num_r + 1;
- }
- if (0 = num_r)
- {
- http ('<tr><td colspan="3"><span class="advisory">No demo queries available on this server.</span></td></tr>');
}
?>
- </table>
+ </ul>
</div> <!-- #demo_queries_ctr -->
</div> <!-- #MD -->
<div id="FT">
@@ -120,7 +113,7 @@ function get_and_encode_query (q_elm)
<img alt="Linked Data" src="/fct/images/LoDLogo.gif"/>
</a>
<br/>
- <span class="copyright">Copyright © 2009-2012 OpenLink Software</span>
+ <span class="copyright">Copyright © 2009-2011 OpenLink Software</span>
<div id="FT_L"/>
<div id="FT_R"/>
</div> <!-- #FT -->
diff --git a/binsrc/b3s/facet.js b/binsrc/b3s/facet.js
index a7b7c1f..74e5a01 100644
--- a/binsrc/b3s/facet.js
+++ b/binsrc/b3s/facet.js
@@ -1,10 +1,10 @@
/*
- * $Id: facet.js,v 1.1.2.26 2012/03/05 17:38:05 source Exp $
+ * $Id: facet.js,v 1.1.2.13 2011/10/26 15:38:11 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -33,26 +33,6 @@ function fct_nav_to (url)
document.location = url;
}
-function fct_pager_next (form_pfx)
-{
- if ($(form_pfx+'_goto').value == '')
- $(form_pfx + '_cmd').value = 'next';
- $(form_pfx).submit();
-}
-
-function fct_pager_prev (form_pfx)
-{
- if ($(form_pfx+'_goto').value == '')
- $(form_pfx + '_cmd').value = 'prev';
- $(form_pfx).submit();
-}
-
-function fct_pager_go_to (form_pfx)
-{
- $(form_pfx + '_cmd').value = 'go_to';
- $(form_pfx).submit();
-}
-
var c_thr;
function fct_uri_ac_get_matches (ac_ctl)
@@ -64,8 +44,8 @@ function fct_uri_ac_get_matches (ac_ctl)
c_thr = $('new_uri_txt');
- OAT.AJAX.GET("/services/rdf/iriautocomplete.get?uri" + "=" + escape (val),
- false,
+ OAT.AJAX.GET("/services/rdf/iriautocomplete.get?uri" + "=" + escape (val),
+ false,
fct_uri_ac_ajax_handler,{});
}
@@ -78,8 +58,8 @@ function fct_lbl_ac_get_matches (ac_ctl)
c_thr = $('new_lbl_txt');
- OAT.AJAX.GET("/services/rdf/iriautocomplete.get?lbl" + "=" + escape (val),
- false,
+ OAT.AJAX.GET("/services/rdf/iriautocomplete.get?lbl" + "=" + escape (val),
+ false,
fct_lbl_ac_ajax_handler,{});
}
@@ -100,7 +80,7 @@ function fct_uri_ac_ajax_handler (resp)
if (resp_obj.restype == "single")
uri_ac.set_uri_opts (resp_obj.results);
- else
+ else
uri_ac.set_uri_opts (resp_obj.results[0].concat(resp_obj.results[1]));
uri_ac.show_popup ();
@@ -122,18 +102,18 @@ function fct_lbl_ac_ajax_handler (resp)
if (resp_obj.restype == "single")
lbl_ac.set_opts (resp_obj.results);
- else
+ else
lbl_ac.set_opts (resp_obj.results[0].concat(resp_obj.results[1]));
lbl_ac.show_popup ();
}
-function ac_show_thr ()
+function ac_show_thr ()
{
OAT.Dom.addClass (c_thr, 'thr');
}
-function ac_hide_thr ()
+function ac_hide_thr ()
{
OAT.Dom.removeClass (c_thr, 'thr');
}
@@ -149,7 +129,7 @@ function resize_handler ()
{
var wp_width = OAT.Dom.getViewport ()[0];
- if ($('res'))
+ if ($('res'))
{
var _w = (wp_width-230)+'px';
$('res').style.width = _w;
@@ -243,7 +223,7 @@ function prop_val_dt_sel_init () {
if (v in dt_s)
dt_s[v]++;
- else
+ else
dt_s[v]=1;
}
@@ -261,8 +241,8 @@ function prop_val_dt_sel_init () {
opts_a.push(new Option(shorten_dt (dt_a[i][0]), dt_a[i][0], false));
}
- var num_opt = new Option ('Numeric', '##numeric', false);
- var none_opt = new Option ('No datatype', '##none', false);
+ var num_opt = new Option ('Numeric', '##numeric', false);
+ var none_opt = new Option ('No datatype', '##none', false);
if (is_numeric_dt (dt_a[0][0])) {
opts_a.unshift (num_opt);
@@ -280,6 +260,7 @@ function prop_val_dt_sel_init () {
OAT.Event.attach ('set_cond', 'click', function (e) {
var ct = $v('cond_type');
+
var v_l = $v('cond_lo');
var v_h = $v('cond_hi');
@@ -287,35 +268,18 @@ function prop_val_dt_sel_init () {
if ((ct == 'range' || ct == 'neg_range') && (v_h == '' || v_l == '')) return;
+
if ($('cond_dt').value != '##numeric' && $('cond_dt').value != '##none' && ct != 'contains') {
- if ($v('out_lang') == '') {
- if (v_h != '' && v_h.match (/\".*\"\^\^\<.*\>/) === null) {
- if ($v('cond_dt') == '' || $v('cond_dt') == 'http://www.openlinksw.com/schemas/facets/dtp/plainstring')
- v_h = '"'+ v_h +'"';
- else
- v_h = '"' + v_h + '"^^<' + $v('cond_dt') + '>';
- }
- if (v_l != '' && v_l.match (/\".*\"\^\^\<.*\>/) === null) {
- if ($v('cond_dt') == '' || $v('cond_dt') == 'http://www.openlinksw.com/schemas/facets/dtp/plainstring')
- v_l = '"'+ v_l +'"';
- else
- v_l = '"' + v_l + '"^^<' + $v('cond_dt') + '>';
- }
- } else {
- if (v_l != '')
- v_l = '"""' + v_l + '"""@' + $v('out_lang');
-
- if (v_h != '')
- v_h = '"""' + v_h + '"""@' + $v('out_lang');
- }
+ v_h = '"' + v_h + '"^^<' + $v('cond_dt') + '>';
+ v_l = '"' + v_l + '"^^<' + $v('cond_dt') + '>';
}
- if (ct == 'gt' ||
- ct == 'lt' ||
- ct == 'gte' ||
- ct == 'lte' ||
- ct == 'eq' ||
- ct == 'neq' ||
+ if (ct == 'gt' ||
+ ct == 'lt' ||
+ ct == 'gte' ||
+ ct == 'lte' ||
+ ct == 'eq' ||
+ ct == 'neq' ||
ct == 'contains') {
$('out_hi').value = '';
}
@@ -323,45 +287,24 @@ function prop_val_dt_sel_init () {
if (ct == 'range' || ct == 'neg_range') {
$("out_hi").value = v_h;
$("out_lo").value = v_l;
- } else
+ } else
$("out_val").value = v_l;
$('out_dtp').value = '';
$('out_lang').value = '';
-
+
$('cond_form').submit();
});
OAT.Dom.show ('cond_form');
}
-
-function fct_add_loc_marker () {
- var loc_lat = $$('loc_lat');
- var loc_lon = $$('loc_lon');
-
- if (loc_lat.length && loc_lon.length) {
- var lat = parseFloat (loc_lat[0].innerHTML);
- var lon = parseFloat (loc_lon[0].innerHTML);
-
-
- window.loc_marker = window.cMap.addMarker (lat,
- lon,
- false,
- {image: 'oat/images/markers/house.png',
- imageSize: [18,41],
- title: 'Origin',
- custData: {__fct_bubble_content: ["Current Location"]}});
- }
-}
-
Geo_ui = function (form) {
var self=this;
this.form = $(form);
- this.lc = new OAT.LocationCache (5, [], false);
- this.update = false;
+ this.lc = new OAT.LocationCache (5, [], false);
this.refresh = function () {
return;
@@ -369,7 +312,6 @@ Geo_ui = function (form) {
this.loc_marker = null;
-
this.loc_acq_h = function (s,m,l) {
OAT.Dom.hide (self.loc_acq_thr_i);
OAT.Dom.hide (self.loc_ctr);
@@ -379,23 +321,24 @@ Geo_ui = function (form) {
OAT.Dom.hide (self.loc_ctr);
OAT.Dom.show (self.coord_ctr);
OAT.Dom.show (self.loc_use_b);
-
- if (self.update !== false) {
- self.cmd_i.value = 'set_loc';
- self.cno_i.value = self.update;
- self.update = false;
- self.form.submit();
- }
+ if (self.loc_marker != null)
+ window.cMap.removeMarker (self.loc_marker);
+ self.loc_marker = window.cMap.addMarker (l.getLat(),
+ l.getLon(),
+ false,
+ {image: 'oat/images/markers/house.png',
+ imageSize: [18,41],
+ custData: {__fct_bubble_content: ["Current Location"]}});
}
this.loc_to_h = function () {
OAT.Dom.hide (self.loc_acq_thr_i);
- alert ('Timeout while acquiring location.');
+ alert ('Timeout while acquiring location');
}
this.loc_err_h = function () {
OAT.Dom.hide (self.loc_acq_thr_i);
- alert ('Failed to acquire location.\nDid you allow the client to locate you?\nYou also may have geolocation, or WiFi disabled - \nif so, try enabling them and reload.');
+ alert ('Failed to acquire location');
}
this.acq_b_h = function (e) {
@@ -406,51 +349,25 @@ Geo_ui = function (form) {
this.loc_use_h = function (e) {
OAT.Event.prevent(e);
- if ((self.lat_i.value == '' || self.lon_i.value == '') && self.loc_trig_sel.selectedIndex == 0)
- return;
- if ($('cond_dist').value == '')
- return;
- if (self.loc_trig_sel.selectedIndex == 1) {
- self.lat_i.value='';
- self.lon_i.value='';
- }
+ if (self.lat_i.value == '' ||
+ self.lon_i.value == '' ||
+ $(cond_dist).value == '') return;
self.form.submit();
}
- this.loc_update = function (cno) {
- self.update = cno;
- self.lc.acquireCurrent();
- }
-
- this.loc_trig_sel_h = function (e) {
- if (e.target.selectedIndex == 1) {
- OAT.Dom.hide (self.coord_ctr);
- OAT.Dom.hide (self.acq_b);
- } else {
- OAT.Dom.show (self.coord_ctr);
- OAT.Dom.show (self.acq_b);
- }
- }
-
this.init = function () {
self.loc_acq_thr_i = $('loc_acq_thr_i');
self.loc_i = $('cond_loc');
self.lat_i = $('cond_lat');
self.lon_i = $('cond_lon');
self.acc_i = $('cond_acc');
- self.cmd_i = $('cmd');
- self.cno_i = $('cno');
- self.acq_b = $('cond_loc_acq_b');
- self.coord_ctr = $('coord_ctr');
+ self.acq_b = $('cond_loc_acq_b');
OAT.Event.attach (self.acq_b, 'click', self.acq_b_h);
self.loc_use_b = $('cond_loc_use_b')
OAT.Event.attach (self.loc_use_b, 'click', self.loc_use_h);
- self.loc_trig_sel = $('loc_trig_sel');
- OAT.Event.attach (self.loc_trig_sel, 'change', self.loc_trig_sel_h);
-
OAT.MSG.attach (self.lc, "LOCATION_ACQUIRED", self.loc_acq_h);
OAT.MSG.attach (self.lc, "LOCATION_ERROR", self.loc_err_h);
OAT.MSG.attach (self.lc, "LOCATION_TIMEOUT", self.loc_to_h);
@@ -512,13 +429,13 @@ In_ui = function (dom_ctr, form) {
if (isNaN (parseInt(_val)) && (isNaN (parseFloat(_val))))
_val = '"'+_val+'"';
-
+
self.add_val (_val, _dt, _lang);
- }
+ }
this.val_change_h = function (e) {
- }
+ }
this.make_val_row = function (d, i) {
var new_r = OAT.Dom.create ('tr');
@@ -529,19 +446,19 @@ In_ui = function (dom_ctr, form) {
new_val_col.innerHTML = d.val;
new_dt_col.innerHTML = d.dt;
- new_lang_col.innerHTML = d.lang;
+ new_lang_col.innerHTML = d.lang;
var del_a = OAT.Dom.create ('a', {}, 'in_del');
del_a.innerHTML = 'Delete';
OAT.Event.attach (del_a, 'click', function () {
self.del_val (i);
- });
+ });
OAT.Dom.append ([new_cmd_col, del_a]);
OAT.Dom.append ([new_r, new_val_col, new_dt_col, new_lang_col, new_cmd_col]);
return new_r;
- }
+ }
this.sort_fun = function (a,b) {
return (a.val > b.val);
@@ -572,10 +489,10 @@ In_ui = function (dom_ctr, form) {
this.mk_cond_parm = function (d) {
var elm = '<cond-parm ' +
- self.mk_attr ('datatype', d.dt) +
- ' ' +
+ self.mk_attr ('datatype', d.dt) +
+ ' ' +
self.mk_attr ('lang', d.lang) + '>';
-
+
return (elm.concat(OAT.Dom.toSafeXML(d.val),'</cond-parm>'));
}
@@ -583,11 +500,11 @@ In_ui = function (dom_ctr, form) {
OAT.Event.prevent(e);
var val_s = '';
if (!self.data.length) return;
-
+
for (var i=0;i < self.data.length;i++) {
val_s = val_s.concat(self.mk_cond_parm (self.data[i]));
- }
-
+ }
+
self.cond_parms.value = val_s;
self.form.submit();
}
@@ -610,7 +527,7 @@ In_ui = function (dom_ctr, form) {
OAT.Dom.append ([new_dt_c, self.new_dt_i]);
OAT.Dom.append ([new_lang_c, self.new_lang_i]);
OAT.Dom.append ([new_val_add_c, new_add_btn]);
-
+
OAT.Dom.append ([self.manual_r, new_val_c, new_dt_c, new_lang_c, new_val_add_c]);
OAT.Event.attach (new_add_btn, 'click', self.val_add_h);
@@ -633,12 +550,12 @@ In_ui = function (dom_ctr, form) {
OAT.Event.attach (self.new_add_btn, 'click', self.val_add_h);
OAT.Event.attach (self.set_cond_btn, 'click', self.submit);
- OAT.Dom.append ([self.val_list_t,
- self.val_list_thead,
+ OAT.Dom.append ([self.val_list_t,
+ self.val_list_thead,
self.val_list_tbody]);
- OAT.Dom.append ([self.dom_ctr,
- self.val_list_t,
+ OAT.Dom.append ([self.dom_ctr,
+ self.val_list_t,
self.set_cond_btn]);
self.refresh();
@@ -671,7 +588,7 @@ function handle_val_anchor_click (e) {
case "eq":
case "neq":
case "contains":
- OAT.Event.prevent(e);
+ OAT.Event.prevent(e);
$('cond_lo').value = val;
break;
case "range":
@@ -679,7 +596,7 @@ function handle_val_anchor_click (e) {
OAT.Event.prevent(e);
if ($v('cond_lo') != '')
$('cond_hi').value = val;
- else
+ else
$('cond_lo').value = val;
break;
case "in":
@@ -687,18 +604,7 @@ function handle_val_anchor_click (e) {
in_ui.add_val (val, dtp, lang);
break;
}
- // XXX should warn user if setting range option with values of different dtp
-
$('out_dtp').value = dtp;
-
- for (i=0;i<$('cond_dt').options.length;i++) {
- var opt = $('cond_dt').options[i];
- if (opt.value == dtp)
- opt.selected = true;
- else
- opt.selected = false;
- }
-
$('out_lang').value = lang;
}
@@ -717,47 +623,43 @@ function prop_cond_sel_init () {
var in_ui = false;
var geo_ui = false;
-function init () {
- fct_init_ui (); // Yes, the xsl sheet overrides ini, but this hack needs to be here in order for the main query page to work.
-}
-
-function fct_init_ui ()
+function init()
{
resize_handler ();
OAT.Event.attach (window, 'resize', resize_handler);
if ($('main_srch')) {
- uri_ac = new OAT.Autocomplete('new_uri_txt',
- 'new_uri_val',
- 'new_uri_btn',
- 'new_uri_fm',
- {get_ac_matches: fct_uri_ac_get_matches});
+ uri_ac = new OAT.Autocomplete('new_uri_txt',
+ 'new_uri_val',
+ 'new_uri_btn',
+ 'new_uri_fm',
+ {get_ac_matches: fct_uri_ac_get_matches});
- lbl_ac = new OAT.Autocomplete('new_lbl_txt',
- 'new_lbl_val',
- 'new_lbl_btn',
- 'new_lbl_fm',
- {get_ac_matches: fct_lbl_ac_get_matches});
+ lbl_ac = new OAT.Autocomplete('new_lbl_txt',
+ 'new_lbl_val',
+ 'new_lbl_btn',
+ 'new_lbl_fm',
+ {get_ac_matches: fct_lbl_ac_get_matches});
+
+ var tabs = new OAT.Tab ('TAB_CTR', {dockMode: false});
- var tabs = new OAT.Tab ('TAB_CTR', {dockMode: false});
+ tabs.add ('TAB_TXT', 'TAB_PAGE_TXT');
+ tabs.add ('TAB_URI', 'TAB_PAGE_URI');
+ tabs.add ('TAB_URILBL', 'TAB_PAGE_URILBL');
- tabs.add ('TAB_TXT', 'TAB_PAGE_TXT');
- tabs.add ('TAB_URI', 'TAB_PAGE_URI');
- tabs.add ('TAB_URILBL', 'TAB_PAGE_URILBL');
-
- tabs.go (0);
+ tabs.go (0);
OAT.MSG.attach ('*', 'AJAX_START', function () { ac_show_thr () });
- OAT.Dom.show ('main_srch');
-
- if ((typeof window.external =="object") &&
- ((typeof window.external.AddSearchProvider == "unknown") ||
- (typeof window.external.AddSearchProvider == "function")))
+ OAT.Dom.show ('main_srch');
+
+ if ((typeof window.external =="object") &&
+ ((typeof window.external.AddSearchProvider == "unknown") ||
+ (typeof window.external.AddSearchProvider == "function")))
{
- OAT.Event.attach ('opensearch_link',
- 'click',
+ OAT.Event.attach ('opensearch_link',
+ 'click',
function () { window.external.AddSearchProvider(location.protocol+'//'+location.host+'/fct/opensearchdescription.vsp'); });
}
}
@@ -775,11 +677,9 @@ function fct_init_ui ()
prop_val_anchors_init();
prop_cond_sel_init();
- if (!in_ui)
+ if (!in_ui)
in_ui = new In_ui ('in_ctr','cond_form');
-
-
OAT.Dom.hide('cond_hi_ctr');
OAT.Event.attach('cond_type', 'change', function (e) {
@@ -794,29 +694,22 @@ function fct_init_ui ()
case "gte":
case "eq":
case "neq":
- in_ui.hide ();
- OAT.Dom.show ('cond_inp_ctr');
- OAT.Dom.show ('cond_dt');
- OAT.Dom.hide ('cond_hi_ctr');
- break;
case "contains":
in_ui.hide ();
OAT.Dom.show ('cond_inp_ctr');
OAT.Dom.hide ('cond_hi_ctr');
- OAT.Dom.hide ('cond_dt');
break;
case "range":
case "neg_range":
in_ui.hide();
OAT.Dom.show ('cond_inp_ctr');
OAT.Dom.show ('cond_hi_ctr');
- OAT.Dom.show ('cond_dt');
break;
case "in":
OAT.Dom.hide ('cond_inp_ctr');
- OAT.Dom.hide ('cond_hi_ctr');
+ OAT.Dom.hide ('cond_hi_ctr');
in_ui.show();
- break;
+ break;
/* case "near":
in_ui.hide();
OAT.Dom.hide ('cond_inp_ctr');
@@ -827,7 +720,6 @@ function fct_init_ui ()
}
}
-
// opts = { loader: function - function gets called when user hits tab or stops entering text
// timer_interval: timer interval in msec };
//
@@ -836,7 +728,7 @@ function fct_init_ui ()
OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
var self = this;
-
+
this.timer = 0;
this.value = 0;
@@ -845,17 +737,17 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
timer_interval:1000,
onchange:function() {}
}
-
+
for (var p in optObj) { self.options[p] = optObj[p]; }
-
+
this.div = OAT.Dom.create("div", {}, "autocomplete");
-
+
this.list = OAT.Dom.create("div",
{position:"absolute",left:"0px",top:"0px",zIndex:1001},
"autocomplete_list");
-
+
self.instant = new OAT.Instant (self.list);
-
+
this.submit_form = function() {
if (self.value) {
self.val_inp.value = self.value;
@@ -885,7 +777,7 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
this.keydown_handler = function (e)
{
- if ((e.keyCode && e.keyCode == 13) ||
+ if ((e.keyCode && e.keyCode == 13) ||
(e.which && e.which == 13)) {
self.val_inp.value = '';
if (self.timer)
@@ -897,7 +789,7 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
}
}
- this.blur_handler = function (e)
+ this.blur_handler = function (e)
{
if (self.timer) {
window.clearTimeout (self.timer);
@@ -905,18 +797,18 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
}
}
- this.btn_handler = function(e)
+ this.btn_handler = function(e)
{
self.submit_form();
}
-
- this.clear_opts = function()
+
+ this.clear_opts = function()
{
OAT.Dom.clear(self.list);
}
-
- this.add_option = function(name, value)
+
+ this.add_option = function(name, value)
{
var n = name;
var v = name;
@@ -928,7 +820,7 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
var opt_lbl = OAT.Dom.create ("span", {}, "opt_lbl");
opt_lbl.innerHTML = n;
- var opt_iri = OAT.Dom.create ("span", {}, "opt_iri");
+ var opt_iri = OAT.Dom.create ("span", {}, "opt_iri");
opt_iri.innerHTML = v;
opt.value = v;
@@ -939,7 +831,7 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
self.list.appendChild(opt);
}
- this.attach = function(option)
+ this.attach = function(option)
{
var ref = function(event) {
self.value = option.value;
@@ -954,7 +846,7 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
}
this.set_opts = function (opt_list)
- {
+ {
if (opt_list.length) {
for (var i=0;i<opt_list.length;i=i+2) {
this.add_option(opt_list[i], opt_list[i+1]);
@@ -964,9 +856,9 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
else
self.btn.disabled = true;
}
-
+
this.set_uri_opts = function (opt_list)
- {
+ {
if (opt_list.length) {
for (var i=0;i<opt_list.length;i=i+1) {
this.add_option(opt_list[i]);
@@ -976,7 +868,7 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
else
self.btn.disabled = true;
}
-
+
this.show_popup = function ()
{
self.instant.show();
@@ -986,8 +878,8 @@ OAT.Autocomplete = function (_input, _value_input, _button, _form, optObj) {
{
self.instant.hide();
}
-
- self.instant.options.showCallback = function()
+
+ self.instant.options.showCallback = function()
{
var coords = OAT.Dom.position(self.input);
var dims = OAT.Dom.getWH(self.input);
@@ -1069,4 +961,3 @@ function fct_set_pivot_href_opt()
href = href.replace(/CXML_redir_for_hrefs=[^&]*&/, 'CXML_redir_for_hrefs='+opt+'&');
a.setAttribute("href", href);
}
-
diff --git a/binsrc/b3s/facet.sql b/binsrc/b3s/facet.sql
index 3772578..1646206 100644
--- a/binsrc/b3s/facet.sql
+++ b/binsrc/b3s/facet.sql
@@ -1,10 +1,10 @@
--
--- $Id: facet.sql,v 1.1.2.38 2012/03/05 17:38:05 source Exp $
+-- $Id: facet.sql,v 1.1.2.27 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -23,58 +23,15 @@
-- Facet web service
-create procedure
-fct_dbg_msg (in str varchar, in lvl int := 666)
-{
- declare d_lvl int;
- declare d_mode varchar;
-
- d_lvl := connection_get ('fct_dbg_lvl');
- d_mode := connection_get ('fct_dbg_mode');
-
- if (lvl < d_lvl) return;
-
- if (d_lvl)
- {
- if (d_mode = 'stderr')
- {
- dbg_printf ('%s', str);
- return;
- }
- if (d_mode = 'page')
- {
- declare d_out_s any;
- d_out_s := connection_get ('__fct_dbg_out');
- if (d_out_s)
- http (str || '\n', d_out_s);
- }
- }
-}
-;
-
-create procedure
-fct_render_dbg_out ()
+create procedure
+fct_dbg_msg (in str varchar)
{
declare d_lvl int;
- declare d_out varchar;
-
- d_lvl := connection_get ('fct_dbg_lvl');
- d_out := connection_get ('fct_dbg_out');
- if (not d_lvl) return;
- if (not d_out) { dbg_printf ('fct_render_dbg_out: no d_out'); return; }
+ d_lvl := registry_get ('fct_dbg_lvl');
+ if (isstring (d_lvl)) d_lvl := atoi (d_lvl);
- declare d_ses any;
- d_ses := connection_get ('__fct_dbg_out');
-
- if (d_ses)
- {
- http('<div id="dbg_output"><pre>');
- http_value (d_ses);
- http('</pre></div>');
- }
- else
- dbg_printf ('fct_render_dbg_out: no string session to write to!');
+ if (d_lvl > 0) dbg_printf ('%s', str);
}
;
@@ -210,8 +167,8 @@ FCT_LABEL (in x any, in g_id iri_id_8, in ctx varchar)
label_iri := iri_id_from_num (atoi (registry_get ('fct_label_iri')));
best_str := null;
best_l := 0;
- for select o, p
- from rdf_quad table option (index primary key)
+ for select o, p
+ from rdf_quad table option (index primary key)
where s = x and p in (rdf_super_sub_list (ctx, label_iri, 3)) do
{
if (is_rdf_box (o) or isstring (o))
@@ -222,8 +179,8 @@ FCT_LABEL (in x any, in g_id iri_id_8, in ctx varchar)
l := length (o);
if (l > best_l)
{
- best_str := o;
- best_l := l;
+ best_str := o;
+ best_l := l;
}
}
}
@@ -263,7 +220,7 @@ FCT_LABEL_DP_L (in x any, in g_id iri_id_8, in ctx varchar, in lng varchar)
str_lang := (select RL_ID from RDF_LANGUAGE where RL_TWOBYTE = lng_pref);
}
else
- str_lang := 'en';
+ str_lang := 'en';
q := cmp_get_lang_by_q (lng, str_lang);
if (is_rdf_box (o) or isstring (o))
@@ -283,8 +240,8 @@ FCT_LABEL_DP_L (in x any, in g_id iri_id_8, in ctx varchar, in lng varchar)
l := length (o);
if (l > best_l)
{
- best_str := o;
- best_l := l;
+ best_str := o;
+ best_l := l;
}
}
}
@@ -310,16 +267,15 @@ FCT_LABEL_NP (in x any, in g_id iri_id_8, in ctx varchar, in lng varchar := 'en'
best_str := '';
best_l := 0;
best_q := 0;
- for select o
+ for select __ro2sq (o) as o
from rdf_quad table option (index rdf_quad)
- where s = x and p in (rdf_super_sub_list (ctx, label_iri, 3)) order by cast (b3s_lbl_order (P) as int) do
+ where s = x and p in (rdf_super_sub_list (ctx, label_iri, 3)) do
{
- o := __ro2sq (o);
lang_id := rdf_box_lang (o);
if (lang_id > 257)
str_lang := (select RL_ID from RDF_LANGUAGE where RL_TWOBYTE = lang_id);
else
- str_lang := 'en';
+ str_lang := 'en';
q := cmp_get_lang_by_q (lng, str_lang);
if (is_rdf_box (o) or isstring (o))
{
@@ -360,7 +316,7 @@ FCT_LABEL_S (in x any, in g_id iri_id_8, in ctx varchar, in lng varchar)
str_lang := (select RL_ID from RDF_LANGUAGE where RL_TWOBYTE = lng_pref);
}
else
- str_lang := 'en';
+ str_lang := 'en';
q := cmp_get_lang_by_q (lng, str_lang);
if (is_rdf_box (o) or isstring (o))
@@ -459,8 +415,6 @@ og:longitude rdfs:subPropertyOf geo:long .
<http://poolparty.punkt.at/demozone/ont#title> rdfs:subPropertyOf virtrdf:label .
<http://purl.uniprot.org/core/scientificName> rdfs:subPropertyOf virtrdf:label .
<http://www.openlinksw.com/schemas/googleplus#activity_title> rdfs:subPropertyOf virtrdf:label .
-<http://linkedopencommerce.com/schemas/icecat/v1/hasShortSummaryDescription> rdfs:subPropertyOf virtrdf:label .
-<http://yago-knowledge.org/resource/hasPreferredName> rdfs:subPropertyOf virtrdf:label .
', 'xx', 'facets');
rdfs_rule_set ('facets', 'facets');
@@ -472,11 +426,11 @@ fct_inf_val (in tree any)
{
declare i varchar;
- i := cast (xpath_eval ('/query/@inference', tree) as varchar);
+ i := cast (xpath_eval ('/query/@inference', tree) as varchar);
if (i is null or '' = i)
return null;
- return i;
+ return i;
}
;
@@ -489,7 +443,7 @@ fct_inf_clause (in tree any)
if (i is not null)
return sprintf (' define input:inference "%s" ', i);
- return '';
+ return '';
}
;
@@ -498,7 +452,7 @@ fct_sas_val (in tree any)
{
declare i varchar;
- i := cast (xpath_eval ('/query/@same-as', tree) as varchar);
+ i := cast (xpath_eval ('/query/@same-as', tree) as varchar);
if (i is null or '' = i)
return null;
@@ -515,7 +469,7 @@ fct_sas_clause (in tree any)
if (i is not null)
return sprintf (' define input:same-as "%s" ', i);
- return '';
+ return '';
}
;
@@ -549,10 +503,11 @@ fct_dtp (in x any)
declare dtp any;
dtp := rdf_datatype_of_long (x, UNAME'http://www.openlinksw.com/schemas/facets/dtp/plainstring');
- return (id_to_iri (dtp));
+ return (id_to_iri (dtp));
}
;
+
--
-- Handle any DTs which need special serialization in FILTER, etc.
--
@@ -566,7 +521,7 @@ fct_sparql_ser (in x any)
return '';
}
;
-
+
create procedure
fct_lang (in x any)
{
@@ -578,16 +533,14 @@ fct_lang (in x any)
}
;
-create procedure
+create procedure
fct_get_mode (in tree any, in xp any)
{
declare view_type varchar;
view_type := cast (xpath_eval (xp, tree, 1) as varchar);
-
if (0 and sys_stat ('cl_run_local_only') and view_type = 'text-d')
view_type := 'text';
-
- return view_type;
+ return view_type;
}
;
@@ -607,7 +560,7 @@ fct_xml_wrap (in tree any, in txt any)
fct_dbg_msg (sprintf (' n_cols : %d', n_cols));
-- dbg_obj_print (xpath_eval ('//query/text', tree, 1));
-
+
if (n_cols = 2)
{
if (view_type = 'text')
@@ -637,9 +590,9 @@ fct_xml_wrap (in tree any, in txt any)
else if (view_type = 'text-d')
{
texp := cast (xpath_eval ('string (//query/text)', tree, 1) as varchar);
- http ('select xmlelement (\'result\',
- xmlattributes (\'text-d\' as "type"),
- "res")
+ http ('select xmlelement (\'result\',
+ xmlattributes (\'text-d\' as "type"),
+ "res")
from (sparql ', ntxt);
}
else if (view_type = 'entities-list' or view_type = 'list' or view_type = 'propval-list')
@@ -684,7 +637,7 @@ fct_xml_wrap (in tree any, in txt any)
xmlelement ("column", fct_label_np ("c1", 0, ''facets'' )))))
from (sparql define output:valmode "LONG"', view_type), ntxt);
if (n_cols = 3)
- http (sprintf ('select xmlelement ("result", xmlattributes (''%s'' as "type"),
+ http ('select xmlelement ("result", xmlattributes ('''' as "type"),
xmlagg (xmlelement ("row",
xmlelement ("column",
xmlattributes (fct_lang ("c1") as "xml:lang",
@@ -696,7 +649,7 @@ fct_xml_wrap (in tree any, in txt any)
xmlelement ("column", __ro2sq ("c2")),
xmlelement ("column", __ro2sq ("c3"))
)))
- from (sparql define output:valmode "LONG" ', view_type), ntxt);
+ from (sparql define output:valmode "LONG" ', ntxt);
http (txt, ntxt);
@@ -778,7 +731,7 @@ fct_view (in tree any, in this_s int, in txt any, in pre any, in post any, in fu
declare geo_conds any;
geo_conds := xpath_eval ('//cond/@cond_t = ''near''', full_tree);
- if (0 <> geo_conds and mode <> 'geo')
+ if (0 <> geo_conds and mode <> 'geo')
mode := 'geo-list';
fct_dbg_msg (sprintf('fct_view: view mode: %s', mode));
@@ -794,20 +747,17 @@ fct_view (in tree any, in this_s int, in txt any, in pre any, in post any, in fu
http (sprintf ('select ?s%d as ?c1 count (*) as ?c2 ', this_s), pre);
http (sprintf (' group by ?s%d order by desc 2', this_s), post);
}
-
if ('entities-list' = mode)
{
http (sprintf ('select distinct ?s%d as ?c1 ', this_s), pre);
http (sprintf (' order by desc (<LONG::IRI_RANK> (?s%d)) ', this_s), post);
}
-
if ('properties' = mode)
{
if (length (fct_inf_clause (tree)) > 0)
http (sprintf ('select ?s%dp as ?c1 count (distinct (?s%d)) as ?c2 ', this_s, this_s), pre);
else
http (sprintf ('select ?s%dp as ?c1 count (*) as ?c2 ', this_s), pre);
-
http (sprintf (' ?s%d ?s%dp ?s%do .', this_s, this_s, this_s), txt);
http (sprintf (' group by ?s%dp order by desc 2', this_s), post);
}
@@ -834,7 +784,6 @@ fct_view (in tree any, in this_s int, in txt any, in pre any, in post any, in fu
http (sprintf (' ?s%d a ?s%dc .', this_s, this_s), txt);
http (sprintf (' group by ?s%dc order by desc 2', this_s), post);
}
-
if ('text' = mode or ('text-d' = mode and plain = 1))
{
declare exp any;
@@ -854,18 +803,18 @@ fct_view (in tree any, in this_s int, in txt any, in pre any, in post any, in fu
if ('text-d' = mode)
{
declare exp any;
-
exp := charset_recode (xpath_eval ('string (//text)', tree), '_WIDE_', 'UTF-8');
-
- http (sprintf ('select
- (<sql:s_sum_page> (<sql:vector_agg> (<bif:vector> (?c1, ?sm)), <bif:vector> (%s))) as ?res where { {
+ http (sprintf ('select
+ (<sql:s_sum_page> (<sql:vector_agg> (<bif:vector> (?c1, ?sm)), <bif:vector> (%s))) as ?res where { {
select (<SHORT_OR_LONG::>(?s%d)) as ?c1, (<sql:S_SUM> ( <SHORT_OR_LONG::IRI_RANK> (?s%d), <SHORT_OR_LONG::>(?s%dtextp), <SHORT_OR_LONG::>(?o%d), ?sc ) ) as ?sm ', element_split (exp), this_s, this_s, this_s, this_s), pre);
- http (sprintf ('order by desc (<sql:sum_rank> ((<sql:S_SUM> ( <SHORT_OR_LONG::IRI_RANK> (?s%d), <SHORT_OR_LONG::>(?s%dtextp), <SHORT_OR_LONG::>(?o%d), ?sc ) ) ) )', this_s, this_s, this_s), post);
+ http (sprintf ('order by desc (<sql:sum_rank> ((<sql:S_SUM> ( <SHORT_OR_LONG::IRI_RANK> (?s%d), <SHORT_OR_LONG::>(?s%dtextp), <SHORT_OR_LONG::>(?o%d), ?sc ) ) ) )', this_s, this_s, this_s), post);
fct_post (tree, post, lim, offs);
http ('}}', post);
return;
}
+
+
if ('graphs' = mode)
{
http ('select ?g as ?c1, count(*) as ?c2 ', pre);
@@ -875,7 +824,6 @@ fct_view (in tree any, in this_s int, in txt any, in pre any, in post any, in fu
{
declare loc any;
loc := xpath_eval ('@location-prop', tree);
-
if (loc = 'any')
{
loc := '?anyloc';
@@ -883,14 +831,15 @@ fct_view (in tree any, in this_s int, in txt any, in pre any, in post any, in fu
}
else
http (sprintf ('select distinct ?s%d as ?c1 ?lat%d as ?c2 ?lng%d as ?c3 ', this_s, this_s, this_s), pre);
-
if (length (loc) < 2)
http (sprintf (' ?s%d geo:lat ?lat%d ; geo:long ?lng%d .', this_s, this_s, this_s), txt);
else
http (sprintf (' ?s%d %s ?location . ?location geo:lat ?lat%d ; geo:long ?lng%d .', this_s, loc, this_s, this_s), txt);
+
}
fct_post (tree, post, lim, offs);
+
}
;
@@ -918,7 +867,7 @@ fct_literal (in tree any)
if ('uri' = dtp or 'url' = dtp or 'iri' = dtp) {
return sprintf ('<%s>', val);
- }
+}
return sprintf ('"%s"^^<%s>', val, dtp);
}
@@ -958,9 +907,9 @@ fct_cond (in tree any, in this_s int, in txt any)
-- dbg_printf ('fct_cond: inner: %s', flt_inner);
- if (neg = 'on')
+ if (neg = 'on')
http (sprintf (' filter (! (%s)) . ', flt_inner), txt);
- else
+ else
http (sprintf (' filter (%s) . ', flt_inner), txt);
return;
@@ -968,7 +917,7 @@ fct_cond (in tree any, in this_s int, in txt any)
;
create procedure
-fct_value (in tree any, in this_s int, in txt any)
+fct_value (in tree any, in this_s int, in txt any)
{
declare val, dtp, op any;
@@ -981,7 +930,7 @@ fct_value (in tree any, in this_s int, in txt any)
declare t_s varchar;
t_s := sprintf ('?s%d', this_s);
- http (sprintf (' filter (%s %s %s) .', t_s, op, val));
+ http (sprintf (' filter (%s %s %s) .', t_s, op, val));
return;
}
@@ -1009,14 +958,14 @@ fct_cond_range (in tree any, in this_s int, in txt any)
cond_t := xpath_eval ('./@type', tree);
neg := xpath_eval ('./@neg', tree);
- lo := xpath_eval ('./@lo', tree);
- hi := xpath_eval ('./@hi', tree);
+ lo := xpath_eval ('./@lo', tree);
+ hi := xpath_eval ('./@hi', tree);
declare flt_inner, flt_cl varchar;
-- fct_dbg_msg (sprintf ('fct_cond_range: got lo: %s, hi: %s, neg: %s', lo, hi, cast (neg as varchar)));
- if (lo <> '' and hi <> '') {
+ if (lo <> '' and hi <> '') {
flt_inner := sprintf ('(?s%d >= %s && ?s%d <= %s)', this_s, lo, this_s, hi);
}
@@ -1028,43 +977,27 @@ fct_cond_range (in tree any, in this_s int, in txt any)
http (flt_cl, txt);
return;
-}
+ }
;
-create procedure
+create procedure
fct_cond_contains (in tree any, in this_s int, in txt any)
{
- declare val, neg, cond_t, txs_qr varchar;
- declare wlimit int;
- declare txs_arr any;
+ declare val, neg, cond_t varchar;
- neg := xpath_eval ('./@neg', tree);
+ neg := xpath_eval ('./@neg', tree);
val := cast (xpath_eval ('.', tree) as varchar);
- if (val <> '')
- {
- wlimit := registry_get ('fct_text_query_limit');
-
- if (isstring (wlimit))
- wlimit := atoi (wlimit);
- if (0 = wlimit)
- wlimit := 100;
-
- txs_qr := fti_make_search_string_inner (charset_recode (xpath_eval ('string (.)', tree), '_WIDE_', 'UTF-8'), txs_arr);
-
- if (length (txs_arr) > wlimit)
- signal ('22023', 'The request is too large');
-
- if ('no' <> neg)
- {
- http (sprintf (' ?s%d bif:contains ''%s'' .', this_s, txs_qr), txt);
- }
- else
- {
- http (sprintf (' filter (! bif:contains (?s%d, ''"%s"'')) .', this_s, val), txt);
- }
+ if (val <> '')
+ {
+ if ('no' <> neg) {
+ http (sprintf (' filter (bif:contains (?s%d, ''"%s"'')) .', this_s, val), txt);
+ }
+ else {
+ http (sprintf (' filter (! bif:contains (?s%d, ''"%s"'')) .', this_s, val), txt);
}
+ }
}
;
@@ -1078,14 +1011,14 @@ fct_cond_in (in tree any, in this_s int, in txt any) {
v := xpath_eval ('./cond-parm', tree, 0);
if (0 = length(v)) return;
-
+
for (i := 0; i < length(v); i := i + 1) {
fct_dbg_msg (sprintf ('val: %s\n', cast (xpath_eval ('./text()', v[i]) as varchar)));
if (i = 0) {
v_str := fct_literal (v[i]);
}
- else
+ else
v_str := v_str || ',' || fct_literal (v[i]);
};
@@ -1112,15 +1045,15 @@ fct_cond_near (in tree any, in this_s int, in txt any) {
d := xpath_eval ('./@d', tree, 0);
prop := xpath_eval ('./@location-prop', tree, 0);
- if (length(lon) = 0 or length(lat) = 0 or length (d) = 0) return;
+ if (length (lon) = 0 or
+ length (lat) = 0 or
+ length (d) = 0) return;
lon := aref (lon, 0);
lat := aref (lat, 0);
d := cast (aref (d, 0) as int);
prop := aref (prop, 0);
- if (lon = '' or lat = '') return;
-
fct_dbg_msg (sprintf ('fct_cond_near: lon:%s, lat:%s, dist: %d', lon, lat, d));
if (length (prop) < 2)
@@ -1128,12 +1061,12 @@ fct_cond_near (in tree any, in this_s int, in txt any) {
else
http (sprintf (' ?s%d %s ?location . ?location geo:lat ?lat%d ; geo:long ?lng%d .', this_s, prop, this_s, this_s), txt);
- http (sprintf (' filter (bif:st_intersects (bif:st_point (xsd:float(?lng%d),xsd:float(?lat%d)), bif:st_point (%s,%s), %d)).',
+ http (sprintf (' filter (bif:st_intersects (bif:st_point (xsd:float(?lng%d),xsd:float(?lat%d)), bif:st_point (%s,%s), %d)).',
this_s, this_s, lon, lat, d), txt);
}
;
-create procedure
+create procedure
fct_curie_iri (in curie varchar)
{
declare pos int;
@@ -1144,14 +1077,14 @@ fct_curie_iri (in curie varchar)
return null;
pref := subseq (curie, 0, pos);
loc := subseq (curie, pos + 1);
- ns := __xml_get_ns_uri (pref, 2);
+ ns := __xml_get_ns_uri (pref, 2);
if (ns is null)
return null;
return ns || loc;
}
;
-create procedure
+create procedure
fct_curie (in curie varchar)
{
if (curie like '\\[%:%\\]')
@@ -1162,7 +1095,7 @@ fct_curie (in curie varchar)
if (tmp is not null)
curie := tmp;
}
- return curie;
+ return curie;
}
;
@@ -1210,16 +1143,13 @@ fct_text (in tree any,
{
declare ciri varchar;
ciri := fct_curie (cast (xpath_eval ('./@iri', tree) as varchar));
-
- fct_dbg_msg (sprintf ('class: %s', cast (ciri as varchar)));
-
if (cast (xpath_eval ('./@exclude', tree) as varchar) = 'yes')
{
http (sprintf (' filter (!bif:exists ((select (1) where { ?s%d a <%s> } ))) .', this_s, ciri), txt);
}
- else if (ciri is null)
+ else if (ciri is null)
{
- http (sprintf ('?s%d a ?s%d .', this_s, this_s + 1), txt);
+ http (sprintf ('?s%d a ?s%d .', this_s, this_s+1), txt);
}
else
{
@@ -1250,7 +1180,6 @@ fct_text (in tree any,
sc_opt := ' option (score ?sc) ';
else
sc_opt := '';
-
if (prop is not null)
prop := '<' || prop || '>';
else
@@ -1260,8 +1189,8 @@ fct_text (in tree any,
if (isstring (wlimit))
wlimit := atoi (wlimit);
if (0 = wlimit)
- wlimit := 100;
- txs_qr := fti_make_search_string_inner (charset_recode (xpath_eval ('string (.)', tree), '_WIDE_', 'UTF-8'), txs_arr);
+ wlimit := 100;
+ txs_qr := fti_make_search_string_inner (charset_recode (xpath_eval ('string (.)', tree), '_WIDE_', 'UTF-8'), txs_arr);
if (length (txs_arr) > wlimit)
signal ('22023', 'The request is too large');
http (sprintf (' ?s%d %s ?o%d . ?o%d bif:contains ''%s'' %s .', this_s, prop, this_s, this_s, txs_qr, sc_opt), txt);
@@ -1311,13 +1240,11 @@ fct_text (in tree any,
if ('cond' = n)
{
- fct_chk_any_prop (tree, this_s, max_s, txt);
fct_cond (tree, this_s, txt);
}
if ('cond-range' = n)
{
- fct_chk_any_prop (tree, this_s, max_s, txt);
fct_cond_range (tree, this_s, txt);
}
@@ -1329,28 +1256,10 @@ fct_text (in tree any,
;
create procedure
-fct_chk_any_prop (in tree any, inout this_s int, inout max_s int, in txt any)
-{
- if (0 = xpath_eval ('count (./ancestor::*[name()=''property''])+ count(./ancestor::*[name()=''property-of''])', tree, 1))
- {
- declare dtp varchar;
- dtp := xpath_eval ('./@dtp', tree, 1);
-
- declare new_s int;
- max_s := max_s + 1;
- new_s := max_s;
-
- http (sprintf ('?s%d ?s%dcondp ?s%d .', this_s, this_s, new_s), txt);
- this_s := max_s;
- }
-}
-;
-
-create procedure
fct_query (in tree any, in plain integer := 0)
{
declare s, add_graph int;
- declare txt, pre, post any;
+ declare txt, pre, post any;
txt := string_output ();
pre := string_output ();
@@ -1413,24 +1322,7 @@ fct_test (in str varchar, in timeout int := 0)
;
create procedure
-fct_view_pos (in tree any)
-{
- declare c any;
- declare i int;
- c := xpath_eval ('//*[name() = "query" or
- name () = "property" or
- name () = "property-of"]', tree, 0);
- for (i := 0; i < length (c); i := i + 1)
- {
- if (xpath_eval ('./view', c[i]) is not null)
- return i;
- }
- return 0;
-}
-;
-
-create procedure
-fct_exec (in tree any,
+fct_exec (in tree any,
in timeout int)
{
declare start_time, view3, inx, n_rows int;
@@ -1453,9 +1345,7 @@ fct_exec (in tree any,
}
sqls := '00000';
-
qr := fct_query (xpath_eval ('//query', tree, 1));
-
query := qr;
qr2 := fct_xml_wrap (tree, qr);
@@ -1502,16 +1392,15 @@ fct_exec (in tree any,
inx := inx + 1;
}
- declare v_pos integer;
- v_pos := fct_view_pos(tree);
- res := xmlelement ("facets", xmlelement ("sparql", query),
+
+ res := xmlelement ("facets", xmlelement ("sparql", query),
xmlelement ("time", msec_time () - start_time),
xmlelement ("complete", case when sqls = 'S1TAT' then 'no' else 'yes' end),
xmlelement ("timeout", __min (timeout * 2, atoi (registry_get ('fct_timeout_max')))),
xmlelement ("db-activity", act),
- xmlelement ("processed", n_rows),
- xmlelement ("view", xmlattributes (offs as "offset", lim as "limit", v_pos as "position")),
+ xmlelement ("processed", n_rows),
+ xmlelement ("view", xmlattributes (offs as "offset", lim as "limit")),
results[0], results[1], results[2]);
--String_to_file ('ret.xml', serialize_to_UTF8_xml (res), -2);
diff --git a/binsrc/b3s/facet.vsp b/binsrc/b3s/facet.vsp
index 3a6fea7..7381402 100644
--- a/binsrc/b3s/facet.vsp
+++ b/binsrc/b3s/facet.vsp
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html
+<!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">
<head>
<title>Precision Search & Find</title>
-<?vsp
- declare main_ss varchar;
- main_ss := registry_get ('fct_main_ss');
- if (not isstring (main_ss)) main_ss := 'styles/default.css';
-?>
- <link rel="stylesheet" type="text/css" href="<?=main_ss?>" charset="utf-8" />
+<link id="ss" rel="stylesheet" media="screen" type="text/css" href="styles/default.css"/>
<?vsp
fct_gen_opensearch_link();
@@ -23,65 +18,52 @@
<script type="text/javascript" src="oat/toolkit/loader.js"></script>
<script type="text/javascript" src="facet.js"></script>
-<?vsp
+<?vsp
declare sid, _S, ses_parms varchar;
b3s_handle_ses (path, lines, params);
sid := connection_get ('sid');
-
- declare dbg_out any;
- declare dbg_mode varchar;
- declare dbg_lvl int;
-
- dbg_mode := registry_get ('fct_dbg_mode');
- dbg_lvl := registry_get ('fct_dbg_lvl');
-
- if (not isstring (dbg_lvl))
- dbg_lvl := http_param ('dbg');
-
- if (not isstring (dbg_lvl))
- dbg_lvl := 0;
- else
- dbg_lvl := atoi (dbg_lvl);
-
- connection_set ('fct_dbg_lvl', dbg_lvl);
-
- if (not isstring(dbg_mode))
- dbg_mode := http_param ('dbg_mode');
-
- if (not isstring (dbg_mode))
- dbg_mode := 'page';
-
- connection_set ('fct_dbg_mode', dbg_mode);
-
- if (dbg_mode := 'page')
- {
- dbg_out := string_output();
- connection_set ('__fct_dbg_out', dbg_out);
- }
-
-- dbg_obj_print (path);
-- dbg_obj_print (lines);
-
+
?>
</head>
<body>
<div id="PG">
<div id="HD">
- <?vsp fct_page_head (); ?>
+ <?vsp fct_page_head (); ?>
+ <ul id="main_menu">
+ <?vsp if (sid is not null) { ?>
+ <!--li class="sel"><a href="<?= b3s_render_fct_link() ?>" class="sel">Facets</a></li-->
+ <?vsp } ?>
+ <!--li id="mnu_settings"><a href="settings.vsp?g=<?U _S ?><?V ses_parms ?>">Settings</a>
+ <div id="settings_popup" style="display: none">
+ <ul>
+ <li>
+ <input id="sas_ckb" type="checkbox" <?= b3s_sas_selected() ?> onchange="javascript:sas_cb();"/>
+ <label for="sas_ckb">owl:sameAs</label>
+ </li>
+ <li>
+ <label for="inf_sel">IFP rule:</label>
+ <select id="inf_sel" onchange="javascript:inf_cb();"><?vsp b3s_render_inf_opts (); ?></select><br/>
+ </li>
+ </ul>
+ </div>
+ </li--><!--settings-popup-->
+ </ul>
</div><!-- #HD -->
<div id="MD">
-<?vsp
---
+<?vsp
--
--- $Id: facet.vsp,v 1.1.2.24 2012/03/05 17:38:05 source Exp $
+--
+-- $Id: facet.vsp,v 1.1.2.14 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -117,11 +99,11 @@ if ('load' = cmd)
_fsq_id := http_param ('fsq_id');
- if (_fsq_id)
+ if (_fsq_id)
{
_sid := fct_load (_fsq_id);
if (_sid is not null)
- {
+ {
http_rewrite ();
http_request_status ('HTTP/1.1 302 Found');
http_header (sprintf ('Location: /fct/facet.vsp?sid=%d&cmd=refresh\r\n', _sid));
@@ -136,86 +118,62 @@ sq := connection_get ('sparql_query');
declare exit handler for sqlstate '*'
{
- commit work;
- declare _state, _out any;
- declare _xmlser varchar;
-
- if (isstring (http_param ('sid')))
- select fct_state into _state from fct_state where fct_sid = http_param ('sid');
- else
- _state := null;
-
- _out := string_output();
-
- http_value (_state, 0, _out);
- _xmlser := string_output_string (_out);
-
http('<div class="error_msg dlg">\n');
http(' <div class="title"><h2>Error</h2></div>\n');
- http(' <div class="body">');
- http('<p>Could not process your request because of an unexpected error.</p>');
- http(' </div>\n');
+ http(' <div class="body">An unexpected error was encountered while processing your request.</div>\n');
http(' <div class="diag">\n');
http(' <h3>Diagnostics</h3>\n');
http(sprintf ('<pre class="sqlstate">SQLSTATE: %s</pre><br/>\n', __SQL_STATE));
http(sprintf ('<pre class="sqlmsg">SQLMSG : %s</pre><br/>\n', __SQL_MESSAGE));
http('<a href="#" id="err_det_toggle" onclick="javascript: OAT.Dom.show (err_details);">More info…</a>');
http(' <div id="err_details" style="display:none">');
-
if (connection_get ('sparql_query') is not null)
- {
- http('<pre class="sparqlqry">SPARQL:\n');
- http_value(connection_get ('sparql_query'));
- http('</pre><br/>\n');
- }
-
- http(sprintf ('<p><a href="/fct/facet.vsp?qxml=%U" title="Permalink">Permalink</a></p>', _xmlser));
+ http(sprintf ('<pre class="sparqlqry">SPARQL:\n%s</pre><br/>\n', connection_get ('sparql_query')));
commit work;
+ declare _state any;
+ select fct_state into _state from fct_state where fct_sid = http_param ('sid');
insert into fct_log (fl_sid, fl_cli_ip, fl_state, fl_where, fl_cmd, fl_sqlstate, fl_sqlmsg, fl_parms)
- values (http_param('sid'),
+ values (http_param('sid'),
http_client_ip (),
_state,
'ERR_HANDLER',
- http_param('cmd'),
+ http_param('cmd'),
__SQL_STATE,
__SQL_MESSAGE,
serialize(params));
http(' <pre class="facet_state">STATE:\n');
- http_value(_xmlser);
- http('</pre><br/>');
+ http('<![CDATA[\n');
+ http_value(_state);
+ http('\n]]>');
+
+ http(' </pre><br/>');
http(' </div>\n');
http(' </div>\n');
- http(' <div class="btn_bar"><button onclick="document.location=''/fct/facet.vsp?qq=ww''">New Search</button></div>\n');
+ http(' <div class="btn_bar"><button onclick="document.location=''/fct/facet.vsp?qq=ww''">New Search</button></div>\n');
http('</div>\n');
goto footer;
-
+
};
fct_vsp ();
footer:;
?>
-<?vsp if (dbg_lvl) { ?>
-<div class="dbg">
- <pre><![CDATA[<?vsp if (sq is not null) http(sq); ?>]]></pre>
-<?vsp fct_render_dbg_out ();?>
-</div>
-<?vsp } ?>
-
+<div class="dbg" style="display: none"><pre><![CDATA[<?vsp if (sq is not null) http(sq); ?>]]></div>
</div><!-- #MD -->
<div id="FT">
Faceted Search & Find service v<?vsp http(DB.DBA.VAD_CHECK_VERSION('fct')); ?><br/>
<a href="http://virtuoso.openlinksw.com/"><img src="/fct/images/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/></a>
<a href="http://linkeddata.org"><img src="/fct/images/LoDLogo.gif" alt="Linked Data"/></a>
- <?vsp
+ <?vsp
if (isstring (registry_get ('fst_hosted'))) { http (registry_get ('fst_hosted')); }
?>
<br/>
- <?vsp fct_virt_info (); ?><br />
- <span class="copyright">Data on this page is owned by its respective rights holders.<br/>Virtuoso Faceted Browser Copyright © 2009-2012 OpenLink Software</span>
+ <?vsp fct_virt_info (); ?><br />
+ <span class="copyright">Copyright © 2009-2011 OpenLink Software</span>
<div id="FT_L"></div>
<div id="FT_R"></div>
</div>
diff --git a/binsrc/b3s/facet_doc.html b/binsrc/b3s/facet_doc.html
index c4949fb..1497033 100644
--- a/binsrc/b3s/facet_doc.html
+++ b/binsrc/b3s/facet_doc.html
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: facet_doc.html,v 1.1.2.10 2012/03/05 17:38:05 source Exp $
+-- $Id: facet_doc.html,v 1.1.2.8 2011/03/08 15:43:44 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -22,7 +22,7 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
-->
-<!DOCTYPE html
+<!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'; ?>
@@ -42,7 +42,7 @@
<h1>
<div id="logo">
<a href="/fct/facet.vsp">
- <img src="/fct/images/openlink_site_logo.png"
+ <img src="/fct/images/openlink_site_logo.png"
alt="OpenLink Software"/>
</a>
</div>
@@ -50,7 +50,7 @@
<div id="homelink"></div>
</div> <!-- hd_l -->
<div id="hd_r">
- <a href="http://data.openlinksw.com/about/html/http://data.openlinksw.com/oplweb/product_family/virtuoso"
+ <a href="http://data.openlinksw.com/about/html/http://data.openlinksw.com/oplweb/product_family/virtuoso"
title="OpenLink Virtuoso">
<img class="powered_by" src="/fct/images/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/>
</a>
@@ -61,35 +61,35 @@
<h1>Entity Search, Find, and Explore - Documentation</h1>
<p></p>
<h2>Text Search</h2>
- <p>Enter a text pattern to look for. Finder will show a listing of entities with the text
- occurring in any literal property value or label. You may then continue to refine your search
+ <p>Enter a text pattern to look for. Finder will show a listing of entities with the text
+ occurring in any literal property value or label. You may then continue to refine your search
by filtering by type, property value, etc.</p>
<h2>Entity URI (ID) Lookup</h2>
- <p>You can lookup an Entity URI using the autocomplete feature which performs lookups as you type.
+ <p>You can lookup an Entity URI using the autocomplete feature which performs lookups as you type.
The OpenLink Finder recognizes some well-known namespace prefixes. For example: "dbpedia:"</p>
<h2>Results Order & Ranking</h2>
- <p>On some listings, results are sorted using a combination of text match score and entity-attribute-value
- link coefficients. Thus, a small indicator graphic (horizontal bars in leftmost column) is used to unveil
- metrics for both rankings per entity; the top bar indicates the text score while the bottom covers the entity
+ <p>On some listings, results are sorted using a combination of text match score and entity-attribute-value
+ link coefficients. Thus, a small indicator graphic (horizontal bars in leftmost column) is used to unveil
+ metrics for both rankings per entity; the top bar indicates the text score while the bottom covers the entity
ranking. Hovering on either will reveal the actual value.</p>
<h3>Text Scores</h3>
- <p>These are proportional to the frequency of the search terms in the match and if many terms are present,
+ <p>These are proportional to the frequency of the search terms in the match and if many terms are present,
the score weight is increased by a proximity factor.
<h3>Entity Rank</h3>
- <p>Entity matches are ranked based on how frequently they are referenced by other entities. Rankings
- are increased as a function of the score of the referencing entity.</p>
+ <p>Entity matches are ranked based on how frequently they are referenced by other entities. Rankings
+ are increased as a function of the score of the referencing entity.</p>
<a name="timeout"></a><h2>Timeouts</h2>
- <p>The Virtuoso 6.x engine includes a new "Anytime Query" feature that enables the optional use of a configurable
+ <p>The Virtuoso 6.x engine includes a new "Anytime Query" feature that enables the optional use of a configurable
response time threshold (timeout) when executing queries over large
- datasets. This feature protects against deliberate or inadvertent denial-of-service style resource-hogging
- that can arise from badly written or complex queries.
- When enabled, this feature lets you to set hard limit for resource usage per query associated with
- unauthenticated users. Queries execute until the response time limit threshold is reached, and, if partial
- results are available, they are returned with additional result set diagnostics flagging the partial nature
- of the result set. All query handling is partitioned thereby protecting against cross-client resource
+ datasets. This feature protects against deliberate or inadvertent denial-of-service style resource-hogging
+ that can arise from badly written or complex queries.
+ When enabled, this feature lets you to set hard limit for resource usage per query associated with
+ unauthenticated users. Queries execute until the response time limit threshold is reached, and, if partial
+ results are available, they are returned with additional result set diagnostics flagging the partial nature
+ of the result set. All query handling is partitioned thereby protecting against cross-client resource
contention.</p>
- <p>This service currently enforces a 20 second hard time limit for queries. Each query is first run with a 2 second timeout -
- if only a partial result or no results are received, the user is prompted to retry with double the previous time limit until
+ <p>This service currently enforces a 20 second hard time limit for queries. Each query is first run with a 2 second timeout -
+ if only a partial result or no results are received, the user is prompted to retry with double the previous time limit until
the hard limit is reached.</p>
<h2>OpenSearch</h2>
<p>You can add this service as a search engine plugin in OpenSearch capable browsers. You can do this in Firefox by using the pulldown
@@ -115,7 +115,7 @@
<div id="FT">
<a href="http://virtuoso.openlinksw.com/"><img src="/fct/images/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/></a>
<a href="http://linkeddata.org"><img src="/fct/images/LoDLogo.gif" alt="Linked Data"/></a><br/>
- <span class="copyright">Copyright © 2009-2012 OpenLink Software</span>
+ <span class="copyright">Copyright © 2009-2011 OpenLink Software</span>
<div id="FT_L"></div>
<div id="FT_R"></div>
</div>
diff --git a/binsrc/b3s/facet_svc.sql b/binsrc/b3s/facet_svc.sql
index 393161f..f96a806 100644
--- a/binsrc/b3s/facet_svc.sql
+++ b/binsrc/b3s/facet_svc.sql
@@ -1,10 +1,10 @@
--
--- $Id: facet_svc.sql,v 1.1.2.12 2012/03/05 17:38:05 source Exp $
+-- $Id: facet_svc.sql,v 1.1.2.10 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -31,7 +31,7 @@ create procedure fct_init ()
{
WS.WS.host_meta_add ('FCT.service', '<Link rel="http://openlinksw.com/virtuoso/fct/service" href="http://%{WSHost}s/fct/service"/>');
WS.WS.host_meta_add ('FCT.browser', '<Link rel="http://openlinksw.com/virtuoso/fct/browser" href="http://%{WSHost}s/fct/"/>');
- WS.WS.host_meta_add ('FCT.describe',
+ WS.WS.host_meta_add ('FCT.describe',
'<Link rel="http://openlinksw.com/virtuoso/fct/resource-descriptor" template="http://%{WSHost}s/describe/?url={uri}"/>');
}
}
@@ -50,7 +50,7 @@ create procedure fct_svc_log (in qr varchar, in lines varchar)
}
;
-create procedure
+create procedure
fct_svc_exec (in tree any, in timeout int, in accept varchar, in lines any)
{
declare start_time int;
@@ -84,7 +84,7 @@ fct_svc_exec (in tree any, in timeout int, in accept varchar, in lines any)
if (not isarray (res) or 0 = length (res) or not isarray (res[0]) or 0 = length (res[0]))
res := xtree_doc ('<result/>');
else
- res := res[0][0];
+ res := res[0][0];
ret := xmlelement ("facets", xmlelement ("sparql", qr), xmlelement ("time", msec_time () - start_time),
xmlelement ("complete", case when sqls = 'S1TAT' then 'no' else 'yes' end),
diff --git a/binsrc/b3s/facet_test.sql b/binsrc/b3s/facet_test.sql
index fbf442f..2b8a04e 100644
--- a/binsrc/b3s/facet_test.sql
+++ b/binsrc/b3s/facet_test.sql
@@ -1,10 +1,10 @@
--
--- $Id: facet_test.sql,v 1.1.2.5 2012/03/05 17:38:05 source Exp $
+-- $Id: facet_test.sql,v 1.1.2.3 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -20,7 +20,7 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
--- Sample facet queries
+-- Sample facet queries
<query> <class iri="http://xmlns.com/foaf/0.1/Person" /><view type="list" limit="10" /></query>
@@ -35,17 +35,19 @@ select fct_query (xtree_doc ('
select fct_query (xtree_doc ('
<query> <class iri="http://xmlns.com/foaf/0.1/Person" />
-<property iri="foaf:knows"><property iri="foaf:name"><value>"Joe"</value></property>
+<property iri="foaf:knows"><property iri="foaf:name"><value>"Joe"</value> </property>
</property>
<view type="properties" limit="10" /></query>
'));
+
+
select fct_query (xtree_doc ('
<query><text>semantic</text> <view type="text" limit="10" />
</query>'));
select fct_test ('
-<query>
+<query>
<class iri="http://xmlns.com/foaf/0.1/Person" />
<view type="properties" limit="10" /></query>
', 1000);
@@ -54,14 +56,14 @@ select fct_test ('
select fct_query (xtree_doc ('<query><class iri="http://xmlns.com/foaf/0.1/Person"/> <view type="list" limit="10"/></query>'));
-select fct_test ('<query> <text>semantic web</text><view type="text" limit="20"/></query>');
+select fct_test ('<query> <text>semantic web</text><view type="text" limit="20"/></query>');
-select fct_test ('<query> <text>hottie</text><view type="text-properties" limit="20"/></query>');
+select fct_test ('<query> <text>hottie</text><view type="text-properties" limit="20"/></query>');
-select fct_test ('<query> <text property="http://purl.org/dc/elements/1.1/description">hottie</text><view type="text" limit="20"/></query>');
+select fct_test ('<query> <text property="http://purl.org/dc/elements/1.1/description">hottie</text><view type="text" limit="20"/></query>');
select xslt ('file://fct/fct_vsp.xsl',
- xtree_doc ('<facets><result><row><column>http://xyz.com/xyz.htm</column></row></result></facets>'),
+ xtree_doc ('<facets><result><row><column>http://xyz.com/xyz.htm</column></row></result></facets>'),
vector ('sid', 2, 'type', 'properties'))
create procedure fct_exp (in str varchar)
diff --git a/binsrc/b3s/facet_text.xsl b/binsrc/b3s/facet_text.xsl
index a41ff03..ae4ae46 100644
--- a/binsrc/b3s/facet_text.xsl
+++ b/binsrc/b3s/facet_text.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: facet_text.xsl,v 1.1.2.3 2012/03/05 17:38:05 source Exp $
+-- $Id: facet_text.xsl,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -27,14 +27,14 @@
<xsl:output method="text"/>
<xsl:template match="facets">
<xsl:for-each select="result/row">
- <xsl:for-each select="column">
- <xsl:value-of select="." />
+ <xsl:for-each select="column">
+ <xsl:value-of select="." />
<xsl:text></xsl:text>
</xsl:for-each>
<xsl:text>
- </xsl:text>
+ </xsl:text>
</xsl:for-each>
-<xsl:text> Complete = </xsl:text> <xsl:value-of select="complete"/>
+<xsl:text> Complete = </xsl:text> <xsl:value-of select="complete"/>
<xsl:text> Activity = </xsl:text> <xsl:value-of select="db-activity"/>
</xsl:template>
</xsl:stylesheet>
diff --git a/binsrc/b3s/facet_view.sql b/binsrc/b3s/facet_view.sql
index de1df84..c0c7ccf 100644
--- a/binsrc/b3s/facet_view.sql
+++ b/binsrc/b3s/facet_view.sql
@@ -1,10 +1,10 @@
--
--- $Id: facet_view.sql,v 1.1.2.48 2012/03/15 16:35:35 source Exp $
+-- $Id: facet_view.sql,v 1.1.2.34 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -23,9 +23,25 @@
--set ignore_params=on;
-- Facets web page
-registry_set ('_fct_xslt_',
+registry_set ('_fct_xslt_',
case when registry_get('_fct_url_') = 0 then 'file://fct/' else registry_get('_fct_url_') end);
+create procedure
+fct_view_pos (in tree any)
+{
+ declare c any;
+ declare i int;
+ c := xpath_eval ('//*[name() = "query" or
+ name () = "property" or
+ name () = "property-of"]', tree, 0);
+ for (i := 0; i < length (c); i := i + 1)
+ {
+ if (xpath_eval ('./view', c[i]) is not null)
+ return i;
+ }
+ return null;
+}
+;
create procedure
fct_view_info (in tree any, in ctx int, in txt any)
@@ -35,9 +51,7 @@ fct_view_info (in tree any, in ctx int, in txt any)
pos := 1 + fct_view_pos (tree);
tree := xpath_eval ('//view', tree);
-
mode := cast (xpath_eval ('./@type', tree, 1) as varchar);
-
lim := atoi (cast (xpath_eval ('./@limit', tree, 1) as varchar));
offs := atoi (cast (xpath_eval ('./@offset', tree, 1) as varchar));
@@ -58,7 +72,7 @@ fct_view_info (in tree any, in ctx int, in txt any)
{
http ('Displaying Places associated with Entities', txt);
}
- if ('geo-list' = mode)
+ if ('geo-list' = mode)
{
http ('Displaying Entities with Geographical location');
}
@@ -70,6 +84,7 @@ fct_view_info (in tree any, in ctx int, in txt any)
{
http ('Displaying Attributes with Entity Reference Values', txt);
}
+
if ('text-properties' = mode)
{
http (sprintf ('showing properties of %s%d containing "%s"',
@@ -86,13 +101,13 @@ fct_view_info (in tree any, in ctx int, in txt any)
{
http ('Displaying Ranked Entity Names and Text summaries', txt);
}
- if ('propval-list' = mode)
+ if ('propval-list' = mode)
{
http ('Displaying property values', txt);
}
-- if (offs)
-- http (sprintf (' values %d - %d', 1 + offs, lim), txt);
-
+
http (' where:</h3>', txt);
}
@@ -137,21 +152,16 @@ create procedure fct_t_term ()
create procedure
fct_var_tag (in this_s int, in ctx int)
{
- declare cl varchar;
-
- if (this_s <> ctx)
- cl := '';
- else
- cl := 'focus';
-
- return sprintf ('<a class="%s" href="/fct/facet.vsp?cmd=set_focus&sid=%d&n=%d" title="Focus on %s%d">%s%d</a>',
- cl,
+ if (ctx)
+ return sprintf ('<a href="/fct/facet.vsp?cmd=set_focus&sid=%d&n=%d" title="Focus on %s%d">%s%d</a>',
connection_get ('sid'),
this_s,
fct_s_term (),
this_s,
fct_s_term (),
this_s);
+ else
+ return sprintf ('%s%d', connection_get ('s_term'), this_s);
}
;
@@ -171,8 +181,8 @@ fct_space (in n int)
}
;
-create procedure
-fct_cond_name (in cond varchar)
+create procedure
+fct_cond_name (in cond varchar)
{
if ('eq' = cond) return '==';
if ('neq' = cond) return '!=';
@@ -184,7 +194,7 @@ fct_cond_name (in cond varchar)
}
;
-create procedure
+create procedure
fct_li (in out_str varchar, in txt any) {
http ('<li>', txt);
http (out_str, txt);
@@ -192,7 +202,7 @@ fct_li (in out_str varchar, in txt any) {
}
;
-create procedure
+create procedure
fct_val_fmt_enc (in val varchar, in lang varchar, in dtp varchar)
{
-- fct_dbg_msg (sprintf ('fct_val_fmt_enc: %s, %s, %s', val, lang, dtp));
@@ -203,7 +213,7 @@ fct_val_fmt_enc (in val varchar, in lang varchar, in dtp varchar)
if (dtp <> '') {
if (dtp <> 'uri')
return sprintf ('"%V"^^%V', val, dtp);
- else
+ else
return sprintf ('<%V>', val);
}
@@ -248,7 +258,7 @@ fct_query_info (in tree any,
n := cast (xpath_eval ('name ()', tree, 1) as varchar);
- fct_dbg_msg (sprintf ('fct_query_info: cno: %d, level: %d, n: %s, ctx: %d', cno, level, n, ctx));
+ fct_dbg_msg (sprintf ('fct_query_info: level: %d, n: %s', level, n));
http (fct_space (2 * level), txt);
@@ -257,20 +267,20 @@ fct_query_info (in tree any,
if (cast (xpath_eval ('./@exclude', tree) as varchar) = 'yes')
{
fct_li (sprintf ('%s is not a <span class="iri">%s</span> . <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
- fct_var_tag (this_s, ctx),
- fct_short_form (cast (xpath_eval ('./@iri', tree) as varchar)),
- connection_get ('sid'),
- cno),
- txt);
+ fct_var_tag (this_s, ctx),
+ fct_short_form (cast (xpath_eval ('./@iri', tree) as varchar)),
+ connection_get ('sid'),
+ cno),
+ txt);
}
else
{
fct_li (sprintf ('%s is a <span class="iri">%s</span> . <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
- fct_var_tag (this_s, ctx),
- fct_short_form (cast (xpath_eval ('./@iri', tree) as varchar)),
- connection_get ('sid'),
- cno),
- txt);
+ fct_var_tag (this_s, ctx),
+ fct_short_form (cast (xpath_eval ('./@iri', tree) as varchar)),
+ connection_get ('sid'),
+ cno),
+ txt);
}
cno := cno + 1;
}
@@ -286,22 +296,22 @@ fct_query_info (in tree any,
prop := cast (xpath_eval ('./@property', tree, 1) as varchar);
if (prop is not null)
- fct_li (sprintf (' %s has <span class="iri"><a href="#"/fct/facet.vsp?sid=%d&cmd=drop_text_prop">%s</a></span> containing text <span class="value">"%s"</span>. ',
- fct_var_tag (this_s, ctx),
- connection_get ('sid'),
- fct_short_form (prop),
- charset_recode (xpath_eval ('string (.)', tree), '_WIDE_', 'UTF-8')),
+ fct_li (sprintf (' %s has <span class="iri"><a href="#"/fct/facet.vsp?sid=%d&cmd=drop_text_prop">%s</a></span> containing text <span class="value">"%s"</span>. ',
+ fct_var_tag (this_s, ctx),
+ connection_get ('sid'),
+ fct_short_form (prop),
+ charset_recode (xpath_eval ('string (.)', tree), '_WIDE_', 'UTF-8')),
txt);
else
- fct_li (sprintf (' %s has <a class="qry_info_cmd" href="/fct/facet.vsp?sid=%d&cmd=set_view&type=text-properties&limit=20&offset=0&cno=%d">any %s</a> with %s <span class="value">"%s"</span> <a href="/fct/facet.vsp?sid=%d&cmd=drop_text">Drop</a>. ',
- fct_var_tag (this_s, ctx),
- connection_get ('sid'),
- cno,
- fct_p_term (),
- fct_o_term (),
- charset_recode (xpath_eval ('string (.)', tree), '_WIDE_', 'UTF-8'),
- connection_get ('sid')),
- txt);
+ fct_li (sprintf (' %s has <a class="qry_info_cmd" href="/fct/facet.vsp?sid=%d&cmd=set_view&type=text-properties&limit=20&offset=0&cno=%d">any %s</a> with %s <span class="value">"%s"</span> <a href="/fct/facet.vsp?sid=%d&cmd=drop_text">Drop</a>. ',
+ fct_var_tag (this_s, ctx),
+ connection_get('sid'),
+ cno,
+ fct_p_term (),
+ fct_o_term (),
+ charset_recode (xpath_eval ('string (.)', tree), '_WIDE_', 'UTF-8'),
+ connection_get('sid')),
+ txt);
}
else if ('property' = n)
@@ -313,25 +323,25 @@ fct_query_info (in tree any,
if (cast (xpath_eval ('./@exclude', tree) as varchar) = 'yes')
{
http (sprintf (' %s does not have property <span class="iri">%s</span> %s . ',
- fct_var_tag (this_s, ctx),
- fct_short_form (cast (xpath_eval ('./@iri', tree, 1) as varchar)),
- fct_var_tag (new_s, ctx)),
+ fct_var_tag (this_s, ctx),
+ fct_short_form (cast (xpath_eval ('./@iri', tree, 1) as varchar)),
+ fct_var_tag (new_s, ctx)),
txt);
}
else
{
http (sprintf (' %s <span class="iri">%s</span> %s . ',
- fct_var_tag (this_s, ctx),
- fct_short_form (cast (xpath_eval ('./@iri', tree, 1) as varchar)),
- fct_var_tag (new_s, ctx)),
+ fct_var_tag (this_s, ctx),
+ fct_short_form (cast (xpath_eval ('./@iri', tree, 1) as varchar)),
+ fct_var_tag (new_s, ctx)),
txt);
}
if (ctx)
http (sprintf ('<a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop&n=%d">Drop %s%d</a> ',
- connection_get ('sid'),
- new_s,
- fct_s_term (),
- new_s),
+ connection_get ('sid'),
+ new_s,
+ fct_s_term (),
+ new_s),
txt);
fct_query_info_1 (tree, new_s, max_s, level, ctx, txt, cno);
@@ -352,9 +362,9 @@ fct_query_info (in tree any,
if (ctx)
http (sprintf ('<a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop&n=%d">Drop %s%d</a> ',
- connection_get ('sid'),
- new_s,
- fct_s_term (),
+ connection_get ('sid'),
+ new_s,
+ fct_s_term (),
new_s), txt);
fct_query_info_1 (tree, new_s, max_s, ctx, level, txt, cno);
@@ -363,12 +373,12 @@ fct_query_info (in tree any,
if ('value' = n)
{
fct_li (sprintf (' %s %s %V . <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
- fct_var_tag (this_s, ctx),
- cast (xpath_eval ('./@op', tree) as varchar),
- fct_literal (tree),
- connection_get ('sid'),
- cno),
- txt);
+ fct_var_tag (this_s, ctx),
+ cast (xpath_eval ('./@op', tree) as varchar),
+ fct_literal (tree),
+ connection_get ('sid'),
+ cno),
+ txt);
cno := cno + 1;
}
if ('cond-parm' = n)
@@ -377,21 +387,15 @@ fct_query_info (in tree any,
fct_literal (tree)),
txt);
}
- if ('cond' = n)
+ if ('cond' = n)
{
declare cond_t, lang, dtp, neg, val any;
- declare prop_qual varchar;
cond_t := xpath_eval ('./@type', tree);
lang := xpath_eval ('./@lang', tree);
dtp := xpath_eval ('./@datatype',tree);
val := cast (xpath_eval ('.', tree) as varchar);
- if (0 = xpath_eval ('count (./ancestor::*[name()=''property''])+ count(./ancestor::*[name()=''property-of''])', tree, 1))
- prop_qual := ' (any property) ';
- else
- prop_qual := '';
-
fct_dbg_msg (sprintf ('fct_qry_info: cond: type:%s dtp:%s lang:%s val:%s',
cast (cond_t as varchar),
cast (dtp as varchar),
@@ -403,39 +407,37 @@ fct_query_info (in tree any,
http ('<li>', txt);
- if (cond_t = 'eq' or
- cond_t = 'neq' or
- cond_t = 'lt' or
- cond_t = 'lte' or
- cond_t = 'gt' or
+ if (cond_t = 'eq' or
+ cond_t = 'neq' or
+ cond_t = 'lt' or
+ cond_t = 'lte' or
+ cond_t = 'gt' or
cond_t = 'gte')
{
- --val_fmt_enc (val, lang, dtp)),
- http (sprintf ('%s %s%s %V',
- fct_var_tag (this_s, ctx),
- prop_qual,
+ --val_fmt_enc (val, lang, dtp)),
+ http (sprintf ('%s %s %V',
+ fct_var_tag (this_s, ctx),
fct_cond_name (cond_t),
fct_literal (xpath_eval ('.', tree))),
txt);
- }
- else if ('contains' = cond_t)
+ }
+ else if ('contains' = cond_t)
{
- http (sprintf (' %s %scontains "%s" .',
+ http (sprintf (' %s contains "%s" .',
fct_var_tag (this_s, ctx),
- prop_qual,
- val),
+ val),
txt);
- }
- else if ('in' = cond_t)
+ }
+ else if ('in' = cond_t)
{
declare this_cno int;
this_cno := cno;
- http (sprintf ('%s %sis IN: ', fct_var_tag (this_s, ctx), prop_qual), txt);
+ http (sprintf ('%s is IN: ', fct_var_tag (this_s, ctx)), txt);
fct_query_info_1 (tree, this_s, max_s, level, ctx, txt, cno);
- http (sprintf (' <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
- connection_get ('sid'),
- this_cno),
- txt);
+ http (sprintf (' <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
+ connection_get ('sid'),
+ this_cno),
+ txt);
http ('</li>\n', txt);
cno := cno + 1;
@@ -447,88 +449,76 @@ fct_query_info (in tree any,
declare d integer;
declare prop varchar;
declare prop_info varchar;
- declare acq_l integer;
- lat := xpath_eval ('./@lat', tree);
- lon := xpath_eval ('./@lon', tree);
- d := xpath_eval ('./@d', tree);
- acq_l := xpath_eval ('./@acquire', tree);
- prop := xpath_eval ('./@location-prop', tree);
+ lat := xpath_eval ('./@lat', tree);
+ lon := xpath_eval ('./@lon', tree);
+ d := xpath_eval ('./@d', tree);
+ prop := xpath_eval ('./@location-prop', tree);
prop_info := '.';
if (prop <> '') {
prop_info := sprintf (' by %s property.', prop);
- }
-
- if (acq_l is not null and (length(lat) = 0 or length(lon) = 0))
- {
- fct_dbg_msg ('Triggering autolocation');
- http (sprintf ('<span class="acq_l_ind" id="acq_l_ind">Locating...</span><span class="acq_l_trig" id="acq_l_trig" style="display:none">%d</span>', cno), txt);
- }
-
- if (length(lat) and length(lon))
- {
- http (sprintf ('%s is within %s km radius of lat:<span class="loc_lat">%s</span>, lon:<span class="loc_lon">%s</span>%s',
- fct_var_tag(this_s, ctx),
- d,
- lat,
- lon,
- prop_info),
- txt);
- if (acq_l is not null)
- http ('<span class="autoloc_ind">Location acquired.</span>', txt);
- }
+ }
+
+ http (sprintf ('%s is within %s km radius of lat:%s, lon:%s%s',
+ fct_var_tag (this_s, ctx),
+ d,
+ lat,
+ lon,
+ prop_info),
+ txt);
}
- http (sprintf (' <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
- connection_get ('sid'),
- cno),
- txt);
+ http (sprintf (' <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
+ connection_get ('sid'),
+ cno),
+ txt);
+
http ('</li>\n', txt);
cno := cno + 1;
- }
- if ('cond-range' = n)
+ }
+ if ('cond-range' = n)
{
declare hi, lo, neg, cond_t any;
- cond_t := xpath_eval ('./@type', tree);
- hi := xpath_eval ('./@hi', tree);
- lo := xpath_eval ('./@lo', tree);
+ cond_t := xpath_eval ('./@type', tree);
+ hi := xpath_eval ('./@hi', tree);
+ lo := xpath_eval ('./@lo', tree);
neg := xpath_eval ('./@neg', tree);
http ('<li>', txt);
- if (neg = 'on' or 'neg_range' = cond_t)
+ if (neg = 'on' or 'neg_range' = cond_t)
neg := ' not ';
- else
+ else
neg := '';
http (sprintf (' %s is %s between %V and %V .',
- fct_var_tag (this_s, ctx),
- neg,
- cast (lo as varchar),
+ fct_var_tag (this_s, ctx),
+ neg,
+ cast (lo as varchar),
cast (hi as varchar)),
txt);
- http (sprintf (' <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
- connection_get ('sid'),
- cno),
- txt);
+ http (sprintf (' <a class="qry_nfo_cmd" href="/fct/facet.vsp?sid=%d&cmd=drop_cond&cno=%d">Drop</a>',
+ connection_get ('sid'),
+ cno),
+ txt);
http ('</li>\n', txt);
cno := cno + 1;
+ }
}
-}
;
VHOST_REMOVE (lpath=>'/fct');
VHOST_DEFINE (lpath=>'/fct',
- ppath=>case when registry_get('_fct_path_') = 0 then '/fct/' else registry_get('_fct_path_') end,
+ ppath=>case when registry_get('_fct_path_') = 0 then '/fct/' else registry_get('_fct_path_') end,
is_dav=>atoi (case when registry_get('_fct_dav_') = 0 then '0' else registry_get('_fct_dav_') end),
vsp_user=>'dba', def_page=>'facet.vsp');
VHOST_REMOVE (lpath=>'/b3s');
VHOST_DEFINE (lpath=>'/b3s',
- ppath=>case when registry_get('_fct_path_') = 0 then '/fct/' else registry_get('_fct_path_') end || 'www/',
+ ppath=>case when registry_get('_fct_path_') = 0 then '/fct/' else registry_get('_fct_path_') end || 'www/',
is_dav=>atoi (case when registry_get('_fct_dav_') = 0 then '0' else registry_get('_fct_dav_') end),
vsp_user=>'dba', def_page=>'listall.vsp');
@@ -542,11 +532,8 @@ fct_top (in tree any, in txt any)
declare cno int;
cno := 0;
- declare ctx int;
- ctx := fct_view_pos (tree)+1;
- fct_dbg_msg (sprintf ('fct_top: ctx: %d', ctx));
+ fct_query_info (xpath_eval ('/query', tree), 1, max_s, 1, 1, txt, cno);
- fct_query_info (xpath_eval ('/query', tree), 1, max_s, 1, ctx, txt, cno);
}
;
@@ -555,7 +542,6 @@ fct_view_link (in tp varchar, in msg varchar, in txt any, in tip any := null)
{
if (tip is null)
tip := msg;
-
http (sprintf ('<li><a href="/fct/facet.vsp?cmd=set_view&sid=%d&type=%s&limit=20&offset=0" title="%V">%s</a></li>',
connection_get ('sid'), tp, tip, msg), txt);
}
@@ -564,8 +550,8 @@ fct_view_link (in tp varchar, in msg varchar, in txt any, in tip any := null)
create procedure
fct_ft_a (in txt any)
{
- http(sprintf ('<li><form><label for="ft_q">Text</label><input type="hidden" name="cmd" value="text"/><input type="hidden" name="sid" value="%d"/><input type="text" name="q"/><input type="submit" value="Set"/></li>',
- connection_get('sid')),
+ http(sprintf ('<li><form><label for="ft_q">Text</label><input type="hidden" name="cmd" value="text"/><input type="hidden" name="sid" value="%d"/><input type="text" name="q"/><input type="submit" value="Set"/></li>',
+ connection_get('sid')),
txt);
}
;
@@ -610,41 +596,41 @@ fct_nav (in tree any,
}
if ('classes' <> tp)
- if (connection_get('c_term') = 'class')
+ if (connection_get('c_term') = 'class')
fct_view_link ('classes', 'Classes', txt);
- else
+ else
fct_view_link ('classes', 'Types', txt, 'Entity Category or Class');
if ('properties' <> tp)
- if (connection_get('s_term') = 's')
+ if (connection_get('s_term') = 's')
fct_view_link ('properties', 'Properties', txt, 'Entity Characteristic or Property');
else
- fct_view_link ('properties', 'Attributes', txt, 'Entity Characteristic or Property');
+ fct_view_link ('properties', 'Attributes', txt, 'Entity Characteristic or Property');
if ('text' = tp and pos = 0)
fct_view_link ('text-properties', 'Properties containing the text', txt);
if ('properties-in' <> tp)
- if (connection_get('s_term') = 's')
+ if (connection_get('s_term') = 's')
fct_view_link ('properties-in', 'Referencing Properties', txt, 'Characteristics or Properties with Entity References as values');
else
- fct_view_link ('properties-in', 'Referencing Attributes', txt, 'Characteristics or Properties with Entity References as values');
+ fct_view_link ('properties-in', 'Referencing Attributes', txt, 'Characteristics or Properties with Entity References as values');
if ('text' <> tp and tp <> 'text-d')
{
if (tp <> 'list-count')
- if (connection_get('s_term') = 's')
+ if (connection_get('s_term') = 's')
fct_view_link ('list-count', 'Distinct objects (Aggregated)', txt, 'Displaying List of Distinct Entity Names ordered by Count');
else
- fct_view_link ('list-count', 'Distinct values (Aggregated)', txt, 'Displaying List of Distinct Entity Names ordered by Count');
+ fct_view_link ('list-count', 'Distinct values (Aggregated)', txt, 'Displaying List of Distinct Entity Names ordered by Count');
if (tp <> 'list')
- if (connection_get('s_term') = 's')
+ if (connection_get('s_term') = 's')
fct_view_link ('list', 'Show Matching Objects', txt, 'Displaying Ranked Enitity Names and Text summaries');
else
- fct_view_link ('list', 'Show Matching Values', txt, 'Displaying Ranked Enitity Names and Text summaries');
+ fct_view_link ('list', 'Show Matching Values', txt, 'Displaying Ranked Enitity Names and Text summaries');
}
- if ('full-text' <> tp and not xpath_eval ('//query/text', tree))
+ if ('full-text' <> tp and not xpath_eval ('//query/text', tree))
{
fct_view_link ('full-text', 'Text', txt,'Add full-text constraint');
}
@@ -654,8 +640,8 @@ fct_nav (in tree any,
--fct_view_link ('geo', 'Map', txt);
http (sprintf ('<li><a id="map_link" href="/fct/facet.vsp?cmd=set_view&sid=%d&type=%s&limit=20&offset=0" title="%V">%s</a> '||
'<select name="map_of" onchange="javascript:link_change(this.value)">'||
- '<option value="any">Any location</option>'||
'<option value="">Shown items</option>'||
+ '<option value="any">Any location</option>'||
'<option value="dbpprop:location">dbpedia:location</option>'||
'<option value="dbpprop:place">dbpedia:place</option>'||
'<option value="foaf:based_near">foaf:based_near</option>'||
@@ -671,14 +657,14 @@ fct_nav (in tree any,
}
http ('</ul><ul class="n2">', txt);
- http (sprintf ('<li><a href="/fct/facet.vsp?cmd=set_inf&sid=%d">Options</a></li>',
- connection_get ('sid')), txt);
- http (sprintf ('<li><a href="/fct/facet.vsp?cmd=save_init&sid=%d">Save</a></li>',
- connection_get ('sid')), txt);
- http (sprintf ('<li><a href="/fct/facet.vsp?cmd=featured&sid=%d">Featured Queries</a></li>',
- connection_get ('sid')), txt);
- http (sprintf ('<li><a href="/fct/facet.vsp?sid=%d">New Search</a></li>',
- connection_get ('sid')), txt);
+ http (sprintf ('<li><a href="/fct/facet.vsp?cmd=set_inf&sid=%d">Options</a></li>',
+ connection_get ('sid')), txt);
+ http (sprintf ('<li><a href="/fct/facet.vsp?cmd=save_init&sid=%d">Save</a></li>',
+ connection_get ('sid')), txt);
+ http (sprintf ('<li><a href="/fct/facet.vsp?cmd=featured&sid=%d">Featured Queries</a></li>',
+ connection_get ('sid')), txt);
+ http (sprintf ('<li><a href="/fct/facet.vsp?sid=%d">New Search</a></li>',
+ connection_get ('sid')), txt);
http ('</ul>', txt);
http ('</div> <!-- #fct_nav -->', txt);
}
@@ -687,11 +673,11 @@ fct_nav (in tree any,
create procedure
fct_view_type (in vt varchar)
{
- if (vt in ('properties',
- 'classes',
- 'properties-in',
- 'text-properties',
- 'list',
+ if (vt in ('properties',
+ 'classes',
+ 'properties-in',
+ 'text-properties',
+ 'list',
'list-count',
'propval-list',
'geo',
@@ -723,8 +709,8 @@ fct_view_cmd (in tp varchar)
return 'set_text';
if ('list-count' = tp or 'geo-list' = tp)
- return 'select_value';
-
+ return 'select_value';
+
return 'cond';
}
;
@@ -743,7 +729,7 @@ fct_set_default_qry (inout tree any)
}
;
-create procedure
+create procedure
fct_print_space_1 (inout ses any, in n int)
{
for (declare i int, i := 0; i < n; i := i + 1)
@@ -751,7 +737,7 @@ fct_print_space_1 (inout ses any, in n int)
}
;
-create procedure
+create procedure
fct_pretty_sparql_1 (inout arr any, inout inx int, in len int, inout ses any, in lev int := 0)
{
declare nbsp, was_open, was_close, num_open int;
@@ -827,7 +813,7 @@ fct_pretty_sparql_1 (inout arr any, inout inx int, in len int, inout ses any, in
}
;
-create procedure
+create procedure
fct_pretty_sparql (in q varchar, in lev int := 0)
{
declare ses, arr any;
@@ -856,10 +842,10 @@ fct_web (in tree any)
declare reply, md, res, qr, qr2, txt any;
declare p_qry varchar;
declare timeout int;
-
+
timeout := connection_get ('timeout');
- if (not isinteger(timeout))
+ if (not isinteger(timeout))
timeout := atoi(timeout);
--
@@ -867,13 +853,12 @@ fct_web (in tree any)
--
if (xpath_eval('/query/*[not(name()=''view'')]', tree) is null)
- {
+ {
if (xpath_eval('/query/view[@type=''classes'']', tree) is null)
fct_set_default_qry (tree);
}
reply := fct_exec (tree, timeout);
-
p_qry := fct_query (tree, 1); -- get "plain" query text
p_qry := fct_pretty_sparql (p_qry);
@@ -897,13 +882,9 @@ fct_web (in tree any)
declare p_ses, r_ses any;
declare p_xml varchar;
- declare p_xml_tree any;
-
- p_xml_tree := xslt (registry_get ('_fct_xslt_') || 'fct_strip_loc.xsl', tree, vector());
p_ses := string_output();
- http_value (p_xml_tree, null, p_ses);
-
+ http_value (tree, null, p_ses);
p_xml := cast (p_ses as varchar);
r_ses := string_output ();
@@ -911,13 +892,6 @@ fct_web (in tree any)
fct_dbg_msg (sprintf ('reply: %s', cast (r_ses as varchar)));
- declare _addthis_key varchar;
- _addthis_key := registry_get ('fct_addthis_key');
- if (not isstring(_addthis_key)) _addthis_key := null;
- if ('1' = _addthis_key) _addthis_key := 'xa-4ce13e0065cdadc0';
-
- --dbg_printf('addthis_key: %s', _addthis_key);
-
http_value (xslt (registry_get ('_fct_xslt_') || 'fct_vsp.xsl',
reply,
vector ('sid',
@@ -930,20 +904,18 @@ fct_web (in tree any)
__min (timeout*2, atoi (registry_get ('fct_timeout_max'))),
'query',
tree,
- 's_term',
+ 's_term',
fct_s_term (),
- 'p_term',
+ 'p_term',
fct_p_term (),
- 'o_term',
+ 'o_term',
fct_o_term (),
- 't_term',
+ 't_term',
fct_t_term (),
'p_qry',
p_qry,
'p_xml',
p_xml,
- 'addthis_key',
- _addthis_key,
'tree',
tree
)),
@@ -984,9 +956,9 @@ fct_set_text_property (in tree any, in sid int, in iri varchar)
declare new_tree, txt any;
txt := cast (xpath_eval ('//text', tree) as varchar);
- new_tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_text.xsl',
+ new_tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_text.xsl',
tree, vector ('text', txt, 'prop', iri));
- new_tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
+ new_tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
new_tree, vector ('pos', 0, 'type', 'text-d', 'limit', 20, 'op', 'view'));
update fct_state set fct_state = new_tree where fct_sid = sid;
@@ -1004,19 +976,18 @@ fct_set_focus (in tree any, in sid int, in pos int)
vector ('pos', pos - 1, 'op', 'view', 'type', 'list', 'limit', 20, 'offset', 0));
update fct_state set fct_state = tree where fct_sid = sid;
commit work;
-
fct_web (tree);
}
;
-create procedure
+create procedure
fct_drop (in tree any, in sid int, in pos int)
{
- tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
+ tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
tree, vector ('pos', pos - 1, 'op', 'close'));
if (xpath_eval ('//view', tree) is null)
- tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
+ tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
tree, vector ('pos', 0, 'op', 'view', 'type', 'list', 'limit', 20, 'offset', 0));
update fct_state set fct_state = tree where fct_sid = sid;
@@ -1044,7 +1015,7 @@ fct_drop_text (in tree any, in sid int)
{
declare txt varchar;
txt := xpath_eval ('//text', tree);
-
+
tree := xslt (registry_get ('_fct_xslt_') || 'fct_drop_text.xsl', tree, vector ('text', txt, 'prop', 'none'));
update fct_state set fct_state = tree where fct_sid = sid;
@@ -1059,7 +1030,7 @@ fct_drop_text_prop (in tree any, in sid int)
{
declare txt varchar;
txt := xpath_eval ('//text', tree);
-
+
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_text.xsl', tree, vector ('text', txt, 'prop', 'none'));
update fct_state set fct_state = tree where fct_sid = sid;
@@ -1070,11 +1041,11 @@ fct_drop_text_prop (in tree any, in sid int)
;
create procedure
-fct_set_view (in tree any,
- in sid int,
- in tp varchar,
- in lim int,
- in offs int,
+fct_set_view (in tree any,
+ in sid int,
+ in tp varchar,
+ in lim int,
+ in offs int,
in loc_prop varchar := null)
{
@@ -1108,92 +1079,52 @@ fct_set_view (in tree any,
;
create procedure
-fct_next (in tree any, in sid int, in offset varchar, in limit varchar)
+fct_next (in tree any, in sid int)
{
declare tp varchar;
declare lim, offs int;
- tp := cast (xpath_eval ('//view/@type', tree) as varchar);
+ tp := cast (xpath_eval ('//view/@type', tree) as varchar);
+ lim := atoi (cast (xpath_eval ('//view/@limit', tree) as varchar));
+ offs := atoi (cast (xpath_eval ('//view/@offset',tree) as varchar));
- if (isstring (limit) and limit <> '')
- lim := atoi (limit);
- else
- lim := atoi (cast (xpath_eval ('//view/@limit', tree) as varchar));
-
- if (isstring (offset) and offset <> '')
- offs := atoi (offset);
- else
- offs := atoi (cast (xpath_eval ('//view/@offset',tree) as varchar));
-
- fct_set_view (tree, sid, tp, lim, offs + lim);
+ fct_set_view (tree, sid, tp, lim, offs + 20);
}
;
create procedure
-fct_prev (in tree any, in sid int, in offset varchar, in limit varchar)
+fct_prev (in tree any, in sid int)
{
declare tp varchar;
declare lim, offs int;
- tp := cast (xpath_eval ('//view/@type', tree) as varchar);
-
- if (isstring (limit) and limit <> '')
- lim := atoi (limit);
- else
- lim := atoi (cast (xpath_eval ('//view/@limit', tree) as varchar));
-
- if (isstring (offset) and offset <> '')
- offs := atoi (offset);
- else {
- offs := atoi (cast (xpath_eval ('//view/@offset',tree) as varchar));
- offs := offs - lim;
- if (offs < 0) offs := 0;
- }
- fct_set_view (tree, sid, tp, lim, offs);
-}
-;
-
-create procedure
-fct_go_to (in tree any, in sid int, in _offs varchar, in _lim varchar)
-{
- declare tp varchar;
- declare offs, lim int;
-
- if (isstring (_offs) and _offs <> '')
- offs := atoi (_offs);
-
- if (isstring (_lim) and _lim <> '')
- lim := atoi (_lim);
- else
- lim := atoi (cast (xpath_eval ('//view/@limit', tree) as varchar));
-
- if (offs is null) offs := 0;
-
- fct_dbg_msg (sprintf ('fct_go_to offs: %d, lim: %d', offs, lim));
+ tp := cast (xpath_eval ('//view/@type', tree) as varchar);
+ lim := atoi (cast (xpath_eval ('//view/@limit', tree) as varchar));
+ offs := atoi (cast (xpath_eval ('//view/@offset',tree) as varchar));
- tp := cast (xpath_eval ('//view/@type', tree) as varchar);
+ offs := offs - 20;
+ if (offs < 0) offs := 0;
fct_set_view (tree, sid, tp, lim, offs);
}
;
create procedure
-fct_open_property (in tree any,
- in sid int,
- in iri varchar,
- in name varchar,
+fct_open_property (in tree any,
+ in sid int,
+ in iri varchar,
+ in name varchar,
in exclude varchar := null)
{
declare pos int;
pos := fct_view_pos (tree);
-
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
tree,
vector ('pos', pos,
'op', 'prop',
'name', name,
'iri', iri,
- 'type', 'list',
+ 'type', 'list',
'limit', 20,
'offset', 0,
'exclude', exclude));
@@ -1201,12 +1132,12 @@ fct_open_property (in tree any,
if (xpath_eval ('//view', tree) is null)
{
- tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl', tree,
- vector ('pos', pos,
- 'op', 'view',
- 'type', 'properties',
- 'limit', 20,
- 'offset', 0));
+ tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl', tree,
+ vector ('pos', pos,
+ 'op', 'view',
+ 'type', 'properties',
+ 'limit', 20,
+ 'offset', 0));
}
update fct_state
@@ -1226,16 +1157,18 @@ fct_set_class (in tree any,
{
declare pos int;
- fct_dbg_msg (sprintf ('fct_set_class: sid: %d, iri: %s, pos: %d', sid, iri, pos));
+ pos := fct_view_pos (tree);
+
+ fct_dbg_msg(sprintf('fct_set_class: sid: %d, iri: %s', sid, iri));
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
tree,
- vector ('pos', pos,
- 'op', 'class',
- 'iri', iri,
- 'type', 'list',
- 'limit', 20,
- 'offset', 0,
+ vector ('pos' , pos,
+ 'op' , 'class',
+ 'iri' , iri,
+ 'type' , 'list',
+ 'limit' , 20,
+ 'offset', 0,
'exclude', exclude));
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
@@ -1265,11 +1198,11 @@ http ('
cnt := 0;
no_qry := http_param ('no_qry');
- for (select fsq_id,
- fsq_title,
- fsq_expln
- from fct_stored_qry
- where fsq_featured is not null
+ for (select fsq_id,
+ fsq_title,
+ fsq_expln
+ from fct_stored_qry
+ where fsq_featured is not null
order by fsq_featured desc) do
{
cnt := cnt + 1;
@@ -1280,7 +1213,7 @@ http ('
</tr>
');
}
- if (0 = cnt)
+ if (0 = cnt)
{
http ('
<tr><td>There are currently no featured views.</td></td>
@@ -1349,8 +1282,8 @@ function get_and_encode_query (q_elm)
ctr := 0;
- for select res_content, res_name, res_full_path
- from WS.WS.SYS_DAV_RES
+ for select res_content, res_name, res_full_path
+ from WS.WS.SYS_DAV_RES
where RES_FULL_PATH like demo_dav_path || '%.isparql' do
{
ctr := ctr + 1;
@@ -1363,14 +1296,14 @@ function get_and_encode_query (q_elm)
http('</table>');
- if (0 = ctr)
+ if (0 = ctr)
{
http ('<p class="empty_indicator">There are currently no saved SPARQL queries.</p>');
}
http('
</div> <!-- .fm_sect -->
<a href="/fct/facet.vsp?cmd=refresh&sid='); http_value ( case when no_qry then 0 else sid end ); http ('">Go Back</a>
- </div>
+ </div>
</div> <!-- featured -->
');
}
@@ -1406,15 +1339,15 @@ http ('
;
create procedure
-fct_save (in tree xmltype,
- in sid int,
- in title varchar,
+fct_save (in tree xmltype,
+ in sid int,
+ in title varchar,
in _desc varchar)
{
declare _fsq_id int;
_fsq_id := sequence_next ('fsq_seq');
-
+
insert into fct_stored_qry (fsq_id, fsq_title, fsq_expln, fsq_state)
values (_fsq_id, title, _desc, tree);
@@ -1433,17 +1366,17 @@ fct_save (in tree xmltype,
}
;
-create procedure
+create procedure
fct_load (in from_stored int)
{
declare sid int;
-
+
sid := sequence_next ('fct_seq');
declare tree any;
whenever not found goto no_ses;
- select fsq_state
+ select fsq_state
into tree
from fct_stored_qry
where fsq_id = from_stored;
@@ -1459,8 +1392,8 @@ fct_load (in from_stored int)
}
;
-create procedure
-fct_ses_from_xml (in xml_d varchar)
+create procedure
+fct_ses_from_xml (in xml_d varchar)
{
declare tree any;
declare sid int;
@@ -1473,11 +1406,11 @@ fct_ses_from_xml (in xml_d varchar)
values (sid, tree);
return sid;
-}
+}
;
-create procedure
-fct_create_ses ()
+create procedure
+fct_create_ses ()
{
declare sid int;
declare new_tree any;
@@ -1493,7 +1426,7 @@ fct_create_ses ()
}
;
-create procedure
+create procedure
fct_new ()
{
declare sid int;
@@ -1503,8 +1436,8 @@ fct_new ()
if (0 = sid)
{
- no_ses:
- r_v := fct_create_ses ();
+ no_ses:
+ r_v := fct_create_ses ();
sid := r_v[0];
}
else
@@ -1546,8 +1479,8 @@ fct_new ()
|
<a href="facet_doc.html">About</a>
<!--span id="opensearch_container" style="display:none"> |
- <a href=""
- id="opensearch_link"
+ <a href=""
+ id="opensearch_link"
title="Install OpenSearch Plugin">Search from browser</a></span-->
</div>
</div> <!-- #TAB_ROW -->
@@ -1556,29 +1489,17 @@ fct_new ()
<div id="TAB_PAGE_TXT" class="tab_page" style="display: none">
<h2>Precision Search & Find</h2>
<form method="post"
- action="/fct/facet.vsp?cmd=text&sid=');
- http_value ( sid );
+ action="/fct/facet.vsp?cmd=text&sid=');
+ http_value ( sid );
http ('" >
<div id="new_srch">
<label class="left_txt"
for="new_search_txt">Search Text</label>
- <input id= "new_search_txt"
- size="60"
- type="text"
- name="q"/>');
-if (isstring (http_param ('dbg')))
- {
- http('<input type="hidden" name="dbg" value="');
- http_value (http_param('dbg'));
- http ('">');
- }
-if (isstring (http_param ('dbg_out')))
- {
- http('<input type="hidden" name="dbg_out" value="');
- http_value (http_param('dbg_out'));
- http ('">');
- }
- http('<input type=submit value="Search"><br/>
+ <input id= "new_search_txt"
+ size="60"
+ type="text"
+ name="q"/>
+ <input type=submit value="Search"><br/>
</div>
</form>
</div> <!-- #TAB_PAGE_TXT -->
@@ -1593,9 +1514,9 @@ if (isstring (http_param ('dbg_out')))
<label class="left_txt"
for= "new_lbl_txt">Label</label>
- <input id= "new_lbl_txt"
- size="60"
- type="text"
+ <input id= "new_lbl_txt"
+ size="60"
+ type="text"
autocomplete="off"/>
<button id="new_lbl_btn">Describe</button><br/>
@@ -1618,9 +1539,9 @@ if (isstring (http_param ('dbg_out')))
<label class="left_txt"
for= "new_uri_txt">URI</label>
- <input id= "new_uri_txt"
- size="60"
- type="text"
+ <input id= "new_uri_txt"
+ size="60"
+ type="text"
autocomplete="off"/>
<button id="new_uri_btn">Describe</button><br/>
</div>
@@ -1645,6 +1566,7 @@ fct_set_inf (in tree any, in sid int)
if (view3 = 0) view3 := '';
tlogy := http_param ('tlogy');
+
if (0 = sas or 0 = inf or 0 = tlogy)
{
declare selected_inf, selected_sas, selected_view3, sel_c_term, sel_s_term varchar;
@@ -1667,17 +1589,17 @@ fct_set_inf (in tree any, in sid int)
<select name="inference">
<option value="">none</option>
'); for select RS_NAME from SYS_RDF_SCHEMA do { http ('
- <option value="'); http_value ( RS_NAME ); http ('"
+ <option value="'); http_value ( RS_NAME ); http ('"
'); http_value ( case when selected_inf = RS_NAME then 'selected' else '' end ); http ('>
'); http_value ( RS_NAME ); http ('
</option>
'); } http ('
</select>
<br>
- <input type="checkbox"
- name="same-as"
- value="yes"
- id="same-as" '); http_value ( case when selected_sas = 'yes' then 'checked="true"' end ); http ('>
+ <input type="checkbox"
+ name="same-as"
+ value="yes"
+ id="same-as" '); http_value ( case when selected_sas = 'yes' then 'checked="true"' end ); http ('>
<label class="rt_ckb" for="same-as">Same As</label><br>
</div>
<div class="fm_sect">
@@ -1687,11 +1609,11 @@ fct_set_inf (in tree any, in sid int)
<option value="eav" '); http_value ( case when sel_s_term = 'e' then 'selected="true"' else '' end ); http ('>Entity-Attribute-Value</option>
<option value="spo" '); http_value ( case when sel_s_term = 's' then 'selected="true"' else '' end ); http ('>Subject-Predicate-Object</option>
</select><br/>
-<!--
- <input type="checkbox"
- name="view3"
- value="yes"
- id="view3" '); http_value ( case when selected_view3 = 'yes' then 'checked="true"' end ); http ('>
+<!--
+ <input type="checkbox"
+ name="view3"
+ value="yes"
+ id="view3" '); http_value ( case when selected_view3 = 'yes' then 'checked="true"' end ); http ('>
<label class="rt_ckb" for="view3">Show Values, Types, Properties simultaneously</label><br> -->
</div>
<!-- <div class="fm_sect">
@@ -1722,11 +1644,11 @@ fct_set_inf (in tree any, in sid int)
s_term := case when 'eav' = tlogy then 'e' else 's' end;
tree := XMLUpdate (tree,
- '/query/@inference', inf,
- '/query/@same-as', sas,
- '/query/@view3', view3,
- '/query/@s-term', s_term,
- '/query/@c-term', c_term);
+ '/query/@inference', inf,
+ '/query/@same-as', sas,
+ '/query/@view3', view3,
+ '/query/@s-term', s_term,
+ '/query/@c-term', c_term);
connection_set ('c_term', c_term);
connection_set ('s_term', s_term);
@@ -1805,10 +1727,10 @@ fct_select_value (in tree any,
{
declare pos int;
--- fct_dbg_msg (sprintf ('fct_select_value: val: %s, lang: %s, dtp: %s, op: %s',
--- cast (val as varchar),
--- cast (lang as varchar),
--- cast (dtp as varchar),
+-- fct_dbg_msg (sprintf ('fct_select_value: val: %s, lang: %s, dtp: %s, op: %s',
+-- cast (val as varchar),
+-- cast (lang as varchar),
+-- cast (dtp as varchar),
-- cast (cond_t as varchar)));
pos := fct_view_pos (tree);
@@ -1817,11 +1739,11 @@ fct_select_value (in tree any,
tree,
vector ('pos', pos, 'op', 'cond', 'val', val, 'lang', lang, 'datatype', dtp, 'cond_t', cond_t));
--- if (cond_t = 'eq')
+-- if (cond_t = 'eq')
-- {
- tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
- tree,
- vector ('pos', 0, 'op', 'view', 'type', 'list', 'limit', 20, 'offset', 0));
+ tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
+ tree,
+ vector ('pos', 0, 'op', 'view', 'type', 'list', 'limit', 20, 'offset', 0));
-- }
update fct_state set fct_state = tree where fct_sid = sid;
@@ -1831,14 +1753,13 @@ fct_select_value (in tree any,
}
;
-create procedure
-fct_validate_xsd_float (in str varchar)
-{
+create procedure
+fct_validate_xsd_float (in str varchar) {
declare ret varchar;
ret := regexp_match ('^[-+]?([0-9]+(\.[0-9]*)?|\.[0-9]+)([eE][-+]?[0-9]+)$', str); -- simple case
- if (ret is not null)
+ if (ret is not null)
{
return ret;
}
@@ -1848,20 +1769,19 @@ fct_validate_xsd_float (in str varchar)
}
;
-create procedure
-fct_validate_xsd_decimal (in str varchar)
-{
+create procedure
+fct_validate_xsd_decimal (in str varchar) {
return regexp_match ('^"([^\\"]|\\.|[-+]?([0-9]+(\.[0-9]*)?|\.[0-9]+)?)"\\^\\^xsd\\:decimal',str);
}
;
create procedure
-fct_validate_xsd_int (in str varchar)
+fct_validate_xsd_int (in str varchar)
{
declare ret varchar;
ret := regexp_match ('^[-+]?[0-9]+$', str); -- simple integers
- if (ret is not null)
+ if (ret is not null)
{
return ret;
}
@@ -1871,15 +1791,14 @@ fct_validate_xsd_int (in str varchar)
}
;
-create procedure
-fct_validate_xsd_date (in str varchar)
-{
+create procedure
+fct_validate_xsd_date (in str varchar) {
return regexp_match ('^"-?[0-9][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9](Z|[-+]?[0-2][0-9]\\:[0-5][0-9])?"\\^\\^xsd\\:date$', str);
}
;
create procedure
-fct_validate_xsd_datetime (in str varchar)
+fct_validate_xsd_datetime (in str varchar)
{
declare retval varchar;
@@ -1888,7 +1807,7 @@ fct_validate_xsd_datetime (in str varchar)
}
;
-create procedure
+create procedure
fct_validate_xsd_str (in str varchar) {
declare retval varchar;
@@ -1901,12 +1820,12 @@ fct_validate_xsd_str (in str varchar) {
}
;
-create procedure
-fct_validate_cond_input (in str varchar)
+create procedure
+fct_validate_cond_input (in str varchar)
{
declare retval varchar;
- retval := coalesce (fct_validate_xsd_int(str),
+ retval := coalesce (fct_validate_xsd_int(str),
fct_validate_xsd_float (str),
fct_validate_xsd_decimal(str),
fct_validate_xsd_datetime(str),
@@ -1917,13 +1836,13 @@ fct_validate_cond_input (in str varchar)
}
;
-create procedure
+create procedure
fct_validate_xsd_float (in str varchar) {
declare ret varchar;
ret := regexp_match ('^[-+]?([0-9]+(\.[0-9]*)?|\.[0-9]+)([eE][-+]?[0-9]+)$', str); -- simple case
- if (ret is not null)
+ if (ret is not null)
{
return ret;
}
@@ -1933,19 +1852,19 @@ fct_validate_xsd_float (in str varchar) {
}
;
-create procedure
-fct_validate_xsd_decimal (in str varchar) {
+create procedure
+fct_validate_xsd_decimal (in str varchar) {
return regexp_match ('^"([^\\"]|\\.|[-+]?([0-9]+(\.[0-9]*)?|\.[0-9]+)?)"\\^\\^xsd\\:decimal',str);
}
;
create procedure
-fct_validate_xsd_int (in str varchar)
+fct_validate_xsd_int (in str varchar)
{
declare ret varchar;
ret := regexp_match ('^[-+]?[0-9]+$', str); -- simple integers
- if (ret is not null)
+ if (ret is not null)
{
return ret;
}
@@ -1955,14 +1874,14 @@ fct_validate_xsd_int (in str varchar)
}
;
-create procedure
+create procedure
fct_validate_xsd_date (in str varchar) {
return regexp_match ('^"-?[0-9][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9](Z|[-+]?[0-2][0-9]\\:[0-5][0-9])?"\\^\\^xsd\\:date$', str);
}
;
create procedure
-fct_validate_xsd_datetime (in str varchar)
+fct_validate_xsd_datetime (in str varchar)
{
declare retval varchar;
@@ -1971,7 +1890,7 @@ fct_validate_xsd_datetime (in str varchar)
}
;
-create procedure
+create procedure
fct_validate_xsd_str (in str varchar) {
declare retval varchar;
@@ -1984,12 +1903,12 @@ fct_validate_xsd_str (in str varchar) {
}
;
-create procedure
-fct_validate_cond_input (in str varchar)
+create procedure
+fct_validate_cond_input (in str varchar)
{
declare retval varchar;
- retval := coalesce (fct_validate_xsd_int(str),
+ retval := coalesce (fct_validate_xsd_int(str),
fct_validate_xsd_float (str),
fct_validate_xsd_decimal(str),
fct_validate_xsd_datetime(str),
@@ -2000,12 +1919,12 @@ fct_validate_cond_input (in str varchar)
}
;
-create procedure
-fct_set_cond_range (in tree any,
- in sid int,
- in lang varchar,
- in dtp varchar,
- in lo varchar,
+create procedure
+fct_set_cond_range (in tree any,
+ in sid int,
+ in lang varchar,
+ in dtp varchar,
+ in lo varchar,
in hi varchar,
in neg varchar)
{
@@ -2018,7 +1937,7 @@ fct_set_cond_range (in tree any,
-- fct_dbg_msg (sprintf ('fct_set_cond_range: %s, %s', lo, hi));
- if (lo is null and hi is null)
+ if (lo is null and hi is null)
{
fct_web (tree);
return;
@@ -2027,12 +1946,12 @@ fct_set_cond_range (in tree any,
{
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
tree,
- vector ('pos', pos,
- 'op', 'cond-range',
- 'hi', hi,
- 'lo', lo,
- 'neg', neg,
- 'lang', lang,
+ vector ('pos', pos,
+ 'op', 'cond-range',
+ 'hi', hi,
+ 'lo', lo,
+ 'neg', neg,
+ 'lang', lang,
'datatype', dtp));
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
@@ -2042,17 +1961,17 @@ fct_set_cond_range (in tree any,
update fct_state set fct_state = tree where fct_sid = sid;
commit work;
- }
+ }
fct_web (tree);
}
;
-create procedure
-fct_set_cond (in tree any,
- in sid int,
+create procedure
+fct_set_cond (in tree any,
+ in sid int,
in cond_t varchar,
- in lang varchar,
+ in lang varchar,
in dtp varchar,
in val varchar,
in neg varchar)
@@ -2063,12 +1982,12 @@ fct_set_cond (in tree any,
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
tree,
- vector ('pos', pos,
- 'op','cond',
- 'cond_t', cond_t,
- 'neg', neg,
+ vector ('pos', pos,
+ 'op','cond',
+ 'cond_t', cond_t,
+ 'neg', neg,
'val', val,
- 'lang', lang,
+ 'lang', lang,
'datatype', dtp));
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
@@ -2083,7 +2002,7 @@ fct_set_cond (in tree any,
}
;
-create procedure
+create procedure
fct_set_cond_in (in tree any,
in sid int,
in neg varchar,
@@ -2104,10 +2023,10 @@ fct_set_cond_in (in tree any,
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
tree,
- vector ('pos', pos,
- 'op','cond',
- 'cond_t', 'in',
- 'neg', neg,
+ vector ('pos', pos,
+ 'op','cond',
+ 'cond_t', 'in',
+ 'neg', neg,
'parms', parm_tree));
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
@@ -2119,45 +2038,37 @@ fct_set_cond_in (in tree any,
commit work;
fct_web (tree);
-}
+ }
;
create procedure
-fct_set_cond_near (in tree any,
+fct_set_cond_near (in tree any,
in sid int,
in lat varchar,
in lon varchar,
in dist varchar,
- in acquire varchar,
- in prop varchar)
+ in prop varchar)
{
- fct_dbg_msg (sprintf ('fct_set_cond_near: lat:%s, lon:%s, d:%s, acquire:%s',
- cast (lat as varchar),
- cast (lon as varchar),
- dist,
- cast (acquire as varchar)));
+ fct_dbg_msg (sprintf ('fct_set_cond_near: lat:%s, lon:%s, d:%s', lat, lon, dist));
declare pos int;
pos := fct_view_pos (tree);
- declare acq varchar;
-
tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
tree,
vector ('pos', pos,
'op','cond',
- 'cond_t', 'near',
+ 'cond_t', 'near',
'lat', lat,
'lon', lon,
- 'loc_acq', acquire,
'd', dist));
- tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
- tree,
- vector ('pos', 0,
- 'op', 'view',
- 'type', 'geo',
- 'limit', 20,
+ tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
+ tree,
+ vector ('pos', 0,
+ 'op', 'view',
+ 'type', 'geo',
+ 'limit', 20,
'offset', 0,
'location-prop', prop));
@@ -2169,48 +2080,26 @@ fct_set_cond_near (in tree any,
}
;
-create procedure
+create procedure
fct_set_loc (in tree any,
- in sid int,
- in cno int)
+ in sid int)
{
declare lon, lat float;
declare acc int;
-
+
lon := http_param ('lon');
lat := http_param ('lat');
+ acc := http_param ('acc');
- fct_dbg_msg (sprintf ('fct_set_loc: cno:%d, lon:%s, lat:%s', cno, lon, lat));
-
- if (0 = lon or 0 = lat) {
+ if (0 = lon or 0 = lat or 0 = acc) {
http_request_status ('HTTP/1.1 400 Bad request');
- http('FCT002: Missing location data\n');
+ http('FCT002: Invalid location data\n');
return;
}
-
- tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_loc.xsl',
- tree,
- vector ('cno', cno,
- 'lat', lat,
- 'lon', lon));
-
- tree := xslt (registry_get ('_fct_xslt_') || 'fct_set_view.xsl',
- tree,
- vector ('pos', 0,
- 'op', 'view',
- 'type', 'geo',
- 'limit', 20,
- 'offset', 0));
-
- update fct_state set fct_state = tree where fct_sid = sid;
-
- commit work;
-
- fct_web (tree);
}
;
-create procedure
+create procedure
fct_gen_opensearch_link ()
{
declare uriqa_str varchar;
@@ -2253,8 +2142,8 @@ fct_vsp ()
sid := http_param ('sid');
- if (0 <> sid) {
- sid := atoi (sid);
+ if (0 <> sid) {
+ sid := atoi (sid);
}
else {
fct_dbg_msg ('fct_vsp: looking for xml');
@@ -2279,25 +2168,21 @@ fct_vsp ()
whenever not found goto no_ses;
- fct_dbg_msg ('fct_vsp: select on sid');
-
select fct_state into tree from fct_state where fct_sid = sid;
- fct_dbg_msg ('fct_vsp: got ses');
goto exec;
- no_ses:
- fct_dbg_msg ('fct_vsp: no ses found');
+ no_ses:
declare r_v any;
- if (s_for is not null)
+ if (s_for is not null)
{
r_v := fct_create_ses();
sid := r_v[0];
tree := r_v[1];
- cmd := 'text';
+ cmd := 'text';
}
- else if ('new_with_class' = cmd)
+ else if ('new_with_class' = cmd)
{
r_v := fct_create_ses();
sid := r_v[0];
@@ -2307,7 +2192,7 @@ fct_vsp ()
else
goto do_new_ses;
-exec:;
+exec:;
declare s_term varchar;
connection_set ('sid', sid);
@@ -2322,14 +2207,13 @@ exec:;
connection_set ('c_term', c_term);
if (registry_get ('fct_log_enable') = 1)
- insert into fct_log (fl_sid, fl_cli_ip, fl_where, fl_state, fl_cmd)
+ insert into fct_log (fl_sid, fl_cli_ip, fl_where, fl_state, fl_cmd)
values (sid, http_client_ip(), 'DISPATCH', tree, cmd);
-
commit work;
start_time := msec_time ();
- fct_dbg_msg (sprintf ('fct_vsp: cmd: %s, sid: %d', cmd, sid));
+ fct_dbg_msg (sprintf ('fct_vsp: cmd: %s', cmd));
if ('text' = cmd)
{
@@ -2351,11 +2235,9 @@ exec:;
atoi (http_param ('offset')),
http_param ('location-prop'));
else if ('next' = cmd)
- fct_next (tree, sid, http_param ('offset'), http_param ('limit'));
+ fct_next (tree, sid);
else if ('prev' = cmd)
- fct_prev (tree, sid, http_param ('offset'), http_param ('limit'));
- else if ('go_to' = cmd)
- fct_go_to (tree, sid, http_param ('offset'), http_param ('limit'));
+ fct_prev (tree, sid);
else if ('set_text_property' = cmd)
fct_set_text_property (tree, sid, http_param ('iri'));
else if ('open_property' = cmd)
@@ -2366,7 +2248,7 @@ exec:;
fct_drop (tree, sid, atoi (http_param ('n')));
else if ('drop_cond' = cmd)
fct_drop_cond (tree, sid, atoi (http_param ('cno')));
- else if ('drop_text_prop' = cmd)
+ else if ('drop_text_prop' = cmd)
fct_drop_text_prop (tree, sid);
else if ('drop_text' = cmd)
fct_drop_text (tree, sid);
@@ -2392,29 +2274,29 @@ exec:;
http_param ('lang'),
http_param ('datatype'),
http_param ('op'));
- fct_dbg_msg (sprintf ('select_value: iri=%s, val=%s',
- cast (http_param('iri') as varchar),
+ fct_dbg_msg (sprintf ('select_value: iri=%s, val=%s',
+ cast (http_param('iri') as varchar),
cast (http_param('val') as varchar)));
}
else if ('cond' = cmd) {
declare cond_t varchar;
cond_t := http_param ('cond_t');
- if ('range' = cond_t) {
- fct_set_cond_range (tree,
- sid,
- http_param('lang'),
- http_param('datatype'),
+ if ('range' = cond_t) {
+ fct_set_cond_range (tree,
+ sid,
+ http_param('lang'),
+ http_param('datatype'),
http_param('lo'),
http_param('hi'),
'');
fct_dbg_msg (sprintf ('range: %s-%s', http_param('lo'), http_param('hi')));
} else if ('neg_range' = cond_t) {
- fct_set_cond_range (tree,
- sid,
- http_param('lang'),
- http_param('datatype'),
- http_param('lo'),
+ fct_set_cond_range (tree,
+ sid,
+ http_param('lang'),
+ http_param('datatype'),
+ http_param('lo'),
http_param('hi'),
'on');
fct_dbg_msg (sprintf ('neg-range: %s-%s', http_param('lo'), http_param('hi')));
@@ -2424,38 +2306,27 @@ exec:;
http_param('neg'),
http_param('cond_parms'));
} else if ('near' = cond_t) {
- declare i_lat, i_lon, i_loc_trig_sel varchar;
-
- i_lat := http_param ('lat');
- i_lon := http_param ('lon');
- i_loc_trig_sel := http_param ('loc_trig_sel');
-
- if (i_lat = 0) i_lat := null;
- if (i_lon = 0) i_lon := null;
- if (i_loc_trig_sel = 0) i_loc_trig_sel := null;
-
- fct_set_cond_near (tree,
- sid,
- i_lat,
- i_lon,
+ fct_set_cond_near (tree,
+ sid,
+ http_param ('lat'),
+ http_param ('lon'),
http_param ('dist'),
- i_loc_trig_sel,
http_param ('location-prop'));
} else {
declare iri,val any;
- fct_set_cond (tree,
- sid,
+ fct_set_cond (tree,
+ sid,
cond_t,
- http_param('lang'),
- http_param('datatype'),
+ http_param('lang'),
+ http_param('datatype'),
http_param('val'),
'');
--- fct_dbg_msg (sprintf ('set_cond: val=%s, cond_t=%s',
--- cast (http_param('val') as varchar), cast (http_param('cond_t') as varchar)));
+-- fct_dbg_msg (sprintf ('set_cond: val=%s, cond_t=%s',
+-- cast (http_param('val') as varchar), cast (http_param('cond_t') as varchar)));
}
}
else if ('save' = cmd)
- fct_save (tree,
+ fct_save (tree,
sid,
http_param ('title'),
http_param ('desc'));
@@ -2464,7 +2335,7 @@ exec:;
else if ('featured' = cmd)
fct_featured (tree, sid);
else if ('set_loc' = cmd)
- fct_set_loc (tree, sid, cast (http_param('cno') as int));
+ fct_set_loc (tree, sid);
else
{
http_request_status ('HTTP/1.1 400 Bad request');
@@ -2476,14 +2347,14 @@ exec:;
select fct_state into _state from fct_state where fct_sid = sid;
if (registry_get ('fct_log_enable') = 1)
- insert into fct_log (fl_sid, fl_cli_ip, fl_where, fl_state, fl_cmd, fl_msec)
+ insert into fct_log (fl_sid, fl_cli_ip, fl_where, fl_state, fl_cmd, fl_msec)
values (sid, http_client_ip(), 'RETURN', _state, cmd, msec_time () - start_time);
commit work;
return;
- do_new_ses:
+ do_new_ses:
http (sprintf ('<div class="ses_info">Session id %d lost. New search started</div>', sid));
fct_new ();
}
@@ -2491,12 +2362,12 @@ exec:;
create procedure fct_virt_info ()
{
- http ('<a href="http://www.openlinksw.com/virtuoso/">OpenLink Virtuoso</a> version ');
- http (sys_stat ('st_dbms_ver'));
+ http ('<a href="http://www.openlinksw.com/virtuoso/">OpenLink Virtuoso</a> version ');
+ http (sys_stat ('st_dbms_ver'));
http (', on ');
- http (sys_stat ('st_build_opsys_id')); http (sprintf (' (%s), ', host_id ()));
+ http (sys_stat ('st_build_opsys_id')); http (sprintf (' (%s), ', host_id ()));
http (case when sys_stat ('cl_run_local_only') = 1 then 'Standard Edition' else 'Cluster Edition' end);
- http (case when sys_stat ('cl_run_local_only') = 0 then sprintf ('(%d server processes)', sys_stat ('cl_n_hosts')) else '' end);
+ http (case when sys_stat ('cl_run_local_only') = 0 then sprintf ('(%d server processes)', sys_stat ('cl_n_hosts')) else '' end);
}
;
@@ -2513,28 +2384,10 @@ create procedure fct_page_head ()
<div id="homelink"></div>
</div> <!-- hd_l -->
<div id="hd_r">
- <div class="addthis_toolbox addthis_default_style">
- <a class="addthis_button_compact"></a>
- <a class="addthis_button_preferred_1"></a>
- <a class="addthis_button_preferred_2"></a>
- <a class="addthis_button_preferred_3"></a>
- <a class="addthis_button_preferred_4"></a>
- <a class="addthis_button_google_plusone"></a>
- </div>
+ <a href="http://data.openlinksw.com/about/html/http://data.openlinksw.com/oplweb/product_family/virtuoso"
+ title="OpenLink Virtuoso">
+ <img class="powered_by" src="/fct/images/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/>
+ </a>
</div> <!-- hd_r -->');
}
;
-
-create procedure fct_desc_page_head ()
-{
- http ('<div id="hd_l">
- <h1 id="logo">
- <a href="/fct/facet.vsp">
- <img src="/fct/images/openlink_site_logo.png" alt="OpenLink Software"/>
- </a>
- </h1>
- <div id="homelink"></div>
- </div> <!-- hd_l -->
- <div id="hd_r"></div> <!-- hd_r -->');
-}
-;
diff --git a/binsrc/b3s/fct_drop_cond.xsl b/binsrc/b3s/fct_drop_cond.xsl
index 1962f55..fd9101c 100644
--- a/binsrc/b3s/fct_drop_cond.xsl
+++ b/binsrc/b3s/fct_drop_cond.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: fct_drop_cond.xsl,v 1.1.2.5 2012/03/05 17:38:05 source Exp $
+-- $Id: fct_drop_cond.xsl,v 1.1.2.3 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -22,29 +22,28 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
-->
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="cno"/>
<xsl:template match="class | value | value-range | cond-range | cond">
- <xsl:if test="$cno != (count (./ancestor::*[name () = 'class' or
- name () = 'value' or
- name () = 'value-range' or
+ <xsl:if test="$cno != (count (./ancestor::*[name () = 'class' or
+ name () = 'value' or
+ name () = 'value-range' or
name () = 'cond-range' or
name () = 'cond']) +
- count (./ancestor-or-self::*/preceding-sibling::*/descendant-or-self::*[name () = 'class' or
- name () = 'value' or
- name () = 'value-range' or
- name () = 'cond-range' or
+ count (./ancestor-or-self::*/preceding-sibling::*/descendant-or-self::*[name () = 'class' or
+ name () = 'value' or
+ name () = 'value-range' or
+ name () = 'cond-range' or
name () = 'cond']))">
<xsl:copy>
<xsl:apply-templates select="@* | node()"/>
</xsl:copy>
</xsl:if>
-
</xsl:template>
-
+
<xsl:template match="@* | node()">
<xsl:copy>
<xsl:apply-templates select="@* | node()"/>
diff --git a/binsrc/b3s/fct_drop_text.xsl b/binsrc/b3s/fct_drop_text.xsl
index 5b0988b..5603c97 100644
--- a/binsrc/b3s/fct_drop_text.xsl
+++ b/binsrc/b3s/fct_drop_text.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: fct_drop_text.xsl,v 1.1.2.3 2012/03/05 17:38:05 source Exp $
+-- $Id: fct_drop_text.xsl,v 1.1.2.1 2010/12/12 18:09:27 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -22,7 +22,7 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
-->
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="text">
diff --git a/binsrc/b3s/fct_inx.sql b/binsrc/b3s/fct_inx.sql
index d96fdaf..c0cdd90 100644
--- a/binsrc/b3s/fct_inx.sql
+++ b/binsrc/b3s/fct_inx.sql
@@ -1,12 +1,12 @@
--
--- $Id: fct_inx.sql,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+-- $Id: fct_inx.sql,v 1.1.2.1 2009/05/08 11:18:40 source Exp $
--
-- 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-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/fct_req.xsl b/binsrc/b3s/fct_req.xsl
index 00fe3be..44fcfc8 100644
--- a/binsrc/b3s/fct_req.xsl
+++ b/binsrc/b3s/fct_req.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: fct_req.xsl,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+-- $Id: fct_req.xsl,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/fct_resp.xsl b/binsrc/b3s/fct_resp.xsl
index a2fa0cd..bae6962 100644
--- a/binsrc/b3s/fct_resp.xsl
+++ b/binsrc/b3s/fct_resp.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: fct_resp.xsl,v 1.1.2.3 2012/03/05 12:08:07 source Exp $
+-- $Id: fct_resp.xsl,v 1.1.2.2 2009/05/01 19:39:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/fct_set_default.xsl b/binsrc/b3s/fct_set_default.xsl
index 30a33fe..d5aa92a 100644
--- a/binsrc/b3s/fct_set_default.xsl
+++ b/binsrc/b3s/fct_set_default.xsl
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- -
+ -
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
- -
- - Copyright (C) 1998-2012 OpenLink Software
- -
+ -
+ - Copyright (C) 1998-2009 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
- -
- -
+ -
+ -
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
diff --git a/binsrc/b3s/fct_set_loc.xsl b/binsrc/b3s/fct_set_loc.xsl
deleted file mode 100644
index 89c6466..0000000
--- a/binsrc/b3s/fct_set_loc.xsl
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
---
--- $Id: fct_set_loc.xsl,v 1.1.2.2 2012/03/05 17:38:05 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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
---
--->
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:param name="cno"/>
-<xsl:param name="lat"/>
-<xsl:param name="lon"/>
-
-<xsl:template match="cond[@type = 'near']">
- <xsl:choose>
- <xsl:when test="$cno != (count (./ancestor::*[name () = 'class' or
- name () = 'value' or
- name () = 'value-range' or
- name () = 'cond-range' or
- name () = 'cond']) +
- count (./ancestor-or-self::*/preceding-sibling::*/descendant-or-self::*[name () = 'class' or
- name () = 'value' or
- name () = 'value-range' or
- name () = 'cond-range' or
- name () = 'cond']))">
- <xsl:copy>
- <xsl:apply-templates select="@* | node()"/>
- </xsl:copy>
- </xsl:when>
- <xsl:otherwise>
- <cond type="near">
- <xsl:attribute name="neg">
- <xsl:value-of select="./@neg"/>
- </xsl:attribute>
- <xsl:attribute name="location-prop">
- <xsl:value-of select="./@location-prop"/>
- </xsl:attribute>
- <xsl:attribute name="d">
- <xsl:value-of select="./@d"/>
- </xsl:attribute>
- <xsl:attribute name="acquire">
- <xsl:value-of select="./@acquire"/>
- </xsl:attribute>
- <xsl:attribute name="lat"><xsl:value-of select="$lat"/></xsl:attribute>
- <xsl:attribute name="lon"><xsl:value-of select="$lon"/></xsl:attribute>
- </cond>
- <xsl:apply-templates select="@* | node()"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="@* | node()">
- <xsl:copy>
- <xsl:apply-templates select="@* | node()"/>
- </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/binsrc/b3s/fct_set_text.xsl b/binsrc/b3s/fct_set_text.xsl
index 1799d21..e246249 100644
--- a/binsrc/b3s/fct_set_text.xsl
+++ b/binsrc/b3s/fct_set_text.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: fct_set_text.xsl,v 1.1.2.3 2012/03/05 17:38:05 source Exp $
+-- $Id: fct_set_text.xsl,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -46,7 +46,7 @@
<xsl:template match="text">
</xsl:template>
-
+
<xsl:template match="@* | node()">
<xsl:copy>
<xsl:apply-templates select="@* | node()"/>
diff --git a/binsrc/b3s/fct_set_view.xsl b/binsrc/b3s/fct_set_view.xsl
index 6564ef8..fac6c75 100644
--- a/binsrc/b3s/fct_set_view.xsl
+++ b/binsrc/b3s/fct_set_view.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: fct_set_view.xsl,v 1.1.2.11 2012/03/05 17:38:05 source Exp $
+-- $Id: fct_set_view.xsl,v 1.1.2.8 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -44,105 +44,103 @@
<xsl:param name="lat"/>
<xsl:param name="lon"/>
<xsl:param name="d"/>
-<xsl:param name="loc_acq"/>
-<xsl:template match = "query | property | property-of">
+<xsl:template match = "query | property |property-of">
- <xsl:if test="not ($op = 'close') or
- not ($pos = count (./ancestor::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of']) +
- count (./preceding::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of']))">
- <xsl:copy>
- <xsl:apply-templates select="@* | node()" />
-
- <xsl:if test="$op = 'view' and
- $pos = count (./ancestor::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of']) +
- count (./preceding::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of'])">
- <xsl:element name="view">
- <xsl:attribute name="type">
- <xsl:choose>
- <xsl:when test="'list' = $type and ./text">text-d</xsl:when>
- <xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="limit"><xsl:value-of select="$limit"/></xsl:attribute>
- <xsl:attribute name="offset"><xsl:value-of select="$offset"/></xsl:attribute>
- <xsl:if test="$location-prop">
- <xsl:attribute name="location-prop">
- <xsl:value-of select="$location-prop"/>
+<xsl:if test="not ($op = 'close') or
+ not ($pos = count (./ancestor::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of']) +
+ count (./preceding::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of']))">
+ <xsl:copy>
+ <xsl:apply-templates select="@* | node()" />
+
+ <xsl:if test="$op = 'view' and
+ $pos = count (./ancestor::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of']) +
+ count (./preceding::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of'])">
+ <xsl:element name="view">
+ <xsl:attribute name="type">
+ <xsl:choose>
+ <xsl:when test="'list' = $type and ./text">text-d</xsl:when>
+ <xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:attribute name="limit"> <xsl:value-of select="$limit"/></xsl:attribute>
+ <xsl:attribute name="offset"> <xsl:value-of select="$offset"/></xsl:attribute>
+ <xsl:if test="$location-prop">
+ <xsl:attribute name="location-prop">
+ <xsl:value-of select="$location-prop"/>
</xsl:attribute>
- </xsl:if>
- </xsl:element>
- </xsl:if>
-
- <xsl:if test="$op = 'prop' and
- $pos = count (./ancestor::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of']) +
- count (./preceding::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of'])">
- <xsl:element name="{$name}">
- <xsl:attribute name="iri">
- <xsl:value-of select="$iri"/>
- </xsl:attribute>
- <xsl:if test="$exclude = 'yes'">
+ </xsl:if>
+ </xsl:element>
+ </xsl:if>
+
+ <xsl:if test="$op = 'prop' and
+ $pos = count (./ancestor::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of']) +
+ count (./preceding::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of'])">
+ <xsl:element name="{$name}">
+ <xsl:attribute name="iri">
+ <xsl:value-of select="$iri"/>
+ </xsl:attribute>
+ <xsl:if test="$exclude = 'yes'">
<xsl:attribute name="exclude">yes</xsl:attribute>
- </xsl:if>
- <xsl:element name="view">
- <xsl:attribute name="type"><xsl:value-of select="$type"/></xsl:attribute>
- <xsl:attribute name="limit"><xsl:value-of select="$limit"/></xsl:attribute>
- <xsl:attribute name="offset"><xsl:value-of select="$offset"/></xsl:attribute>
- </xsl:element>
- </xsl:element>
- </xsl:if>
-
- <xsl:choose>
-
- <xsl:when test="$op = 'class' and
- $pos = count (./ancestor::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of']) +
- count (./preceding::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of'])">
- <class iri="{$iri}">
+ </xsl:if>
+ <xsl:element name="view">
+ <xsl:attribute name="type"> <xsl:value-of select="$type"/></xsl:attribute>
+ <xsl:attribute name="limit"> <xsl:value-of select="$limit"/></xsl:attribute>
+ <xsl:attribute name="offset"> <xsl:value-of select="$offset"/></xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ </xsl:if>
+
+ <xsl:choose>
+ <xsl:when test="$op = 'class' and
+ $pos = count (./ancestor::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of']) +
+ count (./preceding::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of'])">
+ <class iri="{$iri}">
<xsl:if test="$exclude = 'yes'">
- <xsl:attribute name="exclude">yes</xsl:attribute>
+ <xsl:attribute name="exclude">yes</xsl:attribute>
</xsl:if>
- </class>
- </xsl:when>
+ </class>
+ </xsl:when>
<!-- xsl:when test="$op = 'class'">
- <class iri="{$iri}"/>
- <xsl:element name="view">
+ <class iri="{$iri}"/>
+ <xsl:element name="view">
<xsl:attribute name="type">list</xsl:attribute>
- <xsl:attribute name="limit"><xsl:value-of select="$limit"/></xsl:attribute>
- <xsl:attribute name="offset"><xsl:value-of select="$offset"/></xsl:attribute>
- </xsl:element>
+ <xsl:attribute name="limit"> <xsl:value-of select="$limit"/></xsl:attribute>
+ <xsl:attribute name="offset"> <xsl:value-of select="$offset"/></xsl:attribute>
+ </xsl:element>
</xsl:when -->
- </xsl:choose>
-
- <xsl:if test="$op = 'value' and
- $pos = count (./ancestor::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of']) +
- count (./preceding::*[name () = 'query' or
- name () = 'property' or
- name () = 'property-of'])">
- <value xml:lang="{$lang}"
- datatype="{$datatype}"
- op="{$cmp}">
+ </xsl:choose>
+
+ <xsl:if test="$op = 'value' and
+ $pos = count (./ancestor::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of']) +
+ count (./preceding::*[name () = 'query' or
+ name () = 'property' or
+ name () = 'property-of'])">
+ <value xml:lang="{$lang}"
+ datatype="{$datatype}"
+ op="{$cmp}">
<xsl:value-of select="$val"/>
- </value>
- </xsl:if>
+ </value>
+ </xsl:if>
<xsl:if test="$op = 'cond-range' and
$pos = count (./ancestor::*[name () = 'query' or
@@ -173,42 +171,37 @@
</cond>
</xsl:when>
<xsl:when test="$cond_t = 'near'">
- <cond type="{$cond_t}" neg="{$neg}" lat="{$lat}" lon="{$lon}" d="{$d}" location-prop="{$location-prop}">
- <xsl:if test="$loc_acq = 'on'">
- <xsl:attribute name="acquire">true</xsl:attribute>
- </xsl:if>
- </cond>
+ <cond type="{$cond_t}" neg="{$neg}" lat="{$lat}" lon="{$lon}" d="{$d}" location-prop="{$location-prop}"/>
</xsl:when>
<xsl:otherwise>
<cond type="{$cond_t}"
- xml:lang="{$lang}"
- datatype="{$datatype}"
- neg="{$neg}">
+ xml:lang="{$lang}"
+ datatype="{$datatype}"
+ neg="{$neg}">
<xsl:value-of select="$val"/>
</cond>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
-
- </xsl:copy>
- </xsl:if>
+ </xsl:copy>
+</xsl:if>
</xsl:template>
<xsl:template match="view">
- <xsl:choose>
- <xsl:when test="'class' = $op" >
- <xsl:copy>
- <xsl:attribute name="offset"><xsl:value-of select="$offset"/></xsl:attribute>
- <xsl:apply-templates select="@*[local-name () != 'offset'] | node()" />
- </xsl:copy>
- </xsl:when>
- <xsl:when test="'value' = $op or '' = $op" >
- <xsl:copy>
- <xsl:apply-templates select="@* | node()" />
- </xsl:copy>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="'class' = $op" >
+ <xsl:copy>
+ <xsl:attribute name="offset"><xsl:value-of select="$offset"/></xsl:attribute>
+ <xsl:apply-templates select="@*[local-name () != 'offset'] | node()" />
+ </xsl:copy>
+ </xsl:when>
+ <xsl:when test="'value' = $op or '' = $op" >
+ <xsl:copy>
+ <xsl:apply-templates select="@* | node()" />
+ </xsl:copy>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<xsl:template match="@* | node()">
diff --git a/binsrc/b3s/fct_strip_loc.xsl b/binsrc/b3s/fct_strip_loc.xsl
deleted file mode 100644
index fc80d72..0000000
--- a/binsrc/b3s/fct_strip_loc.xsl
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
---
--- $Id: fct_strip_loc.xsl,v 1.1.2.3 2012/03/05 17:38:05 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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
---
--->
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- strip "temporary" location data off any cond with auto-acquire enabled for permalinks -->
-
-<xsl:template match="cond[@acquire='true']">
- <cond type="near">
- <xsl:attribute name="neg">
- <xsl:value-of select="./@neg"/>
- </xsl:attribute>
- <xsl:attribute name="location-prop">
- <xsl:value-of select="./@location-prop"/>
- </xsl:attribute>
- <xsl:attribute name="d">
- <xsl:value-of select="./@d"/>
- </xsl:attribute>
- <xsl:attribute name="acquire">
- <xsl:value-of select="./@acquire"/>
- </xsl:attribute>
- </cond>
-</xsl:template>
-
-<xsl:template match="@* | node()">
- <xsl:copy>
- <xsl:apply-templates select="@* | node()"/>
- </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/binsrc/b3s/fct_vsp.xsl b/binsrc/b3s/fct_vsp.xsl
index cf0c34a..7fdd94b 100644
--- a/binsrc/b3s/fct_vsp.xsl
+++ b/binsrc/b3s/fct_vsp.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: fct_vsp.xsl,v 1.1.2.35 2012/03/05 17:38:05 source Exp $
+-- $Id: fct_vsp.xsl,v 1.1.2.22 2011/10/28 16:09:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -22,18 +22,13 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
-->
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:addthis="http://www.addthis.com/help/api-spec">
+<xsl:stylesheet version ="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="html" encoding="ISO-8859-1" indent="yes"/>
-<!-- Pager-related vars calculation -->
-<xsl:variable name="offs"
+<xsl:variable name="page_len" select="20"/>
+<xsl:variable name="offs"
select="if(or(/facets/view/@offset = '', not(/facets/view/@offset)), 1, /facets/view/@offset + 1)"/>
-<xsl:variable name="limit" select="/facets/view/@limit"/>
-
<xsl:variable name="rowcnt" select="count(/facets/result/row)"/>
-
<xsl:param name="s_term"/>
<xsl:param name="p_term"/>
<xsl:param name="o_term"/>
@@ -41,173 +36,188 @@
<xsl:param name="p_qry"/>
<xsl:param name="p_xml"/>
<xsl:param name="tree"/>
-<xsl:param name="addthis_key"/>
-<xsl:param name="type"/>
-<xsl:variable name="view-type">
- <xsl:choose>
- <xsl:when test="/facets/result/@type='list' and /facets/view/@position='0'">
- <xsl:text>entities-list</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="/facets/result/@type"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:variable>
+<xsl:template match = "facets">
+<div id="res">
+ <div class="btn_bar btn_bar_top"><xsl:comment><xsl:value-of select="$type"/></xsl:comment>
+ <xsl:call-template name="render-pager"/>
+ <xsl:if test="/facets/complete != 'yes'">
+ <span class="partial_res_expln">
+ <xsl:choose>
+ <xsl:when test="$rowcnt != 0">
+ The query timed out with partial result:
+ </xsl:when>
+ <xsl:otherwise>
+ The query timed out with no result:
+ </xsl:otherwise>
+ </xsl:choose>
+ </span>
+ <a class="partial_res_help" href="/fct/facet_doc.html#timeout">What's this?</a>
+ <button>
+ <xsl:attribute name="onclick">
+ javascript:fct_nav_to('/fct/facet.vsp?cmd=refresh&sid=<xsl:value-of select="$sid"/>&timeout=<xsl:value-of select="$timeout"/>')
+ </xsl:attribute>Retry with <xsl:value-of select="($timeout div 1000)"/> seconds timeout
+ </button>
+ </xsl:if>
+</div> <!-- btn_bar -->
+<xsl:if test="/facets/complete = 'yes' and /facets/processed = 0 and $rowcnt = 0">
+ <div class="empty_result">
+ Nothing found.
+ </div>
+</xsl:if>
+<xsl:choose>
+ <!--xsl:when test="$type = 'text'"><h3>Text match results</h3></xsl:when>
+ <xsl:when test="$type = 'text-d'"><h3>Text match results</h3></xsl:when>
+ <xsl:when test="$type = 'text-properties'"><h3>List of Properties With Matching Text</h3></xsl:when>
+ <xsl:when test="$type = 'classes'"><h3>Types</h3></xsl:when>
+ <xsl:when test="$type = 'properties'"><h3>Properties</h3></xsl:when>
+ <xsl:when test="$type = 'properties-in'"><h3>Referencing Properties</h3></xsl:when-->
+ <xsl:when test="$type = 'list'"><h3>Select a value or condition</h3></xsl:when>
+ <!--xsl:when test="$type = 'list-count'"><h3>Distinct values</h3></xsl:when>
+ <xsl:when test="$type = 'geo'"><h3>Location</h3></xsl:when-->
+</xsl:choose>
+<!--xsl:message terminate="no"><xsl:value-of select="$type"/></xsl:message-->
+<xsl:choose>
+ <xsl:when test="$type = 'geo' or $type = 'geo-list'">
+ <script type="text/javascript" >
+<![CDATA[
-<xsl:variable name="noresult">
- <xsl:if test="/facets/complete = 'yes' and /facets/processed = 0 and $rowcnt = 0"><xsl:value-of select="1"/></xsl:if>
-</xsl:variable>
+OAT.Preferences.imagePath = "oat/images/";
-<xsl:template match="facets">
- <div id="res">
- <div class="btn_bar btn_bar_top">
- <xsl:comment><xsl:value-of select="$type"/></xsl:comment>
- <xsl:call-template name="render-pager">
- <xsl:with-param name="pfx">pager_top</xsl:with-param>
- </xsl:call-template>
- <xsl:if test="/facets/complete != 'yes'">
- <span class="partial_res_expln">
- <xsl:choose>
- <xsl:when test="$rowcnt != 0">
- <xsl:text>The query timed out with partial result:</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>The query timed out with no result:</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </span>
- <a class="partial_res_help" href="/fct/facet_doc.html#timeout">What's this?</a>
- <button>
- <xsl:attribute name="onclick">
- javascript:fct_nav_to('/fct/facet.vsp?cmd=refresh&sid=<xsl:value-of select="$sid"/>&timeout=<xsl:value-of select="$timeout"/>')
- </xsl:attribute>Retry with <xsl:value-of select="($timeout div 1000)"/> seconds timeout
- </button>
- </xsl:if>
- </div> <!-- btn_bar -->
+function markerClickHandler (caller, msg, m) {
+ var c = m.__fct_bubble_content;
+
+ var x;
+ if (c[0].length > 0) {
+ x = OAT.Dom.create ("a");
+ x.href = '/describe/?url='+escape (c[0]);
+ if (c[1].length > 0)
+ x.innerHTML = c[1];
+ else
+ x.innerHTML = c[0];
+ }
+ else x = OAT.Dom.text(c[1]);
+ window.cMap.openWindow (m, x);
+ }
+
+function init(){
+ window.cMap = {};
+ var mapcb = function() {
+ window.cMap.init(OAT.Map.TYPE_G3);
+ window.cMap.centerAndZoom(0,0,0);
+ window.cMap.setMapType(OAT.Map.MAP_HYB);
+ OAT.MSG.attach ("*", "MAP_MARKER_CLICK", markerClickHandler);
+ var markersArr = [];
+]]>
+ <xsl:for-each select="result/row">
+ window.cMap.addMarker( <xsl:value-of select="column[3]"/>,
+ <xsl:value-of select="column[4]"/>,
+ false,
+ {image: "oat/images/markers/01.png",
+ imageSize: [18,41],
+ custData: {__fct_bubble_content: ["<xsl:value-of select="column[1]"/>",
+ "<xsl:value-of select='translate (normalize-space (column[2]), '"', '')'/>"]}});
+ markersArr.push([<xsl:value-of select="column[3]"/>,<xsl:value-of select="column[4]"/>]);
+ </xsl:for-each>
+<![CDATA[
+ window.cMap.optimalPosition(markersArr);
+ window.cMap.showMarkers(false);
+ return;
+ }
+ window.YMAPPID = "";
+ var providerType = OAT.Map.TYPE_G3;
+ window.cMap = new OAT.Map($('user_map'),providerType,{fix:OAT.Map.FIX_ROUND1});
+ OAT.Map.loadApi(providerType, {callback: mapcb});
+ window.geo_ui = new Geo_ui ('cond_form');
+}
+]]>
+ </script>
+ <div id="user_map"></div>
+ <xsl:call-template name="render-geo-conds-ui"/>
+ </xsl:when>
+ <xsl:otherwise>
<xsl:choose>
- <xsl:when test="$noresult = 1">
- <div class="empty_result">
- <h3>No Result</h3>
- <p>This query did not produce any results.<br/>
- Try dropping some of the conditions, to make the query less specific.</p>
- </div>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <!--xsl:when test="$view-type = 'text'"><h3>Text match results</h3></xsl:when>
- <xsl:when test="$view-type = 'text-d'"><h3>Text match results</h3></xsl:when>
- <xsl:when test="$view-type = 'text-properties'"><h3>List of Properties With Matching Text</h3></xsl:when>
- <xsl:when test="$view-type = 'classes'"><h3>Types</h3></xsl:when>
- <xsl:when test="$view-type = 'properties'"><h3>Properties</h3></xsl:when>
- <xsl:when test="$view-type = 'properties-in'"><h3>Referencing Properties</h3></xsl:when-->
- <xsl:when test="$view-type = 'list'"><h3>Select a value or condition</h3></xsl:when>
- <xsl:when test="$view-type = 'entities-list'"><h3>Entities found</h3></xsl:when>
- <!--xsl:when test="$view-type = 'list-count'"><h3>Distinct values</h3></xsl:when>
- <xsl:when test="$view-type = 'geo'"><h3>Location</h3></xsl:when-->
- </xsl:choose>
- <!-- xsl:message terminate="no"><xsl:value-of select="$type"/></xsl:message -->
- <xsl:choose>
- <xsl:when test="$view-type = 'geo' or $view-type = 'geo-list'">
- <xsl:call-template name="render-geo-conds-ui">
- <xsl:with-param name="result" select="/facets/result"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="count (/facets/result) > 1">
- <xsl:for-each select="result[@type = 'classes' or @type = 'properties']">
- <div class="facet_ctr">
- <xsl:choose>
- <xsl:when test="@type='properties'">
- <h4 class="facet_hd">Properties</h4>
- </xsl:when>
- <xsl:otherwise>
- <h4 class="facet_hd">Types</h4>
- </xsl:otherwise>
- </xsl:choose>
- <div class="facet">
- <xsl:call-template name="render-result">
- <xsl:with-param name="view-type"><xsl:value-of select="$view-type"/></xsl:with-param>
- <xsl:with-param name="command">
- <xsl:choose>
- <xsl:when test="@type = 'classes'">set_class</xsl:when>
- <xsl:when test="@type = 'properties'">open_property</xsl:when>
- <xsl:otherwise><xsl:value-of select="$cmd"/></xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
- </xsl:call-template>
- </div>
- </div> <!-- facet_ctr -->
- </xsl:for-each>
- <xsl:for-each select="/facets/result [@type != 'classes' and @type != 'properties']">
- <xsl:call-template name="render-result">
- <xsl:with-param name="view-type"><xsl:value-of select="$view-type"/></xsl:with-param>
- <xsl:with-param name="command">
- <xsl:choose>
- <xsl:when test="@type = 'classes'">set_class</xsl:when>
- <xsl:when test="@type = 'properties'">open_property</xsl:when>
- <xsl:otherwise><xsl:value-of select="$cmd"/></xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
- </xsl:call-template>
- </xsl:for-each>
- </xsl:when> <!-- multiple results -->
+ <xsl:when test="count (/facets/result) > 1">
+ <xsl:for-each select="result[@type = 'classes' or @type = 'properties']">
+ <div class="facet_ctr">
+ <xsl:choose>
+ <xsl:when test="@type='properties'">
+ <h4 class="facet_hd">Properties</h4>
+ </xsl:when>
<xsl:otherwise>
- <xsl:for-each select="/facets/result">
- <xsl:call-template name="render-result">
- <xsl:with-param name="view-type"><xsl:value-of select="$view-type"/></xsl:with-param>
- <xsl:with-param name="command">
- <xsl:choose>
- <xsl:when test="@type = 'classes'">set_class</xsl:when>
- <xsl:when test="@type = 'properties'">open_property</xsl:when>
- <xsl:otherwise><xsl:value-of select="$cmd"/></xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
- </xsl:call-template>
- </xsl:for-each>
+ <h4 class="facet_hd">Types</h4>
</xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- <div class="btn_bar">
- <xsl:call-template name="render-pager">
- <xsl:with-param name="pfx">pager_bottom</xsl:with-param>
- </xsl:call-template>
- </div> <!-- btn_bar -->
- </xsl:otherwise> <!-- non-empty result -->
+ </xsl:choose>
+ <div class="facet">
+ <xsl:call-template name="render-result">
+ <xsl:with-param name="view-type"><xsl:value-of select="@type"/></xsl:with-param>
+ <xsl:with-param name="command">
+ <xsl:choose>
+ <xsl:when test="@type = 'classes'">set_class</xsl:when>
+ <xsl:when test="@type = 'properties'">open_property</xsl:when>
+ <xsl:otherwise><xsl:value-of select="$cmd"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:with-param>
+ </xsl:call-template>
+ </div>
+ </div> <!-- facet_ctr -->
+ </xsl:for-each>
+ <xsl:for-each select="/facets/result [@type != 'classes' and @type != 'properties']">
+ <xsl:call-template name="render-result">
+ <xsl:with-param name="view-type"><xsl:value-of select="$type"/></xsl:with-param>
+ <xsl:with-param name="command">
+ <xsl:choose>
+ <xsl:when test="@type = 'classes'">set_class</xsl:when>
+ <xsl:when test="@type = 'properties'">open_property</xsl:when>
+ <xsl:otherwise><xsl:value-of select="$cmd"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:for-each>
+ </xsl:when> <!-- multiple results -->
+ <xsl:otherwise>
+ <xsl:for-each select="/facets/result">
+ <xsl:call-template name="render-result">
+ <xsl:with-param name="view-type"><xsl:value-of select="$type"/></xsl:with-param>
+ <xsl:with-param name="command">
+ <xsl:choose>
+ <xsl:when test="@type = 'classes'">set_class</xsl:when>
+ <xsl:when test="@type = 'properties'">open_property</xsl:when>
+ <xsl:otherwise><xsl:value-of select="$cmd"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:for-each>
+ </xsl:otherwise>
</xsl:choose>
- <div id="result_nfo">
- <xsl:choose>
- <xsl:when test="/facets/complete = 'yes'">
- <xsl:text>Complete result - </xsl:text>
- </xsl:when>
- <xsl:otherwise>Partial result - </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="if(/facets/processed > 0, /facets/processed, $rowcnt)"/>
- <xsl:text> processed in </xsl:text>
- <xsl:value-of select="/facets/time"/>
- <xsl:text> msec.</xsl:text>
- <br/>
- <xsl:text> Resource utilization: </xsl:text>
- <xsl:value-of select="/facets/db-activity"/>
- </div> <!-- #result_nfo -->
- </div> <!-- #res -->
- <script type="text/javascript">
+ </xsl:otherwise>
+</xsl:choose>
+<div class="btn_bar">
+ <xsl:call-template name="render-pager"/>
+</div> <!-- btn_bar -->
+<div id="result_nfo">
+ <xsl:choose>
+ <xsl:when test="/facets/complete = 'yes'">Complete result - </xsl:when>
+ <xsl:otherwise>Partial result - </xsl:otherwise>
+ </xsl:choose>
+ <xsl:value-of select="if(/facets/processed > 0, /facets/processed, $rowcnt)"/> processed in <xsl:value-of select="/facets/time"/> msec.<br/> Resource utilization:
+ <xsl:value-of select="/facets/db-activity"/>
+</div> <!-- #result_nfo -->
+</div> <!-- #res -->
+<script type="text/javascript">
var sparql_a = OAT.Dom.create('a',{}, 'sparql_a');
- sparql_a.href='/sparql?default-graph-uri=&qtxt=<xsl:value-of select="urlify ($p_qry)"/>&debug='
+ sparql_a.href='/sparql?qtxt=<xsl:value-of select="urlify ($p_qry)"/>&debug='
sparql_a.innerHTML = 'View query as SPARQL';
var plink_a = OAT.Dom.create('a',{}, 'plink_a');
plink_a.href='/fct/facet.vsp?qxml=<xsl:value-of select="urlify ($p_xml)"/>'
plink_a.innerHTML = 'Facet permalink';
OAT.Dom.append (['sparql_a_ctr',sparql_a, plink_a]);
- </script>
- <!--xsl:message terminate="no">addthis_key:<xsl:value-of select="$addthis_key"/></xsl:message-->
- <xsl:if test="$view-type = 'entities-list' or $type = 'default'">
- <script type="text/javascript">
+</script>
+<xsl:if test="$type = 'default'">
+<script type="text/javascript">
if ($('pivot_a_ctr')) {
- var pivot_a = OAT.Dom.create('a', {}, 'pivot_a');
- pivot_a.href='/pivot_collections/pivot.vsp?sid=<xsl:value-of select="$sid"/>&limit=75&qrcodes=0&CXML_redir_for_subjs=&CXML_redir_for_hrefs=&q=<xsl:value-of select="urlify (normalize-space(/facets/sparql))"/>'
+ var pivot_a = OAT.Dom.create('a',{}, 'pivot_a');
+ pivot_a.href='/pivot_collections/pivot.vsp?sid=<xsl:value-of select="$sid"/>&limit=75&qrcodes=0&CXML_redir_for_subjs=&CXML_redir_for_hrefs=&q=<xsl:value-of select="urlify (normalize-space(/facets/sparql))"/>'
pivot_a.innerHTML = 'Make Pivot collection';
pivot_a.id = 'pivot_a_mpc';
@@ -218,7 +228,7 @@
var pivot_link_opts = OAT.Dom.create('span', {}, 'pivot_link_opts');
pivot_link_opts.innerHTML = ' \
- <a href="#" title="Sets the link-out behavior of subject URIs, optionally performing a DESCRIBE on the subject">Subject link behavior</a> \
+ <a href="#" title="Sets the link-out behavior of subject URIs, optionally performing a DESCRIBE on the subject">Subject link behavior</a> \
<select id="CXML_redir_for_subjs" onchange="fct_set_pivot_subj_uri_opt()">\
<option value="121" selected="true">External resource link</option>\
<option value="">No link out</option>\
@@ -244,120 +254,70 @@
OAT.Dom.append (['pivot_a_ctr',pivot_a,pivot_pg,pivot_qrcode_opts,pivot_link_opts]);
}
- </script>
- </xsl:if>
-
- <xsl:call-template name="render-init-func">
- <xsl:with-param name="result" select="/facets/result"/>
- </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template name="render-limit-opts">
- <xsl:param name="lim-list"/>
- <xsl:param name="limit"/>
- <xsl:variable name="new-lim-list" select="concat(normalize-space($lim-list), ' ')"/>
- <xsl:variable name="first-val" select="substring-before($new-lim-list, ' ')" />
- <xsl:variable name="remaining" select="substring-after($new-lim-list, ' ')" />
- <option>
- <xsl:attribute name="value"><xsl:value-of select="$first-val"/></xsl:attribute>
- <xsl:if test="$first-val = $limit"><xsl:attribute name="selected">true</xsl:attribute></xsl:if>
- <xsl:value-of select="$first-val"/>
- </option>
- <xsl:if test="$remaining">
- <xsl:call-template name="render-limit-opts">
- <xsl:with-param name="lim-list"><xsl:value-of select="$remaining"/></xsl:with-param>
- <xsl:with-param name="limit"><xsl:value-of select="$limit"/></xsl:with-param>
- </xsl:call-template>
- </xsl:if>
+</script>
+</xsl:if>
</xsl:template>
<xsl:template name="render-pager">
- <xsl:param name="pfx"/>
<xsl:if test="/facets/processed > 0">
- <form class="pager">
- <xsl:attribute name="id"><xsl:value-of select="$pfx"/></xsl:attribute>
- <input type="hidden" name="sid">
- <xsl:attribute name="value">
- <xsl:value-of select="$sid"/>
- </xsl:attribute>
- </input>
- <input type="hidden" name="cmd" value="go_to">
- <xsl:attribute name="id"><xsl:value-of select="$pfx"/>_cmd</xsl:attribute>
- </input>
- <label>
- <xsl:attribute name="for"><xsl:value-of select="$pfx"/>_goto</xsl:attribute>
- Go to:
- </label>
-
- <input name="offset" type="text" class="pager_go" size="3">
- <xsl:attribute name="id"><xsl:value-of select="$pfx"/>_goto</xsl:attribute>
- <!--xsl:attribute name="value"><xsl:value-of select="$offs"/></xsl:attribute-->
- </input>
-
- <label>
- <xsl:attribute name="for"><xsl:value-of select="$pfx"/>_nres</xsl:attribute>
- Show
- </label>
- <select name="limit">
- <xsl:attribute name="id"><xsl:value-of select="$pfx"/>_nres</xsl:attribute>
- <xsl:call-template name="render-limit-opts">
- <xsl:with-param name="lim-list">20 50 100 150 200 300 400 500</xsl:with-param>
- <xsl:with-param name="limit" select="$limit"/>
- </xsl:call-template>
- </select>
- <span class="pager_stats">
- <xsl:value-of select="$offs"/> - <xsl:value-of select="$offs + $rowcnt - 1"/> <xsl:text> of </xsl:text>
- <xsl:value-of select="/facets/processed"/> <xsl:text> total </xsl:text>
+ <div class="pager">
+ <span class="stats"><xsl:text>Showing </xsl:text>
+ <xsl:value-of select="$offs"/>-<!-- <xsl:value-of select="$offs + $page_len - 1"/>--><xsl:value-of select="$offs + $rowcnt - 1"/> <xsl:text> of </xsl:text>
+ <xsl:value-of select="/facets/processed"/> <xsl:text>total </xsl:text>
</span>
+ <xsl:if test="$offs >= $page_len">
<button>
- <xsl:if test="$offs <= 1">
- <xsl:attribute name="disabled">true</xsl:attribute>
- </xsl:if>
<xsl:attribute name="class">pager</xsl:attribute>
- <xsl:attribute name="onclick">javascript:fct_pager_prev('<xsl:value-of select="$pfx"/>');</xsl:attribute>
- ◀
+ <xsl:attribute name="onclick">javascript:fct_nav_to('/fct/facet.vsp?cmd=prev&sid=<xsl:value-of select="$sid"/>')
+ </xsl:attribute>◂ Prev
</button>
+ </xsl:if>
+ <xsl:if test="($offs + $page_len) < /facets/processed">
<button>
- <xsl:if test="not(($offs + $limit) < /facets/processed)">
- <xsl:attribute name="disabled">true</xsl:attribute>
- </xsl:if>
<xsl:attribute name="class">pager</xsl:attribute>
- <xsl:attribute name="onclick">javascript:fct_pager_next('<xsl:value-of select="$pfx"/>');</xsl:attribute>
- ▶
+ <xsl:attribute name="onclick">javascript:fct_nav_to('/fct/facet.vsp?cmd=next&sid=<xsl:value-of select="$sid"/>')
+ </xsl:attribute>▸ Next
</button>
- </form>
+ </xsl:if>
+ </div>
</xsl:if>
</xsl:template> <!-- render-pager -->
<xsl:template name="render-result">
-<div class="dbg"><xsl:value-of select="$view-type"/></div>
<table id="result_t">
<xsl:attribute name="class">result <xsl:value-of select="$view-type"/></xsl:attribute>
<thead>
<xsl:choose>
<xsl:when test="$view-type = 'properties'">
- <tr><th></th><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th></th><th>Count</th></tr>
+ <div class="dbg"><xsl:value-of select="$view-type"/></div>
+ <tr><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'list-count'">
- <tr><th></th><th><xsl:value-of select="$s_term"/></th><!--th>Title</th--><th></th><th>Count</th></tr>
+ <div class="dbg"><xsl:value-of select="$view-type"/></div>
+ <tr><th><xsl:value-of select="$s_term"/></th><!--th>Title</th--><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'text-properties'">
- <tr><th></th><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th></th><th>Count</th></tr>
+ <div class="dbg"><xsl:value-of select="$view-type"/></div>
+ <tr><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'properties-in'">
- <tr><th></th><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th></th><th>Count</th></tr>
+ <div class="dbg"><xsl:value-of select="$view-type"/></div>
+ <tr><th><xsl:value-of select="$p_term"/></th><!--th>Label</th--><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'list'">
+ <div class="dbg"><xsl:value-of select="$view-type"/></div>
<tr><th></th><th></th><th></th></tr>
</xsl:when>
<xsl:when test="$view-type = 'classes'">
- <tr><th></th><th><xsl:value-of select="$t_term"/></th><!--th>Label</th--><th></th><th>Count</th></tr>
+ <div class="dbg"><xsl:value-of select="$view-type"/></div>
+ <tr><th><xsl:value-of select="$t_term"/></th><!--th>Label</th--><th>Count</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'text' or $view-type = 'text-d'">
- <tr><th></th><th></th><th></th><th><xsl:value-of select="$s_term"/></th><th>Title</th><th>Text excerpt</th></tr>
+ <div class="dbg"><xsl:value-of select="$view-type"/></div>
+ <tr><th><xsl:value-of select="$s_term"/></th><th>Title</th><th>Text excerpt</th></tr>
</xsl:when>
<xsl:when test="$view-type = 'text' or $view-type = 'propval-list'">
+ <div class="dbg"><xsl:value-of select="$view-type"/></div>
<tr><th>Value</th><th>Datatype</th></tr>
</xsl:when>
</xsl:choose>
@@ -366,140 +326,109 @@
<xsl:for-each select="row">
<tr>
<xsl:choose>
- <xsl:when test="$view-type = 'entities-list'">
- <xsl:if test="./@rank">
- <td>
- <xsl:value-of select="./@rank"/>
- </td>
- </xsl:if>
- <td>
- <xsl:call-template name="render-describe-link">
- <xsl:with-param name="uri" select="column[1]"/>
- <xsl:with-param name="content" select="column[2]"/>
- </xsl:call-template>
- </td>
- </xsl:when>
<xsl:when test="$view-type = 'properties' or
$view-type = 'classes' or
$view-type = 'properties-in' or
$view-type = 'text-properties' or
$view-type = 'list' or
$view-type = 'list-count'">
- <xsl:if test="./@rank">
- <td>
- <xsl:value-of select="./@rank"/>
- </td>
- </xsl:if>
+ <xsl:if test="./@rank">
<td>
- <xsl:if test="$view-type = 'properties' or $view-type = 'classes'">
- <input type="checkbox" name="cb" value="{position (.)}" checked="true" onclick="javascript:fct_sel_neg (this)"/>
- </xsl:if>
-
- <!--xsl:message terminate="no">
- <xsl:value-of select="$query/query/class/@iri"/><xsl:text> | </xsl:text><xsl:value-of select="column[1]"/>
- </xsl:message-->
- <xsl:variable name="current_iri" select="column[1]"/>
- <xsl:variable name="use_iri">
- <xsl:choose>
- <xsl:when test="not $query/query/class[@iri = $current_iri] and column[1]/@sparql_ser != ''">
- <xsl:value-of select="urlify(column[1]/@sparql_ser)"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="urlify($current_iri)"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:comment><xsl:value-of select="$current_iri"/></xsl:comment>
+ <xsl:value-of select="./@rank"/>
</td>
- <td>
- <a id="a_{position (.)}">
- <xsl:attribute name="class">sel_val</xsl:attribute>
- <xsl:attribute name="href">
- <xsl:text>/fct/facet.vsp?cmd=</xsl:text>
- <xsl:value-of select="$command"/>
- <xsl:text>&</xsl:text>
- <xsl:choose>
+ </xsl:if>
+ <td>
+ <xsl:if test="'uri' = column[1]/@datatype or 'url' = column[1]/@datatype">
+ <a><xsl:attribute name="href">/describe/?url=<xsl:value-of select="urlify (column[1])"/>&sid=<xsl:value-of select="$sid"/></xsl:attribute>
+ <xsl:attribute name="class">describe</xsl:attribute>Describe</a>
+ </xsl:if>
+ <xsl:if test="$view-type = 'properties' or $view-type = 'classes'">
+ <input type="checkbox" name="cb" value="{position (.)}" checked="true" onclick="javascript:fct_sel_neg (this)"/>
+ </xsl:if>
+ <a id="a_{position (.)}">
+ <!--xsl:message terminate="no"><xsl:value-of select="$query/query/class/@iri"/><xsl:value-of select="column[1]"/></xsl:message-->
+ <xsl:variable name="current_iri" select="column[1]"/>
+ <xsl:if test="not $query/query/class[@iri = $current_iri]" >
+ <xsl:variable name="use_iri">
+ <xsl:choose>
+ <xsl:when test="column[1]/@sparql_ser != ''">
+ <xsl:value-of select="urlify(column[1]/@sparql_ser)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="urlify($current_iri)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:comment><xsl:value-of select="$current_iri"/></xsl:comment>
+ <xsl:attribute name="class">sel_val</xsl:attribute>
+ <xsl:attribute name="href">/fct/facet.vsp?cmd=<xsl:value-of select="$command"/>&<xsl:choose>
<xsl:when test="'cond' = $command">cond_t=eq&val=<xsl:value-of select="$use_iri"/></xsl:when>
<xsl:otherwise>iri=<xsl:value-of select="$use_iri"/></xsl:otherwise>
- </xsl:choose>
- <xsl:text>&lang=</xsl:text>
- <xsl:value-of select="column[1]/@xml:lang"/>
- <xsl:text>&datatype=</xsl:text>
- <xsl:value-of select="urlify (column[1]/@datatype)"/>
- <xsl:text>&sid=</xsl:text>
- <xsl:value-of select="$sid"/>
- </xsl:attribute> <!-- href -->
- <xsl:attribute name="title">
- <xsl:value-of select="column[1]"/>
- </xsl:attribute>
- <xsl:choose>
- <xsl:when test="'' != string (column[2])">
- <xsl:value-of select="column[2]"/>
- </xsl:when>
- <xsl:when test="'' != column[1]/@shortform">
- <xsl:value-of select="column[1]/@shortform"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="column[1]"/>
- </xsl:otherwise>
- </xsl:choose>
- </a>
- </td>
- <td>
- <xsl:if test="'uri' = column[1]/@datatype or 'url' = column[1]/@datatype">
- <xsl:call-template name="render-describe-link">
- <xsl:with-param name="uri" select="column[1]"/>
- <xsl:with-param name="shortform" select="column[1]/@shortform"/>
- <xsl:with-param name="content">Describe</xsl:with-param>
- </xsl:call-template>
- </xsl:if>
- </td>
+ </xsl:choose>&lang=<xsl:value-of select="column[1]/@xml:lang"/>&datatype=<xsl:value-of select="urlify (column[1]/@datatype)"/>&sid=<xsl:value-of select="$sid"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="title">
+ <xsl:value-of select="column[1]"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="'' != string (column[2])">
+ <xsl:value-of select="column[2]"/>
+ </xsl:when>
+ <xsl:when test="'' != column[1]/@shortform">
+ <xsl:value-of select="column[1]/@shortform"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="column[1]"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </a>
+ </td>
<xsl:if test="$view-type = 'list'">
<td class="val_dt">
<xsl:value-of select="column[1]/@datatype"/>
</td>
</xsl:if>
- <!--td>
- <xsl:choose>
- <xsl:when test="'' != ./@shortform">
- <xsl:value-of select="./@shortform"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="column[2]"/>
- </xsl:otherwise>
- </xsl:choose>
- </td-->
- <td>
- <xsl:apply-templates select="column[3]"/>
- </td>
+ <!--td>
+ <xsl:choose>
+ <xsl:when test="'' != ./@shortform">
+ <xsl:value-of select="./@shortform"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="column[2]"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td-->
+ <td>
+ <xsl:apply-templates select="column[3]"/>
+ </td>
</xsl:when>
<!--xsl:when test="$view-type = 'propval-list'">
- <td class="val">
- <xsl:value-of select="column[1]" />
- </td>
- <td class="val_dt">
- <xsl:value-of select="column[1]/@datatype" />
- </td>
+ <td class="val">
+ <xsl:value-of select="column[1]" />
+ </td>
+ <td class="val_dt">
+ <xsl:value-of select="column[1]/@datatype" />
+ </td>
</xsl:when-->
- <xsl:otherwise> <!-- text matches view -->
+ <xsl:otherwise> <!-- text matches view -->
<td class="rnk">
<xsl:for-each select="column[@datatype='trank' or @datatype='erank']">
<img class="rnk">
<xsl:attribute name="src">
- <xsl:text>images/r_</xsl:text><xsl:value-of select="min (floor(.), 10)"/><xsl:text>.png</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="alt">
- <xsl:choose>
- <xsl:when test="./@datatype='trank'">Text Rank:</xsl:when>
- <xsl:when test="./@datatype='erank'">Entity Rank:</xsl:when>
- </xsl:choose>
- <xsl:value-of select="."/>
+ <xsl:text>images/r_</xsl:text><xsl:value-of select="min (floor(.), 10)"/><xsl:text>.png</xsl:text>
</xsl:attribute>
- <xsl:attribute name="title">
- <xsl:choose>
- <xsl:when test="./@datatype='trank'">Text Rank:</xsl:when>
- <xsl:when test="./@datatype='erank'">Entity Rank:</xsl:when>
- </xsl:choose>
+ <xsl:attribute name="alt">
+ <xsl:choose>
+ <xsl:when test="./@datatype='trank'">Text Rank:</xsl:when>
+ <xsl:when test="./@datatype='erank'">Entity Rank:</xsl:when>
+ </xsl:choose>
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ <xsl:attribute name="title">
+ <xsl:choose>
+ <xsl:when test="./@datatype='trank'">Text Rank:</xsl:when>
+ <xsl:when test="./@datatype='erank'">Entity Rank:</xsl:when>
+ </xsl:choose>
<xsl:value-of select="."/>
</xsl:attribute>
</img>
@@ -507,31 +436,34 @@
</td>
<xsl:for-each select="column">
<td>
- <xsl:choose>
+ <xsl:choose>
<xsl:when test="'uri' = ./@datatype or 'url' = ./@datatype">
- <xsl:call-template name="render-describe-link">
- <xsl:with-param name="uri" select="."/>
- <xsl:with-param name="shortform" select="./@shortform"/>
- </xsl:call-template>
+ <a>
+ <xsl:attribute name="href">/describe/?url=<xsl:value-of select="urlify (.)"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:value-of select="."/></xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="'' != ./@shortform"><xsl:value-of select="./@shortform"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+ </xsl:choose>
+ </a>
</xsl:when>
<xsl:when test="'erank' = ./@datatype or 'trank' = ./@datatype">
+
</xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="."/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
+ </xsl:choose>
</td>
</xsl:for-each>
</xsl:otherwise>
- </xsl:choose>
+ </xsl:choose>
</tr>
<xsl:text></xsl:text>
</xsl:for-each>
</tbody>
</table>
-<xsl:if test="/facets/result/@type='propval-list' or $view-type='list'">
- <form id="cond_form">
+<xsl:if test="/facets/result/@type='propval-list' or /facets/result/@type='list'">
+ <form id="cond_form">
<input type="hidden" name="sid"><xsl:attribute name="value"><xsl:value-of select="$sid"/></xsl:attribute></input>
<input type="hidden" name="hi" id="out_hi"/>
<input type="hidden" name="lo" id="out_lo"/>
@@ -540,13 +472,13 @@
<input type="hidden" name="val" id="out_val"/>
<input type="hidden" name="cmd" value="cond" id="cmd"/>
<input type="hidden" name="cond_parms" id="cond_parms"/>
- Add condition:
+ Add condition:
<select id="cond_type" name="cond_t">
<option value="none">None</option>
<option value="eq">==</option>
<option value="neq">!=</option>
- <option value="gte">>=</option>
- <option value="gt">></option>
+ <option value="gte">>=</option>
+ <option value="gt">></option>
<option value="lte"><=</option>
<option value="lt"><</option>
<option value="range">Between</option>
@@ -555,87 +487,34 @@
<option value="in">In</option>
</select>
<span id="cond_inp_ctr" style="display:none">
- <!--label for="ckb_neg" class="ckb">Negation:</label><input type="checkbox" name="neg" id="ckb_neg"/-->
+ <!--label for="ckb_neg" class="ckb">Negation:</label><input type="checkbox" name="neg" id="ckb_neg"/-->
<input id="cond_lo" type="text"/>
<span id="cond_hi_ctr"> and <input id="cond_hi" type="text"/></span> <select id="cond_dt"></select>
<input type="button" id="set_cond" value="Set Condition"/>
</span>
<div id="in_ctr" style="display:none"></div>
<div id="geo_ctr" style="display:none"></div>
- </form>
+ </form>
</xsl:if>
-<xsl:call-template name="render-init-func">
- <xsl:with-param name="result" select="/facets/result"/>
-</xsl:call-template>
-
-</xsl:template> <!-- render-result -->
+<xsl:call-template name="render-geo-conds-ui"/>
-<xsl:template name="render-describe-link">
- <xsl:param name="uri"/>
- <xsl:param name="shortform"/>
- <xsl:param name="content"/>
- <xsl:param name="marker"/>
- <!--xsl:message terminate="no">"<xsl:value-of select="content"/>"</xsl:message-->
- <a>
- <xsl:attribute name="href">
- <xsl:text>/describe/?url=</xsl:text>
- <xsl:value-of select="urlify ($uri)"/>
- <xsl:text>&sid=</xsl:text>
- <xsl:value-of select="$sid"/>
- </xsl:attribute>
- <xsl:attribute name="class">describe</xsl:attribute>
- <xsl:attribute name="title">
- <xsl:choose>
- <xsl:when test="$shortform">
- <xsl:value-of select="$shortform"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$uri"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:choose>
- <xsl:when test="$content=''">
- <xsl:choose>
- <xsl:when test="$shortform != ''">
- <xsl:value-of select="$shortform"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$uri"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$content"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="$marker"/>
- </a>
-</xsl:template> <!-- render-describe-link -->
+</xsl:template>
<xsl:template name="render-geo-conds-ui">
- <!--xsl:message terminate="no">In render-geo-conds-ui. type=<xsl:value-of select="$type"/></xsl:message-->
- <xsl:param name="result"/>
<xsl:if test="$type='geo' or $type='geo-list'">
- <div id="user_map"></div>
- <form id="cond_form">
+ <form id="cond_form">
<input type="hidden" name="sid"><xsl:attribute name="value"><xsl:value-of select="$sid"/></xsl:attribute></input>
<input type="hidden" name="cmd" value="cond" id="cmd"/>
- <input type="hidden" name="cno" value="" id="cno"/>
<input type="hidden" name="cond_t" value="near" id="cond_t"/>
<label for="cond_distance">Within: </label>
- <input name="dist" id="cond_dist" type="text" size="5"/> km of
- <select name="loc_trig_sel" id="loc_trig_sel">
- <option>Coordinates</option>
- <option value="on">Autolocation</option>
- </select>
+ <input name="dist" id="cond_dist" type="text" size="5"/> km of
<span id="loc_ctr">
- <img src="images/notify-throbber.gif" alt="Locating..." id="loc_acq_thr_i" style="display:none"/>
+ <img src="images/notify_throbber.gif" alt="Locating..." id="loc_acq_thr_i" style="display:none"/>
<input id="cond_loc" type="text" style="display:none"/>
</span>
<span id="coord_ctr">
- <!--label for="ckb_neg" class="ckb">Negation:</label><input type="checkbox" name="neg" id="ckb_neg"/-->
+ <!--label for="ckb_neg" class="ckb">Negation:</label><input type="checkbox" name="neg" id="ckb_neg"/-->
<label for="cond_lat">Lat:</label>
<input name="lat" id="cond_lat" type="text" size="9"/>
<label for="cond_lon">Lon:</label>
@@ -645,91 +524,7 @@
</span>
<button id="cond_loc_acq_b">Acquire</button>
<button id="cond_loc_use_b">Set condition</button>
- </form>
- </xsl:if>
-</xsl:template> <!-- render-geo-conds-ui -->
-
-<xsl:template name="render-init-func">
- <xsl:param name="result"/>
- <!--xsl:message terminate="no">In render-init-func: type=<xsl:value-of select="$type"/></xsl:message-->
- <script type="text/javascript" >
- <xsl:if test="$type='geo' or $type='geo-list'">
-OAT.Preferences.imagePath = "oat/images/";
-function markerClickHandler (caller, msg, m) {
- var c = m.__fct_bubble_content;
-
- var x;
- if (c[0].length > 0) {
- x = OAT.Dom.create ("a");
- x.href = '/describe/?url='+escape (c[0]);
- if (c[1].length > 0)
- x.innerHTML = c[1];
- else
- x.innerHTML = c[0];
- }
- else x = OAT.Dom.text(c[1]);
- window.cMap.openWindow (m, x);
-}
- </xsl:if>
-
-function init() {
-
- <xsl:if test="$type='geo' or $type='geo-list'">
- window.cMap = {};
- var mapcb = function() {
- window.cMap.init(OAT.Map.TYPE_G3);
- window.cMap.centerAndZoom(0,0,0);
- window.cMap.setMapType(OAT.Map.MAP_HYB);
- OAT.MSG.attach ("*", "MAP_MARKER_CLICK", markerClickHandler);
- var markersArr = [];
- <xsl:for-each select="$result/row">
- <!--xsl:message terminate="no"><xsl:value-of select="."/></xsl:message-->
- window.cMap.addMarker(<xsl:value-of select="column[3]"/>,
- <xsl:value-of select="column[4]"/>,
- false,
- {image: "oat/images/markers/01.png",
- imageSize: [18,41],
- custData: {__fct_bubble_content: ["<xsl:value-of select="column[1]"/>",
- "<xsl:value-of select='translate (normalize-space (column[2]), '"', '')'/>"]}});
- markersArr.push([<xsl:value-of select="column[3]"/>,<xsl:value-of select="column[4]"/>]);
- </xsl:for-each>
- fct_add_loc_marker ();
- window.cMap.optimalPosition(markersArr);
- window.cMap.showMarkers(false);
- return;
- }
-
- window.YMAPPID = "";
- var providerType = OAT.Map.TYPE_G3;
- window.cMap = new OAT.Map($('user_map'),providerType,{fix:OAT.Map.FIX_ROUND1});
- OAT.Map.loadApi(providerType, {callback: mapcb});
- window.geo_ui = new Geo_ui ('cond_form');
-
- var acq_trig = $('acq_l_trig');
-
- if (acq_trig) {
- window.geo_ui.loc_update(parseInt(acq_trig.innerHTML));
- }
- </xsl:if>
- <xsl:if test="$addthis_key != ''">
- </xsl:if>
- fct_init_ui();
-}<!-- init -->
- </script>
- <xsl:if test="$addthis_key != ''">
- <script type="text/javascript">
- var addthis_config = {
- "data_track_clickback":true,
- ui_cobrand:"OpenLink Virtuoso",
- pubid: "<xsl:value-of select="$addthis_key"/>"
- };
-var addthis_share = {
- url: window.location.protocol + '//' + window.location.host + window.location.pathname + '?qxml=<xsl:value-of select="urlify ($p_xml)"/>',
- title: "Faceted browser permalink",
- Description: "This is a permalink to an OpenLink Faceted Browsing service page."
-};
- </script>
- <script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js"></script>
+ </form>
</xsl:if>
</xsl:template>
@@ -739,4 +534,5 @@ var addthis_share = {
</xsl:copy>
</xsl:template>
+
</xsl:stylesheet>
diff --git a/binsrc/b3s/images/link_16.png b/binsrc/b3s/images/link_16.png
deleted file mode 100644
index 9be575d..0000000
Binary files a/binsrc/b3s/images/link_16.png and /dev/null differ
diff --git a/binsrc/b3s/install.html b/binsrc/b3s/install.html
index 3d7c952..e3940f9 100644
--- a/binsrc/b3s/install.html
+++ b/binsrc/b3s/install.html
@@ -20,7 +20,7 @@ create bitmap index RDF_QUAD_POGS on RDF_QUAD (P, O, G, S) partition (O varchar
create bitmap index RDF_QUAD_GPOS on RDF_QUAD (G, P, O, S) partition (O varchar (-1, 0hexffff));
checkpoint;
- </pre>
+</pre>
<p>Once the indexes are created, you must re-install the Faceted Browser VAD package.</p>
</body>
</html>
diff --git a/binsrc/b3s/isparql_describe.xsl b/binsrc/b3s/isparql_describe.xsl
index 6f825d7..23226d3 100644
--- a/binsrc/b3s/isparql_describe.xsl
+++ b/binsrc/b3s/isparql_describe.xsl
@@ -2,12 +2,12 @@
<!--
- $Id: isparql_describe.xsl,v 1.1.2.4 2012/03/05 17:38:05 source Exp $
+ $Id: isparql_describe.xsl,v 1.1.2.1 2011/09/23 19:22:35 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
@@ -25,9 +25,9 @@
-->
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:ex="http://example.org/stuff/1.0/">
<xsl:output method="html"
omit-xml-declaration="yes"
@@ -51,7 +51,7 @@
<xsl:attribute name="href">
<xsl:value-of select="$full_path"/>
</xsl:attribute>
- Run with iSPARQL
+ Run Query
</a>
<a>
<xsl:attribute name="href">
diff --git a/binsrc/b3s/make_vad.sh b/binsrc/b3s/make_vad.sh
index f438d05..df81cc9 100755
--- a/binsrc/b3s/make_vad.sh
+++ b/binsrc/b3s/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.1.2.10 2012/03/05 17:38:05 source Exp $
+# $Id: make_vad.sh,v 1.1.2.8 2011/10/26 15:38:11 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -176,7 +176,7 @@ directory_init() {
for d in `find . -type d | grep -v CVS | grep -v VirtTripleLoader`
do
- mkdir -p vad/vsp/fct/$d
+ mkdir -p vad/vsp/fct/$d
done
for f in `find . -name '*.sql'`
@@ -268,7 +268,7 @@ sticker_init() {
echo " <name package=\"$VAD_NAME\">" >> $STICKER
echo " <prop name=\"Title\" value=\"$VAD_DESC\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -317,13 +317,13 @@ fi
for f in $SQLDEPS
- do
+ 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
+ do
+ exclude=0
if [ ! -z "$EXCEPT" -o ! -z "$SQLDEPS" ]
then
for ex in $EXCEPT $SQLDEPS
@@ -333,7 +333,7 @@ fi
exclude=1
fi
done
- fi
+ fi
if [ $exclude -eq 0 ]
then
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/$f', 0, 'report', $ISDAV);" >> $STICKER
diff --git a/binsrc/b3s/ns.sql b/binsrc/b3s/ns.sql
index b576204..5097036 100644
--- a/binsrc/b3s/ns.sql
+++ b/binsrc/b3s/ns.sql
@@ -1,10 +1,10 @@
--
--- $Id: ns.sql,v 1.1.2.9 2012/03/05 17:08:16 source Exp $
+-- $Id: ns.sql,v 1.1.2.7 2011/09/23 19:22:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -79,15 +79,3 @@ INSERT INTO GRAPH <urn:rules.skos> { skos:broader rdfs:subPropertyOf skos:broade
;
rdfs_rule_set ('skos-trans', 'urn:rules.skos');
-
-create procedure fct_load_oplweb ()
-{
- for select RES_CONTENT as cnt from WS.WS.SYS_DAV_RES where RES_FULL_PATH = '/DAV/VAD/fct/oplweb.owl' do
- {
- DB.DBA.RDF_LOAD_RDFXML (cast (cnt as varchar), 'http://www.openlinksw.com/schemas/oplweb#', 'http://www.openlinksw.com/schemas/oplweb#');
- }
-}
-;
-
-fct_load_oplweb ();
-rdfs_rule_set ('oplweb', 'http://www.openlinksw.com/schemas/oplweb#');
diff --git a/binsrc/b3s/nsdecl.sql b/binsrc/b3s/nsdecl.sql
index dfcd566..72712e8 100644
--- a/binsrc/b3s/nsdecl.sql
+++ b/binsrc/b3s/nsdecl.sql
@@ -1,10 +1,10 @@
--
--- $Id: nsdecl.sql,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+-- $Id: nsdecl.sql,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/open.xsl b/binsrc/b3s/open.xsl
index 6294851..9d9bd1b 100644
--- a/binsrc/b3s/open.xsl
+++ b/binsrc/b3s/open.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
--
--- $Id: open.xsl,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+-- $Id: open.xsl,v 1.1.2.1 2009/04/17 11:07:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/opensearchdescription.vsp b/binsrc/b3s/opensearchdescription.vsp
index 49137b2..ca19a5b 100644
--- a/binsrc/b3s/opensearchdescription.vsp
+++ b/binsrc/b3s/opensearchdescription.vsp
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -34,17 +34,16 @@
if (0 = sname)
{
- if (length (uriqa_str) > 16)
+ if (length (uriqa_str) > 16)
{
log_message ('facets: ShortName from URIQA too long. Please set ''fct_opensearch_shortname'' in registry');
- sname := 'OpenLink FCT';
}
else
sname := uriqa_str;
}
sname := "LEFT" (sname, 16);
-
+
descr := registry_get ('fct_opensearch_desc');
if (0 = descr)
@@ -62,17 +61,17 @@
if (0 = url_reg)
{
- url_reg := 'http://' || uriqa_str || '/fct/facet.vsp';
+ url_reg := 'http://' || uriqa_str || '/fct/facet.vsp';
}
url := sprintf ('%s?q={searchTerms}', url_reg);
-
+
favicon_path := registry_get ('fct_opensearch_favicon_url');
search_image_path := registry_get ('fct_opensearch_image_url');
http_rewrite ();
http_header ('Content-Type: application/opensearchdescription+xml\r\n');
-
+
http ('<?xml version="1.0" encoding="UTF-8"?>');
http ('<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">');
http (sprintf ('<ShortName>%s</ShortName>', sname));
diff --git a/binsrc/b3s/rdfdesc/description.sql b/binsrc/b3s/rdfdesc/description.sql
index 2d3633a..e73b143 100644
--- a/binsrc/b3s/rdfdesc/description.sql
+++ b/binsrc/b3s/rdfdesc/description.sql
@@ -1,10 +1,10 @@
--
--- $Id: description.sql,v 1.1.2.46 2012/03/07 21:14:19 source Exp $
+-- $Id: description.sql,v 1.1.2.30 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -68,7 +68,7 @@ create procedure b3s_page_get_type (in val any)
;
--
--- make a vector of languages and their quality
+-- make a vector of languages and their quality
--
create procedure b3s_get_lang_acc (in lines any)
{
@@ -123,24 +123,24 @@ create procedure b3s_str_lang_check (in lang any, in acc any)
}
;
-create procedure
+create procedure
b3s_handle_ses (inout _path any, inout _lines any, inout _params any)
{
declare sid, refr varchar;
- sid := get_keyword ('sid', _params);
+ sid := get_keyword ('sid', _params);
if (sid is null) {
refr := http_request_header (http_request_header (), 'Referer', null, null);
if (refr is not null)
{
- declare ht, pars any;
+ declare ht, pars any;
ht := WS.WS.PARSE_URI (refr);
pars := ht[4];
pars := split_and_decode (pars);
- if (pars is not null)
- sid := get_keyword ('sid', pars);
+ if (pars is not null)
+ sid := get_keyword ('sid', pars);
}
}
@@ -150,37 +150,26 @@ b3s_handle_ses (inout _path any, inout _lines any, inout _params any)
-- XXX should probably find the most specific if more than one class and inference rule is set
-create procedure
-b3s_type (in subj varchar,
- in _from varchar,
- out url varchar,
- out c_iri varchar)
+create procedure b3s_type (in subj varchar,
+ in _from varchar,
+ out url varchar,
+ out c_iri varchar)
{
declare meta, data, ll any;
- declare i int;
-
ll := 'unknown';
url := 'javascript:void()';
- c_iri := 'http://www.w3.org/2002/07/owl#Thing';
-
if (length (subj))
{
- exec (sprintf ('sparql select ?l ?tp %s where { <%S> a ?tp . optional { ?tp rdfs:label ?l } }', _from, subj),
+ exec (sprintf ('sparql select ?l ?tp %s where { <%S> a ?tp . optional { ?tp rdfs:label ?l } }', _from, subj),
null, null, vector (), 100, meta, data);
-
if (length (data))
{
- for (i := 0; i < length (data); i := i + 1)
- {
- if (data[i][0] is not null)
- ll := data[i][0];
- else
- ll := b3s_uri_local_part (data[i][1]);
-
- url := b3s_http_url (data[i][1]);
-
- c_iri := data[i][1];
- }
+ if (data[0][0] is not null)
+ ll := data[0][0];
+ else
+ ll := b3s_uri_local_part (data[0][1]);
+ url := b3s_http_url (data[0][1]);
+ c_iri := data[0][1];
}
}
return ll;
@@ -203,74 +192,40 @@ create procedure b3s_uri_local_part (in uri varchar)
;
create procedure
-b3s_render_iri_select (in _s varchar,
- in _from varchar,
- in ins_str varchar := '',
- in sel int := -1)
-{
- declare stat, msg, meta, data any;
- declare i int;
-
- if (length (_s))
- {
- data := null;
- exec (sprintf ('sparql select distinct ?tp %s where { <%S> a ?tp .}', _from, _s),
- stat, msg, vector (), 100, meta, data);
- if (length (data))
- {
- if (sel = -1) sel := length(data)-1;
-
- http (sprintf ('<select %s>', ins_str));
-
- for (i := 0; i < length(data); i := i + 1)
- {
- http (sprintf ('<option value="%s"%s>%s</option>',
- data[i][0],
- case when i = sel then 'selected="true"' else '' end,
- b3s_uri_curie(data[i][0])));
- }
- http ('</select>');
- }
- }
- return i;
-}
-;
-
-create procedure
b3s_render_fct_link ()
{
declare sid varchar;
sid := connection_get ('sid');
if (sid is not null)
- return ('/fct/facet.vsp?sid='||sid||'&cmd=refresh');
+ return ('/fct/facet.vsp?sid='||sid||'&cmd=refresh');
else
return '';
}
;
create procedure
-b3s_render_inf_opts ()
+b3s_render_inf_opts ()
{
declare inf varchar;
declare f int;
f := 0;
inf := connection_get ('inf');
- for select distinct RS_NAME as RS_NAME from SYS_RDF_SCHEMA do
+ for select distinct RS_NAME as RS_NAME from SYS_RDF_SCHEMA do
{
- if (RS_NAME = inf)
+ if (RS_NAME = inf)
{
http (sprintf ('<option value="%s" selected="selected">%s</option>', RS_NAME, RS_NAME));
f := 1;
}
- else
+ else
http (sprintf ('<option value="%s">%s</option>', RS_NAME, RS_NAME));
}
if (f = 0)
http ('<option value="**none**" selected="selected">None</option>');
- else
+ else
http ('<option value="**none**">None</option>');
}
;
@@ -278,22 +233,22 @@ b3s_render_inf_opts ()
create procedure
b3s_sas_selected ()
{
- if (connection_get ('sas') = 'yes')
+ if (connection_get ('sas') = 'yes')
return ' checked="true" ';
- else
- return '';
+ else
+ return '';
}
;
-
-create procedure
+
+create procedure
b3s_parse_inf (in sid varchar, inout params any)
{
declare _sas, _inf varchar;
- _sas := _inf := null;
+ _sas := _inf := null;
if (sid is not null)
- {
+ {
for select fct_state from fct_state where fct_sid = sid do
{
declare i varchar;
@@ -322,7 +277,7 @@ b3s_parse_inf (in sid varchar, inout params any)
{
if (_sas = '1' or _sas = 'yes')
connection_set ('sas', 'yes');
- else
+ else
connection_set ('sas', null);
}
}
@@ -336,22 +291,22 @@ b3s_render_inf_clause ()
_inf := connection_get ('inf');
_sas := connection_get ('sas');
- if (_inf is not null)
- _inf := sprintf ('define input:inference ''%s'' ', _inf);
- else
+ if (_inf is not null)
+ _inf := sprintf (' define input:inference ''%s'' ', _inf);
+ else
_inf := '';
if (_sas is not null)
- _sas := sprintf ('define input:same-as "yes" ');
- else
+ _sas := sprintf (' define input:same-as "yes" ');
+ else
_sas := '';
- return (_inf || _sas);
+ return (_inf || _sas);
}
;
create procedure
-b3s_render_ses_params ()
+b3s_render_ses_params ()
{
declare i,s,ifp,sid varchar;
@@ -368,7 +323,7 @@ b3s_render_ses_params ()
}
;
-create procedure
+create procedure
b3s_dbg_out (inout ses any, in str any)
{
if (connection_get ('b3s_dbg'))
@@ -376,10 +331,10 @@ b3s_dbg_out (inout ses any, in str any)
}
;
-create procedure
+create procedure
b3s_render_dbg_out (inout ses any)
{
- if (connection_get ('b3s_dbg'))
+ if (connection_get ('b3s_dbg'))
{
http('<div id="dbg_output"><pre>');
http_value (ses);
@@ -394,8 +349,6 @@ create procedure b3s_get_lang_by_q (in accept varchar, in lang varchar)
declare arr any;
declare i, l int;
- if (not length (lang))
- lang := 'en';
arr := split_and_decode (accept, 0, '\0\0,;');
q := 0;
l := length (arr);
@@ -450,17 +403,17 @@ create procedure b3s_label_get (inout data any, in langs any)
if (not isstring (label))
{
if (__tag of rdf_box = __tag (label) and rdf_box_is_complete (label))
- label := rdf_box_data (label);
- else
+ label := rdf_box_data (label);
+ else
label := __rdf_strsqlval (label);
}
if (not isstring (label))
label := cast (label as varchar);
- --label := regexp_replace (label, '<[^>]+>', '', 1, null);
+ --label := regexp_replace (label, '<[^>]+>', '', 1, null);
if (0 and sys_stat ('cl_run_local_only'))
{
- label := xpath_eval ('string(.)', xtree_doc (label, 2));
- label := charset_recode (label, '_WIDE_', 'UTF-8');
+ label := xpath_eval ('string(.)', xtree_doc (label, 2));
+ label := charset_recode (label, '_WIDE_', 'UTF-8');
}
else
label := cast (xtree_doc (label, 2) as varchar);
@@ -468,7 +421,7 @@ create procedure b3s_label_get (inout data any, in langs any)
}
;
-create procedure
+create procedure
b3s_rel_print (in val any, in rel any, in flag int := 0)
{
declare delim, delim1, delim2, delim3 integer;
@@ -506,7 +459,7 @@ b3s_rel_print (in val any, in rel any, in flag int := 0)
;
-create procedure
+create procedure
b3s_uri_curie (in uri varchar)
{
declare delim integer;
@@ -549,7 +502,7 @@ create procedure b3s_prop_label (in uri any)
if (length (ll) = 0)
ll := b3s_uri_curie (uri);
if (isstring (ll) and ll like 'opl%:isDescribedUsing')
- ll := 'Described Using Terms From';
+ ll := 'Described Using Terms From';
return ll;
}
;
@@ -558,7 +511,7 @@ create procedure
b3s_trunc_uri (in s varchar, in maxlen int := 80)
{
declare _s varchar;
- declare _h int;
+ declare _h int;
_s := trim(s);
@@ -570,7 +523,7 @@ b3s_trunc_uri (in s varchar, in maxlen int := 80)
}
;
-create procedure
+create procedure
b3s_http_url (in url varchar, in sid varchar := null, in _from varchar := null)
{
declare host, pref, more, i varchar;
@@ -585,16 +538,16 @@ b3s_http_url (in url varchar, in sid varchar := null, in _from varchar := null)
i := b3s_render_ses_params();
if (length (_from))
i := sprintf ('%s&graph=%U', i, _from);
-
+
return sprintf ('/describe/?url=%U%s', url, i);
};
-create procedure
+create procedure
b3s_http_print_l (in p_text any, inout odd_position int, in r int := 0, in sid varchar := null, in langs any := null)
{
declare short_p, p_prefix, int_redirect, url any;
- odd_position := odd_position + 1;
+ odd_position := odd_position + 1;
p_prefix := b3s_label (p_text, langs);
if (not length (p_prefix))
p_prefix := b3s_uri_curie (p_text);
@@ -603,13 +556,13 @@ b3s_http_print_l (in p_text any, inout odd_position int, in r int := 0, in sid v
if (not length (p_text))
return;
- http (sprintf ('<tr class="%s"><td class="property">', either (mod (odd_position, 2), 'odd', 'even')));
+ http (sprintf ('<tr class="%s"><td class="property">', either(mod (odd_position, 2), 'odd', 'even')));
if (r) http ('is ');
- http (sprintf ('<a class="uri" href="%s" title="%s">%s</a>\n',
- url,
- p_prefix,
+ http (sprintf ('<a class="uri" href="%s" title="%s">%s</a>\n',
+ url,
+ p_prefix,
b3s_trunc_uri (p_prefix, 40)));
if (r) http (' of');
@@ -618,7 +571,7 @@ b3s_http_print_l (in p_text any, inout odd_position int, in r int := 0, in sid v
}
;
-create procedure b3s_label (in _S any, in langs any, in lbl_order_pref_id int := 0)
+create procedure b3s_label (in _S any, in langs any)
{
declare best_str, meta, data any;
declare best_q, q float;
@@ -627,8 +580,8 @@ create procedure b3s_label (in _S any, in langs any, in lbl_order_pref_id int :=
stat := '00000';
--exec (sprintf ('sparql define input:inference "facets" '||
--'select ?o (lang(?o)) where { <%S> virtrdf:label ?o }', _S), stat, msg, vector (), 0, meta, data);
- exec (sprintf ('select __ro2sq (O), DB.DBA.RDF_LANGUAGE_OF_OBJ (__ro2sq (O)) , cast (b3s_lbl_order (P, %d) as int) from RDF_QUAD table option (with ''facets'')
- where S = __i2id (?) and P = __i2id (''http://www.openlinksw.com/schemas/virtrdf#label'', 0) and not is_bnode_iri_id (O) order by 3', lbl_order_pref_id),
+ exec ('select __ro2sq (O), DB.DBA.RDF_LANGUAGE_OF_OBJ (__ro2sq (O)) , b3s_lbl_order (P) from RDF_QUAD table option (with ''facets'')
+ where S = __i2id (?) and P = __i2id (''http://www.openlinksw.com/schemas/virtrdf#label'', 0) order by 3',
stat, msg, vector (_S), 0, meta, data);
if (stat <> '00000')
return '';
@@ -651,20 +604,16 @@ create procedure b3s_label (in _S any, in langs any, in lbl_order_pref_id int :=
{
best_str := __rdf_strsqlval (best_str);
}
-
- if (isnumeric (best_str))
- return (cast (best_str as varchar));
-
return best_str;
}
;
-create procedure
+create procedure
b3s_http_print_r (in _object any, in sid varchar, in prop any, in langs any, in rel int := 1, in acc any := null, in _from varchar := null)
{
declare lang, rdfs_type, rdfa, visible any;
- if (_object is null)
+ if (_object is null)
return;
if (__tag (_object) = 230)
@@ -707,39 +656,29 @@ again:
_url := _object;
if (not length (_url))
- return;
+ return;
http (sprintf ('<!-- %d -->', length (_url)));
rdfa := b3s_rel_print (prop, rel, 0);
- if (prop = 'http://bblfish.net/work/atom-owl/2006-06-06/#content' and _object like '%#content%')
- {
- declare src any;
- whenever not found goto usual_iri;
- select id_to_iri (O) into src from DB.DBA.RDF_QUAD where
- S = iri_to_id (_object, 0) and P = iri_to_id ('http://bblfish.net/work/atom-owl/2006-06-06/#src', 0);
- http (sprintf ('<div id="x_content"><iframe src="%s" width="100%%" height="100%% frameborder="0"><p>Your browser does not support iframes.</p></iframe></div><br/>', src));
- }
- else if (http_mime_type (_url) like 'image/%')
+ if (http_mime_type (_url) like 'image/%')
http (sprintf ('<a class="uri" %s href="%s"><img src="%s" height="160" style="border-width:0" alt="External Image" /></a>', rdfa, b3s_http_url (_url, sid, _from), _url));
else
{
- usual_iri:;
- declare lbl, vlbl any;
+ declare lbl any;
lbl := '';
if ((registry_get ('fct_desc_value_labels') = '1' or registry_get ('fct_desc_value_labels') = 0) and (__tag (_object) = 243 or (isstring (_object) and __box_flags (_object) = 1)))
- lbl := b3s_label (_url, langs, 1);
+ lbl := b3s_label (_url, langs);
if ((not isstring(lbl)) or length (lbl) = 0)
lbl := b3s_uri_curie(_url);
- -- XXX: must encode as wide label to print correctly
+ -- XXX: must encode as wide label to print correctly
--http (sprintf ('<a class="uri" %s href="%s">%V</a>', rdfa, b3s_http_url (_url, sid, _from), lbl));
http (sprintf ('<a class="uri" %s href="%s">', rdfa, b3s_http_url (_url, sid, _from)));
- vlbl := charset_recode (lbl, 'UTF-8', '_WIDE_');
- http_value (case when vlbl <> 0 then vlbl else lbl end);
+ http_value (charset_recode (lbl, 'UTF-8', '_WIDE_'));
http (sprintf ('</a>'));
}
--if (registry_get ('fct_sponge') = '1' and _url like 'http://%' or _url like 'https://%')
- -- http (sprintf (' <a class="uri" href="%s&sp=1"><img src="/fct/images/goout.gif" title="Sponge" border="0"/></a>',
+ -- http (sprintf (' <a class="uri" href="%s&sp=1"><img src="/fct/images/goout.gif" title="Sponge" border="0"/></a>',
-- b3s_http_url (_url, sid)));
}
@@ -765,16 +704,9 @@ again:
}
else if (__tag (_object) = 182)
{
- declare vlbl any;
http (sprintf ('<span %s>', rdfa));
_object := regexp_replace (_object, ' (http://[^ ]+) ', ' <a href="\\1">\\1</a> ', 1, null);
- vlbl := charset_recode (_object, 'UTF-8', '_WIDE_');
- if (vlbl = 0)
- vlbl := charset_recode (_object, current_charset (), '_WIDE_');
- if (vlbl = 0)
http (_object);
- else
- http_value (vlbl);
http ('</span>');
lang := '';
}
@@ -796,7 +728,7 @@ again:
else if (__tag (_object) = 225)
{
http (sprintf ('<span %s>', rdfa));
- http (charset_recode (_object, '_WIDE_', 'UTF-8'));
+ http (charset_recode (_object, '_WIDE_', 'UTF-8'));
http ('</span>');
}
else if (__tag (_object) = 238)
@@ -878,7 +810,7 @@ create procedure fct_links_hdr (in subj any, in desc_link any)
vec := fct_links_formats ();
foreach (any elm in vec) do
{
- links := links ||
+ links := links ||
sprintf ('<%s&output=%U>; rel="alternate"; type="%s"; title="Structured Descriptor Document (%s format)",', desc_link, elm[0], elm[0], elm[1]);
}
links := links || sprintf ('<%s>; rel="http://xmlns.com/foaf/0.1/primaryTopic",', subj);
@@ -897,7 +829,7 @@ create procedure fct_links_mup (in subj any, in desc_link any)
vec := fct_links_formats ();
foreach (any elm in vec) do
{
- links := links || repeat (' ', 5) ||
+ links := links || repeat (' ', 5) ||
sprintf ('<link href="%V&output=%U" rel="alternate" type="%s" title="Structured Descriptor Document (%s format)" />\n', desc_link, elm[0], elm[0], elm[1]);
}
links := links || repeat (' ', 5) || sprintf ('<link href="%V" rel="http://xmlns.com/foaf/0.1/primaryTopic" />\n', subj);
@@ -907,10 +839,10 @@ create procedure fct_links_mup (in subj any, in desc_link any)
;
create procedure
-fct_make_selector (in subj any, in sid integer)
+fct_make_selector (in subj any, in sid integer)
{
return null;
-}
+}
;
create procedure fct_make_qr_code (in data_to_qrcode any, in src_width int := 120, in src_height int := 120, in qr_scale int := 3)
@@ -1016,8 +948,8 @@ create procedure DB.DBA.SPARQL_DESC_DICT_LOD (in subj_dict any, in consts any, i
grant execute on DB.DBA.SPARQL_DESC_DICT_LOD_PHYSICAL to "SPARQL_SELECT";
grant execute on DB.DBA.SPARQL_DESC_DICT_LOD to "SPARQL_SELECT";
-create procedure b3s_lbl_order (in p any, in lbl_order_pref_id int := 0)
-{
+create procedure b3s_lbl_order (in p any)
+{
declare r int;
r := vector (
'http://www.w3.org/2000/01/rdf-schema#label',
@@ -1045,16 +977,8 @@ create procedure b3s_lbl_order (in p any, in lbl_order_pref_id int := 0)
'http://rdf.freebase.com/ns/common.topic.alias',
'http://opengraphprotocol.org/schema/title',
'http://rdf.alchemyapi.com/rdf/v1/s/aapi-schema.rdf#Name',
- 'http://poolparty.punkt.at/demozone/ont#title',
- 'http://linkedopencommerce.com/schemas/icecat/v1/hasShortSummaryDescription',
- 'http://www.openlinksw.com/schemas/googleplus#displayName'
+ 'http://poolparty.punkt.at/demozone/ont#title'
);
-
- if (lbl_order_pref_id = 1)
- -- Give skos:prefLabel precedence
- -- NLP meta-cartridges use skos:prefLabel to include a prefix identifying the meta-cartridge which identified a named entity
- r := vector_concat (vector ('http://www.w3.org/2004/02/skos/core#prefLabel'), r);
-
r := position (id_to_iri (p), r);
if (r = 0)
return 100;
diff --git a/binsrc/b3s/rdfdesc/description.vsp b/binsrc/b3s/rdfdesc/description.vsp
index 8117da3..91788bb 100644
--- a/binsrc/b3s/rdfdesc/description.vsp
+++ b/binsrc/b3s/rdfdesc/description.vsp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html
- xmlns="http://www.w3.org/1999/xhtml"
- xml:lang="en"
+<html
+ xmlns="http://www.w3.org/1999/xhtml"
+ xml:lang="en"
version="XHTML+RDFa 1.0"
xmlns:addthis="http://www.addthis.com/help/api-spec"
xmlns:fb="http://www.facebook.com/2008/fbml"
@@ -10,12 +10,12 @@
<?vsp
--
--
--- $Id: description.vsp,v 1.1.2.67 2012/03/15 16:35:35 source Exp $
+-- $Id: description.vsp,v 1.1.2.40 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -31,74 +31,60 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
--
-
---
--- Registry keys:
---
--- fct_timeout_max - anytime query timeout for producing this page
--- fct_addthis_key - addthis.com API key
--- fct_license_text - markup designating a license for content on site
---
-
-
- declare _S, odd_position any;
- declare page_resource_uri, proxy_iri, rdf_link, label, vlbl, _subject any;
- declare white_page, arr, data, meta, h1, h2, inx, gr, host, refr, sid, inf, sas, langs, best_q any;
- declare urilookup integer;
- declare dbg_enable varchar;
- declare qry_str varchar;
- declare dbg_out any;
- declare inf_parm varchar;
+ declare _S, odd_position any;
+ declare page_resource_uri, proxy_iri, rdf_link, label, true_label, _subject any;
+ declare white_page, arr, data, meta, h1, h2, inx, gr, host, refr, sid, inf, sas, langs, best_q any;
+ declare urilookup integer;
+ declare dbg_enable varchar;
+ declare qry_str varchar;
+ declare dbg_out any;
+ declare inf_parm varchar;
declare ses_parms varchar;
declare all_langs, lang_parm any;
- declare c_iri, iri_type, iri_type_label, iri_uri, _F, _from, topof varchar;
+ declare c_iri, iri_type, iri_uri, _F, _from, topof varchar;
declare page, n_per_page, lim, ofs, dis_next int;
declare vis, printed, _skip, _last int;
declare all_lang any;
declare curr_pred any;
- declare dt1, dt2, count_str, tbinf, tbsas, ua, doc, sp_mode, sp_accept varchar;
- declare c_iri_a any;
+ declare dt1, dt2, count_str, tbinf, tbsas, ua, doc varchar;
- declare continue handler for sqlstate 'S1TAT';
- set result_timeout = atoi (registry_get ('fct_timeout_max'));
n_per_page := 100;
dis_next := 0;
- dbg_enable := get_keyword ('dbg', params);
- if (dbg_enable = '1')
- {
+ dbg_enable := get_keyword ('dbg', params);
+ if (dbg_enable = '1')
+ {
dbg_printf ('Enabling b3s session debug.\n');
connection_set ('b3s_dbg', 1);
dbg_out := string_output ();
- }
- else connection_set ('b3s_dbg',0);
-
+ }
+ else connection_set ('b3s_dbg',0);
+
connection_set ('ns_ctr', 1); /* for unknown xmlns to print in RDFa */
white_page := 1;
sid := null;
inf := '';
iri_type := 'unknown';
- sp_mode := 'add';
b3s_handle_ses (path, lines, params);
sid := connection_get ('sid');
- b3s_parse_inf (sid, params);
- inf := b3s_render_inf_clause ();
+ b3s_parse_inf (sid, params);
+ inf := b3s_render_inf_clause ();
tbinf := connection_get ('inf');
tbsas := connection_get ('sas');
if (tbinf is not null)
tbinf := sprintf ('TABLE OPTION (WITH \'%s\')', tbinf);
else
tbinf := '';
-
+
if (tbsas is not null)
tbsas := '';
else
tbsas := '';
-
-
+
+
--
-- Get AddthisKey from registry
--
@@ -113,10 +99,10 @@
ses_parms := b3s_render_ses_params ();
- host := http_request_header (http_request_header (), 'X-Forwarded-Host', null, null);
+ host := http_request_header (http_request_header (), 'X-Forwarded-Host', null, null);
if (host is null)
- host := http_request_header (http_request_header (), 'Host');
- langs := http_request_header_full (lines, 'Accept-Language', 'en');
+ host := http_request_header (http_request_header (), 'Host');
+ langs := http_request_header_full (lines, 'Accept-Language', 'en');
ua := http_request_header (lines, 'User-Agent');
all_langs := b3s_get_lang_acc (lines);
lang_parm := get_keyword ('lang', params, '');
@@ -125,62 +111,55 @@
all_langs := vector (lang_parm, 1.0);
langs := lang_parm;
}
- gr := get_keyword ('g', params, '');
+ gr := get_keyword ('g', params, '');
_from := get_keyword ('graph', params, '');
- -- dbg_obj_print_vars (gr, _F);
+-- dbg_obj_print_vars (gr, _F);
if (length (_from))
_F := concat ('FROM <', _from, '>');
else
_F := '';
-
- page := null;
-
_last := atoi (get_keyword ('lp', params, '0'));
- if ({?'prev'} is not null)
+ if ({?'prev'} is not null)
page := atoi (get_keyword ('op', params, '0'));
- else if ({?'first'} is not null)
- page := 0;
- else if ({?'last'} is not null)
+ else if ({?'first'} is not null)
+ page := 0;
+ else if ({?'last'} is not null)
page := _last;
- else if ({?'next'} is not null)
+ else if ({?'next'} is not null)
page := atoi (get_keyword ('p', params, '0'));
- else if ({?'go'} is not null)
+ else if ({?'go'} is not null)
page := atoi (get_keyword ('gp', params, '1')) - 1;
- else
+ else
page := atoi (get_keyword ('p', params, '1')) - 1;
--topof := '';
b3s_dbg_out (dbg_out, 'sid : ' || sid);
b3s_dbg_out (dbg_out, 'gr : ' || gr);
- arr := rfc1808_parse_uri (gr);
+ arr := rfc1808_parse_uri (gr);
- if (arr[0] = '' and arr[1] = '' and arr[2] <> '')
- gr := 'http://' || gr;
+ if (arr[0] = '' and arr[1] = '' and arr[2] <> '')
+ gr := 'http://' || gr;
arr := rfc1808_parse_uri (gr);
arr [5] := '';
doc := vspx_uri_compose (arr);
-
- page_resource_uri := gr;
- page_resource_uri := replace (page_resource_uri, '%23', '#');
+
+ page_resource_uri := gr;
+ page_resource_uri := replace (page_resource_uri, '%23', '#');
page_resource_uri := replace (page_resource_uri, ' ', '%20');
- page_resource_uri := replace (page_resource_uri, '"', '%22');
-
- _S := page_resource_uri;
- proxy_iri := page_resource_uri;
+
+ _S := page_resource_uri;
+ proxy_iri := page_resource_uri;
b3s_dbg_out (dbg_out, 'page_resource_uri: ' || page_resource_uri);
- sp_mode := get_keyword ('sponger:get', params, 'add');
- sp_accept := get_keyword ('sponger:accept', params, '');
- if (length (sp_accept))
- sp_accept := 'define get:accept "' || sp_accept || '"';
+
if (get_keyword ('sp', params) = '1' and 0 = length (_F))
{
- DB.DBA.EXEC_AS (sprintf ('sparql define input:storage "" define get:soft "add" SELECT * from <%S> where { ?x ?y ?z . }', doc), 'SPARQL');
+ DB.DBA.EXEC_AS (sprintf ('sparql define input:storage "" define get:soft "soft" SELECT * from <%S> where { ?x ?y ?z . }', doc), 'SPARQL');
DB.DBA.VT_INC_INDEX_DB_DBA_RDF_OBJ ();
}
- else if ((get_keyword ('sr', params) is not null or get_keyword ('sponger:get', params) is not null or length (sp_accept) > 0) and 0 = length (_F))
+ else if (get_keyword ('sr', params) is not null and 0 = length (_F))
{
declare refr varchar;
if (get_keyword ('sr', params, '') = 'clean')
@@ -191,56 +170,41 @@
sparql clear graph ?:doc;
}
}
- else
- refr := atoi (get_keyword ('sr', params, '0'));
- DB.DBA.EXEC_AS (sprintf ('sparql define input:storage "" define get:refresh "%d" define get:soft "%s" %s SELECT * from <%S> where { ?x ?y ?z . }', refr, sp_mode, sp_accept, doc), 'SPARQL');
+ else
+ refr := atoi (get_keyword ('sr', params, '0'));
+ DB.DBA.EXEC_AS (sprintf ('sparql define input:storage "" define get:refresh "%d" define get:soft "soft" SELECT * from <%S> where { ?x ?y ?z . }', refr, doc), 'SPARQL');
DB.DBA.VT_INC_INDEX_DB_DBA_RDF_OBJ ();
}
-
- odd_position := 0;
- set http_charset='utf-8';
- set isolation = 'uncommitted';
-
- http_header ('Cache-Control: no-cache, must-revalidate\r\nPragma: no-cache\r\n');
- label := ''; _subject := '';
+ odd_position := 0;
+ set http_charset='utf-8';
+ set isolation = 'uncommitted';
+ http_header ('Cache-Control: no-cache, must-revalidate\r\nPragma: no-cache\r\n');
+ label := ''; _subject := '';
--qry_str := sprintf ('sparql define input:inference "facets" select ?o (lang(?o)) %s where { <%S> virtrdf:label ?o }', _F, _S);
--b3s_dbg_out (dbg_out, 'qry: ' || qry_str);
- --dbg_obj_print (qry_str);
+--dbg_obj_print (qry_str);
--exec (qry_str, null, null, vector (), 0, meta, data);
- --exec ('select __ro2sq (O), DB.DBA.RDF_LANGUAGE_OF_OBJ (__ro2sq (O)) , b3s_lbl_order (P) from RDF_QUAD table option (with ''facets'')
- -- where S = __i2id (?) and P = __i2id (''http://www.openlinksw.com/schemas/virtrdf#label'', 0) and not is_bnode_iri_id (O) order by 3',
- -- null, null, vector (_S), 0, meta, data);
-
- label := b3s_label (_S, langs);
-
- if (iswidestring (label))
- vlbl := label;
- else
- vlbl := charset_recode (label, 'UTF-8', '_WIDE_');
- if (vlbl = 0)
- vlbl := charset_recode (label, current_charset (), '_WIDE_');
- if (vlbl = 0)
- vlbl := label;
-
- b3s_dbg_out (dbg_out, 'label: "' || vlbl || '"');
+ exec ('select __ro2sq (O), DB.DBA.RDF_LANGUAGE_OF_OBJ (__ro2sq (O)) , b3s_lbl_order (P) from RDF_QUAD table option (with ''facets'')
+ where S = __i2id (?) and P = __i2id (''http://www.openlinksw.com/schemas/virtrdf#label'', 0) order by 3',
+ null, null, vector (_S), 0, meta, data);
+ label := b3s_label_get (data, langs);
+ true_label := label;
iri_type := b3s_type (_S, _F, iri_uri, c_iri);
- iri_type_label := b3s_label (c_iri, langs);
- if (iri_type_label = '') iri_type_label := iri_type;
qry_str := sprintf ('sparql %s prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> prefix dc: <http://purl.org/dc/elements/1.1/> select ?o (lang(?o)) %s where { <%S> rdfs:comment ?o }', inf, _F, _S);
-- dbg_obj_print (qry_str);
- b3s_dbg_out (dbg_out, 'qry: ' || qry_str);
+ b3s_dbg_out (dbg_out, 'qry: ' || qry_str);
- exec (qry_str, null, null, vector (), 0, meta, data);
+ exec (qry_str, null, null, vector (), 0, meta, data);
- _subject := b3s_label_get (data, langs);
+ _subject := b3s_label_get (data, langs);
- rdf_link := sprintf ('/sparql?query=%U', sprintf ('define sql:describe-mode "LOD" %s DESCRIBE <%s>', b3s_render_inf_clause(), _S));
+ rdf_link := sprintf ('/sparql?query=%U', sprintf ('define sql:describe-mode "LOD" %s DESCRIBE <%s>', b3s_render_inf_clause(), _S));
declare __res_desc, qs, qv, best_variant, accept varchar;
declare best_q, curr float;
@@ -264,7 +228,7 @@
{
best_q := curr;
best_variant := q;
- }
+ }
inx := inx + 1;
}
if (best_variant is null)
@@ -281,57 +245,31 @@
inx := inx + 1;
}
http_header (http_header_get () || '\r\n');
- return;
+ return;
}
if (best_variant is not null and best_variant not in ('text/html', 'application/xhtml+xml'))
{
http_rewrite ();
http_status_set (303);
http_header (sprintf ('TCN: choice\r\nVary: negotiate,accept\r\nLocation: http://%{WSHost}s%s&format=%U\r\n', rdf_link, best_variant));
- return;
+ return;
}
__res_desc := b3s_uri_curie(page_resource_uri);
fct_links_hdr (_S, rdf_link);
if (not length (label))
label := b3s_trunc_uri (page_resource_uri);
- if (vlbl <> 0) label := vlbl;
declare desc_resource_uri varchar;
declare desc_qr varchar;
desc_qr := sprintf ('define sql:describe-mode "CBD" DESCRIBE <%s>', page_resource_uri);
desc_resource_uri := sprintf ('http://%{WSHost}s/sparql?query=%U&format=cxml', desc_qr);
--http_flush (1);
-
- declare plink_href varchar;
-
- plink_href := sprintf ('/describe/?url=%U', page_resource_uri);
-
- if (page is not null and page > 0)
- {
- plink_href := concat (plink_href, sprintf ('&gp=%d&go=', page+1));
- }
- if (connection_get ('inf') is not null)
- {
- plink_href := concat (plink_href, sprintf ('&inf=%U', connection_get ('inf')));
- }
- if (connection_get ('sas') is not null)
- {
- plink_href := concat (plink_href, sprintf ('&sas=%U', connection_get ('sas')));
- }
-
-
?>
<head>
<base href="http://<?V host ?>/fct/rdfdesc/" />
- <title>About: <?vsp if (length (label)) http_value (label); else http_value (b3s_uri_curie (page_resource_uri));?></title>
+ <title>About: <?vsp http (label); ?></title>
<!--link rel="alternate" type="application/rdf+xml" href="<?=rdf_link?>" title="RDF" /-->
- <?vsp
- declare main_ss varchar;
- main_ss := registry_get ('fct_main_ss');
- if (not isstring (main_ss)) main_ss := 'styles/default.css';
- ?>
- <link rel="stylesheet" type="text/css" href="<?=main_ss?>" charset="utf-8" />
-
+ <link rel="stylesheet" type="text/css" href="styles/default.css" charset="utf-8" />
<link rel="stylesheet" type="text/css" href="styles/highlighter.css" charset="utf-8" />
<script type="text/javascript" >
var featureList=["tab"];
@@ -340,10 +278,10 @@
<script type="text/javascript" src="s/description.js"></script>
<?vsp fct_links_mup (_S, rdf_link); ?>
</head>
-<body about="<?V page_resource_uri ?>">
- <div id="PG">
- <div id="HD">
- <?vsp fct_desc_page_head (); ?>
+ <body about="<?V page_resource_uri ?>">
+ <div id="PG">
+ <div id="HD">
+ <?vsp fct_page_head (); ?>
<ul id="main_menu">
<?vsp if (sid is not null) { ?>
<li><a href="<?= b3s_render_fct_link() ?>">Facets</a></li>
@@ -356,7 +294,7 @@
<div id="settings_popup" style="display: none">
<ul>
<li>
- <input id="sas_ckb" type="checkbox" <?= b3s_sas_selected() ?> onchange="javascript:sas_cb();"/>
+ <input id="sas_ckb" type="checkbox" <?= b3s_sas_selected() ?> onchange="javascript:sas_cb();"/>
<label for="sas_ckb">owl:sameAs</label>
</li>
<li>
@@ -367,24 +305,15 @@
</div> <!-- settings-popup -->
</li>
</ul>
- </div> <!-- #HD -->
- <div id="MD">
- <div class="page_resource_info">
- <h2>About: <a href="<?= case when page_resource_uri like
- 'nodeID://%' then b3s_http_url (page_resource_uri) else
- page_resource_uri end ?>"><?vsp if (length(label)) http_value
- (label); else http_value(b3s_uri_curie (page_resource_uri));
- ?></a> <a class="desc_sponge_link"
- href="/describe/?url=<?U page_resource_uri ?><?= case when sid is
- not null then '&sid=' || sid end ?>&sponger:get=add"
- title="Click to generate local descriptor data for this entity"
- id="sp_link" rel="nofollow">Sponge</a> <a class="desc_permalink" href="<?= plink_href ?>">Permalink</a></h2>
- <div class="ds_inf_info">
- An Entity of Type : <a href="<?V iri_uri ?>"><?V iri_type_label ?></a>,
+ </div> <!-- #HD -->
+ <div id="MD">
+ <div class="page_resource_info">
+ <h2>About: <a href="<?= case when page_resource_uri like 'nodeID://%' then b3s_http_url (page_resource_uri) else page_resource_uri end ?>"><?vsp http (label); ?></a> <a href="/describe/?url=<?U page_resource_uri ?>&sid=<?V sid ?>&sr=clean" title="Click to generate local descriptor data for this entity" id="sp_link" rel="nofollow"><img src="/fct/images/sponge.png" title="Click to generate local descriptor data for this entity" alt="Generate local descriptor data" /></a></h2>
+ <div class="ds_inf_info">
+ An Entity of Type : <a href="<?V iri_uri ?>"><?V iri_type ?></a>,
within Data Space : <a href="http://<?V host ?>"><?V host ?></a><br/>
-<?vsp
+<?vsp
declare _ciri varchar;
- declare num_types int;
if (c_iri = 'http://www.w3.org/2000/01/rdf-schema#Class' or c_iri = 'http://www.w3.org/2002/07/owl#Class') {
_ciri := page_resource_uri;
@@ -393,44 +322,20 @@
_ciri := c_iri;
}
- if ('unknown' <> iri_type)
- {
+ if (sid) {
?>
- <form id="fct_form" action="/fct/facet.vsp" method="get">
- <label for="c_iri_sel">Type:</label>
-<?vsp
- if (sid)
- {
-?>
- <input type="hidden" name="sid" value="<?V sid ?>"/>
- <input type="hidden" name="cmd" value="set_class"/>
-<?vsp
- num_types := b3s_render_iri_select (_S, _F, 'name="iri" id="c_iri_sel"');
- if (num_types) {
-?>
- <button class="fct_sel_as_type"
- title="Add class constraint in current facet session">Constrain facet</button>
+ <a class="fct_sel_as_type"
+ title="Use as class in facets"
+ href="/fct/facet.vsp?sid=<?V sid ?>&cmd=set_class&iri=<?/ _ciri ?>">Constrain facet on this type</a>
+
+<?vsp
+ } else { ?>
+ <a class="fct_sel_as_type"
+ title="Start new facet session with type"
+ href="/fct/facet.vsp?cmd=new_with_class&iri=<?/ _ciri ?>">Start faceted browsing from this Type</a>
<?vsp
- }
- }
- else
- {
-?>
- <input type="hidden" name="cmd" value="new_with_class"/>
-<?vsp
- num_types := b3s_render_iri_select (_S, _F, 'name="iri" id="c_iri_sel"');
- if (num_types) {
-?>
- <button class="fct_sel_as_type"
- title="Start new facet session with type">Start faceted browsing</button>
-<?vsp
- }
- }
-?>
- </form>
-<?vsp
- }
+ }
declare qrimg any;
qrimg := fct_make_qr_code (fct_make_curie ('http://' || host || b3s_http_url (page_resource_uri), lines));
if (qrimg is not null and strcasestr (ua, 'Mobile') is null) {
@@ -438,23 +343,23 @@
<img id="qrcode" alt="QRcode image" src="data:image/jpg;base64,<?V qrimg ?>"/>
<?vsp } ?>
</div>
- </div>
-<?vsp
-if (_subject <> '') {
+ </div>
+<?vsp
+if (_subject <> '') {
?>
- <p class="subj_desc"><?vsp http (sprintf ('%s', _subject)); ?></p>
-<?vsp
-} else {
+ <p class="subj_desc"><?vsp http (sprintf ('%s', _subject)); ?></p>
+<?vsp
+} else {
?>
<p class="subj_delim"></p>
-<?vsp
-}
+<?vsp
+}
?>
<!-- <li><a href="/fct/facet.vsp?sid=<?V sid ?>&cmd=set_class&iri=<?V gr ?>">Choose <?V ''?> as Type</a></li>
<li><a href="/fct/facet.vsp?sid=<?V sid ?>&cmd=open_property">Choose <?V ''?> as Property (p)</a></li>
- <li><a href="">Choose <?V ''?> as Value (o)</a></li>-->
+ <li><a href="">Choose <?V ''?> as Value (o)</a></li> -->
<!-- proptable -->
- <table class="description">
+ <table class="description">
<?vsp
@@ -467,7 +372,7 @@ if (_subject <> '') {
_skip := n_per_page * page;
if (length (_F) or 1 = sys_stat ('cl_run_local_only'))
- {
+ {
dt1 := sprintf ('select id_to_iri ("p") as PRED, __ro2sq ("o") as OBJECT LONG VARCHAR, 0 as FLAG int from (sparql %s define output:valmode "LONG" select distinct ?p ?o %s where { <%S> ?p ?o } order by 1) sp1', inf, _F, _S);
}
else
@@ -480,7 +385,7 @@ if (_subject <> '') {
qry_str := sprintf ('select %s PRED, OBJECT, FLAG from (%s UNION ALL %s) un0', topof, dt1, dt2);
--dbg_printf ('%s', qry_str);
if (_last = 0)
- {
+ {
if (length (_F) or 1 = sys_stat ('cl_run_local_only'))
{
dt1 := sprintf ('select count(*) as cnt from (sparql %s define output:valmode "LONG" select distinct ?p ?o %s where { <%S> ?p ?o } order by 1) sp1', inf, _F, _S);
@@ -493,25 +398,19 @@ if (_subject <> '') {
count_str := sprintf ('select sum (cnt) from (%s UNION ALL %s) un0', dt1, dt2);
--dbg_printf ('%s', count_str);
exec (count_str, null, null, vector (), 0, meta, data);
- if (length (data) and length (data[0]))
- _last := data[0][0]; -- sum is supposed to have always number
- else
- _last := n_per_page;
+ _last := data[0][0]; -- sum is supposed to have always number
_last := _last / n_per_page;
}
-
- exec (qry_str, null, null, vector (), 0, null, null, h1);
+
+ exec (qry_str, null, null, vector (), 0, null, null, h1);
curr_pred := '';
inx := 0;
- data := null;
- while (0 = exec_next (h1, null, null, data))
+ while (0 = exec_next (h1, null, null, data))
{
declare PRED, OBJECT, FLAG any;
--if (inx <= _skip)
-- goto nxt1;
- if (length (data) < 3)
- goto skip;
- pred := data[0];
+ pred := data[0];
object := data[1];
FLAG := data[2];
if (not length (PRED))
@@ -526,7 +425,6 @@ if (_subject <> '') {
vis := b3s_http_print_r (OBJECT, sid, PRED, langs, 1, all_langs, _from);
nxt1:;
inx := inx + 1;
- skip:;
}
exec_close (h1);
if (curr_pred <> '') http ('</ul></td></tr>');
@@ -534,7 +432,7 @@ if (_subject <> '') {
if (inx < n_per_page)
dis_next := 1;
- if (odd_position = 0)
+ if (odd_position = 0)
{
http_request_status ('HTTP/1.1 404 Not found');
http ('<tr><td colspan="2"><p>No further information is available.</p></td></tr>');
@@ -556,19 +454,19 @@ if (_subject <> '') {
<input type="hidden" name="sid" value="<?V sid ?>"/>
<?vsp } ?>
<input type="hidden" name="lp" value="<?V _last ?>"/>
- <?vsp if (topof <> '' and _last > 0) { if (1 or page > 0) { ?>
+ <?vsp if (topof <> '' and _last > 0) { if (1 or page > 0) { ?>
<button type="submit" value="" name="first" <?vsp if (page <= 0) { http ('disabled="disabled"'); } ?>>◂◂ First</button>
<input type="hidden" name="op" value="<?V page - 1 ?>"/>
<button type="submit" value="" name="prev" <?vsp if (page <= 0) { http ('disabled="disabled"'); } ?>>◂ Prev</button>
- <?vsp } if (1 or not dis_next) { ?>
+ <?vsp } if (1 or not dis_next) { ?>
<button type="submit" value="" name="next" <?vsp if (dis_next) { http ('disabled="disabled"'); } ?>>Next ▸</button>
<button type="submit" value="" name="last" <?vsp if (dis_next) { http ('disabled="disabled"'); } ?>>Last ▸▸</button>
Page <?V page + 1 ?> of <?V _last + 1 ?>
- <input type="text" value="<?V page + 1 ?>" size="5" name="gp" />
+ <input type="text" value="<?V page + 1 ?>" size="5" name="gp" />
<button type="submit" value="" name="go">Go</button>
<?vsp } } ?>
</div>
@@ -589,11 +487,11 @@ if (_subject <> '') {
</div>
<script type="text/javascript">
/*<![CDATA[*/
- var addthis_config = {"data_track_clickback":true, ui_cobrand:"Virtuoso"};
+ var addthis_config = {"data_track_clickback":true; ui_cobrand:"Virtuoso"};
var addthis_share = { url_transforms : { clean: true, remove: ['sid'] } };
/*]]>*/
</script>
- <script type="text/javascript">
+ <script type="text/javascript">
var fb_like_id = document.getElementById('fb_like_id');
if (fb_like_id) fb_like_id.setAttribute('fb:like:layout', 'button_count');
var g_plusone_id = document.getElementById('g_plusone_id');
@@ -605,39 +503,41 @@ if (_subject <> '') {
<?vsp } ?>
<div id="ft_t">
Alternative Linked Data Views:
- <?vsp if (VAD_CHECK_VERSION ('PivotViewer') is not null) { ?>
- <a href="/PivotViewer/?url=<?vsp http_url (desc_resource_uri); ?>" title="PivotViewer page for exploring results and generating new queries" target="_blank">PivotViewer</a>
+ <?vsp if (VAD_CHECK_VERSION ('PivotViewer') is not null) { ?>
+ <a href="/PivotViewer/?url=<?vsp http_url (desc_resource_uri); ?>" title="PivotViewer page for exploring results and generating new queries" target="_blank">PivotViewer</a>
|
<?vsp } ?>
- <?vsp if (VAD_CHECK_VERSION ('rdf_mappers') is not null) { ?>
- <a href="<?vsp http (rdfdesc_http_url (page_resource_uri)); ?>" target="_blank">Sponger</a>
+ <?vsp if (VAD_CHECK_VERSION ('rdf_mappers') is not null) { ?>
+ <a href="<?vsp http (rdfdesc_http_url (page_resource_uri)); ?>" target="_blank">Sponger</a>
|
<?vsp } ?>
- <?vsp if (VAD_CHECK_VERSION ('iSPARQL') is not null) { ?>
- <a href="/isparql/view/?query=<?vsp http_url (desc_qr); ?>&resultview=browser" title="Interactive Query By Example oriented SPARQL UI" target="_blank">iSPARQL</a>
+ <?vsp if (VAD_CHECK_VERSION ('iSPARQL') is not null) { ?>
+ <a href="/isparql/view/?query=<?vsp http_url (desc_qr); ?>&resultview=browser" title="Interactive Query By Example oriented SPARQL UI" target="_blank">iSPARQL</a>
|
<?vsp } ?>
- <a href="http://linkeddata.uriburner.com/ode/?uri=<?vsp http_url (page_resource_uri); ?>" title="Basic navigation and exploration" target="_blank">ODE</a>
-
+ <a href="http://linkeddata.uriburner.com/ode/?uri=<?vsp http_url (page_resource_uri); ?>" title="Basic navigation and exploration" target="_blank">ODE</a>
+
Raw Data in:
<a href="<?=rdf_link || sprintf ('&output=%U', 'text/cxml')?>">CXML</a> |
<a href="<?=rdf_link || sprintf ('&output=%U', 'text/csv')?>">CSV</a> | RDF (
<a href="<?=rdf_link || sprintf ('&output=%U', 'text/plain') ?>">N-Triples</a>
<a href="<?=rdf_link || sprintf ('&output=%U', 'text/rdf+n3') ?>">N3/Turtle</a>
- <a href="<?=rdf_link || sprintf ('&output=%U', 'application/rdf+json')?>">JSON</a>
+ <a href="<?=rdf_link || sprintf ('&output=%U', 'application/rdf+json')?>">JSON</a>
<a href="<?=rdf_link || sprintf ('&output=%U', 'application/rdf+xml') ?>">XML</a> ) | OData (
- <a href="<?=rdf_link || sprintf ('&output=%U', 'application/atom+xml')?>">Atom</a>
+ <a href="<?=rdf_link || sprintf ('&output=%U', 'application/atom+xml')?>">Atom</a>
<a href="<?=rdf_link || sprintf ('&output=%U', 'application/odata+json')?>">JSON</a> ) | Microdata (
<a href="<?=rdf_link || sprintf ('&output=%U', 'application/microdata+json') ?>">JSON</a>
- <a href="<?=rdf_link || sprintf ('&output=%U', 'text/html') ?>">HTML</a>) |
- <a href="<?=rdf_link || sprintf ('&output=%U', 'application/ld+json')?>">JSON-LD</a>
+ <a href="<?=rdf_link || sprintf ('&output=%U', 'text/html') ?>">HTML</a>) |
+ <a href="<?=rdf_link || sprintf ('&output=%U', 'application/ld+json')?>">JSON-LD</a>
<a href="/fct/facet_doc.html">About</a>
</div> <!-- #ft_t -->
<div id="ft_b">
<a href="http://linkeddata.org/"><img alt="This material is Open Knowledge" src="/fct/images/LoDLogo.gif" style="border-width:0"/></a>
<a href="http://dbpedia.org/sparql"><img alt="W3C Semantic Web Technology" src="/fct/images/sw-sparql-blue.png" style="border-width:0"/></a>
<a href="<?=rdf_link?>" title="RDF data"><img src="/fct/images/sw-rdf-blue.png" alt="[RDF Data]" style="border-width:0"/></a>
-
+ <a href="http://www.opendefinition.org/"><img alt="This material is Open Knowledge" src="/fct/images/od_80x15_red_green.png" style="border-width:0"/></a>
+ <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0"
+ src="/fct/images/creativecommons.png" /></a>
<span about=""
resource="http://www.w3.org/TR/rdfa-syntax"
rel="dc:conformsTo" xmlns:dc="http://purl.org/dc/terms/">
@@ -646,18 +546,10 @@ if (_subject <> '') {
alt="Valid XHTML + RDFa" height="27" /></a>
</span>
<br />
- <?vsp fct_virt_info (); ?><br />
- <?vsp
- declare license_text varchar;
- license_text := registry_get ('fct_license_text');
-
- if (license_text) {
- http(license_text);
- }
-
- ?>
- Data on this page belongs to its respective rights holders.<br/>
- Virtuoso Faceted Browser Copyright © 2009-2012 OpenLink Software
+ This work is licensed under a
+ <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</a>.<br />
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2011 OpenLink Software
</div> <!-- #ft_b -->
</div> <!-- #FT -->
</div> <!-- #PG -->
@@ -667,5 +559,5 @@ if (_subject <> '') {
<div class="form_row"><label for=""></label><input type="text" class="prop_val_lo"/></div><br/>
<div class="form_row"><label for=""></label><input type="text" class="prop_val_hi"/></div>
</div -->
- </body>
+ </body>
</html>
diff --git a/binsrc/b3s/rdfdesc/settings.vsp b/binsrc/b3s/rdfdesc/settings.vsp
index 0773fd8..618c5f6 100644
--- a/binsrc/b3s/rdfdesc/settings.vsp
+++ b/binsrc/b3s/rdfdesc/settings.vsp
@@ -1,7 +1,7 @@
<?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">
-<?vsp
+<?vsp
declare host,gr,page_resource_uri,_S varhar;
declare sid,ses_parms varchar;
declare arr any;
@@ -14,10 +14,10 @@
page_resource_uri := gr;
page_resource_uri := replace (page_resource_uri, '%23', '#');
+
+ _S := page_resource_uri;
- _S := page_resource_uri;
-
- host := http_request_header (http_request_header (), 'Host');
+ host := http_request_header (http_request_header (), 'Host');
b3s_handle_ses (path, lines, params);
sid := connection_get ('sid');
@@ -40,11 +40,11 @@
<body>
<div id="PG">
<div id="HD">
- <?vsp fct_desc_page_head (); ?>
+ <?vsp fct_page_head (); ?>
<ul id="main_menu">
<?vsp if (sid is not null) { ?>
<li><a href="<?= b3s_render_fct_link() ?>">Facets</a></li>
- <?vsp } ?>
+ <?vsp } ?>
<li id="mnu_descr"><a href="/describe/?uri=<?U _S ?><?V ses_parms ?>">Description</a></li>
<li id="mnu_usage" class="sel">
<a href="usage.vsp?g=<?U _S ?><?V ses_parms ?>">Metadata</a>
@@ -74,10 +74,10 @@
<div id="ft_t">
</div> <!-- #ft_t -->
<div id="ft_b">
- <?vsp fct_virt_info (); ?><br />
- Copyright © 2009-2012 OpenLink Software | <a href="/fct/facet_doc.html">About</a>
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2011 OpenLink Software | <a href="/fct/facet_doc.html">About</a>
</div> <!-- #ft_b -->
</div> <!-- #FT -->
</div> <!-- #PG -->
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/binsrc/b3s/rdfdesc/usage.vsp b/binsrc/b3s/rdfdesc/usage.vsp
index fc1935f..ebf94b9 100644
--- a/binsrc/b3s/rdfdesc/usage.vsp
+++ b/binsrc/b3s/rdfdesc/usage.vsp
@@ -1,8 +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"
+<html
+ xmlns="http://www.w3.org/1999/xhtml"
+ xml:lang="en"
lang="en"
xmlns:addthis="http://www.addthis.com/help/api-spec"
xmlns:fb="http://www.facebook.com/2008/fbml"
@@ -10,12 +10,12 @@
<?vsp
--
--
--- $Id: usage.vsp,v 1.1.2.26 2012/03/05 17:38:05 source Exp $
+-- $Id: usage.vsp,v 1.1.2.21 2011/10/26 15:38:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -32,17 +32,17 @@
--
--
- declare _S, odd_position any;
- declare page_resource_uri, proxy_iri, rdf_link, label, _subject any;
- declare white_page, arr, data, meta, h1, h2, inx, gr, host, refr, sid, inf, langs, best_q, tp any;
- declare orig_refr varchar;
- declare urilookup integer;
- declare dbg_enable varchar;
- declare dbg_out any;
+ declare _S, odd_position any;
+ declare page_resource_uri, proxy_iri, rdf_link, label, _subject any;
+ declare white_page, arr, data, meta, h1, h2, inx, gr, host, refr, sid, inf, langs, best_q, tp any;
+ declare orig_refr varchar;
+ declare urilookup integer;
+ declare dbg_enable varchar;
+ declare dbg_out any;
declare inf_rule varchar;
declare ses_parms varchar;
- white_page := 1;
+ white_page := 1;
b3s_handle_ses (path, lines, params);
@@ -60,66 +60,63 @@
if (not isstring(_addthis_key)) _addthis_key := '0';
if ('1' = _addthis_key) _addthis_key := 'xa-4ce13e0065cdadc0';
- -- side-effect sets connection vars 'inf' and 'sas' - val or null
+ -- side-effect sets connection vars 'inf' and 'sas' - val or null
- b3s_parse_inf (sid, params);
+ b3s_parse_inf (sid, params);
- inf := b3s_render_inf_clause ();
+ inf := b3s_render_inf_clause ();
inf_rule := connection_get ('inf');
if (inf_rule is null) { inf_rule := 'b3sifp'; }
ses_parms := b3s_render_ses_params();
- host := http_request_header (http_request_header (), 'Host');
- langs := http_request_header_full (lines, 'Accept-Language', 'en');
- gr := get_keyword ('g', params, '');
- arr := rfc1808_parse_uri (gr);
+ host := http_request_header (http_request_header (), 'Host');
+ langs := http_request_header_full (lines, 'Accept-Language', 'en');
+ gr := get_keyword ('g', params, '');
+ arr := rfc1808_parse_uri (gr);
+ if (arr[0] = '' and arr[1] = '' and arr[2] <> '')
+ gr := 'http://' || gr;
- if (arr[0] = '' and arr[1] = '' and arr[2] <> '')
- gr := 'http://' || gr;
+ page_resource_uri := gr;
+ page_resource_uri := replace (page_resource_uri, '%23', '#');
- page_resource_uri := gr;
- page_resource_uri := replace (page_resource_uri, '%23', '#');
+ _S := page_resource_uri;
- _S := page_resource_uri;
+ proxy_iri := page_resource_uri;
- proxy_iri := page_resource_uri;
+ odd_position := 0;
+ set http_charset='utf-8';
+ set isolation = 'uncommitted';
+ http_header ('Cache-Control: no-cache, must-revalidate\r\nPragma: no-cache\r\n');
+ label := ''; _subject := '';
- odd_position := 0;
- set http_charset='utf-8';
- set isolation = 'uncommitted';
- http_header ('Cache-Control: no-cache, must-revalidate\r\nPragma: no-cache\r\n');
- label := ''; _subject := '';
-
- exec (sprintf ('sparql define input:inference "facets" select ?o (lang(?o)) where { <%S> virtrdf:label ?o }', _S),
+ exec (sprintf ('sparql define input:inference "facets" select ?o (lang(?o)) where { <%S> virtrdf:label ?o }', _S),
null, null, vector (), 0, meta, data);
- label := b3s_label_get (data, langs);
+ label := b3s_label_get (data, langs);
- exec (sprintf ('sparql %s prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> prefix dc: <http://purl.org/dc/elements/1.1/>
- select ?o (lang(?o)) where { <%S> rdfs:comment ?o }', inf, _S), null, null, vector (), 0, meta, data);
- _subject := b3s_label_get (data, langs);
+ exec (sprintf ('sparql %s prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> prefix dc: <http://purl.org/dc/elements/1.1/>
+ select ?o (lang(?o)) where { <%S> rdfs:comment ?o }', inf, _S), null, null, vector (), 0, meta, data);
+ _subject := b3s_label_get (data, langs);
- rdf_link := sprintf ('/sparql?query=%U', sprintf ('define sql:describe-mode "LOD" %s DESCRIBE <%s>', b3s_render_inf_clause(), _S));
+ rdf_link := sprintf ('/sparql?query=%U', sprintf ('define sql:describe-mode "LOD" %s DESCRIBE <%s>', b3s_render_inf_clause(), _S));
declare __res_desc varchar;
__res_desc := b3s_uri_curie(page_resource_uri);
-
if (not length (label))
label := page_resource_uri;
+ tp := atoi (get_keyword ('tp', params, '1'));
- tp := atoi (get_keyword ('tp', params, '1'));
+ dbg_enable := get_keyword ('dbg', params);
- dbg_enable := get_keyword ('dbg', params);
-
- if (dbg_enable = '1')
- {
- dbg_printf ('Enabling b3s session debug.\n');
- connection_set ('b3s_dbg', 1);
- dbg_out := string_output ();
- }
- else connection_set ('b3s_dbg',0);
+ if (dbg_enable = '1')
+ {
+ dbg_printf ('Enabling b3s session debug.\n');
+ connection_set ('b3s_dbg', 1);
+ dbg_out := string_output ();
+ }
+ else connection_set ('b3s_dbg',0);
declare desc_resource_uri varchar;
declare desc_qr varchar;
@@ -142,11 +139,11 @@
</head>
<body class="usage_page">
<div id="HD">
- <?vsp fct_desc_page_head (); ?>
+ <?vsp fct_page_head (); ?>
<ul id="main_menu">
<?vsp if (sid is not null) { ?>
<li><a href="<?= b3s_render_fct_link() ?>">Facets</a></li>
- <?vsp } ?>
+ <?vsp } ?>
<li id="mnu_descr"><a href="/describe/?uri=<?U page_resource_uri ?><?V ses_parms ?>">Description</a></li>
<li id="mnu_usage" class="sel">
<a href="#" class="sel">Metadata</a>
@@ -158,43 +155,34 @@
<div id="MD">
<div class="page_resource_info">
<h2>Usage stats on <a href="<?= case when page_resource_uri like 'nodeID://%' then b3s_http_url (page_resource_uri) else page_resource_uri end ?>">
- <?vsp http (sprintf ('%s', label)); ?></a></h2> <a class="desc_permalink" href="usage.vsp?g=<?U page_resource_uri ?>">Permalink</a>
+ <?vsp http (sprintf ('%s', label)); ?></a></h2>
<p> an Entity in Data Space: <a href="http://<?V host ?>"><?V host ?></a></p>
</div>
<div class="subj_nav">
<?vsp if (_subject <> '') { ?>
<p class="subj_desc"><?vsp http (sprintf ('%s', _subject)); ?></p>
<?vsp } ?>
- <?vsp
- declare qrimg, ua, qrd any;
- qrd := HTTP_REQUESTED_URL () || '?' || http_request_get ('QUERY_STRING');
- ua := http_request_header (lines, 'User-Agent');
- qrimg := fct_make_qr_code (fct_make_curie (qrd, lines));
- if (qrimg is not null and strcasestr (ua, 'Mobile') is null) {
- ?>
- <img id="qrcode" alt="QRcode image" src="data:image/jpg;base64,<?V qrimg ?>"/>
- <?vsp } ?>
</div> <!-- .subj_nav -->
<!-- proptable -->
<div id="TAB_ROW">
- <div class="tab <?vsp http (case when tp = 1 then ' tab_selected' else '' end); ?>">
+ <div class="tab <?vsp http (case when tp = 1 then ' tab_selected' else '' end); ?>">
<a href="<?V http_path () ?>?g=<?U _S ?>&tp=1<?V ses_parms ?>">Source Graphs</a>
- </div>
- <div class="tab <?vsp http (case when tp = 2 then ' tab_selected' else '' end); ?>">
+ </div>
+ <div class="tab <?vsp http (case when tp = 2 then ' tab_selected' else '' end); ?>">
<a href="<?V http_path () ?>?g=<?U _S ?>&tp=2<?V ses_parms ?>">Referenced by Graphs</a>
- </div>
- <div class="tab <?vsp http (case when tp = 3 then ' tab_selected' else '' end); ?>">
- <a title="A list of other identifiers for the current entity."
+ </div>
+ <div class="tab <?vsp http (case when tp = 3 then ' tab_selected' else '' end); ?>">
+ <a title="A list of other identifiers for the current entity."
href="<?V http_path () ?>?g=<?U _S ?>&tp=3<?V ses_parms ?>">Direct coreferences</a>
- </div>
- <div class="tab <?vsp http (case when tp = 4 then ' tab_selected' else '' end); ?>">
- <a title="A list of indirect identifiers for the current entity based on Inverse Functional Property values."
+ </div>
+ <div class="tab <?vsp http (case when tp = 4 then ' tab_selected' else '' end); ?>">
+ <a title="A list of indirect identifiers for the current entity based on Inverse Functional Property values."
href="<?V http_path () ?>?g=<?U _S ?>&tp=4<?V ses_parms ?>">Indirect coreferences</a>
- </div>
- </div> <!-- TAB_ROW -->
+ </div>
+ </div> <!-- TAB_ROW -->
- <div id="TAB_CTR">
+ <div id="TAB_CTR">
<div class="tab_page">
<table class="description">
<?vsp
@@ -212,7 +200,7 @@
if (tp = 3) -- Expanded sas
{
qr := sprintf ('sparql select ?syn (sql:rnk_scale (<LONG::IRI_RANK> (?syn))) where {{ select ?s ?syn where {{?syn owl:sameAs ?s } union {?s owl:sameAs ?syn}}} option (transitive, t_distinct, t_min (0), T_in (?s), t_out (?syn)) . filter (!isliteral (?syn) && ?s = <%S> ) } order by desc 2 limit 20', _S);
- http (sprintf ('<tr><th>%s</th><th>Rank</th></tr>\n',
+ http (sprintf ('<tr><th>%s</th><th>Rank</th></tr>\n',
'Identifier (URI)'
--fct_s_term ()
));
@@ -225,28 +213,28 @@
b3s_dbg_out(dbg_out, qr);
- exec (qr, null, null, vector (), 0, null, null, h1);
- while (0 = exec_next (h1, null, null, data))
+ exec (qr, null, null, vector (), 0, null, null, h1);
+ while (0 = exec_next (h1, null, null, data))
{
http ('<tr>');
if (tp = 1 or tp = 2)
- {
+ {
--for (declare i, l int, i := 0, l := length (data); i < l; i := i + 1)
-- {
-- http_value (data[i], 'td');
- -- }
+ -- }
if (exists (select 1 from RDF_QUAD where G = iri_to_id ('http://lod.openlinksw.com/void/') and
S = iri_to_id (sprintf ('http://lod.openlinksw.com/void/%s/Dataset', rtrim (data[0], '/#')))))
http (sprintf ('<td><a href="http://lod.openlinksw.com/void/%s/Dataset">%V</a></td>', rtrim (data[0], '/#'), data[0]));
else
http (sprintf ('<td>%V</td>', data[0]));
http (sprintf ('<td align="right">%d</td>', data[1]));
- }
+ }
else if (tp = 3)
{
http (sprintf ('<td><a href="/describe/?url=%U%s">%V</a></td>', data[0], b3s_render_ses_params(), b3s_uri_curie (data[0])));
http (sprintf ('<td align="right">%.6g</td>', data[1]));
- }
+ }
else if (tp = 4)
{
http (sprintf ('<td><a href="/describe/?url=%U%s">%V</a></td>', data[0], b3s_render_ses_params(), b3s_uri_curie (data[0])));
@@ -259,26 +247,26 @@
if (__tag (data[2]) = 246)
tmp := __rdf_sqlval_of_obj (data[2], 1);
else
- tmp := data[2];
+ tmp := data[2];
if (isstring (tmp))
http ('<td>' || tmp || '</td>');
- else
+ else
http_value (tmp, 'td');
- }
+ }
http (sprintf ('<td align="right">%.06g</td>', cast (data[3] as decimal)));
--http (sprintf ('<td align="right">%s</td>', data[3]));
- }
+ }
http ('</tr>\n');
}
exec_close (h1);
?>
- </table>
+ </table>
</div> <!-- .tab_page -->
- </div> <!-- #TAB_CTR -->
- <?vsp b3s_render_dbg_out(dbg_out); ?>
- </div> <!-- #MD -->
+ </div> <!-- #TAB_CTR -->
+ <?vsp b3s_render_dbg_out(dbg_out); ?>
+ </div> <!-- #MD -->
<!-- footer -->
- <div id="FT">
+ <div id="FT">
<?vsp if (_addthis_key <> '0') { ?>
<div id="FT_share">
<!-- AddThis Button BEGIN -->
@@ -294,7 +282,7 @@
var addthis_share = { url_transforms : { clean: true, remove: ['sid'] } };
/*]]>*/
</script>
- <script type="text/javascript">
+ <script type="text/javascript">
var fb_like_id = document.getElementById('fb_like_id');
if (fb_like_id) fb_like_id.setAttribute('fb:like:layout', 'button_count');
var g_plusone_id = document.getElementById('g_plusone_id');
@@ -306,40 +294,40 @@
<?vsp } ?>
<div id="ft_t">
Alternative Linked Data Views:
- <?vsp if (VAD_CHECK_VERSION ('PivotViewer') is not null) { ?>
- <a href="/PivotViewer/?url=<?vsp http_url (desc_resource_uri); ?>" title="PivotViewer page for exploring results and generating new queries" target="_blank">PivotViewer</a>
+ <?vsp if (VAD_CHECK_VERSION ('PivotViewer') is not null) { ?>
+ <a href="/PivotViewer/?url=<?vsp http_url (desc_resource_uri); ?>" title="PivotViewer page for exploring results and generating new queries" target="_blank">PivotViewer</a>
|
<?vsp } ?>
- <?vsp if (VAD_CHECK_VERSION ('rdf_mappers') is not null) { ?>
- <a href="<?vsp http (rdfdesc_http_url (page_resource_uri)); ?>" target="_blank">Sponger</a>
+ <?vsp if (VAD_CHECK_VERSION ('rdf_mappers') is not null) { ?>
+ <a href="<?vsp http (rdfdesc_http_url (page_resource_uri)); ?>" target="_blank">Sponger</a>
|
<?vsp } ?>
- <?vsp if (VAD_CHECK_VERSION ('iSPARQL') is not null) { ?>
- <a href="/isparql/view/?query=<?vsp http_url (desc_qr); ?>&resultview=browser" title="Interactive Query By Example oriented SPARQL UI" target="_blank">iSPARQL</a>
+ <?vsp if (VAD_CHECK_VERSION ('iSPARQL') is not null) { ?>
+ <a href="/isparql/view/?query=<?vsp http_url (desc_qr); ?>&resultview=browser" title="Interactive Query By Example oriented SPARQL UI" target="_blank">iSPARQL</a>
|
<?vsp } ?>
- <a href="http://linkeddata.uriburner.com/ode/?uri=<?vsp http_url (page_resource_uri); ?>" title="Basic navigation and exploration" target="_blank">ODE</a>
-
+ <a href="http://linkeddata.uriburner.com/ode/?uri=<?vsp http_url (page_resource_uri); ?>" title="Basic navigation and exploration" target="_blank">ODE</a>
+
Raw Data in:
<a href="<?=rdf_link || sprintf ('&output=%U', 'text/cxml')?>">CXML</a> |
<a href="<?=rdf_link || sprintf ('&output=%U', 'text/csv')?>">CSV</a> | RDF (
<a href="<?=rdf_link || sprintf ('&output=%U', 'text/plain') ?>">N-Triples</a>
<a href="<?=rdf_link || sprintf ('&output=%U', 'text/rdf+n3') ?>">N3/Turtle</a>
- <a href="<?=rdf_link || sprintf ('&output=%U', 'application/rdf+json')?>">JSON</a>
+ <a href="<?=rdf_link || sprintf ('&output=%U', 'application/rdf+json')?>">JSON</a>
<a href="<?=rdf_link || sprintf ('&output=%U', 'application/rdf+xml') ?>">XML</a> ) | OData (
- <a href="<?=rdf_link || sprintf ('&output=%U', 'application/atom+xml')?>">Atom</a>
+ <a href="<?=rdf_link || sprintf ('&output=%U', 'application/atom+xml')?>">Atom</a>
<a href="<?=rdf_link || sprintf ('&output=%U', 'application/odata+json')?>">JSON</a> ) | Microdata (
<a href="<?=rdf_link || sprintf ('&output=%U', 'application/microdata+json') ?>">JSON</a>
- <a href="<?=rdf_link || sprintf ('&output=%U', 'text/html') ?>">HTML</a>) |
- <a href="<?=rdf_link || sprintf ('&output=%U', 'application/ld+json')?>">JSON-LD</a>
+ <a href="<?=rdf_link || sprintf ('&output=%U', 'text/html') ?>">HTML</a>) |
+ <a href="<?=rdf_link || sprintf ('&output=%U', 'application/ld+json')?>">JSON-LD</a>
<a href="/fct/facet_doc.html">About</a>
</div> <!-- #ft_t -->
<div id="ft_b">
- <a href="http://linkeddata.org/"><img alt="This material is Open Knowledge" src="/fct/images/LoDLogo.gif" style="border-width:0"/></a>
- <a href="http://dbpedia.org/sparql"><img alt="W3C Semantic Web Technology" src="/fct/images/sw-sparql-blue.png" style="border-width:0"/></a>
- <a href="<?=rdf_link?>" title="RDF data"><img src="/fct/images/sw-rdf-blue.png" alt="[RDF Data]" style="border-width:0"/></a>
- <a href="http://www.opendefinition.org/"><img alt="This material is Open Knowledge" src="/fct/images/od_80x15_red_green.png" style="border-width:0"/></a>
- <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0"
+ <a href="http://linkeddata.org/"><img alt="This material is Open Knowledge" src="/fct/images/LoDLogo.gif" style="border-width:0" /></a>
+ <a href="http://dbpedia.org/sparql"><img alt="W3C Semantic Web Technology" src="/fct/images/sw-sparql-blue.png" style="border-width:0" /></a>
+ <a href="<?=rdf_link?>" title="RDF data"><img src="/fct/images/sw-rdf-blue.png" alt="[RDF Data]" style="border-width:0" /></a>
+ <a href="http://www.opendefinition.org/"><img alt="This material is Open Knowledge" src="/fct/images/od_80x15_red_green.png" style="border-width:0" /></a>
+ <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0"
src="/fct/images/creativecommons.png"/></a>
<span about=""
resource="http://www.w3.org/TR/rdfa-syntax"
@@ -349,11 +337,11 @@
alt="Valid XHTML + RDFa" height="27" /></a>
</span>
<br />
- This work is licensed under a
+ This work is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</a>.<br />
- <?vsp fct_virt_info (); ?><br />
- Copyright © 2009-2012 OpenLink Software
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2011 OpenLink Software
</div> <!-- #ft_b -->
- </div> <!-- #FT -->
-</body>
+ </div> <!-- #FT -->
+ </body>
</html>
diff --git a/binsrc/b3s/s/description.js b/binsrc/b3s/s/description.js
index e21d664..1e9a8e5 100644
--- a/binsrc/b3s/s/description.js
+++ b/binsrc/b3s/s/description.js
@@ -1,10 +1,10 @@
/*
- * $Id: description.js,v 1.1.2.5 2012/03/05 17:38:05 source Exp $
+ * $Id: description.js,v 1.1.2.3 2010/10/22 21:12:25 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -29,7 +29,6 @@ function init() {
var long_literal_counter = 0;
var long_literal_spans = {};
var long_literal_texts = {};
-
function init_long_literals() {
var spans = document.getElementsByTagName('span');
for (i = 0; i < spans.length; i++) {
@@ -56,11 +55,10 @@ function init_long_literals() {
var long_ul_counter = 0;
var long_uls = {};
var long_uls_nodes = {};
-
-function init_long_list()
+function init_long_list()
{
var uls = document.getElementsByTagName('ul');
- for (i = 0; i < uls.length; i++)
+ for (i = 0; i < uls.length; i++)
{
if (uls[i].className != 'obj') continue;
if (uls[i].childNodes.length <= 10) continue;
@@ -108,7 +106,7 @@ function uri_parms_string (p_obj)
return parms_s.substring(0,parms_s.length-1);
}
-function inf_cb ()
+function inf_cb ()
{
var loc = window.location;
var href = loc.protocol+'//'+loc.host+loc.pathname;
@@ -118,7 +116,7 @@ function inf_cb ()
window.location = href+uri_parms_string(parms);
}
-function sas_cb ()
+function sas_cb ()
{
var loc = window.location;
var href = loc.protocol+'//'+loc.host+loc.pathname;
diff --git a/binsrc/b3s/sparql.vsp b/binsrc/b3s/sparql.vsp
index 7e59dae..c384620 100644
--- a/binsrc/b3s/sparql.vsp
+++ b/binsrc/b3s/sparql.vsp
@@ -1,11 +1,11 @@
<?vsp
---
--- $Id: sparql.vsp,v 1.1.2.5 2012/03/05 17:38:05 source Exp $
+--
+-- $Id: sparql.vsp,v 1.1.2.3 2009/05/08 10:51:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -48,7 +48,7 @@ h1 { width: 100%; background-color: #86b9d9; font-size: 18pt; font-weight: norma
var last_format = 1;
function format_select(query_obg)
{
- var query = query_obg.value;
+ var query = query_obg.value;
var format = query_obg.form.format;
if (query.match(/construct/i) && last_format == 1) {
@@ -79,9 +79,9 @@ function format_select(query_obg)
</div>
<div id="main">
<p>This query page is designed to help you test OpenLink Virtuoso SPARQL protocol endpoint. <br/>
- Consult the <a href="http://virtuoso.openlinksw.com/wiki/main/Main/VOSSparqlProtocol">Virtuoso Wiki page</a> describing the service
+ Consult the <a href="http://virtuoso.openlinksw.com/wiki/main/Main/VOSSparqlProtocol">Virtuoso Wiki page</a> describing the service
or the <a href="http://docs.openlinksw.com/virtuoso/">Online Virtuoso Documentation</a> section <a href="http://docs.openlinksw.com/virtuoso/rdfandsparql.html">RDF Database and SPARQL</a>.</p>
- <p>There is also a rich Web based user interface with sample queries.
+ <p>There is also a rich Web based user interface with sample queries.
<?vsp if (DB.DBA.VAD_CHECK_VERSION('iSPARQL') is null) { ?>
In order to use it you must install the iSPARQL package (isparql_dav.vad).</p>
<?vsp } else { ?>
@@ -117,7 +117,7 @@ declare host_ur varchar;
DBA may wish to grant "SPARQL_SPONGE" privilege to "SPARQL" account to remove the restriction.
In order to do this, please perform the following steps:</i>
<br />
-1. Go to the Virtuoso Administration Conductor i.e.
+1. Go to the Virtuoso Administration Conductor i.e.
<?vsp
if (not isstring (host_ur))
{
@@ -144,7 +144,7 @@ else
<?vsp } ?>
<label for="query">Query text</label>
<br />
- <textarea rows="10" cols="60" name="query" id="query" onchange="format_select(this)"
+ <textarea rows="10" cols="60" name="query" id="query" onchange="format_select(this)"
onkeyup="format_select(this)"><?V coalesce (get_keyword ('q', params), def_qry, '') ?></textarea>
<br /><br />
<label for="format" class="n">Display Results As:</label>
diff --git a/binsrc/b3s/srank.sql b/binsrc/b3s/srank.sql
index 076a8ec..693acc6 100644
--- a/binsrc/b3s/srank.sql
+++ b/binsrc/b3s/srank.sql
@@ -1,10 +1,10 @@
--
--- $Id: srank.sql,v 1.1.2.7 2012/03/05 17:38:05 source Exp $
+-- $Id: srank.sql,v 1.1.2.5 2009/06/25 14:00:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -56,7 +56,7 @@ create procedure rnk_scale (in i int)
ret := exp ((i - 0hex7fff) / 1e3);
- if (ret < 1)
+ if (ret < 1)
{
return (2 * atan (ret*5));
}
@@ -66,7 +66,7 @@ create procedure rnk_scale (in i int)
return 3 + ((atan (ret-1) * 4) / 3.14e0);
}
- else
+ else
{
return 7 + (atan ((ret-10)/50) * 2);
}
diff --git a/binsrc/b3s/srank23.sql b/binsrc/b3s/srank23.sql
index 2a4978b..1e25354 100644
--- a/binsrc/b3s/srank23.sql
+++ b/binsrc/b3s/srank23.sql
@@ -1,10 +1,10 @@
--
--- $Id: srank23.sql,v 1.1.2.3 2012/03/05 17:38:05 source Exp $
+-- $Id: srank23.sql,v 1.1.2.1 2010/02/01 12:44:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -37,7 +37,7 @@ create procedure f_s (in f double precision)
declare i double precision;
i := log (f) * 1000 + 0hex7fff;
if (i > 0hexffff)
- return 0hexffff;
+ return 0hexffff;
return cast (i as int);
}
;
@@ -56,7 +56,7 @@ create procedure rnk_scale (in i int)
ret := exp ((i - 0hex7fff) / 1e3);
- if (ret < 1)
+ if (ret < 1)
{
return (2 * atan (ret*5));
}
@@ -66,7 +66,7 @@ create procedure rnk_scale (in i int)
return 3 + ((atan (ret-1) * 4) / 3.14e0);
}
- else
+ else
{
return 7 + (atan ((ret-10)/50) * 2);
}
@@ -105,7 +105,7 @@ create procedure DB.DBA.IRI_RANK (in iri iri_id_8)
return 0;
ni := iri_id_num (iri);
n := bit_and (0hexffffffffffffff00, ni);
- nth := 2 * bit_and (ni, 0hexff);
+ nth := 2 * bit_and (ni, 0hexff);
str := (select rnk_string from rdf_iri_rank where rnk_iri = iri_id_from_num (n));
if (nth >= length (str))
return 0;
@@ -119,7 +119,7 @@ grant execute on IRI_RANK to "SPARQL";
create procedure rnk_store_w (inout first int, inout str varchar, inout fill int)
{
if (fill < 1000)
- str := subseq (str, 0, fill);
+ str := subseq (str, 0, fill);
insert replacing rdf_iri_stat option (no cluster) values (iri_id_from_num (first), str);
commit work;
}
@@ -154,27 +154,27 @@ create procedure rnk_count_refs_srv ()
sn := iri_id_num (s);
if (s_first is null)
{
- s_first := bit_and (sn, 0hexffffffffffffff00);
- s_prev := sn;
- cnt := 0;
+ s_first := bit_and (sn, 0hexffffffffffffff00);
+ s_prev := sn;
+ cnt := 0;
}
if (sn = s_prev)
{
- cnt := cnt + 1;
+ cnt := cnt + 1;
}
else
{
if (not isstring (str))
str := make_string (1536);
- nth := 6 * (s_prev - s_first);
- str[nth] := bit_shift (cnt, -8);
- str[nth + 1] := cnt;
- fill := nth + 6;
- cnt := 1;
- s_prev := sn;
+ nth := 6 * (s_prev - s_first);
+ str[nth] := bit_shift (cnt, -8);
+ str[nth + 1] := cnt;
+ fill := nth + 6;
+ cnt := 1;
+ s_prev := sn;
if (sn - s_first > 255 or s_first > sn)
- {
- rnk_store_w (s_first, str, fill);
+ {
+ rnk_store_w (s_first, str, fill);
s_first := bit_and (sn, 0hexffffffffffffff00);
--str := make_string (1536);
str := rnk_get_stat (s_first);
@@ -182,14 +182,14 @@ create procedure rnk_count_refs_srv ()
}
}
}
- last:
+ last:
if (not isstring (str))
- str := make_string (1536);
- nth := 6 * (s_prev - s_first);
+ str := make_string (1536);
+ nth := 6 * (s_prev - s_first);
str[nth] := bit_shift (cnt, -8);
- str[nth + 1] := cnt;
- fill := nth + 6;
- rnk_store_w (s_first, str, fill);
+ str[nth + 1] := cnt;
+ fill := nth + 6;
+ rnk_store_w (s_first, str, fill);
}
;
@@ -201,8 +201,8 @@ create procedure DB.DBA.IST_SRV (in iri iri_id_8)
declare n, nth, ni int;
ni := iri_id_num (iri);
n := bit_and (0hexffffffffffffff00, ni);
- nth := 6 * bit_and (ni, 0hexff);
- str := (select rst_string from rdf_iri_stat table option (no cluster) where rst_iri = iri_id_from_num (n));
+ nth := 6 * bit_and (ni, 0hexff);
+ str := (select rst_string from rdf_iri_stat table option (no cluster) where rst_iri = iri_id_from_num (n));
if (str is null)
return vector (0, 1);
if (nth > length (str) - 6)
@@ -230,7 +230,7 @@ create procedure DB.DBA.IRI_STAT (in iri iri_id_8)
declare n, nth, ni int;
ni := iri_id_num (iri);
n := bit_and (0hexffffffffffffff00, ni);
- nth := 6 * bit_and (ni, 0hexff);
+ nth := 6 * bit_and (ni, 0hexff);
str := (select rst_string from rdf_iri_stat where rst_iri = iri_id_from_num (n));
if (str is null)
return 0;
@@ -275,7 +275,7 @@ create procedure rnk_store_sc (inout first int, inout str varchar, inout fill in
create procedure rnk_get_ranks (in s_first int)
{
declare str varchar;
- str := (select rnk_string from rdf_iri_rank where rnk_iri = iri_id_from_num (s_first));
+ str := (select rnk_string from rdf_iri_rank where rnk_iri = iri_id_from_num (s_first));
if (str is null)
return make_string (512);
if (length (str) < 512)
@@ -286,9 +286,9 @@ create procedure rnk_get_ranks (in s_first int)
create procedure rnk_score (in nth_iter int)
{
- -- use the POGS instead of OP index and check for lower value
- declare cr cursor for select o, p, iri_stat (s)
- from rdf_quad table option (no cluster, index rdf_quad_pogs)
+ -- use the POGS instead of OP index and check for lower value
+ declare cr cursor for select o, p, iri_stat (s)
+ from rdf_quad table option (no cluster, index rdf_quad_pogs)
where o > #i0 and o < iri_id_from_num (0hexffffffffffffff00);
declare s_first, s_prev, nth, sn, rnk, ssc, fill, n_iters int;
declare sc double precision;
@@ -306,17 +306,17 @@ create procedure rnk_score (in nth_iter int)
sn := iri_id_num (s);
if (s_first is null)
{
- s_first := bit_and (sn, 0hexffffffffffffff00);
+ s_first := bit_and (sn, 0hexffffffffffffff00);
if (nth_iter > 1)
str := rnk_get_ranks (s_first);
else
- str := make_string (512);
- s_prev := sn;
- sc := 0;
+ str := make_string (512);
+ s_prev := sn;
+ sc := 0;
}
if (sn = s_prev)
{
- sc := sc + rnk_inc (rnk, nth_iter);
+ sc := sc + rnk_inc (rnk, nth_iter);
--dbg_obj_princ ('> sc of ', s, ' ', sc , ' rnk:', rnk, ' nth_iter:', nth_iter);
}
else
@@ -324,32 +324,32 @@ create procedure rnk_score (in nth_iter int)
declare dst int;
if (not isstring (str))
str := make_string (512);
- nth := 2 * (s_prev - s_first);
- ssc := f_s (sc + s_f (str[nth] * 256 + str[nth + 1]));
- str[nth] := bit_shift (ssc, -8);
- str[nth + 1] := ssc;
- fill := nth + 2;
- sc := rnk_inc (rnk, nth_iter);
- s_prev := sn;
+ nth := 2 * (s_prev - s_first);
+ ssc := f_s (sc + s_f (str[nth] * 256 + str[nth + 1]));
+ str[nth] := bit_shift (ssc, -8);
+ str[nth + 1] := ssc;
+ fill := nth + 2;
+ sc := rnk_inc (rnk, nth_iter);
+ s_prev := sn;
dst := sn - s_first;
if (dst > 255 or dst < 0)
- {
- rnk_store_sc (s_first, str, fill);
+ {
+ rnk_store_sc (s_first, str, fill);
s_first := bit_and (sn, 0hexffffffffffffff00);
- str := rnk_get_ranks (s_first);
+ str := rnk_get_ranks (s_first);
fill := 0;
}
}
}
last:
if (not isstring (str))
- str := make_string (512);
- nth := 2 * (s_prev - s_first);
- ssc := f_s (sc);
+ str := make_string (512);
+ nth := 2 * (s_prev - s_first);
+ ssc := f_s (sc);
str[nth] := bit_shift (ssc, -8);
- str[nth + 1] := ssc;
- fill := nth + 2;
- rnk_store_sc (s_first, str, fill);
+ str[nth + 1] := ssc;
+ fill := nth + 2;
+ rnk_store_sc (s_first, str, fill);
}
;
@@ -375,21 +375,21 @@ create procedure rnk_next_cycle ()
for (;;)
{
fetch cr into iri, stat;
- rank := (select rnk_string from rdf_iri_rank where rnk_iri = iri);
+ rank := (select rnk_string from rdf_iri_rank where rnk_iri = iri);
if (isstring (rank) and isstring (stat))
{
declare nr, ns, inx, rnth, snth int;
- nr := length (rank) / 2;
- ns := length (stat) / 6;
+ nr := length (rank) /2;
+ ns := length (stat) /6;
if (nr < ns)
- ns := nr;
+ ns := nr;
for (inx := 0; inx < ns; inx := inx + 1)
{
- n_done := n_done + 1;
- rnth := inx * 2;
- snth := inx * 6;
- stat[snth + 2] := rank[rnth];
- stat[snth + 3] := rank[rnth + 1];
+ n_done := n_done + 1;
+ rnth := inx * 2;
+ snth := inx * 6;
+ stat[snth + 2] := rank [rnth];
+ stat[snth + 3] := rank[rnth + 1];
stat[snth + 4] := stat[snth + 2];
stat[snth + 5] := stat[snth + 3];
}
@@ -410,8 +410,8 @@ create procedure s_rank ()
cl_exec('__dbf_set(''cl_max_keep_alives_missed'',3000)');
}
log_enable (2);
- delete from rdf_iri_stat;
- delete from rdf_iri_rank;
+ delete from rdf_iri_stat;
+ delete from rdf_iri_rank;
log_enable (1);
cl_exec ('rnk_count_refs_srv ()');
cl_exec ('rnk_score_srv (1)');
diff --git a/binsrc/b3s/styles/default.css b/binsrc/b3s/styles/default.css
index 3bcdce5..67f6865 100644
--- a/binsrc/b3s/styles/default.css
+++ b/binsrc/b3s/styles/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.1.2.29 2012/03/05 17:38:05 source Exp $
+ * $Id: default.css,v 1.1.2.20 2011/10/26 15:38:11 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -23,7 +23,7 @@
html {}
-body {
+body {
margin: 0; padding: 0;
font-family: Gill Sans, Verdana, Helvetica, sans-serif;
font-size: 9pt; text-align: center}
@@ -34,51 +34,40 @@ a.describe {margin-right: 6px}
tr:hover {
background-color: #ddd;}
-pre {
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
-
-#PG { width: 100%;
+#PG { width: 100%;
text-align: left;
background-color: #fff;}
-#HD {
- width: 100%;
- float: left;
+#HD {
+ width: 100%;
+ float: left;
height: 70px;
- text-align: center;
+ text-align: center;
background-image: url(/fct/images/bg_header.png);
border-bottom: 1px solid #226;}
#HD img { margin: 2px 0 0 0; padding: 0; vertical-align: middle; border: 0;}
-#HD h1 {
- font-size: 14pt;
- float:left;
- margin: 0 0 0 20px;
- vertical-align: top;
- color: #fff;
+#HD h1 {
+ font-size: 14pt;
+ float:left;
+ margin: 0 0 0 20px;
+ vertical-align: top;
+ color: #fff;
padding: 0}
#HD h1 a { color: #fff}
-#HD h2 { font-size: 14pt; float: left; margin: 20px 0 0 20px; color: #fff; padding: 0;}
-
#main_menu {
- margin: 40px 0; padding: 0;
+ margin: 0; padding: 0;
float: right;
-/* clear: right;*/
+ clear: right;
list-style-type: none;
list-style-image: none;
list-style-position: outside;
list-style-type: none;
margin-right: 12px;
-/* min-width: 500px; */
+ min-width: 500px;
}
#main_menu li { float: left }
@@ -103,7 +92,7 @@ pre {
-moz-border-radius-topright:3px;
background:#E4F2FD none repeat scroll 0 0;
color:#555555;
- text-shadow:1px 1px 1px #C6D9E9;
+ text-shadow:1px 1px 1px #C6D9E9;
}
li#mnu_settings a {
@@ -127,23 +116,23 @@ li#mnu_settings ul li { }
#hd_r { float: right; clear: right}
-#hd_r img { margin: 15px 10px 0 0;
- vertical-align: middle;
- padding-bottom: 3px;
+#hd_r img { margin: 15px 10px 0 0;
+ vertical-align: middle;
+ padding-bottom: 3px;
background-color: white; }
a.logo { margin-left: 10px; float: left;}
#opl_logo { border: 0; float: left;}
-#MD { width: 100%;
- float: left;
- margin-top: 0;
- background-color: #e9f2f7;
- padding-bottom: 10px;
+#MD { width: 100%;
+ float: left;
+ margin-top: 0;
+ background-color: #e9f2f7;
+ padding-bottom: 10px;
margin-left: auto; margin-right: auto;}
-#MD div#settings {
+#MD div#settings {
margin: 10px;
}
@@ -154,7 +143,7 @@ a.logo { margin-left: 10px; float: left;}
#MD div#settings ul li { padding: 0;}
#MD div#settings td:hover {background: inherited}
#MD div#settings tr:hover {background: inherited}
-#FT { width: 100%; float: left;
+#FT { width: 100%; float: left;
border-top: 1px solid #335;
text-align: center;
padding-top: 10px; }
@@ -166,7 +155,7 @@ span.copyright { font-size: 8pt; color: #888}
div.page_resource_info {
float: left; clear: left;
text-align: left;
- margin: 15px;
+ margin: 15px;
}
div.page_resource_info h2 { display: inline; padding: 0;}
@@ -192,8 +181,8 @@ div.main_expln { float: left; clear: left; text-align: center; width: 100%;}
#user_map { position: relative;width: 100%; height:650px; }
-input.thr { background-image: url(/fct/images/thrb.gif);
- background-repeat: no-repeat;
+input.thr { background-image: url(/fct/images/thrb.gif);
+ background-repeat: no-repeat;
background-position: right;}
table.result { clear:left; width: 100%; margin: 3px; font-size: 9pt;}
@@ -210,10 +199,10 @@ p.subj_desc {
float: left;
clear: left;
width: 750px;
- text-align: left;
- font-style: italic;
- font-size: 12pt;
- margin: 10px;
+ text-align: left;
+ font-style: italic;
+ font-size: 12pt;
+ margin: 10px;
padding: 10px;
background-color: #fff;
border: 1px solid black;}
@@ -221,17 +210,17 @@ p.subj_desc {
p.subj_delim {
float: left;
clear: left;
- margin-left: 10px;
+ margin-left: 10px;
width: 750px;
border-bottom: 1px solid black;}
-div.subj_nav div.nav {
- float: right;
+div.subj_nav div.nav {
+ float: right;
clear: right;
- text-align: left;
+ text-align: left;
width: 200px;
- margin-top: 10px;
- border-left: 1px solid #ddd;
+ margin-top: 10px;
+ border-left: 1px solid #ddd;
}
div.subj_nav div.nav ul { list-style-type: none; padding: 0; margin-left: 10px;}
@@ -240,28 +229,28 @@ div.subj_nav div.nav h3 { text-align: left; margin-left: 10px; }
table.description { text-align: left; margin: 10px; float: left;clear: left;}
table.description td { vertical-align: top;}
table.description td.property { white-space: nowrap;}
-table.description ul.obj {
- padding: 0;
- margin-top: 0;
- margin-left; 10px;
+table.description ul.obj {
+ padding: 0;
+ margin-top: 0;
+ margin-left; 10px;
list-style-type: none } /* list-style-type: none} */
-#main_srch {
- margin-top: 15px;
+#main_srch {
+ margin-top: 15px;
margin-left: auto;
margin-right: auto}
#TAB_ROW { width: 780px; margin-left: auto; margin-right: auto;}
-div.tab {
+div.tab {
float: left;
min-width: 12em;
padding-top: 10px;
padding-left: 10px;
padding-bottom: 4px;
- cursor: pointer;
- background-image: url(/fct/images/tablv1default.png);
+ cursor: pointer;
+ background-image: url(/fct/images/tablv1default.png);
margin-right: 4px;
}
@@ -269,15 +258,15 @@ div.tab a { text-decoration: none; white-space: nowrap; margin-right: 5px; }
div.tab:first-child { clear: left; }
-div.tab_selected {
- background-image: url(/fct/images/tablv1sel.png);
+div.tab_selected {
+ background-image: url(/fct/images/tablv1sel.png);
font-weight: bold;
padding-top: 10px;
padding-bottom: 5px;
border-top: 1px solid #ddd;
border-right: 1px solid #ddd;
border-left: 1px solid #ddd;
- border-bottom: 2px solid #fff;
+ border-bottom: 2px solid #fff;
}
#TAB_ROW div.tab_act { float: right; padding-top: 10px;}
@@ -297,7 +286,7 @@ div.tab_page {
width: 100%;
min-height: 150px;
background-color: #ffffff;
- background-image: url(/fct/images/tab_page_back1.png);
+ background-image: url(/fct/images/tab_page_back1.png);
background-repeat: repeat-x;
background-position: bottom left;
border-left: 1px solid #ddd;
@@ -313,7 +302,7 @@ div.pg_b_nav { float: left; clear: left; width: 100%; margin-left: 10px;}
div.ac_info { margin-top: 20px;}
div.ac_info img.txt_i { vertical-align: middle; margin: 4px;}
-div.autocomplete_list {
+div.autocomplete_list {
padding: 0;
margin: 0;
max-height: 500px;
@@ -321,13 +310,13 @@ div.autocomplete_list {
overflow-x: auto;
list-style-type: none;
text-align: left;
- background: #fff;
+ background: #fff;
border: 1px solid #888; }
-div.ac_list_option {
- text-align: left;
- margin: 2px 5px 2px 5px;
- cursor: pointer;
+div.ac_list_option {
+ text-align: left;
+ margin: 2px 5px 2px 5px;
+ cursor: pointer;
color: #888;
border-top: 1px solid #ddd }
@@ -347,15 +336,15 @@ span.descr { font-size: 9pt; color: #557; margin-top: 0;}
#result_nfo { float: left; clear: both; width: 100%; margin-top: 8px; margin-left: 5px; color: #446;}
-#fct_nav {
- float: right;
+#fct_nav {
+ float: right;
margin-left: 10px;
- margin-top: 4px;
- padding-left: 3px;
- width: 200px;
+ margin-top: 4px;
+ padding-left: 3px;
+ width: 200px;
border-left: 1px solid #335;}
-#fct_nav h3 { margin: 0; padding: 0; color: #445; }
+#fct_nav h3 { margin: 0; padding: 0;}
#fct_nav ul { list-style-type: none; padding: 0; margin: 0;}
#fct_nav ul li { list-style-type: none;}
@@ -374,16 +363,16 @@ div.thr_ctr { display: inline; width: 16px; border: 0; padding: 0;margin: 0;}
border: 1px outset;
margin: 10px auto 10px auto;
width: 90%;}
-.dlg .title { margin: 0;
- text-align: center;
- background-image: url(/fct/images/dlg_title_bkg.png);
+.dlg .title { margin: 0;
+ text-align: center;
+ background-image: url(/fct/images/dlg_title_bkg.png);
border-bottom: 1px inset;
padding: 2px 0 2px 0;}
.dlg .title h2 { color: #333}
.dlg form { margin: 0; width: 100%;}
-.dlg .btn_bar { margin: 0;
- padding-top: 2ex;
- width: 100%; height: 6ex;
+.dlg .btn_bar { margin: 0;
+ padding-top: 2ex;
+ width: 100%; height: 6ex;
border-top: 1px solid #333; background-color: #ddd; text-align: right; }
.dlg .btn_bar button { margin-right: 4px; }
.dlg .btn_bar input[type="submit"] { margin-right: 6px; }
@@ -394,11 +383,11 @@ div.thr_ctr { display: inline; width: 16px; border: 0; padding: 0;margin: 0;}
.dlg .fm_sect h3 { font-size: 9pt; margin: 0}
.dlg label.left_txt { float: left; clear: left; width: 120px;}
.dlg .ctl_expln { margin-left: 120px; font-size: 8pt; font-style: oblique}
-
+
#opts_ctr {
width: 100%;
text-align: center;
- background-color: white;
+ background-color: white;
}
#opts {
@@ -432,52 +421,25 @@ a.in_del:hover { cursor: pointer; }
font-style: italic;
}
-#res .pager button {
- background-color: #e5e5e5;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#cccccc));
- background-image: -webkit-linear-gradient(top, #e5e5e5, #d5d5d5);
- background-image: -ms-linear-gradient(top, #e5e5e5, #d5d5d5);
- background-image: -moz-linear-gradient(top, #e5e5e5, #d5d5d5);
- background-image: -o-linear-gradient(top, #e5e5e5, #d5d5d5);
- background-image: linear-gradient(top, #e5e5e5, #d5d5d5);
- border: 1px solid #c2c2c2;
- border-bottom: 1px solid #b2b2b2;
- -ms-border-radius: 3px;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- -o-border-radius: 3px;
- border-radius: 3px;
- color: #333;
- font: bold 11px Geneva, Verdana, sans-serif;
- line-height: 1;
- padding: 3px 3px;
- text-align: center;
- text-shadow: 0 1px 0 #EEE;
-}
-
-#res .pager button:disabled {
- color: #666;
-}
-
div.empty_result {
- font-weight: bold;
+ font-weight: bold;
font-size: 12pt;
margin: 20px;
}
-div.dbg {
+div.dbg {
display: none; }
/*div.dbg { padding: 10px; background-color: yellow; border: 1px solid black}*/
div#pager { margin-top: 10px; float: right;}
-div#pager a { background-color: #ddd;
- padding: 2px;
- border: 1px solid #335;
- padding: 3px 5px 3px 5px;
- width: auto;
- text-decoration: none;
+div#pager a { background-color: #ddd;
+ padding: 2px;
+ border: 1px solid #335;
+ padding: 3px 5px 3px 5px;
+ width: auto;
+ text-decoration: none;
text-align: center;}
h3#view_info {
@@ -486,7 +448,7 @@ h3#view_info {
font-size: 10pt;
}
-div#top_ctr {
+div#top_ctr {
font-size: 10pt;
background-color: #ccc;
margin-top: 0px; padding-top: 4px;
@@ -497,11 +459,6 @@ div#top_ctr {
list-style-type: none;
}
-#top_ctr ul .focus {
- font-weight: bold;
- color: #393;
-}
-
div.error_msg { margin: 5px; }
div.error_msg h2 {}
div.error_msg div.body { margin: 10px;}
@@ -516,8 +473,8 @@ div.facet_ctr {
div.facet_ctr:first-child { margin-left: 0;}
-.facet_hd {
- margin: 0;
+.facet_hd {
+ margin: 0;
text-align: center;
border-top: 1px solid #333;
border-left: 1px solid #333;
@@ -525,12 +482,12 @@ div.facet_ctr:first-child { margin-left: 0;}
background-color: #aaa;
background-image: url(/images/dlg_title_bkg.png);}
-div.facet {
- float:left;
- height: 20em;
- width: 394px;
- overflow-y: auto;
- overflow-x: hidden;
+div.facet {
+ float:left;
+ height: 20em;
+ width: 394px;
+ overflow-y: auto;
+ overflow-x: hidden;
background-color: #fff;
border: 1px inset;
}
@@ -538,13 +495,13 @@ div.facet {
.plink_a {margin-left: 1em}
div#sparql_link { margin-top: 10px; float: right;}
-div#sparql_link a {
- background-color: #ddd;
- padding: 2px;
- border: 1px solid #335;
- padding: 3px 5px 3px 5px;
- width: auto;
- text-decoration: none;
+div#sparql_link a {
+ background-color: #ddd;
+ padding: 2px;
+ border: 1px solid #335;
+ padding: 3px 5px 3px 5px;
+ width: auto;
+ text-decoration: none;
text-align: center;}
div.featured { margin: 5px; }
@@ -553,10 +510,10 @@ div.featured .expln { text-align: left;}
#featured_list td { font-size: 9pt;}
table.sparql_qry_list { width: 78%; margin-left: auto; margin-right: auto}
-table.sparql_qry_list td.title { font-weight: bold; }
-table.sparql_qry_list td.expln { width: 50%; }
+table.sparql_qry_list td.title { font-weight: bold; }
+table.sparql_qry_list td.expln { width: 50%; }
-#demo_queries_ctr { margin: 10px; min-height: 200px}
+#demo_queries_ctr { margin: 10px; }
ul.demo_qry_list {
list-style-type: none;
@@ -568,14 +525,12 @@ ul.demo_qry_list div.expln { margin: 10px; }
ul.demo_qry_list pre { margin: 10px; }
div#dbg_output {
- float: left;
+ float: left;
clear:left;
font-size: 8pt;
}
-span.advisory { font-weight: bold; }
-
-span.pivot_pg a,
+span.pivot_pg a,
span.pivot_qrcode_opts a,
span.pivot_link_opts a { text-decoration: none; }
@@ -590,16 +545,10 @@ div#nav {
margin-left: 50px;
}
-a#sp_link { font-size: 9pt; font-weight:normal; }
-a.desc_permalink { font-size: 9pt; font-weight: normal }
-
-#qrcode { position:fixed; top:100px; right: 30px; z-index: 0; }
-
-#FT_share { margin: auto; width: 400px}
-
-#fct_form { margin-top: 1ex }
+a#sp_link { font-size: 11pt; font-weight:normal; }
-.addthis_toolbox { margin: 20px 10px auto; }
+#qrcode { position:fixed; top:100px; right: 30px; z-index: 0; }
-#FT_share .addthis_toolbox { margin: 0 }
+#FT_share { float: center; clear: both; text-align: center; }
+.addthis_toolbox { width: 400px; margin: 0 auto; }
diff --git a/binsrc/b3s/sum.sql b/binsrc/b3s/sum.sql
index 7c9ecd2..e87d362 100644
--- a/binsrc/b3s/sum.sql
+++ b/binsrc/b3s/sum.sql
@@ -1,10 +1,10 @@
--
--- $Id: sum.sql,v 1.1.2.8 2012/03/05 17:38:05 source Exp $
+-- $Id: sum.sql,v 1.1.2.6 2010/02/01 12:44:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -20,10 +20,9 @@
-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--
--- Each summary is initially an array of 29 with s_rank, o_fill, o1, p1, sc1, o2, p2, sc2
+-- Each summary is initially an array of 29 with s_rank, o_fill, o1, p1, sc1, o2, p2, sc2
-- and so on. After so many entries, more are not added.
-
create procedure s_sum_init (inout env any)
{
env := make_array (30, 'any');
@@ -54,13 +53,13 @@ create procedure s_sum_fin (inout env any)
;
-create aggregate DB.DBA.S_SUM (in s_rank double precision, in p iri_id, in o any, in sc int) returns any from
+create aggregate DB.DBA.S_SUM (in s_rank double precision, in p iri_id, in o any, in sc int) returns any from
s_sum_init, s_sum_acc, s_sum_fin;
-grant execute on DB.DBA.S_SUM_INIT to "SPARQL";
-grant execute on DB.DBA.S_SUM_ACC to "SPARQL";
-grant execute on DB.DBA.S_SUM_FIN to "SPARQL";
-grant execute on DB.DBA.S_SUM to "SPARQL";
+grant execute on DB.DBA.S_SUM_INIT to "SPARQL";
+grant execute on DB.DBA.S_SUM_ACC to "SPARQL";
+grant execute on DB.DBA.S_SUM_FIN to "SPARQL";
+grant execute on DB.DBA.S_SUM to "SPARQL";
create procedure sum_rank (inout arr any)
{
@@ -68,7 +67,7 @@ create procedure sum_rank (inout arr any)
}
;
-grant execute on DB.DBA.SUM_RANK to "SPARQL";
+grant execute on DB.DBA.SUM_RANK to "SPARQL";
create procedure sum_o_p_score (inout o any, inout p any)
{
@@ -108,10 +107,10 @@ create procedure sum_result (inout final any, inout res any, inout text_exp any,
tot := tot || cast (rdf_box_data (sorted[inx]) as varchar);
exc := fct_bold_tags (search_excerpt (text_exp, tot));
-- dbg_obj_print (' summaries of ', tot, ' ', lbl, ' ', exc);
- elt := xmlelement ('row',
+ elt := xmlelement ('row',
xmlelement ('column', xmlattributes ('trank' as "datatype"), cast (cast (tsum as real) / ((end_inx - start_inx) / 3) as varchar)),
xmlelement ('column', xmlattributes ('erank' as "datatype"), cast (s_rank as varchar)),
- xmlelement ('column', xmlattributes ('url' as "datatype", fct_short_form (s) as "shortform"), s),
+ xmlelement ('column', xmlattributes ('url' as "datatype", fct_short_form (s) as "shortform"), s),
xmlelement ('column', lbl),
xmlelement ('column', exc)
);
@@ -143,14 +142,14 @@ create procedure s_sum_page_s (in rows any, in text_exp varchar)
}
n := 3 * n;
--dbg_obj_print ('result length ', n);
- res := make_array (n, 'any');
+ res := make_array (n, 'any');
fill := 0;
for (inx := 0; inx < length (rows); inx := inx + 1)
{
os := aref (rows, inx, 1);
s_rank := rnk_scale (os[0]);
s := ID_TO_IRI (rows[inx][0]);
- lbl := FCT_LABEL_S (rows[inx][0], 0, 'facets', lng_pref);
+ lbl := FCT_LABEL_S (rows[inx][0], 0, 'facets', lng_pref);
prev_fill := fill;
for (inx2 := 3; inx2 < os[1] + 3; inx2 := inx2 + 3)
{
@@ -182,23 +181,23 @@ create procedure s_sum_page_c (in rows any, in text_exp varchar)
}
n := 3 * dpipe_count (dp);
--dbg_obj_print ('result length ', n);
- res := make_array (n, 'any');
+ res := make_array (n, 'any');
fill := 0;
for (inx := 0; inx < length (rows); inx := inx + 1)
{
os := aref (rows, inx, 1);
s_rank := rnk_scale (os[0]);
- prev_fill := fill;
+ prev_fill := fill;
for (inx2 := 3; inx2 < os[1] + 3; inx2 := inx2 + 3)
- {
- so := dpipe_next (dp, 0);
+ {
+ so := dpipe_next (dp, 0);
--dbg_obj_print ('res ', fill, so);
- s := so[0];
+ s := so[0];
res[fill] := so[1];
- res[fill + 1] := os[inx2 + 1];
- res[fill + 2] := os[inx2 + 2];
+ res[fill + 1] := os[inx2 + 1];
+ res[fill + 2] := os[inx2 + 2];
lbl := so[2];
- fill := fill + 3;
+ fill := fill + 3;
}
sum_result (final, res, text_exp, s, prev_fill, fill, s_rank, lbl);
}
@@ -290,8 +289,8 @@ create procedure sum_tst_1 (in text_exp varchar, in text_words varchar := null)
-- text_words := vector (text_exp);
-- res := (select vector_agg (vector (s, sm)) from (
-- select top 20 s, s_sum (iri_rank (s), p, o, score) as sm
--- from rdf_obj, rdf_ft, rdf_quad q1
--- where contains (ro_flags, text_exp) and rf_id = ro_id and q1.o = rf_o group by s
+-- from rdf_obj, rdf_ft, rdf_quad q1
+-- where contains (ro_flags, text_exp) and rf_id = ro_id and q1.o = rf_o group by s
-- order by sum_rank (sm) option (quietcast) ) s option (quietcast)
--);
--dbg_obj_print (res);
@@ -302,7 +301,7 @@ create procedure sum_tst_1 (in text_exp varchar, in text_words varchar := null)
-- sum_tst ('oori');
---
+--
-- sparql
-- select (<SHORT_OR_LONG::>(?s1)) as ?c1, (<sql:S_SUM> (
-- <SHORT_OR_LONG::IRI_RANK> (?s1),
diff --git a/binsrc/b3s/vad_version b/binsrc/b3s/vad_version
index 7eed6d0..b207b75 100644
--- a/binsrc/b3s/vad_version
+++ b/binsrc/b3s/vad_version
@@ -1 +1 @@
-1.11.74
+1.10.55
diff --git a/binsrc/b3s/www/about.html b/binsrc/b3s/www/about.html
index b73fe2e..4494433 100644
--- a/binsrc/b3s/www/about.html
+++ b/binsrc/b3s/www/about.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<!--
--
--- $Id: about.html,v 1.1.2.2 2012/03/05 12:08:07 source Exp $
+-- $Id: about.html,v 1.1.2.1 2009/04/17 11:07:30 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/b3s/www/dlistall.vsp b/binsrc/b3s/www/dlistall.vsp
index 14fb978..ba4c408 100644
--- a/binsrc/b3s/www/dlistall.vsp
+++ b/binsrc/b3s/www/dlistall.vsp
@@ -2,12 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<?vsp
--
--- $Id: dlistall.vsp,v 1.1.2.7 2012/03/05 17:38:05 source Exp $
+-- $Id: dlistall.vsp,v 1.1.2.5 2010/02/01 12:44:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -26,7 +26,7 @@
label := 'Drill-down queries';
puri := get_keyword('p', params,'');
- puri := replace (puri, '\'', '%27');
+ puri := replace (puri, '\'', '%27');
?>
<head>
<link rel="stylesheet" type="text/css" href="style.css">
@@ -97,7 +97,7 @@
http('<td>');
if (__tag of rdf_box = __tag (tmp) and not rdf_box_is_complete (tmp))
http ('Incomplete box');
- else
+ else
{
http_value(tmp);
}
diff --git a/binsrc/b3s/www/listall.vsp b/binsrc/b3s/www/listall.vsp
index 0c9cb05..a35793c 100644
--- a/binsrc/b3s/www/listall.vsp
+++ b/binsrc/b3s/www/listall.vsp
@@ -2,12 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<?vsp
--
--- $Id: listall.vsp,v 1.1.2.9 2012/03/05 17:38:05 source Exp $
+-- $Id: listall.vsp,v 1.1.2.7 2011/09/23 19:22:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -56,16 +56,16 @@
For your convenience we have a set of <a href="nspref.vsp">predefined name space prefixes</a>.</div>
<div id="footer">
<div id="ft_b">
- <a href="about.html">About</a>
+ <a href="about.html">About</a>
<a href="http://virtuoso.openlinksw.com" title="OpenLink Virtuoso"><img class="powered_by" src="http://dbpedia.org/statics/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/></a>
<a href="http://linkeddata.org/"><img alt="This material is Open Knowledge" src="http://dbpedia.org/statics/LoDLogo.gif" border="0"></a>
<a href="http://dbpedia.org/sparql"><img alt="W3C Semantic Web Technology" src="http://dbpedia.org/statics/sw-sparql-blue.png" border="0"></a>
<a href="http://www.opendefinition.org/"><img alt="This material is Open Knowledge" src="http://dbpedia.org/statics/od_80x15_red_green.png" border="0"></a>
<br />
- This work is licensed under a
+ This work is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</a>.<br />
- <?vsp fct_virt_info (); ?><br />
- Copyright © 2009-2012 OpenLink Software
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2011 OpenLink Software
</div> <!-- #ft_b -->
</div> <!-- #footer -->
</body>
diff --git a/binsrc/b3s/www/nspref.vsp b/binsrc/b3s/www/nspref.vsp
index ebf0d37..faeea0c 100644
--- a/binsrc/b3s/www/nspref.vsp
+++ b/binsrc/b3s/www/nspref.vsp
@@ -2,12 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<?vsp
--
--- $Id: nspref.vsp,v 1.1.2.4 2012/03/05 17:38:05 source Exp $
+-- $Id: nspref.vsp,v 1.1.2.2 2009/05/01 19:39:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -48,7 +48,7 @@
</div><!-- #content -->
<div id="footer">
<div id="ft_b">
- <a href="about.html">About</a>
+ <a href="about.html">About</a>
<a href="http://virtuoso.openlinksw.com" title="OpenLink Virtuoso"><img class="powered_by" src="http://dbpedia.org/statics/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/></a>
<a href="http://linkeddata.org/"><img alt="This material is Open Knowledge" src="http://dbpedia.org/statics/LoDLogo.gif" border="0"></a>
<a href="http://dbpedia.org/sparql"><img alt="W3C Semantic Web Technology" src="http://dbpedia.org/statics/sw-sparql-blue.png" border="0"></a>
diff --git a/binsrc/b3s/www/search.sql b/binsrc/b3s/www/search.sql
index 4e9e983..d2b6275 100644
--- a/binsrc/b3s/www/search.sql
+++ b/binsrc/b3s/www/search.sql
@@ -1,10 +1,10 @@
--
--- $Id: search.sql,v 1.1.2.13 2012/03/05 17:38:05 source Exp $
+-- $Id: search.sql,v 1.1.2.11 2011/09/23 19:22:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -151,8 +151,8 @@ create procedure desc_get (in num varchar)
'What sources talk the most about a given subject? Show the top N graphs containing triples with the given text pattern. Sort by descending triple count.',
'What types of objects contain a text pattern. Find matches, get the type. Group by type, order by count.',
'What are the interests of a given person based on their foaf:name?',
- 'Who writes the most about a topic. Show for each author the number of works mentioning the topic and total number of works. '
-||'<br>For all documents and posts we have extracted named entities the entity could shows the entities which occur in the works of each author. '
+ 'Who writes the most about a topic. Show for each author the number of works mentioning the topic and total number of works.'
+||'<br>For all documents and posts we have extracted named entities the entity could shows the entities which occur in the works of each author.'
||'There are statistics about named entities occurring together, these are used for display a list of related entities. '
,
'Show the people a person directly or indirectly knows. Sort by distance and count of connections of the known person',
@@ -202,7 +202,7 @@ create procedure head_get (in num varchar)
vector ('Thing', 'Nick name', 'Occurrences'),
vector ('Thing', 'Text Pattern', 'Occurrences'),
vector ('Manifacturer URI', 'Total Products'),
- vector ('Vendor', 'Offer', 'Business Function', 'Offer Object', 'Type of Good', 'Price'),
+ vector ('Vendor', 'Offer', 'Business Function', 'Offer Object', 'Type of Good', 'Price'),
-- vector ('Vendor', 'Offer', 'Business Function', 'Customer Type', 'Offer Object', 'Type of Good', 'Price'),
-- vector ('Total Products'),
vector ('Cafe URI', 'Latitude', 'Longitude', 'Cafe Name', 'Church Name', 'Count'),
@@ -235,7 +235,7 @@ create procedure validate_input(inout val varchar)
{
val := trim(val, ' ');
val := replace(val, '*', '');
- val := replace(val, '>', '');
+ val := replace(val, '>', '');
val := replace(val, '<', '');
--val := replace(val, '&', '');
--val := replace(val, '"', '');
@@ -246,7 +246,7 @@ create procedure validate_input(inout val varchar)
create procedure get_curie (in val any)
{
- declare delim, delim1, delim2, delim3 integer;
+ declare delim, delim1, delim2, delim3 integer;
declare pref, res, suff varchar;
delim1 := coalesce (strrchr (val, '/'), -1);
@@ -577,14 +577,13 @@ create procedure pick_query(in smode varchar, inout val any, inout query varchar
s1 := 'sparql SELECT ?i2 COUNT (*) WHERE { ?p foaf:interest ?i1 . ' ||
' ?p foaf:name ?name . ' ||
' FILTER ( bif:contains (?name, \'';
- validate_input(val);
+ validate_input(val);
s2 := trim (fti_make_search_string(val), '()');
s3 := '\')) . ?p foaf:interest ?i2 } GROUP BY ?i2 ORDER BY DESC 2 LIMIT 20';
- query := concat('',s1, s2, s3,'');
+ query := concat('',s1, s2, s3,'');
}
else if (smode='5')
{
-
-- this query crashes the server:
----* The Most One-Sidedly Known People
--sparql
@@ -944,7 +943,7 @@ s3 := '\')) .
' WHERE ' ||
' { ' ||
' { ' ||
- ' SELECT ?c ?m ?n ?p ?trans ?dist ' ||
+ ' SELECT ?c ?m ?n ?p ?trans?dist ' ||
' WHERE ' ||
' { ' ||
' ?m rdfs:label ?n . ' ||
diff --git a/binsrc/b3s/www/search.vsp b/binsrc/b3s/www/search.vsp
index 7ccc212..b0db7f3 100644
--- a/binsrc/b3s/www/search.vsp
+++ b/binsrc/b3s/www/search.vsp
@@ -2,12 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<?vsp
--
--- $Id: search.vsp,v 1.1.2.11 2012/03/05 17:38:05 source Exp $
+-- $Id: search.vsp,v 1.1.2.9 2011/09/23 19:22:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -57,7 +57,7 @@
err_msg := 'No such query';
res := vector();
};
-
+
declare desc_resource_uri varchar;
desc_resource_uri := sprintf ('http://%{WSHost}s/sparql?query=%U&format=cxml', ltrim(squery, 'sparql '));
?>
@@ -80,7 +80,7 @@
http (sprintf(' <b><a href="dlistall.vsp?p=%U">Back to Drill-down list | </a></b>',srch));
http(sprintf('<a href="listall.vsp">Back to main menu</a>'));
?>
- <p><?vsp http (desc_get (smode)); ?></p>
+ <p><?vsp http (desc_get (smode)); ?></p>
</td>
</tr>
</table>
@@ -94,9 +94,9 @@
<?vsp
if (input_get (smode) = 'Search for')
{
- http_value ('In search form, enter words separated by spaces. To indicate consecutive words, enclose in quotes (").', 'p');
- }
- ?>
+ http_value ('In search form, enter words separated by spaces. To indicate consecutive words, enclose in quotes (").', 'p');
+ }
+ ?>
<?V input_get (smode) ?> <input size="60" type="text" name="sc" value="<?= srch ?>"/>
<!-- show the second input field-->
<?vsp
@@ -223,7 +223,7 @@
http ('<tr>');
foreach (any elm in head) do
{
- http_value (elm, 'th');
+ http_value (elm, 'th');
}
http ('</tr>');
}
@@ -256,15 +256,15 @@
else if (smode = '1004' and j = 0)
{
http (sprintf ('<td><a href="search.vsp?q=1001&sc=%U&fa=Execute">', tmp));
- http_value (tmp);
+ http_value (tmp);
http ('</a>');
}
- else if (smode = '4' and j = 0)
+ else if (smode = '4' and j = 0)
{
http (sprintf ('<td><a href="search.vsp?q=%U&sc=%U&fa=Execute">', smode, '<'||tmp||'>'));
http_value (tmp);
http (sprintf('</a> <a href="/describe/?url=%U">Browse</a>',tmp));
- }
+ }
else if (smode = '18' and j = 0)
{
http (sprintf ('<td><a href="search.vsp?q=%U&sc=%U&sc2=%U&sc3=%U&fa=Execute">', smode, '<'||tmp||'>', srch2, srch3));
@@ -273,11 +273,11 @@
}
else if (smode = '1001' and j = 0)
{
- http (sprintf ('<td><a class="uri" href="%V">%s</a>',
- replace (tmp, 'http://umbel.org/umbel/ne/wikipedia/', 'http://dbpedia.org/resource/'),
+ http (sprintf ('<td><a class="uri" href="%V">%s</a>',
+ replace (tmp, 'http://umbel.org/umbel/ne/wikipedia/', 'http://dbpedia.org/resource/'),
get_curie (tmp)));
http (sprintf(' <b><a href="search.vsp?q=1004&sc=%U&fa=Execute">Authors</a></b>',tmp));
- }
+ }
else if (smode not in ('2'))
http (sprintf ('<td><a class="uri" href="%s">%s</a>', concat('/describe/?url=', sprintf ('%U',tmp)), get_curie (tmp)));
else
@@ -298,22 +298,22 @@
--dbg_obj_print(tmp);
if (__tag of rdf_box = __tag (tmp) and not rdf_box_is_complete (tmp))
http ('Incomplete box');
- else
+ else
{
if ((smode = '8' or smode ='9' or smode ='10') and j = 1)
- http (sprintf ('<a href="search.vsp?q=%U&sc=%U&fa=Execute">', smode, tmp));
+ http (sprintf ('<a href="search.vsp?q=%U&sc=%U&fa=Execute">', smode, tmp));
if ((smode = '8' or smode ='9' or smode ='10') and j = 2)
- http (sprintf ('<a href="search.vsp?q=1005&sc=%U&fa=Execute">', rs[1]));
+ http (sprintf ('<a href="search.vsp?q=1005&sc=%U&fa=Execute">', rs[1]));
if ((smode = '1' and j = 2) or (smode = '1002' and j = 2) or (smode = '1003' and j = 2))
http (tmp);
- else
+ else
{
if (isstring (tmp))
tmp := charset_recode (tmp, 'UTF-8', '_WIDE_');
http_value(tmp);
- }
+ }
if ( (smode = '8' or smode ='9' or smode ='10') and (j = 1 or j = 2))
- http ('</a>');
+ http ('</a>');
}
http('</td>');
};
@@ -327,19 +327,19 @@
<?vsp
};
};
- if (smode = '1004') {
+ if (smode = '1004') {
?>
<tr>
<td>
<p>Related NEs</p>
<table class="tableresult" border="1">
- <?vsp
+ <?vsp
exec ('select top 20 iri from (select id_to_iri (tc_t2) iri, tc_count from nes_coincidence where tc_t1 = iri_to_id (?) union select id_to_iri (tc_t1), tc_count from nes_coincidence where tc_t2 = iri_to_id (?) order by tc_count desc) xx', null, null, vector (srch, srch), 0, meta, data);
for (i := 0; i < length (data); i := i + 1)
{
declare iri any;
iri := data[i][0];
- http (sprintf ('<tr><td><a href="search.vsp?q=1004&sc=%U&fa=Execute">%V</a></td></tr>', iri, get_curie (iri)));
+ http (sprintf ('<tr><td><a href="search.vsp?q=1004&sc=%U&fa=Execute">%V</a></td></tr>', iri, get_curie (iri)));
}
?>
</table>
@@ -354,7 +354,7 @@
</tr>
</table>
</div><!-- #content -->
-
+
<!-- div id="isparql-results">
<table class="description">
<tr>
@@ -384,34 +384,34 @@
</table>
</div>
<div id="footer">
-
+
<div id="ft_b">
- <?vsp if (squery <> '' and squery is not null) { ?>
+ <?vsp if (squery <> '' and squery is not null) { ?>
Alternative Linked Data Views:
-
- <?vsp if (VAD_CHECK_VERSION ('PivotViewer') is not null) { ?>
- <a href="/PivotViewer/?url=<?vsp http_url (desc_resource_uri); ?>" title="PivotViewer page for exploring results and generating new queries" target="_blank">PivotViewer</a>
+
+ <?vsp if (VAD_CHECK_VERSION ('PivotViewer') is not null) { ?>
+ <a href="/PivotViewer/?url=<?vsp http_url (desc_resource_uri); ?>" title="PivotViewer page for exploring results and generating new queries" target="_blank">PivotViewer</a>
<?vsp } ?>
|
- <?vsp if (VAD_CHECK_VERSION ('iSPARQL') is not null) {
+ <?vsp if (VAD_CHECK_VERSION ('iSPARQL') is not null) {
squery := ltrim(squery, 'sparql ');
http (sprintf(' <a href="/isparql/view/?query=%U&endpoint=/sparql&maxrows=50&default-graph-uri=&resultview=browser" title="Interactive Query By Example oriented SPARQL UI" target="_blank">iSPARQL</a>',squery));
} ?>
-
+
<?vsp } ?>
</div> <!-- #ft_t -->
-
+
<div id="ft_b">
- <a href="about.html">About</a>
+ <a href="about.html">About</a>
<a href="http://virtuoso.openlinksw.com" title="OpenLink Virtuoso"><img class="powered_by" src="http://dbpedia.org/statics/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/></a>
<a href="http://linkeddata.org/"><img alt="This material is Open Knowledge" src="http://dbpedia.org/statics/LoDLogo.gif" border="0"></a>
<a href="http://dbpedia.org/sparql"><img alt="W3C Semantic Web Technology" src="http://dbpedia.org/statics/sw-sparql-blue.png" border="0"></a>
<a href="http://www.opendefinition.org/"><img alt="This material is Open Knowledge" src="http://dbpedia.org/statics/od_80x15_red_green.png" border="0"></a>
<br />
- This work is licensed under a
+ This work is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</a>.<br />
- <?vsp fct_virt_info (); ?><br />
- Copyright © 2009-2012 OpenLink Software
+ <?vsp fct_virt_info (); ?><br />
+ Copyright © 2009-2011 OpenLink Software
</div> <!-- #ft_b -->
</div> <!-- #footer -->
</body>
diff --git a/binsrc/b3s/www/style.css b/binsrc/b3s/www/style.css
index d56b419..b1ccd8b 100644
--- a/binsrc/b3s/www/style.css
+++ b/binsrc/b3s/www/style.css
@@ -1,10 +1,10 @@
/*
- * $Id: style.css,v 1.1.2.4 2012/03/05 17:38:05 source Exp $
+ * $Id: style.css,v 1.1.2.2 2011/09/23 19:22:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -28,9 +28,9 @@ body {
font-size: 80%;
margin: 0;
padding: 1.2em 2em;}
-
+
a, a:visited {color: #242;}
-
+
#rdficon { float: right; position: relative; top: -28px; vertical-align: middle; padding: 3px; border: 1px solid #fff;}
#header { border-bottom: 2px solid #696; margin: 0 0 1.2em; padding: 0 0 0.3em; }
#footer { border-top: 2px solid #696; color: #666; margin: 1.2em 0 0; padding: 0.3em 0 0; }
diff --git a/binsrc/bpel/101.HelloWorld/HelloWorld.bpel b/binsrc/bpel/101.HelloWorld/HelloWorld.bpel
index ed29906..37bb068 100644
--- a/binsrc/bpel/101.HelloWorld/HelloWorld.bpel
+++ b/binsrc/bpel/101.HelloWorld/HelloWorld.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl b/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl
index 6572ac0..ff15ba0 100644
--- a/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl
+++ b/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/101.HelloWorld/HelloWorld.xml b/binsrc/bpel/101.HelloWorld/HelloWorld.xml
index d1cf987..de454d1 100644
--- a/binsrc/bpel/101.HelloWorld/HelloWorld.xml
+++ b/binsrc/bpel/101.HelloWorld/HelloWorld.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/101.HelloWorld/build.xml b/binsrc/bpel/101.HelloWorld/build.xml
index bff4ada..1d35028 100644
--- a/binsrc/bpel/101.HelloWorld/build.xml
+++ b/binsrc/bpel/101.HelloWorld/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/106.ParallelFlows/FlowSample.bpel b/binsrc/bpel/106.ParallelFlows/FlowSample.bpel
index 701982a..4a78f25 100644
--- a/binsrc/bpel/106.ParallelFlows/FlowSample.bpel
+++ b/binsrc/bpel/106.ParallelFlows/FlowSample.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl b/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl
index 915dc34..0ceab05 100644
--- a/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl
+++ b/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/106.ParallelFlows/bpel.xml b/binsrc/bpel/106.ParallelFlows/bpel.xml
index aef1322..79b46c0 100644
--- a/binsrc/bpel/106.ParallelFlows/bpel.xml
+++ b/binsrc/bpel/106.ParallelFlows/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/106.ParallelFlows/build.xml b/binsrc/bpel/106.ParallelFlows/build.xml
index d6f7667..f6cc83d 100644
--- a/binsrc/bpel/106.ParallelFlows/build.xml
+++ b/binsrc/bpel/106.ParallelFlows/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel
index bfe8c97..fbfa43f 100644
--- a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel
+++ b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl
index 4963d75..d69d213 100644
--- a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl
+++ b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml b/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml
index e641c60..c0e6f41 100644
--- a/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml
+++ b/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/build.xml b/binsrc/bpel/109.CorrelationSets/Buyer/build.xml
index 3299f75..4cc1ad8 100644
--- a/binsrc/bpel/109.CorrelationSets/Buyer/build.xml
+++ b/binsrc/bpel/109.CorrelationSets/Buyer/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl
index 4117bf6..a8e96ee 100644
--- a/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl
+++ b/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl
index 1f59b7a..f452b55 100644
--- a/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl
+++ b/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel b/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel
index 8bc0b1b..b5fe71e 100644
--- a/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel
+++ b/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl
index d363245..9f71b02 100644
--- a/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl
+++ b/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml b/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml
index 3f4855b..306ce10 100644
--- a/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml
+++ b/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/build.xml b/binsrc/bpel/109.CorrelationSets/Seller/build.xml
index 133ff6f..bb38348 100644
--- a/binsrc/bpel/109.CorrelationSets/Seller/build.xml
+++ b/binsrc/bpel/109.CorrelationSets/Seller/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl
index 4117bf6..a8e96ee 100644
--- a/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl
+++ b/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl
index 1f59b7a..f452b55 100644
--- a/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl
+++ b/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/build.xml b/binsrc/bpel/109.CorrelationSets/build.xml
index e0ae3d2..b8ab8b5 100644
--- a/binsrc/bpel/109.CorrelationSets/build.xml
+++ b/binsrc/bpel/109.CorrelationSets/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl
index 4117bf6..a8e96ee 100644
--- a/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl
+++ b/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl
index 1f59b7a..f452b55 100644
--- a/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl
+++ b/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/Makefile.am b/binsrc/bpel/Makefile.am
index 33445dc..29121b3 100644
--- a/binsrc/bpel/Makefile.am
+++ b/binsrc/bpel/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/Makefile.in b/binsrc/bpel/Makefile.in
index 26f7f1c..a5e36d5 100644
--- a/binsrc/bpel/Makefile.in
+++ b/binsrc/bpel/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/bpel/activity.vspx b/binsrc/bpel/activity.vspx
index 6d1c260..9c04afe 100644
--- a/binsrc/bpel/activity.vspx
+++ b/binsrc/bpel/activity.vspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/activity.xsl b/binsrc/bpel/activity.xsl
index 078a57d..7204694 100644
--- a/binsrc/bpel/activity.xsl
+++ b/binsrc/bpel/activity.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: activity.xsl,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: activity.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/asyncall.vsp b/binsrc/bpel/asyncall.vsp
index d559c4c..819fd1a 100644
--- a/binsrc/bpel/asyncall.vsp
+++ b/binsrc/bpel/asyncall.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: asyncall.vsp,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+-- $Id: asyncall.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel.vsp b/binsrc/bpel/bpel.vsp
index 6d536a0..3968d72 100644
--- a/binsrc/bpel/bpel.vsp
+++ b/binsrc/bpel/bpel.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: bpel.vsp,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+-- $Id: bpel.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel.xsd b/binsrc/bpel/bpel.xsd
index df81139..81fee5d 100644
--- a/binsrc/bpel/bpel.xsd
+++ b/binsrc/bpel/bpel.xsd
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_adaptor.cs b/binsrc/bpel/bpel_adaptor.cs
index d4bb83c..1204148 100644
--- a/binsrc/bpel/bpel_adaptor.cs
+++ b/binsrc/bpel/bpel_adaptor.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_confirm.vspx b/binsrc/bpel/bpel_confirm.vspx
index d4c5b90..7ebde61 100644
--- a/binsrc/bpel/bpel_confirm.vspx
+++ b/binsrc/bpel/bpel_confirm.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpel_confirm.vspx,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_confirm.vspx,v 1.2 2006/08/16 00:04:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_ddl.sql b/binsrc/bpel/bpel_ddl.sql
index cc06fc9..553416c 100644
--- a/binsrc/bpel/bpel_ddl.sql
+++ b/binsrc/bpel/bpel_ddl.sql
@@ -1,14 +1,14 @@
--
-- bpel_ddl.sql
--
--- $Id: bpel_ddl.sql,v 1.1.1.1.2.1 2012/03/08 12:54:55 source Exp $
+-- $Id: bpel_ddl.sql,v 1.1.1.1 2006/04/11 17:56:09 source Exp $
--
-- BPEL DB Schema
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_decor.vspx b/binsrc/bpel/bpel_decor.vspx
index 3d6d7d9..e6d9ce0 100644
--- a/binsrc/bpel/bpel_decor.vspx
+++ b/binsrc/bpel/bpel_decor.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bpel_decor.vspx,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_decor.vspx,v 1.3 2006/08/16 00:04:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_eng.sql b/binsrc/bpel/bpel_eng.sql
index 92ed0dc..31d08d2 100644
--- a/binsrc/bpel/bpel_eng.sql
+++ b/binsrc/bpel/bpel_eng.sql
@@ -1,14 +1,14 @@
--
-- bpel_eng.sql
--
--- $Id: bpel_eng.sql,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+-- $Id: bpel_eng.sql,v 1.2 2008/07/14 19:23:11 source Exp $
--
-- BPEL Script compilation & utilities
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_intrp.sql b/binsrc/bpel/bpel_intrp.sql
index 28cf575..921fa7e 100644
--- a/binsrc/bpel/bpel_intrp.sql
+++ b/binsrc/bpel/bpel_intrp.sql
@@ -1,14 +1,14 @@
--
-- Bpel_interpreter.sql
--
--- $Id: bpel_intrp.sql,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+-- $Id: bpel_intrp.sql,v 1.2 2007/03/14 14:23:25 source Exp $
--
-- BPEL Intrepreter
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_login.vspx b/binsrc/bpel/bpel_login.vspx
index a63e1cc..efb0ae7 100644
--- a/binsrc/bpel/bpel_login.vspx
+++ b/binsrc/bpel/bpel_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpel_login.vspx,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_login.vspx,v 1.2 2006/08/16 00:04:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_login_new.vspx b/binsrc/bpel/bpel_login_new.vspx
index 0e5cec5..4e4c4db 100644
--- a/binsrc/bpel/bpel_login_new.vspx
+++ b/binsrc/bpel/bpel_login_new.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpel_login_new.vspx,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_login_new.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_navigation_bar.vspx b/binsrc/bpel/bpel_navigation_bar.vspx
index 36a232c..33f9ea5 100644
--- a/binsrc/bpel/bpel_navigation_bar.vspx
+++ b/binsrc/bpel/bpel_navigation_bar.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpel_navigation_bar.vspx,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_navigation_bar.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_plinks.xsl b/binsrc/bpel/bpel_plinks.xsl
index 6e6c880..a15cf0c 100644
--- a/binsrc/bpel/bpel_plinks.xsl
+++ b/binsrc/bpel/bpel_plinks.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: bpel_plinks.xsl,v 1.3.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_plinks.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_style.xsl b/binsrc/bpel/bpel_style.xsl
index 363e183..ce97469 100644
--- a/binsrc/bpel/bpel_style.xsl
+++ b/binsrc/bpel/bpel_style.xsl
@@ -2,12 +2,12 @@
<!-- <!DOCTYPE html PUBLIC "" "ent.dtd"> -->
<!--
-
- - $Id: bpel_style.xsl,v 1.3.2.2 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_style.xsl,v 1.3.2.1 2010/01/07 16:58:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_style_new.xsl b/binsrc/bpel/bpel_style_new.xsl
index 88873c2..7596521 100644
--- a/binsrc/bpel/bpel_style_new.xsl
+++ b/binsrc/bpel/bpel_style_new.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: bpel_style_new.xsl,v 1.2.2.2 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_style_new.xsl,v 1.2.2.1 2010/01/07 16:58:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx b/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx
index e37e798..f5822e0 100644
--- a/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx
+++ b/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpel_ui_bpelwsdl_edit.vspx,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_ui_bpelwsdl_edit.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx b/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx
index 1246e5b..15da4c7 100644
--- a/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx
+++ b/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpel_ui_bpelwsdl_register.vspx,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_ui_bpelwsdl_register.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_ui_import.vspx b/binsrc/bpel/bpel_ui_import.vspx
index 2f0fb38..e93ece9 100644
--- a/binsrc/bpel/bpel_ui_import.vspx
+++ b/binsrc/bpel/bpel_ui_import.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpel_ui_import.vspx,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_ui_import.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpel_ui_import2.vspx b/binsrc/bpel/bpel_ui_import2.vspx
index 342aaaa..41d1f6b 100644
--- a/binsrc/bpel/bpel_ui_import2.vspx
+++ b/binsrc/bpel/bpel_ui_import2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpel_ui_import2.vspx,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpel_ui_import2.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelcomp.xsl b/binsrc/bpel/bpelcomp.xsl
index c0c9516..78cd0f1 100644
--- a/binsrc/bpel/bpelcomp.xsl
+++ b/binsrc/bpel/bpelcomp.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: bpelcomp.xsl,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpelcomp.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelexpn.xsl b/binsrc/bpel/bpelexpn.xsl
index 9e9b1d1..3446fc7 100644
--- a/binsrc/bpel/bpelexpn.xsl
+++ b/binsrc/bpel/bpelexpn.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpelexpn.xsl,v 1.2.2.1 2012/03/08 12:54:55 source Exp $
+ - $Id: bpelexpn.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelimport.xsl b/binsrc/bpel/bpelimport.xsl
index 817bedc..5e16002 100644
--- a/binsrc/bpel/bpelimport.xsl
+++ b/binsrc/bpel/bpelimport.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpelimport.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: bpelimport.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelmsg.xsl b/binsrc/bpel/bpelmsg.xsl
index 50f50ba..042b266 100644
--- a/binsrc/bpel/bpelmsg.xsl
+++ b/binsrc/bpel/bpelmsg.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpelmsg.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: bpelmsg.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelmsgen.xsl b/binsrc/bpel/bpelmsgen.xsl
index 3ced006..6a286d7 100644
--- a/binsrc/bpel/bpelmsgen.xsl
+++ b/binsrc/bpel/bpelmsgen.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpelmsgen.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: bpelmsgen.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpeloper.xsl b/binsrc/bpel/bpeloper.xsl
index ea1a402..b2a000e 100644
--- a/binsrc/bpel/bpeloper.xsl
+++ b/binsrc/bpel/bpeloper.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpeloper.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: bpeloper.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelstatus.xsl b/binsrc/bpel/bpelstatus.xsl
index 8f885a2..c1ca02c 100644
--- a/binsrc/bpel/bpelstatus.xsl
+++ b/binsrc/bpel/bpelstatus.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bpelstatus.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: bpelstatus.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelv.xsd b/binsrc/bpel/bpelv.xsd
index bc5892e..1705d7a 100644
--- a/binsrc/bpel/bpelv.xsd
+++ b/binsrc/bpel/bpelv.xsd
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelwsdl.xsl b/binsrc/bpel/bpelwsdl.xsl
index 7e55686..620c3fb 100644
--- a/binsrc/bpel/bpelwsdl.xsl
+++ b/binsrc/bpel/bpelwsdl.xsl
@@ -5,12 +5,12 @@
]>
<!--
-
- - $Id: bpelwsdl.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: bpelwsdl.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/bpelx.xsd b/binsrc/bpel/bpelx.xsd
index 0ac3b25..39be785 100644
--- a/binsrc/bpel/bpelx.xsd
+++ b/binsrc/bpel/bpelx.xsd
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/browser.vspx b/binsrc/bpel/browser.vspx
index fd46bf7..8f89c35 100644
--- a/binsrc/bpel/browser.vspx
+++ b/binsrc/bpel/browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: browser.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: browser.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/common.xsl b/binsrc/bpel/common.xsl
index 9a0bd7c..542981a 100644
--- a/binsrc/bpel/common.xsl
+++ b/binsrc/bpel/common.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: common.xsl,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: common.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/configure.vspx b/binsrc/bpel/configure.vspx
index b3c3cb5..3b9f68d 100644
--- a/binsrc/bpel/configure.vspx
+++ b/binsrc/bpel/configure.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: configure.vspx,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: configure.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/debug.vsp b/binsrc/bpel/debug.vsp
index a37fb2d..9d288d2 100644
--- a/binsrc/bpel/debug.vsp
+++ b/binsrc/bpel/debug.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: debug.vsp,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: debug.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/default.css b/binsrc/bpel/default.css
index a173984..c37b771 100644
--- a/binsrc/bpel/default.css
+++ b/binsrc/bpel/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ * $Id: default.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/drop.sql b/binsrc/bpel/drop.sql
index be277d1..da9b7a7 100644
--- a/binsrc/bpel/drop.sql
+++ b/binsrc/bpel/drop.sql
@@ -1,14 +1,14 @@
--
-- drop.sql
--
--- $Id: drop.sql,v 1.1.1.1.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: drop.sql,v 1.1.1.1 2006/04/11 17:56:09 source Exp $
--
-- BPEL uninstall operations
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/drop_prc.sql b/binsrc/bpel/drop_prc.sql
index b63d1ad..b0fde83 100644
--- a/binsrc/bpel/drop_prc.sql
+++ b/binsrc/bpel/drop_prc.sql
@@ -1,14 +1,14 @@
--
-- drop_hosts.sql
--
--- $Id: drop_prc.sql,v 1.1.1.1.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: drop_prc.sql,v 1.1.1.1 2006/04/11 17:56:09 source Exp $
--
-- Delete from BPEL.BPEL.script to activate triggers for removing defined Virtual Directories
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/error.vspx b/binsrc/bpel/error.vspx
index 1af4ab9..6220cc9 100644
--- a/binsrc/bpel/error.vspx
+++ b/binsrc/bpel/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: error.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/filesystem.sql b/binsrc/bpel/filesystem.sql
index 917dc0d..4f755e4 100644
--- a/binsrc/bpel/filesystem.sql
+++ b/binsrc/bpel/filesystem.sql
@@ -1,10 +1,10 @@
--
--- $Id: filesystem.sql,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: filesystem.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/genwsdl.xsl b/binsrc/bpel/genwsdl.xsl
index d6b3cb3..4a952e5 100644
--- a/binsrc/bpel/genwsdl.xsl
+++ b/binsrc/bpel/genwsdl.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: genwsdl.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: genwsdl.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help.vspx b/binsrc/bpel/help.vspx
index 538be1f..3df5016 100644
--- a/binsrc/bpel/help.vspx
+++ b/binsrc/bpel/help.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: help.vspx,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: help.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help.xsl b/binsrc/bpel/help.xsl
index ee75167..4054e9d 100644
--- a/binsrc/bpel/help.xsl
+++ b/binsrc/bpel/help.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: help.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: help.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/browser.xml b/binsrc/bpel/help/browser.xml
index 77159e4..0147017 100644
--- a/binsrc/bpel/help/browser.xml
+++ b/binsrc/bpel/help/browser.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/configure.xml b/binsrc/bpel/help/configure.xml
index 9eb93e1..e0fd598 100644
--- a/binsrc/bpel/help/configure.xml
+++ b/binsrc/bpel/help/configure.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/confirm.xml b/binsrc/bpel/help/confirm.xml
index 52af26c..962827c 100644
--- a/binsrc/bpel/help/confirm.xml
+++ b/binsrc/bpel/help/confirm.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/imsgpr.xml b/binsrc/bpel/help/imsgpr.xml
index 7b71a9e..f5fdeeb 100644
--- a/binsrc/bpel/help/imsgpr.xml
+++ b/binsrc/bpel/help/imsgpr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/incoming.xml b/binsrc/bpel/help/incoming.xml
index d62b440..a6d1eaa 100644
--- a/binsrc/bpel/help/incoming.xml
+++ b/binsrc/bpel/help/incoming.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/instances.xml b/binsrc/bpel/help/instances.xml
index 45e4e54..0eb27b3 100644
--- a/binsrc/bpel/help/instances.xml
+++ b/binsrc/bpel/help/instances.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/message.xml b/binsrc/bpel/help/message.xml
index 2abdb61..f0ae746 100644
--- a/binsrc/bpel/help/message.xml
+++ b/binsrc/bpel/help/message.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/omsgpr.xml b/binsrc/bpel/help/omsgpr.xml
index 933048c..bfef33d 100644
--- a/binsrc/bpel/help/omsgpr.xml
+++ b/binsrc/bpel/help/omsgpr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/plinks.xml b/binsrc/bpel/help/plinks.xml
index 07a91f7..eac85e2 100644
--- a/binsrc/bpel/help/plinks.xml
+++ b/binsrc/bpel/help/plinks.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/plinks_props.xml b/binsrc/bpel/help/plinks_props.xml
index 59fc970..e5343fc 100644
--- a/binsrc/bpel/help/plinks_props.xml
+++ b/binsrc/bpel/help/plinks_props.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/process_activity.xml b/binsrc/bpel/help/process_activity.xml
index 160a51d..aeae5c1 100644
--- a/binsrc/bpel/help/process_activity.xml
+++ b/binsrc/bpel/help/process_activity.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/process_audit.xml b/binsrc/bpel/help/process_audit.xml
index 7253ed3..dbfbb06 100644
--- a/binsrc/bpel/help/process_audit.xml
+++ b/binsrc/bpel/help/process_audit.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/process_graph.xml b/binsrc/bpel/help/process_graph.xml
index 4b3c572..1d4b97e 100644
--- a/binsrc/bpel/help/process_graph.xml
+++ b/binsrc/bpel/help/process_graph.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/process_list.xml b/binsrc/bpel/help/process_list.xml
index 125c7c8..9bfb1ff 100644
--- a/binsrc/bpel/help/process_list.xml
+++ b/binsrc/bpel/help/process_list.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/process_redef.xml b/binsrc/bpel/help/process_redef.xml
index dada4dd..da2ec3e 100644
--- a/binsrc/bpel/help/process_redef.xml
+++ b/binsrc/bpel/help/process_redef.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/process_redefine.xml b/binsrc/bpel/help/process_redefine.xml
index f35a85d..363f0b6 100644
--- a/binsrc/bpel/help/process_redefine.xml
+++ b/binsrc/bpel/help/process_redefine.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/process_status.xml b/binsrc/bpel/help/process_status.xml
index ffc69bb..6c5339a 100644
--- a/binsrc/bpel/help/process_status.xml
+++ b/binsrc/bpel/help/process_status.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/process_upload.xml b/binsrc/bpel/help/process_upload.xml
index 12922e4..c91d896 100644
--- a/binsrc/bpel/help/process_upload.xml
+++ b/binsrc/bpel/help/process_upload.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/processes_list.xml b/binsrc/bpel/help/processes_list.xml
index f2dc5bf..9523afd 100644
--- a/binsrc/bpel/help/processes_list.xml
+++ b/binsrc/bpel/help/processes_list.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/reports.xml b/binsrc/bpel/help/reports.xml
index 0176961..6791766 100644
--- a/binsrc/bpel/help/reports.xml
+++ b/binsrc/bpel/help/reports.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/rmsgpr.xml b/binsrc/bpel/help/rmsgpr.xml
index ca8d078..9de6dd1 100644
--- a/binsrc/bpel/help/rmsgpr.xml
+++ b/binsrc/bpel/help/rmsgpr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/statendp.xml b/binsrc/bpel/help/statendp.xml
index e8055fa..3f2442e 100644
--- a/binsrc/bpel/help/statendp.xml
+++ b/binsrc/bpel/help/statendp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/statproc.xml b/binsrc/bpel/help/statproc.xml
index bd63e10..147dc5d 100644
--- a/binsrc/bpel/help/statproc.xml
+++ b/binsrc/bpel/help/statproc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/help/wss_keys.xml b/binsrc/bpel/help/wss_keys.xml
index b072149..ff26b93 100644
--- a/binsrc/bpel/help/wss_keys.xml
+++ b/binsrc/bpel/help/wss_keys.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/home.vspx b/binsrc/bpel/home.vspx
index dc7702a..3081b93 100644
--- a/binsrc/bpel/home.vspx
+++ b/binsrc/bpel/home.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: home.vspx,v 1.4.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: home.vspx,v 1.4 2008/04/18 14:05:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/imsgpr.vspx b/binsrc/bpel/imsgpr.vspx
index 39d44b5..ab9d999 100644
--- a/binsrc/bpel/imsgpr.vspx
+++ b/binsrc/bpel/imsgpr.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: imsgpr.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: imsgpr.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/incoming.vspx b/binsrc/bpel/incoming.vspx
index 82be318..bef19ae 100644
--- a/binsrc/bpel/incoming.vspx
+++ b/binsrc/bpel/incoming.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: incoming.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: incoming.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/install.sql b/binsrc/bpel/install.sql
index 1147b24..9321253 100644
--- a/binsrc/bpel/install.sql
+++ b/binsrc/bpel/install.sql
@@ -1,14 +1,14 @@
--
-- install.sql
--
--- $Id: install.sql,v 1.1.1.1.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: install.sql,v 1.1.1.1 2006/04/11 17:56:09 source Exp $
--
-- BPEL support procedures
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/instances.vspx b/binsrc/bpel/instances.vspx
index 0ea2d63..4dd1666 100644
--- a/binsrc/bpel/instances.vspx
+++ b/binsrc/bpel/instances.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: instances.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: instances.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/main_tabs.vspx b/binsrc/bpel/main_tabs.vspx
index 933c9b2..8aff065 100644
--- a/binsrc/bpel/main_tabs.vspx
+++ b/binsrc/bpel/main_tabs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: main_tabs.vspx,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: main_tabs.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/make_vad.sh b/binsrc/bpel/make_vad.sh
index 853b0f9..74ae80b 100755
--- a/binsrc/bpel/make_vad.sh
+++ b/binsrc/bpel/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.13.2.3 2012/03/08 12:54:56 source Exp $
+# $Id: make_vad.sh,v 1.13.2.2 2011/02/03 10:36:50 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -318,7 +318,7 @@ sticker_init() {
echo " <name package=\"bpel4ws\">" >> $STICKER
echo " <prop name=\"Title\" value=\"BPEL4WS\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/bpel/message.vspx b/binsrc/bpel/message.vspx
index 8e7c584..d66f56d 100644
--- a/binsrc/bpel/message.vspx
+++ b/binsrc/bpel/message.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: message.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: message.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/omsgpr.vspx b/binsrc/bpel/omsgpr.vspx
index 7c76397..bfc2fd9 100644
--- a/binsrc/bpel/omsgpr.vspx
+++ b/binsrc/bpel/omsgpr.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: omsgpr.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: omsgpr.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/plinks.vspx b/binsrc/bpel/plinks.vspx
index efdf5b3..1c3d209 100644
--- a/binsrc/bpel/plinks.vspx
+++ b/binsrc/bpel/plinks.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: plinks.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: plinks.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/plinks_props.vspx b/binsrc/bpel/plinks_props.vspx
index ec8bd2a..a39c6f1 100644
--- a/binsrc/bpel/plinks_props.vspx
+++ b/binsrc/bpel/plinks_props.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: plinks_props.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: plinks_props.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/process.sql b/binsrc/bpel/process.sql
index ff1fb76..e4adb99 100644
--- a/binsrc/bpel/process.sql
+++ b/binsrc/bpel/process.sql
@@ -1,14 +1,14 @@
--
-- process.sql
--
--- $Id: process.sql,v 1.1.1.1.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: process.sql,v 1.1.1.1 2006/04/11 17:56:09 source Exp $
--
-- BPEL support view/procedures
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/process.vspx b/binsrc/bpel/process.vspx
index e518bb7..a43e289 100644
--- a/binsrc/bpel/process.vspx
+++ b/binsrc/bpel/process.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: process.vspx,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: process.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/process.xsl b/binsrc/bpel/process.xsl
index 7b7b419..5adc71e 100644
--- a/binsrc/bpel/process.xsl
+++ b/binsrc/bpel/process.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: process.xsl,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: process.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/raw.xsl b/binsrc/bpel/raw.xsl
index 03a9eed..e862a9b 100644
--- a/binsrc/bpel/raw.xsl
+++ b/binsrc/bpel/raw.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: raw.xsl,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: raw.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/reports.vspx b/binsrc/bpel/reports.vspx
index 7094221..8c85ff0 100644
--- a/binsrc/bpel/reports.vspx
+++ b/binsrc/bpel/reports.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: reports.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: reports.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/rmsgpr.vspx b/binsrc/bpel/rmsgpr.vspx
index 8d4fcea..6e11572 100644
--- a/binsrc/bpel/rmsgpr.vspx
+++ b/binsrc/bpel/rmsgpr.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rmsgpr.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: rmsgpr.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/script.vspx b/binsrc/bpel/script.vspx
index 390efc4..da34646 100644
--- a/binsrc/bpel/script.vspx
+++ b/binsrc/bpel/script.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: script.vspx,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: script.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/script.xsl b/binsrc/bpel/script.xsl
index fb101f6..0f5f1c4 100644
--- a/binsrc/bpel/script.xsl
+++ b/binsrc/bpel/script.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: script.xsl,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: script.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/start.vsp b/binsrc/bpel/start.vsp
index 430b759..e874e0d 100644
--- a/binsrc/bpel/start.vsp
+++ b/binsrc/bpel/start.vsp
@@ -1,12 +1,12 @@
<html>
<?vsp
--
--- $Id: start.vsp,v 1.2.2.2 2012/03/08 12:54:56 source Exp $
+-- $Id: start.vsp,v 1.2.2.1 2010/01/07 16:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/statendp.vspx b/binsrc/bpel/statendp.vspx
index 662cb07..fdb1199 100644
--- a/binsrc/bpel/statendp.vspx
+++ b/binsrc/bpel/statendp.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: statendp.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: statendp.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/statproc.vspx b/binsrc/bpel/statproc.vspx
index 25c3519..b146619 100644
--- a/binsrc/bpel/statproc.vspx
+++ b/binsrc/bpel/statproc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: statproc.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: statproc.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/status.vspx b/binsrc/bpel/status.vspx
index 988256c..bd78cbf 100644
--- a/binsrc/bpel/status.vspx
+++ b/binsrc/bpel/status.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: status.vspx,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: status.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/system/bpel/bpel.xsd b/binsrc/bpel/system/bpel/bpel.xsd
index b95465a..ff6ddfb 100644
--- a/binsrc/bpel/system/bpel/bpel.xsd
+++ b/binsrc/bpel/system/bpel/bpel.xsd
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/Flow/Flow.bpel b/binsrc/bpel/tests/Flow/Flow.bpel
index 9332f51..9eeb3c3 100644
--- a/binsrc/bpel/tests/Flow/Flow.bpel
+++ b/binsrc/bpel/tests/Flow/Flow.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/Flow/Flow.wsdl b/binsrc/bpel/tests/Flow/Flow.wsdl
index c449d14..05b7066 100644
--- a/binsrc/bpel/tests/Flow/Flow.wsdl
+++ b/binsrc/bpel/tests/Flow/Flow.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/Flow/bpel.xml b/binsrc/bpel/tests/Flow/bpel.xml
index 6eca9ec..4edfc6b 100644
--- a/binsrc/bpel/tests/Flow/bpel.xml
+++ b/binsrc/bpel/tests/Flow/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/Flow/build.xml b/binsrc/bpel/tests/Flow/build.xml
index 1005814..17f7bf4 100644
--- a/binsrc/bpel/tests/Flow/build.xml
+++ b/binsrc/bpel/tests/Flow/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/Flow/ini.sql b/binsrc/bpel/tests/Flow/ini.sql
index 8b81449..a6e8276 100644
--- a/binsrc/bpel/tests/Flow/ini.sql
+++ b/binsrc/bpel/tests/Flow/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/Flow/test_tutorial.sql b/binsrc/bpel/tests/Flow/test_tutorial.sql
index 853f519..d900ff3 100644
--- a/binsrc/bpel/tests/Flow/test_tutorial.sql
+++ b/binsrc/bpel/tests/Flow/test_tutorial.sql
@@ -1,10 +1,10 @@
--
--- $Id: test_tutorial.sql,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: test_tutorial.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/CreditRating.vsp b/binsrc/bpel/tests/LoanFlow/CreditRating.vsp
index 2890dc8..e1d9d09 100644
--- a/binsrc/bpel/tests/LoanFlow/CreditRating.vsp
+++ b/binsrc/bpel/tests/LoanFlow/CreditRating.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: CreditRating.vsp,v 1.5.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: CreditRating.vsp,v 1.5 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel b/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel
index c56472f..4079cba 100644
--- a/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel
+++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.sql b/binsrc/bpel/tests/LoanFlow/LoanFlow.sql
index 43063e8..5ebc7bb 100644
--- a/binsrc/bpel/tests/LoanFlow/LoanFlow.sql
+++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.sql
@@ -1,10 +1,10 @@
--
--- $Id: LoanFlow.sql,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: LoanFlow.sql,v 1.3 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp b/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp
index aaaa2b9..ebcfd19 100644
--- a/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp
+++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: LoanFlow.vsp,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: LoanFlow.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl b/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl
index df63a21..c48a83e 100644
--- a/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl
+++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.xml b/binsrc/bpel/tests/LoanFlow/LoanFlow.xml
index b4654aa..f93fb11 100644
--- a/binsrc/bpel/tests/LoanFlow/LoanFlow.xml
+++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp b/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp
index 86971a6..ff457f1 100644
--- a/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp
+++ b/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: LoanFlowUI.vsp,v 1.3.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: LoanFlowUI.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/StarLoan.vsp b/binsrc/bpel/tests/LoanFlow/StarLoan.vsp
index c9825ce..438382e 100644
--- a/binsrc/bpel/tests/LoanFlow/StarLoan.vsp
+++ b/binsrc/bpel/tests/LoanFlow/StarLoan.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: StarLoan.vsp,v 1.5.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: StarLoan.vsp,v 1.5 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp b/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp
index b975dba..fa6431d 100644
--- a/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp
+++ b/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: UnitedLoan.vsp,v 1.5.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: UnitedLoan.vsp,v 1.5 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/bpel.xml b/binsrc/bpel/tests/LoanFlow/bpel.xml
index e15c3e2..0e43146 100644
--- a/binsrc/bpel/tests/LoanFlow/bpel.xml
+++ b/binsrc/bpel/tests/LoanFlow/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/LoanFlow/options.xml b/binsrc/bpel/tests/LoanFlow/options.xml
index cdd972c..4662044 100644
--- a/binsrc/bpel/tests/LoanFlow/options.xml
+++ b/binsrc/bpel/tests/LoanFlow/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml b/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml
index 95a3c78..0d03404 100644
--- a/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml
+++ b/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/bpel_engines/Twister/new.xml b/binsrc/bpel/tests/bpel_engines/Twister/new.xml
index 3a727e1..ac842ae 100644
--- a/binsrc/bpel/tests/bpel_engines/Twister/new.xml
+++ b/binsrc/bpel/tests/bpel_engines/Twister/new.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/bpel.xml b/binsrc/bpel/tests/echo/bpel.xml
index aaa4b6a..cb7cd41 100644
--- a/binsrc/bpel/tests/echo/bpel.xml
+++ b/binsrc/bpel/tests/echo/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/build.xml b/binsrc/bpel/tests/echo/build.xml
index 6b349da..bde727d 100644
--- a/binsrc/bpel/tests/echo/build.xml
+++ b/binsrc/bpel/tests/echo/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/doc.bpel b/binsrc/bpel/tests/echo/doc.bpel
index 25eec36..25fe08d 100644
--- a/binsrc/bpel/tests/echo/doc.bpel
+++ b/binsrc/bpel/tests/echo/doc.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/doc.wsdl b/binsrc/bpel/tests/echo/doc.wsdl
index a5b4c3e..c354725 100644
--- a/binsrc/bpel/tests/echo/doc.wsdl
+++ b/binsrc/bpel/tests/echo/doc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/echo.bpel b/binsrc/bpel/tests/echo/echo.bpel
index 6d7dac7..a7fcfeb 100644
--- a/binsrc/bpel/tests/echo/echo.bpel
+++ b/binsrc/bpel/tests/echo/echo.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/echo.vsp b/binsrc/bpel/tests/echo/echo.vsp
index 31d3b3c..9c841b2 100644
--- a/binsrc/bpel/tests/echo/echo.vsp
+++ b/binsrc/bpel/tests/echo/echo.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echo.vsp,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: echo.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/echo.wsdl b/binsrc/bpel/tests/echo/echo.wsdl
index 691b36d..f1aeb28 100644
--- a/binsrc/bpel/tests/echo/echo.wsdl
+++ b/binsrc/bpel/tests/echo/echo.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/echo.xml b/binsrc/bpel/tests/echo/echo.xml
index 1920880..f0c3f5a 100644
--- a/binsrc/bpel/tests/echo/echo.xml
+++ b/binsrc/bpel/tests/echo/echo.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/ini.sh b/binsrc/bpel/tests/echo/ini.sh
index 12c9ae3..370798b 100755
--- a/binsrc/bpel/tests/echo/ini.sh
+++ b/binsrc/bpel/tests/echo/ini.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: ini.sh,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+# $Id: ini.sh,v 1.2 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/bpel/tests/echo/ini.sql b/binsrc/bpel/tests/echo/ini.sql
index 127d40c..3044fbd 100644
--- a/binsrc/bpel/tests/echo/ini.sql
+++ b/binsrc/bpel/tests/echo/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/options.xml b/binsrc/bpel/tests/echo/options.xml
index ce971ec..0079d45 100644
--- a/binsrc/bpel/tests/echo/options.xml
+++ b/binsrc/bpel/tests/echo/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/sdoc.wsdl b/binsrc/bpel/tests/echo/sdoc.wsdl
index ee73ce1..3c46dc4 100644
--- a/binsrc/bpel/tests/echo/sdoc.wsdl
+++ b/binsrc/bpel/tests/echo/sdoc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/svc.sql b/binsrc/bpel/tests/echo/svc.sql
index 312f9a2..84529fb 100644
--- a/binsrc/bpel/tests/echo/svc.sql
+++ b/binsrc/bpel/tests/echo/svc.sql
@@ -1,10 +1,10 @@
--
--- $Id: svc.sql,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: svc.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echo/synsvc.wsdl b/binsrc/bpel/tests/echo/synsvc.wsdl
index d0c040f..8cc2985 100644
--- a/binsrc/bpel/tests/echo/synsvc.wsdl
+++ b/binsrc/bpel/tests/echo/synsvc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echovirt/bpel.xml b/binsrc/bpel/tests/echovirt/bpel.xml
index eb96ab4..b777206 100644
--- a/binsrc/bpel/tests/echovirt/bpel.xml
+++ b/binsrc/bpel/tests/echovirt/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echovirt/build.xml b/binsrc/bpel/tests/echovirt/build.xml
index 3782c20..d1fa920 100644
--- a/binsrc/bpel/tests/echovirt/build.xml
+++ b/binsrc/bpel/tests/echovirt/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echovirt/echovirt.bpel b/binsrc/bpel/tests/echovirt/echovirt.bpel
index ee20184..d00de0b 100644
--- a/binsrc/bpel/tests/echovirt/echovirt.bpel
+++ b/binsrc/bpel/tests/echovirt/echovirt.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echovirt/echovirt.wsdl b/binsrc/bpel/tests/echovirt/echovirt.wsdl
index 45f02d7..9f6dee0 100644
--- a/binsrc/bpel/tests/echovirt/echovirt.wsdl
+++ b/binsrc/bpel/tests/echovirt/echovirt.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echovirt/echovirtNew.bpel b/binsrc/bpel/tests/echovirt/echovirtNew.bpel
index d002932..96b47e4 100644
--- a/binsrc/bpel/tests/echovirt/echovirtNew.bpel
+++ b/binsrc/bpel/tests/echovirt/echovirtNew.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/echovirt/ini.sql b/binsrc/bpel/tests/echovirt/ini.sql
index 368f0dd..df28b6e 100644
--- a/binsrc/bpel/tests/echovirt/ini.sql
+++ b/binsrc/bpel/tests/echovirt/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/Restart.bpel b/binsrc/bpel/tests/fault1/Restart.bpel
index 5dd2b27..4b72ad8 100644
--- a/binsrc/bpel/tests/fault1/Restart.bpel
+++ b/binsrc/bpel/tests/fault1/Restart.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/Restart.wsdl b/binsrc/bpel/tests/fault1/Restart.wsdl
index 535211e..aac4670 100644
--- a/binsrc/bpel/tests/fault1/Restart.wsdl
+++ b/binsrc/bpel/tests/fault1/Restart.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel b/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel
index f31c25c..744c461 100644
--- a/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel
+++ b/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl b/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl
index ae6ede9..8521658 100644
--- a/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl
+++ b/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/While.bpel b/binsrc/bpel/tests/fault1/While.bpel
index b5481fd..76ce2da 100644
--- a/binsrc/bpel/tests/fault1/While.bpel
+++ b/binsrc/bpel/tests/fault1/While.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/While.wsdl b/binsrc/bpel/tests/fault1/While.wsdl
index f851487..9ca48b8 100644
--- a/binsrc/bpel/tests/fault1/While.wsdl
+++ b/binsrc/bpel/tests/fault1/While.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/check.sql b/binsrc/bpel/tests/fault1/check.sql
index 9aa0d97..d3afd46 100644
--- a/binsrc/bpel/tests/fault1/check.sql
+++ b/binsrc/bpel/tests/fault1/check.sql
@@ -1,10 +1,10 @@
--
--- $Id: check.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: check.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/check2.sql b/binsrc/bpel/tests/fault1/check2.sql
index 6443115..aace7c3 100644
--- a/binsrc/bpel/tests/fault1/check2.sql
+++ b/binsrc/bpel/tests/fault1/check2.sql
@@ -1,10 +1,10 @@
--
--- $Id: check2.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: check2.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/clr.sql b/binsrc/bpel/tests/fault1/clr.sql
index b98cc27..aad9049 100644
--- a/binsrc/bpel/tests/fault1/clr.sql
+++ b/binsrc/bpel/tests/fault1/clr.sql
@@ -1,10 +1,10 @@
--
--- $Id: clr.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: clr.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec.bpel b/binsrc/bpel/tests/fault1/clr_exec.bpel
index 6cf8da9..d89e401 100644
--- a/binsrc/bpel/tests/fault1/clr_exec.bpel
+++ b/binsrc/bpel/tests/fault1/clr_exec.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec.vsp b/binsrc/bpel/tests/fault1/clr_exec.vsp
index 1670cf3..3898381 100644
--- a/binsrc/bpel/tests/fault1/clr_exec.vsp
+++ b/binsrc/bpel/tests/fault1/clr_exec.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: clr_exec.vsp,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: clr_exec.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec.wsdl b/binsrc/bpel/tests/fault1/clr_exec.wsdl
index 6828971..db21462 100644
--- a/binsrc/bpel/tests/fault1/clr_exec.wsdl
+++ b/binsrc/bpel/tests/fault1/clr_exec.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec.xml b/binsrc/bpel/tests/fault1/clr_exec.xml
index 81865fd..40368af 100644
--- a/binsrc/bpel/tests/fault1/clr_exec.xml
+++ b/binsrc/bpel/tests/fault1/clr_exec.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec_bpel.xml b/binsrc/bpel/tests/fault1/clr_exec_bpel.xml
index b8de196..06674eb 100644
--- a/binsrc/bpel/tests/fault1/clr_exec_bpel.xml
+++ b/binsrc/bpel/tests/fault1/clr_exec_bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/clr_exec_desc.xml b/binsrc/bpel/tests/fault1/clr_exec_desc.xml
index 2ec04bf..507fe5a 100644
--- a/binsrc/bpel/tests/fault1/clr_exec_desc.xml
+++ b/binsrc/bpel/tests/fault1/clr_exec_desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/comp1.bpel b/binsrc/bpel/tests/fault1/comp1.bpel
index bdcd68b..d59cbc7 100644
--- a/binsrc/bpel/tests/fault1/comp1.bpel
+++ b/binsrc/bpel/tests/fault1/comp1.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/fault.bpel b/binsrc/bpel/tests/fault1/fault.bpel
index d660b0b..850fd14 100644
--- a/binsrc/bpel/tests/fault1/fault.bpel
+++ b/binsrc/bpel/tests/fault1/fault.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/fault.wsdl b/binsrc/bpel/tests/fault1/fault.wsdl
index e5f8ad6..47bca3a 100644
--- a/binsrc/bpel/tests/fault1/fault.wsdl
+++ b/binsrc/bpel/tests/fault1/fault.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/fault2.bpel b/binsrc/bpel/tests/fault1/fault2.bpel
index edd8e5a..6b3d5dd 100644
--- a/binsrc/bpel/tests/fault1/fault2.bpel
+++ b/binsrc/bpel/tests/fault1/fault2.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/fault3.bpel b/binsrc/bpel/tests/fault1/fault3.bpel
index 358f04e..0b2e019 100644
--- a/binsrc/bpel/tests/fault1/fault3.bpel
+++ b/binsrc/bpel/tests/fault1/fault3.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/faultHTCLI.bpel b/binsrc/bpel/tests/fault1/faultHTCLI.bpel
index 9e294a3..26c69c9 100644
--- a/binsrc/bpel/tests/fault1/faultHTCLI.bpel
+++ b/binsrc/bpel/tests/fault1/faultHTCLI.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/incsvcwsdl.vsp b/binsrc/bpel/tests/fault1/incsvcwsdl.vsp
index b6173d6..3822abf 100644
--- a/binsrc/bpel/tests/fault1/incsvcwsdl.vsp
+++ b/binsrc/bpel/tests/fault1/incsvcwsdl.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: incsvcwsdl.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: incsvcwsdl.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/ini.sql b/binsrc/bpel/tests/fault1/ini.sql
index d89764f..56486fb 100644
--- a/binsrc/bpel/tests/fault1/ini.sql
+++ b/binsrc/bpel/tests/fault1/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: ini.sql,v 1.3 2008/01/18 13:57:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/ini2.sql b/binsrc/bpel/tests/fault1/ini2.sql
index 8d79154..1dd7058 100644
--- a/binsrc/bpel/tests/fault1/ini2.sql
+++ b/binsrc/bpel/tests/fault1/ini2.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini2.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: ini2.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/inv.sql b/binsrc/bpel/tests/fault1/inv.sql
index d850640..b2fcaa4 100644
--- a/binsrc/bpel/tests/fault1/inv.sql
+++ b/binsrc/bpel/tests/fault1/inv.sql
@@ -1,10 +1,10 @@
--
--- $Id: inv.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: inv.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/java.sql b/binsrc/bpel/tests/fault1/java.sql
index 37c59ba..146d552 100644
--- a/binsrc/bpel/tests/fault1/java.sql
+++ b/binsrc/bpel/tests/fault1/java.sql
@@ -1,10 +1,10 @@
--
--- $Id: java.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: java.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/java_exec.bpel b/binsrc/bpel/tests/fault1/java_exec.bpel
index 31b95cc..b6a1c99 100644
--- a/binsrc/bpel/tests/fault1/java_exec.bpel
+++ b/binsrc/bpel/tests/fault1/java_exec.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/java_exec.vsp b/binsrc/bpel/tests/fault1/java_exec.vsp
index f9598c1..69c133b 100644
--- a/binsrc/bpel/tests/fault1/java_exec.vsp
+++ b/binsrc/bpel/tests/fault1/java_exec.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: java_exec.vsp,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: java_exec.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/java_exec.wsdl b/binsrc/bpel/tests/fault1/java_exec.wsdl
index 90349ee..853efd9 100644
--- a/binsrc/bpel/tests/fault1/java_exec.wsdl
+++ b/binsrc/bpel/tests/fault1/java_exec.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/java_exec.xml b/binsrc/bpel/tests/fault1/java_exec.xml
index e39322d..040cd40 100644
--- a/binsrc/bpel/tests/fault1/java_exec.xml
+++ b/binsrc/bpel/tests/fault1/java_exec.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/java_exec_bpel.xml b/binsrc/bpel/tests/fault1/java_exec_bpel.xml
index 193bba0..7075fe5 100644
--- a/binsrc/bpel/tests/fault1/java_exec_bpel.xml
+++ b/binsrc/bpel/tests/fault1/java_exec_bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/java_exec_desc.xml b/binsrc/bpel/tests/fault1/java_exec_desc.xml
index a154c3e..f76fdf5 100644
--- a/binsrc/bpel/tests/fault1/java_exec_desc.xml
+++ b/binsrc/bpel/tests/fault1/java_exec_desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/servicewsdl.vsp b/binsrc/bpel/tests/fault1/servicewsdl.vsp
index 51c21e9..81db99d 100644
--- a/binsrc/bpel/tests/fault1/servicewsdl.vsp
+++ b/binsrc/bpel/tests/fault1/servicewsdl.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: servicewsdl.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: servicewsdl.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/sql_exec.bpel b/binsrc/bpel/tests/fault1/sql_exec.bpel
index c767af2..c4c34d0 100644
--- a/binsrc/bpel/tests/fault1/sql_exec.bpel
+++ b/binsrc/bpel/tests/fault1/sql_exec.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fault1/sql_exec.wsdl b/binsrc/bpel/tests/fault1/sql_exec.wsdl
index a4c7e29..7faed29 100644
--- a/binsrc/bpel/tests/fault1/sql_exec.wsdl
+++ b/binsrc/bpel/tests/fault1/sql_exec.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/bpel.xml b/binsrc/bpel/tests/fi/bpel.xml
index 3a84f6d..8ddeae9 100644
--- a/binsrc/bpel/tests/fi/bpel.xml
+++ b/binsrc/bpel/tests/fi/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fi.bpel b/binsrc/bpel/tests/fi/fi.bpel
index f0bc700..97afc9e 100644
--- a/binsrc/bpel/tests/fi/fi.bpel
+++ b/binsrc/bpel/tests/fi/fi.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fi.vsp b/binsrc/bpel/tests/fi/fi.vsp
index ab0a5a0..a7efa52 100644
--- a/binsrc/bpel/tests/fi/fi.vsp
+++ b/binsrc/bpel/tests/fi/fi.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: fi.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: fi.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fi.wsdl b/binsrc/bpel/tests/fi/fi.wsdl
index 90b0479..0c59a3e 100644
--- a/binsrc/bpel/tests/fi/fi.wsdl
+++ b/binsrc/bpel/tests/fi/fi.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fi.xml b/binsrc/bpel/tests/fi/fi.xml
index 8a40bc8..d6e3efa 100644
--- a/binsrc/bpel/tests/fi/fi.xml
+++ b/binsrc/bpel/tests/fi/fi.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fi_wsdl.vsp b/binsrc/bpel/tests/fi/fi_wsdl.vsp
index 49a96e3..c08051f 100644
--- a/binsrc/bpel/tests/fi/fi_wsdl.vsp
+++ b/binsrc/bpel/tests/fi/fi_wsdl.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: fi_wsdl.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: fi_wsdl.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fia.bpel b/binsrc/bpel/tests/fi/fia.bpel
index 4515709..fea6402 100644
--- a/binsrc/bpel/tests/fi/fia.bpel
+++ b/binsrc/bpel/tests/fi/fia.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fia.wsdl b/binsrc/bpel/tests/fi/fia.wsdl
index 644ff68..31fa413 100644
--- a/binsrc/bpel/tests/fi/fia.wsdl
+++ b/binsrc/bpel/tests/fi/fia.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fib.bpel b/binsrc/bpel/tests/fi/fib.bpel
index 3583609..9336496 100644
--- a/binsrc/bpel/tests/fi/fib.bpel
+++ b/binsrc/bpel/tests/fi/fib.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/fib.wsdl b/binsrc/bpel/tests/fi/fib.wsdl
index 67c2356..0bc0521 100644
--- a/binsrc/bpel/tests/fi/fib.wsdl
+++ b/binsrc/bpel/tests/fi/fib.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/ini.sql b/binsrc/bpel/tests/fi/ini.sql
index 8662f4c..b0dba41 100644
--- a/binsrc/bpel/tests/fi/ini.sql
+++ b/binsrc/bpel/tests/fi/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/inv.sql b/binsrc/bpel/tests/fi/inv.sql
index 2354433..9f4ad51 100644
--- a/binsrc/bpel/tests/fi/inv.sql
+++ b/binsrc/bpel/tests/fi/inv.sql
@@ -1,10 +1,10 @@
--
--- $Id: inv.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: inv.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/options.xml b/binsrc/bpel/tests/fi/options.xml
index e03f0e6..f95179b 100644
--- a/binsrc/bpel/tests/fi/options.xml
+++ b/binsrc/bpel/tests/fi/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/fi/service.vsp b/binsrc/bpel/tests/fi/service.vsp
index 233322d..60a680a 100644
--- a/binsrc/bpel/tests/fi/service.vsp
+++ b/binsrc/bpel/tests/fi/service.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: service.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: service.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/index.vsp b/binsrc/bpel/tests/index.vsp
index a327d16..0f454ee 100644
--- a/binsrc/bpel/tests/index.vsp
+++ b/binsrc/bpel/tests/index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index.vsp,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: index.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/index.xml b/binsrc/bpel/tests/index.xml
index fb37727..a09b76f 100644
--- a/binsrc/bpel/tests/index.xml
+++ b/binsrc/bpel/tests/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel
index 05e32b9..a670f90 100644
--- a/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel
+++ b/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel
index 2a2bc2e..90cff9d 100644
--- a/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel
+++ b/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel
index 48e8089..37ff055 100644
--- a/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel
+++ b/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel
index 1a75423..1eeca1a 100644
--- a/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel
+++ b/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel
index 7121ccf..ba1ce50 100644
--- a/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel
+++ b/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel
index c92354f..adb16b4 100644
--- a/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel
+++ b/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01.sql b/binsrc/bpel/tests/interop/UseCases/MS01.sql
index 3833b9d..17a96b4 100644
--- a/binsrc/bpel/tests/interop/UseCases/MS01.sql
+++ b/binsrc/bpel/tests/interop/UseCases/MS01.sql
@@ -1,10 +1,10 @@
--
--- $Id: MS01.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: MS01.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/MS01.wsdl b/binsrc/bpel/tests/interop/UseCases/MS01.wsdl
index 9482fd7..785db0a 100644
--- a/binsrc/bpel/tests/interop/UseCases/MS01.wsdl
+++ b/binsrc/bpel/tests/interop/UseCases/MS01.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/UseCases.vsp b/binsrc/bpel/tests/interop/UseCases/UseCases.vsp
index 6460a89..3399e5f 100644
--- a/binsrc/bpel/tests/interop/UseCases/UseCases.vsp
+++ b/binsrc/bpel/tests/interop/UseCases/UseCases.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: UseCases.vsp,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: UseCases.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/UseCases/UseCases.xml b/binsrc/bpel/tests/interop/UseCases/UseCases.xml
index ee76e28..dbd9840 100644
--- a/binsrc/bpel/tests/interop/UseCases/UseCases.xml
+++ b/binsrc/bpel/tests/interop/UseCases/UseCases.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel b/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel
index 09d84f0..ebccc7b 100644
--- a/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel
+++ b/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.sql b/binsrc/bpel/tests/interop/WSE2.0/Sec.sql
index 4a061c1..6a4faf8 100644
--- a/binsrc/bpel/tests/interop/WSE2.0/Sec.sql
+++ b/binsrc/bpel/tests/interop/WSE2.0/Sec.sql
@@ -1,10 +1,10 @@
--
--- $Id: Sec.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: Sec.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl b/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl
index a5b4c3e..c354725 100644
--- a/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl
+++ b/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs b/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs
index 72c9cf2..cbea66b 100644
--- a/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs
+++ b/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl b/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl
index bcc7fec..e722eea 100644
--- a/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl
+++ b/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs b/binsrc/bpel/tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs
index c3bffec..840e5cf 100644
--- a/binsrc/bpel/tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs
+++ b/binsrc/bpel/tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/bpel.xml b/binsrc/bpel/tests/interop/site/Aecho/bpel.xml
index 0a1f24a..c06f6a9 100644
--- a/binsrc/bpel/tests/interop/site/Aecho/bpel.xml
+++ b/binsrc/bpel/tests/interop/site/Aecho/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/desc.xml b/binsrc/bpel/tests/interop/site/Aecho/desc.xml
index 0661425..61defb8 100644
--- a/binsrc/bpel/tests/interop/site/Aecho/desc.xml
+++ b/binsrc/bpel/tests/interop/site/Aecho/desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.bpel b/binsrc/bpel/tests/interop/site/Aecho/echo.bpel
index 5bee9db..97cd5ae 100644
--- a/binsrc/bpel/tests/interop/site/Aecho/echo.bpel
+++ b/binsrc/bpel/tests/interop/site/Aecho/echo.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.sql b/binsrc/bpel/tests/interop/site/Aecho/echo.sql
index 8d52525..0d2114c 100644
--- a/binsrc/bpel/tests/interop/site/Aecho/echo.sql
+++ b/binsrc/bpel/tests/interop/site/Aecho/echo.sql
@@ -1,10 +1,10 @@
--
--- $Id: echo.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: echo.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl b/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl
index dff997c..217019e 100644
--- a/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl
+++ b/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp
index 302d850..add2bc1 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp
+++ b/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: CreditRating.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: CreditRating.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel
index 5dd513b..3d38e1d 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel
+++ b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql
index 34992cb..ce65d66 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql
+++ b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql
@@ -1,10 +1,10 @@
--
--- $Id: LoanFlow.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: LoanFlow.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl
index df63a21..c48a83e 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl
+++ b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql
index 28d2777..95f0e67 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql
+++ b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql
@@ -1,10 +1,10 @@
--
--- $Id: LoanFlowDemo.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: LoanFlowDemo.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp
index 7c93ddc..8b376c3 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: RMLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: RMLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml
index 2ecd257..4c34afb 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml
+++ b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp
index 5270877..79e4ac6 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: StarLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: StarLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp
index 38e1de8..6c0090e 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: UnitedLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: UnitedLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml b/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml
index e15c3e2..0e43146 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml
+++ b/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/desc.xml b/binsrc/bpel/tests/interop/site/RMLoan/desc.xml
index 3ca365c..d5c3ef2 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/desc.xml
+++ b/binsrc/bpel/tests/interop/site/RMLoan/desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMLoan/options.xml b/binsrc/bpel/tests/interop/site/RMLoan/options.xml
index 3b0bc6f..f757ba4 100644
--- a/binsrc/bpel/tests/interop/site/RMLoan/options.xml
+++ b/binsrc/bpel/tests/interop/site/RMLoan/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/bpel.xml b/binsrc/bpel/tests/interop/site/RMecho/bpel.xml
index b93f47b..06817ae 100644
--- a/binsrc/bpel/tests/interop/site/RMecho/bpel.xml
+++ b/binsrc/bpel/tests/interop/site/RMecho/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/desc.xml b/binsrc/bpel/tests/interop/site/RMecho/desc.xml
index 10ddab3..bd8ecae 100644
--- a/binsrc/bpel/tests/interop/site/RMecho/desc.xml
+++ b/binsrc/bpel/tests/interop/site/RMecho/desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.bpel b/binsrc/bpel/tests/interop/site/RMecho/echo.bpel
index 59819b3..b051db5 100644
--- a/binsrc/bpel/tests/interop/site/RMecho/echo.bpel
+++ b/binsrc/bpel/tests/interop/site/RMecho/echo.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.sql b/binsrc/bpel/tests/interop/site/RMecho/echo.sql
index 2285bc1..2d37a51 100644
--- a/binsrc/bpel/tests/interop/site/RMecho/echo.sql
+++ b/binsrc/bpel/tests/interop/site/RMecho/echo.sql
@@ -1,10 +1,10 @@
--
--- $Id: echo.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: echo.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl b/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl
index 66f9f7c..6366360 100644
--- a/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl
+++ b/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml b/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml
index 8df179a..656c0f2 100644
--- a/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml
+++ b/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/desc.xml b/binsrc/bpel/tests/interop/site/SecAecho/desc.xml
index 160f053..885adf0 100644
--- a/binsrc/bpel/tests/interop/site/SecAecho/desc.xml
+++ b/binsrc/bpel/tests/interop/site/SecAecho/desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel b/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel
index 407ab9b..8c58cf0 100644
--- a/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel
+++ b/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.sql b/binsrc/bpel/tests/interop/site/SecAecho/echo.sql
index 424a30a..d5d97c9 100644
--- a/binsrc/bpel/tests/interop/site/SecAecho/echo.sql
+++ b/binsrc/bpel/tests/interop/site/SecAecho/echo.sql
@@ -1,10 +1,10 @@
--
--- $Id: echo.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: echo.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl b/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl
index dff997c..217019e 100644
--- a/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl
+++ b/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp
index 9b647df..847dbb8 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp
+++ b/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: CreditRating.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: CreditRating.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel
index 5dd513b..3d38e1d 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel
+++ b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql
index 3696edb..24e64c2 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql
+++ b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql
@@ -1,10 +1,10 @@
--
--- $Id: LoanFlow.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: LoanFlow.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl
index df63a21..c48a83e 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl
+++ b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql
index 20f0fae..c654fbb 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql
+++ b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql
@@ -1,10 +1,10 @@
--
--- $Id: LoanFlowDemo.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: LoanFlowDemo.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp
index 8b7677c..3ad4cb1 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: SecLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: SecLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml
index a746e58..aeb9c5c 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml
+++ b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp
index 02a7d78..e47dd3d 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: StarLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: StarLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp
index ce3acdf..0843808 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: UnitedLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: UnitedLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml b/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml
index e15c3e2..0e43146 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml
+++ b/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/desc.xml b/binsrc/bpel/tests/interop/site/SecLoan/desc.xml
index e9fac6a..4a45c40 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/desc.xml
+++ b/binsrc/bpel/tests/interop/site/SecLoan/desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecLoan/options.xml b/binsrc/bpel/tests/interop/site/SecLoan/options.xml
index 3b0bc6f..f757ba4 100644
--- a/binsrc/bpel/tests/interop/site/SecLoan/options.xml
+++ b/binsrc/bpel/tests/interop/site/SecLoan/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp
index 9b647df..847dbb8 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: CreditRating.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: CreditRating.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel
index 5dd513b..3d38e1d 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql
index 8b7dc58..d826372 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql
@@ -1,10 +1,10 @@
--
--- $Id: LoanFlow.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: LoanFlow.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl
index df63a21..c48a83e 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql
index 61677e5..51780c4 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql
@@ -1,10 +1,10 @@
--
--- $Id: LoanFlowDemo.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: LoanFlowDemo.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp
index fea06d6..fcbd68b 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: SecRMLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: SecRMLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml
index ba9ab5b..a1a369c 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp
index 309c165..c134556 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: StarLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: StarLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp
index 7c76f7e..1f8ab57 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: UnitedLoan.vsp,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: UnitedLoan.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml
index e15c3e2..0e43146 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml
index f477f6e..a186901 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml
index 3b0bc6f..f757ba4 100644
--- a/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml
+++ b/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp
index 283292e..059ba12 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: about.vsp,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: about.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx
index 843a398..dec94e4 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: about.vspx,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: about.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl
index ef599b5..ab06bef 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: about.xsl,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: about.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp
index ffa04a6..20b75e3 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: bpelrsc.vsp,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: bpelrsc.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx
index 18eda0c..70ac1a4 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bpelrsc.vspx,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: bpelrsc.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl
index 6bb14be..7e5fa22 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: bpelrsc.xsl,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: bpelrsc.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx
index 4ed5940..8a9aa54 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bpeluct.vspx,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: bpeluct.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx
index d3de3c8..bcb293f 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: aechoUI.vspx,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: aechoUI.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx
index 99448f7..5fa33b1 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: echoUI.vspx,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: echoUI.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx
index ef9df8c..06590b5 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rmechoUI.vspx,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: rmechoUI.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx
index b089de3..212c5c3 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rmloanUI.vspx,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: rmloanUI.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx
index 1810ef6..e2aa7a9 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: secechoUI.vspx,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: secechoUI.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx
index 709f825..ec4e7d1 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: secloanUI.vspx,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: secloanUI.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx
index 9ef08d3..c5003d4 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: secrmloanUI.vspx,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: secrmloanUI.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx
index 1ff5b08..8519f6a 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: viewres.vspx,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: viewres.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl
index 7f8d01e..6fac2cc 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: common.xsl,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: common.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/default.css b/binsrc/bpel/tests/interop/site/bpel4ws/default.css
index c435d46..26224ba 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/default.css
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+ * $Id: default.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx
index 1804895..b616afe 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: error.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx
index dc55cf7..7ba2e0b 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: home.vspx,v 1.4.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: home.vspx,v 1.4 2006/08/17 18:27:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp
index fc2d872..28ff040 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop.vsp,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: interop.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl
index 20c4b29..3b82487 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl
@@ -155,7 +155,7 @@
<A class="m_n" href="http://virtuoso.openlinksw.com/interop/index.htm#">Privacy</A>
</div>
<div class="copyright">
- <xsl:text disable-output-escaping="yes">Copyright © 1998-2012 OpenLink Software</xsl:text>
+ <xsl:text disable-output-escaping="yes">Copyright © 1998-2011 OpenLink Software</xsl:text>
</div>
</td>
</tr>
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_decor.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/interop_decor.vspx
index 63ed482..8fa4fba 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_decor.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_decor.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: interop_decor.vspx,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: interop_decor.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql b/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql
index 8a18212..ef86905 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql
@@ -1,10 +1,10 @@
--
--- $Id: interop_install.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: interop_install.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx
index ac83de4..10bb3f4 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: interop_main.vspx,v 1.3.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: interop_main.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_navigation_bar.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/interop_navigation_bar.vspx
index 22ab0fd..5769aba 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_navigation_bar.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_navigation_bar.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: interop_navigation_bar.vspx,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+ - $Id: interop_navigation_bar.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl
index 125056f..c1efbb4 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl
@@ -2,14 +2,14 @@
<!-- <!DOCTYPE html PUBLIC "" "ent.dtd"> -->
<!----
-
- - $Id: interop_style.xsl,v 1.3.2.2 2012/03/08 12:54:57 source Exp $
+ - $Id: interop_style.xsl,v 1.3.2.1 2010/01/07 16:58:12 source Exp $
-
- Virtuoso VSPX XSL-T style-sheet for page class compilation
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql b/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql
index ca8c028..476e9d4 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql
@@ -1,10 +1,10 @@
--
--- $Id: interop_vhost.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: interop_vhost.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx
index 28f25d2..eda0591 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: intest.vspx,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: intest.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp
index 22d9fef..1554c6f 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mgrsum.vsp,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: mgrsum.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx
index e9c9591..d5720e1 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: mgrsum.vspx,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: mgrsum.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl
index d3c20f9..40320e0 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: mgrsum.xsl,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: mgrsum.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp
index d05d2eb..dc1777c 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: post.vsp,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: post.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx
index 72fe3a8..6c59e8f 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: post.vspx,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: post.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl
index 632f8f0..7557605 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: post.xsl,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: post.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp
index a9d707b..d48a066 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: protocols.vsp,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: protocols.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx
index b5d2583..b5a2382 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: protocols.vspx,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: protocols.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml
index eae9dec..2b5b5e6 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl
index 83e70be..d383c71 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: protocols.xsl,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: protocols.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp
index 1f923fd..97e094a 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: reply.vsp,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: reply.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/results.xml b/binsrc/bpel/tests/interop/site/bpel4ws/results.xml
index b77a604..d115ade 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/results.xml
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/results.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql b/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql
index 28ab831..846e096 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: tables.sql,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: tables.sql,v 1.3 2007/01/22 13:11:22 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp
index 9750892..283860d 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: tstsum.vsp,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: tstsum.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx
index 0f89ad5..e5a8048 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tstsum.vspx,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: tstsum.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl
index 2af7399..35eb82f 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: tstsum.xsl,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: tstsum.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp
index 41d75ff..ebf3019 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: view.vsp,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: view.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx
index aafb13f..7949157 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: view.vspx,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: view.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl
index 3b05c79..28abe9f 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: view.xsl,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: view.xsl,v 1.3 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp
index 9be2554..6cdd9a4 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wsa.vsp,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: wsa.vsp,v 1.2 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx
index cf66df1..1a679dc 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: wsa.vspx,v 1.4.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: wsa.vspx,v 1.4 2007/01/22 13:11:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl
index 0ed6ce6..0ce79cc 100644
--- a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl
+++ b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: wsa.xsl,v 1.4.2.1 2012/03/08 12:54:58 source Exp $
+ - $Id: wsa.xsl,v 1.4 2007/01/22 13:11:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/echo/bpel.xml b/binsrc/bpel/tests/interop/site/echo/bpel.xml
index aaa4b6a..cb7cd41 100644
--- a/binsrc/bpel/tests/interop/site/echo/bpel.xml
+++ b/binsrc/bpel/tests/interop/site/echo/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/echo/desc.xml b/binsrc/bpel/tests/interop/site/echo/desc.xml
index b2fd34f..02ce411 100644
--- a/binsrc/bpel/tests/interop/site/echo/desc.xml
+++ b/binsrc/bpel/tests/interop/site/echo/desc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/echo/echo.bpel b/binsrc/bpel/tests/interop/site/echo/echo.bpel
index 6d7dac7..a7fcfeb 100644
--- a/binsrc/bpel/tests/interop/site/echo/echo.bpel
+++ b/binsrc/bpel/tests/interop/site/echo/echo.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/echo/echo.sql b/binsrc/bpel/tests/interop/site/echo/echo.sql
index 538e348..1596c5d 100644
--- a/binsrc/bpel/tests/interop/site/echo/echo.sql
+++ b/binsrc/bpel/tests/interop/site/echo/echo.sql
@@ -1,10 +1,10 @@
--
--- $Id: echo.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: echo.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/echo/echo.wsdl b/binsrc/bpel/tests/interop/site/echo/echo.wsdl
index 691b36d..f1aeb28 100644
--- a/binsrc/bpel/tests/interop/site/echo/echo.wsdl
+++ b/binsrc/bpel/tests/interop/site/echo/echo.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/index.html b/binsrc/bpel/tests/interop/site/index.html
index ca23b28..dc55c9d 100644
--- a/binsrc/bpel/tests/interop/site/index.html
+++ b/binsrc/bpel/tests/interop/site/index.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/interop/site/setup.sql b/binsrc/bpel/tests/interop/site/setup.sql
index ec7fcc1..7240a67 100644
--- a/binsrc/bpel/tests/interop/site/setup.sql
+++ b/binsrc/bpel/tests/interop/site/setup.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup.sql,v 1.2.2.1 2012/03/08 12:54:57 source Exp $
+-- $Id: setup.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/cmpflow.bpel b/binsrc/bpel/tests/mix/cmpflow.bpel
index 7a1a932..a28a015 100644
--- a/binsrc/bpel/tests/mix/cmpflow.bpel
+++ b/binsrc/bpel/tests/mix/cmpflow.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/cmpflow.wsdl b/binsrc/bpel/tests/mix/cmpflow.wsdl
index ac431a8..da5ff24 100644
--- a/binsrc/bpel/tests/mix/cmpflow.wsdl
+++ b/binsrc/bpel/tests/mix/cmpflow.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/comp.sql b/binsrc/bpel/tests/mix/comp.sql
index 1cd593d..0401d44 100644
--- a/binsrc/bpel/tests/mix/comp.sql
+++ b/binsrc/bpel/tests/mix/comp.sql
@@ -1,10 +1,10 @@
--
--- $Id: comp.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: comp.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/comp2.bpel b/binsrc/bpel/tests/mix/comp2.bpel
index 14ca9e9..6ee27ec 100644
--- a/binsrc/bpel/tests/mix/comp2.bpel
+++ b/binsrc/bpel/tests/mix/comp2.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/comp2.sql b/binsrc/bpel/tests/mix/comp2.sql
index 7243906..a9575f4 100644
--- a/binsrc/bpel/tests/mix/comp2.sql
+++ b/binsrc/bpel/tests/mix/comp2.sql
@@ -1,10 +1,10 @@
--
--- $Id: comp2.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: comp2.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/comp3.bpel b/binsrc/bpel/tests/mix/comp3.bpel
index 5d63cdd..71cc399 100644
--- a/binsrc/bpel/tests/mix/comp3.bpel
+++ b/binsrc/bpel/tests/mix/comp3.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/comp4.bpel b/binsrc/bpel/tests/mix/comp4.bpel
index 73cb436..15288c4 100644
--- a/binsrc/bpel/tests/mix/comp4.bpel
+++ b/binsrc/bpel/tests/mix/comp4.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/comp5.bpel b/binsrc/bpel/tests/mix/comp5.bpel
index a36f90e..28df1cf 100644
--- a/binsrc/bpel/tests/mix/comp5.bpel
+++ b/binsrc/bpel/tests/mix/comp5.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/comp6.bpel b/binsrc/bpel/tests/mix/comp6.bpel
index ad1c66b..13fde8c 100644
--- a/binsrc/bpel/tests/mix/comp6.bpel
+++ b/binsrc/bpel/tests/mix/comp6.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/evcomp.bpel b/binsrc/bpel/tests/mix/evcomp.bpel
index bfbf69c..42bd85f 100644
--- a/binsrc/bpel/tests/mix/evcomp.bpel
+++ b/binsrc/bpel/tests/mix/evcomp.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/evcomp.wsdl b/binsrc/bpel/tests/mix/evcomp.wsdl
index 8f99f52..fd3a22f 100644
--- a/binsrc/bpel/tests/mix/evcomp.wsdl
+++ b/binsrc/bpel/tests/mix/evcomp.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/fault.wsdl b/binsrc/bpel/tests/mix/fault.wsdl
index 431638d..7dd9dd8 100644
--- a/binsrc/bpel/tests/mix/fault.wsdl
+++ b/binsrc/bpel/tests/mix/fault.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/fault4.bpel b/binsrc/bpel/tests/mix/fault4.bpel
index f16c5f7..c962760 100644
--- a/binsrc/bpel/tests/mix/fault4.bpel
+++ b/binsrc/bpel/tests/mix/fault4.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/ini.sql b/binsrc/bpel/tests/mix/ini.sql
index 5b1dc9a..8a11ecc 100644
--- a/binsrc/bpel/tests/mix/ini.sql
+++ b/binsrc/bpel/tests/mix/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/ol.bpel b/binsrc/bpel/tests/mix/ol.bpel
index 0619a22..60b2e93 100644
--- a/binsrc/bpel/tests/mix/ol.bpel
+++ b/binsrc/bpel/tests/mix/ol.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/ol.wsdl b/binsrc/bpel/tests/mix/ol.wsdl
index 12b1d5e..39573f9 100644
--- a/binsrc/bpel/tests/mix/ol.wsdl
+++ b/binsrc/bpel/tests/mix/ol.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/olservice.wsdl b/binsrc/bpel/tests/mix/olservice.wsdl
index bb8a1c2..75e684f 100644
--- a/binsrc/bpel/tests/mix/olservice.wsdl
+++ b/binsrc/bpel/tests/mix/olservice.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/recovery_test.sql b/binsrc/bpel/tests/mix/recovery_test.sql
index f6408c8..a135faa 100644
--- a/binsrc/bpel/tests/mix/recovery_test.sql
+++ b/binsrc/bpel/tests/mix/recovery_test.sql
@@ -1,10 +1,10 @@
--
--- $Id: recovery_test.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: recovery_test.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/sw.bpel b/binsrc/bpel/tests/mix/sw.bpel
index 0e39364..a85c1be 100644
--- a/binsrc/bpel/tests/mix/sw.bpel
+++ b/binsrc/bpel/tests/mix/sw.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/sw.wsdl b/binsrc/bpel/tests/mix/sw.wsdl
index ed2002d..f6708b6 100644
--- a/binsrc/bpel/tests/mix/sw.wsdl
+++ b/binsrc/bpel/tests/mix/sw.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/testsvc.sql b/binsrc/bpel/tests/mix/testsvc.sql
index 6e7d272..7ea8de4 100644
--- a/binsrc/bpel/tests/mix/testsvc.sql
+++ b/binsrc/bpel/tests/mix/testsvc.sql
@@ -1,10 +1,10 @@
--
--- $Id: testsvc.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: testsvc.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/timesvc.wsdl b/binsrc/bpel/tests/mix/timesvc.wsdl
index a2ac835..ae08460 100644
--- a/binsrc/bpel/tests/mix/timesvc.wsdl
+++ b/binsrc/bpel/tests/mix/timesvc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/tsvc.wsdl b/binsrc/bpel/tests/mix/tsvc.wsdl
index a394849..0ee62a7 100644
--- a/binsrc/bpel/tests/mix/tsvc.wsdl
+++ b/binsrc/bpel/tests/mix/tsvc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/while1.bpel b/binsrc/bpel/tests/mix/while1.bpel
index 6d4fab7..ec250d6 100644
--- a/binsrc/bpel/tests/mix/while1.bpel
+++ b/binsrc/bpel/tests/mix/while1.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/mix/while1.wsdl b/binsrc/bpel/tests/mix/while1.wsdl
index c6454d4..1de9199 100644
--- a/binsrc/bpel/tests/mix/while1.wsdl
+++ b/binsrc/bpel/tests/mix/while1.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/order/input.xml b/binsrc/bpel/tests/order/input.xml
index 0b1713a..aea7857 100644
--- a/binsrc/bpel/tests/order/input.xml
+++ b/binsrc/bpel/tests/order/input.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/order/invoke.sql b/binsrc/bpel/tests/order/invoke.sql
index 969c56c..2e8f391 100644
--- a/binsrc/bpel/tests/order/invoke.sql
+++ b/binsrc/bpel/tests/order/invoke.sql
@@ -1,10 +1,10 @@
--
--- $Id: invoke.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: invoke.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/order/load_all.sql b/binsrc/bpel/tests/order/load_all.sql
index 3b77fa2..981892b 100644
--- a/binsrc/bpel/tests/order/load_all.sql
+++ b/binsrc/bpel/tests/order/load_all.sql
@@ -1,10 +1,10 @@
--
--- $Id: load_all.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: load_all.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/order/order.bpel b/binsrc/bpel/tests/order/order.bpel
index 2f6a88e..32b1a84 100644
--- a/binsrc/bpel/tests/order/order.bpel
+++ b/binsrc/bpel/tests/order/order.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/order/order.sql b/binsrc/bpel/tests/order/order.sql
index 7cc329f..a85a065 100644
--- a/binsrc/bpel/tests/order/order.sql
+++ b/binsrc/bpel/tests/order/order.sql
@@ -1,10 +1,10 @@
--
--- $Id: order.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: order.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/order/order.wsdl b/binsrc/bpel/tests/order/order.wsdl
index 534feae..eae0b0f 100644
--- a/binsrc/bpel/tests/order/order.wsdl
+++ b/binsrc/bpel/tests/order/order.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/order/order_svc.sql b/binsrc/bpel/tests/order/order_svc.sql
index 65c8254..4cf8fe0 100644
--- a/binsrc/bpel/tests/order/order_svc.sql
+++ b/binsrc/bpel/tests/order/order_svc.sql
@@ -1,10 +1,10 @@
--
--- $Id: order_svc.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: order_svc.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/order/servicewsdl.vsp b/binsrc/bpel/tests/order/servicewsdl.vsp
index de2a6f7..a7c7881 100644
--- a/binsrc/bpel/tests/order/servicewsdl.vsp
+++ b/binsrc/bpel/tests/order/servicewsdl.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: servicewsdl.vsp,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: servicewsdl.vsp,v 1.3 2006/08/15 19:30:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick/async_svc.sql b/binsrc/bpel/tests/pick/async_svc.sql
index 81bb2c1..315bd0d 100644
--- a/binsrc/bpel/tests/pick/async_svc.sql
+++ b/binsrc/bpel/tests/pick/async_svc.sql
@@ -1,10 +1,10 @@
--
--- $Id: async_svc.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: async_svc.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick/ini.sql b/binsrc/bpel/tests/pick/ini.sql
index ef05539..49bddfd 100644
--- a/binsrc/bpel/tests/pick/ini.sql
+++ b/binsrc/bpel/tests/pick/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick/inv.sql b/binsrc/bpel/tests/pick/inv.sql
index 3059411..59b6e3e 100644
--- a/binsrc/bpel/tests/pick/inv.sql
+++ b/binsrc/bpel/tests/pick/inv.sql
@@ -1,10 +1,10 @@
--
--- $Id: inv.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: inv.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick/pick.bpel b/binsrc/bpel/tests/pick/pick.bpel
index 92aab38..bfa8015 100644
--- a/binsrc/bpel/tests/pick/pick.bpel
+++ b/binsrc/bpel/tests/pick/pick.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick/pick.wsdl b/binsrc/bpel/tests/pick/pick.wsdl
index 5dd721e..e9daccb 100644
--- a/binsrc/bpel/tests/pick/pick.wsdl
+++ b/binsrc/bpel/tests/pick/pick.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick/service.wsdl b/binsrc/bpel/tests/pick/service.wsdl
index 43f1241..9b956fc 100644
--- a/binsrc/bpel/tests/pick/service.wsdl
+++ b/binsrc/bpel/tests/pick/service.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick1/bpel.xml b/binsrc/bpel/tests/pick1/bpel.xml
index a5d2e09..a25c636 100644
--- a/binsrc/bpel/tests/pick1/bpel.xml
+++ b/binsrc/bpel/tests/pick1/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick1/build.xml b/binsrc/bpel/tests/pick1/build.xml
index baed3a4..dcbb88d 100644
--- a/binsrc/bpel/tests/pick1/build.xml
+++ b/binsrc/bpel/tests/pick1/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick1/ini.sql b/binsrc/bpel/tests/pick1/ini.sql
index 2d916d7..12137c2 100644
--- a/binsrc/bpel/tests/pick1/ini.sql
+++ b/binsrc/bpel/tests/pick1/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick1/pick1.bpel b/binsrc/bpel/tests/pick1/pick1.bpel
index f2ba9be..beb098a 100644
--- a/binsrc/bpel/tests/pick1/pick1.bpel
+++ b/binsrc/bpel/tests/pick1/pick1.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/pick1/pick1.wsdl b/binsrc/bpel/tests/pick1/pick1.wsdl
index 451088b..3349b9e 100644
--- a/binsrc/bpel/tests/pick1/pick1.wsdl
+++ b/binsrc/bpel/tests/pick1/pick1.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/post/bpel.xml b/binsrc/bpel/tests/post/bpel.xml
index b3cd307..6e9ddb0 100644
--- a/binsrc/bpel/tests/post/bpel.xml
+++ b/binsrc/bpel/tests/post/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/post/build.xml b/binsrc/bpel/tests/post/build.xml
index c5f0517..a669be8 100644
--- a/binsrc/bpel/tests/post/build.xml
+++ b/binsrc/bpel/tests/post/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/post/ini.sql b/binsrc/bpel/tests/post/ini.sql
index 91d6952..3b11af2 100644
--- a/binsrc/bpel/tests/post/ini.sql
+++ b/binsrc/bpel/tests/post/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/post/post.bpel b/binsrc/bpel/tests/post/post.bpel
index 994a5ec..aa310bb 100644
--- a/binsrc/bpel/tests/post/post.bpel
+++ b/binsrc/bpel/tests/post/post.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/post/post.wsdl b/binsrc/bpel/tests/post/post.wsdl
index 5ab3d36..05010cd 100644
--- a/binsrc/bpel/tests/post/post.wsdl
+++ b/binsrc/bpel/tests/post/post.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/XQuerySample.bpel b/binsrc/bpel/tests/processXQuery/XQuerySample.bpel
index 3ea865f..999710d 100644
--- a/binsrc/bpel/tests/processXQuery/XQuerySample.bpel
+++ b/binsrc/bpel/tests/processXQuery/XQuerySample.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl b/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl
index 20854d8..89bdaed 100644
--- a/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl
+++ b/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/books.xq b/binsrc/bpel/tests/processXQuery/books.xq
index 8dde0a8..b6beac7 100644
--- a/binsrc/bpel/tests/processXQuery/books.xq
+++ b/binsrc/bpel/tests/processXQuery/books.xq
@@ -3,7 +3,7 @@
: This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
: project.
:
- : Copyright (C) 1998-2012 OpenLink Software
+ : Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/bpel.xml b/binsrc/bpel/tests/processXQuery/bpel.xml
index f637dd7..01f00aa 100644
--- a/binsrc/bpel/tests/processXQuery/bpel.xml
+++ b/binsrc/bpel/tests/processXQuery/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/ini.sql b/binsrc/bpel/tests/processXQuery/ini.sql
index bce5ee0..1c7b9a2 100644
--- a/binsrc/bpel/tests/processXQuery/ini.sql
+++ b/binsrc/bpel/tests/processXQuery/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/invoice.xq b/binsrc/bpel/tests/processXQuery/invoice.xq
index 177fc35..3772e7c 100644
--- a/binsrc/bpel/tests/processXQuery/invoice.xq
+++ b/binsrc/bpel/tests/processXQuery/invoice.xq
@@ -3,7 +3,7 @@
: This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
: project.
:
- : Copyright (C) 1998-2012 OpenLink Software
+ : Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/options.xml b/binsrc/bpel/tests/processXQuery/options.xml
index 4f12bb5..611b229 100644
--- a/binsrc/bpel/tests/processXQuery/options.xml
+++ b/binsrc/bpel/tests/processXQuery/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/processXQuery.vsp b/binsrc/bpel/tests/processXQuery/processXQuery.vsp
index 830bf05..cf7a55d 100644
--- a/binsrc/bpel/tests/processXQuery/processXQuery.vsp
+++ b/binsrc/bpel/tests/processXQuery/processXQuery.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: processXQuery.vsp,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: processXQuery.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXQuery/processXQuery.xml b/binsrc/bpel/tests/processXQuery/processXQuery.xml
index cb403ca..1ace8e3 100644
--- a/binsrc/bpel/tests/processXQuery/processXQuery.xml
+++ b/binsrc/bpel/tests/processXQuery/processXQuery.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/CreditRating.vsp b/binsrc/bpel/tests/processXSLT/CreditRating.vsp
index db09b98..5d82db2 100644
--- a/binsrc/bpel/tests/processXSLT/CreditRating.vsp
+++ b/binsrc/bpel/tests/processXSLT/CreditRating.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: CreditRating.vsp,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: CreditRating.vsp,v 1.3 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/InvToPo.xslt b/binsrc/bpel/tests/processXSLT/InvToPo.xslt
index 852a8b7..809fe50 100644
--- a/binsrc/bpel/tests/processXSLT/InvToPo.xslt
+++ b/binsrc/bpel/tests/processXSLT/InvToPo.xslt
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.bpel b/binsrc/bpel/tests/processXSLT/XSLTSample.bpel
index 2addf67..bee3828 100644
--- a/binsrc/bpel/tests/processXSLT/XSLTSample.bpel
+++ b/binsrc/bpel/tests/processXSLT/XSLTSample.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl b/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl
index 8d8296d..c07a131 100644
--- a/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl
+++ b/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.xslt b/binsrc/bpel/tests/processXSLT/XSLTSample.xslt
index 2d85bc5..2088e8f 100644
--- a/binsrc/bpel/tests/processXSLT/XSLTSample.xslt
+++ b/binsrc/bpel/tests/processXSLT/XSLTSample.xslt
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/bpel.xml b/binsrc/bpel/tests/processXSLT/bpel.xml
index 681822f..d628754 100644
--- a/binsrc/bpel/tests/processXSLT/bpel.xml
+++ b/binsrc/bpel/tests/processXSLT/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/ini.sql b/binsrc/bpel/tests/processXSLT/ini.sql
index 4f26d79..ba14b92 100644
--- a/binsrc/bpel/tests/processXSLT/ini.sql
+++ b/binsrc/bpel/tests/processXSLT/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/options.xml b/binsrc/bpel/tests/processXSLT/options.xml
index be62e8e..d4f48e7 100644
--- a/binsrc/bpel/tests/processXSLT/options.xml
+++ b/binsrc/bpel/tests/processXSLT/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.sql b/binsrc/bpel/tests/processXSLT/processXSLT.sql
index 6190b09..c647555 100644
--- a/binsrc/bpel/tests/processXSLT/processXSLT.sql
+++ b/binsrc/bpel/tests/processXSLT/processXSLT.sql
@@ -1,10 +1,10 @@
--
--- $Id: processXSLT.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: processXSLT.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.vsp b/binsrc/bpel/tests/processXSLT/processXSLT.vsp
index d55fcd5..42f6198 100644
--- a/binsrc/bpel/tests/processXSLT/processXSLT.vsp
+++ b/binsrc/bpel/tests/processXSLT/processXSLT.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: processXSLT.vsp,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: processXSLT.vsp,v 1.3 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.xml b/binsrc/bpel/tests/processXSLT/processXSLT.xml
index 64bb252..6f1c716 100644
--- a/binsrc/bpel/tests/processXSLT/processXSLT.xml
+++ b/binsrc/bpel/tests/processXSLT/processXSLT.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/XSQLSample.bpel b/binsrc/bpel/tests/processXSQL/XSQLSample.bpel
index 09f6628..c6f39a2 100644
--- a/binsrc/bpel/tests/processXSQL/XSQLSample.bpel
+++ b/binsrc/bpel/tests/processXSQL/XSQLSample.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl b/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl
index c9875de..04b3ff3 100644
--- a/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl
+++ b/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/bpel.xml b/binsrc/bpel/tests/processXSQL/bpel.xml
index f0494dc..9888f95 100644
--- a/binsrc/bpel/tests/processXSQL/bpel.xml
+++ b/binsrc/bpel/tests/processXSQL/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/ini.sql b/binsrc/bpel/tests/processXSQL/ini.sql
index 15f2eb5..0aba471 100644
--- a/binsrc/bpel/tests/processXSQL/ini.sql
+++ b/binsrc/bpel/tests/processXSQL/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/options.xml b/binsrc/bpel/tests/processXSQL/options.xml
index 94ae4cf..658bcb9 100644
--- a/binsrc/bpel/tests/processXSQL/options.xml
+++ b/binsrc/bpel/tests/processXSQL/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/processXSQL.vsp b/binsrc/bpel/tests/processXSQL/processXSQL.vsp
index 40aa0e6..2d4b3b5 100644
--- a/binsrc/bpel/tests/processXSQL/processXSQL.vsp
+++ b/binsrc/bpel/tests/processXSQL/processXSQL.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: processXSQL.vsp,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: processXSQL.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/processXSQL.xml b/binsrc/bpel/tests/processXSQL/processXSQL.xml
index f300382..800b434 100644
--- a/binsrc/bpel/tests/processXSQL/processXSQL.xml
+++ b/binsrc/bpel/tests/processXSQL/processXSQL.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql b/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql
index 9a9a9b1..c9389a5 100644
--- a/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql
+++ b/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: processXSQL_ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: processXSQL_ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/selectCustomer.xsql b/binsrc/bpel/tests/processXSQL/selectCustomer.xsql
index dbfe3cf..cd8aa23 100644
--- a/binsrc/bpel/tests/processXSQL/selectCustomer.xsql
+++ b/binsrc/bpel/tests/processXSQL/selectCustomer.xsql
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/processXSQL/selectProduct.xsql b/binsrc/bpel/tests/processXSQL/selectProduct.xsql
index d42ae18..af3a6ba 100644
--- a/binsrc/bpel/tests/processXSQL/selectProduct.xsql
+++ b/binsrc/bpel/tests/processXSQL/selectProduct.xsql
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/sqlexec/bpel.xml b/binsrc/bpel/tests/sqlexec/bpel.xml
index be8b88b..5266c11 100644
--- a/binsrc/bpel/tests/sqlexec/bpel.xml
+++ b/binsrc/bpel/tests/sqlexec/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/sqlexec/inventory.bpel b/binsrc/bpel/tests/sqlexec/inventory.bpel
index 121b323..3a0d509 100644
--- a/binsrc/bpel/tests/sqlexec/inventory.bpel
+++ b/binsrc/bpel/tests/sqlexec/inventory.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/sqlexec/inventory.wsdl b/binsrc/bpel/tests/sqlexec/inventory.wsdl
index c853957..4572f9a 100644
--- a/binsrc/bpel/tests/sqlexec/inventory.wsdl
+++ b/binsrc/bpel/tests/sqlexec/inventory.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/sqlexec/options.xml b/binsrc/bpel/tests/sqlexec/options.xml
index 199c9b4..46d9823 100644
--- a/binsrc/bpel/tests/sqlexec/options.xml
+++ b/binsrc/bpel/tests/sqlexec/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/sqlexec/sqlexec.vsp b/binsrc/bpel/tests/sqlexec/sqlexec.vsp
index 564570b..0c49254 100644
--- a/binsrc/bpel/tests/sqlexec/sqlexec.vsp
+++ b/binsrc/bpel/tests/sqlexec/sqlexec.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sqlexec.vsp,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: sqlexec.vsp,v 1.3 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/sqlexec/sqlexec.xml b/binsrc/bpel/tests/sqlexec/sqlexec.xml
index 0bf09b3..cf0ff8a 100644
--- a/binsrc/bpel/tests/sqlexec/sqlexec.xml
+++ b/binsrc/bpel/tests/sqlexec/sqlexec.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/sqlexec/store.sql b/binsrc/bpel/tests/sqlexec/store.sql
index 78f32a5..4fd0a58 100644
--- a/binsrc/bpel/tests/sqlexec/store.sql
+++ b/binsrc/bpel/tests/sqlexec/store.sql
@@ -1,10 +1,10 @@
--
--- $Id: store.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: store.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/sqlexec/store.vsp b/binsrc/bpel/tests/sqlexec/store.vsp
index 180b67a..86834a0 100644
--- a/binsrc/bpel/tests/sqlexec/store.vsp
+++ b/binsrc/bpel/tests/sqlexec/store.vsp
@@ -1,11 +1,11 @@
<?xml version="1.0"?><?vsp
--
--- $Id: store.vsp,v 1.3.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: store.vsp,v 1.3 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/buyer/Buyer.bpel b/binsrc/bpel/tests/t1/buyer/Buyer.bpel
index bfe8c97..fbfa43f 100644
--- a/binsrc/bpel/tests/t1/buyer/Buyer.bpel
+++ b/binsrc/bpel/tests/t1/buyer/Buyer.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/buyer/Buyer.wsdl b/binsrc/bpel/tests/t1/buyer/Buyer.wsdl
index ce55a74..bf04240 100644
--- a/binsrc/bpel/tests/t1/buyer/Buyer.wsdl
+++ b/binsrc/bpel/tests/t1/buyer/Buyer.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/buyer/ini.sql b/binsrc/bpel/tests/t1/buyer/ini.sql
index 1c0ac6e..f1b1a9f 100644
--- a/binsrc/bpel/tests/t1/buyer/ini.sql
+++ b/binsrc/bpel/tests/t1/buyer/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl b/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl
index 4117bf6..a8e96ee 100644
--- a/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl
+++ b/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl b/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl
index 1f59b7a..f452b55 100644
--- a/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl
+++ b/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/seller/Seller.bpel b/binsrc/bpel/tests/t1/seller/Seller.bpel
index 5475fd8..9fc38bf 100644
--- a/binsrc/bpel/tests/t1/seller/Seller.bpel
+++ b/binsrc/bpel/tests/t1/seller/Seller.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/seller/Seller.wsdl b/binsrc/bpel/tests/t1/seller/Seller.wsdl
index 6010b0b..cc8f9c9 100644
--- a/binsrc/bpel/tests/t1/seller/Seller.wsdl
+++ b/binsrc/bpel/tests/t1/seller/Seller.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/seller/ini.sql b/binsrc/bpel/tests/t1/seller/ini.sql
index 2dd9b42..4214b7b 100644
--- a/binsrc/bpel/tests/t1/seller/ini.sql
+++ b/binsrc/bpel/tests/t1/seller/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:58 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl b/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl
index 4117bf6..a8e96ee 100644
--- a/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl
+++ b/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl b/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl
index 1f59b7a..f452b55 100644
--- a/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl
+++ b/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t2/FlowSample.bpel b/binsrc/bpel/tests/t2/FlowSample.bpel
index 9d1a2a8..e743c38 100644
--- a/binsrc/bpel/tests/t2/FlowSample.bpel
+++ b/binsrc/bpel/tests/t2/FlowSample.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t2/FlowSample.wsdl b/binsrc/bpel/tests/t2/FlowSample.wsdl
index 915dc34..0ceab05 100644
--- a/binsrc/bpel/tests/t2/FlowSample.wsdl
+++ b/binsrc/bpel/tests/t2/FlowSample.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t2/bpel.xml b/binsrc/bpel/tests/t2/bpel.xml
index aef1322..79b46c0 100644
--- a/binsrc/bpel/tests/t2/bpel.xml
+++ b/binsrc/bpel/tests/t2/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t2/build.xml b/binsrc/bpel/tests/t2/build.xml
index d6f7667..f6cc83d 100644
--- a/binsrc/bpel/tests/t2/build.xml
+++ b/binsrc/bpel/tests/t2/build.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/t2/ini.sql b/binsrc/bpel/tests/t2/ini.sql
index fe4910b..af6e618 100644
--- a/binsrc/bpel/tests/t2/ini.sql
+++ b/binsrc/bpel/tests/t2/ini.sql
@@ -1,10 +1,10 @@
--
--- $Id: ini.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: ini.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl b/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl
index f03d5f2..005756a 100644
--- a/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl
+++ b/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel
index 0257804..77c5fb8 100644
--- a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel
+++ b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl
index 20354c4..da54899 100644
--- a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl
+++ b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml b/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml
index 9905d36..613b066 100644
--- a/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml
+++ b/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tevent/Event.bpel b/binsrc/bpel/tests/tevent/Event.bpel
index 5d72bf7..8ef6bcc 100644
--- a/binsrc/bpel/tests/tevent/Event.bpel
+++ b/binsrc/bpel/tests/tevent/Event.bpel
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tevent/Event.wsdl b/binsrc/bpel/tests/tevent/Event.wsdl
index 692c465..78d1530 100644
--- a/binsrc/bpel/tests/tevent/Event.wsdl
+++ b/binsrc/bpel/tests/tevent/Event.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tevent/bpel.xml b/binsrc/bpel/tests/tevent/bpel.xml
index d3cacb2..e0aed3f 100644
--- a/binsrc/bpel/tests/tevent/bpel.xml
+++ b/binsrc/bpel/tests/tevent/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tevent/tevent.sql b/binsrc/bpel/tests/tevent/tevent.sql
index b34a374..a082373 100644
--- a/binsrc/bpel/tests/tevent/tevent.sql
+++ b/binsrc/bpel/tests/tevent/tevent.sql
@@ -1,10 +1,10 @@
--
--- $Id: tevent.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: tevent.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/Sut.bpel b/binsrc/bpel/tests/tpcc/Sut.bpel
index c1d4e4e..4ac2e95 100644
--- a/binsrc/bpel/tests/tpcc/Sut.bpel
+++ b/binsrc/bpel/tests/tpcc/Sut.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/Sut.wsdl b/binsrc/bpel/tests/tpcc/Sut.wsdl
index cc35a97..dee9f85 100644
--- a/binsrc/bpel/tests/tpcc/Sut.wsdl
+++ b/binsrc/bpel/tests/tpcc/Sut.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/chk.sql b/binsrc/bpel/tests/tpcc/chk.sql
index 0e60d88..f25c27e 100644
--- a/binsrc/bpel/tests/tpcc/chk.sql
+++ b/binsrc/bpel/tests/tpcc/chk.sql
@@ -1,10 +1,10 @@
--
--- $Id: chk.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: chk.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/dbservices.wsdl b/binsrc/bpel/tests/tpcc/dbservices.wsdl
index f1c9545..288056b 100644
--- a/binsrc/bpel/tests/tpcc/dbservices.wsdl
+++ b/binsrc/bpel/tests/tpcc/dbservices.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/delqr.sql b/binsrc/bpel/tests/tpcc/delqr.sql
index 8a89eb6..3c5ef47 100644
--- a/binsrc/bpel/tests/tpcc/delqr.sql
+++ b/binsrc/bpel/tests/tpcc/delqr.sql
@@ -1,10 +1,10 @@
--
--- $Id: delqr.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: delqr.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/endp.sql b/binsrc/bpel/tests/tpcc/endp.sql
index 542d989..99c3307 100644
--- a/binsrc/bpel/tests/tpcc/endp.sql
+++ b/binsrc/bpel/tests/tpcc/endp.sql
@@ -1,10 +1,10 @@
--
--- $Id: endp.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: endp.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/load.sql b/binsrc/bpel/tests/tpcc/load.sql
index c222619..562bd94 100644
--- a/binsrc/bpel/tests/tpcc/load.sql
+++ b/binsrc/bpel/tests/tpcc/load.sql
@@ -1,10 +1,10 @@
--
--- $Id: load.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: load.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/procedures-list-DB.sql b/binsrc/bpel/tests/tpcc/procedures-list-DB.sql
index 7ae33e7..9a9b1b0 100644
--- a/binsrc/bpel/tests/tpcc/procedures-list-DB.sql
+++ b/binsrc/bpel/tests/tpcc/procedures-list-DB.sql
@@ -1,10 +1,10 @@
--
--- $Id: procedures-list-DB.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: procedures-list-DB.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/procedures-list-TD.sql b/binsrc/bpel/tests/tpcc/procedures-list-TD.sql
index e37aca6..e5b05c1 100644
--- a/binsrc/bpel/tests/tpcc/procedures-list-TD.sql
+++ b/binsrc/bpel/tests/tpcc/procedures-list-TD.sql
@@ -1,10 +1,10 @@
--
--- $Id: procedures-list-TD.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: procedures-list-TD.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/qr.sql b/binsrc/bpel/tests/tpcc/qr.sql
index 1cdce26..df54ef4 100644
--- a/binsrc/bpel/tests/tpcc/qr.sql
+++ b/binsrc/bpel/tests/tpcc/qr.sql
@@ -1,10 +1,10 @@
--
--- $Id: qr.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: qr.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/run.sh b/binsrc/bpel/tests/tpcc/run.sh
index 6bae30c..e90f8a1 100755
--- a/binsrc/bpel/tests/tpcc/run.sh
+++ b/binsrc/bpel/tests/tpcc/run.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: run.sh,v 1.4.2.1 2012/03/08 12:54:59 source Exp $
+# $Id: run.sh,v 1.4 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/bpel/tests/tpcc/tdservices.wsdl b/binsrc/bpel/tests/tpcc/tdservices.wsdl
index f764cb6..4d64a9a 100644
--- a/binsrc/bpel/tests/tpcc/tdservices.wsdl
+++ b/binsrc/bpel/tests/tpcc/tdservices.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/test.sql b/binsrc/bpel/tests/tpcc/test.sql
index e1ec6db..a51de33 100644
--- a/binsrc/bpel/tests/tpcc/test.sql
+++ b/binsrc/bpel/tests/tpcc/test.sql
@@ -1,10 +1,10 @@
--
--- $Id: test.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: test.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tpcc/test1.sql b/binsrc/bpel/tests/tpcc/test1.sql
index fc0b624..9faa248 100644
--- a/binsrc/bpel/tests/tpcc/test1.sql
+++ b/binsrc/bpel/tests/tpcc/test1.sql
@@ -1,10 +1,10 @@
--
--- $Id: test1.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: test1.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tver/service.wsdl b/binsrc/bpel/tests/tver/service.wsdl
index d23cb7b..a221b82 100644
--- a/binsrc/bpel/tests/tver/service.wsdl
+++ b/binsrc/bpel/tests/tver/service.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tver/tver.bpel b/binsrc/bpel/tests/tver/tver.bpel
index 3067a82..82357e8 100644
--- a/binsrc/bpel/tests/tver/tver.bpel
+++ b/binsrc/bpel/tests/tver/tver.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tver/tver.sql b/binsrc/bpel/tests/tver/tver.sql
index b903f75..eaf5cd2 100644
--- a/binsrc/bpel/tests/tver/tver.sql
+++ b/binsrc/bpel/tests/tver/tver.sql
@@ -1,10 +1,10 @@
--
--- $Id: tver.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: tver.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tver/tver.wsdl b/binsrc/bpel/tests/tver/tver.wsdl
index c062b3b..5b5d013 100644
--- a/binsrc/bpel/tests/tver/tver.wsdl
+++ b/binsrc/bpel/tests/tver/tver.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tver/tvernew1.bpel b/binsrc/bpel/tests/tver/tvernew1.bpel
index ad7efca..1406a90 100644
--- a/binsrc/bpel/tests/tver/tvernew1.bpel
+++ b/binsrc/bpel/tests/tver/tvernew1.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/tver/tvernew2.bpel b/binsrc/bpel/tests/tver/tvernew2.bpel
index a26f0e7..b22d982 100644
--- a/binsrc/bpel/tests/tver/tvernew2.bpel
+++ b/binsrc/bpel/tests/tver/tvernew2.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/wsrm/doc.bpel b/binsrc/bpel/tests/wsrm/doc.bpel
index f96e929..3b47abe 100644
--- a/binsrc/bpel/tests/wsrm/doc.bpel
+++ b/binsrc/bpel/tests/wsrm/doc.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/wsrm/doc.wsdl b/binsrc/bpel/tests/wsrm/doc.wsdl
index a5b4c3e..c354725 100644
--- a/binsrc/bpel/tests/wsrm/doc.wsdl
+++ b/binsrc/bpel/tests/wsrm/doc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/wsrm/wsrmdoc.sql b/binsrc/bpel/tests/wsrm/wsrmdoc.sql
index dfc4642..43da1f4 100644
--- a/binsrc/bpel/tests/wsrm/wsrmdoc.sql
+++ b/binsrc/bpel/tests/wsrm/wsrmdoc.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsrmdoc.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: wsrmdoc.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl b/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl
index 8ff2f8d..86075d5 100644
--- a/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl
+++ b/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/wss/doc.bpel b/binsrc/bpel/tests/wss/doc.bpel
index a19d896..33fa06f 100644
--- a/binsrc/bpel/tests/wss/doc.bpel
+++ b/binsrc/bpel/tests/wss/doc.bpel
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/wss/doc.wsdl b/binsrc/bpel/tests/wss/doc.wsdl
index a5b4c3e..c354725 100644
--- a/binsrc/bpel/tests/wss/doc.wsdl
+++ b/binsrc/bpel/tests/wss/doc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/wss/secdoc.sql b/binsrc/bpel/tests/wss/secdoc.sql
index cbf9070..1c1a880 100644
--- a/binsrc/bpel/tests/wss/secdoc.sql
+++ b/binsrc/bpel/tests/wss/secdoc.sql
@@ -1,10 +1,10 @@
--
--- $Id: secdoc.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: secdoc.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/tests/wss/secsvc.wsdl b/binsrc/bpel/tests/wss/secsvc.wsdl
index 66e77ba..32dac15 100644
--- a/binsrc/bpel/tests/wss/secsvc.wsdl
+++ b/binsrc/bpel/tests/wss/secsvc.wsdl
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/time.vsp b/binsrc/bpel/time.vsp
index 3f962d8..9313c0f 100644
--- a/binsrc/bpel/time.vsp
+++ b/binsrc/bpel/time.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: time.vsp,v 1.4.2.1 2012/03/08 12:54:56 source Exp $
+-- $Id: time.vsp,v 1.4 2007/03/14 14:23:25 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/upload_new.vspx b/binsrc/bpel/upload_new.vspx
index 79b6ef8..a925dd7 100644
--- a/binsrc/bpel/upload_new.vspx
+++ b/binsrc/bpel/upload_new.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: upload_new.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: upload_new.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/view.vspx b/binsrc/bpel/view.vspx
index c8f8099..c05ee9a 100644
--- a/binsrc/bpel/view.vspx
+++ b/binsrc/bpel/view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: view.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: view.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/virtuoso_splash.vspx b/binsrc/bpel/virtuoso_splash.vspx
index 2375b84..b15b958 100644
--- a/binsrc/bpel/virtuoso_splash.vspx
+++ b/binsrc/bpel/virtuoso_splash.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: virtuoso_splash.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: virtuoso_splash.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/wsdl.xsd b/binsrc/bpel/wsdl.xsd
index c41d20e..7c8207b 100644
--- a/binsrc/bpel/wsdl.xsd
+++ b/binsrc/bpel/wsdl.xsd
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/wss_keys.vspx b/binsrc/bpel/wss_keys.vspx
index 065ee09..95abf89 100644
--- a/binsrc/bpel/wss_keys.vspx
+++ b/binsrc/bpel/wss_keys.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wss_keys.vspx,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: wss_keys.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/xsql.sql b/binsrc/bpel/xsql.sql
index 8e99637..ee27075 100644
--- a/binsrc/bpel/xsql.sql
+++ b/binsrc/bpel/xsql.sql
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -21,7 +21,7 @@
create function SYS_XSQL_LIB_VERSION ()
{
return subseq ('
---#$$Id: xsql.sql,v 1.1.1.1.2.1 2012/03/08 12:54:56 source Exp $$',
+--#$$Id: xsql.sql,v 1.1.1.1 2006/04/11 17:56:09 source Exp $$',
4);
}
;
diff --git a/binsrc/bpel/xsql.xsd b/binsrc/bpel/xsql.xsd
index ada0df2..197bfde 100644
--- a/binsrc/bpel/xsql.xsd
+++ b/binsrc/bpel/xsql.xsd
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/bpel/xsql2virtPL.xsl b/binsrc/bpel/xsql2virtPL.xsl
index c7c446f..8998b93 100644
--- a/binsrc/bpel/xsql2virtPL.xsl
+++ b/binsrc/bpel/xsql2virtPL.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xsql2virtPL.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $
+ - $Id: xsql2virtPL.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -30,7 +30,7 @@
<xsl:param name="page-name" select="'unnamed'"/>
<xsl:param name="proc-name" select="'XSQL__SAMPLE'"/>
<xsl:variable name="mylibversion"><xsl:value-of select="xsql:lib-version"/></xsl:variable>
- <xsl:variable name="myversion">$Id: xsql2virtPL.xsl,v 1.2.2.1 2012/03/08 12:54:56 source Exp $</xsl:variable>
+ <xsl:variable name="myversion">$Id: xsql2virtPL.xsl,v 1.2 2006/08/15 22:09:20 source Exp $</xsl:variable>
<xsl:template match="/">
diff --git a/binsrc/cached_resources/Makefile.am b/binsrc/cached_resources/Makefile.am
index f52d13e..82bc815 100644
--- a/binsrc/cached_resources/Makefile.am
+++ b/binsrc/cached_resources/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/cached_resources/Makefile.in b/binsrc/cached_resources/Makefile.in
index 4d2e182..ba05917 100644
--- a/binsrc/cached_resources/Makefile.in
+++ b/binsrc/cached_resources/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -101,7 +101,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -150,7 +149,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -202,7 +200,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -249,6 +246,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/cached_resources/cache_gen.sh b/binsrc/cached_resources/cache_gen.sh
index a15876f..3cd5c4f 100755
--- a/binsrc/cached_resources/cache_gen.sh
+++ b/binsrc/cached_resources/cache_gen.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: cache_gen.sh,v 1.4.2.4 2012/03/08 12:54:59 source Exp $
+# $Id: cache_gen.sh,v 1.4.2.3 2011/04/11 15:05:06 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/cached_resources/cached_resources.c b/binsrc/cached_resources/cached_resources.c
index 5ba19cc..b45b33f 100644
--- a/binsrc/cached_resources/cached_resources.c
+++ b/binsrc/cached_resources/cached_resources.c
@@ -4672,7 +4672,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
"# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n",
"# project.\n",
"# \n",
-"# Copyright (C) 1998-2012 OpenLink Software\n",
+"# Copyright (C) 1998-2009 OpenLink Software\n",
"# \n",
"# This project is free software; you can redistribute it and/or modify it\n",
"# under the terms of the GNU General Public License as published by the\n",
@@ -4715,7 +4715,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
"\n",
"# Don't forget to change version, both here and in DB.DBA.SPARQL_RELOAD_QM_GRAPH, to force reload.\n",
"<http://www.openlinksw.com/sparql/virtrdf-data-formats.ttl>\n",
-" virtrdf:version '2012-01-26 0002v6g' ;\n",
+" virtrdf:version '2011-09-01 0001v6g' ;\n",
" virtrdf:item\n",
" rdfdf:default-iid , rdfdf:default-iid-nullable ,\n",
" rdfdf:default-iid-nonblank , rdfdf:default-iid-nonblank-nullable ,\n",
@@ -4780,7 +4780,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfSqlvalTmpl \" __id2i (^{alias-dot}^^{column}^)\"; # STRING REQUIRED \"sqlval\" value template, can be NULL\n",
" virtrdf:qmfBoolTmpl \" NULL\"; # STRING REQUIRED Boolean value template, can be NULL\n",
"# Templates of booleans that tell whether the short is of some sort:\n",
-" virtrdf:qmfIsrefOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is ref\n",
+" virtrdf:qmfIsrefOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" (^{tree}^ < min_bnode_iri_id ())\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" (^{tree}^ >= min_bnode_iri_id ())\"; # STRING REQUIRED ... whether the short is blank node ref\n",
" virtrdf:qmfIslitOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
@@ -4960,8 +4960,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (^{tree}^)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5027,7 +5026,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (^{tree-0}^, __i2idn (^{tree-1}^), null)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree-0}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5091,8 +5090,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (^{tree-0}^, null, ^{tree-1}^)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree-0}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5256,8 +5254,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (^{tree}^)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5323,7 +5320,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (^{tree-0}^, __i2idn (^{tree-1}^), null)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree-0}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5387,7 +5384,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (^{tree-0}^, null, ^{tree-1}^)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree-0}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5546,24 +5543,23 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfShortTmpl \" ^{alias-dot}^^{column}^\"; # STRING REQUIRED \"short\" value template, can be NULL\n",
" virtrdf:qmfLongTmpl \" ^{alias-dot}^^{column}^\"; # STRING REQUIRED \"long\" value template, can be NULL\n",
" virtrdf:qmfSqlvalTmpl \" cast (^{alias-dot}^^{column}^ as varbinary)\"; # STRING REQUIRED \"sqlval\" value template, can be NULL\n",
-" virtrdf:qmfBoolTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED Boolean value template, can be NULL\n",
+" virtrdf:qmfBoolTmpl \" 1\"; # STRING REQUIRED Boolean value template, can be NULL\n",
"# Templates of booleans that tell whether the short is of some sort:\n",
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" cast (^{tree}^ as varbinary)\"; # STRING REQUIRED ... SQL value from short\n",
" virtrdf:qmfDatatypeOfShortTmpl \" 'http://www.w3.org/2001/XMLSchema#octetStream'\"; # STRING REQUIRED ... datatype IRI STRING from short\n",
" virtrdf:qmfLanguageOfShortTmpl \" NULL\"; # STRING REQUIRED ... language ID STRING from short\n",
-" virtrdf:qmfBoolOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... boolean value from short\n",
+" virtrdf:qmfBoolOfShortTmpl \" 1\"; # STRING REQUIRED ... boolean value from short\n",
" virtrdf:qmfIidOfShortTmpl \" NULL\";\n",
" virtrdf:qmfUriOfShortTmpl \" NULL\"; # STRING REQUIRED ... URI STRING from short\n",
" virtrdf:qmfStrsqlvalOfShortTmpl \" cast (^{tree}^ as varchar)\"; # STRING REQUIRED ... SQL representation of the STRING value of short\n",
"# Templates of expressions that make short values from other representations\n",
-" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#octetStream' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
+" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#octetStream' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
" virtrdf:qmfShortOfSqlvalTmpl \" (case (__tag (^{sqlval-of-tree}^)) when 131 then (^{sqlval-of-tree}^) else NULL end)\"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type\n",
" virtrdf:qmfShortOfLongTmpl \" (case (__tag (^{tree}^)) when 131 then (^{tree}^) else NULL end)\"; # STRING REQUIRED ... makes short by long\n",
" virtrdf:qmfShortOfUriTmpl \" NULL\"; # STRING REQUIRED ... makes short by uri\n",
@@ -5612,11 +5608,10 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfSqlvalTmpl \" __spfi (^{custom-string-1}^, ^{alias-dot}^^{column}^)\"; # STRING REQUIRED \"sqlval\" value template, can be NULL\n",
" virtrdf:qmfBoolTmpl \" NULL\"; # STRING REQUIRED Boolean value template, can be NULL\n",
"# Templates of booleans that tell whether the short is of some sort:\n",
-" virtrdf:qmfIsrefOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is uri\n",
+" virtrdf:qmfIsrefOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
+" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
" virtrdf:qmfIslitOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __i2id (__spfi (^{custom-string-1}^, ^{tree}^))\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __spfi (^{custom-string-1}^, ^{tree}^)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5687,8 +5682,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __spf (^{custom-string-1}^, ^{tree}^)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __spf (^{custom-string-1}^, ^{tree}^)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5805,7 +5799,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5816,7 +5810,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfUriOfShortTmpl \" NULL\"; # STRING REQUIRED ... URI STRING from short\n",
" virtrdf:qmfStrsqlvalOfShortTmpl \" cast (^{tree}^ as varchar)\"; # STRING REQUIRED ... SQL representation of the STRING value of short\n",
"# Templates of expressions that make short values from other representations\n",
-" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#integer' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
+" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#integer' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
" virtrdf:qmfShortOfSqlvalTmpl \" ^{sqlval-of-tree}^\"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type\n",
" virtrdf:qmfShortOfLongTmpl \" ^{tree}^\"; # STRING REQUIRED ... makes short by long\n",
" virtrdf:qmfShortOfUriTmpl \" NULL\"; # STRING REQUIRED ... makes short by uri\n",
@@ -5959,8 +5953,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -5971,7 +5964,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfUriOfShortTmpl \" NULL\"; # STRING REQUIRED ... URI STRING from short\n",
" virtrdf:qmfStrsqlvalOfShortTmpl \" cast (^{tree}^ as varchar)\"; # STRING REQUIRED ... SQL representation of the STRING value of short\n",
"# Templates of expressions that make short values from other representations\n",
-" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#double' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
+" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#double' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
" virtrdf:qmfShortOfSqlvalTmpl \" ^{sqlval-of-tree}^\"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type\n",
" virtrdf:qmfShortOfLongTmpl \" ^{tree}^\"; # STRING REQUIRED ... makes short by long\n",
" virtrdf:qmfShortOfUriTmpl \" NULL\"; # STRING REQUIRED ... makes short by uri\n",
@@ -6027,8 +6020,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6039,7 +6031,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfUriOfShortTmpl \" NULL\"; # STRING REQUIRED ... URI STRING from short\n",
" virtrdf:qmfStrsqlvalOfShortTmpl \" cast (^{tree}^ as varchar)\"; # STRING REQUIRED ... SQL representation of the STRING value of short\n",
"# Templates of expressions that make short values from other representations\n",
-" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#numeric' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
+" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#numeric' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
" virtrdf:qmfShortOfSqlvalTmpl \" ^{sqlval-of-tree}^\"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type\n",
" virtrdf:qmfShortOfLongTmpl \" ^{tree}^\"; # STRING REQUIRED ... makes short by long\n",
" virtrdf:qmfShortOfUriTmpl \" NULL\"; # STRING REQUIRED ... makes short by uri\n",
@@ -6182,8 +6174,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6194,7 +6185,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfUriOfShortTmpl \" NULL\"; # STRING REQUIRED ... URI STRING from short\n",
" virtrdf:qmfStrsqlvalOfShortTmpl \" cast (^{tree}^ as varchar)\"; # STRING REQUIRED ... SQL representation of the STRING value of short\n",
"# Templates of expressions that make short values from other representations\n",
-" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#date' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
+" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#date' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
" virtrdf:qmfShortOfSqlvalTmpl \" ^{sqlval-of-tree}^\"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type\n",
" virtrdf:qmfShortOfLongTmpl \" ^{tree}^\"; # STRING REQUIRED ... makes short by long\n",
" virtrdf:qmfShortOfUriTmpl \" NULL\"; # STRING REQUIRED ... makes short by uri\n",
@@ -6254,8 +6245,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6266,7 +6256,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfUriOfShortTmpl \" NULL\"; # STRING REQUIRED ... URI STRING from short\n",
" virtrdf:qmfStrsqlvalOfShortTmpl \" cast (^{tree}^ as varchar)\"; # STRING REQUIRED ... SQL representation of the STRING value of short\n",
"# Templates of expressions that make short values from other representations\n",
-" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#time' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
+" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#time' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
" virtrdf:qmfShortOfSqlvalTmpl \" ^{sqlval-of-tree}^\"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type\n",
" virtrdf:qmfShortOfLongTmpl \" ^{tree}^\"; # STRING REQUIRED ... makes short by long\n",
" virtrdf:qmfShortOfUriTmpl \" NULL\"; # STRING REQUIRED ... makes short by uri\n",
@@ -6323,8 +6313,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{tree}^\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6335,7 +6324,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfUriOfShortTmpl \" NULL\"; # STRING REQUIRED ... URI STRING from short\n",
" virtrdf:qmfStrsqlvalOfShortTmpl \" cast (^{tree}^ as varchar)\"; # STRING REQUIRED ... SQL representation of the STRING value of short\n",
"# Templates of expressions that make short values from other representations\n",
-" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#datetime' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
+" virtrdf:qmfShortOfTypedsqlvalTmpl \" (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#datetime' then ^{sqlval-of-tree}^ else NULL end)\"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language\n",
" virtrdf:qmfShortOfSqlvalTmpl \" ^{sqlval-of-tree}^\"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type\n",
" virtrdf:qmfShortOfLongTmpl \" ^{tree}^\"; # STRING REQUIRED ... makes short by long\n",
" virtrdf:qmfShortOfUriTmpl \" NULL\"; # STRING REQUIRED ... makes short by uri\n",
@@ -6388,11 +6377,10 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfSqlvalTmpl \" __spfi (^{custom-string-1}^, ^{comma-list-begin}^ ^{alias-N-dot}^^{column-N}^^{end}^)\"; # STRING REQUIRED \"sqlval\" value template, can be NULL\n",
" virtrdf:qmfBoolTmpl \" NULL\"; # STRING REQUIRED Boolean value template, can be NULL\n",
"# Templates of booleans that tell whether the short is of some sort:\n",
-" virtrdf:qmfIsrefOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is uri\n",
+" virtrdf:qmfIsrefOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
+" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
" virtrdf:qmfIslitOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __i2id (__spfi (^{custom-string-1}^, ^{comma-list-begin}^ ^{tree-N}^^{end}^))\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __spfi (^{custom-string-1}^, ^{comma-list-begin}^ ^{tree-N}^^{end}^)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6464,8 +6452,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __spf (^{custom-string-1}^, ^{comma-list-begin}^ ^{tree-N}^^{end}^)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __spf (^{custom-string-1}^, ^{comma-list-begin}^ ^{tree-N}^^{end}^)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6534,11 +6521,10 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfSqlvalTmpl \" __bft (^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{alias-N-dot}^^{column-N}^^{end}^), 1)\"; # STRING REQUIRED \"sqlval\" value template, can be NULL\n",
" virtrdf:qmfBoolTmpl \" NULL\"; # STRING REQUIRED Boolean value template, can be NULL\n",
"# Templates of booleans that tell whether the short is of some sort:\n",
-" virtrdf:qmfIsrefOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is uri\n",
+" virtrdf:qmfIsrefOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
+" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
" virtrdf:qmfIslitOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __i2id (^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{tree-N}^^{end}^))\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __bft (^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{tree-N}^^{end}^), 1)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6586,7 +6572,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_LONG_OF_SQLVAL (^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{tree-N}^^{end}^))\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{tree-N}^^{end}^)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6631,11 +6617,10 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfSqlvalTmpl \" __spfi (^{custom-string-1}^)\"; # STRING REQUIRED \"sqlval\" value template, can be NULL\n",
" virtrdf:qmfBoolTmpl \" NULL\"; # STRING REQUIRED Boolean value template, can be NULL\n",
"# Templates of booleans that tell whether the short is of some sort:\n",
-" virtrdf:qmfIsrefOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is uri\n",
+" virtrdf:qmfIsrefOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
+" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
" virtrdf:qmfIslitOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __i2id (__spfi (^{custom-string-1}^))\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __spfi (^{custom-string-1}^)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6705,8 +6690,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __spf (^{custom-string-1}^)\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __spf (^{custom-string-1}^)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6773,11 +6757,10 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfSqlvalTmpl \" __bft (^{custom-verbatim-1}^ (), 1)\"; # STRING REQUIRED \"sqlval\" value template, can be NULL\n",
" virtrdf:qmfBoolTmpl \" NULL\"; # STRING REQUIRED Boolean value template, can be NULL\n",
"# Templates of booleans that tell whether the short is of some sort:\n",
-" virtrdf:qmfIsrefOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is uri\n",
+" virtrdf:qmfIsrefOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
+" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
" virtrdf:qmfIslitOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __i2id (^{custom-verbatim-1}^ ())\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __bft (^{custom-verbatim-1}^ (), 1)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6825,7 +6808,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_LONG_OF_SQLVAL (^{custom-verbatim-1}^ ())\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{custom-verbatim-1}^ ()\"; # STRING REQUIRED ... SQL value from short\n",
@@ -6870,11 +6853,10 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfSqlvalTmpl \" __bft (^{custom-verbatim-1}^ (^{alias-dot}^^{column}^), 1)\"; # STRING REQUIRED \"sqlval\" value template, can be NULL\n",
" virtrdf:qmfBoolTmpl \" NULL\"; # STRING REQUIRED Boolean value template, can be NULL\n",
"# Templates of booleans that tell whether the short is of some sort:\n",
-" virtrdf:qmfIsrefOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is ref\n",
-" virtrdf:qmfIsuriOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is uri\n",
+" virtrdf:qmfIsrefOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is ref\n",
+" virtrdf:qmfIsuriOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
" virtrdf:qmfIslitOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is literal\n",
-" virtrdf:qmfIsnumericOfShortTmpl \" 0\"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" __i2id (^{custom-verbatim-1}^ (^{tree}^))\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" __bft (^{custom-verbatim-1}^ (^{tree}^), 1)\"; # STRING REQUIRED ... SQL value from short\n",
@@ -7033,7 +7015,7 @@ static const char * cres_virtrdf_data_formats_ttl[] =
" virtrdf:qmfIsrefOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is ref\n",
" virtrdf:qmfIsuriOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is uri\n",
" virtrdf:qmfIsblankOfShortTmpl \" 0\"; # STRING REQUIRED ... whether the short is blank node ref\n",
-" virtrdf:qmfIslitOfShortTmpl \" isnotnull (^{tree}^)\"; # STRING REQUIRED ... whether the short is literal\n",
+" virtrdf:qmfIslitOfShortTmpl \" 1\"; # STRING REQUIRED ... whether the short is literal\n",
"# Templates that convert short value into other types (can be applied to both field and not field expression)\n",
" virtrdf:qmfLongOfShortTmpl \" DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (^{custom-verbatim-1}^ (^{tree}^))\"; # STRING REQUIRED ... long from short\n",
" virtrdf:qmfSqlvalOfShortTmpl \" ^{custom-verbatim-1}^ (^{tree}^)\"; # STRING REQUIRED ... SQL value from short\n",
diff --git a/binsrc/cached_resources/openlinksw-sparql/virtrdf-data-formats.ttl b/binsrc/cached_resources/openlinksw-sparql/virtrdf-data-formats.ttl
index 483d5bb..7213cad 100644
--- a/binsrc/cached_resources/openlinksw-sparql/virtrdf-data-formats.ttl
+++ b/binsrc/cached_resources/openlinksw-sparql/virtrdf-data-formats.ttl
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -45,7 +45,7 @@ virtrdf:QuadStorage virtrdf:isGcResistantType "2" .
# Don't forget to change version, both here and in DB.DBA.SPARQL_RELOAD_QM_GRAPH, to force reload.
<http://www.openlinksw.com/sparql/virtrdf-data-formats.ttl>
- virtrdf:version '2012-01-26 0002v6g' ;
+ virtrdf:version '2011-09-01 0001v6g' ;
virtrdf:item
rdfdf:default-iid , rdfdf:default-iid-nullable ,
rdfdf:default-iid-nonblank , rdfdf:default-iid-nonblank-nullable ,
@@ -110,7 +110,7 @@ rdfdf:default-iid
virtrdf:qmfSqlvalTmpl " __id2i (^{alias-dot}^^{column}^)"; # STRING REQUIRED "sqlval" value template, can be NULL
virtrdf:qmfBoolTmpl " NULL"; # STRING REQUIRED Boolean value template, can be NULL
# Templates of booleans that tell whether the short is of some sort:
- virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsrefOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " (^{tree}^ < min_bnode_iri_id ())"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " (^{tree}^ >= min_bnode_iri_id ())"; # STRING REQUIRED ... whether the short is blank node ref
virtrdf:qmfIslitOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
@@ -290,8 +290,7 @@ rdfdf:sql-varchar
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (^{tree}^)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... SQL value from short
@@ -357,7 +356,7 @@ rdfdf:sql-varchar-dt
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (^{tree-0}^, __i2idn (^{tree-1}^), null)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree-0}^"; # STRING REQUIRED ... SQL value from short
@@ -421,8 +420,7 @@ rdfdf:sql-varchar-lang
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (^{tree-0}^, null, ^{tree-1}^)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree-0}^"; # STRING REQUIRED ... SQL value from short
@@ -586,8 +584,7 @@ rdfdf:sql-nvarchar
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (^{tree}^)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... SQL value from short
@@ -653,7 +650,7 @@ rdfdf:sql-nvarchar-dt
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (^{tree-0}^, __i2idn (^{tree-1}^), null)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree-0}^"; # STRING REQUIRED ... SQL value from short
@@ -717,7 +714,7 @@ rdfdf:sql-nvarchar-lang
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (^{tree-0}^, null, ^{tree-1}^)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree-0}^"; # STRING REQUIRED ... SQL value from short
@@ -876,24 +873,23 @@ rdfdf:sql-longvarbinary
virtrdf:qmfShortTmpl " ^{alias-dot}^^{column}^"; # STRING REQUIRED "short" value template, can be NULL
virtrdf:qmfLongTmpl " ^{alias-dot}^^{column}^"; # STRING REQUIRED "long" value template, can be NULL
virtrdf:qmfSqlvalTmpl " cast (^{alias-dot}^^{column}^ as varbinary)"; # STRING REQUIRED "sqlval" value template, can be NULL
- virtrdf:qmfBoolTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED Boolean value template, can be NULL
+ virtrdf:qmfBoolTmpl " 1"; # STRING REQUIRED Boolean value template, can be NULL
# Templates of booleans that tell whether the short is of some sort:
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " cast (^{tree}^ as varbinary)"; # STRING REQUIRED ... SQL value from short
virtrdf:qmfDatatypeOfShortTmpl " 'http://www.w3.org/2001/XMLSchema#octetStream'"; # STRING REQUIRED ... datatype IRI STRING from short
virtrdf:qmfLanguageOfShortTmpl " NULL"; # STRING REQUIRED ... language ID STRING from short
- virtrdf:qmfBoolOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... boolean value from short
+ virtrdf:qmfBoolOfShortTmpl " 1"; # STRING REQUIRED ... boolean value from short
virtrdf:qmfIidOfShortTmpl " NULL";
virtrdf:qmfUriOfShortTmpl " NULL"; # STRING REQUIRED ... URI STRING from short
virtrdf:qmfStrsqlvalOfShortTmpl " cast (^{tree}^ as varchar)"; # STRING REQUIRED ... SQL representation of the STRING value of short
# Templates of expressions that make short values from other representations
- virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#octetStream' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
+ virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#octetStream' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
virtrdf:qmfShortOfSqlvalTmpl " (case (__tag (^{sqlval-of-tree}^)) when 131 then (^{sqlval-of-tree}^) else NULL end)"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type
virtrdf:qmfShortOfLongTmpl " (case (__tag (^{tree}^)) when 131 then (^{tree}^) else NULL end)"; # STRING REQUIRED ... makes short by long
virtrdf:qmfShortOfUriTmpl " NULL"; # STRING REQUIRED ... makes short by uri
@@ -942,11 +938,10 @@ rdfdf:sql-varchar-uri
virtrdf:qmfSqlvalTmpl " __spfi (^{custom-string-1}^, ^{alias-dot}^^{column}^)"; # STRING REQUIRED "sqlval" value template, can be NULL
virtrdf:qmfBoolTmpl " NULL"; # STRING REQUIRED Boolean value template, can be NULL
# Templates of booleans that tell whether the short is of some sort:
- virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
virtrdf:qmfIslitOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __i2id (__spfi (^{custom-string-1}^, ^{tree}^))"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __spfi (^{custom-string-1}^, ^{tree}^)"; # STRING REQUIRED ... SQL value from short
@@ -1017,8 +1012,7 @@ rdfdf:sql-varchar-literal
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __spf (^{custom-string-1}^, ^{tree}^)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __spf (^{custom-string-1}^, ^{tree}^)"; # STRING REQUIRED ... SQL value from short
@@ -1135,7 +1129,7 @@ rdfdf:sql-integer
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... SQL value from short
@@ -1146,7 +1140,7 @@ rdfdf:sql-integer
virtrdf:qmfUriOfShortTmpl " NULL"; # STRING REQUIRED ... URI STRING from short
virtrdf:qmfStrsqlvalOfShortTmpl " cast (^{tree}^ as varchar)"; # STRING REQUIRED ... SQL representation of the STRING value of short
# Templates of expressions that make short values from other representations
- virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#integer' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
+ virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#integer' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
virtrdf:qmfShortOfSqlvalTmpl " ^{sqlval-of-tree}^"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type
virtrdf:qmfShortOfLongTmpl " ^{tree}^"; # STRING REQUIRED ... makes short by long
virtrdf:qmfShortOfUriTmpl " NULL"; # STRING REQUIRED ... makes short by uri
@@ -1289,8 +1283,7 @@ rdfdf:sql-doubleprecision
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " isnotnull (^{tree}^)"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... SQL value from short
@@ -1301,7 +1294,7 @@ rdfdf:sql-doubleprecision
virtrdf:qmfUriOfShortTmpl " NULL"; # STRING REQUIRED ... URI STRING from short
virtrdf:qmfStrsqlvalOfShortTmpl " cast (^{tree}^ as varchar)"; # STRING REQUIRED ... SQL representation of the STRING value of short
# Templates of expressions that make short values from other representations
- virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#double' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
+ virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#double' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
virtrdf:qmfShortOfSqlvalTmpl " ^{sqlval-of-tree}^"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type
virtrdf:qmfShortOfLongTmpl " ^{tree}^"; # STRING REQUIRED ... makes short by long
virtrdf:qmfShortOfUriTmpl " NULL"; # STRING REQUIRED ... makes short by uri
@@ -1357,8 +1350,7 @@ rdfdf:sql-numeric
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " isnotnull (^{tree}^)"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... SQL value from short
@@ -1369,7 +1361,7 @@ rdfdf:sql-numeric
virtrdf:qmfUriOfShortTmpl " NULL"; # STRING REQUIRED ... URI STRING from short
virtrdf:qmfStrsqlvalOfShortTmpl " cast (^{tree}^ as varchar)"; # STRING REQUIRED ... SQL representation of the STRING value of short
# Templates of expressions that make short values from other representations
- virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#numeric' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
+ virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#numeric' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
virtrdf:qmfShortOfSqlvalTmpl " ^{sqlval-of-tree}^"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type
virtrdf:qmfShortOfLongTmpl " ^{tree}^"; # STRING REQUIRED ... makes short by long
virtrdf:qmfShortOfUriTmpl " NULL"; # STRING REQUIRED ... makes short by uri
@@ -1512,8 +1504,7 @@ rdfdf:sql-date
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... SQL value from short
@@ -1524,7 +1515,7 @@ rdfdf:sql-date
virtrdf:qmfUriOfShortTmpl " NULL"; # STRING REQUIRED ... URI STRING from short
virtrdf:qmfStrsqlvalOfShortTmpl " cast (^{tree}^ as varchar)"; # STRING REQUIRED ... SQL representation of the STRING value of short
# Templates of expressions that make short values from other representations
- virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#date' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
+ virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#date' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
virtrdf:qmfShortOfSqlvalTmpl " ^{sqlval-of-tree}^"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type
virtrdf:qmfShortOfLongTmpl " ^{tree}^"; # STRING REQUIRED ... makes short by long
virtrdf:qmfShortOfUriTmpl " NULL"; # STRING REQUIRED ... makes short by uri
@@ -1584,8 +1575,7 @@ rdfdf:sql-time
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... SQL value from short
@@ -1596,7 +1586,7 @@ rdfdf:sql-time
virtrdf:qmfUriOfShortTmpl " NULL"; # STRING REQUIRED ... URI STRING from short
virtrdf:qmfStrsqlvalOfShortTmpl " cast (^{tree}^ as varchar)"; # STRING REQUIRED ... SQL representation of the STRING value of short
# Templates of expressions that make short values from other representations
- virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#time' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
+ virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#time' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
virtrdf:qmfShortOfSqlvalTmpl " ^{sqlval-of-tree}^"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type
virtrdf:qmfShortOfLongTmpl " ^{tree}^"; # STRING REQUIRED ... makes short by long
virtrdf:qmfShortOfUriTmpl " NULL"; # STRING REQUIRED ... makes short by uri
@@ -1653,8 +1643,7 @@ rdfdf:sql-datetime
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{tree}^"; # STRING REQUIRED ... SQL value from short
@@ -1665,7 +1654,7 @@ rdfdf:sql-datetime
virtrdf:qmfUriOfShortTmpl " NULL"; # STRING REQUIRED ... URI STRING from short
virtrdf:qmfStrsqlvalOfShortTmpl " cast (^{tree}^ as varchar)"; # STRING REQUIRED ... SQL representation of the STRING value of short
# Templates of expressions that make short values from other representations
- virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^) when 'http://www.w3.org/2001/XMLSchema#datetime' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
+ virtrdf:qmfShortOfTypedsqlvalTmpl " (case (^{datatype-of-tree}^)) when 'http://www.w3.org/2001/XMLSchema#datetime' then ^{sqlval-of-tree}^ else NULL end)"; # STRING REQUIRED ... makes short by SQL value with specified type and/or language
virtrdf:qmfShortOfSqlvalTmpl " ^{sqlval-of-tree}^"; # STRING REQUIRED ... makes short by sqlvalue with no language and a datatype specified by SQL type
virtrdf:qmfShortOfLongTmpl " ^{tree}^"; # STRING REQUIRED ... makes short by long
virtrdf:qmfShortOfUriTmpl " NULL"; # STRING REQUIRED ... makes short by uri
@@ -1718,11 +1707,10 @@ rdfdf:multipart-uri
virtrdf:qmfSqlvalTmpl " __spfi (^{custom-string-1}^, ^{comma-list-begin}^ ^{alias-N-dot}^^{column-N}^^{end}^)"; # STRING REQUIRED "sqlval" value template, can be NULL
virtrdf:qmfBoolTmpl " NULL"; # STRING REQUIRED Boolean value template, can be NULL
# Templates of booleans that tell whether the short is of some sort:
- virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
virtrdf:qmfIslitOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __i2id (__spfi (^{custom-string-1}^, ^{comma-list-begin}^ ^{tree-N}^^{end}^))"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __spfi (^{custom-string-1}^, ^{comma-list-begin}^ ^{tree-N}^^{end}^)"; # STRING REQUIRED ... SQL value from short
@@ -1794,8 +1782,7 @@ rdfdf:multipart-literal
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __spf (^{custom-string-1}^, ^{comma-list-begin}^ ^{tree-N}^^{end}^)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __spf (^{custom-string-1}^, ^{comma-list-begin}^ ^{tree-N}^^{end}^)"; # STRING REQUIRED ... SQL value from short
@@ -1864,11 +1851,10 @@ rdfdf:multipart-uri-fn-nullable
virtrdf:qmfSqlvalTmpl " __bft (^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{alias-N-dot}^^{column-N}^^{end}^), 1)"; # STRING REQUIRED "sqlval" value template, can be NULL
virtrdf:qmfBoolTmpl " NULL"; # STRING REQUIRED Boolean value template, can be NULL
# Templates of booleans that tell whether the short is of some sort:
- virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
virtrdf:qmfIslitOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __i2id (^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{tree-N}^^{end}^))"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __bft (^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{tree-N}^^{end}^), 1)"; # STRING REQUIRED ... SQL value from short
@@ -1916,7 +1902,7 @@ rdfdf:multipart-literal-fn-nullable
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_LONG_OF_SQLVAL (^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{tree-N}^^{end}^))"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{custom-verbatim-1}^ (^{comma-list-begin}^ ^{tree-N}^^{end}^)"; # STRING REQUIRED ... SQL value from short
@@ -1961,11 +1947,10 @@ rdfdf:zeropart-uri
virtrdf:qmfSqlvalTmpl " __spfi (^{custom-string-1}^)"; # STRING REQUIRED "sqlval" value template, can be NULL
virtrdf:qmfBoolTmpl " NULL"; # STRING REQUIRED Boolean value template, can be NULL
# Templates of booleans that tell whether the short is of some sort:
- virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
virtrdf:qmfIslitOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __i2id (__spfi (^{custom-string-1}^))"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __spfi (^{custom-string-1}^)"; # STRING REQUIRED ... SQL value from short
@@ -2035,8 +2020,7 @@ rdfdf:zeropart-literal
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __spf (^{custom-string-1}^)"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __spf (^{custom-string-1}^)"; # STRING REQUIRED ... SQL value from short
@@ -2103,11 +2087,10 @@ rdfdf:zeropart-uri-fn-nullable
virtrdf:qmfSqlvalTmpl " __bft (^{custom-verbatim-1}^ (), 1)"; # STRING REQUIRED "sqlval" value template, can be NULL
virtrdf:qmfBoolTmpl " NULL"; # STRING REQUIRED Boolean value template, can be NULL
# Templates of booleans that tell whether the short is of some sort:
- virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
virtrdf:qmfIslitOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __i2id (^{custom-verbatim-1}^ ())"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __bft (^{custom-verbatim-1}^ (), 1)"; # STRING REQUIRED ... SQL value from short
@@ -2155,7 +2138,7 @@ rdfdf:zeropart-literal-fn-nullable
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_LONG_OF_SQLVAL (^{custom-verbatim-1}^ ())"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{custom-verbatim-1}^ ()"; # STRING REQUIRED ... SQL value from short
@@ -2200,11 +2183,10 @@ rdfdf:sql-varchar-uri-fn
virtrdf:qmfSqlvalTmpl " __bft (^{custom-verbatim-1}^ (^{alias-dot}^^{column}^), 1)"; # STRING REQUIRED "sqlval" value template, can be NULL
virtrdf:qmfBoolTmpl " NULL"; # STRING REQUIRED Boolean value template, can be NULL
# Templates of booleans that tell whether the short is of some sort:
- virtrdf:qmfIsrefOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is ref
- virtrdf:qmfIsuriOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is uri
+ virtrdf:qmfIsrefOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is ref
+ virtrdf:qmfIsuriOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
virtrdf:qmfIslitOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is literal
- virtrdf:qmfIsnumericOfShortTmpl " 0"; # STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " __i2id (^{custom-verbatim-1}^ (^{tree}^))"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " __bft (^{custom-verbatim-1}^ (^{tree}^), 1)"; # STRING REQUIRED ... SQL value from short
@@ -2363,7 +2345,7 @@ rdfdf:sql-varchar-literal-fn
virtrdf:qmfIsrefOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is ref
virtrdf:qmfIsuriOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is uri
virtrdf:qmfIsblankOfShortTmpl " 0"; # STRING REQUIRED ... whether the short is blank node ref
- virtrdf:qmfIslitOfShortTmpl " isnotnull (^{tree}^)"; # STRING REQUIRED ... whether the short is literal
+ virtrdf:qmfIslitOfShortTmpl " 1"; # STRING REQUIRED ... whether the short is literal
# Templates that convert short value into other types (can be applied to both field and not field expression)
virtrdf:qmfLongOfShortTmpl " DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (^{custom-verbatim-1}^ (^{tree}^))"; # STRING REQUIRED ... long from short
virtrdf:qmfSqlvalOfShortTmpl " ^{custom-verbatim-1}^ (^{tree}^)"; # STRING REQUIRED ... SQL value from short
diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk
index 386d5e9..31b4c5c 100644
--- a/binsrc/cached_resources/res_to_c.awk
+++ b/binsrc/cached_resources/res_to_c.awk
@@ -1,14 +1,14 @@
#
# sql_to_c.awk
#
-# $Id: res_to_c.awk,v 1.1.1.1.2.3 2012/03/08 13:52:41 source Exp $
+# $Id: res_to_c.awk,v 1.1.1.1.2.1 2011/09/08 15:28:27 source Exp $
#
# Embeds text into a C file
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -30,7 +30,13 @@ BEGIN {
}
{
fun = $0
- gsub ( "\\\\", "&&", fun)
+ # was: gsub ( /\\/, "\\\\", fun)
+ q = "\\\\"
+ if (PROCINFO["version"] ~ /^4/)
+ gsub ( q, q q, fun)
+ else
+ gsub ( q, q, fun)
+
gsub ( /"/, "\\\"", fun)
gsub ( /\$/, "\\044", fun)
gsub ( /.*/, "\"&\\n\",", fun)
diff --git a/binsrc/config/ccdefs.c b/binsrc/config/ccdefs.c
index e6e2a5a..2e3874c 100644
--- a/binsrc/config/ccdefs.c
+++ b/binsrc/config/ccdefs.c
@@ -1,14 +1,14 @@
/*
* ccdefs.c
*
- * $Id: ccdefs.c,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+ * $Id: ccdefs.c,v 1.2 2008/07/03 13:44:22 source Exp $
*
* Determine & report the Makeconfig variables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/config/config.guess b/binsrc/config/config.guess
index dc84c68..e6b5d5b 100755
--- a/binsrc/config/config.guess
+++ b/binsrc/config/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-11-20'
+timestamp='2008-01-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-11-20'
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# Originally written by Per Bothner <per at bothner.com>.
+# Please send patches to <config-patches at gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -139,6 +139,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_MACHINE}" in
+ i?86)
+ test -z "$VENDOR" && VENDOR=pc
+ ;;
+ *)
+ test -z "$VENDOR" && VENDOR=unknown
+ ;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -170,7 +180,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ELF__
+ | grep __ELF__ >/dev/null
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -324,33 +334,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
- s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
- exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- SUN_ARCH="x86_64"
- fi
- fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -659,7 +650,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep -q __LP64__
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -810,12 +801,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:*)
+ *:Interix*:[3456]*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- authenticamd | genuineintel | EM64T)
+ EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -825,9 +816,6 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -857,32 +845,18 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
@@ -891,91 +865,181 @@ EOF
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
- exit ;;
- i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo frv-${VENDOR}-linux-gnu
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
+ ;;
+ mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
+ #undef mips64
+ #undef mips64el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=${UNAME_MACHINE}el
+ CPU=mips64el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=${UNAME_MACHINE}
+ CPU=mips64
#else
CPU=
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo or32-${VENDOR}-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-${VENDOR}-linux-gnu
exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ ppc64:Linux:*:*)
+ echo powerpc64-${VENDOR}-linux-gnu
exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+ PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+ *) echo hppa-${VENDOR}-linux-gnu ;;
esac
exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-${VENDOR}-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo x86_64-${VENDOR}-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported targets: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+ TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
+ exit ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
+ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
+ exit ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+ ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -1004,7 +1068,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1048,11 +1112,8 @@ EOF
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
- # Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
- # this is a cross-build.
- echo i586-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
@@ -1090,16 +1151,6 @@ EOF
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- OS_REL='.3'
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1112,7 +1163,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1175,9 +1226,6 @@ EOF
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit ;;
- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1205,16 +1253,6 @@ EOF
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1296,9 +1334,6 @@ EOF
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
- i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
- exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1459,9 +1494,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/binsrc/config/config.sub b/binsrc/config/config.sub
index 2a55a50..6759825 100755
--- a/binsrc/config/config.sub
+++ b/binsrc/config/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-11-20'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -32,16 +32,13 @@ timestamp='2009-11-20'
# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -125,7 +122,6 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -152,13 +148,10 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
- ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -256,16 +249,13 @@ case $basic_machine in
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
| mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
@@ -278,7 +268,6 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
- | moxie \
| mt \
| msp430 \
| nios | nios2 \
@@ -287,22 +276,20 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
- | ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k | z80)
+ | z8k)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
@@ -342,17 +329,14 @@ case $basic_machine in
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
| mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
@@ -373,22 +357,21 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
- | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-* | z80-*)
+ | z8k-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
@@ -456,10 +439,6 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
- aros)
- basic_machine=i386-pc
- os=-aros
- ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -476,18 +455,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
- bluegene*)
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -555,10 +526,6 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -732,9 +699,6 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
- basic_machine=microblaze-xilinx
- ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -1164,10 +1128,6 @@ case $basic_machine in
basic_machine=z8k-unknown
os=-sim
;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1206,7 +1166,7 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1256,9 +1216,6 @@ case $os in
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
- ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1279,11 +1236,10 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1292,7 +1248,7 @@ case $os in
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1302,7 +1258,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1432,9 +1388,6 @@ case $os in
-zvmoe)
os=-zvmoe
;;
- -dicos*)
- os=-dicos
- ;;
-none)
;;
*)
@@ -1632,7 +1585,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
- -cnk*|-aix*)
+ -aix*)
vendor=ibm
;;
-beos*)
diff --git a/binsrc/config/depcomp b/binsrc/config/depcomp
index df8eea7..e5f9736 100755
--- a/binsrc/config/depcomp
+++ b/binsrc/config/depcomp
@@ -1,10 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2007-03-29.01
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +17,9 @@ scriptversion=2009-04-28.21; # UTC
# 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, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -85,15 +87,6 @@ if test "$depmode" = dashXmstdout; then
depmode=dashmstdout
fi
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u="sed s,\\\\\\\\,/,g"
- depmode=msvisualcpp
-fi
-
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
@@ -199,14 +192,14 @@ sgi)
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
-' ' ' >> "$depfile"
- echo >> "$depfile"
+' ' ' >> $depfile
+ echo >> $depfile
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
+ >> $depfile
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -335,12 +328,7 @@ hp2)
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
# Add `dependent.h:' lines.
- sed -ne '2,${
- s/^ *//
- s/ \\*$//
- s/$/:/
- p
- }' "$tmpdepfile" >> "$depfile"
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -416,7 +404,7 @@ dashmstdout)
# Remove the call to Libtool.
if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
+ while test $1 != '--mode=compile'; do
shift
done
shift
@@ -467,39 +455,32 @@ makedepend)
"$@" || exit $?
# Remove any Libtool call
if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
+ while test $1 != '--mode=compile'; do
shift
done
shift
fi
# X makedepend
shift
- cleared=no eat=no
- for arg
- do
+ cleared=no
+ for arg in "$@"; do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
- if test $eat = yes; then
- eat=no
- continue
- fi
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
# Strip any option that makedepend may not understand. Remove
# the object too, otherwise makedepend will parse it as a source file.
- -arch)
- eat=yes ;;
-*|$object)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
- obj_suffix=`echo "$object" | sed 's/^.*\././'`
+ obj_suffix="`echo $object | sed 's/^.*\././'`"
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
@@ -519,7 +500,7 @@ cpp)
# Remove the call to Libtool.
if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
+ while test $1 != '--mode=compile'; do
shift
done
shift
@@ -557,27 +538,13 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
+ # always write the preprocessed file to stdout, regardless of -o,
+ # because we must use -o when running libtool.
"$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
-
IFS=" "
for arg
do
case "$arg" in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
@@ -590,23 +557,16 @@ msvisualcpp)
;;
esac
done
- "$@" -E 2>/dev/null |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+ "$@" -E |
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
-msvcmsys)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
none)
exec "$@"
;;
@@ -625,6 +585,5 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
# End:
diff --git a/binsrc/config/install-sh b/binsrc/config/install-sh
index 6781b98..a5897de 100755
--- a/binsrc/config/install-sh
+++ b/binsrc/config/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,6 +515,5 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
# End:
diff --git a/binsrc/config/libtool.m4 b/binsrc/config/libtool.m4
index 88de383..4ff44c8 100644
--- a/binsrc/config/libtool.m4
+++ b/binsrc/config/libtool.m4
@@ -1,8 +1,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -11,8 +10,7 @@
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -39,7 +37,7 @@ m4_define([_LT_COPYING], [dnl
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
-# serial 57 LT_INIT
+# serial 56 LT_INIT
# LT_PREREQ(VERSION)
@@ -68,7 +66,6 @@ esac
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -85,8 +82,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
@@ -123,7 +118,7 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
])
@@ -143,9 +138,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
@@ -168,13 +160,10 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
m4_require([_LT_CMD_RELOAD])dnl
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
@@ -190,6 +179,7 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
case $host_os in
aix3*)
@@ -203,6 +193,23 @@ aix3*)
;;
esac
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -243,28 +250,6 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
@@ -423,7 +408,7 @@ m4_define([_lt_decl_all_varnames],
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
# _LT_CONFIG_STATUS_DECLARATIONS
@@ -433,7 +418,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -532,20 +517,12 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
# Quote evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -556,9 +533,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -566,38 +543,16 @@ for var in lt_decl_all_varnames([[ \
esac
done
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+ ;;
+esac
+
_LT_OUTPUT_LIBTOOL_INIT
])
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script. The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
# ---------
@@ -607,11 +562,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
-cat >>"$CONFIG_LT" <<\_LTEOF
lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
@@ -637,7 +601,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -682,13 +646,15 @@ chmod +x "$CONFIG_LT"
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
+if test "$no_create" != yes; then
+ lt_cl_success=:
+ test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+ exec AS_MESSAGE_LOG_FD>/dev/null
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+ exec AS_MESSAGE_LOG_FD>>config.log
+ $lt_cl_success || AS_EXIT(1)
+fi
])# LT_OUTPUT
@@ -718,7 +684,6 @@ _LT_CONFIG_SAVE_COMMANDS([
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
_LT_COPYING
@@ -751,12 +716,15 @@ _LT_EOF
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
- _LT_PROG_REPLACE_SHELLFNS
+ _LT_PROG_XSI_SHELLFNS
- mv -f "$cfgfile" "$ofile" ||
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
@@ -862,13 +830,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
dnl AC_DEFUN([AC_LIBTOOL_F77], [])
dnl AC_DEFUN([AC_LIBTOOL_FC], [])
dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
# _LT_TAG_COMPILER
@@ -973,31 +939,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
- [lt_cv_ld_force_load=no
- cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
- _lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
- lt_cv_ld_force_load=yes
- else
- cat conftest.err >&AS_MESSAGE_LOG_FD
- fi
- rm -f conftest.err libconftest.a conftest conftest.c
- rm -rf conftest.dSYM
- ])
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1025,7 +966,7 @@ _LT_EOF
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test "$DSYMUTIL" != ":"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1045,11 +986,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
- fi
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -1057,7 +994,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=func_echo_all
+ output_verbose_link_cmd=echo
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1073,141 +1010,202 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
fi
])
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
# Links a minimal program and checks the executable
# for the system default hardcoded library path. In most cases,
# this is /usr/lib:/lib, but when the MPI compilers are used
# the location of the communication and MPI libs are included too.
# If we don't find anything, use the default library path according
# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
- [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
- lt_aix_libpath_sed='[
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }]'
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi],[])
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
- fi
- ])
- aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
+AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_SYS_MODULE_PATH_AIX
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
+[ifdef([AC_DIVERSION_NOTICE],
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+ [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
# _LT_PROG_ECHO_BACKSLASH
# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+ # Remove one level of quotation (which was required for Make).
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+ ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X[$]1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $ECHO works!
+ :
else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
+ # Restart under the correct shell.
+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
fi
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
+if test "X[$]1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<_LT_EOF
+[$]*
+_LT_EOF
+ exit 0
+fi
-case "$ECHO" in
- printf*) AC_MSG_RESULT([printf]) ;;
- print*) AC_MSG_RESULT([print -r]) ;;
- *) AC_MSG_RESULT([cat]) ;;
-esac
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- PATH=/empty FPATH=/empty; export PATH FPATH
- test "X`printf %s $ECHO`" = "X$ECHO" \
- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+ then
+ break
+ fi
+ done
+ fi
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+ else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
+
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$dir/echo"
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ ECHO='print -r'
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ else
+ # Try using printf.
+ ECHO='printf %s\n'
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted. We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
- if test "$GCC" = yes; then
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- fi
- ;; #(
- /*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
- ;; #(
- no|'')
- ;; #(
- *)
- AC_MSG_RESULT([${with_sysroot}])
- AC_MSG_ERROR([The sysroot must be an absolute path.])
- ;;
-esac
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
+
+ if test "$prev" != 'sed 50q "[$]0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+ fi
+ fi
+ fi
+ fi
+ fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+ [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -1237,7 +1235,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
@@ -1355,47 +1353,14 @@ need_locks="$enable_libtool_lock"
])# _LT_ENABLE_LOCK
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
- [lt_cv_ar_at_file=no
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
- [echo conftest.$ac_objext > conftest.lst
- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
- AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
- # Ensure the archiver fails upon bogus file names.
- rm -f conftest.$ac_objext libconftest.a
- AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
- lt_cv_ar_at_file=@
- fi
- fi
- rm -f conftest.* libconftest.a
- ])
- ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
- archiver_list_spec=
-else
- archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
- [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
# _LT_CMD_OLD_ARCHIVE
# -------------------
m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
@@ -1422,19 +1387,10 @@ if test -n "$RANLIB"; then
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
-
-case $host_os in
- darwin*)
- lock_old_archive_extraction=yes ;;
- *)
- lock_old_archive_extraction=no ;;
-esac
_LT_DECL([], [old_postinstall_cmds], [2])
_LT_DECL([], [old_postuninstall_cmds], [2])
_LT_TAGDECL([], [old_archive_cmds], [2],
[Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
- [Whether to use a lock for old archive extraction])
])# _LT_CMD_OLD_ARCHIVE
@@ -1459,15 +1415,15 @@ AC_CACHE_CHECK([$1], [$2],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -1507,7 +1463,7 @@ AC_CACHE_CHECK([$1], [$2],
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -1570,11 +1526,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- mint*)
- # On MiNT this can take a long time and run out of memory.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -1639,8 +1590,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -1691,7 +1642,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
+[#line __oline__ "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -1732,13 +1683,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1747,11 +1692,7 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
- }
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
else
@@ -1927,16 +1868,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2095,7 +2036,6 @@ m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
@@ -2104,23 +2044,16 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
- case $lt_search_path_spec in
- *\;*)
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
- ;;
- *)
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
- ;;
- esac
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -2133,7 +2066,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -2153,13 +2086,7 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
- # AWK program above erroneously prepends '/' to C:/dos/paths
- # for these hosts.
- case $host_os in
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
- esac
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
@@ -2247,7 +2174,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -2278,9 +2205,8 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$cc_basename in
- yes,*)
- # gcc
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -2301,83 +2227,36 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- ;;
-
- *,cl*)
- # Native MSVC
- libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
-
- case $build_os in
- mingw*)
- sys_lib_search_path_spec=
- lt_save_ifs=$IFS
- IFS=';'
- for lt_path in $LIB
- do
- IFS=$lt_save_ifs
- # Let DOS variable expansion print the short 8.3 style file name.
- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- done
- IFS=$lt_save_ifs
- # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
- ;;
- cygwin*)
- # Convert to unix form, then to dos form, then back to unix form
- # but this time dos style (no spaces!) so that the unix form looks
- # like /cygdrive/c/PROGRA~1:/cygdr...
- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- ;;
- *)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH.
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
- # FIXME: find the short name or the path components, as spaces are
- # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
;;
esac
-
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
- dynamic_linker='Win32 link.exe'
;;
*)
- # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- dynamic_linker='Win32 ld.exe'
;;
esac
+ dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -2464,19 +2343,6 @@ gnu*)
hardcode_into_libs=yes
;;
-haiku*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -2519,10 +2385,8 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
postinstall_cmds='chmod 555 $lib'
- # or fails outright, so override atomically:
- install_override_mode=555
;;
interix[[3-9]]*)
@@ -2580,7 +2444,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2589,35 +2453,26 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
-
# Some binutils ld are patched to set DT_RUNPATH
- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
- [lt_cv_shlibpath_overrides_runpath=no
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [lt_cv_shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
- ])
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+ [shlibpath_overrides_runpath=yes])])
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2849,8 +2704,6 @@ _LT_DECL([], [library_names_spec], [1],
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
- [Permission mode override for installation of shared libraries])
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
@@ -2963,7 +2816,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
@@ -3085,11 +2937,6 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
- reload_cmds=false
- fi
- ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -3098,8 +2945,8 @@ case $host_os in
fi
;;
esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
@@ -3151,18 +2998,16 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- # Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc*)
+cegcc)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3192,10 +3037,6 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-haiku*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -3204,11 +3045,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -3230,7 +3071,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3308,21 +3149,6 @@ tpf*)
;;
esac
])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
- case $host_os in
- mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
- fi
- ;;
- esac
-fi
-
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3330,11 +3156,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
_LT_DECL([], [deplibs_check_method], [1],
[Method to check whether dependent libraries are shared objects])
_LT_DECL([], [file_magic_cmd], [1],
- [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
- [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
- [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+ [Command to use when deplibs_check_method == "file_magic"])
])# _LT_CHECK_MAGIC_METHOD
@@ -3391,19 +3213,7 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$DUMPBIN"; then :
- # Let the user override the test.
- else
- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
- *COFF*)
- DUMPBIN="$DUMPBIN -symbols"
- ;;
- *)
- DUMPBIN=:
- ;;
- esac
- fi
+ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -3416,13 +3226,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3437,67 +3247,6 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- *--identify-strict*)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- ;;
- *)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- ;;
- esac
- ;;
-*)
- # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
- [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
- [lt_cv_path_mainfest_tool=no
- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- cat conftest.err >&AS_MESSAGE_LOG_FD
- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_mainfest_tool=yes
- fi
- rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
- MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
# LT_LIB_M
# --------
@@ -3506,7 +3255,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3534,12 +3283,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
- case $cc_basename in
- nvcc*)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
- esac
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
@@ -3556,7 +3300,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
@@ -3624,8 +3367,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3661,7 +3404,6 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -3683,7 +3425,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -3695,18 +3437,6 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT@&t at _DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data. */
-# define LT@&t at _DLSYM_CONST
-#else
-# define LT@&t at _DLSYM_CONST const
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -3718,7 +3448,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-LT@&t at _DLSYM_CONST struct {
+const struct {
const char *name;
void *address;
}
@@ -3744,15 +3474,15 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_globsym_save_LIBS=$LIBS
- lt_globsym_save_CFLAGS=$CFLAGS
+ lt_save_LIBS="$LIBS"
+ lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS=$lt_globsym_save_LIBS
- CFLAGS=$lt_globsym_save_CFLAGS
+ LIBS="$lt_save_LIBS"
+ CFLAGS="$lt_save_CFLAGS"
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
@@ -3785,13 +3515,6 @@ else
AC_MSG_RESULT(ok)
fi
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
- nm_file_list_spec='@'
-fi
-
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3802,8 +3525,6 @@ _LT_DECL([global_symbol_to_c_name_address],
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
- [Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3815,6 +3536,7 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)=
+AC_MSG_CHECKING([for $compiler option to produce PIC])
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -3865,11 +3587,6 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -3919,12 +3636,6 @@ m4_if([$1], [CXX], [
;;
esac
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
dgux*)
case $cc_basename in
ec++*)
@@ -3981,7 +3692,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4014,8 +3725,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
- # IBM XL 8.0, 9.0 on PPC and BlueGene
+ xlc* | xlC*)
+ # IBM XL 8.0 on PPC
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4077,7 +3788,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
- CC* | sunCC*)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4181,12 +3892,6 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
-
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -4229,13 +3934,6 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
-
- case $cc_basename in
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
- ;;
- esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -4278,7 +3976,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4299,13 +3997,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
- nagfor*)
- # NAG Fortran compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4317,26 +4009,26 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xl* | bgxl* | bgf* | mpixl*)
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
- ;;
*Sun\ C*)
# Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ ;;
esac
;;
esac
@@ -4367,7 +4059,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ f77* | f90* | f95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4424,11 +4116,9 @@ case $host_os in
_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
;;
esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+ [How to pass a linker flag through the compiler])
#
# Check to make sure the PIC flag actually works.
@@ -4447,8 +4137,6 @@ fi
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- [How to pass a linker flag through the compiler])
#
# Check to make sure the static flag actually works.
#
@@ -4469,7 +4157,6 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
m4_defun([_LT_LINKER_SHLIBS],
[AC_REQUIRE([LT_PATH_LD])dnl
AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -4478,35 +4165,27 @@ m4_require([_LT_TAG_COMPILER])dnl
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
m4_if([$1], [CXX], [
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
+ ;;
cygwin* | mingw* | cegcc*)
- case $cc_basename in
- cl*) ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
- ;;
- esac
- ;;
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ ;;
esac
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4569,33 +4248,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
- case $host_os in
- aix*)
- # The AIX port of GNU ld has always aspired to compatibility
- # with the native linker. However, as the warning in the GNU ld
- # block says, versions before 2.19.5* couldn't really create working
- # shared libraries, regardless of the interface used.
- case `$LD -v 2>&1` in
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- fi
-
- if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4613,7 +4266,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
- *GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4629,12 +4281,11 @@ dnl Note also adjust exclude_expsyms for C++ above.
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
_LT_EOF
fi
@@ -4670,12 +4321,10 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -4693,11 +4342,6 @@ _LT_EOF
fi
;;
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4713,7 +4357,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -4723,16 +4367,15 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=' $pic_flag'
+ tmp_addflag=
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4743,17 +4386,13 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
- ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -4769,17 +4408,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf* | bgf* | bgxlf* | mpixlf*)
+ xlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4793,8 +4432,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -4812,8 +4451,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4859,8 +4498,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4900,10 +4539,8 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4990,9 +4627,9 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5001,19 +4638,14 @@ _LT_EOF
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -5045,63 +4677,20 @@ _LT_EOF
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- case $cc_basename in
- cl*)
- # Native MSVC
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
- # The linker will not automatically build a static lib if we build a DLL.
- # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
- # Don't use ranlib
- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # Assume MSVC wrapper
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
- esac
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
darwin* | rhapsody*)
@@ -5139,7 +4728,7 @@ _LT_EOF
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5147,7 +4736,7 @@ _LT_EOF
hpux9*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
@@ -5162,8 +4751,8 @@ _LT_EOF
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -5181,16 +4770,16 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
@@ -5202,14 +4791,7 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- m4_if($1, [], [
- # Older versions of the 11.00 compiler do not understand -b yet
- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
- _LT_LINKER_OPTION([if $CC understands -b],
- _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
- [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
@@ -5237,34 +4819,28 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- # This should be the same for all languages, so no per-tag cache variable.
- AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
- [lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(
- [AC_LANG_SOURCE(
- [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
- [C++], [[int foo (void) { return 0; }]],
- [Fortran 77], [[
- subroutine foo
- end]],
- [Fortran], [[
- subroutine foo
- end]])])],
- [lt_cv_irix_exported_symbol=yes],
- [lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- fi
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(
+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+ [C++], [[int foo (void) { return 0; }]],
+ [Fortran 77], [[
+ subroutine foo
+ end]],
+ [Fortran], [[
+ subroutine foo
+ end]])])], [
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ ])
+ LDFLAGS="$save_LDFLAGS"
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5326,17 +4902,17 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5346,13 +4922,13 @@ _LT_EOF
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5365,9 +4941,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
@@ -5543,38 +5119,36 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- AC_CACHE_CHECK([whether -lc should be explicitly linked in],
- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
- [$RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- ])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+ then
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ else
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
;;
esac
fi
@@ -5639,6 +5213,8 @@ _LT_TAGDECL([], [inherit_rpath], [0],
to runtime path list])
_LT_TAGDECL([], [link_all_deplibs], [0],
[Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+ [Fix the shell variable $srcfile for the compiler])
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5649,8 +5225,6 @@ _LT_TAGDECL([], [include_expsyms], [1],
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
- [Commands necessary for finishing linking programs])
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
@@ -5744,15 +5318,14 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
@@ -5760,6 +5333,22 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
else
_lt_caught_CXX_error=yes
fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined. These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5781,8 +5370,6 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5814,7 +5401,6 @@ if test "$_lt_caught_CXX_error" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
- lt_save_CFLAGS=$CFLAGS
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
@@ -5832,7 +5418,6 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
- CFLAGS=$CXXFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -5854,8 +5439,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5887,7 +5472,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
else
GXX=no
@@ -5996,10 +5581,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -6008,19 +5593,14 @@ if test "$_lt_caught_CXX_error" != yes; then
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
@@ -6050,75 +5630,28 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
cygwin* | mingw* | pw32* | cegcc*)
- case $GXX,$cc_basename in
- ,cl* | no,cl*)
- # Native MSVC
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
- # The linker will not automatically build a static lib if we build a DLL.
- # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- # Don't use ranlib
- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # g++
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
@@ -6160,11 +5693,6 @@ if test "$_lt_caught_CXX_error" != yes; then
gnu*)
;;
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6189,11 +5717,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
*)
if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6254,7 +5782,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
*)
if test "$GXX" = yes; then
@@ -6264,10 +5792,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -6297,7 +5825,7 @@ if test "$_lt_caught_CXX_error" != yes; then
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6308,9 +5836,9 @@ if test "$_lt_caught_CXX_error" != yes; then
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6321,7 +5849,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6339,7 +5867,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6376,26 +5904,26 @@ if test "$_lt_caught_CXX_error" != yes; then
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
$RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- *) # Version 6 and above use weak symbols
+ *) # Version 6 will use weak symbols
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
@@ -6403,7 +5931,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -6422,9 +5950,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
- xl* | mpixl* | bgxl*)
+ xl*)
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6444,13 +5972,13 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
# would be better.
- output_verbose_link_cmd='func_echo_all'
+ output_verbose_link_cmd='echo'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6519,7 +6047,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
- output_verbose_link_cmd=func_echo_all
+ output_verbose_link_cmd=echo
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6554,15 +6082,15 @@ if test "$_lt_caught_CXX_error" != yes; then
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
@@ -6578,17 +6106,17 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
;;
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
@@ -6598,7 +6126,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -6634,7 +6162,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
- CC* | sunCC*)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6655,7 +6183,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
- output_verbose_link_cmd='func_echo_all'
+ output_verbose_link_cmd='echo'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6675,14 +6203,14 @@ if test "$_lt_caught_CXX_error" != yes; then
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6693,7 +6221,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6747,10 +6275,6 @@ if test "$_lt_caught_CXX_error" != yes; then
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6806,7 +6330,6 @@ if test "$_lt_caught_CXX_error" != yes; then
fi # test -n "$compiler"
CC=$lt_save_CC
- CFLAGS=$lt_save_CFLAGS
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
@@ -6821,29 +6344,6 @@ AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -6852,7 +6352,6 @@ func_stripname_cnf ()
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
@@ -6903,13 +6402,6 @@ public class foo {
};
_LT_EOF
])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-esac
-
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
@@ -6921,7 +6413,7 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
@@ -6930,22 +6422,13 @@ if AC_TRY_EVAL(ac_compile); then
test $p = "-R"; then
prev=$p
continue
+ else
+ prev=
fi
- # Expand the sysroot to ease extracting the directories later.
- if test -z "$prev"; then
- case $p in
- -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
- -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
- -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
- esac
- fi
- case $p in
- =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
- esac
if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
- -L | -R)
+ case $p in
+ -L* | -R*)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
@@ -6965,10 +6448,8 @@ if AC_TRY_EVAL(ac_compile); then
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
- prev=
;;
- *.lto.$objext) ;; # Ignore GCC LTO objects
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
@@ -7004,7 +6485,6 @@ else
fi
$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
@@ -7041,7 +6521,7 @@ linux*)
solaris*)
case $cc_basename in
- CC* | sunCC*)
+ CC*)
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
@@ -7085,16 +6565,32 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
# _LT_LANG_F77_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7113,8 +6609,6 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7154,9 +6648,7 @@ if test "$_lt_disable_F77" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
- CFLAGS=$FFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -7210,24 +6702,38 @@ if test "$_lt_disable_F77" != yes; then
GCC=$lt_save_GCC
CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
fi # test "$_lt_disable_F77" != yes
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
# _LT_LANG_FC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7246,8 +6752,6 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7287,9 +6791,7 @@ if test "$_lt_disable_FC" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
- CFLAGS=$FCFLAGS
compiler=$CC
GCC=$ac_cv_fc_compiler_gnu
@@ -7345,8 +6847,7 @@ if test "$_lt_disable_FC" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC=$lt_save_CC
- CFLAGS=$lt_save_CFLAGS
+ CC="$lt_save_CC"
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
@@ -7383,12 +6884,10 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
+lt_save_CC="$CC"
lt_save_GCC=$GCC
GCC=yes
CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
@@ -7398,8 +6897,6 @@ _LT_CC_BASENAME([$compiler])
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7419,8 +6916,7 @@ fi
AC_LANG_RESTORE
GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
+CC="$lt_save_CC"
])# _LT_LANG_GCJ_CONFIG
@@ -7455,11 +6951,9 @@ _LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
CC=${RC-"windres"}
-CFLAGS=
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -7472,8 +6966,7 @@ fi
GCC=$lt_save_GCC
AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
+CC="$lt_save_CC"
])# _LT_LANG_RC_CONFIG
@@ -7532,15 +7025,6 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
AC_SUBST([OBJDUMP])
])
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
# _LT_DECL_SED
# ------------
@@ -7634,8 +7118,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,, \
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -7674,162 +7158,208 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+}
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=${1%%=*}
+ func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=${1%.*}.lo
+}
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=$(( $[*] ))
+}
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=${#1}
+}
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+_LT_EOF
+ ;;
+ *) # Bourne compatible functions.
+ cat << \_LT_EOF >> "$cfgfile"
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+}
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+}
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- ;;
- esac
- ;;
- *-*-cygwin* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- ;;
- esac
- ;;
- * ) # unhandled hosts (and "normal" native builds)
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
- [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- ;;
- esac
+
+case $lt_shell_append in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$[1]+=\$[2]"
+}
+_LT_EOF
;;
-esac
+ *)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+ ;;
+ esac
])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
- [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/binsrc/config/ltmain.sh b/binsrc/config/ltmain.sh
index aa5624c..950feee 100755
--- a/binsrc/config/ltmain.sh
+++ b/binsrc/config/ltmain.sh
@@ -1,9 +1,9 @@
+# Generated from ltmain.m4sh.
-# libtool (GNU libtool) 2.4
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -32,56 +32,50 @@
#
# Provide generalized library-building support services.
#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --no-quiet, --no-silent
-# print informational messages (default)
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print more informational messages than default
-# --no-verbose don't print the extra informational messages
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print informational messages (default)
+# --version print version information
+# -h, --help print short or long help message
#
# MODE must be one of the following:
#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# MODE-ARGS vary depending on the MODE.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4
-# automake: $automake_version
-# autoconf: $autoconf_version
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.6b
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
-PROGRAM=libtool
+PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.4
+VERSION=2.2.6b
TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3018
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -97,15 +91,10 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
# NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -118,33 +107,24 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
$lt_unset CDPATH
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+: ${ECHO="echo"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/bin/sed"}
+: ${SED="/usr/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -164,27 +144,6 @@ IFS=" $lt_nl"
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
@@ -199,183 +158,33 @@ func_basename ()
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
- s@/\./@/@g
- t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-# value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
- "")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
}
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
- ;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
- ;;
- *)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
- ;;
- esac
- done
-
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
+# Generated shell functions inserted here.
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
+case $progname in
+ -*) progname=./$progname ;;
+esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@ -406,15 +215,6 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
@@ -443,7 +243,7 @@ opt_warning=:
# name if it has been set yet.
func_echo ()
{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+ $ECHO "$progname${mode+: }$mode: $*"
}
# func_verbose arg...
@@ -458,25 +258,18 @@ func_verbose ()
:
}
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
}
# func_warning arg...
# Echo program name prefixed warning message to standard error.
func_warning ()
{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
# bash bug again:
:
@@ -533,9 +326,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -585,7 +378,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "$my_tmpdir"
+ $ECHO "X$my_tmpdir" | $Xsed
}
@@ -599,7 +392,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -626,7 +419,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
+ my_arg=`$ECHO "X$1" | $Xsed \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -695,39 +488,15 @@ func_show_eval_locale ()
fi
}
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result. All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
-}
+
+
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $opt_debug
-
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -740,28 +509,22 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
- $opt_debug
-
- $SED -n '/^# Usage:/,/^# *.*--help/ {
+ $SED -n '/^# Usage:/,/# -h/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- echo
+ $ECHO
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+# func_help
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
-
$SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
s/^# //
s/^# *$//
s*\$progname*'$progname'*
@@ -774,15 +537,8 @@ func_help ()
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ }' < "$progpath"
+ exit $?
}
# func_missing_arg argname
@@ -790,106 +546,63 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
-
- func_error "missing argument for $1."
+ func_error "missing argument for $1"
exit_cmd=exit
}
+exit_cmd=:
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
-
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-exit_cmd=:
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+ # Yippee, $ECHO works!
+ :
+else
+ # Restart under the correct shell, and then maybe $ECHO will work.
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit $EXIT_SUCCESS
+fi
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
# Global variables.
+# $mode is unset
nonopt=
+execute_dlfiles=
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
+
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
@@ -923,16 +636,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
- echo "host: $host"
+ $ECHO "host: $host"
if test "$build_libtool_libs" = yes; then
- echo "enable shared libraries"
+ $ECHO "enable shared libraries"
else
- echo "disable shared libraries"
+ $ECHO "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- echo "enable static libraries"
+ $ECHO "enable static libraries"
else
- echo "disable static libraries"
+ $ECHO "disable static libraries"
fi
exit $?
@@ -979,204 +692,117 @@ func_enable_tag ()
esac
}
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
+# Parse options once, thoroughly. This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
- fi
-
- exit $EXIT_MISMATCH
- fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
- # this just eases exit handling
- while test $# -gt 0; do
+ # Parse non-mode specific arguments:
+ while test "$#" -gt 0; do
opt="$1"
shift
+
case $opt in
- --debug|-x) opt_debug='set -x'
+ --config) func_config ;;
+
+ --debug) preserve_args="$preserve_args $opt"
func_echo "enabling shell trace mode"
+ opt_debug='set -x'
$opt_debug
;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
+
+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ execute_dlfiles="$execute_dlfiles $1"
shift
;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
+
+ --dry-run | -n) opt_dry_run=: ;;
+ --features) func_features ;;
+ --finish) mode="finish" ;;
+
+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ case $1 in
+ # Valid mode arguments:
+ clean) ;;
+ compile) ;;
+ execute) ;;
+ finish) ;;
+ install) ;;
+ link) ;;
+ relink) ;;
+ uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+
+ mode="$1"
shift
;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
+
+ --preserve-dup-deps)
+ opt_duplicate_deps=: ;;
+
+ --quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
+
+ --verbose| -v) preserve_args="$preserve_args $opt"
+ opt_silent=false
;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
+
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ preserve_args="$preserve_args $opt $1"
+ func_enable_tag "$1" # tagname is set here
shift
;;
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
-
# Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+ -dlopen=*|--mode=*|--tag=*)
+ func_opt_split "$opt"
+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
shift
;;
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
+ -\?|-h) func_usage ;;
+ --help) opt_help=: ;;
+ --version) func_version ;;
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+
+ *) nonopt="$opt"
+ break
+ ;;
esac
done
- # Validate options:
-
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
-
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -1184,44 +810,82 @@ func_enable_tag "$optarg"
opt_duplicate_compiler_generated_deps=:
;;
*)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
;;
esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
+ # Having warned about all mis-specified options, bail out if
+ # anything was wrong.
+ $exit_cmd $EXIT_FAILURE
+}
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ exit $EXIT_MISMATCH
+ fi
+}
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+## ----------- ##
+## Main. ##
+## ----------- ##
+$opt_help || {
+ # Sanity checks first:
+ func_check_version_match
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
-}
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
+ fi
+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$progname --help --mode=$mode' for more information."
+}
-## ----------- ##
-## Main. ##
-## ----------- ##
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -1286,9 +950,12 @@ func_ltwrapper_executable_p ()
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
- func_dirname_and_basename "$1" "" "."
- func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=""
+ if func_ltwrapper_executable_p "$1"; then
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ fi
}
# func_ltwrapper_p file
@@ -1334,37 +1001,6 @@ func_source ()
}
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot. Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
- func_resolve_sysroot_result=$1
- case $func_resolve_sysroot_result in
- =*)
- func_stripname '=' '' "$func_resolve_sysroot_result"
- func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
- ;;
- esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
- case "$lt_sysroot:$1" in
- ?*:"$lt_sysroot"*)
- func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
- ;;
- *)
- # Including no sysroot.
- func_replace_sysroot_result=$1
- ;;
- esac
-}
-
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
@@ -1377,15 +1013,13 @@ func_infer_tag ()
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
- func_append_quoted CC_quoted "$arg"
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
- CC_expanded=`func_echo_all $CC`
- CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1396,13 +1030,11 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
- func_append_quoted CC_quoted "$arg"
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
- CC_expanded=`func_echo_all $CC`
- CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1465,486 +1097,6 @@ EOF
}
}
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
- if test -n "$1"; then
- # Unfortunately, winepath does not exit with a non-zero error code, so we
- # are forced to check the contents of stdout. On the other hand, if the
- # command is not found, the shell will set an exit code of 127 and print
- # *an error message* to stdout. So we must check for both error code of
- # zero AND non-empty stdout, which explains the odd construction:
- func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
- func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
- else
- func_convert_core_file_wine_to_w32_result=
- fi
- fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
- $opt_debug
- # unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
- if test -n "$1"; then
- oldIFS=$IFS
- IFS=:
- for func_convert_core_path_wine_to_w32_f in $1; do
- IFS=$oldIFS
- func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
- if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
- else
- func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
- fi
- fi
- done
- IFS=$oldIFS
- fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
- $opt_debug
- if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
- func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
- if test "$?" -ne 0; then
- # on failure, ensure result is empty
- func_cygpath_result=
- fi
- else
- func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
- fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format. Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
- $opt_debug
- # awkward: cmd appends spaces to result
- func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
- func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback:
- func_to_host_file_result="$1"
- fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
- $opt_debug
- if test -z "$4" && test -n "$3"; then
- func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback. This is a deliberately simplistic "conversion" and
- # should not be "improved". See libtool.info.
- if test "x$1" != "x$2"; then
- lt_replace_pathsep_chars="s|$1|$2|g"
- func_to_host_path_result=`echo "$3" |
- $SED -e "$lt_replace_pathsep_chars"`
- else
- func_to_host_path_result="$3"
- fi
- fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
- $opt_debug
- case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
- ;;
- esac
- case $4 in
- $2 ) func_append func_to_host_path_result "$3"
- ;;
- esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
- $opt_debug
- $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result. If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
- $opt_debug
- case ,$2, in
- *,"$to_tool_file_cmd",*)
- func_to_tool_file_result=$1
- ;;
- *)
- $to_tool_file_cmd "$1"
- func_to_tool_file_result=$func_to_host_file_result
- ;;
- esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
- func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper. Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format. Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
- # LT_CYGPATH in this case.
- func_to_host_file_result=`cygpath -m "$1"`
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format. Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- func_convert_core_msys_to_w32 "$1"
- func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
- $opt_debug
- func_to_host_file_result="$1"
- if test -n "$1"; then
- # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
- func_convert_core_file_wine_to_w32 "$1"
- func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
- fi
- func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format. If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-# file name conversion function : func_convert_file_X_to_Y ()
-# path conversion function : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same. If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
- $opt_debug
- if test -z "$to_host_path_cmd"; then
- func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
- fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
- $opt_debug
- func_init_to_host_path_cmd
- $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
- func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper. Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # Remove leading and trailing path separator characters from ARG. MSYS
- # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
- # and winepath ignores them completely.
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format. Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format. Requires a wine environment and
-# a working winepath. Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
- func_convert_path_check : ";" \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # See func_convert_path_msys_to_w32:
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
- func_convert_path_check : : \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
- fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
- $opt_debug
- func_to_host_path_result="$1"
- if test -n "$1"; then
- # Remove leading and trailing path separator characters from
- # ARG. msys behavior is inconsistent here, cygpath turns them
- # into '.;' and ';.', and winepath ignores them completely.
- func_stripname : : "$1"
- func_to_host_path_tmp1=$func_stripname_result
- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
- func_convert_path_check : : \
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
- fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
# func_mode_compile arg...
func_mode_compile ()
{
@@ -1985,12 +1137,12 @@ func_mode_compile ()
;;
-pie | -fpie | -fPIE)
- func_append pie_flag " $arg"
+ pie_flag="$pie_flag $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
- func_append later " $arg"
+ later="$later $arg"
continue
;;
@@ -2011,14 +1163,15 @@ func_mode_compile ()
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
- func_append_quoted lastarg "$arg"
+ func_quote_for_eval "$arg"
+ lastarg="$lastarg $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
- func_append base_compile " $lastarg"
+ base_compile="$base_compile $lastarg"
continue
;;
@@ -2034,7 +1187,8 @@ func_mode_compile ()
esac # case $arg_mode
# Aesthetically quote the previous argument.
- func_append_quoted base_compile "$lastarg"
+ func_quote_for_eval "$lastarg"
+ base_compile="$base_compile $func_quote_for_eval_result"
done # for arg
case $arg_mode in
@@ -2059,7 +1213,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -2134,7 +1288,7 @@ func_mode_compile ()
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -2165,16 +1319,17 @@ compiler."
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- func_append removelist " $output_obj"
+ removelist="$removelist $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
- func_append removelist " $lockfile"
+ removelist="$removelist $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
- srcfile=$func_to_tool_file_result
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
@@ -2194,7 +1349,7 @@ compiler."
if test -z "$output_obj"; then
# Place PIC objects in $objdir
- func_append command " -o $lobj"
+ command="$command -o $lobj"
fi
func_show_eval_locale "$command" \
@@ -2241,11 +1396,11 @@ compiler."
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
- func_append command " -o $obj"
+ command="$command -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
- func_append command "$suppress_output"
+ command="$command$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
@@ -2290,13 +1445,13 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
- case $opt_mode in
+ case $mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
@@ -2327,11 +1482,10 @@ This mode accepts the following additional options:
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to build PIC objects only
- -prefer-non-pic try to build non-PIC objects only
+ -prefer-pic try to building PIC objects only
+ -prefer-non-pic try to building non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
- -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@ -2384,7 +1538,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
@@ -2404,8 +1558,6 @@ The following components of LINK-COMMAND are treated specially:
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
- -bindir BINDIR specify path to binaries directory (for systems where
- libraries must be found in the PATH setting at runtime)
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -2434,11 +1586,6 @@ The following components of LINK-COMMAND are treated specially:
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
- -Wc,FLAG
- -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
- -Wl,FLAG
- -Xlinker FLAG pass linker-specific FLAG directly to the linker
- -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
All other options (arguments beginning with \`-') are ignored.
@@ -2472,44 +1619,18 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode \`$mode'"
;;
esac
- echo
+ $ECHO
$ECHO "Try \`$progname --help' for more information about other modes."
+
+ exit $?
}
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
- if test "$opt_help" = :; then
- func_mode_help
- else
- {
- func_help noexit
- for opt_mode in compile link execute install finish uninstall clean; do
- func_mode_help
- done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
- {
- func_help noexit
- for opt_mode in compile link execute install finish uninstall clean; do
- echo
- func_mode_help
- done
- } |
- sed '1d
- /^When reporting/,/^Report/{
- H
- d
- }
- $x
- /information about other modes/d
- /more detailed .*MODE/d
- s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
- fi
- exit $?
-fi
+ # Now that we've collected a possible --mode arg, show help if necessary
+ $opt_help && func_mode_help
# func_mode_execute arg...
@@ -2522,16 +1643,13 @@ func_mode_execute ()
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
- for file in $opt_dlopen; do
+ for file in $execute_dlfiles; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
- func_resolve_sysroot "$file"
- file=$func_resolve_sysroot_result
-
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -2553,7 +1671,7 @@ func_mode_execute ()
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
- func_append dir "/$objdir"
+ dir="$dir/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -2594,7 +1712,7 @@ func_mode_execute ()
for file
do
case $file in
- -* | *.la | *.lo ) ;;
+ -*) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
@@ -2610,7 +1728,8 @@ func_mode_execute ()
;;
esac
# Quote arguments (to preserve shell metacharacters).
- func_append_quoted args "$file"
+ func_quote_for_eval "$file"
+ args="$args $func_quote_for_eval_result"
done
if test "X$opt_dry_run" = Xfalse; then
@@ -2633,68 +1752,31 @@ func_mode_execute ()
exec_cmd="\$cmd$args"
else
# Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
- fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
- $opt_debug
- libs=
- libdirs=
- admincmds=
-
- for opt in "$nonopt" ${1+"$@"}
- do
- if test -d "$opt"; then
- func_append libdirs " $opt"
-
- elif test -f "$opt"; then
- if func_lalib_unsafe_p "$opt"; then
- func_append libs " $opt"
- else
- func_warning "\`$opt' is not a valid libtool archive"
- fi
-
- else
- func_fatal_error "invalid argument \`$opt'"
- fi
- done
-
- if test -n "$libs"; then
- if test -n "$lt_sysroot"; then
- sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
- sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
- else
- sysroot_cmd=
- fi
-
- # Remove sysroot references
- if $opt_dry_run; then
- for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
- done
- else
- tmpdir=`func_mktempdir`
- for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
- > $tmpdir/tmp-la
- mv -f $tmpdir/tmp-la $lib
- done
- ${RM}r "$tmpdir"
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ $ECHO "export $shlibpath_var"
fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
fi
+}
+
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+ $opt_debug
+ libdirs="$nonopt"
+ admincmds=
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for dir
+ do
+ libdirs="$libdirs $dir"
+ done
+
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -2704,7 +1786,7 @@ func_mode_finish ()
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
- $opt_dry_run || eval "$cmds" || func_append admincmds "
+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
$cmds"
fi
done
@@ -2713,55 +1795,53 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $ECHO " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $ECHO " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $ECHO " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
+ $ECHO "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $ECHO " $libdir"
+ done
+ $ECHO
+ $ECHO "If you ever happen to want to link against installed libraries"
+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ $ECHO "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ $ECHO " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
+ $ECHO " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
- echo "See any operating system documentation about shared libraries for"
- case $host in
- solaris2.[6789]|solaris2.1[0-9])
- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- echo "pages."
- ;;
- *)
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- ;;
- esac
- echo "----------------------------------------------------------------------"
+ $ECHO " - use the \`$flag' linker flag"
fi
+ if test -n "$admincmds"; then
+ $ECHO " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ $ECHO
+
+ $ECHO "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ $ECHO "pages."
+ ;;
+ *)
+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ ;;
+ esac
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test "$mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
@@ -2772,7 +1852,7 @@ func_mode_install ()
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2786,12 +1866,7 @@ func_mode_install ()
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
- func_append install_prog "$func_quote_for_eval_result"
- install_shared_prog=$install_prog
- case " $install_prog " in
- *[\\\ /]cp\ *) install_cp=: ;;
- *) install_cp=false ;;
- esac
+ install_prog="$install_prog$func_quote_for_eval_result"
# We need to accept at least all the BSD install flags.
dest=
@@ -2801,12 +1876,10 @@ func_mode_install ()
install_type=
isdir=no
stripme=
- no_mode=:
for arg
do
- arg2=
if test -n "$dest"; then
- func_append files " $dest"
+ files="$files $dest"
dest=$arg
continue
fi
@@ -2814,9 +1887,10 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
- if $install_cp; then :; else
- prev=$arg
- fi
+ case " $install_prog " in
+ *[\\\ /]cp\ *) ;;
+ *) prev=$arg ;;
+ esac
;;
-g | -m | -o)
prev=$arg
@@ -2830,10 +1904,6 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
- arg2=$install_override_mode
- no_mode=false
- fi
prev=
else
dest=$arg
@@ -2844,11 +1914,7 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
- func_append install_prog " $func_quote_for_eval_result"
- if test -n "$arg2"; then
- func_quote_for_eval "$arg2"
- fi
- func_append install_shared_prog " $func_quote_for_eval_result"
+ install_prog="$install_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -2857,13 +1923,6 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
- if test -n "$install_override_mode" && $no_mode; then
- if $install_cp; then :; else
- func_quote_for_eval "$install_override_mode"
- func_append install_shared_prog " -m $func_quote_for_eval_result"
- fi
- fi
-
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
@@ -2918,13 +1977,10 @@ func_mode_install ()
case $file in
*.$libext)
# Do the static libraries later.
- func_append staticlibs " $file"
+ staticlibs="$staticlibs $file"
;;
*.la)
- func_resolve_sysroot "$file"
- file=$func_resolve_sysroot_result
-
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
@@ -2938,23 +1994,23 @@ func_mode_install ()
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
- *) func_append current_libdirs " $libdir" ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
- *) func_append future_libdirs " $libdir" ;;
+ *) future_libdirs="$future_libdirs $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
- func_append dir "$objdir"
+ dir="$dir$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@ -2967,9 +2023,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@ -2987,7 +2043,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@ -3027,7 +2083,7 @@ func_mode_install ()
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
- test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
;;
*.lo)
@@ -3127,7 +2183,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
@@ -3146,7 +2202,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@ -3165,7 +2221,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -3224,7 +2280,7 @@ func_mode_install ()
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test "$mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3267,22 +2323,6 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data. */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
/* External symbol declarations for the compiler. */\
"
@@ -3292,11 +2332,10 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
for progfile in $progfiles; do
- func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
- $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+ func_verbose "extracting global C symbols from \`$progfile'"
+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
done
if test -n "$exclude_expsyms"; then
@@ -3332,7 +2371,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -3345,52 +2384,10 @@ extern \"C\" {
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
- case $host in
- *cygwin* | *mingw* | *cegcc* )
- # if an import library, we need to obtain dlname
- if func_win32_import_lib_p "$dlprefile"; then
- func_tr_sh "$dlprefile"
- eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
- if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
- # Use subshell, to avoid clobbering current variable values
- dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
- func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
- else
- # no lafile. user explicitly requested -dlpreopen <import library>.
- $sharedlib_from_linklib_cmd "$dlprefile"
- dlprefile_dlbasename=$sharedlib_from_linklib_result
- fi
- fi
- $opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
- eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
- else
- func_warning "Could not compute DLL name from $name"
- eval '$ECHO ": $name " >> "$nlist"'
- fi
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
- }
- else # not an import lib
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
- fi
- ;;
- *)
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
- ;;
- esac
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
done
$opt_dry_run || {
@@ -3418,19 +2415,36 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
- echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
- echo >> "$output_objdir/$my_dlsyms" "\
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
const char *name;
void *address;
} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
+"
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+ runtime relocations are performed -- see ld's documentation
+ on pseudo-relocs. */"
+ lt_dlsym_const= ;;
+ *osf5*)
+ echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+ lt_dlsym_const= ;;
+ *)
+ lt_dlsym_const=const ;;
+ esac
+
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
+$lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
@@ -3443,7 +2457,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
- echo >> "$output_objdir/$my_dlsyms" "\
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
@@ -3486,7 +2500,7 @@ static const void *lt_preloaded_setup() {
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
- *) func_append symtab_cflags " $arg" ;;
+ *) symtab_cflags="$symtab_cflags $arg" ;;
esac
done
@@ -3501,16 +2515,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@ -3524,8 +2538,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
}
@@ -3535,7 +2549,6 @@ static const void *lt_preloaded_setup() {
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
$opt_debug
@@ -3546,11 +2559,9 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
- # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
/ I /{
@@ -3579,131 +2590,6 @@ func_win32_libid ()
$ECHO "$win32_libid_type"
}
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-# $sharedlib_from_linklib_cmd
-# Result is available in the variable
-# $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
- $opt_debug
- sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
- $opt_debug
- match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
- $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
- $SED '/^Contents of section '"$match_literal"':/{
- # Place marker at beginning of archive member dllname section
- s/.*/====MARK====/
- p
- d
- }
- # These lines can sometimes be longer than 43 characters, but
- # are always uninteresting
- /:[ ]*file format pe[i]\{,1\}-/d
- /^In archive [^:]*:/d
- # Ensure marker is printed
- /^====MARK====/p
- # Remove all lines with less than 43 characters
- /^.\{43\}/!d
- # From remaining lines, remove first 43 characters
- s/^.\{43\}//' |
- $SED -n '
- # Join marker and all lines until next marker into a single line
- /^====MARK====/ b para
- H
- $ b para
- b
- :para
- x
- s/\n//g
- # Remove the marker
- s/^====MARK====//
- # Remove trailing dots and whitespace
- s/[\. \t]*$//
- # Print
- /./p' |
- # we now have a list, one entry per line, of the stringified
- # contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
- # a '.' (that is, objdump's representation of an unprintable
- # character.) This should work for all archives with less than
- # 0x302f exports -- but will fail for DLLs whose name actually
- # begins with a literal '.' or a single character followed by
- # a '.'.
- #
- # Of those that remain, print the first one.
- $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-# $sharedlib_from_linklib_cmd
-# Result is available in the variable
-# $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
- # binutils import library
- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
- # ms-generated import library
- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
- else
- # unknown
- sharedlib_from_linklib_result=""
- fi
-}
# func_extract_an_archive dir oldlib
@@ -3712,18 +2598,7 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
- lockfile=$f_ex_an_ar_oldlib.lock
- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
- func_echo "Waiting for $lockfile to be removed"
- sleep 2
- done
- fi
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
- 'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
- $opt_dry_run || rm -f "$lockfile"
- fi
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -3794,7 +2669,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@ -3809,30 +2684,25 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable. Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
+
+# func_emit_wrapper_part1 [arg=no]
#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory. This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
{
- func_emit_wrapper_arg1=${1-no}
+ func_emit_wrapper_part1_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_part1_arg1=$1
+ fi
$ECHO "\
#! $SHELL
@@ -3848,6 +2718,7 @@ func_emit_wrapper ()
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
@@ -3878,132 +2749,31 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
- file=\"\$0\""
-
- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
- $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
- ECHO=\"$qECHO\"
- fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
- lt_script_arg0=\$0
- shift
- for lt_opt
- do
- case \"\$lt_opt\" in
- --lt-debug) lt_option_debug=1 ;;
- --lt-dump-script)
- lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
- test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
- lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
- cat \"\$lt_dump_D/\$lt_dump_F\"
- exit 0
- ;;
- --lt-*)
- \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
- exit 1
- ;;
- esac
- done
-
- # Print the debug banner immediately:
- if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
- fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
- lt_dump_args_N=1;
- for lt_arg
- do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
- lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
- done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
- func_lt_dump_args \${1+\"\$@\"} 1>&2
- fi
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
- ;;
-
- *)
- $ECHO "\
- if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
- func_lt_dump_args \${1+\"\$@\"} 1>&2
- fi
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ ECHO=\"$qecho\"
+ file=\"\$0\"
+ # Make sure echo works.
+ if test \"X\$1\" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+ # Yippee, \$ECHO works!
+ :
+ else
+ # Restart under the correct shell, and then maybe \$ECHO will work.
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ fi
+ fi\
"
- ;;
- esac
- $ECHO "\
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
- for lt_wr_arg
- do
- case \$lt_wr_arg in
- --lt-*) ;;
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- esac
- shift
- done
- func_exec_program_core \${1+\"\$@\"}
-}
-
- # Parse options
- func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+ $ECHO "\
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
while test -n \"\$file\"; do
- destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@ -4013,13 +2783,30 @@ func_exec_program ()
esac
fi
- file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+ func_emit_wrapper_part2_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_part2_arg1=$1
+ fi
+
+ $ECHO "\
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@ -4027,7 +2814,7 @@ func_exec_program ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@ -4082,18 +2869,6 @@ func_exec_program ()
if test -f \"\$progdir/\$program\"; then"
- # fixup the dll searchpath if we need to.
- #
- # Fix the DLL searchpath if we need to. Do this before prepending
- # to shlibpath, because on Windows, both are PATH and uninstalled
- # libraries must come first.
- if test -n "$dllsearchpath"; then
- $ECHO "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
- fi
-
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
@@ -4102,28 +2877,253 @@ func_exec_program ()
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
export $shlibpath_var
"
fi
+ # fixup the dll searchpath if we need to.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
- func_exec_program \${1+\"\$@\"}
+"
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $ECHO "\
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
fi
else
# The program doesn't exist.
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
- \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
fi
fi\
"
}
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+ func_emit_wrapper_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_arg1=$1
+ fi
+
+ # split this up so that func_emit_cwrapperexe_src
+ # can call each part independently.
+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+# $build $host
+# mingw (msys) mingw [e.g. native]
+# cygwin mingw
+# *nix + wine mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin. Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+ func_to_host_path_result="$1"
+ if test -n "$1" ; then
+ case $host in
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ case $build in
+ *mingw* ) # actually, msys
+ # awkward: cmd appends spaces to result
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ *cygwin* )
+ func_to_host_path_tmp1=`cygpath -w "$1"`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+ # Unfortunately, winepath does not exit with a non-zero
+ # error code, so we are forced to check the contents of
+ # stdout. On the other hand, if the command is not
+ # found, the shell will set an exit code of 127 and print
+ # *an error message* to stdout. So we must check for both
+ # error code of zero AND non-empty stdout, which explains
+ # the odd construction:
+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ # Allow warning below.
+ func_to_host_path_result=""
+ fi
+ ;;
+ esac
+ if test -z "$func_to_host_path_result" ; then
+ func_error "Could not determine host path corresponding to"
+ func_error " '$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_path_result="$1"
+ fi
+ ;;
+ esac
+ fi
+}
+# end: func_to_host_path
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+# $build $host
+# mingw (msys) mingw [e.g. native]
+# cygwin mingw
+# *nix + wine mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+ func_to_host_pathlist_result="$1"
+ if test -n "$1" ; then
+ case $host in
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ # Remove leading and trailing path separator characters from
+ # ARG. msys behavior is inconsistent here, cygpath turns them
+ # into '.;' and ';.', and winepath ignores them completely.
+ func_to_host_pathlist_tmp2="$1"
+ # Once set for this call, this variable should not be
+ # reassigned. It is used in tha fallback case.
+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e 's|^:*||' -e 's|:*$||'`
+ case $build in
+ *mingw* ) # Actually, msys.
+ # Awkward: cmd appends spaces to result.
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ *cygwin* )
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+ # unfortunately, winepath doesn't convert pathlists
+ func_to_host_pathlist_result=""
+ func_to_host_pathlist_oldIFS=$IFS
+ IFS=:
+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+ IFS=$func_to_host_pathlist_oldIFS
+ if test -n "$func_to_host_pathlist_f" ; then
+ func_to_host_path "$func_to_host_pathlist_f"
+ if test -n "$func_to_host_path_result" ; then
+ if test -z "$func_to_host_pathlist_result" ; then
+ func_to_host_pathlist_result="$func_to_host_path_result"
+ else
+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+ fi
+ fi
+ fi
+ IFS=:
+ done
+ IFS=$func_to_host_pathlist_oldIFS
+ ;;
+ esac
+ if test -z "$func_to_host_pathlist_result" ; then
+ func_error "Could not determine the host path(s) corresponding to"
+ func_error " '$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback. This may break if $1 contains DOS-style drive
+ # specifications. The fix is not to complicate the expression
+ # below, but for the user to provide a working wine installation
+ # with winepath so that path translation in the cross-to-mingw
+ # case works properly.
+ lt_replace_pathsep_nix_to_dos="s|:|;|g"
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+ $SED -e "$lt_replace_pathsep_nix_to_dos"`
+ fi
+ # Now, add the leading and trailing path separators back
+ case "$1" in
+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+ ;;
+ esac
+ case "$1" in
+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+}
+# end: func_to_host_pathlist
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
@@ -4141,23 +3141,31 @@ func_emit_cwrapperexe_src ()
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
+
+ Currently, it simply execs the wrapper *script* "$SHELL $output",
+ but could eventually absorb all of the scripts functionality and
+ exec $objdir/$outputname directly.
*/
EOF
cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
# include <direct.h>
# include <process.h>
# include <io.h>
+# define setmode _setmode
#else
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
# include <io.h>
+# define HAVE_SETENV
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
# endif
#endif
#include <malloc.h>
@@ -4169,44 +3177,6 @@ EOF
#include <fcntl.h>
#include <sys/stat.h>
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat _stat
-# define chmod _chmod
-# define getcwd _getcwd
-# define putenv _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat _stat
-# define chmod _chmod
-# define getcwd _getcwd
-# define putenv _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
@@ -4222,7 +3192,14 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
-/* path handling portability macros */
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+# define intptr_t int
+# endif
+#endif
+
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@ -4253,6 +3230,10 @@ int setenv (const char *, const char *, int);
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
@@ -4265,13 +3246,22 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+ va_list args;
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+}
#else
-static int lt_debug = 0;
+# define LTWRAPPER_DEBUGPRINTF(args)
#endif
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+const char *program_name = NULL;
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@ -4281,27 +3271,41 @@ char *chase_symlinks (const char *pathspec);
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
+void lt_fatal (const char *message, ...);
void lt_setenv (const char *name, const char *value);
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
void lt_update_exe_path (const char *name, const char *value);
void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
+
+static const char *script_text_part1 =
+EOF
+
+ func_emit_wrapper_part1 yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ "/' -e 's/$/\\n"/'
+ echo ";"
+ cat <<EOF
+
+static const char *script_text_part2 =
EOF
+ func_emit_wrapper_part2 yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ "/' -e 's/$/\\n"/'
+ echo ";"
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- func_to_host_path "$temp_rpath"
+ func_to_host_pathlist "$temp_rpath"
cat <<EOF
-const char * LIB_PATH_VALUE = "$func_to_host_path_result";
+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
EOF
else
cat <<"EOF"
@@ -4310,10 +3314,10 @@ EOF
fi
if test -n "$dllsearchpath"; then
- func_to_host_path "$dllsearchpath:"
+ func_to_host_pathlist "$dllsearchpath:"
cat <<EOF
const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE = "$func_to_host_path_result";
+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
EOF
else
cat <<"EOF"
@@ -4336,10 +3340,24 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
+
+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
+ /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
int
main (int argc, char *argv[])
@@ -4356,13 +3374,10 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
- /* very simple arg parsing; don't want to rely on getopt
- * also, copy all non cwrapper options to newargz, except
- * argz[0], which is handled differently
- */
- newargc=0;
+ /* very simple arg parsing; don't want to rely on getopt */
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -4376,57 +3391,25 @@ EOF
esac
cat <<"EOF"
- lt_dump_script (stdout);
+ printf ("%s", script_text_part1);
+ printf ("%s", script_text_part2);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
- {
- lt_debug = 1;
- continue;
- }
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
- {
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- namespace, but it is not one of the ones we know about and
- have already dealt with, above (inluding dump-script), then
- report an error. Otherwise, targets might begin to believe
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- namespace. The first time any user complains about this, we'll
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- or a configure.ac-settable value.
- */
- lt_fatal (__FILE__, __LINE__,
- "unrecognized %s option: '%s'",
- ltwrapper_option_prefix, argv[i]);
- }
- /* otherwise ... */
- newargz[++newargc] = xstrdup (argv[i]);
}
- newargz[++newargc] = NULL;
-
-EOF
- cat <<EOF
- /* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-EOF
- cat <<"EOF"
- lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
- lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+ newargz = XMALLOC (char *, argc + 1);
tmp_pathspec = find_executable (argv[0]);
if (tmp_pathspec == NULL)
- lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
- lt_debugprintf (__FILE__, __LINE__,
- "(main) found exe (before symlink chase) at: %s\n",
- tmp_pathspec);
+ lt_fatal ("Couldn't find %s", argv[0]);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+ tmp_pathspec));
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- lt_debugprintf (__FILE__, __LINE__,
- "(main) found exe (after symlink chase) at: %s\n",
- actual_cwrapper_path);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+ actual_cwrapper_path));
XFREE (tmp_pathspec);
- actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
@@ -4444,9 +3427,8 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
- lt_debugprintf (__FILE__, __LINE__,
- "(main) libtool target name: %s\n",
- target_name);
+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+ target_name));
EOF
cat <<EOF
@@ -4496,19 +3478,80 @@ EOF
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
- /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
- be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
- because on Windows, both *_VARNAMEs are PATH but uninstalled
- libraries must come first. */
- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+ newargc=0;
+ for (i = 1; i < argc; i++)
+ {
+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+ {
+ if (argv[i][env_set_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_set_opt_len + 1;
+ lt_opt_process_env_set (p);
+ }
+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_set (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_set_opt);
+ continue;
+ }
+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+ {
+ if (argv[i][env_prepend_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_prepend_opt_len + 1;
+ lt_opt_process_env_prepend (p);
+ }
+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_prepend_opt);
+ continue;
+ }
+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+ {
+ if (argv[i][env_append_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_append_opt_len + 1;
+ lt_opt_process_env_append (p);
+ }
+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_append (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_append_opt);
+ continue;
+ }
+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+ {
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+ namespace, but it is not one of the ones we know about and
+ have already dealt with, above (inluding dump-script), then
+ report an error. Otherwise, targets might begin to believe
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+ namespace. The first time any user complains about this, we'll
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+ or a configure.ac-settable value.
+ */
+ lt_fatal ("Unrecognized option in %s namespace: '%s'",
+ ltwrapper_option_prefix, argv[i]);
+ }
+ /* otherwise ... */
+ newargz[++newargc] = xstrdup (argv[i]);
+ }
+ newargz[++newargc] = NULL;
- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
- nonnull (lt_argv_zero));
+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
for (i = 0; i < newargc; i++)
{
- lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
- i, nonnull (newargz[i]));
+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
}
EOF
@@ -4517,14 +3560,11 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
- newargz = prepare_spawn (newargz);
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
- lt_debugprintf (__FILE__, __LINE__,
- "(main) failed to launch target \"%s\": %s\n",
- lt_argv_zero, nonnull (strerror (errno)));
+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
return 127;
}
return rval;
@@ -4546,7 +3586,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal (__FILE__, __LINE__, "memory exhausted");
+ lt_fatal ("Memory exhausted");
return p;
}
@@ -4580,8 +3620,8 @@ check_executable (const char *path)
{
struct stat st;
- lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
- nonempty (path));
+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
if ((!path) || (!*path))
return 0;
@@ -4598,8 +3638,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
- lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
- nonempty (path));
+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
if ((!path) || (!*path))
return 0;
@@ -4625,8 +3665,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
- lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
- nonempty (wrapper));
+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@ -4679,8 +3719,7 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
- nonnull (strerror (errno)));
+ lt_fatal ("getcwd failed");
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -4705,8 +3744,7 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
- nonnull (strerror (errno)));
+ lt_fatal ("getcwd failed");
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@ -4732,9 +3770,8 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- lt_debugprintf (__FILE__, __LINE__,
- "checking path component for symlinks: %s\n",
- tmp_pathspec);
+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+ tmp_pathspec));
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@ -4756,9 +3793,8 @@ chase_symlinks (const char *pathspec)
}
else
{
- lt_fatal (__FILE__, __LINE__,
- "error accessing file \"%s\": %s",
- tmp_pathspec, nonnull (strerror (errno)));
+ char *errstr = strerror (errno);
+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
}
}
XFREE (tmp_pathspec);
@@ -4771,8 +3807,7 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal (__FILE__, __LINE__,
- "could not follow symlinks for %s", pathspec);
+ lt_fatal ("Could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@ -4798,25 +3833,11 @@ strendzap (char *str, const char *pat)
return str;
}
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
- va_list args;
- if (lt_debug)
- {
- (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
- va_start (args, fmt);
- (void) vfprintf (stderr, fmt, args);
- va_end (args);
- }
-}
-
static void
-lt_error_core (int exit_status, const char *file,
- int line, const char *mode,
+lt_error_core (int exit_status, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+ fprintf (stderr, "%s: %s: ", program_name, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@ -4825,32 +3846,20 @@ lt_error_core (int exit_status, const char *file,
}
void
-lt_fatal (const char *file, int line, const char *message, ...)
+lt_fatal (const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
va_end (ap);
}
-static const char *
-nonnull (const char *s)
-{
- return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
- return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
void
lt_setenv (const char *name, const char *value)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_setenv) setting '%s' to '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@ -4895,12 +3904,95 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
return new_value;
}
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+ const char *p;
+ int len;
+ if (!arg || !*arg)
+ return 1;
+
+ p = strchr (arg, (int)'=');
+
+ if (!p)
+ return 1;
+
+ *value = xstrdup (++p);
+
+ len = strlen (arg) - strlen (*value);
+ *name = XMALLOC (char, len);
+ strncpy (*name, arg, len-1);
+ (*name)[len - 1] = '\0';
+
+ return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
+
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+ }
+
+ lt_setenv (name, value);
+ XFREE (name);
+ XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
+ char *new_value = NULL;
+
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+ }
+
+ new_value = lt_extend_str (getenv (name), value, 0);
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+ XFREE (name);
+ XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
+ char *new_value = NULL;
+
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+ }
+
+ new_value = lt_extend_str (getenv (name), value, 1);
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+ XFREE (name);
+ XFREE (value);
+}
+
void
lt_update_exe_path (const char *name, const char *value)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
if (name && *name && value && *value)
{
@@ -4919,9 +4011,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
- lt_debugprintf (__FILE__, __LINE__,
- "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- nonnull (name), nonnull (value));
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
if (name && *name && value && *value)
{
@@ -4931,152 +4023,11 @@ lt_update_lib_path (const char *name, const char *value)
}
}
-EOF
- case $host_os in
- mingw*)
- cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
- Note that spawn() does not by itself call the command interpreter
- (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
- ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&v);
- v.dwPlatformId == VER_PLATFORM_WIN32_NT;
- }) ? "cmd.exe" : "command.com").
- Instead it simply concatenates the arguments, separated by ' ', and calls
- CreateProcess(). We must quote the arguments since Win32 CreateProcess()
- interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
- special way:
- - Space and tab are interpreted as delimiters. They are not treated as
- delimiters if they are surrounded by double quotes: "...".
- - Unescaped double quotes are removed from the input. Their only effect is
- that within double quotes, space and tab are treated like normal
- characters.
- - Backslashes not followed by double quotes are not special.
- - But 2*n+1 backslashes followed by a double quote become
- n backslashes followed by a double quote (n >= 0):
- \" -> "
- \\\" -> \"
- \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
- size_t argc;
- char **new_argv;
- size_t i;
-
- /* Count number of arguments. */
- for (argc = 0; argv[argc] != NULL; argc++)
- ;
-
- /* Allocate new argument vector. */
- new_argv = XMALLOC (char *, argc + 1);
-
- /* Put quoted arguments into the new argument vector. */
- for (i = 0; i < argc; i++)
- {
- const char *string = argv[i];
-
- if (string[0] == '\0')
- new_argv[i] = xstrdup ("\"\"");
- else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
- {
- int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
- size_t length;
- unsigned int backslashes;
- const char *s;
- char *quoted_string;
- char *p;
-
- length = 0;
- backslashes = 0;
- if (quote_around)
- length++;
- for (s = string; *s != '\0'; s++)
- {
- char c = *s;
- if (c == '"')
- length += backslashes + 1;
- length++;
- if (c == '\\')
- backslashes++;
- else
- backslashes = 0;
- }
- if (quote_around)
- length += backslashes + 1;
-
- quoted_string = XMALLOC (char, length + 1);
-
- p = quoted_string;
- backslashes = 0;
- if (quote_around)
- *p++ = '"';
- for (s = string; *s != '\0'; s++)
- {
- char c = *s;
- if (c == '"')
- {
- unsigned int j;
- for (j = backslashes + 1; j > 0; j--)
- *p++ = '\\';
- }
- *p++ = c;
- if (c == '\\')
- backslashes++;
- else
- backslashes = 0;
- }
- if (quote_around)
- {
- unsigned int j;
- for (j = backslashes; j > 0; j--)
- *p++ = '\\';
- *p++ = '"';
- }
- *p = '\0';
-
- new_argv[i] = quoted_string;
- }
- else
- new_argv[i] = (char *) string;
- }
- new_argv[argc] = NULL;
-
- return new_argv;
-}
-EOF
- ;;
- esac
-
- cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
- func_emit_wrapper yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
- cat <<"EOF"
-}
EOF
}
# end: func_emit_cwrapperexe_src
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
- $opt_debug
- case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
- *import*) : ;;
- *) false ;;
- esac
-}
-
# func_mode_link arg...
func_mode_link ()
{
@@ -5121,7 +4072,6 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
- bindir=
dlfiles=
dlprefiles=
dlself=no
@@ -5214,11 +4164,6 @@ func_mode_link ()
esac
case $prev in
- bindir)
- bindir="$arg"
- prev=
- continue
- ;;
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
@@ -5250,9 +4195,9 @@ func_mode_link ()
;;
*)
if test "$prev" = dlfiles; then
- func_append dlfiles " $arg"
+ dlfiles="$dlfiles $arg"
else
- func_append dlprefiles " $arg"
+ dlprefiles="$dlprefiles $arg"
fi
prev=
continue
@@ -5276,7 +4221,7 @@ func_mode_link ()
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
- *) func_append deplibs " $qarg.ltframework" # this is fixed later
+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
;;
esac
;;
@@ -5295,7 +4240,7 @@ func_mode_link ()
moreargs=
for fil in `cat "$save_arg"`
do
-# func_append moreargs " $fil"
+# moreargs="$moreargs $fil"
arg=$fil
# A libtool-controlled object.
@@ -5324,7 +4269,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- func_append dlfiles " $pic_object"
+ dlfiles="$dlfiles $pic_object"
prev=
continue
else
@@ -5336,7 +4281,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- func_append dlprefiles " $pic_object"
+ dlprefiles="$dlprefiles $pic_object"
prev=
fi
@@ -5406,12 +4351,12 @@ func_mode_link ()
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
- *) func_append rpath " $arg" ;;
+ *) rpath="$rpath $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
- *) func_append xrpath " $arg" ;;
+ *) xrpath="$xrpath $arg" ;;
esac
fi
prev=
@@ -5423,28 +4368,28 @@ func_mode_link ()
continue
;;
weak)
- func_append weak_libs " $arg"
+ weak_libs="$weak_libs $arg"
prev=
continue
;;
xcclinker)
- func_append linker_flags " $qarg"
- func_append compiler_flags " $qarg"
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xcompiler)
- func_append compiler_flags " $qarg"
+ compiler_flags="$compiler_flags $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xlinker)
- func_append linker_flags " $qarg"
- func_append compiler_flags " $wl$qarg"
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $wl$qarg"
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
@@ -5480,11 +4425,6 @@ func_mode_link ()
continue
;;
- -bindir)
- prev=bindir
- continue
- ;;
-
-dlopen)
prev=dlfiles
continue
@@ -5535,16 +4475,15 @@ func_mode_link ()
;;
-L*)
- func_stripname "-L" '' "$arg"
- if test -z "$func_stripname_result"; then
+ func_stripname '-L' '' "$arg"
+ dir=$func_stripname_result
+ if test -z "$dir"; then
if test "$#" -gt 0; then
func_fatal_error "require no space between \`-L' and \`$1'"
else
func_fatal_error "need path for \`-L' option"
fi
fi
- func_resolve_sysroot "$func_stripname_result"
- dir=$func_resolve_sysroot_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -5556,30 +4495,24 @@ func_mode_link ()
;;
esac
case "$deplibs " in
- *" -L$dir "* | *" $arg "*)
- # Will only happen for absolute or sysroot arguments
- ;;
+ *" -L$dir "*) ;;
*)
- # Preserve sysroot, but never include relative directories
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
- *) func_append deplibs " -L$dir" ;;
- esac
- func_append lib_search_path " $dir"
+ deplibs="$deplibs -L$dir"
+ lib_search_path="$lib_search_path $dir"
;;
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
- *) func_append dllsearchpath ":$dir";;
+ *) dllsearchpath="$dllsearchpath:$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) func_append dllsearchpath ":$testbindir";;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
esac
;;
esac
@@ -5589,7 +4522,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -5603,7 +4536,7 @@ func_mode_link ()
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- func_append deplibs " System.ltframework"
+ deplibs="$deplibs System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
@@ -5623,7 +4556,7 @@ func_mode_link ()
;;
esac
fi
- func_append deplibs " $arg"
+ deplibs="$deplibs $arg"
continue
;;
@@ -5635,8 +4568,8 @@ func_mode_link ()
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
- -model|-arch|-isysroot|--sysroot)
- func_append compiler_flags " $arg"
+ -model|-arch|-isysroot)
+ compiler_flags="$compiler_flags $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
@@ -5644,12 +4577,12 @@ func_mode_link ()
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- func_append compiler_flags " $arg"
+ compiler_flags="$compiler_flags $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
- * ) func_append new_inherited_linker_flags " $arg" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
esac
continue
;;
@@ -5716,17 +4649,13 @@ func_mode_link ()
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
- =*)
- func_stripname '=' '' "$dir"
- dir=$lt_sysroot$func_stripname_result
- ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
*" $dir "*) ;;
- *) func_append xrpath " $dir" ;;
+ *) xrpath="$xrpath $dir" ;;
esac
continue
;;
@@ -5779,8 +4708,8 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- func_append arg " $func_quote_for_eval_result"
- func_append compiler_flags " $func_quote_for_eval_result"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -5795,9 +4724,9 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- func_append arg " $wl$func_quote_for_eval_result"
- func_append compiler_flags " $wl$func_quote_for_eval_result"
- func_append linker_flags " $func_quote_for_eval_result"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+ linker_flags="$linker_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -5825,27 +4754,23 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
- # Flags to be passed through unchanged, with rationale:
- # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
- # -r[0-9][0-9]* specify processor for the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
- # +DA*, +DD* enable 64-bit mode for the HP compiler
- # -q* compiler args for the IBM compiler
- # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
- # -F/path path to uninstalled frameworks, gcc on darwin
- # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
- # @file GCC response files
- # -tp=* Portland pgcc target processor selection
- # --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+ # +DA*, +DD* enable 64-bit mode on the HP compiler
+ # -q* pass through compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
+ # -F/path gives path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
func_append finalize_command " $arg"
- func_append compiler_flags " $arg"
+ compiler_flags="$compiler_flags $arg"
continue
;;
@@ -5857,7 +4782,7 @@ func_mode_link ()
*.$objext)
# A standard object.
- func_append objs " $arg"
+ objs="$objs $arg"
;;
*.lo)
@@ -5888,7 +4813,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- func_append dlfiles " $pic_object"
+ dlfiles="$dlfiles $pic_object"
prev=
continue
else
@@ -5900,7 +4825,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- func_append dlprefiles " $pic_object"
+ dlprefiles="$dlprefiles $pic_object"
prev=
fi
@@ -5945,25 +4870,24 @@ func_mode_link ()
*.$libext)
# An archive.
- func_append deplibs " $arg"
- func_append old_deplibs " $arg"
+ deplibs="$deplibs $arg"
+ old_deplibs="$old_deplibs $arg"
continue
;;
*.la)
# A libtool-controlled library.
- func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
- func_append dlfiles " $func_resolve_sysroot_result"
+ dlfiles="$dlfiles $arg"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
- func_append dlprefiles " $func_resolve_sysroot_result"
+ dlprefiles="$dlprefiles $arg"
prev=
else
- func_append deplibs " $func_resolve_sysroot_result"
+ deplibs="$deplibs $arg"
fi
continue
;;
@@ -6001,7 +4925,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@ -6010,8 +4934,6 @@ func_mode_link ()
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
- func_to_tool_file "$output_objdir/"
- tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
func_mkdir_p "$output_objdir"
@@ -6032,12 +4954,12 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append libs " $deplib"
+ libs="$libs $deplib"
done
if test "$linkmode" = lib; then
@@ -6050,9 +4972,9 @@ func_mode_link ()
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
- *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
esac
- func_append pre_post_deps " $pre_post_dep"
+ pre_post_deps="$pre_post_deps $pre_post_dep"
done
fi
pre_post_deps=
@@ -6119,19 +5041,17 @@ func_mode_link ()
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
- func_resolve_sysroot "$lib"
case $lib in
- *.la) func_source "$func_resolve_sysroot_result" ;;
+ *.la) func_source "$lib" ;;
esac
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- func_basename "$deplib"
- deplib_base=$func_basename_result
+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
case " $weak_libs " in
*" $deplib_base "*) ;;
- *) func_append deplibs " $deplib" ;;
+ *) deplibs="$deplibs $deplib" ;;
esac
done
done
@@ -6152,11 +5072,11 @@ func_mode_link ()
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- func_append compiler_flags " $deplib"
+ compiler_flags="$compiler_flags $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) func_append new_inherited_linker_flags " $deplib" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
esac
fi
fi
@@ -6241,7 +5161,7 @@ func_mode_link ()
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) func_append new_inherited_linker_flags " $deplib" ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
esac
fi
fi
@@ -6254,8 +5174,7 @@ func_mode_link ()
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
prog)
if test "$pass" = conv; then
@@ -6269,8 +5188,7 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
@@ -6281,21 +5199,17 @@ func_mode_link ()
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- dir=$func_resolve_sysroot_result
+ dir=$func_stripname_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
- *) func_append xrpath " $dir" ;;
+ *) xrpath="$xrpath $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
continue
;;
- *.la)
- func_resolve_sysroot "$deplib"
- lib=$func_resolve_sysroot_result
- ;;
+ *.la) lib="$deplib" ;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
@@ -6313,7 +5227,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -6323,15 +5237,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
- echo
+ $ECHO
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because the file extensions .$libext of this argument makes me believe"
- echo "*** that it is just a static archive that I should not use here."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because the file extensions .$libext of this argument makes me believe"
+ $ECHO "*** that it is just a static archive that I should not use here."
else
- echo
+ $ECHO
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
@@ -6358,11 +5272,11 @@ func_mode_link ()
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
- func_append newdlprefiles " $deplib"
+ newdlprefiles="$newdlprefiles $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- func_append newdlfiles " $deplib"
+ newdlfiles="$newdlfiles $deplib"
fi
fi
continue
@@ -6404,20 +5318,20 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
- *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
esac
done
fi
- dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
- test -n "$dlopen" && func_append dlfiles " $dlopen"
- test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
fi
if test "$pass" = conv; then
@@ -6428,20 +5342,20 @@ func_mode_link ()
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
- func_append convenience " $ladir/$objdir/$old_library"
- func_append old_convenience " $ladir/$objdir/$old_library"
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $deplib"
+ tmp_libs="$tmp_libs $deplib"
done
continue
fi # $pass = conv
@@ -6449,15 +5363,9 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
- if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
- linklib=$old_library
- else
- for l in $old_library $library_names; do
- linklib="$l"
- done
- fi
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
@@ -6474,9 +5382,9 @@ func_mode_link ()
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
- func_append dlprefiles " $lib $dependency_libs"
+ dlprefiles="$dlprefiles $lib $dependency_libs"
else
- func_append newdlfiles " $lib"
+ newdlfiles="$newdlfiles $lib"
fi
continue
fi # $pass = dlopen
@@ -6498,14 +5406,14 @@ func_mode_link ()
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
- if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
func_warning "library \`$lib' was moved."
dir="$ladir"
absdir="$abs_ladir"
libdir="$abs_ladir"
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir="$libdir"
+ absdir="$libdir"
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
@@ -6513,12 +5421,12 @@ func_mode_link ()
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
- func_append notinst_path " $abs_ladir"
+ notinst_path="$notinst_path $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
- func_append notinst_path " $abs_ladir"
+ notinst_path="$notinst_path $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
@@ -6529,46 +5437,20 @@ func_mode_link ()
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
- case "$host" in
- # special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *cegcc* )
- # Linker will automatically link against shared library if both
- # static and shared are present. Therefore, ensure we extract
- # symbols from the import library if a shared library is present
- # (otherwise, the dlopen module name will be incorrect). We do
- # this by putting the import library name into $newdlprefiles.
- # We recover the dlopen module name by 'saving' the la file
- # name in a special purpose variable, and (later) extracting the
- # dlname from the la file.
- if test -n "$dlname"; then
- func_tr_sh "$dir/$linklib"
- eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
- func_append newdlprefiles " $dir/$linklib"
- else
- func_append newdlprefiles " $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- func_append dlpreconveniencelibs " $dir/$old_library"
- fi
- ;;
- * )
- # Prefer using a static library (so that no silly _DYNAMIC symbols
- # are required to link).
- if test -n "$old_library"; then
- func_append newdlprefiles " $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- func_append dlpreconveniencelibs " $dir/$old_library"
- # Otherwise, use the dlname, so that lt_dlopen finds it.
- elif test -n "$dlname"; then
- func_append newdlprefiles " $dir/$dlname"
- else
- func_append newdlprefiles " $dir/$linklib"
- fi
- ;;
- esac
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ newdlprefiles="$newdlprefiles $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ newdlprefiles="$newdlprefiles $dir/$dlname"
+ else
+ newdlprefiles="$newdlprefiles $dir/$linklib"
+ fi
fi # $pass = dlpreopen
if test -z "$libdir"; then
@@ -6586,7 +5468,7 @@ func_mode_link ()
if test "$linkmode" = prog && test "$pass" != link; then
- func_append newlib_search_path " $ladir"
+ newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
@@ -6599,8 +5481,7 @@ func_mode_link ()
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result"
- func_append newlib_search_path " $func_resolve_sysroot_result"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
esac
# Need to link against all dependency_libs?
@@ -6611,12 +5492,12 @@ func_mode_link ()
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $deplib"
+ tmp_libs="$tmp_libs $deplib"
done # for deplib
continue
fi # $linkmode = prog...
@@ -6631,7 +5512,7 @@ func_mode_link ()
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
- *) func_append temp_rpath "$absdir:" ;;
+ *) temp_rpath="$temp_rpath$absdir:" ;;
esac
fi
@@ -6643,7 +5524,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) func_append compile_rpath " $absdir" ;;
+ *) compile_rpath="$compile_rpath $absdir"
esac
;;
esac
@@ -6652,7 +5533,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
esac
;;
esac
@@ -6677,12 +5558,12 @@ func_mode_link ()
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
- func_append notinst_deplibs " $lib"
+ notinst_deplibs="$notinst_deplibs $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
- func_append notinst_deplibs " $lib"
+ notinst_deplibs="$notinst_deplibs $lib"
need_relink=yes
fi
;;
@@ -6699,7 +5580,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
- echo
+ $ECHO
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
@@ -6717,7 +5598,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) func_append compile_rpath " $absdir" ;;
+ *) compile_rpath="$compile_rpath $absdir"
esac
;;
esac
@@ -6726,7 +5607,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
esac
;;
esac
@@ -6780,7 +5661,7 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test "$linkmode" = prog || test "$mode" != relink; then
add_shlibpath=
add_dir=
add=
@@ -6802,9 +5683,9 @@ func_mode_link ()
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
- echo
- echo "*** And there doesn't seem to be a static archive available"
- echo "*** The link will probably fail, sorry"
+ $ECHO
+ $ECHO "*** And there doesn't seem to be a static archive available"
+ $ECHO "*** The link will probably fail, sorry"
else
add="$dir/$old_library"
fi
@@ -6836,7 +5717,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- func_append add_dir " -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -6858,7 +5739,7 @@ func_mode_link ()
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
- *) func_append compile_shlibpath "$add_shlibpath:" ;;
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
@@ -6872,13 +5753,13 @@ func_mode_link ()
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) func_append finalize_shlibpath "$libdir:" ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
fi
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test "$linkmode" = prog || test "$mode" = relink; then
add_shlibpath=
add_dir=
add=
@@ -6892,7 +5773,7 @@ func_mode_link ()
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) func_append finalize_shlibpath "$libdir:" ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -6909,7 +5790,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- func_append add_dir " -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -6944,21 +5825,21 @@ func_mode_link ()
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- echo
+ $ECHO
$ECHO "*** Warning: This system can not link to static lib archive $lib."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
- echo "*** But as you try to build a module library, libtool will still create "
- echo "*** a static module, that should work as long as the dlopening application"
- echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ $ECHO "*** But as you try to build a module library, libtool will still create "
+ $ECHO "*** a static module, that should work as long as the dlopening application"
+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
- echo
- echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ $ECHO
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $ECHO "*** not find such a program. So, this module is probably useless."
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
@@ -6986,46 +5867,37 @@ func_mode_link ()
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
- *) func_append xrpath " $temp_xrpath";;
+ *) xrpath="$xrpath $temp_xrpath";;
esac;;
- *) func_append temp_deplibs " $libdir";;
+ *) temp_deplibs="$temp_deplibs $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
- func_append newlib_search_path " $absdir"
+ newlib_search_path="$newlib_search_path $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
- case $deplib in
- -L*) func_stripname '-L' '' "$deplib"
- func_resolve_sysroot "$func_stripname_result";;
- *) func_resolve_sysroot "$deplib" ;;
- esac
- if $opt_preserve_dup_deps ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
- *" $func_resolve_sysroot_result "*)
- func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
- func_append tmp_libs " $func_resolve_sysroot_result"
+ tmp_libs="$tmp_libs $deplib"
done
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
- path=
case $deplib in
-L*) path="$deplib" ;;
*.la)
- func_resolve_sysroot "$deplib"
- deplib=$func_resolve_sysroot_result
func_dirname "$deplib" "" "."
- dir=$func_dirname_result
+ dir="$func_dirname_result"
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -7052,8 +5924,8 @@ func_mode_link ()
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
path=
fi
fi
@@ -7086,7 +5958,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
- compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@ -7103,7 +5975,7 @@ func_mode_link ()
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
- *) func_append lib_search_path " $dir" ;;
+ *) lib_search_path="$lib_search_path $dir" ;;
esac
done
newlib_search_path=
@@ -7161,10 +6033,10 @@ func_mode_link ()
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
- *) func_append tmp_libs " $deplib" ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
esac
;;
- *) func_append tmp_libs " $deplib" ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
@@ -7180,7 +6052,7 @@ func_mode_link ()
;;
esac
if test -n "$i" ; then
- func_append tmp_libs " $i"
+ tmp_libs="$tmp_libs $i"
fi
done
dependency_libs=$tmp_libs
@@ -7221,7 +6093,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
- func_append objs "$old_deplibs"
+ objs="$objs$old_deplibs"
;;
lib)
@@ -7254,10 +6126,10 @@ func_mode_link ()
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
- echo
+ $ECHO
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
- func_append libobjs " $objs"
+ libobjs="$libobjs $objs"
fi
fi
@@ -7322,7 +6194,7 @@ func_mode_link ()
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
+ freebsd-aout|freebsd-elf|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@ -7455,7 +6327,7 @@ func_mode_link ()
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ verstring="$verstring:${current}.0"
;;
qnx)
@@ -7523,10 +6395,10 @@ func_mode_link ()
fi
func_generate_dlsyms "$libname" "$libname" "yes"
- func_append libobjs " $symfileobj"
+ libobjs="$libobjs $symfileobj"
test "X$libobjs" = "X " && libobjs=
- if test "$opt_mode" != relink; then
+ if test "$mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7542,7 +6414,7 @@ func_mode_link ()
continue
fi
fi
- func_append removelist " $p"
+ removelist="$removelist $p"
;;
*) ;;
esac
@@ -7553,28 +6425,27 @@ func_mode_link ()
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- func_append oldlibs " $output_objdir/$libname.$libext"
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
- # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
- # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
- func_replace_sysroot "$libdir"
- func_append temp_xrpath " -R$func_replace_sysroot_result"
+ temp_xrpath="$temp_xrpath -R$libdir"
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -7588,7 +6459,7 @@ func_mode_link ()
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
- *) func_append dlfiles " $lib" ;;
+ *) dlfiles="$dlfiles $lib" ;;
esac
done
@@ -7598,19 +6469,19 @@ func_mode_link ()
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
- *) func_append dlprefiles " $lib" ;;
+ *) dlprefiles="$dlprefiles $lib" ;;
esac
done
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- func_append deplibs " System.ltframework"
+ deplibs="$deplibs System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
@@ -7627,7 +6498,7 @@ func_mode_link ()
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
- func_append deplibs " -lc"
+ deplibs="$deplibs -lc"
fi
;;
esac
@@ -7676,7 +6547,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
i=""
;;
esac
@@ -7687,21 +6558,21 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which I believe you do not have"
- echo "*** because a test_compile did reveal that the linker did not use it for"
- echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which I believe you do not have"
+ $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
;;
esac
done
@@ -7719,7 +6590,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
i=""
;;
esac
@@ -7730,29 +6601,29 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because a test_compile did reveal that the linker did not use this one"
- echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
- echo "*** make it link in! You will probably need to install it or some"
- echo "*** library that it depends on before this library will be fully"
- echo "*** functional. Installing it before continuing would be even better."
+ $ECHO "*** make it link in! You will probably need to install it or some"
+ $ECHO "*** library that it depends on before this library will be fully"
+ $ECHO "*** functional. Installing it before continuing would be even better."
fi
;;
*)
- func_append newdeplibs " $i"
+ newdeplibs="$newdeplibs $i"
;;
esac
done
@@ -7769,27 +6640,15 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
;;
esac
fi
if test -n "$a_deplib" ; then
libname=`eval "\\$ECHO \"$libname_spec\""`
- if test -n "$file_magic_glob"; then
- libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
- else
- libnameglob=$libname
- fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
- shopt -s nocaseglob
- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- $nocaseglob
- else
- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- fi
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
@@ -7806,13 +6665,13 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
@@ -7821,12 +6680,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because I did check the linker path looking for a file starting"
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
@@ -7837,7 +6696,7 @@ EOF
;;
*)
# Add a -L argument.
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
;;
esac
done # Gone through all deplibs.
@@ -7853,7 +6712,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
;;
esac
@@ -7864,9 +6723,9 @@ EOF
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
@@ -7875,12 +6734,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- echo
+ $ECHO
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- echo "*** I have the capability to make that library automatically link in when"
- echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because I did check the linker path looking for a file starting"
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
@@ -7891,32 +6750,32 @@ EOF
;;
*)
# Add a -L argument.
- func_append newdeplibs " $a_deplib"
+ newdeplibs="$newdeplibs $a_deplib"
;;
esac
done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
done
fi
- case $tmp_deplibs in
- *[!\ \ ]*)
- echo
+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
+ $GREP . >/dev/null; then
+ $ECHO
if test "X$deplibs_check_method" = "Xnone"; then
- echo "*** Warning: inter-library dependencies are not supported in this platform."
+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
else
- echo "*** Warning: inter-library dependencies are not known to be supported."
+ $ECHO "*** Warning: inter-library dependencies are not known to be supported."
fi
- echo "*** All declared inter-library dependencies are being dropped."
+ $ECHO "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
- ;;
- esac
+ fi
;;
esac
versuffix=$versuffix_save
@@ -7928,23 +6787,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
- echo
- echo "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO
+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
- echo "*** a static module, that should work as long as the dlopening"
- echo "*** application is linked with the -dlopen flag."
+ $ECHO "*** a static module, that should work as long as the dlopening"
+ $ECHO "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
- echo
- echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ $ECHO
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $ECHO "*** not find such a program. So, this module is probably useless."
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
@@ -7954,16 +6813,16 @@ EOF
build_libtool_libs=no
fi
else
- echo "*** The inter-library dependencies that have been dropped here will be"
- echo "*** automatically added whenever a program is linked with this library"
- echo "*** or is declared to -dlopen it."
+ $ECHO "*** The inter-library dependencies that have been dropped here will be"
+ $ECHO "*** automatically added whenever a program is linked with this library"
+ $ECHO "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
- echo
- echo "*** Since this library must not contain undefined symbols,"
- echo "*** because either the platform does not support them or"
- echo "*** it was explicitly requested with -no-undefined,"
- echo "*** libtool will only create a static version of it."
+ $ECHO
+ $ECHO "*** Since this library must not contain undefined symbols,"
+ $ECHO "*** because either the platform does not support them or"
+ $ECHO "*** it was explicitly requested with -no-undefined,"
+ $ECHO "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
@@ -7980,9 +6839,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -7995,7 +6854,7 @@ EOF
*)
case " $deplibs " in
*" -L$path/$objdir "*)
- func_append new_libs " -L$path/$objdir" ;;
+ new_libs="$new_libs -L$path/$objdir" ;;
esac
;;
esac
@@ -8005,10 +6864,10 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
done
deplibs="$new_libs"
@@ -8025,12 +6884,10 @@ EOF
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
- func_replace_sysroot "$libdir"
- libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
@@ -8039,18 +6896,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append dep_rpath " $flag"
+ dep_rpath="$dep_rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
done
@@ -8068,7 +6925,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
@@ -8076,7 +6933,7 @@ EOF
fi
shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,18 +6959,18 @@ EOF
linknames=
for link
do
- func_append linknames " $link"
+ linknames="$linknames $link"
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
export_symbols="$output_objdir/$libname.uexp"
- func_append delfiles " $export_symbols"
+ delfiles="$delfiles $export_symbols"
fi
orig_export_symbols=
@@ -8144,45 +7001,13 @@ EOF
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
- for cmd1 in $cmds; do
+ for cmd in $cmds; do
IFS="$save_ifs"
- # Take the normal branch if the nm_file_list_spec branch
- # doesn't work or if tool conversion is not needed.
- case $nm_file_list_spec~$to_tool_file_cmd in
- *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
- try_normal_branch=yes
- eval cmd=\"$cmd1\"
- func_len " $cmd"
- len=$func_len_result
- ;;
- *)
- try_normal_branch=no
- ;;
- esac
- if test "$try_normal_branch" = yes \
- && { test "$len" -lt "$max_cmd_len" \
- || test "$max_cmd_len" -le -1; }
- then
- func_show_eval "$cmd" 'exit $?'
- skipped_export=false
- elif test -n "$nm_file_list_spec"; then
- func_basename "$output"
- output_la=$func_basename_result
- save_libobjs=$libobjs
- save_output=$output
- output=${output_objdir}/${output_la}.nm
- func_to_tool_file "$output"
- libobjs=$nm_file_list_spec$func_to_tool_file_result
- func_append delfiles " $output"
- func_verbose "creating $NM input file list: $output"
- for obj in $save_libobjs; do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result"
- done > "$output"
- eval cmd=\"$cmd1\"
+ eval cmd=\"$cmd\"
+ func_len " $cmd"
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
func_show_eval "$cmd" 'exit $?'
- output=$save_output
- libobjs=$save_libobjs
skipped_export=false
else
# The command line is too long to execute in one step.
@@ -8204,7 +7029,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -8216,7 +7041,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -8226,7 +7051,7 @@ EOF
case " $convenience " in
*" $test_deplib "*) ;;
*)
- func_append tmp_deplibs " $test_deplib"
+ tmp_deplibs="$tmp_deplibs $test_deplib"
;;
esac
done
@@ -8246,21 +7071,21 @@ EOF
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $convenience
- func_append libobjs " $func_extract_archives_result"
+ libobjs="$libobjs $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
- func_append linker_flags " $flag"
+ linker_flags="$linker_flags $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
@@ -8305,8 +7130,7 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
- func_basename "$output"
- output_la=$func_basename_result
+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -8319,16 +7143,13 @@ EOF
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
- echo 'INPUT (' > $output
+ $ECHO 'INPUT (' > $output
for obj in $save_libobjs
do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result" >> $output
+ $ECHO "$obj" >> $output
done
- echo ')' >> $output
- func_append delfiles " $output"
- func_to_tool_file "$output"
- output=$func_to_tool_file_result
+ $ECHO ')' >> $output
+ delfiles="$delfiles $output"
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
@@ -8342,12 +7163,10 @@ EOF
fi
for obj
do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result" >> $output
+ $ECHO "$obj" >> $output
done
- func_append delfiles " $output"
- func_to_tool_file "$output"
- output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+ delfiles="$delfiles $output"
+ output=$firstobj\"$file_list_spec$output\"
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
@@ -8371,19 +7190,17 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- reload_objs=$objlist
- eval concat_cmds=\"$reload_cmds\"
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
else
# All subsequent reloadable object files will link in
# the last one created.
- reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
- objlist=" $obj"
+ objlist=$obj
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
@@ -8393,12 +7210,11 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
- func_append delfiles " $output"
+ delfiles="$delfiles $output"
else
output=
@@ -8432,7 +7248,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8453,7 +7269,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@ -8465,7 +7281,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -8506,10 +7322,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $dlprefiles
- func_append libobjs " $func_extract_archives_result"
+ libobjs="$libobjs $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
@@ -8525,7 +7341,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8537,7 +7353,7 @@ EOF
IFS="$save_ifs"
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test "$mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8618,21 +7434,18 @@ EOF
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
- # If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@ -8692,8 +7505,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
@@ -8704,14 +7517,14 @@ EOF
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -8725,7 +7538,7 @@ EOF
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
- func_append new_libs " -L$path/$objdir" ;;
+ new_libs="$new_libs -L$path/$objdir" ;;
esac
;;
esac
@@ -8735,17 +7548,17 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
;;
- *) func_append new_libs " $deplib" ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
done
compile_deplibs="$new_libs"
- func_append compile_command " $compile_deplibs"
- func_append finalize_command " $finalize_deplibs"
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -8753,7 +7566,7 @@ EOF
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_rpath " $libdir" ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
fi
@@ -8772,18 +7585,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append rpath " $flag"
+ rpath="$rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_append perm_rpath " $libdir" ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
case $host in
@@ -8792,12 +7605,12 @@ EOF
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
- *) func_append dllsearchpath ":$libdir";;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) func_append dllsearchpath ":$testbindir";;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
esac
;;
esac
@@ -8823,18 +7636,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- func_append rpath " $flag"
+ rpath="$rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
- *) func_append finalize_perm_rpath " $libdir" ;;
+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
esac
fi
done
@@ -8848,8 +7661,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -8861,15 +7674,15 @@ EOF
wrappers_required=yes
case $host in
- *cegcc* | *mingw32ce*)
- # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
- ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
+ *cegcc)
+ # Disable wrappers for cegcc, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
@@ -8878,19 +7691,13 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -8913,7 +7720,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -8921,7 +7728,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
- func_append rpath "$dir:"
+ rpath="$rpath$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -8931,18 +7738,11 @@ EOF
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
-
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
exit $EXIT_SUCCESS
fi
@@ -8957,7 +7757,7 @@ EOF
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -8969,19 +7769,13 @@ EOF
fi
# Replace the output file specification.
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
func_show_eval "$link_command" 'exit $?'
- if test -n "$postlink_cmds"; then
- func_to_tool_file "$output_objdir/$outputname"
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- func_execute_cmds "$postlink_cmds" 'exit $?'
- fi
-
# Now create the wrapper script.
func_verbose "creating $output"
@@ -8999,7 +7793,18 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Quote $ECHO for shipping.
+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+ case $progpath in
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -9079,7 +7884,7 @@ EOF
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
+ oldobjs="$oldobjs $symfileobj"
fi
fi
addlibs="$old_convenience"
@@ -9087,10 +7892,10 @@ EOF
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $addlibs
- func_append oldobjs " $func_extract_archives_result"
+ oldobjs="$oldobjs $func_extract_archives_result"
fi
# Do each command in the archive commands.
@@ -9101,10 +7906,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_extract_archives $gentop $dlprefiles
- func_append oldobjs " $func_extract_archives_result"
+ oldobjs="$oldobjs $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
@@ -9120,9 +7925,9 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
- echo "copying selected object files to avoid basename conflicts..."
+ $ECHO "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
- func_append generated " $gentop"
+ generated="$generated $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
@@ -9146,9 +7951,9 @@ EOF
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- func_append oldobjs " $gentop/$newobj"
+ oldobjs="$oldobjs $gentop/$newobj"
;;
- *) func_append oldobjs " $obj" ;;
+ *) oldobjs="$oldobjs $obj" ;;
esac
done
fi
@@ -9158,16 +7963,6 @@ EOF
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
- elif test -n "$archiver_list_spec"; then
- func_verbose "using command file archive linking..."
- for obj in $oldobjs
- do
- func_to_tool_file "$obj"
- $ECHO "$func_to_tool_file_result"
- done > $output_objdir/$libname.libcmd
- func_to_tool_file "$output_objdir/$libname.libcmd"
- oldobjs=" $archiver_list_spec$func_to_tool_file_result"
- cmds=$old_archive_cmds
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
@@ -9241,7 +8036,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -9264,19 +8059,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
- ;;
- -L*)
- func_stripname -L '' "$deplib"
- func_replace_sysroot "$func_stripname_result"
- func_append newdependency_libs " -L$func_replace_sysroot_result"
+ newdependency_libs="$newdependency_libs $libdir/$name"
;;
- -R*)
- func_stripname -R '' "$deplib"
- func_replace_sysroot "$func_stripname_result"
- func_append newdependency_libs " -R$func_replace_sysroot_result"
- ;;
- *) func_append newdependency_libs " $deplib" ;;
+ *) newdependency_libs="$newdependency_libs $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
@@ -9290,9 +8075,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+ newdlfiles="$newdlfiles $libdir/$name"
;;
- *) func_append newdlfiles " $lib" ;;
+ *) newdlfiles="$newdlfiles $lib" ;;
esac
done
dlfiles="$newdlfiles"
@@ -9309,7 +8094,7 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+ newdlprefiles="$newdlprefiles $libdir/$name"
;;
esac
done
@@ -9321,7 +8106,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- func_append newdlfiles " $abs"
+ newdlfiles="$newdlfiles $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
@@ -9330,33 +8115,15 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- func_append newdlprefiles " $abs"
+ newdlprefiles="$newdlprefiles $abs"
done
dlprefiles="$newdlprefiles"
fi
$RM $output
# place dlname in correct position for cygwin
- # In fact, it would be nice if we could use this code for all target
- # systems that can't hard-code library paths into their executables
- # and that have no shared library path variable independent of PATH,
- # but it turns out we can't easily determine that from inspecting
- # libtool variables, so we have to hard-code the OSs to which it
- # applies here; at the moment, that means platforms that use the PE
- # object format with DLL files. See the long comment at the top of
- # tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
- # If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
- func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
- else
- # Otherwise fall back on heuristic.
- tdlname=../bin/$dlname
- fi
- ;;
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
@@ -9415,7 +8182,7 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+{ test "$mode" = link || test "$mode" = relink; } &&
func_mode_link ${1+"$@"}
@@ -9435,9 +8202,9 @@ func_mode_uninstall ()
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
- -*) func_append RM " $arg" ;;
- *) func_append files " $arg" ;;
+ -f) RM="$RM $arg"; rmforce=yes ;;
+ -*) RM="$RM $arg" ;;
+ *) files="$files $arg" ;;
esac
done
@@ -9446,23 +8213,24 @@ func_mode_uninstall ()
rmdirs=
+ origobjdir="$objdir"
for file in $files; do
func_dirname "$file" "" "."
dir="$func_dirname_result"
if test "X$dir" = X.; then
- odir="$objdir"
+ objdir="$origobjdir"
else
- odir="$dir/$objdir"
+ objdir="$dir/$origobjdir"
fi
func_basename "$file"
name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ test "$mode" = uninstall && objdir="$dir"
- # Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ # Remember objdir for removal later, being careful to avoid duplicates
+ if test "$mode" = clean; then
case " $rmdirs " in
- *" $odir "*) ;;
- *) func_append rmdirs " $odir" ;;
+ *" $objdir "*) ;;
+ *) rmdirs="$rmdirs $objdir" ;;
esac
fi
@@ -9488,17 +8256,18 @@ func_mode_uninstall ()
# Delete the libtool libraries and symlinks.
for n in $library_names; do
- func_append rmfiles " $odir/$n"
+ rmfiles="$rmfiles $objdir/$n"
done
- test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- case "$opt_mode" in
+ case "$mode" in
clean)
- case " $library_names " in
+ case " $library_names " in
+ # " " in the beginning catches empty $dlname
*" $dlname "*) ;;
- *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
esac
- test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
@@ -9526,19 +8295,19 @@ func_mode_uninstall ()
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
- func_append rmfiles " $dir/$pic_object"
+ rmfiles="$rmfiles $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
if test -n "$non_pic_object" &&
test "$non_pic_object" != none; then
- func_append rmfiles " $dir/$non_pic_object"
+ rmfiles="$rmfiles $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test "$mode" = clean ; then
noexename=$name
case $file in
*.exe)
@@ -9548,7 +8317,7 @@ func_mode_uninstall ()
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
- func_append rmfiles " $file"
+ rmfiles="$rmfiles $file"
;;
esac
# Do a test to see if this is a libtool program.
@@ -9557,7 +8326,7 @@ func_mode_uninstall ()
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
- func_append rmfiles " $func_ltwrapper_scriptname_result"
+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
@@ -9565,12 +8334,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
- func_append rmfiles " $odir/lt-$name"
+ rmfiles="$rmfiles $objdir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
fi
fi
fi
@@ -9578,6 +8347,7 @@ func_mode_uninstall ()
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
+ objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
@@ -9589,16 +8359,16 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
func_mode_uninstall ${1+"$@"}
-test -z "$opt_mode" && {
+test -z "$mode" && {
help="$generic_help"
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode \`$mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
diff --git a/binsrc/config/ltoptions.m4 b/binsrc/config/ltoptions.m4
index 17cfd51..34151a3 100644
--- a/binsrc/config/ltoptions.m4
+++ b/binsrc/config/ltoptions.m4
@@ -1,14 +1,13 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 7 ltoptions.m4
+# serial 6 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -126,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -134,13 +133,13 @@ case $host in
esac
test -z "$AS" && AS=as
-_LT_DECL([], [AS], [1], [Assembler program])dnl
+_LT_DECL([], [AS], [0], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
diff --git a/binsrc/config/ltversion.m4 b/binsrc/config/ltversion.m4
index 9c7b5d4..1da0e8c 100644
--- a/binsrc/config/ltversion.m4
+++ b/binsrc/config/ltversion.m4
@@ -7,17 +7,17 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# @configure_input@
+# Generated from ltversion.in.
-# serial 3293 ltversion.m4
+# serial 3018 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3018])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.2.6b'
+macro_revision='1.3018'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/binsrc/config/lt~obsolete.m4 b/binsrc/config/lt~obsolete.m4
index c573da9..637bb20 100644
--- a/binsrc/config/lt~obsolete.m4
+++ b/binsrc/config/lt~obsolete.m4
@@ -1,13 +1,13 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 5 lt~obsolete.m4
+# serial 4 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
@@ -77,6 +77,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -89,10 +90,3 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/binsrc/config/missing b/binsrc/config/missing
index 28055d2..1c8ff70 100755
--- a/binsrc/config/missing
+++ b/binsrc/config/missing
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,9 @@ scriptversion=2009-04-28.21; # UTC
# 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, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -87,9 +89,6 @@ Supported PROGRAM values:
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
Send bug reports to <bug-automake at gnu.org>."
exit $?
;;
@@ -107,22 +106,15 @@ Send bug reports to <bug-automake at gnu.org>."
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
+# the program).
case $1 in
- lex*|yacc*)
+ lex|yacc)
# Not GNU programs, they don't have --version.
;;
- tar*)
+ tar)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -146,7 +138,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $program in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -156,7 +148,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch aclocal.m4
;;
- autoconf*)
+ autoconf)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -165,7 +157,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch configure
;;
- autoheader*)
+ autoheader)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -195,7 +187,7 @@ WARNING: \`$1' is $msg. You should only need it if
while read f; do touch "$f"; done
;;
- autom4te*)
+ autom4te)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -218,7 +210,7 @@ WARNING: \`$1' is needed, but is $msg.
fi
;;
- bison*|yacc*)
+ bison|yacc)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -248,7 +240,7 @@ WARNING: \`$1' $msg. You should only need it if
fi
;;
- lex*|flex*)
+ lex|flex)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -271,7 +263,7 @@ WARNING: \`$1' is $msg. You should only need it if
fi
;;
- help2man*)
+ help2man)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -285,11 +277,11 @@ WARNING: \`$1' is $msg. You should only need it if
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit $?
+ exit 1
fi
;;
- makeinfo*)
+ makeinfo)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -318,7 +310,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
- tar*)
+ tar)
shift
# We have already tried tar in the generic part.
@@ -371,6 +363,5 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
# End:
diff --git a/binsrc/dav/.dav_load.sh b/binsrc/dav/.dav_load.sh
index 0287ad3..07b72b4 100755
--- a/binsrc/dav/.dav_load.sh
+++ b/binsrc/dav/.dav_load.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: .dav_load.sh,v 1.3.2.1 2012/03/08 12:54:59 source Exp $
+# $Id: .dav_load.sh,v 1.3 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/dav/DET_Archive.sql b/binsrc/dav/DET_Archive.sql
index fe03440..8441973 100644
--- a/binsrc/dav/DET_Archive.sql
+++ b/binsrc/dav/DET_Archive.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Archive.sql,v 1.2.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_Archive.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_Blog.sql b/binsrc/dav/DET_Blog.sql
index ca1ec51..54813cb 100644
--- a/binsrc/dav/DET_Blog.sql
+++ b/binsrc/dav/DET_Blog.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Blog.sql,v 1.4.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_Blog.sql,v 1.4 2009/02/13 10:09:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_Bookmark.sql b/binsrc/dav/DET_Bookmark.sql
index d806be2..9dff9dc 100644
--- a/binsrc/dav/DET_Bookmark.sql
+++ b/binsrc/dav/DET_Bookmark.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Bookmark.sql,v 1.3.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_Bookmark.sql,v 1.3.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_CatFilter.sql b/binsrc/dav/DET_CatFilter.sql
index 167c32d..25c8208 100644
--- a/binsrc/dav/DET_CatFilter.sql
+++ b/binsrc/dav/DET_CatFilter.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_CatFilter.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_CatFilter.sql,v 1.2 2007/03/28 11:41:04 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_DynaRes.sql b/binsrc/dav/DET_DynaRes.sql
index d5d5eaa..3cc4084 100644
--- a/binsrc/dav/DET_DynaRes.sql
+++ b/binsrc/dav/DET_DynaRes.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_DynaRes.sql,v 1.1.2.4 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_DynaRes.sql,v 1.1.2.3 2011/05/11 09:39:25 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2010 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
diff --git a/binsrc/dav/DET_Gallery.sql b/binsrc/dav/DET_Gallery.sql
index 6a7e2f8..5f013a0 100644
--- a/binsrc/dav/DET_Gallery.sql
+++ b/binsrc/dav/DET_Gallery.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Gallery.sql,v 1.3.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_Gallery.sql,v 1.3 2008/04/21 08:10:38 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_HostFs.sql b/binsrc/dav/DET_HostFs.sql
index 48f336d..ed9968b 100644
--- a/binsrc/dav/DET_HostFs.sql
+++ b/binsrc/dav/DET_HostFs.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_HostFs.sql,v 1.3.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_HostFs.sql,v 1.3 2008/04/21 08:10:38 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_PropFilter.sql b/binsrc/dav/DET_PropFilter.sql
index 1ba150b..e948f91 100644
--- a/binsrc/dav/DET_PropFilter.sql
+++ b/binsrc/dav/DET_PropFilter.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_PropFilter.sql,v 1.2.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_PropFilter.sql,v 1.2 2007/03/28 11:41:04 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_RDFData.sql b/binsrc/dav/DET_RDFData.sql
index 7b78aa4..e7071a3 100644
--- a/binsrc/dav/DET_RDFData.sql
+++ b/binsrc/dav/DET_RDFData.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_RDFData.sql,v 1.16.2.3 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_RDFData.sql,v 1.16.2.2 2011/07/19 19:36:41 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_ResFilter.sql b/binsrc/dav/DET_ResFilter.sql
index 11f31cb..8bb8d94 100644
--- a/binsrc/dav/DET_ResFilter.sql
+++ b/binsrc/dav/DET_ResFilter.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_ResFilter.sql,v 1.1.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_ResFilter.sql,v 1.1.2.1 2010/12/10 15:19:38 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_S3.sql b/binsrc/dav/DET_S3.sql
index cb02483..3c20392 100644
--- a/binsrc/dav/DET_S3.sql
+++ b/binsrc/dav/DET_S3.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_S3.sql,v 1.4.2.4 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_S3.sql,v 1.4.2.2 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -645,13 +645,12 @@ create function DB.DBA."S3_DAV_DELETE" (
--| There's a special problem, known as 'Transaction deadlock after reading from HTTP session'.
--| The DET function should do only one INSERT of the 'content' into the table and do it as late as possible.
--| The function should return -29 if deadlocked or otherwise broken after reading blob from HTTP.
--- XXX: this as built-in stops the actual code to be used
---create function DB.DBA."S3_DAV_RES_UPLOAD" (in detcolID any, in pathParts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
---{
+create function DB.DBA."S3_DAV_RES_UPLOAD" (in detcolID any, in pathParts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any
+{
-- dbg_obj_princ ('S3_DAV_RES_UPLOAD (', detcolID, pathParts, ', [content], ', type, permissions, uid, gid, auth_uid, ')');
--- return -20;
---}
---;
+ return -20;
+}
+;
--| When DAV_PROP_REMOVE_INT calls DET function, authentication and check for locks are performed before the call.
--| The check whether it's a system name or not (when an error in returned if name is system) is _not_ permitted.
diff --git a/binsrc/dav/DET_Stub.sql b/binsrc/dav/DET_Stub.sql
index fa757cf..4cfab12 100644
--- a/binsrc/dav/DET_Stub.sql
+++ b/binsrc/dav/DET_Stub.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Stub.sql,v 1.3.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_Stub.sql,v 1.3.2.1 2011/10/13 18:28:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_nntp.sql b/binsrc/dav/DET_nntp.sql
index d21b148..5a7c6d9 100644
--- a/binsrc/dav/DET_nntp.sql
+++ b/binsrc/dav/DET_nntp.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_nntp.sql,v 1.2.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_nntp.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DET_oMail.sql b/binsrc/dav/DET_oMail.sql
index fdc7e14..8b8a9c9 100644
--- a/binsrc/dav/DET_oMail.sql
+++ b/binsrc/dav/DET_oMail.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_oMail.sql,v 1.2.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: DET_oMail.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DETtest.sql b/binsrc/dav/DETtest.sql
index 8622aa8..e459a03 100644
--- a/binsrc/dav/DETtest.sql
+++ b/binsrc/dav/DETtest.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETtest.sql,v 1.1.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: DETtest.sql,v 1.1 2007/03/26 14:47:01 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/DETtest_CatFilter.sql b/binsrc/dav/DETtest_CatFilter.sql
index 8ef7027..6fc62f2 100644
--- a/binsrc/dav/DETtest_CatFilter.sql
+++ b/binsrc/dav/DETtest_CatFilter.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETtest_CatFilter.sql,v 1.1.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: DETtest_CatFilter.sql,v 1.1.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -41,7 +41,7 @@ create procedure TEST_CATFILTER_MAKE_SCHEMA (in base varchar, in addon_uri varch
<rdfs:label>An example of RDF schema with Virtuoso extensions for TEST_CatFilter.</rdfs:label>
<rdfs:comment>This schema contains a set of properties that should be used by categorization of test resources.</rdfs:comment>
<!-- document version -->
- <virtrdf:version>$$Id: DETtest_CatFilter.sql,v 1.1.2.2 2012/03/08 12:54:59 source Exp $$</virtrdf:version>
+ <virtrdf:version>$$Id: DETtest_CatFilter.sql,v 1.1.2.1 2009/11/20 17:11:24 source Exp $$</virtrdf:version>
</owl:Ontology>
', ses);
diff --git a/binsrc/dav/DETtest_sec.sql b/binsrc/dav/DETtest_sec.sql
index 6eaae55..6136eed 100644
--- a/binsrc/dav/DETtest_sec.sql
+++ b/binsrc/dav/DETtest_sec.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETtest_sec.sql,v 1.1.2.1 2012/03/08 12:54:59 source Exp $
+-- $Id: DETtest_sec.sql,v 1.1 2007/03/26 14:47:01 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/Makefile.am b/binsrc/dav/Makefile.am
index 862d90c..ca0c8eb 100644
--- a/binsrc/dav/Makefile.am
+++ b/binsrc/dav/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/Makefile.in b/binsrc/dav/Makefile.in
index ffd943e..4af3631 100644
--- a/binsrc/dav/Makefile.in
+++ b/binsrc/dav/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/dav/Versioning/DETVerTest.m4 b/binsrc/dav/Versioning/DETVerTest.m4
index eaeb905..64551c2 100644
--- a/binsrc/dav/Versioning/DETVerTest.m4
+++ b/binsrc/dav/Versioning/DETVerTest.m4
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/Versioning/DETVerTest.sql b/binsrc/dav/Versioning/DETVerTest.sql
index 8400379..3102f54 100644
--- a/binsrc/dav/Versioning/DETVerTest.sql
+++ b/binsrc/dav/Versioning/DETVerTest.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETVerTest.sql,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+-- $Id: DETVerTest.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -24,7 +24,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/Versioning/DETVerTest2.sql b/binsrc/dav/Versioning/DETVerTest2.sql
index 3c3d6f5..4125394 100644
--- a/binsrc/dav/Versioning/DETVerTest2.sql
+++ b/binsrc/dav/Versioning/DETVerTest2.sql
@@ -1,10 +1,10 @@
--
--- $Id: DETVerTest2.sql,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+-- $Id: DETVerTest2.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/Versioning/DET_Versioning.sql b/binsrc/dav/Versioning/DET_Versioning.sql
index 6d3ae08..23603f2 100644
--- a/binsrc/dav/Versioning/DET_Versioning.sql
+++ b/binsrc/dav/Versioning/DET_Versioning.sql
@@ -1,10 +1,10 @@
--
--- $Id: DET_Versioning.sql,v 1.6.2.3 2012/03/08 12:55:00 source Exp $
+-- $Id: DET_Versioning.sql,v 1.6.2.2 2011/07/20 09:48:38 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/Versioning/dav_ver_new.sql b/binsrc/dav/Versioning/dav_ver_new.sql
index 8422415..dc52b25 100644
--- a/binsrc/dav/Versioning/dav_ver_new.sql
+++ b/binsrc/dav/Versioning/dav_ver_new.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_ver_new.sql,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+-- $Id: dav_ver_new.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/Versioning/test.m4 b/binsrc/dav/Versioning/test.m4
index c5d9d6b..741a5e0 100644
--- a/binsrc/dav/Versioning/test.m4
+++ b/binsrc/dav/Versioning/test.m4
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/dav-rdf-schema-example.rdf b/binsrc/dav/dav-rdf-schema-example.rdf
index 18657ae..5983790 100644
--- a/binsrc/dav/dav-rdf-schema-example.rdf
+++ b/binsrc/dav/dav-rdf-schema-example.rdf
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/dav.sql b/binsrc/dav/dav.sql
index 9db4b25..2900669 100644
--- a/binsrc/dav/dav.sql
+++ b/binsrc/dav/dav.sql
@@ -1,12 +1,12 @@
--
--- $Id: dav.sql,v 1.20.2.20 2012/03/08 12:54:59 source Exp $
+-- $Id: dav.sql,v 1.20.2.15 2011/10/13 18:28:52 source Exp $
--
-- WebDAV support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -25,59 +25,6 @@
create procedure WS.WS."OPTIONS" (in path varchar, inout params varchar, in lines varchar)
{
- declare full_path varchar;
- declare path_id any;
- full_path := '/' || DAV_CONCAT_PATH (path, '/');
- path_id := DAV_SEARCH_ID (full_path, 'C');
- if (isarray(path_id) = 1)
- {
- if (path_id[0] = UNAME'CalDAV')
- {
- http_header (concat (
- 'Content-Type: text/xml\r\n',
- 'Allow: OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE\r\n',
- 'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\r\n',
- 'DAV: 1, 2, access-control, calendar-access\r\n',
- 'MS-Author-Via: DAV\r\n'));
- return;
- }
- if (path_id[0] = UNAME'CardDAV')
- {
- http_header (concat (
- 'Content-Type: text/xml\r\n',
- 'Allow: OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE\r\n',
- 'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\r\n',
- 'DAV: 1, 2, 3, access-control, addressbook\r\n',
- 'MS-Author-Via: DAV\r\n'));
- return;
- }
- }
- else
- {
- declare is_det int;
- is_det := (select COL_ID from WS.WS.SYS_DAV_COL where COL_ID = path_id and COL_DET = 'CalDAV');
- if (is_det > 0)
- {
- http_header (concat (
- 'Content-Type: text/xml\r\n',
- 'Allow: OPTIONS, GET, HEAD, POST, TRACE\r\n',
- 'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\r\n',
- 'DAV: 1, 2, access-control, calendar-access\r\n',
- 'MS-Author-Via: DAV\r\n'));
- return;
- }
- is_det := (select COL_ID from WS.WS.SYS_DAV_COL where COL_ID = path_id and COL_DET = 'CardDAV');
- if (is_det > 0)
- {
- http_header (concat (
- 'Content-Type: text/xml\r\n',
- 'Allow: OPTIONS, GET, HEAD, POST, TRACE\r\n',
- 'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\r\n',
- 'DAV: 1, 2, 3, access-control, addressbook\r\n',
- 'MS-Author-Via: DAV\r\n'));
- return;
- }
- }
declare headers, ctype, msauthor any;
http_methods_set ('OPTIONS', 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE', 'PROPFIND', 'PROPPATCH', 'COPY', 'MOVE', 'LOCK', 'UNLOCK');
WS.WS.GET (path, params, lines);
@@ -103,14 +50,17 @@ create procedure WS.WS.PROPFIND (in path varchar, inout params varchar, in lines
declare uname, upwd varchar;
declare id any;
declare _u_id, _g_id, rc integer;
- --dbg_obj_princ ('WS.WS.PROPFIND (', path, params, lines, ')');
_ses := aref_set_0 (params, 1);
_body := string_output_string (_ses);
+ -- dbg_obj_princ (_body);
_lpath := http_path ();
_ppath := http_physical_path ();
if (_lpath = '')
_lpath := '/';
+
+ -- dbg_obj_princ ('WS.WS.PROPFIND (', path, params, lines, ')');
+
id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(''), path, vector('')), 'C'));
if (id is not null)
st := 'C';
@@ -135,6 +85,7 @@ create procedure WS.WS.PROPFIND (in path varchar, inout params varchar, in lines
{
rc := DAV_AUTHENTICATE_HTTP (DAV_GET_PARENT (id, st, _ppath), 'C', '1__', 1, lines, uname, upwd, _u_id, _g_id, _perms);
}
+ -- dbg_obj_princ ('Authentication in PROPFIND gives ', rc, uname, upwd, _u_id, _g_id, _perms);
if (rc < 0)
{
if ((rc = -12) or (rc = -13))
@@ -180,17 +131,6 @@ create procedure WS.WS.PROPFIND (in path varchar, inout params varchar, in lines
http_request_status ('HTTP/1.1 207 Multi-Status');
- declare full_path varchar;
- declare path_id any;
- full_path := '/' || DAV_CONCAT_PATH (path, '/');
- path_id := DAV_SEARCH_ID (full_path, 'C');
- if (isarray(path_id) = 1)
- {
- if (path_id[0] = UNAME'CalDAV')
- http_header ('DAV: 1, calendar-access, calendar-schedule, calendar-proxy\r\nContent-type: application/xml; charset="utf-8"\r\n');
- if (path_id[0] = UNAME'CardDAV')
- http_header ('DAV: 1, addressbook\r\nContent-type: application/xml; charset="utf-8"\r\n');
- }
http_header ('Content-type: text/xml; charset="utf-8"\r\n');
http ('<?xml version="1.0" encoding="utf-8"?>\n');
http ('<D:multistatus xmlns:D="DAV:" xmlns:M="urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/">\n');
@@ -337,7 +277,7 @@ create procedure WS.WS.PROPFIND_RESPONSE_FORMAT (in lpath varchar,
declare st char(1);
declare diritm, prop_raw_val, prop_val, href any;
declare perms, uid, gid any;
- --dbg_obj_princ ('WS.WS.PROPFIND_RESPONSE_FORMAT (', lpath, dirlist, append_name_to_href, ms_date, propnames, all_prop, add_not_found, _u_id, ')');
+ -- dbg_obj_princ ('WS.WS.PROPFIND_RESPONSE_FORMAT (', lpath, dirlist, append_name_to_href, ms_date, propnames, all_prop, add_not_found, u_id, ')');
if (ms_date)
{
@@ -384,10 +324,11 @@ next_response:
crt := now ();
if (__tag (modt) <> 211)
modt := now ();
+
href := case append_name_to_href when 0 then lpath else DAV_CONCAT_PATH (lpath, name) end;
- if (st = 'C' and href not like '%/' and href not like '%.ics' and href not like '%.vcf')
+ if (st = 'C' and href not like '%/')
href := href || '/';
- http ('<D:response xmlns:D="DAV:" xmlns:lp0="DAV:" xmlns:i0="DAV:" xmlns:V="http://www.openlinksw.com/virtuoso/webdav/1.0/">\n');
+ http ('<D:response xmlns:lp0="DAV:" xmlns:i0="DAV:" xmlns:V="http://www.openlinksw.com/virtuoso/webdav/1.0/">\n');
http ('<D:href>');
http_dav_url (
charset_recode (
@@ -424,7 +365,7 @@ next_response:
}
else if (prop = ':getcontenttype')
{
- http (concat('<lp0:getcontenttype>', mime_type, '</lp0:getcontenttype>\n'));
+ http (concat('<D:getcontenttype>', mime_type, '</D:getcontenttype>\n'));
found_sprop := 1;
}
else if (prop = ':getcontentlength' and st = 'R')
@@ -432,131 +373,10 @@ next_response:
http (concat ('<lp0:getcontentlength>', cast (res_len as varchar), '</lp0:getcontentlength>\n'));
found_sprop := 1;
}
- else if (prop = 'urn:ietf:params:xml:ns:caldav:supported-calendar-component-set')
- {
- http ('<C:supported-calendar-component-set xmlns:C="urn:ietf:params:xml:ns:caldav"><C:comp name="VEVENT"/><C:comp name="VTODO"/></C:supported-calendar-component-set>\r\n');
- found_sprop := 1;
- }
- else if (prop = 'urn:ietf:params:xml:ns:carddav:supported-address-data')
- {
- http ('<A:supported-address-data xmlns:A="urn:ietf:params:xml:ns:carddav"><C:address-data-type content-type="text/vcard" version="3.0"/></A:supported-address-data>\r\n');
- found_sprop := 1;
- }
- else if (prop = ':getetag' and st = 'C')
- {
- http (concat('<lp0:getetag>"', WS.WS.ETAG (name, parent_col), '"</lp0:getetag>\n'));
- found_sprop := 1;
- }
- else if (prop = 'http://calendarserver.org/ns/:getctag')
- {
- http (concat('<CS:getctag xmlns:CS="http://calendarserver.org/ns/">', WS.WS.ETAG (name, parent_col), '</CS:getctag>\n'));
- found_sprop := 1;
- }
- else if (prop = 'urn:ietf:params:xml:ns:caldav:calendar-data')
- {
- declare content, type_ any;
- DB.DBA.DAV_RES_CONTENT_INT (DAV_SEARCH_ID (lpath, 'R'), content, type_, 0, 0);
- http (concat('<C:calendar-data xmlns:C="urn:ietf:params:xml:ns:caldav">', content, '</C:calendar-data>\n'));
- found_sprop := 1;
- }
- else if (prop = 'urn:ietf:params:xml:ns:carddav:address-data')
- {
- declare content, type_ any;
- DB.DBA.DAV_RES_CONTENT_INT (DAV_SEARCH_ID (lpath, 'R'), content, type_, 0, 0);
- http (concat('<A:address-data xmlns:A="urn:ietf:params:xml:ns:carddav">', content, '</A:address-data>\n'));
- found_sprop := 1;
- }
- else if (prop = 'urn:ietf:params:xml:ns:caldav:calendar-home-set')
- {
- http (concat('<C:calendar-home-set xmlns:C="urn:ietf:params:xml:ns:caldav"><D:href>', lpath, '</D:href></C:calendar-home-set>\n'));
- found_sprop := 1;
- }
- else if (prop = 'urn:ietf:params:xml:ns:carddav:addressbook-home-set')
- {
- http (concat('<C:addressbook-home-set xmlns:C="urn:ietf:params:xml:ns:carddav"><D:href>', lpath, '</D:href></C:addressbook-home-set>\n'));
- found_sprop := 1;
- }
- else if (prop = ':principal-URL')
- {
- http (concat('<D:principal-URL><D:href>', lpath, '</D:href></D:principal-URL>\n'));
- found_sprop := 1;
- }
- else if (prop = ':current-user-privilege-set')
- {
- if (mime_type = 'text/vcard' or mime_type = 'text/calendar')
- {
- http ('<D:current-user-privilege-set><D:privilege><D:all/></D:privilege></D:current-user-privilege-set>');
- found_sprop := 1;
- }
- }
- else if (prop = ':supported-report-set')
- {
- if (mime_type = 'text/vcard')
- {
- http (concat('<D:supported-report-set>', '<D:supported-report>
- <D:report>
- <C:addressbook-query xmlns:C="urn:ietf:params:xml:ns:carddav"/>
- </D:report>
- </D:supported-report>
- <D:supported-report>
- <D:report>
- <C:addressbook-multiget xmlns:C="urn:ietf:params:xml:ns:carddav"/>
- </D:report>
- </D:supported-report>
- <D:supported-report>
- <D:report>
- <D:expand-property />
- </D:report>
- </D:supported-report>
- <D:supported-report>
- <D:report>
- <D:principal-property-search />
- </D:report>
- </D:supported-report>
- <D:supported-report>
- <D:report>
- <D:principal-search-property-set />
- </D:report>
- </D:supported-report>', '</D:supported-report-set>\n'));
- found_sprop := 1;
- }
- else if (mime_type = 'text/calendar')
- {
- http (concat('<D:supported-report-set>', '<D:supported-report>
- <D:report>
- <C:calendar-multiget xmlns:C="urn:ietf:params:xml:ns:caldav"/>
- </D:report>
- </D:supported-report>
- <D:supported-report>
- <D:report>
- <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav"/>
- </D:report>
- </D:supported-report>
- <D:supported-report>
- <D:report>
- <D:principal-match/>
- </D:report>
- </D:supported-report>
- <D:supported-report>
- <D:report>
- <C:free-busy-query xmlns:C="urn:ietf:params:xml:ns:caldav"/>
- </D:report>
- </D:supported-report>', '</D:supported-report-set>\n'));
- found_sprop := 1;
- }
- found_sprop := 1;
- }
else if (prop = ':resourcetype')
{
if (st = 'C')
- {
- if (mime_type = 'text/vcard')
- http ('<D:resourcetype><D:collection/><C:addressbook xmlns:C="urn:ietf:params:xml:ns:carddav" /></D:resourcetype>\n');
- else if (mime_type = 'text/calendar')
- http ('<D:resourcetype><D:collection/><C:calendar xmlns:C="urn:ietf:params:xml:ns:caldav" /></D:resourcetype>\n');
- else
http ('<D:resourcetype><D:collection/></D:resourcetype>\n');
- }
else
http ('<D:resourcetype/>\n');
found_sprop := 1;
@@ -795,308 +615,6 @@ create procedure WS.WS.PROPNAMES (in _body varchar)
}
;
-create procedure WS.WS.CALENDAR_NAMES (in _body varchar)
-{
- declare prop, propname, allprop, tree, tmp, ret any;
- declare ix, len, sc integer;
- declare name varchar;
- if (not isstring(_body) or _body = '')
- return null;
- prop := string_output ();
- propname := string_output ();
- allprop := string_output ();
- tree := xml_tree_doc (xml_expand_refs (xml_tree (_body)));
- http_value (xpath_eval ('//calendar-multiget/prop', tree , 1), null, prop);
- http_value (xpath_eval ('//calendar-multiget/propname', tree , 1), null, propname);
- http_value (xpath_eval ('//calendar-multiget/allprop', tree , 1), null, allprop);
- prop := string_output_string (prop);
- propname := string_output_string (propname);
- allprop := string_output_string (allprop);
- ret := null;
- if (allprop <> '')
- return vector ('allprop');
- else if (propname <> '')
- return vector ('propname');
- else if (prop <> '')
- {
- declare xp any;
- tree := xtree_doc (prop);
- xp := xpath_eval('/prop/*', tree, 0);
- foreach (any elm in xp) do
- {
- name := cast (xpath_eval ('name()', elm) as varchar);
- sc := strrchr (name, ':');
- if (sc is not null and (name like 'DAV::%'
- or name like 'http://www.openlinksw.com/virtuoso/webdav/1.0/:%'))
- name := subseq (name, sc, length (name));
- if (ret is null)
- ret := vector (name);
- else
- ret := vector_concat (ret, vector (name));
- }
- }
- return ret;
-}
-;
-
-create procedure WS.WS.ADDRESSBOOK_NAMES (in _body varchar)
-{
- declare prop, propname, allprop, tree, tmp, ret any;
- declare ix, len, sc integer;
- declare name varchar;
- if (not isstring(_body) or _body = '')
- return null;
- prop := string_output ();
- propname := string_output ();
- allprop := string_output ();
- tree := xml_tree_doc (xml_expand_refs (xml_tree (_body)));
- http_value (xpath_eval ('//addressbook-multiget/prop', tree , 1), null, prop);
- http_value (xpath_eval ('//addressbook-multiget/propname', tree , 1), null, propname);
- http_value (xpath_eval ('//addressbook-multiget/allprop', tree , 1), null, allprop);
- prop := string_output_string (prop);
- propname := string_output_string (propname);
- allprop := string_output_string (allprop);
- ret := null;
- if (allprop <> '')
- return vector ('allprop');
- else if (propname <> '')
- return vector ('propname');
- else if (prop <> '')
- {
- declare xp any;
- tree := xtree_doc (prop);
- xp := xpath_eval('/prop/*', tree, 0);
- foreach (any elm in xp) do
- {
- name := cast (xpath_eval ('name()', elm) as varchar);
- sc := strrchr (name, ':');
- if (sc is not null and (name like 'DAV::%'
- or name like 'http://www.openlinksw.com/virtuoso/webdav/1.0/:%'))
- name := subseq (name, sc, length (name));
- if (ret is null)
- ret := vector (name);
- else
- ret := vector_concat (ret, vector (name));
- }
- }
- return ret;
-}
-;
-
-
-create procedure WS.WS.REPORT (in path varchar, inout params varchar, in lines varchar)
-{
- declare _mod_time datetime;
- declare _cr_time datetime;
- declare _depth integer;
- declare st, _temp varchar;
- declare _ms_date integer;
- declare _lpath, _body, _ses, _props, _ppath, _perms varchar;
- declare uname, upwd varchar;
- declare id any;
- declare _u_id, _g_id, rc, is_calendar, is_addressbook integer;
- _ses := aref_set_0 (params, 1);
- _body := string_output_string (_ses);
- _lpath := http_path ();
- _ppath := http_physical_path ();
- is_calendar := 0;
- is_addressbook := 0;
- if (_lpath = '')
- _lpath := '/';
- id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(''), path, vector('')), 'C'));
- if (id is not null)
- {
- if (isarray(id) = 1)
- {
- if (id[0] = UNAME'CalDAV')
- is_calendar := 1;
- if (id[0] = UNAME'CardDAV')
- is_addressbook := 1;
- }
- st := 'C';
- }
- else
- {
- id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(''), path), 'R'));
- if (id is not null)
- st := 'R';
- else
- {
- http_request_status ('HTTP/1.1 404 Not Found');
- return;
- }
- }
- _u_id := null;
- _g_id := null;
- if (st = 'C')
- rc := DAV_AUTHENTICATE_HTTP (id, st, '1__', 1, lines, uname, upwd, _u_id, _g_id, _perms);
- else
- rc := DAV_AUTHENTICATE_HTTP (DAV_GET_PARENT (id, st, _ppath), 'C', '1__', 1, lines, uname, upwd, _u_id, _g_id, _perms);
- if (rc < 0)
- {
- if ((rc = -12) or (rc = -13))
- {
- http_request_status ('HTTP/1.1 403 Forbidden');
- return;
- }
- return;
- }
- if (strstr (WS.WS.FINDPARAM (lines, 'User-Agent:'), 'Microsoft') is not null)
- _ms_date := 1;
- else
- _ms_date := 0;
- _temp := WS.WS.FINDPARAM (lines, 'Depth:');
- if (_temp <> '' and _temp <> 'infinity')
- _depth := atoi (_temp);
- else
- _depth := -1;
- {
- declare test_tree any;
- declare exit handler for sqlstate '*'
- {
- http_request_status ('HTTP/1.1 400 Bad Request');
- return;
- };
- if (length (_body) > 0)
- test_tree := xml_tree (_body);
- }
- if (st = 'C' and aref (_lpath, length (_lpath) - 1) <> ascii ('/'))
- _lpath := concat (_lpath, '/');
- -- Any properties
- if (is_calendar = 1)
- _props := WS.WS.CALENDAR_NAMES (_body);
- else if (is_addressbook = 1)
- _props := WS.WS.ADDRESSBOOK_NAMES (_body);
- else
- _props := WS.WS.PROPNAMES (_body);
- if (isarray (_props) and length (_props) = 1 and (aref (_props, 0) = 'propname'))
- {
- WS.WS.CUSTOM_PROP (_lpath, _props, _depth, st);
- return;
- }
- http_request_status ('HTTP/1.1 207 Multi-Status');
- if (is_calendar = 1)
- {
- declare urls any;
- urls := xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav:"] //calendar-multiget/D:href/text()', xml_tree_doc (xml_expand_refs (xml_tree (_body))), 0);
- http_header ('DAV: 1, calendar-access, calendar-schedule, calendar-proxy\r\nContent-type: application/xml; charset="utf-8"\r\n');
- http ('<?xml version="1.0" encoding="utf-8"?>\n');
- http ('<D:multistatus xmlns:D="DAV:" xmlns:M="urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/">\n');
- foreach (any prop in urls) do
- {
- if (-13 = WS.WS.REPORT_RESPONSE (cast(prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id))
- {
- _u_id := null;
- _g_id := null;
- -- This will force 'Unauthorized'
- http_rewrite ();
- WS.WS.GET_DAV_AUTH (lines, 0, 1, uname, upwd, _u_id, _g_id, _perms);
- return;
- }
- }
- http ('</D:multistatus>\n');
- }
- else if (is_addressbook = 1)
- {
- declare urls any;
- urls := xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:carddav:"] //addressbook-multiget/D:href/text()', xml_tree_doc (xml_expand_refs (xml_tree (_body))), 0);
- http_header ('DAV: 1, addressbook\r\nContent-type: application/xml; charset="utf-8"\r\n');
- http ('<?xml version="1.0" encoding="utf-8"?>\n');
- http ('<D:multistatus xmlns:D="DAV:" xmlns:M="urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/">\n');
- foreach (any prop in urls) do
- {
- if (-13 = WS.WS.REPORT_RESPONSE (cast(prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id))
- {
- _u_id := null;
- _g_id := null;
- -- This will force 'Unauthorized'
- http_rewrite ();
- WS.WS.GET_DAV_AUTH (lines, 0, 1, uname, upwd, _u_id, _g_id, _perms);
- return;
- }
- }
- http ('</D:multistatus>\n');
- }
- else
- {
- http_header ('Content-type: text/xml; charset="utf-8"\r\n');
- http ('<?xml version="1.0" encoding="utf-8"?>\n');
- http ('<D:multistatus xmlns:D="DAV:" xmlns:M="urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/">\n');
- if (-13 = WS.WS.PROPFIND_RESPONSE (_lpath, _ppath, _depth, st, _ms_date, _props, _u_id))
- {
- _u_id := null;
- _g_id := null;
- -- This will force 'Unauthorized'
- http_rewrite ();
- WS.WS.GET_DAV_AUTH (lines, 0, 1, uname, upwd, _u_id, _g_id, _perms);
- return;
- }
- http ('</D:multistatus>\n');
- }
-}
-;
-
---#IF VER=5
---!AFTER
---#ENDIF
-create function WS.WS.REPORT_RESPONSE (
- in lpath varchar,
- in ppath varchar,
- in depth integer,
- in st char (1),
- in ms_date integer,
- in propnames any,
- in u_id integer) returns integer
-{
- declare all_prop, ppath_len integer;
- declare dirlist any;
- declare add_not_found, _this_col integer;
- all_prop := 0;
- add_not_found := 1;
- if (not isstring (lpath) or not isstring (ppath))
- return -28;
- if (st = 'C' and aref (ppath, length (ppath) - 1) <> ascii ('/'))
- ppath := concat (ppath, '/');
- ppath_len := length (ppath);
- if (not isarray (propnames))
- {
- if (ms_date)
- {
- propnames := vector (':getlastmodified', ':creationdate',
- ':lastaccessed', ':getcontentlength', ':resourcetype', ':supportedlock');
- add_not_found := 0;
- }
- else
- propnames := vector (':getlastmodified', ':getcontentlength', ':resourcetype');
- }
- else if (aref (propnames, 0) = 'allprop')
- {
- propnames := vector (':getlastmodified', ':creationdate', ':getetag', ':getcontenttype',
- ':getcontentlength', ':resourcetype', ':lockdiscovery', ':supportedlock');
- all_prop := 1;
- }
- dirlist := DAV_DIR_LIST_INT (ppath, -1, '%', null, null, u_id);
- if (isinteger (dirlist))
- {
- if (dirlist = -13)
- {
- if (u_id > 0)
- dirlist := vector ();
- else
- return dirlist;
- }
- else
- dirlist := vector (); -- TODO: This is a stub. It should be turned into something better.
- }
- if (length (dirlist) = 0)
- {
- return -1;
- }
- WS.WS.PROPFIND_RESPONSE_FORMAT (lpath, dirlist, 0, ms_date, propnames, all_prop, add_not_found, 0, u_id);
- return 0;
-}
-;
-
create procedure WS.WS.CUSTOM_PROP (in lpath any, in prop any, in depth integer, in st char (1))
{
declare _name, _lmask, _prop, _ltype, _lscope, _lown, _ltoken, _tp, _pname varchar;
@@ -1172,25 +690,15 @@ nf:
-- /* PROPPATCH method */
create procedure WS.WS.PROPPATCH (in path varchar, inout params varchar, in lines varchar)
{
- declare _u_id, _g_id, _slen, _len, _ix, id, _pid, _ix1, is_calendar, is_addressbook integer;
+ declare _u_id, _g_id, _slen, _len, _ix, id, _pid, _ix1 integer;
declare uname, upwd, st, _perms, _body, _name varchar;
declare _ses, _set, _del, _tmp, _val any;
declare rc, acc, _proprc, xtree any;
+
-- dbg_obj_princ ('WS.WS.PROPPATCH (', path, params, lines, ')');
- is_addressbook := 0;
- is_calendar := 0;
id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(''), path, vector('')), 'C'));
if (id is not null)
- {
- if (isarray(id) = 1)
- {
- if (id[0] = UNAME'CalDAV')
- is_calendar := 1;
- if (id[0] = UNAME'CardDAV')
- is_addressbook := 1;
- }
st := 'C';
- }
else
{
id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(''), path), 'R'));
@@ -1263,12 +771,8 @@ create procedure WS.WS.PROPPATCH (in path varchar, inout params varchar, in line
pn := concat (pns, ':', pn);
xte_nodebld_acc (acc, xte_node (xte_head (pn)));
- if (is_calendar or is_addressbook)
- {
- --- do nothing for now;
- ;
- }
- else if (pns = 'http://www.openlinksw.com/virtuoso/webdav/1.0/'
+
+ if (pns = 'http://www.openlinksw.com/virtuoso/webdav/1.0/'
and _prop_name in ('virtpermissions', 'virtowneruid', 'virtownergid'))
{
declare tmp, tmp_id any;
@@ -1307,7 +811,8 @@ create procedure WS.WS.PROPPATCH (in path varchar, inout params varchar, in line
update WS.WS.SYS_DAV_COL set COL_GROUP = tmp_id where COL_ID = id;
}
}
- else if (not exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = pn and PROP_TYPE = st and PROP_PARENT_ID = id))
+ else if (not exists (select 1 from WS.WS.SYS_DAV_PROP
+ where PROP_NAME = pn and PROP_TYPE = st and PROP_PARENT_ID = id))
{
_pid := WS.WS.GETID ('P');
insert into WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE)
@@ -2040,7 +1545,7 @@ create procedure WS.WS.GET (in path any, inout params any, in lines any)
declare full_path varchar;
declare parent_path varchar;
declare cont_type varchar;
- declare server_etag, client_etag, rdf_graph varchar;
+ declare server_etag, client_etag varchar;
declare uid, maxres integer;
declare p_comm, stat, msg, xpr, sxtag, rxtag, resource_content, str varchar;
declare resource_owner, exec_safety_level integer;
@@ -2348,7 +1853,6 @@ again:
if (stat <> '00000')
{
exec_err:
- http_status_set (500);
http ('<html><body>');
http (concat ('<H3>Execution of "', sprintf ('%V', http_path()), '" failed.</H3>'));
http (concat ('<p><b>SQL Error: ', stat, ' '));
@@ -2469,14 +1973,6 @@ again:
case when is_https_ctx () then 'https' else 'http' end,
http_request_header (lines, 'Host', NULL, NULL), http_path ());
}
- rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where
- PROP_PARENT_ID = _col and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdf_graph');
- if (rdf_graph is not null)
- {
- declare rdf_uri varchar;
- rdf_uri := rfc1808_expand_uri (DB.DBA.HTTP_REQUESTED_URL (), DAV_RDF_RES_NAME (rdf_graph));
- hdr_str := hdr_str || sprintf ('Link: <%s>; rel="alternate"\r\n', rdf_uri);
- }
http_header (hdr_str);
}
else
diff --git a/binsrc/dav/dav_acct.sql b/binsrc/dav/dav_acct.sql
index b5af5de..2ea1af2 100644
--- a/binsrc/dav/dav_acct.sql
+++ b/binsrc/dav/dav_acct.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_acct.sql,v 1.1.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: dav_acct.sql,v 1.1.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/dav_api.sql b/binsrc/dav/dav_api.sql
index 12213d8..de579a2 100644
--- a/binsrc/dav/dav_api.sql
+++ b/binsrc/dav/dav_api.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_api.sql,v 1.17.2.39 2012/03/08 12:54:59 source Exp $
+-- $Id: dav_api.sql,v 1.17.2.30 2011/10/28 21:43:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -338,7 +338,7 @@ DAV_HOME_DIR_CREATE (in uid varchar) returns any
if (server_http_port () <> '80')
host := host ||':'|| server_http_port ();
}
- rc := DAV_PROP_SET_INT (path, 'virt:rdf_graph', rtrim ('http://' || host || path, '/') || '#this', null, null, 0, 0);
+ rc := DAV_PROP_SET_INT (path, 'virt:rdf_graph', 'http://' || host || path, null, null, 0, 0);
if (isnull (DAV_HIDE_ERROR (rc)))
goto _end;
rc := DAV_PROP_SET_INT (path, 'virt:rdf_sponger', 'on', null, null, 0, 0);
@@ -1525,7 +1525,7 @@ DAV_REQ_CHARS_TO_BITMASK (in req varchar) returns integer
create function
DAV_AUTHENTICATE (in id any, in what char(1), in req varchar, in a_uname varchar, in a_pwd varchar, in a_uid integer := null) returns integer
{
- declare rc, oid, ogid, puid, pgid integer;
+ declare oid, ogid, puid, pgid integer;
declare opwd, pperms varchar;
declare pacl varbinary;
what := upper (what);
@@ -1566,11 +1566,18 @@ DAV_AUTHENTICATE (in id any, in what char(1), in req varchar, in a_uname varchar
}
if (isarray (id))
{
- rc := call (cast (id[0] as varchar) || '_DAV_AUTHENTICATE') (id, what, req, a_uname, a_pwd, a_uid);
- if (rc = -20)
- rc := DAV_AUTHENTICATE (id[1], 'C', req, a_uname, a_pwd, a_uid);
+ declare detcol_id integer;
- return rc;
+ detcol_id := id[1];
+ select COL_OWNER, COL_GROUP, COL_PERMS, COL_ACL into puid, pgid, pperms, pacl from WS.WS.SYS_DAV_COL where COL_ID = detcol_id;
+ if (not DAV_CHECK_PERM (pperms, req, oid, ogid, pgid, puid))
+ {
+ if (not WS.WS.ACL_IS_GRANTED (pacl, oid, 4))
+ {
+ return -13;
+ }
+ }
+ return call (cast (id[0] as varchar) || '_DAV_AUTHENTICATE') (id, what, req, a_uname, a_pwd, a_uid);
}
whenever not found goto nf_col_or_res;
if (what = 'R')
@@ -1640,8 +1647,8 @@ DAV_AUTHENTICATE_HTTP (in id any, in what char(1), in req varchar, in can_write_
declare d__perms varchar;
rc := call (cast (id[0] as varchar) || '_DAV_AUTHENTICATE_HTTP') (id, what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);
- if (rc = -20)
- rc := DAV_AUTHENTICATE_HTTP (id[1], 'C', req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);
+ if (rc >= 0)
+ rc := DAV_AUTHENTICATE_HTTP (id[1], 'C', '1__', can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, d__perms);
return rc;
}
@@ -1765,43 +1772,91 @@ DAV_AUTHENTICATE_SSL_CONDITION () returns integer
}
;
--- redundant code muste be deleted after move the procedure WEBID_AUTH_GEN_2 in DAV!!!
--- START REDUNDANT CODE
-create function DAV_WEBID_QR (in gr varchar, in uri varchar)
-{
- return sprintf ('sparql
- define input:storage ""
- define input:same-as "yes"
- prefix cert: <http://www.w3.org/ns/auth/cert#>
- prefix rsa: <http://www.w3.org/ns/auth/rsa#>
- select (str (?exp)) (str (?mod))
- from <%S>
- where
- {
- { ?id cert:identity <%S> ; rsa:public_exponent ?exp ; rsa:modulus ?mod . }
- union
- { ?id cert:identity <%S> ; rsa:public_exponent ?exp1 ; rsa:modulus ?mod1 . ?exp1 cert:decimal ?exp . ?mod1 cert:hex ?mod . }
- union
- { <%S> cert:key ?key . ?key cert:exponent ?exp . ?key cert:modulus ?mod . }
- }', gr, uri, uri, uri);
-}
-;
--- END REDUNDANT CODE
-
create function
DAV_AUTHENTICATE_SSL_WEBID ()
{
- declare webid varchar;
- declare cert, dummy, vtype any;
+ declare retIRI varchar;
+ declare graph, baseGraph, foafIRI, foafGraph, loadIRI, localIRI any;
+ declare S, V, info, st, msg, data, meta any;
- webid := null;
- if (__proc_exists ('DB.DBA.WEBID_AUTH_GEN_2') is not null)
+ retIRI := null;
+
+ set_user_id ('dba');
+ foafIRI := trim (get_certificate_info (7, null, null, null, '2.5.29.17'));
+ V := regexp_replace (foafIRI, ',[ ]*', ',', 1, null);
+ V := split_and_decode (V, 0, '\0\0,:');
+ if (V is null)
+ V := vector ();
+ foafIRI := get_keyword ('URI', V);
+ if (isnull (foafIRI))
+ {
+ if (__proc_exists ('DB.DBA.FOAF_SSL_WEBFINGER') is not null)
+ {
+ retIRI := DB.DBA.FOAF_SSL_WEBFINGER ();
+ if (not isnull (retIRI))
+ goto _exit;
+ }
+ if (__proc_exists ('ODS.DBA.FINGERPOINT_WEBID_GET') is not null)
+ {
+ retIRI := ODS.DBA.FINGERPOINT_WEBID_GET ();
+ if (not isnull (retIRI))
+ goto _exit;
+ }
+ } else {
+ foafGraph := 'http://local.virt/FOAF/' || cast (rnd (1000) as varchar);
+ localIRI := foafIRI;
+ V := rfc1808_parse_uri (localIRI);
+ if (is_https_ctx () and
+ virtuoso_ini_item_value ('URIQA', 'DynamicLocal') = '1' and
+ V[1] = registry_get ('URIQADefaultHost'))
+ {
+ V [0] := 'local';
+ V [1] := '';
+ localIRI := db.dba.vspx_uri_compose (V);
+ }
+ V := rfc1808_parse_uri (foafIRI);
+ V[5] := '';
+ loadIRI := DB.DBA.vspx_uri_compose (V);
+ S := sprintf ('sparql load <%s> into graph <%s>', loadIRI, foafGraph);
+ st := '00000';
+ exec (S, st, msg, vector (), 0);
+ if (st = '00000')
+ {
+ S := sprintf (' sparql define input:storage "" ' ||
+ ' prefix cert: <http://www.w3.org/ns/auth/cert#> ' ||
+ ' prefix rsa: <http://www.w3.org/ns/auth/rsa#> ' ||
+ ' select (str (bif:coalesce (?exp_val, ?exp))) ' ||
+ ' (str (bif:coalesce (?mod_val, ?mod))) ' ||
+ ' from <%s> ' ||
+ ' where { ' ||
+ ' ?id cert:identity <%s> ; ' ||
+ ' rsa:public_exponent ?exp ; ' ||
+ ' rsa:modulus ?mod . ' ||
+ ' optional { ?exp cert:decimal ?exp_val . ' ||
+ ' ?mod cert:hex ?mod_val . } ' ||
+ ' }',
+ foafGraph,
+ localIRI);
+ exec (S, st, msg, vector (), 0, meta, data);
+ if (st = '00000')
+ {
+ info := get_certificate_info (9);
+ foreach (any _row in data) do
+ {
+ if (_row[0] = cast (info[1] as varchar) and
+ lower (regexp_replace (_row[1], '[^A-Z0-9a-f]', '', 1, null)) = bin2hex (info[2]))
{
- cert := client_attr ('client_certificate');
- dummy := null;
- DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 0, webid, dummy, 0, vtype);
+ retIRI := foafIRI;
+ goto _break;
}
- return webid;
+ }
+ }
+ }
+ _break:;
+ SPARQL clear graph ?:foafGraph;
+ }
+_exit:
+ return retIRI;
}
;
@@ -1851,11 +1906,9 @@ DAV_AUTHENTICATE_SSL (
{
tmp := null;
if (isnull (foafIRI))
- {
- foafIRI := DB.DBA.DAV_AUTHENTICATE_SSL_WEBID ();
+ foafIRI := DAV_AUTHENTICATE_SSL_WEBID ();
if (isnull (foafIRI))
goto _exit;
- }
graph := WS.WS.DAV_IRI (V[N]);
for (
sparql
@@ -2504,12 +2557,6 @@ create procedure DB.DBA.RDF_SINK_AQ_RUN ()
}
;
-create procedure DAV_RDF_RES_NAME (in rdf_graph varchar)
-{
- return replace ( replace ( replace ( replace ( replace ( replace ( replace (rdf_graph, '/', '_'), '\\', '_'), ':', '_'), '+', '_'), '\"', '_'), '[', '_'), ']', '_') || '.RDF';
-}
-;
-
create procedure RDF_SINK_FUNC (in path varchar, in rc int, in c_id int, in rdf_graph any, in type any, in ouid int, in ogid int)
{
declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;
@@ -2527,7 +2574,7 @@ create procedure RDF_SINK_FUNC (in path varchar, in rc int, in c_id int, in rdf_
-- upload into first (rdf_sink) graph
if (RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges))
{
- rdf_graph_resource_name := DAV_RDF_RES_NAME (rdf_graph);
+ rdf_graph_resource_name := replace ( replace ( replace ( replace ( replace ( replace ( replace (rdf_graph, '/', '_'), '\\', '_'), ':', '_'), '+', '_'), '\"', '_'), '[', '_'), ']', '_') || '.RDF';
rdf_graph_resource_name := replace (rdf_graph_resource_name, ' ', '_');
rdf_graph_resource_path := WS.WS.COL_PATH (c_id) || rdf_graph_resource_name;
if (isnull (DAV_HIDE_ERROR (DAV_SEARCH_ID (rdf_graph_resource_path, 'R'))))
@@ -2640,7 +2687,6 @@ create procedure RDF_SINK_UPLOAD (
goto _exit;
}
if (
- strstr (type, 'text/n3') is not null or
strstr (type, 'text/rdf+n3') is not null or
strstr (type, 'text/rdf+ttl') is not null or
strstr (type, 'application/rdf+n3') is not null or
@@ -2705,15 +2751,19 @@ create procedure RDF_SINK_UPLOAD_CARTRIDGES (
return 0;
cartridges := split_and_decode (rdf_cartridges, 0, '\0\0,');
+ hasSelection := length (cartridges);
ps := null;
aq := null;
foreach (any row in rows) do
{
cname := cast (row[0] as varchar);
+ if (hasSelection)
+ {
if (position (cname, cartridges))
goto _try;
goto _try_next;
+ }
_try:
val_match := case when (row[2] = 'MIME') then type else rdf_graph end;
@@ -4701,7 +4751,6 @@ create procedure WS.WS.WAC_DELETE (
DAV_DELETE_INT (rtrim (path, '/') || ',acl', 1, null, null, 0, 0);
connection_set ('dav_acl_sync', null);
}
- set_user_id ('dba');
SPARQL clear graph ?:graph;
}
;
diff --git a/binsrc/dav/dav_debug.sql b/binsrc/dav/dav_debug.sql
index a1ef97a..e28c679 100644
--- a/binsrc/dav/dav_debug.sql
+++ b/binsrc/dav/dav_debug.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_debug.sql,v 1.1.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: dav_debug.sql,v 1.1.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/dav_meta.sql b/binsrc/dav/dav_meta.sql
index a6133b3..299745b 100644
--- a/binsrc/dav/dav_meta.sql
+++ b/binsrc/dav/dav_meta.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_meta.sql,v 1.12.2.3 2012/03/08 12:54:59 source Exp $
+-- $Id: dav_meta.sql,v 1.12.2.2 2011/06/02 12:28:41 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/dav_metr.sh b/binsrc/dav/dav_metr.sh
index 4de6e9a..8d7247e 100755
--- a/binsrc/dav/dav_metr.sh
+++ b/binsrc/dav/dav_metr.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: dav_metr.sh,v 1.4.2.2 2012/03/08 12:54:59 source Exp $
+# $Id: dav_metr.sh,v 1.4.2.1 2009/11/20 17:11:24 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/dav/dav_rdf_quad.sql b/binsrc/dav/dav_rdf_quad.sql
index ebde191..30d3bfa 100644
--- a/binsrc/dav/dav_rdf_quad.sql
+++ b/binsrc/dav/dav_rdf_quad.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_rdf_quad.sql,v 1.4.2.4 2012/03/08 12:54:59 source Exp $
+-- $Id: dav_rdf_quad.sql,v 1.4.2.3 2011/10/13 18:28:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/davddk.sql b/binsrc/dav/davddk.sql
index e8ffece..f0ef84e 100644
--- a/binsrc/dav/davddk.sql
+++ b/binsrc/dav/davddk.sql
@@ -1,10 +1,10 @@
--
--- $Id: davddk.sql,v 1.13.2.6 2012/03/08 12:54:59 source Exp $
+-- $Id: davddk.sql,v 1.13.2.5 2011/01/05 12:52:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/davxml2n3xml.xsl b/binsrc/dav/davxml2n3xml.xsl
index 8d43910..5500907 100644
--- a/binsrc/dav/davxml2n3xml.xsl
+++ b/binsrc/dav/davxml2n3xml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: davxml2n3xml.xsl,v 1.1.2.1 2012/03/08 12:54:59 source Exp $
+ - $Id: davxml2n3xml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/davxml2rdfxml.xsl b/binsrc/dav/davxml2rdfxml.xsl
index d122a63..1235738 100644
--- a/binsrc/dav/davxml2rdfxml.xsl
+++ b/binsrc/dav/davxml2rdfxml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: davxml2rdfxml.xsl,v 1.1.2.1 2012/03/08 12:54:59 source Exp $
+ - $Id: davxml2rdfxml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/init_dav_metr.sql b/binsrc/dav/init_dav_metr.sql
index 8c99c78..db8c4e5 100644
--- a/binsrc/dav/init_dav_metr.sql
+++ b/binsrc/dav/init_dav_metr.sql
@@ -1,10 +1,10 @@
--
--- $Id: init_dav_metr.sql,v 1.1.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: init_dav_metr.sql,v 1.1.2.1 2009/11/20 17:11:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/n3xml2uriqahtml.xsl b/binsrc/dav/n3xml2uriqahtml.xsl
index 44e3fcc..602b9ae 100644
--- a/binsrc/dav/n3xml2uriqahtml.xsl
+++ b/binsrc/dav/n3xml2uriqahtml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: n3xml2uriqahtml.xsl,v 1.1.2.1 2012/03/08 12:54:59 source Exp $
+ - $Id: n3xml2uriqahtml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/rdav.sh b/binsrc/dav/rdav.sh
index 738ac02..3f42b54 100755
--- a/binsrc/dav/rdav.sh
+++ b/binsrc/dav/rdav.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: rdav.sh,v 1.4.2.2 2012/03/08 12:54:59 source Exp $
+# $Id: rdav.sh,v 1.4.2.1 2009/11/20 17:11:24 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/dav/rdfxml2n3xml.xsl b/binsrc/dav/rdfxml2n3xml.xsl
index 63c6a08..6b5f14d 100644
--- a/binsrc/dav/rdfxml2n3xml.xsl
+++ b/binsrc/dav/rdfxml2n3xml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdfxml2n3xml.xsl,v 1.1.2.1 2012/03/08 12:54:59 source Exp $
+ - $Id: rdfxml2n3xml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/snapshot_repl.sql b/binsrc/dav/snapshot_repl.sql
index 59e2f4d..a746055 100644
--- a/binsrc/dav/snapshot_repl.sql
+++ b/binsrc/dav/snapshot_repl.sql
@@ -1,12 +1,12 @@
--
--- $Id: snapshot_repl.sql,v 1.2.2.2 2012/03/08 12:54:59 source Exp $
+-- $Id: snapshot_repl.sql,v 1.2.2.1 2009/11/20 17:11:24 source Exp $
--
-- SNP replication support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dav/uriqa.sql b/binsrc/dav/uriqa.sql
index f78081d..5d59d48 100644
--- a/binsrc/dav/uriqa.sql
+++ b/binsrc/dav/uriqa.sql
@@ -1,10 +1,10 @@
--
--- $Id: uriqa.sql,v 1.7.2.2 2012/03/08 12:55:00 source Exp $
+-- $Id: uriqa.sql,v 1.7.2.1 2011/09/28 17:01:16 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/dbpedia/Makefile.am b/binsrc/dbpedia/Makefile.am
deleted file mode 100644
index 40c1e0b..0000000
--- a/binsrc/dbpedia/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-# project.
-#
-# Copyright (C) 1998-2012 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@
-
-if WITH_DBPEDIA_VAD
-nodist_vad_DATA = dbpedia_dav.vad
-endif
-
-noinst_SCRIPTS = make_vad.sh
-CLEANFILES = \
- dbpedia_dav.vad \
- dbpedia_filesystem.vad \
- make_dbpedia_vad.log \
- make_vad.output \
- vad_dav.xml \
- vad_fs.xml \
- virtuoso.pxa
-
-
-dbpedia_filesystem.vad dbpedia_dav.vad: $(EXTRA_DIST)
- PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh
-
-clean-local:
- -rm -rf vad
-
-# ----------------------------------------------------------------------
-#
-# Additional files to distribute
-#
-# ----------------------------------------------------------------------
-EXTRA_DIST = \
- *.sql \
- make_vad.sh \
- vad_version \
- vsp/*.sql \
- vsp/*.vsp \
- vsp/images/*.gif \
- vsp/images/*.png \
- vsp/statics/*.css \
- vsp/statics/*.gif \
- vsp/statics/*.js \
- vsp/statics/*.png \
- vsp/statics/*.svg \
- vsp/style/*.css
diff --git a/binsrc/dbpedia/Makefile.in b/binsrc/dbpedia/Makefile.in
deleted file mode 100644
index 0196891..0000000
--- a/binsrc/dbpedia/Makefile.in
+++ /dev/null
@@ -1,550 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-#
-# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-# project.
-#
-# Copyright (C) 1998-2012 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
-#
-#
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = binsrc/dbpedia
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/binsrc/config/libtool.m4 \
- $(top_srcdir)/binsrc/config/libxml.m4 \
- $(top_srcdir)/binsrc/config/ltoptions.m4 \
- $(top_srcdir)/binsrc/config/ltsugar.m4 \
- $(top_srcdir)/binsrc/config/ltversion.m4 \
- $(top_srcdir)/binsrc/config/lt~obsolete.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/libsrc/Dk/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SCRIPTS = $(noinst_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(vaddir)"
-DATA = $(nodist_vad_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BINDIR = @BINDIR@
-BUILD_GLIB_CFLAGS = @BUILD_GLIB_CFLAGS@
-BUILD_GLIB_LIBS = @BUILD_GLIB_LIBS@
-BUILD_OPTS = @BUILD_OPTS@
-CC = @CC@
-CCDEBUG = @CCDEBUG@
-CCDEFS = @CCDEFS@
-CCDEPMODE = @CCDEPMODE@
-CCLIBS = @CCLIBS@
-CCOPT = @CCOPT@
-CCPLATFORMDEFS = @CCPLATFORMDEFS@
-CCWARN = @CCWARN@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FLEX = @FLEX@
-GAWK = @GAWK@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GPERF = @GPERF@
-GREP = @GREP@
-HSL_CPPFLAGS = @HSL_CPPFLAGS@
-HSL_LDFLAGS = @HSL_LDFLAGS@
-HSL_LIBS = @HSL_LIBS@
-HS_LOOKUP = @HS_LOOKUP@
-HTMLDOC = @HTMLDOC@
-IM_CONFIG = @IM_CONFIG@
-IM_CPPFLAGS = @IM_CPPFLAGS@
-IM_LDFLAGS = @IM_LDFLAGS@
-IM_LIBS = @IM_LIBS@
-INCDIR = @INCDIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBDIR = @LIBDIR@
-LIBDL = @LIBDL@
-LIBOBJS = @LIBOBJS@
-LIBRDL = @LIBRDL@
-LIBS = @LIBS@
-LIBTHR = @LIBTHR@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPSYS = @OPSYS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PERL_CFLAGS = @PERL_CFLAGS@
-PERL_LDFLAGS = @PERL_LDFLAGS@
-PKG_CONFIG = @PKG_CONFIG@
-PLSTATS = @PLSTATS@
-PORT = @PORT@
-PYTHON = @PYTHON@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
-PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
-RANLIB = @RANLIB@
-RUBY = @RUBY@
-RUBY_CFLAGS = @RUBY_CFLAGS@
-RUBY_LDFLAGS = @RUBY_LDFLAGS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYSLIBS = @SYSLIBS@
-TOP = @TOP@
-VERSION = @VERSION@
-VIRT_AM_CFLAGS = @VIRT_AM_CFLAGS@
-WBXML2_CFLAGS = @WBXML2_CFLAGS@
-WBXML2_LDFLAGS = @WBXML2_LDFLAGS@
-WGET = @WGET@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-ZLIB_INC = @ZLIB_INC@
-ZLIB_LIB = @ZLIB_LIB@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_jdk2_path = @ac_jdk2_path@
-ac_jdk3_path = @ac_jdk3_path@
-ac_jdk4_path = @ac_jdk4_path@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-ccincl = @ccincl@
-clntlibs = @clntlibs@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dbdir = @dbdir@
-demodir = @demodir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-hostingdir = @hostingdir@
-htmldir = @htmldir@
-htmldocdir = @htmldocdir@
-httprootdir = @httprootdir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-iodbc_LDFLAGS = @iodbc_LDFLAGS@
-java_CPPFLAGS = @java_CPPFLAGS@
-java_LDFLAGS = @java_LDFLAGS@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libxml_file = @libxml_file@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-openldap_CFLAGS = @openldap_CFLAGS@
-openldap_LDFLAGS = @openldap_LDFLAGS@
-openssl_CFLAGS = @openssl_CFLAGS@
-openssl_LDFLAGS = @openssl_LDFLAGS@
-pdfdir = @pdfdir@
-pdfdocdir = @pdfdocdir@
-php5_CFLAGS = @php5_CFLAGS@
-php5_LDFLAGS = @php5_LDFLAGS@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-srvrlibs = @srvrlibs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-vaddir = @vaddir@
- at WITH_DBPEDIA_VAD_TRUE@nodist_vad_DATA = dbpedia_dav.vad
-noinst_SCRIPTS = make_vad.sh
-CLEANFILES = \
- dbpedia_dav.vad \
- dbpedia_filesystem.vad \
- make_dbpedia_vad.log \
- make_vad.output \
- vad_dav.xml \
- vad_fs.xml \
- virtuoso.pxa
-
-
-# ----------------------------------------------------------------------
-#
-# Additional files to distribute
-#
-# ----------------------------------------------------------------------
-EXTRA_DIST = \
- *.sql \
- make_vad.sh \
- vad_version \
- vsp/*.sql \
- vsp/*.vsp \
- vsp/images/*.gif \
- vsp/images/*.png \
- vsp/statics/*.css \
- vsp/statics/*.gif \
- vsp/statics/*.js \
- vsp/statics/*.png \
- vsp/statics/*.svg \
- vsp/style/*.css
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu binsrc/dbpedia/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu binsrc/dbpedia/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-nodist_vadDATA: $(nodist_vad_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(vaddir)" || $(MKDIR_P) "$(DESTDIR)$(vaddir)"
- @list='$(nodist_vad_DATA)'; test -n "$(vaddir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(vaddir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(vaddir)" || exit $$?; \
- done
-
-uninstall-nodist_vadDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(nodist_vad_DATA)'; test -n "$(vaddir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(vaddir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(vaddir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS) $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(vaddir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-nodist_vadDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-nodist_vadDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- clean-local distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-nodist_vadDATA install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am uninstall uninstall-am uninstall-nodist_vadDATA
-
-
-dbpedia_filesystem.vad dbpedia_dav.vad: $(EXTRA_DIST)
- PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh
-
-clean-local:
- -rm -rf vad
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/binsrc/dbpedia/dbpedia_init.sql b/binsrc/dbpedia/dbpedia_init.sql
deleted file mode 100644
index c67dcb4..0000000
--- a/binsrc/dbpedia/dbpedia_init.sql
+++ /dev/null
@@ -1,726 +0,0 @@
---
--- $Id: dbpedia_init.sql,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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 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|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|ntriples)\x24', '.'||s);
- alt := alt || sprintf ('<http://%s%s>; 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|atom)\x24', '.atom');
- alt := alt || sprintf ('<http://%s%s>; 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|atom)\x24', '.jsod');
- alt := alt || sprintf ('<http://%s%s>; rel="alternate"; type="application/odata+json"; title="OData (JSON format)", ', host, p);
- }
- p := regexp_replace (in_path, '\\.(n3|nt|rdf|ttl|jrdf|xml|json|atom)\x24', '');
- p := replace (p, '/data/', '/page/');
- alt := alt || sprintf ('<http://%s%s>; rel="alternate"; type="text/html"; title="XHTML+RDFa", ', host, p);
- p := replace (p, '/page/', '/resource/');
- alt := alt || sprintf ('<http://%s%s>; rev="http://xmlns.com/foaf/0.1/primaryTopic", ', host, p);
- alt := alt || sprintf ('<http://%s%s>; 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 ())));
- }
- return sprintf ('%s%sLink: %s<http://mementoarchive.lanl.gov/dbpedia/timegate/http://%s%s>; rel="timegate"', exp, loc, 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_white.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 (
-'
- at prefix owl: <http://www.w3.org/2002/07/owl#> .
-
-<http://dbpedia.org/ontology/deathPlace> owl:equivalentProperty <http://dbpedia.org/property/deathPlace> .
-<http://dbpedia.org/ontology/deathDate> owl:equivalentProperty <http://dbpedia.org/property/death> .
-<http://dbpedia.org/ontology/birthPlace> owl:equivalentProperty <http://dbpedia.org/property/birthPlace> .
-<http://dbpedia.org/ontology/birthDate> owl:equivalentProperty <http://dbpedia.org/property/birth> .
-<http://xmlns.com/foaf/0.1/givenName> owl:equivalentProperty <http://xmlns.com/foaf/0.1/givenname> .
-<http://purl.org/dc/terms/subject> owl:equivalentProperty <http://www.w3.org/2004/02/skos/core#subject> .
-<http://dbpedia.org/ontology/wikiPageID> owl:equivalentProperty <http://dbpedia.org/property/pageId> .
-<http://dbpedia.org/ontology/wikiPageRevisionID> owl:equivalentProperty <http://dbpedia.org/property/revisionId> .
-<http://dbpedia.org/ontology/wikiPageWikiLink> owl:equivalentProperty <http://dbpedia.org/property/wikilink> .
-<http://dbpedia.org/ontology/wikiPageExternalLink> owl:equivalentProperty <http://dbpedia.org/property/reference> .
-<http://dbpedia.org/ontology/wikiPageRedirects> owl:equivalentProperty <http://dbpedia.org/property/redirect> .
-<http://dbpedia.org/ontology/wikiPageDisambiguates> owl:equivalentProperty <http://dbpedia.org/property/disambiguates> .
-', '', 'http://dbpedia.org/schema/property_rules#');
-
diff --git a/binsrc/dbpedia/dbpedia_local.sql b/binsrc/dbpedia/dbpedia_local.sql
deleted file mode 100644
index 48616a5..0000000
--- a/binsrc/dbpedia/dbpedia_local.sql
+++ /dev/null
@@ -1,471 +0,0 @@
---
--- $Id: dbpedia_local.sql,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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 dbp_setup ()
-{
---# if utf-8 iri's are used
- if (not isstring(registry_get ('dbp_decode_iri')))
- registry_set ('dbp_decode_iri','off');
-
---# the resource domain e.g. http://(xx.)dbpedia.org/resource/...
- if (not isstring(registry_get('dbp_domain')))
- registry_set('dbp_domain','http://dbpedia.org');
-
---# the default graph
- if (not isstring(registry_get ('dbp_graph')))
- registry_set ('dbp_graph', 'http://dbpedia.org');
-
---#
- if (not isstring(registry_get ('dbp_lang')))
- registry_set ('dbp_lang', 'en');
-
---# fix for dbp_replace
- if (not isstring(registry_get ('dbp_DynamicLocal')))
- registry_set ('dbp_DynamicLocal', 'on');
-
---# to create the prefix category:
- if (not isstring(registry_get ('dbp_category')))
- registry_set('dbp_category', 'Category');
-
- if (not isstring(registry_get ('dbp_imprint')))
- registry_set ('dbp_imprint', 'http://wiki.dbpedia.org/Imprint');
-
---# in order to remove and set the rules automatically
- if (not isstring(registry_get ('dbp_website') ))
- registry_set('dbp_website','http://wiki.dbpedia.org/');
-
- if (not isstring(registry_get ('dbp_lhost') ))
- registry_set ('dbp_lhost', ':80');
-
- if (not isstring(registry_get ('dbp_vhost') ))
- registry_set ('dbp_vhost', 'dbpedia.org');
-};
-
-dbp_setup ();
-
-create procedure dbp_replace (in o any)
-{
---# changed 'http://dbpedia.org to dbp domain since local: works with server domain
- declare ret any;
- if (isiri_id (o))
- {
- if (registry_get('dbp_DynamicLocal') = 'off')
- return iri_to_id(o);
- else
- return iri_to_id (replace (id_to_iri (o), registry_get('dbp_domain'), 'local:'));
- }
- else if (__box_flags (o) = 1)
- {
-
- if (registry_get('dbp_DynamicLocal') = 'off')
- ret:= o;
- else
- ret := replace (o, registry_get('dbp_domain'), 'local:');
-
- __box_flags_set (ret, 1);
- return ret;
- }
- return o;
-}
-;
-
-grant execute on dbp_replace to SPARQL_SELECT;
-
-create procedure DB.DBA.SPARQL_DESC_DICT_DBPEDIA_ODATA_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, arr, ret any;
- res := DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL (subj_dict, consts, good_graphs, bad_graphs, storage_name, options);
- ret := dict_new ();
- arr := dict_to_vector (res, 1);
- for (declare i int, i := 0; i < length (arr); i := i + 2)
- {
- dict_put (ret, vector (dbp_replace (arr[i][0]), dbp_replace (arr[i][1]), dbp_replace (arr[i][2])), 0);
- }
- return ret;
-}
-;
-
-grant execute on DB.DBA.SPARQL_DESC_DICT_DBPEDIA_ODATA_PHYSICAL to "SPARQL_SELECT";
-
-create procedure dbp_gen_describe (in path varchar)
-{
- declare qr varchar;
- qr :=
- 'prefix owl: <http://www.w3.org/2002/07/owl#> CONSTRUCT { <local:/IRI/PH> `sql:dbp_replace (?p1)` `sql:dbp_replace (?o1)` . '||
- '`sql:dbp_replace (?s2)` `sql:dbp_replace (?p2)` <local:/IRI/PH> . <local:/IRI/PH> owl:sameAs <http://dbpedia.org/IRI/PH> . } '||
- 'WHERE { { <http://dbpedia.org/IRI/PH> ?p1 ?o1 } UNION { ?s2 ?p2 <http://dbpedia.org/IRI/PH> } }';
- if (registry_get('dbp_DynamicLocal') = 'off')
- {
- qr := replace (qr, 'local:', registry_get('dbp_domain'));
- }
- qr := replace (qr, 'IRI', path);
- qr := sprintf ('%U', qr);
- qr := replace (qr, '%', '%%');
- qr := replace (qr, 'PH', '%U');
- return qr;
-}
-;
-
--- XXX : to be removed
---registry_set('_dbpedia_path_', '/dbpedia/');
---registry_set('_dbpedia_dav_', '0');
-
--- Base
-
-DB.DBA.VHOST_REMOVE (lpath=>registry_get('_dbpedia_path_'));
-DB.DBA.VHOST_DEFINE (lpath=>rtrim (registry_get('_dbpedia_path_'), '/'), ppath=>registry_get('_dbpedia_path_'),
- is_dav=>atoi (registry_get('_dbpedia_dav_')), vsp_user=>'dba');
-
--- CSS, images etc.
-DB.DBA.VHOST_REMOVE (lpath=>'/statics');
-DB.DBA.VHOST_DEFINE (lpath=>'/statics', ppath=>registry_get('_dbpedia_path_')||'statics/',
- is_dav=>atoi (registry_get('_dbpedia_dav_')));
-
--- Classes
-DB.DBA.VHOST_REMOVE (lpath=>'/class');
-DB.DBA.VHOST_DEFINE (lpath=>'/class',
- ppath=>'/',
- is_dav=>0,
- def_page=>'',
- opts=>vector ('url_rewrite', 'dbpl_class_rule_list')
-);
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_class_rule_list', 1, vector ('dbpl_class_rule_1', 'dbpl_class_rule_2', 'dbpl_class_rule_3', 'dbpl_class_rule_4'));
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_class_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_class_rule_2', 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 ( 'dbpl_class_rule_3', 1, '/class/(.*)\x24', vector ('par_1'), 1,
-'/data2/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 1, 303, 'Content-Type: text/rdf+n3');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_class_rule_4', 1, '/class/(.*)\x24', vector ('par_1'), 1,
-'/data2/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle');
-
-
--- OWL
-DB.DBA.VHOST_REMOVE (lpath=>'/ontology');
-DB.DBA.VHOST_DEFINE (lpath=>'/ontology', ppath=>'/', is_dav=>0, def_page=>'', opts=>vector ('url_rewrite', 'dbpl_owl_rule_list'));
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_owl_rule_list', 1, vector ('dbpl_owl_rule_1', 'dbpl_owl_rule_2', 'dbpl_owl_rule_3', 'dbpl_owl_rule_4'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_owl_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_owl_rule_2', 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 ( 'dbpl_owl_rule_3', 1, '/ontology/(.*)\x24', vector ('par_1'), 1,
-'/data3/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 1, 303, 'Content-Type: text/rdf+n3');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_owl_rule_4', 1, '/ontology/(.*)\x24', vector ('par_1'), 1,
-'/data3/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle');
-
--- RDF link
-create procedure DB.DBA.DBP_GRAPH_PARAM (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.VHOST_REMOVE (lpath=>'/data');
-DB.DBA.VHOST_DEFINE (lpath=>'/data', ppath=>registry_get('_dbpedia_path_'), is_dav=>atoi (registry_get('_dbpedia_dav_')),
- vsp_user=>'dba', opts=>vector ('url_rewrite', 'dbpl_data_rule_list'));
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_data_rule_list', 1, vector ('dbpl_data_rule_0', 'dbpl_data_rule_1', 'dbpl_data_rule_2', 'dbpl_data_rule_3', 'dbpl_data_rule_4', 'dbpl_data_rule_5', 'dbpl_data_rule_6', 'dbpl_data_rule_7', 'dbpl_data_rule_8', 'dbpl_data_rule_9', 'dbpl_data_rule_10'));
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_0', 1, '/data/([a-z_\\-]*/)?(.*)', vector ('gr', 'par_1'), 1,
-'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=rdf',
-vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_1', 1, '/data/([a-z_\\-]*/)?(.*)', vector ('gr', 'par_1'), 1,
-'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=%U',
-vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', '*accept*'), 'DB.DBA.DBP_GRAPH_PARAM',
- '(application/rdf.xml)|(text/rdf.n3)', 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_2', 1, '/data/([a-z_\\-]*/)?(.*)\\.(rdf|ttl)', vector ('gr', 'par_1', 'fmt'), 1,
-'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=%U',
-vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'fmt'), 'DB.DBA.DBP_GRAPH_PARAM', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_3', 1, '/data/([a-z_\\-]*/)?(.*)\\.(jrdf)', vector ('gr', 'par_1', 'fmt'), 1,
-'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=application%%2Frdf%%2Bjson',
-vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_4', 1, '/data/([a-z_\\-]*/)?(.*)\\.(json)', vector ('gr', 'par_1', 'fmt'), 1,
-'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=application%%2Fjson',
-vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_5', 1, '/data/([a-z_\\-]*/)?(.*)\\.(xml)', vector ('gr', 'par_1', 'fmt'), 1,
-'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=rdf',
-vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
---DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_6', 1, '/data/([a-z_\\-]*/)?(.*)\\.(atom)', vector ('gr', 'par_1', 'fmt'), 1,
---'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=application%%2Fatom%%2Bxml',
---vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_6', 1, '/data/([a-z_\\-]*/)?(.*)\\.(atom)', vector ('gr', 'par_1', 'f'), 1,
-'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA_ODATA"+DESCRIBE+%%3Chttp%%3A%%2F%%2Fdbpedia.org%%2Fresource%%2F%s%%3E&output=application%%2Fatom%%2Bxml',
-vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_7', 1, '/data/([a-z_\\-]*/)?(.*)\\.(n3)', vector ('gr', 'par_1', 'fmt'), 1,
-'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=text%%2Fn3',
-vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_8', 1, '/data/([a-z_\\-]*/)?(.*)\\.(nt)', vector ('gr', 'par_1', 'fmt'), 1,
-'/sparql?%s&query='||dbp_gen_describe('resource')||'&format=text%%2Frdf%%2Bn3',
-vector ('gr', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_9', 1, '/data/([a-z_\\-]*/)?(.*)\\.(jsod)', vector ('gr', 'par_1', 'f'), 1,
-'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA_ODATA"+DESCRIBE+%%3Chttp%%3A%%2F%%2Fdbpedia.org%%2Fresource%%2F%U%%3E&output=application%%2Fodata%%2Bjson',
-vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data_rule_10', 1, '/data/([a-z_\\-]*/)?(.*)\\.(ntriples)', vector ('gr', 'par_1', 'f'), 1,
-'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA_ODATA"+DESCRIBE+%%3Chttp%%3A%%2F%%2Fdbpedia.org%%2Fresource%%2F%U%%3E&output=text%%2Fplain',
-vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-
--- OWL link
-DB.DBA.VHOST_REMOVE (lpath=>'/data2');
-DB.DBA.VHOST_DEFINE (lpath=>'/data2', ppath=>registry_get('_dbpedia_path_'), is_dav=>atoi (registry_get('_dbpedia_dav_')),
- vsp_user=>'dba', opts=>vector ('url_rewrite', 'dbpl_data2_rule_list'));
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_data2_rule_list', 1, vector ('dbpl_data2_rule_1'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data2_rule_1', 1, '/data2/(.*)\\.(n3|rdf|ttl)', vector ('par_1', 'fmt'), 1,
-'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query='||dbp_gen_describe('class')||'&format=%U',
-vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'fmt'), NULL, NULL, 2, null, '');
-
--- Property link
-DB.DBA.VHOST_REMOVE (lpath=>'/data3');
-DB.DBA.VHOST_DEFINE (lpath=>'/data3', ppath=>registry_get('_dbpedia_path_'), is_dav=>atoi (registry_get('_dbpedia_dav_')),
- vsp_user=>'dba', opts=>vector ('url_rewrite', 'dbpl_data3_rule_list'));
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_data3_rule_list', 1, vector ('dbpl_data3_rule_1', 'dbpl_data3_rule_2', 'dbpl_data3_rule_3'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data3_rule_1', 1, '/data3/(.*)\\.(n3|rdf|ttl)', vector ('par_1', 'fmt'), 1,
-'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query='||dbp_gen_describe ('ontology')||'&format=%U',
-vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'fmt'), NULL, NULL, 2, null, '');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data3_rule_2', 1, '/data3/(.*)\\.atom', vector ('par_1'), 1,
-'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query='||dbp_gen_describe ('ontology')||'&format=application%%2Fatom%%2Bxml',
-vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), NULL, NULL, 2, null, '');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data3_rule_3', 1, '/data3/(.*)\\.ntriples', vector ('par_1'), 1,
-'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query='||dbp_gen_describe ('ontology')||'&format=text%%2Fplain',
-vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1'), NULL, NULL, 2, null, '');
-
-
--- HTML
-DB.DBA.VHOST_REMOVE (lpath=>'/page');
-DB.DBA.VHOST_DEFINE (lpath=>'/page', ppath=>registry_get('_dbpedia_path_'), is_dav=>atoi (registry_get('_dbpedia_dav_')),
- opts=>vector ('url_rewrite', 'dbpl_page_rule_list'));
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_page_rule_list', 1, vector ('dbpl_page_rule_1'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_page_rule_1', 1, '(/[^#\\?]*)', vector ('par_1'), 1,
-registry_get('_dbpedia_path_')||'description.vsp?res=%U', vector ('par_1'), NULL, NULL, 0, 0, '');
-
--- IRIs
-DB.DBA.VHOST_REMOVE (lpath=>'/category');
-DB.DBA.VHOST_DEFINE (lpath=>'/category', ppath=>'/', is_dav=>0, def_page=>'', opts=>vector ('url_rewrite', 'dbpl_category_rule_list'));
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_category_rule_list', 1,
- vector ('dbpl_category_rule_1', 'dbpl_category_rule_2'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_category_rule_1', 1, '/category/(.*)\x24', vector ('par_1'), 1,
- '/page/%s', vector ('par_1'), NULL, NULL, 2, 303, NULL);
-
-create procedure DB.DBA.DBP_DATA_IRI (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')
- return sprintf (fmt, arr[1] || '/');
- val := '';
- }
- return sprintf (fmt, val);
-}
-;
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_category_rule_2', 1, '/category/([^\\?]*)(\\?lang=.*)?\x24', vector ('par_1', 'par_2'), 1,
- '/data/%s at __@%s', vector ('par_2', 'par_1'), 'DB.DBA.DBP_DATA_IRI',
- '(application/rdf.xml)|(text/rdf.n3)|(application/x-turtle)|(application/rdf.json)|(application/json)', 2, 303, '^{sql:DB.DBA.DBP_LINK_HDR}^');
-
-delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'dbpl_category_rule_list';
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_category_rule_list', '@__@(.*)', '/data/\x241.xml', 'application/rdf+xml', 0.95, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_category_rule_list', '@__@(.*)', '/data/\x241.n3', 'text/rdf+n3', 0.80, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_category_rule_list', '@__@(.*)', '/data/\x241.ttl', 'application/x-turtle', 0.70, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_category_rule_list', '@__@(.*)', '/data/\x241.json', 'application/json', 0.60, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_category_rule_list', '@__@(.*)', '/data/\x241.jrdf', 'application/rdf+json', 0.60, location_hook=>null);
-
-DB.DBA.VHOST_REMOVE (lpath=>'/resource');
-DB.DBA.VHOST_DEFINE (lpath=>'/resource', ppath=>'/', is_dav=>0, def_page=>'', opts=>vector ('url_rewrite', 'dbpl_resource_rule_list'));
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_resource_rule_list', 1,
- vector ('dbpl_resource_rule_1', 'dbpl_resource_rule_2'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_resource_rule_1', 1, '/resource/(.*)\x24', vector ('par_1'), 1,
- '/page/%s', vector ('par_1'), NULL, NULL, 2, 303, NULL);
-
-create procedure DB.DBA.DBP_DATA_IRI (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 ( 'dbpl_resource_rule_2', 1, '/resource/([^\\?]*)(\\?lang=.*)?\x24', vector ('par_1', 'par_2'), 1,
- '/data/%s at __@%s', vector ('par_2', 'par_1'), 'DB.DBA.DBP_DATA_IRI',
- '(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}^');
-
-delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'dbpl_resource_rule_list';
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '@__@(.*)', '/data/\x241.xml', 'application/rdf+xml', 0.95, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '@__@(.*)', '/data/\x241.n3', 'text/n3', 0.80, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '@__@(.*)', '/data/\x241.nt', 'text/rdf+n3', 0.80, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '@__@(.*)', '/data/\x241.ttl', 'application/x-turtle', 0.70, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '@__@(.*)', '/data/\x241.json', 'application/json', 0.60, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '@__@(.*)', '/data/\x241.jrdf', 'application/rdf+json', 0.60, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '@__@(.*)', '/data/\x241.atom', 'application/atom+xml', 0.50, location_hook=>null);
-DB.DBA.HTTP_VARIANT_ADD ('dbpl_resource_rule_list', '@__@(.*)', '/data/\x241.jsod', 'application/odata+json', 0.50, location_hook=>null);
-
--- Wikicompany
---DB.DBA.VHOST_REMOVE (lpath=>'/wikicompany/resource');
---DB.DBA.VHOST_DEFINE (lpath=>'/wikicompany/resource', ppath=>'/DAV/wikicompany/resource/', is_dav=>1, vsp_user=>'dba',
--- opts=>vector ('url_rewrite', 'dbpl_wc_rule_list'));
---DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_wc_rule_list', 1, vector ('dbpl_wc_rule1', 'dbpl_wc_rule2'));
---DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_wc_rule1', 1, '(/[^#]*)', vector ('par_1'), 1,
---registry_get('_dbpedia_path_')||'description_white.vsp?res=%s', vector ('par_1'), NULL, NULL, 2, 0, '');
---DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_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, '');
-
--- Property
-DB.DBA.VHOST_REMOVE (lpath=>'/property');
-DB.DBA.VHOST_DEFINE (lpath=>'/property',
- ppath=>'/',
- is_dav=>0,
- def_page=>'',
- opts=>vector ('url_rewrite', 'dbpl_prop_rule_list')
-);
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_prop_rule_list', 1, vector ('dbpl_prop_rule_1', 'dbpl_prop_rule_2', 'dbpl_prop_rule_3', 'dbpl_prop_rule_4'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_prop_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_prop_rule_2', 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 ( 'dbpl_prop_rule_3', 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 ( 'dbpl_prop_rule_4', 1, '/property/(.*)\x24', vector ('par_1'), 1,
-'/data4/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle');
-
--- RDF for property
-DB.DBA.VHOST_REMOVE (lpath=>'/data4');
-DB.DBA.VHOST_DEFINE (lpath=>'/data4',
- ppath=>registry_get('_dbpedia_path_'),
- is_dav=>atoi (registry_get('_dbpedia_dav_')),
- vsp_user=>'dba',
- opts=>vector ('url_rewrite', 'dbpl_data4_rule_list')
-);
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_data4_rule_list', 1, vector ('dbpl_data4_rule_1'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data4_rule_1', 1, '/data4/(.*)\\.(n3|rdf|ttl)', vector ('par_1', 'fmt'), 1,
-'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query='||dbp_gen_describe ('property')||'&format=%U',
-vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'fmt'), NULL, NULL, 2, null, '');
-
-
--- Meta
-DB.DBA.VHOST_REMOVE (lpath=>'/meta');
-DB.DBA.VHOST_DEFINE (lpath=>'/meta',
- ppath=>'/',
- is_dav=>0,
- def_page=>'',
- opts=>vector ('url_rewrite', 'dbpl_meta_rule_list')
-);
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_meta_rule_list', 1, vector ('dbpl_meta_rule_1', 'dbpl_meta_rule_2', 'dbpl_meta_rule_3', 'dbpl_meta_rule_4'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_meta_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_meta_rule_2', 1, '/meta/(.*)\x24', vector ('par_1'), 1,
-'/data5/%s.rdf', vector ('par_1'), NULL, 'application/rdf.xml', 2, 303, 'Content-Type: application/rdf+xml');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_meta_rule_3', 1, '/meta/(.*)\x24', vector ('par_1'), 1,
-'/data5/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 1, 303, 'Content-Type: text/rdf+n3');
-
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_meta_rule_4', 1, '/meta/(.*)\x24', vector ('par_1'), 1,
-'/data5/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle');
-
--- RDF for meta
-DB.DBA.VHOST_REMOVE (lpath=>'/data5');
-DB.DBA.VHOST_DEFINE (lpath=>'/data5',
- ppath=>registry_get('_dbpedia_path_'),
- is_dav=>atoi (registry_get('_dbpedia_dav_')),
- vsp_user=>'dba',
- opts=>vector ('url_rewrite', 'dbpl_data5_rule_list')
-);
-
-DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_data5_rule_list', 1, vector ('dbpl_data5_rule_1'));
-DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data5_rule_1', 1, '/data5/(.*)\\.(n3|rdf|ttl)', vector ('par_1', 'fmt'), 1,
-'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query='||dbp_gen_describe ('meta')||'&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'))
- {
- declare exit handler for sqlstate '*' {
- return;
- };
- string_to_file (http_root () || '/robots.txt', 'User-agent: *\r\nDisallow: /\r\n', -2);
- }
-}
-;
-
-dbpl_robots ()
-;
-
-
diff --git a/binsrc/dbpedia/make_vad.sh b/binsrc/dbpedia/make_vad.sh
deleted file mode 100755
index d2ef43c..0000000
--- a/binsrc/dbpedia/make_vad.sh
+++ /dev/null
@@ -1,457 +0,0 @@
-#!/bin/sh
-#
-# $Id: make_vad.sh,v 1.1.2.2 2012/03/02 12:43:27 source Exp $
-#
-# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-# project.
-#
-# Copyright (C) 1998-2012 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 [ $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=1 } { 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/dbpedia
- mkdir vad/vsp
- mkdir vad/vsp/dbpedia
- mkdir vad/vsp/dbpedia/statics
- mkdir vad/vsp/dbpedia/images
- mkdir vad/vsp/dbpedia/style
-
- 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() {
- ddate=`date`
- starth=`date | cut -f 2 -d :`
- starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
- timeout=600
- $myrm -f *.lck
- if [ "z$HOST_OS" != "z" ]
- then
- "$SERVER" +foreground &
- else
- "$SERVER" +wait
- fi
- stat="true"
- while true
- do
- sleep 4
- echo "Waiting Virtuoso Server start on port $PORT..."
- stat=`netstat -an | grep "[\.\:]$PORT " | grep LISTEN`
- if [ "z$stat" != "z" ]
- then
- sleep 7
- LOG "PASSED: Virtuoso Server successfully started on port $PORT"
- return 0
- 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
- LOG "***FAILED: Could not start Virtuoso Server within $timeout seconds"
- exit 1
- fi
- done
-}
-
-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 "<?xml version=\"1.0\" encoding=\"ASCII\"?>" > $STICKER
- echo "<!DOCTYPE sticker SYSTEM \"vad_sticker.dtd\">" >> $STICKER
- echo "<sticker version=\"1.0.010505A\" xml:lang=\"en-UK\">" >> $STICKER
- echo "<caption>" >> $STICKER
- echo " <name package=\"$VAD_NAME\">" >> $STICKER
- echo " <prop name=\"Title\" value=\"$VAD_DESC\"/>" >> $STICKER
- echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
- echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
- echo " </name>" >> $STICKER
- echo " <version package=\"$VERSION\">" >> $STICKER
- echo " <prop name=\"Release Date\" value=\"$PACKDATE\"/>" >> $STICKER
- echo " <prop name=\"Build\" value=\"Release, optimized\"/>" >> $STICKER
- echo " </version>" >> $STICKER
- echo "</caption>" >> $STICKER
- echo "<dependencies>" >> $STICKER
- echo "</dependencies>" >> $STICKER
- echo "<procedures uninstallation=\"supported\">" >> $STICKER
- echo " <sql purpose=\"pre-install\"><![CDATA[" >> $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 " ]]></sql>" >> $STICKER
- echo " <sql purpose=\"post-install\">" >> $STICKER
- echo " ; " >> $STICKER
- echo " </sql>" >> $STICKER
- echo "</procedures>" >> $STICKER
- echo "<ddls>" >> $STICKER
- echo " <sql purpose=\"post-install\">" >> $STICKER
- echo " <![CDATA[" >> $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 " </sql>" >> $STICKER
- echo " <sql purpose='pre-uninstall'>" >> $STICKER
- echo " <![CDATA[" >> $STICKER
- echo " ;" >> $STICKER
- echo " ]]>" >> $STICKER
- echo " </sql>" >> $STICKER
-# echo " <sql purpose='post-uninstall'>" >> $STICKER
-# echo " </sql>" >> $STICKER
- echo "</ddls>" >> $STICKER
- echo "<resources>" >> $STICKER
-
- echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/dbpedia_init.sql\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> $STICKER
- echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/dbpedia_local.sql\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> $STICKER
- echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/description.sql\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> $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
- echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/$file\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> ../$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
- echo " <file type=\"$TYPE\" source=\"http\" target_uri=\"$VAD_NAME/$file\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> ../$STICKER
- done
- cd .. >/dev/null 2>&1
-
- echo "</resources>" >> $STICKER
- echo "<registry>" >> $STICKER
- echo "</registry>" >> $STICKER
- echo "</sticker>" >> $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/vad_version b/binsrc/dbpedia/vad_version
deleted file mode 100644
index 8731870..0000000
--- a/binsrc/dbpedia/vad_version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.89
diff --git a/binsrc/dbpedia/vsp/description.sql b/binsrc/dbpedia/vsp/description.sql
deleted file mode 100644
index 03b58ec..0000000
--- a/binsrc/dbpedia/vsp/description.sql
+++ /dev/null
@@ -1,628 +0,0 @@
---
--- $Id: description.sql,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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
---
---
-
-TTLP ('@prefix foaf: <http://xmlns.com/foaf/0.1/>
- at prefix dc: <http://purl.org/dc/elements/1.1/>
- at prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
- at prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- at prefix fbase: <http://rdf.freebase.com/ns/>
-rdfs:label rdfs:subPropertyOf virtrdf:label .
-dc:title rdfs:subPropertyOf virtrdf:label .
-fbase:type.object.name rdfs:subPropertyOf virtrdf:label .
-foaf:name rdfs:subPropertyOf virtrdf:label .
-<http://s.opencalais.com/1/pred/name> rdfs:subPropertyOf virtrdf:label .
-foaf:nick rdfs:subPropertyOf virtrdf:label .', '', 'dbprdf-label');
-
-rdfs_rule_set ('dbprdf-label', 'dbprdf-label');
-
-create procedure dbp_ldd_set_ns_decl ()
-{
- declare arr any;
- declare i, l int;
- arr := vector (
- registry_get('dbp_domain') || '/resource/', 'dbpedia',
- registry_get('dbp_domain') || '/resource/' || registry_get('dbp_category') || ':', 'category',
- 'http://dbpedia.org/property/', 'p',
- 'http://dbpedia.openlinksw.com/wikicompany/', 'wikicompany',
- 'http://dbpedia.org/class/yago/', 'yago',
- 'http://www.w3.org/2003/01/geo/wgs84_pos#', 'geo',
- 'http://www.geonames.org/ontology#', 'geonames',
- 'http://xmlns.com/foaf/0.1/', 'foaf',
- 'http://www.w3.org/2004/02/skos/core#', 'skos',
- 'http://www.w3.org/2002/07/owl#', 'owl',
- 'http://www.w3.org/2000/01/rdf-schema#', 'rdfs',
- 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'rdf',
- 'http://www.w3.org/2001/XMLSchema#', 'xsd',
- 'http://purl.org/dc/elements/1.1/', 'dc',
- 'http://purl.org/dc/terms/', 'dcterms',
- 'http://dbpedia.org/units/', 'units',
- 'http://umbel.org/umbel/sc/', 'umbel-sc',
- 'http://umbel.org/umbel/ac/', 'umbel-ac',
- 'http://www.georss.org/georss/', 'georss',
- 'http://sw.opencyc.org/2008/06/10/concept/en/', 'opencyc',
- 'http://sw.opencyc.org/2008/06/10/concept/', 'opencyc',
- 'http://mpii.de/yago/resource/', 'yago-res',
- 'http://rdf.freebase.com/ns/', 'freebase',
- 'http://dbpedia.org/ontology/', 'dbpedia-owl');
- l := length (arr);
- for (i := 0; i < l; i := i + 2)
- {
- XML_REMOVE_NS_BY_PREFIX (arr[i+1], 2);
- XML_SET_NS_DECL (arr[i+1], arr[i], 2);
- }
-}
-;
-
-dbp_ldd_set_ns_decl ();
-
-create procedure dbp_ldd_get_lang_by_q (in accept varchar, in lang varchar)
-{
- declare format, itm varchar;
- declare arr, q any;
- declare i, l int;
-
- arr := split_and_decode (accept, 0, '\0\0,;');
- q := 0;
- l := length (arr);
- format := null;
- for (i := 0; i < l; i := i + 2)
- {
- declare tmp any;
- itm := trim(arr[i]);
- if (itm = lang)
- {
- q := arr[i+1];
- if (q is null)
- q := 1.0;
- else
- {
- tmp := split_and_decode (q, 0, '\0\0=');
- if (length (tmp) = 2)
- q := atof (tmp[1]);
- else
- q := 1.0;
- }
- goto ret;
- }
- }
- ret:
- if (q = 0 and lang = 'en')
- q := 0.002;
- if (q = 0 and not length (lang))
- q := 0.001;
- return q;
-}
-;
-
-create procedure dbp_ldd_label (in _S any, in _G varchar, in lines any := null)
-{
- declare best_str, meta, data any;
- declare best_q, q float;
- declare lang, langs varchar;
- declare retr int;
-
- retr := 1;
-
- declare exit handler for sqlstate '42000'
- {
- if (retr and __SQL_MESSAGE like '%Inference context %')
- {
- rdfs_load_schema ('dbprdf-label', 'dbprdf-label');
- retr := 0;
- goto again;
- }
- return _S;
- };
-
-again:
- if (__tag of IRI_ID = __tag (_S))
- _S := id_to_iri (_S);
- if (__tag of IRI_ID = __tag (_G))
- _G := id_to_iri (_G);
-
- langs := 'en';
- if (lines is not null)
- {
- langs := http_request_header_full (lines, 'Accept-Language', 'en');
- }
- exec (sprintf ('sparql '||
- 'select ?o (lang(?o)) where { graph <%S> { <%S> rdfs:label ?o } }', _G, _S), null, null, vector (), 0, meta, data);
- best_str := '';
- best_q := 0;
- if (length (data))
- {
- for (declare i, l int, i := 0, l := length (data); i < l; i := i + 1)
- {
- q := dbp_ldd_get_lang_by_q (langs, data[i][1]);
- if (q > best_q)
- {
- best_str := data[i][0];
- best_q := q;
- }
- }
- }
- if (best_str <> '')
- return best_str;
- exec (sprintf ('sparql define input:inference "dbprdf-label" '||
- 'select ?o (lang(?o)) where { graph <%S> { <%S> virtrdf:label ?o } }', _G, _S), null, null, vector (), 0, meta, data);
- best_str := '';
- best_q := 0;
- if (length (data))
- {
- for (declare i, l int, i := 0, l := length (data); i < l; i := i + 1)
- {
- q := dbp_ldd_get_lang_by_q (langs, data[i][1]);
- if (q > best_q)
- {
- best_str := data[i][0];
- best_q := q;
- }
- }
- }
- return best_str;
-}
-;
-
-create procedure dbp_ldd_type (in gr varchar, in subj varchar, out url varchar, in lines any := null)
-{
- declare meta, data, ll any;
- ll := 'Thing';
- url := 'javascript:void()';
-
- if (__tag of IRI_ID = __tag (subj))
- subj := id_to_iri (subj);
- if (__tag of IRI_ID = __tag (gr))
- gr := id_to_iri (gr);
-
- if (length (gr))
- {
- declare langs any;
- --if (isvector (lines))
- -- langs := http_request_header_full (lines, 'Accept-Language', 'en');
- --else
- langs := 'en';
- exec (sprintf ('sparql select (sql:BEST_LANGMATCH (?l, \'%S\', \'\')) ?tp from <%S> from virtrdf:schemas { <%S> <http://dbpedia.org/ontology/type> ?tp . optional { ?tp rdfs:label ?l } }', langs, gr, subj), null, null, vector (), 0, meta, data);
- if (not length (data))
- exec (sprintf ('sparql select (sql:BEST_LANGMATCH (?l, \'%S\', \'\')) ?tp from <%S> from virtrdf:schemas { <%S> a ?tp . optional { ?tp rdfs:label ?l } filter (?tp like <http://dbpedia.org/ontology/%%>) }', langs, gr, subj),
- null, null, vector (), 0, meta, data);
- if (not length (data))
- exec (sprintf ('sparql select (sql:BEST_LANGMATCH (?l, \'%S\', \'\')) ?tp from <%S> from virtrdf:schemas { <%S> a ?tp . optional { ?tp rdfs:label ?l } }', langs, gr, subj),
- null, null, vector (), 0, meta, data);
- if (length (data))
- {
- if (data[0][0] is not null and data[0][0] <> 0)
- ll := data[0][0];
- else
- ll := dbp_ldd_uri_local_part (data[0][1]);
- url := dbp_ldd_get_proxy (data[0][1]);
- }
- }
- return ll;
-}
-;
-
-create procedure dbp_ldd_uri_local_part (in uri varchar)
-{
- declare delim integer;
- declare uriSearch varchar;
- delim := -1;
- uriSearch := uri;
- delim := coalesce (strrchr (uriSearch, '/'), 0);
- delim := __max (delim, coalesce (strrchr (uriSearch, '#'), 0));
- delim := __max (delim, coalesce (strrchr (uriSearch, ':'), 0));
- if (delim > 0)
- uriSearch := subseq (uri, delim + 1);
- return uriSearch;
-}
-;
-
-create procedure dbp_ldd_subject (in _S any, in _G varchar, in lines any := null)
-{
- declare best_str, meta, data any;
- declare best_q, q float;
- declare lang, langs varchar;
-
- if (__tag of IRI_ID = __tag (_S))
- _S := id_to_iri (_S);
- if (__tag of IRI_ID = __tag (_G))
- _G := id_to_iri (_G);
-
- langs := 'en';
- if (lines is not null)
- {
- langs := http_request_header_full (lines, 'Accept-Language', 'en');
- }
- if (langs is not null)
- {
- langs := replace (langs, 'en-us', 'en');
- langs := replace (langs, 'en-uk', 'en');
- }
- best_str := '';
- exec (sprintf ('sparql select (sql:BEST_LANGMATCH (?l, \'%S\', \'en\')) ?tp where { graph <%S> { <%S> dbpprop:comment_live ?l } }',
- langs, _G, _S), null, null, vector (), 0, meta, data);
- if (length (data) and data[0][0] is not null and data[0][0] <> 0)
- best_str := data[0][0];
- else
- {
- exec (sprintf ('sparql select (sql:BEST_LANGMATCH (?l, \'%S\', \'en\')) ?tp where { graph <%S> { <%S> rdfs:comment ?l } }',
- langs, _G, _S), null, null, vector (), 0, meta, data);
- if (length (data) and data[0][0] is not null and data[0][0] <> 0)
- best_str := data[0][0];
- }
- return best_str;
-}
-;
-
-create procedure
-dbp_ldd_trunc_uri (in s varchar, in maxlen int := 80)
-{
- declare _s varchar;
- declare _h int;
-
- _s := trim(s);
- _s := charset_recode (_s, 'UTF-8', '_WIDE_');
-
- if (length(_s) <= maxlen) return charset_recode (_s, '_WIDE_', 'UTF-8');
- _h := floor ((maxlen-3) / 2);
- _s := concat ("LEFT"(_s, _h), N'...', "RIGHT"(_s, _h-1));
-
- return charset_recode (_s, '_WIDE_', 'UTF-8');
-}
-;
-
-create procedure dbp_ldd_split_url (in uri varchar, out pref varchar, out res varchar, in label varchar := null)
-{
- declare delim any;
- declare uriSearch, nsPrefix any;
-
- delim := -1;
- uriSearch := uri;
- nsPrefix := null;
- if (not length (label))
- label := null;
- while (nsPrefix is null and delim <> 0)
- {
- delim := coalesce (strrchr (uriSearch, '/'), 0);
- delim := __max (delim, coalesce (strrchr (uriSearch, '#'), 0));
- delim := __max (delim, coalesce (strrchr (uriSearch, ':'), 0));
- nsPrefix := coalesce (__xml_get_ns_prefix (subseq (uriSearch, 0, delim + 1), 2),
- __xml_get_ns_prefix (subseq (uriSearch, 0, delim), 2));
- uriSearch := subseq (uriSearch, 0, delim);
- }
- if (nsPrefix is not null)
- {
- declare rhs varchar;
- rhs := subseq(uri, length (uriSearch) + 1, null);
- if (length (rhs))
- {
- pref := nsPrefix;
- if (regexp_match ('(_percent_[0-9A-F][0-9A-F])', rhs))
- {
- rhs := regexp_replace (rhs, '(_percent_)', '%', 1, null);
- }
- if (regexp_match ('%[0-9A-F][0-9A-F]', rhs))
- {
- declare tmp any;
- tmp := split_and_decode (rhs)[0];
- if (charset_recode (tmp, 'UTF-8', null))
- rhs := tmp;
- }
- rhs := dbp_ldd_trunc_uri (rhs);
- res := coalesce (label, rhs);
- return;
- }
- }
- pref := uri;
- res := null;
-}
-;
-
-create procedure dbp_ldd_get_proxy (in x varchar)
-{
- if (x like 'nodeID://%')
- return '/about/html/' || x;
- if (x like 'http://dbpedia.org/%' and http_request_header (http_request_header (), 'Host') <> 'dbpedia.org')
- return regexp_replace (x, 'http://dbpedia.org', 'http://'||http_request_header (http_request_header (), 'Host'));
- if (x like registry_get('dbp_domain') || '/%' and http_request_header (http_request_header (), 'Host') <> replace(registry_get('dbp_domain'),'http://',''))
- return regexp_replace (x, registry_get('dbp_domain'), 'http://'||http_request_header (http_request_header (), 'Host'));
-
- if (connection_get ('mappers_installed') = 1 and (
- x like 'http://www.w3.org/2002/07/owl%' or
- x like 'http://www.w3.org/1999/02/22-rdf-syntax-ns%' or
- x like 'http://www.w3.org/2000/01/rdf-schema%'))
- return '/about/html/' || replace (x, '#', '%01');
-
- return x;
-}
-;
-
---
--- make a vector of languages and their quality
---
-create procedure dbp_ldd_get_lang_acc (in lines any)
-{
- declare accept, itm varchar;
- declare i, l, q int;
- declare ret, arr any;
-
- accept := 'en';
- if (lines is not null)
- {
- accept := http_request_header_full (lines, 'Accept-Language', 'en');
- }
- arr := split_and_decode (accept, 0, '\0\0,;');
- q := 0;
- l := length (arr);
- ret := make_array (l, 'any');
- for (i := 0; i < l; i := i + 2)
- {
- declare tmp any;
- itm := trim(arr[i]);
- if (itm like '%-%')
- itm := subseq (itm, 0, strchr (itm, '-'));
- q := arr[i+1];
- if (q is null)
- q := 1.0;
- else
- {
- tmp := split_and_decode (q, 0, '\0\0=');
- if (length (tmp) = 2)
- q := atof (tmp[1]);
- else
- q := 1.0;
- }
- ret[i] := itm;
- ret[i+1] := q;
- }
- return ret;
-}
-;
-
-create procedure dbp_ldd_str_lang_check (in lang any, in acc any)
-{
- if (lang like '%-%')
- lang := subseq (lang, 0, strchr (lang, '-'));
- if (not length (lang))
- return 1;
- else if (position (lang, acc) > 0)
- return 1;
- else if (position ('*', acc) > 0)
- return 1;
- return 0;
-}
-;
-
-create procedure dbp_ldd_http_print_l (in p_text any, inout odd_position int, in rev int := 0)
-{
- declare short_p, p_prefix, int_redirect, href, title any;
-
- odd_position := odd_position + 1;
- dbp_ldd_split_url (p_text, p_prefix, short_p);
- href := dbp_ldd_get_proxy (p_text);
- title := p_text;
- if (title = href)
- title := '';
- else
- title := sprintf (' title="%V"', title);
-
- http (sprintf ('<tr class="%s"><td class="property">', either(mod (odd_position, 2), 'odd', 'even')));
- if (rev) http ('is ');
- if (short_p is not null)
- http (sprintf ('<a class="uri" href="%V"%s><small>%s:</small>%s</a>\n', href, title, p_prefix, short_p));
- else
- http (sprintf ('<a class="uri" href="%V"%s>%s</a>\n', href, title, p_prefix));
- if (rev) http (' of');
- http ('</td><td><ul>\n');
-}
-;
-
-create procedure dbp_ldd_rel_print (in val any, in rel any, in obj any, in flag int := 0, in lang varchar := null)
-{
- declare delim, delim1, delim2, delim3 integer;
- declare inx int;
- declare nss, loc, res, nspref, lang_def varchar;
-
- delim1 := coalesce (strrchr (val, '/'), -1);
- delim2 := coalesce (strrchr (val, '#'), -1);
- delim3 := coalesce (strrchr (val, ':'), -1);
- delim := __max (delim1, delim2, delim3);
- nss := '';
- loc := val;
- if (delim < 0) return loc;
- nss := subseq (val, 0, delim + 1);
- loc := subseq (val, delim + 1);
- res := '';
-
- nspref := __xml_get_ns_prefix (nss, 2);
- if (nspref is null)
- {
- inx := coalesce (connection_get ('ns_ctr'), 0);
- connection_set ('ns_ctr', inx + 1);
- nspref := sprintf ('ns%d', inx);
- }
-
-
- if (nspref is not null and nspref not in ('dbpprop', 'owl'))
- nss := sprintf (' xmlns:%s="%s"', nspref, nss);
- else
- nss := '';
- if (flag)
- loc := sprintf ('property="%s:%s"', nspref, loc);
- else if (rel)
- loc := sprintf ('rel="%s:%s"', nspref, loc);
- else
- loc := sprintf ('rev="%s:%s"', nspref, loc);
- --if (obj is not null)
- -- res := sprintf (' resource="%V"', obj);
- lang_def := '';
- if (isstring (lang) and lang <> '')
- lang_def := sprintf (' xml:lang="%s"', lang);
- return concat (loc, res, nss, lang_def);
-}
-;
-
-create procedure dbp_ldd_http_print_r (in _object any, in org int := 0, in label varchar, in pred varchar, in rel int, inout acc any)
-{
- declare lang, rdfs_type, rdfa, visible any;
-
- lang := DB.DBA.RDF_LANGUAGE_OF_OBJ (_object);
- visible := dbp_ldd_str_lang_check (lang, acc);
- rdfs_type := DB.DBA.RDF_DATATYPE_OF_OBJ (_object);
- rdfa := dbp_ldd_rel_print (id_to_iri (pred), rel, null, 1, lang);
-
- http (sprintf ('\t<li%s><span class="literal">', case visible when 0 then ' style="display:none;"' else '' end));
-
-again:
- if (__tag (_object) = 246)
- {
- declare dat any;
- dat := __rdf_sqlval_of_obj (_object, 1);
- _object := dat;
- goto again;
- }
- else if (__tag (_object) = 189)
- {
- http (sprintf ('<span %s>%d</span>', rdfa, _object));
- lang := 'xsd:integer';
- }
- else if (__tag (_object) = 190)
- {
- http (sprintf ('<span %s>%f</span>', rdfa, _object));
- lang := 'xsd:float';
- }
- else if (__tag (_object) = 191)
- {
- http (sprintf ('<span %s>%f</span>', rdfa, _object));
- lang := 'xsd:double';
- }
- else if (__tag (_object) = 219)
- {
- http (sprintf ('<span %s>%s</span>', rdfa, cast (_object as varchar)));
- lang := 'xsd:double';
- }
- else if (__tag (_object) = 182)
- {
- string_type:
- http (sprintf ('<span %s>%s</span>', rdfa, _object));
- lang := '';
- }
- else if (__tag (_object) = 211)
- {
- http (sprintf ('<span %s>%s</span>', rdfa, datestring (_object)));
- lang := 'xsd:date';
- }
- else if (__tag (_object) = 243)
- {
- declare _url, p_t, s_t, _label any;
-
- _label := null;
- if (pred = rdf_sas_iri ())
- _label := label;
- _url := id_to_iri (_object);
- if (_url is null)
- {
- _object := 'unknown IRI_ID';
- goto string_type;
- }
- if (_url like 'http://sw.opencyc.org/2008/06/10/concept/%')
- {
- declare h_url varchar;
- declare stat, msg, data, meta any;
- stat := '00000';
- exec (sprintf ('sparql select * from <http://dbpedia.org/resource/classes/opencyc-readable#> where { ?x owl:sameAs <%s> } limit 1', _url),
- stat, msg, vector (), 0, meta, data);
- if (length (data))
- h_url := data[0][0];
- else
- h_url := _url;
- dbp_ldd_split_url (h_url, p_t, s_t);
- }
- else
- dbp_ldd_split_url (_url, p_t, s_t, _label);
-
- rdfa := dbp_ldd_rel_print (id_to_iri (pred), rel, _url, 0, lang);
- if (s_t is null)
- {
- http (sprintf ('<a class="uri" %s href="%s">%s</a>',
- rdfa, case when org then _url else dbp_ldd_get_proxy(_url) end, _url));
- }
- else
- {
- http (sprintf ('<a class="uri" %s href="%s"><small>%s</small>:%s</a>',
- rdfa, case when org then _url else dbp_ldd_get_proxy (_url) end, p_t, s_t));
- }
- }
- else if (__tag (_object) = 238)
- {
- http (sprintf ('<span %s>', rdfa));
- http (st_astext (_object));
- http ('</span>');
- }
- else
- http (sprintf ('FIXME %i', __tag (_object)));
-
- if (lang is not NULL and lang <> '')
- {
- http (sprintf ('<small> (%s)</small>', lang));
- }
-
- http ('</span></li>\n');
- return visible;
-}
-;
-
-create procedure dbp_virt_info ()
-{
- http ('<a href="http://www.openlinksw.com/virtuoso/">OpenLink Virtuoso</a> version ');
- http (sys_stat ('st_dbms_ver'));
- http (', on ');
- http (sys_stat ('st_build_opsys_id')); http (',');
- http (case when sys_stat ('cl_run_local_only') = 1 then 'Single' else 'Cluster' end); http (' Edition ');
- http (case when sys_stat ('cl_run_local_only') = 0 then sprintf ('(%d nodes)', sys_stat ('cl_n_hosts')) else '' end);
-}
-;
-
-create procedure dbp_wikipedia_cc_by_sa (in _S any, in _G any)
-{
- declare meta, data any;
- declare wiki_link varchar;
-
- if (__tag of IRI_ID = __tag (_S))
- _S := id_to_iri (_S);
- if (__tag of IRI_ID = __tag (_G))
- _G := id_to_iri (_G);
-
- exec (sprintf ('sparql '||
- 'select ?o where { graph <%S> { <%S> foaf:page ?o } } LIMIT 1', _G, _S), null, null, vector (), 0, meta, data);
-
- if (length (data))
- wiki_link := data[0][0];
- else
- wiki_link := 'http://www.wikipedia.org/';
-
- http ('This content was extracted from ');
- http (sprintf ('<a href="%V">Wikipedia</a>', wiki_link));
- http (' and is licensed under the ');
- http ('<a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>\n');
-}
-;
diff --git a/binsrc/dbpedia/vsp/description.vsp b/binsrc/dbpedia/vsp/description.vsp
deleted file mode 100644
index b6c5b6b..0000000
--- a/binsrc/dbpedia/vsp/description.vsp
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:dbpprop="http://dbpedia.org/property/"
- xmlns:foaf="http://xmlns.com/foaf/0.1/"
- version="XHTML+RDFa 1.0" xml:lang="en">
-<?vsp
---
--- $Id: description.vsp,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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
---
---
-
- declare _G, _S, _P, _O, odd_position any;
- declare _resource_, project_name, project_home_page any;
- declare page_resource_uri, rdf_link, rdf_link2, rdf_link3, rdf_link4, atom_link, jsod, ntriples, label, true_label, _subject, csv_link, cxml_link, gen_rdf_link any;
- declare iri_type, iri_uri, white_page, pkgs, txt, host, links, langs, dset, tmp_lines any;
-
- -- INIT VALLUES
-
- set http_charset='utf-8';
- set isolation = 'uncomitted';
- _resource_ := get_keyword ('res', params, '');
- dset := get_keyword ('lang', params, '');
- langs := dbp_ldd_get_lang_acc (lines);
- tmp_lines := lines;
- iri_type := 'unknown';
- if (length (dset))
- {
- langs := vector (dset, 1.0);
- tmp_lines := vector ('Accept-Language: ' || dset);
- }
- else
- {
- declare tmp any;
- tmp := sprintf_inverse (registry_get ('dbp_graph'), 'http://%s.dbpedia.org', 0);
- if (length (tmp))
- tmp_lines := vector ('Accept-Language: ' || tmp[0]);
- }
- pkgs := VAD..VAD_GET_PACKAGES ();
- foreach (any p in pkgs) do
- {
- if (p[1] = 'rdf_mappers')
- connection_set ('mappers_installed', 1);
- }
- nxt:
-
- white_page := 0;
- if (strstr (_resource_, '/resource') = 0)
- white_page := 1;
-
- -- add domain prefix
- _resource_ := replace (_resource_, '/resource_vsp/', '', 1);
- if (_resource_ not like 'nodeID:%')
- {
- -- if rousource use custom domain, else use http://dbpedia.org
- if (_resource_ like '/page/%')
- _resource_ := registry_get('dbp_domain') || _resource_;
- else
- _resource_ := 'http://dbpedia.org' || _resource_;
- }
-
- host := http_request_header (http_request_header (), 'Host');
- project_name := 'dbpedia.org';
-
- -- setup default graph (project_home_page)
- project_home_page := registry_get ('dbp_graph');
-
- if (_resource_ like '%dbpedia.org/void/%')
- project_home_page := registry_get('dbp_graph') || '/void/';
- else if (_resource_ like '%dbpedia.org/meta/%')
- project_home_page := registry_get('dbp_graph') || '/meta';
-
- page_resource_uri := replace (_resource_, '\'', '%27');
- page_resource_uri := replace (page_resource_uri, 'dbpedia.org/page', 'dbpedia.org/resource');
-
- -- HACK properties !!!
-
- if (strstr (page_resource_uri, registry_get('dbp_domain') || '/resource/property') = 0)
- {
- page_resource_uri := replace (page_resource_uri,
- registry_get('dbp_domain') || '/resource/property', registry_get('dbp_domain') || '/property');
- }
-
- -- setup rdf alternative links
-
- rdf_link := 'http://'|| http_request_header (http_request_header (), 'Host')
- ||'/sparql?default-graph-uri=http%3A%2F%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query=DESCRIBE+<' ||
- replace (page_resource_uri, '%', '%25') || '>';
- gen_rdf_link := rdf_link;
- csv_link := rdf_link||'&format=text%2Fcsv';
- cxml_link := rdf_link||'&format=text%2Fcxml';
- if (page_resource_uri like 'http://%/resource/%')
- rdf_link2 := dbp_ldd_get_proxy (replace (page_resource_uri, '/resource/', '/data/'));
- else if (page_resource_uri like 'http://%/class/%')
- rdf_link2 := dbp_ldd_get_proxy (replace (page_resource_uri, '/class/', '/data2/'));
- else if (page_resource_uri like 'http://%/ontology/%')
- rdf_link2 := dbp_ldd_get_proxy (replace (page_resource_uri, '/ontology/', '/data3/'));
- else if (page_resource_uri like 'http://%/property/%')
- rdf_link2 := dbp_ldd_get_proxy (replace (page_resource_uri, '/property/', '/data4/'));
- else if (page_resource_uri like 'http://%/meta/%')
- rdf_link2 := dbp_ldd_get_proxy (replace (page_resource_uri, '/meta/', '/data5/'));
- else
- rdf_link2 := rdf_link;
- if (rdf_link2 not like '%/data%/%')
- {
- rdf_link2 := rdf_link||'&format=rdf';
- rdf_link3 := rdf_link || '&output=application%2Frdf%2Bjson';
- rdf_link4 := rdf_link || '&output=application%2Frdf%2Bjson';
- rdf_link := rdf_link || '&format=n3';
- atom_link := rdf_link || '&output=application%2Fatom%2Bxml';
- jsod := rdf_link || '&output=application%2Fodata%2Bjson';
- ntriples := rdf_link || '&output=text%2Fplain';
- }
- else
- {
- rdf_link := rdf_link2 || '.n3';
- rdf_link3 := rdf_link2 || '.json';
- rdf_link4 := rdf_link2 || '.jrdf';
- atom_link := rdf_link2 || '.atom';
- jsod := rdf_link2 || '.jsod';
- ntriples := rdf_link2 || '.ntriples';
- rdf_link2 := rdf_link2 || '.rdf';
- }
-
- links := sprintf ('Link: <%s>; rel="alternate"; type="application/rdf+xml"; title="Structured Descriptor Document (RDF/XML format)", ', rdf_link2);
- links := links || sprintf ('<%s>; rel="alternate"; type="text/n3"; title="Structured Descriptor Document (N3/Turtle format)", ',rdf_link);
- links := links || sprintf ('<%s>; rel="alternate"; type="application/json"; title="Structured Descriptor Document (RDF/JSON format)", ', rdf_link3);
- links := links || sprintf ('<%s>; rel="alternate"; type="application/atom+xml"; title="OData (Atom+Feed format)", ', atom_link);
- links := links || sprintf ('<%s>; rel="alternate"; type="text/csv"; title="Structured Descriptor Document (CSV format)", ', csv_link);
- if (__proc_exists ('DB.DBA.RDF_TRIPLES_TO_CXML') is not null)
- {
- links := links || sprintf ('<%s>; rel="alternate"; type="text/cxml"; title="Structured Descriptor Document (CXML format)", ', cxml_link);
- }
- links := links || sprintf ('<%s>; rel="alternate"; type="text/plain"; title="Structured Descriptor Document (N-Triples format)", ', ntriples);
-
- links := links || sprintf ('<%s>; rel="alternate"; type="application/microdata+json"; title="Structured Descriptor Document (Microdata/JSON format)", ', gen_rdf_link || sprintf ('&output=%U', 'application/microdata+json') );
- links := links || sprintf ('<%s>; rel="alternate"; type="text/html"; title="Structured Descriptor Document (Microdata/HTML format)", ', gen_rdf_link || sprintf ('&output=%U', 'text/html') );
- links := links || sprintf ('<%s>; rel="alternate"; type="application/ld+json"; title="Structured Descriptor Document (JSON-LD format)", ', gen_rdf_link || sprintf ('&output=%U', 'application/ld+json') );
-
- links := links || sprintf ('<%s>; rel="http://xmlns.com/foaf/0.1/primaryTopic", ', page_resource_uri);
- links := links || sprintf ('<%s>; rev="describedby", ', page_resource_uri);
- links := links || sprintf ('<http://mementoarchive.lanl.gov/dbpedia/timegate/%s>; rel="timegate"\r\n', _resource_);
-
- -- set for white page
- if (lower (host) <> 'dbpedia.org')
- txt := sprintf ('at <a href="http://%s/">%s</a>', host, host);
- else
- txt := sprintf ('at <a href="%s">DBpedia.org</a>', registry_get ('dbp_graph'));
-
- -- check weather to decode the iri's
- if (registry_get ('dbp_decode_iri') = 'on')
- {
- page_resource_uri := split_and_decode (page_resource_uri)[0];
--- _resource_:= split_and_decode (_resource_)[0];
- }
-
- -- create iid's
- _G := DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE (project_home_page);
- _S := DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE (page_resource_uri);
- _P := DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE (page_resource_uri);
- _O := DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE (page_resource_uri);
- odd_position := 0;
-
- -- set up label
- label := dbp_ldd_label (_S, _G, tmp_lines);
- true_label := label;
- if (not length (label))
- label := page_resource_uri;
-
- -- abstract
- _subject := dbp_ldd_subject (_S, _G, tmp_lines);
- -- class type
- iri_type := dbp_ldd_type (_G, _S, iri_uri, lines);
-
- -- set up http
- -- http_header ('Cache-Control: no-cache, must-revalidate\r\nPragma: no-cache\r\n');
- http_header (sprintf ('Expires: %s\r\n', date_rfc1123 (dateadd ('day', 7, now ()))) || links);
-?>
-
-<!-- header -->
-<head profile="http://www.w3.org/1999/xhtml/vocab">
- <title>About: <?vsp http (sprintf ('%s', label)); ?></title>
- <link rel="alternate" type="application/rdf+xml" href="<?=rdf_link2?>" title="Structured Descriptor Document (RDF/XML format)" />
- <link rel="alternate" type="text/rdf+n3" href="<?=rdf_link?>" title="Structured Descriptor Document (N3/Turtle format)" />
- <link rel="alternate" type="application/json+rdf" href="<?=rdf_link4?>" title="Structured Descriptor Document (RDF/JSON format)" />
- <link rel="alternate" type="application/json" href="<?=rdf_link3?>" title="Structured Descriptor Document (RDF/JSON format)" />
- <link rel="alternate" type="application/atom+xml" href="<?= atom_link ?>" title="OData (Atom+Feed format)" />
- <link rel="alternate" type="text/plain" href="<?= ntriples ?>" title="Structured Descriptor Document (N-Triples format)" />
- <link rel="alternate" href="<?V csv_link ?>" type="text/csv" title="Structured Descriptor Document (CSV format)" />
- <?vsp if (__proc_exists ('DB.DBA.RDF_TRIPLES_TO_CXML') is not null) { ?>
- <link rel="alternate" href="<?V cxml_link ?>" type="text/cxml" title="Structured Descriptor Document (CXML format)" />
- <?vsp } ?>
- <link rel="alternate" href="<?V gen_rdf_link || sprintf ('&output=%U', 'application/microdata+json') ?>" type="application/microdata+json" title="Structured Descriptor Document (Microdata/JSON format)" />
- <link rel="alternate" href="<?V gen_rdf_link || sprintf ('&output=%U', 'text/html') ?>" type="text/html" title="Structured Descriptor Document (Microdata/HTML format)" />
- <link rel="alternate" href="<?V gen_rdf_link || sprintf ('&output=%U', 'application/ld+json') ?>" type="application/ld+json" title="Structured Descriptor Document (JSON-LD format)" />
- <link rel="timegate" type="text/html" href="http://mementoarchive.lanl.gov/dbpedia/timegate/<?= _resource_ ?>" title="Time Machine" />
- <link rel="stylesheet" type="text/css" href="/statics/<?=either (white_page, 'style_w.css', 'style.css')?>" />
- <link href="/statics/highlighter.css" type="text/css" rel="stylesheet" charset="utf-8" />
- <link rel="foaf:primarytopic" href="<?= page_resource_uri ?>"/>
- <link rev="describedby" href="<?= page_resource_uri ?>"/>
- <script type="text/javascript" src="/statics/script.js"></script>
-</head>
-<body onload="init();" about="<?V page_resource_uri ?>">
- <div id="header">
- <div id="hd_l">
- <h1 id="title">About: <a href="<?vsp http (dbp_ldd_get_proxy (page_resource_uri)); ?>"><?vsp http (sprintf ('%s', label)); ?></a></h1>
- <div id="homelink">
- <!--?vsp if (white_page = 0) http (txt); ?-->
- </div>
- <div class="page-resource-uri">
- An Entity of Type : <a href="<?= iri_uri ?>"><?= iri_type ?></a>,
- from Named Graph : <a href="<?V project_home_page ?>"><?V project_home_page ?></a>,
- within Data Space : <a href="http://<?V host ?>"><?V host ?></a>
- </div>
- </div> <!-- hd_l -->
- <div id="hd_r">
- <a href="<?=registry_get('dbp_imprint') ?>" title="About DBpedia">
- <img src="/statics/dbpedia_logo.png" height="64" alt="About DBpedia"/>
- </a>
- </div> <!-- hd_r -->
- </div> <!-- header -->
- <div id="content">
-
- <p><?vsp http (sprintf ('%s', _subject)); ?></p>
-<!-- proptable -->
- <table class="description"><tr><th>Property</th><th>Value</th></tr>
-
-<?vsp
- declare sas, printed, vis int;
- declare all_lang any;
- all_lang := vector ('*', 1.0);
-
- -- check resource domain and graph in order to print owl:sameAs
- if (page_resource_uri <> dbp_ldd_get_proxy (page_resource_uri) and registry_get ('dbp_graph') = registry_get('dbp_domain'))
- sas := 1;
- else
- sas := 0;
-
- --select predicates for resource
- for (select distinct P as PRED from DB.DBA.RDF_QUAD where S = _S and G = _G order by id_to_iri (P)) do
- {
- dbp_ldd_http_print_l (id_to_iri (PRED), odd_position);
- printed := 0;
- -- select values for each predicate
- for (select top 300 O as OBJECT from DB.DBA.RDF_QUAD where S = _S and G = _G and P = PRED) do
- {
- if (id_to_iri (PRED) in (registry_get('dbp_domain') || '/property/redirect', registry_get('dbp_domain') || '/ontology/wikiPageRedirects') and isiri_id (OBJECT))
- {
- http_rewrite ();
- http_status_set (301);
- http_header (sprintf ('Location: %s\n', dbp_ldd_get_proxy (id_to_iri (OBJECT))));
- return;
- }
- vis := dbp_ldd_http_print_r (OBJECT, 0, true_label, PRED, 1, langs);
- printed := printed + vis;
- }
- if (not printed)
- {
- for (select top 100 O as OBJECT from DB.DBA.RDF_QUAD where S = _S and G = _G and P = PRED) do
- dbp_ldd_http_print_r (OBJECT, 0, true_label, PRED, 1, all_lang);
- }
-
- if (sas and PRED = rdf_sas_iri ())
- {
- dbp_ldd_http_print_r (iri_to_id (page_resource_uri), 1, true_label, PRED, 1, langs);
- sas := 0;
- }
-
- http ('</ul></td></tr>');
- }
- -- print owl:sameAs
- if (sas)
- {
- dbp_ldd_http_print_l (id_to_iri (rdf_sas_iri ()), odd_position);
- dbp_ldd_http_print_r (iri_to_id (page_resource_uri), 1, null, rdf_sas_iri (), 1, langs);
- http ('</ul></td></tr>');
- }
- -- check for reverse triples
- for (select distinct P as PRED from DB.DBA.RDF_QUAD where O = _O and G = _G order by id_to_iri (P)) do
- {
- dbp_ldd_http_print_l (id_to_iri (PRED), odd_position, 1);
- printed := 0;
- for (select top 300 S as OBJECT from DB.DBA.RDF_QUAD where O = _O and G = _G and P = PRED) do
- {
- vis := dbp_ldd_http_print_r (OBJECT, 0, true_label, PRED, 0, langs);
- printed := printed + vis;
- }
- if (not printed)
- {
- for (select top 100 S as OBJECT from DB.DBA.RDF_QUAD where O = _O and G = _G and P = PRED) do
- dbp_ldd_http_print_r (OBJECT, 0, true_label, PRED, 0, all_lang);
- }
- http ('</ul></td></tr>');
- }
-
- if (odd_position = 0)
- {
- http_request_status ('HTTP/1.1 404 Not found');
- http ('<tr><td colspan="2"><p>No further information is available. (The requested entity is unknown)</p></td></tr>');
- }
-?>
- </table>
- </div> <!-- #content -->
-<!-- footer -->
- <div id="footer">
- <div id="ft_t">
- Browse using:
- <a href="http://linkeddata.uriburner.com/ode/?uri=<?vsp http_url (page_resource_uri); ?>">OpenLink Data Explorer</a> |
- <a href="http://dataviewer.zitgist.com/?uri=<?vsp http_url (page_resource_uri); ?>">Zitgist Data Viewer</a> |
- <a href="http://beckr.org/marbles?uri=<?vsp http_url (page_resource_uri); ?>">Marbles</a> |
- <a href="http://www4.wiwiss.fu-berlin.de/rdf_browser/?browse_uri=<?vsp http_url (page_resource_uri); ?>">DISCO</a> |
- <a href="http://dig.csail.mit.edu/2005/ajar/release/tabulator/0.8/tab.html?uri=<?vsp http_url (page_resource_uri); ?>" >Tabulator</a>
- Raw Data in:
- <?vsp if (__proc_exists ('DB.DBA.RDF_TRIPLES_TO_CXML') is not null) { ?>
- <a href="<?= cxml_link ?>">CXML</a> |
- <?vsp } ?>
- <a href="<?= csv_link ?>">CSV</a> | RDF (
- <a href="<?= ntriples ?>">N-Triples</a>
- <a href="<?= rdf_link ?>">N3/Turtle</a>
- <a href="<?= rdf_link3 ?>">JSON</a>
- <a href="<?= rdf_link2 ?>">XML</a> ) | OData (
- <a href="<?= atom_link ?>">Atom</a>
- <a href="<?= jsod ?>">JSON</a> )| Microdata (
- <a href="<?= gen_rdf_link || sprintf ('&output=%U', 'application/microdata+json') ?>">JSON</a>
- <a href="<?= gen_rdf_link || sprintf ('&output=%U', 'text/html') ?>">HTML</a>) |
- <a href="<?= gen_rdf_link || sprintf ('&output=%U', 'application/ld+json')?>">JSON-LD</a>
-
- <a href="<?=registry_get('dbp_imprint') ?>">About</a>
- </div> <!-- #ft_t -->
- <div id="ft_b">
- <a href="http://virtuoso.openlinksw.com" title="OpenLink Virtuoso"><img class="powered_by" src="/statics/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/></a>
- <a href="http://linkeddata.org/"><img alt="This material is Open Knowledge" src="/statics/LoDLogo.gif"/></a>
- <a href="<?= project_home_page ?>/sparql"><img alt="W3C Semantic Web Technology" src="/statics/sw-sparql-blue.png"/></a>
- <a href="http://www.opendefinition.org/"><img alt="This material is Open Knowledge" src="/statics/od_80x15_red_green.png"/></a>
- <span about=""
- resource="http://www.w3.org/TR/rdfa-syntax"
- rel="dc:conformsTo" xmlns:dc="http://purl.org/dc/terms/">
- <a href="http://validator.w3.org/check?uri=referer"><img
- src="http://www.w3.org/Icons/valid-xhtml-rdfa"
- alt="Valid XHTML + RDFa" height="27" /></a>
- </span>
- </div> <!-- #ft_b -->
- <div id="ft_ccbysa">
- <?vsp dbp_wikipedia_cc_by_sa(_S, _G); ?>
- </div> <!-- #ft_ccbysa -->
- </div> <!-- #footer -->
- <!--script type="text/javascript">
- Place any Javascript code e.g. Google Analytics scripts
- </script-->
- <?vsp if (isstring (registry_get ('dbpedia_urchinTracker'))) { ?>
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '<?V registry_get ('dbpedia_urchinTracker') ?>']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
- <?vsp } ?>
- </body>
-</html>
-
diff --git a/binsrc/dbpedia/vsp/description_white.vsp b/binsrc/dbpedia/vsp/description_white.vsp
deleted file mode 100644
index 02b0e58..0000000
--- a/binsrc/dbpedia/vsp/description_white.vsp
+++ /dev/null
@@ -1,175 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<?vsp
---
--- $Id: description_white.vsp,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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
---
---
-
- declare _G, _S, _P, _O, odd_position any;
- declare _resource_, project_name, project_home_page any;
- declare page_resource_uri, rdf_link, label, _subject any;
- declare req_url_esc any;
-
- -- INIT VALLUES
-
- _resource_ := get_keyword ('res', params, '');
- _resource_ := replace (_resource_, '/resource_vsp/', '', 1);
- _resource_ := 'http://dbpedia.openlinksw.com' || _resource_;
- req_url_esc := string_output();
-
- project_name := 'dbpedia.openlinksw.com';
- project_home_page := 'http://dbpedia.openlinksw.com/wikicompany';
- page_resource_uri := _resource_;
- http_url (sprintf ('<%S>', page_resource_uri), 0, req_url_esc);
- req_url_esc := string_output_string (req_url_esc);
- rdf_link := 'http://dbpedia.org:8890/sparql?default-graph-uri=http%3A%2F%2Fdbpedia.org&query=DESCRIBE+' || req_url_esc;
-
- dbg_obj_print (page_resource_uri);
-
--- HACK properties !!!
-
- if (strstr (page_resource_uri, 'http://dbpedia.openlinksw.com/property') = 0)
- {
- page_resource_uri := replace (page_resource_uri,
- 'http://dbpedia.openlinksw.com/property', 'http://dbpedia.org/property');
- project_home_page := 'http://dbpedia.org';
- }
-
--- HACK resource !!!
-
- if (strstr (page_resource_uri, 'http://dbpedia.openlinksw.com/resource') = 0)
- {
- page_resource_uri := replace (page_resource_uri,
- 'http://dbpedia.openlinksw.com/resource', 'http://dbpedia.org/resource');
- project_home_page := 'http://dbpedia.org';
- }
-
-
- _G := DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE (project_home_page);
- _S := DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE (page_resource_uri);
- _P := DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE (page_resource_uri);
- _O := DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE (page_resource_uri);
- odd_position := 0;
-
- set http_charset='utf-8';
- set isolation = 'serializable';
- http_header ('Cache-Control: no-cache, must-revalidate\r\nPragma: no-cache\r\n');
- http_header (sprintf ('Expires: %s\r\n', date_rfc1123 (dateadd ('day', 1, now ()))));
-
-
- if (exists (select 1 from DB.DBA.RDF_QUAD where S = _S and G = _G and P = DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE ('http://www.w3.org/2000/01/rdf-schema#label')))
- select O into label from DB.DBA.RDF_QUAD where S = _S and G = _G and
- P = DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE ('http://www.w3.org/2000/01/rdf-schema#label');
- else
- label := '';
-
- if (__tag (label) = 246) label := DB.DBA.RDF_SQLVAL_OF_OBJ (label);
-
- dbg_obj_print (' page_resource_uri www ', page_resource_uri, ' ', project_home_page);
-?>
-
-<!-- header -->
-<head>
- <title><?=_resource_?> | <?=project_name?></title>
- <link rel="alternate" type="application/rdf+xml" href="<?=rdf_link?>" title="RDF" />
- <link rel="stylesheet" type="text/css" href="http://dbpedia.org/statics/style_w.css" />
- <link href="http://dbpedia.org/statics/highlighter.css" type="text/css" rel="stylesheet" charset="utf-8">
- <script type="text/javascript" src="http://dbpedia.org/statics/script.js"></script>
-</head>
- <body onLoad="init();">
- <div id="header">
- <div>
- <h1 id="title"><?=label?></h1>
- <div id="homelink"></div>
- </div>
- <div class="page-resource-uri">
- <label class="ds_uri">Data Source Name (URI): </label>
- <a title="A Data Source Name, Entity ID, or URI that exposes the location of the Description of this Resource" href="<?=replace (page_resource_uri, 'http://dbpedia.org', 'http://dbpedia.org:8890')?>"><?=page_resource_uri?></a>
- </div>
- <div id="rdficon"><a href="<?=rdf_link?>" title="RDF data">
- <img src="http://dbpedia.org/statics/sw-rdf-gray.png" alt="[RDF Data]"></a>
- </div>
- </div>
-
-<!-- proptable -->
-<table class="description"><tr><th width="25%">Property</th><th>Value</th></tr>
-
-<?vsp
-
- for (select distinct P as PRED from DB.DBA.RDF_QUAD where S = _S and G = _G order by id_to_iri (P)) do
- {
- dbp_ldd_http_print_l_white (id_to_iri (PRED), odd_position);
- for (select O as OBJECT from DB.DBA.RDF_QUAD where S = _S and G = _G and P = PRED) do
- dbp_ldd_http_print_r_white (OBJECT);
-
- http ('</ul></td></tr>');
- }
-
- for (select distinct P as PRED from DB.DBA.RDF_QUAD where O = _O and G = _G order by id_to_iri (P)) do
- {
- dbp_ldd_http_print_l_white (id_to_iri (PRED), odd_position, 1);
- for (select S as OBJECT from DB.DBA.RDF_QUAD where O = _O and G = _G and P = PRED) do
- dbp_ldd_http_print_r_white (OBJECT);
- http ('</ul></td></tr>');
- }
-
- if (odd_position = 0)
- {
- http ('<tr><td colspan="2"><p>No further information is available.</p></td></tr>');
- }
-
-?>
- </table>
-
-<!-- footer -->
-<div id="footer">
- This page shows information obtained from the SPARQL endpoint at
- <a class="sparql-uri" href="http://dbpedia.org/sparql"> http://dbpedia.org/sparql </a> or
- <a class="sparql-uri" href="http://dbpedia.org:8890/sparql">http://dbpedia.org:8890/sparql</a>.<br>
-
- <a href="http://linkeddata.org/"><img style="vertical-align: -3px;" alt="This material is Open Knowledge" src="http://dbpedia.org/statics/LoDLogo.gif" border="0"></a>
- Browse using:
- <a href="http://demo.openlinksw.com/rdfbrowser2/?uri=<?vsp http_url (page_resource_uri); ?>">OpenLink Data Explorer</a> |
- <a href="http://dataviewer.zitgist.com/?uri=<?vsp http_url (page_resource_uri); ?>">Zitgist Data Viewer</a> |
- <a href="http://beckr.org/marbles?uri=<?vsp http_url (page_resource_uri); ?>">Marbles</a> |
- <a href="http://www4.wiwiss.fu-berlin.de/rdf_browser/?browse_uri=<?vsp http_url (page_resource_uri); ?>">DISCO</a> |
- <a href="http://dig.csail.mit.edu/2005/ajar/release/tabulator/0.8/tab.html?uri=<?vsp http_url (page_resource_uri); ?>">Tabulator</a>
- Raw Data in:
- <a href="<?=rdf_link || '&output=n3'?>">N3</a> |
- <a href="<?=rdf_link || '&output=xml'?>">RDF/XML</a>
- <a href="http://wiki.dbpedia.org/Imprint">Contact</a>
- <a href="http://www.opendefinition.org/"><img style="vertical-align: -3px;" alt="This material is Open Knowledge" src="http://dbpedia.org/statics/od_80x15_red_green.png" border="0"></a>
- </div>
-
- <div id="rdficon">
- <a href="http://virtuoso.openlinksw.com" title="OpenLink Virtuoso"><img class="powered_by" src="http://dbpedia.org/statics/virt_power_no_border.png" alt="Powered by OpenLink Virtuoso"/></a>
- </div>
-
- <div>
- </div>
-
- </td></tr>
- </div>
-<!-- footer -->
-
-
- </body>
-</html>
diff --git a/binsrc/dbpedia/vsp/images/od_80x15_red_green.png b/binsrc/dbpedia/vsp/images/od_80x15_red_green.png
deleted file mode 100644
index 8e1ea5c..0000000
Binary files a/binsrc/dbpedia/vsp/images/od_80x15_red_green.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/images/rdf-icon.gif b/binsrc/dbpedia/vsp/images/rdf-icon.gif
deleted file mode 100644
index 0291161..0000000
Binary files a/binsrc/dbpedia/vsp/images/rdf-icon.gif and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/images/sw-cube.png b/binsrc/dbpedia/vsp/images/sw-cube.png
deleted file mode 100644
index e27957c..0000000
Binary files a/binsrc/dbpedia/vsp/images/sw-cube.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/images/sw-sparql-blue.png b/binsrc/dbpedia/vsp/images/sw-sparql-blue.png
deleted file mode 100644
index aac6421..0000000
Binary files a/binsrc/dbpedia/vsp/images/sw-sparql-blue.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/images/virt_power_no_border.png b/binsrc/dbpedia/vsp/images/virt_power_no_border.png
deleted file mode 100644
index 93fcb80..0000000
Binary files a/binsrc/dbpedia/vsp/images/virt_power_no_border.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/LoDLogo.gif b/binsrc/dbpedia/vsp/statics/LoDLogo.gif
deleted file mode 100755
index 6b91cc0..0000000
Binary files a/binsrc/dbpedia/vsp/statics/LoDLogo.gif and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/dbpedia_logo.png b/binsrc/dbpedia/vsp/statics/dbpedia_logo.png
deleted file mode 100644
index 1958fb6..0000000
Binary files a/binsrc/dbpedia/vsp/statics/dbpedia_logo.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/highlighter.css b/binsrc/dbpedia/vsp/statics/highlighter.css
deleted file mode 100644
index 8ce358f..0000000
--- a/binsrc/dbpedia/vsp/statics/highlighter.css
+++ /dev/null
@@ -1,116 +0,0 @@
-/* See license.txt for terms of usage */
-
-.firebugHighlight {
- z-index: 2147483647;
- position: absolute;
- background-color: #3875d7;
-}
-
-.firebugLayoutBoxParent {
- z-index: 2147483647;
- position: absolute;
- border-right: 1px dashed #BBBBBB;
- border-bottom: 1px dashed #BBBBBB;
-}
-
-.firebugRulerH {
- position: absolute;
- top: -15px;
- left: 0;
- width: 100%;
- height: 14px;
- background: url(chrome://firebug/skin/rulerH.png) repeat-x;
- border-top: 1px solid #BBBBBB;
- border-right: 1px dashed #BBBBBB;
- border-bottom: 1px solid #000000;
-}
-
-.firebugRulerV {
- position: absolute;
- top: 0;
- left: -15px;
- width: 14px;
- height: 100%;
- background: url(chrome://firebug/skin/rulerV.png) repeat-y;
- border-left: 1px solid #BBBBBB;
- border-right: 1px solid #000000;
- border-bottom: 1px dashed #BBBBBB;
-}
-
-.overflowRulerX > .firebugRulerV {
- left: 0;
-}
-
-.overflowRulerY > .firebugRulerH {
- top: 0;
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-.firebugLayoutBoxOffset {
- z-index: 2147483647;
- position: absolute;
- opacity: 0.8;
-}
-
-.firebugLayoutBoxMargin {
- background-color: #EDFF64;
-}
-
-.firebugLayoutBoxBorder {
- background-color: #666666;
-}
-
-.firebugLayoutBoxPadding {
- background-color: SlateBlue;
-}
-
-.firebugLayoutBoxContent {
- background-color: SkyBlue;
-}
-
-/*.firebugHighlightGroup .firebugLayoutBox {
- background-color: transparent;
-}
-
-.firebugHighlightBox {
- background-color: Blue !important;
-}*/
-
-.firebugLayoutLine {
- z-index: 2147483647;
- background-color: #000000;
- opacity: 0.4;
-}
-
-.firebugLayoutLineLeft,
-.firebugLayoutLineRight {
- position: fixed;
- width: 1px;
- height: 100%;
-}
-
-.firebugLayoutLineTop,
-.firebugLayoutLineBottom {
- position: absolute;
- width: 100%;
- height: 1px;
-}
-
-.firebugLayoutLineTop {
- margin-top: -1px;
- border-top: 1px solid #999999;
-}
-
-.firebugLayoutLineRight {
- border-right: 1px solid #999999;
-}
-
-.firebugLayoutLineBottom {
- border-bottom: 1px solid #999999;
-}
-
-.firebugLayoutLineLeft {
- margin-left: -1px;
- border-left: 1px solid #999999;
-}
diff --git a/binsrc/dbpedia/vsp/statics/od_80x15_red_green.png b/binsrc/dbpedia/vsp/statics/od_80x15_red_green.png
deleted file mode 100644
index 8e1ea5c..0000000
Binary files a/binsrc/dbpedia/vsp/statics/od_80x15_red_green.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/rdf-icon.gif b/binsrc/dbpedia/vsp/statics/rdf-icon.gif
deleted file mode 100644
index 0291161..0000000
Binary files a/binsrc/dbpedia/vsp/statics/rdf-icon.gif and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/rdf_w3c.png b/binsrc/dbpedia/vsp/statics/rdf_w3c.png
deleted file mode 100644
index ab88ea8..0000000
Binary files a/binsrc/dbpedia/vsp/statics/rdf_w3c.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/rdf_w3c.svg b/binsrc/dbpedia/vsp/statics/rdf_w3c.svg
deleted file mode 100644
index 45d107a..0000000
--- a/binsrc/dbpedia/vsp/statics/rdf_w3c.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" version="1.1" overflow="visible" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 484.862 525.335">
- <g shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality">
- <rect y="40.473" width="484.862" height="484.862"/>
- <rect y="50.808" x="9.477" fill="#FFFFFF" width="464.192" height="329.847"/>
- <path d="M383.476,267.343c-2.544-1.346-5.14-2.493-7.743-3.516l1.863-0.15c0,0-16.608-7.354-18.057-60.722 c-1.438-53.372,15.828-62.478,15.828-62.478l-2.48,0.109c13.045-6.69,24.265-17.267,31.669-31.216 c19.295-36.291,5.488-81.362-30.81-100.657C337.436-10.563,292.374,3.207,273.09,39.53c-7.927,14.899-10.178,31.273-7.677,46.733 l-0.851-1.306c0,0,4.373,19.365-41.032,47.55c-45.397,28.2-65.877,14.159-65.877,14.159l1.302,1.925 c-1.298-0.803-2.544-1.624-3.901-2.333c-36.306-19.294-81.38-5.509-100.667,30.804c-19.281,36.309-5.489,81.365,30.813,100.668 c27.064,14.364,58.974,10.36,81.461-7.655l-0.487,0.946c0,0,16.531-13.599,64.16,11.973c37.601,20.178,43.184,39.956,43.899,47.383 c-0.983,27.57,13.388,54.618,39.389,68.433c36.301,19.299,81.374,5.498,100.657-30.804 C433.571,331.704,419.786,286.624,383.476,267.343z M299.542,277.128c-6.018,2.129-23.203,4.487-59.389-14.921 c-39.187-21.04-45.005-38.615-45.855-43.891c0.557-6.401,0.202-12.791-0.891-19.02l0.239,0.359c0,0-3.189-17.096,41.65-44.943 c40.133-24.908,58.376-19.955,61.771-18.653c2.185,1.485,4.45,2.867,6.825,4.131c4.518,2.398,9.174,4.283,13.888,5.672 c5.52,5.257,15.678,20.178,16.733,59.413c1.078,39.535-10.533,54.779-16.865,60.168C311.122,268.399,305.022,272.34,299.542,277.128 z" fill="#0C479C"/>
- <g>
- <path d="M294.631,32.4c-21.659,23.694-22.118,58.544-1.246,78.264c-10.316-9.935-10.093-30.608,0.33-50.387 c1.342-1.774,5.224-5.961,10.898-4.055c0.569,0.194,0.951,0.245,1.17,0.213c1.284,0.278,2.601,0.439,3.96,0.381 c8.622-0.393,15.288-7.684,14.898-16.307c-0.175-3.868-1.78-7.292-4.26-9.92c20.007-13.107,42.968-14.61,52.375-6.016l0.359,0.025 C351.625,4.97,316.493,8.476,294.631,32.4z" fill="#FFFFFF"/>
- </g>
- <g>
- <path d="M76.205,251.381c-0.184-0.19-0.371-0.406-0.562-0.598c0.121,0.125,0.235,0.279,0.378,0.407L76.205,251.381z " fill="#FFFFFF"/>
- <path d="M76.894,172.52c-21.663,23.694-22.114,58.541-1.251,78.264c-10.313-9.935-10.092-30.608,0.331-50.387 c1.345-1.778,5.231-5.961,10.906-4.055c0.565,0.195,0.946,0.242,1.167,0.212c1.283,0.275,2.603,0.44,3.959,0.377 c8.623-0.392,15.288-7.684,14.899-16.303c-0.179-3.867-1.782-7.296-4.252-9.92c19.995-13.107,42.959-14.617,52.366-6.021 l0.355,0.03C133.891,145.086,98.751,148.591,76.894,172.52z" fill="#FFFFFF"/>
- </g>
- <g>
- <path d="M306.701,370.015c-0.187-0.191-0.374-0.404-0.564-0.594c0.117,0.125,0.237,0.279,0.378,0.402 L306.701,370.015z" fill="#FFFFFF"/>
- <path d="M307.39,291.145c-21.666,23.704-22.118,58.553-1.254,78.276c-10.317-9.935-10.09-30.611,0.331-50.388 c1.344-1.781,5.227-5.96,10.906-4.053c0.568,0.189,0.941,0.242,1.166,0.212c1.282,0.277,2.605,0.44,3.963,0.381 c8.617-0.396,15.28-7.692,14.891-16.32c-0.176-3.864-1.781-7.288-4.252-9.917c20.002-13.103,42.959-14.61,52.37-6.016l0.355,0.029 C364.383,263.718,329.241,267.226,307.39,291.145z" fill="#FFFFFF"/>
- </g>
- <g>
- <path d="M132.259,497.639h-27.878l-25.326-30h-8.171v30H48.197v-81.875h36.565c5.046,0,9.441,0.284,13.186,0.853 s7.203,1.751,10.377,3.548c3.256,1.871,5.84,4.245,7.753,7.124c1.912,2.879,2.869,6.537,2.869,10.975 c0,6.271-1.567,11.359-4.7,15.265c-3.133,3.906-7.324,7.014-12.572,9.324L132.259,497.639z M95.509,440.84 c0-2.054-0.438-3.823-1.314-5.31c-0.876-1.485-2.332-2.632-4.368-3.438c-1.426-0.55-3.015-0.898-4.767-1.045 s-3.931-0.221-6.538-0.221h-7.638v22.063h6.538c3.178,0,5.876-0.174,8.097-0.522c2.22-0.348,4.104-1.091,5.651-2.229 c1.467-1.026,2.557-2.255,3.27-3.686S95.509,443.15,95.509,440.84z" fill="#FFFFFF"/>
- <path d="M289.092,456.783c0,7.625-1.854,14.453-5.56,20.483s-8.39,10.658-14.051,13.884 c-4.725,2.75-9.866,4.519-15.425,5.307c-5.56,0.788-11.476,1.182-17.747,1.182h-28.468v-81.875h28.224 c6.394,0,12.38,0.367,17.96,1.1c5.58,0.733,10.813,2.512,15.701,5.334c5.986,3.446,10.71,8.093,14.172,13.939 S289.092,448.865,289.092,456.783z M265.655,456.646c0-5.389-1.03-9.999-3.09-13.83c-2.061-3.83-5.231-6.827-9.515-8.991 c-3.101-1.539-6.354-2.383-9.76-2.529s-7.476-0.22-12.207-0.22h-0.429v51.25h0.429c5.139,0,9.473-0.082,13.002-0.247 c3.528-0.165,6.884-1.146,10.065-2.942c3.753-2.126,6.608-5.059,8.566-8.798S265.655,462.035,265.655,456.646z" fill="#FFFFFF"/>
- <path d="M432.269,431.389h-38.188v15.438h35.125v15.625h-35.125v35.188h-22.688v-81.875h60.875V431.389z" fill="#FFFFFF"/>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/binsrc/dbpedia/vsp/statics/rdf_w3c_300.png b/binsrc/dbpedia/vsp/statics/rdf_w3c_300.png
deleted file mode 100644
index 1d100fb..0000000
Binary files a/binsrc/dbpedia/vsp/statics/rdf_w3c_300.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/rdf_w3c_500.png b/binsrc/dbpedia/vsp/statics/rdf_w3c_500.png
deleted file mode 100644
index b0ccb4a..0000000
Binary files a/binsrc/dbpedia/vsp/statics/rdf_w3c_500.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/rdf_w3c_742.png b/binsrc/dbpedia/vsp/statics/rdf_w3c_742.png
deleted file mode 100644
index 53b7d20..0000000
Binary files a/binsrc/dbpedia/vsp/statics/rdf_w3c_742.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/rdf_w3c_742_trans.png b/binsrc/dbpedia/vsp/statics/rdf_w3c_742_trans.png
deleted file mode 100644
index b3fd917..0000000
Binary files a/binsrc/dbpedia/vsp/statics/rdf_w3c_742_trans.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/script.js b/binsrc/dbpedia/vsp/statics/script.js
deleted file mode 100644
index 94656af..0000000
--- a/binsrc/dbpedia/vsp/statics/script.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $Id: script.js,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-function init() {
- init_long_literals();
-}
-
-var long_literal_counter = 0;
-var long_literal_spans = {};
-var long_literal_texts = {};
-function init_long_literals() {
- var spans = document.getElementsByTagName('span');
- for (i = 0; i < spans.length; i++) {
- if (spans[i].className != 'literal') continue;
- var span = spans[i];
- var textNode = span.firstChild;
- var text = textNode.data;
- if (!text || text.length < 300) continue;
- var match = text.match(/([^\0]{150}[^\0]*? )([^\0]*)/);
- if (!match) continue;
- span.insertBefore(document.createTextNode(match[1] + ' ... '), span.firstChild);
- span.removeChild(textNode);
- var link = document.createElement('a');
- link.href = 'javascript:expand(' + long_literal_counter + ');';
- link.appendChild(document.createTextNode('\u00BBmore\u00BB'));
- link.className = 'expander';
- span.insertBefore(link, span.firstChild.nextSibling);
- long_literal_spans[long_literal_counter] = span;
- long_literal_texts[long_literal_counter] = textNode;
- long_literal_counter = long_literal_counter + 1;
- }
-}
-
-function expand(i) {
- var span = long_literal_spans[i];
- span.removeChild(span.firstChild);
- span.removeChild(span.firstChild);
- span.insertBefore(long_literal_texts[i], span.firstChild);
-}
diff --git a/binsrc/dbpedia/vsp/statics/style.css b/binsrc/dbpedia/vsp/statics/style.css
deleted file mode 100644
index 94cf931..0000000
--- a/binsrc/dbpedia/vsp/statics/style.css
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * $Id: style.css,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-html { margin: 0; padding: 0; }
-body { font-family: sans-serif; font-size: 80%; margin: 0; padding: 1.2em 2em; background: #cec; }
-
-#header { width: 100%; float: left; clear: left; border-bottom: 2px solid #696; margin: 0 0 1.2em; padding: 0 0 0.3em; }
-#hd_l { width: 80%; float: left;}
-#hd_r {float: right; clear: right;}
-
-#homelink { display: inline; }
-#homelink, #homelink a { color: #666; }
-#homelink a { font-weight: bold; text-decoration: none; }
-#homelink a:hover { color: red; text-decoration: underline; }
-
-h1 { display: inline; font-weight: normal; font-size: 200%; margin: 0; text-align: left; }
-h2 { font-weight: normal; font-size: 124%; margin: 1.2em 0 0.2em; }
-h1, h2 { color: #810; }
-
-.page-resource-uri { font-size: 124%; margin: 0.2em 0; }
-/*.page-resource-uri a { color: black; text-decoration: none; }*/
-.page-resource-uri a:hover { color: red; text-decoration: underline; }
-
-a.sparql-uri { color: black; text-decoration: none; }
-a.sparql-uri:hover { color: red; text-decoration: underline; }
-
-img { border: none; }
-
-#content {width: 100%; float: left; clear: left;}
-
-#footer { width: 100%;float: left; clear: left;border-top: 2px solid #696; margin: 1.2em 0 0; padding: 0.3em; background-color: #fff;}
-#ft_r { float: right; clear: right;}
-#ft_t { text-align: center; }
-#ft_b { text-align: center; margin-top: 0.7ex }
-#ft_ccbysa { font-size: 8pt; text-align: center; margin-top: 0.7ex }
-
-table.description { border-collapse: collapse; clear: left; font-size: 100%; margin: 0 0 1em; width: 100%; }
-table.description th { background: white; text-align: left; }
-table.description td, table.description th { line-height: 1.2em; padding: 0.2em 0.4em; vertical-align: top; }
-table.description ul { margin: 0; padding-left: 0em; }
-table.description li { list-style-type: square; }
-
-.uri { white-space: nowrap; }
-.uri a, a.uri { text-decoration: none; }
-.unbound { color: #888; }
-
-table.description a small { font-size: 100%; color: #55a; }
-table.description small { font-size: 100%; color: #666; }
-table.description .property { white-space: nowrap; }
-table.description .odd td { background: #d4f6d4; }
-table.description .even td { background: #f0fcf0; }
-
-.image { background: white; float: left; margin: 0 1.5em 1.5em 0; padding: 2px; }
-
-a.expander { text-decoration: none; }
diff --git a/binsrc/dbpedia/vsp/statics/style_w.css b/binsrc/dbpedia/vsp/statics/style_w.css
deleted file mode 100644
index 100484b..0000000
--- a/binsrc/dbpedia/vsp/statics/style_w.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * $Id: style_w.css,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-html { margin: 0; padding: 0; }
-body {
- font-family: gill sans, sans-serif;
- font-size: 80%;
- margin: 0;
- padding: 1.2em 2em;}
-#header { width: 100%; float: left; clear: left; border-bottom: 2px solid #696; margin: 0 0 1.2em; padding: 0 0 0.3em; }
-#hd_l { width: 80%; float: left;}
-#hd_r {float: right; clear: right;}
-#footer { border-top: 2px solid #696; color: #666; margin: 1.2em 0 0; padding: 0.3em 0 0; }
-#homelink { display: inline; }
-#homelink, #homelink a { color: #666; }
-#homelink a { font-weight: bold; text-decoration: none; }
-#homelink a:hover { color: red; text-decoration: underline; }
-h1 { display: inline; font-weight: bold; font-size: 200%; margin: 0; text-align: left; }
-h2 { font-weight: normal; font-size: 124%; margin: 1.2em 0 0.2em; }
-.page-resource-uri { font-size: 124%; margin: 0.2em 0; font-style: italic; }
-.page-resource-uri a { color: black; text-decoration: none; }
-.page-resource-uri a:hover { color: red; text-decoration: underline; }
-.page-resource-uri label { font-size: smaller; font-style: normal;}
-a.sparql-uri { color: black; text-decoration: none; }
-a.sparql-uri:hover { color: red; text-decoration: underline; }
-img { border: none; }
-table.description { border-collapse: collapse; clear: left; font-size: 100%; margin: 0 0 1em; width: 100%; }
-table.description th { text-align: left; }
-table.description td, table.description th { line-height: 1.2em; padding: 0.2em 0.4em; vertical-align: top; }
-table.description ul { margin: 0; padding-left: 0em; }
-table.description li { list-style-type: square; }
-.uri { white-space: nowrap; }
-.uri a, a.uri { text-decoration: none; }
-a.uri:hover { text-decoration: underline }
-.unbound { color: #888; }
-table.description a small { font-size: 100% }
-table.description small { font-size: 100%; }
-table.description .property { white-space: nowrap; }
-h1, h2 { color: #224; }
-table.description .odd td { }
-table.description .even td { }
-.image { background: white; float: left; margin: 0 1.5em 1.5em 0; padding: 2px; }
-a.expander { text-decoration: none; }
-a.rdf_source { text-decoration: none; color: #666;}
-a.rdf_source img { vertical-align: middle;margin-right: 5px;}
-#rdficon:hover { background-color: #eef; border: 1px solid #666;}
-#ft_l { float: left;}
-#ft_r { float: right;}
-#ft_l label { margin-right: 5px;}
diff --git a/binsrc/dbpedia/vsp/statics/sw-cube.png b/binsrc/dbpedia/vsp/statics/sw-cube.png
deleted file mode 100644
index e27957c..0000000
Binary files a/binsrc/dbpedia/vsp/statics/sw-cube.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/sw-rdf-gray.png b/binsrc/dbpedia/vsp/statics/sw-rdf-gray.png
deleted file mode 100644
index ba550cf..0000000
Binary files a/binsrc/dbpedia/vsp/statics/sw-rdf-gray.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/sw-sparql-blue.png b/binsrc/dbpedia/vsp/statics/sw-sparql-blue.png
deleted file mode 100644
index aac6421..0000000
Binary files a/binsrc/dbpedia/vsp/statics/sw-sparql-blue.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/sw-vert-v.png b/binsrc/dbpedia/vsp/statics/sw-vert-v.png
deleted file mode 100644
index 763e156..0000000
Binary files a/binsrc/dbpedia/vsp/statics/sw-vert-v.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/sw-vert-v.svg b/binsrc/dbpedia/vsp/statics/sw-vert-v.svg
deleted file mode 100644
index 50d0e9d..0000000
--- a/binsrc/dbpedia/vsp/statics/sw-vert-v.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" version="1.1" overflow="visible" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 221.025 265.366">
- <title>Semantic Web symbol with text</title>
- <desc>The Semantic Web symbol, ie the drawing of a cube whose top part is slightly peeled off, with the text 'Semantic Web' underneath</desc>
- <metadata>
- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:xhtml="http://www.w3.org/1999/xhtml/vocab#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <cc:Work rdf:about="">
- <dc:title>Semantic Web symbol with text</dc:title>
- <dc:format>image/svg+xml</dc:format>
- <rdfs:seeAlso rdf:resource="http://www.w3.org/2007/10/sw-logos.html"/>
- <dc:date>2007-11-01</dc:date>
- <xhtml:license rdf:resource="http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231"/>
- <cc:morePermissions rdf:resource="http://www.w3.org/2007/10/sw-logos.html#LogoWithoutW3C"/>
- <cc:attributionURL rdf:reource="http://www.w3.org/2001/sw/"/>
- <dc:description>The Semantic Web symbol, ie the drawing of a cube whose top part is slightly peeled off, with the text 'Semantic Web' underneath
- </dc:description>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <text x="0" y="210" font-size="48" fill-opacity="0" font-family="Trebuchet" font-weight="bold">Semantic <tspan x="45" y="250" letter-spacing="4">Web</tspan></text>
-
- <g shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality">
- <g>
- <g>
- <g>
- <path d="M107.185,223.804l-14.027,41.563h-5.657l-8.415-24.188l-8.626,24.188h-5.704l-13.745-41.563h10.122 l6.732,22.75l7.714-22.75h6.99l7.573,22.75l7.037-22.75H107.185z" fill="#005A9C"/>
- <path d="M132.587,252.304h-16.766c0.326,1.837,1.129,3.338,2.408,4.503s2.729,1.747,4.35,1.747 c2.838,0,5.973-1.007,9.402-3.021v6.621c-1.23,0.813-2.721,1.553-4.471,2.217c-1.75,0.663-3.98,0.996-6.688,0.996 c-2.926,0-5.416-0.69-7.471-2.071s-3.592-3.255-4.611-5.622s-1.529-5.05-1.529-8.048c0-2.959,0.51-5.607,1.529-7.945 s2.555-4.172,4.609-5.504c2.055-1.331,4.545-1.997,7.471-1.997c1.93,0,3.793,0.526,5.592,1.579 c1.797,1.053,3.275,2.775,4.436,5.166c1.158,2.392,1.738,5.477,1.738,9.255V252.304z M124.712,247.054 c0-1.918-0.379-3.449-1.137-4.595c-0.76-1.145-1.85-1.718-3.273-1.718c-1.408,0-2.545,0.583-3.412,1.747 c-0.869,1.165-1.303,2.687-1.303,4.565H124.712z" fill="#005A9C"/>
- <path d="M163.546,249.97c0,3.494-0.537,6.392-1.611,8.69c-1.074,2.3-2.443,3.992-4.109,5.078 c-1.666,1.085-3.363,1.628-5.092,1.628c-1.246,0-2.324-0.183-3.234-0.548c-0.912-0.365-1.621-0.76-2.127-1.185 s-1.031-0.934-1.576-1.526v2.696h-8.375v-41h8.375v12.681c0.623-0.61,1.48-1.147,2.57-1.61s2.35-0.695,3.783-0.695 c1.914,0,3.604,0.439,5.068,1.316c1.463,0.877,2.658,2.065,3.584,3.563s1.615,3.179,2.066,5.042S163.546,247.92,163.546,249.97z M154.671,249.732c0-2.583-0.459-4.55-1.375-5.901s-2.002-2.027-3.26-2.027s-2.672,0.642-4.24,1.923v11.51 c1.18,1.42,2.594,2.13,4.24,2.13c1.039,0,2.072-0.537,3.098-1.612C154.16,254.68,154.671,252.672,154.671,249.732z" fill="#005A9C"/>
- </g>
- </g>
- <g>
- <path d="M118.161,17.833C165.051,38.963,175.276,0,175.276,0s-8.906,48.871-50.02,68.834 c-8.377,4.073-13.579,6.256-13.579,6.256L44.325,42.259l67.353-27.62C111.677,14.639,110.052,14.179,118.161,17.833z" fill="#86BA0C"/>
- <polygon points="103.829,160.953 41.073,126.977 41.073,56.906 103.829,88.805" fill="#EF7C00"/>
- <polygon points="117.944,160.953 180.696,126.977 180.696,56.906 117.944,88.805" fill="#BD1789"/>
- </g>
- <g>
- <g>
- <path d="M23.875,200.056c0,2.57-0.518,4.794-1.551,6.672s-2.476,3.316-4.325,4.314 c-1.85,0.997-3.972,1.497-6.365,1.497c-0.668,0-1.488-0.055-2.46-0.163c-0.972-0.109-2.262-0.41-3.87-0.905 c-1.609-0.494-3.284-1.227-5.024-2.196v-10.075c1.631,1.281,3.235,2.346,4.813,3.193c1.577,0.848,3.267,1.271,5.069,1.271 c1.662,0,2.738-0.35,3.229-1.05c0.489-0.699,0.734-1.355,0.734-1.967c0-1.104-0.422-2.035-1.264-2.794s-2.066-1.543-3.673-2.352 c-1.769-0.946-3.319-1.977-4.653-3.091s-2.423-2.51-3.268-4.187C0.422,186.548,0,184.565,0,182.277 c0-2.209,0.427-4.205,1.282-5.99c0.854-1.785,2.16-3.21,3.917-4.275c1.756-1.064,3.901-1.598,6.435-1.598 c1.803,0,3.47,0.223,5.001,0.666c1.531,0.444,2.794,0.942,3.789,1.495c0.994,0.553,1.679,0.987,2.052,1.303v9.616 c-1.324-1.202-2.799-2.276-4.426-3.223s-3.366-1.42-5.219-1.42c-1.215,0-2.094,0.296-2.639,0.888s-0.817,1.32-0.817,2.188 c0,0.809,0.272,1.509,0.818,2.101s1.521,1.311,2.926,2.158c2.488,1.479,4.479,2.81,5.973,3.992 c1.493,1.184,2.664,2.549,3.512,4.097S23.875,197.749,23.875,200.056z" fill="#005A9C"/>
- <path d="M53.529,199.477H36.762c0.327,1.837,1.13,3.338,2.409,4.503c1.278,1.165,2.729,1.747,4.35,1.747 c2.838,0,5.972-1.007,9.402-3.021v6.621c-1.23,0.813-2.721,1.553-4.471,2.217c-1.751,0.663-3.98,0.996-6.688,0.996 c-2.926,0-5.416-0.69-7.471-2.071s-3.591-3.255-4.61-5.622s-1.529-5.05-1.529-8.048c0-2.959,0.509-5.607,1.528-7.945 s2.556-4.172,4.61-5.504c2.055-1.331,4.545-1.997,7.471-1.997c1.93,0,3.793,0.526,5.591,1.579 c1.797,1.053,3.275,2.775,4.436,5.166c1.159,2.392,1.739,5.477,1.739,9.255V199.477z M45.654,194.227 c0-1.918-0.38-3.449-1.138-4.595c-0.759-1.145-1.85-1.718-3.272-1.718c-1.408,0-2.546,0.583-3.413,1.747 c-0.868,1.165-1.302,2.687-1.302,4.565H45.654z" fill="#005A9C"/>
- <path d="M100.06,211.977h-8.375v-16.028c0-2.125-0.278-3.715-0.835-4.768s-1.438-1.579-2.644-1.579 c-1.176,0-2.139,0.448-2.891,1.344s-1.504,2.021-2.256,3.379v17.652h-8.375v-16.028c0-2.027-0.259-3.592-0.775-4.693 c-0.518-1.102-1.434-1.653-2.75-1.653c-0.627,0-1.202,0.158-1.728,0.473s-0.952,0.669-1.281,1.063s-0.729,0.974-1.198,1.741 s-0.768,1.25-0.893,1.446v17.652h-8.375v-30.125h8.375v4.367c1.263-1.701,2.549-2.938,3.859-3.71 c1.31-0.771,2.822-1.157,4.537-1.157c0.811,0,1.583,0.095,2.315,0.282s1.454,0.509,2.164,0.964 c0.709,0.455,1.353,1.079,1.93,1.87c0.576,0.791,1.036,1.711,1.38,2.76c1.355-1.938,2.763-3.402,4.22-4.392 s3.136-1.484,5.038-1.484c1.901,0,3.495,0.483,4.782,1.448c1.285,0.966,2.236,2.36,2.852,4.183 c0.615,1.823,0.924,4.035,0.924,6.637V211.977z" fill="#005A9C"/>
- <path d="M129.744,210.494c-1.227,0.613-2.361,1.107-3.4,1.482c-1.041,0.374-2.291,0.563-3.752,0.563 c-1.383,0-2.346-0.312-2.889-0.934s-0.932-1.378-1.164-2.268c-0.906,0.93-1.912,1.695-3.02,2.298 c-1.109,0.602-2.561,0.903-4.354,0.903c-1.732,0-3.133-0.38-4.201-1.138c-1.069-0.758-1.818-1.714-2.247-2.866 c-0.43-1.152-0.644-2.34-0.644-3.562c0-1.852,0.37-3.383,1.111-4.595c0.741-1.211,1.736-2.201,2.985-2.97 c1.248-0.769,2.903-1.566,4.965-2.395c1.17-0.473,2.055-0.832,2.656-1.078s1.049-0.438,1.346-0.576 c0.297-0.138,0.609-0.315,0.938-0.532c0-1.456-0.234-2.598-0.703-3.424s-1.484-1.24-3.045-1.24c-1.843,0-3.553,0.513-5.129,1.538 c-1.577,1.025-3.021,2.346-4.333,3.962v-8.178c1.043-0.951,2.172-1.729,3.387-2.335c1.215-0.604,2.483-1.056,3.808-1.354 c1.324-0.297,2.664-0.446,4.02-0.446c3.441,0,6.029,0.844,7.766,2.529s2.605,4.008,2.605,6.966v11.624 c0,1.104,0.08,1.928,0.244,2.47c0.164,0.543,0.465,0.813,0.9,0.813c0.529,0,1.246-0.285,2.15-0.857V210.494z M118.074,204.723 v-7.121c-2.018,1.024-3.49,1.945-4.42,2.763s-1.394,1.925-1.394,3.323c0,1.004,0.232,1.772,0.697,2.304 c0.466,0.532,1.005,0.798,1.618,0.798c0.582,0,1.162-0.201,1.736-0.604C116.888,205.781,117.474,205.294,118.074,204.723z" fill="#005A9C"/>
- <path d="M158.441,211.977h-8.375v-15.586v-0.62c0-1.652-0.215-3.094-0.646-4.324 c-0.432-1.229-1.375-1.845-2.832-1.845c-0.689,0-1.297,0.163-1.82,0.487c-0.525,0.324-0.996,0.742-1.41,1.254 c-0.416,0.512-0.764,1.004-1.047,1.477c-0.281,0.473-0.572,0.974-0.869,1.505v17.652h-8.375v-30.125h8.375v4.367 c1.324-1.801,2.654-3.062,3.986-3.784c1.334-0.722,2.818-1.083,4.455-1.083c5.705,0,8.559,4.316,8.559,12.947V211.977z" fill="#005A9C"/>
- <path d="M182.312,210.251c-0.873,0.535-2.078,1.051-3.613,1.546c-1.535,0.494-3.004,0.742-4.406,0.742 c-6.02,0-9.029-3.757-9.029-11.271v-12.042h-3.811v-1.858l11.234-14.517h0.951v9h8.041v7.375h-8.041v9.658 c0,1.126,0.055,2.034,0.164,2.726s0.416,1.269,0.924,1.732c0.506,0.465,1.273,0.696,2.303,0.696c1.34,0,3.1-0.709,5.283-2.129 V210.251z" fill="#005A9C"/>
- <path d="M194.843,211.977h-8.375v-30.125h8.375V211.977z M194.171,174.897c0,1.239-0.35,2.291-1.045,3.156 s-1.523,1.298-2.482,1.298c-0.65,0-1.242-0.196-1.775-0.59c-0.533-0.393-0.955-0.929-1.264-1.607 c-0.309-0.678-0.463-1.431-0.463-2.257c0-1.219,0.34-2.271,1.02-3.156c0.682-0.885,1.508-1.327,2.482-1.327 c0.959,0,1.787,0.442,2.482,1.327S194.171,173.679,194.171,174.897z" fill="#005A9C"/>
- <path d="M221.025,210.607c-0.701,0.337-1.441,0.649-2.221,0.937s-1.656,0.524-2.631,0.713 c-0.975,0.188-2.037,0.282-3.189,0.282c-2.604,0-4.807-0.558-6.609-1.672s-3.191-2.515-4.168-4.201 c-0.975-1.687-1.65-3.408-2.025-5.164s-0.561-3.304-0.561-4.646c0-1.341,0.189-2.89,0.572-4.646s1.051-3.452,2.002-5.089 c0.953-1.637,2.33-3.008,4.133-4.113c1.803-1.104,4.021-1.657,6.656-1.657c1.76,0,3.193,0.159,4.301,0.476 c1.105,0.317,2.229,0.743,3.365,1.278v8.402c-2.742-1.104-4.885-1.656-6.428-1.656c-1.496,0-2.824,0.569-3.986,1.707 c-1.16,1.139-1.74,2.904-1.74,5.299c0,1.59,0.287,2.929,0.863,4.018c0.576,1.09,1.309,1.89,2.197,2.399s1.777,0.765,2.666,0.765 c0.842,0,1.799-0.157,2.875-0.473s2.385-0.769,3.928-1.36V210.607z" fill="#005A9C"/>
- </g>
- </g>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/binsrc/dbpedia/vsp/statics/sw-vert-v_780_trans.png b/binsrc/dbpedia/vsp/statics/sw-vert-v_780_trans.png
deleted file mode 100644
index d41bbb6..0000000
Binary files a/binsrc/dbpedia/vsp/statics/sw-vert-v_780_trans.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/statics/virt_power_no_border.png b/binsrc/dbpedia/vsp/statics/virt_power_no_border.png
deleted file mode 100755
index 93fcb80..0000000
Binary files a/binsrc/dbpedia/vsp/statics/virt_power_no_border.png and /dev/null differ
diff --git a/binsrc/dbpedia/vsp/style/style.css b/binsrc/dbpedia/vsp/style/style.css
deleted file mode 100644
index cb7b648..0000000
--- a/binsrc/dbpedia/vsp/style/style.css
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * $Id: style.css,v 1.1.2.1 2012/03/02 11:13:51 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-html { margin: 0; padding: 0; }
-body { font-family: sans-serif; font-size: 80%; margin: 0; padding: 1.2em 2em; background: #cec; }
-
-#header { width: 100%; float: left; clear: left; border-bottom: 2px solid #696; margin: 0 0 1.2em; padding: 0 0 0.3em; }
-#hd_l { width: 80%; float: left;}
-#hd_r {float: right; clear: right;}
-
-#homelink { display: inline; }
-#homelink, #homelink a { color: #666; }
-#homelink a { font-weight: bold; text-decoration: none; }
-#homelink a:hover { color: red; text-decoration: underline; }
-
-h1 { display: inline; font-weight: normal; font-size: 200%; margin: 0; text-align: left; }
-h2 { font-weight: normal; font-size: 124%; margin: 1.2em 0 0.2em; }
-h1, h2 { color: #810; }
-
-.page-resource-uri { font-size: 124%; margin: 0.2em 0; }
-.page-resource-uri a { color: black; text-decoration: none; }
-.page-resource-uri a:hover { color: red; text-decoration: underline; }
-
-a.sparql-uri { color: black; text-decoration: none; }
-a.sparql-uri:hover { color: red; text-decoration: underline; }
-
-img { border: none; }
-
-#content {width: 100%; float: left; clear: left;}
-
-#footer { width: 100%;float: left; clear: left;border-top: 2px solid #696; margin: 1.2em 0 0; padding: 0.3em; background-color: #fff;}
-#ft_r { float: right; clear: right;}
-#ft_t { text-align: center; }
-#ft_b { text-align: center; margin-top: 0.7ex }
-#ft_ccbysa { font-size: 8pt; text-align: center; margin-top: 0.7ex }
-
-table.description { border-collapse: collapse; clear: left; font-size: 100%; margin: 0 0 1em; width: 100%; }
-table.description th { background: white; text-align: left; }
-table.description td, table.description th { line-height: 1.2em; padding: 0.2em 0.4em; vertical-align: top; }
-table.description ul { margin: 0; padding-left: 0em; }
-table.description li { list-style-type: square; }
-
-.uri { white-space: nowrap; }
-.uri a, a.uri { text-decoration: none; }
-.unbound { color: #888; }
-
-table.description a small { font-size: 100%; color: #55a; }
-table.description small { font-size: 100%; color: #666; }
-table.description .property { white-space: nowrap; }
-table.description .odd td { background: #d4f6d4; }
-table.description .even td { background: #f0fcf0; }
-
-.image { background: white; float: left; margin: 0 1.5em 1.5em 0; padding: 2px; }
-
-a.expander { text-decoration: none; }
diff --git a/binsrc/driver/Makefile.am b/binsrc/driver/Makefile.am
index 07a7a43..8923084 100644
--- a/binsrc/driver/Makefile.am
+++ b/binsrc/driver/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/driver/Makefile.in b/binsrc/driver/Makefile.in
index af62fb4..21720fa 100644
--- a/binsrc/driver/Makefile.in
+++ b/binsrc/driver/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -194,7 +194,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,7 +242,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -295,7 +293,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -342,6 +339,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/driver/unixodbc.c b/binsrc/driver/unixodbc.c
index e070794..6de05c9 100644
--- a/binsrc/driver/unixodbc.c
+++ b/binsrc/driver/unixodbc.c
@@ -1,14 +1,14 @@
/*
* unixodbc.c
*
- * $Id: unixodbc.c,v 1.2.2.1 2012/03/08 12:55:00 source Exp $
+ * $Id: unixodbc.c,v 1.2 2007/08/24 12:31:23 source Exp $
*
* Unix ODBC driver
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/driver/virt_vers.c b/binsrc/driver/virt_vers.c
index ec24cc8..e2df084 100644
--- a/binsrc/driver/virt_vers.c
+++ b/binsrc/driver/virt_vers.c
@@ -4,6 +4,6 @@
char version[] = "\
OpenLink Virtuoso ODBC Driver\n\
-Version 06.01.3127 as of Thu Mar 15 19:27:16 CET 2012.\n\
-Compiled for Linux 2.6.42.3-2.fc15.x86_64\n\
-Copyright (C) 1998-2012 OpenLink Software.\n";
+Version 06.01.3127 as of Mon Oct 31 18:10:38 CET 2011.\n\
+Compiled for Linux 2.6.37.1-1.2-default\n\
+Copyright (C) OpenLink Software.\n";
diff --git a/binsrc/driver/virt_vers_r.c b/binsrc/driver/virt_vers_r.c
index d413e4d..da880ee 100644
--- a/binsrc/driver/virt_vers_r.c
+++ b/binsrc/driver/virt_vers_r.c
@@ -4,6 +4,6 @@
char version[] = "\
OpenLink Virtuoso ODBC Driver (multi threaded)\n\
-Version 06.01.3127 as of Thu Mar 15 19:27:36 CET 2012.\n\
-Compiled for Linux 2.6.42.3-2.fc15.x86_64\n\
-Copyright (C) 1998-2012 OpenLink Software.\n";
+Version 06.01.3127 as of Mon Oct 31 18:10:40 CET 2011.\n\
+Compiled for Linux 2.6.37.1-1.2-default\n\
+Copyright (C) OpenLink Software.\n";
diff --git a/binsrc/driver/virt_vers_ru.c b/binsrc/driver/virt_vers_ru.c
index e68ef03..d50bb2b 100644
--- a/binsrc/driver/virt_vers_ru.c
+++ b/binsrc/driver/virt_vers_ru.c
@@ -4,6 +4,6 @@
char version[] = "\
OpenLink Virtuoso ODBC Driver (Unicode)(multi threaded)\n\
-Version 06.01.3127 as of Thu Mar 15 19:27:40 CET 2012.\n\
-Compiled for Linux 2.6.42.3-2.fc15.x86_64\n\
-Copyright (C) 1998-2012 OpenLink Software.\n";
+Version 06.01.3127 as of Mon Oct 31 18:10:44 CET 2011.\n\
+Compiled for Linux 2.6.37.1-1.2-default\n\
+Copyright (C) OpenLink Software.\n";
diff --git a/binsrc/driver/virt_vers_u.c b/binsrc/driver/virt_vers_u.c
index 9efc653..34b62ab 100644
--- a/binsrc/driver/virt_vers_u.c
+++ b/binsrc/driver/virt_vers_u.c
@@ -4,6 +4,6 @@
char version[] = "\
OpenLink Virtuoso ODBC Driver (Unicode)\n\
-Version 06.01.3127 as of Thu Mar 15 19:27:37 CET 2012.\n\
-Compiled for Linux 2.6.42.3-2.fc15.x86_64\n\
-Copyright (C) 1998-2012 OpenLink Software.\n";
+Version 06.01.3127 as of Mon Oct 31 18:10:42 CET 2011.\n\
+Compiled for Linux 2.6.37.1-1.2-default\n\
+Copyright (C) OpenLink Software.\n";
diff --git a/binsrc/hibernate/Makefile.am b/binsrc/hibernate/Makefile.am
index f3e1c1c..1c9da6b 100644
--- a/binsrc/hibernate/Makefile.am
+++ b/binsrc/hibernate/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
diff --git a/binsrc/hibernate/Makefile.in b/binsrc/hibernate/Makefile.in
index 0dcb81d..a965566 100644
--- a/binsrc/hibernate/Makefile.in
+++ b/binsrc/hibernate/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java b/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java
index 1e1dae6..6ba904a 100644
--- a/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java
+++ b/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoDialect.java,v 1.1.2.4 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoDialect.java,v 1.1.2.3 2011/08/17 17:44:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/Makefile.am b/binsrc/hosting/Makefile.am
index 1b12a28..696a5de 100644
--- a/binsrc/hosting/Makefile.am
+++ b/binsrc/hosting/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/Makefile.in b/binsrc/hosting/Makefile.in
index b1d45e8..d9e6adc 100644
--- a/binsrc/hosting/Makefile.in
+++ b/binsrc/hosting/Makefile.in
@@ -118,7 +118,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -167,7 +166,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -219,7 +217,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -266,6 +263,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -295,7 +293,7 @@ vaddir = @vaddir@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/fcgi/GNUmakefile b/binsrc/hosting/fcgi/GNUmakefile
index 990d0be..bc0fcc3 100644
--- a/binsrc/hosting/fcgi/GNUmakefile
+++ b/binsrc/hosting/fcgi/GNUmakefile
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/fcgi/cgi_fcgi.c b/binsrc/hosting/fcgi/cgi_fcgi.c
index d7521d3..6fddad0 100644
--- a/binsrc/hosting/fcgi/cgi_fcgi.c
+++ b/binsrc/hosting/fcgi/cgi_fcgi.c
@@ -1,14 +1,14 @@
/*
* cgi_fcgi.c
*
- * $Id: cgi_fcgi.c,v 1.1.1.1.2.1 2012/03/08 12:55:00 source Exp $
+ * $Id: cgi_fcgi.c,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
*
* Virtuoso FastCGI hosting plugin fcgi iface
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/fcgi/hosting_fcgi.c b/binsrc/hosting/fcgi/hosting_fcgi.c
index 4f9f72a..ea6a5bb 100644
--- a/binsrc/hosting/fcgi/hosting_fcgi.c
+++ b/binsrc/hosting/fcgi/hosting_fcgi.c
@@ -1,14 +1,14 @@
/*
* hosting_fcgi.c
*
- * $Id: hosting_fcgi.c,v 1.1.1.1.2.1 2012/03/08 12:55:00 source Exp $
+ * $Id: hosting_fcgi.c,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
*
* Virtuoso FastCGI hosting plugin virtuoso iface
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/fcgi/hosting_fcgi.h b/binsrc/hosting/fcgi/hosting_fcgi.h
index 08b3113..996a729 100644
--- a/binsrc/hosting/fcgi/hosting_fcgi.h
+++ b/binsrc/hosting/fcgi/hosting_fcgi.h
@@ -1,14 +1,14 @@
/*
* hosting_fcgi.h
*
- * $Id: hosting_fcgi.h,v 1.1.1.1.2.1 2012/03/08 12:55:00 source Exp $
+ * $Id: hosting_fcgi.h,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
*
* Virtuoso FastCGI hosting plugin header
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/Makefile.am b/binsrc/hosting/mono/Makefile.am
index f13091c..0495f61 100644
--- a/binsrc/hosting/mono/Makefile.am
+++ b/binsrc/hosting/mono/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/mono/Makefile.in b/binsrc/hosting/mono/Makefile.in
index 4a7adca..485be25 100644
--- a/binsrc/hosting/mono/Makefile.in
+++ b/binsrc/hosting/mono/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -217,7 +217,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -266,7 +265,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -318,7 +316,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -365,6 +362,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/hosting/mono/basec.c b/binsrc/hosting/mono/basec.c
index 5da6ad5..03333cd 100644
--- a/binsrc/hosting/mono/basec.c
+++ b/binsrc/hosting/mono/basec.c
@@ -1,10 +1,10 @@
/*
- * $Id: basec.c,v 1.3.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: basec.c,v 1.3.2.2 2010/01/29 16:16:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/mono/clr.def b/binsrc/hosting/mono/clr.def
index dd2c94f..be5df2c 100644
--- a/binsrc/hosting/mono/clr.def
+++ b/binsrc/hosting/mono/clr.def
@@ -1,14 +1,14 @@
;
; libviwin32.def
;
-; $Id: clr.def,v 1.1.2.2 2012/03/08 12:55:00 source Exp $
+; $Id: clr.def,v 1.1.2.1 2010/01/25 23:34:12 source Exp $
;
; Link script for the OpenLink Virtuoso VDBMS Server DLL
;
; This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
; project.
;
-; Copyright (C) 1998-2012 OpenLink Software
+; Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/mono/clr_ll_api.h b/binsrc/hosting/mono/clr_ll_api.h
index 68b6db2..2aabc69 100644
--- a/binsrc/hosting/mono/clr_ll_api.h
+++ b/binsrc/hosting/mono/clr_ll_api.h
@@ -1,10 +1,10 @@
/*
- * $Id: clr_ll_api.h,v 1.1.1.1.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: clr_ll_api.h,v 1.1.1.1.2.1 2010/01/25 23:34:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/mono/dotnet.cpp b/binsrc/hosting/mono/dotnet.cpp
index eb23c32..d7cea79 100644
--- a/binsrc/hosting/mono/dotnet.cpp
+++ b/binsrc/hosting/mono/dotnet.cpp
@@ -1,10 +1,10 @@
/*
- * $Id: dotnet.cpp,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: dotnet.cpp,v 1.2.2.1 2010/01/25 23:34:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/mono/import_clr.sql b/binsrc/hosting/mono/import_clr.sql
index 7d1d636..7b05a01 100644
--- a/binsrc/hosting/mono/import_clr.sql
+++ b/binsrc/hosting/mono/import_clr.sql
@@ -1,10 +1,10 @@
--
--- $Id: import_clr.sql,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+-- $Id: import_clr.sql,v 1.2.2.1 2010/01/25 23:34:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/mono.c b/binsrc/hosting/mono/mono.c
index 6fb85af..095d428 100644
--- a/binsrc/hosting/mono/mono.c
+++ b/binsrc/hosting/mono/mono.c
@@ -1,10 +1,10 @@
/*
- * $Id: mono.c,v 1.1.1.1.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: mono.c,v 1.1.1.1.2.1 2010/01/25 23:34:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/mono/mono.h b/binsrc/hosting/mono/mono.h
index f0891a0..3d763d0 100644
--- a/binsrc/hosting/mono/mono.h
+++ b/binsrc/hosting/mono/mono.h
@@ -1,10 +1,10 @@
/*
- * $Id: mono.h,v 1.2.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: mono.h,v 1.2.2.2 2010/01/29 16:16:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/mono/mono_type.xsl b/binsrc/hosting/mono/mono_type.xsl
index c73bc94..8744380 100644
--- a/binsrc/hosting/mono/mono_type.xsl
+++ b/binsrc/hosting/mono/mono_type.xsl
@@ -1,11 +1,11 @@
<!--
-
- - $Id: mono_type.xsl,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+ - $Id: mono_type.xsl,v 1.2.2.1 2010/01/25 23:34:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/sql_code_xslt.c b/binsrc/hosting/mono/sql_code_xslt.c
index 8953901..63232cc 100644
--- a/binsrc/hosting/mono/sql_code_xslt.c
+++ b/binsrc/hosting/mono/sql_code_xslt.c
@@ -9,12 +9,12 @@
static const char *xsl1[]= {
"<!--\n"
" -\n"
-" - $Id: mono_type.xsl,v 1.2.2.2 2012/03/08 12:55:00 source Exp $\n"
+" - $Id: mono_type.xsl,v 1.2.2.1 2010/01/25 23:34:13 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
diff --git a/binsrc/hosting/mono/tests/Makefile.am b/binsrc/hosting/mono/tests/Makefile.am
index 3888a83..79d3fa9 100644
--- a/binsrc/hosting/mono/tests/Makefile.am
+++ b/binsrc/hosting/mono/tests/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/tests/Makefile.in b/binsrc/hosting/mono/tests/Makefile.in
index 21c91e6..7e5bf00 100644
--- a/binsrc/hosting/mono/tests/Makefile.in
+++ b/binsrc/hosting/mono/tests/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -101,7 +101,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -150,7 +149,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -202,7 +200,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -249,6 +246,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/hosting/mono/tests/Point.cs b/binsrc/hosting/mono/tests/Point.cs
index af9b7c4..66fd369 100644
--- a/binsrc/hosting/mono/tests/Point.cs
+++ b/binsrc/hosting/mono/tests/Point.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/tests/Point_ho_s_10.cs b/binsrc/hosting/mono/tests/Point_ho_s_10.cs
index 67592b8..9048f30 100644
--- a/binsrc/hosting/mono/tests/Point_ho_s_10.cs
+++ b/binsrc/hosting/mono/tests/Point_ho_s_10.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/tests/clr_suite_types.sql b/binsrc/hosting/mono/tests/clr_suite_types.sql
index 40bbb13..2dc36bf 100644
--- a/binsrc/hosting/mono/tests/clr_suite_types.sql
+++ b/binsrc/hosting/mono/tests/clr_suite_types.sql
@@ -1,10 +1,10 @@
--
--- $Id: clr_suite_types.sql,v 1.2.2.1 2012/03/08 12:55:00 source Exp $
+-- $Id: clr_suite_types.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/tests/clr_test2.sql b/binsrc/hosting/mono/tests/clr_test2.sql
index d8fb1de..40f906c 100644
--- a/binsrc/hosting/mono/tests/clr_test2.sql
+++ b/binsrc/hosting/mono/tests/clr_test2.sql
@@ -1,10 +1,10 @@
--
--- $Id: clr_test2.sql,v 1.2.2.1 2012/03/08 12:55:00 source Exp $
+-- $Id: clr_test2.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/tests/sample.cs b/binsrc/hosting/mono/tests/sample.cs
index 8702a61..9046bfa 100644
--- a/binsrc/hosting/mono/tests/sample.cs
+++ b/binsrc/hosting/mono/tests/sample.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/tests/tax.cs b/binsrc/hosting/mono/tests/tax.cs
index 9670af0..447d78b 100644
--- a/binsrc/hosting/mono/tests/tax.cs
+++ b/binsrc/hosting/mono/tests/tax.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/tests/tclrsrv.sh b/binsrc/hosting/mono/tests/tclrsrv.sh
index 3653dad..e191afd 100755
--- a/binsrc/hosting/mono/tests/tclrsrv.sh
+++ b/binsrc/hosting/mono/tests/tclrsrv.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tclrsrv.sh,v 1.2.2.1 2012/03/08 12:55:00 source Exp $
+# $Id: tclrsrv.sh,v 1.2 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/hosting/mono/tests/test_point_clr.sql b/binsrc/hosting/mono/tests/test_point_clr.sql
index d1d0e3f..d8be8a9 100644
--- a/binsrc/hosting/mono/tests/test_point_clr.sql
+++ b/binsrc/hosting/mono/tests/test_point_clr.sql
@@ -1,10 +1,10 @@
--
--- $Id: test_point_clr.sql,v 1.2.2.1 2012/03/08 12:55:00 source Exp $
+-- $Id: test_point_clr.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/tests/test_tax_clr.sql b/binsrc/hosting/mono/tests/test_tax_clr.sql
index bef466c..dc25c5f 100644
--- a/binsrc/hosting/mono/tests/test_tax_clr.sql
+++ b/binsrc/hosting/mono/tests/test_tax_clr.sql
@@ -1,10 +1,10 @@
--
--- $Id: test_tax_clr.sql,v 1.2.2.1 2012/03/08 12:55:00 source Exp $
+-- $Id: test_tax_clr.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/mono/virt_http.cs b/binsrc/hosting/mono/virt_http.cs
index d953ce3..200fdfd 100644
--- a/binsrc/hosting/mono/virt_http.cs
+++ b/binsrc/hosting/mono/virt_http.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/mono/virtclr.cs b/binsrc/hosting/mono/virtclr.cs
index bac490d..775f8e9 100644
--- a/binsrc/hosting/mono/virtclr.cs
+++ b/binsrc/hosting/mono/virtclr.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2010 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
diff --git a/binsrc/hosting/perl/Makefile.am b/binsrc/hosting/perl/Makefile.am
index fb55de4..a87bc87 100644
--- a/binsrc/hosting/perl/Makefile.am
+++ b/binsrc/hosting/perl/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/perl/Makefile.in b/binsrc/hosting/perl/Makefile.in
index 0aa1cfd..b541e4c 100644
--- a/binsrc/hosting/perl/Makefile.in
+++ b/binsrc/hosting/perl/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -148,7 +148,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -197,7 +196,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -249,7 +247,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -296,6 +293,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/hosting/perl/hosting_perl.c b/binsrc/hosting/perl/hosting_perl.c
index 2c67be4..137dcac 100644
--- a/binsrc/hosting/perl/hosting_perl.c
+++ b/binsrc/hosting/perl/hosting_perl.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk
index eb4a07d..369610f 100644
--- a/binsrc/hosting/perl/pl_to_c.awk
+++ b/binsrc/hosting/perl/pl_to_c.awk
@@ -3,7 +3,7 @@ BEGIN {
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -42,7 +42,7 @@ END {
}
x = $0
- gsub ( "\\\\", "&&", x)
+ gsub (/\\/, "\\\\", x)
gsub (/\"/, "\\\"", x)
print "\"" x "\\n\""
}
diff --git a/binsrc/hosting/perl/virt_handler.c b/binsrc/hosting/perl/virt_handler.c
index e6b83cc..21d4632 100644
--- a/binsrc/hosting/perl/virt_handler.c
+++ b/binsrc/hosting/perl/virt_handler.c
@@ -3,7 +3,7 @@ static char *virt_handler =
"# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
"# project.\n"
"# \n"
-"# Copyright (C) 1998-2012 OpenLink Software\n"
+"# Copyright (C) 1998-2006 OpenLink Software\n"
"# \n"
"# This project is free software; you can redistribute it and/or modify it\n"
"# under the terms of the GNU General Public License as published by the\n"
diff --git a/binsrc/hosting/perl/virt_handler.pm b/binsrc/hosting/perl/virt_handler.pm
index 2128c31..be1fccf 100644
--- a/binsrc/hosting/perl/virt_handler.pm
+++ b/binsrc/hosting/perl/virt_handler.pm
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/php/Makefile.am b/binsrc/hosting/php/Makefile.am
index 911d737..9b52d03 100644
--- a/binsrc/hosting/php/Makefile.am
+++ b/binsrc/hosting/php/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/php/Makefile.in b/binsrc/hosting/php/Makefile.in
index cc21d91..14f1cce 100644
--- a/binsrc/hosting/php/Makefile.in
+++ b/binsrc/hosting/php/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -146,7 +146,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -195,7 +194,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -247,7 +245,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -294,6 +291,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/hosting/php/hosting_php.c b/binsrc/hosting/php/hosting_php.c
index a8c014a..6938d24 100644
--- a/binsrc/hosting/php/hosting_php.c
+++ b/binsrc/hosting/php/hosting_php.c
@@ -1,12 +1,12 @@
/*
* hosting_php.c
*
- * $Id: hosting_php.c,v 1.4.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: hosting_php.c,v 1.4.2.2 2011/09/12 10:54:39 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2011 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
@@ -663,7 +663,7 @@ PHP_MINFO_FUNCTION (virtuoso)
php_info_print_table_start ();
php_info_print_table_row (2, "Server Version", DBMS_SRV_VER);
php_info_print_table_row (2, "Build Date", __DATE__);
- php_info_print_table_row (2, "Revision", "$Revision: 1.4.2.3 $");
+ php_info_print_table_row (2, "Revision", "$Revision: 1.4.2.2 $");
php_info_print_table_end ();
DISPLAY_INI_ENTRIES ();
diff --git a/binsrc/hosting/python/Makefile.am b/binsrc/hosting/python/Makefile.am
index 11feafd..ab8d7c1 100644
--- a/binsrc/hosting/python/Makefile.am
+++ b/binsrc/hosting/python/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/python/Makefile.in b/binsrc/hosting/python/Makefile.in
index fac49cb..11fe8bc 100644
--- a/binsrc/hosting/python/Makefile.in
+++ b/binsrc/hosting/python/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -151,7 +151,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -200,7 +199,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -252,7 +250,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -299,6 +296,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/hosting/python/build.py b/binsrc/hosting/python/build.py
index f8a71e0..1b2df40 100644
--- a/binsrc/hosting/python/build.py
+++ b/binsrc/hosting/python/build.py
@@ -1,14 +1,14 @@
#
# build.py
#
-# $Id: build.py,v 1.1.1.1.2.1 2012/03/08 12:55:00 source Exp $
+# $Id: build.py,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
#
# Python Makefile for the OpenLink python plugin
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/python/hosting_python.c b/binsrc/hosting/python/hosting_python.c
index c9c63de..b1be0a0 100644
--- a/binsrc/hosting/python/hosting_python.c
+++ b/binsrc/hosting/python/hosting_python.c
@@ -1,14 +1,14 @@
/*
* hosting_python.c
*
- * $Id: hosting_python.c,v 1.2.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: hosting_python.c,v 1.2.2.2 2011/01/25 14:29:06 source Exp $
*
* Virtuoso Python hosting plugin
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk
index 4f53985..f7d6935 100644
--- a/binsrc/hosting/python/py_to_c.awk
+++ b/binsrc/hosting/python/py_to_c.awk
@@ -1,13 +1,13 @@
# py_to_c.awk
#
-# $Id: py_to_c.awk,v 1.1.1.1.2.2 2012/03/08 13:52:41 source Exp $
+# $Id: py_to_c.awk,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
#
# GAWK python embeding script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -48,7 +48,7 @@ END {
}
x = $0
- gsub ( "\\\\", "&&", x)
+ gsub (/\\/, "\\\\", x)
gsub (/\"/, "\\\"", x)
print "\"" x "\\n\""
}
diff --git a/binsrc/hosting/python/virt_handler.c b/binsrc/hosting/python/virt_handler.c
index c326250..df8714d 100644
--- a/binsrc/hosting/python/virt_handler.c
+++ b/binsrc/hosting/python/virt_handler.c
@@ -2,14 +2,14 @@ static char *virt_handler =
"#\n"
"# virt_handler.py\n"
"#\n"
-"# $Id: virt_handler.py,v 1.1.1.1.2.2 2012/03/08 12:55:00 source Exp $\n"
+"# $Id: virt_handler.py,v 1.1.1.1.2.1 2010/04/14 13:55:08 source Exp $\n"
"#\n"
"# python proxy for OpenLink python plugin\n"
"# \n"
"# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
"# project.\n"
"# \n"
-"# Copyright (C) 1998-2012 OpenLink Software\n"
+"# Copyright (C) 1998-2006 OpenLink Software\n"
"# \n"
"# This project is free software; you can redistribute it and/or modify it\n"
"# under the terms of the GNU General Public License as published by the\n"
diff --git a/binsrc/hosting/python/virt_handler.py b/binsrc/hosting/python/virt_handler.py
index 1884026..0bd564c 100644
--- a/binsrc/hosting/python/virt_handler.py
+++ b/binsrc/hosting/python/virt_handler.py
@@ -1,14 +1,14 @@
#
# virt_handler.py
#
-# $Id: virt_handler.py,v 1.1.1.1.2.2 2012/03/08 12:55:00 source Exp $
+# $Id: virt_handler.py,v 1.1.1.1.2.1 2010/04/14 13:55:08 source Exp $
#
# python proxy for OpenLink python plugin
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/ruby/Makefile.am b/binsrc/hosting/ruby/Makefile.am
index ca7a307..a08666e 100644
--- a/binsrc/hosting/ruby/Makefile.am
+++ b/binsrc/hosting/ruby/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/ruby/Makefile.in b/binsrc/hosting/ruby/Makefile.in
index 0ead0ab..55fc106 100644
--- a/binsrc/hosting/ruby/Makefile.in
+++ b/binsrc/hosting/ruby/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -149,7 +149,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -198,7 +197,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -250,7 +248,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -297,6 +294,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/hosting/ruby/hosting_ruby.c b/binsrc/hosting/ruby/hosting_ruby.c
index c5bad46..3716798 100644
--- a/binsrc/hosting/ruby/hosting_ruby.c
+++ b/binsrc/hosting/ruby/hosting_ruby.c
@@ -1,14 +1,14 @@
/*
* hosting_ruby.c
*
- * $Id: hosting_ruby.c,v 1.1.1.1.2.1 2012/03/08 12:55:00 source Exp $
+ * $Id: hosting_ruby.c,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
*
* Virtuoso Ruby hosting plugin
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/ruby/hosting_ruby.h b/binsrc/hosting/ruby/hosting_ruby.h
index 05e0c44..eed4930 100644
--- a/binsrc/hosting/ruby/hosting_ruby.h
+++ b/binsrc/hosting/ruby/hosting_ruby.h
@@ -1,14 +1,14 @@
/*
* hosting_ruby.h
*
- * $Id: hosting_ruby.h,v 1.1.1.1.2.1 2012/03/08 12:55:00 source Exp $
+ * $Id: hosting_ruby.h,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
*
* Virtuoso Ruby hosting plugin header
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/hosting/ruby/ruby_io.c b/binsrc/hosting/ruby/ruby_io.c
index 2eb0b00..5558b4c 100644
--- a/binsrc/hosting/ruby/ruby_io.c
+++ b/binsrc/hosting/ruby/ruby_io.c
@@ -1,14 +1,14 @@
/*
* ruby_io.c
*
- * $Id: ruby_io.c,v 1.1.1.1.2.1 2012/03/08 12:55:00 source Exp $
+ * $Id: ruby_io.c,v 1.1.1.1 2006/04/11 17:56:13 source Exp $
*
* Virtuoso Ruby hosting plugin IO handlers
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/isparql/Makefile.am b/binsrc/isparql/Makefile.am
index 3ee56c1..e9390a4 100644
--- a/binsrc/isparql/Makefile.am
+++ b/binsrc/isparql/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/isparql/Makefile.in b/binsrc/isparql/Makefile.in
index df151b3..b608c28 100644
--- a/binsrc/isparql/Makefile.in
+++ b/binsrc/isparql/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -125,7 +125,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -174,7 +173,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -226,7 +224,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -273,6 +270,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/isparql/auth.vsp b/binsrc/isparql/auth.vsp
index d57f51c..385f255 100644
--- a/binsrc/isparql/auth.vsp
+++ b/binsrc/isparql/auth.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: auth.vsp,v 1.4.2.4 2012/03/08 12:55:00 source Exp $
+-- $Id: auth.vsp,v 1.4.2.3 2011/01/25 14:08:45 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/isparql/auth_ods.vsp b/binsrc/isparql/auth_ods.vsp
index 0063ec6..138d985 100644
--- a/binsrc/isparql/auth_ods.vsp
+++ b/binsrc/isparql/auth_ods.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: auth_ods.vsp,v 1.4.2.2 2012/03/08 12:55:00 source Exp $
+-- $Id: auth_ods.vsp,v 1.4.2.1 2009/06/10 19:49:06 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/isparql/cmds.vsp b/binsrc/isparql/cmds.vsp
index a9532ab..a5bebe0 100644
--- a/binsrc/isparql/cmds.vsp
+++ b/binsrc/isparql/cmds.vsp
@@ -1,10 +1,10 @@
/*
- * $Id: cmds.vsp,v 1.1.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: cmds.vsp,v 1.1.2.2 2009/06/10 19:49:06 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/isparql/defaults.vsp b/binsrc/isparql/defaults.vsp
index cf479a6..6f4bff1 100644
--- a/binsrc/isparql/defaults.vsp
+++ b/binsrc/isparql/defaults.vsp
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<?vsp
--
--- $Id: defaults.vsp,v 1.1.2.14 2012/03/08 12:55:00 source Exp $
+-- $Id: defaults.vsp,v 1.1.2.13 2011/09/05 15:27:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/isparql/error.js b/binsrc/isparql/error.js
index 04fa758..b7e39aa 100644
--- a/binsrc/isparql/error.js
+++ b/binsrc/isparql/error.js
@@ -1,9 +1,9 @@
/*
- * $Id: error.js,v 1.1.2.3 2012/03/08 13:18:57 source Exp $
+ * $Id: error.js,v 1.1.2.2 2010/03/12 09:01:02 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/execute.html b/binsrc/isparql/execute.html
index 47ff2ca..fd205f1 100644
--- a/binsrc/isparql/execute.html
+++ b/binsrc/isparql/execute.html
@@ -3,11 +3,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
- $Id: execute.html,v 1.12.2.22 2012/03/08 13:18:57 source Exp $
+ $Id: execute.html,v 1.12.2.20 2011/09/09 13:10:24 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2009-2012 OpenLink Software
+ Copyright (C) 2009 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
@@ -134,7 +134,7 @@ function init() {
<img src="/isparql/images/stop_32.png" alt="error" id="splashErrorImg" style="display:none"/>
<div class="error" id="statMsgErr"></div>
<div id="splash_ver"></div>
- <div id="splash_copyr">Copyright © 2006-2012 OpenLink Software</div>
+ <div id="splash_copyr">Copyright © 2006-2011 OpenLink Software</div>
<div id="splash_foot" class="opl_motto">Making Technology Work For You ™</div>
</div> <!-- #splash_inner -->
</div> <!-- #splash -->
@@ -190,7 +190,7 @@ function init() {
ODATA (<a id="odata_atom_lnk">Atom</a> | <a id="odata_json_lnk">JSON</a>)
</div>
<div class="foot_r" id="foot_r">
- Copyright © 2006-2012 OpenLink Software<br/><span id="ft_loc"></span><br/>
+ Copyright © 2006-2011 OpenLink Software<br/><span id="ft_loc"></span><br/>
</div>
<div id="stats"></div> <!-- stats -->
</div> <!-- #foot -->
diff --git a/binsrc/isparql/execute.js b/binsrc/isparql/execute.js
index a88f503..4429d0a 100644
--- a/binsrc/isparql/execute.js
+++ b/binsrc/isparql/execute.js
@@ -1,9 +1,9 @@
/*
- * $Id: execute.js,v 1.32.2.44 2012/03/08 13:18:57 source Exp $
+ * $Id: execute.js,v 1.32.2.42 2011/09/20 12:03:50 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
@@ -510,7 +510,7 @@ var QueryExec = function(optObj) {
request:request,
data:data,
txt:OAT.Xml.serializeXmlDoc (data),
- store: new OAT.RDFStore(false,{raw_iris: true}),
+ store: new OAT.RDFStore(),
dom: {}
}
@@ -1211,19 +1211,18 @@ var QueryExec = function(optObj) {
if (item.resType == iSPARQL.ResultType.GRAPH) { // Use RDFMini to show Graphs
var lastIndex = 0;
var tabs = [
- ["triples","Grid View",{raw_iris:true}],
- ["navigator","Navigator",{raw_iris:true}],
- ["browser","Raw Triples",{removeNS:true, raw_iris:true}],
- ["svg","SVG Graph",{raw_iris:true}],
- ["images","Images",{raw_iris:true}],
+ ["navigator","Navigator"],
+ ["browser","Raw Triples",{removeNS:true}],
+ ["triples","Grid View",{}],
+ ["svg","SVG Graph",{}],
+ ["images","Images",{}],
["map",
iSPARQL.Defaults.mapProviderNames[iSPARQL.Defaults.map_type],
{provider:iSPARQL.Defaults.map_type,
markerMode:OAT.RDFTabsData.MARKER_MODE_AUTO,
clickPopup:true,
hoverPopup:false,
- height: map_h,
- raw_iris: true}]
+ height: map_h}]
];
lastIndex = self.parseTabIndex (opts.resultView, tabs);
@@ -1251,8 +1250,7 @@ var QueryExec = function(optObj) {
if (item.store.getTripleCount() > 0) {
item.mini = new OAT.RDFMini(mini_c,{tabs:tabs,
showSearch:false,
- store: item.store,
- raw_iris: true});
+ store: item.store});
item.mini.processLink = self.processLink;
diff --git a/binsrc/isparql/index.html b/binsrc/isparql/index.html
index 1ed59d0..969dfd2 100644
--- a/binsrc/isparql/index.html
+++ b/binsrc/isparql/index.html
@@ -3,11 +3,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
- $Id: index.html,v 1.37.2.32 2012/03/08 13:18:57 source Exp $
+ $Id: index.html,v 1.37.2.30 2011/09/09 13:10:24 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2009-2012 OpenLink Software
+ Copyright (C) 2009 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
@@ -103,11 +103,9 @@ OAT.MSG.attach(OAT, 'OAT_LOAD', myInit);
</noscript>
<img src="/isparql/images/stop_32.png" alt="error" id="splashErrorImg" style="display: none"/>
-
<div class="error" id="statMsgErr"></div>
<div id="splash_ver"></div>
- <div id="splash_copyr">Copyright © 2006-2012 OpenLink Software</div>
-
+ <div id="splash_copyr">Copyright © 2006-2011 OpenLink Software</div>
<div id="splash_foot" class="opl_motto">Making Technology Work For You ™</div>
</div> <!-- #splash_inner -->
</div> <!-- #splash -->
@@ -548,7 +546,7 @@ WHERE { ?thing a ?type;
Bookmarklet - drag this link to your browser's bookmark bar: <a id="isparql_bookmarklet_a" href="javascript:(function(){location='http://www.openlinksw.com/';})();">iSPARQL</a> <a id="sparql_bookmarklet_a" href="" style="display:none">SPARQL</a>
</div> <!-- #foot_l -->
<div class="foot_r" id="foot_r">
- iSPARQL Copyright © 2006-2012 OpenLink Software<br/><span id="ft_loc"></span><br/>
+ iSPARQL Copyright © 2006-2011 OpenLink Software<br/><span id="ft_loc"></span><br/>
</div>
<div id="stats"></div> <!-- stats -->
</div> <!-- #foot -->
diff --git a/binsrc/isparql/io.js b/binsrc/isparql/io.js
index af5cc58..a2d27f7 100644
--- a/binsrc/isparql/io.js
+++ b/binsrc/isparql/io.js
@@ -1,9 +1,9 @@
/*
- * $Id: io.js,v 1.8.2.11 2012/03/08 13:18:57 source Exp $
+ * $Id: io.js,v 1.8.2.10 2011/06/24 11:29:13 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/location.js b/binsrc/isparql/location.js
index 3187172..daaed32 100644
--- a/binsrc/isparql/location.js
+++ b/binsrc/isparql/location.js
@@ -1,9 +1,9 @@
/*
- * $Id: location.js,v 1.1.2.8 2012/03/08 13:18:57 source Exp $
+ * $Id: location.js,v 1.1.2.7 2011/03/23 11:56:21 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/main.js b/binsrc/isparql/main.js
index 27ee8c2..85bf950 100644
--- a/binsrc/isparql/main.js
+++ b/binsrc/isparql/main.js
@@ -1,9 +1,9 @@
/*
- * $Id: main.js,v 1.45.2.41 2012/03/08 13:18:57 source Exp $
+ * $Id: main.js,v 1.45.2.39 2011/09/08 15:14:18 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
@@ -1307,21 +1307,6 @@ iSPARQL.ServerConnection = function (uri, authObj) {
self.authObj = OAT.JSON.deserialize(sessionStorage.iSPARQLAuth);
}
-
- this.connectTestCb = function () {
- self.saveAuth ();
- OAT.WebDav.init({imageExt:"png",
- imagePath:toolkitImagesPath,
- silentStart:true,
- user:self.authObj.user,
- pass:self.authObj.password,
- isDav:true});
-
- self.detectServerProperties ();
-
- OAT.MSG.send (self, "iSPARQL_SERVER_CONNECTED", self);
- }
-
this.connect = function (_user, _pass, caller) {
self.authObj.user = _user;
self.authObj.password = _pass;
@@ -1330,8 +1315,10 @@ iSPARQL.ServerConnection = function (uri, authObj) {
if ((!!self.authObj.user) && self.authObj.user != '')
{
OAT.AJAX.PROPFIND ('/DAV/home/' + _user,'',
- self.connectTestCb,
- {async:true,
+ function (data, headers) {
+ self.connected = true;
+ },
+ {async:false,
user: self.authObj.user,
password: self.authObj.password,
onstart:function() {return},
@@ -1342,6 +1329,19 @@ iSPARQL.ServerConnection = function (uri, authObj) {
else self.error = 'Unknown error';
self.connected = false; }});
+ if (self.connected) {
+ self.saveAuth ();
+ OAT.WebDav.init({imageExt:"png",
+ imagePath:toolkitImagesPath,
+ silentStart:true,
+ user:self.authObj.user,
+ pass:self.authObj.password,
+ isDav:true});
+
+ self.detectServerProperties ();
+
+ OAT.MSG.send (self, "iSPARQL_SERVER_CONNECTED", self);
+ }
}
}
diff --git a/binsrc/isparql/make_vad.sh b/binsrc/isparql/make_vad.sh
index aa867da..46e7188 100755
--- a/binsrc/isparql/make_vad.sh
+++ b/binsrc/isparql/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.17.2.7 2012/03/08 12:55:00 source Exp $
+# $Id: make_vad.sh,v 1.17.2.5 2011/02/03 10:28:23 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -280,7 +280,7 @@ sticker_init() {
echo " <name package=\"iSPARQL\">" >> $STICKER
echo " <prop name=\"Title\" value=\"iSPARQL\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/isparql/qbe.js b/binsrc/isparql/qbe.js
index e20030d..68ebbbc 100644
--- a/binsrc/isparql/qbe.js
+++ b/binsrc/isparql/qbe.js
@@ -1,9 +1,9 @@
/*
- * $Id: qbe.js,v 1.36.2.15 2012/03/08 13:18:57 source Exp $
+ * $Id: qbe.js,v 1.36.2.14 2011/09/05 15:27:50 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/remote.vsp b/binsrc/isparql/remote.vsp
index 2016c02..d7479a1 100644
--- a/binsrc/isparql/remote.vsp
+++ b/binsrc/isparql/remote.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: remote.vsp,v 1.3.2.2 2012/03/08 12:55:00 source Exp $
+-- $Id: remote.vsp,v 1.3.2.1 2009/06/10 19:49:06 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/isparql/set_dav_props.vsp b/binsrc/isparql/set_dav_props.vsp
index a7cb343..745e84d 100644
--- a/binsrc/isparql/set_dav_props.vsp
+++ b/binsrc/isparql/set_dav_props.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: set_dav_props.vsp,v 1.5.2.2 2012/03/08 12:55:00 source Exp $
+-- $Id: set_dav_props.vsp,v 1.5.2.1 2009/06/10 19:49:06 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/isparql/sql/drop.sql b/binsrc/isparql/sql/drop.sql
index f21a1d9..99f48d8 100644
--- a/binsrc/isparql/sql/drop.sql
+++ b/binsrc/isparql/sql/drop.sql
@@ -1,9 +1,9 @@
--
--- $Id: drop.sql,v 1.5.2.1 2012/03/08 13:18:57 source Exp $
+-- $Id: drop.sql,v 1.5 2009/01/06 22:15:02 source Exp $
--
-- This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
--
--- Copyright (C) 2009-2012 OpenLink Software
+-- Copyright (C) 2009 OpenLink Software
--
-- See LICENSE file for details.
--
diff --git a/binsrc/isparql/sql/setup.sql b/binsrc/isparql/sql/setup.sql
index 40574f3..ff90ca7 100644
--- a/binsrc/isparql/sql/setup.sql
+++ b/binsrc/isparql/sql/setup.sql
@@ -1,9 +1,9 @@
--
--- $Id: setup.sql,v 1.10.2.1 2012/03/08 13:18:57 source Exp $
+-- $Id: setup.sql,v 1.10 2009/01/06 22:15:02 source Exp $
--
-- This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
--
--- Copyright (C) 2009-2012 OpenLink Software
+-- Copyright (C) 2009 OpenLink Software
--
-- See LICENSE file for details.
--
diff --git a/binsrc/isparql/statusui.js b/binsrc/isparql/statusui.js
index ab31526..d703b8c 100644
--- a/binsrc/isparql/statusui.js
+++ b/binsrc/isparql/statusui.js
@@ -1,9 +1,9 @@
/*
- * $Id: statusui.js,v 1.1.2.6 2012/03/08 13:18:57 source Exp $
+ * $Id: statusui.js,v 1.1.2.5 2011/02/03 10:28:23 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/dialog.css b/binsrc/isparql/styles/dialog.css
index 80e6cdb..49cc246 100644
--- a/binsrc/isparql/styles/dialog.css
+++ b/binsrc/isparql/styles/dialog.css
@@ -1,9 +1,9 @@
/*
- * $Id: dialog.css,v 1.1.2.6 2012/03/08 13:18:57 source Exp $
+ * $Id: dialog.css,v 1.1.2.5 2011/01/25 14:08:45 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/execute.css b/binsrc/isparql/styles/execute.css
index a960483..b76bdd4 100644
--- a/binsrc/isparql/styles/execute.css
+++ b/binsrc/isparql/styles/execute.css
@@ -1,9 +1,9 @@
/*
- * $Id: execute.css,v 1.4.2.14 2012/03/08 13:18:57 source Exp $
+ * $Id: execute.css,v 1.4.2.13 2011/09/05 15:27:50 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/menu.css b/binsrc/isparql/styles/menu.css
index de24fb8..2c72aad 100644
--- a/binsrc/isparql/styles/menu.css
+++ b/binsrc/isparql/styles/menu.css
@@ -1,9 +1,9 @@
/*
- * $Id: menu.css,v 1.2.2.5 2012/03/08 13:18:57 source Exp $
+ * $Id: menu.css,v 1.2.2.4 2011/08/29 10:27:33 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/mobile.css b/binsrc/isparql/styles/mobile.css
index 5fb6f11..e7d56fa 100644
--- a/binsrc/isparql/styles/mobile.css
+++ b/binsrc/isparql/styles/mobile.css
@@ -1,9 +1,9 @@
/*
- * $Id: mobile.css,v 1.1.2.5 2012/03/08 13:18:57 source Exp $
+ * $Id: mobile.css,v 1.1.2.4 2011/02/18 15:40:13 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/qbe.css b/binsrc/isparql/styles/qbe.css
index a442b5d..c0dfa91 100644
--- a/binsrc/isparql/styles/qbe.css
+++ b/binsrc/isparql/styles/qbe.css
@@ -1,9 +1,9 @@
/*
- * $Id: qbe.css,v 1.5.2.4 2012/03/08 13:18:57 source Exp $
+ * $Id: qbe.css,v 1.5.2.3 2009/09/13 21:52:19 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/styles/style.css b/binsrc/isparql/styles/style.css
index f0a6248..94eaabe 100644
--- a/binsrc/isparql/styles/style.css
+++ b/binsrc/isparql/styles/style.css
@@ -1,9 +1,9 @@
/*
- * $Id: style.css,v 1.7.2.18 2012/03/08 13:18:57 source Exp $
+ * $Id: style.css,v 1.7.2.17 2011/08/29 10:27:33 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2009-2012 OpenLink Software
+ * Copyright (C) 2009 OpenLink Software
*
* See LICENSE file for details.
*
diff --git a/binsrc/isparql/vad_version b/binsrc/isparql/vad_version
index 81bdf53..466388f 100644
--- a/binsrc/isparql/vad_version
+++ b/binsrc/isparql/vad_version
@@ -1 +1 @@
-1.27.82
+1.27.69
diff --git a/binsrc/isparql/xslt/dynamic-page.xsl b/binsrc/isparql/xslt/dynamic-page.xsl
index 0213fb8..a3b2309 100644
--- a/binsrc/isparql/xslt/dynamic-page.xsl
+++ b/binsrc/isparql/xslt/dynamic-page.xsl
@@ -1,11 +1,11 @@
<?xml version="1.0" ?>
<!--
- $Id: dynamic-page.xsl,v 1.14.2.4 2012/03/08 13:18:57 source Exp $
+ $Id: dynamic-page.xsl,v 1.14.2.3 2009/10/06 19:25:31 source Exp $
This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
- Copyright (C) 2009-2012 OpenLink Software
+ Copyright (C) 2009 OpenLink Software
See LICENSE file for details.
diff --git a/binsrc/jena/Makefile.am b/binsrc/jena/Makefile.am
index f298590..82190c8 100644
--- a/binsrc/jena/Makefile.am
+++ b/binsrc/jena/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -83,7 +83,7 @@ doc:
#
# Run testsuite if WITH_JDK was found
#
-if WITH_JDK4
+if WITH_JDK3
run-tests: virt_jena.jar
$(JAVAC) $(JDK_FLAGS) \
-classpath "$(JENA_CLASSPATH):./virt_jena.jar" \
diff --git a/binsrc/jena/Makefile.in b/binsrc/jena/Makefile.in
index 1bbf849..92135ec 100644
--- a/binsrc/jena/Makefile.in
+++ b/binsrc/jena/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -534,13 +532,13 @@ doc:
#
# Run testsuite if WITH_JDK was found
#
- at WITH_JDK4_TRUE@run-tests: virt_jena.jar
- at WITH_JDK4_TRUE@ $(JAVAC) $(JDK_FLAGS) \
- at WITH_JDK4_TRUE@ -classpath "$(JENA_CLASSPATH):./virt_jena.jar" \
- at WITH_JDK4_TRUE@ $(TESTSUITE_SRC)
- at WITH_JDK4_TRUE@ cd testsuite && env JAVA="$(JAVA)" PORT="$(PORT)" $(SHELL) start.sh
- at WITH_JDK4_FALSE@run-tests:
- at WITH_JDK4_FALSE@ @echo "***WARNING: Disabled Jena test suite"
+ at WITH_JDK3_TRUE@run-tests: virt_jena.jar
+ at WITH_JDK3_TRUE@ $(JAVAC) $(JDK_FLAGS) \
+ at WITH_JDK3_TRUE@ -classpath "$(JENA_CLASSPATH):./virt_jena.jar" \
+ at WITH_JDK3_TRUE@ $(TESTSUITE_SRC)
+ at WITH_JDK3_TRUE@ cd testsuite && env JAVA="$(JAVA)" PORT="$(PORT)" $(SHELL) start.sh
+ at WITH_JDK3_FALSE@run-tests:
+ at WITH_JDK3_FALSE@ @echo "***WARNING: Disabled Jena test suite"
.PHONY: version
version:
diff --git a/binsrc/jena/testsuite/start.sh b/binsrc/jena/testsuite/start.sh
index 60ff442..291bb14 100755
--- a/binsrc/jena/testsuite/start.sh
+++ b/binsrc/jena/testsuite/start.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: start.sh,v 1.3.2.4 2012/03/08 12:55:00 source Exp $
+# $Id: start.sh,v 1.3.2.3 2010/04/01 10:54:36 source Exp $
#
# Jena tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/Version.java b/binsrc/jena/virtuoso_driver/Version.java
index 3c8d36c..c46acd0 100644
--- a/binsrc/jena/virtuoso_driver/Version.java
+++ b/binsrc/jena/virtuoso_driver/Version.java
@@ -1,10 +1,10 @@
/*
- * $Id: Version.java,v 1.1.4.8 2012/03/15 12:56:34 source Exp $
+ * $Id: Version.java,v 1.1.4.6 2011/05/17 13:56:30 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -29,7 +29,7 @@ public class Version {
protected static final String DRV_VER = "2.6.2";
// The major and minor version number
- protected static final String build_id = "1.6";
+ protected static final String build_id = "1.5";
public static void main(String args[])
{
diff --git a/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java b/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java
index 659813b..4a2bfae 100644
--- a/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java
+++ b/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtBulkUpdateHandler.java,v 1.6.2.4 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtBulkUpdateHandler.java,v 1.6.2.3 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtDataSource.java b/binsrc/jena/virtuoso_driver/VirtDataSource.java
index 18fff28..618c5f8 100644
--- a/binsrc/jena/virtuoso_driver/VirtDataSource.java
+++ b/binsrc/jena/virtuoso_driver/VirtDataSource.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtDataSource.java,v 1.7.2.8 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtDataSource.java,v 1.7.2.7 2011/05/17 13:56:30 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtGraph.java b/binsrc/jena/virtuoso_driver/VirtGraph.java
index 783d00a..72e25dd 100644
--- a/binsrc/jena/virtuoso_driver/VirtGraph.java
+++ b/binsrc/jena/virtuoso_driver/VirtGraph.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtGraph.java,v 1.15.2.18 2012/03/15 12:56:34 source Exp $
+ * $Id: VirtGraph.java,v 1.15.2.16 2011/05/17 13:56:30 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -58,8 +58,8 @@ public class VirtGraph extends GraphBase
protected String ruleSet = null;
protected boolean useSameAs = false;
protected int queryTimeout = 0;
- static final String sinsert = "sparql insert into graph iri(??) { `iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)` }";
- static final String sdelete = "sparql delete from graph iri(??) {`iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)`}";
+ static final String sinsert = "sparql define output:format '_JAVA_' insert into graph iri(??) { `iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)` }";
+ static final String sdelete = "sparql define output:format '_JAVA_' delete from graph iri(??) {`iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)`}";
static final int BATCH_SIZE = 5000;
static final String utf8 = "charset=utf-8";
static final String charset = "UTF-8";
diff --git a/binsrc/jena/virtuoso_driver/VirtInfGraph.java b/binsrc/jena/virtuoso_driver/VirtInfGraph.java
index 189bf61..8559b8c 100644
--- a/binsrc/jena/virtuoso_driver/VirtInfGraph.java
+++ b/binsrc/jena/virtuoso_driver/VirtInfGraph.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtInfGraph.java,v 1.1.4.4 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtInfGraph.java,v 1.1.4.3 2010/04/06 14:35:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtModel.java b/binsrc/jena/virtuoso_driver/VirtModel.java
index 87546e0..c71b851 100644
--- a/binsrc/jena/virtuoso_driver/VirtModel.java
+++ b/binsrc/jena/virtuoso_driver/VirtModel.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtModel.java,v 1.1.2.6 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtModel.java,v 1.1.2.5 2010/06/28 10:30:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java b/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java
index a7ce721..3834f22 100644
--- a/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java
+++ b/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtPrefixMapping.java,v 1.3.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtPrefixMapping.java,v 1.3.2.2 2011/05/17 13:56:30 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtResSetIter.java b/binsrc/jena/virtuoso_driver/VirtResSetIter.java
index f72d8e9..640219e 100644
--- a/binsrc/jena/virtuoso_driver/VirtResSetIter.java
+++ b/binsrc/jena/virtuoso_driver/VirtResSetIter.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtResSetIter.java,v 1.8.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtResSetIter.java,v 1.8.2.2 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java b/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java
index 13d48f9..c54390d 100644
--- a/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java
+++ b/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtTransactionHandler.java,v 1.3.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtTransactionHandler.java,v 1.3.2.2 2011/03/23 11:58:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java b/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java
index 20c8fa7..eebcdbd 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoQueryEngine.java,v 1.1.4.9 2012/03/15 12:56:34 source Exp $
+ * $Id: VirtuosoQueryEngine.java,v 1.1.4.7 2011/05/17 13:56:30 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -144,8 +144,19 @@ public class VirtuosoQueryEngine extends QueryEngineMain
private String fixQuery(String query, Binding args, VirtGraph vg)
{
+ StringTokenizer tok = new StringTokenizer(query);
+ String s = "";
StringBuffer sb = new StringBuffer("sparql\n ");
+ while (tok.hasMoreTokens()) {
+ s = tok.nextToken().toLowerCase();
+ if (s.equals("describe") || s.equals("construct"))
+ break;
+ }
+
+ if (s.equals("describe") || s.equals("construct"))
+ sb.append("define output:format '_JAVA_'\n ");
+
if (vg.getRuleSet()!=null)
sb.append(" define input:inference '"+vg.getRuleSet()+"'\n ");
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoQueryExecution.java b/binsrc/jena/virtuoso_driver/VirtuosoQueryExecution.java
index 4850768..818ea34 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoQueryExecution.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoQueryExecution.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoQueryExecution.java,v 1.11.2.11 2012/03/15 12:56:34 source Exp $
+ * $Id: VirtuosoQueryExecution.java,v 1.11.2.9 2011/05/17 13:56:31 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -276,8 +276,19 @@ public class VirtuosoQueryExecution implements QueryExecution
private String getQuery()
{
+//-- StringBuffer sb = new StringBuffer("sparql\n define output:format '_JAVA_'\n");
StringBuffer sb = new StringBuffer("sparql\n ");
+ StringTokenizer tok = new StringTokenizer(virt_query);
+ String s = "";
+ while(tok.hasMoreTokens()) {
+ s = tok.nextToken().toLowerCase();
+ if (s.equals("describe") || s.equals("construct") || s.equals("ask") || s.equals("select"))
+ break;
+ }
+ if (s.equals("describe") || s.equals("construct") || s.equals("ask"))
+ sb.append("define output:format '_JAVA_'\n ");
+
if (graph.getRuleSet()!= null)
sb.append(" define input:inference '"+graph.getRuleSet()+"'\n");
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoQueryExecutionFactory.java b/binsrc/jena/virtuoso_driver/VirtuosoQueryExecutionFactory.java
index 7ee8851..9b8dd50 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoQueryExecutionFactory.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoQueryExecutionFactory.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoQueryExecutionFactory.java,v 1.4.2.4 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoQueryExecutionFactory.java,v 1.4.2.3 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java
index 3ec963f..ef1e4ce 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample1.java,v 1.5.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample1.java,v 1.5.2.2 2010/06/01 14:12:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java
index 113577b..e951d80 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample10.java,v 1.1.2.5 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample10.java,v 1.1.2.4 2010/06/01 14:12:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java
index 4742bf3..ebe7d21 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample11.java,v 1.1.2.4 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample11.java,v 1.1.2.3 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java
index 782797a..b0af097 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample12.java,v 1.1.4.4 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample12.java,v 1.1.4.3 2010/04/06 14:35:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java
index f16afca..efa9416 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample13.java,v 1.1.4.3 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample13.java,v 1.1.4.2 2010/04/06 14:35:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2008 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java
index c108802..920440c 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample2.java,v 1.4.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample2.java,v 1.4.2.1 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java
index 9b1c29c..abab9c0 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample3.java,v 1.4.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample3.java,v 1.4.2.2 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java
index a485c64..615d080 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample4.java,v 1.4.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample4.java,v 1.4.2.1 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java
index faa6470..c475ea4 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample5.java,v 1.4.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample5.java,v 1.4.2.1 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java
index 9d8eac5..7366d95 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample6.java,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample6.java,v 1.2.2.1 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java
index cef493d..7eaec01 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample7.java,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample7.java,v 1.2.2.1 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java
index d4e7cef..b7d114e 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample8.java,v 1.3.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample8.java,v 1.3.2.2 2010/06/01 14:12:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java
index e0db944..795af9e 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSPARQLExample9.java,v 1.2.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoSPARQLExample9.java,v 1.2.2.2 2010/06/01 14:12:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java b/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java
index bbddbdc..4c3654e 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoUpdateFactory.java,v 1.1.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: VirtuosoUpdateFactory.java,v 1.1.2.1 2010/04/01 10:54:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java b/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java
index 3877e60..d8bef05 100644
--- a/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java
+++ b/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoUpdateRequest.java,v 1.4.2.6 2012/03/15 12:56:34 source Exp $
+ * $Id: VirtuosoUpdateRequest.java,v 1.4.2.4 2011/05/17 13:56:31 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -65,7 +65,7 @@ public class VirtuosoUpdateRequest
for ( Iterator iter = requests.iterator() ; iter.hasNext(); )
{
- String query = "sparql\n "+ (String)iter.next();
+ String query = "sparql\n define output:format '_JAVA_'\n "+ (String)iter.next();
stmt.execute(query);
}
diff --git a/binsrc/maildrop/Makefile.am b/binsrc/maildrop/Makefile.am
index 3c6173b..1008e3f 100644
--- a/binsrc/maildrop/Makefile.am
+++ b/binsrc/maildrop/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/Makefile.in b/binsrc/maildrop/Makefile.in
index 9c2f9f7..c1e3d2b 100644
--- a/binsrc/maildrop/Makefile.in
+++ b/binsrc/maildrop/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -143,7 +143,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -192,7 +191,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -244,7 +242,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -291,6 +288,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/maildrop/dkstub.c b/binsrc/maildrop/dkstub.c
index 8ef5a9c..2f5786c 100644
--- a/binsrc/maildrop/dkstub.c
+++ b/binsrc/maildrop/dkstub.c
@@ -1,10 +1,10 @@
/*
- * $Id: dkstub.c,v 1.1.1.1.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: dkstub.c,v 1.1.1.1.2.1 2010/01/25 23:41:20 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/odbc_mail.c b/binsrc/maildrop/odbc_mail.c
index 11dc845..ac46f0f 100644
--- a/binsrc/maildrop/odbc_mail.c
+++ b/binsrc/maildrop/odbc_mail.c
@@ -1,12 +1,12 @@
/*
- * $Id: odbc_mail.c,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: odbc_mail.c,v 1.2.2.1 2010/01/25 23:41:20 source Exp $
*
* ODBC Mail Dropper
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/odbc_mail.default.ini b/binsrc/maildrop/odbc_mail.default.ini
index 93fab27..7b64086 100644
--- a/binsrc/maildrop/odbc_mail.default.ini
+++ b/binsrc/maildrop/odbc_mail.default.ini
@@ -6,7 +6,7 @@
; This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
; project.
;
-; Copyright (C) 1998-2012 OpenLink Software
+; Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/odbc_mail_vers.c b/binsrc/maildrop/odbc_mail_vers.c
index 854103b..eff2eb6 100644
--- a/binsrc/maildrop/odbc_mail_vers.c
+++ b/binsrc/maildrop/odbc_mail_vers.c
@@ -4,6 +4,6 @@
char version[] = "\
OpenLink ODBC Mail Interface\n\
-Version 2.01 as of Tue Mar 13 01:44:02 CET 2012.\n\
-Compiled for Linux 2.6.42.3-2.fc15.x86_64\n\
-Copyright (C) 1998-2012 OpenLink Software.\n";
+Version 2.01 as of Fri Oct 28 19:31:13 CEST 2011.\n\
+Compiled for Linux 2.6.37.1-1.2-default\n\
+Copyright (C) OpenLink Software.\n";
diff --git a/binsrc/maildrop/virt_mail_vers.c b/binsrc/maildrop/virt_mail_vers.c
index 3734e0f..33143ec 100644
--- a/binsrc/maildrop/virt_mail_vers.c
+++ b/binsrc/maildrop/virt_mail_vers.c
@@ -4,6 +4,6 @@
char version[] = "\
OpenLink Virtuoso Mail Interface\n\
-Version 2.01 as of Tue Mar 13 01:44:02 CET 2012.\n\
-Compiled for Linux 2.6.42.3-2.fc15.x86_64\n\
-Copyright (C) 1998-2012 OpenLink Software.\n";
+Version 2.01 as of Fri Oct 28 19:31:13 CEST 2011.\n\
+Compiled for Linux 2.6.37.1-1.2-default\n\
+Copyright (C) OpenLink Software.\n";
diff --git a/binsrc/maildrop/win32/OpenX/Dialogs.ifs b/binsrc/maildrop/win32/OpenX/Dialogs.ifs
index 231d017..342505a 100644
--- a/binsrc/maildrop/win32/OpenX/Dialogs.ifs
+++ b/binsrc/maildrop/win32/OpenX/Dialogs.ifs
@@ -1,14 +1,14 @@
(*
* Dialogs.ifs
*
- * $Id: Dialogs.ifs,v 1.1.1.1.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: Dialogs.ifs,v 1.1.1.1.2.1 2010/01/25 23:41:20 source Exp $
*
* Setup functions for extended Inno Setup
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/win32/OpenX/maildrop.iss b/binsrc/maildrop/win32/OpenX/maildrop.iss
index a38251f..691b3e3 100644
--- a/binsrc/maildrop/win32/OpenX/maildrop.iss
+++ b/binsrc/maildrop/win32/OpenX/maildrop.iss
@@ -15,7 +15,7 @@ AlwaysCreateUninstallIcon=true
MinVersion=0,5.0.2195
-AppCopyright=© 1998-2012 OpenLink Software
+AppCopyright=© 2002 OpenLink Software
WizardImageFile=compiler:WizModernImage14.bmp
WizardSmallImageFile=compiler:WizModernSmallImage14.bmp
DisableStartupPrompt=true
diff --git a/binsrc/maildrop/win32/OpenX/odbc_mail.ini b/binsrc/maildrop/win32/OpenX/odbc_mail.ini
index 78bc2d9..60eb6b6 100644
--- a/binsrc/maildrop/win32/OpenX/odbc_mail.ini
+++ b/binsrc/maildrop/win32/OpenX/odbc_mail.ini
@@ -6,7 +6,7 @@
; This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
; project.
;
-; Copyright (C) 1998-2012 OpenLink Software
+; Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/win32/generate.bat b/binsrc/maildrop/win32/generate.bat
index 6e45226..8457e17 100644
--- a/binsrc/maildrop/win32/generate.bat
+++ b/binsrc/maildrop/win32/generate.bat
@@ -2,7 +2,7 @@ rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2010 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/maildrop/win32/maildrop.cpp b/binsrc/maildrop/win32/maildrop.cpp
index e108c2d..4318d4c 100644
--- a/binsrc/maildrop/win32/maildrop.cpp
+++ b/binsrc/maildrop/win32/maildrop.cpp
@@ -1,12 +1,12 @@
/*
* maildrop.cpp
*
- * $Id: maildrop.cpp,v 1.2.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: maildrop.cpp,v 1.2.2.1 2010/01/25 23:41:20 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/win32/maildrop.idl b/binsrc/maildrop/win32/maildrop.idl
index ca3ed1e..f145ba2 100644
--- a/binsrc/maildrop/win32/maildrop.idl
+++ b/binsrc/maildrop/win32/maildrop.idl
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/win32/mpl.c b/binsrc/maildrop/win32/mpl.c
index c8afa45..f9abe74 100644
--- a/binsrc/maildrop/win32/mpl.c
+++ b/binsrc/maildrop/win32/mpl.c
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/maildrop/win32/register.bat b/binsrc/maildrop/win32/register.bat
index c590adf..66c8463 100644
--- a/binsrc/maildrop/win32/register.bat
+++ b/binsrc/maildrop/win32/register.bat
@@ -2,7 +2,7 @@ rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2010 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/mono/Makefile.am b/binsrc/mono/Makefile.am
index cb4f6af..837cc4c 100644
--- a/binsrc/mono/Makefile.am
+++ b/binsrc/mono/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/mono/Makefile.in b/binsrc/mono/Makefile.in
index b51aa75..8ae7d52 100644
--- a/binsrc/mono/Makefile.in
+++ b/binsrc/mono/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/mono/mono-build.sh b/binsrc/mono/mono-build.sh
index 3c10c24..5797dd9 100755
--- a/binsrc/mono/mono-build.sh
+++ b/binsrc/mono/mono-build.sh
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/oat/LICENSE b/binsrc/oat/LICENSE
index 5529698..057f441 100644
--- a/binsrc/oat/LICENSE
+++ b/binsrc/oat/LICENSE
@@ -1,5 +1,5 @@
OpenLink Software's Ajax Toolkit (OAT)
-Copyright (C) 2005-2012 OpenLink Software
+Copyright (C) 2005-2009 OpenLink Software
This software is licensed under the GNU General Public License (see
COPYING).
diff --git a/binsrc/oat/Makefile.am b/binsrc/oat/Makefile.am
index aff0b29..44611d5 100644
--- a/binsrc/oat/Makefile.am
+++ b/binsrc/oat/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Ajax Toolkit (OAT) project
#
# Copyright (C) 2006 by Ondrej Zara
-# Copyright (C) 2006-2012 by OpenLink Software
+# Copyright (C) 2006 by 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
diff --git a/binsrc/oat/Makefile.in b/binsrc/oat/Makefile.in
index d917ef7..a8ece80 100644
--- a/binsrc/oat/Makefile.in
+++ b/binsrc/oat/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Ajax Toolkit (OAT) project
#
# Copyright (C) 2006 by Ondrej Zara
-# Copyright (C) 2006-2012 by OpenLink Software
+# Copyright (C) 2006 by 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
@@ -98,7 +98,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -147,7 +146,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -199,7 +197,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -246,6 +243,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/oat/styles/grid.css b/binsrc/oat/styles/grid.css
index 5a9f4ea..1af4dc6 100644
--- a/binsrc/oat/styles/grid.css
+++ b/binsrc/oat/styles/grid.css
@@ -1,9 +1,9 @@
/*
- * $Id: grid.css,v 1.4.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: grid.css,v 1.4.2.2 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/styles/pivot.css b/binsrc/oat/styles/pivot.css
index 1f98873..fae3340 100644
--- a/binsrc/oat/styles/pivot.css
+++ b/binsrc/oat/styles/pivot.css
@@ -1,9 +1,9 @@
/*
- * $Id: pivot.css,v 1.3.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: pivot.css,v 1.3.2.1 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/styles/rdftabs.css b/binsrc/oat/styles/rdftabs.css
index c4163b6..2e82bf1 100644
--- a/binsrc/oat/styles/rdftabs.css
+++ b/binsrc/oat/styles/rdftabs.css
@@ -1,9 +1,9 @@
/*
- * $Id: rdftabs.css,v 1.6.2.7 2012/03/08 12:55:00 source Exp $
+ * $Id: rdftabs.css,v 1.6.2.6 2011/08/21 12:50:21 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/styles/timeline.css b/binsrc/oat/styles/timeline.css
index 0444847..e273865 100644
--- a/binsrc/oat/styles/timeline.css
+++ b/binsrc/oat/styles/timeline.css
@@ -1,9 +1,9 @@
/*
- * $Id: timeline.css,v 1.4.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: timeline.css,v 1.4.2.1 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/styles/webdav.css b/binsrc/oat/styles/webdav.css
index c72b801..787c5c8 100644
--- a/binsrc/oat/styles/webdav.css
+++ b/binsrc/oat/styles/webdav.css
@@ -1,9 +1,9 @@
/*
- * $Id: webdav.css,v 1.3.2.2 2012/03/08 12:55:00 source Exp $
+ * $Id: webdav.css,v 1.3.2.1 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/ajax.js b/binsrc/oat/toolkit/ajax.js
index 5bf4ad2..4e10372 100644
--- a/binsrc/oat/toolkit/ajax.js
+++ b/binsrc/oat/toolkit/ajax.js
@@ -1,9 +1,9 @@
/*
- * $Id: ajax.js,v 1.10.2.8 2012/03/08 12:55:00 source Exp $
+ * $Id: ajax.js,v 1.10.2.7 2011/08/29 10:19:49 source Exp $
*
* This file is part of the OpenLink Software AJAX Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/anchor.js b/binsrc/oat/toolkit/anchor.js
index 1a4374c..355e6b6 100644
--- a/binsrc/oat/toolkit/anchor.js
+++ b/binsrc/oat/toolkit/anchor.js
@@ -1,9 +1,9 @@
/*
- * $Id: anchor.js,v 1.34.2.6 2012/03/08 12:55:00 source Exp $
+ * $Id: anchor.js,v 1.34.2.5 2011/03/08 13:08:17 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/animation.js b/binsrc/oat/toolkit/animation.js
index 670f5fb..e537474 100644
--- a/binsrc/oat/toolkit/animation.js
+++ b/binsrc/oat/toolkit/animation.js
@@ -1,9 +1,9 @@
/*
- * $Id: animation.js,v 1.9.2.4 2012/03/08 12:55:00 source Exp $
+ * $Id: animation.js,v 1.9.2.3 2011/06/24 11:27:27 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/barchart.js b/binsrc/oat/toolkit/barchart.js
index 7d18e36..b07bed8 100644
--- a/binsrc/oat/toolkit/barchart.js
+++ b/binsrc/oat/toolkit/barchart.js
@@ -1,9 +1,9 @@
/*
- * $Id: barchart.js,v 1.8.2.4 2012/03/08 12:55:00 source Exp $
+ * $Id: barchart.js,v 1.8.2.3 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/bezier.js b/binsrc/oat/toolkit/bezier.js
index e99a648..f22b241 100644
--- a/binsrc/oat/toolkit/bezier.js
+++ b/binsrc/oat/toolkit/bezier.js
@@ -1,9 +1,9 @@
/*
- * $Id: bezier.js,v 1.6.2.4 2012/03/08 12:55:00 source Exp $
+ * $Id: bezier.js,v 1.6.2.3 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/bindings.js b/binsrc/oat/toolkit/bindings.js
index 10752f3..8604302 100644
--- a/binsrc/oat/toolkit/bindings.js
+++ b/binsrc/oat/toolkit/bindings.js
@@ -1,9 +1,9 @@
/*
- * $Id: bindings.js,v 1.6.2.5 2012/03/08 12:55:00 source Exp $
+ * $Id: bindings.js,v 1.6.2.4 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/calendar.js b/binsrc/oat/toolkit/calendar.js
index 0f91e33..3d6217e 100644
--- a/binsrc/oat/toolkit/calendar.js
+++ b/binsrc/oat/toolkit/calendar.js
@@ -1,9 +1,9 @@
/*
- * $Id: calendar.js,v 1.11.2.6 2012/03/08 12:55:00 source Exp $
+ * $Id: calendar.js,v 1.11.2.5 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/canvas.js b/binsrc/oat/toolkit/canvas.js
index 106ac6e..4762029 100644
--- a/binsrc/oat/toolkit/canvas.js
+++ b/binsrc/oat/toolkit/canvas.js
@@ -1,9 +1,9 @@
/*
- * $Id: canvas.js,v 1.6.2.3 2012/03/08 12:55:00 source Exp $
+ * $Id: canvas.js,v 1.6.2.2 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/color.js b/binsrc/oat/toolkit/color.js
index a5753f3..803eed1 100644
--- a/binsrc/oat/toolkit/color.js
+++ b/binsrc/oat/toolkit/color.js
@@ -1,9 +1,9 @@
/*
- * $Id: color.js,v 1.8.2.5 2012/03/08 12:55:00 source Exp $
+ * $Id: color.js,v 1.8.2.4 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/combobox.js b/binsrc/oat/toolkit/combobox.js
index 22ed251..dfff1f8 100644
--- a/binsrc/oat/toolkit/combobox.js
+++ b/binsrc/oat/toolkit/combobox.js
@@ -1,9 +1,9 @@
/*
- * $Id: combobox.js,v 1.8.2.5 2012/03/08 12:55:00 source Exp $
+ * $Id: combobox.js,v 1.8.2.4 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/combobutton.js b/binsrc/oat/toolkit/combobutton.js
index b9327ae..958118d 100644
--- a/binsrc/oat/toolkit/combobutton.js
+++ b/binsrc/oat/toolkit/combobutton.js
@@ -1,9 +1,9 @@
/*
- * $Id: combobutton.js,v 1.8.2.5 2012/03/08 12:55:00 source Exp $
+ * $Id: combobutton.js,v 1.8.2.4 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/combolist.js b/binsrc/oat/toolkit/combolist.js
index abf7bfe..9144abb 100644
--- a/binsrc/oat/toolkit/combolist.js
+++ b/binsrc/oat/toolkit/combolist.js
@@ -1,9 +1,9 @@
/*
- * $Id: combolist.js,v 1.12.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: combolist.js,v 1.12.2.4 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/connection.js b/binsrc/oat/toolkit/connection.js
index 675afaf..2119f6f 100644
--- a/binsrc/oat/toolkit/connection.js
+++ b/binsrc/oat/toolkit/connection.js
@@ -1,9 +1,9 @@
/*
- * $Id: connection.js,v 1.8.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: connection.js,v 1.8.2.3 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/datasource.js b/binsrc/oat/toolkit/datasource.js
index 35fadb3..c7c60ad 100644
--- a/binsrc/oat/toolkit/datasource.js
+++ b/binsrc/oat/toolkit/datasource.js
@@ -1,9 +1,9 @@
/*
- * $Id: datasource.js,v 1.10.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: datasource.js,v 1.10.2.3 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dav.js b/binsrc/oat/toolkit/dav.js
index fe958b0..163a81c 100644
--- a/binsrc/oat/toolkit/dav.js
+++ b/binsrc/oat/toolkit/dav.js
@@ -1,9 +1,9 @@
/*
- * $Id: dav.js,v 1.36.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: dav.js,v 1.36.2.4 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/declarative.js b/binsrc/oat/toolkit/declarative.js
index e80466e..093f466 100644
--- a/binsrc/oat/toolkit/declarative.js
+++ b/binsrc/oat/toolkit/declarative.js
@@ -1,9 +1,9 @@
/*
- * $Id: declarative.js,v 1.7.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: declarative.js,v 1.7.2.3 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dereference.js b/binsrc/oat/toolkit/dereference.js
index 9e8c79d..c1d175c 100644
--- a/binsrc/oat/toolkit/dereference.js
+++ b/binsrc/oat/toolkit/dereference.js
@@ -1,9 +1,9 @@
/*
- * $Id: dereference.js,v 1.23.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: dereference.js,v 1.23.2.3 2010/04/06 16:46:11 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dialog.js b/binsrc/oat/toolkit/dialog.js
index 13dcd09..6bc1c0c 100644
--- a/binsrc/oat/toolkit/dialog.js
+++ b/binsrc/oat/toolkit/dialog.js
@@ -1,9 +1,9 @@
/*
- * $Id: dialog.js,v 1.13.2.7 2012/03/08 12:55:01 source Exp $
+ * $Id: dialog.js,v 1.13.2.6 2011/02/16 20:54:22 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dimmer.js b/binsrc/oat/toolkit/dimmer.js
index 598b40b..e3ff8cb 100644
--- a/binsrc/oat/toolkit/dimmer.js
+++ b/binsrc/oat/toolkit/dimmer.js
@@ -1,9 +1,9 @@
/*
- * $Id: dimmer.js,v 1.12.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: dimmer.js,v 1.12.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dock.js b/binsrc/oat/toolkit/dock.js
index 5f2ace0..e73ea01 100644
--- a/binsrc/oat/toolkit/dock.js
+++ b/binsrc/oat/toolkit/dock.js
@@ -1,9 +1,9 @@
/*
- * $Id: dock.js,v 1.11.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: dock.js,v 1.11.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/drag.js b/binsrc/oat/toolkit/drag.js
index 8c40171..781a969 100644
--- a/binsrc/oat/toolkit/drag.js
+++ b/binsrc/oat/toolkit/drag.js
@@ -1,9 +1,9 @@
/*
- * $Id: drag.js,v 1.11.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: drag.js,v 1.11.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/dstransport.js b/binsrc/oat/toolkit/dstransport.js
index cef1b6e..a7b78bd 100644
--- a/binsrc/oat/toolkit/dstransport.js
+++ b/binsrc/oat/toolkit/dstransport.js
@@ -1,9 +1,9 @@
/*
- * $Id: dstransport.js,v 1.5.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: dstransport.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/fisheye.js b/binsrc/oat/toolkit/fisheye.js
index 0c7566e..6820518 100644
--- a/binsrc/oat/toolkit/fisheye.js
+++ b/binsrc/oat/toolkit/fisheye.js
@@ -1,9 +1,9 @@
/*
- * $Id: fisheye.js,v 1.7.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: fisheye.js,v 1.7.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/form.js b/binsrc/oat/toolkit/form.js
index 5e35310..fe0dfdc 100644
--- a/binsrc/oat/toolkit/form.js
+++ b/binsrc/oat/toolkit/form.js
@@ -1,9 +1,9 @@
/*
- * $Id: form.js,v 1.10.2.6 2012/03/08 12:55:01 source Exp $
+ * $Id: form.js,v 1.10.2.5 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/formobject.js b/binsrc/oat/toolkit/formobject.js
index 87ee49a..7e270ac 100644
--- a/binsrc/oat/toolkit/formobject.js
+++ b/binsrc/oat/toolkit/formobject.js
@@ -1,9 +1,9 @@
/*
- * $Id: formobject.js,v 1.14.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: formobject.js,v 1.14.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/fresnel.js b/binsrc/oat/toolkit/fresnel.js
index 86e2e67..ef4dcdd 100644
--- a/binsrc/oat/toolkit/fresnel.js
+++ b/binsrc/oat/toolkit/fresnel.js
@@ -1,9 +1,9 @@
/*
- * $Id: fresnel.js,v 1.9.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: fresnel.js,v 1.9.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/geometry.js b/binsrc/oat/toolkit/geometry.js
index 244b1f9..feba3a1 100644
--- a/binsrc/oat/toolkit/geometry.js
+++ b/binsrc/oat/toolkit/geometry.js
@@ -1,9 +1,9 @@
/*
- * $Id: geometry.js,v 1.5.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: geometry.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/ghostdrag.js b/binsrc/oat/toolkit/ghostdrag.js
index 0929826..f4e3362 100644
--- a/binsrc/oat/toolkit/ghostdrag.js
+++ b/binsrc/oat/toolkit/ghostdrag.js
@@ -1,9 +1,9 @@
/*
- * $Id: ghostdrag.js,v 1.13.2.6 2012/03/08 12:55:01 source Exp $
+ * $Id: ghostdrag.js,v 1.13.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -117,18 +117,12 @@ OAT.GhostDrag = function() {
self.processes.push(process);
self.callbacks.push(callback);
var cica = true;
- var ref = function(e) {
- var rclick;
- if (!e) var e = window.event;
- if (e.which) rclick = (e.which == 3);
- else if (e.button) rclick = (e.button == 2);
- if (rclick) return;
-
- OAT.Event.prevent(e);
+ var ref = function(event) {
+ OAT.Event.prevent(event);
var index = self.sources.indexOf(elm);
if (index == -1) return;
- var x = e.clientX;
- var y = e.clientY;
+ var x = event.clientX;
+ var y = event.clientY;
self.startDrag(self.sources[index],self.processes[index],self.callbacks[index],x,y);
}
OAT.Event.attach(elm,"mousedown",ref);
diff --git a/binsrc/oat/toolkit/graph.js b/binsrc/oat/toolkit/graph.js
index 46ff836..28f0eb2 100644
--- a/binsrc/oat/toolkit/graph.js
+++ b/binsrc/oat/toolkit/graph.js
@@ -1,9 +1,9 @@
/*
- * $Id: graph.js,v 1.6.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: graph.js,v 1.6.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/graphsidebar.js b/binsrc/oat/toolkit/graphsidebar.js
index 4fa462e..df13ee3 100644
--- a/binsrc/oat/toolkit/graphsidebar.js
+++ b/binsrc/oat/toolkit/graphsidebar.js
@@ -1,9 +1,9 @@
/*
- * $Id: graphsidebar.js,v 1.6.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: graphsidebar.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/graphsvg.js b/binsrc/oat/toolkit/graphsvg.js
index c26b4d7..d7f598a 100644
--- a/binsrc/oat/toolkit/graphsvg.js
+++ b/binsrc/oat/toolkit/graphsvg.js
@@ -1,9 +1,9 @@
/*
- * $Id: graphsvg.js,v 1.12.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: graphsvg.js,v 1.12.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/grid.js b/binsrc/oat/toolkit/grid.js
index ce17ce8..580730e 100644
--- a/binsrc/oat/toolkit/grid.js
+++ b/binsrc/oat/toolkit/grid.js
@@ -1,9 +1,9 @@
/*
- * $Id: grid.js,v 1.16.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: grid.js,v 1.16.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/instant.js b/binsrc/oat/toolkit/instant.js
index ea5cb1f..10f3737 100644
--- a/binsrc/oat/toolkit/instant.js
+++ b/binsrc/oat/toolkit/instant.js
@@ -1,9 +1,9 @@
/*
- * $Id: instant.js,v 1.8.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: instant.js,v 1.8.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/jsobj.js b/binsrc/oat/toolkit/jsobj.js
index 02da5b5..62100c7 100644
--- a/binsrc/oat/toolkit/jsobj.js
+++ b/binsrc/oat/toolkit/jsobj.js
@@ -1,9 +1,9 @@
/*
- * $Id: jsobj.js,v 1.6.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: jsobj.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/json.js b/binsrc/oat/toolkit/json.js
index 6610ed7..eea9910 100644
--- a/binsrc/oat/toolkit/json.js
+++ b/binsrc/oat/toolkit/json.js
@@ -1,9 +1,9 @@
/*
- * $Id: json.js,v 1.8.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: json.js,v 1.8.2.4 2011/05/03 14:03:49 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/keyboard.js b/binsrc/oat/toolkit/keyboard.js
index 91cae60..3bf3af9 100644
--- a/binsrc/oat/toolkit/keyboard.js
+++ b/binsrc/oat/toolkit/keyboard.js
@@ -1,9 +1,9 @@
/*
- * $Id: keyboard.js,v 1.5.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: keyboard.js,v 1.5.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/layers.js b/binsrc/oat/toolkit/layers.js
index 3738ca7..5076796 100644
--- a/binsrc/oat/toolkit/layers.js
+++ b/binsrc/oat/toolkit/layers.js
@@ -1,9 +1,9 @@
/*
- * $Id: layers.js,v 1.7.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: layers.js,v 1.7.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/linechart.js b/binsrc/oat/toolkit/linechart.js
index 67210b7..fd77ecb 100644
--- a/binsrc/oat/toolkit/linechart.js
+++ b/binsrc/oat/toolkit/linechart.js
@@ -1,9 +1,9 @@
/*
- * $Id: linechart.js,v 1.5.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: linechart.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/loader.js b/binsrc/oat/toolkit/loader.js
index ec10094..6e210f9 100644
--- a/binsrc/oat/toolkit/loader.js
+++ b/binsrc/oat/toolkit/loader.js
@@ -1,9 +1,9 @@
/*
- * $Id: loader.js,v 1.87.2.27 2012/03/08 12:55:01 source Exp $
+ * $Id: loader.js,v 1.87.2.25 2011/10/25 23:37:37 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -86,8 +86,8 @@ OAT.Preferences = {
imagePath: "/DAV/JS/images/",
stylePath: "/DAV/JS/styles/",
endpointXmla: "/XMLA",
- version: "2.9.3",
- build: "$Date: 2012/03/08 12:55:01 $",
+ version: "2.9.2",
+ build: "$Date: 2011/10/25 23:37:37 $",
httpError: 1, /* show http errors */
allowDefaultResize: 1,
allowDefaultDrag: 1
diff --git a/binsrc/oat/toolkit/location.js b/binsrc/oat/toolkit/location.js
index c19cbf8..402e8a4 100644
--- a/binsrc/oat/toolkit/location.js
+++ b/binsrc/oat/toolkit/location.js
@@ -1,9 +1,9 @@
/*
- * $Id: location.js,v 1.1.4.3 2012/03/08 12:55:01 source Exp $
+ * $Id: location.js,v 1.1.4.2 2011/10/25 23:37:37 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2011 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/macwin.js b/binsrc/oat/toolkit/macwin.js
index c14149e..ef3bec2 100644
--- a/binsrc/oat/toolkit/macwin.js
+++ b/binsrc/oat/toolkit/macwin.js
@@ -1,9 +1,9 @@
/*
- * $Id: macwin.js,v 1.9.2.6 2012/03/08 12:55:01 source Exp $
+ * $Id: macwin.js,v 1.9.2.5 2010/09/07 21:56:37 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/map.js b/binsrc/oat/toolkit/map.js
index f497a02..853f9d3 100644
--- a/binsrc/oat/toolkit/map.js
+++ b/binsrc/oat/toolkit/map.js
@@ -1,9 +1,9 @@
/*
- * $Id: map.js,v 1.17.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: map.js,v 1.17.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -1176,7 +1176,6 @@ OAT.Map.loadApi = function(provider, optObj) {
window[funcName] = function() {
window[funcName] = null;
if (options.callback) { options.callback(provider); }
- OAT.MSG.send (OAT, "OAT_MAP_API_LOADED", provider);
}
return funcName;
}
diff --git a/binsrc/oat/toolkit/menu.js b/binsrc/oat/toolkit/menu.js
index aa71f37..370ed0a 100644
--- a/binsrc/oat/toolkit/menu.js
+++ b/binsrc/oat/toolkit/menu.js
@@ -1,9 +1,9 @@
/*
- * $Id: menu.js,v 1.11.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: menu.js,v 1.11.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/mswin.js b/binsrc/oat/toolkit/mswin.js
index 18dc936..1611aca 100644
--- a/binsrc/oat/toolkit/mswin.js
+++ b/binsrc/oat/toolkit/mswin.js
@@ -1,9 +1,9 @@
/*
- * $Id: mswin.js,v 1.9.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: mswin.js,v 1.9.2.4 2010/09/07 21:56:37 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/n3.js b/binsrc/oat/toolkit/n3.js
index a72d22a..2d02b85 100644
--- a/binsrc/oat/toolkit/n3.js
+++ b/binsrc/oat/toolkit/n3.js
@@ -1,9 +1,9 @@
/*
- * $Id: n3.js,v 1.5.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: n3.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/notify.js b/binsrc/oat/toolkit/notify.js
index 3e0f985..6c4fc0b 100644
--- a/binsrc/oat/toolkit/notify.js
+++ b/binsrc/oat/toolkit/notify.js
@@ -1,9 +1,9 @@
/*
- * $Id: notify.js,v 1.6.2.7 2012/03/08 12:55:01 source Exp $
+ * $Id: notify.js,v 1.6.2.6 2011/09/05 15:26:06 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/panelbar.js b/binsrc/oat/toolkit/panelbar.js
index 38f4475..489a95c 100644
--- a/binsrc/oat/toolkit/panelbar.js
+++ b/binsrc/oat/toolkit/panelbar.js
@@ -1,9 +1,9 @@
/*
- * $Id: panelbar.js,v 1.14.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: panelbar.js,v 1.14.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/piechart.js b/binsrc/oat/toolkit/piechart.js
index 4c1832a..383353c 100644
--- a/binsrc/oat/toolkit/piechart.js
+++ b/binsrc/oat/toolkit/piechart.js
@@ -1,9 +1,9 @@
/*
- * $Id: piechart.js,v 1.7.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: piechart.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/pivot.js b/binsrc/oat/toolkit/pivot.js
index b979648..993da14 100644
--- a/binsrc/oat/toolkit/pivot.js
+++ b/binsrc/oat/toolkit/pivot.js
@@ -1,9 +1,9 @@
/*
- * $Id: pivot.js,v 1.10.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: pivot.js,v 1.10.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/profiler.js b/binsrc/oat/toolkit/profiler.js
index 302a0f6..e29117d 100644
--- a/binsrc/oat/toolkit/profiler.js
+++ b/binsrc/oat/toolkit/profiler.js
@@ -1,9 +1,9 @@
/*
- * $Id: profiler.js,v 1.6.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: profiler.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/quickedit.js b/binsrc/oat/toolkit/quickedit.js
index 7d244d1..b8f4e40 100644
--- a/binsrc/oat/toolkit/quickedit.js
+++ b/binsrc/oat/toolkit/quickedit.js
@@ -1,9 +1,9 @@
/*
- * $Id: quickedit.js,v 1.6.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: quickedit.js,v 1.6.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rdf.js b/binsrc/oat/toolkit/rdf.js
index 347ecee..cd88d6f 100644
--- a/binsrc/oat/toolkit/rdf.js
+++ b/binsrc/oat/toolkit/rdf.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdf.js,v 1.13.2.11 2012/03/08 12:55:01 source Exp $
+ * $Id: rdf.js,v 1.13.2.10 2011/08/21 12:50:21 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rdfbrowser.js b/binsrc/oat/toolkit/rdfbrowser.js
index f0df022..da5d840 100644
--- a/binsrc/oat/toolkit/rdfbrowser.js
+++ b/binsrc/oat/toolkit/rdfbrowser.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdfbrowser.js,v 1.28.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: rdfbrowser.js,v 1.28.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rdfmini.js b/binsrc/oat/toolkit/rdfmini.js
index 0a422c0..54b133e 100644
--- a/binsrc/oat/toolkit/rdfmini.js
+++ b/binsrc/oat/toolkit/rdfmini.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdfmini.js,v 1.7.2.14 2012/03/08 12:55:01 source Exp $
+ * $Id: rdfmini.js,v 1.7.2.12 2011/08/29 10:22:17 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -193,10 +193,7 @@ OAT.RDFMini = function(div,optObj) {
ciri = OAT.IRIDB.resolveCIRI(data_.getValue());
content = OAT.Dom.create("span");
var a = OAT.Dom.create("a");
-
- if (label) a.innerHTML = label;
- else a.innerHTML = (self.options.raw_iris ? data : ciri);
-
+ a.innerHTML = (label ? label : ciri);
a.href = data;
content.appendChild(a);
self.processLink(a,data,disabledActions);
@@ -211,10 +208,7 @@ OAT.RDFMini = function(div,optObj) {
label = data_.label;
content = OAT.Dom.create("span");
var a = OAT.Dom.create("a");
-
- if (label) a.innerHTML = label;
- else a.innerHTML = (self.options.raw_iris ? data : ciri);
-
+ a.innerHTML = (label ? label : ciri);
a.href = data;
content.appendChild(a);
self.processLink(a,data,disabledActions);
diff --git a/binsrc/oat/toolkit/rdfstore.js b/binsrc/oat/toolkit/rdfstore.js
index f40897e..622ef76 100644
--- a/binsrc/oat/toolkit/rdfstore.js
+++ b/binsrc/oat/toolkit/rdfstore.js
@@ -1,8 +1,9 @@
-/* $Id: rdfstore.js,v 1.32.2.11 2012/03/08 12:55:01 source Exp $
+/*
+ * $Id: rdfstore.js,v 1.32.2.9 2011/08/21 12:50:21 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -712,10 +713,7 @@ OAT.RDFStore = function(tripleChangeCallback, optObj) {
if (!!item.label)
return item.label;
else
- if (self.options.raw_iris)
- return OAT.IRIDB.getIRI (item.iid);
- else
- return self.getCIRIorSplit (item.iid);
+ return self.getCIRIorSplit (item.iid)
}
// XXX
diff --git a/binsrc/oat/toolkit/rdftabs.js b/binsrc/oat/toolkit/rdftabs.js
index c8f1f9a..ae76dee 100644
--- a/binsrc/oat/toolkit/rdftabs.js
+++ b/binsrc/oat/toolkit/rdftabs.js
@@ -1,9 +1,9 @@
/*
- * $Id: rdftabs.js,v 1.63.2.27 2012/03/08 12:55:01 source Exp $
+ * $Id: rdftabs.js,v 1.63.2.25 2011/09/20 12:03:04 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
@@ -64,8 +64,7 @@ OAT.RDFTabs.browser = function(parent,optObj) {
pageSize:20,
removeNS:true,
description:"This view shows all RDF data grouped by subject resource.",
- desc:"RDF data by subject resource",
- raw_iris: false
+ desc:"RDF data by subject resource"
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -345,10 +344,7 @@ OAT.RDFTabs.browser = function(parent,optObj) {
elm.href = OAT.IRIDB.getIRI(value);
attach(elm,value);
}
-
- if (self.options.raw_iris) elm.innerHTML = elm.href;
- else elm.innerHTML = self.parent.store.getCIRIorSplit(value);
-
+ elm.innerHTML = self.parent.store.getCIRIorSplit(value);
if (i) { self.sortDiv.appendChild(OAT.Dom.text(", ")); }
self.sortDiv.appendChild(elm);
}
@@ -378,8 +374,7 @@ OAT.RDFTabs.navigator = function(parent,optObj) {
this.options = {
limit:5,
description:"This module is used to navigate through locally cached data, one resource at a time. Filters are not applied.",
- desc:"Navigate through locally cached data (Filters not applied)",
- raw_iris: false
+ desc:"Navigate through locally cached data (Filters not applied)"
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -600,10 +595,7 @@ OAT.RDFTabs.navigator = function(parent,optObj) {
} else if (type == 1) { /* dereferencable link */
content = OAT.Dom.create("a");
content.href = value.getIRI();
-
- if (self.options.raw_iris) content.innerHTML = value.getIRI();
- else content.innerHTML = self.parent.store.getCIRIorSplit(value.getIID());
-
+ content.innerHTML = self.parent.store.getCIRIorSplit(value.getIID());
self.dattach(content,value.getIRI());
}
} else { /* text */
@@ -704,9 +696,6 @@ OAT.RDFTabs.navigator = function(parent,optObj) {
if (iid in self.parent.store.labels)
a.innerHTML = self.parent.store.labels[iid].label;
else
- if (self.options.raw_iris)
- a.innerHTML = OAT.IRIDB.getIRI(iid);
- else
a.innerHTML = self.parent.store.getCIRIorSplit(iid);
a.title = a.href = OAT.IRIDB.getIRI(iid);
@@ -777,25 +766,15 @@ OAT.RDFTabs.navigator = function(parent,optObj) {
td.colSpan = 3;
var simple;
-
- if (self.options.raw_iris)
- simple = OAT.IRIDB.getIRI(label);
- else
simple = self.parent.store.getCIRIorSplit(label);
if (cnt > 1 && simple.charAt(0) != "[" && simple in self.plurals) {
simple = self.plurals[simple];
}//]
- var a = OAT.Dom.create("a", {className: "nav_rdf_subject"});
-
- a.innerHTML = simple;
- a.title = OAT.IRIDB.getIRI(label);
- a.href = simple;
-
- td.appendChild (a);
+ td.innerHTML = simple;
+ td.title = OAT.IRIDB.getIRI(label);
tr.appendChild(td);
-
OAT.Event.attach(arrow,"click",function() {
state = (state+1) % 2;
arrow.innerHTML = states[state];
@@ -966,8 +945,7 @@ OAT.RDFTabs.triples = function(parent,optObj) {
pageSize:100,
removeNS:true,
description:"This module displays all filtered triples.",
- desc:"All filtered triples",
- raw_iris: false
+ desc:"All filtered triples"
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -1061,12 +1039,7 @@ OAT.RDFTabs.triples = function(parent,optObj) {
try { // Dirty data does exist, you see...
var iri = decodeURIComponent(OAT.IRIDB.getIRI(iid));
var col_v_elm = OAT.Dom.create("a");
-
- if (self.options.raw_iris)
- col_v_elm.innerHTML = iri;
- else
- col_v_elm = self.parent.store.getCIRIorSplit(iid);
-
+ col_v_elm.innerHTML = self.parent.store.getCIRIorSplit(iid);
col_v_elm.href = iri;
self.parent.processLink(col_v_elm, iri);
} catch (e) {
@@ -1108,8 +1081,7 @@ OAT.RDFTabs.svg = function(parent,optObj) {
this.options = {
limit:100,
description:"",
- desc:"Filtered data as SVG Graph",
- raw_iris: false
+ desc:"Filtered data as SVG Graph"
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -1355,8 +1327,7 @@ OAT.RDFTabs.map = function(parent,optObj) {
hoverPopup:true,
height: "600px",
useMobileOpts:false,
- supportedMobileDetected:false,
- raw_iris: false
+ supportedMobileDetected:false
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -1683,13 +1654,7 @@ OAT.RDFTabs.map = function(parent,optObj) {
for (var p in preds) {
if (self.markerPredBlacklist.find(parseInt(p)) != -1) continue; // Not all predicates are created equal
var pred = preds[p];
- var simple;
-
- if (self.options.raw_iris)
- simple = OAT.IRIDB.getIRI (p);
- else
- simple = self.parent.store.getCIRIorSplit(p);
-
+ var simple = self.parent.store.getCIRIorSplit(p);
if (pred.length == 1 || self.lookupProperties.find(simple) != -1) {
var predC = OAT.Dom.create("tr",{className:"predicate"});
var predT = OAT.Dom.create("td",{className:"pred_title"});
@@ -1881,8 +1846,7 @@ OAT.RDFTabs.timeline = function(parent,optObj) {
this.options = {
imagePath:OAT.Preferences.imagePath,
description:"This module displays all date/time containing resources on an interactive timeline.",
- desc:"Date/time on timeline",
- raw_iris: false
+ desc:"Date/time on timeline"
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -1994,10 +1958,6 @@ OAT.RDFTabs.timeline = function(parent,optObj) {
}
}
-//
-// XXX unfinished
-//
-
OAT.RDFTabs.people = function(parent,optObj) {
var self = this;
OAT.RDFTabs.parent(self);
@@ -2005,8 +1965,7 @@ OAT.RDFTabs.people = function(parent,optObj) {
this.options = {
pictSize:150,
columns: 2,
- width: 800,
- raw_iris: false
+ width: 800
};
this.personTypes = ["http://xmlns.com/foaf/0.1/Person"];
@@ -2032,10 +1991,8 @@ OAT.RDFTabs.images = function(parent,optObj) {
thumbSize:150,
size:600,
description:"This module displays all images found in filtered data set.",
- desc:"Images from filtered data set",
- raw_iris: false
+ desc:"Images from filtered data set"
}
-
for (var p in optObj) { self.options[p] = optObj[p]; }
this.elm.style.textAlign = "center";
@@ -2232,8 +2189,7 @@ OAT.RDFTabs.tagcloud = function(parent,optObj) {
this.options = {
description:"This module displays all links found in filtered data set.",
- desc:"Links from filtered data set",
- raw_iris: false
+ desc:"Links from filtered data set"
}
for (var p in optObj) { self.options[p] = optObj[p]; }
@@ -2324,8 +2280,7 @@ OAT.RDFTabs.fresnel = function(parent, optObj) {
defaultURL:"",
autoload:false,
description:"This module applies Fresnel RDF Vocabularies to all dereferenced data.",
- desc:"Fresnel RDF Vocabularies to dereferenced data",
- raw_iris: false
+ desc:"Fresnel RDF Vocabularies to dereferenced data"
}
for (var p in optObj) { self.options[p] = optObj[p]; }
diff --git a/binsrc/oat/toolkit/rectwin.js b/binsrc/oat/toolkit/rectwin.js
index 3203289..8b72284 100644
--- a/binsrc/oat/toolkit/rectwin.js
+++ b/binsrc/oat/toolkit/rectwin.js
@@ -1,9 +1,9 @@
/*
- * $Id: rectwin.js,v 1.10.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: rectwin.js,v 1.10.2.4 2010/09/07 21:56:37 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/resize.js b/binsrc/oat/toolkit/resize.js
index 713f481..3ac7881 100644
--- a/binsrc/oat/toolkit/resize.js
+++ b/binsrc/oat/toolkit/resize.js
@@ -1,9 +1,9 @@
/*
- * $Id: resize.js,v 1.7.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: resize.js,v 1.7.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rotator.js b/binsrc/oat/toolkit/rotator.js
index c94dd62..14431a2 100644
--- a/binsrc/oat/toolkit/rotator.js
+++ b/binsrc/oat/toolkit/rotator.js
@@ -1,9 +1,9 @@
/*
- * $Id: rotator.js,v 1.7.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: rotator.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/roundwin.js b/binsrc/oat/toolkit/roundwin.js
index 139bfd5..9280498 100644
--- a/binsrc/oat/toolkit/roundwin.js
+++ b/binsrc/oat/toolkit/roundwin.js
@@ -1,9 +1,9 @@
/*
- * $Id: roundwin.js,v 1.9.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: roundwin.js,v 1.9.2.4 2010/09/07 21:56:37 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/rssreader.js b/binsrc/oat/toolkit/rssreader.js
index 720f419..8792a4a 100644
--- a/binsrc/oat/toolkit/rssreader.js
+++ b/binsrc/oat/toolkit/rssreader.js
@@ -1,9 +1,9 @@
/*
- * $Id: rssreader.js,v 1.5.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: rssreader.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/schema.js b/binsrc/oat/toolkit/schema.js
index ccd9711..c4df412 100644
--- a/binsrc/oat/toolkit/schema.js
+++ b/binsrc/oat/toolkit/schema.js
@@ -1,9 +1,9 @@
/*
- * $Id: schema.js,v 1.7.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: schema.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/simplefx.js b/binsrc/oat/toolkit/simplefx.js
index 0089cef..830c0c2 100644
--- a/binsrc/oat/toolkit/simplefx.js
+++ b/binsrc/oat/toolkit/simplefx.js
@@ -1,9 +1,9 @@
/*
- * $Id: simplefx.js,v 1.13.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: simplefx.js,v 1.13.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/slidebar.js b/binsrc/oat/toolkit/slidebar.js
index 61c6173..0275225 100644
--- a/binsrc/oat/toolkit/slidebar.js
+++ b/binsrc/oat/toolkit/slidebar.js
@@ -1,9 +1,9 @@
/*
- * $Id: slidebar.js,v 1.4.2.6 2012/03/08 12:55:01 source Exp $
+ * $Id: slidebar.js,v 1.4.2.5 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/slider.js b/binsrc/oat/toolkit/slider.js
index e075f0b..f1c5027 100644
--- a/binsrc/oat/toolkit/slider.js
+++ b/binsrc/oat/toolkit/slider.js
@@ -1,9 +1,9 @@
/*
- * $Id: slider.js,v 1.8.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: slider.js,v 1.8.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/soap.js b/binsrc/oat/toolkit/soap.js
index 0f27c83..35fa765 100644
--- a/binsrc/oat/toolkit/soap.js
+++ b/binsrc/oat/toolkit/soap.js
@@ -1,9 +1,9 @@
/*
- * $Id: soap.js,v 1.6.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: soap.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/sparkline.js b/binsrc/oat/toolkit/sparkline.js
index e98afaa..872c657 100644
--- a/binsrc/oat/toolkit/sparkline.js
+++ b/binsrc/oat/toolkit/sparkline.js
@@ -1,9 +1,9 @@
/*
- * $Id: sparkline.js,v 1.5.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: sparkline.js,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/sparql.js b/binsrc/oat/toolkit/sparql.js
index 93407e3..800f380 100644
--- a/binsrc/oat/toolkit/sparql.js
+++ b/binsrc/oat/toolkit/sparql.js
@@ -1,9 +1,9 @@
/*
- * $Id: sparql.js,v 1.13.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: sparql.js,v 1.13.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/sqlquery.js b/binsrc/oat/toolkit/sqlquery.js
index 5a20a03..6d83868 100644
--- a/binsrc/oat/toolkit/sqlquery.js
+++ b/binsrc/oat/toolkit/sqlquery.js
@@ -1,9 +1,9 @@
/*
- * $Id: sqlquery.js,v 1.7.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: sqlquery.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/statistics.js b/binsrc/oat/toolkit/statistics.js
index 899a070..6e2b12b 100644
--- a/binsrc/oat/toolkit/statistics.js
+++ b/binsrc/oat/toolkit/statistics.js
@@ -1,9 +1,9 @@
/*
- * $Id: statistics.js,v 1.6.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: statistics.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/svg.js b/binsrc/oat/toolkit/svg.js
index 1a123ab..ca58d06 100644
--- a/binsrc/oat/toolkit/svg.js
+++ b/binsrc/oat/toolkit/svg.js
@@ -1,9 +1,9 @@
/*
- * $Id: svg.js,v 1.6.2.3 2012/03/08 12:55:01 source Exp $
+ * $Id: svg.js,v 1.6.2.2 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/svgsparql.js b/binsrc/oat/toolkit/svgsparql.js
index dc36468..2e090d5 100644
--- a/binsrc/oat/toolkit/svgsparql.js
+++ b/binsrc/oat/toolkit/svgsparql.js
@@ -1,9 +1,9 @@
/*
- * $Id: svgsparql.js,v 1.6.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: svgsparql.js,v 1.6.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/tab.js b/binsrc/oat/toolkit/tab.js
index 2d857a7..9cd2033 100644
--- a/binsrc/oat/toolkit/tab.js
+++ b/binsrc/oat/toolkit/tab.js
@@ -1,9 +1,9 @@
/*
- * $Id: tab.js,v 1.12.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: tab.js,v 1.12.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/tagcloud.js b/binsrc/oat/toolkit/tagcloud.js
index 90d5aee..34db665 100644
--- a/binsrc/oat/toolkit/tagcloud.js
+++ b/binsrc/oat/toolkit/tagcloud.js
@@ -1,9 +1,9 @@
/*
- * $Id: tagcloud.js,v 1.3.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: tagcloud.js,v 1.3.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/ticker.js b/binsrc/oat/toolkit/ticker.js
index 63fbe60..761c338 100644
--- a/binsrc/oat/toolkit/ticker.js
+++ b/binsrc/oat/toolkit/ticker.js
@@ -1,9 +1,9 @@
/*
- * $Id: ticker.js,v 1.6.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: ticker.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/timeline.js b/binsrc/oat/toolkit/timeline.js
index d376e49..294fc99 100644
--- a/binsrc/oat/toolkit/timeline.js
+++ b/binsrc/oat/toolkit/timeline.js
@@ -1,9 +1,9 @@
/*
- * $Id: timeline.js,v 1.16.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: timeline.js,v 1.16.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/tlscale.js b/binsrc/oat/toolkit/tlscale.js
index 421cb1d..8b32fdf 100644
--- a/binsrc/oat/toolkit/tlscale.js
+++ b/binsrc/oat/toolkit/tlscale.js
@@ -1,9 +1,9 @@
/*
- * $Id: tlscale.js,v 1.11.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: tlscale.js,v 1.11.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/toolbar.js b/binsrc/oat/toolkit/toolbar.js
index da6a35f..16f42e9 100644
--- a/binsrc/oat/toolkit/toolbar.js
+++ b/binsrc/oat/toolkit/toolbar.js
@@ -1,9 +1,9 @@
/*
- * $Id: toolbar.js,v 1.8.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: toolbar.js,v 1.8.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/tree.js b/binsrc/oat/toolkit/tree.js
index 5bc751d..c4e1e65 100644
--- a/binsrc/oat/toolkit/tree.js
+++ b/binsrc/oat/toolkit/tree.js
@@ -1,9 +1,9 @@
/*
- * $Id: tree.js,v 1.19.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: tree.js,v 1.19.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/upload.js b/binsrc/oat/toolkit/upload.js
index 4aceb94..fcd0c56 100644
--- a/binsrc/oat/toolkit/upload.js
+++ b/binsrc/oat/toolkit/upload.js
@@ -1,9 +1,9 @@
/*
- * $Id: upload.js,v 1.6.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: upload.js,v 1.6.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/validation.js b/binsrc/oat/toolkit/validation.js
index 29e3850..587dbbd 100644
--- a/binsrc/oat/toolkit/validation.js
+++ b/binsrc/oat/toolkit/validation.js
@@ -1,9 +1,9 @@
/*
- * $Id: validation.js,v 1.7.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: validation.js,v 1.7.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/webclipbinding.js b/binsrc/oat/toolkit/webclipbinding.js
index 4de1da1..49c6fb5 100644
--- a/binsrc/oat/toolkit/webclipbinding.js
+++ b/binsrc/oat/toolkit/webclipbinding.js
@@ -1,9 +1,9 @@
/*
- * $Id: webclipbinding.js,v 1.6.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: webclipbinding.js,v 1.6.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/win.js b/binsrc/oat/toolkit/win.js
index a191c3d..351b74d 100644
--- a/binsrc/oat/toolkit/win.js
+++ b/binsrc/oat/toolkit/win.js
@@ -1,9 +1,9 @@
/*
- * $Id: win.js,v 1.16.2.6 2012/03/08 12:55:01 source Exp $
+ * $Id: win.js,v 1.16.2.5 2011/02/16 20:54:22 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/window.js b/binsrc/oat/toolkit/window.js
index 25ae376..19c1ac1 100644
--- a/binsrc/oat/toolkit/window.js
+++ b/binsrc/oat/toolkit/window.js
@@ -1,9 +1,9 @@
/*
- * $Id: window.js,v 1.10.2.5 2012/03/08 12:55:01 source Exp $
+ * $Id: window.js,v 1.10.2.4 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/ws.js b/binsrc/oat/toolkit/ws.js
index 3048b76..a790aae 100644
--- a/binsrc/oat/toolkit/ws.js
+++ b/binsrc/oat/toolkit/ws.js
@@ -1,9 +1,9 @@
/*
- * $Id: ws.js,v 1.7.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: ws.js,v 1.7.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/xml.js b/binsrc/oat/toolkit/xml.js
index 3d75302..22d2c36 100644
--- a/binsrc/oat/toolkit/xml.js
+++ b/binsrc/oat/toolkit/xml.js
@@ -1,9 +1,9 @@
/*
- * $Id: xml.js,v 1.14.2.9 2012/03/08 12:55:01 source Exp $
+ * $Id: xml.js,v 1.14.2.8 2011/05/03 14:03:49 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/toolkit/xmla.js b/binsrc/oat/toolkit/xmla.js
index 857cab5..774b73e 100644
--- a/binsrc/oat/toolkit/xmla.js
+++ b/binsrc/oat/toolkit/xmla.js
@@ -1,9 +1,9 @@
/*
- * $Id: xmla.js,v 1.8.2.4 2012/03/08 12:55:01 source Exp $
+ * $Id: xmla.js,v 1.8.2.3 2010/04/06 16:46:12 source Exp $
*
* This file is part of the OpenLink Software Ajax Toolkit (OAT) project.
*
- * Copyright (C) 2005-2012 OpenLink Software
+ * Copyright (C) 2005-2010 OpenLink Software
*
* See LICENSE file for details.
*/
diff --git a/binsrc/oat/xslt/designview.xsl b/binsrc/oat/xslt/designview.xsl
index 3464496..ad0cc39 100644
--- a/binsrc/oat/xslt/designview.xsl
+++ b/binsrc/oat/xslt/designview.xsl
@@ -1,11 +1,11 @@
<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>
<!--
- $Id: designview.xsl,v 1.6.2.2 2012/03/08 12:55:01 source Exp $
+ $Id: designview.xsl,v 1.6.2.1 2010/04/06 16:46:12 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2012 OpenLink Software
+ Copyright (C) 2005-2010 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
diff --git a/binsrc/oat/xslt/formview.xsl b/binsrc/oat/xslt/formview.xsl
index 4735595..c656033 100644
--- a/binsrc/oat/xslt/formview.xsl
+++ b/binsrc/oat/xslt/formview.xsl
@@ -1,11 +1,11 @@
<?xml version="1.0" ?>
<!--
- $Id: formview.xsl,v 1.9.2.2 2012/03/08 12:55:01 source Exp $
+ $Id: formview.xsl,v 1.9.2.1 2010/04/06 16:46:12 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2012 OpenLink Software
+ Copyright (C) 2005-2010 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
diff --git a/binsrc/oat/xslt/grid.xsl b/binsrc/oat/xslt/grid.xsl
index 2dc0eaf..e67e7cf 100644
--- a/binsrc/oat/xslt/grid.xsl
+++ b/binsrc/oat/xslt/grid.xsl
@@ -1,11 +1,11 @@
<?xml version="1.0" ?>
<!--
- $Id: grid.xsl,v 1.4.2.2 2012/03/08 12:55:01 source Exp $
+ $Id: grid.xsl,v 1.4.2.1 2010/04/06 16:46:12 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2012 OpenLink Software
+ Copyright (C) 2005-2010 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
diff --git a/binsrc/oat/xslt/pivotview.xsl b/binsrc/oat/xslt/pivotview.xsl
index 7ae00a5..624a161 100644
--- a/binsrc/oat/xslt/pivotview.xsl
+++ b/binsrc/oat/xslt/pivotview.xsl
@@ -1,11 +1,11 @@
<?xml version="1.0" ?>
<!--
- $Id: pivotview.xsl,v 1.5.2.3 2012/03/08 12:55:01 source Exp $
+ $Id: pivotview.xsl,v 1.5.2.2 2010/04/06 16:46:12 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2012 OpenLink Software
+ Copyright (C) 2005-2010 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
diff --git a/binsrc/oat/xslt/query.xsl b/binsrc/oat/xslt/query.xsl
index c7de3cf..f4077cd 100644
--- a/binsrc/oat/xslt/query.xsl
+++ b/binsrc/oat/xslt/query.xsl
@@ -1,11 +1,11 @@
<?xml version="1.0" ?>
<!--
- $Id: query.xsl,v 1.5.2.4 2012/03/08 12:55:01 source Exp $
+ $Id: query.xsl,v 1.5.2.3 2010/04/06 16:46:12 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2012 OpenLink Software
+ Copyright (C) 2005-2010 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
diff --git a/binsrc/oat/xslt/rdfbrowser.xsl b/binsrc/oat/xslt/rdfbrowser.xsl
index f5101d2..bb177a8 100644
--- a/binsrc/oat/xslt/rdfbrowser.xsl
+++ b/binsrc/oat/xslt/rdfbrowser.xsl
@@ -1,11 +1,11 @@
<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>
<!--
- $Id: rdfbrowser.xsl,v 1.5.2.2 2012/03/08 12:55:01 source Exp $
+ $Id: rdfbrowser.xsl,v 1.5.2.1 2010/04/06 16:46:12 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2012 OpenLink Software
+ Copyright (C) 2005-2010 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
diff --git a/binsrc/oat/xslt/tree.xsl b/binsrc/oat/xslt/tree.xsl
index 6759942..caa14fc 100644
--- a/binsrc/oat/xslt/tree.xsl
+++ b/binsrc/oat/xslt/tree.xsl
@@ -1,11 +1,11 @@
<?xml version="1.0" ?>
<!--
- $Id: tree.xsl,v 1.4.2.2 2012/03/08 12:55:01 source Exp $
+ $Id: tree.xsl,v 1.4.2.1 2010/04/06 16:46:12 source Exp $
This file is part of the OpenLink Ajax Toolkit (OAT) project
- Copyright (C) 2005-2012 OpenLink Software
+ Copyright (C) 2005-2010 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
diff --git a/binsrc/rdf_mappers/Makefile.am b/binsrc/rdf_mappers/Makefile.am
index 67d2e60..3d80e10 100644
--- a/binsrc/rdf_mappers/Makefile.am
+++ b/binsrc/rdf_mappers/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
diff --git a/binsrc/rdf_mappers/Makefile.in b/binsrc/rdf_mappers/Makefile.in
index c308a9f..6c32a4d 100644
--- a/binsrc/rdf_mappers/Makefile.in
+++ b/binsrc/rdf_mappers/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -125,7 +125,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -174,7 +173,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -226,7 +224,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -273,6 +270,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/rdf_mappers/make_vad.sh b/binsrc/rdf_mappers/make_vad.sh
index 4e9a962..2c610cb 100755
--- a/binsrc/rdf_mappers/make_vad.sh
+++ b/binsrc/rdf_mappers/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.15.2.19 2012/03/14 11:10:16 source Exp $
+# $Id: make_vad.sh,v 1.15.2.14 2011/06/09 15:35:35 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -206,7 +206,6 @@ directory_init() {
cp rdf_mappers.sql vad/code/rdf_mappers
cp rdf_mappers_drop.sql vad/code/rdf_mappers
- cp sponger_coref_post_process.sql vad/code/rdf_mappers
cp virt_rdf_label.sql vad/code/rdf_mappers
cp data/*.sql vad/code/rdf_mappers
@@ -217,7 +216,6 @@ directory_init() {
cp ontologies/owl/*.owl vad/vsp/rdf_mappers/ontologies/owl/
cp sponger_front_page/* vad/vsp/rdf_mappers/sponger_front_page/
-
cp sponger_front_page/skin/i/* vad/vsp/rdf_mappers/sponger_front_page/skin/i/
cp sponger_front_page/skin/ss/* vad/vsp/rdf_mappers/sponger_front_page/skin/ss/
@@ -237,7 +235,7 @@ directory_init() {
#
# Install minimal OAT toolkit
#
- for i in loader.js animation.js slidebar.js resize.js ajax.js json.js
+ for i in loader.js animation.js slidebar.js resize.js
do
cp ../oat/toolkit/$i vad/vsp/rdf_mappers/rdfdesc/oat/
done
@@ -315,7 +313,7 @@ sticker_init() {
echo " <name package=\"$VAD_NAME\">" >> $STICKER
echo " <prop name=\"Title\" value=\"$VAD_DESC\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
@@ -333,11 +331,6 @@ sticker_init() {
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 (__proc_exists ('__PROC_PARAMS_NUM', 2) is null) " >> $STICKER
- echo " { " >> $STICKER
- echo " result ('ERROR', 'The $VAD_DESC package requires new server version'); " >> $STICKER
- echo " signal ('FATAL', 'The $VAD_DESC package requires new server version'); " >> $STICKER
- echo " } " >> $STICKER
echo " ]]></sql>" >> $STICKER
echo " <sql purpose=\"post-install\">" >> $STICKER
echo " ; " >> $STICKER
@@ -356,7 +349,6 @@ fi
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/description.sql', 0, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/yelp_categories.sql', 0, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/rdf_mappers.sql', 0, 'report', $ISDAV);" >> $STICKER
- echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/sponger_coref_post_process.sql', 0, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/oai_servers.sql', 0, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/iso_country_codes.sql', 0, 'report', $ISDAV);" >> $STICKER
echo " DB.DBA.VHOST_REMOVE (lpath=>'/rdfdesc');" >> $STICKER
@@ -378,7 +370,6 @@ fi
echo "<resources>" >> $STICKER
echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/rdf_mappers.sql\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> $STICKER
- echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/sponger_coref_post_process.sql\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> $STICKER
echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/oai_servers.sql\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> $STICKER
echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/yelp_categories.sql\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> $STICKER
echo " <file type=\"$TYPE\" source=\"code\" target_uri=\"$VAD_NAME/iso_country_codes.sql\" dav_owner=\"dav\" dav_grp=\"administrators\" dav_perm=\"111101101NN\" makepath=\"yes\"/>" >> $STICKER
diff --git a/binsrc/rdf_mappers/ontologies/owl/attribution.owl b/binsrc/rdf_mappers/ontologies/owl/attribution.owl
index f54358a..14bfbe2 100644
--- a/binsrc/rdf_mappers/ontologies/owl/attribution.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/attribution.owl
@@ -1,26 +1,5 @@
<?xml version="1.0" ?>
<!--
-
- attribution.owl,v 1.1.4.6 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
The OpenLink Sponger ontology for transformation results attribution.
-->
@@ -122,13 +101,12 @@
<rdfs:isDefinedBy rdf:resource="&opl;"/>
</owl:Class>
- <owl:Property rdf:about="&opl;entityType">
- <rdfs:comment>The type or ontological category of a named entity</rdfs:comment>
+ <owl:Property rdf:about="&opl;namedEntityConcept">
+ <rdfs:comment>The concept (type of thing) the named entity represents</rdfs:comment>
<rdfs:domain rdf:resource="&opl;NamedEntity"/>
<rdfs:isDefinedBy rdf:resource="&opl;"/>
- <rdfs:label>entity type</rdfs:label>
+ <rdfs:label>named entity concept</rdfs:label>
<rdfs:range rdf:resource="&owl;Thing"/>
- <owl:equivalentProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
</owl:Property>
</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl b/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl
index 1ce397e..2d78a5b 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl
@@ -1,11 +1,11 @@
<!--
- oplamazon.owl,v 1.1.2.5 2012/03/06 16:48:07 source Exp
+ $Id: oplamazon.owl,v 1.1.2.4 2010/01/25 15:36:25 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplangel.owl b/binsrc/rdf_mappers/ontologies/owl/oplangel.owl
deleted file mode 100644
index 6ab5a21..0000000
--- a/binsrc/rdf_mappers/ontologies/owl/oplangel.owl
+++ /dev/null
@@ -1,244 +0,0 @@
-<!--
-
- oplangel.owl,v 1.1.2.2 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
-
- Generated from oplangel.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
-
- An OpenLink ontology for Angel List (http://angel.co/)
-
--->
-
-
-<rdf:RDF xmlns="http://www.openlinksw.com/schemas/angel#"
- xmlns:angel="http://www.openlinksw.com/schemas/angel#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:gn="http://www.geonames.org/ontology#"
- xmlns:gr="http://purl.org/goodrelations/v1#"
- xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:opl="http://www.openlinksw.com/schema/attribution#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:sioc="http://rdfs.org/sioc/ns#"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-
- <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/angel#">
- <dc:creator rdf:datatype="http://www.w3.org/2001/XMLSchema#string">OpenLink Software, http://www.openlinksw.com</dc:creator>
- </owl:Ontology>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/angel#Agent">
- <rdfs:comment>An AngelList Entity</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>Angel Agent</rdfs:label>
- </owl:Class>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/angel#Location">
- <rdfs:comment>An Angel-List Entity Location</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>Angel Location</rdfs:label>
- </owl:Class>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/angel#Market">
- <rdfs:comment>An Angel-List Marketplace</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>Angel Market</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/angel#Agent"/>
- </owl:Class>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/angel#Startup">
- <rdfs:comment>An Angel-List startup (company)</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>Startup</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/angel#Agent"/>
- <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
- </owl:Class>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/angel#User">
- <rdfs:comment>An Angel-List user (investor or other)</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>Person</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/angel#Agent"/>
- <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
- </owl:Class>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#bio">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Biography</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/description"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#company_url">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Startup"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Company URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- <rdfs:subPropertyOf rdf:resource="http://www.openlinksw.com/schemas/angel#url"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#followers">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Agent"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Followers</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#has_location">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Agent"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Location</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/angel#Location"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#has_market">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Startup"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Market</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/angel#Market"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#high_concept">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Startup"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>High-level Concept</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/description"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#id">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Agent"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Angel ID</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#image">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Image</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#location_id">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Location"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Location ID</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#location_name">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Location"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Location ID</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <rdfs:subPropertyOf rdf:resource="http://www.geonames.org/ontology#name"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#location_url">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Location"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Location ID</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#logo_url">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Startup"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Logo URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#market_name">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Market"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Market Name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <rdfs:subPropertyOf rdf:resource="http://www.openlinksw.com/schemas/angel#name"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#market_url">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Market"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Market Name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- <rdfs:subPropertyOf rdf:resource="http://www.openlinksw.com/schemas/angel#url"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#name">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Agent"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Angel Agent Name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
- <owl:sameAs rdf:resource="http://xmlns.com/foaf/0.1/name"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#product_desc">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Startup"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Product Description</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/description"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#role">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Role</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#status">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Startup"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Current Status</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#thumb_url">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Startup"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Thumbnail</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#url">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Agent"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Angel URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2000/01/rdf-schema#seeAlso"/>
- <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/homepage"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/angel#video_url">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/angel#Startup"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/angel#"/>
- <rdfs:label>Corporate Video</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- <rdfs:subPropertyOf rdf:resource="http://www.openlinksw.com/schemas/angel#url"/>
- </owl:DatatypeProperty>
-</rdf:RDF>
-
-
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplbase.owl b/binsrc/rdf_mappers/ontologies/owl/oplbase.owl
deleted file mode 100644
index e19a05a..0000000
--- a/binsrc/rdf_mappers/ontologies/owl/oplbase.owl
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--
-
- oplbase.owl,v 1.1.2.3 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
- Generated from oplbase.n3
-
- An OpenLink base ontology for collecting together similar classes and properties
- from other OpenLink ontologies
-
- See also virt_rdf_label.sql
--->
-
-<rdf:RDF xmlns="http://www.openlinksw.com/schemas/oplbase#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:oplbase="http://www.openlinksw.com/schemas/oplbase#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-
- <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/oplbase">
- <dc:creator>OpenLink Software, http://www.openlinksw.com</dc:creator>
- <dc:date rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2012-02-10</dc:date>
- <dc:description>An OpenLink base schema for collecting together similar classes and properties from other OpenLink ontologies - see also ruleset virtrdf-label</dc:description>
- <dc:title>OpenLink base schema</dc:title>
- </owl:Ontology>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/oplbase#blog_url">
- <rdfs:comment>A generic blog as a social profile URL. e.g. pointing to Blogger, Blogspot, Wordpress, etc.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/oplbase"/>
- <rdfs:label>Blog URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- <rdfs:subPropertyOf rdf:resource="http://www.openlinksw.com/schemas/oplbase#social_profile_url"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/oplbase#native_entity_type">
- <rdfs:comment>An entity type classifier returned by an entity extraction service</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/oplbase"/>
- <rdfs:label>native entity type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/oplbase#relevance_score">
- <rdfs:comment>A relevance score returned by an entity extraction service</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/oplbase"/>
- <rdfs:label>relevance score</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#decimal"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/oplbase#social_profile_url">
- <rdfs:comment>A generic property for holding a social profile URL. e.g. from Twitter, Facebook, LinkedIn etc.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/oplbase"/>
- <rdfs:label>social profile url</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-</rdf:RDF>
-
-
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl b/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl
index 785fd15..ce90257 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl
@@ -1,11 +1,11 @@
<!--
- oplbestbuy.owl,v 1.1.2.5 2012/03/06 16:48:07 source Exp
+ $Id: oplbestbuy.owl,v 1.1.2.4 2010/01/25 15:36:25 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcert.owl b/binsrc/rdf_mappers/ontologies/owl/oplcert.owl
deleted file mode 100644
index 085680c..0000000
--- a/binsrc/rdf_mappers/ontologies/owl/oplcert.owl
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- oplcert.owl,v 1.1.2.2 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
--->
-
-<rdf:RDF xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cert="http://www.w3.org/ns/auth/cert#" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:wot="http://xmlns.com/wot/0.1/" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:opl="http://www.openlinksw.com/schemas/cert#" xmlns:ns="http://purl.org/dc/elements/1.1/">
- <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/cert#">
- <ns:creator>OpenLink Software, http://www.openlinksw.com</ns:creator>
- </owl:Ontology>
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/cert#Certificate">
- <rdfs:label>Certificate</rdfs:label>
- <owl:equivalentClass rdf:resource="http://www.w3.org/ns/auth/cert#X509Certificate" />
- <owl:equivalentClass rdf:resource="http://xmlns.com/wot/0.1/PubKey" />
- <rdfs:subClassOf rdf:resource="http://www.w3.org/ns/auth/cert#Certificate" />
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/cert#" />
- </owl:Class>
- <rdf:Property rdf:about="http://www.openlinksw.com/schemas/cert#hasCertificate">
- <rdfs:label>Owns</rdfs:label>
- <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Agent" />
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/cert#Certificate" />
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/cert#" />
- </rdf:Property>
- <rdf:Property rdf:about="http://www.openlinksw.com/schemas/cert#fingerprint">
- <rdfs:label>fingerprint</rdfs:label>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/cert#Certificate" />
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/cert#" />
- <rdfs:range rdf:resource="http://www.w3.org/ns/auth/cert#hex" />
- </rdf:Property>
- <rdf:Property rdf:about="http://www.openlinksw.com/schemas/cert#fingerprint-digest">
- <rdfs:label>fingerprint digest</rdfs:label>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/cert#Certificate" />
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/cert#" />
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string" />
- </rdf:Property>
-</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl b/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl
index 9564aae..2cdd5d5 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl
@@ -1,11 +1,11 @@
<!--
- oplcnet.owl,v 1.1.2.5 2012/03/06 16:48:07 source Exp
+ $Id: oplcnet.owl,v 1.1.2.4 2010/01/25 15:36:25 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl b/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl
deleted file mode 100644
index 330c67e..0000000
--- a/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl
+++ /dev/null
@@ -1,646 +0,0 @@
-<!--
-
- oplcrunchbase.owl,v 1.1.2.4 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
- Generated from oplcrunchbase.n3
- An OpenLink ontology for Crunchbase
--->
-
-<rdf:RDF xmlns="http://www.openlinksw.com/schemas/crunchbase#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:oplcb="http://www.openlinksw.com/schemas/crunchbase#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-
- <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/crunchbase">
- <dc:creator>OpenLink Software, http://www.openlinksw.com</dc:creator>
- <dc:date rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2012-02-08</dc:date>
- <dc:description>OpenLink schema for Crunchbase objects and properties</dc:description>
- <dc:title>OpenLink schema for Crunchbase</dc:title>
- </owl:Ontology>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Financial-organization">
- <rdfs:comment>Financial organization</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>Financial organization</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://purl.org/goodrelations/v1#BusinessEntity"/>
- </owl:Class>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Company">
- <rdfs:comment>Company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>Company</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://purl.org/goodrelations/v1#BusinessEntity"/>
- </owl:Class>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Screenshots">
- <rdfs:comment>Screenshots</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>Screenshots</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/Image"/>
- </owl:Class>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#Relationships">
- <rdfs:comment>Relationships</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>Relationships</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:Class>
-
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#acquired_day">
- <rdfs:comment>The day of an acquistion</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>acquired day</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#acquired_month">
- <rdfs:comment>The month of an acquisition</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>acquired month</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#acquired_year">
- <rdfs:comment>The year of an acquistion</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>acquired year</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#acquiring_company">
- <rdfs:comment>The company acquiring this one</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>acquiring company</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#acquisition">
- <rdfs:comment>Details of a company acquisition</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>acquisition</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#acquisitions">
- <rdfs:comment>Details of a company acquisition</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>acquisition</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#acquisition">
- <rdfs:comment>Details of a company acquisition</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>acquisition</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#address1">
- <rdfs:comment>1st line of a company address</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>address1</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#address2">
- <rdfs:comment>2nd line of a company address</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>address2</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#affiliation_name">
- <rdfs:comment>A company with which an individual is associated</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>affiliation name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#available_sizes">
- <rdfs:comment>The available sizes of screenshots</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>available sizes</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#birthplace">
- <rdfs:comment>A person's birthplace</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>birthplace</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#blog_feed_url">
- <rdfs:comment>The blog feed of a person known to Crunchbase</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>blog feed url</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#blog_url">
- <rdfs:comment>The blog of a person known to Crunchbase</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>blog url</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#born_day">
- <rdfs:comment>The day of the month of a person's DOB</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>born day</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#born_month">
- <rdfs:comment>The month of a person's DOB</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>born day</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#born_year">
- <rdfs:comment>The year of a person's DOB</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>born year</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#category_code">
- <rdfs:comment>A code representing the business category a company operates in</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>category code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#city">
- <rdfs:comment>City in which a company office is located</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>city</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#company">
- <rdfs:comment>A company. The focus of an investment, funding round or acquisition.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>company</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#competitor">
- <rdfs:comment>A company in competition with this one.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>competitor</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#country_code">
- <rdfs:comment>A country code. e.g. of an office location.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>country code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#created_at">
- <rdfs:comment>The creation date of a Crunchbase entry</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>created at</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#crunchbase_url">
- <rdfs:comment></rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>crunchbase url</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#description">
- <rdfs:comment>A description of a milestone event in a company's history.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>description</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#embed_code">
- <rdfs:comment>An HTML snippet to embed a video about the company.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>embed code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#external_links">
- <rdfs:comment>An external link class describing links to other sites with resources relating to this company.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>external links</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#external_link">
- <rdfs:comment>An external link class describing links to other sites with resources relating to this company.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>external link</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#external_url">
- <rdfs:comment>A link to another site with resources relating to this company.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>external url</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#financial_org">
- <rdfs:comment>A financial organization behind an investment</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>financial org</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#firm">
- <rdfs:comment>A firm with which an individual is or has been related.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>firm</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#founded_day">
- <rdfs:comment>The day of the month a company was founded</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>founded day</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#founded_month">
- <rdfs:comment>The month a company was founded</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>founded month</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#founded_year">
- <rdfs:comment>The year a company was founded</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>founded year</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#funded_day">
- <rdfs:comment>The day of the month a funding round was received</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>funded day</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#funded_month">
- <rdfs:comment>The month a funding round was received</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>funded month</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#funded_year">
- <rdfs:comment>The year a funding round was received</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>funded year</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#funding_round">
- <rdfs:comment>Details of a funding round</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>funding round</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#funding_rounds">
- <rdfs:comment>Details of funding rounds</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>funding rounds</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#funding_round">
- <rdfs:comment>Details of funding rounds</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>funding round</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#investments">
- <rdfs:comment>Details of an investment in the company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>investment</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#investment">
- <rdfs:comment>Details of an investment in the company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>investment</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#ipo">
- <rdfs:comment>Details of a company's IPO. e.g. Stock symbol, valuation etc.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>ipo</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#is_past">
- <rdfs:comment>Whether this is a person's current or a previous position</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>is past</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#last_name">
- <rdfs:comment>A person's last name</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>last name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#milestones">
- <rdfs:comment>Milestones in a company's history</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>milestones</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#milestone">
- <rdfs:comment>Milestones in a company's history</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>milestone</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#number_of_employees">
- <rdfs:comment>The number of employees in a company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>number of employees</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#offices">
- <rdfs:comment>Details of a company office</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>offices</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#office">
- <rdfs:comment>Details of a company office</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>office</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#permalink">
- <rdfs:comment>A permalink to a Crunchbase profile of a company or person</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>permalink</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#person">
- <rdfs:comment>A person known to Crunchbase</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>person</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#phone_number">
- <rdfs:comment>A company phone number</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>phone number</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#price_amount">
- <rdfs:comment>The price paid for an acquisition</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>price amount</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#price_currency_code">
- <rdfs:comment>The currency of price_amount</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>price currency code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#products">
- <rdfs:comment>Details of one of a company's products</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>products</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#product">
- <rdfs:comment>Details of one of a company's products</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>product</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/crunchbase#provider">
- <rdfs:comment>A legal, PR & marketing firms that provides services to this company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>provider</rdfs:label>
- </owl:Class>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#providerships">
- <rdfs:comment>Providers - legal, PR & marketing firms that provide services to this company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>providerships</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#providership">
- <rdfs:comment>Providers - legal, PR & marketing firms that provide services to this company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>providership</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#raised_amount">
- <rdfs:comment>The amount raised by a funding round</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>raised amount</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#raised_currency_code">
- <rdfs:comment>The currency of raised_amount</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>raised currency code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#relationship">
- <rdfs:comment>Details of a person associated with a company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>relationship</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#round_code">
- <rdfs:comment>A code describing the type of funding associated with a funding round: angel, seed ...</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>round code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#screenshots">
- <rdfs:comment>Screenshots linked to a company profile - typically company logos</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>screenshots</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#screenshot">
- <rdfs:comment>Screenshots linked to a company profile - typically company logos</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>screenshot</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#source_description">
- <rdfs:comment>A description of a milestone event in a company's history.</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>source description</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#source_url">
- <rdfs:comment>A news source reporting a company milestone or funding round</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>source url</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#state_code">
- <rdfs:comment>Company address - state code</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>state code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#stock_symbol">
- <rdfs:comment>Company stock symbol</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>stock symbol</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#stoneable">
- <rdfs:comment>The Crunchbase entity to which a milestone relates</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>stoneable</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#stoneable_type">
- <rdfs:comment>The type of Crunchbase entity to which a milestone relates</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>stoneable type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#stoned_day">
- <rdfs:comment>The day of the month a milestone occurred</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>stoned day</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#stoned_month">
- <rdfs:comment>The month a milestone occurred</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>stoned month</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#stoned_year">
- <rdfs:comment>The year a milestone occurred</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>stoned year</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#total_money_raised">
- <rdfs:comment>Total money raised by a company</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>total money raised</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#twitter_username">
- <rdfs:comment>A company's or individual's Twitter username</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>twitter username</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/twitter#id"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#updated_at">
- <rdfs:comment>The date a Crunchbase entry was last updated</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>updated at</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#valuation_currency_code">
- <rdfs:comment>The currency of a company valuation</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>valuation currency code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#video_embeds">
- <rdfs:comment>An embedded video about a company or individual</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>video embeds</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#video_embed">
- <rdfs:comment>An embedded video about a company or individual</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>video embed</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/crunchbase#zip_code">
- <rdfs:comment>Company address - zip code</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/crunchbase"/>
- <rdfs:label>zip code</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcv.owl b/binsrc/rdf_mappers/ontologies/owl/oplcv.owl
index e709536..770aa64 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplcv.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplcv.owl
@@ -1,26 +1,4 @@
<!--
-
- oplcv.owl,v 1.1.4.3 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
-
Generated from opllinkedin.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
An OpenLink ontology for CVs and resumes
diff --git a/binsrc/rdf_mappers/ontologies/owl/opldbps.owl b/binsrc/rdf_mappers/ontologies/owl/opldbps.owl
deleted file mode 100644
index 5390ef9..0000000
--- a/binsrc/rdf_mappers/ontologies/owl/opldbps.owl
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-
- opldbps.owl,v 1.1.2.2 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
- Generated from opldbps.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
-
- An OpenLink ontology for DBPedia Spotlight results
-
--->
-
-<rdf:RDF xmlns="http://www.openlinksw.com/schemas/dbpedia-spotlight#"
- xmlns:dbps="http://www.openlinksw.com/schemas/dbpedia-spotlight#"
- xmlns:gr="http://purl.org/goodrelations/v1#"
- xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:opl="http://www.openlinksw.com/schema/attribution#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:sioc="http://rdfs.org/sioc/ns#"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-
- <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/dbpedia-spotlight#">
- <creator xmlns="http://purl.org/dc/elements/1.1/"
- rdf:datatype="http://www.w3.org/2001/XMLSchema#string">OpenLink Software, http://www.openlinksw.com</creator>
- </owl:Ontology>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/dbpedia-spotlight#AnyURI">
- <rdfs:comment>A resource URI generated by DBPedia Spotlight</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>Resource URI</rdfs:label>
- </owl:Class>
-
- <owl:DatatypeProprty rdf:about="http://www.openlinksw.com/schemas/dbpedia-spotlight#link">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schema/attribution#NamedEntity"/>
- <rdfs:equivalentProperty rdf:resource="http://rdfs.org/sioc/ns#link"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>DBPedia resource link</rdfs:label>
- </owl:DatatypeProprty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/dbpedia-spotlight#percentageOfSecondRank">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#AnyURI"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>Percentage of Second Rank</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/dbpedia-spotlight#similarityScore">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#AnyURI"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/dbpedia-spotlight#"/>
- <rdfs:label>Similarity Score</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-</rdf:RDF>
-
-
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplebay.owl b/binsrc/rdf_mappers/ontologies/owl/oplebay.owl
index 5382d90..3309ecf 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplebay.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplebay.owl
@@ -1,11 +1,11 @@
<!--
- oplebay.owl,v 1.1.2.5 2012/03/06 16:48:07 source Exp
+ $Id: oplebay.owl,v 1.1.2.4 2010/01/25 15:36:25 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplevri.owl b/binsrc/rdf_mappers/ontologies/owl/oplevri.owl
index 92a99a4..fe9f244 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplevri.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplevri.owl
@@ -1,26 +1,4 @@
<!--
-
- oplevri.owl,v 1.1.4.3 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
-
Generated from oplbestbuy.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
An OpenLink ontology for specializing the ProductOrService class of the GoodRelations ontology
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl b/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl
index f1f7b71..d6ccdbd 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl
@@ -1,11 +1,11 @@
<!--
- oplgooglebase.owl,v 1.1.2.4 2012/03/06 16:48:07 source Exp
+ $Id: oplgooglebase.owl,v 1.1.2.3 2010/01/28 00:28:52 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplgoogleplus.owl b/binsrc/rdf_mappers/ontologies/owl/oplgoogleplus.owl
index a310898..66ac4ee 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplgoogleplus.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplgoogleplus.owl
@@ -1,23 +1,13 @@
<!-- Processed by Id: cwm.py,v 1.197 2007/12/13 15:38:39 syosi Exp -->
-<!-- using base file:///Users/rtsekova/dev/oplsrc/cartridges/google+/oplgoogleplus.n3-->
+<!-- using base file:///Users/carl/dev/oplsrc/cartridges/google+/oplgoogleplus.n3-->
-<rdf:RDF xmlns="http://www.openlinksw.com/schemas/googleplus#"
- xmlns:bibo="http://purl.org/ontology/bibo/"
- xmlns:dbpedia="http://dbpedia.org/ontology/"
+<rdf:RDF xmlns="http://www.w3.org/2000/01/rdf-schema#"
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:event="http://purl.org/NET/c4dm/event.owl#"
- xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:oplgp="http://www.openlinksw.com/schemas/googleplus#"
xmlns:owl="http://www.w3.org/2002/07/owl#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:sioc="http://rdfs.org/sioc/ns#"
- xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
<owl:Ontology rdf:about="http://www.openlinksw.com/schemas/googleplus">
<dc:creator>OpenLink Software, http://www.openlinksw.com</dc:creator>
@@ -27,957 +17,978 @@
</owl:Ontology>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Access">
- <rdfs:comment>Identifies who has access to see a Google+ Activity</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Access</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>Identifies who has access to see a Google+ Activity</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Access</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#AccessItem">
- <rdfs:comment>An access entry</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>AccessItem</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>An access entry</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>AccessItem</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Activity">
- <rdfs:comment>A Google+ activity</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Activity</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A Google+ activity</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Activity</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <owl:equivalentClass rdf:resource="http://rdfs.org/sioc/ns#Post"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#ActivityObject">
- <rdfs:comment>The object of an activity</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>ActivityObject</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>The object of an activity</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>ActivityObject</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <owl:equivalentClass rdf:resource="http://rdfs.org/sioc/ns#Post"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Actor">
- <rdfs:comment>The person who performed a Google+ Activity</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Actor</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>The person who performed a Google+ Activity</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Actor</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <owl:equivalentClass rdf:resource="http://rdfs.org/sioc/ns#UserAccount"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Attachment">
- <rdfs:comment>A media object attached to an Activity</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Attachment</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A media object attached to an Activity</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Attachment</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Comment">
- <rdfs:comment>A Google+ comment</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Comment</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A Google+ comment</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Comment</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <owl:equivalentClass rdf:resource="http://rdfs.org/sioc/ns#Post"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Email">
- <rdfs:comment>An email address of a Google+ user</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Email</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>An email address of a Google+ user</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Email</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#EmbeddableLink">
- <rdfs:comment>An embeddable link to a attached video</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>EmbeddableLink</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>An embeddable link to a attached video</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>EmbeddableLink</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#FullImage">
- <rdfs:comment>A full image photo attachment</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>FullImage</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A full image photo attachment</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>FullImage</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#InReplyTo">
- <rdfs:comment>A description of the Activity a Comment replied to</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>InReplyTo</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A description of the Activity a Comment replied to</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>InReplyTo</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Name">
- <rdfs:comment>An object representing the individual components of a person's name</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Name</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>An object representing the individual components of a person's name</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Name</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Object">
- <rdfs:comment>A base class representing all Google+ objects</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Google+ object</rdfs:label>
+ <comment>A base class representing all Google+ objects</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Google+ object</label>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Organization">
- <rdfs:comment>An organization with which a Google+ user is or has been associated</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Organization</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>An organization with which a Google+ user is or has been associated</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Organization</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <owl:equivalentClass rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Person">
- <rdfs:comment>A Google+ user</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Person</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A Google+ user</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Person</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <owl:equivalentClass rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#PlaceLived">
- <rdfs:comment>A place where a Google+ user has lived</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>PlaceLived</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A place where a Google+ user has lived</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>PlaceLived</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#PreviewImage">
- <rdfs:comment>A preview image for a photo or video attachment</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>PreviewImage</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A preview image for a photo or video attachment</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>PreviewImage</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/googleplus#Url">
- <rdfs:comment>A URL for a Google+ user</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>Url</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <comment>A URL for a Google+ user</comment>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>Url</label>
+ <subClassOf rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
</owl:Class>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#aboutMe">
- <rdfs:comment>A short biography for this person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>about me</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>A short biography for this person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>about me</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/description"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access">
- <rdfs:comment>Identifies who has access to see an activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>access</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
+ <comment>Identifies who has access to see an activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>access</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access_description">
- <rdfs:comment>Description of the access granted, suitable for display</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>access description</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Description of the access granted, suitable for display</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>access description</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access_item">
- <rdfs:comment>An access entry</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>access item</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#AccessItem"/>
+ <comment>An access entry</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>access item</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#AccessItem"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access_item_type">
- <rdfs:comment>The type of entry describing to whom access is granted</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>access item type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The type of entry describing to whom access is granted</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>access item type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#access_kind">
- <rdfs:comment>Access kind</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>access kind</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Access kind</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Access"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>access kind</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_object">
- <rdfs:comment>The object of an activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>activity object</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <comment>The object of an activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>activity object</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_object_type">
- <rdfs:comment>The type of the activity object. e.g.
+ <comment>The type of the activity object. e.g.
'note' - Textual content.
'activity' - A Google+ activity.
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>activity object type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>activity object type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_replied_to_id">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#InverseFunctionalProperty"/>
- <rdfs:comment>ID of the Activity replied to</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#InReplyTo"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>id of activity replied to</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>ID of the Activity replied to</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#InReplyTo"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>id of activity replied to</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_title">
- <rdfs:comment>The title of an activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>activity title</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The title of an activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>activity title</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://purl.org/dc/elements/1.1/title"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#activity_url">
- <rdfs:comment>The URL associated with the activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>activity URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>The URL associated with the activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>activity URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#actor">
- <rdfs:comment>The person who performed this activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>actor</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
+ <comment>The person who performed this activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>actor</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
+ <owl:equivalentProperty rdf:resource="http://rdfs.org/sioc/ns#has_creator"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#actor_displayName">
- <rdfs:comment>The name of the actor, suitable for display</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>actor display name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The name of the actor, suitable for display</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>actor display name</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/name"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#actor_profile_image">
- <rdfs:comment>The URL of an actor's profile photo</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>actor profile image</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>The URL of an actor's profile photo</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>actor profile image</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/img"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#actor_profile_url">
- <rdfs:comment>The URL of an actor's Google+ profile</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>actor profile URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>The URL of an actor's Google+ profile</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>actor profile URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#address">
- <rdfs:comment>Street address where this activity occurred</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>address</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Street address where this activity occurred</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>address</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#annotation">
- <rdfs:comment>Additional content added by the person who shared this activity, applicable only when resharing an activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>annotation</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Additional content added by the person who shared this activity, applicable only when resharing an activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>annotation</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#associatedWith">
- <rdfs:comment>An organization with which this person is or has been associated</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>associated with</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <comment>An organization with which this person is or has been associated</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>associated with</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
</owl:ObjectProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#attachment">
- <rdfs:comment>A media object attached to an activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>attachment</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
+ <comment>A media object attached to an activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>attachment</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#attachment_displayName">
- <rdfs:comment>The title of the attachment (such as a photo caption or an article title)</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>attachment display name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The title of the attachment (such as a photo caption or an article title)</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>attachment display name</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#attachment_media_type">
- <rdfs:comment>The type of media object. e.g. 'photo', 'video', 'article'</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>attachment media type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The type of media object. e.g. 'photo', 'video', 'article'</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>attachment media type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#attachment_url">
- <rdfs:comment>URL of the attachment</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>attachment URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>URL of the attachment</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>attachment URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#comment_actor">
- <rdfs:comment>The person who posted this comment</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>comment actor</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
+ <comment>The person who posted this comment</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>comment actor</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
+ <owl:equivalentProperty rdf:resource="http://rdfs.org/sioc/ns#has_creator"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#comment_content">
- <rdfs:comment>The content of a comment</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>comment content</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The content of a comment</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>comment content</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#comment_self_link">
- <rdfs:comment>Link to a Comment resource</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>comment self link</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>Link to a Comment resource</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>comment self link</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#comment_verb">
- <rdfs:comment>An comment's verb, indicating what action was performed e.g.
+ <comment>An comment's verb, indicating what action was performed e.g.
'post' - Publish content to the stream.
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>comment verb</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>comment verb</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#content">
- <rdfs:comment>If the attachment is an article, this property contains a snippet of text from the article</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>content</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>If the attachment is an article, this property contains a snippet of text from the article</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>content</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#crosspostSource">
- <rdfs:comment>If this activity is a crosspost from another system, this property specifies the ID of the original activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>crosspost source</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>If this activity is a crosspost from another system, this property specifies the ID of the original activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>crosspost source</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#currentLocation">
- <rdfs:comment>The current location for this person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>current location</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The current location for this person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>current location</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#date_of_birth">
- <rdfs:comment>The person's date of birth</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>birthday</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+ <comment>The person's date of birth</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>birthday</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+ <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/rdfs/birthDate#this"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#department">
- <rdfs:comment>The department within the organization</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>department</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The department within the organization</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>department</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#displayName">
- <rdfs:comment>The name of this person, suitable for display</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>display name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The name of this person, suitable for display</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>display name</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/name"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#email">
- <rdfs:comment>An email address of a Google+ user</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>email</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Email"/>
+ <comment>An email address of a Google+ user</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>email</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Email"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#email_type">
- <rdfs:comment>The type of email address. Possible values are:
+ <comment>The type of email address. Possible values are:
'home' - Home email address
'work' - Work email address
'other' - Other
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Email"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>email address type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Email"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>email address type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#email_value">
- <rdfs:comment>The actual email address</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Email"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>email value</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The actual email address</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Email"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>email value</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#embed">
- <rdfs:comment>If the attachment is a video, the embeddable link</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>embeddable link</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#EmbeddableLink"/>
+ <comment>If the attachment is a video, the embeddable link</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>embeddable link</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#EmbeddableLink"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#embed_media_type">
- <rdfs:comment>Media type of the link</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#EmbeddableLink"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>embed media type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Media type of the link</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#EmbeddableLink"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>embed media type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#embed_url">
- <rdfs:comment>URL of embeddable link</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#EmbeddableLink"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>embed URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>URL of embeddable link</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#EmbeddableLink"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>embed URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#endDate">
- <rdfs:comment>The date the person left the organization</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>end date</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+ <comment>The date the person left the organization</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>end date</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#familyName">
- <rdfs:comment>The family name (last name0 of a person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>family name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The family name (last name0 of a person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>family name</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/lastName"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#formatted">
- <rdfs:comment>The full name of a person, including middle names, suffixes etc.</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>formatted</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The full name of a person, including middle names, suffixes etc.</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>formatted</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#fullImage">
- <rdfs:comment>The full image for photo attachments</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>full image</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
+ <comment>The full image for photo attachments</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>full image</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#full_image_height">
- <rdfs:comment>The height, in pixels, of the linked image</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>full image height</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+ <comment>The height, in pixels, of the linked image</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>full image height</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#full_image_media_type">
- <rdfs:comment>Media type of the image</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>full image media type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Media type of the image</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>full image media type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#full_image_url">
- <rdfs:comment>URL of the linked image</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>full image URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>URL of the linked image</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>full image URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#full_image_width">
- <rdfs:comment>The width, in pixels, of the linked image</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>full image width</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+ <comment>The width, in pixels, of the linked image</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#FullImage"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>full image width</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#gender">
- <rdfs:comment>The person's gender. Possible values are: 'male', 'female', 'other'</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>gender</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The person's gender. Possible values are: 'male', 'female', 'other'</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>gender</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/gender"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#geocode">
- <rdfs:comment>Latitude and longitude where an activity occurred. Format is latitude followed by longitude, space separated</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>geocode</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Latitude and longitude where an activity occurred. Format is latitude followed by longitude, space separated</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>geocode</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#givenName">
- <rdfs:comment>The given name (first name) of a person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>given name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The given name (first name) of a person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>given name</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/firstName"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#hasApp">
- <rdfs:comment>If true, indicates that the person has installed the app
+ <comment>If true, indicates that the person has installed the app
that is making the request and has chosen to expose this install state
to the caller. A value of false indicates that the install state
cannot be determined (it is either not installed or the person has
chosen to keep this information private).
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>has app</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>has app</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#has_comment">
- <rdfs:comment>A comment in reply to an activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>has comment</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
+ <comment>A comment in reply to an activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>has comment</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
+ <owl:equivalentProperty rdf:resource="http://rdfs.org/sioc/ns#has_reply"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#honorificPrefix">
- <rdfs:comment>The honorific prefix (such as 'Dr' or 'Mrs') for a person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>honorific prefix</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The honorific prefix (such as 'Dr' or 'Mrs') for a person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>honorific prefix</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://www.w3.org/2001/vcard-rdf/3.0#TITLE"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#honorificSuffix">
- <rdfs:comment>The honorific suffix (such as 'Jr') for a person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>honorific suffix</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The honorific suffix (such as 'Jr') for a person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>honorific suffix</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#html_content">
- <rdfs:comment>The HTML-formatted content, suitable for display</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>html content</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The HTML-formatted content, suitable for display</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>html content</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#id">
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#InverseFunctionalProperty" />
- <rdfs:comment>A Google+ Person, Activity, AccessItem, ActivityObject, Actor, Attachment or Comment ID</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>id</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>A Google+ Person, Activity, AccessItem, ActivityObject, Actor, Attachment or Comment ID</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>id</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#in_reply_to">
- <rdfs:comment>The Activity to which a reply applies</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>is reply to activity</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <comment>The Activity to which a reply applies</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>is reply to activity</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <owl:equivalentProperty rdf:resource="http://rdfs.org/sioc/ns#reply_of"/>
</owl:ObjectProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#in_reply_to_object">
- <rdfs:comment>An object describing the activity this comment replied to</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>inReplyTo object</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#InReplyTo"/>
+ <comment>An object describing the activity this comment replied to</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Comment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>inReplyTo object</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#InReplyTo"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#in_reply_to_url">
- <rdfs:comment>URL of the Activity to which a reply applies</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#InReplyTo"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>is reply to activity with URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>URL of the Activity to which a reply applies</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#InReplyTo"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>is reply to activity with URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#location">
- <rdfs:comment>The location of the organization</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>location</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The location of the organization</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>location</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#middleName">
- <rdfs:comment>The middle name of a person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>middle name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The middle name of a person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>middle name</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#name">
- <rdfs:comment>An object representing the individual components of a person's name</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>name</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
+ <comment>An object representing the individual components of a person's name</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>name</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Name"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#nickname">
- <rdfs:comment>The nickname of a person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>nickname</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The nickname of a person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>nickname</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/nick"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#object_actor">
- <rdfs:comment>If an activity's object is itself another activity (for example, when a person reshares an activity),
+ <comment>If an activity's object is itself another activity (for example, when a person reshares an activity),
this property specifies the original activity's actor.
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>object actor</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>object actor</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Actor"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#object_url">
- <rdfs:comment>The URL associated with the activity object</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>activity object URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>The URL associated with the activity object</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>activity object URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#organization_name">
- <rdfs:comment>The name of the organization</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>organization name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The name of the organization</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>organization name</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#organization_type">
- <rdfs:comment>The type of organization, e.g. 'job', 'school'</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>organization type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The type of organization, e.g. 'job', 'school'</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>organization type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#originalContent">
- <rdfs:comment>The content (text) as provided by the author, stored without any HTML formatting</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>original content</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The content (text) as provided by the author, stored without any HTML formatting</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>original content</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#performed_activity">
- <rdfs:comment>A Google+ activity in the user's activities collection</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>performed activity</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <comment>A Google+ activity in the user's activities collection</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>performed activity</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#placeId">
- <rdfs:comment>ID of the place where an activity occurred</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>placeID</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>ID of the place where an activity occurred</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>placeID</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#placeLived">
- <rdfs:comment>A place where a person has lived</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>place lived</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#PlaceLived"/>
+ <comment>A place where a person has lived</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>place lived</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#PlaceLived"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#placeName">
- <rdfs:comment>Name of the place where an activity occurred</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>place name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Name of the place where an activity occurred</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>place name</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#plusoners_total">
- <rdfs:comment>Total number of people who +1'd this activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>plusoners total</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+ <comment>Total number of people who +1'd this activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>plusoners total</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#previewImage">
- <rdfs:comment>The preview image for photos or videos</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>preview image</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
+ <comment>The preview image for photos or videos</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Attachment"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>preview image</label>
+ <range rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
</owl:ObjectProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#preview_image_height">
- <rdfs:comment>The height, in pixels, of the linked image</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>preview image height</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+ <comment>The height, in pixels, of the linked image</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>preview image height</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#preview_image_media_type">
- <rdfs:comment>Media type of the image</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>preview image media type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Media type of the image</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>preview image media type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#preview_image_url">
- <rdfs:comment>URL of the linked image</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>preview image URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>URL of the linked image</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>preview image URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#preview_image_width">
- <rdfs:comment>The width, in pixels, of the linked image</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>preview image width</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+ <comment>The width, in pixels, of the linked image</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PreviewImage"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>preview image width</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#primary_email">
- <rdfs:comment>If true, indicates this email address is the person's primary one</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Email"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>primary email</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
+ <comment>If true, indicates this email address is the person's primary one</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Email"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>primary email</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#primary_organization">
- <rdfs:comment>If true, indicates this organization is the person's
+ <comment>If true, indicates this organization is the person's
primary one (typically indicated as current one).
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>primary organization</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>primary organization</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#primary_residence">
- <rdfs:comment>If true, this place of residence is a person's primary residence</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PlaceLived"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>primary residence</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
+ <comment>If true, this place of residence is a person's primary residence</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PlaceLived"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>primary residence</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#primary_url">
- <rdfs:comment>If true, this URL is a person's primary URL</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Url"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>primary URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
+ <comment>If true, this URL is a person's primary URL</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Url"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>primary URL</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#profile_image">
- <rdfs:comment>The URL of an person's profile photo</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>profile image</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>The URL of an person's profile photo</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>profile image</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/img"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#profile_url">
- <rdfs:comment>The URL of a person's Google+ profile</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>profile URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>The URL of a person's Google+ profile</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>profile URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#providerTitle">
- <rdfs:comment>Name of the service provider that initially published an activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>provider title</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>Name of the service provider that initially published an activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>provider title</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#published">
- <rdfs:comment>The time at which an activity or comment was initially published</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>published</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
+ <comment>The time at which an activity or comment was initially published</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>published</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#datetime"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#radius">
- <rdfs:comment>Radius, in metres, of the region where this activity occurred, centered at the latitude and
+ <comment>Radius, in metres, of the region where this activity occurred, centered at the latitude and
longitude identified by geocode
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>radius</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>radius</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#relationshipStatus">
- <rdfs:comment>The person's relationship status</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>relationship status</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The person's relationship status</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>relationship status</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#replies_total">
- <rdfs:comment>Total number of comments on this activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>replies total</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+ <comment>Total number of comments on this activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>replies total</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#resharers_total">
- <rdfs:comment>Total number of people who reshared this activity</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>resharers total</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+ <comment>Total number of people who reshared this activity</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#ActivityObject"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>resharers total</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#residence_location">
- <rdfs:comment>A place where a person has lived</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PlaceLived"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>residence location</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>A place where a person has lived</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#PlaceLived"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>residence location</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#role">
- <rdfs:comment>A short description of the person's role in the organization</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>description</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>A short description of the person's role in the organization</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>description</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#shared_url">
- <rdfs:comment>A URL associated with and shared via a person's Google+ profile</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>shared URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>A URL associated with and shared via a person's Google+ profile</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>shared URL</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <owl:equivalentProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#seeAlso"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#speaksLanguage">
- <rdfs:comment>A language spoken by this person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>speaks language</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>A language spoken by this person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>speaks language</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#startDate">
- <rdfs:comment>The date the person joined the organization</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>start date</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+ <comment>The date the person joined the organization</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>start date</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#tagline">
- <rdfs:comment>The brief description (tagline) of a person</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>tagline</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The brief description (tagline) of a person</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Person"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>tagline</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#title">
- <rdfs:comment>The person's job title or role within the organization</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>title</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <comment>The person's job title or role within the organization</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Organization"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>title</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#updated">
- <rdfs:comment>The time at which an activity or comment was last updated</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>updated</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
+ <comment>The time at which an activity or comment was last updated</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Object"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>updated</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#datetime"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#url_type">
- <rdfs:comment>The type of this Google+ profile URL -
+ <comment>The type of this Google+ profile URL -
'home', 'work', 'blog', 'profile', 'other'
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Url"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>URL type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Url"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>URL type</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#url_value">
- <rdfs:comment>The URL value</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Url"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>URL value</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <comment>The URL value</comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Url"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>URL value</label>
+ <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/googleplus#verb">
- <rdfs:comment>An activity's verb, indicating what action was performed e.g.
+ <comment>An activity's verb, indicating what action was performed e.g.
'post' - Publish content to the stream.
'checkin' - Check in to a location.
'share' - Re-share an activity.
- </rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
- <rdfs:label>verb</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ </comment>
+ <domain rdf:resource="http://www.openlinksw.com/schemas/googleplus#Activity"/>
+ <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/googleplus"/>
+ <label>verb</label>
+ <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
</rdf:RDF>
-
-
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplklout.owl b/binsrc/rdf_mappers/ontologies/owl/oplklout.owl
deleted file mode 100644
index 466ae23..0000000
--- a/binsrc/rdf_mappers/ontologies/owl/oplklout.owl
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- oplklout.owl,v 1.1.2.3 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
-
- Generated from oplklout.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
-
- An OpenLink ontology for Klout
-
- See:
- http://developer.klout.com/iodocs (Klout API resources)
--->
-
-<rdf:RDF
- xmlns="http://www.openlinksw.com/schemas/klout#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:oplklout="http://www.openlinksw.com/schemas/klout#"
- xmlns:opltw="http://www.openlinksw.com/schemas/twitter#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:sioct="http://rdfs.org/sioc/types#"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-
- <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/klout">
- <dc:creator>OpenLink Software, http://www.openlinksw.com</dc:creator>
- <dc:date rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2011-07-22</dc:date>
- <dc:description>OpenLink schema for Klout objects and properties</dc:description>
- <dc:title>OpenLink schema for Klout</dc:title>
- </owl:Ontology>
-
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/klout#User">
- <rdfs:comment>A Klout (twitter) user</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>Klout user</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/twitter#User"/>
- </owl:Class>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#amplification">
- <rdfs:comment>Klout Amplification</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>Amplification</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#class">
- <rdfs:comment>Klout user class</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>Klout</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#delta1d">
- <rdfs:comment>Klout score 1-day change</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>delta-1d</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#delta5d">
- <rdfs:comment>Klout score 5-day change</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>delta-5d</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#description">
- <rdfs:comment>Klout's description of a user</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>Description</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#has_klout">
- <rdfs:comment>A user's Klout score</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>Klout</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#influenced_by">
- <rdfs:comment>Klout users who influence the current user</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>InfluencedBy</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#influences">
- <rdfs:comment>Other Klout users influenced by the current user</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>Influences</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#netscore">
- <rdfs:comment>A Klout user's Network score</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>Netscore</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#score_slope">
- <rdfs:comment>A user's Klout score-slope</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>ScoreSlope</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#topic">
- <rdfs:comment>Topic about which a Klout user posts</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>KloutTopic</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/topic_interest"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#true_reach">
- <rdfs:comment>Measure of a user's Klout True Reach</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>TrueReach</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/klout#twitterProfileURI">
- <rdfs:comment>Klout user's equivalent Twitter profile URI</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/klout#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/klout"/>
- <rdfs:label>TwitterProfile</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/homepage"/>
- </owl:DatatypeProperty>
-
-</rdf:RDF>
-
diff --git a/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl b/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl
index 3f81d3e..ec992b2 100644
--- a/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl
@@ -1,25 +1,4 @@
<!--
-
- opllinkedin.owl,v 1.1.4.6 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
Generated from opllinkedin.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
An OpenLink ontology for LinkedIn
@@ -63,6 +42,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>Company</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/linkedin#Object"/>
+ <owl:equivalentClass rdf:resource="http://purl.org/goodrelations/v1#BusinessEntity"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/linkedin#Education">
@@ -77,6 +57,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>Instant messaging account</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/linkedin#Object"/>
+ <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/OnlineAccount"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/linkedin#Language">
@@ -84,6 +65,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>Language</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/linkedin#Object"/>
+ <owl:equivalentClass rdf:resource="http://www.openlinksw.com/schemas/rdfs/Language#this"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/linkedin#MemberURLResource">
@@ -104,6 +86,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>Patent</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/linkedin#Object"/>
+ <owl:equivalentClass rdf:resource="http://purl.org/ontology/bibo/Patent"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/linkedin#Person">
@@ -111,6 +94,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>Person</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/linkedin#Object"/>
+ <owl:equivalentClass rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/linkedin#PhoneNumber">
@@ -131,7 +115,9 @@
<rdfs:comment>A publication authored by a LinkedIn member</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>Publication</rdfs:label>
+ <rdfs:subClassOf rdf:resource="http://purl.org/ontology/bibo/Document"/>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/linkedin#Object"/>
+ <owl:equivalentClass rdf:resource="http://umbel.org/umbel/rc/ScholarlyArticle"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/linkedin#Recommendation">
@@ -153,6 +139,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>Twitter account</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/linkedin#Object"/>
+ <rdfs:subClassOf rdf:resource="http://xmlns.com/foaf/0.1/OnlineAccount"/>
</owl:Class>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#associations">
@@ -177,6 +164,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>author id</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://purl.org/dc/terms/creator"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#author_person">
@@ -297,6 +285,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>date of birth</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+ <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/rdfs/birthDate#this"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#distance">
@@ -377,6 +366,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>first name</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/firstName"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#has_im_account">
@@ -393,6 +383,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>has phone number</rdfs:label>
<rdfs:range rdf:resource="http://www.openlinksw.com/schemas/linkedin#PhoneNumber"/>
+ <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/rdfs/telephone#this"/>
</owl:ObjectProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#has_twitter_account">
@@ -513,6 +504,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>last name</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/lastName"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#location_name">
@@ -649,6 +641,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>phone number</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/phone"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#phone_number_type">
@@ -665,6 +658,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>profile picture URL</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/img"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#position">
@@ -708,11 +702,12 @@
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#public_profile_url">
- <rdfs:comment>URL to a LinkedIn member's public profile</rdfs:comment>
+ <rdfs:comment>URL to a member's public profile</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/linkedin#Person"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
- <rdfs:label>LinkedIn profile URL</rdfs:label>
+ <rdfs:label>public profile URL</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/page"/>
</owl:DatatypeProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#publication">
@@ -745,6 +740,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>title</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://purl.org/dc/terms/title"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#publication_url">
@@ -753,6 +749,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>publication URL</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
+ <owl:equivalentProperty rdf:resource="http://purl.org/ontology/bibo/uri"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/linkedin#publisher_name">
@@ -865,6 +862,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/linkedin"/>
<rdfs:label>title</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <owl:equivalentProperty rdf:resource="http://www.w3.org/2001/vcard-rdf/3.0#TITLE"/>
</owl:DatatypeProperty>
</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl b/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl
index ee5115c..c3f455f 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl
@@ -1,27 +1,3 @@
-<!--
-
- oplmoney.owl,v 1.1.4.3 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
--->
-
<rdf:RDF xmlns="http://www.openlinksw.com/schemas/money#"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:log="http://www.w3.org/2000/10/swap/log#"
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplnyt.owl b/binsrc/rdf_mappers/ontologies/owl/oplnyt.owl
deleted file mode 100644
index 9f4c11e..0000000
--- a/binsrc/rdf_mappers/ontologies/owl/oplnyt.owl
+++ /dev/null
@@ -1,93 +0,0 @@
-<!--
-
- oplnyt.owl,v 1.1.2.3 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
-
- Generated from oplnyt.n3
-
- An OpenLink ontology for New York Times
-
- See:
- http://developer.nytimes.com/docs/read/The_Semantic_API
- http://developer.nytimes.com/docs/read/article_search_api
--->
-
-<rdf:RDF xmlns="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-
- <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/nyt">
- <dc:creator>OpenLink Software, http://www.openlinksw.com</dc:creator>
- <dc:date rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2011-12-14</dc:date>
- <dc:description>OpenLink schema for New York Times Semantic and Article Search APIs</dc:description>
- <dc:title>OpenLink schema for New York Times</dc:title>
- </owl:Ontology>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/nyt#concept_type">
- <comment>A concept type from the New York Times controlled vocabulary</comment>
- <domain rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
- <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/nyt"/>
- <label>NYT concept type</label>
- <range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/nyt#fee">
- <comment>Indicates whether users must pay a fee to retrieve the full article</comment>
- <domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
- <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/nyt"/>
- <label>fee</label>
- <range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/nyt#full_article">
- <comment>A link to a full NYT article related to a NYT concept/topic tag</comment>
- <domain rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
- <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/nyt"/>
- <label>full NYT article</label>
- <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/nyt#is_times_tag">
- <comment>True if a concept is returned by the TimesTags API</comment>
- <domain rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
- <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/nyt"/>
- <label>is Times tag</label>
- <range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/nyt#related_article">
- <comment>A summary of a NYT article related to a NYT concept/topic tag</comment>
- <domain rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
- <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/nyt"/>
- <label>related NYT article</label>
- <range rdf:resource="http://purl.org/ontology/bibo/Document"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/nyt#topic_page">
- <comment>A NYT topic page associated with a NYT concept/topic tag</comment>
- <domain rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
- <isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/nyt"/>
- <label>topic page</label>
- <range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl b/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl
index 69f06db..8b2d85c 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl
@@ -1,26 +1,4 @@
<!--
-
- oplopengraph.owl,v 1.1.4.8 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
-
Generated from oplopengraph.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
An OpenLink ontology for complementing Open Graph
@@ -31,7 +9,6 @@
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:like="http://ontologi.es/like#"
xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:mo="http://purl.org/ontology/mo/"
xmlns:og="http://ogp.me/ns#"
xmlns:oplog="http://www.openlinksw.com/schemas/opengraph#"
xmlns:owl="http://www.w3.org/2002/07/owl#"
@@ -123,13 +100,6 @@
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/opengraph#Object"/>
</owl:Class>
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/opengraph#Image">
- <rdfs:comment>A class representing a variant of a Photo</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>Image</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/opengraph#Photo"/>
- </owl:Class>
-
<owl:Class rdf:about="http://www.openlinksw.com/schemas/opengraph#Insights">
<rdfs:comment>Statistics about applications, pages, and domains.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
@@ -255,32 +225,6 @@
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/opengraph#Object"/>
</owl:Class>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#accounts">
- <rdfs:comment>The Facebook apps and pages owned by the current user</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>accounts</rdfs:label>
- <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/opengraph#has_account"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#activities">
- <rdfs:comment>The activities listed on the user's profile.</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>activities</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Activity"/>
- <owl:equivalentProperty rdf:resource="http://ontologi.es/like#likes"/>
- <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/opengraph#likes_activity"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#address">
- <rdfs:comment>User's address</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>address</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#album_type">
<rdfs:comment>The type of the album: profile, mobile, wall, normal or album</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Album"/>
@@ -289,39 +233,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#albums">
- <rdfs:comment>The photo albums this user has created.</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>albums</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Album"/>
- <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/opengraph#has_album"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#bio">
- <rdfs:comment>The user's biography</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>address</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#birthday">
- <rdfs:comment>The user's birthday</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>birthday</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#books">
- <rdfs:comment>The books listed on the user's profile</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>books</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Book"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#category">
<rdfs:comment>The Page's category</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Page"/>
@@ -330,14 +241,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#checkins">
- <rdfs:comment>The places that the user has checked-into</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>checkins</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#count">
<rdfs:comment>The number of photos in an album</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Album"/>
@@ -362,78 +265,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#education">
- <rdfs:comment>A list of the user's education history.</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>education</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#email">
- <rdfs:comment>The proxied or contact email address granted by the user</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>email</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#events">
- <rdfs:comment>The events this user is attending</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>events</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#family">
- <rdfs:comment>The user's family relationships</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>family</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#feed">
- <rdfs:comment>The user's wall</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>feed</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#first_name">
- <rdfs:comment>The user's first name</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>first name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#friendlists">
- <rdfs:comment>The user's friend lists</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>friend lists</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#friendrequests">
- <rdfs:comment>The user's incoming friend requests</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>friend requests</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#friends">
- <rdfs:comment>The user's friends</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>friends</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#from">
<rdfs:comment>The Facebook user who made this post</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Post"/>
@@ -442,30 +273,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#games">
- <rdfs:comment>Games the user has added to the Arts and Entertainment section of their profile</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>games</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Game"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#gender">
- <rdfs:comment>The user's gender</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>gender</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#groups">
- <rdfs:comment>The Groups that the user belongs to</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>groups</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#has_account">
<rdfs:comment>A Facebook page owned by the user</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Page"/>
@@ -537,21 +344,13 @@
</owl:ObjectProperty>
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#has_post">
- <rdfs:comment>An application's own post</rdfs:comment>
+ <rdfs:comment>A application's own post</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Application"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
<rdfs:label>has post</rdfs:label>
<rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Post"/>
</owl:ObjectProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#has_variant">
- <rdfs:comment>A variant of a photo</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Photo"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>has variant</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Image"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#height">
<rdfs:comment>The height of a photo in pixels</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Photo"/>
@@ -560,22 +359,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#home">
- <rdfs:comment>The user's news feed</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>home</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#hometown">
- <rdfs:comment>The user's hometown</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>hometown</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#id">
<rdfs:comment>A Facebook object ID</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Object"/>
@@ -584,71 +367,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#inbox">
- <rdfs:comment>The [Threads](/docs/reference/api/thread/) in this user's inbox</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>inbox</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#inspirational_people">
- <rdfs:comment>Inspirational people</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>inspirational people</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#installed">
- <rdfs:comment>installed</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>installed</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#interested_in">
- <rdfs:comment>The genders the user is interested in</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>interested_in</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#interests">
- <rdfs:comment>The interests listed on the user's profile.</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>interests</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Interest"/>
- <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/opengraph#has_interest"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#is_employee">
- <rdfs:comment>employee</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>is_employee</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#languages">
- <rdfs:comment>The user's languages</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>languages</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#last_name">
- <rdfs:comment>The user's last name</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>last name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#liked_by">
<rdfs:comment>the user that liked the Facebook object</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Object"/>
@@ -657,15 +375,6 @@
<rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
</owl:ObjectProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#likes">
- <rdfs:comment>All the pages this user has liked</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>likes</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <owl:equivalentProperty rdf:resource="http://ontologi.es/like#likes"/>
- </owl:ObjectProperty>
-
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#likes_activity">
<rdfs:comment>An activity listed on a user's profile</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
@@ -722,23 +431,12 @@
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#link">
<rdfs:comment>A link attached to a Post</rdfs:comment>
- <rdfs:comment>The URL of the profile for the user on Facebook</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Post"/>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
<rdfs:label>link</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#links">
- <rdfs:comment>The user's posted links</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>links</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#locale">
<rdfs:comment>A user's locale expressed as an ISO language code and country code</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Product"/>
@@ -747,22 +445,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#location">
- <rdfs:comment>The user's current city</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>location</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#meeting_for">
- <rdfs:comment>meeting for</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>meeting_for</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#message">
<rdfs:comment>A message contained in a Post</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Post"/>
@@ -771,120 +453,14 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#middle_name">
- <rdfs:comment>The user's middle name</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>middle name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#mobile_phone">
- <rdfs:comment>mobile phone</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>mobile_phone</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#movies">
- <rdfs:comment>The movies listed on the user's profile.</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>movies</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Movie"/>
- <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/opengraph#likes_movie"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#music">
- <rdfs:comment>The music listed on the user's profile.</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>music</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Music"/>
- <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/opengraph#likes_music"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#mutualfriends">
- <rdfs:comment>The mutual friends between two users</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>mutualfriends</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#name">
- <rdfs:comment>The user's full name</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
+ <rdfs:comment>The name of an Open Graph object</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Object"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
<rdfs:label>name</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#notes">
- <rdfs:comment>The user's notes</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>notes</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#notifications">
- <rdfs:comment>The user's notifications</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>notifications</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#outbox">
- <rdfs:comment>TThe messages in this user's outbox</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>outbox</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#payments">
- <rdfs:comment>The Facebook Credits orders the user placed with an application</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>payments</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#permissions">
- <rdfs:comment>The permissions that user has granted the application</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>permissions</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#photos">
- <rdfs:comment>Photos the user (or friend) is tagged in.</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>photos</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Photo"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#picture">
- <rdfs:comment>The user's profile picture</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>picture</rdfs:label>
- <owl:equivalentProperty rdf:resource="http://www.openlinksw.com/schemas/opengraph#has_picture"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#political">
- <rdfs:comment>The user's political view</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>political</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#position">
<rdfs:comment>The position of a photo in an album</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Photo"/>
@@ -901,14 +477,6 @@
<rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Post"/>
</owl:ObjectProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#posts">
- <rdfs:comment>The user's own posts</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>posts</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#privacy">
<rdfs:comment>The privacy setting of a group</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Group"/>
@@ -917,78 +485,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#public_profile_url">
- <rdfs:comment>URL to a Facebook user's home page</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>Facebook profile URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#quotes">
- <rdfs:comment>The user's favorite quotes</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>quotes</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#relationship_status">
- <rdfs:comment>The user's relationship status: 'Single', 'In a relationship', 'Engaged', 'Married', 'It's complicated', 'In an open relationship', 'Widowed', 'Separated', 'Divorced', 'In a civil union', 'In a domestic partnership'. 'user_relationships' or 'friends_relationships'</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>relationship status</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#religion">
- <rdfs:comment>The user's religion</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>religion</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#scores">
- <rdfs:comment>The current [scores](/docs/score/) for the user in games</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>scores</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#significant_other">
- <rdfs:comment>The user's significant other</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>significant other</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#sports">
- <rdfs:comment>The user's sports</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>sports</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#statuses">
- <rdfs:comment>The user's status updates</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>statuses</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#tagged">
- <rdfs:comment>Posts the user is tagged in</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>tagged</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
<owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#tagged_by">
<rdfs:comment>The photos, videos, and posts in which this application has been tagged</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Application"/>
@@ -997,14 +493,6 @@
<rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Object"/>
</owl:ObjectProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#television">
- <rdfs:comment>The television listed on the user's profile</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>television</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#TvProgramme"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#third_party_id">
<rdfs:comment>An anonymous but unique identifier for the user</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
@@ -1013,14 +501,6 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#timezone">
- <rdfs:comment>The user's timezone offset from UTC. Available only for the current user</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>timezone</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#to">
<rdfs:comment>A Facebook profile targeted in this post</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Post"/>
@@ -1029,40 +509,16 @@
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#trust">
- <rdfs:comment>trust</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>trust</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#updated_time">
- <rdfs:comment>The last time the user's profile was updated; changes to the 'languages', 'link', 'timezone', 'verified', 'interested_in', 'favorite_athletes', 'favorite_teams', and 'video_upload_limits' are not not reflected in this value. Requires 'access_token'. 'string' containing an ISO-8601 datetime</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>updated time</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#updates">
- <rdfs:comment>The updates in this user's inbox</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>updates</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:ObjectProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#uri">
- <rdfs:comment>A link to an OpenGraph resource</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Object"/>
+ <rdfs:comment>The URI of a Facebook user's Facebook home page</rdfs:comment>
+ <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#Product"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
<rdfs:label>uri</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#username">
- <rdfs:comment>The user's Facebook username</rdfs:comment>
+ <rdfs:comment>A user's Facebook username</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
<rdfs:label>username</rdfs:label>
@@ -1070,34 +526,10 @@
</owl:DatatypeProperty>
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#verified">
- <rdfs:comment>The user's account verification status, either 'true' or 'false' </rdfs:comment>
+ <rdfs:comment>A user's account verification status</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
<rdfs:label>verified</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#video_upload_limits">
- <rdfs:comment>The size of the video file and the length of the video that a user can upload; only returned if specifically requested via the 'fields' URL parameter</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>video upload limits</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
- <owl:ObjectProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#videos">
- <rdfs:comment>The videos this user has been tagged in</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>videos</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/opengraph#Video"/>
- </owl:ObjectProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#website">
- <rdfs:comment>The URL of the user's personal website</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>website</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
</owl:DatatypeProperty>
@@ -1108,12 +540,4 @@
<rdfs:label>width</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/opengraph#work">
- <rdfs:comment>A list of the user's work history</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/opengraph#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/opengraph"/>
- <rdfs:label>work</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplstackoverflow.owl b/binsrc/rdf_mappers/ontologies/owl/oplstackoverflow.owl
deleted file mode 100644
index 812df2f..0000000
--- a/binsrc/rdf_mappers/ontologies/owl/oplstackoverflow.owl
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- oplstackoverflow.owl,v 1.1.2.2 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
--->
-<rdf:RDF
- xmlns:awol="http://bblfish.net/work/atom-owl/2006-06-06/#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:gn="http://www.geonames.org/ontology#"
- xmlns:opl="http://www.openlinksw.com/schema/attribution#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:sioc="http://rdfs.org/sioc/ns#"
- xmlns:sioct="http://rdfs.org/sioc/types#""
- xmlns:so="http://www.openlinksw.com/schemas/stackoverflow#"
- xmlns:virtrdfmec="http://www.openlinksw.com/schemas/virtrdf-meta-entity-class#"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
- <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/stackoverflow#">
- <dc:creator rdf:datatype="http://www.w3.org/2001/XMLSchema#string">OpenLink Software, http://www.openlinksw.com</dc:creator>
- </owl:Ontology>
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/stackoverflow#Answer">
- <rdfs:comment>An answer in a StackOverflow question thread</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>StackOverflow Answer</rdfs:label>
- </owl:Class>
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/stackoverflow#Entity">
- <rdfs:comment>An entity in the StackOverflow world</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>StackOverflow Entity</rdfs:label>
- </owl:Class>
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/stackoverflow#Question">
- <rdfs:comment>A StackOverflow question thread</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>StackOverflow Question</rdfs:label>
- </owl:Class>
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/stackoverflow#User">
- <rdfs:comment>A StackOverflow user</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>StackOverflow User</rdfs:label>
- </owl:Class>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#accepted_answer_id">
- <rdfs:comment>An answer accepted by the original user</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#Question"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Accepted Answer</rdfs:label>
- <rdfs:range rdf:resource="http://rdfs.org/sioc/types#"Answer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#answer_count">
- <rdfs:comment>Number of answers provided for a Question</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#Question"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Answer count</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#employee">
- <rdfs:comment>Whether a StackOverflow User is an employee or not</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#Question"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Employed?</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#is_accepted">
- <rdfs:comment>Whether the answer has been accepted by original poster</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#Answer"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Accepted?</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#location">
- <rdfs:comment>StackOverflow user's general location</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Location</rdfs:label>
- <rdfs:subPropertyOf rdf:resource="http://www.geonames.org/ontology#name"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#quota_max">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#Agent"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Quota: Max</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#quota_remaining">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#Agent"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Quota: Remaining</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#reputation">
- <rdfs:comment>A StackOverflow User's reputation (karma)</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Reputation</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#reputation_change_day">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Reputation change 1d</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#reputation_change_month">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Reputation change 1m</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#reputation_change_week">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Reputation change 1wk</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#reputation_change_year">
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Reputation change 1yr</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#score">
- <rdfs:comment>A StackOverflow Entity's score</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#Entity"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>Score</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#user_type">
- <rdfs:comment>Whether the user is registered or not</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>User type</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/stackoverflow#view_count">
- <rdfs:comment>Number of times a StackOverflow question has been viewed</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#Question"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/stackoverflow#"/>
- <rdfs:label>View count</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
- </owl:DatatypeProperty>
-</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/opltesco.owl b/binsrc/rdf_mappers/ontologies/owl/opltesco.owl
index f1cc582..d8d7f65 100644
--- a/binsrc/rdf_mappers/ontologies/owl/opltesco.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/opltesco.owl
@@ -1,25 +1,4 @@
<!--
-
- opltesco.owl,v 1.1.4.3 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
Generated from opltesco.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
An OpenLink ontology for specializing the ProductOrService class of the GoodRelations ontology
diff --git a/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl b/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl
index a339645..d461c1c 100644
--- a/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl
@@ -1,26 +1,5 @@
<!--
-
- opltwitter.owl,v 1.1.4.7 2012/03/06 16:48:07 source Exp
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- Copyright (C) 1998-2012 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
-
- Generated from opltwitter.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
+ Generated from opllinkedin.n3 by on-line N3-RDF/XML converter at http://www.mindswap.org/2002/rdfconvert/
An OpenLink ontology for Twitter
@@ -38,7 +17,6 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:sioct="http://rdfs.org/sioc/types#"
- xmlns:virtrdfmec="http://www.openlinksw.com/schemas/virtrdf-meta-entity-class#"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
<owl:Ontology rdf:about="http://www.openlinksw.com/schemas/twitter">
@@ -48,13 +26,6 @@
<dc:title>OpenLink schema for Twitter</dc:title>
</owl:Ontology>
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/twitter#Application">
- <rdfs:comment>Application used to generate tweets</rdfs:comment>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
- <rdfs:label>Twitter application</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/twitter#Object"/>
- </owl:Class>
-
<owl:Class rdf:about="http://www.openlinksw.com/schemas/twitter#Object">
<rdfs:comment>A base class representing all Twitter objects</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
@@ -66,6 +37,7 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
<rdfs:label>Tweet</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/twitter#Object"/>
+ <owl:equivalentClass rdf:resource="http://rdfs.org/sioc/types#MicroblogPost"/>
</owl:Class>
<owl:Class rdf:about="http://www.openlinksw.com/schemas/twitter#User">
@@ -73,17 +45,9 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
<rdfs:label>Twitter user</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/twitter#Object"/>
- <rdfs:subClassOf rdf:resource="http://www.openlinksw.com/schemas/virtrdf-meta-entity-class#Person"/>
+ <owl:equivalentClass rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
</owl:Class>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/twitter#appLink">
- <rdfs:comment>Resource for the agent used to post the tweet</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/twitter#Application"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
- <rdfs:label>Posting Agent resource</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/twitter#favorites_count">
<rdfs:comment>The number of tweets (statuses) tagged by this user as being a favorite</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/twitter#User"/>
@@ -146,24 +110,9 @@
<rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
<rdfs:label>made tweet</rdfs:label>
<rdfs:range rdf:resource="http://www.openlinksw.com/schemas/twitter#Tweet"/>
+ <owl:equivalentProperty rdf:resource="http://xmlns.com/foaf/0.1/made"/>
</owl:ObjectProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/twitter#public_profile_url">
- <rdfs:comment>URL to a Twitter user's public profile / home page</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/twitter#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
- <rdfs:label>Twitter profile URL</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
- </owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/twitter#screen_name">
- <rdfs:comment>Twitter account name</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/twitter#User"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
- <rdfs:label>screen_name</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </owl:DatatypeProperty>
-
<owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/twitter#statuses_count">
<rdfs:comment>The number of tweets (statuses) posted by this user</rdfs:comment>
<rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/twitter#User"/>
@@ -171,12 +120,4 @@
<rdfs:label>statuses count</rdfs:label>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
</owl:DatatypeProperty>
-
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/twitter#via">
- <rdfs:comment>Agent used for posting the tweet</rdfs:comment>
- <rdfs:domain rdf:resource="http://www.openlinksw.com/schemas/twitter#Tweet"/>
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/twitter"/>
- <rdfs:label>via</rdfs:label>
- <rdfs:range rdf:resource="http://www.openlinksw.com/schemas/twitter#Application"/>
- </owl:DatatypeProperty>
</rdf:RDF>
diff --git a/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl b/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl
index 9b3adc6..d3948a1 100644
--- a/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl
@@ -1,11 +1,11 @@
<!--
- oplzillow.owl,v 1.1.2.6 2012/03/06 16:48:07 source Exp
+ $Id: oplzillow.owl,v 1.1.2.5 2010/01/25 15:36:26 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/ontologies/owl/owl.owl b/binsrc/rdf_mappers/ontologies/owl/owl.owl
index f804d0c..e8bdf5c 100644
--- a/binsrc/rdf_mappers/ontologies/owl/owl.owl
+++ b/binsrc/rdf_mappers/ontologies/owl/owl.owl
@@ -26,7 +26,7 @@
explicitly into their ontology. People that do import this file
should expect their ontology to be an OWL Full ontology.
</rdfs:comment>
- <versionInfo>10 February 2004, revised 2009/12/15 23:13:00</versionInfo>
+ <versionInfo>10 February 2004, revised $Date: 2009/12/15 23:13:00 $</versionInfo>
<priorVersion rdf:resource="http://www.daml.org/2001/03/daml+oil"/>
</Ontology>
diff --git a/binsrc/rdf_mappers/ontologies/xbrl/xbrl.owl b/binsrc/rdf_mappers/ontologies/xbrl/xbrl.owl
index a486b62..594cfb3 100644
--- a/binsrc/rdf_mappers/ontologies/xbrl/xbrl.owl
+++ b/binsrc/rdf_mappers/ontologies/xbrl/xbrl.owl
@@ -15,7 +15,7 @@
<!ENTITY us-gaap-ci 'http://www.xbrl.org/us/fr/gaap/ci/2005-02-28#'>
<!ENTITY xml 'http://www.w3.org/XML/1998/namespace#'>
]>
-<rdf:RDF xmlns:opl-xbrl="http://www.openlinksw.com/schemas/xbrl/" xmlns:xo="http://rhizomik.upf.edu/redefer/xsl/xsd2owl-functions.xsl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:link="http://www.xbrl.org/2003/linkbase#" xmlns:xlink="http://www.w3.org/1999/xlink#" xmlns:xbrli="http://www.xbrl.org/2003/instance#" xmlns:msft="#" xmlns:mem="http://www.microsoft.com/xbrl/mem#" xmlns:usfr-seccert="http://www.xbrl.org/us/fr/rpt/seccert/2005-02-28#" xmlns:usfr-mda="http://www.xbrl.org/us/fr/rpt/mda/2005-02-28#" xmlns:usfr-ar="http://www.xbrl.org/us/fr/rpt/ar/2005-02-28#" xmlns:usfr-pte="http://www.xbrl.org/us/fr/common/pte/2005-02-28#" xmlns:ref="http://www.xbrl.org/2004/ref#" xmlns:usfr-mr="http://www.xbrl.org/us/fr/rpt/mr/2005-02-28#" xmlns:us-gaap-ci="http://www.xbrl.org/us/fr/gaap/ci/2005-02-28#">
+<rdf:RDF xmlns:xo="http://rhizomik.upf.edu/redefer/xsl/xsd2owl-functions.xsl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:link="http://www.xbrl.org/2003/linkbase#" xmlns:xlink="http://www.w3.org/1999/xlink#" xmlns:xbrli="http://www.xbrl.org/2003/instance#" xmlns:msft="#" xmlns:mem="http://www.microsoft.com/xbrl/mem#" xmlns:usfr-seccert="http://www.xbrl.org/us/fr/rpt/seccert/2005-02-28#" xmlns:usfr-mda="http://www.xbrl.org/us/fr/rpt/mda/2005-02-28#" xmlns:usfr-ar="http://www.xbrl.org/us/fr/rpt/ar/2005-02-28#" xmlns:usfr-pte="http://www.xbrl.org/us/fr/common/pte/2005-02-28#" xmlns:ref="http://www.xbrl.org/2004/ref#" xmlns:usfr-mr="http://www.xbrl.org/us/fr/rpt/mr/2005-02-28#" xmlns:us-gaap-ci="http://www.xbrl.org/us/fr/gaap/ci/2005-02-28#">
<owl:Ontology rdf:about="">
<rdfs:comment>OWL ontology for XBRL</rdfs:comment>
<owl:imports rdf:resource="http://www.xbrl.org/2003/instance#"/>
@@ -105,16 +105,6 @@
</owl:Class>
</rdfs:range>
</owl:ObjectProperty>
- <owl:DatatypeProperty rdf:about="http://www.openlinksw.com/schemas/xbrl/identifier">
- <rdfs:isDefinedBy rdf:resource="http://www.openlinksw.com/schemas/xbrl"/>
- <rdfs:label>CIK</rdfs:label>
- <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- <owl:equivalentProperty rdf:resource="http://www.rdfabout.com/rdf/schema/ussec/cik"/>
- </owl:DatatypeProperty>
- <owl:Class rdf:about="http://www.openlinksw.com/schemas/xbrl/report">
- <rdfs:label xml:lang="en">Report</rdfs:label>
- <rdfs:subClassOf rdf:resource="http://rdfs.org/sioc/ns#Container"/>
- </owl:Class>
<rdf:Property rdf:about="InvestmentCategoryName">
<rdfs:subPropertyOf rdf:resource="http://www.xbrl.org/2003/instance#item"/>
<rdfs:range rdf:resource="http://www.xbrl.org/2003/instance#stringItemType"/>
diff --git a/binsrc/rdf_mappers/rdf_mappers.sql b/binsrc/rdf_mappers/rdf_mappers.sql
index 039f5d3..a50fa6f 100644
--- a/binsrc/rdf_mappers/rdf_mappers.sql
+++ b/binsrc/rdf_mappers/rdf_mappers.sql
@@ -1,13 +1,13 @@
--
--
--- $Id: rdf_mappers.sql,v 1.165.2.197 2012/03/14 11:40:13 source Exp $
+-- $Id: rdf_mappers.sql,v 1.165.2.133 2011/10/25 23:36:21 source Exp $
--
-- RDF Mappings
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -24,8 +24,6 @@
--
--
---set macro_substitution=off;
-
-- remove wrong cartridge patterns
delete from DB.DBA.SYS_RDF_MAPPERS where RM_PATTERN = '(text/html)|(application/atom.xml)|(text/xml)|(application/xml)|(application/rss.xml)' and RM_TYPE = 'MIME';
delete from DB.DBA.SYS_RDF_MAPPERS where RM_PATTERN = '(text/html)|(application/atom.xml)|(text/xml)|(application/xml)|(application/rss.xml)|(application/rdf.xml)' and RM_TYPE = 'MIME';
@@ -33,7 +31,6 @@ delete from DB.DBA.SYS_RDF_MAPPERS where RM_PATTERN = '.+\.svg\$';
delete from DB.DBA.SYS_RDF_MAPPERS where RM_PATTERN = '.+\.od[ts]\$';
delete from DB.DBA.SYS_RDF_MAPPERS where RM_PATTERN = '.+\.ics\$';
delete from DB.DBA.SYS_RDF_MAPPERS where RM_PATTERN = '.+\\.ics\x24';
-delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_HTTP_SESSION';
-- insertion of cartridges
@@ -73,8 +70,7 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'URL', 'DB.DBA.RDF_LOAD_EVRI', null, 'Evri');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(http://.*foursquare.com/.*)|'||
- '(https://.*foursquare.com/.*)',
+ values ('(http://.*foursquare.com/.*)|(https://.*foursquare.com/.*)',
'URL', 'DB.DBA.RDF_LOAD_FOURSQUARE', null, 'Foursquare');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
@@ -82,8 +78,7 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'URL', 'DB.DBA.RDF_LOAD_SEATGEEK', null, 'Seatgeek');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(http://.*simplegeo.com/.*)|'||
- '(https://.*simplegeo.com/.*)',
+ values ('(http://.*simplegeo.com/.*)|(https://.*simplegeo.com/.*)',
'URL', 'DB.DBA.RDF_LOAD_SIMPLEGEO', null, 'SimpleGeo');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
@@ -137,14 +132,10 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
values ('(http://plus.google.com/.*)|'||
- '(https://plus.google.com/.*)',
+ '(https://plus.google.com/.*)',
'URL', 'DB.DBA.RDF_LOAD_GOOGLE_PROFILE', null, 'Google (Profile)');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('http://socialstatistics.com/.*',
- 'URL', 'DB.DBA.RDF_LOAD_SOCIALSTATISTICS', null, 'Google+ Stats');
-
-insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
values ('http://maps.google.com/.*',
'URL', 'DB.DBA.RDF_LOAD_GOOGLE_PLACES', null, 'Google (Places)');
@@ -157,6 +148,10 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
values ('http://.*jigsaw.com/.*',
'URL', 'DB.DBA.RDF_LOAD_JIGSAW', null, 'Jigsaw');
+--insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_ENABLED)
+-- values ('.*', 'HTTP', 'DB.DBA.RDF_LOAD_HTTP_SESSION', null, 'HTTP in RDF', 0);
+delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_HTTP_SESSION';
+
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
values ('(text/html)|(text/xml)|(application/xml)|(application/rdf.xml)',
'MIME', 'DB.DBA.RDF_LOAD_HTML_RESPONSE', null, 'xHTML', vector ('add-html-meta', 'yes', 'get-feeds', 'no'));
@@ -167,7 +162,7 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
values ('(http://farm[0-9]*.static.flickr.com/.*)|'||
- '(http://www.flickr.com/photos/.*)',
+ '(http://www.flickr.com/photos/.*)',
'URL', 'DB.DBA.RDF_LOAD_FLICKR_IMG', null, 'Flickr Images');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
@@ -198,9 +193,9 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'(http://.*amazon.[^/]+/[^/]+/dp/[^/]+(/.*)?)|'||
'(http://.*amazon.[^/]+/[^/]+/product-reviews/.*)|'||
'(http://.*amazon.[^/]+/exec/obidos/ASIN/.*)|' ||
- '(http://.*amazon.[^/]+/s\?.*)|' ||
- '(http://.*amazon.[^/]+/gp/registry/wishlist/.*)|' ||
- '(http://.*amazon.[^/]+/exec/obidos/tg/detail/-/[^/]+/.*)',
+ '(http://.*amazon.[^/]+/s\?.*)|' ||
+ '(http://.*amazon.[^/]+/gp/registry/wishlist/.*)|' ||
+ '(http://.*amazon.[^/]+/exec/obidos/tg/detail/-/[^/]+/.*)',
'URL', 'DB.DBA.RDF_LOAD_AMAZON_ARTICLE', null, 'Amazon articles');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
@@ -224,8 +219,7 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'URL', 'DB.DBA.RDF_LOAD_EOL', null, 'Eol');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(http://.*delicious.com/.*)|'||
- '(http://del.icio.us/.*)',
+ values ('(http://delicious.com/.*)|(http://feeds.delicious.com/.*)|(http://del.icio.us/.*)',
'URL', 'DB.DBA.RDF_LOAD_DELICIOUS', null, 'Delicious');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
@@ -290,8 +284,7 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'URL', 'DB.DBA.RDF_LOAD_BUGZILLA', null, 'Bugzillas');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(http://digg.com/.*)|'||
- '(http://services.digg.com/.*)',
+ values ('(http://digg.com/.*)|(http://services.digg.com/.*)',
'URL', 'DB.DBA.RDF_LOAD_DIGG', null, 'Digg');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
@@ -312,7 +305,8 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'URL', 'DB.DBA.RDF_LOAD_GETSATISFATION', null, 'GetSatisfaction');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(http://.*twitter.com/.*)',
+ values ('(http://twitter.com/.*)|' ||
+ '(http://search.twitter.com/.*)',
'URL', 'DB.DBA.RDF_LOAD_TWITTER', null, 'Twitter');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
@@ -320,10 +314,6 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'URL', 'DB.DBA.RDF_LOAD_TWITTER_FP', null, 'Twitter WebIDs');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('http://(www.)?klout.com/.*',
- 'URL', 'DB.DBA.RDF_LOAD_KLOUT', null, 'Klout');
-
-insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
values ('(http://.*salesforce.com/.*)|'||
'(https://.*salesforce.com/.*)',
'URL', 'DB.DBA.RDF_LOAD_SALESFORCE', null, 'SalesForce');
@@ -350,73 +340,57 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'URL', 'DB.DBA.RDF_LOAD_OPENLIBRARY', null, 'OpenLibrary');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('.+\\.svg\x24',
- 'URL', 'DB.DBA.RDF_LOAD_SVG', null, 'SVG');
-
-insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('http://(.+\.)?stackoverflow.com/.*',
- 'URL', 'DB.DBA.RDF_LOAD_STACKOVERFLOW', null, 'Stack Overflow');
+ values ('.+\\.svg\x24', 'URL', 'DB.DBA.RDF_LOAD_SVG', null, 'SVG');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('http://.*angel.co/.*',
- 'URL', 'DB.DBA.RDF_LOAD_ANGELLIST', null, 'Angel List');
-
-insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('.+\\.csv\x24',
- 'URL', 'DB.DBA.RDF_LOAD_CSV', null, 'CSV');
+ values ('.+\\.csv\x24', 'URL', 'DB.DBA.RDF_LOAD_CSV', null, 'CSV');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('.+\\.xrd\x24',
- 'URL', 'RDF_LOAD_XRD_GENERIC', null, 'XRD');
+ values ('.+\\.xrd\x24', 'URL', 'RDF_LOAD_XRD_GENERIC', null, 'XRD');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(http://cgi.sandbox.ebay.com/.*)|'||
- '(http://cgi.ebay.com/.*)|'||
- '(http://cgi.ebay.de/.*)|'||
- '(http://www.ebay.co.uk/.*)|'||
- '(http://www.ebay.com/.*)',
+ values ('(http://cgi.sandbox.ebay.com/.*)|(http://cgi.ebay.com/.*)|(http://cgi.ebay.de/.*)|(http://www.ebay.co.uk/.*)|(http://www.ebay.com/.*)',
'URL', 'DB.DBA.RDF_LOAD_EBAY_ARTICLE', null, 'eBay articles');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('.+\\.od[ts]\x24',
- 'URL', 'DB.DBA.RDF_LOAD_OO_DOCUMENT', null, 'OO Documents');
+ values ('.+\\.od[ts]\x24', 'URL', 'DB.DBA.RDF_LOAD_OO_DOCUMENT', null, 'OO Documents');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(.+\\.docx\x24)|(.+\\.xlsx\x24)',
- 'URL', 'DB.DBA.RDF_LOAD_MS_DOCUMENT', null, 'Microsoft Documents');
+ values ('(.+\\.docx\x24)|(.+\\.xlsx\x24)', 'URL', 'DB.DBA.RDF_LOAD_MS_DOCUMENT', null, 'Microsoft Documents');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('.+\\.fod[tsg]\x24',
- 'URL', 'DB.DBA.RDF_LOAD_OO_DOCUMENT2', null, 'OpenOffice Documents');
+ values ('.+\\.fod[tsg]\x24', 'URL', 'DB.DBA.RDF_LOAD_OO_DOCUMENT2', null, 'OpenOffice Documents');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
values ('http://local.yahooapis.com/MapsService/V1/trafficData.*',
'URL', 'DB.DBA.RDF_LOAD_YAHOO_TRAFFIC_DATA', null, 'Yahoo Traffic Data');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(.+\\.ics\x24)|(.+\\.ics\?.*)',
- 'URL', 'DB.DBA.RDF_LOAD_ICAL', null, 'iCalendar');
+ values ('(.+\\.ics\x24)|(.+\\.ics\?.*)', 'URL', 'DB.DBA.RDF_LOAD_ICAL', null, 'iCalendar');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('(text/calendar)',
- 'MIME', 'DB.DBA.RDF_LOAD_WEBCAL', null, 'WebCal');
+ values ('(text/calendar)', 'MIME', 'DB.DBA.RDF_LOAD_WEBCAL', null, 'WebCal');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
- values ('.*facebook.*',
- 'URL', 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH', null, 'Facebook (Graph API)',
- vector ('app_secret', '', 'app_id', '', 'offline_access', '1', 'max_pages', '4', 'paging_page_size_limit', '5000'));
+ values ('.*', 'URL', 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH', null, 'Facebook (Graph API)', vector ('app_secret', '', 'app_id', '', 'offline_access', '1'));
+
+-- Force an update to the Facebook cartridge name if its already registered
+update DB.DBA.SYS_RDF_MAPPERS set RM_PATTERN = '.*', RM_DESCRIPTION = 'Facebook (Graph API)'
+ where RM_HOOK = 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH';
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
values ('http[s]*://.*.facebook.com/.*',
'URL', 'DB.DBA.RDF_LOAD_FQL', null, 'Facebook (Facebook Query Language - FQL)', vector ('secret', '', 'session', ''));
+update DB.DBA.SYS_RDF_MAPPERS set RM_DESCRIPTION = 'Facebook (Facebook Query Language - FQL)'
+ where RM_HOOK = 'DB.DBA.RDF_LOAD_FQL';
+
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
values ('http://www.freebase.com/view/.*',
'URL', 'DB.DBA.RDF_LOAD_MQL', null, 'Freebase', vector ());
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_ENABLED)
- values ('.*',
- 'MIME', 'DB.DBA.RDF_LOAD_DAV_META', null, 'WebDAV Metadata', 1);
+ values ('.*', 'MIME', 'DB.DBA.RDF_LOAD_DAV_META', null, 'WebDAV Metadata', 1);
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
values ('http://.*.wikipedia.org.*',
@@ -431,69 +405,33 @@ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DES
'URL', 'DB.DBA.RDF_LOAD_MBZ', null, 'Musicbrainz');
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
- values ('(http://api.crunchbase.com/v/1/.*)|'||
- '(http://www.crunchbase.com/.*)|'||
- '(http://crunchbase.com/.*)',
+ values ('(http://api.crunchbase.com/v/1/.*)|(http://www.crunchbase.com/.*)|(http://crunchbase.com/.*)',
'URL', 'DB.DBA.RDF_LOAD_CRUNCHBASE', null, 'CrunchBase', null);
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
- values ('.+\\.pptx\x24',
- 'URL', 'DB.DBA.RDF_LOAD_PPTX_DOCUMENT', null, 'Powerpoint documents', null);
-
-insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
- values ('http://.*.linkedin.com/.*',
- 'URL', 'DB.DBA.RDF_LOAD_LINKEDIN', null, 'LinkedIn',
- vector ('consumer_key', '', 'consumer_secret', '', 'consumer_name', ''));
+ values ('.+\\.pptx\x24', 'URL', 'DB.DBA.RDF_LOAD_PPTX_DOCUMENT', null, 'Powerpoint documents', null);
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
- values ('http://twitter.com/.*',
- 'URL', 'DB.DBA.RDF_LOAD_TWITTER_V2', null, 'Twitter v2',
- vector ('consumer_key', '', 'consumer_secret', '',
- 'friends_n_followers_pg_limit', '0',
- 'friends_n_followers_item_limit', '100',
- 'favorites_pg_limit', '5',
- 'user_timeline_pg_limit', '5'));
+ values ('http://.*.linkedin.com/.*', 'URL', 'DB.DBA.RDF_LOAD_LINKEDIN', null, 'LinkedIn', vector (
+ 'consumer_key', '', 'consumer_secret', '', 'consumer_name', ''));
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS)
- values ('https?://plus.google.com/.*',
- 'URL', 'DB.DBA.RDF_LOAD_GOOGLE_PLUS', null, 'Google+',
- vector ('max_activity_pages', '1', 'max_comment_pages', '1', 'items_per_activity_page', '50', 'items_per_comment_page', '50'));
+ values ('http://twitter.com/.*', 'URL', 'DB.DBA.RDF_LOAD_TWITTER_V2', null, 'Twitter v2',
+ vector ('consumer_key', '',
+ 'consumer_secret', '',
+ 'friends_n_followers_pg_limit', '0',
+ 'friends_n_followers_item_limit', '100',
+ 'favorites_pg_limit', '5',
+ 'user_timeline_pg_limit', '5'));
insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('http://(www\\.)?overstock.com/.*\\.(html|htm)(\\?.*)?',
- 'URL', 'DB.DBA.RDF_LOAD_OVERSTOCK', null, 'Overstock');
-
-insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('http://www.csnstores.com/.*|http://www.bifter.co.uk/.*|http://www.hingly.com/.*|http://www.gnoss.com/.*',
- 'URL', 'DB.DBA.RDF_LOAD_RDFA_CARTRIDGE', null, 'RDFa');
-
-insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_ENABLED)
- values ('text/html',
- 'MIME', 'DB.DBA.RDF_LOAD_RDFA_NP_CARTRIDGE', null, 'RDFa (no translation)', 0);
-
-insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_OPTIONS, RM_ENABLED)
- values ('http://.*.nytimes.com/.*', 'URL', 'DB.DBA.RDF_LOAD_NYT_ARTICLE', null, 'NYT Article', null, 0);
-
-update DB.DBA.SYS_RDF_MAPPERS
- set RM_DESCRIPTION = 'Facebook (Facebook Query Language - FQL)'
- where RM_HOOK = 'DB.DBA.RDF_LOAD_FQL';
-
--- Force an update to the Facebook cartridge name if its already registered
-update DB.DBA.SYS_RDF_MAPPERS
- set RM_PATTERN = '.*facebook.*', RM_DESCRIPTION = 'Facebook (Graph API)'
- where RM_HOOK = 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH';
+ values ('https?://plus.google.com/.*', 'URL', 'DB.DBA.RDF_LOAD_GOOGLE_PLUS', null, 'Google+');
-- Disable old Twitter cartridge in favour of DB.DBA.RDF_LOAD_TWITTER_V2
update DB.DBA.SYS_RDF_MAPPERS set RM_ENABLED = 0 where RM_HOOK = 'DB.DBA.RDF_LOAD_TWITTER';
-
-- Disable old Google profile cartridge in favour of DB.DBA.RDF_LOAD_GOOGLE_PLUS
update DB.DBA.SYS_RDF_MAPPERS set RM_ENABLED = 0 where RM_HOOK = 'DB.DBA.RDF_LOAD_GOOGLE_PROFILE';
--- Ensure previously installed Google+ cartridges have options entries
-update DB.DBA.SYS_RDF_MAPPERS
- set RM_OPTIONS = vector ('max_activity_pages', '1', 'max_comment_pages', '1', 'items_per_activity_page', '50', 'items_per_comment_page', '50')
- where RM_HOOK = 'DB.DBA.RDF_LOAD_GOOGLE_PLUS' and RM_OPTIONS is null;
-
update DB.DBA.SYS_RDF_MAPPERS set RM_ENABLED = 1 where RM_ENABLED is null;
-- pattern upgrades
@@ -507,12 +445,10 @@ update DB.DBA.SYS_RDF_MAPPERS set RM_PATTERN =
'(http://reviews.cnet.com/.*)'
where RM_HOOK = 'DB.DBA.RDF_LOAD_CNET';
-update DB.DBA.SYS_RDF_MAPPERS
- set RM_PATTERN = '(http://cgi.sandbox.ebay.com/.*)|(http://cgi.ebay.com/.*)|(http://cgi.ebay.de/.*)|(http://www.ebay.co.uk/.*)|(http://www.ebay.com/.*)'
+update DB.DBA.SYS_RDF_MAPPERS set RM_PATTERN = '(http://cgi.sandbox.ebay.com/.*)|(http://cgi.ebay.com/.*)|(http://cgi.ebay.de/.*)|(http://www.ebay.co.uk/.*)|(http://www.ebay.com/.*)'
where RM_HOOK = 'DB.DBA.RDF_LOAD_EBAY_ARTICLE';
-update DB.DBA.SYS_RDF_MAPPERS
- set RM_PATTERN =
+update DB.DBA.SYS_RDF_MAPPERS set RM_PATTERN =
'(http://.*amazon.[^/]+/gp/product/.*)|'||
'(http://.*amazon.[^/]+/o/ASIN/.*)|'||
'(http://.*amazon.[^/]+/[^/]+/dp/[^/]+(/.*)?)|'||
@@ -520,7 +456,7 @@ update DB.DBA.SYS_RDF_MAPPERS
'(http://.*amazon.[^/]+/[^/]+/product-reviews/.*)|'||
'(http://.*amazon.[^/]+/s\?.*)|'||
'(http://.*amazon.[^/]+/exec/obidos/ASIN/.*)|' ||
- '(http://.*amazon.[^/]+/gp/registry/wishlist/.*)|' ||
+ '(http://.*amazon.[^/]+/gp/registry/wishlist/.*)|' ||
'(http://.*amazon.[^/]+/exec/obidos/tg/detail/-/[^/]+/.*)'
where RM_HOOK = 'DB.DBA.RDF_LOAD_AMAZON_ARTICLE';
@@ -531,30 +467,42 @@ update DB.DBA.SYS_RDF_MAPPERS
update DB.DBA.SYS_RDF_MAPPERS
set RM_PATTERN = '(https?://www.groupon.com/.*)'
where RM_HOOK = 'DB.DBA.RDF_LOAD_GROUPON';
-
+
+insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
+ values ('http://(www\\.)?overstock.com/.*\\.(html|htm)(\\?.*)?',
+ 'URL', 'DB.DBA.RDF_LOAD_OVERSTOCK', null, 'Overstock');
+
+insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
+ values ('http://www.csnstores.com/.*|http://www.bifter.co.uk/.*|http://www.hingly.com/.*|http://www.gnoss.com/.*',
+ 'URL', 'DB.DBA.RDF_LOAD_RDFA_CARTRIDGE', null, 'RDFa');
+
+insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION, RM_ENABLED)
+ values ('text/html',
+ 'MIME', 'DB.DBA.RDF_LOAD_RDFA_NP_CARTRIDGE', null, 'RDFa (no translation)', 0);
+
-- migration from old servers
create procedure DB.DBA.RM_MAPPERS_UPGRADE ()
{
- declare pk any;
- pk := DB.DBA.REPL_PK_COLS ('DB.DBA.SYS_RDF_MAPPERS');
- if (length (pk) = 2 and pk[0][0] = 'RM_TYPE' and pk[1][0] = 'RM_PATTERN')
+ declare pk any;
+ pk := DB.DBA.REPL_PK_COLS ('DB.DBA.SYS_RDF_MAPPERS');
+ if (length (pk) = 2 and pk[0][0] = 'RM_TYPE' and pk[1][0] = 'RM_PATTERN')
{
- declare skip_up int;
- skip_up := 0;
- for select RM_HOOK from DB.DBA.SYS_RDF_MAPPERS group by 1 having count(*) > 1 do
- {
- if (skip_up = 0)
- log_message ('The DB.DBA.SYS_RDF_MAPPERS cannot be upgraded');
- log_message (sprintf ('The %s cartridge is defined multiple times, remove duplicate', RM_HOOK));
- skip_up := skip_up + 1;
- }
- if (skip_up = 0)
- {
- exec ('alter table DB.DBA.SYS_RDF_MAPPERS modify primary key (RM_HOOK)');
- log_message ('The DB.DBA.SYS_RDF_MAPPERS have been upgraded');
- }
+ declare skip_up int;
+ skip_up := 0;
+ for select RM_HOOK from DB.DBA.SYS_RDF_MAPPERS group by 1 having count(*) > 1 do
+ {
+ if (skip_up = 0)
+ log_message ('The DB.DBA.SYS_RDF_MAPPERS cannot be upgraded');
+ log_message (sprintf ('The %s cartridge is defined multiple times, remove duplicate', RM_HOOK));
+ skip_up := skip_up + 1;
+ }
+ if (skip_up = 0)
+ {
+ exec ('alter table DB.DBA.SYS_RDF_MAPPERS modify primary key (RM_HOOK)');
+ log_message ('The DB.DBA.SYS_RDF_MAPPERS have been upgraded');
+ }
}
- return;
+ return;
}
;
@@ -563,9 +511,9 @@ DB.DBA.RM_MAPPERS_UPGRADE ()
create procedure RM_UPGRADE_TBL (in tbl varchar, in col varchar, in coltype varchar)
{
- if (exists( select top 1 1 from DB.DBA.SYS_COLS where upper("TABLE") = upper(tbl) and upper("COLUMN") = upper(col)))
- return;
- exec (sprintf ('alter table %s add column %s %s', tbl, col, coltype));
+ if (exists( select top 1 1 from DB.DBA.SYS_COLS where upper("TABLE") = upper(tbl) and upper("COLUMN") = upper(col)))
+ return;
+ exec (sprintf ('alter table %s add column %s %s', tbl, col, coltype));
}
;
@@ -581,16 +529,12 @@ DB.DBA.EXEC_STMT(
MC_DESC long varchar,
MC_ENABLED int not null default 1,
MC_API_TYPE integer default 0,
- MC_FAILED int default 0,
- MC_AVG_TIME float default 0,
primary key (MC_HOOK)
)
alter index RDF_META_CARTRIDGES on DB.DBA.RDF_META_CARTRIDGES partition cluster replicated', 0)
;
RM_UPGRADE_TBL ('DB.DBA.RDF_META_CARTRIDGES', 'MC_API_TYPE', 'integer default 0');
-RM_UPGRADE_TBL ('DB.DBA.RDF_META_CARTRIDGES', 'MC_FAILED', 'integer default 0');
-RM_UPGRADE_TBL ('DB.DBA.RDF_META_CARTRIDGES', 'MC_AVG_TIME', 'float default 0');
DB.DBA.EXEC_STMT(
'create table DB.DBA.RDF_CARTRIDGES_LOOKUPS (
@@ -601,11 +545,8 @@ DB.DBA.EXEC_STMT(
)
;
--- RDF_META_CARTRIDGES_LOG is now redundant.
--- But the table isn't dropped to prevent errors in old versions of Conductor/Yacutia
--- DB.DBA.EXEC_STMT('drop table DB.DBA.RDF_META_CARTRIDGES_LOG');
DB.DBA.EXEC_STMT(
-'create table DB.DBA.RDF_CARTRIDGES_LOG (
+'create table DB.DBA.RDF_META_CARTRIDGES_LOG (
ML_SESSION varchar, -- session id
ML_ID integer identity, -- an unique number
ML_TS timestamp, -- ts
@@ -617,11 +558,11 @@ DB.DBA.EXEC_STMT(
ML_RESULT long varchar, -- transformation to rdf
primary key (ML_SESSION, ML_ID)
)
-alter index RDF_CARTRIDGES_LOG on DB.DBA.RDF_CARTRIDGES_LOG partition cluster replicated', 0)
+alter index RDF_META_CARTRIDGES_LOG on DB.DBA.RDF_META_CARTRIDGES_LOG partition cluster replicated', 0)
;
EXEC_STMT ('create table RDF_SPONGER_QUEUE (
- RS_URI varchar,
+ RS_URI varchar,
RS_QTS datetime,
RS_TS timestamp,
RS_STATE int default 0,
@@ -632,63 +573,63 @@ EXEC_STMT ('create table RDF_SPONGER_QUEUE (
PRIMARY KEY (RS_URI))
create index RDF_SPONGER_QUEUE_STAT on RDF_SPONGER_QUEUE (RS_STATE, RS_QTS)', 0);
-
create procedure RM_LOG_REQUEST (in url varchar, in kwd varchar, in proc varchar)
{
- declare sid any;
- sid := connection_get ('__rdf_sponge_sid');
- if (registry_get ('__rdf_sponge_debug') <> '1')
- return;
- if (sid is null)
- return;
- insert into DB.DBA.RDF_CARTRIDGES_LOG (ML_KEYWORDS, ML_REQUEST, ML_SESSION, ML_PROC) values (kwd, url, sid, proc);
- connection_set ('__rdf_sponge_idn', identity_value ());
+ declare sid, pname any;
+ sid := connection_get ('__rdf_sponge_sid');
+ if (registry_get ('__rdf_sponge_debug') <> '1')
+ return;
+ if (sid is null)
+ return;
+ pname := rtrim (proc, '2');
+ pname := rtrim (pname, '_REST');
+ insert into DB.DBA.RDF_META_CARTRIDGES_LOG (ML_KEYWORDS, ML_REQUEST, ML_SESSION, ML_PROC) values (kwd, url, sid, pname);
+ connection_set ('__rdf_sponge_idn', identity_value ());
}
;
create procedure RM_LOG_RESPONSE (in resp varchar, in hdr any)
{
- declare sid, idn, hdr_str any;
- sid := connection_get ('__rdf_sponge_sid');
- idn := connection_get ('__rdf_sponge_idn');
- if (sid is null or idn is null)
- return;
- hdr_str := '';
- foreach (varchar l in hdr) do
- hdr_str := hdr_str || l;
- update DB.DBA.RDF_CARTRIDGES_LOG set ML_RESPONSE = resp, ML_RESPONSE_HEAD = hdr_str where ML_SESSION = sid and ML_ID = idn;
+ declare sid, idn, hdr_str any;
+ sid := connection_get ('__rdf_sponge_sid');
+ idn := connection_get ('__rdf_sponge_idn');
+ if (sid is null or idn is null)
+ return;
+ hdr_str := '';
+ foreach (varchar l in hdr) do
+ hdr_str := hdr_str || l;
+ update DB.DBA.RDF_META_CARTRIDGES_LOG set ML_RESPONSE = resp, ML_RESPONSE_HEAD = hdr_str where ML_SESSION = sid and ML_ID = idn;
}
;
create procedure RM_LOG_RESULT (in res any)
{
- declare sid, idn any;
- sid := connection_get ('__rdf_sponge_sid');
- idn := connection_get ('__rdf_sponge_idn');
- if (sid is null or idn is null)
- return;
- update DB.DBA.RDF_CARTRIDGES_LOG set ML_RESULT = res where ML_SESSION = sid and ML_ID = idn;
+ declare sid, idn any;
+ sid := connection_get ('__rdf_sponge_sid');
+ idn := connection_get ('__rdf_sponge_idn');
+ if (sid is null or idn is null)
+ return;
+ update DB.DBA.RDF_META_CARTRIDGES_LOG set ML_RESULT = res where ML_SESSION = sid and ML_ID = idn;
}
;
create procedure RM_LOG_CLEAR ()
{
- declare sid any;
- sid := connection_get ('__rdf_sponge_sid');
- if (sid is null)
- return;
- delete from DB.DBA.RDF_CARTRIDGES_LOG where ML_SESSION = sid;
+ declare sid any;
+ sid := connection_get ('__rdf_sponge_sid');
+ if (sid is null)
+ return;
+ delete from DB.DBA.RDF_META_CARTRIDGES_LOG where ML_SESSION = sid;
}
;
create procedure DB.DBA.MIGRATE_CALAIS ()
{
- insert into DB.DBA.RDF_META_CARTRIDGES (MC_HOOK, MC_TYPE, MC_PATTERN, MC_KEY, MC_OPTIONS, MC_DESC, MC_ENABLED)
- select RM_HOOK, RM_TYPE, RM_PATTERN, RM_KEY, RM_OPTIONS, RM_DESCRIPTION, RM_ENABLED
- from DB.DBA.SYS_RDF_MAPPERS
- where RM_HOOK = 'DB.DBA.RDF_LOAD_CALAIS';
- delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_CALAIS';
+ insert into DB.DBA.RDF_META_CARTRIDGES (MC_HOOK, MC_TYPE, MC_PATTERN, MC_KEY, MC_OPTIONS, MC_DESC, MC_ENABLED)
+ select RM_HOOK, RM_TYPE, RM_PATTERN, RM_KEY, RM_OPTIONS, RM_DESCRIPTION, RM_ENABLED from DB.DBA.SYS_RDF_MAPPERS
+ where RM_HOOK = 'DB.DBA.RDF_LOAD_CALAIS';
+ delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_CALAIS';
}
;
@@ -696,33 +637,38 @@ DB.DBA.MIGRATE_CALAIS ();
create procedure DB.DBA.RM_MAPPERS_SET_ORDER ()
{
- declare inx int;
- declare top_arr, arr, http, html, feed, calais, fb_og, num any;
- if (exists (select RM_PID, count(*) from DB.DBA.SYS_RDF_MAPPERS group by RM_PID having count(*) > 1))
- {
- num := (select count(*) from DB.DBA.SYS_RDF_MAPPERS);
- inx := 1;
- for select RM_HOOK as hook from DB.DBA.SYS_RDF_MAPPERS do
- {
- update DB.DBA.SYS_RDF_MAPPERS set RM_PID = inx where RM_HOOK = hook;
- inx := inx + 1;
- }
- }
- html := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_HTML_RESPONSE');
- feed := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FEED_RESPONSE');
- fb_og := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH');
- top_arr := vector (html, feed, fb_og);
- arr := (select DB.DBA.VECTOR_AGG (RM_PID) from DB.DBA.SYS_RDF_MAPPERS where 0 = position (RM_PID, top_arr) order by RM_ID);
- inx := 1;
- arr := vector_concat (top_arr, arr);
- foreach (int pid in arr) do
- {
- update DB.DBA.SYS_RDF_MAPPERS set RM_ID = inx where RM_PID = pid;
- inx := inx + 1;
- }
- DB.DBA.SET_IDENTITY_COLUMN ('DB.DBA.SYS_RDF_MAPPERS', 'RM_PID', inx);
- DB.DBA.SET_IDENTITY_COLUMN ('DB.DBA.SYS_RDF_MAPPERS', 'RM_ID', inx);
- update DB.DBA.SYS_RDF_MAPPERS set RM_ID = 10000 + inx where RM_HOOK = 'DB.DBA.RDF_LOAD_DAV_META';
+ declare inx int;
+ declare top_arr, arr, http, html, feed, calais, fb_og, num any;
+
+ if (exists (select RM_PID, count(*) from DB.DBA.SYS_RDF_MAPPERS group by RM_PID having count(*) > 1))
+ {
+ num := (select count(*) from DB.DBA.SYS_RDF_MAPPERS);
+ inx := 1;
+ for select RM_HOOK as hook from DB.DBA.SYS_RDF_MAPPERS do
+ {
+ update DB.DBA.SYS_RDF_MAPPERS set RM_PID = inx where RM_HOOK = hook;
+ inx := inx + 1;
+ }
+ }
+
+ --http := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_HTTP_SESSION');
+ html := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_HTML_RESPONSE');
+ feed := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FEED_RESPONSE');
+ fb_og := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH');
+-- calais := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_CALAIS');
+ top_arr := vector (html, feed, fb_og);
+
+ arr := (select DB.DBA.VECTOR_AGG (RM_PID) from DB.DBA.SYS_RDF_MAPPERS where 0 = position (RM_PID, top_arr) order by RM_ID);
+ inx := 1;
+ arr := vector_concat (top_arr, arr);
+ foreach (int pid in arr) do
+ {
+ update DB.DBA.SYS_RDF_MAPPERS set RM_ID = inx where RM_PID = pid;
+ inx := inx + 1;
+ }
+ DB.DBA.SET_IDENTITY_COLUMN ('DB.DBA.SYS_RDF_MAPPERS', 'RM_PID', inx);
+ DB.DBA.SET_IDENTITY_COLUMN ('DB.DBA.SYS_RDF_MAPPERS', 'RM_ID', inx);
+ update DB.DBA.SYS_RDF_MAPPERS set RM_ID = 10000 + inx where RM_HOOK = 'DB.DBA.RDF_LOAD_DAV_META';
}
;
@@ -731,33 +677,34 @@ RM_MAPPERS_SET_ORDER ();
-- /* to insert cartridge after another */
create procedure RM_MAPPERS_SET_CONSEQ (in proc_1 varchar, in proc_2 varchar)
{
- declare inx int;
- declare top_arr, arr, http, html, feed, calais, pid_1, pid_2, do_update any;
- pid_1 := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = proc_1);
- pid_2 := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = proc_2);
- top_arr := (select DB.DBA.VECTOR_AGG (RM_PID) from DB.DBA.SYS_RDF_MAPPERS
- where RM_HOOK in ('DB.DBA.RDF_LOAD_HTTP_SESSION','DB.DBA.RDF_LOAD_HTML_RESPONSE','DB.DBA.RDF_LOAD_FEED_RESPONSE')
- order by RM_ID);
- arr := (select DB.DBA.VECTOR_AGG (RM_PID) from DB.DBA.SYS_RDF_MAPPERS where 0 = position (RM_PID, top_arr) and RM_HOOK <> proc_2 order by RM_ID);
- inx := 0;
- do_update := 0;
- arr := vector_concat (top_arr, arr);
- foreach (int pid in arr) do
- {
- if (pid = pid_1)
- {
- inx := inx + 1;
- update DB.DBA.SYS_RDF_MAPPERS set RM_ID = inx where RM_PID = pid_2;
- do_update := 1;
- }
- else if (do_update)
- {
- update DB.DBA.SYS_RDF_MAPPERS set RM_ID = inx where RM_PID = pid;
- }
- inx := inx + 1;
- }
- DB.DBA.SET_IDENTITY_COLUMN ('DB.DBA.SYS_RDF_MAPPERS', 'RM_PID', inx);
- update DB.DBA.SYS_RDF_MAPPERS set RM_ID = 10000 + inx where RM_HOOK = 'DB.DBA.RDF_LOAD_DAV_META';
+ declare inx int;
+ declare top_arr, arr, http, html, feed, calais, pid_1, pid_2, do_update any;
+
+ pid_1 := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = proc_1);
+ pid_2 := (select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = proc_2);
+ top_arr := (select DB.DBA.VECTOR_AGG (RM_PID) from DB.DBA.SYS_RDF_MAPPERS
+ where RM_HOOK in ('DB.DBA.RDF_LOAD_HTTP_SESSION','DB.DBA.RDF_LOAD_HTML_RESPONSE','DB.DBA.RDF_LOAD_FEED_RESPONSE')
+ order by RM_ID);
+ arr := (select DB.DBA.VECTOR_AGG (RM_PID) from DB.DBA.SYS_RDF_MAPPERS where 0 = position (RM_PID, top_arr) and RM_HOOK <> proc_2 order by RM_ID);
+ inx := 0;
+ do_update := 0;
+ arr := vector_concat (top_arr, arr);
+ foreach (int pid in arr) do
+ {
+ if (pid = pid_1)
+ {
+ inx := inx + 1;
+ update DB.DBA.SYS_RDF_MAPPERS set RM_ID = inx where RM_PID = pid_2;
+ do_update := 1;
+ }
+ else if (do_update)
+ {
+ update DB.DBA.SYS_RDF_MAPPERS set RM_ID = inx where RM_PID = pid;
+ }
+ inx := inx + 1;
+ }
+ DB.DBA.SET_IDENTITY_COLUMN ('DB.DBA.SYS_RDF_MAPPERS', 'RM_PID', inx);
+ update DB.DBA.SYS_RDF_MAPPERS set RM_ID = 10000 + inx where RM_HOOK = 'DB.DBA.RDF_LOAD_DAV_META';
}
;
@@ -905,24 +852,23 @@ insert replacing DB.DBA.SYS_GRDDL_MAPPING (GM_NAME, GM_PROFILE, GM_XSLT)
values ('xFolk', '', registry_get ('_rdf_mappers_path_') || 'xslt/main/xfolk2rdf.xsl')
;
-create procedure DB.DBA.RM_XLAT_CONCAT (in x any, in p any, in s_or_o any, in y any)
+create procedure DB.DBA.RM_XLAT_CONCAT (in x any, in y any)
{
- --dbg_obj_print_vars (x, p);
- if (not isstring (x))
- return x;
- if (registry_get ('__rdf_cartridges_original_doc_uri__') = '1')
+ if (not isstring (x))
+ return x;
+ if (registry_get ('__rdf_cartridges_original_doc_uri__') = '1')
+ return x;
+ if (http_mime_type (x) like 'image/%')
+ {
return x;
- if (http_mime_type (x) like 'image/%' or (s_or_o = 'o' and p = UNAME'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'))
- {
- return x;
- }
- return DB.DBA.RDF_PROXY_ENTITY_IRI(x);
+ }
+ return DB.DBA.RDF_PROXY_ENTITY_IRI(x);
}
;
EXEC_STMT ('grant execute on DB.DBA.RM_XLAT_CONCAT to "SPARQL_SPONGE"', 0);
-create procedure DB.DBA.RM_RDF_SPONGE_ERROR (in triple_dict any, in pname varchar, in graph_iri varchar, in dest varchar, in sql_message varchar)
+create procedure DB.DBA.RM_RDF_SPONGE_ERROR (in pname varchar, in graph_iri varchar, in dest varchar, in sql_message varchar)
{
declare gr, errs_iri, err_iri, nam any;
if (0 = length (sql_message) or pname is null)
@@ -934,47 +880,15 @@ create procedure DB.DBA.RM_RDF_SPONGE_ERROR (in triple_dict any, in pname varcha
nam := lower (name_part (pname, 2));
err_iri := gr ||'#'||nam;
errs_iri := gr||'#errors';
- declare ss any;
- ss := string_output ();
- http (sprintf ('<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:opl="http://www.openlinksw.com/schema/attribution#">'), ss);
- http (sprintf (' <rdf:Description rdf:about="%V">', RM_SPONGE_DOC_IRI (gr)), ss);
- http (sprintf (' <opl:hasErrors rdf:resource="%V"/>', errs_iri), ss);
- http (sprintf (' </rdf:Description>'), ss);
- http (sprintf (' <rdf:Description rdf:about="%V">', errs_iri), ss);
- http (sprintf (' <opl:hasError rdf:resource="%V"/>', err_iri), ss);
- http (sprintf (' </rdf:Description>'), ss);
- http (sprintf (' <rdf:Description rdf:about="%V">', err_iri), ss);
- http (sprintf (' <opl:errorText>%V</opl:errorText>', sql_message), ss);
- http (sprintf (' </rdf:Description>'), ss);
- http (sprintf ('</rdf:RDF>'), ss);
- ss := string_output_string (ss);
- if (triple_dict is not null)
- DB.DBA.RDF_RDFXML_LOAD_DICT (ss, gr, gr, triple_dict);
- else
- DB.DBA.RDF_LOAD_RDFXML (ss, gr, gr);
+ DB.DBA.RDF_QUAD_URI (gr, RM_SPONGE_DOC_IRI (gr), 'http://www.openlinksw.com/schema/attribution#hasErrors', errs_iri);
+ DB.DBA.RDF_QUAD_URI (gr, errs_iri, 'http://www.openlinksw.com/schema/attribution#hasError', err_iri);
+ DB.DBA.RDF_QUAD_URI_L (gr, err_iri, 'http://www.openlinksw.com/schema/attribution#errorText', sql_message);
return;
}
;
-create procedure DB.DBA.RM_RDF_RDFXML_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, in triple_dict any)
-{
- if (triple_dict is not null)
- DB.DBA.RDF_RDFXML_LOAD_DICT (strg, base, graph, triple_dict);
- else
- RDF_LOAD_RDFXML (strg, base, graph);
-}
-;
-
-create procedure DB.DBA.RM_RDF_TTL_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, in triple_dict any)
-{
- if (triple_dict is not null)
- DB.DBA.RDF_TTL_LOAD_DICT (strg, base, graph, triple_dict);
- else
- TTLP (strg, base, graph);
-}
-;
-- helper procedures
-create procedure DB.DBA.RM_RDF_LOAD_RDFXML (inout triple_dict any, in strg varchar, in base varchar, in graph varchar, in doc_iri_flag int := 1, in long_str int := 0)
+create procedure DB.DBA.RM_RDF_LOAD_RDFXML (in strg varchar, in base varchar, in graph varchar, in doc_iri_flag int := 1, in long_str int := 0)
{
declare nss, ses, dict, triples, ntriples any;
nss := xmlnss_get (xtree_doc (strg));
@@ -988,16 +902,6 @@ create procedure DB.DBA.RM_RDF_LOAD_RDFXML (inout triple_dict any, in strg varch
http (sprintf ('<%s> opl:isDescribedUsing <%s> .\n', case when doc_iri_flag then RDF_SPONGE_PROXY_IRI (graph) else graph end, nss[i+1]), ses);
http (sprintf ('<%s> opl:hasNamespacePrefix "%s" .\n', nss[i+1], nss[i]), ses);
}
-
- if (triple_dict is not null)
- {
- --string_to_file ('rdf.xml', strg, -2);
- DB.DBA.RDF_RDFXML_LOAD_DICT (strg, base, graph, triple_dict);
- DB.DBA.RDF_TTL_LOAD_DICT (ses, base, graph, triple_dict);
- DB.DBA.RM_LOG_RESULT (strg);
- return;
- }
-
if (long_str = 0)
{
dict := DB.DBA.RDF_RDFXML_TO_DICT (strg, base, graph);
@@ -1018,12 +922,11 @@ create procedure DB.DBA.RM_RDF_LOAD_RDFXML (inout triple_dict any, in strg varch
DB.DBA.RDF_LOAD_RDFXML (strg, base, graph);
}
-- INFO: may be this should be done when primaryTopic is set
- DB.DBA.RM_LOG_RESULT (strg);
DB.DBA.TTLP (ses, base, graph);
}
;
-create procedure DB.DBA.RM_ADD_PRV (inout triple_dict any, in proc varchar, in base varchar, in graph varchar, in service_url varchar)
+create procedure DB.DBA.RM_ADD_PRV (in proc varchar, in base varchar, in graph varchar, in service_url varchar)
{
declare ses, iri, h any;
@@ -1034,9 +937,7 @@ create procedure DB.DBA.RM_ADD_PRV (inout triple_dict any, in proc varchar, in b
if (length (service_url) > 1500)
return;
h := rfc1808_parse_uri (service_url);
- h [3] := '';
- h [4] := '';
- h [5] := '';
+ h [3] := ''; h [4] := ''; h [5] := '';
service_url := DB.DBA.vspx_uri_compose (h);
proc := cast (proc as varchar);
ses := string_output ();
@@ -1059,27 +960,15 @@ create procedure DB.DBA.RM_ADD_PRV (inout triple_dict any, in proc varchar, in b
http(' </prv:retrievedBy>', ses);
http(' </prv:DataItem>', ses);
http('</rdf:RDF>', ses);
- if (triple_dict is not null)
- {
- DB.DBA.RDF_RDFXML_LOAD_DICT (ses, base, graph, triple_dict);
- return;
- }
DB.DBA.RDF_LOAD_RDFXML (ses, DB.DBA.RDF_SPONGE_PROXY_IRI (base), graph);
}
;
-create procedure RM_CLEAN_DEST (inout triple_dict any, in dest varchar, in graph_iri varchar, in new_origin_uri varchar, inout opts any, in clear_triple_dict int := 0)
+create procedure RM_CLEAN_DEST (in dest varchar, in graph_iri varchar, in new_origin_uri varchar, inout opts any)
{
declare deadl int;
if (get_keyword ('disable-clean', opts, '') = 'Y')
return;
- if ((registry_get ('__rdf_sponge_force_triple_dict_clean') = '1' or clear_triple_dict > 0) and triple_dict is not null)
- {
- dict_zap (triple_dict, 2);
- return;
- }
- if (get_keyword ('get:soft', opts, '') = 'add')
- return;
deadl := 5;
declare exit handler for sqlstate '40001'
{
@@ -1116,34 +1005,12 @@ create procedure DB.DBA.RM_UMBEL_GET (in strg varchar)
}
;
-create function DB.DBA.html2text(in content long varchar)
-{
- -- remove HTML/XML tag markup
- declare _ret_body long varchar;
- _ret_body:=regexp_replace(content, '<[^>]*>', '', 1, null);
- _ret_body:=regexp_replace(_ret_body, ' *', ' ', 1, null);
- _ret_body:=regexp_replace(_ret_body, ' *', ' ', 1, null);
- return _ret_body;
-};
-
create procedure DB.DBA.XSLT_REGEXP_MATCH (in pattern varchar, in val varchar)
{
return regexp_match (pattern, val);
}
;
-create procedure DB.DBA.DI_URI (in str varchar)
-{
- declare sha, ret any;
- if (str like 'mailto:%')
- str := subseq (str, 7);
- sha := xenc_sha1_digest (str);
- sha := replace (replace (rtrim (sha, '='), '+', '-'), '/', '_');
- ret := sprintf ('di:sha1;%s', sha);
- return ret;
-}
-;
-
create procedure DB.DBA.XSLT_SPLIT_AND_DECODE (in val varchar, in md int, in pattern varchar)
{
declare x, ses any;
@@ -1249,7 +1116,8 @@ create procedure DB.DBA.XSLT_HTTP_STRING_DATE (in val varchar)
return ret;
}
-- Wed Dec 10 21:24:54 EST 2008
- if (regexp_match ('[[:upper:]][[:lower:]]{2} [[:upper:]][[:lower:]]{2} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} [[:upper:]]{2,} [0-9]{4,}', val) is not null)
+ if (regexp_match ('[[:upper:]][[:lower:]]{2} [[:upper:]][[:lower:]]{2} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} [[:upper:]]{2,} [0-9]{4,}', val)
+ is not null)
{
tmp := sprintf_inverse (val, '%s %s %s %s %s %s', 0);
if (tmp is not null and length (tmp) > 5)
@@ -1309,106 +1177,72 @@ create procedure DB.DBA.XSLT_TRIM (in val varchar, in tr varchar)
create procedure DB.DBA.XSLT_REPLACE1 (in val varchar)
{
- val := replace (val, '(', '%28');
- val := replace (val, ')', '%29');
- return replace (val, '\'', '%27');
+ val := replace (val, '(', '%28');
+ val := replace (val, ')', '%29');
+ return replace (val, '\'', '%27');
}
;
create procedure DB.DBA.XSLT_SHA1_HEX (in val varchar)
{
- return tree_sha1 (val, 1);
+ return tree_sha1 (val, 1);
}
;
create procedure DB.DBA.XSLT_STR2DATE (in val varchar)
{
- declare ret any;
- ret := null;
- if (val like '[A-Za-z]* [0-9]*')
- {
- declare dt, pos, tmp, v any;
- v := trim (val, '+');
- pos := strchr (v, ' ');
- tmp := subseq (v, 0, pos);
- dt := trim(tmp);
- tmp := trim (subseq (v, pos));
- dt := 'Wee, ' || tmp || ' ' || dt || sprintf (' %d 00:00:00 GMT', year (now ()));
- ret := http_string_date (dt, null, null);
- }
- else
- ret := http_string_date (val, null, null);
- if (ret is not null)
+ declare ret any;
+ ret := null;
+ if (val like '[A-Za-z]* [0-9]*')
{
- ret := dt_set_tz (ret, 0);
- ret := date_iso8601 (ret);
+ declare dt, pos, tmp, v any;
+ v := trim (val, '+');
+ pos := strchr (v, ' ');
+ tmp := subseq (v, 0, pos);
+ dt := trim(tmp);
+ tmp := trim (subseq (v, pos));
+ dt := 'Wee, ' || tmp || ' ' || dt || sprintf (' %d 00:00:00 GMT', year (now ()));
+ ret := http_string_date (dt, null, null);
}
- return coalesce (ret, val);
-}
-;
-
-create procedure DB.DBA.XSLT_DI_SPLIT (in str varchar)
-{
- declare di, h, dgst varchar;
- declare ses any;
- ses := string_output ();
- http ('<result>', ses);
- while (di := regexp_match ('di:[^ <>]+', str, 1) is not null)
+ else
+ ret := http_string_date (val, null, null);
+ if (ret is not null)
{
- dbg_obj_print (di);
- h := WS.WS.PARSE_URI (di);
- dgst := bin2hex (cast (decode_base64 (replace (replace (h[3], '-', '+'), '_', '/')) as varbinary));
- http (sprintf ('<di><dgst>%V</dgst><hash>%V</hash></di>', h[2], dgst), ses);
+ ret := dt_set_tz (ret, 0);
+ ret := date_iso8601 (ret);
}
- http ('</result>', ses);
- return xtree_doc (ses);
+ return coalesce (ret, val);
}
;
create procedure DB.DBA.RDF_SPONGE_DOC_IRI (in url varchar, in dest varchar := null)
{
- declare res varchar;
- res := coalesce (url, dest);
- return res;
+ declare res varchar;
+ res := coalesce (url, dest);
+ return res;
}
;
-create procedure RM_CONTENT_TYPE_IS_RDF (in ret_content_type any)
-{
- if (strstr (ret_content_type, 'application/rdf+xml') is not null or
- strstr (ret_content_type, 'text/rdf+n3') is not null or
- strstr (ret_content_type, 'text/n3') is not null or
- strstr (ret_content_type, 'text/rdf+ttl') is not null or
- strstr (ret_content_type, 'text/rdf+turtle') is not null or
- strstr (ret_content_type, 'text/turtle') is not null or
- strstr (ret_content_type, 'application/rdf+n3') is not null or
- strstr (ret_content_type, 'application/rdf+turtle') is not null or
- strstr (ret_content_type, 'application/turtle') is not null or
- strstr (ret_content_type, 'application/x-turtle') is not null )
- return 1;
- return 0;
-}
-;
--
-- # this returns document IRI, non-proxy one
--
create procedure DB.DBA.RM_SPONGE_DOC_IRI (in url varchar, in frag varchar := 'this')
{
- declare hf, uri any;
- hf := rfc1808_parse_uri (url);
- if (hf[5] = '')
- hf[5] := frag;
- uri := vspx_uri_compose (hf);
- return uri;
+ declare hf, uri any;
+ hf := rfc1808_parse_uri (url);
+ if (hf[5] = '')
+ hf[5] := frag;
+ uri := vspx_uri_compose (hf);
+ return uri;
}
;
create procedure DB.DBA.RDF_SPONGE_IRI_SCH ()
{
- if (is_https_ctx ())
- return 'https';
- return 'http';
+ if (is_https_ctx ())
+ return 'https';
+ return 'http';
}
;
@@ -1417,63 +1251,56 @@ create procedure DB.DBA.RDF_SPONGE_IRI_SCH ()
--
create procedure DB.DBA.RDF_SPONGE_PROXY_IRI (in uri varchar := '', in login varchar := '', in frag varchar := 'this')
{
- declare cname any;
- declare ret any;
- declare url_sch varchar;
- declare ua any;
- cname := DB.DBA.RDF_PROXY_GET_HTTP_HOST ();
- if (frag = 'this' or frag = '#this') -- comment out to do old behaviour
- frag := '';
- if (length (frag) and frag[0] <> '#'[0])
- frag := '#' || sprintf ('%U', frag);
- if (strchr (uri, '#') is not null)
- frag := '';
- --if (http_mime_type (uri) like 'image/%')
+ declare cname any;
+ declare ret any;
+ declare url_sch varchar;
+ declare ua any;
+
+ cname := DB.DBA.RDF_PROXY_GET_HTTP_HOST ();
+
+ if (frag = 'this' or frag = '#this') -- comment out to do old behaviour
+ frag := '';
+
+ if (length (frag) and frag[0] <> '#'[0])
+ frag := '#' || sprintf ('%U', frag);
+ if (strchr (uri, '#') is not null)
+ frag := '';
+
+ --if (http_mime_type (uri) like 'image/%')
--return uri;
- ua := rfc1808_parse_uri (uri);
- url_sch := ua[0];
- ua [0] := '';
- uri := vspx_uri_compose (ua);
- uri := ltrim (uri, '/');
- if (length (login))
- ret := sprintf ('%s://%s/about/rdf/%s/%U/%s%s', RDF_SPONGE_IRI_SCH (), cname, url_sch, login, uri, frag);
- else
- ret := sprintf ('%s://%s/about/id/%s/%s%s', RDF_SPONGE_IRI_SCH (), cname, url_sch, uri, frag);
- return ret;
-}
-;
-create function DB.DBA.RDF_PROXY_GET_HTTP_HOST ()
-{
- declare default_host, cname varchar;
- if (is_http_ctx ())
- default_host := http_request_header(http_request_header (), 'Host', null, null);
- else if (connection_get ('__http_host') is not null)
- default_host := connection_get ('__http_host');
- else
- default_host := cfg_item_value (virtuoso_ini_path (), 'URIQA', 'DefaultHost');
- if (default_host is not null)
- cname := default_host;
- else
- {
- cname := sys_stat ('st_host_name');
- if (server_http_port () <> '80')
- cname := cname ||':'|| server_http_port ();
- }
- return cname;
+ ua := rfc1808_parse_uri (uri);
+ url_sch := ua[0];
+ ua [0] := '';
+ uri := vspx_uri_compose (ua);
+ uri := ltrim (uri, '/');
+
+ if (length (login))
+ ret := sprintf ('%s://%s/about/rdf/%s/%U/%s%s', RDF_SPONGE_IRI_SCH (), cname, url_sch, login, uri, frag);
+ else
+ ret := sprintf ('%s://%s/about/id/%s/%s%s', RDF_SPONGE_IRI_SCH (), cname, url_sch, uri, frag);
+ return ret;
}
;
-EXEC_STMT ('create table DB.DBA.RDF_PROXY_IRI_MAP (RPIM_IRI IRI_ID_8, RPIM_SOURCE_IRI IRI_ID_8, primary key (RPIM_IRI, RPIM_SOURCE_IRI))', 0);
-
-create procedure RDF_SPONGE_PROXY_IRI_MAP (in uri_identifier varchar, in graph varchar)
+create function DB.DBA.RDF_PROXY_GET_HTTP_HOST ()
{
- declare cname, id, ret varchar;
- cname := DB.DBA.RDF_PROXY_GET_HTTP_HOST ();
- id := bin2hex (cast (decode_base64 (xenc_sha1_digest (uri_identifier)) as varbinary));
- ret := sprintf ('%s://%s/proxy-iri/%s', RDF_SPONGE_IRI_SCH (), cname, id);
- insert soft DB.DBA.RDF_PROXY_IRI_MAP (RPIM_IRI, RPIM_SOURCE_IRI) values (iri_to_id (ret), iri_to_id (graph));
- return ret;
+ declare default_host, cname varchar;
+ if (is_http_ctx ())
+ default_host := http_request_header(http_request_header (), 'Host', null, null);
+ else if (connection_get ('__http_host') is not null)
+ default_host := connection_get ('__http_host');
+ else
+ default_host := cfg_item_value (virtuoso_ini_path (), 'URIQA', 'DefaultHost');
+ if (default_host is not null)
+ cname := default_host;
+ else
+ {
+ cname := sys_stat ('st_host_name');
+ if (server_http_port () <> '80')
+ cname := cname ||':'|| server_http_port ();
+ }
+ return cname;
}
;
@@ -1484,7 +1311,7 @@ create procedure DB.DBA.RDF_PROXY_ENTITY_IRI (in uri varchar := '', in login var
{
declare cname any;
declare ret any;
- declare url_sch, local_prx varchar;
+ declare url_sch varchar;
declare ua any;
cname := DB.DBA.RDF_PROXY_GET_HTTP_HOST ();
@@ -1502,16 +1329,12 @@ create procedure DB.DBA.RDF_PROXY_ENTITY_IRI (in uri varchar := '', in login var
--if (http_mime_type (uri) like 'image/%')
-- return uri;
- local_prx := sprintf ('%s://%s/about/id/entity/%%', RDF_SPONGE_IRI_SCH (), cname);
-
- if (uri like local_prx)
- return uri;
-
ua := rfc1808_parse_uri (uri);
url_sch := ua[0];
ua [0] := '';
uri := vspx_uri_compose (ua);
uri := ltrim (uri, '/');
+
ret := sprintf ('%s://%s/about/id/entity/%s/%s%s', RDF_SPONGE_IRI_SCH (), cname, url_sch, uri, frag);
return ret;
}
@@ -1604,69 +1427,72 @@ create procedure DB.DBA.RDF_CONVERT_TO_XTREE (in code varchar)
create procedure DB.DBA.RDF_SPONGE_DBP_IRI (in base varchar, in word varchar)
{
- declare res, xp, xt, url varchar;
- declare uri varchar;
- declare st int;
- declare dbp_iri any;
- declare exit handler for sqlstate '*'
+ declare res, xp, xt, url varchar;
+ declare uri varchar;
+ declare st int;
+ declare dbp_iri any;
+
+ declare exit handler for sqlstate '*' {
+ return base || '#' || word;
+ };
+
+ uri := MOAT_APPLY (http_dav_uid (), word);
+ if (uri is not null)
{
- return base || '#' || word;
- };
- uri := MOAT_APPLY (http_dav_uid (), word);
- if (uri is not null)
- {
- return uri;
- }
- if (word[0] >= 'a'[0] and word[0] <= 'z'[0])
- word[0] := word[0] - 32;
- word := replace (word, ' ', '_');
- url := sprintf ('http://dbpedia.org/resource/%U', word);
- dbp_iri := iri_to_id (url);
- st := (select CL_STAT from RDF_CARTRIDGES_LOOKUPS where CL_URI = dbp_iri);
- if (st = 1)
- return url;
- else if (st = 0)
- return base || '#' || word;
- uri := sprintf ('ask from <http://dbpedia.org> where { <%s> ?y ?z }', url);
- res := http_client (url=>sprintf ('http://dbpedia.org/sparql?query=%U&format=xml', uri), timeout=>30, proxy=>connection_get ('sparql-get:proxy'));
- xt := xtree_doc (res);
- xp := cast (xpath_eval('/sparql/boolean/text()', xt) as varchar);
- if (xp = 'true')
- {
- insert soft DB.DBA.RDF_CARTRIDGES_LOOKUPS (CL_URI, CL_STAT) values (dbp_iri, 1);
- return url;
- }
- insert soft DB.DBA.RDF_CARTRIDGES_LOOKUPS (CL_URI, CL_STAT) values (dbp_iri, 0);
+ return uri;
+ }
+
+ if (word[0] >= 'a'[0] and word[0] <= 'z'[0])
+ word[0] := word[0] - 32;
+ word := replace (word, ' ', '_');
+ url := sprintf ('http://dbpedia.org/resource/%U', word);
+ dbp_iri := iri_to_id (url);
+ st := (select CL_STAT from RDF_CARTRIDGES_LOOKUPS where CL_URI = dbp_iri);
+ if (st = 1)
+ return url;
+ else if (st = 0)
return base || '#' || word;
+
+ uri := sprintf ('ask from <http://dbpedia.org> where { <%s> ?y ?z }', url);
+ res := http_client (url=>sprintf ('http://dbpedia.org/sparql?query=%U&format=xml', uri), timeout=>30, proxy=>connection_get ('sparql-get:proxy'));
+ xt := xtree_doc (res);
+ xp := cast (xpath_eval('/sparql/boolean/text()', xt) as varchar);
+ if (xp = 'true')
+ {
+ insert soft DB.DBA.RDF_CARTRIDGES_LOOKUPS (CL_URI, CL_STAT) values (dbp_iri, 1);
+ return url;
+ }
+ insert soft DB.DBA.RDF_CARTRIDGES_LOOKUPS (CL_URI, CL_STAT) values (dbp_iri, 0);
+ return base || '#' || word;
}
;
create procedure DB.DBA.RM_SAMEAS_IRI (in u varchar)
{
- return RDF_SPONGE_PROXY_IRI (u);
- --if (strchr (u, '#') is null)
- -- return u || '#this';
- --return u;
+ return RDF_SPONGE_PROXY_IRI (u);
+ --if (strchr (u, '#') is null)
+ -- return u || '#this';
+ --return u;
}
;
create procedure DB.DBA.RDF_MQL_RESOLVE_IMAGE (in name varchar)
{
- declare qr, url, cnt, tree, xt, hdr any;
- declare exit handler for sqlstate '*'
+ declare qr, url, cnt, tree, xt, hdr any;
+ declare exit handler for sqlstate '*'
{
- return '';
+ return '';
};
-
- qr := sprintf ('{"ROOT":{"query":{"name":"%s", "type":"/common/image", "id":{}}}}', name);
- url := sprintf ('http://www.freebase.com/api/service/mqlread?queries=%U', qr);
- cnt := http_client_ext (url, headers=>hdr, proxy=>connection_get ('sparql-get:proxy'));
- tree := json_parse (cnt);
- tree := get_keyword ('ROOT', tree);
- tree := get_keyword ('result', tree);
- tree := get_keyword ('id', tree);
- tree := get_keyword ('value', tree);
- return 'http://www.freebase.com/api/trans/image_thumb'||tree;
+
+ qr := sprintf ('{"ROOT":{"query":{"name":"%s", "type":"/common/image", "id":{}}}}', name);
+ url := sprintf ('http://www.freebase.com/api/service/mqlread?queries=%U', qr);
+ cnt := http_client_ext (url, headers=>hdr, proxy=>connection_get ('sparql-get:proxy'));
+ tree := json_parse (cnt);
+ tree := get_keyword ('ROOT', tree);
+ tree := get_keyword ('result', tree);
+ tree := get_keyword ('id', tree);
+ tree := get_keyword ('value', tree);
+ return 'http://www.freebase.com/api/trans/image_thumb'||tree;
}
;
@@ -1683,38 +1509,38 @@ create procedure DB.DBA.GET_XBRL_ONTOLOGY_DOMAIN(in elem varchar) returns varcha
create procedure DB.DBA.GET_XBRL_ONTOLOGY_VALUE_NAME(in elem varchar) returns varchar
{
- declare cur, range, value, ret varchar;
- declare pos int;
- declare dict any;
-
- dict := connection_get ('xbrl-value-name');
- if (dict is null)
+ declare cur, range, value, ret varchar;
+ declare pos int;
+ declare dict any;
+
+ dict := connection_get ('xbrl-value-name');
+ if (dict is null)
{
- dict := dict_new (10);
- connection_set ('xbrl-value-name', dict);
+ dict := dict_new (10);
+ connection_set ('xbrl-value-name', dict);
}
- cur := 'http://www.openlinksw.com/schemas/xbrl/' || elem;
- ret := dict_get (dict, cur);
- if (ret is not null)
+ cur := 'http://www.openlinksw.com/schemas/xbrl/' || elem;
+ ret := dict_get (dict, cur);
+ if (ret is not null)
{
- return ret;
+ return ret;
}
- ret := 'value';
- value := (sparql select ?s from <http://www.openlinksw.com/schemas/RDF_Mapper_Ontology/1.0/>
- where {`iri(?:cur)` rdfs:range ?range . ?s rdfs:domain ?range } );
- if (value is not null and value <> '')
+ ret := 'value';
+ value := (sparql select ?s from <http://www.openlinksw.com/schemas/RDF_Mapper_Ontology/1.0/>
+ where {`iri(?:cur)` rdfs:range ?range . ?s rdfs:domain ?range } );
+ if (value is not null and value <> '')
{
- pos := strrchr(value, '/');
- if (pos is null or pos = 0)
- ret := value;
- else
+ pos := strrchr(value, '/');
+ if (pos is null or pos = 0)
+ ret := value;
+ else
{
- value := subseq(value, pos+1);
- ret := value;
- }
+ value := subseq(value, pos+1);
+ ret := value;
+ }
}
- dict_put (dict, cur, ret);
- return ret;
+ dict_put (dict, cur, ret);
+ return ret;
}
;
@@ -1723,63 +1549,63 @@ create procedure DB.DBA.GET_XBRL_ONTOLOGY_VALUE_DATATYPE(in elem varchar) return
declare cur, range, value, ret varchar;
declare pos int;
declare dict any;
-
+
dict := connection_get ('xbrl-data-type');
if (dict is null)
- {
- dict := dict_new (10);
- connection_set ('xbrl-data-type', dict);
- }
-
+ {
+ dict := dict_new (10);
+ connection_set ('xbrl-data-type', dict);
+ }
+
cur := 'http://www.openlinksw.com/schemas/xbrl/' || elem;
ret := dict_get (dict, cur);
if (ret is not null)
- {
+ {
return ret;
- }
+ }
range := (sparql select ?range from <http://www.openlinksw.com/schemas/RDF_Mapper_Ontology/1.0/> where {`iri(?:cur)` rdfs:range ?range . } );
ret := 'http://www.w3.org/2001/XMLSchema#string';
if (range is not null and range <> '')
- {
- value := (sparql select ?range from <http://www.openlinksw.com/schemas/RDF_Mapper_Ontology/1.0/> where {?s rdfs:domain `iri(?:range)` . ?s rdfs:range ?range .});
- if (value is not null and value <> '')
- {
- ret := value;
- }
- else
- {
- if (length(range) > 8)
- {
- if (right(range, 8) = 'ItemType')
- {
- value := subseq(range, 0, length(range) - 8);
- pos := strchr(value, '#');
- if (pos > 0)
- {
- value := subseq(value, pos + 1);
- if (value = 'textBlock')
- ret := 'http://www.w3.org/2001/XMLSchema#string';
- else if (value = 'monetary')
- ret := 'http://www.w3.org/2001/XMLSchema#decimal';
- else if (value = 'shares')
- ret := 'http://www.w3.org/2001/XMLSchema#decimal';
- else if (value = 'pure')
- ret := 'http://www.w3.org/2001/XMLSchema#decimal';
- else if (value = 'fraction')
- ret := 'http://www.w3.org/2001/XMLSchema#integer';
- else if (value = 'domain')
- ret := 'http://www.w3.org/2001/XMLSchema#string';
- else if (value = 'percent')
- ret := 'http://www.w3.org/2001/XMLSchema#decimal';
- else if (value = 'perShare')
- ret := 'http://www.w3.org/2001/XMLSchema#decimal';
- else
- ret := concat('http://www.w3.org/2001/XMLSchema#', value);
- }
- }
- }
- }
- }
+ {
+ value := (sparql select ?range from <http://www.openlinksw.com/schemas/RDF_Mapper_Ontology/1.0/> where {?s rdfs:domain `iri(?:range)` . ?s rdfs:range ?range .});
+ if (value is not null and value <> '')
+ {
+ ret := value;
+ }
+ else
+ {
+ if (length(range) > 8)
+ {
+ if (right(range, 8) = 'ItemType')
+ {
+ value := subseq(range, 0, length(range) - 8);
+ pos := strchr(value, '#');
+ if (pos > 0)
+ {
+ value := subseq(value, pos + 1);
+ if (value = 'textBlock')
+ ret := 'http://www.w3.org/2001/XMLSchema#string';
+ else if (value = 'monetary')
+ ret := 'http://www.w3.org/2001/XMLSchema#decimal';
+ else if (value = 'shares')
+ ret := 'http://www.w3.org/2001/XMLSchema#decimal';
+ else if (value = 'pure')
+ ret := 'http://www.w3.org/2001/XMLSchema#decimal';
+ else if (value = 'fraction')
+ ret := 'http://www.w3.org/2001/XMLSchema#integer';
+ else if (value = 'domain')
+ ret := 'http://www.w3.org/2001/XMLSchema#string';
+ else if (value = 'percent')
+ ret := 'http://www.w3.org/2001/XMLSchema#decimal';
+ else if (value = 'perShare')
+ ret := 'http://www.w3.org/2001/XMLSchema#decimal';
+ else
+ ret := concat('http://www.w3.org/2001/XMLSchema#', value);
+ }
+ }
+ }
+ }
+ }
dict_put (dict, cur, ret);
return ret;
}
@@ -1831,22 +1657,22 @@ create procedure DB.DBA.GET_XBRL_CANONICAL_LABEL_NAME(in elem varchar) returns v
cur := replace(cur, '_', ' ');
if (cur is not null)
{
- result := chr(cur[0]);
- for (i := 1; i < length(cur); i := i+1)
- {
- if (chr(cur[i]) = upper(chr(cur[i])))
- {
- if (chr(cur[i - 1]) = upper(chr(cur[i - 1])) or chr(cur[i - 1]) = ' ')
- result := concat(result, chr(cur[i]));
- else
- {
- result := concat(result, ' ');
- result := concat(result, chr(cur[i]));
- }
- }
- else
- result := concat(result, chr(cur[i]));
- }
+ result := chr(cur[0]);
+ for (i := 1; i < length(cur); i := i+1)
+ {
+ if (chr(cur[i]) = upper(chr(cur[i])))
+ {
+ if (chr(cur[i - 1]) = upper(chr(cur[i - 1])) or chr(cur[i - 1]) = ' ')
+ result := concat(result, chr(cur[i]));
+ else
+ {
+ result := concat(result, ' ');
+ result := concat(result, chr(cur[i]));
+ }
+ }
+ else
+ result := concat(result, chr(cur[i]));
+ }
return result;
}
else
@@ -1859,56 +1685,33 @@ RM_UPGRADE_TBL ('DB.DBA.XBRL_CIK_CACHE', 'XC_URL', 'varchar');
create procedure DB.DBA.GET_XBRL_NAME_BY_CIK (in cik varchar)
{
- declare url, nam, ret, cnt, xt, xp varchar;
- declare exit handler for sqlstate '*'
+ declare url, nam, ret, cnt, xt, xp varchar;
+ declare exit handler for sqlstate '*'
{
- return '';
+ return '';
};
- whenever not found goto retr;
- set isolation='comitted';
- select XC_URL into ret from DB.DBA.XBRL_CIK_CACHE where XC_CIK = cik;
- if (ret is null)
+ whenever not found goto retr;
+ set isolation='comitted';
+ select XC_URL into ret from DB.DBA.XBRL_CIK_CACHE where XC_CIK = cik;
+ if (ret is null)
{
- delete from XBRL_CIK_CACHE where XC_CIK = cik;
- goto retr;
+ delete from XBRL_CIK_CACHE where XC_CIK = cik;
+ goto retr;
}
- return ret;
- retr:
- url := sprintf ('http://www.rdfabout.com/sparql?query=%U',
- sprintf ('select ?url ?name '||
- ' where { <http://www.rdfabout.com/rdf/usgov/sec/id/cik%s> <http://www.w3.org/2002/07/owl#sameAs> ?url ; '||
- ' <http://xmlns.com/foaf/0.1/name> ?name . }', cik));
- cnt := http_client (url, proxy=>connection_get ('sparql-get:proxy'));
- xt := xtree_doc (cnt);
- url := cast (xpath_eval ('string (//binding[@name="url"]/uri)', xt) as varchar);
- nam := cast (xpath_eval ('string (//binding[@name="name"]/literal)', xt) as varchar);
- if (not length (url))
- return '';
- insert into DB.DBA.XBRL_CIK_CACHE (XC_CIK, XC_NAME, XC_URL) values (cik, nam, url);
- return url;
-}
-;
-
-create procedure DB.DBA.XENC_X509_PUB_KEY (in data varchar) returns any
-{
- declare x, m, e, fp any;
- data := ltrim (data, 'data:application/x-x509-user-cert;base64,');
- x := get_certificate_info (9, decode_base64 (data), 1);
- fp := get_certificate_info (6, decode_base64 (data), 1);
- e := cast (x[1] as varchar);
- m := bin2hex (x[2]);
- return xtree_doc (sprintf ('<key><mod>%s</mod><exp>%s</exp><fp>%s</fp></key>', m, e, replace (fp, ':', '')));
-}
-;
-
-grant execute on DB.DBA.XENC_X509_PUB_KEY to public;
-
-create procedure DB.DBA.DECODEXML(in xmlstr varchar)
-{
- -- takes XMLSTR, returns an xml tree doc
- declare ret any;
- ret := xtree_doc(xmlstr);
- return ret;
+ return ret;
+ retr:
+ url := sprintf ('http://www.rdfabout.com/sparql?query=%U',
+ sprintf ('select ?url ?name '||
+ ' where { <http://www.rdfabout.com/rdf/usgov/sec/id/cik%s> <http://www.w3.org/2002/07/owl#sameAs> ?url ; '||
+ ' <http://xmlns.com/foaf/0.1/name> ?name . }', cik));
+ cnt := http_client (url, proxy=>connection_get ('sparql-get:proxy'));
+ xt := xtree_doc (cnt);
+ url := cast (xpath_eval ('string (//binding[@name="url"]/uri)', xt) as varchar);
+ nam := cast (xpath_eval ('string (//binding[@name="name"]/literal)', xt) as varchar);
+ if (not length (url))
+ return '';
+ insert into DB.DBA.XBRL_CIK_CACHE (XC_CIK, XC_NAME, XC_URL) values (cik, nam, url);
+ return url;
}
;
@@ -1928,9 +1731,9 @@ create procedure DB.DBA.GET_XBRL_CANONICAL_DATATYPE(in elem varchar) returns var
create procedure RDF_SPONGE_URI_HASH (in u varchar)
{
- if (u is null)
- return '';
- return tridgell32 (u, 1);
+ if (u is null)
+ return '';
+ return tridgell32 (u, 1);
}
;
@@ -1962,75 +1765,48 @@ create procedure DB.DBA.FORMAT_AMOUNT (in val varchar) returns varchar
-- Convert string money values like $1.6M, $230k, $2B into decimals
create procedure DB.DBA.XSLT_CRUNCHBASE_MONEYSTRING2DECIMAL (in val varchar)
{
- declare vec any;
- declare unit, base_sval, converted_sval varchar;
- declare base_dval decimal;
- declare multiplier integer;
-
- if (val is null)
- return null;
- multiplier := 1;
- converted_sval := null;
- val := upper (val);
- vec := regexp_parse ('([0-9\.]+)([BMK]?$)', val, 0);
- if (vec is not null and length (vec) = 6)
- {
- base_sval := subseq (val, vec[2], vec[3]);
- if (vec[4] < vec[5])
- {
- unit := subseq (val, vec[4]);
- multiplier := case (unit) when 'B' then 1000000000 when 'M' then 1000000 when 'K' then 1000 else 1 end;
- base_dval := atof (base_sval);
- }
-
- if (multiplier > 1)
- converted_sval := sprintf('%.lf', base_dval * multiplier);
- else
- converted_sval := base_sval;
+ declare vec any;
+ declare unit, base_sval, converted_sval varchar;
+ declare base_dval decimal;
+ declare multiplier integer;
+
+ if (val is null)
+ return null;
+
+ multiplier := 1;
+ converted_sval := null;
+
+ val := upper (val);
+ vec := regexp_parse ('([0-9\.]+)([BMK]?$)', val, 0);
+ if (vec is not null and length (vec) = 6)
+ {
+ base_sval := subseq (val, vec[2], vec[3]);
+ if (vec[4] < vec[5])
+ {
+ unit := subseq (val, vec[4]);
+ multiplier := case (unit) when 'B' then 1000000000 when 'M' then 1000000 when 'K' then 1000 else 1 end;
+ base_dval := atof (base_sval);
}
- return converted_sval;
-}
-;
+
+ if (multiplier > 1)
+ converted_sval := sprintf('%.lf', base_dval * multiplier);
+ else
+ converted_sval := base_sval;
+ }
-create procedure DB.DBA.XSLT_SANEURI (in val varchar, in seed integer default -1)
-{
- -- Generate sane URI with xml/http-safe characters, based on val and seed (xpath position)
- declare str varchar;
- if ( seed=-1 )
- str:=regexp_replace(sprintf('%s', val), '[^a-zA-Z0-9_-]', '', 1, null);
- else
- str:=regexp_replace(sprintf('%s_%d', val, seed), '[^a-zA-Z0-9_-]', '', 1, null);
- return str;
+ return converted_sval;
}
;
-create function DB.DBA.DBPEDIA_URL_LABEL(in url varchar)
-{
- -- make label from dbpedia URL
- declare ret varchar;
- ret:=regexp_replace(url, '^.*/', '', 1, null);
- ret:=regexp_replace(ret, '_', ' ', 1, null);
- ret:=regexp_replace(ret, '%21', '!', 1, null);
- ret:=regexp_replace(ret, '%26', '&', 1, null);
- ret:=regexp_replace(ret, '%27', '''', 1, null);
- ret:=regexp_replace(ret, '%28', '(', 1, null);
- ret:=regexp_replace(ret, '%29', ')', 1, null);
- ret:=regexp_replace(ret, '%2C', ',', 1, null);
- ret:=regexp_replace(ret, '%3F', '?', 1, null);
- return ret;
-};
-
grant execute on DB.DBA.RDF_MQL_RESOLVE_IMAGE to public;
grant execute on DB.DBA.RM_UMBEL_GET to public;
grant execute on DB.DBA.XSLT_REGEXP_MATCH to public;
grant execute on DB.DBA.XSLT_SPLIT_AND_DECODE to public;
-grant execute on DB.DBA.DI_URI to public;
grant execute on DB.DBA.XSLT_UNIX2ISO_DATE to public;
grant execute on DB.DBA.XSLT_SHA1_HEX to public;
grant execute on DB.DBA.XSLT_REPLACE1 to public;
grant execute on DB.DBA.XSLT_TRIM to public;
grant execute on DB.DBA.XSLT_STR2DATE to public;
-grant execute on DB.DBA.XSLT_DI_SPLIT to public;
grant execute on DB.DBA.XSLT_HTTP_STRING_DATE to public;
grant execute on DB.DBA.XSLT_STRING2ISO_DATE to public;
grant execute on DB.DBA.XSLT_STRING2ISO_DATE2 to public;
@@ -2056,9 +1832,6 @@ grant execute on DB.DBA.RDF_SPONGE_GET_COUNTRY_NAME to public;
grant execute on DB.DBA.RDF_CONVERT_TO_XTREE to public;
grant execute on DB.DBA.OPENGRAPH_OBJ_CONNECTIONS to public;
grant execute on DB.DBA.XSLT_CRUNCHBASE_MONEYSTRING2DECIMAL to public;
-grant execute on DB.DBA.XSLT_SANEURI to public;
-grant execute on DB.DBA.DECODEXML to public;
-grant execute on DB.DBA.DBPEDIA_URL_LABEL to public;
xpf_extension_remove ('http://www.openlinksw.com/virtuoso/xslt:getNameByCIK');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt:xbrl_canonical_datatype', fix_identifier_case ('DB.DBA.GET_XBRL_CANONICAL_DATATYPE'));
@@ -2070,7 +1843,6 @@ xpf_extension ('http://www.openlinksw.com/virtuoso/xslt:xbrl_canonical_value_nam
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt:xbrl_ontology_domain', fix_identifier_case ('DB.DBA.GET_XBRL_ONTOLOGY_DOMAIN'));
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:regexp-match', 'DB.DBA.XSLT_REGEXP_MATCH');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:split-and-decode', 'DB.DBA.XSLT_SPLIT_AND_DECODE');
-xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:di-uri', 'DB.DBA.DI_URI');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:html5md_localname', 'DB.DBA.GET_HTML5MD_LOCALNAME');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:html5md_namespace', 'DB.DBA.GET_HTML5MD_NAMESPACE');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:unix2iso-date', 'DB.DBA.XSLT_UNIX2ISO_DATE');
@@ -2078,7 +1850,6 @@ xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:sha1_hex', 'DB.DBA.XSLT
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:replace1', 'DB.DBA.XSLT_REPLACE1');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:trim', 'DB.DBA.XSLT_TRIM');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:str2date', 'DB.DBA.XSLT_STR2DATE');
-xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:di-split', 'DB.DBA.XSLT_DI_SPLIT');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:escape', 'DB.DBA.XSLT_ESCAPE');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:string2date', 'DB.DBA.XSLT_STRING2ISO_DATE');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:string2date2', 'DB.DBA.XSLT_STRING2ISO_DATE2');
@@ -2096,69 +1867,66 @@ xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:http_string_date', 'DB.
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:uri_hash', 'DB.DBA.RDF_SPONGE_URI_HASH');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:convert_to_xtree', 'DB.DBA.RDF_CONVERT_TO_XTREE');
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:crunchbase_moneystring2decimal', 'DB.DBA.XSLT_CRUNCHBASE_MONEYSTRING2DECIMAL');
-xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:saneURI', 'DB.DBA.XSLT_SANEURI');
-xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:decodeXML', 'DB.DBA.DECODEXML');
-xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:x509_pub_key', 'DB.DBA.XENC_X509_PUB_KEY');
-xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:dbpedia_url_label', 'DB.DBA.DBPEDIA_URL_LABEL');
create procedure DB.DBA.RDF_MAPPER_XSLT (in xslt varchar, inout xt any, in params any := null)
{
- set_user_id ('dba');
- if (params is null)
- return xslt (xslt, xt);
- else
- return xslt (xslt, xt, params);
+ set_user_id ('dba');
+ if (params is null)
+ return xslt (xslt, xt);
+ else
+ return xslt (xslt, xt, params);
};
create procedure DB.DBA.RDF_APERTURE_INIT ()
{
- if (__proc_exists ('java_vm_attach', 2) is null)
+ if (__proc_exists ('java_vm_attach', 2) is null)
{
- delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_BIN_DOCUMENT';
- return;
+ delete from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_BIN_DOCUMENT';
+ return;
}
- set_qualifier ('APERTURE');
- if (not udt_is_available ('APERTURE.DBA.MetaExtractor'))
+ set_qualifier ('APERTURE');
+ if (not udt_is_available ('APERTURE.DBA.MetaExtractor'))
+ {
+ declare exit handler for sqlstate '*'
{
- declare exit handler for sqlstate '*'
- {
- set_qualifier ('DB');
- return;
- };
- DB.DBA.import_jar (NULL, 'MetaExtractor', 1);
- }
- exec (
- 'create procedure DB.DBA.RDF_LOAD_BIN_DOCUMENT (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
- {
- declare xd, tmp, fn any;
- tmp := null;
- declare exit handler for sqlstate \'*\'
- {
- if (length (tmp))
- file_delete (tmp, 1);
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
- tmp := tmp_file_name (\'rdfm\', \'bin\');
- fn := tmp;
- string_to_file (tmp, _ret_body, -2);
- xd := APERTURE.DBA."MetaExtractor"().getMetaFromFile (fn, 5);
- xd := charset_recode(xd, \'_WIDE_\', \'UTF-8\');
+ set_qualifier ('DB');
+ return;
+ };
+ DB.DBA.import_jar (NULL, 'MetaExtractor', 1);
+ }
+ exec (
+'create procedure DB.DBA.RDF_LOAD_BIN_DOCUMENT (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
+{
+ declare xd, tmp, fn any;
+ tmp := null;
+ declare exit handler for sqlstate \'*\'
+ {
+ if (length (tmp))
file_delete (tmp, 1);
- if (xd is null)
- return 0;
- xd := replace (xd, \'file:\'||tmp, new_origin_uri);
- xd := replace (xd, \'urn:uuid:\', new_origin_uri||\'/\');
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), \'urn:org.semanticdesktop.aperture\');
- return 1;
- }');
- insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
- values ('application/.*',
- 'MIME', 'DB.DBA.RDF_LOAD_BIN_DOCUMENT', null, 'Binary Files');
- update DB.DBA.SYS_RDF_MAPPERS set RM_ID = 1000 where RM_HOOK = 'DB.DBA.RDF_LOAD_BIN_DOCUMENT';
- set_qualifier ('DB');
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ return 0;
+ };
+ tmp := tmp_file_name (\'rdfm\', \'bin\');
+ fn := tmp;
+ string_to_file (tmp, _ret_body, -2);
+ xd := APERTURE.DBA."MetaExtractor"().getMetaFromFile (fn, 5);
+ xd := charset_recode(xd, \'_WIDE_\', \'UTF-8\');
+ file_delete (tmp, 1);
+ if (xd is null)
+ return 0;
+ xd := replace (xd, \'file:\'||tmp, new_origin_uri);
+ xd := replace (xd, \'urn:uuid:\', new_origin_uri||\'/\');
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), \'urn:org.semanticdesktop.aperture\');
+ return 1;
+}');
+
+ insert soft DB.DBA.SYS_RDF_MAPPERS (RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_DESCRIPTION)
+ values ('application/.*',
+ 'MIME', 'DB.DBA.RDF_LOAD_BIN_DOCUMENT', null, 'Binary Files');
+ update DB.DBA.SYS_RDF_MAPPERS set RM_ID = 1000 where RM_HOOK = 'DB.DBA.RDF_LOAD_BIN_DOCUMENT';
+ set_qualifier ('DB');
}
;
@@ -2169,141 +1937,121 @@ RDF_APERTURE_INIT ()
create procedure FB_SIG (in params any, in secret any)
{
- declare arr, pars, str any;
- arr := split_and_decode (params, 0, '\0\0&=');
- pars := vector ();
- for (declare i int, i := 0; i < length (arr); i := i + 2)
- {
- declare tmp any;
- tmp := split_and_decode (arr[i+1]);
- tmp := tmp[0];
- pars := vector_concat (pars, vector (arr[i]||'='||tmp));
- }
- pars := __vector_sort (pars);
- str := '';
- foreach (any elm in pars) do
+ declare arr, pars, str any;
+ arr := split_and_decode (params, 0, '\0\0&=');
+ pars := vector ();
+ for (declare i int, i := 0; i < length (arr); i := i + 2)
+ {
+ declare tmp any;
+ tmp := split_and_decode (arr[i+1]);
+ tmp := tmp[0];
+ pars := vector_concat (pars, vector (arr[i]||'='||tmp));
+ }
+ pars := __vector_sort (pars);
+ str := '';
+ foreach (any elm in pars) do
{
- str := str || elm;
+ str := str || elm;
}
- str := str || secret;
- return md5 (str);
+ str := str || secret;
+ return md5 (str);
};
create procedure DB.DBA.MQL_TREE_TO_XML_REC (in tree any, in tag varchar, inout ses any)
{
- if (not isarray (tree) or isstring (tree))
+ if (not isarray (tree) or isstring (tree))
{
- if (tree is not null and tree <> '')
- {
- http_value (tree, tag, ses);
- }
+ if (tree is not null and tree <> '')
+ {
+ http_value (tree, tag, ses);
+ }
}
- else if (length (tree) > 1 and __tag (tree[0]) = 255)
+ else if (length (tree) > 1 and __tag (tree[0]) = 255)
{
- http (sprintf ('<%U>', tag), ses);
- for (declare i,l int, i := 2, l := length (tree); i < l; i := i + 2)
- {
- DB.DBA.MQL_TREE_TO_XML_REC (tree[i+1], tree[i], ses);
- }
- http (sprintf ('</%U>', tag), ses);
+ http (sprintf ('<%U>', tag), ses);
+ for (declare i,l int, i := 2, l := length (tree); i < l; i := i + 2)
+ {
+ DB.DBA.MQL_TREE_TO_XML_REC (tree[i+1], tree[i], ses);
+ }
+ http (sprintf ('</%U>', tag), ses);
}
- else if (length (tree) > 0)
+ else if (length (tree) > 0)
{
- for (declare i,l int, i := 0, l := length (tree); i < l; i := i + 1)
- {
- DB.DBA.MQL_TREE_TO_XML_REC (tree[i], tag, ses);
- }
+ for (declare i,l int, i := 0, l := length (tree); i < l; i := i + 1)
+ {
+ DB.DBA.MQL_TREE_TO_XML_REC (tree[i], tag, ses);
+ }
}
}
;
create procedure DB.DBA.MQL_TREE_TO_XML (in tree any)
{
- declare ses any;
- ses := string_output ();
- DB.DBA.MQL_TREE_TO_XML_REC (tree, 'results', ses);
- ses := string_output_string (ses);
- ses := xtree_doc (ses);
- return ses;
-}
-;
-
-create procedure DB.DBA.STREE_ELEM (in tag varchar)
-{
- declare x any;
- x := replace(replace(tag, ' ', '_'), '@', '');
- if (strchr ('!"#$%&\'()*+,-./:;<=>?@[\]^_`{|}~0123456789', x[0]) is not null)
- return 'elem_' || x;
- return x;
+ declare ses any;
+ ses := string_output ();
+ DB.DBA.MQL_TREE_TO_XML_REC (tree, 'results', ses);
+ ses := string_output_string (ses);
+ ses := xtree_doc (ses);
+ return ses;
}
;
create procedure DB.DBA.SOCIAL_TREE_TO_XML_REC (in tree any, in tag varchar, inout ses any)
{
- tag := trim(tag, '\"');
- if (not isarray (tree) or isstring (tree))
- {
- if (isstring (tree))
- tree := trim(tree, '\"');
- if (left(tag, 7) = 'http://')
- tag := 'Site';
- http_value (tree, tag, ses);
- }
- else if (length (tree) > 1 and __tag (tree[0]) = 255)
- {
- if (left(tag, 7) = 'http://' or left(tag, 6) = 'ttp://' or left(tag, 7) = 'mailto:' or left(tag, 4) = 'sgn:')
- {
- http ('<Document>\n', ses);
- http_value (tag, 'about', ses);
- }
- else if (regexp_parse ('^(19|20)\\d\\d[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$', tag, 0))
- {
- http (sprintf ('<date><when>%U</when>\n', replace(replace(tag, ' ', '_'), '@', '')), ses);
- }
- else
- {
- http (sprintf ('<%U>\n', STREE_ELEM (tag)), ses);
- }
- for (declare i,l int, i := 2, l := length (tree); i < l; i := i + 2)
- {
- DB.DBA.SOCIAL_TREE_TO_XML_REC (tree[i+1], tree[i], ses);
- }
- if (left(tag, 7) = 'http://' or left(tag, 6) = 'ttp://' or left(tag, 7) = 'mailto:' or left(tag, 4) = 'sgn:')
- {
- http ('</Document>\n', ses);
- }
- else if (regexp_parse ('^(19|20)\\d\\d[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$', tag, 0))
- {
- http ('</date>\n', ses);
- }
- else
- {
- http (sprintf ('</%U>\n', STREE_ELEM (tag)), ses);
- }
- }
- else if (length (tree) > 0)
- {
- for (declare i,l int, i := 0, l := length (tree); i < l; i := i + 1)
- {
- DB.DBA.SOCIAL_TREE_TO_XML_REC (tree[i], tag, ses);
- }
- }
+ tag := trim(tag, '\"');
+ if (not isarray (tree) or isstring (tree))
+ {
+ if (isstring (tree))
+ tree := trim(tree, '\"');
+ if (left(tag, 7) = 'http://')
+ tag := 'Site';
+ http_value (tree, tag, ses);
+ }
+ else if (length (tree) > 1 and __tag (tree[0]) = 255)
+ {
+ if (left(tag, 7) = 'http://' or left(tag, 6) = 'ttp://' or left(tag, 7) = 'mailto:' or left(tag, 4) = 'sgn:')
+ {
+ http ('<Document>\n', ses);
+ http_value (tag, 'about', ses);
+ }
+ else
+ {
+ http (sprintf ('<%U>\n', replace(replace(tag, ' ', '_'), '@', '')), ses);
+ }
+ for (declare i,l int, i := 2, l := length (tree); i < l; i := i + 2)
+ {
+ DB.DBA.SOCIAL_TREE_TO_XML_REC (tree[i+1], tree[i], ses);
+ }
+ if (left(tag, 7) = 'http://' or left(tag, 6) = 'ttp://' or left(tag, 7) = 'mailto:' or left(tag, 4) = 'sgn:')
+ http ('</Document>\n', ses);
+ else
+ {
+ http (sprintf ('</%U>\n', replace(replace(tag, ' ', '_'), '@', '')), ses);
+ }
+ }
+ else if (length (tree) > 0)
+ {
+ for (declare i,l int, i := 0, l := length (tree); i < l; i := i + 1)
+ {
+ DB.DBA.SOCIAL_TREE_TO_XML_REC (tree[i], tag, ses);
+ }
+ }
}
;
create procedure DB.DBA.SOCIAL_TREE_TO_XML (in tree any)
{
- declare ses any;
- ses := string_output ();
- DB.DBA.SOCIAL_TREE_TO_XML_REC (tree, 'results', ses);
- ses := string_output_string (ses);
- ses := xtree_doc (ses);
- return ses;
+ declare ses any;
+ ses := string_output ();
+ DB.DBA.SOCIAL_TREE_TO_XML_REC (tree, 'results', ses);
+ ses := string_output_string (ses);
+ ses := xtree_doc (ses);
+ return ses;
}
;
create procedure DB.DBA.RDF_LOAD_SALESFORCE(in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare hdr any;
declare tree, xt, xd any;
@@ -2311,7 +2059,7 @@ create procedure DB.DBA.RDF_LOAD_SALESFORCE(in graph_iri varchar, in new_origin_
hdr := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
username_ := get_keyword ('username', opts);
@@ -2329,18 +2077,18 @@ create procedure DB.DBA.RDF_LOAD_SALESFORCE(in graph_iri varchar, in new_origin_
id := trim (tmp[1], '/');
else
return 0;
- if (id is null)
- {
- return 0;
- }
- }
+ if (id is null)
+ {
+ return 0;
+ }
+ }
res := xml_tree_doc(SOAP_CLIENT (
- url=>'https://www.salesforce.com/services/Soap/c/14.0',
- operation=>'login',
- parameters=>vector ('username', username_,
- 'password', password_),
- target_namespace=>'urn:enterprise.soap.sforce.com',
- style=>21));
+ url=>'https://www.salesforce.com/services/Soap/c/14.0',
+ operation=>'login',
+ parameters=>vector ('username', username_,
+ 'password', password_),
+ target_namespace=>'urn:enterprise.soap.sforce.com',
+ style=>21));
sessionId := cast(xpath_eval('//sessionId/text()' , res ) as varchar);
serverURL := cast(xpath_eval('//serverUrl/text()' , res ) as varchar);
type := left(id, 3);
@@ -2578,30 +2326,30 @@ create procedure DB.DBA.RDF_LOAD_SALESFORCE(in graph_iri varchar, in new_origin_
url=>serverUrl,
operation=>'retrieve',
headers=>vector (
- vector ('SessionHeader', '__XML__', 0),
- xtree_doc (concat (
- '<urn:SessionHeader xmlns:urn="urn:enterprise.soap.sforce.com">
- <urn:sessionId xmlns:urn="urn:enterprise.soap.sforce.com">',
- sessionId,
- '</urn:sessionId>
- </urn:SessionHeader>'))),
- parameters=>vector (
- 'fieldList', fieldList,
- 'sObjectType', sObjectType,
- 'ids', id),
- target_namespace=>'urn:enterprise.soap.sforce.com',
- style=>21));
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ vector ('SessionHeader', '__XML__', 0),
+ xtree_doc (concat (
+ '<urn:SessionHeader xmlns:urn="urn:enterprise.soap.sforce.com">
+ <urn:sessionId xmlns:urn="urn:enterprise.soap.sforce.com">',
+ sessionId,
+ '</urn:sessionId>
+ </urn:SessionHeader>'))),
+ parameters=>vector (
+ 'fieldList', fieldList,
+ 'sObjectType', sObjectType,
+ 'ids', id),
+ target_namespace=>'urn:enterprise.soap.sforce.com',
+ style=>21));
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/sf2rdf.xsl', xd, vector ('baseUri', RDF_SPONGE_DOC_IRI (new_origin_uri)));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 'https://www.salesforce.com/services/Soap/c/14.0');
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 'https://www.salesforce.com/services/Soap/c/14.0');
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_TWITTER2(in url varchar, in id varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, in username_ varchar, in password_ varchar, in what_ varchar, inout opts any, in triple_dict any := null) returns integer
+create procedure DB.DBA.RDF_LOAD_TWITTER2(in url varchar, in id varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, in username_ varchar, in password_ varchar, in what_ varchar, inout opts any) returns integer
{
declare xt, xd any;
declare tmp, test1, test2, test3 varchar;
@@ -2616,15 +2364,15 @@ create procedure DB.DBA.RDF_LOAD_TWITTER2(in url varchar, in id varchar, in new_
return 0;
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/twitter2rdf.xsl', xd, vector ('baseUri', RDF_SPONGE_DOC_IRI (new_origin_uri), 'id', id, 'what', what_));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_TWITTER(in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xt, xd any;
declare url, tmp varchar;
@@ -2632,7 +2380,7 @@ create procedure DB.DBA.RDF_LOAD_TWITTER(in graph_iri varchar, in new_origin_uri
declare pos, page, res_count integer;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
what_ := '';
@@ -2645,9 +2393,9 @@ create procedure DB.DBA.RDF_LOAD_TWITTER(in graph_iri varchar, in new_origin_uri
if (new_origin_uri like 'http://search.twitter.com/search/thread/%')
{
url := concat(new_origin_uri, '.atom');
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
what_ := 'thread2';
- DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts);
return 1;
}
else if (new_origin_uri like 'http://search.twitter.com/search?q=%')
@@ -2657,9 +2405,9 @@ create procedure DB.DBA.RDF_LOAD_TWITTER(in graph_iri varchar, in new_origin_uri
if (post is null)
return 0;
url := sprintf('http://search.twitter.com/search.atom?q=%s', post);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
what_ := 'thread1';
- DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts);
return 1;
}
else if (new_origin_uri like 'http://twitter.com/%/status/%')
@@ -2670,15 +2418,15 @@ create procedure DB.DBA.RDF_LOAD_TWITTER(in graph_iri varchar, in new_origin_uri
if (id is null or post is null)
return 0;
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
what_ := 'thread2';
url := sprintf('http://search.twitter.com/search/thread/%s.atom', post);
- DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts);
what_ := 'status';
url := sprintf('http://twitter.com/statuses/show/%s.xml', post);
- DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts);
return 1;
}
@@ -2690,15 +2438,15 @@ create procedure DB.DBA.RDF_LOAD_TWITTER(in graph_iri varchar, in new_origin_uri
if (id is null or post is null)
return 0;
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
what_ := 'thread2';
url := sprintf('http://search.twitter.com/search/thread/%s.atom', post);
- DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts);
what_ := 'status';
url := sprintf('http://twitter.com/statuses/show/%s.xml', post);
- DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts);
return 1;
@@ -2742,55 +2490,60 @@ create procedure DB.DBA.RDF_LOAD_TWITTER(in graph_iri varchar, in new_origin_uri
}
else
return 0;
+
friends_and_followers: ;
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
page := 1;
while (page > 0 and page < res_count)
{
url := sprintf('http://twitter.com/statuses/user_timeline.xml?id=%s&page=%d', id, page);
- if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict) = 0)
+ if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts) = 0)
goto statuses_out;
page := page + 1;
}
statuses_out: ;
+
page := 1;
while (page > 0 and page < res_count)
{
what_ := 'friends';
url := sprintf('http://twitter.com/statuses/friends.xml?id=%s&page=%d', id, page);
- if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict) = 0)
+ if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts) = 0)
goto friends_out;
page := page + 1;
}
friends_out: ;
+
page := 1;
while (page > 0 and page < res_count)
{
url := sprintf('http://twitter.com/favorites.xml?id=%s&page=%d', id, page);
- if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict) = 0)
+ if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts) = 0)
goto favorites_out;
page := page + 1;
}
favorites_out: ;
+
page := 1;
while (page > 0 and page < res_count)
{
what_ := 'followers';
url := sprintf('http://twitter.com/statuses/followers.xml?id=%s&page=%d', id, page);
- if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict) = 0)
+ if (DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts) = 0)
goto followers_out;
page := page + 1;
}
followers_out: ;
+
what_ := 'user';
url := sprintf('http://twitter.com/users/show/%s.xml', id);
- DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts, triple_dict);
+ DB.DBA.RDF_LOAD_TWITTER2(url, id, new_origin_uri, dest, graph_iri, username_, password_, what_, opts);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_TWITTER_FP (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xt, xd any;
declare url, tmp varchar;
@@ -2798,7 +2551,7 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_FP (in graph_iri varchar, in new_origin
declare ses any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
tree := json_parse (_ret_body);
@@ -2809,13 +2562,13 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_FP (in graph_iri varchar, in new_origin
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/twitter_fp2rdf.xsl', xt, vector ('baseUri', RDF_SPONGE_DOC_IRI (new_origin_uri)));
xd := serialize_to_UTF8_xml (xt);
--dbg_obj_print_vars (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_GETSATISFATION(in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare qr, path, hdr any;
declare tree, xt, xd, types, is_search any;
@@ -2823,11 +2576,12 @@ create procedure DB.DBA.RDF_LOAD_GETSATISFATION(in graph_iri varchar, in new_ori
declare url_vec any;
declare cur, len integer;
declare what_, name_, where_, file, base_uri varchar;
+
hdr := null;
base_uri := new_origin_uri;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://getsatisfaction.com/%')
@@ -2929,7 +2683,7 @@ create procedure DB.DBA.RDF_LOAD_GETSATISFATION(in graph_iri varchar, in new_ori
else
return 0;
tmp := http_client(url, proxy=>get_keyword_ucase ('get:proxy', opts));
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
if (what_ = 'topics')
{
xd := xtree_doc (tmp);
@@ -2944,39 +2698,39 @@ create procedure DB.DBA.RDF_LOAD_GETSATISFATION(in graph_iri varchar, in new_ori
vector ('baseUri', RDF_SPONGE_DOC_IRI (base_uri), 'what', what_));
}
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, base_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, base_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_GOOGLEBASE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOOGLEBASE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
xd := xtree_doc (_ret_body);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/googlebase2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_OVERSTOCK (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare thisgr, cont varchar;
thisgr := coalesce (dest, graph_iri);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
--ret_body := replace (ret_body, '= \'<script', '= \'<scr\' + \'ipt');
@@ -2998,22 +2752,22 @@ create procedure DB.DBA.RDF_LOAD_OVERSTOCK (in graph_iri varchar, in new_origin_
'</div>');
}
if (dest is null)
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 0);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RDF_LOAD_RDFA_1 (cont, new_origin_uri, thisgr, 0);
--DB.DBA.RDF_QUAD_URI (thisgr, new_origin_uri, 'http://xmlns.com/foaf/0.1/primaryTopic', new_origin_uri || '#product');
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_RDFA_CARTRIDGE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare thisgr, cont varchar;
thisgr := coalesce (dest, graph_iri);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (get_keyword ('use_tidy', opts) = 'yes')
@@ -3021,20 +2775,20 @@ create procedure DB.DBA.RDF_LOAD_RDFA_CARTRIDGE (in graph_iri varchar, in new_or
else
cont := ret_body;
if (dest is null)
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 0);
+ DB.DBA.RDF_LOAD_RDFA_1 (cont, new_origin_uri, thisgr, 0);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 1);
+ DB.DBA.RDF_LOAD_RDFA_1 (cont, new_origin_uri, thisgr, 1);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 2);
+ DB.DBA.RDF_LOAD_RDFA_1 (cont, new_origin_uri, thisgr, 2);
rdfa_end:;
}
return 1;
@@ -3042,14 +2796,14 @@ create procedure DB.DBA.RDF_LOAD_RDFA_CARTRIDGE (in graph_iri varchar, in new_or
;
create procedure DB.DBA.RDF_LOAD_RDFA_NP_CARTRIDGE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare thisgr, cont varchar;
thisgr := coalesce (dest, graph_iri);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (get_keyword ('use_tidy', opts) = 'yes')
@@ -3057,20 +2811,20 @@ create procedure DB.DBA.RDF_LOAD_RDFA_NP_CARTRIDGE (in graph_iri varchar, in new
else
cont := ret_body;
if (dest is null)
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 0, 0);
+ DB.DBA.RDF_LOAD_RDFA (cont, new_origin_uri, thisgr, 0);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 1, 0);
+ DB.DBA.RDF_LOAD_RDFA (cont, new_origin_uri, thisgr, 1);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, cont, new_origin_uri, thisgr, 2, 0);
+ DB.DBA.RDF_LOAD_RDFA (cont, new_origin_uri, thisgr, 2);
rdfa_end:;
}
return 1;
@@ -3078,7 +2832,7 @@ create procedure DB.DBA.RDF_LOAD_RDFA_NP_CARTRIDGE (in graph_iri varchar, in new
;
create procedure DB.DBA.RDF_LOAD_CRUNCHBASE(in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare qr, path, hdr any;
declare tree, xt, xd, types, is_search any;
@@ -3087,7 +2841,7 @@ create procedure DB.DBA.RDF_LOAD_CRUNCHBASE(in graph_iri varchar, in new_origin_
hdr := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -3129,7 +2883,7 @@ create procedure DB.DBA.RDF_LOAD_CRUNCHBASE(in graph_iri varchar, in new_origin_
}
if (hdr is not null and hdr[0] not like 'HTTP/1._ 200 %')
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, hdr[0]);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, hdr[0]);
return 0;
}
if (new_origin_uri like 'http://api.crunchbase.com/v/1/search.js?query=%')
@@ -3137,15 +2891,15 @@ create procedure DB.DBA.RDF_LOAD_CRUNCHBASE(in graph_iri varchar, in new_origin_
tree := json_parse (cnt);
if (is_search)
tree := get_keyword ('results', tree);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
xt := DB.DBA.MQL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/crunchbase2rdf.xsl', xt,
vector ('baseUri', new_origin_uri, 'base', base, 'suffix', suffix));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
@@ -3227,7 +2981,7 @@ create procedure DB.DBA.RM_FREEBASE_DOC_LINK (in graph varchar, in doc varchar,
-- /* Freebase cartridge */
create procedure DB.DBA.RDF_LOAD_MQL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare qr, path, hdr any;
declare tree, xt, xd, types any;
@@ -3238,7 +2992,7 @@ create procedure DB.DBA.RDF_LOAD_MQL (in graph_iri varchar, in new_origin_uri va
sa := '';
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -3256,9 +3010,9 @@ create procedure DB.DBA.RDF_LOAD_MQL (in graph_iri varchar, in new_origin_uri va
if (mime = 'application/rdf+xml')
{
sa := DB.DBA.RDF_MQL_GET_WIKI_URI (k);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
-- cb-- As was
- --DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, cnt, new_origin_uri, coalesce (dest, graph_iri));
+ --DB.DBA.RM_RDF_LOAD_RDFXML (cnt, new_origin_uri, coalesce (dest, graph_iri));
-- cb++
xt := xtree_doc(cnt);
@@ -3266,11 +3020,11 @@ create procedure DB.DBA.RDF_LOAD_MQL (in graph_iri varchar, in new_origin_uri va
vector ('baseUri', new_origin_uri, 'wpUri', sa, 'ptIRI', sprintf ('http://rdf.freebase.com/ns/%U.%U', lang, k)));
sa := '';
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
-- ++cb
DB.DBA.RM_FREEBASE_DOC_LINK (coalesce (dest, graph_iri), new_origin_uri, sprintf ('http://rdf.freebase.com/ns/%U.%U', lang, k), sa);
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), new_url);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), new_url);
have_rdf := 1;
goto done;
}
@@ -3302,7 +3056,7 @@ create procedure DB.DBA.RDF_LOAD_MQL (in graph_iri varchar, in new_origin_uri va
types := vector_concat (types, tmp);
}
--types := get_keyword ('type', xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
foreach (any tp in types) do
{
qr := sprintf ('{"ROOT":{"query":{%s, "type":"%s", "*":[]}}}', k, tp);
@@ -3315,9 +3069,9 @@ create procedure DB.DBA.RDF_LOAD_MQL (in graph_iri varchar, in new_origin_uri va
vector ('baseUri', new_origin_uri, 'wpUri', sa));
sa := '';
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
have_rdf := 1;
}
done:;
@@ -3344,14 +3098,14 @@ create procedure FQL_CALL (in q varchar, in api_key varchar, in ses_id varchar,
;
create procedure DB.DBA.RDF_LOAD_FQL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare api_key, ses_id, secret varchar;
declare ret, tmp, karr, xt, xd any;
declare url, sig, pars, q, own, pid, aid, acc varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -3414,14 +3168,14 @@ create procedure DB.DBA.RDF_LOAD_FQL (in graph_iri varchar, in new_origin_uri va
xt := xtree_doc (ret);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fql2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'login', acc));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
q := sprintf ('SELECT aid, cover_pid, owner, name, created, modified, description, location, size, link FROM album '||
'WHERE owner = %s and strpos (link, "aid=%s&") > 0', own, aid);
ret := DB.DBA.FQL_CALL (q, api_key, ses_id, secret, opts);
xt := xtree_doc (ret);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fql2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'login', acc));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
goto end_sp;
try_profile:
@@ -3440,7 +3194,7 @@ try_profile:
xt := xtree_doc (ret);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fql2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'login', acc));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
q := sprintf ('SELECT aid, cover_pid, owner, name, created, modified, description, location, size, link FROM album '||
'WHERE owner = %s', own);
@@ -3448,7 +3202,7 @@ try_profile:
xt := xtree_doc (ret);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fql2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'login', acc));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
q := sprintf ('select eid, name, tagline, nid, pic_small, pic_big, pic, host, description, event_type, event_subtype, '||
' start_time, end_time, creator, update_time, location, venue from event where eid in '||
'(SELECT eid FROM event_member where uid = %s)', own);
@@ -3456,16 +3210,16 @@ try_profile:
xt := xtree_doc (ret);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fql2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'login', acc));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
q := sprintf ('SELECT uid, first_name, last_name, name, pic_small, pic_big, pic_square, pic, profile_update_time, timezone, religion, birthday, sex, current_location FROM user WHERE uid IN (select uid2 from friend where uid1 = %s)', own);
ret := DB.DBA.FQL_CALL (q, api_key, ses_id, secret, opts);
xt := xtree_doc (ret);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fql2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'login', acc));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
goto end_sp;
end_sp:
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 'http://api.facebook.com/restserver.php');
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 'http://api.facebook.com/restserver.php');
return 1;
};
@@ -3484,8 +3238,6 @@ EXEC_STMT(
create index OPENGRAPH_ACCESS_TOKENS_USER_ID on DB.DBA.OPENGRAPH_ACCESS_TOKENS (OGAT_GRANTOR_ID)', 0)
;
-RM_UPGRADE_TBL ('DB.DBA.OPENGRAPH_ACCESS_TOKENS', 'OGAT_TOKEN_INVALID', 'integer default 0');
-
EXEC_STMT(
'create table DB.DBA.LINKEDIN_ACCESS_TOKENS (
LIAT_ACCESS_TOKEN varchar, -- LinkedIn access token
@@ -3526,376 +3278,223 @@ EXEC_STMT(
OAUTH_REQ_SECRET varchar
)
create index OAUTH_TOKEN_REQUESTS_OAUTH_REQ_TOKEN on DB.DBA.OAUTH_TOKEN_REQUESTS (OAUTH_REQ_TOKEN)', 0)
-;
-
-create procedure DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
-{
- declare qr, path any;
- declare tree, xt, xt2, xt_og_metadata, xd, types, hdr any;
- declare id, cnt, url, tmp, access_token, client_id, mime, client_secret, code varchar;
- declare pos, ret, ord integer;
-
- declare og_object_type varchar; -- Type of Open Graph object being handled
- declare og_id varchar; -- Open Graph object ID
- declare og_conns any; -- Open Graph object's connections
- declare og_err, og_headers any;
- declare retries, page, max_pages, paging_page_size_limit, more_pages integer;
- declare og_timeout integer; -- Timeout when accessing Open Graph collections
- declare http_new_origin_uri varchar;
- declare append_access_token_to_connections integer;
- declare default_access_token varchar;
-
- og_timeout := 60;
- og_id := null;
- access_token := null;
- mime := get_keyword ('content-type', opts);
-
- declare exit handler for sqlstate '*'
- {
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
-
- http_new_origin_uri := new_origin_uri;
- if (subseq (new_origin_uri, 0, 5) = 'https')
- http_new_origin_uri := 'http' || subseq (new_origin_uri, 5);
-
- if (http_new_origin_uri like 'http://www.facebook.com/profile.php?id=%')
- {
- tmp := sprintf_inverse (http_new_origin_uri, 'http://www.facebook.com/profile.php?id=%s', 0);
- id := rtrim(tmp[0], '&/');
- pos := strchr(id, '&');
- if (pos > 0)
- id := left(id, pos);
- if (id is null)
- return 0;
- }
- else if (http_new_origin_uri like 'http://www.facebook.com/pages/%/%')
- {
- tmp := sprintf_inverse (http_new_origin_uri, 'http://www.facebook.com/pages/%s/%s', 0);
- id := rtrim(tmp[1], '&/');
- pos := strchr(id, '?');
- if (pos > 0)
- id := left(id, pos);
- if (id is null)
- return 0;
- }
- else if (http_new_origin_uri like 'http://www.facebook.com/album.php?aid=%&id=%')
- {
- tmp := sprintf_inverse (http_new_origin_uri, 'http://www.facebook.com/album.php?aid=%s&id=%s', 0);
- id := rtrim(tmp[1], '&/');
- pos := strchr(id, '?');
- if (pos > 0)
- id := left(id, pos);
- if (id is null)
- return 0;
- }
- else if (http_new_origin_uri like 'http://www.facebook.com/%')
- {
- tmp := sprintf_inverse (http_new_origin_uri, 'http://www.facebook.com/%s', 0);
- id := rtrim(tmp[0], '&/');
- pos := strchr(id, '?');
- if (pos > 0)
- id := left(id, pos);
- if (id is null)
- return 0;
- }
- else if (http_new_origin_uri like 'http://graph.facebook.com/%')
- {
- tmp := sprintf_inverse (http_new_origin_uri, 'http://graph.facebook.com/%s', 0);
- id := rtrim(tmp[0], '&/');
- pos := strchr(id, '?');
- if (pos > 0)
- id := left(id, pos);
- if (id is null)
- return 0;
- }
- else
- {
- url := concat('http://graph.facebook.com/?ids=', new_origin_uri, '&metadata=1');
- cnt := http_client_ext (url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
- if (hdr[0] not like 'HTTP/1._ 200 %')
- {
- signal ('22023', trim(hdr[0], '\r\n'), 'RDFXX');
- return 0;
- }
- tree := json_parse (cnt);
- if (tree is null)
- return 0;
- xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
- if (xpath_eval ('/results/document/type[ . = "link_stat"]', xt) is null)
- {
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fb_og2rdf.xsl', xt,
- vector ('baseUri', new_origin_uri, 'og_object_type', 'general'));
- xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 'http://graph.facebook.com/');
- }
- ord := (select RM_ID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH');
- if (RM_CONTENT_TYPE_IS_RDF (mime))
- ret := -1;
- else
- ret := 1;
- for select RM_PATTERN, RM_TYPE, RM_HOOK from DB.DBA.SYS_RDF_MAPPERS where RM_ID > ord and RM_TYPE in ('URL', 'MIME') and RM_ENABLED = 1 order by RM_ID do
- {
- if (RM_TYPE = 'URL' and regexp_match (RM_PATTERN, new_origin_uri) is not null)
- ret := 0;
- else if (RM_TYPE = 'MIME' and mime is not null and RM_HOOK <> 'DB.DBA.RDF_LOAD_DAV_META'
- and regexp_match (RM_PATTERN, mime) is not null)
- ret := 0;
- }
- return ret;
- }
-
- -- max_pages: maximum number of pages to retrieve. 0 => no limit
- -- paging_page_size_limit: only turn on paging for page sizes below this limit. 0 => fetch all available pages, irrespective of their size
- max_pages := coalesce (atoi(get_keyword ('max_pages', opts)), 1);
- paging_page_size_limit := coalesce (atoi(get_keyword ('paging_page_size_limit', opts)), 5000);
-
- url := sprintf ('https://graph.facebook.com/%s?metadata=1', id);
- cnt := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- append_access_token_to_connections := 1;
-
- -- Handle some OpenGraph object types as special cases when sponged directly.
- -- i.e. - the input URL identifies the OpenGraph object directly
- -- - the object isn't retrieved from a connection/collection of a parent object
- -- An access token must be supplied to be able to query these object types at all.
- -- e.g. Album, Link
- -- If not supplied, OpenGraph returns HTTP 200 (OK) and 'false' instead of an OAuthException.
- --
- -- Attempts to sponge Photos directly return HTTP 400 (Bad request) and an OAuthException.
- -- The Sponger doesn't invoke this cartridge.
- if (cnt = 'false')
- {
- -- We don't yet know the Facebook user ID of the object's creator.
- -- Try all available access tokens to get the unknown object's metadata
- declare access_tokens any;
-
- access_token := null;
- access_tokens := DB.DBA.OPENGRAPH_GET_ACCESS_TOKEN (null);
- if (length (access_tokens) = 0)
- {
- log_message (sprintf('%s: No access token is available to query this OpenGraph object\'s metadata.', current_proc_name()));
- return 0;
- }
- foreach (any _token in access_tokens) do
- {
- declare token varchar;
- token := cast (_token as varchar);
- url := url || '&access_token=' || token;
- cnt := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- if (cnt <> 'false')
- {
- tree := json_parse (cnt);
- xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
- og_err := cast (xpath_eval('results/error/type', xt) as varchar);
- if (og_err is null)
- {
- access_token := token;
- goto got_usable_token_for_object;
- }
- }
- }
- log_message (sprintf('%s: No access token is available to query this OpenGraph object\'s metadata.', current_proc_name()));
- return 0;
-
-got_usable_token_for_object:
- tree := json_parse (cnt);
- xt_og_metadata := DB.DBA.SOCIAL_TREE_TO_XML (tree);
- og_object_type := cast (xpath_eval('/results/type', xt_og_metadata) as varchar);
-
- -- Get the Facebook user ID of the object's creator
- og_id := cast (xpath_eval('/results/from/id', xt_og_metadata) as varchar);
- -- Has he/she granted an access token
- default_access_token := access_token;
- if (length (og_id))
- access_token := DB.DBA.OPENGRAPH_GET_ACCESS_TOKEN (og_id);
-
- if (access_token <> default_access_token)
- {
- -- Re-fetch the object's metadata
- -- Because this query includes an access token, any connection URIs in the returned metadata will
- -- include the creator's access token
- url := sprintf ('https://graph.facebook.com/%s?metadata=1', id);
- url := url || '&access_token=' || access_token;
- cnt := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- }
- -- Prevent DB.DBA.OPENGRAPH_OBJ_CONNECTIONS from appending the access token to the object's connection/collection URLs.
- -- The access token should already appended to these URLs in the returned metadata
- append_access_token_to_connections := 0;
- }
-
- tree := json_parse (cnt);
- xt_og_metadata := DB.DBA.SOCIAL_TREE_TO_XML (tree);
- og_object_type := cast (xpath_eval('/results/type', xt_og_metadata) as varchar);
+;
- -- Transform the base OpenGraph object description to RDF
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fb_og2rdf.xsl', xt_og_metadata,
- vector ('baseUri', new_origin_uri, 'og_object_type', og_object_type));
- xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- -- May already have og_id
- if (og_id is null)
- {
- og_id := cast (xpath_eval('/results/id', xt_og_metadata) as varchar);
- if (length (og_id) > 0)
- access_token := DB.DBA.OPENGRAPH_GET_ACCESS_TOKEN (og_id);
- }
+create procedure DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
+{
+ declare qr, path any;
+ declare tree, xt, xt_og_metadata, xd, types, hdr any;
+ declare id, cnt, url, tmp, access_token, client_id, mime, client_secret, code varchar;
+ declare pos, ret, ord integer;
- retries := 0;
-retry_without_access_token:
- -- Try all the object's connections listed in the object metadata
- og_conns := DB.DBA.OPENGRAPH_OBJ_CONNECTIONS (xt_og_metadata, access_token, append_access_token_to_connections);
- page := 0;
+ declare og_object_type varchar; -- Type of Open Graph object being handled
+ declare og_id varchar; -- Open Graph object ID
+ declare og_conns any; -- Open Graph object's connections
+ declare og_err, og_headers any;
+ declare retries integer;
+ declare og_timeout integer; -- Timeout when accessing Open Graph collections
+ declare http_new_origin_uri varchar;
- -- batch request
- declare br, req, rtree any;
+ og_timeout := 60;
-next_page_batch:
- page := page + 1;
- more_pages := 0;
- br := '[';
- for (declare i int, i := 0; i < length (og_conns); i := i + 2)
+ declare exit handler for sqlstate '*'
{
- declare u, h any;
- if (og_conns[i + 1] is not null)
- {
- h := rfc1808_parse_uri (og_conns[i + 1]);
- h [0] := h [1] := '';
- u := vspx_uri_compose (h);
- br := br || sprintf ('{"method": "GET", "relative_url": "%s"},', subseq (u, 1));
- }
- }
- br := rtrim (br, ',') || ']';
- req := sprintf ('access_token=%U&batch=%U', access_token, br);
- cnt := http_get ('https://graph.facebook.com', og_headers, 'POST', null, req);
- rtree := json_parse (cnt);
-
- -- Transform each of the OpenGraph object's connections
- declare ibatch integer;
- ibatch := -1;
- for (declare i int, i := 0; i < length (og_conns); i := i + 2)
- {
- declare og_conn_type any;
-
- if (og_conns[i+1] is null)
- goto next_conn;
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ return 0;
+ };
- og_conn_type := og_conns[i];
- ibatch := ibatch + 1;
+ http_new_origin_uri := new_origin_uri;
+ if (subseq (new_origin_uri, 0, 5) = 'https')
+ http_new_origin_uri := 'http' || subseq (new_origin_uri, 5);
- if (og_conn_type = 'picture')
+ if (http_new_origin_uri like 'http://www.facebook.com/profile.php?id=%')
{
- declare og_picture_url varchar;
- og_picture_url := null;
- -- TO DO: Doesn't work - Why?
- -- cnt := http_client_ext (url=>og_conns[i+1], proxy=>get_keyword_ucase ('get:proxy', opts), headers=>og_headers, n_redirects=>5);
- cnt := http_client_ext (url=>og_conns[i+1], headers=>og_headers);
- if (aref (og_headers, 0) like '% 302%')
- {
- for (declare j int, j := 0; j < length (og_headers); j := j+1)
- {
- if (og_headers[j] like 'Location: %')
- {
- og_picture_url := subseq (trim(og_headers[j], '\r\n'), 10);
- goto got_picture_url;
- }
- }
- }
-got_picture_url:
- if (og_picture_url is not null)
- xt := xtree_doc (sprintf ('<results><picture>%s</picture></results>', og_picture_url));
- else
- xt := xtree_doc ('<results></results>');
+ tmp := sprintf_inverse (http_new_origin_uri, 'http://www.facebook.com/profile.php?id=%s', 0);
+ id := rtrim(tmp[0], '&/');
+ pos := strchr(id, '&');
+ if (pos > 0)
+ id := left(id, pos);
+ if (id is null)
+ return 0;
}
- else
+ else if (http_new_origin_uri like 'http://www.facebook.com/pages/%/%')
{
- cnt := get_keyword ('body', rtree[ibatch]);
- -- Batch requests are sometimes not always completely fulfilled
- if (cnt is not null)
- {
- tree := json_parse (cnt);
- xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
- }
+ tmp := sprintf_inverse (http_new_origin_uri, 'http://www.facebook.com/pages/%s/%s', 0);
+ id := rtrim(tmp[1], '&/');
+ pos := strchr(id, '?');
+ if (pos > 0)
+ id := left(id, pos);
+ if (id is null)
+ return 0;
}
- og_conns[i+1] := null; -- Assume no more pages are required for this connection
- og_err := cast (xpath_eval('results/error/type', xt) as varchar);
- if (og_err is null)
- {
- declare mode varchar;
- declare og_next_page varchar;
-
- mode := sprintf ('%s_%s', og_object_type, og_conn_type);
-
- -- Transform the OpenGraph connection output to RDF
- xt2 := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fb_og2rdf.xsl', xt,
- vector ('baseUri', new_origin_uri, 'og_object_type', mode));
- xd := serialize_to_UTF8_xml (xt2);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
-
- -- Prepare to get next page of collection data
- --
- -- The page size used by the Graph API doesn't appear to be configurable.
- -- Two page sizes are routinely used:
- -- 25: for connections
- -- posts, statuses, links, notes, photos, albums, checkins
- -- 5000: for connections
- -- friends, interests, music, books, movies, games, likes
- --
- if (max_pages = 0 or (max_pages > 0 and page < max_pages))
- {
- og_next_page := cast (xpath_eval('/results/paging/next', xt) as varchar);
- if (og_next_page is not null)
- {
- declare page_size integer;
-
- page_size := 0;
- tmp := sprintf_inverse (og_next_page, '%slimit=%d&%s', 0);
- if (tmp is not null and tmp[1] is not null)
- page_size := tmp[1];
- if (page_size > 0 and (paging_page_size_limit = 0 or page_size < paging_page_size_limit))
- {
- og_conns[i+1] := og_next_page;
- more_pages := 1;
- }
- }
- }
+ else if (http_new_origin_uri like 'http://www.facebook.com/album.php?aid=%&id=%')
+ {
+ tmp := sprintf_inverse (http_new_origin_uri, 'http://www.facebook.com/album.php?aid=%s&id=%s', 0);
+ id := rtrim(tmp[1], '&/');
+ pos := strchr(id, '?');
+ if (pos > 0)
+ id := left(id, pos);
+ if (id is null)
+ return 0;
}
- else
+ else if (http_new_origin_uri like 'http://www.facebook.com/%')
{
- declare og_msg varchar;
- og_msg := cast (xpath_eval('results/error/message', xt) as varchar);
- if (retries = 0 and og_err = 'OAuthException' and
- (strstr (og_msg, 'Invalid OAuth access token') is not null or strstr (og_msg, 'Error validating access token') is not null))
- {
- -- Access token is invalid
- -- Even public connections will fail if tried with an invalid access token
- -- Retry the connections without an access token, allowing connections which
- -- require one to quietly fail
- access_token := null;
- retries := 1;
- goto retry_without_access_token;
- }
+ tmp := sprintf_inverse (http_new_origin_uri, 'http://www.facebook.com/%s', 0);
+ id := rtrim(tmp[0], '&/');
+ pos := strchr(id, '?');
+ if (pos > 0)
+ id := left(id, pos);
+ if (id is null)
+ return 0;
}
-next_conn:;
- }
- if (more_pages)
- goto next_page_batch;
+ else if (http_new_origin_uri like 'http://graph.facebook.com/%')
+ {
+ tmp := sprintf_inverse (http_new_origin_uri, 'http://graph.facebook.com/%s', 0);
+ id := rtrim(tmp[0], '&/');
+ pos := strchr(id, '?');
+ if (pos > 0)
+ id := left(id, pos);
+ if (id is null)
+ return 0;
+ }
+ else
+ {
+ url := concat('http://graph.facebook.com/?ids=', new_origin_uri, '&metadata=1');
+ cnt := http_client_ext (url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
+ if (hdr[0] not like 'HTTP/1._ 200 %')
+ {
+ signal ('22023', trim(hdr[0], '\r\n'), 'RDFXX');
+ return 0;
+ }
+ tree := json_parse (cnt);
+ if (tree is null)
+ return 0;
+ declare ses any;
+ ses := string_output ();
+ DB.DBA.SOCIAL_TREE_TO_XML_REC (tree, 'results', ses);
+ ses := string_output_string (ses);
+ xt := xtree_doc (ses, 2);
+ if (xpath_eval ('/results/document/type[ . = "link_stat"]', xt) is null)
+ {
+ xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fb_og2rdf.xsl', xt,
+ vector ('baseUri', new_origin_uri, 'og_object_type', 'general'));
+ xd := serialize_to_UTF8_xml (xt);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), 'http://graph.facebook.com/');
+ }
+ mime := get_keyword ('content-type', opts);
+ ord := (select RM_ID from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FACEBOOK_OPENGRAPH');
+ ret := 1;
+ for select RM_PATTERN, RM_TYPE, RM_HOOK from DB.DBA.SYS_RDF_MAPPERS where RM_ID > ord and RM_TYPE in ('URL', 'MIME') and RM_ENABLED = 1 order by RM_ID do
+ {
+ if (RM_TYPE = 'URL' and regexp_match (RM_PATTERN, new_origin_uri) is not null)
+ ret := 0;
+ else if (RM_TYPE = 'MIME' and mime is not null and RM_HOOK <> 'DB.DBA.RDF_LOAD_DAV_META' and regexp_match (RM_PATTERN, mime) is not null)
+ ret := 0;
+ }
+ return ret;
+ }
+ url := sprintf ('https://graph.facebook.com/%s?metadata=1', id);
+ cnt := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
+ tree := json_parse (cnt);
+ xt_og_metadata := DB.DBA.SOCIAL_TREE_TO_XML (tree);
+ og_object_type := cast (xpath_eval('/results/type', xt_og_metadata) as varchar);
+ -- Transform the base OpenGraph object description to RDF
+ xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fb_og2rdf.xsl', xt_og_metadata,
+ vector ('baseUri', new_origin_uri, 'og_object_type', og_object_type));
+ xd := serialize_to_UTF8_xml (xt);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ og_id := cast (xpath_eval('/results/id', xt_og_metadata) as varchar);
+ if (length (og_id) = 0)
+ og_id := null;
+ access_token := DB.DBA.OPENGRAPH_GET_ACCESS_TOKEN (og_id);
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
- return 1;
+ -- dbg_printf('og_id: %s - access token: %s', og_id, access_token);
+
+ retries := 0;
+retry_without_access_token:
+ -- Try all the object's connections listed in the object metadata
+ og_conns := DB.DBA.OPENGRAPH_OBJ_CONNECTIONS (xt_og_metadata, access_token);
+ -- Transform each of the OpenGraph object's connections
+ for (declare i int, i := 0; i < length (og_conns); i := i + 2)
+ {
+ if (og_conns[i] = 'picture')
+ {
+ declare og_picture_url varchar;
+ og_picture_url := null;
+ -- TO DO: Doesn't work - Why?
+ -- cnt := http_client_ext (url=>og_conns[i+1], proxy=>get_keyword_ucase ('get:proxy', opts), headers=>og_headers, n_redirects=>5);
+ cnt := http_client_ext (url=>og_conns[i+1], headers=>og_headers);
+ if (aref (og_headers, 0) like '% 302%')
+ {
+ for (declare j int, j := 0; j < length (og_headers); j := j+1)
+ {
+ -- dbg_printf ('og_header[%d] = %s', j, og_headers[j]);
+ if (og_headers[j] like 'Location: %')
+ {
+ og_picture_url := subseq (trim(og_headers[j], '\r\n'), 10);
+ goto got_picture_url;
+ }
+ }
+ }
+got_picture_url:
+ if (og_picture_url is not null)
+ xt := xtree_doc (sprintf ('<results><picture>%s</picture></results>', og_picture_url));
+ else
+ xt := xtree_doc ('<results></results>');
+ }
+ else
+ {
+ -- Some of the Open Graph collections occasionally fail to respond, so set timeout
+ cnt := http_client (og_conns[i+1], proxy=>get_keyword_ucase ('get:proxy', opts), timeout=>og_timeout);
+ tree := json_parse (cnt);
+ xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
+ }
+ og_err := cast (xpath_eval('results/error/type', xt) as varchar);
+ if (og_err is null)
+ {
+ declare mode varchar;
+ mode := sprintf ('%s_%s', og_object_type, og_conns[i]);
+ -- Transform the OpenGraph connection output to RDF
+ xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fb_og2rdf.xsl', xt,
+ vector ('baseUri', new_origin_uri, 'og_object_type', mode));
+ xd := serialize_to_UTF8_xml (xt);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ }
+ else
+ {
+ declare og_msg varchar;
+ og_msg := cast (xpath_eval('results/error/message', xt) as varchar);
+ if (retries = 0 and og_err = 'OAuthException' and
+ (strstr (og_msg, 'Invalid OAuth access token') is not null or strstr (og_msg, 'Error validating access token') is not null))
+ {
+ -- Access token is invalid
+ -- Even public connections will fail if tried with an invalid access token
+ -- Retry the connections without an access token, allowing connections which
+ -- require one to quietly fail
+ access_token := null;
+ retries := 1;
+ -- dbg_printf ('\nAccess token invalid - Retrying without one\n');
+ goto retry_without_access_token;
+ }
+ }
+conn_done:
+ ;
+ }
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ return 1;
}
;
-- Extracts an Open Graph object's connections from XML tree containing the object's metadata
-- Returns vector of (connection name, connection uri) pairs
-create procedure DB.DBA.OPENGRAPH_OBJ_CONNECTIONS (in xt any, in access_token varchar, in append_access_token integer)
+create procedure DB.DBA.OPENGRAPH_OBJ_CONNECTIONS (in xt any, in access_token varchar)
{
declare og_conns, conns any;
declare conn_str, token_str varchar;
token_str := '';
- if (append_access_token and access_token is not null and length (access_token) > 0)
+ if (access_token is not null and length (access_token) > 0)
token_str := '?access_token=' || access_token;
og_conns := vector();
@@ -3937,114 +3536,62 @@ create procedure DB.DBA.OPENGRAPH_GET_ACCESS_TOKEN (in og_id varchar)
access_token := null;
- if (length (og_id) > 0)
- {
- -- First look for a non-expiring access token.
- -- Facebook grants the same access token in response to repeated requests for a
- -- non-expiring token for a particular Facebook app by the same user.
- -- If more than one non-expiring access token exists in OPENGRAPH_ACCESS_TOKENS
- -- for the same combination of user (and app), all but the most recent
- -- are assumed to have been revoked by the user and hence be invalid.
- for (select top 1
+ if (og_id is null or length (og_id) = 0)
+ return null;
+
+ -- First look for a non-expiring access token.
+ -- Facebook grants the same access token in response to repeated requests for a
+ -- non-expiring token for a particular Facebook app by the same user.
+ -- If more than one non-expiring access token exists in OPENGRAPH_ACCESS_TOKENS
+ -- for the same combination of user (and app), all but the most recent
+ -- are assumed to have been revoked by the user and hence be invalid.
+ for (select top 1
OGAT_ACCESS_TOKEN as _token
from
DB.DBA.OPENGRAPH_ACCESS_TOKENS
where
- OGAT_GRANTOR_ID = og_id and OGAT_EXPIRES is null and OGAT_APP_SITE_URL like '%facebook_oauth/'
+ OGAT_GRANTOR_ID = og_id and OGAT_EXPIRES is null
order by OGAT_CREATED desc
)
- do
- {
- access_token := _token;
- }
+ do
+ {
+ access_token := _token;
+ }
- if (access_token is not null)
- return access_token;
+ if (access_token is not null)
+ return access_token;
- -- Then look for an unexpired expiring access token
- for (select top 1
+ -- Then look for an unexpired expiring access token
+ for (select top 1
OGAT_ACCESS_TOKEN as _token
from
DB.DBA.OPENGRAPH_ACCESS_TOKENS
where
- OGAT_GRANTOR_ID = og_id and OGAT_EXPIRES > now() and OGAT_APP_SITE_URL like '%facebook_oauth/'
+ OGAT_GRANTOR_ID = og_id and OGAT_EXPIRES > now()
)
- do
- {
- access_token := _token;
- }
+ do
+ {
+ access_token := _token;
+ }
- if (access_token is not null)
- return access_token;
+ if (access_token is not null)
+ return access_token;
- -- Use any available non-expiring access token to sign requests
- for (select top 1
+ -- Use any available non-expiring access token to sign requests
+ for (select top 1
OGAT_ACCESS_TOKEN as _token
from
DB.DBA.OPENGRAPH_ACCESS_TOKENS
where
- OGAT_EXPIRES is null and OGAT_APP_SITE_URL like '%facebook_oauth/'
+ OGAT_EXPIRES is null
order by OGAT_CREATED desc
)
- do
- {
- access_token := _token;
- }
-
- return access_token;
- }
- else
- {
- declare access_tokens any;
- access_tokens := (select DB.DBA.VECTOR_AGG(OGAT_ACCESS_TOKEN) from DB.DBA.OPENGRAPH_ACCESS_TOKENS
- where OGAT_APP_SITE_URL like '%facebook_oauth/'
- order by OGAT_CREATED desc);
- return access_tokens;
- }
-}
-;
-
-create procedure DB.DBA.OPENGRAPH_CHECK_ACCESS_TOKENS ()
-{
- -- Checks for invalid access tokens:
- -- After granting a token, a user may subsequently have revoked it by opting to deny the Sponger Facebook application access to their profile,
- -- or they may have changed their password.
-
- declare token_test_url_template, url, cnt varchar;
- declare tree, xt, hdr any;
- -- declare grantor_id, access_token any;
-
- if (not exists( select top 1 1 from DB.DBA.SYS_COLS where upper("TABLE") = 'DB.DBA.OPENGRAPH_ACCESS_TOKENS' and upper("COLUMN") = 'OGAT_TOKEN_INVALID'))
+ do
{
- log_message ('%s: Update RDF Mappers VAD or run RM_UPGRADE_TBL (''DB.DBA.OPENGRAPH_ACCESS_TOKENS'', ''OGAT_TOKEN_INVALID'', ''integer default 0'')', current_proc_name());
- return;
+ access_token := _token;
}
- -- Not all Graph API connections require an access token; photos does.
- token_test_url_template := 'https://graph.facebook.com/%s/photos?access_token=%s';
- for (select OGAT_GRANTOR_ID as grantor_id, OGAT_ACCESS_TOKEN as access_token from DB.DBA.OPENGRAPH_ACCESS_TOKENS where OGAT_TOKEN_INVALID is null or OGAT_TOKEN_INVALID = 0) do
- {
- url := sprintf (token_test_url_template, grantor_id, access_token);
- cnt := http_client_ext (url, headers=>hdr);
- -- Invalid tokens result in HTTP/1.1 400 Bad Request
- if (hdr[0] like 'HTTP/1._ 400 %')
- {
- tree := json_parse (cnt);
- if (tree is not null)
- {
- xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
- if (xpath_eval ('/results/error/type[. = "OAuthException"]', xt) is not null)
- {
- declare msg varchar;
- msg := cast (xpath_eval ('/results/error/message', xt) as varchar);
- if (strstr (msg, 'Error validating access token') is not null)
- {
- update DB.DBA.OPENGRAPH_ACCESS_TOKENS set OGAT_TOKEN_INVALID = 1 where OGAT_ACCESS_TOKEN = access_token;
- }
- }
- }
- }
- }
+ return access_token;
}
;
@@ -4111,7 +3658,7 @@ DB.DBA.VHOST_DEFINE (
is_default_host=>0
);
-create procedure DB.DBA.RDF_LOAD_ZOOPLA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_ZOOPLA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xt, xd any;
declare test int;
@@ -4120,7 +3667,7 @@ create procedure DB.DBA.RDF_LOAD_ZOOPLA (in graph_iri varchar, in new_origin_uri
return 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.zoopla.co.uk/property/%')
@@ -4167,20 +3714,20 @@ create procedure DB.DBA.RDF_LOAD_ZOOPLA (in graph_iri varchar, in new_origin_uri
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/zoopla2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
}
;
-create procedure DB.DBA.RDF_LOAD_ZILLOW (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_ZILLOW (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, url2, tmp, api_key, full_address, address, citystatezip, zpid, hdr any;
declare api_ret varchar;
declare iAve, iDr, iLn, iPl, iRd, iSt, iUnit, iWay, cAddrFlds, iFld, sSearch any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -4297,9 +3844,9 @@ create procedure DB.DBA.RDF_LOAD_ZILLOW (in graph_iri varchar, in new_origin_uri
xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/zillow2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar) ));
xd := serialize_to_UTF8_xml (xd);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
-- GetUpdatedPropertyDetails often returns error code 501:
-- "The updated data for the property you are requesting is not available due to legal restrictions"
@@ -4316,20 +3863,20 @@ create procedure DB.DBA.RDF_LOAD_ZILLOW (in graph_iri varchar, in new_origin_uri
xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/zillow2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar) ));
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url2);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url2);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_FRIENDFEED (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_FRIENDFEED (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif any;
asin := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://friendfeed.com/search?q=%')
@@ -4355,23 +3902,23 @@ create procedure DB.DBA.RDF_LOAD_FRIENDFEED (in graph_iri varchar, in new_origin
tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/atom2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/friendfeed2rdf.xsl', xt, vector ('baseUri', graph_iri, 'isDiscussion', 1));
xd := serialize_to_UTF8_xml (xd);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_TWFY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_TWFY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif any;
asin := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -4409,14 +3956,14 @@ create procedure DB.DBA.RDF_LOAD_TWFY (in graph_iri varchar, in new_origin_uri v
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/twfy2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_SLIDESIX (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_SLIDESIX (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xt, xd any;
declare developer_key_, username_, password_, url, tmp, ses, query varchar;
@@ -4427,7 +3974,7 @@ create procedure DB.DBA.RDF_LOAD_SLIDESIX (in graph_iri varchar, in new_origin_u
return 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
url := sprintf ('http://slidesix.com/api/SlideSix.cfc?method=authenticateUser&APIKEY=%s&LOGINUSER=%s&LOGINPASSWORD=%s&RETURNTYPE=XML', developer_key_, username_, md5(password_));
@@ -4450,9 +3997,9 @@ create procedure DB.DBA.RDF_LOAD_SLIDESIX (in graph_iri varchar, in new_origin_u
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/slidesix2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
@@ -4469,7 +4016,7 @@ create procedure slideshare_hex_sha1_digest(in str varchar)
}
;
-create procedure DB.DBA.RDF_LOAD_SLIDESHARE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_SLIDESHARE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare qr, path, hdr any;
declare test integer;
@@ -4487,7 +4034,7 @@ create procedure DB.DBA.RDF_LOAD_SLIDESHARE (in graph_iri varchar, in new_origin
return 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
ts := cast(datediff ('second', stringdate ('1970-1-1'), stringdate(datestring_GMT(now ()))) as varchar);
@@ -4559,14 +4106,14 @@ create procedure DB.DBA.RDF_LOAD_SLIDESHARE (in graph_iri varchar, in new_origin
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/slideshare2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_DISQUS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_DISQUS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare qr, path, hdr any;
declare test, pos integer;
@@ -4575,7 +4122,7 @@ create procedure DB.DBA.RDF_LOAD_DISQUS (in graph_iri varchar, in new_origin_uri
hdr := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://disqus.com/people/%')
@@ -4616,10 +4163,10 @@ create procedure DB.DBA.RDF_LOAD_DISQUS (in graph_iri varchar, in new_origin_uri
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/rss2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- --DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict, 1);
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ --DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri), 1);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
@@ -4658,13 +4205,13 @@ create procedure get_url2(in url varchar) returns varchar
}
;
-create procedure DB.DBA.RDF_LOAD_RHAPSODY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_RHAPSODY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, id, id2, indicators any;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.rhapsody.com/goto?%&variant=data')
@@ -4695,25 +4242,25 @@ create procedure DB.DBA.RDF_LOAD_RHAPSODY (in graph_iri varchar, in new_origin_u
}
else
return 0;
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/rhapsody2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_TESCO (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_TESCO (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, tmp, id, ses, hdr, tree any;
declare email_, password_, developer_key_, application_key_, session_key_, url varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
email_ := get_keyword ('email', opts);
@@ -4760,20 +4307,20 @@ create procedure DB.DBA.RDF_LOAD_TESCO (in graph_iri varchar, in new_origin_uri
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/tesco2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_IDIOMAG (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_IDIOMAG (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, urls, url, tmp, id, id2, indicators any;
declare pos, i, l int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
urls := vector();
@@ -4810,7 +4357,7 @@ create procedure DB.DBA.RDF_LOAD_IDIOMAG (in graph_iri varchar, in new_origin_ur
else
return 0;
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
for (i := 0, l := length (urls); i < l; i := i + 1)
{
url := urls[i];
@@ -4818,20 +4365,20 @@ create procedure DB.DBA.RDF_LOAD_IDIOMAG (in graph_iri varchar, in new_origin_ur
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/idiomag2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
}
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_RADIOPOP (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_RADIOPOP (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, id, id2, indicators any;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.radiopop.co.uk/users/%')
@@ -4873,15 +4420,15 @@ create procedure DB.DBA.RDF_LOAD_RADIOPOP (in graph_iri varchar, in new_origin_u
}
else
return 0;
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/radiopop2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'user', id ));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
else
@@ -4889,14 +4436,14 @@ create procedure DB.DBA.RDF_LOAD_RADIOPOP (in graph_iri varchar, in new_origin_u
}
;
-create procedure DB.DBA.RDF_LOAD_DISCOGS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_DISCOGS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif any;
declare pos integer;
asin := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -4947,20 +4494,20 @@ create procedure DB.DBA.RDF_LOAD_DISCOGS (in graph_iri varchar, in new_origin_ur
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/discogs2rdf.xsl', xd,
vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_LIBRARYTHING (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_LIBRARYTHING (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, id any;
id := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -4994,14 +4541,14 @@ create procedure DB.DBA.RDF_LOAD_LIBRARYTHING (in graph_iri varchar, in new_orig
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/lt2rdf.xsl', xd,
vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_ISBN (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_ISBN (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif, books any;
declare is_book integer;
@@ -5009,7 +4556,7 @@ create procedure DB.DBA.RDF_LOAD_ISBN (in graph_iri varchar, in new_origin_uri v
is_book := 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -5108,14 +4655,14 @@ create procedure DB.DBA.RDF_LOAD_ISBN (in graph_iri varchar, in new_origin_uri v
}
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/isbn2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_MEETUP2(in url varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, in what_ varchar, in base varchar, inout opts any, in triple_dict any := null) returns integer
+create procedure DB.DBA.RDF_LOAD_MEETUP2(in url varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, in what_ varchar, in base varchar, inout opts any) returns integer
{
declare xt, xd, hdr any;
declare tmp, test1, test2 varchar;
@@ -5124,26 +4671,26 @@ create procedure DB.DBA.RDF_LOAD_MEETUP2(in url varchar, in new_origin_uri varch
tmp := http_client_ext (url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
if (not length (hdr) or hdr[0] not like 'HTTP/1._ 200 %')
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, 'API call failed:' || hdr[0]);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, 'API call failed:' || hdr[0]);
return 0;
}
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/meetup2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'base', base, 'what', what_ ));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, hdr, id0, id1, id2, id3, id4, id5, id6 any;
declare pos, len int;
declare xsl2, what_, base varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -5174,7 +4721,7 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
id0 := tmp[0];
if (id0 is null or (id0 = 'www' and id1 is null))
return 0;
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
if (id0 = 'www')
{
if (id1 = 'cities')
@@ -5199,14 +4746,14 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
else
return 0;
url := concat(url, '&key=', api_key );
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
if (id1 = 'members' and id2 is not null)
{
base := concat('http://www.meetup.com/members/', id2, '/');
url := concat('http://api.meetup.com/members.xml/?member_id=', id2, '&key=', api_key);
what_ := 'member';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
else
{
@@ -5215,7 +4762,7 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
{
url := concat('http://api.meetup.com/members.xml/?group_urlname=', id1, '&key=', api_key);
what_ := 'members';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
else if (id1 is not null and id2 = 'calendar')
{
@@ -5223,38 +4770,38 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
{
url := concat('http://api.meetup.com/events.xml/?group_urlname=', id1, '&key=', api_key);
what_ := 'events';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
else
{
url := concat('http://api.meetup.com/events.xml/?id=', id3, '&key=', api_key);
what_ := 'event';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
}
else if (id1 is not null and id2 = 'photos')
{
url := concat('http://api.meetup.com/photos.xml/?group_urlname=', id1, '&key=', api_key);
what_ := 'photos';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
else
{
url := sprintf('http://api.meetup.com/groups.xml/?group_urlname=%s&key=%s', id1, api_key);
what_ := 'groups';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := concat('http://api.meetup.com/members.xml/?group_urlname=', id1, '&key=', api_key);
what_ := 'members';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := concat('http://api.meetup.com/events.xml/?group_urlname=', id1, '&key=', api_key);
what_ := 'events';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := sprintf('http://api.meetup.com/comments.xml/?group_urlname=%s&key=%s', id1, api_key);
what_ := 'comments';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
}
}
@@ -5282,7 +4829,7 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
else
return 0;
url := concat(url, '&key=', api_key );
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
else
{
@@ -5291,13 +4838,13 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
{
url := concat('http://api.meetup.com/members.xml/?topic=', id0, '&groupnum=', id1, '&key=', api_key);
what_ := 'members';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
if (id1 is not null and id2 = 'photos')
{
url := concat('http://api.meetup.com/photos.xml/?topic=', id0, '&groupnum=', id1, '&key=', api_key);
what_ := 'photos';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
if (id1 is not null and id2 = 'calendar')
{
@@ -5305,14 +4852,14 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
{
url := concat('http://api.meetup.com/events.xml/?topic=', id0, '&groupnum=', id1, '&key=', api_key);
what_ := 'events';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
else
{
base := concat(trim(new_origin_uri, '/'), '/');
url := concat('http://api.meetup.com/events.xml/?id=', id3, '&key=', api_key);
what_ := 'event';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
}
if (id1 is null or id1 = '')
@@ -5321,37 +4868,37 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
url := sprintf('http://api.meetup.com/groups.xml/?topic=%s&key=%s', id0, api_key);
what_ := 'groups';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := concat('http://api.meetup.com/members.xml/?topic=', id0, '&key=', api_key);
what_ := 'members';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := concat('http://api.meetup.com/events.xml/?topic=', id0, '&key=', api_key);
what_ := 'events';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := concat('http://api.meetup.com/comments.xml/?topic=', id0, '&key=', api_key);
what_ := 'comments';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
else
{
url := sprintf('http://api.meetup.com/groups.xml/?topic=%s&groupnum=%s&key=%s', id0, id1, api_key);
what_ := 'groups';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := concat('http://api.meetup.com/members.xml/?topic=', id0, '&groupnum=', id1, '&key=', api_key);
what_ := 'members';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := concat('http://api.meetup.com/events.xml/?topic=', id0, '&groupnum=', id1, '&key=', api_key);
what_ := 'events';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
url := concat('http://api.meetup.com/comments.xml/?topic=', id0, '&groupnum=', id1, '&key=', api_key);
what_ := 'comments';
- DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MEETUP2(url, new_origin_uri, dest, graph_iri, what_, base, opts);
}
}
}
@@ -5360,7 +4907,7 @@ create procedure DB.DBA.RDF_LOAD_MEETUP (in graph_iri varchar, in new_origin_uri
}
;
-create procedure DB.DBA.RDF_LOAD_LASTFM2 (in url varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_LASTFM2 (in url varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any)
returns integer
{
declare xt, xd any;
@@ -5369,14 +4916,14 @@ create procedure DB.DBA.RDF_LOAD_LASTFM2 (in url varchar, in new_origin_uri varc
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/lastfm2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- --RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ --RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, tmp1, server, api_key, hdr, gr_iri any;
declare pos, len int;
@@ -5388,7 +4935,7 @@ create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri
id4 := '';
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -5421,7 +4968,7 @@ create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri
id0 := tmp[0];
else
return 0;
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
if (id0 = 'music')
{
if (id1 is not null and id1 <> '')
@@ -5430,70 +4977,70 @@ create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri
{
if (id3 is not null and id3 <> '')
{
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=track.getinfo&api_key=%s&artist=%s&track=%s', api_key, id1, id3);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=track.getsimilar&artist=%s&track=%s&api_key=%s', id1, id3, api_key);
- return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
}
else
{
if (strchr(id2, '+') = 0) -- todo: perhaps it needs some processing?
{
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getevents&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getsimilar&artist=%s&api_key=%s', id1, api_key);
- return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
}
else if (id1 = '+noredirect')
{
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=%s&api_key=%s', id2, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&artist=%s&api_key=%s', id2, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getevents&artist=%s&api_key=%s', id2, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getsimilar&artist=%s&api_key=%s', id2, api_key);
- return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
}
else
{
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=%s&artist=%s&album=%s', api_key, id1, id2);
- return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
}
}
}
else
{
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getevents&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getsimilar&artist=%s&api_key=%s', id1, api_key);
- return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
}
}
else
@@ -5503,19 +5050,19 @@ create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri
{
if (id1 is not null and id1 <> '')
{
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getevents&artist=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=artist.getsimilar&artist=%s&api_key=%s', id1, api_key);
- return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
}
else
return 0;
@@ -5527,10 +5074,10 @@ create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri
pos := strchr(id1, '+');
if (pos > 0)
id1 := left(id1, pos);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=event.getinfo&event=%s&api_key=%s', id1, api_key);
- return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ return DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
}
else
return 0;
@@ -5539,28 +5086,28 @@ create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri
{
if (id1 is not null and id1 <> '' and (id2 = '' or id2 is null))
{
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('http://ws.audioscrobbler.com/1.0/user/%s/profile.xml', id1);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=user.getfriends&user=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=user.gettopalbums&user=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=user.gettopartists&user=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=user.gettoptracks&user=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
url := sprintf('http://ws.audioscrobbler.com/2.0/?method=user.getplaylists&user=%s&api_key=%s', id1, api_key);
- DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ DB.DBA.RDF_LOAD_LASTFM2(url, new_origin_uri, dest, graph_iri, opts);
tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
xd := xtree_doc (tmp);
@@ -5576,8 +5123,8 @@ create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/lastfm2rdf.xsl', xd, vector ('baseUri', RDF_SPONGE_DOC_IRI (new_origin_uri), 'id', x));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url2);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url2);
}
}
else if (id1 is not null and id1 <> '' and (id2 = 'library' and id3 = 'playlists' and id4 <> '' and id4 is not null))
@@ -5593,14 +5140,14 @@ create procedure DB.DBA.RDF_LOAD_LASTFM (in graph_iri varchar, in new_origin_uri
}
;
-create procedure DB.DBA.RDF_LOAD_PICASA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_PICASA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, img_id, hdr, exif any;
declare album_name, user_name varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (
@@ -5649,9 +5196,9 @@ create procedure DB.DBA.RDF_LOAD_PICASA (in graph_iri varchar, in new_origin_uri
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/picasa2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
else
@@ -5662,13 +5209,13 @@ create procedure DB.DBA.RDF_LOAD_PICASA (in graph_iri varchar, in new_origin_uri
}
;
-create procedure DB.DBA.RDF_LOAD_GEONAMES (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GEONAMES (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, geo_id any;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%.geonames.org/%')
@@ -5686,20 +5233,20 @@ create procedure DB.DBA.RDF_LOAD_GEONAMES (in graph_iri varchar, in new_origin_u
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/geonames2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_VIMEO (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_VIMEO (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, hdr, id any;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://vimeo.com/%')
@@ -5729,21 +5276,21 @@ create procedure DB.DBA.RDF_LOAD_VIMEO (in graph_iri varchar, in new_origin_uri
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/vimeo2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_YOUTUBE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_YOUTUBE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, img_id, hdr, exif any;
declare xsl2, user_id varchar;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -5799,8 +5346,8 @@ create procedure DB.DBA.RDF_LOAD_YOUTUBE (in graph_iri varchar, in new_origin_ur
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/youtube2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
else
@@ -5810,21 +5357,21 @@ create procedure DB.DBA.RDF_LOAD_YOUTUBE (in graph_iri varchar, in new_origin_ur
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || xsl2, xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_DIGG (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_DIGG (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, section_name, search, xt, url, tmp, story_url, appkey any;
story_url := '';
appkey := 'http://www.openlinksw.com/virtuoso';
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://digg.com/search?%')
@@ -5840,10 +5387,10 @@ create procedure DB.DBA.RDF_LOAD_DIGG (in graph_iri varchar, in new_origin_uri v
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/rss2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'isDiscussion', '1'));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- --DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict, 1);
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ --DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri), 1);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
else if (new_origin_uri like 'http://digg.com/%')
@@ -5861,9 +5408,9 @@ create procedure DB.DBA.RDF_LOAD_DIGG (in graph_iri varchar, in new_origin_uri v
story_url := cast (xpath_eval ('string (/stories/story/@href)', xd) as varchar);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/digg2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
url := sprintf ('http://services.digg.com/story/%s/comments?count=%s&appkey=%U', id, comm, appkey);
tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
goto diggsvc;
@@ -5884,9 +5431,9 @@ create procedure DB.DBA.RDF_LOAD_DIGG (in graph_iri varchar, in new_origin_uri v
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/digg2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'storyUrl', story_url));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
ret:
@@ -5894,7 +5441,7 @@ ret:
}
;
-create procedure DB.DBA.RDF_LOAD_GROUPON (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GROUPON (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, section_name, search, xt, url, tmp any;
declare entity varchar;
@@ -5902,7 +5449,7 @@ create procedure DB.DBA.RDF_LOAD_GROUPON (in graph_iri varchar, in new_origin_ur
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -5934,15 +5481,14 @@ create procedure DB.DBA.RDF_LOAD_GROUPON (in graph_iri varchar, in new_origin_ur
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/groupon2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-
-create procedure DB.DBA.RDF_LOAD_EOL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_EOL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, section_name, search, xt, url, tmp any;
declare entity varchar;
@@ -5950,7 +5496,7 @@ create procedure DB.DBA.RDF_LOAD_EOL (in graph_iri varchar, in new_origin_uri va
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.eol.org/pages/%')
@@ -5973,20 +5519,20 @@ create procedure DB.DBA.RDF_LOAD_EOL (in graph_iri varchar, in new_origin_uri va
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/eol2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_OHLOH (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_OHLOH (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, section_name, search, xt, url, tmp any;
declare entity, resource_url, person_iri, docproxy_iri varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://rdfohloh.wikier.org/%/%')
@@ -6016,20 +5562,20 @@ create procedure DB.DBA.RDF_LOAD_OHLOH (in graph_iri varchar, in new_origin_uri
tmp := replace(tmp, concat('\"', url, '/rdf\"'), concat('\"', docproxy_iri, '\"'));
tmp := replace(tmp, concat('\"', url, '\"'), concat('\"', resource_url, '\"'));
tmp := replace(tmp, concat('\"', url, '#person\"'), concat('\"', person_iri, '\"'));
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, tmp, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (tmp, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_DELICIOUS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_DELICIOUS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, section_name, search, xt, url, tmp any;
declare what varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%del.icio.us/tags/%' or new_origin_uri like 'http://%delicious.com/tags/%' or new_origin_uri like 'http://feeds.delicious.com/v2/rss/tags/%')
@@ -6069,9 +5615,9 @@ create procedure DB.DBA.RDF_LOAD_DELICIOUS (in graph_iri varchar, in new_origin_
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/delicious2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'what', what));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
declare result, meta, state, message any;
state := '00000';
exec (sprintf('sparql select ?l from <%s> where { <%s> <http://scot-project.org/scot/ns#name> ?l }', graph_iri, graph_iri), state, message, vector (), 0, meta, result);
@@ -6104,7 +5650,7 @@ create procedure DB.DBA.RDF_LOAD_DELICIOUS (in graph_iri varchar, in new_origin_
}
;
-create procedure DB.DBA.RDF_LOAD_GOOGLE_DOCUMENT (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOOGLE_DOCUMENT (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif any;
declare pos int;
@@ -6114,7 +5660,7 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_DOCUMENT (in graph_iri varchar, in new_o
pwd := get_keyword ('password', opts, null);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
auth_header := null;
@@ -6168,14 +5714,14 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_DOCUMENT (in graph_iri varchar, in new_o
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/google_document2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_GOOGLE_SPREADSHEET (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOOGLE_SPREADSHEET (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xd2, host_part, xt, url, tmp, api_key, hdr, ids, exif any;
declare pos int;
@@ -6185,7 +5731,7 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_SPREADSHEET (in graph_iri varchar, in ne
pwd := get_keyword ('password', opts, null);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
auth_header := null;
@@ -6225,9 +5771,9 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_SPREADSHEET (in graph_iri varchar, in ne
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/google_spreadsheet2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'what', 'doc'));
xd2 := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd2, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd2, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
ids := xpath_eval ('/feed/entry/link[@rel="http://schemas.google.com/spreadsheets/2006#cellsfeed"]/@href', xd, 0);
foreach (any y in ids) do
@@ -6238,21 +5784,21 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_SPREADSHEET (in graph_iri varchar, in ne
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/google_spreadsheet2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'what', 'cells'));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
}
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_OREILLY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_OREILLY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif any;
declare pos int;
declare book_id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.oreilly.com/catalog/%')
@@ -6282,21 +5828,21 @@ create procedure DB.DBA.RDF_LOAD_OREILLY (in graph_iri varchar, in new_origin_ur
xd := xtree_doc (tmp, 2);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/oreilly2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar)));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_GOOGLE_BOOK (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOOGLE_BOOK (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif any;
declare pos int;
declare book_id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://books.google.com/books?id=%')
@@ -6317,21 +5863,21 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_BOOK (in graph_iri varchar, in new_origi
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/google_book2rdf.xsl',
xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_GOOGLE_PLACES (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOOGLE_PLACES (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, tree any;
declare pos int;
declare lat, lng, name, reference, item_id, ret_body varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (length (_key) = 0)
@@ -6376,9 +5922,9 @@ next_procedure:
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/google_place2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
else
@@ -6388,14 +5934,14 @@ next_procedure:
;
-create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, tree any;
declare pos int;
declare item_id, item_id2, action varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -6408,10 +5954,10 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE (in graph_iri varchar, in new_or
pos := strchr(item_id, '/');
if (pos is not null and pos <> 0)
item_id := left(item_id, pos);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('https://www.googleapis.com/buzz/v1/activities/%s/@self?key=%s', item_id, _key);
action := 'buzz';
- DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest);
}
else if (new_origin_uri like 'https://plus.google.com/%/about')
{
@@ -6422,10 +5968,10 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE (in graph_iri varchar, in new_or
pos := strchr(item_id, '/');
if (pos is not null and pos <> 0)
item_id := left(item_id, pos);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('https://www.googleapis.com/buzz/v1/people/%s/@self?alt=atom&pp=1&key=%s', item_id, _key);
action := 'about';
- DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest);
}
else if (new_origin_uri like 'https://plus.google.com/%/photos')
{
@@ -6436,10 +5982,10 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE (in graph_iri varchar, in new_or
pos := strchr(item_id, '/');
if (pos is not null and pos <> 0)
item_id := left(item_id, pos);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('https://www.googleapis.com/buzz/v1/photos/%s/@self?key=%s', item_id, _key);
action := 'photos';
- DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest);
}
else if (new_origin_uri like 'https://plus.google.com/%')
{
@@ -6455,19 +6001,19 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE (in graph_iri varchar, in new_or
else
return 0;
}
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
url := sprintf('https://www.googleapis.com/buzz/v1/people/%s/@self?alt=atom&pp=1&key=%s', item_id, _key);
action := 'about';
- DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest);
url := sprintf('https://www.googleapis.com/buzz/v1/people/%s/@groups/@following?key=%s', item_id, _key);
action := 'following';
- DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest);
url := sprintf('https://www.googleapis.com/buzz/v1/people/%s/@groups/@followers?key=%s', item_id, _key);
action := 'followers';
- DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest, triple_dict);
+ DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(url, action, opts, graph_iri, new_origin_uri, dest);
}
else
return 0;
@@ -6475,7 +6021,7 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE (in graph_iri varchar, in new_or
}
;
-create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(in url varchar, in action varchar, inout opts any, in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout triple_dict any)
+create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(in url varchar, in action varchar, inout opts any, in graph_iri varchar, in new_origin_uri varchar, in dest varchar)
{
declare xd, xt, tmp, hdr any;
tmp := http_client_ext (url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
@@ -6485,25 +6031,21 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PROFILE_REST(in url varchar, in action v
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/google_profile2rdf.xsl',
xd, vector ('baseUri', new_origin_uri, 'action', action));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
}
;
--- /* Google+ */
-create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
- declare xd, xd2, xt, api_urls, tmp, hdr any;
- declare url, base_url, people_api_url, activity_api_url any;
+ declare xd, xd2, xt, api_urls, tmp any;
+ declare url, people_api_url, activity_api_url any;
declare uid, post_id, api_mode varchar;
- declare max_activity_pages, items_per_activity_page integer;
- declare max_comment_pages, items_per_comment_page integer;
- declare page_token, post_url varchar;
- declare first_pass, next_page integer;
+ declare first_pass integer;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -6513,20 +6055,6 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS (in graph_iri varchar, in new_origi
return 0;
}
- -- max_activity_pages / max_comment_pages:
- -- 0 => no limit
- -- <0 => don't fetch activities / comments
- max_activity_pages := coalesce (atoi(get_keyword ('max_activity_pages', opts)), 1);
- max_comment_pages := coalesce (atoi(get_keyword ('max_comment_pages', opts)), 1);
-
- items_per_activity_page := coalesce (atoi(get_keyword ('items_per_activity_page', opts)), 50);
- if (items_per_activity_page <= 0 or items_per_activity_page > 100)
- items_per_activity_page := 100;
-
- items_per_comment_page := coalesce (atoi(get_keyword ('items_per_comment_page', opts)), 50);
- if (items_per_comment_page <= 0 or items_per_comment_page > 100)
- items_per_comment_page := 100;
-
--
-- Sponge G+ post/Activity directly
--
@@ -6540,51 +6068,28 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS (in graph_iri varchar, in new_origi
-- Using the search API https://developers.google.com/+/api/latest/activities/search to search
-- on the post ID is unreliable - often nothing is returned.
-- The approach used here is to retrieve and search the user's Activity collection for the
- -- required post.
+ -- required post. Without paging support, a maximum of 100 Activities is returned. An old
+ -- post may not be contained in the list of the 100 most recent.
uid := regexp_replace (new_origin_uri, '^https?://plus.google.com(/u/0)?/([0-9]{8,})(/.*)?', '\\2');
if (uid = new_origin_uri)
return 0;
-
url := sprintf ('https://www.googleapis.com/plus/v1/people/%s/activities/public?key=%s&maxResults=100', uid, _key);
- post_url := replace (new_origin_uri, 'http://', 'https://');
- base_url := url;
-
- next_page := 1;
- while (next_page > 0)
+ tmp := '';
+ tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
+ if (length (tmp) = 0)
{
- tmp := '';
- tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- if (length (tmp) = 0)
- {
- log_message (sprintf ('%s: Failed HTTP GET: %s', current_proc_name(), url));
- return 0;
- }
- tmp := json_parse (tmp);
- xd := DB.DBA.SOCIAL_TREE_TO_XML (tmp);
- activity_id := cast (xpath_eval (sprintf('/results/items/id[../url = "%s"]', post_url), xd) as varchar);
- if (activity_id is not null)
- {
- goto got_activity_id;
- }
-
- page_token := cast (xpath_eval ('/results/nextPageToken', xd) as varchar);
- if (length (page_token))
- {
- next_page := next_page + 1;
- url := sprintf ('%s&pageToken=%s', base_url, page_token);
- }
- else
- next_page := 0;
+ log_message (sprintf ('%s: Failed HTTP GET: %s', current_proc_name(), url));
+ return 0;
}
-
-got_activity_id:
+ tmp := json_parse (tmp);
+ xd := DB.DBA.SOCIAL_TREE_TO_XML (tmp);
+ activity_id := cast (xpath_eval (sprintf('/results/items/id[../url = "%s"]', new_origin_uri), xd) as varchar);
if (activity_id is null)
{
- log_message (sprintf ('%s: Couldn''t find post ID %s amongst the user''s posts', current_proc_name(), post_id));
+ log_message (sprintf ('%s: Couldn''t find post ID %s amongst the user''s 100 most recent', current_proc_name(), post_id));
return 0;
}
-
url := sprintf ('https://www.googleapis.com/plus/v1/activities/%s?key=%s', activity_id, _key);
tmp := '';
tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
@@ -6598,12 +6103,11 @@ got_activity_id:
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/googleplus2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'mode', 'activity'));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
- if (max_comment_pages >= 0)
- DB.DBA.RDF_LOAD_GOOGLE_PLUS_COMMENTS (graph_iri, new_origin_uri, dest, _key, opts, triple_dict, activity_id, null, items_per_comment_page, max_comment_pages);
+ DB.DBA.RDF_LOAD_GOOGLE_PLUS_COMMENTS (graph_iri, new_origin_uri, dest, _key, opts, activity_id);
return 1;
}
@@ -6614,34 +6118,21 @@ got_activity_id:
uid := regexp_replace (new_origin_uri, '^https?://plus.google.com(/u/0)?/([0-9]{8,})(/.*)?', '\\2');
if (uid = new_origin_uri)
return 0;
-
people_api_url := sprintf ('https://www.googleapis.com/plus/v1/people/%s?key=%s', uid, _key);
- activity_api_url := sprintf ('https://www.googleapis.com/plus/v1/people/%s/activities/public?key=%s&maxResults=%d', uid, _key, items_per_activity_page);
- api_urls := vector (vector (people_api_url, 'people'));
- if (max_activity_pages >= 0)
- api_urls := vector_concat (api_urls, vector( vector (activity_api_url, 'activity')));
+ activity_api_url := sprintf ('https://www.googleapis.com/plus/v1/people/%s/activities/public?key=%s&maxResults=100', uid, _key);
+ api_urls := vector (vector (people_api_url, 'people'), vector (activity_api_url, 'activity'));
first_pass := 1;
foreach (any pair in api_urls) do
{
url := pair[0];
api_mode := pair[1];
+ tmp := '';
+ tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
+ if (length (tmp) = 0)
+ return 0;
- next_page := 1;
- while (next_page > 0)
- {
- if (max_activity_pages > 0 and next_page > max_activity_pages)
- goto got_all_activity_pages;
-
- tmp := '';
- DB.DBA.RM_LOG_REQUEST (url, null, current_proc_name ());
- -- tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- tmp := http_client_ext (url=>url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
- DB.DBA.RM_LOG_RESPONSE (tmp, hdr);
- if (length (tmp) = 0)
- return 0;
-
- tmp := json_parse (tmp);
+ tmp := json_parse (tmp);
xd := DB.DBA.SOCIAL_TREE_TO_XML (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/googleplus2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'mode', api_mode));
@@ -6649,161 +6140,66 @@ got_activity_id:
if (first_pass)
{
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
first_pass := 0;
}
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd2, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd2, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
- if (api_mode = 'activity' and max_comment_pages >= 0)
+ if (api_mode = 'activity')
{
declare vReplies_urls any;
declare replies_url varchar;
- declare iReply integer;
- iReply := 0;
- vReplies_urls := xpath_eval ('/results/items/object/replies/selfLink', xd, 0);
- foreach (any replies_url_entry in vReplies_urls) do
- {
- iReply := iReply + 1;
- replies_url := cast (replies_url_entry as varchar);
- DB.DBA.RDF_LOAD_GOOGLE_PLUS_COMMENTS (graph_iri, new_origin_uri, dest, _key, opts, triple_dict, null, replies_url, items_per_comment_page, max_comment_pages);
- }
- }
-
- if (api_mode = 'activity')
- {
- page_token := cast (xpath_eval ('/results/nextPageToken', xd) as varchar);
- if (length (page_token))
- {
- next_page := next_page + 1;
- url := sprintf ('%s&pageToken=%s', pair[0], page_token);
- }
- else
- next_page := 0;
- }
- else
- next_page := 0; -- No paging required for api_mode = 'people'
- }
-
-got_all_activity_pages:;
- }
-
- url := sprintf('http://api.socialstatistics.com/1/users/show/%s.json', uid);
- tmp := '';
- tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- if (length (tmp) = 0)
- return 0;
- tmp := json_parse (tmp);
- xd := DB.DBA.SOCIAL_TREE_TO_XML (tmp);
- if (xpath_eval('results/error', xd) is null)
- {
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/socialstatistics2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
- xd2 := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd2, new_origin_uri, coalesce (dest, graph_iri));
- }
-
- return 1;
-}
-;
-
-create procedure DB.DBA.RDF_LOAD_SOCIALSTATISTICS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, inout triple_dict any := null)
-{
- declare xd, xd2, xt, api_urls, tmp any;
- declare url, people_api_url, activity_api_url any;
- declare item_id varchar;
- declare pos integer;
-
- declare exit handler for sqlstate '*'
- {
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
-
- if (new_origin_uri like 'http://socialstatistics.com/profile/%')
- {
- tmp := sprintf_inverse (new_origin_uri, 'http://socialstatistics.com/profile/%s', 0);
- item_id := trim(tmp[0], '/');
- if (item_id is null)
- return 0;
- pos := strchr(item_id, '/');
- if (pos is not null and pos <> 0)
- item_id := left(item_id, pos);
- url := sprintf('http://api.socialstatistics.com/1/users/show/%s.json', item_id);
- }
- tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- if (length (tmp) = 0)
- return 0;
- tmp := json_parse (tmp);
- xd := DB.DBA.SOCIAL_TREE_TO_XML (tmp);
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/socialstatistics2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
- xd2 := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd2, new_origin_uri, coalesce (dest, graph_iri));
- return 1;
+ vReplies_urls := xpath_eval ('/results/items/object/replies/selfLink', xd, 0);
+ foreach (any replies_url_entry in vReplies_urls) do
+ {
+ replies_url := cast (replies_url_entry as varchar);
+ DB.DBA.RDF_LOAD_GOOGLE_PLUS_COMMENTS (graph_iri, new_origin_uri, dest, _key, opts, null, replies_url);
+ }
+ }
+ }
+ return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS_COMMENTS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, in _key any, in opts any, inout triple_dict any,
+create procedure DB.DBA.RDF_LOAD_GOOGLE_PLUS_COMMENTS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, in _key any, in opts any,
in activity_id varchar, -- Used when sponging a G+ Post directly
- in replies_url varchar := null, -- Used when sponging an G+ Activities list
- in items_per_comment_page integer,
- in max_comment_pages integer
+ in replies_url varchar := null -- Used when sponging an G+ Activities list
)
{
- declare base_url, url, tmp, xd, xd2, xt any;
- declare page_token varchar;
- declare next_page integer;
+ declare url, tmp, xd, xt any;
if (activity_id is not null)
- url := sprintf ('https://www.googleapis.com/plus/v1/activities/%s/comments?key=%s&maxResults=%d', activity_id, _key, items_per_comment_page);
+ url := sprintf ('https://www.googleapis.com/plus/v1/activities/%s/comments?key=%s', activity_id, _key);
else if (replies_url is not null)
- url := sprintf ('%s?key=%s&maxResults=%d', replies_url, _key, items_per_comment_page);
+ url := sprintf ('%s?key=%s', replies_url, _key);
else
return;
-
- base_url := url;
- next_page := 1;
- while (next_page > 0)
+ tmp := '';
+ tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
+ if (length (tmp) = 0)
{
- if (max_comment_pages > 0 and next_page > max_comment_pages)
- goto got_all_comments_pages;
-
- tmp := '';
- tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
- if (length (tmp) = 0)
- {
- log_message (sprintf ('%s: Failed HTTP GET: %s', current_proc_name(), url));
- return;
- }
-
- tmp := json_parse (tmp);
- xd := DB.DBA.SOCIAL_TREE_TO_XML (tmp);
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/googleplus2rdf.xsl', xd,
- vector ('baseUri', new_origin_uri, 'mode', 'comment'));
- xd2 := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd2, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
-
- page_token := cast (xpath_eval ('/results/nextPageToken', xd) as varchar);
- if (length (page_token))
- {
- next_page := next_page + 1;
- url := sprintf ('%s&pageToken=%s', base_url, page_token);
- }
- else
- next_page := 0;
+ log_message (sprintf ('%s: Failed HTTP GET: %s', current_proc_name(), url));
+ return;
}
-got_all_comments_pages:;
+ tmp := json_parse (tmp);
+ xd := DB.DBA.SOCIAL_TREE_TO_XML (tmp);
+ xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/googleplus2rdf.xsl', xd,
+ vector ('baseUri', new_origin_uri, 'mode', 'comment'));
+ xd := serialize_to_UTF8_xml (xt);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
}
;
-create procedure DB.DBA.RDF_LOAD_ETSY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_ETSY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, tree any;
declare pos int;
declare item_id, action varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.etsy.com/people/%')
@@ -6849,21 +6245,21 @@ create procedure DB.DBA.RDF_LOAD_ETSY (in graph_iri varchar, in new_origin_uri v
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/etsy2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'action', action));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_GUARDIAN (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GUARDIAN (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, tree, methods any;
declare pos int;
declare item_id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.guardian.co.uk/politics/person/%')
@@ -6887,14 +6283,14 @@ create procedure DB.DBA.RDF_LOAD_GUARDIAN (in graph_iri varchar, in new_origin_u
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/guardian2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_SEEVL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_SEEVL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, tree, methods any;
declare pos int;
@@ -6904,7 +6300,7 @@ create procedure DB.DBA.RDF_LOAD_SEEVL (in graph_iri varchar, in new_origin_uri
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%seevl.net/entity/%')
@@ -6935,22 +6331,22 @@ create procedure DB.DBA.RDF_LOAD_SEEVL (in graph_iri varchar, in new_origin_uri
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/seevl2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'method', method));
xd := serialize_to_UTF8_xml (xt);
- --RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ --RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
}
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_TUMBLR (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_TUMBLR (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare _id, _id2 varchar;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%.tumblr.com' or new_origin_uri like 'http://%.tumblr.com/')
@@ -6985,20 +6381,20 @@ create procedure DB.DBA.RDF_LOAD_TUMBLR (in graph_iri varchar, in new_origin_uri
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/tumblr2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_WINE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_WINE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare wine_id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.wine.com/V6/%/wine/%/%')
@@ -7025,20 +6421,20 @@ create procedure DB.DBA.RDF_LOAD_WINE (in graph_iri varchar, in new_origin_uri v
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/wine2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_EVRI (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_EVRI (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare entity_id, _id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.evri.com/%/%')
@@ -7059,21 +6455,21 @@ create procedure DB.DBA.RDF_LOAD_EVRI (in graph_iri varchar, in new_origin_uri v
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/evri2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'entity', entity_id));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_PLANCAST (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_PLANCAST (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, exif, tree any;
declare entity_id, email_, password_, what_ varchar;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
email_ := get_keyword ('email', opts);
@@ -7110,21 +6506,21 @@ create procedure DB.DBA.RDF_LOAD_PLANCAST (in graph_iri varchar, in new_origin_u
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/plancast2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'type', what_));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_HYPERPUBLIC (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_HYPERPUBLIC (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, hdr, tree any;
declare entity_id, client_id, client_secret, action varchar;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
client_id := get_keyword ('client_id', opts);
@@ -7168,21 +6564,21 @@ create procedure DB.DBA.RDF_LOAD_HYPERPUBLIC (in graph_iri varchar, in new_origi
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/hyperpublic2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'action', action));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_UPCOMING (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_UPCOMING (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare entity_id, email_, password_ varchar;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://upcoming.yahoo.com/venue/%')
@@ -7218,14 +6614,14 @@ create procedure DB.DBA.RDF_LOAD_UPCOMING (in graph_iri varchar, in new_origin_u
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/upcoming2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'entity', entity_id));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_EVENTBRITE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_EVENTBRITE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare entity_id, app_key_, user_key_ varchar;
@@ -7236,7 +6632,7 @@ create procedure DB.DBA.RDF_LOAD_EVENTBRITE (in graph_iri varchar, in new_origin
return 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.eventbrite.com/event/%')
@@ -7268,14 +6664,14 @@ create procedure DB.DBA.RDF_LOAD_EVENTBRITE (in graph_iri varchar, in new_origin
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/eventbrite2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'entity', entity_id));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_EVENTFUL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_EVENTFUL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare entity_id, app_key_, user_key_ varchar;
@@ -7285,7 +6681,7 @@ create procedure DB.DBA.RDF_LOAD_EVENTFUL (in graph_iri varchar, in new_origin_u
return 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://eventful.com/%events/%E0-%')
@@ -7340,21 +6736,21 @@ create procedure DB.DBA.RDF_LOAD_EVENTFUL (in graph_iri varchar, in new_origin_u
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/eventful2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'entity', entity_id));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_SIMPLEGEO (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_SIMPLEGEO (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, tree any;
declare entity_id, consumer_key, consumer_secret, lat, lon, epoch varchar;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
consumer_key := get_keyword ('consumer_key', opts, null);
@@ -7380,21 +6776,21 @@ create procedure DB.DBA.RDF_LOAD_SIMPLEGEO (in graph_iri varchar, in new_origin_
xd := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/simplegeo2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'entity', entity_id));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_SEATGEEK (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_SEATGEEK (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, exif any;
declare entity_id, email_, password_ varchar;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http%://%seatgeek.com/%-tickets/%')
@@ -7412,21 +6808,21 @@ create procedure DB.DBA.RDF_LOAD_SEATGEEK (in graph_iri varchar, in new_origin_u
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/seatgeek2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_FOURSQUARE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_FOURSQUARE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, hdr, tree any;
declare entity_id, oauth_token varchar;
declare pos int;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
--email_ := get_keyword ('email', opts);
@@ -7484,21 +6880,21 @@ create procedure DB.DBA.RDF_LOAD_FOURSQUARE (in graph_iri varchar, in new_origin
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/foursquare2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'entity', entity_id));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_CNET (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_CNET (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif any;
declare pos int;
declare soft_id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.download.com/%/%.html%')
@@ -7564,21 +6960,21 @@ create procedure DB.DBA.RDF_LOAD_CNET (in graph_iri varchar, in new_origin_uri v
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/cnet2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar)));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_GOOGLE_STORE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOOGLE_STORE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif any;
declare pos int;
declare soft_id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.googlestore.com/%/%/%.axd%')
@@ -7610,14 +7006,14 @@ create procedure DB.DBA.RDF_LOAD_GOOGLE_STORE (in graph_iri varchar, in new_orig
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/google_store2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar)));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_GOWALLA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_GOWALLA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, tree, hdr, exif any;
declare pos int;
@@ -7630,7 +7026,7 @@ create procedure DB.DBA.RDF_LOAD_GOWALLA (in graph_iri varchar, in new_origin_ur
return 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://gowalla.com/spots/%')
@@ -7693,14 +7089,14 @@ create procedure DB.DBA.RDF_LOAD_GOWALLA (in graph_iri varchar, in new_origin_ur
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/gowalla2rdf.xsl', xt,
vector ('baseUri', new_origin_uri, 'what', what_));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_PROGRAMMABLEWEB (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_PROGRAMMABLEWEB (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, asin any;
declare pos int;
@@ -7708,7 +7104,7 @@ create procedure DB.DBA.RDF_LOAD_PROGRAMMABLEWEB (in graph_iri varchar, in new_o
return 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.programmableweb.com/mashup/%')
@@ -7743,9 +7139,9 @@ create procedure DB.DBA.RDF_LOAD_PROGRAMMABLEWEB (in graph_iri varchar, in new_o
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/programmableweb2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
@@ -7826,7 +7222,7 @@ create procedure DB.DBA.sign_request (in meth varchar := 'GET', in url varchar,
}
;
-create procedure DB.DBA.RDF_LOAD_YELP (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_YELP (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif, tree any;
declare pos int;
@@ -7834,7 +7230,7 @@ create procedure DB.DBA.RDF_LOAD_YELP (in graph_iri varchar, in new_origin_uri v
declare consumer_key, oauth_token, consumer_secret, oauth_secret varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
consumer_key := get_keyword ('consumer_key', opts, null);
@@ -7858,27 +7254,26 @@ create procedure DB.DBA.RDF_LOAD_YELP (in graph_iri varchar, in new_origin_uri v
}
else
return 0;
-dbg_obj_princ(url);
tmp := http_client (url, proxy=>get_keyword_ucase ('get:proxy', opts));
tree := json_parse (tmp);
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/yelp2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_REVYU (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_REVYU (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, hdr, exif any;
declare pos int;
declare link, user_id varchar;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%revyu.com/people/%')
@@ -7898,19 +7293,19 @@ create procedure DB.DBA.RDF_LOAD_REVYU (in graph_iri varchar, in new_origin_uri
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/revyu2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_BUGZILLA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_BUGZILLA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, host_part, xt, url, tmp, api_key, img_id, hdr, exif any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
tmp := sprintf_inverse (new_origin_uri, '%s://%s/show_bug.cgi?id=%s', 0);
@@ -7930,14 +7325,14 @@ create procedure DB.DBA.RDF_LOAD_BUGZILLA (in graph_iri varchar, in new_origin_u
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/bugzilla2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_OPENLIBRARY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_OPENLIBRARY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare qr, path any;
declare tree, xt, xd, types any;
@@ -7945,7 +7340,7 @@ create procedure DB.DBA.RDF_LOAD_OPENLIBRARY (in graph_iri varchar, in new_origi
declare pos integer;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
tmp := sprintf_inverse (new_origin_uri, 'http://openlibrary.org/b/%s', 0);
@@ -7964,14 +7359,14 @@ create procedure DB.DBA.RDF_LOAD_OPENLIBRARY (in graph_iri varchar, in new_origi
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/openlibrary2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_SOCIALGRAPH (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_SOCIALGRAPH (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare qr, path, hdr any;
declare tree, xt, xd, types any;
@@ -7979,7 +7374,7 @@ create procedure DB.DBA.RDF_LOAD_SOCIALGRAPH (in graph_iri varchar, in new_origi
hdr := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
url := new_origin_uri;
@@ -7988,9 +7383,9 @@ create procedure DB.DBA.RDF_LOAD_SOCIALGRAPH (in graph_iri varchar, in new_origi
xt := DB.DBA.SOCIAL_TREE_TO_XML (tree);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/sg2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
@@ -8090,100 +7485,12 @@ create procedure csv_to_xml (in s any)
}
;
-create procedure DB.DBA.RDF_LOAD_STACKOVERFLOW (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
-{
- declare xd, xt, url, kind, paramid, json, hdr, content any;
-
- declare exit handler for sqlstate '*'
- {
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
-
- kind:=regexp_substr('^http://(www.)?stackoverflow.com/(users|questions|comments)', new_origin_uri, 2);
- paramid:=regexp_substr('^http://(www.)?stackoverflow.com/(users|questions|comments)/([^/]+)', new_origin_uri, 3);
-
- -- https://api.stackexchange.com/2.0/questions/9430557?order=desc&sort=activity&site=stackoverflow
- url:=sprintf('https://api.stackexchange.com/2.0/%s/%s?site=stackoverflow.com&filter=withbody', kind, paramid);
- hdr:=null;
- DB.DBA.RM_LOG_REQUEST (url, null, current_proc_name ());
- content := http_get (url, hdr, 'GET', null, null, get_keyword_ucase ('get:proxy', opts));
- DB.DBA.RM_LOG_RESPONSE (content, hdr);
- xt := DB.DBA.MQL_TREE_TO_XML(json_parse(content));
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/stackoverflow2rdf.xsl', xt, vector('baseUri', new_origin_uri, 'kind', kind));
- xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
-
- if(kind='questions') {
- -- Get all answers as well
- url:=sprintf('https://api.stackexchange.com/2.0/questions/%s/answers?order=desc&site=stackoverflow&filter=withbody', paramid);
- hdr:=null;
- DB.DBA.RM_LOG_REQUEST (url, null, current_proc_name ());
- content := http_get (url, hdr, 'GET', null, null, get_keyword_ucase ('get:proxy', opts));
- DB.DBA.RM_LOG_RESPONSE (content, hdr);
- xt := DB.DBA.MQL_TREE_TO_XML(json_parse(content));
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/stackoverflow2rdf.xsl', xt, vector('baseUri', new_origin_uri, 'kind', 'answers'));
- xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- }
-
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
- return 1;
-}
-;
-
-create procedure DB.DBA.RDF_LOAD_ANGELLIST (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
-{
- declare xd, xt, urlpart, url, tree, json, hdr, content, success any;
-
- declare exit handler for sqlstate '*'
- {
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
-
- urlpart:=regexp_substr('^http://(www.)?angel.co/([^/]+)', new_origin_uri, 2);
-
- hdr:=null;
-
- -- is it a user (person)?
- url:='https://api.angel.co/1/users/search?slug=' || urlpart;
- DB.DBA.RM_LOG_REQUEST (url, null, current_proc_name ());
- content := http_get (url, hdr, 'GET', null, null, get_keyword_ucase ('get:proxy', opts));
- DB.DBA.RM_LOG_RESPONSE (content, hdr);
- tree := json_parse(content);
- xt := DB.DBA.MQL_TREE_TO_XML(tree);
- success:=cast( xpath_eval('count(/results/error)', xt) as integer );
- if(success=0) {
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/angellist2rdf.xsl', xt, vector('baseUri', new_origin_uri, 'type', 'Person'));
- xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- } else {
- -- is it a startup (company)?
- url:='https://api.angel.co/1/startups/search?slug=' || urlpart;
- DB.DBA.RM_LOG_REQUEST (url, null, current_proc_name ());
- content := http_get (url, hdr, 'GET', null, null, get_keyword_ucase ('get:proxy', opts));
- DB.DBA.RM_LOG_RESPONSE (content, hdr);
- tree := json_parse(content);
- xt := DB.DBA.MQL_TREE_TO_XML(tree);
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/angellist2rdf.xsl', xt, vector('baseUri', new_origin_uri, 'type', 'Organization'));
- xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- }
-
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
- return 1;
-}
-;
-
-create procedure DB.DBA.RDF_LOAD_CSV (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_CSV (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -8192,21 +7499,21 @@ create procedure DB.DBA.RDF_LOAD_CSV (in graph_iri varchar, in new_origin_uri va
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/csvxml2rdf.xsl', xt,
vector ('baseUri', new_origin_uri));
xd := blob_to_string_output (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_XRD_GENERIC (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_XRD_GENERIC (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp any;
declare exit handler for sqlstate '*'
{
-- dbg_printf('Error: [%s]', __SQL_MESSAGE);
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -8216,8 +7523,8 @@ create procedure DB.DBA.RDF_LOAD_XRD_GENERIC (in graph_iri varchar, in new_origi
xd:=blob_to_string_output(xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, COALESCE(DEST, GRAPH_IRI));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, COALESCE(DEST, GRAPH_IRI), null);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, COALESCE(DEST, GRAPH_IRI));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, COALESCE(DEST, GRAPH_IRI), null);
return 1;
}
;
@@ -8236,26 +7543,26 @@ grant execute on DB.DBA.XSLT_IRISPLIT to public;
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:IRISPLIT', 'DB.DBA.XSLT_IRISPLIT');
-create procedure DB.DBA.RDF_LOAD_SVG (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_SVG (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, img_id, hdr, exif any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
xd := xtree_doc (_ret_body);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/svg2rdf.xsl', xd, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_MS_DOCUMENT (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare meta, tmp varchar;
declare xt, xd any;
@@ -8271,8 +7578,8 @@ create procedure DB.DBA.RDF_LOAD_MS_DOCUMENT (in graph_iri varchar, in new_origi
xt := xtree_doc (meta);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/ms_doc2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
string_to_file (tmp, _ret_body, -2);
meta := unzip_file (tmp, 'docProps/core.xml');
file_delete (tmp, 1);
@@ -8281,15 +7588,15 @@ create procedure DB.DBA.RDF_LOAD_MS_DOCUMENT (in graph_iri varchar, in new_origi
xt := xtree_doc (meta);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/ms_doc2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_OO_DOCUMENT (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare meta, tmp varchar;
declare xt, xd any;
@@ -8304,76 +7611,76 @@ create procedure DB.DBA.RDF_LOAD_OO_DOCUMENT (in graph_iri varchar, in new_origi
xt := xtree_doc (meta);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/oo2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_OO_DOCUMENT2 (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare meta, tmp varchar;
declare xt, xd any;
xt := xtree_doc (_ret_body);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/fod2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_YAHOO_TRAFFIC_DATA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare meta, tmp varchar;
declare xt, xd any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
xt := xtree_doc (_ret_body);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/yahoo_trf2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_ICAL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare meta, tmp varchar;
declare xt, xd any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
xt := xml_tree_doc (DB.DBA.IMC_TO_XML (_ret_body));
xml_tree_doc_encoding (xt, 'UTF-8');
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/ics2rdf.xsl', xt, vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_WEBCAL (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
return DB.DBA.RDF_LOAD_ICAL (graph_iri, new_origin_uri, dest, _ret_body, aq, ps, _key, opts);
}
;
create procedure DB.DBA.RDF_LOAD_PRODUCTWIKI (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif any;
declare pos, is_sku, is_store integer;
@@ -8383,7 +7690,7 @@ create procedure DB.DBA.RDF_LOAD_PRODUCTWIKI (in graph_iri varchar, in new_origi
return 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%.productwiki.com/%')
@@ -8410,22 +7717,22 @@ create procedure DB.DBA.RDF_LOAD_PRODUCTWIKI (in graph_iri varchar, in new_origi
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/productwiki2rdf.xsl', xd,
vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_ZAPPOS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, asin, hdr, tree, exif any;
declare pos, is_sku, is_store integer;
asin := null;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://www.zappos.com/product/%')
@@ -8456,16 +7763,16 @@ create procedure DB.DBA.RDF_LOAD_ZAPPOS (in graph_iri varchar, in new_origin_uri
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/zappos2rdf.xsl', xt,
vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar)));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-- /* BestBuy */
create procedure DB.DBA.RDF_LOAD_BESTBUY (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, asin, hdr, exif any;
declare pos, is_sku, is_store integer;
@@ -8474,7 +7781,7 @@ create procedure DB.DBA.RDF_LOAD_BESTBUY (in graph_iri varchar, in new_origin_ur
is_store := 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://stores.bestbuy.com/%')
@@ -8556,9 +7863,9 @@ create procedure DB.DBA.RDF_LOAD_BESTBUY (in graph_iri varchar, in new_origin_ur
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/bestbuy2rdf.xsl', xd,
vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar), 'is_store', cast(is_store as varchar)));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
@@ -8579,7 +7886,7 @@ create procedure DB.DBA.RDF_LOAD_AMAZON_QRY_SGN (in canon any, in secret_key any
;
create procedure DB.DBA.RDF_LOAD_AMAZON_ARTICLE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare index1, xd, xd_utf8, xt, url, tmp, api_key, asin, hdr, exif, secret_key, datenow, canon, StringToSign, hmacKey, signed any;
declare pos, is_wish_list integer;
@@ -8589,7 +7896,7 @@ create procedure DB.DBA.RDF_LOAD_AMAZON_ARTICLE (in graph_iri varchar, in new_or
is_wish_list := 0;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%amazon.%/gp/product/product-description/%')
@@ -8602,13 +7909,12 @@ create procedure DB.DBA.RDF_LOAD_AMAZON_ARTICLE (in graph_iri varchar, in new_or
tmp := sprintf_inverse (new_origin_uri, 'http://%samazon.%s/gp/product/%s', 0);
asin := rtrim (tmp[2], '/');
}
- -- ListLookup operation, used for this URL pattern, has been deprecated
- -- else if (new_origin_uri like 'http://%amazon.%/gp/registry/wishlist/%')
- -- {
- -- tmp := sprintf_inverse (new_origin_uri, 'http://%samazon.%s/gp/registry/wishlist/%s', 0);
- -- asin := rtrim (tmp[2], '/');
- -- is_wish_list := 1;
- -- }
+ else if (new_origin_uri like 'http://%amazon.%/gp/registry/wishlist/%')
+ {
+ tmp := sprintf_inverse (new_origin_uri, 'http://%samazon.%s/gp/registry/wishlist/%s', 0);
+ asin := rtrim (tmp[2], '/');
+ is_wish_list := 1;
+ }
else if (new_origin_uri like 'http://%amazon.%/s?%')
{
tmp := sprintf_inverse (new_origin_uri, 'http://%samazon.%s/s?%skeywords=%s', 0);
@@ -8697,7 +8003,7 @@ create procedure DB.DBA.RDF_LOAD_AMAZON_ARTICLE (in graph_iri varchar, in new_or
secret_key := get_keyword ('secret_key', opts);
associate_key := get_keyword ('associate_key', opts);
}
- if ((0 = length (api_key)) or (0 = length (secret_key)) or (0 = length (associate_key)))
+ if ((0 = length (api_key)) or (0 = length (secret_key)))
return 0;
if (asin is null)
return 0;
@@ -8706,22 +8012,18 @@ create procedure DB.DBA.RDF_LOAD_AMAZON_ARTICLE (in graph_iri varchar, in new_or
-- Lowercase parameters will come after uppercase ones in the canonical query string.
if (is_wish_list = 1)
{
- -- Operation ListLookup has been deprecated
- -- canon := sprintf('AWSAccessKeyId=%s&AssociateTag=%s&Condition=All&ListId=%s&ListType=WishList&MerchantId=All&Operation=ListLookup&ResponseGroup=Large%%2CItemAttributes%%2COffers%%2CReviews&Service=AWSECommerceService&SignatureMethod=HmacSHA1&Timestamp=%s&Version=2011-08-01', api_key, associate_key, asin, datenow);
- return 0;
+ canon := sprintf('AWSAccessKeyId=%s&Condition=All&ListId=%s&ListType=WishList&MerchantId=All&Operation=ListLookup&ResponseGroup=Large%%2CItemAttributes%%2COffers%%2CReviews&Service=AWSECommerceService&SignatureMethod=HmacSHA1&Timestamp=%s', api_key, asin, datenow);
}
else if (is_wish_list = 2)
{
- canon := sprintf('AWSAccessKeyId=%s&AssociateTag=%s&Availability=Available&Condition=All&Keywords=%s&Operation=ItemSearch&ResponseGroup=Large%%2CItemAttributes%%2COffers%%2CReviews&SearchIndex=%s&Service=AWSECommerceService&SignatureMethod=HmacSHA1&Timestamp=%s&Version=2011-08-01', api_key, associate_key, asin, index1, datenow);
+ canon := sprintf('AWSAccessKeyId=%s&Availability=Available&Condition=All&Keywords=%s&MerchantId=All&Operation=ItemSearch&ResponseGroup=Large%%2CItemAttributes%%2COffers%%2CReviews&SearchIndex=%s&Service=AWSECommerceService&SignatureMethod=HmacSHA1&Timestamp=%s', api_key, asin, index1, datenow);
}
else
{
- canon := sprintf('AWSAccessKeyId=%s&AssociateTag=%s&Condition=All&ItemId=%s&Operation=ItemLookup&ResponseGroup=Large%%2CItemAttributes%%2COffers%%2CReviews&Service=AWSECommerceService&SignatureMethod=HmacSHA1&Timestamp=%s&Version=2011-08-01', api_key, associate_key, asin, datenow);
+ canon := sprintf('AWSAccessKeyId=%s&Condition=All&ItemId=%s&MerchantId=All&Operation=ItemLookup&ResponseGroup=Large%%2CItemAttributes%%2COffers%%2CReviews&Service=AWSECommerceService&SignatureMethod=HmacSHA1&Timestamp=%s', api_key, asin, datenow);
}
url := DB.DBA.RDF_LOAD_AMAZON_QRY_SGN (canon, secret_key);
- DB.DBA.RM_LOG_REQUEST (url, null, current_proc_name ());
tmp := http_client_ext (url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
- DB.DBA.RM_LOG_RESPONSE (tmp, hdr);
if (hdr[0] not like 'HTTP/1._ 200 %')
signal ('22023', trim(hdr[0], '\r\n'), 'RDFXX');
xd := xtree_doc (tmp);
@@ -8729,15 +8031,58 @@ create procedure DB.DBA.RDF_LOAD_AMAZON_ARTICLE (in graph_iri varchar, in new_or
vector ('baseUri', new_origin_uri, 'asin', asin, 'currentDateTime', cast(date_iso8601(now()) as varchar),
'wish_list', cast(is_wish_list as varchar), 'associate_key', associate_key));
xd_utf8 := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd_utf8, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ {
+ declare mlist varchar;
+ declare xdMerchants, merchantIds any;
+ declare strTmp varchar;
+ -- Extract the merchantIds contained in initial AWS query response
+ mlist := '';
+ merchantIds := xpath_eval('//Offer/Merchant/MerchantId', xd, 0);
+ foreach (any mid in merchantIds) do
+ {
+ declare id varchar;
+ id := cast(mid as varchar);
+ if (length (mlist))
+ mlist := mlist || '%2C';
+ mlist := mlist || id ;
+ }
+ -- Query AWS to get the names of these merchants
+ canon := sprintf('AWSAccessKeyId=%s&Operation=SellerLookup&SellerId=%s&Service=AWSECommerceService&SignatureMethod=HmacSHA1&Timestamp=%s',
+ api_key, mlist, datenow);
+ url := DB.DBA.RDF_LOAD_AMAZON_QRY_SGN (canon, secret_key);
+ tmp := http_client_ext (url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
+ if (hdr[0] not like 'HTTP/1._ 200 %')
+ -- signal ('22023', trim(hdr[0], '\r\n'), 'RDFXX');
+ -- leave legalName of gr:BusinessEntity instances as MERCHANTID_<merchantId>
+ goto skip_merchantid2name;
+ xdMerchants := xtree_doc (tmp);
+ foreach (any mid in merchantIds) do
+ {
+ declare id, sellerName varchar;
+ declare sName, sNickname any;
+ id := cast(mid as varchar);
+ sellerName := '';
+ sName := xpath_eval('//Seller[SellerId="' || id || '"]/SellerName', xdMerchants);
+ sNickname := xpath_eval('//Seller[SellerId="' || id || '"]/Nickname', xdMerchants);
+ if (sName is not null)
+ sellerName := cast (sName as varchar);
+ else if (sNickname is not null)
+ sellerName := cast (sNickname as varchar);
+ -- Replace MERCHANTID_xxx placeholders with seller name
+ if (length(sellerName))
+ xd_utf8 := replace (xd_utf8, 'MERCHANTID_' || id, sellerName);
+ }
+ }
+ skip_merchantid2name:
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd_utf8, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_OPENSTREETMAP (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, lon1, lat1, hdr, exif any;
declare zoom, layers varchar;
@@ -8746,7 +8091,7 @@ create procedure DB.DBA.RDF_LOAD_OPENSTREETMAP (in graph_iri varchar, in new_ori
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (new_origin_uri like 'http://%openstreetmap.org/%?lat=%&lon=%')
@@ -8787,19 +8132,19 @@ create procedure DB.DBA.RDF_LOAD_OPENSTREETMAP (in graph_iri varchar, in new_ori
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/openstreet2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'lon', lon1, 'lat', lat1));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_USTREAM (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, img_id, hdr, what, pos any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -8849,19 +8194,19 @@ create procedure DB.DBA.RDF_LOAD_USTREAM (in graph_iri varchar, in new_origin_ur
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/ustream2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'what', what));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_FLICKR_IMG (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xd, xt, url, tmp, api_key, img_id, hdr, exif any;
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
api_key := _key;
@@ -8903,21 +8248,21 @@ create procedure DB.DBA.RDF_LOAD_FLICKR_IMG (in graph_iri varchar, in new_origin
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/flickr2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'exif', exif));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_EBAY_ARTICLE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout ser_key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout ser_key any, inout opts any)
{
declare xd, xd_utf8, xt, url, tmp, api_key, item_id, hdr, karr, use_sandbox, user_id, node any;
declare product_id varchar;
declare exit handler for sqlstate '*'
{
-- dbg_printf('Error: [%s]', __SQL_MESSAGE);
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -8965,7 +8310,7 @@ create procedure DB.DBA.RDF_LOAD_EBAY_ARTICLE (in graph_iri varchar, in new_orig
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/ebay2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar)));
xd_utf8 := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd_utf8, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd_utf8, new_origin_uri, coalesce (dest, graph_iri));
-- Get any reviews
node := xpath_eval('//Item/ProductID[@type="Reference"]', xd);
@@ -8982,16 +8327,16 @@ create procedure DB.DBA.RDF_LOAD_EBAY_ARTICLE (in graph_iri varchar, in new_orig
xd := xtree_doc (tmp);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/ebay2rdf.xsl', xd, vector ('baseUri', new_origin_uri, 'currentDateTime', cast(date_iso8601(now()) as varchar)));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
skipReviews:
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_DAV_META (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout ser_key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout ser_key any, inout opts any)
{
declare xd, localdest, groupdest, dep any;
localdest := coalesce (dest, graph_iri);
@@ -8999,9 +8344,9 @@ create procedure DB.DBA.RDF_LOAD_DAV_META (in graph_iri varchar, in new_origin_u
xd := DAV_EXTRACT_META_AS_RDF_XML (new_origin_uri, _ret_body);
if (xd is not null)
{
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, localdest);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, localdest);
if (groupdest is not null)
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, groupdest);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, groupdest);
return 1;
}
dep := (sparql define input:storage ""
@@ -9088,7 +8433,7 @@ RDF_MAPPER_CACHE_REGISTER (in url varchar, in top_url varchar, inout hdr any,
;
create procedure DB.DBA.RDF_LOAD_OPENSOCIAL_PERSON (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xt, xd, tmp, cnt, hdr any;
declare mail, pwd, auth, auth_header varchar;
@@ -9097,7 +8442,7 @@ create procedure DB.DBA.RDF_LOAD_OPENSOCIAL_PERSON (in graph_iri varchar, in new
pwd := get_keyword ('password', opts, null);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
auth_header := null;
@@ -9122,15 +8467,15 @@ create procedure DB.DBA.RDF_LOAD_OPENSOCIAL_PERSON (in graph_iri varchar, in new
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/ospeople2rdf.xsl', xd,
vector ('baseUri', new_origin_uri));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
create procedure DB.DBA.RDF_LOAD_WIKIPEDIA_ARTICLE
(in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare get_uri, body, dbpiri any;
declare code, base, primary_topic, doc_iri any;
@@ -9141,7 +8486,7 @@ create procedure DB.DBA.RDF_LOAD_WIKIPEDIA_ARTICLE
{
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
body := sprintf('<?xml version=\"1.0\" encoding=\"utf-8\"?>
@@ -9153,11 +8498,11 @@ create procedure DB.DBA.RDF_LOAD_WIKIPEDIA_ARTICLE
</foaf:Document>
</rdf:RDF>', RDF_SPONGE_PROXY_IRI (new_origin_uri), get_uri);
--body := http_get ('http://dbpedia.org/data/'|| get_uri, null, 'GET', 'Accept: application/xml, */*');
- --RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ --RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
primary_topic := DB.DBA.RDF_PROXY_ENTITY_IRI (graph_iri);
doc_iri := DB.DBA.RDF_SPONGE_PROXY_IRI (graph_iri);
update DB.DBA.RDF_QUAD set P = iri_to_id ('http://xmlns.com/foaf/0.1/topic') where G = iri_to_id (coalesce (dest, graph_iri)) and P = iri_to_id ('http://xmlns.com/foaf/0.1/primaryTopic') and S = iri_to_id (doc_iri);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, body, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (body, new_origin_uri, coalesce (dest, graph_iri));
}
if (base is not null and isstring (file_stat (base)) and __proc_exists ('php_str', 2) is not null)
{
@@ -9170,19 +8515,19 @@ create procedure DB.DBA.RDF_LOAD_WIKIPEDIA_ARTICLE
if (length (body) > 2 and body[0] = 239 and body[1] = 187 and body[2] = 191)
body := subseq (body, 3);
dbpiri := sprintf ('http://dbpedia.org/resource/%U', get_uri);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
DB.DBA.TTLP (body, dbpiri, dbpiri);
insert soft DB.DBA.SYS_HTTP_SPONGE (HS_LOCAL_IRI, HS_PARSER, HS_ORIGIN_URI, HS_ORIGIN_LOGIN, HS_LAST_LOAD, HS_EXPIRATION)
values (dbpiri, 'DB.DBA.RDF_LOAD_HTTP_RESPONSE', dbpiri, dbpiri, now(), dateadd ('hour', 1, now ()));
}
fallback:
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 1;
}
;
-create procedure DB.DBA.RDF_DO_XSLT_AND_LOAD (inout triple_dict any, in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
+create procedure DB.DBA.RDF_DO_XSLT_AND_LOAD (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
in xt any, inout mdta any, in xslt_sheet varchar, in what varchar, in base varchar, inout opts any)
{
declare xslt_uri varchar;
@@ -9203,7 +8548,7 @@ create procedure DB.DBA.RDF_DO_XSLT_AND_LOAD (inout triple_dict any, in graph_ir
{
-- /* we try to get xslt with content negotiation */
declare exit handler for sqlstate '*' {
- goto try_next;
+ goto try_next;
};
xslt_body := http_get (xslt_uri, null, 'GET', 'Accept: application/xml, */*', null, get_keyword_ucase ('get:proxy', opts));
if (length (xslt_body))
@@ -9223,17 +8568,17 @@ create procedure DB.DBA.RDF_DO_XSLT_AND_LOAD (inout triple_dict any, in graph_ir
goto try_next;
if (xpath_eval ('count(/RDF/*)', xd) > 0)
{
- mdta := mdta + 1;
+ mdta := mdta + 1;
}
media := xml_tree_doc_media_type (xd);
xd := serialize_to_UTF8_xml (xd);
if (media = 'text/rdf+n3')
{
- DB.DBA.RM_RDF_TTL_LOAD_DICT (xd, base, coalesce (dest, graph_iri), triple_dict);
- mdta := mdta + 1;
+ DB.DBA.TTLP (xd, base, coalesce (dest, graph_iri));
+ mdta := mdta + 1;
}
else
- DB.DBA.RM_RDF_RDFXML_LOAD_DICT (xd, base, coalesce (dest, graph_iri), triple_dict);
+ DB.DBA.RDF_LOAD_RDFXML (xd, base, coalesce (dest, graph_iri));
goto try_next;
}
try_w3c:
@@ -9289,7 +8634,7 @@ create procedure DB.DBA.RDF_MAPPER_EXPN_URLS (in all_xslt any, in base varchar)
return ret;
};
-create procedure DB.DBA.RDF_LOAD_GRDDL_REC (inout triple_dict any, in doc_base varchar, in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
+create procedure DB.DBA.RDF_LOAD_GRDDL_REC (in doc_base varchar, in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
in xt any, inout mdta any, inout visited any, in what varchar, in lev int, inout opts any)
{
declare pf_docs, ns_doc, barr any;
@@ -9433,12 +8778,12 @@ create procedure DB.DBA.RDF_LOAD_GRDDL_REC (inout triple_dict any, in doc_base v
declare ret any;
foreach (any pf_item in pf_docs) do
{
- ret := DB.DBA.RDF_LOAD_GRDDL_REC (triple_dict, base_url, graph_iri, pf_item[0], dest, pf_item[1], mdta, visited, 'pf', lev, opts);
+ ret := DB.DBA.RDF_LOAD_GRDDL_REC (base_url, graph_iri, pf_item[0], dest, pf_item[1], mdta, visited, 'pf', lev, opts);
all_xslt := vector_concat (all_xslt, ret);
}
foreach (any ns_item in ns_doc) do
{
- ret := DB.DBA.RDF_LOAD_GRDDL_REC (triple_dict, base_url, graph_iri, ns_item[0], dest, ns_item[1], mdta, visited, 'ns', lev, opts);
+ ret := DB.DBA.RDF_LOAD_GRDDL_REC (base_url, graph_iri, ns_item[0], dest, ns_item[1], mdta, visited, 'ns', lev, opts);
all_xslt := vector_concat (all_xslt, ret);
}
}
@@ -9452,7 +8797,7 @@ create procedure DB.DBA.RDF_LOAD_GRDDL_REC (inout triple_dict any, in doc_base v
{
if (0)
log_message (sprintf ('TRANSFORM=[%s] XSLT=[%s]', new_origin_uri, xslt));
- ret := DB.DBA.RDF_DO_XSLT_AND_LOAD (triple_dict, graph_iri, new_origin_uri, dest, xt, mdta, xslt, what, base_url, opts);
+ ret := DB.DBA.RDF_DO_XSLT_AND_LOAD (graph_iri, new_origin_uri, dest, xt, mdta, xslt, what, base_url, opts);
ret_arr := vector_concat (ret_arr, ret);
}
}
@@ -9462,14 +8807,8 @@ create procedure DB.DBA.RDF_LOAD_GRDDL_REC (inout triple_dict any, in doc_base v
--
-- /* RDFA comaptibility wrapper */
--
-create procedure DB.DBA.RDF_LOAD_RDFA_1 (in triple_dict any, inout ret_body any, inout new_origin_uri varchar, inout thisgr varchar, in flag int, in xlat int := 1)
+create procedure DB.DBA.RDF_LOAD_RDFA_1 (inout ret_body any, inout new_origin_uri varchar, inout thisgr varchar, in flag int)
{
- if (triple_dict is not null)
- {
- DB.DBA.RDFA_LOAD_DICT_XLAT (ret_body, new_origin_uri, thisgr, triple_dict, flag, 'DB.DBA.RM_XLAT_CONCAT', null);
- return;
- }
-
if (__proc_exists ('DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION') is not null)
DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION (ret_body, new_origin_uri, thisgr, flag, 'DB.DBA.RM_XLAT_CONCAT', null);
else
@@ -9482,7 +8821,7 @@ create procedure DB.DBA.RDF_LOAD_RDFA_1 (in triple_dict any, inout ret_body any,
-- /* GRDDL filters, if signature changed web robot needs to be updated too */
--
create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
-- check to microformats
declare xt_sav, xt, xd, profile, mdta, xslt_style, profs, profs_done, feed_url, xt_xml any;
@@ -9564,16 +8903,16 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
ret_content_type := http_request_header (hdr, 'Content-Type', null, null);
ret_content_type := DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE (new_origin_uri, ret_content_type, content);
if (strstr (ret_content_type, 'application/rdf+xml') is not null)
- DB.DBA.RM_RDF_RDFXML_LOAD_DICT (content, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ DB.DBA.RM_RDF_LOAD_RDFXML (content, new_origin_uri, coalesce (dest, graph_iri), 0);
else
- DB.DBA.RM_RDF_TTL_LOAD_DICT (content, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ DB.DBA.TTLP (content, new_origin_uri, coalesce (dest, graph_iri));
mdta := mdta + 1;
dict_put (dict, rdf_url, 1);
rdf_url_inx := rdf_url_inx + 1;
ret_flag := -1;
try_next_link:;
}
- DB.DBA.RM_RDF_TTL_LOAD_DICT (ss, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ DB.DBA.TTLP (ss, new_origin_uri, coalesce (dest, graph_iri));
}
-- sometimes RDF is inside the xhtml
if (xpath_eval ('/html//rdf', xt) is not null and xt_xml is not null)
@@ -9583,7 +8922,7 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
foreach (any x in rdf_in_html) do
{
xd := serialize_to_UTF8_xml (x);
- DB.DBA.RM_RDF_RDFXML_LOAD_DICT (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri), 0);
mdta := mdta + 1;
}
}
@@ -9607,7 +8946,7 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
};
xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/rdf_wo_grddl.xsl', xt_xml);
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_RDFXML_LOAD_DICT (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
mdta := mdta + 1;
}
not_rdf:;
@@ -9620,10 +8959,9 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
profile := cast (xpath_eval ('/html/head/@profile', xt) as varchar);
if (profile is not null)
profs := split_and_decode (profile, 0, '\0\0 ');
-
reg := '';
doc_base := get_keyword ('http-redirect-to', opts, new_origin_uri);
- DB.DBA.RDF_LOAD_GRDDL_REC (triple_dict, doc_base, graph_iri, new_origin_uri, dest, xt, mdta, reg, '', 0, opts);
+ DB.DBA.RDF_LOAD_GRDDL_REC (doc_base, graph_iri, new_origin_uri, dest, xt, mdta, reg, '', 0, opts);
if (registry_get ('__rdf_cartridges_original_doc_uri__') = '1' and mdta) -- It is recognized as GRDDL, data is loaded (testing the grddl only mode)
goto ret;
try_rdfa:;
@@ -9634,31 +8972,31 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
if (__proc_exists (fix_identifier_case ('xtree_doc_get_dtd'), 2) is null)
goto no_dtd_check;
dtd_sysuri := xtree_doc_get_dtd (xt, 1);
- if (dtd_sysuri = 'http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd' or xpath_eval ('//*[@about]|//*[@typeof]', xt) is not null or registry_get ('__rdf_cartridges_original_doc_uri__') = '1')
+ if (dtd_sysuri = 'http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd' or xpath_eval ('//@about|//@typeof', xt) is not null or registry_get ('__rdf_cartridges_original_doc_uri__') = '1')
{
no_dtd_check:;
{
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, ret_body, new_origin_uri, thisgr, 0);
+ DB.DBA.RDF_LOAD_RDFA_1 (ret_body, new_origin_uri, thisgr, 0);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*';
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, ret_body, new_origin_uri, thisgr, 1);
+ DB.DBA.RDF_LOAD_RDFA_1 (ret_body, new_origin_uri, thisgr, 1);
goto rdfa_end;
}
{
declare exit handler for sqlstate '*' { goto try_grddl1; };
- DB.DBA.RDF_LOAD_RDFA_1 (triple_dict, ret_body, new_origin_uri, thisgr, 2);
+ DB.DBA.RDF_LOAD_RDFA_1 (ret_body, new_origin_uri, thisgr, 2);
rdfa_end:;
}
}
mdta := mdta + 1;
- --goto ret;
+ goto ret;
}
- --else if (mdta)
- -- goto ret;
+ else if (mdta)
+ goto ret;
try_grddl1:
-- /* GRDDL - plan A, eRDF going here */
foreach (any prof in profs) do
@@ -9678,7 +9016,7 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
mdta := mdta + 1;
}
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
profs_done := vector_concat (profs_done, vector (prof));
}
next_prof:;
@@ -9701,8 +9039,8 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
mdta := mdta + 1;
xd := serialize_to_UTF8_xml (xd);
if (GM_FLAG = 2)
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
if (GM_FLAG > 0)
return mdta;
}
@@ -9777,8 +9115,8 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
}
xd := serialize_to_UTF8_xml (xd);
ins_rdf:
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri), 0);
- DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri), 0);
+ DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri));
ret_flag := 1;
no_feed:;
}
@@ -9786,22 +9124,12 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
xt := xt_sav;
if (add_html_meta = 1 and xpath_eval ('/html', xt) is not null)
{
- declare numtriples integer;
xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/html2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'source', tgt_page));
- numtriples:=cast(xpath_eval ('count(/RDF/*)', xd) as integer);
- if (numtriples > 0)
- {
- mdta := mdta + 1;
- xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri), 1);
- }
- xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/htmlAllMeta2rdf.xsl', xt, vector ('baseUri', new_origin_uri, 'source', tgt_page));
- numtriples:=cast(xpath_eval ('count(/RDF/*)', xd) as integer);
- if (numtriples > 0)
+ if (xpath_eval ('count(/RDF/*)', xd) > 0)
{
mdta := mdta + 1;
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri), 1);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri), 1);
}
}
ret:
@@ -9834,17 +9162,16 @@ create procedure DB.DBA.RDF_LOAD_HTML_RESPONSE (in graph_iri varchar, in new_ori
return vector ('seeAlso', dep);
}
}
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return mdta;
no_microformats:;
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
return 0;
}
;
-
create procedure DB.DBA.RDF_LOAD_FEED_RESPONSE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare content, xd, xt, ret_flag, mdta any;
content := ret_body;
@@ -9875,7 +9202,7 @@ create procedure DB.DBA.RDF_LOAD_FEED_RESPONSE (in graph_iri varchar, in new_ori
if (xpath_eval ('count(/RDF/*)', xd) > 0)
mdta := 1;
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
goto no_feed;
}
else if (xpath_eval ('/service', xt) is not null)
@@ -9884,7 +9211,7 @@ create procedure DB.DBA.RDF_LOAD_FEED_RESPONSE (in graph_iri varchar, in new_ori
if (xpath_eval ('count(/RDF/*)', xd) > 0)
mdta := 1;
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
goto no_feed;
}
else
@@ -9896,7 +9223,7 @@ create procedure DB.DBA.RDF_LOAD_FEED_RESPONSE (in graph_iri varchar, in new_ori
}
xd := serialize_to_UTF8_xml (xd);
ins_rdf:
- mdta := DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ mdta := DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri));
no_feed:
declare ord, mime any;
@@ -9917,7 +9244,7 @@ no_xml:;
;
-- /* convert the feed in rss 1.0 format to sioc */
-create procedure DB.DBA.RDF_LOAD_FEED_SIOC (in content any, in iri varchar, in graph_iri varchar, inout triple_dict any, in is_disc int := '')
+create procedure DB.DBA.RDF_LOAD_FEED_SIOC (in content any, in iri varchar, in graph_iri varchar, in is_disc int := '')
{
declare xt, xd any;
declare exit handler for sqlstate '*'
@@ -9927,8 +9254,8 @@ create procedure DB.DBA.RDF_LOAD_FEED_SIOC (in content any, in iri varchar, in g
xt := xtree_doc (content);
xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/feed2sioc.xsl', xt, vector ('baseUri', graph_iri, 'isDiscussion', is_disc));
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, iri, graph_iri, 0);
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), iri, graph_iri, null);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, iri, graph_iri, 0);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), iri, graph_iri, null);
return 1;
no_sioc:
return 0;
@@ -10029,7 +9356,7 @@ create procedure DB.DBA.SYS_WEBCAL_SPONGE_UP (in local_iri varchar, in get_uri v
;
create procedure DB.DBA.RDF_LOAD_YAHOO_STOCK_DATA (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare meta, tmp, content varchar;
declare symbol varchar;
@@ -10037,24 +9364,24 @@ create procedure DB.DBA.RDF_LOAD_YAHOO_STOCK_DATA (in graph_iri varchar, in new_
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
arr := sprintf_inverse (new_origin_uri, 'http://finance.yahoo.com/q?s=%s', 0);
symbol := arr[0];
- rdfm_yq_get_quote (symbol, new_origin_uri, dest, graph_iri, opts, triple_dict);
- rdfm_yq_get_history (symbol, new_origin_uri, dest, graph_iri, opts, triple_dict);
- rdfm_yq_get_feed (symbol, new_origin_uri, dest, graph_iri, opts, triple_dict);
- rdfm_yq_get_events (symbol, new_origin_uri, dest, graph_iri, opts, triple_dict);
- rdfm_yq_get_mb (symbol, new_origin_uri, dest, graph_iri, opts, triple_dict);
- rdfm_yq_get_competitors (symbol, new_origin_uri, dest, graph_iri, opts, triple_dict);
+ rdfm_yq_get_quote (symbol, new_origin_uri, dest, graph_iri, opts);
+ rdfm_yq_get_history (symbol, new_origin_uri, dest, graph_iri, opts);
+ rdfm_yq_get_feed (symbol, new_origin_uri, dest, graph_iri, opts);
+ rdfm_yq_get_events (symbol, new_origin_uri, dest, graph_iri, opts);
+ rdfm_yq_get_mb (symbol, new_origin_uri, dest, graph_iri, opts);
+ rdfm_yq_get_competitors (symbol, new_origin_uri, dest, graph_iri, opts);
return 1;
}
;
-create procedure rdfm_yq_get_quote (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any, in triple_dict any := null)
+create procedure rdfm_yq_get_quote (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any)
{
declare arr, cnt, ses, content, url any;
declare xt, xd any;
@@ -10082,13 +9409,13 @@ create procedure rdfm_yq_get_quote (in symbol varchar, in new_origin_uri varchar
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/yahoo_stock2rdf.xsl', xt,
vector ('baseUri', 'http://finance.yahoo.com/q?s='||symbol));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return;
}
;
-create procedure rdfm_yq_get_history (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any, in triple_dict any := null)
+create procedure rdfm_yq_get_history (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any)
{
declare arr, cnt, ses, content, url any;
declare xt, xd any;
@@ -10118,8 +9445,8 @@ create procedure rdfm_yq_get_history (in symbol varchar, in new_origin_uri varch
xt := xtree_doc (content);
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/yahoo_stock2rdf.xsl', xt, vector ('baseUri', 'http://finance.yahoo.com/q/hp?s='||symbol));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return;
}
;
@@ -10141,7 +9468,7 @@ create procedure rdfm_yq_date_cvt (in d varchar)
}
;
-create procedure rdfm_yq_get_competitors (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any, in triple_dict any := null)
+create procedure rdfm_yq_get_competitors (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any)
{
declare content, iri any;
declare xt, xd, xp, ses any;
@@ -10160,12 +9487,12 @@ create procedure rdfm_yq_get_competitors (in symbol varchar, in new_origin_uri v
}
}
content := string_output_string (ses);
- DB.DBA.RM_RDF_TTL_LOAD_DICT (content, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ TTLP (content, new_origin_uri, coalesce (dest, graph_iri));
return;
}
;
-create procedure rdfm_yq_get_events (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any, in triple_dict any := null)
+create procedure rdfm_yq_get_events (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any)
{
declare content, iri any;
declare xt, xd, xp, ses any;
@@ -10203,13 +9530,13 @@ create procedure rdfm_yq_get_events (in symbol varchar, in new_origin_uri varcha
http ('</c:Vcalendar>\n', ses);
http ('</r:RDF>\n', ses);
content := string_output_string (ses);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, content, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), iri);
+ DB.DBA.RM_RDF_LOAD_RDFXML (content, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), iri);
return;
}
;
-create procedure rdfm_yq_get_mb (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any, in triple_dict any := null)
+create procedure rdfm_yq_get_mb (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any)
{
declare content, hdr any;
declare xt, xp any;
@@ -10224,7 +9551,7 @@ create procedure rdfm_yq_get_mb (in symbol varchar, in new_origin_uri varchar, i
}
;
-create procedure rdfm_yq_load_feed (inout content any, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout triple_dict any)
+create procedure rdfm_yq_load_feed (inout content any, in new_origin_uri varchar, in dest varchar, in graph_iri varchar)
{
declare xt, xd any;
xt := xtree_doc (content);
@@ -10245,18 +9572,18 @@ create procedure rdfm_yq_load_feed (inout content any, in new_origin_uri varchar
goto no_feed;
xd := serialize_to_UTF8_xml (xd);
ins_rdf:
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri), triple_dict);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RDF_LOAD_FEED_SIOC (xd, new_origin_uri, coalesce (dest, graph_iri));
no_feed:
return;
}
;
-create procedure rdfm_yq_get_feed (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any, in triple_dict any := null)
+create procedure rdfm_yq_get_feed (in symbol varchar, in new_origin_uri varchar, in dest varchar, in graph_iri varchar, inout opts any)
{
declare content, hdr any;
content := DB.DBA.RDF_HTTP_URL_GET (sprintf ('http://us.rd.yahoo.com/finance/news/rss/add/*http://finance.yahoo.com/rss/SeekingAlpha?s=%U', symbol), '', hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
- rdfm_yq_load_feed (content, new_origin_uri, dest, graph_iri, triple_dict);
+ rdfm_yq_load_feed (content, new_origin_uri, dest, graph_iri);
return;
}
;
@@ -10360,8 +9687,6 @@ create procedure DB.DBA.SYS_OAI_SPONGE_UP (in local_iri varchar, in get_uri varc
{
declare url, hdr, xt, xd, cnt any;
declare new_origin_uri, dest, graph_iri varchar;
- declare triple_dict any;
- triple_dict := null; -- XXX:
new_origin_uri := cast (get_keyword_ucase ('get:uri', options, get_uri) as varchar);
graph_iri := get_uri;
dest := get_keyword_ucase ('get:destination', options);
@@ -10377,9 +9702,9 @@ create procedure DB.DBA.SYS_OAI_SPONGE_UP (in local_iri varchar, in get_uri varc
xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/oai2rdf.xsl', xt, vector ('baseUri', get_uri));
xd := serialize_to_UTF8_xml (xd);
if (dest is null)
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, options);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, options);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
}
return local_iri;
}
@@ -10489,7 +9814,7 @@ CREATE PROCEDURE RDFMAP_DBPEDIA_EXTRACT_PHP (in base varchar, in title varchar)
create procedure DB.DBA.RDF_LOAD_PPTX_DOCUMENT (
in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
-inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, inout triple_dict any
+inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any
)
{
declare urihost, baseUri, original_dest varchar;
@@ -10502,7 +9827,7 @@ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any,
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (__proc_exists ('unzip_file', 2) is null)
@@ -10550,7 +9875,7 @@ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any,
http ('</rdf:Description>\n', ses);
http ('</rdf:RDF>\n', ses);
tmp := string_output_string (ses);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, tmp, new_origin_uri, original_dest);
+ DB.DBA.RDF_LOAD_RDFXML (tmp, new_origin_uri, original_dest);
}
-- Get base RDF description of presentation
@@ -10561,7 +9886,7 @@ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any,
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/pptx2rdf.xsl', xt,
vector ('baseUri', baseUri, 'sourceDoc', original_dest, 'urihost', urihost, 'fileExt', fileExt));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
}
-- Get a colon-delimited list of slides contained in the presentation
xt := xtree_doc (slides_meta);
@@ -10608,7 +9933,7 @@ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any,
if (xpath_eval('//text()', xd) is not null)
{
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
}
-- Extract each embedded image file and place it in DAV storage
@@ -10742,7 +10067,7 @@ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any,
vector ('baseUri', baseUri, 'sourceDoc', original_dest, 'urihost', urihost, 'fileExt', fileExt,
'mode', 'html_encode_slide_content', 'slideUri', slideUri));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
-- Construct RDF to hold text from each individual slide
-- ses2 := string_output();
@@ -10790,7 +10115,7 @@ next_slide:
http ('</rdf:Description>\n', ses);
http ('</rdf:RDF>\n', ses);
tmp := string_output_string (ses);
- DB.DBA.RM_RDF_LOAD_RDFXML (tmp, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RDF_LOAD_RDFXML (tmp, new_origin_uri, coalesce (dest, graph_iri));
}
--dbg_printf('.PPTX Cartridge - Presentation text extraction done');
}
@@ -10802,7 +10127,7 @@ next_slide:
;
create procedure DB.DBA.RDF_LOAD_MBZ_1 (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- in kind varchar, in id varchar, in inc varchar, inout opts any, in triple_dict any := null)
+ in kind varchar, in id varchar, in inc varchar, inout opts any)
{
declare uri, cnt, xt, xd, hdr any;
uri := sprintf ('http://musicbrainz.org/ws/1/%s/%s?type=xml&inc=%U', kind, id, inc);
@@ -10810,12 +10135,12 @@ create procedure DB.DBA.RDF_LOAD_MBZ_1 (in graph_iri varchar, in new_origin_uri
xt := xtree_doc (cnt);
xd := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/mbz2rdf.xsl', xt, vector ('baseUri', RDF_SPONGE_DOC_IRI (new_origin_uri)));
xd := serialize_to_UTF8_xml (xd);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), uri);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), uri);
};
create procedure DB.DBA.RDF_LOAD_MBZ (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare kind, id varchar;
declare tmp, incs any;
@@ -10824,7 +10149,7 @@ create procedure DB.DBA.RDF_LOAD_MBZ (in graph_iri varchar, in new_origin_uri va
tmp := regexp_parse ('http://musicbrainz.org/([^/]*)/([^\.]+)', new_origin_uri, 0);
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
if (length (tmp) < 6)
@@ -10854,17 +10179,20 @@ create procedure DB.DBA.RDF_LOAD_MBZ (in graph_iri varchar, in new_origin_uri va
else
return 0;
if (dest is null)
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RDF_LOAD_MBZ_1 (graph_iri, new_origin_uri, dest, kind, id, inc, opts, triple_dict);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RDF_LOAD_MBZ_1 (graph_iri, new_origin_uri, dest, kind, id, inc, opts);
+ -- DELME: should not be there
+ --DB.DBA.TTLP (sprintf ('<%S> <http://xmlns.com/foaf/0.1/primaryTopic> <%S> .\n<%S> a <http://xmlns.com/foaf/0.1/Document> .',
+ -- new_origin_uri, DB.DBA.RDF_SPONGE_PROXY_IRI (new_origin_uri), new_origin_uri),
+ -- '', graph_iri);
foreach (any inc1 in incs) do
{
- DB.DBA.RDF_LOAD_MBZ_1 (graph_iri, new_origin_uri, dest, kind, id, inc1, opts, triple_dict);
+ DB.DBA.RDF_LOAD_MBZ_1 (graph_iri, new_origin_uri, dest, kind, id, inc1, opts);
}
return 1;
};
-
-create procedure DB.DBA.RDF_LOAD_LINKEDIN (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+create procedure DB.DBA.RDF_LOAD_LINKEDIN (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xt, cnt, xd any;
declare linkedin_id, tmp, required_profile_fields varchar;
@@ -10876,7 +10204,7 @@ create procedure DB.DBA.RDF_LOAD_LINKEDIN (in graph_iri varchar, in new_origin_u
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -10920,57 +10248,24 @@ create procedure DB.DBA.RDF_LOAD_LINKEDIN (in graph_iri varchar, in new_origin_u
return 0;
}
- -- Retrieve most data apart from connections
-- LinkedIn rejects the entire request if an attempt is made to retrieve a user's connections with an access token granted by someone-else
required_profile_fields := 'id,public-profile-url,first-name,last-name,headline,industry,location,num-connections,summary,specialties,associations,interests,honors,positions,num-recommenders,recommendations-received,member-url-resources,picture-url,certifications,date-of-birth,im-accounts,educations,languages,main-address,phone-numbers,publications,skills';
if (is_owner_key)
- -- required_profile_fields := required_profile_fields || ',connections,twitter-accounts';
- required_profile_fields := required_profile_fields || ',twitter-accounts';
+ required_profile_fields := required_profile_fields || ',connections,twitter-accounts';
api_url := sprintf ('https://api.linkedin.com/v1/people/url=%U:(%s)', public_profile_url, required_profile_fields);
url := DB.DBA.sign_request ('GET', api_url, '', consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
cnt := http_get (url);
- declare person_id any;
li_object_type := 'unknown';
xd := xtree_doc (cnt);
- person_id := cast (xpath_eval ('/person/id', xd) as varchar);
-
- declare num_connections any;
- num_connections := cast (xpath_eval ('/person/num-connections', xd) as integer);
-
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/linkedin2rdf.xsl', xd,
vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'li_object_type', li_object_type));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- if (length (person_id))
- {
- --Retrieve details of the person's network
- url := DB.DBA.sign_request ('GET', sprintf ('http://api.linkedin.com/v1/people/%s/network', person_id), 'type=SHAR&scope=self', consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
- cnt := http_get (url);
- xd := xtree_doc (cnt);
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/linkedin_shares2rdf.xsl', xd, vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'li_object_type', li_object_type));
- xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
-
- -- Paginated requests for all their connections
- declare st, retrcount integer;
- st:=0; retrcount:=500;
- li_object_type := 'connections';
- while(retrcount=500) {
- url := DB.DBA.sign_request ('GET', sprintf ('http://api.linkedin.com/v1/people/%s/connections:(id,public-profile-url,site-public-profile-request,first-name,last-name,headline,industry,location)', person_id), sprintf('start=%d&count=500',st), consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
- st:=st+500;
- cnt := http_get (url);
- xd := xtree_doc (cnt);
- retrcount:=cast(xpath_eval('count(/connections/person)', xd) as integer);
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/linkedin2rdf.xsl', xd, vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'li_object_type', li_object_type));
- xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- }
- }
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
@@ -11294,8 +10589,7 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_V2_ID_TO_USER_PROFILE (
in consumer_key varchar,
in consumer_secret varchar,
in oauth_token varchar,
- in oauth_secret varchar,
- inout triple_dict any
+ in oauth_secret varchar
)
{
declare xt, cnt, xd any;
@@ -11337,7 +10631,7 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_V2_ID_TO_USER_PROFILE (
vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'what', what, 'primary_user_screen_name', screen_name));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
tw_param := '';
tw_batch_count := 0;
@@ -11353,7 +10647,7 @@ done:;
-- Twitter cartridge v2 - Uses Twitter REST API and OAuth.
-- Twitter cartridge v1 (RDF_LOAD_TWITTER) uses old API and HTTP basic authentication.
create procedure DB.DBA.RDF_LOAD_TWITTER_V2 (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare xt, cnt, xd any;
declare url, api_url, api_params any;
@@ -11367,7 +10661,7 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_V2 (in graph_iri varchar, in new_origin
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
log_message (sprintf ('%s Error: %s', current_proc_name (), __SQL_MESSAGE));
return 0;
};
@@ -11468,8 +10762,8 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_V2 (in graph_iri varchar, in new_origin
vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'what', what, 'primary_user_screen_name', tw_screen_name));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
goto done;
}
@@ -11484,7 +10778,7 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_V2 (in graph_iri varchar, in new_origin
twitter_error := cast (xpath_eval ('/hash/error', xd) as varchar);
if (length (twitter_error) <> 0)
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, twitter_error);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, twitter_error);
log_message (sprintf ('%s Error: %s', current_proc_name (), twitter_error));
return 0;
}
@@ -11492,8 +10786,8 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_V2 (in graph_iri varchar, in new_origin
vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'what', 'user', 'primary_user_screen_name', tw_screen_name));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
--
-- Get friends: up to 5000 per page
@@ -11507,7 +10801,7 @@ create procedure DB.DBA.RDF_LOAD_TWITTER_V2 (in graph_iri varchar, in new_origin
url := DB.DBA.sign_request ('GET', api_url, api_params, consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
cnt := http_get (url);
DB.DBA.RDF_LOAD_TWITTER_V2_ID_TO_USER_PROFILE (cnt, next_cursor, friends_n_followers_item_limit, tw_screen_name, 'friends', new_origin_uri,
- dest, graph_iri, consumer_key, consumer_secret, oauth_token, oauth_secret, triple_dict);
+ dest, graph_iri, consumer_key, consumer_secret, oauth_token, oauth_secret);
if (next_cursor = 0)
goto friends_done;
page := page + 1;
@@ -11527,7 +10821,7 @@ friends_done:;
url := DB.DBA.sign_request ('GET', api_url, api_params, consumer_key, consumer_secret, oauth_token, oauth_secret, 1);
cnt := http_get (url);
DB.DBA.RDF_LOAD_TWITTER_V2_ID_TO_USER_PROFILE (cnt, next_cursor, friends_n_followers_item_limit, tw_screen_name, 'followers', new_origin_uri,
- dest, graph_iri, consumer_key, consumer_secret, oauth_token, oauth_secret, triple_dict);
+ dest, graph_iri, consumer_key, consumer_secret, oauth_token, oauth_secret);
if (next_cursor = 0)
goto followers_done;
page := page + 1;
@@ -11550,7 +10844,7 @@ followers_done:;
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/twitter_rest_api2rdf.xsl', xd,
vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'what', 'favorites', 'primary_user_screen_name', tw_screen_name));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
if (empty_test = 0)
goto favorites_done;
@@ -11575,7 +10869,7 @@ favorites_done:;
xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/twitter_rest_api2rdf.xsl', xd,
vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'what', 'user_timeline', 'primary_user_screen_name', tw_screen_name));
xd := serialize_to_UTF8_xml (xt);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
if (empty_test = 0)
goto user_timeline_done;
@@ -11585,58 +10879,13 @@ favorites_done:;
user_timeline_done:;
done:;
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
+ DB.DBA.RM_ADD_PRV (current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
return 1;
}
;
-create procedure DB.DBA.RDF_LOAD_KLOUT (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
-{
- declare xd, xt, url, baseurl, baseurls, response, mode any;
- declare kuser varchar;
- declare i integer;
-
- declare exit handler for sqlstate '*' {
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
-
- if (_key is null) {
- log_message ('Klout: Extractor cartridge needs API key');
- return 0;
- }
-
- kuser:=regexp_replace(new_origin_uri, '^http://(www.)?(klout|twitter).com/([a-zA-Z0-9]+).*', '\\3');
-
- baseurl:='http://api.klout.com/1/';
- baseurls:=vector(
- 'users/show.xml', 'show', -- includes klout.xml data as well
- 'users/topics.xml', 'topics',
- 'soi/influenced_by.xml', 'influencers',
- 'soi/influencer_of.xml', 'influences'
- );
-
- for (i:=0; i<length(baseurls); i:=i+2) {
- url:=aref(baseurls, i);
- mode:=aref(baseurls, i+1);
- url:=sprintf('%s%s?users=%s&key=%s', baseurl, url, kuser, _key);
- response := http_get (url, null, 'GET', null, '', get_keyword_ucase ('get:proxy', opts));
- xt := xtree_doc(response);
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/klout2rdf.xsl', xt,
- vector ('baseUri', new_origin_uri, 'mode', mode));
- xd := blob_to_string_output (xt);
- if (i=0) {
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- }
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), null);
- }
- return 1;
-}
-;
-
create procedure DB.DBA.RDF_LOAD_JIGSAW (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
+ inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any)
{
declare api_key, hdr, ret_body, tmp, jgsw_params, xd, xt any;
declare vec any;
@@ -11645,7 +10894,7 @@ create procedure DB.DBA.RDF_LOAD_JIGSAW (in graph_iri varchar, in new_origin_uri
declare exit handler for sqlstate '*'
{
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
+ DB.DBA.RM_RDF_SPONGE_ERROR (current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
return 0;
};
@@ -11738,8 +10987,11 @@ searchForCompany:
url := sprintf ('https://www.jigsaw.com/rest/searchCompany.xml?token=%s&name=%s', api_key, company_name);
ret_body := http_client_ext (url, headers=>hdr, timeout=>30, proxy=>get_keyword_ucase ('get:proxy', opts));
+
+
xd := xtree_doc (ret_body);
- total_hits := atoi(cast(xpath_eval ('//totalHits', xd) as varchar));
+ total_hits := atoi (cast (xpath_eval ('//totalHits', xd) as varchar));
+
if (total_hits > 1)
{
-- Shouldn't happen, but see above.
@@ -11762,7 +11014,7 @@ searchForCompany:
company_name := jgsw_name;
vec := regexp_parse('.*(_company)$', company_name, 0);
if (vec is not null)
- company_name := subseq(company_name, 0, vec[2]);
+ company_name := subseq (company_name, 0, vec[2]);
goto searchForCompany;
}
else
@@ -11770,67 +11022,11 @@ searchForCompany:
}
load_rdf:
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/jigsaw2rdf.xsl', xd, vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'jgsw_id', jgsw_id));
- xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- return 1;
-}
-;
-
-create procedure DB.DBA.RDF_LOAD_NYT_ARTICLE (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout _ret_body any, inout aq any, inout ps any, inout _key any, inout opts any, in triple_dict any := null)
-{
- declare xd, xt, tmp, url, article_url, desired_response_fields, hdr any;
- declare response_fields varchar;
-
- declare exit handler for sqlstate '*'
- {
- DB.DBA.RM_RDF_SPONGE_ERROR (triple_dict, current_proc_name (), graph_iri, dest, __SQL_MESSAGE);
- return 0;
- };
-
- if (length (_key) = 0)
- {
- log_message (sprintf ('%s: An API key has not been configured for the New York Times API', current_proc_name ()));
- return 0;
- }
-
- -- NB: The related article description returned by the Semantic API returns only: body, byline, date, title, url
- desired_response_fields := vector (
- 'abstract', 'author', 'body', 'byline', 'classifiers_facet', 'column_facet', 'comments',
- 'date', 'dbpedia_resource', 'dbpedia_resource_url', 'des_facet', 'desk_facet', 'fee',
- 'geo_facet', 'lead_paragraph', 'material_type_facet', 'multimedia', 'nytd_byline', 'nytd_des_facet',
- 'nytd_geo_facet', 'nytd_lead_paragraph', 'nytd_org_facet', 'nytd_per_facet', 'nytd_section_facet',
- 'nytd_title', 'nytd_works_mentioned_facet', 'org_facet', 'per_facet', 'related_multimedia',
- 'small_image', 'small_image_url', 'small_image_height', 'small_image_width', 'source_facet',
- 'title', 'url', 'word_count', 'works_mentioned_facet'
- );
-
- response_fields := '';
- foreach (varchar field in desired_response_fields) do
- response_fields := response_fields || field || ',';
- response_fields := trim (response_fields, ',');
-
- article_url := replace (new_origin_uri, '/', '\\/');
- url := sprintf ('http://api.nytimes.com/svc/search/v1/article?query=url:%s&fields=%s&api-key=%s', article_url, response_fields, _key);
-
- DB.DBA.RM_LOG_REQUEST (url, null, current_proc_name ());
- tmp := http_client_ext (url=>url, headers=>hdr, proxy=>get_keyword_ucase ('get:proxy', opts));
- DB.DBA.RM_LOG_RESPONSE (tmp, hdr);
- if (length (tmp) = 0)
- {
- log_message (sprintf ('%s: Failed HTTP GET: %s', current_proc_name(), url));
- return 0;
- }
- tmp := json_parse (tmp);
- xd := DB.DBA.SOCIAL_TREE_TO_XML (tmp);
- xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/nyt_article2rdf.xsl', xd,
- vector ('baseUri', new_origin_uri));
+ xt := DB.DBA.RDF_MAPPER_XSLT (registry_get ('_rdf_mappers_path_') || 'xslt/main/jigsaw2rdf.xsl', xd,
+ vector ('baseUri', RDF_SPONGE_DOC_IRI (dest, graph_iri), 'jgsw_id', jgsw_id));
xd := serialize_to_UTF8_xml (xt);
- RM_CLEAN_DEST (triple_dict, dest, graph_iri, new_origin_uri, opts);
- DB.DBA.RM_RDF_LOAD_RDFXML (triple_dict, xd, new_origin_uri, coalesce (dest, graph_iri));
- DB.DBA.RM_ADD_PRV (triple_dict, current_proc_name (), new_origin_uri, coalesce (dest, graph_iri), url);
-
+ RM_CLEAN_DEST (dest, graph_iri, new_origin_uri, opts);
+ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
return 1;
}
;
@@ -11986,168 +11182,16 @@ create procedure DB.DBA.RDF_SPONGER_STATUS (in graph_iri varchar, in new_origin_
}
;
-create procedure DB.DBA.RM_MAKE_DOC_LINKS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar, inout opts any, inout triples any)
-{
- declare gr, subj1, ss, des, pt, mime, tp, pti, prim any;
- declare dict, arr any;
- declare have_pt, add_doc int;
-
- mime := get_keyword ('content-type', opts);
- if (mime like '%/rdf+%' or mime = 'text/n3')
- return vector ();
- if (registry_get ('__rdf_cartridges_original_doc_uri__') = '1')
- return vector ();
-
- add_doc := 1;
- subj1 := iri_to_id (DB.DBA.RDF_SPONGE_PROXY_IRI (coalesce (dest, graph_iri)));
- prim := iri_to_id (DB.DBA.RDF_PROXY_ENTITY_IRI (new_origin_uri));
- des := iri_to_id ('http://www.openlinksw.com/schema/attribution#isDescribedUsing');
- pt := iri_to_id ('http://www.w3.org/2007/05/powder-s#describedby');
- tp := iri_to_id ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type');
- pti := iri_to_id ('http://xmlns.com/foaf/0.1/primaryTopic');
-
- dict := dict_new (10);
- foreach (any x in triples) do
- {
- if (x[1] = tp and x[0] <> subj1)
- dict_put (dict, vector (x[0], pt, subj1), 1);
- if (x[0] = subj1 and x[1] = tp)
- add_doc := 0;
- }
- dict_put (dict, vector (subj1, pti, prim), 1);
- if (add_doc)
- dict_put (dict, vector (subj1, tp, iri_to_id ('http://xmlns.com/foaf/0.1/Document')), 1);
- dict_put (dict, vector (subj1, iri_to_id ('http://vocab.deri.ie/void#inDataset'), iri_to_id (coalesce (dest, graph_iri))), 1);
- dict_put (dict, vector (iri_to_id (coalesce (dest, graph_iri)),
- iri_to_id ('http://rdfs.org/ns/void#sparqlEndpoint'),
- iri_to_id (sprintf ('http://%{URIQADefaultHost}s/sparql/'))), 1);
- return dict_list_keys (dict, 2);
-}
-;
-
--- /* top level, called from sparql engine */
-create procedure DB.DBA.RDF_RUN_CARTRIDGES (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
- inout ret_body any, in ret_content_type varchar, inout options any, inout ret_hdr any, inout ps any, inout aq any, inout req_hdr_arr any)
-{
- declare cset, rc any;
- declare dict any;
- declare inx, enable_meta any;
- enable_meta := 1;
- RM_LOG_CLEAR ();
- -- remove below to disable get:cartridge processing
- for (inx := 0; inx < length (options); inx := inx + 2)
- {
- if (options[inx] = 'get:cartridge')
- {
- if (options[inx+1] = 'none')
- return 1;
- if (options[inx+1] = 'meta')
- {
- enable_meta := 1;
- }
- if (options[inx+1] = 'extractor')
- enable_meta := 0;
- }
- }
- dict := dict_new ((length (ret_body) / 100) + 1);
- cset := http_request_header (ret_hdr, 'Content-Type', 'charset', null);
- for select RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_OPTIONS, RM_DESCRIPTION from DB.DBA.SYS_RDF_MAPPERS where RM_ENABLED = 1 order by RM_ID do
- {
- declare val_match, pcols, new_opts any;
- declare npars int;
-
- if (RM_TYPE = 'MIME')
- val_match := ret_content_type;
- else if (RM_TYPE = 'URL' or RM_TYPE = 'HTTP')
- val_match := new_origin_uri;
- else
- val_match := null;
-
- --if (registry_get ('__sparql_mappers_debug') = '1')
- -- dbg_obj_prin1 ('Trying ', RM_HOOK);
- if (isstring (val_match) and regexp_match (RM_PATTERN, val_match) is not null)
- {
- if (__proc_exists (RM_HOOK) is null)
- goto try_next_mapper;
-
- declare exit handler for sqlstate '*'
- {
- goto try_next_mapper;
- };
- --!!!TBD: Carefully check what happens when dest is NULL vs dest is not NULL, then add support for groupdest.
- if (registry_get ('__sparql_mappers_debug') = '1')
- dbg_obj_prin1 ('Match ', RM_HOOK);
- new_opts := vector_concat (options, RM_OPTIONS, vector ('content-type', ret_content_type, 'charset', cset));
- DB.DBA.RDF_SPONGER_STATUS (graph_iri, new_origin_uri, dest, RM_DESCRIPTION, options);
- if (RM_TYPE <> 'HTTP')
- {
- rc := call (RM_HOOK) (graph_iri, new_origin_uri, dest, ret_body, aq, ps, RM_KEY, new_opts, dict);
- }
- else
- {
- rc := call (RM_HOOK) (graph_iri, new_origin_uri, dest, ret_body, aq, ps, vector (req_hdr_arr, ret_hdr), new_opts, dict);
- }
- if (registry_get ('__sparql_mappers_debug') = '1')
- {
- dbg_obj_prin1 ('Return ', rc, RM_HOOK);
- dbg_obj_print ('no triples:', dict_size (dict));
- if (__tag(rc) = 193 or rc < 0 or rc > 0)
- dbg_obj_prin1 ('END of mappings');
- }
- if (__tag(rc) = 193 or rc < 0 or rc > 0)
- {
- ins_triples:
- declare triples, links any;
- --dbg_obj_print ('inserting triples:', dict_size (dict));
- --dbg_obj_print ('in store: ', (select count(*) from RDF_QUAD where G = iri_to_id (coalesce (dest, graph_iri))));
- triples := dict_list_keys (dict, 1);
- links := DB.DBA.RM_MAKE_DOC_LINKS (graph_iri, new_origin_uri, dest, new_opts, triples);
- {
- declare deadl int;
- deadl := 5;
- ins_again:
- declare exit handler for sqlstate '40001' {
- deadl := deadl - 1;
- if (deadl > 0)
- {
- rollback work;
- goto ins_again;
- }
- resignal;
- };
- --dbg_obj_print (coalesce (dest, graph_iri), triples);
- DB.DBA.RDF_INSERT_TRIPLES (coalesce (dest, graph_iri), triples);
- DB.DBA.RDF_INSERT_TRIPLES (coalesce (dest, graph_iri), links);
- commit work;
- DB.DBA.RDF_SPONGER_STATUS (graph_iri, new_origin_uri, dest, null, options);
- commit work;
- }
- if (__tag(rc) = 193)
- return rc;
- return 1;
- }
- }
- try_next_mapper:;
- }
- if (dict_size (dict))
- goto ins_triples;
- return 0;
-}
-;
-
-
create procedure DB.DBA.RDF_LOAD_POST_PROCESS (in graph_iri varchar, in new_origin_uri varchar, in dest varchar,
inout ret_body any, in ret_content_type varchar, inout options any)
{
declare new_opts any;
- declare dummy, spmode, triples, graph, tmp, labels, dict any;
- declare f_delete_orig_triples, rc, mc_api int;
+ declare dummy, spmode, triples, graph, tmp, labels any;
+ declare rc int;
dummy := null;
- f_delete_orig_triples := 0;
- mc_api := 0;
+ RM_LOG_CLEAR ();
RM_GRAPH_PT_CK (graph_iri, dest);
- dict := dict_new ((length (ret_body) / 100) + 1);
graph := coalesce (dest, graph_iri);
spmode := get_keyword ('meta-cartridges-mode', options, '');
if (spmode = 'none')
@@ -12155,7 +11199,6 @@ create procedure DB.DBA.RDF_LOAD_POST_PROCESS (in graph_iri varchar, in new_orig
if (spmode <> '')
{
triples := (select vector_agg (vector (S,P,O)) from RDF_QUAD where g = iri_to_id (graph));
- f_delete_orig_triples := 1;
tmp := split_and_decode (spmode, 0, '\0\0,');
if (length (tmp) = 1 and atoi (tmp[0]) <= 0)
spmode := abs (atoi (tmp[0]));
@@ -12216,7 +11259,7 @@ create procedure DB.DBA.RDF_LOAD_POST_PROCESS (in graph_iri varchar, in new_orig
DB.DBA.RDF_SPONGER_STATUS (graph_iri, new_origin_uri, dest, MC_DESC, options);
commit work;
st := msec_time ();
- rc := call (MC_HOOK) (graph_iri, new_origin_uri, dest, ret_body, dummy, dummy, MC_KEY, new_opts, dict);
+ rc := call (MC_HOOK) (graph_iri, new_origin_uri, dest, ret_body, dummy, dummy, MC_KEY, new_opts);
RM_GRAPH_PT_CK (graph_iri, dest);
prof_sample (MC_HOOK, msec_time () - st, 1);
if (registry_get ('__sparql_mappers_debug') = '1')
@@ -12225,54 +11268,17 @@ create procedure DB.DBA.RDF_LOAD_POST_PROCESS (in graph_iri varchar, in new_orig
if (rc < 0 or rc > 0)
dbg_obj_prin1 ('END of PP mappings');
}
- if (rc < 0 or rc > 0 or ( (MC_API_TYPE=0 or MC_API_TYPE=3) and dict_size (dict)))
+ if (rc < 0 or rc > 0)
{
- ins_triples:
- declare _triples, links any;
- if (f_delete_orig_triples)
- {
- DB.DBA.RDF_DELETE_TRIPLES (graph, triples);
- f_delete_orig_triples := 0;
- }
- --dbg_obj_print ('inserting triples:', dict_size (dict));
- --dbg_obj_print ('in store: ', (select count(*) from RDF_QUAD where G = iri_to_id (coalesce (dest, graph_iri))));
- _triples := dict_list_keys (dict, 1);
- {
- declare deadl int;
- deadl := 5;
- ins_again:
- declare exit handler for sqlstate '40001' {
- deadl := deadl - 1;
- if (deadl > 0)
- {
- rollback work;
- goto ins_again;
- }
- resignal;
- };
- --dbg_obj_print (coalesce (dest, graph_iri), triples);
- DB.DBA.RDF_INSERT_TRIPLES (coalesce (dest, graph_iri), _triples);
- commit work;
- }
- if (MC_API_TYPE in (0,3))
- {
- dict := dict_new ((length (ret_body) / 100) + 1);
- goto try_next_mapper;
- }
return (case when rc < 0 then 0 else 1 end);
}
}
try_next_mapper:;
}
- if (f_delete_orig_triples)
- {
- DB.DBA.RDF_DELETE_TRIPLES (graph, triples);
- f_delete_orig_triples := 0;
- }
+ if (spmode <> '')
+ DB.DBA.RDF_DELETE_TRIPLES (graph, triples);
if (registry_get ('__sparql_mappers_debug') = '1')
dbg_obj_prin1 ('END of PP mappings');
- if (dict_size (dict))
- goto ins_triples;
}
;
@@ -12365,11 +11371,9 @@ DB.DBA.RM_LOAD_ONTOLOGIES ();
drop procedure DB.DBA.RM_LOAD_ONTOLOGIES;
-create procedure RM_DO_SPONGE (in _G any, in sp_type varchar := '', in do_refresh int := null, in sp_mode varchar := 'add',
- in accept_mode varchar := null)
+create procedure RM_DO_SPONGE (in _G any, in sp_type varchar := '', in do_refresh int := null)
{
declare dedl int;
- --dbg_obj_print_vars (sp_mode);
set_user_id ('SPARQL');
dedl := 10;
declare exit handler for sqlstate '40001'
@@ -12382,9 +11386,9 @@ create procedure RM_DO_SPONGE (in _G any, in sp_type varchar := '', in do_refres
};
again:
if (do_refresh is null)
- DB.DBA.RDF_SPONGE_UP (_G, vector ('get:soft', sp_mode, 'refresh_free_text' , 0, 'meta-cartridges-mode', sp_type, 'get:accept', accept_mode));
+ DB.DBA.RDF_SPONGE_UP (_G, vector ('get:soft', 'soft', 'refresh_free_text' , 0, 'meta-cartridges-mode', sp_type));
else
- DB.DBA.RDF_SPONGE_UP (_G, vector ('get:soft', sp_mode, 'refresh_free_text' , 1, 'meta-cartridges-mode', sp_type, 'get:refresh', do_refresh, 'get:accept', accept_mode));
+ DB.DBA.RDF_SPONGE_UP (_G, vector ('get:soft', 'soft', 'refresh_free_text' , 1, 'meta-cartridges-mode', sp_type, 'get:refresh', do_refresh));
}
;
@@ -12505,7 +11509,7 @@ create procedure CLEAN_SPONGE (in d int := 30, in n int := 2000)
}
;
---RDFS_RULE_SET ('http://www.w3.org/2000/01/rdf-schema#', 'http://www.w3.org/2000/01/rdf-schema#');
+RDFS_RULE_SET ('http://www.w3.org/2000/01/rdf-schema#', 'http://www.w3.org/2000/01/rdf-schema#');
-- Sponger splash screen
DB.DBA.VHOST_REMOVE (
@@ -12556,54 +11560,10 @@ create procedure lbl_order (in p any)
'http://rdf.freebase.com/ns/common.topic.alias',
'http://opengraphprotocol.org/schema/title',
'http://rdf.alchemyapi.com/rdf/v1/s/aapi-schema.rdf#Name',
- 'http://poolparty.punkt.at/demozone/ont#title',
- 'http://www.openlinksw.com/schemas/googleplus#activity_title',
- 'http://www.openlinksw.com/schemas/googleplus#providerTitle'
- );
- r := position (id_to_iri (p), r);
- if (r <= 0)
- return 100;
- return r;
-}
-;
-
--- Same as lbl_order(), except that skos:prefLabel takes precedence
--- NLP meta-cartridges use skos:prefLabel to include a label prefix identifying the source cartridge
-create procedure lbl_order_1 (in p any)
-{
- declare r int;
- r := vector (
- 'http://www.w3.org/2004/02/skos/core#prefLabel',
- 'http://www.w3.org/2000/01/rdf-schema#label',
- 'http://xmlns.com/foaf/0.1/name',
- 'http://purl.org/dc/elements/1.1/title',
- 'http://purl.org/dc/terms/title',
- 'http://xmlns.com/foaf/0.1/nick',
- 'http://usefulinc.com/ns/doap#name',
- 'http://rdf.data-vocabulary.org/name',
- 'http://www.w3.org/2002/12/cal/ical#summary',
- 'http://aims.fao.org/aos/geopolitical.owl#nameListEN',
- 'http://s.opencalais.com/1/pred/name',
- 'http://www.crunchbase.com/source_description',
- 'http://dbpedia.org/property/name',
- 'http://www.geonames.org/ontology#name',
- 'http://purl.org/ontology/bibo/shortTitle',
- 'http://www.w3.org/1999/02/22-rdf-syntax-ns#value',
- 'http://xmlns.com/foaf/0.1/accountName',
- 'http://rdf.freebase.com/ns/type.object.name',
- 'http://s.opencalais.com/1/pred/name',
- 'http://www.w3.org/2008/05/skos#prefLabel',
- 'http://www.w3.org/2002/12/cal/icaltzd#summary',
- 'http://rdf.data-vocabulary.org/name',
- 'http://rdf.freebase.com/ns/common.topic.alias',
- 'http://opengraphprotocol.org/schema/title',
- 'http://rdf.alchemyapi.com/rdf/v1/s/aapi-schema.rdf#Name',
- 'http://poolparty.punkt.at/demozone/ont#title',
- 'http://www.openlinksw.com/schemas/googleplus#activity_title',
- 'http://www.openlinksw.com/schemas/googleplus#providerTitle'
+ 'http://poolparty.punkt.at/demozone/ont#title'
);
r := position (id_to_iri (p), r);
- if (r <= 0)
+ if (r = 0)
return 100;
return r;
}
@@ -12614,11 +11574,10 @@ create procedure
RM_SPONGE_BY_ID (in graph varchar, in url varchar, in content any, in ctype varchar, in ids any, in opts any)
{
declare mime_type, _graph, _base, out_arr, tmp varchar;
- declare html_start, xd, dict any;
+ declare html_start, xd any;
declare rc, deadl int;
html_start := null;
- dict := null;
_graph := get_keyword ('rdf-graph', opts, graph);
_base := url;
@@ -12695,7 +11654,7 @@ again:
new_opts := vector_concat (RM_OPTIONS, vector ('disable-clean', 'Y'));
if (RM_TYPE <> 'HTTP')
{
- rc := call (RM_HOOK) (_graph, _base, null, content, aq, aq, RM_KEY, new_opts, dict);
+ rc := call (RM_HOOK) (_graph, _base, null, content, aq, aq, RM_KEY, new_opts);
}
if (rc < 0 or rc > 0)
return;
@@ -12706,21 +11665,3 @@ again:
}
;
-DB.DBA.VHOST_REMOVE (lpath=>'/about/queue/status');
-DB.DBA.VHOST_DEFINE (lpath=>'/about/queue/status', ppath=>'/SOAP/Http/sponger_queue_status', soap_user=>'dba');
-
-create procedure sponger_queue_status (in uri varchar) __soap_http 'applcation/json'
-{
- declare ret any;
- ret := '{ "result":0 }';
- declare exit handler for sqlstate '*'
- {
- rollback work;
- http_status_set (500);
- return sprintf ('{ "error":"%V" }', __SQL_MESSAGE);
- };
- return ret;
-}
-;
-
-grant execute on sponger_queue_status to dba;
diff --git a/binsrc/rdf_mappers/rdf_mappers_drop.sql b/binsrc/rdf_mappers/rdf_mappers_drop.sql
index 13cca19..f4bb868 100644
--- a/binsrc/rdf_mappers/rdf_mappers_drop.sql
+++ b/binsrc/rdf_mappers/rdf_mappers_drop.sql
@@ -1,13 +1,13 @@
--
--
--- $Id: rdf_mappers_drop.sql,v 1.1.2.2 2012/03/08 12:55:02 source Exp $
+-- $Id: rdf_mappers_drop.sql,v 1.1.2.1 2011/06/09 15:35:36 source Exp $
--
-- RDF Mappings
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/rdf_mappers/rdfdesc/description.sql b/binsrc/rdf_mappers/rdfdesc/description.sql
index 1b91756..95a24c8 100644
--- a/binsrc/rdf_mappers/rdfdesc/description.sql
+++ b/binsrc/rdf_mappers/rdfdesc/description.sql
@@ -1,10 +1,10 @@
--
--- $Id: description.sql,v 1.21.2.79 2012/03/08 12:55:02 source Exp $
+-- $Id: description.sql,v 1.21.2.68 2011/10/25 23:36:21 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -83,8 +83,6 @@ create procedure rdfdesc_get_lang_by_q (in accept varchar, in lang varchar)
declare arr, q any;
declare i, l int;
- if (not length (lang))
- lang := 'en';
arr := split_and_decode (accept, 0, '\0\0,;');
q := 0;
l := length (arr);
@@ -130,8 +128,8 @@ create procedure rdfdesc_label (in _S any, in _G varchar, in lines any := null)
}
--exec (sprintf ('sparql define input:inference "virtrdf-label" '||
--'select ?o (lang(?o)) where { graph <%S> { <%S> virtrdf:label ?o } }', _G, _S), null, null, vector (), 0, meta, data);
- exec ('select __ro2sq (O), DB.DBA.RDF_LANGUAGE_OF_OBJ (o) , cast (lbl_order (P) as int) from RDF_QUAD table option (with ''virtrdf-label'')
- where G = __i2id (?) and S = __i2id (?) and P = __i2id (''http://www.openlinksw.com/schemas/virtrdf#label'', 0) and not is_bnode_iri_id (O) order by 3', null, null, vector (_G, _S), 0, meta, data);
+ exec ('select __ro2sq (O), DB.DBA.RDF_LANGUAGE_OF_OBJ (o) , lbl_order (P) from RDF_QUAD table option (with ''virtrdf-label'')
+ where G = __i2id (?) and S = __i2id (?) and P = __i2id (''http://www.openlinksw.com/schemas/virtrdf#label'', 0) order by 3', null, null, vector (_G, _S), 0, meta, data);
best_str := '';
best_q := 0;
if (length (data))
@@ -174,10 +172,8 @@ create procedure rdfdesc_label_1 (in _S any, in lines any := null)
langs := http_request_header_full (lines, 'Accept-Language', 'en');
}
stat := '00000';
- exec ('select __ro2sq (O), DB.DBA.RDF_LANGUAGE_OF_OBJ (o) , cast (lbl_order_1 (P) as int) from RDF_QUAD table option (with ''virtrdf-label'')
- where S = __i2id (?) and P = __i2id (''http://www.openlinksw.com/schemas/virtrdf#label'', 0) and not is_bnode_iri_id (O) order by 3', null, null, vector (_S), 0, meta, data);
- --exec (sprintf ('sparql define input:inference "virtrdf-label" '||
- --'select ?o (lang(?o)) where { <%S> virtrdf:label ?o }', _S), stat, msg, vector (), 0, meta, data);
+ exec (sprintf ('sparql define input:inference "virtrdf-label" '||
+ 'select ?o (lang(?o)) where { <%S> virtrdf:label ?o }', _S), stat, msg, vector (), 0, meta, data);
best_str := '';
best_q := 0;
if (stat = '00000' and length (data))
@@ -195,10 +191,7 @@ create procedure rdfdesc_label_1 (in _S any, in lines any := null)
}
label := best_str;
if (__tag of rdf_box = __tag (label))
- {
- __rdf_box_make_complete (label);
- label := rdf_box_data (label);
- }
+ label := rdf_box_data (label);
if (not isstring (label))
label := cast (label as varchar);
label := cast (xtree_doc (label, 2) as varchar);
@@ -341,33 +334,6 @@ create procedure rdfdesc_uri_curie (in uri varchar, in label varchar := null)
}
;
-create procedure rdfdesc_uri_local (in uri varchar)
-{
- declare delim integer;
- declare uriSearch, nsPrefix, ret varchar;
-
- delim := -1;
- uriSearch := uri;
- nsPrefix := null;
- ret := uri;
- delim := coalesce (strrchr (uriSearch, '/'), 0);
- delim := __max (delim, coalesce (strrchr (uriSearch, '#'), 0));
- delim := __max (delim, coalesce (strrchr (uriSearch, ':'), 0));
- if (delim > 0)
- uriSearch := subseq (uriSearch, 0, delim);
- if (delim > 0)
- {
- declare rhs varchar;
- rhs := subseq(uri, length (uriSearch) + 1, null);
- if (not length (rhs))
- ret := uri;
- else
- ret := rhs;
- }
- return rdfdesc_trunc_uri (ret);
-}
-;
-
--! used to return local part of an iri
create procedure rdfdesc_uri_local_part (in uri varchar)
{
@@ -646,8 +612,6 @@ create procedure rdfdesc_prop_label (in uri any)
and P = __i2idn ('http://www.w3.org/2000/01/rdf-schema#label') OPTION (QUIETCAST));
if (length (ll) = 0)
ll := rdfdesc_uri_curie (uri);
- if (isstring (ll) and ll like 'http://%')
- ll := rdfdesc_uri_local (uri);
if (isstring (ll) and ll like 'opl%:isDescribedUsing')
ll := 'Described Using Terms From';
return ll;
@@ -812,7 +776,7 @@ create procedure virt_proxy_init_about ()
'/about/id/(http|https|acct|mailto|webcal|feed|nodeID)[/:](.*)', vector ('sch', 'g'), 2,
'/about/data/%s/%s', vector ('sch', 'g'), null,
'(application/rdf.xml)|(text/rdf.n3)|(application/x-turtle)|(text/n3)|(text/turtle)|'||
- '(application/rdf.json)|(application/json)|(text/html)|(text/plain)|(application/atom.xml)|(application/odata.json)|(application/ld.json)|(application/microdata.json)|(\\*/\\*)',
+ '(application/rdf.json)|(application/json)|(text/html)|(text/plain)|(application/atom.xml)|(application/odata.json)|(\\*/\\*)',
2, 303, null);
delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'ext_ahp_rule_list_new';
@@ -823,10 +787,8 @@ create procedure virt_proxy_init_about ()
DB.DBA.HTTP_VARIANT_ADD ('ext_ahp_rule_list_new', '/about/data/(.*)', '/about/data/turtle/\x241', 'text/turtle', 0.80);
DB.DBA.HTTP_VARIANT_ADD ('ext_ahp_rule_list_new', '/about/data/(.*)', '/about/data/json/\x241', 'application/json', 0.70);
DB.DBA.HTTP_VARIANT_ADD ('ext_ahp_rule_list_new', '/about/data/(.*)', '/about/data/jrdf/\x241', 'application/rdf+json', 0.70);
- DB.DBA.HTTP_VARIANT_ADD ('ext_ahp_rule_list_new', '/about/data/(.*)', '/about/html/^{DynamicLocalFormat}^/about/id/\x241', 'text/html', 1.0);
+ DB.DBA.HTTP_VARIANT_ADD ('ext_ahp_rule_list_new', '/about/data/(.*)', '/about/html/^{DynamicLocalFormat}^/about/id/\x241', 'text/html', 0.80);
DB.DBA.HTTP_VARIANT_ADD ('ext_ahp_rule_list_new', '/about/data/(.*)', '/about/data/text/\x241', 'text/plain', 0.20);
- DB.DBA.HTTP_VARIANT_ADD ('ext_ahp_rule_list_new', '/about/data/(.*)', '/about/data/ld/\x241', 'application/ld+json', 0.70);
- DB.DBA.HTTP_VARIANT_ADD ('ext_ahp_rule_list_new', '/about/data/(.*)', '/about/data/md/\x241', 'application/microdata+json', 0.70);
DB.DBA.URLREWRITE_CREATE_RULELIST ( 'ext_ahp_rule_list_new', 1,
vector (
@@ -848,7 +810,7 @@ create procedure virt_proxy_init_about ()
'/about/id/entity/(http|https|acct|mailto|webcal|feed|nodeID)/(.*)', vector ('sch', 'g'), 2,
'/about/data/entity/%s/%s', vector ('sch', 'g'), null,
'(application/rdf.xml)|(text/rdf.n3)|(application/x-turtle)|(text/n3)|(text/turtle)|'||
- '(application/rdf.json)|(application/json)|(text/html)|(text/plain)|(application/atom.xml)|(application/odata.json)|(application/ld.json)|(application/microdata.json)|(\\*/\\*)',
+ '(application/rdf.json)|(application/json)|(text/html)|(text/plain)|(application/atom.xml)|(application/odata.json)|(\\*/\\*)',
2, 303, null);
delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'sp_entity_rll';
@@ -859,12 +821,10 @@ create procedure virt_proxy_init_about ()
DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/data/entity/turtle/\x241', 'text/turtle', 0.80);
DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/data/entity/jrdf/\x241', 'application/rdf+json', 0.70);
DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/data/entity/json/\x241', 'application/json', 0.70);
- DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/html/^{DynamicLocalFormat}^/about/id/entity/\x241', 'text/html', 1.0);
+ DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/html/^{DynamicLocalFormat}^/about/id/entity/\x241', 'text/html', 0.80);
DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/data/entity/atom/\x241', 'application/atom+xml', 0.60);
DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/data/entity/jsod/\x241', 'application/odata+json', 0.60);
DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/data/entity/text/\x241', 'text/plain', 0.20);
- DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/data/entity/ld/\x241', 'application/ld+json', 0.70);
- DB.DBA.HTTP_VARIANT_ADD ('sp_entity_rll', '/about/data/entity/(.*)', '/about/data/entity/md/\x241', 'application/microdata+json', 0.70);
DB.DBA.URLREWRITE_CREATE_RULELIST ( 'sp_entity_rll', 1,
vector ( 'sp_entity_rl_restrict', 'sp_entity_rl_data'));
@@ -934,24 +894,6 @@ create procedure virt_proxy_init_about ()
'/about?url=%s:%U&force=rdf&output-format=application%%2Fodata%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/odata+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
- DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_8', 1,
- '/about/data/ld/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
- '/about?url=%s://%U&force=rdf&output-format=application%%2Fld%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
- 'Content-Type: application/ld+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
- DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_8_am', 1,
- '/about/data/ld/(acct|mailto)/(.*)\0x24', vector ('sch', 'url'), 2,
- '/about?url=%s:%U&force=rdf&output-format=application%%2Fld%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
- 'Content-Type: application/ld+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
-
- DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_9', 1,
- '/about/data/md/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
- '/about?url=%s://%U&force=rdf&output-format=application%%2Fmicrodata%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
- 'Content-Type: application/microdata+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
- DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('ext_ahp_rule_data_9_am', 1,
- '/about/data/md/(acct|mailto)/(.*)\0x24', vector ('sch', 'url'), 2,
- '/about?url=%s:%U&force=rdf&output-format=application%%2Fmicrodata%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
- 'Content-Type: application/microdata+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
-
DB.DBA.URLREWRITE_CREATE_RULELIST ( 'ext_ahp_rule_list_data', 1,
vector (
'ext_ahp_rule_data_1',
@@ -961,17 +903,13 @@ create procedure virt_proxy_init_about ()
'ext_ahp_rule_data_5',
'ext_ahp_rule_data_6',
'ext_ahp_rule_data_7',
- 'ext_ahp_rule_data_8',
- 'ext_ahp_rule_data_9',
'ext_ahp_rule_data_1_am',
'ext_ahp_rule_data_2_am',
'ext_ahp_rule_data_3_am',
'ext_ahp_rule_data_4_am',
'ext_ahp_rule_data_5_am',
'ext_ahp_rule_data_6_am',
- 'ext_ahp_rule_data_7_am',
- 'ext_ahp_rule_data_8_am',
- 'ext_ahp_rule_data_9_am'
+ 'ext_ahp_rule_data_7_am'
)
);
@@ -1042,24 +980,6 @@ create procedure virt_proxy_init_about ()
'/about?url=%s:%U&force=rdf&output-format=application%%2Fodata%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
'Content-Type: application/odata+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
- DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_8', 1,
- '/about/data/entity/ld/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
- '/about?url=%s://%U&force=rdf&output-format=application%%2Fld%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
- 'Content-Type: application/ld+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
- DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_8_am', 1,
- '/about/data/entity/ld/(acct|mailto)/(.*)\0x24', vector ('sch', 'url'), 2,
- '/about?url=%s:%U&force=rdf&output-format=application%%2Fld%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
- 'Content-Type: application/ld+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
-
- DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_9', 1,
- '/about/data/entity/md/(http|https|webcal|feed|nodeID)/(.*)\0x24', vector ('sch', 'url'), 2,
- '/about?url=%s://%U&force=rdf&output-format=application%%2Fmicrodata%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
- 'Content-Type: application/microdata+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
- DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('sp_ent_data_rl_9_am', 1,
- '/about/data/entity/md/(acct|mailto)/(.*)\0x24', vector ('sch', 'url'), 2,
- '/about?url=%s:%U&force=rdf&output-format=application%%2Fmicrodata%%2Bjson', vector ('sch', 'url'), null, null, 2, null,
- 'Content-Type: application/microdata+json\r\n^{sql:DB.DBA.RM_LINK_HDR}^');
-
DB.DBA.URLREWRITE_CREATE_RULELIST ( 'sp_ent_data_rll', 1,
vector (
'sp_ent_data_rl_1',
@@ -1069,17 +989,13 @@ create procedure virt_proxy_init_about ()
'sp_ent_data_rl_5',
'sp_ent_data_rl_6',
'sp_ent_data_rl_7',
- 'sp_ent_data_rl_8',
- 'sp_ent_data_rl_9',
'sp_ent_data_rl_1_am',
'sp_ent_data_rl_2_am',
'sp_ent_data_rl_3_am',
'sp_ent_data_rl_4_am',
'sp_ent_data_rl_5_am',
'sp_ent_data_rl_6_am',
- 'sp_ent_data_rl_7_am',
- 'sp_ent_data_rl_8_am',
- 'sp_ent_data_rl_9_am'
+ 'sp_ent_data_rl_7_am'
)
);
@@ -1134,7 +1050,7 @@ create procedure RM_LINK_HDR (in path varchar)
for (declare i,l int, i := 0, l := length (exts); i < l; i := i + 1)
{
if (ext <> exts[i][0])
- h := h || sprintf (' <http://%s%s>;\r\n rel="alternate"; type="%s"; title="%s",\r\n', host, fmt, exts[i][0], exts[i][1], exts[i][2]);
+ h := h || sprintf (' <http://%s'||fmt||'>;\r\n rel="alternate"; type="%s"; title="%s",\r\n', host, exts[i][0], exts[i][1], exts[i][2]);
}
h := rtrim (h, ',\r\n');
return h;
diff --git a/binsrc/rdf_mappers/rdfdesc/description.vsp b/binsrc/rdf_mappers/rdfdesc/description.vsp
index b36f643..58f2179 100644
--- a/binsrc/rdf_mappers/rdfdesc/description.vsp
+++ b/binsrc/rdf_mappers/rdfdesc/description.vsp
@@ -11,7 +11,7 @@
declare _G, _S, _S_save, odd_position any;
declare rdf_link, label, true_label, _subject any;
declare arr, data, meta, h1, h2, inx, gr, host, pars, cookievec any;
- declare iri_type, iri_uri, links, langs, dspace, sid, error_message, cookiestr, dsn, ua, sp_mode, accept_mode varchar;
+ declare iri_type, iri_uri, links, langs, dspace, sid, error_message, cookiestr, dsn, ua varchar;
declare do_sponge, force_clean, do_refresh, local_lookup, sponge_type, proxy_iri_fn, expir int;
set http_charset='utf-8';
@@ -64,17 +64,6 @@
do_refresh := null;
gr := regexp_substr ( '(.*)([\\?&]@Lookup@=.*)', gr, 1);
}
- sp_mode := 'add';
- accept_mode := null;
- if (gr like '%sponger:%=%')
- {
- declare rq any;
- rq := WS..PARSE_URI (gr);
- rq := split_and_decode (rq[4]);
- sp_mode := get_keyword ('sponger:get', rq, 'add');
- accept_mode := get_keyword ('sponger:accept', rq);
- gr := regexp_substr ( '(.*)([\\?&]sponger:(.*)=.*)', gr, 1);
- }
arr := rfc1808_parse_uri (gr);
if (arr[0] = '' and arr[1] = '' and arr[2] <> '') -- case when /about/html/www.cname/path i.e. when no scheme the default is http
gr := 'http://' || gr;
@@ -217,7 +206,7 @@
{
sparql clear graph ?:_G;
}
- DB.DBA.RM_DO_SPONGE (_G, sponge_type, do_refresh, sp_mode, accept_mode);
+ DB.DBA.RM_DO_SPONGE (_G, sponge_type, do_refresh);
commit work;
}
else if (_S like 'nodeID://%' or local_lookup = 1)
@@ -322,11 +311,6 @@
<link rel="stylesheet" type="text/css" href="statics/style_w.css" />
<link href="statics/highlighter.css" type="text/css" rel="stylesheet" charset="utf-8" />
<meta http-equiv="Content-type" content="text/html;charset=utf-8" />
- <script type="text/javascript">
- /*<![CDATA[*/
- var uri = "<?U dsn ?>";
- /*]]>*/
- </script>
<script type="text/javascript" src="statics/script.js"></script>
<script type="text/javascript" src="oat/loader.js"></script>
</head>
@@ -377,7 +361,7 @@
</a>
</div>
<div id="entity_info">
- <h1 id="title">About: <a href="<?= case when _S like 'nodeID://%' then rdfdesc_http_url (_S) else replace (_S, '#', '%01') end ?>"><?vsp http (label); ?></a></h1>
+ <h1 id="title">About: <a href="<?= case when _S like 'nodeID://%' then rdfdesc_http_url (_S) else _S end ?>"><?vsp http (label); ?></a></h1>
<div id="homelink">
</div>
<div class="page-resource-uri">
@@ -579,7 +563,6 @@
http ('Trace ID: ' || sid);
?>
</div>
- <div id="status"></div>
</div> <!-- #footer -->
<?vsp if (isstring (registry_get ('urchinTracker'))) { ?>
diff --git a/binsrc/rdf_mappers/rdfdesc/statics/script.js b/binsrc/rdf_mappers/rdfdesc/statics/script.js
index 2bbfc65..c3b4c25 100644
--- a/binsrc/rdf_mappers/rdfdesc/statics/script.js
+++ b/binsrc/rdf_mappers/rdfdesc/statics/script.js
@@ -1,32 +1,4 @@
-var featureList = ["slidebar", "resize", "ajax", "json"];
-var timer = null;
-var x = function (data)
- {
- var o = null;
- var div = $('status');
- try
- {
- o = OAT.JSON.parse(data);
- }
- catch (e)
- {
- o = null;
- }
- if (o && o.result != 0)
- {
- div.innerHTML = "Status: " + o.cartridge + ", " + o.time + "sec. in queue";
- }
- if (o && o.result == 0)
- {
- div.innerHTML = 'Status: done';
- if (timer) clearTimeout (timer);
- }
- }
-function getStatus ()
- {
- OAT.AJAX.GET ("/about/queue/status?uri=" + uri, false, x);
- timer = setTimeout ("getStatus ()", 10000);
- }
+var featureList = ["slidebar", "resize"];
function init() {
var slb = new OAT.Slidebar ("slb", {imgPrefix: "statics/", autoClose: false, width: 500, handleWidth: 15, handleOpenImg: "whats_this_open_hndl_15w.png", handleCloseImg: "whats_this_close_hndl_15w.png"});
@@ -37,7 +9,6 @@ function init() {
{
OAT.Resize.create($('x_content'),$('x_content'),OAT.Resize.TYPE_Y,restrict);
}
- getStatus ();
}
var long_literal_counter = 0;
diff --git a/binsrc/rdf_mappers/rdfdesc/statics/style_w.css b/binsrc/rdf_mappers/rdfdesc/statics/style_w.css
index fbebd03..c8dca17 100644
--- a/binsrc/rdf_mappers/rdfdesc/statics/style_w.css
+++ b/binsrc/rdf_mappers/rdfdesc/statics/style_w.css
@@ -175,5 +175,3 @@ line-height: 120%;
#FT_share { float: center; clear: both; text-align: center; margin-top: 4px; }
.addthis_toolbox { width: 400px; margin: 0 auto; }
-
-#status { margin-left:10px; margin-bottom: 3px; position:fixed; bottom:10px; }
diff --git a/binsrc/rdf_mappers/sponger_coref_post_process.sql b/binsrc/rdf_mappers/sponger_coref_post_process.sql
deleted file mode 100644
index c8463fd..0000000
--- a/binsrc/rdf_mappers/sponger_coref_post_process.sql
+++ /dev/null
@@ -1,495 +0,0 @@
---
--- $Id: sponger_coref_post_process.sql,v 1.1.2.1 2012/03/06 16:06:15 source Exp $
---
--- Post-processes Sponger generated entity URIs, identifying and
--- linking co-references by adding owl:sameAs links
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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
---
---
-
--- Searches the given graph for instances of the given type. Instances with matching values of the specified match property
--- are linked, through owl:sameAs, to a 'canonical' URI for that instance. The canonical URI is generated from the match property.
--- All instances with the same value of the match property should generate the same canonical URI.
--- The match property will typically be some label which uniquely identifies some real-world entity.
---
--- Defines:
--- DB.DBA.RM_COREF_PROCESS_SCHEMAS
--- DB.DBA.RM_COREF_SCHEMA_GET_TYPES
--- DB.DBA.RM_COREF_RESOLVE_ALL_GRAPHS_BY_TYPE
--- DB.DBA.RM_COREF_RESOLVE_BY_TYPE_AND_GRAPH
--- DB.DBA.RM_COREF_CANONICAL_URI_MAKE
--- DB.DBA.RM_COREF_CLEAN_SINGLE_SAMEAS_STMTS
--- DB.DBA.RM_COREF_RESOLVER_RESOLVE
--- DB.DBA.RM_COREF_RESOLVER_ENABLE_SELECTED_TYPES
-
-EXEC_STMT(
-'create table DB.DBA.RM_COREF_RESOLVE_TYPES (
- CR_TYPE_URI varchar,
- CR_SCHEMA_URI varchar,
- CR_STATE integer default 0,
- CR_STARTED datetime,
- CR_FINISHED datetime,
- primary key (CR_TYPE_URI)
- )', 0)
-;
-
--- CR_STATE:
--- -2: Manually marked. Always skip
--- -1: Error occurred
--- 0: Initial state
--- 1: To be checked
--- 2: Checking in progress
--- 3: Checked
-
-EXEC_STMT(
-'create table DB.DBA.RM_COREF_RESOLVE_STATUS (
- CR_GRAPH_URI varchar,
- CR_TYPE_URI varchar,
- CR_MATCH_PROP_URI varchar,
- CR_TYPE_INSTANCES integer default 0,
- CR_STATE integer default 0,
- CR_STARTED datetime,
- CR_FINISHED datetime,
- CR_MESSAGE varchar,
- primary key (CR_GRAPH_URI, CR_TYPE_URI, CR_MATCH_PROP_URI)
- )
- create index RM_COREF_RESOLVE_STAT on DB.DBA.RM_COREF_RESOLVE_STATUS (CR_STATE)', 0)
-;
-
--- CR_STATE:
--- -1: Error occurred
--- 0: Initial state
--- 1: To be checked
--- 2: Checking in progress
--- 3: Checked
-
-commit work;
-
-create procedure DB.DBA.RM_COREF_RESOLVE_ALL_GRAPHS_BY_TYPE (
- in type_uri varchar,
- in type_domain varchar,
- in coref_graph_uri varchar,
- in coref_uri_base varchar,
- in match_property_uri varchar,
- in ins_batch_size integer := 1000
- )
-{
-
- for select "g", "c" from (sparql define input:storage "" select distinct ?g count(?s) as ?c where { graph ?g { ?s a `iri (?:type_uri)`; `iri (?:match_property_uri)` ?tag . }}) x do
- {
- declare graph_uri varchar;
- declare _cr_state, type_instance_count integer;
-
- graph_uri := cast ("g" as varchar);
- type_instance_count := cast ("c" as integer);
-
- insert soft RM_COREF_RESOLVE_STATUS (CR_GRAPH_URI, CR_TYPE_URI, CR_MATCH_PROP_URI) values (graph_uri, type_uri, match_property_uri);
- _cr_state := (select CR_STATE from RM_COREF_RESOLVE_STATUS where
- CR_GRAPH_URI = graph_uri and CR_TYPE_URI = type_uri and CR_MATCH_PROP_URI = match_property_uri);
- if (_cr_state = 3)
- {
- goto next_graph;
- }
-
- update RM_COREF_RESOLVE_STATUS set CR_STARTED = now(), CR_FINISHED = null, CR_STATE = 2, CR_TYPE_INSTANCES = type_instance_count
- where CR_GRAPH_URI = graph_uri and CR_TYPE_URI = type_uri and CR_MATCH_PROP_URI = match_property_uri;
- commit work;
-
- declare exit handler for sqlstate '*'
- {
- rollback work;
-
- update RM_COREF_RESOLVE_STATUS set CR_STATE = -1, CR_MESSAGE = __SQL_MESSAGE
- where CR_GRAPH_URI = graph_uri and CR_TYPE_URI = type_uri and CR_MATCH_PROP_URI = match_property_uri;
- commit work;
- goto next_graph;
- };
-
- DB.DBA.RM_COREF_RESOLVE_BY_TYPE_AND_GRAPH (type_uri, graph_uri, type_domain, coref_graph_uri,
- coref_uri_base, match_property_uri, ins_batch_size);
-
- update RM_COREF_RESOLVE_STATUS set CR_FINISHED = now(), CR_STATE = 3
- where CR_GRAPH_URI = graph_uri and CR_TYPE_URI = type_uri and CR_MATCH_PROP_URI = match_property_uri;
- commit work;
-
-next_graph:;
- }
-}
-;
-
-create procedure DB.DBA.RM_COREF_RESOLVE_BY_TYPE_AND_GRAPH (
- in type_uri varchar,
- in graph_uri varchar,
- in type_domain varchar,
- in coref_graph_uri varchar,
- in coref_uri_base varchar,
- in match_property_uri varchar,
- in ins_batch_size integer := 1000
- )
-{
- declare qry varchar;
- declare result, meta, state, message any;
- declare sameAs_triples_dict any;
- declare iTripleBatchSize integer;
- declare sameAs_pred_id any;
-
-
- sameAs_pred_id := iri_to_id ('http://www.w3.org/2002/07/owl#sameAs');
-
- qry := sprintf ('sparql define input:storage "" select ?s ?tag from <%s> where { ?s a <%s> ; <%s> ?tag . }', graph_uri, type_uri, match_property_uri);
- state := '00000';
- exec (qry, state, message, vector(), 0, meta, result);
- if (state <> '00000')
- {
- signal (state, message, 'COREF');
- }
-
- sameAs_triples_dict := dict_new (ins_batch_size);
- iTripleBatchSize := 0;
-
- foreach (any str in result) do
- {
- declare entity_uri, entity_tag, canonical_entity_uri varchar;
-
- if (isstring (str[0]) and isstring (str[1]))
- {
- entity_uri := str[0];
- entity_tag := str[1];
-
- canonical_entity_uri := DB.DBA.RM_COREF_CANONICAL_URI_MAKE (coref_uri_base, type_domain, type_uri, entity_tag);
- if (canonical_entity_uri is not null)
- {
- declare sameAs_subj_id, sameAs_obj_id any;
-
- iTripleBatchSize := iTripleBatchSize + 1;
- -- Make owl:sameAs triple
- sameAs_subj_id := iri_to_id (entity_uri);
- sameAs_obj_id := iri_to_id (canonical_entity_uri);
- dict_put (sameAs_triples_dict, vector (sameAs_subj_id, sameAs_pred_id, sameAs_obj_id), 1);
- }
-
- -- for every ins_batch_size triples
- if (mod (iTripleBatchSize, ins_batch_size) = 0)
- {
- if (dict_size (sameAs_triples_dict))
- {
-ins_triples:
- declare sameAs_triples any;
- sameAs_triples := dict_list_keys (sameAs_triples_dict, 1);
- {
- declare deadl int;
- deadl := 5;
-ins_again:
- declare exit handler for sqlstate '40001' {
- deadl := deadl - 1;
- if (deadl > 0)
- {
- rollback work;
- goto ins_again;
- }
- resignal;
- };
- DB.DBA.RDF_INSERT_TRIPLES (coref_graph_uri, sameAs_triples);
- commit work;
- }
- iTripleBatchSize := 0;
- }
- }
- }
- }
-
--- Insert last partial batch
-if (dict_size (sameAs_triples_dict))
- goto ins_triples;
-}
-;
-
-create procedure DB.DBA.RM_COREF_CANONICAL_URI_MAKE (
- in coref_uri_base varchar,
- in type_domain varchar,
- in type_uri varchar,
- in tag varchar
- )
-{
- declare canonical_uri, type_name, tmp varchar;
- declare indx int;
-
- -- All Sponger-generated entity URIs are hash URIs
- indx := strrchr (type_uri, '#');
- if (indx is null or (indx = length (type_uri) - 1))
- return null;
- type_name := subseq (type_uri, indx + 1);
- tag := trim (tag);
- -- Skip tags > 50 chars, these are probably not true labels, more like descriptions
- if (length (tag) < 2 or length (tag) > 50)
- return null;
- if (regexp_match ('[^A-Za-z0-9 _]', tag) is not null)
- {
- return null;
- }
- tag := replace (tag, ' ', '_'); -- TO DO: Needs extending - what about other chars which must be uri-encoded
- canonical_uri := sprintf ('%s/%s/%s#%s', coref_uri_base, type_domain, type_name, tag);
- return canonical_uri;
-}
-;
-
-create procedure DB.DBA.RM_COREF_SCHEMA_GET_TYPES (in schema_uri varchar)
-{
- declare qry varchar;
- declare result, meta, state, message any;
- declare type_uris any;
-
-
- qry := sprintf ('sparql define input:storage "" select distinct ?s from <%s> where {{ ?s a owl:Class . } union { ?s a rdfs:Class . }}', schema_uri);
- state := '00000';
- exec (qry, state, message, vector(), 0, meta, result);
-
- if (state <> '00000')
- return;
-
- type_uris := vector ();
- foreach (any str in result) do
- {
- declare type_uri varchar;
-
- if (isstring (str[0]))
- {
- type_uri := str[0];
- -- Skip base classes of xxx#Object
- if (type_uri = schema_uri || '#Object')
- goto next_type;
- type_uris := vector_concat (type_uris, vector (type_uri));
- }
-next_type:;
- }
- return type_uris;
-}
-;
-
--- Identifies the types for which we might want to resolve co-references
--- by extracting type declarations from selected schemas.
--- Adds an entry to table RM_COREF_RESOLVE_TYPES for each type.
--- Only schemas with a URI matching the given stem are considered.
--- All owl:Class and rdfs:Class instances in the matching schemas are identified as candidate types.
-create procedure DB.DBA.RM_COREF_PROCESS_SCHEMAS (in schema_uri_match_stem varchar)
-{
- declare schemas any;
- schemas := vector ();
-
- for (select NS_URL from SYS_XML_PERSISTENT_NS_DECL where NS_URL like schema_uri_match_stem || '%') do
- {
- -- Skip all virt schemas (virtcxml#, virtrdf#, virtrdf-meta-entity-class#)
- if (strstr (NS_URL, 'http://www.openlinksw.com/schemas/virt') is not null)
- goto next_url;
- NS_URL := rtrim (NS_URL, '#/');
- schemas := vector_concat (schemas, vector (NS_URL));
-next_url:;
- }
-
- foreach (any _schema in schemas) do
- {
- declare schema_types any;
- schema_types := DB.DBA.RM_COREF_SCHEMA_GET_TYPES (_schema);
- foreach (any schema_type in schema_types) do
- {
- insert soft RM_COREF_RESOLVE_TYPES (CR_TYPE_URI, CR_SCHEMA_URI, CR_STATE) values (schema_type, _schema, -2);
- }
- commit work;
- }
-}
-;
-
--- Remove any single owl:sameAs statements (i.e. a canonical URI has only one referrer), they serve no purpose
-create procedure DB.DBA.RM_COREF_CLEAN_SINGLE_SAMEAS_STMTS (in coref_graph_uri varchar := 'http://virtrdf_mapper_coref')
-{
- declare qry varchar;
- declare result, meta, state, message any;
-
- qry := sprintf ('sparql define input:storage "" select distinct ?o, count(?o) as ?c from <%s> where { ?s ?p ?o }', coref_graph_uri);
- state := '00000';
- exec (qry, state, message, vector(), 0, meta, result);
- if (state <> '00000')
- return;
-
- foreach (any str in result) do
- {
- declare canonical_uri varchar;
- declare cnt integer;
-
- if (isstring (str[0]) and isinteger (str[1]))
- {
- canonical_uri := str[0];
- cnt := str[1];
- if (cnt = 1)
- {
- qry := sprintf ('sparql delete from <%s> { ?s ?p ?o } where { ?s owl:sameAs <%s> . ?s ?p ?o . }', coref_graph_uri, canonical_uri);
- state := '00000';
- exec (qry, state, message);
- if (state <> '00000')
- {
- rollback work;
- }
- else
- commit work;
-skip_delete:;
- }
- }
- }
-}
-;
-
-create procedure DB.DBA.RM_COREF_RESOLVER_ENABLE_SELECTED_TYPES ()
-{
- -- update RM_COREF_RESOLVE_TYPES set CR_STATE = 1 where CR_SCHEMA_URI like '%linkedin';
- -- update RM_COREF_RESOLVE_TYPES set CR_STATE = 1 where CR_SCHEMA_URI like '%twitter';
- -- update RM_COREF_RESOLVE_TYPES set CR_STATE = 1 where CR_SCHEMA_URI like '%googleplus';
-
- -- Some class's labels typically don't form a bounded set or can be so generic that false matches are likely
- -- These instances aren't considered individuals
- -- Examples:
- -- http://www.openlinksw.com/schemas/cv#WorkHistory
- -- http://www.openlinksw.com/schemas/googleplus#ActivityObject
- -- http://www.openlinksw.com/schemas/linkedin#Position
- -- http://www.openlinksw.com/schemas/opengraph#Album
- -- http://www.openlinksw.com/schemas/opengraph#Photo
-
- declare v_types_to_enable any;
-
- v_types_to_enable := vector (
- 'http://www.openlinksw.com/schemas/cv#Company',
- 'http://www.openlinksw.com/schemas/cv#EducationalOrg',
- 'http://www.openlinksw.com/schemas/cv#Organization',
- 'http://www.openlinksw.com/schemas/cv#Skill',
- 'http://www.openlinksw.com/schemas/googleplus#PlaceLived',
- 'http://www.openlinksw.com/schemas/linkedin#Company',
- 'http://www.openlinksw.com/schemas/linkedin#Skill',
- 'http://www.openlinksw.com/schemas/twitter#Application'
- );
-
- foreach (any type_to_enable in v_types_to_enable) do
- {
- update RM_COREF_RESOLVE_TYPES set CR_STATE = 1 where CR_TYPE_URI = type_to_enable ;
- }
- commit work;
-}
-;
-
--- ------------------------------------------------
-
-create procedure DB.DBA.RM_COREF_RESOLVER_RESOLVE (in coref_graph_uri varchar := 'http://virtrdf_mapper_coref', in cr_init_state integer := 0)
-{
- declare type_uri varchar;
- declare graph_uri varchar;
- declare type_domain varchar;
- declare coref_uri_base varchar;
- declare match_property_uri varchar;
- declare batch_size integer;
-
- coref_uri_base := coref_graph_uri;
- match_property_uri := 'http://www.w3.org/2000/01/rdf-schema#label';
- batch_size := 100;
-
- if (cr_init_state = 2)
- {
- delete from DB.DBA.RM_COREF_RESOLVE_TYPES;
- commit work;
-
- -- Identifies the types for which we might want to resolve co-references
- -- by extracting type declarations from selected schemas.
- -- Adds an entry to table RM_COREF_RESOLVE_TYPES for each type.
- -- Only schemas with a URI matching the given stem are considered.
- -- All owl:Class and rdfs:Class instances in the matching schemas are identified as candidate types.
- DB.DBA.RM_COREF_PROCESS_SCHEMAS ('http://www.openlinksw.com/schemas');
- return;
-
- -- Manually edit DB.DBA.RM_COREF_RESOLVER_ENABLE_SELECTED_TYPES (), setting CR_STATE= 1 for types you want to enable.
- }
-
- if (cr_init_state = 1)
- {
- update RM_COREF_RESOLVE_TYPES set CR_STARTED = null, CR_FINISHED = null, CR_STATE = 1 where CR_STATE >= -1;
- commit work;
- }
-
- if (cr_init_state > 0)
- {
- exec (sprintf ('sparql clear graph <%s>', coref_graph_uri));
- delete from DB.DBA.RM_COREF_RESOLVE_STATUS;
- commit work;
- }
-
- -- For each type, scan all graphs (or those not already processed if resuming a run) and generate owl:sameAs statements
- for (select CR_TYPE_URI as _cr_type_uri, CR_SCHEMA_URI from RM_COREF_RESOLVE_TYPES where CR_STATE = 1) do
- {
- update RM_COREF_RESOLVE_TYPES set CR_STARTED = now(), CR_FINISHED = null, CR_STATE = 2
- where CR_TYPE_URI = _cr_type_uri;
- commit work;
-
- type_domain := rtrim (trim (CR_SCHEMA_URI), '#/');
- type_domain := subseq (type_domain, strrchr (type_domain, '/') + 1);
- DB.DBA.RM_COREF_RESOLVE_ALL_GRAPHS_BY_TYPE (_cr_type_uri, type_domain,
- coref_graph_uri, coref_uri_base, match_property_uri, batch_size);
-
- update RM_COREF_RESOLVE_TYPES set CR_FINISHED = now(), CR_STATE = 3
- where CR_TYPE_URI = _cr_type_uri;
- commit work;
- }
-
-}
-;
-
--- cr_init_state controls resetting of entries in table RM_COREF_RESOLVE_TYPES:
--- 0 => resume
--- Leaves CR_STATE entries unchanged.
--- Resumes processing of types by RM_COREF_RESOLVE_ALL_GRAPHS_BY_TYPE() from a previous run.
--- 1 => reset
--- Resets CR_STATEs >=-1 to 1
--- Leaves types manually marked for skipping (CR_STATE = -2) intact.
--- Clears graph <http://virtrdf_mapper_coref>
--- All other types will processed from scratch by RM_COREF_RESOLVE_ALL_GRAPHS_BY_TYPE().
--- 2 => clean
--- Cleans and re-populates table RM_COREF_RESOLVE_TYPES.
--- Clears graph <http://virtrdf_mapper_coref>
--- Doesn't run RM_COREF_RESOLVE_ALL_GRAPHS_BY_TYPE(), to allow manual marking of types to be skipped.
-
-create procedure DB.DBA.RM_COREF_RESOLVER_INIT ()
-{
- DB.DBA.RM_COREF_RESOLVER_RESOLVE (cr_init_state=>2);
- log_message ('DB.DBA.RM_COREF_RESOLVER_INIT: Done');
- log_message ('Edit RM_COREF_RESOLVER_ENABLE_SELECTED_TYPES(), then run RM_COREF_RESOLVER_RUN');
-}
-;
-
-create procedure DB.DBA.RM_COREF_RESOLVER_RUN (in cr_init_state integer := 0)
-{
- DB.DBA.RM_COREF_RESOLVER_ENABLE_SELECTED_TYPES ();
-
- log_message ('DB.DBA.RM_COREF_RESOLVER_RESOLVE : Start');
- DB.DBA.RM_COREF_RESOLVER_RESOLVE (cr_init_state=>cr_init_state);
- log_message ('DB.DBA.RM_COREF_RESOLVER_RESOLVE : Done');
-
- log_message ('DB.DBA.RM_COREF_CLEAN_SINGLE_SAMEAS_STMTS : Start');
- DB.DBA.RM_COREF_CLEAN_SINGLE_SAMEAS_STMTS ();
- log_message ('DB.DBA.RM_COREF_CLEAN_SINGLE_SAMEAS_STMTS : Done');
-}
-;
-
--- DB.DBA.RM_COREF_RESOLVER_INIT ();
--- DB.DBA.RM_COREF_RESOLVER_RUN (1 / 0);
diff --git a/binsrc/rdf_mappers/sponger_front_page/examples.vsp b/binsrc/rdf_mappers/sponger_front_page/examples.vsp
index 52b6f33..a37c7f8 100644
--- a/binsrc/rdf_mappers/sponger_front_page/examples.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/examples.vsp
@@ -95,8 +95,8 @@
</div>
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div>
- </body></html>
+ </body></html>
\ No newline at end of file
diff --git a/binsrc/rdf_mappers/sponger_front_page/fb_access_token_popup.vsp b/binsrc/rdf_mappers/sponger_front_page/fb_access_token_popup.vsp
index ad1a29c..731ce96 100644
--- a/binsrc/rdf_mappers/sponger_front_page/fb_access_token_popup.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/fb_access_token_popup.vsp
@@ -46,8 +46,8 @@
return false;
}
- el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/graph.facebook.com\/.*sponger:get/, 'graph.facebook.com/' + facebook_id + '?sponger:get' );
- el_describe_sponge_uri.href = el_describe_sponge_uri.href.replace(/graph.facebook.com\/.*add/, 'graph.facebook.com/' + facebook_id + '&sponger:get=add' );
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/graph.facebook.com\/.*@Lookup@/, 'graph.facebook.com/' + facebook_id + '?@Lookup@' );
+ el_describe_sponge_uri.href = el_describe_sponge_uri.href.replace(/graph.facebook.com\/.*1/, 'graph.facebook.com/' + facebook_id + '&sp=1' );
el_about_sponge_uri.innerHTML = el_describe_sponge_uri.innerHTML = "Facebook ID: " + facebook_id;
el_fb_ds_links_no_token.style.display = 'inline';
@@ -115,15 +115,15 @@
-- Request permissions for additional info beyond the basic info returned
-- See http://developers.facebook.com/docs/authentication/permissions/ for full permissions list
- fb_login_dialog_url := fb_login_dialog_url || 'user_likes,friends_likes,user_activities,user_interests,user_notes,user_photos,user_status,user_videos,user_website,user_checkins,friends_checkins,publish_stream,read_stream';
- -- dbg_obj_print (fb_login_dialog_url);
+ fb_login_dialog_url := fb_login_dialog_url || 'user_likes,friends_likes,user_activities,user_interests,user_notes,user_photos,user_status,user_videos,user_website,user_checkins,friends_checkins';
+
http ('<script>');
http (sprintf ('top.location.href=\'%s\';', fb_login_dialog_url));
http ('</script>');
}
-- Get the access token
- oauth_url := sprintf ('https://graph.facebook.com/oauth/access_token?client_id=%U&redirect_uri=%U&client_secret=%U&code=%U',
+ oauth_url := sprintf ('https://graph.facebook.com/oauth/access_token?client_id=%s&redirect_uri=%U&client_secret=%s&code=%s',
fb_app_id, fb_app_site_url, fb_app_secret, oauth_code);
oauth_resp := http_client_ext (url=>oauth_url, headers=>oauth_headers);
@@ -254,9 +254,9 @@ auth_err: ;
<p><strong>Please update your RDF Mappers VAD. The latest VAD saves access tokens to a Virtuoso table. Manual entry of access tokens in the API Key is no longer required.</strong></p>
<?vsp } else {
declare entity_uri, about_sponge_uri, describe_sponge_uri varchar;
- about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/http/graph.facebook.com/%s?sponger:get=add&refresh=0', _host, _host, og_user_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/http/graph.facebook.com/%s?@Lookup@=&refresh=0', _host, _host, og_user_id);
entity_uri := sprintf ('http://%s/about/id/entity/http/graph.facebook.com/%s', _host, og_user_id);
- describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sp=1', _host, entity_uri);
?>
<h3>View Your Facebook Linked Data Space</h3>
<p>Here are a variety of Linked Data oriented views derived from your Facebook profile:</p>
@@ -277,10 +277,10 @@ auth_err: ;
<?vsp if (oauth_token is null) {
declare entity_uri, about_sponge_uri, describe_sponge_uri varchar;
og_user_id := 'UNKNOWN_OG_USER_ID';
- about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/http/graph.facebook.com/%s?sponger:get=add&refresh=0', _host, _host, og_user_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/http/graph.facebook.com/%s?@Lookup@=&refresh=0', _host, _host, og_user_id);
entity_uri := sprintf ('http://%s/about/id/entity/http/graph.facebook.com/%s', _host, og_user_id);
- --describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _host, entity_uri);
- describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sponger:get=add&sr=0', _host, entity_uri);
+ --describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sp=1', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sp=1', _host, entity_uri);
?>
<p><strong>You can still sponge without an access token by entering your Facebook ID.</strong></p>
@@ -329,7 +329,7 @@ auth_err: ;
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div><!-- outer -->
diff --git a/binsrc/rdf_mappers/sponger_front_page/index.vsp b/binsrc/rdf_mappers/sponger_front_page/index.vsp
index 451d15f..7441f97 100644
--- a/binsrc/rdf_mappers/sponger_front_page/index.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/index.vsp
@@ -135,7 +135,7 @@
<ul>
<li><a href=
- "javascript:if (/twitter.com$/.test(window.location.host)) window.location='http://linkeddata.uriburner.com/about/html/'+window.location.toString().replace('/#!',''); else window.location='http://linkeddata.uriburner.com/about/html/http/'+window.location.host+window.location.pathname+window.location.search;">
+ "javascript:window.location='http://linkeddata.uriburner.com/about/html/http/'+window.location.host+window.location.pathname+window.location.search">
Page Description</a> (default: XHTML with embedded
RDFa)</li>
<!--
@@ -190,7 +190,7 @@
<ul>
<li><a href=
- "javascript:if (/twitter.com$/.test(window.location.host)) window.location='http://linkeddata.uriburner.com/ode/?uri='+window.location.toString().replace('/#!',''); else window.location='http://linkeddata.uriburner.com/ode/?uri='+window.location;">
+ "javascript:window.location='http://linkeddata.uriburner.com/ode/?uri='+window.location">
OpenLink Data Explorer (a Linked Data
Browser)</a></li>
</ul>
@@ -221,34 +221,13 @@ href="http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}"
all the dereferenceable proxy/wrapper URIs generated by
this service, along the following lines:</p>
- <h4><a id="HTMLMicroformats"></a>HTML+Microformats:</h4>
+ <h4><a id="HTML"></a>HTML+Microdata:</h4>
<ul>
<li><tt>curl -I -H "Accept: text/html"</tt><br/>
<tt>http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}</tt></li>
</ul>
- <h4><a id="HTMLMicrodata"></a>HTML+Microdata:</h4>
-
- <ul>
- <li><tt>curl -I -H "Accept: text/html"</tt><br/>
- <tt>http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}</tt></li>
- </ul>
-
- <h4><a id="HTMLRDFa"></a>HTML+RDFa:</h4>
-
- <ul>
- <li><tt>curl -I -H "Accept: text/html"</tt><br/>
- <tt>http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}</tt></li>
- </ul>
-
- <h4><a id="XHTMLRDFa"></a>XHTML+RDFa:</h4>
-
- <ul>
- <li><tt>curl -I -H "Accept: application/xhtml+xml"</tt><br/>
- <tt>http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}</tt></li>
- </ul>
-
<h4><a id="JSON"></a>JSON:</h4>
<ul>
@@ -317,34 +296,32 @@ href="http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}"
starting point!</span></p>
<ul>
+ <li><a href="sponge_uri.vsp?site=WebID"><img alt="WebID icon" src=
+ "<?=skinpfx?>/i/webid_icon.png" title="Sponge your WebID / FOAF profile" /></a></li>
+
+ <li><a href="sponge_uri.vsp?site=WebFinger"><img alt="WebFinger icon" src=
+ "<?=skinpfx?>/i/webfinger.png" title="Sponge your WebFinger profile" /></a></li>
+
<li><a href=
"fb_access_token_popup.vsp"><img alt=
"Facebook icon" src="<?=skinpfx?>/i/facebook_icon.jpg" title=
"Sponge your Facebook profile"/></a></li>
- <li><a href="twitter_access_token.vsp?site=Twitter"><img alt="Twitter icon" src=
- "<?=skinpfx?>/i/twitter.jpg" title="Sponge your Twitter profile" /></a></li>
-
<li><a href="sponge_social_profile.vsp?site=Google%2B"><img alt="Google icon" src=
"<?=skinpfx?>/i/gprofile_button-44.png" title="Sponge your Google+ profile" /></a></li>
- <li><a href="linkedin_access_token.vsp"><img alt="LinkedIn icon" src=
- "<?=skinpfx?>/i/linkedin.jpg" title="Sponge your LinkedIn profile" /></a></li>
- <li><a href="sponge_uri.vsp?site=Foursquare"><img alt="foursquare icon" src=
- "<?=skinpfx?>/i/foursquare.png" title="Sponge your Foursquare profile" /></a></li>
+ <li><a href="twitter_access_token.vsp?site=Twitter"><img alt="Twitter icon" src=
+ "<?=skinpfx?>/i/twitter.jpg" title="Sponge your Twitter profile" /></a></li>
- <li><a href="sponge_uri.vsp?site=Flickr"><img alt="flickr icon" src=
- "<?=skinpfx?>/i/flickr.jpg" title="Sponge a Flickr image" /></a></li>
+ <li><a href="linkedin_access_token.vsp"><img alt="LinkedIn icon" src=
+ "<?=skinpfx?>/i/linkedin.jpg" title="Sponge your LinkedIn profile" /></a></li>
<li><a href="sponge_social_profile.vsp?site=Delicious"><img alt="delicious icon" src=
"<?=skinpfx?>/i/delicious.png" title="Sponge your Delicious profile" /></a></li>
- <li><a href="sponge_uri.vsp?site=WebID"><img alt="WebID icon" src=
- "<?=skinpfx?>/i/webid_icon.png" title="Sponge your WebID / FOAF profile" /></a></li>
-
- <li><a href="sponge_uri.vsp?site=WebFinger"><img alt="WebFinger icon" src=
- "<?=skinpfx?>/i/webfinger.png" title="Sponge your WebFinger profile" /></a></li>
+ <li><a href="sponge_uri.vsp?site=Flickr"><img alt="flickr icon" src=
+ "<?=skinpfx?>/i/flickr.jpg" title="Sponge a Flickr image" /></a></li>
</ul>
</div>
@@ -434,7 +411,7 @@ href="http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}"
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div>
diff --git a/binsrc/rdf_mappers/sponger_front_page/linkedin_access_token.vsp b/binsrc/rdf_mappers/sponger_front_page/linkedin_access_token.vsp
index c7168f4..a496468 100644
--- a/binsrc/rdf_mappers/sponger_front_page/linkedin_access_token.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/linkedin_access_token.vsp
@@ -210,9 +210,9 @@ cartridge_options_err:
declare profile_proxy_url varchar;
profile_proxy_url := replace (li_user_public_profile_url, 'http://', 'http/');
- about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?sponger:get=add&refresh=0', _host, _host, profile_proxy_url);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?@Lookup@=&refresh=0', _host, _host, profile_proxy_url);
entity_uri := sprintf ('http://%s/about/id/entity/%s', _host, profile_proxy_url);
- describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sp=1', _host, entity_uri);
?>
<p>An OAuth access token has been generated. The Linked Data Generator hosted by application <em><?=li_app_name ?></em> now has access to your LinkedIn-hosted Data Space.</p>
@@ -271,7 +271,7 @@ cartridge_options_err:
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div><!-- outer -->
diff --git a/binsrc/rdf_mappers/sponger_front_page/sponge_flickr.vsp b/binsrc/rdf_mappers/sponger_front_page/sponge_flickr.vsp
index b13d972..426fa19 100644
--- a/binsrc/rdf_mappers/sponger_front_page/sponge_flickr.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/sponge_flickr.vsp
@@ -51,9 +51,9 @@
switch (site_name)
{
case 'Flickr':
- el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/id\/entity\/.*sponger:get/, 'id/entity/' + item_id + '?sponger:get');
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/id\/entity\/.*@Lookup@/, 'id/entity/' + item_id + '?@Lookup@');
entity_uri = entity_uri.replace(/id\/entity\/.*/, 'id/entity/' + item_id);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
el_describe_sponge_uri.href = describe_href;
break;
}
@@ -134,10 +134,10 @@
declare item_id varchar;
item_id := 'UNKNOWN_ITEM_ID';
- about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?sponger:get=add&refresh=0', _host, _host, item_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?@Lookup@=&refresh=0', _host, _host, item_id);
entity_uri := sprintf ('http://%s/about/id/entity/%s', _host, item_id);
- --describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _host, entity_uri);
- describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sponger:get=add&sr=0', _host, entity_uri);
+ --describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sp=1', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sp=1', _host, entity_uri);
?>
<?vsp
@@ -194,7 +194,7 @@
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div><!-- outer -->
diff --git a/binsrc/rdf_mappers/sponger_front_page/sponge_social_profile.vsp b/binsrc/rdf_mappers/sponger_front_page/sponge_social_profile.vsp
index 6fddc94..ec93be4 100644
--- a/binsrc/rdf_mappers/sponger_front_page/sponge_social_profile.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/sponge_social_profile.vsp
@@ -30,7 +30,7 @@
var el_fb_ds_links_no_token;
var user_id = "";
- function build_sponge_links (site_name, host, entity_uri, about_sponge_uri)
+ function build_sponge_links (site_name, host, entity_uri)
{
var describe_href;
@@ -51,38 +51,22 @@
switch (site_name)
{
case 'Twitter':
- el_about_sponge_uri.href = about_sponge_uri.replace(/twitter.com\/.*sponger:get/, 'twitter.com/' + user_id + '?sponger:get');
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/twitter.com\/.*@Lookup@/, 'twitter.com/' + user_id + '?@Lookup@');
entity_uri = entity_uri.replace(/twitter.com\/.*/, 'twitter.com/' + user_id);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
el_describe_sponge_uri.href = describe_href;
break;
case 'Delicious':
- el_about_sponge_uri.href = about_sponge_uri.replace(/twitter.com\/.*sponger:get/, 'www.delicious.com/' + user_id + '?sponger:get');
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/twitter.com\/.*@Lookup@/, 'www.delicious.com/' + user_id + '?@Lookup@');
entity_uri = entity_uri.replace(/twitter.com\/.*/, 'www.delicious.com/' + user_id);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
el_describe_sponge_uri.href = describe_href;
break;
case 'Google+':
- var matches = /\/(\d{5,})/.exec (user_id);
- // Guard against a user entering their full Google+ profile URI instead of just their user ID
- if (matches != null)
- user_id = matches[1];
- else
- {
- matches = /^\d{5,}$/.exec (user_id);
- if (matches != null)
- user_id = matches[0];
- else
- {
- alert ('Please enter your ' + site_name + ' ID');
- el_fb_ds_links_no_token.style.display = 'none';
- return false;
- }
- }
- el_about_sponge_uri.href = about_sponge_uri.replace(/http\/twitter.com\/.*sponger:get/,
- 'https/plus.google.com/' + user_id + '?sponger:get');
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/http\/twitter.com\/.*@Lookup@/,
+ 'https/plus.google.com/' + user_id + '?@Lookup@');
entity_uri = entity_uri.replace(/http\/twitter.com\/.*/, 'https/plus.google.com/' + user_id);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
el_describe_sponge_uri.href = describe_href;
break;
}
@@ -106,7 +90,7 @@
if (site_name = 'Google+')
{
- rm_key := (select RM_KEY from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_GOOGLE_PLUS');
+ rm_key := (select RM_KEY from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_GOOGLE_PROFILE');
if (length(rm_key) = 0)
api_key_missing := 1;
}
@@ -154,10 +138,10 @@
declare user_id varchar;
user_id := 'UNKNOWN_USER_ID';
- about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/http/twitter.com/%s?sponger:get=add&refresh=0', _host, _host, user_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/http/twitter.com/%s?@Lookup@=&refresh=0', _host, _host, user_id);
entity_uri := sprintf ('http://%s/about/id/entity/http/twitter.com/%s', _host, user_id);
- --describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _host, entity_uri);
- describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sponger:get=add&sr=0', _host, entity_uri);
+ --describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sp=1', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sp=1', _host, entity_uri);
?>
<?vsp
@@ -177,9 +161,8 @@
else
http (sprintf ('<label for="fld_user_id">%s username: </label>', site_name));
?>
- <input type="text" maxlength="80" size="42" id="fld_user_id" name="fld_user_id" />
- <input type="submit" name="cmd_submit_FB_ID" id="cmd_submit_user_id" value="Submit"
- onclick="return build_sponge_links('<?=site_name?>', '<?=_host?>', '<?=entity_uri?>', '<?=about_sponge_uri?>');"/>
+ <input type="text" maxlength="40" size="42" id="fld_user_id" name="fld_user_id" />
+ <input type="submit" name="cmd_submit_FB_ID" id="cmd_submit_user_id" value="Submit" onclick="return build_sponge_links('<?=site_name?>', '<?=_host?>', '<?=entity_uri?>');"/>
<?vsp
if (site_name = 'Google+')
{
@@ -231,7 +214,7 @@
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div><!-- outer -->
diff --git a/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp b/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp
index 1ef4039..0704670 100644
--- a/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp
@@ -33,7 +33,6 @@
function build_sponge_links (site_name, host, entity_uri)
{
var describe_href;
- var item_id_sanitized;
el_item_id = el_item_id || document.getElementById('fld_item_id');
el_about_sponge_uri = el_about_sponge_uri || document.getElementById('about_sponge_uri');
@@ -60,24 +59,21 @@
switch (site_name)
{
case 'WebID':
- el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/about\/html\/.*sponger:get/, 'about/html/' + item_id + '?sponger:get');
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(item_id) + '&sponger:get=add&sr=0';
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/about\/html\/.*@Lookup@/, 'about/html/' + item_id + '?@Lookup@');
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(item_id) + '&sp=1';
el_describe_sponge_uri.href = describe_href;
break;
case 'WebFinger':
- item_id = item_id.replace (/^acct:/, '');
- el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/about\/html\/.*sponger:get/, 'about/html/acct:' + item_id + '?sponger:get');
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent('acct:' + item_id) + '&sponger:get=add&sr=0';
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/about\/html\/.*@Lookup@/, 'about/html/acct:' + item_id + '?@Lookup@');
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent('acct:' + item_id) + '&sp=1';
el_describe_sponge_uri.href = describe_href;
break;
case 'LinkedIn':
case 'Flickr':
- case 'Foursquare':
- item_id_sanitized = item_id.replace (/https:\//, 'https');
- item_id_sanitized = item_id_sanitized.replace (/http:\//, 'http');
- el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/id\/entity\/.*sponger:get/, 'id/entity/' + item_id_sanitized + '?sponger:get');
- entity_uri = entity_uri.replace(/id\/entity\/.*/, 'id/entity/' + item_id_sanitized);
- describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sponger:get=add&sr=0';
+ item_id = item_id.replace (/http:\//, 'http');
+ el_about_sponge_uri.href = el_about_sponge_uri.href.replace(/id\/entity\/.*@Lookup@/, 'id/entity/' + item_id + '?@Lookup@');
+ entity_uri = entity_uri.replace(/id\/entity\/.*/, 'id/entity/' + item_id);
+ describe_href = 'http://' + host + '/describe/?url=' + encodeURIComponent(entity_uri) + '&sp=1';
el_describe_sponge_uri.href = describe_href;
break;
}
@@ -97,7 +93,7 @@
<?vsp
declare _host varchar;
declare site_name varchar;
- declare rm_key, rm_opt varchar;
+ declare rm_key varchar;
declare api_key_missing integer;
site_name := http_param ('site');
@@ -109,13 +105,7 @@
if (site_name = 'Flickr')
{
rm_key := (select RM_KEY from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FLICKR_IMG');
- if (length (rm_key) = 0)
- api_key_missing := 1;
- }
- else if (site_name = 'Foursquare')
- {
- rm_opt := (select get_keyword ('oauth_token', coalesce (RM_OPTIONS, vector())) from DB.DBA.SYS_RDF_MAPPERS where RM_HOOK = 'DB.DBA.RDF_LOAD_FOURSQUARE');
- if (length (rm_opt) = 0)
+ if (length(rm_key) = 0)
api_key_missing := 1;
}
?>
@@ -170,27 +160,27 @@
item_id := 'UNKNOWN_ITEM_ID';
if (site_name = 'WebID')
{
- about_sponge_uri := sprintf ('http://%s/about/html/%s?sponger:get=add&refresh=0', _host, item_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/%s?@Lookup@=&refresh=0', _host, item_id);
entity_uri := item_id;
}
else if (site_name = 'WebFinger')
{
- about_sponge_uri := sprintf ('http://%s/about/html/acct:%s?sponger:get=add&refresh=0', _host, item_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/acct:%s?@Lookup@=&refresh=0', _host, item_id);
entity_uri := 'acct:' || item_id;
}
else
{
- about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?sponger:get=add&refresh=0', _host, _host, item_id);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?@Lookup@=&refresh=0', _host, _host, item_id);
entity_uri := sprintf ('http://%s/about/id/entity/%s', _host, item_id);
}
- --describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _host, entity_uri);
- describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sponger:get=add&sr=0', _host, entity_uri);
+ --describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sp=1', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%s&sp=1', _host, entity_uri);
?>
<?vsp
if (api_key_missing)
{
- http (sprintf ('<p>An API key or cartridge options are required for the %s cartridge, but none has been configured.<br/>Please refer to <a href="sponger_setup.vsp">Sponger Setup</a></p>', site_name));
+ http (sprintf ('<p>An API key is required for the %s cartridge, but one hasn\'t been configured.<br/>Please refer to <a href="sponger_setup.vsp">Sponger Setup</a></p>', site_name));
}
else
{
@@ -202,10 +192,8 @@
<?vsp
if (site_name = 'WebFinger')
http (sprintf ('WebFinger email address: '));
- else if (site_name = 'Foursquare')
- http (sprintf ('%s profile URL: ', site_name));
else
- http (sprintf ('%s URL: ', site_name));
+ http (sprintf ('%s URL: ', site_name));
?>
</label>
<input type="text" size="60" id="fld_item_id" name="fld_item_id" />
@@ -269,7 +257,7 @@
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div><!-- outer -->
diff --git a/binsrc/rdf_mappers/sponger_front_page/sponger_architecture.vsp b/binsrc/rdf_mappers/sponger_front_page/sponger_architecture.vsp
index d4d0d69..72bbf60 100644
--- a/binsrc/rdf_mappers/sponger_front_page/sponger_architecture.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/sponger_architecture.vsp
@@ -160,7 +160,7 @@
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div>
diff --git a/binsrc/rdf_mappers/sponger_front_page/sponger_setup.vsp b/binsrc/rdf_mappers/sponger_front_page/sponger_setup.vsp
index 5691137..ff38594 100644
--- a/binsrc/rdf_mappers/sponger_front_page/sponger_setup.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/sponger_setup.vsp
@@ -628,7 +628,7 @@
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div>
diff --git a/binsrc/rdf_mappers/sponger_front_page/twitter_access_token.vsp b/binsrc/rdf_mappers/sponger_front_page/twitter_access_token.vsp
index 1d79106..12d40fc 100644
--- a/binsrc/rdf_mappers/sponger_front_page/twitter_access_token.vsp
+++ b/binsrc/rdf_mappers/sponger_front_page/twitter_access_token.vsp
@@ -209,9 +209,9 @@ cartridge_options_err:
declare profile_proxy_url varchar;
profile_proxy_url := replace (twit_user_public_profile_url, 'http://', 'http/');
- about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?sponger:get=add&refresh=0', _host, _host, profile_proxy_url);
+ about_sponge_uri := sprintf ('http://%s/about/html/http/%s/about/id/entity/%s?@Lookup@=&refresh=0', _host, _host, profile_proxy_url);
entity_uri := sprintf ('http://%s/about/id/entity/%s', _host, profile_proxy_url);
- describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sponger:get=add&sr=0', _host, entity_uri);
+ describe_sponge_uri := sprintf ('http://%s/describe/?url=%U&sp=1', _host, entity_uri);
?>
<p>An OAuth access token has been generated. The Linked Data Generator hosted by application <em><?=twit_app_name ?></em> now has access to your Twitter-hosted Data Space.</p>
@@ -270,7 +270,7 @@ cartridge_options_err:
<div class="reset">
<div id="footer">
- Copyright (C) 1998-2012 OpenLink Software. All rights reserved.
+ Copyright (C) OpenLink Software 2011. All rights reserved.
</div>
</div>
</div><!-- outer -->
diff --git a/binsrc/rdf_mappers/vad_version b/binsrc/rdf_mappers/vad_version
index a700aa6..96729c8 100644
--- a/binsrc/rdf_mappers/vad_version
+++ b/binsrc/rdf_mappers/vad_version
@@ -1 +1 @@
-1.34.37
+1.31.21
diff --git a/binsrc/rdf_mappers/virt_rdf_label.sql b/binsrc/rdf_mappers/virt_rdf_label.sql
index c36817a..10c9c7e 100644
--- a/binsrc/rdf_mappers/virt_rdf_label.sql
+++ b/binsrc/rdf_mappers/virt_rdf_label.sql
@@ -1,12 +1,12 @@
--
--
--- $Id: virt_rdf_label.sql,v 1.1.4.21 2012/03/15 16:41:46 source Exp $
+-- $Id: virt_rdf_label.sql,v 1.1.4.7 2011/10/13 18:36:28 source Exp $
--
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -41,18 +41,6 @@ TTLP (
@prefix c: <http://www.w3.org/2002/12/cal/icaltzd#> .
@prefix oplzllw: <http://www.openlinksw.com/schemas/zillow#> .
@prefix oplgp: <http://www.openlinksw.com/schemas/googleplus#> .
- at prefix event: <http://purl.org/NET/c4dm/event.owl#> .
- at prefix dbpedia: <http://dbpedia.org/ontology/> .
- at prefix vcard: <http://www.w3.org/2001/vcard-rdf/3.0#> .
- at prefix sioc: <http://rdfs.org/sioc/ns#> .
- at prefix opltw: <http://www.openlinksw.com/schemas/twitter#> .
- at prefix sioct: <http://rdfs.org/sioc/types#> .
- at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- at prefix oplli: <http://www.openlinksw.com/schemas/linkedin#> .
- at prefix umbelrc: <http://umbel.org/umbel/rc/> .
- at prefix oplog: <http://www.openlinksw.com/schemas/opengraph#> .
- at prefix mo: <http://purl.org/ontology/mo/> .
- at prefix oplbase: <http://www.openlinksw.com/schemas/oplbase#> .
dc:title rdfs:subPropertyOf virtrdf:label .
rdfs:label rdfs:subPropertyOf virtrdf:label .
@@ -90,22 +78,22 @@ og:longitude rdfs:subPropertyOf geo:long .
<http://rdfs.org/ns/void#vocabulary> owl:equivalentProperty <http://www.openlinksw.com/schema/attribution#isDescribedUsing> .
<http://www.rdfabout.com/rdf/schema/ussec/tradingSymbol> a owl:inverseFunctionalProperty .
<http://www.rdfabout.com/rdf/schema/ussec/cik> a owl:inverseFunctionalProperty .
-foaf:logo rdfs:subPropertyOf foaf:depiction .
+foaf:logo owl:subPropertyOf foaf:depiction .
<http://umbel.org/umbel#isAbout> owl:equivalentProperty foaf:focus .
-gr:name rdfs:subPropertyOf foaf:name .
+gr:name owl:equivalentProperty foaf:name .
<http://poolparty.punkt.at/demozone/ont#title> rdfs:subPropertyOf virtrdf:label .
<http://www.w3.org/2007/05/powder-s#describedby> owl:equivalentProperty <http://www.iana.org/assignments/relation/describedby> .
<http://dbpedia.org/property/secCik> a owl:inverseFunctionalProperty .
dv:photo owl:equivalentProperty foaf:depiction .
-dv:instructions rdfs:subPropertyOf dc:description .
+dv:instructions owl:equivalentProperty dc:description .
dv:name rdfs:subPropertyOf virtrdf:label .
c:summary rdfs:subPropertyOf virtrdf:label .
c:description owl:equivalentProperty dc:description .
foaf:img rdfs:subPropertyOf virtrdf:image .
foaf:depiction rdfs:subPropertyOf virtrdf:image .
dv:photo rdfs:subPropertyOf virtrdf:image .
-<http://www.openlinksw.com/schemas/virtcxml#Custom-Screen%20Name> rdfs:subPropertyOf foaf:nick.
-<http://www.openlinksw.com/schemas/virtcxml#Custom-Real%20Name> rdfs:subPropertyOf foaf:name .
+<http://www.openlinksw.com/schemas/virtcxml#Custom-Screen%20Name> owl:equivalentProperty foaf:nick.
+<http://www.openlinksw.com/schemas/virtcxml#Custom-Real%20Name> owl:equivalentProperty foaf:name .
<http://www.openlinksw.com/schemas/virtcxml#FacetDescription> owl:equivalentProperty dcterms:description .
<http://www.w3.org/1999/02/22-rdf-syntax-ns#value> rdfs:subPropertyOf virtrdf:label .
<http://rdf.alchemyapi.com/rdf/v1/s/aapi-schema.rdf#Name> rdfs:subPropertyOf virtrdf:label .
@@ -118,643 +106,6 @@ oplgp:displayName rdfs:subPropertyOf virtrdf:label .
oplgp:activity_title rdfs:subPropertyOf virtrdf:label .
oplgp:actor_displayName rdfs:subPropertyOf virtrdf:label .
oplgp:attachment_displayName rdfs:subPropertyOf virtrdf:label .
-<http://yago-knowledge.org/resource/hasPreferredMeaning> rdfs:subPropertyOf virtrdf:label .
-<http://yago-knowledge.org/resource/hasPreferredName> rdfs:subPropertyOf virtrdf:label .
-<http://www.openlinksw.com/schemas/cert#subject> rdfs:subPropertyOf virtrdf:label .
-
-oplgp:Activity owl:equivalentClass sioc:Post .
-oplgp:ActivityObject owl:equivalentClass sioc:Post .
-oplgp:Actor owl:equivalentClass sioc:UserAccount .
-oplgp:Comment owl:equivalentClass sioc:Post .
-
-oplgp:actor owl:equivalentProperty sioc:has_creator .
-oplgp:comment_actor owl:equivalentProperty sioc:has_creator .
-oplgp:has_comment owl:equivalentProperty sioc:has_reply .
-oplgp:in_reply_to owl:equivalentProperty sioc:reply_of .
-oplgp:attachment owl:equivalentProperty sioc:attachment .
-oplgp:annotation rdfs:subPropertyOf sioc:content .
-oplgp:html_content owl:equivalentProperty sioc:content .
-oplgp:originalContent owl:equivalentProperty sioc:content .
-oplgp:content owl:equivalentProperty sioc:content .
-oplgp:comment_content owl:equivalentProperty sioc:content .
-oplgp:email owl:equivalentProperty sioc:email .
-oplgp:role owl:equivalentProperty sioc:has_function .
-oplgp:activity_replied_to_id rdfs:subPropertyOf sioc:id .
-oplgp:placeId rdfs:subPropertyOf sioc:id.
-oplgp:id owl:equivalentProperty sioc:id.
-oplgp:updated rdfs:subPropertyOf sioc:last_activity_date .
-oplgp:activity_url rdfs:subPropertyOf sioc:link .
-oplgp:profile_url rdfs:subPropertyOf sioc:link .
-oplgp:shared_url rdfs:subPropertyOf sioc:link .
-oplgp:primary_url rdfs:subPropertyOf sioc:link .
-oplgp:url_value rdfs:subPropertyOf sioc:link .
-oplgp:object_url rdfs:subPropertyOf sioc:link .
-oplgp:actor_profile_url rdfs:subPropertyOf sioc:link .
-oplgp:attachment_url rdfs:subPropertyOf sioc:link .
-oplgp:embed_url rdfs:subPropertyOf sioc:link .
-oplgp:full_image_url rdfs:subPropertyOf sioc:link .
-oplgp:preview_image_url rdfs:subPropertyOf sioc:link .
-oplgp:in_reply_to_url rdfs:subPropertyOf sioc:link .
-oplgp:displayName rdfs:subPropertyOf sioc:name .
-oplgp:name rdfs:subPropertyOf sioc:name .
-oplgp:annotation rdfs:subPropertyOf sioc:note .
-
-oplgp:Organization owl:equivalentClass foaf:Organization .
-oplgp:Person owl:equivalentClass foaf:Person .
-oplgp:FullImage owl:equivalentClass foaf:Image .
-oplgp:PreviewImage owl:equivalentClass foaf:Image .
-oplgp:Actor owl:equivalentClass foaf:OnlineAccount .
-
-oplgp:email owl:equivalentProperty foaf:mbox .
-oplgp:actor_profile_image rdfs:subPropertyOf foaf:img .
-oplgp:profile_image rdfs:subPropertyOf foaf:img .
-oplgp:fullImage rdfs:subPropertyOf foaf:img .
-oplgp:previewImage rdfs:subPropertyOf foaf:img .
-oplgp:name rdfs:subPropertyOf foaf:name .
-oplgp:familyName owl:equivalentProperty foaf:familyName .
-oplgp:givenName owl:equivalentProperty foaf:givenName .
-oplgp:gender owl:equivalentProperty foaf:gender .
-oplgp:nickname owl:equivalentProperty foaf:nick .
-oplgp:date_of_birth owl:equivalentProperty foaf:birthday .
-oplgp:relationshipStatus rdfs:subPropertyOf foaf:status .
-oplgp:honorificPrefix owl:equivalentProperty foaf:title .
-
-oplgp:aboutMe rdfs:subPropertyOf dc:description .
-oplgp:activity_title owl:equivalentProperty dc:title .
-oplgp:published rdfs:subPropertyOf dc:date .
-oplgp:updated rdfs:subPropertyOf dc:date .
-oplgp:date_of_birth rdfs:subPropertyOf dc:date .
-oplgp:endDate rdfs:subPropertyOf dc:date .
-oplgp:startDate rdfs:subPropertyOf dc:date .
-oplgp:actor owl:equivalentProperty dc:creator .
-oplgp:comment_actor owl:equivalentProperty dc:creator .
-oplgp:tagline rdfs:subPropertyOf dc:description .
-oplgp:role rdfs:subPropertyOf dc:description .
-oplgp:access_description rdfs:subPropertyOf dc:description .
-oplgp:attachment_media_type rdfs:subPropertyOf dc:format .
-oplgp:full_image_width rdfs:subPropertyOf dc:format .
-oplgp:full_image_height rdfs:subPropertyOf dc:format .
-oplgp:preview_image_height rdfs:subPropertyOf dc:format .
-oplgp:preview_image_width rdfs:subPropertyOf dc:format .
-oplgp:activity_replied_to_id rdfs:subPropertyOf dc:identifier .
-oplgp:placeId rdfs:subPropertyOf dc:identifier .
-oplgp:id rdfs:subPropertyOf dc:identifier .
-oplgp:speaksLanguage rdfs:subPropertyOf dc:language .
-oplgp:activity_title owl:equivalentProperty dc:publisher .
-oplgp:relationshipStatus rdfs:subPropertyOf dc:relation .
-oplgp:profile_url rdfs:subPropertyOf dc:source .
-oplgp:shared_url rdfs:subPropertyOf dc:source .
-oplgp:crosspostSource rdfs:subPropertyOf dc:source .
-oplgp:activity_url rdfs:subPropertyOf dc:source .
-oplgp:activity_url rdfs:subPropertyOf dc:source .
-oplgp:url_value rdfs:subPropertyOf dc:source .
-oplgp:object_url rdfs:subPropertyOf dc:source .
-oplgp:actor_profile_url rdfs:subPropertyOf dc:source .
-oplgp:attachment_url rdfs:subPropertyOf dc:source .
-oplgp:embed_url rdfs:subPropertyOf dc:source .
-oplgp:full_image_url rdfs:subPropertyOf dc:source .
-oplgp:preview_image_url rdfs:subPropertyOf dc:source .
-oplgp:comment_self_link rdfs:subPropertyOf dc:source .
-oplgp:in_reply_to_url rdfs:subPropertyOf dc:source .
-oplgp:title owl:equivalentProperty dc:title .
-oplgp:attachment_displayName rdfs:subPropertyOf dc:title .
-oplgp:activity_title rdfs:subPropertyOf dc:title .
-oplgp:email_type rdfs:subPropertyOf dc:type .
-oplgp:organization_type owl:equivalentProperty dc:type .
-oplgp:url_type rdfs:subPropertyOf dc:type .
-oplgp:access_item_type rdfs:subPropertyOf dc:type .
-oplgp:activity_object_type rdfs:subPropertyOf dc:type .
-oplgp:attachment_media_type rdfs:subPropertyOf dc:type .
-oplgp:embed_media_type rdfs:subPropertyOf dc:type .
-oplgp:full_image_media_type rdfs:subPropertyOf dc:type .
-oplgp:preview_image_media_type rdfs:subPropertyOf dc:type .
-
-oplgp:published owl:equivalentProperty dcterms:created .
-oplgp:updated owl:equivalentProperty dcterms:date .
-oplgp:actor owl:equivalentProperty dcterms:creator .
-oplgp:comment_actor owl:equivalentProperty dcterms:creator .
-oplgp:aboutMe rdfs:subPropertyOf dcterms:description .
-oplgp:tagline rdfs:subPropertyOf dcterms:description .
-oplgp:access_description rdfs:subPropertyOf dcterms:description .
-oplgp:attachment_media_type rdfs:subPropertyOf dcterms:format .
-oplgp:full_image_width rdfs:subPropertyOf dcterms:format .
-oplgp:full_image_height rdfs:subPropertyOf dcterms:format .
-oplgp:preview_image_height rdfs:subPropertyOf dcterms:format .
-oplgp:preview_image_width rdfs:subPropertyOf dcterms:format .
-oplgp:activity_replied_to_id rdfs:subPropertyOf dcterms:identifier .
-oplgp:placeId rdfs:subPropertyOf dcterms:identifier .
-oplgp:id rdfs:subPropertyOf dcterms:identifier .
-oplgp:speaksLanguage rdfs:subPropertyOf dcterms:language .
-oplgp:updated owl:equivalentProperty dcterms:modified .
-oplgp:activity_title owl:equivalentProperty dcterms:publisher .
-oplgp:relationshipStatus rdfs:subPropertyOf dcterms:relation .
-oplgp:profile_url rdfs:subPropertyOf dcterms:source .
-oplgp:shared_url rdfs:subPropertyOf dcterms:source .
-oplgp:crosspostSource rdfs:subPropertyOf dcterms:source .
-oplgp:activity_url rdfs:subPropertyOf dcterms:source .
-oplgp:activity_url rdfs:subPropertyOf dcterms:source .
-oplgp:url_value rdfs:subPropertyOf dcterms:source .
-oplgp:object_url rdfs:subPropertyOf dcterms:source .
-oplgp:actor_profile_url rdfs:subPropertyOf dcterms:source .
-oplgp:attachment_url rdfs:subPropertyOf dcterms:source .
-oplgp:embed_url rdfs:subPropertyOf dcterms:source .
-oplgp:full_image_url rdfs:subPropertyOf dcterms:source .
-oplgp:preview_image_url rdfs:subPropertyOf dcterms:source .
-oplgp:comment_self_link rdfs:subPropertyOf dcterms:source .
-oplgp:in_reply_to_url rdfs:subPropertyOf dcterms:source .
-oplgp:title owl:equivalentProperty dcterms:title .
-oplgp:attachment_displayName owl:equivalentProperty dcterms:title .
-oplgp:activity_title owl:equivalentProperty dcterms:title .
-oplgp:email_type rdfs:subPropertyOf dcterms:type .
-oplgp:organization_type owl:equivalentProperty dcterms:type .
-oplgp:url_type rdfs:subPropertyOf dcterms:type .
-oplgp:access_item_type rdfs:subPropertyOf dcterms:type .
-oplgp:activity_object_type rdfs:subPropertyOf dcterms:type .
-oplgp:attachment_media_type rdfs:subPropertyOf dcterms:type .
-oplgp:embed_media_type rdfs:subPropertyOf dcterms:type .
-oplgp:full_image_media_type rdfs:subPropertyOf dcterms:type .
-oplgp:preview_image_media_type rdfs:subPropertyOf dcterms:type .
-
-oplgp:FullImage owl:equivalentClass bibo:Image .
-oplgp:Email owl:equivalentClass bibo:Email .
-oplgp:PreviewImage owl:equivalentClass bibo:Image .
-
-oplgp:annotation rdfs:subPropertyOf bibo:annotates .
-oplgp:originalContent owl:equivalentProperty bibo:content .
-oplgp:content owl:equivalentProperty bibo:content .
-oplgp:comment_content owl:equivalentProperty bibo:content .
-oplgp:html_content owl:equivalentProperty bibo:content .
-oplgp:relationshipStatus owl:equivalentProperty bibo:status .
-oplgp:activity_title owl:equivalentProperty bibo:title .
-oplgp:activity_title owl:equivalentProperty bibo:title .
-oplgp:title owl:equivalentProperty bibo:title .
-oplgp:attachment_displayName owl:equivalentProperty bibo:title .
-oplgp:actor owl:equivalentProperty bibo:owner .
-oplgp:comment_actor owl:equivalentProperty bibo:owner .
-oplgp:activity_replied_to_id rdfs:subPropertyOf bibo:identifier .
-oplgp:placeId rdfs:subPropertyOf bibo:identifier .
-oplgp:id rdfs:subPropertyOf bibo:identifier .
-oplgp:honorificPrefix owl:equivalentProperty bibo:prefixName .
-oplgp:honorificSuffix owl:equivalentProperty bibo:suffixName .
-
-oplgp:placeName owl:equivalentProperty event:place .
-
-oplgp:date_of_birth owl:equivalentProperty <http://www.openlinksw.com/schemas/rdfs/birthDate#this> .
-
-oplgp:honorificPrefix owl:equivalentProperty vcard:TITLE .
-oplgp:nickname owl:equivalentProperty vcard:NICKNAME .
-oplgp:date_of_birth owl:equivalentProperty vcard:BDAY .
-oplgp:title owl:equivalentProperty vcard:TITLE .
-oplgp:role owl:equivalentProperty vcard:ROLE .
-oplgp:annotation rdfs:subPropertyOf vcard:NOTE .
-oplgp:email owl:equivalentProperty vcard:EMAIL .
-oplgp:name rdfs:subPropertyOf vcard:N .
-oplgp:familyName owl:equivalentProperty vcard:Family .
-oplgp:givenName owl:equivalentProperty vcard:Given .
-oplgp:honorificPrefix owl:equivalentProperty vcard:Prefix .
-oplgp:honorificSuffix owl:equivalentProperty vcard:Suffix .
-oplgp:organization_name owl:equivalentProperty vcard:ORG .
-oplgp:department rdfs:subPropertyOf vcard:Orgunit .
-oplgp:actor_profile_image owl:equivalentProperty vcard:PHOTO .
-oplgp:profile_image rdfs:subPropertyOf vcard:PHOTO .
-oplgp:fullImage rdfs:subPropertyOf vcard:PHOTO .
-oplgp:previewImage rdfs:subPropertyOf vcard:PHOTO .
-
-oplgp:shared_url owl:equivalentProperty rdfs:seeAlso .
-
-oplgp:Activity owl:equivalentClass dbpedia:Activity .
-oplgp:Name owl:equivalentClass dbpedia:Name .
-oplgp:Organization owl:equivalentClass dbpedia:Organization .
-oplgp:Person owl:equivalentClass dbpedia:Person .
-oplgp:Actor owl:equivalentClass dbpedia:Actor .
-oplgp:PlaceLived owl:equivalentClass dbpedia:Place .
-oplgp:activity_title owl:equivalentClass dbpedia:Publisher .
-oplgp:published rdfs:subPropertyOf dbpedia:Date .
-oplgp:updated rdfs:subPropertyOf dbpedia:Date .
-oplgp:access owl:equivalentProperty dbpedia:Access .
-oplgp:address owl:equivalentProperty dbpedia:Address .
-oplgp:annotation rdfs:subPropertyOf dbpedia:Note .
-oplgp:placeName owl:equivalentProperty dbpedia:Place .
-oplgp:currentLocation owl:equivalentProperty dbpedia:LocatedInArea .
-oplgp:date_of_birth owl:equivalentProperty dbpedia:BirthDate .
-oplgp:gender owl:equivalentProperty dbpedia:Genre .
-oplgp:speaksLanguage owl:equivalentProperty dbpedia:Language .
-oplgp:relationshipStatus owl:equivalentProperty dbpedia:Relation .
-oplgp:department owl:equivalentProperty dbpedia:Department .
-oplgp:role owl:equivalentProperty dbpedia:Role .
-oplgp:location owl:equivalentProperty dbpedia:Location .
-oplgp:title owl:equivalentProperty dbpedia:Title .
-
-
-opltw:User owl:equivalentClass foaf:Person .
-opltw:made_tweet owl:equivalentProperty foaf:made .
-opltw:via owl:equivalentProperty foaf:maker .
-
-opltw:Tweet owl:equivalentClass sioc:Post .
-opltw:User owl:equivalentClass sioc:UserAccount .
-opltw:made_tweet owl:equivalentProperty sioc:has_creator .
-opltw:id owl:equivalentProperty sioc:id .
-opltw:appLink owl:equivalentProperty sioc:link .
-
-opltw:Tweet owl:equivalentClass sioct:MicroblogPost .
-
-opltw:appLink owl:equivalentProperty rdf:Resource .
-
-opltw:User owl:equivalentClass dc:Agent .
-opltw:made_tweet owl:equivalentProperty dc:creator .
-opltw:id rdfs:subPropertyOf dc:identifier .
-opltw:appLink rdfs:subPropertyOf dc:source .
-
-opltw:User owl:equivalentClass dcterms:Agent .
-opltw:made_tweet owl:equivalentProperty dcterms:creator .
-opltw:id rdfs:subPropertyOf dcterms:identifier .
-opltw:appLink rdfs:subPropertyOf dcterms:source .
-
-opltw:Tweet owl:equivalentClass bibo:Article.
-opltw:id rdfs:subPropertyOf bibo:identifier .
-
-opltw:Tweet owl:equivalentClass dbpedia:Activity .
-opltw:User owl:equivalentClass dbpedia:Actor .
-opltw:User owl:equivalentClass dbpedia:Person .
-opltw:Application owl:equivalentClass dbpedia:Software .
-opltw:id owl:equivalentProperty dbpedia:Id .
-opltw:followed_by owl:equivalentProperty dbpedia:Person .
-opltw:follows owl:equivalentProperty dbpedia:Person .
-opltw:made_tweet owl:equivalentProperty dbpedia:Owner .
-
-
-oplli:Person owl:equivalentClass foaf:Person .
-oplli:Company owl:equivalentClass foaf:Organization .
-oplli:InstantMessagingAccount rdfs:subClassOf foaf:OnlineAccount .
-oplli:TwitterAccount owl:equivalentClass foaf:OnlineAccount .
-
-oplli:first_name owl:equivalentProperty foaf:firstName .
-oplli:has_im_account owl:equivalentProperty foaf:account .
-oplli:has_twitter_account owl:equivalentProperty foaf:account .
-oplli:interests owl:equivalentProperty foaf:interest .
-oplli:last_name owl:equivalentProperty foaf:lastName .
-oplli:location_name owl:equivalentProperty foaf:based_near .
-oplli:picture_url owl:equivalentProperty foaf:img .
-oplli:publication owl:equivalentProperty foaf:publications .
-oplli:public_profile_url rdfs:subPropertyOf foaf:accountServiceHomepage .
-oplli:public_profile_url rdfs:subPropertyOf foaf:page .
-oplli:im_account_name owl:equivalentProperty foaf:accountName .
-oplli:phone_number owl:equivalentProperty foaf:phone .
-oplli:publication_title owl:equivalentProperty foaf:publications .
-
-
-oplli:Publication owl:equivalentClass sioc:Post .
-oplli:Recommendation owl:equivalentClass sioc:Post .
-oplli:InstantMessagingAccount owl:equivalentClass sioc:UserAccount .
-oplli:TwitterAccount owl:equivalentClass sioc:UserAccount .
-oplli:Skill owl:equivalentClass sioc:Role .
-
-oplli:id owl:equivalentProperty sioc:id .
-oplli:patent_status_id rdfs:subPropertyOf sioc:id .
-oplli:inventor_id rdfs:subPropertyOf sioc:id .
-oplli:author_id rdfs:subPropertyOf sioc:id .
-oplli:provider_account_id rdfs:subPropertyOf sioc:id .
-oplli:member_url_resource rdfs:subPropertyOf sioc:link .
-oplli:picture_url rdfs:subPropertyOf sioc:link .
-oplli:public_profile_url rdfs:subPropertyOf sioc:link .
-oplli:patent_url rdfs:subPropertyOf sioc:link .
-oplli:member_shared_resource_url rdfs:subPropertyOf sioc:link .
-oplli:publication_url rdfs:subPropertyOf sioc:link .
-oplli:summary owl:equivalentProperty sioc:content .
-oplli:patent_summary owl:equivalentProperty sioc:content .
-oplli:publication_summary owl:equivalentProperty sioc:content .
-oplli:education_notes rdfs:subPropertyOf sioc:note .
-oplli:provider_account_name rdfs:subPropertyOf sioc:name .
-oplli:first_name rdfs:subPropertyOf sioc:name .
-oplli:im_account_name rdfs:subPropertyOf sioc:name .
-oplli:company_name rdfs:subPropertyOf sioc:name .
-oplli:school_name rdfs:subPropertyOf sioc:name .
-oplli:publisher_name rdfs:subPropertyOf sioc:name .
-oplli:author_name rdfs:subPropertyOf sioc:name .
-oplli:provider_account_name rdfs:subPropertyOf sioc:name .
-oplli:last_name rdfs:subPropertyOf sioc:name .
-oplli:proposal_comments rdfs:subPropertyOf sioc:note .
-oplli:certification_name rdfs:subPropertyOf sioc:name .
-oplli:language_name rdfs:subPropertyOf sioc:name .
-oplli:publication_title rdfs:subPropertyOf sioc:name .
-oplli:member_shared_resource_name rdfs:subPropertyOf sioc:name .
-
-oplli:Person rdfs:subClassOf dc:Agent .
-oplli:Company rdfs:subClassOf dc:Agent .
-oplli:InstantMessagingAccount rdfs:subClassOf dc:Agent .
-oplli:TwitterAccount rdfs:subClassOf dc:Agent .
-
-oplli:proposal_comments rdfs:subPropertyOf dc:description .
-oplli:associations rdfs:subPropertyOf dc:description .
-oplli:certification rdfs:subPropertyOf dc:description .
-oplli:language owl:equivalentProperty dc:language .
-oplli:company_type rdfs:subPropertyOf dc:type .
-oplli:im_account_type rdfs:subPropertyOf dc:type .
-oplli:phone_number_type rdfs:subPropertyOf dc:type .
-oplli:recommendation_type rdfs:subPropertyOf dc:type .
-oplli:id owl:equivalentProperty dc:identifier .
-oplli:patent_status_id rdfs:subPropertyOf dc:identifier .
-oplli:inventor_id rdfs:subPropertyOf dc:identifier .
-oplli:author_id rdfs:subPropertyOf dc:identifier .
-oplli:provider_account_id rdfs:subPropertyOf dc:identifier .
-oplli:member_url_resource rdfs:subPropertyOf dc:source .
-oplli:picture_url rdfs:subPropertyOf dc:source .
-oplli:public_profile_url rdfs:subPropertyOf dc:source .
-oplli:member_shared_resource_url rdfs:subPropertyOf dc:source .
-oplli:patent_url rdfs:subPropertyOf dc:source .
-oplli:publication_url rdfs:subPropertyOf dc:source .
-oplli:publisher_name owl:equivalentProperty dc:publisher .
-oplli:summary owl:equivalentProperty dc:description .
-oplli:patent_title owl:equivalentProperty dc:title .
-oplli:title owl:equivalentProperty dc:title .
-oplli:publication_title owl:equivalentProperty dc:title .
-oplli:date_of_birth rdfs:subPropertyOf dc:date .
-oplli:certification_start_date rdfs:subPropertyOf dc:date .
-oplli:certification_end_date rdfs:subPropertyOf dc:date .
-oplli:education_start_date rdfs:subPropertyOf dc:date .
-oplli:education_end_date rdfs:subPropertyOf dc:date .
-oplli:patent_date rdfs:subPropertyOf dc:date .
-oplli:end_date rdfs:subPropertyOf dc:date .
-oplli:start_date rdfs:subPropertyOf dc:date .
-oplli:publication_date rdfs:subPropertyOf dc:date .
-oplli:author_name owl:equivalentProperty dc:creator .
-
-oplli:Person rdfs:subClassOf dcterms:Agent .
-oplli:Company rdfs:subClassOf dcterms:Agent .
-oplli:InstantMessagingAccount rdfs:subClassOf dcterms:Agent .
-oplli:TwitterAccount rdfs:subClassOf dcterms:Agent .
-
-oplli:proposal_comments rdfs:subPropertyOf dcterms:description .
-oplli:associations rdfs:subPropertyOf dcterms:description .
-oplli:certification rdfs:subPropertyOf dcterms:description .
-oplli:education rdfs:subPropertyOf dcterms:educationLevel .
-oplli:language owl:equivalentProperty dcterms:language .
-oplli:company_type rdfs:subPropertyOf dcterms:type .
-oplli:im_account_type rdfs:subPropertyOf dcterms:type .
-oplli:phone_number_type rdfs:subPropertyOf dcterms:type .
-oplli:recommendation_type rdfs:subPropertyOf dcterms:type .
-oplli:id owl:equivalentProperty dcterms:identifier .
-oplli:patent_status_id rdfs:subPropertyOf dcterms:identifier .
-oplli:inventor_id rdfs:subPropertyOf dcterms:identifier .
-oplli:author_id rdfs:subPropertyOf dcterms:identifier .
-oplli:provider_account_id rdfs:subPropertyOf dcterms:identifier .
-oplli:member_url_resource rdfs:subPropertyOf dcterms:source .
-oplli:picture_url rdfs:subPropertyOf dcterms:source .
-oplli:public_profile_url rdfs:subPropertyOf dcterms:source .
-oplli:member_shared_resource_url rdfs:subPropertyOf dcterms:source .
-oplli:patent_url rdfs:subPropertyOf dcterms:source .
-oplli:publication_url rdfs:subPropertyOf dcterms:source .
-oplli:publisher_name owl:equivalentProperty dcterms:publisher .
-oplli:summary owl:equivalentProperty dcterms:description .
-oplli:patent_title owl:equivalentProperty dcterms:title .
-oplli:title owl:equivalentProperty dcterms:title .
-oplli:publication_title owl:equivalentProperty dcterms:title .
-oplli:date_of_birth rdfs:subPropertyOf dcterms:date .
-oplli:certification_start_date rdfs:subPropertyOf dcterms:date .
-oplli:certification_end_date rdfs:subPropertyOf dcterms:date .
-oplli:education_start_date rdfs:subPropertyOf dcterms:date .
-oplli:education_end_date rdfs:subPropertyOf dcterms:date .
-oplli:patent_date rdfs:subPropertyOf dcterms:date .
-oplli:end_date rdfs:subPropertyOf dcterms:date .
-oplli:start_date rdfs:subPropertyOf dcterms:date .
-oplli:publication_date rdfs:subPropertyOf dcterms:date .
-oplli:author_name owl:equivalentProperty dcterms:creator .
-
-
-oplli:Patent owl:equivalentClass bibo:Patent .
-oplli:Publication rdfs:subClassOf bibo:Document .
-
-oplli:publication_url rdfs:subPropertyOf bibo:uri .
-oplli:education_notes rdfs:subPropertyOf bibo:annotates .
-oplli:patent_number rdfs:subPropertyOf bibo:number .
-oplli:skill_years_of_experience rdfs:subPropertyOf bibo:number .
-oplli:patent_status rdfs:subPropertyOf bibo:status .
-oplli:author_name rdfs:subPropertyOf bibo:owner.
-oplli:author_name rdfs:subPropertyOf bibo:producer .
-oplli:author_person rdfs:subPropertyOf bibo:owner.
-oplli:author_person rdfs:subPropertyOf bibo:producer .
-oplli:patent_summary rdfs:subPropertyOf bibo:content .
-oplli:position_summary rdfs:subPropertyOf bibo:content .
-oplli:publication_summary rdfs:subPropertyOf bibo:content .
-oplli:summary rdfs:subPropertyOf bibo:content .
-oplli:id owl:equivalentProperty bibo:identifier .
-oplli:patent_status_id rdfs:subPropertyOf bibo:identifier .
-oplli:inventor_id rdfs:subPropertyOf bibo:identifier .
-oplli:author_id rdfs:subPropertyOf bibo:identifier .
-oplli:provider_account_id rdfs:subPropertyOf bibo:identifier .
-
-
-oplli:date_of_birth owl:equivalentProperty vcard:BDAY .
-oplli:education_notes rdfs:subPropertyOf vcard:NOTE .
-oplli:first_name owl:equivalentProperty vcard:Given .
-oplli:last_name owl:equivalentProperty vcard:Family .
-oplli:picture_url owl:equivalentProperty vcard:PHOTO .
-oplli:company_industry rdfs:subPropertyOf vcard:Orgunit .
-oplli:company_name owl:equivalentProperty vcard:Orgname .
-oplli:id owl:equivalentProperty vcard:UID .
-oplli:patent_status_id rdfs:subPropertyOf vcard:UID .
-oplli:inventor_id rdfs:subPropertyOf vcard:UID .
-oplli:author_id rdfs:subPropertyOf vcard:UID .
-oplli:provider_account_id rdfs:subPropertyOf vcard:UID .
-oplli:phone_number owl:equivalentProperty vcard:TEL .
-oplli:phone_number_type owl:equivalentProperty vcard:TELTYPES .
-oplli:main_address owl:equivalentProperty vcard:ADR .
-
-oplli:Person owl:equivalentClass dbpedia:Person .
-oplli:InstantMessagingAccount owl:equivalentClass dbpedia:Person .
-oplli:TwitterAccount owl:equivalentClass dbpedia:Person .
-oplli:Company owl:equivalentClass dbpedia:Organization .
-oplli:Language owl:equivalentClass dbpedia:Language .
-oplli:Publication owl:equivalentClass dbpedia:Activity .
-oplli:date_of_birth rdfs:subPropertyOf dbpedia:Date .
-oplli:certification_start_date rdfs:subPropertyOf dbpedia:Date .
-oplli:certification_end_date rdfs:subPropertyOf dbpedia:Date .
-oplli:education_start_date rdfs:subPropertyOf dbpedia:Date .
-oplli:education_end_date rdfs:subPropertyOf dbpedia:Date .
-oplli:patent_date rdfs:subPropertyOf dbpedia:Date .
-oplli:end_date rdfs:subPropertyOf dbpedia:Date .
-oplli:start_date rdfs:subPropertyOf dbpedia:Date .
-oplli:publication_date rdfs:subPropertyOf dbpedia:Date .
-oplli:main_address owl:equivalentProperty dbpedia:Address .
-oplli:education_notes rdfs:subPropertyOf dbpedia:Note .
-oplli:location_name owl:equivalentProperty dbpedia:Place .
-oplli:date_of_birth owl:equivalentProperty dbpedia:BirthDate .
-oplli:patent_title owl:equivalentProperty dbpedia:Title .
-oplli:title owl:equivalentProperty dbpedia:Title .
-oplli:publication_title owl:equivalentProperty dbpedia:Title .
-oplli:school_name owl:equivalentProperty dbpedia:School .
-oplli:education_start_date owl:equivalentProperty dbpedia:StartDate .
-oplli:start_date owl:equivalentProperty dbpedia:StartDate .
-oplli:certification_start_date owl:equivalentProperty dbpedia:StartDate .
-oplli:certification_end_date owl:equivalentProperty dbpedia:EndDate .
-oplli:education_end_date owl:equivalentProperty dbpedia:EndDate .
-oplli:end_date owl:equivalentProperty dbpedia:EndDate .
-oplli:certification_name owl:equivalentProperty dbpedia:Certification .
-oplli:specialties owl:equivalentProperty dbpedia:Specialist .
-oplli:patent owl:equivalentProperty dbpedia:Patent .
-oplli:associations owl:equivalentProperty dbpedia:Associate .
-oplli:country_code rdfs:subPropertyOf dbpedia:AreaCode .
-oplli:education owl:equivalentProperty dbpedia:Education .
-oplli:publication_date owl:equivalentProperty dbpedia:FirstPublicationDate .
-oplli:publication_date owl:equivalentProperty dbpedia:PublicationDate .
-oplli:distance owl:equivalentProperty dbpedia:Distance .
-oplli:industry owl:equivalentProperty dbpedia:Industry .
-oplli:interests owl:equivalentProperty dbpedia:Interest .
-oplli:language owl:equivalentProperty dbpedia:Language .
-oplli:location_name owl:equivalentProperty dbpedia:Location .
-oplli:main_address owl:equivalentProperty dbpedia:Address .
-oplli:patent owl:equivalentProperty dbpedia:Patent .
-oplli:title owl:equivalentProperty dbpedia:Position .
-oplli:publisher_name owl:equivalentProperty dbpedia:Publisher .
-oplli:company_name owl:equivalentProperty dbpedia:Company .
-oplli:patent_status owl:equivalentProperty dbpedia:Status .
-oplli:patent_number rdfs:subPropertyOf dbpedia:Number .
-oplli:certification_number rdfs:subPropertyOf dbpedia:Number .
-oplli:phone_number rdfs:subPropertyOf dbpedia:Number .
-oplli:skill_years_of_experience rdfs:subPropertyOf dbpedia:Number .
-oplli:company_type rdfs:subPropertyOf dbpedia:Type .
-oplli:im_account_type rdfs:subPropertyOf dbpedia:Type .
-oplli:phone_number_type rdfs:subPropertyOf dbpedia:Type .
-oplli:recommendation_type rdfs:subPropertyOf dbpedia:Type .
-oplli:member_url_resource rdfs:subPropertyOf dbpedia:Source .
-oplli:picture_url rdfs:subPropertyOf dbpedia:Source .
-oplli:public_profile_url rdfs:subPropertyOf dbpedia:Source .
-oplli:member_shared_resource_url rdfs:subPropertyOf dbpedia:Source .
-oplli:patent_url rdfs:subPropertyOf dbpedia:Source .
-oplli:publication_url rdfs:subPropertyOf dbpedia:Source .
-oplli:inventor_person rdfs:subPropertyOf dbpedia:Person .
-oplli:author_name rdfs:subPropertyOf dbpedia:Author .
-oplli:author_person rdfs:subPropertyOf dbpedia:Author .
-
-oplli:Company owl:equivalentClass gr:BusinessEntity .
-
-oplli:Language owl:equivalentClass <http://www.openlinksw.com/schemas/rdfs/Language#this> .
-
-oplli:Publication owl:equivalentClass umbelrc:ScholarlyArticle .
-
-oplli:date_of_birth owl:equivalentProperty <http://www.openlinksw.com/schemas/rdfs/birthDate#this> .
-
-oplli:has_phone_number owl:equivalentProperty <http://www.openlinksw.com/schemas/rdfs/telephone#this> .
-
-
-oplog:Account owl:equivalentClass foaf:OnlineAccount .
-oplog:Group owl:equivalentClass foaf:Group .
-oplog:Note rdfs:subClassOf foaf:Document .
-oplog:Photo rdfs:subClassOf foaf:Image .
-oplog:User rdfs:subClassOf foaf:Person .
-oplog:Image owl:equivalentClass foaf:Image .
-oplog:Album rdfs:subClassOf mo:ReleaseType .
-oplog:Application rdfs:subClassOf dbpedia:Software .
-
-oplog:has_picture rdfs:subPropertyOf foaf:img .
-oplog:picture rdfs:subPropertyOf foaf:img .
-oplog:has_photo rdfs:subPropertyOf foaf:img .
-oplog:photos rdfs:subPropertyOf foaf:img .
-oplog:has_account rdfs:subPropertyOf foaf:page .
-oplog:name rdfs:subPropertyOf foaf:name .
-oplog:uri rdfs:subPropertyOf foaf:homepage .
-oplog:website rdfs:subPropertyOf foaf:homepage .
-oplog:has_interest owl:equivalentProperty foaf:interest .
-oplog:first_name owl:equivalentProperty foaf:firstName .
-oplog:last_name owl:equivalentProperty foaf:lastName .
-oplog:gender owl:equivalentProperty foaf:gender .
-oplog:birthday owl:equivalentProperty foaf:birthday .
-oplog:has_friend rdfs:subPropertyOf foaf:knows .
-oplog:email owl:equivalentProperty foaf:mbox .
-oplog:mobile_phone rdfs:subPropertyOf foaf:phone .
-
-oplog:Post owl:equivalentClass sioc:Post .
-oplog:Activity owl:equivalentClass sioc:Post .
-oplog:Account owl:equivalentClass sioc:UserAccount .
-oplog:Comment owl:equivalentClass sioc:Post .
-
-oplog:email owl:equivalentProperty sioc:email .
-oplog:id owl:equivalentProperty sioc:id .
-oplog:third_party_id rdfs:subPropertyOf sioc:id .
-oplog:updated_time owl:equivalentProperty sioc:last_activity_date .
-oplog:link owl:equivalentProperty sioc:link .
-oplog:name rdfs:subPropertyOf sioc:name .
-oplog:notes rdfs:subPropertyOf sioc:note .
-
-oplog:id owl:equivalentProperty dc:identifier .
-oplog:third_party_id rdfs:subPropertyOf dc:identifier .
-oplog:album_type rdfs:subPropertyOf dc:type .
-oplog:description owl:equivalentProperty dc:description .
-oplog:height rdfs:subPropertyOf dc:format .
-oplog:width rdfs:subPropertyOf dc:format .
-oplog:tagged_by rdfs:subPropertyOf dc:source .
-oplog:link rdfs:subPropertyOf dc:source .
-oplog:uri rdfs:subPropertyOf dc:source .
-oplog:username rdfs:subPropertyOf dc:publisher .
-oplog:updated_time rdfs:subPropertyOf dc:date .
-oplog:birthday rdfs:subPropertyOf dc:date .
-oplog:languages rdfs:subPropertyOf dc:language .
-
-oplog:id owl:equivalentProperty dcterms:identifier .
-oplog:third_party_id rdfs:subPropertyOf dcterms:identifier .
-oplog:album_type rdfs:subPropertyOf dcterms:type .
-oplog:description owl:equivalentProperty dcterms:description .
-oplog:height rdfs:subPropertyOf dcterms:format .
-oplog:width rdfs:subPropertyOf dcterms:format .
-oplog:tagged_by rdfs:subPropertyOf dcterms:source .
-oplog:link rdfs:subPropertyOf dcterms:source .
-oplog:uri rdfs:subPropertyOf dcterms:source .
-oplog:username rdfs:subPropertyOf dcterms:publisher .
-oplog:updated_time rdfs:subPropertyOf dcterms:date .
-oplog:birthday rdfs:subPropertyOf dcterms:date .
-oplog:languages rdfs:subPropertyOf dcterms:language .
-oplog:education rdfs:subPropertyOf dcterms:educationLevel .
-
-oplog:Photo owl:equivalentClass bibo:Image .
-oplog:Book owl:equivalentClass bibo:Book .
-oplog:Movie owl:equivalentClass bibo:Film .
-oplog:Note owl:equivalentClass bibo:Note .
-oplog:id owl:equivalentProperty bibo:identifier .
-oplog:third_party_id rdfs:subPropertyOf bibo:identifier .
-
-oplog:Event owl:equivalentClass event:Event .
-
-oplog:birthday owl:equivalentProperty vcard:BDAY .
-oplog:email owl:equivalentProperty vcard:EMAIL .
-oplog:last_name owl:equivalentProperty vcard:Family .
-oplog:has_photo rdfs:subPropertyOf vcard:PHOTO .
-oplog:photos rdfs:subPropertyOf vcard:PHOTO .
-oplog:has_variant rdfs:subPropertyOf vcard:PHOTO .
-oplog:mobile_phone rdfs:subPropertyOf vcard:TEL .
-oplog:notes rdfs:subPropertyOf vcard:NOTE .
-oplog:tagged_by rdfs:subPropertyOf vcard:SOURCE .
-oplog:link rdfs:subPropertyOf vcard:SOURCE .
-oplog:uri rdfs:subPropertyOf vcard:SOURCE .
-oplog:address owl:equivalentProperty vcard:ADR .
-oplog:locale owl:equivalentProperty vcard:Locality .
-oplog:timezone owl:equivalentProperty vcard:TZ .
-oplog:middle_name rdfs:subPropertyOf vcard:Other .
-oplog:id rdfs:subPropertyOf vcard:UID .
-oplog:third_party_id rdfs:subPropertyOf vcard:UID .
-oplog:category rdfs:subPropertyOf vcard:CATEGORIES .
-
-oplog:Activity owl:equivalentClass dbpedia:Activity .
-oplog:updated_time rdfs:subPropertyOf dbpedia:Date .
-oplog:birthday rdfs:subPropertyOf dbpedia:Date .
-oplog:address owl:equivalentProperty dbpedia:Address .
-oplog:notes rdfs:subPropertyOf dbpedia:Note .
-oplog:location owl:equivalentProperty dbpedia:Location .
-oplog:birthday owl:equivalentProperty dbpedia:BirthDate .
-oplog:gender owl:equivalentProperty dbpedia:Genre .
-oplog:languages rdfs:subPropertyOf dbpedia:Language .
-oplog:education owl:equivalentProperty dbpedia:Education .
-oplog:has_interest rdfs:subPropertyOf dbpedia:Interest .
-oplog:address owl:equivalentProperty dbpedia:Address .
-oplog:album_type rdfs:subPropertyOf dbpedia:Type .
-oplog:tagged_by rdfs:subPropertyOf dbpedia:Source .
-oplog:link rdfs:subPropertyOf dbpedia:Source .
-oplog:uri rdfs:subPropertyOf dbpedia:Source .
-
-oplbase:social_profile_url rdfs:subPropertyOf foaf:homepage .
-oplli:public_profile_url rdfs:subPropertyOf oplbase:social_profile_url .
-oplog:public_profile_url rdfs:subPropertyOf oplbase:social_profile_url .
-opltw:public_profile_url rdfs:subPropertyOf oplbase:social_profile_url .
-
', '', 'virtrdf-label');
rdfs_rule_set ('virtrdf-label', 'virtrdf-label');
diff --git a/binsrc/rdf_mappers/xslt/main/abmeta2rdfxml.xsl b/binsrc/rdf_mappers/xslt/main/abmeta2rdfxml.xsl
index 527224b..0ffec56 100644
--- a/binsrc/rdf_mappers/xslt/main/abmeta2rdfxml.xsl
+++ b/binsrc/rdf_mappers/xslt/main/abmeta2rdfxml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: abmeta2rdfxml.xsl,v 1.1.2.4 2012/03/08 12:55:02 source Exp $
+ - $Id: abmeta2rdfxml.xsl,v 1.1.2.3 2010/12/09 12:36:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl b/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl
index 8bde2cc..5d1a2a8 100644
--- a/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: amazon2rdf.xsl,v 1.1.2.30 2012/03/08 12:55:02 source Exp $
+ - $Id: amazon2rdf.xsl,v 1.1.2.28 2011/10/25 23:36:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -38,7 +38,7 @@
<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
<!ENTITY review "http:/www.purl.org/stuff/rev#">
<!ENTITY pto "http://www.productontology.org/id/">
-<!ENTITY amz "http://webservices.amazon.com/AWSECommerceService/2011-08-01">
+<!ENTITY amz "http://webservices.amazon.com/AWSECommerceService/2005-10-05">
<!ENTITY oplamz "http://www.openlinksw.com/schemas/amazon#">
]>
<xsl:stylesheet
@@ -255,25 +255,24 @@
<rdfs:label>
<xsl:value-of select="concat('Offer ', position(), ':', //amz:ItemAttributes/amz:Title)"/>
</rdfs:label>
- <xsl:if test="string-length(//amz:ItemAttributes/amz:EAN) > 0">
- <gr:hasEAN_UCC-13>
- <xsl:value-of select="//amz:ItemAttributes/amz:EAN"/>
- </gr:hasEAN_UCC-13>
- </xsl:if>
+ <gr:hasEAN_UCC-13>
+ <xsl:value-of select="//amz:ItemAttributes/amz:EAN"/>
+ </gr:hasEAN_UCC-13>
<oplamz:condition>
<xsl:value-of select="./amz:OfferAttributes/amz:Condition"/>
</oplamz:condition>
- <xsl:if test="string-length(./amz:OfferAttributes/amz:ConditionNote) > 0">
- <oplamz:conditionNote>
- <xsl:value-of select="./amz:OfferAttributes/amz:ConditionNote"/>
- </oplamz:conditionNote>
- </xsl:if>
+ <oplamz:conditionNote>
+ <xsl:value-of select="./amz:OfferAttributes/amz:ConditionNote"/>
+ </oplamz:conditionNote>
<oplamz:availability>
<xsl:value-of select="./amz:OfferListing/amz:Availability"/>
</oplamz:availability>
<oplamz:offerListingId>
<xsl:value-of select="./amz:OfferListing/amz:OfferListingId"/>
</oplamz:offerListingId>
+ <oplamz:merchantId>
+ <xsl:value-of select="./amz:Merchant/amz:MerchantId"/>
+ </oplamz:merchantId>
<gr:hasPriceSpecification>
<gr:UnitPriceSpecification rdf:about="{concat(vi:proxyIRI ($base, '', 'OfferPrice_'), position())}">
<rdfs:label>
@@ -289,7 +288,6 @@
<gr:priceType rdf:datatype="&xsd;string">offer price</gr:priceType>
</gr:UnitPriceSpecification>
</gr:hasPriceSpecification>
- <xsl:if test="./amz:OfferListing/amz:SalePrice">
<oplamz:hasSalePrice>
<gr:UnitPriceSpecification rdf:about="{concat(vi:proxyIRI ($base, '', 'SalePrice_'), position())}">
<rdfs:label>
@@ -305,10 +303,31 @@
<gr:priceType rdf:datatype="&xsd;string">sale price</gr:priceType>
</gr:UnitPriceSpecification>
</oplamz:hasSalePrice>
- </xsl:if>
</xsl:element>
+ <xsl:element namespace="&gr;" name="BusinessEntity">
+ <xsl:attribute name="rdf:about">
+ <xsl:value-of select="concat (vi:proxyIRI($base, '', 'Vendor_'), position())"/>
+ </xsl:attribute>
+ <rdfs:comment>The legal agent making the offering</rdfs:comment>
+ <!-- MERCHANTID_{merchant id} will be replaced by merchant name/nickname by cartridge hook function -->
+ <rdfs:label>
+ <xsl:value-of select="concat('MERCHANTID_', ./amz:Merchant/amz:MerchantId)"/>
+ </rdfs:label>
+ <gr:legalName>
+ <xsl:value-of select="concat('MERCHANTID_', ./amz:Merchant/amz:MerchantId)"/>
+ </gr:legalName>
+ <gr:offers>
+ <xsl:attribute name="rdf:resource">
+ <xsl:value-of select="concat (vi:proxyIRI($base, '', 'Offer_'), position())"/>
+ </xsl:attribute>
+ </gr:offers>
+ <rdfs:seeAlso rdf:resource="{./amz:Merchant/amz:GlancePage}"/>
+ <oplamz:vendorSynopsisUrl rdf:resource="{./amz:Merchant/amz:GlancePage}"/>
+ </xsl:element>
+
<!-- shortcuts -->
<rdf:Description rdf:about="{$docproxyIRI}">
+ <foaf:topic rdf:resource="{concat (vi:proxyIRI ($base, '', 'Vendor_'), position())}"/>
<foaf:topic rdf:resource="{concat (vi:proxyIRI ($base, '', 'Offer_'), position())}"/>
</rdf:Description>
</xsl:template>
diff --git a/binsrc/rdf_mappers/xslt/main/angellist2rdf.xsl b/binsrc/rdf_mappers/xslt/main/angellist2rdf.xsl
deleted file mode 100644
index f5ad1e5..0000000
--- a/binsrc/rdf_mappers/xslt/main/angellist2rdf.xsl
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: angellist2rdf.xsl,v 1.1.2.2 2012/03/08 12:55:02 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
--->
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-<!ENTITY sioc "http://rdfs.org/sioc/ns#">
-<!ENTITY oplangel "http://www.openlinksw.com/schemas/angel#">
-<!ENTITY oplli "http://www.openlinksw.com/schemas/linkedin#">
-<!ENTITY opltw "http://www.openlinksw.com/schemas/twitter#">
-<!ENTITY oplog "http://www.openlinksw.com/schemas/opengraph#">
-<!ENTITY oplbase "http://www.openlinksw.com/schemas/oplbase#">
-]>
-
-<xsl:stylesheet
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:h="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:vi="http://www.openlinksw.com/virtuoso/xslt/"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:oplangel="&oplangel;"
- xmlns:opltw="&opltw;"
- xmlns:oplli="&oplli;"
- xmlns:oplog="&oplog;"
- xmlns:oplbase="&oplbase;"
- xmlns:gn="http://www.geonames.org/ontology#"
- xmlns:foaf="&foaf;"
- version="1.0">
-
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:param name="baseUri"/>
- <xsl:param name="type"/>
- <xsl:variable name="resourceURL" select="vi:proxyIRI($baseUri)"/>
- <xsl:variable name="docIRI" select="vi:docIRI($baseUri)"/>
- <xsl:variable name="docproxyIRI" select="vi:docproxyIRI($baseUri)"/>
-
- <xsl:template match="/">
- <rdf:RDF>
- <rdf:Description rdf:about="{$resourceURL}">
- <xsl:choose>
- <xsl:when test="normalize-space($type)='Person'">
- <xsl:apply-templates select="/results" mode="person"/>
- </xsl:when>
- <xsl:when test="$type='Organization'">
- <xsl:apply-templates select="/results" mode="organization"/>
- </xsl:when>
- </xsl:choose>
- </rdf:Description>
- </rdf:RDF>
- </xsl:template>
-
- <!-- Case where agent is a User -->
- <xsl:template match="results" mode="person">
- <rdf:type rdf:resource="&oplangel;User" />
- <xsl:apply-templates mode="person" />
- </xsl:template>
-
- <xsl:template match="name" mode="person">
- <oplangel:name><xsl:value-of select="." /></oplangel:name>
- </xsl:template>
-
- <xsl:template match="id" mode="person">
- <oplangel:id rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplangel:id>
- </xsl:template>
-
- <xsl:template match="follower_count" mode="person">
- <oplangel:followers rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplangel:followers>
- </xsl:template>
-
- <xsl:template match="angellist_url" mode="person">
- <oplangel:url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="bio" mode="person">
- <oplangel:bio><xsl:value-of select="normalize-space(./text())" /></oplangel:bio>
- </xsl:template>
-
- <xsl:template match="image" mode="person">
- <oplangel:image rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="blog_url" mode="person">
- <oplbase:blog_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="twitter_url" mode="person">
- <opltw:public_profile_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="facebook_url" mode="person">
- <oplog:public_profile_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="linkedin_url" mode="person">
- <oplli:public_profile_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="locations" mode="person">
- <oplangel:has_location>
- <oplangel:Location rdf:about="{vi:proxyIRI($baseUri, '', concat('Location_', ./id))}">
- <xsl:apply-templates mode="location" />
- <rdf:type rdf:resource="&oplangel;Location" />
- </oplangel:Location>
- </oplangel:has_location>
- </xsl:template>
-
- <xsl:template match="locations" mode="organization">
- <oplangel:has_location>
- <oplangel:Location rdf:about="{vi:proxyIRI($baseUri, '', concat('Location_', ./id))}">
- <xsl:apply-templates mode="location" />
- <rdf:type rdf:resource="&oplangel;Location" />
- </oplangel:Location>
- </oplangel:has_location>
- </xsl:template>
-
- <xsl:template match="roles" mode="person">
- <oplangel:role><xsl:value-of select="name" /></oplangel:role>
- </xsl:template>
-
- <!-- Case where agent is a Startup -->
-
- <xsl:template match="results" mode="organization">
- <rdf:type rdf:resource="&oplangel;Startup" />
- <xsl:apply-templates mode="organization" />
- </xsl:template>
-
- <xsl:template match="name" mode="organization">
- <oplangel:name><xsl:value-of select="." /></oplangel:name>
- </xsl:template>
-
- <xsl:template match="id" mode="organization">
- <oplangel:id rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplangel:id>
- </xsl:template>
-
- <xsl:template match="follower_count" mode="organization">
- <oplangel:followers rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplangel:followers>
- </xsl:template>
-
- <xsl:template match="angellist_url" mode="organization">
- <oplangel:url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="logo_url" mode="organization">
- <oplangel:logo_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="thumb_url" mode="organization">
- <oplangel:thumb_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="product_desc" mode="organization">
- <oplangel:product_desc><xsl:value-of select="." /></oplangel:product_desc>
- </xsl:template>
-
- <xsl:template match="high_concept" mode="organization">
- <oplangel:high_concept><xsl:value-of select="." /></oplangel:high_concept>
- </xsl:template>
-
- <xsl:template match="blog_url" mode="organization">
- <oplbase:blog_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="twitter_url" mode="organization">
- <opltw:public_profile_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="facebook_url" mode="organization">
- <oplog:public_profile_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="video_url" mode="organization">
- <oplangel:video_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="markets" mode="organization">
- <oplangel:has_market>
- <oplangel:Market rdf:about="{vi:proxyIRI($baseUri, '', concat('Market_', ./id))}">
- <xsl:apply-templates select="*" mode="market" />
- </oplangel:Market>
- </oplangel:has_market>
- </xsl:template>
-
- <xsl:template match="display_name|name" mode="market">
- <oplangel:market_name><xsl:value-of select="." /></oplangel:market_name>
- <rdfs:label><xsl:value-of select="." /></rdfs:label>
- </xsl:template>
-
- <xsl:template match="angellist_url" mode="market">
- <oplangel:market_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="id" mode="market">
- <oplangel:id rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplangel:id>
- </xsl:template>
-
- <xsl:template match="id" mode="location">
- <oplangel:location_id rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplangel:location_id>
- </xsl:template>
-
- <xsl:template match="name|display_name" mode="location">
- <oplangel:location_name><xsl:value-of select="." /></oplangel:location_name>
- <rdfs:label><xsl:value-of select="." /></rdfs:label>
- </xsl:template>
-
- <xsl:template match="angellist_url" mode="location">
- <oplangel:location_url rdf:resource="{./text()}" />
- </xsl:template>
-
- <xsl:template match="text()|@*"/>
- <xsl:template match="text()|@*" mode="person" />
- <xsl:template match="text()|@*" mode="organization" />
- <xsl:template match="text()|@*" mode="market" />
- <xsl:template match="text()|@*" mode="location" />
-</xsl:stylesheet>
-
diff --git a/binsrc/rdf_mappers/xslt/main/atom2rdf.xsl b/binsrc/rdf_mappers/xslt/main/atom2rdf.xsl
index 2c0c3aa..3624ace 100644
--- a/binsrc/rdf_mappers/xslt/main/atom2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/atom2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: atom2rdf.xsl,v 1.1.2.12 2012/03/08 12:55:02 source Exp $
+ - $Id: atom2rdf.xsl,v 1.1.2.10 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -66,7 +66,6 @@
xmlns:ff="&ff;"
xmlns:dcterms="&dcterms;"
xmlns:foaf="&foaf;"
- xmlns:opl="http://www.openlinksw.com/schemas/attribution#"
version="1.0">
<xsl:output indent="yes" cdata-section-elements="content:encoded" />
@@ -131,7 +130,6 @@
<xsl:template match="a:author">
<dc:creator><xsl:value-of select="a:name" /> <<xsl:value-of select="a:email" />></dc:creator>
<foaf:mbox rdf:resource="mailto:{a:email}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (a:email)}"/>
</xsl:template>
<xsl:template match="a:entry" mode="li">
diff --git a/binsrc/rdf_mappers/xslt/main/atomdoc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/atomdoc2rdf.xsl
index bb4bf01..95c3cf2 100644
--- a/binsrc/rdf_mappers/xslt/main/atomdoc2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/atomdoc2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: atomdoc2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:02 source Exp $
+ - $Id: atomdoc2rdf.xsl,v 1.1.2.6 2011/07/15 11:23:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -68,7 +68,6 @@
xmlns:foaf="&foaf;"
xmlns:dcterms="&dcterms;"
xmlns:vi="http://www.openlinksw.com/virtuoso/xslt/"
- xmlns:opl="http://www.openlinksw.com/schemas/attribution#"
version="1.0">
<xsl:output indent="yes" cdata-section-elements="content:encoded" />
@@ -143,8 +142,7 @@
<xsl:template match="a:author">
<dc:creator><xsl:value-of select="a:name" /> <<xsl:value-of select="a:email" />></dc:creator>
- <foaf:mbox rdf:resource="mailto:{a:email}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (a:email)}"/>
+<foaf:mbox rdf:resource="mailto:{a:email}"/>
</xsl:template>
<xsl:template match="a:entry" mode="li">
diff --git a/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl b/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl
index ff98a36..88d4821 100644
--- a/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: atomentry2rdf.xsl,v 1.1.2.12 2012/03/08 12:55:02 source Exp $
+ - $Id: atomentry2rdf.xsl,v 1.1.2.11 2011/07/15 11:23:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl
index 886b2ee..47b0b1d 100644
--- a/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bestbuy2rdf.xsl,v 1.1.2.29 2012/03/08 12:55:02 source Exp $
+ - $Id: bestbuy2rdf.xsl,v 1.1.2.27 2011/09/09 13:12:17 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -80,7 +80,7 @@
<foaf:primaryTopic rdf:resource="{$resourceURL}"/>
<dcterms:subject rdf:resource="{$resourceURL}"/>
</rdf:Description>
- <gr:Location rdf:about="{$resourceURL}">
+ <gr:LocationOfSalesOrServiceProvisioning rdf:about="{$resourceURL}">
<opl:providedBy>
<foaf:Organization rdf:about="http://www.bestbuy.com#this">
<foaf:name>BestBuy</foaf:name>
@@ -131,7 +131,7 @@
<rdfs:label><xsl:value-of select="vi:trim(concat(/stores/store/address, ', ', /stores/store/city, ', ', /stores/store/postalCode, ', ', /stores/store/country), ', ')"/></rdfs:label>
</rdf:Description>
</vcard:ADR>
- </gr:Location>
+ </gr:LocationOfSalesOrServiceProvisioning>
</xsl:when>
<xsl:otherwise>
<rdf:Description rdf:about="{$docproxyIRI}">
diff --git a/binsrc/rdf_mappers/xslt/main/bugzilla2rdf.xsl b/binsrc/rdf_mappers/xslt/main/bugzilla2rdf.xsl
index 78ea706..58ab983 100644
--- a/binsrc/rdf_mappers/xslt/main/bugzilla2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/bugzilla2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bugzilla2rdf.xsl,v 1.1.2.14 2012/03/08 12:55:02 source Exp $
+ - $Id: bugzilla2rdf.xsl,v 1.1.2.12 2011/07/15 11:23:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -53,7 +53,6 @@
xmlns:sioc="&sioc;"
xmlns:owl="&owl;"
xmlns:xsd="&xsd;"
- xmlns:opl="http://www.openlinksw.com/schemas/attribution#"
version="1.0">
<xsl:output method="xml" indent="yes"/>
<xsl:param name="baseUri" />
@@ -109,7 +108,6 @@
<foaf:name><xsl:value-of select="who/@name"/></foaf:name>
</xsl:if>
<foaf:mbox rdf:resource="mailto:{who}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (who)}"/>
</rdf:Description>
</xsl:for-each>
</xsl:template>
@@ -155,7 +153,6 @@
<foaf:name><xsl:value-of select="who/@name"/></foaf:name>
</xsl:if>
<foaf:mbox rdf:resource="mailto:{who}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (who)}"/>
<sioc:creator_of rdf:resource="{vi:proxyIRI($baseUri,'',replace(bug_when, ' ', '_'))}"/>
</rdf:Description>
</xsl:for-each>
diff --git a/binsrc/rdf_mappers/xslt/main/cc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/cc2rdf.xsl
index 3eae84a..cf0672f 100644
--- a/binsrc/rdf_mappers/xslt/main/cc2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/cc2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: cc2rdf.xsl,v 1.1.2.4 2012/03/08 12:55:02 source Exp $
+ - $Id: cc2rdf.xsl,v 1.1.2.3 2011/07/15 11:23:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl
index c38027d..4597521 100644
--- a/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: cnet2rdf.xsl,v 1.1.2.18 2012/03/08 12:55:02 source Exp $
+ - $Id: cnet2rdf.xsl,v 1.1.2.17 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl b/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl
index c0bd296..57405ce 100644
--- a/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: crunchbase2rdf.xsl,v 1.1.2.18 2012/03/14 11:06:21 source Exp $
+ - $Id: crunchbase2rdf.xsl,v 1.1.2.14 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -303,7 +303,6 @@
<xsl:template match="email_address[. != '']">
<foaf:mbox rdf:resource="mailto:{.}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (.)}"/>
</xsl:template>
<xsl:template match="*[* and ../../*]" priority="1">
@@ -337,32 +336,20 @@
<xsl:variable name="nspace">
<xsl:choose>
<xsl:when test="$space = 'financial_org'">
- <xsl:text>financial-organization</xsl:text>
+ <xsl:text>financial-organization</xsl:text>
</xsl:when>
<xsl:when test="$space = 'firm' or $space = 'competitor'">
- <xsl:text>company</xsl:text>
+ <xsl:text>company</xsl:text>
</xsl:when>
<xsl:otherwise>
- <!--xsl:variable name="first_letter" select="upper-case(substring($space, 1, 1))"/>
- <xsl:variable name="type_name" select="concat($first_letter, substring($space, 2))"/-->
- <xsl:value-of select="translate ($space, '_', '-')"/>
+ <xsl:value-of select="translate ($space, '_', '-')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:variable name="field_name"/>
- <xsl:choose>
- <xsl:when test="ends-with(name(), 's')" >
- <xsl:variable name="field_name" select="substring(name(), 1, string-length(name()) - 1)" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable name="field_name" select="name()"/>
- </xsl:otherwise>
- </xsl:choose>
-
<xsl:choose>
<xsl:when test="$type != ''">
- <xsl:element namespace="{$ns}" name="{$field_name}">
+ <xsl:element namespace="{$ns}" name="{name()}">
<xsl:element name="{$type}" namespace="&foaf;">
<xsl:attribute name="rdf:about">
<xsl:value-of select="vi:proxyIRI(concat ($base, $nspace, '/', permalink, $suffix))"/>
@@ -376,7 +363,7 @@
<xsl:apply-templates />
</xsl:when>
<xsl:otherwise>
- <xsl:element namespace="{$ns}" name="{$field_name}">
+ <xsl:element namespace="{$ns}" name="{name()}">
<xsl:element name="{$nspace}" namespace="{$ns}">
<xsl:attribute name="rdf:about">
<xsl:variable name="cur_suffix" select="name()"/>
diff --git a/binsrc/rdf_mappers/xslt/main/csvxml2rdf.xsl b/binsrc/rdf_mappers/xslt/main/csvxml2rdf.xsl
index 627c6df..b374ca0 100644
--- a/binsrc/rdf_mappers/xslt/main/csvxml2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/csvxml2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: csvxml2rdf.xsl,v 1.1.4.4 2012/03/08 12:55:02 source Exp $
+ - $Id: csvxml2rdf.xsl,v 1.1.4.3 2011/07/15 11:23:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl
index 24c820d..29a5085 100644
--- a/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: dc2rdf.xsl,v 1.1.2.6 2012/03/08 12:55:02 source Exp $
+ - $Id: dc2rdf.xsl,v 1.1.2.5 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl b/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl
index d3fbc23..808587e 100644
--- a/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: delicious2rdf.xsl,v 1.1.2.11 2012/03/08 12:55:02 source Exp $
+ - $Id: delicious2rdf.xsl,v 1.1.2.10 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl b/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl
index b7044d0..dc38e11 100644
--- a/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: digg2rdf.xsl,v 1.1.2.5 2012/03/08 12:55:02 source Exp $
+ - $Id: digg2rdf.xsl,v 1.1.2.4 2011/07/15 11:23:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl b/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl
index fc62eb5..e72b0c1 100644
--- a/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: discogs2rdf.xsl,v 1.1.2.10 2012/03/08 12:55:02 source Exp $
+ - $Id: discogs2rdf.xsl,v 1.1.2.9 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl
index 414fb28..73133f2 100644
--- a/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ebay2rdf.xsl,v 1.1.2.23 2012/03/08 12:55:02 source Exp $
+ - $Id: ebay2rdf.xsl,v 1.1.2.22 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl
index d3ab498..f360377 100644
--- a/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: eol2rdf.xsl,v 1.1.4.3 2012/03/08 12:55:02 source Exp $
+ - $Id: eol2rdf.xsl,v 1.1.4.2 2011/01/03 23:40:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl b/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl
index e2fa67f..178fbf5 100644
--- a/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl
+++ b/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: erdf2rdfxml.xsl,v 1.1.2.4 2012/03/08 12:55:02 source Exp $
+ - $Id: erdf2rdfxml.xsl,v 1.1.2.3 2011/07/15 11:23:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl
index c5fc424..33244e8 100644
--- a/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: etsy2rdf.xsl,v 1.1.4.12 2012/03/08 12:55:02 source Exp $
+ - $Id: etsy2rdf.xsl,v 1.1.4.11 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl
index b0064f5..adef82b 100644
--- a/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: eventbrite2rdf.xsl,v 1.1.4.5 2012/03/08 12:55:02 source Exp $
+ - $Id: eventbrite2rdf.xsl,v 1.1.4.4 2011/07/15 11:23:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl
index b3a858a..d6f13ff 100644
--- a/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: eventful2rdf.xsl,v 1.1.4.3 2012/03/08 12:55:02 source Exp $
+ - $Id: eventful2rdf.xsl,v 1.1.4.2 2011/08/09 10:58:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl b/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl
index 0f2543a..a056145 100644
--- a/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-- $Id: evri2rdf.xsl,v 1.1.4.7 2012/03/08 12:55:02 source Exp $
+- $Id: evri2rdf.xsl,v 1.1.4.6 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
-- Copyright (C) 1998-2012 OpenLink Software
+- Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl
index b01d5db..d7a0c72 100644
--- a/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: fb_og2rdf.xsl,v 1.1.4.23 2012/03/08 12:55:02 source Exp $
+ - $Id: fb_og2rdf.xsl,v 1.1.4.11 2011/09/12 10:52:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -21,13 +21,9 @@
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-->
-<!-- tabstops=4 -->
<!DOCTYPE xsl:stylesheet [
<!ENTITY bibo "http://purl.org/ontology/bibo/">
-<!ENTITY c "http://www.w3.org/2002/12/cal/icaltzd#">
-<!ENTITY exif "http://www.w3.org/2003/12/exif/ns/">
<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY geo "http://www.w3.org/2003/01/geo/wgs84_pos#">
<!ENTITY like "http://ontologi.es/like#">
<!ENTITY mmd "http://musicbrainz.org/ns/mmd-1.0#">
<!ENTITY mo "http://purl.org/ontology/mo/">
@@ -36,47 +32,43 @@
<!ENTITY oplog "http://www.openlinksw.com/schemas/opengraph#">
<!ENTITY owl "http://www.w3.org/2002/07/owl#">
<!ENTITY rdfns "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<!ENTITY scot "http://scot-project.org/scot/ns#">
<!ENTITY sioc "http://rdfs.org/sioc/ns#">
<!ENTITY sioct "http://rdfs.org/sioc/types#">
-<!ENTITY tag "http://www.holygoat.co.uk/owl/redwood/0.1/tags/">
-<!ENTITY vcard "http://www.w3.org/2006/vcard/ns#">
-<!ENTITY vi "http://www.openlinksw.com/virtuoso/xslt/">
<!ENTITY video "http://purl.org/media/video#">
<!ENTITY xhv "http://www.w3.org/1999/xhtml/vocab#">
<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-<!ENTITY oplcert "http://www.openlinksw.com/schemas/cert#">
-<!ENTITY cert "http://www.w3.org/ns/auth/cert#">
+<!ENTITY vi "http://www.openlinksw.com/virtuoso/xslt/">
+<!ENTITY exif "http://www.w3.org/2003/12/exif/ns/">
+<!ENTITY c "http://www.w3.org/2002/12/cal/icaltzd#">
+<!ENTITY vcard "http://www.w3.org/2006/vcard/ns#">
+<!ENTITY geo "http://www.w3.org/2003/01/geo/wgs84_pos#">
]>
<xsl:stylesheet
- xmlns:fb="http://www.facebook.com/2008/fbml"
xmlns:bibo="&bibo;"
- xmlns:c="&c;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:exif="&exif;"
xmlns:foaf="&foaf;"
- xmlns:geo="&geo;"
xmlns:h="http://www.w3.org/1999/xhtml"
xmlns:like="&like;"
xmlns:mmd="&mmd;"
xmlns:mo="&mo;"
+ xmlns:c="&c;"
+ xmlns:vcard="&vcard;"
+ xmlns:exif="&exif;"
xmlns:og="&og;"
xmlns:opl="&opl;"
xmlns:oplog="&oplog;"
xmlns:owl="&owl;"
xmlns:rdf="&rdfns;"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:scot="&scot;"
xmlns:sioc="&sioc;"
xmlns:sioct="&sioct;"
- xmlns:tag="&tag;"
- xmlns:vcard="&vcard;"
xmlns:vi="&vi;"
xmlns:video="&video;"
xmlns:xhv="&xhv;"
- xmlns:oplcert="&oplcert;"
+ xmlns:fb="http://www.facebook.com/2008/fbml"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:geo="&geo;"
version="1.0"
>
@@ -95,62 +87,29 @@
<xsl:when test="$og_object_type = 'general'">
<xsl:apply-templates mode="general"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'album'">
+ <xsl:when test="$og_object_type = 'page'">
<xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="album"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'album_photos'">
- <xsl:apply-templates mode="album_photos"/>
+ <xsl:apply-templates mode="page"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'application'">
+ <xsl:when test="$og_object_type = 'user'">
<xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="application"/>
+ <xsl:apply-templates mode="user"/>
</xsl:when>
<xsl:when test="$og_object_type = 'event'">
<xsl:apply-templates mode="root"/>
<xsl:apply-templates mode="event"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'group'">
+ <xsl:when test="$og_object_type = 'application'">
<xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="group"/>
+ <xsl:apply-templates mode="application"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'link'">
+ <xsl:when test="$og_object_type = 'group'">
<xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="link"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'link_comments'">
- <xsl:apply-templates mode="status_comments"/>
+ <xsl:apply-templates mode="group"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'page'">
+ <xsl:when test="$og_object_type = 'album'">
<xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="page"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_albums'">
- <xsl:apply-templates mode="user_albums"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_events'">
- <xsl:apply-templates mode="page_events"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_feed'">
- <xsl:apply-templates mode="page_feed"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_links'">
- <xsl:apply-templates mode="user_links"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_notes'">
- <xsl:apply-templates mode="page_notes"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_posts'">
- <xsl:apply-templates mode="user_posts"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_statuses'">
- <xsl:apply-templates mode="page_statuses"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_tagged'">
- <xsl:apply-templates mode="page_feed"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'page_videos'">
- <xsl:apply-templates mode="user_movies"/>
+ <xsl:apply-templates mode="album"/>
</xsl:when>
<xsl:when test="$og_object_type = 'photo'">
<xsl:apply-templates mode="root"/>
@@ -160,61 +119,84 @@
<xsl:apply-templates mode="root"/>
<xsl:apply-templates mode="status"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'status_comments'">
- <xsl:apply-templates mode="status_comments"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'user'">
+ <xsl:when test="$og_object_type = 'link'">
<xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="user"/>
- </xsl:when>
- <xsl:when test="$og_object_type = 'user_accounts'">
- <xsl:apply-templates mode="user_accounts"/>
+ <xsl:apply-templates mode="link"/>
</xsl:when>
<xsl:when test="$og_object_type = 'user_activities'">
<xsl:apply-templates mode="user_activities"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'user_albums'">
- <xsl:apply-templates mode="user_albums"/>
+ <xsl:when test="$og_object_type = 'page_notes'">
+ <xsl:apply-templates mode="page_notes"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'page_events'">
+ <xsl:apply-templates mode="page_events"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'user_links'">
+ <xsl:apply-templates mode="user_links"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'page_links'">
+ <xsl:apply-templates mode="user_links"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'user_accounts'">
+ <xsl:apply-templates mode="user_accounts"/>
</xsl:when>
<xsl:when test="$og_object_type = 'user_books'">
<xsl:apply-templates mode="user_books"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'user_feed'">
- <xsl:apply-templates mode="page_feed"/>
- </xsl:when>
<xsl:when test="$og_object_type = 'user_friends'">
<xsl:apply-templates mode="user_friends"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'user_games'">
- <xsl:apply-templates mode="user_games"/>
+ <xsl:when test="$og_object_type = 'user_albums'">
+ <xsl:apply-templates mode="user_albums"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'user_interests'">
- <xsl:apply-templates mode="user_interests"/>
+ <xsl:when test="$og_object_type = 'page_albums'">
+ <xsl:apply-templates mode="user_albums"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'page_statuses'">
+ <xsl:apply-templates mode="page_statuses"/>
</xsl:when>
<xsl:when test="$og_object_type = 'user_likes'">
<xsl:apply-templates mode="user_likes"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'user_links'">
- <xsl:apply-templates mode="user_links"/>
+ <xsl:when test="$og_object_type = 'user_interests'">
+ <xsl:apply-templates mode="user_interests"/>
</xsl:when>
<xsl:when test="$og_object_type = 'user_movies'">
<xsl:apply-templates mode="user_movies"/>
</xsl:when>
+ <xsl:when test="$og_object_type = 'page_videos'">
+ <xsl:apply-templates mode="user_movies"/>
+ </xsl:when>
<xsl:when test="$og_object_type = 'user_music'">
<xsl:apply-templates mode="user_music"/>
</xsl:when>
+ <xsl:when test="$og_object_type = 'user_games'">
+ <xsl:apply-templates mode="user_games"/>
+ </xsl:when>
<xsl:when test="$og_object_type = 'user_picture'">
<xsl:apply-templates mode="user_picture"/>
</xsl:when>
<xsl:when test="$og_object_type = 'user_posts'">
<xsl:apply-templates mode="user_posts"/>
</xsl:when>
+ <xsl:when test="$og_object_type = 'page_feed'">
+ <xsl:apply-templates mode="page_feed"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'page_tagged'">
+ <xsl:apply-templates mode="page_feed"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'page_posts'">
+ <xsl:apply-templates mode="user_posts"/>
+ </xsl:when>
<xsl:when test="$og_object_type = 'user_television'">
<xsl:apply-templates mode="user_television"/>
</xsl:when>
- <xsl:when test="$og_object_type = 'video'">
- <xsl:apply-templates mode="root"/>
- <xsl:apply-templates mode="video"/>
+ <xsl:when test="$og_object_type = 'status_comments'">
+ <xsl:apply-templates mode="status_comments"/>
+ </xsl:when>
+ <xsl:when test="$og_object_type = 'link_comments'">
+ <xsl:apply-templates mode="status_comments"/>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates />
@@ -350,11 +332,7 @@
<xsl:if test="name">
<foaf:name><xsl:value-of select="name"/></foaf:name>
</xsl:if>
- <!--
- picture is a thumbnail which is also included in the images list.
- Just associate source as the main photo.
<foaf:depiction rdf:resource="{picture}"/>
- -->
<foaf:depiction rdf:resource="{source}"/>
<oplog:height rdf:datatype="&xsd;integer">
<xsl:value-of select="height"/>
@@ -363,43 +341,14 @@
<xsl:value-of select="width"/>
</oplog:width>
<xsl:for-each select="images">
- <oplog:has_variant>
- <rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat('Image_', ../id, '_', position()))}">
- <rdf:type rdf:resource="&oplog;Image" />
- <rdfs:label>
- <xsl:value-of select="concat ('Photo ', ../id, ' (', width, 'w x ', height, 'h)')"/>
- </rdfs:label>
- <foaf:depiction rdf:resource="{source}"/>
- <oplog:height rdf:datatype="&xsd;integer">
- <xsl:value-of select="height"/>
- </oplog:height>
- <oplog:width rdf:datatype="&xsd;integer">
- <xsl:value-of select="width"/>
- </oplog:width>
- </rdf:Description>
- </oplog:has_variant>
+ <foaf:depiction rdf:resource="{source}"/>
</xsl:for-each>
<xsl:if test="link">
<oplog:uri rdf:resource="{link}"/>
</xsl:if>
- <!--
<xsl:if test="icon">
<foaf:depiction rdf:resource="{icon}"/>
</xsl:if>
- -->
-
- <!--
- Some photo objects appear to be more like a status update relating to a photo.
- In which case the following fields are present
- -->
- <xsl:if test="caption">
- <dc:title><xsl:value-of select="caption"/></dc:title>
- </xsl:if>
- <xsl:if test="string-length(story) > 0">
- <dc:description><xsl:value-of select="story"/></dc:description>
- </xsl:if>
- <!-- -->
-
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -434,9 +383,12 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <sioc:content>
+ <dc:title>
<xsl:value-of select="message" />
- </sioc:content>
+ </dc:title>
+ <dc:description>
+ <xsl:value-of select="message" />
+ </dc:description>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -448,14 +400,7 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator>
- <!--
- Stub resource to hold creator's name. Resource will be sponged fully when dcterms:creator link is followed
- -->
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
+ <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
<sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
</sioct:Comment>
</sioc:has_reply>
@@ -508,7 +453,6 @@
</xsl:if>
<xsl:if test="email">
<foaf:mbox rdf:resource="{email}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (email)}"/>
</xsl:if>
<!--xsl:for-each select="metadata/connections/*">
<foaf:focus rdf:resource="{.}"/>
@@ -527,14 +471,7 @@
<xsl:if test="id">
<oplog:id><xsl:value-of select="id"/></oplog:id>
</xsl:if>
- <dcterms:creator>
- <!--
- Stub resource to hold creator's name. Resource will be sponged fully when dcterms:creator link is followed
- -->
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
+ <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
<xsl:if test="name">
<foaf:name><xsl:value-of select="name"/></foaf:name>
</xsl:if>
@@ -578,9 +515,12 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <sioc:content>
+ <dc:title>
+ <xsl:value-of select="message" />
+ </dc:title>
+ <dc:description>
<xsl:value-of select="message" />
- </sioc:content>
+ </dc:description>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -592,11 +532,7 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator>
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
+ <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
<sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
</sioct:Comment>
</sioc:has_reply>
@@ -639,7 +575,7 @@
<oplog:locale><xsl:value-of select="locale"/></oplog:locale>
</xsl:if>
<xsl:if test="link">
- <oplog:public_profile_url rdf:resource="{link}"/>
+ <oplog:uri rdf:resource="{link}"/>
</xsl:if>
<xsl:if test="username">
<foaf:nick><xsl:value-of select="username"/></foaf:nick>
@@ -909,9 +845,12 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <sioc:content>
+ <dc:title>
+ <xsl:value-of select="message" />
+ </dc:title>
+ <dc:description>
<xsl:value-of select="message" />
- </sioc:content>
+ </dc:description>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -923,11 +862,7 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator>
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
+ <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
<sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
</sioct:Comment>
</sioc:has_reply>
@@ -991,9 +926,9 @@
<dc:title>
<xsl:value-of select="concat('Comment from ', from/name, ' ', from/id)" />
</dc:title>
- <sioc:content>
+ <dc:description>
<xsl:value-of select="message" />
- </sioc:content>
+ </dc:description>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1005,11 +940,7 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator>
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
+ <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
<sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
</sioct:Comment>
</sioc:has_reply>
@@ -1082,9 +1013,12 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <sioc:content>
+ <dc:title>
<xsl:value-of select="message" />
- </sioc:content>
+ </dc:title>
+ <dc:description>
+ <xsl:value-of select="message" />
+ </dc:description>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1096,11 +1030,7 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator>
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
+ <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
<sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
</sioct:Comment>
</sioc:has_reply>
@@ -1301,9 +1231,12 @@
<rdfs:label>
<xsl:value-of select="message"/>
</rdfs:label>
- <sioc:content>
+ <dc:title>
+ <xsl:value-of select="message" />
+ </dc:title>
+ <dc:description>
<xsl:value-of select="message" />
- </sioc:content>
+ </dc:description>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1315,11 +1248,7 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:created>
- <dcterms:creator>
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
+ <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
<sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
</sioct:Comment>
</sioc:has_reply>
@@ -1536,8 +1465,10 @@
<opl:providedBy rdf:resource="{$providedByIRI}" />
<owl:sameAs rdf:resource="{$docIRI}"/>
<rdf:type rdf:resource="&oplog;Post" />
+ <rdf:type rdf:resource="&sioc;Post" />
<oplog:id><xsl:value-of select="id"/></oplog:id>
<oplog:from><xsl:value-of select="concat (from/name, ' (', from/id, ')')"/></oplog:from>
+ <rdfs:label><xsl:value-of select="concat ('Post ', $id)"/></rdfs:label>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1560,43 +1491,6 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:modified>
-
- <xsl:choose>
- <xsl:when test="string-length(message) > 0">
- <rdfs:label>
- <xsl:choose>
- <xsl:when test="string-length(message) > 50">
- <xsl:value-of select="concat(substring (message, 1, 100), '...')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="message"/>
- </xsl:otherwise>
- </xsl:choose>
- </rdfs:label>
- </xsl:when>
- <xsl:when test="string-length(description) > 0">
- <rdfs:label>
- <xsl:choose>
- <xsl:when test="string-length(description) > 50">
- <xsl:value-of select="concat(substring (description, 1, 100), '...')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="description"/>
- </xsl:otherwise>
- </xsl:choose>
- </rdfs:label>
- </xsl:when>
- <xsl:when test="string-length(story) > 0">
- <rdfs:label><xsl:value-of select="story"/></rdfs:label>
- </xsl:when>
- <xsl:otherwise>
- <rdfs:label><xsl:value-of select="concat ('Post ', $id)"/></rdfs:label>
- </xsl:otherwise>
- </xsl:choose>
-
- <xsl:if test="description">
- <oplog:description><xsl:value-of select="description"/></oplog:description>
- </xsl:if>
<xsl:if test="message">
<oplog:message><xsl:value-of select="message"/></oplog:message>
</xsl:if>
@@ -1618,16 +1512,7 @@
<rdf:type rdf:resource="&sioc;Post" />
<oplog:id><xsl:value-of select="id"/></oplog:id>
<oplog:from><xsl:value-of select="concat (from/name, ' (', from/id, ')')"/></oplog:from>
- <rdfs:label>
- <xsl:choose>
- <xsl:when test="string-length (name) > 0">
- <xsl:value-of select="name"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="concat ('Link ', $id)"/>
- </xsl:otherwise>
- </xsl:choose>
- </rdfs:label>
+ <rdfs:label><xsl:value-of select="concat ('Link ', $id)"/></rdfs:label>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1676,6 +1561,7 @@
<rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat('Post_', $id))}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplog;Post" />
+ <rdf:type rdf:resource="&sioc;Post" />
<oplog:id><xsl:value-of select="id"/></oplog:id>
<oplog:from><xsl:value-of select="concat (from/name, ' (', from/id, ')')"/></oplog:from>
<dcterms:created rdf:datatype="&xsd;dateTime">
@@ -1700,40 +1586,12 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:modified>
-
- <xsl:choose>
- <xsl:when test="string-length(message) > 0">
- <rdfs:label>
- <xsl:choose>
- <xsl:when test="string-length(message) > 50">
- <xsl:value-of select="concat(substring (message, 1, 100), '...')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="message"/>
- </xsl:otherwise>
- </xsl:choose>
- </rdfs:label>
- </xsl:when>
- <xsl:when test="string-length(description) > 0">
- <rdfs:label>
- <xsl:choose>
- <xsl:when test="string-length(description) > 50">
- <xsl:value-of select="concat(substring (description, 1, 100), '...')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="description"/>
- </xsl:otherwise>
- </xsl:choose>
- </rdfs:label>
- </xsl:when>
- <xsl:when test="string-length(story) > 0">
- <rdfs:label><xsl:value-of select="story"/></rdfs:label>
- </xsl:when>
- <xsl:otherwise>
- <rdfs:label><xsl:value-of select="concat ('Post ', $id)"/></rdfs:label>
- </xsl:otherwise>
- </xsl:choose>
-
+ <!--
+ <xsl:if test="name">
+ <rdfs:label><xsl:value-of select="name"/></rdfs:label>
+ </xsl:if>
+ -->
+ <rdfs:label><xsl:value-of select="concat ('Post ', $id)"/></rdfs:label>
<xsl:if test="description">
<oplog:description><xsl:value-of select="description"/></oplog:description>
</xsl:if>
@@ -1763,13 +1621,10 @@
<rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat('Post_', $id))}">
<opl:providedBy rdf:resource="{$providedByIRI}" />
<rdf:type rdf:resource="&oplog;Post" />
+ <rdf:type rdf:resource="&sioc;Post" />
<oplog:id><xsl:value-of select="id"/></oplog:id>
<oplog:from><xsl:value-of select="concat (from/name, ' (', from/id, ')')"/></oplog:from>
- <xsl:if test="to">
- <oplog:to>
- <xsl:value-of select="concat (to/data/name, ' (', to/data/id, ')')"/>
- </oplog:to>
- </xsl:if>
+ <oplog:to><xsl:value-of select="concat (to/data/name, ' (', to/data/id, ')')"/></oplog:to>
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
<xsl:choose>
@@ -1792,40 +1647,7 @@
</xsl:otherwise>
</xsl:choose>
</dcterms:modified>
-
- <xsl:choose>
- <xsl:when test="string-length(message) > 0">
- <rdfs:label>
- <xsl:choose>
- <xsl:when test="string-length(message) > 50">
- <xsl:value-of select="concat(substring (message, 1, 100), '...')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="message"/>
- </xsl:otherwise>
- </xsl:choose>
- </rdfs:label>
- </xsl:when>
- <xsl:when test="string-length(description) > 0">
- <rdfs:label>
- <xsl:choose>
- <xsl:when test="string-length(description) > 50">
- <xsl:value-of select="concat(substring (description, 1, 100), '...')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="description"/>
- </xsl:otherwise>
- </xsl:choose>
- </rdfs:label>
- </xsl:when>
- <xsl:when test="string-length(story) > 0">
- <rdfs:label><xsl:value-of select="story"/></rdfs:label>
- </xsl:when>
- <xsl:otherwise>
- <rdfs:label><xsl:value-of select="concat ('Post ', $id)"/></rdfs:label>
- </xsl:otherwise>
- </xsl:choose>
-
+ <rdfs:label><xsl:value-of select="concat ('Post ', $id)"/></rdfs:label>
<xsl:if test="description">
<oplog:description><xsl:value-of select="description"/></oplog:description>
</xsl:if>
@@ -1840,47 +1662,7 @@
</rdf:Description>
</oplog:posted>
</xsl:for-each>
- </rdf:Description>
- <xsl:for-each select="data">
- <!-- x509 -->
- <xsl:if test="starts-with (message, '#X509Cert Fingerprint:')">
- <xsl:variable name="fp"><xsl:value-of select="substring-before (substring-after (message, '#X509Cert Fingerprint:'), ' ')"/></xsl:variable>
- <xsl:variable name="fpn"><xsl:value-of select="translate ($fp, ':', '')"/></xsl:variable>
- <xsl:variable name="dgst">
- <xsl:choose>
- <xsl:when test="contains (message, '#SHA1')">sha1</xsl:when>
- <xsl:otherwise>md5</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:variable name="ct"><xsl:value-of select="vi:proxyIRI ($baseUri,'',$fpn)"/></xsl:variable>
- <rdf:Description rdf:about="{$resourceURL}">
- <oplcert:hasCertificate rdf:resource="{$ct}"/>
</rdf:Description>
- <oplcert:Certificate rdf:about="{$ct}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </xsl:if>
- <!-- x509 certificate -->
- <xsl:if test="message like '%di:%?hashtag=webid%'">
- <xsl:variable name="di"><xsl:copy-of select="vi:di-split (message)"/></xsl:variable>
- <xsl:for-each select="$di/result/di">
- <xsl:variable name="fp"><xsl:value-of select="hash"/></xsl:variable>
- <xsl:variable name="dgst"><xsl:value-of select="dgst"/></xsl:variable>
- <xsl:variable name="ct"><xsl:value-of select="vi:proxyIRI ($baseUri,'',$fp)"/></xsl:variable>
- <foaf:Agent rdf:about="{$resourceURL}">
- <oplcert:hasCertificate rdf:resource="{$ct}"/>
- </foaf:Agent>
- <oplcert:Certificate rdf:about="{$ct}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </xsl:for-each>
- </xsl:if>
- <!-- end certificate -->
- </xsl:for-each>
</rdf:RDF>
</xsl:template>
@@ -1896,14 +1678,16 @@
<rdfs:label>
<xsl:value-of select="message" />
</rdfs:label>
- <sioc:content>
+ <dc:title>
<xsl:value-of select="message" />
- </sioc:content>
- <dcterms:creator>
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
+ </dc:title>
+ <dc:description>
+ <!--
+ <xsl:value-of select="message" />
+ -->
+ <xsl:value-of select="concat ('Comment from ', from/name)" />
+ </dc:description>
+ <dcterms:creator rdf:resource="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}"/>
<sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
@@ -1923,248 +1707,6 @@
</rdf:RDF>
</xsl:template>
- <xsl:template match="/results" mode="album_photos">
- <rdf:RDF>
- <rdf:Description rdf:about="{$resourceURL}">
- <opl:providedBy rdf:resource="{$providedByIRI}" />
- <owl:sameAs rdf:resource="{$docIRI}"/>
- <xsl:for-each select="data">
- <xsl:variable name="id" select="id" />
- <oplog:has_photo>
- <rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat('Photo_', $id))}">
- <opl:providedBy rdf:resource="{$providedByIRI}" />
- <rdf:type rdf:resource="&foaf;Image" />
- <rdf:type rdf:resource="&exif;IFD" />
- <rdf:type rdf:resource="&oplog;Photo" />
- <oplog:id><xsl:value-of select="id"/></oplog:id>
- <rdfs:label>
- <xsl:choose>
- <xsl:when test="name">
- <xsl:value-of select="concat('Photo ', position, ': ', name)"/>
- </xsl:when>
- <xsl:when test="comments/data/message[1]">
- <xsl:value-of select="concat('Photo ', position, ': ', comments/data/message[1])"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="concat('Photo ', position)"/>
- </xsl:otherwise>
- </xsl:choose>
- </rdfs:label>
- <dcterms:creator>
- <!--
- Stub resource to hold creator's name. Resource will be sponged fully when dcterms:creator link is followed
- -->
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
- <!--
- picture is a thumbnail which is also included in the images list.
- Just associate source as the main photo.
- <foaf:depiction rdf:resource="{picture}"/>
- -->
- <foaf:depiction rdf:resource="{source}"/>
- <oplog:height rdf:datatype="&xsd;integer">
- <xsl:value-of select="height"/>
- </oplog:height>
- <oplog:width rdf:datatype="&xsd;integer">
- <xsl:value-of select="width"/>
- </oplog:width>
- <xsl:for-each select="images">
- <oplog:has_variant>
- <rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat('Image_', ../id, '_', position()))}">
- <rdf:type rdf:resource="&oplog;Image" />
- <rdfs:label>
- <xsl:value-of select="concat ('Photo ', ../id, ' (', width, 'w x ', height, 'h)')"/>
- </rdfs:label>
- <foaf:depiction rdf:resource="{source}"/>
- <oplog:height rdf:datatype="&xsd;integer">
- <xsl:value-of select="height"/>
- </oplog:height>
- <oplog:width rdf:datatype="&xsd;integer">
- <xsl:value-of select="width"/>
- </oplog:width>
- </rdf:Description>
- </oplog:has_variant>
- </xsl:for-each>
- <sioc:link rdf:resource="{link}" />
- <!--
- <xsl:if test="icon">
- <foaf:depiction rdf:resource="{icon}"/>
- </xsl:if>
- -->
- <dcterms:created rdf:datatype="&xsd;dateTime">
- <xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
- <xsl:choose>
- <xsl:when test="string-length($time_without_bad_offset) > 0">
- <xsl:value-of select="$time_without_bad_offset"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="created_time"/>
- </xsl:otherwise>
- </xsl:choose>
- </dcterms:created>
- <xsl:if test="position">
- <oplog:position rdf:datatype="&xsd;integer"><xsl:value-of select="position"/></oplog:position>
- </xsl:if>
- <xsl:if test="updated_time">
- <dcterms:modified rdf:datatype="&xsd;dateTime">
- <xsl:variable name="time_without_bad_offset" select="substring-before(updated_time, '+0000')"/>
- <xsl:choose>
- <xsl:when test="string-length($time_without_bad_offset) > 0">
- <xsl:value-of select="$time_without_bad_offset"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="updated_time"/>
- </xsl:otherwise>
- </xsl:choose>
- </dcterms:modified>
- </xsl:if>
- <xsl:for-each select="comments/data">
- <sioc:has_reply>
- <sioct:Comment rdf:about="{vi:proxyIRI ($baseUri, '', id)}">
- <opl:providedBy rdf:resource="{$providedByIRI}" />
- <rdfs:label>
- <xsl:value-of select="message"/>
- </rdfs:label>
- <sioc:content>
- <xsl:value-of select="message" />
- </sioc:content>
- <dcterms:created rdf:datatype="&xsd;dateTime">
- <xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
- <xsl:choose>
- <xsl:when test="string-length($time_without_bad_offset) > 0">
- <xsl:value-of select="$time_without_bad_offset"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="created_time"/>
- </xsl:otherwise>
- </xsl:choose>
- </dcterms:created>
- <dcterms:creator>
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
- <sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
- </sioct:Comment>
- </sioc:has_reply>
- </xsl:for-each>
- <xsl:for-each select="tags/data">
- <scot:hasTag>
- <!-- Not all tags have an id, so don't use as part of entity URI -->
- <scot:Tag rdf:about="{vi:proxyIRI ($baseUri, '', concat('Tag_', ../../id, '_', position()))}">
- <tag:name>
- <xsl:value-of select="name"/>
- </tag:name>
- <rdfs:label>
- <xsl:value-of select="name"/>
- </rdfs:label>
- <xsl:if test="string-length(id) > 0">
- <oplog:id><xsl:value-of select="id"/></oplog:id>
- <foaf:focus rdf:resource="{vi:proxyIRI (concat('http://graph.facebook.com/', id))}"/>
- </xsl:if>
- </scot:Tag>
- </scot:hasTag>
- </xsl:for-each>
- </rdf:Description>
- </oplog:has_photo>
- </xsl:for-each>
- </rdf:Description>
- </rdf:RDF>
- </xsl:template>
-
- <xsl:template match="/results" mode="video">
- <rdf:RDF>
- <rdf:Description rdf:about="{$resourceURL}">
- <opl:providedBy rdf:resource="{$providedByIRI}" />
- <owl:sameAs rdf:resource="{$docIRI}"/>
- <rdf:type rdf:resource="&oplog;Video" />
- <oplog:uri rdf:resource="{source}" />
- <xsl:if test="id">
- <oplog:id><xsl:value-of select="id"/></oplog:id>
- </xsl:if>
- <dcterms:creator>
- <!--
- Stub resource to hold creator's name. Resource will be sponged fully when dcterms:creator link is followed
- -->
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
- <xsl:if test="name">
- <foaf:name><xsl:value-of select="name"/></foaf:name>
- </xsl:if>
- <xsl:if test="description">
- <dc:description>
- <xsl:value-of select="description"/>
- </dc:description>
- </xsl:if>
- <xsl:if test="picture">
- <foaf:depiction rdf:resource="{picture}"/>
- </xsl:if>
-
- <dcterms:created rdf:datatype="&xsd;dateTime">
- <xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
- <xsl:choose>
- <xsl:when test="string-length($time_without_bad_offset) > 0">
- <xsl:value-of select="$time_without_bad_offset"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="created_time"/>
- </xsl:otherwise>
- </xsl:choose>
- </dcterms:created>
- <xsl:if test="updated_time">
- <dcterms:modified rdf:datatype="&xsd;dateTime">
- <xsl:variable name="time_without_bad_offset" select="substring-before(updated_time, '+0000')"/>
- <xsl:choose>
- <xsl:when test="string-length($time_without_bad_offset) > 0">
- <xsl:value-of select="$time_without_bad_offset"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="updated_time"/>
- </xsl:otherwise>
- </xsl:choose>
- </dcterms:modified>
- </xsl:if>
- <xsl:for-each select="comments/data">
- <sioc:has_reply>
- <sioct:Comment rdf:about="{vi:proxyIRI ($baseUri, '', id)}">
- <opl:providedBy rdf:resource="{$providedByIRI}" />
- <rdfs:label>
- <xsl:value-of select="message"/>
- </rdfs:label>
- <sioc:content>
- <xsl:value-of select="message" />
- </sioc:content>
- <dcterms:created rdf:datatype="&xsd;dateTime">
- <xsl:variable name="time_without_bad_offset" select="substring-before(created_time, '+0000')"/>
- <xsl:choose>
- <xsl:when test="string-length($time_without_bad_offset) > 0">
- <xsl:value-of select="$time_without_bad_offset"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="created_time"/>
- </xsl:otherwise>
- </xsl:choose>
- </dcterms:created>
- <dcterms:creator>
- <!--
- Stub resource to hold creator's name. Resource will be sponged fully when dcterms:creator link is followed
- -->
- <rdf:Description rdf:about="{vi:proxyIRI(concat('https://graph.facebook.com/', from/id))}">
- <foaf:name><xsl:value-of select="from/name"/></foaf:name>
- </rdf:Description>
- </dcterms:creator>
- <sioc:link rdf:resource="{concat('https://graph.facebook.com/', id)}" />
- </sioct:Comment>
- </sioc:has_reply>
- </xsl:for-each>
- </rdf:Description>
- </rdf:RDF>
- </xsl:template>
-
<xsl:template match="*|text()"/>
</xsl:stylesheet>
diff --git a/binsrc/rdf_mappers/xslt/main/fb_ogs2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fb_ogs2rdf.xsl
index 0436275..0ac8310 100644
--- a/binsrc/rdf_mappers/xslt/main/fb_ogs2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/fb_ogs2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: fb_ogs2rdf.xsl,v 1.1.4.5 2012/03/08 12:55:02 source Exp $
+ - $Id: fb_ogs2rdf.xsl,v 1.1.4.4 2011/07/15 11:23:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl b/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl
index 3ee0aa4..07d8e60 100644
--- a/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl
+++ b/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: feed2sioc.xsl,v 1.1.2.16 2012/03/08 12:55:02 source Exp $
+ - $Id: feed2sioc.xsl,v 1.1.2.14 2011/07/15 11:23:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -66,7 +66,6 @@
xmlns:awol="&awol;"
xmlns:d="&d;"
xmlns:m="&m;"
- xmlns:opl="http://www.openlinksw.com/schemas/attribution#"
version="1.0">
<xsl:output indent="yes" />
<xsl:param name="baseUri" />
@@ -212,7 +211,6 @@
</xsl:if>
<xsl:if test="string (//foaf:mbox/@rdf:resource) != ''">
<foaf:mbox rdf:resource="{//foaf:mbox/@rdf:resource}" />
- <opl:email_address_digest rdf:resource="{vi:di-uri (//foaf:mbox/@rdf:resource)}"/>
</xsl:if>
<xsl:for-each select="//rss:item[string (dc:creator) = $uname]">
<foaf:made rdf:resource="{vi:proxyIRI (@rdf:about)}" />
diff --git a/binsrc/rdf_mappers/xslt/main/flickr2rdf.xsl b/binsrc/rdf_mappers/xslt/main/flickr2rdf.xsl
index d5e4cbf..45b7c25 100644
--- a/binsrc/rdf_mappers/xslt/main/flickr2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/flickr2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: flickr2rdf.xsl,v 1.1.2.11 2012/03/08 12:55:02 source Exp $
+ - $Id: flickr2rdf.xsl,v 1.1.2.10 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl
index 7f3812e..ea2cc50 100644
--- a/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: fod2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:02 source Exp $
+ - $Id: fod2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl b/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl
index c87c13e..61dc53f 100755
--- a/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: foursquare2rdf.xsl,v 1.1.4.8 2012/03/08 12:55:02 source Exp $
+ - $Id: foursquare2rdf.xsl,v 1.1.4.5 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -144,7 +144,6 @@
</foaf:gender>
<xsl:if test="string-length(contact/email) > 0">
<foaf:mbox rdf:resource="{concat('mailto:', contact/email)}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (contact/email)}"/>
</xsl:if>
<xsl:if test="string-length(contact/facebook) > 0">
<sioc:link rdf:resource="{concat('http://www.facebook.com/profile.php?id=', contact/facebook)}"/>
@@ -219,7 +218,7 @@
<bibo:uri rdf:resource="{concat('https://foursquare.com/venue/', id)}" />
<sioc:link rdf:resource="{concat('https://foursquare.com/venue/', id)}" />
<xsl:for-each select="categories">
- <oplfq:category>
+ <sioc:topic>
<bibo:Document rdf:about="{vi:proxyIRI ($baseUri, '', concat('category_', id))}">
<rdfs:label>
<xsl:value-of select="name"/>
@@ -232,7 +231,7 @@
</dc:description>
<foaf:depiction rdf:resource="{icon}"/>
</bibo:Document>
- </oplfq:category>
+ </sioc:topic>
</xsl:for-each>
</rdf:Description>
</oplfq:is_mayor_of>
diff --git a/binsrc/rdf_mappers/xslt/main/fql2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fql2rdf.xsl
index 6af0a07..6132b3a 100644
--- a/binsrc/rdf_mappers/xslt/main/fql2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/fql2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: fql2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:02 source Exp $
+ - $Id: fql2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl b/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl
index 739d5b7..8a3ac94 100644
--- a/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: friendfeed2rdf.xsl,v 1.1.2.7 2012/03/08 12:55:02 source Exp $
+ - $Id: friendfeed2rdf.xsl,v 1.1.2.6 2011/07/15 11:23:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl
index 88f2986..25f0a05 100644
--- a/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: geo2rdf.xsl,v 1.1.2.4 2012/03/08 12:55:02 source Exp $
+ - $Id: geo2rdf.xsl,v 1.1.2.3 2011/07/15 11:23:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl b/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl
index 9d64a84..8bf08b1 100644
--- a/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: geonames2rdf.xsl,v 1.1.2.11 2012/03/08 12:55:02 source Exp $
+ - $Id: geonames2rdf.xsl,v 1.1.2.8 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -85,8 +85,7 @@
</opl:providedBy>
<rdf:type rdf:resource="&geonames;Feature"/>
- <rdf:type rdf:resource="&gr;Location"/>
- <rdfs:label><xsl:value-of select="geonames:name"/></rdfs:label>
+ <rdf:type rdf:resource="&gr;LocationOfSalesOrServiceProvisioning"/>
<xsl:copy-of select="*"/>
</rdf:Description>
</xsl:template>
diff --git a/binsrc/rdf_mappers/xslt/main/getsatisfaction2rdf.xsl b/binsrc/rdf_mappers/xslt/main/getsatisfaction2rdf.xsl
index ec94eb2..87c9b0b 100644
--- a/binsrc/rdf_mappers/xslt/main/getsatisfaction2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/getsatisfaction2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: getsatisfaction2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:02 source Exp $
+ - $Id: getsatisfaction2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/google2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google2rdf.xsl
index 335dd4a..88dcb96 100644
--- a/binsrc/rdf_mappers/xslt/main/google2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/google2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: google2rdf.xsl,v 1.1.2.10 2012/03/08 12:55:02 source Exp $
+ - $Id: google2rdf.xsl,v 1.1.2.8 2011/07/15 11:23:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -54,7 +54,6 @@
xmlns:m="&m;"
xmlns:d="&d;"
xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
- xmlns:opl="http://www.openlinksw.com/schemas/attribution#"
version="1.0">
<xsl:output method="xml" encoding="utf-8" indent="yes"/>
@@ -148,7 +147,6 @@
<rdf:type rdf:resource="&foaf;Agent"/>
<foaf:name><xsl:value-of select="name"/></foaf:name>
<foaf:mbox rdf:resource="mailto:{email}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (email)}"/>
</rdf:Description>
</sioc:has_creator>
</xsl:if>
diff --git a/binsrc/rdf_mappers/xslt/main/google_book2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_book2rdf.xsl
index 3ca5665..5597559 100644
--- a/binsrc/rdf_mappers/xslt/main/google_book2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/google_book2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: google_book2rdf.xsl,v 1.1.4.5 2012/03/08 12:55:02 source Exp $
+ - $Id: google_book2rdf.xsl,v 1.1.4.4 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl
index a022b0f..8536f12 100644
--- a/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: google_document2rdf.xsl,v 1.1.2.10 2012/03/08 12:55:02 source Exp $
+ - $Id: google_document2rdf.xsl,v 1.1.2.9 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl
index c22191d..f86eecf 100644
--- a/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: google_place2rdf.xsl,v 1.1.4.3 2012/03/08 12:55:02 source Exp $
+ - $Id: google_place2rdf.xsl,v 1.1.4.2 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl
index bdea359..69f398c 100644
--- a/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: google_profile2rdf.xsl,v 1.1.4.5 2012/03/08 12:55:02 source Exp $
+ - $Id: google_profile2rdf.xsl,v 1.1.4.3 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -34,7 +34,6 @@
<!ENTITY dcterms "http://purl.org/dc/terms/">
<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
<!ENTITY bibo "http://purl.org/ontology/bibo/">
-<!ENTITY opl "http://www.openlinksw.com/schema/attribution#">
<!ENTITY m "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
<!ENTITY d "http://schemas.microsoft.com/ado/2007/08/dataservices">
]>
@@ -65,7 +64,6 @@
xmlns:media="http://search.yahoo.com/mrss/"
xmlns:poco="http://portablecontacts.net/ns/1.0"
xmlns:thr="http://purl.org/syndication/thread/1.0"
- xmlns:opl="&opl;"
version="1.0">
<xsl:output method="xml" encoding="utf-8" indent="yes"/>
diff --git a/binsrc/rdf_mappers/xslt/main/google_spreadsheet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_spreadsheet2rdf.xsl
index 3b78c46..46c6b51 100644
--- a/binsrc/rdf_mappers/xslt/main/google_spreadsheet2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/google_spreadsheet2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: google_spreadsheet2rdf.xsl,v 1.1.2.9 2012/03/08 12:55:02 source Exp $
+ - $Id: google_spreadsheet2rdf.xsl,v 1.1.2.8 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl
index 875d6b1..e9ccb57 100644
--- a/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: google_store2rdf.xsl,v 1.1.4.6 2012/03/08 12:55:02 source Exp $
+ - $Id: google_store2rdf.xsl,v 1.1.4.5 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl b/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl
index 79fbf00..dab4e4d 100644
--- a/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: googlebase2rdf.xsl,v 1.3.2.13 2012/03/08 12:55:02 source Exp $
+ - $Id: googlebase2rdf.xsl,v 1.3.2.12 2011/08/09 10:58:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl b/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl
index 11b5181..2f9b063 100644
--- a/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: googleplus2rdf.xsl,v 1.1.4.8 2012/03/08 12:55:02 source Exp $
+ - $Id: googleplus2rdf.xsl,v 1.1.4.3 2011/10/25 23:36:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -40,7 +40,6 @@
<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
<!ENTITY xsi "http://www.w3.org/2001/XMLSchema-instance">
<!ENTITY xsl "http://www.w3.org/1999/XSL/Transform">
-<!ENTITY oplcert "http://www.openlinksw.com/schemas/cert#">
]>
<xsl:stylesheet
xmlns:awol="&awol;"
@@ -61,7 +60,6 @@
xmlns:xsd="&xsd;"
xmlns:xsi="&xsi;"
xmlns:xsl="&xsl;"
- xmlns:oplcert="&oplcert;"
version="1.0">
<xsl:output method="xml" indent="yes"/>
@@ -107,7 +105,7 @@
</rdf:RDF>
</xsl:template>
- <!-- People mapping -->
+ <!-- People mapping --------------------->
<xsl:template match="/results/kind" mode="people">
<xsl:if test="contains(. ,'person')">
@@ -369,7 +367,7 @@
<xsl:template match="*|text()" mode="people"/>
- <!-- Activity mapping -->
+ <!-- Activity mapping ---------------------->
<!-- Presence of items element indicates multiple Activities are being sponged
in the course of sponging a Google+ user profile URL -->
@@ -430,23 +428,6 @@
<oplgp:actor_profile_url rdf:resource="{url}"/>
-->
<oplgp:actor_profile_url rdf:resource="{vi:proxyIRI(url)}"/>
- <!-- x509 certificate -->
- <xsl:if test="../object/content like '%di:%?hashtag=webid%'">
- <xsl:variable name="di"><xsl:copy-of select="vi:di-split (../object/content)"/></xsl:variable>
- <xsl:for-each select="$di/result/di">
- <xsl:variable name="fp"><xsl:value-of select="hash"/></xsl:variable>
- <xsl:variable name="dgst"><xsl:value-of select="dgst"/></xsl:variable>
- <xsl:variable name="ct"><xsl:value-of select="vi:proxyIRI ($baseUri,'',$fp)"/></xsl:variable>
- <oplcert:hasCertificate>
- <oplcert:Certificate rdf:about="{$ct}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </oplcert:hasCertificate>
- </xsl:for-each>
- </xsl:if>
- <!-- end certificate -->
</oplgp:Actor>
</xsl:template>
@@ -570,7 +551,7 @@
</oplgp:attachment>
</xsl:template>
- <!-- Comments mapping -->
+ <!-- Comments mapping ---------------------->
<xsl:template match="items" mode="comment">
<xsl:variable name="activity_id" select="inReplyTo/id"/>
@@ -601,12 +582,12 @@
<xsl:value-of select="object/content"/>
</oplgp:comment_content>
<xsl:if test="string-length(published) > 0">
- <oplgp:published rdf:datatype="&xsd;dateTime">
+ <oplgp:published rdf:datatype="&xsd;date">
<xsl:value-of select="published"/>
</oplgp:published>
</xsl:if>
<xsl:if test="string-length(updated) > 0">
- <oplgp:updated rdf:datatype="&xsd;dateTime">
+ <oplgp:updated rdf:datatype="&xsd;date">
<xsl:value-of select="updated"/>
</oplgp:updated>
</xsl:if>
@@ -705,7 +686,7 @@
</oplgp:providerTitle>
</xsl:if>
<xsl:if test="string-length(published) > 0">
- <oplgp:published rdf:datatype="&xsd;dateTime">
+ <oplgp:published rdf:datatype="&xsd;date">
<xsl:value-of select="published"/>
</oplgp:published>
</xsl:if>
@@ -720,7 +701,7 @@
</oplgp:activity_title>
</xsl:if>
<xsl:if test="string-length(updated) > 0">
- <oplgp:updated rdf:datatype="&xsd;dateTime">
+ <oplgp:updated rdf:datatype="&xsd;date">
<xsl:value-of select="updated"/>
</oplgp:updated>
</xsl:if>
diff --git a/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl b/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl
index e59e8e3..61c52ad 100644
--- a/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: gowalla2rdf.xsl,v 1.1.4.5 2012/03/08 12:55:02 source Exp $
+ - $Id: gowalla2rdf.xsl,v 1.1.4.4 2011/08/01 14:19:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl b/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl
index eb9a40d..0cc7850 100644
--- a/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: groupon2rdf.xsl,v 1.1.4.7 2012/03/08 12:55:02 source Exp $
+ - $Id: groupon2rdf.xsl,v 1.1.4.6 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl b/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl
index 7c72d32..6ff5464 100644
--- a/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: guardian2rdf.xsl,v 1.1.4.6 2012/03/08 12:55:02 source Exp $
+ - $Id: guardian2rdf.xsl,v 1.1.4.4 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -83,7 +83,6 @@
</xsl:if>
<xsl:for-each select="person/contact-details/email-addresses">
<foaf:mbox rdf:resource="{email}"/>
- <opl:email_address_digest rdf:resource="{vi:di-uri (email)}"/>
</xsl:for-each>
<xsl:for-each select="person/contact-details/websites">
<rdfs:seeAlso rdf:resource="{url}"/>
diff --git a/binsrc/rdf_mappers/xslt/main/hcal2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hcal2rdf.xsl
index d45cad6..9006ed6 100644
--- a/binsrc/rdf_mappers/xslt/main/hcal2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hcal2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hcal2rdf.xsl,v 1.1.2.10 2012/03/08 12:55:02 source Exp $
+ - $Id: hcal2rdf.xsl,v 1.1.2.9 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl
index 5cdc7a8..2686987 100644
--- a/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hcard2rdf.xsl,v 1.1.2.12 2012/03/08 12:55:02 source Exp $
+ - $Id: hcard2rdf.xsl,v 1.1.2.10 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -21,18 +21,6 @@
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-->
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<!ENTITY bibo "http://purl.org/ontology/bibo/">
-<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY sioc "http://rdfs.org/sioc/ns#">
-<!ENTITY owl "http://www.w3.org/2002/07/owl#">
-<!ENTITY awol "http://bblfish.net/work/atom-owl/2006-06-06/#">
-<!ENTITY dcterms "http://purl.org/dc/terms/">
-<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-<!ENTITY oplcert "http://www.openlinksw.com/schemas/cert#">
-<!ENTITY cert "http://www.w3.org/ns/auth/cert#">
-]>
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:v="http://www.w3.org/2006/vcard/ns#"
@@ -41,15 +29,13 @@
xmlns:h="http://www.w3.org/1999/xhtml"
xmlns:vi="http://www.openlinksw.com/virtuoso/xslt/"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:cert="http://www.w3.org/ns/auth/cert#"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
version="1.0">
<xsl:output method="xml" encoding="utf-8" indent="yes"/>
<xsl:preserve-space elements="*"/>
<xsl:param name="baseUri" />
- <xsl:variable name="docproxyIRI" select="vi:proxyIRI($baseUri)"/>
+<xsl:variable name="docproxyIRI" select="vi:docproxyIRI($baseUri)"/>
<xsl:template match="/">
<rdf:RDF>
@@ -65,26 +51,6 @@
</xsl:variable>
<xsl:if test="$vcard != 0">
- <xsl:if test="//*[contains (concat (' ', @class, ' '), ' key ')]">
- <rdf:Description>
- <xsl:for-each select="//*[contains (concat (' ', @class, ' '), ' url ')][1]">
- <xsl:attribute name="rdf:about">
- <xsl:choose>
- <xsl:when test="@href">
- <xsl:value-of select="@href"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:if test="not(contains(.,':'))">http://</xsl:if>
- <xsl:value-of select="string(.)"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- </xsl:for-each>
- <rdf:type rdf:resource="&bibo;Document"/>
- <rdf:type rdf:resource="&foaf;Document"/>
- <xsl:apply-templates mode="extract-key"/>
- </rdf:Description>
- </xsl:if>
<rdf:Description rdf:about="{$docproxyIRI}">
<foaf:topic rdf:resource="{vi:proxyIRI ($baseUri, '', 'hcard')}"/>
</rdf:Description>
@@ -99,24 +65,6 @@
<xsl:template match="comment()|processing-instruction()|text()"/>
<!-- ============================================================ -->
- <xsl:template match="*" mode="extract-key">
- <xsl:variable name="key">
- <xsl:call-template name="testclass">
- <xsl:with-param name="val" select="'key'"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:if test="$key != 0 and @href and starts-with (@href, 'data:application/x-x509-user-cert;base64,')">
- <xsl:variable name="cert"><stub><xsl:copy-of select="vi:x509_pub_key (@href)"/></stub></xsl:variable>
- <cert:key>
- <cert:RSAPublicKey rdf:ID="key{$cert//fp}">
- <cert:modulus rdf:datatype="http://www.w3.org/2001/XMLSchema#hexBinary"><xsl:value-of select="$cert//mod"/></cert:modulus>
- <cert:exponent rdf:datatype="http://www.w3.org/2001/XMLSchema#integer"><xsl:value-of select="$cert//exp"/></cert:exponent>
- </cert:RSAPublicKey>
- </cert:key>
- </xsl:if>
- </xsl:template>
- <xsl:template match="comment()|processing-instruction()|text()"
- mode="extract-key"/>
<xsl:template match="*" mode="extract-vcard">
<xsl:variable name="fn">
diff --git a/binsrc/rdf_mappers/xslt/main/hlisting2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hlisting2rdf.xsl
index 4a615aa..dbb5ded 100644
--- a/binsrc/rdf_mappers/xslt/main/hlisting2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hlisting2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hlisting2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:02 source Exp $
+ - $Id: hlisting2rdf.xsl,v 1.1.2.7 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl
index 105ac27..06218b7 100644
--- a/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl
@@ -5,12 +5,12 @@
]>
<!--
-
- - $Id: hnews2rdf.xsl,v 1.1.4.10 2012/03/08 12:55:02 source Exp $
+ - $Id: hnews2rdf.xsl,v 1.1.4.9 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl
index 0bd4ada..5878830 100644
--- a/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hproduct2rdf.xsl,v 1.1.2.7 2012/03/08 12:55:02 source Exp $
+ - $Id: hproduct2rdf.xsl,v 1.1.2.6 2011/07/15 11:23:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl
index dc3320d..a477661 100644
--- a/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: hrecipe2rdf.xsl,v 1.1.4.9 2012/03/08 12:55:02 source Exp $
+ - $Id: hrecipe2rdf.xsl,v 1.1.4.6 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -25,7 +25,6 @@
<!ENTITY moat "http://moat-project.org/ns#">
<!ENTITY scot "http://scot-project.org/scot/ns#">
<!ENTITY skos "http://www.w3.org/2004/02/skos/core#">
-<!ENTITY opl "http://www.openlinksw.com/schema/attribution#">
]>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -40,7 +39,6 @@ xmlns:scot="&scot;"
xmlns:moat="&moat;"
xmlns:skos="&skos;"
xmlns:wdrs="http://www.w3.org/2007/05/powder-s#"
-xmlns:opl="&opl;"
xmlns:dv="http://rdf.data-vocabulary.org/" version="1.0">
<xsl:output method="xml" encoding="utf-8" indent="yes" />
<xsl:preserve-space elements="*" />
@@ -221,7 +219,7 @@ xmlns:dv="http://rdf.data-vocabulary.org/" version="1.0">
<xsl:choose>
<xsl:when test="string-length($ing_name) > 0">
<dv:ingredient>
- <dv:Ingredient rdf:about="{vi:proxyIRI ($baseUri, '', escape-uri(concat('hrecipe', substring( replace(normalize-space(.), ' ', ''), 1 , 20) ), true())) }">
+ <dv:Ingredient rdf:about="{vi:proxyIRI ($baseUri, '', replace(concat('hrecipe', .), ' ', '_')) }">
<dv:name>
<xsl:choose>
<xsl:when test="*[@class = 'name' or starts-with(@class,concat('name', ' ')) or contains(@class,concat(' ','name',' ')) or substring(@class, string-length(@class)-string-length('name')) = concat(' ','name')]">
diff --git a/binsrc/rdf_mappers/xslt/main/hresume2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hresume2rdf.xsl
index f3987b2..4052c86 100644
--- a/binsrc/rdf_mappers/xslt/main/hresume2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hresume2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hresume2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:02 source Exp $
+ - $Id: hresume2rdf.xsl,v 1.1.2.7 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl
index b1cd4ef..06410ca 100644
--- a/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hreview2rdf.xsl,v 1.1.2.7 2012/03/08 12:55:02 source Exp $
+ - $Id: hreview2rdf.xsl,v 1.1.2.6 2011/07/15 11:23:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl
index 0e1c302..7e5928a 100644
--- a/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: hreview_aggregate2rdf.xsl,v 1.1.4.4 2012/03/08 12:55:02 source Exp $
+ - $Id: hreview_aggregate2rdf.xsl,v 1.1.4.2 2010/12/14 12:07:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -160,11 +160,9 @@ xmlns:hrev="http://www.purl.org/stuff/hrev#" version="1.0">
</dcterms:modified>
</xsl:if>
<xsl:if test="$rating != 0">
- <xsl:if test="string-length(.) > 0">
- <review:rating>
- <xsl:value-of select="." />
- </review:rating>
- </xsl:if>
+ <review:rating>
+ <xsl:value-of select="." />
+ </review:rating>
</xsl:if>
<xsl:if test="$description != 0">
<review:text>
diff --git a/binsrc/rdf_mappers/xslt/main/hrxml2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hrxml2rdf.xsl
index c7374d7..2cd1499 100644
--- a/binsrc/rdf_mappers/xslt/main/hrxml2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hrxml2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hrxml2rdf.xsl,v 1.1.2.6 2012/03/08 12:55:02 source Exp $
+ - $Id: hrxml2rdf.xsl,v 1.1.2.5 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/html2rdf.xsl b/binsrc/rdf_mappers/xslt/main/html2rdf.xsl
index 94fbb64..8739e49 100644
--- a/binsrc/rdf_mappers/xslt/main/html2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/html2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: html2rdf.xsl,v 1.1.2.28 2012/03/14 11:05:44 source Exp $
+ - $Id: html2rdf.xsl,v 1.1.2.19 2011/07/15 11:23:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -29,9 +29,6 @@
<!ENTITY owl "http://www.w3.org/2002/07/owl#">
<!ENTITY awol "http://bblfish.net/work/atom-owl/2006-06-06/#">
<!ENTITY dcterms "http://purl.org/dc/terms/">
-<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-<!ENTITY oplcert "http://www.openlinksw.com/schemas/cert#">
-<!ENTITY cert "http://www.w3.org/ns/auth/cert#">
]>
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -48,7 +45,6 @@
xmlns:content="http://purl.org/rss/1.0/modules/content/"
xmlns:awol="&awol;"
xmlns:dcterms="&dcterms;"
- xmlns:oplcert="&oplcert;"
xmlns:xhv="http://www.w3.org/1999/xhtml/vocab#"
version="1.0">
<xsl:output method="xml" indent="yes" encoding="utf-8"/>
@@ -84,7 +80,7 @@
<xsl:apply-templates select="/html/body" mode="content"/>
</xsl:variable>
<!--content:encoded><xsl:value-of select="vi:escape($doc1)" /></content:encoded-->
- <xsl:if test="not ($baseUri like 'http://%.nytimes.com/%' and $baseUri like 'http://stackoverflow.com/%')">
+ <xsl:if test="not ($baseUri like 'http://%.nytimes.com/%')">
<awol:content rdf:resource="{$resourceURL}#content"/>
</xsl:if>
</rdf:Description>
@@ -94,63 +90,6 @@
<awol:src rdf:resource="{$source}"/>
</rdf:Description>
</xsl:if>
- <!-- x509 certificate -->
- <xsl:for-each select="//*[starts-with (., '#X509Cert Fingerprint:')]">
- <xsl:variable name="fp"><xsl:value-of select="substring-before (substring-after (., '#X509Cert Fingerprint:'), ' ')"/></xsl:variable>
- <xsl:variable name="fpn"><xsl:value-of select="translate ($fp, ':', '')"/></xsl:variable>
- <xsl:variable name="dgst">
- <xsl:choose>
- <xsl:when test="contains (., '#SHA1')">sha1</xsl:when>
- <xsl:otherwise>md5</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:variable name="ct"><xsl:value-of select="vi:proxyIRI ($baseUri,'',$fpn)"/></xsl:variable>
- <xsl:variable name="au">
- <xsl:choose>
- <xsl:when test="//link[@rel='canonical']/@href"><xsl:value-of select="//link[@rel='canonical']/@href"/>#author</xsl:when>
- <xsl:otherwise><xsl:value-of select="vi:proxyIRI ($baseUri,'','author')"/></xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <foaf:Agent rdf:about="{$au}">
- <oplcert:hasCertificate rdf:resource="{$ct}"/>
- </foaf:Agent>
- <rdf:Description rdf:about="{$resourceURL}">
- <dc:creator rdf:resource="{$au}"/>
- </rdf:Description>
- <oplcert:Certificate rdf:about="{$ct}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </xsl:for-each>
- <!-- end certificate -->
- <!-- x509 certificate -->
- <xsl:for-each select="//*[text() like '%di:%?hashtag=webid%']">
- <xsl:variable name="di"><xsl:copy-of select="vi:di-split (.)"/></xsl:variable>
- <xsl:variable name="au">
- <xsl:choose>
- <xsl:when test="//link[@rel='canonical']/@href"><xsl:value-of select="//link[@rel='canonical']/@href"/>#author</xsl:when>
- <xsl:otherwise><xsl:value-of select="vi:proxyIRI ($baseUri,'','author')"/></xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:for-each select="$di/result/di">
- <xsl:variable name="fp"><xsl:value-of select="hash"/></xsl:variable>
- <xsl:variable name="dgst"><xsl:value-of select="dgst"/></xsl:variable>
- <xsl:variable name="ct"><xsl:value-of select="vi:proxyIRI ($baseUri,'',$fp)"/></xsl:variable>
- <foaf:Agent rdf:about="{$au}">
- <oplcert:hasCertificate rdf:resource="{$ct}"/>
- </foaf:Agent>
- <rdf:Description rdf:about="{$resourceURL}">
- <dc:creator rdf:resource="{$au}"/>
- </rdf:Description>
- <oplcert:Certificate rdf:about="{$ct}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </xsl:for-each>
- </xsl:for-each>
- <!-- end certificate -->
</xsl:template>
<xsl:template match="link[@rel='alternate']">
diff --git a/binsrc/rdf_mappers/xslt/main/html5md2rdf.xsl b/binsrc/rdf_mappers/xslt/main/html5md2rdf.xsl
index c667e98..d18d9c1 100644
--- a/binsrc/rdf_mappers/xslt/main/html5md2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/html5md2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: html5md2rdf.xsl,v 1.1.4.7 2012/03/08 12:55:02 source Exp $
+ - $Id: html5md2rdf.xsl,v 1.1.4.6 2011/07/15 11:23:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl b/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl
deleted file mode 100644
index a5dc3c0..0000000
--- a/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: htmlAllMeta2rdf.xsl,v 1.1.2.2 2012/03/08 12:55:02 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
--->
-<xsl:stylesheet
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:h="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:vi="http://www.openlinksw.com/virtuoso/xslt/"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- version="1.0">
-
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:param name="baseUri"/>
- <xsl:variable name="uc">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
- <xsl:variable name="lc">abcdefghijklmnopqrstuvwxyz</xsl:variable>
- <xsl:variable name="resourceURL" select="vi:proxyIRI($baseUri)"/>
- <xsl:variable name="docIRI" select="vi:docIRI($baseUri)"/>
- <xsl:variable name="docproxyIRI" select="vi:docproxyIRI($baseUri)"/>
-
- <xsl:template match="/">
- <rdf:RDF>
- <xsl:apply-templates select="//h:head/h:meta|//h:head/h:link" mode="ref"/>
- <rdf:Description rdf:about="{$resourceURL}">
- <xsl:apply-templates select="//h:head/h:meta|//h:head/h:link" mode="gen"/>
- </rdf:Description>
- </rdf:RDF>
- </xsl:template>
-
- <xsl:template match="h:meta" mode="ref">
- <xsl:variable name="p" select="vi:docproxyIRI($baseUri, '', vi:saneURI(./@name, -1))"/>
- <owl:DatatypeProperty rdf:about="{$p}">
- <rdfs:label>
- <xsl:value-of select="@name"/>
- </rdfs:label>
- <rdfs:isDefinedBy rdf:resource="{vi:docproxyIRI($baseUri,'','schema')}"/>
- </owl:DatatypeProperty>
- </xsl:template>
-
- <xsl:template match="h:link" mode="ref">
- <xsl:variable name="p" select="vi:docproxyIRI($baseUri, '', vi:saneURI(./@rel, -1))"/>
- <owl:DatatypeProperty rdf:about="{$p}">
- <rdfs:label>
- <xsl:value-of select="@rel"/>
- </rdfs:label>
- <rdfs:isDefinedBy rdf:resource="{vi:docproxyIRI($baseUri,'','schema')}"/>
- </owl:DatatypeProperty>
- </xsl:template>
-
- <xsl:template match="h:meta" mode="gen">
- <xsl:variable name="p" select="vi:docproxyIRI($baseUri, '', vi:saneURI(./@name, -1))"/>
- <xsl:variable name="lp" select="vi:saneURI(./@name, -1)"/>
- <xsl:element name="{$lp}" namespace="{concat($baseUri, '#')}"><xsl:value-of select="@content" /></xsl:element>
- </xsl:template>
-
- <xsl:template match="h:link" mode="gen">
- <xsl:variable name="p" select="vi:docproxyIRI($baseUri, '', vi:saneURI(./@rel, -1))"/>
- <xsl:variable name="lp" select="vi:saneURI(./@rel, -1)"/>
- <xsl:element name="{$lp}" namespace="{concat($baseUri, '#')}"><xsl:value-of select="@href" /></xsl:element>
- </xsl:template>
-
- <xsl:template match="text()|@*"/>
-</xsl:stylesheet>
-
diff --git a/binsrc/rdf_mappers/xslt/main/hyperpublic2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hyperpublic2rdf.xsl
index 3b0cf08..7abc109 100644
--- a/binsrc/rdf_mappers/xslt/main/hyperpublic2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/hyperpublic2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hyperpublic2rdf.xsl,v 1.1.4.4 2012/03/08 12:55:02 source Exp $
+ - $Id: hyperpublic2rdf.xsl,v 1.1.4.3 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl
index 2832579..4899055 100644
--- a/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ics2rdf.xsl,v 1.1.2.12 2012/03/08 12:55:02 source Exp $
+ - $Id: ics2rdf.xsl,v 1.1.2.11 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl b/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl
index e51f6c5..d9b40d8 100644
--- a/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: idiomag2rdf.xsl,v 1.1.4.7 2012/03/08 12:55:02 source Exp $
+ - $Id: idiomag2rdf.xsl,v 1.1.4.6 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl b/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl
index 36250c1..fae2a57 100644
--- a/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: isbn2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:02 source Exp $
+ - $Id: isbn2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl b/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl
index 0450cbc..69aa00f 100644
--- a/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: jigsaw2rdf.xsl,v 1.1.4.3 2012/03/08 12:55:02 source Exp $
+ - $Id: jigsaw2rdf.xsl,v 1.1.4.2 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl b/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl
deleted file mode 100644
index 2381038..0000000
--- a/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: klout2rdf.xsl,v 1.1.2.3 2012/03/08 12:55:02 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
--->
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY sioc "http://rdfs.org/sioc/ns#">
-<!ENTITY bibo "http://purl.org/ontology/bibo/">
-<!ENTITY oplklout "http://www.openlinksw.com/schemas/klout#">
-<!ENTITY opltw "http://www.openlinksw.com/schemas/twitter#">
-<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:vi="http://www.openlinksw.com/virtuoso/xslt/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bibo="&bibo;" xmlns:sioc="&sioc;" xmlns:oplklout="&oplklout;" xmlns:opltw="&opltw;" xmlns:foaf="&foaf;" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:xsd="&xsd;" version="1.0">
-
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:param name="baseUri"/>
- <xsl:param name="mode"/>
-
- <xsl:variable name="resourceURL" select="vi:proxyIRI($baseUri)"/>
- <xsl:variable name="docIRI" select="vi:docIRI($baseUri)"/>
- <xsl:variable name="docproxyIRI" select="vi:docproxyIRI($baseUri)"/>
-
- <xsl:template match="/">
- <rdf:RDF>
- <rdf:Description rdf:about="{$docproxyIRI}">
- <rdf:type rdf:resource="&bibo;Document"/>
- <dc:title>
- <xsl:value-of select="$baseUri"/>
- </dc:title>
- <sioc:container_of rdf:resource="{$resourceURL}"/>
- <foaf:primaryTopic rdf:resource="{$resourceURL}"/>
- <dcterms:subject rdf:resource="{$resourceURL}"/>
- <owl:sameAs rdf:resource="{$docIRI}"/>
- </rdf:Description>
- <rdf:Description rdf:about="{$resourceURL}">
- <rdf:type rdf:resource="&sioc;Container"/>
- <rdf:type rdf:resource="&oplklout;User"/>
- <xsl:apply-templates/>
- </rdf:Description>
- </rdf:RDF>
- </xsl:template>
-
- <xsl:template match="users">
- <xsl:apply-templates select="user"/>
- </xsl:template>
-
- <xsl:template match="user">
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match="twitter_id">
- <opltw:id>
- <xsl:value-of select="."/>
- </opltw:id>
- </xsl:template>
-
- <xsl:template match="twitter_screen_name">
- <opltw:screen_name>
- <xsl:value-of select="."/>
- </opltw:screen_name>
- <rdfs:label>
- <xsl:value-of select="."/>
- </rdfs:label>
- <oplklout:twitterProfileURI rdf:resource="{vi:proxyIRI (concat('http://twitter.com/', .))}"/>
- </xsl:template>
-
- <xsl:template match="score">
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match="kscore">
- <oplklout:has_klout rdf:datatype="&xsd;float">
- <xsl:value-of select="."/>
- </oplklout:has_klout>
- </xsl:template>
-
- <xsl:template match="slope">
- <oplklout:score_slope rdf:datatype="&xsd;float">
- <xsl:value-of select="."/>
- </oplklout:score_slope>
- </xsl:template>
-
- <xsl:template match="description">
- <oplklout:description>
- <xsl:value-of select="."/>
- </oplklout:description>
- </xsl:template>
-
- <xsl:template match="kclass">
- <oplklout:class>
- <xsl:value-of select="."/>
- </oplklout:class>
- </xsl:template>
-
- <xsl:template match="network_score">
- <oplklout:netscore rdf:datatype="&xsd;float">
- <xsl:value-of select="."/>
- </oplklout:netscore>
- </xsl:template>
-
- <xsl:template match="amplification">
- <oplklout:amplification rdf:datatype="&xsd;float">
- <xsl:value-of select="."/>
- </oplklout:amplification>
- </xsl:template>
-
- <xsl:template match="true_reach">
- <oplklout:true_reach rdf:datatype="&xsd;float">
- <xsl:value-of select="."/>
- </oplklout:true_reach>
- </xsl:template>
-
- <xsl:template match="delta_1day">
- <oplklout:delta1d rdf:datatype="&xsd;float">
- <xsl:value-of select="."/>
- </oplklout:delta1d>
- </xsl:template>
-
- <xsl:template match="delta_5day">
- <oplklout:delta5d rdf:datatype="&xsd;float">
- <xsl:value-of select="."/>
- </oplklout:delta5d>
- </xsl:template>
-
- <xsl:template match="topics">
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match="topic">
- <oplklout:topic>
- <xsl:value-of select="."/>
- </oplklout:topic>
- </xsl:template>
-
- <xsl:template match="influencees">
- <xsl:apply-templates select="twitter_screen_name" mode="influencee"/>
- </xsl:template>
-
- <xsl:template match="twitter_screen_name" mode="influencee">
- <oplklout:influences>
- <rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', .)}">
- <rdf:type rdf:resource="&oplklout;User"/>
- <rdfs:label>
- <xsl:value-of select="."/>
- </rdfs:label>
- <foaf:homepage rdf:resource="{vi:proxyIRI (concat('http://klout.com/', .))}"/>
- </rdf:Description>
- </oplklout:influences>
- </xsl:template>
-
- <xsl:template match="influencers">
- <xsl:apply-templates select="twitter_screen_name" mode="influenced_by"/>
- </xsl:template>
-
- <xsl:template match="twitter_screen_name" mode="influenced_by">
- <oplklout:influenced_by>
- <rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', .)}">
- <rdf:type rdf:resource="&oplklout;User"/>
- <rdfs:label>
- <xsl:value-of select="."/>
- </rdfs:label>
- <foaf:homepage rdf:resource="{vi:proxyIRI (concat('http://klout.com/', .))}"/>
- </rdf:Description>
- </oplklout:influenced_by>
- </xsl:template>
-
- <xsl:template match="*|text()"/>
-
- <xsl:template match="*|text()" mode="show"/>
-
- <xsl:template match="*|text()" mode="topics"/>
-
- <xsl:template match="*|text()" mode="influencers"/>
-
- <xsl:template match="*|text()" mode="influenced_by"/>
-
- <xsl:template match="*|text()" mode="influences"/>
-
- <xsl:template match="*|text()"/>
-</xsl:stylesheet>
-
diff --git a/binsrc/rdf_mappers/xslt/main/lastfm2rdf.xsl b/binsrc/rdf_mappers/xslt/main/lastfm2rdf.xsl
index fe1d8f6..fb2c1ad 100644
--- a/binsrc/rdf_mappers/xslt/main/lastfm2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/lastfm2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: lastfm2rdf.xsl,v 1.1.2.13 2012/03/08 12:55:02 source Exp $
+ - $Id: lastfm2rdf.xsl,v 1.1.2.12 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl b/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl
index 1c325ff..6661e1f 100644
--- a/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: linkedin2rdf.xsl,v 1.1.4.5 2012/03/08 12:55:02 source Exp $
+ - $Id: linkedin2rdf.xsl,v 1.1.4.3 2011/07/15 11:14:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -77,22 +77,12 @@
<owl:sameAs rdf:resource="{$docIRI}"/>
</rdf:Description>
- <rdf:Description rdf:about="{$resourceURL}">
- <xsl:if test="$li_object_type='connections'">
- <xsl:apply-templates select="/connections/person" mode="connpersonref" />
- <oplli:num_connections rdf:datatype="&xsd;integer"><xsl:value-of select="/connections/@total"/></oplli:num_connections>
- </xsl:if>
- </rdf:Description>
-
<!-- Attribution resource -->
<foaf:Organization rdf:about="{$providedByIRI}">
<foaf:name>LinkedIn Inc.</foaf:name>
<foaf:homepage rdf:resource="http://www.linkedin.com"/>
</foaf:Organization>
-
- <xsl:if test="$li_object_type='connections'">
- <xsl:apply-templates select="/connections/person" mode="connperson" />
- </xsl:if>
+
<xsl:apply-templates select="*"/>
</rdf:RDF>
</xsl:template>
@@ -103,20 +93,6 @@
</xsl:call-template>
</xsl:template>
- <xsl:template match="/connections" />
-
- <xsl:template match="person" mode="connpersonref">
- <xsl:variable name="personURI" select="vi:proxyIRI($baseUri, '', concat('Person_', id))"/>
- <foaf:knows rdf:resource="{$personURI}" />
- </xsl:template>
-
- <xsl:template match="person" mode="connperson">
- <xsl:variable name="personURI" select="vi:proxyIRI($baseUri, '', concat('Person_', id))"/>
- <xsl:call-template name="person">
- <xsl:with-param name="personURI"><xsl:value-of select="$personURI" /></xsl:with-param>
- </xsl:call-template>
- </xsl:template>
-
<xsl:template match="educations">
<xsl:for-each select="education">
<xsl:variable name="id" select="id" />
@@ -305,6 +281,9 @@
<xsl:if test="headline">
<oplli:headline><xsl:value-of select="headline"/></oplli:headline>
</xsl:if>
+ <xsl:if test="num-connections">
+ <oplli:num_connections rdf:datatype="&xsd;integer"><xsl:value-of select="num-connections"/></oplli:num_connections>
+ </xsl:if>
<xsl:if test="picture-url">
<foaf:img rdf:resource="{picture-url}"/>
</xsl:if>
diff --git a/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl b/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl
deleted file mode 100644
index 4f4b120..0000000
--- a/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: linkedin_shares2rdf.xsl,v 1.1.2.9 2012/03/08 12:55:02 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
--->
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY bibo "http://purl.org/ontology/bibo/">
-<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY opl "http://www.openlinksw.com/schema/attribution#">
-<!ENTITY oplcv "http://www.openlinksw.com/schemas/cv#">
-<!ENTITY oplli "http://www.openlinksw.com/schemas/linkedin#">
-<!ENTITY owl "http://www.w3.org/2002/07/owl#">
-<!ENTITY rdfns "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<!ENTITY sioc "http://rdfs.org/sioc/ns#">
-<!ENTITY sioct "http://rdfs.org/sioc/types#">
-<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-<!ENTITY vi "http://www.openlinksw.com/virtuoso/xslt/">
-<!ENTITY oplcert "http://www.openlinksw.com/schemas/cert#">
-<!ENTITY cert "http://www.w3.org/ns/auth/cert#">
-]>
-<xsl:stylesheet
- xmlns:bibo="&bibo;"
- xmlns:oplcv="&oplcv;"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:foaf="&foaf;"
- xmlns:h="http://www.w3.org/1999/xhtml"
- xmlns:oplli="&oplli;"
- xmlns:opl="&opl;"
- xmlns:owl="&owl;"
- xmlns:rdf="&rdfns;"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:sioc="&sioc;"
- xmlns:vi="&vi;"
- xmlns:oplcert="&oplcert;"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- >
-
- <xsl:param name="baseUri" />
- <xsl:param name="li_object_type" />
-
- <xsl:variable name="resourceURL" select="vi:proxyIRI ($baseUri)"/>
- <xsl:variable name="docIRI" select="vi:docIRI($baseUri)"/>
- <xsl:variable name="docproxyIRI" select="vi:docproxyIRI($baseUri)"/>
- <xsl:variable name="providedByIRI" select="concat ('http://www.linkedin.com', '#this')"/>
-
- <xsl:variable name="uc">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
- <xsl:variable name="lc">abcdefghijklmnopqrstuvwxyz</xsl:variable>
-
- <xsl:output method="xml" version="1.0" encoding="utf-8" omit-xml-declaration="no" standalone="no" indent="yes" />
-
- <xsl:template match="/">
- <rdf:RDF>
- <xsl:for-each select="/network/updates/update/update-content/person/current-share">
- <rdf:Description rdf:about="{vi:proxyIRI ($baseUri, '', concat ('#', id))}">
- <rdf:type rdf:resource="&sioct;MicroblogPost"/>
- <dcterms:creator rdf:resource="{$resourceURL}"/>
- <bibo:content>
- <xsl:value-of select="comment"/>
- </bibo:content>
- <rdfs:label><xsl:value-of select="comment"/></rdfs:label>
- <dcterms:created rdf:datatype="&xsd;dateTime"><xsl:value-of select="vi:unix2iso-date (timestamp div 1000)"/></dcterms:created>
- </rdf:Description>
- <xsl:if test="starts-with (comment, '#X509Cert Fingerprint:')">
- <xsl:variable name="fp"><xsl:value-of select="substring-before (substring-after (comment, '#X509Cert Fingerprint:'), ' ')"/></xsl:variable>
- <xsl:variable name="fpn"><xsl:value-of select="translate ($fp, ':', '')"/></xsl:variable>
- <xsl:variable name="dgst">
- <xsl:choose>
- <xsl:when test="contains (comment, '#SHA1')">sha1</xsl:when>
- <xsl:otherwise>md5</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <rdf:Description rdf:about="{$resourceURL}">
- <oplcert:hasCertificate rdf:resource="{vi:proxyIRI ($baseUri, '', $fpn)}"/>
- </rdf:Description>
- <oplcert:Certificate rdf:about="{vi:proxyIRI ($baseUri, '', $fpn)}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </xsl:if>
- <!-- x509 certificate -->
- <xsl:if test="comment like '%di:%?hashtag=webid%'">
- <xsl:variable name="di"><xsl:copy-of select="vi:di-split (comment)"/></xsl:variable>
- <xsl:for-each select="$di/result/di">
- <xsl:variable name="fp"><xsl:value-of select="hash"/></xsl:variable>
- <xsl:variable name="dgst"><xsl:value-of select="dgst"/></xsl:variable>
- <xsl:variable name="ct"><xsl:value-of select="vi:proxyIRI ($baseUri,'',$fp)"/></xsl:variable>
- <foaf:Agent rdf:about="{$resourceURL}">
- <oplcert:hasCertificate rdf:resource="{$ct}"/>
- </foaf:Agent>
- <oplcert:Certificate rdf:about="{$ct}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </xsl:for-each>
- </xsl:if>
- <!-- end certificate -->
- </xsl:for-each>
- </rdf:RDF>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/binsrc/rdf_mappers/xslt/main/lt2rdf.xsl b/binsrc/rdf_mappers/xslt/main/lt2rdf.xsl
index 51dc385..709ae9b 100644
--- a/binsrc/rdf_mappers/xslt/main/lt2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/lt2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: lt2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:02 source Exp $
+ - $Id: lt2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl b/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl
index 50a41eb..bd9d7a0 100644
--- a/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: mbz2rdf.xsl,v 1.1.2.10 2012/03/08 12:55:02 source Exp $
+ - $Id: mbz2rdf.xsl,v 1.1.2.9 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl b/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl
index cd9c7ce..85537bd 100644
--- a/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: meetup2rdf.xsl,v 1.1.2.11 2012/03/08 12:55:02 source Exp $
+ - $Id: meetup2rdf.xsl,v 1.1.2.10 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl b/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl
index 4b89d45..b77b277 100644
--- a/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: mql2rdf.xsl,v 1.1.2.5 2012/03/08 12:55:02 source Exp $
+ - $Id: mql2rdf.xsl,v 1.1.2.4 2011/07/15 11:23:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl b/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl
index e6c564b..3857aba 100644
--- a/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: mqlrdf2oplrdf.xsl,v 1.1.2.7 2012/03/08 12:55:02 source Exp $
+ - $Id: mqlrdf2oplrdf.xsl,v 1.1.2.6 2011/07/15 11:23:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl
index 04e5ddf..ec8ed3c 100644
--- a/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ms_doc2rdf.xsl,v 1.1.2.6 2012/03/08 12:55:02 source Exp $
+ - $Id: ms_doc2rdf.xsl,v 1.1.2.5 2011/07/15 11:23:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl
index 853e758..e3b1b6b 100644
--- a/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ms_document2rdf.xsl,v 1.1.2.5 2012/03/08 12:55:02 source Exp $
+ - $Id: ms_document2rdf.xsl,v 1.1.2.4 2011/07/15 11:23:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl
index a79ac6c..6d80069 100644
--- a/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ms_spreadsheet2rdf.xsl,v 1.1.2.7 2012/03/08 12:55:02 source Exp $
+ - $Id: ms_spreadsheet2rdf.xsl,v 1.1.2.6 2011/07/15 11:23:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl
index 1cf2ef8..4ca878a 100644
--- a/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ning2rdf.xsl,v 1.1.2.4 2012/03/08 12:55:02 source Exp $
+ - $Id: ning2rdf.xsl,v 1.1.2.3 2011/07/15 11:23:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl b/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl
deleted file mode 100644
index 7cae554..0000000
--- a/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: nyt_article2rdf.xsl,v 1.1.2.4 2012/03/08 12:55:02 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
--->
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY bibo "http://purl.org/ontology/bibo/">
-<!ENTITY dc "http://purl.org/dc/elements/1.1/">
-<!ENTITY dcterms "http://purl.org/dc/terms/">
-<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY opl "http://www.openlinksw.com/schema/attribution#">
-<!ENTITY oplnyt "http://www.openlinksw.com/schemas/nyt#">
-<!ENTITY owl "http://www.w3.org/2002/07/owl#">
-<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#">
-<!ENTITY sioc "http://rdfs.org/sioc/ns#">
-<!ENTITY vi "http://www.openlinksw.com/virtuoso/xslt/">
-<!ENTITY virtrdfmec "http://www.openlinksw.com/schemas/virtrdf-meta-entity-class#">
-<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-]>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:bibo="&bibo;"
- xmlns:dc="&dc;"
- xmlns:dcterms="&dcterms;"
- xmlns:foaf="&foaf;"
- xmlns:opl="&opl;"
- xmlns:oplnyt="&oplnyt;"
- xmlns:owl="&owl;"
- xmlns:rdf="&rdf;"
- xmlns:rdfs="&rdfs;"
- xmlns:sioc="&sioc;"
- xmlns:vi="&vi;"
- xmlns:virtrdfmec="&virtrdfmec;"
- xmlns:xsd="&xsd;"
- >
-
- <xsl:output method="xml" indent="yes" />
-
- <xsl:param name="baseUri" />
-
- <xsl:variable name="resourceURL" select="vi:proxyIRI($baseUri)"/>
- <xsl:variable name="docIRI" select="vi:docIRI($baseUri)"/>
- <xsl:variable name="docproxyIRI" select="vi:docproxyIRI($baseUri)"/>
- <xsl:variable name="providedByIRI" select="concat ('http://www.nytimes.com', '#this')"/>
-
- <xsl:template match="/results/results">
- <rdf:RDF>
- <rdf:Description rdf:about="{$docproxyIRI}">
- <rdf:type rdf:resource="&bibo;Document"/>
- <sioc:container_of rdf:resource="{$resourceURL}"/>
- <foaf:primaryTopic rdf:resource="{$resourceURL}"/>
- <dcterms:subject rdf:resource="{$resourceURL}"/>
- <xsl:if test="string-length (nytd_title) != ''">
- <dc:title><xsl:value-of select="nytd_title"/></dc:title>
- </xsl:if>
- <owl:sameAs rdf:resource="{$docIRI}"/>
- </rdf:Description>
-
- <rdf:Description rdf:about="{$resourceURL}">
- <opl:providedBy rdf:resource="{$providedByIRI}" />
- <rdf:type rdf:resource="&bibo;Document"/>
- <xsl:if test="string-length (abstract) > 0">
- <dcterms:abstract>
- <xsl:value-of select="abstract" />
- </dcterms:abstract>
- </xsl:if>
- <!-- title may include NYT related info, whereas nytd_title doesn't -->
- <xsl:if test="string-length (nytd_title) != ''">
- <dc:title>
- <xsl:value-of select="nytd_title"/>
- </dc:title>
- </xsl:if>
- <dc:creator>
- <xsl:choose>
- <xsl:when test="starts-with (byline, 'By ')">
- <xsl:value-of select="substring-after (byline, 'By ')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="byline"/>
- </xsl:otherwise>
- </xsl:choose>
- </dc:creator>
- <dc:description>
- <xsl:value-of select="concat (body, ' ...')"/>
- </dc:description>
- <dcterms:created rdf:datatype="&xsd;date">
- <xsl:value-of select="date"/>
- </dcterms:created>
- <oplnyt:full_article rdf:resource="{url}"/>
- <dcterms:extent>
- <xsl:value-of select="concat (word_count, ' words')"/>
- </dcterms:extent>
- <oplnyt:fee rdf:datatype="&xsd;boolean">
- <xsl:value-of select="translate (fee, 'YN', '10')"/>
- </oplnyt:fee>
- <xsl:for-each select="dbpedia_resource_url">
- <foaf:focus rdf:resource="{.}"/>
- </xsl:for-each>
- <xsl:if test="small_image_url">
- <foaf:img rdf:resource="{small_image_url}"/>
- </xsl:if>
- <xsl:if test="nytd_section">
- <oplnyt:section>
- <xsl:value-of select="nytd_section"/>
- </oplnyt:section>
- </xsl:if>
- <xsl:for-each select="nytd_des_facet">
- <dcterms:subject>
- <xsl:value-of select="."/>
- </dcterms:subject>
- </xsl:for-each>
- <xsl:for-each select="nytd_per_facet">
- <xsl:variable name="person_name">
- <xsl:choose>
- <xsl:when test="contains (., ',')">
- <xsl:value-of select="concat (substring-after (., ', '), ' ', substring-before (., ','))"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="."/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <opl:mentions>
- <opl:NamedEntity rdf:about="{vi:proxyIRI ($baseUri,'#', translate(., ' ,.', '_'))}">
- <rdfs:label>
- <xsl:value-of select="concat ('[New York Times] ', $person_name)"/>
- </rdfs:label>
- <opl:entityType rdf:resource="&virtrdfmec;Person" />
- </opl:NamedEntity>
- </opl:mentions>
- </xsl:for-each>
- <xsl:for-each select="nytd_org_facet">
- <opl:mentions>
- <opl:NamedEntity rdf:about="{vi:proxyIRI ($baseUri,'#', translate(., ' ,.', '_'))}">
- <rdfs:label>
- <xsl:value-of select="concat ('[New York Times] ', .)"/>
- </rdfs:label>
- <opl:entityType rdf:resource="&virtrdfmec;Organization" />
- </opl:NamedEntity>
- </opl:mentions>
- </xsl:for-each>
- <xsl:for-each select="nytd_geo_facet">
- <opl:mentions>
- <opl:NamedEntity rdf:about="{vi:proxyIRI ($baseUri,'#', translate(., ' ,.', '_'))}">
- <rdfs:label>
- <xsl:value-of select="concat ('[New York Times] ', .)"/>
- </rdfs:label>
- <opl:entityType rdf:resource="&virtrdfmec;Place" />
- </opl:NamedEntity>
- </opl:mentions>
- </xsl:for-each>
- </rdf:Description>
- </rdf:RDF>
- </xsl:template>
-
- <xsl:template match="text()|@*"/>
-
-</xsl:stylesheet>
diff --git a/binsrc/rdf_mappers/xslt/main/oai2rdf.xsl b/binsrc/rdf_mappers/xslt/main/oai2rdf.xsl
index bbec331..5472945 100644
--- a/binsrc/rdf_mappers/xslt/main/oai2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/oai2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: oai2rdf.xsl,v 1.1.2.7 2012/03/08 12:55:02 source Exp $
+ - $Id: oai2rdf.xsl,v 1.1.2.6 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl b/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl
index 76ee643..25658b7 100644
--- a/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: odata2rdf.xsl,v 1.1.4.5 2012/03/08 12:55:02 source Exp $
+ - $Id: odata2rdf.xsl,v 1.1.4.4 2011/07/15 11:23:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl
index a3bca51..c524107 100644
--- a/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: oo2rdf.xsl,v 1.1.2.4 2012/03/08 12:55:02 source Exp $
+ - $Id: oo2rdf.xsl,v 1.1.2.3 2011/07/15 11:23:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl b/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl
index 55b4f6e..953c771 100644
--- a/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: openlibrary2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:03 source Exp $
+ - $Id: openlibrary2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl
index 1cba769..47b5650 100644
--- a/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: openstreet2rdf.xsl,v 1.1.2.9 2012/03/08 12:55:03 source Exp $
+ - $Id: openstreet2rdf.xsl,v 1.1.2.8 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl b/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl
index 3964704..6aba5cf 100644
--- a/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: oreilly2rdf.xsl,v 1.1.2.19 2012/03/08 12:55:03 source Exp $
+ - $Id: oreilly2rdf.xsl,v 1.1.2.18 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl
index b4d2d12..99141a0 100644
--- a/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ospeople2rdf.xsl,v 1.1.2.4 2012/03/08 12:55:03 source Exp $
+ - $Id: ospeople2rdf.xsl,v 1.1.2.3 2011/07/15 11:23:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl b/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl
index 387a4ba..bb62fba 100644
--- a/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: picasa2rdf.xsl,v 1.1.2.10 2012/03/08 12:55:03 source Exp $
+ - $Id: picasa2rdf.xsl,v 1.1.2.9 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl b/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl
index ca34c92..4085c88 100755
--- a/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: plancast2rdf.xsl,v 1.1.4.4 2012/03/08 12:55:03 source Exp $
+ - $Id: plancast2rdf.xsl,v 1.1.4.3 2011/07/15 11:15:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl b/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl
index 15d28f9..570a9be 100755
--- a/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: productwiki2rdf.xsl,v 1.1.4.8 2012/03/08 12:55:03 source Exp $
+ - $Id: productwiki2rdf.xsl,v 1.1.4.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl b/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl
index 4ee28ba..6b107f6 100644
--- a/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: programmableweb2rdf.xsl,v 1.1.4.6 2012/03/08 12:55:03 source Exp $
+ - $Id: programmableweb2rdf.xsl,v 1.1.4.5 2011/07/15 11:23:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl b/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl
index f595d6e..a3facad 100644
--- a/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: radiopop2rdf.xsl,v 1.1.2.7 2012/03/08 12:55:03 source Exp $
+ - $Id: radiopop2rdf.xsl,v 1.1.2.6 2011/07/15 11:23:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl b/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl
index a652e04..e390983 100644
--- a/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl
+++ b/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_wo_grddl.xsl,v 1.1.2.4 2012/03/08 12:55:03 source Exp $
+ - $Id: rdf_wo_grddl.xsl,v 1.1.2.3 2011/07/15 11:23:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl b/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl
index a9f685c..26c3207 100644
--- a/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl
+++ b/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdfa2rdfxml.xsl,v 1.1.2.6 2012/03/08 12:55:03 source Exp $
+ - $Id: rdfa2rdfxml.xsl,v 1.1.2.5 2011/07/15 11:23:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl b/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl
index 605e829..3f6ada8 100644
--- a/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: revyu2rdf.xsl,v 1.1.2.4 2012/03/08 12:55:03 source Exp $
+ - $Id: revyu2rdf.xsl,v 1.1.2.3 2011/07/15 11:23:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl b/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl
index 14a3000..cdc3154 100644
--- a/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rhapsody2rdf.xsl,v 1.1.2.7 2012/03/08 12:55:03 source Exp $
+ - $Id: rhapsody2rdf.xsl,v 1.1.2.6 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl b/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl
index ed2cd9e..3b391c2 100644
--- a/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rss2rdf.xsl,v 1.1.2.9 2012/03/08 12:55:03 source Exp $
+ - $Id: rss2rdf.xsl,v 1.1.2.8 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl b/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl
index ae480f4..a15c9cf 100644
--- a/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: seatgeek2rdf.xsl,v 1.1.4.3 2012/03/08 12:55:03 source Exp $
+ - $Id: seatgeek2rdf.xsl,v 1.1.4.2 2011/08/29 10:37:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl b/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl
index ea43c25..986a019 100644
--- a/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: seevl2rdf.xsl,v 1.1.4.5 2012/03/08 12:55:03 source Exp $
+ - $Id: seevl2rdf.xsl,v 1.1.4.4 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl b/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl
index efd2fc2..f84808a 100644
--- a/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sf2rdf.xsl,v 1.1.2.9 2012/03/08 12:55:03 source Exp $
+ - $Id: sf2rdf.xsl,v 1.1.2.8 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl b/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl
index 1ddcab3..4c24f2f 100644
--- a/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sg2rdf.xsl,v 1.1.2.5 2012/03/08 12:55:03 source Exp $
+ - $Id: sg2rdf.xsl,v 1.1.2.4 2011/07/15 11:23:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl
index 6d3cc75..80d0d95 100644
--- a/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: simplegeo2rdf.xsl,v 1.1.4.3 2012/03/08 12:55:03 source Exp $
+ - $Id: simplegeo2rdf.xsl,v 1.1.4.2 2011/08/09 10:58:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl b/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl
index 025a1cf..660bd4e 100644
--- a/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: slideshare2rdf.xsl,v 1.1.2.12 2012/03/08 12:55:03 source Exp $
+ - $Id: slideshare2rdf.xsl,v 1.1.2.10 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -196,10 +196,10 @@
</xsl:choose>
</bibo:content>
<dcterms:created rdf:datatype="&xsd;dateTime">
- <xsl:value-of select="vi:string2date(Created)" />
+ <xsl:value-of select="Created" />
</dcterms:created>
<dcterms:modified rdf:datatype="&xsd;dateTime">
- <xsl:value-of select="vi:string2date(Updated)" />
+ <xsl:value-of select="Updated" />
</dcterms:modified>
<bibo:pageStart>1</bibo:pageStart>
<bibo:pageEnd>
diff --git a/binsrc/rdf_mappers/xslt/main/slidesix2rdf.xsl b/binsrc/rdf_mappers/xslt/main/slidesix2rdf.xsl
index 49933f6..5d161fa 100644
--- a/binsrc/rdf_mappers/xslt/main/slidesix2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/slidesix2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: slidesix2rdf.xsl,v 1.1.2.7 2012/03/08 12:55:03 source Exp $
+ - $Id: slidesix2rdf.xsl,v 1.1.2.6 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl
index 0acc2db..afd7d9a 100644
--- a/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: slidy2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:03 source Exp $
+ - $Id: slidy2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl b/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl
deleted file mode 100644
index 3d3ba74..0000000
--- a/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: socialstatistics2rdf.xsl,v 1.1.2.2 2012/03/08 12:55:03 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
--->
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY owl "http://www.w3.org/2002/07/owl#">
-<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#">
-<!ENTITY sioc "http://rdfs.org/sioc/ns#">
-<!ENTITY sioct "http://rdfs.org/sioc/types#">
-<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-<!ENTITY opl "http://www.openlinksw.com/schema/attribution#">
-<!ENTITY rss "http://purl.org/rss/1.0/">
-<!ENTITY dc "http://purl.org/dc/elements/1.1/">
-<!ENTITY dcterms "http://purl.org/dc/terms/">
-<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY bibo "http://purl.org/ontology/bibo/">
-<!ENTITY m "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-<!ENTITY d "http://schemas.microsoft.com/ado/2007/08/dataservices">
-<!ENTITY oplgp "http://www.openlinksw.com/schemas/googleplus#">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:rdf="&rdf;"
- xmlns:rdfs="&rdfs;"
- xmlns:dc="&dc;"
- xmlns:dcterms="&dcterms;"
- xmlns:a="http://www.w3.org/2005/Atom"
- xmlns:cv="http://purl.org/captsolo/resume-rdf/0.2/cv#"
- xmlns:sioc="&sioc;"
- xmlns:bibo="&bibo;"
- xmlns:foaf="&foaf;"
- xmlns:g="http://base.google.com/ns/1.0"
- xmlns:gb="http://www.openlinksw.com/schemas/google-base#"
- xmlns:virtrdf="http://www.openlinksw.com/schemas/virtrdf#"
- xmlns:batch="http://schemas.google.com/gdata/batch"
- xmlns:vi="http://www.openlinksw.com/virtuoso/xslt/"
- xmlns:m="&m;"
- xmlns:opl="&opl;"
- xmlns:d="&d;"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
- xmlns:activity="http://activitystrea.ms/spec/1.0/"
- xmlns:buzz="http://schemas.google.com/buzz/2010"
- xmlns:crosspost="http://purl.org/syndication/cross-posting"
- xmlns:gd="http://schemas.google.com/g/2005"
- xmlns:georss="http://www.georss.org/georss"
- xmlns:media="http://search.yahoo.com/mrss/"
- xmlns:poco="http://portablecontacts.net/ns/1.0"
- xmlns:thr="http://purl.org/syndication/thread/1.0"
- xmlns:oplgp="&oplgp;"
- version="1.0">
-
- <xsl:output method="xml" encoding="utf-8" indent="yes"/>
-
- <xsl:param name="baseUri" />
-
- <xsl:variable name="resourceURL" select="vi:proxyIRI ($baseUri)"/>
- <xsl:variable name="docIRI" select="vi:docIRI($baseUri)"/>
- <xsl:variable name="docproxyIRI" select="vi:docproxyIRI($baseUri)"/>
-
- <xsl:template match="/results">
- <rdf:RDF>
- <rdf:Description rdf:about="{$docproxyIRI}">
- <rdf:type rdf:resource="&bibo;Document"/>
- <sioc:container_of rdf:resource="{$resourceURL}"/>
- <foaf:primaryTopic rdf:resource="{$resourceURL}"/>
- <dcterms:subject rdf:resource="{$resourceURL}"/>
- <dc:title>
- <xsl:value-of select="$baseUri"/>
- </dc:title>
- <owl:sameAs rdf:resource="{$docIRI}"/>
- </rdf:Description>
- <rdf:Description rdf:about="{$resourceURL}">
- <rdf:type rdf:resource="&foaf;Person"/>
- <rdfs:label>
- <xsl:value-of select="user/name"/>
- </rdfs:label>
- <foaf:name>
- <xsl:value-of select="user/name"/>
- </foaf:name>
- <!--foaf:depiction rdf:resource="{user/avatar}"/-->
- <dcterms:modified rdf:datatype="&xsd;dateTime">
- <xsl:value-of select="user/lastupdated"/>
- </dcterms:modified>
- <foaf:gender>
- <xsl:value-of select="user/gender"/>
- </foaf:gender>
- <xsl:for-each select="stats/date">
- <oplgp:circles_updated>
- <oplgp:circles_update>
- <opl:providedBy>
- <foaf:Organization rdf:about="http://socialstatistics.com#this">
- <foaf:name>Social Statistics</foaf:name>
- <foaf:homepage rdf:resource="http://socialstatistics.com"/>
- </foaf:Organization>
- </opl:providedBy>
- <xsl:attribute name="rdf:about">
- <xsl:value-of select="vi:proxyIRI($baseUri, '', concat('date_', when))" />
- </xsl:attribute>
- <oplgp:when>
- <xsl:value-of select="when" />
- </oplgp:when>
- <rdfs:label>
- <xsl:value-of select="concat('Circles on ', when)" />
- </rdfs:label>
- <oplgp:friends-circles>
- <xsl:value-of select="friends-circles"/>
- </oplgp:friends-circles>
- <oplgp:user-circles>
- <xsl:value-of select="user-circles"/>
- </oplgp:user-circles>
- </oplgp:circles_update>
- </oplgp:circles_updated>
- </xsl:for-each>
- </rdf:Description>
- </rdf:RDF>
- </xsl:template>
-
- <xsl:template match="text()" />
-</xsl:stylesheet>
diff --git a/binsrc/rdf_mappers/xslt/main/stackoverflow2rdf.xsl b/binsrc/rdf_mappers/xslt/main/stackoverflow2rdf.xsl
deleted file mode 100644
index 4054858..0000000
--- a/binsrc/rdf_mappers/xslt/main/stackoverflow2rdf.xsl
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: stackoverflow2rdf.xsl,v 1.1.2.2 2012/03/08 12:55:03 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
--->
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
-<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-<!ENTITY sioc "http://rdfs.org/sioc/ns#">
-<!ENTITY sioct "http://rdfs.org/sioc/types#">
-<!ENTITY scot "http://scot-project.org/scot/ns#">
-<!ENTITY oplso "http://www.openlinksw.com/schemas/stackoverflow#">
-<!ENTITY oplbase "http://www.openlinksw.com/schemas/oplbase#">
-<!ENTITY opl "http://www.openlinksw.com/schema/attribution#">
-<!ENTITY awol "http://bblfish.net/work/atom-owl/2006-06-06/#">
-]>
-
-<xsl:stylesheet
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:h="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:vi="http://www.openlinksw.com/virtuoso/xslt/"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:oplso="&oplso;"
- xmlns:opl="&opl;"
- xmlns:awol="&awol;"
- xmlns:oplbase="&oplbase;"
- xmlns:gn="http://www.geonames.org/ontology#"
- xmlns:foaf="&foaf;"
- xmlns:sioc="&sioc;"
- xmlns:sioct="&sioct;"
- xmlns:scot="&scot;"
- version="1.0">
-
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:param name="baseUri"/>
- <xsl:param name="kind"/>
- <xsl:variable name="resourceURL" select="vi:proxyIRI($baseUri)"/>
- <xsl:variable name="docIRI" select="vi:docIRI($baseUri)"/>
- <xsl:variable name="docproxyIRI" select="vi:docproxyIRI($baseUri)"/>
-
- <xsl:template match="/">
- <rdf:RDF>
- <rdf:Description rdf:about="{$resourceURL}">
- <opl:providedBy rdf:resource="http://www.stackoverflow.com/#this" />
- <xsl:choose>
- <xsl:when test="$kind='users'">
- <xsl:apply-templates select="/results" mode="users"/>
- </xsl:when>
- <xsl:when test="$kind='questions'">
- <xsl:apply-templates select="/results" mode="questions"/>
- </xsl:when>
- <xsl:when test="$kind='answers'">
- <xsl:apply-templates select="/results" mode="answers"/>
- </xsl:when>
- </xsl:choose>
- </rdf:Description>
- </rdf:RDF>
- </xsl:template>
-
- <!-- Cases where kind is a User -->
- <xsl:template match="results" mode="users">
- <xsl:apply-templates mode="users" />
- </xsl:template>
-
- <xsl:template match="items" mode="users">
- <rdf:type rdf:resource="&sioc;User" />
- <xsl:apply-templates mode="users" />
- </xsl:template>
-
- <xsl:template match="user_id" mode="users">
- <sioc:id rdf:datatype="&xsd;integer"><xsl:value-of select="." /></sioc:id>
- </xsl:template>
-
- <xsl:template match="user_type" mode="users">
- <oplso:User_type><xsl:value-of select="." /></oplso:User_type>
- </xsl:template>
-
- <xsl:template match="display_name" mode="users">
- <foaf:name><xsl:value-of select="." /></foaf:name>
- <rdfs:label><xsl:value-of select="." /></rdfs:label>
- </xsl:template>
-
- <xsl:template match="reputation" mode="users">
- <oplso:reputation rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:reputation>
- </xsl:template>
-
- <xsl:template match="reputation_change_day" mode="users">
- <oplso:reputation_change_day rdf:datatype="&xsd;float"><xsl:value-of select="." /></oplso:reputation_change_day>
- </xsl:template>
-
- <xsl:template match="reputation_change_week" mode="users">
- <oplso:reputation_change_week rdf:datatype="&xsd;float"><xsl:value-of select="." /></oplso:reputation_change_week>
- </xsl:template>
-
- <xsl:template match="reputation_change_month" mode="users">
- <oplso:reputation_change_month rdf:datatype="&xsd;float"><xsl:value-of select="." /></oplso:reputation_change_month>
- </xsl:template>
-
- <xsl:template match="reputation_change_year" mode="users">
- <oplso:reputation_change_year rdf:datatype="&xsd;float"><xsl:value-of select="." /></oplso:reputation_change_year>
- </xsl:template>
-
- <xsl:template match="last_access_date" mode="users">
- <sioc:last_activity_date rdf:datatype="&xsd;dateTime"><xsl:value-of select="vi:unix2iso-date(number(.))" /></sioc:last_activity_date>
- </xsl:template>
-
- <xsl:template match="last_modified_date" mode="users">
- <sioc:last_item_date rdf:datatype="&xsd;dateTime"><xsl:value-of select="vi:unix2iso-date(number(.))" /></sioc:last_item_date>
- </xsl:template>
-
- <xsl:template match="is_employee" mode="users">
- <oplso:employee rdf:datatype="&xsd;boolean">
- <xsl:choose>
- <xsl:when test="./text()='0'">false</xsl:when>
- <xsl:otherwise>true</xsl:otherwise>
- </xsl:choose>
- </oplso:employee>
- </xsl:template>
-
- <xsl:template match="link" mode="users">
- <foaf:homepage rdf:resource="{.}" />
- </xsl:template>
-
- <xsl:template match="website_url" mode="users">
- <rdfs:seeAlso rdf:resource="{.}" />
- </xsl:template>
-
- <xsl:template match="location" mode="users">
- <oplso:location><xsl:value-of select="." /></oplso:location>
- </xsl:template>
-
- <xsl:template match="account_id" mode="users">
- <sioc:id rdf:datatype="&xsd;integer"><xsl:value-of select="." /></sioc:id>
- </xsl:template>
-
- <xsl:template match="quota_remaining" mode="users">
- <oplso:quota_remaining rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:quota_remaining>
- </xsl:template>
-
- <xsl:template match="quota_max" mode="users">
- <oplso:quota_max rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:quota_max>
- </xsl:template>
-
- <!-- Cases where kind is a Question -->
- <xsl:template match="results" mode="questions">
- <xsl:apply-templates mode="questions" />
- </xsl:template>
-
- <xsl:template match="items" mode="questions">
- <rdf:type rdf:resource="&sioct;Question" />
- <xsl:apply-templates mode="questions" />
- </xsl:template>
-
- <xsl:template match="question_id" mode="questions">
- <sioc:id rdf:datatype="&xsd;integer"><xsl:value-of select="." /></sioc:id>
- </xsl:template>
-
- <xsl:template match="creation_date" mode="questions">
- <dcterms:created rdf:datatype="&xsd;dateTime"><xsl:value-of select="vi:unix2iso-date(number(.))" /></dcterms:created>
- </xsl:template>
-
- <xsl:template match="last_activity_date" mode="questions">
- <sioc:last_item_date rdf:datatype="&xsd;dateTime"><xsl:value-of select="vi:unix2iso-date(number(.))" /></sioc:last_item_date>
- </xsl:template>
-
- <xsl:template match="score" mode="questions">
- <oplso:score rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:score>
- </xsl:template>
-
- <xsl:template match="answer_count" mode="questions">
- <oplso:answer_count rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:answer_count>
- </xsl:template>
-
- <xsl:template match="accepted_answer_id" mode="questions">
- <oplso:accepted_answer_id rdf:resource="{vi:proxyIRI($baseUri, '', concat('Answer_', .))}" />
- </xsl:template>
-
- <xsl:template match="title" mode="questions">
- <dc:title><xsl:value-of select="." /></dc:title>
- </xsl:template>
-
- <xsl:template match="tags" mode="questions">
- <scot:hasTag>
- <scot:Tag rdf:about="{vi:proxyIRI($baseUri, '', concat('Tag', position(.)))}">
- <rdf:type rdf:resource="&scot;Tag" />
- <rdfs:label><xsl:value-of select="." /></rdfs:label>
- <scot:spellingVariant><xsl:value-of select="." /></scot:spellingVariant>
- </scot:Tag>
- </scot:hasTag>
- </xsl:template>
-
- <xsl:template match="body" mode="questions">
- <awol:content><xsl:value-of select="." /></awol:content>
- </xsl:template>
-
- <xsl:template match="view_count" mode="questions">
- <oplso:view_count rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:view_count>
- </xsl:template>
-
- <xsl:template match="owner" mode="questions">
- <sioc:has_creator>
- <sioc:User rdf:about="{./link}">
- <foaf:name><xsl:value-of select="name" /></foaf:name>
- <rdfs:label><xsl:value-of select="name" /></rdfs:label>
- <dc:title><xsl:value-of select="name" /></dc:title>
- <oplso:reputation rdf:datatype="&xsd;integer"><xsl:value-of select="reputation" /></oplso:reputation>
- <sioc:link rdf:datatype="&xsd;anyURI"><xsl:value-of select="link" /></sioc:link>
- </sioc:User>
- </sioc:has_creator>
- </xsl:template>
-
- <xsl:template match="link" mode="questions">
- <sioc:link rdf:datatype="&xsd;anyURI"><xsl:value-of select="." /></sioc:link>
- </xsl:template>
-
- <xsl:template match="quota_remaining" mode="questions">
- <oplso:quota_remaining rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:quota_remaining>
- </xsl:template>
-
- <xsl:template match="quota_max" mode="questions">
- <oplso:quota_max rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:quota_max>
- </xsl:template>
-
- <!-- Cases where the kind is an answer -->
-
- <xsl:template match="results" mode="answers">
- <xsl:apply-templates mode="answers" />
- </xsl:template>
-
- <xsl:template match="items" mode="answers">
- <sioc:has_reply>
- <sioct:Answer rdf:about="{vi:proxyIRI($baseUri, '', concat('Answer_', ./answer_id))}">
- <rdf:type rdf:resource="&sioct;Answer" />
- <xsl:apply-templates mode="answers" />
- </sioct:Answer>
- </sioc:has_reply>
- </xsl:template>
-
- <xsl:template match="score" mode="answers">
- <oplso:score rdf:datatype="&xsd;integer"><xsl:value-of select="." /></oplso:score>
- </xsl:template>
-
- <xsl:template match="is_accepted" mode="answers">
- <oplso:is_accepted rdf:datatype="&xsd;boolean"><xsl:value-of select="." /></oplso:is_accepted>
- <xsl:if test="number(.)='1'"><rdf:type rdf:resource="&sioct;BestAnswer" /></xsl:if>
- </xsl:template>
-
- <xsl:template match="answer_id" mode="answers">
- <sioc:id rdf:datatype="&xsd;integer"><xsl:value-of select="." /></sioc:id>
- </xsl:template>
-
- <xsl:template match="creation_date" mode="answers">
- <dcterms:created rdf:datatype="&xsd;dateTime"><xsl:value-of select="vi:unix2iso-date(number(.))" /></dcterms:created>
- </xsl:template>
-
- <xsl:template match="last_activity_date" mode="answers">
- <sioc:last_item_date rdf:datatype="&xsd;dateTime"><xsl:value-of select="vi:unix2iso-date(number(.))" /></sioc:last_item_date>
- </xsl:template>
-
- <xsl:template match="body" mode="answers">
- <awol:content><xsl:value-of select="." /></awol:content>
- </xsl:template>
-
- <xsl:template match="owner" mode="answers">
- <sioc:has_creator>
- <sioc:User rdf:about="{./link}">
- <foaf:name><xsl:value-of select="name" /></foaf:name>
- <rdfs:label><xsl:value-of select="name" /></rdfs:label>
- <dc:title><xsl:value-of select="name" /></dc:title>
- <oplso:reputation rdf:datatype="&xsd;integer"><xsl:value-of select="reputation" /></oplso:reputation>
- <sioc:link rdf:datatype="&xsd;anyURI"><xsl:value-of select="link" /></sioc:link>
- </sioc:User>
- </sioc:has_creator>
- </xsl:template>
-
- <xsl:template match="text()|@*"/>
- <xsl:template match="text()|@*" mode="users" />
- <xsl:template match="text()|@*" mode="questions" />
- <xsl:template match="text()|@*" mode="answers" />
-
-</xsl:stylesheet>
-
diff --git a/binsrc/rdf_mappers/xslt/main/svg2rdf.xsl b/binsrc/rdf_mappers/xslt/main/svg2rdf.xsl
index 04ec837..f7bffbf 100644
--- a/binsrc/rdf_mappers/xslt/main/svg2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/svg2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: svg2rdf.xsl,v 1.1.2.5 2012/03/08 12:55:03 source Exp $
+ - $Id: svg2rdf.xsl,v 1.1.2.4 2011/07/15 11:23:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2008 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
diff --git a/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl b/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl
index 6c90509..53d11c2 100644
--- a/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tesco2rdf.xsl,v 1.1.2.16 2012/03/08 12:55:03 source Exp $
+ - $Id: tesco2rdf.xsl,v 1.1.2.15 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl b/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl
index f557d84..6af7306 100644
--- a/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: tumblr2rdf.xsl,v 1.1.4.6 2012/03/08 12:55:03 source Exp $
+ - $Id: tumblr2rdf.xsl,v 1.1.4.5 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl
index 2001e4c..eca7166 100644
--- a/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: twfy2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:03 source Exp $
+ - $Id: twfy2rdf.xsl,v 1.1.2.7 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl
index 5d6548d..90f4fde 100644
--- a/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: twitter2rdf.xsl,v 1.1.2.10 2012/03/08 12:55:03 source Exp $
+ - $Id: twitter2rdf.xsl,v 1.1.2.9 2011/07/15 11:23:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl
index 5137806..91dc08d 100644
--- a/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: twitter_fp2rdf.xsl,v 1.1.4.4 2012/03/08 12:55:03 source Exp $
+ - $Id: twitter_fp2rdf.xsl,v 1.1.4.2 2011/10/25 23:36:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -26,16 +26,29 @@
<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<!ENTITY xml 'http://www.w3.org/XML/1998/namespace#'>
<!ENTITY foaf "http://xmlns.com/foaf/0.1/">
+<!ENTITY sioc "http://rdfs.org/sioc/ns#">
+<!ENTITY bibo "http://purl.org/ontology/bibo/">
+<!ENTITY sioct "http://rdfs.org/sioc/types#">
<!ENTITY owl "http://www.w3.org/2002/07/owl#">
-<!ENTITY opl "http://www.openlinksw.com/schema/cert#">
-<!ENTITY cert "http://www.w3.org/ns/auth/cert#">
+<!ENTITY opl "http://www.openlinksw.com/schema/attribution#">
]>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:dcterms="http://purl.org/dc/terms/"
xmlns:foaf="&foaf;"
+ xmlns:virtrdf="http://www.openlinksw.com/schemas/XHTML#"
xmlns:vi="http://www.openlinksw.com/virtuoso/xslt/"
+ xmlns:v="http://www.w3.org/2006/vcard/ns#"
+ xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
+ xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#"
+ xmlns:twitter="http://www.openlinksw.com/schemas/twitter/"
+ xmlns:sioc="&sioc;"
+ xmlns:bibo="&bibo;"
xmlns:owl="&owl;"
+ xmlns:a="http://www.w3.org/2005/Atom"
+ xmlns:sioct="&sioct;"
xmlns:opl="&opl;"
version="1.0">
<xsl:output method="xml" indent="yes" omit-xml-declaration="yes" />
@@ -45,24 +58,16 @@
<xsl:variable name="resourceURL" select="vi:proxyIRI ($baseUri)"/>
<xsl:template match="/">
<rdf:RDF>
- <xsl:for-each select="//results[starts-with (string (text), '#X509Cert Fingerprint:')]">
- <xsl:variable name="fp"><xsl:value-of select="substring-before (substring-after (text, '#X509Cert Fingerprint:'), ' ')"/></xsl:variable>
- <xsl:variable name="dgst">
- <xsl:choose>
- <xsl:when test="contains (text, '#SHA1')">sha1</xsl:when>
- <xsl:otherwise>md5</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+ <xsl:for-each select="//results[starts-with (string (text), '#Self #WebID #Fingerprint:')]">
<rdf:Description rdf:about="{$docproxyIRI}">
+ <rdf:type rdf:resource="&bibo;Document"/>
<foaf:topic rdf:resource="{vi:proxyIRI(concat('http://twitter.com/', from_user))}"/>
</rdf:Description>
<foaf:Person rdf:about="{vi:proxyIRI(concat('http://twitter.com/', from_user))}">
- <opl:hasCertificate rdf:resource="{vi:proxyIRI ($baseUri, '', $fp)}"/>
+ <opl:hasFingerprint>
+ <xsl:value-of select="substring-after (text, '#Self #WebID #Fingerprint:')"/>
+ </opl:hasFingerprint>
</foaf:Person>
- <opl:Certificate rdf:about="{vi:proxyIRI ($baseUri, '', $fp)}">
- <opl:fingerprint><xsl:value-of select="$fp"/></opl:fingerprint>
- <opl:fingerprint-digest><xsl:value-of select="$dgst"/></opl:fingerprint-digest>
- </opl:Certificate>
</xsl:for-each>
</rdf:RDF>
</xsl:template>
diff --git a/binsrc/rdf_mappers/xslt/main/twitter_rest_api2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twitter_rest_api2rdf.xsl
index 605ded5..3eda82b 100644
--- a/binsrc/rdf_mappers/xslt/main/twitter_rest_api2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/twitter_rest_api2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: twitter_rest_api2rdf.xsl,v 1.1.4.11 2012/03/08 12:55:03 source Exp $
+ - $Id: twitter_rest_api2rdf.xsl,v 1.1.4.3 2011/10/25 23:36:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -39,8 +39,6 @@
<!ENTITY vi "http://www.openlinksw.com/virtuoso/xslt/">
<!ENTITY xml 'http://www.w3.org/XML/1998/namespace#'>
<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-<!ENTITY oplcert "http://www.openlinksw.com/schemas/cert#">
-<!ENTITY cert "http://www.w3.org/ns/auth/cert#">
]>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:a="&a;"
@@ -49,7 +47,6 @@
xmlns:dcterms="&dcterms;"
xmlns:foaf="&foaf;"
xmlns:opl="&opl;"
- xmlns:oplcert="&oplcert;"
xmlns:owl="&owl;"
xmlns:rdf="&rdf;"
xmlns:rdfs= "&rdfs;"
@@ -144,7 +141,6 @@
<twitter:id>
<xsl:value-of select="id" />
</twitter:id>
- <twitter:screen_name><xsl:value-of select="screen_name" /></twitter:screen_name>
<xsl:if test="followers_count != ''">
<twitter:followers_count rdf:datatype="&xsd;integer">
<xsl:value-of select="followers_count" />
@@ -176,8 +172,7 @@
<foaf:title>
<xsl:value-of select="description" />
</foaf:title>
- <twitter:public_profile_url rdf:resource="{concat('http://twitter.com/', screen_name)}"/>
- <owl:sameAs rdf:resource="{concat('http://twitter.com/#!/', screen_name)}"/>
+ <owl:sameAs rdf:resource="{concat('http://twitter.com/!#/', screen_name)}"/>
</foaf:Person>
</xsl:template>
@@ -188,47 +183,14 @@
<xsl:template name="status">
<rdf:Description rdf:about="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name, '/status/', id))}">
<xsl:call-template name="status_int"/>
- </rdf:Description>
-
- <xsl:if test="starts-with (text, '#X509Cert Fingerprint:')">
- <xsl:variable name="fp"><xsl:value-of select="substring-before (substring-after (text, '#X509Cert Fingerprint:'), ' ')"/></xsl:variable>
- <xsl:variable name="fpn"><xsl:value-of select="translate ($fp, ':', '')"/></xsl:variable>
- <xsl:variable name="dgst">
- <xsl:choose>
- <xsl:when test="contains (text, '#SHA1')">sha1</xsl:when>
- <xsl:otherwise>md5</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <foaf:Person rdf:about="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name))}">
- <oplcert:hasCertificate rdf:resource="{vi:proxyIRI (concat('http://twitter.com/', user/screen_name), '', $fpn)}"/>
- </foaf:Person>
- <oplcert:Certificate rdf:about="{vi:proxyIRI (concat('http://twitter.com/', user/screen_name), '', $fpn)}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </xsl:if>
- <!-- x509 certificate -->
- <xsl:if test="text like '%di:%?hashtag=webid%'">
- <xsl:variable name="di"><xsl:copy-of select="vi:di-split (text)"/></xsl:variable>
- <xsl:variable name="au"><xsl:value-of select="vi:proxyIRI(concat('http://twitter.com/', user/screen_name))"/></xsl:variable>
- <xsl:for-each select="$di/result/di">
- <xsl:variable name="fp"><xsl:value-of select="hash"/></xsl:variable>
- <xsl:variable name="dgst"><xsl:value-of select="dgst"/></xsl:variable>
- <xsl:variable name="ct"><xsl:value-of select="vi:proxyIRI ($baseUri,'',$fp)"/></xsl:variable>
- <foaf:Person rdf:about="{$au}">
- <oplcert:hasCertificate rdf:resource="{vi:proxyIRI ($au, '', $fp)}"/>
- </foaf:Person>
- <oplcert:Certificate rdf:about="{vi:proxyIRI ($au, '', $fp)}">
- <rdfs:label><xsl:value-of select="$fp"/></rdfs:label>
- <oplcert:fingerprint><xsl:value-of select="$fp"/></oplcert:fingerprint>
- <oplcert:fingerprint-digest><xsl:value-of select="$dgst"/></oplcert:fingerprint-digest>
- </oplcert:Certificate>
- </xsl:for-each>
- </xsl:if>
- <!-- end certificate -->
+ </rdf:Description>
<foaf:Person rdf:about="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name))}">
+ <xsl:if test="starts-with (text, '#Self #WebID #Fingerprint:')">
+ <opl:hasFingerprint>
+ <xsl:value-of select="substring-after (text, '#Self #WebID #Fingerprint:')"/>
+ </opl:hasFingerprint>
+ </xsl:if>
<xsl:choose>
<xsl:when test="$what = 'favorites'">
<twitter:has_favorite rdf:resource="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name, '/status/', id))}"/>
@@ -239,24 +201,6 @@
</xsl:choose>
</foaf:Person>
- <xsl:if test="source">
- <rdf:Description rdf:about="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name, '/status/', id, '#via'))}">
- <rdf:type rdf:resource="&twitter;Application" />
-
- <xsl:choose>
- <xsl:when test="contains(source, 'href=')">
- <xsl:variable name="sourceXML" select="vi:decodeXML(source)" />
- <rdfs:label><xsl:value-of select="$sourceXML/a" /></rdfs:label>
- <foaf:homepage rdf:resource="{$sourceXML/a/@href}" />
- <twitter:appLink><xsl:value-of select="concat($sourceXML/a/@href,'#this')" /></twitter:appLink>
- </xsl:when>
- <xsl:otherwise>
- <rdfs:label><xsl:value-of select="normalize-space(source/text())" /></rdfs:label>
- </xsl:otherwise>
- </xsl:choose>
- </rdf:Description>
- </xsl:if>
-
<xsl:if test="in_reply_to_status_id != ''">
<rdf:Description rdf:about="{vi:proxyIRI(concat('http://twitter.com/', in_reply_to_screen_name, '/status/', in_reply_to_status_id))}">
<sioc:has_reply rdf:resource="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name, '/status/', id))}"/>
@@ -271,8 +215,6 @@
<dcterms:created rdf:datatype="&xsd;dateTime">
<xsl:value-of select="vi:string2date(created_at)"/>
</dcterms:created>
-
- <twitter:via rdf:resource="{vi:proxyIRI(concat('http://twitter.com/', user/screen_name, '/status/', id, '#via'))}"/>
<dc:title>
<xsl:call-template name="add-href">
<xsl:with-param name="string" select="text"/>
diff --git a/binsrc/rdf_mappers/xslt/main/upcoming2rdf.xsl b/binsrc/rdf_mappers/xslt/main/upcoming2rdf.xsl
index c0b4254..01026eb 100755
--- a/binsrc/rdf_mappers/xslt/main/upcoming2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/upcoming2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: upcoming2rdf.xsl,v 1.1.4.4 2012/03/08 12:55:03 source Exp $
+ - $Id: upcoming2rdf.xsl,v 1.1.4.3 2011/07/15 11:23:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl
index 2cf9831..5b3b118 100644
--- a/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ustream2rdf.xsl,v 1.1.2.6 2012/03/08 12:55:03 source Exp $
+ - $Id: ustream2rdf.xsl,v 1.1.2.5 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl
index f047cfd..f7150e3 100644
--- a/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vimeo2rdf.xsl,v 1.1.4.6 2012/03/08 12:55:03 source Exp $
+ - $Id: vimeo2rdf.xsl,v 1.1.4.5 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl b/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl
index 22aec77..ecfb176 100644
--- a/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: wine2rdf.xsl,v 1.1.4.12 2012/03/08 12:55:03 source Exp $
+ - $Id: wine2rdf.xsl,v 1.1.4.11 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl
index aa0bcbf..7236345 100644
--- a/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xbrl2rdf.xsl,v 1.1.2.14 2012/03/15 16:41:29 source Exp $
+ - $Id: xbrl2rdf.xsl,v 1.1.2.12 2011/10/13 18:36:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -190,14 +190,7 @@
</xsl:if>
<sioc:has_container rdf:resource="{$contextRef}" />
<rdfs:label>
- <xsl:choose>
- <xsl:when test="string-length(normalize-space(.)) > 0">
- <xsl:value-of select="concat($canonical_label_name, ': ', normalize-space(.))"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$canonical_label_name"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of select="$canonical_name"/>
</rdfs:label>
</rdf:Description>
diff --git a/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl
index 0ccf2e0..742b010 100644
--- a/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xfn2rdf.xsl,v 1.1.2.6 2012/03/08 12:55:03 source Exp $
+ - $Id: xfn2rdf.xsl,v 1.1.2.5 2011/07/15 11:23:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl
index 71bfeb2..6585538 100644
--- a/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xfolk2rdf.xsl,v 1.1.2.6 2012/03/08 12:55:03 source Exp $
+ - $Id: xfolk2rdf.xsl,v 1.1.2.5 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl b/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl
index 7eec2d7..c0bbca0 100644
--- a/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl
+++ b/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xrd-generic.xsl,v 1.1.4.3 2012/03/08 12:55:03 source Exp $
+ - $Id: xrd-generic.xsl,v 1.1.4.2 2011/08/01 14:19:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl
index aefbd4d..19648a2 100644
--- a/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: yahoo_stock2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:03 source Exp $
+ - $Id: yahoo_stock2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl
index f1bf91c..0e8f05f 100644
--- a/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: yahoo_trf2rdf.xsl,v 1.1.2.8 2012/03/08 12:55:03 source Exp $
+ - $Id: yahoo_trf2rdf.xsl,v 1.1.2.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl
index adc13af..f93b9e0 100644
--- a/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: yelp2rdf.xsl,v 1.1.2.16 2012/03/08 12:55:03 source Exp $
+ - $Id: yelp2rdf.xsl,v 1.1.2.14 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -79,7 +79,7 @@
</foaf:Organization>
</opl:providedBy>
- <rdf:type rdf:resource="&gr;Location"/>
+ <rdf:type rdf:resource="&gr;LocationOfSalesOrServiceProvisioning"/>
<dc:title>
<xsl:value-of select="name" />
</dc:title>
diff --git a/binsrc/rdf_mappers/xslt/main/youtube2rdf.xsl b/binsrc/rdf_mappers/xslt/main/youtube2rdf.xsl
index fc8aa67..052fab0 100644
--- a/binsrc/rdf_mappers/xslt/main/youtube2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/youtube2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: youtube2rdf.xsl,v 1.1.4.4 2012/03/08 12:55:03 source Exp $
+ - $Id: youtube2rdf.xsl,v 1.1.4.3 2011/07/15 11:23:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl
index 1a46f49..015256b 100644
--- a/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: zappos2rdf.xsl,v 1.1.4.8 2012/03/08 12:55:03 source Exp $
+ - $Id: zappos2rdf.xsl,v 1.1.4.7 2011/08/09 11:17:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl
index c5eea22..c933f31 100644
--- a/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: zillow2rdf.xsl,v 1.1.2.21 2012/03/08 12:55:03 source Exp $
+ - $Id: zillow2rdf.xsl,v 1.1.2.20 2011/08/09 10:58:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl
index 7abfcca..a5ff215 100644
--- a/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl
+++ b/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: zoopla2rdf.xsl,v 1.1.4.6 2012/03/08 12:55:03 source Exp $
+ - $Id: zoopla2rdf.xsl,v 1.1.4.5 2011/08/09 10:58:33 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/redland/Makefile.am b/binsrc/redland/Makefile.am
index d8554e4..e0ec170 100644
--- a/binsrc/redland/Makefile.am
+++ b/binsrc/redland/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
diff --git a/binsrc/redland/Makefile.in b/binsrc/redland/Makefile.in
index b52e13c..ace86b5 100644
--- a/binsrc/redland/Makefile.in
+++ b/binsrc/redland/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/JDBC/BrowserCheck.java b/binsrc/samples/JDBC/BrowserCheck.java
index 27f0388..cea2cf6 100644
--- a/binsrc/samples/JDBC/BrowserCheck.java
+++ b/binsrc/samples/JDBC/BrowserCheck.java
@@ -1,14 +1,14 @@
/*
* BrowserCheck.java
*
- * $Id: BrowserCheck.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: BrowserCheck.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Check the version of JVM in the browser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/Makefile.am b/binsrc/samples/JDBC/Makefile.am
index a1d0d96..76334f4 100644
--- a/binsrc/samples/JDBC/Makefile.am
+++ b/binsrc/samples/JDBC/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/Makefile.in b/binsrc/samples/JDBC/Makefile.in
index d14ec98..8cecb83 100644
--- a/binsrc/samples/JDBC/Makefile.in
+++ b/binsrc/samples/JDBC/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/JDBC/index.htm b/binsrc/samples/JDBC/index.htm
index b28420a..839dee3 100644
--- a/binsrc/samples/JDBC/index.htm
+++ b/binsrc/samples/JDBC/index.htm
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat
index 7c879a8..f09ad5e 100644
--- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat
+++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat
@@ -2,14 +2,14 @@
REM
REM JDBCDemo.bat
REM
-REM $Id: JDBCDemo.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: JDBCDemo.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.java
index c6c9b3b..bf19b5d 100644
--- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.java
@@ -1,14 +1,14 @@
/*
* JDBCDemo.java
*
- * $Id: JDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: JDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh
index 0a77e56..2fe5c15 100755
--- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh
+++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh
@@ -2,14 +2,14 @@
#
# JDBCDemo.sh
#
-# $Id: JDBCDemo.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: JDBCDemo.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html
index c10bb54..302d268 100644
--- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html
+++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java
index ae14955..87daf8e 100644
--- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java
@@ -1,14 +1,14 @@
/*
* WebJDBCDemo.java
*
- * $Id: WebJDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebJDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.1/index.htm b/binsrc/samples/JDBC/jdk1.1/index.htm
index 84ba7fc..c233df0 100644
--- a/binsrc/samples/JDBC/jdk1.1/index.htm
+++ b/binsrc/samples/JDBC/jdk1.1/index.htm
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat
index 7c879a8..f09ad5e 100644
--- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat
+++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat
@@ -2,14 +2,14 @@
REM
REM JDBCDemo.bat
REM
-REM $Id: JDBCDemo.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: JDBCDemo.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.java
index ca8003e..baeaaa4 100644
--- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.java
@@ -1,14 +1,14 @@
/*
* JDBCDemo.java
*
- * $Id: JDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: JDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh
index 0a77e56..2fe5c15 100755
--- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh
+++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh
@@ -2,14 +2,14 @@
#
# JDBCDemo.sh
#
-# $Id: JDBCDemo.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: JDBCDemo.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html
index 638e86a..9ec1e8e 100644
--- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html
+++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java
index f606414..1586727 100644
--- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java
@@ -1,14 +1,14 @@
/*
* WebJDBCDemo.java
*
- * $Id: WebJDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebJDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat
index b8203cd..e54f9f6 100644
--- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat
+++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat
@@ -2,14 +2,14 @@
REM
REM ScrollDemo2.bat
REM
-REM $Id: ScrollDemo2.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: ScrollDemo2.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.java
index 0e49f51..3ea00b5 100644
--- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.java
+++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.java
@@ -1,14 +1,14 @@
/*
* ScrollDemo2.java
*
- * $Id: ScrollDemo2.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: ScrollDemo2.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh
index 6669491..16413cb 100755
--- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh
+++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: ScrollDemo2.sh,v 1.2.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: ScrollDemo2.sh,v 1.2 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html
index 8674f6f..1a3e3f5 100644
--- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html
+++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java
index 1d4b277..79e4291 100644
--- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java
+++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java
@@ -1,14 +1,14 @@
/*
* WebScrollDemo2.java
*
- * $Id: WebScrollDemo2.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebScrollDemo2.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm
index b49e95b..eb3ddd2 100644
--- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm
+++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.2/index.htm b/binsrc/samples/JDBC/jdk1.2/index.htm
index 50d9622..78fd061 100644
--- a/binsrc/samples/JDBC/jdk1.2/index.htm
+++ b/binsrc/samples/JDBC/jdk1.2/index.htm
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat
index 7c879a8..f09ad5e 100644
--- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat
+++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat
@@ -2,14 +2,14 @@
REM
REM JDBCDemo.bat
REM
-REM $Id: JDBCDemo.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: JDBCDemo.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.java
index 2cd27c4..6bab0e0 100644
--- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.java
@@ -1,14 +1,14 @@
/*
* JDBCDemo.java
*
- * $Id: JDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: JDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh
index 0a77e56..2fe5c15 100755
--- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh
+++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh
@@ -2,14 +2,14 @@
#
# JDBCDemo.sh
#
-# $Id: JDBCDemo.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: JDBCDemo.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html
index e0e318d..e2f2b7e 100644
--- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html
+++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java
index f606414..1586727 100644
--- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java
@@ -1,14 +1,14 @@
/*
* WebJDBCDemo.java
*
- * $Id: WebJDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebJDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat
index a40389d..367849f 100644
--- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat
+++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat
@@ -2,14 +2,14 @@
REM
REM ScrollDemo2.bat
REM
-REM $Id: ScrollDemo2.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: ScrollDemo2.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.java
index 20b6ae6..61053b1 100644
--- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.java
+++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.java
@@ -1,14 +1,14 @@
/*
* ScrollDemo2.java
*
- * $Id: ScrollDemo2.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: ScrollDemo2.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh
index 4b7f471..71e22f9 100755
--- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh
+++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh
@@ -2,14 +2,14 @@
#
# ScrollDemo2.sh
#
-# $Id: ScrollDemo2.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: ScrollDemo2.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html
index ebaa184..c33dcbe 100644
--- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html
+++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java
index ae70184..3acb998 100644
--- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java
+++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java
@@ -1,14 +1,14 @@
/*
* WebScrollDemo2.java
*
- * $Id: WebScrollDemo2.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebScrollDemo2.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.3/index.htm b/binsrc/samples/JDBC/jdk1.3/index.htm
index 5c62cca..a38d5b8 100644
--- a/binsrc/samples/JDBC/jdk1.3/index.htm
+++ b/binsrc/samples/JDBC/jdk1.3/index.htm
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat
index ca0e350..711ad19 100644
--- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat
+++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat
@@ -2,14 +2,14 @@
REM
REM CachedRowSet.bat
REM
-REM $Id: CachedRowSet.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: CachedRowSet.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.java
index 61bdf26..afc5f13 100644
--- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.java
+++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.java
@@ -1,14 +1,14 @@
/*
* CachedRowSet.java
*
- * $Id: CachedRowSet.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: CachedRowSet.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh
index 452a10c..6fd09b0 100755
--- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh
+++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh
@@ -2,14 +2,14 @@
#
# CachedRowSet.sh
#
-# $Id: CachedRowSet.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: CachedRowSet.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java
index 2aec121..ad58cb7 100644
--- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java
+++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java
@@ -1,14 +1,14 @@
/*
* DialogConnection1.java
*
- * $Id: DialogConnection1.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection1.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java
index 09460a9..f63b914 100644
--- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java
+++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList1.java
*
- * $Id: DialogConnectionList1.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList1.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html
index b88ee3f..272e6c2 100644
--- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html
+++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java
index 76cf0b9..9b75459 100644
--- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java
+++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java
@@ -1,14 +1,14 @@
/*
* WebCachedRowSet.java
*
- * $Id: WebCachedRowSet.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebCachedRowSet.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat
index 7c879a8..f09ad5e 100644
--- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat
+++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat
@@ -2,14 +2,14 @@
REM
REM JDBCDemo.bat
REM
-REM $Id: JDBCDemo.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: JDBCDemo.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.java
index c84f56f..c181736 100644
--- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.java
@@ -1,14 +1,14 @@
/*
* JDBCDemo.java
*
- * $Id: JDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: JDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh
index 0a77e56..2fe5c15 100755
--- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh
+++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh
@@ -2,14 +2,14 @@
#
# JDBCDemo.sh
#
-# $Id: JDBCDemo.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: JDBCDemo.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html
index da285d6..0569058 100644
--- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html
+++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java
index ae14955..87daf8e 100644
--- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java
@@ -1,14 +1,14 @@
/*
* WebJDBCDemo.java
*
- * $Id: WebJDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebJDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat
index a40389d..367849f 100644
--- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat
+++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat
@@ -2,14 +2,14 @@
REM
REM ScrollDemo2.bat
REM
-REM $Id: ScrollDemo2.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: ScrollDemo2.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.java
index 2a3eae7..dfd74d0 100644
--- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.java
+++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.java
@@ -1,14 +1,14 @@
/*
* ScrollDemo2.java
*
- * $Id: ScrollDemo2.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: ScrollDemo2.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh
index 4b7f471..71e22f9 100755
--- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh
+++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh
@@ -2,14 +2,14 @@
#
# ScrollDemo2.sh
#
-# $Id: ScrollDemo2.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: ScrollDemo2.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html
index ae17514..0f79303 100644
--- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html
+++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java
index ae70184..3acb998 100644
--- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java
+++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java
@@ -1,14 +1,14 @@
/*
* WebScrollDemo2.java
*
- * $Id: WebScrollDemo2.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebScrollDemo2.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.4/index.htm b/binsrc/samples/JDBC/jdk1.4/index.htm
index 0fb24b0..9cb148a 100644
--- a/binsrc/samples/JDBC/jdk1.4/index.htm
+++ b/binsrc/samples/JDBC/jdk1.4/index.htm
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat
index ca0e350..711ad19 100644
--- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat
+++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat
@@ -2,14 +2,14 @@
REM
REM CachedRowSet.bat
REM
-REM $Id: CachedRowSet.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: CachedRowSet.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.java
index 61bdf26..afc5f13 100644
--- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.java
+++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.java
@@ -1,14 +1,14 @@
/*
* CachedRowSet.java
*
- * $Id: CachedRowSet.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: CachedRowSet.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh
index 452a10c..6fd09b0 100755
--- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh
+++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh
@@ -2,14 +2,14 @@
#
# CachedRowSet.sh
#
-# $Id: CachedRowSet.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: CachedRowSet.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java
index 2aec121..ad58cb7 100644
--- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java
+++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java
@@ -1,14 +1,14 @@
/*
* DialogConnection1.java
*
- * $Id: DialogConnection1.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection1.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java
index 09460a9..f63b914 100644
--- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java
+++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList1.java
*
- * $Id: DialogConnectionList1.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList1.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html
index b88ee3f..272e6c2 100644
--- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html
+++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java
index 76cf0b9..9b75459 100644
--- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java
+++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java
@@ -1,14 +1,14 @@
/*
* WebCachedRowSet.java
*
- * $Id: WebCachedRowSet.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebCachedRowSet.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat
index 7c879a8..f09ad5e 100644
--- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat
+++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat
@@ -2,14 +2,14 @@
REM
REM JDBCDemo.bat
REM
-REM $Id: JDBCDemo.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: JDBCDemo.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.java
index c84f56f..c181736 100644
--- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.java
@@ -1,14 +1,14 @@
/*
* JDBCDemo.java
*
- * $Id: JDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: JDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh
index 0a77e56..2fe5c15 100755
--- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh
+++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh
@@ -2,14 +2,14 @@
#
# JDBCDemo.sh
#
-# $Id: JDBCDemo.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: JDBCDemo.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html
index da285d6..0569058 100644
--- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html
+++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java
index ae14955..87daf8e 100644
--- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java
+++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java
@@ -1,14 +1,14 @@
/*
* WebJDBCDemo.java
*
- * $Id: WebJDBCDemo.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: WebJDBCDemo.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java
index 9c30d63..860b490 100644
--- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java
+++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java
@@ -1,14 +1,14 @@
/*
* DialogConnection.java
*
- * $Id: DialogConnection.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnection.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java
index 7d2a275..23361e7 100644
--- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java
+++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java
@@ -1,14 +1,14 @@
/*
* DialogConnectionList.java
*
- * $Id: DialogConnectionList.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: DialogConnectionList.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* URL picklist
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat
index a40389d..367849f 100644
--- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat
+++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat
@@ -2,14 +2,14 @@
REM
REM ScrollDemo2.bat
REM
-REM $Id: ScrollDemo2.bat,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+REM $Id: ScrollDemo2.bat,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
REM
REM Java startup script
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.java
index 2a3eae7..dfd74d0 100644
--- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.java
+++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.java
@@ -1,14 +1,14 @@
/*
* ScrollDemo2.java
*
- * $Id: ScrollDemo2.java,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+ * $Id: ScrollDemo2.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh
index 4b7f471..71e22f9 100755
--- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh
+++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh
@@ -2,14 +2,14 @@
#
# ScrollDemo2.sh
#
-# $Id: ScrollDemo2.sh,v 1.1.1.1.2.1 2012/03/08 12:55:03 source Exp $
+# $Id: ScrollDemo2.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Java startup script
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html
index ae17514..0f79303 100644
--- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html
+++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java
index 266baf1..3acb998 100644
--- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java
+++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java
@@ -1,14 +1,14 @@
/*
* WebScrollDemo2.java
*
- * $Id: WebScrollDemo2.java,v 1.1.1.1.2.1 2012/03/08 12:55:04 source Exp $
+ * $Id: WebScrollDemo2.java,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
*
* Sample JDBC program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/JDBC/jdk1.5/index.htm b/binsrc/samples/JDBC/jdk1.5/index.htm
index 70b2e1a..daef147 100644
--- a/binsrc/samples/JDBC/jdk1.5/index.htm
+++ b/binsrc/samples/JDBC/jdk1.5/index.htm
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/Makefile.am b/binsrc/samples/Makefile.am
index 1fac926..4a73c5a 100644
--- a/binsrc/samples/Makefile.am
+++ b/binsrc/samples/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/Makefile.in b/binsrc/samples/Makefile.in
index b659053..407a1fd 100644
--- a/binsrc/samples/Makefile.in
+++ b/binsrc/samples/Makefile.in
@@ -118,7 +118,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -167,7 +166,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -219,7 +217,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -266,6 +263,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -295,7 +293,7 @@ vaddir = @vaddir@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/Makefile.am b/binsrc/samples/demo/Makefile.am
index f3b294a..a439ebe 100644
--- a/binsrc/samples/demo/Makefile.am
+++ b/binsrc/samples/demo/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/Makefile.in b/binsrc/samples/demo/Makefile.in
index 8105eca..69c8723 100644
--- a/binsrc/samples/demo/Makefile.in
+++ b/binsrc/samples/demo/Makefile.in
@@ -104,7 +104,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -153,7 +152,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -193,7 +191,7 @@ SYSLIBS = @SYSLIBS@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -226,7 +224,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -273,6 +270,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/demo/art.sql b/binsrc/samples/demo/art.sql
index 006bf0e..fc6327c 100644
--- a/binsrc/samples/demo/art.sql
+++ b/binsrc/samples/demo/art.sql
@@ -1,10 +1,10 @@
--
--- $Id: art.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: art.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/art_vad.sql b/binsrc/samples/demo/art_vad.sql
index c4426ca..691ca0f 100644
--- a/binsrc/samples/demo/art_vad.sql
+++ b/binsrc/samples/demo/art_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: art_vad.sql,v 1.1.2.2 2012/03/08 12:55:04 source Exp $
+-- $Id: art_vad.sql,v 1.1.2.1 2009/11/06 17:17:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/check_demo.sql b/binsrc/samples/demo/check_demo.sql
index 8101b9c..d2243e9 100644
--- a/binsrc/samples/demo/check_demo.sql
+++ b/binsrc/samples/demo/check_demo.sql
@@ -1,10 +1,10 @@
--
--- $Id: check_demo.sql,v 1.4.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: check_demo.sql,v 1.4 2007/11/19 13:33:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/countries.sql b/binsrc/samples/demo/countries.sql
index 540d231..1259881 100644
--- a/binsrc/samples/demo/countries.sql
+++ b/binsrc/samples/demo/countries.sql
@@ -1,14 +1,14 @@
--
-- countries.sql
--
--- $Id: countries.sql,v 1.3.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: countries.sql,v 1.3 2006/05/26 11:23:44 source Exp $
--
-- Creates a countries database
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/countries_vad.sql b/binsrc/samples/demo/countries_vad.sql
index 119da57..4b51fa0 100644
--- a/binsrc/samples/demo/countries_vad.sql
+++ b/binsrc/samples/demo/countries_vad.sql
@@ -1,14 +1,14 @@
--
-- countries.sql
--
--- $Id: countries_vad.sql,v 1.3.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: countries_vad.sql,v 1.3 2007/04/03 09:58:59 source Exp $
--
-- Creates a countries database
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/doc.owl b/binsrc/samples/demo/doc.owl
index ea4de55..dce28b5 100644
--- a/binsrc/samples/demo/doc.owl
+++ b/binsrc/samples/demo/doc.owl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: doc.owl,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+ - $Id: doc.owl,v 1.2 2008/03/24 17:26:06 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/binsrc/samples/demo/drop.sql b/binsrc/samples/demo/drop.sql
index 424f149..2e1113f 100644
--- a/binsrc/samples/demo/drop.sql
+++ b/binsrc/samples/demo/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: drop.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/make_vad.sh b/binsrc/samples/demo/make_vad.sh
index 6591d44..dfee25a 100755
--- a/binsrc/samples/demo/make_vad.sh
+++ b/binsrc/samples/demo/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.18.2.5 2012/03/08 12:55:04 source Exp $
+# $Id: make_vad.sh,v 1.18.2.4 2011/02/03 10:37:51 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -357,7 +357,7 @@ sticker_init() {
echo " <name package=\"Demo\">" >> $STICKER
echo " <prop name=\"Title\" value=\"Demo Database\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso/demo/download\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso/demo/download\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/samples/demo/mkdemo.bat b/binsrc/samples/demo/mkdemo.bat
index e2cf755..d957c73 100644
--- a/binsrc/samples/demo/mkdemo.bat
+++ b/binsrc/samples/demo/mkdemo.bat
@@ -2,7 +2,7 @@ rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/samples/demo/mkdemo.sh b/binsrc/samples/demo/mkdemo.sh
index c30acd3..87de4ab 100755
--- a/binsrc/samples/demo/mkdemo.sh
+++ b/binsrc/samples/demo/mkdemo.sh
@@ -2,14 +2,14 @@
#
# mkdemo.sh
#
-# $Id: mkdemo.sh,v 1.33.2.5 2012/03/08 12:55:04 source Exp $
+# $Id: mkdemo.sh,v 1.33.2.4 2010/09/21 13:12:36 source Exp $
#
# Creates a demo database
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/mkdemo.sql b/binsrc/samples/demo/mkdemo.sql
index d00c3d1..100ec12 100644
--- a/binsrc/samples/demo/mkdemo.sql
+++ b/binsrc/samples/demo/mkdemo.sql
@@ -1,14 +1,14 @@
--
-- mkdemo.sql
--
--- $Id: mkdemo.sql,v 1.4.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: mkdemo.sql,v 1.4 2007/11/19 13:33:36 source Exp $
--
-- Creates a demo database
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/mkdemo_vad.sql b/binsrc/samples/demo/mkdemo_vad.sql
index 1bcb623..08dca05 100644
--- a/binsrc/samples/demo/mkdemo_vad.sql
+++ b/binsrc/samples/demo/mkdemo_vad.sql
@@ -1,14 +1,14 @@
--
-- mkdemo.sql
--
--- $Id: mkdemo_vad.sql,v 1.4.2.2 2012/03/08 12:55:04 source Exp $
+-- $Id: mkdemo_vad.sql,v 1.4.2.1 2009/11/25 22:11:16 source Exp $
--
-- Creates a demo database
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/mkdoc.sh b/binsrc/samples/demo/mkdoc.sh
index 2ffd1e0..12393a8 100755
--- a/binsrc/samples/demo/mkdoc.sh
+++ b/binsrc/samples/demo/mkdoc.sh
@@ -2,14 +2,14 @@
#
# mkdoc.sh
#
-# $Id: mkdoc.sh,v 1.20.2.3 2012/03/08 12:55:04 source Exp $
+# $Id: mkdoc.sh,v 1.20.2.2 2011/02/03 10:37:51 source Exp $
#
# Creates Virtuoso Documentation
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -387,7 +387,7 @@ sticker_init() {
echo " <name package=\"doc\">" >> $STICKER
echo " <prop name=\"Title\" value=\"Virtuoso Documentation\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/samples/demo/mkdoc.sql b/binsrc/samples/demo/mkdoc.sql
index 85e8f89..c241150 100644
--- a/binsrc/samples/demo/mkdoc.sql
+++ b/binsrc/samples/demo/mkdoc.sql
@@ -1,10 +1,10 @@
--
--- $Id: mkdoc.sql,v 1.3.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: mkdoc.sql,v 1.3 2008/09/16 21:04:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/mkdoc_new.sql b/binsrc/samples/demo/mkdoc_new.sql
index 6f4a239..94dcdd6 100644
--- a/binsrc/samples/demo/mkdoc_new.sql
+++ b/binsrc/samples/demo/mkdoc_new.sql
@@ -1,10 +1,10 @@
--
--- $Id: mkdoc_new.sql,v 1.8.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: mkdoc_new.sql,v 1.8 2008/01/18 13:56:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/mksearch.sql b/binsrc/samples/demo/mksearch.sql
index 7264b4c..97a7dde 100644
--- a/binsrc/samples/demo/mksearch.sql
+++ b/binsrc/samples/demo/mksearch.sql
@@ -1,10 +1,10 @@
--
--- $Id: mksearch.sql,v 1.4.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: mksearch.sql,v 1.4 2007/05/08 17:44:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/mkvspxdoc.sql b/binsrc/samples/demo/mkvspxdoc.sql
index 74bcd7e..7f0e7ca 100644
--- a/binsrc/samples/demo/mkvspxdoc.sql
+++ b/binsrc/samples/demo/mkvspxdoc.sql
@@ -1,10 +1,10 @@
--
--- $Id: mkvspxdoc.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: mkvspxdoc.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/demo/nw.owl b/binsrc/samples/demo/nw.owl
index 3574cfd..41aa26f 100644
--- a/binsrc/samples/demo/nw.owl
+++ b/binsrc/samples/demo/nw.owl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: nw.owl,v 1.4.2.3 2012/03/08 12:55:04 source Exp $
+ - $Id: nw.owl,v 1.4.2.2 2009/12/15 23:01:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/binsrc/samples/hslookup/Makefile.am b/binsrc/samples/hslookup/Makefile.am
index 2f018f7..57d5dba 100644
--- a/binsrc/samples/hslookup/Makefile.am
+++ b/binsrc/samples/hslookup/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
diff --git a/binsrc/samples/hslookup/Makefile.in b/binsrc/samples/hslookup/Makefile.in
index af3aeae..52beeb4 100644
--- a/binsrc/samples/hslookup/Makefile.in
+++ b/binsrc/samples/hslookup/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
@@ -147,7 +147,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -196,7 +195,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -248,7 +246,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -295,6 +292,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/hslookup/hslookup.c b/binsrc/samples/hslookup/hslookup.c
index b53249e..2a34754 100644
--- a/binsrc/samples/hslookup/hslookup.c
+++ b/binsrc/samples/hslookup/hslookup.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -38,7 +38,7 @@
#include <time.h>
#ifdef WIN32
-#include <handle.h>
+#include <hdl/handle.h>
#else
#include <hdl/hdl.h>
#endif
diff --git a/binsrc/samples/image_magick/Makefile.am b/binsrc/samples/image_magick/Makefile.am
index dd7b0cb..d75d129 100644
--- a/binsrc/samples/image_magick/Makefile.am
+++ b/binsrc/samples/image_magick/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/image_magick/Makefile.in b/binsrc/samples/image_magick/Makefile.in
index e6636fa..8fa08d3 100644
--- a/binsrc/samples/image_magick/Makefile.in
+++ b/binsrc/samples/image_magick/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -146,7 +146,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -195,7 +194,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -247,7 +245,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -294,6 +291,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/image_magick/demo.sql b/binsrc/samples/image_magick/demo.sql
index 0fd7e3f..891d57a 100644
--- a/binsrc/samples/image_magick/demo.sql
+++ b/binsrc/samples/image_magick/demo.sql
@@ -1,10 +1,10 @@
--
--- $Id: demo.sql,v 1.3.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: demo.sql,v 1.3 2007/01/22 13:16:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/image_magick/im.c b/binsrc/samples/image_magick/im.c
index 0584edf..8efcf86 100644
--- a/binsrc/samples/image_magick/im.c
+++ b/binsrc/samples/image_magick/im.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -696,7 +696,6 @@ caddr_t bif_im_DeepZoom4to1 (caddr_t * qst, caddr_t * err, state_slot_t ** args)
im_env_t env;
caddr_t res;
int fmt_is_set = 0;
- int image_ctr;
im_init (&env, qst, args, "IM DeepZoom4to1");
im_set_background (&env, "#000000");
env.ime_target_magick_wand = NewMagickWand ();
@@ -710,7 +709,7 @@ caddr_t bif_im_DeepZoom4to1 (caddr_t * qst, caddr_t * err, state_slot_t ** args)
im_leave_with_error (&env, "22023", "IM001", "Can not set image extent");
if (MagickFalse == MagickSetImageBackgroundColor (env.ime_target_magick_wand, env.ime_background))
im_leave_with_error (&env, "22023", "IM001", "Can not set image background");
- image_ctr = BOX_ELEMENTS (args) / 2;
+ int image_ctr = BOX_ELEMENTS (args) / 2;
if (image_ctr > 4)
image_ctr = 4;
while (0 < image_ctr--)
@@ -765,7 +764,6 @@ bif_im_AnnotateImageBlob (caddr_t * qst, caddr_t * err, state_slot_t ** args)
long f_size = n_args > 5 ? bif_long_arg (qst, args, 5, szMe) : 12;
char *text_color = n_args > 6 ? bif_string_arg (qst, args, 6, szMe) : "black" ;
dtp_t dtp = DV_TYPE_OF (blob);
- im_env_t env;
im_init (&env, qst, args, "IM AnnotateImageBlob");
if (IS_STRING_DTP (dtp))
blob_size = box_length (blob) - 1;
diff --git a/binsrc/samples/odp/Makefile.am b/binsrc/samples/odp/Makefile.am
index becc8ce..4271ecc 100644
--- a/binsrc/samples/odp/Makefile.am
+++ b/binsrc/samples/odp/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/Makefile.in b/binsrc/samples/odp/Makefile.in
index 3249443..10d9c25 100644
--- a/binsrc/samples/odp/Makefile.in
+++ b/binsrc/samples/odp/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/odp/_current_config.sql b/binsrc/samples/odp/_current_config.sql
index a29022b..3f54670 100644
--- a/binsrc/samples/odp/_current_config.sql
+++ b/binsrc/samples/odp/_current_config.sql
@@ -1,10 +1,10 @@
--
--- $Id: _current_config.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: _current_config.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/all_profiles.vsp b/binsrc/samples/odp/http/all_profiles.vsp
index 19c20c0..eb9965f 100644
--- a/binsrc/samples/odp/http/all_profiles.vsp
+++ b/binsrc/samples/odp/http/all_profiles.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: all_profiles.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: all_profiles.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/dmoz_s1.vsp b/binsrc/samples/odp/http/dmoz_s1.vsp
index 9d2295b..022ec4e 100644
--- a/binsrc/samples/odp/http/dmoz_s1.vsp
+++ b/binsrc/samples/odp/http/dmoz_s1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dmoz_s1.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: dmoz_s1.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/edit_topic.vsp b/binsrc/samples/odp/http/edit_topic.vsp
index 3df3854..654e86d 100644
--- a/binsrc/samples/odp/http/edit_topic.vsp
+++ b/binsrc/samples/odp/http/edit_topic.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: edit_topic.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: edit_topic.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/editor.vsp b/binsrc/samples/odp/http/editor.vsp
index 9ffee61..a4e6519 100644
--- a/binsrc/samples/odp/http/editor.vsp
+++ b/binsrc/samples/odp/http/editor.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: editor.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: editor.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/editors.vsp b/binsrc/samples/odp/http/editors.vsp
index 0e92b8a..85db7bf 100644
--- a/binsrc/samples/odp/http/editors.vsp
+++ b/binsrc/samples/odp/http/editors.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: editors.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: editors.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/main.vsp b/binsrc/samples/odp/http/main.vsp
index 104ee74..58d81d8 100644
--- a/binsrc/samples/odp/http/main.vsp
+++ b/binsrc/samples/odp/http/main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: main.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: main.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/perform_search.vsp b/binsrc/samples/odp/http/perform_search.vsp
index 60e2f7a..78fb508 100644
--- a/binsrc/samples/odp/http/perform_search.vsp
+++ b/binsrc/samples/odp/http/perform_search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: perform_search.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: perform_search.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/search.vsp b/binsrc/samples/odp/http/search.vsp
index 3f7aa6e..e4a5061 100644
--- a/binsrc/samples/odp/http/search.vsp
+++ b/binsrc/samples/odp/http/search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: search.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: search.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/status.vsp b/binsrc/samples/odp/http/status.vsp
index 38e1b1e..4c2d83a 100644
--- a/binsrc/samples/odp/http/status.vsp
+++ b/binsrc/samples/odp/http/status.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: status.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: status.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/topic.vsp b/binsrc/samples/odp/http/topic.vsp
index 82c158d..244d5a0 100644
--- a/binsrc/samples/odp/http/topic.vsp
+++ b/binsrc/samples/odp/http/topic.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: topic.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: topic.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/http/topic_descr.vsp b/binsrc/samples/odp/http/topic_descr.vsp
index 0fea9fb..5b233ee 100644
--- a/binsrc/samples/odp/http/topic_descr.vsp
+++ b/binsrc/samples/odp/http/topic_descr.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: topic_descr.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: topic_descr.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/odp_boot.sql b/binsrc/samples/odp/odp_boot.sql
index 2efdeba..35c2bff 100644
--- a/binsrc/samples/odp/odp_boot.sql
+++ b/binsrc/samples/odp/odp_boot.sql
@@ -1,10 +1,10 @@
--
--- $Id: odp_boot.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: odp_boot.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/odp_lib.sql b/binsrc/samples/odp/odp_lib.sql
index 342fb72..1fef20b 100644
--- a/binsrc/samples/odp/odp_lib.sql
+++ b/binsrc/samples/odp/odp_lib.sql
@@ -1,10 +1,10 @@
--
--- $Id: odp_lib.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: odp_lib.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/odp_vsp.sql b/binsrc/samples/odp/odp_vsp.sql
index c27d879..51ea462 100644
--- a/binsrc/samples/odp/odp_vsp.sql
+++ b/binsrc/samples/odp/odp_vsp.sql
@@ -1,10 +1,10 @@
--
--- $Id: odp_vsp.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: odp_vsp.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/rdf_lib.sql b/binsrc/samples/odp/rdf_lib.sql
index 5669d0f..b6e11e9 100644
--- a/binsrc/samples/odp/rdf_lib.sql
+++ b/binsrc/samples/odp/rdf_lib.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdf_lib.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: rdf_lib.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/setup.isql b/binsrc/samples/odp/setup.isql
index ca06ac1..332da64 100644
--- a/binsrc/samples/odp/setup.isql
+++ b/binsrc/samples/odp/setup.isql
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/odp/virtodp.sh b/binsrc/samples/odp/virtodp.sh
index 4c11a7c..8f4bc77 100755
--- a/binsrc/samples/odp/virtodp.sh
+++ b/binsrc/samples/odp/virtodp.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: virtodp.sh,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+# $Id: virtodp.sh,v 1.2 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/samples/sparql_demo/Makefile.am b/binsrc/samples/sparql_demo/Makefile.am
index 82a7109..ba64b9e 100644
--- a/binsrc/samples/sparql_demo/Makefile.am
+++ b/binsrc/samples/sparql_demo/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/Makefile.in b/binsrc/samples/sparql_demo/Makefile.in
index 5d22106..c28dc65 100644
--- a/binsrc/samples/sparql_demo/Makefile.in
+++ b/binsrc/samples/sparql_demo/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -123,7 +123,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -172,7 +171,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -224,7 +222,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -271,6 +268,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/sparql_demo/data_upload.vsp b/binsrc/samples/sparql_demo/data_upload.vsp
index 39cc86b..d06697d 100644
--- a/binsrc/samples/sparql_demo/data_upload.vsp
+++ b/binsrc/samples/sparql_demo/data_upload.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: data_upload.vsp,v 1.4.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: data_upload.vsp,v 1.4 2006/08/03 18:48:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/default.css b/binsrc/samples/sparql_demo/default.css
index 2e60505..eecbeff 100644
--- a/binsrc/samples/sparql_demo/default.css
+++ b/binsrc/samples/sparql_demo/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.16.2.2 2012/03/08 12:55:04 source Exp $
+ * $Id: default.css,v 1.16.2.1 2009/10/07 19:37:48 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/explain.vsp b/binsrc/samples/sparql_demo/explain.vsp
index 2249178..9c81bf9 100644
--- a/binsrc/samples/sparql_demo/explain.vsp
+++ b/binsrc/samples/sparql_demo/explain.vsp
@@ -1,10 +1,10 @@
<?vsp
--
--- $Id: explain.vsp,v 1.1.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: explain.vsp,v 1.1 2006/08/03 18:48:32 source Exp $
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/load_dawg_usecase.vsp b/binsrc/samples/sparql_demo/load_dawg_usecase.vsp
index b32e5ba..8df9bec 100644
--- a/binsrc/samples/sparql_demo/load_dawg_usecase.vsp
+++ b/binsrc/samples/sparql_demo/load_dawg_usecase.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: load_dawg_usecase.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: load_dawg_usecase.vsp,v 1.2 2007/01/22 22:04:56 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/load_sq.vsp b/binsrc/samples/sparql_demo/load_sq.vsp
index 8d6a46c..7b778d1 100644
--- a/binsrc/samples/sparql_demo/load_sq.vsp
+++ b/binsrc/samples/sparql_demo/load_sq.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: load_sq.vsp,v 1.1.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: load_sq.vsp,v 1.1 2006/08/03 18:48:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/load_uris.vsp b/binsrc/samples/sparql_demo/load_uris.vsp
index 5d6c5f2..b2c3b47 100644
--- a/binsrc/samples/sparql_demo/load_uris.vsp
+++ b/binsrc/samples/sparql_demo/load_uris.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: load_uris.vsp,v 1.1.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: load_uris.vsp,v 1.1 2006/08/03 18:48:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/make_vad.sh b/binsrc/samples/sparql_demo/make_vad.sh
index 4b1ba87..1fc88a9 100755
--- a/binsrc/samples/sparql_demo/make_vad.sh
+++ b/binsrc/samples/sparql_demo/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.16.2.3 2012/03/08 12:55:04 source Exp $
+# $Id: make_vad.sh,v 1.16.2.2 2011/02/03 10:37:51 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -269,7 +269,7 @@ sticker_init() {
echo " <name package=\"SPARQL Demo\">" >> $STICKER
echo " <prop name=\"Title\" value=\"SPARQL Demo\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/samples/sparql_demo/remote.vsp b/binsrc/samples/sparql_demo/remote.vsp
index 8584a32..d77eb3b 100644
--- a/binsrc/samples/sparql_demo/remote.vsp
+++ b/binsrc/samples/sparql_demo/remote.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: remote.vsp,v 1.1.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: remote.vsp,v 1.1 2006/08/03 18:48:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/setup.sql b/binsrc/samples/sparql_demo/setup.sql
index 2bdb348..666fc02 100644
--- a/binsrc/samples/sparql_demo/setup.sql
+++ b/binsrc/samples/sparql_demo/setup.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup.sql,v 1.12.2.2 2012/03/08 12:55:04 source Exp $
+-- $Id: setup.sql,v 1.12.2.1 2009/07/27 22:55:28 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/setup_demo_db.sql b/binsrc/samples/sparql_demo/setup_demo_db.sql
index cd7e83e..6101258 100644
--- a/binsrc/samples/sparql_demo/setup_demo_db.sql
+++ b/binsrc/samples/sparql_demo/setup_demo_db.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup_demo_db.sql,v 1.9.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: setup_demo_db.sql,v 1.9 2007/04/03 10:00:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/setup_queries.sql b/binsrc/samples/sparql_demo/setup_queries.sql
index a6ea0af..99e1848 100644
--- a/binsrc/samples/sparql_demo/setup_queries.sql
+++ b/binsrc/samples/sparql_demo/setup_queries.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup_queries.sql,v 1.1.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: setup_queries.sql,v 1.1 2006/08/03 18:48:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/sparql_ajax.js b/binsrc/samples/sparql_demo/sparql_ajax.js
index 1c04b11..0775568 100644
--- a/binsrc/samples/sparql_demo/sparql_ajax.js
+++ b/binsrc/samples/sparql_demo/sparql_ajax.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/sparql_ajax.vsp b/binsrc/samples/sparql_demo/sparql_ajax.vsp
index 885a036..6db1557 100644
--- a/binsrc/samples/sparql_demo/sparql_ajax.vsp
+++ b/binsrc/samples/sparql_demo/sparql_ajax.vsp
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<?vsp
--
--- $Id: sparql_ajax.vsp,v 1.21.2.3 2012/03/08 12:55:04 source Exp $
+-- $Id: sparql_ajax.vsp,v 1.21.2.2 2010/03/18 10:50:28 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/sparql_auth.vsp b/binsrc/samples/sparql_demo/sparql_auth.vsp
index 1645c53..d38a14d 100644
--- a/binsrc/samples/sparql_demo/sparql_auth.vsp
+++ b/binsrc/samples/sparql_demo/sparql_auth.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sparql_auth.vsp,v 1.1.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: sparql_auth.vsp,v 1.1 2006/10/18 12:21:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/sparql_demo/sparql_file.vsp b/binsrc/samples/sparql_demo/sparql_file.vsp
index 7385a3a..bda95bc 100644
--- a/binsrc/samples/sparql_demo/sparql_file.vsp
+++ b/binsrc/samples/sparql_demo/sparql_file.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sparql_file.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: sparql_file.vsp,v 1.2 2006/10/26 00:11:54 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/wbxml2/Makefile.am b/binsrc/samples/wbxml2/Makefile.am
index 6ba4f94..8bf8ab4 100644
--- a/binsrc/samples/wbxml2/Makefile.am
+++ b/binsrc/samples/wbxml2/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/wbxml2/Makefile.in b/binsrc/samples/wbxml2/Makefile.in
index b8f1afd..1f86736 100644
--- a/binsrc/samples/wbxml2/Makefile.in
+++ b/binsrc/samples/wbxml2/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -147,7 +147,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -196,7 +195,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -248,7 +246,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -295,6 +292,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/wbxml2/wbxml2.c b/binsrc/samples/wbxml2/wbxml2.c
index bb17af5..0ce5190 100644
--- a/binsrc/samples/wbxml2/wbxml2.c
+++ b/binsrc/samples/wbxml2/wbxml2.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/Makefile.am b/binsrc/samples/webapp/Makefile.am
index f1cbe4d..2f4995e 100644
--- a/binsrc/samples/webapp/Makefile.am
+++ b/binsrc/samples/webapp/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/Makefile.in b/binsrc/samples/webapp/Makefile.in
index 40222ea..64128f1 100644
--- a/binsrc/samples/webapp/Makefile.in
+++ b/binsrc/samples/webapp/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/webapp/app_common.sql b/binsrc/samples/webapp/app_common.sql
index 71f3969..70bf8f7 100644
--- a/binsrc/samples/webapp/app_common.sql
+++ b/binsrc/samples/webapp/app_common.sql
@@ -1,10 +1,10 @@
--
--- $Id: app_common.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: app_common.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appcookie/appcookie.sql b/binsrc/samples/webapp/appcookie/appcookie.sql
index 75316c1..dffd781 100644
--- a/binsrc/samples/webapp/appcookie/appcookie.sql
+++ b/binsrc/samples/webapp/appcookie/appcookie.sql
@@ -1,10 +1,10 @@
--
--- $Id: appcookie.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: appcookie.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appcookie/default.vsp b/binsrc/samples/webapp/appcookie/default.vsp
index 041aec9..c032b23 100644
--- a/binsrc/samples/webapp/appcookie/default.vsp
+++ b/binsrc/samples/webapp/appcookie/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appcookie/front.vsp b/binsrc/samples/webapp/appcookie/front.vsp
index 9e9c62c..c58963e 100644
--- a/binsrc/samples/webapp/appcookie/front.vsp
+++ b/binsrc/samples/webapp/appcookie/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appcookie/login.vsp b/binsrc/samples/webapp/appcookie/login.vsp
index a02987b..65c5530 100644
--- a/binsrc/samples/webapp/appcookie/login.vsp
+++ b/binsrc/samples/webapp/appcookie/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appcookie/logout.vsp b/binsrc/samples/webapp/appcookie/logout.vsp
index 205d6f5..2852558 100644
--- a/binsrc/samples/webapp/appcookie/logout.vsp
+++ b/binsrc/samples/webapp/appcookie/logout.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: logout.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: logout.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appcookie/register.vsp b/binsrc/samples/webapp/appcookie/register.vsp
index 0a3fb37..ab36f0e 100644
--- a/binsrc/samples/webapp/appcookie/register.vsp
+++ b/binsrc/samples/webapp/appcookie/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appcookie/relogin.vsp b/binsrc/samples/webapp/appcookie/relogin.vsp
index e2a5740..f6ac157 100644
--- a/binsrc/samples/webapp/appcookie/relogin.vsp
+++ b/binsrc/samples/webapp/appcookie/relogin.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: relogin.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: relogin.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appdigest/appdigest.sql b/binsrc/samples/webapp/appdigest/appdigest.sql
index 8fd4a91..97fc870 100644
--- a/binsrc/samples/webapp/appdigest/appdigest.sql
+++ b/binsrc/samples/webapp/appdigest/appdigest.sql
@@ -1,10 +1,10 @@
--
--- $Id: appdigest.sql,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: appdigest.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appdigest/default.vsp b/binsrc/samples/webapp/appdigest/default.vsp
index 25c8278..e8b57bb 100644
--- a/binsrc/samples/webapp/appdigest/default.vsp
+++ b/binsrc/samples/webapp/appdigest/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appdigest/front.vsp b/binsrc/samples/webapp/appdigest/front.vsp
index a9c9612..6a3f061 100644
--- a/binsrc/samples/webapp/appdigest/front.vsp
+++ b/binsrc/samples/webapp/appdigest/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appdigest/logout.vsp b/binsrc/samples/webapp/appdigest/logout.vsp
index 2464d6b..b6d121e 100644
--- a/binsrc/samples/webapp/appdigest/logout.vsp
+++ b/binsrc/samples/webapp/appdigest/logout.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: logout.vsp,v 1.2.2.1 2012/03/08 12:55:04 source Exp $
+-- $Id: logout.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appdigest/register.vsp b/binsrc/samples/webapp/appdigest/register.vsp
index 11440d2..56a8223 100644
--- a/binsrc/samples/webapp/appdigest/register.vsp
+++ b/binsrc/samples/webapp/appdigest/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appjs/appjs.sql b/binsrc/samples/webapp/appjs/appjs.sql
index b0979c0..eef2eba 100644
--- a/binsrc/samples/webapp/appjs/appjs.sql
+++ b/binsrc/samples/webapp/appjs/appjs.sql
@@ -1,10 +1,10 @@
--
--- $Id: appjs.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: appjs.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appjs/default.vsp b/binsrc/samples/webapp/appjs/default.vsp
index e59d693..e8b57bb 100644
--- a/binsrc/samples/webapp/appjs/default.vsp
+++ b/binsrc/samples/webapp/appjs/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appjs/front.vsp b/binsrc/samples/webapp/appjs/front.vsp
index ee98f2a..6a3f061 100644
--- a/binsrc/samples/webapp/appjs/front.vsp
+++ b/binsrc/samples/webapp/appjs/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appjs/logout.vsp b/binsrc/samples/webapp/appjs/logout.vsp
index 59185eb..742ad60 100644
--- a/binsrc/samples/webapp/appjs/logout.vsp
+++ b/binsrc/samples/webapp/appjs/logout.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: logout.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: logout.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appjs/register.vsp b/binsrc/samples/webapp/appjs/register.vsp
index 360b374..6961936 100644
--- a/binsrc/samples/webapp/appjs/register.vsp
+++ b/binsrc/samples/webapp/appjs/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appsimple/simple_session.sql b/binsrc/samples/webapp/appsimple/simple_session.sql
index 3bef235..7e7293f 100644
--- a/binsrc/samples/webapp/appsimple/simple_session.sql
+++ b/binsrc/samples/webapp/appsimple/simple_session.sql
@@ -1,10 +1,10 @@
--
--- $Id: simple_session.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: simple_session.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appsimple/simple_session.vsp b/binsrc/samples/webapp/appsimple/simple_session.vsp
index c3e73a5..cfc4451 100644
--- a/binsrc/samples/webapp/appsimple/simple_session.vsp
+++ b/binsrc/samples/webapp/appsimple/simple_session.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: simple_session.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: simple_session.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appssl/appssl.sql b/binsrc/samples/webapp/appssl/appssl.sql
index d434140..dc3705d 100644
--- a/binsrc/samples/webapp/appssl/appssl.sql
+++ b/binsrc/samples/webapp/appssl/appssl.sql
@@ -1,10 +1,10 @@
--
--- $Id: appssl.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: appssl.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appssl/default.vsp b/binsrc/samples/webapp/appssl/default.vsp
index cd64748..7fcaeb9 100644
--- a/binsrc/samples/webapp/appssl/default.vsp
+++ b/binsrc/samples/webapp/appssl/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appssl/front.vsp b/binsrc/samples/webapp/appssl/front.vsp
index c01a85b..c58963e 100644
--- a/binsrc/samples/webapp/appssl/front.vsp
+++ b/binsrc/samples/webapp/appssl/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appssl/login.vsp b/binsrc/samples/webapp/appssl/login.vsp
index 4649667..86c19e0 100644
--- a/binsrc/samples/webapp/appssl/login.vsp
+++ b/binsrc/samples/webapp/appssl/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appssl/logout.vsp b/binsrc/samples/webapp/appssl/logout.vsp
index 8eed736..4e0407d 100644
--- a/binsrc/samples/webapp/appssl/logout.vsp
+++ b/binsrc/samples/webapp/appssl/logout.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: logout.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: logout.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appssl/register.vsp b/binsrc/samples/webapp/appssl/register.vsp
index 2d7d939..d2e4666 100644
--- a/binsrc/samples/webapp/appssl/register.vsp
+++ b/binsrc/samples/webapp/appssl/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appssl/relogin.vsp b/binsrc/samples/webapp/appssl/relogin.vsp
index 40fc4a4..40f5f63 100644
--- a/binsrc/samples/webapp/appssl/relogin.vsp
+++ b/binsrc/samples/webapp/appssl/relogin.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: relogin.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: relogin.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurl/appurl.sql b/binsrc/samples/webapp/appurl/appurl.sql
index 71c1a14..b60392d 100644
--- a/binsrc/samples/webapp/appurl/appurl.sql
+++ b/binsrc/samples/webapp/appurl/appurl.sql
@@ -1,10 +1,10 @@
--
--- $Id: appurl.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: appurl.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurl/default.vsp b/binsrc/samples/webapp/appurl/default.vsp
index 313e7b3..dcb9068 100644
--- a/binsrc/samples/webapp/appurl/default.vsp
+++ b/binsrc/samples/webapp/appurl/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurl/front.vsp b/binsrc/samples/webapp/appurl/front.vsp
index c01a85b..c58963e 100644
--- a/binsrc/samples/webapp/appurl/front.vsp
+++ b/binsrc/samples/webapp/appurl/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurl/login.vsp b/binsrc/samples/webapp/appurl/login.vsp
index 8382c74..8375066 100644
--- a/binsrc/samples/webapp/appurl/login.vsp
+++ b/binsrc/samples/webapp/appurl/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurl/logout.vsp b/binsrc/samples/webapp/appurl/logout.vsp
index cefebd3..6f33cf3 100644
--- a/binsrc/samples/webapp/appurl/logout.vsp
+++ b/binsrc/samples/webapp/appurl/logout.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: logout.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: logout.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurl/register.vsp b/binsrc/samples/webapp/appurl/register.vsp
index 188e28a..1612b1c 100644
--- a/binsrc/samples/webapp/appurl/register.vsp
+++ b/binsrc/samples/webapp/appurl/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurl/relogin.vsp b/binsrc/samples/webapp/appurl/relogin.vsp
index 00fab37..f7b3a74 100644
--- a/binsrc/samples/webapp/appurl/relogin.vsp
+++ b/binsrc/samples/webapp/appurl/relogin.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: relogin.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: relogin.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurla/appurla.sql b/binsrc/samples/webapp/appurla/appurla.sql
index 43381a4..80055c6 100644
--- a/binsrc/samples/webapp/appurla/appurla.sql
+++ b/binsrc/samples/webapp/appurla/appurla.sql
@@ -1,10 +1,10 @@
--
--- $Id: appurla.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: appurla.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurla/default.vsp b/binsrc/samples/webapp/appurla/default.vsp
index 0602d1b..7ce16a5 100644
--- a/binsrc/samples/webapp/appurla/default.vsp
+++ b/binsrc/samples/webapp/appurla/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurla/front.vsp b/binsrc/samples/webapp/appurla/front.vsp
index c01a85b..c58963e 100644
--- a/binsrc/samples/webapp/appurla/front.vsp
+++ b/binsrc/samples/webapp/appurla/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurla/login.vsp b/binsrc/samples/webapp/appurla/login.vsp
index 4fc643c..e1f5d46 100644
--- a/binsrc/samples/webapp/appurla/login.vsp
+++ b/binsrc/samples/webapp/appurla/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurla/logout.vsp b/binsrc/samples/webapp/appurla/logout.vsp
index 7580ac2..e5c7316 100644
--- a/binsrc/samples/webapp/appurla/logout.vsp
+++ b/binsrc/samples/webapp/appurla/logout.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: logout.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: logout.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurla/register.vsp b/binsrc/samples/webapp/appurla/register.vsp
index 62ce1cf..71bdd7b 100644
--- a/binsrc/samples/webapp/appurla/register.vsp
+++ b/binsrc/samples/webapp/appurla/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/appurla/relogin.vsp b/binsrc/samples/webapp/appurla/relogin.vsp
index e670192..1bf3170 100644
--- a/binsrc/samples/webapp/appurla/relogin.vsp
+++ b/binsrc/samples/webapp/appurla/relogin.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: relogin.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: relogin.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/changeNews.vsp b/binsrc/samples/webapp/eNews/changeNews.vsp
index 04e7cb7..f396009 100644
--- a/binsrc/samples/webapp/eNews/changeNews.vsp
+++ b/binsrc/samples/webapp/eNews/changeNews.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: changeNews.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: changeNews.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/css/one.css b/binsrc/samples/webapp/eNews/css/one.css
index 10f0cf9..0c2cfdc 100644
--- a/binsrc/samples/webapp/eNews/css/one.css
+++ b/binsrc/samples/webapp/eNews/css/one.css
@@ -1,10 +1,10 @@
/*
- * $Id: one.css,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: one.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/css/two.css b/binsrc/samples/webapp/eNews/css/two.css
index cd1fbf3..1016456 100644
--- a/binsrc/samples/webapp/eNews/css/two.css
+++ b/binsrc/samples/webapp/eNews/css/two.css
@@ -1,10 +1,10 @@
/*
- * $Id: two.css,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: two.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/dhtml.js b/binsrc/samples/webapp/eNews/dhtml.js
index e92290c..df0c912 100644
--- a/binsrc/samples/webapp/eNews/dhtml.js
+++ b/binsrc/samples/webapp/eNews/dhtml.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/eNews.sql b/binsrc/samples/webapp/eNews/eNews.sql
index 3d55ca1..57d98c4 100644
--- a/binsrc/samples/webapp/eNews/eNews.sql
+++ b/binsrc/samples/webapp/eNews/eNews.sql
@@ -1,10 +1,10 @@
--
--- $Id: eNews.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: eNews.sql,v 1.2 2006/08/16 07:58:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/eNews_vad.sql b/binsrc/samples/webapp/eNews/eNews_vad.sql
index 02d7259..4107bb6 100644
--- a/binsrc/samples/webapp/eNews/eNews_vad.sql
+++ b/binsrc/samples/webapp/eNews/eNews_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: eNews_vad.sql,v 1.1.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: eNews_vad.sql,v 1.1 2007/09/20 12:09:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/newslogin.vsp b/binsrc/samples/webapp/eNews/newslogin.vsp
index 71f572f..eaf2090 100644
--- a/binsrc/samples/webapp/eNews/newslogin.vsp
+++ b/binsrc/samples/webapp/eNews/newslogin.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: newslogin.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: newslogin.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/newsmenu.vsp b/binsrc/samples/webapp/eNews/newsmenu.vsp
index bc2ec59..43e5207 100644
--- a/binsrc/samples/webapp/eNews/newsmenu.vsp
+++ b/binsrc/samples/webapp/eNews/newsmenu.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: newsmenu.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: newsmenu.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/newsregistration.vsp b/binsrc/samples/webapp/eNews/newsregistration.vsp
index 6cfe6bc..53c8cbe 100644
--- a/binsrc/samples/webapp/eNews/newsregistration.vsp
+++ b/binsrc/samples/webapp/eNews/newsregistration.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: newsregistration.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: newsregistration.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/newsview.vsp b/binsrc/samples/webapp/eNews/newsview.vsp
index ee30780..7ad7356 100644
--- a/binsrc/samples/webapp/eNews/newsview.vsp
+++ b/binsrc/samples/webapp/eNews/newsview.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: newsview.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: newsview.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/newswatch.vsp b/binsrc/samples/webapp/eNews/newswatch.vsp
index e3bedd9..d69bbed 100644
--- a/binsrc/samples/webapp/eNews/newswatch.vsp
+++ b/binsrc/samples/webapp/eNews/newswatch.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: newswatch.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: newswatch.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/noblankscroll.xsl b/binsrc/samples/webapp/eNews/noblankscroll.xsl
index 45335cb..7a2d97c 100644
--- a/binsrc/samples/webapp/eNews/noblankscroll.xsl
+++ b/binsrc/samples/webapp/eNews/noblankscroll.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: noblankscroll.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: noblankscroll.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/block.xsl b/binsrc/samples/webapp/eNews/stylesheets/block.xsl
index f16c923..c3d1474 100644
--- a/binsrc/samples/webapp/eNews/stylesheets/block.xsl
+++ b/binsrc/samples/webapp/eNews/stylesheets/block.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: block.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: block.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/grid.xsl b/binsrc/samples/webapp/eNews/stylesheets/grid.xsl
index 9b6b817..1b6401f 100644
--- a/binsrc/samples/webapp/eNews/stylesheets/grid.xsl
+++ b/binsrc/samples/webapp/eNews/stylesheets/grid.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: grid.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: grid.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl
index dfa430c..b9282ad 100644
--- a/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl
+++ b/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: multi-scroll.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: multi-scroll.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl
index 53ef445..25f82fe 100644
--- a/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl
+++ b/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: scroll.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: scroll.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl
index 60a95f6..bd1c87c 100644
--- a/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl
+++ b/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: xscroll.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: xscroll.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/confirm.vsp b/binsrc/samples/webapp/forums/confirm.vsp
index 887cddf..11de3b5 100644
--- a/binsrc/samples/webapp/forums/confirm.vsp
+++ b/binsrc/samples/webapp/forums/confirm.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: confirm.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: confirm.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/def.sql b/binsrc/samples/webapp/forums/def.sql
index be6ecd0..0894f2e 100644
--- a/binsrc/samples/webapp/forums/def.sql
+++ b/binsrc/samples/webapp/forums/def.sql
@@ -1,10 +1,10 @@
--
--- $Id: def.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: def.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/def_vad.sql b/binsrc/samples/webapp/forums/def_vad.sql
index d5880fa..48be6dc 100644
--- a/binsrc/samples/webapp/forums/def_vad.sql
+++ b/binsrc/samples/webapp/forums/def_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: def_vad.sql,v 1.1.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: def_vad.sql,v 1.1 2007/09/20 12:09:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/error.vsp b/binsrc/samples/webapp/forums/error.vsp
index a06f7a6..acdebea 100644
--- a/binsrc/samples/webapp/forums/error.vsp
+++ b/binsrc/samples/webapp/forums/error.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: error.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: error.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/forum.vsp b/binsrc/samples/webapp/forums/forum.vsp
index c8caf89..db88029 100644
--- a/binsrc/samples/webapp/forums/forum.vsp
+++ b/binsrc/samples/webapp/forums/forum.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: forum.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: forum.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/func.sql b/binsrc/samples/webapp/forums/func.sql
index b885f2c..e50e929 100644
--- a/binsrc/samples/webapp/forums/func.sql
+++ b/binsrc/samples/webapp/forums/func.sql
@@ -1,10 +1,10 @@
--
--- $Id: func.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: func.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/func_vad.sql b/binsrc/samples/webapp/forums/func_vad.sql
index 4567f78..87cb35e 100644
--- a/binsrc/samples/webapp/forums/func_vad.sql
+++ b/binsrc/samples/webapp/forums/func_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: func_vad.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: func_vad.sql,v 1.2 2007/11/29 15:05:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/home.vsp b/binsrc/samples/webapp/forums/home.vsp
index ad11e0b..a374ff2 100644
--- a/binsrc/samples/webapp/forums/home.vsp
+++ b/binsrc/samples/webapp/forums/home.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: home.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: home.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/login.vsp b/binsrc/samples/webapp/forums/login.vsp
index 436edff..1cabbc6 100644
--- a/binsrc/samples/webapp/forums/login.vsp
+++ b/binsrc/samples/webapp/forums/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/post_messages.vsp b/binsrc/samples/webapp/forums/post_messages.vsp
index 314005d..4c50040 100644
--- a/binsrc/samples/webapp/forums/post_messages.vsp
+++ b/binsrc/samples/webapp/forums/post_messages.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: post_messages.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: post_messages.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/registr.vsp b/binsrc/samples/webapp/forums/registr.vsp
index 9a26752..13f5813 100644
--- a/binsrc/samples/webapp/forums/registr.vsp
+++ b/binsrc/samples/webapp/forums/registr.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: registr.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: registr.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/search.vsp b/binsrc/samples/webapp/forums/search.vsp
index 965cf43..2529ba4 100644
--- a/binsrc/samples/webapp/forums/search.vsp
+++ b/binsrc/samples/webapp/forums/search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: search.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: search.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/subforums.vsp b/binsrc/samples/webapp/forums/subforums.vsp
index cdcf2ae..83f3238 100644
--- a/binsrc/samples/webapp/forums/subforums.vsp
+++ b/binsrc/samples/webapp/forums/subforums.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: subforums.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: subforums.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/thread.vsp b/binsrc/samples/webapp/forums/thread.vsp
index a4a7903..0ed1294 100644
--- a/binsrc/samples/webapp/forums/thread.vsp
+++ b/binsrc/samples/webapp/forums/thread.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: thread.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: thread.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl b/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl
index 95755af..4545b87 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: confirm.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: confirm.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/error.xsl b/binsrc/samples/webapp/forums/xslt/forums/error.xsl
index 526b6d9..b312431 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/error.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/error.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: error.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: error.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/forum.xsl b/binsrc/samples/webapp/forums/xslt/forums/forum.xsl
index 7151227..145d910 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/forum.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/forum.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: forum.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: forum.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/home.xsl b/binsrc/samples/webapp/forums/xslt/forums/home.xsl
index aec5389..26839e0 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/home.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/home.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: home.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: home.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/login.xsl b/binsrc/samples/webapp/forums/xslt/forums/login.xsl
index f91e408..31d271c 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/login.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/login.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: login.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl b/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl
index 6df4252..c2ae173 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: navigations.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: navigations.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl b/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl
index 19f5f34..0bd6141 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: post_messages.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: post_messages.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/registr.xsl b/binsrc/samples/webapp/forums/xslt/forums/registr.xsl
index 3b3f25e..ab387e0 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/registr.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/registr.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: registr.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: registr.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/search.xsl b/binsrc/samples/webapp/forums/xslt/forums/search.xsl
index dfb7042..37656a9 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/search.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/search.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: search.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl b/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl
index 1f5ddc3..d31cbed 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: subforums.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: subforums.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/webapp/forums/xslt/forums/thread.xsl b/binsrc/samples/webapp/forums/xslt/forums/thread.xsl
index 239082a..3cd744a 100644
--- a/binsrc/samples/webapp/forums/xslt/forums/thread.xsl
+++ b/binsrc/samples/webapp/forums/xslt/forums/thread.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: thread.xsl,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ - $Id: thread.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/Makefile.am b/binsrc/samples/xpath/Makefile.am
index 07a3f16..4658880 100644
--- a/binsrc/samples/xpath/Makefile.am
+++ b/binsrc/samples/xpath/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/Makefile.in b/binsrc/samples/xpath/Makefile.in
index 8c944de..ddd7a62 100644
--- a/binsrc/samples/xpath/Makefile.in
+++ b/binsrc/samples/xpath/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/xpath/R-tables.sql b/binsrc/samples/xpath/R-tables.sql
index 904ef8d..1bd7eb1 100644
--- a/binsrc/samples/xpath/R-tables.sql
+++ b/binsrc/samples/xpath/R-tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: R-tables.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: R-tables.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/border.vsp b/binsrc/samples/xpath/border.vsp
index b5a6e35..c3547a1 100644
--- a/binsrc/samples/xpath/border.vsp
+++ b/binsrc/samples/xpath/border.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: border.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: border.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/case.vsp b/binsrc/samples/xpath/case.vsp
index b1f0295..715286e 100644
--- a/binsrc/samples/xpath/case.vsp
+++ b/binsrc/samples/xpath/case.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: case.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: case.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/demo.vsp b/binsrc/samples/xpath/demo.vsp
index 5fd06a9..995e839 100644
--- a/binsrc/samples/xpath/demo.vsp
+++ b/binsrc/samples/xpath/demo.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: demo.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: demo.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/desk.sql b/binsrc/samples/xpath/desk.sql
index e008c1a..ee7e4f5 100644
--- a/binsrc/samples/xpath/desk.sql
+++ b/binsrc/samples/xpath/desk.sql
@@ -1,10 +1,10 @@
--
--- $Id: desk.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: desk.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/desk.vsp b/binsrc/samples/xpath/desk.vsp
index b0165e8..a497c3d 100644
--- a/binsrc/samples/xpath/desk.vsp
+++ b/binsrc/samples/xpath/desk.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: desk.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: desk.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/deskall.vsp b/binsrc/samples/xpath/deskall.vsp
index 1c2257b..2a8b2a8 100644
--- a/binsrc/samples/xpath/deskall.vsp
+++ b/binsrc/samples/xpath/deskall.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskall.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: deskall.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/deskdata.vsp b/binsrc/samples/xpath/deskdata.vsp
index a1d0bb2..be0817b 100644
--- a/binsrc/samples/xpath/deskdata.vsp
+++ b/binsrc/samples/xpath/deskdata.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskdata.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: deskdata.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/deskhome.vsp b/binsrc/samples/xpath/deskhome.vsp
index 80c94cb..995c342 100644
--- a/binsrc/samples/xpath/deskhome.vsp
+++ b/binsrc/samples/xpath/deskhome.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskhome.vsp,v 1.3.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: deskhome.vsp,v 1.3 2007/01/22 13:21:44 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/deskmeta.vsp b/binsrc/samples/xpath/deskmeta.vsp
index 7e1ac63..7065c4f 100644
--- a/binsrc/samples/xpath/deskmeta.vsp
+++ b/binsrc/samples/xpath/deskmeta.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskmeta.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: deskmeta.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/faq.vsp b/binsrc/samples/xpath/faq.vsp
index 2161b48..37d6de0 100644
--- a/binsrc/samples/xpath/faq.vsp
+++ b/binsrc/samples/xpath/faq.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: faq.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: faq.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/files2dav.sh b/binsrc/samples/xpath/files2dav.sh
index 8424541..be285d7 100755
--- a/binsrc/samples/xpath/files2dav.sh
+++ b/binsrc/samples/xpath/files2dav.sh
@@ -2,14 +2,14 @@
#
# mkdemo.sh
#
-# $Id: files2dav.sh,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+# $Id: files2dav.sh,v 1.2 2009/02/12 15:15:13 source Exp $
#
# Creates a demo database
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/header.vsp b/binsrc/samples/xpath/header.vsp
index 5be7f5e..abe5f0d 100644
--- a/binsrc/samples/xpath/header.vsp
+++ b/binsrc/samples/xpath/header.vsp
@@ -3,7 +3,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -22,7 +22,7 @@
declare _version_id any;
-- 020801
- _version_id := split_and_decode('$Id: header.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $', 0, '\x0\x0\x20');
+ _version_id := split_and_decode('$Id: header.vsp,v 1.2 2006/08/15 19:30:33 source Exp $', 0, '\x0\x0\x20');
?>
<HTML>
<BODY TEXT="#FFFFFF" BGCOLOR="#000066" TOPMARGIN=0>
diff --git a/binsrc/samples/xpath/list.vsp b/binsrc/samples/xpath/list.vsp
index 5efe30b..6ff1cb9 100644
--- a/binsrc/samples/xpath/list.vsp
+++ b/binsrc/samples/xpath/list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: list.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: list.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/main.vsp b/binsrc/samples/xpath/main.vsp
index 0d88b15..8eeb306 100644
--- a/binsrc/samples/xpath/main.vsp
+++ b/binsrc/samples/xpath/main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: main.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: main.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/metadata.sql b/binsrc/samples/xpath/metadata.sql
index 04299a9..c1c2a73 100644
--- a/binsrc/samples/xpath/metadata.sql
+++ b/binsrc/samples/xpath/metadata.sql
@@ -1,10 +1,10 @@
--
--- $Id: metadata.sql,v 1.3.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: metadata.sql,v 1.3 2007/01/22 13:21:44 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/postsetup.sql b/binsrc/samples/xpath/postsetup.sql
index c397ab2..8888599 100644
--- a/binsrc/samples/xpath/postsetup.sql
+++ b/binsrc/samples/xpath/postsetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: postsetup.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: postsetup.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/presetup.sql b/binsrc/samples/xpath/presetup.sql
index 158820b..72f4a48 100644
--- a/binsrc/samples/xpath/presetup.sql
+++ b/binsrc/samples/xpath/presetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: presetup.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: presetup.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xpath/sample.sql b/binsrc/samples/xpath/sample.sql
index 788b54b..d413e83 100644
--- a/binsrc/samples/xpath/sample.sql
+++ b/binsrc/samples/xpath/sample.sql
@@ -1,10 +1,10 @@
--
--- $Id: sample.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: sample.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/Makefile.am b/binsrc/samples/xquery/Makefile.am
index a79a4a3..ede683c 100644
--- a/binsrc/samples/xquery/Makefile.am
+++ b/binsrc/samples/xquery/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/Makefile.in b/binsrc/samples/xquery/Makefile.in
index 71c66fc..d8d7e55 100644
--- a/binsrc/samples/xquery/Makefile.in
+++ b/binsrc/samples/xquery/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/samples/xquery/R-tables.sql b/binsrc/samples/xquery/R-tables.sql
index fa8e2f7..4495827 100644
--- a/binsrc/samples/xquery/R-tables.sql
+++ b/binsrc/samples/xquery/R-tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: R-tables.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: R-tables.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/border.vsp b/binsrc/samples/xquery/border.vsp
index b5a6e35..c3547a1 100644
--- a/binsrc/samples/xquery/border.vsp
+++ b/binsrc/samples/xquery/border.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: border.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: border.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/case.vsp b/binsrc/samples/xquery/case.vsp
index 00aee24..e0db98b 100644
--- a/binsrc/samples/xquery/case.vsp
+++ b/binsrc/samples/xquery/case.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: case.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: case.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/demo.vsp b/binsrc/samples/xquery/demo.vsp
index d10648e..e8af0ae 100644
--- a/binsrc/samples/xquery/demo.vsp
+++ b/binsrc/samples/xquery/demo.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: demo.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: demo.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/desk.sql b/binsrc/samples/xquery/desk.sql
index b8cfda2..e57a290 100644
--- a/binsrc/samples/xquery/desk.sql
+++ b/binsrc/samples/xquery/desk.sql
@@ -1,10 +1,10 @@
--
--- $Id: desk.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: desk.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/desk.vsp b/binsrc/samples/xquery/desk.vsp
index 35dc4fd..2eb31bf 100644
--- a/binsrc/samples/xquery/desk.vsp
+++ b/binsrc/samples/xquery/desk.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: desk.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: desk.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/deskall.vsp b/binsrc/samples/xquery/deskall.vsp
index 8f36d5b..64dbe4f 100644
--- a/binsrc/samples/xquery/deskall.vsp
+++ b/binsrc/samples/xquery/deskall.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskall.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: deskall.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/deskdata.vsp b/binsrc/samples/xquery/deskdata.vsp
index 3279e51..2731c73 100644
--- a/binsrc/samples/xquery/deskdata.vsp
+++ b/binsrc/samples/xquery/deskdata.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskdata.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: deskdata.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/deskhome.vsp b/binsrc/samples/xquery/deskhome.vsp
index 0f7f4aa..9ab4989 100644
--- a/binsrc/samples/xquery/deskhome.vsp
+++ b/binsrc/samples/xquery/deskhome.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskhome.vsp,v 1.3.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: deskhome.vsp,v 1.3 2007/01/22 13:44:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/deskmeta.vsp b/binsrc/samples/xquery/deskmeta.vsp
index f18de82..f02c315 100644
--- a/binsrc/samples/xquery/deskmeta.vsp
+++ b/binsrc/samples/xquery/deskmeta.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deskmeta.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: deskmeta.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/faq.vsp b/binsrc/samples/xquery/faq.vsp
index 2161b48..37d6de0 100644
--- a/binsrc/samples/xquery/faq.vsp
+++ b/binsrc/samples/xquery/faq.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: faq.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: faq.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/files2dav.sh b/binsrc/samples/xquery/files2dav.sh
index 01e87ea..be5b658 100755
--- a/binsrc/samples/xquery/files2dav.sh
+++ b/binsrc/samples/xquery/files2dav.sh
@@ -2,14 +2,14 @@
#
#
#
-# $Id: files2dav.sh,v 1.3.2.1 2012/03/08 12:55:05 source Exp $
+# $Id: files2dav.sh,v 1.3 2009/04/14 12:16:49 source Exp $
#
#
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/header.vsp b/binsrc/samples/xquery/header.vsp
index 1f6595b..68c0767 100644
--- a/binsrc/samples/xquery/header.vsp
+++ b/binsrc/samples/xquery/header.vsp
@@ -3,7 +3,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -22,7 +22,7 @@
declare _version_id any;
-- 020801
- _version_id := split_and_decode('$Id: header.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $', 0, '\x0\x0\x20');
+ _version_id := split_and_decode('$Id: header.vsp,v 1.2 2006/08/15 19:30:33 source Exp $', 0, '\x0\x0\x20');
?>
<HTML>
<BODY TEXT="#FFFFFF" BGCOLOR="#000066" TOPMARGIN=0>
diff --git a/binsrc/samples/xquery/list.vsp b/binsrc/samples/xquery/list.vsp
index fc04d3a..8aab4dc 100644
--- a/binsrc/samples/xquery/list.vsp
+++ b/binsrc/samples/xquery/list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: list.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: list.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/main.vsp b/binsrc/samples/xquery/main.vsp
index b9ce29b..c3c6f0a 100644
--- a/binsrc/samples/xquery/main.vsp
+++ b/binsrc/samples/xquery/main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: main.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: main.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/metadata.sql b/binsrc/samples/xquery/metadata.sql
index 7cca89b..9cedca1 100644
--- a/binsrc/samples/xquery/metadata.sql
+++ b/binsrc/samples/xquery/metadata.sql
@@ -1,10 +1,10 @@
--
--- $Id: metadata.sql,v 1.3.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: metadata.sql,v 1.3 2007/01/22 13:44:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/postsetup.sql b/binsrc/samples/xquery/postsetup.sql
index 0b8ea63..af6ba8d 100644
--- a/binsrc/samples/xquery/postsetup.sql
+++ b/binsrc/samples/xquery/postsetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: postsetup.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: postsetup.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/presetup.sql b/binsrc/samples/xquery/presetup.sql
index f6d525a..e062594 100644
--- a/binsrc/samples/xquery/presetup.sql
+++ b/binsrc/samples/xquery/presetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: presetup.sql,v 1.3.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: presetup.sql,v 1.3 2008/04/28 12:05:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/search.sql b/binsrc/samples/xquery/search.sql
index 45dc92c..8e2af6c 100644
--- a/binsrc/samples/xquery/search.sql
+++ b/binsrc/samples/xquery/search.sql
@@ -1,10 +1,10 @@
--
--- $Id: search.sql,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: search.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/search.vsp b/binsrc/samples/xquery/search.vsp
index d7ce285..24aa99e 100644
--- a/binsrc/samples/xquery/search.vsp
+++ b/binsrc/samples/xquery/search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: search.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: search.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/setup.isql b/binsrc/samples/xquery/setup.isql
index b0d771c..aaac284 100644
--- a/binsrc/samples/xquery/setup.isql
+++ b/binsrc/samples/xquery/setup.isql
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/samples/xquery/text.vsp b/binsrc/samples/xquery/text.vsp
index a138410..51c3d52 100644
--- a/binsrc/samples/xquery/text.vsp
+++ b/binsrc/samples/xquery/text.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: text.vsp,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+-- $Id: text.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/sesame/Makefile.am b/binsrc/sesame/Makefile.am
index 1a448d5..abfbc57 100644
--- a/binsrc/sesame/Makefile.am
+++ b/binsrc/sesame/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame/Makefile.in b/binsrc/sesame/Makefile.in
index 35a88df..596f264 100644
--- a/binsrc/sesame/Makefile.in
+++ b/binsrc/sesame/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2007 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java
index d7448b2..31a5cd4 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoAdminListener.java,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoAdminListener.java,v 1.2 2007/11/21 11:10:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java
index 54ffdd4..dc84c1e 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoExample1.java,v 1.3.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoExample1.java,v 1.3 2007/11/23 21:47:41 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java
index 5a65ed1..62a53e5 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoExample2.java,v 1.3.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoExample2.java,v 1.3 2007/11/23 21:47:41 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java
index 0684bab..8b7762e 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoExample3.java,v 1.1.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoExample3.java,v 1.1 2008/04/28 12:16:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2008 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java
index 7b38b96..da7145f 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoGraphQueryListener.java,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoGraphQueryListener.java,v 1.2 2007/11/21 11:10:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java
index fe4c94a..0c83189 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoQueryListener.java,v 1.2.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoQueryListener.java,v 1.2 2007/11/21 11:10:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java
index ecb551f..0055228 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoRepository.java,v 1.5.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoRepository.java,v 1.5 2008/04/28 12:16:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java b/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java
index fc4c5b1..d2a6459 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoSchemaRepository.java,v 1.4.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoSchemaRepository.java,v 1.4 2007/11/27 11:21:19 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java b/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java
index 6eb7ceb..9b572b1 100644
--- a/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java
+++ b/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoStatementIterator.java,v 1.1.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoStatementIterator.java,v 1.1 2007/11/28 09:54:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame2/Makefile.am b/binsrc/sesame2/Makefile.am
index c3a5736..94c7f19 100644
--- a/binsrc/sesame2/Makefile.am
+++ b/binsrc/sesame2/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
diff --git a/binsrc/sesame2/Makefile.in b/binsrc/sesame2/Makefile.in
index 5c6e082..e00957d 100644
--- a/binsrc/sesame2/Makefile.in
+++ b/binsrc/sesame2/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/sesame2/virtuoso_driver/Version.java b/binsrc/sesame2/virtuoso_driver/Version.java
index ea94bfc..c65a74d 100644
--- a/binsrc/sesame2/virtuoso_driver/Version.java
+++ b/binsrc/sesame2/virtuoso_driver/Version.java
@@ -1,10 +1,10 @@
/*
- * $Id: Version.java,v 1.1.4.8 2012/03/15 12:56:53 source Exp $
+ * $Id: Version.java,v 1.1.4.6 2011/10/13 22:49:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -29,7 +29,7 @@ public class Version {
protected static final String DRV_VER = "2.5.1";
// The major and minor version number
- protected static final String build_id = "1.6";
+ protected static final String build_id = "1.5";
public static void main(String args[])
{
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java
index 903cc0e..41bbfea 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoBooleanQuery.java,v 1.3.2.3 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoBooleanQuery.java,v 1.3.2.2 2010/02/25 20:23:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java
index 1aaf644..77d4e28 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoGraphQuery.java,v 1.3.2.3 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoGraphQuery.java,v 1.3.2.2 2010/02/25 20:23:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java b/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java
index bcbac1d..1ea1c3e 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoOperation.java,v 1.1.4.3 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoOperation.java,v 1.1.4.2 2011/10/13 22:49:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2011 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java
index 4472521..3914f4e 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoQuery.java,v 1.3.2.5 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoQuery.java,v 1.3.2.4 2011/10/13 22:49:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java
index dd6caa2..c59aa8a 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoRepository.java,v 1.9.2.10 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoRepository.java,v 1.9.2.9 2011/05/17 13:56:31 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java
index 372a92b..04f8478 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java
@@ -1,229 +1,229 @@
-/*
- * $Id: VirtuosoRepositoryConfig.java,v 1.1.2.4 2012/03/08 16:22:50 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-package virtuoso.sesame2.driver.config;
-
-import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.PASSWORD;
-import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.HOSTLIST;
-import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.USERNAME;
-import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.DEFGRAPH;
-import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.USELAZYADD;
-import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.FETCHSIZE;
-import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.ROUNDROBIN;
-import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.RULESET;
-
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.util.GraphUtil;
-import org.openrdf.model.util.GraphUtilException;
-import org.openrdf.repository.config.RepositoryConfigException;
-import org.openrdf.repository.config.RepositoryImplConfigBase;
-
-/**
- */
-public class VirtuosoRepositoryConfig extends RepositoryImplConfigBase {
-
- private String hostlist;
-
- private String username;
-
- private String password;
-
- private String defGraph;
-
- private boolean useLazyAdd;
-
- private int fetchSize = 200;
-
- private boolean roundRobin;
-
- private String ruleSet;
-
- public VirtuosoRepositoryConfig() {
- super(VirtuosoRepositoryFactory.REPOSITORY_TYPE);
- }
-
- public VirtuosoRepositoryConfig(String hostlist) {
- this();
- setHostList(hostlist);
- }
-
- public String getHostList() {
- return hostlist;
- }
-
- public void setHostList(String hostlist) {
- this.hostlist = hostlist;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
-
- public String getDefGraph() {
- return defGraph;
- }
-
- public void setDefGraph(String defGraph) {
- this.defGraph = defGraph;
- }
-
-
- public boolean getUseLazyAdd() {
- return useLazyAdd;
- }
-
- public void setUseLazyAdd(boolean useLazyAdd) {
- this.useLazyAdd = useLazyAdd;
- }
-
- public boolean getRoundRobin() {
- return roundRobin;
- }
-
- public void setRoundRobin(boolean roundRobin) {
- this.roundRobin = roundRobin;
- }
-
-
- public int getFetchSize() {
- return fetchSize;
- }
-
- public void setFetchSize(int fetchSize) {
- this.fetchSize = fetchSize;
- }
-
-
- public String getRuleSet() {
- return ruleSet;
- }
-
- public void setRuleSet(String ruleSet) {
- if (ruleSet!=null && ruleSet.equals("null"))
- this.ruleSet = null;
- else
- this.ruleSet = ruleSet;
- }
-
- @Override
- public void validate()
- throws RepositoryConfigException
- {
- super.validate();
- if (hostlist == null) {
- throw new RepositoryConfigException("No HostList specified for Virtuoso repository");
- }
- }
-
- @Override
- public Resource export(Graph graph) {
- Resource implNode = super.export(graph);
-
- if (hostlist != null) {
- graph.add(implNode, HOSTLIST, graph.getValueFactory().createLiteral(hostlist));
- }
- if (username != null) {
- graph.add(implNode, USERNAME, graph.getValueFactory().createLiteral(username));
- }
- if (password != null) {
- graph.add(implNode, PASSWORD, graph.getValueFactory().createLiteral(password));
- }
-
- if (defGraph != null) {
- graph.add(implNode, DEFGRAPH, graph.getValueFactory().createLiteral(defGraph));
- }
-
- if (ruleSet != null && ruleSet.length() > 0 && !ruleSet.equals("null")) {
- graph.add(implNode, RULESET, graph.getValueFactory().createLiteral(ruleSet));
- }
-
- graph.add(implNode, USELAZYADD, graph.getValueFactory().createLiteral(new Boolean(useLazyAdd).toString()));
-
- graph.add(implNode, ROUNDROBIN, graph.getValueFactory().createLiteral(new Boolean(roundRobin).toString()));
-
- graph.add(implNode, FETCHSIZE, graph.getValueFactory().createLiteral(Integer.toString(fetchSize,10)));
-
- return implNode;
- }
-
- @Override
- public void parse(Graph graph, Resource implNode)
- throws RepositoryConfigException
- {
- super.parse(graph, implNode);
-
- try {
- Literal hlist = GraphUtil.getOptionalObjectLiteral(graph, implNode, HOSTLIST);
- if (hlist != null) {
- setHostList(hlist.getLabel());
- }
- Literal username = GraphUtil.getOptionalObjectLiteral(graph, implNode, USERNAME);
- if (username != null) {
- setUsername(username.getLabel());
- }
- Literal password = GraphUtil.getOptionalObjectLiteral(graph, implNode, PASSWORD);
- if (password != null) {
- setPassword(password.getLabel());
- }
- Literal defgraph = GraphUtil.getOptionalObjectLiteral(graph, implNode, DEFGRAPH);
- if (defgraph != null) {
- setDefGraph(defgraph.getLabel());
- }
- Literal uselazyadd = GraphUtil.getOptionalObjectLiteral(graph, implNode, USELAZYADD);
- if (uselazyadd != null) {
- setUseLazyAdd(Boolean.getBoolean(uselazyadd.getLabel()));
- }
- Literal roundrobin = GraphUtil.getOptionalObjectLiteral(graph, implNode, ROUNDROBIN);
- if (roundrobin != null) {
- setRoundRobin(Boolean.getBoolean(roundrobin.getLabel()));
- }
- Literal fetchsize = GraphUtil.getOptionalObjectLiteral(graph, implNode, FETCHSIZE);
- if (fetchsize != null) {
- setFetchSize(Integer.parseInt(fetchsize.getLabel()));
- }
- Literal ruleset = GraphUtil.getOptionalObjectLiteral(graph, implNode, RULESET);
- if (ruleset != null) {
- setRuleSet(ruleset.getLabel());
- }
- }
- catch (GraphUtilException e) {
- throw new RepositoryConfigException(e.getMessage(), e);
- }
- }
-}
+/*
+ * $Id: VirtuosoRepositoryConfig.java,v 1.1.2.2 2010/02/25 20:23:04 source Exp $
+ *
+ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+ * project.
+ *
+ * Copyright (C) 1998-2010 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
+ *
+ */
+
+package virtuoso.sesame2.driver.config;
+
+import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.PASSWORD;
+import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.HOSTLIST;
+import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.USERNAME;
+import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.DEFGRAPH;
+import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.USELAZYADD;
+import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.FETCHSIZE;
+import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.ROUNDROBIN;
+import static virtuoso.sesame2.driver.config.VirtuosoRepositorySchema.RULESET;
+
+import org.openrdf.model.Graph;
+import org.openrdf.model.Literal;
+import org.openrdf.model.Resource;
+import org.openrdf.model.URI;
+import org.openrdf.model.util.GraphUtil;
+import org.openrdf.model.util.GraphUtilException;
+import org.openrdf.repository.config.RepositoryConfigException;
+import org.openrdf.repository.config.RepositoryImplConfigBase;
+
+/**
+ */
+public class VirtuosoRepositoryConfig extends RepositoryImplConfigBase {
+
+ private String hostlist;
+
+ private String username;
+
+ private String password;
+
+ private String defGraph;
+
+ private boolean useLazyAdd;
+
+ private int fetchSize = 200;
+
+ private boolean roundRobin;
+
+ private String ruleSet;
+
+ public VirtuosoRepositoryConfig() {
+ super(VirtuosoRepositoryFactory.REPOSITORY_TYPE);
+ }
+
+ public VirtuosoRepositoryConfig(String hostlist) {
+ this();
+ setHostList(hostlist);
+ }
+
+ public String getHostList() {
+ return hostlist;
+ }
+
+ public void setHostList(String hostlist) {
+ this.hostlist = hostlist;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+
+ public String getDefGraph() {
+ return defGraph;
+ }
+
+ public void setDefGraph(String defGraph) {
+ this.defGraph = defGraph;
+ }
+
+
+ public boolean getUseLazyAdd() {
+ return useLazyAdd;
+ }
+
+ public void setUseLazyAdd(boolean useLazyAdd) {
+ this.useLazyAdd = useLazyAdd;
+ }
+
+ public boolean getRoundRobin() {
+ return roundRobin;
+ }
+
+ public void setRoundRobin(boolean roundRobin) {
+ this.roundRobin = roundRobin;
+ }
+
+
+ public int getFetchSize() {
+ return fetchSize;
+ }
+
+ public void setFetchSize(int fetchSize) {
+ this.fetchSize = fetchSize;
+ }
+
+
+ public String getRuleSet() {
+ return ruleSet;
+ }
+
+ public void setRuleSet(String ruleSet) {
+ if (ruleSet!=null && ruleSet.equals("null"))
+ this.ruleSet = null;
+ else
+ this.ruleSet = ruleSet;
+ }
+
+ @Override
+ public void validate()
+ throws RepositoryConfigException
+ {
+ super.validate();
+ if (hostlist == null) {
+ throw new RepositoryConfigException("No HostList specified for Virtuoso repository");
+ }
+ }
+
+ @Override
+ public Resource export(Graph graph) {
+ Resource implNode = super.export(graph);
+
+ if (hostlist != null) {
+ graph.add(implNode, HOSTLIST, graph.getValueFactory().createLiteral(hostlist));
+ }
+ if (username != null) {
+ graph.add(implNode, USERNAME, graph.getValueFactory().createLiteral(username));
+ }
+ if (password != null) {
+ graph.add(implNode, PASSWORD, graph.getValueFactory().createLiteral(password));
+ }
+
+ if (defGraph != null) {
+ graph.add(implNode, DEFGRAPH, graph.getValueFactory().createLiteral(defGraph));
+ }
+
+ if (ruleSet != null && ruleSet.length() > 0 && !ruleSet.equals("null")) {
+ graph.add(implNode, RULESET, graph.getValueFactory().createLiteral(ruleSet));
+ }
+
+ graph.add(implNode, USELAZYADD, graph.getValueFactory().createLiteral(new Boolean(useLazyAdd).toString()));
+
+ graph.add(implNode, ROUNDROBIN, graph.getValueFactory().createLiteral(new Boolean(roundRobin).toString()));
+
+ graph.add(implNode, FETCHSIZE, graph.getValueFactory().createLiteral(Integer.toString(fetchSize,10)));
+
+ return implNode;
+ }
+
+ @Override
+ public void parse(Graph graph, Resource implNode)
+ throws RepositoryConfigException
+ {
+ super.parse(graph, implNode);
+
+ try {
+ Literal hlist = GraphUtil.getOptionalObjectLiteral(graph, implNode, HOSTLIST);
+ if (hlist != null) {
+ setHostList(hlist.getLabel());
+ }
+ Literal username = GraphUtil.getOptionalObjectLiteral(graph, implNode, USERNAME);
+ if (username != null) {
+ setUsername(username.getLabel());
+ }
+ Literal password = GraphUtil.getOptionalObjectLiteral(graph, implNode, PASSWORD);
+ if (password != null) {
+ setPassword(password.getLabel());
+ }
+ Literal defgraph = GraphUtil.getOptionalObjectLiteral(graph, implNode, DEFGRAPH);
+ if (defgraph != null) {
+ setDefGraph(defgraph.getLabel());
+ }
+ Literal uselazyadd = GraphUtil.getOptionalObjectLiteral(graph, implNode, USELAZYADD);
+ if (uselazyadd != null) {
+ setUseLazyAdd(Boolean.getBoolean(uselazyadd.getLabel()));
+ }
+ Literal roundrobin = GraphUtil.getOptionalObjectLiteral(graph, implNode, ROUNDROBIN);
+ if (roundrobin != null) {
+ setRoundRobin(Boolean.getBoolean(roundrobin.getLabel()));
+ }
+ Literal fetchsize = GraphUtil.getOptionalObjectLiteral(graph, implNode, FETCHSIZE);
+ if (fetchsize != null) {
+ setFetchSize(Integer.parseInt(fetchsize.getLabel()));
+ }
+ Literal ruleset = GraphUtil.getOptionalObjectLiteral(graph, implNode, RULESET);
+ if (ruleset != null) {
+ setRuleSet(ruleset.getLabel());
+ }
+ }
+ catch (GraphUtilException e) {
+ throw new RepositoryConfigException(e.getMessage(), e);
+ }
+ }
+}
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java
index 20886da..35de3f1 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoRepositoryConnection.java,v 1.33.2.17 2012/03/15 12:56:53 source Exp $
+ * $Id: VirtuosoRepositoryConnection.java,v 1.33.2.15 2011/10/13 22:49:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -153,8 +153,8 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
private static Resource nilContext;
private Connection quadStoreConnection;
protected VirtuosoRepository repository;
- static final String S_INSERT = "sparql insert into graph iri(??) { `iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)` }";
- static final String S_DELETE = "sparql delete from graph iri(??) {`iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)`}";
+ static final String S_INSERT = "sparql define output:format '_JAVA_' insert into graph iri(??) { `iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)` }";
+ static final String S_DELETE = "sparql define output:format '_JAVA_' delete from graph iri(??) {`iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)`}";
static final int BATCH_SIZE = 5000;
private PreparedStatement psInsert;
private int psInsertCount = 0;
@@ -1807,7 +1807,7 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
verifyIsOpen();
flushDelayAdd();
stmt = createStatement();
- stmt.execute("sparql\n " + query);
+ stmt.execute("sparql\n define output:format '_JAVA_'\n " + query);
return stmt.getUpdateCount();
}
catch (SQLException e) {
@@ -1910,8 +1910,25 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
private String fixQuery(boolean isSPARUL, String query, Dataset dataset, boolean includeInferred, BindingSet bindings)
{
+ StringTokenizer tok = new StringTokenizer(query);
+ String s = "";
StringBuffer ret = new StringBuffer("sparql\n ");
+ if (!isSPARUL)
+ {
+ while(tok.hasMoreTokens()) {
+ s = tok.nextToken().toLowerCase();
+ if (s.equals("describe") || s.equals("construct") || s.equals("ask") || s.equals("select"))
+ break;
+ }
+
+ if (s.equals("describe") || s.equals("construct") || s.equals("ask"))
+ ret.append("define output:format '_JAVA_'\n ");
+
+ } else {
+ ret.append("define output:format '_JAVA_'\n ");
+ }
+
if (includeInferred && repository.ruleSet!=null && repository.ruleSet.length() > 0)
ret.append("define input:inference '"+repository.ruleSet+"'\n ");
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryFactory.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryFactory.java
index 53f4e95..9ae5ddb 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryFactory.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryFactory.java
@@ -1,79 +1,79 @@
-/*
- * $Id: VirtuosoRepositoryFactory.java,v 1.1.2.4 2012/03/08 16:22:50 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-package virtuoso.sesame2.driver.config;
-
-
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.config.RepositoryConfigException;
-import org.openrdf.repository.config.RepositoryFactory;
-import org.openrdf.repository.config.RepositoryImplConfig;
-import virtuoso.sesame2.driver.VirtuosoRepository;
-
-/**
- * A {@link RepositoryFactory} that creates {@link VirtuosoRepository}s based on
- * RDF configuration data.
- */
-public class VirtuosoRepositoryFactory implements RepositoryFactory {
-
- /**
- * The type of repositories that are created by this factory.
- *
- * @see RepositoryFactory#getRepositoryType()
- */
- public static final String REPOSITORY_TYPE = "openrdf:VirtuosoRepository";
-
- /**
- * Returns the repository's type: <tt>openrdf:VirtuosoRepository</tt>.
- */
- public String getRepositoryType() {
- return REPOSITORY_TYPE;
- }
-
- public RepositoryImplConfig getConfig() {
- return new VirtuosoRepositoryConfig();
- }
-
- public Repository getRepository(RepositoryImplConfig config)
- throws RepositoryConfigException
- {
- VirtuosoRepository result = null;
-
- if (config instanceof VirtuosoRepositoryConfig) {
- VirtuosoRepositoryConfig vConfig = (VirtuosoRepositoryConfig)config;
- result = new VirtuosoRepository(vConfig.getHostList(),
- vConfig.getUsername(),
- vConfig.getPassword(),
- vConfig.getDefGraph(),
- vConfig.getUseLazyAdd());
- result.setFetchSize(vConfig.getFetchSize());
- result.setRoundrobin(vConfig.getRoundRobin());
- result.setFetchSize(vConfig.getFetchSize());
- result.setRuleSet(vConfig.getRuleSet());
- }
- else {
- throw new RepositoryConfigException("Invalid configuration class: " + config.getClass());
- }
- return result;
- }
-}
+/*
+ * $Id: VirtuosoRepositoryFactory.java,v 1.1.2.2 2010/02/25 20:23:05 source Exp $
+ *
+ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+ * project.
+ *
+ * Copyright (C) 1998-2010 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
+ *
+ */
+
+package virtuoso.sesame2.driver.config;
+
+
+import org.openrdf.repository.Repository;
+import org.openrdf.repository.config.RepositoryConfigException;
+import org.openrdf.repository.config.RepositoryFactory;
+import org.openrdf.repository.config.RepositoryImplConfig;
+import virtuoso.sesame2.driver.VirtuosoRepository;
+
+/**
+ * A {@link RepositoryFactory} that creates {@link VirtuosoRepository}s based on
+ * RDF configuration data.
+ */
+public class VirtuosoRepositoryFactory implements RepositoryFactory {
+
+ /**
+ * The type of repositories that are created by this factory.
+ *
+ * @see RepositoryFactory#getRepositoryType()
+ */
+ public static final String REPOSITORY_TYPE = "openrdf:VirtuosoRepository";
+
+ /**
+ * Returns the repository's type: <tt>openrdf:VirtuosoRepository</tt>.
+ */
+ public String getRepositoryType() {
+ return REPOSITORY_TYPE;
+ }
+
+ public RepositoryImplConfig getConfig() {
+ return new VirtuosoRepositoryConfig();
+ }
+
+ public Repository getRepository(RepositoryImplConfig config)
+ throws RepositoryConfigException
+ {
+ VirtuosoRepository result = null;
+
+ if (config instanceof VirtuosoRepositoryConfig) {
+ VirtuosoRepositoryConfig vConfig = (VirtuosoRepositoryConfig)config;
+ result = new VirtuosoRepository(vConfig.getHostList(),
+ vConfig.getUsername(),
+ vConfig.getPassword(),
+ vConfig.getDefGraph(),
+ vConfig.getUseLazyAdd());
+ result.setFetchSize(vConfig.getFetchSize());
+ result.setRoundrobin(vConfig.getRoundRobin());
+ result.setFetchSize(vConfig.getFetchSize());
+ result.setRuleSet(vConfig.getRuleSet());
+ }
+ else {
+ throw new RepositoryConfigException("Invalid configuration class: " + config.getClass());
+ }
+ return result;
+ }
+}
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java
index 00f94d1..fc5ef9e 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java
@@ -1,78 +1,78 @@
-/*
- * $Id: VirtuosoRepositorySchema.java,v 1.1.2.4 2012/03/08 16:22:50 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-package virtuoso.sesame2.driver.config;
-
-
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import virtuoso.sesame2.driver.VirtuosoRepository;
-
-/**
- * Defines constants for the VirtuosoRepository schema which is used by
- * {@link VirtuosoRepositoryFactory}s to initialize {@link VirtuosoRepository}s.
- *
- */
-public class VirtuosoRepositorySchema {
-
- public static final String NAMESPACE = "http://www.openrdf.org/config/repository/virtuoso#";
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#hostList</tt> */
- public final static URI HOSTLIST;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#username</tt> */
- public final static URI USERNAME;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#password</tt> */
- public final static URI PASSWORD;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#defGraph</tt> */
- public final static URI DEFGRAPH;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#useLazyAdd</tt> */
- public final static URI USELAZYADD;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#fetchSize</tt> */
- public final static URI FETCHSIZE;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#roundRobin</tt> */
- public final static URI ROUNDROBIN;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#ruleSet</tt> */
- public final static URI RULESET;
-
-
- static {
- ValueFactory factory = ValueFactoryImpl.getInstance();
- HOSTLIST = factory.createURI(NAMESPACE, "hostList");
- USERNAME = factory.createURI(NAMESPACE, "username");
- PASSWORD = factory.createURI(NAMESPACE, "password");
- DEFGRAPH = factory.createURI(NAMESPACE, "defGraph");
- USELAZYADD = factory.createURI(NAMESPACE, "useLazyAdd");
- FETCHSIZE = factory.createURI(NAMESPACE, "fetchSize");
- ROUNDROBIN = factory.createURI(NAMESPACE, "roundRobin");
- RULESET = factory.createURI(NAMESPACE, "ruleSet");
- }
-}
-
+/*
+ * $Id: VirtuosoRepositorySchema.java,v 1.1.2.2 2010/02/25 20:23:05 source Exp $
+ *
+ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+ * project.
+ *
+ * Copyright (C) 1998-2010 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
+ *
+ */
+
+package virtuoso.sesame2.driver.config;
+
+
+import org.openrdf.model.URI;
+import org.openrdf.model.ValueFactory;
+import org.openrdf.model.impl.ValueFactoryImpl;
+import virtuoso.sesame2.driver.VirtuosoRepository;
+
+/**
+ * Defines constants for the VirtuosoRepository schema which is used by
+ * {@link VirtuosoRepositoryFactory}s to initialize {@link VirtuosoRepository}s.
+ *
+ */
+public class VirtuosoRepositorySchema {
+
+ public static final String NAMESPACE = "http://www.openrdf.org/config/repository/virtuoso#";
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#hostList</tt> */
+ public final static URI HOSTLIST;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#username</tt> */
+ public final static URI USERNAME;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#password</tt> */
+ public final static URI PASSWORD;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#defGraph</tt> */
+ public final static URI DEFGRAPH;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#useLazyAdd</tt> */
+ public final static URI USELAZYADD;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#fetchSize</tt> */
+ public final static URI FETCHSIZE;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#roundRobin</tt> */
+ public final static URI ROUNDROBIN;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#ruleSet</tt> */
+ public final static URI RULESET;
+
+
+ static {
+ ValueFactory factory = ValueFactoryImpl.getInstance();
+ HOSTLIST = factory.createURI(NAMESPACE, "hostList");
+ USERNAME = factory.createURI(NAMESPACE, "username");
+ PASSWORD = factory.createURI(NAMESPACE, "password");
+ DEFGRAPH = factory.createURI(NAMESPACE, "defGraph");
+ USELAZYADD = factory.createURI(NAMESPACE, "useLazyAdd");
+ FETCHSIZE = factory.createURI(NAMESPACE, "fetchSize");
+ ROUNDROBIN = factory.createURI(NAMESPACE, "roundRobin");
+ RULESET = factory.createURI(NAMESPACE, "ruleSet");
+ }
+}
+
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java b/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java
index 554a562..47796fa 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoTest.java,v 1.11.2.5 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoTest.java,v 1.11.2.3 2010/03/01 10:06:02 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -120,7 +120,7 @@ public class VirtuosoTest {
// test add data to the repository
boolean ok = true;
String query = null;
- String strurl = "http://dbpedia.org/data/Berlin.rdf";
+ String strurl = "http://www.openlinksw.com/dataspace/person/kidehen@openlinksw.com/foaf.rdf";
URL url = new URL(strurl);
URI context = repository.getValueFactory().createURI("http://demo.openlinksw.com/demo#this");
Value[][] results = null;
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoTupleQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoTupleQuery.java
index 62fdfb8..84a784b 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoTupleQuery.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoTupleQuery.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoTupleQuery.java,v 1.2.2.3 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoTupleQuery.java,v 1.2.2.2 2010/02/25 20:23:06 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java b/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java
index a3a05d4..809298a 100644
--- a/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java
+++ b/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoUpdate.java,v 1.1.4.3 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoUpdate.java,v 1.1.4.2 2011/10/13 22:49:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2011 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
diff --git a/binsrc/sesame3/Makefile.am b/binsrc/sesame3/Makefile.am
index 8224ee6..a6118b8 100644
--- a/binsrc/sesame3/Makefile.am
+++ b/binsrc/sesame3/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
diff --git a/binsrc/sesame3/Makefile.in b/binsrc/sesame3/Makefile.in
index 25167ea..138921a 100644
--- a/binsrc/sesame3/Makefile.in
+++ b/binsrc/sesame3/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/sesame3/virtuoso_driver/Version.java b/binsrc/sesame3/virtuoso_driver/Version.java
index a9ddc47..f2cca93 100644
--- a/binsrc/sesame3/virtuoso_driver/Version.java
+++ b/binsrc/sesame3/virtuoso_driver/Version.java
@@ -1,10 +1,10 @@
/*
- * $Id: Version.java,v 1.1.4.7 2012/03/15 12:57:17 source Exp $
+ * $Id: Version.java,v 1.1.4.5 2011/05/17 13:56:31 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -29,7 +29,7 @@ public class Version {
protected static final String DRV_VER = "3.0-alpha";
// The major and minor version number
- protected static final String build_id = "1.5";
+ protected static final String build_id = "1.4";
public static void main(String args[])
{
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java
index 72b1048..5db2efb 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoBooleanQuery.java,v 1.1.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoBooleanQuery.java,v 1.1 2009/03/26 13:57:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java
index e2c5d95..f49a258 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoGraphQuery.java,v 1.1.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoGraphQuery.java,v 1.1 2009/03/26 13:57:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java
index fa5738f..0fe64ac 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoQuery.java,v 1.1.2.1 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoQuery.java,v 1.1 2009/03/26 13:57:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java
index 460a3e4..b249d8b 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoRepository.java,v 1.1.2.10 2012/03/08 12:55:05 source Exp $
+ * $Id: VirtuosoRepository.java,v 1.1.2.9 2011/05/17 13:56:31 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java
index e472b6e..fd0f935 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java
@@ -1,234 +1,234 @@
-/*
- * $Id: VirtuosoRepositoryConfig.java,v 1.1.4.4 2012/03/08 16:23:03 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-package virtuoso.sesame3.driver.config;
-
-import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.PASSWORD;
-import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.HOSTLIST;
-import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.USERNAME;
-import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.DEFGRAPH;
-import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.USELAZYADD;
-import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.FETCHSIZE;
-import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.ROUNDROBIN;
-import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.RULESET;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.openrdf.model.Literal;
-import org.openrdf.model.Model;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.util.ModelException;
-import org.openrdf.repository.config.RepositoryImplConfigBase;
-import org.openrdf.store.StoreConfigException;
-
-
-public class VirtuosoRepositoryConfig extends RepositoryImplConfigBase {
-
- private String hostlist;
-
- private String username;
-
- private String password;
-
- private String defGraph;
-
- private boolean useLazyAdd;
-
- private int fetchSize = 200;
-
- private boolean roundRobin;
-
- private String ruleSet;
-
- public VirtuosoRepositoryConfig() {
- super(VirtuosoRepositoryFactory.REPOSITORY_TYPE);
- }
-
- public VirtuosoRepositoryConfig(String hostlist) {
- this();
- setHostList(hostlist);
- }
-
- public String getHostList() {
- return hostlist;
- }
-
- public void setHostList(String hostlist) {
- this.hostlist = hostlist;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
-
- public String getDefGraph() {
- return defGraph;
- }
-
- public void setDefGraph(String defGraph) {
- this.defGraph = defGraph;
- }
-
-
- public boolean getUseLazyAdd() {
- return useLazyAdd;
- }
-
- public void setUseLazyAdd(boolean useLazyAdd) {
- this.useLazyAdd = useLazyAdd;
- }
-
- public boolean getRoundRobin() {
- return roundRobin;
- }
-
- public void setRoundRobin(boolean roundRobin) {
- this.roundRobin = roundRobin;
- }
-
-
- public int getFetchSize() {
- return fetchSize;
- }
-
- public void setFetchSize(int fetchSize) {
- this.fetchSize = fetchSize;
- }
-
-
- public String getRuleSet() {
- return ruleSet;
- }
-
- public void setRuleSet(String ruleSet) {
- if (ruleSet!=null && ruleSet.equals("null"))
- this.ruleSet = null;
- else
- this.ruleSet = ruleSet;
- }
-
-
- @Override
- public void validate()
- throws StoreConfigException
- {
- super.validate();
- if (hostlist == null) {
- throw new StoreConfigException("No HostList specified for Virtuoso repository");
- }
- }
-
- @Override
- public Resource export(Model model) {
- Resource implNode = super.export(model);
- ValueFactoryImpl vf = ValueFactoryImpl.getInstance();
-
- if (hostlist != null) {
- model.add(implNode, HOSTLIST, vf.createLiteral(hostlist));
- }
- if (username != null) {
- model.add(implNode, USERNAME, vf.createLiteral(username));
- }
- if (password != null) {
- model.add(implNode, PASSWORD, vf.createLiteral(password));
- }
-
- if (defGraph != null) {
- model.add(implNode, DEFGRAPH, vf.createLiteral(defGraph));
- }
-
- if (ruleSet != null && ruleSet.length() > 0 && !ruleSet.equals("null")) {
- model.add(implNode, RULESET, vf.createLiteral(ruleSet));
- }
-
- model.add(implNode, USELAZYADD, vf.createLiteral(new Boolean(useLazyAdd).toString()));
-
- model.add(implNode, ROUNDROBIN, vf.createLiteral(new Boolean(roundRobin).toString()));
-
- model.add(implNode, FETCHSIZE, vf.createLiteral(Integer.toString(fetchSize,10)));
-
- return implNode;
- }
-
- @Override
- public void parse(Model model, Resource implNode)
- throws StoreConfigException
- {
- super.parse(model, implNode);
-
- try {
- Literal hlist = model.filter(implNode, HOSTLIST, null).objectLiteral();
- if (hlist != null) {
- setHostList(hlist.getLabel());
- }
- Literal username = model.filter(implNode, USERNAME, null).objectLiteral();
- if (username != null) {
- setUsername(username.getLabel());
- }
- Literal password = model.filter(implNode, PASSWORD, null).objectLiteral();
- if (password != null) {
- setPassword(password.getLabel());
- }
- Literal defgraph = model.filter(implNode, DEFGRAPH, null).objectLiteral();
- if (defgraph != null) {
- setDefGraph(defgraph.getLabel());
- }
- Literal uselazyadd = model.filter(implNode, USELAZYADD, null).objectLiteral();
- if (uselazyadd != null) {
- setUseLazyAdd(Boolean.getBoolean(uselazyadd.getLabel()));
- }
- Literal roundrobin = model.filter(implNode, ROUNDROBIN, null).objectLiteral();
- if (roundrobin != null) {
- setRoundRobin(Boolean.getBoolean(roundrobin.getLabel()));
- }
- Literal fetchsize = model.filter(implNode, FETCHSIZE, null).objectLiteral();
- if (fetchsize != null) {
- setFetchSize(Integer.parseInt(fetchsize.getLabel()));
- }
- Literal ruleset = model.filter(implNode, RULESET, null).objectLiteral();
- if (ruleset != null) {
- setRuleSet(ruleset.getLabel());
- }
- }
- catch (ModelException e) {
- throw new StoreConfigException(e.getMessage(), e);
- }
- }
-}
+/*
+ * $Id: VirtuosoRepositoryConfig.java,v 1.1.4.2 2010/05/31 14:27:52 source Exp $
+ *
+ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+ * project.
+ *
+ * Copyright (C) 1998-2010 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
+ *
+ */
+
+package virtuoso.sesame3.driver.config;
+
+import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.PASSWORD;
+import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.HOSTLIST;
+import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.USERNAME;
+import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.DEFGRAPH;
+import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.USELAZYADD;
+import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.FETCHSIZE;
+import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.ROUNDROBIN;
+import static virtuoso.sesame3.driver.config.VirtuosoRepositorySchema.RULESET;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.openrdf.model.Literal;
+import org.openrdf.model.Model;
+import org.openrdf.model.Resource;
+import org.openrdf.model.URI;
+import org.openrdf.model.Value;
+import org.openrdf.model.impl.ValueFactoryImpl;
+import org.openrdf.model.util.ModelException;
+import org.openrdf.repository.config.RepositoryImplConfigBase;
+import org.openrdf.store.StoreConfigException;
+
+
+public class VirtuosoRepositoryConfig extends RepositoryImplConfigBase {
+
+ private String hostlist;
+
+ private String username;
+
+ private String password;
+
+ private String defGraph;
+
+ private boolean useLazyAdd;
+
+ private int fetchSize = 200;
+
+ private boolean roundRobin;
+
+ private String ruleSet;
+
+ public VirtuosoRepositoryConfig() {
+ super(VirtuosoRepositoryFactory.REPOSITORY_TYPE);
+ }
+
+ public VirtuosoRepositoryConfig(String hostlist) {
+ this();
+ setHostList(hostlist);
+ }
+
+ public String getHostList() {
+ return hostlist;
+ }
+
+ public void setHostList(String hostlist) {
+ this.hostlist = hostlist;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+
+ public String getDefGraph() {
+ return defGraph;
+ }
+
+ public void setDefGraph(String defGraph) {
+ this.defGraph = defGraph;
+ }
+
+
+ public boolean getUseLazyAdd() {
+ return useLazyAdd;
+ }
+
+ public void setUseLazyAdd(boolean useLazyAdd) {
+ this.useLazyAdd = useLazyAdd;
+ }
+
+ public boolean getRoundRobin() {
+ return roundRobin;
+ }
+
+ public void setRoundRobin(boolean roundRobin) {
+ this.roundRobin = roundRobin;
+ }
+
+
+ public int getFetchSize() {
+ return fetchSize;
+ }
+
+ public void setFetchSize(int fetchSize) {
+ this.fetchSize = fetchSize;
+ }
+
+
+ public String getRuleSet() {
+ return ruleSet;
+ }
+
+ public void setRuleSet(String ruleSet) {
+ if (ruleSet!=null && ruleSet.equals("null"))
+ this.ruleSet = null;
+ else
+ this.ruleSet = ruleSet;
+ }
+
+
+ @Override
+ public void validate()
+ throws StoreConfigException
+ {
+ super.validate();
+ if (hostlist == null) {
+ throw new StoreConfigException("No HostList specified for Virtuoso repository");
+ }
+ }
+
+ @Override
+ public Resource export(Model model) {
+ Resource implNode = super.export(model);
+ ValueFactoryImpl vf = ValueFactoryImpl.getInstance();
+
+ if (hostlist != null) {
+ model.add(implNode, HOSTLIST, vf.createLiteral(hostlist));
+ }
+ if (username != null) {
+ model.add(implNode, USERNAME, vf.createLiteral(username));
+ }
+ if (password != null) {
+ model.add(implNode, PASSWORD, vf.createLiteral(password));
+ }
+
+ if (defGraph != null) {
+ model.add(implNode, DEFGRAPH, vf.createLiteral(defGraph));
+ }
+
+ if (ruleSet != null && ruleSet.length() > 0 && !ruleSet.equals("null")) {
+ model.add(implNode, RULESET, vf.createLiteral(ruleSet));
+ }
+
+ model.add(implNode, USELAZYADD, vf.createLiteral(new Boolean(useLazyAdd).toString()));
+
+ model.add(implNode, ROUNDROBIN, vf.createLiteral(new Boolean(roundRobin).toString()));
+
+ model.add(implNode, FETCHSIZE, vf.createLiteral(Integer.toString(fetchSize,10)));
+
+ return implNode;
+ }
+
+ @Override
+ public void parse(Model model, Resource implNode)
+ throws StoreConfigException
+ {
+ super.parse(model, implNode);
+
+ try {
+ Literal hlist = model.filter(implNode, HOSTLIST, null).objectLiteral();
+ if (hlist != null) {
+ setHostList(hlist.getLabel());
+ }
+ Literal username = model.filter(implNode, USERNAME, null).objectLiteral();
+ if (username != null) {
+ setUsername(username.getLabel());
+ }
+ Literal password = model.filter(implNode, PASSWORD, null).objectLiteral();
+ if (password != null) {
+ setPassword(password.getLabel());
+ }
+ Literal defgraph = model.filter(implNode, DEFGRAPH, null).objectLiteral();
+ if (defgraph != null) {
+ setDefGraph(defgraph.getLabel());
+ }
+ Literal uselazyadd = model.filter(implNode, USELAZYADD, null).objectLiteral();
+ if (uselazyadd != null) {
+ setUseLazyAdd(Boolean.getBoolean(uselazyadd.getLabel()));
+ }
+ Literal roundrobin = model.filter(implNode, ROUNDROBIN, null).objectLiteral();
+ if (roundrobin != null) {
+ setRoundRobin(Boolean.getBoolean(roundrobin.getLabel()));
+ }
+ Literal fetchsize = model.filter(implNode, FETCHSIZE, null).objectLiteral();
+ if (fetchsize != null) {
+ setFetchSize(Integer.parseInt(fetchsize.getLabel()));
+ }
+ Literal ruleset = model.filter(implNode, RULESET, null).objectLiteral();
+ if (ruleset != null) {
+ setRuleSet(ruleset.getLabel());
+ }
+ }
+ catch (ModelException e) {
+ throw new StoreConfigException(e.getMessage(), e);
+ }
+ }
+}
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java
index e8a3050..ca9b280 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoRepositoryConnection.java,v 1.1.2.13 2012/03/15 12:57:17 source Exp $
+ * $Id: VirtuosoRepositoryConnection.java,v 1.1.2.11 2011/05/17 13:56:31 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
@@ -171,8 +171,8 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
private static Resource nilContext;
private Connection quadStoreConnection;
protected VirtuosoRepository repository;
- static final String S_INSERT = "sparql insert into graph iri(??) { `iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)` }";
- static final String S_DELETE = "sparql delete from graph iri(??) {`iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)`}";
+ static final String S_INSERT = "sparql define output:format '_JAVA_' insert into graph iri(??) { `iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)` }";
+ static final String S_DELETE = "sparql define output:format '_JAVA_' delete from graph iri(??) {`iri(??)` `iri(??)` `bif:__rdf_long_from_batch_params(??,??,??)`}";
static final int BATCH_SIZE = 5000;
private PreparedStatement psInsert;
private int psInsertCount = 0;
@@ -2310,7 +2310,7 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
try {
flushDelayAdd();
java.sql.Statement stmt = createStatement();
- stmt.execute("sparql\n " + query);
+ stmt.execute("sparql\n define output:format '_JAVA_'\n " + query);
return stmt.getUpdateCount();
}
catch (SQLException e) {
@@ -2409,11 +2409,25 @@ public class VirtuosoRepositoryConnection implements RepositoryConnection {
private String fixQuery(String query, Dataset dataset, boolean includeInferred, BindingSet bindings)
{
+ StringTokenizer tok = new StringTokenizer(query);
+ String s = "";
StringBuffer ret = new StringBuffer("sparql\n ");
+ while(tok.hasMoreTokens()) {
+ s = tok.nextToken().toLowerCase();
+ if (s.equals("describe") || s.equals("construct") || s.equals("ask"))
+ break;
+ }
+
+ if (s.equals("describe") || s.equals("construct") || s.equals("ask"))
+ ret.append("define output:format '_JAVA_'\n ");
+
+
if (includeInferred && repository.ruleSet!=null && repository.ruleSet.length() > 0)
ret.append("define input:inference '"+repository.ruleSet+"'\n ");
+ ret.append("define output:format '_JAVA_'\n ");
+
if (dataset != null)
{
Set<URI> list = dataset.getDefaultGraphs();
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryFactory.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryFactory.java
index 88a3a6c..09e29fc 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryFactory.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryFactory.java
@@ -1,79 +1,79 @@
-/*
- * $Id: VirtuosoRepositoryFactory.java,v 1.1.4.4 2012/03/08 16:23:03 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-package virtuoso.sesame3.driver.config;
-
-
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.config.RepositoryFactory;
-import org.openrdf.repository.config.RepositoryImplConfig;
-import org.openrdf.store.StoreConfigException;
-import virtuoso.sesame3.driver.VirtuosoRepository;
-
-/**
- * A {@link RepositoryFactory} that creates {@link VirtuosoRepository}s based on
- * RDF configuration data.
- */
-public class VirtuosoRepositoryFactory implements RepositoryFactory {
-
- /**
- * The type of repositories that are created by this factory.
- *
- * @see RepositoryFactory#getRepositoryType()
- */
- public static final String REPOSITORY_TYPE = "openrdf:VirtuosoRepository";
-
- /**
- * Returns the repository's type: <tt>openrdf:VirtuosoRepository</tt>.
- */
- public String getRepositoryType() {
- return REPOSITORY_TYPE;
- }
-
- public RepositoryImplConfig getConfig() {
- return new VirtuosoRepositoryConfig();
- }
-
- public Repository getRepository(RepositoryImplConfig config)
- throws StoreConfigException
- {
- VirtuosoRepository result = null;
-
- if (config instanceof VirtuosoRepositoryConfig) {
- VirtuosoRepositoryConfig vConfig = (VirtuosoRepositoryConfig)config;
- result = new VirtuosoRepository(vConfig.getHostList(),
- vConfig.getUsername(),
- vConfig.getPassword(),
- vConfig.getDefGraph(),
- vConfig.getUseLazyAdd());
- result.setFetchSize(vConfig.getFetchSize());
- result.setRoundrobin(vConfig.getRoundRobin());
- result.setFetchSize(vConfig.getFetchSize());
- result.setRuleSet(vConfig.getRuleSet());
- }
- else {
- throw new StoreConfigException("Invalid configuration class: " + config.getClass());
- }
- return result;
- }
-}
+/*
+ * $Id: VirtuosoRepositoryFactory.java,v 1.1.4.2 2010/05/31 14:27:52 source Exp $
+ *
+ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+ * project.
+ *
+ * Copyright (C) 1998-2010 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
+ *
+ */
+
+package virtuoso.sesame3.driver.config;
+
+
+import org.openrdf.repository.Repository;
+import org.openrdf.repository.config.RepositoryFactory;
+import org.openrdf.repository.config.RepositoryImplConfig;
+import org.openrdf.store.StoreConfigException;
+import virtuoso.sesame3.driver.VirtuosoRepository;
+
+/**
+ * A {@link RepositoryFactory} that creates {@link VirtuosoRepository}s based on
+ * RDF configuration data.
+ */
+public class VirtuosoRepositoryFactory implements RepositoryFactory {
+
+ /**
+ * The type of repositories that are created by this factory.
+ *
+ * @see RepositoryFactory#getRepositoryType()
+ */
+ public static final String REPOSITORY_TYPE = "openrdf:VirtuosoRepository";
+
+ /**
+ * Returns the repository's type: <tt>openrdf:VirtuosoRepository</tt>.
+ */
+ public String getRepositoryType() {
+ return REPOSITORY_TYPE;
+ }
+
+ public RepositoryImplConfig getConfig() {
+ return new VirtuosoRepositoryConfig();
+ }
+
+ public Repository getRepository(RepositoryImplConfig config)
+ throws StoreConfigException
+ {
+ VirtuosoRepository result = null;
+
+ if (config instanceof VirtuosoRepositoryConfig) {
+ VirtuosoRepositoryConfig vConfig = (VirtuosoRepositoryConfig)config;
+ result = new VirtuosoRepository(vConfig.getHostList(),
+ vConfig.getUsername(),
+ vConfig.getPassword(),
+ vConfig.getDefGraph(),
+ vConfig.getUseLazyAdd());
+ result.setFetchSize(vConfig.getFetchSize());
+ result.setRoundrobin(vConfig.getRoundRobin());
+ result.setFetchSize(vConfig.getFetchSize());
+ result.setRuleSet(vConfig.getRuleSet());
+ }
+ else {
+ throw new StoreConfigException("Invalid configuration class: " + config.getClass());
+ }
+ return result;
+ }
+}
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java
index 6bfbeac..8ad943a 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoRepositoryMetaData.java,v 1.1.2.1 2012/03/08 12:55:06 source Exp $
+ * $Id: VirtuosoRepositoryMetaData.java,v 1.1 2009/03/26 13:57:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java
index 13af0fa..18d00b6 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java
@@ -1,78 +1,78 @@
-/*
- * $Id: VirtuosoRepositorySchema.java,v 1.1.4.4 2012/03/08 16:23:03 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-package virtuoso.sesame3.driver.config;
-
-
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import virtuoso.sesame3.driver.VirtuosoRepository;
-
-/**
- * Defines constants for the VirtuosoRepository schema which is used by
- * {@link VirtuosoRepositoryFactory}s to initialize {@link VirtuosoRepository}s.
- *
- */
-public class VirtuosoRepositorySchema {
-
- public static final String NAMESPACE = "http://www.openrdf.org/config/repository/virtuoso#";
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#hostList</tt> */
- public final static URI HOSTLIST;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#username</tt> */
- public final static URI USERNAME;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#password</tt> */
- public final static URI PASSWORD;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#defGraph</tt> */
- public final static URI DEFGRAPH;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#useLazyAdd</tt> */
- public final static URI USELAZYADD;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#fetchSize</tt> */
- public final static URI FETCHSIZE;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#roundRobin</tt> */
- public final static URI ROUNDROBIN;
-
- /** <tt>http://www.openrdf.org/config/repository/virtuoso#ruleSet</tt> */
- public final static URI RULESET;
-
-
- static {
- ValueFactory factory = ValueFactoryImpl.getInstance();
- HOSTLIST = factory.createURI(NAMESPACE, "hostList");
- USERNAME = factory.createURI(NAMESPACE, "username");
- PASSWORD = factory.createURI(NAMESPACE, "password");
- DEFGRAPH = factory.createURI(NAMESPACE, "defGraph");
- USELAZYADD = factory.createURI(NAMESPACE, "useLazyAdd");
- FETCHSIZE = factory.createURI(NAMESPACE, "fetchSize");
- ROUNDROBIN = factory.createURI(NAMESPACE, "roundRobin");
- RULESET = factory.createURI(NAMESPACE, "ruleSet");
- }
-}
-
+/*
+ * $Id: VirtuosoRepositorySchema.java,v 1.1.4.2 2010/05/31 14:27:52 source Exp $
+ *
+ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+ * project.
+ *
+ * Copyright (C) 1998-2010 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
+ *
+ */
+
+package virtuoso.sesame3.driver.config;
+
+
+import org.openrdf.model.URI;
+import org.openrdf.model.ValueFactory;
+import org.openrdf.model.impl.ValueFactoryImpl;
+import virtuoso.sesame3.driver.VirtuosoRepository;
+
+/**
+ * Defines constants for the VirtuosoRepository schema which is used by
+ * {@link VirtuosoRepositoryFactory}s to initialize {@link VirtuosoRepository}s.
+ *
+ */
+public class VirtuosoRepositorySchema {
+
+ public static final String NAMESPACE = "http://www.openrdf.org/config/repository/virtuoso#";
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#hostList</tt> */
+ public final static URI HOSTLIST;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#username</tt> */
+ public final static URI USERNAME;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#password</tt> */
+ public final static URI PASSWORD;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#defGraph</tt> */
+ public final static URI DEFGRAPH;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#useLazyAdd</tt> */
+ public final static URI USELAZYADD;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#fetchSize</tt> */
+ public final static URI FETCHSIZE;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#roundRobin</tt> */
+ public final static URI ROUNDROBIN;
+
+ /** <tt>http://www.openrdf.org/config/repository/virtuoso#ruleSet</tt> */
+ public final static URI RULESET;
+
+
+ static {
+ ValueFactory factory = ValueFactoryImpl.getInstance();
+ HOSTLIST = factory.createURI(NAMESPACE, "hostList");
+ USERNAME = factory.createURI(NAMESPACE, "username");
+ PASSWORD = factory.createURI(NAMESPACE, "password");
+ DEFGRAPH = factory.createURI(NAMESPACE, "defGraph");
+ USELAZYADD = factory.createURI(NAMESPACE, "useLazyAdd");
+ FETCHSIZE = factory.createURI(NAMESPACE, "fetchSize");
+ ROUNDROBIN = factory.createURI(NAMESPACE, "roundRobin");
+ RULESET = factory.createURI(NAMESPACE, "ruleSet");
+ }
+}
+
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java b/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java
index 34b3969..b0f48d3 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoTest.java,v 1.1.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: VirtuosoTest.java,v 1.1.2.1 2009/09/18 16:11:19 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2008 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
diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java
index 8b62f60..fc91078 100644
--- a/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java
+++ b/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoTupleQuery.java,v 1.1.2.1 2012/03/08 12:55:06 source Exp $
+ * $Id: VirtuosoTupleQuery.java,v 1.1 2009/03/26 13:57:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/binsrc/sqldoc/Makefile.am b/binsrc/sqldoc/Makefile.am
index 3780605..85f0dda 100644
--- a/binsrc/sqldoc/Makefile.am
+++ b/binsrc/sqldoc/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/sqldoc/Makefile.in b/binsrc/sqldoc/Makefile.in
index 415de50..26bda7b 100644
--- a/binsrc/sqldoc/Makefile.in
+++ b/binsrc/sqldoc/Makefile.in
@@ -106,7 +106,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -155,7 +154,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -207,7 +205,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -254,6 +251,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/sqldoc/bif_sps.sql b/binsrc/sqldoc/bif_sps.sql
index cc99e9b..b6db011 100644
--- a/binsrc/sqldoc/bif_sps.sql
+++ b/binsrc/sqldoc/bif_sps.sql
@@ -1,10 +1,10 @@
--
--- $Id: bif_sps.sql,v 1.2.2.1 2012/03/08 12:55:06 source Exp $
+-- $Id: bif_sps.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/sqldoc/cutter.c b/binsrc/sqldoc/cutter.c
index 9c49b52..9681f10 100644
--- a/binsrc/sqldoc/cutter.c
+++ b/binsrc/sqldoc/cutter.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/sqldoc/escape8bit.c b/binsrc/sqldoc/escape8bit.c
index ffea3ed..46a42b9 100644
--- a/binsrc/sqldoc/escape8bit.c
+++ b/binsrc/sqldoc/escape8bit.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/sqldoc/functions.sql b/binsrc/sqldoc/functions.sql
index bbeb4e0..0df804e 100644
--- a/binsrc/sqldoc/functions.sql
+++ b/binsrc/sqldoc/functions.sql
@@ -1,10 +1,10 @@
--
--- $Id: functions.sql,v 1.2.2.1 2012/03/08 12:55:06 source Exp $
+-- $Id: functions.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/sqldoc/isql_log_normalize.c b/binsrc/sqldoc/isql_log_normalize.c
index 32bd769..3471569 100644
--- a/binsrc/sqldoc/isql_log_normalize.c
+++ b/binsrc/sqldoc/isql_log_normalize.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/sqldoc/mkfuncref.bat b/binsrc/sqldoc/mkfuncref.bat
index 52f590c..eac404a 100644
--- a/binsrc/sqldoc/mkfuncref.bat
+++ b/binsrc/sqldoc/mkfuncref.bat
@@ -2,7 +2,7 @@ rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2006 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/binsrc/sqldoc/sql_functions.xsl b/binsrc/sqldoc/sql_functions.xsl
index 82f884b..542b34f 100644
--- a/binsrc/sqldoc/sql_functions.xsl
+++ b/binsrc/sqldoc/sql_functions.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sql_functions.xsl,v 1.2.2.1 2012/03/08 12:55:06 source Exp $
+ - $Id: sql_functions.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/sqldoc/vspx_doc.sh b/binsrc/sqldoc/vspx_doc.sh
index 4deb8f5..5b5978c 100755
--- a/binsrc/sqldoc/vspx_doc.sh
+++ b/binsrc/sqldoc/vspx_doc.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: vspx_doc.sh,v 1.4.2.1 2012/03/08 12:55:06 source Exp $
+# $Id: vspx_doc.sh,v 1.4 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/sync/Makefile.am b/binsrc/sync/Makefile.am
index 838ea96..9960a01 100644
--- a/binsrc/sync/Makefile.am
+++ b/binsrc/sync/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/sync/Makefile.in b/binsrc/sync/Makefile.in
index b364579..3b581f6 100644
--- a/binsrc/sync/Makefile.in
+++ b/binsrc/sync/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -125,7 +125,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -174,7 +173,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -226,7 +224,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -273,6 +270,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/sync/drop.sql b/binsrc/sync/drop.sql
index 0ffd843..24fa45c 100644
--- a/binsrc/sync/drop.sql
+++ b/binsrc/sync/drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop.sql,v 1.2.2.1 2012/03/08 12:55:06 source Exp $
+-- $Id: drop.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/sync/make_vad.sh b/binsrc/sync/make_vad.sh
index fd784cd..01f2e9c 100755
--- a/binsrc/sync/make_vad.sh
+++ b/binsrc/sync/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.8.2.5 2012/03/08 12:55:06 source Exp $
+# $Id: make_vad.sh,v 1.8.2.3 2011/10/25 23:58:36 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -221,7 +221,7 @@ sticker_init() {
echo " <name package=\"SyncML\">" >> $STICKER
echo " <prop name=\"Title\" value=\"SyncML\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/sync/sync.sql b/binsrc/sync/sync.sql
index 07b6aae..3db8fc2 100644
--- a/binsrc/sync/sync.sql
+++ b/binsrc/sync/sync.sql
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -19,7 +19,7 @@
--
--
--
--- $Id: sync.sql,v 1.1.1.1.2.1 2012/03/08 12:55:06 source Exp $
+-- $Id: sync.sql,v 1.1.1.1 2006/04/11 17:56:10 source Exp $
--
vhost_remove (lpath => '/sync');
diff --git a/binsrc/sync/sync.vsp b/binsrc/sync/sync.vsp
index db32b42..590ba8e 100644
--- a/binsrc/sync/sync.vsp
+++ b/binsrc/sync/sync.vsp
@@ -3,7 +3,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -20,7 +20,7 @@
--
--
?>
-<!-- $Id: sync.vsp,v 1.1.1.1.2.1 2012/03/08 12:55:06 source Exp $ -->
+<!-- $Id: sync.vsp,v 1.1.1.1 2006/04/11 17:56:10 source Exp $ -->
<?vsp
declare _accept varchar;
declare _req varchar;
diff --git a/binsrc/sync/syncml.sql b/binsrc/sync/syncml.sql
index faf4c24..6a79b88 100644
--- a/binsrc/sync/syncml.sql
+++ b/binsrc/sync/syncml.sql
@@ -1,10 +1,10 @@
--
--- $Id: syncml.sql,v 1.10.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: syncml.sql,v 1.10.2.1 2011/09/12 10:55:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2011 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
diff --git a/binsrc/sync/syncml_drop.sql b/binsrc/sync/syncml_drop.sql
index b36749f..0fa89d1 100644
--- a/binsrc/sync/syncml_drop.sql
+++ b/binsrc/sync/syncml_drop.sql
@@ -1,10 +1,10 @@
--
--- $Id: syncml_drop.sql,v 1.1.4.3 2012/03/08 12:55:06 source Exp $
+-- $Id: syncml_drop.sql,v 1.1.4.2 2011/10/25 23:58:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2011 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
diff --git a/binsrc/sync/wbxml.sql b/binsrc/sync/wbxml.sql
index 1ec7c6f..b554f43 100644
--- a/binsrc/sync/wbxml.sql
+++ b/binsrc/sync/wbxml.sql
@@ -1,10 +1,10 @@
--
--- $Id: wbxml.sql,v 1.2.2.1 2012/03/08 12:55:06 source Exp $
+-- $Id: wbxml.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/Makefile.am b/binsrc/tests/Makefile.am
index 2736231..4df0a17 100644
--- a/binsrc/tests/Makefile.am
+++ b/binsrc/tests/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/Makefile.in b/binsrc/tests/Makefile.in
index cc69e77..b250ed5 100644
--- a/binsrc/tests/Makefile.in
+++ b/binsrc/tests/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -343,7 +343,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -392,7 +391,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -444,7 +442,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -491,6 +488,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/b3078.c b/binsrc/tests/b3078.c
index a45ed9b..a878bac 100644
--- a/binsrc/tests/b3078.c
+++ b/binsrc/tests/b3078.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/Makefile.am b/binsrc/tests/biftest/Makefile.am
index b569944..8d42379 100644
--- a/binsrc/tests/biftest/Makefile.am
+++ b/binsrc/tests/biftest/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/Makefile.in b/binsrc/tests/biftest/Makefile.in
index 518d2d6..fb85177 100644
--- a/binsrc/tests/biftest/Makefile.in
+++ b/binsrc/tests/biftest/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -173,7 +173,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -222,7 +221,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -274,7 +272,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -321,6 +318,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/biftest/bif_sample.c b/binsrc/tests/biftest/bif_sample.c
index ecabbb9..bec8e6c 100644
--- a/binsrc/tests/biftest/bif_sample.c
+++ b/binsrc/tests/biftest/bif_sample.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/bif_sample_win32.c b/binsrc/tests/biftest/bif_sample_win32.c
index b6e1160..140c229 100644
--- a/binsrc/tests/biftest/bif_sample_win32.c
+++ b/binsrc/tests/biftest/bif_sample_win32.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/bif_server.c b/binsrc/tests/biftest/bif_server.c
index 9c6e413..b467939 100644
--- a/binsrc/tests/biftest/bif_server.c
+++ b/binsrc/tests/biftest/bif_server.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/import_clr.sql b/binsrc/tests/biftest/import_clr.sql
index 08b18f5..051bb01 100644
--- a/binsrc/tests/biftest/import_clr.sql
+++ b/binsrc/tests/biftest/import_clr.sql
@@ -1,10 +1,10 @@
--
--- $Id: import_clr.sql,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: import_clr.sql,v 1.3.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/java/BpelVarsAdaptor.java b/binsrc/tests/biftest/java/BpelVarsAdaptor.java
index a2a385a..7df1328 100644
--- a/binsrc/tests/biftest/java/BpelVarsAdaptor.java
+++ b/binsrc/tests/biftest/java/BpelVarsAdaptor.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java/Restricted.java b/binsrc/tests/biftest/java/Restricted.java
index 2c60533..aa1673a 100644
--- a/binsrc/tests/biftest/java/Restricted.java
+++ b/binsrc/tests/biftest/java/Restricted.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java/Unrestricted.java b/binsrc/tests/biftest/java/Unrestricted.java
index b40edff..544f5ea 100644
--- a/binsrc/tests/biftest/java/Unrestricted.java
+++ b/binsrc/tests/biftest/java/Unrestricted.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java/__virt_access_granter.java b/binsrc/tests/biftest/java/__virt_access_granter.java
index edcf8f8..82ace35 100644
--- a/binsrc/tests/biftest/java/__virt_access_granter.java
+++ b/binsrc/tests/biftest/java/__virt_access_granter.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java/__virt_class_loader_r.java b/binsrc/tests/biftest/java/__virt_class_loader_r.java
index 3bf074b..d6ccfb9 100644
--- a/binsrc/tests/biftest/java/__virt_class_loader_r.java
+++ b/binsrc/tests/biftest/java/__virt_class_loader_r.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java/__virt_class_loader_ur.java b/binsrc/tests/biftest/java/__virt_class_loader_ur.java
index 86d104c..8ae2f29 100644
--- a/binsrc/tests/biftest/java/__virt_class_loader_ur.java
+++ b/binsrc/tests/biftest/java/__virt_class_loader_ur.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java/__virt_helper.java b/binsrc/tests/biftest/java/__virt_helper.java
index 6b6db26..1b1c37c 100644
--- a/binsrc/tests/biftest/java/__virt_helper.java
+++ b/binsrc/tests/biftest/java/__virt_helper.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java_code.c b/binsrc/tests/biftest/java_code.c
index 3d27d6d..07aa2f0 100644
--- a/binsrc/tests/biftest/java_code.c
+++ b/binsrc/tests/biftest/java_code.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java_skel.c b/binsrc/tests/biftest/java_skel.c
index a6ca45f..f200b59 100644
--- a/binsrc/tests/biftest/java_skel.c
+++ b/binsrc/tests/biftest/java_skel.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/java_to_c.awk b/binsrc/tests/biftest/java_to_c.awk
index 8399ac2..1a24d03 100644
--- a/binsrc/tests/biftest/java_to_c.awk
+++ b/binsrc/tests/biftest/java_to_c.awk
@@ -1,11 +1,11 @@
BEGIN {
#
-# $Id: java_to_c.awk,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+# $Id: java_to_c.awk,v 1.1.1.1.2.1 2009/04/20 21:14:00 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/javavm.c b/binsrc/tests/biftest/javavm.c
index 854d967..b5bcee5 100644
--- a/binsrc/tests/biftest/javavm.c
+++ b/binsrc/tests/biftest/javavm.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/javavm_pl.xsl b/binsrc/tests/biftest/javavm_pl.xsl
index b220928..793ce44 100644
--- a/binsrc/tests/biftest/javavm_pl.xsl
+++ b/binsrc/tests/biftest/javavm_pl.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: javavm_pl.xsl,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+ - $Id: javavm_pl.xsl,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/javavm_type.xsl b/binsrc/tests/biftest/javavm_type.xsl
index be967e8..0a0b329 100644
--- a/binsrc/tests/biftest/javavm_type.xsl
+++ b/binsrc/tests/biftest/javavm_type.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: javavm_type.xsl,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+ - $Id: javavm_type.xsl,v 1.3.2.1 2009/04/20 21:14:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/javavm_xml.sql b/binsrc/tests/biftest/javavm_xml.sql
index f10d478..b0ef325 100644
--- a/binsrc/tests/biftest/javavm_xml.sql
+++ b/binsrc/tests/biftest/javavm_xml.sql
@@ -1,10 +1,10 @@
--
--- $Id: javavm_xml.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: javavm_xml.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/javavm_xml2.sql b/binsrc/tests/biftest/javavm_xml2.sql
index 3a74399..e96465a 100644
--- a/binsrc/tests/biftest/javavm_xml2.sql
+++ b/binsrc/tests/biftest/javavm_xml2.sql
@@ -1,10 +1,10 @@
--
--- $Id: javavm_xml2.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: javavm_xml2.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/javavm_xml3.sql b/binsrc/tests/biftest/javavm_xml3.sql
index 7d8e474..7f87904 100644
--- a/binsrc/tests/biftest/javavm_xml3.sql
+++ b/binsrc/tests/biftest/javavm_xml3.sql
@@ -1,10 +1,10 @@
--
--- $Id: javavm_xml3.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: javavm_xml3.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/lang_sample.c b/binsrc/tests/biftest/lang_sample.c
index 69b8f95..b8f8820 100644
--- a/binsrc/tests/biftest/lang_sample.c
+++ b/binsrc/tests/biftest/lang_sample.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/sql_code_xslt.c b/binsrc/tests/biftest/sql_code_xslt.c
index 9837065..3e08f00 100644
--- a/binsrc/tests/biftest/sql_code_xslt.c
+++ b/binsrc/tests/biftest/sql_code_xslt.c
@@ -10,12 +10,12 @@ static const char *xsl1[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: javavm_type.xsl,v 1.3.2.2 2012/03/08 12:55:06 source Exp $\n"
+" - $Id: javavm_type.xsl,v 1.3.2.1 2009/04/20 21:14:00 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
diff --git a/binsrc/tests/biftest/tests/Point.java b/binsrc/tests/biftest/tests/Point.java
index 618f10c..8f43b78 100644
--- a/binsrc/tests/biftest/tests/Point.java
+++ b/binsrc/tests/biftest/tests/Point.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/Point_src.aspx b/binsrc/tests/biftest/tests/Point_src.aspx
index dbd19c8..d669e2d 100644
--- a/binsrc/tests/biftest/tests/Point_src.aspx
+++ b/binsrc/tests/biftest/tests/Point_src.aspx
@@ -1,12 +1,12 @@
<%@ Page Language="C#" Debug="true" %>
<!--
-
- - $Id: Point_src.aspx,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+ - $Id: Point_src.aspx,v 1.1.1.1.2.1 2009/04/20 21:14:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/Write_no.java b/binsrc/tests/biftest/tests/Write_no.java
index d168620..c472dc3 100644
--- a/binsrc/tests/biftest/tests/Write_no.java
+++ b/binsrc/tests/biftest/tests/Write_no.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/Write_yes.java b/binsrc/tests/biftest/tests/Write_yes.java
index 28b8d06..70d90c0 100644
--- a/binsrc/tests/biftest/tests/Write_yes.java
+++ b/binsrc/tests/biftest/tests/Write_yes.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/java_ts.sql b/binsrc/tests/biftest/tests/java_ts.sql
index 1ad12d5..77c7326 100644
--- a/binsrc/tests/biftest/tests/java_ts.sql
+++ b/binsrc/tests/biftest/tests/java_ts.sql
@@ -1,10 +1,10 @@
--
--- $Id: java_ts.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: java_ts.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/java_ts2.sql b/binsrc/tests/biftest/tests/java_ts2.sql
index b6c5e3c..704ff61 100644
--- a/binsrc/tests/biftest/tests/java_ts2.sql
+++ b/binsrc/tests/biftest/tests/java_ts2.sql
@@ -1,10 +1,10 @@
--
--- $Id: java_ts2.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: java_ts2.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/java_ts3.sql b/binsrc/tests/biftest/tests/java_ts3.sql
index be36254..a03af1d 100644
--- a/binsrc/tests/biftest/tests/java_ts3.sql
+++ b/binsrc/tests/biftest/tests/java_ts3.sql
@@ -1,10 +1,10 @@
--
--- $Id: java_ts3.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: java_ts3.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/my_finances.java b/binsrc/tests/biftest/tests/my_finances.java
index 7bbbdf6..3a051f9 100644
--- a/binsrc/tests/biftest/tests/my_finances.java
+++ b/binsrc/tests/biftest/tests/my_finances.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/test_tax_java.sql b/binsrc/tests/biftest/tests/test_tax_java.sql
index d65fec6..0688aa1 100644
--- a/binsrc/tests/biftest/tests/test_tax_java.sql
+++ b/binsrc/tests/biftest/tests/test_tax_java.sql
@@ -1,10 +1,10 @@
--
--- $Id: test_tax_java.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: test_tax_java.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/testsuite.java b/binsrc/tests/biftest/tests/testsuite.java
index 407d8a4..963b54c 100644
--- a/binsrc/tests/biftest/tests/testsuite.java
+++ b/binsrc/tests/biftest/tests/testsuite.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/testsuite_base.java b/binsrc/tests/biftest/tests/testsuite_base.java
index 8d43903..39cc862 100644
--- a/binsrc/tests/biftest/tests/testsuite_base.java
+++ b/binsrc/tests/biftest/tests/testsuite_base.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/testsuite_ns.java b/binsrc/tests/biftest/tests/testsuite_ns.java
index ed1e373..ebd5640 100644
--- a/binsrc/tests/biftest/tests/testsuite_ns.java
+++ b/binsrc/tests/biftest/tests/testsuite_ns.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/tests/tjavavm.sh b/binsrc/tests/biftest/tests/tjavavm.sh
index b39dd51..dc1c4f9 100755
--- a/binsrc/tests/biftest/tests/tjavavm.sh
+++ b/binsrc/tests/biftest/tests/tjavavm.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tjavavm.sh,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+# $Id: tjavavm.sh,v 1.1.1.1.2.1 2009/04/20 21:14:00 source Exp $
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/thook.sh b/binsrc/tests/biftest/thook.sh
index da38ed8..5c190dc 100755
--- a/binsrc/tests/biftest/thook.sh
+++ b/binsrc/tests/biftest/thook.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: thook.sh,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+# $Id: thook.sh,v 1.3.2.1 2009/04/20 21:14:00 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/biftest/thook.sql b/binsrc/tests/biftest/thook.sql
index 2a63ce2..a76a41a 100644
--- a/binsrc/tests/biftest/thook.sql
+++ b/binsrc/tests/biftest/thook.sql
@@ -1,10 +1,10 @@
--
--- $Id: thook.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: thook.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/thook1.sql b/binsrc/tests/biftest/thook1.sql
index bdf0a0e..018710a 100644
--- a/binsrc/tests/biftest/thook1.sql
+++ b/binsrc/tests/biftest/thook1.sql
@@ -1,10 +1,10 @@
--
--- $Id: thook1.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: thook1.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/thook2.sql b/binsrc/tests/biftest/thook2.sql
index b40b5e7..0532289 100644
--- a/binsrc/tests/biftest/thook2.sql
+++ b/binsrc/tests/biftest/thook2.sql
@@ -1,10 +1,10 @@
--
--- $Id: thook2.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: thook2.sql,v 1.2.2.1 2009/04/20 21:14:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/biftest/win32.mk b/binsrc/tests/biftest/win32.mk
index 25c4662..0d3a8da 100644
--- a/binsrc/tests/biftest/win32.mk
+++ b/binsrc/tests/biftest/win32.mk
@@ -1,10 +1,10 @@
#
-# $Id: win32.mk,v 1.1.1.1.2.3 2012/03/08 12:55:06 source Exp $
+# $Id: win32.mk,v 1.1.1.1.2.2 2010/01/29 16:18:03 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/blobnulls.c b/binsrc/tests/blobnulls.c
index 0732fd1..459c701 100644
--- a/binsrc/tests/blobnulls.c
+++ b/binsrc/tests/blobnulls.c
@@ -1,14 +1,14 @@
/*
* blobnulls.c
*
- * $Id: blobnulls.c,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: blobnulls.c,v 1.1.1.1.2.1 2009/04/20 21:18:31 source Exp $
*
* Test for BLOBS with NULL values passed in PutData
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/blobs.c b/binsrc/tests/blobs.c
index eeb9307..38dd9de 100644
--- a/binsrc/tests/blobs.c
+++ b/binsrc/tests/blobs.c
@@ -1,14 +1,14 @@
/*
* blobs.c
*
- * $Id: blobs.c,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: blobs.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
*
* BLOBS test
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/blobs2.c b/binsrc/tests/blobs2.c
index a5abed6..627ef62 100644
--- a/binsrc/tests/blobs2.c
+++ b/binsrc/tests/blobs2.c
@@ -1,14 +1,14 @@
/*
* blobs.c
*
- * $Id: blobs2.c,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: blobs2.c,v 1.1.1.1.2.1 2009/04/20 21:18:31 source Exp $
*
* BLOBS test
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/bsbm/Makefile.am b/binsrc/tests/bsbm/Makefile.am
index b8054e6..b3cadaa 100644
--- a/binsrc/tests/bsbm/Makefile.am
+++ b/binsrc/tests/bsbm/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
diff --git a/binsrc/tests/bsbm/Makefile.in b/binsrc/tests/bsbm/Makefile.in
index 0ff1c33..dce12fe 100644
--- a/binsrc/tests/bsbm/Makefile.in
+++ b/binsrc/tests/bsbm/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/bsbm/run_javac.sh b/binsrc/tests/bsbm/run_javac.sh
index e1f2569..47f0443 100755
--- a/binsrc/tests/bsbm/run_javac.sh
+++ b/binsrc/tests/bsbm/run_javac.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: run_javac.sh,v 1.3.2.1 2012/03/08 12:55:06 source Exp $
+# $Id: run_javac.sh,v 1.3 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/bsbm/run_test.sh b/binsrc/tests/bsbm/run_test.sh
index 3406974..fb965f6 100755
--- a/binsrc/tests/bsbm/run_test.sh
+++ b/binsrc/tests/bsbm/run_test.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: run_test.sh,v 1.6.2.1 2012/03/08 12:55:06 source Exp $
+# $Id: run_test.sh,v 1.6 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/burstoff.c b/binsrc/tests/burstoff.c
index 7cba20b..b34c930 100644
--- a/binsrc/tests/burstoff.c
+++ b/binsrc/tests/burstoff.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/butils.h b/binsrc/tests/butils.h
index 81b1fd9..a118b6d 100644
--- a/binsrc/tests/butils.h
+++ b/binsrc/tests/butils.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/chil.c b/binsrc/tests/chil.c
index be831c2..59f8877 100644
--- a/binsrc/tests/chil.c
+++ b/binsrc/tests/chil.c
@@ -1,14 +1,14 @@
/*
* chil.c
*
- * $Id: chil.c,v 1.5.2.4 2012/03/08 12:55:06 source Exp $
+ * $Id: chil.c,v 1.5.2.3 2011/10/13 18:29:57 source Exp $
*
* Server main
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/cursor.c b/binsrc/tests/cursor.c
index 4cd43f7..56a2c57 100644
--- a/binsrc/tests/cursor.c
+++ b/binsrc/tests/cursor.c
@@ -1,10 +1,10 @@
/*
- * $Id: cursor.c,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: cursor.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/davperf.sql b/binsrc/tests/davperf.sql
index aeece5d..04e0127 100644
--- a/binsrc/tests/davperf.sql
+++ b/binsrc/tests/davperf.sql
@@ -1,10 +1,10 @@
--
--- $Id: davperf.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: davperf.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/dbdump.c b/binsrc/tests/dbdump.c
index 9c97ea7..b599bb9 100644
--- a/binsrc/tests/dbdump.c
+++ b/binsrc/tests/dbdump.c
@@ -1,10 +1,10 @@
/*
- * $Id: dbdump.c,v 1.5.2.3 2012/03/08 12:55:06 source Exp $
+ * $Id: dbdump.c,v 1.5.2.2 2009/05/14 18:32:25 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/Makefile.am b/binsrc/tests/dotnet/Makefile.am
index c9953d8..820aa06 100644
--- a/binsrc/tests/dotnet/Makefile.am
+++ b/binsrc/tests/dotnet/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/dotnet/Makefile.in b/binsrc/tests/dotnet/Makefile.in
index d73992f..3826a74 100644
--- a/binsrc/tests/dotnet/Makefile.in
+++ b/binsrc/tests/dotnet/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/dotnet/Test.cs b/binsrc/tests/dotnet/Test.cs
index 414e0ea..22d7bd1 100644
--- a/binsrc/tests/dotnet/Test.cs
+++ b/binsrc/tests/dotnet/Test.cs
@@ -1,10 +1,10 @@
//
-// $Id: Test.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: Test.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs
index 65c90ed..e336d90 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs
@@ -1,10 +1,10 @@
//
-// $Id: AssemblyInfo.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: AssemblyInfo.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs
index 720f29f..2e50eff 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs
@@ -1,10 +1,10 @@
//
-// $Id: BlobTest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: BlobTest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs
index 3d6c541..9801451 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs
@@ -1,10 +1,10 @@
//
-// $Id: CommandBuilderTest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: CommandBuilderTest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs
index c13d4f2..a086037 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs
@@ -1,10 +1,10 @@
//
-// $Id: CommandTest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: CommandTest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs
index ad3f297..a792531 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs
@@ -1,10 +1,10 @@
//
-// $Id: ConnectionTest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: ConnectionTest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs
index 8de5399..0ccc437 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs
@@ -1,10 +1,10 @@
//
-// $Id: DtcTest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: DtcTest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs
index 18a0661..f366eb5 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs
@@ -1,10 +1,10 @@
//
-// $Id: SqlServer.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: SqlServer.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs
index 4b3ff5f..7f1d3e9 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs
@@ -1,10 +1,10 @@
//
-// $Id: SqlXmlTest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: SqlXmlTest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs
index a4343a1..8b2f072 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs
@@ -1,10 +1,10 @@
//
-// $Id: TimeoutTest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TimeoutTest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs
index c82f341..d9ec6b0 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs
@@ -1,10 +1,10 @@
//
-// $Id: TransactionTest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TransactionTest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs
index a6292b3..98c18f8 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs
@@ -1,10 +1,10 @@
//
-// $Id: VirtuosoClientSuite.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: VirtuosoClientSuite.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs
index 9492958..9dcf148 100644
--- a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs
+++ b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs
@@ -1,10 +1,10 @@
//
-// $Id: VirtuosoDtcSuite.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: VirtuosoDtcSuite.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/AssemblyInfo.cs b/binsrc/tests/dotnet/harness/AssemblyInfo.cs
index 0ecb81d..c0dc3fa 100644
--- a/binsrc/tests/dotnet/harness/AssemblyInfo.cs
+++ b/binsrc/tests/dotnet/harness/AssemblyInfo.cs
@@ -1,10 +1,10 @@
//
-// $Id: AssemblyInfo.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: AssemblyInfo.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs
index 42bcf46..857b070 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs
@@ -1,10 +1,10 @@
//
-// $Id: ComparisonException.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: ComparisonException.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs
index 9e52c86..c09c8f6 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs
@@ -1,10 +1,10 @@
//
-// $Id: ITest.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: ITest.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs
index b2053c7..da41823 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs
@@ -1,10 +1,10 @@
//
-// $Id: ITestListener.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: ITestListener.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs
index d8e0618..3bc8404 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestCase.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestCase.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs
index 1e8b7a9..6f1e4f4 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestCaseAttribute.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestCaseAttribute.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs
index 03bd025..be11a96 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestCaseResult.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestCaseResult.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs
index a660095..91618d9 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestFailedException.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestFailedException.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs
index 5f8a0cf..9f8533c 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestResult.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestResult.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs
index a48c39e..56e904c 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestSkippedException.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestSkippedException.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs
index ca170b0..af35284 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestStatus.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestStatus.cs,v 1.1.1.1.2.1 2009/04/20 21:15:31 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs
index 405b071..3934500 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestStatusCode.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestStatusCode.cs,v 1.1.1.1.2.1 2009/04/20 21:15:32 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs
index b504d81..152c75e 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestSuite.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestSuite.cs,v 1.1.1.1.2.1 2009/04/20 21:15:32 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs
index 2ca03aa..0d27424 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestSuiteAttribute.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestSuiteAttribute.cs,v 1.1.1.1.2.1 2009/04/20 21:15:32 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs
index af89ff2..1312906 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs
@@ -1,10 +1,10 @@
//
-// $Id: BaseTestRunner.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: BaseTestRunner.cs,v 1.1.1.1.2.1 2009/04/20 21:15:32 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs
index 123b651..0a4159a 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs
@@ -1,10 +1,10 @@
//
-// $Id: ConsoleTestRunner.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: ConsoleTestRunner.cs,v 1.1.1.1.2.1 2009/04/20 21:15:32 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs
index 18092b2..f18df1e 100644
--- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs
+++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs
@@ -1,10 +1,10 @@
//
-// $Id: TestSettings.cs,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+// $Id: TestSettings.cs,v 1.1.1.1.2.1 2009/04/20 21:15:32 source Exp $
//
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/dotnet/test_server.sh b/binsrc/tests/dotnet/test_server.sh
index d8be7e3..9b26be6 100755
--- a/binsrc/tests/dotnet/test_server.sh
+++ b/binsrc/tests/dotnet/test_server.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test_server.sh,v 1.4.2.2 2012/03/08 12:55:07 source Exp $
+# $Id: test_server.sh,v 1.4.2.1 2009/04/20 21:15:31 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/force_dbms_name.c b/binsrc/tests/force_dbms_name.c
index b60a23d..ca8337d 100644
--- a/binsrc/tests/force_dbms_name.c
+++ b/binsrc/tests/force_dbms_name.c
@@ -1,7 +1,7 @@
/*
* force_dbms_name.c
*
- * $Id: force_dbms_name.c,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: force_dbms_name.c,v 1.1.1.1.2.1 2009/04/20 21:18:31 source Exp $
*
* Testsuite for FORCE_DBMS_NAME connect option.
* set the DBMS name to haha.
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/getdata.c b/binsrc/tests/getdata.c
index 5754a1a..bd99a13 100644
--- a/binsrc/tests/getdata.c
+++ b/binsrc/tests/getdata.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/inifile.c b/binsrc/tests/inifile.c
index 57118c2..edb22bb 100644
--- a/binsrc/tests/inifile.c
+++ b/binsrc/tests/inifile.c
@@ -1,14 +1,14 @@
/*
* inifile.c
*
- * $Id: inifile.c,v 1.1.1.1.2.3 2012/03/08 12:55:06 source Exp $
+ * $Id: inifile.c,v 1.1.1.1.2.2 2009/11/26 20:37:00 source Exp $
*
* Get fields out of an ini file and possibly rewrite them
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/inifile.vers.c b/binsrc/tests/inifile.vers.c
index 7799a9a..7907448 100644
--- a/binsrc/tests/inifile.vers.c
+++ b/binsrc/tests/inifile.vers.c
@@ -4,6 +4,6 @@
char version[] = "\
Ini file configuration utility\n\
-Version 1.4 as of Thu Nov 11 13:03:39 CET 2010.\n\
-Compiled for Linux 2.6.34.7-56.fc13.x86_64\n\
+Version 1.4 as of Tue Mar 29 22:10:47 CEST 2011.\n\
+Compiled for Linux 2.6.27.56-0.1-default\n\
Copyright (C) OpenLink Software.\n";
diff --git a/binsrc/tests/ins.c b/binsrc/tests/ins.c
index 588982a..929b849 100644
--- a/binsrc/tests/ins.c
+++ b/binsrc/tests/ins.c
@@ -1,14 +1,14 @@
/*
* ins.c
*
- * $Id: ins.c,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: ins.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
*
* Insert test
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/isql.c b/binsrc/tests/isql.c
index b34d61e..76341c7 100644
--- a/binsrc/tests/isql.c
+++ b/binsrc/tests/isql.c
@@ -1,10 +1,10 @@
/*
- * $Id: isql.c,v 1.3.2.7 2012/03/12 10:28:52 source Exp $
+ * $Id: isql.c,v 1.3.2.4 2011/03/25 17:47:30 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -645,7 +645,7 @@ TCHAR *web_query_string = NULL; /* from environment variable QUERY_STRING */
int web_mode = 0; /* Is set to 1 in the beginning of main if used
as a cgi-script */
int kubl_mode = 1; /* Currently affects only how MAXROWS are handled. */
-int print_banner_flag = 1, print_types_also = 1, verbose_mode = 1, echo_mode = 0, explain_mode = 0, sparql_translate_mode = 0;
+int print_banner_flag = 1, print_types_also = 1, verbose_mode = 1, echo_mode = 0;
int flag_newlines_at_eor = 1; /* By default print one nl at the end of row */
long int select_max_rows = 0; /* By default show them all. */
long int perm_deadlock_retries = 0, vol_deadlock_retries = 0;
@@ -2625,8 +2625,6 @@ add_var_def (_T("FORM_LAST_ENCODING"), (&form_last_encoding), CHARPTR_VAR, NULL)
add_var_def (_T("BLOBS"), (&print_blobs_flag), INT_FLAG, OFF_ON),
add_var_def (_T("FOREACH_ERR_BREAK"), (&foreach_err_break), INT_FLAG, OFF_ON),
add_var_def (_T("ECHO"), (&echo_mode), INT_FLAG, OFF_ON),
- add_var_def (_T("EXPLAIN"), (&explain_mode), INT_FLAG, OFF_ON),
- add_var_def (_T("SPARQL_TRANSLATE"), (&sparql_translate_mode), INT_FLAG, OFF_ON),
add_var_def (_T("HIDDEN_CRS"), (&clear_hidden_crs_flag), INT_FLAG, PRESERVED_CLEARED),
add_var_def (_T("BINARY_OUTPUT"), (&flag_binary_output), INT_FLAG, OFF_ON),
add_var_def (_T("BANNER"), (&print_banner_flag), INT_FLAG, OFF_ON),
@@ -5903,32 +5901,9 @@ again_exec:;
);
IF_ERR_GO (stmt, error, rc);
- rc = SQLExecDirect (stmt, UCP (text), SQL_NTS);
- }
- else if (explain_mode)
- {
- rc = SQLPrepare (stmt, _T("EXPLAIN(?)"), SQL_NTS);
- IF_ERR_GO (stmt, error, rc);
- rc = SQLBindParameter (stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, isqlt_tcslen(text), 0, UCP(text), isqlt_tcslen(text), NULL);
- IF_ERR_GO (stmt, error, rc);
- rc = SQLExecute (stmt);
- }
- else if (sparql_translate_mode)
- {
- const TCHAR* q = text;
- if (!strncasecmp (text, _T("SPARQL"), isqlt_tcslen(_T("SPARQL"))))
- q = text + isqlt_tcslen(_T("SPARQL"));
-
- rc = SQLPrepare (stmt, _T("SELECT SPARQL_TO_SQL_TEXT(?)"), SQL_NTS);
- IF_ERR_GO (stmt, error, rc);
- rc = SQLBindParameter (stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, isqlt_tcslen(q), 0, UCP(q), isqlt_tcslen(q), NULL);
- IF_ERR_GO (stmt, error, rc);
- rc = SQLExecute (stmt);
- }
- else
- {
- rc = SQLExecDirect (stmt, UCP (text), SQL_NTS);
}
+
+ rc = SQLExecDirect (stmt, UCP (text), SQL_NTS);
}
else if (rc == DO_SQL_API_COMMAND_IS_NOT_AVAILABLE)
{ /* Should we free something? */
@@ -9378,6 +9353,10 @@ handle_multipart_form (TCHAR *boundary, FILE * in_fp)
form_boundary = chestrdup (boundary, me);
+#ifdef WIN32
+ setmode (fileno (stdin), _O_BINARY); /* _O_TEXT is ASCII mode. */
+#endif
+
while (0 != (got_anything = bin_fgets (inpoint, IN_BATCH, in_fp)))
{
/*
@@ -9504,9 +9483,6 @@ _tmain (int argc, TCHAR **argv)
"Possibly wrong setting for LANG environment variable. "
"Using the C locale instead.\n");
#endif
-#ifdef WIN32
- setmode (fileno (stdin), _O_BINARY);
-#endif
#ifdef MALLOC_DEBUG
dbg_malloc_enable();
#endif
diff --git a/binsrc/tests/isql_tchar.h b/binsrc/tests/isql_tchar.h
index 3107c80..99d82b5 100644
--- a/binsrc/tests/isql_tchar.h
+++ b/binsrc/tests/isql_tchar.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/isql_wfuncs.c b/binsrc/tests/isql_wfuncs.c
index 07fc571..e205f40 100644
--- a/binsrc/tests/isql_wfuncs.c
+++ b/binsrc/tests/isql_wfuncs.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/isql_win32.c b/binsrc/tests/isql_win32.c
index 84d93fe..5516a00 100644
--- a/binsrc/tests/isql_win32.c
+++ b/binsrc/tests/isql_win32.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm-cli.c b/binsrc/tests/lubm-cli.c
index c70ba06..b3f0a6a 100644
--- a/binsrc/tests/lubm-cli.c
+++ b/binsrc/tests/lubm-cli.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm/Makefile.am b/binsrc/tests/lubm/Makefile.am
index cf27161..37d563d 100644
--- a/binsrc/tests/lubm/Makefile.am
+++ b/binsrc/tests/lubm/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
diff --git a/binsrc/tests/lubm/Makefile.in b/binsrc/tests/lubm/Makefile.in
index dae63ca..2b7605a 100644
--- a/binsrc/tests/lubm/Makefile.in
+++ b/binsrc/tests/lubm/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
@@ -101,7 +101,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -150,7 +149,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -202,7 +200,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -249,6 +246,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/lubm/big-lubm-load.sql b/binsrc/tests/lubm/big-lubm-load.sql
index 32205e8..d1e096a 100644
--- a/binsrc/tests/lubm/big-lubm-load.sql
+++ b/binsrc/tests/lubm/big-lubm-load.sql
@@ -1,10 +1,10 @@
--
--- $Id: big-lubm-load.sql,v 1.1.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: big-lubm-load.sql,v 1.1.2.1 2009/12/22 10:37:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm/lubm-cp.sql b/binsrc/tests/lubm/lubm-cp.sql
index f45b1ea..3d3ba8b 100644
--- a/binsrc/tests/lubm/lubm-cp.sql
+++ b/binsrc/tests/lubm/lubm-cp.sql
@@ -1,10 +1,10 @@
--
--- $Id: lubm-cp.sql,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: lubm-cp.sql,v 1.2.2.1 2009/12/22 10:37:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm/lubm-inf.sql b/binsrc/tests/lubm/lubm-inf.sql
index 23b67c3..f498c89 100644
--- a/binsrc/tests/lubm/lubm-inf.sql
+++ b/binsrc/tests/lubm/lubm-inf.sql
@@ -1,10 +1,10 @@
--
--- $Id: lubm-inf.sql,v 1.3.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: lubm-inf.sql,v 1.3.2.1 2009/12/22 10:37:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm/lubm-load.sql b/binsrc/tests/lubm/lubm-load.sql
index ee55eec..40c38d0 100644
--- a/binsrc/tests/lubm/lubm-load.sql
+++ b/binsrc/tests/lubm/lubm-load.sql
@@ -1,10 +1,10 @@
--
--- $Id: lubm-load.sql,v 1.6.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: lubm-load.sql,v 1.6.2.1 2009/12/22 10:37:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm/lubm-org.sql b/binsrc/tests/lubm/lubm-org.sql
index fd3fb93..8cacda0 100644
--- a/binsrc/tests/lubm/lubm-org.sql
+++ b/binsrc/tests/lubm/lubm-org.sql
@@ -1,10 +1,10 @@
--
--- $Id: lubm-org.sql,v 1.1.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: lubm-org.sql,v 1.1.2.1 2009/12/22 10:37:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm/lubm-phys.sql b/binsrc/tests/lubm/lubm-phys.sql
index 329d018..dcec348 100644
--- a/binsrc/tests/lubm/lubm-phys.sql
+++ b/binsrc/tests/lubm/lubm-phys.sql
@@ -1,10 +1,10 @@
--
--- $Id: lubm-phys.sql,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: lubm-phys.sql,v 1.2.2.1 2009/12/22 10:37:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm/lubm.sql b/binsrc/tests/lubm/lubm.sql
index 2878bcb..b85e76e 100644
--- a/binsrc/tests/lubm/lubm.sql
+++ b/binsrc/tests/lubm/lubm.sql
@@ -1,10 +1,10 @@
--
--- $Id: lubm.sql,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: lubm.sql,v 1.2.2.1 2009/12/22 10:37:52 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/lubm/test_server.sh b/binsrc/tests/lubm/test_server.sh
index 6b45a2a..9209ef8 100755
--- a/binsrc/tests/lubm/test_server.sh
+++ b/binsrc/tests/lubm/test_server.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: test_server.sh,v 1.1.2.3 2012/03/08 12:55:07 source Exp $
+# $Id: test_server.sh,v 1.1.2.2 2010/01/05 19:12:15 source Exp $
#
# choose a server to run with
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/lubm/tlubm.sh b/binsrc/tests/lubm/tlubm.sh
index 4381cb5..b051191 100755
--- a/binsrc/tests/lubm/tlubm.sh
+++ b/binsrc/tests/lubm/tlubm.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tlubm.sh,v 1.1.2.3 2012/03/08 12:55:07 source Exp $
+# $Id: tlubm.sh,v 1.1.2.2 2010/01/05 19:12:15 source Exp $
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/lubm/trdfrng.sql b/binsrc/tests/lubm/trdfrng.sql
index 6c7119f..5bbb60a 100644
--- a/binsrc/tests/lubm/trdfrng.sql
+++ b/binsrc/tests/lubm/trdfrng.sql
@@ -1,10 +1,10 @@
--
--- $Id: trdfrng.sql,v 1.1.2.4 2012/03/08 12:55:07 source Exp $
+-- $Id: trdfrng.sql,v 1.1.2.3 2010/01/05 19:12:15 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/mail_virt.c b/binsrc/tests/mail_virt.c
index af57551..5d15305 100644
--- a/binsrc/tests/mail_virt.c
+++ b/binsrc/tests/mail_virt.c
@@ -1,12 +1,12 @@
/*
- * $Id: mail_virt.c,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: mail_virt.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
*
* Virtuoso Local mailer
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/odbcinc.h b/binsrc/tests/odbcinc.h
index 81a3e53..75ba622 100644
--- a/binsrc/tests/odbcinc.h
+++ b/binsrc/tests/odbcinc.h
@@ -1,14 +1,14 @@
/*
* odbcinc.h
*
- * $Id: odbcinc.h,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: odbcinc.h,v 1.1.1.1.2.1 2009/04/20 21:18:31 source Exp $
*
* Include the ODBC header, whichever appropriate
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/odbcuti.h b/binsrc/tests/odbcuti.h
index 58274ce..d808620 100644
--- a/binsrc/tests/odbcuti.h
+++ b/binsrc/tests/odbcuti.h
@@ -1,14 +1,14 @@
/*
* odbcuti.c
*
- * $Id: odbcuti.h,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: odbcuti.h,v 1.1.1.1.2.1 2009/04/20 21:18:31 source Exp $
*
* ODBC utility macros
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/oledb/Makefile.am b/binsrc/tests/oledb/Makefile.am
index 11ce103..652e0f8 100644
--- a/binsrc/tests/oledb/Makefile.am
+++ b/binsrc/tests/oledb/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/oledb/Makefile.in b/binsrc/tests/oledb/Makefile.in
index a332898..431871f 100644
--- a/binsrc/tests/oledb/Makefile.in
+++ b/binsrc/tests/oledb/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/oledb/dts_import.sql b/binsrc/tests/oledb/dts_import.sql
index 329222d..c955fcf 100644
--- a/binsrc/tests/oledb/dts_import.sql
+++ b/binsrc/tests/oledb/dts_import.sql
@@ -1,10 +1,10 @@
--
--- $Id: dts_import.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: dts_import.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/paramstats.c b/binsrc/tests/paramstats.c
index 5340da1..bd535a1 100644
--- a/binsrc/tests/paramstats.c
+++ b/binsrc/tests/paramstats.c
@@ -1,14 +1,14 @@
/*
* paramstats.c
*
- * $Id: paramstats.c,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: paramstats.c,v 1.1.1.1.2.1 2009/04/20 21:18:31 source Exp $
*
* param status pointer test (bug 1293)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/rdf/Makefile.am b/binsrc/tests/rdf/Makefile.am
index 2d30cfb..e1d4713 100644
--- a/binsrc/tests/rdf/Makefile.am
+++ b/binsrc/tests/rdf/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/rdf/Makefile.in b/binsrc/tests/rdf/Makefile.in
index be3f96e..93c454d 100644
--- a/binsrc/tests/rdf/Makefile.in
+++ b/binsrc/tests/rdf/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/rdf/articles.sql b/binsrc/tests/rdf/articles.sql
index 468b0f2..6f0c36d 100644
--- a/binsrc/tests/rdf/articles.sql
+++ b/binsrc/tests/rdf/articles.sql
@@ -1,10 +1,10 @@
--
--- $Id: articles.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: articles.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/rdf/rdf-exp-load.xsl b/binsrc/tests/rdf/rdf-exp-load.xsl
index 3a75905..c755b36 100644
--- a/binsrc/tests/rdf/rdf-exp-load.xsl
+++ b/binsrc/tests/rdf/rdf-exp-load.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf-exp-load.xsl,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+ - $Id: rdf-exp-load.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl b/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl
index b2ceb20..b207902 100644
--- a/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl
+++ b/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf-exp-rdfxml2dict.xsl,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+ - $Id: rdf-exp-rdfxml2dict.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/rdf/rdf-exp.sql b/binsrc/tests/rdf/rdf-exp.sql
index a515dfc..b6b1909 100644
--- a/binsrc/tests/rdf/rdf-exp.sql
+++ b/binsrc/tests/rdf/rdf-exp.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdf-exp.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: rdf-exp.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/rdf/rdfbase.sql b/binsrc/tests/rdf/rdfbase.sql
index e5855c1..1bf8524 100644
--- a/binsrc/tests/rdf/rdfbase.sql
+++ b/binsrc/tests/rdf/rdfbase.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdfbase.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: rdfbase.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/rdf/rdfxmlload.xsl b/binsrc/tests/rdf/rdfxmlload.xsl
index e3058c2..fe3d9dd 100644
--- a/binsrc/tests/rdf/rdfxmlload.xsl
+++ b/binsrc/tests/rdf/rdfxmlload.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdfxmlload.xsl,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+ - $Id: rdfxmlload.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/rdf/wordnet.sql b/binsrc/tests/rdf/wordnet.sql
index de8b74f..41c604a 100644
--- a/binsrc/tests/rdf/wordnet.sql
+++ b/binsrc/tests/rdf/wordnet.sql
@@ -1,10 +1,10 @@
--
--- $Id: wordnet.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: wordnet.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/runbg.c b/binsrc/tests/runbg.c
index f7eb6f7..1c1c4a3 100644
--- a/binsrc/tests/runbg.c
+++ b/binsrc/tests/runbg.c
@@ -1,14 +1,14 @@
/*
* runbg.c
*
- * $Id: runbg.c,v 1.1.1.1.2.3 2012/03/08 12:55:06 source Exp $
+ * $Id: runbg.c,v 1.1.1.1.2.2 2009/11/26 20:37:27 source Exp $
*
* Runs a process in the background, similar to nohup but slightly different.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/scroll.c b/binsrc/tests/scroll.c
index 538e6cb..0293f12 100644
--- a/binsrc/tests/scroll.c
+++ b/binsrc/tests/scroll.c
@@ -1,14 +1,14 @@
/*
* scroll.c
*
- * $Id: scroll.c,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: scroll.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
*
* scroll test
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/setcurs.c b/binsrc/tests/setcurs.c
index ed24833..6ccf2f4 100644
--- a/binsrc/tests/setcurs.c
+++ b/binsrc/tests/setcurs.c
@@ -1,7 +1,7 @@
/*
* setcurs.c
*
- * $Id: setcurs.c,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: setcurs.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
*
* Testsuite for SQLSetCursorName() call.
* In order it to work there should be the following statements :
@@ -11,7 +11,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/smtpsend.c b/binsrc/tests/smtpsend.c
index b8ff89e..63e9b30 100644
--- a/binsrc/tests/smtpsend.c
+++ b/binsrc/tests/smtpsend.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/Makefile.am b/binsrc/tests/suite/Makefile.am
index 6c1f459..ff45796 100644
--- a/binsrc/tests/suite/Makefile.am
+++ b/binsrc/tests/suite/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/Makefile.in b/binsrc/tests/suite/Makefile.in
index bdb8e48..16bb03f 100644
--- a/binsrc/tests/suite/Makefile.in
+++ b/binsrc/tests/suite/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -141,7 +141,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -190,7 +189,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -242,7 +240,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -289,6 +286,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/suite/audit.txt b/binsrc/tests/suite/audit.txt
new file mode 100644
index 0000000..06cdc16
--- /dev/null
+++ b/binsrc/tests/suite/audit.txt
@@ -0,0 +1,3 @@
+Virtuoso release check passed
+Fri Oct 28 20:13:46 CEST 2011
+Linux dyn209 2.6.37.1-1.2-default #1 SMP 2011-02-21 10:34:10 +0100 x86_64 x86_64 x86_64 GNU/Linux
diff --git a/binsrc/tests/suite/backup.sql b/binsrc/tests/suite/backup.sql
index ad61ad6..e0d01fd 100644
--- a/binsrc/tests/suite/backup.sql
+++ b/binsrc/tests/suite/backup.sql
@@ -1,14 +1,14 @@
--
-- backup.sql
--
--- $Id: backup.sql,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: backup.sql,v 1.1.1.1.2.1 2009/04/16 12:37:42 source Exp $
--
-- Make an On-Line Backup
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/blobs.sql b/binsrc/tests/suite/blobs.sql
index 543dabf..c7a3171 100644
--- a/binsrc/tests/suite/blobs.sql
+++ b/binsrc/tests/suite/blobs.sql
@@ -1,14 +1,14 @@
--
-- blobs.sql
--
--- $Id: blobs.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: blobs.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Check Blob fields
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/bpel.sh b/binsrc/tests/suite/bpel.sh
index 1772de4..e0b23d0 100755
--- a/binsrc/tests/suite/bpel.sh
+++ b/binsrc/tests/suite/bpel.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: bpel.sh,v 1.4.2.3 2012/03/08 12:55:07 source Exp $
+# $Id: bpel.sh,v 1.4.2.2 2009/07/09 13:04:50 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/byteorder.sh b/binsrc/tests/suite/byteorder.sh
index 3f7211d..6efc29a 100755
--- a/binsrc/tests/suite/byteorder.sh
+++ b/binsrc/tests/suite/byteorder.sh
@@ -1,14 +1,14 @@
#!/bin/sh
# tsql.sh
#
-# $Id: byteorder.sh,v 1.1.1.1.2.3 2012/03/08 12:55:07 source Exp $
+# $Id: byteorder.sh,v 1.1.1.1.2.2 2009/07/09 13:04:50 source Exp $
#
# VARIOUS MACHINE BYTEORDER support
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/byteorder.sql b/binsrc/tests/suite/byteorder.sql
index 7b29e43..0e285a4 100644
--- a/binsrc/tests/suite/byteorder.sql
+++ b/binsrc/tests/suite/byteorder.sql
@@ -1,10 +1,10 @@
--
--- $Id: byteorder.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: byteorder.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ce.xml b/binsrc/tests/suite/ce.xml
index 722d8dc..43a6552 100644
--- a/binsrc/tests/suite/ce.xml
+++ b/binsrc/tests/suite/ce.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/clean.sh b/binsrc/tests/suite/clean.sh
index 2cee249..7ab62de 100755
--- a/binsrc/tests/suite/clean.sh
+++ b/binsrc/tests/suite/clean.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: clean.sh,v 1.8.2.4 2012/03/08 12:55:07 source Exp $
+# $Id: clean.sh,v 1.8.2.3 2009/11/17 21:01:00 source Exp $
#
# Cleanup after running the testsuite
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/cube.sql b/binsrc/tests/suite/cube.sql
index 4aaec2e..0dc6f3c 100644
--- a/binsrc/tests/suite/cube.sql
+++ b/binsrc/tests/suite/cube.sql
@@ -1,10 +1,10 @@
--
--- $Id: cube.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: cube.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/dbev_login.sql b/binsrc/tests/suite/dbev_login.sql
index 97de1d9..dc21c1c 100644
--- a/binsrc/tests/suite/dbev_login.sql
+++ b/binsrc/tests/suite/dbev_login.sql
@@ -1,10 +1,10 @@
--
--- $Id: dbev_login.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: dbev_login.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/dbconcepts.xml b/binsrc/tests/suite/docsrc/dbconcepts.xml
index bedc8de..31d7401 100644
--- a/binsrc/tests/suite/docsrc/dbconcepts.xml
+++ b/binsrc/tests/suite/docsrc/dbconcepts.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/html_common_v.xsl b/binsrc/tests/suite/docsrc/html_common_v.xsl
index 40cb870..ad9f31f 100644
--- a/binsrc/tests/suite/docsrc/html_common_v.xsl
+++ b/binsrc/tests/suite/docsrc/html_common_v.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_common_v.xsl,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+ - $Id: html_common_v.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/intl.xml b/binsrc/tests/suite/docsrc/intl.xml
index 8aa8397..7bd3685 100644
--- a/binsrc/tests/suite/docsrc/intl.xml
+++ b/binsrc/tests/suite/docsrc/intl.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/odbcimplementation.xml b/binsrc/tests/suite/docsrc/odbcimplementation.xml
index 679b5c4..6d6f347 100644
--- a/binsrc/tests/suite/docsrc/odbcimplementation.xml
+++ b/binsrc/tests/suite/docsrc/odbcimplementation.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/ptune.xml b/binsrc/tests/suite/docsrc/ptune.xml
index 47c6d9d..3bacc47 100644
--- a/binsrc/tests/suite/docsrc/ptune.xml
+++ b/binsrc/tests/suite/docsrc/ptune.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/repl.xml b/binsrc/tests/suite/docsrc/repl.xml
index 2e731c5..8bb191d 100644
--- a/binsrc/tests/suite/docsrc/repl.xml
+++ b/binsrc/tests/suite/docsrc/repl.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/server.xml b/binsrc/tests/suite/docsrc/server.xml
index 4aa47a4..d0705d9 100644
--- a/binsrc/tests/suite/docsrc/server.xml
+++ b/binsrc/tests/suite/docsrc/server.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -94,7 +94,7 @@ started from the Control Panel or automatically at system startup.
;
; virtuoso.ini
;
-; $Id: server.xml,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+; $Id: server.xml,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
;
; Configuration file for the OpenLink Virtuoso VDBMS Server
;
diff --git a/binsrc/tests/suite/docsrc/sqlfunctions.xml b/binsrc/tests/suite/docsrc/sqlfunctions.xml
index 706e761..03f4cf3 100644
--- a/binsrc/tests/suite/docsrc/sqlfunctions.xml
+++ b/binsrc/tests/suite/docsrc/sqlfunctions.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/sqlprocedures.xml b/binsrc/tests/suite/docsrc/sqlprocedures.xml
index 0ef467a..d18e3c0 100644
--- a/binsrc/tests/suite/docsrc/sqlprocedures.xml
+++ b/binsrc/tests/suite/docsrc/sqlprocedures.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/sqlreference.xml b/binsrc/tests/suite/docsrc/sqlreference.xml
index d3f985b..64962d3 100644
--- a/binsrc/tests/suite/docsrc/sqlreference.xml
+++ b/binsrc/tests/suite/docsrc/sqlreference.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/tsales.xml b/binsrc/tests/suite/docsrc/tsales.xml
index fb5f106..eb57961 100644
--- a/binsrc/tests/suite/docsrc/tsales.xml
+++ b/binsrc/tests/suite/docsrc/tsales.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/tsales.xsl b/binsrc/tests/suite/docsrc/tsales.xsl
index b411739..4c04766 100644
--- a/binsrc/tests/suite/docsrc/tsales.xsl
+++ b/binsrc/tests/suite/docsrc/tsales.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tsales.xsl,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+ - $Id: tsales.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/tsales2.xsl b/binsrc/tests/suite/docsrc/tsales2.xsl
index 6944f68..c84346b 100644
--- a/binsrc/tests/suite/docsrc/tsales2.xsl
+++ b/binsrc/tests/suite/docsrc/tsales2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tsales2.xsl,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+ - $Id: tsales2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/docsrc/vdbconcepts.xml b/binsrc/tests/suite/docsrc/vdbconcepts.xml
index 5074923..deef2f1 100644
--- a/binsrc/tests/suite/docsrc/vdbconcepts.xml
+++ b/binsrc/tests/suite/docsrc/vdbconcepts.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/emp.xsl b/binsrc/tests/suite/emp.xsl
index 0350f57..baf84e4 100644
--- a/binsrc/tests/suite/emp.xsl
+++ b/binsrc/tests/suite/emp.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: emp.xsl,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+ - $Id: emp.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/emp_my.xsl b/binsrc/tests/suite/emp_my.xsl
index 0941a39..4cd57d2 100644
--- a/binsrc/tests/suite/emp_my.xsl
+++ b/binsrc/tests/suite/emp_my.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: emp_my.xsl,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+ - $Id: emp_my.xsl,v 1.2 2006/08/15 22:09:20 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/error.sql b/binsrc/tests/suite/error.sql
index 1bdc831..2dc7f8e 100644
--- a/binsrc/tests/suite/error.sql
+++ b/binsrc/tests/suite/error.sql
@@ -1,10 +1,10 @@
--
--- $Id: error.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: error.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ftirepl.sql b/binsrc/tests/suite/ftirepl.sql
index 74f4561..9b697a0 100644
--- a/binsrc/tests/suite/ftirepl.sql
+++ b/binsrc/tests/suite/ftirepl.sql
@@ -1,10 +1,10 @@
--
--- $Id: ftirepl.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: ftirepl.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/gtkbench.sh b/binsrc/tests/suite/gtkbench.sh
index 514bdbf..4c8c040 100755
--- a/binsrc/tests/suite/gtkbench.sh
+++ b/binsrc/tests/suite/gtkbench.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: gtkbench.sh,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+# $Id: gtkbench.sh,v 1.2.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/ident.txt b/binsrc/tests/suite/ident.txt
index 93b164e..0f4c16f 100644
--- a/binsrc/tests/suite/ident.txt
+++ b/binsrc/tests/suite/ident.txt
@@ -3,23 +3,23 @@ VARCHAR
_______________________________________________________________________________
OpenLink Virtuoso Server
-Version 06.01.3127-pthreads for Linux as of Mar 15 2012
-Started on: 2012/03/15 18:51 GMT+60
+Version 06.01.3127-pthreads for Linux as of Oct 28 2011
+Started on: 2011/10/28 20:13 GMT+120
Database Status:
- File size 20971520, 2560 pages, 2030 free.
- 20000 buffers, 500 used, 0 dirty 0 wired down, repl age 0 0 w. io 0 w/crsr.
- Disk Usage: 8 reads avg 0 msec, 0% r 0% w last 0 s, 574 writes,
+ File size 20971520, 2560 pages, 2010 free.
+ 2000 buffers, 501 used, 0 dirty 0 wired down, repl age 0 0 w. io 0 w/crsr.
+ Disk Usage: 8 reads avg 0 msec, 0% r 0% w last 0 s, 566 writes,
0 read ahead, batch = 0. Autocompact 81 in 58 out, 28% saved.
Gate: 0 2nd in reads, 0 gate write waits, 0 in while read 0 busy scrap.
Log = virtuoso.trx, 155 bytes
-500 pages have been changed since last backup (in checkpoint state)
+501 pages have been changed since last backup (in checkpoint state)
Current backup timestamp: 0x0000-0x00-0x00
Last backup date: unknown
Clients: 1 connects, max 1 concurrent
-RPC: 4 calls, 1 pending, 1 max until now, 0 queued, 2 burst reads (50%), 0 second brk=161202176
-Checkpoint Remap 19 pages, 0 mapped back. 0 s atomic time.
- DB master 2560 total 2030 free 19 remap 0 mapped back
+RPC: 4 calls, 1 pending, 1 max until now, 0 queued, 0 burst reads (0%), 0 second brk=160923648
+Checkpoint Remap 38 pages, 0 mapped back. 0 s atomic time.
+ DB master 2560 total 2010 free 38 remap 0 mapped back
temp 256 total 251 free
Lock Status: 0 deadlocks of which 0 2r1w, 0 waits,
@@ -27,14 +27,14 @@ Lock Status: 0 deadlocks of which 0 2r1w, 0 waits,
Pending:
Client 1111:1: Account: dba, 203 bytes in, 256 bytes out, 1 stmts.
-PID: 26276, OS: unix, Application: unknown, IP#: 127.0.0.1
+PID: 8379, OS: unix, Application: unknown, IP#: 127.0.0.1
Transaction status: PENDING, 1 threads.
Locks:
Running Statements:
Time (msec) Text
- 49 status()
+ 30 status()
Hash indexes
diff --git a/binsrc/tests/suite/inprocess.sh b/binsrc/tests/suite/inprocess.sh
index 47f928e..b9b4962 100755
--- a/binsrc/tests/suite/inprocess.sh
+++ b/binsrc/tests/suite/inprocess.sh
@@ -2,14 +2,14 @@
#
# inprocess.sh
#
-# $Id: inprocess.sh,v 1.1.1.1.2.3 2012/03/08 12:55:07 source Exp $
+# $Id: inprocess.sh,v 1.1.1.1.2.2 2009/07/09 13:04:50 source Exp $
#
# inprocess client tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/inprocess.sql b/binsrc/tests/suite/inprocess.sql
index c7b4a27..149d2e8 100644
--- a/binsrc/tests/suite/inprocess.sql
+++ b/binsrc/tests/suite/inprocess.sql
@@ -1,14 +1,14 @@
--
-- inprocess.sql
--
--- $Id: inprocess.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: inprocess.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- inprocess client tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/large_db.sh b/binsrc/tests/suite/large_db.sh
index e6372f7..24faa44 100755
--- a/binsrc/tests/suite/large_db.sh
+++ b/binsrc/tests/suite/large_db.sh
@@ -1,14 +1,14 @@
#!/bin/sh
# large_db.sh
#
-# $Id: large_db.sh,v 1.1.1.1.2.3 2012/03/08 12:55:07 source Exp $
+# $Id: large_db.sh,v 1.1.1.1.2.2 2009/07/09 13:04:50 source Exp $
#
# Large (>2Gb) database file support tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/large_db.sql b/binsrc/tests/suite/large_db.sql
index 83bdc94..6022e50 100644
--- a/binsrc/tests/suite/large_db.sql
+++ b/binsrc/tests/suite/large_db.sql
@@ -1,14 +1,14 @@
--
-- large_db.sql
--
--- $Id: large_db.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: large_db.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/large_db_3g.sql b/binsrc/tests/suite/large_db_3g.sql
index 9211a4b..456f49e 100644
--- a/binsrc/tests/suite/large_db_3g.sql
+++ b/binsrc/tests/suite/large_db_3g.sql
@@ -1,14 +1,14 @@
--
-- large_db.sql
--
--- $Id: large_db_3g.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: large_db_3g.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/large_db_3g_check.sql b/binsrc/tests/suite/large_db_3g_check.sql
index 3c8935c..b3a327e 100644
--- a/binsrc/tests/suite/large_db_3g_check.sql
+++ b/binsrc/tests/suite/large_db_3g_check.sql
@@ -1,14 +1,14 @@
--
-- large_db_check.sql
--
--- $Id: large_db_3g_check.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: large_db_3g_check.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/large_db_5g.sql b/binsrc/tests/suite/large_db_5g.sql
index 771f4e1..94f75d3 100644
--- a/binsrc/tests/suite/large_db_5g.sql
+++ b/binsrc/tests/suite/large_db_5g.sql
@@ -1,14 +1,14 @@
--
-- large_db.sql
--
--- $Id: large_db_5g.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: large_db_5g.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/large_db_backup.sql b/binsrc/tests/suite/large_db_backup.sql
index 3c81493..49cb7a1 100644
--- a/binsrc/tests/suite/large_db_backup.sql
+++ b/binsrc/tests/suite/large_db_backup.sql
@@ -1,10 +1,10 @@
--
--- $Id: large_db_backup.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: large_db_backup.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/large_db_check.sql b/binsrc/tests/suite/large_db_check.sql
index 00dbf86..6d6b5b2 100644
--- a/binsrc/tests/suite/large_db_check.sql
+++ b/binsrc/tests/suite/large_db_check.sql
@@ -1,14 +1,14 @@
--
-- large_db_check.sql
--
--- $Id: large_db_check.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: large_db_check.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Large DB test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ldmeter.sql b/binsrc/tests/suite/ldmeter.sql
index dbabf04..efa9fa2 100644
--- a/binsrc/tests/suite/ldmeter.sql
+++ b/binsrc/tests/suite/ldmeter.sql
@@ -70,18 +70,11 @@ create procedure ld_sample (in is_first int := 0)
create procedure ld_meter_run (in s_delay int)
{
- declare stat, msg any;
ld_sample (1);
while (1)
{
delay (s_delay);
- stat := '00000';
- exec ('ld_sample (0)', stat, msg, null);
- if (stat <> '00000')
- {
- rollback work;
- log_message (stat || ' ' || msg);
- }
+ exec ('ld_sample (0)', null, null, null);
}
}
diff --git a/binsrc/tests/suite/lowerall.sh b/binsrc/tests/suite/lowerall.sh
index 5a3c902..f4ea530 100755
--- a/binsrc/tests/suite/lowerall.sh
+++ b/binsrc/tests/suite/lowerall.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: lowerall.sh,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+# $Id: lowerall.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Rename all files in current directory to lowercase names
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/mail.sql b/binsrc/tests/suite/mail.sql
index a23d7fd..c5b7cf0 100644
--- a/binsrc/tests/suite/mail.sql
+++ b/binsrc/tests/suite/mail.sql
@@ -1,10 +1,10 @@
--
--- $Id: mail.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: mail.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/msdtc.sh b/binsrc/tests/suite/msdtc.sh
index 35f4c50..2bc183a 100755
--- a/binsrc/tests/suite/msdtc.sh
+++ b/binsrc/tests/suite/msdtc.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: msdtc.sh,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+# $Id: msdtc.sh,v 1.2 2007/03/14 14:18:51 source Exp $
#
# MS DTC tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/msdtc_conn_check.sql b/binsrc/tests/suite/msdtc_conn_check.sql
index 06aec0a..a548171 100644
--- a/binsrc/tests/suite/msdtc_conn_check.sql
+++ b/binsrc/tests/suite/msdtc_conn_check.sql
@@ -1,10 +1,10 @@
--
--- $Id: msdtc_conn_check.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: msdtc_conn_check.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/netmeter.sql b/binsrc/tests/suite/netmeter.sql
index c935c83..2afd8ed 100644
--- a/binsrc/tests/suite/netmeter.sql
+++ b/binsrc/tests/suite/netmeter.sql
@@ -22,15 +22,14 @@ create procedure _NMSRV (in str varchar)
create procedure nm_run (in n_batches int, in bytes int, in ops_per_batch int)
{
declare daq any;
- declare i, h, n, nh int;
- nh := sys_stat ('cl_n_hosts');
+ declare i, h, n int;
set vdb_timeout = 2000;
daq := daq (0);
for (n:=0; n<n_batches; n := n + 1)
{
for (i:= 0; i < ops_per_batch; i:= i + 1)
{
- for (h := 1; h <= nh; h:= h + 1)
+ for (h := 1; h < sys_stat ('cl_n_hosts'); h:= h + 1)
{
if (h <> sys_stat ('cl_this_host'))
daq_call (daq, '__ALL', vector (h), 'DB.DBA._NMSRV', vector (make_string (bytes)), 0);
diff --git a/binsrc/tests/suite/nntp_suite.sql b/binsrc/tests/suite/nntp_suite.sql
index 2dd69ff..c975c93 100644
--- a/binsrc/tests/suite/nntp_suite.sql
+++ b/binsrc/tests/suite/nntp_suite.sql
@@ -1,10 +1,10 @@
--
--- $Id: nntp_suite.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nntp_suite.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwdemo.sql b/binsrc/tests/suite/nwdemo.sql
index 17bfeca..7fa1244 100644
--- a/binsrc/tests/suite/nwdemo.sql
+++ b/binsrc/tests/suite/nwdemo.sql
@@ -1,14 +1,14 @@
--
-- nwdemo.sql
--
--- $Id: nwdemo.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwdemo.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Creates a demo database, works regardless of case mode
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwdemo_norefs.sql b/binsrc/tests/suite/nwdemo_norefs.sql
index a98610d..05fabde 100644
--- a/binsrc/tests/suite/nwdemo_norefs.sql
+++ b/binsrc/tests/suite/nwdemo_norefs.sql
@@ -1,14 +1,14 @@
--
-- nwdemo.sql
--
--- $Id: nwdemo_norefs.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwdemo_norefs.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Creates a demo database, works regardless of case mode
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwdemo_update.sql b/binsrc/tests/suite/nwdemo_update.sql
index 0f3a5ca..a5990ad 100644
--- a/binsrc/tests/suite/nwdemo_update.sql
+++ b/binsrc/tests/suite/nwdemo_update.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwdemo_update.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwdemo_update.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml.sh b/binsrc/tests/suite/nwxml.sh
index 3ed4fa8..e2bc10b 100755
--- a/binsrc/tests/suite/nwxml.sh
+++ b/binsrc/tests/suite/nwxml.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: nwxml.sh,v 1.4.2.3 2012/03/08 12:55:07 source Exp $
+# $Id: nwxml.sh,v 1.4.2.2 2010/01/31 20:18:26 source Exp $
#
# XML tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml.sql b/binsrc/tests/suite/nwxml.sql
index ad03908..b279814 100644
--- a/binsrc/tests/suite/nwxml.sql
+++ b/binsrc/tests/suite/nwxml.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml.sql,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml.sql,v 1.2.2.1 2009/04/16 12:37:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml1.sql b/binsrc/tests/suite/nwxml1.sql
index 0516312..1ed12b6 100644
--- a/binsrc/tests/suite/nwxml1.sql
+++ b/binsrc/tests/suite/nwxml1.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml1.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml1.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml2.sql b/binsrc/tests/suite/nwxml2.sql
index af0b8b4..6144a56 100644
--- a/binsrc/tests/suite/nwxml2.sql
+++ b/binsrc/tests/suite/nwxml2.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml2.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml2.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml2_vad.sql b/binsrc/tests/suite/nwxml2_vad.sql
index c4cd566..fce38ab 100644
--- a/binsrc/tests/suite/nwxml2_vad.sql
+++ b/binsrc/tests/suite/nwxml2_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml2_vad.sql,v 1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml2_vad.sql,v 1.1 2007/03/22 13:08:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml3.sql b/binsrc/tests/suite/nwxml3.sql
index 8989a77..93b4c7c 100644
--- a/binsrc/tests/suite/nwxml3.sql
+++ b/binsrc/tests/suite/nwxml3.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml3.sql,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml3.sql,v 1.2.2.1 2010/01/31 20:18:26 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml3a.sql b/binsrc/tests/suite/nwxml3a.sql
index 393f05a..4ad2f4c 100644
--- a/binsrc/tests/suite/nwxml3a.sql
+++ b/binsrc/tests/suite/nwxml3a.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml3a.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml3a.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml3b.sql b/binsrc/tests/suite/nwxml3b.sql
index d79752e..428a94b 100644
--- a/binsrc/tests/suite/nwxml3b.sql
+++ b/binsrc/tests/suite/nwxml3b.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml3b.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml3b.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml3c.sql b/binsrc/tests/suite/nwxml3c.sql
index 7ae6bcd..add165f 100644
--- a/binsrc/tests/suite/nwxml3c.sql
+++ b/binsrc/tests/suite/nwxml3c.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml3c.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml3c.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml4.sql b/binsrc/tests/suite/nwxml4.sql
index 66255f9..055f95f 100644
--- a/binsrc/tests/suite/nwxml4.sql
+++ b/binsrc/tests/suite/nwxml4.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml4.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml4.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxml_vad.sql b/binsrc/tests/suite/nwxml_vad.sql
index 8b84380..092e545 100644
--- a/binsrc/tests/suite/nwxml_vad.sql
+++ b/binsrc/tests/suite/nwxml_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxml_vad.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxml_vad.sql,v 1.2 2007/11/30 09:41:08 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxmla.sql b/binsrc/tests/suite/nwxmla.sql
index ea3764a..21ad71f 100644
--- a/binsrc/tests/suite/nwxmla.sql
+++ b/binsrc/tests/suite/nwxmla.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmla.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxmla.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxmlb.sql b/binsrc/tests/suite/nwxmlb.sql
index eab3c13..461363a 100644
--- a/binsrc/tests/suite/nwxmlb.sql
+++ b/binsrc/tests/suite/nwxmlb.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmlb.sql,v 1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxmlb.sql,v 1.1 2007/07/09 23:13:03 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxmlco.sql b/binsrc/tests/suite/nwxmlco.sql
index 5acaf18..5c3300f 100644
--- a/binsrc/tests/suite/nwxmlco.sql
+++ b/binsrc/tests/suite/nwxmlco.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmlco.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxmlco.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxmlo.sql b/binsrc/tests/suite/nwxmlo.sql
index 3b4a950..a8c6d7b 100644
--- a/binsrc/tests/suite/nwxmlo.sql
+++ b/binsrc/tests/suite/nwxmlo.sql
@@ -1,14 +1,14 @@
--
-- nwxmlo.sql
--
--- $Id: nwxmlo.sql,v 1.3.2.3 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxmlo.sql,v 1.3.2.2 2010/01/31 20:18:26 source Exp $
--
-- For XML auto testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxmltype3.sql b/binsrc/tests/suite/nwxmltype3.sql
index 654e653..c3662b7 100644
--- a/binsrc/tests/suite/nwxmltype3.sql
+++ b/binsrc/tests/suite/nwxmltype3.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmltype3.sql,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxmltype3.sql,v 1.2.2.1 2010/01/31 20:18:26 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxmltype3a.sql b/binsrc/tests/suite/nwxmltype3a.sql
index 9ec40f3..a0d7d41 100644
--- a/binsrc/tests/suite/nwxmltype3a.sql
+++ b/binsrc/tests/suite/nwxmltype3a.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmltype3a.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxmltype3a.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxmltype3b.sql b/binsrc/tests/suite/nwxmltype3b.sql
index a402f3c..db4adfd 100644
--- a/binsrc/tests/suite/nwxmltype3b.sql
+++ b/binsrc/tests/suite/nwxmltype3b.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmltype3b.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxmltype3b.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxmltype3c.sql b/binsrc/tests/suite/nwxmltype3c.sql
index 6cc7dba..3c05777 100644
--- a/binsrc/tests/suite/nwxmltype3c.sql
+++ b/binsrc/tests/suite/nwxmltype3c.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxmltype3c.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxmltype3c.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/nwxp.sql b/binsrc/tests/suite/nwxp.sql
index e0661e4..153a608 100644
--- a/binsrc/tests/suite/nwxp.sql
+++ b/binsrc/tests/suite/nwxp.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwxp.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: nwxp.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ob_tpcc_check.sql b/binsrc/tests/suite/ob_tpcc_check.sql
index ce586f5..7a00e1c 100644
--- a/binsrc/tests/suite/ob_tpcc_check.sql
+++ b/binsrc/tests/suite/ob_tpcc_check.sql
@@ -1,10 +1,10 @@
--
--- $Id: ob_tpcc_check.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: ob_tpcc_check.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/obackup.sh b/binsrc/tests/suite/obackup.sh
index 385d350..500bb11 100755
--- a/binsrc/tests/suite/obackup.sh
+++ b/binsrc/tests/suite/obackup.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: obackup.sh,v 1.2.2.5 2012/03/08 12:55:07 source Exp $
+# $Id: obackup.sh,v 1.2.2.4 2010/01/28 14:33:20 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/obackup.sql b/binsrc/tests/suite/obackup.sql
index c1b1faa..7d41f68 100644
--- a/binsrc/tests/suite/obackup.sql
+++ b/binsrc/tests/suite/obackup.sql
@@ -1,14 +1,14 @@
--
-- tconcur2.sql
--
--- $Id: obackup.sql,v 1.2.2.4 2012/03/08 12:55:07 source Exp $
+-- $Id: obackup.sql,v 1.2.2.3 2009/07/09 13:04:50 source Exp $
--
-- Concurrency test #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/obackup0.sql b/binsrc/tests/suite/obackup0.sql
index 41ea8e9..1d36834 100644
--- a/binsrc/tests/suite/obackup0.sql
+++ b/binsrc/tests/suite/obackup0.sql
@@ -1,14 +1,14 @@
--
-- obackup0.sql
--
--- $Id: obackup0.sql,v 1.1.1.1.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: obackup0.sql,v 1.1.1.1.2.1 2009/04/16 12:37:42 source Exp $
--
-- Online Backup stage 0
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/obackup1.sql b/binsrc/tests/suite/obackup1.sql
index 6573030..1a32cd2 100644
--- a/binsrc/tests/suite/obackup1.sql
+++ b/binsrc/tests/suite/obackup1.sql
@@ -1,14 +1,14 @@
--
-- obackup1.sql
--
--- $Id: obackup1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: obackup1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Online Backup stage 0
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/obackup_userck.sql b/binsrc/tests/suite/obackup_userck.sql
index 5b3f836..cfde353 100644
--- a/binsrc/tests/suite/obackup_userck.sql
+++ b/binsrc/tests/suite/obackup_userck.sql
@@ -1,10 +1,10 @@
--
--- $Id: obackup_userck.sql,v 1.3.2.4 2012/03/08 12:55:07 source Exp $
+-- $Id: obackup_userck.sql,v 1.3.2.3 2009/07/09 13:04:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/obackup_userck2.sql b/binsrc/tests/suite/obackup_userck2.sql
index edc5d72..372fc43 100644
--- a/binsrc/tests/suite/obackup_userck2.sql
+++ b/binsrc/tests/suite/obackup_userck2.sql
@@ -1,14 +1,14 @@
--
-- obackup_userck2.sql
--
--- $Id: obackup_userck2.sql,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+-- $Id: obackup_userck2.sql,v 1.2.2.1 2009/04/20 21:19:39 source Exp $
--
-- Concurrency test #N..
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/obackupck.sql b/binsrc/tests/suite/obackupck.sql
index 4d5e9fa..29c97b0 100644
--- a/binsrc/tests/suite/obackupck.sql
+++ b/binsrc/tests/suite/obackupck.sql
@@ -1,14 +1,14 @@
--
-- obackupck.sql
--
--- $Id: obackupck.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: obackupck.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Concurrency test #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/oledb.sh b/binsrc/tests/suite/oledb.sh
index bd69536..f4df764 100755
--- a/binsrc/tests/suite/oledb.sh
+++ b/binsrc/tests/suite/oledb.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: oledb.sh,v 1.2.2.2 2012/03/08 12:55:07 source Exp $
+# $Id: oledb.sh,v 1.2.2.1 2009/04/16 12:37:42 source Exp $
#
# OLE DB tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/pass.sql b/binsrc/tests/suite/pass.sql
index 8492b82..216673c 100644
--- a/binsrc/tests/suite/pass.sql
+++ b/binsrc/tests/suite/pass.sql
@@ -1,14 +1,14 @@
--
-- passt1.sql
--
--- $Id: pass.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: pass.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- function pass-trough testsuite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/pddin.sql b/binsrc/tests/suite/pddin.sql
index a2a6efe..df376d6 100644
--- a/binsrc/tests/suite/pddin.sql
+++ b/binsrc/tests/suite/pddin.sql
@@ -1,10 +1,10 @@
--
--- $Id: pddin.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: pddin.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/pddin2.sql b/binsrc/tests/suite/pddin2.sql
index 2bc513c..0099a6e 100644
--- a/binsrc/tests/suite/pddin2.sql
+++ b/binsrc/tests/suite/pddin2.sql
@@ -1,10 +1,10 @@
--
--- $Id: pddin2.sql,v 1.2.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: pddin2.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/complex-doc-1.xsd b/binsrc/tests/suite/r4/complex-doc-1.xsd
index 3477e1e..498089d 100644
--- a/binsrc/tests/suite/r4/complex-doc-1.xsd
+++ b/binsrc/tests/suite/r4/complex-doc-1.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/complex-doc-2.xsd b/binsrc/tests/suite/r4/complex-doc-2.xsd
index 799b009..15acbb4 100644
--- a/binsrc/tests/suite/r4/complex-doc-2.xsd
+++ b/binsrc/tests/suite/r4/complex-doc-2.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/complex-doc-3.xsd b/binsrc/tests/suite/r4/complex-doc-3.xsd
index bacdbff..f70177a 100644
--- a/binsrc/tests/suite/r4/complex-doc-3.xsd
+++ b/binsrc/tests/suite/r4/complex-doc-3.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/complex-doc-literal.sql b/binsrc/tests/suite/r4/complex-doc-literal.sql
index 545331a..a6fc472 100644
--- a/binsrc/tests/suite/r4/complex-doc-literal.sql
+++ b/binsrc/tests/suite/r4/complex-doc-literal.sql
@@ -1,10 +1,10 @@
--
--- $Id: complex-doc-literal.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: complex-doc-literal.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/complex-rpc-encoded.sql b/binsrc/tests/suite/r4/complex-rpc-encoded.sql
index 9dc5ac1..b79e897 100644
--- a/binsrc/tests/suite/r4/complex-rpc-encoded.sql
+++ b/binsrc/tests/suite/r4/complex-rpc-encoded.sql
@@ -1,10 +1,10 @@
--
--- $Id: complex-rpc-encoded.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: complex-rpc-encoded.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/complex-rpc-encoded.xsd b/binsrc/tests/suite/r4/complex-rpc-encoded.xsd
index c5af8f5..c5df132 100644
--- a/binsrc/tests/suite/r4/complex-rpc-encoded.xsd
+++ b/binsrc/tests/suite/r4/complex-rpc-encoded.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/dime-doc.sql b/binsrc/tests/suite/r4/dime-doc.sql
index f1644d7..7dff621 100644
--- a/binsrc/tests/suite/r4/dime-doc.sql
+++ b/binsrc/tests/suite/r4/dime-doc.sql
@@ -1,10 +1,10 @@
--
--- $Id: dime-doc.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: dime-doc.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/dime-doc.xsd b/binsrc/tests/suite/r4/dime-doc.xsd
index 83d3590..05959e1 100644
--- a/binsrc/tests/suite/r4/dime-doc.xsd
+++ b/binsrc/tests/suite/r4/dime-doc.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/dime-rpc.sql b/binsrc/tests/suite/r4/dime-rpc.sql
index a6c1dbd..8fcd8fb 100644
--- a/binsrc/tests/suite/r4/dime-rpc.sql
+++ b/binsrc/tests/suite/r4/dime-rpc.sql
@@ -1,10 +1,10 @@
--
--- $Id: dime-rpc.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: dime-rpc.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/dime-rpc.xsd b/binsrc/tests/suite/r4/dime-rpc.xsd
index 1efc506..3232d20 100644
--- a/binsrc/tests/suite/r4/dime-rpc.xsd
+++ b/binsrc/tests/suite/r4/dime-rpc.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/load_xsd.sql b/binsrc/tests/suite/r4/load_xsd.sql
index 07a6678..cd7be4c 100644
--- a/binsrc/tests/suite/r4/load_xsd.sql
+++ b/binsrc/tests/suite/r4/load_xsd.sql
@@ -1,10 +1,10 @@
--
--- $Id: load_xsd.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: load_xsd.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/mime-doc.sql b/binsrc/tests/suite/r4/mime-doc.sql
index 91651ac..250b948 100644
--- a/binsrc/tests/suite/r4/mime-doc.sql
+++ b/binsrc/tests/suite/r4/mime-doc.sql
@@ -1,10 +1,10 @@
--
--- $Id: mime-doc.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: mime-doc.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/mime-rpc.sql b/binsrc/tests/suite/r4/mime-rpc.sql
index 34b9b02..d22664b 100644
--- a/binsrc/tests/suite/r4/mime-rpc.sql
+++ b/binsrc/tests/suite/r4/mime-rpc.sql
@@ -1,10 +1,10 @@
--
--- $Id: mime-rpc.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: mime-rpc.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/round4xsd-1.xsd b/binsrc/tests/suite/r4/round4xsd-1.xsd
index 220945e..2b2a736 100644
--- a/binsrc/tests/suite/r4/round4xsd-1.xsd
+++ b/binsrc/tests/suite/r4/round4xsd-1.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/round4xsd-2.xsd b/binsrc/tests/suite/r4/round4xsd-2.xsd
index c6b3b6a..c227165 100644
--- a/binsrc/tests/suite/r4/round4xsd-2.xsd
+++ b/binsrc/tests/suite/r4/round4xsd-2.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/round4xsd-3.xsd b/binsrc/tests/suite/r4/round4xsd-3.xsd
index 56d3cb0..0a5afd5 100644
--- a/binsrc/tests/suite/r4/round4xsd-3.xsd
+++ b/binsrc/tests/suite/r4/round4xsd-3.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/round4xsd-4.xsd b/binsrc/tests/suite/r4/round4xsd-4.xsd
index 73f6859..fdc4d7d 100644
--- a/binsrc/tests/suite/r4/round4xsd-4.xsd
+++ b/binsrc/tests/suite/r4/round4xsd-4.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/simple-doc-literal-1.xsd b/binsrc/tests/suite/r4/simple-doc-literal-1.xsd
index b1d4462..063d013 100644
--- a/binsrc/tests/suite/r4/simple-doc-literal-1.xsd
+++ b/binsrc/tests/suite/r4/simple-doc-literal-1.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/simple-doc-literal-2.xsd b/binsrc/tests/suite/r4/simple-doc-literal-2.xsd
index 8df51ee..0725377 100644
--- a/binsrc/tests/suite/r4/simple-doc-literal-2.xsd
+++ b/binsrc/tests/suite/r4/simple-doc-literal-2.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/simple-doc-literal-3.xsd b/binsrc/tests/suite/r4/simple-doc-literal-3.xsd
index cf5c02d..12963a3 100644
--- a/binsrc/tests/suite/r4/simple-doc-literal-3.xsd
+++ b/binsrc/tests/suite/r4/simple-doc-literal-3.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/simple-doc-literal.sql b/binsrc/tests/suite/r4/simple-doc-literal.sql
index 1be3a55..24b673a 100644
--- a/binsrc/tests/suite/r4/simple-doc-literal.sql
+++ b/binsrc/tests/suite/r4/simple-doc-literal.sql
@@ -1,10 +1,10 @@
--
--- $Id: simple-doc-literal.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: simple-doc-literal.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/simple-rpc-encoded.sql b/binsrc/tests/suite/r4/simple-rpc-encoded.sql
index 26b6ef3..2b37c31 100644
--- a/binsrc/tests/suite/r4/simple-rpc-encoded.sql
+++ b/binsrc/tests/suite/r4/simple-rpc-encoded.sql
@@ -1,10 +1,10 @@
--
--- $Id: simple-rpc-encoded.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: simple-rpc-encoded.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/simple-rpc-encoded.xsd b/binsrc/tests/suite/r4/simple-rpc-encoded.xsd
index c14b56e..57b8037 100644
--- a/binsrc/tests/suite/r4/simple-rpc-encoded.xsd
+++ b/binsrc/tests/suite/r4/simple-rpc-encoded.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/r4/xsd.sql b/binsrc/tests/suite/r4/xsd.sql
index 8942aa2..95d8093 100644
--- a/binsrc/tests/suite/r4/xsd.sql
+++ b/binsrc/tests/suite/r4/xsd.sql
@@ -1,10 +1,10 @@
--
--- $Id: xsd.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: xsd.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rdfldck.sql b/binsrc/tests/suite/rdfldck.sql
index c820859..0dd4c07 100644
--- a/binsrc/tests/suite/rdfldck.sql
+++ b/binsrc/tests/suite/rdfldck.sql
@@ -2,34 +2,10 @@
-- check and stats statements for rdf
-wait_for_children;
select count (*) from rdf_quad a table option (index rdf_quad) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_pogs) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s);
select count (*) from rdf_quad a table option (index rdf_quad_pogs) where not exists (select 1 from rdf_quad b table option (loop, index primary key) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s);
-select count (*) from rdf_quad a table option (index rdf_quad_pogs) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_op) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s);
-select count (*) from rdf_quad a table option (index rdf_quad_pogs) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_sp) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s);
-select count (*) from rdf_quad a table option (index rdf_quad_pogs) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_gs) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s);
-
-
---
-select count (s), count (p), count (o), count (g) from rdf_quad table option (index rdf_quad);
-
-
--- op oow
-select count (*) from rdf_quad a table option (index rdf_quad_op, index_only) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_op, index_only) where a.p = b.p and a.o = b.o );
-
-create table rq_psog (p iri_id_8, s iri_id_8, o any, g iri_id_8, primary key (p,s,o,g));
-create table rq_pogs (p iri_id_8, s iri_id_8, o any, g iri_id_8, primary key (p,o,g,s));
-
-log_enable (2);
-insert into rq_psog (p,s,o,g) select p, s,o,g from rdf_quad table option (index rdf_quad);
-insert into rq_pogs (p,s,o,g) select p, s,o,g from rdf_quad table option (index rdf_quad_pogs);
-
-
--- partial key only
-select count (*) from rdf_quad a table option (index rdf_quad_pogs) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_op, index_only) where a.p = b.p and a.o = b.o );
-
select count (*) from rdf_iri a where not exists (select 1 from rdf_iri b table option (loop) where a.ri_id = b.ri_id);
select count (*) from rdf_iri a where not exists (select 1 from rdf_iri b table option (loop) where a.ri_name = b.ri_name);
@@ -41,8 +17,6 @@ select count (*) from rdf_obj a table option (index rdf_obj) where not exists (s
select count (*) from rdf_obj a table option (index ro_val) where not exists (select 1 from rdf_obj b table option (index rdf_obj, loop) where b.ro_id = a.ro_id and b.ro_val = a.ro_val and b.ro_dt_and_lang = a.ro_dt_and_lang);
-select count (*) from rdf_quad where not exists (select 1 from rdf_obj where ro_id = rdf_box_ro_id (o)) and is_rdf_box (o);
-
select count (*) from rdf_quad a table option (index primary key) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_ogps) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s);
select count (*) from rdf_quad a table option (index rdf_quad_ogps) where not exists (select 1 from rdf_quad b table option (loop, index primary key) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s);
@@ -110,13 +84,13 @@ insert into RDF_IRI index DB_DBA_RDF_IRI_UNQC_RI_ID (RI_ID, RI_NAME) select id,
-create procedure DEL_IRI_PK_DP (in n varchar, in id iri_id)
+create procedure DEL_IRI_PK_DP (in n varcjar, in id iri_id)
{
delete from rdf_iri table option (no cluster, index rdf_iri) where ri_id = id and ri_name = n option (index rdf_iri, no cluster);
return vector (row_count (), 1);
}
-create procedure DEL_IRI_ID_DP (in id iri_id, in n varchar)
+create procedure DEL_IRI_ID_DP (in id iri_id, in n varcjar)
{
delete from rdf_iri table option (no cluster, index DB_DBA_RDF_IRI_UNQC_RI_ID) where ri_id = id and ri_name = n option (index DB_DBA_RDF_IRI_UNQC_RI_ID, no cluster);
return vector (row_count (), 1);
@@ -274,109 +248,3 @@ create procedure rdf_order_ck ()
p1 := p; o1 := o; g1 := g; s1 := s;
}
}
-
-select count (*) from c..rdf_quad a table option (index c_rdf_quad_pogs) where not exists (select 1 from c..rdf_quad b table option (loop, index c_rdf_quad_pogs) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s);
-
-
-
-
-create table rq_psog (
- G IRI_ID_8,
- S IRI_ID_8,
- P IRI_ID_8,
- O any,
- primary key (P, S, O, G) column
- )
-alter index rq_pogs on rq_pogs partition (S int (0hexffff00))
-
-
-
-create procedure ckpogs ()
-{
- declare p1, g1, s1 iri_id;
- declare o1 any;
- p1 := null;
- o1 := null;
- g1 := null;
- s1 := null;
- for select p, o, g, s from rdf_quad table option (index rdf_quad_pogs) do
- {
-
- if (p < p1) goto oow;
- if (p = p1 and o < o1) goto oow;
- if (p = p1 and o = o1 and g < g1) goto oow;
- if (p = p1 and o = o1 and g = g1 and s <= s1) goto oow;
- p1 := p; s1 := s; o1 := o; p1 := p;
- goto loop;
- oow:
- dbg_obj_princ ('oow ', p, o, g, s, ' after ', p1, o1, g1, s1);
- return;
- loop: ;
- }
-}
-
-
-create procedure ckop ()
-{
- declare p1, g1, s1 iri_id;
- declare o1 any;
- p1 := null;
- o1 := null;
- g1 := null;
- s1 := null;
- cl_set_slice ('DB.DBA.RDF_QUAD', 'RDF_QUAD_OP', 31);
- for select o, p from rdf_quad table option (index rdf_quad_op, index_only, no cluster) do
- {
-
- if (o < o1) goto oow;
- if (o = o1 and p < p1) goto oow;
- p1 := p; o1 := o;
- goto next;
- oow:
- dbg_obj_princ ('oow ', o, p, ' after ', o1, p1);
- signal ('oowop', 'in loop asc ck');
- return;
- next: ;
- }
-}
-
-
-
-create procedure slice_ck_slice (in slid int)
-{
- declare cnt int;
- cl_detach_thread ();
- cl_set_slice ('DB.DBA.RDF_QUAD', 'RDF_QUAD', slid);
- cnt := (select count (*) from rdf_quad a table option (index rdf_quad_pogs, no cluster) where not exists (select 1 from rdf_quad b table option (loop, index rdf_quad_pogs, no cluster) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s));
- if (0 <> cnt)
- log_message (sprintf ('Slice %d out of whack by %d', slid, cnt));
-}
-
-create procedure slice_ck ()
-{
- cl_detach_thread ();
- cl_exec ('cl_call_local_slices (''DB.DBA.RDF_QUAD'', ''RDF_QUAD'', ''slice_ck_slice'', vector ())');
-}
-
-
-
-
-create procedure rq_slice_cnt (in slid int)
-{
- cl_set_slice ('DB.DBA.RDF_QUAD', 'RDF_QUAD', slid);
- dbg_obj_print ('psog dist ', (select count (*) from (select distinct g,s,o,p from rdf_quad table option (index rdf_quad, no cluster)) f));
- dbg_obj_print ('psog ', (select count (*) from rdf_quad table option (index rdf_quad, no cluster)), 'pogs ', (select count (*) from rdf_quad table option (index rdf_quad_pogs, no cluster)));
-}
-
-
-cl_exec ('__dbf_set (''dbf_col_ins_dbg_log'', 1002)');
-
-sequence_set ('__NEXT__RDF_URL_IID_NAMED', 2147483648 - 500000, 0);
-sequence_set ('__NEXT__RDF_RO_ID', 2147483648 - 500000, 0);
-
-sequence_set ('__NEXT__RDF_URL_IID_NAMED', bit_shift (1, 32) - 300000, 0);
-sequence_set ('__NEXT__RDF_RO_ID', bit_shift (1, 32) + 100, 0);
-
-select top 1 iri_id_num (ri_id) - bit_shift (1, 32) from rdf_iri order by ri_id desc;
-
-select top 1 ro_id - bit_shift (1, 32) from rdf_obj order by ro_id desc;
diff --git a/binsrc/tests/suite/recovck1.sql b/binsrc/tests/suite/recovck1.sql
index 67f91a1..3a12959 100644
--- a/binsrc/tests/suite/recovck1.sql
+++ b/binsrc/tests/suite/recovck1.sql
@@ -1,14 +1,14 @@
--
-- recovck1.sql
--
--- $Id: recovck1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: recovck1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Recovery check test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/recovck1_noreg.sql b/binsrc/tests/suite/recovck1_noreg.sql
index 9faedaf..7130cce 100644
--- a/binsrc/tests/suite/recovck1_noreg.sql
+++ b/binsrc/tests/suite/recovck1_noreg.sql
@@ -1,14 +1,14 @@
--
-- recovck1_noreg.sql
--
--- $Id: recovck1_noreg.sql,v 1.1.1.1.2.3 2012/03/08 12:55:07 source Exp $
+-- $Id: recovck1_noreg.sql,v 1.1.1.1.2.2 2009/11/10 15:54:05 source Exp $
--
-- Recovery check test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/revstr.sql b/binsrc/tests/suite/revstr.sql
index 9846984..0c3fe4c 100644
--- a/binsrc/tests/suite/revstr.sql
+++ b/binsrc/tests/suite/revstr.sql
@@ -1,14 +1,14 @@
--
-- revstr.sql
--
--- $Id: revstr.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: revstr.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Stored Procedure to reverse a string argument
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rexecute.sql b/binsrc/tests/suite/rexecute.sql
index 3628f89..22ec207 100644
--- a/binsrc/tests/suite/rexecute.sql
+++ b/binsrc/tests/suite/rexecute.sql
@@ -1,14 +1,14 @@
--
-- rexecute.sql
--
--- $Id: rexecute.sql,v 1.1.1.1.2.1 2012/03/08 12:55:07 source Exp $
+-- $Id: rexecute.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- rexecute suite testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rls.sql b/binsrc/tests/suite/rls.sql
index 0c14573..1afdc7e 100644
--- a/binsrc/tests/suite/rls.sql
+++ b/binsrc/tests/suite/rls.sql
@@ -1,14 +1,14 @@
--
-- rls.sql
--
--- $Id: rls.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rls.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Row level security tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rls_attach.sql b/binsrc/tests/suite/rls_attach.sql
index 0c39286..42d0e09 100644
--- a/binsrc/tests/suite/rls_attach.sql
+++ b/binsrc/tests/suite/rls_attach.sql
@@ -1,10 +1,10 @@
--
--- $Id: rls_attach.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rls_attach.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rls_create.sql b/binsrc/tests/suite/rls_create.sql
index fdfe015..559a4b3 100644
--- a/binsrc/tests/suite/rls_create.sql
+++ b/binsrc/tests/suite/rls_create.sql
@@ -1,10 +1,10 @@
--
--- $Id: rls_create.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rls_create.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rpjoin.sql b/binsrc/tests/suite/rpjoin.sql
index 657f910..725901b 100644
--- a/binsrc/tests/suite/rpjoin.sql
+++ b/binsrc/tests/suite/rpjoin.sql
@@ -1,10 +1,10 @@
--
--- $Id: rpjoin.sql,v 1.3.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: rpjoin.sql,v 1.3.2.2 2009/07/09 13:04:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rproc1.sql b/binsrc/tests/suite/rproc1.sql
index b9b6db1..cc61376 100644
--- a/binsrc/tests/suite/rproc1.sql
+++ b/binsrc/tests/suite/rproc1.sql
@@ -1,14 +1,14 @@
--
-- rproc1.sql
--
--- $Id: rproc1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rproc1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- procedure attachment testsuite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rproc2.sql b/binsrc/tests/suite/rproc2.sql
index 8030441..4870479 100644
--- a/binsrc/tests/suite/rproc2.sql
+++ b/binsrc/tests/suite/rproc2.sql
@@ -1,14 +1,14 @@
--
-- rproc2.sql
--
--- $Id: rproc2.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rproc2.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- procedure attachment testsuite destination part
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtest.sh b/binsrc/tests/suite/rtest.sh
index d10cc3f..aaa3669 100755
--- a/binsrc/tests/suite/rtest.sh
+++ b/binsrc/tests/suite/rtest.sh
@@ -2,14 +2,14 @@
#
# rtest.sh
#
-# $Id: rtest.sh,v 1.4.2.4 2012/03/12 22:45:09 source Exp $
+# $Id: rtest.sh,v 1.4.2.2 2010/01/31 20:18:26 source Exp $
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -92,7 +92,7 @@ then
exit 1
fi
-RUN $BLOBS $DS1
+../blobs $DS1
RUN $ISQL $DS1 PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < rtest1-1.sql
@@ -251,7 +251,7 @@ fi
# NOT AVAILABLE
LOG "Scrolling through the VDB."
-RUN $SCROLL $DS2 100 R1 R1
+RUN ../scroll $DS2 100 R1 R1
if test $STATUS -ne 0
then
LOG "***ABORTED: rtest.sh: scroll"
diff --git a/binsrc/tests/suite/rtest1-1.sql b/binsrc/tests/suite/rtest1-1.sql
index 5405d64..fcc6f0f 100644
--- a/binsrc/tests/suite/rtest1-1.sql
+++ b/binsrc/tests/suite/rtest1-1.sql
@@ -1,14 +1,14 @@
--
-- rtest1-1.sql
--
--- $Id: rtest1-1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rtest1-1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Remote database testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtest1.sql b/binsrc/tests/suite/rtest1.sql
index ef6e876..6e6cb18 100644
--- a/binsrc/tests/suite/rtest1.sql
+++ b/binsrc/tests/suite/rtest1.sql
@@ -1,14 +1,14 @@
--
-- rtest1.sql
--
--- $Id: rtest1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rtest1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Remote database testing part 1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtest2-1.sql b/binsrc/tests/suite/rtest2-1.sql
index c723f4d..5739d1b 100644
--- a/binsrc/tests/suite/rtest2-1.sql
+++ b/binsrc/tests/suite/rtest2-1.sql
@@ -1,14 +1,14 @@
--
-- rtest2-1.sql
--
--- $Id: rtest2-1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rtest2-1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Remote database testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtest2.sql b/binsrc/tests/suite/rtest2.sql
index b0dafad..6d86360 100644
--- a/binsrc/tests/suite/rtest2.sql
+++ b/binsrc/tests/suite/rtest2.sql
@@ -1,14 +1,14 @@
--
-- rtest2.sql
--
--- $Id: rtest2.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rtest2.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Remote database testing part 2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtest3.sql b/binsrc/tests/suite/rtest3.sql
index 2fed1c0..b314bb9 100644
--- a/binsrc/tests/suite/rtest3.sql
+++ b/binsrc/tests/suite/rtest3.sql
@@ -1,14 +1,14 @@
--
-- rtest3.sql
--
--- $Id: rtest3.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rtest3.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Remote database testing part 3
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtest4.sql b/binsrc/tests/suite/rtest4.sql
index a59fa6a..ece7f96 100644
--- a/binsrc/tests/suite/rtest4.sql
+++ b/binsrc/tests/suite/rtest4.sql
@@ -1,14 +1,14 @@
--
-- rtest4.sql
--
--- $Id: rtest4.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rtest4.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Remote database testing part 4
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtest5.sql b/binsrc/tests/suite/rtest5.sql
index f078f55..98a5855 100644
--- a/binsrc/tests/suite/rtest5.sql
+++ b/binsrc/tests/suite/rtest5.sql
@@ -1,14 +1,14 @@
--
-- rtest5.sql
--
--- $Id: rtest5.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: rtest5.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Remote database testing part 5
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtesta.sql b/binsrc/tests/suite/rtesta.sql
index 26feb88..56b5d99 100644
--- a/binsrc/tests/suite/rtesta.sql
+++ b/binsrc/tests/suite/rtesta.sql
@@ -1,14 +1,14 @@
--
-- rtesta.sql
--
--- $Id: rtesta.sql,v 1.2.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: rtesta.sql,v 1.2.2.2 2009/09/17 14:47:09 source Exp $
--
-- Remote database testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/rtrxdead.sql b/binsrc/tests/suite/rtrxdead.sql
index 7bfeefb..3bd2cf6 100644
--- a/binsrc/tests/suite/rtrxdead.sql
+++ b/binsrc/tests/suite/rtrxdead.sql
@@ -1,14 +1,14 @@
--
-- rtrxdead.sql
--
--- $Id: rtrxdead.sql,v 1.2.2.4 2012/03/08 12:55:08 source Exp $
+-- $Id: rtrxdead.sql,v 1.2.2.3 2010/01/31 20:18:26 source Exp $
--
-- Remote database transaction testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/selt1.sql b/binsrc/tests/suite/selt1.sql
index 1a387c7..6d1f0c1 100644
--- a/binsrc/tests/suite/selt1.sql
+++ b/binsrc/tests/suite/selt1.sql
@@ -1,7 +1,7 @@
--
-- selt1.sql
--
--- $Id: selt1.sql,v 1.1.1.1.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: selt1.sql,v 1.1.1.1.2.1 2010/01/25 23:27:37 source Exp $
--
-- checkpoint errors #1.
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/selt2.sql b/binsrc/tests/suite/selt2.sql
index a5cbc3b..89b3877 100644
--- a/binsrc/tests/suite/selt2.sql
+++ b/binsrc/tests/suite/selt2.sql
@@ -1,7 +1,7 @@
--
-- selt2.sql
--
--- $Id: selt2.sql,v 1.1.1.1.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: selt2.sql,v 1.1.1.1.2.1 2010/01/25 23:27:37 source Exp $
--
-- checkpoint errors #2.
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/selt3.sql b/binsrc/tests/suite/selt3.sql
index 88c8da8..c1ec662 100644
--- a/binsrc/tests/suite/selt3.sql
+++ b/binsrc/tests/suite/selt3.sql
@@ -1,7 +1,7 @@
--
-- selt3.sql
--
--- $Id: selt3.sql,v 1.1.1.1.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: selt3.sql,v 1.1.1.1.2.1 2010/01/25 23:27:37 source Exp $
--
-- checkpoint errors #3.
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/selt4.sql b/binsrc/tests/suite/selt4.sql
index 3098611..40d0119 100644
--- a/binsrc/tests/suite/selt4.sql
+++ b/binsrc/tests/suite/selt4.sql
@@ -1,7 +1,7 @@
--
-- selt4.sql
--
--- $Id: selt4.sql,v 1.1.1.1.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: selt4.sql,v 1.1.1.1.2.1 2010/01/25 23:27:37 source Exp $
--
-- checkpoint errors #4.
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/selt5.sql b/binsrc/tests/suite/selt5.sql
index 4ce7e9a..29503d5 100644
--- a/binsrc/tests/suite/selt5.sql
+++ b/binsrc/tests/suite/selt5.sql
@@ -1,14 +1,14 @@
--
-- selt5.sql
--
--- $Id: selt5.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: selt5.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- checkpoint errors #1.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/soapauth.sql b/binsrc/tests/suite/soapauth.sql
index 799e95a..def45ea 100644
--- a/binsrc/tests/suite/soapauth.sql
+++ b/binsrc/tests/suite/soapauth.sql
@@ -1,10 +1,10 @@
--
--- $Id: soapauth.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: soapauth.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/sqlo.sql b/binsrc/tests/suite/sqlo.sql
index 6d5c572..3829acc 100644
--- a/binsrc/tests/suite/sqlo.sql
+++ b/binsrc/tests/suite/sqlo.sql
@@ -1,14 +1,14 @@
--
-- sqlo.sql
--
--- $Id: sqlo.sql,v 1.5.2.8 2012/03/08 12:55:08 source Exp $
+-- $Id: sqlo.sql,v 1.5.2.7 2010/01/31 20:18:26 source Exp $
--
-- Various SQL optimized compiler tests.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/sqlo2.sql b/binsrc/tests/suite/sqlo2.sql
index b1e503b..e3d3c82 100644
--- a/binsrc/tests/suite/sqlo2.sql
+++ b/binsrc/tests/suite/sqlo2.sql
@@ -1,14 +1,14 @@
--
-- sqlo2.sql
--
--- $Id: sqlo2.sql,v 1.4.2.6 2012/03/08 12:55:08 source Exp $
+-- $Id: sqlo2.sql,v 1.4.2.5 2010/12/10 12:24:41 source Exp $
--
-- Various SQL optimized compiler tests, part 2.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/sqlovdb.sql b/binsrc/tests/suite/sqlovdb.sql
index 2484715..ceb9e38 100644
--- a/binsrc/tests/suite/sqlovdb.sql
+++ b/binsrc/tests/suite/sqlovdb.sql
@@ -1,14 +1,14 @@
--
-- sqlovdb.sql
--
--- $Id: sqlovdb.sql,v 1.6.2.4 2012/03/08 12:55:08 source Exp $
+-- $Id: sqlovdb.sql,v 1.6.2.3 2009/08/09 00:16:20 source Exp $
--
-- SQLO Remote database testing part 1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/stat.sql b/binsrc/tests/suite/stat.sql
index 048d1f4..5f9339c 100644
--- a/binsrc/tests/suite/stat.sql
+++ b/binsrc/tests/suite/stat.sql
@@ -1,10 +1,10 @@
--
--- $Id: stat.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: stat.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/succ.sql b/binsrc/tests/suite/succ.sql
index 6b2560a..0cd30f6 100644
--- a/binsrc/tests/suite/succ.sql
+++ b/binsrc/tests/suite/succ.sql
@@ -1,14 +1,14 @@
--
-- succ.sql
--
--- $Id: succ.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: succ.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Stored Procedure to increase the last character of the argument by one.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tacl.sql b/binsrc/tests/suite/tacl.sql
index f74c488..87daa03 100644
--- a/binsrc/tests/suite/tacl.sql
+++ b/binsrc/tests/suite/tacl.sql
@@ -1,10 +1,10 @@
--
--- $Id: tacl.sql,v 1.2.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tacl.sql,v 1.2.2.1 2010/09/20 08:27:40 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tarith.sql b/binsrc/tests/suite/tarith.sql
index 4d7abf4..456b725 100644
--- a/binsrc/tests/suite/tarith.sql
+++ b/binsrc/tests/suite/tarith.sql
@@ -1,14 +1,14 @@
--
-- tarrith.sql
--
--- $Id: tarith.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tarith.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Arithmetic tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tarray.sql b/binsrc/tests/suite/tarray.sql
index 8ad81e4..f6c5b09 100644
--- a/binsrc/tests/suite/tarray.sql
+++ b/binsrc/tests/suite/tarray.sql
@@ -1,14 +1,14 @@
--
-- tarray.sql
--
--- $Id: tarray.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tarray.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Testing array fields
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tbak.sql b/binsrc/tests/suite/tbak.sql
index ff5f721..dea703d 100644
--- a/binsrc/tests/suite/tbak.sql
+++ b/binsrc/tests/suite/tbak.sql
@@ -1,14 +1,14 @@
--
-- tbak.sql
--
--- $Id: tbak.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tbak.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test backup functionality
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tbfree.sql b/binsrc/tests/suite/tbfree.sql
index e5b71f2..cbd8dde 100644
--- a/binsrc/tests/suite/tbfree.sql
+++ b/binsrc/tests/suite/tbfree.sql
@@ -1,10 +1,10 @@
--
--- $Id: tbfree.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tbfree.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tbin.sql b/binsrc/tests/suite/tbin.sql
index 2b527b7..eefda12 100644
--- a/binsrc/tests/suite/tbin.sql
+++ b/binsrc/tests/suite/tbin.sql
@@ -1,14 +1,14 @@
--
-- tbin.sql
--
--- $Id: tbin.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tbin.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test distinct varbinary and varchar
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tbitmap.sql b/binsrc/tests/suite/tbitmap.sql
index 883e4fc..901dc26 100644
--- a/binsrc/tests/suite/tbitmap.sql
+++ b/binsrc/tests/suite/tbitmap.sql
@@ -1,8 +1,5 @@
echo both "Bitmap index tests\n";
---set echo on;
-
-
drop table tb;
create table tb (id int primary key, k1 int, k2 int);
@@ -14,10 +11,6 @@ create procedure bmck (in n int := 0)
--return;
if ((select count (*) from tb table option (index tb)) <> (select count (*) from tb table option (index k1)))
signal ('BMFUP', sprintf ('bm inx out of whack %d', n));
- if (0 <> (select count (*) from tb a table option (index tb) where not exists (select 1 from tb b table option (loop, index k1) where a.id = b.id and a.k1 = b.k1)))
- signal ('BMFUP', 'bm inx does not contain pk row');
- if (0 <> (select count (*) from tb a table option (index k1) where not exists (select 1 from tb b table option (loop, index tb) where a.id = b.id and a.k1 = b.k1)))
- signal ('BMFUP', 'pk does not contain bm row');
}
insert into tb values (10, 11, 0);
@@ -109,15 +102,10 @@ select id, k1 from tb a table option (index primary key) where id - 1 <> (sel
echo both $if $equ $rowcnt 704 "PASSED" "***FAILED";
echo both ": bm select of previous in desc order with lt\n";
-select id, k1 from tb a table option (index primary key) where id - 1 <> (select b.id from tb b table option (index k1, loop) where b.k1 = a.k1 and b.id < a.id order by b.id + 0 desc);
+select id, k1 from tb a table option (index primary key) where id - 1 <> (select b.id from tb b table option (index k1) where b.k1 = a.k1 and b.id < a.id order by b.id + 0 desc);
echo both $if $equ $rowcnt 704 "PASSED" "***FAILED";
echo both ": bm select of previous in desc order with lt sorted desc oby\n";
-select id, k1 from tb a table option (index primary key) where id - 1 <> (select b.id from tb b table option (index k1, hash) where b.k1 = a.k1 and b.id < a.id order by b.id + 0 desc);
-echo both $if $equ $rowcnt 704 "PASSED" "***FAILED";
-echo both ": bm select of previous in desc order with lt sorted desc oby w hash\n";
-
-
select id, k1 from tb a table option (index primary key) where id - 1 <> (select b.id from tb b table option (index primary key) where b.k1 = a.k1 and b.id < a.id order by b.id desc);
echo both $if $equ $rowcnt 704 "PASSED" "***FAILED";
@@ -260,7 +248,7 @@ bmck (14);
rollback work;
bmck (15);
-exit;
+
set autocommit manual;
update tb set k1 = id;
bmck (16);
diff --git a/binsrc/tests/suite/tblob.sql b/binsrc/tests/suite/tblob.sql
index 2a6f7c2..1732e80 100644
--- a/binsrc/tests/suite/tblob.sql
+++ b/binsrc/tests/suite/tblob.sql
@@ -1,10 +1,10 @@
--
--- $Id: tblob.sql,v 1.2.2.4 2012/03/08 12:55:08 source Exp $
+-- $Id: tblob.sql,v 1.2.2.3 2009/11/10 15:54:05 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tblob_recode.sh b/binsrc/tests/suite/tblob_recode.sh
index b849878..2f28d4b 100755
--- a/binsrc/tests/suite/tblob_recode.sh
+++ b/binsrc/tests/suite/tblob_recode.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tblob_recode.sh,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+# $Id: tblob_recode.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# blob recoding tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tblog.sql b/binsrc/tests/suite/tblog.sql
index cc36788..f6bd4c5 100644
--- a/binsrc/tests/suite/tblog.sql
+++ b/binsrc/tests/suite/tblog.sql
@@ -1,10 +1,10 @@
--
--- $Id: tblog.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tblog.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tblogq.sql b/binsrc/tests/suite/tblogq.sql
index 70e5858..6d5f067 100644
--- a/binsrc/tests/suite/tblogq.sql
+++ b/binsrc/tests/suite/tblogq.sql
@@ -1,10 +1,10 @@
--
--- $Id: tblogq.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tblogq.sql,v 1.2 2006/08/16 07:58:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tbunion.sql b/binsrc/tests/suite/tbunion.sql
index a56d615..495241c 100644
--- a/binsrc/tests/suite/tbunion.sql
+++ b/binsrc/tests/suite/tbunion.sql
@@ -1,10 +1,10 @@
--
--- $Id: tbunion.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tbunion.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tcast.sql b/binsrc/tests/suite/tcast.sql
index 85a3648..414fbd6 100644
--- a/binsrc/tests/suite/tcast.sql
+++ b/binsrc/tests/suite/tcast.sql
@@ -1,10 +1,10 @@
--
--- $Id: tcast.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tcast.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tchars.sql b/binsrc/tests/suite/tchars.sql
index 85ec71c..3e30170 100644
--- a/binsrc/tests/suite/tchars.sql
+++ b/binsrc/tests/suite/tchars.sql
@@ -1,14 +1,14 @@
--
-- tchars.sql
--
--- $Id: tchars.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tchars.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- strict chars testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tcheck.sql b/binsrc/tests/suite/tcheck.sql
index 2562f4b..22f0be3 100644
--- a/binsrc/tests/suite/tcheck.sql
+++ b/binsrc/tests/suite/tcheck.sql
@@ -1,10 +1,10 @@
--
--- $Id: tcheck.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tcheck.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tcoll.sql b/binsrc/tests/suite/tcoll.sql
index abb1ed8..4a38d4c 100644
--- a/binsrc/tests/suite/tcoll.sql
+++ b/binsrc/tests/suite/tcoll.sql
@@ -1,14 +1,14 @@
--
-- tcoll.sql
--
--- $Id: tcoll.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tcoll.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Collation tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tconcur2.sql b/binsrc/tests/suite/tconcur2.sql
index 8da0340..6adc04f 100644
--- a/binsrc/tests/suite/tconcur2.sql
+++ b/binsrc/tests/suite/tconcur2.sql
@@ -1,14 +1,14 @@
--
-- tconcur2.sql
--
--- $Id: tconcur2.sql,v 1.1.1.1.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tconcur2.sql,v 1.1.1.1.2.1 2009/04/16 12:37:43 source Exp $
--
-- Concurrency test #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tcpt.sh b/binsrc/tests/suite/tcpt.sh
index f9bf95d..9648d78 100755
--- a/binsrc/tests/suite/tcpt.sh
+++ b/binsrc/tests/suite/tcpt.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tcpt.sh,v 1.3.2.1 2012/03/08 12:55:08 source Exp $
+# $Id: tcpt.sh,v 1.3 2008/06/19 11:35:01 source Exp $
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tcred.sql b/binsrc/tests/suite/tcred.sql
index a12aa38..7a93151 100644
--- a/binsrc/tests/suite/tcred.sql
+++ b/binsrc/tests/suite/tcred.sql
@@ -1,10 +1,10 @@
--
--- $Id: tcred.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tcred.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdate.sql b/binsrc/tests/suite/tdate.sql
index 4f8a8c6..29c27ec 100644
--- a/binsrc/tests/suite/tdate.sql
+++ b/binsrc/tests/suite/tdate.sql
@@ -1,14 +1,14 @@
--
-- tdate.sql
--
--- $Id: tdate.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdate.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Some simple date checking functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdatefun.sql b/binsrc/tests/suite/tdatefun.sql
index c21ff0c..3af6932 100644
--- a/binsrc/tests/suite/tdatefun.sql
+++ b/binsrc/tests/suite/tdatefun.sql
@@ -1,14 +1,14 @@
--
-- tdatefun.sql
--
--- $Id: tdatefun.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdatefun.sql,v 1.2 2009/03/10 14:32:26 source Exp $
--
-- Test date and timestamp functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdav.sh b/binsrc/tests/suite/tdav.sh
index e58d196..0649062 100755
--- a/binsrc/tests/suite/tdav.sh
+++ b/binsrc/tests/suite/tdav.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tdav.sh,v 1.3.2.4 2012/03/08 12:55:08 source Exp $
+# $Id: tdav.sh,v 1.3.2.3 2010/01/28 14:33:20 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tdav.sql b/binsrc/tests/suite/tdav.sql
index 6b82d1c..f31dfe7 100644
--- a/binsrc/tests/suite/tdav.sql
+++ b/binsrc/tests/suite/tdav.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav.sql,v 1.3.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdav.sql,v 1.3 2007/01/22 14:09:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdav1.sql b/binsrc/tests/suite/tdav1.sql
index ea2646d..e6be68c 100644
--- a/binsrc/tests/suite/tdav1.sql
+++ b/binsrc/tests/suite/tdav1.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav1.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdav1.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdav_conc.sql b/binsrc/tests/suite/tdav_conc.sql
index 58fcdf4..e3a4ba2 100644
--- a/binsrc/tests/suite/tdav_conc.sql
+++ b/binsrc/tests/suite/tdav_conc.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav_conc.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdav_conc.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdav_meta.sh b/binsrc/tests/suite/tdav_meta.sh
index 47ccfa9..7ee4cf1 100755
--- a/binsrc/tests/suite/tdav_meta.sh
+++ b/binsrc/tests/suite/tdav_meta.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tdav_meta.sh,v 1.5.2.5 2012/03/08 12:55:08 source Exp $
+# $Id: tdav_meta.sh,v 1.5.2.4 2011/03/28 23:11:40 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tdav_meta.sql b/binsrc/tests/suite/tdav_meta.sql
index 4e8f21e..83a20a8 100644
--- a/binsrc/tests/suite/tdav_meta.sql
+++ b/binsrc/tests/suite/tdav_meta.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav_meta.sql,v 1.4.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: tdav_meta.sql,v 1.4.2.2 2010/03/04 23:48:20 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdav_meta_checks.sql b/binsrc/tests/suite/tdav_meta_checks.sql
index 00b64d0..1f67fdf 100644
--- a/binsrc/tests/suite/tdav_meta_checks.sql
+++ b/binsrc/tests/suite/tdav_meta_checks.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav_meta_checks.sql,v 1.2.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tdav_meta_checks.sql,v 1.2.2.1 2010/03/04 23:48:20 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdav_meta_rdf.sql b/binsrc/tests/suite/tdav_meta_rdf.sql
index a62e39c..0714f0a 100644
--- a/binsrc/tests/suite/tdav_meta_rdf.sql
+++ b/binsrc/tests/suite/tdav_meta_rdf.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav_meta_rdf.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdav_meta_rdf.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdav_meta_rdf_checks.sql b/binsrc/tests/suite/tdav_meta_rdf_checks.sql
index 931a1da..2482985 100644
--- a/binsrc/tests/suite/tdav_meta_rdf_checks.sql
+++ b/binsrc/tests/suite/tdav_meta_rdf_checks.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdav_meta_checks.sql,v 1.2.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tdav_meta_checks.sql,v 1.2.2.1 2010/03/04 23:48:20 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdavmigr1.sql b/binsrc/tests/suite/tdavmigr1.sql
index a14fe55..5292c74 100644
--- a/binsrc/tests/suite/tdavmigr1.sql
+++ b/binsrc/tests/suite/tdavmigr1.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdavmigr1.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdavmigr1.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdavmigr2.sql b/binsrc/tests/suite/tdavmigr2.sql
index 389a572..d3ec8ec 100644
--- a/binsrc/tests/suite/tdavmigr2.sql
+++ b/binsrc/tests/suite/tdavmigr2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdavmigr2.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdavmigr2.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdbp.sh b/binsrc/tests/suite/tdbp.sh
index 8e164d4..637a023 100755
--- a/binsrc/tests/suite/tdbp.sh
+++ b/binsrc/tests/suite/tdbp.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tdbp.sh,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+# $Id: tdbp.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# DBPUMP tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdcascade.sql b/binsrc/tests/suite/tdcascade.sql
index 5e5bfb6..93d5cc5 100644
--- a/binsrc/tests/suite/tdcascade.sql
+++ b/binsrc/tests/suite/tdcascade.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdcascade.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdcascade.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdconv.sh b/binsrc/tests/suite/tdconv.sh
index e450875..0162d88 100755
--- a/binsrc/tests/suite/tdconv.sh
+++ b/binsrc/tests/suite/tdconv.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tdconv.sh,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+# $Id: tdconv.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# VAD tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdelete.sql b/binsrc/tests/suite/tdelete.sql
index 75d74a2..996e92b 100644
--- a/binsrc/tests/suite/tdelete.sql
+++ b/binsrc/tests/suite/tdelete.sql
@@ -1,14 +1,14 @@
--
-- tdelete.sql
--
--- $Id: tdelete.sql,v 1.1.1.1.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: tdelete.sql,v 1.1.1.1.2.2 2009/07/16 06:17:17 source Exp $
--
-- Test delete functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdrop.sh b/binsrc/tests/suite/tdrop.sh
index 6cb69e5..c0ffc6e 100755
--- a/binsrc/tests/suite/tdrop.sh
+++ b/binsrc/tests/suite/tdrop.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tdrop.sh,v 1.2.2.2 2012/03/08 12:55:08 source Exp $
+# $Id: tdrop.sh,v 1.2.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tdrop.sql b/binsrc/tests/suite/tdrop.sql
index fb89eb1..6f63dba 100644
--- a/binsrc/tests/suite/tdrop.sql
+++ b/binsrc/tests/suite/tdrop.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdrop.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdrop.sql,v 1.2 2006/08/16 07:58:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdrop1.sql b/binsrc/tests/suite/tdrop1.sql
index 5628efb..2532fee 100644
--- a/binsrc/tests/suite/tdrop1.sql
+++ b/binsrc/tests/suite/tdrop1.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdrop1.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdrop1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tdrop2.sql b/binsrc/tests/suite/tdrop2.sql
index fa7888c..a9c2c5f 100644
--- a/binsrc/tests/suite/tdrop2.sql
+++ b/binsrc/tests/suite/tdrop2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tdrop2.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tdrop2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/terror.sql b/binsrc/tests/suite/terror.sql
index 22594ab..9986468 100644
--- a/binsrc/tests/suite/terror.sql
+++ b/binsrc/tests/suite/terror.sql
@@ -1,7 +1,7 @@
--
-- terror.sql
--
--- $Id: terror.sql,v 1.9.2.6 2012/03/08 12:55:08 source Exp $
+-- $Id: terror.sql,v 1.9.2.5 2009/11/17 21:01:00 source Exp $
--
-- Various tests that should return an error.
-- The intent is that the server recover from these, hence results are
@@ -10,7 +10,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tescape.sql b/binsrc/tests/suite/tescape.sql
index 3d7ad4f..5cbadb0 100644
--- a/binsrc/tests/suite/tescape.sql
+++ b/binsrc/tests/suite/tescape.sql
@@ -1,10 +1,10 @@
--
--- $Id: tescape.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tescape.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/test_fn.sh b/binsrc/tests/suite/test_fn.sh
index e7cb828..f903215 100755
--- a/binsrc/tests/suite/test_fn.sh
+++ b/binsrc/tests/suite/test_fn.sh
@@ -2,7 +2,7 @@
#
# test_fn.sh
#
-# $Id: test_fn.sh,v 1.5.2.7 2012/03/12 22:45:09 source Exp $
+# $Id: test_fn.sh,v 1.5.2.5 2010/01/28 14:33:20 source Exp $
#
# Generic test functions which should be read at the beginning of the
# shell script.
@@ -10,7 +10,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -42,7 +42,6 @@ SILENT=${SILENT-0}
SERVER=${SERVER-M2}
ISQL=${ISQL-isql}
BLOBS=${BLOBS-blobs}
-SCROLL=${SCROLL-scroll}
INS=${INS-ins}
PORT=${PORT-1111}
HTTPPORT=`expr $PORT + 7000`
diff --git a/binsrc/tests/suite/test_server.sh b/binsrc/tests/suite/test_server.sh
index c0807ab..b7aa2d5 100755
--- a/binsrc/tests/suite/test_server.sh
+++ b/binsrc/tests/suite/test_server.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: test_server.sh,v 1.2.2.2 2012/03/08 12:55:08 source Exp $
+# $Id: test_server.sh,v 1.2.2.1 2009/04/20 21:17:47 source Exp $
#
# choose a server to run with
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/testall.sh b/binsrc/tests/suite/testall.sh
index 65db3ac..33964bd 100755
--- a/binsrc/tests/suite/testall.sh
+++ b/binsrc/tests/suite/testall.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: testall.sh,v 1.9.2.2 2012/03/08 12:55:08 source Exp $
+# $Id: testall.sh,v 1.9.2.1 2009/04/16 12:37:43 source Exp $
#
# Call all tests in succession
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/testgz.sql b/binsrc/tests/suite/testgz.sql
index ae8aac9..5c242a0 100644
--- a/binsrc/tests/suite/testgz.sql
+++ b/binsrc/tests/suite/testgz.sql
@@ -1,10 +1,10 @@
--
--- $Id: testgz.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: testgz.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/testtext.sql b/binsrc/tests/suite/testtext.sql
index f567d90..fcef34d 100644
--- a/binsrc/tests/suite/testtext.sql
+++ b/binsrc/tests/suite/testtext.sql
@@ -1,10 +1,10 @@
--
--- $Id: testtext.sql,v 1.2.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: testtext.sql,v 1.2.2.2 2009/07/14 22:24:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/texcept.sql b/binsrc/tests/suite/texcept.sql
index e637967..50110c9 100644
--- a/binsrc/tests/suite/texcept.sql
+++ b/binsrc/tests/suite/texcept.sql
@@ -1,14 +1,14 @@
--
-- texcept.sql
--
--- $Id: texcept.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: texcept.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Exception handling tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/texecute.sql b/binsrc/tests/suite/texecute.sql
index c00a078..64b5e79 100644
--- a/binsrc/tests/suite/texecute.sql
+++ b/binsrc/tests/suite/texecute.sql
@@ -1,14 +1,14 @@
--
-- texecute.sql
--
--- $Id: texecute.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: texecute.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- exec suite testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/text.sql b/binsrc/tests/suite/text.sql
index a060817..01b3b7a 100644
--- a/binsrc/tests/suite/text.sql
+++ b/binsrc/tests/suite/text.sql
@@ -1,10 +1,10 @@
--
--- $Id: text.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: text.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/textdef.sql b/binsrc/tests/suite/textdef.sql
index c04cbdd..d3fcca8 100644
--- a/binsrc/tests/suite/textdef.sql
+++ b/binsrc/tests/suite/textdef.sql
@@ -1,10 +1,10 @@
--
--- $Id: textdef.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: textdef.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tfk.sql b/binsrc/tests/suite/tfk.sql
index ed5957f..8913977 100644
--- a/binsrc/tests/suite/tfk.sql
+++ b/binsrc/tests/suite/tfk.sql
@@ -1,10 +1,10 @@
--
--- $Id: tfk.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tfk.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tfref.sql b/binsrc/tests/suite/tfref.sql
index 8f4a29a..b0cb4bf 100644
--- a/binsrc/tests/suite/tfref.sql
+++ b/binsrc/tests/suite/tfref.sql
@@ -1,14 +1,14 @@
--
-- tfref.sql
--
--- $Id: tfref.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tfref.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Function reference tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tft_offband.sql b/binsrc/tests/suite/tft_offband.sql
index 0b16644..238a155 100644
--- a/binsrc/tests/suite/tft_offband.sql
+++ b/binsrc/tests/suite/tft_offband.sql
@@ -1,10 +1,10 @@
--
--- $Id: tft_offband.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tft_offband.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tftext.sql b/binsrc/tests/suite/tftext.sql
index 512649d..98a7ae5 100644
--- a/binsrc/tests/suite/tftext.sql
+++ b/binsrc/tests/suite/tftext.sql
@@ -1,10 +1,10 @@
--
--- $Id: tftext.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tftext.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tftp.sql b/binsrc/tests/suite/tftp.sql
index 9fd9221..d370d53 100644
--- a/binsrc/tests/suite/tftp.sql
+++ b/binsrc/tests/suite/tftp.sql
@@ -1,10 +1,10 @@
--
--- $Id: tftp.sql,v 1.3.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tftp.sql,v 1.3.2.1 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tftt.sql b/binsrc/tests/suite/tftt.sql
index 118b0c5..6fab525 100644
--- a/binsrc/tests/suite/tftt.sql
+++ b/binsrc/tests/suite/tftt.sql
@@ -1,10 +1,10 @@
--
--- $Id: tftt.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tftt.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tgroup.sql b/binsrc/tests/suite/tgroup.sql
index e9659ec..0cee6ce 100644
--- a/binsrc/tests/suite/tgroup.sql
+++ b/binsrc/tests/suite/tgroup.sql
@@ -1,14 +1,14 @@
--
-- tgroup.sql
--
--- $Id: tgroup.sql,v 1.3.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: tgroup.sql,v 1.3.2.2 2009/04/20 21:19:39 source Exp $
--
-- Group By test
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/thttp.sh b/binsrc/tests/suite/thttp.sh
index b5c8ab3..16cb012 100755
--- a/binsrc/tests/suite/thttp.sh
+++ b/binsrc/tests/suite/thttp.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: thttp.sh,v 1.18.2.7 2012/03/12 22:45:09 source Exp $
+# $Id: thttp.sh,v 1.18.2.5 2010/01/28 14:33:20 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -744,26 +744,8 @@ case $1 in
if [ "$MAKE_VAD" = "yes" ] ; then
if [ $do_mappers_only -eq 1 ]
then
- LOG "Create RDF mappers Package"
- (cd ../../../../binsrc/rdf_mappers && make rdf_mappers_dav.vad)
- cp ../../../../binsrc/rdf_mappers/rdf_mappers_dav.vad .
- elif [ -f ../../../../autogen.sh ]
- then
- LOG "Create RDF mappers Package"
- (cd ../../../../binsrc/rdf_mappers && make rdf_mappers_dav.vad)
- cp ../../../../binsrc/rdf_mappers/rdf_mappers_dav.vad .
-
- LOG "Create ODS Framework VAD Package"
- (cd ../../../../appsrc/ODS-Framework && make ods_framework_dav.vad)
- cp ../../../../appsrc/ODS-Framework/ods_framework_dav.vad .
-
- LOG "Create ODS Blog VAD Package"
- (cd ../../../../appsrc/ODS-Blog && make ods_blog_dav.vad)
- cp ../../../../appsrc/ODS-Blog/ods_blog_dav.vad .
-
- LOG "Create SyncML VAD Package"
- (cd ../../../../binsrc/sync && make syncml_dav.vad)
- cp ../../../../binsrc/sync/syncml_dav.vad .
+ (cd ../../../rdf_mappers; make)
+ cp ../../../rdf_mappers/rdf_mappers_dav.vad ./
elif [ "x$HOST_OS" = "x" ]
then
LOG "Create ODS VAD Package"
@@ -1058,68 +1040,6 @@ fi
exit 1
fi
- LOG 'Now starting graph CRUD tests...'
-rm http/_virtrdf_log*.ttl
-rm http/graphcrud*.log
-
-#
-# Make sure curl is installed
-#
-RUN curl --version
-
-if test $STATUS -eq 0
-then
- curl --verbose --url "http://localhost:$HTTPPORT/sparql-graph-crud?graph-uri=http://www.openlinksw.com/schemas/virtrdf%23" > http/_virtrdf_log1.ttl 2> http/graphcrud_get0.log
- if grep 'virtrdf:' http/_virtrdf_log1.ttl > /dev/null ; then
- LOG 'PASSED: http/_virtrdf_log1.ttl contains data'
- else
- LOG '***FAILED: http/_virtrdf_log1.ttl does not contains virtrdf: string, but it should'
- fi
-
- curl --digest --user dba:dba --verbose --url "http://localhost:$HTTPPORT/sparql-graph-crud-auth?graph-uri=http://example.com/crud1" -X DELETE > http/graphcrud_1.log 2>&1
- if grep 'HTTP/1.1 404' http/graphcrud_1.log > /dev/null ; then
- LOG 'PASSED: http/graphcrud_1.log contains 404 error for missing graph'
- else
- LOG '***FAILED: http/graphcrud_1.log does not contains 404 error for missing graph, but it should'
- fi
-
- curl --digest --user dba:dba --verbose --url "http://localhost:$HTTPPORT/sparql-graph-crud-auth?graph-uri=http://example.com/crud1" -T http/_virtrdf_log1.ttl > http/graphcrud_2.log 2>&1
- if grep 'HTTP/1.1 201' http/graphcrud_2.log > /dev/null ; then
- LOG 'PASSED: http/graphcrud_2.log contains 201 for newly created graph'
- else
- LOG '***FAILED: http/graphcrud_2.log does not contain 201 for newly created graph, but it should'
- fi
-
- curl --verbose --url "http://localhost:$HTTPPORT/sparql-graph-crud?graph-uri=http://example.com/crud1" > http/_virtrdf_log2.ttl 2> http/graphcrud_get2.log
- if grep 'virtrdf:' http/_virtrdf_log2.ttl > /dev/null ; then
- LOG 'PASSED: http/_virtrdf_log2.ttl contains data'
- else
- LOG '***FAILED: http/_virtrdf_log2.ttl does not contains virtrdf: string, but it should'
- fi
-
- curl --digest --user dba:dba --verbose --url "http://localhost:$HTTPPORT/sparql-graph-crud-auth?graph-uri=http://example.com/crud1" -T http/_virtrdf_log1.ttl > http/graphcrud_2.log 2>&1
- if grep 'HTTP/1.1 200' http/graphcrud_2.log > /dev/null ; then
- LOG 'PASSED: http/graphcrud_2.log contains 200 for recreated graph'
- else
- LOG '***FAILED: http/graphcrud_2.log does not contains 200 for newly created graph, but it should'
- fi
-
- curl --digest --user dba:dba --verbose --url "http://localhost:$HTTPPORT/sparql-graph-crud-auth?graph-uri=http://example.com/crud1" -X DELETE > http/graphcrud_3.log 2>&1
- if grep 'HTTP/1.1 200' http/graphcrud_3.log > /dev/null ; then
- LOG 'PASSED: http/graphcrud_3.log contains 200 for successful graph removal'
- else
- LOG '***FAILED: http/graphcrud_3.log does not contain 200 for successful graph removal, but it should'
- fi
-
- curl --verbose --url "http://localhost:$HTTPPORT/sparql-graph-crud?graph-uri=http://example.com/crud1" > http/graphcrud_4.log 2>&1
- if grep 'HTTP/1.1 404' http/graphcrud_4.log > /dev/null ; then
- LOG 'PASSED: http/graphcrud_4.log contains 404 for deleted graph'
- else
- LOG '***FAILED: http/graphcrud_4.log does not contain 404 for deleted graph, but it should'
- fi
-fi
-
-
SHUTDOWN_SERVER
#
diff --git a/binsrc/tests/suite/thttp.sql b/binsrc/tests/suite/thttp.sql
index 9c6c3a8..8cd29e8 100644
--- a/binsrc/tests/suite/thttp.sql
+++ b/binsrc/tests/suite/thttp.sql
@@ -1,10 +1,10 @@
--
--- $Id: thttp.sql,v 1.4.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: thttp.sql,v 1.4.2.1 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tidxksize.sql b/binsrc/tests/suite/tidxksize.sql
index 8d768b7..5f6fcf3 100644
--- a/binsrc/tests/suite/tidxksize.sql
+++ b/binsrc/tests/suite/tidxksize.sql
@@ -1,14 +1,14 @@
--
-- tidxksize.sql
--
--- $Id: tidxksize.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tidxksize.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Index key sizes test suite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/timsg.sh b/binsrc/tests/suite/timsg.sh
index 1991d34..aec2363 100755
--- a/binsrc/tests/suite/timsg.sh
+++ b/binsrc/tests/suite/timsg.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: timsg.sh,v 1.3.2.2 2012/03/08 12:55:08 source Exp $
+# $Id: timsg.sh,v 1.3.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tinx.sql b/binsrc/tests/suite/tinx.sql
index 7cb85fc..42c5a32 100644
--- a/binsrc/tests/suite/tinx.sql
+++ b/binsrc/tests/suite/tinx.sql
@@ -1,10 +1,10 @@
--
--- $Id: tinx.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tinx.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tinxint.sql b/binsrc/tests/suite/tinxint.sql
index 76aaafe..1caa5f6 100644
--- a/binsrc/tests/suite/tinxint.sql
+++ b/binsrc/tests/suite/tinxint.sql
@@ -1,10 +1,10 @@
--
--- $Id: tinxint.sql,v 1.3.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tinxint.sql,v 1.3.2.1 2009/04/16 12:37:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tinxintbm.sql b/binsrc/tests/suite/tinxintbm.sql
index 82c1db8..a3bbff8 100644
--- a/binsrc/tests/suite/tinxintbm.sql
+++ b/binsrc/tests/suite/tinxintbm.sql
@@ -1,10 +1,10 @@
--
--- $Id: tinxintbm.sql,v 1.1.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: tinxintbm.sql,v 1.1.2.2 2009/07/09 13:04:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tiri.sql b/binsrc/tests/suite/tiri.sql
index 655fd58..501edc7 100644
--- a/binsrc/tests/suite/tiri.sql
+++ b/binsrc/tests/suite/tiri.sql
@@ -1,10 +1,10 @@
--
--- $Id: tiri.sql,v 1.3.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: tiri.sql,v 1.3.2.2 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tiso.sql b/binsrc/tests/suite/tiso.sql
index 0ce7cfa..6b48f52 100644
--- a/binsrc/tests/suite/tiso.sql
+++ b/binsrc/tests/suite/tiso.sql
@@ -1,10 +1,10 @@
--
--- $Id: tiso.sql,v 1.2.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tiso.sql,v 1.2.2.1 2009/04/16 12:37:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tjdbc.sh b/binsrc/tests/suite/tjdbc.sh
index 4210866..6a1dd93 100755
--- a/binsrc/tests/suite/tjdbc.sh
+++ b/binsrc/tests/suite/tjdbc.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tjdbc.sh,v 1.3.2.3 2012/03/08 12:55:08 source Exp $
+# $Id: tjdbc.sh,v 1.3.2.2 2009/07/09 13:04:50 source Exp $
#
# JDBC tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tjoin.sql b/binsrc/tests/suite/tjoin.sql
index 6ffe3cf..71db318 100644
--- a/binsrc/tests/suite/tjoin.sql
+++ b/binsrc/tests/suite/tjoin.sql
@@ -1,14 +1,14 @@
--
-- tjoin.sql
--
--- $Id: tjoin.sql,v 1.1.1.1.2.4 2012/03/08 12:55:08 source Exp $
+-- $Id: tjoin.sql,v 1.1.1.1.2.3 2011/03/25 15:10:16 source Exp $
--
-- Outer Join tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tkwd.sql b/binsrc/tests/suite/tkwd.sql
index 9024ee7..4691fd4 100644
--- a/binsrc/tests/suite/tkwd.sql
+++ b/binsrc/tests/suite/tkwd.sql
@@ -1,10 +1,10 @@
--
--- $Id: tkwd.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tkwd.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tldap.sql b/binsrc/tests/suite/tldap.sql
index 1aaccf1..2ef7bb9 100644
--- a/binsrc/tests/suite/tldap.sql
+++ b/binsrc/tests/suite/tldap.sql
@@ -1,10 +1,10 @@
--
--- $Id: tldap.sql,v 1.4.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tldap.sql,v 1.4.2.1 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tlock.sql b/binsrc/tests/suite/tlock.sql
index 0332117..0c75ea3 100644
--- a/binsrc/tests/suite/tlock.sql
+++ b/binsrc/tests/suite/tlock.sql
@@ -1,10 +1,10 @@
--
--- $Id: tlock.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tlock.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tlogft1.sql b/binsrc/tests/suite/tlogft1.sql
index 0668ff5..9c14034 100644
--- a/binsrc/tests/suite/tlogft1.sql
+++ b/binsrc/tests/suite/tlogft1.sql
@@ -1,14 +1,14 @@
--
-- tlogft1.sql
--
--- $Id: tlogft1.sql,v 1.2.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: tlogft1.sql,v 1.2.2.2 2009/04/20 21:19:39 source Exp $
--
-- Test freetext interaction with transaction log #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tlogft2.sql b/binsrc/tests/suite/tlogft2.sql
index 20be0d3..7fdd9b3 100644
--- a/binsrc/tests/suite/tlogft2.sql
+++ b/binsrc/tests/suite/tlogft2.sql
@@ -1,14 +1,14 @@
--
-- tlogft2.sql
--
--- $Id: tlogft2.sql,v 1.2.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: tlogft2.sql,v 1.2.2.2 2009/04/20 21:19:39 source Exp $
--
-- Test freetext interaction with transaction log #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tmulgrp.sql b/binsrc/tests/suite/tmulgrp.sql
index 35c0498..644b73c 100644
--- a/binsrc/tests/suite/tmulgrp.sql
+++ b/binsrc/tests/suite/tmulgrp.sql
@@ -1,14 +1,14 @@
--
-- tmulgroup.sql
--
--- $Id: tmulgrp.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tmulgrp.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Check multiple user group functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tmulgrp1.sql b/binsrc/tests/suite/tmulgrp1.sql
index 08ca0b3..09fafce 100644
--- a/binsrc/tests/suite/tmulgrp1.sql
+++ b/binsrc/tests/suite/tmulgrp1.sql
@@ -1,14 +1,14 @@
--
-- tmulgroup.sql
--
--- $Id: tmulgrp1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tmulgrp1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Check multiple user group functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tmulgrp2.sql b/binsrc/tests/suite/tmulgrp2.sql
index 91f9334..1c20a92 100644
--- a/binsrc/tests/suite/tmulgrp2.sql
+++ b/binsrc/tests/suite/tmulgrp2.sql
@@ -1,14 +1,14 @@
--
-- tmulgroup.sql
--
--- $Id: tmulgrp2.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tmulgrp2.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Check multiple user group functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tnull.sql b/binsrc/tests/suite/tnull.sql
index 20cdfe5..94db659 100644
--- a/binsrc/tests/suite/tnull.sql
+++ b/binsrc/tests/suite/tnull.sql
@@ -1,14 +1,14 @@
--
-- tnull.sql
--
--- $Id: tnull.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tnull.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test NULL handling
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tnum.sql b/binsrc/tests/suite/tnum.sql
index 3260076..cde0124 100644
--- a/binsrc/tests/suite/tnum.sql
+++ b/binsrc/tests/suite/tnum.sql
@@ -1,14 +1,14 @@
--
-- tnum.sql
--
--- $Id: tnum.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tnum.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Number tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tnumr.sql b/binsrc/tests/suite/tnumr.sql
index 1dcbd32..815e999 100644
--- a/binsrc/tests/suite/tnumr.sql
+++ b/binsrc/tests/suite/tnumr.sql
@@ -1,7 +1,7 @@
--
-- tnumr.sql
--
--- $Id: tnumr.sql,v 1.1.1.1.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: tnumr.sql,v 1.1.1.1.2.1 2010/01/25 23:28:52 source Exp $
--
-- Number tests
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tnumt.sql b/binsrc/tests/suite/tnumt.sql
index 53798c6..74b0110 100644
--- a/binsrc/tests/suite/tnumt.sql
+++ b/binsrc/tests/suite/tnumt.sql
@@ -1,14 +1,14 @@
--
-- tnumt.sql
--
--- $Id: tnumt.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tnumt.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Number tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tnwords.sql b/binsrc/tests/suite/tnwords.sql
index 4580235..c940b69 100644
--- a/binsrc/tests/suite/tnwords.sql
+++ b/binsrc/tests/suite/tnwords.sql
@@ -1,14 +1,14 @@
--
-- tnwords.sql
--
--- $Id: tnwords.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tnwords.sql,v 1.2 2007/05/04 13:02:28 source Exp $
--
-- Word tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tnwords_create.sql b/binsrc/tests/suite/tnwords_create.sql
index e575688..6f37ece 100644
--- a/binsrc/tests/suite/tnwords_create.sql
+++ b/binsrc/tests/suite/tnwords_create.sql
@@ -1,14 +1,14 @@
--
-- tnwords_create.sql
--
--- $Id: tnwords_create.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tnwords_create.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Creates the tables for Word tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tnwords_remote.sql b/binsrc/tests/suite/tnwords_remote.sql
index 6d810a3..587a1b1 100644
--- a/binsrc/tests/suite/tnwords_remote.sql
+++ b/binsrc/tests/suite/tnwords_remote.sql
@@ -1,14 +1,14 @@
--
-- tnwords_remote.sql
--
--- $Id: tnwords_remote.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tnwords_remote.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Attaches the tables for Word tests and does the test remotely
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tobject.sql b/binsrc/tests/suite/tobject.sql
index f2dae16..e856213 100644
--- a/binsrc/tests/suite/tobject.sql
+++ b/binsrc/tests/suite/tobject.sql
@@ -1,14 +1,14 @@
--
-- tobject.sql
--
--- $Id: tobject.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tobject.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Object feature tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/toutdsk.sql b/binsrc/tests/suite/toutdsk.sql
index 061bed4..6f609e7 100644
--- a/binsrc/tests/suite/toutdsk.sql
+++ b/binsrc/tests/suite/toutdsk.sql
@@ -1,10 +1,10 @@
--
--- $Id: toutdsk.sql,v 1.3.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: toutdsk.sql,v 1.3.2.2 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/toutdskck.sql b/binsrc/tests/suite/toutdskck.sql
index 8530aa6..2b695d2 100644
--- a/binsrc/tests/suite/toutdskck.sql
+++ b/binsrc/tests/suite/toutdskck.sql
@@ -1,10 +1,10 @@
--
--- $Id: toutdskck.sql,v 1.4.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: toutdskck.sql,v 1.4.2.2 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tp.sh b/binsrc/tests/suite/tp.sh
index 983424c..f8dc6e7 100755
--- a/binsrc/tests/suite/tp.sh
+++ b/binsrc/tests/suite/tp.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tp.sh,v 1.2.2.3 2012/03/08 12:55:08 source Exp $
+# $Id: tp.sh,v 1.2.2.2 2009/07/09 13:04:50 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tpc-d/LOAD.sh b/binsrc/tests/suite/tpc-d/LOAD.sh
index 3670786..05b08fe 100755
--- a/binsrc/tests/suite/tpc-d/LOAD.sh
+++ b/binsrc/tests/suite/tpc-d/LOAD.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: LOAD.sh,v 1.2.2.4 2012/03/12 22:45:09 source Exp $
+# $Id: LOAD.sh,v 1.2.2.2 2009/04/20 21:19:39 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -426,6 +426,6 @@ in
;;
z*)
- LOG "usage $0 database username password (tables | indexes | procedures | cleanprocedures | cleantables | cleandata | load | attach )"
+ LOG "usage $0 (tables | indexes | procedures | cleanprocedures | cleantables | cleandata | load | attach )"
;;
esac
diff --git a/binsrc/tests/suite/tpc-d/Makefile.am b/binsrc/tests/suite/tpc-d/Makefile.am
index d8ce25b..f06ede6 100644
--- a/binsrc/tests/suite/tpc-d/Makefile.am
+++ b/binsrc/tests/suite/tpc-d/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
diff --git a/binsrc/tests/suite/tpc-d/Makefile.in b/binsrc/tests/suite/tpc-d/Makefile.in
index 206c421..03484e6 100644
--- a/binsrc/tests/suite/tpc-d/Makefile.in
+++ b/binsrc/tests/suite/tpc-d/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2008 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
@@ -101,7 +101,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -150,7 +149,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -202,7 +200,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -249,6 +246,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/suite/tpc-d/Q.sql b/binsrc/tests/suite/tpc-d/Q.sql
index 3ac3241..f481b88 100644
--- a/binsrc/tests/suite/tpc-d/Q.sql
+++ b/binsrc/tests/suite/tpc-d/Q.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q1.sql b/binsrc/tests/suite/tpc-d/Q1.sql
index 166ac80..dc36bd2 100644
--- a/binsrc/tests/suite/tpc-d/Q1.sql
+++ b/binsrc/tests/suite/tpc-d/Q1.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q1.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q10.sql b/binsrc/tests/suite/tpc-d/Q10.sql
index 55c8ad9..43b9e63 100644
--- a/binsrc/tests/suite/tpc-d/Q10.sql
+++ b/binsrc/tests/suite/tpc-d/Q10.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q10.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q10.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q11.sql b/binsrc/tests/suite/tpc-d/Q11.sql
index 46f859b..7c98939 100644
--- a/binsrc/tests/suite/tpc-d/Q11.sql
+++ b/binsrc/tests/suite/tpc-d/Q11.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q11.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q11.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q12.sql b/binsrc/tests/suite/tpc-d/Q12.sql
index ebb686e..b9f9b12 100644
--- a/binsrc/tests/suite/tpc-d/Q12.sql
+++ b/binsrc/tests/suite/tpc-d/Q12.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q12.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q12.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q13.sql b/binsrc/tests/suite/tpc-d/Q13.sql
index c538595..b814c2f 100644
--- a/binsrc/tests/suite/tpc-d/Q13.sql
+++ b/binsrc/tests/suite/tpc-d/Q13.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q13.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q13.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q14.sql b/binsrc/tests/suite/tpc-d/Q14.sql
index 496f47e..2558047 100644
--- a/binsrc/tests/suite/tpc-d/Q14.sql
+++ b/binsrc/tests/suite/tpc-d/Q14.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q14.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q14.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q15.sql b/binsrc/tests/suite/tpc-d/Q15.sql
index 3fe801e..a9c0065 100644
--- a/binsrc/tests/suite/tpc-d/Q15.sql
+++ b/binsrc/tests/suite/tpc-d/Q15.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q15.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q15.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q16.sql b/binsrc/tests/suite/tpc-d/Q16.sql
index 6b56f54..aada77c 100644
--- a/binsrc/tests/suite/tpc-d/Q16.sql
+++ b/binsrc/tests/suite/tpc-d/Q16.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q16.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q16.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q17.sql b/binsrc/tests/suite/tpc-d/Q17.sql
index a7ea006..23f5805 100644
--- a/binsrc/tests/suite/tpc-d/Q17.sql
+++ b/binsrc/tests/suite/tpc-d/Q17.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q17.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q17.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q18.sql b/binsrc/tests/suite/tpc-d/Q18.sql
index 7938ca1..2e81685 100644
--- a/binsrc/tests/suite/tpc-d/Q18.sql
+++ b/binsrc/tests/suite/tpc-d/Q18.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q18.sql,v 1.2.2.2 2012/03/08 12:55:10 source Exp $
+-- $Id: Q18.sql,v 1.2.2.1 2009/07/09 13:04:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q19.sql b/binsrc/tests/suite/tpc-d/Q19.sql
index e71c1b9..d27e5de 100644
--- a/binsrc/tests/suite/tpc-d/Q19.sql
+++ b/binsrc/tests/suite/tpc-d/Q19.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q19.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q19.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q2.sql b/binsrc/tests/suite/tpc-d/Q2.sql
index 9cdd3ca..ba65f33 100644
--- a/binsrc/tests/suite/tpc-d/Q2.sql
+++ b/binsrc/tests/suite/tpc-d/Q2.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q2.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q20.sql b/binsrc/tests/suite/tpc-d/Q20.sql
index b7740f9..74e2298 100644
--- a/binsrc/tests/suite/tpc-d/Q20.sql
+++ b/binsrc/tests/suite/tpc-d/Q20.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q20.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q20.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q21.sql b/binsrc/tests/suite/tpc-d/Q21.sql
index 1566a8b..187bb01 100644
--- a/binsrc/tests/suite/tpc-d/Q21.sql
+++ b/binsrc/tests/suite/tpc-d/Q21.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q21.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q21.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q22.sql b/binsrc/tests/suite/tpc-d/Q22.sql
index 9397d27..c5dd3bb 100644
--- a/binsrc/tests/suite/tpc-d/Q22.sql
+++ b/binsrc/tests/suite/tpc-d/Q22.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q22.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q22.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q3.sql b/binsrc/tests/suite/tpc-d/Q3.sql
index ad7abc5..d63b979 100644
--- a/binsrc/tests/suite/tpc-d/Q3.sql
+++ b/binsrc/tests/suite/tpc-d/Q3.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q3.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q4.sql b/binsrc/tests/suite/tpc-d/Q4.sql
index 99a112c..a3a82ca 100644
--- a/binsrc/tests/suite/tpc-d/Q4.sql
+++ b/binsrc/tests/suite/tpc-d/Q4.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q4.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q4.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q5.sql b/binsrc/tests/suite/tpc-d/Q5.sql
index a2e6893..03cc6ed 100644
--- a/binsrc/tests/suite/tpc-d/Q5.sql
+++ b/binsrc/tests/suite/tpc-d/Q5.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q5.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q5.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q6.sql b/binsrc/tests/suite/tpc-d/Q6.sql
index ce28d01..5727519 100644
--- a/binsrc/tests/suite/tpc-d/Q6.sql
+++ b/binsrc/tests/suite/tpc-d/Q6.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q6.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q6.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q7.sql b/binsrc/tests/suite/tpc-d/Q7.sql
index d3decd6..f8d4eab 100644
--- a/binsrc/tests/suite/tpc-d/Q7.sql
+++ b/binsrc/tests/suite/tpc-d/Q7.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q7.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q7.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q8.sql b/binsrc/tests/suite/tpc-d/Q8.sql
index 5b997be..cc7babe 100644
--- a/binsrc/tests/suite/tpc-d/Q8.sql
+++ b/binsrc/tests/suite/tpc-d/Q8.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q8.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q8.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q9.sql b/binsrc/tests/suite/tpc-d/Q9.sql
index 8abf9ad..4d79827 100644
--- a/binsrc/tests/suite/tpc-d/Q9.sql
+++ b/binsrc/tests/suite/tpc-d/Q9.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q9.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q9.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS1.sql b/binsrc/tests/suite/tpc-d/QS1.sql
index f53a261..b6c5efa 100644
--- a/binsrc/tests/suite/tpc-d/QS1.sql
+++ b/binsrc/tests/suite/tpc-d/QS1.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS1.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS10.sql b/binsrc/tests/suite/tpc-d/QS10.sql
index 2ed5fd4..fd4942c 100644
--- a/binsrc/tests/suite/tpc-d/QS10.sql
+++ b/binsrc/tests/suite/tpc-d/QS10.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS10.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS10.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS11.sql b/binsrc/tests/suite/tpc-d/QS11.sql
index d2d5f57..2f7ea0f 100644
--- a/binsrc/tests/suite/tpc-d/QS11.sql
+++ b/binsrc/tests/suite/tpc-d/QS11.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS11.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS11.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS12.sql b/binsrc/tests/suite/tpc-d/QS12.sql
index ca1b4e6..c30343a 100644
--- a/binsrc/tests/suite/tpc-d/QS12.sql
+++ b/binsrc/tests/suite/tpc-d/QS12.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS12.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS12.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS13.sql b/binsrc/tests/suite/tpc-d/QS13.sql
index 35f36cf..5d04509 100644
--- a/binsrc/tests/suite/tpc-d/QS13.sql
+++ b/binsrc/tests/suite/tpc-d/QS13.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS13.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS13.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS14.sql b/binsrc/tests/suite/tpc-d/QS14.sql
index ede4d9f..bf90ca1 100644
--- a/binsrc/tests/suite/tpc-d/QS14.sql
+++ b/binsrc/tests/suite/tpc-d/QS14.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS14.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS14.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS15.sql b/binsrc/tests/suite/tpc-d/QS15.sql
index c098187..85030dd 100644
--- a/binsrc/tests/suite/tpc-d/QS15.sql
+++ b/binsrc/tests/suite/tpc-d/QS15.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS15.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS15.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS17.sql b/binsrc/tests/suite/tpc-d/QS17.sql
index 74acb9f..7ac0cbd 100644
--- a/binsrc/tests/suite/tpc-d/QS17.sql
+++ b/binsrc/tests/suite/tpc-d/QS17.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS17.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS17.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS18.sql b/binsrc/tests/suite/tpc-d/QS18.sql
index fb9a4ee..4ae612a 100644
--- a/binsrc/tests/suite/tpc-d/QS18.sql
+++ b/binsrc/tests/suite/tpc-d/QS18.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS18.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS18.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS18o.sql b/binsrc/tests/suite/tpc-d/QS18o.sql
index 509a562..2f81037 100644
--- a/binsrc/tests/suite/tpc-d/QS18o.sql
+++ b/binsrc/tests/suite/tpc-d/QS18o.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS18o.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS18o.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS2.sql b/binsrc/tests/suite/tpc-d/QS2.sql
index d4f61e9..ddd9ec4 100644
--- a/binsrc/tests/suite/tpc-d/QS2.sql
+++ b/binsrc/tests/suite/tpc-d/QS2.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS2.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS20.sql b/binsrc/tests/suite/tpc-d/QS20.sql
index dcc4001..3506caa 100644
--- a/binsrc/tests/suite/tpc-d/QS20.sql
+++ b/binsrc/tests/suite/tpc-d/QS20.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS20.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS20.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS21.sql b/binsrc/tests/suite/tpc-d/QS21.sql
index cf62cdd..72caca3 100644
--- a/binsrc/tests/suite/tpc-d/QS21.sql
+++ b/binsrc/tests/suite/tpc-d/QS21.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS21.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS21.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS22.sql b/binsrc/tests/suite/tpc-d/QS22.sql
index e71876b..7cf2dce 100644
--- a/binsrc/tests/suite/tpc-d/QS22.sql
+++ b/binsrc/tests/suite/tpc-d/QS22.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS22.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS22.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS3.sql b/binsrc/tests/suite/tpc-d/QS3.sql
index 6f9126c..2b01e3c 100644
--- a/binsrc/tests/suite/tpc-d/QS3.sql
+++ b/binsrc/tests/suite/tpc-d/QS3.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS3.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS4.sql b/binsrc/tests/suite/tpc-d/QS4.sql
index 15e546e..2a27fb3 100644
--- a/binsrc/tests/suite/tpc-d/QS4.sql
+++ b/binsrc/tests/suite/tpc-d/QS4.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS4.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS4.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS5.sql b/binsrc/tests/suite/tpc-d/QS5.sql
index b3b12a8..a351b4f 100644
--- a/binsrc/tests/suite/tpc-d/QS5.sql
+++ b/binsrc/tests/suite/tpc-d/QS5.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS5.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS5.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS6.sql b/binsrc/tests/suite/tpc-d/QS6.sql
index fb12047..b6fbc80 100644
--- a/binsrc/tests/suite/tpc-d/QS6.sql
+++ b/binsrc/tests/suite/tpc-d/QS6.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS6.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS6.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS7.sql b/binsrc/tests/suite/tpc-d/QS7.sql
index 63a8fad..0b636e4 100644
--- a/binsrc/tests/suite/tpc-d/QS7.sql
+++ b/binsrc/tests/suite/tpc-d/QS7.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS7.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS7.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS8.sql b/binsrc/tests/suite/tpc-d/QS8.sql
index ff15480..86681af 100644
--- a/binsrc/tests/suite/tpc-d/QS8.sql
+++ b/binsrc/tests/suite/tpc-d/QS8.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS8.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS8.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/QS9.sql b/binsrc/tests/suite/tpc-d/QS9.sql
index 91d5e36..f0cb646 100644
--- a/binsrc/tests/suite/tpc-d/QS9.sql
+++ b/binsrc/tests/suite/tpc-d/QS9.sql
@@ -1,10 +1,10 @@
--
--- $Id: QS9.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: QS9.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_dt.sql b/binsrc/tests/suite/tpc-d/Q_dt.sql
index a24c126..af18b64 100644
--- a/binsrc/tests/suite/tpc-d/Q_dt.sql
+++ b/binsrc/tests/suite/tpc-d/Q_dt.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_dt.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_dt.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_mysql.sql b/binsrc/tests/suite/tpc-d/Q_mysql.sql
index 6529643..10e0465 100644
--- a/binsrc/tests/suite/tpc-d/Q_mysql.sql
+++ b/binsrc/tests/suite/tpc-d/Q_mysql.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_mysql.sql,v 1.1.2.3 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_mysql.sql,v 1.1.2.2 2009/04/16 20:15:22 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_ora.sql b/binsrc/tests/suite/tpc-d/Q_ora.sql
index e4feb60..0a4a556 100644
--- a/binsrc/tests/suite/tpc-d/Q_ora.sql
+++ b/binsrc/tests/suite/tpc-d/Q_ora.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_ora.sql,v 1.1.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_ora.sql,v 1.1 2007/03/28 11:47:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_sparql_map.sql b/binsrc/tests/suite/tpc-d/Q_sparql_map.sql
index 1ca55fb..1b2b37d 100644
--- a/binsrc/tests/suite/tpc-d/Q_sparql_map.sql
+++ b/binsrc/tests/suite/tpc-d/Q_sparql_map.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_sparql_map.sql,v 1.3.2.3 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_sparql_map.sql,v 1.3.2.2 2009/04/16 20:15:22 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_sparql_map_cmp.sql b/binsrc/tests/suite/tpc-d/Q_sparql_map_cmp.sql
index bebcfaf..2e0db14 100644
--- a/binsrc/tests/suite/tpc-d/Q_sparql_map_cmp.sql
+++ b/binsrc/tests/suite/tpc-d/Q_sparql_map_cmp.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_sparql_map_cmp.sql,v 1.3.2.6 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_sparql_map_cmp.sql,v 1.3.2.5 2010/01/31 20:18:26 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_sparql_map_endpoint.sql b/binsrc/tests/suite/tpc-d/Q_sparql_map_endpoint.sql
index 675f0b7..4962862 100644
--- a/binsrc/tests/suite/tpc-d/Q_sparql_map_endpoint.sql
+++ b/binsrc/tests/suite/tpc-d/Q_sparql_map_endpoint.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_sparql_map_endpoint.sql,v 1.1.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_sparql_map_endpoint.sql,v 1.1 2008/06/17 07:55:21 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_sparql_map_translations.sql b/binsrc/tests/suite/tpc-d/Q_sparql_map_translations.sql
index 5a0be87..535ba4e 100644
--- a/binsrc/tests/suite/tpc-d/Q_sparql_map_translations.sql
+++ b/binsrc/tests/suite/tpc-d/Q_sparql_map_translations.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_sparql_map_translations.sql,v 1.2.2.2 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_sparql_map_translations.sql,v 1.2.2.1 2009/07/09 13:04:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_sparql_phy_cmp.sql b/binsrc/tests/suite/tpc-d/Q_sparql_phy_cmp.sql
index bf6f544..0c43083 100644
--- a/binsrc/tests/suite/tpc-d/Q_sparql_phy_cmp.sql
+++ b/binsrc/tests/suite/tpc-d/Q_sparql_phy_cmp.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_sparql_phy_cmp.sql,v 1.3.2.3 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_sparql_phy_cmp.sql,v 1.3.2.2 2009/07/09 13:04:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/Q_virt.sql b/binsrc/tests/suite/tpc-d/Q_virt.sql
index 3041d6f..2fe2eb3 100644
--- a/binsrc/tests/suite/tpc-d/Q_virt.sql
+++ b/binsrc/tests/suite/tpc-d/Q_virt.sql
@@ -1,10 +1,10 @@
--
--- $Id: Q_virt.sql,v 1.1.2.2 2012/03/08 12:55:10 source Exp $
+-- $Id: Q_virt.sql,v 1.1.2.1 2010/01/31 20:18:26 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/all_ms.sql b/binsrc/tests/suite/tpc-d/all_ms.sql
index c4ccfda..3590c37 100644
--- a/binsrc/tests/suite/tpc-d/all_ms.sql
+++ b/binsrc/tests/suite/tpc-d/all_ms.sql
@@ -1,10 +1,10 @@
--
--- $Id: all_ms.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: all_ms.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/attach_tpcd.sql b/binsrc/tests/suite/tpc-d/attach_tpcd.sql
index b8c4082..faed3d0 100644
--- a/binsrc/tests/suite/tpc-d/attach_tpcd.sql
+++ b/binsrc/tests/suite/tpc-d/attach_tpcd.sql
@@ -1,14 +1,14 @@
--
-- attach_tpcd.sql
--
--- $Id: attach_tpcd.sql,v 1.1.1.1.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: attach_tpcd.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- TPC-D Benchmark
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql b/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql
index 8fc47db..f5a0306 100644
--- a/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql
+++ b/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql
@@ -1,14 +1,14 @@
--
-- attach_tpcd.sql
--
--- $Id: attach_tpcd_vdb.sql,v 1.1.1.1.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: attach_tpcd_vdb.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- TPC-D Benchmark
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/create_indexes.sql b/binsrc/tests/suite/tpc-d/create_indexes.sql
index 701479a..297ae6b 100644
--- a/binsrc/tests/suite/tpc-d/create_indexes.sql
+++ b/binsrc/tests/suite/tpc-d/create_indexes.sql
@@ -1,10 +1,10 @@
--
--- $Id: create_indexes.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: create_indexes.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/create_procedures.sql b/binsrc/tests/suite/tpc-d/create_procedures.sql
index eb06b33..70c574b 100644
--- a/binsrc/tests/suite/tpc-d/create_procedures.sql
+++ b/binsrc/tests/suite/tpc-d/create_procedures.sql
@@ -1,10 +1,10 @@
--
--- $Id: create_procedures.sql,v 1.2.2.2 2012/03/08 12:55:10 source Exp $
+-- $Id: create_procedures.sql,v 1.2.2.1 2009/09/17 14:47:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/create_tables.sql b/binsrc/tests/suite/tpc-d/create_tables.sql
index a767985..72d87bb 100644
--- a/binsrc/tests/suite/tpc-d/create_tables.sql
+++ b/binsrc/tests/suite/tpc-d/create_tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: create_tables.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: create_tables.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/deattach_tpcd.sql b/binsrc/tests/suite/tpc-d/deattach_tpcd.sql
index abad522..205fc57 100644
--- a/binsrc/tests/suite/tpc-d/deattach_tpcd.sql
+++ b/binsrc/tests/suite/tpc-d/deattach_tpcd.sql
@@ -1,14 +1,14 @@
--
-- dedrop_tpcd.sql
--
--- $Id: deattach_tpcd.sql,v 1.1.1.1.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: deattach_tpcd.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- TPC-D Benchmark
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/load_query.sql b/binsrc/tests/suite/tpc-d/load_query.sql
index 5639e11..9e476c7 100644
--- a/binsrc/tests/suite/tpc-d/load_query.sql
+++ b/binsrc/tests/suite/tpc-d/load_query.sql
@@ -1,10 +1,10 @@
--
--- $Id: load_query.sql,v 1.3.2.2 2012/03/08 12:55:10 source Exp $
+-- $Id: load_query.sql,v 1.3.2.1 2009/04/16 20:15:22 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/msaccess.sql b/binsrc/tests/suite/tpc-d/msaccess.sql
index da5c516..9eaf337 100644
--- a/binsrc/tests/suite/tpc-d/msaccess.sql
+++ b/binsrc/tests/suite/tpc-d/msaccess.sql
@@ -1,10 +1,10 @@
--
--- $Id: msaccess.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: msaccess.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/mssql.sql b/binsrc/tests/suite/tpc-d/mssql.sql
index 530b6c7..dcfcfc0 100644
--- a/binsrc/tests/suite/tpc-d/mssql.sql
+++ b/binsrc/tests/suite/tpc-d/mssql.sql
@@ -1,10 +1,10 @@
--
--- $Id: mssql.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: mssql.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/ora.sql b/binsrc/tests/suite/tpc-d/ora.sql
index 4b8c119..40c40d3 100644
--- a/binsrc/tests/suite/tpc-d/ora.sql
+++ b/binsrc/tests/suite/tpc-d/ora.sql
@@ -1,10 +1,10 @@
--
--- $Id: ora.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: ora.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/q31.sql b/binsrc/tests/suite/tpc-d/q31.sql
index 4d82d87..189b4e4 100644
--- a/binsrc/tests/suite/tpc-d/q31.sql
+++ b/binsrc/tests/suite/tpc-d/q31.sql
@@ -1,10 +1,10 @@
--
--- $Id: q31.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: q31.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/q32.sql b/binsrc/tests/suite/tpc-d/q32.sql
index 0d6771b..d81a820 100644
--- a/binsrc/tests/suite/tpc-d/q32.sql
+++ b/binsrc/tests/suite/tpc-d/q32.sql
@@ -1,10 +1,10 @@
--
--- $Id: q32.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: q32.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/q33.sql b/binsrc/tests/suite/tpc-d/q33.sql
index 65d4c13..ce4b60c 100644
--- a/binsrc/tests/suite/tpc-d/q33.sql
+++ b/binsrc/tests/suite/tpc-d/q33.sql
@@ -1,10 +1,10 @@
--
--- $Id: q33.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: q33.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/q34.sql b/binsrc/tests/suite/tpc-d/q34.sql
index 234f7f3..077b859 100644
--- a/binsrc/tests/suite/tpc-d/q34.sql
+++ b/binsrc/tests/suite/tpc-d/q34.sql
@@ -1,10 +1,10 @@
--
--- $Id: q34.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: q34.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/res.sh b/binsrc/tests/suite/tpc-d/res.sh
index cb28290..3b3b2d6 100755
--- a/binsrc/tests/suite/tpc-d/res.sh
+++ b/binsrc/tests/suite/tpc-d/res.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: res.sh,v 1.2.2.2 2012/03/08 12:55:10 source Exp $
+# $Id: res.sh,v 1.2.2.1 2009/09/17 14:47:09 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tpc-d/runtests.sh b/binsrc/tests/suite/tpc-d/runtests.sh
index 95243ff..7a47259 100755
--- a/binsrc/tests/suite/tpc-d/runtests.sh
+++ b/binsrc/tests/suite/tpc-d/runtests.sh
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/stat-tpcd.sql b/binsrc/tests/suite/tpc-d/stat-tpcd.sql
index 1f23c9f..accd73f 100644
--- a/binsrc/tests/suite/tpc-d/stat-tpcd.sql
+++ b/binsrc/tests/suite/tpc-d/stat-tpcd.sql
@@ -1,10 +1,10 @@
--
--- $Id: stat-tpcd.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: stat-tpcd.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/test_ms.sql b/binsrc/tests/suite/tpc-d/test_ms.sql
index f5bfad6..54d971f 100644
--- a/binsrc/tests/suite/tpc-d/test_ms.sql
+++ b/binsrc/tests/suite/tpc-d/test_ms.sql
@@ -1,10 +1,10 @@
--
--- $Id: test_ms.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: test_ms.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/test_tbl.sql b/binsrc/tests/suite/tpc-d/test_tbl.sql
index 8dd8c83..afb0085 100644
--- a/binsrc/tests/suite/tpc-d/test_tbl.sql
+++ b/binsrc/tests/suite/tpc-d/test_tbl.sql
@@ -1,10 +1,10 @@
--
--- $Id: test_tbl.sql,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: test_tbl.sql,v 1.3 2008/03/05 16:05:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpc-d/tpcd.sh b/binsrc/tests/suite/tpc-d/tpcd.sh
index bcdc7c3..95e4143 100755
--- a/binsrc/tests/suite/tpc-d/tpcd.sh
+++ b/binsrc/tests/suite/tpc-d/tpcd.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tpcd.sh,v 1.5.2.3 2012/03/08 12:55:10 source Exp $
+# $Id: tpcd.sh,v 1.5.2.2 2009/04/16 20:15:22 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tpcc_update.sql b/binsrc/tests/suite/tpcc_update.sql
index 9bd69e7..5339e30 100644
--- a/binsrc/tests/suite/tpcc_update.sql
+++ b/binsrc/tests/suite/tpcc_update.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpcc_update.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tpcc_update.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpcc_update1.sql b/binsrc/tests/suite/tpcc_update1.sql
index 842ba38..449d0d0 100644
--- a/binsrc/tests/suite/tpcc_update1.sql
+++ b/binsrc/tests/suite/tpcc_update1.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpcc_update1.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tpcc_update1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpcc_update2.sql b/binsrc/tests/suite/tpcc_update2.sql
index 653dc05..9130497 100644
--- a/binsrc/tests/suite/tpcc_update2.sql
+++ b/binsrc/tests/suite/tpcc_update2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpcc_update2.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tpcc_update2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpcd.sh b/binsrc/tests/suite/tpcd.sh
index 0929b9d..4ac3c1b 100755
--- a/binsrc/tests/suite/tpcd.sh
+++ b/binsrc/tests/suite/tpcd.sh
@@ -2,14 +2,14 @@
#
# tpcd.sh
#
-# $Id: tpcd.sh,v 1.7.2.5 2012/03/08 12:55:08 source Exp $
+# $Id: tpcd.sh,v 1.7.2.4 2009/09/17 14:47:09 source Exp $
#
# TPC-D tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpkopt.sql b/binsrc/tests/suite/tpkopt.sql
index fd8922a..42102c7 100644
--- a/binsrc/tests/suite/tpkopt.sql
+++ b/binsrc/tests/suite/tpkopt.sql
@@ -1,14 +1,14 @@
--
-- tpkopt.sql
--
--- $Id: tpkopt.sql,v 1.2.2.3 2012/03/08 12:55:08 source Exp $
+-- $Id: tpkopt.sql,v 1.2.2.2 2009/04/20 21:19:39 source Exp $
--
-- Test primary keys
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tplinverse.sql b/binsrc/tests/suite/tplinverse.sql
index 83a1c9b..cf38441 100644
--- a/binsrc/tests/suite/tplinverse.sql
+++ b/binsrc/tests/suite/tplinverse.sql
@@ -1,14 +1,14 @@
--
-- tplinverse.sql
--
--- $Id: tplinverse.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tplinverse.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- PL inverse functions suite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tplmodule.sql b/binsrc/tests/suite/tplmodule.sql
index ff8c5b9..74774bc 100644
--- a/binsrc/tests/suite/tplmodule.sql
+++ b/binsrc/tests/suite/tplmodule.sql
@@ -1,14 +1,14 @@
--
-- tplmodule.sql
--
--- $Id: tplmodule.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tplmodule.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- PL Modules suite testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tplscroll.sql b/binsrc/tests/suite/tplscroll.sql
index 3e578b2..5d4b08b 100644
--- a/binsrc/tests/suite/tplscroll.sql
+++ b/binsrc/tests/suite/tplscroll.sql
@@ -1,14 +1,14 @@
--
-- tplscroll.sql
--
--- $Id: tplscroll.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tplscroll.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- PL Scrollable cursors suite testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpm.sql b/binsrc/tests/suite/tpm.sql
index 24ec258..ade1ac1 100644
--- a/binsrc/tests/suite/tpm.sql
+++ b/binsrc/tests/suite/tpm.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpm.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tpm.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpmfinal.sql b/binsrc/tests/suite/tpmfinal.sql
index 669305f..b1cea2d 100644
--- a/binsrc/tests/suite/tpmfinal.sql
+++ b/binsrc/tests/suite/tpmfinal.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpmfinal.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tpmfinal.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tpminit.sql b/binsrc/tests/suite/tpminit.sql
index 1963b34..283da3c 100644
--- a/binsrc/tests/suite/tpminit.sql
+++ b/binsrc/tests/suite/tpminit.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpminit.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tpminit.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tproviders.sh b/binsrc/tests/suite/tproviders.sh
index 418ea94..6ae12bc 100755
--- a/binsrc/tests/suite/tproviders.sh
+++ b/binsrc/tests/suite/tproviders.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tproviders.sh,v 1.3.2.2 2012/03/08 12:55:08 source Exp $
+# $Id: tproviders.sh,v 1.3.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tproxy.sh b/binsrc/tests/suite/tproxy.sh
index d0c7cf9..cec65af 100755
--- a/binsrc/tests/suite/tproxy.sh
+++ b/binsrc/tests/suite/tproxy.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tproxy.sh,v 1.4.2.4 2012/03/08 12:55:08 source Exp $
+# $Id: tproxy.sh,v 1.4.2.3 2010/01/28 14:33:20 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tpview.sql b/binsrc/tests/suite/tpview.sql
index 4ab9267..39d70de 100644
--- a/binsrc/tests/suite/tpview.sql
+++ b/binsrc/tests/suite/tpview.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpview.sql,v 1.3.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tpview.sql,v 1.3 2006/09/25 14:25:10 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trdf.sql b/binsrc/tests/suite/trdf.sql
index 77d9497..0b45ed6 100644
--- a/binsrc/tests/suite/trdf.sql
+++ b/binsrc/tests/suite/trdf.sql
@@ -1,10 +1,10 @@
--
--- $Id: trdf.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: trdf.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trdfbox.sql b/binsrc/tests/suite/trdfbox.sql
index 04779ec..e654016 100644
--- a/binsrc/tests/suite/trdfbox.sql
+++ b/binsrc/tests/suite/trdfbox.sql
@@ -1,10 +1,10 @@
--
--- $Id: trdfbox.sql,v 1.2.2.4 2012/03/08 12:55:08 source Exp $
+-- $Id: trdfbox.sql,v 1.2.2.3 2010/01/31 20:18:26 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trdfhi.sql b/binsrc/tests/suite/trdfhi.sql
index 981a009..41f7684 100644
--- a/binsrc/tests/suite/trdfhi.sql
+++ b/binsrc/tests/suite/trdfhi.sql
@@ -1,10 +1,10 @@
--
--- $Id: trdfhi.sql,v 1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: trdfhi.sql,v 1.1 2008/03/19 14:27:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trdfinf.sql b/binsrc/tests/suite/trdfinf.sql
index cb5c0b5..335a191 100644
--- a/binsrc/tests/suite/trdfinf.sql
+++ b/binsrc/tests/suite/trdfinf.sql
@@ -283,9 +283,9 @@ create procedure s_list (in ctx varchare, in iri varchar, in axis int)
result (id_to_iri (a[inx]));
}
-sparql clear graph <g1>;
-sparql clear graph <g2>;
-sparql clear graph <g3>;
+sparql clear <g1>;
+sparql clear <g2>;
+sparql clear <g3>;
sparql insert data in <g1> { <s1> <p> 1; <q> 10 . };
sparql insert data in <g2> { <s2> <p> 2; <q> 20 . };
sparql insert data in <g3> { <s3> <p> 3; <q> 30 . };
diff --git a/binsrc/tests/suite/trecov.sh b/binsrc/tests/suite/trecov.sh
index f818846..c49d0e3 100755
--- a/binsrc/tests/suite/trecov.sh
+++ b/binsrc/tests/suite/trecov.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: trecov.sh,v 1.2.2.3 2012/03/08 12:55:08 source Exp $
+# $Id: trecov.sh,v 1.2.2.2 2009/07/09 13:04:50 source Exp $
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trecov_schema.sh b/binsrc/tests/suite/trecov_schema.sh
index fcbc1b4..b56273a 100755
--- a/binsrc/tests/suite/trecov_schema.sh
+++ b/binsrc/tests/suite/trecov_schema.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: trecov_schema.sh,v 1.1.1.1.2.4 2012/03/08 12:55:08 source Exp $
+# $Id: trecov_schema.sh,v 1.1.1.1.2.3 2009/09/17 14:47:09 source Exp $
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/treg1.sql b/binsrc/tests/suite/treg1.sql
index dc395cf..9c28400 100644
--- a/binsrc/tests/suite/treg1.sql
+++ b/binsrc/tests/suite/treg1.sql
@@ -1,14 +1,14 @@
--
-- treg.sql
--
--- $Id: treg1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: treg1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test DB Registry
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/treg2.sql b/binsrc/tests/suite/treg2.sql
index 89b4778..af72a3a 100644
--- a/binsrc/tests/suite/treg2.sql
+++ b/binsrc/tests/suite/treg2.sql
@@ -1,14 +1,14 @@
--
-- treg2.sql
--
--- $Id: treg2.sql,v 1.1.1.1.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: treg2.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test Database Registry
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tregexp.sql b/binsrc/tests/suite/tregexp.sql
index d7f5abb..9d2376d 100644
--- a/binsrc/tests/suite/tregexp.sql
+++ b/binsrc/tests/suite/tregexp.sql
@@ -1,10 +1,10 @@
--
--- $Id: tregexp.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tregexp.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tregexpN.sql b/binsrc/tests/suite/tregexpN.sql
index 7aae555..cd7bc00 100644
--- a/binsrc/tests/suite/tregexpN.sql
+++ b/binsrc/tests/suite/tregexpN.sql
@@ -1,10 +1,10 @@
--
--- $Id: tregexpN.sql,v 1.2.2.1 2012/03/08 12:55:08 source Exp $
+-- $Id: tregexpN.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trepl.sh b/binsrc/tests/suite/trepl.sh
index 2b74d25..9f0f9f9 100755
--- a/binsrc/tests/suite/trepl.sh
+++ b/binsrc/tests/suite/trepl.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: trepl.sh,v 1.4.2.3 2012/03/08 12:55:08 source Exp $
+# $Id: trepl.sh,v 1.4.2.2 2010/12/10 12:24:41 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/trepl.sql b/binsrc/tests/suite/trepl.sql
index 52cacb3..8a9bb59 100644
--- a/binsrc/tests/suite/trepl.sql
+++ b/binsrc/tests/suite/trepl.sql
@@ -1,10 +1,10 @@
--
--- $Id: trepl.sql,v 1.3.2.2 2012/03/08 12:55:08 source Exp $
+-- $Id: trepl.sql,v 1.3.2.1 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trepl_ddl.sql b/binsrc/tests/suite/trepl_ddl.sql
index b9d52aa..4d1455e 100644
--- a/binsrc/tests/suite/trepl_ddl.sql
+++ b/binsrc/tests/suite/trepl_ddl.sql
@@ -1,14 +1,14 @@
--
-- trepl_ddl.sql
--
--- $Id: trepl_ddl.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: trepl_ddl.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- DDL replication suite
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trepl_p1.sql b/binsrc/tests/suite/trepl_p1.sql
index f0fe88a..a5b9c5f 100644
--- a/binsrc/tests/suite/trepl_p1.sql
+++ b/binsrc/tests/suite/trepl_p1.sql
@@ -1,10 +1,10 @@
--
--- $Id: trepl_p1.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: trepl_p1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/trepl_t1.sql b/binsrc/tests/suite/trepl_t1.sql
index 35d2ea7..e77a1a5 100644
--- a/binsrc/tests/suite/trepl_t1.sql
+++ b/binsrc/tests/suite/trepl_t1.sql
@@ -1,10 +1,10 @@
--
--- $Id: trepl_t1.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: trepl_t1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/treplh.sh b/binsrc/tests/suite/treplh.sh
index 3cdf1ba..0e2c036 100755
--- a/binsrc/tests/suite/treplh.sh
+++ b/binsrc/tests/suite/treplh.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: treplh.sh,v 1.3.2.2 2012/03/08 12:55:09 source Exp $
+# $Id: treplh.sh,v 1.3.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tschema1.sql b/binsrc/tests/suite/tschema1.sql
index e832e8e..e3d356d 100644
--- a/binsrc/tests/suite/tschema1.sql
+++ b/binsrc/tests/suite/tschema1.sql
@@ -1,14 +1,14 @@
--
-- tschema1.sql
--
--- $Id: tschema1.sql,v 1.1.1.1.2.4 2012/03/08 12:55:09 source Exp $
+-- $Id: tschema1.sql,v 1.1.1.1.2.3 2010/01/31 20:18:26 source Exp $
--
-- Test DDL functionality #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tschema2.sql b/binsrc/tests/suite/tschema2.sql
index eba2781..b3c02b5 100644
--- a/binsrc/tests/suite/tschema2.sql
+++ b/binsrc/tests/suite/tschema2.sql
@@ -1,14 +1,14 @@
--
-- tschema2.sql
--
--- $Id: tschema2.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tschema2.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test DDL functionality #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tschema3.sql b/binsrc/tests/suite/tschema3.sql
index b3d2709..bcccd6e 100644
--- a/binsrc/tests/suite/tschema3.sql
+++ b/binsrc/tests/suite/tschema3.sql
@@ -1,14 +1,14 @@
--
-- tschema3.sql
--
--- $Id: tschema3.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tschema3.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test DDL functionality #3
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tschema4.sql b/binsrc/tests/suite/tschema4.sql
index 7a60477..7e34044 100644
--- a/binsrc/tests/suite/tschema4.sql
+++ b/binsrc/tests/suite/tschema4.sql
@@ -1,14 +1,14 @@
--
-- tschema4.sql
--
--- $Id: tschema4.sql,v 1.2.2.3 2012/03/08 12:55:09 source Exp $
+-- $Id: tschema4.sql,v 1.2.2.2 2009/04/20 21:19:39 source Exp $
--
-- Test DDL functionality #4
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsec.sh b/binsrc/tests/suite/tsec.sh
index 1861c4f..f321704 100755
--- a/binsrc/tests/suite/tsec.sh
+++ b/binsrc/tests/suite/tsec.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tsec.sh,v 1.1.1.1.2.4 2012/03/12 22:45:09 source Exp $
+# $Id: tsec.sh,v 1.1.1.1.2.2 2010/01/31 20:18:26 source Exp $
#
# Security tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -49,22 +49,7 @@ then
LOG "***ABORTED: tsecini.sql -- Initialization"
exit 1
fi
-RUN $ISQL $DSN 'U1RUS' 'Ðбракадабра2' '"EXEC=ECHO BOTH 'Logging in as U1RUS with UTF-8 password set as wide before';"' PROMPT=OFF ERRORS=STDOUT 2> /dev/null
-if test $STATUS -eq 0
-then
- LOG "PASSED: Lets U1RUS in with an UTF-8 password"
-else
- LOG "***FAILED: Does not let U1RUS in with an UTF-8 password"
- exit 1
-fi
-RUN $ISQL $DSN 'U1RUS' 'Ðбракадабра1' '"EXEC=ECHO BOTH 'Trying to get in as U1RUS with the wrong password';"' PROMPT=OFF ERRORS=STDOUT 2> /dev/null
-if test $STATUS -eq 0
-then
- LOG "***ABORTED: Lets the U1RUS in with a wrong password"
- exit 1
-else
- LOG "PASSED: Does not let U1RUS in with a wrong password"
-fi
+
RUN $ISQL $DSN U1 U1 tsecu1-1.sql PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT
if test $STATUS -ne 0
then
diff --git a/binsrc/tests/suite/tsec_proc.sql b/binsrc/tests/suite/tsec_proc.sql
index d4b5859..1f3d532 100644
--- a/binsrc/tests/suite/tsec_proc.sql
+++ b/binsrc/tests/suite/tsec_proc.sql
@@ -1,14 +1,14 @@
--
-- tsec_proc.sql
--
--- $Id: tsec_proc.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsec_proc.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Procedures security tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsec_role.sql b/binsrc/tests/suite/tsec_role.sql
index ba03499..c41902e 100644
--- a/binsrc/tests/suite/tsec_role.sql
+++ b/binsrc/tests/suite/tsec_role.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsec_role.sql,v 1.3.2.3 2012/03/08 12:55:09 source Exp $
+-- $Id: tsec_role.sql,v 1.3.2.2 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsec_role1.sql b/binsrc/tests/suite/tsec_role1.sql
index f63a898..48f5026 100644
--- a/binsrc/tests/suite/tsec_role1.sql
+++ b/binsrc/tests/suite/tsec_role1.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsec_role1.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsec_role1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsec_role2.sql b/binsrc/tests/suite/tsec_role2.sql
index 5a5b6ae..c9ed661 100644
--- a/binsrc/tests/suite/tsec_role2.sql
+++ b/binsrc/tests/suite/tsec_role2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsec_role2.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsec_role2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsecend.sql b/binsrc/tests/suite/tsecend.sql
index f6c79a3..a928e6d 100644
--- a/binsrc/tests/suite/tsecend.sql
+++ b/binsrc/tests/suite/tsecend.sql
@@ -1,14 +1,14 @@
--
-- tsecend.sql
--
--- $Id: tsecend.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsecend.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test Security
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsecini-1.sql b/binsrc/tests/suite/tsecini-1.sql
index 10962d5..d25f258 100644
--- a/binsrc/tests/suite/tsecini-1.sql
+++ b/binsrc/tests/suite/tsecini-1.sql
@@ -1,14 +1,14 @@
--
-- tsecini-1.sql
--
--- $Id: tsecini-1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsecini-1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Security checks
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsecini.sql b/binsrc/tests/suite/tsecini.sql
index 3c167de..b9908e1 100644
--- a/binsrc/tests/suite/tsecini.sql
+++ b/binsrc/tests/suite/tsecini.sql
@@ -1,14 +1,14 @@
--
-- tsecini.sql
--
--- $Id: tsecini.sql,v 1.1.1.1.2.2 2012/03/12 22:45:09 source Exp $
+-- $Id: tsecini.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test security - initialization
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -83,7 +83,6 @@ insert into SEC_TEST_3 values (121, 242, 363);
insert into SEC_TEST_4 values (1331, 2662, 3993);
delete user U1;
-delete user U1RUS;
delete user U2;
delete user U3;
delete user U4;
@@ -108,24 +107,6 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
ECHO BOTH ": U_ID (" $LAST[1] ") " $IF $LIF "==" "!=" " U_GROUP (" $LAST[2] ")\n";
--
--- Now a user named 'U1RUS' is created for tests of "national" passwords:
---
-
-create user U1RUS;
-select U_ID, U_GROUP from SYS_USERS where U_NAME = 'U1RUS';
-ECHO BOTH $IF $EQU $ROWCNT 1 "PASSED" "***FAILED";
-SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-ECHO BOTH ": " $ROWCNT " user(s) named 'U1RUS' after CREATE USER U1RUS;\n";
-user_set_password ('U1RUS', charset_recode ('Ðбракадабра1', 'UTF-8', '_WIDE_'));
-ECHO BOTH $IF $EQU $STATE "OK" "PASSED" "***FAILED";
-SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-ECHO BOTH ": User U1RUS got wide password via user_set_password; STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-DB.DBA.USER_CHANGE_PASSWORD ('U1RUS', charset_recode ('Ðбракадабра1', 'UTF-8', '_WIDE_'), charset_recode ('Ðбракадабра2', 'UTF-8', '_WIDE_'));
-ECHO BOTH $IF $EQU $STATE "OK" "PASSED" "***FAILED";
-SET ARGV[$LIF] $+ $ARGV[$LIF] 1;
-ECHO BOTH ": User U1RUS got changed wide password via DB.DBA.USER_CHANGE_PASSWORD; STATE=" $STATE " MESSAGE=" $MESSAGE "\n";
-
---
-- First check that there is only one user named 'U2' after this command:
--
diff --git a/binsrc/tests/suite/tsecu1-1.sql b/binsrc/tests/suite/tsecu1-1.sql
index 73ef9e5..9e741de 100644
--- a/binsrc/tests/suite/tsecu1-1.sql
+++ b/binsrc/tests/suite/tsecu1-1.sql
@@ -1,14 +1,14 @@
--
-- tsecu1-1.sql
--
--- $Id: tsecu1-1.sql,v 1.2.2.3 2012/03/08 12:55:09 source Exp $
+-- $Id: tsecu1-1.sql,v 1.2.2.2 2009/04/20 21:19:39 source Exp $
--
-- Security test #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsecu1-2.sql b/binsrc/tests/suite/tsecu1-2.sql
index ab4c1ba..c4d343a 100644
--- a/binsrc/tests/suite/tsecu1-2.sql
+++ b/binsrc/tests/suite/tsecu1-2.sql
@@ -1,14 +1,14 @@
--
-- tsecu1-2.sql
--
--- $Id: tsecu1-2.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsecu1-2.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Security test #2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsecu3-1.sql b/binsrc/tests/suite/tsecu3-1.sql
index 440dbee..1e71c2a 100644
--- a/binsrc/tests/suite/tsecu3-1.sql
+++ b/binsrc/tests/suite/tsecu3-1.sql
@@ -1,14 +1,14 @@
--
-- tsecu3-1.sql
--
--- $Id: tsecu3-1.sql,v 1.2.2.3 2012/03/08 12:55:09 source Exp $
+-- $Id: tsecu3-1.sql,v 1.2.2.2 2009/04/20 21:19:39 source Exp $
--
-- Security test #3
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsecu3-2.sql b/binsrc/tests/suite/tsecu3-2.sql
index 4791e30..55ee8b9 100644
--- a/binsrc/tests/suite/tsecu3-2.sql
+++ b/binsrc/tests/suite/tsecu3-2.sql
@@ -1,14 +1,14 @@
--
-- tsecu3-2.sql
--
--- $Id: tsecu3-2.sql,v 1.2.2.3 2012/03/08 12:55:09 source Exp $
+-- $Id: tsecu3-2.sql,v 1.2.2.2 2009/04/20 21:19:39 source Exp $
--
-- Security test #3 part 2
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsecu5-1.sql b/binsrc/tests/suite/tsecu5-1.sql
index c25bc00..3aa3fcd 100644
--- a/binsrc/tests/suite/tsecu5-1.sql
+++ b/binsrc/tests/suite/tsecu5-1.sql
@@ -1,14 +1,14 @@
--
-- tsecu5-1.sql
--
--- $Id: tsecu5-1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsecu5-1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Security test #5
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsnaprepl.sql b/binsrc/tests/suite/tsnaprepl.sql
index 593565f..fe5c252 100644
--- a/binsrc/tests/suite/tsnaprepl.sql
+++ b/binsrc/tests/suite/tsnaprepl.sql
@@ -1,14 +1,14 @@
--
-- tsnaprepl.sql
--
--- $Id: tsnaprepl.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsnaprepl.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Snapshot replication local tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsoap.sql b/binsrc/tests/suite/tsoap.sql
index 9cfebc5..e96a140 100644
--- a/binsrc/tests/suite/tsoap.sql
+++ b/binsrc/tests/suite/tsoap.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoap.sql,v 1.2.2.2 2012/03/08 12:55:09 source Exp $
+-- $Id: tsoap.sql,v 1.2.2.1 2010/12/10 12:24:41 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsoap12.sh b/binsrc/tests/suite/tsoap12.sh
index ed8bc33..dde8538 100755
--- a/binsrc/tests/suite/tsoap12.sh
+++ b/binsrc/tests/suite/tsoap12.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tsoap12.sh,v 1.5.2.2 2012/03/08 12:55:09 source Exp $
+# $Id: tsoap12.sh,v 1.5.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tsoap_new.sql b/binsrc/tests/suite/tsoap_new.sql
index 6c1cb17..27c307a 100644
--- a/binsrc/tests/suite/tsoap_new.sql
+++ b/binsrc/tests/suite/tsoap_new.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoap_new.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsoap_new.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsoap_r3.sql b/binsrc/tests/suite/tsoap_r3.sql
index 01f528a..8a7281f 100644
--- a/binsrc/tests/suite/tsoap_r3.sql
+++ b/binsrc/tests/suite/tsoap_r3.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoap_r3.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsoap_r3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsoap_r4.sql b/binsrc/tests/suite/tsoap_r4.sql
index 609e8cf..3603242 100644
--- a/binsrc/tests/suite/tsoap_r4.sql
+++ b/binsrc/tests/suite/tsoap_r4.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoap_r4.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsoap_r4.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsoap_rpc.sql b/binsrc/tests/suite/tsoap_rpc.sql
index 5e9a03a..ee739b4 100644
--- a/binsrc/tests/suite/tsoap_rpc.sql
+++ b/binsrc/tests/suite/tsoap_rpc.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoap_rpc.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsoap_rpc.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsoapcpl.sql b/binsrc/tests/suite/tsoapcpl.sql
index dbae20d..dc435d8 100644
--- a/binsrc/tests/suite/tsoapcpl.sql
+++ b/binsrc/tests/suite/tsoapcpl.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoapcpl.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsoapcpl.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsoapudt.sql b/binsrc/tests/suite/tsoapudt.sql
index 4add2c9..b3b1cca 100644
--- a/binsrc/tests/suite/tsoapudt.sql
+++ b/binsrc/tests/suite/tsoapudt.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsoapudt.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsoapudt.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsparql.sh b/binsrc/tests/suite/tsparql.sh
index 443b7fa..e3636ca 100755
--- a/binsrc/tests/suite/tsparql.sh
+++ b/binsrc/tests/suite/tsparql.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tsparql.sh,v 1.5.2.2 2012/03/08 12:55:09 source Exp $
+# $Id: tsparql.sh,v 1.5.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tsparql_demo.sh b/binsrc/tests/suite/tsparql_demo.sh
index 9684e8e..4e6d9c3 100755
--- a/binsrc/tests/suite/tsparql_demo.sh
+++ b/binsrc/tests/suite/tsparql_demo.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tsparql_demo.sh,v 1.5.2.2 2012/03/08 12:55:09 source Exp $
+# $Id: tsparql_demo.sh,v 1.5.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tspotlight.sql b/binsrc/tests/suite/tspotlight.sql
index 1f60ace..5c1825b 100644
--- a/binsrc/tests/suite/tspotlight.sql
+++ b/binsrc/tests/suite/tspotlight.sql
@@ -1,10 +1,10 @@
--
--- $Id: tspotlight.sql,v 1.2.2.2 2012/03/08 12:55:09 source Exp $
+-- $Id: tspotlight.sql,v 1.2.2.1 2009/04/16 12:37:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsql.sh b/binsrc/tests/suite/tsql.sh
index 1497680..2864e62 100755
--- a/binsrc/tests/suite/tsql.sh
+++ b/binsrc/tests/suite/tsql.sh
@@ -1,14 +1,14 @@
#!/bin/sh
# tsql.sh
#
-# $Id: tsql.sh,v 1.7.2.5 2012/03/08 12:55:09 source Exp $
+# $Id: tsql.sh,v 1.7.2.4 2009/08/09 00:16:20 source Exp $
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsql2.sh b/binsrc/tests/suite/tsql2.sh
index 668e549..d31c18c 100755
--- a/binsrc/tests/suite/tsql2.sh
+++ b/binsrc/tests/suite/tsql2.sh
@@ -1,14 +1,14 @@
#!/bin/sh
# tsql2.sh
#
-# $Id: tsql2.sh,v 1.5.2.4 2012/03/08 12:55:09 source Exp $
+# $Id: tsql2.sh,v 1.5.2.3 2009/07/09 13:04:50 source Exp $
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsql3.sh b/binsrc/tests/suite/tsql3.sh
index 13ac8b8..bfdce0f 100755
--- a/binsrc/tests/suite/tsql3.sh
+++ b/binsrc/tests/suite/tsql3.sh
@@ -1,14 +1,14 @@
#!/bin/sh
# tsql3.sh
#
-# $Id: tsql3.sh,v 1.4.2.6 2012/03/08 12:55:09 source Exp $
+# $Id: tsql3.sh,v 1.4.2.5 2009/11/19 19:24:11 source Exp $
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsqllite.sh b/binsrc/tests/suite/tsqllite.sh
index d1a1d0b..b021e7a 100755
--- a/binsrc/tests/suite/tsqllite.sh
+++ b/binsrc/tests/suite/tsqllite.sh
@@ -1,14 +1,14 @@
#!/bin/sh
# tsql.sh
#
-# $Id: tsqllite.sh,v 1.1.2.2 2012/03/08 12:55:09 source Exp $
+# $Id: tsqllite.sh,v 1.1.2.1 2009/04/16 12:37:43 source Exp $
#
# SQL conformance tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsqlo.sh b/binsrc/tests/suite/tsqlo.sh
index 2cb8793..adc1b66 100755
--- a/binsrc/tests/suite/tsqlo.sh
+++ b/binsrc/tests/suite/tsqlo.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tsqlo.sh,v 1.4.2.2 2012/03/08 12:55:09 source Exp $
+# $Id: tsqlo.sh,v 1.4.2.1 2009/04/16 12:37:43 source Exp $
#
# SQL Optimizer tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsqlo2.sql b/binsrc/tests/suite/tsqlo2.sql
index 3b7c10a..98b61b5 100644
--- a/binsrc/tests/suite/tsqlo2.sql
+++ b/binsrc/tests/suite/tsqlo2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsqlo2.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsqlo2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tstriping.sh b/binsrc/tests/suite/tstriping.sh
index 723f28e..ae24d82 100755
--- a/binsrc/tests/suite/tstriping.sh
+++ b/binsrc/tests/suite/tstriping.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tstriping.sh,v 1.5.2.3 2012/03/08 12:55:09 source Exp $
+# $Id: tstriping.sh,v 1.5.2.2 2010/01/31 20:18:26 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tstrses.sql b/binsrc/tests/suite/tstrses.sql
index 150d652..25dc3fc 100644
--- a/binsrc/tests/suite/tstrses.sql
+++ b/binsrc/tests/suite/tstrses.sql
@@ -1,10 +1,10 @@
--
--- $Id: tstrses.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tstrses.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsxml.sh b/binsrc/tests/suite/tsxml.sh
index 655a650..d23b7ef 100755
--- a/binsrc/tests/suite/tsxml.sh
+++ b/binsrc/tests/suite/tsxml.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tsxml.sh,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+# $Id: tsxml.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsxml.sql b/binsrc/tests/suite/tsxml.sql
index 6defc9b..516314b 100644
--- a/binsrc/tests/suite/tsxml.sql
+++ b/binsrc/tests/suite/tsxml.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsxml.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tsxml.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tsyncml.sql b/binsrc/tests/suite/tsyncml.sql
index 40301c2..0e9337f 100644
--- a/binsrc/tests/suite/tsyncml.sql
+++ b/binsrc/tests/suite/tsyncml.sql
@@ -1,10 +1,10 @@
--
--- $Id: tsyncml.sql,v 1.4.2.2 2012/03/08 12:55:09 source Exp $
+-- $Id: tsyncml.sql,v 1.4.2.1 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ttext.sql b/binsrc/tests/suite/ttext.sql
index ee51795..72ff668 100644
--- a/binsrc/tests/suite/ttext.sql
+++ b/binsrc/tests/suite/ttext.sql
@@ -1,10 +1,10 @@
--
--- $Id: ttext.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: ttext.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ttext_qual_hf.sql b/binsrc/tests/suite/ttext_qual_hf.sql
index f1c4636..1932a23 100644
--- a/binsrc/tests/suite/ttext_qual_hf.sql
+++ b/binsrc/tests/suite/ttext_qual_hf.sql
@@ -1,10 +1,10 @@
--
--- $Id: ttext_qual_hf.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: ttext_qual_hf.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ttrig1.sql b/binsrc/tests/suite/ttrig1.sql
index accd589..45ec56b 100644
--- a/binsrc/tests/suite/ttrig1.sql
+++ b/binsrc/tests/suite/ttrig1.sql
@@ -1,14 +1,14 @@
--
-- ttrig1.sql
--
--- $Id: ttrig1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: ttrig1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test local or remote table triggers.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ttrig2.sql b/binsrc/tests/suite/ttrig2.sql
index b31e3b5..1d838c0 100644
--- a/binsrc/tests/suite/ttrig2.sql
+++ b/binsrc/tests/suite/ttrig2.sql
@@ -1,14 +1,14 @@
--
-- ttrig2.sql
--
--- $Id: ttrig2.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: ttrig2.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test INSTEAD OF & view triggers.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ttrigr.sql b/binsrc/tests/suite/ttrigr.sql
index fd10ebc..a3ba0fb 100644
--- a/binsrc/tests/suite/ttrigr.sql
+++ b/binsrc/tests/suite/ttrigr.sql
@@ -1,14 +1,14 @@
--
-- ttrigr.sql
--
--- $Id: ttrigr.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: ttrigr.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Trigger testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ttrigt.sql b/binsrc/tests/suite/ttrigt.sql
index 1c4f881..2d9c563 100644
--- a/binsrc/tests/suite/ttrigt.sql
+++ b/binsrc/tests/suite/ttrigt.sql
@@ -1,14 +1,14 @@
--
-- ttrigt.sql
--
--- $Id: ttrigt.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: ttrigt.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Trigger testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ttrigtrig.sql b/binsrc/tests/suite/ttrigtrig.sql
index d199d92..e5e92fb 100644
--- a/binsrc/tests/suite/ttrigtrig.sql
+++ b/binsrc/tests/suite/ttrigtrig.sql
@@ -1,14 +1,14 @@
--
-- ttrigtrig.sql
--
--- $Id: ttrigtrig.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: ttrigtrig.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Trigger testing
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/ttutorial.sh b/binsrc/tests/suite/ttutorial.sh
index 70feee1..46c689c 100755
--- a/binsrc/tests/suite/ttutorial.sh
+++ b/binsrc/tests/suite/ttutorial.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: ttutorial.sh,v 1.4.2.3 2012/03/08 12:55:09 source Exp $
+# $Id: ttutorial.sh,v 1.4.2.2 2009/07/09 13:04:50 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tunder1.sql b/binsrc/tests/suite/tunder1.sql
index 01850f2..74e2013 100644
--- a/binsrc/tests/suite/tunder1.sql
+++ b/binsrc/tests/suite/tunder1.sql
@@ -1,14 +1,14 @@
--
-- tschema1.sql
--
--- $Id: tunder1.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tunder1.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Test DDL functionality #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tunder2.sql b/binsrc/tests/suite/tunder2.sql
index cbbcf8f..0951f40 100644
--- a/binsrc/tests/suite/tunder2.sql
+++ b/binsrc/tests/suite/tunder2.sql
@@ -1,14 +1,14 @@
--
-- tschema1.sql
--
--- $Id: tunder2.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tunder2.sql,v 1.2 2006/10/09 12:32:39 source Exp $
--
-- Test DDL functionality #1
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tunq.sql b/binsrc/tests/suite/tunq.sql
index 63492e2..ff516c3 100644
--- a/binsrc/tests/suite/tunq.sql
+++ b/binsrc/tests/suite/tunq.sql
@@ -1,10 +1,10 @@
--
--- $Id: tunq.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tunq.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tupdate.sql b/binsrc/tests/suite/tupdate.sql
index ffc4e45..dc53a32 100644
--- a/binsrc/tests/suite/tupdate.sql
+++ b/binsrc/tests/suite/tupdate.sql
@@ -1,14 +1,14 @@
--
-- tupdate.sql
--
--- $Id: tupdate.sql,v 1.2.2.4 2012/03/08 12:55:09 source Exp $
+-- $Id: tupdate.sql,v 1.2.2.3 2009/07/16 06:17:17 source Exp $
--
-- Update tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tupdg.sql b/binsrc/tests/suite/tupdg.sql
index 2fe46cc..e153f14 100644
--- a/binsrc/tests/suite/tupdg.sql
+++ b/binsrc/tests/suite/tupdg.sql
@@ -1,10 +1,10 @@
--
--- $Id: tupdg.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tupdg.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tupgrade_recov.sh b/binsrc/tests/suite/tupgrade_recov.sh
index ea6a8d3..b1e4a25 100755
--- a/binsrc/tests/suite/tupgrade_recov.sh
+++ b/binsrc/tests/suite/tupgrade_recov.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tupgrade_recov.sh,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+# $Id: tupgrade_recov.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# Database recovery tests afer database upgrade
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tvad.sh b/binsrc/tests/suite/tvad.sh
index 80b80b3..e73ee61 100755
--- a/binsrc/tests/suite/tvad.sh
+++ b/binsrc/tests/suite/tvad.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tvad.sh,v 1.5.2.4 2012/03/08 12:55:09 source Exp $
+# $Id: tvad.sh,v 1.5.2.3 2011/03/25 15:10:16 source Exp $
#
# VAD tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -96,7 +96,7 @@ GenVAD1 ()
<name package="rdf_lib">
<prop name="Title" value="RDF Support Library" />
<prop name="Developer" value="OpenLink Software" />
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software" />
<prop name="Download" value="http://www.openlinksw.com/virtuoso/rdf_lib/download" />
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/rdf_lib/download" />
</name>
@@ -135,7 +135,7 @@ GenVAD2 ()
<name package="test1">
<prop name="Title" value="test" />
<prop name="Developer" value="OpenLink Software" />
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software" />
<prop name="Download" value="http://www.openlinksw.com/virtuoso/rdf_lib/download" />
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/rdf_lib/download" />
</name>
@@ -172,7 +172,7 @@ GenVAD3 ()
<name package="test1">
<prop name="Title" value="test" />
<prop name="Developer" value="OpenLink Software" />
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software" />
<prop name="Download" value="http://www.openlinksw.com/virtuoso/rdf_lib/download" />
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/rdf_lib/download" />
</name>
@@ -208,7 +208,7 @@ GenVAD4 ()
<name package="test2">
<prop name="Title" value="test" />
<prop name="Developer" value="OpenLink Software" />
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software" />
<prop name="Download" value="http://www.openlinksw.com/virtuoso/rdf_lib/download" />
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/rdf_lib/download" />
</name>
diff --git a/binsrc/tests/suite/tvad2.sh b/binsrc/tests/suite/tvad2.sh
index 99e343f..70aea44 100755
--- a/binsrc/tests/suite/tvad2.sh
+++ b/binsrc/tests/suite/tvad2.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tvad2.sh,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+# $Id: tvad2.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# VAD tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tview.sql b/binsrc/tests/suite/tview.sql
index 547092c..45af294 100644
--- a/binsrc/tests/suite/tview.sql
+++ b/binsrc/tests/suite/tview.sql
@@ -1,14 +1,14 @@
--
-- tview.sql
--
--- $Id: tview.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tview.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- UNION and VIEW tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tviewqual.sql b/binsrc/tests/suite/tviewqual.sql
index c31763f..62015ef 100644
--- a/binsrc/tests/suite/tviewqual.sql
+++ b/binsrc/tests/suite/tviewqual.sql
@@ -1,14 +1,14 @@
--
-- tviewqual.sql
--
--- $Id: tviewqual.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tviewqual.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- expansion of the view qualifiers
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tvsp.sh b/binsrc/tests/suite/tvsp.sh
index d204a7a..7c1ffa7 100755
--- a/binsrc/tests/suite/tvsp.sh
+++ b/binsrc/tests/suite/tvsp.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tvsp.sh,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+# $Id: tvsp.sh,v 1.2 2008/12/17 16:55:28 source Exp $
#
# Database recovery tests
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tvsp.sql b/binsrc/tests/suite/tvsp.sql
index f1d3551..7fccd6a 100644
--- a/binsrc/tests/suite/tvsp.sql
+++ b/binsrc/tests/suite/tvsp.sql
@@ -1,14 +1,14 @@
--
-- tvsp.sql
--
--- $Id: tvsp.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: tvsp.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- Check vsp functions
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tvspx.sh b/binsrc/tests/suite/tvspx.sh
index ce33589..cca58e3 100755
--- a/binsrc/tests/suite/tvspx.sh
+++ b/binsrc/tests/suite/tvspx.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tvspx.sh,v 1.4.2.4 2012/03/08 12:55:09 source Exp $
+# $Id: tvspx.sh,v 1.4.2.3 2010/01/28 14:33:20 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/tvspxex.awk b/binsrc/tests/suite/tvspxex.awk
index b7a5785..54e3eb6 100644
--- a/binsrc/tests/suite/tvspxex.awk
+++ b/binsrc/tests/suite/tvspxex.awk
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/tvspxex.sh b/binsrc/tests/suite/tvspxex.sh
index d4033a5..09d8ba9 100755
--- a/binsrc/tests/suite/tvspxex.sh
+++ b/binsrc/tests/suite/tvspxex.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: tvspxex.sh,v 1.4.2.2 2012/03/08 12:55:09 source Exp $
+# $Id: tvspxex.sh,v 1.4.2.1 2009/07/09 13:04:50 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/twcopy.sh b/binsrc/tests/suite/twcopy.sh
index 16fd1d5..9061201 100755
--- a/binsrc/tests/suite/twcopy.sh
+++ b/binsrc/tests/suite/twcopy.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: twcopy.sh,v 1.5.2.5 2012/03/08 12:55:09 source Exp $
+# $Id: twcopy.sh,v 1.5.2.4 2011/03/25 15:10:16 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/twcopy.sql b/binsrc/tests/suite/twcopy.sql
index 9f7b35d..aed7a4c 100644
--- a/binsrc/tests/suite/twcopy.sql
+++ b/binsrc/tests/suite/twcopy.sql
@@ -1,10 +1,10 @@
--
--- $Id: twcopy.sql,v 1.2.2.2 2012/03/08 12:55:09 source Exp $
+-- $Id: twcopy.sql,v 1.2.2.1 2010/01/31 20:18:26 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/twiki.sh b/binsrc/tests/suite/twiki.sh
index 61ea7b4..a441418 100755
--- a/binsrc/tests/suite/twiki.sh
+++ b/binsrc/tests/suite/twiki.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: twiki.sh,v 1.2.2.3 2012/03/08 12:55:09 source Exp $
+# $Id: twiki.sh,v 1.2.2.2 2009/07/09 13:04:50 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/twords.sql b/binsrc/tests/suite/twords.sql
index 84ea671..60dcb69 100644
--- a/binsrc/tests/suite/twords.sql
+++ b/binsrc/tests/suite/twords.sql
@@ -1,14 +1,14 @@
--
-- twords.sql
--
--- $Id: twords.sql,v 1.2.2.3 2012/03/08 12:55:09 source Exp $
+-- $Id: twords.sql,v 1.2.2.2 2009/07/09 13:04:50 source Exp $
--
-- Word tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/twsrm.sql b/binsrc/tests/suite/twsrm.sql
index cfe2821..ba59530 100644
--- a/binsrc/tests/suite/twsrm.sql
+++ b/binsrc/tests/suite/twsrm.sql
@@ -1,10 +1,10 @@
--
--- $Id: twsrm.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: twsrm.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/twsrp.sql b/binsrc/tests/suite/twsrp.sql
index 057aa17..d91c4dd 100644
--- a/binsrc/tests/suite/twsrp.sql
+++ b/binsrc/tests/suite/twsrp.sql
@@ -1,10 +1,10 @@
--
--- $Id: twsrp.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: twsrp.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/twss.sql b/binsrc/tests/suite/twss.sql
index 582b1f1..4d949a8 100644
--- a/binsrc/tests/suite/twss.sql
+++ b/binsrc/tests/suite/twss.sql
@@ -1,10 +1,10 @@
--
--- $Id: twss.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: twss.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/twstr.sql b/binsrc/tests/suite/twstr.sql
index aed4dbd..91e9227 100644
--- a/binsrc/tests/suite/twstr.sql
+++ b/binsrc/tests/suite/twstr.sql
@@ -1,10 +1,10 @@
--
--- $Id: twstr.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: twstr.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/txml.sql b/binsrc/tests/suite/txml.sql
index 0cb233d..a3fdafa 100644
--- a/binsrc/tests/suite/txml.sql
+++ b/binsrc/tests/suite/txml.sql
@@ -1,14 +1,14 @@
--
-- txml.sql
--
--- $Id: txml.sql,v 1.1.1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: txml.sql,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
--
-- XML tests
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/txmla.sql b/binsrc/tests/suite/txmla.sql
index 7c362c6..ace47cf 100644
--- a/binsrc/tests/suite/txmla.sql
+++ b/binsrc/tests/suite/txmla.sql
@@ -1,10 +1,10 @@
--
--- $Id: txmla.sql,v 1.4.2.2 2012/03/08 12:55:09 source Exp $
+-- $Id: txmla.sql,v 1.4.2.1 2009/04/20 21:19:39 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/txmla3.sql b/binsrc/tests/suite/txmla3.sql
index 551ef34..5e4c6bc 100644
--- a/binsrc/tests/suite/txmla3.sql
+++ b/binsrc/tests/suite/txmla3.sql
@@ -1,10 +1,10 @@
--
--- $Id: txmla3.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: txmla3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/txmlload.sql b/binsrc/tests/suite/txmlload.sql
index 9062d19..f31ad3f 100644
--- a/binsrc/tests/suite/txmlload.sql
+++ b/binsrc/tests/suite/txmlload.sql
@@ -1,10 +1,10 @@
--
--- $Id: txmlload.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: txmlload.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/txsl.sql b/binsrc/tests/suite/txsl.sql
index 36d76ee..81906a5 100644
--- a/binsrc/tests/suite/txsl.sql
+++ b/binsrc/tests/suite/txsl.sql
@@ -1,10 +1,10 @@
--
--- $Id: txsl.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: txsl.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/txslt.sh b/binsrc/tests/suite/txslt.sh
index bf89ce0..e28d93c 100755
--- a/binsrc/tests/suite/txslt.sh
+++ b/binsrc/tests/suite/txslt.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: txslt.sh,v 1.4.2.2 2012/03/08 12:55:09 source Exp $
+# $Id: txslt.sh,v 1.4.2.1 2009/04/20 21:17:47 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/suite/txslt.sql b/binsrc/tests/suite/txslt.sql
index 60ad819..1917721 100644
--- a/binsrc/tests/suite/txslt.sql
+++ b/binsrc/tests/suite/txslt.sql
@@ -1,10 +1,10 @@
--
--- $Id: txslt.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: txslt.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/txslt1.sql b/binsrc/tests/suite/txslt1.sql
index ca764e4..bf2b072 100644
--- a/binsrc/tests/suite/txslt1.sql
+++ b/binsrc/tests/suite/txslt1.sql
@@ -1,10 +1,10 @@
--
--- $Id: txslt1.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: txslt1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/txslt_funcext.sql b/binsrc/tests/suite/txslt_funcext.sql
index e7b1185..72a88fd 100644
--- a/binsrc/tests/suite/txslt_funcext.sql
+++ b/binsrc/tests/suite/txslt_funcext.sql
@@ -1,10 +1,10 @@
--
--- $Id: txslt_funcext.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: txslt_funcext.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/uaggr_test.sql b/binsrc/tests/suite/uaggr_test.sql
index f3d5a4d..14cf283 100644
--- a/binsrc/tests/suite/uaggr_test.sql
+++ b/binsrc/tests/suite/uaggr_test.sql
@@ -1,10 +1,10 @@
--
--- $Id: uaggr_test.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: uaggr_test.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/udtsec.sql b/binsrc/tests/suite/udtsec.sql
index 0041831..ac3d90b 100644
--- a/binsrc/tests/suite/udtsec.sql
+++ b/binsrc/tests/suite/udtsec.sql
@@ -1,10 +1,10 @@
--
--- $Id: udtsec.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: udtsec.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/udttest.sql b/binsrc/tests/suite/udttest.sql
index b687e40..64f292e 100644
--- a/binsrc/tests/suite/udttest.sql
+++ b/binsrc/tests/suite/udttest.sql
@@ -1,10 +1,10 @@
--
--- $Id: udttest.sql,v 1.2.2.2 2012/03/08 12:55:09 source Exp $
+-- $Id: udttest.sql,v 1.2.2.1 2009/07/14 22:24:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/udttest1.sql b/binsrc/tests/suite/udttest1.sql
index ea0588f..d485d15 100644
--- a/binsrc/tests/suite/udttest1.sql
+++ b/binsrc/tests/suite/udttest1.sql
@@ -1,10 +1,10 @@
--
--- $Id: udttest1.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: udttest1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/uri_test.sql b/binsrc/tests/suite/uri_test.sql
index 2045d86..f442682 100644
--- a/binsrc/tests/suite/uri_test.sql
+++ b/binsrc/tests/suite/uri_test.sql
@@ -1,10 +1,10 @@
--
--- $Id: uri_test.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: uri_test.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/uri_wide_test.sql b/binsrc/tests/suite/uri_wide_test.sql
index 698f0eb..47aec30 100644
--- a/binsrc/tests/suite/uri_wide_test.sql
+++ b/binsrc/tests/suite/uri_wide_test.sql
@@ -1,10 +1,10 @@
--
--- $Id: uri_wide_test.sql,v 1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: uri_wide_test.sql,v 1.1 2007/11/18 15:10:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/url_rewrite_test.sql b/binsrc/tests/suite/url_rewrite_test.sql
index 5cd74c4..aa9d699 100644
--- a/binsrc/tests/suite/url_rewrite_test.sql
+++ b/binsrc/tests/suite/url_rewrite_test.sql
@@ -1,10 +1,10 @@
--
--- $Id: url_rewrite_test.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: url_rewrite_test.sql,v 1.2 2007/05/15 12:40:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test1/1.vsp b/binsrc/tests/suite/vad_test/vsp/vad_test1/1.vsp
index 1f0a5ed..747e935 100644
--- a/binsrc/tests/suite/vad_test/vsp/vad_test1/1.vsp
+++ b/binsrc/tests/suite/vad_test/vsp/vad_test1/1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: 1.vsp,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: 1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test1/2.vsp b/binsrc/tests/suite/vad_test/vsp/vad_test1/2.vsp
index 8ec1cea..e44406d 100644
--- a/binsrc/tests/suite/vad_test/vsp/vad_test1/2.vsp
+++ b/binsrc/tests/suite/vad_test/vsp/vad_test1/2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: 2.vsp,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: 2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test1/test.sql b/binsrc/tests/suite/vad_test/vsp/vad_test1/test.sql
index 53dd0b7..4646846 100644
--- a/binsrc/tests/suite/vad_test/vsp/vad_test1/test.sql
+++ b/binsrc/tests/suite/vad_test/vsp/vad_test1/test.sql
@@ -1,10 +1,10 @@
--
--- $Id: test.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: test.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test2/1.vsp b/binsrc/tests/suite/vad_test/vsp/vad_test2/1.vsp
index 1f0a5ed..747e935 100644
--- a/binsrc/tests/suite/vad_test/vsp/vad_test2/1.vsp
+++ b/binsrc/tests/suite/vad_test/vsp/vad_test2/1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: 1.vsp,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: 1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test2/2.vsp b/binsrc/tests/suite/vad_test/vsp/vad_test2/2.vsp
index 8ec1cea..e44406d 100644
--- a/binsrc/tests/suite/vad_test/vsp/vad_test2/2.vsp
+++ b/binsrc/tests/suite/vad_test/vsp/vad_test2/2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: 2.vsp,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: 2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test2/test.sql b/binsrc/tests/suite/vad_test/vsp/vad_test2/test.sql
index 9cba51b..7ab6593 100644
--- a/binsrc/tests/suite/vad_test/vsp/vad_test2/test.sql
+++ b/binsrc/tests/suite/vad_test/vsp/vad_test2/test.sql
@@ -1,10 +1,10 @@
--
--- $Id: test.sql,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+-- $Id: test.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/vad_test1.xml b/binsrc/tests/suite/vad_test1.xml
index dd02165..b241161 100644
--- a/binsrc/tests/suite/vad_test1.xml
+++ b/binsrc/tests/suite/vad_test1.xml
@@ -5,7 +5,7 @@
<name package="test1">
<prop name="Title" value="Test1 Package"/>
<prop name="Developer" value="OpenLink Software"/>
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software"/>
<prop name="Download" value="http://www.openlinksw.com/virtuoso"/>
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso"/>
</name>
diff --git a/binsrc/tests/suite/vad_test2.xml b/binsrc/tests/suite/vad_test2.xml
index 74c99a8..ba85f93 100644
--- a/binsrc/tests/suite/vad_test2.xml
+++ b/binsrc/tests/suite/vad_test2.xml
@@ -5,7 +5,7 @@
<name package="test2">
<prop name="Title" value="Test2"/>
<prop name="Developer" value="OpenLink Software"/>
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software"/>
<prop name="Download" value="http://www.openlinksw.com/virtuoso"/>
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso"/>
</name>
diff --git a/binsrc/tests/suite/vspsoap.vsp b/binsrc/tests/suite/vspsoap.vsp
index 4927372..711c51b 100644
--- a/binsrc/tests/suite/vspsoap.vsp
+++ b/binsrc/tests/suite/vspsoap.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vspsoap.vsp,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: vspsoap.vsp,v 1.2 2006/08/15 19:30:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/vspsoap_mod.vsp b/binsrc/tests/suite/vspsoap_mod.vsp
index 116805c..8407120 100644
--- a/binsrc/tests/suite/vspsoap_mod.vsp
+++ b/binsrc/tests/suite/vspsoap_mod.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vspsoap_mod.vsp,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: vspsoap_mod.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/wsdl_suite.sql b/binsrc/tests/suite/wsdl_suite.sql
index 0a90c1f..50c3fc9 100644
--- a/binsrc/tests/suite/wsdl_suite.sql
+++ b/binsrc/tests/suite/wsdl_suite.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsdl_suite.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: wsdl_suite.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xmlsql.sql b/binsrc/tests/suite/xmlsql.sql
index 3570144..90531cc 100644
--- a/binsrc/tests/suite/xmlsql.sql
+++ b/binsrc/tests/suite/xmlsql.sql
@@ -1,10 +1,10 @@
--
--- $Id: xmlsql.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: xmlsql.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xmlsql_vad.sql b/binsrc/tests/suite/xmlsql_vad.sql
index 11ad34a..2933624 100644
--- a/binsrc/tests/suite/xmlsql_vad.sql
+++ b/binsrc/tests/suite/xmlsql_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: xmlsql_vad.sql,v 1.1.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: xmlsql_vad.sql,v 1.1 2007/03/22 13:08:32 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xmlsupp.sql b/binsrc/tests/suite/xmlsupp.sql
index 8f4111c..50d17da 100644
--- a/binsrc/tests/suite/xmlsupp.sql
+++ b/binsrc/tests/suite/xmlsupp.sql
@@ -1,10 +1,10 @@
--
--- $Id: xmlsupp.sql,v 1.2.2.1 2012/03/08 12:55:09 source Exp $
+-- $Id: xmlsupp.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/attr_entity.xml b/binsrc/tests/suite/xsl_samples/attr_entity.xml
index c1f6ecc..cb5e323 100644
--- a/binsrc/tests/suite/xsl_samples/attr_entity.xml
+++ b/binsrc/tests/suite/xsl_samples/attr_entity.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/attr_entity.xsl b/binsrc/tests/suite/xsl_samples/attr_entity.xsl
index ecbed24..cd8d50c 100644
--- a/binsrc/tests/suite/xsl_samples/attr_entity.xsl
+++ b/binsrc/tests/suite/xsl_samples/attr_entity.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: attr_entity.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: attr_entity.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/auction1.xml b/binsrc/tests/suite/xsl_samples/auction1.xml
index 6e5d4ac..e29f40e 100644
--- a/binsrc/tests/suite/xsl_samples/auction1.xml
+++ b/binsrc/tests/suite/xsl_samples/auction1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/auction2.xml b/binsrc/tests/suite/xsl_samples/auction2.xml
index ea615ea..f7b0a82 100644
--- a/binsrc/tests/suite/xsl_samples/auction2.xml
+++ b/binsrc/tests/suite/xsl_samples/auction2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/auction3.xml b/binsrc/tests/suite/xsl_samples/auction3.xml
index eb1fc63..8783a65 100644
--- a/binsrc/tests/suite/xsl_samples/auction3.xml
+++ b/binsrc/tests/suite/xsl_samples/auction3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/authors.xml b/binsrc/tests/suite/xsl_samples/authors.xml
index 72ce4c8..fe1aba0 100644
--- a/binsrc/tests/suite/xsl_samples/authors.xml
+++ b/binsrc/tests/suite/xsl_samples/authors.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/bids-table.xsl b/binsrc/tests/suite/xsl_samples/bids-table.xsl
index 2d10d91..120c845 100644
--- a/binsrc/tests/suite/xsl_samples/bids-table.xsl
+++ b/binsrc/tests/suite/xsl_samples/bids-table.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bids-table.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: bids-table.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/bids-table2.xsl b/binsrc/tests/suite/xsl_samples/bids-table2.xsl
index 4f1589b..ff60d7c 100644
--- a/binsrc/tests/suite/xsl_samples/bids-table2.xsl
+++ b/binsrc/tests/suite/xsl_samples/bids-table2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bids-table2.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: bids-table2.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/booksshort.xml b/binsrc/tests/suite/xsl_samples/booksshort.xml
index 708e44c..2889cf9 100644
--- a/binsrc/tests/suite/xsl_samples/booksshort.xml
+++ b/binsrc/tests/suite/xsl_samples/booksshort.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/bug1174.xml b/binsrc/tests/suite/xsl_samples/bug1174.xml
index 3e7fd72..cbb6e11 100644
--- a/binsrc/tests/suite/xsl_samples/bug1174.xml
+++ b/binsrc/tests/suite/xsl_samples/bug1174.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/bug1174.xsl b/binsrc/tests/suite/xsl_samples/bug1174.xsl
index f16c604..dacd5e0 100644
--- a/binsrc/tests/suite/xsl_samples/bug1174.xsl
+++ b/binsrc/tests/suite/xsl_samples/bug1174.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bug1174.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: bug1174.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/bug3342.xml b/binsrc/tests/suite/xsl_samples/bug3342.xml
index bc5872d..9572ef1 100644
--- a/binsrc/tests/suite/xsl_samples/bug3342.xml
+++ b/binsrc/tests/suite/xsl_samples/bug3342.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/bug3342.xsl b/binsrc/tests/suite/xsl_samples/bug3342.xsl
index bee997d..30f5751 100644
--- a/binsrc/tests/suite/xsl_samples/bug3342.xsl
+++ b/binsrc/tests/suite/xsl_samples/bug3342.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: bug3342.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: bug3342.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/convert.xsl b/binsrc/tests/suite/xsl_samples/convert.xsl
index 1ee20d4..b78380b 100644
--- a/binsrc/tests/suite/xsl_samples/convert.xsl
+++ b/binsrc/tests/suite/xsl_samples/convert.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: convert.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: convert.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/defaultss.xsl b/binsrc/tests/suite/xsl_samples/defaultss.xsl
index 224bc49..ba084b2 100644
--- a/binsrc/tests/suite/xsl_samples/defaultss.xsl
+++ b/binsrc/tests/suite/xsl_samples/defaultss.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: defaultss.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: defaultss.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/empty_comment.xml b/binsrc/tests/suite/xsl_samples/empty_comment.xml
index 84bcf62..07424b7 100644
--- a/binsrc/tests/suite/xsl_samples/empty_comment.xml
+++ b/binsrc/tests/suite/xsl_samples/empty_comment.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/empty_comment.xsl b/binsrc/tests/suite/xsl_samples/empty_comment.xsl
index 868d59b..ffc2d39 100644
--- a/binsrc/tests/suite/xsl_samples/empty_comment.xsl
+++ b/binsrc/tests/suite/xsl_samples/empty_comment.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: empty_comment.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: empty_comment.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/externalScript.xml b/binsrc/tests/suite/xsl_samples/externalScript.xml
index bfe0060..96e68e2 100644
--- a/binsrc/tests/suite/xsl_samples/externalScript.xml
+++ b/binsrc/tests/suite/xsl_samples/externalScript.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/family.xml b/binsrc/tests/suite/xsl_samples/family.xml
index 433b27d..030400b 100644
--- a/binsrc/tests/suite/xsl_samples/family.xml
+++ b/binsrc/tests/suite/xsl_samples/family.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/family.xsl b/binsrc/tests/suite/xsl_samples/family.xsl
index bc1a215..79c9c91 100644
--- a/binsrc/tests/suite/xsl_samples/family.xsl
+++ b/binsrc/tests/suite/xsl_samples/family.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: family.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: family.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/grocery-list.xml b/binsrc/tests/suite/xsl_samples/grocery-list.xml
index 57aba86..10e2976 100644
--- a/binsrc/tests/suite/xsl_samples/grocery-list.xml
+++ b/binsrc/tests/suite/xsl_samples/grocery-list.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/grocery-list.xsl b/binsrc/tests/suite/xsl_samples/grocery-list.xsl
index 3ada801..f5a6976 100644
--- a/binsrc/tests/suite/xsl_samples/grocery-list.xsl
+++ b/binsrc/tests/suite/xsl_samples/grocery-list.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: grocery-list.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: grocery-list.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/grocery-list2.xml b/binsrc/tests/suite/xsl_samples/grocery-list2.xml
index b25c67d..230cff5 100644
--- a/binsrc/tests/suite/xsl_samples/grocery-list2.xml
+++ b/binsrc/tests/suite/xsl_samples/grocery-list2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/grocery-list2.xsl b/binsrc/tests/suite/xsl_samples/grocery-list2.xsl
index 98e0ad0..edce84a 100644
--- a/binsrc/tests/suite/xsl_samples/grocery-list2.xsl
+++ b/binsrc/tests/suite/xsl_samples/grocery-list2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: grocery-list2.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: grocery-list2.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/hilite-xml.xsl b/binsrc/tests/suite/xsl_samples/hilite-xml.xsl
index 4fb4c13..6d9f9f6 100644
--- a/binsrc/tests/suite/xsl_samples/hilite-xml.xsl
+++ b/binsrc/tests/suite/xsl_samples/hilite-xml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: hilite-xml.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: hilite-xml.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/identityxfm.xsl b/binsrc/tests/suite/xsl_samples/identityxfm.xsl
index 81971e0..a00f695 100644
--- a/binsrc/tests/suite/xsl_samples/identityxfm.xsl
+++ b/binsrc/tests/suite/xsl_samples/identityxfm.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: identityxfm.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: identityxfm.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/identityxfm1.xsl b/binsrc/tests/suite/xsl_samples/identityxfm1.xsl
index bb7fbba..d924a42 100644
--- a/binsrc/tests/suite/xsl_samples/identityxfm1.xsl
+++ b/binsrc/tests/suite/xsl_samples/identityxfm1.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: identityxfm1.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: identityxfm1.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl b/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl
index 1bc1557..0987131 100644
--- a/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl
+++ b/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: investments-to-portfolio.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: investments-to-portfolio.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/investments.xml b/binsrc/tests/suite/xsl_samples/investments.xml
index de1a017..7a7ff0c 100644
--- a/binsrc/tests/suite/xsl_samples/investments.xml
+++ b/binsrc/tests/suite/xsl_samples/investments.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/invoice.xml b/binsrc/tests/suite/xsl_samples/invoice.xml
index 59cf9ae..378df6f 100644
--- a/binsrc/tests/suite/xsl_samples/invoice.xml
+++ b/binsrc/tests/suite/xsl_samples/invoice.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/invoice.xsl b/binsrc/tests/suite/xsl_samples/invoice.xsl
index 7357bd3..06f93a0 100644
--- a/binsrc/tests/suite/xsl_samples/invoice.xsl
+++ b/binsrc/tests/suite/xsl_samples/invoice.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: invoice.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: invoice.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/ledger.xml b/binsrc/tests/suite/xsl_samples/ledger.xml
index 15c25c3..41c5717 100644
--- a/binsrc/tests/suite/xsl_samples/ledger.xml
+++ b/binsrc/tests/suite/xsl_samples/ledger.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/ledger.xsl b/binsrc/tests/suite/xsl_samples/ledger.xsl
index 7e3bc55..c290b81 100644
--- a/binsrc/tests/suite/xsl_samples/ledger.xsl
+++ b/binsrc/tests/suite/xsl_samples/ledger.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ledger.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: ledger.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/number_format.xml b/binsrc/tests/suite/xsl_samples/number_format.xml
index 2d3aa54..07ee3a4 100644
--- a/binsrc/tests/suite/xsl_samples/number_format.xml
+++ b/binsrc/tests/suite/xsl_samples/number_format.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/number_format.xsl b/binsrc/tests/suite/xsl_samples/number_format.xsl
index df78400..d1af14a 100644
--- a/binsrc/tests/suite/xsl_samples/number_format.xsl
+++ b/binsrc/tests/suite/xsl_samples/number_format.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: number_format.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: number_format.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/number_format1.xsl b/binsrc/tests/suite/xsl_samples/number_format1.xsl
index ca717f5..89f63b4 100644
--- a/binsrc/tests/suite/xsl_samples/number_format1.xsl
+++ b/binsrc/tests/suite/xsl_samples/number_format1.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: number_format1.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: number_format1.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/pole.xml b/binsrc/tests/suite/xsl_samples/pole.xml
index 583d20d..9c52bce 100644
--- a/binsrc/tests/suite/xsl_samples/pole.xml
+++ b/binsrc/tests/suite/xsl_samples/pole.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/pole.xsl b/binsrc/tests/suite/xsl_samples/pole.xsl
index e63dd53..14eaf4c 100644
--- a/binsrc/tests/suite/xsl_samples/pole.xsl
+++ b/binsrc/tests/suite/xsl_samples/pole.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: pole.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: pole.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/pole2.xml b/binsrc/tests/suite/xsl_samples/pole2.xml
index 2da2cca..7d9a9d6 100644
--- a/binsrc/tests/suite/xsl_samples/pole2.xml
+++ b/binsrc/tests/suite/xsl_samples/pole2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/pole2.xsl b/binsrc/tests/suite/xsl_samples/pole2.xsl
index 470c1d2..eb75af8 100644
--- a/binsrc/tests/suite/xsl_samples/pole2.xsl
+++ b/binsrc/tests/suite/xsl_samples/pole2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: pole2.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: pole2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/pole3.xml b/binsrc/tests/suite/xsl_samples/pole3.xml
index af98bfb..d4b3000 100644
--- a/binsrc/tests/suite/xsl_samples/pole3.xml
+++ b/binsrc/tests/suite/xsl_samples/pole3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/pole3.xsl b/binsrc/tests/suite/xsl_samples/pole3.xsl
index 467b913..bc0b08d 100644
--- a/binsrc/tests/suite/xsl_samples/pole3.xsl
+++ b/binsrc/tests/suite/xsl_samples/pole3.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: pole3.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: pole3.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/pole4.xml b/binsrc/tests/suite/xsl_samples/pole4.xml
index a250f09..9a92dc1 100644
--- a/binsrc/tests/suite/xsl_samples/pole4.xml
+++ b/binsrc/tests/suite/xsl_samples/pole4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/pole4.xsl b/binsrc/tests/suite/xsl_samples/pole4.xsl
index 195a29b..a9e5507 100644
--- a/binsrc/tests/suite/xsl_samples/pole4.xsl
+++ b/binsrc/tests/suite/xsl_samples/pole4.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: pole4.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: pole4.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml
index 1ba6e53..3f27062 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml
+++ b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl
index c994798..56b0337 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: portfolio-attributes.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio-attributes.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-choose.xml b/binsrc/tests/suite/xsl_samples/portfolio-choose.xml
index 3548ccc..b0d89af 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-choose.xml
+++ b/binsrc/tests/suite/xsl_samples/portfolio-choose.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl b/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl
index c7cc9df..dea7396 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: portfolio-choose.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio-choose.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl b/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl
index 0991c3f..c5704e0 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: portfolio-cp.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio-cp.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-if.xml b/binsrc/tests/suite/xsl_samples/portfolio-if.xml
index 136d51a..299dc3b 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-if.xml
+++ b/binsrc/tests/suite/xsl_samples/portfolio-if.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-if.xsl b/binsrc/tests/suite/xsl_samples/portfolio-if.xsl
index 3d19533..dced44d 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-if.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio-if.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: portfolio-if.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio-if.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-schema.xml b/binsrc/tests/suite/xsl_samples/portfolio-schema.xml
index db484d1..37820bb 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-schema.xml
+++ b/binsrc/tests/suite/xsl_samples/portfolio-schema.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl b/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl
index ffa5a9d..952399f 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: portfolio-sort1.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio-sort1.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml
index 56f9508..6f73d62 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml
+++ b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl
index 50fa5f3..dfb6ec1 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: portfolio-sort2.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio-sort2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl b/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl
index 174d5b4..60a1b24 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: portfolio-to-investments.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio-to-investments.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio.xml b/binsrc/tests/suite/xsl_samples/portfolio.xml
index 1fbc7d0..a8664a4 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio.xml
+++ b/binsrc/tests/suite/xsl_samples/portfolio.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio.xsl b/binsrc/tests/suite/xsl_samples/portfolio.xsl
index c1653c2..df48e23 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: portfolio.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio2.xml b/binsrc/tests/suite/xsl_samples/portfolio2.xml
index b6ef57e..f9a37e0 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio2.xml
+++ b/binsrc/tests/suite/xsl_samples/portfolio2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/portfolio2.xsl b/binsrc/tests/suite/xsl_samples/portfolio2.xsl
index 0b8761b..aa1715b 100644
--- a/binsrc/tests/suite/xsl_samples/portfolio2.xsl
+++ b/binsrc/tests/suite/xsl_samples/portfolio2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: portfolio2.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: portfolio2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/price-graph.xsl b/binsrc/tests/suite/xsl_samples/price-graph.xsl
index 6dfa135..ea2ea62 100644
--- a/binsrc/tests/suite/xsl_samples/price-graph.xsl
+++ b/binsrc/tests/suite/xsl_samples/price-graph.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: price-graph.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: price-graph.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/product-list.xml b/binsrc/tests/suite/xsl_samples/product-list.xml
index c88f175..c452ec1 100644
--- a/binsrc/tests/suite/xsl_samples/product-list.xml
+++ b/binsrc/tests/suite/xsl_samples/product-list.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/product-list.xsl b/binsrc/tests/suite/xsl_samples/product-list.xsl
index 755cfc7..b242c02 100644
--- a/binsrc/tests/suite/xsl_samples/product-list.xsl
+++ b/binsrc/tests/suite/xsl_samples/product-list.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: product-list.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: product-list.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/product-list2.xml b/binsrc/tests/suite/xsl_samples/product-list2.xml
index 2d7302e..41c96cb 100644
--- a/binsrc/tests/suite/xsl_samples/product-list2.xml
+++ b/binsrc/tests/suite/xsl_samples/product-list2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/product-list2.xsl b/binsrc/tests/suite/xsl_samples/product-list2.xsl
index 775ce2e..e590bd0 100644
--- a/binsrc/tests/suite/xsl_samples/product-list2.xsl
+++ b/binsrc/tests/suite/xsl_samples/product-list2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: product-list2.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: product-list2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/raw-xml.xsl b/binsrc/tests/suite/xsl_samples/raw-xml.xsl
index 7eb4924..11d1170 100644
--- a/binsrc/tests/suite/xsl_samples/raw-xml.xsl
+++ b/binsrc/tests/suite/xsl_samples/raw-xml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: raw-xml.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: raw-xml.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/rename.xsl b/binsrc/tests/suite/xsl_samples/rename.xsl
index a6285f1..d01c53d 100644
--- a/binsrc/tests/suite/xsl_samples/rename.xsl
+++ b/binsrc/tests/suite/xsl_samples/rename.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rename.xsl,v 1.2.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: rename.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl b/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl
index a8d8a5b..42241b3 100644
--- a/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl
+++ b/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: review-bad-pattern.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: review-bad-pattern.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review-bad-script.xsl b/binsrc/tests/suite/xsl_samples/review-bad-script.xsl
index 19eb75c..ca07226 100644
--- a/binsrc/tests/suite/xsl_samples/review-bad-script.xsl
+++ b/binsrc/tests/suite/xsl_samples/review-bad-script.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: review-bad-script.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: review-bad-script.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review-bad.xml b/binsrc/tests/suite/xsl_samples/review-bad.xml
index 835662f..750a0b4 100644
--- a/binsrc/tests/suite/xsl_samples/review-bad.xml
+++ b/binsrc/tests/suite/xsl_samples/review-bad.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review-bad.xsl b/binsrc/tests/suite/xsl_samples/review-bad.xsl
index 3466571..d52b17e 100644
--- a/binsrc/tests/suite/xsl_samples/review-bad.xsl
+++ b/binsrc/tests/suite/xsl_samples/review-bad.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: review-bad.xsl,v 1.3.2.1 2012/03/08 12:55:10 source Exp $
+ - $Id: review-bad.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review-css.xml b/binsrc/tests/suite/xsl_samples/review-css.xml
index a8b886d..44f02a4 100644
--- a/binsrc/tests/suite/xsl_samples/review-css.xml
+++ b/binsrc/tests/suite/xsl_samples/review-css.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review-embedded-css.xml b/binsrc/tests/suite/xsl_samples/review-embedded-css.xml
index e6db6cb..e65375d 100644
--- a/binsrc/tests/suite/xsl_samples/review-embedded-css.xml
+++ b/binsrc/tests/suite/xsl_samples/review-embedded-css.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review-simple.xsl b/binsrc/tests/suite/xsl_samples/review-simple.xsl
index 01ef6b6..954e42b 100644
--- a/binsrc/tests/suite/xsl_samples/review-simple.xsl
+++ b/binsrc/tests/suite/xsl_samples/review-simple.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: review-simple.xsl,v 1.3.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: review-simple.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review.xml b/binsrc/tests/suite/xsl_samples/review.xml
index 3c47c5a..36dc6de 100644
--- a/binsrc/tests/suite/xsl_samples/review.xml
+++ b/binsrc/tests/suite/xsl_samples/review.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/review.xsl b/binsrc/tests/suite/xsl_samples/review.xsl
index 681eccb..dc7024b 100644
--- a/binsrc/tests/suite/xsl_samples/review.xsl
+++ b/binsrc/tests/suite/xsl_samples/review.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: review.xsl,v 1.3.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: review.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/simple.xml b/binsrc/tests/suite/xsl_samples/simple.xml
index 509ff99..8f6bbfc 100644
--- a/binsrc/tests/suite/xsl_samples/simple.xml
+++ b/binsrc/tests/suite/xsl_samples/simple.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/simple.xsl b/binsrc/tests/suite/xsl_samples/simple.xsl
index 978226b..0c9c6a1 100644
--- a/binsrc/tests/suite/xsl_samples/simple.xsl
+++ b/binsrc/tests/suite/xsl_samples/simple.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: simple.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: simple.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl
index 5345052..454f7ea 100644
--- a/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl
+++ b/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sort-bidder-.xsl,v 1.3.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: sort-bidder-.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl
index 5cd6b66..f00cee9 100644
--- a/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl
+++ b/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sort-bidder-price-.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: sort-bidder-price-.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl
index 11ef577..9e5cc03 100644
--- a/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl
+++ b/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sort-bidder-price.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: sort-bidder-price.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder.xsl
index ddb575f..cf14bc2 100644
--- a/binsrc/tests/suite/xsl_samples/sort-bidder.xsl
+++ b/binsrc/tests/suite/xsl_samples/sort-bidder.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sort-bidder.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: sort-bidder.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/sort.xsl b/binsrc/tests/suite/xsl_samples/sort.xsl
index 5f8cb0a..168d4dc 100644
--- a/binsrc/tests/suite/xsl_samples/sort.xsl
+++ b/binsrc/tests/suite/xsl_samples/sort.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sort.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: sort.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml
index cecbcdc..a18261e 100644
--- a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml
+++ b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl
index ae6c57b..aa3eb61 100644
--- a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl
+++ b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: stock-sorter-vb.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: stock-sorter-vb.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter.xml b/binsrc/tests/suite/xsl_samples/stock-sorter.xml
index 7a6e180..92aa1f7 100644
--- a/binsrc/tests/suite/xsl_samples/stock-sorter.xml
+++ b/binsrc/tests/suite/xsl_samples/stock-sorter.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter.xsl b/binsrc/tests/suite/xsl_samples/stock-sorter.xsl
index 293521a..b31c35e 100644
--- a/binsrc/tests/suite/xsl_samples/stock-sorter.xsl
+++ b/binsrc/tests/suite/xsl_samples/stock-sorter.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: stock-sorter.xsl,v 1.3.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: stock-sorter.xsl,v 1.3 2006/08/16 08:31:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/utf8.xml b/binsrc/tests/suite/xsl_samples/utf8.xml
index 670453e..bd39635 100644
--- a/binsrc/tests/suite/xsl_samples/utf8.xml
+++ b/binsrc/tests/suite/xsl_samples/utf8.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/utf8.xsl b/binsrc/tests/suite/xsl_samples/utf8.xsl
index b163823..9669677 100644
--- a/binsrc/tests/suite/xsl_samples/utf8.xsl
+++ b/binsrc/tests/suite/xsl_samples/utf8.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding="windows-1251"?>
<!--
-
- - $Id: utf8.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: utf8.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl b/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl
index 20c702e..26b118b 100644
--- a/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl
+++ b/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xmlspec-toc.xsl,v 1.3.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: xmlspec-toc.xsl,v 1.3 2006/08/16 08:31:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/suite/xsl_samples/xsl-toc.xml b/binsrc/tests/suite/xsl_samples/xsl-toc.xml
index 968acdc..640fc51 100644
--- a/binsrc/tests/suite/xsl_samples/xsl-toc.xml
+++ b/binsrc/tests/suite/xsl_samples/xsl-toc.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -22,7 +22,7 @@
-->
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="xmlspec-toc.xsl" type="text/xsl"?>
-<!-- $Id: xsl-toc.xml,v 1.1.1.1.2.1 2012/03/08 12:55:11 source Exp $ -->
+<!-- $Id: xsl-toc.xml,v 1.1.1.1 2006/04/11 17:56:11 source Exp $ -->
<!DOCTYPE spec SYSTEM "xslspec.dtd" [
<!ENTITY XMLRec "http://www.w3.org/TR/REC-xml">
<!ENTITY XMLNames "http://www.w3.org/TR/WD-xml-names">
diff --git a/binsrc/tests/suite/xsl_samples/xsl.xml b/binsrc/tests/suite/xsl_samples/xsl.xml
index b9f1540..9e725d2 100644
--- a/binsrc/tests/suite/xsl_samples/xsl.xml
+++ b/binsrc/tests/suite/xsl_samples/xsl.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -22,7 +22,7 @@
-->
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="xmlspec.xsl" type="text/xsl"?>
-<!-- $Id: xsl.xml,v 1.1.1.1.2.1 2012/03/08 12:55:11 source Exp $ -->
+<!-- $Id: xsl.xml,v 1.1.1.1 2006/04/11 17:56:11 source Exp $ -->
<!DOCTYPE spec SYSTEM "xslspec.dtd" [
<!ENTITY XMLRec "http://www.w3.org/TR/REC-xml">
<!ENTITY XMLNames "http://www.w3.org/TR/WD-xml-names">
diff --git a/binsrc/tests/testlock.c b/binsrc/tests/testlock.c
index 13f9bbe..e3cd253 100644
--- a/binsrc/tests/testlock.c
+++ b/binsrc/tests/testlock.c
@@ -1,10 +1,10 @@
/*
- * $Id: testlock.c,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: testlock.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2008 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
diff --git a/binsrc/tests/time.c b/binsrc/tests/time.c
index 7ee5a06..06f79a5 100644
--- a/binsrc/tests/time.c
+++ b/binsrc/tests/time.c
@@ -1,14 +1,14 @@
/*
* time.c
*
- * $Id: time.c,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: time.c,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
*
* Timing functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/timeacct.h b/binsrc/tests/timeacct.h
index 01c660d..f81ddf7 100644
--- a/binsrc/tests/timeacct.h
+++ b/binsrc/tests/timeacct.h
@@ -1,14 +1,14 @@
/*
* timeacct.h
*
- * $Id: timeacct.h,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: timeacct.h,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
*
* Timing macros and functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tkset.c b/binsrc/tests/tkset.c
index e314223..e4a8a78 100644
--- a/binsrc/tests/tkset.c
+++ b/binsrc/tests/tkset.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/tpcc.c b/binsrc/tests/tpcc.c
index 6fc8678..df701e0 100644
--- a/binsrc/tests/tpcc.c
+++ b/binsrc/tests/tpcc.c
@@ -1,14 +1,14 @@
/*
* tpcc.c
*
- * $Id: tpcc.c,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: tpcc.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
*
* TPC-C Benchmark
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcc.h b/binsrc/tests/tpcc.h
index 8cad8e2..ce3b2f0 100644
--- a/binsrc/tests/tpcc.h
+++ b/binsrc/tests/tpcc.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/tpcc.sql b/binsrc/tests/tpcc.sql
index 50fc746..e86be76 100644
--- a/binsrc/tests/tpcc.sql
+++ b/binsrc/tests/tpcc.sql
@@ -1,14 +1,14 @@
--
-- tpcc.sql
--
--- $Id: tpcc.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: tpcc.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
--
-- TPC-C Benchmark transactions as stored procedures.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpccddk.sql b/binsrc/tests/tpccddk.sql
index 5d67ed4..89d26a0 100644
--- a/binsrc/tests/tpccddk.sql
+++ b/binsrc/tests/tpccddk.sql
@@ -1,14 +1,14 @@
--
-- tpccddk.sql
--
--- $Id: tpccddk.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: tpccddk.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
--
-- TPC-C Benchmark
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpccoci.c b/binsrc/tests/tpccoci.c
index 3119ef6..e54c77f 100644
--- a/binsrc/tests/tpccoci.c
+++ b/binsrc/tests/tpccoci.c
@@ -1,14 +1,14 @@
/*
* tpcctrx.c
*
- * $Id: tpccoci.c,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: tpccoci.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
*
* TPC-C Transactions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpccodbc.c b/binsrc/tests/tpccodbc.c
index b1f9b04..85e0f65 100644
--- a/binsrc/tests/tpccodbc.c
+++ b/binsrc/tests/tpccodbc.c
@@ -1,14 +1,14 @@
/*
* tpccodbc.c
*
- * $Id: tpccodbc.c,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: tpccodbc.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
*
* TPC-C Transactions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcctrx.c b/binsrc/tests/tpcctrx.c
index 270254a..a4a702b 100644
--- a/binsrc/tests/tpcctrx.c
+++ b/binsrc/tests/tpcctrx.c
@@ -1,14 +1,14 @@
/*
* tpcctrx.c
*
- * $Id: tpcctrx.c,v 1.3.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: tpcctrx.c,v 1.3.2.1 2009/04/20 21:18:31 source Exp $
*
* TPC-C Transactions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/Makefile.am b/binsrc/tests/tpcrun/Makefile.am
index 8579f2f..e7e6e23 100644
--- a/binsrc/tests/tpcrun/Makefile.am
+++ b/binsrc/tests/tpcrun/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/Makefile.in b/binsrc/tests/tpcrun/Makefile.in
index 5bdd2a1..2270841 100644
--- a/binsrc/tests/tpcrun/Makefile.in
+++ b/binsrc/tests/tpcrun/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/tpcrun/checkdb.sql b/binsrc/tests/tpcrun/checkdb.sql
index 33a04ef..6eeceb0 100644
--- a/binsrc/tests/tpcrun/checkdb.sql
+++ b/binsrc/tests/tpcrun/checkdb.sql
@@ -1,10 +1,10 @@
--
--- $Id: checkdb.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: checkdb.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/repl_ck.sql b/binsrc/tests/tpcrun/repl_ck.sql
index ab6a47d..ec56d19 100644
--- a/binsrc/tests/tpcrun/repl_ck.sql
+++ b/binsrc/tests/tpcrun/repl_ck.sql
@@ -1,10 +1,10 @@
--
--- $Id: repl_ck.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: repl_ck.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/repl_ck_init.sql b/binsrc/tests/tpcrun/repl_ck_init.sql
index 7c70344..f3d4ff0 100644
--- a/binsrc/tests/tpcrun/repl_ck_init.sql
+++ b/binsrc/tests/tpcrun/repl_ck_init.sql
@@ -1,10 +1,10 @@
--
--- $Id: repl_ck_init.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: repl_ck_init.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/repl_pub_tpcc.sql b/binsrc/tests/tpcrun/repl_pub_tpcc.sql
index f2e3854..9032930 100644
--- a/binsrc/tests/tpcrun/repl_pub_tpcc.sql
+++ b/binsrc/tests/tpcrun/repl_pub_tpcc.sql
@@ -1,10 +1,10 @@
--
--- $Id: repl_pub_tpcc.sql,v 1.2.2.2 2012/03/08 12:55:11 source Exp $
+-- $Id: repl_pub_tpcc.sql,v 1.2.2.1 2009/11/25 22:12:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/repl_sub_tpcc.sql b/binsrc/tests/tpcrun/repl_sub_tpcc.sql
index 395972c..9fc1966 100644
--- a/binsrc/tests/tpcrun/repl_sub_tpcc.sql
+++ b/binsrc/tests/tpcrun/repl_sub_tpcc.sql
@@ -1,10 +1,10 @@
--
--- $Id: repl_sub_tpcc.sql,v 1.2.2.2 2012/03/08 12:55:11 source Exp $
+-- $Id: repl_sub_tpcc.sql,v 1.2.2.1 2009/11/25 22:12:11 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/test_server.sh b/binsrc/tests/tpcrun/test_server.sh
index 4e8bde6..4755a07 100755
--- a/binsrc/tests/tpcrun/test_server.sh
+++ b/binsrc/tests/tpcrun/test_server.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: test_server.sh,v 1.1.1.1.2.1 2012/03/08 12:55:11 source Exp $
+# $Id: test_server.sh,v 1.1.1.1 2006/04/11 17:56:11 source Exp $
#
# choose a server to run with
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/tpc_back.sql b/binsrc/tests/tpcrun/tpc_back.sql
index 5ad0729..74400b7 100644
--- a/binsrc/tests/tpcrun/tpc_back.sql
+++ b/binsrc/tests/tpcrun/tpc_back.sql
@@ -1,14 +1,14 @@
--
-- tpc_back.sql
--
--- $Id: tpc_back.sql,v 1.3.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: tpc_back.sql,v 1.3 2009/02/03 15:47:27 source Exp $
--
-- Make an On-Line Backup
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/tpc_cpts.sql b/binsrc/tests/tpcrun/tpc_cpts.sql
index ec9407f..868dc2f 100644
--- a/binsrc/tests/tpcrun/tpc_cpts.sql
+++ b/binsrc/tests/tpcrun/tpc_cpts.sql
@@ -1,14 +1,14 @@
--
-- tcp_cpts.sql
--
--- $Id: tpc_cpts.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: tpc_cpts.sql,v 1.2 2009/02/03 15:47:27 source Exp $
--
-- Do regular checkpoints
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpcrun/tpc_run.sh b/binsrc/tests/tpcrun/tpc_run.sh
index 1a444a0..d53f2a7 100755
--- a/binsrc/tests/tpcrun/tpc_run.sh
+++ b/binsrc/tests/tpcrun/tpc_run.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: tpc_run.sh,v 1.3.2.2 2012/03/08 12:55:11 source Exp $
+# $Id: tpc_run.sh,v 1.3.2.1 2009/04/20 21:14:24 source Exp $
#
# Running the TPC benchmark
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/tpm.sql b/binsrc/tests/tpm.sql
index d272221..539dd8c 100644
--- a/binsrc/tests/tpm.sql
+++ b/binsrc/tests/tpm.sql
@@ -1,10 +1,10 @@
--
--- $Id: tpm.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: tpm.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/urlsimu.c b/binsrc/tests/urlsimu.c
index da716e3..e22517e 100644
--- a/binsrc/tests/urlsimu.c
+++ b/binsrc/tests/urlsimu.c
@@ -1,5 +1,5 @@
/*
- * $Id: urlsimu.c,v 1.1.1.1.2.2 2012/03/08 12:55:06 source Exp $
+ * $Id: urlsimu.c,v 1.1.1.1.2.1 2009/04/20 21:18:31 source Exp $
*
* URLSIMU - Url simulator
*
@@ -10,7 +10,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/virtdriver.c b/binsrc/tests/virtdriver.c
index 7db4a39..be25e6e 100644
--- a/binsrc/tests/virtdriver.c
+++ b/binsrc/tests/virtdriver.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/binsrc/tests/virtdriver.sql b/binsrc/tests/virtdriver.sql
index 2cc661e..15b2862 100644
--- a/binsrc/tests/virtdriver.sql
+++ b/binsrc/tests/virtdriver.sql
@@ -1,10 +1,10 @@
--
--- $Id: virtdriver.sql,v 1.2.2.2 2012/03/08 12:55:06 source Exp $
+-- $Id: virtdriver.sql,v 1.2.2.1 2009/04/20 21:18:31 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/Makefile.am b/binsrc/tests/wb/Makefile.am
index afe6771..9b4aaed 100644
--- a/binsrc/tests/wb/Makefile.am
+++ b/binsrc/tests/wb/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/Makefile.in b/binsrc/tests/wb/Makefile.in
index 5e179c5..8f872e9 100644
--- a/binsrc/tests/wb/Makefile.in
+++ b/binsrc/tests/wb/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml
index d1506d5..b7a964e 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml
index d868b35..a9678fe 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml
index 8c35b80..51d1e2a 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml
index 193be7f..56c0146 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml
index c3a1eea..61c045b 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml
index 66da722..b0b2ab9 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml
index 43f3fe1..2668125 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml
index 2609da9..2292a0d 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml
index 2609da9..2292a0d 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml
index 1dc399d..be09097 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml
index b079c44..79ec099 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml
index 2e3f0b2..15eb353 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml
index 887490a..c4e023c 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml
index e9986ed..6376e79 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml
index 5c17d06..4367be4 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml
index 8f6e9ed..c27cf01 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml
index 858f55e..bf66d94 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml
index ff91c0b..3a317c0 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml
index c5a59a9..2702d59 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml
index dd54a2a..4f117d4 100644
--- a/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml
+++ b/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/1x1.html b/binsrc/tutorial/1x1.html
index fe3a1f8..99564d0 100644
--- a/binsrc/tutorial/1x1.html
+++ b/binsrc/tutorial/1x1.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/Makefile.am b/binsrc/tutorial/Makefile.am
index e8caac5..70b5777 100644
--- a/binsrc/tutorial/Makefile.am
+++ b/binsrc/tutorial/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/Makefile.in b/binsrc/tutorial/Makefile.in
index b0ceff2..7b45c00 100644
--- a/binsrc/tutorial/Makefile.in
+++ b/binsrc/tutorial/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -163,7 +163,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -212,7 +211,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -264,7 +262,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -311,6 +308,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tutorial/apps/Makefile.am b/binsrc/tutorial/apps/Makefile.am
index 69cdfc1..2afa3e1 100644
--- a/binsrc/tutorial/apps/Makefile.am
+++ b/binsrc/tutorial/apps/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/Makefile.in b/binsrc/tutorial/apps/Makefile.in
index 9bb5fe9..20558e4 100644
--- a/binsrc/tutorial/apps/Makefile.in
+++ b/binsrc/tutorial/apps/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tutorial/apps/blog/blog.sql b/binsrc/tutorial/apps/blog/blog.sql
index f7bc2d6..74ff7f9 100644
--- a/binsrc/tutorial/apps/blog/blog.sql
+++ b/binsrc/tutorial/apps/blog/blog.sql
@@ -1,10 +1,10 @@
--
--- $Id: blog.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: blog.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog/blog.xml b/binsrc/tutorial/apps/blog/blog.xml
index 6ce9240..ebda7b2 100644
--- a/binsrc/tutorial/apps/blog/blog.xml
+++ b/binsrc/tutorial/apps/blog/blog.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog/blog_home.vspx b/binsrc/tutorial/apps/blog/blog_home.vspx
index 15180c1..5dee4a5 100644
--- a/binsrc/tutorial/apps/blog/blog_home.vspx
+++ b/binsrc/tutorial/apps/blog/blog_home.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog_home.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: blog_home.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog/blog_login.vspx b/binsrc/tutorial/apps/blog/blog_login.vspx
index bb4248e..8dde097 100644
--- a/binsrc/tutorial/apps/blog/blog_login.vspx
+++ b/binsrc/tutorial/apps/blog/blog_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog_login.vspx,v 1.3.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: blog_login.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog/blog_setup.vspx b/binsrc/tutorial/apps/blog/blog_setup.vspx
index 92c4670..713eec9 100644
--- a/binsrc/tutorial/apps/blog/blog_setup.vspx
+++ b/binsrc/tutorial/apps/blog/blog_setup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog_setup.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: blog_setup.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog/get_blogs.vspx b/binsrc/tutorial/apps/blog/get_blogs.vspx
index 305aa67..1ff58aa 100644
--- a/binsrc/tutorial/apps/blog/get_blogs.vspx
+++ b/binsrc/tutorial/apps/blog/get_blogs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: get_blogs.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: get_blogs.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog/options.xml b/binsrc/tutorial/apps/blog/options.xml
index 917a036..903f35b 100644
--- a/binsrc/tutorial/apps/blog/options.xml
+++ b/binsrc/tutorial/apps/blog/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog/register.vspx b/binsrc/tutorial/apps/blog/register.vspx
index 2b99b9c..427af0d 100644
--- a/binsrc/tutorial/apps/blog/register.vspx
+++ b/binsrc/tutorial/apps/blog/register.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: register.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: register.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_bridge/blog.vspx b/binsrc/tutorial/apps/blog_bridge/blog.vspx
index 7f01391..ea2bdd0 100644
--- a/binsrc/tutorial/apps/blog_bridge/blog.vspx
+++ b/binsrc/tutorial/apps/blog_bridge/blog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: blog.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql b/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql
index 38f9ca3..d164840 100644
--- a/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql
+++ b/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql
@@ -1,10 +1,10 @@
--
--- $Id: blog_bridge.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: blog_bridge.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml b/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml
index 9a57fc1..17c8de8 100644
--- a/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml
+++ b/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_bridge/bridge.vspx b/binsrc/tutorial/apps/blog_bridge/bridge.vspx
index 452f7b4..466cd0c 100644
--- a/binsrc/tutorial/apps/blog_bridge/bridge.vspx
+++ b/binsrc/tutorial/apps/blog_bridge/bridge.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bridge.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: bridge.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx b/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx
index 1206b58..59adccf 100644
--- a/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx
+++ b/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: get_blogs.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: get_blogs.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_bridge/login.vspx b/binsrc/tutorial/apps/blog_bridge/login.vspx
index 41332ea..517f903 100644
--- a/binsrc/tutorial/apps/blog_bridge/login.vspx
+++ b/binsrc/tutorial/apps/blog_bridge/login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.vspx,v 1.3.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: login.vspx,v 1.3 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_bridge/options.xml b/binsrc/tutorial/apps/blog_bridge/options.xml
index 93b5319..a83ecca 100644
--- a/binsrc/tutorial/apps/blog_bridge/options.xml
+++ b/binsrc/tutorial/apps/blog_bridge/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_bridge/register.vspx b/binsrc/tutorial/apps/blog_bridge/register.vspx
index f9d77ff..50f3e58 100644
--- a/binsrc/tutorial/apps/blog_bridge/register.vspx
+++ b/binsrc/tutorial/apps/blog_bridge/register.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: register.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: register.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_query/blog_query.sql b/binsrc/tutorial/apps/blog_query/blog_query.sql
index 59029a5..8c4bef7 100644
--- a/binsrc/tutorial/apps/blog_query/blog_query.sql
+++ b/binsrc/tutorial/apps/blog_query/blog_query.sql
@@ -1,10 +1,10 @@
--
--- $Id: blog_query.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: blog_query.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_query/blog_query.xml b/binsrc/tutorial/apps/blog_query/blog_query.xml
index 3909528..29384a4 100644
--- a/binsrc/tutorial/apps/blog_query/blog_query.xml
+++ b/binsrc/tutorial/apps/blog_query/blog_query.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_query/opml.xml b/binsrc/tutorial/apps/blog_query/opml.xml
index edf0673..eadd713 100644
--- a/binsrc/tutorial/apps/blog_query/opml.xml
+++ b/binsrc/tutorial/apps/blog_query/opml.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/blog_query/options.xml b/binsrc/tutorial/apps/blog_query/options.xml
index 65438c9..ab82036 100644
--- a/binsrc/tutorial/apps/blog_query/options.xml
+++ b/binsrc/tutorial/apps/blog_query/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/demo.css b/binsrc/tutorial/apps/demo.css
index 0cd7292..3bbab5c 100644
--- a/binsrc/tutorial/apps/demo.css
+++ b/binsrc/tutorial/apps/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/forums/forums.xml b/binsrc/tutorial/apps/forums/forums.xml
index 4acdd0e..0a495fc 100644
--- a/binsrc/tutorial/apps/forums/forums.xml
+++ b/binsrc/tutorial/apps/forums/forums.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/forums/options.xml b/binsrc/tutorial/apps/forums/options.xml
index a427cc5..580d97f 100644
--- a/binsrc/tutorial/apps/forums/options.xml
+++ b/binsrc/tutorial/apps/forums/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml b/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml
index 3730ad0..bf0ba5a 100644
--- a/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml
+++ b/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/ibuyspy/options.xml b/binsrc/tutorial/apps/ibuyspy/options.xml
index 79a5895..3f5be09 100644
--- a/binsrc/tutorial/apps/ibuyspy/options.xml
+++ b/binsrc/tutorial/apps/ibuyspy/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/index.xml b/binsrc/tutorial/apps/index.xml
index c3832dc..69d2e06 100644
--- a/binsrc/tutorial/apps/index.xml
+++ b/binsrc/tutorial/apps/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/petshop/options.xml b/binsrc/tutorial/apps/petshop/options.xml
index ed137b5..3d03ecb 100644
--- a/binsrc/tutorial/apps/petshop/options.xml
+++ b/binsrc/tutorial/apps/petshop/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/petshop/petshop.xml b/binsrc/tutorial/apps/petshop/petshop.xml
index af74e47..4360621 100644
--- a/binsrc/tutorial/apps/petshop/petshop.xml
+++ b/binsrc/tutorial/apps/petshop/petshop.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/petshop/petshopinit.sql b/binsrc/tutorial/apps/petshop/petshopinit.sql
index 86c5c49..675227f 100644
--- a/binsrc/tutorial/apps/petshop/petshopinit.sql
+++ b/binsrc/tutorial/apps/petshop/petshopinit.sql
@@ -1,10 +1,10 @@
--
--- $Id: petshopinit.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: petshopinit.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/rss_feed/blog.vspx b/binsrc/tutorial/apps/rss_feed/blog.vspx
index 71ff7f2..9c0d688 100644
--- a/binsrc/tutorial/apps/rss_feed/blog.vspx
+++ b/binsrc/tutorial/apps/rss_feed/blog.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog.vspx,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: blog.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/rss_feed/blogs.sql b/binsrc/tutorial/apps/rss_feed/blogs.sql
index a75cbbd..7ff8cef 100644
--- a/binsrc/tutorial/apps/rss_feed/blogs.sql
+++ b/binsrc/tutorial/apps/rss_feed/blogs.sql
@@ -1,10 +1,10 @@
--
--- $Id: blogs.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: blogs.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/rss_feed/options.xml b/binsrc/tutorial/apps/rss_feed/options.xml
index 7ccd823..bd4092f 100644
--- a/binsrc/tutorial/apps/rss_feed/options.xml
+++ b/binsrc/tutorial/apps/rss_feed/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/rss_feed/rss.vsp b/binsrc/tutorial/apps/rss_feed/rss.vsp
index 053501c..16bb189 100644
--- a/binsrc/tutorial/apps/rss_feed/rss.vsp
+++ b/binsrc/tutorial/apps/rss_feed/rss.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: rss.vsp,v 1.4.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: rss.vsp,v 1.4 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/rss_feed/rss2upg.xsl b/binsrc/tutorial/apps/rss_feed/rss2upg.xsl
index 47f582c..263176e 100644
--- a/binsrc/tutorial/apps/rss_feed/rss2upg.xsl
+++ b/binsrc/tutorial/apps/rss_feed/rss2upg.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: rss2upg.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: rss2upg.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/apps/rss_feed/rss_feed.xml b/binsrc/tutorial/apps/rss_feed/rss_feed.xml
index 670a18c..e939722 100644
--- a/binsrc/tutorial/apps/rss_feed/rss_feed.xml
+++ b/binsrc/tutorial/apps/rss_feed/rss_feed.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/atom.vsp b/binsrc/tutorial/atom.vsp
index ba0cf50..a0f7539 100644
--- a/binsrc/tutorial/atom.vsp
+++ b/binsrc/tutorial/atom.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: atom.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: atom.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/dev.sql b/binsrc/tutorial/dev.sql
index 86fe401..6cf4dc2 100644
--- a/binsrc/tutorial/dev.sql
+++ b/binsrc/tutorial/dev.sql
@@ -1,10 +1,10 @@
--
--- $Id: dev.sql,v 1.6.2.3 2012/03/08 12:55:11 source Exp $
+-- $Id: dev.sql,v 1.6.2.1 2011/07/20 09:50:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -98,7 +98,7 @@ create procedure TUT_get_xml(in path varchar){
if(isnull(xpath_eval('@wwwpath',xp_example)))
{
- if (_ex_optxml is not null and lower(xpath_eval('string(/init/@is_vspx)',_ex_optxml)) = 'yes')
+ if (_ex_optxml and lower(xpath_eval('string(/init/@is_vspx)',_ex_optxml)) = 'yes')
ex := 'x';
XMLAddAttribute (xp_example,2,'wwwpath',concat(_ex_fspath ,'/', _ex_id , '.vsp',ex));
};
diff --git a/binsrc/tutorial/dev.vsp b/binsrc/tutorial/dev.vsp
index f949cef..5e9419a 100644
--- a/binsrc/tutorial/dev.vsp
+++ b/binsrc/tutorial/dev.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dev.vsp,v 1.7.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: dev.vsp,v 1.7 2007/05/08 17:41:08 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/example.js b/binsrc/tutorial/example.js
index 44c1b28..f3299d4 100644
--- a/binsrc/tutorial/example.js
+++ b/binsrc/tutorial/example.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/guide.vsp b/binsrc/tutorial/guide.vsp
index d9cef45..acdd2d6 100644
--- a/binsrc/tutorial/guide.vsp
+++ b/binsrc/tutorial/guide.vsp
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<?vsp
--
--- $Id: guide.vsp,v 1.4.2.2 2012/03/08 12:55:11 source Exp $
+-- $Id: guide.vsp,v 1.4.2.1 2010/01/07 16:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/Makefile.am b/binsrc/tutorial/hosting/Makefile.am
index 413f875..9c1122e 100644
--- a/binsrc/tutorial/hosting/Makefile.am
+++ b/binsrc/tutorial/hosting/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/Makefile.in b/binsrc/tutorial/hosting/Makefile.in
index 8ea1864..fbdc983 100644
--- a/binsrc/tutorial/hosting/Makefile.in
+++ b/binsrc/tutorial/hosting/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tutorial/hosting/demo.css b/binsrc/tutorial/hosting/demo.css
index f55c3ac..f14191e 100644
--- a/binsrc/tutorial/hosting/demo.css
+++ b/binsrc/tutorial/hosting/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/Point.java b/binsrc/tutorial/hosting/ho_s_1/Point.java
index 7dafa06..8f6d005 100644
--- a/binsrc/tutorial/hosting/ho_s_1/Point.java
+++ b/binsrc/tutorial/hosting/ho_s_1/Point.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/ho_s_1.sql b/binsrc/tutorial/hosting/ho_s_1/ho_s_1.sql
index cfb6e1a..2621e2d 100644
--- a/binsrc/tutorial/hosting/ho_s_1/ho_s_1.sql
+++ b/binsrc/tutorial/hosting/ho_s_1/ho_s_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_1.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: ho_s_1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/ho_s_1.xml b/binsrc/tutorial/hosting/ho_s_1/ho_s_1.xml
index 967a43c..f154dc3 100644
--- a/binsrc/tutorial/hosting/ho_s_1/ho_s_1.xml
+++ b/binsrc/tutorial/hosting/ho_s_1/ho_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/my_finances.java b/binsrc/tutorial/hosting/ho_s_1/my_finances.java
index a39527b..59abedc 100644
--- a/binsrc/tutorial/hosting/ho_s_1/my_finances.java
+++ b/binsrc/tutorial/hosting/ho_s_1/my_finances.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/options.xml b/binsrc/tutorial/hosting/ho_s_1/options.xml
index e1644bd..67df1ea 100644
--- a/binsrc/tutorial/hosting/ho_s_1/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp
index 648c120..bd7d874 100644
--- a/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp
+++ b/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp1.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: vsp1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp
index f073f0b..77f9537 100644
--- a/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp
+++ b/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp2.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: vsp2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp
index 2dbfd9c..c8380dd 100644
--- a/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp
+++ b/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp3.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: vsp3.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp
index d679bf8..1266855 100644
--- a/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp
+++ b/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp4.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: vsp4.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_10/Point_ho_s_10.cs b/binsrc/tutorial/hosting/ho_s_10/Point_ho_s_10.cs
index e5ecdf8..300874d 100644
--- a/binsrc/tutorial/hosting/ho_s_10/Point_ho_s_10.cs
+++ b/binsrc/tutorial/hosting/ho_s_10/Point_ho_s_10.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_10/ho_s_10.sql b/binsrc/tutorial/hosting/ho_s_10/ho_s_10.sql
index 796bcab..5077023 100644
--- a/binsrc/tutorial/hosting/ho_s_10/ho_s_10.sql
+++ b/binsrc/tutorial/hosting/ho_s_10/ho_s_10.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_10.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: ho_s_10.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_10/ho_s_10.xml b/binsrc/tutorial/hosting/ho_s_10/ho_s_10.xml
index 2e8138d..27b9883 100644
--- a/binsrc/tutorial/hosting/ho_s_10/ho_s_10.xml
+++ b/binsrc/tutorial/hosting/ho_s_10/ho_s_10.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_10/options.xml b/binsrc/tutorial/hosting/ho_s_10/options.xml
index 18ae178..1dba60f 100644
--- a/binsrc/tutorial/hosting/ho_s_10/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_10/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp
index 8689951..8e97567 100644
--- a/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp
+++ b/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp1.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: vsp1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/ho_s_11.sql b/binsrc/tutorial/hosting/ho_s_11/ho_s_11.sql
index c7c576b..3196440 100644
--- a/binsrc/tutorial/hosting/ho_s_11/ho_s_11.sql
+++ b/binsrc/tutorial/hosting/ho_s_11/ho_s_11.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_11.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: ho_s_11.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/ho_s_11.xml b/binsrc/tutorial/hosting/ho_s_11/ho_s_11.xml
index 125b9ca..e327eed 100644
--- a/binsrc/tutorial/hosting/ho_s_11/ho_s_11.xml
+++ b/binsrc/tutorial/hosting/ho_s_11/ho_s_11.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/options.xml b/binsrc/tutorial/hosting/ho_s_11/options.xml
index fe5bb2c..86827c0 100644
--- a/binsrc/tutorial/hosting/ho_s_11/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_11/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/restricted.cs b/binsrc/tutorial/hosting/ho_s_11/restricted.cs
index 55aa4ad..3350d70 100644
--- a/binsrc/tutorial/hosting/ho_s_11/restricted.cs
+++ b/binsrc/tutorial/hosting/ho_s_11/restricted.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/restricted.vsp b/binsrc/tutorial/hosting/ho_s_11/restricted.vsp
index fb37b34..2ec941d 100644
--- a/binsrc/tutorial/hosting/ho_s_11/restricted.vsp
+++ b/binsrc/tutorial/hosting/ho_s_11/restricted.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restricted.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: restricted.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs b/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs
index ff703f2..1d1b612 100644
--- a/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs
+++ b/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp b/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp
index dd20085..b6ba935 100644
--- a/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp
+++ b/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: unrestricted.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: unrestricted.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs b/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs
index 6486509..e55e191 100644
--- a/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs
+++ b/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs b/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs
index b657804..0006b99 100644
--- a/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs
+++ b/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp b/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp
index 3f00a73..6f9b3ee 100644
--- a/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp
+++ b/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: asmx_tutorial.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: asmx_tutorial.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/ho_s_12.sql b/binsrc/tutorial/hosting/ho_s_12/ho_s_12.sql
index e3f88aa..ebcdb2a 100644
--- a/binsrc/tutorial/hosting/ho_s_12/ho_s_12.sql
+++ b/binsrc/tutorial/hosting/ho_s_12/ho_s_12.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_12.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: ho_s_12.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/ho_s_12.xml b/binsrc/tutorial/hosting/ho_s_12/ho_s_12.xml
index 78c7664..6834aab 100644
--- a/binsrc/tutorial/hosting/ho_s_12/ho_s_12.xml
+++ b/binsrc/tutorial/hosting/ho_s_12/ho_s_12.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_12/options.xml b/binsrc/tutorial/hosting/ho_s_12/options.xml
index 32f6493..8f31e10 100644
--- a/binsrc/tutorial/hosting/ho_s_12/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_12/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/Restricted.java b/binsrc/tutorial/hosting/ho_s_13/Restricted.java
index 633393f..ce22e0b 100644
--- a/binsrc/tutorial/hosting/ho_s_13/Restricted.java
+++ b/binsrc/tutorial/hosting/ho_s_13/Restricted.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java b/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java
index 282c212..b20d5a2 100644
--- a/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java
+++ b/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/ho_s_13.sql b/binsrc/tutorial/hosting/ho_s_13/ho_s_13.sql
index b1eb135..d743c7c 100644
--- a/binsrc/tutorial/hosting/ho_s_13/ho_s_13.sql
+++ b/binsrc/tutorial/hosting/ho_s_13/ho_s_13.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_13.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: ho_s_13.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/ho_s_13.xml b/binsrc/tutorial/hosting/ho_s_13/ho_s_13.xml
index b111d71..91c2c78 100644
--- a/binsrc/tutorial/hosting/ho_s_13/ho_s_13.xml
+++ b/binsrc/tutorial/hosting/ho_s_13/ho_s_13.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/options.xml b/binsrc/tutorial/hosting/ho_s_13/options.xml
index e1644bd..67df1ea 100644
--- a/binsrc/tutorial/hosting/ho_s_13/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_13/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/restricted.vsp b/binsrc/tutorial/hosting/ho_s_13/restricted.vsp
index fc7fd85..0684bb2 100644
--- a/binsrc/tutorial/hosting/ho_s_13/restricted.vsp
+++ b/binsrc/tutorial/hosting/ho_s_13/restricted.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restricted.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: restricted.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp b/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp
index 0b78620..95177a9 100644
--- a/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp
+++ b/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: unrestricted.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: unrestricted.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.cs b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.cs
index 9b97835..bc700df 100644
--- a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.cs
+++ b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.sql b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.sql
index 4259410..51277bd 100644
--- a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.sql
+++ b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_14.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: ho_s_14.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.xml b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.xml
index 8e884cf..afab1a4 100644
--- a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.xml
+++ b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_14/options.xml b/binsrc/tutorial/hosting/ho_s_14/options.xml
index 8853beb..c84efda 100644
--- a/binsrc/tutorial/hosting/ho_s_14/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_14/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp
index ffe0121..38eab15 100644
--- a/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp
+++ b/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp1.vsp,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: vsp1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/Resource.h b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/Resource.h
index 30489e0..dc52899 100644
--- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/Resource.h
+++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/Resource.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.cpp b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.cpp
index 29028e3..bde0937 100644
--- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.cpp
+++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.h b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.h
index 06c9763..1d1b859 100644
--- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.h
+++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMServer.cpp b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMServer.cpp
index 9f4bc35..377bc79 100644
--- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMServer.cpp
+++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMServer.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.cpp b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.cpp
index a115850..9c8adbb 100644
--- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.cpp
+++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.h b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.h
index d681f6d..1ca46b9 100644
--- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.h
+++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp
index 29028e3..bde0937 100644
--- a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp
+++ b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h
index 06c9763..1d1b859 100644
--- a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h
+++ b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/ho_s_15.sql b/binsrc/tutorial/hosting/ho_s_15/ho_s_15.sql
index 5446f70..d26382b 100644
--- a/binsrc/tutorial/hosting/ho_s_15/ho_s_15.sql
+++ b/binsrc/tutorial/hosting/ho_s_15/ho_s_15.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_15.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: ho_s_15.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/ho_s_15.xml b/binsrc/tutorial/hosting/ho_s_15/ho_s_15.xml
index 97494fa..8deec95 100644
--- a/binsrc/tutorial/hosting/ho_s_15/ho_s_15.xml
+++ b/binsrc/tutorial/hosting/ho_s_15/ho_s_15.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/options.xml b/binsrc/tutorial/hosting/ho_s_15/options.xml
index 190cff7..d456df6 100644
--- a/binsrc/tutorial/hosting/ho_s_15/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_15/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp
index 1449b28..b7c6a21 100644
--- a/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp
+++ b/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp1.vsp,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: vsp1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_16/cgitest.rb b/binsrc/tutorial/hosting/ho_s_16/cgitest.rb
index ac83dc8..44b3235 100644
--- a/binsrc/tutorial/hosting/ho_s_16/cgitest.rb
+++ b/binsrc/tutorial/hosting/ho_s_16/cgitest.rb
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_16/ho_s_16.xml b/binsrc/tutorial/hosting/ho_s_16/ho_s_16.xml
index 1732c11..e2ced03 100644
--- a/binsrc/tutorial/hosting/ho_s_16/ho_s_16.xml
+++ b/binsrc/tutorial/hosting/ho_s_16/ho_s_16.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_16/options.xml b/binsrc/tutorial/hosting/ho_s_16/options.xml
index 5530c4c..4e962dc 100644
--- a/binsrc/tutorial/hosting/ho_s_16/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_16/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_17/ho_s_17.xml b/binsrc/tutorial/hosting/ho_s_17/ho_s_17.xml
index f2816ff..e54a357 100644
--- a/binsrc/tutorial/hosting/ho_s_17/ho_s_17.xml
+++ b/binsrc/tutorial/hosting/ho_s_17/ho_s_17.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_17/options.xml b/binsrc/tutorial/hosting/ho_s_17/options.xml
index e1644bd..67df1ea 100644
--- a/binsrc/tutorial/hosting/ho_s_17/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_17/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs b/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs
index 9670af0..447d78b 100644
--- a/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs
+++ b/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/Point.cs b/binsrc/tutorial/hosting/ho_s_2/Point.cs
index af9b7c4..66fd369 100644
--- a/binsrc/tutorial/hosting/ho_s_2/Point.cs
+++ b/binsrc/tutorial/hosting/ho_s_2/Point.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/ho_s_2.sql b/binsrc/tutorial/hosting/ho_s_2/ho_s_2.sql
index accabb7..0c6a4af 100644
--- a/binsrc/tutorial/hosting/ho_s_2/ho_s_2.sql
+++ b/binsrc/tutorial/hosting/ho_s_2/ho_s_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_2.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: ho_s_2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/ho_s_2.xml b/binsrc/tutorial/hosting/ho_s_2/ho_s_2.xml
index f93577c..1084470 100644
--- a/binsrc/tutorial/hosting/ho_s_2/ho_s_2.xml
+++ b/binsrc/tutorial/hosting/ho_s_2/ho_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/options.xml b/binsrc/tutorial/hosting/ho_s_2/options.xml
index 8853beb..c84efda 100644
--- a/binsrc/tutorial/hosting/ho_s_2/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp
index 08a0c03..156c862 100644
--- a/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp
+++ b/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp1.vsp,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: vsp1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp
index 5fc47eb..157a541 100644
--- a/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp
+++ b/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp2.vsp,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: vsp2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp
index 5aa139f..ee3c584 100644
--- a/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp
+++ b/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp3.vsp,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: vsp3.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp
index 0625965..5c53a22 100644
--- a/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp
+++ b/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp4.vsp,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: vsp4.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/handler.vsp b/binsrc/tutorial/hosting/ho_s_3/handler.vsp
index 9632906..a9b1e5f 100644
--- a/binsrc/tutorial/hosting/ho_s_3/handler.vsp
+++ b/binsrc/tutorial/hosting/ho_s_3/handler.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: handler.vsp,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: handler.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/ho_s_3.sql b/binsrc/tutorial/hosting/ho_s_3/ho_s_3.sql
index 604a274..fd91172 100644
--- a/binsrc/tutorial/hosting/ho_s_3/ho_s_3.sql
+++ b/binsrc/tutorial/hosting/ho_s_3/ho_s_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_3.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: ho_s_3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/ho_s_3.xml b/binsrc/tutorial/hosting/ho_s_3/ho_s_3.xml
index bb84474..6229975 100644
--- a/binsrc/tutorial/hosting/ho_s_3/ho_s_3.xml
+++ b/binsrc/tutorial/hosting/ho_s_3/ho_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/options.xml b/binsrc/tutorial/hosting/ho_s_3/options.xml
index 190cff7..d456df6 100644
--- a/binsrc/tutorial/hosting/ho_s_3/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs b/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs
index 3d6f7f3..fb56bd5 100644
--- a/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs
+++ b/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs b/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs
index 403d0e0..fa51f98 100644
--- a/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs
+++ b/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp b/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp
index 7f6aabc..7239811 100644
--- a/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp
+++ b/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: setup_sms.vsp,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: setup_sms.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html
index ccb7971..7df6cb8 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html
index ec8e076..a1c4602 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html
index 3919428..81135b9 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html
index 89f6e1d..8e01221 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/activity_log.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/activity_log.php
index 27bac96..e1842e0 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/activity_log.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/activity_log.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/add_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/add_entry.php
index b3a8f67..8b91e47 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/add_entry.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/add_entry.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php
index a47d4fa..8bb20ec 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin_handler.php
index d630432..0d898d0 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/approve_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/approve_entry.php
index cc6230d..66da63e 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/approve_entry.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/approve_entry.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit.php
index a3c2aee..a054aa6 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit_handler.php
index a8a6005..83c884f 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php
index 785e86e..6b0f9ac 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category_handler.php
index b7d94f8..11c90cc 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php
index deb5f97..3c87373 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php
index c0e1198..afd10b1 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php
index 92b2283..31e4cb6 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_entry.php
index 0da9448..0fb9a3a 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_entry.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_entry.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_layer.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_layer.php
index a44e978..b1f4f5f 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_layer.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_layer.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/docs/php2html.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/docs/php2html.pl
index 6f18282..4f09992 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/docs/php2html.pl
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/docs/php2html.pl
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/drop-tables-odbc.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/drop-tables-odbc.sql
index 1dee38d..693dc7e 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/drop-tables-odbc.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/drop-tables-odbc.sql
@@ -1,10 +1,10 @@
--
--- $Id: drop-tables-odbc.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: drop-tables-odbc.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry.php
index e0bdb21..90fff47 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry_handler.php
index 449eab0..6350e83 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer.php
index b87a698..0412857 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer_handler.php
index 4c45219..9c15409 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user.php
index 30bf448..ee263e5 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user_handler.php
index 751cf80..851d5ea 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php
index e3d40ca..a5fe899 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export_handler.php
index 755e2e5..aac0d6c 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit.php
index 0d6ce18..d8bbac9 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit_handler.php
index 65318fa..d6089bc 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php
index 1275250..73a0f57 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_admin.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_admin.php
index ccd7243..022d7bc 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_admin.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_admin.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_bug.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_bug.php
index 96e6595..7f7d4e9 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_bug.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_bug.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_edit_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_edit_entry.php
index cdcfb7a..0c8a241 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_edit_entry.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_edit_entry.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_index.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_index.php
index 4db3f9f..a54ce81 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_index.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_index.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_layers.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_layers.php
index d0db2e9..c1cd0fa 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_layers.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_layers.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_pref.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_pref.php
index 7959932..e51311a 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_pref.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_pref.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/config.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/config.php
index 2c0370f..862c86a 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/config.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/config.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/connect.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/connect.php
index 112c8b5..99ff8e9 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/connect.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/connect.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/dbtable.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/dbtable.php
index c13dc9d..ffcd2dd 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/dbtable.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/dbtable.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/functions.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/functions.php
index a4d21c8..1495ca8 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/functions.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/functions.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/help_trailer.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/help_trailer.php
index d8bdf6e..6b73e26 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/help_trailer.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/help_trailer.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.html
index c42a44a..d39874c 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.html
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.php
index a4e9f3c..e7ecf5a 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/js.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/js.php
index 03853cd..a95bc1d 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/js.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/js.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/php-dbi.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/php-dbi.php
index 85db5fe..8a0029c 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/php-dbi.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/php-dbi.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/site_extras.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/site_extras.php
index 91da199..b31484c 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/site_extras.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/site_extras.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/styles.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/styles.php
index dfbfda3..b1c9e5b 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/styles.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/styles.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/trailer.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/trailer.php
index b0334b6..baa9c0c 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/trailer.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/trailer.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/translate.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/translate.php
index b217ff3..17b36f4 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/translate.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/translate.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-ldap.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-ldap.php
index 797e96d..08657db 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-ldap.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-ldap.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-nis.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-nis.php
index 85fe593..5f13a65 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-nis.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-nis.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user.php
index 28f90d3..db52d84 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/validate.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/validate.php
index feea5d7..74c4d9b 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/validate.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/validate.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php
index c9cabbb..13b0a49 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php
index 200e06c..bae0678 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers_toggle.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers_toggle.php
index 9e2985b..b520590 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers_toggle.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers_toggle.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/list_unapproved.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/list_unapproved.php
index 3cdc6cb..30d384d 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/list_unapproved.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/list_unapproved.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php
index bfa172f..426f5d9 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php
index 404137f..3680e85 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php
index 46fe923..681ecf8 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref_handler.php
index 8972d37..0a200a3 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php
index ab8b573..81e2f58 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/reject_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/reject_entry.php
index 994f1d0..e0343a9 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/reject_entry.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/reject_entry.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php
index 27e614a..17c72e7 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search_handler.php
index 0e57796..2c76909 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/select_user.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/select_user.php
index 7e47fd5..2736bf1 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/select_user.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/select_user.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/set_entry_cat.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/set_entry_cat.php
index ff1d4e7..b9f806f 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/set_entry_cat.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/set_entry_cat.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-db2.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-db2.sql
index 4fd3b49..e0964c2 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-db2.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-db2.sql
@@ -1,10 +1,10 @@
--
--- $Id: tables-db2.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: tables-db2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-ibase.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-ibase.sql
index 3be7e08..25f60cd 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-ibase.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-ibase.sql
@@ -1,10 +1,10 @@
--
--- $Id: tables-ibase.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: tables-ibase.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-mysql.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-mysql.sql
index 235e0da..76093f0 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-mysql.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-mysql.sql
@@ -1,10 +1,10 @@
--
--- $Id: tables-mysql.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: tables-mysql.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-odbc.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-odbc.sql
index a699a67..464615a 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-odbc.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-odbc.sql
@@ -1,10 +1,10 @@
--
--- $Id: tables-odbc.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: tables-odbc.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-oracle.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-oracle.sql
index 76ad421..fdd3d9e 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-oracle.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-oracle.sql
@@ -1,10 +1,10 @@
--
--- $Id: tables-oracle.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: tables-oracle.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-postgres.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-postgres.sql
index 5200705..dcf2b43 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-postgres.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-postgres.sql
@@ -1,10 +1,10 @@
--
--- $Id: tables-postgres.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: tables-postgres.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/check_translation.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/check_translation.pl
index d43484f..7ee3cae 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/check_translation.pl
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/check_translation.pl
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/send_reminders.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/send_reminders.php
index 34076f0..d6a5ae9 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/send_reminders.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/send_reminders.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/translation_summary.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/translation_summary.pl
index 458c848..0be489a 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/translation_summary.pl
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/translation_summary.pl
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_all.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_all.pl
index 1026273..eb15a55 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_all.pl
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_all.pl
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_translation.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_translation.pl
index 5e0acf7..dd93f89 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_translation.pl
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_translation.pl
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/upgrade_to_0.9.7.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/upgrade_to_0.9.7.pl
index 0f306b6..8f5b53d 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/upgrade_to_0.9.7.pl
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/upgrade_to_0.9.7.pl
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php
index 9ba1d2f..dcaad97 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php
index dde7e80..8c34160 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_entry.php
index 6409f2e..4cfe2ee 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_entry.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_entry.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_m.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_m.php
index 68b5671..6087be8 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_m.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_m.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_v.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_v.php
index 8c55e6d..9e99fe9 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_v.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_v.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_w.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_w.php
index 7a6336b..3073255 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_w.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_w.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php
index d0a1853..1750bfa 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit.php
index 660ccdb..936e6b5 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit_handler.php
index 848a56c..a7147b2 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit_handler.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit_handler.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php
index a23eff3..c11bc5d 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_details.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_details.php
index 14ac3dc..8a43c8b 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_details.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_details.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_ssi.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_ssi.php
index 0427a04..7bd6a75 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_ssi.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_ssi.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php
index b8fd862..f9445da 100644
--- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php
+++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/create_local_dsn.sql b/binsrc/tutorial/hosting/ho_s_30/create_local_dsn.sql
index 3bd3028..5725b7b 100644
--- a/binsrc/tutorial/hosting/ho_s_30/create_local_dsn.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/create_local_dsn.sql
@@ -1,10 +1,10 @@
--
--- $Id: create_local_dsn.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: create_local_dsn.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/ho_s_30.sql b/binsrc/tutorial/hosting/ho_s_30/ho_s_30.sql
index 92eb8da..8a42a76 100644
--- a/binsrc/tutorial/hosting/ho_s_30/ho_s_30.sql
+++ b/binsrc/tutorial/hosting/ho_s_30/ho_s_30.sql
@@ -1,10 +1,10 @@
--
--- $Id: ho_s_30.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: ho_s_30.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/ho_s_30.xml b/binsrc/tutorial/hosting/ho_s_30/ho_s_30.xml
index 5fa51c1..9077056 100644
--- a/binsrc/tutorial/hosting/ho_s_30/ho_s_30.xml
+++ b/binsrc/tutorial/hosting/ho_s_30/ho_s_30.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php b/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php
index 0fb37c1..11b27ae 100644
--- a/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php
+++ b/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/options.xml b/binsrc/tutorial/hosting/ho_s_30/options.xml
index f2efd0e..111919d 100644
--- a/binsrc/tutorial/hosting/ho_s_30/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_30/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_30/webcalendar.php b/binsrc/tutorial/hosting/ho_s_30/webcalendar.php
index bbde43c..cbccd80 100644
--- a/binsrc/tutorial/hosting/ho_s_30/webcalendar.php
+++ b/binsrc/tutorial/hosting/ho_s_30/webcalendar.php
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/handler.vspx b/binsrc/tutorial/hosting/ho_s_4/handler.vspx
index d1faa25..06fd0ed 100644
--- a/binsrc/tutorial/hosting/ho_s_4/handler.vspx
+++ b/binsrc/tutorial/hosting/ho_s_4/handler.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: handler.vspx,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+ - $Id: handler.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/ho_s_4.xml b/binsrc/tutorial/hosting/ho_s_4/ho_s_4.xml
index d53f1e9..92eaf1a 100644
--- a/binsrc/tutorial/hosting/ho_s_4/ho_s_4.xml
+++ b/binsrc/tutorial/hosting/ho_s_4/ho_s_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/options.xml b/binsrc/tutorial/hosting/ho_s_4/options.xml
index 39a9569..8443e83 100644
--- a/binsrc/tutorial/hosting/ho_s_4/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs
index 3d6f7f3..fb56bd5 100644
--- a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs
+++ b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql
index 048d621..cadbcbe 100644
--- a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql
+++ b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql
@@ -1,10 +1,10 @@
--
--- $Id: redcoalsms.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: redcoalsms.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs b/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs
index 403d0e0..fa51f98 100644
--- a/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs
+++ b/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx b/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx
index 7b4350a..b02f867 100644
--- a/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx
+++ b/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: setup_sms.vspx,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+ - $Id: setup_sms.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/handler.vspx b/binsrc/tutorial/hosting/ho_s_5/handler.vspx
index 7befe47..c3e4909 100644
--- a/binsrc/tutorial/hosting/ho_s_5/handler.vspx
+++ b/binsrc/tutorial/hosting/ho_s_5/handler.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: handler.vspx,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+ - $Id: handler.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/ho_s_5.xml b/binsrc/tutorial/hosting/ho_s_5/ho_s_5.xml
index f6f91dc..85d2ae2 100644
--- a/binsrc/tutorial/hosting/ho_s_5/ho_s_5.xml
+++ b/binsrc/tutorial/hosting/ho_s_5/ho_s_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/options.xml b/binsrc/tutorial/hosting/ho_s_5/options.xml
index 13c20b7..555b1c2 100644
--- a/binsrc/tutorial/hosting/ho_s_5/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_5/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs
index 1cd9509..5de9aea 100644
--- a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs
+++ b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql
index ec03ba0..5efa9a9 100644
--- a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql
+++ b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql
@@ -1,10 +1,10 @@
--
--- $Id: redcoalsms_dom.sql,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+-- $Id: redcoalsms_dom.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx b/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx
index 14e876f..7cf1629 100644
--- a/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx
+++ b/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: setup_sms.vspx,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+ - $Id: setup_sms.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/admin_style.css b/binsrc/tutorial/hosting/ho_s_6/admin_style.css
index d556af1..c91cdf1 100644
--- a/binsrc/tutorial/hosting/ho_s_6/admin_style.css
+++ b/binsrc/tutorial/hosting/ho_s_6/admin_style.css
@@ -1,10 +1,10 @@
/*
- * $Id: admin_style.css,v 1.2.2.1 2012/03/08 12:55:12 source Exp $
+ * $Id: admin_style.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/button.aspx b/binsrc/tutorial/hosting/ho_s_6/button.aspx
index 813d8c0..99cb6f8 100644
--- a/binsrc/tutorial/hosting/ho_s_6/button.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/button.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/calendar.aspx b/binsrc/tutorial/hosting/ho_s_6/calendar.aspx
index 939e4a4..d376aee 100644
--- a/binsrc/tutorial/hosting/ho_s_6/calendar.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/calendar.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/code-render.aspx b/binsrc/tutorial/hosting/ho_s_6/code-render.aspx
index f3002e1..dcaee91 100644
--- a/binsrc/tutorial/hosting/ho_s_6/code-render.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/code-render.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx
index f495e60..9e251ec 100644
--- a/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx
index 09fc59f..1c99fd5 100644
--- a/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx
index 25d5a1a..35ffe27 100644
--- a/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx
index f3a8aec..5227f33 100644
--- a/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/ho_s_6.xml b/binsrc/tutorial/hosting/ho_s_6/ho_s_6.xml
index ed7d2be..14e073a 100644
--- a/binsrc/tutorial/hosting/ho_s_6/ho_s_6.xml
+++ b/binsrc/tutorial/hosting/ho_s_6/ho_s_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx
index b5caedc..f836c35 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx
index 33488bb..649c1af 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx
index 33e5c8b..11961a1 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx
index f866efe..4cf24a0 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx
index 7286ccf..d424a9a 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx
index d21a272..de84df5 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx
index 7ac3c97..e650764 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx
index 3c6c9c3..599c2f0 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx
index 82b12c0..12f1ef9 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx
index e70d912..54f941c 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx
index 31a1cd8..07a9c86 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx
index fb9aa5b..9caf958 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx b/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx
index 1282341..5743f9d 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx b/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx
index 3ed5f3c..e9109d1 100644
--- a/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/listitem.aspx b/binsrc/tutorial/hosting/ho_s_6/listitem.aspx
index 388319a..c867787 100644
--- a/binsrc/tutorial/hosting/ho_s_6/listitem.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/listitem.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/options.xml b/binsrc/tutorial/hosting/ho_s_6/options.xml
index e7e0021..cb264f2 100644
--- a/binsrc/tutorial/hosting/ho_s_6/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_6/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/server-side-object.aspx b/binsrc/tutorial/hosting/ho_s_6/server-side-object.aspx
index 6f2949e..5f9d7ed 100644
--- a/binsrc/tutorial/hosting/ho_s_6/server-side-object.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/server-side-object.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/session1.aspx b/binsrc/tutorial/hosting/ho_s_6/session1.aspx
index 3106e75..f74f63d 100644
--- a/binsrc/tutorial/hosting/ho_s_6/session1.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/session1.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx
index ee39a9c..2d489f9 100644
--- a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs
index 3f86c6b..287d75b 100644
--- a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs
+++ b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx
index 7411405..5bb3004 100644
--- a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs
index d402caa..b699adb 100644
--- a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs
+++ b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/temperature.aspx b/binsrc/tutorial/hosting/ho_s_6/temperature.aspx
index c305415..7daddae 100644
--- a/binsrc/tutorial/hosting/ho_s_6/temperature.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/temperature.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/validator1.aspx b/binsrc/tutorial/hosting/ho_s_6/validator1.aspx
index addc685..30edd84 100644
--- a/binsrc/tutorial/hosting/ho_s_6/validator1.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/validator1.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx
index 5d3326c..2413c94 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml
index 8dab32f..e5aecf6 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml
+++ b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_button.aspx b/binsrc/tutorial/hosting/ho_s_6/web_button.aspx
index bc4e12a..963fe33 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_button.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_button.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx
index 475b460..bbd0919 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx
index e86a0b3..636e962 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx
index a468a20..ad85d08 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx b/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx
index 4ed38a7..b74983b 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_image.aspx b/binsrc/tutorial/hosting/ho_s_6/web_image.aspx
index 8a671b0..4fd0cd4 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_image.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_image.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx
index 6336753..317d5b3 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_label.aspx b/binsrc/tutorial/hosting/ho_s_6/web_label.aspx
index efd81b4..a37bf37 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_label.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_label.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx
index d67f265..33598df 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx
index d1f7c7b..899dc58 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx b/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx
index 229e687..36e8104 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx b/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx
index 4ca8458..5a7c3bb 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx b/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx
index 1145c33..549c377 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx
index d513d54..58033d9 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx
index c128f74..bd64312 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx b/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx
index 33758db..b41643c 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_table.aspx b/binsrc/tutorial/hosting/ho_s_6/web_table.aspx
index e912e87..100df60 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_table.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_table.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx
index 830d7f0..813628f 100644
--- a/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx
+++ b/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx b/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx
index e5193d1..7cb0961 100644
--- a/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx
+++ b/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql b/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql
index b011bf4..fefc649 100644
--- a/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql
+++ b/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql
@@ -1,10 +1,10 @@
--
--- $Id: VirtSample.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: VirtSample.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_7/ho_s_7.xml b/binsrc/tutorial/hosting/ho_s_7/ho_s_7.xml
index 834d829..e7c7e00 100644
--- a/binsrc/tutorial/hosting/ho_s_7/ho_s_7.xml
+++ b/binsrc/tutorial/hosting/ho_s_7/ho_s_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_7/options.xml b/binsrc/tutorial/hosting/ho_s_7/options.xml
index bc9443f..6d6e8d6 100644
--- a/binsrc/tutorial/hosting/ho_s_7/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_7/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_8/cgi.pl b/binsrc/tutorial/hosting/ho_s_8/cgi.pl
index e97667e..8d64af0 100644
--- a/binsrc/tutorial/hosting/ho_s_8/cgi.pl
+++ b/binsrc/tutorial/hosting/ho_s_8/cgi.pl
@@ -3,7 +3,7 @@ use CGI qw/:standard/;
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_8/cgidb.pl b/binsrc/tutorial/hosting/ho_s_8/cgidb.pl
index 61b28a8..c262657 100644
--- a/binsrc/tutorial/hosting/ho_s_8/cgidb.pl
+++ b/binsrc/tutorial/hosting/ho_s_8/cgidb.pl
@@ -3,7 +3,7 @@ use CGI qw/:standard :html3 :all *table/;
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_8/ho_s_8.xml b/binsrc/tutorial/hosting/ho_s_8/ho_s_8.xml
index 4455d70..8a01f94 100644
--- a/binsrc/tutorial/hosting/ho_s_8/ho_s_8.xml
+++ b/binsrc/tutorial/hosting/ho_s_8/ho_s_8.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_8/options.xml b/binsrc/tutorial/hosting/ho_s_8/options.xml
index cbc0fab..acda4fa 100644
--- a/binsrc/tutorial/hosting/ho_s_8/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_8/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_9/cgitest.py b/binsrc/tutorial/hosting/ho_s_9/cgitest.py
index 9726c99..7c30c87 100644
--- a/binsrc/tutorial/hosting/ho_s_9/cgitest.py
+++ b/binsrc/tutorial/hosting/ho_s_9/cgitest.py
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_9/ho_s_9.xml b/binsrc/tutorial/hosting/ho_s_9/ho_s_9.xml
index 8bf595a..4c8faca 100644
--- a/binsrc/tutorial/hosting/ho_s_9/ho_s_9.xml
+++ b/binsrc/tutorial/hosting/ho_s_9/ho_s_9.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/ho_s_9/options.xml b/binsrc/tutorial/hosting/ho_s_9/options.xml
index 3d33c4c..4660a26 100644
--- a/binsrc/tutorial/hosting/ho_s_9/options.xml
+++ b/binsrc/tutorial/hosting/ho_s_9/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/hosting/index.xml b/binsrc/tutorial/hosting/index.xml
index c630713..2552572 100644
--- a/binsrc/tutorial/hosting/index.xml
+++ b/binsrc/tutorial/hosting/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/demo.css b/binsrc/tutorial/intprot/demo.css
index 6425c39..fed097d 100644
--- a/binsrc/tutorial/intprot/demo.css
+++ b/binsrc/tutorial/intprot/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+ * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/index.xml b/binsrc/tutorial/intprot/index.xml
index e518b47..7fec117 100644
--- a/binsrc/tutorial/intprot/index.xml
+++ b/binsrc/tutorial/intprot/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/nn_s_1/nn_s_1.xml b/binsrc/tutorial/intprot/nn_s_1/nn_s_1.xml
index 3bd6a6a..2995dbc 100644
--- a/binsrc/tutorial/intprot/nn_s_1/nn_s_1.xml
+++ b/binsrc/tutorial/intprot/nn_s_1/nn_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/nn_s_1/nn_s_1_sample_1.vsp b/binsrc/tutorial/intprot/nn_s_1/nn_s_1_sample_1.vsp
index 623d268..0b12104 100644
--- a/binsrc/tutorial/intprot/nn_s_1/nn_s_1_sample_1.vsp
+++ b/binsrc/tutorial/intprot/nn_s_1/nn_s_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: nn_s_1_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: nn_s_1_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/nn_s_2/nn_s_2.xml b/binsrc/tutorial/intprot/nn_s_2/nn_s_2.xml
index 3391d07..99e3a36 100644
--- a/binsrc/tutorial/intprot/nn_s_2/nn_s_2.xml
+++ b/binsrc/tutorial/intprot/nn_s_2/nn_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/nn_s_2/nn_s_2_sample_1.vsp b/binsrc/tutorial/intprot/nn_s_2/nn_s_2_sample_1.vsp
index 761dcf5..49fa72e 100644
--- a/binsrc/tutorial/intprot/nn_s_2/nn_s_2_sample_1.vsp
+++ b/binsrc/tutorial/intprot/nn_s_2/nn_s_2_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: nn_s_2_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: nn_s_2_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_1/sm_s_1.xml b/binsrc/tutorial/intprot/sm_s_1/sm_s_1.xml
index 1c2b8e4..322924d 100644
--- a/binsrc/tutorial/intprot/sm_s_1/sm_s_1.xml
+++ b/binsrc/tutorial/intprot/sm_s_1/sm_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_1/sm_s_1_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_1/sm_s_1_sample_1.vsp
index 09abf5a..e71f3e3 100644
--- a/binsrc/tutorial/intprot/sm_s_1/sm_s_1_sample_1.vsp
+++ b/binsrc/tutorial/intprot/sm_s_1/sm_s_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sm_s_1_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_1_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_2/sm_s_2.xml b/binsrc/tutorial/intprot/sm_s_2/sm_s_2.xml
index 2da6cd9..205feba 100644
--- a/binsrc/tutorial/intprot/sm_s_2/sm_s_2.xml
+++ b/binsrc/tutorial/intprot/sm_s_2/sm_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_3/sm_s_3.sql b/binsrc/tutorial/intprot/sm_s_3/sm_s_3.sql
index 451bb97..d3cb13f 100644
--- a/binsrc/tutorial/intprot/sm_s_3/sm_s_3.sql
+++ b/binsrc/tutorial/intprot/sm_s_3/sm_s_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: sm_s_3.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_3/sm_s_3.xml b/binsrc/tutorial/intprot/sm_s_3/sm_s_3.xml
index d49d3a3..f57d5ae 100644
--- a/binsrc/tutorial/intprot/sm_s_3/sm_s_3.xml
+++ b/binsrc/tutorial/intprot/sm_s_3/sm_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_4/sm_s_4.sql b/binsrc/tutorial/intprot/sm_s_4/sm_s_4.sql
index 408b468..bd9ae79 100644
--- a/binsrc/tutorial/intprot/sm_s_4/sm_s_4.sql
+++ b/binsrc/tutorial/intprot/sm_s_4/sm_s_4.sql
@@ -1,10 +1,10 @@
--
--- $Id: sm_s_4.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_4.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_4/sm_s_4.xml b/binsrc/tutorial/intprot/sm_s_4/sm_s_4.xml
index e95edbb..4639839 100644
--- a/binsrc/tutorial/intprot/sm_s_4/sm_s_4.xml
+++ b/binsrc/tutorial/intprot/sm_s_4/sm_s_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_4/sm_s_4_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_4/sm_s_4_sample_1.vsp
index 3407b75..5a4de8a 100644
--- a/binsrc/tutorial/intprot/sm_s_4/sm_s_4_sample_1.vsp
+++ b/binsrc/tutorial/intprot/sm_s_4/sm_s_4_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sm_s_4_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_4_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_5/options.xml b/binsrc/tutorial/intprot/sm_s_5/options.xml
index a85e679..ce0933f 100644
--- a/binsrc/tutorial/intprot/sm_s_5/options.xml
+++ b/binsrc/tutorial/intprot/sm_s_5/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5.sql b/binsrc/tutorial/intprot/sm_s_5/sm_s_5.sql
index 168a29d..8df8fb9 100644
--- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5.sql
+++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5.sql
@@ -1,10 +1,10 @@
--
--- $Id: sm_s_5.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_5.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5.xml b/binsrc/tutorial/intprot/sm_s_5/sm_s_5.xml
index 703c3e6..a335451 100644
--- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5.xml
+++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_1.vsp
index d4cdb29..4823fa9 100644
--- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_1.vsp
+++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sm_s_5_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_5_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_2.vsp b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_2.vsp
index 1486103..82c6ff1 100644
--- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_2.vsp
+++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sm_s_5_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_5_sample_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_3.vsp b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_3.vsp
index ef6a0bb..53e083e 100644
--- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_3.vsp
+++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sm_s_5_sample_3.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_5_sample_3.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_6/sm_s_6.xml b/binsrc/tutorial/intprot/sm_s_6/sm_s_6.xml
index fb3c2d8..8f88fa2 100644
--- a/binsrc/tutorial/intprot/sm_s_6/sm_s_6.xml
+++ b/binsrc/tutorial/intprot/sm_s_6/sm_s_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_6/sm_s_6_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_6/sm_s_6_sample_1.vsp
index feb6450..57b78ca 100644
--- a/binsrc/tutorial/intprot/sm_s_6/sm_s_6_sample_1.vsp
+++ b/binsrc/tutorial/intprot/sm_s_6/sm_s_6_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sm_s_6_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_6_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_7/sm_s_7.xml b/binsrc/tutorial/intprot/sm_s_7/sm_s_7.xml
index 115ec5c..dd015b2 100644
--- a/binsrc/tutorial/intprot/sm_s_7/sm_s_7.xml
+++ b/binsrc/tutorial/intprot/sm_s_7/sm_s_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/intprot/sm_s_7/sm_s_7_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_7/sm_s_7_sample_1.vsp
index 6380f62..d330ac0 100644
--- a/binsrc/tutorial/intprot/sm_s_7/sm_s_7_sample_1.vsp
+++ b/binsrc/tutorial/intprot/sm_s_7/sm_s_7_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sm_s_7_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: sm_s_7_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/linkeddata/index.xml b/binsrc/tutorial/linkeddata/index.xml
index 62dcf9e..38087d3 100644
--- a/binsrc/tutorial/linkeddata/index.xml
+++ b/binsrc/tutorial/linkeddata/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/tutorial/linkeddata/sem_s_1/options.xml b/binsrc/tutorial/linkeddata/sem_s_1/options.xml
index bb21991..43e2472 100755
--- a/binsrc/tutorial/linkeddata/sem_s_1/options.xml
+++ b/binsrc/tutorial/linkeddata/sem_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/tutorial/linkeddata/sem_s_1/sem_s_1.xml b/binsrc/tutorial/linkeddata/sem_s_1/sem_s_1.xml
index 62ec04c..b751be0 100755
--- a/binsrc/tutorial/linkeddata/sem_s_1/sem_s_1.xml
+++ b/binsrc/tutorial/linkeddata/sem_s_1/sem_s_1.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/tutorial/make_tutorial_dav_vad.xml b/binsrc/tutorial/make_tutorial_dav_vad.xml
index d8fe383..e5e081e 100644
--- a/binsrc/tutorial/make_tutorial_dav_vad.xml
+++ b/binsrc/tutorial/make_tutorial_dav_vad.xml
@@ -5,12 +5,12 @@
<name package="tutorial">
<prop name="Title" value="Virtuoso Developer Tutorial"/>
<prop name="Developer" value="OpenLink Software"/>
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software"/>
<prop name="Download" value="http://www.openlinksw.com/virtuoso"/>
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso"/>
</name>
<version package="1.00.6878">
- <prop name="Release Date" value="2012-03-13 01:45"/>
+ <prop name="Release Date" value="2011-10-28 19:33"/>
<prop name="Build" value="Release"/>
</version>
</caption>
diff --git a/binsrc/tutorial/make_tutorial_fs_vad.xml b/binsrc/tutorial/make_tutorial_fs_vad.xml
index d77ec0a..3b41f54 100644
--- a/binsrc/tutorial/make_tutorial_fs_vad.xml
+++ b/binsrc/tutorial/make_tutorial_fs_vad.xml
@@ -5,12 +5,12 @@
<name package="tutorial">
<prop name="Title" value="Virtuoso Developer Tutorial"/>
<prop name="Developer" value="OpenLink Software"/>
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software"/>
<prop name="Download" value="http://www.openlinksw.com/virtuoso"/>
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso"/>
</name>
<version package="1.00.6878">
- <prop name="Release Date" value="2012-03-13 01:45"/>
+ <prop name="Release Date" value="2011-10-28 19:32"/>
<prop name="Build" value="Release"/>
</version>
</caption>
diff --git a/binsrc/tutorial/make_vad.sh b/binsrc/tutorial/make_vad.sh
index 8b9620a..e365f45 100755
--- a/binsrc/tutorial/make_vad.sh
+++ b/binsrc/tutorial/make_vad.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: make_vad.sh,v 1.20.2.6 2012/03/05 11:47:07 source Exp $
+# $Id: make_vad.sh,v 1.20.2.5 2011/07/20 09:50:18 source Exp $
# ----------------------------------------------------------------------
# Fix issues with LOCALE
@@ -336,7 +336,7 @@ sticker_init() {
echo " <name package=\"tutorial\">" >> $STICKER
echo " <prop name=\"Title\" value=\"Virtuoso Developer Tutorial\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/tutorial/page.xsl b/binsrc/tutorial/page.xsl
index 5fb50ab..e04b076 100644
--- a/binsrc/tutorial/page.xsl
+++ b/binsrc/tutorial/page.xsl
@@ -9,7 +9,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/page_common.xsl b/binsrc/tutorial/page_common.xsl
index 4c4cf53..76e2023 100644
--- a/binsrc/tutorial/page_common.xsl
+++ b/binsrc/tutorial/page_common.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: page_common.xsl,v 1.4.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: page_common.xsl,v 1.4 2006/09/25 14:38:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/page_html_common.xsl b/binsrc/tutorial/page_html_common.xsl
index 90bd7d7..ba0d8c5 100644
--- a/binsrc/tutorial/page_html_common.xsl
+++ b/binsrc/tutorial/page_html_common.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: page_html_common.xsl,v 1.1.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: page_html_common.xsl,v 1.1 2006/10/11 07:52:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/page_ocs_output.xsl b/binsrc/tutorial/page_ocs_output.xsl
index 1cdf87f..796658e 100644
--- a/binsrc/tutorial/page_ocs_output.xsl
+++ b/binsrc/tutorial/page_ocs_output.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: page_ocs_output.xsl,v 1.4.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: page_ocs_output.xsl,v 1.4 2006/09/25 14:38:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/page_opml_output.xsl b/binsrc/tutorial/page_opml_output.xsl
index 8076aca..6151b08 100644
--- a/binsrc/tutorial/page_opml_output.xsl
+++ b/binsrc/tutorial/page_opml_output.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: page_opml_output.xsl,v 1.4.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: page_opml_output.xsl,v 1.4 2006/09/25 14:38:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/page_rss_output.xsl b/binsrc/tutorial/page_rss_output.xsl
index e53c150..249b5a7 100644
--- a/binsrc/tutorial/page_rss_output.xsl
+++ b/binsrc/tutorial/page_rss_output.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: page_rss_output.xsl,v 1.4.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: page_rss_output.xsl,v 1.4 2006/09/25 14:38:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/page_sioc_output.xsl b/binsrc/tutorial/page_sioc_output.xsl
index e5ba4de..9caf2bf 100644
--- a/binsrc/tutorial/page_sioc_output.xsl
+++ b/binsrc/tutorial/page_sioc_output.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: page_sioc_output.xsl,v 1.6.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: page_sioc_output.xsl,v 1.6 2007/05/09 10:49:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf.vsp b/binsrc/tutorial/rdf.vsp
index 362b1a8..6f07211 100644
--- a/binsrc/tutorial/rdf.vsp
+++ b/binsrc/tutorial/rdf.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: rdf.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: rdf.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/fs_s_1/foaf_ssl_client.vsp b/binsrc/tutorial/rdf/fs_s_1/foaf_ssl_client.vsp
index 4743d6e..1299cc5 100644
--- a/binsrc/tutorial/rdf/fs_s_1/foaf_ssl_client.vsp
+++ b/binsrc/tutorial/rdf/fs_s_1/foaf_ssl_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: foaf_ssl_client.vsp,v 1.1.4.3 2012/03/08 12:55:13 source Exp $
+-- $Id: foaf_ssl_client.vsp,v 1.1.4.2 2010/04/26 07:56:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2010 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
diff --git a/binsrc/tutorial/rdf/fs_s_1/fs_s_1.xml b/binsrc/tutorial/rdf/fs_s_1/fs_s_1.xml
index 3c35a41..af23946 100644
--- a/binsrc/tutorial/rdf/fs_s_1/fs_s_1.xml
+++ b/binsrc/tutorial/rdf/fs_s_1/fs_s_1.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- - $Id: fs_s_1.xml,v 1.1.4.3 2012/03/08 12:55:13 source Exp $
+ - $Id: fs_s_1.xml,v 1.1.4.2 2010/04/26 07:56:09 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp b/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp
index 919c25f..cc50747 100644
--- a/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp
+++ b/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register_cert.vsp,v 1.1.4.3 2012/03/08 12:55:13 source Exp $
+-- $Id: register_cert.vsp,v 1.1.4.2 2010/04/26 07:56:09 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2010 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
diff --git a/binsrc/tutorial/rdf/index.xml b/binsrc/tutorial/rdf/index.xml
index 61b6f3b..8df5ed8 100644
--- a/binsrc/tutorial/rdf/index.xml
+++ b/binsrc/tutorial/rdf/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rd_s_1/options.xml b/binsrc/tutorial/rdf/rd_s_1/options.xml
index 300e870..e306635 100644
--- a/binsrc/tutorial/rdf/rd_s_1/options.xml
+++ b/binsrc/tutorial/rdf/rd_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rd_s_1/rd_s_1.xml b/binsrc/tutorial/rdf/rd_s_1/rd_s_1.xml
index 400ff66..8ed610f 100644
--- a/binsrc/tutorial/rdf/rd_s_1/rd_s_1.xml
+++ b/binsrc/tutorial/rdf/rd_s_1/rd_s_1.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rd_s_2/options.xml b/binsrc/tutorial/rdf/rd_s_2/options.xml
index 81f058f..2cb2ee1 100644
--- a/binsrc/tutorial/rdf/rd_s_2/options.xml
+++ b/binsrc/tutorial/rdf/rd_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rd_s_2/rd_s_2.xml b/binsrc/tutorial/rdf/rd_s_2/rd_s_2.xml
index 3fb57bc..13e26d2 100644
--- a/binsrc/tutorial/rdf/rd_s_2/rd_s_2.xml
+++ b/binsrc/tutorial/rdf/rd_s_2/rd_s_2.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/ri_s_1/options.xml b/binsrc/tutorial/rdf/ri_s_1/options.xml
index 68d7065..8ef4e14 100644
--- a/binsrc/tutorial/rdf/ri_s_1/options.xml
+++ b/binsrc/tutorial/rdf/ri_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/ri_s_1/ri_s_1.xml b/binsrc/tutorial/rdf/ri_s_1/ri_s_1.xml
index d1673ad..4a111b0 100644
--- a/binsrc/tutorial/rdf/ri_s_1/ri_s_1.xml
+++ b/binsrc/tutorial/rdf/ri_s_1/ri_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rq_s_2/create_local_dsn.sql b/binsrc/tutorial/rdf/rq_s_2/create_local_dsn.sql
index a85335d..a06f908 100644
--- a/binsrc/tutorial/rdf/rq_s_2/create_local_dsn.sql
+++ b/binsrc/tutorial/rdf/rq_s_2/create_local_dsn.sql
@@ -1,10 +1,10 @@
--
--- $Id: create_local_dsn.sql,v 1.3.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: create_local_dsn.sql,v 1.3 2007/05/04 11:24:48 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rq_s_2/options.xml b/binsrc/tutorial/rdf/rq_s_2/options.xml
index f2efd0e..111919d 100644
--- a/binsrc/tutorial/rdf/rq_s_2/options.xml
+++ b/binsrc/tutorial/rdf/rq_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rq_s_2/rq_s_2.xml b/binsrc/tutorial/rdf/rq_s_2/rq_s_2.xml
index d143336..009b44a 100644
--- a/binsrc/tutorial/rdf/rq_s_2/rq_s_2.xml
+++ b/binsrc/tutorial/rdf/rq_s_2/rq_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rq_s_2/sparql_query.php b/binsrc/tutorial/rdf/rq_s_2/sparql_query.php
index 328b396..1aec1b9 100644
--- a/binsrc/tutorial/rdf/rq_s_2/sparql_query.php
+++ b/binsrc/tutorial/rdf/rq_s_2/sparql_query.php
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rq_s_3/create_local_dsn.sql b/binsrc/tutorial/rdf/rq_s_3/create_local_dsn.sql
index 2dde6e1..e07b154 100644
--- a/binsrc/tutorial/rdf/rq_s_3/create_local_dsn.sql
+++ b/binsrc/tutorial/rdf/rq_s_3/create_local_dsn.sql
@@ -1,10 +1,10 @@
--
--- $Id: create_local_dsn.sql,v 1.1.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: create_local_dsn.sql,v 1.1 2007/05/04 11:24:48 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rq_s_3/options.xml b/binsrc/tutorial/rdf/rq_s_3/options.xml
index b9739cc..486a18d 100644
--- a/binsrc/tutorial/rdf/rq_s_3/options.xml
+++ b/binsrc/tutorial/rdf/rq_s_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rq_s_3/rdf_import.php b/binsrc/tutorial/rdf/rq_s_3/rdf_import.php
index 87620ee..6233ae0 100644
--- a/binsrc/tutorial/rdf/rq_s_3/rdf_import.php
+++ b/binsrc/tutorial/rdf/rq_s_3/rdf_import.php
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdf/rq_s_3/rq_s_3.xml b/binsrc/tutorial/rdf/rq_s_3/rq_s_3.xml
index d6b97bc..a271458 100644
--- a/binsrc/tutorial/rdf/rq_s_3/rq_s_3.xml
+++ b/binsrc/tutorial/rdf/rq_s_3/rq_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdfview/index.xml b/binsrc/tutorial/rdfview/index.xml
index 781ad0a..5c47127 100644
--- a/binsrc/tutorial/rdfview/index.xml
+++ b/binsrc/tutorial/rdfview/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdfview/rd_v_1/options.xml b/binsrc/tutorial/rdfview/rd_v_1/options.xml
index 594a200..6323851 100644
--- a/binsrc/tutorial/rdfview/rd_v_1/options.xml
+++ b/binsrc/tutorial/rdfview/rd_v_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.owl b/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.owl
index c9def3d..3dc0507 100644
--- a/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.owl
+++ b/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.owl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: rd_v_1.owl,v 1.5.2.3 2012/03/08 12:55:13 source Exp $
+ - $Id: rd_v_1.owl,v 1.5.2.2 2009/06/09 11:25:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.xml b/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.xml
index 049be81..93be275 100644
--- a/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.xml
+++ b/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/demo.css b/binsrc/tutorial/repl/demo.css
index 6425c39..fed097d 100644
--- a/binsrc/tutorial/repl/demo.css
+++ b/binsrc/tutorial/repl/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+ * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/index.xml b/binsrc/tutorial/repl/index.xml
index 6c06e0f..be2e25e 100644
--- a/binsrc/tutorial/repl/index.xml
+++ b/binsrc/tutorial/repl/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_ds_1/options.xml b/binsrc/tutorial/repl/re_ds_1/options.xml
index 1c7ee77..b25e06d 100644
--- a/binsrc/tutorial/repl/re_ds_1/options.xml
+++ b/binsrc/tutorial/repl/re_ds_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_ds_1/re_ds_1.sql b/binsrc/tutorial/repl/re_ds_1/re_ds_1.sql
index ed1865d..52e6e2f 100644
--- a/binsrc/tutorial/repl/re_ds_1/re_ds_1.sql
+++ b/binsrc/tutorial/repl/re_ds_1/re_ds_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_ds_1.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_ds_1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_ds_1/re_ds_1.xml b/binsrc/tutorial/repl/re_ds_1/re_ds_1.xml
index 254ac7b..3370cbe 100644
--- a/binsrc/tutorial/repl/re_ds_1/re_ds_1.xml
+++ b/binsrc/tutorial/repl/re_ds_1/re_ds_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_init.vsp b/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_init.vsp
index 90ef7bf..f3be3af 100644
--- a/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_init.vsp
+++ b/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_init.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: re_ds_1_sample_init.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_ds_1_sample_init.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_repl.vsp b/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_repl.vsp
index 1fd61c8..afb475b 100644
--- a/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_repl.vsp
+++ b/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_repl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: re_ds_1_sample_repl.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_ds_1_sample_repl.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_1/options.xml b/binsrc/tutorial/repl/re_sb_1/options.xml
index e81afa9..8ca9549 100644
--- a/binsrc/tutorial/repl/re_sb_1/options.xml
+++ b/binsrc/tutorial/repl/re_sb_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_1/re_sb_1.sql b/binsrc/tutorial/repl/re_sb_1/re_sb_1.sql
index b2f5dc6..2d940c2 100644
--- a/binsrc/tutorial/repl/re_sb_1/re_sb_1.sql
+++ b/binsrc/tutorial/repl/re_sb_1/re_sb_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_sb_1.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_sb_1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_1/re_sb_1.xml b/binsrc/tutorial/repl/re_sb_1/re_sb_1.xml
index a4c963a..1ad0d59 100644
--- a/binsrc/tutorial/repl/re_sb_1/re_sb_1.xml
+++ b/binsrc/tutorial/repl/re_sb_1/re_sb_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_2/options.xml b/binsrc/tutorial/repl/re_sb_2/options.xml
index d811ea3..7ada589 100644
--- a/binsrc/tutorial/repl/re_sb_2/options.xml
+++ b/binsrc/tutorial/repl/re_sb_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_2/re_sb_2.sql b/binsrc/tutorial/repl/re_sb_2/re_sb_2.sql
index 5e829af..ff50204 100644
--- a/binsrc/tutorial/repl/re_sb_2/re_sb_2.sql
+++ b/binsrc/tutorial/repl/re_sb_2/re_sb_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_sb_2.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_sb_2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_2/re_sb_2.xml b/binsrc/tutorial/repl/re_sb_2/re_sb_2.xml
index 7466c60..179d17e 100644
--- a/binsrc/tutorial/repl/re_sb_2/re_sb_2.xml
+++ b/binsrc/tutorial/repl/re_sb_2/re_sb_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_3/options.xml b/binsrc/tutorial/repl/re_sb_3/options.xml
index e78cc07..64aa0e0 100644
--- a/binsrc/tutorial/repl/re_sb_3/options.xml
+++ b/binsrc/tutorial/repl/re_sb_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_3/re_sb_3.sql b/binsrc/tutorial/repl/re_sb_3/re_sb_3.sql
index 48490f2..5943bdd 100644
--- a/binsrc/tutorial/repl/re_sb_3/re_sb_3.sql
+++ b/binsrc/tutorial/repl/re_sb_3/re_sb_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_sb_3.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_sb_3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_3/re_sb_3.xml b/binsrc/tutorial/repl/re_sb_3/re_sb_3.xml
index e6c785c..23f475c 100644
--- a/binsrc/tutorial/repl/re_sb_3/re_sb_3.xml
+++ b/binsrc/tutorial/repl/re_sb_3/re_sb_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_4/options.xml b/binsrc/tutorial/repl/re_sb_4/options.xml
index c8a4fa2..e94f071 100644
--- a/binsrc/tutorial/repl/re_sb_4/options.xml
+++ b/binsrc/tutorial/repl/re_sb_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_4/re_sb_4.sql b/binsrc/tutorial/repl/re_sb_4/re_sb_4.sql
index 13fe2cf..c7c8857 100644
--- a/binsrc/tutorial/repl/re_sb_4/re_sb_4.sql
+++ b/binsrc/tutorial/repl/re_sb_4/re_sb_4.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_sb_4.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_sb_4.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_4/re_sb_4.xml b/binsrc/tutorial/repl/re_sb_4/re_sb_4.xml
index aa0c8ed..2609d99 100644
--- a/binsrc/tutorial/repl/re_sb_4/re_sb_4.xml
+++ b/binsrc/tutorial/repl/re_sb_4/re_sb_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sb_4/re_sb_4_sample_1.vsp b/binsrc/tutorial/repl/re_sb_4/re_sb_4_sample_1.vsp
index fea984f..fabcfe6 100644
--- a/binsrc/tutorial/repl/re_sb_4/re_sb_4_sample_1.vsp
+++ b/binsrc/tutorial/repl/re_sb_4/re_sb_4_sample_1.vsp
@@ -3,7 +3,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -20,7 +20,7 @@
--
--
?>
-<!-- $Id: re_sb_4_sample_1.vsp,v 1.1.1.1.2.1 2012/03/08 12:55:13 source Exp $ -->
+<!-- $Id: re_sb_4_sample_1.vsp,v 1.1.1.1 2006/04/11 17:56:13 source Exp $ -->
<html>
<head><link rel="stylesheet" type="text/css" href="../demo.css"></head>
<body>
diff --git a/binsrc/tutorial/repl/re_sd_1/options.xml b/binsrc/tutorial/repl/re_sd_1/options.xml
index 29816d2..00c12c8 100644
--- a/binsrc/tutorial/repl/re_sd_1/options.xml
+++ b/binsrc/tutorial/repl/re_sd_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sd_1/re_sd_1.sql b/binsrc/tutorial/repl/re_sd_1/re_sd_1.sql
index fd879ab..0c8669b 100644
--- a/binsrc/tutorial/repl/re_sd_1/re_sd_1.sql
+++ b/binsrc/tutorial/repl/re_sd_1/re_sd_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_sd_1.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_sd_1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sd_1/re_sd_1.xml b/binsrc/tutorial/repl/re_sd_1/re_sd_1.xml
index aa373e4..5aea349 100644
--- a/binsrc/tutorial/repl/re_sd_1/re_sd_1.xml
+++ b/binsrc/tutorial/repl/re_sd_1/re_sd_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sd_2/options.xml b/binsrc/tutorial/repl/re_sd_2/options.xml
index 5c2deb7..fd8b99d 100644
--- a/binsrc/tutorial/repl/re_sd_2/options.xml
+++ b/binsrc/tutorial/repl/re_sd_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sd_2/re_sd_2.sql b/binsrc/tutorial/repl/re_sd_2/re_sd_2.sql
index c162acd..05e2eaf 100644
--- a/binsrc/tutorial/repl/re_sd_2/re_sd_2.sql
+++ b/binsrc/tutorial/repl/re_sd_2/re_sd_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_sd_2.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_sd_2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sd_2/re_sd_2.xml b/binsrc/tutorial/repl/re_sd_2/re_sd_2.xml
index 3348008..8a549dd 100644
--- a/binsrc/tutorial/repl/re_sd_2/re_sd_2.xml
+++ b/binsrc/tutorial/repl/re_sd_2/re_sd_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sd_3/options.xml b/binsrc/tutorial/repl/re_sd_3/options.xml
index 5310657..34b588a 100644
--- a/binsrc/tutorial/repl/re_sd_3/options.xml
+++ b/binsrc/tutorial/repl/re_sd_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sd_3/re_sd_3.sql b/binsrc/tutorial/repl/re_sd_3/re_sd_3.sql
index ecd64b9..52ddff9 100644
--- a/binsrc/tutorial/repl/re_sd_3/re_sd_3.sql
+++ b/binsrc/tutorial/repl/re_sd_3/re_sd_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_sd_3.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_sd_3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sd_3/re_sd_3.xml b/binsrc/tutorial/repl/re_sd_3/re_sd_3.xml
index 91be0aa..b03ff01 100644
--- a/binsrc/tutorial/repl/re_sd_3/re_sd_3.xml
+++ b/binsrc/tutorial/repl/re_sd_3/re_sd_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sm_1/options.xml b/binsrc/tutorial/repl/re_sm_1/options.xml
index bd0d22e..75dc4b0 100644
--- a/binsrc/tutorial/repl/re_sm_1/options.xml
+++ b/binsrc/tutorial/repl/re_sm_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_sm_1/re_sm_1.xml b/binsrc/tutorial/repl/re_sm_1/re_sm_1.xml
index 4276571..2ee894e 100644
--- a/binsrc/tutorial/repl/re_sm_1/re_sm_1.xml
+++ b/binsrc/tutorial/repl/re_sm_1/re_sm_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_1/options.xml b/binsrc/tutorial/repl/re_xb_1/options.xml
index b4a027c..94aa62e 100644
--- a/binsrc/tutorial/repl/re_xb_1/options.xml
+++ b/binsrc/tutorial/repl/re_xb_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_1/re_xb_1.sql b/binsrc/tutorial/repl/re_xb_1/re_xb_1.sql
index a43c7a2..620697a 100644
--- a/binsrc/tutorial/repl/re_xb_1/re_xb_1.sql
+++ b/binsrc/tutorial/repl/re_xb_1/re_xb_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_xb_1.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_xb_1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_1/re_xb_1.xml b/binsrc/tutorial/repl/re_xb_1/re_xb_1.xml
index cbec096..cf49d71 100644
--- a/binsrc/tutorial/repl/re_xb_1/re_xb_1.xml
+++ b/binsrc/tutorial/repl/re_xb_1/re_xb_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_2/options.xml b/binsrc/tutorial/repl/re_xb_2/options.xml
index b024fb1..65ec990 100644
--- a/binsrc/tutorial/repl/re_xb_2/options.xml
+++ b/binsrc/tutorial/repl/re_xb_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_2/re_xb_2.sql b/binsrc/tutorial/repl/re_xb_2/re_xb_2.sql
index 5b16e0a..414bd26 100644
--- a/binsrc/tutorial/repl/re_xb_2/re_xb_2.sql
+++ b/binsrc/tutorial/repl/re_xb_2/re_xb_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_xb_2.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_xb_2.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_2/re_xb_2.xml b/binsrc/tutorial/repl/re_xb_2/re_xb_2.xml
index 1b233db..8749064 100644
--- a/binsrc/tutorial/repl/re_xb_2/re_xb_2.xml
+++ b/binsrc/tutorial/repl/re_xb_2/re_xb_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_3/options.xml b/binsrc/tutorial/repl/re_xb_3/options.xml
index e496fd6..693e510 100644
--- a/binsrc/tutorial/repl/re_xb_3/options.xml
+++ b/binsrc/tutorial/repl/re_xb_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_3/re_xb_3.sql b/binsrc/tutorial/repl/re_xb_3/re_xb_3.sql
index 9bafaf6..245502f 100644
--- a/binsrc/tutorial/repl/re_xb_3/re_xb_3.sql
+++ b/binsrc/tutorial/repl/re_xb_3/re_xb_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_xb_3.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_xb_3.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_3/re_xb_3.xml b/binsrc/tutorial/repl/re_xb_3/re_xb_3.xml
index 31830ea..195d3b6 100644
--- a/binsrc/tutorial/repl/re_xb_3/re_xb_3.xml
+++ b/binsrc/tutorial/repl/re_xb_3/re_xb_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_4/options.xml b/binsrc/tutorial/repl/re_xb_4/options.xml
index c1efbca..879516c 100644
--- a/binsrc/tutorial/repl/re_xb_4/options.xml
+++ b/binsrc/tutorial/repl/re_xb_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_4/re_xb_4.sql b/binsrc/tutorial/repl/re_xb_4/re_xb_4.sql
index 2271a92..aebcf84 100644
--- a/binsrc/tutorial/repl/re_xb_4/re_xb_4.sql
+++ b/binsrc/tutorial/repl/re_xb_4/re_xb_4.sql
@@ -1,10 +1,10 @@
--
--- $Id: re_xb_4.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: re_xb_4.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/repl/re_xb_4/re_xb_4.xml b/binsrc/tutorial/repl/re_xb_4/re_xb_4.xml
index 9d10efc..6f483da 100644
--- a/binsrc/tutorial/repl/re_xb_4/re_xb_4.xml
+++ b/binsrc/tutorial/repl/re_xb_4/re_xb_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/rss2xbel.xsl b/binsrc/tutorial/rss2xbel.xsl
index 1f510f2..38ed2b3 100644
--- a/binsrc/tutorial/rss2xbel.xsl
+++ b/binsrc/tutorial/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/semweb/index.xml b/binsrc/tutorial/semweb/index.xml
index 82ceec3..1b6acab 100644
--- a/binsrc/tutorial/semweb/index.xml
+++ b/binsrc/tutorial/semweb/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/semweb/sem_s_1/options.xml b/binsrc/tutorial/semweb/sem_s_1/options.xml
index bb21991..d7aeb85 100644
--- a/binsrc/tutorial/semweb/sem_s_1/options.xml
+++ b/binsrc/tutorial/semweb/sem_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/semweb/sem_s_1/sem_s_1.xml b/binsrc/tutorial/semweb/sem_s_1/sem_s_1.xml
index 62ec04c..37d3926 100644
--- a/binsrc/tutorial/semweb/sem_s_1/sem_s_1.xml
+++ b/binsrc/tutorial/semweb/sem_s_1/sem_s_1.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/Makefile.am b/binsrc/tutorial/services/Makefile.am
index 72b8b26..03ec89b 100644
--- a/binsrc/tutorial/services/Makefile.am
+++ b/binsrc/tutorial/services/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/Makefile.in b/binsrc/tutorial/services/Makefile.in
index 48c805c..45b0692 100644
--- a/binsrc/tutorial/services/Makefile.in
+++ b/binsrc/tutorial/services/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tutorial/services/ajax_inc/ajax.js b/binsrc/tutorial/services/ajax_inc/ajax.js
index b8d227a..9151447 100644
--- a/binsrc/tutorial/services/ajax_inc/ajax.js
+++ b/binsrc/tutorial/services/ajax_inc/ajax.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ajax_inc/proxy.vsp b/binsrc/tutorial/services/ajax_inc/proxy.vsp
index 8d13baf..06f6ede 100644
--- a/binsrc/tutorial/services/ajax_inc/proxy.vsp
+++ b/binsrc/tutorial/services/ajax_inc/proxy.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: proxy.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: proxy.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl b/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl
index f5e7eea..0878d5b 100644
--- a/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl
+++ b/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: wsdl2js.xsl,v 1.4.2.1 2012/03/08 12:55:13 source Exp $
+ - $Id: wsdl2js.xsl,v 1.4 2006/08/16 08:31:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl b/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl
index 918faa4..c56d159 100644
--- a/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl
+++ b/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: wsdl2js_udt.xsl,v 1.3.2.1 2012/03/08 12:55:13 source Exp $
+ - $Id: wsdl2js_udt.xsl,v 1.3 2006/08/16 08:31:03 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/dc_s_1/dc_s_1.xml b/binsrc/tutorial/services/dc_s_1/dc_s_1.xml
index 4e3cb0a..805653c 100644
--- a/binsrc/tutorial/services/dc_s_1/dc_s_1.xml
+++ b/binsrc/tutorial/services/dc_s_1/dc_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/dc_s_1/options.xml b/binsrc/tutorial/services/dc_s_1/options.xml
index 80b3129..e0f39fa 100644
--- a/binsrc/tutorial/services/dc_s_1/options.xml
+++ b/binsrc/tutorial/services/dc_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/demo.css b/binsrc/tutorial/services/demo.css
index 4c12859..fa0f5ff 100644
--- a/binsrc/tutorial/services/demo.css
+++ b/binsrc/tutorial/services/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+ * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/idp_s_1/idp_s_1.vsp b/binsrc/tutorial/services/idp_s_1/idp_s_1.vsp
index 5297cd5..1577597 100644
--- a/binsrc/tutorial/services/idp_s_1/idp_s_1.vsp
+++ b/binsrc/tutorial/services/idp_s_1/idp_s_1.vsp
@@ -4,7 +4,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/idp_s_1/idp_s_1.xml b/binsrc/tutorial/services/idp_s_1/idp_s_1.xml
index bd50a49..96bca51 100644
--- a/binsrc/tutorial/services/idp_s_1/idp_s_1.xml
+++ b/binsrc/tutorial/services/idp_s_1/idp_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/idp_s_1/options.xml b/binsrc/tutorial/services/idp_s_1/options.xml
index 443d725..65f9eb7 100644
--- a/binsrc/tutorial/services/idp_s_1/options.xml
+++ b/binsrc/tutorial/services/idp_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/index.xml b/binsrc/tutorial/services/index.xml
index 648da36..41ab568 100644
--- a/binsrc/tutorial/services/index.xml
+++ b/binsrc/tutorial/services/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/raw.xsl b/binsrc/tutorial/services/raw.xsl
index de6f99a..349f039 100644
--- a/binsrc/tutorial/services/raw.xsl
+++ b/binsrc/tutorial/services/raw.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: raw.xsl,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+ - $Id: raw.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rm_s_1/rm_s_1.sql b/binsrc/tutorial/services/rm_s_1/rm_s_1.sql
index 7fe08f5..f53d0a9 100644
--- a/binsrc/tutorial/services/rm_s_1/rm_s_1.sql
+++ b/binsrc/tutorial/services/rm_s_1/rm_s_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: rm_s_1.sql,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: rm_s_1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rm_s_1/rm_s_1.xml b/binsrc/tutorial/services/rm_s_1/rm_s_1.xml
index b0bbf59..2a7c716 100644
--- a/binsrc/tutorial/services/rm_s_1/rm_s_1.xml
+++ b/binsrc/tutorial/services/rm_s_1/rm_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rm_s_1/rmcli.vsp b/binsrc/tutorial/services/rm_s_1/rmcli.vsp
index 0881758..ba5241c 100644
--- a/binsrc/tutorial/services/rm_s_1/rmcli.vsp
+++ b/binsrc/tutorial/services/rm_s_1/rmcli.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: rmcli.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: rmcli.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp b/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp
index 7b08dce..22e2e80 100644
--- a/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp
+++ b/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: rmcli_sec.vsp,v 1.2.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: rmcli_sec.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rn_s_1/options.xml b/binsrc/tutorial/services/rn_s_1/options.xml
index 49bfe1e..ea355c6 100644
--- a/binsrc/tutorial/services/rn_s_1/options.xml
+++ b/binsrc/tutorial/services/rn_s_1/options.xml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: options.xml,v 1.1.2.1 2012/03/08 12:55:13 source Exp $
+ - $Id: options.xml,v 1.1 2006/10/11 07:52:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rn_s_1/res.vsp b/binsrc/tutorial/services/rn_s_1/res.vsp
index 172b84e..32c90d1 100644
--- a/binsrc/tutorial/services/rn_s_1/res.vsp
+++ b/binsrc/tutorial/services/rn_s_1/res.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: res.vsp,v 1.1.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: res.vsp,v 1.1 2006/10/11 07:52:08 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rn_s_1/rn_s_1.xml b/binsrc/tutorial/services/rn_s_1/rn_s_1.xml
index 4912a9b..f5044b3 100644
--- a/binsrc/tutorial/services/rn_s_1/rn_s_1.xml
+++ b/binsrc/tutorial/services/rn_s_1/rn_s_1.xml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: rn_s_1.xml,v 1.1.2.1 2012/03/08 12:55:13 source Exp $
+ - $Id: rn_s_1.xml,v 1.1 2006/10/11 07:52:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rn_s_1/rn_s_1_run.vsp b/binsrc/tutorial/services/rn_s_1/rn_s_1_run.vsp
index c83637a..7b6ae8c 100644
--- a/binsrc/tutorial/services/rn_s_1/rn_s_1_run.vsp
+++ b/binsrc/tutorial/services/rn_s_1/rn_s_1_run.vsp
@@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<?vsp
--
--- $Id: rn_s_1_run.vsp,v 1.1.2.1 2012/03/08 12:55:13 source Exp $
+-- $Id: rn_s_1_run.vsp,v 1.1 2006/10/11 07:52:08 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_1/RoutingClient.cs b/binsrc/tutorial/services/rp_s_1/RoutingClient.cs
index d1555c9..745fe6d 100644
--- a/binsrc/tutorial/services/rp_s_1/RoutingClient.cs
+++ b/binsrc/tutorial/services/rp_s_1/RoutingClient.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_1/options.xml b/binsrc/tutorial/services/rp_s_1/options.xml
index aea8d0a..fe5c9bd 100644
--- a/binsrc/tutorial/services/rp_s_1/options.xml
+++ b/binsrc/tutorial/services/rp_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_1/rp_s_1.xml b/binsrc/tutorial/services/rp_s_1/rp_s_1.xml
index f2c768c..4157d7f 100644
--- a/binsrc/tutorial/services/rp_s_1/rp_s_1.xml
+++ b/binsrc/tutorial/services/rp_s_1/rp_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_1/wsrp.vsp b/binsrc/tutorial/services/rp_s_1/wsrp.vsp
index 2401e3f..2fb5f41 100644
--- a/binsrc/tutorial/services/rp_s_1/wsrp.vsp
+++ b/binsrc/tutorial/services/rp_s_1/wsrp.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wsrp.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: wsrp.vsp,v 1.3 2008/04/25 15:08:01 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql b/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql
index 9da714d..f746af6 100644
--- a/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql
+++ b/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsrp_setup.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: wsrp_setup.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp b/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp
index b5405d2..fcd8bd6 100644
--- a/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp
+++ b/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wsrptargets.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: wsrptargets.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_2/options.xml b/binsrc/tutorial/services/rp_s_2/options.xml
index 76308fe..a493438 100644
--- a/binsrc/tutorial/services/rp_s_2/options.xml
+++ b/binsrc/tutorial/services/rp_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_2/rp_s_2.xml b/binsrc/tutorial/services/rp_s_2/rp_s_2.xml
index 2928969..c940d58 100644
--- a/binsrc/tutorial/services/rp_s_2/rp_s_2.xml
+++ b/binsrc/tutorial/services/rp_s_2/rp_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/rp_s_2/wsrf.vsp b/binsrc/tutorial/services/rp_s_2/wsrf.vsp
index a772dc4..3d907b9 100644
--- a/binsrc/tutorial/services/rp_s_2/wsrf.vsp
+++ b/binsrc/tutorial/services/rp_s_2/wsrf.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wsrf.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: wsrf.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_1/options.xml b/binsrc/tutorial/services/so_s_1/options.xml
index 27f7625..93ee337 100644
--- a/binsrc/tutorial/services/so_s_1/options.xml
+++ b/binsrc/tutorial/services/so_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_1/so_s_1.sql b/binsrc/tutorial/services/so_s_1/so_s_1.sql
index 57fe575..da0a9a5 100644
--- a/binsrc/tutorial/services/so_s_1/so_s_1.sql
+++ b/binsrc/tutorial/services/so_s_1/so_s_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_1.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_1.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_1/so_s_1.xml b/binsrc/tutorial/services/so_s_1/so_s_1.xml
index 7ebe6e0..5362790 100644
--- a/binsrc/tutorial/services/so_s_1/so_s_1.xml
+++ b/binsrc/tutorial/services/so_s_1/so_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_1/so_s_1_sample_1.vsp b/binsrc/tutorial/services/so_s_1/so_s_1_sample_1.vsp
index bf27770..7a91811 100644
--- a/binsrc/tutorial/services/so_s_1/so_s_1_sample_1.vsp
+++ b/binsrc/tutorial/services/so_s_1/so_s_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_1_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_1_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html b/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html
index 6a42660..32c88a3 100644
--- a/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html
+++ b/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_10/options.xml b/binsrc/tutorial/services/so_s_10/options.xml
index efa2446..aad1b45 100644
--- a/binsrc/tutorial/services/so_s_10/options.xml
+++ b/binsrc/tutorial/services/so_s_10/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_10/so_s_10.sql b/binsrc/tutorial/services/so_s_10/so_s_10.sql
index 501a7d0..7898e9e 100644
--- a/binsrc/tutorial/services/so_s_10/so_s_10.sql
+++ b/binsrc/tutorial/services/so_s_10/so_s_10.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_10.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_10.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_10/so_s_10.xml b/binsrc/tutorial/services/so_s_10/so_s_10.xml
index 8cbb7bd..5d0ece0 100644
--- a/binsrc/tutorial/services/so_s_10/so_s_10.xml
+++ b/binsrc/tutorial/services/so_s_10/so_s_10.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_10/sr.xsl b/binsrc/tutorial/services/so_s_10/sr.xsl
index 4692292..c2d4c28 100644
--- a/binsrc/tutorial/services/so_s_10/sr.xsl
+++ b/binsrc/tutorial/services/so_s_10/sr.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sr.xsl,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: sr.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/array2d.xsd b/binsrc/tutorial/services/so_s_11/array2d.xsd
index 635999b..366b7f4 100644
--- a/binsrc/tutorial/services/so_s_11/array2d.xsd
+++ b/binsrc/tutorial/services/so_s_11/array2d.xsd
@@ -9,7 +9,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/array_div.xsd b/binsrc/tutorial/services/so_s_11/array_div.xsd
index b9f6b44..c31d6f6 100644
--- a/binsrc/tutorial/services/so_s_11/array_div.xsd
+++ b/binsrc/tutorial/services/so_s_11/array_div.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/division.xsd b/binsrc/tutorial/services/so_s_11/division.xsd
index 87933df..4aad55d 100644
--- a/binsrc/tutorial/services/so_s_11/division.xsd
+++ b/binsrc/tutorial/services/so_s_11/division.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/factbook.xml b/binsrc/tutorial/services/so_s_11/factbook.xml
index cecfa11..8303a92 100644
--- a/binsrc/tutorial/services/so_s_11/factbook.xml
+++ b/binsrc/tutorial/services/so_s_11/factbook.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/moz.xsl b/binsrc/tutorial/services/so_s_11/moz.xsl
index 07f9ab4..c548ded 100644
--- a/binsrc/tutorial/services/so_s_11/moz.xsl
+++ b/binsrc/tutorial/services/so_s_11/moz.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: moz.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: moz.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/options.xml b/binsrc/tutorial/services/so_s_11/options.xml
index 64677f2..e5fbc3f 100644
--- a/binsrc/tutorial/services/so_s_11/options.xml
+++ b/binsrc/tutorial/services/so_s_11/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/provinces.xsd b/binsrc/tutorial/services/so_s_11/provinces.xsd
index adafa63..5425591 100644
--- a/binsrc/tutorial/services/so_s_11/provinces.xsd
+++ b/binsrc/tutorial/services/so_s_11/provinces.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/provinces_ajax.html b/binsrc/tutorial/services/so_s_11/provinces_ajax.html
index e7bff8a..ac8936a 100644
--- a/binsrc/tutorial/services/so_s_11/provinces_ajax.html
+++ b/binsrc/tutorial/services/so_s_11/provinces_ajax.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/raw.xsl b/binsrc/tutorial/services/so_s_11/raw.xsl
index d853250..fbd6346 100644
--- a/binsrc/tutorial/services/so_s_11/raw.xsl
+++ b/binsrc/tutorial/services/so_s_11/raw.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: raw.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: raw.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/so_s_11.sql b/binsrc/tutorial/services/so_s_11/so_s_11.sql
index 06d0d9c..2e1ff69 100644
--- a/binsrc/tutorial/services/so_s_11/so_s_11.sql
+++ b/binsrc/tutorial/services/so_s_11/so_s_11.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_11.sql,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_11.sql,v 1.3 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/so_s_11.xml b/binsrc/tutorial/services/so_s_11/so_s_11.xml
index 3f3cd94..b4d7fdc 100644
--- a/binsrc/tutorial/services/so_s_11/so_s_11.xml
+++ b/binsrc/tutorial/services/so_s_11/so_s_11.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/so_s_11_array_client.vsp b/binsrc/tutorial/services/so_s_11/so_s_11_array_client.vsp
index bb99c1e..acc5118 100644
--- a/binsrc/tutorial/services/so_s_11/so_s_11_array_client.vsp
+++ b/binsrc/tutorial/services/so_s_11/so_s_11_array_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_11_array_client.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_11_array_client.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/so_s_11_client.vsp b/binsrc/tutorial/services/so_s_11/so_s_11_client.vsp
index 78d9308..f6cd318 100644
--- a/binsrc/tutorial/services/so_s_11/so_s_11_client.vsp
+++ b/binsrc/tutorial/services/so_s_11/so_s_11_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_11_client.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_11_client.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/sr.xsl b/binsrc/tutorial/services/so_s_11/sr.xsl
index eae3378..34908a6 100644
--- a/binsrc/tutorial/services/so_s_11/sr.xsl
+++ b/binsrc/tutorial/services/so_s_11/sr.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sr.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: sr.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_11/sr2d.xsl b/binsrc/tutorial/services/so_s_11/sr2d.xsl
index 4869dc1..18758e5 100644
--- a/binsrc/tutorial/services/so_s_11/sr2d.xsl
+++ b/binsrc/tutorial/services/so_s_11/sr2d.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sr2d.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: sr2d.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_12/administrative_divisions.html b/binsrc/tutorial/services/so_s_12/administrative_divisions.html
index 975a090..2f4c6bc 100644
--- a/binsrc/tutorial/services/so_s_12/administrative_divisions.html
+++ b/binsrc/tutorial/services/so_s_12/administrative_divisions.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_12/administrative_divisions_ch.html b/binsrc/tutorial/services/so_s_12/administrative_divisions_ch.html
index 411ee81..32a81f4 100644
--- a/binsrc/tutorial/services/so_s_12/administrative_divisions_ch.html
+++ b/binsrc/tutorial/services/so_s_12/administrative_divisions_ch.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_12/options.xml b/binsrc/tutorial/services/so_s_12/options.xml
index 21427e2..74ec062 100644
--- a/binsrc/tutorial/services/so_s_12/options.xml
+++ b/binsrc/tutorial/services/so_s_12/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_12/so_s_12.xml b/binsrc/tutorial/services/so_s_12/so_s_12.xml
index 0eb09fb..16f1cf6 100644
--- a/binsrc/tutorial/services/so_s_12/so_s_12.xml
+++ b/binsrc/tutorial/services/so_s_12/so_s_12.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_12/sr.xsl b/binsrc/tutorial/services/so_s_12/sr.xsl
index dcca43b..ecb6bd4 100644
--- a/binsrc/tutorial/services/so_s_12/sr.xsl
+++ b/binsrc/tutorial/services/so_s_12/sr.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sr.xsl,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: sr.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_13/options.xml b/binsrc/tutorial/services/so_s_13/options.xml
index f3d057d..15dc7f9 100644
--- a/binsrc/tutorial/services/so_s_13/options.xml
+++ b/binsrc/tutorial/services/so_s_13/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_13/so_s_13.sql b/binsrc/tutorial/services/so_s_13/so_s_13.sql
index f3ebd04..7a71977 100644
--- a/binsrc/tutorial/services/so_s_13/so_s_13.sql
+++ b/binsrc/tutorial/services/so_s_13/so_s_13.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_13.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_13.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_13/so_s_13.xml b/binsrc/tutorial/services/so_s_13/so_s_13.xml
index 6dcc90f..aecc23d 100644
--- a/binsrc/tutorial/services/so_s_13/so_s_13.xml
+++ b/binsrc/tutorial/services/so_s_13/so_s_13.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_13/so_s_13_secure_SOAP_client.vsp b/binsrc/tutorial/services/so_s_13/so_s_13_secure_SOAP_client.vsp
index 327996f..0b14ce1 100644
--- a/binsrc/tutorial/services/so_s_13/so_s_13_secure_SOAP_client.vsp
+++ b/binsrc/tutorial/services/so_s_13/so_s_13_secure_SOAP_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_13_secure_SOAP_client.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_13_secure_SOAP_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_13/sr.xsl b/binsrc/tutorial/services/so_s_13/sr.xsl
index a5c7371..e994fb0 100644
--- a/binsrc/tutorial/services/so_s_13/sr.xsl
+++ b/binsrc/tutorial/services/so_s_13/sr.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sr.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: sr.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/ms.sql b/binsrc/tutorial/services/so_s_14/ms.sql
index 047f339..68e015a 100644
--- a/binsrc/tutorial/services/so_s_14/ms.sql
+++ b/binsrc/tutorial/services/so_s_14/ms.sql
@@ -1,10 +1,10 @@
--
--- $Id: ms.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: ms.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/ms.xsl b/binsrc/tutorial/services/so_s_14/ms.xsl
index 290c31d..884bb48 100644
--- a/binsrc/tutorial/services/so_s_14/ms.xsl
+++ b/binsrc/tutorial/services/so_s_14/ms.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: ms.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: ms.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/options.xml b/binsrc/tutorial/services/so_s_14/options.xml
index 65f0ac7..4ba92e6 100644
--- a/binsrc/tutorial/services/so_s_14/options.xml
+++ b/binsrc/tutorial/services/so_s_14/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/ora.sql b/binsrc/tutorial/services/so_s_14/ora.sql
index 7c86ec9..dacee76 100644
--- a/binsrc/tutorial/services/so_s_14/ora.sql
+++ b/binsrc/tutorial/services/so_s_14/ora.sql
@@ -1,10 +1,10 @@
--
--- $Id: ora.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: ora.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/ora.xsl b/binsrc/tutorial/services/so_s_14/ora.xsl
index c2903e1..723b964 100644
--- a/binsrc/tutorial/services/so_s_14/ora.xsl
+++ b/binsrc/tutorial/services/so_s_14/ora.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: ora.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: ora.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/so_s_14.sql b/binsrc/tutorial/services/so_s_14/so_s_14.sql
index 29fbe45..f98b3b3 100644
--- a/binsrc/tutorial/services/so_s_14/so_s_14.sql
+++ b/binsrc/tutorial/services/so_s_14/so_s_14.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_14.sql,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_14.sql,v 1.3 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/so_s_14.xml b/binsrc/tutorial/services/so_s_14/so_s_14.xml
index 652f49c..e0eb9de 100644
--- a/binsrc/tutorial/services/so_s_14/so_s_14.xml
+++ b/binsrc/tutorial/services/so_s_14/so_s_14.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/so_s_14_ms_client.vsp b/binsrc/tutorial/services/so_s_14/so_s_14_ms_client.vsp
index b9998fe..7145658 100644
--- a/binsrc/tutorial/services/so_s_14/so_s_14_ms_client.vsp
+++ b/binsrc/tutorial/services/so_s_14/so_s_14_ms_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_14_ms_client.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_14_ms_client.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_14/so_s_14_ora_client.vsp b/binsrc/tutorial/services/so_s_14/so_s_14_ora_client.vsp
index 5881c05..aa55bfe 100644
--- a/binsrc/tutorial/services/so_s_14/so_s_14_ora_client.vsp
+++ b/binsrc/tutorial/services/so_s_14/so_s_14_ora_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_14_ora_client.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_14_ora_client.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/conversion.vsp b/binsrc/tutorial/services/so_s_15/conversion.vsp
index aa8dd87..d9cfd54 100644
--- a/binsrc/tutorial/services/so_s_15/conversion.vsp
+++ b/binsrc/tutorial/services/so_s_15/conversion.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: conversion.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: conversion.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/converted_value.xsl b/binsrc/tutorial/services/so_s_15/converted_value.xsl
index 89769b8..f217cb9 100644
--- a/binsrc/tutorial/services/so_s_15/converted_value.xsl
+++ b/binsrc/tutorial/services/so_s_15/converted_value.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: converted_value.xsl,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: converted_value.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/converted_value_ajax.xsl b/binsrc/tutorial/services/so_s_15/converted_value_ajax.xsl
index 552293a..f03a29a 100644
--- a/binsrc/tutorial/services/so_s_15/converted_value_ajax.xsl
+++ b/binsrc/tutorial/services/so_s_15/converted_value_ajax.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: converted_value_ajax.xsl,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: converted_value_ajax.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/currency_list.vsp b/binsrc/tutorial/services/so_s_15/currency_list.vsp
index 15332dc..38dbb27 100644
--- a/binsrc/tutorial/services/so_s_15/currency_list.vsp
+++ b/binsrc/tutorial/services/so_s_15/currency_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: currency_list.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: currency_list.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/currency_list.xsl b/binsrc/tutorial/services/so_s_15/currency_list.xsl
index 81aa991..a7fda90 100644
--- a/binsrc/tutorial/services/so_s_15/currency_list.xsl
+++ b/binsrc/tutorial/services/so_s_15/currency_list.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: currency_list.xsl,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: currency_list.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/currency_list_ajax.xsl b/binsrc/tutorial/services/so_s_15/currency_list_ajax.xsl
index 5999cf2..5a2182e 100644
--- a/binsrc/tutorial/services/so_s_15/currency_list_ajax.xsl
+++ b/binsrc/tutorial/services/so_s_15/currency_list_ajax.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: currency_list_ajax.xsl,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: currency_list_ajax.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/exchange.sql b/binsrc/tutorial/services/so_s_15/exchange.sql
index 6c3eef5..46428ae 100644
--- a/binsrc/tutorial/services/so_s_15/exchange.sql
+++ b/binsrc/tutorial/services/so_s_15/exchange.sql
@@ -1,10 +1,10 @@
--
--- $Id: exchange.sql,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: exchange.sql,v 1.3 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/exchange_rates.vsp b/binsrc/tutorial/services/so_s_15/exchange_rates.vsp
index fb80eca..8d8c08d 100644
--- a/binsrc/tutorial/services/so_s_15/exchange_rates.vsp
+++ b/binsrc/tutorial/services/so_s_15/exchange_rates.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: exchange_rates.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: exchange_rates.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/exchange_rates_ajax.html b/binsrc/tutorial/services/so_s_15/exchange_rates_ajax.html
index 771a3c4..a8789e6 100644
--- a/binsrc/tutorial/services/so_s_15/exchange_rates_ajax.html
+++ b/binsrc/tutorial/services/so_s_15/exchange_rates_ajax.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/options.xml b/binsrc/tutorial/services/so_s_15/options.xml
index bf937f3..84ffeda 100644
--- a/binsrc/tutorial/services/so_s_15/options.xml
+++ b/binsrc/tutorial/services/so_s_15/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_15/so_s_15.xml b/binsrc/tutorial/services/so_s_15/so_s_15.xml
index 23656e8..c083722 100644
--- a/binsrc/tutorial/services/so_s_15/so_s_15.xml
+++ b/binsrc/tutorial/services/so_s_15/so_s_15.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_16/options.xml b/binsrc/tutorial/services/so_s_16/options.xml
index 1ef0678..dad3c99 100644
--- a/binsrc/tutorial/services/so_s_16/options.xml
+++ b/binsrc/tutorial/services/so_s_16/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_16/registration.html b/binsrc/tutorial/services/so_s_16/registration.html
index ba8dffe..3cf2eac 100644
--- a/binsrc/tutorial/services/so_s_16/registration.html
+++ b/binsrc/tutorial/services/so_s_16/registration.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_16/so_s_16.xml b/binsrc/tutorial/services/so_s_16/so_s_16.xml
index 583dcd0..f3ea10c 100644
--- a/binsrc/tutorial/services/so_s_16/so_s_16.xml
+++ b/binsrc/tutorial/services/so_s_16/so_s_16.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_17/mail_validate.html b/binsrc/tutorial/services/so_s_17/mail_validate.html
index 67e7d9b..59fb87f 100644
--- a/binsrc/tutorial/services/so_s_17/mail_validate.html
+++ b/binsrc/tutorial/services/so_s_17/mail_validate.html
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_17/mail_validate.xsl b/binsrc/tutorial/services/so_s_17/mail_validate.xsl
index 43d6cd1..f6f8faf 100644
--- a/binsrc/tutorial/services/so_s_17/mail_validate.xsl
+++ b/binsrc/tutorial/services/so_s_17/mail_validate.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: mail_validate.xsl,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: mail_validate.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_17/options.xml b/binsrc/tutorial/services/so_s_17/options.xml
index 8708cc7..4519811 100644
--- a/binsrc/tutorial/services/so_s_17/options.xml
+++ b/binsrc/tutorial/services/so_s_17/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_17/so_s_17.sql b/binsrc/tutorial/services/so_s_17/so_s_17.sql
index dfcd38e..9cb1791 100644
--- a/binsrc/tutorial/services/so_s_17/so_s_17.sql
+++ b/binsrc/tutorial/services/so_s_17/so_s_17.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_17.sql,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_17.sql,v 1.3 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_17/so_s_17.xml b/binsrc/tutorial/services/so_s_17/so_s_17.xml
index 524eb6d..90e1fc6 100644
--- a/binsrc/tutorial/services/so_s_17/so_s_17.xml
+++ b/binsrc/tutorial/services/so_s_17/so_s_17.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_18/options.xml b/binsrc/tutorial/services/so_s_18/options.xml
index 15170cd..78a4c5a 100644
--- a/binsrc/tutorial/services/so_s_18/options.xml
+++ b/binsrc/tutorial/services/so_s_18/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_18/so_s_18.xml b/binsrc/tutorial/services/so_s_18/so_s_18.xml
index 56ba2ec..1fb674d 100644
--- a/binsrc/tutorial/services/so_s_18/so_s_18.xml
+++ b/binsrc/tutorial/services/so_s_18/so_s_18.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_18/wsdl_import.sql b/binsrc/tutorial/services/so_s_18/wsdl_import.sql
index f5741ba..fee8efc 100644
--- a/binsrc/tutorial/services/so_s_18/wsdl_import.sql
+++ b/binsrc/tutorial/services/so_s_18/wsdl_import.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsdl_import.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: wsdl_import.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_18/wsdl_import.vsp b/binsrc/tutorial/services/so_s_18/wsdl_import.vsp
index d71d27b..0083e0c 100644
--- a/binsrc/tutorial/services/so_s_18/wsdl_import.vsp
+++ b/binsrc/tutorial/services/so_s_18/wsdl_import.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wsdl_import.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: wsdl_import.vsp,v 1.3 2008/04/10 09:37:04 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_19/array4d.xsd b/binsrc/tutorial/services/so_s_19/array4d.xsd
index c32df8c..d9cba65 100644
--- a/binsrc/tutorial/services/so_s_19/array4d.xsd
+++ b/binsrc/tutorial/services/so_s_19/array4d.xsd
@@ -9,7 +9,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_19/contact.xsl b/binsrc/tutorial/services/so_s_19/contact.xsl
index bd6b7b8..ab3ad71 100644
--- a/binsrc/tutorial/services/so_s_19/contact.xsl
+++ b/binsrc/tutorial/services/so_s_19/contact.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: contact.xsl,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: contact.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_19/contacts.html b/binsrc/tutorial/services/so_s_19/contacts.html
index 898ad1a..986d109 100644
--- a/binsrc/tutorial/services/so_s_19/contacts.html
+++ b/binsrc/tutorial/services/so_s_19/contacts.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_19/contacts.sql b/binsrc/tutorial/services/so_s_19/contacts.sql
index d158eb7..d8b98d6 100644
--- a/binsrc/tutorial/services/so_s_19/contacts.sql
+++ b/binsrc/tutorial/services/so_s_19/contacts.sql
@@ -1,10 +1,10 @@
--
--- $Id: contacts.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: contacts.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_19/options.xml b/binsrc/tutorial/services/so_s_19/options.xml
index 8b8d4c9..4896610 100644
--- a/binsrc/tutorial/services/so_s_19/options.xml
+++ b/binsrc/tutorial/services/so_s_19/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_19/so_s_19.xml b/binsrc/tutorial/services/so_s_19/so_s_19.xml
index 97563e6..258b4f0 100644
--- a/binsrc/tutorial/services/so_s_19/so_s_19.xml
+++ b/binsrc/tutorial/services/so_s_19/so_s_19.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_2/options.xml b/binsrc/tutorial/services/so_s_2/options.xml
index 3a285a2..2dcdad8 100644
--- a/binsrc/tutorial/services/so_s_2/options.xml
+++ b/binsrc/tutorial/services/so_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_2/so_s_2.sql b/binsrc/tutorial/services/so_s_2/so_s_2.sql
index d553f88..2bfa39b 100644
--- a/binsrc/tutorial/services/so_s_2/so_s_2.sql
+++ b/binsrc/tutorial/services/so_s_2/so_s_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_2.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_2.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_2/so_s_2.xml b/binsrc/tutorial/services/so_s_2/so_s_2.xml
index 7ed42b8..39a6034 100644
--- a/binsrc/tutorial/services/so_s_2/so_s_2.xml
+++ b/binsrc/tutorial/services/so_s_2/so_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_2/so_s_2_sample_1.vsp b/binsrc/tutorial/services/so_s_2/so_s_2_sample_1.vsp
index d5d0a23..4218ff0 100644
--- a/binsrc/tutorial/services/so_s_2/so_s_2_sample_1.vsp
+++ b/binsrc/tutorial/services/so_s_2/so_s_2_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_2_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_2_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/Extensibility.vsp b/binsrc/tutorial/services/so_s_20/Extensibility.vsp
index 190462c..f72ac7e 100644
--- a/binsrc/tutorial/services/so_s_20/Extensibility.vsp
+++ b/binsrc/tutorial/services/so_s_20/Extensibility.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: Extensibility.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: Extensibility.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp b/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp
index d1d9a79..dc988f5 100644
--- a/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp
+++ b/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ExtensibilityRequired.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: ExtensibilityRequired.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/echoDocument.vsp b/binsrc/tutorial/services/so_s_20/echoDocument.vsp
index e9f32c6..9c7c648 100644
--- a/binsrc/tutorial/services/so_s_20/echoDocument.vsp
+++ b/binsrc/tutorial/services/so_s_20/echoDocument.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoDocument.vsp,v 1.4.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: echoDocument.vsp,v 1.4 2008/04/11 09:09:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/echoEmployee.vsp b/binsrc/tutorial/services/so_s_20/echoEmployee.vsp
index 172ef67..75d55c0 100644
--- a/binsrc/tutorial/services/so_s_20/echoEmployee.vsp
+++ b/binsrc/tutorial/services/so_s_20/echoEmployee.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoEmployee.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: echoEmployee.vsp,v 1.3 2008/04/11 09:09:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/echoPerson.vsp b/binsrc/tutorial/services/so_s_20/echoPerson.vsp
index 8f11fa4..6952587 100644
--- a/binsrc/tutorial/services/so_s_20/echoPerson.vsp
+++ b/binsrc/tutorial/services/so_s_20/echoPerson.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoPerson.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: echoPerson.vsp,v 1.3 2008/04/11 09:09:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/echoString.vsp b/binsrc/tutorial/services/so_s_20/echoString.vsp
index a878cd5..1d6d822 100644
--- a/binsrc/tutorial/services/so_s_20/echoString.vsp
+++ b/binsrc/tutorial/services/so_s_20/echoString.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoString.vsp,v 1.4.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: echoString.vsp,v 1.4 2008/04/11 09:09:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/echoStringArray.vsp b/binsrc/tutorial/services/so_s_20/echoStringArray.vsp
index c22fa0f..413b090 100644
--- a/binsrc/tutorial/services/so_s_20/echoStringArray.vsp
+++ b/binsrc/tutorial/services/so_s_20/echoStringArray.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStringArray.vsp,v 1.6.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: echoStringArray.vsp,v 1.6 2008/04/11 09:09:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/echoStruct.vsp b/binsrc/tutorial/services/so_s_20/echoStruct.vsp
index 3b9604f..2254a91 100644
--- a/binsrc/tutorial/services/so_s_20/echoStruct.vsp
+++ b/binsrc/tutorial/services/so_s_20/echoStruct.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStruct.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: echoStruct.vsp,v 1.3 2008/04/11 09:09:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/echoStructArray.vsp b/binsrc/tutorial/services/so_s_20/echoStructArray.vsp
index 0a1a806..6eca649 100644
--- a/binsrc/tutorial/services/so_s_20/echoStructArray.vsp
+++ b/binsrc/tutorial/services/so_s_20/echoStructArray.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStructArray.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: echoStructArray.vsp,v 1.3 2008/04/11 09:09:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/echoStructLit.vsp b/binsrc/tutorial/services/so_s_20/echoStructLit.vsp
index fcff352..4e1c544 100644
--- a/binsrc/tutorial/services/so_s_20/echoStructLit.vsp
+++ b/binsrc/tutorial/services/so_s_20/echoStructLit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStructLit.vsp,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: echoStructLit.vsp,v 1.3 2008/04/11 09:09:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/interop3_clients.vsp b/binsrc/tutorial/services/so_s_20/interop3_clients.vsp
index e504f6c..68c87c6 100644
--- a/binsrc/tutorial/services/so_s_20/interop3_clients.vsp
+++ b/binsrc/tutorial/services/so_s_20/interop3_clients.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop3_clients.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: interop3_clients.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/options.xml b/binsrc/tutorial/services/so_s_20/options.xml
index 989c845..37a6dd8 100644
--- a/binsrc/tutorial/services/so_s_20/options.xml
+++ b/binsrc/tutorial/services/so_s_20/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_20/so_s_20.xml b/binsrc/tutorial/services/so_s_20/so_s_20.xml
index de0d4b2..4a00436 100644
--- a/binsrc/tutorial/services/so_s_20/so_s_20.xml
+++ b/binsrc/tutorial/services/so_s_20/so_s_20.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_21/google_api.sql b/binsrc/tutorial/services/so_s_21/google_api.sql
index d8e8b1d..ad7ff73 100644
--- a/binsrc/tutorial/services/so_s_21/google_api.sql
+++ b/binsrc/tutorial/services/so_s_21/google_api.sql
@@ -1,10 +1,10 @@
--
--- $Id: google_api.sql,v 1.3.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: google_api.sql,v 1.3 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_21/google_api.vsp b/binsrc/tutorial/services/so_s_21/google_api.vsp
index 1922dcd..a4d3deb 100644
--- a/binsrc/tutorial/services/so_s_21/google_api.vsp
+++ b/binsrc/tutorial/services/so_s_21/google_api.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: google_api.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: google_api.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_21/options.xml b/binsrc/tutorial/services/so_s_21/options.xml
index 1da2431..5b08612 100644
--- a/binsrc/tutorial/services/so_s_21/options.xml
+++ b/binsrc/tutorial/services/so_s_21/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_21/raw.xsl b/binsrc/tutorial/services/so_s_21/raw.xsl
index 2c825d4..1d66391 100644
--- a/binsrc/tutorial/services/so_s_21/raw.xsl
+++ b/binsrc/tutorial/services/so_s_21/raw.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: raw.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: raw.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_21/so_s_21.xml b/binsrc/tutorial/services/so_s_21/so_s_21.xml
index a44c303..7768ad3 100644
--- a/binsrc/tutorial/services/so_s_21/so_s_21.xml
+++ b/binsrc/tutorial/services/so_s_21/so_s_21.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_22/options.xml b/binsrc/tutorial/services/so_s_22/options.xml
index a81d09c..b163eae 100644
--- a/binsrc/tutorial/services/so_s_22/options.xml
+++ b/binsrc/tutorial/services/so_s_22/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_22/so_s_22.sql b/binsrc/tutorial/services/so_s_22/so_s_22.sql
index 48c476c..79e6465 100644
--- a/binsrc/tutorial/services/so_s_22/so_s_22.sql
+++ b/binsrc/tutorial/services/so_s_22/so_s_22.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_22.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_22.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_22/so_s_22.xml b/binsrc/tutorial/services/so_s_22/so_s_22.xml
index 765122c..84c4c93 100644
--- a/binsrc/tutorial/services/so_s_22/so_s_22.xml
+++ b/binsrc/tutorial/services/so_s_22/so_s_22.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_22/so_s_22_sample.vsp b/binsrc/tutorial/services/so_s_22/so_s_22_sample.vsp
index ffe5234..f2515d9 100644
--- a/binsrc/tutorial/services/so_s_22/so_s_22_sample.vsp
+++ b/binsrc/tutorial/services/so_s_22/so_s_22_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_22_sample.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: so_s_22_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_23/java_pl_wrapper.sql b/binsrc/tutorial/services/so_s_23/java_pl_wrapper.sql
index 65da5eb..502023a 100644
--- a/binsrc/tutorial/services/so_s_23/java_pl_wrapper.sql
+++ b/binsrc/tutorial/services/so_s_23/java_pl_wrapper.sql
@@ -1,10 +1,10 @@
--
--- $Id: java_pl_wrapper.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: java_pl_wrapper.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_23/java_server.java b/binsrc/tutorial/services/so_s_23/java_server.java
index f89e6cc..215960f 100644
--- a/binsrc/tutorial/services/so_s_23/java_server.java
+++ b/binsrc/tutorial/services/so_s_23/java_server.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_23/javavm_pl.xsl b/binsrc/tutorial/services/so_s_23/javavm_pl.xsl
index 5fe8232..e1961f2 100644
--- a/binsrc/tutorial/services/so_s_23/javavm_pl.xsl
+++ b/binsrc/tutorial/services/so_s_23/javavm_pl.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: javavm_pl.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: javavm_pl.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_23/javavm_xml.sql b/binsrc/tutorial/services/so_s_23/javavm_xml.sql
index 7f03c1f..4575210 100644
--- a/binsrc/tutorial/services/so_s_23/javavm_xml.sql
+++ b/binsrc/tutorial/services/so_s_23/javavm_xml.sql
@@ -1,10 +1,10 @@
--
--- $Id: javavm_xml.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: javavm_xml.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_23/options.xml b/binsrc/tutorial/services/so_s_23/options.xml
index fc5e355..7c7b972 100644
--- a/binsrc/tutorial/services/so_s_23/options.xml
+++ b/binsrc/tutorial/services/so_s_23/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_23/so_s_23.xml b/binsrc/tutorial/services/so_s_23/so_s_23.xml
index bef44ca..7d41905 100644
--- a/binsrc/tutorial/services/so_s_23/so_s_23.xml
+++ b/binsrc/tutorial/services/so_s_23/so_s_23.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_24/amazon.html b/binsrc/tutorial/services/so_s_24/amazon.html
index 2067df0..a20d569 100644
--- a/binsrc/tutorial/services/so_s_24/amazon.html
+++ b/binsrc/tutorial/services/so_s_24/amazon.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_24/amazon.sql b/binsrc/tutorial/services/so_s_24/amazon.sql
index 02d5d4f..e43118d 100644
--- a/binsrc/tutorial/services/so_s_24/amazon.sql
+++ b/binsrc/tutorial/services/so_s_24/amazon.sql
@@ -1,10 +1,10 @@
--
--- $Id: amazon.sql,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: amazon.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_24/options.xml b/binsrc/tutorial/services/so_s_24/options.xml
index 81a8b58..2a35826 100644
--- a/binsrc/tutorial/services/so_s_24/options.xml
+++ b/binsrc/tutorial/services/so_s_24/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_24/so_s_24.xml b/binsrc/tutorial/services/so_s_24/so_s_24.xml
index 0cb20da..3e28506 100644
--- a/binsrc/tutorial/services/so_s_24/so_s_24.xml
+++ b/binsrc/tutorial/services/so_s_24/so_s_24.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_24/viewhtml.xsl b/binsrc/tutorial/services/so_s_24/viewhtml.xsl
index b40e262..f84b7f1 100644
--- a/binsrc/tutorial/services/so_s_24/viewhtml.xsl
+++ b/binsrc/tutorial/services/so_s_24/viewhtml.xsl
@@ -1,11 +1,11 @@
<!--
-
- - $Id: viewhtml.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: viewhtml.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_24/viewraw.xsl b/binsrc/tutorial/services/so_s_24/viewraw.xsl
index ee134d5..ea524f6 100644
--- a/binsrc/tutorial/services/so_s_24/viewraw.xsl
+++ b/binsrc/tutorial/services/so_s_24/viewraw.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: viewraw.xsl,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+ - $Id: viewraw.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/XSD.vsp b/binsrc/tutorial/services/so_s_25/XSD.vsp
index 5eba30a..72fadb8 100644
--- a/binsrc/tutorial/services/so_s_25/XSD.vsp
+++ b/binsrc/tutorial/services/so_s_25/XSD.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: XSD.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: XSD.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/complex-rpc.vsp b/binsrc/tutorial/services/so_s_25/complex-rpc.vsp
index e8a6c3e..3041f83 100644
--- a/binsrc/tutorial/services/so_s_25/complex-rpc.vsp
+++ b/binsrc/tutorial/services/so_s_25/complex-rpc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: complex-rpc.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: complex-rpc.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/dime-doc.vsp b/binsrc/tutorial/services/so_s_25/dime-doc.vsp
index 70c9859..e461b30 100644
--- a/binsrc/tutorial/services/so_s_25/dime-doc.vsp
+++ b/binsrc/tutorial/services/so_s_25/dime-doc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dime-doc.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: dime-doc.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/dime-rpc.vsp b/binsrc/tutorial/services/so_s_25/dime-rpc.vsp
index 098eab1..3446041 100644
--- a/binsrc/tutorial/services/so_s_25/dime-rpc.vsp
+++ b/binsrc/tutorial/services/so_s_25/dime-rpc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dime-rpc.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: dime-rpc.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/mime-doc.vsp b/binsrc/tutorial/services/so_s_25/mime-doc.vsp
index 6b6d94d..a9ba063 100644
--- a/binsrc/tutorial/services/so_s_25/mime-doc.vsp
+++ b/binsrc/tutorial/services/so_s_25/mime-doc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mime-doc.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: mime-doc.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/mime-rpc.vsp b/binsrc/tutorial/services/so_s_25/mime-rpc.vsp
index b18fa78..465cf28 100644
--- a/binsrc/tutorial/services/so_s_25/mime-rpc.vsp
+++ b/binsrc/tutorial/services/so_s_25/mime-rpc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mime-rpc.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: mime-rpc.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/simple-doc.vsp b/binsrc/tutorial/services/so_s_25/simple-doc.vsp
index 63cf560..78c23e4 100644
--- a/binsrc/tutorial/services/so_s_25/simple-doc.vsp
+++ b/binsrc/tutorial/services/so_s_25/simple-doc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: simple-doc.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: simple-doc.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/simple-rpc.vsp b/binsrc/tutorial/services/so_s_25/simple-rpc.vsp
index 87195ac..df6b55f 100644
--- a/binsrc/tutorial/services/so_s_25/simple-rpc.vsp
+++ b/binsrc/tutorial/services/so_s_25/simple-rpc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: simple-rpc.vsp,v 1.2.2.1 2012/03/08 12:55:14 source Exp $
+-- $Id: simple-rpc.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_25/so_s_25.xml b/binsrc/tutorial/services/so_s_25/so_s_25.xml
index b279929..41058a4 100644
--- a/binsrc/tutorial/services/so_s_25/so_s_25.xml
+++ b/binsrc/tutorial/services/so_s_25/so_s_25.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_26/handler.vspx b/binsrc/tutorial/services/so_s_26/handler.vspx
index 20b708e..3b350aa 100644
--- a/binsrc/tutorial/services/so_s_26/handler.vspx
+++ b/binsrc/tutorial/services/so_s_26/handler.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: handler.vspx,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: handler.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_26/options.xml b/binsrc/tutorial/services/so_s_26/options.xml
index 269215b..06a549e 100644
--- a/binsrc/tutorial/services/so_s_26/options.xml
+++ b/binsrc/tutorial/services/so_s_26/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_26/redcoalsms.sql b/binsrc/tutorial/services/so_s_26/redcoalsms.sql
index bfbc658..c73a40a 100644
--- a/binsrc/tutorial/services/so_s_26/redcoalsms.sql
+++ b/binsrc/tutorial/services/so_s_26/redcoalsms.sql
@@ -1,10 +1,10 @@
--
--- $Id: redcoalsms.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: redcoalsms.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_26/setup_sms.vspx b/binsrc/tutorial/services/so_s_26/setup_sms.vspx
index 23d9db2..fc5ef64 100644
--- a/binsrc/tutorial/services/so_s_26/setup_sms.vspx
+++ b/binsrc/tutorial/services/so_s_26/setup_sms.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: setup_sms.vspx,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: setup_sms.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_26/so_s_26.xml b/binsrc/tutorial/services/so_s_26/so_s_26.xml
index 91f6c2f..30cb17b 100644
--- a/binsrc/tutorial/services/so_s_26/so_s_26.xml
+++ b/binsrc/tutorial/services/so_s_26/so_s_26.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_27/options.xml b/binsrc/tutorial/services/so_s_27/options.xml
index 1fca954..ee60d3f 100644
--- a/binsrc/tutorial/services/so_s_27/options.xml
+++ b/binsrc/tutorial/services/so_s_27/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_27/raw.xsl b/binsrc/tutorial/services/so_s_27/raw.xsl
index 2543ab2..5785cd0 100644
--- a/binsrc/tutorial/services/so_s_27/raw.xsl
+++ b/binsrc/tutorial/services/so_s_27/raw.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: raw.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: raw.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_27/so_s_27.xml b/binsrc/tutorial/services/so_s_27/so_s_27.xml
index 210101d..214d64f 100644
--- a/binsrc/tutorial/services/so_s_27/so_s_27.xml
+++ b/binsrc/tutorial/services/so_s_27/so_s_27.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_27/yahoo_geocode.html b/binsrc/tutorial/services/so_s_27/yahoo_geocode.html
index 264944f..bc5abc6 100644
--- a/binsrc/tutorial/services/so_s_27/yahoo_geocode.html
+++ b/binsrc/tutorial/services/so_s_27/yahoo_geocode.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql b/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql
index 75811a6..9a31bd5 100644
--- a/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql
+++ b/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql
@@ -1,10 +1,10 @@
--
--- $Id: yahoo_geocode.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: yahoo_geocode.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_28/data_xml.vsp b/binsrc/tutorial/services/so_s_28/data_xml.vsp
index 7b66d58..3a0970a 100644
--- a/binsrc/tutorial/services/so_s_28/data_xml.vsp
+++ b/binsrc/tutorial/services/so_s_28/data_xml.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: data_xml.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: data_xml.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_28/googlemaps.vsp b/binsrc/tutorial/services/so_s_28/googlemaps.vsp
index f903119..f20ddf1 100644
--- a/binsrc/tutorial/services/so_s_28/googlemaps.vsp
+++ b/binsrc/tutorial/services/so_s_28/googlemaps.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: googlemaps.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: googlemaps.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_28/options.xml b/binsrc/tutorial/services/so_s_28/options.xml
index 1eafa7c..0e5feab 100644
--- a/binsrc/tutorial/services/so_s_28/options.xml
+++ b/binsrc/tutorial/services/so_s_28/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_28/so_s_28.sql b/binsrc/tutorial/services/so_s_28/so_s_28.sql
index 3d6ec73..47ab8c3 100644
--- a/binsrc/tutorial/services/so_s_28/so_s_28.sql
+++ b/binsrc/tutorial/services/so_s_28/so_s_28.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_28.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_28.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_28/so_s_28.xml b/binsrc/tutorial/services/so_s_28/so_s_28.xml
index 3f3516c..81adbb8 100644
--- a/binsrc/tutorial/services/so_s_28/so_s_28.xml
+++ b/binsrc/tutorial/services/so_s_28/so_s_28.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_29/options.xml b/binsrc/tutorial/services/so_s_29/options.xml
index 1eafa7c..0e5feab 100644
--- a/binsrc/tutorial/services/so_s_29/options.xml
+++ b/binsrc/tutorial/services/so_s_29/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_29/so_s_29.xml b/binsrc/tutorial/services/so_s_29/so_s_29.xml
index 45c3058..b22f71a 100644
--- a/binsrc/tutorial/services/so_s_29/so_s_29.xml
+++ b/binsrc/tutorial/services/so_s_29/so_s_29.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_29/yahoomaps.vsp b/binsrc/tutorial/services/so_s_29/yahoomaps.vsp
index 02469ac..869effc 100644
--- a/binsrc/tutorial/services/so_s_29/yahoomaps.vsp
+++ b/binsrc/tutorial/services/so_s_29/yahoomaps.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: yahoomaps.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: yahoomaps.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_3/options.xml b/binsrc/tutorial/services/so_s_3/options.xml
index 21b8179..221307b 100644
--- a/binsrc/tutorial/services/so_s_3/options.xml
+++ b/binsrc/tutorial/services/so_s_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_3/so_s_3.xml b/binsrc/tutorial/services/so_s_3/so_s_3.xml
index 915d635..a515705 100644
--- a/binsrc/tutorial/services/so_s_3/so_s_3.xml
+++ b/binsrc/tutorial/services/so_s_3/so_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_3/so_s_3.xsl b/binsrc/tutorial/services/so_s_3/so_s_3.xsl
index 9d81616..5b160c0 100644
--- a/binsrc/tutorial/services/so_s_3/so_s_3.xsl
+++ b/binsrc/tutorial/services/so_s_3/so_s_3.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: so_s_3.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: so_s_3.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_3/so_s_3_sample_1.vsp b/binsrc/tutorial/services/so_s_3/so_s_3_sample_1.vsp
index 8f90ba4..49de24f 100644
--- a/binsrc/tutorial/services/so_s_3/so_s_3_sample_1.vsp
+++ b/binsrc/tutorial/services/so_s_3/so_s_3_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_3_sample_1.vsp,v 1.3.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_3_sample_1.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_3/so_s_3_sample_2.vsp b/binsrc/tutorial/services/so_s_3/so_s_3_sample_2.vsp
index b499de0..545d17e 100644
--- a/binsrc/tutorial/services/so_s_3/so_s_3_sample_2.vsp
+++ b/binsrc/tutorial/services/so_s_3/so_s_3_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_3_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_3_sample_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_3/so_s_3_sample_3.vsp b/binsrc/tutorial/services/so_s_3/so_s_3_sample_3.vsp
index 61f93a2..8b12631 100644
--- a/binsrc/tutorial/services/so_s_3/so_s_3_sample_3.vsp
+++ b/binsrc/tutorial/services/so_s_3/so_s_3_sample_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_3_sample_3.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_3_sample_3.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_30/options.xml b/binsrc/tutorial/services/so_s_30/options.xml
index d4248f8..a42c509 100644
--- a/binsrc/tutorial/services/so_s_30/options.xml
+++ b/binsrc/tutorial/services/so_s_30/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_30/so_s_30.java b/binsrc/tutorial/services/so_s_30/so_s_30.java
index adc1a6d..11e5db2 100644
--- a/binsrc/tutorial/services/so_s_30/so_s_30.java
+++ b/binsrc/tutorial/services/so_s_30/so_s_30.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_30/so_s_30.sql b/binsrc/tutorial/services/so_s_30/so_s_30.sql
index d514221..3289df9 100644
--- a/binsrc/tutorial/services/so_s_30/so_s_30.sql
+++ b/binsrc/tutorial/services/so_s_30/so_s_30.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_30.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_30.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_30/so_s_30.xml b/binsrc/tutorial/services/so_s_30/so_s_30.xml
index a4d17c8..b44aefd 100644
--- a/binsrc/tutorial/services/so_s_30/so_s_30.xml
+++ b/binsrc/tutorial/services/so_s_30/so_s_30.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_31/options.xml b/binsrc/tutorial/services/so_s_31/options.xml
index 4772708..09fb68a 100644
--- a/binsrc/tutorial/services/so_s_31/options.xml
+++ b/binsrc/tutorial/services/so_s_31/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_31/so_s_31.sql b/binsrc/tutorial/services/so_s_31/so_s_31.sql
index 6107892..21e0524 100644
--- a/binsrc/tutorial/services/so_s_31/so_s_31.sql
+++ b/binsrc/tutorial/services/so_s_31/so_s_31.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_31.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_31.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_31/so_s_31.xml b/binsrc/tutorial/services/so_s_31/so_s_31.xml
index 9221a55..e7858ab 100644
--- a/binsrc/tutorial/services/so_s_31/so_s_31.xml
+++ b/binsrc/tutorial/services/so_s_31/so_s_31.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_32/options.xml b/binsrc/tutorial/services/so_s_32/options.xml
index e827773..d6f34a5 100644
--- a/binsrc/tutorial/services/so_s_32/options.xml
+++ b/binsrc/tutorial/services/so_s_32/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_32/so_s_32.cs b/binsrc/tutorial/services/so_s_32/so_s_32.cs
index c3abc8f..0847395 100644
--- a/binsrc/tutorial/services/so_s_32/so_s_32.cs
+++ b/binsrc/tutorial/services/so_s_32/so_s_32.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_32/so_s_32.sql b/binsrc/tutorial/services/so_s_32/so_s_32.sql
index 06fd659..8e4794c 100644
--- a/binsrc/tutorial/services/so_s_32/so_s_32.sql
+++ b/binsrc/tutorial/services/so_s_32/so_s_32.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_32.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_32.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_32/so_s_32.xml b/binsrc/tutorial/services/so_s_32/so_s_32.xml
index e6553c2..7718ac4 100644
--- a/binsrc/tutorial/services/so_s_32/so_s_32.xml
+++ b/binsrc/tutorial/services/so_s_32/so_s_32.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_33/redcoal.sql b/binsrc/tutorial/services/so_s_33/redcoal.sql
index acb5356..9d6e901 100644
--- a/binsrc/tutorial/services/so_s_33/redcoal.sql
+++ b/binsrc/tutorial/services/so_s_33/redcoal.sql
@@ -1,10 +1,10 @@
--
--- $Id: redcoal.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: redcoal.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_33/sms.vsp b/binsrc/tutorial/services/so_s_33/sms.vsp
index afa4c84..4fbe6f9 100644
--- a/binsrc/tutorial/services/so_s_33/sms.vsp
+++ b/binsrc/tutorial/services/so_s_33/sms.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sms.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: sms.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_33/so_s_33.xml b/binsrc/tutorial/services/so_s_33/so_s_33.xml
index 3057d06..73f5b86 100644
--- a/binsrc/tutorial/services/so_s_33/so_s_33.xml
+++ b/binsrc/tutorial/services/so_s_33/so_s_33.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_34/options.xml b/binsrc/tutorial/services/so_s_34/options.xml
index 395ded9..9787a1b 100644
--- a/binsrc/tutorial/services/so_s_34/options.xml
+++ b/binsrc/tutorial/services/so_s_34/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_34/so_s_34.sql b/binsrc/tutorial/services/so_s_34/so_s_34.sql
index 475efe4..01fd72d 100644
--- a/binsrc/tutorial/services/so_s_34/so_s_34.sql
+++ b/binsrc/tutorial/services/so_s_34/so_s_34.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_34.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_34.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_34/so_s_34.xml b/binsrc/tutorial/services/so_s_34/so_s_34.xml
index c771520..72b2f19 100644
--- a/binsrc/tutorial/services/so_s_34/so_s_34.xml
+++ b/binsrc/tutorial/services/so_s_34/so_s_34.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_35/mappoint.sql b/binsrc/tutorial/services/so_s_35/mappoint.sql
index f956c0e..e0d15c4 100644
--- a/binsrc/tutorial/services/so_s_35/mappoint.sql
+++ b/binsrc/tutorial/services/so_s_35/mappoint.sql
@@ -1,10 +1,10 @@
--
--- $Id: mappoint.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: mappoint.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_35/mappoint.vsp b/binsrc/tutorial/services/so_s_35/mappoint.vsp
index a303e08..347668b 100644
--- a/binsrc/tutorial/services/so_s_35/mappoint.vsp
+++ b/binsrc/tutorial/services/so_s_35/mappoint.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mappoint.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: mappoint.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_35/mappoint.xsd b/binsrc/tutorial/services/so_s_35/mappoint.xsd
index ba6f14f..c78e691 100644
--- a/binsrc/tutorial/services/so_s_35/mappoint.xsd
+++ b/binsrc/tutorial/services/so_s_35/mappoint.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_35/so_s_35.xml b/binsrc/tutorial/services/so_s_35/so_s_35.xml
index d6fcecd..22b46fa 100644
--- a/binsrc/tutorial/services/so_s_35/so_s_35.xml
+++ b/binsrc/tutorial/services/so_s_35/so_s_35.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_36/eBay.sql b/binsrc/tutorial/services/so_s_36/eBay.sql
index 7d201f6..8cc915e 100644
--- a/binsrc/tutorial/services/so_s_36/eBay.sql
+++ b/binsrc/tutorial/services/so_s_36/eBay.sql
@@ -1,10 +1,10 @@
--
--- $Id: eBay.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: eBay.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_36/eBayCategories.vspx b/binsrc/tutorial/services/so_s_36/eBayCategories.vspx
index 4bce48c..34ef728 100644
--- a/binsrc/tutorial/services/so_s_36/eBayCategories.vspx
+++ b/binsrc/tutorial/services/so_s_36/eBayCategories.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: eBayCategories.vspx,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: eBayCategories.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl b/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl
index f082e3a..fdcf5b5 100644
--- a/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl
+++ b/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl b/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl
index 302769b..7964f01 100644
--- a/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl
+++ b/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_36/ebay_demo.sql b/binsrc/tutorial/services/so_s_36/ebay_demo.sql
index b2a1030..79534c3 100644
--- a/binsrc/tutorial/services/so_s_36/ebay_demo.sql
+++ b/binsrc/tutorial/services/so_s_36/ebay_demo.sql
@@ -1,10 +1,10 @@
--
--- $Id: ebay_demo.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ebay_demo.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_36/options.xml b/binsrc/tutorial/services/so_s_36/options.xml
index 8bd5d36..a81b3b7 100644
--- a/binsrc/tutorial/services/so_s_36/options.xml
+++ b/binsrc/tutorial/services/so_s_36/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_36/so_s_36.xml b/binsrc/tutorial/services/so_s_36/so_s_36.xml
index f59ae18..812f956 100644
--- a/binsrc/tutorial/services/so_s_36/so_s_36.xml
+++ b/binsrc/tutorial/services/so_s_36/so_s_36.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_37/nwsetup.sql b/binsrc/tutorial/services/so_s_37/nwsetup.sql
index d566a6a..6726cd6 100644
--- a/binsrc/tutorial/services/so_s_37/nwsetup.sql
+++ b/binsrc/tutorial/services/so_s_37/nwsetup.sql
@@ -1,10 +1,10 @@
--
--- $Id: nwsetup.sql,v 1.3.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: nwsetup.sql,v 1.3 2008/04/21 08:09:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_37/options.xml b/binsrc/tutorial/services/so_s_37/options.xml
index e9beb58..b9f836a 100644
--- a/binsrc/tutorial/services/so_s_37/options.xml
+++ b/binsrc/tutorial/services/so_s_37/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_37/so_s_37.xml b/binsrc/tutorial/services/so_s_37/so_s_37.xml
index 06bc603..1450f72 100644
--- a/binsrc/tutorial/services/so_s_37/so_s_37.xml
+++ b/binsrc/tutorial/services/so_s_37/so_s_37.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_4/options.xml b/binsrc/tutorial/services/so_s_4/options.xml
index 6acb4e0..ce11f8d 100644
--- a/binsrc/tutorial/services/so_s_4/options.xml
+++ b/binsrc/tutorial/services/so_s_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_4/so_s_4.sql b/binsrc/tutorial/services/so_s_4/so_s_4.sql
index dae0949..2222085 100644
--- a/binsrc/tutorial/services/so_s_4/so_s_4.sql
+++ b/binsrc/tutorial/services/so_s_4/so_s_4.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_4.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_4.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_4/so_s_4.xml b/binsrc/tutorial/services/so_s_4/so_s_4.xml
index 247d9ef..6acd842 100644
--- a/binsrc/tutorial/services/so_s_4/so_s_4.xml
+++ b/binsrc/tutorial/services/so_s_4/so_s_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_4/so_s_4_sample_1.vsp b/binsrc/tutorial/services/so_s_4/so_s_4_sample_1.vsp
index 60acee6..5166f38 100644
--- a/binsrc/tutorial/services/so_s_4/so_s_4_sample_1.vsp
+++ b/binsrc/tutorial/services/so_s_4/so_s_4_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_4_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_4_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_5/so_s_5.xml b/binsrc/tutorial/services/so_s_5/so_s_5.xml
index 729a8d9..ff6f630 100644
--- a/binsrc/tutorial/services/so_s_5/so_s_5.xml
+++ b/binsrc/tutorial/services/so_s_5/so_s_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_6/options.xml b/binsrc/tutorial/services/so_s_6/options.xml
index 69b7cd5..aed7286 100644
--- a/binsrc/tutorial/services/so_s_6/options.xml
+++ b/binsrc/tutorial/services/so_s_6/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_6/so_s_6.sql b/binsrc/tutorial/services/so_s_6/so_s_6.sql
index a835c27..54384a7 100644
--- a/binsrc/tutorial/services/so_s_6/so_s_6.sql
+++ b/binsrc/tutorial/services/so_s_6/so_s_6.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_6.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_6.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_6/so_s_6.xml b/binsrc/tutorial/services/so_s_6/so_s_6.xml
index fd8bd5d..559f111 100644
--- a/binsrc/tutorial/services/so_s_6/so_s_6.xml
+++ b/binsrc/tutorial/services/so_s_6/so_s_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_6/so_s_6_sample_1.vsp b/binsrc/tutorial/services/so_s_6/so_s_6_sample_1.vsp
index 610dbaf..283c5eb 100644
--- a/binsrc/tutorial/services/so_s_6/so_s_6_sample_1.vsp
+++ b/binsrc/tutorial/services/so_s_6/so_s_6_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_6_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_6_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_6/so_s_6_sample_2.vsp b/binsrc/tutorial/services/so_s_6/so_s_6_sample_2.vsp
index 02ae961..735b396 100644
--- a/binsrc/tutorial/services/so_s_6/so_s_6_sample_2.vsp
+++ b/binsrc/tutorial/services/so_s_6/so_s_6_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_6_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_6_sample_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_6/so_s_6_sample_3.vsp b/binsrc/tutorial/services/so_s_6/so_s_6_sample_3.vsp
index d24a568..d72aac8 100644
--- a/binsrc/tutorial/services/so_s_6/so_s_6_sample_3.vsp
+++ b/binsrc/tutorial/services/so_s_6/so_s_6_sample_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_6_sample_3.vsp,v 1.3.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_6_sample_3.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_6/wsdl_call.xsl b/binsrc/tutorial/services/so_s_6/wsdl_call.xsl
index 79fe857..898e53c 100644
--- a/binsrc/tutorial/services/so_s_6/wsdl_call.xsl
+++ b/binsrc/tutorial/services/so_s_6/wsdl_call.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: wsdl_call.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: wsdl_call.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl b/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl
index 91f58c0..22021fb 100644
--- a/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl
+++ b/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: wsdl_oper.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: wsdl_oper.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html b/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html
index b9a775e..91887b0 100644
--- a/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html
+++ b/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_7/options.xml b/binsrc/tutorial/services/so_s_7/options.xml
index 300c9bc..9da2486 100644
--- a/binsrc/tutorial/services/so_s_7/options.xml
+++ b/binsrc/tutorial/services/so_s_7/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_7/so_s_7.sql b/binsrc/tutorial/services/so_s_7/so_s_7.sql
index e615cfc..2514965 100644
--- a/binsrc/tutorial/services/so_s_7/so_s_7.sql
+++ b/binsrc/tutorial/services/so_s_7/so_s_7.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_7.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_7.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_7/so_s_7.xml b/binsrc/tutorial/services/so_s_7/so_s_7.xml
index 52253ff..0b6e10d 100644
--- a/binsrc/tutorial/services/so_s_7/so_s_7.xml
+++ b/binsrc/tutorial/services/so_s_7/so_s_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_7/so_s_7_client.vsp b/binsrc/tutorial/services/so_s_7/so_s_7_client.vsp
index 6d503ae..60a787d 100644
--- a/binsrc/tutorial/services/so_s_7/so_s_7_client.vsp
+++ b/binsrc/tutorial/services/so_s_7/so_s_7_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_7_client.vsp,v 1.3.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_7_client.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_7/so_s_7_server.vsp b/binsrc/tutorial/services/so_s_7/so_s_7_server.vsp
index 7c650e0..ac829ee 100644
--- a/binsrc/tutorial/services/so_s_7/so_s_7_server.vsp
+++ b/binsrc/tutorial/services/so_s_7/so_s_7_server.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_7_server.vsp,v 1.3.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_7_server.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_7/so_s_7_wsdl.vsp b/binsrc/tutorial/services/so_s_7/so_s_7_wsdl.vsp
index fd7d5a8..3b6c167 100644
--- a/binsrc/tutorial/services/so_s_7/so_s_7_wsdl.vsp
+++ b/binsrc/tutorial/services/so_s_7/so_s_7_wsdl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_7_wsdl.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_7_wsdl.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_7/sr.xsl b/binsrc/tutorial/services/so_s_7/sr.xsl
index 1f3849c..5fcde62 100644
--- a/binsrc/tutorial/services/so_s_7/sr.xsl
+++ b/binsrc/tutorial/services/so_s_7/sr.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sr.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: sr.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_8/options.xml b/binsrc/tutorial/services/so_s_8/options.xml
index 634cb09..28ac0ef 100644
--- a/binsrc/tutorial/services/so_s_8/options.xml
+++ b/binsrc/tutorial/services/so_s_8/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_8/so_s_8.sql b/binsrc/tutorial/services/so_s_8/so_s_8.sql
index 00b099d..6b66052 100644
--- a/binsrc/tutorial/services/so_s_8/so_s_8.sql
+++ b/binsrc/tutorial/services/so_s_8/so_s_8.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_8.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_8.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_8/so_s_8.xml b/binsrc/tutorial/services/so_s_8/so_s_8.xml
index dc7324b..d0be1d2 100644
--- a/binsrc/tutorial/services/so_s_8/so_s_8.xml
+++ b/binsrc/tutorial/services/so_s_8/so_s_8.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_8/so_s_8_client.vsp b/binsrc/tutorial/services/so_s_8/so_s_8_client.vsp
index 8670f89..f4b176a 100644
--- a/binsrc/tutorial/services/so_s_8/so_s_8_client.vsp
+++ b/binsrc/tutorial/services/so_s_8/so_s_8_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_8_client.vsp,v 1.3.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_8_client.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_8/so_s_8_server.vsp b/binsrc/tutorial/services/so_s_8/so_s_8_server.vsp
index b22beab..efe6644 100644
--- a/binsrc/tutorial/services/so_s_8/so_s_8_server.vsp
+++ b/binsrc/tutorial/services/so_s_8/so_s_8_server.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_8_server.vsp,v 1.3.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_8_server.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_8/so_s_8_wsdl.vsp b/binsrc/tutorial/services/so_s_8/so_s_8_wsdl.vsp
index 30bea98..77c59f4 100644
--- a/binsrc/tutorial/services/so_s_8/so_s_8_wsdl.vsp
+++ b/binsrc/tutorial/services/so_s_8/so_s_8_wsdl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_8_wsdl.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_8_wsdl.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_8/sr.xsl b/binsrc/tutorial/services/so_s_8/sr.xsl
index 37f7b74..6754e82 100644
--- a/binsrc/tutorial/services/so_s_8/sr.xsl
+++ b/binsrc/tutorial/services/so_s_8/sr.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sr.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: sr.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_9/options.xml b/binsrc/tutorial/services/so_s_9/options.xml
index 9a9993b..0d6a9ef 100644
--- a/binsrc/tutorial/services/so_s_9/options.xml
+++ b/binsrc/tutorial/services/so_s_9/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_9/so_s_9.sql b/binsrc/tutorial/services/so_s_9/so_s_9.sql
index 002c266..0997344 100644
--- a/binsrc/tutorial/services/so_s_9/so_s_9.sql
+++ b/binsrc/tutorial/services/so_s_9/so_s_9.sql
@@ -1,10 +1,10 @@
--
--- $Id: so_s_9.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_9.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_9/so_s_9.xml b/binsrc/tutorial/services/so_s_9/so_s_9.xml
index f344ea2..9504fc7 100644
--- a/binsrc/tutorial/services/so_s_9/so_s_9.xml
+++ b/binsrc/tutorial/services/so_s_9/so_s_9.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_9/so_s_9_client.vsp b/binsrc/tutorial/services/so_s_9/so_s_9_client.vsp
index d7a1b65..68b9881 100644
--- a/binsrc/tutorial/services/so_s_9/so_s_9_client.vsp
+++ b/binsrc/tutorial/services/so_s_9/so_s_9_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: so_s_9_client.vsp,v 1.3.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: so_s_9_client.vsp,v 1.3 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/so_s_9/sr.xsl b/binsrc/tutorial/services/so_s_9/sr.xsl
index 46cec96..e25403d 100644
--- a/binsrc/tutorial/services/so_s_9/sr.xsl
+++ b/binsrc/tutorial/services/so_s_9/sr.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sr.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: sr.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/soap.js b/binsrc/tutorial/services/soap.js
index dfd3c27..7e74882 100644
--- a/binsrc/tutorial/services/soap.js
+++ b/binsrc/tutorial/services/soap.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_1/options.xml b/binsrc/tutorial/services/ud_s_1/options.xml
index 5e1961a..f0b492d 100644
--- a/binsrc/tutorial/services/ud_s_1/options.xml
+++ b/binsrc/tutorial/services/ud_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1.sql b/binsrc/tutorial/services/ud_s_1/ud_s_1.sql
index 2865b7e..4fe4701 100644
--- a/binsrc/tutorial/services/ud_s_1/ud_s_1.sql
+++ b/binsrc/tutorial/services/ud_s_1/ud_s_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: ud_s_1.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1.xml b/binsrc/tutorial/services/ud_s_1/ud_s_1.xml
index 3d04e4f..18402bb 100644
--- a/binsrc/tutorial/services/ud_s_1/ud_s_1.xml
+++ b/binsrc/tutorial/services/ud_s_1/ud_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1.xsl b/binsrc/tutorial/services/ud_s_1/ud_s_1.xsl
index 31635d0..70dd38b 100644
--- a/binsrc/tutorial/services/ud_s_1/ud_s_1.xsl
+++ b/binsrc/tutorial/services/ud_s_1/ud_s_1.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ud_s_1.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: ud_s_1.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1_result.xsl b/binsrc/tutorial/services/ud_s_1/ud_s_1_result.xsl
index 03c5c24..80bd406 100644
--- a/binsrc/tutorial/services/ud_s_1/ud_s_1_result.xsl
+++ b/binsrc/tutorial/services/ud_s_1/ud_s_1_result.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ud_s_1_result.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: ud_s_1_result.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1_sample_1.vsp b/binsrc/tutorial/services/ud_s_1/ud_s_1_sample_1.vsp
index cf5c0e1..d7a703d 100644
--- a/binsrc/tutorial/services/ud_s_1/ud_s_1_sample_1.vsp
+++ b/binsrc/tutorial/services/ud_s_1/ud_s_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ud_s_1_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_1_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_2/options.xml b/binsrc/tutorial/services/ud_s_2/options.xml
index e4a3379..cb07cf9 100644
--- a/binsrc/tutorial/services/ud_s_2/options.xml
+++ b/binsrc/tutorial/services/ud_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_2/ud_s_2.sql b/binsrc/tutorial/services/ud_s_2/ud_s_2.sql
index 36d8176..2a8d634 100644
--- a/binsrc/tutorial/services/ud_s_2/ud_s_2.sql
+++ b/binsrc/tutorial/services/ud_s_2/ud_s_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: ud_s_2.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_2.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_2/ud_s_2.xml b/binsrc/tutorial/services/ud_s_2/ud_s_2.xml
index 7312d92..3e9677d 100644
--- a/binsrc/tutorial/services/ud_s_2/ud_s_2.xml
+++ b/binsrc/tutorial/services/ud_s_2/ud_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_2/ud_s_2.xsl b/binsrc/tutorial/services/ud_s_2/ud_s_2.xsl
index af54db3..d482b8e 100644
--- a/binsrc/tutorial/services/ud_s_2/ud_s_2.xsl
+++ b/binsrc/tutorial/services/ud_s_2/ud_s_2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ud_s_2.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: ud_s_2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_2/ud_s_2_sample_1.vsp b/binsrc/tutorial/services/ud_s_2/ud_s_2_sample_1.vsp
index ee947e1..120202a 100644
--- a/binsrc/tutorial/services/ud_s_2/ud_s_2_sample_1.vsp
+++ b/binsrc/tutorial/services/ud_s_2/ud_s_2_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ud_s_2_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_2_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/be.xml b/binsrc/tutorial/services/ud_s_3/be.xml
index a784e41..3ddf84d 100644
--- a/binsrc/tutorial/services/ud_s_3/be.xml
+++ b/binsrc/tutorial/services/ud_s_3/be.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/bnd.xml b/binsrc/tutorial/services/ud_s_3/bnd.xml
index ec6cc79..7f89189 100644
--- a/binsrc/tutorial/services/ud_s_3/bnd.xml
+++ b/binsrc/tutorial/services/ud_s_3/bnd.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/bs.xml b/binsrc/tutorial/services/ud_s_3/bs.xml
index 6e56bc1..296cebf 100644
--- a/binsrc/tutorial/services/ud_s_3/bs.xml
+++ b/binsrc/tutorial/services/ud_s_3/bs.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/options.xml b/binsrc/tutorial/services/ud_s_3/options.xml
index e69729c..15b3953 100644
--- a/binsrc/tutorial/services/ud_s_3/options.xml
+++ b/binsrc/tutorial/services/ud_s_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/tm.xml b/binsrc/tutorial/services/ud_s_3/tm.xml
index e43fe17..758b047 100644
--- a/binsrc/tutorial/services/ud_s_3/tm.xml
+++ b/binsrc/tutorial/services/ud_s_3/tm.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3.sql b/binsrc/tutorial/services/ud_s_3/ud_s_3.sql
index 112d06e..840d8f2 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3.sql
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: ud_s_3.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_3.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3.xml b/binsrc/tutorial/services/ud_s_3/ud_s_3.xml
index e9f0900..eee9fa8 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3.xml
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3.xsl b/binsrc/tutorial/services/ud_s_3/ud_s_3.xsl
index 939cf93..054de1d 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3.xsl
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: ud_s_3.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: ud_s_3.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_find.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_find.vsp
index 0bf396e..3031571 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3_find.vsp
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_find.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ud_s_3_find.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_3_find.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_sample_1.sql b/binsrc/tutorial/services/ud_s_3/ud_s_3_sample_1.sql
index 98fae56..aca9c3a 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3_sample_1.sql
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_sample_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: ud_s_3_sample_1.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_3_sample_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_1.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_1.vsp
index 13617b0..e053ea1 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_1.vsp
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ud_s_3_step_1.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_3_step_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_2.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_2.vsp
index 78f73c2..6b83996 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_2.vsp
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ud_s_3_step_2.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_3_step_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_3.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_3.vsp
index eac11c6..dbbaae2 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_3.vsp
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ud_s_3_step_3.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_3_step_3.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_4.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_4.vsp
index dae0665..d22f5b3 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_4.vsp
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_4.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ud_s_3_step_4.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_3_step_4.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_5.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_5.vsp
index 3b18c0a..0e3a1b0 100644
--- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_5.vsp
+++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_5.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ud_s_3_step_5.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ud_s_3_step_5.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_1/register_client_create.vsp b/binsrc/tutorial/services/ws_s_1/register_client_create.vsp
index abc5565..03bd7df 100644
--- a/binsrc/tutorial/services/ws_s_1/register_client_create.vsp
+++ b/binsrc/tutorial/services/ws_s_1/register_client_create.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register_client_create.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: register_client_create.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_1/ws_s_1.sql b/binsrc/tutorial/services/ws_s_1/ws_s_1.sql
index dcde0b8..49f2eaf 100644
--- a/binsrc/tutorial/services/ws_s_1/ws_s_1.sql
+++ b/binsrc/tutorial/services/ws_s_1/ws_s_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: ws_s_1.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ws_s_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_1/ws_s_1.xml b/binsrc/tutorial/services/ws_s_1/ws_s_1.xml
index 7f5619e..99290cc 100644
--- a/binsrc/tutorial/services/ws_s_1/ws_s_1.xml
+++ b/binsrc/tutorial/services/ws_s_1/ws_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_2/SymClient.cs b/binsrc/tutorial/services/ws_s_2/SymClient.cs
index baa31f9..1996b66 100644
--- a/binsrc/tutorial/services/ws_s_2/SymClient.cs
+++ b/binsrc/tutorial/services/ws_s_2/SymClient.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_2/symmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_2/symmeric_encryption_client.vsp
index 3e184b4..27cbece 100644
--- a/binsrc/tutorial/services/ws_s_2/symmeric_encryption_client.vsp
+++ b/binsrc/tutorial/services/ws_s_2/symmeric_encryption_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: symmeric_encryption_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: symmeric_encryption_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_2/virt_symmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_2/virt_symmeric_encryption_client.vsp
index e94c7c7..c8364e6 100644
--- a/binsrc/tutorial/services/ws_s_2/virt_symmeric_encryption_client.vsp
+++ b/binsrc/tutorial/services/ws_s_2/virt_symmeric_encryption_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: virt_symmeric_encryption_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: virt_symmeric_encryption_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_2/ws_s_2.xml b/binsrc/tutorial/services/ws_s_2/ws_s_2.xml
index 4ba7a69..47cca67 100644
--- a/binsrc/tutorial/services/ws_s_2/ws_s_2.xml
+++ b/binsrc/tutorial/services/ws_s_2/ws_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_3/ASymClient.cs b/binsrc/tutorial/services/ws_s_3/ASymClient.cs
index ca3a70a..aad0459 100644
--- a/binsrc/tutorial/services/ws_s_3/ASymClient.cs
+++ b/binsrc/tutorial/services/ws_s_3/ASymClient.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_3/ASymClient2.cs b/binsrc/tutorial/services/ws_s_3/ASymClient2.cs
index f623fff..e064fdf 100644
--- a/binsrc/tutorial/services/ws_s_3/ASymClient2.cs
+++ b/binsrc/tutorial/services/ws_s_3/ASymClient2.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_3/asymmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_3/asymmeric_encryption_client.vsp
index f2451a5..ee55c0d 100644
--- a/binsrc/tutorial/services/ws_s_3/asymmeric_encryption_client.vsp
+++ b/binsrc/tutorial/services/ws_s_3/asymmeric_encryption_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: asymmeric_encryption_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: asymmeric_encryption_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_3/virt_asymmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_3/virt_asymmeric_encryption_client.vsp
index d25f428..065ac81 100644
--- a/binsrc/tutorial/services/ws_s_3/virt_asymmeric_encryption_client.vsp
+++ b/binsrc/tutorial/services/ws_s_3/virt_asymmeric_encryption_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: virt_asymmeric_encryption_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: virt_asymmeric_encryption_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_3/ws_s_3.xml b/binsrc/tutorial/services/ws_s_3/ws_s_3.xml
index cb21950..b3963cf 100644
--- a/binsrc/tutorial/services/ws_s_3/ws_s_3.xml
+++ b/binsrc/tutorial/services/ws_s_3/ws_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_3/wse_asymmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_3/wse_asymmeric_encryption_client.vsp
index 43a7d0d..dcd1af2 100644
--- a/binsrc/tutorial/services/ws_s_3/wse_asymmeric_encryption_client.vsp
+++ b/binsrc/tutorial/services/ws_s_3/wse_asymmeric_encryption_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wse_asymmeric_encryption_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: wse_asymmeric_encryption_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4/virt_x509signing_client.vsp b/binsrc/tutorial/services/ws_s_4/virt_x509signing_client.vsp
index 2d0d49c..58a5050 100644
--- a/binsrc/tutorial/services/ws_s_4/virt_x509signing_client.vsp
+++ b/binsrc/tutorial/services/ws_s_4/virt_x509signing_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: virt_x509signing_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: virt_x509signing_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4/ws_s_4.xml b/binsrc/tutorial/services/ws_s_4/ws_s_4.xml
index d9cd907..2df0238 100644
--- a/binsrc/tutorial/services/ws_s_4/ws_s_4.xml
+++ b/binsrc/tutorial/services/ws_s_4/ws_s_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4/wse_x509_signing_client.vsp b/binsrc/tutorial/services/ws_s_4/wse_x509_signing_client.vsp
index 2c47d79..906464d 100644
--- a/binsrc/tutorial/services/ws_s_4/wse_x509_signing_client.vsp
+++ b/binsrc/tutorial/services/ws_s_4/wse_x509_signing_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wse_x509_signing_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: wse_x509_signing_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4/x509.xml b/binsrc/tutorial/services/ws_s_4/x509.xml
index 302239a..e8a0fc0 100644
--- a/binsrc/tutorial/services/ws_s_4/x509.xml
+++ b/binsrc/tutorial/services/ws_s_4/x509.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4/x509Client.cs b/binsrc/tutorial/services/ws_s_4/x509Client.cs
index e8809ce..8cb5285 100644
--- a/binsrc/tutorial/services/ws_s_4/x509Client.cs
+++ b/binsrc/tutorial/services/ws_s_4/x509Client.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4/x509_signing_client.vsp b/binsrc/tutorial/services/ws_s_4/x509_signing_client.vsp
index 22f24e1..e3bebf0 100644
--- a/binsrc/tutorial/services/ws_s_4/x509_signing_client.vsp
+++ b/binsrc/tutorial/services/ws_s_4/x509_signing_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: x509_signing_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: x509_signing_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs b/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs
index 0035014..d09dee2 100644
--- a/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs
+++ b/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs b/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs
index ec31057..cd7e972 100644
--- a/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs
+++ b/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4a/username_signing_client.vsp b/binsrc/tutorial/services/ws_s_4a/username_signing_client.vsp
index 3e0cddf..625d9d9 100644
--- a/binsrc/tutorial/services/ws_s_4a/username_signing_client.vsp
+++ b/binsrc/tutorial/services/ws_s_4a/username_signing_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: username_signing_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: username_signing_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_4a/ws_s_4a.xml b/binsrc/tutorial/services/ws_s_4a/ws_s_4a.xml
index 50dc7c9..d295957 100644
--- a/binsrc/tutorial/services/ws_s_4a/ws_s_4a.xml
+++ b/binsrc/tutorial/services/ws_s_4a/ws_s_4a.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_5/trust_client.vsp b/binsrc/tutorial/services/ws_s_5/trust_client.vsp
index 8fc21a7..81366b2 100644
--- a/binsrc/tutorial/services/ws_s_5/trust_client.vsp
+++ b/binsrc/tutorial/services/ws_s_5/trust_client.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trust_client.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: trust_client.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_5/ws_s_5.sql b/binsrc/tutorial/services/ws_s_5/ws_s_5.sql
index f1246ad..76d0666 100644
--- a/binsrc/tutorial/services/ws_s_5/ws_s_5.sql
+++ b/binsrc/tutorial/services/ws_s_5/ws_s_5.sql
@@ -1,10 +1,10 @@
--
--- $Id: ws_s_5.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: ws_s_5.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/ws_s_5/ws_s_5.xml b/binsrc/tutorial/services/ws_s_5/ws_s_5.xml
index 62014c8..811593d 100644
--- a/binsrc/tutorial/services/ws_s_5/ws_s_5.xml
+++ b/binsrc/tutorial/services/ws_s_5/ws_s_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/xa_s_1/options.xml b/binsrc/tutorial/services/xa_s_1/options.xml
index a81eb6d..260d791 100644
--- a/binsrc/tutorial/services/xa_s_1/options.xml
+++ b/binsrc/tutorial/services/xa_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/xa_s_1/xa_s_1.xml b/binsrc/tutorial/services/xa_s_1/xa_s_1.xml
index 699e187..406219c 100644
--- a/binsrc/tutorial/services/xa_s_1/xa_s_1.xml
+++ b/binsrc/tutorial/services/xa_s_1/xa_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/xa_s_1/xars.xsl b/binsrc/tutorial/services/xa_s_1/xars.xsl
index 25516ef..6083f88 100644
--- a/binsrc/tutorial/services/xa_s_1/xars.xsl
+++ b/binsrc/tutorial/services/xa_s_1/xars.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xars.xsl,v 1.2.2.2 2012/03/08 12:55:15 source Exp $
+ - $Id: xars.xsl,v 1.2.2.1 2011/09/12 10:51:32 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/xa_s_1/xmla.vsp b/binsrc/tutorial/services/xa_s_1/xmla.vsp
index 70a389c..d4300db 100644
--- a/binsrc/tutorial/services/xa_s_1/xmla.vsp
+++ b/binsrc/tutorial/services/xa_s_1/xmla.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xmla.vsp,v 1.6.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: xmla.vsp,v 1.6 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/xa_s_1/xmla_dsn_add.vsp b/binsrc/tutorial/services/xa_s_1/xmla_dsn_add.vsp
index a107756..73c0d1e 100644
--- a/binsrc/tutorial/services/xa_s_1/xmla_dsn_add.vsp
+++ b/binsrc/tutorial/services/xa_s_1/xmla_dsn_add.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xmla_dsn_add.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: xmla_dsn_add.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/services/xa_s_1/xmla_setup.sql b/binsrc/tutorial/services/xa_s_1/xmla_setup.sql
index 43df9cd..e44f143 100644
--- a/binsrc/tutorial/services/xa_s_1/xmla_setup.sql
+++ b/binsrc/tutorial/services/xa_s_1/xmla_setup.sql
@@ -1,10 +1,10 @@
--
--- $Id: xmla_setup.sql,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: xmla_setup.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/setup_search.sql b/binsrc/tutorial/setup_search.sql
index dc0f63f..0faf5be 100644
--- a/binsrc/tutorial/setup_search.sql
+++ b/binsrc/tutorial/setup_search.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup_search.sql,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: setup_search.sql,v 1.2 2006/08/16 07:58:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/setup_tutorial.sql b/binsrc/tutorial/setup_tutorial.sql
index 9ec1673..ac9bfe4 100644
--- a/binsrc/tutorial/setup_tutorial.sql
+++ b/binsrc/tutorial/setup_tutorial.sql
@@ -1,10 +1,10 @@
--
--- $Id: setup_tutorial.sql,v 1.7.2.3 2012/03/08 12:55:11 source Exp $
+-- $Id: setup_tutorial.sql,v 1.7.2.2 2011/07/20 09:50:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/sioc_ttl.vsp b/binsrc/tutorial/sioc_ttl.vsp
index 4ac948b..5fecc2f 100644
--- a/binsrc/tutorial/sioc_ttl.vsp
+++ b/binsrc/tutorial/sioc_ttl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sioc_ttl.vsp,v 1.1.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: sioc_ttl.vsp,v 1.1 2007/01/22 21:58:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/SyntaxHighlighter.css b/binsrc/tutorial/syntax/SyntaxHighlighter.css
index 9ddc7b9..d31ae88 100644
--- a/binsrc/tutorial/syntax/SyntaxHighlighter.css
+++ b/binsrc/tutorial/syntax/SyntaxHighlighter.css
@@ -1,10 +1,10 @@
/*
- * $Id: SyntaxHighlighter.css,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ * $Id: SyntaxHighlighter.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/shBrushCSharp.js b/binsrc/tutorial/syntax/shBrushCSharp.js
index cc05164..c9d7c19 100644
--- a/binsrc/tutorial/syntax/shBrushCSharp.js
+++ b/binsrc/tutorial/syntax/shBrushCSharp.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/shBrushDelphi.js b/binsrc/tutorial/syntax/shBrushDelphi.js
index bb26204..a094726 100644
--- a/binsrc/tutorial/syntax/shBrushDelphi.js
+++ b/binsrc/tutorial/syntax/shBrushDelphi.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/shBrushJScript.js b/binsrc/tutorial/syntax/shBrushJScript.js
index 7e42ed2..9c47dcc 100644
--- a/binsrc/tutorial/syntax/shBrushJScript.js
+++ b/binsrc/tutorial/syntax/shBrushJScript.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/shBrushPhp.js b/binsrc/tutorial/syntax/shBrushPhp.js
index b9f51b0..a504943 100644
--- a/binsrc/tutorial/syntax/shBrushPhp.js
+++ b/binsrc/tutorial/syntax/shBrushPhp.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/shBrushPython.js b/binsrc/tutorial/syntax/shBrushPython.js
index 49547ae..3310b95 100644
--- a/binsrc/tutorial/syntax/shBrushPython.js
+++ b/binsrc/tutorial/syntax/shBrushPython.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/shBrushSql.js b/binsrc/tutorial/syntax/shBrushSql.js
index 6815d4a..21273b0 100644
--- a/binsrc/tutorial/syntax/shBrushSql.js
+++ b/binsrc/tutorial/syntax/shBrushSql.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/shBrushVb.js b/binsrc/tutorial/syntax/shBrushVb.js
index 46d8ae4..462d1ce 100644
--- a/binsrc/tutorial/syntax/shBrushVb.js
+++ b/binsrc/tutorial/syntax/shBrushVb.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/syntax/shBrushXml.js b/binsrc/tutorial/syntax/shBrushXml.js
index 14508e9..7897ee9 100644
--- a/binsrc/tutorial/syntax/shBrushXml.js
+++ b/binsrc/tutorial/syntax/shBrushXml.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/tutorial.owl b/binsrc/tutorial/tutorial.owl
index f6738dc..bf38ffc 100644
--- a/binsrc/tutorial/tutorial.owl
+++ b/binsrc/tutorial/tutorial.owl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: tutorial.owl,v 1.1.2.1 2012/03/08 12:55:11 source Exp $
+ - $Id: tutorial.owl,v 1.1 2008/07/24 09:22:25 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/binsrc/tutorial/tutorial.xml b/binsrc/tutorial/tutorial.xml
index 899ac52..1f786e7 100644
--- a/binsrc/tutorial/tutorial.xml
+++ b/binsrc/tutorial/tutorial.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/tutorial3.css b/binsrc/tutorial/tutorial3.css
index 0bd26af..925b48f 100644
--- a/binsrc/tutorial/tutorial3.css
+++ b/binsrc/tutorial/tutorial3.css
@@ -1,10 +1,10 @@
/*
- * $Id: tutorial3.css,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+ * $Id: tutorial3.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/demo.css b/binsrc/tutorial/wap/demo.css
index 5094851..fed097d 100644
--- a/binsrc/tutorial/wap/demo.css
+++ b/binsrc/tutorial/wap/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/index.xml b/binsrc/tutorial/wap/index.xml
index e3d2451..cdceafb 100644
--- a/binsrc/tutorial/wap/index.xml
+++ b/binsrc/tutorial/wap/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp b/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp
index 079b7f7..7314d96 100644
--- a/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp
+++ b/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: RunHtml2wml.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: RunHtml2wml.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_1/html2wml.vsp b/binsrc/tutorial/wap/wa_b_1/html2wml.vsp
index cf20d7b..4f88fc9 100644
--- a/binsrc/tutorial/wap/wa_b_1/html2wml.vsp
+++ b/binsrc/tutorial/wap/wa_b_1/html2wml.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: html2wml.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: html2wml.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_1/html2wml.xsl b/binsrc/tutorial/wap/wa_b_1/html2wml.xsl
index 7c2a9ff..8eaf9f1 100644
--- a/binsrc/tutorial/wap/wa_b_1/html2wml.xsl
+++ b/binsrc/tutorial/wap/wa_b_1/html2wml.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: html2wml.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: html2wml.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_1/options.xml b/binsrc/tutorial/wap/wa_b_1/options.xml
index 8b41563..fa596ce 100644
--- a/binsrc/tutorial/wap/wa_b_1/options.xml
+++ b/binsrc/tutorial/wap/wa_b_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_1/wa_b_1.xml b/binsrc/tutorial/wap/wa_b_1/wa_b_1.xml
index 7f7a75a..5850a25 100644
--- a/binsrc/tutorial/wap/wa_b_1/wa_b_1.xml
+++ b/binsrc/tutorial/wap/wa_b_1/wa_b_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_2/wa_b_2.xml b/binsrc/tutorial/wap/wa_b_2/wa_b_2.xml
index 36c2417..2d7915a 100644
--- a/binsrc/tutorial/wap/wa_b_2/wa_b_2.xml
+++ b/binsrc/tutorial/wap/wa_b_2/wa_b_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_2/wapphone.vsp b/binsrc/tutorial/wap/wa_b_2/wapphone.vsp
index 77326c9..2d9972a 100644
--- a/binsrc/tutorial/wap/wa_b_2/wapphone.vsp
+++ b/binsrc/tutorial/wap/wa_b_2/wapphone.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: wapphone.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: wapphone.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_2/wapphone.xsl b/binsrc/tutorial/wap/wa_b_2/wapphone.xsl
index ceb1eba..4378108 100644
--- a/binsrc/tutorial/wap/wa_b_2/wapphone.xsl
+++ b/binsrc/tutorial/wap/wa_b_2/wapphone.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wapphone.xsl,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+ - $Id: wapphone.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp b/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp
index 86305d6..b5f1b16 100644
--- a/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: RunWapEmail.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: RunWapEmail.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/addressbook.vsp b/binsrc/tutorial/wap/wa_b_3/addressbook.vsp
index f06a45c..d03dd20 100644
--- a/binsrc/tutorial/wap/wa_b_3/addressbook.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/addressbook.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: addressbook.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: addressbook.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/checkmail.vsp b/binsrc/tutorial/wap/wa_b_3/checkmail.vsp
index 719c02e..058e36b 100644
--- a/binsrc/tutorial/wap/wa_b_3/checkmail.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/checkmail.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: checkmail.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: checkmail.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/compose.vsp b/binsrc/tutorial/wap/wa_b_3/compose.vsp
index 8f885ac..156ab62 100644
--- a/binsrc/tutorial/wap/wa_b_3/compose.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/compose.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: compose.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: compose.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/delete.vsp b/binsrc/tutorial/wap/wa_b_3/delete.vsp
index e5e397d..5a383f0 100644
--- a/binsrc/tutorial/wap/wa_b_3/delete.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/delete.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: delete.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: delete.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/folder.vsp b/binsrc/tutorial/wap/wa_b_3/folder.vsp
index e52a81c..9718e06 100644
--- a/binsrc/tutorial/wap/wa_b_3/folder.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/folder.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: folder.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: folder.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/folder_add.vsp b/binsrc/tutorial/wap/wa_b_3/folder_add.vsp
index ae1c3d1..987bbed 100644
--- a/binsrc/tutorial/wap/wa_b_3/folder_add.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/folder_add.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: folder_add.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: folder_add.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/folders.vsp b/binsrc/tutorial/wap/wa_b_3/folders.vsp
index b019347..ce4fe7e 100644
--- a/binsrc/tutorial/wap/wa_b_3/folders.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/folders.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: folders.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: folders.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/forward.vsp b/binsrc/tutorial/wap/wa_b_3/forward.vsp
index 67ea481..46edcd7 100644
--- a/binsrc/tutorial/wap/wa_b_3/forward.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/forward.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: forward.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: forward.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/getmail.vsp b/binsrc/tutorial/wap/wa_b_3/getmail.vsp
index 7695c09..9121ce7 100644
--- a/binsrc/tutorial/wap/wa_b_3/getmail.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/getmail.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: getmail.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: getmail.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/handset.vsp b/binsrc/tutorial/wap/wa_b_3/handset.vsp
index 847ce4c..72cd7c2 100644
--- a/binsrc/tutorial/wap/wa_b_3/handset.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/handset.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: handset.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: handset.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/handset_update.vsp b/binsrc/tutorial/wap/wa_b_3/handset_update.vsp
index 15a252d..2a40ddc 100644
--- a/binsrc/tutorial/wap/wa_b_3/handset_update.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/handset_update.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: handset_update.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: handset_update.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/index.vsp b/binsrc/tutorial/wap/wa_b_3/index.vsp
index 2066c66..5586e28 100644
--- a/binsrc/tutorial/wap/wa_b_3/index.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: index.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/login.vsp b/binsrc/tutorial/wap/wa_b_3/login.vsp
index ba3d557..f02df5a 100644
--- a/binsrc/tutorial/wap/wa_b_3/login.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/logout.vsp b/binsrc/tutorial/wap/wa_b_3/logout.vsp
index dfeea78..398bcb1 100644
--- a/binsrc/tutorial/wap/wa_b_3/logout.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/logout.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: logout.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: logout.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/move.vsp b/binsrc/tutorial/wap/wa_b_3/move.vsp
index c60dc08..f92b785 100644
--- a/binsrc/tutorial/wap/wa_b_3/move.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/move.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: move.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: move.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/options.xml b/binsrc/tutorial/wap/wa_b_3/options.xml
index 878ee0c..6c85671 100644
--- a/binsrc/tutorial/wap/wa_b_3/options.xml
+++ b/binsrc/tutorial/wap/wa_b_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/password.vsp b/binsrc/tutorial/wap/wa_b_3/password.vsp
index 99a2dfe..1b8a94a 100644
--- a/binsrc/tutorial/wap/wa_b_3/password.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/password.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: password.vsp,v 1.2.2.1 2012/03/08 12:55:15 source Exp $
+-- $Id: password.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/personal.vsp b/binsrc/tutorial/wap/wa_b_3/personal.vsp
index bc79f37..b788ad9 100644
--- a/binsrc/tutorial/wap/wa_b_3/personal.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/personal.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: personal.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: personal.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/personal_update.vsp b/binsrc/tutorial/wap/wa_b_3/personal_update.vsp
index 71de859..6961ab4 100644
--- a/binsrc/tutorial/wap/wa_b_3/personal_update.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/personal_update.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: personal_update.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: personal_update.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account.vsp
index 8b590b5..7fb4316 100644
--- a/binsrc/tutorial/wap/wa_b_3/pop3account.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/pop3account.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: pop3account.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: pop3account.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp
index 824961c..57aaa31 100644
--- a/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: pop3account_add.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: pop3account_add.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp
index ff64b0e..836044f 100644
--- a/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: pop3account_options.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: pop3account_options.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/read.vsp b/binsrc/tutorial/wap/wa_b_3/read.vsp
index 335b9c2..09ba7ab 100644
--- a/binsrc/tutorial/wap/wa_b_3/read.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/read.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: read.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: read.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/reply.vsp b/binsrc/tutorial/wap/wa_b_3/reply.vsp
index 78ac3a3..9ed19de 100644
--- a/binsrc/tutorial/wap/wa_b_3/reply.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/reply.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: reply.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: reply.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/save_draft.vsp b/binsrc/tutorial/wap/wa_b_3/save_draft.vsp
index 825956f..22ab79a 100644
--- a/binsrc/tutorial/wap/wa_b_3/save_draft.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/save_draft.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: save_draft.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: save_draft.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/send.vsp b/binsrc/tutorial/wap/wa_b_3/send.vsp
index 346ce77..8ae2a8d 100644
--- a/binsrc/tutorial/wap/wa_b_3/send.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/send.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: send.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: send.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/setting.vsp b/binsrc/tutorial/wap/wa_b_3/setting.vsp
index 2191ac5..1c1709f 100644
--- a/binsrc/tutorial/wap/wa_b_3/setting.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/setting.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: setting.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: setting.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/signup.vsp b/binsrc/tutorial/wap/wa_b_3/signup.vsp
index 3922988..b2892ba 100644
--- a/binsrc/tutorial/wap/wa_b_3/signup.vsp
+++ b/binsrc/tutorial/wap/wa_b_3/signup.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: signup.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: signup.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/wa_b_3.sql b/binsrc/tutorial/wap/wa_b_3/wa_b_3.sql
index 5f89b23..4f25eee 100644
--- a/binsrc/tutorial/wap/wa_b_3/wa_b_3.sql
+++ b/binsrc/tutorial/wap/wa_b_3/wa_b_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: wa_b_3.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: wa_b_3.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/wap/wa_b_3/wa_b_3.xml b/binsrc/tutorial/wap/wa_b_3/wa_b_3.xml
index 57d9ae0..d440410 100644
--- a/binsrc/tutorial/wap/wa_b_3/wa_b_3.xml
+++ b/binsrc/tutorial/wap/wa_b_3/wa_b_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/Makefile.am b/binsrc/tutorial/web/Makefile.am
index 40fcc79..3a06148 100644
--- a/binsrc/tutorial/web/Makefile.am
+++ b/binsrc/tutorial/web/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/Makefile.in b/binsrc/tutorial/web/Makefile.in
index cfffab5..dbe448c 100644
--- a/binsrc/tutorial/web/Makefile.in
+++ b/binsrc/tutorial/web/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tutorial/web/demo.css b/binsrc/tutorial/web/demo.css
index 9de9739..3ef4845 100644
--- a/binsrc/tutorial/web/demo.css
+++ b/binsrc/tutorial/web/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.3.2.1 2012/03/08 12:55:16 source Exp $
+ * $Id: demo.css,v 1.3 2007/05/04 11:24:48 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/index.xml b/binsrc/tutorial/web/index.xml
index e9d1d67..1cb5309 100644
--- a/binsrc/tutorial/web/index.xml
+++ b/binsrc/tutorial/web/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_1/options.xml b/binsrc/tutorial/web/vs_b_1/options.xml
index bb0f05c..8eab197 100644
--- a/binsrc/tutorial/web/vs_b_1/options.xml
+++ b/binsrc/tutorial/web/vs_b_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_1/vs_b_1.sql b/binsrc/tutorial/web/vs_b_1/vs_b_1.sql
index eb8f8f5..b015c52 100644
--- a/binsrc/tutorial/web/vs_b_1/vs_b_1.sql
+++ b/binsrc/tutorial/web/vs_b_1/vs_b_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_b_1.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_1/vs_b_1.xml b/binsrc/tutorial/web/vs_b_1/vs_b_1.xml
index 3123cff..e9acf4a 100644
--- a/binsrc/tutorial/web/vs_b_1/vs_b_1.xml
+++ b/binsrc/tutorial/web/vs_b_1/vs_b_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_2/options.xml b/binsrc/tutorial/web/vs_b_2/options.xml
index 2eae625..a8c8b11 100644
--- a/binsrc/tutorial/web/vs_b_2/options.xml
+++ b/binsrc/tutorial/web/vs_b_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_2/vs_b_2.xml b/binsrc/tutorial/web/vs_b_2/vs_b_2.xml
index 07dc684..e251748 100644
--- a/binsrc/tutorial/web/vs_b_2/vs_b_2.xml
+++ b/binsrc/tutorial/web/vs_b_2/vs_b_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_2/vs_b_2_sample_1.vsp b/binsrc/tutorial/web/vs_b_2/vs_b_2_sample_1.vsp
index b9d91cf..c628cad 100644
--- a/binsrc/tutorial/web/vs_b_2/vs_b_2_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_b_2/vs_b_2_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_2_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_2_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_3/vs_b_3.xml b/binsrc/tutorial/web/vs_b_3/vs_b_3.xml
index 56884db..cd820af 100644
--- a/binsrc/tutorial/web/vs_b_3/vs_b_3.xml
+++ b/binsrc/tutorial/web/vs_b_3/vs_b_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_1.vsp b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_1.vsp
index 1dd658c..256b845 100644
--- a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_3_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_3_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.sql b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.sql
index ab033b4..370596b 100644
--- a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.sql
+++ b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_b_3_sample_2.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_3_sample_2.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.vsp b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.vsp
index 20608a1..fe59376 100644
--- a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.vsp
+++ b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_3_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_3_sample_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4.xml b/binsrc/tutorial/web/vs_b_4/vs_b_4.xml
index d584ea5..abb8e0b 100644
--- a/binsrc/tutorial/web/vs_b_4/vs_b_4.xml
+++ b/binsrc/tutorial/web/vs_b_4/vs_b_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_1.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_1.vsp
index cd9affd..252ce5e 100644
--- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_4_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_4_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_2.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_2.vsp
index a779ba5..9552b6a 100644
--- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_2.vsp
+++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_4_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_4_sample_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_3.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_3.vsp
index 4350d2f..241013a 100644
--- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_3.vsp
+++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_4_sample_3.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_4_sample_3.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_4.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_4.vsp
index 7a1e517..6fab715 100644
--- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_4.vsp
+++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_4.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_4_sample_4.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_4_sample_4.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_5.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_5.vsp
index baa0603..460e34f 100644
--- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_5.vsp
+++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_5.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_4_sample_5.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_4_sample_5.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_6.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_6.vsp
index 318c0e8..2d92c90 100644
--- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_6.vsp
+++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_6.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_4_sample_6.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_4_sample_6.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_5/vs_b_5.xml b/binsrc/tutorial/web/vs_b_5/vs_b_5.xml
index 2945881..56cb9f3 100644
--- a/binsrc/tutorial/web/vs_b_5/vs_b_5.xml
+++ b/binsrc/tutorial/web/vs_b_5/vs_b_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.html b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.html
index e14a5aa..5154646 100644
--- a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.html
+++ b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.vsp b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.vsp
index 61696b0..a5b7a90 100644
--- a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_5_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_5_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_2.vsp b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_2.vsp
index 4b1c785..1faa633 100644
--- a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_2.vsp
+++ b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_5_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_5_sample_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp b/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp
index 57f17b5..3cf8cb3 100644
--- a/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp
+++ b/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: deadlock_handler.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: deadlock_handler.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_6/options.xml b/binsrc/tutorial/web/vs_b_6/options.xml
index e8b9a6d..07576fc 100644
--- a/binsrc/tutorial/web/vs_b_6/options.xml
+++ b/binsrc/tutorial/web/vs_b_6/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_6/vs_b_6.xml b/binsrc/tutorial/web/vs_b_6/vs_b_6.xml
index 56397a3..a32d070 100644
--- a/binsrc/tutorial/web/vs_b_6/vs_b_6.xml
+++ b/binsrc/tutorial/web/vs_b_6/vs_b_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_1.vsp b/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_1.vsp
index 2659162..17ce9d7 100644
--- a/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_6_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_6_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_2.vsp b/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_2.vsp
index ea09427..fe998c0 100644
--- a/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_2.vsp
+++ b/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_6_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_6_sample_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7.xml b/binsrc/tutorial/web/vs_b_7/vs_b_7.xml
index a266751..a254dd4 100644
--- a/binsrc/tutorial/web/vs_b_7/vs_b_7.xml
+++ b/binsrc/tutorial/web/vs_b_7/vs_b_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7_ddl.sql b/binsrc/tutorial/web/vs_b_7/vs_b_7_ddl.sql
index 7a3df6f..bdd5151 100644
--- a/binsrc/tutorial/web/vs_b_7/vs_b_7_ddl.sql
+++ b/binsrc/tutorial/web/vs_b_7/vs_b_7_ddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_b_7_ddl.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_7_ddl.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7_login.vsp b/binsrc/tutorial/web/vs_b_7/vs_b_7_login.vsp
index b474704..6d625ef 100644
--- a/binsrc/tutorial/web/vs_b_7/vs_b_7_login.vsp
+++ b/binsrc/tutorial/web/vs_b_7/vs_b_7_login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_7_login.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_7_login.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7_query.vsp b/binsrc/tutorial/web/vs_b_7/vs_b_7_query.vsp
index 5b06e8b..bc5c389 100644
--- a/binsrc/tutorial/web/vs_b_7/vs_b_7_query.vsp
+++ b/binsrc/tutorial/web/vs_b_7/vs_b_7_query.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_7_query.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_7_query.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7_register.vsp b/binsrc/tutorial/web/vs_b_7/vs_b_7_register.vsp
index 106807b..8a2ad45 100644
--- a/binsrc/tutorial/web/vs_b_7/vs_b_7_register.vsp
+++ b/binsrc/tutorial/web/vs_b_7/vs_b_7_register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_7_register.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_7_register.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_8/vs_b_8.xml b/binsrc/tutorial/web/vs_b_8/vs_b_8.xml
index 1efa8ad..f826392 100644
--- a/binsrc/tutorial/web/vs_b_8/vs_b_8.xml
+++ b/binsrc/tutorial/web/vs_b_8/vs_b_8.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_8/vs_b_8_ddl.sql b/binsrc/tutorial/web/vs_b_8/vs_b_8_ddl.sql
index 0d01812..41ff75d 100644
--- a/binsrc/tutorial/web/vs_b_8/vs_b_8_ddl.sql
+++ b/binsrc/tutorial/web/vs_b_8/vs_b_8_ddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_b_8_ddl.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_8_ddl.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_8/vs_b_8_media.vsp b/binsrc/tutorial/web/vs_b_8/vs_b_8_media.vsp
index ce30cf8..6ab6f8e 100644
--- a/binsrc/tutorial/web/vs_b_8/vs_b_8_media.vsp
+++ b/binsrc/tutorial/web/vs_b_8/vs_b_8_media.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_8_media.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_8_media.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_9/vs_b_9.xml b/binsrc/tutorial/web/vs_b_9/vs_b_9.xml
index d49b027..be8c408 100644
--- a/binsrc/tutorial/web/vs_b_9/vs_b_9.xml
+++ b/binsrc/tutorial/web/vs_b_9/vs_b_9.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_b_9/vs_b_9_sample_1.vsp b/binsrc/tutorial/web/vs_b_9/vs_b_9_sample_1.vsp
index 90e2fba..2fc185c 100644
--- a/binsrc/tutorial/web/vs_b_9/vs_b_9_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_b_9/vs_b_9_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_b_9_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_b_9_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_c_1/long_task.vsp b/binsrc/tutorial/web/vs_c_1/long_task.vsp
index 7e936e7..737fbe4 100644
--- a/binsrc/tutorial/web/vs_c_1/long_task.vsp
+++ b/binsrc/tutorial/web/vs_c_1/long_task.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: long_task.vsp,v 1.3.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: long_task.vsp,v 1.3 2008/12/11 14:27:28 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_c_1/vs_c_1.xml b/binsrc/tutorial/web/vs_c_1/vs_c_1.xml
index 0346d02..41faba2 100644
--- a/binsrc/tutorial/web/vs_c_1/vs_c_1.xml
+++ b/binsrc/tutorial/web/vs_c_1/vs_c_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_c_1/vs_c_1_sample_1.vsp b/binsrc/tutorial/web/vs_c_1/vs_c_1_sample_1.vsp
index c8dd1b9..fa4cad8 100644
--- a/binsrc/tutorial/web/vs_c_1/vs_c_1_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_c_1/vs_c_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_c_1_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_c_1_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_1/vs_d_1.xml b/binsrc/tutorial/web/vs_d_1/vs_d_1.xml
index ea64adf..1f9c401 100644
--- a/binsrc/tutorial/web/vs_d_1/vs_d_1.xml
+++ b/binsrc/tutorial/web/vs_d_1/vs_d_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_2/propfind.vsp b/binsrc/tutorial/web/vs_d_2/propfind.vsp
index 1db145c..f6cbc9f 100644
--- a/binsrc/tutorial/web/vs_d_2/propfind.vsp
+++ b/binsrc/tutorial/web/vs_d_2/propfind.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: propfind.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: propfind.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_2/proppatch.vsp b/binsrc/tutorial/web/vs_d_2/proppatch.vsp
index 4f7e6a9..c2d3da1 100644
--- a/binsrc/tutorial/web/vs_d_2/proppatch.vsp
+++ b/binsrc/tutorial/web/vs_d_2/proppatch.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: proppatch.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: proppatch.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_3/options.xml b/binsrc/tutorial/web/vs_d_3/options.xml
index 557233e..52d2d64 100644
--- a/binsrc/tutorial/web/vs_d_3/options.xml
+++ b/binsrc/tutorial/web/vs_d_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_3/vs_d_3.xml b/binsrc/tutorial/web/vs_d_3/vs_d_3.xml
index 240c9e5..dd623a5 100644
--- a/binsrc/tutorial/web/vs_d_3/vs_d_3.xml
+++ b/binsrc/tutorial/web/vs_d_3/vs_d_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_3/vs_d_3_sample.sql b/binsrc/tutorial/web/vs_d_3/vs_d_3_sample.sql
index 4e5fb36..b7678a6 100644
--- a/binsrc/tutorial/web/vs_d_3/vs_d_3_sample.sql
+++ b/binsrc/tutorial/web/vs_d_3/vs_d_3_sample.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_d_3_sample.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_d_3_sample.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_4/options.xml b/binsrc/tutorial/web/vs_d_4/options.xml
index bcbd218..8c7e93d 100644
--- a/binsrc/tutorial/web/vs_d_4/options.xml
+++ b/binsrc/tutorial/web/vs_d_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_4/vs_d_4.xml b/binsrc/tutorial/web/vs_d_4/vs_d_4.xml
index 00951b8..b9c91ef 100644
--- a/binsrc/tutorial/web/vs_d_4/vs_d_4.xml
+++ b/binsrc/tutorial/web/vs_d_4/vs_d_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_5/vs_d_5.xml b/binsrc/tutorial/web/vs_d_5/vs_d_5.xml
index b0b0bef..8019104 100644
--- a/binsrc/tutorial/web/vs_d_5/vs_d_5.xml
+++ b/binsrc/tutorial/web/vs_d_5/vs_d_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_5/vs_d_5_sample_1.vsp b/binsrc/tutorial/web/vs_d_5/vs_d_5_sample_1.vsp
index 63fe98c..bb2a76a 100644
--- a/binsrc/tutorial/web/vs_d_5/vs_d_5_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_d_5/vs_d_5_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_d_5_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_d_5_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_6/vs_d_6.xml b/binsrc/tutorial/web/vs_d_6/vs_d_6.xml
index f457fab..1a89eca 100644
--- a/binsrc/tutorial/web/vs_d_6/vs_d_6.xml
+++ b/binsrc/tutorial/web/vs_d_6/vs_d_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_6/vs_d_6_sample_1.vsp b/binsrc/tutorial/web/vs_d_6/vs_d_6_sample_1.vsp
index e5d8e19..615eb9d 100644
--- a/binsrc/tutorial/web/vs_d_6/vs_d_6_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_d_6/vs_d_6_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_d_6_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_d_6_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_7/options.xml b/binsrc/tutorial/web/vs_d_7/options.xml
index e0ef80f..190d017 100644
--- a/binsrc/tutorial/web/vs_d_7/options.xml
+++ b/binsrc/tutorial/web/vs_d_7/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_7/vs_d_7.sql b/binsrc/tutorial/web/vs_d_7/vs_d_7.sql
index f4f2738..c3c1792 100644
--- a/binsrc/tutorial/web/vs_d_7/vs_d_7.sql
+++ b/binsrc/tutorial/web/vs_d_7/vs_d_7.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_d_7.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_d_7.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_7/vs_d_7.xml b/binsrc/tutorial/web/vs_d_7/vs_d_7.xml
index cfff868..5c2d532 100644
--- a/binsrc/tutorial/web/vs_d_7/vs_d_7.xml
+++ b/binsrc/tutorial/web/vs_d_7/vs_d_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_8/default.vsp b/binsrc/tutorial/web/vs_d_8/default.vsp
index cef3dc4..8727076 100644
--- a/binsrc/tutorial/web/vs_d_8/default.vsp
+++ b/binsrc/tutorial/web/vs_d_8/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_8/front.vsp b/binsrc/tutorial/web/vs_d_8/front.vsp
index d90505d..5c5d377 100644
--- a/binsrc/tutorial/web/vs_d_8/front.vsp
+++ b/binsrc/tutorial/web/vs_d_8/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_8/login.vsp b/binsrc/tutorial/web/vs_d_8/login.vsp
index 8819cdd..0acbef6 100644
--- a/binsrc/tutorial/web/vs_d_8/login.vsp
+++ b/binsrc/tutorial/web/vs_d_8/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_8/options.xml b/binsrc/tutorial/web/vs_d_8/options.xml
index 430bdd3..1406b39 100644
--- a/binsrc/tutorial/web/vs_d_8/options.xml
+++ b/binsrc/tutorial/web/vs_d_8/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_8/query_gen.vsp b/binsrc/tutorial/web/vs_d_8/query_gen.vsp
index 4740267..8a1483d 100644
--- a/binsrc/tutorial/web/vs_d_8/query_gen.vsp
+++ b/binsrc/tutorial/web/vs_d_8/query_gen.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: query_gen.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: query_gen.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_8/register.vsp b/binsrc/tutorial/web/vs_d_8/register.vsp
index ff46aab..31ad276 100644
--- a/binsrc/tutorial/web/vs_d_8/register.vsp
+++ b/binsrc/tutorial/web/vs_d_8/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_8/vs_d_8.sql b/binsrc/tutorial/web/vs_d_8/vs_d_8.sql
index 7902d70..9de6857 100644
--- a/binsrc/tutorial/web/vs_d_8/vs_d_8.sql
+++ b/binsrc/tutorial/web/vs_d_8/vs_d_8.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_d_8.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_d_8.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_d_8/vs_d_8.xml b/binsrc/tutorial/web/vs_d_8/vs_d_8.xml
index 1df98f6..14441e3 100644
--- a/binsrc/tutorial/web/vs_d_8/vs_d_8.xml
+++ b/binsrc/tutorial/web/vs_d_8/vs_d_8.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_r_1/vs_r_1.sql b/binsrc/tutorial/web/vs_r_1/vs_r_1.sql
index 9044669..7a958dd 100644
--- a/binsrc/tutorial/web/vs_r_1/vs_r_1.sql
+++ b/binsrc/tutorial/web/vs_r_1/vs_r_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_r_1.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_r_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_r_1/vs_r_1.xml b/binsrc/tutorial/web/vs_r_1/vs_r_1.xml
index 68382d6..a5de033 100644
--- a/binsrc/tutorial/web/vs_r_1/vs_r_1.xml
+++ b/binsrc/tutorial/web/vs_r_1/vs_r_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_r_1/vs_r_1_run.vsp b/binsrc/tutorial/web/vs_r_1/vs_r_1_run.vsp
index 3d17517..d6d9f14 100644
--- a/binsrc/tutorial/web/vs_r_1/vs_r_1_run.vsp
+++ b/binsrc/tutorial/web/vs_r_1/vs_r_1_run.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_r_1_run.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_r_1_run.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_r_1/vs_r_1_stat.vsp b/binsrc/tutorial/web/vs_r_1/vs_r_1_stat.vsp
index 26b6522..8eae2cc 100644
--- a/binsrc/tutorial/web/vs_r_1/vs_r_1_stat.vsp
+++ b/binsrc/tutorial/web/vs_r_1/vs_r_1_stat.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_r_1_stat.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_r_1_stat.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_1/vs_s_1.xml b/binsrc/tutorial/web/vs_s_1/vs_s_1.xml
index eeed3d4..04fe87f 100644
--- a/binsrc/tutorial/web/vs_s_1/vs_s_1.xml
+++ b/binsrc/tutorial/web/vs_s_1/vs_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_2/options.xml b/binsrc/tutorial/web/vs_s_2/options.xml
index b9ece81..536e5b4 100644
--- a/binsrc/tutorial/web/vs_s_2/options.xml
+++ b/binsrc/tutorial/web/vs_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_2/vs_s_2.xml b/binsrc/tutorial/web/vs_s_2/vs_s_2.xml
index 75e40dc..ed1d7f2 100644
--- a/binsrc/tutorial/web/vs_s_2/vs_s_2.xml
+++ b/binsrc/tutorial/web/vs_s_2/vs_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.sql b/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.sql
index 1b718c1..112ab30 100644
--- a/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.sql
+++ b/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_s_2_sample_1.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_s_2_sample_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.vsp b/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.vsp
index ab0f909..1dc1b85 100644
--- a/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_s_2_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_s_2_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_3/vs_s_3.sql b/binsrc/tutorial/web/vs_s_3/vs_s_3.sql
index 3d40720..850dfe0 100644
--- a/binsrc/tutorial/web/vs_s_3/vs_s_3.sql
+++ b/binsrc/tutorial/web/vs_s_3/vs_s_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_s_3.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_s_3.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_3/vs_s_3.xml b/binsrc/tutorial/web/vs_s_3/vs_s_3.xml
index fc5d5bb..8c23644 100644
--- a/binsrc/tutorial/web/vs_s_3/vs_s_3.xml
+++ b/binsrc/tutorial/web/vs_s_3/vs_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_4/options.xml b/binsrc/tutorial/web/vs_s_4/options.xml
index e0ef80f..190d017 100644
--- a/binsrc/tutorial/web/vs_s_4/options.xml
+++ b/binsrc/tutorial/web/vs_s_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_4/vs_s_4.sql b/binsrc/tutorial/web/vs_s_4/vs_s_4.sql
index 358f32a..a10d9bf 100644
--- a/binsrc/tutorial/web/vs_s_4/vs_s_4.sql
+++ b/binsrc/tutorial/web/vs_s_4/vs_s_4.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_s_4.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_s_4.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_4/vs_s_4.xml b/binsrc/tutorial/web/vs_s_4/vs_s_4.xml
index 80b6ce5..c17a1cc 100644
--- a/binsrc/tutorial/web/vs_s_4/vs_s_4.xml
+++ b/binsrc/tutorial/web/vs_s_4/vs_s_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_5/options.xml b/binsrc/tutorial/web/vs_s_5/options.xml
index 300e870..e306635 100644
--- a/binsrc/tutorial/web/vs_s_5/options.xml
+++ b/binsrc/tutorial/web/vs_s_5/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_5/vs_s_5.sql b/binsrc/tutorial/web/vs_s_5/vs_s_5.sql
index 93b5fa5..3b02179 100644
--- a/binsrc/tutorial/web/vs_s_5/vs_s_5.sql
+++ b/binsrc/tutorial/web/vs_s_5/vs_s_5.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_s_5.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_s_5.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_5/vs_s_5.xml b/binsrc/tutorial/web/vs_s_5/vs_s_5.xml
index 5d3eaf7..6693799 100644
--- a/binsrc/tutorial/web/vs_s_5/vs_s_5.xml
+++ b/binsrc/tutorial/web/vs_s_5/vs_s_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_6/options.xml b/binsrc/tutorial/web/vs_s_6/options.xml
index 300e870..e306635 100644
--- a/binsrc/tutorial/web/vs_s_6/options.xml
+++ b/binsrc/tutorial/web/vs_s_6/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_6/vs_s_6.sql b/binsrc/tutorial/web/vs_s_6/vs_s_6.sql
index 09e19d2..27f358d 100644
--- a/binsrc/tutorial/web/vs_s_6/vs_s_6.sql
+++ b/binsrc/tutorial/web/vs_s_6/vs_s_6.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_s_6.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_s_6.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_6/vs_s_6.xml b/binsrc/tutorial/web/vs_s_6/vs_s_6.xml
index 3ca6c10..7e06239 100644
--- a/binsrc/tutorial/web/vs_s_6/vs_s_6.xml
+++ b/binsrc/tutorial/web/vs_s_6/vs_s_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_s_7/vs_s_7.xml b/binsrc/tutorial/web/vs_s_7/vs_s_7.xml
index ed25772..116a642 100644
--- a/binsrc/tutorial/web/vs_s_7/vs_s_7.xml
+++ b/binsrc/tutorial/web/vs_s_7/vs_s_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_1/vs_u_1.xml b/binsrc/tutorial/web/vs_u_1/vs_u_1.xml
index da58ce7..f8704a3 100644
--- a/binsrc/tutorial/web/vs_u_1/vs_u_1.xml
+++ b/binsrc/tutorial/web/vs_u_1/vs_u_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_2/default.vsp b/binsrc/tutorial/web/vs_u_2/default.vsp
index 47e6708..d2bf7cd 100644
--- a/binsrc/tutorial/web/vs_u_2/default.vsp
+++ b/binsrc/tutorial/web/vs_u_2/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_2/front.vsp b/binsrc/tutorial/web/vs_u_2/front.vsp
index de3c94d..7ede421 100644
--- a/binsrc/tutorial/web/vs_u_2/front.vsp
+++ b/binsrc/tutorial/web/vs_u_2/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_2/login.vsp b/binsrc/tutorial/web/vs_u_2/login.vsp
index d296f19..7f50f9f 100644
--- a/binsrc/tutorial/web/vs_u_2/login.vsp
+++ b/binsrc/tutorial/web/vs_u_2/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_2/options.xml b/binsrc/tutorial/web/vs_u_2/options.xml
index bc26491..4ca091a 100644
--- a/binsrc/tutorial/web/vs_u_2/options.xml
+++ b/binsrc/tutorial/web/vs_u_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_2/register.vsp b/binsrc/tutorial/web/vs_u_2/register.vsp
index 8c0311b..6955893 100644
--- a/binsrc/tutorial/web/vs_u_2/register.vsp
+++ b/binsrc/tutorial/web/vs_u_2/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_2/vs_u_2.sql b/binsrc/tutorial/web/vs_u_2/vs_u_2.sql
index cc7008e..c513ef0 100644
--- a/binsrc/tutorial/web/vs_u_2/vs_u_2.sql
+++ b/binsrc/tutorial/web/vs_u_2/vs_u_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_u_2.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_u_2.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_2/vs_u_2.xml b/binsrc/tutorial/web/vs_u_2/vs_u_2.xml
index 9ed8ea7..4ff66c7 100644
--- a/binsrc/tutorial/web/vs_u_2/vs_u_2.xml
+++ b/binsrc/tutorial/web/vs_u_2/vs_u_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_3/default.vsp b/binsrc/tutorial/web/vs_u_3/default.vsp
index cf25a67..15561a0 100644
--- a/binsrc/tutorial/web/vs_u_3/default.vsp
+++ b/binsrc/tutorial/web/vs_u_3/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_3/front.vsp b/binsrc/tutorial/web/vs_u_3/front.vsp
index a6e9adf..517c2a0 100644
--- a/binsrc/tutorial/web/vs_u_3/front.vsp
+++ b/binsrc/tutorial/web/vs_u_3/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_3/login.vsp b/binsrc/tutorial/web/vs_u_3/login.vsp
index cc71133..4f5c10e 100644
--- a/binsrc/tutorial/web/vs_u_3/login.vsp
+++ b/binsrc/tutorial/web/vs_u_3/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_3/options.xml b/binsrc/tutorial/web/vs_u_3/options.xml
index 1553a74..0b753fb 100644
--- a/binsrc/tutorial/web/vs_u_3/options.xml
+++ b/binsrc/tutorial/web/vs_u_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_3/register.vsp b/binsrc/tutorial/web/vs_u_3/register.vsp
index 0e0d59d..6c0a4f1 100644
--- a/binsrc/tutorial/web/vs_u_3/register.vsp
+++ b/binsrc/tutorial/web/vs_u_3/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_3/vs_u_3.sql b/binsrc/tutorial/web/vs_u_3/vs_u_3.sql
index a9e5da9..4cc32a5 100644
--- a/binsrc/tutorial/web/vs_u_3/vs_u_3.sql
+++ b/binsrc/tutorial/web/vs_u_3/vs_u_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_u_3.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_u_3.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_3/vs_u_3.xml b/binsrc/tutorial/web/vs_u_3/vs_u_3.xml
index 16613ac..adbf692 100644
--- a/binsrc/tutorial/web/vs_u_3/vs_u_3.xml
+++ b/binsrc/tutorial/web/vs_u_3/vs_u_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_4/default.vsp b/binsrc/tutorial/web/vs_u_4/default.vsp
index 3e2ab4e..518af4d 100644
--- a/binsrc/tutorial/web/vs_u_4/default.vsp
+++ b/binsrc/tutorial/web/vs_u_4/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_4/front.vsp b/binsrc/tutorial/web/vs_u_4/front.vsp
index 45621e9..d916bdd 100644
--- a/binsrc/tutorial/web/vs_u_4/front.vsp
+++ b/binsrc/tutorial/web/vs_u_4/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_4/logout.vsp b/binsrc/tutorial/web/vs_u_4/logout.vsp
index 700fe94..2977520 100644
--- a/binsrc/tutorial/web/vs_u_4/logout.vsp
+++ b/binsrc/tutorial/web/vs_u_4/logout.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: logout.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: logout.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_4/options.xml b/binsrc/tutorial/web/vs_u_4/options.xml
index db93532..9cfd6ce 100644
--- a/binsrc/tutorial/web/vs_u_4/options.xml
+++ b/binsrc/tutorial/web/vs_u_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_4/register.vsp b/binsrc/tutorial/web/vs_u_4/register.vsp
index eeb5ee4..8006f1d 100644
--- a/binsrc/tutorial/web/vs_u_4/register.vsp
+++ b/binsrc/tutorial/web/vs_u_4/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_4/vs_u_4.sql b/binsrc/tutorial/web/vs_u_4/vs_u_4.sql
index f1b25a8..3762fdd 100644
--- a/binsrc/tutorial/web/vs_u_4/vs_u_4.sql
+++ b/binsrc/tutorial/web/vs_u_4/vs_u_4.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_u_4.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_u_4.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_4/vs_u_4.xml b/binsrc/tutorial/web/vs_u_4/vs_u_4.xml
index 7d160d4..18195c4 100644
--- a/binsrc/tutorial/web/vs_u_4/vs_u_4.xml
+++ b/binsrc/tutorial/web/vs_u_4/vs_u_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_5/default.vsp b/binsrc/tutorial/web/vs_u_5/default.vsp
index 41584a8..60a9b88 100644
--- a/binsrc/tutorial/web/vs_u_5/default.vsp
+++ b/binsrc/tutorial/web/vs_u_5/default.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: default.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: default.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_5/front.vsp b/binsrc/tutorial/web/vs_u_5/front.vsp
index 28b272f..213328f 100644
--- a/binsrc/tutorial/web/vs_u_5/front.vsp
+++ b/binsrc/tutorial/web/vs_u_5/front.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: front.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: front.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_5/login.vsp b/binsrc/tutorial/web/vs_u_5/login.vsp
index d8bf497..b6f782e 100644
--- a/binsrc/tutorial/web/vs_u_5/login.vsp
+++ b/binsrc/tutorial/web/vs_u_5/login.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: login.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: login.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_5/options.xml b/binsrc/tutorial/web/vs_u_5/options.xml
index 44490c6..78995b3 100644
--- a/binsrc/tutorial/web/vs_u_5/options.xml
+++ b/binsrc/tutorial/web/vs_u_5/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_5/register.vsp b/binsrc/tutorial/web/vs_u_5/register.vsp
index 761022a..ed94fad 100644
--- a/binsrc/tutorial/web/vs_u_5/register.vsp
+++ b/binsrc/tutorial/web/vs_u_5/register.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: register.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: register.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_5/vs_u_5.sql b/binsrc/tutorial/web/vs_u_5/vs_u_5.sql
index 0b547d4..53738d0 100644
--- a/binsrc/tutorial/web/vs_u_5/vs_u_5.sql
+++ b/binsrc/tutorial/web/vs_u_5/vs_u_5.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_u_5.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_u_5.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_5/vs_u_5.xml b/binsrc/tutorial/web/vs_u_5/vs_u_5.xml
index 9293e25..06da023 100644
--- a/binsrc/tutorial/web/vs_u_5/vs_u_5.xml
+++ b/binsrc/tutorial/web/vs_u_5/vs_u_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_7/options.xml b/binsrc/tutorial/web/vs_u_7/options.xml
index 4bab9ca..6d691a0 100644
--- a/binsrc/tutorial/web/vs_u_7/options.xml
+++ b/binsrc/tutorial/web/vs_u_7/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7.sql b/binsrc/tutorial/web/vs_u_7/vs_u_7.sql
index 9ec9c1a..2923eb8 100644
--- a/binsrc/tutorial/web/vs_u_7/vs_u_7.sql
+++ b/binsrc/tutorial/web/vs_u_7/vs_u_7.sql
@@ -1,10 +1,10 @@
--
--- $Id: vs_u_7.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_u_7.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7.xml b/binsrc/tutorial/web/vs_u_7/vs_u_7.xml
index e0dfb8b..4da02cb 100644
--- a/binsrc/tutorial/web/vs_u_7/vs_u_7.xml
+++ b/binsrc/tutorial/web/vs_u_7/vs_u_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_1.vsp b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_1.vsp
index d407638..389758e 100644
--- a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_1.vsp
+++ b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_u_7_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_u_7_sample_1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_2.vsp b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_2.vsp
index 193be05..b2cb091 100644
--- a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_2.vsp
+++ b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_u_7_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_u_7_sample_2.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_3.vsp b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_3.vsp
index ae50f49..4ee1040 100644
--- a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_3.vsp
+++ b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_u_7_sample_3.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_u_7_sample_3.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_1/options.xml b/binsrc/tutorial/web/vs_x_1/options.xml
index a7626d9..a29e8ff 100644
--- a/binsrc/tutorial/web/vs_x_1/options.xml
+++ b/binsrc/tutorial/web/vs_x_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_1/shippers.vsp b/binsrc/tutorial/web/vs_x_1/shippers.vsp
index 4dddf0b..21e8305 100644
--- a/binsrc/tutorial/web/vs_x_1/shippers.vsp
+++ b/binsrc/tutorial/web/vs_x_1/shippers.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: shippers.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: shippers.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_1/shippers.xsl b/binsrc/tutorial/web/vs_x_1/shippers.xsl
index 05a4260..f02dc25 100644
--- a/binsrc/tutorial/web/vs_x_1/shippers.xsl
+++ b/binsrc/tutorial/web/vs_x_1/shippers.xsl
@@ -1,11 +1,11 @@
<!--
-
- - $Id: shippers.xsl,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: shippers.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_1/tsales.vsp b/binsrc/tutorial/web/vs_x_1/tsales.vsp
index d2f1ef4..0093c8a 100644
--- a/binsrc/tutorial/web/vs_x_1/tsales.vsp
+++ b/binsrc/tutorial/web/vs_x_1/tsales.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: tsales.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: tsales.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_1/tsales.xsl b/binsrc/tutorial/web/vs_x_1/tsales.xsl
index f30aa3c..fc16e67 100644
--- a/binsrc/tutorial/web/vs_x_1/tsales.xsl
+++ b/binsrc/tutorial/web/vs_x_1/tsales.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tsales.xsl,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: tsales.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_1/tsales1.vsp b/binsrc/tutorial/web/vs_x_1/tsales1.vsp
index fd17613..104d7ad 100644
--- a/binsrc/tutorial/web/vs_x_1/tsales1.vsp
+++ b/binsrc/tutorial/web/vs_x_1/tsales1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: tsales1.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: tsales1.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_1/tsales2.xsl b/binsrc/tutorial/web/vs_x_1/tsales2.xsl
index 9c19582..bd6d3cc 100644
--- a/binsrc/tutorial/web/vs_x_1/tsales2.xsl
+++ b/binsrc/tutorial/web/vs_x_1/tsales2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tsales2.xsl,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: tsales2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_1/vs_x_1.xml b/binsrc/tutorial/web/vs_x_1/vs_x_1.xml
index 38f3063..ba248e4 100644
--- a/binsrc/tutorial/web/vs_x_1/vs_x_1.xml
+++ b/binsrc/tutorial/web/vs_x_1/vs_x_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_2/options.xml b/binsrc/tutorial/web/vs_x_2/options.xml
index a7626d9..a29e8ff 100644
--- a/binsrc/tutorial/web/vs_x_2/options.xml
+++ b/binsrc/tutorial/web/vs_x_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_2/shippers.vsp b/binsrc/tutorial/web/vs_x_2/shippers.vsp
index fd09938..6f23af2 100644
--- a/binsrc/tutorial/web/vs_x_2/shippers.vsp
+++ b/binsrc/tutorial/web/vs_x_2/shippers.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: shippers.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: shippers.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_2/shippers.xsl b/binsrc/tutorial/web/vs_x_2/shippers.xsl
index 6b3a282..af2e96b 100644
--- a/binsrc/tutorial/web/vs_x_2/shippers.xsl
+++ b/binsrc/tutorial/web/vs_x_2/shippers.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: shippers.xsl,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: shippers.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_2/vs_x_2.xml b/binsrc/tutorial/web/vs_x_2/vs_x_2.xml
index 98a87a1..3ad9172 100644
--- a/binsrc/tutorial/web/vs_x_2/vs_x_2.xml
+++ b/binsrc/tutorial/web/vs_x_2/vs_x_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_3/options.xml b/binsrc/tutorial/web/vs_x_3/options.xml
index a7626d9..a29e8ff 100644
--- a/binsrc/tutorial/web/vs_x_3/options.xml
+++ b/binsrc/tutorial/web/vs_x_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_3/shippers.vsp b/binsrc/tutorial/web/vs_x_3/shippers.vsp
index 1dffc0c..f5c62cd 100644
--- a/binsrc/tutorial/web/vs_x_3/shippers.vsp
+++ b/binsrc/tutorial/web/vs_x_3/shippers.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: shippers.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: shippers.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_3/shippers.xsl b/binsrc/tutorial/web/vs_x_3/shippers.xsl
index 4755ccc..08dc12a 100644
--- a/binsrc/tutorial/web/vs_x_3/shippers.xsl
+++ b/binsrc/tutorial/web/vs_x_3/shippers.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: shippers.xsl,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: shippers.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_x_3/vs_x_3.xml b/binsrc/tutorial/web/vs_x_3/vs_x_3.xml
index a56130d..b2f737f 100644
--- a/binsrc/tutorial/web/vs_x_3/vs_x_3.xml
+++ b/binsrc/tutorial/web/vs_x_3/vs_x_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_xr_1/options.xml b/binsrc/tutorial/web/vs_xr_1/options.xml
index a7626d9..a29e8ff 100644
--- a/binsrc/tutorial/web/vs_xr_1/options.xml
+++ b/binsrc/tutorial/web/vs_xr_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xml b/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xml
index bb722a1..c3ac390 100644
--- a/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xml
+++ b/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xsl b/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xsl
index 2619dfb..56985ed 100644
--- a/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xsl
+++ b/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vs_xr_1.xsl,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: vs_xr_1.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_xr_1/vs_xr_1_qry.vsp b/binsrc/tutorial/web/vs_xr_1/vs_xr_1_qry.vsp
index 2026d4b..f84ac63 100644
--- a/binsrc/tutorial/web/vs_xr_1/vs_xr_1_qry.vsp
+++ b/binsrc/tutorial/web/vs_xr_1/vs_xr_1_qry.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_xr_1_qry.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_xr_1_qry.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_xr_2/options.xml b/binsrc/tutorial/web/vs_xr_2/options.xml
index a7626d9..a29e8ff 100644
--- a/binsrc/tutorial/web/vs_xr_2/options.xml
+++ b/binsrc/tutorial/web/vs_xr_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xml b/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xml
index 3bf95ef..0941bfc 100644
--- a/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xml
+++ b/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xsl b/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xsl
index 6de39de..a841ef6 100644
--- a/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xsl
+++ b/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vs_xr_2.xsl,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: vs_xr_2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vs_xr_2/vs_xr_2_qry.vsp b/binsrc/tutorial/web/vs_xr_2/vs_xr_2_qry.vsp
index d6573f9..b71a7cf 100644
--- a/binsrc/tutorial/web/vs_xr_2/vs_xr_2_qry.vsp
+++ b/binsrc/tutorial/web/vs_xr_2/vs_xr_2_qry.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vs_xr_2_qry.vsp,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vs_xr_2_qry.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_1/options.xml b/binsrc/tutorial/web/vx_s_1/options.xml
index 408d1fd..9fd8902 100644
--- a/binsrc/tutorial/web/vx_s_1/options.xml
+++ b/binsrc/tutorial/web/vx_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_1/simple.vspx b/binsrc/tutorial/web/vx_s_1/simple.vspx
index 6f57cc5..5308b1a 100644
--- a/binsrc/tutorial/web/vx_s_1/simple.vspx
+++ b/binsrc/tutorial/web/vx_s_1/simple.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: simple.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: simple.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_1/vx_s_1.xml b/binsrc/tutorial/web/vx_s_1/vx_s_1.xml
index 1cdf23d..7cf1d63 100644
--- a/binsrc/tutorial/web/vx_s_1/vx_s_1.xml
+++ b/binsrc/tutorial/web/vx_s_1/vx_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_10/order.vspx b/binsrc/tutorial/web/vx_s_10/order.vspx
index 3c5ff28..79eb05e 100644
--- a/binsrc/tutorial/web/vx_s_10/order.vspx
+++ b/binsrc/tutorial/web/vx_s_10/order.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: order.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: order.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_10/vx_s_10.sql b/binsrc/tutorial/web/vx_s_10/vx_s_10.sql
index 505bf99..3e7ee25 100644
--- a/binsrc/tutorial/web/vx_s_10/vx_s_10.sql
+++ b/binsrc/tutorial/web/vx_s_10/vx_s_10.sql
@@ -1,10 +1,10 @@
--
--- $Id: vx_s_10.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vx_s_10.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_10/vx_s_10.xml b/binsrc/tutorial/web/vx_s_10/vx_s_10.xml
index 670b60a..3e99a6e 100644
--- a/binsrc/tutorial/web/vx_s_10/vx_s_10.xml
+++ b/binsrc/tutorial/web/vx_s_10/vx_s_10.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_11/options.xml b/binsrc/tutorial/web/vx_s_11/options.xml
index dd9b265..3bab546 100644
--- a/binsrc/tutorial/web/vx_s_11/options.xml
+++ b/binsrc/tutorial/web/vx_s_11/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_11/vx_s_11.xml b/binsrc/tutorial/web/vx_s_11/vx_s_11.xml
index 99f96ec..4863612 100644
--- a/binsrc/tutorial/web/vx_s_11/vx_s_11.xml
+++ b/binsrc/tutorial/web/vx_s_11/vx_s_11.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_11/vx_s_11_sample.vspx b/binsrc/tutorial/web/vx_s_11/vx_s_11_sample.vspx
index 51c2b65..c39180b 100644
--- a/binsrc/tutorial/web/vx_s_11/vx_s_11_sample.vspx
+++ b/binsrc/tutorial/web/vx_s_11/vx_s_11_sample.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vx_s_11_sample.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: vx_s_11_sample.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_12/options.xml b/binsrc/tutorial/web/vx_s_12/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/web/vx_s_12/options.xml
+++ b/binsrc/tutorial/web/vx_s_12/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_12/vx_s_12.sql b/binsrc/tutorial/web/vx_s_12/vx_s_12.sql
index 10324de..e84306c 100644
--- a/binsrc/tutorial/web/vx_s_12/vx_s_12.sql
+++ b/binsrc/tutorial/web/vx_s_12/vx_s_12.sql
@@ -1,10 +1,10 @@
--
--- $Id: vx_s_12.sql,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vx_s_12.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_12/vx_s_12.xml b/binsrc/tutorial/web/vx_s_12/vx_s_12.xml
index 9c67106..0605281 100644
--- a/binsrc/tutorial/web/vx_s_12/vx_s_12.xml
+++ b/binsrc/tutorial/web/vx_s_12/vx_s_12.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_12/vx_s_12_sample.vspx b/binsrc/tutorial/web/vx_s_12/vx_s_12_sample.vspx
index 0f9a007..742e879 100644
--- a/binsrc/tutorial/web/vx_s_12/vx_s_12_sample.vspx
+++ b/binsrc/tutorial/web/vx_s_12/vx_s_12_sample.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vx_s_12_sample.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: vx_s_12_sample.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/atom.xml b/binsrc/tutorial/web/vx_s_13/atom.xml
index f3d9060..29b2ebc 100644
--- a/binsrc/tutorial/web/vx_s_13/atom.xml
+++ b/binsrc/tutorial/web/vx_s_13/atom.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: atom.xml,v 1.1.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: atom.xml,v 1.1 2006/07/13 13:17:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/c_data.vspx b/binsrc/tutorial/web/vx_s_13/c_data.vspx
index cb01be2..b1d30b6 100644
--- a/binsrc/tutorial/web/vx_s_13/c_data.vspx
+++ b/binsrc/tutorial/web/vx_s_13/c_data.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: c_data.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: c_data.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/c_disp.vspx b/binsrc/tutorial/web/vx_s_13/c_disp.vspx
index 57f006e..b9b765a 100644
--- a/binsrc/tutorial/web/vx_s_13/c_disp.vspx
+++ b/binsrc/tutorial/web/vx_s_13/c_disp.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: c_disp.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: c_disp.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/c_edit.vspx b/binsrc/tutorial/web/vx_s_13/c_edit.vspx
index 114eb31..6d2530b 100644
--- a/binsrc/tutorial/web/vx_s_13/c_edit.vspx
+++ b/binsrc/tutorial/web/vx_s_13/c_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: c_edit.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: c_edit.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/countries.xml b/binsrc/tutorial/web/vx_s_13/countries.xml
index d3dbf4f..f5989f0 100644
--- a/binsrc/tutorial/web/vx_s_13/countries.xml
+++ b/binsrc/tutorial/web/vx_s_13/countries.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- - $Id: countries.xml,v 1.1.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: countries.xml,v 1.1 2006/07/13 13:17:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/options.xml b/binsrc/tutorial/web/vx_s_13/options.xml
index ec3e3ce..65df1ac 100644
--- a/binsrc/tutorial/web/vx_s_13/options.xml
+++ b/binsrc/tutorial/web/vx_s_13/options.xml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: options.xml,v 1.1.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: options.xml,v 1.1 2006/07/13 13:17:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/rdf.xml b/binsrc/tutorial/web/vx_s_13/rdf.xml
index 5999846..c54557d 100644
--- a/binsrc/tutorial/web/vx_s_13/rdf.xml
+++ b/binsrc/tutorial/web/vx_s_13/rdf.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: rdf.xml,v 1.1.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: rdf.xml,v 1.1 2006/07/13 13:17:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/rss.xml b/binsrc/tutorial/web/vx_s_13/rss.xml
index 94d018f..0590286 100644
--- a/binsrc/tutorial/web/vx_s_13/rss.xml
+++ b/binsrc/tutorial/web/vx_s_13/rss.xml
@@ -1,12 +1,12 @@
<?xml version ='1.0' encoding='UTF-8'?>
<!--
-
- - $Id: rss.xml,v 1.1.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: rss.xml,v 1.1 2006/07/13 13:17:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_13/vx_s_13.sql b/binsrc/tutorial/web/vx_s_13/vx_s_13.sql
index 90fe240..756acf1 100644
--- a/binsrc/tutorial/web/vx_s_13/vx_s_13.sql
+++ b/binsrc/tutorial/web/vx_s_13/vx_s_13.sql
@@ -1,10 +1,10 @@
--
--- $Id: vx_s_13.sql,v 1.1.2.1 2012/03/08 12:55:16 source Exp $
+-- $Id: vx_s_13.sql,v 1.1 2006/07/13 13:17:49 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/check_box.vspx b/binsrc/tutorial/web/vx_s_2/check_box.vspx
index 52ad8f9..cc0c355 100644
--- a/binsrc/tutorial/web/vx_s_2/check_box.vspx
+++ b/binsrc/tutorial/web/vx_s_2/check_box.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: check_box.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: check_box.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/date.vspx b/binsrc/tutorial/web/vx_s_2/date.vspx
index a60ea02..cba9613 100644
--- a/binsrc/tutorial/web/vx_s_2/date.vspx
+++ b/binsrc/tutorial/web/vx_s_2/date.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: date.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: date.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/form.vspx b/binsrc/tutorial/web/vx_s_2/form.vspx
index 26548be..6b77ef5 100644
--- a/binsrc/tutorial/web/vx_s_2/form.vspx
+++ b/binsrc/tutorial/web/vx_s_2/form.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: form.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: form.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/options.xml b/binsrc/tutorial/web/vx_s_2/options.xml
index 408d1fd..9fd8902 100644
--- a/binsrc/tutorial/web/vx_s_2/options.xml
+++ b/binsrc/tutorial/web/vx_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/radio.vspx b/binsrc/tutorial/web/vx_s_2/radio.vspx
index 08757c8..3d9112e 100644
--- a/binsrc/tutorial/web/vx_s_2/radio.vspx
+++ b/binsrc/tutorial/web/vx_s_2/radio.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: radio.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: radio.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/radio_group.vspx b/binsrc/tutorial/web/vx_s_2/radio_group.vspx
index 2920952..abd89c3 100644
--- a/binsrc/tutorial/web/vx_s_2/radio_group.vspx
+++ b/binsrc/tutorial/web/vx_s_2/radio_group.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: radio_group.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: radio_group.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/select.vspx b/binsrc/tutorial/web/vx_s_2/select.vspx
index 3d35634..2f7bfd6 100644
--- a/binsrc/tutorial/web/vx_s_2/select.vspx
+++ b/binsrc/tutorial/web/vx_s_2/select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: select.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: select.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/textarea.vspx b/binsrc/tutorial/web/vx_s_2/textarea.vspx
index 54815b4..bfa74b4 100644
--- a/binsrc/tutorial/web/vx_s_2/textarea.vspx
+++ b/binsrc/tutorial/web/vx_s_2/textarea.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: textarea.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: textarea.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_2/vx_s_2.xml b/binsrc/tutorial/web/vx_s_2/vx_s_2.xml
index 1617998..c3f7a9f 100644
--- a/binsrc/tutorial/web/vx_s_2/vx_s_2.xml
+++ b/binsrc/tutorial/web/vx_s_2/vx_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_3/data_set.vspx b/binsrc/tutorial/web/vx_s_3/data_set.vspx
index df59963..f392917 100644
--- a/binsrc/tutorial/web/vx_s_3/data_set.vspx
+++ b/binsrc/tutorial/web/vx_s_3/data_set.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_set.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: data_set.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_3/selectdb.vspx b/binsrc/tutorial/web/vx_s_3/selectdb.vspx
index cc5d103..8c21335 100644
--- a/binsrc/tutorial/web/vx_s_3/selectdb.vspx
+++ b/binsrc/tutorial/web/vx_s_3/selectdb.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: selectdb.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: selectdb.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_3/update_form.vspx b/binsrc/tutorial/web/vx_s_3/update_form.vspx
index 4270f37..8ad36d1 100644
--- a/binsrc/tutorial/web/vx_s_3/update_form.vspx
+++ b/binsrc/tutorial/web/vx_s_3/update_form.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: update_form.vspx,v 1.2.2.1 2012/03/08 12:55:16 source Exp $
+ - $Id: update_form.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_3/update_radio.vspx b/binsrc/tutorial/web/vx_s_3/update_radio.vspx
index 27c8ed0..c6d5953 100644
--- a/binsrc/tutorial/web/vx_s_3/update_radio.vspx
+++ b/binsrc/tutorial/web/vx_s_3/update_radio.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: update_radio.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: update_radio.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_3/vx_s_3.sql b/binsrc/tutorial/web/vx_s_3/vx_s_3.sql
index 8d79fb6..2054d61 100644
--- a/binsrc/tutorial/web/vx_s_3/vx_s_3.sql
+++ b/binsrc/tutorial/web/vx_s_3/vx_s_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: vx_s_3.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: vx_s_3.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_3/vx_s_3.xml b/binsrc/tutorial/web/vx_s_3/vx_s_3.xml
index 1324e00..6cb585f 100644
--- a/binsrc/tutorial/web/vx_s_3/vx_s_3.xml
+++ b/binsrc/tutorial/web/vx_s_3/vx_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_4/tree.vspx b/binsrc/tutorial/web/vx_s_4/tree.vspx
index 3380ed2..1fb48ab 100644
--- a/binsrc/tutorial/web/vx_s_4/tree.vspx
+++ b/binsrc/tutorial/web/vx_s_4/tree.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tree.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: tree.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_4/vx_s_4.sql b/binsrc/tutorial/web/vx_s_4/vx_s_4.sql
index e3ca4e8..2c1c61b 100644
--- a/binsrc/tutorial/web/vx_s_4/vx_s_4.sql
+++ b/binsrc/tutorial/web/vx_s_4/vx_s_4.sql
@@ -1,10 +1,10 @@
--
--- $Id: vx_s_4.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: vx_s_4.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_4/vx_s_4.xml b/binsrc/tutorial/web/vx_s_4/vx_s_4.xml
index 70de336..f6c7f7b 100644
--- a/binsrc/tutorial/web/vx_s_4/vx_s_4.xml
+++ b/binsrc/tutorial/web/vx_s_4/vx_s_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_5/emp.vspx b/binsrc/tutorial/web/vx_s_5/emp.vspx
index 1550310..657c07c 100644
--- a/binsrc/tutorial/web/vx_s_5/emp.vspx
+++ b/binsrc/tutorial/web/vx_s_5/emp.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: emp.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: emp.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_5/options.xml b/binsrc/tutorial/web/vx_s_5/options.xml
index 44cad6d..2bcbfae 100644
--- a/binsrc/tutorial/web/vx_s_5/options.xml
+++ b/binsrc/tutorial/web/vx_s_5/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_5/tab.vspx b/binsrc/tutorial/web/vx_s_5/tab.vspx
index e1fe8fd..c5817c0 100644
--- a/binsrc/tutorial/web/vx_s_5/tab.vspx
+++ b/binsrc/tutorial/web/vx_s_5/tab.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tab.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: tab.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_5/vx_s_5.sql b/binsrc/tutorial/web/vx_s_5/vx_s_5.sql
index 37e55a2..2898074 100644
--- a/binsrc/tutorial/web/vx_s_5/vx_s_5.sql
+++ b/binsrc/tutorial/web/vx_s_5/vx_s_5.sql
@@ -1,10 +1,10 @@
--
--- $Id: vx_s_5.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: vx_s_5.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_5/vx_s_5.xml b/binsrc/tutorial/web/vx_s_5/vx_s_5.xml
index 59e94ae..a3c210b 100644
--- a/binsrc/tutorial/web/vx_s_5/vx_s_5.xml
+++ b/binsrc/tutorial/web/vx_s_5/vx_s_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_6/login.vspx b/binsrc/tutorial/web/vx_s_6/login.vspx
index 156b1cd..d481162 100644
--- a/binsrc/tutorial/web/vx_s_6/login.vspx
+++ b/binsrc/tutorial/web/vx_s_6/login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: login.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_6/vx_s_6.sql b/binsrc/tutorial/web/vx_s_6/vx_s_6.sql
index 00d0419..703fea6 100644
--- a/binsrc/tutorial/web/vx_s_6/vx_s_6.sql
+++ b/binsrc/tutorial/web/vx_s_6/vx_s_6.sql
@@ -1,10 +1,10 @@
--
--- $Id: vx_s_6.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: vx_s_6.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_6/vx_s_6.xml b/binsrc/tutorial/web/vx_s_6/vx_s_6.xml
index 0e7432c..7f11a3d 100644
--- a/binsrc/tutorial/web/vx_s_6/vx_s_6.xml
+++ b/binsrc/tutorial/web/vx_s_6/vx_s_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_7/options.xml b/binsrc/tutorial/web/vx_s_7/options.xml
index a8127f5..568dde4 100644
--- a/binsrc/tutorial/web/vx_s_7/options.xml
+++ b/binsrc/tutorial/web/vx_s_7/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_7/products.vspx b/binsrc/tutorial/web/vx_s_7/products.vspx
index f395b99..89c4d4b 100644
--- a/binsrc/tutorial/web/vx_s_7/products.vspx
+++ b/binsrc/tutorial/web/vx_s_7/products.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: products.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: products.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_7/sel_category.vspx b/binsrc/tutorial/web/vx_s_7/sel_category.vspx
index e03266a..973f206 100644
--- a/binsrc/tutorial/web/vx_s_7/sel_category.vspx
+++ b/binsrc/tutorial/web/vx_s_7/sel_category.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sel_category.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: sel_category.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_7/vx_s_7.xml b/binsrc/tutorial/web/vx_s_7/vx_s_7.xml
index 4151e22..2689f0f 100644
--- a/binsrc/tutorial/web/vx_s_7/vx_s_7.xml
+++ b/binsrc/tutorial/web/vx_s_7/vx_s_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_8/formdecor.vspx b/binsrc/tutorial/web/vx_s_8/formdecor.vspx
index 394cf51..64e5b63 100644
--- a/binsrc/tutorial/web/vx_s_8/formdecor.vspx
+++ b/binsrc/tutorial/web/vx_s_8/formdecor.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: formdecor.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: formdecor.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_8/formsty.vspx b/binsrc/tutorial/web/vx_s_8/formsty.vspx
index 0bc996e..109dd45 100644
--- a/binsrc/tutorial/web/vx_s_8/formsty.vspx
+++ b/binsrc/tutorial/web/vx_s_8/formsty.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: formsty.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: formsty.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_8/formsty.xsl b/binsrc/tutorial/web/vx_s_8/formsty.xsl
index c81131c..0aa898d 100644
--- a/binsrc/tutorial/web/vx_s_8/formsty.xsl
+++ b/binsrc/tutorial/web/vx_s_8/formsty.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: formsty.xsl,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: formsty.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_8/options.xml b/binsrc/tutorial/web/vx_s_8/options.xml
index 20a93d3..dd469b3 100644
--- a/binsrc/tutorial/web/vx_s_8/options.xml
+++ b/binsrc/tutorial/web/vx_s_8/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_8/vx_s_8.xml b/binsrc/tutorial/web/vx_s_8/vx_s_8.xml
index 32d019e..085f5c8 100644
--- a/binsrc/tutorial/web/vx_s_8/vx_s_8.xml
+++ b/binsrc/tutorial/web/vx_s_8/vx_s_8.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/button_0.vspx b/binsrc/tutorial/web/vx_s_9/button_0.vspx
index e252f02..3d7b974 100644
--- a/binsrc/tutorial/web/vx_s_9/button_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/button_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: button_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/button_1.vspx b/binsrc/tutorial/web/vx_s_9/button_1.vspx
index 63a9fca..dd241ae 100644
--- a/binsrc/tutorial/web/vx_s_9/button_1.vspx
+++ b/binsrc/tutorial/web/vx_s_9/button_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button_1.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: button_1.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/button_2.vspx b/binsrc/tutorial/web/vx_s_9/button_2.vspx
index a496719..53d93e8 100644
--- a/binsrc/tutorial/web/vx_s_9/button_2.vspx
+++ b/binsrc/tutorial/web/vx_s_9/button_2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button_2.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: button_2.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/button_3.vspx b/binsrc/tutorial/web/vx_s_9/button_3.vspx
index 7e75919..e872c52 100644
--- a/binsrc/tutorial/web/vx_s_9/button_3.vspx
+++ b/binsrc/tutorial/web/vx_s_9/button_3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button_3.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: button_3.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/calendar_0.vspx b/binsrc/tutorial/web/vx_s_9/calendar_0.vspx
index f2bf0ec..c8cd07e 100644
--- a/binsrc/tutorial/web/vx_s_9/calendar_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/calendar_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: calendar_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: calendar_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/check_box_0.vspx b/binsrc/tutorial/web/vx_s_9/check_box_0.vspx
index d3fe541..becdee8 100644
--- a/binsrc/tutorial/web/vx_s_9/check_box_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/check_box_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: check_box_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: check_box_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/data_grid_0.vspx b/binsrc/tutorial/web/vx_s_9/data_grid_0.vspx
index b7a888f..07465d7 100644
--- a/binsrc/tutorial/web/vx_s_9/data_grid_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/data_grid_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_grid_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: data_grid_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/data_list_0.vspx b/binsrc/tutorial/web/vx_s_9/data_list_0.vspx
index a7734a7..5346096 100644
--- a/binsrc/tutorial/web/vx_s_9/data_list_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/data_list_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_list_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: data_list_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/data_list_1.vspx b/binsrc/tutorial/web/vx_s_9/data_list_1.vspx
index 869ea47..b8c91fd 100644
--- a/binsrc/tutorial/web/vx_s_9/data_list_1.vspx
+++ b/binsrc/tutorial/web/vx_s_9/data_list_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_list_1.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: data_list_1.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/data_set_0.vspx b/binsrc/tutorial/web/vx_s_9/data_set_0.vspx
index f81bee7..203bdbc 100644
--- a/binsrc/tutorial/web/vx_s_9/data_set_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/data_set_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_set_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: data_set_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/data_set_1.vspx b/binsrc/tutorial/web/vx_s_9/data_set_1.vspx
index 0e83b23..6e9d33e 100644
--- a/binsrc/tutorial/web/vx_s_9/data_set_1.vspx
+++ b/binsrc/tutorial/web/vx_s_9/data_set_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_set_1.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: data_set_1.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/data_source_0.vspx b/binsrc/tutorial/web/vx_s_9/data_source_0.vspx
index 80c670c..164a06d 100644
--- a/binsrc/tutorial/web/vx_s_9/data_source_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/data_source_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_source_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: data_source_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/error_summary_0.vspx b/binsrc/tutorial/web/vx_s_9/error_summary_0.vspx
index 6b51ed7..dfb5c59 100644
--- a/binsrc/tutorial/web/vx_s_9/error_summary_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/error_summary_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: error_summary_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: error_summary_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/error_summary_1.vspx b/binsrc/tutorial/web/vx_s_9/error_summary_1.vspx
index 3531f0b..19f01f8 100644
--- a/binsrc/tutorial/web/vx_s_9/error_summary_1.vspx
+++ b/binsrc/tutorial/web/vx_s_9/error_summary_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: error_summary_1.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: error_summary_1.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/footer.xml b/binsrc/tutorial/web/vx_s_9/footer.xml
index 64c5881..f691826 100644
--- a/binsrc/tutorial/web/vx_s_9/footer.xml
+++ b/binsrc/tutorial/web/vx_s_9/footer.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/form_0.vspx b/binsrc/tutorial/web/vx_s_9/form_0.vspx
index ba86a05..332094e 100644
--- a/binsrc/tutorial/web/vx_s_9/form_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/form_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: form_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: form_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/form_1.vspx b/binsrc/tutorial/web/vx_s_9/form_1.vspx
index 097bc4d..edc2a5d 100644
--- a/binsrc/tutorial/web/vx_s_9/form_1.vspx
+++ b/binsrc/tutorial/web/vx_s_9/form_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: form_1.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: form_1.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/include_0.vspx b/binsrc/tutorial/web/vx_s_9/include_0.vspx
index cc8dca1..09e1023 100644
--- a/binsrc/tutorial/web/vx_s_9/include_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/include_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: include_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: include_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/label_0.vspx b/binsrc/tutorial/web/vx_s_9/label_0.vspx
index 6dc6417..b9697fc 100644
--- a/binsrc/tutorial/web/vx_s_9/label_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/label_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: label_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: label_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/login_0.vspx b/binsrc/tutorial/web/vx_s_9/login_0.vspx
index 9d7b8ff..8f7fe49 100644
--- a/binsrc/tutorial/web/vx_s_9/login_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/login_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: login_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/login_form_0.vspx b/binsrc/tutorial/web/vx_s_9/login_form_0.vspx
index 3a3d075..10eecb4 100644
--- a/binsrc/tutorial/web/vx_s_9/login_form_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/login_form_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login_form_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: login_form_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/page_0.vspx b/binsrc/tutorial/web/vx_s_9/page_0.vspx
index 976c3e5..b94bb45 100644
--- a/binsrc/tutorial/web/vx_s_9/page_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/page_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: page_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: page_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/radio_button_0.vspx b/binsrc/tutorial/web/vx_s_9/radio_button_0.vspx
index 1433523..3c6cb0d 100644
--- a/binsrc/tutorial/web/vx_s_9/radio_button_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/radio_button_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: radio_button_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: radio_button_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/radio_group_0.vspx b/binsrc/tutorial/web/vx_s_9/radio_group_0.vspx
index c74fe51..2cfcf54 100644
--- a/binsrc/tutorial/web/vx_s_9/radio_group_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/radio_group_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: radio_group_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: radio_group_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/select_list_0.vspx b/binsrc/tutorial/web/vx_s_9/select_list_0.vspx
index 666180c..170851b 100644
--- a/binsrc/tutorial/web/vx_s_9/select_list_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/select_list_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: select_list_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: select_list_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/tab_0.vspx b/binsrc/tutorial/web/vx_s_9/tab_0.vspx
index 79bac83..0828992 100644
--- a/binsrc/tutorial/web/vx_s_9/tab_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/tab_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tab_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: tab_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/text_0.vspx b/binsrc/tutorial/web/vx_s_9/text_0.vspx
index 5cdb9c2..e6f01ae 100644
--- a/binsrc/tutorial/web/vx_s_9/text_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/text_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: text_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: text_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/text_area_0.vspx b/binsrc/tutorial/web/vx_s_9/text_area_0.vspx
index c45a859..a416f73 100644
--- a/binsrc/tutorial/web/vx_s_9/text_area_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/text_area_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: text_area_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: text_area_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/tree_0.vspx b/binsrc/tutorial/web/vx_s_9/tree_0.vspx
index 22f12c6..83a538b 100644
--- a/binsrc/tutorial/web/vx_s_9/tree_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/tree_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tree_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: tree_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/url_0.vspx b/binsrc/tutorial/web/vx_s_9/url_0.vspx
index 452bdba..a418ed1 100644
--- a/binsrc/tutorial/web/vx_s_9/url_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/url_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: url_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: url_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/validator_0.vspx b/binsrc/tutorial/web/vx_s_9/validator_0.vspx
index eb720b4..4aef7f2 100644
--- a/binsrc/tutorial/web/vx_s_9/validator_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/validator_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: validator_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: validator_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/variable_0.vspx b/binsrc/tutorial/web/vx_s_9/variable_0.vspx
index bc8c366..59fcb75 100644
--- a/binsrc/tutorial/web/vx_s_9/variable_0.vspx
+++ b/binsrc/tutorial/web/vx_s_9/variable_0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: variable_0.vspx,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: variable_0.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/vx_s_9.sql b/binsrc/tutorial/web/vx_s_9/vx_s_9.sql
index d2eba73..ce36faf 100644
--- a/binsrc/tutorial/web/vx_s_9/vx_s_9.sql
+++ b/binsrc/tutorial/web/vx_s_9/vx_s_9.sql
@@ -1,10 +1,10 @@
--
--- $Id: vx_s_9.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: vx_s_9.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web/vx_s_9/vx_s_9.xml b/binsrc/tutorial/web/vx_s_9/vx_s_9.xml
index 4880d10..c02cf52 100644
--- a/binsrc/tutorial/web/vx_s_9/vx_s_9.xml
+++ b/binsrc/tutorial/web/vx_s_9/vx_s_9.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/web2/index.xml b/binsrc/tutorial/web2/index.xml
index 9bbde6c..5b32580 100644
--- a/binsrc/tutorial/web2/index.xml
+++ b/binsrc/tutorial/web2/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xbel.vsp b/binsrc/tutorial/xbel.vsp
index ea7381f..0e7460f 100644
--- a/binsrc/tutorial/xbel.vsp
+++ b/binsrc/tutorial/xbel.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xbel.vsp,v 1.2.2.1 2012/03/08 12:55:11 source Exp $
+-- $Id: xbel.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/Makefile.am b/binsrc/tutorial/xml/Makefile.am
index 36d36c3..7a7c49e 100644
--- a/binsrc/tutorial/xml/Makefile.am
+++ b/binsrc/tutorial/xml/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/Makefile.in b/binsrc/tutorial/xml/Makefile.in
index 73241b2..f07aa05 100644
--- a/binsrc/tutorial/xml/Makefile.in
+++ b/binsrc/tutorial/xml/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/tutorial/xml/demo.css b/binsrc/tutorial/xml/demo.css
index b0a1355..fed097d 100644
--- a/binsrc/tutorial/xml/demo.css
+++ b/binsrc/tutorial/xml/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/index.xml b/binsrc/tutorial/xml/index.xml
index 1760358..4a09de4 100644
--- a/binsrc/tutorial/xml/index.xml
+++ b/binsrc/tutorial/xml/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/rq_s_1/options.xml b/binsrc/tutorial/xml/rq_s_1/options.xml
index 4c281c9..e6abcae 100644
--- a/binsrc/tutorial/xml/rq_s_1/options.xml
+++ b/binsrc/tutorial/xml/rq_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/rq_s_1/rq_s_1.xml b/binsrc/tutorial/xml/rq_s_1/rq_s_1.xml
index 59dacc9..6bb1a7e 100644
--- a/binsrc/tutorial/xml/rq_s_1/rq_s_1.xml
+++ b/binsrc/tutorial/xml/rq_s_1/rq_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_0/options.xml b/binsrc/tutorial/xml/sx_e_0/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_0/options.xml
+++ b/binsrc/tutorial/xml/sx_e_0/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_0/sx_e_0.xml b/binsrc/tutorial/xml/sx_e_0/sx_e_0.xml
index 421a3ae..eca30c5 100644
--- a/binsrc/tutorial/xml/sx_e_0/sx_e_0.xml
+++ b/binsrc/tutorial/xml/sx_e_0/sx_e_0.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_1/options.xml b/binsrc/tutorial/xml/sx_e_1/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_1/options.xml
+++ b/binsrc/tutorial/xml/sx_e_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_1/sx_e_1.xml b/binsrc/tutorial/xml/sx_e_1/sx_e_1.xml
index 6d75acb..5a12ca4 100644
--- a/binsrc/tutorial/xml/sx_e_1/sx_e_1.xml
+++ b/binsrc/tutorial/xml/sx_e_1/sx_e_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_1/sx_e_1_sample.vsp b/binsrc/tutorial/xml/sx_e_1/sx_e_1_sample.vsp
index 5fb840e..582cc3a 100644
--- a/binsrc/tutorial/xml/sx_e_1/sx_e_1_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_1/sx_e_1_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_1_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_1_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_2/options.xml b/binsrc/tutorial/xml/sx_e_2/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_2/options.xml
+++ b/binsrc/tutorial/xml/sx_e_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_2/sx_e_2.xml b/binsrc/tutorial/xml/sx_e_2/sx_e_2.xml
index eab1f24..97ff55c 100644
--- a/binsrc/tutorial/xml/sx_e_2/sx_e_2.xml
+++ b/binsrc/tutorial/xml/sx_e_2/sx_e_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_2/sx_e_2_sample.vsp b/binsrc/tutorial/xml/sx_e_2/sx_e_2_sample.vsp
index 0d339fe..d2f5182 100644
--- a/binsrc/tutorial/xml/sx_e_2/sx_e_2_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_2/sx_e_2_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_2_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_2_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_3/options.xml b/binsrc/tutorial/xml/sx_e_3/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_3/options.xml
+++ b/binsrc/tutorial/xml/sx_e_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_3/sx_e_3.xml b/binsrc/tutorial/xml/sx_e_3/sx_e_3.xml
index cf1cbcb..4d65bc1 100644
--- a/binsrc/tutorial/xml/sx_e_3/sx_e_3.xml
+++ b/binsrc/tutorial/xml/sx_e_3/sx_e_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_3/sx_e_3_sample.vsp b/binsrc/tutorial/xml/sx_e_3/sx_e_3_sample.vsp
index aa5af86..c6476b9 100644
--- a/binsrc/tutorial/xml/sx_e_3/sx_e_3_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_3/sx_e_3_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_3_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_3_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_4/options.xml b/binsrc/tutorial/xml/sx_e_4/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_4/options.xml
+++ b/binsrc/tutorial/xml/sx_e_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_4/sx_e_4.xml b/binsrc/tutorial/xml/sx_e_4/sx_e_4.xml
index e50ec82..ac1b3e9 100644
--- a/binsrc/tutorial/xml/sx_e_4/sx_e_4.xml
+++ b/binsrc/tutorial/xml/sx_e_4/sx_e_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_4/sx_e_4_sample.vsp b/binsrc/tutorial/xml/sx_e_4/sx_e_4_sample.vsp
index 818ae6d..c16a763 100644
--- a/binsrc/tutorial/xml/sx_e_4/sx_e_4_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_4/sx_e_4_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_4_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_4_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_5/options.xml b/binsrc/tutorial/xml/sx_e_5/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_5/options.xml
+++ b/binsrc/tutorial/xml/sx_e_5/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_5/sx_e_5.xml b/binsrc/tutorial/xml/sx_e_5/sx_e_5.xml
index 31d5199..bf86ac1 100644
--- a/binsrc/tutorial/xml/sx_e_5/sx_e_5.xml
+++ b/binsrc/tutorial/xml/sx_e_5/sx_e_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_5/sx_e_5_sample.vsp b/binsrc/tutorial/xml/sx_e_5/sx_e_5_sample.vsp
index c7c7256..e0c1c46 100644
--- a/binsrc/tutorial/xml/sx_e_5/sx_e_5_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_5/sx_e_5_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_5_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_5_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_6/options.xml b/binsrc/tutorial/xml/sx_e_6/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_6/options.xml
+++ b/binsrc/tutorial/xml/sx_e_6/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_6/sx_e_6.xml b/binsrc/tutorial/xml/sx_e_6/sx_e_6.xml
index 2ae5d21..186d8a9 100644
--- a/binsrc/tutorial/xml/sx_e_6/sx_e_6.xml
+++ b/binsrc/tutorial/xml/sx_e_6/sx_e_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_6/sx_e_6_sample.vsp b/binsrc/tutorial/xml/sx_e_6/sx_e_6_sample.vsp
index 719b434..bf57277 100644
--- a/binsrc/tutorial/xml/sx_e_6/sx_e_6_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_6/sx_e_6_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_6_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_6_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_7/options.xml b/binsrc/tutorial/xml/sx_e_7/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_7/options.xml
+++ b/binsrc/tutorial/xml/sx_e_7/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_7/sx_e_7.xml b/binsrc/tutorial/xml/sx_e_7/sx_e_7.xml
index 31a95a3..24f264e 100644
--- a/binsrc/tutorial/xml/sx_e_7/sx_e_7.xml
+++ b/binsrc/tutorial/xml/sx_e_7/sx_e_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_7/sx_e_7_sample.vsp b/binsrc/tutorial/xml/sx_e_7/sx_e_7_sample.vsp
index 3e51c71..f3b8aa9 100644
--- a/binsrc/tutorial/xml/sx_e_7/sx_e_7_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_7/sx_e_7_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_7_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_7_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_8/options.xml b/binsrc/tutorial/xml/sx_e_8/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_8/options.xml
+++ b/binsrc/tutorial/xml/sx_e_8/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_8/sx_e_8.xml b/binsrc/tutorial/xml/sx_e_8/sx_e_8.xml
index a582693..4d050a0 100644
--- a/binsrc/tutorial/xml/sx_e_8/sx_e_8.xml
+++ b/binsrc/tutorial/xml/sx_e_8/sx_e_8.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_8/sx_e_8_sample.vsp b/binsrc/tutorial/xml/sx_e_8/sx_e_8_sample.vsp
index b79dccf..8a9b56c 100644
--- a/binsrc/tutorial/xml/sx_e_8/sx_e_8_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_8/sx_e_8_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_8_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_8_sample.vsp,v 1.2 2006/08/15 19:30:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_9/options.xml b/binsrc/tutorial/xml/sx_e_9/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_e_9/options.xml
+++ b/binsrc/tutorial/xml/sx_e_9/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_9/sx_e_9.xml b/binsrc/tutorial/xml/sx_e_9/sx_e_9.xml
index 36f698a..50f7845 100644
--- a/binsrc/tutorial/xml/sx_e_9/sx_e_9.xml
+++ b/binsrc/tutorial/xml/sx_e_9/sx_e_9.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_e_9/sx_e_9_sample.vsp b/binsrc/tutorial/xml/sx_e_9/sx_e_9_sample.vsp
index 610542e..98f3fbb 100644
--- a/binsrc/tutorial/xml/sx_e_9/sx_e_9_sample.vsp
+++ b/binsrc/tutorial/xml/sx_e_9/sx_e_9_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_e_9_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_e_9_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_f_1/options.xml b/binsrc/tutorial/xml/sx_f_1/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_f_1/options.xml
+++ b/binsrc/tutorial/xml/sx_f_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_f_1/sx_f_1.xml b/binsrc/tutorial/xml/sx_f_1/sx_f_1.xml
index cd04869..a939060 100644
--- a/binsrc/tutorial/xml/sx_f_1/sx_f_1.xml
+++ b/binsrc/tutorial/xml/sx_f_1/sx_f_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_f_1/sx_f_1_sample.vsp b/binsrc/tutorial/xml/sx_f_1/sx_f_1_sample.vsp
index ca9fb54..088ced2 100644
--- a/binsrc/tutorial/xml/sx_f_1/sx_f_1_sample.vsp
+++ b/binsrc/tutorial/xml/sx_f_1/sx_f_1_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_f_1_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_f_1_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_g_1/options.xml b/binsrc/tutorial/xml/sx_g_1/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_g_1/options.xml
+++ b/binsrc/tutorial/xml/sx_g_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_g_1/sx_g_1.xml b/binsrc/tutorial/xml/sx_g_1/sx_g_1.xml
index b224704..a4f8281 100644
--- a/binsrc/tutorial/xml/sx_g_1/sx_g_1.xml
+++ b/binsrc/tutorial/xml/sx_g_1/sx_g_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_g_1/sx_g_1_sample.vsp b/binsrc/tutorial/xml/sx_g_1/sx_g_1_sample.vsp
index f269436..166985e 100644
--- a/binsrc/tutorial/xml/sx_g_1/sx_g_1_sample.vsp
+++ b/binsrc/tutorial/xml/sx_g_1/sx_g_1_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_g_1_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_g_1_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_h_1/options.xml b/binsrc/tutorial/xml/sx_h_1/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xml/sx_h_1/options.xml
+++ b/binsrc/tutorial/xml/sx_h_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_h_1/sx_h_1.xml b/binsrc/tutorial/xml/sx_h_1/sx_h_1.xml
index 41f1fba..509153d 100644
--- a/binsrc/tutorial/xml/sx_h_1/sx_h_1.xml
+++ b/binsrc/tutorial/xml/sx_h_1/sx_h_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_h_1/sx_h_1_sample.vsp b/binsrc/tutorial/xml/sx_h_1/sx_h_1_sample.vsp
index 1d77095..f18aedf 100644
--- a/binsrc/tutorial/xml/sx_h_1/sx_h_1_sample.vsp
+++ b/binsrc/tutorial/xml/sx_h_1/sx_h_1_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sx_h_1_sample.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sx_h_1_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/sx_output.xsl b/binsrc/tutorial/xml/sx_output.xsl
index 374ce39..6a5048f 100644
--- a/binsrc/tutorial/xml/sx_output.xsl
+++ b/binsrc/tutorial/xml/sx_output.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sx_output.xsl,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: sx_output.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/map01.xsd b/binsrc/tutorial/xml/usecases/map01.xsd
index ed37803..9066fbd 100644
--- a/binsrc/tutorial/xml/usecases/map01.xsd
+++ b/binsrc/tutorial/xml/usecases/map01.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/map02.xml b/binsrc/tutorial/xml/usecases/map02.xml
index 061f44a..a170e06 100644
--- a/binsrc/tutorial/xml/usecases/map02.xml
+++ b/binsrc/tutorial/xml/usecases/map02.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/map02.xsd b/binsrc/tutorial/xml/usecases/map02.xsd
index 5a4ab9d..b78c920 100644
--- a/binsrc/tutorial/xml/usecases/map02.xsd
+++ b/binsrc/tutorial/xml/usecases/map02.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/map03.xml b/binsrc/tutorial/xml/usecases/map03.xml
index 0b99afe..141e519 100644
--- a/binsrc/tutorial/xml/usecases/map03.xml
+++ b/binsrc/tutorial/xml/usecases/map03.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/options.xml b/binsrc/tutorial/xml/usecases/options.xml
index 8026ceb..9f98d66 100644
--- a/binsrc/tutorial/xml/usecases/options.xml
+++ b/binsrc/tutorial/xml/usecases/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/slash.xml b/binsrc/tutorial/xml/usecases/slash.xml
index 4749882..ea04f53 100644
--- a/binsrc/tutorial/xml/usecases/slash.xml
+++ b/binsrc/tutorial/xml/usecases/slash.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sq01.xml b/binsrc/tutorial/xml/usecases/sq01.xml
index ac3577d..a605e4a 100644
--- a/binsrc/tutorial/xml/usecases/sq01.xml
+++ b/binsrc/tutorial/xml/usecases/sq01.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sq02.xml b/binsrc/tutorial/xml/usecases/sq02.xml
index 4cb3e04..e03e553 100644
--- a/binsrc/tutorial/xml/usecases/sq02.xml
+++ b/binsrc/tutorial/xml/usecases/sq02.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sq03.xml b/binsrc/tutorial/xml/usecases/sq03.xml
index 84f2e79..18aa850 100644
--- a/binsrc/tutorial/xml/usecases/sq03.xml
+++ b/binsrc/tutorial/xml/usecases/sq03.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sq04.xml b/binsrc/tutorial/xml/usecases/sq04.xml
index 3599928..82ed8a6 100644
--- a/binsrc/tutorial/xml/usecases/sq04.xml
+++ b/binsrc/tutorial/xml/usecases/sq04.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sq05.xml b/binsrc/tutorial/xml/usecases/sq05.xml
index 128f33a..4eb6b46 100644
--- a/binsrc/tutorial/xml/usecases/sq05.xml
+++ b/binsrc/tutorial/xml/usecases/sq05.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sq06.xml b/binsrc/tutorial/xml/usecases/sq06.xml
index c6d4732..41c23b9 100644
--- a/binsrc/tutorial/xml/usecases/sq06.xml
+++ b/binsrc/tutorial/xml/usecases/sq06.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sqlx01.xml b/binsrc/tutorial/xml/usecases/sqlx01.xml
index 8017d0b..a3e9f73 100644
--- a/binsrc/tutorial/xml/usecases/sqlx01.xml
+++ b/binsrc/tutorial/xml/usecases/sqlx01.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sqlx02.xml b/binsrc/tutorial/xml/usecases/sqlx02.xml
index bf1bc86..eaff520 100644
--- a/binsrc/tutorial/xml/usecases/sqlx02.xml
+++ b/binsrc/tutorial/xml/usecases/sqlx02.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sqlx03.xml b/binsrc/tutorial/xml/usecases/sqlx03.xml
index 4107d83..fdcb491 100644
--- a/binsrc/tutorial/xml/usecases/sqlx03.xml
+++ b/binsrc/tutorial/xml/usecases/sqlx03.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/sqlx04.xml b/binsrc/tutorial/xml/usecases/sqlx04.xml
index 3f83825..058777b 100644
--- a/binsrc/tutorial/xml/usecases/sqlx04.xml
+++ b/binsrc/tutorial/xml/usecases/sqlx04.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/usecases.sql b/binsrc/tutorial/xml/usecases/usecases.sql
index c135157..95d9d89 100644
--- a/binsrc/tutorial/xml/usecases/usecases.sql
+++ b/binsrc/tutorial/xml/usecases/usecases.sql
@@ -1,10 +1,10 @@
--
--- $Id: usecases.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: usecases.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/usecases.vsp b/binsrc/tutorial/xml/usecases/usecases.vsp
index 8ba1b0a..940b092 100644
--- a/binsrc/tutorial/xml/usecases/usecases.vsp
+++ b/binsrc/tutorial/xml/usecases/usecases.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: usecases.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: usecases.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/usecases_vad.sql b/binsrc/tutorial/xml/usecases/usecases_vad.sql
index 299a63a..6600a85 100644
--- a/binsrc/tutorial/xml/usecases/usecases_vad.sql
+++ b/binsrc/tutorial/xml/usecases/usecases_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: usecases_vad.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: usecases_vad.sql,v 1.2 2007/04/02 07:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/xq04.xml b/binsrc/tutorial/xml/usecases/xq04.xml
index 197bd34..857da3c 100644
--- a/binsrc/tutorial/xml/usecases/xq04.xml
+++ b/binsrc/tutorial/xml/usecases/xq04.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/xq05.xml b/binsrc/tutorial/xml/usecases/xq05.xml
index 6a87f6c..180d619 100644
--- a/binsrc/tutorial/xml/usecases/xq05.xml
+++ b/binsrc/tutorial/xml/usecases/xq05.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/xq06.xml b/binsrc/tutorial/xml/usecases/xq06.xml
index e304f84..bc992a6 100644
--- a/binsrc/tutorial/xml/usecases/xq06.xml
+++ b/binsrc/tutorial/xml/usecases/xq06.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/xqr01.xml b/binsrc/tutorial/xml/usecases/xqr01.xml
index 5819176..3a1773b 100644
--- a/binsrc/tutorial/xml/usecases/xqr01.xml
+++ b/binsrc/tutorial/xml/usecases/xqr01.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/xqr02.xml b/binsrc/tutorial/xml/usecases/xqr02.xml
index d64b52f..08e4a62 100644
--- a/binsrc/tutorial/xml/usecases/xqr02.xml
+++ b/binsrc/tutorial/xml/usecases/xqr02.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/usecases/xqr03.xml b/binsrc/tutorial/xml/usecases/xqr03.xml
index 3ae6425..544a35b 100644
--- a/binsrc/tutorial/xml/usecases/xqr03.xml
+++ b/binsrc/tutorial/xml/usecases/xqr03.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_1/options.xml b/binsrc/tutorial/xml/xq_s_1/options.xml
index 599ba15..4dfe56d 100644
--- a/binsrc/tutorial/xml/xq_s_1/options.xml
+++ b/binsrc/tutorial/xml/xq_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_1/xq_s_1.xml b/binsrc/tutorial/xml/xq_s_1/xq_s_1.xml
index d701075..99d14a2 100644
--- a/binsrc/tutorial/xml/xq_s_1/xq_s_1.xml
+++ b/binsrc/tutorial/xml/xq_s_1/xq_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2/options.xml b/binsrc/tutorial/xml/xq_s_2/options.xml
index baea63d..9136e45 100644
--- a/binsrc/tutorial/xml/xq_s_2/options.xml
+++ b/binsrc/tutorial/xml/xq_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2/search.sql b/binsrc/tutorial/xml/xq_s_2/search.sql
index 4b4c2c9..cacbfec 100644
--- a/binsrc/tutorial/xml/xq_s_2/search.sql
+++ b/binsrc/tutorial/xml/xq_s_2/search.sql
@@ -1,10 +1,10 @@
--
--- $Id: search.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: search.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2/search.vsp b/binsrc/tutorial/xml/xq_s_2/search.vsp
index 4b1695f..461cf13 100644
--- a/binsrc/tutorial/xml/xq_s_2/search.vsp
+++ b/binsrc/tutorial/xml/xq_s_2/search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: search.vsp,v 1.3.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: search.vsp,v 1.3 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2/text.vsp b/binsrc/tutorial/xml/xq_s_2/text.vsp
index 192d146..51fff95 100644
--- a/binsrc/tutorial/xml/xq_s_2/text.vsp
+++ b/binsrc/tutorial/xml/xq_s_2/text.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: text.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: text.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2/xq_s_2.xml b/binsrc/tutorial/xml/xq_s_2/xq_s_2.xml
index 381e096..1ec93d0 100644
--- a/binsrc/tutorial/xml/xq_s_2/xq_s_2.xml
+++ b/binsrc/tutorial/xml/xq_s_2/xq_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/example.vsp b/binsrc/tutorial/xml/xq_s_2a/example.vsp
index 9160f3f..bb8544d 100644
--- a/binsrc/tutorial/xml/xq_s_2a/example.vsp
+++ b/binsrc/tutorial/xml/xq_s_2a/example.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: example.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: example.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss1.xml b/binsrc/tutorial/xml/xq_s_2a/rss1.xml
index f70debd..b3a2178 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss1.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss1.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss10.xml b/binsrc/tutorial/xml/xq_s_2a/rss10.xml
index cc04558..fdb714f 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss10.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss10.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss11.xml b/binsrc/tutorial/xml/xq_s_2a/rss11.xml
index 1955d04..de4c0a5 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss11.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss11.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss12.xml b/binsrc/tutorial/xml/xq_s_2a/rss12.xml
index 1c5fc94..6d60b9b 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss12.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss12.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss13.xml b/binsrc/tutorial/xml/xq_s_2a/rss13.xml
index 9b41949..43afb62 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss13.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss13.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss14.xml b/binsrc/tutorial/xml/xq_s_2a/rss14.xml
index 8e3c213..d855418 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss14.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss14.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss2.xml b/binsrc/tutorial/xml/xq_s_2a/rss2.xml
index f6dde88..b99d208 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss2.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss2.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss3.xml b/binsrc/tutorial/xml/xq_s_2a/rss3.xml
index 1cb3321..f8ba0e2 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss3.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss3.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss4.xml b/binsrc/tutorial/xml/xq_s_2a/rss4.xml
index 0695c12..81856e7 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss4.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss4.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss5.xml b/binsrc/tutorial/xml/xq_s_2a/rss5.xml
index 34c0daf..f70b11b 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss5.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss5.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss6.xml b/binsrc/tutorial/xml/xq_s_2a/rss6.xml
index 4416256..367455c 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss6.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss6.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss7.xml b/binsrc/tutorial/xml/xq_s_2a/rss7.xml
index c0535d9..89a6610 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss7.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss7.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss8.xml b/binsrc/tutorial/xml/xq_s_2a/rss8.xml
index bb5ee54..f039cd1 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss8.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss8.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/rss9.xml b/binsrc/tutorial/xml/xq_s_2a/rss9.xml
index 28f3c96..3c4ed52 100644
--- a/binsrc/tutorial/xml/xq_s_2a/rss9.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/rss9.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.sql b/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.sql
index ae5e40d..9f93583 100644
--- a/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.sql
+++ b/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.sql
@@ -1,10 +1,10 @@
--
--- $Id: xq_s_2a.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: xq_s_2a.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.xml b/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.xml
index 2c83b86..81bcaa9 100644
--- a/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.xml
+++ b/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_3/slash.vsp b/binsrc/tutorial/xml/xq_s_3/slash.vsp
index e5ccf5f..130bfb9 100644
--- a/binsrc/tutorial/xml/xq_s_3/slash.vsp
+++ b/binsrc/tutorial/xml/xq_s_3/slash.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: slash.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: slash.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_3/slash.xml b/binsrc/tutorial/xml/xq_s_3/slash.xml
index 1765dcc..b60845b 100644
--- a/binsrc/tutorial/xml/xq_s_3/slash.xml
+++ b/binsrc/tutorial/xml/xq_s_3/slash.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_3/xq_s_3.sql b/binsrc/tutorial/xml/xq_s_3/xq_s_3.sql
index 75f8ec3..146d7c8 100644
--- a/binsrc/tutorial/xml/xq_s_3/xq_s_3.sql
+++ b/binsrc/tutorial/xml/xq_s_3/xq_s_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: xq_s_3.sql,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: xq_s_3.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_3/xq_s_3.xml b/binsrc/tutorial/xml/xq_s_3/xq_s_3.xml
index b7b41af..b0010e3 100644
--- a/binsrc/tutorial/xml/xq_s_3/xq_s_3.xml
+++ b/binsrc/tutorial/xml/xq_s_3/xq_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp b/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp
index 0e8d13a..9900907 100644
--- a/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp
@@ -2,12 +2,12 @@
<?vsp
--
--- $Id: african_blogs.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: african_blogs.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/atom.vsp b/binsrc/tutorial/xml/xq_s_4/atom.vsp
index d218595..77c76a2 100644
--- a/binsrc/tutorial/xml/xq_s_4/atom.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/atom.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: atom.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: atom.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/blog100.vsp b/binsrc/tutorial/xml/xq_s_4/blog100.vsp
index 3d0972a..a1b9c5f 100644
--- a/binsrc/tutorial/xml/xq_s_4/blog100.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/blog100.vsp
@@ -2,12 +2,12 @@
<?vsp
--
--- $Id: blog100.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: blog100.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp b/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp
index 37a3b02..fd1208b 100644
--- a/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp
@@ -2,12 +2,12 @@
<?vsp
--
--- $Id: blogafrica.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: blogafrica.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/ceo.vsp b/binsrc/tutorial/xml/xq_s_4/ceo.vsp
index bb9667d..ca50d9d 100644
--- a/binsrc/tutorial/xml/xq_s_4/ceo.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/ceo.vsp
@@ -2,12 +2,12 @@
<?vsp
--
--- $Id: ceo.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: ceo.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/common.vsp b/binsrc/tutorial/xml/xq_s_4/common.vsp
index 33d831f..6584417 100644
--- a/binsrc/tutorial/xml/xq_s_4/common.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/common.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: common.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: common.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/foaf.vsp b/binsrc/tutorial/xml/xq_s_4/foaf.vsp
index 15c4197..20f3b45 100644
--- a/binsrc/tutorial/xml/xq_s_4/foaf.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/foaf.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: foaf.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: foaf.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/foafmap.vsp b/binsrc/tutorial/xml/xq_s_4/foafmap.vsp
index 968d557..1f2c80a 100644
--- a/binsrc/tutorial/xml/xq_s_4/foafmap.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/foafmap.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: foafmap.vsp,v 1.1.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: foafmap.vsp,v 1.1 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp b/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp
index 5057de6..67f394f 100644
--- a/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: gnomedexers.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: gnomedexers.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp b/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp
index 7d98133..87b4848 100644
--- a/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mapufacture.vsp,v 1.1.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: mapufacture.vsp,v 1.1 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp b/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp
index df6b9b5..593701c 100644
--- a/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp
@@ -2,12 +2,12 @@
<?vsp
--
--- $Id: nigerian_bloggers.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: nigerian_bloggers.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/o100.sql b/binsrc/tutorial/xml/xq_s_4/o100.sql
index 9dbbe57..f1f03c7 100644
--- a/binsrc/tutorial/xml/xq_s_4/o100.sql
+++ b/binsrc/tutorial/xml/xq_s_4/o100.sql
@@ -1,10 +1,10 @@
--
--- $Id: o100.sql,v 1.4.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: o100.sql,v 1.4 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/o100.vsp b/binsrc/tutorial/xml/xq_s_4/o100.vsp
index 336d9ef..01608f3 100644
--- a/binsrc/tutorial/xml/xq_s_4/o100.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/o100.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: o100.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: o100.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/options.xml b/binsrc/tutorial/xml/xq_s_4/options.xml
index 0913121..7162e10 100644
--- a/binsrc/tutorial/xml/xq_s_4/options.xml
+++ b/binsrc/tutorial/xml/xq_s_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/osc2003.vsp b/binsrc/tutorial/xml/xq_s_4/osc2003.vsp
index 81d4069..fa02348 100644
--- a/binsrc/tutorial/xml/xq_s_4/osc2003.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/osc2003.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: osc2003.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: osc2003.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/osc2005.vsp b/binsrc/tutorial/xml/xq_s_4/osc2005.vsp
index b7dc93d..7bc7a63 100644
--- a/binsrc/tutorial/xml/xq_s_4/osc2005.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/osc2005.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: osc2005.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: osc2005.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp b/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp
index 9c820c9..7643749 100644
--- a/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp
@@ -2,12 +2,12 @@
<?vsp
--
--- $Id: planetrdf.vsp,v 1.1.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: planetrdf.vsp,v 1.1 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp b/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp
index 6c61336..42f60da 100644
--- a/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sem_blogs.vsp,v 1.1.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sem_blogs.vsp,v 1.1 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/sioc.vsp b/binsrc/tutorial/xml/xq_s_4/sioc.vsp
index e6c7244..664d2aa 100644
--- a/binsrc/tutorial/xml/xq_s_4/sioc.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/sioc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sioc.vsp,v 1.1.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: sioc.vsp,v 1.1 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/status.vsp b/binsrc/tutorial/xml/xq_s_4/status.vsp
index 8d1a629..72e53a3 100644
--- a/binsrc/tutorial/xml/xq_s_4/status.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/status.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: status.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: status.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp b/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp
index 2a98051..967130b 100644
--- a/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: techcrunch.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: techcrunch.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp b/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp
index ed552e8..57e20c9 100644
--- a/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: technologyvoices.vsp,v 1.1.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: technologyvoices.vsp,v 1.1 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp b/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp
index e8466af..9523cc4 100644
--- a/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: technorati_fav.vsp,v 1.1.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: technorati_fav.vsp,v 1.1 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp b/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp
index 031ec7e..64c5307 100644
--- a/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: technorati_pop.vsp,v 1.1.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: technorati_pop.vsp,v 1.1 2007/01/22 22:01:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp b/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp
index 5c8bd7d..d7cae56 100644
--- a/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vloggercon.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: vloggercon.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/web2005.vsp b/binsrc/tutorial/xml/xq_s_4/web2005.vsp
index 22854f3..758898f 100644
--- a/binsrc/tutorial/xml/xq_s_4/web2005.vsp
+++ b/binsrc/tutorial/xml/xq_s_4/web2005.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: web2005.vsp,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+-- $Id: web2005.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/xq_s_4.xml b/binsrc/tutorial/xml/xq_s_4/xq_s_4.xml
index 56bd9ec..a84c0c4 100644
--- a/binsrc/tutorial/xml/xq_s_4/xq_s_4.xml
+++ b/binsrc/tutorial/xml/xq_s_4/xq_s_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/xq_s_4.xsl b/binsrc/tutorial/xml/xq_s_4/xq_s_4.xsl
index 0c4e86d..7543bd7 100644
--- a/binsrc/tutorial/xml/xq_s_4/xq_s_4.xsl
+++ b/binsrc/tutorial/xml/xq_s_4/xq_s_4.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: xq_s_4.xsl,v 1.3.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: xq_s_4.xsl,v 1.3 2007/01/22 22:01:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xml/xq_s_4/xq_s_4svc.xsl b/binsrc/tutorial/xml/xq_s_4/xq_s_4svc.xsl
index f179dd9..dbfbdac 100644
--- a/binsrc/tutorial/xml/xq_s_4/xq_s_4svc.xsl
+++ b/binsrc/tutorial/xml/xq_s_4/xq_s_4svc.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: xq_s_4svc.xsl,v 1.2.2.1 2012/03/08 12:55:17 source Exp $
+ - $Id: xq_s_4svc.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlapps/index.xml b/binsrc/tutorial/xmlapps/index.xml
index 1760358..4a09de4 100644
--- a/binsrc/tutorial/xmlapps/index.xml
+++ b/binsrc/tutorial/xmlapps/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/demo.css b/binsrc/tutorial/xmlsql/demo.css
index 87621d5..fed097d 100644
--- a/binsrc/tutorial/xmlsql/demo.css
+++ b/binsrc/tutorial/xmlsql/demo.css
@@ -1,10 +1,10 @@
/*
- * $Id: demo.css,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ * $Id: demo.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/index.xml b/binsrc/tutorial/xmlsql/index.xml
index d7136bf..239b868 100644
--- a/binsrc/tutorial/xmlsql/index.xml
+++ b/binsrc/tutorial/xmlsql/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd
index 2ed49f7..23b169f 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd
+++ b/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd b/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd
index f35ebe4..6fc593e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd
+++ b/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_OD.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_OD.xsd
index 4c6dd0f..322341e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_OD.xsd
+++ b/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_OD.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_attr.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_attr.xsd
index 244b74b..1db942b 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_attr.xsd
+++ b/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_attr.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd
index 647f418..8ce63e9 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd
+++ b/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd b/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd
index 8a43bdb..1459407 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd
+++ b/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.sql b/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.sql
index d808283..1690961 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.sql
+++ b/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.sql
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.xml b/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.xml
index b6f6b85..f8233d6 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_1/options.xml b/binsrc/tutorial/xmlsql/ms_a_1/options.xml
index 8b6c0cb..e2ca10e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_1/options.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2.xml b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2.xml
index cd880ac..7eb6601 100644
--- a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_1.vsp b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_1.vsp
index 8dba3ff..9fa5629 100644
--- a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_1.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_2_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_2_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_2.vsp
index f816c52..86b9070 100644
--- a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_2.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_2_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_2_sample_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_2/options.xml b/binsrc/tutorial/xmlsql/ms_a_2/options.xml
index 7c9852e..8f4e61e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_2/options.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3.xml b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3.xml
index c5f8df8..f7dd231 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample.vsp
index f41106a..920c191 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_3_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_3_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample_2.vsp
index 77a13ae..a21e2b3 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample_2.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_3_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_3_sample_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3/options.xml b/binsrc/tutorial/xmlsql/ms_a_3/options.xml
index 7c9852e..8f4e61e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3/options.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a.xml b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a.xml
index acf0cc4..fcdd4d7 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample.vsp
index 989949d..771557b 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_3a_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_3a_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample_2.vsp
index fc9af85..d403f94 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample_2.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_3a_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_3a_sample_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/options.xml b/binsrc/tutorial/xmlsql/ms_a_3a/options.xml
index 7c9852e..8f4e61e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3a/options.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_3a/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b.xml b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b.xml
index d39098d..10387c0 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample.vsp
index 80d571d..60ea760 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_3b_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_3b_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample_2.vsp
index 7c20e5b..672aeff 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample_2.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_3b_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_3b_sample_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/options.xml b/binsrc/tutorial/xmlsql/ms_a_3b/options.xml
index 7c9852e..8f4e61e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_3b/options.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_3b/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4.xml b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4.xml
index 27829b0..b5628cb 100644
--- a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample.vsp
index 78d1c76..f7635ea 100644
--- a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_4_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_4_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample_2.vsp
index 77f659e..71775d3 100644
--- a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample_2.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_4_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_4_sample_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_4/options.xml b/binsrc/tutorial/xmlsql/ms_a_4/options.xml
index 7c9852e..8f4e61e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_4/options.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5.xml b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5.xml
index 416cd85..c04332c 100644
--- a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample.vsp
index 003bef4..54365fa 100644
--- a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_5_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_5_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample_2.vsp
index 7473028..de7d7ae 100644
--- a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample_2.vsp
+++ b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ms_a_5_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: ms_a_5_sample_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/ms_a_5/options.xml b/binsrc/tutorial/xmlsql/ms_a_5/options.xml
index 7c9852e..8f4e61e 100644
--- a/binsrc/tutorial/xmlsql/ms_a_5/options.xml
+++ b/binsrc/tutorial/xmlsql/ms_a_5/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/sx_output.xsl b/binsrc/tutorial/xmlsql/sx_output.xsl
index 240d6c2..6a5048f 100644
--- a/binsrc/tutorial/xmlsql/sx_output.xsl
+++ b/binsrc/tutorial/xmlsql/sx_output.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sx_output.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: sx_output.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_1/options.xml b/binsrc/tutorial/xmlsql/xp_v_1/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xmlsql/xp_v_1/options.xml
+++ b/binsrc/tutorial/xmlsql/xp_v_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.sql b/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.sql
index e837574..c15aa76 100644
--- a/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.sql
+++ b/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: xp_v_1.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xp_v_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.xml b/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.xml
index 359d4fb..23811af 100644
--- a/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.xml
+++ b/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_2/options.xml b/binsrc/tutorial/xmlsql/xp_v_2/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xmlsql/xp_v_2/options.xml
+++ b/binsrc/tutorial/xmlsql/xp_v_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2.xml b/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2.xml
index 3d88d3b..092ce6f 100644
--- a/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2.xml
+++ b/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2_sample.vsp b/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2_sample.vsp
index 875ea78..53ea389 100644
--- a/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2_sample.vsp
+++ b/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xp_v_2_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xp_v_2_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_3/options.xml b/binsrc/tutorial/xmlsql/xp_v_3/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xmlsql/xp_v_3/options.xml
+++ b/binsrc/tutorial/xmlsql/xp_v_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xp_v_3/xp_v_3.xml b/binsrc/tutorial/xmlsql/xp_v_3/xp_v_3.xml
index e2c3878..186cf52 100644
--- a/binsrc/tutorial/xmlsql/xp_v_3/xp_v_3.xml
+++ b/binsrc/tutorial/xmlsql/xp_v_3/xp_v_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_1/options.xml b/binsrc/tutorial/xmlsql/xs_s_1/options.xml
index 3c5460e..009cb28 100644
--- a/binsrc/tutorial/xmlsql/xs_s_1/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.sql b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.sql
index 75d85ff..be37774 100644
--- a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.sql
+++ b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_s_1.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.xml b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.xml
index a025de3..e114659 100644
--- a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1_sample_1.vsp
index 8eddd08..adc2633 100644
--- a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1_sample_1.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_1_sample_1.vsp,v 1.3.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_1_sample_1.vsp,v 1.3 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_2/options.xml b/binsrc/tutorial/xmlsql/xs_s_2/options.xml
index 27d89fe..347b59f 100644
--- a/binsrc/tutorial/xmlsql/xs_s_2/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.sql b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.sql
index 7d3f424..cee4460 100644
--- a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.sql
+++ b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_s_2.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_2.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.xml b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.xml
index 89436a9..b86c531 100644
--- a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2_sample_1.vsp
index 3e9f0d6..4bcfda1 100644
--- a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2_sample_1.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_2_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_2_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_3/options.xml b/binsrc/tutorial/xmlsql/xs_s_3/options.xml
index 300e870..e306635 100644
--- a/binsrc/tutorial/xmlsql/xs_s_3/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3.xml b/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3.xml
index e5c8c0c..f4088b2 100644
--- a/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3_sample_1.vsp
index 662add4..57f9ec8 100644
--- a/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3_sample_1.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_3_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_3_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_4/options.xml b/binsrc/tutorial/xmlsql/xs_s_4/options.xml
index 300e870..e306635 100644
--- a/binsrc/tutorial/xmlsql/xs_s_4/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_4/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4.xml b/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4.xml
index 47bb64b..b7816bb 100644
--- a/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4_sample_1.vsp
index 8ef420e..631d1af 100644
--- a/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4_sample_1.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_4_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_4_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.sql b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.sql
index a924d39..9093969 100644
--- a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.sql
+++ b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_s_5.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_5.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xml b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xml
index ce0e712..ba95dba 100644
--- a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xsl b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xsl
index a814ba2..bd7de08 100644
--- a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xsl
+++ b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xs_s_5.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: xs_s_5.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5_show.vsp b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5_show.vsp
index ae208ed..459fdae 100644
--- a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5_show.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5_show.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_5_show.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_5_show.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_6/options.xml b/binsrc/tutorial/xmlsql/xs_s_6/options.xml
index 300e870..e306635 100644
--- a/binsrc/tutorial/xmlsql/xs_s_6/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_6/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6.xml b/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6.xml
index e082e20..860b8df 100644
--- a/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6_sample_1.vsp
index e4cc404..2f9d0e4 100644
--- a/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6_sample_1.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_6_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_6_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.html b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.html
index 3cedf90..d8fc65e 100644
--- a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.html
+++ b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xml b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xml
index a5aafae..14df94f 100644
--- a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xsl b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xsl
index d606042..140f9cb 100644
--- a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xsl
+++ b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: xs_s_7.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: xs_s_7.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7_sample_1.vsp
index bd55f07..9654b33 100644
--- a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7_sample_1.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_7_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_7_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_8/options.xml b/binsrc/tutorial/xmlsql/xs_s_8/options.xml
index 300e870..e306635 100644
--- a/binsrc/tutorial/xmlsql/xs_s_8/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_8/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.sql b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.sql
index 9edca77..5a5f4f5 100644
--- a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.sql
+++ b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_s_8.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_8.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.xml b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.xml
index 986aa87..469856e 100644
--- a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8_sample.vsp b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8_sample.vsp
index b11c522..15e4ffe 100644
--- a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8_sample.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_8_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_8_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/options.xml b/binsrc/tutorial/xmlsql/xs_s_9/options.xml
index 300e870..e306635 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_9/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9.xml b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9.xml
index 49a3077..cc8684b 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9.xml
+++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.sql b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.sql
index 7657bf8..44f0d8c 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.sql
+++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_s_9_sample_1.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_9_sample_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.vsp
index 6ce3b93..154ff2c 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_9_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_9_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.sql b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.sql
index 19142f7..90f1c03 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.sql
+++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_s_9_sample_2.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_9_sample_2.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.vsp b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.vsp
index 223abe4..03ae2f5 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_9_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_9_sample_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_3.vsp b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_3.vsp
index 92f973d..26bad0e 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_3.vsp
+++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_s_9_sample_3.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_9_sample_3.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_4.sql b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_4.sql
index 5db643e..bfaddec 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_4.sql
+++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_4.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_s_9_sample_4.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_9_sample_4.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_5.sql b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_5.sql
index ee927c0..eb86586 100644
--- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_5.sql
+++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_5.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_s_9_sample_5.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_s_9_sample_5.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_1/options.xml b/binsrc/tutorial/xmlsql/xs_u_1/options.xml
index 6ece952..73514ac 100644
--- a/binsrc/tutorial/xmlsql/xs_u_1/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_u_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xml b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xml
index 10f98b8..b86daa4 100644
--- a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xml
+++ b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xsl b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xsl
index 92b8caa..12e6dde 100644
--- a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xsl
+++ b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: xs_u_1.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: xs_u_1.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_sample_1.sql b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_sample_1.sql
index a08aba7..dfeffee 100644
--- a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_sample_1.sql
+++ b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_sample_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_u_1_sample_1.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_u_1_sample_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_view_src.vsp b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_view_src.vsp
index 9eaa15a..45f5c21 100644
--- a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_view_src.vsp
+++ b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_view_src.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_u_1_view_src.vsp,v 1.3.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_u_1_view_src.vsp,v 1.3 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_2/options.xml b/binsrc/tutorial/xmlsql/xs_u_2/options.xml
index 7541c1e..af0edae 100644
--- a/binsrc/tutorial/xmlsql/xs_u_2/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_u_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.sql b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.sql
index d7f6ef1..1de825e 100644
--- a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.sql
+++ b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_u_2.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_u_2.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.xml b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.xml
index 36329b6..1a03abb 100644
--- a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.xml
+++ b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_photo.vsp b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_photo.vsp
index 182e178..c6a0d11 100644
--- a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_photo.vsp
+++ b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_photo.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_u_2_photo.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_u_2_photo.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_sample.vsp b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_sample.vsp
index 057f785..1ce518a 100644
--- a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_sample.vsp
+++ b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_u_2_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_u_2_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/options.xml b/binsrc/tutorial/xmlsql/xs_u_3/options.xml
index 8296381..9bff0da 100644
--- a/binsrc/tutorial/xmlsql/xs_u_3/options.xml
+++ b/binsrc/tutorial/xmlsql/xs_u_3/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.html b/binsrc/tutorial/xmlsql/xs_u_3/shippers.html
index b08a7b3..fae1478 100644
--- a/binsrc/tutorial/xmlsql/xs_u_3/shippers.html
+++ b/binsrc/tutorial/xmlsql/xs_u_3/shippers.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml
index 51e8e3c..5867551 100644
--- a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml
+++ b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl
index 5c2170d..33d1a05 100644
--- a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl
+++ b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: shippers.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: shippers.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.sql b/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.sql
index 6a2c725..7acca5a 100644
--- a/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.sql
+++ b/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_u_3.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_u_3.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.xml b/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.xml
index 1cd5b83..a035ce1 100644
--- a/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.xml
+++ b/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/index.xml b/binsrc/tutorial/xmlxslt/index.xml
index 5c37be0..719fd76 100644
--- a/binsrc/tutorial/xmlxslt/index.xml
+++ b/binsrc/tutorial/xmlxslt/index.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_d_1/options.xml b/binsrc/tutorial/xmlxslt/xs_d_1/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xmlxslt/xs_d_1/options.xml
+++ b/binsrc/tutorial/xmlxslt/xs_d_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1.xml b/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1.xml
index 0a69390..7cde7e8 100644
--- a/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1.xml
+++ b/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1_sample_1.vsp b/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1_sample_1.vsp
index e301e18..2aa957b 100644
--- a/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1_sample_1.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_d_1_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_d_1_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/options.xml b/binsrc/tutorial/xmlxslt/xs_e_1/options.xml
index 3331d39..1d71c38 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/options.xml
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.sql b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.sql
index 40a170d..c3a8812 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.sql
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_e_1.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_e_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xml b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xml
index 354ad89..8f0eab0 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xml
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xsl b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xsl
index 94d6632..4f652d3 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xsl
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xs_e_1.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: xs_e_1.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_ft_intl.sql b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_ft_intl.sql
index c291023..e0c0139 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_ft_intl.sql
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_ft_intl.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_e_1_ft_intl.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_e_1_ft_intl.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_1.vsp b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_1.vsp
index 0540589..e240c78 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_1.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_e_1_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_e_1_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_2.vsp b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_2.vsp
index f593ce9..b2fcedc 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_2.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_e_1_sample_2.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_e_1_sample_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_3.vsp b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_3.vsp
index 862b64e..33bd68b 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_3.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_e_1_sample_3.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_e_1_sample_3.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_2.xsl b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_2.xsl
index 512bb90..7136038 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_2.xsl
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_2.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xs_e_2.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: xs_e_2.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_3.xsl b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_3.xsl
index eb7c74b..212fcca 100644
--- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_3.xsl
+++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_3.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xs_e_3.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: xs_e_3.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/options.xml b/binsrc/tutorial/xmlxslt/xs_f_1/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xmlxslt/xs_f_1/options.xml
+++ b/binsrc/tutorial/xmlxslt/xs_f_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xml b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xml
index a90df50..f06427c 100644
--- a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xml
+++ b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xsl b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xsl
index 224c9fe..e993dfe 100644
--- a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xsl
+++ b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: xs_f_1.xsl,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+ - $Id: xs_f_1.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1_sample.vsp b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1_sample.vsp
index 79c88b4..08cce18 100644
--- a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1_sample.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_f_1_sample.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_f_1_sample.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_2/options.xml b/binsrc/tutorial/xmlxslt/xs_f_2/options.xml
index 88a17a1..88cfba1 100644
--- a/binsrc/tutorial/xmlxslt/xs_f_2/options.xml
+++ b/binsrc/tutorial/xmlxslt/xs_f_2/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2.xml b/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2.xml
index 1ac8aa9..59816a6 100644
--- a/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2.xml
+++ b/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2_sample.vsp b/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2_sample.vsp
index 00acb1a..9e05abe 100644
--- a/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2_sample.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2_sample.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_f_2_sample.vsp,v 1.3.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_f_2_sample.vsp,v 1.3 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1.xml b/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1.xml
index 07558a2..8a3934b 100644
--- a/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1.xml
+++ b/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1_sample_1.vsp b/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1_sample_1.vsp
index 705d1ee..93904f2 100644
--- a/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1_sample_1.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1_sample_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_l_1_sample_1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_l_1_sample_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/options.xml b/binsrc/tutorial/xmlxslt/xs_t_1/options.xml
index 4c8da8c..57d5c2c 100644
--- a/binsrc/tutorial/xmlxslt/xs_t_1/options.xml
+++ b/binsrc/tutorial/xmlxslt/xs_t_1/options.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.sql b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.sql
index dce3fc0..c900414 100644
--- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.sql
+++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.sql
@@ -1,10 +1,10 @@
--
--- $Id: xs_t_1.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_t_1.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.xml b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.xml
index 4c2a8ed..36062b2 100644
--- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.xml
+++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits.vsp b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits.vsp
index 123db24..885d759 100644
--- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_t_1_hits.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_t_1_hits.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits1.vsp b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits1.vsp
index 9f1e53c..a257aa5 100644
--- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits1.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_t_1_hits1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_t_1_hits1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_list.vsp b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_list.vsp
index 2bd2f41..b163095 100644
--- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_list.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_t_1_list.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_t_1_list.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_trig.vsp b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_trig.vsp
index e3e6294..fe161d6 100644
--- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_trig.vsp
+++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_trig.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xs_t_1_trig.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: xs_t_1_trig.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/Makefile.am b/binsrc/vad/Makefile.am
index 6887e16..24ec372 100644
--- a/binsrc/vad/Makefile.am
+++ b/binsrc/vad/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/Makefile.in b/binsrc/vad/Makefile.in
index cf4aeff..7747ec5 100644
--- a/binsrc/vad/Makefile.in
+++ b/binsrc/vad/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/vad/http/regedit.vsp b/binsrc/vad/http/regedit.vsp
index 834672a..5a6461c 100644
--- a/binsrc/vad/http/regedit.vsp
+++ b/binsrc/vad/http/regedit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit.vsp,v 1.3.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: regedit.vsp,v 1.3 2007/03/28 11:42:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/http/regedit_data.vsp b/binsrc/vad/http/regedit_data.vsp
index 5d2b104..fa4bc90 100644
--- a/binsrc/vad/http/regedit_data.vsp
+++ b/binsrc/vad/http/regedit_data.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_data.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: regedit_data.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/http/regedit_e1.vsp b/binsrc/vad/http/regedit_e1.vsp
index 4de4b6f..5c49b35 100644
--- a/binsrc/vad/http/regedit_e1.vsp
+++ b/binsrc/vad/http/regedit_e1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_e1.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: regedit_e1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/http/regedit_sql.vsp b/binsrc/vad/http/regedit_sql.vsp
index e975652..a137a7c 100644
--- a/binsrc/vad/http/regedit_sql.vsp
+++ b/binsrc/vad/http/regedit_sql.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_sql.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: regedit_sql.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/http/regedit_sticker.vsp b/binsrc/vad/http/regedit_sticker.vsp
index b676fa0..6544964 100644
--- a/binsrc/vad/http/regedit_sticker.vsp
+++ b/binsrc/vad/http/regedit_sticker.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_sticker.vsp,v 1.3.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: regedit_sticker.vsp,v 1.3 2007/01/22 13:57:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/http/regedit_tree.vsp b/binsrc/vad/http/regedit_tree.vsp
index ec65116..9247489 100644
--- a/binsrc/vad/http/regedit_tree.vsp
+++ b/binsrc/vad/http/regedit_tree.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_tree.vsp,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: regedit_tree.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/oper_pars.sql b/binsrc/vad/oper_pars.sql
index 9b17418..5691fb1 100644
--- a/binsrc/vad/oper_pars.sql
+++ b/binsrc/vad/oper_pars.sql
@@ -1,10 +1,10 @@
--
--- $Id: oper_pars.sql,v 1.3.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: oper_pars.sql,v 1.3 2007/01/22 13:57:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/operpars.awk b/binsrc/vad/operpars.awk
index 4f96a41..614e03a 100644
--- a/binsrc/vad/operpars.awk
+++ b/binsrc/vad/operpars.awk
@@ -3,7 +3,7 @@ BEGIN {
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/pars_init.sql b/binsrc/vad/pars_init.sql
index f11e994..4109edf 100644
--- a/binsrc/vad/pars_init.sql
+++ b/binsrc/vad/pars_init.sql
@@ -1,10 +1,10 @@
--
--- $Id: pars_init.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: pars_init.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/parse_oper_pars.sh b/binsrc/vad/parse_oper_pars.sh
index b57f6f0..b695a97 100755
--- a/binsrc/vad/parse_oper_pars.sh
+++ b/binsrc/vad/parse_oper_pars.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: parse_oper_pars.sh,v 1.4.2.1 2012/03/08 12:55:18 source Exp $
+# $Id: parse_oper_pars.sh,v 1.4 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/vad/regedit.sql b/binsrc/vad/regedit.sql
index 47cc9a0..29789f2 100644
--- a/binsrc/vad/regedit.sql
+++ b/binsrc/vad/regedit.sql
@@ -1,10 +1,10 @@
--
--- $Id: regedit.sql,v 1.2.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: regedit.sql,v 1.2 2006/08/16 07:58:13 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/specs/sticker_rdf_lib.xml b/binsrc/vad/specs/sticker_rdf_lib.xml
index b7a7abd..834146a 100644
--- a/binsrc/vad/specs/sticker_rdf_lib.xml
+++ b/binsrc/vad/specs/sticker_rdf_lib.xml
@@ -6,7 +6,7 @@
<name package="rdf_lib">
<prop name="Title" value="RDF Support Library" />
<prop name="Developer" value="OpenLink Software" />
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software" />
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software" />
<prop name="Download" value="http://www.openlinksw.com/virtuoso/rdf_lib/download" />
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/rdf_lib/download" />
</name>
diff --git a/binsrc/vad/vad.isql b/binsrc/vad/vad.isql
index b2650a2..cfa23a3 100644
--- a/binsrc/vad/vad.isql
+++ b/binsrc/vad/vad.isql
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/vad_boot.sql b/binsrc/vad/vad_boot.sql
index b69e600..3892b4f 100644
--- a/binsrc/vad/vad_boot.sql
+++ b/binsrc/vad/vad_boot.sql
@@ -1,10 +1,10 @@
--
--- $Id: vad_boot.sql,v 1.3.2.1 2012/03/08 12:55:18 source Exp $
+-- $Id: vad_boot.sql,v 1.3 2007/01/22 13:57:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/vad_make.sql b/binsrc/vad/vad_make.sql
index edef0ca..aa05856 100644
--- a/binsrc/vad/vad_make.sql
+++ b/binsrc/vad/vad_make.sql
@@ -1,10 +1,10 @@
--
--- $Id: vad_make.sql,v 1.23.2.6 2012/03/08 12:55:18 source Exp $
+-- $Id: vad_make.sql,v 1.23.2.5 2011/10/26 00:00:54 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vad/vad_misc.sql b/binsrc/vad/vad_misc.sql
index 006c056..4d5d919 100644
--- a/binsrc/vad/vad_misc.sql
+++ b/binsrc/vad/vad_misc.sql
@@ -1,10 +1,10 @@
--
--- $Id: vad_misc.sql,v 1.6.2.4 2012/03/08 12:55:18 source Exp $
+-- $Id: vad_misc.sql,v 1.6.2.3 2011/10/13 18:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -86,7 +86,7 @@ create procedure "VAD"."DBA"."HTML_FOOTER_OUT" ( in arr any )
http ('<TR CLASS="CopyrightBorder"><TD COLSPAN="2"><IMG SRC="/admin/images/1x1.gif" WIDTH="1" HEIGHT="2" ALT=""></TD></TR>');
http ('<TR><TD ALIGN="right" COLSPAN="2"><P CLASS="Copyright">Virtuoso Server ');
http (sys_stat('st_dbms_ver'));
- http (sprintf (' VAD Interface (%s) - Copyright© 1998-2012 OpenLink Software.</P></TD></TR>',"VAD"."DBA"."VAD_VERSION" ()));
+ http (sprintf (' VAD Interface (%s) - Copyright© 1998-2011 OpenLink Software.</P></TD></TR>',"VAD"."DBA"."VAD_VERSION" ()));
http ('</TABLE>\n</BODY>');
}
;
diff --git a/binsrc/vad/vad_root.sql b/binsrc/vad/vad_root.sql
index 4c01401..dd6a0c5 100644
--- a/binsrc/vad/vad_root.sql
+++ b/binsrc/vad/vad_root.sql
@@ -1,10 +1,10 @@
--
--- $Id: vad_root.sql,v 1.10.2.2 2012/03/08 12:55:18 source Exp $
+-- $Id: vad_root.sql,v 1.10.2.1 2011/09/09 13:19:03 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/virtodbc/CLIsql3_w32.cpp b/binsrc/virtodbc/CLIsql3_w32.cpp
index 85b9470..3a7598a 100644
--- a/binsrc/virtodbc/CLIsql3_w32.cpp
+++ b/binsrc/virtodbc/CLIsql3_w32.cpp
@@ -1,12 +1,12 @@
/*
- * $Id: CLIsql3_w32.cpp,v 1.5.2.3 2012/03/08 12:55:18 source Exp $
+ * $Id: CLIsql3_w32.cpp,v 1.5.2.2 2010/01/25 22:43:36 source Exp $
*
* Win32 specific version of CLIsql3
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/Makefile.am b/binsrc/virtodbc/Makefile.am
index dbbcd07..2251197 100644
--- a/binsrc/virtodbc/Makefile.am
+++ b/binsrc/virtodbc/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/Makefile.in b/binsrc/virtodbc/Makefile.in
index e1bdb02..ac3cae6 100644
--- a/binsrc/virtodbc/Makefile.in
+++ b/binsrc/virtodbc/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/virtodbc/dialog.cpp b/binsrc/virtodbc/dialog.cpp
index e20aa07..2793260 100644
--- a/binsrc/virtodbc/dialog.cpp
+++ b/binsrc/virtodbc/dialog.cpp
@@ -1,14 +1,14 @@
/*
* dialog.cpp
*
- * $Id: dialog.cpp,v 1.1.1.1.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: dialog.cpp,v 1.1.1.1.2.1 2010/01/25 22:43:36 source Exp $
*
* Common dialog code
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/dialog.h b/binsrc/virtodbc/dialog.h
index 7317fee..108d95f 100644
--- a/binsrc/virtodbc/dialog.h
+++ b/binsrc/virtodbc/dialog.h
@@ -1,14 +1,14 @@
/*
* dialog.h
*
- * $Id: dialog.h,v 1.1.1.1.2.3 2012/03/08 12:55:18 source Exp $
+ * $Id: dialog.h,v 1.1.1.1.2.2 2010/02/01 23:10:14 source Exp $
*
* Common dialog code
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/kvlist.cpp b/binsrc/virtodbc/kvlist.cpp
index c279c6a..5f709e0 100644
--- a/binsrc/virtodbc/kvlist.cpp
+++ b/binsrc/virtodbc/kvlist.cpp
@@ -1,14 +1,14 @@
/*
* kvlist.cpp
*
- * $Id: kvlist.cpp,v 1.3.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: kvlist.cpp,v 1.3.2.1 2010/01/25 22:43:36 source Exp $
*
* Key/Value pair matching for DSN parsing
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/kvlist.h b/binsrc/virtodbc/kvlist.h
index c582197..a92a4ec 100644
--- a/binsrc/virtodbc/kvlist.h
+++ b/binsrc/virtodbc/kvlist.h
@@ -1,14 +1,14 @@
/*
* kvlist.h
*
- * $Id: kvlist.h,v 1.2.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: kvlist.h,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
*
* Key/Value pair matching for DSN parsing
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/resource.h b/binsrc/virtodbc/resource.h
index 9f44362..1495751 100644
--- a/binsrc/virtodbc/resource.h
+++ b/binsrc/virtodbc/resource.h
@@ -1,10 +1,10 @@
/*
- * $Id: resource.h,v 1.2.2.3 2012/03/07 10:59:36 source Exp $
+ * $Id: resource.h,v 1.2.2.2 2010/01/25 22:43:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -21,11 +21,10 @@
*/
//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by virtodbc.rc
+// Microsoft Developer Studio generated include file.
+// Used by VirtDSN.rc
//
#define IDS_FINISH 1
-#define VS_VERSION_INFO 1
#define IDS_NEXT 3
#define IDS_AUTHMETHOD1 4
#define IDS_AUTHMETHOD2 5
diff --git a/binsrc/virtodbc/virtodbc.cpp b/binsrc/virtodbc/virtodbc.cpp
index 96c5ada..4fd90d5 100644
--- a/binsrc/virtodbc/virtodbc.cpp
+++ b/binsrc/virtodbc/virtodbc.cpp
@@ -1,14 +1,14 @@
/*
* virtodbc.cpp
*
- * $Id: virtodbc.cpp,v 1.5.2.3 2012/03/08 12:55:18 source Exp $
+ * $Id: virtodbc.cpp,v 1.5.2.2 2010/01/25 22:43:36 source Exp $
*
* Common includes for win32 utilties
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/virtodbc.def b/binsrc/virtodbc/virtodbc.def
index ac1dd7b..b5643b5 100644
--- a/binsrc/virtodbc/virtodbc.def
+++ b/binsrc/virtodbc/virtodbc.def
@@ -1,14 +1,14 @@
;
; virtodbc.def
;
-; $Id: virtodbc.def,v 1.2.2.2 2012/03/08 12:55:18 source Exp $
+; $Id: virtodbc.def,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
;
; DLL link script
;
; This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
; project.
;
-; Copyright (C) 1998-2012 OpenLink Software
+; Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/virtodbc.rc b/binsrc/virtodbc/virtodbc.rc
index b947474..90466bd 100644
--- a/binsrc/virtodbc/virtodbc.rc
+++ b/binsrc/virtodbc/virtodbc.rc
@@ -1,4 +1,4 @@
-// Microsoft Visual C++ generated resource script.
+//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
@@ -53,13 +53,14 @@ END
//
IDD_CONFIGDSN DIALOGEX 0, 0, 335, 204
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "OpenLink Virtuoso DSN Configuration"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
BEGIN
CONTROL 105,IDC_STATIC,"Static",SS_BITMAP,7,7,20,20
- LTEXT "",IDC_PLACEHOLDER,94,7,234,156,NOT WS_VISIBLE | WS_BORDER
+ LTEXT "",IDC_PLACEHOLDER,94,7,234,156,NOT WS_VISIBLE |
+ WS_BORDER
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,174,323,1
PUSHBUTTON "< &Back",IDC_BACKBTN,171,183,50,14
DEFPUSHBUTTON "&Next >",IDC_NEXTBTN,221,183,50,14
@@ -67,61 +68,74 @@ BEGIN
END
IDD_CONFIGPAGE1 DIALOGEX 0, 0, 234, 157
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- LTEXT "This wizard will help you create an ODBC data source that you can use to connect to OpenLink Virtuoso.",IDC_STATIC,0,0,234,17
- LTEXT "What name do you want to use to refer to the data source?",IDC_STATIC,0,19,234,8
+ LTEXT "This wizard will help you create an ODBC data source that you can use to connect to OpenLink Virtuoso.",
+ IDC_STATIC,0,0,234,17
+ LTEXT "What name do you want to use to refer to the data source?",
+ IDC_STATIC,0,19,234,8
RTEXT "Na&me:",IDC_STATIC,0,36,58,8
EDITTEXT IDC_DSN,64,33,170,14,ES_AUTOHSCROLL
- LTEXT "How do you want to describe the data source?",IDC_STATIC,0,58,234,8
+ LTEXT "How do you want to describe the data source?",
+ IDC_STATIC,0,58,234,8
RTEXT "&Description:",IDC_STATIC,0,75,58,8
EDITTEXT IDC_COMMENT,64,72,170,14,ES_AUTOHSCROLL
- LTEXT "Which Virtuoso Server do you want to connect to?",IDC_STATIC,0,98,234,8
+ LTEXT "Which Virtuoso Server do you want to connect to?",
+ IDC_STATIC,0,98,234,8
RTEXT "&Server:",IDC_STATIC,0,115,58,8
- COMBOBOX IDC_SERVER,64,112,170,50,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "This server &requires a secure connection (SSL)",IDC_USESSL,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,64,128,163,10
+ COMBOBOX IDC_SERVER,64,112,170,50,CBS_DROPDOWN | CBS_SORT |
+ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
+ CONTROL "This server &requires a secure connection (SSL)",
+ IDC_USESSL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,64,128,
+ 163,10
CONTROL "Use RoundRobin for failover connection",IDC_RROBIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,64,141,143,10
END
-IDD_CONFIGPAGE3 DIALOG 0, 0, 234, 157
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
+IDD_CONFIGPAGE3 DIALOG DISCARDABLE 0, 0, 234, 157
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "Change the &default database to:",IDC_USEDEFAULTDB,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,0,117,10
- COMBOBOX IDC_DEFAULTDB,12,12,166,60,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_DEFAULTDB,12,12,166,60,CBS_DROPDOWN | WS_VSCROLL |
+ WS_TABSTOP
CONTROL "Change the default character set to:",IDC_USEDEFAULTCS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,33,129,10
- COMBOBOX IDC_DEFAULTCS,12,45,166,60,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_DEFAULTCS,12,45,166,60,CBS_DROPDOWN | WS_VSCROLL |
+ WS_TABSTOP
CONTROL "Change the default transaction isolation level to:",IDC_USEDEFAULTIL,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,65,169,10
- COMBOBOX IDC_DEFAULTIL,12,78,166,60,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
- CONTROL "Automatically correct for daylight saving changes",IDC_USEDSTCORRECT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,97,169,10
- CONTROL "Treat system tables as user tables",IDC_NOSYSTEMTABLES,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,109,169,10
- CONTROL "Treat views as user tables",IDC_TREATVIEWSASTABLES,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,121,169,10
+ COMBOBOX IDC_DEFAULTIL,12,78,166,60,CBS_DROPDOWN | WS_VSCROLL |
+ WS_TABSTOP
+ CONTROL "Automatically correct for daylight saving changes",
+ IDC_USEDSTCORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+ 0,97,169,10
+ CONTROL "Treat system tables as user tables",
+ IDC_NOSYSTEMTABLES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+ 0,109,169,10
+ CONTROL "Treat views as user tables",
+ IDC_TREATVIEWSASTABLES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+ 0,121,169,10
END
-IDD_ODBCERROR DIALOG 0, 0, 201, 113
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_ODBCERROR DIALOG DISCARDABLE 0, 0, 201, 113
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Database connection failed"
FONT 8, "MS Sans Serif"
BEGIN
RTEXT "SQL State:",IDC_STATIC,18,10,45,8
EDITTEXT IDC_SQLSTATE,70,7,74,14,ES_AUTOHSCROLL | ES_READONLY
LTEXT "Reason:",IDC_STATIC,7,31,28,8
- EDITTEXT IDC_SQLERROR,7,41,187,42,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+ EDITTEXT IDC_SQLERROR,7,41,187,42,ES_MULTILINE | ES_AUTOVSCROLL |
+ ES_READONLY | WS_VSCROLL
DEFPUSHBUTTON "Dismiss",IDOK,70,92,50,14
END
-IDD_LOGINDLG DIALOG 0, 0, 235, 82
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_LOGINDLG DIALOG DISCARDABLE 0, 0, 235, 82
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "OpenLink Virtuoso Login"
FONT 8, "MS Sans Serif"
BEGIN
@@ -137,26 +151,33 @@ BEGIN
PUSHBUTTON "&Options >>",IDC_OPTIONS,178,61,50,14
END
-IDD_CONFIGPAGE2 DIALOG 0, 0, 234, 157
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
+IDD_CONFIGPAGE2 DIALOG DISCARDABLE 0, 0, 234, 157
+STYLE DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
FONT 8, "MS Sans Serif"
BEGIN
- LTEXT "How should the Virtuoso Server verify the authenticity of the login ID?",IDC_STATIC,0,0,219,8
+ LTEXT "How should the Virtuoso Server verify the authenticity of the login ID?",
+ IDC_STATIC,0,0,219,8
RTEXT "&Authentication method:",IDC_STATIC,0,13,58,16
- COMBOBOX IDC_AUTHMETHOD,64,15,136,59,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- CONTROL "C&onnect to the Virtuoso Server to obtain default settings for the additional configuration options.",IDC_USEUID,
- "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,0,42,227,19
+ COMBOBOX IDC_AUTHMETHOD,64,15,136,59,CBS_DROPDOWNLIST |
+ CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ CONTROL "C&onnect to the Virtuoso Server to obtain default settings for the additional configuration options.",
+ IDC_USEUID,"Button",BS_AUTOCHECKBOX | BS_MULTILINE |
+ WS_TABSTOP,0,42,227,19
RTEXT "&Login ID:",IDC_UIDLBL,0,67,58,8
EDITTEXT IDC_UID,64,64,136,13,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_BROWSEUIDCERT,200,65,29,13
RTEXT "&Password:",IDC_PWDLBL,0,83,58,8
EDITTEXT IDC_PWD,64,80,136,13,ES_PASSWORD | ES_AUTOHSCROLL
- CONTROL "&Require the server to authenticate itself with this public key:",IDC_USESERVERCERT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,107,203,10
+ CONTROL "&Require the server to authenticate itself with this public key:",
+ IDC_USESERVERCERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+ 0,107,203,10
RTEXT "C&ertificate:",IDC_SERVERCERTLBL,10,122,48,8
- EDITTEXT IDC_SERVERCERT,64,119,136,13,ES_AUTOHSCROLL | ES_READONLY
+ EDITTEXT IDC_SERVERCERT,64,119,136,13,ES_AUTOHSCROLL |
+ ES_READONLY
PUSHBUTTON "...",IDC_BROWSESERVERCERT,200,119,29,13
- CONTROL "&Disable interactive login",IDC_NOLOGINBOX,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,0,147,91,10
+ CONTROL "&Disable interactive login",IDC_NOLOGINBOX,"Button",
+ BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED |
+ WS_TABSTOP,0,147,91,10
END
@@ -166,7 +187,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_CONFIGDSN, DIALOG
BEGIN
@@ -222,52 +243,14 @@ END
// Bitmap
//
-IDB_BITMAPVIRT BITMAP "virtodbc.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,3,3127
- PRODUCTVERSION 6,1,3,3127
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "OpenLink Software"
- VALUE "FileDescription", "Virtuoso OpenSource"
- VALUE "FileVersion", "6, 1, 3, 3127"
- VALUE "InternalName", "Virtuoso"
- VALUE "LegalCopyright", "Copyright (C) 1998-2012 OpenLink Software"
- VALUE "ProductName", "Virtuoso OpenSource"
- VALUE "ProductVersion", "6, 1, 3, 3127"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
+IDB_BITMAPVIRT BITMAP DISCARDABLE "virtodbc.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
-STRINGTABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_FINISH "Finish"
IDS_NEXT "&Next >"
@@ -283,10 +266,6 @@ BEGIN
IDS_PKCS12BROWSE "Personal Information Exchange (*.pfx;*.p12)|*.pfx;*.p12|PEM Encoded File (*.pem)|*.pem|All Files (*.*)|*.*|"
IDS_ZCUNRESOLVED "Unable to locate the Virtuoso server. Please use either <host>:<port> in the Server field, or select a configuration from the list."
IDS_X509BROWSE "X.509 Certificate (*.cer;*.crt;*.pem)|*.cer;*.crt;*.pem|All Files (*.*)|*.*|"
-END
-
-STRINGTABLE
-BEGIN
IDS_ISOLATIONLEVEL1 "Read Uncommitted"
IDS_ISOLATIONLEVEL2 "Read Commited"
IDS_ISOLATIONLEVEL3 "Repeatable Read"
diff --git a/binsrc/virtodbc/w32util.h b/binsrc/virtodbc/w32util.h
index a48c803..f7d7dd7 100644
--- a/binsrc/virtodbc/w32util.h
+++ b/binsrc/virtodbc/w32util.h
@@ -1,14 +1,14 @@
/*
* w32util.h
*
- * $Id: w32util.h,v 1.2.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: w32util.h,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
*
* Common includes for win32 utilties
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/waitcursor.h b/binsrc/virtodbc/waitcursor.h
index 6e50fbe..f937a68 100644
--- a/binsrc/virtodbc/waitcursor.h
+++ b/binsrc/virtodbc/waitcursor.h
@@ -1,14 +1,14 @@
/*
* waitcursor.h
*
- * $Id: waitcursor.h,v 1.1.1.1.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: waitcursor.h,v 1.1.1.1.2.1 2010/01/25 22:43:36 source Exp $
*
* Wait cursor with dynamic scope
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/winctl.cpp b/binsrc/virtodbc/winctl.cpp
index 3c4c2bc..04412ee 100644
--- a/binsrc/virtodbc/winctl.cpp
+++ b/binsrc/virtodbc/winctl.cpp
@@ -1,14 +1,14 @@
/*
* winctl.cpp
*
- * $Id: winctl.cpp,v 1.1.1.1.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: winctl.cpp,v 1.1.1.1.2.1 2010/01/25 22:43:36 source Exp $
*
* Win32 controls
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/winctl.h b/binsrc/virtodbc/winctl.h
index 049842e..9bb059c 100644
--- a/binsrc/virtodbc/winctl.h
+++ b/binsrc/virtodbc/winctl.h
@@ -1,14 +1,14 @@
/*
* winctl.h
*
- * $Id: winctl.h,v 1.1.1.1.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: winctl.h,v 1.1.1.1.2.1 2010/01/25 22:43:36 source Exp $
*
* Win32 controls
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/wizard.cpp b/binsrc/virtodbc/wizard.cpp
index 6b5fbf4..0c7eaaa 100644
--- a/binsrc/virtodbc/wizard.cpp
+++ b/binsrc/virtodbc/wizard.cpp
@@ -1,14 +1,14 @@
/*
* wizard.cpp
*
- * $Id: wizard.cpp,v 1.1.1.1.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: wizard.cpp,v 1.1.1.1.2.1 2010/01/25 22:43:36 source Exp $
*
* Wizard Dialogs
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/wizard.h b/binsrc/virtodbc/wizard.h
index 3752f6e..843cfba 100644
--- a/binsrc/virtodbc/wizard.h
+++ b/binsrc/virtodbc/wizard.h
@@ -1,14 +1,14 @@
/*
* wizard.h
*
- * $Id: wizard.h,v 1.1.1.1.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: wizard.h,v 1.1.1.1.2.1 2010/01/25 22:43:36 source Exp $
*
* Wizard Dialogs
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/zcbrowser.cpp b/binsrc/virtodbc/zcbrowser.cpp
index 95ff132..ee8b4c6 100644
--- a/binsrc/virtodbc/zcbrowser.cpp
+++ b/binsrc/virtodbc/zcbrowser.cpp
@@ -1,14 +1,14 @@
/*
* zcbrowser.cpp
*
- * $Id: zcbrowser.cpp,v 1.2.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: zcbrowser.cpp,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
*
* Zero Config Browser (rendezvous)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/zcbrowser.h b/binsrc/virtodbc/zcbrowser.h
index ab8f7fd..4040f93 100644
--- a/binsrc/virtodbc/zcbrowser.h
+++ b/binsrc/virtodbc/zcbrowser.h
@@ -1,14 +1,14 @@
/*
* zcbrowser.h
*
- * $Id: zcbrowser.h,v 1.2.2.2 2012/03/08 12:55:18 source Exp $
+ * $Id: zcbrowser.h,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
*
* ZeroConfig Browser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/zcbrowsercombo.cpp b/binsrc/virtodbc/zcbrowsercombo.cpp
index 55797d8..95bd2d5 100644
--- a/binsrc/virtodbc/zcbrowsercombo.cpp
+++ b/binsrc/virtodbc/zcbrowsercombo.cpp
@@ -1,14 +1,14 @@
/*
* zcbrowsercombo.cpp
*
- * $Id: zcbrowsercombo.cpp,v 1.2.2.2 2012/03/08 12:55:19 source Exp $
+ * $Id: zcbrowsercombo.cpp,v 1.2.2.1 2010/01/25 22:43:36 source Exp $
*
* ZeroConfig Browser Combo
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtodbc/zcbrowsercombo.h b/binsrc/virtodbc/zcbrowsercombo.h
index 98ffd08..6f42223 100644
--- a/binsrc/virtodbc/zcbrowsercombo.h
+++ b/binsrc/virtodbc/zcbrowsercombo.h
@@ -1,14 +1,14 @@
/*
* zcbrowsercombo.h
*
- * $Id: zcbrowsercombo.h,v 1.1.1.1.2.2 2012/03/08 12:55:19 source Exp $
+ * $Id: zcbrowsercombo.h,v 1.1.1.1.2.1 2010/01/25 22:43:36 source Exp $
*
* ZeroConfig Browser Combo
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/virtoledb/Makefile.am b/binsrc/virtoledb/Makefile.am
index ba269bc..18ee650 100644
--- a/binsrc/virtoledb/Makefile.am
+++ b/binsrc/virtoledb/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/Makefile.in b/binsrc/virtoledb/Makefile.in
index 8b29c55..b3cf2ae 100644
--- a/binsrc/virtoledb/Makefile.in
+++ b/binsrc/virtoledb/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/virtoledb/asserts.cpp b/binsrc/virtoledb/asserts.cpp
index ca2246d..b84d012 100644
--- a/binsrc/virtoledb/asserts.cpp
+++ b/binsrc/virtoledb/asserts.cpp
@@ -3,14 +3,14 @@
*
* asserts.cpp
*
- * $Id: asserts.cpp,v 1.1.1.1.2.2 2012/03/08 12:55:19 source Exp $
+ * $Id: asserts.cpp,v 1.1.1.1.2.1 2011/01/25 14:36:33 source Exp $
*
* Debugging and Assertion Routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/asserts.h b/binsrc/virtoledb/asserts.h
index 06de854..e7a95f7 100644
--- a/binsrc/virtoledb/asserts.h
+++ b/binsrc/virtoledb/asserts.h
@@ -3,14 +3,14 @@
*
* asserts.h
*
- * $Id: asserts.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: asserts.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Assertion Routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/baseobj.cpp b/binsrc/virtoledb/baseobj.cpp
index 6d09fce..401fc07 100644
--- a/binsrc/virtoledb/baseobj.cpp
+++ b/binsrc/virtoledb/baseobj.cpp
@@ -1,13 +1,13 @@
/* baseobj.cpp
*
- * $Id: baseobj.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: baseobj.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Base class for COM objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/baseobj.h b/binsrc/virtoledb/baseobj.h
index 125da12..5e960e0 100644
--- a/binsrc/virtoledb/baseobj.h
+++ b/binsrc/virtoledb/baseobj.h
@@ -1,13 +1,13 @@
/* baseobj.h
*
- * $Id: baseobj.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: baseobj.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Base class for COM objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/command.cpp b/binsrc/virtoledb/command.cpp
index 7b22c67..06d5c5e 100644
--- a/binsrc/virtoledb/command.cpp
+++ b/binsrc/virtoledb/command.cpp
@@ -1,11 +1,11 @@
/* command.cpp
*
- * $Id: command.cpp,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: command.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/command.h b/binsrc/virtoledb/command.h
index e70eb2a..3671718 100644
--- a/binsrc/virtoledb/command.h
+++ b/binsrc/virtoledb/command.h
@@ -1,11 +1,11 @@
/* command.h
*
- * $Id: command.h,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: command.h,v 1.2 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/connobj.cpp b/binsrc/virtoledb/connobj.cpp
index a518dea..292a64d 100644
--- a/binsrc/virtoledb/connobj.cpp
+++ b/binsrc/virtoledb/connobj.cpp
@@ -1,13 +1,13 @@
/* connobj.h
*
- * $Id: connobj.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: connobj.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Connectable objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/connobj.h b/binsrc/virtoledb/connobj.h
index 72adeb5..342dbed 100644
--- a/binsrc/virtoledb/connobj.h
+++ b/binsrc/virtoledb/connobj.h
@@ -1,13 +1,13 @@
/* connobj.h
*
- * $Id: connobj.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: connobj.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Connectable objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/data.cpp b/binsrc/virtoledb/data.cpp
index c0e5273..e1e63f8 100644
--- a/binsrc/virtoledb/data.cpp
+++ b/binsrc/virtoledb/data.cpp
@@ -1,11 +1,11 @@
/* data.cpp
*
- * $Id: data.cpp,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: data.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/data.h b/binsrc/virtoledb/data.h
index 12b853a..b68f0bb 100644
--- a/binsrc/virtoledb/data.h
+++ b/binsrc/virtoledb/data.h
@@ -1,11 +1,11 @@
/* data.h
*
- * $Id: data.h,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: data.h,v 1.3 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/datalink.cpp b/binsrc/virtoledb/datalink.cpp
index c3ca0cb..91a5170 100644
--- a/binsrc/virtoledb/datalink.cpp
+++ b/binsrc/virtoledb/datalink.cpp
@@ -1,13 +1,13 @@
/* datalink.cpp
*
- * $Id: datalink.cpp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: datalink.cpp,v 1.2 2007/10/23 13:14:03 source Exp $
*
* Data Link property pages.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/datalink.h b/binsrc/virtoledb/datalink.h
index f8a1744..db83bd3 100644
--- a/binsrc/virtoledb/datalink.h
+++ b/binsrc/virtoledb/datalink.h
@@ -1,13 +1,13 @@
/* datalink.h
*
- * $Id: datalink.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: datalink.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Data Link property pages.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/dataobj.cpp b/binsrc/virtoledb/dataobj.cpp
index 24e2610..2bbc693 100644
--- a/binsrc/virtoledb/dataobj.cpp
+++ b/binsrc/virtoledb/dataobj.cpp
@@ -1,13 +1,13 @@
/* dataobj.cpp
*
- * $Id: dataobj.cpp,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: dataobj.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
*
* Base class for Command and Rowset objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/dataobj.h b/binsrc/virtoledb/dataobj.h
index debd49c..553ecd8 100644
--- a/binsrc/virtoledb/dataobj.h
+++ b/binsrc/virtoledb/dataobj.h
@@ -1,13 +1,13 @@
/* dataobj.h
*
- * $Id: dataobj.h,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: dataobj.h,v 1.2 2007/09/05 11:33:57 source Exp $
*
* Base class for Command and Rowset objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/datasource.cpp b/binsrc/virtoledb/datasource.cpp
index 034a497..4cff66b 100644
--- a/binsrc/virtoledb/datasource.cpp
+++ b/binsrc/virtoledb/datasource.cpp
@@ -1,11 +1,11 @@
/* datasource.cpp
*
- * $Id: datasource.cpp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: datasource.cpp,v 1.2 2007/09/05 11:33:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/datasource.h b/binsrc/virtoledb/datasource.h
index 5ffd70f..6d25f7c 100644
--- a/binsrc/virtoledb/datasource.h
+++ b/binsrc/virtoledb/datasource.h
@@ -1,11 +1,11 @@
/* datasource.h
*
- * $Id: datasource.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: datasource.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/db.cpp b/binsrc/virtoledb/db.cpp
index f05e8f1..d95f4cf 100644
--- a/binsrc/virtoledb/db.cpp
+++ b/binsrc/virtoledb/db.cpp
@@ -1,11 +1,11 @@
/* db.cpp
*
- * $Id: db.cpp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: db.cpp,v 1.2 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/db.h b/binsrc/virtoledb/db.h
index ebd3ea5..c073559 100644
--- a/binsrc/virtoledb/db.h
+++ b/binsrc/virtoledb/db.h
@@ -1,11 +1,11 @@
/* db.h
*
- * $Id: db.h,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: db.h,v 1.2 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/dllmodule.cpp b/binsrc/virtoledb/dllmodule.cpp
index 6060b4a..9b72603 100644
--- a/binsrc/virtoledb/dllmodule.cpp
+++ b/binsrc/virtoledb/dllmodule.cpp
@@ -1,11 +1,11 @@
/* dllmodule.cpp
*
- * $Id: dllmodule.cpp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: dllmodule.cpp,v 1.2 2007/09/05 11:33:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/dllmodule.h b/binsrc/virtoledb/dllmodule.h
index b8124c9..becf381 100644
--- a/binsrc/virtoledb/dllmodule.h
+++ b/binsrc/virtoledb/dllmodule.h
@@ -1,11 +1,11 @@
/* dllmodule.h
*
- * $Id: dllmodule.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: dllmodule.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/error.cpp b/binsrc/virtoledb/error.cpp
index 66b22e0..dd53642 100644
--- a/binsrc/virtoledb/error.cpp
+++ b/binsrc/virtoledb/error.cpp
@@ -1,11 +1,11 @@
/* error.cpp
*
- * $Id: error.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: error.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/error.h b/binsrc/virtoledb/error.h
index db4a92c..17cb8d4 100644
--- a/binsrc/virtoledb/error.h
+++ b/binsrc/virtoledb/error.h
@@ -1,11 +1,11 @@
/* error.h
*
- * $Id: error.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: error.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/filedsn.cpp b/binsrc/virtoledb/filedsn.cpp
index 6fd9fde..730fd54 100644
--- a/binsrc/virtoledb/filedsn.cpp
+++ b/binsrc/virtoledb/filedsn.cpp
@@ -1,11 +1,11 @@
/* filedsn.h
*
- * $Id: filedsn.cpp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: filedsn.cpp,v 1.2 2007/09/05 11:33:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/filedsn.h b/binsrc/virtoledb/filedsn.h
index cdc90b2..c85461c 100644
--- a/binsrc/virtoledb/filedsn.h
+++ b/binsrc/virtoledb/filedsn.h
@@ -1,11 +1,11 @@
/* filedsn.h
*
- * $Id: filedsn.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: filedsn.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/globals.cpp b/binsrc/virtoledb/globals.cpp
index df09406..ef9fdfd 100644
--- a/binsrc/virtoledb/globals.cpp
+++ b/binsrc/virtoledb/globals.cpp
@@ -1,6 +1,6 @@
/* globals.cpp
*
- * $Id: globals.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: globals.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Source file that includes just the standard includes
* virtoledb.pch will be the pre-compiled header
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/headers.cpp b/binsrc/virtoledb/headers.cpp
index e070d86..3555808 100644
--- a/binsrc/virtoledb/headers.cpp
+++ b/binsrc/virtoledb/headers.cpp
@@ -1,6 +1,6 @@
/* headers.cpp
*
- * $Id: headers.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: headers.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Source file that includes just the standard includes
* virtoledb.pch will be the pre-compiled header
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/headers.h b/binsrc/virtoledb/headers.h
index 7c8064a..53806e3 100644
--- a/binsrc/virtoledb/headers.h
+++ b/binsrc/virtoledb/headers.h
@@ -1,6 +1,6 @@
/* headers.h
*
- * $Id: headers.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: headers.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Include file for standard system include files, or
* project specific include files that are used frequently,
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/lobdata.cpp b/binsrc/virtoledb/lobdata.cpp
index 9c0e110..8882030 100644
--- a/binsrc/virtoledb/lobdata.cpp
+++ b/binsrc/virtoledb/lobdata.cpp
@@ -1,11 +1,11 @@
/* lobdata.h
*
- * $Id: lobdata.cpp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: lobdata.cpp,v 1.2 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/lobdata.h b/binsrc/virtoledb/lobdata.h
index 5f6bf10..4f40c33 100644
--- a/binsrc/virtoledb/lobdata.h
+++ b/binsrc/virtoledb/lobdata.h
@@ -1,11 +1,11 @@
/* lobdata.h
*
- * $Id: lobdata.h,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: lobdata.h,v 1.2 2007/09/05 11:33:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/mresults.cpp b/binsrc/virtoledb/mresults.cpp
index b923e8a..4e5951d 100644
--- a/binsrc/virtoledb/mresults.cpp
+++ b/binsrc/virtoledb/mresults.cpp
@@ -1,11 +1,11 @@
/* mresults.cpp
*
- * $Id: mresults.cpp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: mresults.cpp,v 1.2 2007/09/05 11:33:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/mresults.h b/binsrc/virtoledb/mresults.h
index 159af3c..4ecef72 100644
--- a/binsrc/virtoledb/mresults.h
+++ b/binsrc/virtoledb/mresults.h
@@ -1,11 +1,11 @@
/* mresults.h
*
- * $Id: mresults.h,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: mresults.h,v 1.2 2007/09/05 11:33:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/os.h b/binsrc/virtoledb/os.h
index 2b17173..dbfcada 100644
--- a/binsrc/virtoledb/os.h
+++ b/binsrc/virtoledb/os.h
@@ -1,13 +1,13 @@
/* os.h
*
- * $Id: os.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: os.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Portability macros
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/paramdata.cpp b/binsrc/virtoledb/paramdata.cpp
index 3744a11..4910f4c 100644
--- a/binsrc/virtoledb/paramdata.cpp
+++ b/binsrc/virtoledb/paramdata.cpp
@@ -1,11 +1,11 @@
/* paramdata.cpp
*
- * $Id: paramdata.cpp,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: paramdata.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/paramdata.h b/binsrc/virtoledb/paramdata.h
index 89651ac..308f12e 100644
--- a/binsrc/virtoledb/paramdata.h
+++ b/binsrc/virtoledb/paramdata.h
@@ -1,11 +1,11 @@
/* paramdata.h
*
- * $Id: paramdata.h,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: paramdata.h,v 1.3 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/properties.cpp b/binsrc/virtoledb/properties.cpp
index 6098cac..16644bd 100644
--- a/binsrc/virtoledb/properties.cpp
+++ b/binsrc/virtoledb/properties.cpp
@@ -1,11 +1,11 @@
/* properties.cpp
*
- * $Id: properties.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: properties.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/properties.h b/binsrc/virtoledb/properties.h
index cb9b008..04b436f 100644
--- a/binsrc/virtoledb/properties.h
+++ b/binsrc/virtoledb/properties.h
@@ -1,11 +1,11 @@
/* properties.h
*
- * $Id: properties.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: properties.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/refcounted.cpp b/binsrc/virtoledb/refcounted.cpp
index f11b951..5faae16 100644
--- a/binsrc/virtoledb/refcounted.cpp
+++ b/binsrc/virtoledb/refcounted.cpp
@@ -1,13 +1,13 @@
/* refcounted.h
*
- * $Id: refcounted.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: refcounted.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Reference counted objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/refcounted.h b/binsrc/virtoledb/refcounted.h
index 41cc13f..f3a507a 100644
--- a/binsrc/virtoledb/refcounted.h
+++ b/binsrc/virtoledb/refcounted.h
@@ -1,13 +1,13 @@
/* refcounted.h
*
- * $Id: refcounted.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: refcounted.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Reference counted objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/resource.h b/binsrc/virtoledb/resource.h
index e17f578..4ec7074 100644
--- a/binsrc/virtoledb/resource.h
+++ b/binsrc/virtoledb/resource.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/rowset.cpp b/binsrc/virtoledb/rowset.cpp
index 2434739..2e1ee36 100644
--- a/binsrc/virtoledb/rowset.cpp
+++ b/binsrc/virtoledb/rowset.cpp
@@ -1,11 +1,11 @@
/* rowset.cpp
*
- * $Id: rowset.cpp,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: rowset.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/rowset.h b/binsrc/virtoledb/rowset.h
index 771657b..ae3a44e 100644
--- a/binsrc/virtoledb/rowset.h
+++ b/binsrc/virtoledb/rowset.h
@@ -1,11 +1,11 @@
/* rowset.h
*
- * $Id: rowset.h,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: rowset.h,v 1.2 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/rowsetdata.cpp b/binsrc/virtoledb/rowsetdata.cpp
index 1ca01d3..067bf91 100644
--- a/binsrc/virtoledb/rowsetdata.cpp
+++ b/binsrc/virtoledb/rowsetdata.cpp
@@ -1,11 +1,11 @@
/* rowsetdata.cpp
*
- * $Id: rowsetdata.cpp,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: rowsetdata.cpp,v 1.3 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/rowsetdata.h b/binsrc/virtoledb/rowsetdata.h
index 5941832..791ea8a 100644
--- a/binsrc/virtoledb/rowsetdata.h
+++ b/binsrc/virtoledb/rowsetdata.h
@@ -1,11 +1,11 @@
/* rowsetdata.h
*
- * $Id: rowsetdata.h,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: rowsetdata.h,v 1.3 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/rowsetprops.cpp b/binsrc/virtoledb/rowsetprops.cpp
index af26671..f0d0cc9 100644
--- a/binsrc/virtoledb/rowsetprops.cpp
+++ b/binsrc/virtoledb/rowsetprops.cpp
@@ -1,11 +1,11 @@
/* rowsetprops.h
*
- * $Id: rowsetprops.cpp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: rowsetprops.cpp,v 1.2 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/rowsetprops.h b/binsrc/virtoledb/rowsetprops.h
index c2b75b2..97c71ef 100644
--- a/binsrc/virtoledb/rowsetprops.h
+++ b/binsrc/virtoledb/rowsetprops.h
@@ -1,11 +1,11 @@
/* rowsetprops.h
*
- * $Id: rowsetprops.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: rowsetprops.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/session.cpp b/binsrc/virtoledb/session.cpp
index cc62619..12919c6 100644
--- a/binsrc/virtoledb/session.cpp
+++ b/binsrc/virtoledb/session.cpp
@@ -1,11 +1,11 @@
/* session.cpp
*
- * $Id: session.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: session.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/session.h b/binsrc/virtoledb/session.h
index 74153ae..3edb30f 100644
--- a/binsrc/virtoledb/session.h
+++ b/binsrc/virtoledb/session.h
@@ -1,11 +1,11 @@
/* session.h
*
- * $Id: session.h,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: session.h,v 1.2 2007/10/23 13:14:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/syncobj.cpp b/binsrc/virtoledb/syncobj.cpp
index 553bc0b..030ee92 100644
--- a/binsrc/virtoledb/syncobj.cpp
+++ b/binsrc/virtoledb/syncobj.cpp
@@ -1,13 +1,13 @@
/* syncobj.cpp
*
- * $Id: syncobj.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: syncobj.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Synchronization objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/syncobj.h b/binsrc/virtoledb/syncobj.h
index 8023580..4f522cf 100644
--- a/binsrc/virtoledb/syncobj.h
+++ b/binsrc/virtoledb/syncobj.h
@@ -1,13 +1,13 @@
/* syncobj.h
*
- * $Id: syncobj.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: syncobj.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* Synchronization objects.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/util.cpp b/binsrc/virtoledb/util.cpp
index c994a41..9635a51 100644
--- a/binsrc/virtoledb/util.cpp
+++ b/binsrc/virtoledb/util.cpp
@@ -1,11 +1,11 @@
/* util.cpp
*
- * $Id: util.cpp,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: util.cpp,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/util.h b/binsrc/virtoledb/util.h
index 3404f39..54f8048 100644
--- a/binsrc/virtoledb/util.h
+++ b/binsrc/virtoledb/util.h
@@ -1,11 +1,11 @@
/* util.h
*
- * $Id: util.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: util.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtoledb/virtoledb.h b/binsrc/virtoledb/virtoledb.h
index 2276805..e54f912 100644
--- a/binsrc/virtoledb/virtoledb.h
+++ b/binsrc/virtoledb/virtoledb.h
@@ -1,11 +1,11 @@
/* virtoledb.h
*
- * $Id: virtoledb.h,v 1.1.1.1.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: virtoledb.h,v 1.1.1.1 2006/04/11 17:56:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso/Makefile.am b/binsrc/virtuoso/Makefile.am
index 5767285..996c368 100644
--- a/binsrc/virtuoso/Makefile.am
+++ b/binsrc/virtuoso/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso/Makefile.in b/binsrc/virtuoso/Makefile.in
index 078c050..e0666b8 100644
--- a/binsrc/virtuoso/Makefile.in
+++ b/binsrc/virtuoso/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -227,7 +227,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -276,7 +275,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -328,7 +326,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -375,6 +372,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/virtuoso/libviwin32.def b/binsrc/virtuoso/libviwin32.def
index 83bf7c7..8aaa90e 100644
--- a/binsrc/virtuoso/libviwin32.def
+++ b/binsrc/virtuoso/libviwin32.def
@@ -1,14 +1,14 @@
;
; libviwin32.def
;
-; $Id: libviwin32.def,v 1.4.2.3 2012/03/08 12:55:19 source Exp $
+; $Id: libviwin32.def,v 1.4.2.1 2010/01/25 22:44:12 source Exp $
;
; Link script for the OpenLink Virtuoso Universal Server DLL
;
; This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
; project.
;
-; Copyright (C) 1998-2012 OpenLink Software
+; Copyright (C) 1998-2010 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
@@ -195,6 +195,7 @@ EXPORTS
sch_name_to_type @673
PrpcThreadAttach @674
PrpcThreadDetach @675
+ decode_base64 @676
case_mode @677
virtuoso_odbc_port @678
uudecode_base64 @679
@@ -209,4 +210,3 @@ EXPORTS
isp_schema_1 @688
strses_enable_paging @689
http_ses_size @690
- log_proc_overwrite @691
diff --git a/binsrc/virtuoso/viconfig.c b/binsrc/virtuoso/viconfig.c
index cf38427..161e7b2 100644
--- a/binsrc/virtuoso/viconfig.c
+++ b/binsrc/virtuoso/viconfig.c
@@ -1,12 +1,12 @@
/*
* viconfig.c
*
- * $Id: viconfig.c,v 1.38.2.34 2012/03/15 13:57:11 source Exp $
+ * $Id: viconfig.c,v 1.38.2.28 2011/10/28 21:49:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -30,8 +30,6 @@
#include "sqlnode.h"
#include "sqlver.h"
-
-#include "util/sslengine.h"
#include "plugin.h"
#include "langfunc.h"
#include "msdtc.h"
@@ -177,7 +175,6 @@ extern int uriqa_dynamic_local;
extern int lite_mode;
extern int rdf_obj_ft_rules_size;
extern int it_n_maps;
-extern int32 rdf_shorten_long_iri;
extern int32 ric_samples_sz;
extern int32 enable_p_stat;
extern int aq_max_threads;
@@ -1362,7 +1359,7 @@ cfg_setup (void)
if (cfg_getlong (pconfig, section, "DuplicateCheckpointRemaps", &cpt_remap_recovery) == -1)
cpt_remap_recovery = 0;
if (cfg_getlong (pconfig, section, "CheckExtentFreePages", &dbs_check_extent_free_pages) == -1)
- dbs_check_extent_free_pages = 1;
+ dbs_check_extent_free_pages = 0;
#if 0/*obsoleted*/
@@ -1450,31 +1447,9 @@ cfg_setup (void)
c_sparql_max_mem_in_use = 0;
if (cfg_getlong (pconfig, section, "TransitivityCacheEnabled", &tn_cache_enable) == -1)
tn_cache_enable = 0;
- if (cfg_getlong (pconfig, section, "ShortenLongURIs", &rdf_shorten_long_iri) == -1)
- rdf_shorten_long_iri = 0;
if (cfg_getlong (pconfig, section, "EnablePstats", &enable_p_stat) == -1)
enable_p_stat = 1;
- /* Initialize OpenSSL engines */
- ssl_engine_startup ();
-#if 0
- if (cfg_find (pconfig, "SSLEngines", NULL) == 0)
- {
- while (cfg_nextentry (pconfig) == 0)
- {
- if (cfg_section (pconfig))
- break;
- if (cfg_define (pconfig) && !cfg_continue (pconfig))
- {
- if (ssl_engine_configure (pconfig->value) == -1)
- {
- log_error ("Failed to configure an OpenSSL engine with parameters '%s'", pconfig->value);
- }
- }
- }
- }
-#endif
-
/* Now open the HTTP log */
if (http_log_file)
{
@@ -2046,6 +2021,7 @@ new_dbs_read_cfg (dbe_storage_t * dbs, char *ignore_file_name)
}
modifier = toupper (segszstr[strlen (segszstr) - 1]);
/* THIS ASSUMES PAGE_SZ == 4k */
+# define KILOS_PER_PAGE (PAGE_SZ/1024)
switch (modifier)
{
case 'K':
@@ -2237,7 +2213,7 @@ static void
db_lck_write_pid (int fd)
{
char pid_arr[50];
- size_t len;
+ int len;
snprintf (pid_arr, sizeof (pid_arr), "VIRT_PID=%lu\n", (unsigned long) getpid ());
len = strlen (pid_arr);
diff --git a/binsrc/virtuoso/viunix.c b/binsrc/virtuoso/viunix.c
index ca17454..63ba967 100644
--- a/binsrc/virtuoso/viunix.c
+++ b/binsrc/virtuoso/viunix.c
@@ -1,14 +1,14 @@
/*
* viunix.c
*
- * $Id: viunix.c,v 1.11.2.5 2012/03/08 12:55:19 source Exp $
+ * $Id: viunix.c,v 1.11.2.4 2011/10/28 21:49:35 source Exp $
*
* OpenLink Virtuoso VDBMS Server main
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso/viwin32.c b/binsrc/virtuoso/viwin32.c
index 30b5e65..990f86f 100644
--- a/binsrc/virtuoso/viwin32.c
+++ b/binsrc/virtuoso/viwin32.c
@@ -1,7 +1,7 @@
/*
* viwin32.c
*
- * $Id: viwin32.c,v 1.11.2.4 2012/03/14 13:58:52 source Exp $
+ * $Id: viwin32.c,v 1.11.2.2 2011/10/26 09:34:24 source Exp $
*
* OpenLink Virtuoso DBMS Server
* Main code for Win32
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1632,14 +1632,3 @@ ApplicationMain (int argc, char **argv)
return NO_ERROR;
}
-
-
-/* This is here so that OpenSSL can determine if this instance is running
- * as a windows service. OpenSSL tries to avoid UI when this returns TRUE.
- * It also affects the random generator which reads the screen at startup.
- */
-__declspec(dllexport) BOOL __cdecl
-_OPENSSL_isservice (void)
-{
- return serviceFlag;
-}
diff --git a/binsrc/virtuoso/viwin32.ico b/binsrc/virtuoso/viwin32.ico
index b7ff434..77aa4ee 100644
Binary files a/binsrc/virtuoso/viwin32.ico and b/binsrc/virtuoso/viwin32.ico differ
diff --git a/binsrc/virtuoso_sink/DBConnection.cpp b/binsrc/virtuoso_sink/DBConnection.cpp
index 40d8d3d..07b7211 100644
--- a/binsrc/virtuoso_sink/DBConnection.cpp
+++ b/binsrc/virtuoso_sink/DBConnection.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/DBConnection.h b/binsrc/virtuoso_sink/DBConnection.h
index 1bd0dd9..a4ded5e 100644
--- a/binsrc/virtuoso_sink/DBConnection.h
+++ b/binsrc/virtuoso_sink/DBConnection.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/DBConnectionPool.cpp b/binsrc/virtuoso_sink/DBConnectionPool.cpp
index 13fa82b..aa3555c 100644
--- a/binsrc/virtuoso_sink/DBConnectionPool.cpp
+++ b/binsrc/virtuoso_sink/DBConnectionPool.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/DBConnectionPool.h b/binsrc/virtuoso_sink/DBConnectionPool.h
index d48ad3e..a87426a 100644
--- a/binsrc/virtuoso_sink/DBConnectionPool.h
+++ b/binsrc/virtuoso_sink/DBConnectionPool.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/MailMsg_i.c b/binsrc/virtuoso_sink/MailMsg_i.c
index 428f2bf..0fcdeeb 100644
--- a/binsrc/virtuoso_sink/MailMsg_i.c
+++ b/binsrc/virtuoso_sink/MailMsg_i.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/MailMsg_p.c b/binsrc/virtuoso_sink/MailMsg_p.c
index 7c9bb0b..99308d0 100644
--- a/binsrc/virtuoso_sink/MailMsg_p.c
+++ b/binsrc/virtuoso_sink/MailMsg_p.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/Makefile.am b/binsrc/virtuoso_sink/Makefile.am
index 932eafc..18827ad 100644
--- a/binsrc/virtuoso_sink/Makefile.am
+++ b/binsrc/virtuoso_sink/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/Makefile.in b/binsrc/virtuoso_sink/Makefile.in
index 1b030da..a3d58f8 100644
--- a/binsrc/virtuoso_sink/Makefile.in
+++ b/binsrc/virtuoso_sink/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/virtuoso_sink/NNTP.cpp b/binsrc/virtuoso_sink/NNTP.cpp
index c31cb1d..2a76b4c 100644
--- a/binsrc/virtuoso_sink/NNTP.cpp
+++ b/binsrc/virtuoso_sink/NNTP.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/NNTP.h b/binsrc/virtuoso_sink/NNTP.h
index 7db2a00..98761fe 100644
--- a/binsrc/virtuoso_sink/NNTP.h
+++ b/binsrc/virtuoso_sink/NNTP.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/SMTP.cpp b/binsrc/virtuoso_sink/SMTP.cpp
index f059331..9c0ffe2 100644
--- a/binsrc/virtuoso_sink/SMTP.cpp
+++ b/binsrc/virtuoso_sink/SMTP.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/SMTP.h b/binsrc/virtuoso_sink/SMTP.h
index 6be70a0..b14aaae 100644
--- a/binsrc/virtuoso_sink/SMTP.h
+++ b/binsrc/virtuoso_sink/SMTP.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/Seo_i.c b/binsrc/virtuoso_sink/Seo_i.c
index 83a250b..abe03d1 100644
--- a/binsrc/virtuoso_sink/Seo_i.c
+++ b/binsrc/virtuoso_sink/Seo_i.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/Seo_p.c b/binsrc/virtuoso_sink/Seo_p.c
index 1d841f1..e3ad410 100644
--- a/binsrc/virtuoso_sink/Seo_p.c
+++ b/binsrc/virtuoso_sink/Seo_p.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/SmtpEvent.h b/binsrc/virtuoso_sink/SmtpEvent.h
index c20e890..4e84990 100644
--- a/binsrc/virtuoso_sink/SmtpEvent.h
+++ b/binsrc/virtuoso_sink/SmtpEvent.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/SmtpEvent_i.c b/binsrc/virtuoso_sink/SmtpEvent_i.c
index c167d1a..8b2e891 100644
--- a/binsrc/virtuoso_sink/SmtpEvent_i.c
+++ b/binsrc/virtuoso_sink/SmtpEvent_i.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/SmtpEvent_p.c b/binsrc/virtuoso_sink/SmtpEvent_p.c
index 74c055c..8743c06 100644
--- a/binsrc/virtuoso_sink/SmtpEvent_p.c
+++ b/binsrc/virtuoso_sink/SmtpEvent_p.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/StdAfx.cpp b/binsrc/virtuoso_sink/StdAfx.cpp
index 14b6945..bedb5b0 100644
--- a/binsrc/virtuoso_sink/StdAfx.cpp
+++ b/binsrc/virtuoso_sink/StdAfx.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/StdAfx.h b/binsrc/virtuoso_sink/StdAfx.h
index c89f702..cf739c4 100644
--- a/binsrc/virtuoso_sink/StdAfx.h
+++ b/binsrc/virtuoso_sink/StdAfx.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink.cpp b/binsrc/virtuoso_sink/VirtuosoSink.cpp
index e5b4e2d..ec72e1b 100644
--- a/binsrc/virtuoso_sink/VirtuosoSink.cpp
+++ b/binsrc/virtuoso_sink/VirtuosoSink.cpp
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink.h b/binsrc/virtuoso_sink/VirtuosoSink.h
index dd19cd8..0f57b0d 100644
--- a/binsrc/virtuoso_sink/VirtuosoSink.h
+++ b/binsrc/virtuoso_sink/VirtuosoSink.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink.idl b/binsrc/virtuoso_sink/VirtuosoSink.idl
index c45a446..0cf7150 100644
--- a/binsrc/virtuoso_sink/VirtuosoSink.idl
+++ b/binsrc/virtuoso_sink/VirtuosoSink.idl
@@ -2,7 +2,7 @@
// This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
// project.
//
-// Copyright (C) 1998-2012 OpenLink Software
+// Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink_i.c b/binsrc/virtuoso_sink/VirtuosoSink_i.c
index 1beb180..9a08e40 100644
--- a/binsrc/virtuoso_sink/VirtuosoSink_i.c
+++ b/binsrc/virtuoso_sink/VirtuosoSink_i.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/VirtuosoSink_p.c b/binsrc/virtuoso_sink/VirtuosoSink_p.c
index 345d1a0..4fd76f2 100644
--- a/binsrc/virtuoso_sink/VirtuosoSink_p.c
+++ b/binsrc/virtuoso_sink/VirtuosoSink_p.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/dlldata.c b/binsrc/virtuoso_sink/dlldata.c
index 75ce7a1..cc3ead6 100644
--- a/binsrc/virtuoso_sink/dlldata.c
+++ b/binsrc/virtuoso_sink/dlldata.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/virtuoso_sink/resource.h b/binsrc/virtuoso_sink/resource.h
index 64c1b5c..5524684 100644
--- a/binsrc/virtuoso_sink/resource.h
+++ b/binsrc/virtuoso_sink/resource.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/Makefile.am b/binsrc/vsp/Makefile.am
index 4632d56..3e2a088 100644
--- a/binsrc/vsp/Makefile.am
+++ b/binsrc/vsp/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/Makefile.in b/binsrc/vsp/Makefile.in
index 4e11f3d..6487732 100644
--- a/binsrc/vsp/Makefile.in
+++ b/binsrc/vsp/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -152,7 +151,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -251,6 +248,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/vsp/admin/Hosted_Modules.vspx b/binsrc/vsp/admin/Hosted_Modules.vspx
index f349558..6ffb186 100644
--- a/binsrc/vsp/admin/Hosted_Modules.vspx
+++ b/binsrc/vsp/admin/Hosted_Modules.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: Hosted_Modules.vspx,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ - $Id: Hosted_Modules.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/Hosted_Modules_load.vspx b/binsrc/vsp/admin/Hosted_Modules_load.vspx
index 2d11a7e..d615680 100644
--- a/binsrc/vsp/admin/Hosted_Modules_load.vspx
+++ b/binsrc/vsp/admin/Hosted_Modules_load.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: Hosted_Modules_load.vspx,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ - $Id: Hosted_Modules_load.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/Hosted_Modules_load_results.vspx b/binsrc/vsp/admin/Hosted_Modules_load_results.vspx
index 21af4fd..ce7ce74 100644
--- a/binsrc/vsp/admin/Hosted_Modules_load_results.vspx
+++ b/binsrc/vsp/admin/Hosted_Modules_load_results.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: Hosted_Modules_load_results.vspx,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ - $Id: Hosted_Modules_load_results.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/Hosted_Modules_select.vspx b/binsrc/vsp/admin/Hosted_Modules_select.vspx
index 6e5850c..376aeef 100644
--- a/binsrc/vsp/admin/Hosted_Modules_select.vspx
+++ b/binsrc/vsp/admin/Hosted_Modules_select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: Hosted_Modules_select.vspx,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ - $Id: Hosted_Modules_select.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/Hosted_Modules_select2.vspx b/binsrc/vsp/admin/Hosted_Modules_select2.vspx
index 39c9082..e757c13 100644
--- a/binsrc/vsp/admin/Hosted_Modules_select2.vspx
+++ b/binsrc/vsp/admin/Hosted_Modules_select2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: Hosted_Modules_select2.vspx,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ - $Id: Hosted_Modules_select2.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/adm_js_check.vsp b/binsrc/vsp/admin/adm_js_check.vsp
index eafefa7..57d0da4 100644
--- a/binsrc/vsp/admin/adm_js_check.vsp
+++ b/binsrc/vsp/admin/adm_js_check.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: adm_js_check.vsp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+-- $Id: adm_js_check.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin.sql b/binsrc/vsp/admin/admin.sql
index 81d22cd..d7eb69e 100644
--- a/binsrc/vsp/admin/admin.sql
+++ b/binsrc/vsp/admin/admin.sql
@@ -2,14 +2,14 @@
--
-- admin.sql
--
--- $Id: admin.sql,v 1.3.2.5 2012/03/08 12:55:19 source Exp $
+-- $Id: admin.sql,v 1.3.2.3 2011/02/03 10:35:33 source Exp $
--
-- Virtuoso admin vsp interface
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -4282,7 +4282,7 @@ adm_page_footer()
http('<TR><TD CLASS="CopyrightBorder" COLSPAN="2"><IMG SRC="/admin/images/1x1.gif" WIDTH="1" HEIGHT="2" ALT=""></TD></TR>');
http('<TR><TD ALIGN="right" COLSPAN="2"><P CLASS="Copyright">Virtuoso Universal Server ');
http(sys_stat('st_dbms_ver'));
- http(' - Copyright© 1998-2012 OpenLink Software.</P></TD></TR>');
+ http(' - Copyright© 1998-2011 OpenLink Software.</P></TD></TR>');
http('</TABLE>\n</BODY>');
}
;
diff --git a/binsrc/vsp/admin/admin_conn_ds.vsp b/binsrc/vsp/admin/admin_conn_ds.vsp
index 188a205..d9bf8a6 100644
--- a/binsrc/vsp/admin/admin_conn_ds.vsp
+++ b/binsrc/vsp/admin/admin_conn_ds.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_conn_ds.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_conn_ds.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_conn_ds_add.vsp b/binsrc/vsp/admin/admin_conn_ds_add.vsp
index 262f181..9cfca5e 100644
--- a/binsrc/vsp/admin/admin_conn_ds_add.vsp
+++ b/binsrc/vsp/admin/admin_conn_ds_add.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_conn_ds_add.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_conn_ds_add.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp b/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp
index 8e6787a..cada748 100644
--- a/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp
+++ b/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: adm_acl_main.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: adm_acl_main.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp b/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp
index 1eca49d..116729f 100644
--- a/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp
+++ b/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: adm_http_acl.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: adm_http_acl.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp b/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp
index 9a4be2d..a47c8ea 100644
--- a/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp
+++ b/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: adm_proxy_acl.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: adm_proxy_acl.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp b/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp
index 0c2150a..ae812f1 100644
--- a/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp
+++ b/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: adm_soap_opts.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: adm_soap_opts.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp b/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp
index 089785a..eafd641 100644
--- a/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp
+++ b/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: adm_wsdl_gen.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: adm_wsdl_gen.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog.vsp b/binsrc/vsp/admin/admin_dav/admin_blog.vsp
index 0ff39fe..3d326f1 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp
index c21a933..3004a95 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_1.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_1.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp
index 97d4224..c7ad5a4 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_2.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_2.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp
index 40d27ed..f5fd7b8 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_3.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_3.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp
index fb32865..0422cf8 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_category.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_category.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp
index 4cddb2c..d8dbcf7 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_channel.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_channel.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_channel_items.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_channel_items.vsp
index 6e44eb4..d0bdb5c 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_channel_items.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_channel_items.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_channel_items.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_channel_items.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp
index 81e6e93..21c0a14 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_comments.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_comments.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp
index f1f6ac0..e69250c 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_cont.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_cont.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_domain_setup.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_domain_setup.vsp
index 685dcf4..4a95fc6 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_domain_setup.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_domain_setup.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_domain_setup.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_domain_setup.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_error_log.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_error_log.vsp
index ab99042..2ce35b2 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_error_log.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_error_log.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_error_log.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_error_log.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp
index 49d155d..3004a0a 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_mail.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_mail.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail_gw.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail_gw.vsp
index a2d21eb..2e2ee25 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_mail_gw.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_mail_gw.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_mail_gw.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_mail_gw.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail_pic.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail_pic.vsp
index b1873e0..c96bd82 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_mail_pic.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_mail_pic.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_mail_pic.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_mail_pic.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail_show.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail_show.vsp
index 3534d35..e7d7290 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_mail_show.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_mail_show.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_mail_show.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_mail_show.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx b/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx
index ef9e80b..10f2aff 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: admin_blog_notify.vspx,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+ - $Id: admin_blog_notify.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_ping_hosts.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_ping_hosts.vsp
index 679316e..ff48eb1 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_ping_hosts.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_ping_hosts.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_ping_hosts.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_ping_hosts.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_search_eng.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_search_eng.vsp
index 6d6cbd6..ddded2e 100644
--- a/binsrc/vsp/admin/admin_dav/admin_blog_search_eng.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_blog_search_eng.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_blog_search_eng.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_blog_search_eng.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp
index a894387..36a33dd 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_browse.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_browse.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp
index e6f4e4c..fdc2aa3 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_cols.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_cols.vsp,v 1.3 2007/01/22 14:02:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_document_search.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_document_search.vsp
index e354914..b4dde48 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_document_search.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_document_search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_document_search.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_document_search.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp
index 07dbb09..2aa6c2f 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_documents.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_documents.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp
index 9250f7d..0a31ac2 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_edit.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_edit.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp
index f4cb93b..c1f8bf7 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_editor.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_editor.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_ftext_upd.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_ftext_upd.vsp
index 7a7f5fe..c537fff 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_ftext_upd.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_ftext_upd.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_ftext_upd.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_ftext_upd.vsp,v 1.3 2007/01/22 14:02:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp
index c9ea78f..0b8fa5f 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_new.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_new.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_res_types.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_res_types.vsp
index a531a73..cbddfbc 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_res_types.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_res_types.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_res_types.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_res_types.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_user_opts.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_user_opts.vsp
index 9ac72cf..584281c 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_user_opts.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_user_opts.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_user_opts.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_user_opts.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp
index 96643e5..3aafac3 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_users.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_users.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp
index f2e6225..041d393 100644
--- a/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dav_xslt.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dav_xslt.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_footer.vsp b/binsrc/vsp/admin/admin_dav/admin_footer.vsp
index ed452da..8eaba54 100644
--- a/binsrc/vsp/admin/admin_dav/admin_footer.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_footer.vsp
@@ -1 +1 @@
-<hr><div class="copyright"><small>Virtuoso management interface. Copyright © 1998-2012 OpenLink Software</small></div>
+<hr><div class="copyright"><small>Virtuoso management interface. Copyright © 1998-2011 OpenLink Software</small></div>
diff --git a/binsrc/vsp/admin/admin_dav/admin_import_users.vsp b/binsrc/vsp/admin/admin_dav/admin_import_users.vsp
index 7e3037b..5cbed72 100644
--- a/binsrc/vsp/admin/admin_dav/admin_import_users.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_import_users.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_import_users.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_import_users.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_import_users_1.vsp b/binsrc/vsp/admin/admin_dav/admin_import_users_1.vsp
index 08cdb99..cb4949e 100644
--- a/binsrc/vsp/admin/admin_dav/admin_import_users_1.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_import_users_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_import_users_1.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_import_users_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_import_users_2.vsp b/binsrc/vsp/admin/admin_dav/admin_import_users_2.vsp
index 2c8c9ee..b7a571d 100644
--- a/binsrc/vsp/admin/admin_dav/admin_import_users_2.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_import_users_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_import_users_2.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_import_users_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_import_users_3.vsp b/binsrc/vsp/admin/admin_dav/admin_import_users_3.vsp
index 70736b7..f8804db 100644
--- a/binsrc/vsp/admin/admin_dav/admin_import_users_3.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_import_users_3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_import_users_3.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_import_users_3.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp b/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp
index 02820c6..746d70d 100644
--- a/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_proc_list.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_proc_list.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp b/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp
index df7ef11..f90f52f 100644
--- a/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_select_proc.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_select_proc.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp b/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp
index b71a58e..3f934c9 100644
--- a/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_soap_list.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_soap_list.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_export_main.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_export_main.vsp
index 3c6a8b6..0ca549a 100644
--- a/binsrc/vsp/admin/admin_dav/admin_vfs_export_main.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_vfs_export_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_vfs_export_main.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_vfs_export_main.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp
index 8d6c5ef..a0988a4 100644
--- a/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_vfs_queue.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_vfs_queue.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp
index b1601ee..bd6e431 100644
--- a/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_vfs_site.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_vfs_site.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp
index ddc420d..1779c24 100644
--- a/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_vfs_urls.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_vfs_urls.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp b/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp
index e0eee4e..a7708b5 100644
--- a/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_virt_dir.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_virt_dir.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp b/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp
index 565128a..ac12106 100644
--- a/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp
+++ b/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_xml_template.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_xml_template.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp b/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp
index 732c138..d8166b2 100644
--- a/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp
+++ b/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: blog_post_preview.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: blog_post_preview.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/bridge.vspx b/binsrc/vsp/admin/admin_dav/bridge.vspx
index 69979b0..b9e2cb9 100644
--- a/binsrc/vsp/admin/admin_dav/bridge.vspx
+++ b/binsrc/vsp/admin/admin_dav/bridge.vspx
@@ -2,12 +2,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: bridge.vspx,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+ - $Id: bridge.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.css b/binsrc/vsp/admin/admin_dav/dav_browser.css
index 9092ed0..d52ece7 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser.css
+++ b/binsrc/vsp/admin/admin_dav/dav_browser.css
@@ -1,10 +1,10 @@
/*
- * $Id: dav_browser.css,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+ * $Id: dav_browser.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.js b/binsrc/vsp/admin/admin_dav/dav_browser.js
index 20f46fc..fec6c94 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser.js
+++ b/binsrc/vsp/admin/admin_dav/dav_browser.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.sql b/binsrc/vsp/admin/admin_dav/dav_browser.sql
index fce0fde..ce7f49b 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser.sql
+++ b/binsrc/vsp/admin/admin_dav/dav_browser.sql
@@ -1,10 +1,10 @@
--
--- $Id: dav_browser.sql,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_browser.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.vsp b/binsrc/vsp/admin/admin_dav/dav_browser.vsp
index 9e5b0e1..c7cd5e7 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_browser.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_browser.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp
index dd5de61..1d82fa6 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_bot.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_browser_bot.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp
index fc3e02b..a4a5c86 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_host.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_browser_host.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp
index 8ea4968..f2d9be0 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_js.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_browser_js.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp
index 08651db..fc7c973 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_list.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_browser_list.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js b/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js
index eae0efd..89d0acb 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js
+++ b/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_msie.js b/binsrc/vsp/admin/admin_dav/dav_browser_msie.js
index 55e4c02..4e87043 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser_msie.js
+++ b/binsrc/vsp/admin/admin_dav/dav_browser_msie.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp
index aceaa65..fe20985 100644
--- a/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_top.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_browser_top.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp b/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp
index db240f4..3205926 100644
--- a/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_dir_list.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_dir_list.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_js.vsp b/binsrc/vsp/admin/admin_dav/dav_js.vsp
index 7a7051c..2c3a658 100644
--- a/binsrc/vsp/admin/admin_dav/dav_js.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_js.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_js.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_js.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp b/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp
index eefab39..40e5138 100644
--- a/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp
+++ b/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_prop_edit.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dav_prop_edit.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/dir_list.vsp b/binsrc/vsp/admin/admin_dav/dir_list.vsp
index 65a774b..5441437 100644
--- a/binsrc/vsp/admin/admin_dav/dir_list.vsp
+++ b/binsrc/vsp/admin/admin_dav/dir_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dir_list.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: dir_list.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/error.vsp b/binsrc/vsp/admin/admin_dav/error.vsp
index ae0dd93..f65d97a 100644
--- a/binsrc/vsp/admin/admin_dav/error.vsp
+++ b/binsrc/vsp/admin/admin_dav/error.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: error.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: error.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/error_pages.vspx b/binsrc/vsp/admin/admin_dav/error_pages.vspx
index 5385203..2b50bfe 100644
--- a/binsrc/vsp/admin/admin_dav/error_pages.vspx
+++ b/binsrc/vsp/admin/admin_dav/error_pages.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: error_pages.vspx,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+ - $Id: error_pages.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/ftt_hits.vsp b/binsrc/vsp/admin/admin_dav/ftt_hits.vsp
index b00e0a6..86bee50 100644
--- a/binsrc/vsp/admin/admin_dav/ftt_hits.vsp
+++ b/binsrc/vsp/admin/admin_dav/ftt_hits.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ftt_hits.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: ftt_hits.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/ftt_query.vsp b/binsrc/vsp/admin/admin_dav/ftt_query.vsp
index ca4e58e..497532b 100644
--- a/binsrc/vsp/admin/admin_dav/ftt_query.vsp
+++ b/binsrc/vsp/admin/admin_dav/ftt_query.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ftt_query.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: ftt_query.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/get_blogs.vspx b/binsrc/vsp/admin/admin_dav/get_blogs.vspx
index 7992549..d19acc4 100644
--- a/binsrc/vsp/admin/admin_dav/get_blogs.vspx
+++ b/binsrc/vsp/admin/admin_dav/get_blogs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: get_blogs.vspx,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+ - $Id: get_blogs.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/portfolio.xml b/binsrc/vsp/admin/admin_dav/portfolio.xml
index 7a15a51..fc7c215 100644
--- a/binsrc/vsp/admin/admin_dav/portfolio.xml
+++ b/binsrc/vsp/admin/admin_dav/portfolio.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/portfolio.xsl b/binsrc/vsp/admin/admin_dav/portfolio.xsl
index 39839ea..490aba7 100644
--- a/binsrc/vsp/admin/admin_dav/portfolio.xsl
+++ b/binsrc/vsp/admin/admin_dav/portfolio.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: portfolio.xsl,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+ - $Id: portfolio.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/search_help.html b/binsrc/vsp/admin/admin_dav/search_help.html
index f86cfdd..71b7d5c 100644
--- a/binsrc/vsp/admin/admin_dav/search_help.html
+++ b/binsrc/vsp/admin/admin_dav/search_help.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/util.js b/binsrc/vsp/admin/admin_dav/util.js
index a775cb0..79be980 100644
--- a/binsrc/vsp/admin/admin_dav/util.js
+++ b/binsrc/vsp/admin/admin_dav/util.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs.sql b/binsrc/vsp/admin/admin_dav/vfs.sql
index 85074e9..5d9ab62 100644
--- a/binsrc/vsp/admin/admin_dav/vfs.sql
+++ b/binsrc/vsp/admin/admin_dav/vfs.sql
@@ -1,14 +1,14 @@
--
-- vfs.sql
--
--- $Id: vfs.sql,v 1.10.2.29 2012/03/08 12:55:20 source Exp $
+-- $Id: vfs.sql,v 1.10.2.28 2011/08/01 14:17:06 source Exp $
--
-- Site-copy robot.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs_export.vsp b/binsrc/vsp/admin/admin_dav/vfs_export.vsp
index 2a70d7a..e26cfe5 100644
--- a/binsrc/vsp/admin/admin_dav/vfs_export.vsp
+++ b/binsrc/vsp/admin/admin_dav/vfs_export.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vfs_export.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: vfs_export.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp b/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp
index 28527bb..61a3681 100644
--- a/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp
+++ b/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vfs_queue_sched.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: vfs_queue_sched.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs_status.vsp b/binsrc/vsp/admin/admin_dav/vfs_status.vsp
index c51d230..6553a9a 100644
--- a/binsrc/vsp/admin/admin_dav/vfs_status.vsp
+++ b/binsrc/vsp/admin/admin_dav/vfs_status.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vfs_status.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: vfs_status.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp b/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp
index d521b56..09fc8b5 100644
--- a/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp
+++ b/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vfs_urls_list.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: vfs_urls_list.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/vfsddk.sql b/binsrc/vsp/admin/admin_dav/vfsddk.sql
index 608b16d..c99d886 100644
--- a/binsrc/vsp/admin/admin_dav/vfsddk.sql
+++ b/binsrc/vsp/admin/admin_dav/vfsddk.sql
@@ -1,14 +1,14 @@
--
-- vfsddk.sql
--
--- $Id: vfsddk.sql,v 1.5.2.17 2012/03/08 12:55:20 source Exp $
+-- $Id: vfsddk.sql,v 1.5.2.16 2011/08/01 14:17:06 source Exp $
--
-- Site-copy robot DB.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dav/vsp_debug.vsp b/binsrc/vsp/admin/admin_dav/vsp_debug.vsp
index 66b3927..c800ef8 100644
--- a/binsrc/vsp/admin/admin_dav/vsp_debug.vsp
+++ b/binsrc/vsp/admin/admin_dav/vsp_debug.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp_debug.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: vsp_debug.vsp,v 1.3 2006/11/30 13:49:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_ddl.sql b/binsrc/vsp/admin/admin_ddl.sql
index b2d23ad..ea2d6e0 100644
--- a/binsrc/vsp/admin/admin_ddl.sql
+++ b/binsrc/vsp/admin/admin_ddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: admin_ddl.sql,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_ddl.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dsn.vsp b/binsrc/vsp/admin/admin_dsn.vsp
index f309183..fdcf741 100644
--- a/binsrc/vsp/admin/admin_dsn.vsp
+++ b/binsrc/vsp/admin/admin_dsn.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dsn_add.vsp b/binsrc/vsp/admin/admin_dsn_add.vsp
index 9457940..cf5f190 100644
--- a/binsrc/vsp/admin/admin_dsn_add.vsp
+++ b/binsrc/vsp/admin/admin_dsn_add.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn_add.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn_add.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dsn_add2.vsp b/binsrc/vsp/admin/admin_dsn_add2.vsp
index 746e42b..94e60b0 100644
--- a/binsrc/vsp/admin/admin_dsn_add2.vsp
+++ b/binsrc/vsp/admin/admin_dsn_add2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn_add2.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn_add2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dsn_add3.vsp b/binsrc/vsp/admin/admin_dsn_add3.vsp
index f3972ed..587d4a4 100644
--- a/binsrc/vsp/admin/admin_dsn_add3.vsp
+++ b/binsrc/vsp/admin/admin_dsn_add3.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn_add3.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn_add3.vsp,v 1.3 2006/11/30 13:49:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dsn_add_generic32.vsp b/binsrc/vsp/admin/admin_dsn_add_generic32.vsp
index 14d60bb..232beaf 100644
--- a/binsrc/vsp/admin/admin_dsn_add_generic32.vsp
+++ b/binsrc/vsp/admin/admin_dsn_add_generic32.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn_add_generic32.vsp,v 1.3.2.4 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn_add_generic32.vsp,v 1.3.2.2 2011/02/03 10:35:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -140,7 +140,7 @@
?>
<FORM method="POST" action="admin_dsn_add_generic32_2.vsp" name="gen32">
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="5">
- <TR><TD COLSPAN="3" ALIGN="middle"><P CLASS="copyright_noalign"><?=_driver_de?><BR /><small>Copyright 1998-2012 OpenLink Software</small><BR /><small>All rights reserved</small></P></TD></TR>
+ <TR><TD COLSPAN="3" ALIGN="middle"><P CLASS="copyright_noalign"><?=_driver_de?><BR /><small>Copyright 1998-2011 OpenLink Software</small><BR /><small>All rights reserved</small></P></TD></TR>
<TR><TD ROWSPAN="3" VALIGN="top"><IMG SRC="images/opl.jpg" BORDER="1" /></TD>
<TD VALIGN="top">
diff --git a/binsrc/vsp/admin/admin_dsn_add_generic32_2.vsp b/binsrc/vsp/admin/admin_dsn_add_generic32_2.vsp
index 105f062..ceca4ea 100644
--- a/binsrc/vsp/admin/admin_dsn_add_generic32_2.vsp
+++ b/binsrc/vsp/admin/admin_dsn_add_generic32_2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn_add_generic32_2.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn_add_generic32_2.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dsn_add_virt.vsp b/binsrc/vsp/admin/admin_dsn_add_virt.vsp
index d342a2b..3a4f8b1 100644
--- a/binsrc/vsp/admin/admin_dsn_add_virt.vsp
+++ b/binsrc/vsp/admin/admin_dsn_add_virt.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn_add_virt.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn_add_virt.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dsn_edit.vsp b/binsrc/vsp/admin/admin_dsn_edit.vsp
index 96148c7..8e95c01 100644
--- a/binsrc/vsp/admin/admin_dsn_edit.vsp
+++ b/binsrc/vsp/admin/admin_dsn_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn_edit.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn_edit.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_dsn_edit_virt.vsp b/binsrc/vsp/admin/admin_dsn_edit_virt.vsp
index 8d607a9..06e9bc7 100644
--- a/binsrc/vsp/admin/admin_dsn_edit_virt.vsp
+++ b/binsrc/vsp/admin/admin_dsn_edit_virt.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_dsn_edit_virt.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_dsn_edit_virt.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_evt_main.vsp b/binsrc/vsp/admin/admin_evt_main.vsp
index 79572aa..fc47cac 100644
--- a/binsrc/vsp/admin/admin_evt_main.vsp
+++ b/binsrc/vsp/admin/admin_evt_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_evt_main.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_evt_main.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_footer.vsp b/binsrc/vsp/admin/admin_footer.vsp
index 1612bb0..52a959d 100644
--- a/binsrc/vsp/admin/admin_footer.vsp
+++ b/binsrc/vsp/admin/admin_footer.vsp
@@ -1,4 +1,4 @@
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<TR><TD CLASS="CopyrightBorder"><IMG SRC="/admin/images/1x1.gif" WIDTH="1" HEIGHT="2" ALT=""></TD></TR>
-<TR><TD><P CLASS="copyright">Virtuoso Universal Server (<?= sys_stat('st_dbms_ver') ?>) - Copyright© 1998-2012 OpenLink Software. </P></TD></TR>
+<TR><TD><P CLASS="copyright">Virtuoso Universal Server (<?= sys_stat('st_dbms_ver') ?>) - Copyright© 1998-2011 OpenLink Software. </P></TD></TR>
</TABLE>
diff --git a/binsrc/vsp/admin/admin_isql_main.vsp b/binsrc/vsp/admin/admin_isql_main.vsp
index a3be6a8..06e78bf 100644
--- a/binsrc/vsp/admin/admin_isql_main.vsp
+++ b/binsrc/vsp/admin/admin_isql_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_isql_main.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_isql_main.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_left.vsp b/binsrc/vsp/admin/admin_left.vsp
index 1edd64f..8877840 100644
--- a/binsrc/vsp/admin/admin_left.vsp
+++ b/binsrc/vsp/admin/admin_left.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_left.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_left.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_link_proc.vsp b/binsrc/vsp/admin/admin_link_proc.vsp
index 4e28a4f..decac45 100644
--- a/binsrc/vsp/admin/admin_link_proc.vsp
+++ b/binsrc/vsp/admin/admin_link_proc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_link_proc.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_link_proc.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_link_proc_1.vsp b/binsrc/vsp/admin/admin_link_proc_1.vsp
index 9604b74..1b9c313 100644
--- a/binsrc/vsp/admin/admin_link_proc_1.vsp
+++ b/binsrc/vsp/admin/admin_link_proc_1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_link_proc_1.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_link_proc_1.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_link_tables.js b/binsrc/vsp/admin/admin_link_tables.js
index b750fdd..0b5319c 100644
--- a/binsrc/vsp/admin/admin_link_tables.js
+++ b/binsrc/vsp/admin/admin_link_tables.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_link_tables.vsp b/binsrc/vsp/admin/admin_link_tables.vsp
index 8ac59fe..218106a 100644
--- a/binsrc/vsp/admin/admin_link_tables.vsp
+++ b/binsrc/vsp/admin/admin_link_tables.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_link_tables.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_link_tables.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_lt_wiz.vsp b/binsrc/vsp/admin/admin_lt_wiz.vsp
index 136c9c1..97771e9 100644
--- a/binsrc/vsp/admin/admin_lt_wiz.vsp
+++ b/binsrc/vsp/admin/admin_lt_wiz.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_lt_wiz.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_lt_wiz.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_lt_wiz_start.vsp b/binsrc/vsp/admin/admin_lt_wiz_start.vsp
index 441099d..ea4da2b 100644
--- a/binsrc/vsp/admin/admin_lt_wiz_start.vsp
+++ b/binsrc/vsp/admin/admin_lt_wiz_start.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_lt_wiz_start.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_lt_wiz_start.vsp,v 1.3 2006/11/30 13:49:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_main.vsp b/binsrc/vsp/admin/admin_main.vsp
index 6044223..5d1771b 100644
--- a/binsrc/vsp/admin/admin_main.vsp
+++ b/binsrc/vsp/admin/admin_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_main.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_main.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/admin_news.sql b/binsrc/vsp/admin/admin_news/admin_news.sql
index aa88a58..6a1fbe5 100644
--- a/binsrc/vsp/admin/admin_news/admin_news.sql
+++ b/binsrc/vsp/admin/admin_news/admin_news.sql
@@ -1,10 +1,10 @@
--
--- $Id: admin_news.sql,v 1.2.2.2 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_news.sql,v 1.2.2.1 2011/10/13 18:31:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/mime_display.vsp b/binsrc/vsp/admin/admin_news/mime_display.vsp
index 2322920..026a9a8 100644
--- a/binsrc/vsp/admin/admin_news/mime_display.vsp
+++ b/binsrc/vsp/admin/admin_news/mime_display.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mime_display.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: mime_display.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_acl.vsp b/binsrc/vsp/admin/admin_news/news_acl.vsp
index 27eb28f..3c9587e 100644
--- a/binsrc/vsp/admin/admin_news/news_acl.vsp
+++ b/binsrc/vsp/admin/admin_news/news_acl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_acl.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_acl.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_available_processing.vsp b/binsrc/vsp/admin/admin_news/news_available_processing.vsp
index 9ce6bad..8979a6c 100644
--- a/binsrc/vsp/admin/admin_news/news_available_processing.vsp
+++ b/binsrc/vsp/admin/admin_news/news_available_processing.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_available_processing.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_available_processing.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_available_update.vsp b/binsrc/vsp/admin/admin_news/news_available_update.vsp
index 138e741..20476d1 100644
--- a/binsrc/vsp/admin/admin_news/news_available_update.vsp
+++ b/binsrc/vsp/admin/admin_news/news_available_update.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_available_update.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_available_update.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_available_update_frame.vsp b/binsrc/vsp/admin/admin_news/news_available_update_frame.vsp
index 7b073b5..cb03177 100644
--- a/binsrc/vsp/admin/admin_news/news_available_update_frame.vsp
+++ b/binsrc/vsp/admin/admin_news/news_available_update_frame.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_available_update_frame.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_available_update_frame.vsp,v 1.3 2006/11/30 13:49:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_frames.vsp b/binsrc/vsp/admin/admin_news/news_frames.vsp
index ae084d6..53a6b87 100644
--- a/binsrc/vsp/admin/admin_news/news_frames.vsp
+++ b/binsrc/vsp/admin/admin_news/news_frames.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_frames.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_frames.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_group_detail.vsp b/binsrc/vsp/admin/admin_news/news_group_detail.vsp
index 30135ae..ac2e52f 100644
--- a/binsrc/vsp/admin/admin_news/news_group_detail.vsp
+++ b/binsrc/vsp/admin/admin_news/news_group_detail.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_group_detail.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_group_detail.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_read.vsp b/binsrc/vsp/admin/admin_news/news_read.vsp
index 5ff9a3f..fe1d497 100644
--- a/binsrc/vsp/admin/admin_news/news_read.vsp
+++ b/binsrc/vsp/admin/admin_news/news_read.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_read.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_read.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_read_banner.vsp b/binsrc/vsp/admin/admin_news/news_read_banner.vsp
index 356eef0..08499fb 100644
--- a/binsrc/vsp/admin/admin_news/news_read_banner.vsp
+++ b/binsrc/vsp/admin/admin_news/news_read_banner.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_read_banner.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_read_banner.vsp,v 1.3 2006/11/30 13:49:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_search.vsp b/binsrc/vsp/admin/admin_news/news_search.vsp
index 31e43cf..f4aad8b 100644
--- a/binsrc/vsp/admin/admin_news/news_search.vsp
+++ b/binsrc/vsp/admin/admin_news/news_search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_search.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_search.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_search_result.vsp b/binsrc/vsp/admin/admin_news/news_search_result.vsp
index dd791e9..85799cd 100644
--- a/binsrc/vsp/admin/admin_news/news_search_result.vsp
+++ b/binsrc/vsp/admin/admin_news/news_search_result.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_search_result.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_search_result.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_server_config.vsp b/binsrc/vsp/admin/admin_news/news_server_config.vsp
index c9ec21a..238f631 100644
--- a/binsrc/vsp/admin/admin_news/news_server_config.vsp
+++ b/binsrc/vsp/admin/admin_news/news_server_config.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_server_config.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_server_config.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/news_server_list.vsp b/binsrc/vsp/admin/admin_news/news_server_list.vsp
index d90fd71..cbf0a00 100644
--- a/binsrc/vsp/admin/admin_news/news_server_list.vsp
+++ b/binsrc/vsp/admin/admin_news/news_server_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: news_server_list.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: news_server_list.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_news/newsgroups_add.vsp b/binsrc/vsp/admin/admin_news/newsgroups_add.vsp
index ee84fe0..3257e59 100644
--- a/binsrc/vsp/admin/admin_news/newsgroups_add.vsp
+++ b/binsrc/vsp/admin/admin_news/newsgroups_add.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: newsgroups_add.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: newsgroups_add.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_proc_edit.vsp b/binsrc/vsp/admin/admin_proc_edit.vsp
index 273f275..ed8cf60 100644
--- a/binsrc/vsp/admin/admin_proc_edit.vsp
+++ b/binsrc/vsp/admin/admin_proc_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_proc_edit.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_proc_edit.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_proc_view.vsp b/binsrc/vsp/admin/admin_proc_view.vsp
index f0a6227..ae2a5ff 100644
--- a/binsrc/vsp/admin/admin_proc_view.vsp
+++ b/binsrc/vsp/admin/admin_proc_view.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_proc_view.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_proc_view.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_procs.vsp b/binsrc/vsp/admin/admin_procs.vsp
index 281acb6..2fc3f10 100644
--- a/binsrc/vsp/admin/admin_procs.vsp
+++ b/binsrc/vsp/admin/admin_procs.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_procs.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_procs.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_procs_verify.vsp b/binsrc/vsp/admin/admin_procs_verify.vsp
index 2342488..3b18539 100644
--- a/binsrc/vsp/admin/admin_procs_verify.vsp
+++ b/binsrc/vsp/admin/admin_procs_verify.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_procs_verify.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_procs_verify.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp b/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp
index 3a64e15..2cf24ef 100644
--- a/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp
+++ b/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_repl_main.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: admin_repl_main.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/link_tables.js b/binsrc/vsp/admin/admin_repl/link_tables.js
index ae65a4b..a113bee 100644
--- a/binsrc/vsp/admin/admin_repl/link_tables.js
+++ b/binsrc/vsp/admin/admin_repl/link_tables.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp b/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp
index 6b4ba95..a5d6c7c 100644
--- a/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp
+++ b/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: snp_all_shed.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: snp_all_shed.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_bidir.vsp b/binsrc/vsp/admin/admin_repl/snp_bidir.vsp
index 269e6c5..8c11dd5 100644
--- a/binsrc/vsp/admin/admin_repl/snp_bidir.vsp
+++ b/binsrc/vsp/admin/admin_repl/snp_bidir.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: snp_bidir.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: snp_bidir.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp b/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp
index 9afa858..a7a137e 100644
--- a/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp
+++ b/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: snp_bidir_edit.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: snp_bidir_edit.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_bidir_new_subscriber.vsp b/binsrc/vsp/admin/admin_repl/snp_bidir_new_subscriber.vsp
index abb745f..4b54b9c 100644
--- a/binsrc/vsp/admin/admin_repl/snp_bidir_new_subscriber.vsp
+++ b/binsrc/vsp/admin/admin_repl/snp_bidir_new_subscriber.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: snp_bidir_new_subscriber.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: snp_bidir_new_subscriber.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_create.vsp b/binsrc/vsp/admin/admin_repl/snp_create.vsp
index 3461403..ef269cf 100644
--- a/binsrc/vsp/admin/admin_repl/snp_create.vsp
+++ b/binsrc/vsp/admin/admin_repl/snp_create.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: snp_create.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: snp_create.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_main.vsp b/binsrc/vsp/admin/admin_repl/snp_main.vsp
index 0b1c137..a18c847 100644
--- a/binsrc/vsp/admin/admin_repl/snp_main.vsp
+++ b/binsrc/vsp/admin/admin_repl/snp_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: snp_main.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: snp_main.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_sched.vsp b/binsrc/vsp/admin/admin_repl/snp_sched.vsp
index d74e7cf..2ab232c 100644
--- a/binsrc/vsp/admin/admin_repl/snp_sched.vsp
+++ b/binsrc/vsp/admin/admin_repl/snp_sched.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: snp_sched.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: snp_sched.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp b/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp
index 4aae0a5..7a7ec58 100644
--- a/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp
+++ b/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: snp_tbl_list.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: snp_tbl_list.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_start.vsp b/binsrc/vsp/admin/admin_start.vsp
index 2ab60fd..e4d15d9 100644
--- a/binsrc/vsp/admin/admin_start.vsp
+++ b/binsrc/vsp/admin/admin_start.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_start.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_start.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_stat.vsp b/binsrc/vsp/admin/admin_stat.vsp
index 04dac66..0f9e68b 100644
--- a/binsrc/vsp/admin/admin_stat.vsp
+++ b/binsrc/vsp/admin/admin_stat.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_stat.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_stat.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_stat_audit.vsp b/binsrc/vsp/admin/admin_stat_audit.vsp
index d2a111b..46627fc 100644
--- a/binsrc/vsp/admin/admin_stat_audit.vsp
+++ b/binsrc/vsp/admin/admin_stat_audit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_stat_audit.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_stat_audit.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_stat_disk.vsp b/binsrc/vsp/admin/admin_stat_disk.vsp
index f039602..842f30a 100644
--- a/binsrc/vsp/admin/admin_stat_disk.vsp
+++ b/binsrc/vsp/admin/admin_stat_disk.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_stat_disk.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_stat_disk.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_stat_idx.vsp b/binsrc/vsp/admin/admin_stat_idx.vsp
index c742bbb..6c6af6a 100644
--- a/binsrc/vsp/admin/admin_stat_idx.vsp
+++ b/binsrc/vsp/admin/admin_stat_idx.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_stat_idx.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_stat_idx.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_stat_lock.vsp b/binsrc/vsp/admin/admin_stat_lock.vsp
index 25e0f1b..1e74888 100644
--- a/binsrc/vsp/admin/admin_stat_lock.vsp
+++ b/binsrc/vsp/admin/admin_stat_lock.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_stat_lock.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_stat_lock.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_stat_prof.vsp b/binsrc/vsp/admin/admin_stat_prof.vsp
index a33fe22..526ccd3 100644
--- a/binsrc/vsp/admin/admin_stat_prof.vsp
+++ b/binsrc/vsp/admin/admin_stat_prof.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_stat_prof.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_stat_prof.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_stat_space.vsp b/binsrc/vsp/admin/admin_stat_space.vsp
index 3c67481..4d86499 100644
--- a/binsrc/vsp/admin/admin_stat_space.vsp
+++ b/binsrc/vsp/admin/admin_stat_space.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_stat_space.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_stat_space.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_stat_www.vsp b/binsrc/vsp/admin/admin_stat_www.vsp
index e47aef5..6b941de 100644
--- a/binsrc/vsp/admin/admin_stat_www.vsp
+++ b/binsrc/vsp/admin/admin_stat_www.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_stat_www.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_stat_www.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_style.css b/binsrc/vsp/admin/admin_style.css
index ef22774..70fa9a6 100644
--- a/binsrc/vsp/admin/admin_style.css
+++ b/binsrc/vsp/admin/admin_style.css
@@ -1,10 +1,10 @@
/*
- * $Id: admin_style.css,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+ * $Id: admin_style.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_tables.vsp b/binsrc/vsp/admin/admin_tables.vsp
index 8b29b6d..a0ae9bd 100644
--- a/binsrc/vsp/admin/admin_tables.vsp
+++ b/binsrc/vsp/admin/admin_tables.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_tables.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_tables.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_tables_verify.vsp b/binsrc/vsp/admin/admin_tables_verify.vsp
index 787d2b4..e6dfd33 100644
--- a/binsrc/vsp/admin/admin_tables_verify.vsp
+++ b/binsrc/vsp/admin/admin_tables_verify.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_tables_verify.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_tables_verify.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_topleft.html b/binsrc/vsp/admin/admin_topleft.html
index 857e5d4..91c59d0 100644
--- a/binsrc/vsp/admin/admin_topleft.html
+++ b/binsrc/vsp/admin/admin_topleft.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_triggers.vsp b/binsrc/vsp/admin/admin_triggers.vsp
index ded3f94..de3f01d 100644
--- a/binsrc/vsp/admin/admin_triggers.vsp
+++ b/binsrc/vsp/admin/admin_triggers.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_triggers.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_triggers.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_triggers_edit.vsp b/binsrc/vsp/admin/admin_triggers_edit.vsp
index 18a1c89..fe2cf00 100644
--- a/binsrc/vsp/admin/admin_triggers_edit.vsp
+++ b/binsrc/vsp/admin/admin_triggers_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_triggers_edit.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_triggers_edit.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_triggers_verify.vsp b/binsrc/vsp/admin/admin_triggers_verify.vsp
index aa94f1b..77c891a 100644
--- a/binsrc/vsp/admin/admin_triggers_verify.vsp
+++ b/binsrc/vsp/admin/admin_triggers_verify.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_triggers_verify.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_triggers_verify.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp b/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp
index df4ca52..5e5a492 100644
--- a/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sub_error.vsp,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: sub_error.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp
index 87237d5..94ab08b 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_dav.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_dav.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp
index b943253..5016006 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_file.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_file.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_new_dav_col.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_new_dav_col.vsp
index eef29cb..7d11cd0 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_new_dav_col.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_new_dav_col.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_new_dav_col.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_new_dav_col.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr.vsp
index 4d6cba9..77bb70f 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_cr.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_cr.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_edit.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_edit.vsp
index ae0a3d1..e178cad 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_edit.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_cr_edit.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_cr_edit.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_new.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_new.vsp
index 43ec6b4..cc39c1a 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_new.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_new.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_cr_new.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_cr_new.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_add.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_add.vsp
index bd09434..a71587b 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_add.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_add.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_item_add.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_item_add.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_adv.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_adv.vsp
index 3755ae3..db46078 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_adv.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_adv.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_item_adv.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_item_adv.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub.vsp
index 0758f47..5d1b449 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_pub.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_pub.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_items.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_items.vsp
index d383b6f..1340257 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_items.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_items.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_pub_items.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_pub_items.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_new.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_new.vsp
index 1bd6b36..8908190 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_new.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_new.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_pub_new.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_pub_new.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_subscriber_add.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_subscriber_add.vsp
index e018a74..cc149b0 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_subscriber_add.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_subscriber_add.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_repl_subscriber_add.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_repl_subscriber_add.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp
index e31e9ba..93913c0 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_sub.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_sub.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub_copy_stat.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub_copy_stat.vsp
index 375bf31..0f6de03 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_sub_copy_stat.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub_copy_stat.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_sub_copy_stat.vsp,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_sub_copy_stat.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub_edit.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub_edit.vsp
index f3796d3..61c5103 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_sub_edit.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_sub_edit.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_sub_edit.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub_new.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub_new.vsp
index 56e9a40..7b12438 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_sub_new.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub_new.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_sub_new.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_sub_new.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub_replay.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub_replay.vsp
index 8be3928..8176131 100644
--- a/binsrc/vsp/admin/admin_trx_repl/trx_sub_replay.vsp
+++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub_replay.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: trx_sub_replay.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: trx_sub_replay.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_unlink_proc.vsp b/binsrc/vsp/admin/admin_unlink_proc.vsp
index 0c91603..2a7ee31 100644
--- a/binsrc/vsp/admin/admin_unlink_proc.vsp
+++ b/binsrc/vsp/admin/admin_unlink_proc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_unlink_proc.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_unlink_proc.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_user_types.vsp b/binsrc/vsp/admin/admin_user_types.vsp
index 1234684..fd60633 100644
--- a/binsrc/vsp/admin/admin_user_types.vsp
+++ b/binsrc/vsp/admin/admin_user_types.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_user_types.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_user_types.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_user_types_verify.vsp b/binsrc/vsp/admin/admin_user_types_verify.vsp
index 63cc624..33253be 100644
--- a/binsrc/vsp/admin/admin_user_types_verify.vsp
+++ b/binsrc/vsp/admin/admin_user_types_verify.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_user_types_verify.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_user_types_verify.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_users.vsp b/binsrc/vsp/admin/admin_users.vsp
index eeb700c..19f474b 100644
--- a/binsrc/vsp/admin/admin_users.vsp
+++ b/binsrc/vsp/admin/admin_users.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_users.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_users.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_utils.js b/binsrc/vsp/admin/admin_utils.js
index c38e5d1..6e4d458 100644
--- a/binsrc/vsp/admin/admin_utils.js
+++ b/binsrc/vsp/admin/admin_utils.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_views.vsp b/binsrc/vsp/admin/admin_views.vsp
index 5fee92b..95d727a 100644
--- a/binsrc/vsp/admin/admin_views.vsp
+++ b/binsrc/vsp/admin/admin_views.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_views.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_views.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_views_edit.vsp b/binsrc/vsp/admin/admin_views_edit.vsp
index 4b22e4e..70afd5f 100644
--- a/binsrc/vsp/admin/admin_views_edit.vsp
+++ b/binsrc/vsp/admin/admin_views_edit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_views_edit.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_views_edit.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_views_verify.vsp b/binsrc/vsp/admin/admin_views_verify.vsp
index ca0a348..fc70c5d 100644
--- a/binsrc/vsp/admin/admin_views_verify.vsp
+++ b/binsrc/vsp/admin/admin_views_verify.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_views_verify.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_views_verify.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_virtini.vsp b/binsrc/vsp/admin/admin_virtini.vsp
index f7281e7..54fe898 100644
--- a/binsrc/vsp/admin/admin_virtini.vsp
+++ b/binsrc/vsp/admin/admin_virtini.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_virtini.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_virtini.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_xml_documents_main.vsp b/binsrc/vsp/admin/admin_xml_documents_main.vsp
index 06c255f..2cd429a 100644
--- a/binsrc/vsp/admin/admin_xml_documents_main.vsp
+++ b/binsrc/vsp/admin/admin_xml_documents_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_xml_documents_main.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_xml_documents_main.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_xml_documents_view.vsp b/binsrc/vsp/admin/admin_xml_documents_view.vsp
index 7a737e5..bc74f0b 100644
--- a/binsrc/vsp/admin/admin_xml_documents_view.vsp
+++ b/binsrc/vsp/admin/admin_xml_documents_view.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_xml_documents_view.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_xml_documents_view.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_xml_views_main.vsp b/binsrc/vsp/admin/admin_xml_views_main.vsp
index a5611c6..7a15ab8 100644
--- a/binsrc/vsp/admin/admin_xml_views_main.vsp
+++ b/binsrc/vsp/admin/admin_xml_views_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_xml_views_main.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_xml_views_main.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_xquery_main.vsp b/binsrc/vsp/admin/admin_xquery_main.vsp
index 302bd00..0ec420c 100644
--- a/binsrc/vsp/admin/admin_xquery_main.vsp
+++ b/binsrc/vsp/admin/admin_xquery_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_xquery_main.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_xquery_main.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/admin_xquery_test.vsp b/binsrc/vsp/admin/admin_xquery_test.vsp
index f0f112d..331b0cc 100644
--- a/binsrc/vsp/admin/admin_xquery_test.vsp
+++ b/binsrc/vsp/admin/admin_xquery_test.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: admin_xquery_test.vsp,v 1.3.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: admin_xquery_test.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/browse_page.vsp b/binsrc/vsp/admin/dbpump/browse_page.vsp
index 42f50f4..b00028c 100644
--- a/binsrc/vsp/admin/dbpump/browse_page.vsp
+++ b/binsrc/vsp/admin/dbpump/browse_page.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: browse_page.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: browse_page.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/comp_html.sql b/binsrc/vsp/admin/dbpump/comp_html.sql
index 5a638ec..419fe93 100644
--- a/binsrc/vsp/admin/dbpump/comp_html.sql
+++ b/binsrc/vsp/admin/dbpump/comp_html.sql
@@ -1,10 +1,10 @@
--
--- $Id: comp_html.sql,v 1.4.2.4 2012/03/08 12:55:21 source Exp $
+-- $Id: comp_html.sql,v 1.4.2.2 2011/02/03 10:35:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -223,7 +223,7 @@ create procedure "PUMP"."DBA"."HTML_FOOTER_OUT" ( inout arr any )
http ('<TR><TD CLASS="CopyrightBorder" COLSPAN="2"><IMG SRC="/admin/images/1x1.gif" WIDTH="1" HEIGHT="2" ALT=""></TD></TR>');
http ('<TR><TD ALIGN="right" COLSPAN="2"><P CLASS="Copyright">Virtuoso Server ');
http (sys_stat('st_dbms_ver'));
- http (' DBPUMP Interface - Copyright© 1998-2012 OpenLink Software.</P></TD></TR>');
+ http (' DBPUMP Interface - Copyright© 1998-2011 OpenLink Software.</P></TD></TR>');
http ('</TABLE>\n</BODY>');
}
;
diff --git a/binsrc/vsp/admin/dbpump/comp_misc.sql b/binsrc/vsp/admin/dbpump/comp_misc.sql
index a915cbf..4c57fd5 100644
--- a/binsrc/vsp/admin/dbpump/comp_misc.sql
+++ b/binsrc/vsp/admin/dbpump/comp_misc.sql
@@ -1,10 +1,10 @@
--
--- $Id: comp_misc.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: comp_misc.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/comp_rpath.sql b/binsrc/vsp/admin/dbpump/comp_rpath.sql
index 4cc361c..c335855 100644
--- a/binsrc/vsp/admin/dbpump/comp_rpath.sql
+++ b/binsrc/vsp/admin/dbpump/comp_rpath.sql
@@ -1,10 +1,10 @@
--
--- $Id: comp_rpath.sql,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: comp_rpath.sql,v 1.3 2009/02/11 16:36:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/comp_tables.sql b/binsrc/vsp/admin/dbpump/comp_tables.sql
index b50d74d..29f7cf8 100644
--- a/binsrc/vsp/admin/dbpump/comp_tables.sql
+++ b/binsrc/vsp/admin/dbpump/comp_tables.sql
@@ -1,10 +1,10 @@
--
--- $Id: comp_tables.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: comp_tables.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/components.sql b/binsrc/vsp/admin/dbpump/components.sql
index 8dfb9da..cabc1c7 100644
--- a/binsrc/vsp/admin/dbpump/components.sql
+++ b/binsrc/vsp/admin/dbpump/components.sql
@@ -1,10 +1,10 @@
--
--- $Id: components.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: components.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dbdoc.vsp b/binsrc/vsp/admin/dbpump/dbdoc.vsp
index b0e69f3..3f81c2c 100644
--- a/binsrc/vsp/admin/dbpump/dbdoc.vsp
+++ b/binsrc/vsp/admin/dbpump/dbdoc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dbdoc.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dbdoc.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dbhelp.vsp b/binsrc/vsp/admin/dbpump/dbhelp.vsp
index c1d4b7e..761b2bc 100644
--- a/binsrc/vsp/admin/dbpump/dbhelp.vsp
+++ b/binsrc/vsp/admin/dbpump/dbhelp.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dbhelp.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dbhelp.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dbpump.vsp b/binsrc/vsp/admin/dbpump/dbpump.vsp
index 9bd6537..7c16854 100644
--- a/binsrc/vsp/admin/dbpump/dbpump.vsp
+++ b/binsrc/vsp/admin/dbpump/dbpump.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dbpump.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dbpump.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dbpump_root.sql b/binsrc/vsp/admin/dbpump/dbpump_root.sql
index 08e0ae7..cacb9c3 100644
--- a/binsrc/vsp/admin/dbpump/dbpump_root.sql
+++ b/binsrc/vsp/admin/dbpump/dbpump_root.sql
@@ -1,10 +1,10 @@
--
--- $Id: dbpump_root.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dbpump_root.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dbpump_scripts.html b/binsrc/vsp/admin/dbpump/dbpump_scripts.html
index 30c9366..0c010d4 100644
--- a/binsrc/vsp/admin/dbpump/dbpump_scripts.html
+++ b/binsrc/vsp/admin/dbpump/dbpump_scripts.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/debug.vsp b/binsrc/vsp/admin/dbpump/debug.vsp
index 9dfe49f..aa5a2f3 100644
--- a/binsrc/vsp/admin/dbpump/debug.vsp
+++ b/binsrc/vsp/admin/dbpump/debug.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: debug.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: debug.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dump_itself.vsp b/binsrc/vsp/admin/dbpump/dump_itself.vsp
index 4f511dc..f3b4d19 100644
--- a/binsrc/vsp/admin/dbpump/dump_itself.vsp
+++ b/binsrc/vsp/admin/dbpump/dump_itself.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dump_itself.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dump_itself.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dump_options.vsp b/binsrc/vsp/admin/dbpump/dump_options.vsp
index ceb5794..53b06f1 100644
--- a/binsrc/vsp/admin/dbpump/dump_options.vsp
+++ b/binsrc/vsp/admin/dbpump/dump_options.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dump_options.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dump_options.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dump_page.vsp b/binsrc/vsp/admin/dbpump/dump_page.vsp
index 11382bd..1caec61 100644
--- a/binsrc/vsp/admin/dbpump/dump_page.vsp
+++ b/binsrc/vsp/admin/dbpump/dump_page.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dump_page.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dump_page.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dump_schema.vsp b/binsrc/vsp/admin/dbpump/dump_schema.vsp
index 6c9b6c5..60deab1 100644
--- a/binsrc/vsp/admin/dbpump/dump_schema.vsp
+++ b/binsrc/vsp/admin/dbpump/dump_schema.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dump_schema.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dump_schema.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp b/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp
index 6ad0615..b86ece2 100644
--- a/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp
+++ b/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dump_schema_itself.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dump_schema_itself.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dump_tables.vsp b/binsrc/vsp/admin/dbpump/dump_tables.vsp
index a55b113..12400db 100644
--- a/binsrc/vsp/admin/dbpump/dump_tables.vsp
+++ b/binsrc/vsp/admin/dbpump/dump_tables.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dump_tables.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dump_tables.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp b/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp
index 1183c90..4f57d48 100644
--- a/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp
+++ b/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dump_tables_itself.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dump_tables_itself.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/filter_options.vsp b/binsrc/vsp/admin/dbpump/filter_options.vsp
index 997b70e..42878aa 100644
--- a/binsrc/vsp/admin/dbpump/filter_options.vsp
+++ b/binsrc/vsp/admin/dbpump/filter_options.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: filter_options.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: filter_options.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/manifest.vsp b/binsrc/vsp/admin/dbpump/manifest.vsp
index b7e433e..435329b 100644
--- a/binsrc/vsp/admin/dbpump/manifest.vsp
+++ b/binsrc/vsp/admin/dbpump/manifest.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: manifest.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: manifest.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/manifest.xsl b/binsrc/vsp/admin/dbpump/manifest.xsl
index 663a390..c18513e 100644
--- a/binsrc/vsp/admin/dbpump/manifest.xsl
+++ b/binsrc/vsp/admin/dbpump/manifest.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: manifest.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: manifest.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/oper_pars.sql b/binsrc/vsp/admin/dbpump/oper_pars.sql
index 356fb1b..3628b71 100644
--- a/binsrc/vsp/admin/dbpump/oper_pars.sql
+++ b/binsrc/vsp/admin/dbpump/oper_pars.sql
@@ -1,10 +1,10 @@
--
--- $Id: oper_pars.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: oper_pars.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/operpars.awk b/binsrc/vsp/admin/dbpump/operpars.awk
index cb17797..02469e5 100644
--- a/binsrc/vsp/admin/dbpump/operpars.awk
+++ b/binsrc/vsp/admin/dbpump/operpars.awk
@@ -3,7 +3,7 @@ BEGIN {
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/pars_init.sql b/binsrc/vsp/admin/dbpump/pars_init.sql
index 2947e76..db5b255 100644
--- a/binsrc/vsp/admin/dbpump/pars_init.sql
+++ b/binsrc/vsp/admin/dbpump/pars_init.sql
@@ -1,10 +1,10 @@
--
--- $Id: pars_init.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: pars_init.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/parse_oper_pars.sh b/binsrc/vsp/admin/dbpump/parse_oper_pars.sh
index 75f0dec..3c89869 100755
--- a/binsrc/vsp/admin/dbpump/parse_oper_pars.sh
+++ b/binsrc/vsp/admin/dbpump/parse_oper_pars.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: parse_oper_pars.sh,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+# $Id: parse_oper_pars.sh,v 1.2 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/vsp/admin/dbpump/passwd_page.vsp b/binsrc/vsp/admin/dbpump/passwd_page.vsp
index 0076a2d..60d5006 100644
--- a/binsrc/vsp/admin/dbpump/passwd_page.vsp
+++ b/binsrc/vsp/admin/dbpump/passwd_page.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: passwd_page.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: passwd_page.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/restore_itself.vsp b/binsrc/vsp/admin/dbpump/restore_itself.vsp
index 213e870..5e53660 100644
--- a/binsrc/vsp/admin/dbpump/restore_itself.vsp
+++ b/binsrc/vsp/admin/dbpump/restore_itself.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restore_itself.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: restore_itself.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/restore_options.vsp b/binsrc/vsp/admin/dbpump/restore_options.vsp
index 0372c9b..f8712d1 100644
--- a/binsrc/vsp/admin/dbpump/restore_options.vsp
+++ b/binsrc/vsp/admin/dbpump/restore_options.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restore_options.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: restore_options.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/restore_page.vsp b/binsrc/vsp/admin/dbpump/restore_page.vsp
index 538ae1b..a925d05 100644
--- a/binsrc/vsp/admin/dbpump/restore_page.vsp
+++ b/binsrc/vsp/admin/dbpump/restore_page.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restore_page.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: restore_page.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/restore_schema.vsp b/binsrc/vsp/admin/dbpump/restore_schema.vsp
index 911e9f5..49eb9bd 100644
--- a/binsrc/vsp/admin/dbpump/restore_schema.vsp
+++ b/binsrc/vsp/admin/dbpump/restore_schema.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restore_schema.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: restore_schema.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp b/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp
index b40d302..e7b01ac 100644
--- a/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp
+++ b/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restore_schema_itself.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: restore_schema_itself.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/restore_tables.vsp b/binsrc/vsp/admin/dbpump/restore_tables.vsp
index da23de9..90bee0c 100644
--- a/binsrc/vsp/admin/dbpump/restore_tables.vsp
+++ b/binsrc/vsp/admin/dbpump/restore_tables.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restore_tables.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: restore_tables.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp b/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp
index 952dcfe..95fa1c5 100644
--- a/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp
+++ b/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: restore_tables_itself.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: restore_tables_itself.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/root.isql b/binsrc/vsp/admin/dbpump/root.isql
index 8619bc4..cfb53fe 100644
--- a/binsrc/vsp/admin/dbpump/root.isql
+++ b/binsrc/vsp/admin/dbpump/root.isql
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl b/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl
index 701c51c..63ab66c 100644
--- a/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl
+++ b/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: schema_index-info_error.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: schema_index-info_error.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_index_info.vsp b/binsrc/vsp/admin/dbpump/schema_index_info.vsp
index 71debed..469b257 100644
--- a/binsrc/vsp/admin/dbpump/schema_index_info.vsp
+++ b/binsrc/vsp/admin/dbpump/schema_index_info.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: schema_index_info.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: schema_index_info.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_index_info.xsl b/binsrc/vsp/admin/dbpump/schema_index_info.xsl
index 77a49f9..7d2b410 100644
--- a/binsrc/vsp/admin/dbpump/schema_index_info.xsl
+++ b/binsrc/vsp/admin/dbpump/schema_index_info.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: schema_index_info.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: schema_index_info.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_indices.vsp b/binsrc/vsp/admin/dbpump/schema_indices.vsp
index 69c8445..e34dcd8 100644
--- a/binsrc/vsp/admin/dbpump/schema_indices.vsp
+++ b/binsrc/vsp/admin/dbpump/schema_indices.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: schema_indices.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: schema_indices.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_indices.xsl b/binsrc/vsp/admin/dbpump/schema_indices.xsl
index 261e288..8db895d 100644
--- a/binsrc/vsp/admin/dbpump/schema_indices.xsl
+++ b/binsrc/vsp/admin/dbpump/schema_indices.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: schema_indices.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: schema_indices.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_info.vsp b/binsrc/vsp/admin/dbpump/schema_info.vsp
index 778f8b4..1573705 100644
--- a/binsrc/vsp/admin/dbpump/schema_info.vsp
+++ b/binsrc/vsp/admin/dbpump/schema_info.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: schema_info.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: schema_info.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_proc_info.vsp b/binsrc/vsp/admin/dbpump/schema_proc_info.vsp
index 69d9e04..b070ae8 100644
--- a/binsrc/vsp/admin/dbpump/schema_proc_info.vsp
+++ b/binsrc/vsp/admin/dbpump/schema_proc_info.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: schema_proc_info.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: schema_proc_info.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_proc_info.xsl b/binsrc/vsp/admin/dbpump/schema_proc_info.xsl
index 614eba8..74c000d 100644
--- a/binsrc/vsp/admin/dbpump/schema_proc_info.xsl
+++ b/binsrc/vsp/admin/dbpump/schema_proc_info.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: schema_proc_info.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: schema_proc_info.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_procs.vsp b/binsrc/vsp/admin/dbpump/schema_procs.vsp
index 3e2480b..a66e91c 100644
--- a/binsrc/vsp/admin/dbpump/schema_procs.vsp
+++ b/binsrc/vsp/admin/dbpump/schema_procs.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: schema_procs.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: schema_procs.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_procs.xsl b/binsrc/vsp/admin/dbpump/schema_procs.xsl
index 44ca557..9194207 100644
--- a/binsrc/vsp/admin/dbpump/schema_procs.xsl
+++ b/binsrc/vsp/admin/dbpump/schema_procs.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: schema_procs.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: schema_procs.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_table_info.vsp b/binsrc/vsp/admin/dbpump/schema_table_info.vsp
index 2918709..abe477a 100644
--- a/binsrc/vsp/admin/dbpump/schema_table_info.vsp
+++ b/binsrc/vsp/admin/dbpump/schema_table_info.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: schema_table_info.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: schema_table_info.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_table_info.xsl b/binsrc/vsp/admin/dbpump/schema_table_info.xsl
index a2b959f..060bbcd 100644
--- a/binsrc/vsp/admin/dbpump/schema_table_info.xsl
+++ b/binsrc/vsp/admin/dbpump/schema_table_info.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: schema_table_info.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: schema_table_info.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_tables.vsp b/binsrc/vsp/admin/dbpump/schema_tables.vsp
index 5378488..406a8bd 100644
--- a/binsrc/vsp/admin/dbpump/schema_tables.vsp
+++ b/binsrc/vsp/admin/dbpump/schema_tables.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: schema_tables.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: schema_tables.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_tables.xsl b/binsrc/vsp/admin/dbpump/schema_tables.xsl
index 1186081..ba97463 100644
--- a/binsrc/vsp/admin/dbpump/schema_tables.xsl
+++ b/binsrc/vsp/admin/dbpump/schema_tables.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: schema_tables.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: schema_tables.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/schema_tables_select.xsl b/binsrc/vsp/admin/dbpump/schema_tables_select.xsl
index 288c598..2b4defa 100644
--- a/binsrc/vsp/admin/dbpump/schema_tables_select.xsl
+++ b/binsrc/vsp/admin/dbpump/schema_tables_select.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: schema_tables_select.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: schema_tables_select.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/select_datasource.vsp b/binsrc/vsp/admin/dbpump/select_datasource.vsp
index c3b448b..5cafa5a 100644
--- a/binsrc/vsp/admin/dbpump/select_datasource.vsp
+++ b/binsrc/vsp/admin/dbpump/select_datasource.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: select_datasource.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: select_datasource.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/select_options.vsp b/binsrc/vsp/admin/dbpump/select_options.vsp
index 7eb8e08..6fb6f33 100644
--- a/binsrc/vsp/admin/dbpump/select_options.vsp
+++ b/binsrc/vsp/admin/dbpump/select_options.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: select_options.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: select_options.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/dbpump/try_connect.vsp b/binsrc/vsp/admin/dbpump/try_connect.vsp
index ee47bd0..c54aa44 100644
--- a/binsrc/vsp/admin/dbpump/try_connect.vsp
+++ b/binsrc/vsp/admin/dbpump/try_connect.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: try_connect.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: try_connect.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/debug/filter.awk b/binsrc/vsp/admin/debug/filter.awk
index c29bd96..a01f8b9 100644
--- a/binsrc/vsp/admin/debug/filter.awk
+++ b/binsrc/vsp/admin/debug/filter.awk
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/debug/init.sql b/binsrc/vsp/admin/debug/init.sql
index dfb602d..b94bbe0 100644
--- a/binsrc/vsp/admin/debug/init.sql
+++ b/binsrc/vsp/admin/debug/init.sql
@@ -1,10 +1,10 @@
--
--- $Id: init.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: init.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/debug/make_vad.sh b/binsrc/vsp/admin/debug/make_vad.sh
index 835e680..db4a7e2 100755
--- a/binsrc/vsp/admin/debug/make_vad.sh
+++ b/binsrc/vsp/admin/debug/make_vad.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: make_vad.sh,v 1.9.2.4 2012/03/08 12:55:21 source Exp $
+# $Id: make_vad.sh,v 1.9.2.2 2011/02/03 10:35:34 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -188,7 +188,7 @@ sticker_init() {
echo " <name package=\"http_debug\">" >> $STICKER
echo " <prop name=\"Title\" value=\"HTTP Level debug tool\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
- echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+ echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/vsp/admin/debug/record.vspx b/binsrc/vsp/admin/debug/record.vspx
index 813de5f..aa9ba64 100644
--- a/binsrc/vsp/admin/debug/record.vspx
+++ b/binsrc/vsp/admin/debug/record.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: record.vspx,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: record.vspx,v 1.3 2009/01/29 21:56:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/debug/record_login.vspx b/binsrc/vsp/admin/debug/record_login.vspx
index 9b8af37..baf2e9b 100644
--- a/binsrc/vsp/admin/debug/record_login.vspx
+++ b/binsrc/vsp/admin/debug/record_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: record_login.vspx,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: record_login.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/debug/run_tests.sh b/binsrc/vsp/admin/debug/run_tests.sh
index 0e33363..d93e7d4 100755
--- a/binsrc/vsp/admin/debug/run_tests.sh
+++ b/binsrc/vsp/admin/debug/run_tests.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: run_tests.sh,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+# $Id: run_tests.sh,v 1.3 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/vsp/admin/hosted_modules_grants.vsp b/binsrc/vsp/admin/hosted_modules_grants.vsp
index 263907e..f288c72 100644
--- a/binsrc/vsp/admin/hosted_modules_grants.vsp
+++ b/binsrc/vsp/admin/hosted_modules_grants.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: hosted_modules_grants.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: hosted_modules_grants.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/hosted_modules_show_sql.vsp b/binsrc/vsp/admin/hosted_modules_show_sql.vsp
index 969f46a..59e66d7 100644
--- a/binsrc/vsp/admin/hosted_modules_show_sql.vsp
+++ b/binsrc/vsp/admin/hosted_modules_show_sql.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: hosted_modules_show_sql.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: hosted_modules_show_sql.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/index_left.vsp b/binsrc/vsp/admin/index_left.vsp
index 632c251..eec807a 100644
--- a/binsrc/vsp/admin/index_left.vsp
+++ b/binsrc/vsp/admin/index_left.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index_left.vsp,v 1.7.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: index_left.vsp,v 1.7 2008/10/22 20:05:47 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/leftfr.vsp b/binsrc/vsp/admin/leftfr.vsp
index f0959de..40f16f4 100644
--- a/binsrc/vsp/admin/leftfr.vsp
+++ b/binsrc/vsp/admin/leftfr.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: leftfr.vsp,v 1.2.2.1 2012/03/08 12:55:20 source Exp $
+-- $Id: leftfr.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/dbdoc.vsp b/binsrc/vsp/admin/vad/dbdoc.vsp
index 6afaf19..544dcfb 100644
--- a/binsrc/vsp/admin/vad/dbdoc.vsp
+++ b/binsrc/vsp/admin/vad/dbdoc.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dbdoc.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dbdoc.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/dbhelp.vsp b/binsrc/vsp/admin/vad/dbhelp.vsp
index 92efcd8..5010fde 100644
--- a/binsrc/vsp/admin/vad/dbhelp.vsp
+++ b/binsrc/vsp/admin/vad/dbhelp.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dbhelp.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dbhelp.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/regedit.vsp b/binsrc/vsp/admin/vad/regedit.vsp
index 442afd6..8662799 100644
--- a/binsrc/vsp/admin/vad/regedit.vsp
+++ b/binsrc/vsp/admin/vad/regedit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit.vsp,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: regedit.vsp,v 1.3 2006/11/30 13:49:19 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/regedit_data.vsp b/binsrc/vsp/admin/vad/regedit_data.vsp
index f3435b1..e54b9d6 100644
--- a/binsrc/vsp/admin/vad/regedit_data.vsp
+++ b/binsrc/vsp/admin/vad/regedit_data.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_data.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: regedit_data.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/regedit_e1.vsp b/binsrc/vsp/admin/vad/regedit_e1.vsp
index 078cf58..799debd 100644
--- a/binsrc/vsp/admin/vad/regedit_e1.vsp
+++ b/binsrc/vsp/admin/vad/regedit_e1.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_e1.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: regedit_e1.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/regedit_sql.vsp b/binsrc/vsp/admin/vad/regedit_sql.vsp
index 9ef08e7..6d4cf1f 100644
--- a/binsrc/vsp/admin/vad/regedit_sql.vsp
+++ b/binsrc/vsp/admin/vad/regedit_sql.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_sql.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: regedit_sql.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/regedit_sticker.vsp b/binsrc/vsp/admin/vad/regedit_sticker.vsp
index f5bb6e6..430a154 100644
--- a/binsrc/vsp/admin/vad/regedit_sticker.vsp
+++ b/binsrc/vsp/admin/vad/regedit_sticker.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_sticker.vsp,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: regedit_sticker.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/regedit_tree.vsp b/binsrc/vsp/admin/vad/regedit_tree.vsp
index 17c6865..36f509e 100644
--- a/binsrc/vsp/admin/vad/regedit_tree.vsp
+++ b/binsrc/vsp/admin/vad/regedit_tree.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: regedit_tree.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: regedit_tree.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/vad.vsp b/binsrc/vsp/admin/vad/vad.vsp
index 3cad2d0..1a90f14 100644
--- a/binsrc/vsp/admin/vad/vad.vsp
+++ b/binsrc/vsp/admin/vad/vad.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vad.vsp,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: vad.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/vad_configs.vsp b/binsrc/vsp/admin/vad/vad_configs.vsp
index 0ed02b2..3e85caa 100644
--- a/binsrc/vsp/admin/vad/vad_configs.vsp
+++ b/binsrc/vsp/admin/vad/vad_configs.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vad_configs.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: vad_configs.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/vad_davs.vsp b/binsrc/vsp/admin/vad/vad_davs.vsp
index 36e8779..45be7c2 100644
--- a/binsrc/vsp/admin/vad/vad_davs.vsp
+++ b/binsrc/vsp/admin/vad/vad_davs.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vad_davs.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: vad_davs.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/vad_docs.vsp b/binsrc/vsp/admin/vad/vad_docs.vsp
index f13351f..f92b263 100644
--- a/binsrc/vsp/admin/vad/vad_docs.vsp
+++ b/binsrc/vsp/admin/vad/vad_docs.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vad_docs.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: vad_docs.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/vad_packages.vsp b/binsrc/vsp/admin/vad/vad_packages.vsp
index 916e5fb..c064b31 100644
--- a/binsrc/vsp/admin/vad/vad_packages.vsp
+++ b/binsrc/vsp/admin/vad/vad_packages.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vad_packages.vsp,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: vad_packages.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin/vad/vad_vsps.vsp b/binsrc/vsp/admin/vad/vad_vsps.vsp
index a86aa1e..ace46da 100644
--- a/binsrc/vsp/admin/vad/vad_vsps.vsp
+++ b/binsrc/vsp/admin/vad/vad_vsps.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vad_vsps.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: vad_vsps.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/admin_style.html b/binsrc/vsp/admin_style.html
index f183956..ae84a72 100644
--- a/binsrc/vsp/admin_style.html
+++ b/binsrc/vsp/admin_style.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/bugsfixed.html b/binsrc/vsp/bugsfixed.html
index 7b950b4..938374a 100644
--- a/binsrc/vsp/bugsfixed.html
+++ b/binsrc/vsp/bugsfixed.html
@@ -98,6 +98,6 @@
</UL>
<BR />
-<DIV CLASS="vtabfoot"> - Copyright 1998-2012, OpenLink Software - </DIV>
+<DIV CLASS="vtabfoot"> - Copyright 1998-2011, OpenLink Software - </DIV>
</BODY>
</HTML>
diff --git a/binsrc/vsp/default.css b/binsrc/vsp/default.css
index 83c143a..aa16545 100644
--- a/binsrc/vsp/default.css
+++ b/binsrc/vsp/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.3.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: default.css,v 1.3 2006/08/31 11:01:55 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/demo-index.html b/binsrc/vsp/demo-index.html
index ea39d0e..52bc779 100644
--- a/binsrc/vsp/demo-index.html
+++ b/binsrc/vsp/demo-index.html
@@ -185,7 +185,7 @@ Virtuoso data and data stored in 3rd party databases via a single, JDBC connecti
<TR><TD>
<P CLASS="copyright">Virtuoso Universal Server
<!--(<?= sys_stat('st_dbms_ver') ?>)-->
- Administration Interface - Copyright© 1998-2012 OpenLink Software.
+ Administration Interface - Copyright© 1998-2011 OpenLink Software.
</P>
</TD></TR>
</TABLE>
diff --git a/binsrc/vsp/demo-index.vsp b/binsrc/vsp/demo-index.vsp
index 9bb3827..f69210e 100644
--- a/binsrc/vsp/demo-index.vsp
+++ b/binsrc/vsp/demo-index.vsp
@@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<?vsp
--
--- $Id: demo-index.vsp,v 1.3.2.4 2012/03/08 12:55:19 source Exp $
+-- $Id: demo-index.vsp,v 1.3.2.2 2011/02/03 10:35:33 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -206,7 +206,7 @@ direct access to Virtuoso Servers.
</TABLE>
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<TR CLASS="CopyrightBorder"><TD><IMG SRC="/admin/images/1x1.gif" WIDTH="1" HEIGHT="2" ALT=""></TD></TR>
-<TR><TD><P CLASS="copyright">Virtuoso Server <!--(<?= sys_stat('st_dbms_ver') ?>)--> Administration Interface - Copyright© 1998-2012 OpenLink Software. </P></TD></TR>
+<TR><TD><P CLASS="copyright">Virtuoso Server <!--(<?= sys_stat('st_dbms_ver') ?>)--> Administration Interface - Copyright© 1998-2011 OpenLink Software. </P></TD></TR>
</TABLE>
<!--?include admin/admin_footer.vsp ?-->
</html>
diff --git a/binsrc/vsp/doc/adv_search.vspx b/binsrc/vsp/doc/adv_search.vspx
index 9b73d8c..eb38026 100644
--- a/binsrc/vsp/doc/adv_search.vspx
+++ b/binsrc/vsp/doc/adv_search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: adv_search.vspx,v 1.7.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: adv_search.vspx,v 1.7 2009/01/29 21:56:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/doc/docs.vsp b/binsrc/vsp/doc/docs.vsp
index 9714b8e..3962802 100644
--- a/binsrc/vsp/doc/docs.vsp
+++ b/binsrc/vsp/doc/docs.vsp
@@ -1,12 +1,12 @@
<HTML>
<?vsp
--
--- $Id: docs.vsp,v 1.3.2.4 2012/03/08 12:55:21 source Exp $
+-- $Id: docs.vsp,v 1.3.2.2 2011/02/03 10:35:34 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -137,7 +137,7 @@ else
<TABLE BORDER="0" WIDTH="100%">
<TR><TD WIDTH="50"></TD>
<TD WIDTH="80%">
-<DIV CLASS="copyright">Copyright© 1998-2012 OpenLink Software</DIV>
+<DIV CLASS="copyright">Copyright© 1998-2011 OpenLink Software</DIV>
</TD>
<TD WIDTH="50"/>
</TR>
diff --git a/binsrc/vsp/doc/rss2xbel.xsl b/binsrc/vsp/doc/rss2xbel.xsl
index 6ee3ab2..6f64642 100644
--- a/binsrc/vsp/doc/rss2xbel.xsl
+++ b/binsrc/vsp/doc/rss2xbel.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: rss2xbel.xsl,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ - $Id: rss2xbel.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/doc/search.css b/binsrc/vsp/doc/search.css
index d9fe66f..ba8abfb 100644
--- a/binsrc/vsp/doc/search.css
+++ b/binsrc/vsp/doc/search.css
@@ -1,10 +1,10 @@
/*
- * $Id: search.css,v 1.4.2.1 2012/03/08 12:55:21 source Exp $
+ * $Id: search.css,v 1.4 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/doc/search.vsp b/binsrc/vsp/doc/search.vsp
index f844752..5d58d0e 100644
--- a/binsrc/vsp/doc/search.vsp
+++ b/binsrc/vsp/doc/search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: search.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: search.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/doc/translate.vsp b/binsrc/vsp/doc/translate.vsp
index f8e828a..f9ae414 100644
--- a/binsrc/vsp/doc/translate.vsp
+++ b/binsrc/vsp/doc/translate.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: translate.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: translate.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/doc/translation.css b/binsrc/vsp/doc/translation.css
index d89af44..5554b33 100644
--- a/binsrc/vsp/doc/translation.css
+++ b/binsrc/vsp/doc/translation.css
@@ -1,10 +1,10 @@
/*
- * $Id: translation.css,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ * $Id: translation.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/downfr.html b/binsrc/vsp/downfr.html
index c1d9428..7e0ad7d 100644
--- a/binsrc/vsp/downfr.html
+++ b/binsrc/vsp/downfr.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/index.html b/binsrc/vsp/index.html
index 1c23251..6321c23 100644
--- a/binsrc/vsp/index.html
+++ b/binsrc/vsp/index.html
@@ -114,7 +114,7 @@
</td>
</tr>
<tr><td id="copyright_ctr" colspan="2">
- Copyright © 1998-2012 OpenLink Software
+ Copyright © 1998-2011 OpenLink Software
</td>
</tr>
</table>
diff --git a/binsrc/vsp/index1.html b/binsrc/vsp/index1.html
index 9289b2c..0a80ee4 100644
--- a/binsrc/vsp/index1.html
+++ b/binsrc/vsp/index1.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/index_left.vsp b/binsrc/vsp/index_left.vsp
index 508c652..02d0186 100644
--- a/binsrc/vsp/index_left.vsp
+++ b/binsrc/vsp/index_left.vsp
@@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<?vsp
--
--- $Id: index_left.vsp,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+-- $Id: index_left.vsp,v 1.2 2006/08/15 19:30:35 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/install.sh b/binsrc/vsp/install.sh
index c658678..c373dce 100755
--- a/binsrc/vsp/install.sh
+++ b/binsrc/vsp/install.sh
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/knownissues.html b/binsrc/vsp/knownissues.html
index bcfcb6e..80fb323 100644
--- a/binsrc/vsp/knownissues.html
+++ b/binsrc/vsp/knownissues.html
@@ -25,6 +25,6 @@ Virtuoso installation due to Windows interaction bug.</LI>
<LI>Issue 2190: Entity references fail on certain XPath search expressions.</LI>
</UL>
-<DIV CLASS="vtabfoot"> - Copyright 1998-2012, OpenLink Software - </DIV>
+<DIV CLASS="vtabfoot"> - Copyright 1998-2011, OpenLink Software - </DIV>
</BODY>
</HTML>
diff --git a/binsrc/vsp/leftfr.html b/binsrc/vsp/leftfr.html
index 8bd444b..03920da 100644
--- a/binsrc/vsp/leftfr.html
+++ b/binsrc/vsp/leftfr.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mainfr.html b/binsrc/vsp/mainfr.html
index 08841d6..f08c851 100644
--- a/binsrc/vsp/mainfr.html
+++ b/binsrc/vsp/mainfr.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/dav_res.vsp b/binsrc/vsp/mime/dav_res.vsp
index 0b64802..f61048d 100644
--- a/binsrc/vsp/mime/dav_res.vsp
+++ b/binsrc/vsp/mime/dav_res.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_res.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dav_res.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/ftt_mail_hits.vsp b/binsrc/vsp/mime/ftt_mail_hits.vsp
index 4a23073..334c78d 100644
--- a/binsrc/vsp/mime/ftt_mail_hits.vsp
+++ b/binsrc/vsp/mime/ftt_mail_hits.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ftt_mail_hits.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: ftt_mail_hits.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/ftt_mail_query.vsp b/binsrc/vsp/mime/ftt_mail_query.vsp
index 9f704c1..4049017 100644
--- a/binsrc/vsp/mime/ftt_mail_query.vsp
+++ b/binsrc/vsp/mime/ftt_mail_query.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ftt_mail_query.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: ftt_mail_query.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/ftt_news_hits.vsp b/binsrc/vsp/mime/ftt_news_hits.vsp
index aa0adfe..f8917ed 100644
--- a/binsrc/vsp/mime/ftt_news_hits.vsp
+++ b/binsrc/vsp/mime/ftt_news_hits.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ftt_news_hits.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: ftt_news_hits.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/ftt_news_query.vsp b/binsrc/vsp/mime/ftt_news_query.vsp
index 7186993..496d9c4 100644
--- a/binsrc/vsp/mime/ftt_news_query.vsp
+++ b/binsrc/vsp/mime/ftt_news_query.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: ftt_news_query.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: ftt_news_query.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/mail_search.vsp b/binsrc/vsp/mime/mail_search.vsp
index 24e2176..0b8fe7b 100644
--- a/binsrc/vsp/mime/mail_search.vsp
+++ b/binsrc/vsp/mime/mail_search.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mail_search.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: mail_search.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/mime_compose.vsp b/binsrc/vsp/mime/mime_compose.vsp
index afb4b50..b555a78 100644
--- a/binsrc/vsp/mime/mime_compose.vsp
+++ b/binsrc/vsp/mime/mime_compose.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mime_compose.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: mime_compose.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/mime_display.vsp b/binsrc/vsp/mime/mime_display.vsp
index 9868e2f..e1292a4 100644
--- a/binsrc/vsp/mime/mime_display.vsp
+++ b/binsrc/vsp/mime/mime_display.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mime_display.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: mime_display.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/mime_plain.vsp b/binsrc/vsp/mime/mime_plain.vsp
index 7f0be23..8890c2e 100644
--- a/binsrc/vsp/mime/mime_plain.vsp
+++ b/binsrc/vsp/mime/mime_plain.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mime_plain.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: mime_plain.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/mime_spam_filter.vsp b/binsrc/vsp/mime/mime_spam_filter.vsp
index 0498ef5..471c062 100644
--- a/binsrc/vsp/mime/mime_spam_filter.vsp
+++ b/binsrc/vsp/mime/mime_spam_filter.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mime_spam_filter.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: mime_spam_filter.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/mime_spam_filter_setup.vsp b/binsrc/vsp/mime/mime_spam_filter_setup.vsp
index c1074a1..ade42ca 100644
--- a/binsrc/vsp/mime/mime_spam_filter_setup.vsp
+++ b/binsrc/vsp/mime/mime_spam_filter_setup.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: mime_spam_filter_setup.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: mime_spam_filter_setup.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/nntp_help.htm b/binsrc/vsp/mime/nntp_help.htm
index 939785b..ae3a535 100644
--- a/binsrc/vsp/mime/nntp_help.htm
+++ b/binsrc/vsp/mime/nntp_help.htm
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/mime/pop3_get.vsp b/binsrc/vsp/mime/pop3_get.vsp
index 4026c45..c1f6e95 100644
--- a/binsrc/vsp/mime/pop3_get.vsp
+++ b/binsrc/vsp/mime/pop3_get.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: pop3_get.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: pop3_get.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/newfeatures.html b/binsrc/vsp/newfeatures.html
index 931e458..a2f8d3e 100644
--- a/binsrc/vsp/newfeatures.html
+++ b/binsrc/vsp/newfeatures.html
@@ -671,7 +671,7 @@ Virtuoso 4.5 online tutorials</a> </font></td></tr></tbody></table>
Home</a><font color="#000000"> | </font>
<img border="0" src="images/whats_17.gif"><a class="footer" accesskey="9" href="mailto:support at openlinksw.com">Technical
Support</a><font color="#000000"> </font></font></div><div class="bottomCorners">
- <p align="center"><font face="Verdana">Copyright 1998-2012 OpenLink Software. All Rights Reserved.</font></div></div></td>
+ <p align="center"><font face="Verdana">Copyright 1998-2011 OpenLink Software. All Rights Reserved.</font></div></div></td>
<td valign="top" width="6"><div class="contentWrapper_rightnav">
<div class="content_Virtuoso_rightnav_graphic">
<font face="Verdana"> <br>
diff --git a/binsrc/vsp/releasenotes.css b/binsrc/vsp/releasenotes.css
index fb434a3..1bc4a7a 100644
--- a/binsrc/vsp/releasenotes.css
+++ b/binsrc/vsp/releasenotes.css
@@ -1,10 +1,10 @@
/*
- * $Id: releasenotes.css,v 1.2.2.1 2012/03/08 12:55:19 source Exp $
+ * $Id: releasenotes.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/SOAP.html b/binsrc/vsp/soapdemo/SOAP.html
index 737c4bc..61859e4 100644
--- a/binsrc/vsp/soapdemo/SOAP.html
+++ b/binsrc/vsp/soapdemo/SOAP.html
@@ -48,7 +48,7 @@ function clickit()
</TABLE>
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<TR CLASS="copyrightborder"><TD><IMG SRC="images/1x1.gif" WIDTH="1" HEIGHT="2" ALT=""></TD></TR>
-<TR><TD><P CLASS="copyright">Virtuoso SOAP Test Interface - Copyright© 1998-2012 OpenLink Software. </P></TD></TR>
+<TR><TD><P CLASS="copyright">Virtuoso SOAP Test Interface - Copyright© 1998-2011 OpenLink Software. </P></TD></TR>
</TABLE>
<P> <APPLET code="SOAP.class" name="sc"
diff --git a/binsrc/vsp/soapdemo/SOAP.java b/binsrc/vsp/soapdemo/SOAP.java
index dec89f7..7b0ef81 100644
--- a/binsrc/vsp/soapdemo/SOAP.java
+++ b/binsrc/vsp/soapdemo/SOAP.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoDocument.vsp b/binsrc/vsp/soapdemo/echoDocument.vsp
index a3506a3..b7cb4e3 100644
--- a/binsrc/vsp/soapdemo/echoDocument.vsp
+++ b/binsrc/vsp/soapdemo/echoDocument.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoDocument.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoDocument.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoEmployee.vsp b/binsrc/vsp/soapdemo/echoEmployee.vsp
index 042eeba..d6f2d9e 100644
--- a/binsrc/vsp/soapdemo/echoEmployee.vsp
+++ b/binsrc/vsp/soapdemo/echoEmployee.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoEmployee.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoEmployee.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoPerson.vsp b/binsrc/vsp/soapdemo/echoPerson.vsp
index 1dbd2df..9a65346 100644
--- a/binsrc/vsp/soapdemo/echoPerson.vsp
+++ b/binsrc/vsp/soapdemo/echoPerson.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoPerson.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoPerson.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoString.vsp b/binsrc/vsp/soapdemo/echoString.vsp
index 274ec50..1206a91 100644
--- a/binsrc/vsp/soapdemo/echoString.vsp
+++ b/binsrc/vsp/soapdemo/echoString.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoString.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoString.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoStringArray.vsp b/binsrc/vsp/soapdemo/echoStringArray.vsp
index d9cda77..53070bd 100644
--- a/binsrc/vsp/soapdemo/echoStringArray.vsp
+++ b/binsrc/vsp/soapdemo/echoStringArray.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStringArray.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoStringArray.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoStruct.vsp b/binsrc/vsp/soapdemo/echoStruct.vsp
index f481b94..bd94cc9 100644
--- a/binsrc/vsp/soapdemo/echoStruct.vsp
+++ b/binsrc/vsp/soapdemo/echoStruct.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStruct.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoStruct.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoStructArray.vsp b/binsrc/vsp/soapdemo/echoStructArray.vsp
index e6eabb9..0a96e1b 100644
--- a/binsrc/vsp/soapdemo/echoStructArray.vsp
+++ b/binsrc/vsp/soapdemo/echoStructArray.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStructArray.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoStructArray.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoStructLit.vsp b/binsrc/vsp/soapdemo/echoStructLit.vsp
index 408158c..c878b81 100644
--- a/binsrc/vsp/soapdemo/echoStructLit.vsp
+++ b/binsrc/vsp/soapdemo/echoStructLit.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoStructLit.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoStructLit.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/echoVoid.vsp b/binsrc/vsp/soapdemo/echoVoid.vsp
index a752cf2..1e97b99 100644
--- a/binsrc/vsp/soapdemo/echoVoid.vsp
+++ b/binsrc/vsp/soapdemo/echoVoid.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: echoVoid.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: echoVoid.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/extensions.wsdl.vsp b/binsrc/vsp/soapdemo/extensions.wsdl.vsp
index 0ecf688..ae61481 100644
--- a/binsrc/vsp/soapdemo/extensions.wsdl.vsp
+++ b/binsrc/vsp/soapdemo/extensions.wsdl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: extensions.wsdl.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: extensions.wsdl.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/extensions_required.wsdl.vsp b/binsrc/vsp/soapdemo/extensions_required.wsdl.vsp
index 4005a19..3453a42 100644
--- a/binsrc/vsp/soapdemo/extensions_required.wsdl.vsp
+++ b/binsrc/vsp/soapdemo/extensions_required.wsdl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: extensions_required.wsdl.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: extensions_required.wsdl.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/fishselect.java b/binsrc/vsp/soapdemo/fishselect.java
index 046dedf..37ea4df 100644
--- a/binsrc/vsp/soapdemo/fishselect.java
+++ b/binsrc/vsp/soapdemo/fishselect.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/fishselect.sql b/binsrc/vsp/soapdemo/fishselect.sql
index 4f4b86f..c0bc7ac 100644
--- a/binsrc/vsp/soapdemo/fishselect.sql
+++ b/binsrc/vsp/soapdemo/fishselect.sql
@@ -1,10 +1,10 @@
--
--- $Id: fishselect.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: fishselect.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/fishselectResponse.java b/binsrc/vsp/soapdemo/fishselectResponse.java
index 8cc9d79..a026097 100644
--- a/binsrc/vsp/soapdemo/fishselectResponse.java
+++ b/binsrc/vsp/soapdemo/fishselectResponse.java
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop-xsd.sql b/binsrc/vsp/soapdemo/interop-xsd.sql
index 010459b..854778f 100644
--- a/binsrc/vsp/soapdemo/interop-xsd.sql
+++ b/binsrc/vsp/soapdemo/interop-xsd.sql
@@ -1,10 +1,10 @@
--
--- $Id: interop-xsd.sql,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop-xsd.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop.html b/binsrc/vsp/soapdemo/interop.html
index 815494f..bebb03c 100644
--- a/binsrc/vsp/soapdemo/interop.html
+++ b/binsrc/vsp/soapdemo/interop.html
@@ -35,7 +35,7 @@
<TR><TD>
<P CLASS="copyright">Virtuoso Universal Server
<!--(<?= sys_stat('st_dbms_ver') ?>)-->
- Administration Interface - Copyright© 1998-2012 OpenLink Software.
+ Administration Interface - Copyright© 1998-2011 OpenLink Software.
</P>
</TD></TR>
</TABLE>
diff --git a/binsrc/vsp/soapdemo/interop_client.sql b/binsrc/vsp/soapdemo/interop_client.sql
index b778c0b..2038413 100644
--- a/binsrc/vsp/soapdemo/interop_client.sql
+++ b/binsrc/vsp/soapdemo/interop_client.sql
@@ -1,10 +1,10 @@
--
--- $Id: interop_client.sql,v 1.5.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_client.sql,v 1.5 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp b/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp
index 1339f3c..d79a3de 100644
--- a/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp
+++ b/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop_failed_wsdl.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_failed_wsdl.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop_main.vsp b/binsrc/vsp/soapdemo/interop_main.vsp
index d71f415..8bf9618 100644
--- a/binsrc/vsp/soapdemo/interop_main.vsp
+++ b/binsrc/vsp/soapdemo/interop_main.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop_main.vsp,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_main.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop_req_res.vsp b/binsrc/vsp/soapdemo/interop_req_res.vsp
index cac59a4..63b711d 100644
--- a/binsrc/vsp/soapdemo/interop_req_res.vsp
+++ b/binsrc/vsp/soapdemo/interop_req_res.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop_req_res.vsp,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_req_res.vsp,v 1.3 2009/01/29 21:56:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop_results.vsp b/binsrc/vsp/soapdemo/interop_results.vsp
index b708903..7ac20f0 100644
--- a/binsrc/vsp/soapdemo/interop_results.vsp
+++ b/binsrc/vsp/soapdemo/interop_results.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop_results.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_results.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop_results2.vsp b/binsrc/vsp/soapdemo/interop_results2.vsp
index e6f0045..2a629e9 100644
--- a/binsrc/vsp/soapdemo/interop_results2.vsp
+++ b/binsrc/vsp/soapdemo/interop_results2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop_results2.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_results2.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop_services.vsp b/binsrc/vsp/soapdemo/interop_services.vsp
index 5a4a80c..bbae105 100644
--- a/binsrc/vsp/soapdemo/interop_services.vsp
+++ b/binsrc/vsp/soapdemo/interop_services.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop_services.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_services.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop_test.vsp b/binsrc/vsp/soapdemo/interop_test.vsp
index 8ae3bdc..28e053a 100644
--- a/binsrc/vsp/soapdemo/interop_test.vsp
+++ b/binsrc/vsp/soapdemo/interop_test.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop_test.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_test.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/interop_test2.vsp b/binsrc/vsp/soapdemo/interop_test2.vsp
index a70b3fc..f923edc 100644
--- a/binsrc/vsp/soapdemo/interop_test2.vsp
+++ b/binsrc/vsp/soapdemo/interop_test2.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: interop_test2.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: interop_test2.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r3_index.vsp b/binsrc/vsp/soapdemo/r3_index.vsp
index dabfb94..d145009 100644
--- a/binsrc/vsp/soapdemo/r3_index.vsp
+++ b/binsrc/vsp/soapdemo/r3_index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: r3_index.vsp,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: r3_index.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd
index 3477e1e..498089d 100644
--- a/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd
+++ b/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd
index 799b009..15acbb4 100644
--- a/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd
+++ b/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd
index bacdbff..f70177a 100644
--- a/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd
+++ b/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql b/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql
index 5d1acb4..86bb804 100644
--- a/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql
+++ b/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql
@@ -1,10 +1,10 @@
--
--- $Id: complex-doc-literal.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: complex-doc-literal.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql b/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql
index b3e84bb..ce11d6b 100644
--- a/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql
+++ b/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: complex-doc-literal_vad.sql,v 1.1.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: complex-doc-literal_vad.sql,v 1.1 2007/04/02 07:34:41 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql
index 0423530..d3ca367 100644
--- a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql
+++ b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql
@@ -1,10 +1,10 @@
--
--- $Id: complex-rpc-encoded.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: complex-rpc-encoded.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd
index c5af8f5..c5df132 100644
--- a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd
+++ b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql
index f748374..28e990b 100644
--- a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql
+++ b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: complex-rpc-encoded_vad.sql,v 1.1.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: complex-rpc-encoded_vad.sql,v 1.1 2007/04/02 07:34:41 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/dime-doc.sql b/binsrc/vsp/soapdemo/r4/dime-doc.sql
index 1d2b7ae..28787f4 100644
--- a/binsrc/vsp/soapdemo/r4/dime-doc.sql
+++ b/binsrc/vsp/soapdemo/r4/dime-doc.sql
@@ -1,10 +1,10 @@
--
--- $Id: dime-doc.sql,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: dime-doc.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/dime-doc.xsd b/binsrc/vsp/soapdemo/r4/dime-doc.xsd
index 83d3590..05959e1 100644
--- a/binsrc/vsp/soapdemo/r4/dime-doc.xsd
+++ b/binsrc/vsp/soapdemo/r4/dime-doc.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/dime-rpc.sql b/binsrc/vsp/soapdemo/r4/dime-rpc.sql
index e01ac37..33a1658 100644
--- a/binsrc/vsp/soapdemo/r4/dime-rpc.sql
+++ b/binsrc/vsp/soapdemo/r4/dime-rpc.sql
@@ -1,10 +1,10 @@
--
--- $Id: dime-rpc.sql,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: dime-rpc.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/dime-rpc.xsd b/binsrc/vsp/soapdemo/r4/dime-rpc.xsd
index 1efc506..3232d20 100644
--- a/binsrc/vsp/soapdemo/r4/dime-rpc.xsd
+++ b/binsrc/vsp/soapdemo/r4/dime-rpc.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/load_xsd.sql b/binsrc/vsp/soapdemo/r4/load_xsd.sql
index bb16090..1b0f0d9 100644
--- a/binsrc/vsp/soapdemo/r4/load_xsd.sql
+++ b/binsrc/vsp/soapdemo/r4/load_xsd.sql
@@ -1,10 +1,10 @@
--
--- $Id: load_xsd.sql,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: load_xsd.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/mime-doc.sql b/binsrc/vsp/soapdemo/r4/mime-doc.sql
index 885f0e2..fc3f1f8 100644
--- a/binsrc/vsp/soapdemo/r4/mime-doc.sql
+++ b/binsrc/vsp/soapdemo/r4/mime-doc.sql
@@ -1,10 +1,10 @@
--
--- $Id: mime-doc.sql,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: mime-doc.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/mime-rpc.sql b/binsrc/vsp/soapdemo/r4/mime-rpc.sql
index 725dc94..58be13f 100644
--- a/binsrc/vsp/soapdemo/r4/mime-rpc.sql
+++ b/binsrc/vsp/soapdemo/r4/mime-rpc.sql
@@ -1,10 +1,10 @@
--
--- $Id: mime-rpc.sql,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: mime-rpc.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd
index 220945e..2b2a736 100644
--- a/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd
+++ b/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd
index c6b3b6a..c227165 100644
--- a/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd
+++ b/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd
index 56d3cb0..0a5afd5 100644
--- a/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd
+++ b/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd
index 73f6859..fdc4d7d 100644
--- a/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd
+++ b/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd
index 90d1d19..1aae21f 100644
--- a/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd
+++ b/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd
index 8df51ee..0725377 100644
--- a/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd
+++ b/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd
index cf5c02d..12963a3 100644
--- a/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd
+++ b/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql b/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql
index 017f46b..bce739f 100644
--- a/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql
+++ b/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql
@@ -2,7 +2,7 @@
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql
index 9104471..fce6924 100644
--- a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql
+++ b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql
@@ -1,10 +1,10 @@
--
--- $Id: simple-rpc-encoded.sql,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: simple-rpc-encoded.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd
index c14b56e..57b8037 100644
--- a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd
+++ b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/r4/xsd.sql b/binsrc/vsp/soapdemo/r4/xsd.sql
index 21e5ea0..d7184d6 100644
--- a/binsrc/vsp/soapdemo/r4/xsd.sql
+++ b/binsrc/vsp/soapdemo/r4/xsd.sql
@@ -1,10 +1,10 @@
--
--- $Id: xsd.sql,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: xsd.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round2-B.sql b/binsrc/vsp/soapdemo/round2-B.sql
index 64c9c68..b7ccd46 100644
--- a/binsrc/vsp/soapdemo/round2-B.sql
+++ b/binsrc/vsp/soapdemo/round2-B.sql
@@ -1,10 +1,10 @@
--
--- $Id: round2-B.sql,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: round2-B.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round2-base.sql b/binsrc/vsp/soapdemo/round2-base.sql
index 3f43bec..ffa1138 100644
--- a/binsrc/vsp/soapdemo/round2-base.sql
+++ b/binsrc/vsp/soapdemo/round2-base.sql
@@ -1,10 +1,10 @@
--
--- $Id: round2-base.sql,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: round2-base.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round2.sql b/binsrc/vsp/soapdemo/round2.sql
index f071e07..c558fba 100644
--- a/binsrc/vsp/soapdemo/round2.sql
+++ b/binsrc/vsp/soapdemo/round2.sql
@@ -1,10 +1,10 @@
--
--- $Id: round2.sql,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: round2.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round3-D.sql b/binsrc/vsp/soapdemo/round3-D.sql
index b2752e2..2942957 100644
--- a/binsrc/vsp/soapdemo/round3-D.sql
+++ b/binsrc/vsp/soapdemo/round3-D.sql
@@ -1,10 +1,10 @@
--
--- $Id: round3-D.sql,v 1.4.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: round3-D.sql,v 1.4 2007/04/02 07:30:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round3-E.sql b/binsrc/vsp/soapdemo/round3-E.sql
index a58c75f..93f7246 100644
--- a/binsrc/vsp/soapdemo/round3-E.sql
+++ b/binsrc/vsp/soapdemo/round3-E.sql
@@ -1,10 +1,10 @@
--
--- $Id: round3-E.sql,v 1.4.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: round3-E.sql,v 1.4 2007/04/02 07:30:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round3-F.sql b/binsrc/vsp/soapdemo/round3-F.sql
index a7659f5..a7f669b 100644
--- a/binsrc/vsp/soapdemo/round3-F.sql
+++ b/binsrc/vsp/soapdemo/round3-F.sql
@@ -1,10 +1,10 @@
--
--- $Id: round3-F.sql,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: round3-F.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round3-F_vad.sql b/binsrc/vsp/soapdemo/round3-F_vad.sql
index f5ecf79..b8280e6 100644
--- a/binsrc/vsp/soapdemo/round3-F_vad.sql
+++ b/binsrc/vsp/soapdemo/round3-F_vad.sql
@@ -1,10 +1,10 @@
--
--- $Id: round3-F_vad.sql,v 1.1.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: round3-F_vad.sql,v 1.1 2007/04/02 07:34:41 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round3.html b/binsrc/vsp/soapdemo/round3.html
index ebc4428..805cb17 100644
--- a/binsrc/vsp/soapdemo/round3.html
+++ b/binsrc/vsp/soapdemo/round3.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/round4.html b/binsrc/vsp/soapdemo/round4.html
index a5e45a0..ffa3eca 100644
--- a/binsrc/vsp/soapdemo/round4.html
+++ b/binsrc/vsp/soapdemo/round4.html
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/soap.css b/binsrc/vsp/soapdemo/soap.css
index 314a413..7b27576 100644
--- a/binsrc/vsp/soapdemo/soap.css
+++ b/binsrc/vsp/soapdemo/soap.css
@@ -1,10 +1,10 @@
/*
- * $Id: soap.css,v 1.2.2.1 2012/03/08 12:55:21 source Exp $
+ * $Id: soap.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/soap12-addon.sql b/binsrc/vsp/soapdemo/soap12-addon.sql
index 7ff75a2..a4fd732 100644
--- a/binsrc/vsp/soapdemo/soap12-addon.sql
+++ b/binsrc/vsp/soapdemo/soap12-addon.sql
@@ -1,10 +1,10 @@
--
--- $Id: soap12-addon.sql,v 1.3.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: soap12-addon.sql,v 1.3 2007/03/14 14:42:18 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/soapdemo/soap_validator.sql b/binsrc/vsp/soapdemo/soap_validator.sql
index ae76de5..7951f78 100644
--- a/binsrc/vsp/soapdemo/soap_validator.sql
+++ b/binsrc/vsp/soapdemo/soap_validator.sql
@@ -1,10 +1,10 @@
--
--- $Id: soap_validator.sql,v 1.4.2.1 2012/03/08 12:55:21 source Exp $
+-- $Id: soap_validator.sql,v 1.4 2007/04/02 07:30:55 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/vsmx/default.css b/binsrc/vsp/vsmx/default.css
index 77980fc..7a42094 100644
--- a/binsrc/vsp/vsmx/default.css
+++ b/binsrc/vsp/vsmx/default.css
@@ -1,10 +1,10 @@
/*
- * $Id: default.css,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ * $Id: default.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/vsmx/msg.vspx b/binsrc/vsp/vsmx/msg.vspx
index 8f4b646..613dfcf 100644
--- a/binsrc/vsp/vsmx/msg.vspx
+++ b/binsrc/vsp/vsmx/msg.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: msg.vspx,v 1.3.2.4 2012/03/08 12:55:22 source Exp $
+ - $Id: msg.vspx,v 1.3.2.2 2011/02/03 10:35:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -406,7 +406,7 @@
</tr>
</table>
</v:form>
- <div class="foot"><span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2012 OpenLink Software.</span></div>
+ <div class="foot"><span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2011 OpenLink Software.</span></div>
</body>
</html>
</v:page>
diff --git a/binsrc/vsp/vsmx/oper.vspx b/binsrc/vsp/vsmx/oper.vspx
index 15d4da2..dd8aaf5 100644
--- a/binsrc/vsp/vsmx/oper.vspx
+++ b/binsrc/vsp/vsmx/oper.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: oper.vspx,v 1.3.2.4 2012/03/08 12:55:22 source Exp $
+ - $Id: oper.vspx,v 1.3.2.2 2011/02/03 10:35:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -118,7 +118,7 @@
</table>
</v:form>
<div class="foot">
- <span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2012 OpenLink Software.</span>
+ <span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2011 OpenLink Software.</span>
</div>
</body>
</html>
diff --git a/binsrc/vsp/vsmx/vsmx.vspx b/binsrc/vsp/vsmx/vsmx.vspx
index 9d976d3..db3d957 100644
--- a/binsrc/vsp/vsmx/vsmx.vspx
+++ b/binsrc/vsp/vsmx/vsmx.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vsmx.vspx,v 1.4.2.4 2012/03/08 12:55:22 source Exp $
+ - $Id: vsmx.vspx,v 1.4.2.2 2011/02/03 10:35:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -73,7 +73,7 @@
</table>
</v:form>
<div class="foot">
- <span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2012 OpenLink Software.</span>
+ <span class="foot">Virtuoso Universal Server <?V sys_stat('st_dbms_ver')?> - Copyright© 1998-2011 OpenLink Software.</span>
</div>
</body>
</html>
diff --git a/binsrc/vsp/vsmx/vsmx_msg.xsl b/binsrc/vsp/vsmx/vsmx_msg.xsl
index 4b7e7d5..47619a8 100644
--- a/binsrc/vsp/vsmx/vsmx_msg.xsl
+++ b/binsrc/vsp/vsmx/vsmx_msg.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vsmx_msg.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vsmx_msg.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/vsmx/vsmx_oper.xsl b/binsrc/vsp/vsmx/vsmx_oper.xsl
index 02e191d..1b1a2ba 100644
--- a/binsrc/vsp/vsmx/vsmx_oper.xsl
+++ b/binsrc/vsp/vsmx/vsmx_oper.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vsmx_oper.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vsmx_oper.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/vsmx/vsmx_res.xsl b/binsrc/vsp/vsmx/vsmx_res.xsl
index 5e2b377..bf32cb1 100644
--- a/binsrc/vsp/vsmx/vsmx_res.xsl
+++ b/binsrc/vsp/vsmx/vsmx_res.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vsmx_res.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vsmx_res.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vsp/vsp_auth.sql b/binsrc/vsp/vsp_auth.sql
index e5c48ac..2e63b83 100644
--- a/binsrc/vsp/vsp_auth.sql
+++ b/binsrc/vsp/vsp_auth.sql
@@ -2,14 +2,14 @@
--
-- vsp_auth.vsp
--
--- $Id: vsp_auth.sql,v 1.2.2.3 2012/03/08 12:55:19 source Exp $
+-- $Id: vsp_auth.sql,v 1.2.2.2 2011/01/03 23:41:46 source Exp $
--
-- Virtuoso vsp stored procedures for digest and basic authentication
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/Makefile.am b/binsrc/vspx/Makefile.am
index 0991341..5c96b09 100644
--- a/binsrc/vspx/Makefile.am
+++ b/binsrc/vspx/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/Makefile.in b/binsrc/vspx/Makefile.in
index 4b69bef..161074b 100644
--- a/binsrc/vspx/Makefile.in
+++ b/binsrc/vspx/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/vspx/active_ctrls.vspx b/binsrc/vspx/active_ctrls.vspx
index ff655df..06fe0a0 100644
--- a/binsrc/vspx/active_ctrls.vspx
+++ b/binsrc/vspx/active_ctrls.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: active_ctrls.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: active_ctrls.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/box.vspx b/binsrc/vspx/box.vspx
index 0b8a8e6..b3a51a1 100644
--- a/binsrc/vspx/box.vspx
+++ b/binsrc/vspx/box.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: box.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: box.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/admin_dav_browser.sql b/binsrc/vspx/browser/admin_dav_browser.sql
index 824b983..1968f80 100644
--- a/binsrc/vspx/browser/admin_dav_browser.sql
+++ b/binsrc/vspx/browser/admin_dav_browser.sql
@@ -1,10 +1,10 @@
--
--- $Id: admin_dav_browser.sql,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: admin_dav_browser.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser.css b/binsrc/vspx/browser/dav_browser.css
index feb1079..d52ece7 100644
--- a/binsrc/vspx/browser/dav_browser.css
+++ b/binsrc/vspx/browser/dav_browser.css
@@ -1,10 +1,10 @@
/*
- * $Id: dav_browser.css,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ * $Id: dav_browser.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser.js b/binsrc/vspx/browser/dav_browser.js
index 3f5dfc4..0129b6d 100644
--- a/binsrc/vspx/browser/dav_browser.js
+++ b/binsrc/vspx/browser/dav_browser.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser.vsp b/binsrc/vspx/browser/dav_browser.vsp
index 7389097..b14d21a 100644
--- a/binsrc/vspx/browser/dav_browser.vsp
+++ b/binsrc/vspx/browser/dav_browser.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: dav_browser.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser_bot.vsp b/binsrc/vspx/browser/dav_browser_bot.vsp
index 885b30f..fcc9fb3 100644
--- a/binsrc/vspx/browser/dav_browser_bot.vsp
+++ b/binsrc/vspx/browser/dav_browser_bot.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_bot.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: dav_browser_bot.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser_host.vsp b/binsrc/vspx/browser/dav_browser_host.vsp
index e2e45a8..befe81b 100644
--- a/binsrc/vspx/browser/dav_browser_host.vsp
+++ b/binsrc/vspx/browser/dav_browser_host.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_host.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: dav_browser_host.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser_list.vsp b/binsrc/vspx/browser/dav_browser_list.vsp
index 6d28d10..c66d158 100644
--- a/binsrc/vspx/browser/dav_browser_list.vsp
+++ b/binsrc/vspx/browser/dav_browser_list.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_list.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: dav_browser_list.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser_mozilla.js b/binsrc/vspx/browser/dav_browser_mozilla.js
index eae0efd..89d0acb 100644
--- a/binsrc/vspx/browser/dav_browser_mozilla.js
+++ b/binsrc/vspx/browser/dav_browser_mozilla.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser_msie.js b/binsrc/vspx/browser/dav_browser_msie.js
index 55e4c02..4e87043 100644
--- a/binsrc/vspx/browser/dav_browser_msie.js
+++ b/binsrc/vspx/browser/dav_browser_msie.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_browser_top.vsp b/binsrc/vspx/browser/dav_browser_top.vsp
index b8d21f3..ce6789d 100644
--- a/binsrc/vspx/browser/dav_browser_top.vsp
+++ b/binsrc/vspx/browser/dav_browser_top.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_browser_top.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: dav_browser_top.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/dav_js.vsp b/binsrc/vspx/browser/dav_js.vsp
index 713c77d..107ec01 100644
--- a/binsrc/vspx/browser/dav_js.vsp
+++ b/binsrc/vspx/browser/dav_js.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: dav_js.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: dav_js.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/util.js b/binsrc/vspx/browser/util.js
index a775cb0..79be980 100644
--- a/binsrc/vspx/browser/util.js
+++ b/binsrc/vspx/browser/util.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/browser/vsp_debug.vsp b/binsrc/vspx/browser/vsp_debug.vsp
index c009fd3..eda2927 100644
--- a/binsrc/vspx/browser/vsp_debug.vsp
+++ b/binsrc/vspx/browser/vsp_debug.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: vsp_debug.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: vsp_debug.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/cal.vspx b/binsrc/vspx/cal.vspx
index 5996f43..8d095d6 100644
--- a/binsrc/vspx/cal.vspx
+++ b/binsrc/vspx/cal.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: cal.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: cal.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/check_box.vspx b/binsrc/vspx/check_box.vspx
index 2b05228..b8d7663 100644
--- a/binsrc/vspx/check_box.vspx
+++ b/binsrc/vspx/check_box.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: check_box.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: check_box.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/code1.sql b/binsrc/vspx/code1.sql
index 0d24a26..16f18a2 100644
--- a/binsrc/vspx/code1.sql
+++ b/binsrc/vspx/code1.sql
@@ -1,10 +1,10 @@
--
--- $Id: code1.sql,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: code1.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/code_behind.vspx b/binsrc/vspx/code_behind.vspx
index 7e02587..24454aa 100644
--- a/binsrc/vspx/code_behind.vspx
+++ b/binsrc/vspx/code_behind.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: code_behind.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: code_behind.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/combo.vspx b/binsrc/vspx/combo.vspx
index b34927d..b15b87d 100644
--- a/binsrc/vspx/combo.vspx
+++ b/binsrc/vspx/combo.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: combo.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: combo.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/combo1.vspx b/binsrc/vspx/combo1.vspx
index c85d0e5..240d18c 100644
--- a/binsrc/vspx/combo1.vspx
+++ b/binsrc/vspx/combo1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: combo1.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: combo1.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/custinst.vspx b/binsrc/vspx/custinst.vspx
index b9f111f..e110be0 100644
--- a/binsrc/vspx/custinst.vspx
+++ b/binsrc/vspx/custinst.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: custinst.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: custinst.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/custom_condition.vspx b/binsrc/vspx/custom_condition.vspx
index a6fb605..c4b56cf 100644
--- a/binsrc/vspx/custom_condition.vspx
+++ b/binsrc/vspx/custom_condition.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: custom_condition.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: custom_condition.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/custom_format.vspx b/binsrc/vspx/custom_format.vspx
index da38160..0f892a6 100644
--- a/binsrc/vspx/custom_format.vspx
+++ b/binsrc/vspx/custom_format.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: custom_format.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: custom_format.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/data_list.vspx b/binsrc/vspx/data_list.vspx
index 2c7ff5e..6acd9d2 100644
--- a/binsrc/vspx/data_list.vspx
+++ b/binsrc/vspx/data_list.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: data_list.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: data_list.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/data_list_sql.vspx b/binsrc/vspx/data_list_sql.vspx
index ca01adf..7ac2c86 100644
--- a/binsrc/vspx/data_list_sql.vspx
+++ b/binsrc/vspx/data_list_sql.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: data_list_sql.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: data_list_sql.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/data_set.vspx b/binsrc/vspx/data_set.vspx
index ca61a88..80399d0 100644
--- a/binsrc/vspx/data_set.vspx
+++ b/binsrc/vspx/data_set.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_set.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: data_set.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/data_set_arr.vspx b/binsrc/vspx/data_set_arr.vspx
index ddb52db..9a7b4e2 100644
--- a/binsrc/vspx/data_set_arr.vspx
+++ b/binsrc/vspx/data_set_arr.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_set_arr.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: data_set_arr.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/data_set_arr_paging.vspx b/binsrc/vspx/data_set_arr_paging.vspx
index c3f6976..0b46010 100644
--- a/binsrc/vspx/data_set_arr_paging.vspx
+++ b/binsrc/vspx/data_set_arr_paging.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_set_arr_paging.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: data_set_arr_paging.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/datagrid.vspx b/binsrc/vspx/datagrid.vspx
index ad224cb..869cfd4 100644
--- a/binsrc/vspx/datagrid.vspx
+++ b/binsrc/vspx/datagrid.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: datagrid.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: datagrid.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/dataset_new.vspx b/binsrc/vspx/dataset_new.vspx
index c23cf95..33213f5 100644
--- a/binsrc/vspx/dataset_new.vspx
+++ b/binsrc/vspx/dataset_new.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dataset_new.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: dataset_new.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/dataset_new_2.vspx b/binsrc/vspx/dataset_new_2.vspx
index a881a86..e62065e 100644
--- a/binsrc/vspx/dataset_new_2.vspx
+++ b/binsrc/vspx/dataset_new_2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dataset_new_2.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: dataset_new_2.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/dataset_pager.vspx b/binsrc/vspx/dataset_pager.vspx
index 62cdd0f..2b38d64 100644
--- a/binsrc/vspx/dataset_pager.vspx
+++ b/binsrc/vspx/dataset_pager.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dataset_pager.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: dataset_pager.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/dataset_update_1.vspx b/binsrc/vspx/dataset_update_1.vspx
index 648add3..d571a1a 100644
--- a/binsrc/vspx/dataset_update_1.vspx
+++ b/binsrc/vspx/dataset_update_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dataset_update_1.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: dataset_update_1.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/datasource.vspx b/binsrc/vspx/datasource.vspx
index 6b1678d..f65d950 100644
--- a/binsrc/vspx/datasource.vspx
+++ b/binsrc/vspx/datasource.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: datasource.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: datasource.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/date.vspx b/binsrc/vspx/date.vspx
index e9e90d1..ce18802 100644
--- a/binsrc/vspx/date.vspx
+++ b/binsrc/vspx/date.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: date.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: date.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/dav_browser.vspx b/binsrc/vspx/dav_browser.vspx
index c82f41d..ee9eff0 100644
--- a/binsrc/vspx/dav_browser.vspx
+++ b/binsrc/vspx/dav_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dav_browser.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: dav_browser.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/dgarr.vspx b/binsrc/vspx/dgarr.vspx
index a1d12a5..67b5f1a 100644
--- a/binsrc/vspx/dgarr.vspx
+++ b/binsrc/vspx/dgarr.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dgarr.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: dgarr.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/error.vsp b/binsrc/vspx/error.vsp
index 086cb24..03d22fd 100644
--- a/binsrc/vspx/error.vsp
+++ b/binsrc/vspx/error.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: error.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: error.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/errors.vspx b/binsrc/vspx/errors.vspx
index f6908cb..977dd06 100644
--- a/binsrc/vspx/errors.vspx
+++ b/binsrc/vspx/errors.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: errors.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: errors.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/button__0.vspx b/binsrc/vspx/examples/button__0.vspx
index 9a3363a..5c3e76f 100644
--- a/binsrc/vspx/examples/button__0.vspx
+++ b/binsrc/vspx/examples/button__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/button__1.vspx b/binsrc/vspx/examples/button__1.vspx
index b017d92..264d1a5 100644
--- a/binsrc/vspx/examples/button__1.vspx
+++ b/binsrc/vspx/examples/button__1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/button__2.vspx b/binsrc/vspx/examples/button__2.vspx
index b941b1b..df681d3 100644
--- a/binsrc/vspx/examples/button__2.vspx
+++ b/binsrc/vspx/examples/button__2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button__2.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__2.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/button__3.vspx b/binsrc/vspx/examples/button__3.vspx
index 044c412..93eed81 100644
--- a/binsrc/vspx/examples/button__3.vspx
+++ b/binsrc/vspx/examples/button__3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button__3.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__3.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/button__4.vspx b/binsrc/vspx/examples/button__4.vspx
index 5c4a775..251cd13 100644
--- a/binsrc/vspx/examples/button__4.vspx
+++ b/binsrc/vspx/examples/button__4.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: button__4.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__4.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/calendar__0.vspx b/binsrc/vspx/examples/calendar__0.vspx
index 1160e3e..60184f2 100644
--- a/binsrc/vspx/examples/calendar__0.vspx
+++ b/binsrc/vspx/examples/calendar__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: calendar__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: calendar__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/check_box__0.vspx b/binsrc/vspx/examples/check_box__0.vspx
index add59ff..a3d98f9 100644
--- a/binsrc/vspx/examples/check_box__0.vspx
+++ b/binsrc/vspx/examples/check_box__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: check_box__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: check_box__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/code_file__0.sql b/binsrc/vspx/examples/code_file__0.sql
index 5557d3b..477dae0 100644
--- a/binsrc/vspx/examples/code_file__0.sql
+++ b/binsrc/vspx/examples/code_file__0.sql
@@ -1,10 +1,10 @@
--
--- $Id: code_file__0.sql,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: code_file__0.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/code_file__0.vspx b/binsrc/vspx/examples/code_file__0.vspx
index 272b10c..3d71818 100644
--- a/binsrc/vspx/examples/code_file__0.vspx
+++ b/binsrc/vspx/examples/code_file__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: code_file__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: code_file__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/data_grid__0.vspx b/binsrc/vspx/examples/data_grid__0.vspx
index 323ce0c..815001b 100644
--- a/binsrc/vspx/examples/data_grid__0.vspx
+++ b/binsrc/vspx/examples/data_grid__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_grid__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_grid__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/data_list__0.vspx b/binsrc/vspx/examples/data_list__0.vspx
index 21b8ade..15b464f 100644
--- a/binsrc/vspx/examples/data_list__0.vspx
+++ b/binsrc/vspx/examples/data_list__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_list__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_list__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/data_list__1.vspx b/binsrc/vspx/examples/data_list__1.vspx
index 423b12c..1de1bd8 100644
--- a/binsrc/vspx/examples/data_list__1.vspx
+++ b/binsrc/vspx/examples/data_list__1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_list__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_list__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/data_set__0.vspx b/binsrc/vspx/examples/data_set__0.vspx
index f83d121..875ae59 100644
--- a/binsrc/vspx/examples/data_set__0.vspx
+++ b/binsrc/vspx/examples/data_set__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_set__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/data_set__1.vspx b/binsrc/vspx/examples/data_set__1.vspx
index d0e0d79..21c95d6 100644
--- a/binsrc/vspx/examples/data_set__1.vspx
+++ b/binsrc/vspx/examples/data_set__1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_set__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/data_source__0.vspx b/binsrc/vspx/examples/data_source__0.vspx
index 2ef858b..458bc18 100644
--- a/binsrc/vspx/examples/data_source__0.vspx
+++ b/binsrc/vspx/examples/data_source__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: data_source__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_source__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/error_summary__0.vspx b/binsrc/vspx/examples/error_summary__0.vspx
index a72f7aa..654e83f 100644
--- a/binsrc/vspx/examples/error_summary__0.vspx
+++ b/binsrc/vspx/examples/error_summary__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: error_summary__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: error_summary__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/error_summary__1.vspx b/binsrc/vspx/examples/error_summary__1.vspx
index 57c684c..d9d0d18 100644
--- a/binsrc/vspx/examples/error_summary__1.vspx
+++ b/binsrc/vspx/examples/error_summary__1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: error_summary__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: error_summary__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/footer.xml b/binsrc/vspx/examples/footer.xml
index 677d575..a017809 100644
--- a/binsrc/vspx/examples/footer.xml
+++ b/binsrc/vspx/examples/footer.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/form__0.vspx b/binsrc/vspx/examples/form__0.vspx
index 7a0210d..78639fa 100644
--- a/binsrc/vspx/examples/form__0.vspx
+++ b/binsrc/vspx/examples/form__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: form__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/form__1.vspx b/binsrc/vspx/examples/form__1.vspx
index e89f963..c7b5287 100644
--- a/binsrc/vspx/examples/form__1.vspx
+++ b/binsrc/vspx/examples/form__1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: form__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: form__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/include__0.vspx b/binsrc/vspx/examples/include__0.vspx
index 57c67e4..73b5a2c 100644
--- a/binsrc/vspx/examples/include__0.vspx
+++ b/binsrc/vspx/examples/include__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: include__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: include__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/label__0.vspx b/binsrc/vspx/examples/label__0.vspx
index 8eaf289..9d5ac16 100644
--- a/binsrc/vspx/examples/label__0.vspx
+++ b/binsrc/vspx/examples/label__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: label__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: label__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/login__0.vspx b/binsrc/vspx/examples/login__0.vspx
index ddd2722..a93071a 100644
--- a/binsrc/vspx/examples/login__0.vspx
+++ b/binsrc/vspx/examples/login__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: login__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/login_form__0.vspx b/binsrc/vspx/examples/login_form__0.vspx
index f0baaa7..2f5fd5b 100644
--- a/binsrc/vspx/examples/login_form__0.vspx
+++ b/binsrc/vspx/examples/login_form__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login_form__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: login_form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/page__0.vspx b/binsrc/vspx/examples/page__0.vspx
index a1e5b01..85b113c 100644
--- a/binsrc/vspx/examples/page__0.vspx
+++ b/binsrc/vspx/examples/page__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: page__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: page__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/radio_button__0.vspx b/binsrc/vspx/examples/radio_button__0.vspx
index 87a60f9..188b2ea 100644
--- a/binsrc/vspx/examples/radio_button__0.vspx
+++ b/binsrc/vspx/examples/radio_button__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: radio_button__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: radio_button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/radio_group__0.vspx b/binsrc/vspx/examples/radio_group__0.vspx
index eabc5f8..3c4fc8e 100644
--- a/binsrc/vspx/examples/radio_group__0.vspx
+++ b/binsrc/vspx/examples/radio_group__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: radio_group__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: radio_group__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/select_list__0.vspx b/binsrc/vspx/examples/select_list__0.vspx
index 8178a05..ea09e25 100644
--- a/binsrc/vspx/examples/select_list__0.vspx
+++ b/binsrc/vspx/examples/select_list__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: select_list__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: select_list__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/tab__0.vspx b/binsrc/vspx/examples/tab__0.vspx
index c6d4aae..36e553e 100644
--- a/binsrc/vspx/examples/tab__0.vspx
+++ b/binsrc/vspx/examples/tab__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tab__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: tab__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/text__0.vspx b/binsrc/vspx/examples/text__0.vspx
index f4562d9..cb09a92 100644
--- a/binsrc/vspx/examples/text__0.vspx
+++ b/binsrc/vspx/examples/text__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: text__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: text__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/text_area__0.vspx b/binsrc/vspx/examples/text_area__0.vspx
index 327cede..01c28ec 100644
--- a/binsrc/vspx/examples/text_area__0.vspx
+++ b/binsrc/vspx/examples/text_area__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: text_area__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: text_area__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/tree__0.vspx b/binsrc/vspx/examples/tree__0.vspx
index 3299a33..ffd8dbc 100644
--- a/binsrc/vspx/examples/tree__0.vspx
+++ b/binsrc/vspx/examples/tree__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tree__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: tree__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/url__0.vspx b/binsrc/vspx/examples/url__0.vspx
index 0cb2cb7..5baf0de 100644
--- a/binsrc/vspx/examples/url__0.vspx
+++ b/binsrc/vspx/examples/url__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: url__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: url__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/validator__0.vspx b/binsrc/vspx/examples/validator__0.vspx
index 8f7bcc0..eb107e9 100644
--- a/binsrc/vspx/examples/validator__0.vspx
+++ b/binsrc/vspx/examples/validator__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: validator__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: validator__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/variable__0.vspx b/binsrc/vspx/examples/variable__0.vspx
index 13256f1..4961d1b 100644
--- a/binsrc/vspx/examples/variable__0.vspx
+++ b/binsrc/vspx/examples/variable__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: variable__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: variable__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/vscx__0.vspx b/binsrc/vspx/examples/vscx__0.vspx
index 2d35f92..823017e 100644
--- a/binsrc/vspx/examples/vscx__0.vspx
+++ b/binsrc/vspx/examples/vscx__0.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vscx__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: vscx__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/examples/vscx__1.vspx b/binsrc/vspx/examples/vscx__1.vspx
index 2d9bf2b..fb864d8 100644
--- a/binsrc/vspx/examples/vscx__1.vspx
+++ b/binsrc/vspx/examples/vscx__1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vscx__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: vscx__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/file.vspx b/binsrc/vspx/file.vspx
index e5f138c..977736d 100644
--- a/binsrc/vspx/file.vspx
+++ b/binsrc/vspx/file.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: file.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: file.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/file_browser.vspx b/binsrc/vspx/file_browser.vspx
index 0e37250..160182b 100644
--- a/binsrc/vspx/file_browser.vspx
+++ b/binsrc/vspx/file_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: file_browser.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: file_browser.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/footer.xml b/binsrc/vspx/footer.xml
index ebe4529..fce8b73 100644
--- a/binsrc/vspx/footer.xml
+++ b/binsrc/vspx/footer.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/form.vspx b/binsrc/vspx/form.vspx
index 9d82550..22e4fe3 100644
--- a/binsrc/vspx/form.vspx
+++ b/binsrc/vspx/form.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: form.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: form.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/formdecor.vspx b/binsrc/vspx/formdecor.vspx
index 75d0035..df68782 100644
--- a/binsrc/vspx/formdecor.vspx
+++ b/binsrc/vspx/formdecor.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: formdecor.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: formdecor.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/formsty.vspx b/binsrc/vspx/formsty.vspx
index dccf20e..3889ad9 100644
--- a/binsrc/vspx/formsty.vspx
+++ b/binsrc/vspx/formsty.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: formsty.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: formsty.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/formsty.xsl b/binsrc/vspx/formsty.xsl
index ee1d450..0adbcb0 100644
--- a/binsrc/vspx/formsty.xsl
+++ b/binsrc/vspx/formsty.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: formsty.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: formsty.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/golive_data_set_colored.vspx b/binsrc/vspx/golive_data_set_colored.vspx
index 04022dd..7526062 100644
--- a/binsrc/vspx/golive_data_set_colored.vspx
+++ b/binsrc/vspx/golive_data_set_colored.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: golive_data_set_colored.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: golive_data_set_colored.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/grid.vspx b/binsrc/vspx/grid.vspx
index 35a1bae..812827d 100644
--- a/binsrc/vspx/grid.vspx
+++ b/binsrc/vspx/grid.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: grid.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: grid.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/hiding_test.vspx b/binsrc/vspx/hiding_test.vspx
index 177934d..4fd1b80 100644
--- a/binsrc/vspx/hiding_test.vspx
+++ b/binsrc/vspx/hiding_test.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: hiding_test.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: hiding_test.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/htree.vspx b/binsrc/vspx/htree.vspx
index 581e21c..9e62c31 100644
--- a/binsrc/vspx/htree.vspx
+++ b/binsrc/vspx/htree.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: htree.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: htree.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/index.vsp b/binsrc/vspx/index.vsp
index abac866..8448f59 100644
--- a/binsrc/vspx/index.vsp
+++ b/binsrc/vspx/index.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: index.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: index.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/isql_control.vspx b/binsrc/vspx/isql_control.vspx
index 8db5f8c..88db1d3 100644
--- a/binsrc/vspx/isql_control.vspx
+++ b/binsrc/vspx/isql_control.vspx
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: isql_control.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: isql_control.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/label.vspx b/binsrc/vspx/label.vspx
index 1474575..239819b 100644
--- a/binsrc/vspx/label.vspx
+++ b/binsrc/vspx/label.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: label.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: label.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/login.vspx b/binsrc/vspx/login.vspx
index 2c01237..44a5775 100644
--- a/binsrc/vspx/login.vspx
+++ b/binsrc/vspx/login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: login.vspx,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: login.vspx,v 1.3 2007/11/26 15:10:02 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/make_docs.sql b/binsrc/vspx/make_docs.sql
index a5d7bc9..df2a20c 100644
--- a/binsrc/vspx/make_docs.sql
+++ b/binsrc/vspx/make_docs.sql
@@ -1,10 +1,10 @@
--
--- $Id: make_docs.sql,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: make_docs.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/new_post_handler.vspx b/binsrc/vspx/new_post_handler.vspx
index 599964b..58f9000 100644
--- a/binsrc/vspx/new_post_handler.vspx
+++ b/binsrc/vspx/new_post_handler.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: new_post_handler.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: new_post_handler.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/new_tree.vspx b/binsrc/vspx/new_tree.vspx
index ad1488a..c753169 100644
--- a/binsrc/vspx/new_tree.vspx
+++ b/binsrc/vspx/new_tree.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: new_tree.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: new_tree.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/new_version_search.vspx b/binsrc/vspx/new_version_search.vspx
index 2050b07..ff5ffff 100644
--- a/binsrc/vspx/new_version_search.vspx
+++ b/binsrc/vspx/new_version_search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: new_version_search.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: new_version_search.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/products.vspx b/binsrc/vspx/products.vspx
index d817a73..e90da51 100644
--- a/binsrc/vspx/products.vspx
+++ b/binsrc/vspx/products.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: products.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: products.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/radio.vspx b/binsrc/vspx/radio.vspx
index 8ee676e..aef56e4 100644
--- a/binsrc/vspx/radio.vspx
+++ b/binsrc/vspx/radio.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: radio.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: radio.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/radio_group.vspx b/binsrc/vspx/radio_group.vspx
index 9b69b4b..5450a5f 100644
--- a/binsrc/vspx/radio_group.vspx
+++ b/binsrc/vspx/radio_group.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: radio_group.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: radio_group.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/sample.vspx b/binsrc/vspx/sample.vspx
index 39ba1a6..fc735cc 100644
--- a/binsrc/vspx/sample.vspx
+++ b/binsrc/vspx/sample.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sample.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: sample.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/search.vspx b/binsrc/vspx/search.vspx
index 1fbeadc..df3decb 100644
--- a/binsrc/vspx/search.vspx
+++ b/binsrc/vspx/search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: search.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/search_login.vspx b/binsrc/vspx/search_login.vspx
index 2ba036a..12a9731 100644
--- a/binsrc/vspx/search_login.vspx
+++ b/binsrc/vspx/search_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: search_login.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: search_login.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/sel_category.vspx b/binsrc/vspx/sel_category.vspx
index 49d7c20..cc661a9 100644
--- a/binsrc/vspx/sel_category.vspx
+++ b/binsrc/vspx/sel_category.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: sel_category.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: sel_category.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/sel_datagrid.vspx b/binsrc/vspx/sel_datagrid.vspx
index fda4070..84874ff 100644
--- a/binsrc/vspx/sel_datagrid.vspx
+++ b/binsrc/vspx/sel_datagrid.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sel_datagrid.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: sel_datagrid.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/sel_select.vspx b/binsrc/vspx/sel_select.vspx
index d71f84b..d634f21 100644
--- a/binsrc/vspx/sel_select.vspx
+++ b/binsrc/vspx/sel_select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sel_select.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: sel_select.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/select.vspx b/binsrc/vspx/select.vspx
index c6cd683..e5b604d 100644
--- a/binsrc/vspx/select.vspx
+++ b/binsrc/vspx/select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: select.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: select.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/show_params.vspx b/binsrc/vspx/show_params.vspx
index d1dc932..cb5f463 100644
--- a/binsrc/vspx/show_params.vspx
+++ b/binsrc/vspx/show_params.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: show_params.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: show_params.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/suite/filter.awk b/binsrc/vspx/suite/filter.awk
index dcd3b68..8841130 100644
--- a/binsrc/vspx/suite/filter.awk
+++ b/binsrc/vspx/suite/filter.awk
@@ -3,7 +3,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/suite/run_tests.sh b/binsrc/vspx/suite/run_tests.sh
index fc01baa..a7c285e 100755
--- a/binsrc/vspx/suite/run_tests.sh
+++ b/binsrc/vspx/suite/run_tests.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: run_tests.sh,v 1.3.2.1 2012/03/08 12:55:23 source Exp $
+# $Id: run_tests.sh,v 1.3 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/vspx/suite/vspx_suite.sh b/binsrc/vspx/suite/vspx_suite.sh
index 2ece310..6e1c065 100755
--- a/binsrc/vspx/suite/vspx_suite.sh
+++ b/binsrc/vspx/suite/vspx_suite.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: vspx_suite.sh,v 1.4.2.1 2012/03/08 12:55:23 source Exp $
+# $Id: vspx_suite.sh,v 1.4 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/vspx/tab.vspx b/binsrc/vspx/tab.vspx
index 5fd430a..671e4fa 100644
--- a/binsrc/vspx/tab.vspx
+++ b/binsrc/vspx/tab.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tab.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: tab.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/tab_custom.vspx b/binsrc/vspx/tab_custom.vspx
index 8ff112c..79e7966 100644
--- a/binsrc/vspx/tab_custom.vspx
+++ b/binsrc/vspx/tab_custom.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tab_custom.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: tab_custom.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/text.vspx b/binsrc/vspx/text.vspx
index 6280c74..1b67f3a 100644
--- a/binsrc/vspx/text.vspx
+++ b/binsrc/vspx/text.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: text.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: text.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/textarea.vspx b/binsrc/vspx/textarea.vspx
index 9a27918..4c53ad8 100644
--- a/binsrc/vspx/textarea.vspx
+++ b/binsrc/vspx/textarea.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: textarea.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: textarea.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/tree.vspx b/binsrc/vspx/tree.vspx
index d0bf09a..0923d95 100644
--- a/binsrc/vspx/tree.vspx
+++ b/binsrc/vspx/tree.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: tree.vspx,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: tree.vspx,v 1.3 2007/08/03 13:29:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/two_browse_buttons.vspx b/binsrc/vspx/two_browse_buttons.vspx
index 2a1a3b9..9d23f2c 100644
--- a/binsrc/vspx/two_browse_buttons.vspx
+++ b/binsrc/vspx/two_browse_buttons.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: two_browse_buttons.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: two_browse_buttons.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/update_form.vspx b/binsrc/vspx/update_form.vspx
index c4e8ca3..a90007b 100644
--- a/binsrc/vspx/update_form.vspx
+++ b/binsrc/vspx/update_form.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: update_form.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: update_form.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/update_radio.vspx b/binsrc/vspx/update_radio.vspx
index 4691ec1..e0b109a 100644
--- a/binsrc/vspx/update_radio.vspx
+++ b/binsrc/vspx/update_radio.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: update_radio.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: update_radio.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/var.vspx b/binsrc/vspx/var.vspx
index a21289c..aabde00 100644
--- a/binsrc/vspx/var.vspx
+++ b/binsrc/vspx/var.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: var.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: var.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vdir.vspx b/binsrc/vspx/vdir.vspx
index ad49552..a80319c 100644
--- a/binsrc/vspx/vdir.vspx
+++ b/binsrc/vspx/vdir.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdir.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vdir.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vdir_browser.vspx b/binsrc/vspx/vdir_browser.vspx
index fbcf9fb..0d5a313 100644
--- a/binsrc/vspx/vdir_browser.vspx
+++ b/binsrc/vspx/vdir_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdir_browser.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vdir_browser.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vdir_helper.sql b/binsrc/vspx/vdir_helper.sql
index 6c4c892..5c26480 100644
--- a/binsrc/vspx/vdir_helper.sql
+++ b/binsrc/vspx/vdir_helper.sql
@@ -1,10 +1,10 @@
--
--- $Id: vdir_helper.sql,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: vdir_helper.sql,v 1.3 2008/07/11 11:47:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx.sql b/binsrc/vspx/vspx.sql
index 09f189a..08b6335 100644
--- a/binsrc/vspx/vspx.sql
+++ b/binsrc/vspx/vspx.sql
@@ -2,14 +2,14 @@
--
-- vspx.vsp
--
--- $Id: vspx.sql,v 1.12.2.8 2012/03/08 12:55:22 source Exp $
+-- $Id: vspx.sql,v 1.12.2.7 2011/10/13 18:32:24 source Exp $
--
-- Virtuoso VSPX core componets classes
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx.xsd b/binsrc/vspx/vspx.xsd
index adfb8a2..55834a3 100644
--- a/binsrc/vspx/vspx.xsd
+++ b/binsrc/vspx/vspx.xsd
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx.xsl b/binsrc/vspx/vspx.xsl
index c28010f..97ec5b8 100644
--- a/binsrc/vspx/vspx.xsl
+++ b/binsrc/vspx/vspx.xsl
@@ -4,12 +4,12 @@
]>
<!--
-
- - $Id: vspx.xsl,v 1.7.2.2 2012/03/08 12:55:22 source Exp $
+ - $Id: vspx.xsl,v 1.7 2008/03/13 13:52:04 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -3151,7 +3151,7 @@ toggle_label:
while (inx < len) {
declare ctrl vspx_control;
ctrl := node.vc_children[inx];
- if (ctrl is not null and udt_instance_of (ctrl, fix_identifier_case ('vspx_button'))) {
+ if (ctrl and udt_instance_of (ctrl, fix_identifier_case ('vspx_button'))) {
declare btn vspx_button;
btn := node.vc_children[inx];
btn.bt_open_img := sel_img;
diff --git a/binsrc/vspx/vspx4xsd.sh b/binsrc/vspx/vspx4xsd.sh
index 397198d..a374112 100755
--- a/binsrc/vspx/vspx4xsd.sh
+++ b/binsrc/vspx/vspx4xsd.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: vspx4xsd.sh,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+# $Id: vspx4xsd.sh,v 1.3 2009/04/14 12:16:49 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/binsrc/vspx/vspx_add_locations.xsl b/binsrc/vspx/vspx_add_locations.xsl
index 957a94d..a318c0d 100644
--- a/binsrc/vspx/vspx_add_locations.xsl
+++ b/binsrc/vspx/vspx_add_locations.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: vspx_add_locations.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vspx_add_locations.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx_demo_init.sql b/binsrc/vspx/vspx_demo_init.sql
index a5457b9..93ec22d 100644
--- a/binsrc/vspx/vspx_demo_init.sql
+++ b/binsrc/vspx/vspx_demo_init.sql
@@ -1,10 +1,10 @@
--
--- $Id: vspx_demo_init.sql,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: vspx_demo_init.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx_expand.xsl b/binsrc/vspx/vspx_expand.xsl
index eebfffd..934c16b 100644
--- a/binsrc/vspx/vspx_expand.xsl
+++ b/binsrc/vspx/vspx_expand.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: vspx_expand.xsl,v 1.3.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vspx_expand.xsl,v 1.3 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx_log_format.xsl b/binsrc/vspx/vspx_log_format.xsl
index 3b35447..ad493ad 100644
--- a/binsrc/vspx/vspx_log_format.xsl
+++ b/binsrc/vspx/vspx_log_format.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: vspx_log_format.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vspx_log_format.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx_pre_sql.xsl b/binsrc/vspx/vspx_pre_sql.xsl
index 120d839..312969f 100644
--- a/binsrc/vspx/vspx_pre_sql.xsl
+++ b/binsrc/vspx/vspx_pre_sql.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: vspx_pre_sql.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vspx_pre_sql.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx_pre_xsd.xsl b/binsrc/vspx/vspx_pre_xsd.xsl
index 3340dc6..b179ab7 100644
--- a/binsrc/vspx/vspx_pre_xsd.xsl
+++ b/binsrc/vspx/vspx_pre_xsd.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: vspx_pre_xsd.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vspx_pre_xsd.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx_reload.sql b/binsrc/vspx/vspx_reload.sql
index b6e1b12..27fdfca 100644
--- a/binsrc/vspx/vspx_reload.sql
+++ b/binsrc/vspx/vspx_reload.sql
@@ -1,10 +1,10 @@
--
--- $Id: vspx_reload.sql,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: vspx_reload.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx_vhost.sql b/binsrc/vspx/vspx_vhost.sql
index 24f886f..1999e39 100644
--- a/binsrc/vspx/vspx_vhost.sql
+++ b/binsrc/vspx/vspx_vhost.sql
@@ -1,10 +1,10 @@
--
--- $Id: vspx_vhost.sql,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: vspx_vhost.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspx_wizards.sql b/binsrc/vspx/vspx_wizards.sql
index dfe5e25..7367e7c 100644
--- a/binsrc/vspx/vspx_wizards.sql
+++ b/binsrc/vspx/vspx_wizards.sql
@@ -1,10 +1,10 @@
--
--- $Id: vspx_wizards.sql,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: vspx_wizards.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspxmeta.xml b/binsrc/vspx/vspxmeta.xml
index daec316..9f25193 100644
--- a/binsrc/vspx/vspxmeta.xml
+++ b/binsrc/vspx/vspxmeta.xml
@@ -671,12 +671,12 @@ as ( vc_stub any ) temporary self as ref
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: button__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -722,12 +722,12 @@ placed into the resulting HTML with no changes.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: button__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -778,12 +778,12 @@ The form accepts two numbers and calculates their sum.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: button__2.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__2.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -835,12 +835,12 @@ The form allows to select a file from server's file system
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: button__3.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__3.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -888,12 +888,12 @@ The form allows to select a two values from a different page
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: button__4.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__4.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -943,12 +943,12 @@ The form returns back to caller form two walues from a text box and select list
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: calendar__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: calendar__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1036,12 +1036,12 @@ This demo will show a calendar allowing to list dates by months
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: check_box__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: check_box__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1086,12 +1086,12 @@ Depending on the state of the checkbox, the submitted value is either 'checked'
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: code_file__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: code_file__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1161,12 +1161,12 @@ create method button_change (inout control vspx_button) for my_page_subclass
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_grid__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_grid__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1266,12 +1266,12 @@ Allows editing, addtion and removal of existing records.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_list__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_list__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1313,12 +1313,12 @@ with a option values their customer IDs.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_list__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_list__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1360,12 +1360,12 @@ with a option values their customer IDs.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_set__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_set__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1466,12 +1466,12 @@ Allows editing, addtion and removal of existing records.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_set__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_set__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1537,12 +1537,12 @@ Allows scrolling only of existing records.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: data_source__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_source__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1606,12 +1606,12 @@ Allows to show different columns : name and phone.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: error_summary__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: error_summary__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1666,12 +1666,12 @@ in the place specified by v:error-summary element.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: error_summary__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: error_summary__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1727,12 +1727,12 @@ in the place specified by v:error-summary element depending of a match attribute
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: form__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1779,12 +1779,12 @@ The OK button of the form submits data from the form back to the same page.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: form__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: form__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1847,12 +1847,12 @@ the check-box is validated against ragio group
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: include__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: include__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1897,12 +1897,12 @@ then the resulting page will have additional paragraph at the end.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: label__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: label__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1944,12 +1944,12 @@ This page demonstrates output of data values of various types.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: login__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: login__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2003,12 +2003,12 @@ a simple post counter.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: login_form__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: login_form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2055,12 +2055,12 @@ This example will render just a login form
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: page__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: page__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2100,12 +2100,12 @@ It does not even print traditional 'Hello world' phrase.</p>
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: radio_button__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: radio_button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2166,12 +2166,12 @@ The form contains two groups of radio buttons, three button in each group.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: radio_group__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: radio_group__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2215,12 +2215,12 @@ The form contains a groups of radio buttons, grouped with radio-group control.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: select_list__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: select_list__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2269,12 +2269,12 @@ The form of the sample page contains a list of three items.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: tab__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: tab__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2318,12 +2318,12 @@ The sample page contains three templates; only one of three is shown and user ca
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: text__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: text__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2368,12 +2368,12 @@ The form contains text input control with 'Hello' string inside. User can edit t
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: text_area__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: text_area__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2420,12 +2420,12 @@ data are posted back to the same URI so the page is instantiated again.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: tree__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: tree__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2479,12 +2479,12 @@ data are posted back to the same URI so the page is instantiated again.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: url__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: url__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2524,12 +2524,12 @@ This draws an anchor in browser screen.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: validator__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: validator__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2580,12 +2580,12 @@ by adding 'error-glyph' attribute to the v:textarea.)
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: variable__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: variable__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2631,12 +2631,12 @@ The v:variable element defines a new member of page class and hance we can acces
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: vscx__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: vscx__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2692,12 +2692,12 @@ as a child of outer page.
<![CDATA[<?xml version="1.0"?>
<!--
-
- - $Id: vscx__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: vscx__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2752,7 +2752,7 @@ This page is used inside vscx__0.vspx one as a custom control.
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/vspxmeta2doc.xsl b/binsrc/vspx/vspxmeta2doc.xsl
index ab0053a..81d74d5 100644
--- a/binsrc/vspx/vspxmeta2doc.xsl
+++ b/binsrc/vspx/vspxmeta2doc.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- - $Id: vspxmeta2doc.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: vspxmeta2doc.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/xb_checkbox.vspx b/binsrc/vspx/xb_checkbox.vspx
index f8a3ad2..08f0839 100644
--- a/binsrc/vspx/xb_checkbox.vspx
+++ b/binsrc/vspx/xb_checkbox.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xb_checkbox.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: xb_checkbox.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/xb_orderby.vspx b/binsrc/vspx/xb_orderby.vspx
index fe131c8..c47850f 100644
--- a/binsrc/vspx/xb_orderby.vspx
+++ b/binsrc/vspx/xb_orderby.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xb_orderby.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: xb_orderby.vspx,v 1.2 2006/08/16 00:04:14 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/xb_orderby_e.vspx b/binsrc/vspx/xb_orderby_e.vspx
index fbed460..adee034 100644
--- a/binsrc/vspx/xb_orderby_e.vspx
+++ b/binsrc/vspx/xb_orderby_e.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xb_orderby_e.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: xb_orderby_e.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/xform.vspx b/binsrc/vspx/xform.vspx
index a393adc..0f10558 100644
--- a/binsrc/vspx/xform.vspx
+++ b/binsrc/vspx/xform.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xform.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: xform.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/xmldataset.vspx b/binsrc/vspx/xmldataset.vspx
index 24c9e11..1e4f6c5 100644
--- a/binsrc/vspx/xmldataset.vspx
+++ b/binsrc/vspx/xmldataset.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xmldataset.vspx,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: xmldataset.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/xsd2doc.xsl b/binsrc/vspx/xsd2doc.xsl
index 28938d6..81996c1 100644
--- a/binsrc/vspx/xsd2doc.xsl
+++ b/binsrc/vspx/xsd2doc.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: xsd2doc.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: xsd2doc.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/xsd2vspx.vsp b/binsrc/vspx/xsd2vspx.vsp
index 7d94e39..adb2776 100644
--- a/binsrc/vspx/xsd2vspx.vsp
+++ b/binsrc/vspx/xsd2vspx.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xsd2vspx.vsp,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+-- $Id: xsd2vspx.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/vspx/xsd2vspx.xsl b/binsrc/vspx/xsd2vspx.xsl
index 7bde343..8d09439 100644
--- a/binsrc/vspx/xsd2vspx.xsl
+++ b/binsrc/vspx/xsd2vspx.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xsd2vspx.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $
+ - $Id: xsd2vspx.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/Makefile.am b/binsrc/ws/Makefile.am
index acab47c..ab0d0ac 100644
--- a/binsrc/ws/Makefile.am
+++ b/binsrc/ws/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/Makefile.in b/binsrc/ws/Makefile.in
index 338d2fc..1f7cf6d 100644
--- a/binsrc/ws/Makefile.in
+++ b/binsrc/ws/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -139,7 +139,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -188,7 +187,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -240,7 +238,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -287,6 +284,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/ws/wsrm/Makefile.am b/binsrc/ws/wsrm/Makefile.am
index 99114f1..2170a17 100644
--- a/binsrc/ws/wsrm/Makefile.am
+++ b/binsrc/ws/wsrm/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/Makefile.in b/binsrc/ws/wsrm/Makefile.in
index 4318f31..b40d097 100644
--- a/binsrc/ws/wsrm/Makefile.in
+++ b/binsrc/ws/wsrm/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/ws/wsrm/orabpel.xsd b/binsrc/ws/wsrm/orabpel.xsd
index 95cd857..4bada7c 100644
--- a/binsrc/ws/wsrm/orabpel.xsd
+++ b/binsrc/ws/wsrm/orabpel.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/utility.xsd b/binsrc/ws/wsrm/utility.xsd
index 3f5c029..2116af0 100644
--- a/binsrc/ws/wsrm/utility.xsd
+++ b/binsrc/ws/wsrm/utility.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/utility200306.xsd b/binsrc/ws/wsrm/utility200306.xsd
index d924107..49d8b90 100644
--- a/binsrc/ws/wsrm/utility200306.xsd
+++ b/binsrc/ws/wsrm/utility200306.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wsa.xsd b/binsrc/ws/wsrm/wsa.xsd
index 0f31936..d27e1eb 100644
--- a/binsrc/ws/wsrm/wsa.xsd
+++ b/binsrc/ws/wsrm/wsa.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wsa200403.xsd b/binsrc/ws/wsrm/wsa200403.xsd
index 054d4e0..88e49c2 100644
--- a/binsrc/ws/wsrm/wsa200403.xsd
+++ b/binsrc/ws/wsrm/wsa200403.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wsp.xsd b/binsrc/ws/wsrm/wsp.xsd
index 3f16d69..f6d3c08 100644
--- a/binsrc/ws/wsrm/wsp.xsd
+++ b/binsrc/ws/wsrm/wsp.xsd
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wsrm.xsd b/binsrc/ws/wsrm/wsrm.xsd
index e5e156f..2506fb8 100644
--- a/binsrc/ws/wsrm/wsrm.xsd
+++ b/binsrc/ws/wsrm/wsrm.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wsrm_ddl.sql b/binsrc/ws/wsrm/wsrm_ddl.sql
index 265b53b..58cafd1 100644
--- a/binsrc/ws/wsrm/wsrm_ddl.sql
+++ b/binsrc/ws/wsrm/wsrm_ddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsrm_ddl.sql,v 1.4.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: wsrm_ddl.sql,v 1.4 2008/04/15 10:57:01 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wsrmcall.xsl b/binsrc/ws/wsrm/wsrmcall.xsl
index dfc5312..1ea9152 100644
--- a/binsrc/ws/wsrm/wsrmcall.xsl
+++ b/binsrc/ws/wsrm/wsrmcall.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wsrmcall.xsl,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: wsrmcall.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wsrmcli.sql b/binsrc/ws/wsrm/wsrmcli.sql
index fa25c91..558ba66 100644
--- a/binsrc/ws/wsrm/wsrmcli.sql
+++ b/binsrc/ws/wsrm/wsrmcli.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsrmcli.sql,v 1.4.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: wsrmcli.sql,v 1.4 2008/04/18 14:03:30 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wsrmsrv.sql b/binsrc/ws/wsrm/wsrmsrv.sql
index 1adbc06..49d6e16 100644
--- a/binsrc/ws/wsrm/wsrmsrv.sql
+++ b/binsrc/ws/wsrm/wsrmsrv.sql
@@ -1,10 +1,10 @@
--
--- $Id: wsrmsrv.sql,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: wsrmsrv.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wss.xsd b/binsrc/ws/wsrm/wss.xsd
index b00255c..f93e688 100644
--- a/binsrc/ws/wsrm/wss.xsd
+++ b/binsrc/ws/wsrm/wss.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/wss0212.xsd b/binsrc/ws/wsrm/wss0212.xsd
index 91ec29a..76d4f55 100644
--- a/binsrc/ws/wsrm/wss0212.xsd
+++ b/binsrc/ws/wsrm/wss0212.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk
index 4bba030..074a30d 100644
--- a/binsrc/ws/wsrm/xsd2sql.awk
+++ b/binsrc/ws/wsrm/xsd2sql.awk
@@ -3,7 +3,7 @@ BEGIN {
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -54,7 +54,7 @@ BEGIN {
print " ses := string_output ();"
}
str = $0
- gsub ( "\\\\", "&&", str)
+ gsub ( /\\/, "\\\\", str)
gsub ( /'/, "\\'", str)
#
diff --git a/binsrc/ws/wstr/wstr_ddl.sql b/binsrc/ws/wstr/wstr_ddl.sql
index 5169c5a..f0e57d0 100644
--- a/binsrc/ws/wstr/wstr_ddl.sql
+++ b/binsrc/ws/wstr/wstr_ddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: wstr_ddl.sql,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: wstr_ddl.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wstr/wstrcli.sql b/binsrc/ws/wstr/wstrcli.sql
index 055f2ed..5918c7c 100644
--- a/binsrc/ws/wstr/wstrcli.sql
+++ b/binsrc/ws/wstr/wstrcli.sql
@@ -1,10 +1,10 @@
--
--- $Id: wstrcli.sql,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: wstrcli.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/ws/wstr/wstrsrv.sql b/binsrc/ws/wstr/wstrsrv.sql
index 5596474..e2a4823 100644
--- a/binsrc/ws/wstr/wstrsrv.sql
+++ b/binsrc/ws/wstr/wstrsrv.sql
@@ -1,10 +1,10 @@
--
--- $Id: wstrsrv.sql,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: wstrsrv.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/Makefile.am b/binsrc/xddl/Makefile.am
index ee24268..5226eb7 100644
--- a/binsrc/xddl/Makefile.am
+++ b/binsrc/xddl/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/Makefile.in b/binsrc/xddl/Makefile.in
index 4bb184e..a229253 100644
--- a/binsrc/xddl/Makefile.in
+++ b/binsrc/xddl/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/xddl/demo.xml b/binsrc/xddl/demo.xml
index 50b85f0..a2fae2b 100644
--- a/binsrc/xddl/demo.xml
+++ b/binsrc/xddl/demo.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/fragment.xml b/binsrc/xddl/fragment.xml
index c38fffa..2976a83 100644
--- a/binsrc/xddl/fragment.xml
+++ b/binsrc/xddl/fragment.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/test.vsp b/binsrc/xddl/test.vsp
index 889a90e..f12d3a6 100644
--- a/binsrc/xddl/test.vsp
+++ b/binsrc/xddl/test.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: test.vsp,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: test.vsp,v 1.2 2006/08/15 19:30:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl.sql b/binsrc/xddl/xddl.sql
index 515b049..976e53a 100644
--- a/binsrc/xddl/xddl.sql
+++ b/binsrc/xddl/xddl.sql
@@ -1,10 +1,10 @@
--
--- $Id: xddl.sql,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: xddl.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl.xsd b/binsrc/xddl/xddl.xsd
index 32d6d3e..1205a36 100644
--- a/binsrc/xddl/xddl.xsd
+++ b/binsrc/xddl/xddl.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl_dav.sql b/binsrc/xddl/xddl_dav.sql
index d2ad970..85cc09f 100644
--- a/binsrc/xddl/xddl_dav.sql
+++ b/binsrc/xddl/xddl_dav.sql
@@ -1,10 +1,10 @@
--
--- $Id: xddl_dav.sql,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: xddl_dav.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl_diff.xsl b/binsrc/xddl/xddl_diff.xsl
index 8920777..292ae84 100644
--- a/binsrc/xddl/xddl_diff.xsl
+++ b/binsrc/xddl/xddl_diff.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xddl_diff.xsl,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: xddl_diff.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl_exec.xsl b/binsrc/xddl/xddl_exec.xsl
index 4205799..abf7036 100644
--- a/binsrc/xddl/xddl_exec.xsl
+++ b/binsrc/xddl/xddl_exec.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xddl_exec.xsl,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: xddl_exec.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl_filesystem.sql b/binsrc/xddl/xddl_filesystem.sql
index 60ad3c9..454db00 100644
--- a/binsrc/xddl/xddl_filesystem.sql
+++ b/binsrc/xddl/xddl_filesystem.sql
@@ -1,10 +1,10 @@
--
--- $Id: xddl_filesystem.sql,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+-- $Id: xddl_filesystem.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl_procs.xsd b/binsrc/xddl/xddl_procs.xsd
index 2a14a9b..52dfdcb 100644
--- a/binsrc/xddl/xddl_procs.xsd
+++ b/binsrc/xddl/xddl_procs.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl_tables.xsd b/binsrc/xddl/xddl_tables.xsd
index 1892c76..d84a506 100644
--- a/binsrc/xddl/xddl_tables.xsd
+++ b/binsrc/xddl/xddl_tables.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/xddl/xddl_views.xsd b/binsrc/xddl/xddl_views.xsd
index aa24b72..0bd030e 100644
--- a/binsrc/xddl/xddl_views.xsd
+++ b/binsrc/xddl/xddl_views.xsd
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/Makefile.am b/binsrc/yacutia/Makefile.am
index 4e76478..6dba70c 100644
--- a/binsrc/yacutia/Makefile.am
+++ b/binsrc/yacutia/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/Makefile.in b/binsrc/yacutia/Makefile.in
index 6a9f657..065c3a0 100644
--- a/binsrc/yacutia/Makefile.in
+++ b/binsrc/yacutia/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -126,7 +126,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -175,7 +174,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -227,7 +225,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -274,6 +271,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/binsrc/yacutia/account_create.vspx b/binsrc/yacutia/account_create.vspx
index 0faddbd..c586a7f 100644
--- a/binsrc/yacutia/account_create.vspx
+++ b/binsrc/yacutia/account_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: account_create.vspx,v 1.8.2.11 2012/03/08 12:55:23 source Exp $
+ - $Id: account_create.vspx,v 1.8.2.9 2011/05/20 11:49:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -68,11 +68,6 @@
</h1>
</vm:rawheader>
<vm:pagebody>
- <v:on-init>
- <![CDATA[
- set http_charset='utf-8';
- ]]>
- </v:on-init>
<vm:help id="account_create" sect=""/>
<script tyep="text/javascript"><![CDATA[
function onExitUserName()
@@ -284,8 +279,7 @@
<table class="tab_page">
<tr>
<td valign="top">
- <v:form name="account_form" type="simple" method="POST" action=""
- xhtml_enctype="multipart/form-data" xhtml_accept-charset="UTF-8">
+ <v:form name="account_form" type="simple" method="POST" action="" xhtml_enctype="multipart/form-data">
<table class="main_page_area" style="valign: top">
<tr valign="top">
<td>
@@ -832,7 +826,7 @@
<v:script>
<![CDATA[
declare i, cnt, exist, u_ident, g_name integer;
- declare tmp, val, user_name, user_pwd, user_pwd2, e_mail, os_name, os_password, user_perm, user_home varchar;
+ declare tmp, val, user_name, user_pwd, e_mail, os_name, os_password, user_perm, user_home varchar;
declare attr any;
declare st, msg varchar;
declare webid varchar;
@@ -852,14 +846,13 @@
attr := vector();
user_name:= self.t_login_name.ufl_value;
- user_pwd := charset_recode (self.t_user_password.ufl_value, 'UTF-8', '_WIDE_');
- user_pwd2 := charset_recode (self.t_user_password_conf.ufl_value, 'UTF-8', '_WIDE_');
+ user_pwd:= self.t_user_password.ufl_value;
os_name := self.t_os_name.ufl_value;
e_mail := self.t_e_mail.ufl_value;
os_password := self.t_os_password.ufl_value;
- if (user_pwd <> user_pwd2)
+ if (user_pwd <> self.t_user_password_conf.ufl_value)
{
control.vc_parent.vc_error_message := 'Passwords mismatch';
self.vc_is_valid := 0;
diff --git a/binsrc/yacutia/account_remove.vspx b/binsrc/yacutia/account_remove.vspx
index c1c0ae7..6345b4a 100644
--- a/binsrc/yacutia/account_remove.vspx
+++ b/binsrc/yacutia/account_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: account_remove.vspx,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ - $Id: account_remove.vspx,v 1.2.2.2 2010/09/20 10:16:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/account_remove_inc.vspx b/binsrc/yacutia/account_remove_inc.vspx
index bcf0ba7..38e0759 100644
--- a/binsrc/yacutia/account_remove_inc.vspx
+++ b/binsrc/yacutia/account_remove_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: account_remove_inc.vspx,v 1.3.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: account_remove_inc.vspx,v 1.3.2.4 2010/09/20 10:16:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/accounts.vspx b/binsrc/yacutia/accounts.vspx
index eb2921e..2b80fb2 100644
--- a/binsrc/yacutia/accounts.vspx
+++ b/binsrc/yacutia/accounts.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: accounts.vspx,v 1.2.2.6 2012/03/08 12:55:23 source Exp $
+ - $Id: accounts.vspx,v 1.2.2.5 2011/01/25 14:21:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/accounts_page.vspx b/binsrc/yacutia/accounts_page.vspx
index e558912..117b6d7 100644
--- a/binsrc/yacutia/accounts_page.vspx
+++ b/binsrc/yacutia/accounts_page.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: accounts_page.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: accounts_page.vspx,v 1.2.2.3 2010/09/20 10:16:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/adm_login.vspx b/binsrc/yacutia/adm_login.vspx
index 04ccdee..ef5f8fa 100644
--- a/binsrc/yacutia/adm_login.vspx
+++ b/binsrc/yacutia/adm_login.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: adm_login.vspx,v 1.4.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: adm_login.vspx,v 1.4.2.3 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/adm_navigation_bar.vspx b/binsrc/yacutia/adm_navigation_bar.vspx
index 7e77408..3010a46 100644
--- a/binsrc/yacutia/adm_navigation_bar.vspx
+++ b/binsrc/yacutia/adm_navigation_bar.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso8859-1"?>
<!--
-
- - $Id: adm_navigation_bar.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: adm_navigation_bar.vspx,v 1.2.2.3 2011/01/10 13:26:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/admin_utils.js b/binsrc/yacutia/admin_utils.js
index 83b24b7..33977cf 100644
--- a/binsrc/yacutia/admin_utils.js
+++ b/binsrc/yacutia/admin_utils.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/back_nav.vspx b/binsrc/yacutia/back_nav.vspx
index 8e6ab21..216c9f7 100644
--- a/binsrc/yacutia/back_nav.vspx
+++ b/binsrc/yacutia/back_nav.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: back_nav.vspx,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ - $Id: back_nav.vspx,v 1.2.2.2 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/bpel_service.vspx b/binsrc/yacutia/bpel_service.vspx
index 217fc04..3ded631 100644
--- a/binsrc/yacutia/bpel_service.vspx
+++ b/binsrc/yacutia/bpel_service.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: bpel_service.vspx,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ - $Id: bpel_service.vspx,v 1.2.2.2 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/capabilities.vspx b/binsrc/yacutia/capabilities.vspx
index 839f6bf..6aea8fb 100644
--- a/binsrc/yacutia/capabilities.vspx
+++ b/binsrc/yacutia/capabilities.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: capabilities.vspx,v 1.2.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: capabilities.vspx,v 1.2.2.4 2011/01/10 13:26:08 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/caps_browser.vspx b/binsrc/yacutia/caps_browser.vspx
index 29f5656..1dae158 100644
--- a/binsrc/yacutia/caps_browser.vspx
+++ b/binsrc/yacutia/caps_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: caps_browser.vspx,v 1.4.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: caps_browser.vspx,v 1.4.2.3 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/caps_cols_browser.vspx b/binsrc/yacutia/caps_cols_browser.vspx
index 4f5c153..98271c7 100644
--- a/binsrc/yacutia/caps_cols_browser.vspx
+++ b/binsrc/yacutia/caps_cols_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: caps_cols_browser.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: caps_cols_browser.vspx,v 1.2.2.3 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cond_common.js b/binsrc/yacutia/cond_common.js
index 4d404ba..8ce4fd4 100644
--- a/binsrc/yacutia/cond_common.js
+++ b/binsrc/yacutia/cond_common.js
@@ -1,12 +1,12 @@
/*
- * $Id: cond_common.js,v 1.1.1.1.2.4 2012/03/08 12:55:23 source Exp $
+ * $Id: cond_common.js,v 1.1.1.1.2.3 2010/09/20 10:16:35 source Exp $
*
* Common (Java/ECMA)Script utilities for Yacutia
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cond_help.css b/binsrc/yacutia/cond_help.css
index 1e07891..fd06ef3 100644
--- a/binsrc/yacutia/cond_help.css
+++ b/binsrc/yacutia/cond_help.css
@@ -1,10 +1,10 @@
/*
- * $Id: cond_help.css,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ * $Id: cond_help.css,v 1.2.2.2 2010/09/20 10:16:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cond_help.html b/binsrc/yacutia/cond_help.html
index 228e391..1297169 100644
--- a/binsrc/yacutia/cond_help.html
+++ b/binsrc/yacutia/cond_help.html
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-
- - $Id: cond_help.html,v 1.1.1.1.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: cond_help.html,v 1.1.1.1.2.3 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cond_help.js b/binsrc/yacutia/cond_help.js
index 5709e24..d80aa91 100644
--- a/binsrc/yacutia/cond_help.js
+++ b/binsrc/yacutia/cond_help.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cond_help.xsl b/binsrc/yacutia/cond_help.xsl
index 12a715f..07c12b3 100644
--- a/binsrc/yacutia/cond_help.xsl
+++ b/binsrc/yacutia/cond_help.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: cond_help.xsl,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ - $Id: cond_help.xsl,v 1.2.2.2 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/conductor.list b/binsrc/yacutia/conductor.list
index 2adfc6b..b556527 100644
--- a/binsrc/yacutia/conductor.list
+++ b/binsrc/yacutia/conductor.list
@@ -291,9 +291,6 @@ conductor/page.xsl
conductor/persistent_xmlns.vspx
conductor/popup2_browser.vspx
conductor/popup_browser.vspx
-conductor/r2rml_gen.vspx
-conductor/r2rml_import.vspx
-conductor/r2rml_validate.vspx
conductor/rdf_conf.vspx
conductor/rdf_console.vspx
conductor/rdf_filters_pp.vspx
diff --git a/binsrc/yacutia/cont_management.vspx b/binsrc/yacutia/cont_management.vspx
index 2083964..47d9564 100644
--- a/binsrc/yacutia/cont_management.vspx
+++ b/binsrc/yacutia/cont_management.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: cont_management.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: cont_management.vspx,v 1.2.2.3 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cont_management_types.vspx b/binsrc/yacutia/cont_management_types.vspx
index 00ea345..bda6c3b 100644
--- a/binsrc/yacutia/cont_management_types.vspx
+++ b/binsrc/yacutia/cont_management_types.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: cont_management_types.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: cont_management_types.vspx,v 1.2.2.3 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cont_page.vspx b/binsrc/yacutia/cont_page.vspx
index a93f288..39d80e5 100644
--- a/binsrc/yacutia/cont_page.vspx
+++ b/binsrc/yacutia/cont_page.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: cont_page.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: cont_page.vspx,v 1.2.2.3 2010/09/20 10:16:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cont_type_edit.vspx b/binsrc/yacutia/cont_type_edit.vspx
index b0bdc0e..48b8f81 100644
--- a/binsrc/yacutia/cont_type_edit.vspx
+++ b/binsrc/yacutia/cont_type_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: cont_type_edit.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: cont_type_edit.vspx,v 1.2.2.3 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/cont_type_remove.vspx b/binsrc/yacutia/cont_type_remove.vspx
index da905ea..16cb6fa 100644
--- a/binsrc/yacutia/cont_type_remove.vspx
+++ b/binsrc/yacutia/cont_type_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: cont_type_remove.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: cont_type_remove.vspx,v 1.2.2.3 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/dashboard.vspx b/binsrc/yacutia/dashboard.vspx
index 17a6809..6ec4eb1 100644
--- a/binsrc/yacutia/dashboard.vspx
+++ b/binsrc/yacutia/dashboard.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: dashboard.vspx,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ - $Id: dashboard.vspx,v 1.2.2.2 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/dashboard_item.vspx b/binsrc/yacutia/dashboard_item.vspx
index 9da6339..585c661 100644
--- a/binsrc/yacutia/dashboard_item.vspx
+++ b/binsrc/yacutia/dashboard_item.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: dashboard_item.vspx,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ - $Id: dashboard_item.vspx,v 1.2.2.2 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/dashboard_item_show.vspx b/binsrc/yacutia/dashboard_item_show.vspx
index 53794a4..c444fa9 100644
--- a/binsrc/yacutia/dashboard_item_show.vspx
+++ b/binsrc/yacutia/dashboard_item_show.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: dashboard_item_show.vspx,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ - $Id: dashboard_item_show.vspx,v 1.2.2.2 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/dashboard_item_show.xsl b/binsrc/yacutia/dashboard_item_show.xsl
index 11e5ee9..9879bcf 100644
--- a/binsrc/yacutia/dashboard_item_show.xsl
+++ b/binsrc/yacutia/dashboard_item_show.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: dashboard_item_show.xsl,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ - $Id: dashboard_item_show.xsl,v 1.2.2.2 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases.vspx b/binsrc/yacutia/databases.vspx
index 0b49a44..ec3f1d0 100644
--- a/binsrc/yacutia/databases.vspx
+++ b/binsrc/yacutia/databases.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases.vspx,v 1.7.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: databases.vspx,v 1.7.2.4 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases_drop.vspx b/binsrc/yacutia/databases_drop.vspx
index c1b56b7..87e4fba 100644
--- a/binsrc/yacutia/databases_drop.vspx
+++ b/binsrc/yacutia/databases_drop.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases_drop.vspx,v 1.4.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_drop.vspx,v 1.4.2.4 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases_export.vspx b/binsrc/yacutia/databases_export.vspx
index ebeca55..e1c6cd8 100644
--- a/binsrc/yacutia/databases_export.vspx
+++ b/binsrc/yacutia/databases_export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: databases_export.vspx,v 1.3.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_export.vspx,v 1.3.2.4 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases_grants.vspx b/binsrc/yacutia/databases_grants.vspx
index 31d77ae..4c94d11 100644
--- a/binsrc/yacutia/databases_grants.vspx
+++ b/binsrc/yacutia/databases_grants.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases_grants.vspx,v 1.2.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_grants.vspx,v 1.2.2.4 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases_proc_edit.vspx b/binsrc/yacutia/databases_proc_edit.vspx
index 3002531..6cb41eb 100644
--- a/binsrc/yacutia/databases_proc_edit.vspx
+++ b/binsrc/yacutia/databases_proc_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases_proc_edit.vspx,v 1.3.2.7 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_proc_edit.vspx,v 1.3.2.6 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases_table_constraints.vspx b/binsrc/yacutia/databases_table_constraints.vspx
index 876d67a..bf5f41a 100644
--- a/binsrc/yacutia/databases_table_constraints.vspx
+++ b/binsrc/yacutia/databases_table_constraints.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases_table_constraints.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_table_constraints.vspx,v 1.2.2.3 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases_table_edit.vspx b/binsrc/yacutia/databases_table_edit.vspx
index 3d02501..b9515e8 100644
--- a/binsrc/yacutia/databases_table_edit.vspx
+++ b/binsrc/yacutia/databases_table_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases_table_edit.vspx,v 1.4.2.6 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_table_edit.vspx,v 1.4.2.4 2010/09/20 10:16:36 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -105,31 +105,20 @@
</v:template>
<v:template name="temp_table_exist" type="simple" enabled="-- case when (self.mode <> 'create') then 1 else 0 end">
<v:form name="tab_navigation_form" type="simple" method="POST" action="databases_table_edit.vspx">
- <table class="page_tab_row" align="left" border="0" cellspacing="0" cellpadding="6">
+ <table class="page_tab_row" align="left" border="0" cellspacing="0" cellpadding="5">
<tr>
- <td width="10%" nowrap="nowrap">
- <v:button action="simple" name="tb_brw" value="Table Browse" style="url">
- <v:on-post><v:script><![CDATA[
- declare ex_q varchar;
- ex_q := construct_table_sql (self.name);
-
- http_request_status ('HTTP/1.1 302 Found');
- http_header (sprintf('Location: isql_main.vspx?sid=%s&realm=%s&load_sql=%s\r\n',self.sid ,self.realm, ex_q));
-
- ]]></v:script></v:on-post>
- </v:button>
- </td>
- <td width="10%" nowrap="nowrap">
+ <td nowrap="nowrap">
<v:button action="simple" name="tb_def" value="Show Columns" style="url">
<v:on-post><v:script><![CDATA[ self.mode:='definition'; self.vc_data_bind(e);]]></v:script></v:on-post>
</v:button>
</td>
- <td width="10%" nowrap="nowrap">
+ <td nowrap="nowrap">
<v:button action="simple" name="tb_sql" value="Show SQL" style="url">
<v:on-post><v:script><![CDATA[ self.mode:='sql'; self.vc_data_bind(e);]]></v:script></v:on-post>
</v:button>
</td>
- <td width="10%" nowrap="nowrap">
+ <td nowrap="nowrap">
+
<v:button action="browse" name="tb_edit_ddl" value="Edit" style="url"
selector="isql.vspx"
child-window-options="scrollbars=yes, resizable=yes, menubar=no, height=630, width=800">
@@ -146,12 +135,12 @@
]]></v:before-render>
</v:button>
</td>
- <td width="10%" nowrap="nowrap">
+ <td nowrap="nowrap">
<v:button action="simple" name="tb_indx" value="Edit Indexes" style="url">
<v:on-post><v:script><![CDATA[ self.mode:='indexes'; self.vc_data_bind(e);]]></v:script></v:on-post>
</v:button>
</td>
- <td width="10%" nowrap="nowrap">
+ <td nowrap="nowrap">
<v:button action="simple" name="tb_trig" value="Edit Triggers" style="url">
<v:on-post><v:script><![CDATA[ self.mode:='triggers'; self.vc_data_bind(e);]]></v:script></v:on-post>
</v:button>
diff --git a/binsrc/yacutia/databases_udt_custom.vspx b/binsrc/yacutia/databases_udt_custom.vspx
index 672041f..f97f123 100644
--- a/binsrc/yacutia/databases_udt_custom.vspx
+++ b/binsrc/yacutia/databases_udt_custom.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases_udt_custom.vspx,v 1.3.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_udt_custom.vspx,v 1.3.2.3 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases_udt_edit.vspx b/binsrc/yacutia/databases_udt_edit.vspx
index 65b667c..6f5ece4 100644
--- a/binsrc/yacutia/databases_udt_edit.vspx
+++ b/binsrc/yacutia/databases_udt_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases_udt_edit.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_udt_edit.vspx,v 1.2.2.3 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/databases_view_edit.vspx b/binsrc/yacutia/databases_view_edit.vspx
index a47a3bc..a5d49e2 100644
--- a/binsrc/yacutia/databases_view_edit.vspx
+++ b/binsrc/yacutia/databases_view_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: databases_view_edit.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: databases_view_edit.vspx,v 1.2.2.3 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/dav_browser.css b/binsrc/yacutia/dav_browser.css
index 48daf89..ae0c1da 100644
--- a/binsrc/yacutia/dav_browser.css
+++ b/binsrc/yacutia/dav_browser.css
@@ -1,10 +1,10 @@
/*
- * $Id: dav_browser.css,v 1.2.2.3 2012/03/08 12:55:23 source Exp $
+ * $Id: dav_browser.css,v 1.2.2.2 2010/09/20 10:16:37 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/dav_browser.xsl b/binsrc/yacutia/dav_browser.xsl
index d20b0a9..5ca4b15 100644
--- a/binsrc/yacutia/dav_browser.xsl
+++ b/binsrc/yacutia/dav_browser.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: dav_browser.xsl,v 1.17.2.20 2012/03/08 12:55:23 source Exp $
+ - $Id: dav_browser.xsl,v 1.17.2.19 2011/10/25 23:34:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/dav_browser_props.js b/binsrc/yacutia/dav_browser_props.js
index 5bb5f04..a61fa6a 100644
--- a/binsrc/yacutia/dav_browser_props.js
+++ b/binsrc/yacutia/dav_browser_props.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/dav_post.js b/binsrc/yacutia/dav_post.js
index 7197368..fc8414e 100644
--- a/binsrc/yacutia/dav_post.js
+++ b/binsrc/yacutia/dav_post.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_backup.vspx b/binsrc/yacutia/db_backup.vspx
index 8e4e617..4c805bf 100644
--- a/binsrc/yacutia/db_backup.vspx
+++ b/binsrc/yacutia/db_backup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: db_backup.vspx,v 1.4.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_backup.vspx,v 1.4.2.4 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_backup_clear.vspx b/binsrc/yacutia/db_backup_clear.vspx
index 82d4c58..79fd1cf 100644
--- a/binsrc/yacutia/db_backup_clear.vspx
+++ b/binsrc/yacutia/db_backup_clear.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_backup_clear.vspx,v 1.3.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_backup_clear.vspx,v 1.3.2.4 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_const_drop_conf.vspx b/binsrc/yacutia/db_const_drop_conf.vspx
index 19eac22..b008f0d 100644
--- a/binsrc/yacutia/db_const_drop_conf.vspx
+++ b/binsrc/yacutia/db_const_drop_conf.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_const_drop_conf.vspx,v 1.3.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_const_drop_conf.vspx,v 1.3.2.4 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_const_drop_errs.vspx b/binsrc/yacutia/db_const_drop_errs.vspx
index 466cffc..ff87747 100644
--- a/binsrc/yacutia/db_const_drop_errs.vspx
+++ b/binsrc/yacutia/db_const_drop_errs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_const_drop_errs.vspx,v 1.3.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_const_drop_errs.vspx,v 1.3.2.4 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_drop_conf.vspx b/binsrc/yacutia/db_drop_conf.vspx
index d5d4eae..84ab850 100644
--- a/binsrc/yacutia/db_drop_conf.vspx
+++ b/binsrc/yacutia/db_drop_conf.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_drop_conf.vspx,v 1.3.2.6 2012/03/08 12:55:23 source Exp $
+ - $Id: db_drop_conf.vspx,v 1.3.2.5 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_drop_errs.vspx b/binsrc/yacutia/db_drop_errs.vspx
index 8a9c35c..54b8e95 100644
--- a/binsrc/yacutia/db_drop_errs.vspx
+++ b/binsrc/yacutia/db_drop_errs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_drop_errs.vspx,v 1.3.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_drop_errs.vspx,v 1.3.2.4 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_grant_errs.vspx b/binsrc/yacutia/db_grant_errs.vspx
index 8971db5..4676f0d 100644
--- a/binsrc/yacutia/db_grant_errs.vspx
+++ b/binsrc/yacutia/db_grant_errs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_grant_errs.vspx,v 1.2.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_grant_errs.vspx,v 1.2.2.4 2010/09/20 10:16:37 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_grant_many.vspx b/binsrc/yacutia/db_grant_many.vspx
index ff23f66..3fe60d4 100644
--- a/binsrc/yacutia/db_grant_many.vspx
+++ b/binsrc/yacutia/db_grant_many.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_grant_many.vspx,v 1.2.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_grant_many.vspx,v 1.2.2.4 2010/09/20 10:16:38 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_rdf_class.vspx b/binsrc/yacutia/db_rdf_class.vspx
index d35d624..78221b9 100644
--- a/binsrc/yacutia/db_rdf_class.vspx
+++ b/binsrc/yacutia/db_rdf_class.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_class.vspx,v 1.7.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_class.vspx,v 1.7.2.4 2011/09/09 13:21:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_rdf_objects.vspx b/binsrc/yacutia/db_rdf_objects.vspx
index f3dbc04..68dd248 100644
--- a/binsrc/yacutia/db_rdf_objects.vspx
+++ b/binsrc/yacutia/db_rdf_objects.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_objects.vspx,v 1.4.2.13 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_objects.vspx,v 1.4.2.12 2011/10/13 18:33:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_rdf_owl.vspx b/binsrc/yacutia/db_rdf_owl.vspx
index 0f24ef6..f30d4ff 100644
--- a/binsrc/yacutia/db_rdf_owl.vspx
+++ b/binsrc/yacutia/db_rdf_owl.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_owl.vspx,v 1.2.2.5 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_owl.vspx,v 1.2.2.4 2010/09/20 10:16:38 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_rdf_view_1.vspx b/binsrc/yacutia/db_rdf_view_1.vspx
index d573b19..0c70afc 100644
--- a/binsrc/yacutia/db_rdf_view_1.vspx
+++ b/binsrc/yacutia/db_rdf_view_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_view_1.vspx,v 1.1.2.10 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_view_1.vspx,v 1.1.2.9 2011/09/09 13:21:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_rdf_view_2.vspx b/binsrc/yacutia/db_rdf_view_2.vspx
index 33b0ccd..95efa31 100644
--- a/binsrc/yacutia/db_rdf_view_2.vspx
+++ b/binsrc/yacutia/db_rdf_view_2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_view_2.vspx,v 1.1.2.10 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_view_2.vspx,v 1.1.2.9 2011/10/13 18:33:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_rdf_view_3.vspx b/binsrc/yacutia/db_rdf_view_3.vspx
index 172e514..c5ef637 100644
--- a/binsrc/yacutia/db_rdf_view_3.vspx
+++ b/binsrc/yacutia/db_rdf_view_3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_view_3.vspx,v 1.2.2.22 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_view_3.vspx,v 1.2.2.19 2011/10/25 23:34:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -41,7 +41,6 @@
<v:variable name="exec_ret" type="any" default="null" persist="temp"/>
<v:variable name="sync_ret" type="any" default="null" persist="temp"/>
<v:variable persist="0" name="body_v" type="any" default="null" param-name="cr_view"/>
- <v:variable persist="0" name="body_r2rml" type="any" default="null" param-name="r2rml"/>
<v:variable persist="0" name="body_o" type="any" default="null" param-name="cr_owl"/>
<v:variable persist="0" name="text_e" type="integer" default="0"/>
<v:variable persist="0" name="owl" type="int" default="0" param-name="owl"/>
@@ -53,7 +52,6 @@
<v:variable persist="0" name="exec_it" type="int" default="0" param-name="exec" />
<v:variable persist="0" name="cols" type="any" default="null" param-name="cols"/>
<v:variable persist="0" name="pklist" type="any" default="null" param-name="pk"/>
- <v:variable persist="0" name="pgraphv" type="varchar" default="''" param-name="pgraph"/>
</vm:variables>
<vm:header caption="Linked Data View definition"/>
@@ -103,7 +101,7 @@
}
if (self.rdb_sync.ufl_selected)
{
- self.sync_ret := RDF_VIEW_DO_SYNC (self.base_url, self.fill.ufl_selected, self.pgraph.ufl_value);
+ self.sync_ret := RDF_VIEW_DO_SYNC (self.base_url, self.fill.ufl_selected);
if (0 = length (self.sync_ret))
self.sync_ret := vector (vector ('00000', 'OK'));
}
@@ -201,10 +199,6 @@
{
self.body_v := self.body_v || '\n\n';
self.body_v := self.body_v || DB.DBA.RDF_VIEW_FROM_TBL (_base_url, tbls, self.voidst, cols);
- if (__proc_exists ('DB.DBA.R2RML_FROM_TBL') is not null)
- self.body_r2rml := R2RML_FROM_TBL (_base_url, tbls, self.voidst, cols);
- else
- self.body_r2rml := '### You need a new server binary in order to unlock R2RML graph generator';
}
if (self.view_vd)
self.body_v := self.body_v || '\n\n-- Virtual directories for instance data\n' || DB.DBA.RDF_VIEW_GEN_VD (_base_url);
@@ -241,7 +235,6 @@
{
?>
<h2>Execution Status</h2>
- <div class="scroll_area">
<table class="listing">
<tr class="listing_header_row"><th>Status</th><th>Message</th></tr>
<?vsp
@@ -257,7 +250,6 @@
}
?>
</table>
- </div>
<?vsp
if (length (self.sync_ret))
{
@@ -328,28 +320,6 @@
}
http ('</div>');
}
- if (length (self.pgraphv) and self.fill.ufl_selected)
- {
- qr := sprintf ('sparql select distinct ?class from <%s> { ?s a ?class } limit 10', self.pgraphv);
- exec (qr, stat, msg, vector (), 0, meta, data);
- if (stat = '00000' and length (data) and length (data[0]))
- {
- http (sprintf ('<div>Instance Data Physical Named Graph: %V <br/>', self.pgraphv));
- foreach (any _row in data) do
- {
- qr := sprintf ('sparql select ?s from <%s> { ?s a <%s> } limit 1', self.pgraphv, _row[0]);
- exec (qr, stat, msg, vector (), 1, meta2, data2);
- if (stat = '00000' and length (data2) and length (data2[0]))
- {
- if (fct_installed)
- http (sprintf ('<a href="/describe/?url=%U" target="_blank">%s</a><br/>', data2[0][0], data2[0][0]));
- else
- http (sprintf ('<a href="%s" target="_blank">%s</a><br/>', replace (data2[0][0], '#', '%01'), data2[0][0]));
- }
- }
- http ('</div>');
- }
- }
}
if (self.st and self.view_vd)
{
@@ -386,8 +356,6 @@
<?vsp if (self.exist_sql) { ?>
<h2>Definitions</h2>
<v:textarea name="cr_view" xhtml_cols="120" xhtml_rows="20" value="--self.body_v"/><br/>
- <h2>R2RML Graph</h2>
- <v:textarea name="r2rml" xhtml_cols="120" xhtml_rows="20" value="--self.body_r2rml"/><br/>
<?vsp } ?>
<?vsp if (self.owl) { ?>
<h2>Ontology</h2>
@@ -395,9 +363,7 @@
<?vsp } ?>
<?vsp } ?>
<?vsp if (self.text_e = 0 and __proc_exists ('DB.DBA.RDF_VIEW_DO_SYNC')) { ?>
- <br />
- <label>Physical Graph Name</label> <v:text name="pgraph" value="--sprintf ('urn:%{URIQADefaultHost}s:%s', self.base_url)" xhtml_size="70" /><br />
- <v:check-box name="rdb_sync" value="1" xhtml_id="rdb_sync" /> <label for="rdb_sync">Generate RDB2RDF triggers</label> <br/>
+ <br /><v:check-box name="rdb_sync" value="1" xhtml_id="rdb_sync" /> <label for="rdb_sync">Generate RDB2RDF triggers</label> <br/>
<v:check-box name="fill" value="1" xhtml_id="fill" /> <label for="fill">Enable Data Syncs with Physical Quad Store</label> <br/>
<?vsp } ?>
<input type="hidden" name="host" value="<?V get_keyword('host', self.vc_event.ve_params) ?>"/><br/>
diff --git a/binsrc/yacutia/db_rdf_view_cols.vspx b/binsrc/yacutia/db_rdf_view_cols.vspx
index 43cd8ee..da175ef 100644
--- a/binsrc/yacutia/db_rdf_view_cols.vspx
+++ b/binsrc/yacutia/db_rdf_view_cols.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_view_cols.vspx,v 1.1.2.12 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_view_cols.vspx,v 1.1.2.11 2011/10/13 18:33:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_rdf_view_pk.vspx b/binsrc/yacutia/db_rdf_view_pk.vspx
index e303a3c..39bcf57 100644
--- a/binsrc/yacutia/db_rdf_view_pk.vspx
+++ b/binsrc/yacutia/db_rdf_view_pk.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_view_pk.vspx,v 1.1.2.8 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_view_pk.vspx,v 1.1.2.7 2011/10/25 23:34:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_rdf_view_tb.vspx b/binsrc/yacutia/db_rdf_view_tb.vspx
index 44ecffa..a8de9a4 100644
--- a/binsrc/yacutia/db_rdf_view_tb.vspx
+++ b/binsrc/yacutia/db_rdf_view_tb.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_rdf_view_tb.vspx,v 1.1.2.9 2012/03/08 12:55:23 source Exp $
+ - $Id: db_rdf_view_tb.vspx,v 1.1.2.8 2011/10/13 18:33:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_basic.vspx b/binsrc/yacutia/db_repl_basic.vspx
index 8687b58..5f55393 100644
--- a/binsrc/yacutia/db_repl_basic.vspx
+++ b/binsrc/yacutia/db_repl_basic.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_basic.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_basic.vspx,v 1.2.2.3 2010/09/20 10:16:38 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_basic_create.vspx b/binsrc/yacutia/db_repl_basic_create.vspx
index b471feb..21f8b9a 100644
--- a/binsrc/yacutia/db_repl_basic_create.vspx
+++ b/binsrc/yacutia/db_repl_basic_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_basic_create.vspx,v 1.3.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_basic_create.vspx,v 1.3.2.3 2010/09/20 10:16:38 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_basic_local.vspx b/binsrc/yacutia/db_repl_basic_local.vspx
index 71a6f06..aea3e2b 100644
--- a/binsrc/yacutia/db_repl_basic_local.vspx
+++ b/binsrc/yacutia/db_repl_basic_local.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_basic_local.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_basic_local.vspx,v 1.2.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_basic_local_create.vspx b/binsrc/yacutia/db_repl_basic_local_create.vspx
index 28d853f..07b8ef0 100644
--- a/binsrc/yacutia/db_repl_basic_local_create.vspx
+++ b/binsrc/yacutia/db_repl_basic_local_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_basic_local_create.vspx,v 1.3.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_basic_local_create.vspx,v 1.3.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_basic_local_start.vspx b/binsrc/yacutia/db_repl_basic_local_start.vspx
index 06e4b64..5a080e7 100644
--- a/binsrc/yacutia/db_repl_basic_local_start.vspx
+++ b/binsrc/yacutia/db_repl_basic_local_start.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_basic_local_start.vspx,v 1.4.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_basic_local_start.vspx,v 1.4.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_basic_start.vspx b/binsrc/yacutia/db_repl_basic_start.vspx
index 70770df..179f668 100644
--- a/binsrc/yacutia/db_repl_basic_start.vspx
+++ b/binsrc/yacutia/db_repl_basic_start.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_basic_start.vspx,v 1.5.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_basic_start.vspx,v 1.5.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_bi.vspx b/binsrc/yacutia/db_repl_bi.vspx
index ee000d3..4f2742c 100644
--- a/binsrc/yacutia/db_repl_bi.vspx
+++ b/binsrc/yacutia/db_repl_bi.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_bi.vspx,v 1.3.2.6 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_bi.vspx,v 1.3.2.5 2011/01/25 14:21:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_bi_add.vspx b/binsrc/yacutia/db_repl_bi_add.vspx
index a2fd569..b8a101f 100644
--- a/binsrc/yacutia/db_repl_bi_add.vspx
+++ b/binsrc/yacutia/db_repl_bi_add.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_bi_add.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_bi_add.vspx,v 1.2.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_bi_cr.vspx b/binsrc/yacutia/db_repl_bi_cr.vspx
index 5027814..abd1855 100644
--- a/binsrc/yacutia/db_repl_bi_cr.vspx
+++ b/binsrc/yacutia/db_repl_bi_cr.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_bi_cr.vspx,v 1.3.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_bi_cr.vspx,v 1.3.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_bi_cr_edit.vspx b/binsrc/yacutia/db_repl_bi_cr_edit.vspx
index 02c550f..09c60da 100644
--- a/binsrc/yacutia/db_repl_bi_cr_edit.vspx
+++ b/binsrc/yacutia/db_repl_bi_cr_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_bi_cr_edit.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_bi_cr_edit.vspx,v 1.2.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_bi_create.vspx b/binsrc/yacutia/db_repl_bi_create.vspx
index 1eacdcd..6783d8f 100644
--- a/binsrc/yacutia/db_repl_bi_create.vspx
+++ b/binsrc/yacutia/db_repl_bi_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_bi_create.vspx,v 1.2.2.4 2012/03/08 12:55:23 source Exp $
+ - $Id: db_repl_bi_create.vspx,v 1.2.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_bi_edit.vspx b/binsrc/yacutia/db_repl_bi_edit.vspx
index d0e0d39..ee0a721 100644
--- a/binsrc/yacutia/db_repl_bi_edit.vspx
+++ b/binsrc/yacutia/db_repl_bi_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_bi_edit.vspx,v 1.3.2.4 2012/03/08 12:55:24 source Exp $
+ - $Id: db_repl_bi_edit.vspx,v 1.3.2.3 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_bi_remove.vspx b/binsrc/yacutia/db_repl_bi_remove.vspx
index b7b42c9..79d4fad 100644
--- a/binsrc/yacutia/db_repl_bi_remove.vspx
+++ b/binsrc/yacutia/db_repl_bi_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_bi_remove.vspx,v 1.3.2.5 2012/03/08 12:55:24 source Exp $
+ - $Id: db_repl_bi_remove.vspx,v 1.3.2.4 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_cr_edit.vspx b/binsrc/yacutia/db_repl_cr_edit.vspx
index a8ef5db..61a28a3 100644
--- a/binsrc/yacutia/db_repl_cr_edit.vspx
+++ b/binsrc/yacutia/db_repl_cr_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_cr_edit.vspx,v 1.3.2.3 2012/03/08 12:55:24 source Exp $
+ - $Id: db_repl_cr_edit.vspx,v 1.3.2.2 2010/09/20 10:16:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_pub.vspx b/binsrc/yacutia/db_repl_pub.vspx
index 1810a91..c05c013 100644
--- a/binsrc/yacutia/db_repl_pub.vspx
+++ b/binsrc/yacutia/db_repl_pub.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_pub.vspx,v 1.2.2.5 2012/03/08 12:55:24 source Exp $
+ - $Id: db_repl_pub.vspx,v 1.2.2.4 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_pub_cr.vspx b/binsrc/yacutia/db_repl_pub_cr.vspx
index fc5af52..cfecfd1 100644
--- a/binsrc/yacutia/db_repl_pub_cr.vspx
+++ b/binsrc/yacutia/db_repl_pub_cr.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_pub_cr.vspx,v 1.2.2.4 2012/03/08 12:55:24 source Exp $
+ - $Id: db_repl_pub_cr.vspx,v 1.2.2.3 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_pub_cr_edit.vspx b/binsrc/yacutia/db_repl_pub_cr_edit.vspx
index e88d906..972c26e 100644
--- a/binsrc/yacutia/db_repl_pub_cr_edit.vspx
+++ b/binsrc/yacutia/db_repl_pub_cr_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_pub_cr_edit.vspx,v 1.4.2.3 2012/03/08 12:55:24 source Exp $
+ - $Id: db_repl_pub_cr_edit.vspx,v 1.4.2.2 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_pub_cr_edit2.vspx b/binsrc/yacutia/db_repl_pub_cr_edit2.vspx
index 76e038d..56a2cf3 100644
--- a/binsrc/yacutia/db_repl_pub_cr_edit2.vspx
+++ b/binsrc/yacutia/db_repl_pub_cr_edit2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_pub_cr_edit2.vspx,v 1.2.2.4 2012/03/08 12:55:24 source Exp $
+ - $Id: db_repl_pub_cr_edit2.vspx,v 1.2.2.3 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_pub_create.vspx b/binsrc/yacutia/db_repl_pub_create.vspx
index deb571b..a3d2854 100644
--- a/binsrc/yacutia/db_repl_pub_create.vspx
+++ b/binsrc/yacutia/db_repl_pub_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_pub_create.vspx,v 1.2.2.4 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_pub_create.vspx,v 1.2.2.3 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_pub_edit.vspx b/binsrc/yacutia/db_repl_pub_edit.vspx
index b815632..78819ee 100644
--- a/binsrc/yacutia/db_repl_pub_edit.vspx
+++ b/binsrc/yacutia/db_repl_pub_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_pub_edit.vspx,v 1.5.2.5 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_pub_edit.vspx,v 1.5.2.4 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_rdf_pub_edit.vspx b/binsrc/yacutia/db_repl_rdf_pub_edit.vspx
index 1a4e233..57ae71c 100644
--- a/binsrc/yacutia/db_repl_rdf_pub_edit.vspx
+++ b/binsrc/yacutia/db_repl_rdf_pub_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_rdf_pub_edit.vspx,v 1.1.4.4 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_rdf_pub_edit.vspx,v 1.1.4.3 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_snap.vspx b/binsrc/yacutia/db_repl_snap.vspx
index 36af4a1..0e06e41 100644
--- a/binsrc/yacutia/db_repl_snap.vspx
+++ b/binsrc/yacutia/db_repl_snap.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap.vspx,v 1.2.2.5 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap.vspx,v 1.2.2.3 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -68,12 +68,12 @@
<col/>
</colgroup>
<tr>
+ <td class="page_tab_selected" align="center">Local to Remote</td>
<td class="page_tab" align="center">
<v:url name="b_url31" value="Remote to Local" url="db_repl_snap_pull.vspx"/>
</td>
- <td class="page_tab_selected" align="center">Local to Remote</td>
<td class="page_tab" align="center">
- <v:url name="b_url32" value="Local to Local" url="db_repl_snap_local.vspx"/>
+ <v:url name="b_url31" value="Local to Local" url="db_repl_snap_local.vspx"/>
</td>
<td class="page_tab_empty"></td>
</tr>
diff --git a/binsrc/yacutia/db_repl_snap_create.vspx b/binsrc/yacutia/db_repl_snap_create.vspx
index 1c44adc..6a696d5 100644
--- a/binsrc/yacutia/db_repl_snap_create.vspx
+++ b/binsrc/yacutia/db_repl_snap_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap_create.vspx,v 1.2.2.5 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap_create.vspx,v 1.2.2.3 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -54,7 +54,6 @@
<v:variable name="dsrws" type="any" default="null" />
<!-- keep the selection -->
<v:variable name="selcust" type="any" default="null" />
- <v:variable name="selcustall" type="any" default="null" />
</vm:variables>
<vm:menu>
<vm:menuitem name="vers" value="Snapshot"/>
@@ -559,58 +558,6 @@ self.vc_data_bind(e);
<v:template name="link_template" type="simple" enabled="-- equ(self.repl_snap_stage, 2)">
<h3>Step 3: Choose Destinations Parameters</h3>
<v:form name="link2_form" action="db_repl_snap_create.vspx" method="POST" type="simple">
- <div class="listing_top_ctl_grp">
- <v:text name="mass_tbq" xhtml_size="3" value="">
- <v:before-render>
- control.ufl_value := '';
- </v:before-render>
- </v:text>.
- <v:text name="mass_tbo" xhtml_size="15" value="">
- <v:before-render>
- control.ufl_value := '';
- </v:before-render>
- </v:text>.[TABLE]
- <v:button name="mass_set" action="simple" value="Set To All">
- <v:on-post>
- <![CDATA[
- declare i, l,dst_arr,tmp_arr any;
- declare _views integer;
- declare p1, p2, p3 varchar;
- _views := 0;
-
-
- if (self.mass_tbq.ufl_value <> '' or self.mass_tbo.ufl_value <> '') {
- _loop:;
- i := 0;
- dst_arr := self.selcust;
- l := length(dst_arr);
- while (i < l) {
- tmp_arr := dst_arr[i];
-
- p1 := name_part(tmp_arr, 0);
- p2 := self.repl_snap_dsn;
- p3 := name_part(tmp_arr, 2);
-
- if (self.mass_tbq.ufl_value <> '')
- p1 := self.mass_tbq.ufl_value;
- if (self.mass_tbo.ufl_value <> '')
- p2 := self.mass_tbo.ufl_value;
- aset(dst_arr,i,concat(p1,'.',p2,'.',p3));
- i:= i + 1;
- };
-
- self.selcustall := dst_arr;
- if (_views = 0)
- {
- _views := 1;
- goto _loop;
- };
- self.vc_data_bind(e);
- };
- ]]>
- </v:on-post>
- </v:button>
- </div>
<table class="listing" rules="groups">
<colgroup/><colgroup/>
<thead>
@@ -630,22 +577,9 @@ self.vc_data_bind(e);
while (_idx < length(self.selcust))
{
_tblname := self.selcust[_idx];
-
- declare l1 integer;
- declare _tblname2 any;
+ _idx := _idx + 1;
declare _attached_name varchar;
-
- l1 := length(self.selcustall);
-
- if (l1 )
- {
- _tblname2 := self.selcustall[_idx];
- _attached_name := _tblname2;
- }else{
_attached_name := att_local_name(self.repl_snap_dsn, name_part(_tblname, 2));
- };
-
- _idx := _idx + 1;
self.r_count := self.r_count + 1;
http (sprintf ('<tr class="%s">', case when mod (self.r_count, 2) then 'listing_row_odd' else 'listing_row_even' end));
http ('<td class="listing_col"><img src="images/icons/table_16.png" alt="Table" title="Table"/></td>');
diff --git a/binsrc/yacutia/db_repl_snap_local.vspx b/binsrc/yacutia/db_repl_snap_local.vspx
index 59a6ffb..37ae9e1 100644
--- a/binsrc/yacutia/db_repl_snap_local.vspx
+++ b/binsrc/yacutia/db_repl_snap_local.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap_local.vspx,v 1.2.2.5 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap_local.vspx,v 1.2.2.3 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -69,10 +69,10 @@
</colgroup>
<tr>
<td class="page_tab" align="center">
- <v:url name="b_url31" value="Remote to Local" url="db_repl_snap_pull.vspx"/>
+ <v:url name="b_url31" value="Local to Remote" url="db_repl_snap.vspx"/>
</td>
<td class="page_tab" align="center">
- <v:url name="b_url32" value="Local to Remote" url="db_repl_snap.vspx"/>
+ <v:url name="b_url31" value="Remote to Local" url="db_repl_snap_pull.vspx"/>
</td>
<td class="page_tab_selected" align="center">Local to Local</td>
<td class="page_tab_empty"></td>
diff --git a/binsrc/yacutia/db_repl_snap_local_create.vspx b/binsrc/yacutia/db_repl_snap_local_create.vspx
index 60951e0..b3e756c 100644
--- a/binsrc/yacutia/db_repl_snap_local_create.vspx
+++ b/binsrc/yacutia/db_repl_snap_local_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap_local_create.vspx,v 1.2.2.5 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap_local_create.vspx,v 1.2.2.3 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -54,7 +54,6 @@
<v:variable name="dsrws" type="any" default="null" />
<!-- keep the selection -->
<v:variable name="selcust" type="any" default="null" />
- <v:variable name="selcustall" type="any" default="null" />
</vm:variables>
<vm:menu>
<vm:menuitem name="vers" value="Snapshot"/>
@@ -353,58 +352,6 @@ self.vc_data_bind(e);
<v:template name="link_template" type="simple" enabled="-- equ(self.repl_snap_local_stage, 2)">
<h3>Step 2: Choose Destinations Parameters</h3>
<v:form name="link2_form" action="db_repl_snap_local_create.vspx" method="POST" type="simple">
- <div class="listing_top_ctl_grp">
- <v:text name="mass_tbq" xhtml_size="3" value="">
- <v:before-render>
- control.ufl_value := '';
- </v:before-render>
- </v:text>.
- <v:text name="mass_tbo" xhtml_size="15" value="">
- <v:before-render>
- control.ufl_value := '';
- </v:before-render>
- </v:text>.[TABLE]
- <v:button name="mass_set" action="simple" value="Set To All">
- <v:on-post>
- <![CDATA[
- declare i, l,dst_arr,tmp_arr any;
- declare _views integer;
- declare p1, p2, p3 varchar;
- _views := 0;
-
-
- if (self.mass_tbq.ufl_value <> '' or self.mass_tbo.ufl_value <> '') {
- _loop:;
- i := 0;
- dst_arr := self.selcust;
- l := length(dst_arr);
- while (i < l) {
- tmp_arr := dst_arr[i];
-
- p1 := name_part(tmp_arr, 0);
- p2 := name_part(tmp_arr, 1);
- p3 := name_part(tmp_arr, 2);
-
- if (self.mass_tbq.ufl_value <> '')
- p1 := self.mass_tbq.ufl_value;
- if (self.mass_tbo.ufl_value <> '')
- p2 := self.mass_tbo.ufl_value;
- aset(dst_arr,i,concat(p1,'.',p2,'.',p3));
- i:= i + 1;
- };
-
- self.selcustall := dst_arr;
- if (_views = 0)
- {
- _views := 1;
- goto _loop;
- };
- -- self.vc_data_bind(e);
- };
- ]]>
- </v:on-post>
- </v:button>
- </div>
<table class="listing" rules="groups">
<colgroup/><colgroup/>
<thead>
@@ -421,33 +368,14 @@ self.vc_data_bind(e);
while (_idx < length(self.selcust))
{
_tblname := self.selcust[_idx];
-
- declare l1 integer;
- declare _tblname2 any;
- declare _attached_name1, _attached_name2 varchar;
-
- l1 := length(self.selcustall);
-
- if (l1 )
- {
- _tblname2 := self.selcustall[_idx];
- _attached_name1 := name_part(_tblname2, 0);
- _attached_name2 := name_part(_tblname2, 1);
- }
- else
- {
- _attached_name1 := coalesce (user_get_option(connection_get ('vspx_user'),'LOGIN_QUALIFIER'), 'DB');
- _attached_name2 := connection_get ('vspx_user');
- };
-
_idx := _idx + 1;
self.r_count := self.r_count + 1;
http (sprintf ('<tr class="%s">', case when mod (self.r_count, 2) then 'listing_row_odd' else 'listing_row_even' end));
http ('<td class="listing_col"><img src="images/icons/table_16.png" alt="Table" title="Table"/></td>');
http(sprintf ('<td>%V</td>', _tblname));
http(sprintf ('<td><input type="checkbox" name="LTB_cr_%s" value="on" checked="checked"/>', _tblname));
- http(sprintf ('<input type="text" size="3" name="LTBQ_%s" value="%s"/>.', _tblname, _attached_name1));
- http(sprintf ('<input type="text" size="15" name="LTBO_%s" value="%s">.', _tblname, _attached_name2));
+ http(sprintf ('<input type="text" size="3" name="LTBQ_%s" value="%s"/>.', _tblname, coalesce (user_get_option(connection_get ('vspx_user'),'LOGIN_QUALIFIER'), 'DB')));
+ http(sprintf ('<input type="text" size="15" name="LTBO_%s" value="%s">.', _tblname, connection_get ('vspx_user')));
http(sprintf ('<input type="text" size="30" name="LTBN_%s" value="%s">', _tblname, name_part(_tblname, 2)));
http(sprintf ('<input type="hidden" name="tbls" value="%s"></td>', _tblname));
http('</tr>');
diff --git a/binsrc/yacutia/db_repl_snap_local_start.vspx b/binsrc/yacutia/db_repl_snap_local_start.vspx
index af3ca62..d7f99bb 100644
--- a/binsrc/yacutia/db_repl_snap_local_start.vspx
+++ b/binsrc/yacutia/db_repl_snap_local_start.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap_local_start.vspx,v 1.2.2.5 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap_local_start.vspx,v 1.2.2.4 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_snap_pull.vspx b/binsrc/yacutia/db_repl_snap_pull.vspx
index 427b843..6ee94b7 100644
--- a/binsrc/yacutia/db_repl_snap_pull.vspx
+++ b/binsrc/yacutia/db_repl_snap_pull.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap_pull.vspx,v 1.2.2.6 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap_pull.vspx,v 1.2.2.4 2010/09/20 10:16:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -68,12 +68,12 @@
<col/>
</colgroup>
<tr>
- <td class="page_tab_selected" align="center">Remote to Local</td>
<td class="page_tab" align="center">
<v:url name="b_url31" value="Local to Remote" url="db_repl_snap.vspx"/>
</td>
+ <td class="page_tab_selected" align="center">Remote to Local</td>
<td class="page_tab" align="center">
- <v:url name="b_url32" value="Local to Local" url="db_repl_snap_local.vspx"/>
+ <v:url name="b_url31" value="Local to Local" url="db_repl_snap_local.vspx"/>
</td>
<td class="page_tab_empty"></td>
</tr>
diff --git a/binsrc/yacutia/db_repl_snap_pull_create.vspx b/binsrc/yacutia/db_repl_snap_pull_create.vspx
index f31129f..ec073e9 100644
--- a/binsrc/yacutia/db_repl_snap_pull_create.vspx
+++ b/binsrc/yacutia/db_repl_snap_pull_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap_pull_create.vspx,v 1.2.2.5 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap_pull_create.vspx,v 1.2.2.3 2010/09/20 10:16:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -54,7 +54,6 @@
<v:variable name="dsrws" type="any" default="null" />
<!-- keep the selection -->
<v:variable name="selcust" type="any" default="null" />
- <v:variable name="selcustall" type="any" default="null" />
</vm:variables>
<vm:menu>
<vm:menuitem name="vers" value="Snapshot"/>
@@ -358,58 +357,6 @@ self.vc_data_bind(e);
<v:template name="link_template" type="simple" enabled="-- equ(self.repl_snap_pull_stage, 2)">
<h3>Step 2: Choose Destinations Parameters</h3>
<v:form name="link2_form" action="db_repl_snap_pull_create.vspx" method="POST" type="simple">
- <div class="listing_top_ctl_grp">
- <v:text name="mass_tbq" xhtml_size="3" value="">
- <v:before-render>
- control.ufl_value := '';
- </v:before-render>
- </v:text>.
- <v:text name="mass_tbo" xhtml_size="15" value="">
- <v:before-render>
- control.ufl_value := '';
- </v:before-render>
- </v:text>.[TABLE]
- <v:button name="mass_set" action="simple" value="Set To All">
- <v:on-post>
- <![CDATA[
- declare i, l,dst_arr,tmp_arr any;
- declare _views integer;
- declare p1, p2, p3 varchar;
- _views := 0;
-
-
- if (self.mass_tbq.ufl_value <> '' or self.mass_tbo.ufl_value <> '') {
- _loop:;
- i := 0;
- dst_arr := self.selcust;
- l := length(dst_arr);
- while (i < l) {
- tmp_arr := dst_arr[i];
-
- p1 := name_part(tmp_arr, 0);
- p2 := name_part(tmp_arr, 1);
- p3 := name_part(tmp_arr, 2);
-
- if (self.mass_tbq.ufl_value <> '')
- p1 := self.mass_tbq.ufl_value;
- if (self.mass_tbo.ufl_value <> '')
- p2 := self.mass_tbo.ufl_value;
- aset(dst_arr,i,concat(p1,'.',p2,'.',p3));
- i:= i + 1;
- };
-
- self.selcustall := dst_arr;
- if (_views = 0)
- {
- _views := 1;
- goto _loop;
- };
- self.vc_data_bind(e);
- };
- ]]>
- </v:on-post>
- </v:button>
- </div>
<table class="listing" rules="groups">
<colgroup/><colgroup/>
<thead>
@@ -426,33 +373,14 @@ self.vc_data_bind(e);
while (_idx < length(self.selcust))
{
_tblname := self.selcust[_idx];
-
- declare l1 integer;
- declare _tblname2 any;
- declare _attached_name1, _attached_name2 varchar;
-
- l1 := length(self.selcustall);
-
- if (l1 )
- {
- _tblname2 := self.selcustall[_idx];
- _attached_name1 := name_part(_tblname2, 0);
- _attached_name2 := name_part(_tblname2, 1);
- }
- else
- {
- _attached_name1 := coalesce (user_get_option(connection_get ('vspx_user'),'LOGIN_QUALIFIER'), 'DB');
- _attached_name2 := connection_get ('vspx_user');
- };
-
_idx := _idx + 1;
self.r_count := self.r_count + 1;
http (sprintf ('<tr class="%s">', case when mod (self.r_count, 2) then 'listing_row_odd' else 'listing_row_even' end));
http ('<td class="listing_col"><img src="images/icons/table_16.png" alt="Table" title="Table"/></td>');
http(sprintf ('<td>%V</td>', _tblname));
http(sprintf ('<td><input type="checkbox" name="LTB_cr_%s" value="on" checked="checked"/>', _tblname));
- http(sprintf ('<input type="text" size="3" name="LTBQ_%s" value="%s"/>.', _tblname, _attached_name1));
- http(sprintf ('<input type="text" size="15" name="LTBO_%s" value="%s">.', _tblname, _attached_name2));
+ http(sprintf ('<input type="text" size="3" name="LTBQ_%s" value="%s"/>.', _tblname, coalesce (user_get_option(connection_get ('vspx_user'),'LOGIN_QUALIFIER'), 'DB')));
+ http(sprintf ('<input type="text" size="15" name="LTBO_%s" value="%s">.', _tblname, connection_get ('vspx_user')));
http(sprintf ('<input type="text" size="30" name="LTBN_%s" value="%s">', _tblname, name_part(_tblname, 2)));
http(sprintf ('<input type="hidden" name="tbls" value="%s"></td>', _tblname));
http('</tr>');
diff --git a/binsrc/yacutia/db_repl_snap_pull_start.vspx b/binsrc/yacutia/db_repl_snap_pull_start.vspx
index 26851ef..20305d8 100644
--- a/binsrc/yacutia/db_repl_snap_pull_start.vspx
+++ b/binsrc/yacutia/db_repl_snap_pull_start.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap_pull_start.vspx,v 1.2.2.4 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap_pull_start.vspx,v 1.2.2.3 2010/09/20 10:16:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_snap_start.vspx b/binsrc/yacutia/db_repl_snap_start.vspx
index 049e694..4c59d95 100644
--- a/binsrc/yacutia/db_repl_snap_start.vspx
+++ b/binsrc/yacutia/db_repl_snap_start.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_snap_start.vspx,v 1.2.2.4 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_snap_start.vspx,v 1.2.2.3 2010/09/20 10:16:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_sub.vspx b/binsrc/yacutia/db_repl_sub.vspx
index 301a341..b685d60 100644
--- a/binsrc/yacutia/db_repl_sub.vspx
+++ b/binsrc/yacutia/db_repl_sub.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: db_repl_sub.vspx,v 1.3.2.5 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_sub.vspx,v 1.3.2.4 2010/09/20 10:16:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_sub_create.vspx b/binsrc/yacutia/db_repl_sub_create.vspx
index b2db2d9..f3fc4e2 100644
--- a/binsrc/yacutia/db_repl_sub_create.vspx
+++ b/binsrc/yacutia/db_repl_sub_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_sub_create.vspx,v 1.4.2.6 2012/03/08 12:55:27 source Exp $
+ - $Id: db_repl_sub_create.vspx,v 1.4.2.5 2010/09/20 10:16:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_sub_edit.vspx b/binsrc/yacutia/db_repl_sub_edit.vspx
index 1651ab7..cf1b071 100644
--- a/binsrc/yacutia/db_repl_sub_edit.vspx
+++ b/binsrc/yacutia/db_repl_sub_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_sub_edit.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: db_repl_sub_edit.vspx,v 1.2.2.3 2010/09/20 10:16:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_sub_image.vspx b/binsrc/yacutia/db_repl_sub_image.vspx
index 5ab41a9..e35caef 100644
--- a/binsrc/yacutia/db_repl_sub_image.vspx
+++ b/binsrc/yacutia/db_repl_sub_image.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: db_repl_sub_image.vspx,v 1.2.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: db_repl_sub_image.vspx,v 1.2.2.4 2011/09/09 13:21:28 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_sub_new_inc.vspx b/binsrc/yacutia/db_repl_sub_new_inc.vspx
index 2ce060e..49196cd 100644
--- a/binsrc/yacutia/db_repl_sub_new_inc.vspx
+++ b/binsrc/yacutia/db_repl_sub_new_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: db_repl_sub_new_inc.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: db_repl_sub_new_inc.vspx,v 1.2.2.3 2010/09/20 10:16:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/db_repl_trans.vspx b/binsrc/yacutia/db_repl_trans.vspx
index f11a1f8..8d031b5 100644
--- a/binsrc/yacutia/db_repl_trans.vspx
+++ b/binsrc/yacutia/db_repl_trans.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: db_repl_trans.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: db_repl_trans.vspx,v 1.2.2.3 2010/09/20 10:16:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/error.vspx b/binsrc/yacutia/error.vspx
index 2a1377a..35cca06 100644
--- a/binsrc/yacutia/error.vspx
+++ b/binsrc/yacutia/error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: error.vspx,v 1.4.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: error.vspx,v 1.4.2.3 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/fb_popup.vspx b/binsrc/yacutia/fb_popup.vspx
index 3e40285..627a821 100644
--- a/binsrc/yacutia/fb_popup.vspx
+++ b/binsrc/yacutia/fb_popup.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: fb_popup.vspx,v 1.1.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: fb_popup.vspx,v 1.1.2.2 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/file_browser.xsl b/binsrc/yacutia/file_browser.xsl
index 50b6732..dfd3e94 100644
--- a/binsrc/yacutia/file_browser.xsl
+++ b/binsrc/yacutia/file_browser.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: file_browser.xsl,v 1.4.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: file_browser.xsl,v 1.4.2.3 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/file_save.vsp b/binsrc/yacutia/file_save.vsp
index 2170bd8..4248979 100644
--- a/binsrc/yacutia/file_save.vsp
+++ b/binsrc/yacutia/file_save.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: file_save.vsp,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+-- $Id: file_save.vsp,v 1.3.2.3 2010/09/20 10:16:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/form.xsl b/binsrc/yacutia/form.xsl
index 60b7ccb..14f1472 100644
--- a/binsrc/yacutia/form.xsl
+++ b/binsrc/yacutia/form.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: form.xsl,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: form.xsl,v 1.2.2.2 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help.vspx b/binsrc/yacutia/help.vspx
index 8576b80..ddf05fc 100644
--- a/binsrc/yacutia/help.vspx
+++ b/binsrc/yacutia/help.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: help.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: help.vspx,v 1.3.2.3 2011/01/25 14:21:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help.xsl b/binsrc/yacutia/help.xsl
index ecebecd..4cc1c69 100644
--- a/binsrc/yacutia/help.xsl
+++ b/binsrc/yacutia/help.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: help.xsl,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: help.xsl,v 1.2.2.2 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/account_create.xml b/binsrc/yacutia/help/account_create.xml
index 41775a3..8d7cd1c 100644
--- a/binsrc/yacutia/help/account_create.xml
+++ b/binsrc/yacutia/help/account_create.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/caps_browser.xml b/binsrc/yacutia/help/caps_browser.xml
index 7206129..f39a06d 100644
--- a/binsrc/yacutia/help/caps_browser.xml
+++ b/binsrc/yacutia/help/caps_browser.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/dav_browser_search.xml b/binsrc/yacutia/help/dav_browser_search.xml
index 5579397..d1b746c 100644
--- a/binsrc/yacutia/help/dav_browser_search.xml
+++ b/binsrc/yacutia/help/dav_browser_search.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/http_server_management.xml b/binsrc/yacutia/help/http_server_management.xml
index ce4e177..160e3b9 100644
--- a/binsrc/yacutia/help/http_server_management.xml
+++ b/binsrc/yacutia/help/http_server_management.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/inifile.xml b/binsrc/yacutia/help/inifile.xml
index 93bb836..d4cebaa 100644
--- a/binsrc/yacutia/help/inifile.xml
+++ b/binsrc/yacutia/help/inifile.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/sec_auth_serv.xml b/binsrc/yacutia/help/sec_auth_serv.xml
index f95eb4b..2357017 100644
--- a/binsrc/yacutia/help/sec_auth_serv.xml
+++ b/binsrc/yacutia/help/sec_auth_serv.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/soap_services.xml b/binsrc/yacutia/help/soap_services.xml
index 2ffde6f..8006d76 100644
--- a/binsrc/yacutia/help/soap_services.xml
+++ b/binsrc/yacutia/help/soap_services.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/soap_services_edit.xml b/binsrc/yacutia/help/soap_services_edit.xml
index 900eb22..b1f04fb 100644
--- a/binsrc/yacutia/help/soap_services_edit.xml
+++ b/binsrc/yacutia/help/soap_services_edit.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/url_rewrite.xml b/binsrc/yacutia/help/url_rewrite.xml
index 50b0f45..3a96b40 100644
--- a/binsrc/yacutia/help/url_rewrite.xml
+++ b/binsrc/yacutia/help/url_rewrite.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/vdb_obj_link_opts.xml b/binsrc/yacutia/help/vdb_obj_link_opts.xml
index 9474e50..48e83ff 100644
--- a/binsrc/yacutia/help/vdb_obj_link_opts.xml
+++ b/binsrc/yacutia/help/vdb_obj_link_opts.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/help/xquery.xml b/binsrc/yacutia/help/xquery.xml
index 9298b2b..4bcce0c 100644
--- a/binsrc/yacutia/help/xquery.xml
+++ b/binsrc/yacutia/help/xquery.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/hosted_grant.vspx b/binsrc/yacutia/hosted_grant.vspx
index 5d4ceaf..a29ad03 100644
--- a/binsrc/yacutia/hosted_grant.vspx
+++ b/binsrc/yacutia/hosted_grant.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hosted_grant.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: hosted_grant.vspx,v 1.3.2.3 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/hosted_import.vspx b/binsrc/yacutia/hosted_import.vspx
index 246199a..bf36e1a 100644
--- a/binsrc/yacutia/hosted_import.vspx
+++ b/binsrc/yacutia/hosted_import.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hosted_import.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: hosted_import.vspx,v 1.3.2.3 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/hosted_modules.vspx b/binsrc/yacutia/hosted_modules.vspx
index 6d14e52..cebd871 100644
--- a/binsrc/yacutia/hosted_modules.vspx
+++ b/binsrc/yacutia/hosted_modules.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hosted_modules.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: hosted_modules.vspx,v 1.3.2.3 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/hosted_modules_load_results.vspx b/binsrc/yacutia/hosted_modules_load_results.vspx
index 4578682..06d5fb1 100644
--- a/binsrc/yacutia/hosted_modules_load_results.vspx
+++ b/binsrc/yacutia/hosted_modules_load_results.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hosted_modules_load_results.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: hosted_modules_load_results.vspx,v 1.2.2.2 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/hosted_modules_select.vspx b/binsrc/yacutia/hosted_modules_select.vspx
index 5a0461a..414d4db 100644
--- a/binsrc/yacutia/hosted_modules_select.vspx
+++ b/binsrc/yacutia/hosted_modules_select.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hosted_modules_select.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: hosted_modules_select.vspx,v 1.2.2.2 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/hosted_modules_select2.vspx b/binsrc/yacutia/hosted_modules_select2.vspx
index 5e9000a..832eadb 100644
--- a/binsrc/yacutia/hosted_modules_select2.vspx
+++ b/binsrc/yacutia/hosted_modules_select2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hosted_modules_select2.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: hosted_modules_select2.vspx,v 1.3.2.2 2010/09/20 10:16:42 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/hosted_modules_show_sql.vsp b/binsrc/yacutia/hosted_modules_show_sql.vsp
index ee86cc3..023fe96 100644
--- a/binsrc/yacutia/hosted_modules_show_sql.vsp
+++ b/binsrc/yacutia/hosted_modules_show_sql.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: hosted_modules_show_sql.vsp,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+-- $Id: hosted_modules_show_sql.vsp,v 1.2.2.2 2010/09/20 10:16:43 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/hosted_page.vspx b/binsrc/yacutia/hosted_page.vspx
index 0c7ebba..173f2a1 100644
--- a/binsrc/yacutia/hosted_page.vspx
+++ b/binsrc/yacutia/hosted_page.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: hosted_page.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: hosted_page.vspx,v 1.2.2.3 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_add_path.vspx b/binsrc/yacutia/http_add_path.vspx
index 3fdaa63..65613fa 100644
--- a/binsrc/yacutia/http_add_path.vspx
+++ b/binsrc/yacutia/http_add_path.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: http_add_path.vspx,v 1.5.2.6 2012/03/08 12:55:28 source Exp $
+ - $Id: http_add_path.vspx,v 1.5.2.5 2010/11/19 16:43:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_del_path.vspx b/binsrc/yacutia/http_del_path.vspx
index 23dfc33..727007e 100644
--- a/binsrc/yacutia/http_del_path.vspx
+++ b/binsrc/yacutia/http_del_path.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: http_del_path.vspx,v 1.4.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: http_del_path.vspx,v 1.4.2.4 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_edit_paths.vspx b/binsrc/yacutia/http_edit_paths.vspx
index b7e7039..a45b1aa 100644
--- a/binsrc/yacutia/http_edit_paths.vspx
+++ b/binsrc/yacutia/http_edit_paths.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: http_edit_paths.vspx,v 1.5.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: http_edit_paths.vspx,v 1.5.2.4 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_host_clone.vspx b/binsrc/yacutia/http_host_clone.vspx
index b5719d5..935d78e 100644
--- a/binsrc/yacutia/http_host_clone.vspx
+++ b/binsrc/yacutia/http_host_clone.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: http_host_clone.vspx,v 1.7.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: http_host_clone.vspx,v 1.7.2.4 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_host_edit.vspx b/binsrc/yacutia/http_host_edit.vspx
index ae87cae..b948266 100644
--- a/binsrc/yacutia/http_host_edit.vspx
+++ b/binsrc/yacutia/http_host_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: http_host_edit.vspx,v 1.7.2.9 2012/03/08 12:55:28 source Exp $
+ - $Id: http_host_edit.vspx,v 1.7.2.8 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_listeners.vspx b/binsrc/yacutia/http_listeners.vspx
index 451457a..759666b 100644
--- a/binsrc/yacutia/http_listeners.vspx
+++ b/binsrc/yacutia/http_listeners.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: http_listeners.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: http_listeners.vspx,v 1.2.2.3 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_serv_mgmt.vspx b/binsrc/yacutia/http_serv_mgmt.vspx
index 5f45714..342c8e0 100644
--- a/binsrc/yacutia/http_serv_mgmt.vspx
+++ b/binsrc/yacutia/http_serv_mgmt.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: http_serv_mgmt.vspx,v 1.14.2.8 2012/03/08 12:55:28 source Exp $
+ - $Id: http_serv_mgmt.vspx,v 1.14.2.7 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_serv_monitoring.vspx b/binsrc/yacutia/http_serv_monitoring.vspx
index a3480d6..0b0d8c6 100644
--- a/binsrc/yacutia/http_serv_monitoring.vspx
+++ b/binsrc/yacutia/http_serv_monitoring.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: http_serv_monitoring.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: http_serv_monitoring.vspx,v 1.3.2.2 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_tcn.vspx b/binsrc/yacutia/http_tcn.vspx
index b2e019b..f270e9f 100644
--- a/binsrc/yacutia/http_tcn.vspx
+++ b/binsrc/yacutia/http_tcn.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: http_tcn.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: http_tcn.vspx,v 1.2.2.2 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/http_url_rewrite.vspx b/binsrc/yacutia/http_url_rewrite.vspx
index 6e0cf19..d42088a 100644
--- a/binsrc/yacutia/http_url_rewrite.vspx
+++ b/binsrc/yacutia/http_url_rewrite.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: http_url_rewrite.vspx,v 1.14.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: http_url_rewrite.vspx,v 1.14.2.3 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ie.vspx b/binsrc/yacutia/ie.vspx
index 12fbd69..78f9664 100644
--- a/binsrc/yacutia/ie.vspx
+++ b/binsrc/yacutia/ie.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ie.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: ie.vspx,v 1.2.2.3 2010/09/20 10:16:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ie_browser.vspx b/binsrc/yacutia/ie_browser.vspx
index 52c0f13..01dd0df 100644
--- a/binsrc/yacutia/ie_browser.vspx
+++ b/binsrc/yacutia/ie_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ie_browser.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: ie_browser.vspx,v 1.3.2.2 2010/09/20 10:16:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ie_export.vspx b/binsrc/yacutia/ie_export.vspx
index b757231..ea753c7 100644
--- a/binsrc/yacutia/ie_export.vspx
+++ b/binsrc/yacutia/ie_export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ie_export.vspx,v 1.4.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: ie_export.vspx,v 1.4.2.3 2010/09/20 10:16:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ie_import.vspx b/binsrc/yacutia/ie_import.vspx
index fee7df0..c267284 100644
--- a/binsrc/yacutia/ie_import.vspx
+++ b/binsrc/yacutia/ie_import.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ie_import.vspx,v 1.4.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: ie_import.vspx,v 1.4.2.3 2010/09/20 10:16:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/import_csv_1.vspx b/binsrc/yacutia/import_csv_1.vspx
index fcc2fdc..071e324 100644
--- a/binsrc/yacutia/import_csv_1.vspx
+++ b/binsrc/yacutia/import_csv_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: import_csv_1.vspx,v 1.1.2.7 2012/03/08 12:55:28 source Exp $
+ - $Id: import_csv_1.vspx,v 1.1.2.6 2010/09/20 10:16:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/yacutia/import_csv_2.vspx b/binsrc/yacutia/import_csv_2.vspx
index 5cacb1e..b7a6427 100644
--- a/binsrc/yacutia/import_csv_2.vspx
+++ b/binsrc/yacutia/import_csv_2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: import_csv_2.vspx,v 1.1.2.8 2012/03/08 12:55:28 source Exp $
+ - $Id: import_csv_2.vspx,v 1.1.2.7 2011/05/20 11:49:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/yacutia/import_csv_3.vspx b/binsrc/yacutia/import_csv_3.vspx
index 7a88b5b..a952e84 100644
--- a/binsrc/yacutia/import_csv_3.vspx
+++ b/binsrc/yacutia/import_csv_3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: import_csv_3.vspx,v 1.1.2.7 2012/03/08 12:55:28 source Exp $
+ - $Id: import_csv_3.vspx,v 1.1.2.6 2011/05/20 11:49:34 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/yacutia/import_csv_opts.vspx b/binsrc/yacutia/import_csv_opts.vspx
index d496a72..7b1c2ce 100644
--- a/binsrc/yacutia/import_csv_opts.vspx
+++ b/binsrc/yacutia/import_csv_opts.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: import_csv_opts.vspx,v 1.1.2.8 2012/03/08 12:55:28 source Exp $
+ - $Id: import_csv_opts.vspx,v 1.1.2.7 2011/03/23 12:03:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/yacutia/inifile.vspx b/binsrc/yacutia/inifile.vspx
index bbd684e..e46537c 100644
--- a/binsrc/yacutia/inifile.vspx
+++ b/binsrc/yacutia/inifile.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: inifile.vspx,v 1.3.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile.vspx,v 1.3.2.4 2011/01/25 14:21:43 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile.xml b/binsrc/yacutia/inifile.xml
index c2c9498..5908b27 100644
--- a/binsrc/yacutia/inifile.xml
+++ b/binsrc/yacutia/inifile.xml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: inifile.xml,v 1.1.1.1.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile.xml,v 1.1.1.1.2.3 2010/09/20 10:16:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile.xsl b/binsrc/yacutia/inifile.xsl
index e15d00c..4ea8848 100644
--- a/binsrc/yacutia/inifile.xsl
+++ b/binsrc/yacutia/inifile.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile.xsl,v 1.4.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile.xsl,v 1.4.2.2 2010/09/20 10:16:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_autorepair.vspx b/binsrc/yacutia/inifile_autorepair.vspx
index 2f8c79b..f31ba57 100644
--- a/binsrc/yacutia/inifile_autorepair.vspx
+++ b/binsrc/yacutia/inifile_autorepair.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile_autorepair.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_autorepair.vspx,v 1.2.2.2 2010/09/20 10:16:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_autorepair_inc.vspx b/binsrc/yacutia/inifile_autorepair_inc.vspx
index 7fae787..3b32434 100644
--- a/binsrc/yacutia/inifile_autorepair_inc.vspx
+++ b/binsrc/yacutia/inifile_autorepair_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: inifile_autorepair_inc.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_autorepair_inc.vspx,v 1.3.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_client.vspx b/binsrc/yacutia/inifile_client.vspx
index 62c4575..0d376db 100644
--- a/binsrc/yacutia/inifile_client.vspx
+++ b/binsrc/yacutia/inifile_client.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile_client.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_client.vspx,v 1.2.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_client_inc.vspx b/binsrc/yacutia/inifile_client_inc.vspx
index 82cd339..a7958cb 100644
--- a/binsrc/yacutia/inifile_client_inc.vspx
+++ b/binsrc/yacutia/inifile_client_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: inifile_client_inc.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_client_inc.vspx,v 1.3.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_database.vspx b/binsrc/yacutia/inifile_database.vspx
index b5fcabb..43b15d4 100644
--- a/binsrc/yacutia/inifile_database.vspx
+++ b/binsrc/yacutia/inifile_database.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile_database.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_database.vspx,v 1.2.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_database_inc.vspx b/binsrc/yacutia/inifile_database_inc.vspx
index c9dbc0c..748309e 100644
--- a/binsrc/yacutia/inifile_database_inc.vspx
+++ b/binsrc/yacutia/inifile_database_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: inifile_database_inc.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_database_inc.vspx,v 1.3.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_engine.vspx b/binsrc/yacutia/inifile_engine.vspx
index ef59ac3..c69d98d 100644
--- a/binsrc/yacutia/inifile_engine.vspx
+++ b/binsrc/yacutia/inifile_engine.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile_engine.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_engine.vspx,v 1.2.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_engine_inc.vspx b/binsrc/yacutia/inifile_engine_inc.vspx
index 331fe4f..57b2e72 100644
--- a/binsrc/yacutia/inifile_engine_inc.vspx
+++ b/binsrc/yacutia/inifile_engine_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: inifile_engine_inc.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_engine_inc.vspx,v 1.2.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_http.vspx b/binsrc/yacutia/inifile_http.vspx
index 408a10d..d939d3e 100644
--- a/binsrc/yacutia/inifile_http.vspx
+++ b/binsrc/yacutia/inifile_http.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile_http.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_http.vspx,v 1.2.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_http_inc.vspx b/binsrc/yacutia/inifile_http_inc.vspx
index 13a3819..71219b9 100644
--- a/binsrc/yacutia/inifile_http_inc.vspx
+++ b/binsrc/yacutia/inifile_http_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: inifile_http_inc.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_http_inc.vspx,v 1.2.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_metadata.xml b/binsrc/yacutia/inifile_metadata.xml
index aa6df27..b03a0ae 100644
--- a/binsrc/yacutia/inifile_metadata.xml
+++ b/binsrc/yacutia/inifile_metadata.xml
@@ -1,11 +1,11 @@
<!--
-
- - $Id: inifile_metadata.xml,v 1.1.1.1.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_metadata.xml,v 1.1.1.1.2.3 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_repl.vspx b/binsrc/yacutia/inifile_repl.vspx
index 86d7e62..1ca9069 100644
--- a/binsrc/yacutia/inifile_repl.vspx
+++ b/binsrc/yacutia/inifile_repl.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile_repl.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_repl.vspx,v 1.2.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_repl_inc.vspx b/binsrc/yacutia/inifile_repl_inc.vspx
index c805e95..a471002 100644
--- a/binsrc/yacutia/inifile_repl_inc.vspx
+++ b/binsrc/yacutia/inifile_repl_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: inifile_repl_inc.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_repl_inc.vspx,v 1.3.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_style.xsl b/binsrc/yacutia/inifile_style.xsl
index 87d33e4..22f7c9e 100644
--- a/binsrc/yacutia/inifile_style.xsl
+++ b/binsrc/yacutia/inifile_style.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile_style.xsl,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_style.xsl,v 1.3.2.2 2010/09/20 10:16:45 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_vdb.vspx b/binsrc/yacutia/inifile_vdb.vspx
index c82dede..cf2af57 100644
--- a/binsrc/yacutia/inifile_vdb.vspx
+++ b/binsrc/yacutia/inifile_vdb.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: inifile_vdb.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_vdb.vspx,v 1.2.2.2 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifile_vdb_inc.vspx b/binsrc/yacutia/inifile_vdb_inc.vspx
index cd5cd4a..bb95261 100644
--- a/binsrc/yacutia/inifile_vdb_inc.vspx
+++ b/binsrc/yacutia/inifile_vdb_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: inifile_vdb_inc.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: inifile_vdb_inc.vspx,v 1.3.2.2 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/inifiles_load.sql b/binsrc/yacutia/inifiles_load.sql
index ec45dea..7f6550b 100644
--- a/binsrc/yacutia/inifiles_load.sql
+++ b/binsrc/yacutia/inifiles_load.sql
@@ -1,10 +1,10 @@
--
--- $Id: inifiles_load.sql,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+-- $Id: inifiles_load.sql,v 1.2.2.2 2010/09/20 10:16:46 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/isql.vspx b/binsrc/yacutia/isql.vspx
index 9af305a..25d3281 100644
--- a/binsrc/yacutia/isql.vspx
+++ b/binsrc/yacutia/isql.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: isql.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: isql.vspx,v 1.2.2.3 2011/02/16 20:45:16 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/isql_main.vspx b/binsrc/yacutia/isql_main.vspx
index 750b297..b36b55a 100644
--- a/binsrc/yacutia/isql_main.vspx
+++ b/binsrc/yacutia/isql_main.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: isql_main.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: isql_main.vspx,v 1.2.2.2 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/isql_main_inc.vspx b/binsrc/yacutia/isql_main_inc.vspx
index 7a97b6c..d3a0a83 100644
--- a/binsrc/yacutia/isql_main_inc.vspx
+++ b/binsrc/yacutia/isql_main_inc.vspx
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: isql_main_inc.vspx,v 1.4.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: isql_main_inc.vspx,v 1.4.2.4 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ldap_import.vspx b/binsrc/yacutia/ldap_import.vspx
index dffa549..e8f2bcd 100644
--- a/binsrc/yacutia/ldap_import.vspx
+++ b/binsrc/yacutia/ldap_import.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ldap_import.vspx,v 1.2.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: ldap_import.vspx,v 1.2.2.4 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ldap_import_1.vspx b/binsrc/yacutia/ldap_import_1.vspx
index 48bc9a8..c94f590 100644
--- a/binsrc/yacutia/ldap_import_1.vspx
+++ b/binsrc/yacutia/ldap_import_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ldap_import_1.vspx,v 1.2.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: ldap_import_1.vspx,v 1.2.2.4 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ldap_import_2.vspx b/binsrc/yacutia/ldap_import_2.vspx
index 3f92f19..28e3a48 100644
--- a/binsrc/yacutia/ldap_import_2.vspx
+++ b/binsrc/yacutia/ldap_import_2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ldap_import_2.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: ldap_import_2.vspx,v 1.2.2.3 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ldap_import_3.vspx b/binsrc/yacutia/ldap_import_3.vspx
index 9f0d01c..7cf63be 100644
--- a/binsrc/yacutia/ldap_import_3.vspx
+++ b/binsrc/yacutia/ldap_import_3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: ldap_import_3.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: ldap_import_3.vspx,v 1.3.2.3 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/ldap_server.vspx b/binsrc/yacutia/ldap_server.vspx
index e83cac5..c50645f 100644
--- a/binsrc/yacutia/ldap_server.vspx
+++ b/binsrc/yacutia/ldap_server.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: ldap_server.vspx,v 1.3.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: ldap_server.vspx,v 1.3.2.4 2010/09/20 10:16:46 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/link_tables.js b/binsrc/yacutia/link_tables.js
index f835f1d..99708f5 100644
--- a/binsrc/yacutia/link_tables.js
+++ b/binsrc/yacutia/link_tables.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging.vspx b/binsrc/yacutia/logging.vspx
index c53d787..d0cad3e 100644
--- a/binsrc/yacutia/logging.vspx
+++ b/binsrc/yacutia/logging.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_cli.vspx b/binsrc/yacutia/logging_cli.vspx
index 7a5ba23..d583d3d 100644
--- a/binsrc/yacutia/logging_cli.vspx
+++ b/binsrc/yacutia/logging_cli.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: logging_cli.vspx,v 1.1.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_cli.vspx,v 1.1.2.2 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_db.vspx b/binsrc/yacutia/logging_db.vspx
index 286c5a2..fc4db56 100644
--- a/binsrc/yacutia/logging_db.vspx
+++ b/binsrc/yacutia/logging_db.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging_db.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_db.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_disk.vspx b/binsrc/yacutia/logging_disk.vspx
index 1b07060..afed50f 100644
--- a/binsrc/yacutia/logging_disk.vspx
+++ b/binsrc/yacutia/logging_disk.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging_disk.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_disk.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_http.vspx b/binsrc/yacutia/logging_http.vspx
index de93c3b..e4b4218 100644
--- a/binsrc/yacutia/logging_http.vspx
+++ b/binsrc/yacutia/logging_http.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging_http.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_http.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_index.vspx b/binsrc/yacutia/logging_index.vspx
index 3bc6aca..4931caa 100644
--- a/binsrc/yacutia/logging_index.vspx
+++ b/binsrc/yacutia/logging_index.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging_index.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_index.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_lock.vspx b/binsrc/yacutia/logging_lock.vspx
index 5b17eec..c704ac4 100644
--- a/binsrc/yacutia/logging_lock.vspx
+++ b/binsrc/yacutia/logging_lock.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: logging_lock.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_lock.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_page.vspx b/binsrc/yacutia/logging_page.vspx
index 6c1fc0c..c2fd10b 100644
--- a/binsrc/yacutia/logging_page.vspx
+++ b/binsrc/yacutia/logging_page.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging_page.vspx,v 1.4.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_page.vspx,v 1.4.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_prof.vspx b/binsrc/yacutia/logging_prof.vspx
index 5a3f415..3410bc3 100644
--- a/binsrc/yacutia/logging_prof.vspx
+++ b/binsrc/yacutia/logging_prof.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging_prof.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_prof.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_space.vspx b/binsrc/yacutia/logging_space.vspx
index 0320048..580c863 100644
--- a/binsrc/yacutia/logging_space.vspx
+++ b/binsrc/yacutia/logging_space.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging_space.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_space.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_tab.vspx b/binsrc/yacutia/logging_tab.vspx
index 0faaaee..6a6c330 100644
--- a/binsrc/yacutia/logging_tab.vspx
+++ b/binsrc/yacutia/logging_tab.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: logging_tab.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_tab.vspx,v 1.3.2.2 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_tab.xsl b/binsrc/yacutia/logging_tab.xsl
index 9cc4020..1837641 100644
--- a/binsrc/yacutia/logging_tab.xsl
+++ b/binsrc/yacutia/logging_tab.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
-
- - $Id: logging_tab.xsl,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_tab.xsl,v 1.2.2.2 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/logging_view.vspx b/binsrc/yacutia/logging_view.vspx
index 3ef9c63..62afb5f 100644
--- a/binsrc/yacutia/logging_view.vspx
+++ b/binsrc/yacutia/logging_view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: logging_view.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: logging_view.vspx,v 1.3.2.3 2010/09/20 10:16:47 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/main_tabs.vspx b/binsrc/yacutia/main_tabs.vspx
index 28f12c7..c42a847 100644
--- a/binsrc/yacutia/main_tabs.vspx
+++ b/binsrc/yacutia/main_tabs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: main_tabs.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: main_tabs.vspx,v 1.3.2.2 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/make.xsl b/binsrc/yacutia/make.xsl
index 09e2800..e8e69da 100644
--- a/binsrc/yacutia/make.xsl
+++ b/binsrc/yacutia/make.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: make.xsl,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: make.xsl,v 1.2.2.2 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/mapped_schema_xml.vspx b/binsrc/yacutia/mapped_schema_xml.vspx
index 9cdebc0..cdfe5b9 100644
--- a/binsrc/yacutia/mapped_schema_xml.vspx
+++ b/binsrc/yacutia/mapped_schema_xml.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: mapped_schema_xml.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: mapped_schema_xml.vspx,v 1.3.2.2 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/merge.xsl b/binsrc/yacutia/merge.xsl
index ed76e0e..a2f3764 100644
--- a/binsrc/yacutia/merge.xsl
+++ b/binsrc/yacutia/merge.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: merge.xsl,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: merge.xsl,v 1.2.2.2 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/mkvad.sh b/binsrc/yacutia/mkvad.sh
index f4e593d..ad25cff 100755
--- a/binsrc/yacutia/mkvad.sh
+++ b/binsrc/yacutia/mkvad.sh
@@ -2,14 +2,14 @@
#
# mkvad.sh
#
-# $Id: mkvad.sh,v 1.20.2.11 2012/03/08 12:55:28 source Exp $
+# $Id: mkvad.sh,v 1.20.2.9 2011/10/13 18:33:27 source Exp $
#
# Creates a vad package for Virtuoso Conductor
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -304,7 +304,7 @@ echo " <caption>" >> $STICKER
echo " <name package=\"conductor\">" >> $STICKER
echo " <prop name=\"Title\" value=\"Virtuoso Conductor\"/>" >> $STICKER
echo " <prop name=\"Developer\" value=\"OpenLink Software\"/>" >> $STICKER
-echo " <prop name=\"Copyright\" value=\"(C) 1998-2012 OpenLink Software\"/>" >> $STICKER
+echo " <prop name=\"Copyright\" value=\"(C) 1998-2011 OpenLink Software\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.com/virtuoso/conductor/download\"/>" >> $STICKER
echo " <prop name=\"Download\" value=\"http://www.openlinksw.co.uk/virtuoso/conductor/download\"/>" >> $STICKER
echo " </name>" >> $STICKER
diff --git a/binsrc/yacutia/mkvad.sql b/binsrc/yacutia/mkvad.sql
index 97cab27..4b5e1bb 100644
--- a/binsrc/yacutia/mkvad.sql
+++ b/binsrc/yacutia/mkvad.sql
@@ -1,10 +1,10 @@
--
--- $Id: mkvad.sql,v 1.1.1.1.2.4 2012/03/08 12:55:28 source Exp $
+-- $Id: mkvad.sql,v 1.1.1.1.2.3 2010/09/20 10:16:48 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/mm_menu1.js b/binsrc/yacutia/mm_menu1.js
index bace2d3..7c74e89 100644
--- a/binsrc/yacutia/mm_menu1.js
+++ b/binsrc/yacutia/mm_menu1.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_conf.vspx b/binsrc/yacutia/msg_news_conf.vspx
index d93248a..96795a8 100644
--- a/binsrc/yacutia/msg_news_conf.vspx
+++ b/binsrc/yacutia/msg_news_conf.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: msg_news_conf.vspx,v 1.4.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_conf.vspx,v 1.4.2.3 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_conf_global.vspx b/binsrc/yacutia/msg_news_conf_global.vspx
index 4e2395e..3ba905a 100644
--- a/binsrc/yacutia/msg_news_conf_global.vspx
+++ b/binsrc/yacutia/msg_news_conf_global.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: msg_news_conf_global.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_conf_global.vspx,v 1.3.2.3 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_group_info.vspx b/binsrc/yacutia/msg_news_group_info.vspx
index 49b271a..0438f59 100644
--- a/binsrc/yacutia/msg_news_group_info.vspx
+++ b/binsrc/yacutia/msg_news_group_info.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: msg_news_group_info.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_group_info.vspx,v 1.2.2.2 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_group_message_body.vspx b/binsrc/yacutia/msg_news_group_message_body.vspx
index f12e250..11841aa 100644
--- a/binsrc/yacutia/msg_news_group_message_body.vspx
+++ b/binsrc/yacutia/msg_news_group_message_body.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: msg_news_group_message_body.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_group_message_body.vspx,v 1.2.2.3 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_group_messages.vspx b/binsrc/yacutia/msg_news_group_messages.vspx
index 295a747..8c122fb 100644
--- a/binsrc/yacutia/msg_news_group_messages.vspx
+++ b/binsrc/yacutia/msg_news_group_messages.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: msg_news_group_messages.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_group_messages.vspx,v 1.2.2.3 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_group_messages_list.vspx b/binsrc/yacutia/msg_news_group_messages_list.vspx
index bc55fd1..13fe0de 100644
--- a/binsrc/yacutia/msg_news_group_messages_list.vspx
+++ b/binsrc/yacutia/msg_news_group_messages_list.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: msg_news_group_messages_list.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_group_messages_list.vspx,v 1.2.2.2 2010/09/20 10:16:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_group_subscribe.vspx b/binsrc/yacutia/msg_news_group_subscribe.vspx
index 195dda8..726ac6f 100644
--- a/binsrc/yacutia/msg_news_group_subscribe.vspx
+++ b/binsrc/yacutia/msg_news_group_subscribe.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: msg_news_group_subscribe.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_group_subscribe.vspx,v 1.2.2.3 2010/09/20 10:16:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_groups.vspx b/binsrc/yacutia/msg_news_groups.vspx
index 23f7223..5f2c581 100644
--- a/binsrc/yacutia/msg_news_groups.vspx
+++ b/binsrc/yacutia/msg_news_groups.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: msg_news_groups.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_groups.vspx,v 1.2.2.3 2010/09/20 10:16:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_server_details.vspx b/binsrc/yacutia/msg_news_server_details.vspx
index 0471434..f7537cd 100644
--- a/binsrc/yacutia/msg_news_server_details.vspx
+++ b/binsrc/yacutia/msg_news_server_details.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: msg_news_server_details.vspx,v 1.4.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_server_details.vspx,v 1.4.2.2 2010/09/20 10:16:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/msg_news_server_info.vspx b/binsrc/yacutia/msg_news_server_info.vspx
index 283fbec..6ea0810 100644
--- a/binsrc/yacutia/msg_news_server_info.vspx
+++ b/binsrc/yacutia/msg_news_server_info.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: msg_news_server_info.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: msg_news_server_info.vspx,v 1.2.2.2 2010/09/20 10:16:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/page.xsl b/binsrc/yacutia/page.xsl
index 9da5c75..02fbad6 100644
--- a/binsrc/yacutia/page.xsl
+++ b/binsrc/yacutia/page.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: page.xsl,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: page.xsl,v 1.3.2.2 2010/09/20 10:16:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/persistent_xmlns.vspx b/binsrc/yacutia/persistent_xmlns.vspx
index 34a02c6..799bd4c 100644
--- a/binsrc/yacutia/persistent_xmlns.vspx
+++ b/binsrc/yacutia/persistent_xmlns.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: persistent_xmlns.vspx,v 1.1.4.4 2012/03/08 12:55:28 source Exp $
+ - $Id: persistent_xmlns.vspx,v 1.1.4.3 2010/09/20 10:16:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/yacutia/popup2_browser.vspx b/binsrc/yacutia/popup2_browser.vspx
index 435e7c1..7606c5d 100644
--- a/binsrc/yacutia/popup2_browser.vspx
+++ b/binsrc/yacutia/popup2_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: popup2_browser.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: popup2_browser.vspx,v 1.2.2.2 2010/09/20 10:16:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/popup_browser.vspx b/binsrc/yacutia/popup_browser.vspx
index 32e84e3..7178d74 100644
--- a/binsrc/yacutia/popup_browser.vspx
+++ b/binsrc/yacutia/popup_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: popup_browser.vspx,v 1.2.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: popup_browser.vspx,v 1.2.2.4 2010/09/20 10:16:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/r2rml_gen.vspx b/binsrc/yacutia/r2rml_gen.vspx
deleted file mode 100644
index 4365c49..0000000
--- a/binsrc/yacutia/r2rml_gen.vspx
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: r2rml_gen.vspx,v 1.1.2.2 2012/03/08 12:55:28 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
- -
- -
--->
-<v:page name="sparql_create_page"
- decor="yacutia_decor.vspx"
- style="yacutia_style.xsl"
- vm:owner="yacutia_sparql_page"
- doctype="-//W3C//DTD XHTML 1.0 Transitional//EN"
- fast-render="1" xmlns:v="http://www.openlinksw.com/vspx/"
- xmlns:vm="http://www.openlinksw.com/vspx/macro">
- <vm:pagetitle>R2RML Generate</vm:pagetitle>
- <vm:pagewrapper>
- <vm:variables>
- <v:variable name="message" default="null" type="varchar" persist="0"/>
- <v:variable name="graph" default="null" type="varchar" persist="0" param-name="graph"/>
- <v:variable name="tgraph1" default="null" type="varchar" persist="0" />
- <v:variable name="pgraph1" default="null" type="varchar" persist="0" />
- <v:variable name="exec_ret" type="any" default="null" persist="temp"/>
- <v:variable name="sync_ret" type="any" default="null" persist="temp"/>
- <v:variable persist="0" name="body_v" type="any" default="null" param-name="cr_view"/>
- </vm:variables>
- <vm:menu>
- <vm:menuitem value="Linked Data"/>
- </vm:menu>
- <vm:header caption="R2RML Generate"/>
- <vm:pagebody>
- <v:on-init>
- <![CDATA[
- set http_charset='utf-8';
- ]]>
- </v:on-init>
- <v:form name="form1" type="simple" method="POST" action="" xhtml_enctype="multipart/form-data">
- <v:before-data-bind><![CDATA[
- declare h any;
- h := rfc1808_parse_uri (self.graph);
- self.tgraph1 := self.graph || '#';
- self.pgraph1 := sprintf ('urn:%{URIQADefaultHost}s:%s', trim (replace (h[2], '/', ':'), ':'));
- self.body_v := DB.DBA.R2RML_MAKE_QM_FROM_G (self.graph, self.tgraph1);
- ]]>
- </v:before-data-bind>
- <?vsp if (self.exec_ret is null) { ?>
- <table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
- <tr>
- <td>
- <h2>Definitions</h2>
- <v:textarea name="cr_view" xhtml_cols="120" xhtml_rows="20" value="--self.body_v"/><br/>
- <label>Default Graph Name</label> <v:text name="tgraph" value="--self.tgraph1" xhtml_size="70" /><br />
- <label>Physical Graph Name</label> <v:text name="pgraph" value="--self.pgraph1" xhtml_size="70" /><br />
- <v:check-box name="rdb_sync" value="1" xhtml_id="rdb_sync" /> <label for="rdb_sync">Generate RDB2RDF triggers</label> <br/>
- <v:check-box name="fill" value="1" xhtml_id="fill" /> <label for="fill">Enable Data Syncs with Physical Quad Store</label> <br/>
- </td>
- </tr>
- <tr valign='top'>
- <td>
- <div class="message"><v:label name="msg" value="--self.message" /> </div>
- <table border='0' width='100%' class="ctl_grp">
- <tr align="center">
- <td colspan="2">
- <v:button action="simple" name="cnl" value="Cancel">
- <v:on-post>
- self.vc_redirect ('r2rml_import.vspx');
- </v:on-post>
- </v:button>
- <v:button action="simple" name="bt1" value="Execute">
- <v:on-post>
- <![CDATA[
- declare stat, msg, meta, data, source any;
- exec ('sparql ' || self.cr_view.ufl_value, stat, msg, vector (), 0, meta, data);
- self.exec_ret := data;
- source := self.graph;
- if (self.rdb_sync.ufl_selected)
- {
- self.sync_ret := RDF_VIEW_SYNC_TO_PHYSICAL (self.tgraph.ufl_value, self.fill.ufl_selected, self.pgraph.ufl_value);
- for select "g" from (sparql define input:storage "" prefix rr: <http://www.w3.org/ns/r2rml#>
- select distinct ?g { graph `iri(?:source)` {{ ?s rr:graph ?g } union { ?s rr:graphMap ?m . ?m rr:constant ?g }}}) x do
- {
- self.sync_ret := vector_concat (self.sync_ret, RDF_VIEW_SYNC_TO_PHYSICAL ("g", self.fill.ufl_selected, self.pgraph.ufl_value));
- }
- if (0 = length (self.sync_ret))
- self.sync_ret := vector (vector ('00000', 'OK'));
- }
- ]]>
- </v:on-post>
- </v:button>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- <?vsp } else { ?>
- <h2>Execution Status</h2>
- <div class="scroll_area">
- <table class="listing">
- <tr class="listing_header_row">
- <th>Status</th>
- <th>Message</th>
- </tr>
- <?vsp
- foreach (any _row in self.exec_ret) do
- {
- ?>
- <tr>
- <td><?V _row[0] ?></td>
- <td><?V _row[1] ?></td>
- </tr>
- <?vsp
- }
- ?>
- </table>
- </div>
- <?vsp }
- if (length (self.sync_ret))
- {
- ?>
- <br/>
- <h2>RDB2RDF Triggers Status</h2>
- <table class="listing">
- <tr class="listing_header_row"><th>Status</th><th>Message</th></tr>
- <?vsp
- foreach (any _row in self.sync_ret) do
- {
- ?>
- <tr><td><?V _row[0] ?></td><td><?V _row[1] ?></td></tr>
- <?vsp
- }
- ?>
- </table>
- <v:button name="back" action="simple" value="Back">
- <v:on-post><![CDATA[
- self.exec_ret := null;
- ]]></v:on-post>
- </v:button>
- <?vsp
- }
- ?>
- </v:form>
- </vm:pagebody>
- </vm:pagewrapper>
-</v:page>
diff --git a/binsrc/yacutia/r2rml_import.vspx b/binsrc/yacutia/r2rml_import.vspx
deleted file mode 100644
index cce2212..0000000
--- a/binsrc/yacutia/r2rml_import.vspx
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: r2rml_import.vspx,v 1.1.2.2 2012/03/08 12:55:28 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
- -
- -
--->
-<v:page name="sparql_create_page"
- decor="yacutia_decor.vspx"
- style="yacutia_style.xsl"
- vm:owner="yacutia_sparql_page"
- doctype="-//W3C//DTD XHTML 1.0 Transitional//EN"
- fast-render="1" xmlns:v="http://www.openlinksw.com/vspx/"
- xmlns:vm="http://www.openlinksw.com/vspx/macro">
- <vm:pagetitle>R2RML Upload</vm:pagetitle>
- <vm:pagewrapper>
- <vm:variables>
- <v:variable name="message" default="null" type="varchar" persist="0"/>
- </vm:variables>
- <vm:menu>
- <vm:menuitem value="Linked Data"/>
- </vm:menu>
- <vm:header caption="R2RML Upload"/>
- <vm:pagebody>
- <v:on-init>
- <![CDATA[
- set http_charset='utf-8';
- ]]>
- </v:on-init>
- <v:form name="form1" type="simple" method="POST" action="" xhtml_enctype="multipart/form-data">
- <table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
- <tr valign='top'>
- <td>
- <div class="message"><v:label name="msg" value="--self.message" /> </div>
- <table border='0' width='100%' class="ctl_grp">
- <tr id="rd1">
- <td>
- <v:radio-button name="rb1" group-name="rb" value="fs">
- <v:before-render>
- if (get_keyword ('rb', self.vc_event.ve_params) = 'fs'
- or get_keyword ('rb', self.vc_event.ve_params) is null)
- control.ufl_selected := 1;
- </v:before-render>
- </v:radio-button>
- Source File<span class="redstar">*</span>
- </td>
- <td>
- <input type="file" name="t_rdf_file" size="100"></input>
- </td>
- </tr>
- <tr id="rd1">
- <td>
- <v:radio-button name="rb2" group-name="rb" value="ur">
- <v:before-render>
- if (get_keyword ('rb', self.vc_event.ve_params) = 'ur')
- control.ufl_selected := 1;
- </v:before-render>
- </v:radio-button>
- Source URL<span class="redstar">*</span>
- </td>
- <td>
- <input type="text" name="t_rdf_url" size="100"></input>
- </td>
- </tr>
- <tr id="rd2">
- <td>Target Graph IRI<span class="redstar">*</span></td>
- <td>
- <v:text name="rdf_graph_name" value=""
- default_value="-- 'http://' || cfg_item_value (virtuoso_ini_path (), 'URIQA', 'DefaultHost') || '/r2rml' "
- xhtml_size="100"/>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <v:check-box name="del" value="1" initial-checked="1" xhtml_id="del"/> <label for="del">Clean Target Graph before import</label>
- </td>
- </tr>
- <tr align="center">
- <td colspan="2">
- <v:button action="simple" name="cnl" value="Cancel">
- <v:on-post>
- self.vc_redirect (http_path ());
- </v:on-post>
- </v:button>
- <v:button action="simple" name="bt1" value="Validate">
- <v:on-post>
- <![CDATA[
-declare usr, grp vspx_select_list;
-declare i, _uid, ownern, groupn integer;
-declare cname, _perms, _p, _idx, mimetype, owner_name, group_name, _inh varchar;
-declare _file, _graph, is_ttl, is_xml any;
-
- _file := get_keyword ('t_rdf_file', e.ve_params);
- _graph := trim (self.rdf_graph_name.ufl_value);
- if (not length (_graph))
- {
- self.vc_is_valid := 0;
- self.vc_error_message := 'The graph IRI must be non-empty string.';
- return;
- }
-
- if (not length (_file))
- {
- declare uri any;
- declare exit handler for sqlstate '*'
- {
- self.vc_is_valid := 0;
- self.vc_error_message := regexp_match ('[^\r\n]*', __SQL_MESSAGE);
- return;
- };
- uri := get_keyword ('t_rdf_url', e.ve_params);
- if (not length (uri))
- {
- self.vc_is_valid := 0;
- self.vc_error_message := 'The file or source URL must be specified';
- return;
- }
- exec (sprintf ('sparql load "%s" into <%s>', uri, _graph));
- goto end_post;
- }
-
- if (self.del.ufl_selected)
- {
- sparql clear iri(?:_graph);
- }
-
- is_ttl := 1;
- {
- declare continue handler for SQLSTATE '*'
- {
- is_ttl := 0;
- };
- DB.DBA.TTLP (_file, _graph, _graph);
- }
- is_xml := 0;
- if (not is_ttl)
- {
- is_xml := 1;
- declare continue handler for SQLSTATE '*'
- {
- is_xml := 0;
- };
- DB.DBA.RDF_LOAD_RDFXML (_file, _graph, _graph);
- }
- if ((is_ttl + is_xml) = 0)
- {
- self.vc_is_valid := 0;
- self.vc_error_message := 'You have attempted to upload invalid data. You can only upload RDF, Turtle, N3 serializations of RDF Data to the RDF Data Store.';
- return;
- }
-
-end_post:;
- self.message := 'The document contains valid R2RML graph';
- self.vc_redirect (sprintf ('r2rml_validate.vspx?graph=%U', _graph));
- ]]>
- </v:on-post>
- </v:button>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </v:form>
- </vm:pagebody>
- </vm:pagewrapper>
-</v:page>
diff --git a/binsrc/yacutia/r2rml_validate.vspx b/binsrc/yacutia/r2rml_validate.vspx
deleted file mode 100644
index f0c881e..0000000
--- a/binsrc/yacutia/r2rml_validate.vspx
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - $Id: r2rml_validate.vspx,v 1.1.2.2 2012/03/08 12:55:28 source Exp $
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
- -
- -
--->
-<v:page name="sparql_create_page"
- decor="yacutia_decor.vspx"
- style="yacutia_style.xsl"
- vm:owner="yacutia_sparql_page"
- doctype="-//W3C//DTD XHTML 1.0 Transitional//EN"
- fast-render="1" xmlns:v="http://www.openlinksw.com/vspx/"
- xmlns:vm="http://www.openlinksw.com/vspx/macro">
- <vm:pagetitle>R2RML Validation</vm:pagetitle>
- <vm:pagewrapper>
- <vm:variables>
- <v:variable name="message" default="null" type="varchar" persist="0"/>
- <v:variable name="graph" default="null" type="varchar" persist="0" param-name="graph"/>
- </vm:variables>
- <vm:menu>
- <vm:menuitem value="Linked Data"/>
- </vm:menu>
- <vm:header caption="R2RML Validation"/>
- <vm:pagebody>
- <v:on-init>
- <![CDATA[
- set http_charset='utf-8';
- ]]>
- </v:on-init>
- <h2>Validation Status</h2>
- <div class="scroll_area">
- <table class="listing">
- <tr class="listing_header_row">
- <th>Subject</th>
- <th>Status</th>
- <th>Message</th>
- </tr>
- <?vsp
- declare stat, msg, data, meta any;
- exec ('DB.DBA.OVL_VALIDATE (?, ''http://www.w3.org/ns/r2rml#OVL'')', stat, msg, vector (self.graph), 0, meta, data);
- foreach (any _row in data) do
- {
- ?>
- <tr>
- <td><?V _row[0] ?></td>
- <td><?V _row[1] ?></td>
- <td><?V _row[2] ?></td>
- </tr>
- <?vsp
- }
- ?>
- </table>
- </div>
- <v:form name="form1" type="simple" method="POST" action="">
- <table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
- <tr valign='top'>
- <td>
- <div class="message"><v:label name="msg" value="--self.message" /> </div>
- <table border='0' width='100%' class="ctl_grp">
- <tr align="center">
- <td colspan="2">
- <v:button action="simple" name="cnl" value="Cancel">
- <v:on-post>
- self.vc_redirect ('r2rml_import.vspx');
- </v:on-post>
- </v:button>
- <v:button action="simple" name="bt1" value="Generate">
- <v:on-post>
- <![CDATA[
- self.vc_redirect (sprintf ('r2rml_gen.vspx?graph=%U', self.graph));
- ]]>
- </v:on-post>
- </v:button>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </v:form>
- </vm:pagebody>
- </vm:pagewrapper>
-</v:page>
diff --git a/binsrc/yacutia/rdf_conf.vspx b/binsrc/yacutia/rdf_conf.vspx
index ee52d29..17be0f7 100644
--- a/binsrc/yacutia/rdf_conf.vspx
+++ b/binsrc/yacutia/rdf_conf.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_conf.vspx,v 1.1.4.6 2012/03/08 12:55:28 source Exp $
+ - $Id: rdf_conf.vspx,v 1.1.4.5 2011/05/02 14:13:40 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2010 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
diff --git a/binsrc/yacutia/rdf_console.vspx b/binsrc/yacutia/rdf_console.vspx
index 148b106..817e53c 100644
--- a/binsrc/yacutia/rdf_console.vspx
+++ b/binsrc/yacutia/rdf_console.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_console.vspx,v 1.1.2.8 2012/03/08 12:55:28 source Exp $
+ - $Id: rdf_console.vspx,v 1.1.2.6 2010/11/08 11:45:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
@@ -46,7 +46,7 @@
<vm:pagebody>
<v:on-init><![CDATA[
if (self.del is not null)
- delete from DB.DBA.RDF_CARTRIDGES_LOG where ML_SESSION = self.del;
+ delete from DB.DBA.RDF_META_CARTRIDGES_LOG where ML_SESSION = self.del;
]]></v:on-init>
<table border="0" width="100%" height="100%" cellpadding="0" cellspacing="0">
<tr valign='top'>
@@ -138,7 +138,7 @@
</tr>
<?vsp
declare ctr int;
- for select mses from (select distinct ML_SESSION as mses from DB.DBA.RDF_CARTRIDGES_LOG) x do {
+ for select mses from (select distinct ML_SESSION as mses from DB.DBA.RDF_META_CARTRIDGES_LOG) x do {
?>
<tr class="<?V case when mod(ctr, 2) then 'listing_row_odd' else 'listing_row_even' end ?>">
<td>
@@ -172,7 +172,7 @@
ctr := ctr + 1;
if (mses = self.ses)
{
- for select ML_ID, ML_PROC from DB.DBA.RDF_CARTRIDGES_LOG where ML_SESSION = mses do
+ for select ML_ID, ML_PROC from DB.DBA.RDF_META_CARTRIDGES_LOG where ML_SESSION = mses do
{
?>
<tr class="<?V case when mod(ctr, 2) then 'listing_row_odd' else 'listing_row_even' end ?>">
@@ -212,7 +212,7 @@
{
declare dict, ses any;
- for select * from DB.DBA.RDF_CARTRIDGES_LOG where ML_SESSION = self.detail and ML_ID = self.idn do {
+ for select * from DB.DBA.RDF_META_CARTRIDGES_LOG where ML_SESSION = self.detail and ML_ID = self.idn do {
dict := null;
if (0 and length (ML_RESULT))
{
diff --git a/binsrc/yacutia/rdf_filters.vspx b/binsrc/yacutia/rdf_filters.vspx
index 7aeb77b..2197647 100644
--- a/binsrc/yacutia/rdf_filters.vspx
+++ b/binsrc/yacutia/rdf_filters.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_filters.vspx,v 1.9.2.11 2012/03/08 12:55:28 source Exp $
+ - $Id: rdf_filters.vspx,v 1.9.2.10 2011/06/09 15:34:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/rdf_filters_pp.vspx b/binsrc/yacutia/rdf_filters_pp.vspx
index 5d042b9..f8a05de 100644
--- a/binsrc/yacutia/rdf_filters_pp.vspx
+++ b/binsrc/yacutia/rdf_filters_pp.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_filters_pp.vspx,v 1.3.2.10 2012/03/08 12:55:28 source Exp $
+ - $Id: rdf_filters_pp.vspx,v 1.3.2.9 2011/06/09 15:34:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/rdf_import.vspx b/binsrc/yacutia/rdf_import.vspx
index 559ba8e..15030dc 100644
--- a/binsrc/yacutia/rdf_import.vspx
+++ b/binsrc/yacutia/rdf_import.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_import.vspx,v 1.1.4.7 2012/03/08 12:55:28 source Exp $
+ - $Id: rdf_import.vspx,v 1.1.4.5 2011/10/17 09:55:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -36,7 +36,7 @@
<v:variable name="message" default="null" type="varchar" persist="0"/>
</vm:variables>
<vm:menu>
- <vm:menuitem value="Linked Data"/>
+ <vm:menuitem value="Linked Data Objects"/>
</vm:menu>
<vm:header caption="Quad Store Upload"/>
<vm:pagebody>
diff --git a/binsrc/yacutia/rdf_psh_subs.vspx b/binsrc/yacutia/rdf_psh_subs.vspx
index 8a6654b..1b13c30 100644
--- a/binsrc/yacutia/rdf_psh_subs.vspx
+++ b/binsrc/yacutia/rdf_psh_subs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_psh_subs.vspx,v 1.1.4.8 2012/03/08 12:55:28 source Exp $
+ - $Id: rdf_psh_subs.vspx,v 1.1.4.6 2011/10/25 23:34:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -36,7 +36,7 @@
<v:variable name="message" default="null" type="varchar" persist="0"/>
</vm:variables>
<vm:menu>
- <vm:menuitem value="Linked Data"/>
+ <vm:menuitem value="Linked Data Objects"/>
</vm:menu>
<vm:header caption="Subscriptions (PHSB)"/>
<vm:pagebody>
diff --git a/binsrc/yacutia/rdf_schemas.vspx b/binsrc/yacutia/rdf_schemas.vspx
index 5825316..c5a90f7 100644
--- a/binsrc/yacutia/rdf_schemas.vspx
+++ b/binsrc/yacutia/rdf_schemas.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_schemas.vspx,v 1.1.2.6 2012/03/08 12:55:28 source Exp $
+ - $Id: rdf_schemas.vspx,v 1.1.2.5 2010/09/20 10:16:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/rdf_void.vspx b/binsrc/yacutia/rdf_void.vspx
index f293247..bb9d2f5 100644
--- a/binsrc/yacutia/rdf_void.vspx
+++ b/binsrc/yacutia/rdf_void.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdf_void.vspx,v 1.2.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: rdf_void.vspx,v 1.2.2.2 2010/09/20 10:16:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_control.vspx b/binsrc/yacutia/robot_control.vspx
index 43e72f5..93119ea 100644
--- a/binsrc/yacutia/robot_control.vspx
+++ b/binsrc/yacutia/robot_control.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_control.vspx,v 1.2.2.10 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_control.vspx,v 1.2.2.9 2011/05/02 14:13:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_edit.vspx b/binsrc/yacutia/robot_edit.vspx
index 1ca50fe..335633e 100644
--- a/binsrc/yacutia/robot_edit.vspx
+++ b/binsrc/yacutia/robot_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_edit.vspx,v 1.6.2.15 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_edit.vspx,v 1.6.2.14 2011/05/02 14:13:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_export.vspx b/binsrc/yacutia/robot_export.vspx
index 1b914af..98b7aa4 100644
--- a/binsrc/yacutia/robot_export.vspx
+++ b/binsrc/yacutia/robot_export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_export.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_export.vspx,v 1.2.2.3 2010/09/20 10:16:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_process.vspx b/binsrc/yacutia/robot_process.vspx
index 7a9d977..340b455 100644
--- a/binsrc/yacutia/robot_process.vspx
+++ b/binsrc/yacutia/robot_process.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_process.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_process.vspx,v 1.2.2.3 2010/09/20 10:16:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_queues.vspx b/binsrc/yacutia/robot_queues.vspx
index 7d1780a..2770733 100644
--- a/binsrc/yacutia/robot_queues.vspx
+++ b/binsrc/yacutia/robot_queues.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_queues.vspx,v 1.2.2.8 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_queues.vspx,v 1.2.2.7 2011/02/16 20:45:23 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_sched.vspx b/binsrc/yacutia/robot_sched.vspx
index e610e04..d906bbb 100644
--- a/binsrc/yacutia/robot_sched.vspx
+++ b/binsrc/yacutia/robot_sched.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_sched.vspx,v 1.3.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_sched.vspx,v 1.3.2.3 2010/09/20 10:16:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_sites.vspx b/binsrc/yacutia/robot_sites.vspx
index 9adf2b4..a4842ed 100644
--- a/binsrc/yacutia/robot_sites.vspx
+++ b/binsrc/yacutia/robot_sites.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_sites.vspx,v 1.2.2.7 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_sites.vspx,v 1.2.2.6 2011/02/16 20:45:24 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_status.vspx b/binsrc/yacutia/robot_status.vspx
index 4ca8b25..c9233ca 100644
--- a/binsrc/yacutia/robot_status.vspx
+++ b/binsrc/yacutia/robot_status.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_status.vspx,v 1.2.2.8 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_status.vspx,v 1.2.2.7 2011/03/08 13:38:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/robot_urls_list.vspx b/binsrc/yacutia/robot_urls_list.vspx
index f0514fc..966350e 100644
--- a/binsrc/yacutia/robot_urls_list.vspx
+++ b/binsrc/yacutia/robot_urls_list.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: robot_urls_list.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: robot_urls_list.vspx,v 1.2.2.3 2010/09/20 10:16:50 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/role_remove.vspx b/binsrc/yacutia/role_remove.vspx
index 2edca48..2d382d8 100644
--- a/binsrc/yacutia/role_remove.vspx
+++ b/binsrc/yacutia/role_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: role_remove.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: role_remove.vspx,v 1.2.2.3 2010/09/20 10:16:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/role_remove_inc.vspx b/binsrc/yacutia/role_remove_inc.vspx
index 13a027e..895874f 100644
--- a/binsrc/yacutia/role_remove_inc.vspx
+++ b/binsrc/yacutia/role_remove_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: role_remove_inc.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: role_remove_inc.vspx,v 1.2.2.3 2010/09/20 10:16:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/roles.vspx b/binsrc/yacutia/roles.vspx
index 96a9471..5d82a5d 100644
--- a/binsrc/yacutia/roles.vspx
+++ b/binsrc/yacutia/roles.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: roles.vspx,v 1.2.2.4 2012/03/08 12:55:28 source Exp $
+ - $Id: roles.vspx,v 1.2.2.3 2010/09/20 10:16:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/roles_inc.vspx b/binsrc/yacutia/roles_inc.vspx
index 4867eb2..85d3b9f 100644
--- a/binsrc/yacutia/roles_inc.vspx
+++ b/binsrc/yacutia/roles_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: roles_inc.vspx,v 1.3.2.3 2012/03/08 12:55:28 source Exp $
+ - $Id: roles_inc.vspx,v 1.3.2.2 2010/09/20 10:16:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sec_acl_edit.vspx b/binsrc/yacutia/sec_acl_edit.vspx
index 070400f..942c952 100644
--- a/binsrc/yacutia/sec_acl_edit.vspx
+++ b/binsrc/yacutia/sec_acl_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sec_acl_edit.vspx,v 1.2.2.5 2012/03/08 12:55:28 source Exp $
+ - $Id: sec_acl_edit.vspx,v 1.2.2.4 2010/09/20 10:16:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sec_acl_edit_sp.vspx b/binsrc/yacutia/sec_acl_edit_sp.vspx
index 872f52f..ae4a500 100644
--- a/binsrc/yacutia/sec_acl_edit_sp.vspx
+++ b/binsrc/yacutia/sec_acl_edit_sp.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sec_acl_edit_sp.vspx,v 1.1.4.3 2012/03/08 12:55:28 source Exp $
+ - $Id: sec_acl_edit_sp.vspx,v 1.1.4.2 2011/10/13 18:33:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sec_auth_serv.vspx b/binsrc/yacutia/sec_auth_serv.vspx
index 320427b..e020c01 100644
--- a/binsrc/yacutia/sec_auth_serv.vspx
+++ b/binsrc/yacutia/sec_auth_serv.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sec_auth_serv.vspx,v 1.3.2.11 2012/03/08 12:55:29 source Exp $
+ - $Id: sec_auth_serv.vspx,v 1.3.2.9 2011/10/13 18:33:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -66,8 +66,8 @@
return 'Deny';
</v:method>
<v:method name="fmt_dest" arglist="in i any">
- --if (self.acl_name = 'HTTP')
- -- return 'N/A';
+ if (self.acl_name = 'HTTP')
+ return 'N/A';
return i;
</v:method>
<v:method name="fmt_obj" arglist="in i any">
@@ -462,7 +462,7 @@
</v:select-list>
</td>
</tr>
- <?vsp if (self.acl_name <> 'NEWS') { ?>
+ <?vsp if (self.acl_name <> 'HTTP' and self.acl_name <> 'NEWS') { ?>
<tr>
<td>Destination</td><td><v:text name="dest1" value="--self.dest"/></td>
</tr>
@@ -545,7 +545,7 @@
rat := 0;
lim := 0;
- --if (self.acl_name <> 'HTTP')
+ if (self.acl_name <> 'HTTP')
dest := self.dest1.ufl_value;
if (self.acl_name not in ('HTTP', 'PROXY'))
diff --git a/binsrc/yacutia/sec_auth_serv_sp.vspx b/binsrc/yacutia/sec_auth_serv_sp.vspx
index 68373fa..4bf0e8c 100644
--- a/binsrc/yacutia/sec_auth_serv_sp.vspx
+++ b/binsrc/yacutia/sec_auth_serv_sp.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sec_auth_serv_sp.vspx,v 1.1.4.3 2012/03/08 12:55:29 source Exp $
+ - $Id: sec_auth_serv_sp.vspx,v 1.1.4.2 2011/10/13 18:33:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sec_pki_1.vspx b/binsrc/yacutia/sec_pki_1.vspx
index 075f33b..c8e87e6 100644
--- a/binsrc/yacutia/sec_pki_1.vspx
+++ b/binsrc/yacutia/sec_pki_1.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sec_pki_1.vspx,v 1.1.2.8 2012/03/08 12:55:29 source Exp $
+ - $Id: sec_pki_1.vspx,v 1.1.2.7 2011/10/28 21:44:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sec_pki_2.vspx b/binsrc/yacutia/sec_pki_2.vspx
index fae54b1..adcf52b 100644
--- a/binsrc/yacutia/sec_pki_2.vspx
+++ b/binsrc/yacutia/sec_pki_2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sec_pki_2.vspx,v 1.1.2.12 2012/03/08 12:55:29 source Exp $
+ - $Id: sec_pki_2.vspx,v 1.1.2.10 2011/10/28 21:44:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -259,7 +259,7 @@
'CN', host,
'emailAddress', get_keyword ('emailAddress', arr)),
vector ('basicConstraints', 'critical,CA:FALSE',
- --'authorityKeyIdentifier', 'keyid,issuer:always',
+ 'authorityKeyIdentifier', 'keyid,issuer:always',
'extendedKeyUsage', 'critical,serverAuth',
'nsComment', 'Virtuoso Generated Certificate'));
USER_KEY_STORE (user, k, 'X.509', 2, '', cast (xenc_pkcs12_export (k, 'HTTPS Certificate', '') as varchar));
diff --git a/binsrc/yacutia/sec_pki_2_conf.vspx b/binsrc/yacutia/sec_pki_2_conf.vspx
index d33caa6..eeeba10 100644
--- a/binsrc/yacutia/sec_pki_2_conf.vspx
+++ b/binsrc/yacutia/sec_pki_2_conf.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sec_pki_2_conf.vspx,v 1.1.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: sec_pki_2_conf.vspx,v 1.1.2.3 2010/09/20 10:16:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sec_pki_3.vspx b/binsrc/yacutia/sec_pki_3.vspx
index 15eab5e..b675183 100644
--- a/binsrc/yacutia/sec_pki_3.vspx
+++ b/binsrc/yacutia/sec_pki_3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sec_pki_3.vspx,v 1.1.2.7 2012/03/08 12:55:29 source Exp $
+ - $Id: sec_pki_3.vspx,v 1.1.2.6 2011/10/28 21:44:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sec_pki_4.vspx b/binsrc/yacutia/sec_pki_4.vspx
index 2a99985..6e2f302 100644
--- a/binsrc/yacutia/sec_pki_4.vspx
+++ b/binsrc/yacutia/sec_pki_4.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sec_pki_4.vspx,v 1.1.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: sec_pki_4.vspx,v 1.1.2.4 2011/10/28 21:44:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sec_pki_drop.vspx b/binsrc/yacutia/sec_pki_drop.vspx
index bf5611e..5317ba2 100644
--- a/binsrc/yacutia/sec_pki_drop.vspx
+++ b/binsrc/yacutia/sec_pki_drop.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sec_pki_drop.vspx,v 1.1.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: sec_pki_drop.vspx,v 1.1.2.3 2010/09/20 10:16:51 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/site.vspx b/binsrc/yacutia/site.vspx
index 1fa684f..1a8387e 100644
--- a/binsrc/yacutia/site.vspx
+++ b/binsrc/yacutia/site.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: site.vspx,v 1.4.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: site.vspx,v 1.4.2.2 2010/09/20 10:16:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/soap_del_path.vspx b/binsrc/yacutia/soap_del_path.vspx
index 1da0f14..8ceb3ce 100644
--- a/binsrc/yacutia/soap_del_path.vspx
+++ b/binsrc/yacutia/soap_del_path.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: soap_del_path.vspx,v 1.3.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: soap_del_path.vspx,v 1.3.2.4 2010/09/20 10:16:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/soap_options_edit.vspx b/binsrc/yacutia/soap_options_edit.vspx
index 887464b..9130747 100644
--- a/binsrc/yacutia/soap_options_edit.vspx
+++ b/binsrc/yacutia/soap_options_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: soap_options_edit.vspx,v 1.4.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: soap_options_edit.vspx,v 1.4.2.3 2010/09/20 10:16:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/soap_services.vspx b/binsrc/yacutia/soap_services.vspx
index 47287a3..88d9c42 100644
--- a/binsrc/yacutia/soap_services.vspx
+++ b/binsrc/yacutia/soap_services.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: soap_services.vspx,v 1.5.2.6 2012/03/08 12:55:29 source Exp $
+ - $Id: soap_services.vspx,v 1.5.2.5 2010/09/20 10:16:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/soap_services_edit.vspx b/binsrc/yacutia/soap_services_edit.vspx
index 6e24593..6d60227 100644
--- a/binsrc/yacutia/soap_services_edit.vspx
+++ b/binsrc/yacutia/soap_services_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: soap_services_edit.vspx,v 1.8.2.6 2012/03/08 12:55:29 source Exp $
+ - $Id: soap_services_edit.vspx,v 1.8.2.5 2010/09/20 10:16:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/soap_services_list.vspx b/binsrc/yacutia/soap_services_list.vspx
index 4b12041..abc6db5 100644
--- a/binsrc/yacutia/soap_services_list.vspx
+++ b/binsrc/yacutia/soap_services_list.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: soap_services_list.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: soap_services_list.vspx,v 1.2.2.3 2010/09/20 10:16:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sparql_acl.vspx b/binsrc/yacutia/sparql_acl.vspx
index ccf9906..c26f3a2 100644
--- a/binsrc/yacutia/sparql_acl.vspx
+++ b/binsrc/yacutia/sparql_acl.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sparql_acl.vspx,v 1.1.4.6 2012/03/08 12:55:29 source Exp $
+ - $Id: sparql_acl.vspx,v 1.1.4.5 2011/10/13 18:33:27 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sparql_filters.vspx b/binsrc/yacutia/sparql_filters.vspx
index 5fc5711..b866543 100644
--- a/binsrc/yacutia/sparql_filters.vspx
+++ b/binsrc/yacutia/sparql_filters.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sparql_filters.vspx,v 1.5.2.6 2012/03/08 12:55:29 source Exp $
+ - $Id: sparql_filters.vspx,v 1.5.2.5 2010/11/08 11:45:35 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sparql_graph.vspx b/binsrc/yacutia/sparql_graph.vspx
index bccf621..b0055c0 100644
--- a/binsrc/yacutia/sparql_graph.vspx
+++ b/binsrc/yacutia/sparql_graph.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sparql_graph.vspx,v 1.4.2.6 2012/03/08 12:55:29 source Exp $
+ - $Id: sparql_graph.vspx,v 1.4.2.5 2011/10/25 23:34:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sparql_input.vspx b/binsrc/yacutia/sparql_input.vspx
index c5c5191..f690c9e 100644
--- a/binsrc/yacutia/sparql_input.vspx
+++ b/binsrc/yacutia/sparql_input.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sparql_input.vspx,v 1.5.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: sparql_input.vspx,v 1.5.2.3 2010/09/20 10:16:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sparql_load.vspx b/binsrc/yacutia/sparql_load.vspx
index 6512f96..42aa001 100644
--- a/binsrc/yacutia/sparql_load.vspx
+++ b/binsrc/yacutia/sparql_load.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sparql_load.vspx,v 1.4.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: sparql_load.vspx,v 1.4.2.4 2010/09/20 10:16:52 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sqlbuilder.vsp b/binsrc/yacutia/sqlbuilder.vsp
index ecbf9ca..842181c 100644
--- a/binsrc/yacutia/sqlbuilder.vsp
+++ b/binsrc/yacutia/sqlbuilder.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: sqlbuilder.vsp,v 1.3.2.3 2012/03/08 12:55:29 source Exp $
+-- $Id: sqlbuilder.vsp,v 1.3.2.2 2010/09/20 10:16:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/syntax/SyntaxHighlighter.css b/binsrc/yacutia/syntax/SyntaxHighlighter.css
index 2663c09..bcca788 100644
--- a/binsrc/yacutia/syntax/SyntaxHighlighter.css
+++ b/binsrc/yacutia/syntax/SyntaxHighlighter.css
@@ -1,10 +1,10 @@
/*
- * $Id: SyntaxHighlighter.css,v 1.2.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: SyntaxHighlighter.css,v 1.2.2.1 2010/09/20 10:17:00 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/syntax/shBrushSql.js b/binsrc/yacutia/syntax/shBrushSql.js
index 3dc4c35..1a52f62 100644
--- a/binsrc/yacutia/syntax/shBrushSql.js
+++ b/binsrc/yacutia/syntax/shBrushSql.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/syntax/shBrushXml.js b/binsrc/yacutia/syntax/shBrushXml.js
index aee0566..23c247a 100644
--- a/binsrc/yacutia/syntax/shBrushXml.js
+++ b/binsrc/yacutia/syntax/shBrushXml.js
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sys_info.vspx b/binsrc/yacutia/sys_info.vspx
index 38640b5..cf4550b 100644
--- a/binsrc/yacutia/sys_info.vspx
+++ b/binsrc/yacutia/sys_info.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sys_info.vspx,v 1.3.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: sys_info.vspx,v 1.3.2.2 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sys_queues.vspx b/binsrc/yacutia/sys_queues.vspx
index f69423d..49cb7c7 100644
--- a/binsrc/yacutia/sys_queues.vspx
+++ b/binsrc/yacutia/sys_queues.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: sys_queues.vspx,v 1.2.2.6 2012/03/08 12:55:29 source Exp $
+ - $Id: sys_queues.vspx,v 1.2.2.5 2011/05/02 14:13:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sys_queues_edit.vspx b/binsrc/yacutia/sys_queues_edit.vspx
index 7e765b1..4e0760f 100644
--- a/binsrc/yacutia/sys_queues_edit.vspx
+++ b/binsrc/yacutia/sys_queues_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: sys_queues_edit.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: sys_queues_edit.vspx,v 1.2.2.3 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sys_queues_edit_inc.vspx b/binsrc/yacutia/sys_queues_edit_inc.vspx
index 55a8d47..e04fa64 100644
--- a/binsrc/yacutia/sys_queues_edit_inc.vspx
+++ b/binsrc/yacutia/sys_queues_edit_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
- - $Id: sys_queues_edit_inc.vspx,v 1.2.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: sys_queues_edit_inc.vspx,v 1.2.2.2 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sys_queues_error.vspx b/binsrc/yacutia/sys_queues_error.vspx
index 7e39dfa..88c9a06 100644
--- a/binsrc/yacutia/sys_queues_error.vspx
+++ b/binsrc/yacutia/sys_queues_error.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sys_queues_error.vspx,v 1.4.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: sys_queues_error.vspx,v 1.4.2.3 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/sys_queues_remove.vspx b/binsrc/yacutia/sys_queues_remove.vspx
index 9ca9418..bb8da8d 100644
--- a/binsrc/yacutia/sys_queues_remove.vspx
+++ b/binsrc/yacutia/sys_queues_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: sys_queues_remove.vspx,v 1.3.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: sys_queues_remove.vspx,v 1.3.2.4 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/tbl.js b/binsrc/yacutia/tbl.js
index d3bdb1a..592eedd 100644
--- a/binsrc/yacutia/tbl.js
+++ b/binsrc/yacutia/tbl.js
@@ -1,10 +1,10 @@
/*
- * $Id: tbl.js,v 1.1.4.7 2012/03/08 12:55:29 source Exp $
+ * $Id: tbl.js,v 1.1.4.6 2011/09/09 13:21:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/binsrc/yacutia/text_queries.vspx b/binsrc/yacutia/text_queries.vspx
index fed4604..9327114 100644
--- a/binsrc/yacutia/text_queries.vspx
+++ b/binsrc/yacutia/text_queries.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: text_queries.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: text_queries.vspx,v 1.2.2.3 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/text_queries_edit.vspx b/binsrc/yacutia/text_queries_edit.vspx
index 09cd5c6..d249667 100644
--- a/binsrc/yacutia/text_queries_edit.vspx
+++ b/binsrc/yacutia/text_queries_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: text_queries_edit.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: text_queries_edit.vspx,v 1.2.2.3 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/text_results.vspx b/binsrc/yacutia/text_results.vspx
index 8b7f5e3..a78d80b 100644
--- a/binsrc/yacutia/text_results.vspx
+++ b/binsrc/yacutia/text_results.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: text_results.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: text_results.vspx,v 1.2.2.3 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/text_search.vspx b/binsrc/yacutia/text_search.vspx
index 9d3fc93..4a2289a 100644
--- a/binsrc/yacutia/text_search.vspx
+++ b/binsrc/yacutia/text_search.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: text_search.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: text_search.vspx,v 1.2.2.3 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/text_triggers.vspx b/binsrc/yacutia/text_triggers.vspx
index d11c798..c263664 100644
--- a/binsrc/yacutia/text_triggers.vspx
+++ b/binsrc/yacutia/text_triggers.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: text_triggers.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: text_triggers.vspx,v 1.3.2.3 2010/09/20 10:16:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/uddi_remove.vspx b/binsrc/yacutia/uddi_remove.vspx
index a63cdba..e5b2149 100644
--- a/binsrc/yacutia/uddi_remove.vspx
+++ b/binsrc/yacutia/uddi_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uddi_remove.vspx,v 1.3.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: uddi_remove.vspx,v 1.3.2.4 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/uddi_serv.vspx b/binsrc/yacutia/uddi_serv.vspx
index 9425d2f..c0f9188 100644
--- a/binsrc/yacutia/uddi_serv.vspx
+++ b/binsrc/yacutia/uddi_serv.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uddi_serv.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: uddi_serv.vspx,v 1.3.2.3 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/uddi_serv_browse.vspx b/binsrc/yacutia/uddi_serv_browse.vspx
index 274d8fa..f83a8a0 100644
--- a/binsrc/yacutia/uddi_serv_browse.vspx
+++ b/binsrc/yacutia/uddi_serv_browse.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uddi_serv_browse.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: uddi_serv_browse.vspx,v 1.3.2.3 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/uddi_serv_create.vspx b/binsrc/yacutia/uddi_serv_create.vspx
index 3977dee..0b9825d 100644
--- a/binsrc/yacutia/uddi_serv_create.vspx
+++ b/binsrc/yacutia/uddi_serv_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: uddi_serv_create.vspx,v 1.4.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: uddi_serv_create.vspx,v 1.4.2.3 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vad.vspx b/binsrc/yacutia/vad.vspx
index 7e146b0..647c107 100644
--- a/binsrc/yacutia/vad.vspx
+++ b/binsrc/yacutia/vad.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad.vspx,v 1.7.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vad.vspx,v 1.7.2.4 2011/01/25 14:21:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vad_dav.xml b/binsrc/yacutia/vad_dav.xml
index 49b683f..3525591 100644
--- a/binsrc/yacutia/vad_dav.xml
+++ b/binsrc/yacutia/vad_dav.xml
@@ -5,12 +5,12 @@
<name package="conductor">
<prop name="Title" value="Virtuoso Conductor"/>
<prop name="Developer" value="OpenLink Software"/>
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software"/>
<prop name="Download" value="http://www.openlinksw.com/virtuoso/conductor/download"/>
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/conductor/download"/>
</name>
- <version package="1.00.8004">
- <prop name="Release Date" value="2012-03-13 01:46"/>
+ <version package="1.00.7976">
+ <prop name="Release Date" value="2011-10-28 23:51"/>
<prop name="Build" value="Release, optimized"/>
</version>
</caption>
@@ -328,9 +328,6 @@
<file type="dav" source="http" target_uri="conductor/persistent_xmlns.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/popup2_browser.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/popup_browser.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
- <file type="dav" source="http" target_uri="conductor/r2rml_gen.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
- <file type="dav" source="http" target_uri="conductor/r2rml_import.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
- <file type="dav" source="http" target_uri="conductor/r2rml_validate.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/rdf_conf.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/rdf_console.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="dav" source="http" target_uri="conductor/rdf_filters_pp.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
diff --git a/binsrc/yacutia/vad_fs.xml b/binsrc/yacutia/vad_fs.xml
index 7b96189..3b91b6e 100644
--- a/binsrc/yacutia/vad_fs.xml
+++ b/binsrc/yacutia/vad_fs.xml
@@ -5,12 +5,12 @@
<name package="conductor">
<prop name="Title" value="Virtuoso Conductor"/>
<prop name="Developer" value="OpenLink Software"/>
- <prop name="Copyright" value="(C) 1998-2012 OpenLink Software"/>
+ <prop name="Copyright" value="(C) 1998-2011 OpenLink Software"/>
<prop name="Download" value="http://www.openlinksw.com/virtuoso/conductor/download"/>
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/conductor/download"/>
</name>
- <version package="1.00.8004">
- <prop name="Release Date" value="2012-03-13 01:46"/>
+ <version package="1.00.7976">
+ <prop name="Release Date" value="2011-10-28 23:51"/>
<prop name="Build" value="Release, optimized"/>
</version>
</caption>
@@ -334,9 +334,6 @@
<file type="http" source="http" target_uri="conductor/persistent_xmlns.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/popup2_browser.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/popup_browser.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
- <file type="http" source="http" target_uri="conductor/r2rml_gen.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
- <file type="http" source="http" target_uri="conductor/r2rml_import.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
- <file type="http" source="http" target_uri="conductor/r2rml_validate.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/rdf_conf.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/rdf_console.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
<file type="http" source="http" target_uri="conductor/rdf_filters_pp.vspx" dav_owner='dav' dav_grp='administrators' dav_perm='111101101NN' makepath="yes"/>
diff --git a/binsrc/yacutia/vad_install.vspx b/binsrc/yacutia/vad_install.vspx
index 45dff3f..e6474a8 100644
--- a/binsrc/yacutia/vad_install.vspx
+++ b/binsrc/yacutia/vad_install.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad_install.vspx,v 1.8.2.6 2012/03/08 12:55:29 source Exp $
+ - $Id: vad_install.vspx,v 1.8.2.5 2011/01/25 14:21:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vad_install_batch.vspx b/binsrc/yacutia/vad_install_batch.vspx
index 42b18b8..f6571db 100644
--- a/binsrc/yacutia/vad_install_batch.vspx
+++ b/binsrc/yacutia/vad_install_batch.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad_install_batch.vspx,v 1.3.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vad_install_batch.vspx,v 1.3.2.3 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -57,7 +57,7 @@
declare state, msg, pack_name, pack_vers, pack_fullname, pkg_date, pack_path varchar;
declare exit handler for sqlstate '*', not found
{
- if (strstr (__SQL_MESSAGE, 'requires Framework') is not null)
+ if (strstr (__SQL_MESSAGE, 'required package Framework') is not null)
goto next;
self.pack_ready := 0;
state := __SQL_STATE;
diff --git a/binsrc/yacutia/vad_remove.vspx b/binsrc/yacutia/vad_remove.vspx
index 44004bd..a5388cf 100644
--- a/binsrc/yacutia/vad_remove.vspx
+++ b/binsrc/yacutia/vad_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad_remove.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vad_remove.vspx,v 1.2.2.3 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vad_remove_batch.vspx b/binsrc/yacutia/vad_remove_batch.vspx
index 32a7495..8ce3c1b 100644
--- a/binsrc/yacutia/vad_remove_batch.vspx
+++ b/binsrc/yacutia/vad_remove_batch.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad_remove_batch.vspx,v 1.1.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: vad_remove_batch.vspx,v 1.1.2.2 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vad_src.vspx b/binsrc/yacutia/vad_src.vspx
index d714371..050ca6d 100644
--- a/binsrc/yacutia/vad_src.vspx
+++ b/binsrc/yacutia/vad_src.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad_src.vspx,v 1.1.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: vad_src.vspx,v 1.1.2.2 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vad_status.vspx b/binsrc/yacutia/vad_status.vspx
index 6d78a2a..201e371 100644
--- a/binsrc/yacutia/vad_status.vspx
+++ b/binsrc/yacutia/vad_status.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad_status.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vad_status.vspx,v 1.3.2.3 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vad_version b/binsrc/yacutia/vad_version
index 1cbfeae..744f362 100644
--- a/binsrc/yacutia/vad_version
+++ b/binsrc/yacutia/vad_version
@@ -1 +1 @@
-1.00.8004
+1.00.7976
diff --git a/binsrc/yacutia/vad_wa_config.vspx b/binsrc/yacutia/vad_wa_config.vspx
index 50ccb1d..ed21095 100644
--- a/binsrc/yacutia/vad_wa_config.vspx
+++ b/binsrc/yacutia/vad_wa_config.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad_wa_config.vspx,v 1.5.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vad_wa_config.vspx,v 1.5.2.3 2010/09/20 10:16:54 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vad_wa_create.vspx b/binsrc/yacutia/vad_wa_create.vspx
index 06f243f..f0cb74f 100644
--- a/binsrc/yacutia/vad_wa_create.vspx
+++ b/binsrc/yacutia/vad_wa_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vad_wa_create.vspx,v 1.7.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vad_wa_create.vspx,v 1.7.2.3 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_conf_dsn_edit.vspx b/binsrc/yacutia/vdb_conf_dsn_edit.vspx
index 6eda996..99f2f56 100644
--- a/binsrc/yacutia/vdb_conf_dsn_edit.vspx
+++ b/binsrc/yacutia/vdb_conf_dsn_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_conf_dsn_edit.vspx,v 1.5.2.7 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_conf_dsn_edit.vspx,v 1.5.2.5 2011/02/03 10:30:29 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -482,7 +482,7 @@
<tr>
<td colspan="3" align="middle">
<p class="copyright_noalign"><?V self.driver ?><br />
- <small>Copyright 1998-2012 OpenLink Software</small><br />
+ <small>Copyright 1998-2011 OpenLink Software</small><br />
<small>All rights reserved</small></p></td></tr>
<tr><td rowspan="4" valign="top"><img src="images/opl.jpg" border="1" /></td>
<td valign="top">
diff --git a/binsrc/yacutia/vdb_conf_dsn_new.vspx b/binsrc/yacutia/vdb_conf_dsn_new.vspx
index d828be1..7339e06 100644
--- a/binsrc/yacutia/vdb_conf_dsn_new.vspx
+++ b/binsrc/yacutia/vdb_conf_dsn_new.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_conf_dsn_new.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_conf_dsn_new.vspx,v 1.2.2.3 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_conf_dsn_remove.vspx b/binsrc/yacutia/vdb_conf_dsn_remove.vspx
index a5850f2..47ebff8 100644
--- a/binsrc/yacutia/vdb_conf_dsn_remove.vspx
+++ b/binsrc/yacutia/vdb_conf_dsn_remove.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_conf_dsn_remove.vspx,v 1.3.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_conf_dsn_remove.vspx,v 1.3.2.4 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_config_dsn.vspx b/binsrc/yacutia/vdb_config_dsn.vspx
index bd35351..4497cbf 100644
--- a/binsrc/yacutia/vdb_config_dsn.vspx
+++ b/binsrc/yacutia/vdb_config_dsn.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_config_dsn.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_config_dsn.vspx,v 1.2.2.3 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_conn_dsn.vspx b/binsrc/yacutia/vdb_conn_dsn.vspx
index 7852960..8082c32 100644
--- a/binsrc/yacutia/vdb_conn_dsn.vspx
+++ b/binsrc/yacutia/vdb_conn_dsn.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_conn_dsn.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_conn_dsn.vspx,v 1.3.2.3 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_conn_dsn_del.vspx b/binsrc/yacutia/vdb_conn_dsn_del.vspx
index 7356358..818d76b 100644
--- a/binsrc/yacutia/vdb_conn_dsn_del.vspx
+++ b/binsrc/yacutia/vdb_conn_dsn_del.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_conn_dsn_del.vspx,v 1.3.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_conn_dsn_del.vspx,v 1.3.2.4 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_conn_dsn_edit.vspx b/binsrc/yacutia/vdb_conn_dsn_edit.vspx
index 9180c40..6006a4b 100644
--- a/binsrc/yacutia/vdb_conn_dsn_edit.vspx
+++ b/binsrc/yacutia/vdb_conn_dsn_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_conn_dsn_edit.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_conn_dsn_edit.vspx,v 1.2.2.3 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_dsn_edit.vspx b/binsrc/yacutia/vdb_dsn_edit.vspx
index 17066b1..b86e324 100644
--- a/binsrc/yacutia/vdb_dsn_edit.vspx
+++ b/binsrc/yacutia/vdb_dsn_edit.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdb_dsn_edit.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_dsn_edit.vspx,v 1.3.2.3 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_dsns.vspx b/binsrc/yacutia/vdb_dsns.vspx
index 44e989c..6a7d08b 100644
--- a/binsrc/yacutia/vdb_dsns.vspx
+++ b/binsrc/yacutia/vdb_dsns.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdb_dsns.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_dsns.vspx,v 1.2.2.3 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_error_inc.vspx b/binsrc/yacutia/vdb_error_inc.vspx
index 146cb99..3591606 100644
--- a/binsrc/yacutia/vdb_error_inc.vspx
+++ b/binsrc/yacutia/vdb_error_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdb_error_inc.vspx,v 1.4.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_error_inc.vspx,v 1.4.2.3 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_errs.vspx b/binsrc/yacutia/vdb_errs.vspx
index 01258ad..5a8e1d6 100644
--- a/binsrc/yacutia/vdb_errs.vspx
+++ b/binsrc/yacutia/vdb_errs.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_errs.vspx,v 1.3.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_errs.vspx,v 1.3.2.4 2010/09/20 10:16:55 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_export.vspx b/binsrc/yacutia/vdb_export.vspx
index 2bebe24..d192a88 100644
--- a/binsrc/yacutia/vdb_export.vspx
+++ b/binsrc/yacutia/vdb_export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdb_export.vspx,v 1.1.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_export.vspx,v 1.1.2.3 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_link.vspx b/binsrc/yacutia/vdb_link.vspx
index dff3835..5f467de 100644
--- a/binsrc/yacutia/vdb_link.vspx
+++ b/binsrc/yacutia/vdb_link.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdb_link.vspx,v 1.4.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_link.vspx,v 1.4.2.3 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_linked_obj.vspx b/binsrc/yacutia/vdb_linked_obj.vspx
index b343f9a..51d2ea6 100644
--- a/binsrc/yacutia/vdb_linked_obj.vspx
+++ b/binsrc/yacutia/vdb_linked_obj.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_linked_obj.vspx,v 1.3.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_linked_obj.vspx,v 1.3.2.4 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_main.vspx b/binsrc/yacutia/vdb_main.vspx
index aa3fa3c..b0db9be 100644
--- a/binsrc/yacutia/vdb_main.vspx
+++ b/binsrc/yacutia/vdb_main.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_main.vspx,v 1.5.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_main.vspx,v 1.5.2.3 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_obj_link.vspx b/binsrc/yacutia/vdb_obj_link.vspx
index 9df4827..5d1fa41 100644
--- a/binsrc/yacutia/vdb_obj_link.vspx
+++ b/binsrc/yacutia/vdb_obj_link.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_obj_link.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_obj_link.vspx,v 1.3.2.3 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_obj_link_opts.vspx b/binsrc/yacutia/vdb_obj_link_opts.vspx
index b034069..d63eb4c 100644
--- a/binsrc/yacutia/vdb_obj_link_opts.vspx
+++ b/binsrc/yacutia/vdb_obj_link_opts.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_obj_link_opts.vspx,v 1.5.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_obj_link_opts.vspx,v 1.5.2.4 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_obj_link_pk.vspx b/binsrc/yacutia/vdb_obj_link_pk.vspx
index 8f8c374..1819f5a 100644
--- a/binsrc/yacutia/vdb_obj_link_pk.vspx
+++ b/binsrc/yacutia/vdb_obj_link_pk.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_obj_link_pk.vspx,v 1.4.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_obj_link_pk.vspx,v 1.4.2.3 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_resources.vspx b/binsrc/yacutia/vdb_resources.vspx
index 9e4583a..33c2fa5 100644
--- a/binsrc/yacutia/vdb_resources.vspx
+++ b/binsrc/yacutia/vdb_resources.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdb_resources.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_resources.vspx,v 1.3.2.3 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdb_unlink_obj.vspx b/binsrc/yacutia/vdb_unlink_obj.vspx
index 32d2c0a..b1190b6 100644
--- a/binsrc/yacutia/vdb_unlink_obj.vspx
+++ b/binsrc/yacutia/vdb_unlink_obj.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: vdb_unlink_obj.vspx,v 1.4.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vdb_unlink_obj.vspx,v 1.4.2.4 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vdir_browser.vspx b/binsrc/yacutia/vdir_browser.vspx
index 0e53088..c6e6e18 100644
--- a/binsrc/yacutia/vdir_browser.vspx
+++ b/binsrc/yacutia/vdir_browser.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vdir_browser.vspx,v 1.5.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: vdir_browser.vspx,v 1.5.2.4 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vfs_export.vspx b/binsrc/yacutia/vfs_export.vspx
index 6068c7a..1026353 100644
--- a/binsrc/yacutia/vfs_export.vspx
+++ b/binsrc/yacutia/vfs_export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vfs_export.vspx,v 1.1.4.6 2012/03/08 12:55:29 source Exp $
+ - $Id: vfs_export.vspx,v 1.1.4.5 2011/05/02 14:13:41 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/vhost_export.vspx b/binsrc/yacutia/vhost_export.vspx
index a9b7080..76e4c4e 100644
--- a/binsrc/yacutia/vhost_export.vspx
+++ b/binsrc/yacutia/vhost_export.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: vhost_export.vspx,v 1.1.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: vhost_export.vspx,v 1.1.2.2 2010/09/20 10:16:56 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/view.vsp b/binsrc/yacutia/view.vsp
index dd86146..a0dc903 100644
--- a/binsrc/yacutia/view.vsp
+++ b/binsrc/yacutia/view.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: view.vsp,v 1.2.2.3 2012/03/08 12:55:29 source Exp $
+-- $Id: view.vsp,v 1.2.2.2 2010/09/20 10:16:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/view.vspx b/binsrc/yacutia/view.vspx
index d452850..613266c 100644
--- a/binsrc/yacutia/view.vspx
+++ b/binsrc/yacutia/view.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: view.vspx,v 1.2.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: view.vspx,v 1.2.2.2 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/view_dav_res.vsp b/binsrc/yacutia/view_dav_res.vsp
index 78aefe2..04f0db3 100644
--- a/binsrc/yacutia/view_dav_res.vsp
+++ b/binsrc/yacutia/view_dav_res.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: view_dav_res.vsp,v 1.2.2.3 2012/03/08 12:55:29 source Exp $
+-- $Id: view_dav_res.vsp,v 1.2.2.2 2010/09/20 10:16:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/view_file.vsp b/binsrc/yacutia/view_file.vsp
index 96ba064..2ccd97e 100644
--- a/binsrc/yacutia/view_file.vsp
+++ b/binsrc/yacutia/view_file.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: view_file.vsp,v 1.2.2.3 2012/03/08 12:55:29 source Exp $
+-- $Id: view_file.vsp,v 1.2.2.2 2010/09/20 10:16:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/virtuoso_splash.vspx b/binsrc/yacutia/virtuoso_splash.vspx
index 126bc10..e06eab0 100644
--- a/binsrc/yacutia/virtuoso_splash.vspx
+++ b/binsrc/yacutia/virtuoso_splash.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: virtuoso_splash.vspx,v 1.2.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: virtuoso_splash.vspx,v 1.2.2.2 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/wsdl_service_create.vspx b/binsrc/yacutia/wsdl_service_create.vspx
index 837a8b0..9f06594 100644
--- a/binsrc/yacutia/wsdl_service_create.vspx
+++ b/binsrc/yacutia/wsdl_service_create.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: wsdl_service_create.vspx,v 1.4.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: wsdl_service_create.vspx,v 1.4.2.4 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/wsdl_services.vspx b/binsrc/yacutia/wsdl_services.vspx
index 5d31276..49b4826 100644
--- a/binsrc/yacutia/wsdl_services.vspx
+++ b/binsrc/yacutia/wsdl_services.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: wsdl_services.vspx,v 1.3.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: wsdl_services.vspx,v 1.3.2.3 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/wsdltree.vspx b/binsrc/yacutia/wsdltree.vspx
index 02b892b..7d676c1 100644
--- a/binsrc/yacutia/wsdltree.vspx
+++ b/binsrc/yacutia/wsdltree.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: wsdltree.vspx,v 1.4.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: wsdltree.vspx,v 1.4.2.4 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xddl-tables.vspx b/binsrc/yacutia/xddl-tables.vspx
index e7fa44e..acf76a9 100644
--- a/binsrc/yacutia/xddl-tables.vspx
+++ b/binsrc/yacutia/xddl-tables.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xddl-tables.vspx,v 1.4.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: xddl-tables.vspx,v 1.4.2.4 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xddl.vspx b/binsrc/yacutia/xddl.vspx
index b96a8f6..6e1f180 100644
--- a/binsrc/yacutia/xddl.vspx
+++ b/binsrc/yacutia/xddl.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xddl.vspx,v 1.5.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: xddl.vspx,v 1.5.2.2 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xml_check.vspx b/binsrc/yacutia/xml_check.vspx
index edff90c..0097120 100644
--- a/binsrc/yacutia/xml_check.vspx
+++ b/binsrc/yacutia/xml_check.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xml_check.vspx,v 1.2.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: xml_check.vspx,v 1.2.2.2 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xml_sql.vspx b/binsrc/yacutia/xml_sql.vspx
index 10b5177..6e275a5 100644
--- a/binsrc/yacutia/xml_sql.vspx
+++ b/binsrc/yacutia/xml_sql.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: xml_sql.vspx,v 1.4.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: xml_sql.vspx,v 1.4.2.4 2010/09/20 10:16:57 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xml_sql2.vspx b/binsrc/yacutia/xml_sql2.vspx
index ac04b9e..1a6c228 100644
--- a/binsrc/yacutia/xml_sql2.vspx
+++ b/binsrc/yacutia/xml_sql2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xml_sql2.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: xml_sql2.vspx,v 1.2.2.3 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xml_sql_check.vspx b/binsrc/yacutia/xml_sql_check.vspx
index 77ea073..4745b29 100644
--- a/binsrc/yacutia/xml_sql_check.vspx
+++ b/binsrc/yacutia/xml_sql_check.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xml_sql_check.vspx,v 1.3.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: xml_sql_check.vspx,v 1.3.2.2 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xml_sql_view_show.vspx b/binsrc/yacutia/xml_sql_view_show.vspx
index fc51388..17f8259 100644
--- a/binsrc/yacutia/xml_sql_view_show.vspx
+++ b/binsrc/yacutia/xml_sql_view_show.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xml_sql_view_show.vspx,v 1.2.2.3 2012/03/08 12:55:29 source Exp $
+ - $Id: xml_sql_view_show.vspx,v 1.2.2.2 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xml_xsd.vspx b/binsrc/yacutia/xml_xsd.vspx
index 03f476c..b4ef110 100644
--- a/binsrc/yacutia/xml_xsd.vspx
+++ b/binsrc/yacutia/xml_xsd.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xml_xsd.vspx,v 1.4.2.5 2012/03/08 12:55:29 source Exp $
+ - $Id: xml_xsd.vspx,v 1.4.2.4 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xquery.vspx b/binsrc/yacutia/xquery.vspx
index b2a1583..4735f68 100644
--- a/binsrc/yacutia/xquery.vspx
+++ b/binsrc/yacutia/xquery.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xquery.vspx,v 1.2.2.4 2012/03/08 12:55:29 source Exp $
+ - $Id: xquery.vspx,v 1.2.2.3 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xquery2.vspx b/binsrc/yacutia/xquery2.vspx
index c53bd09..df1b869 100644
--- a/binsrc/yacutia/xquery2.vspx
+++ b/binsrc/yacutia/xquery2.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xquery2.vspx,v 1.4.2.4 2012/03/08 12:55:30 source Exp $
+ - $Id: xquery2.vspx,v 1.4.2.3 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xquery3.vspx b/binsrc/yacutia/xquery3.vspx
index 81568cd..17f718a 100644
--- a/binsrc/yacutia/xquery3.vspx
+++ b/binsrc/yacutia/xquery3.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xquery3.vspx,v 1.3.2.4 2012/03/08 12:55:30 source Exp $
+ - $Id: xquery3.vspx,v 1.3.2.3 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xquery4.vspx b/binsrc/yacutia/xquery4.vspx
index 0c9ca9c..ba38c18 100644
--- a/binsrc/yacutia/xquery4.vspx
+++ b/binsrc/yacutia/xquery4.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xquery4.vspx,v 1.3.2.4 2012/03/08 12:55:30 source Exp $
+ - $Id: xquery4.vspx,v 1.3.2.3 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xquery_adv.vspx b/binsrc/yacutia/xquery_adv.vspx
index 45c5c5e..4bcb86d 100644
--- a/binsrc/yacutia/xquery_adv.vspx
+++ b/binsrc/yacutia/xquery_adv.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xquery_adv.vspx,v 1.3.2.4 2012/03/08 12:55:30 source Exp $
+ - $Id: xquery_adv.vspx,v 1.3.2.3 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xquery_check.vspx b/binsrc/yacutia/xquery_check.vspx
index 06240cc..42444fc 100644
--- a/binsrc/yacutia/xquery_check.vspx
+++ b/binsrc/yacutia/xquery_check.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xquery_check.vspx,v 1.3.2.3 2012/03/08 12:55:30 source Exp $
+ - $Id: xquery_check.vspx,v 1.3.2.2 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xquery_src_show.vspx b/binsrc/yacutia/xquery_src_show.vspx
index 6ebf68a..9b54af3 100644
--- a/binsrc/yacutia/xquery_src_show.vspx
+++ b/binsrc/yacutia/xquery_src_show.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xquery_src_show.vspx,v 1.2.2.3 2012/03/08 12:55:30 source Exp $
+ - $Id: xquery_src_show.vspx,v 1.2.2.2 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xquery_templates.vspx b/binsrc/yacutia/xquery_templates.vspx
index b294b8c..7120c6c 100644
--- a/binsrc/yacutia/xquery_templates.vspx
+++ b/binsrc/yacutia/xquery_templates.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xquery_templates.vspx,v 1.3.2.5 2012/03/08 12:55:30 source Exp $
+ - $Id: xquery_templates.vspx,v 1.3.2.4 2010/09/20 10:16:58 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xslt.vspx b/binsrc/yacutia/xslt.vspx
index 2a5945b..bf51af6 100644
--- a/binsrc/yacutia/xslt.vspx
+++ b/binsrc/yacutia/xslt.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xslt.vspx,v 1.2.2.4 2012/03/08 12:55:30 source Exp $
+ - $Id: xslt.vspx,v 1.2.2.3 2010/09/20 10:16:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xslt_inc.vspx b/binsrc/yacutia/xslt_inc.vspx
index 46a6bcb..411ed58 100644
--- a/binsrc/yacutia/xslt_inc.vspx
+++ b/binsrc/yacutia/xslt_inc.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xslt_inc.vspx,v 1.3.2.4 2012/03/08 12:55:30 source Exp $
+ - $Id: xslt_inc.vspx,v 1.3.2.3 2010/09/20 10:16:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xslt_res.vsp b/binsrc/yacutia/xslt_res.vsp
index 63b4250..ef67db6 100644
--- a/binsrc/yacutia/xslt_res.vsp
+++ b/binsrc/yacutia/xslt_res.vsp
@@ -1,11 +1,11 @@
<?vsp
--
--- $Id: xslt_res.vsp,v 1.2.2.4 2012/03/08 12:55:30 source Exp $
+-- $Id: xslt_res.vsp,v 1.2.2.3 2010/09/20 10:16:59 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xslt_res.vspx b/binsrc/yacutia/xslt_res.vspx
index 9fbb0c8..f3855a5 100644
--- a/binsrc/yacutia/xslt_res.vspx
+++ b/binsrc/yacutia/xslt_res.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: xslt_res.vspx,v 1.4.2.3 2012/03/08 12:55:30 source Exp $
+ - $Id: xslt_res.vspx,v 1.4.2.2 2010/09/20 10:16:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/xslt_result.vspx b/binsrc/yacutia/xslt_result.vspx
index 94bc5b0..1acff0a 100644
--- a/binsrc/yacutia/xslt_result.vspx
+++ b/binsrc/yacutia/xslt_result.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: xslt_result.vspx,v 1.3.2.4 2012/03/08 12:55:30 source Exp $
+ - $Id: xslt_result.vspx,v 1.3.2.3 2010/09/20 10:16:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/yac.sql b/binsrc/yacutia/yac.sql
index 733d126..fe12bee 100644
--- a/binsrc/yacutia/yac.sql
+++ b/binsrc/yacutia/yac.sql
@@ -1,10 +1,10 @@
--
--- $Id: yac.sql,v 1.1.1.1.2.4 2012/03/08 12:55:30 source Exp $
+-- $Id: yac.sql,v 1.1.1.1.2.3 2010/09/20 10:16:59 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/yacutia.sql b/binsrc/yacutia/yacutia.sql
index 2973f11..80e43fb 100644
--- a/binsrc/yacutia/yacutia.sql
+++ b/binsrc/yacutia/yacutia.sql
@@ -1,10 +1,10 @@
--
--- $Id: yacutia.sql,v 1.43.2.42 2012/03/08 12:55:30 source Exp $
+-- $Id: yacutia.sql,v 1.43.2.40 2011/10/25 23:34:29 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -331,10 +331,10 @@ create procedure adm_menu_tree ()
<node name="Basic" url="db_repl_basic_local.vspx" id="8011" place="1" />
<node name="Basic" url="db_repl_basic_local_create.vspx" id="8012" place="1" />
</node>
- <node name="Incremental" url="db_repl_snap_pull.vspx" id="81" >
- <node name="Incremental" url="db_repl_snap_pull_create.vspx" id="82" place="1" />
- <node name="Incremental" url="db_repl_snap.vspx" id="83" place="1"/>
- <node name="Incremental" url="db_repl_snap_create.vspx" id="84" place="1" />
+ <node name="Incremental" url="db_repl_snap.vspx" id="81" >
+ <node name="Incremental" url="db_repl_snap_create.vspx" id="82" place="1" />
+ <node name="Incremental" url="db_repl_snap_pull.vspx" id="83" place="1"/>
+ <node name="Incremental" url="db_repl_snap_pull_create.vspx" id="84" place="1" />
<node name="Incremental" url="db_repl_snap_local.vspx" id="85" place="1"/>
<node name="Incremental" url="db_repl_snap_local_create.vspx" id="86" place="1" />
</node>
@@ -485,9 +485,6 @@ case when 0 and check_package('rdf_mappers') then
<node name="Views" url="db_rdf_view_tb.vspx" id="273" place="1"/>
<node name="Views" url="db_rdf_view_cols.vspx" id="273" place="1"/>
<node name="Views" url="db_rdf_view_pk.vspx" id="273" place="1"/>
- <node name="R2RML" url="r2rml_import.vspx" id="273" />
- <node name="R2RML" url="r2rml_validate.vspx" id="273" place="1"/>
- <node name="R2RML" url="r2rml_gen.vspx" id="273" place="1"/>
<node name="Quad Store Upload" url="rdf_import.vspx" id="271" allowed="rdf_import_page"/>',
case when __proc_exists ('PSH.DBA.cli_subscribe') is not null then
'<node name="Subscriptions (PHSB)" url="rdf_psh_subs.vspx" id="271" allowed="rdf_psh_sub_page"/>'
@@ -6235,8 +6232,6 @@ create procedure y_rdf_api_type (in t int)
return 'URL';
else if (t = 2)
return 'keywords';
- else if (t = 3)
- return 'preprocess';
return '';
}
;
@@ -6528,39 +6523,3 @@ create procedure y_list_webids (in uname varchar)
return webids;
}
;
-
-create procedure construct_table_sql( in tablename varchar ) returns varchar
-{
- declare sql varchar;
- declare k integer;
-
- sql := 'SELECT ';
- k := 0;
-
- for SELECT c."COLUMN" as COL_NAME
- from DB.DBA.SYS_KEYS k, DB.DBA.SYS_KEY_PARTS kp, "SYS_COLS" c
- where
- name_part (k.KEY_TABLE, 0) = name_part (tablename, 0) and
- name_part (k.KEY_TABLE, 1) = name_part (tablename, 1) and
- name_part (k.KEY_TABLE, 2) = name_part (tablename, 2)
- and __any_grants (k.KEY_TABLE)
- and c."COLUMN" <> '_IDN'
- and k.KEY_IS_MAIN = 1
- and k.KEY_MIGRATE_TO is null
- and kp.KP_KEY_ID = k.KEY_ID
- and c.COL_ID = kp.KP_COL
- order by kp.KP_NTH do
- {
- if (k > 0 )
- sql := concat( sql, ',' );
- else k := 1;
-
- sql := concat( sql, COL_NAME);
-
- }
- sql := concat(sql, ' FROM ', tablename);
-
- return sql;
-}
-;
-
diff --git a/binsrc/yacutia/yacutia_decor.vspx b/binsrc/yacutia/yacutia_decor.vspx
index b884e4d..8350288 100644
--- a/binsrc/yacutia/yacutia_decor.vspx
+++ b/binsrc/yacutia/yacutia_decor.vspx
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-
- - $Id: yacutia_decor.vspx,v 1.7.2.5 2012/03/08 12:55:30 source Exp $
+ - $Id: yacutia_decor.vspx,v 1.7.2.4 2010/09/20 10:16:59 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/yacutia_style.css b/binsrc/yacutia/yacutia_style.css
index 71810c6..db0ac9d 100644
--- a/binsrc/yacutia/yacutia_style.css
+++ b/binsrc/yacutia/yacutia_style.css
@@ -1,10 +1,10 @@
/*
- * $Id: yacutia_style.css,v 1.7.2.9 2012/03/08 12:55:30 source Exp $
+ * $Id: yacutia_style.css,v 1.7.2.8 2011/01/25 14:21:44 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/yacutia_style.xsl b/binsrc/yacutia/yacutia_style.xsl
index 214d524..47b7adf 100644
--- a/binsrc/yacutia/yacutia_style.xsl
+++ b/binsrc/yacutia/yacutia_style.xsl
@@ -2,12 +2,12 @@
<!-- <!DOCTYPE html PUBLIC "" "ent.dtd"> -->
<!--
-
- - $Id: yacutia_style.xsl,v 1.9.2.7 2012/03/08 13:13:48 source Exp $
+ - $Id: yacutia_style.xsl,v 1.9.2.5 2011/01/25 14:21:44 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -26,6 +26,7 @@
-->
<!--
Virtuoso Conductor XSL style-sheet for page macros
+ (C)Copyright 2005 OpenLink Software
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0"
diff --git a/binsrc/yacutia/yacutia_styles_sample.htm b/binsrc/yacutia/yacutia_styles_sample.htm
index 1a0aaa2..0b6aab1 100644
--- a/binsrc/yacutia/yacutia_styles_sample.htm
+++ b/binsrc/yacutia/yacutia_styles_sample.htm
@@ -1,11 +1,11 @@
<!--
-
- - $Id: yacutia_styles_sample.htm,v 1.1.1.1.2.4 2012/03/08 12:55:30 source Exp $
+ - $Id: yacutia_styles_sample.htm,v 1.1.1.1.2.3 2010/09/20 10:17:00 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/binsrc/yacutia/yacutia_vdir_style.css b/binsrc/yacutia/yacutia_vdir_style.css
index a07876f..2ca7adb 100644
--- a/binsrc/yacutia/yacutia_vdir_style.css
+++ b/binsrc/yacutia/yacutia_vdir_style.css
@@ -1,10 +1,10 @@
/*
- * $Id: yacutia_vdir_style.css,v 1.2.2.3 2012/03/08 12:55:30 source Exp $
+ * $Id: yacutia_vdir_style.css,v 1.2.2.2 2010/09/20 10:17:00 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/configure b/configure
index 99d137a..2db69c6 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Id: configure.in.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Virtuoso Open Source Edition 6.1.5.
+# Generated by GNU Autoconf 2.68 for Virtuoso Open Source Edition 6.1.4.
#
# Report bugs to <vos.admin at openlinksw.com>.
#
@@ -175,15 +175,7 @@ test x\$exitcode = x0 || exit 1"
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
- test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
- PATH=/empty FPATH=/empty; export PATH FPATH
- test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
- || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
else
@@ -545,8 +537,155 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
+case X$lt_ECHO in
+X*--fallback-echo)
+ # Remove one level of quotation (which was required for Make).
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+ ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $ECHO works!
+ :
+else
+ # Restart under the correct shell.
+ exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<_LT_EOF
+$*
+_LT_EOF
+ exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+ then
+ break
+ fi
+ done
+ fi
+
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+ else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
+
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$dir/echo"
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ ECHO='print -r'
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+ else
+ # Try using printf.
+ ECHO='printf %s\n'
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
+
+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
+
+ if test "$prev" != 'sed 50q "$0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+ fi
+ fi
+ fi
+ fi
+ fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
@@ -571,8 +710,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Virtuoso Open Source Edition'
PACKAGE_TARNAME='virtuoso-opensource'
-PACKAGE_VERSION='6.1.5'
-PACKAGE_STRING='Virtuoso Open Source Edition 6.1.5'
+PACKAGE_VERSION='6.1.4'
+PACKAGE_STRING='Virtuoso Open Source Edition 6.1.4'
PACKAGE_BUGREPORT='vos.admin at openlinksw.com'
PACKAGE_URL=''
@@ -641,8 +780,6 @@ WITH_FCT_VAD_FALSE
WITH_FCT_VAD_TRUE
WITH_DEMO_VAD_FALSE
WITH_DEMO_VAD_TRUE
-WITH_DBPEDIA_VAD_FALSE
-WITH_DBPEDIA_VAD_TRUE
WITH_CONDUCTOR_VAD_FALSE
WITH_CONDUCTOR_VAD_TRUE
WITH_BPEL_VAD_FALSE
@@ -744,11 +881,9 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
-MANIFEST_TOOL
+lt_ECHO
RANLIB
-ac_ct_AR
AR
-DLLTOOL
OBJDUMP
NM
ac_ct_DUMPBIN
@@ -885,7 +1020,6 @@ enable_shared
enable_static
with_pic
enable_fast_install
-with_sysroot
enable_libtool_lock
with_debug
enable_xml
@@ -923,7 +1057,6 @@ with_port
enable_
enable_bpel_vad
enable_conductor_vad
-enable_dbpedia_vad
enable_demo_vad
enable_fct_vad
enable_isparql_vad
@@ -1487,7 +1620,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Virtuoso Open Source Edition 6.1.5 to adapt to many kinds of systems.
+\`configure' configures Virtuoso Open Source Edition 6.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1558,7 +1691,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Virtuoso Open Source Edition 6.1.5:";;
+ short | recursive ) echo "Configuration of Virtuoso Open Source Edition 6.1.4:";;
esac
cat <<\_ACEOF
@@ -1616,8 +1749,6 @@ VAD Packages:
--disable-bpel-vad disable BPEL vad]
--enable-conductor-vad enable Conductor vad package (default)
--disable-conductor-vad disable Conductor vad package]
- --enable-dbpedia-vad enable DBpedia vad package (default)
- --disable-conductor-vad disable DBpedia vad package]
--enable-demo-vad enable Demo vad package (default)
--disable-demo-vad disable Demo vad package]
--enable-fct-vad enable Demo vad package (default)
@@ -1645,8 +1776,6 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
- --with-sysroot=DIR Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).
--with-debug debugging code
--with-xml-prefix=PFX Prefix where libxml is installed (optional)
--with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)
@@ -1749,7 +1878,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Virtuoso Open Source Edition configure 6.1.5
+Virtuoso Open Source Edition configure 6.1.4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2453,7 +2582,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Virtuoso Open Source Edition $as_me 6.1.5, which was
+It was created by Virtuoso Open Source Edition $as_me 6.1.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3273,7 +3402,7 @@ fi
# Define the identity of the package.
PACKAGE='virtuoso-opensource'
- VERSION='6.1.5'
+ VERSION='6.1.4'
cat >>confdefs.h <<_ACEOF
@@ -5168,58 +5297,6 @@ test -z "$GREP" && GREP=grep
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
-else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO ""
-}
-
-case "$ECHO" in
- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
# Check whether --with-gnu-ld was given.
@@ -7121,8 +7198,8 @@ esac
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.2.6b'
+macro_revision='1.3018'
@@ -7138,23 +7215,6 @@ macro_revision='1.3293'
ltmain="$ac_aux_dir/ltmain.sh"
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
if ${lt_cv_path_NM+:} false; then :
@@ -7210,11 +7270,8 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$DUMPBIN"; then :
- # Let the user override the test.
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in dumpbin "link -dump"
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7258,7 +7315,7 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in dumpbin "link -dump"
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7313,15 +7370,6 @@ esac
fi
fi
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
- *COFF*)
- DUMPBIN="$DUMPBIN -symbols"
- ;;
- *)
- DUMPBIN=:
- ;;
- esac
- fi
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -7341,13 +7389,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7392: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7395: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+ (eval echo "\"\$as_me:7398: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7393,11 +7441,6 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- mint*)
- # On MiNT this can take a long time and run out of memory.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -7462,8 +7505,8 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -7505,8 +7548,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,, \
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -7555,80 +7598,6 @@ esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- ;;
- esac
- ;;
- *-*-cygwin* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- ;;
- esac
- ;;
- * ) # unhandled hosts (and "normal" native builds)
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- ;;
- esac
- ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
if ${lt_cv_ld_reload_flag+:} false; then :
@@ -7645,11 +7614,6 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
- reload_cmds=false
- fi
- ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -7813,18 +7777,16 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- # Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc*)
+cegcc)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -7854,10 +7816,6 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-haiku*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -7866,11 +7824,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -7892,7 +7850,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -7973,21 +7931,6 @@ esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
- case $host_os in
- mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- fi
- ;;
- esac
-fi
-
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -8003,26 +7946,16 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$DLLTOOL"; then
- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8031,7 +7964,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -8041,10 +7974,10 @@ IFS=$as_save_IFS
fi
fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -8052,17 +7985,17 @@ fi
fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
+if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_DLLTOOL"; then
- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8071,7 +8004,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -8081,17 +8014,17 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_DLLTOOL" = x; then
- DLLTOOL="false"
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8099,54 +8032,18 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- DLLTOOL=$ac_ct_DLLTOOL
+ AR=$ac_ct_AR
fi
else
- DLLTOOL="$ac_cv_prog_DLLTOOL"
+ AR="$ac_cv_prog_AR"
fi
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- *--identify-strict*)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- ;;
- *)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- ;;
- esac
- ;;
-*)
- # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
@@ -8155,17 +8052,15 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
if test -n "$ac_tool_prefix"; then
- for ac_prog in ar
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8174,7 +8069,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -8184,32 +8079,28 @@ IFS=$as_save_IFS
fi
fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$AR" && break
- done
fi
-if test -z "$AR"; then
- ac_ct_AR=$AR
- for ac_prog in ar
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8218,7 +8109,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="$ac_prog"
+ ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -8228,175 +8119,10 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_AR" && break
-done
-
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- AR=$ac_ct_AR
- fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_ar_at_file=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- echo conftest.$ac_objext > conftest.lst
- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- (eval $lt_ar_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
- # Ensure the archiver fails upon bogus file names.
- rm -f conftest.$ac_objext libconftest.a
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- (eval $lt_ar_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if test "$ac_status" -ne 0; then
- lt_cv_ar_at_file=@
- fi
- fi
- rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test "x$lt_cv_ar_at_file" = xno; then
- archiver_list_spec=
-else
- archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -8540,18 +8266,6 @@ if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
-case $host_os in
- darwin*)
- lock_old_archive_extraction=yes ;;
- *)
- lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
@@ -8659,8 +8373,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -8696,7 +8410,6 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -8722,8 +8435,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
@@ -8738,18 +8451,6 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data. */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -8761,7 +8462,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-LT_DLSYM_CONST struct {
+const struct {
const char *name;
void *address;
}
@@ -8787,8 +8488,8 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_globsym_save_LIBS=$LIBS
- lt_globsym_save_CFLAGS=$CFLAGS
+ lt_save_LIBS="$LIBS"
+ lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -8798,8 +8499,8 @@ _LT_EOF
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS=$lt_globsym_save_LIBS
- CFLAGS=$lt_globsym_save_CFLAGS
+ LIBS="$lt_save_LIBS"
+ CFLAGS="$lt_save_CFLAGS"
else
echo "cannot find nm_test_func in $nlist" >&5
fi
@@ -8836,23 +8537,6 @@ else
$as_echo "ok" >&6; }
fi
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
@@ -8869,38 +8553,6 @@ fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
- withval=$with_sysroot;
-else
- with_sysroot=no
-fi
-
-
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
- if test "$GCC" = yes; then
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- fi
- ;; #(
- /*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
- ;; #(
- no|'')
- ;; #(
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
- as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
@@ -8937,7 +8589,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ echo '#line 8592 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9099,123 +8751,6 @@ esac
need_locks="$enable_libtool_lock"
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$MANIFEST_TOOL"; then
- ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_MANIFEST_TOOL"; then
- ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_MANIFEST_TOOL" = x; then
- MANIFEST_TOOL=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- fi
-else
- MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_path_mainfest_tool=no
- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- cat conftest.err >&5
- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_mainfest_tool=yes
- fi
- rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
- MANIFEST_TOOL=:
-fi
-
-
-
-
-
case $host_os in
rhapsody* | darwin*)
@@ -9766,38 +9301,6 @@ rm -f core conftest.err conftest.$ac_objext \
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_ld_force_load=no
- cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- echo "$RANLIB libconftest.a" >&5
- $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
- _lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
- lt_cv_ld_force_load=yes
- else
- cat conftest.err >&5
- fi
- rm -f conftest.err libconftest.a conftest conftest.c
- rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -9825,7 +9328,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test "$DSYMUTIL" != ":"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -9848,8 +9351,6 @@ done
-
-
# Set options
@@ -10002,7 +9503,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
test -z "$LN_S" && LN_S="ln -s"
@@ -10052,6 +9552,19 @@ _ACEOF
+
+
+
+
+
+
+
+
+
+
+
+
+
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
@@ -10064,6 +9577,23 @@ aix3*)
;;
esac
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -10092,7 +9622,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# Only perform the check for file, if the check method requires it
@@ -10301,12 +9831,7 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
- case $cc_basename in
- nvcc*)
- lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
- *)
- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
- esac
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
@@ -10326,15 +9851,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9854: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:9858: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
@@ -10363,6 +9888,8 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -10410,12 +9937,6 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-fno-common'
;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- lt_prog_compiler_static=
- ;;
-
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -10458,13 +9979,6 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-fPIC'
;;
esac
-
- case $cc_basename in
- nvcc*) # Cuda Compiler Driver 2.2
- lt_prog_compiler_wl='-Xlinker '
- lt_prog_compiler_pic='-Xcompiler -fPIC'
- ;;
- esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -10506,7 +10020,7 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -10527,13 +10041,7 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
- nagfor*)
- # NAG Fortran compiler
- lt_prog_compiler_wl='-Wl,-Wl,,'
- lt_prog_compiler_pic='-PIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@ -10545,26 +10053,26 @@ lt_prog_compiler_static=
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- xl* | bgxl* | bgf* | mpixl*)
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-qpic'
lt_prog_compiler_static='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
- ;;
*Sun\ C*)
# Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
lt_prog_compiler_wl='-Wl,'
;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl=''
+ ;;
esac
;;
esac
@@ -10595,7 +10103,7 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ f77* | f90* | f95*)
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
@@ -10652,17 +10160,13 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
#
# Check to make sure the PIC flag actually works.
@@ -10686,15 +10190,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10193: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:10197: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
@@ -10723,11 +10227,6 @@ fi
-
-
-
-
-
#
# Check to make sure the static flag actually works.
#
@@ -10747,7 +10246,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
@@ -10796,16 +10295,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10298: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:10302: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -10851,16 +10350,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10353: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:10357: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -10973,33 +10472,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
ld_shlibs=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
- case $host_os in
- aix*)
- # The AIX port of GNU ld has always aspired to compatibility
- # with the native linker. However, as the warning in the GNU ld
- # block says, versions before 2.19.5* couldn't really create working
- # shared libraries, regardless of the interface used.
- case `$LD -v 2>&1` in
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
- *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
- *\ \(GNU\ Binutils\)\ [3-9]*) ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- fi
-
- if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -11017,7 +10490,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
- *GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -11033,12 +10505,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
_LT_EOF
fi
@@ -11074,12 +10545,10 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
- export_dynamic_flag_spec='${wl}--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
- exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -11097,11 +10566,6 @@ _LT_EOF
fi
;;
- haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- link_all_deplibs=yes
- ;;
-
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -11117,7 +10581,7 @@ _LT_EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -11127,16 +10591,15 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=' $pic_flag'
+ tmp_addflag=
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -11147,17 +10610,13 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
- xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
- nvcc*) # Cuda Compiler Driver 2.2
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- compiler_needs_object=yes
- ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -11173,17 +10632,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf* | bgf* | bgxlf* | mpixlf*)
+ xlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
hardcode_libdir_flag_spec=
hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -11197,8 +10656,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -11216,8 +10675,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -11263,8 +10722,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -11304,10 +10763,8 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -11394,13 +10851,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- if ${lt_cv_aix_libpath_+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11413,32 +10864,25 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }'
- lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
- fi
-
-fi
-
- aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -11447,13 +10891,7 @@ fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- if ${lt_cv_aix_libpath_+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11466,42 +10904,30 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }'
- lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
- fi
-
-fi
-
- aix_libpath=$lt_cv_aix_libpath_
-fi
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
- # We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
- fi
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -11533,63 +10959,20 @@ fi
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- case $cc_basename in
- cl*)
- # Native MSVC
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- always_export_symbols=yes
- file_list_spec='@'
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
- # The linker will not automatically build a static lib if we build a DLL.
- # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- # Don't use ranlib
- old_postinstall_cmds='chmod 644 $oldlib'
- postlink_cmds='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # Assume MSVC wrapper
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_from_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- enable_shared_with_static_runtimes=yes
- ;;
- esac
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes=yes
;;
darwin* | rhapsody*)
@@ -11599,11 +10982,7 @@ fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
- else
- whole_archive_flag_spec=''
- fi
+ whole_archive_flag_spec=''
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -11611,7 +10990,7 @@ fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=func_echo_all
+ output_verbose_link_cmd=echo
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -11654,7 +11033,7 @@ fi
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
@@ -11662,7 +11041,7 @@ fi
hpux9*)
if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
@@ -11677,8 +11056,8 @@ fi
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -11696,67 +11075,28 @@ fi
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- case $host_cpu in
- hppa*64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
-
- # Older versions of the 11.00 compiler do not understand -b yet
- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -b"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler__b=yes
- fi
- else
- lt_cv_prog_compiler__b=yes
- fi
- fi
- $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
@@ -11784,39 +11124,27 @@ fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- # This should be the same for all languages, so no per-tag cache variable.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int foo (void) { return 0; }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- lt_cv_irix_exported_symbol=yes
-else
- lt_cv_irix_exported_symbol=no
+
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- if test "$lt_cv_irix_exported_symbol" = yes; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- fi
+ LDFLAGS="$save_LDFLAGS"
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -11878,17 +11206,17 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -11898,13 +11226,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -11917,9 +11245,9 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
@@ -12107,50 +11435,44 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- then
- lt_cv_archive_cmds_need_lc=no
- else
- lt_cv_archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
- archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+ then
+ archive_cmds_need_lc=no
+ else
+ archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
fi
@@ -12321,23 +11643,16 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
- case $lt_search_path_spec in
- *\;*)
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
- ;;
- *)
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
- ;;
- esac
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -12350,7 +11665,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -12370,13 +11685,7 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
- # AWK program above erroneously prepends '/' to C:/dos/paths
- # for these hosts.
- case $host_os in
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
- esac
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@ -12464,7 +11773,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -12495,9 +11804,8 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$cc_basename in
- yes,*)
- # gcc
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -12518,83 +11826,36 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- ;;
-
- *,cl*)
- # Native MSVC
- libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
-
- case $build_os in
- mingw*)
- sys_lib_search_path_spec=
- lt_save_ifs=$IFS
- IFS=';'
- for lt_path in $LIB
- do
- IFS=$lt_save_ifs
- # Let DOS variable expansion print the short 8.3 style file name.
- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- done
- IFS=$lt_save_ifs
- # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- ;;
- cygwin*)
- # Convert to unix form, then to dos form, then back to unix form
- # but this time dos style (no spaces!) so that the unix form looks
- # like /cygdrive/c/PROGRA~1:/cygdr...
- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- ;;
- *)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH.
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
- # FIXME: find the short name or the path components, as spaces are
- # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
esac
-
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
- dynamic_linker='Win32 link.exe'
;;
*)
- # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- dynamic_linker='Win32 ld.exe'
;;
esac
+ dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -12681,19 +11942,6 @@ gnu*)
hardcode_into_libs=yes
;;
-haiku*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -12736,10 +11984,8 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
postinstall_cmds='chmod 555 $lib'
- # or fails outright, so override atomically:
- install_override_mode=555
;;
interix[3-9]*)
@@ -12797,7 +12043,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -12806,17 +12052,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
-
# Some binutils ld are patched to set DT_RUNPATH
- if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_shlibpath_overrides_runpath=no
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -12829,31 +12070,23 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- lt_cv_shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=yes
fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
-
-fi
-
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -13155,11 +12388,6 @@ fi
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
@@ -13490,7 +12718,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 12721 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13531,13 +12759,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -13546,11 +12768,7 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
- }
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
else
@@ -13596,7 +12814,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 12817 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13637,13 +12855,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -13652,11 +12864,7 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
- }
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
else
@@ -18546,7 +17754,7 @@ $as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
-/* [#]line 18549 "configure" */
+/* [#]line 17757 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
@@ -18619,7 +17827,7 @@ $as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
-/* [#]line 18622 "configure" */
+/* [#]line 17830 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
@@ -18692,7 +17900,7 @@ $as_echo_n "checking for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
-/* [#]line 18695 "configure" */
+/* [#]line 17903 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
@@ -19151,21 +18359,6 @@ else
fi
-# Check whether --enable-dbpedia-vad was given.
-if test "${enable_dbpedia_vad+set}" = set; then :
- enableval=$enable_dbpedia_vad;
- case "${enableval}" in
- yes) with_dbpedia_vad="yes";;
- no) with_dbpedia_vad="no";;
- *) as_fn_error $? "bad value ${enableval} for --enable-dbpedia-vad" "$LINENO" 5 ;;
- esac
-
-else
- with_dbpedia_vad="yes"
-
-fi
-
-
# Check whether --enable-demo-vad was given.
if test "${enable_demo_vad+set}" = set; then :
enableval=$enable_demo_vad;
@@ -19306,7 +18499,6 @@ if test "x$with_all_vad" = "xno"
then
with_bpel_vad="no"
with_conductor_vad="no"
- with_dbpedia_vad="no"
with_demo_vad="no"
with_fct_vad="no"
with_isparql_vad="no"
@@ -19333,14 +18525,6 @@ else
WITH_CONDUCTOR_VAD_FALSE=
fi
- if test "x$with_dbpedia_vad" = "xyes"; then
- WITH_DBPEDIA_VAD_TRUE=
- WITH_DBPEDIA_VAD_FALSE='#'
-else
- WITH_DBPEDIA_VAD_TRUE='#'
- WITH_DBPEDIA_VAD_FALSE=
-fi
-
if test "x$with_demo_vad" = "xyes"; then
WITH_DEMO_VAD_TRUE=
WITH_DEMO_VAD_FALSE='#'
@@ -19626,7 +18810,7 @@ VIRT_AM_CFLAGS="$CCOPT $CCWARN $CCDEBUG $CCDEFS $ccincl $CCPLATFORMDEFS $DEFS $I
## Generate the files using the above information ##
## ##
##########################################################################
-ac_config_files="$ac_config_files Makefile binsrc/Makefile docsrc/Makefile libsrc/Makefile binsrc/bpel/Makefile binsrc/b3s/Makefile binsrc/cached_resources/Makefile binsrc/dav/Makefile binsrc/dbpedia/Makefile binsrc/driver/Makefile binsrc/hibernate/Makefile binsrc/hosting/Makefile binsrc/hosting/mono/Makefile binsrc/hosting/mono/tests/Makefile binsrc/hosting/perl/Makefile binsrc/hosting/php/Makefile binsrc/hosting/python/Makefile binsrc/hosting/ruby/Makefile binsrc/isparql/Makefile binsrc/jena/Makefile binsrc/maildrop/Makefile binsrc/mono/Makefile binsrc/oat/Makefile binsrc/rdf_mappers/Makefile binsrc/redland/Makefile binsrc/samples/demo/Makefile binsrc/samples/hslookup/Makefile binsrc/samples/image_magick/Makefile binsrc/samples/JDBC/Makefile binsrc/samples/Makefile binsrc/samples/odp/Makefile binsrc/samples/sparql_demo/Makefile binsrc/samples/wbxml2/Makefile binsrc/samples/webapp/Makefile binsrc/samples/xpath/Makefile binsrc/samples/xquery/Makefile binsrc/sesame/Makefile binsrc/sesame2/Makefile binsrc/sesame3/Makefile binsrc/sqldoc/Makefile binsrc/sync/Makefile binsrc/tests/biftest/Makefile binsrc/tests/dotnet/Makefile binsrc/tests/Makefile binsrc/tests/bsbm/Makefile binsrc/tests/lubm/Makefile binsrc/tests/oledb/Makefile binsrc/tests/rdf/Makefile binsrc/tests/suite/Makefile binsrc/tests/suite/tpc-d/Makefile binsrc/tests/tpcrun/Makefile binsrc/tests/wb/Makefile binsrc/tutorial/apps/Makefile binsrc/tutorial/hosting/Makefile binsrc/tutorial/Makefile binsrc/tutorial/services/Makefile binsrc/tutorial/web/Makefile binsrc/tutorial/xml/Makefile binsrc/vad/Makefile binsrc/virtodbc/Makefile binsrc/virtoledb/Makefile binsrc/VirtuosoClient.Net/Makefile binsrc/virtuoso/Makefile binsrc/virtuoso_sink/Makefile binsrc/vsp/Makefile binsrc/vspx/Makefile binsrc/ws/Makefile binsrc/ws/wsrm/Makefile binsrc/xddl/Makefile binsrc/yacutia/Makefile docsrc/chm/Makefile docsrc/docwiki/Makefile docsrc/html_virt/Makefile docsrc/images/Makefile docsrc/pdf/Makefile docsrc/releasenotes/Makefile docsrc/styleguide/Makefile docsrc/stylesheets/Makefile docsrc/xmlsource/Makefile libsrc/Dk/Makefile libsrc/JDBCDriverType4/Makefile libsrc/JDBCDriverType4/testsuite_2.0/Makefile libsrc/JDBCDriverType4/testsuite_3.0/Makefile libsrc/JDBCDriverType4/testsuite_4.0/Makefile libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile libsrc/JDBCDriverType4/virtuoso/Makefile libsrc/langfunc/Makefile libsrc/odbcsdk/Makefile libsrc/plugin/Makefile libsrc/Thread/Makefile libsrc/Tidy/Makefile libsrc/util/Makefile libsrc/Wi/Makefile libsrc/Xml.new/Makefile libsrc/zlib/Makefile appsrc/Makefile appsrc/ODS-Framework/Makefile appsrc/ODS-Addressbook/Makefile appsrc/ODS-Blog/Makefile appsrc/ODS-Bookmark/Makefile appsrc/ODS-Briefcase/Makefile appsrc/ODS-Calendar/Makefile appsrc/ODS-Community/Makefile appsrc/ODS-Discussion/Makefile appsrc/ODS-FeedManager/Makefile appsrc/ODS-Gallery/Makefile appsrc/ODS-Polls/Makefile appsrc/ODS-WebMail/Makefile appsrc/ODS-Wiki/Makefile appsrc/ODS-Wiki/plugin/Makefile"
+ac_config_files="$ac_config_files Makefile binsrc/Makefile docsrc/Makefile libsrc/Makefile binsrc/bpel/Makefile binsrc/b3s/Makefile binsrc/cached_resources/Makefile binsrc/dav/Makefile binsrc/driver/Makefile binsrc/hibernate/Makefile binsrc/hosting/Makefile binsrc/hosting/mono/Makefile binsrc/hosting/mono/tests/Makefile binsrc/hosting/perl/Makefile binsrc/hosting/php/Makefile binsrc/hosting/python/Makefile binsrc/hosting/ruby/Makefile binsrc/isparql/Makefile binsrc/jena/Makefile binsrc/maildrop/Makefile binsrc/mono/Makefile binsrc/oat/Makefile binsrc/rdf_mappers/Makefile binsrc/redland/Makefile binsrc/samples/demo/Makefile binsrc/samples/hslookup/Makefile binsrc/samples/image_magick/Makefile binsrc/samples/JDBC/Makefile binsrc/samples/Makefile binsrc/samples/odp/Makefile binsrc/samples/sparql_demo/Makefile binsrc/samples/wbxml2/Makefile binsrc/samples/webapp/Makefile binsrc/samples/xpath/Makefile binsrc/samples/xquery/Makefile binsrc/sesame/Makefile binsrc/sesame2/Makefile binsrc/sesame3/Makefile binsrc/sqldoc/Makefile binsrc/sync/Makefile binsrc/tests/biftest/Makefile binsrc/tests/dotnet/Makefile binsrc/tests/Makefile binsrc/tests/bsbm/Makefile binsrc/tests/lubm/Makefile binsrc/tests/oledb/Makefile binsrc/tests/rdf/Makefile binsrc/tests/suite/Makefile binsrc/tests/suite/tpc-d/Makefile binsrc/tests/tpcrun/Makefile binsrc/tests/wb/Makefile binsrc/tutorial/apps/Makefile binsrc/tutorial/hosting/Makefile binsrc/tutorial/Makefile binsrc/tutorial/services/Makefile binsrc/tutorial/web/Makefile binsrc/tutorial/xml/Makefile binsrc/vad/Makefile binsrc/virtodbc/Makefile binsrc/virtoledb/Makefile binsrc/VirtuosoClient.Net/Makefile binsrc/virtuoso/Makefile binsrc/virtuoso_sink/Makefile binsrc/vsp/Makefile binsrc/vspx/Makefile binsrc/ws/Makefile binsrc/ws/wsrm/Makefile binsrc/xddl/Makefile binsrc/yacutia/Makefile docsrc/chm/Makefile docsrc/docwiki/Makefile docsrc/html_virt/Makefile docsrc/images/Makefile docsrc/pdf/Makefile docsrc/releasenotes/Makefile docsrc/styleguide/Makefile docsrc/stylesheets/Makefile docsrc/xmlsource/Makefile libsrc/Dk/Makefile libsrc/JDBCDriverType4/Makefile libsrc/JDBCDriverType4/testsuite_2.0/Makefile libsrc/JDBCDriverType4/testsuite_3.0/Makefile libsrc/JDBCDriverType4/testsuite_4.0/Makefile libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile libsrc/JDBCDriverType4/virtuoso/Makefile libsrc/langfunc/Makefile libsrc/odbcsdk/Makefile libsrc/plugin/Makefile libsrc/Thread/Makefile libsrc/Tidy/Makefile libsrc/util/Makefile libsrc/Wi/Makefile libsrc/Xml.new/Makefile libsrc/zlib/Makefile appsrc/Makefile appsrc/ODS-Framework/Makefile appsrc/ODS-Addressbook/Makefile appsrc/ODS-Blog/Makefile appsrc/ODS-Bookmark/Makefile appsrc/ODS-Briefcase/Makefile appsrc/ODS-Calendar/Makefile appsrc/ODS-Community/Makefile appsrc/ODS-Discussion/Makefile appsrc/ODS-FeedManager/Makefile appsrc/ODS-Gallery/Makefile appsrc/ODS-Polls/Makefile appsrc/ODS-WebMail/Makefile appsrc/ODS-Wiki/Makefile appsrc/ODS-Wiki/plugin/Makefile"
ac_config_commands="$ac_config_commands default"
@@ -19850,10 +19034,6 @@ if test -z "${WITH_CONDUCTOR_VAD_TRUE}" && test -z "${WITH_CONDUCTOR_VAD_FALSE}"
as_fn_error $? "conditional \"WITH_CONDUCTOR_VAD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${WITH_DBPEDIA_VAD_TRUE}" && test -z "${WITH_DBPEDIA_VAD_FALSE}"; then
- as_fn_error $? "conditional \"WITH_DBPEDIA_VAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${WITH_DEMO_VAD_TRUE}" && test -z "${WITH_DEMO_VAD_FALSE}"; then
as_fn_error $? "conditional \"WITH_DEMO_VAD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20295,7 +19475,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Virtuoso Open Source Edition $as_me 6.1.5, which was
+This file was extended by Virtuoso Open Source Edition $as_me 6.1.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20361,7 +19541,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Virtuoso Open Source Edition config.status 6.1.5
+Virtuoso Open Source Edition config.status 6.1.4
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -20490,156 +19670,134 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
# Quote evaled strings.
for var in SED \
GREP \
EGREP \
FGREP \
-SHELL \
-ECHO \
LD \
NM \
LN_S \
@@ -20649,13 +19807,8 @@ reload_flag \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
AR \
AR_FLAGS \
-archiver_list_spec \
STRIP \
RANLIB \
CC \
@@ -20665,14 +19818,14 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
+SHELL \
+ECHO \
lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
lt_prog_compiler_wl \
+lt_prog_compiler_pic \
lt_prog_compiler_static \
lt_cv_prog_compiler_c_o \
need_locks \
-MANIFEST_TOOL \
DSYMUTIL \
NMEDIT \
LIPO \
@@ -20688,6 +19841,7 @@ no_undefined_flag \
hardcode_libdir_flag_spec \
hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
+fix_srcfile_path \
exclude_expsyms \
include_expsyms \
file_list_spec \
@@ -20695,13 +19849,12 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
-install_override_mode \
finish_eval \
old_striplib \
striplib; do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -20723,15 +19876,14 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
-postlink_cmds \
postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -20739,6 +19891,12 @@ sys_lib_dlsearch_path_spec; do
esac
done
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+ ;;
+esac
+
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
@@ -20778,7 +19936,6 @@ do
"binsrc/b3s/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/b3s/Makefile" ;;
"binsrc/cached_resources/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/cached_resources/Makefile" ;;
"binsrc/dav/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/dav/Makefile" ;;
- "binsrc/dbpedia/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/dbpedia/Makefile" ;;
"binsrc/driver/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/driver/Makefile" ;;
"binsrc/hibernate/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/hibernate/Makefile" ;;
"binsrc/hosting/Makefile") CONFIG_FILES="$CONFIG_FILES binsrc/hosting/Makefile" ;;
@@ -21588,12 +20745,10 @@ $as_echo X"$file" |
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -21640,12 +20795,6 @@ EGREP=$lt_EGREP
# A literal string matcher.
FGREP=$lt_FGREP
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
# Which release of libtool.m4 was used?
macro_version=$macro_version
macro_revision=$macro_revision
@@ -21696,11 +20845,9 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
@@ -21708,30 +20855,13 @@ OBJDUMP=$lt_OBJDUMP
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-# Command to use when deplibs_check_method = "file_magic".
+# Command to use when deplibs_check_method == "file_magic".
file_magic_cmd=$lt_file_magic_cmd
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
# The archiver.
AR=$lt_AR
-
-# Flags to create an archive.
AR_FLAGS=$lt_AR_FLAGS
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
# A symbol stripping program.
STRIP=$lt_STRIP
@@ -21740,9 +20870,6 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
# A C compiler.
LTCC=$lt_CC
@@ -21761,24 +20888,21 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
# The name of the directory that contains temporary libtool files.
objdir=$objdir
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
@@ -21835,9 +20959,6 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
@@ -21877,10 +20998,6 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
@@ -21893,12 +21010,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
# How to pass a linker flag through the compiler.
wl=$lt_lt_prog_compiler_wl
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
@@ -21985,6 +21102,9 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
@@ -22000,9 +21120,6 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
@@ -22035,169 +21152,212 @@ ltmain="$ac_aux_dir/ltmain.sh"
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- if test x"$xsi_shell" = xyes; then
- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\ # positional parameters, so assign one to ordinary parameter first.\
-\ func_stripname_result=${3}\
-\ func_stripname_result=${func_stripname_result#"${1}"}\
-\ func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\ func_split_long_opt_name=${1%%=*}\
-\ func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\ func_split_short_opt_arg=${1#??}\
-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\ case ${1} in\
-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\ *) func_lo2o_result=${1} ;;\
-\ esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
- func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
- func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
- func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
- sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
- eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\ func_quote_for_eval "${2}"\
-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
- mv -f "$cfgfile" "$ofile" ||
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ case $xsi_shell in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=${1%%=*}
+ func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=${#1}
+}
+
+_LT_EOF
+ ;;
+ *) # Bourne compatible functions.
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1+=\$2"
+}
+_LT_EOF
+ ;;
+ *)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+ ;;
+ esac
+
+
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
diff --git a/configure.in b/configure.in
index a48168c..06741d1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
AC_PREREQ(2.59)
-AC_REVISION($Id: configure.in,v 1.262.2.52 2012/03/15 17:16:24 source Exp $)
+AC_REVISION($Id: configure.in,v 1.262.2.46 2011/10/28 23:28:08 source Exp $)
#
# configure.in
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -30,7 +30,7 @@ AC_REVISION($Id: configure.in,v 1.262.2.52 2012/03/15 17:16:24 source Exp $)
##########################################################################
AC_INIT([Virtuoso Open Source Edition],
- [6.1.5],
+ [6.1.4],
[vos.admin at openlinksw.com],
[virtuoso-opensource])
AC_CONFIG_SRCDIR([libsrc/Dk.h])
@@ -2231,19 +2231,6 @@ AC_HELP_STRING([--disable-conductor-vad], [disable Conductor vad package])dnl
[ with_conductor_vad="yes" ]
)
-AC_ARG_ENABLE(dbpedia-vad,
-AC_HELP_STRING([--enable-dbpedia-vad], [enable DBpedia vad package (default)])
-AC_HELP_STRING([--disable-conductor-vad], [disable DBpedia vad package])dnl
-], [
- case "${enableval}" in
- yes) with_dbpedia_vad="yes";;
- no) with_dbpedia_vad="no";;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-dbpedia-vad) ;;
- esac
- ],
- [ with_dbpedia_vad="yes" ]
-)
-
AC_ARG_ENABLE(demo-vad,
AC_HELP_STRING([--enable-demo-vad], [enable Demo vad package (default)])
AC_HELP_STRING([--disable-demo-vad], [disable Demo vad package])dnl
@@ -2365,7 +2352,6 @@ if test "x$with_all_vad" = "xno"
then
with_bpel_vad="no"
with_conductor_vad="no"
- with_dbpedia_vad="no"
with_demo_vad="no"
with_fct_vad="no"
with_isparql_vad="no"
@@ -2378,7 +2364,6 @@ fi
AM_CONDITIONAL(WITH_BPEL_VAD, test "x$with_bpel_vad" = "xyes")
AM_CONDITIONAL(WITH_CONDUCTOR_VAD, test "x$with_conductor_vad" = "xyes")
-AM_CONDITIONAL(WITH_DBPEDIA_VAD, test "x$with_dbpedia_vad" = "xyes")
AM_CONDITIONAL(WITH_DEMO_VAD, test "x$with_demo_vad" = "xyes")
AM_CONDITIONAL(WITH_FCT_VAD, test "x$with_fct_vad" = "xyes")
AM_CONDITIONAL(WITH_ISPARQL_VAD, test "x$with_isparql_vad" = "xyes")
@@ -2604,7 +2589,6 @@ AC_CONFIG_FILES([
binsrc/b3s/Makefile
binsrc/cached_resources/Makefile
binsrc/dav/Makefile
- binsrc/dbpedia/Makefile
binsrc/driver/Makefile
binsrc/hibernate/Makefile
binsrc/hosting/Makefile
diff --git a/docsrc/Makefile.am b/docsrc/Makefile.am
index 1ea7fe8..540595e 100644
--- a/docsrc/Makefile.am
+++ b/docsrc/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/Makefile.in b/docsrc/Makefile.in
index a5f5013..5e2e361 100644
--- a/docsrc/Makefile.in
+++ b/docsrc/Makefile.in
@@ -118,7 +118,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -167,7 +166,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -219,7 +217,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -266,6 +263,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -295,7 +293,7 @@ vaddir = @vaddir@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/chm/Makefile.am b/docsrc/chm/Makefile.am
index 5691533..a5c562d 100644
--- a/docsrc/chm/Makefile.am
+++ b/docsrc/chm/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/chm/Makefile.in b/docsrc/chm/Makefile.in
index 48e357d..c9d45f5 100644
--- a/docsrc/chm/Makefile.in
+++ b/docsrc/chm/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/docwiki/Makefile.am b/docsrc/docwiki/Makefile.am
index c198181..3194e16 100644
--- a/docsrc/docwiki/Makefile.am
+++ b/docsrc/docwiki/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/docwiki/Makefile.in b/docsrc/docwiki/Makefile.in
index bd5860a..61ae7e8 100644
--- a/docsrc/docwiki/Makefile.in
+++ b/docsrc/docwiki/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/docwiki/wiki.sql b/docsrc/docwiki/wiki.sql
index 2c82855..676f21f 100644
--- a/docsrc/docwiki/wiki.sql
+++ b/docsrc/docwiki/wiki.sql
@@ -1,10 +1,10 @@
--
--- $Id: wiki.sql,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+-- $Id: wiki.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/docsrc/docwiki/wiki.xsl b/docsrc/docwiki/wiki.xsl
index 48a57fa..ed8b77c 100644
--- a/docsrc/docwiki/wiki.xsl
+++ b/docsrc/docwiki/wiki.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wiki.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: wiki.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/docwiki/wiki_contents.xsl b/docsrc/docwiki/wiki_contents.xsl
index b6fdb2f..e832bc3 100644
--- a/docsrc/docwiki/wiki_contents.xsl
+++ b/docsrc/docwiki/wiki_contents.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wiki_contents.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: wiki_contents.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/html_virt/Makefile.am b/docsrc/html_virt/Makefile.am
index ead5283..50898f5 100644
--- a/docsrc/html_virt/Makefile.am
+++ b/docsrc/html_virt/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/html_virt/Makefile.in b/docsrc/html_virt/Makefile.in
index 85fcea0..cb29ff8 100644
--- a/docsrc/html_virt/Makefile.in
+++ b/docsrc/html_virt/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/images/Makefile.am b/docsrc/images/Makefile.am
index f1bfc5d..801902b 100644
--- a/docsrc/images/Makefile.am
+++ b/docsrc/images/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/images/Makefile.in b/docsrc/images/Makefile.in
index 40bca0a..388df79 100644
--- a/docsrc/images/Makefile.in
+++ b/docsrc/images/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/images/rdf18.png b/docsrc/images/rdf18.png
deleted file mode 100644
index 677e008..0000000
Binary files a/docsrc/images/rdf18.png and /dev/null differ
diff --git a/docsrc/images/rdf19.png b/docsrc/images/rdf19.png
deleted file mode 100644
index 43664ca..0000000
Binary files a/docsrc/images/rdf19.png and /dev/null differ
diff --git a/docsrc/images/ui/ag1.png b/docsrc/images/ui/ag1.png
deleted file mode 100644
index 42bd150..0000000
Binary files a/docsrc/images/ui/ag1.png and /dev/null differ
diff --git a/docsrc/images/ui/ag2.png b/docsrc/images/ui/ag2.png
deleted file mode 100644
index 55e7243..0000000
Binary files a/docsrc/images/ui/ag2.png and /dev/null differ
diff --git a/docsrc/images/ui/ag3.png b/docsrc/images/ui/ag3.png
deleted file mode 100644
index 0f2339a..0000000
Binary files a/docsrc/images/ui/ag3.png and /dev/null differ
diff --git a/docsrc/images/ui/auth1.png b/docsrc/images/ui/auth1.png
deleted file mode 100644
index eb44f49..0000000
Binary files a/docsrc/images/ui/auth1.png and /dev/null differ
diff --git a/docsrc/images/ui/auth3.png b/docsrc/images/ui/auth3.png
deleted file mode 100644
index 608b811..0000000
Binary files a/docsrc/images/ui/auth3.png and /dev/null differ
diff --git a/docsrc/images/ui/auth4.png b/docsrc/images/ui/auth4.png
deleted file mode 100644
index 0ff7e87..0000000
Binary files a/docsrc/images/ui/auth4.png and /dev/null differ
diff --git a/docsrc/images/ui/auth5.png b/docsrc/images/ui/auth5.png
deleted file mode 100644
index f60571e..0000000
Binary files a/docsrc/images/ui/auth5.png and /dev/null differ
diff --git a/docsrc/images/ui/auth6.png b/docsrc/images/ui/auth6.png
deleted file mode 100644
index 513753d..0000000
Binary files a/docsrc/images/ui/auth6.png and /dev/null differ
diff --git a/docsrc/images/ui/cfolder.png b/docsrc/images/ui/cfolder.png
deleted file mode 100644
index 425eac6..0000000
Binary files a/docsrc/images/ui/cfolder.png and /dev/null differ
diff --git a/docsrc/images/ui/cr10.png b/docsrc/images/ui/cr10.png
deleted file mode 100644
index a835a69..0000000
Binary files a/docsrc/images/ui/cr10.png and /dev/null differ
diff --git a/docsrc/images/ui/cr11b.png b/docsrc/images/ui/cr11b.png
deleted file mode 100644
index 5547edf..0000000
Binary files a/docsrc/images/ui/cr11b.png and /dev/null differ
diff --git a/docsrc/images/ui/cr12a.png b/docsrc/images/ui/cr12a.png
deleted file mode 100644
index cabbe6a..0000000
Binary files a/docsrc/images/ui/cr12a.png and /dev/null differ
diff --git a/docsrc/images/ui/cr17a.png b/docsrc/images/ui/cr17a.png
deleted file mode 100644
index b33b95c..0000000
Binary files a/docsrc/images/ui/cr17a.png and /dev/null differ
diff --git a/docsrc/images/ui/cr4.png b/docsrc/images/ui/cr4.png
deleted file mode 100644
index 29c0c9b..0000000
Binary files a/docsrc/images/ui/cr4.png and /dev/null differ
diff --git a/docsrc/images/ui/cr5.png b/docsrc/images/ui/cr5.png
deleted file mode 100644
index db2a6c3..0000000
Binary files a/docsrc/images/ui/cr5.png and /dev/null differ
diff --git a/docsrc/images/ui/cr6.png b/docsrc/images/ui/cr6.png
deleted file mode 100644
index fe3467a..0000000
Binary files a/docsrc/images/ui/cr6.png and /dev/null differ
diff --git a/docsrc/images/ui/cr7.png b/docsrc/images/ui/cr7.png
deleted file mode 100644
index 8895d1d..0000000
Binary files a/docsrc/images/ui/cr7.png and /dev/null differ
diff --git a/docsrc/images/ui/cr8.png b/docsrc/images/ui/cr8.png
deleted file mode 100644
index 229a2ee..0000000
Binary files a/docsrc/images/ui/cr8.png and /dev/null differ
diff --git a/docsrc/images/ui/cr9.png b/docsrc/images/ui/cr9.png
deleted file mode 100644
index d861df7..0000000
Binary files a/docsrc/images/ui/cr9.png and /dev/null differ
diff --git a/docsrc/images/ui/cra1.png b/docsrc/images/ui/cra1.png
deleted file mode 100644
index 480d238..0000000
Binary files a/docsrc/images/ui/cra1.png and /dev/null differ
diff --git a/docsrc/images/ui/cra10.png b/docsrc/images/ui/cra10.png
deleted file mode 100644
index 87ed24a..0000000
Binary files a/docsrc/images/ui/cra10.png and /dev/null differ
diff --git a/docsrc/images/ui/cra11.png b/docsrc/images/ui/cra11.png
deleted file mode 100644
index 07df063..0000000
Binary files a/docsrc/images/ui/cra11.png and /dev/null differ
diff --git a/docsrc/images/ui/cra12.png b/docsrc/images/ui/cra12.png
deleted file mode 100644
index 021caaa..0000000
Binary files a/docsrc/images/ui/cra12.png and /dev/null differ
diff --git a/docsrc/images/ui/cra13.png b/docsrc/images/ui/cra13.png
deleted file mode 100644
index 2f2d00f..0000000
Binary files a/docsrc/images/ui/cra13.png and /dev/null differ
diff --git a/docsrc/images/ui/cra14.png b/docsrc/images/ui/cra14.png
deleted file mode 100644
index 85701d2..0000000
Binary files a/docsrc/images/ui/cra14.png and /dev/null differ
diff --git a/docsrc/images/ui/cra15.png b/docsrc/images/ui/cra15.png
deleted file mode 100644
index c432212..0000000
Binary files a/docsrc/images/ui/cra15.png and /dev/null differ
diff --git a/docsrc/images/ui/cra2.png b/docsrc/images/ui/cra2.png
deleted file mode 100644
index d28e1c5..0000000
Binary files a/docsrc/images/ui/cra2.png and /dev/null differ
diff --git a/docsrc/images/ui/cra3.png b/docsrc/images/ui/cra3.png
deleted file mode 100644
index 2df8c86..0000000
Binary files a/docsrc/images/ui/cra3.png and /dev/null differ
diff --git a/docsrc/images/ui/cra4.png b/docsrc/images/ui/cra4.png
deleted file mode 100644
index 2c9cb36..0000000
Binary files a/docsrc/images/ui/cra4.png and /dev/null differ
diff --git a/docsrc/images/ui/cra5.png b/docsrc/images/ui/cra5.png
deleted file mode 100644
index 69f4306..0000000
Binary files a/docsrc/images/ui/cra5.png and /dev/null differ
diff --git a/docsrc/images/ui/cra6.png b/docsrc/images/ui/cra6.png
deleted file mode 100644
index 630bd39..0000000
Binary files a/docsrc/images/ui/cra6.png and /dev/null differ
diff --git a/docsrc/images/ui/cra7.png b/docsrc/images/ui/cra7.png
deleted file mode 100644
index 1f7c6c8..0000000
Binary files a/docsrc/images/ui/cra7.png and /dev/null differ
diff --git a/docsrc/images/ui/cra8.png b/docsrc/images/ui/cra8.png
deleted file mode 100644
index 07df063..0000000
Binary files a/docsrc/images/ui/cra8.png and /dev/null differ
diff --git a/docsrc/images/ui/cra9.png b/docsrc/images/ui/cra9.png
deleted file mode 100644
index fe5ec4e..0000000
Binary files a/docsrc/images/ui/cra9.png and /dev/null differ
diff --git a/docsrc/images/ui/editres.png b/docsrc/images/ui/editres.png
deleted file mode 100644
index df3bc82..0000000
Binary files a/docsrc/images/ui/editres.png and /dev/null differ
diff --git a/docsrc/images/ui/f1.png b/docsrc/images/ui/f1.png
deleted file mode 100644
index 8c49fb9..0000000
Binary files a/docsrc/images/ui/f1.png and /dev/null differ
diff --git a/docsrc/images/ui/f10.png b/docsrc/images/ui/f10.png
deleted file mode 100644
index b17c4fb..0000000
Binary files a/docsrc/images/ui/f10.png and /dev/null differ
diff --git a/docsrc/images/ui/f11.png b/docsrc/images/ui/f11.png
deleted file mode 100644
index cfaa037..0000000
Binary files a/docsrc/images/ui/f11.png and /dev/null differ
diff --git a/docsrc/images/ui/f12.png b/docsrc/images/ui/f12.png
deleted file mode 100644
index 12098e7..0000000
Binary files a/docsrc/images/ui/f12.png and /dev/null differ
diff --git a/docsrc/images/ui/f13.png b/docsrc/images/ui/f13.png
deleted file mode 100644
index 971e796..0000000
Binary files a/docsrc/images/ui/f13.png and /dev/null differ
diff --git a/docsrc/images/ui/f14.png b/docsrc/images/ui/f14.png
deleted file mode 100644
index 13e3a81..0000000
Binary files a/docsrc/images/ui/f14.png and /dev/null differ
diff --git a/docsrc/images/ui/f15.png b/docsrc/images/ui/f15.png
deleted file mode 100644
index f99fffd..0000000
Binary files a/docsrc/images/ui/f15.png and /dev/null differ
diff --git a/docsrc/images/ui/f16.png b/docsrc/images/ui/f16.png
deleted file mode 100644
index 6c1a4e9..0000000
Binary files a/docsrc/images/ui/f16.png and /dev/null differ
diff --git a/docsrc/images/ui/f17.png b/docsrc/images/ui/f17.png
deleted file mode 100644
index 42b601e..0000000
Binary files a/docsrc/images/ui/f17.png and /dev/null differ
diff --git a/docsrc/images/ui/f18.png b/docsrc/images/ui/f18.png
deleted file mode 100644
index 74b069e..0000000
Binary files a/docsrc/images/ui/f18.png and /dev/null differ
diff --git a/docsrc/images/ui/f19.png b/docsrc/images/ui/f19.png
deleted file mode 100644
index 786960f..0000000
Binary files a/docsrc/images/ui/f19.png and /dev/null differ
diff --git a/docsrc/images/ui/f2.png b/docsrc/images/ui/f2.png
deleted file mode 100644
index 717781e..0000000
Binary files a/docsrc/images/ui/f2.png and /dev/null differ
diff --git a/docsrc/images/ui/f20.png b/docsrc/images/ui/f20.png
deleted file mode 100644
index c1eb760..0000000
Binary files a/docsrc/images/ui/f20.png and /dev/null differ
diff --git a/docsrc/images/ui/f21.png b/docsrc/images/ui/f21.png
deleted file mode 100644
index 60bed2f..0000000
Binary files a/docsrc/images/ui/f21.png and /dev/null differ
diff --git a/docsrc/images/ui/f22.png b/docsrc/images/ui/f22.png
deleted file mode 100644
index 194f8a5..0000000
Binary files a/docsrc/images/ui/f22.png and /dev/null differ
diff --git a/docsrc/images/ui/f23.png b/docsrc/images/ui/f23.png
deleted file mode 100644
index 8821a46..0000000
Binary files a/docsrc/images/ui/f23.png and /dev/null differ
diff --git a/docsrc/images/ui/f24.png b/docsrc/images/ui/f24.png
deleted file mode 100644
index 60bed2f..0000000
Binary files a/docsrc/images/ui/f24.png and /dev/null differ
diff --git a/docsrc/images/ui/f3.png b/docsrc/images/ui/f3.png
deleted file mode 100644
index f9db530..0000000
Binary files a/docsrc/images/ui/f3.png and /dev/null differ
diff --git a/docsrc/images/ui/f4.png b/docsrc/images/ui/f4.png
deleted file mode 100644
index bef6b69..0000000
Binary files a/docsrc/images/ui/f4.png and /dev/null differ
diff --git a/docsrc/images/ui/f5.png b/docsrc/images/ui/f5.png
deleted file mode 100644
index 56ea362..0000000
Binary files a/docsrc/images/ui/f5.png and /dev/null differ
diff --git a/docsrc/images/ui/f6.png b/docsrc/images/ui/f6.png
deleted file mode 100644
index 710b93b..0000000
Binary files a/docsrc/images/ui/f6.png and /dev/null differ
diff --git a/docsrc/images/ui/f7.png b/docsrc/images/ui/f7.png
deleted file mode 100644
index e0d459c..0000000
Binary files a/docsrc/images/ui/f7.png and /dev/null differ
diff --git a/docsrc/images/ui/f8.png b/docsrc/images/ui/f8.png
deleted file mode 100644
index 64360d4..0000000
Binary files a/docsrc/images/ui/f8.png and /dev/null differ
diff --git a/docsrc/images/ui/f9.png b/docsrc/images/ui/f9.png
deleted file mode 100644
index d841ba9..0000000
Binary files a/docsrc/images/ui/f9.png and /dev/null differ
diff --git a/docsrc/images/ui/fb1.png b/docsrc/images/ui/fb1.png
deleted file mode 100644
index 98adbe7..0000000
Binary files a/docsrc/images/ui/fb1.png and /dev/null differ
diff --git a/docsrc/images/ui/fb10.png b/docsrc/images/ui/fb10.png
deleted file mode 100644
index 76faf4f..0000000
Binary files a/docsrc/images/ui/fb10.png and /dev/null differ
diff --git a/docsrc/images/ui/fb11.png b/docsrc/images/ui/fb11.png
deleted file mode 100644
index fd07a29..0000000
Binary files a/docsrc/images/ui/fb11.png and /dev/null differ
diff --git a/docsrc/images/ui/fb12.png b/docsrc/images/ui/fb12.png
deleted file mode 100644
index 02f8994..0000000
Binary files a/docsrc/images/ui/fb12.png and /dev/null differ
diff --git a/docsrc/images/ui/fb13.png b/docsrc/images/ui/fb13.png
deleted file mode 100644
index 1a02ad6..0000000
Binary files a/docsrc/images/ui/fb13.png and /dev/null differ
diff --git a/docsrc/images/ui/fb14.png b/docsrc/images/ui/fb14.png
deleted file mode 100644
index db928e0..0000000
Binary files a/docsrc/images/ui/fb14.png and /dev/null differ
diff --git a/docsrc/images/ui/fb15.png b/docsrc/images/ui/fb15.png
deleted file mode 100644
index ace1be5..0000000
Binary files a/docsrc/images/ui/fb15.png and /dev/null differ
diff --git a/docsrc/images/ui/fb16.png b/docsrc/images/ui/fb16.png
deleted file mode 100644
index e143da6..0000000
Binary files a/docsrc/images/ui/fb16.png and /dev/null differ
diff --git a/docsrc/images/ui/fb17.png b/docsrc/images/ui/fb17.png
deleted file mode 100644
index 2bdaa46..0000000
Binary files a/docsrc/images/ui/fb17.png and /dev/null differ
diff --git a/docsrc/images/ui/fb18.png b/docsrc/images/ui/fb18.png
deleted file mode 100644
index 042b22d..0000000
Binary files a/docsrc/images/ui/fb18.png and /dev/null differ
diff --git a/docsrc/images/ui/fb19.png b/docsrc/images/ui/fb19.png
deleted file mode 100644
index 4dde589..0000000
Binary files a/docsrc/images/ui/fb19.png and /dev/null differ
diff --git a/docsrc/images/ui/fb2.png b/docsrc/images/ui/fb2.png
deleted file mode 100644
index a357375..0000000
Binary files a/docsrc/images/ui/fb2.png and /dev/null differ
diff --git a/docsrc/images/ui/fb20.png b/docsrc/images/ui/fb20.png
deleted file mode 100644
index a09c04a..0000000
Binary files a/docsrc/images/ui/fb20.png and /dev/null differ
diff --git a/docsrc/images/ui/fb21.png b/docsrc/images/ui/fb21.png
deleted file mode 100644
index 2558a26..0000000
Binary files a/docsrc/images/ui/fb21.png and /dev/null differ
diff --git a/docsrc/images/ui/fb22.png b/docsrc/images/ui/fb22.png
deleted file mode 100644
index bb312c9..0000000
Binary files a/docsrc/images/ui/fb22.png and /dev/null differ
diff --git a/docsrc/images/ui/fb23.png b/docsrc/images/ui/fb23.png
deleted file mode 100644
index 47e2347..0000000
Binary files a/docsrc/images/ui/fb23.png and /dev/null differ
diff --git a/docsrc/images/ui/fb24.png b/docsrc/images/ui/fb24.png
deleted file mode 100644
index 591469e..0000000
Binary files a/docsrc/images/ui/fb24.png and /dev/null differ
diff --git a/docsrc/images/ui/fb25.png b/docsrc/images/ui/fb25.png
deleted file mode 100644
index b1659a7..0000000
Binary files a/docsrc/images/ui/fb25.png and /dev/null differ
diff --git a/docsrc/images/ui/fb26.png b/docsrc/images/ui/fb26.png
deleted file mode 100644
index b8682ac..0000000
Binary files a/docsrc/images/ui/fb26.png and /dev/null differ
diff --git a/docsrc/images/ui/fb27.png b/docsrc/images/ui/fb27.png
deleted file mode 100644
index 5615e19..0000000
Binary files a/docsrc/images/ui/fb27.png and /dev/null differ
diff --git a/docsrc/images/ui/fb28.png b/docsrc/images/ui/fb28.png
deleted file mode 100644
index 5b3c949..0000000
Binary files a/docsrc/images/ui/fb28.png and /dev/null differ
diff --git a/docsrc/images/ui/fb29.png b/docsrc/images/ui/fb29.png
deleted file mode 100644
index 8a52488..0000000
Binary files a/docsrc/images/ui/fb29.png and /dev/null differ
diff --git a/docsrc/images/ui/fb3.png b/docsrc/images/ui/fb3.png
deleted file mode 100644
index ee47e73..0000000
Binary files a/docsrc/images/ui/fb3.png and /dev/null differ
diff --git a/docsrc/images/ui/fb30.png b/docsrc/images/ui/fb30.png
deleted file mode 100644
index 741abf1..0000000
Binary files a/docsrc/images/ui/fb30.png and /dev/null differ
diff --git a/docsrc/images/ui/fb31.png b/docsrc/images/ui/fb31.png
deleted file mode 100644
index 9e6a143..0000000
Binary files a/docsrc/images/ui/fb31.png and /dev/null differ
diff --git a/docsrc/images/ui/fb32.png b/docsrc/images/ui/fb32.png
deleted file mode 100644
index f51a64f..0000000
Binary files a/docsrc/images/ui/fb32.png and /dev/null differ
diff --git a/docsrc/images/ui/fb33.png b/docsrc/images/ui/fb33.png
deleted file mode 100644
index c259322..0000000
Binary files a/docsrc/images/ui/fb33.png and /dev/null differ
diff --git a/docsrc/images/ui/fb34.png b/docsrc/images/ui/fb34.png
deleted file mode 100644
index 21f8229..0000000
Binary files a/docsrc/images/ui/fb34.png and /dev/null differ
diff --git a/docsrc/images/ui/fb35.png b/docsrc/images/ui/fb35.png
deleted file mode 100644
index 68a363d..0000000
Binary files a/docsrc/images/ui/fb35.png and /dev/null differ
diff --git a/docsrc/images/ui/fb36.png b/docsrc/images/ui/fb36.png
deleted file mode 100644
index 139d14d..0000000
Binary files a/docsrc/images/ui/fb36.png and /dev/null differ
diff --git a/docsrc/images/ui/fb37.png b/docsrc/images/ui/fb37.png
deleted file mode 100644
index 363d2c6..0000000
Binary files a/docsrc/images/ui/fb37.png and /dev/null differ
diff --git a/docsrc/images/ui/fb38.png b/docsrc/images/ui/fb38.png
deleted file mode 100644
index 8808595..0000000
Binary files a/docsrc/images/ui/fb38.png and /dev/null differ
diff --git a/docsrc/images/ui/fb4.png b/docsrc/images/ui/fb4.png
deleted file mode 100644
index 08a0a00..0000000
Binary files a/docsrc/images/ui/fb4.png and /dev/null differ
diff --git a/docsrc/images/ui/fb5.png b/docsrc/images/ui/fb5.png
deleted file mode 100644
index 3594a10..0000000
Binary files a/docsrc/images/ui/fb5.png and /dev/null differ
diff --git a/docsrc/images/ui/fb6.png b/docsrc/images/ui/fb6.png
deleted file mode 100644
index f4fbba3..0000000
Binary files a/docsrc/images/ui/fb6.png and /dev/null differ
diff --git a/docsrc/images/ui/fb7.png b/docsrc/images/ui/fb7.png
deleted file mode 100644
index 66a7ecb..0000000
Binary files a/docsrc/images/ui/fb7.png and /dev/null differ
diff --git a/docsrc/images/ui/fb8.png b/docsrc/images/ui/fb8.png
deleted file mode 100644
index ad78594..0000000
Binary files a/docsrc/images/ui/fb8.png and /dev/null differ
diff --git a/docsrc/images/ui/fb9.png b/docsrc/images/ui/fb9.png
deleted file mode 100644
index 023fea8..0000000
Binary files a/docsrc/images/ui/fb9.png and /dev/null differ
diff --git a/docsrc/images/ui/lock_16.png b/docsrc/images/ui/lock_16.png
deleted file mode 100644
index 593e884..0000000
Binary files a/docsrc/images/ui/lock_16.png and /dev/null differ
diff --git a/docsrc/images/ui/m36a.png b/docsrc/images/ui/m36a.png
deleted file mode 100644
index 179ec18..0000000
Binary files a/docsrc/images/ui/m36a.png and /dev/null differ
diff --git a/docsrc/images/ui/meditres.png b/docsrc/images/ui/meditres.png
deleted file mode 100644
index eaad678..0000000
Binary files a/docsrc/images/ui/meditres.png and /dev/null differ
diff --git a/docsrc/images/ui/meditres2.png b/docsrc/images/ui/meditres2.png
deleted file mode 100644
index b23f055..0000000
Binary files a/docsrc/images/ui/meditres2.png and /dev/null differ
diff --git a/docsrc/images/ui/scp1.png b/docsrc/images/ui/scp1.png
deleted file mode 100644
index aea4949..0000000
Binary files a/docsrc/images/ui/scp1.png and /dev/null differ
diff --git a/docsrc/images/ui/scp10.png b/docsrc/images/ui/scp10.png
deleted file mode 100644
index 5fb4600..0000000
Binary files a/docsrc/images/ui/scp10.png and /dev/null differ
diff --git a/docsrc/images/ui/scp11.png b/docsrc/images/ui/scp11.png
deleted file mode 100644
index d114d1e..0000000
Binary files a/docsrc/images/ui/scp11.png and /dev/null differ
diff --git a/docsrc/images/ui/scp12.png b/docsrc/images/ui/scp12.png
deleted file mode 100644
index 6406aae..0000000
Binary files a/docsrc/images/ui/scp12.png and /dev/null differ
diff --git a/docsrc/images/ui/scp13.png b/docsrc/images/ui/scp13.png
deleted file mode 100644
index 642098b..0000000
Binary files a/docsrc/images/ui/scp13.png and /dev/null differ
diff --git a/docsrc/images/ui/scp14.png b/docsrc/images/ui/scp14.png
deleted file mode 100644
index 3d6eeb8..0000000
Binary files a/docsrc/images/ui/scp14.png and /dev/null differ
diff --git a/docsrc/images/ui/scp2.png b/docsrc/images/ui/scp2.png
deleted file mode 100644
index 2786a64..0000000
Binary files a/docsrc/images/ui/scp2.png and /dev/null differ
diff --git a/docsrc/images/ui/scp3.png b/docsrc/images/ui/scp3.png
deleted file mode 100644
index c22de5b..0000000
Binary files a/docsrc/images/ui/scp3.png and /dev/null differ
diff --git a/docsrc/images/ui/scp4.png b/docsrc/images/ui/scp4.png
deleted file mode 100644
index 9744cde..0000000
Binary files a/docsrc/images/ui/scp4.png and /dev/null differ
diff --git a/docsrc/images/ui/scp5.png b/docsrc/images/ui/scp5.png
deleted file mode 100644
index 2aeca02..0000000
Binary files a/docsrc/images/ui/scp5.png and /dev/null differ
diff --git a/docsrc/images/ui/scp6.png b/docsrc/images/ui/scp6.png
deleted file mode 100644
index f1f37ca..0000000
Binary files a/docsrc/images/ui/scp6.png and /dev/null differ
diff --git a/docsrc/images/ui/scp7.png b/docsrc/images/ui/scp7.png
deleted file mode 100644
index 9f512ed..0000000
Binary files a/docsrc/images/ui/scp7.png and /dev/null differ
diff --git a/docsrc/images/ui/scp8.png b/docsrc/images/ui/scp8.png
deleted file mode 100644
index 5c5a0c6..0000000
Binary files a/docsrc/images/ui/scp8.png and /dev/null differ
diff --git a/docsrc/images/ui/scp9.png b/docsrc/images/ui/scp9.png
deleted file mode 100644
index 0db820d..0000000
Binary files a/docsrc/images/ui/scp9.png and /dev/null differ
diff --git a/docsrc/images/ui/si1.png b/docsrc/images/ui/si1.png
deleted file mode 100644
index a9a5e01..0000000
Binary files a/docsrc/images/ui/si1.png and /dev/null differ
diff --git a/docsrc/images/ui/si2.png b/docsrc/images/ui/si2.png
deleted file mode 100644
index a189aac..0000000
Binary files a/docsrc/images/ui/si2.png and /dev/null differ
diff --git a/docsrc/images/ui/si3.png b/docsrc/images/ui/si3.png
deleted file mode 100644
index 15f5ab7..0000000
Binary files a/docsrc/images/ui/si3.png and /dev/null differ
diff --git a/docsrc/images/ui/si4.png b/docsrc/images/ui/si4.png
deleted file mode 100644
index 71e3aaa..0000000
Binary files a/docsrc/images/ui/si4.png and /dev/null differ
diff --git a/docsrc/images/ui/si5.png b/docsrc/images/ui/si5.png
deleted file mode 100644
index bd004da..0000000
Binary files a/docsrc/images/ui/si5.png and /dev/null differ
diff --git a/docsrc/images/ui/si6.png b/docsrc/images/ui/si6.png
deleted file mode 100644
index 72db148..0000000
Binary files a/docsrc/images/ui/si6.png and /dev/null differ
diff --git a/docsrc/images/ui/si7.png b/docsrc/images/ui/si7.png
deleted file mode 100644
index 9ab7b6c..0000000
Binary files a/docsrc/images/ui/si7.png and /dev/null differ
diff --git a/docsrc/images/ui/so1.png b/docsrc/images/ui/so1.png
deleted file mode 100644
index bd2d9d1..0000000
Binary files a/docsrc/images/ui/so1.png and /dev/null differ
diff --git a/docsrc/images/ui/so11.png b/docsrc/images/ui/so11.png
deleted file mode 100644
index 6a62d69..0000000
Binary files a/docsrc/images/ui/so11.png and /dev/null differ
diff --git a/docsrc/images/ui/so12.png b/docsrc/images/ui/so12.png
deleted file mode 100644
index f530b7c..0000000
Binary files a/docsrc/images/ui/so12.png and /dev/null differ
diff --git a/docsrc/images/ui/so13.png b/docsrc/images/ui/so13.png
deleted file mode 100644
index e479fd9..0000000
Binary files a/docsrc/images/ui/so13.png and /dev/null differ
diff --git a/docsrc/images/ui/so14.png b/docsrc/images/ui/so14.png
deleted file mode 100644
index 612e292..0000000
Binary files a/docsrc/images/ui/so14.png and /dev/null differ
diff --git a/docsrc/images/ui/so15.png b/docsrc/images/ui/so15.png
deleted file mode 100644
index 9211b5a..0000000
Binary files a/docsrc/images/ui/so15.png and /dev/null differ
diff --git a/docsrc/images/ui/so16.png b/docsrc/images/ui/so16.png
deleted file mode 100644
index 8a154d9..0000000
Binary files a/docsrc/images/ui/so16.png and /dev/null differ
diff --git a/docsrc/images/ui/so2.png b/docsrc/images/ui/so2.png
deleted file mode 100644
index 19c0f55..0000000
Binary files a/docsrc/images/ui/so2.png and /dev/null differ
diff --git a/docsrc/images/ui/so3.png b/docsrc/images/ui/so3.png
deleted file mode 100644
index e41d8ca..0000000
Binary files a/docsrc/images/ui/so3.png and /dev/null differ
diff --git a/docsrc/images/ui/so4.png b/docsrc/images/ui/so4.png
deleted file mode 100644
index 1b9148c..0000000
Binary files a/docsrc/images/ui/so4.png and /dev/null differ
diff --git a/docsrc/images/ui/so5.png b/docsrc/images/ui/so5.png
deleted file mode 100644
index 5f9f323..0000000
Binary files a/docsrc/images/ui/so5.png and /dev/null differ
diff --git a/docsrc/images/ui/so6.png b/docsrc/images/ui/so6.png
deleted file mode 100644
index c5adbdb..0000000
Binary files a/docsrc/images/ui/so6.png and /dev/null differ
diff --git a/docsrc/images/ui/so7.png b/docsrc/images/ui/so7.png
deleted file mode 100644
index c2a8da4..0000000
Binary files a/docsrc/images/ui/so7.png and /dev/null differ
diff --git a/docsrc/images/ui/so8.png b/docsrc/images/ui/so8.png
deleted file mode 100644
index 54f3add..0000000
Binary files a/docsrc/images/ui/so8.png and /dev/null differ
diff --git a/docsrc/images/ui/so9.png b/docsrc/images/ui/so9.png
deleted file mode 100644
index 1d9a2a9..0000000
Binary files a/docsrc/images/ui/so9.png and /dev/null differ
diff --git a/docsrc/images/ui/topo-scenario.png b/docsrc/images/ui/topo-scenario.png
deleted file mode 100644
index 5fe8aaa..0000000
Binary files a/docsrc/images/ui/topo-scenario.png and /dev/null differ
diff --git a/docsrc/images/ui/ufile.png b/docsrc/images/ui/ufile.png
deleted file mode 100644
index bf4269d..0000000
Binary files a/docsrc/images/ui/ufile.png and /dev/null differ
diff --git a/docsrc/index.html b/docsrc/index.html
index c96c500..226e0ff 100644
--- a/docsrc/index.html
+++ b/docsrc/index.html
@@ -71,7 +71,7 @@ A:hover
<DIV CLASS="index_link"><A HREF="pdf/virtdocs.pdf">PDF</A> requires <A HREF="http://www.adobe.com/">Adobe Acrobat</A> 3.0 or above.</DIV>
<BR>
<BR>
-<DIV CLASS="copyright">Copyright © 1998-2012 OpenLink Software</DIV>
+<DIV CLASS="copyright">Copyright© 2000 OpenLink Software</DIV>
</TD>
<TD WIDTH="50"/>
</TR>
diff --git a/docsrc/pdf/Makefile.am b/docsrc/pdf/Makefile.am
index 16cca68..027f51e 100644
--- a/docsrc/pdf/Makefile.am
+++ b/docsrc/pdf/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/pdf/Makefile.in b/docsrc/pdf/Makefile.in
index 9d10d75..9a86f09 100644
--- a/docsrc/pdf/Makefile.in
+++ b/docsrc/pdf/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/readme.html b/docsrc/readme.html
index 105c66b..832d1eb 100644
--- a/docsrc/readme.html
+++ b/docsrc/readme.html
@@ -135,8 +135,8 @@ then must match the id attribute. </P>
<PRE CLASS="programlisting">
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: readme.html,v 1.3.2.2 2012/03/08 13:13:48 source Exp $
- Copyright (C) 1998-2012 OpenLink Software
+ $Id: readme.html,v 1.3.2.1 2009/07/07 12:15:33 source Exp $
+ (C)Copyright 2001 OpenLink Software
-->
<chapter label="TBD.xml" id="TBD">
<title>TBD</title>
diff --git a/docsrc/releasenotes/Makefile.am b/docsrc/releasenotes/Makefile.am
index 27af0d8..3447514 100644
--- a/docsrc/releasenotes/Makefile.am
+++ b/docsrc/releasenotes/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/releasenotes/Makefile.in b/docsrc/releasenotes/Makefile.in
index 4b3a9c7..f37d48b 100644
--- a/docsrc/releasenotes/Makefile.in
+++ b/docsrc/releasenotes/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/releasenotes/ptrconv.xsl b/docsrc/releasenotes/ptrconv.xsl
index 1b8d0c6..c42eb82 100644
--- a/docsrc/releasenotes/ptrconv.xsl
+++ b/docsrc/releasenotes/ptrconv.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: ptrconv.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: ptrconv.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/releasenotes/ptrconv_element.xsl b/docsrc/releasenotes/ptrconv_element.xsl
index 909150f..5fb5b70 100644
--- a/docsrc/releasenotes/ptrconv_element.xsl
+++ b/docsrc/releasenotes/ptrconv_element.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: ptrconv_element.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: ptrconv_element.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/releasenotes/relnotes.xml b/docsrc/releasenotes/relnotes.xml
index 398cb31..21f9b21 100644
--- a/docsrc/releasenotes/relnotes.xml
+++ b/docsrc/releasenotes/relnotes.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/releasenotes/virtuoso_publish_element.xml b/docsrc/releasenotes/virtuoso_publish_element.xml
index 6191913..17b901d 100644
--- a/docsrc/releasenotes/virtuoso_publish_element.xml
+++ b/docsrc/releasenotes/virtuoso_publish_element.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/releasenotes/vrelnotes-nw.xml b/docsrc/releasenotes/vrelnotes-nw.xml
index 7895373..d3c6e6f 100644
--- a/docsrc/releasenotes/vrelnotes-nw.xml
+++ b/docsrc/releasenotes/vrelnotes-nw.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/releasenotes/vrelnotes.xml b/docsrc/releasenotes/vrelnotes.xml
index e405c0d..ce3266a 100644
--- a/docsrc/releasenotes/vrelnotes.xml
+++ b/docsrc/releasenotes/vrelnotes.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/styleguide/Makefile.am b/docsrc/styleguide/Makefile.am
index 5815f34..e1b0ae4 100644
--- a/docsrc/styleguide/Makefile.am
+++ b/docsrc/styleguide/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/styleguide/Makefile.in b/docsrc/styleguide/Makefile.in
index 224059a..8ccf0fa 100644
--- a/docsrc/styleguide/Makefile.in
+++ b/docsrc/styleguide/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/stylesheets/Makefile.am b/docsrc/stylesheets/Makefile.am
index 06b2d1c..a7e0f10 100644
--- a/docsrc/stylesheets/Makefile.am
+++ b/docsrc/stylesheets/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/Makefile.in b/docsrc/stylesheets/Makefile.in
index 6be48a1..022a9ef 100644
--- a/docsrc/stylesheets/Makefile.in
+++ b/docsrc/stylesheets/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/stylesheets/chaptermenu.xsl b/docsrc/stylesheets/chaptermenu.xsl
index 2ff072e..ee10ad9 100644
--- a/docsrc/stylesheets/chaptermenu.xsl
+++ b/docsrc/stylesheets/chaptermenu.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: chaptermenu.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: chaptermenu.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/chaptermenu_xt.xsl b/docsrc/stylesheets/chaptermenu_xt.xsl
index 96f40c3..5d78a97 100644
--- a/docsrc/stylesheets/chaptermenu_xt.xsl
+++ b/docsrc/stylesheets/chaptermenu_xt.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: chaptermenu_xt.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: chaptermenu_xt.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/config.xsl b/docsrc/stylesheets/config.xsl
index a1a3348..6d2883d 100644
--- a/docsrc/stylesheets/config.xsl
+++ b/docsrc/stylesheets/config.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: config.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: config.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_chapter.xsl b/docsrc/stylesheets/html_chapter.xsl
index 5dbdbe7..746ef6f 100644
--- a/docsrc/stylesheets/html_chapter.xsl
+++ b/docsrc/stylesheets/html_chapter.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_chapter.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_chapter.xsl,v 1.2 2006/08/15 22:09:21 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_debug.xsl b/docsrc/stylesheets/html_debug.xsl
index d205fa6..602e057 100644
--- a/docsrc/stylesheets/html_debug.xsl
+++ b/docsrc/stylesheets/html_debug.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_debug.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_debug.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_functions.xsl b/docsrc/stylesheets/html_functions.xsl
index 7aab859..ca0e502 100644
--- a/docsrc/stylesheets/html_functions.xsl
+++ b/docsrc/stylesheets/html_functions.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_functions.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_functions.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_mp_chaptermenu.xsl b/docsrc/stylesheets/html_mp_chaptermenu.xsl
index 5ea8ce1..728c675 100644
--- a/docsrc/stylesheets/html_mp_chaptermenu.xsl
+++ b/docsrc/stylesheets/html_mp_chaptermenu.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_mp_chaptermenu.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_mp_chaptermenu.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_util.xsl b/docsrc/stylesheets/html_util.xsl
index ab4db51..9d5f99e 100644
--- a/docsrc/stylesheets/html_util.xsl
+++ b/docsrc/stylesheets/html_util.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_util.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_util.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_virt_chapter.xsl b/docsrc/stylesheets/html_virt_chapter.xsl
index 9378276..23043ea 100644
--- a/docsrc/stylesheets/html_virt_chapter.xsl
+++ b/docsrc/stylesheets/html_virt_chapter.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_virt_chapter.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_virt_chapter.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_virt_chapter1.xsl b/docsrc/stylesheets/html_virt_chapter1.xsl
index 7ba7e3a..a09b670 100644
--- a/docsrc/stylesheets/html_virt_chapter1.xsl
+++ b/docsrc/stylesheets/html_virt_chapter1.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_virt_chapter1.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_virt_chapter1.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_virt_chaptermenu.xsl b/docsrc/stylesheets/html_virt_chaptermenu.xsl
index 06e1d50..d7ce91e 100644
--- a/docsrc/stylesheets/html_virt_chaptermenu.xsl
+++ b/docsrc/stylesheets/html_virt_chaptermenu.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_virt_chaptermenu.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_virt_chaptermenu.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_virt_common.xsl b/docsrc/stylesheets/html_virt_common.xsl
index 70923d1..2c070d7 100644
--- a/docsrc/stylesheets/html_virt_common.xsl
+++ b/docsrc/stylesheets/html_virt_common.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_virt_common.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_virt_common.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl b/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl
index da2c0d1..13b0bf3 100644
--- a/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl
+++ b/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_virt_mp_chaptermenu.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_virt_mp_chaptermenu.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_virt_refentry.xsl b/docsrc/stylesheets/html_virt_refentry.xsl
index a1a8a20..af5dd32 100644
--- a/docsrc/stylesheets/html_virt_refentry.xsl
+++ b/docsrc/stylesheets/html_virt_refentry.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- - $Id: html_virt_refentry.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_virt_refentry.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_virt_util.xsl b/docsrc/stylesheets/html_virt_util.xsl
index 9bef553..9a831a6 100644
--- a/docsrc/stylesheets/html_virt_util.xsl
+++ b/docsrc/stylesheets/html_virt_util.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_virt_util.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_virt_util.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/html_xt_common.xsl b/docsrc/stylesheets/html_xt_common.xsl
index 836e7b9..666836d 100644
--- a/docsrc/stylesheets/html_xt_common.xsl
+++ b/docsrc/stylesheets/html_xt_common.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_xt_common.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_xt_common.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/list_api.xsl b/docsrc/stylesheets/list_api.xsl
index feb1ef1..8c58d6e 100644
--- a/docsrc/stylesheets/list_api.xsl
+++ b/docsrc/stylesheets/list_api.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: list_api.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: list_api.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/refentry.xsl b/docsrc/stylesheets/refentry.xsl
index 6bff2c5..3243a25 100644
--- a/docsrc/stylesheets/refentry.xsl
+++ b/docsrc/stylesheets/refentry.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- - $Id: refentry.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: refentry.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/doc.css b/docsrc/stylesheets/sections/doc.css
index 0f63115..ddbbe5f 100644
--- a/docsrc/stylesheets/sections/doc.css
+++ b/docsrc/stylesheets/sections/doc.css
@@ -1,10 +1,10 @@
/*
- * $Id: doc.css,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: doc.css,v 1.2 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/function_list.xsl b/docsrc/stylesheets/sections/function_list.xsl
index 416fd0e..45aa9f1 100644
--- a/docsrc/stylesheets/sections/function_list.xsl
+++ b/docsrc/stylesheets/sections/function_list.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: function_list.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: function_list.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/html_functions.xsl b/docsrc/stylesheets/sections/html_functions.xsl
index c0b4f65..8e52741 100644
--- a/docsrc/stylesheets/sections/html_functions.xsl
+++ b/docsrc/stylesheets/sections/html_functions.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: html_functions.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_functions.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/html_inline_refentry.xsl b/docsrc/stylesheets/sections/html_inline_refentry.xsl
index a3fa0f9..a5ceee8 100644
--- a/docsrc/stylesheets/sections/html_inline_refentry.xsl
+++ b/docsrc/stylesheets/sections/html_inline_refentry.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_inline_refentry.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_inline_refentry.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/html_sect1_common.xsl b/docsrc/stylesheets/sections/html_sect1_common.xsl
index 2571b42..13bcc1d 100644
--- a/docsrc/stylesheets/sections/html_sect1_common.xsl
+++ b/docsrc/stylesheets/sections/html_sect1_common.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: html_sect1_common.xsl,v 1.4.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_sect1_common.xsl,v 1.4 2009/01/12 10:36:53 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/html_sect1_tocs.xsl b/docsrc/stylesheets/sections/html_sect1_tocs.xsl
index 1b499e5..65e6f3a 100644
--- a/docsrc/stylesheets/sections/html_sect1_tocs.xsl
+++ b/docsrc/stylesheets/sections/html_sect1_tocs.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: html_sect1_tocs.xsl,v 1.5.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: html_sect1_tocs.xsl,v 1.5 2007/05/08 17:54:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/openlink.css b/docsrc/stylesheets/sections/openlink.css
index b0ad43a..c4682ee 100644
--- a/docsrc/stylesheets/sections/openlink.css
+++ b/docsrc/stylesheets/sections/openlink.css
@@ -1,10 +1,10 @@
/*
- * $Id: openlink.css,v 1.3.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: openlink.css,v 1.3 2006/08/15 22:15:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/opml_sect1_mp.xsl b/docsrc/stylesheets/sections/opml_sect1_mp.xsl
index 4cba15d..c8e7095 100644
--- a/docsrc/stylesheets/sections/opml_sect1_mp.xsl
+++ b/docsrc/stylesheets/sections/opml_sect1_mp.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: opml_sect1_mp.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: opml_sect1_mp.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/sect1_list.xsl b/docsrc/stylesheets/sections/sect1_list.xsl
index 93ca42e..97b4883 100644
--- a/docsrc/stylesheets/sections/sect1_list.xsl
+++ b/docsrc/stylesheets/sections/sect1_list.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sect1_list.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: sect1_list.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/sioc_book.xsl b/docsrc/stylesheets/sections/sioc_book.xsl
index a88458d..cb6bceb 100644
--- a/docsrc/stylesheets/sections/sioc_book.xsl
+++ b/docsrc/stylesheets/sections/sioc_book.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sioc_book.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: sioc_book.xsl,v 1.2 2007/05/08 17:54:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/sioc_chap.xsl b/docsrc/stylesheets/sections/sioc_chap.xsl
index 452118c..0bae823 100644
--- a/docsrc/stylesheets/sections/sioc_chap.xsl
+++ b/docsrc/stylesheets/sections/sioc_chap.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sioc_chap.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: sioc_chap.xsl,v 1.2 2007/05/08 17:54:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/sections/sioc_sect1.xsl b/docsrc/stylesheets/sections/sioc_sect1.xsl
index 9dd9724..30ba89a 100644
--- a/docsrc/stylesheets/sections/sioc_sect1.xsl
+++ b/docsrc/stylesheets/sections/sioc_sect1.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: sioc_sect1.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: sioc_sect1.xsl,v 1.2 2007/05/08 17:54:39 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/virt_config.xsl b/docsrc/stylesheets/virt_config.xsl
index 6a41006..78b8cee 100644
--- a/docsrc/stylesheets/virt_config.xsl
+++ b/docsrc/stylesheets/virt_config.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: virt_config.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: virt_config.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/vsp_contents.xsl b/docsrc/stylesheets/vsp_contents.xsl
index 1df22fa..e463624 100644
--- a/docsrc/stylesheets/vsp_contents.xsl
+++ b/docsrc/stylesheets/vsp_contents.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: vsp_contents.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: vsp_contents.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/stylesheets/vsp_contents_lmvector.xsl b/docsrc/stylesheets/vsp_contents_lmvector.xsl
index 6eb858e..b440824 100644
--- a/docsrc/stylesheets/vsp_contents_lmvector.xsl
+++ b/docsrc/stylesheets/vsp_contents_lmvector.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: vsp_contents_lmvector.xsl,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ - $Id: vsp_contents_lmvector.xsl,v 1.2 2006/08/15 22:09:22 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/2pc.xml b/docsrc/xmlsource/2pc.xml
index dfa5c1c..9a1a143 100644
--- a/docsrc/xmlsource/2pc.xml
+++ b/docsrc/xmlsource/2pc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/DocBook/tblcals.xml b/docsrc/xmlsource/DocBook/tblcals.xml
index 1605689..e0ea6c8 100644
--- a/docsrc/xmlsource/DocBook/tblcals.xml
+++ b/docsrc/xmlsource/DocBook/tblcals.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/DocBook/tblxchg.xml b/docsrc/xmlsource/DocBook/tblxchg.xml
index e40af05..20477cb 100644
--- a/docsrc/xmlsource/DocBook/tblxchg.xml
+++ b/docsrc/xmlsource/DocBook/tblxchg.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/DocBook/test.xml b/docsrc/xmlsource/DocBook/test.xml
index 41c526e..bdae82b 100644
--- a/docsrc/xmlsource/DocBook/test.xml
+++ b/docsrc/xmlsource/DocBook/test.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/Makefile.am b/docsrc/xmlsource/Makefile.am
index 990df20..5196232 100644
--- a/docsrc/xmlsource/Makefile.am
+++ b/docsrc/xmlsource/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/Makefile.in b/docsrc/xmlsource/Makefile.in
index 8696aa8..35d7f8f 100644
--- a/docsrc/xmlsource/Makefile.in
+++ b/docsrc/xmlsource/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docsrc/xmlsource/XMLDOM.xml b/docsrc/xmlsource/XMLDOM.xml
index 81dbeda..bdb1aed 100644
--- a/docsrc/xmlsource/XMLDOM.xml
+++ b/docsrc/xmlsource/XMLDOM.xml
@@ -5,7 +5,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/XMLType.xml b/docsrc/xmlsource/XMLType.xml
index db52d18..354d2ca 100644
--- a/docsrc/xmlsource/XMLType.xml
+++ b/docsrc/xmlsource/XMLType.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/_DirInfo.sh b/docsrc/xmlsource/_DirInfo.sh
index 5b1eb8c..43f4afb 100755
--- a/docsrc/xmlsource/_DirInfo.sh
+++ b/docsrc/xmlsource/_DirInfo.sh
@@ -9,8 +9,8 @@ export LANG LC_ALL
out='_DirInfo.xml'
echo '<?xml version="1.0" ?>' > $out
echo '<!--
- $Id: _DirInfo.sh,v 1.2.2.1 2012/03/08 13:13:48 source Exp $
- Copyright (C) 1998-2012 OpenLink Software
+ $Id: _DirInfo.sh,v 1.2 2009/02/12 15:15:13 source Exp $
+ (C)Copyright 2001 OpenLink Software
-->
<dirinfo>' >> $out
echo ' <dir path="">
diff --git a/docsrc/xmlsource/_DirInfo.xml b/docsrc/xmlsource/_DirInfo.xml
index 8cd24a3..b086051 100644
--- a/docsrc/xmlsource/_DirInfo.xml
+++ b/docsrc/xmlsource/_DirInfo.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/accessinterfaces.xml b/docsrc/xmlsource/accessinterfaces.xml
index 4664aac..be85c8a 100644
--- a/docsrc/xmlsource/accessinterfaces.xml
+++ b/docsrc/xmlsource/accessinterfaces.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1597,12 +1597,12 @@ VirtuosoRepository("server1:port1,server2:port2,server3", "uid", "pwd");
<sect3 id="dataccessclientsconfailandbalancesesms"><title>Sample program</title>
<programlisting><![CDATA[
/*
- * $Id: accessinterfaces.xml,v 1.6.2.7 2012/03/07 15:28:56 source Exp $
+ * $Id: accessinterfaces.xml,v 1.6.2.6 2011/03/05 00:03:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/adminui.blogging.xml b/docsrc/xmlsource/adminui.blogging.xml
index 0ca0529..caae721 100644
--- a/docsrc/xmlsource/adminui.blogging.xml
+++ b/docsrc/xmlsource/adminui.blogging.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.dbadmin.xml b/docsrc/xmlsource/adminui.dbadmin.xml
index 2772d41..bd6c959 100644
--- a/docsrc/xmlsource/adminui.dbadmin.xml
+++ b/docsrc/xmlsource/adminui.dbadmin.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.internetdomains.xml b/docsrc/xmlsource/adminui.internetdomains.xml
index 459fa78..36ed577 100644
--- a/docsrc/xmlsource/adminui.internetdomains.xml
+++ b/docsrc/xmlsource/adminui.internetdomains.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.mailsrvadm.xml b/docsrc/xmlsource/adminui.mailsrvadm.xml
index c5ec3df..7c80531 100644
--- a/docsrc/xmlsource/adminui.mailsrvadm.xml
+++ b/docsrc/xmlsource/adminui.mailsrvadm.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.newssrvadm.xml b/docsrc/xmlsource/adminui.newssrvadm.xml
index 61313cb..2700735 100644
--- a/docsrc/xmlsource/adminui.newssrvadm.xml
+++ b/docsrc/xmlsource/adminui.newssrvadm.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.querytools.xml b/docsrc/xmlsource/adminui.querytools.xml
index adcf5e1..b0b1b9d 100644
--- a/docsrc/xmlsource/adminui.querytools.xml
+++ b/docsrc/xmlsource/adminui.querytools.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.rdfadm.xml b/docsrc/xmlsource/adminui.rdfadm.xml
index 9c2b902..cb45f8f 100644
--- a/docsrc/xmlsource/adminui.rdfadm.xml
+++ b/docsrc/xmlsource/adminui.rdfadm.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -163,7 +163,7 @@
</sect3>
<sect3 id="rdfadmviews"><title>Views</title>
<para>Virtuoso uses a SPARQL-based Meta Schema Language to provide RDBMS-to-RDF mapping
- functionality (also described as, Linked Data Views of SQL data). The language is an extension of the
+ functionality (also described as, RDF Views of SQL data). The language is an extension of the
SPARQL query language meshed with Virtuoso's SPASQL (SPARQL-inside-SQL) functionality. The
language enables you to declaratively map relational database schema tables, columns, rows,
and foreign key relationships to Classes, Attributes, Relationships, and Instances
@@ -179,7 +179,7 @@
<para><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSSQL2RDF#Mapping%20Process">Mapping Process steps.</ulink></para>
<para><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSSQL2RDF#Mapping%20Example">Mapping Example.</ulink></para>
<para><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VOSSQL2RDF">Mapping SQL Data to RDF.</ulink></para>
- <para><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtRdb2RDFViewsGeneration">Automated Generation of Linked Data Views over Relational Data Sources with Virtuoso.</ulink></para>
+ <para><ulink url="http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/VirtRdb2RDFViewsGeneration">Automated Generation of RDF Views over Relational Data Sources with Virtuoso.</ulink></para>
</tip>
</sect3>
<sect3 id="rdfadm"><title>Quad Store Upoload</title>
diff --git a/docsrc/xmlsource/adminui.replicationandsynchronization.xml b/docsrc/xmlsource/adminui.replicationandsynchronization.xml
index c2ea292..7ed01e5 100644
--- a/docsrc/xmlsource/adminui.replicationandsynchronization.xml
+++ b/docsrc/xmlsource/adminui.replicationandsynchronization.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.runtimehosting.xml b/docsrc/xmlsource/adminui.runtimehosting.xml
index 27c20e8..74ad3e1 100644
--- a/docsrc/xmlsource/adminui.runtimehosting.xml
+++ b/docsrc/xmlsource/adminui.runtimehosting.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.webdavadmin.xml b/docsrc/xmlsource/adminui.webdavadmin.xml
index 8d658dc..96831e2 100644
--- a/docsrc/xmlsource/adminui.webdavadmin.xml
+++ b/docsrc/xmlsource/adminui.webdavadmin.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/adminui.webservices.xml b/docsrc/xmlsource/adminui.webservices.xml
index ddee137..39f9693 100644
--- a/docsrc/xmlsource/adminui.webservices.xml
+++ b/docsrc/xmlsource/adminui.webservices.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -188,7 +188,7 @@ http://virtuoso.openlinksw.com/
<graphic fileref="ui/cr12a.png"/>
</figure>
</listitem>
- <listitem>This will result in the Target site being crawled and the retrieved pages stored locally in DAV and any network resource triples being fetched in the RDF Quad store.
+ <listitem>This will result in the Target site being crawled and the retrieved pages stored locally in DAV and any sponged triples in the RDF Quad store.
<figure id="cr13" float="1">
<title>Setting up a Content Crawler Job to Retrieve Sitemaps</title>
<graphic fileref="ui/cr13.png"/>
@@ -539,318 +539,6 @@ DAV/home/demo/gov.uk/data
</listitem>
</orderedlist>
</sect5>
- <sect5 id="contentcrawleratom"><title>Setting up a Content Crawler Job to Retrieve Content from ATOM feed</title>
- <para>This section demonstrates populating the Virtuoso Quad Store using ATOM feed.</para>
- <para>Populating the Virtuoso Quad Store can be done in different ways Virtuoso supports. The Conductor -> Content Import UI offers plenty of options, one of which is the XPath expression for crawling RDF resources URLs and this feature is a powerful and easy-to-use for managing the Quad Store.</para>
- <para>To populate the Virtuoso Quad Store, in this Guide we will use a XPAth expression for the URLs of the RDF resources references in a given ATOM feed. For ex. this one of the "National Bibliography" Store.</para>
- <orderedlist>
- <listitem>Go to http://cname/conductor</listitem>
- <listitem>Enter dba credentials</listitem>
- <listitem>Go to Web Application Server -> Content Management -> Content Imports:
- <figure id="cra1" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra1.png"/>
- </figure>
- </listitem>
- <listitem>Click "New Target":
- <figure id="cra2" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra2.png"/>
- </figure>
- </listitem>
- <listitem>In the presented form specify respectively:
- <itemizedlist mark="bullet">
- <listitem>"Target description": for ex. National Bibliography ;</listitem>
- <listitem>"Target URL": for ex. http://data.libris.kb.se/nationalbibliography/feed/ ;
- <para>Note: the entered URL will be the graph URI for storing the imported RDF data. You can also set it explicitly by entering another graph URI in the "Data Source URL" shown as option in this form.</para>
- </listitem>
- <listitem>"Copy to local DAV collection": for ex.
-<programlisting><![CDATA[
-/DAV/temp/nbio/
-]]></programlisting>
- </listitem>
- <listitem>"XPath expression for links extraction:":
-<programlisting><![CDATA[
-//entry/link/@href
-]]></programlisting>
- </listitem>
- <listitem>"Update Interval (minutes)": for ex. 10 ; </listitem>
- <listitem>"Run Sponger": hatch this check-box ; </listitem>
- <listitem>"Accept RDF": hatch this check-box ; </listitem>
- <listitem>"Store metadata": hatch this check-box ; </listitem>
- <listitem>"RDF Cartridge": hatch this check-box and specify what cartridges will be used:
- <figure id="cra3" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra3.png"/>
- </figure>
- <figure id="cra4" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra4.png"/>
- </figure>
- <figure id="cra5" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra5.png"/>
- </figure>
- <figure id="cra6" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra6.png"/>
- </figure>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>Click "Create".</listitem>
- <listitem>The new created target should be displayed in the list of available Targets:
- <figure id="cra7" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra7.png"/>
- </figure>
- </listitem>
- <listitem>Click "Import Queues":
- <figure id="cra8" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra8.png"/>
- </figure>
- </listitem>
- <listitem>Click for "National Bibliography" target the "Run" link from the very-right "Action" column.</listitem>
- <listitem>Should be presented list of Top pending URLs:
- <figure id="cra9" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra9.png"/>
- </figure>
- </listitem>
- <listitem>Finally when the import is finished, should be shown the total URLs that were processed:
- <figure id="cra10" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra10.png"/>
- </figure>
- </listitem>
- <listitem>Click "Back":
- <figure id="cra11" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra11.png"/>
- </figure>
- </listitem>
- <listitem>Click "Retrieved Sites":
- <figure id="cra12" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra12.png"/>
- </figure>
- </listitem>
- <listitem>Out target should be presented in the list of available retrieved sites. From here you could manage the retrieved URLs by editing the imported URLs or exporting to External/Internal WebDAV destination. Click for ex. the "Edit" link of the very-right "Action" column for our retrieved site.</listitem>
- <listitem>Should be presented all downloaded URLs of RDF resources referenced in our initial ATOM feed:
- <figure id="cra13" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra13.png"/>
- </figure>
- </listitem>
- <listitem>To view the imported RDF data, go to http://cname/sparql and enter a simple query for ex.:
-<programlisting><![CDATA[
-SELECT *
-FROM <http://data.libris.kb.se/nationalbibliography/feed/>
-WHERE
- {
- ?s ?p ?o
- }
-]]></programlisting>
- <figure id="cra14" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra14.png"/>
- </figure>
- </listitem>
- <listitem>Click "Run Query".</listitem>
- <listitem>The imported RDF data triples should be shown:
- <figure id="cra15" float="1">
- <title>Crawling ATOM feed</title>
- <graphic fileref="ui/cra15.png"/>
- </figure>
- </listitem>
- </orderedlist>
- </sect5>
- <sect5 id="contentcrawlersparqlendp"><title>Setting up a Content Crawler Job to Retrieve Content from SPARQL endpoint</title>
- <para>The following step-by section walks you through the process of:</para>
- <itemizedlist mark="bullet">
- <listitem>Populating a Virtuoso Quad Store with data from a 3rd party SPARQL endpoint</listitem>
- <listitem>Generating RDF dumps that are accessible to basic HTTP or WebDAV user agents.</listitem>
- </itemizedlist>
- <orderedlist>
- <listitem>Sample SPARQL query producing a list SPARQL endpoints:
-<programlisting><![CDATA[
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX owl: <http://www.w3.org/2002/07/owl#>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX dcterms: <http://purl.org/dc/terms/>
-PREFIX scovo: <http://purl.org/NET/scovo#>
-PREFIX void: <http://rdfs.org/ns/void#>
-PREFIX akt: <http://www.aktors.org/ontology/portal#>
-
-SELECT DISTINCT ?endpoint
-WHERE
- {
- ?ds a void:Dataset .
- ?ds void:sparqlEndpoint ?endpoint
- }
-]]></programlisting>
- </listitem>
- <listitem>Here is a sample SPARQL protocol URL constructed from one of the sparql endpoints in the result from the query above:
-<programlisting><![CDATA[
-http://void.rkbexplorer.com/sparql/?query=PREFIX+foaf%3A+%3Chttp%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2F%3E+%0D%0APREFIX+void%3A+++++%3Chttp%3A%2F%2Frdfs.org%2Fns%2Fvoid%23%3E++%0D%0ASELECT+distinct+%3Furl++WHERE+%7B+%3Fds+a+void%3ADataset+%3B+foaf%3Ahomepage+%3Furl+%7D%0D%0A&format=sparql
-]]></programlisting>
- </listitem>
- <listitem>Here is the cURL output showing a Virtuoso SPARQL URL that executes against a 3rd party SPARQL Endpoint URL:
-<programlisting><![CDATA[
-$ curl "http://void.rkbexplorer.com/sparql/?query=PREFIX+foaf%3A+%3Chttp%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2F%3E+%0D%0APREFIX+void
-%3A+++++%3Chttp%3A%2F%2Frdfs.org%2Fns%2Fvoid%23%3E++%0D%0ASELECT+distinct+%3Furl++WHERE+%7B+%3Fds+a+void%3ADataset+%3B+foaf%3Ah
-omepage+%3Furl+%7D%0D%0A&format=sparql"
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
- <head>
- <variable name="url"/>
- </head>
- <results ordered="false" distinct="true">
- <result>
- <binding name="url"><uri>http://kisti.rkbexplorer.com/</uri></binding>
- </result>
- <result>
- <binding name="url"><uri>http://epsrc.rkbexplorer.com/</uri></binding>
- </result>
- <result>
- <binding name="url"><uri>http://test2.rkbexplorer.com/</uri></binding>
- </result>
- <result>
- <binding name="url"><uri>http://test.rkbexplorer.com/</uri></binding>
- </result>
- ...
- ...
- ...
- </results>
-</sparql>
-]]></programlisting>
- </listitem>
- <listitem>Go to Conductor UI. For ex. http://localhost:8890/conductor :
- <figure id="scp1" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp1.png"/>
- </figure>
- </listitem>
- <listitem>Enter dba credentials;</listitem>
- <listitem>Go to "Web Application Server"-> "Content Management" -> "Content Imports"
- <figure id="scp2" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp2.png"/>
- </figure>
- </listitem>
- <listitem>Click "New Target":
- <figure id="scp3" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp3.png"/>
- </figure>
- </listitem>
- <listitem>In the presented form enter for ex.:
- <orderedlist>
- <listitem>"Target description": voiD store;</listitem>
- <listitem>"Target URL": the url from above i.e.:
-<programlisting><![CDATA[
-http://void.rkbexplorer.com/sparql/?query=PREFIX+foaf%3A+%3Chttp%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2F%3E+%0D%0APREFIX+void%3A+++++%3Chttp%3A%2F%2Frdfs.org%2Fns%2Fvoid%23%3E++%0D%0ASELECT+distinct+%3Furl++WHERE+%7B+%3Fds+a+void%3ADataset+%3B+foaf%3Ahomepage+%3Furl+%7D%0D%0A&format=sparql
-]]></programlisting>
- </listitem>
- <listitem>"Copy to local DAV collection":
-<programlisting><![CDATA[
-/DAV/void.rkbexplorer.com/content
-]]></programlisting>
- </listitem>
- <listitem>"Follow links matching (delimited with ;)":
-<programlisting><![CDATA[
-%
-]]></programlisting>
- </listitem>
- <listitem>Un-hatch "Use robots.txt" ;</listitem>
- <listitem>"XPath expression for links extraction":
-<programlisting><![CDATA[
-//binding[@name="url"]/uri/text()
-]]></programlisting>
- </listitem>
- <listitem>Hatch "Semantic Web Crawling";</listitem>
- <listitem>"If Graph IRI is unassigned use this Data Source URL:": enter for ex:
-<programlisting><![CDATA[
-http://void.collection
-]]></programlisting>
- </listitem>
- <listitem>Hatch "Follow URLs outside of the target host";</listitem>
- <listitem>Hatch "Run "Sponger" and "Accept RDF"
- <figure id="scp4" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp4.png"/>
- </figure>
- <figure id="scp5" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp5.png"/>
- </figure>
- <figure id="scp6" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp6.png"/>
- </figure>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>Click "Create";</listitem>
- <listitem>The target should be created and presented in the list of available targets:
- <figure id="scp7" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp7.png"/>
- </figure>
- </listitem>
- <listitem>Click "Import Queues":
- <figure id="scp8" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp8.png"/>
- </figure>
- </listitem>
- <listitem>Click "Run" for the imported target:
- <figure id="scp9" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp9.png"/>
- </figure>
- </listitem>
- <listitem>To check the retrieved content go to "Web Application Server"-> "Content Management" -> "Content Imports" -> "Retrieved Sites":
- <figure id="scp11" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp11.png"/>
- </figure>
- </listitem>
- <listitem>Click "voiD store" -> "Edit":
- <figure id="scp12" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp12.png"/>
- </figure>
- </listitem>
- <listitem>To check the imported URLs go to "Web Application Server"-> "Content Management" -> "Repository" path DAV/void.rkbexplorer.com/content:
- <figure id="scp10" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp10.png"/>
- </figure>
- </listitem>
- <listitem>To check the inserted into the RDF QUAD data go to http://cname/sparql and execute the following query:
-<programlisting><![CDATA[
-SELECT *
-FROM <http://void.collection>
-WHERE
- {
- ?s ?p ?o
- }
-]]></programlisting>
- <figure id="scp13" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp13.png"/>
- </figure>
- <figure id="scp14" float="1">
- <title>Crawling SPARQL Endpoints</title>
- <graphic fileref="ui/scp14.png"/>
- </figure>
- </listitem>
- </orderedlist>
- </sect5>
</sect4>
</sect3>
<sect3 id="admiui.accesscontrol"><title>Access Control</title>
diff --git a/docsrc/xmlsource/adminui.xml b/docsrc/xmlsource/adminui.xml
index cdff8a8..862212e 100644
--- a/docsrc/xmlsource/adminui.xml
+++ b/docsrc/xmlsource/adminui.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -88,7 +88,7 @@ perform WSDL Import/Export, manage your BPEL processes.
<graphic fileref="webservices.png"/>
</figure>
<para>From "Linked Data" you can execute/save/load SPARQL queries, add/edit RDF Mapping, make
- statistics, manage graphs, import schemas and define namespaces, generated Linked Data Views,
+ statistics, manage graphs, import schemas and define namespaces, generated Linked Data RDF views,
upload to the Quad Store:</para>
<figure id="adminuirdf" float="1">
<title>RDF</title>
diff --git a/docsrc/xmlsource/adminui.xmlservices.xml b/docsrc/xmlsource/adminui.xmlservices.xml
index 31b4f12..1202931 100644
--- a/docsrc/xmlsource/adminui.xmlservices.xml
+++ b/docsrc/xmlsource/adminui.xmlservices.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/aggregates.xml b/docsrc/xmlsource/aggregates.xml
index 99404e4..1c34908 100644
--- a/docsrc/xmlsource/aggregates.xml
+++ b/docsrc/xmlsource/aggregates.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/appendixa.xml b/docsrc/xmlsource/appendixa.xml
index a2017e2..40dc12f 100644
--- a/docsrc/xmlsource/appendixa.xml
+++ b/docsrc/xmlsource/appendixa.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/backup.xml b/docsrc/xmlsource/backup.xml
index 97842d6..b65a31f 100644
--- a/docsrc/xmlsource/backup.xml
+++ b/docsrc/xmlsource/backup.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bidirrepl.xml b/docsrc/xmlsource/bidirrepl.xml
index 1ff8cda..c3465e5 100644
--- a/docsrc/xmlsource/bidirrepl.xml
+++ b/docsrc/xmlsource/bidirrepl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bidirtransrepl.xml b/docsrc/xmlsource/bidirtransrepl.xml
index 1c73570..2a5843d 100644
--- a/docsrc/xmlsource/bidirtransrepl.xml
+++ b/docsrc/xmlsource/bidirtransrepl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/blog_atom.xml b/docsrc/xmlsource/blog_atom.xml
index 970ab98..472e439 100644
--- a/docsrc/xmlsource/blog_atom.xml
+++ b/docsrc/xmlsource/blog_atom.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/blogger.xml b/docsrc/xmlsource/blogger.xml
index 64c021c..06c9a96 100644
--- a/docsrc/xmlsource/blogger.xml
+++ b/docsrc/xmlsource/blogger.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel.xml b/docsrc/xmlsource/bpel.xml
index d333ac5..93ec360 100644
--- a/docsrc/xmlsource/bpel.xml
+++ b/docsrc/xmlsource/bpel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_compile_script.xml b/docsrc/xmlsource/bpel/bpel_compile_script.xml
index dc8a013..9c9856f 100644
--- a/docsrc/xmlsource/bpel/bpel_compile_script.xml
+++ b/docsrc/xmlsource/bpel/bpel_compile_script.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_copy_script.xml b/docsrc/xmlsource/bpel/bpel_copy_script.xml
index b5d2252..1fe7469 100644
--- a/docsrc/xmlsource/bpel/bpel_copy_script.xml
+++ b/docsrc/xmlsource/bpel/bpel_copy_script.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_get_partner_links.xml b/docsrc/xmlsource/bpel/bpel_get_partner_links.xml
index 9422adf..da002c4 100644
--- a/docsrc/xmlsource/bpel/bpel_get_partner_links.xml
+++ b/docsrc/xmlsource/bpel/bpel_get_partner_links.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_get_var.xml b/docsrc/xmlsource/bpel/bpel_get_var.xml
index 9514dff..d82cf88 100644
--- a/docsrc/xmlsource/bpel/bpel_get_var.xml
+++ b/docsrc/xmlsource/bpel/bpel_get_var.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_import_script.xml b/docsrc/xmlsource/bpel/bpel_import_script.xml
index 2f4b460..7261398 100644
--- a/docsrc/xmlsource/bpel/bpel_import_script.xml
+++ b/docsrc/xmlsource/bpel/bpel_import_script.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_instance_delete.xml b/docsrc/xmlsource/bpel/bpel_instance_delete.xml
index 48f1e8f..e37fdfc 100644
--- a/docsrc/xmlsource/bpel/bpel_instance_delete.xml
+++ b/docsrc/xmlsource/bpel/bpel_instance_delete.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_plink_get_option.xml b/docsrc/xmlsource/bpel/bpel_plink_get_option.xml
index e81717b..1b17f12 100644
--- a/docsrc/xmlsource/bpel/bpel_plink_get_option.xml
+++ b/docsrc/xmlsource/bpel/bpel_plink_get_option.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_plink_set_option.xml b/docsrc/xmlsource/bpel/bpel_plink_set_option.xml
index 56a413d..c0a973b 100644
--- a/docsrc/xmlsource/bpel/bpel_plink_set_option.xml
+++ b/docsrc/xmlsource/bpel/bpel_plink_set_option.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_purge.xml b/docsrc/xmlsource/bpel/bpel_purge.xml
index 56bd4d2..30085b3 100644
--- a/docsrc/xmlsource/bpel/bpel_purge.xml
+++ b/docsrc/xmlsource/bpel/bpel_purge.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_delete.xml b/docsrc/xmlsource/bpel/bpel_script_delete.xml
index 9bf5015..0c9ad8c 100644
--- a/docsrc/xmlsource/bpel/bpel_script_delete.xml
+++ b/docsrc/xmlsource/bpel/bpel_script_delete.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_obsolete.xml b/docsrc/xmlsource/bpel/bpel_script_obsolete.xml
index 96a140a..cd60443 100644
--- a/docsrc/xmlsource/bpel/bpel_script_obsolete.xml
+++ b/docsrc/xmlsource/bpel/bpel_script_obsolete.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_source_update.xml b/docsrc/xmlsource/bpel/bpel_script_source_update.xml
index e84afb4..c8d3e4b 100644
--- a/docsrc/xmlsource/bpel/bpel_script_source_update.xml
+++ b/docsrc/xmlsource/bpel/bpel_script_source_update.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_upload.xml b/docsrc/xmlsource/bpel/bpel_script_upload.xml
index 310f5d5..c1ac807 100644
--- a/docsrc/xmlsource/bpel/bpel_script_upload.xml
+++ b/docsrc/xmlsource/bpel/bpel_script_upload.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml b/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml
index 4483a9d..1cf4d90 100644
--- a/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml
+++ b/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_set_var.xml b/docsrc/xmlsource/bpel/bpel_set_var.xml
index b13e07f..67856e9 100644
--- a/docsrc/xmlsource/bpel/bpel_set_var.xml
+++ b/docsrc/xmlsource/bpel/bpel_set_var.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml b/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml
index 0727fbe..e1003b2 100644
--- a/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml
+++ b/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/cinterface.xml b/docsrc/xmlsource/cinterface.xml
index b419533..1d9398e 100644
--- a/docsrc/xmlsource/cinterface.xml
+++ b/docsrc/xmlsource/cinterface.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/concepts.xml b/docsrc/xmlsource/concepts.xml
index 29bc369..d54c169 100644
--- a/docsrc/xmlsource/concepts.xml
+++ b/docsrc/xmlsource/concepts.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/createassembly.xml b/docsrc/xmlsource/createassembly.xml
index a81d6c1..377514d 100644
--- a/docsrc/xmlsource/createassembly.xml
+++ b/docsrc/xmlsource/createassembly.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/createexthostproc.xml b/docsrc/xmlsource/createexthostproc.xml
index e3e1194..d279cb5 100644
--- a/docsrc/xmlsource/createexthostproc.xml
+++ b/docsrc/xmlsource/createexthostproc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/dbconcepts.xml b/docsrc/xmlsource/dbconcepts.xml
index 045c32c..32755ca 100644
--- a/docsrc/xmlsource/dbconcepts.xml
+++ b/docsrc/xmlsource/dbconcepts.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/dbpump.xml b/docsrc/xmlsource/dbpump.xml
index 94bf6e5..056239c 100644
--- a/docsrc/xmlsource/dbpump.xml
+++ b/docsrc/xmlsource/dbpump.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/errors.xml b/docsrc/xmlsource/errors.xml
index 08549dd..2ff7611 100644
--- a/docsrc/xmlsource/errors.xml
+++ b/docsrc/xmlsource/errors.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/exposingws.xml b/docsrc/xmlsource/exposingws.xml
index b35e265..b14fdbf 100644
--- a/docsrc/xmlsource/exposingws.xml
+++ b/docsrc/xmlsource/exposingws.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/fault.xml b/docsrc/xmlsource/fault.xml
index 41c3791..7627286 100644
--- a/docsrc/xmlsource/fault.xml
+++ b/docsrc/xmlsource/fault.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/freetext.xml b/docsrc/xmlsource/freetext.xml
index 542e76e..a771b8f 100644
--- a/docsrc/xmlsource/freetext.xml
+++ b/docsrc/xmlsource/freetext.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/ftp.xml b/docsrc/xmlsource/ftp.xml
index 516a444..268254e 100644
--- a/docsrc/xmlsource/ftp.xml
+++ b/docsrc/xmlsource/ftp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/GROUP_CONCAT.xml b/docsrc/xmlsource/funcref/GROUP_CONCAT.xml
index 23d7446..a0e8afd 100644
--- a/docsrc/xmlsource/funcref/GROUP_CONCAT.xml
+++ b/docsrc/xmlsource/funcref/GROUP_CONCAT.xml
@@ -23,9 +23,7 @@
the values of an expression with a group. The order of the strings is not specified.
The separator character used in the concatenation may be given with the scalar
argument delimiter.</para>
- <para>Note: the "sql:" prefix is mandatory when this aggregate is used in SPARQL queries.
- In SQL queries the prefix is "DB.DBA".
- </para>
+ <para>Note: Using the "sql:" prefix is mandatory for this aggregate.</para>
</refsect1>
<refsect1 id="params_GROUP_CONCAT">
<title>Parameters</title>
@@ -78,8 +76,6 @@ No. of rows in result: 10
<refsect1 id="seealso_GROUP_CONCAT">
<title>See Also</title>
<para><link linkend="fn_SAMPLE"><function>SAMPLE</function></link></para>
- <para><link linkend="fn_GROUP_DIGEST"><function>GROUP_DIGEST</function></link></para>
- <para><link linkend="samplegroupconcatdigest">Differences between SAMPLE, GROUP_CONCAT and GROUP_DIGEST functions usage.</link></para>
</refsect1>
</refentry>
diff --git a/docsrc/xmlsource/funcref/GROUP_DIGEST.xml b/docsrc/xmlsource/funcref/GROUP_DIGEST.xml
deleted file mode 100644
index adb8208..0000000
--- a/docsrc/xmlsource/funcref/GROUP_DIGEST.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry id="fn_GROUP_DIGEST">
- <refmeta>
- <refentrytitle>GROUP_DIGEST</refentrytitle>
- <refmiscinfo>rdf</refmiscinfo>
- </refmeta>
- <refnamediv>
- <refname>GROUP_DIGEST</refname>
- <refpurpose>returns an arbitrary value from the multiset passed to it.</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <funcsynopsis id="fsyn_GROUP_DIGEST">
- <funcprototype id="fproto_GROUP_DIGEST">
- <funcdef><function>GROUP_DIGEST</function></funcdef>
- <paramdef>in <parameter>token</parameter> varchar</paramdef>
- <paramdef>in <parameter>delim</parameter> varchar</paramdef>
- <paramdef>in <parameter>maxlen</parameter> integer</paramdef>
- <paramdef>in <parameter>mode</parameter> integer</paramdef>
- </funcprototype>
- </funcsynopsis>
- </refsynopsisdiv>
- <refsect1 id="desc_GROUP_DIGEST">
- <title>Description</title>
- <para>GROUP_DIGEST is aggregate function that performs a string concatenation across
- the values of an expression with a group. The order of the strings is not specified.
- The separator character used in the concatenation may be given with the scalar
- argument delimiter. The function is an extended version of sql:GROUP_CONCAT(), with
- two more arguments: maxlen and mode.</para>
- <para>Note: the "sql:" prefix is mandatory when this aggregate is used in SPARQL queries.
- In SQL queries the prefix is "DB.DBA".
- </para>
- </refsect1>
- <refsect1 id="params_GROUP_DIGEST">
- <title>Parameters</title>
- <refsect2><title>token</title>
- <para>An item that should be added to a delimited list.</para>
- </refsect2>
- <refsect2><title>delim</title>
- <para>The delimeter character to be used in the concatenation.</para>
- </refsect2>
- <refsect2><title>maxlen</title>
- <para>The maximal allowed length of the result, in characters. Redundant values will be ignored.
- If the last value does not fit in the "maxlen" entirely, then it can be truncated and "..." is
- placed at the end of the resulting string.</para>
- </refsect2>
- <refsect2><title>mode</title>
- <para>Bitmask of properties. Right now only bit 1 is used and others are reserved. If the value
- of the argument is 1 then duplicate values are ignored; value 0 will put duplicate values like
- in case of sql:GROUP_CONCAT ().</para>
- </refsect2>
- </refsect1>
- <refsect1 id="ret_GROUP_DIGEST"><title>Return Types</title>
- <para>any</para>
- </refsect1>
- <refsect1 id="examples_GROUP_DIGEST">
- <title>Examples</title>
- <example id="ex_GROUP_DIGEST"><title>Get all ?assets as a list with delimiters.</title>
-<programlisting><![CDATA[
-SQL>SPARQL
-SELECT ?view (sql:GROUP_DIGEST (?path, ' ', 1000, 1)) as ?path_list
- (sql:GROUP_DIGEST (?asset, ' ', 1000, 1)) as ?asset_list
-FROM <http://mygraph.com>
-WHERE
- {
- ?view <viewPath> ?path ;
- <viewContent> ?asset ;
- <viewType> 'phyview'.
- };
-]]></programlisting>
- </example>
- </refsect1>
- <refsect1 id="seealso_GROUP_DIGEST">
- <title>See Also</title>
- <para><link linkend="fn_SAMPLE"><function>SAMPLE</function></link></para>
- <para><link linkend="fn_GROUP_CONCAT"><function>GROUP_CONCAT</function></link></para>
- <para><link linkend="samplegroupconcatdigest">Differences between SAMPLE, GROUP_CONCAT and GROUP_DIGEST functions usage.</link></para>
- </refsect1>
-</refentry>
-
diff --git a/docsrc/xmlsource/funcref/REPL_ADD_CR.xml b/docsrc/xmlsource/funcref/REPL_ADD_CR.xml
index 59d3e0f..30811cf 100644
--- a/docsrc/xmlsource/funcref/REPL_ADD_CR.xml
+++ b/docsrc/xmlsource/funcref/REPL_ADD_CR.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml b/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml
index 9ad5031..b9b8fb1 100644
--- a/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml
+++ b/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml b/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml
index 47d3c3b..a10a5e8 100644
--- a/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml
+++ b/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml
index a45bc21..45e12f0 100644
--- a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml
+++ b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml
index 65e65d0..48d14cb 100644
--- a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml
+++ b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml
index f137fd5..ca28683 100644
--- a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml
+++ b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml
index 0a100a0..dd42279 100644
--- a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml
+++ b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml b/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml
index ff3bf21..389887b 100644
--- a/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml
+++ b/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml b/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml
index 99d47f9..200635c 100644
--- a/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml
+++ b/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml b/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml
index de71b6a..918d74c 100644
--- a/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml
+++ b/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml b/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml
index d0b7334..0072913 100644
--- a/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml
+++ b/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/SAMPLE.xml b/docsrc/xmlsource/funcref/SAMPLE.xml
index 7982bab..87f6033 100644
--- a/docsrc/xmlsource/funcref/SAMPLE.xml
+++ b/docsrc/xmlsource/funcref/SAMPLE.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry id="fn_SAMPLE">
+<refentry id="fn_sample">
<refmeta>
<refentrytitle>SAMPLE</refentrytitle>
<refmiscinfo>rdf</refmiscinfo>
@@ -55,7 +55,5 @@ No. of rows in result: 1
<refsect1 id="seealso_sample">
<title>See Also</title>
<para><link linkend="fn_GROUP_CONCAT"><function>GROUP_CONCAT</function></link></para>
- <para><link linkend="fn_GROUP_DIGEST"><function>GROUP_DIGEST</function></link></para>
- <para><link linkend="samplegroupconcatdigest">Differences between SAMPLE, GROUP_CONCAT and GROUP_DIGEST functions usage.</link></para>
</refsect1>
</refentry>
diff --git a/docsrc/xmlsource/funcref/XMLAGG.xml b/docsrc/xmlsource/funcref/XMLAGG.xml
index 3546ea6..d8b2c9f 100644
--- a/docsrc/xmlsource/funcref/XMLAGG.xml
+++ b/docsrc/xmlsource/funcref/XMLAGG.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml b/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml
index 3fdc11d..b8b94a1 100644
--- a/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml
+++ b/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLAddAttribute.xml b/docsrc/xmlsource/funcref/XMLAddAttribute.xml
index 161ad47..68847b3 100644
--- a/docsrc/xmlsource/funcref/XMLAddAttribute.xml
+++ b/docsrc/xmlsource/funcref/XMLAddAttribute.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLAppendChildren.xml b/docsrc/xmlsource/funcref/XMLAppendChildren.xml
index be9ba91..11ea70c 100644
--- a/docsrc/xmlsource/funcref/XMLAppendChildren.xml
+++ b/docsrc/xmlsource/funcref/XMLAppendChildren.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLCONCAT.xml b/docsrc/xmlsource/funcref/XMLCONCAT.xml
index 8aee191..28825de 100644
--- a/docsrc/xmlsource/funcref/XMLCONCAT.xml
+++ b/docsrc/xmlsource/funcref/XMLCONCAT.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLELEMENT.xml b/docsrc/xmlsource/funcref/XMLELEMENT.xml
index e67a597..9faa30a 100644
--- a/docsrc/xmlsource/funcref/XMLELEMENT.xml
+++ b/docsrc/xmlsource/funcref/XMLELEMENT.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLFOREST.xml b/docsrc/xmlsource/funcref/XMLFOREST.xml
index ba6ea93..98cbc6d 100644
--- a/docsrc/xmlsource/funcref/XMLFOREST.xml
+++ b/docsrc/xmlsource/funcref/XMLFOREST.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLInsertAfter.xml b/docsrc/xmlsource/funcref/XMLInsertAfter.xml
index cb2db43..1ac58e8 100644
--- a/docsrc/xmlsource/funcref/XMLInsertAfter.xml
+++ b/docsrc/xmlsource/funcref/XMLInsertAfter.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLInsertBefore.xml b/docsrc/xmlsource/funcref/XMLInsertBefore.xml
index 0c0225e..a95ae2a 100644
--- a/docsrc/xmlsource/funcref/XMLInsertBefore.xml
+++ b/docsrc/xmlsource/funcref/XMLInsertBefore.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLReplace.xml b/docsrc/xmlsource/funcref/XMLReplace.xml
index 662a8ad..483cdff 100644
--- a/docsrc/xmlsource/funcref/XMLReplace.xml
+++ b/docsrc/xmlsource/funcref/XMLReplace.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.XMLType.xml b/docsrc/xmlsource/funcref/XMLType.XMLType.xml
index 8e20618..31d60d8 100644
--- a/docsrc/xmlsource/funcref/XMLType.XMLType.xml
+++ b/docsrc/xmlsource/funcref/XMLType.XMLType.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml b/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml
index 3620b48..2540fae 100644
--- a/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml
+++ b/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml b/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml
index be9f9a9..913ee82 100644
--- a/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml
+++ b/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.createXML.xml b/docsrc/xmlsource/funcref/XMLType.createXML.xml
index 3234190..64369c4 100644
--- a/docsrc/xmlsource/funcref/XMLType.createXML.xml
+++ b/docsrc/xmlsource/funcref/XMLType.createXML.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.existsNode.xml b/docsrc/xmlsource/funcref/XMLType.existsNode.xml
index 23208b4..faa8606 100644
--- a/docsrc/xmlsource/funcref/XMLType.existsNode.xml
+++ b/docsrc/xmlsource/funcref/XMLType.existsNode.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.extract.xml b/docsrc/xmlsource/funcref/XMLType.extract.xml
index 477878b..3a1c391 100644
--- a/docsrc/xmlsource/funcref/XMLType.extract.xml
+++ b/docsrc/xmlsource/funcref/XMLType.extract.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getClobVal.xml b/docsrc/xmlsource/funcref/XMLType.getClobVal.xml
index ded53ed..da7f30e 100644
--- a/docsrc/xmlsource/funcref/XMLType.getClobVal.xml
+++ b/docsrc/xmlsource/funcref/XMLType.getClobVal.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getNamespace.xml b/docsrc/xmlsource/funcref/XMLType.getNamespace.xml
index 66a43ce..7795c8e 100644
--- a/docsrc/xmlsource/funcref/XMLType.getNamespace.xml
+++ b/docsrc/xmlsource/funcref/XMLType.getNamespace.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getNumVal.xml b/docsrc/xmlsource/funcref/XMLType.getNumVal.xml
index 299bce8..ee0da4f 100644
--- a/docsrc/xmlsource/funcref/XMLType.getNumVal.xml
+++ b/docsrc/xmlsource/funcref/XMLType.getNumVal.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getRootElement.xml b/docsrc/xmlsource/funcref/XMLType.getRootElement.xml
index e4a8a9d..a773ce7 100644
--- a/docsrc/xmlsource/funcref/XMLType.getRootElement.xml
+++ b/docsrc/xmlsource/funcref/XMLType.getRootElement.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml b/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml
index 2cb5cd8..d7bad34 100644
--- a/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml
+++ b/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.getStringVal.xml b/docsrc/xmlsource/funcref/XMLType.getStringVal.xml
index 6a54b5d..316c69f 100644
--- a/docsrc/xmlsource/funcref/XMLType.getStringVal.xml
+++ b/docsrc/xmlsource/funcref/XMLType.getStringVal.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.isFragment.xml b/docsrc/xmlsource/funcref/XMLType.isFragment.xml
index 64f3edc..64ec299 100644
--- a/docsrc/xmlsource/funcref/XMLType.isFragment.xml
+++ b/docsrc/xmlsource/funcref/XMLType.isFragment.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml
index c8ff437..eb8be12 100644
--- a/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml
+++ b/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml
index 8079d2e..49a6dc9 100644
--- a/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml
+++ b/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml
index 5704d32..21546d5 100644
--- a/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml
+++ b/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml b/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml
index 8522b39..f840995 100644
--- a/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml
+++ b/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml b/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml
index 597a32e..f5295e2 100644
--- a/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml
+++ b/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.toObject.xml b/docsrc/xmlsource/funcref/XMLType.toObject.xml
index a65967b..0bdc03e 100644
--- a/docsrc/xmlsource/funcref/XMLType.toObject.xml
+++ b/docsrc/xmlsource/funcref/XMLType.toObject.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/XMLType.transform.xml b/docsrc/xmlsource/funcref/XMLType.transform.xml
index 8b4cb3e..c1a7c27 100644
--- a/docsrc/xmlsource/funcref/XMLType.transform.xml
+++ b/docsrc/xmlsource/funcref/XMLType.transform.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/abs.xml b/docsrc/xmlsource/funcref/abs.xml
index 9f329e4..52d0551 100644
--- a/docsrc/xmlsource/funcref/abs.xml
+++ b/docsrc/xmlsource/funcref/abs.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/any_grants.xml b/docsrc/xmlsource/funcref/any_grants.xml
index 7a17fb1..c636a8a 100644
--- a/docsrc/xmlsource/funcref/any_grants.xml
+++ b/docsrc/xmlsource/funcref/any_grants.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/aref.xml b/docsrc/xmlsource/funcref/aref.xml
index 8ddf72c..bab57fd 100644
--- a/docsrc/xmlsource/funcref/aref.xml
+++ b/docsrc/xmlsource/funcref/aref.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ascii.xml b/docsrc/xmlsource/funcref/ascii.xml
index ad8c2b8..b7d1db8 100644
--- a/docsrc/xmlsource/funcref/ascii.xml
+++ b/docsrc/xmlsource/funcref/ascii.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/aset.xml b/docsrc/xmlsource/funcref/aset.xml
index d0dcf27..ca468e3 100644
--- a/docsrc/xmlsource/funcref/aset.xml
+++ b/docsrc/xmlsource/funcref/aset.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/atof.xml b/docsrc/xmlsource/funcref/atof.xml
index 820d96d..b4c4c59 100644
--- a/docsrc/xmlsource/funcref/atof.xml
+++ b/docsrc/xmlsource/funcref/atof.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/atoi.xml b/docsrc/xmlsource/funcref/atoi.xml
index b321c0e..dec52d2 100644
--- a/docsrc/xmlsource/funcref/atoi.xml
+++ b/docsrc/xmlsource/funcref/atoi.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/att_local_name.xml b/docsrc/xmlsource/funcref/att_local_name.xml
index ee26cc3..5a8616c 100644
--- a/docsrc/xmlsource/funcref/att_local_name.xml
+++ b/docsrc/xmlsource/funcref/att_local_name.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/backup.xml b/docsrc/xmlsource/funcref/backup.xml
index 02b6112..5611c0e 100644
--- a/docsrc/xmlsource/funcref/backup.xml
+++ b/docsrc/xmlsource/funcref/backup.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/backup_context_clear.xml b/docsrc/xmlsource/funcref/backup_context_clear.xml
index ed75093..f0252fd 100644
--- a/docsrc/xmlsource/funcref/backup_context_clear.xml
+++ b/docsrc/xmlsource/funcref/backup_context_clear.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/backup_online.xml b/docsrc/xmlsource/funcref/backup_online.xml
index fe721bf..75634bb 100644
--- a/docsrc/xmlsource/funcref/backup_online.xml
+++ b/docsrc/xmlsource/funcref/backup_online.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_arg.xml b/docsrc/xmlsource/funcref/bif_arg.xml
index 9e48da3..daa25f8 100644
--- a/docsrc/xmlsource/funcref/bif_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_array_arg.xml b/docsrc/xmlsource/funcref/bif_array_arg.xml
index c8b04fb..d9cfa1b 100644
--- a/docsrc/xmlsource/funcref/bif_array_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_array_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml b/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml
index cd81488..8c0bea3 100644
--- a/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_bin_arg.xml b/docsrc/xmlsource/funcref/bif_bin_arg.xml
index 84b614d..89b0335 100644
--- a/docsrc/xmlsource/funcref/bif_bin_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_bin_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_double_arg.xml b/docsrc/xmlsource/funcref/bif_double_arg.xml
index 2c9a596..f8b7ee1 100644
--- a/docsrc/xmlsource/funcref/bif_double_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_double_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_entity_arg.xml b/docsrc/xmlsource/funcref/bif_entity_arg.xml
index 15a9745..6003d30 100644
--- a/docsrc/xmlsource/funcref/bif_entity_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_entity_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_float_arg.xml b/docsrc/xmlsource/funcref/bif_float_arg.xml
index ccafedc..06fa964 100644
--- a/docsrc/xmlsource/funcref/bif_float_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_float_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_funcs.xml b/docsrc/xmlsource/funcref/bif_funcs.xml
index 140259b..ebb5c2a 100644
--- a/docsrc/xmlsource/funcref/bif_funcs.xml
+++ b/docsrc/xmlsource/funcref/bif_funcs.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_long_arg.xml b/docsrc/xmlsource/funcref/bif_long_arg.xml
index f98ba98..8d3d5cd 100644
--- a/docsrc/xmlsource/funcref/bif_long_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_long_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml b/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml
index 22d36d3..41fd40d 100644
--- a/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_string_arg.xml b/docsrc/xmlsource/funcref/bif_string_arg.xml
index c2f4451..b1158ab 100644
--- a/docsrc/xmlsource/funcref/bif_string_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_string_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml b/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml
index 29b8a6c..616d560 100644
--- a/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_string_or_wide_or_null_arg.xml b/docsrc/xmlsource/funcref/bif_string_or_wide_or_null_arg.xml
index 95589a5..fef5905 100644
--- a/docsrc/xmlsource/funcref/bif_string_or_wide_or_null_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_string_or_wide_or_null_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bif_strses_arg.xml b/docsrc/xmlsource/funcref/bif_strses_arg.xml
index 0512895..7d58569 100644
--- a/docsrc/xmlsource/funcref/bif_strses_arg.xml
+++ b/docsrc/xmlsource/funcref/bif_strses_arg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bit_and.xml b/docsrc/xmlsource/funcref/bit_and.xml
index c96335c..37b05b4 100644
--- a/docsrc/xmlsource/funcref/bit_and.xml
+++ b/docsrc/xmlsource/funcref/bit_and.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bit_not.xml b/docsrc/xmlsource/funcref/bit_not.xml
index 0560e66..b122efb 100644
--- a/docsrc/xmlsource/funcref/bit_not.xml
+++ b/docsrc/xmlsource/funcref/bit_not.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bit_or.xml b/docsrc/xmlsource/funcref/bit_or.xml
index ef8755a..ba88428 100644
--- a/docsrc/xmlsource/funcref/bit_or.xml
+++ b/docsrc/xmlsource/funcref/bit_or.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bit_shift.xml b/docsrc/xmlsource/funcref/bit_shift.xml
index b16f206..324341a 100644
--- a/docsrc/xmlsource/funcref/bit_shift.xml
+++ b/docsrc/xmlsource/funcref/bit_shift.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bit_xor.xml b/docsrc/xmlsource/funcref/bit_xor.xml
index 04b3f56..59bbb12 100644
--- a/docsrc/xmlsource/funcref/bit_xor.xml
+++ b/docsrc/xmlsource/funcref/bit_xor.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blob_to_string.xml b/docsrc/xmlsource/funcref/blob_to_string.xml
index 7103723..a834b72 100644
--- a/docsrc/xmlsource/funcref/blob_to_string.xml
+++ b/docsrc/xmlsource/funcref/blob_to_string.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blob_to_string_output.xml b/docsrc/xmlsource/funcref/blob_to_string_output.xml
index 73bf036..79c422a 100644
--- a/docsrc/xmlsource/funcref/blob_to_string_output.xml
+++ b/docsrc/xmlsource/funcref/blob_to_string_output.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.deletePost.xml b/docsrc/xmlsource/funcref/blogger.deletePost.xml
index f5b3e3b..616054f 100644
--- a/docsrc/xmlsource/funcref/blogger.deletePost.xml
+++ b/docsrc/xmlsource/funcref/blogger.deletePost.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.editPost.xml b/docsrc/xmlsource/funcref/blogger.editPost.xml
index d551519..b628b6c 100644
--- a/docsrc/xmlsource/funcref/blogger.editPost.xml
+++ b/docsrc/xmlsource/funcref/blogger.editPost.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.getPost.xml b/docsrc/xmlsource/funcref/blogger.getPost.xml
index cbbfae6..7bbfb87 100644
--- a/docsrc/xmlsource/funcref/blogger.getPost.xml
+++ b/docsrc/xmlsource/funcref/blogger.getPost.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml b/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml
index 32bd5bb..5125a4a 100644
--- a/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml
+++ b/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.getTemplate.xml b/docsrc/xmlsource/funcref/blogger.getTemplate.xml
index 7efaa45..4500c8c 100644
--- a/docsrc/xmlsource/funcref/blogger.getTemplate.xml
+++ b/docsrc/xmlsource/funcref/blogger.getTemplate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.getUserInfo.xml b/docsrc/xmlsource/funcref/blogger.getUserInfo.xml
index 09ab9ce..1ae916c 100644
--- a/docsrc/xmlsource/funcref/blogger.getUserInfo.xml
+++ b/docsrc/xmlsource/funcref/blogger.getUserInfo.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml b/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml
index c370dd4..ebe24f8 100644
--- a/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml
+++ b/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.newPost.xml b/docsrc/xmlsource/funcref/blogger.newPost.xml
index 0dd705d..9d37af8 100644
--- a/docsrc/xmlsource/funcref/blogger.newPost.xml
+++ b/docsrc/xmlsource/funcref/blogger.newPost.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/blogger.setTemplate.xml b/docsrc/xmlsource/funcref/blogger.setTemplate.xml
index e7f1039..acf51c5 100644
--- a/docsrc/xmlsource/funcref/blogger.setTemplate.xml
+++ b/docsrc/xmlsource/funcref/blogger.setTemplate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/bookmark.xml b/docsrc/xmlsource/funcref/bookmark.xml
index 5b97a3e..10a331e 100644
--- a/docsrc/xmlsource/funcref/bookmark.xml
+++ b/docsrc/xmlsource/funcref/bookmark.xml
@@ -5,7 +5,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -23,7 +23,8 @@
-
-->
<!--
- $Id: bookmark.xml,v 1.1.1.1.2.3 2012/03/08 13:13:48 source Exp $
+ $Id: bookmark.xml,v 1.1.1.1.2.1 2010/01/06 21:33:50 source Exp $
+ (C)Copyright 2005 OpenLink Software
-->
<refentry id="fn_bookmark">
<refmeta>
diff --git a/docsrc/xmlsource/funcref/ceiling.xml b/docsrc/xmlsource/funcref/ceiling.xml
index f2eeb23..6e1ccd9 100644
--- a/docsrc/xmlsource/funcref/ceiling.xml
+++ b/docsrc/xmlsource/funcref/ceiling.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cfg_item_count.xml b/docsrc/xmlsource/funcref/cfg_item_count.xml
index 9f23b3f..6e442d5 100644
--- a/docsrc/xmlsource/funcref/cfg_item_count.xml
+++ b/docsrc/xmlsource/funcref/cfg_item_count.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cfg_item_name.xml b/docsrc/xmlsource/funcref/cfg_item_name.xml
index 8febf54..fe4100b 100644
--- a/docsrc/xmlsource/funcref/cfg_item_name.xml
+++ b/docsrc/xmlsource/funcref/cfg_item_name.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cfg_item_value.xml b/docsrc/xmlsource/funcref/cfg_item_value.xml
index e071f3e..bc90f51 100644
--- a/docsrc/xmlsource/funcref/cfg_item_value.xml
+++ b/docsrc/xmlsource/funcref/cfg_item_value.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cfg_section_count.xml b/docsrc/xmlsource/funcref/cfg_section_count.xml
index 9c0e52b..69611a9 100644
--- a/docsrc/xmlsource/funcref/cfg_section_count.xml
+++ b/docsrc/xmlsource/funcref/cfg_section_count.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cfg_section_name.xml b/docsrc/xmlsource/funcref/cfg_section_name.xml
index c0c5fb2..87ffa54 100644
--- a/docsrc/xmlsource/funcref/cfg_section_name.xml
+++ b/docsrc/xmlsource/funcref/cfg_section_name.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cfg_write.xml b/docsrc/xmlsource/funcref/cfg_write.xml
index 00fc686..6039dd1 100644
--- a/docsrc/xmlsource/funcref/cfg_write.xml
+++ b/docsrc/xmlsource/funcref/cfg_write.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/charset_define.xml b/docsrc/xmlsource/funcref/charset_define.xml
index 063a337..134b901 100644
--- a/docsrc/xmlsource/funcref/charset_define.xml
+++ b/docsrc/xmlsource/funcref/charset_define.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/charset_recode.xml b/docsrc/xmlsource/funcref/charset_recode.xml
index b0c9f55..e61bfa4 100644
--- a/docsrc/xmlsource/funcref/charset_recode.xml
+++ b/docsrc/xmlsource/funcref/charset_recode.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/charsets_list.xml b/docsrc/xmlsource/funcref/charsets_list.xml
index 0291062..5da3fa5 100644
--- a/docsrc/xmlsource/funcref/charsets_list.xml
+++ b/docsrc/xmlsource/funcref/charsets_list.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/checkpoint_interval.xml b/docsrc/xmlsource/funcref/checkpoint_interval.xml
index 318eab3..b545bf6 100644
--- a/docsrc/xmlsource/funcref/checkpoint_interval.xml
+++ b/docsrc/xmlsource/funcref/checkpoint_interval.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/chr.xml b/docsrc/xmlsource/funcref/chr.xml
index 169f300..3c99fc5 100644
--- a/docsrc/xmlsource/funcref/chr.xml
+++ b/docsrc/xmlsource/funcref/chr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/client_attr.xml b/docsrc/xmlsource/funcref/client_attr.xml
index 3cb14f8..4adfc86 100644
--- a/docsrc/xmlsource/funcref/client_attr.xml
+++ b/docsrc/xmlsource/funcref/client_attr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/collation_define.xml b/docsrc/xmlsource/funcref/collation_define.xml
index 554e027..037200e 100644
--- a/docsrc/xmlsource/funcref/collation_define.xml
+++ b/docsrc/xmlsource/funcref/collation_define.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/complete_table_name.xml b/docsrc/xmlsource/funcref/complete_table_name.xml
index 1415798..d8b284f 100644
--- a/docsrc/xmlsource/funcref/complete_table_name.xml
+++ b/docsrc/xmlsource/funcref/complete_table_name.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/composite.xml b/docsrc/xmlsource/funcref/composite.xml
index 85af9df..f00255a 100644
--- a/docsrc/xmlsource/funcref/composite.xml
+++ b/docsrc/xmlsource/funcref/composite.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/composite_ref.xml b/docsrc/xmlsource/funcref/composite_ref.xml
index fc67d34..9d3a195 100644
--- a/docsrc/xmlsource/funcref/composite_ref.xml
+++ b/docsrc/xmlsource/funcref/composite_ref.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/concat.xml b/docsrc/xmlsource/funcref/concat.xml
index 27cf325..4c97e62 100644
--- a/docsrc/xmlsource/funcref/concat.xml
+++ b/docsrc/xmlsource/funcref/concat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/concatenate.xml b/docsrc/xmlsource/funcref/concatenate.xml
index ec051ce..781df9e 100644
--- a/docsrc/xmlsource/funcref/concatenate.xml
+++ b/docsrc/xmlsource/funcref/concatenate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/connection_get.xml b/docsrc/xmlsource/funcref/connection_get.xml
index 884137a..342f3dd 100644
--- a/docsrc/xmlsource/funcref/connection_get.xml
+++ b/docsrc/xmlsource/funcref/connection_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/connection_id.xml b/docsrc/xmlsource/funcref/connection_id.xml
index b21519d..e601827 100644
--- a/docsrc/xmlsource/funcref/connection_id.xml
+++ b/docsrc/xmlsource/funcref/connection_id.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/connection_is_dirty.xml b/docsrc/xmlsource/funcref/connection_is_dirty.xml
index a90684f..adb51e0 100644
--- a/docsrc/xmlsource/funcref/connection_is_dirty.xml
+++ b/docsrc/xmlsource/funcref/connection_is_dirty.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/connection_set.xml b/docsrc/xmlsource/funcref/connection_set.xml
index e6a3cac..fc1cabe 100644
--- a/docsrc/xmlsource/funcref/connection_set.xml
+++ b/docsrc/xmlsource/funcref/connection_set.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/connection_vars.xml b/docsrc/xmlsource/funcref/connection_vars.xml
index 92b885e..15eaaad 100644
--- a/docsrc/xmlsource/funcref/connection_vars.xml
+++ b/docsrc/xmlsource/funcref/connection_vars.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/connection_vars_set.xml b/docsrc/xmlsource/funcref/connection_vars_set.xml
index 9f71f7b..0c42bd3 100644
--- a/docsrc/xmlsource/funcref/connection_vars_set.xml
+++ b/docsrc/xmlsource/funcref/connection_vars_set.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/contains.xml b/docsrc/xmlsource/funcref/contains.xml
index 8a58a10..c3eaa20 100644
--- a/docsrc/xmlsource/funcref/contains.xml
+++ b/docsrc/xmlsource/funcref/contains.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/corr.xml b/docsrc/xmlsource/funcref/corr.xml
index 39f1ce7..ded8182 100644
--- a/docsrc/xmlsource/funcref/corr.xml
+++ b/docsrc/xmlsource/funcref/corr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cov_load.xml b/docsrc/xmlsource/funcref/cov_load.xml
index 8766b77..383caff 100644
--- a/docsrc/xmlsource/funcref/cov_load.xml
+++ b/docsrc/xmlsource/funcref/cov_load.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cov_report.xml b/docsrc/xmlsource/funcref/cov_report.xml
index ad65d36..5059d8b 100644
--- a/docsrc/xmlsource/funcref/cov_report.xml
+++ b/docsrc/xmlsource/funcref/cov_report.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/cov_store.xml b/docsrc/xmlsource/funcref/cov_store.xml
index ea8fd0a..9b4e853 100644
--- a/docsrc/xmlsource/funcref/cov_store.xml
+++ b/docsrc/xmlsource/funcref/cov_store.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/covar_pop.xml b/docsrc/xmlsource/funcref/covar_pop.xml
index 1be6bc0..835db1b 100644
--- a/docsrc/xmlsource/funcref/covar_pop.xml
+++ b/docsrc/xmlsource/funcref/covar_pop.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/covar_samp.xml b/docsrc/xmlsource/funcref/covar_samp.xml
index 80f7f04..e125e93 100644
--- a/docsrc/xmlsource/funcref/covar_samp.xml
+++ b/docsrc/xmlsource/funcref/covar_samp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/createXML.xml b/docsrc/xmlsource/funcref/createXML.xml
index 90fbacc..d8646d2 100644
--- a/docsrc/xmlsource/funcref/createXML.xml
+++ b/docsrc/xmlsource/funcref/createXML.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/curdate.xml b/docsrc/xmlsource/funcref/curdate.xml
index 4715e32..60ac91a 100644
--- a/docsrc/xmlsource/funcref/curdate.xml
+++ b/docsrc/xmlsource/funcref/curdate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/current_charset.xml b/docsrc/xmlsource/funcref/current_charset.xml
index 99451d2..12ecb57 100644
--- a/docsrc/xmlsource/funcref/current_charset.xml
+++ b/docsrc/xmlsource/funcref/current_charset.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dateadd.xml b/docsrc/xmlsource/funcref/dateadd.xml
index 1302ca7..fa6b58c 100644
--- a/docsrc/xmlsource/funcref/dateadd.xml
+++ b/docsrc/xmlsource/funcref/dateadd.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/datediff.xml b/docsrc/xmlsource/funcref/datediff.xml
index 92f7d15..6a6cf9c 100644
--- a/docsrc/xmlsource/funcref/datediff.xml
+++ b/docsrc/xmlsource/funcref/datediff.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/datestring.xml b/docsrc/xmlsource/funcref/datestring.xml
index e08936a..27b4e06 100644
--- a/docsrc/xmlsource/funcref/datestring.xml
+++ b/docsrc/xmlsource/funcref/datestring.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/datestring_gmt.xml b/docsrc/xmlsource/funcref/datestring_gmt.xml
index 77b05df..543fff1 100644
--- a/docsrc/xmlsource/funcref/datestring_gmt.xml
+++ b/docsrc/xmlsource/funcref/datestring_gmt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dav_api_add.xml b/docsrc/xmlsource/funcref/dav_api_add.xml
index eed009f..a2edbcd 100644
--- a/docsrc/xmlsource/funcref/dav_api_add.xml
+++ b/docsrc/xmlsource/funcref/dav_api_add.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dav_api_change.xml b/docsrc/xmlsource/funcref/dav_api_change.xml
index a21793a..8424540 100644
--- a/docsrc/xmlsource/funcref/dav_api_change.xml
+++ b/docsrc/xmlsource/funcref/dav_api_change.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dav_api_lock.xml b/docsrc/xmlsource/funcref/dav_api_lock.xml
index 47dbc9d..127a151 100644
--- a/docsrc/xmlsource/funcref/dav_api_lock.xml
+++ b/docsrc/xmlsource/funcref/dav_api_lock.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: dav_api_lock.xml,v 1.2.2.1 2012/03/08 13:13:48 source Exp $
+ $Id: dav_api_lock.xml,v 1.2 2008/02/06 23:09:34 source Exp $
+ (C)Copyright 2005 OpenLink Software
-->
<refentry id="fn_dav_api_lock">
<refmeta>
diff --git a/docsrc/xmlsource/funcref/dav_api_search.xml b/docsrc/xmlsource/funcref/dav_api_search.xml
index 002d5b6..95533ea 100644
--- a/docsrc/xmlsource/funcref/dav_api_search.xml
+++ b/docsrc/xmlsource/funcref/dav_api_search.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dav_api_user.xml b/docsrc/xmlsource/funcref/dav_api_user.xml
index 9bd7ccb..e86dc3f 100644
--- a/docsrc/xmlsource/funcref/dav_api_user.xml
+++ b/docsrc/xmlsource/funcref/dav_api_user.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dav_exp.xml b/docsrc/xmlsource/funcref/dav_exp.xml
index 543e9df..123ca80 100644
--- a/docsrc/xmlsource/funcref/dav_exp.xml
+++ b/docsrc/xmlsource/funcref/dav_exp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dayname.xml b/docsrc/xmlsource/funcref/dayname.xml
index e6cf1c8..20ba3d7 100644
--- a/docsrc/xmlsource/funcref/dayname.xml
+++ b/docsrc/xmlsource/funcref/dayname.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dayofmonth.xml b/docsrc/xmlsource/funcref/dayofmonth.xml
index 0757aeb..194b541 100644
--- a/docsrc/xmlsource/funcref/dayofmonth.xml
+++ b/docsrc/xmlsource/funcref/dayofmonth.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dayofweek.xml b/docsrc/xmlsource/funcref/dayofweek.xml
index b515237..4c80e1e 100644
--- a/docsrc/xmlsource/funcref/dayofweek.xml
+++ b/docsrc/xmlsource/funcref/dayofweek.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dayofyear.xml b/docsrc/xmlsource/funcref/dayofyear.xml
index 7e20851..a787ff1 100644
--- a/docsrc/xmlsource/funcref/dayofyear.xml
+++ b/docsrc/xmlsource/funcref/dayofyear.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dbg_obj_print.xml b/docsrc/xmlsource/funcref/dbg_obj_print.xml
index fa5e71f..b3b8cc2 100644
--- a/docsrc/xmlsource/funcref/dbg_obj_print.xml
+++ b/docsrc/xmlsource/funcref/dbg_obj_print.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dbg_printf.xml b/docsrc/xmlsource/funcref/dbg_printf.xml
index cffc51a..2ad2c1c 100644
--- a/docsrc/xmlsource/funcref/dbg_printf.xml
+++ b/docsrc/xmlsource/funcref/dbg_printf.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dbname.xml b/docsrc/xmlsource/funcref/dbname.xml
index cdb79fa..8714f2b 100644
--- a/docsrc/xmlsource/funcref/dbname.xml
+++ b/docsrc/xmlsource/funcref/dbname.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/delay.xml b/docsrc/xmlsource/funcref/delay.xml
index 8ddb1cb..047c50b 100644
--- a/docsrc/xmlsource/funcref/delay.xml
+++ b/docsrc/xmlsource/funcref/delay.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_dec_or_remove.xml b/docsrc/xmlsource/funcref/dict_dec_or_remove.xml
index 189664b..38b433a 100644
--- a/docsrc/xmlsource/funcref/dict_dec_or_remove.xml
+++ b/docsrc/xmlsource/funcref/dict_dec_or_remove.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml b/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml
index 0a2101c..4ed7d60 100644
--- a/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml
+++ b/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/dict_duplicate.xml b/docsrc/xmlsource/funcref/dict_duplicate.xml
index 65029c9..f0cff69 100644
--- a/docsrc/xmlsource/funcref/dict_duplicate.xml
+++ b/docsrc/xmlsource/funcref/dict_duplicate.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_get.xml b/docsrc/xmlsource/funcref/dict_get.xml
index c60fe5e..006d908 100644
--- a/docsrc/xmlsource/funcref/dict_get.xml
+++ b/docsrc/xmlsource/funcref/dict_get.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_inc_or_put.xml b/docsrc/xmlsource/funcref/dict_inc_or_put.xml
index b34ac0f..63e209d 100644
--- a/docsrc/xmlsource/funcref/dict_inc_or_put.xml
+++ b/docsrc/xmlsource/funcref/dict_inc_or_put.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/dict_iter_next.xml b/docsrc/xmlsource/funcref/dict_iter_next.xml
index 70d15fb..7de0727 100644
--- a/docsrc/xmlsource/funcref/dict_iter_next.xml
+++ b/docsrc/xmlsource/funcref/dict_iter_next.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_iter_rewind.xml b/docsrc/xmlsource/funcref/dict_iter_rewind.xml
index 16ae4eb..99280b3 100644
--- a/docsrc/xmlsource/funcref/dict_iter_rewind.xml
+++ b/docsrc/xmlsource/funcref/dict_iter_rewind.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_list_keys.xml b/docsrc/xmlsource/funcref/dict_list_keys.xml
index 403be72..ccfd5fa 100644
--- a/docsrc/xmlsource/funcref/dict_list_keys.xml
+++ b/docsrc/xmlsource/funcref/dict_list_keys.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_new.xml b/docsrc/xmlsource/funcref/dict_new.xml
index 2d3354c..4c087ad 100644
--- a/docsrc/xmlsource/funcref/dict_new.xml
+++ b/docsrc/xmlsource/funcref/dict_new.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_put.xml b/docsrc/xmlsource/funcref/dict_put.xml
index 19ebe73..e9e70eb 100644
--- a/docsrc/xmlsource/funcref/dict_put.xml
+++ b/docsrc/xmlsource/funcref/dict_put.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_remove.xml b/docsrc/xmlsource/funcref/dict_remove.xml
index 1aec176..e4d5eb8 100644
--- a/docsrc/xmlsource/funcref/dict_remove.xml
+++ b/docsrc/xmlsource/funcref/dict_remove.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_size.xml b/docsrc/xmlsource/funcref/dict_size.xml
index 1a59e6b..31b8468 100644
--- a/docsrc/xmlsource/funcref/dict_size.xml
+++ b/docsrc/xmlsource/funcref/dict_size.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/dict_to_vector.xml b/docsrc/xmlsource/funcref/dict_to_vector.xml
index 1dc4c60..cd27939 100644
--- a/docsrc/xmlsource/funcref/dict_to_vector.xml
+++ b/docsrc/xmlsource/funcref/dict_to_vector.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dict_zap.xml b/docsrc/xmlsource/funcref/dict_zap.xml
index 6f008a5..fb2e315 100644
--- a/docsrc/xmlsource/funcref/dict_zap.xml
+++ b/docsrc/xmlsource/funcref/dict_zap.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/disconnect_user.xml b/docsrc/xmlsource/funcref/disconnect_user.xml
index 34e301a..93dffe1 100644
--- a/docsrc/xmlsource/funcref/disconnect_user.xml
+++ b/docsrc/xmlsource/funcref/disconnect_user.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dsig_template_ext.xml b/docsrc/xmlsource/funcref/dsig_template_ext.xml
index d59696d..1a4b903 100644
--- a/docsrc/xmlsource/funcref/dsig_template_ext.xml
+++ b/docsrc/xmlsource/funcref/dsig_template_ext.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dt_set_tz.xml b/docsrc/xmlsource/funcref/dt_set_tz.xml
index d4b6863..ba2e0a2 100644
--- a/docsrc/xmlsource/funcref/dt_set_tz.xml
+++ b/docsrc/xmlsource/funcref/dt_set_tz.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/dvector.xml b/docsrc/xmlsource/funcref/dvector.xml
index 46434f5..e9d28c1 100644
--- a/docsrc/xmlsource/funcref/dvector.xml
+++ b/docsrc/xmlsource/funcref/dvector.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/either.xml b/docsrc/xmlsource/funcref/either.xml
index 28eea9b..8876873 100644
--- a/docsrc/xmlsource/funcref/either.xml
+++ b/docsrc/xmlsource/funcref/either.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/elh_get_handler.xml b/docsrc/xmlsource/funcref/elh_get_handler.xml
index 0bc7d31..498093e 100644
--- a/docsrc/xmlsource/funcref/elh_get_handler.xml
+++ b/docsrc/xmlsource/funcref/elh_get_handler.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/elh_load_handler.xml b/docsrc/xmlsource/funcref/elh_load_handler.xml
index b18548e..923e1a8 100644
--- a/docsrc/xmlsource/funcref/elh_load_handler.xml
+++ b/docsrc/xmlsource/funcref/elh_load_handler.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/encode_b32_num.xml b/docsrc/xmlsource/funcref/encode_b32_num.xml
index f6ee0c5..9dd00b9 100644
--- a/docsrc/xmlsource/funcref/encode_b32_num.xml
+++ b/docsrc/xmlsource/funcref/encode_b32_num.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/encode_base64.xml b/docsrc/xmlsource/funcref/encode_base64.xml
index dc0352d..a9c1c3a 100644
--- a/docsrc/xmlsource/funcref/encode_base64.xml
+++ b/docsrc/xmlsource/funcref/encode_base64.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/end_result.xml b/docsrc/xmlsource/funcref/end_result.xml
index 302107a..a25b0d1 100644
--- a/docsrc/xmlsource/funcref/end_result.xml
+++ b/docsrc/xmlsource/funcref/end_result.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ends_with.xml b/docsrc/xmlsource/funcref/ends_with.xml
index 63997c9..5e968bb 100644
--- a/docsrc/xmlsource/funcref/ends_with.xml
+++ b/docsrc/xmlsource/funcref/ends_with.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/equ.xml b/docsrc/xmlsource/funcref/equ.xml
index 199132e..5e96122 100644
--- a/docsrc/xmlsource/funcref/equ.xml
+++ b/docsrc/xmlsource/funcref/equ.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/exec.xml b/docsrc/xmlsource/funcref/exec.xml
index 6ae1a39..2a540b7 100644
--- a/docsrc/xmlsource/funcref/exec.xml
+++ b/docsrc/xmlsource/funcref/exec.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/exec_close.xml b/docsrc/xmlsource/funcref/exec_close.xml
index 8f226b5..f33488a 100644
--- a/docsrc/xmlsource/funcref/exec_close.xml
+++ b/docsrc/xmlsource/funcref/exec_close.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/exec_metadata.xml b/docsrc/xmlsource/funcref/exec_metadata.xml
index 4d1d321..e87697f 100644
--- a/docsrc/xmlsource/funcref/exec_metadata.xml
+++ b/docsrc/xmlsource/funcref/exec_metadata.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/exec_next.xml b/docsrc/xmlsource/funcref/exec_next.xml
index 5974859..99aace7 100644
--- a/docsrc/xmlsource/funcref/exec_next.xml
+++ b/docsrc/xmlsource/funcref/exec_next.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/exec_result.xml b/docsrc/xmlsource/funcref/exec_result.xml
index a154fcf..7493408 100644
--- a/docsrc/xmlsource/funcref/exec_result.xml
+++ b/docsrc/xmlsource/funcref/exec_result.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/exec_result_names.xml b/docsrc/xmlsource/funcref/exec_result_names.xml
index cf4e130..8f24cb8 100644
--- a/docsrc/xmlsource/funcref/exec_result_names.xml
+++ b/docsrc/xmlsource/funcref/exec_result_names.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/exec_score.xml b/docsrc/xmlsource/funcref/exec_score.xml
index 0821fcf..315c5e8 100644
--- a/docsrc/xmlsource/funcref/exec_score.xml
+++ b/docsrc/xmlsource/funcref/exec_score.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/exp.xml b/docsrc/xmlsource/funcref/exp.xml
index 95050df..18578a3 100644
--- a/docsrc/xmlsource/funcref/exp.xml
+++ b/docsrc/xmlsource/funcref/exp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/explain.xml b/docsrc/xmlsource/funcref/explain.xml
index 3b6d5bf..11f67f6 100644
--- a/docsrc/xmlsource/funcref/explain.xml
+++ b/docsrc/xmlsource/funcref/explain.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_delete.xml b/docsrc/xmlsource/funcref/file_delete.xml
index 4f4c0ca..bed2603 100644
--- a/docsrc/xmlsource/funcref/file_delete.xml
+++ b/docsrc/xmlsource/funcref/file_delete.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_dirlist.xml b/docsrc/xmlsource/funcref/file_dirlist.xml
index 028adf6..16ec428 100644
--- a/docsrc/xmlsource/funcref/file_dirlist.xml
+++ b/docsrc/xmlsource/funcref/file_dirlist.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_mkdir.xml b/docsrc/xmlsource/funcref/file_mkdir.xml
index 6d9cb2a..1bab282 100644
--- a/docsrc/xmlsource/funcref/file_mkdir.xml
+++ b/docsrc/xmlsource/funcref/file_mkdir.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_mkpath.xml b/docsrc/xmlsource/funcref/file_mkpath.xml
index fa9cc61..6645d3f 100644
--- a/docsrc/xmlsource/funcref/file_mkpath.xml
+++ b/docsrc/xmlsource/funcref/file_mkpath.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_open.xml b/docsrc/xmlsource/funcref/file_open.xml
index d7696a8..d421487 100644
--- a/docsrc/xmlsource/funcref/file_open.xml
+++ b/docsrc/xmlsource/funcref/file_open.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_stat.xml b/docsrc/xmlsource/funcref/file_stat.xml
index 2272256..520a341 100644
--- a/docsrc/xmlsource/funcref/file_stat.xml
+++ b/docsrc/xmlsource/funcref/file_stat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_to_string.xml b/docsrc/xmlsource/funcref/file_to_string.xml
index 195b435..26e295d 100644
--- a/docsrc/xmlsource/funcref/file_to_string.xml
+++ b/docsrc/xmlsource/funcref/file_to_string.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_to_string_output.xml b/docsrc/xmlsource/funcref/file_to_string_output.xml
index 28863e8..92c8170 100644
--- a/docsrc/xmlsource/funcref/file_to_string_output.xml
+++ b/docsrc/xmlsource/funcref/file_to_string_output.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/file_unlink.xml b/docsrc/xmlsource/funcref/file_unlink.xml
index a398a1d..92b8f3c 100644
--- a/docsrc/xmlsource/funcref/file_unlink.xml
+++ b/docsrc/xmlsource/funcref/file_unlink.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/fk_check_input_values.xml b/docsrc/xmlsource/funcref/fk_check_input_values.xml
index 26d5ead..da8ab61 100644
--- a/docsrc/xmlsource/funcref/fk_check_input_values.xml
+++ b/docsrc/xmlsource/funcref/fk_check_input_values.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/floor.xml b/docsrc/xmlsource/funcref/floor.xml
index 5ec3eef..38ac921 100644
--- a/docsrc/xmlsource/funcref/floor.xml
+++ b/docsrc/xmlsource/funcref/floor.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ftp_get.xml b/docsrc/xmlsource/funcref/ftp_get.xml
index 148fe8d..42ecbbd 100644
--- a/docsrc/xmlsource/funcref/ftp_get.xml
+++ b/docsrc/xmlsource/funcref/ftp_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ftp_ls.xml b/docsrc/xmlsource/funcref/ftp_ls.xml
index dd0e380..cb22ce8 100644
--- a/docsrc/xmlsource/funcref/ftp_ls.xml
+++ b/docsrc/xmlsource/funcref/ftp_ls.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ftp_put.xml b/docsrc/xmlsource/funcref/ftp_put.xml
index bab5af4..d984178 100644
--- a/docsrc/xmlsource/funcref/ftp_put.xml
+++ b/docsrc/xmlsource/funcref/ftp_put.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/get_certificate_info.xml b/docsrc/xmlsource/funcref/get_certificate_info.xml
index 2d752d8..bd9e996 100644
--- a/docsrc/xmlsource/funcref/get_certificate_info.xml
+++ b/docsrc/xmlsource/funcref/get_certificate_info.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -71,7 +71,7 @@ that string.
<member>6 - return the certificate fingerprint</member>
<member>7 - return the certificate extension value by OID</member>
<member>8 - return the certificate name of the key from current user store</member>
- <member>9 - return a vector of three elements: the certificate's public key type, exponent and modulus</member>
+ <member>9 - return a vector of three elements: the certificate's public key type, modulus and exponent</member>
</simplelist>
</refsect2>
diff --git a/docsrc/xmlsource/funcref/get_keyword.xml b/docsrc/xmlsource/funcref/get_keyword.xml
index 23c928f..8c3847e 100644
--- a/docsrc/xmlsource/funcref/get_keyword.xml
+++ b/docsrc/xmlsource/funcref/get_keyword.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/get_keyword_ucase.xml b/docsrc/xmlsource/funcref/get_keyword_ucase.xml
index f3b12f2..c48a32d 100644
--- a/docsrc/xmlsource/funcref/get_keyword_ucase.xml
+++ b/docsrc/xmlsource/funcref/get_keyword_ucase.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/get_timestamp.xml b/docsrc/xmlsource/funcref/get_timestamp.xml
index c960814..ef662d3 100644
--- a/docsrc/xmlsource/funcref/get_timestamp.xml
+++ b/docsrc/xmlsource/funcref/get_timestamp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/getdate.xml b/docsrc/xmlsource/funcref/getdate.xml
index a6eef50..b026711 100644
--- a/docsrc/xmlsource/funcref/getdate.xml
+++ b/docsrc/xmlsource/funcref/getdate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/gvector_digit_sort.xml b/docsrc/xmlsource/funcref/gvector_digit_sort.xml
index ad21ed4..8dc3a0a 100644
--- a/docsrc/xmlsource/funcref/gvector_digit_sort.xml
+++ b/docsrc/xmlsource/funcref/gvector_digit_sort.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/gvector_sort.xml b/docsrc/xmlsource/funcref/gvector_sort.xml
index 9bdc1b5..6dd81b8 100644
--- a/docsrc/xmlsource/funcref/gvector_sort.xml
+++ b/docsrc/xmlsource/funcref/gvector_sort.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/gz_compress.xml b/docsrc/xmlsource/funcref/gz_compress.xml
index 58d4453..f3a3a9a 100644
--- a/docsrc/xmlsource/funcref/gz_compress.xml
+++ b/docsrc/xmlsource/funcref/gz_compress.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/gz_file_open.xml b/docsrc/xmlsource/funcref/gz_file_open.xml
index cb0aef8..b58d316 100644
--- a/docsrc/xmlsource/funcref/gz_file_open.xml
+++ b/docsrc/xmlsource/funcref/gz_file_open.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/gz_uncompress.xml b/docsrc/xmlsource/funcref/gz_uncompress.xml
index 523ac8c..d9cb81f 100644
--- a/docsrc/xmlsource/funcref/gz_uncompress.xml
+++ b/docsrc/xmlsource/funcref/gz_uncompress.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/hour.xml b/docsrc/xmlsource/funcref/hour.xml
index b6c7539..f753753 100644
--- a/docsrc/xmlsource/funcref/hour.xml
+++ b/docsrc/xmlsource/funcref/hour.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/hs_resolve.xml b/docsrc/xmlsource/funcref/hs_resolve.xml
index 8dc65f3..dcecfcb 100644
--- a/docsrc/xmlsource/funcref/hs_resolve.xml
+++ b/docsrc/xmlsource/funcref/hs_resolve.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- - $Id: hs_resolve.xml,v 1.1.2.3 2012/03/07 15:29:01 source Exp $
+ - $Id: hs_resolve.xml,v 1.1.2.2 2009/05/05 14:10:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/http.xml b/docsrc/xmlsource/funcref/http.xml
index 0d41459..81c252a 100644
--- a/docsrc/xmlsource/funcref/http.xml
+++ b/docsrc/xmlsource/funcref/http.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_acl_get.xml b/docsrc/xmlsource/funcref/http_acl_get.xml
index 9907c28..93d84f3 100644
--- a/docsrc/xmlsource/funcref/http_acl_get.xml
+++ b/docsrc/xmlsource/funcref/http_acl_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_acl_remove.xml b/docsrc/xmlsource/funcref/http_acl_remove.xml
index da09764..67fb1c2 100644
--- a/docsrc/xmlsource/funcref/http_acl_remove.xml
+++ b/docsrc/xmlsource/funcref/http_acl_remove.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_acl_set.xml b/docsrc/xmlsource/funcref/http_acl_set.xml
index 0ba29b2..9f39f59 100644
--- a/docsrc/xmlsource/funcref/http_acl_set.xml
+++ b/docsrc/xmlsource/funcref/http_acl_set.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_body_read.xml b/docsrc/xmlsource/funcref/http_body_read.xml
index ad06a2f..fe1f31a 100644
--- a/docsrc/xmlsource/funcref/http_body_read.xml
+++ b/docsrc/xmlsource/funcref/http_body_read.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_client.xml b/docsrc/xmlsource/funcref/http_client.xml
index 770752e..b8c69ad 100644
--- a/docsrc/xmlsource/funcref/http_client.xml
+++ b/docsrc/xmlsource/funcref/http_client.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_client_ext.xml b/docsrc/xmlsource/funcref/http_client_ext.xml
index b2348a3..94ad1e8 100644
--- a/docsrc/xmlsource/funcref/http_client_ext.xml
+++ b/docsrc/xmlsource/funcref/http_client_ext.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_client_ip.xml b/docsrc/xmlsource/funcref/http_client_ip.xml
index 16964fd..5c0ac39 100644
--- a/docsrc/xmlsource/funcref/http_client_ip.xml
+++ b/docsrc/xmlsource/funcref/http_client_ip.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_debug_log.xml b/docsrc/xmlsource/funcref/http_debug_log.xml
index 00c68d1..86f1f96 100644
--- a/docsrc/xmlsource/funcref/http_debug_log.xml
+++ b/docsrc/xmlsource/funcref/http_debug_log.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_enable_gz.xml b/docsrc/xmlsource/funcref/http_enable_gz.xml
index f129e62..92f65ce 100644
--- a/docsrc/xmlsource/funcref/http_enable_gz.xml
+++ b/docsrc/xmlsource/funcref/http_enable_gz.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_file.xml b/docsrc/xmlsource/funcref/http_file.xml
index f9fde60..d1dd76d 100644
--- a/docsrc/xmlsource/funcref/http_file.xml
+++ b/docsrc/xmlsource/funcref/http_file.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_flush.xml b/docsrc/xmlsource/funcref/http_flush.xml
index 865aae1..98d4689 100644
--- a/docsrc/xmlsource/funcref/http_flush.xml
+++ b/docsrc/xmlsource/funcref/http_flush.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_get.xml b/docsrc/xmlsource/funcref/http_get.xml
index 0165b72..e143cee 100644
--- a/docsrc/xmlsource/funcref/http_get.xml
+++ b/docsrc/xmlsource/funcref/http_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_header.xml b/docsrc/xmlsource/funcref/http_header.xml
index f38f131..a8ae460 100644
--- a/docsrc/xmlsource/funcref/http_header.xml
+++ b/docsrc/xmlsource/funcref/http_header.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_header_get.xml b/docsrc/xmlsource/funcref/http_header_get.xml
index 363205b..ff26c93 100644
--- a/docsrc/xmlsource/funcref/http_header_get.xml
+++ b/docsrc/xmlsource/funcref/http_header_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_kill.xml b/docsrc/xmlsource/funcref/http_kill.xml
index 0077750..d440dc9 100644
--- a/docsrc/xmlsource/funcref/http_kill.xml
+++ b/docsrc/xmlsource/funcref/http_kill.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_listen_host.xml b/docsrc/xmlsource/funcref/http_listen_host.xml
index 2a7960e..d9ae1d5 100644
--- a/docsrc/xmlsource/funcref/http_listen_host.xml
+++ b/docsrc/xmlsource/funcref/http_listen_host.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_lock.xml b/docsrc/xmlsource/funcref/http_lock.xml
index 1f97ac1..46e1d05 100644
--- a/docsrc/xmlsource/funcref/http_lock.xml
+++ b/docsrc/xmlsource/funcref/http_lock.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_map_get.xml b/docsrc/xmlsource/funcref/http_map_get.xml
index 1a04aa7..ea034ca 100644
--- a/docsrc/xmlsource/funcref/http_map_get.xml
+++ b/docsrc/xmlsource/funcref/http_map_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_map_table.xml b/docsrc/xmlsource/funcref/http_map_table.xml
index 106a772..5db171a 100644
--- a/docsrc/xmlsource/funcref/http_map_table.xml
+++ b/docsrc/xmlsource/funcref/http_map_table.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_param.xml b/docsrc/xmlsource/funcref/http_param.xml
index c216547..71cf57d 100644
--- a/docsrc/xmlsource/funcref/http_param.xml
+++ b/docsrc/xmlsource/funcref/http_param.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_path.xml b/docsrc/xmlsource/funcref/http_path.xml
index 18df564..dcd82dc 100644
--- a/docsrc/xmlsource/funcref/http_path.xml
+++ b/docsrc/xmlsource/funcref/http_path.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_pending_req.xml b/docsrc/xmlsource/funcref/http_pending_req.xml
index 287d86c..181f6bf 100644
--- a/docsrc/xmlsource/funcref/http_pending_req.xml
+++ b/docsrc/xmlsource/funcref/http_pending_req.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_physical_path.xml b/docsrc/xmlsource/funcref/http_physical_path.xml
index a29057a..954024c 100644
--- a/docsrc/xmlsource/funcref/http_physical_path.xml
+++ b/docsrc/xmlsource/funcref/http_physical_path.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_proxy.xml b/docsrc/xmlsource/funcref/http_proxy.xml
index 410e96c..5e05afd 100644
--- a/docsrc/xmlsource/funcref/http_proxy.xml
+++ b/docsrc/xmlsource/funcref/http_proxy.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_request_get.xml b/docsrc/xmlsource/funcref/http_request_get.xml
index ad27ce4..6ed3108 100644
--- a/docsrc/xmlsource/funcref/http_request_get.xml
+++ b/docsrc/xmlsource/funcref/http_request_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_request_header.xml b/docsrc/xmlsource/funcref/http_request_header.xml
index 2dc403f..1bb2edd 100644
--- a/docsrc/xmlsource/funcref/http_request_header.xml
+++ b/docsrc/xmlsource/funcref/http_request_header.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_request_header_full.xml b/docsrc/xmlsource/funcref/http_request_header_full.xml
index c9fefd5..0fb893d 100644
--- a/docsrc/xmlsource/funcref/http_request_header_full.xml
+++ b/docsrc/xmlsource/funcref/http_request_header_full.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_request_status.xml b/docsrc/xmlsource/funcref/http_request_status.xml
index c0f9a51..409d1f1 100644
--- a/docsrc/xmlsource/funcref/http_request_status.xml
+++ b/docsrc/xmlsource/funcref/http_request_status.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_rewrite.xml b/docsrc/xmlsource/funcref/http_rewrite.xml
index 4cfa7e3..f9ff52a 100644
--- a/docsrc/xmlsource/funcref/http_rewrite.xml
+++ b/docsrc/xmlsource/funcref/http_rewrite.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_root.xml b/docsrc/xmlsource/funcref/http_root.xml
index e6b3495..38d6e45 100644
--- a/docsrc/xmlsource/funcref/http_root.xml
+++ b/docsrc/xmlsource/funcref/http_root.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_unlock.xml b/docsrc/xmlsource/funcref/http_unlock.xml
index 437fafc..7b5e132 100644
--- a/docsrc/xmlsource/funcref/http_unlock.xml
+++ b/docsrc/xmlsource/funcref/http_unlock.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_url.xml b/docsrc/xmlsource/funcref/http_url.xml
index 0dbae4c..51e5c03 100644
--- a/docsrc/xmlsource/funcref/http_url.xml
+++ b/docsrc/xmlsource/funcref/http_url.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_value.xml b/docsrc/xmlsource/funcref/http_value.xml
index 8b80ec7..ad89e54 100644
--- a/docsrc/xmlsource/funcref/http_value.xml
+++ b/docsrc/xmlsource/funcref/http_value.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/http_xslt.xml b/docsrc/xmlsource/funcref/http_xslt.xml
index 098bf94..13c57f5 100644
--- a/docsrc/xmlsource/funcref/http_xslt.xml
+++ b/docsrc/xmlsource/funcref/http_xslt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/identity_value.xml b/docsrc/xmlsource/funcref/identity_value.xml
index 3c2a193..37ce890 100644
--- a/docsrc/xmlsource/funcref/identity_value.xml
+++ b/docsrc/xmlsource/funcref/identity_value.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/import_clr.xml b/docsrc/xmlsource/funcref/import_clr.xml
index aaa12ca..1094a74 100644
--- a/docsrc/xmlsource/funcref/import_clr.xml
+++ b/docsrc/xmlsource/funcref/import_clr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/import_jar.xml b/docsrc/xmlsource/funcref/import_jar.xml
index 5d43fbf..e165c6c 100644
--- a/docsrc/xmlsource/funcref/import_jar.xml
+++ b/docsrc/xmlsource/funcref/import_jar.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/initcap.xml b/docsrc/xmlsource/funcref/initcap.xml
index 1073bf3..b51bb01 100644
--- a/docsrc/xmlsource/funcref/initcap.xml
+++ b/docsrc/xmlsource/funcref/initcap.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/internal_to_sql_type.xml b/docsrc/xmlsource/funcref/internal_to_sql_type.xml
index 63634f8..0231848 100644
--- a/docsrc/xmlsource/funcref/internal_to_sql_type.xml
+++ b/docsrc/xmlsource/funcref/internal_to_sql_type.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/internal_type.xml b/docsrc/xmlsource/funcref/internal_type.xml
index 0c23b0b..b67f1b9 100644
--- a/docsrc/xmlsource/funcref/internal_type.xml
+++ b/docsrc/xmlsource/funcref/internal_type.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/internal_type_name.xml b/docsrc/xmlsource/funcref/internal_type_name.xml
index 226c81a..4d6ba13 100644
--- a/docsrc/xmlsource/funcref/internal_type_name.xml
+++ b/docsrc/xmlsource/funcref/internal_type_name.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isarray.xml b/docsrc/xmlsource/funcref/isarray.xml
index 138fbab..4182ac6 100644
--- a/docsrc/xmlsource/funcref/isarray.xml
+++ b/docsrc/xmlsource/funcref/isarray.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isbinary.xml b/docsrc/xmlsource/funcref/isbinary.xml
index a84a077..253ef5a 100644
--- a/docsrc/xmlsource/funcref/isbinary.xml
+++ b/docsrc/xmlsource/funcref/isbinary.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isblob.xml b/docsrc/xmlsource/funcref/isblob.xml
index e9d6aab..d2dfebe 100644
--- a/docsrc/xmlsource/funcref/isblob.xml
+++ b/docsrc/xmlsource/funcref/isblob.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isdouble.xml b/docsrc/xmlsource/funcref/isdouble.xml
index 1c36c09..8128de3 100644
--- a/docsrc/xmlsource/funcref/isdouble.xml
+++ b/docsrc/xmlsource/funcref/isdouble.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isentity.xml b/docsrc/xmlsource/funcref/isentity.xml
index f703caf..19c6db3 100644
--- a/docsrc/xmlsource/funcref/isentity.xml
+++ b/docsrc/xmlsource/funcref/isentity.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isfinitenumeric.xml b/docsrc/xmlsource/funcref/isfinitenumeric.xml
index c1b4b0d..32c96ad 100644
--- a/docsrc/xmlsource/funcref/isfinitenumeric.xml
+++ b/docsrc/xmlsource/funcref/isfinitenumeric.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isfloat.xml b/docsrc/xmlsource/funcref/isfloat.xml
index 852b7f1..c16a35d 100644
--- a/docsrc/xmlsource/funcref/isfloat.xml
+++ b/docsrc/xmlsource/funcref/isfloat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isinteger.xml b/docsrc/xmlsource/funcref/isinteger.xml
index 3e8b153..89ae68b 100644
--- a/docsrc/xmlsource/funcref/isinteger.xml
+++ b/docsrc/xmlsource/funcref/isinteger.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isnull.xml b/docsrc/xmlsource/funcref/isnull.xml
index e574b60..61281c7 100644
--- a/docsrc/xmlsource/funcref/isnull.xml
+++ b/docsrc/xmlsource/funcref/isnull.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isnumeric.xml b/docsrc/xmlsource/funcref/isnumeric.xml
index a196c25..767b870 100644
--- a/docsrc/xmlsource/funcref/isnumeric.xml
+++ b/docsrc/xmlsource/funcref/isnumeric.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/isstring.xml b/docsrc/xmlsource/funcref/isstring.xml
index c7ebff1..1ba2921 100644
--- a/docsrc/xmlsource/funcref/isstring.xml
+++ b/docsrc/xmlsource/funcref/isstring.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/iszero.xml b/docsrc/xmlsource/funcref/iszero.xml
index 5870bf5..1c59aa2 100644
--- a/docsrc/xmlsource/funcref/iszero.xml
+++ b/docsrc/xmlsource/funcref/iszero.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/java_call_method.xml b/docsrc/xmlsource/funcref/java_call_method.xml
index 6579b1f..6fa9ff8 100644
--- a/docsrc/xmlsource/funcref/java_call_method.xml
+++ b/docsrc/xmlsource/funcref/java_call_method.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/java_get_property.xml b/docsrc/xmlsource/funcref/java_get_property.xml
index c7b4d65..fe9791a 100644
--- a/docsrc/xmlsource/funcref/java_get_property.xml
+++ b/docsrc/xmlsource/funcref/java_get_property.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/java_load_class.xml b/docsrc/xmlsource/funcref/java_load_class.xml
index 78972f1..0e80ec6 100644
--- a/docsrc/xmlsource/funcref/java_load_class.xml
+++ b/docsrc/xmlsource/funcref/java_load_class.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/java_new_object.xml b/docsrc/xmlsource/funcref/java_new_object.xml
index 56726f2..904f70a 100644
--- a/docsrc/xmlsource/funcref/java_new_object.xml
+++ b/docsrc/xmlsource/funcref/java_new_object.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/java_set_property.xml b/docsrc/xmlsource/funcref/java_set_property.xml
index 63a643f..1d870d6 100644
--- a/docsrc/xmlsource/funcref/java_set_property.xml
+++ b/docsrc/xmlsource/funcref/java_set_property.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/java_vm_attach.xml b/docsrc/xmlsource/funcref/java_vm_attach.xml
index 2c0cfdc..493e65a 100644
--- a/docsrc/xmlsource/funcref/java_vm_attach.xml
+++ b/docsrc/xmlsource/funcref/java_vm_attach.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/java_vm_detach.xml b/docsrc/xmlsource/funcref/java_vm_detach.xml
index 86590d0..b8057ae 100644
--- a/docsrc/xmlsource/funcref/java_vm_detach.xml
+++ b/docsrc/xmlsource/funcref/java_vm_detach.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/json_parse.xml b/docsrc/xmlsource/funcref/json_parse.xml
index 1896219..e97426c 100644
--- a/docsrc/xmlsource/funcref/json_parse.xml
+++ b/docsrc/xmlsource/funcref/json_parse.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/jvm_ref_import.xml b/docsrc/xmlsource/funcref/jvm_ref_import.xml
index 4800a9b..ff83d63 100644
--- a/docsrc/xmlsource/funcref/jvm_ref_import.xml
+++ b/docsrc/xmlsource/funcref/jvm_ref_import.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/key_estimate.xml b/docsrc/xmlsource/funcref/key_estimate.xml
index 3e41cbc..a1ec4e5 100644
--- a/docsrc/xmlsource/funcref/key_estimate.xml
+++ b/docsrc/xmlsource/funcref/key_estimate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/lcase.xml b/docsrc/xmlsource/funcref/lcase.xml
index 93a07bb..dc6b9e9 100644
--- a/docsrc/xmlsource/funcref/lcase.xml
+++ b/docsrc/xmlsource/funcref/lcase.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ldap_add.xml b/docsrc/xmlsource/funcref/ldap_add.xml
index fc0accf..9bc3710 100644
--- a/docsrc/xmlsource/funcref/ldap_add.xml
+++ b/docsrc/xmlsource/funcref/ldap_add.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ldap_delete.xml b/docsrc/xmlsource/funcref/ldap_delete.xml
index 91ca915..5aa9951 100644
--- a/docsrc/xmlsource/funcref/ldap_delete.xml
+++ b/docsrc/xmlsource/funcref/ldap_delete.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ldap_modify.xml b/docsrc/xmlsource/funcref/ldap_modify.xml
index accd49e..e8d5415 100644
--- a/docsrc/xmlsource/funcref/ldap_modify.xml
+++ b/docsrc/xmlsource/funcref/ldap_modify.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ldap_search.xml b/docsrc/xmlsource/funcref/ldap_search.xml
index bae855e..9050c45 100644
--- a/docsrc/xmlsource/funcref/ldap_search.xml
+++ b/docsrc/xmlsource/funcref/ldap_search.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/left.xml b/docsrc/xmlsource/funcref/left.xml
index 429a9ce..bdb5d9c 100644
--- a/docsrc/xmlsource/funcref/left.xml
+++ b/docsrc/xmlsource/funcref/left.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/length.xml b/docsrc/xmlsource/funcref/length.xml
index 703871e..75d2731 100644
--- a/docsrc/xmlsource/funcref/length.xml
+++ b/docsrc/xmlsource/funcref/length.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/lfs_exp.xml b/docsrc/xmlsource/funcref/lfs_exp.xml
index 7c5b4dd..f8ec7b0 100644
--- a/docsrc/xmlsource/funcref/lfs_exp.xml
+++ b/docsrc/xmlsource/funcref/lfs_exp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/lh_get_handler.xml b/docsrc/xmlsource/funcref/lh_get_handler.xml
index 2058ab0..8ada40e 100644
--- a/docsrc/xmlsource/funcref/lh_get_handler.xml
+++ b/docsrc/xmlsource/funcref/lh_get_handler.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/lh_load_handler.xml b/docsrc/xmlsource/funcref/lh_load_handler.xml
index 02ac206..c379d0e 100644
--- a/docsrc/xmlsource/funcref/lh_load_handler.xml
+++ b/docsrc/xmlsource/funcref/lh_load_handler.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/locate.xml b/docsrc/xmlsource/funcref/locate.xml
index 6757ff6..f2b9836 100644
--- a/docsrc/xmlsource/funcref/locate.xml
+++ b/docsrc/xmlsource/funcref/locate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/log.xml b/docsrc/xmlsource/funcref/log.xml
index a92b69d..1663a74 100644
--- a/docsrc/xmlsource/funcref/log.xml
+++ b/docsrc/xmlsource/funcref/log.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/log10.xml b/docsrc/xmlsource/funcref/log10.xml
index b3baff9..218ebc0 100644
--- a/docsrc/xmlsource/funcref/log10.xml
+++ b/docsrc/xmlsource/funcref/log10.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/log_enable.xml b/docsrc/xmlsource/funcref/log_enable.xml
index 6bdd4fa..e7b1e76 100644
--- a/docsrc/xmlsource/funcref/log_enable.xml
+++ b/docsrc/xmlsource/funcref/log_enable.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/log_text.xml b/docsrc/xmlsource/funcref/log_text.xml
index 90d02d1..c49478b 100644
--- a/docsrc/xmlsource/funcref/log_text.xml
+++ b/docsrc/xmlsource/funcref/log_text.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/lower.xml b/docsrc/xmlsource/funcref/lower.xml
index 6fc7872..187bdda 100644
--- a/docsrc/xmlsource/funcref/lower.xml
+++ b/docsrc/xmlsource/funcref/lower.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ltrim.xml b/docsrc/xmlsource/funcref/ltrim.xml
index 7524b0b..a6213ad 100644
--- a/docsrc/xmlsource/funcref/ltrim.xml
+++ b/docsrc/xmlsource/funcref/ltrim.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/make_array.xml b/docsrc/xmlsource/funcref/make_array.xml
index 540e465..ec9bdc1 100644
--- a/docsrc/xmlsource/funcref/make_array.xml
+++ b/docsrc/xmlsource/funcref/make_array.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/make_string.xml b/docsrc/xmlsource/funcref/make_string.xml
index c2196b2..a9f5a7f 100644
--- a/docsrc/xmlsource/funcref/make_string.xml
+++ b/docsrc/xmlsource/funcref/make_string.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/md5.xml b/docsrc/xmlsource/funcref/md5.xml
index 6b064af..04d42ba 100644
--- a/docsrc/xmlsource/funcref/md5.xml
+++ b/docsrc/xmlsource/funcref/md5.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/md5_final.xml b/docsrc/xmlsource/funcref/md5_final.xml
index 919edd7..4d9c22c 100644
--- a/docsrc/xmlsource/funcref/md5_final.xml
+++ b/docsrc/xmlsource/funcref/md5_final.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/md5_init.xml b/docsrc/xmlsource/funcref/md5_init.xml
index 5d89044..2b9e2e8 100644
--- a/docsrc/xmlsource/funcref/md5_init.xml
+++ b/docsrc/xmlsource/funcref/md5_init.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/md5_update.xml b/docsrc/xmlsource/funcref/md5_update.xml
index 8fdb4ab..0116f8a 100644
--- a/docsrc/xmlsource/funcref/md5_update.xml
+++ b/docsrc/xmlsource/funcref/md5_update.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/metaWeblog.editPost.xml b/docsrc/xmlsource/funcref/metaWeblog.editPost.xml
index c023795..8d50a8f 100644
--- a/docsrc/xmlsource/funcref/metaWeblog.editPost.xml
+++ b/docsrc/xmlsource/funcref/metaWeblog.editPost.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/metaWeblog.getPost.xml b/docsrc/xmlsource/funcref/metaWeblog.getPost.xml
index 92ab13e..8eb2e26 100644
--- a/docsrc/xmlsource/funcref/metaWeblog.getPost.xml
+++ b/docsrc/xmlsource/funcref/metaWeblog.getPost.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml b/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml
index 0ba5407..49f02ae 100644
--- a/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml
+++ b/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/metaWeblog.newPost.xml b/docsrc/xmlsource/funcref/metaWeblog.newPost.xml
index ced6e50..5cfa003 100644
--- a/docsrc/xmlsource/funcref/metaWeblog.newPost.xml
+++ b/docsrc/xmlsource/funcref/metaWeblog.newPost.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mime_body.xml b/docsrc/xmlsource/funcref/mime_body.xml
index fea5553..7fe6804 100644
--- a/docsrc/xmlsource/funcref/mime_body.xml
+++ b/docsrc/xmlsource/funcref/mime_body.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mime_part.xml b/docsrc/xmlsource/funcref/mime_part.xml
index e749b91..9e9f811 100644
--- a/docsrc/xmlsource/funcref/mime_part.xml
+++ b/docsrc/xmlsource/funcref/mime_part.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mime_tree.xml b/docsrc/xmlsource/funcref/mime_tree.xml
index a4e161c..57338d3 100644
--- a/docsrc/xmlsource/funcref/mime_tree.xml
+++ b/docsrc/xmlsource/funcref/mime_tree.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/minute.xml b/docsrc/xmlsource/funcref/minute.xml
index 72f6566..5d18575 100644
--- a/docsrc/xmlsource/funcref/minute.xml
+++ b/docsrc/xmlsource/funcref/minute.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mod.xml b/docsrc/xmlsource/funcref/mod.xml
index 84ae2e0..34568f8 100644
--- a/docsrc/xmlsource/funcref/mod.xml
+++ b/docsrc/xmlsource/funcref/mod.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/month.xml b/docsrc/xmlsource/funcref/month.xml
index c4e34e0..935706b 100644
--- a/docsrc/xmlsource/funcref/month.xml
+++ b/docsrc/xmlsource/funcref/month.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/monthname.xml b/docsrc/xmlsource/funcref/monthname.xml
index 6e18e0b..06321a6 100644
--- a/docsrc/xmlsource/funcref/monthname.xml
+++ b/docsrc/xmlsource/funcref/monthname.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/msec_time.xml b/docsrc/xmlsource/funcref/msec_time.xml
index 14c6fff..8f8e131 100644
--- a/docsrc/xmlsource/funcref/msec_time.xml
+++ b/docsrc/xmlsource/funcref/msec_time.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mt.getCategoryList.xml b/docsrc/xmlsource/funcref/mt.getCategoryList.xml
index c898d61..1f3c780 100644
--- a/docsrc/xmlsource/funcref/mt.getCategoryList.xml
+++ b/docsrc/xmlsource/funcref/mt.getCategoryList.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mt.getPostCategories.xml b/docsrc/xmlsource/funcref/mt.getPostCategories.xml
index ca3c67f..54c8287 100644
--- a/docsrc/xmlsource/funcref/mt.getPostCategories.xml
+++ b/docsrc/xmlsource/funcref/mt.getPostCategories.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml b/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml
index 01b78b5..157d958 100644
--- a/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml
+++ b/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml b/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml
index 0a29319..9cce8d0 100644
--- a/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml
+++ b/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mt.publishPost.xml b/docsrc/xmlsource/funcref/mt.publishPost.xml
index a7234c3..13c2b2e 100644
--- a/docsrc/xmlsource/funcref/mt.publishPost.xml
+++ b/docsrc/xmlsource/funcref/mt.publishPost.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mt.setPostCategories.xml b/docsrc/xmlsource/funcref/mt.setPostCategories.xml
index dbfff3a..1f2bec8 100644
--- a/docsrc/xmlsource/funcref/mt.setPostCategories.xml
+++ b/docsrc/xmlsource/funcref/mt.setPostCategories.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mt.supportedMethods.xml b/docsrc/xmlsource/funcref/mt.supportedMethods.xml
index 5b4ec51..7efff8c 100644
--- a/docsrc/xmlsource/funcref/mt.supportedMethods.xml
+++ b/docsrc/xmlsource/funcref/mt.supportedMethods.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mts_connect.xml b/docsrc/xmlsource/funcref/mts_connect.xml
index fb540b6..0ac7f9e 100644
--- a/docsrc/xmlsource/funcref/mts_connect.xml
+++ b/docsrc/xmlsource/funcref/mts_connect.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mts_get_timeout.xml b/docsrc/xmlsource/funcref/mts_get_timeout.xml
index 330d8d5..f38419a 100644
--- a/docsrc/xmlsource/funcref/mts_get_timeout.xml
+++ b/docsrc/xmlsource/funcref/mts_get_timeout.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mts_set_timeout.xml b/docsrc/xmlsource/funcref/mts_set_timeout.xml
index 65661ba..021a3d8 100644
--- a/docsrc/xmlsource/funcref/mts_set_timeout.xml
+++ b/docsrc/xmlsource/funcref/mts_set_timeout.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/mts_status.xml b/docsrc/xmlsource/funcref/mts_status.xml
index 6104a6d..f76aaea 100644
--- a/docsrc/xmlsource/funcref/mts_status.xml
+++ b/docsrc/xmlsource/funcref/mts_status.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/name_part.xml b/docsrc/xmlsource/funcref/name_part.xml
index 1159108..ffe7181 100644
--- a/docsrc/xmlsource/funcref/name_part.xml
+++ b/docsrc/xmlsource/funcref/name_part.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/nm_max.xml b/docsrc/xmlsource/funcref/nm_max.xml
index c7376d9..4512a8f 100644
--- a/docsrc/xmlsource/funcref/nm_max.xml
+++ b/docsrc/xmlsource/funcref/nm_max.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2011 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
diff --git a/docsrc/xmlsource/funcref/nm_max_notnull.xml b/docsrc/xmlsource/funcref/nm_max_notnull.xml
index 22afd15..e347c61 100644
--- a/docsrc/xmlsource/funcref/nm_max_notnull.xml
+++ b/docsrc/xmlsource/funcref/nm_max_notnull.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2011 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
diff --git a/docsrc/xmlsource/funcref/nm_min.xml b/docsrc/xmlsource/funcref/nm_min.xml
index d49e021..27fa7f1 100644
--- a/docsrc/xmlsource/funcref/nm_min.xml
+++ b/docsrc/xmlsource/funcref/nm_min.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2011 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
diff --git a/docsrc/xmlsource/funcref/nm_min_notnull.xml b/docsrc/xmlsource/funcref/nm_min_notnull.xml
index 1f7870b..3628fca 100644
--- a/docsrc/xmlsource/funcref/nm_min_notnull.xml
+++ b/docsrc/xmlsource/funcref/nm_min_notnull.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2011 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
diff --git a/docsrc/xmlsource/funcref/nntp_auth_get.xml b/docsrc/xmlsource/funcref/nntp_auth_get.xml
index 0a8086a..804b91b 100644
--- a/docsrc/xmlsource/funcref/nntp_auth_get.xml
+++ b/docsrc/xmlsource/funcref/nntp_auth_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/nntp_auth_post.xml b/docsrc/xmlsource/funcref/nntp_auth_post.xml
index add1889..a9ecd88 100644
--- a/docsrc/xmlsource/funcref/nntp_auth_post.xml
+++ b/docsrc/xmlsource/funcref/nntp_auth_post.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/nntp_get.xml b/docsrc/xmlsource/funcref/nntp_get.xml
index e5f3286..bb31363 100644
--- a/docsrc/xmlsource/funcref/nntp_get.xml
+++ b/docsrc/xmlsource/funcref/nntp_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/nntp_post.xml b/docsrc/xmlsource/funcref/nntp_post.xml
index 3b6ae91..ea7588c 100644
--- a/docsrc/xmlsource/funcref/nntp_post.xml
+++ b/docsrc/xmlsource/funcref/nntp_post.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/now.xml b/docsrc/xmlsource/funcref/now.xml
index ff39fab..401fcfc 100644
--- a/docsrc/xmlsource/funcref/now.xml
+++ b/docsrc/xmlsource/funcref/now.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/openxml.xml b/docsrc/xmlsource/funcref/openxml.xml
index bbd002d..87ebc26 100644
--- a/docsrc/xmlsource/funcref/openxml.xml
+++ b/docsrc/xmlsource/funcref/openxml.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/os_chmod.xml b/docsrc/xmlsource/funcref/os_chmod.xml
index 1874025..f5c3c85 100644
--- a/docsrc/xmlsource/funcref/os_chmod.xml
+++ b/docsrc/xmlsource/funcref/os_chmod.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/os_chown.xml b/docsrc/xmlsource/funcref/os_chown.xml
index 4dd0933..3fcf029 100644
--- a/docsrc/xmlsource/funcref/os_chown.xml
+++ b/docsrc/xmlsource/funcref/os_chown.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/pem_certificates_to_array.xml b/docsrc/xmlsource/funcref/pem_certificates_to_array.xml
index 506f1ab..815dcad 100644
--- a/docsrc/xmlsource/funcref/pem_certificates_to_array.xml
+++ b/docsrc/xmlsource/funcref/pem_certificates_to_array.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/pldbg_stats.xml b/docsrc/xmlsource/funcref/pldbg_stats.xml
index fd58635..3716c75 100644
--- a/docsrc/xmlsource/funcref/pldbg_stats.xml
+++ b/docsrc/xmlsource/funcref/pldbg_stats.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/pldbg_stats_load.xml b/docsrc/xmlsource/funcref/pldbg_stats_load.xml
index 66c2eb9..5c964e5 100644
--- a/docsrc/xmlsource/funcref/pldbg_stats_load.xml
+++ b/docsrc/xmlsource/funcref/pldbg_stats_load.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/pop3_get.xml b/docsrc/xmlsource/funcref/pop3_get.xml
index d46f302..b009344 100644
--- a/docsrc/xmlsource/funcref/pop3_get.xml
+++ b/docsrc/xmlsource/funcref/pop3_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/position.xml b/docsrc/xmlsource/funcref/position.xml
index d4edf6d..599c4f4 100644
--- a/docsrc/xmlsource/funcref/position.xml
+++ b/docsrc/xmlsource/funcref/position.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/power.xml b/docsrc/xmlsource/funcref/power.xml
index 3a75792..0513822 100644
--- a/docsrc/xmlsource/funcref/power.xml
+++ b/docsrc/xmlsource/funcref/power.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/prof_enable.xml b/docsrc/xmlsource/funcref/prof_enable.xml
index 1bf0ae6..5d374f3 100644
--- a/docsrc/xmlsource/funcref/prof_enable.xml
+++ b/docsrc/xmlsource/funcref/prof_enable.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/prof_sample.xml b/docsrc/xmlsource/funcref/prof_sample.xml
index 2504b4b..3ce50d5 100644
--- a/docsrc/xmlsource/funcref/prof_sample.xml
+++ b/docsrc/xmlsource/funcref/prof_sample.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/quarter.xml b/docsrc/xmlsource/funcref/quarter.xml
index 2071f82..a1d2110 100644
--- a/docsrc/xmlsource/funcref/quarter.xml
+++ b/docsrc/xmlsource/funcref/quarter.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/quote_dotted.xml b/docsrc/xmlsource/funcref/quote_dotted.xml
index 9664517..7d41d0e 100644
--- a/docsrc/xmlsource/funcref/quote_dotted.xml
+++ b/docsrc/xmlsource/funcref/quote_dotted.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/randomize.xml b/docsrc/xmlsource/funcref/randomize.xml
index 8cb2aae..fde82b6 100644
--- a/docsrc/xmlsource/funcref/randomize.xml
+++ b/docsrc/xmlsource/funcref/randomize.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rclose.xml b/docsrc/xmlsource/funcref/rclose.xml
index c25dc3b..842d8c0 100644
--- a/docsrc/xmlsource/funcref/rclose.xml
+++ b/docsrc/xmlsource/funcref/rclose.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml b/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml
index 1cb92c3..22d6dfc 100644
--- a/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml
+++ b/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_audit_metadata.xml b/docsrc/xmlsource/funcref/rdf_audit_metadata.xml
index c7d3f4e..2b041a8 100644
--- a/docsrc/xmlsource/funcref/rdf_audit_metadata.xml
+++ b/docsrc/xmlsource/funcref/rdf_audit_metadata.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_backup_metadata.xml b/docsrc/xmlsource/funcref/rdf_backup_metadata.xml
index 72950b7..8fb6910 100644
--- a/docsrc/xmlsource/funcref/rdf_backup_metadata.xml
+++ b/docsrc/xmlsource/funcref/rdf_backup_metadata.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
@@ -28,7 +28,7 @@
</refmeta>
<refnamediv>
<refname>DB.DBA.RDF_BACKUP_METADATA</refname>
- <refpurpose>Makes a backup copy of RDF metadata (i.e., descriptions of Linked Data Views and the like).</refpurpose>
+ <refpurpose>Makes a backup copy of RDF metadata (i.e., descriptions of RDF Views and the like).</refpurpose>
</refnamediv>
<refsynopsisdiv>
<funcsynopsis id="fsyn_rdf_backup_metadata">
diff --git a/docsrc/xmlsource/funcref/rdf_convert_rdfxml_to_ttl.xml b/docsrc/xmlsource/funcref/rdf_convert_rdfxml_to_ttl.xml
index c0da451..aabc4f0 100644
--- a/docsrc/xmlsource/funcref/rdf_convert_rdfxml_to_ttl.xml
+++ b/docsrc/xmlsource/funcref/rdf_convert_rdfxml_to_ttl.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: rdf_convert_rdfxml_to_ttl.xml,v 1.1.2.1 2012/03/07 15:29:01 source Exp $
+ $Id: rdf_convert_rdfxml_to_ttl.xml,v 1.1 2008/03/19 20:12:43 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2008 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
diff --git a/docsrc/xmlsource/funcref/rdf_graph_group_create.xml b/docsrc/xmlsource/funcref/rdf_graph_group_create.xml
index c4e4f16..e7cb219 100644
--- a/docsrc/xmlsource/funcref/rdf_graph_group_create.xml
+++ b/docsrc/xmlsource/funcref/rdf_graph_group_create.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- - $Id: rdf_graph_group_create.xml,v 1.1.2.3 2012/03/07 15:29:01 source Exp $
+ - $Id: rdf_graph_group_create.xml,v 1.1.2.2 2009/05/05 14:10:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml b/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml
index 4b402c6..177d8ad 100644
--- a/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml
+++ b/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
- - $Id: rdf_graph_group_ins.xml,v 1.1.2.3 2012/03/07 15:29:01 source Exp $
+ - $Id: rdf_graph_group_ins.xml,v 1.1.2.2 2009/05/05 14:10:10 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/rdf_load_rdfa.xml b/docsrc/xmlsource/funcref/rdf_load_rdfa.xml
index 57533c3..4af15ae 100644
--- a/docsrc/xmlsource/funcref/rdf_load_rdfa.xml
+++ b/docsrc/xmlsource/funcref/rdf_load_rdfa.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml b/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml
index a0aec97..9226b65 100644
--- a/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml
+++ b/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_load_turtle.xml b/docsrc/xmlsource/funcref/rdf_load_turtle.xml
index 3c95485..68530ef 100644
--- a/docsrc/xmlsource/funcref/rdf_load_turtle.xml
+++ b/docsrc/xmlsource/funcref/rdf_load_turtle.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml b/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml
index 683e9c1..15111d6 100644
--- a/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml
+++ b/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml b/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml
index d27722b..12f50a0 100644
--- a/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml
+++ b/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_repl_start.xml b/docsrc/xmlsource/funcref/rdf_repl_start.xml
index a280707..a87da15 100644
--- a/docsrc/xmlsource/funcref/rdf_repl_start.xml
+++ b/docsrc/xmlsource/funcref/rdf_repl_start.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rdf_restore_metadata.xml b/docsrc/xmlsource/funcref/rdf_restore_metadata.xml
index bc6d3c3..c5a1672 100644
--- a/docsrc/xmlsource/funcref/rdf_restore_metadata.xml
+++ b/docsrc/xmlsource/funcref/rdf_restore_metadata.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
@@ -28,7 +28,7 @@
</refmeta>
<refnamediv>
<refname>DB.DBA.RDF_RESTORE_METADATA</refname>
- <refpurpose>Restores RDF metadata (descriptions of Linked Data Views and the like) from previously saved backup.</refpurpose>
+ <refpurpose>Restores RDF metadata (descriptions of RDF Views and the like) from previously saved backup.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<funcsynopsis id="fsyn_rdf_restore_metadata">
diff --git a/docsrc/xmlsource/funcref/rdf_view_sync_to_physical.xml b/docsrc/xmlsource/funcref/rdf_view_sync_to_physical.xml
deleted file mode 100644
index a000fae..0000000
--- a/docsrc/xmlsource/funcref/rdf_view_sync_to_physical.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry id="fn_rdf_view_sync_to_physical">
- <refmeta>
- <refentrytitle>RDF_VIEW_SYNC_TO_PHYSICAL</refentrytitle>
- <refmiscinfo>rdf</refmiscinfo>
- </refmeta>
- <refnamediv>
- <refname>RDF_VIEW_SYNC_TO_PHYSICAL</refname>
- <refpurpose>Performs two actions: do triggers on a liked data view and optionally fill
- the physical graph.</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <funcsynopsis id="fsyn_rdf_view_sync_to_physical">
- <funcprototype id="fproto_rdf_view_sync_to_physical">
- <funcdef><function>RDF_VIEW_SYNC_TO_PHYSICAL</function></funcdef>
- <paramdef>in <parameter>vgraph</parameter> varchar</paramdef>
- <paramdef>in <parameter>load_data</parameter> int := 0</paramdef>
- <paramdef>in <parameter>pgraph</parameter> varchar := null</paramdef>
- <paramdef>in <parameter>log_mode</parameter> int := 1</paramdef>
- <paramdef>in <parameter>load_atomic</parameter> int := 1</paramdef>
- </funcprototype>
- </funcsynopsis>
- </refsynopsisdiv>
- <refsect1 id="desc_rdf_view_sync_to_physical">
- <title>Description</title>
- <para>This function does triggers on a liked data view and optionally fills the
- physical graph. Note: applicable for Virtuoso 6.0 and higher.</para>
- </refsect1>
- <refsect1 id="params_rdf_view_sync_to_physical">
- <title>Parameters</title>
- <refsect2><title>vgraph</title>
- <para>The graph which linked data view defines.</para>
- </refsect2>
- <refsect2><title>load_data</title>
- <para>1/0 flag to load the triples in the physical store initially.</para>
- </refsect2>
- <refsect2><title>pgraph</title>
- <para>The destination's physical graph.</para>
- </refsect2>
- <refsect2><title>log_mode</title>
- <para>This parameter takes integer values: 0,1,2,3. It is used to call log_enable ()
- with the same flags.</para>
- </refsect2>
- <refsect2><title>load_atomic</title>
- <para>This parameter should be set in order to run loading the data in atomic mode. Will
- do a checkpoint when done. This mode is default to handle large tables.</para>
- </refsect2>
- </refsect1>
- <refsect1 id="ret_rdf_view_sync_to_physical"><title>Return Types</title>
- <para>any</para>
- </refsect1>
- <refsect1 id="examples_rdf_view_sync_to_physical">
- <title>Examples</title>
- <example id="ex_rdf_view_sync_to_physical"><title></title>
- <para></para>
-<screen><![CDATA[
-SQL>RDF_VIEW_SYNC_TO_PHYSICAL ('http://www.openlinksw.com/schemas/oplweb#', 0, 'http://mygraph.com', 1, 1);
-
-Done. -- 0 msec.
-]]></screen>
- </example>
- </refsect1>
- <refsect1 id="seealso_rdf_view_sync_to_physical">
- <title>See Also</title>
- <para><link linkend="fn_rdf_audit_metadata"><function>DB.DBA.RDF_AUDIT_METADATA</function></link></para>
- <para><link linkend="fn_rdf_backup_metadata"><function>DB.DBA.RDF_BACKUP_METADATA</function></link></para>
- <para><link linkend="fn_rdf_load_rdfxml_mt"><function>DB.DBA.RDF_LOAD_RDFXML_MT</function></link></para>
- <para><link linkend="fn_ttlp"><function>DB.DBA.TTLP</function></link></para>
- <para><link linkend="fn_ttlp_mt"><function>DB.DBA.TTLP_MT</function></link></para>
- <para><link linkend="fn_rdf_triples_to_rdf_xml_text"><function>DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT</function></link></para>
- <para><link linkend="fn_sparql_rexec"><function>DB.DBA.SPARQL_REXEC</function></link></para>
- <para><link linkend="fn_sparql_rexec_to_array"><function>DB.DBA.SPARQL_REXEC_TO_ARRAY</function></link></para>
- <para><link linkend="fn_sparql_rexec_with_meta"><function>DB.DBA.SPARQL_REXEC_WITH_META</function></link></para>
- <para><link linkend="fn_rdf_quad_uri"><function>DB.DBA.RDF_QUAD_URI</function></link></para>
- <para><link linkend="fn_rdf_quad_uri_l_typed"><function>DB.DBA.RDF_QUAD_URI_L_TYPED</function></link></para>
- <para><link linkend="fn_rdf_ttl2hash"><function>DB.DBA.RDF_TTL2HASH</function></link></para>
- </refsect1>
-</refentry>
diff --git a/docsrc/xmlsource/funcref/rdfs_rule_set.xml b/docsrc/xmlsource/funcref/rdfs_rule_set.xml
index 55fbccf..3c3bfdb 100644
--- a/docsrc/xmlsource/funcref/rdfs_rule_set.xml
+++ b/docsrc/xmlsource/funcref/rdfs_rule_set.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regexp_instr.xml b/docsrc/xmlsource/funcref/regexp_instr.xml
index 56e7035..e95f168 100644
--- a/docsrc/xmlsource/funcref/regexp_instr.xml
+++ b/docsrc/xmlsource/funcref/regexp_instr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regexp_like.xml b/docsrc/xmlsource/funcref/regexp_like.xml
index c063779..98a2123 100644
--- a/docsrc/xmlsource/funcref/regexp_like.xml
+++ b/docsrc/xmlsource/funcref/regexp_like.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regexp_match.xml b/docsrc/xmlsource/funcref/regexp_match.xml
index 1a0a851..70ac4b2 100644
--- a/docsrc/xmlsource/funcref/regexp_match.xml
+++ b/docsrc/xmlsource/funcref/regexp_match.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regexp_parse.xml b/docsrc/xmlsource/funcref/regexp_parse.xml
index f8d6f3d..cb76b56 100644
--- a/docsrc/xmlsource/funcref/regexp_parse.xml
+++ b/docsrc/xmlsource/funcref/regexp_parse.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regexp_replace.xml b/docsrc/xmlsource/funcref/regexp_replace.xml
index 07b1a70..c09ae2f 100644
--- a/docsrc/xmlsource/funcref/regexp_replace.xml
+++ b/docsrc/xmlsource/funcref/regexp_replace.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regexp_substr.xml b/docsrc/xmlsource/funcref/regexp_substr.xml
index 5c98979..5caf503 100644
--- a/docsrc/xmlsource/funcref/regexp_substr.xml
+++ b/docsrc/xmlsource/funcref/regexp_substr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/registry_get.xml b/docsrc/xmlsource/funcref/registry_get.xml
index 2940c72..7bb8a3e 100644
--- a/docsrc/xmlsource/funcref/registry_get.xml
+++ b/docsrc/xmlsource/funcref/registry_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/registry_get_all.xml b/docsrc/xmlsource/funcref/registry_get_all.xml
index c16a318..f935b9a 100644
--- a/docsrc/xmlsource/funcref/registry_get_all.xml
+++ b/docsrc/xmlsource/funcref/registry_get_all.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/registry_name_is_protected.xml b/docsrc/xmlsource/funcref/registry_name_is_protected.xml
index 9adb57c..e0de923 100644
--- a/docsrc/xmlsource/funcref/registry_name_is_protected.xml
+++ b/docsrc/xmlsource/funcref/registry_name_is_protected.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/registry_remove.xml b/docsrc/xmlsource/funcref/registry_remove.xml
index 422576b..3189843 100644
--- a/docsrc/xmlsource/funcref/registry_remove.xml
+++ b/docsrc/xmlsource/funcref/registry_remove.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/registry_set.xml b/docsrc/xmlsource/funcref/registry_set.xml
index 3bd79d1..8977ad4 100644
--- a/docsrc/xmlsource/funcref/registry_set.xml
+++ b/docsrc/xmlsource/funcref/registry_set.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_avgx.xml b/docsrc/xmlsource/funcref/regr_avgx.xml
index bbce06c..374f1d9 100644
--- a/docsrc/xmlsource/funcref/regr_avgx.xml
+++ b/docsrc/xmlsource/funcref/regr_avgx.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_avgy.xml b/docsrc/xmlsource/funcref/regr_avgy.xml
index 0613b39..6b08b32 100644
--- a/docsrc/xmlsource/funcref/regr_avgy.xml
+++ b/docsrc/xmlsource/funcref/regr_avgy.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_count.xml b/docsrc/xmlsource/funcref/regr_count.xml
index 3fae6bb..8099a68 100644
--- a/docsrc/xmlsource/funcref/regr_count.xml
+++ b/docsrc/xmlsource/funcref/regr_count.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_intercept.xml b/docsrc/xmlsource/funcref/regr_intercept.xml
index 75f7b3c..79d0f8b 100644
--- a/docsrc/xmlsource/funcref/regr_intercept.xml
+++ b/docsrc/xmlsource/funcref/regr_intercept.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_r2.xml b/docsrc/xmlsource/funcref/regr_r2.xml
index e3b20da..0f75050 100644
--- a/docsrc/xmlsource/funcref/regr_r2.xml
+++ b/docsrc/xmlsource/funcref/regr_r2.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_slope.xml b/docsrc/xmlsource/funcref/regr_slope.xml
index 0e07507..b39b45e 100644
--- a/docsrc/xmlsource/funcref/regr_slope.xml
+++ b/docsrc/xmlsource/funcref/regr_slope.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_sxx.xml b/docsrc/xmlsource/funcref/regr_sxx.xml
index 1b3a726..351f80d 100644
--- a/docsrc/xmlsource/funcref/regr_sxx.xml
+++ b/docsrc/xmlsource/funcref/regr_sxx.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_sxy.xml b/docsrc/xmlsource/funcref/regr_sxy.xml
index 5a4e9f0..5790ccc 100644
--- a/docsrc/xmlsource/funcref/regr_sxy.xml
+++ b/docsrc/xmlsource/funcref/regr_sxy.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/regr_syy.xml b/docsrc/xmlsource/funcref/regr_syy.xml
index e918cd6..4a3def3 100644
--- a/docsrc/xmlsource/funcref/regr_syy.xml
+++ b/docsrc/xmlsource/funcref/regr_syy.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repeat.xml b/docsrc/xmlsource/funcref/repeat.xml
index 34287b1..3c6d97a 100644
--- a/docsrc/xmlsource/funcref/repeat.xml
+++ b/docsrc/xmlsource/funcref/repeat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_disconnect.xml b/docsrc/xmlsource/funcref/repl_disconnect.xml
index 45887ad..48d233a 100644
--- a/docsrc/xmlsource/funcref/repl_disconnect.xml
+++ b/docsrc/xmlsource/funcref/repl_disconnect.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_grant.xml b/docsrc/xmlsource/funcref/repl_grant.xml
index 2cea7e7..c011385 100644
--- a/docsrc/xmlsource/funcref/repl_grant.xml
+++ b/docsrc/xmlsource/funcref/repl_grant.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_init_copy.xml b/docsrc/xmlsource/funcref/repl_init_copy.xml
index 4f12cbb..7cf9891 100644
--- a/docsrc/xmlsource/funcref/repl_init_copy.xml
+++ b/docsrc/xmlsource/funcref/repl_init_copy.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_new_log.xml b/docsrc/xmlsource/funcref/repl_new_log.xml
index a114037..19e0f5b 100644
--- a/docsrc/xmlsource/funcref/repl_new_log.xml
+++ b/docsrc/xmlsource/funcref/repl_new_log.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_pub_add.xml b/docsrc/xmlsource/funcref/repl_pub_add.xml
index e0ad893..a9e21e8 100644
--- a/docsrc/xmlsource/funcref/repl_pub_add.xml
+++ b/docsrc/xmlsource/funcref/repl_pub_add.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_pub_init_image.xml b/docsrc/xmlsource/funcref/repl_pub_init_image.xml
index 885ad66..11d1038 100644
--- a/docsrc/xmlsource/funcref/repl_pub_init_image.xml
+++ b/docsrc/xmlsource/funcref/repl_pub_init_image.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_pub_remove.xml b/docsrc/xmlsource/funcref/repl_pub_remove.xml
index 4476c45..cc72143 100644
--- a/docsrc/xmlsource/funcref/repl_pub_remove.xml
+++ b/docsrc/xmlsource/funcref/repl_pub_remove.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_publish.xml b/docsrc/xmlsource/funcref/repl_publish.xml
index e67c9c7..61a11f2 100644
--- a/docsrc/xmlsource/funcref/repl_publish.xml
+++ b/docsrc/xmlsource/funcref/repl_publish.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_purge.xml b/docsrc/xmlsource/funcref/repl_purge.xml
index a7e1bb9..9768c4d 100644
--- a/docsrc/xmlsource/funcref/repl_purge.xml
+++ b/docsrc/xmlsource/funcref/repl_purge.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_revoke.xml b/docsrc/xmlsource/funcref/repl_revoke.xml
index a3383e0..4517b1a 100644
--- a/docsrc/xmlsource/funcref/repl_revoke.xml
+++ b/docsrc/xmlsource/funcref/repl_revoke.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_sched_init.xml b/docsrc/xmlsource/funcref/repl_sched_init.xml
index f306be8..b55a863 100644
--- a/docsrc/xmlsource/funcref/repl_sched_init.xml
+++ b/docsrc/xmlsource/funcref/repl_sched_init.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_server.xml b/docsrc/xmlsource/funcref/repl_server.xml
index e3a3948..833f7e6 100644
--- a/docsrc/xmlsource/funcref/repl_server.xml
+++ b/docsrc/xmlsource/funcref/repl_server.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_server_rename.xml b/docsrc/xmlsource/funcref/repl_server_rename.xml
index a575b9d..7481734 100644
--- a/docsrc/xmlsource/funcref/repl_server_rename.xml
+++ b/docsrc/xmlsource/funcref/repl_server_rename.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_stat.xml b/docsrc/xmlsource/funcref/repl_stat.xml
index 5c07fba..d894144 100644
--- a/docsrc/xmlsource/funcref/repl_stat.xml
+++ b/docsrc/xmlsource/funcref/repl_stat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_status.xml b/docsrc/xmlsource/funcref/repl_status.xml
index 6460030..a03c46b 100644
--- a/docsrc/xmlsource/funcref/repl_status.xml
+++ b/docsrc/xmlsource/funcref/repl_status.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_subscribe.xml b/docsrc/xmlsource/funcref/repl_subscribe.xml
index 8c7d381..15a3fb7 100644
--- a/docsrc/xmlsource/funcref/repl_subscribe.xml
+++ b/docsrc/xmlsource/funcref/repl_subscribe.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_sync.xml b/docsrc/xmlsource/funcref/repl_sync.xml
index 47e05bf..207fdfc 100644
--- a/docsrc/xmlsource/funcref/repl_sync.xml
+++ b/docsrc/xmlsource/funcref/repl_sync.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_sync_all.xml b/docsrc/xmlsource/funcref/repl_sync_all.xml
index 8a82bb7..2d5e7ac 100644
--- a/docsrc/xmlsource/funcref/repl_sync_all.xml
+++ b/docsrc/xmlsource/funcref/repl_sync_all.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_text.xml b/docsrc/xmlsource/funcref/repl_text.xml
index 05dad87..f872528 100644
--- a/docsrc/xmlsource/funcref/repl_text.xml
+++ b/docsrc/xmlsource/funcref/repl_text.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_this_server.xml b/docsrc/xmlsource/funcref/repl_this_server.xml
index 19d003f..a93fe91 100644
--- a/docsrc/xmlsource/funcref/repl_this_server.xml
+++ b/docsrc/xmlsource/funcref/repl_this_server.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_unpublish.xml b/docsrc/xmlsource/funcref/repl_unpublish.xml
index d447865..3e8fdef 100644
--- a/docsrc/xmlsource/funcref/repl_unpublish.xml
+++ b/docsrc/xmlsource/funcref/repl_unpublish.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/repl_unsubscribe.xml b/docsrc/xmlsource/funcref/repl_unsubscribe.xml
index ffcecb6..f057178 100644
--- a/docsrc/xmlsource/funcref/repl_unsubscribe.xml
+++ b/docsrc/xmlsource/funcref/repl_unsubscribe.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/replace.xml b/docsrc/xmlsource/funcref/replace.xml
index e09a109..e7042d5 100644
--- a/docsrc/xmlsource/funcref/replace.xml
+++ b/docsrc/xmlsource/funcref/replace.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/replay.xml b/docsrc/xmlsource/funcref/replay.xml
index fc5131f..5ad9f5f 100644
--- a/docsrc/xmlsource/funcref/replay.xml
+++ b/docsrc/xmlsource/funcref/replay.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/result.xml b/docsrc/xmlsource/funcref/result.xml
index 330473f..3c3b57e 100644
--- a/docsrc/xmlsource/funcref/result.xml
+++ b/docsrc/xmlsource/funcref/result.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/result_names.xml b/docsrc/xmlsource/funcref/result_names.xml
index bfc468e..999e49f 100644
--- a/docsrc/xmlsource/funcref/result_names.xml
+++ b/docsrc/xmlsource/funcref/result_names.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rexecute.xml b/docsrc/xmlsource/funcref/rexecute.xml
index 5a578f2..1629ac5 100644
--- a/docsrc/xmlsource/funcref/rexecute.xml
+++ b/docsrc/xmlsource/funcref/rexecute.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/right.xml b/docsrc/xmlsource/funcref/right.xml
index 0e026ff..17d0f0d 100644
--- a/docsrc/xmlsource/funcref/right.xml
+++ b/docsrc/xmlsource/funcref/right.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rmoreresults.xml b/docsrc/xmlsource/funcref/rmoreresults.xml
index 1b11782..da4a826 100644
--- a/docsrc/xmlsource/funcref/rmoreresults.xml
+++ b/docsrc/xmlsource/funcref/rmoreresults.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rnd.xml b/docsrc/xmlsource/funcref/rnd.xml
index 8cc6f7b..164bb87 100644
--- a/docsrc/xmlsource/funcref/rnd.xml
+++ b/docsrc/xmlsource/funcref/rnd.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rnext.xml b/docsrc/xmlsource/funcref/rnext.xml
index 7c12f8b..55794b2 100644
--- a/docsrc/xmlsource/funcref/rnext.xml
+++ b/docsrc/xmlsource/funcref/rnext.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/row_count.xml b/docsrc/xmlsource/funcref/row_count.xml
index 50e1490..a8e8091 100644
--- a/docsrc/xmlsource/funcref/row_count.xml
+++ b/docsrc/xmlsource/funcref/row_count.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rowvector_digit_sort.xml b/docsrc/xmlsource/funcref/rowvector_digit_sort.xml
index b490f21..125767f 100644
--- a/docsrc/xmlsource/funcref/rowvector_digit_sort.xml
+++ b/docsrc/xmlsource/funcref/rowvector_digit_sort.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/funcref/rstmtexec.xml b/docsrc/xmlsource/funcref/rstmtexec.xml
index 5da89c0..729da38 100644
--- a/docsrc/xmlsource/funcref/rstmtexec.xml
+++ b/docsrc/xmlsource/funcref/rstmtexec.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/rtrim.xml b/docsrc/xmlsource/funcref/rtrim.xml
index 75e8f61..cc81f12 100644
--- a/docsrc/xmlsource/funcref/rtrim.xml
+++ b/docsrc/xmlsource/funcref/rtrim.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/search_excerpt.xml b/docsrc/xmlsource/funcref/search_excerpt.xml
index 413f3c0..b45c741 100644
--- a/docsrc/xmlsource/funcref/search_excerpt.xml
+++ b/docsrc/xmlsource/funcref/search_excerpt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/second.xml b/docsrc/xmlsource/funcref/second.xml
index c7dc82b..5ebb1e9 100644
--- a/docsrc/xmlsource/funcref/second.xml
+++ b/docsrc/xmlsource/funcref/second.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sequence_get_all.xml b/docsrc/xmlsource/funcref/sequence_get_all.xml
index 8d59624..1935993 100644
--- a/docsrc/xmlsource/funcref/sequence_get_all.xml
+++ b/docsrc/xmlsource/funcref/sequence_get_all.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sequence_next.xml b/docsrc/xmlsource/funcref/sequence_next.xml
index 320868a..fc4a80e8 100644
--- a/docsrc/xmlsource/funcref/sequence_next.xml
+++ b/docsrc/xmlsource/funcref/sequence_next.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sequence_remove.xml b/docsrc/xmlsource/funcref/sequence_remove.xml
index 2b940ad..ddce1b8 100644
--- a/docsrc/xmlsource/funcref/sequence_remove.xml
+++ b/docsrc/xmlsource/funcref/sequence_remove.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sequence_set.xml b/docsrc/xmlsource/funcref/sequence_set.xml
index 226c2c7..6f5f385 100644
--- a/docsrc/xmlsource/funcref/sequence_set.xml
+++ b/docsrc/xmlsource/funcref/sequence_set.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/serialize.xml b/docsrc/xmlsource/funcref/serialize.xml
index 12e7599..5bbecc5 100644
--- a/docsrc/xmlsource/funcref/serialize.xml
+++ b/docsrc/xmlsource/funcref/serialize.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml b/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml
index a02c555..bad9fb2 100644
--- a/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml
+++ b/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/serv_queue_top.xml b/docsrc/xmlsource/funcref/serv_queue_top.xml
index 97d348e..a2366a6 100644
--- a/docsrc/xmlsource/funcref/serv_queue_top.xml
+++ b/docsrc/xmlsource/funcref/serv_queue_top.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/server_root.xml b/docsrc/xmlsource/funcref/server_root.xml
index 5a45bdf..4e7b39b 100644
--- a/docsrc/xmlsource/funcref/server_root.xml
+++ b/docsrc/xmlsource/funcref/server_root.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ses_connect.xml b/docsrc/xmlsource/funcref/ses_connect.xml
index 142d440..5262bf8 100644
--- a/docsrc/xmlsource/funcref/ses_connect.xml
+++ b/docsrc/xmlsource/funcref/ses_connect.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ses_disconnect.xml b/docsrc/xmlsource/funcref/ses_disconnect.xml
index cac6682..2677459 100644
--- a/docsrc/xmlsource/funcref/ses_disconnect.xml
+++ b/docsrc/xmlsource/funcref/ses_disconnect.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ses_read_line.xml b/docsrc/xmlsource/funcref/ses_read_line.xml
index 5168842..a9cf90b 100644
--- a/docsrc/xmlsource/funcref/ses_read_line.xml
+++ b/docsrc/xmlsource/funcref/ses_read_line.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ses_write.xml b/docsrc/xmlsource/funcref/ses_write.xml
index c8bbfc0..5f497ad 100644
--- a/docsrc/xmlsource/funcref/ses_write.xml
+++ b/docsrc/xmlsource/funcref/ses_write.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/set_identity_column.xml b/docsrc/xmlsource/funcref/set_identity_column.xml
index 27b3452..0e5a546 100644
--- a/docsrc/xmlsource/funcref/set_identity_column.xml
+++ b/docsrc/xmlsource/funcref/set_identity_column.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/set_row_count.xml b/docsrc/xmlsource/funcref/set_row_count.xml
index 9278392..e6c5079 100644
--- a/docsrc/xmlsource/funcref/set_row_count.xml
+++ b/docsrc/xmlsource/funcref/set_row_count.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/set_user_id.xml b/docsrc/xmlsource/funcref/set_user_id.xml
index 1cfd55d..593ae18 100644
--- a/docsrc/xmlsource/funcref/set_user_id.xml
+++ b/docsrc/xmlsource/funcref/set_user_id.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sign.xml b/docsrc/xmlsource/funcref/sign.xml
index f4763fe..ebec22e 100644
--- a/docsrc/xmlsource/funcref/sign.xml
+++ b/docsrc/xmlsource/funcref/sign.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/signal.xml b/docsrc/xmlsource/funcref/signal.xml
index aa7b1b2..9a42cbd 100644
--- a/docsrc/xmlsource/funcref/signal.xml
+++ b/docsrc/xmlsource/funcref/signal.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sinv_create_inverse.xml b/docsrc/xmlsource/funcref/sinv_create_inverse.xml
index 814d3ef..22561f5 100644
--- a/docsrc/xmlsource/funcref/sinv_create_inverse.xml
+++ b/docsrc/xmlsource/funcref/sinv_create_inverse.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml b/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml
index 28b24ca..d4ae4b0 100644
--- a/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml
+++ b/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sinv_drop_inverse.xml b/docsrc/xmlsource/funcref/sinv_drop_inverse.xml
index 75a77e7..a703c0d 100644
--- a/docsrc/xmlsource/funcref/sinv_drop_inverse.xml
+++ b/docsrc/xmlsource/funcref/sinv_drop_inverse.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/smime_decrypt.xml b/docsrc/xmlsource/funcref/smime_decrypt.xml
index e88a369..731aca1 100644
--- a/docsrc/xmlsource/funcref/smime_decrypt.xml
+++ b/docsrc/xmlsource/funcref/smime_decrypt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/smime_encrypt.xml b/docsrc/xmlsource/funcref/smime_encrypt.xml
index df98142..62ee699 100644
--- a/docsrc/xmlsource/funcref/smime_encrypt.xml
+++ b/docsrc/xmlsource/funcref/smime_encrypt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/smime_sign.xml b/docsrc/xmlsource/funcref/smime_sign.xml
index e0a7e2b..eef4f0e 100644
--- a/docsrc/xmlsource/funcref/smime_sign.xml
+++ b/docsrc/xmlsource/funcref/smime_sign.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/smime_verify.xml b/docsrc/xmlsource/funcref/smime_verify.xml
index 725eb6f..e38e6bc 100644
--- a/docsrc/xmlsource/funcref/smime_verify.xml
+++ b/docsrc/xmlsource/funcref/smime_verify.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/smtp_send.xml b/docsrc/xmlsource/funcref/smtp_send.xml
index 8282a88..d6c355c 100644
--- a/docsrc/xmlsource/funcref/smtp_send.xml
+++ b/docsrc/xmlsource/funcref/smtp_send.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_box_structure.xml b/docsrc/xmlsource/funcref/soap_box_structure.xml
index a6619dc..0449691 100644
--- a/docsrc/xmlsource/funcref/soap_box_structure.xml
+++ b/docsrc/xmlsource/funcref/soap_box_structure.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_box_xml_entity.xml b/docsrc/xmlsource/funcref/soap_box_xml_entity.xml
index 88d350c..6be3bd7 100644
--- a/docsrc/xmlsource/funcref/soap_box_xml_entity.xml
+++ b/docsrc/xmlsource/funcref/soap_box_xml_entity.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_call.xml b/docsrc/xmlsource/funcref/soap_call.xml
index 1133c59..ce7bc64 100644
--- a/docsrc/xmlsource/funcref/soap_call.xml
+++ b/docsrc/xmlsource/funcref/soap_call.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_client.xml b/docsrc/xmlsource/funcref/soap_client.xml
index 4e56a31..4343b0f 100644
--- a/docsrc/xmlsource/funcref/soap_client.xml
+++ b/docsrc/xmlsource/funcref/soap_client.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_current_url.xml b/docsrc/xmlsource/funcref/soap_current_url.xml
index 7ad3dcf..49c1eeb 100644
--- a/docsrc/xmlsource/funcref/soap_current_url.xml
+++ b/docsrc/xmlsource/funcref/soap_current_url.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_dt_define.xml b/docsrc/xmlsource/funcref/soap_dt_define.xml
index 3c69c6f..c53ef23 100644
--- a/docsrc/xmlsource/funcref/soap_dt_define.xml
+++ b/docsrc/xmlsource/funcref/soap_dt_define.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_make_error.xml b/docsrc/xmlsource/funcref/soap_make_error.xml
index 3f1f396..bc0e1ac 100644
--- a/docsrc/xmlsource/funcref/soap_make_error.xml
+++ b/docsrc/xmlsource/funcref/soap_make_error.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_print_box.xml b/docsrc/xmlsource/funcref/soap_print_box.xml
index 614be97..32b6ef2 100644
--- a/docsrc/xmlsource/funcref/soap_print_box.xml
+++ b/docsrc/xmlsource/funcref/soap_print_box.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_sdl.xml b/docsrc/xmlsource/funcref/soap_sdl.xml
index 51c0366..f2ef422 100644
--- a/docsrc/xmlsource/funcref/soap_sdl.xml
+++ b/docsrc/xmlsource/funcref/soap_sdl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_server.xml b/docsrc/xmlsource/funcref/soap_server.xml
index def64ef..df96448 100644
--- a/docsrc/xmlsource/funcref/soap_server.xml
+++ b/docsrc/xmlsource/funcref/soap_server.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_wsdl.xml b/docsrc/xmlsource/funcref/soap_wsdl.xml
index d925433..8c896e7 100644
--- a/docsrc/xmlsource/funcref/soap_wsdl.xml
+++ b/docsrc/xmlsource/funcref/soap_wsdl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/soap_wsdl_import.xml b/docsrc/xmlsource/funcref/soap_wsdl_import.xml
index a5a2db6..a83c0d6 100644
--- a/docsrc/xmlsource/funcref/soap_wsdl_import.xml
+++ b/docsrc/xmlsource/funcref/soap_wsdl_import.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/space.xml b/docsrc/xmlsource/funcref/space.xml
index 6f2d6f0..8f5e23c 100644
--- a/docsrc/xmlsource/funcref/space.xml
+++ b/docsrc/xmlsource/funcref/space.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml b/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml
index f2bae6d..933e4b5 100644
--- a/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml
+++ b/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml
@@ -6,7 +6,7 @@
</refmeta>
<refnamediv>
<refname>DB.DBA.SPARQL_RDB2RDF_LIST_TABLES</refname>
- <refpurpose>Returns a vector of names of tables that are used as sources for Linked Data Views.</refpurpose>
+ <refpurpose>Returns a vector of names of tables that are used as sources for RDF Views.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<funcsynopsis id="fsyn_sparql_rdb2rdf_list_tables">
@@ -18,10 +18,10 @@
</refsynopsisdiv>
<refsect1 id="desc_sparql_rdb2rdf_list_tables">
<title>Description</title>
- <para>Returns a vector of names of tables that are used as sources for Linked Data Views. Application
+ <para>Returns a vector of names of tables that are used as sources for RDF Views. Application
developer should decide what to do with each of them - create triggers or do some
application-specific workarounds.</para>
- <para>Note that if some SQL views are used as sources for Linked Data Views and these views does not
+ <para>Note that if some SQL views are used as sources for RDF Views and these views does not
have INSTEAD triggers then workarounds become mandatory for them, not just a choice, because
BEFORE or AFTER triggers on views are not allowed if there is no appropriate INSTEAD trigger.
The mode argument should be zero in current version.</para>
diff --git a/docsrc/xmlsource/funcref/sparql_to_sql_text.xml b/docsrc/xmlsource/funcref/sparql_to_sql_text.xml
index 0860acd..ed45ca0 100644
--- a/docsrc/xmlsource/funcref/sparql_to_sql_text.xml
+++ b/docsrc/xmlsource/funcref/sparql_to_sql_text.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/split_decode.xml b/docsrc/xmlsource/funcref/split_decode.xml
index 64a5450..3197276 100644
--- a/docsrc/xmlsource/funcref/split_decode.xml
+++ b/docsrc/xmlsource/funcref/split_decode.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/spotlight_metadata.xml b/docsrc/xmlsource/funcref/spotlight_metadata.xml
index caf74de..cf9919a 100644
--- a/docsrc/xmlsource/funcref/spotlight_metadata.xml
+++ b/docsrc/xmlsource/funcref/spotlight_metadata.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sprintf.xml b/docsrc/xmlsource/funcref/sprintf.xml
index 3403049..9732025 100644
--- a/docsrc/xmlsource/funcref/sprintf.xml
+++ b/docsrc/xmlsource/funcref/sprintf.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sprintf_inverse.xml b/docsrc/xmlsource/funcref/sprintf_inverse.xml
index 7318970..3f051d9 100644
--- a/docsrc/xmlsource/funcref/sprintf_inverse.xml
+++ b/docsrc/xmlsource/funcref/sprintf_inverse.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sprintf_iri.xml b/docsrc/xmlsource/funcref/sprintf_iri.xml
index a4a2670..bb72f8a 100644
--- a/docsrc/xmlsource/funcref/sprintf_iri.xml
+++ b/docsrc/xmlsource/funcref/sprintf_iri.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml b/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml
index e7d7928..e664868 100644
--- a/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml
+++ b/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sprintf_or_null.xml b/docsrc/xmlsource/funcref/sprintf_or_null.xml
index 21a8f98..3b09f11 100644
--- a/docsrc/xmlsource/funcref/sprintf_or_null.xml
+++ b/docsrc/xmlsource/funcref/sprintf_or_null.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_columns.xml b/docsrc/xmlsource/funcref/sql_columns.xml
index 7d42a5b..56c3666 100644
--- a/docsrc/xmlsource/funcref/sql_columns.xml
+++ b/docsrc/xmlsource/funcref/sql_columns.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_config_data_sources.xml b/docsrc/xmlsource/funcref/sql_config_data_sources.xml
index 958b949..024dea5 100644
--- a/docsrc/xmlsource/funcref/sql_config_data_sources.xml
+++ b/docsrc/xmlsource/funcref/sql_config_data_sources.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_data_sources.xml b/docsrc/xmlsource/funcref/sql_data_sources.xml
index a6a828f..7712d6b 100644
--- a/docsrc/xmlsource/funcref/sql_data_sources.xml
+++ b/docsrc/xmlsource/funcref/sql_data_sources.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_driver_connect.xml b/docsrc/xmlsource/funcref/sql_driver_connect.xml
index 3f59003..af1b07c 100644
--- a/docsrc/xmlsource/funcref/sql_driver_connect.xml
+++ b/docsrc/xmlsource/funcref/sql_driver_connect.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml b/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml
index 004101a..d793476 100644
--- a/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml
+++ b/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml b/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml
index e2a8ef8..d2b66a0 100644
--- a/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml
+++ b/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_gettypeinfo.xml b/docsrc/xmlsource/funcref/sql_gettypeinfo.xml
index 06e1417..4f50de8 100644
--- a/docsrc/xmlsource/funcref/sql_gettypeinfo.xml
+++ b/docsrc/xmlsource/funcref/sql_gettypeinfo.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_primary_keys.xml b/docsrc/xmlsource/funcref/sql_primary_keys.xml
index b0e1a6c..0c74277 100644
--- a/docsrc/xmlsource/funcref/sql_primary_keys.xml
+++ b/docsrc/xmlsource/funcref/sql_primary_keys.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_procedures.xml b/docsrc/xmlsource/funcref/sql_procedures.xml
index b02d95c..2c4b28c 100644
--- a/docsrc/xmlsource/funcref/sql_procedures.xml
+++ b/docsrc/xmlsource/funcref/sql_procedures.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml b/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml
index 1e56d28..231052c 100644
--- a/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml
+++ b/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_special_columns.xml b/docsrc/xmlsource/funcref/sql_special_columns.xml
index c7844e4..f16eddb 100644
--- a/docsrc/xmlsource/funcref/sql_special_columns.xml
+++ b/docsrc/xmlsource/funcref/sql_special_columns.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_statistics.xml b/docsrc/xmlsource/funcref/sql_statistics.xml
index 7add1e6..2dee350 100644
--- a/docsrc/xmlsource/funcref/sql_statistics.xml
+++ b/docsrc/xmlsource/funcref/sql_statistics.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_tables.xml b/docsrc/xmlsource/funcref/sql_tables.xml
index 3042011..81240c1 100644
--- a/docsrc/xmlsource/funcref/sql_tables.xml
+++ b/docsrc/xmlsource/funcref/sql_tables.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_transact.xml b/docsrc/xmlsource/funcref/sql_transact.xml
index a4fce06..b29684f 100644
--- a/docsrc/xmlsource/funcref/sql_transact.xml
+++ b/docsrc/xmlsource/funcref/sql_transact.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_write_file_dsn.xml b/docsrc/xmlsource/funcref/sql_write_file_dsn.xml
index 319bf93..3ad167a 100644
--- a/docsrc/xmlsource/funcref/sql_write_file_dsn.xml
+++ b/docsrc/xmlsource/funcref/sql_write_file_dsn.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml b/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml
index 317161d..225b160 100644
--- a/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml
+++ b/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sqrt.xml b/docsrc/xmlsource/funcref/sqrt.xml
index 48a886c..d1a3a0c 100644
--- a/docsrc/xmlsource/funcref/sqrt.xml
+++ b/docsrc/xmlsource/funcref/sqrt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/starts_with.xml b/docsrc/xmlsource/funcref/starts_with.xml
index b79951b..5be33a2 100644
--- a/docsrc/xmlsource/funcref/starts_with.xml
+++ b/docsrc/xmlsource/funcref/starts_with.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/status.xml b/docsrc/xmlsource/funcref/status.xml
index 50eadb6..893393e 100644
--- a/docsrc/xmlsource/funcref/status.xml
+++ b/docsrc/xmlsource/funcref/status.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/stddev.xml b/docsrc/xmlsource/funcref/stddev.xml
index c650437..012594e 100644
--- a/docsrc/xmlsource/funcref/stddev.xml
+++ b/docsrc/xmlsource/funcref/stddev.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/stddev_pop.xml b/docsrc/xmlsource/funcref/stddev_pop.xml
index 1df97c2..fa833f5 100644
--- a/docsrc/xmlsource/funcref/stddev_pop.xml
+++ b/docsrc/xmlsource/funcref/stddev_pop.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/stddev_samp.xml b/docsrc/xmlsource/funcref/stddev_samp.xml
index 0a6f728..27c954f 100644
--- a/docsrc/xmlsource/funcref/stddev_samp.xml
+++ b/docsrc/xmlsource/funcref/stddev_samp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/strcasestr.xml b/docsrc/xmlsource/funcref/strcasestr.xml
index eb09dce..84c3a9d 100644
--- a/docsrc/xmlsource/funcref/strcasestr.xml
+++ b/docsrc/xmlsource/funcref/strcasestr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/strchr.xml b/docsrc/xmlsource/funcref/strchr.xml
index 21c78a2..2694008 100644
--- a/docsrc/xmlsource/funcref/strchr.xml
+++ b/docsrc/xmlsource/funcref/strchr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/strcontains.xml b/docsrc/xmlsource/funcref/strcontains.xml
index 77f0358..541c235 100644
--- a/docsrc/xmlsource/funcref/strcontains.xml
+++ b/docsrc/xmlsource/funcref/strcontains.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/string_output.xml b/docsrc/xmlsource/funcref/string_output.xml
index 8cbe029..b2caed4 100644
--- a/docsrc/xmlsource/funcref/string_output.xml
+++ b/docsrc/xmlsource/funcref/string_output.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/string_output_flush.xml b/docsrc/xmlsource/funcref/string_output_flush.xml
index b0178f7..368db75 100644
--- a/docsrc/xmlsource/funcref/string_output_flush.xml
+++ b/docsrc/xmlsource/funcref/string_output_flush.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/string_output_gz_compress.xml b/docsrc/xmlsource/funcref/string_output_gz_compress.xml
index 83a1cde..7daf753 100644
--- a/docsrc/xmlsource/funcref/string_output_gz_compress.xml
+++ b/docsrc/xmlsource/funcref/string_output_gz_compress.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/string_output_string.xml b/docsrc/xmlsource/funcref/string_output_string.xml
index a9a1c48..7b29847 100644
--- a/docsrc/xmlsource/funcref/string_output_string.xml
+++ b/docsrc/xmlsource/funcref/string_output_string.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/string_to_file.xml b/docsrc/xmlsource/funcref/string_to_file.xml
index 2017845..c377521 100644
--- a/docsrc/xmlsource/funcref/string_to_file.xml
+++ b/docsrc/xmlsource/funcref/string_to_file.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/stringdate.xml b/docsrc/xmlsource/funcref/stringdate.xml
index 82298a4..a17e4c9 100644
--- a/docsrc/xmlsource/funcref/stringdate.xml
+++ b/docsrc/xmlsource/funcref/stringdate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/stringtime.xml b/docsrc/xmlsource/funcref/stringtime.xml
index edd1e41..c84933b 100644
--- a/docsrc/xmlsource/funcref/stringtime.xml
+++ b/docsrc/xmlsource/funcref/stringtime.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/strrchr.xml b/docsrc/xmlsource/funcref/strrchr.xml
index 13e8519..ce11991 100644
--- a/docsrc/xmlsource/funcref/strrchr.xml
+++ b/docsrc/xmlsource/funcref/strrchr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/strstr.xml b/docsrc/xmlsource/funcref/strstr.xml
index bc43bec..a54bca8 100644
--- a/docsrc/xmlsource/funcref/strstr.xml
+++ b/docsrc/xmlsource/funcref/strstr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sub_schedule.xml b/docsrc/xmlsource/funcref/sub_schedule.xml
index a1660d0..7914e46 100644
--- a/docsrc/xmlsource/funcref/sub_schedule.xml
+++ b/docsrc/xmlsource/funcref/sub_schedule.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/subseq.xml b/docsrc/xmlsource/funcref/subseq.xml
index c44eb78..150a5bc 100644
--- a/docsrc/xmlsource/funcref/subseq.xml
+++ b/docsrc/xmlsource/funcref/subseq.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/substring.xml b/docsrc/xmlsource/funcref/substring.xml
index 39040bf..443cdcb 100644
--- a/docsrc/xmlsource/funcref/substring.xml
+++ b/docsrc/xmlsource/funcref/substring.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sync_repl.xml b/docsrc/xmlsource/funcref/sync_repl.xml
index 780f69e..4b496e3 100644
--- a/docsrc/xmlsource/funcref/sync_repl.xml
+++ b/docsrc/xmlsource/funcref/sync_repl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sys_db_stat.xml b/docsrc/xmlsource/funcref/sys_db_stat.xml
index d3eacb8..fcbb6d0 100644
--- a/docsrc/xmlsource/funcref/sys_db_stat.xml
+++ b/docsrc/xmlsource/funcref/sys_db_stat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sys_lockdown.xml b/docsrc/xmlsource/funcref/sys_lockdown.xml
index 98372de..c0be1f0 100644
--- a/docsrc/xmlsource/funcref/sys_lockdown.xml
+++ b/docsrc/xmlsource/funcref/sys_lockdown.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sys_stat.xml b/docsrc/xmlsource/funcref/sys_stat.xml
index 2bb5b6b..472ff33 100644
--- a/docsrc/xmlsource/funcref/sys_stat.xml
+++ b/docsrc/xmlsource/funcref/sys_stat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sys_stat_analyze.xml b/docsrc/xmlsource/funcref/sys_stat_analyze.xml
index 255c83d..1d05717 100644
--- a/docsrc/xmlsource/funcref/sys_stat_analyze.xml
+++ b/docsrc/xmlsource/funcref/sys_stat_analyze.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/sys_stat_histogram.xml b/docsrc/xmlsource/funcref/sys_stat_histogram.xml
index d5e84ce..87765c0 100644
--- a/docsrc/xmlsource/funcref/sys_stat_histogram.xml
+++ b/docsrc/xmlsource/funcref/sys_stat_histogram.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/system.xml b/docsrc/xmlsource/funcref/system.xml
index bb08375..67f0f43 100644
--- a/docsrc/xmlsource/funcref/system.xml
+++ b/docsrc/xmlsource/funcref/system.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/table_drop_policy.xml b/docsrc/xmlsource/funcref/table_drop_policy.xml
index ef9a5cb..f8f036a 100644
--- a/docsrc/xmlsource/funcref/table_drop_policy.xml
+++ b/docsrc/xmlsource/funcref/table_drop_policy.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/table_set_policy.xml b/docsrc/xmlsource/funcref/table_set_policy.xml
index 07b7724..035972d 100644
--- a/docsrc/xmlsource/funcref/table_set_policy.xml
+++ b/docsrc/xmlsource/funcref/table_set_policy.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml b/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml
index 92cf6fe..1f605e1 100644
--- a/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml
+++ b/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml b/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml
index d182988..3e961d7 100644
--- a/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml
+++ b/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/template.sh b/docsrc/xmlsource/funcref/template.sh
index 2d9f9ec..7058b73 100755
--- a/docsrc/xmlsource/funcref/template.sh
+++ b/docsrc/xmlsource/funcref/template.sh
@@ -1,4 +1,4 @@
-# $Id: template.sh,v 1.4.2.1 2012/03/08 12:55:30 source Exp $
+# $Id: template.sh,v 1.4 2009/02/12 15:15:13 source Exp $
# ----------------------------------------------------------------------
# Fix issues with LOCALE
@@ -25,7 +25,7 @@ cat > "${tgt}" <<EndOfTemplate
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
@@ -40,7 +40,7 @@ cat > "${tgt}" <<EndOfTemplate
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- $Id: template.sh,v 1.4.2.1 2012/03/08 12:55:30 source Exp $
+ $Id: template.sh,v 1.4 2009/02/12 15:15:13 source Exp $
-->
<refentry id="${prefix}_${id}">
<refmeta>
diff --git a/docsrc/xmlsource/funcref/template.xml b/docsrc/xmlsource/funcref/template.xml
index 2e48445..fe54eff 100644
--- a/docsrc/xmlsource/funcref/template.xml
+++ b/docsrc/xmlsource/funcref/template.xml
@@ -49,7 +49,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -69,7 +69,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: template.xml,v 1.1.1.1.2.2 2012/03/08 13:13:48 source Exp $
+ $Id: template.xml,v 1.1.1.1 2006/04/11 17:56:15 source Exp $
+ (C)Copyright 2005 OpenLink Software
-->
<refentry id="fn_">
<refmeta>
diff --git a/docsrc/xmlsource/funcref/tidy_html.xml b/docsrc/xmlsource/funcref/tidy_html.xml
index 3ba3b7b..2958e0c 100644
--- a/docsrc/xmlsource/funcref/tidy_html.xml
+++ b/docsrc/xmlsource/funcref/tidy_html.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/tidy_list_errors.xml b/docsrc/xmlsource/funcref/tidy_list_errors.xml
index 8ed7c4c..b6eecc6 100644
--- a/docsrc/xmlsource/funcref/tidy_list_errors.xml
+++ b/docsrc/xmlsource/funcref/tidy_list_errors.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/timezone.xml b/docsrc/xmlsource/funcref/timezone.xml
index c982040..1e131f5 100644
--- a/docsrc/xmlsource/funcref/timezone.xml
+++ b/docsrc/xmlsource/funcref/timezone.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/tmp_file_name.xml b/docsrc/xmlsource/funcref/tmp_file_name.xml
index cb4e648..7eb929a 100644
--- a/docsrc/xmlsource/funcref/tmp_file_name.xml
+++ b/docsrc/xmlsource/funcref/tmp_file_name.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/trace_off.xml b/docsrc/xmlsource/funcref/trace_off.xml
index d1cde07..2f8503a 100644
--- a/docsrc/xmlsource/funcref/trace_off.xml
+++ b/docsrc/xmlsource/funcref/trace_off.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/trace_on.xml b/docsrc/xmlsource/funcref/trace_on.xml
index 1ba5cf9..7fe41a0 100644
--- a/docsrc/xmlsource/funcref/trace_on.xml
+++ b/docsrc/xmlsource/funcref/trace_on.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/trace_status.xml b/docsrc/xmlsource/funcref/trace_status.xml
index 3a3d2df..23fce75 100644
--- a/docsrc/xmlsource/funcref/trace_status.xml
+++ b/docsrc/xmlsource/funcref/trace_status.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/tree_md5.xml b/docsrc/xmlsource/funcref/tree_md5.xml
index a47c49f..7ae0e9c 100644
--- a/docsrc/xmlsource/funcref/tree_md5.xml
+++ b/docsrc/xmlsource/funcref/tree_md5.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/trigonometric.xml b/docsrc/xmlsource/funcref/trigonometric.xml
index 2daa8ca..99544ae 100644
--- a/docsrc/xmlsource/funcref/trigonometric.xml
+++ b/docsrc/xmlsource/funcref/trigonometric.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/trim.xml b/docsrc/xmlsource/funcref/trim.xml
index 95b28bc..e0208a1 100644
--- a/docsrc/xmlsource/funcref/trim.xml
+++ b/docsrc/xmlsource/funcref/trim.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/txn_error.xml b/docsrc/xmlsource/funcref/txn_error.xml
index f6d3dba..62baff2 100644
--- a/docsrc/xmlsource/funcref/txn_error.xml
+++ b/docsrc/xmlsource/funcref/txn_error.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/txn_killall.xml b/docsrc/xmlsource/funcref/txn_killall.xml
index 17c3c8a..5ea3a04 100644
--- a/docsrc/xmlsource/funcref/txn_killall.xml
+++ b/docsrc/xmlsource/funcref/txn_killall.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/ucase.xml b/docsrc/xmlsource/funcref/ucase.xml
index 9917090..cb227c2 100644
--- a/docsrc/xmlsource/funcref/ucase.xml
+++ b/docsrc/xmlsource/funcref/ucase.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_delete_binding.xml b/docsrc/xmlsource/funcref/uddi_delete_binding.xml
index fd50a06..2546d71 100644
--- a/docsrc/xmlsource/funcref/uddi_delete_binding.xml
+++ b/docsrc/xmlsource/funcref/uddi_delete_binding.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_delete_business.xml b/docsrc/xmlsource/funcref/uddi_delete_business.xml
index b0dc68d..ec1ffb5 100644
--- a/docsrc/xmlsource/funcref/uddi_delete_business.xml
+++ b/docsrc/xmlsource/funcref/uddi_delete_business.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_delete_service.xml b/docsrc/xmlsource/funcref/uddi_delete_service.xml
index 3d568f7..041e734 100644
--- a/docsrc/xmlsource/funcref/uddi_delete_service.xml
+++ b/docsrc/xmlsource/funcref/uddi_delete_service.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_delete_tModel.xml b/docsrc/xmlsource/funcref/uddi_delete_tModel.xml
index 9ddcdfa..7efa3b1 100644
--- a/docsrc/xmlsource/funcref/uddi_delete_tModel.xml
+++ b/docsrc/xmlsource/funcref/uddi_delete_tModel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_discard_authToken.xml b/docsrc/xmlsource/funcref/uddi_discard_authToken.xml
index 345d47b..495de1e 100644
--- a/docsrc/xmlsource/funcref/uddi_discard_authToken.xml
+++ b/docsrc/xmlsource/funcref/uddi_discard_authToken.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_find_binding.xml b/docsrc/xmlsource/funcref/uddi_find_binding.xml
index 6bcd260..a7f8669 100644
--- a/docsrc/xmlsource/funcref/uddi_find_binding.xml
+++ b/docsrc/xmlsource/funcref/uddi_find_binding.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_find_business.xml b/docsrc/xmlsource/funcref/uddi_find_business.xml
index 0ef992c..a7f0196 100644
--- a/docsrc/xmlsource/funcref/uddi_find_business.xml
+++ b/docsrc/xmlsource/funcref/uddi_find_business.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_find_service.xml b/docsrc/xmlsource/funcref/uddi_find_service.xml
index ca6bbb7..7a36025 100644
--- a/docsrc/xmlsource/funcref/uddi_find_service.xml
+++ b/docsrc/xmlsource/funcref/uddi_find_service.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_find_tModel.xml b/docsrc/xmlsource/funcref/uddi_find_tModel.xml
index 4ecabed..7173fd8 100644
--- a/docsrc/xmlsource/funcref/uddi_find_tModel.xml
+++ b/docsrc/xmlsource/funcref/uddi_find_tModel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_authToken.xml b/docsrc/xmlsource/funcref/uddi_get_authToken.xml
index 6cff87c..d054109 100644
--- a/docsrc/xmlsource/funcref/uddi_get_authToken.xml
+++ b/docsrc/xmlsource/funcref/uddi_get_authToken.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_bindingDetail.xml b/docsrc/xmlsource/funcref/uddi_get_bindingDetail.xml
index 2f6e165..931ff33 100644
--- a/docsrc/xmlsource/funcref/uddi_get_bindingDetail.xml
+++ b/docsrc/xmlsource/funcref/uddi_get_bindingDetail.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_businessDetail.xml b/docsrc/xmlsource/funcref/uddi_get_businessDetail.xml
index 10dc56e..a5917b1 100644
--- a/docsrc/xmlsource/funcref/uddi_get_businessDetail.xml
+++ b/docsrc/xmlsource/funcref/uddi_get_businessDetail.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_businessDetailExt.xml b/docsrc/xmlsource/funcref/uddi_get_businessDetailExt.xml
index 52c9607..e7665c0 100644
--- a/docsrc/xmlsource/funcref/uddi_get_businessDetailExt.xml
+++ b/docsrc/xmlsource/funcref/uddi_get_businessDetailExt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_registeredInfo.xml b/docsrc/xmlsource/funcref/uddi_get_registeredInfo.xml
index e7b1832..a2c9a87 100644
--- a/docsrc/xmlsource/funcref/uddi_get_registeredInfo.xml
+++ b/docsrc/xmlsource/funcref/uddi_get_registeredInfo.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_serviceDetail.xml b/docsrc/xmlsource/funcref/uddi_get_serviceDetail.xml
index 1d8c7fc..8364adc 100644
--- a/docsrc/xmlsource/funcref/uddi_get_serviceDetail.xml
+++ b/docsrc/xmlsource/funcref/uddi_get_serviceDetail.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_get_tModelDetail.xml b/docsrc/xmlsource/funcref/uddi_get_tModelDetail.xml
index b947ace..b40a504 100644
--- a/docsrc/xmlsource/funcref/uddi_get_tModelDetail.xml
+++ b/docsrc/xmlsource/funcref/uddi_get_tModelDetail.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_save_binding.xml b/docsrc/xmlsource/funcref/uddi_save_binding.xml
index 4e57085..533917f 100644
--- a/docsrc/xmlsource/funcref/uddi_save_binding.xml
+++ b/docsrc/xmlsource/funcref/uddi_save_binding.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_save_business.xml b/docsrc/xmlsource/funcref/uddi_save_business.xml
index 9345d3a..b57feca 100644
--- a/docsrc/xmlsource/funcref/uddi_save_business.xml
+++ b/docsrc/xmlsource/funcref/uddi_save_business.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_save_service.xml b/docsrc/xmlsource/funcref/uddi_save_service.xml
index 93de445..006c7d0 100644
--- a/docsrc/xmlsource/funcref/uddi_save_service.xml
+++ b/docsrc/xmlsource/funcref/uddi_save_service.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uddi_save_tModel.xml b/docsrc/xmlsource/funcref/uddi_save_tModel.xml
index 1700bcc..a38f3eb 100644
--- a/docsrc/xmlsource/funcref/uddi_save_tModel.xml
+++ b/docsrc/xmlsource/funcref/uddi_save_tModel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/udt_defines_field.xml b/docsrc/xmlsource/funcref/udt_defines_field.xml
index c3eb695..76e9586 100644
--- a/docsrc/xmlsource/funcref/udt_defines_field.xml
+++ b/docsrc/xmlsource/funcref/udt_defines_field.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/udt_get.xml b/docsrc/xmlsource/funcref/udt_get.xml
index f13109d..639ba19 100644
--- a/docsrc/xmlsource/funcref/udt_get.xml
+++ b/docsrc/xmlsource/funcref/udt_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/udt_implements_method.xml b/docsrc/xmlsource/funcref/udt_implements_method.xml
index 1206e5c..19894a7 100644
--- a/docsrc/xmlsource/funcref/udt_implements_method.xml
+++ b/docsrc/xmlsource/funcref/udt_implements_method.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/udt_instance_of.xml b/docsrc/xmlsource/funcref/udt_instance_of.xml
index b5291f5..956fdc0 100644
--- a/docsrc/xmlsource/funcref/udt_instance_of.xml
+++ b/docsrc/xmlsource/funcref/udt_instance_of.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/udt_set.xml b/docsrc/xmlsource/funcref/udt_set.xml
index bdbad5b..35bc3dc 100644
--- a/docsrc/xmlsource/funcref/udt_set.xml
+++ b/docsrc/xmlsource/funcref/udt_set.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/unimport_clr.xml b/docsrc/xmlsource/funcref/unimport_clr.xml
index d066458..6360a37 100644
--- a/docsrc/xmlsource/funcref/unimport_clr.xml
+++ b/docsrc/xmlsource/funcref/unimport_clr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/unimport_jar.xml b/docsrc/xmlsource/funcref/unimport_jar.xml
index b0111cc..b9d98ce 100644
--- a/docsrc/xmlsource/funcref/unimport_jar.xml
+++ b/docsrc/xmlsource/funcref/unimport_jar.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/updateXML.xml b/docsrc/xmlsource/funcref/updateXML.xml
index 85bfc58..1bed598 100644
--- a/docsrc/xmlsource/funcref/updateXML.xml
+++ b/docsrc/xmlsource/funcref/updateXML.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/upper.xml b/docsrc/xmlsource/funcref/upper.xml
index c6f6591..7e9f6d5 100644
--- a/docsrc/xmlsource/funcref/upper.xml
+++ b/docsrc/xmlsource/funcref/upper.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/urlrewrite_create_regex_rule.xml b/docsrc/xmlsource/funcref/urlrewrite_create_regex_rule.xml
index 773a9f6..003157f 100644
--- a/docsrc/xmlsource/funcref/urlrewrite_create_regex_rule.xml
+++ b/docsrc/xmlsource/funcref/urlrewrite_create_regex_rule.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: urlrewrite_create_regex_rule.xml,v 1.3.2.3 2012/03/07 15:29:03 source Exp $
+ $Id: urlrewrite_create_regex_rule.xml,v 1.3.2.2 2010/01/06 21:33:50 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2008 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
diff --git a/docsrc/xmlsource/funcref/user_change_password.xml b/docsrc/xmlsource/funcref/user_change_password.xml
index 7cea243..e4ee02d 100644
--- a/docsrc/xmlsource/funcref/user_change_password.xml
+++ b/docsrc/xmlsource/funcref/user_change_password.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_create.xml b/docsrc/xmlsource/funcref/user_create.xml
index b6c4762..0cbc626 100644
--- a/docsrc/xmlsource/funcref/user_create.xml
+++ b/docsrc/xmlsource/funcref/user_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_drop.xml b/docsrc/xmlsource/funcref/user_drop.xml
index 25afc2a..86ba496 100644
--- a/docsrc/xmlsource/funcref/user_drop.xml
+++ b/docsrc/xmlsource/funcref/user_drop.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_get_option.xml b/docsrc/xmlsource/funcref/user_get_option.xml
index b094303..32f0d48 100644
--- a/docsrc/xmlsource/funcref/user_get_option.xml
+++ b/docsrc/xmlsource/funcref/user_get_option.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_grant_role.xml b/docsrc/xmlsource/funcref/user_grant_role.xml
index 040ba87..8284d6d 100644
--- a/docsrc/xmlsource/funcref/user_grant_role.xml
+++ b/docsrc/xmlsource/funcref/user_grant_role.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_key_load.xml b/docsrc/xmlsource/funcref/user_key_load.xml
index 1828f8c..ed7cae9 100644
--- a/docsrc/xmlsource/funcref/user_key_load.xml
+++ b/docsrc/xmlsource/funcref/user_key_load.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_revoke_role.xml b/docsrc/xmlsource/funcref/user_revoke_role.xml
index 3008d8f..cf157e6 100644
--- a/docsrc/xmlsource/funcref/user_revoke_role.xml
+++ b/docsrc/xmlsource/funcref/user_revoke_role.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_role_create.xml b/docsrc/xmlsource/funcref/user_role_create.xml
index 39123e8..6de97fa 100644
--- a/docsrc/xmlsource/funcref/user_role_create.xml
+++ b/docsrc/xmlsource/funcref/user_role_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_role_drop.xml b/docsrc/xmlsource/funcref/user_role_drop.xml
index f6c6f14..67e112b 100644
--- a/docsrc/xmlsource/funcref/user_role_drop.xml
+++ b/docsrc/xmlsource/funcref/user_role_drop.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_set_option.xml b/docsrc/xmlsource/funcref/user_set_option.xml
index 215becd..5f445b3 100644
--- a/docsrc/xmlsource/funcref/user_set_option.xml
+++ b/docsrc/xmlsource/funcref/user_set_option.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_set_password.xml b/docsrc/xmlsource/funcref/user_set_password.xml
index c5ba731..533c679 100644
--- a/docsrc/xmlsource/funcref/user_set_password.xml
+++ b/docsrc/xmlsource/funcref/user_set_password.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/user_set_qualifier.xml b/docsrc/xmlsource/funcref/user_set_qualifier.xml
index 7ec1ce2..764cfb2 100644
--- a/docsrc/xmlsource/funcref/user_set_qualifier.xml
+++ b/docsrc/xmlsource/funcref/user_set_qualifier.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/username.xml b/docsrc/xmlsource/funcref/username.xml
index 2ddd629..67362df 100644
--- a/docsrc/xmlsource/funcref/username.xml
+++ b/docsrc/xmlsource/funcref/username.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uudecode.xml b/docsrc/xmlsource/funcref/uudecode.xml
index 1a4ad15..2732fd1 100644
--- a/docsrc/xmlsource/funcref/uudecode.xml
+++ b/docsrc/xmlsource/funcref/uudecode.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uuencode.xml b/docsrc/xmlsource/funcref/uuencode.xml
index 05fdeca..91f2232 100644
--- a/docsrc/xmlsource/funcref/uuencode.xml
+++ b/docsrc/xmlsource/funcref/uuencode.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/uuvalidate.xml b/docsrc/xmlsource/funcref/uuvalidate.xml
index 515a346..b74d1ee 100644
--- a/docsrc/xmlsource/funcref/uuvalidate.xml
+++ b/docsrc/xmlsource/funcref/uuvalidate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vacuum.xml b/docsrc/xmlsource/funcref/vacuum.xml
index 9d56bec..ba57a64 100644
--- a/docsrc/xmlsource/funcref/vacuum.xml
+++ b/docsrc/xmlsource/funcref/vacuum.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vad_check.xml b/docsrc/xmlsource/funcref/vad_check.xml
index 4ab9524..e9ab9dd 100644
--- a/docsrc/xmlsource/funcref/vad_check.xml
+++ b/docsrc/xmlsource/funcref/vad_check.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vad_check_installability.xml b/docsrc/xmlsource/funcref/vad_check_installability.xml
index 8a1b299..f226a87 100644
--- a/docsrc/xmlsource/funcref/vad_check_installability.xml
+++ b/docsrc/xmlsource/funcref/vad_check_installability.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vad_check_uninstallability.xml b/docsrc/xmlsource/funcref/vad_check_uninstallability.xml
index 87ecc66..628fbef 100644
--- a/docsrc/xmlsource/funcref/vad_check_uninstallability.xml
+++ b/docsrc/xmlsource/funcref/vad_check_uninstallability.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vad_fail_check.xml b/docsrc/xmlsource/funcref/vad_fail_check.xml
index 811f5b6..03513ad 100644
--- a/docsrc/xmlsource/funcref/vad_fail_check.xml
+++ b/docsrc/xmlsource/funcref/vad_fail_check.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vad_install.xml b/docsrc/xmlsource/funcref/vad_install.xml
index a3588c5..cf80645 100644
--- a/docsrc/xmlsource/funcref/vad_install.xml
+++ b/docsrc/xmlsource/funcref/vad_install.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vad_load_file.xml b/docsrc/xmlsource/funcref/vad_load_file.xml
index 81962ac..a00b9a7 100644
--- a/docsrc/xmlsource/funcref/vad_load_file.xml
+++ b/docsrc/xmlsource/funcref/vad_load_file.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -74,7 +74,6 @@
</refsect1>
-->
<refsect1 id="seealso"><title>See Also</title>
- <para><link linkend="fn_vad_load_sql_file">vad_load_sql_file()</link></para>
<para><link linkend="fn_vad_check_uninstallability">vad_check_uninstallability()</link></para>
<para><link linkend="fn_vad_check_installability">vad_check_installability()</link></para>
<para><link linkend="fn_vad_install">vad_install()</link></para>
diff --git a/docsrc/xmlsource/funcref/vad_load_sql_file.xml b/docsrc/xmlsource/funcref/vad_load_sql_file.xml
deleted file mode 100644
index 1a86126..0000000
--- a/docsrc/xmlsource/funcref/vad_load_sql_file.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- -
- - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- - project.
- -
- - Copyright (C) 1998-2012 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
- -
- -
--->
-<refentry id="fn_vad_load_sql_file">
- <refmeta>
- <refentrytitle>VAD_LOAD_SQL_FILE</refentrytitle>
- <refmiscinfo>vad</refmiscinfo>
- </refmeta>
- <refnamediv>
- <refname>VAD_LOAD_SQL_FILE</refname>
- <refpurpose>Loads SQL file and executes its content's statements.</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <funcsynopsis id="fsyn_vad_load_sql_file">
- <funcprototype id="fproto_vad_load_sql_file">
- <funcdef>DB.DBA.<function>VAD_LOAD_SQL_FILE</function></funcdef>
- <paramdef>in <parameter>sql_file_name</parameter> varchar</paramdef>
- <paramdef>in <parameter>grouping</parameter> integer</paramdef>
- <paramdef>in <parameter>report_errors</parameter> varchar</paramdef>
- <paramdef>in <parameter>is_dav</parameter> integer</paramdef>
- </funcprototype>
- </funcsynopsis>
- </refsynopsisdiv>
- <refsect1 id="desc"><title>Description</title>
- <para>Loads SQL file ( can be regular file or DAV resource ) and then splits its content
- into single statements and executes them one by one. Along the process, the function
- makes needed reports and changes 'VAD_errcount' registry variable.</para>
- </refsect1>
- <refsect1 id="params"><title>Parameters</title>
- <refsect2><title>sql_file_name</title>
- <para>For files, this parameter is either absolute or relative to server's working directory.
- The directory should be readable according to the virtuoso.ini settings. For DAV resources,
- the sql_file_name is always absolute: ('/DAV/<folder-name>...').
- </para>
- </refsect2>
- <refsect2><title>grouping</title>
- <para>Always set this parameter to 1.</para>
- </refsect2>
- <refsect2><title>grouping</title>
- <para>The supported values for this parameter are:</para>
- <itemizedlist mark="bullet">
- <listitem><emphasis>'report'</emphasis> - to log errors and continue or:</listitem>
- <listitem><emphasis>'signal'</emphasis> - at the very first error, break the loading
- and resignal it.</listitem>
- </itemizedlist>
- </refsect2>
- <refsect2><title>is_dav</title>
- <para>This parameter is 0 for plain file and 1 for resource loaded in DAV.
- </para>
- </refsect2>
- </refsect1>
-
- <refsect1 id="examples_vad_load_sql_file"><title>Examples</title>
- <example id="ex_vad_load_sql_file_1"><title></title>
- <para></para>
-<programlisting><![CDATA[
-DB.DBA.VAD_LOAD_SQL_FILE ('./conductor/vdir_helper.sql', 1, 'report', 0);
-]]></programlisting>
- </example>
- </refsect1>
- <refsect1 id="seealso"><title>See Also</title>
- <para><link linkend="fn_vad_load_file">vad_load_file()</link></para>
- <para><link linkend="fn_vad_check_uninstallability">vad_check_uninstallability()</link></para>
- <para><link linkend="fn_vad_check_installability">vad_check_installability()</link></para>
- <para><link linkend="fn_vad_install">vad_install()</link></para>
- <para><link linkend="fn_vad_pack">vad_pack()</link></para>
- <para><link linkend="fn_vad_safe_exec">vad_safe_exec()</link></para>
- <para><link linkend="fn_vad_uninstall">vad_uninstall()</link></para>
- <para><link linkend="fn_vad_fail_check">vad_fail_check()</link></para>
- <para><link linkend="fn_vad_check">vad_check()</link></para>
- </refsect1>
-</refentry>
-
diff --git a/docsrc/xmlsource/funcref/vad_pack.xml b/docsrc/xmlsource/funcref/vad_pack.xml
index b1ef34a..d759305 100644
--- a/docsrc/xmlsource/funcref/vad_pack.xml
+++ b/docsrc/xmlsource/funcref/vad_pack.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vad_safe_exec.xml b/docsrc/xmlsource/funcref/vad_safe_exec.xml
index cf57042..ca5cd54 100644
--- a/docsrc/xmlsource/funcref/vad_safe_exec.xml
+++ b/docsrc/xmlsource/funcref/vad_safe_exec.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vad_uninstall.xml b/docsrc/xmlsource/funcref/vad_uninstall.xml
index a72b64a..f2deb62 100644
--- a/docsrc/xmlsource/funcref/vad_uninstall.xml
+++ b/docsrc/xmlsource/funcref/vad_uninstall.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/var.xml b/docsrc/xmlsource/funcref/var.xml
index 3d99dc0..8efb8fa 100644
--- a/docsrc/xmlsource/funcref/var.xml
+++ b/docsrc/xmlsource/funcref/var.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/var_pop.xml b/docsrc/xmlsource/funcref/var_pop.xml
index 1d317b0..36179fe 100644
--- a/docsrc/xmlsource/funcref/var_pop.xml
+++ b/docsrc/xmlsource/funcref/var_pop.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/var_samp.xml b/docsrc/xmlsource/funcref/var_samp.xml
index b4d92fb..7da7a1d 100644
--- a/docsrc/xmlsource/funcref/var_samp.xml
+++ b/docsrc/xmlsource/funcref/var_samp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vd_remote_data_source.xml b/docsrc/xmlsource/funcref/vd_remote_data_source.xml
index 37d3fb5..dc9ede2 100644
--- a/docsrc/xmlsource/funcref/vd_remote_data_source.xml
+++ b/docsrc/xmlsource/funcref/vd_remote_data_source.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vd_remote_proc_wrapper.xml b/docsrc/xmlsource/funcref/vd_remote_proc_wrapper.xml
index 59dec04..2b089b0 100644
--- a/docsrc/xmlsource/funcref/vd_remote_proc_wrapper.xml
+++ b/docsrc/xmlsource/funcref/vd_remote_proc_wrapper.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vd_remote_table.xml b/docsrc/xmlsource/funcref/vd_remote_table.xml
index b6e4114..f335932 100644
--- a/docsrc/xmlsource/funcref/vd_remote_table.xml
+++ b/docsrc/xmlsource/funcref/vd_remote_table.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vd_statistics.xml b/docsrc/xmlsource/funcref/vd_statistics.xml
index 088e579..769328a 100644
--- a/docsrc/xmlsource/funcref/vd_statistics.xml
+++ b/docsrc/xmlsource/funcref/vd_statistics.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vdd_disconnect_data_source.xml b/docsrc/xmlsource/funcref/vdd_disconnect_data_source.xml
index f707980..b9b2273 100644
--- a/docsrc/xmlsource/funcref/vdd_disconnect_data_source.xml
+++ b/docsrc/xmlsource/funcref/vdd_disconnect_data_source.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vdd_measure_rpc_time.xml b/docsrc/xmlsource/funcref/vdd_measure_rpc_time.xml
index 286882e..1783fca 100644
--- a/docsrc/xmlsource/funcref/vdd_measure_rpc_time.xml
+++ b/docsrc/xmlsource/funcref/vdd_measure_rpc_time.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vector.xml b/docsrc/xmlsource/funcref/vector.xml
index 2d5dd4c..efe5fc0 100644
--- a/docsrc/xmlsource/funcref/vector.xml
+++ b/docsrc/xmlsource/funcref/vector.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vector_concat.xml b/docsrc/xmlsource/funcref/vector_concat.xml
index 2426c69..8669442 100644
--- a/docsrc/xmlsource/funcref/vector_concat.xml
+++ b/docsrc/xmlsource/funcref/vector_concat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vhost_define.xml b/docsrc/xmlsource/funcref/vhost_define.xml
index fec9002..26fcf17 100644
--- a/docsrc/xmlsource/funcref/vhost_define.xml
+++ b/docsrc/xmlsource/funcref/vhost_define.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vhost_remove.xml b/docsrc/xmlsource/funcref/vhost_remove.xml
index 33f2c11..c3efa03 100644
--- a/docsrc/xmlsource/funcref/vhost_remove.xml
+++ b/docsrc/xmlsource/funcref/vhost_remove.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/virtuoso_ini_path.xml b/docsrc/xmlsource/funcref/virtuoso_ini_path.xml
index 1c9c2e6..e990016 100644
--- a/docsrc/xmlsource/funcref/virtuoso_ini_path.xml
+++ b/docsrc/xmlsource/funcref/virtuoso_ini_path.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vsp_calculate_digest.xml b/docsrc/xmlsource/funcref/vsp_calculate_digest.xml
index ccc7224..a904829 100644
--- a/docsrc/xmlsource/funcref/vsp_calculate_digest.xml
+++ b/docsrc/xmlsource/funcref/vsp_calculate_digest.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vt_batch.xml b/docsrc/xmlsource/funcref/vt_batch.xml
index 06773a5..cead7aa 100644
--- a/docsrc/xmlsource/funcref/vt_batch.xml
+++ b/docsrc/xmlsource/funcref/vt_batch.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vt_batch_d_id.xml b/docsrc/xmlsource/funcref/vt_batch_d_id.xml
index c35ce43..87a2fa6 100644
--- a/docsrc/xmlsource/funcref/vt_batch_d_id.xml
+++ b/docsrc/xmlsource/funcref/vt_batch_d_id.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vt_batch_feed.xml b/docsrc/xmlsource/funcref/vt_batch_feed.xml
index dba55f2..ab09be5 100644
--- a/docsrc/xmlsource/funcref/vt_batch_feed.xml
+++ b/docsrc/xmlsource/funcref/vt_batch_feed.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vt_batch_feed_offband.xml b/docsrc/xmlsource/funcref/vt_batch_feed_offband.xml
index ec3fadb..9132b4f 100644
--- a/docsrc/xmlsource/funcref/vt_batch_feed_offband.xml
+++ b/docsrc/xmlsource/funcref/vt_batch_feed_offband.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vt_batch_update.xml b/docsrc/xmlsource/funcref/vt_batch_update.xml
index 62a8731..6ee57c4 100644
--- a/docsrc/xmlsource/funcref/vt_batch_update.xml
+++ b/docsrc/xmlsource/funcref/vt_batch_update.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vt_create_text_index.xml b/docsrc/xmlsource/funcref/vt_create_text_index.xml
index aa30f5d..1783a01 100644
--- a/docsrc/xmlsource/funcref/vt_create_text_index.xml
+++ b/docsrc/xmlsource/funcref/vt_create_text_index.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -43,7 +43,6 @@
<paramdef>in <parameter>use_hook_function</parameter> integer</paramdef>
<paramdef><optional>in <parameter>language_name</parameter> varchar</optional></paramdef>
<paramdef><optional>in <parameter>encoding_name</parameter> integer</optional></paramdef>
- <paramdef><optional>in <parameter>silent</parameter> integer</optional></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
@@ -162,9 +161,6 @@ index source texts.
If the parameter is omitted or is equal to '*ini*' string, indexing routines
will use the encoding specified by charset of the RDBMS connection that is
in use when the index is created.</para></refsect2>
- <refsect2><title>silent</title>
- <para>Flag with values 1/0. Default is 0. When set to 0, the function signals error if the text index exists.
- If set to 1, the function signals no error if the text index exists.</para></refsect2>
</refsect1>
<refsect1 id="ret"><title>Return Types</title><para></para></refsect1>
<!--
diff --git a/docsrc/xmlsource/funcref/vt_drop_ftt.xml b/docsrc/xmlsource/funcref/vt_drop_ftt.xml
index d654d46..5066ecf 100644
--- a/docsrc/xmlsource/funcref/vt_drop_ftt.xml
+++ b/docsrc/xmlsource/funcref/vt_drop_ftt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/vt_is_noise.xml b/docsrc/xmlsource/funcref/vt_is_noise.xml
index e1441fc..1f69a17 100644
--- a/docsrc/xmlsource/funcref/vt_is_noise.xml
+++ b/docsrc/xmlsource/funcref/vt_is_noise.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/week.xml b/docsrc/xmlsource/funcref/week.xml
index 02356de..c92400d 100644
--- a/docsrc/xmlsource/funcref/week.xml
+++ b/docsrc/xmlsource/funcref/week.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/wsdl_import_udt.xml b/docsrc/xmlsource/funcref/wsdl_import_udt.xml
index 4db849e..fb54889 100644
--- a/docsrc/xmlsource/funcref/wsdl_import_udt.xml
+++ b/docsrc/xmlsource/funcref/wsdl_import_udt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/wst_cli.xml b/docsrc/xmlsource/funcref/wst_cli.xml
index f32518d..405225e 100644
--- a/docsrc/xmlsource/funcref/wst_cli.xml
+++ b/docsrc/xmlsource/funcref/wst_cli.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/x509_certificate_verify.xml b/docsrc/xmlsource/funcref/x509_certificate_verify.xml
index 372cf77..1305aca 100644
--- a/docsrc/xmlsource/funcref/x509_certificate_verify.xml
+++ b/docsrc/xmlsource/funcref/x509_certificate_verify.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/x509_from_csr.xml b/docsrc/xmlsource/funcref/x509_from_csr.xml
index 0c000a3..d744b47 100644
--- a/docsrc/xmlsource/funcref/x509_from_csr.xml
+++ b/docsrc/xmlsource/funcref/x509_from_csr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_SPKI_read.xml b/docsrc/xmlsource/funcref/xenc_SPKI_read.xml
index dcddf06..1e4e8e1 100644
--- a/docsrc/xmlsource/funcref/xenc_SPKI_read.xml
+++ b/docsrc/xmlsource/funcref/xenc_SPKI_read.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_X509_certificate_serialize.xml b/docsrc/xmlsource/funcref/xenc_X509_certificate_serialize.xml
index fc1ea7c..6090e8a 100644
--- a/docsrc/xmlsource/funcref/xenc_X509_certificate_serialize.xml
+++ b/docsrc/xmlsource/funcref/xenc_X509_certificate_serialize.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_bn2dec.xml b/docsrc/xmlsource/funcref/xenc_bn2dec.xml
index b5871a0..d249a39 100644
--- a/docsrc/xmlsource/funcref/xenc_bn2dec.xml
+++ b/docsrc/xmlsource/funcref/xenc_bn2dec.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_decrypt_soap.xml b/docsrc/xmlsource/funcref/xenc_decrypt_soap.xml
index d765e1c..d57bdd6 100644
--- a/docsrc/xmlsource/funcref/xenc_decrypt_soap.xml
+++ b/docsrc/xmlsource/funcref/xenc_decrypt_soap.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_delete_temp_keys.xml b/docsrc/xmlsource/funcref/xenc_delete_temp_keys.xml
index cbdd7b4..2a14e76 100644
--- a/docsrc/xmlsource/funcref/xenc_delete_temp_keys.xml
+++ b/docsrc/xmlsource/funcref/xenc_delete_temp_keys.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_encrypt.xml b/docsrc/xmlsource/funcref/xenc_encrypt.xml
index 858cc34..be4dd7a 100644
--- a/docsrc/xmlsource/funcref/xenc_encrypt.xml
+++ b/docsrc/xmlsource/funcref/xenc_encrypt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_get_key_algo.xml b/docsrc/xmlsource/funcref/xenc_get_key_algo.xml
index 07ee152..9344ee9 100644
--- a/docsrc/xmlsource/funcref/xenc_get_key_algo.xml
+++ b/docsrc/xmlsource/funcref/xenc_get_key_algo.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_get_key_identifier.xml b/docsrc/xmlsource/funcref/xenc_get_key_identifier.xml
index 620402c..a6e31d7 100644
--- a/docsrc/xmlsource/funcref/xenc_get_key_identifier.xml
+++ b/docsrc/xmlsource/funcref/xenc_get_key_identifier.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_3DES_read.xml b/docsrc/xmlsource/funcref/xenc_key_3DES_read.xml
index e182e1b..ecd9b47 100644
--- a/docsrc/xmlsource/funcref/xenc_key_3DES_read.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_3DES_read.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_3des_create.xml b/docsrc/xmlsource/funcref/xenc_key_3des_create.xml
index fe21332..bd3b28b 100644
--- a/docsrc/xmlsource/funcref/xenc_key_3des_create.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_3des_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_3des_rand_create.xml b/docsrc/xmlsource/funcref/xenc_key_3des_rand_create.xml
index 7e92739..6c2ba66 100644
--- a/docsrc/xmlsource/funcref/xenc_key_3des_rand_create.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_3des_rand_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_DSA_read.xml b/docsrc/xmlsource/funcref/xenc_key_DSA_read.xml
index b45d057..e1fb3fe 100644
--- a/docsrc/xmlsource/funcref/xenc_key_DSA_read.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_DSA_read.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_RSA_read.xml b/docsrc/xmlsource/funcref/xenc_key_RSA_read.xml
index 68425d9..d010ebf 100644
--- a/docsrc/xmlsource/funcref/xenc_key_RSA_read.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_RSA_read.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_aes_create.xml b/docsrc/xmlsource/funcref/xenc_key_aes_create.xml
index 75f4537..b6d814c 100644
--- a/docsrc/xmlsource/funcref/xenc_key_aes_create.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_aes_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_aes_rand_create.xml b/docsrc/xmlsource/funcref/xenc_key_aes_rand_create.xml
index 3f4dffa..0e30483 100644
--- a/docsrc/xmlsource/funcref/xenc_key_aes_rand_create.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_aes_rand_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_create_cert.xml b/docsrc/xmlsource/funcref/xenc_key_create_cert.xml
index a9cdad0..a727e5b 100644
--- a/docsrc/xmlsource/funcref/xenc_key_create_cert.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_create_cert.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_dsa_create.xml b/docsrc/xmlsource/funcref/xenc_key_dsa_create.xml
index 0f471bb..faf8ffc 100644
--- a/docsrc/xmlsource/funcref/xenc_key_dsa_create.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_dsa_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_exists.xml b/docsrc/xmlsource/funcref/xenc_key_exists.xml
index 543c301..e9d2a58 100644
--- a/docsrc/xmlsource/funcref/xenc_key_exists.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_exists.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_inst_create.xml b/docsrc/xmlsource/funcref/xenc_key_inst_create.xml
index 8d6bc45..e1c1d43 100644
--- a/docsrc/xmlsource/funcref/xenc_key_inst_create.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_inst_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_remove.xml b/docsrc/xmlsource/funcref/xenc_key_remove.xml
index 0550611..c998cd3 100644
--- a/docsrc/xmlsource/funcref/xenc_key_remove.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_remove.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_rsa_create.xml b/docsrc/xmlsource/funcref/xenc_key_rsa_create.xml
index 57bc63e..993304d 100644
--- a/docsrc/xmlsource/funcref/xenc_key_rsa_create.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_rsa_create.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_key_serialize.xml b/docsrc/xmlsource/funcref/xenc_key_serialize.xml
index 1e5c3d7..bcd0407 100644
--- a/docsrc/xmlsource/funcref/xenc_key_serialize.xml
+++ b/docsrc/xmlsource/funcref/xenc_key_serialize.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_pem_export.xml b/docsrc/xmlsource/funcref/xenc_pem_export.xml
index 9d4a110..c86476c 100644
--- a/docsrc/xmlsource/funcref/xenc_pem_export.xml
+++ b/docsrc/xmlsource/funcref/xenc_pem_export.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_pkcs12_export.xml b/docsrc/xmlsource/funcref/xenc_pkcs12_export.xml
index f4814f8..77356a2 100644
--- a/docsrc/xmlsource/funcref/xenc_pkcs12_export.xml
+++ b/docsrc/xmlsource/funcref/xenc_pkcs12_export.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_set_primary_key.xml b/docsrc/xmlsource/funcref/xenc_set_primary_key.xml
index f3dbbaa..b942a50 100644
--- a/docsrc/xmlsource/funcref/xenc_set_primary_key.xml
+++ b/docsrc/xmlsource/funcref/xenc_set_primary_key.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_x509_csr_generate.xml b/docsrc/xmlsource/funcref/xenc_x509_csr_generate.xml
index b1c21ce..c6f40fe 100644
--- a/docsrc/xmlsource/funcref/xenc_x509_csr_generate.xml
+++ b/docsrc/xmlsource/funcref/xenc_x509_csr_generate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_x509_generate.xml b/docsrc/xmlsource/funcref/xenc_x509_generate.xml
index 5f385ec..3e338ab 100644
--- a/docsrc/xmlsource/funcref/xenc_x509_generate.xml
+++ b/docsrc/xmlsource/funcref/xenc_x509_generate.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xenc_x509_ss_generate.xml b/docsrc/xmlsource/funcref/xenc_x509_ss_generate.xml
index 8ca9459..a597c4e 100644
--- a/docsrc/xmlsource/funcref/xenc_x509_ss_generate.xml
+++ b/docsrc/xmlsource/funcref/xenc_x509_ss_generate.xml
@@ -4,7 +4,7 @@
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.deleteMultipleFiles.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.deleteMultipleFiles.xml
index 9f823c9..fea0a4d 100644
--- a/docsrc/xmlsource/funcref/xmlStorageSystem.deleteMultipleFiles.xml
+++ b/docsrc/xmlsource/funcref/xmlStorageSystem.deleteMultipleFiles.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.getServerCapabilities.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.getServerCapabilities.xml
index d7f6cd5..159c7f4 100644
--- a/docsrc/xmlsource/funcref/xmlStorageSystem.getServerCapabilities.xml
+++ b/docsrc/xmlsource/funcref/xmlStorageSystem.getServerCapabilities.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.mailPasswordToUser.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.mailPasswordToUser.xml
index a5963f8..05d8e1a 100644
--- a/docsrc/xmlsource/funcref/xmlStorageSystem.mailPasswordToUser.xml
+++ b/docsrc/xmlsource/funcref/xmlStorageSystem.mailPasswordToUser.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.registerUser.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.registerUser.xml
index 821ee0e..4859372 100644
--- a/docsrc/xmlsource/funcref/xmlStorageSystem.registerUser.xml
+++ b/docsrc/xmlsource/funcref/xmlStorageSystem.registerUser.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xmlStorageSystem.saveMultipleFiles.xml b/docsrc/xmlsource/funcref/xmlStorageSystem.saveMultipleFiles.xml
index bfe36c4..d063ac4 100644
--- a/docsrc/xmlsource/funcref/xmlStorageSystem.saveMultipleFiles.xml
+++ b/docsrc/xmlsource/funcref/xmlStorageSystem.saveMultipleFiles.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_auto.xml b/docsrc/xmlsource/funcref/xml_auto.xml
index a7d21d3..1fa55df 100644
--- a/docsrc/xmlsource/funcref/xml_auto.xml
+++ b/docsrc/xmlsource/funcref/xml_auto.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_auto_dtd.xml b/docsrc/xmlsource/funcref/xml_auto_dtd.xml
index 4182ac3..6e1807d 100644
--- a/docsrc/xmlsource/funcref/xml_auto_dtd.xml
+++ b/docsrc/xmlsource/funcref/xml_auto_dtd.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_auto_schema.xml b/docsrc/xmlsource/funcref/xml_auto_schema.xml
index 4a419bf..b229eca 100644
--- a/docsrc/xmlsource/funcref/xml_auto_schema.xml
+++ b/docsrc/xmlsource/funcref/xml_auto_schema.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_create_tables_from_mapping_schema_decl.xml b/docsrc/xmlsource/funcref/xml_create_tables_from_mapping_schema_decl.xml
index a8e91fc..b003728 100644
--- a/docsrc/xmlsource/funcref/xml_create_tables_from_mapping_schema_decl.xml
+++ b/docsrc/xmlsource/funcref/xml_create_tables_from_mapping_schema_decl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_cut.xml b/docsrc/xmlsource/funcref/xml_cut.xml
index 57c1493..9ee80e4 100644
--- a/docsrc/xmlsource/funcref/xml_cut.xml
+++ b/docsrc/xmlsource/funcref/xml_cut.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_doc_output_option.xml b/docsrc/xmlsource/funcref/xml_doc_output_option.xml
index e315f23..f2f303e 100644
--- a/docsrc/xmlsource/funcref/xml_doc_output_option.xml
+++ b/docsrc/xmlsource/funcref/xml_doc_output_option.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_load_mapping_schema_decl.xml b/docsrc/xmlsource/funcref/xml_load_mapping_schema_decl.xml
index 2e8f5fe..0b6d72d 100644
--- a/docsrc/xmlsource/funcref/xml_load_mapping_schema_decl.xml
+++ b/docsrc/xmlsource/funcref/xml_load_mapping_schema_decl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_load_schema_decl.xml b/docsrc/xmlsource/funcref/xml_load_schema_decl.xml
index 88f6c7e..ea18761 100644
--- a/docsrc/xmlsource/funcref/xml_load_schema_decl.xml
+++ b/docsrc/xmlsource/funcref/xml_load_schema_decl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_namespace_scope.xml b/docsrc/xmlsource/funcref/xml_namespace_scope.xml
index 47ddc22..583b1ef 100644
--- a/docsrc/xmlsource/funcref/xml_namespace_scope.xml
+++ b/docsrc/xmlsource/funcref/xml_namespace_scope.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_path.xml b/docsrc/xmlsource/funcref/xml_path.xml
index 388c704..960951e 100644
--- a/docsrc/xmlsource/funcref/xml_path.xml
+++ b/docsrc/xmlsource/funcref/xml_path.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_persistent.xml b/docsrc/xmlsource/funcref/xml_persistent.xml
index c533117..2dfe5d6 100644
--- a/docsrc/xmlsource/funcref/xml_persistent.xml
+++ b/docsrc/xmlsource/funcref/xml_persistent.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_remove_ns_by_prefix.xml b/docsrc/xmlsource/funcref/xml_remove_ns_by_prefix.xml
index 755f266..3c3956e 100644
--- a/docsrc/xmlsource/funcref/xml_remove_ns_by_prefix.xml
+++ b/docsrc/xmlsource/funcref/xml_remove_ns_by_prefix.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_set_ns_decl.xml b/docsrc/xmlsource/funcref/xml_set_ns_decl.xml
index e1b715d..dad1be7 100644
--- a/docsrc/xmlsource/funcref/xml_set_ns_decl.xml
+++ b/docsrc/xmlsource/funcref/xml_set_ns_decl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_template.xml b/docsrc/xmlsource/funcref/xml_template.xml
index 31ca24c..78dfb0d 100644
--- a/docsrc/xmlsource/funcref/xml_template.xml
+++ b/docsrc/xmlsource/funcref/xml_template.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_tree.xml b/docsrc/xmlsource/funcref/xml_tree.xml
index 6eb58a3..bb69639 100644
--- a/docsrc/xmlsource/funcref/xml_tree.xml
+++ b/docsrc/xmlsource/funcref/xml_tree.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_tree_doc.xml b/docsrc/xmlsource/funcref/xml_tree_doc.xml
index 040941b..52998d0 100644
--- a/docsrc/xmlsource/funcref/xml_tree_doc.xml
+++ b/docsrc/xmlsource/funcref/xml_tree_doc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_tree_doc_media_type.xml b/docsrc/xmlsource/funcref/xml_tree_doc_media_type.xml
index f27e9ba..49fd6ca 100644
--- a/docsrc/xmlsource/funcref/xml_tree_doc_media_type.xml
+++ b/docsrc/xmlsource/funcref/xml_tree_doc_media_type.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_uri_get.xml b/docsrc/xmlsource/funcref/xml_uri_get.xml
index 51e837d..d7223f9 100644
--- a/docsrc/xmlsource/funcref/xml_uri_get.xml
+++ b/docsrc/xmlsource/funcref/xml_uri_get.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_uri_merge.xml b/docsrc/xmlsource/funcref/xml_uri_merge.xml
index 91eb656..8374d3e 100644
--- a/docsrc/xmlsource/funcref/xml_uri_merge.xml
+++ b/docsrc/xmlsource/funcref/xml_uri_merge.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_validate_dtd.xml b/docsrc/xmlsource/funcref/xml_validate_dtd.xml
index 7ca77a6..df75a7f 100644
--- a/docsrc/xmlsource/funcref/xml_validate_dtd.xml
+++ b/docsrc/xmlsource/funcref/xml_validate_dtd.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_validate_schema.xml b/docsrc/xmlsource/funcref/xml_validate_schema.xml
index d28f609..9bf302a 100644
--- a/docsrc/xmlsource/funcref/xml_validate_schema.xml
+++ b/docsrc/xmlsource/funcref/xml_validate_schema.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_view_dtd.xml b/docsrc/xmlsource/funcref/xml_view_dtd.xml
index 748132d..9068325 100644
--- a/docsrc/xmlsource/funcref/xml_view_dtd.xml
+++ b/docsrc/xmlsource/funcref/xml_view_dtd.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xml_view_schema.xml b/docsrc/xmlsource/funcref/xml_view_schema.xml
index 54fdaa1..1bcde74 100644
--- a/docsrc/xmlsource/funcref/xml_view_schema.xml
+++ b/docsrc/xmlsource/funcref/xml_view_schema.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xmlsql_update.xml b/docsrc/xmlsource/funcref/xmlsql_update.xml
index 93cf062..40c7cfe 100644
--- a/docsrc/xmlsource/funcref/xmlsql_update.xml
+++ b/docsrc/xmlsource/funcref/xmlsql_update.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xmlupdate.xml b/docsrc/xmlsource/funcref/xmlupdate.xml
index ccc6744..805443f 100644
--- a/docsrc/xmlsource/funcref/xmlupdate.xml
+++ b/docsrc/xmlsource/funcref/xmlupdate.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/_row.xml b/docsrc/xmlsource/funcref/xo/_row.xml
index ea08268..1a2916e 100644
--- a/docsrc/xmlsource/funcref/xo/_row.xml
+++ b/docsrc/xmlsource/funcref/xo/_row.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/lh_get_handler.xml b/docsrc/xmlsource/funcref/xo/lh_get_handler.xml
index 0a8df4e..af56c39 100644
--- a/docsrc/xmlsource/funcref/xo/lh_get_handler.xml
+++ b/docsrc/xmlsource/funcref/xo/lh_get_handler.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/lh_load_handler.xml b/docsrc/xmlsource/funcref/xo/lh_load_handler.xml
index 66716d6..571e42b 100644
--- a/docsrc/xmlsource/funcref/xo/lh_load_handler.xml
+++ b/docsrc/xmlsource/funcref/xo/lh_load_handler.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/make_oid.xml b/docsrc/xmlsource/funcref/xo/make_oid.xml
index 914b1f5..85e7620 100644
--- a/docsrc/xmlsource/funcref/xo/make_oid.xml
+++ b/docsrc/xmlsource/funcref/xo/make_oid.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/matches_like.xml b/docsrc/xmlsource/funcref/xo/matches_like.xml
index 868042d..33ad170 100644
--- a/docsrc/xmlsource/funcref/xo/matches_like.xml
+++ b/docsrc/xmlsource/funcref/xo/matches_like.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/new_mail.xml b/docsrc/xmlsource/funcref/xo/new_mail.xml
index addfc40..f66df02 100644
--- a/docsrc/xmlsource/funcref/xo/new_mail.xml
+++ b/docsrc/xmlsource/funcref/xo/new_mail.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/new_news.xml b/docsrc/xmlsource/funcref/xo/new_news.xml
index 3f12952..fa71fb6 100644
--- a/docsrc/xmlsource/funcref/xo/new_news.xml
+++ b/docsrc/xmlsource/funcref/xo/new_news.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/oid_class_spec.xml b/docsrc/xmlsource/funcref/xo/oid_class_spec.xml
index 4e9e2ac..91062a8 100644
--- a/docsrc/xmlsource/funcref/xo/oid_class_spec.xml
+++ b/docsrc/xmlsource/funcref/xo/oid_class_spec.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/openxml.xml b/docsrc/xmlsource/funcref/xo/openxml.xml
index bbd002d..87ebc26 100644
--- a/docsrc/xmlsource/funcref/xo/openxml.xml
+++ b/docsrc/xmlsource/funcref/xo/openxml.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/row_column.xml b/docsrc/xmlsource/funcref/xo/row_column.xml
index cd10892..5b5e923 100644
--- a/docsrc/xmlsource/funcref/xo/row_column.xml
+++ b/docsrc/xmlsource/funcref/xo/row_column.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/row_deref.xml b/docsrc/xmlsource/funcref/xo/row_deref.xml
index f59b5aa..c3d2d11 100644
--- a/docsrc/xmlsource/funcref/xo/row_deref.xml
+++ b/docsrc/xmlsource/funcref/xo/row_deref.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/row_identity.xml b/docsrc/xmlsource/funcref/xo/row_identity.xml
index ed79d1b..0fa9981 100644
--- a/docsrc/xmlsource/funcref/xo/row_identity.xml
+++ b/docsrc/xmlsource/funcref/xo/row_identity.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/row_table.xml b/docsrc/xmlsource/funcref/xo/row_table.xml
index 76fd1f3..dffac5e 100644
--- a/docsrc/xmlsource/funcref/xo/row_table.xml
+++ b/docsrc/xmlsource/funcref/xo/row_table.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/sqlfunctions_old_obsolete.xml b/docsrc/xmlsource/funcref/xo/sqlfunctions_old_obsolete.xml
index 01cad36..246b46e 100644
--- a/docsrc/xmlsource/funcref/xo/sqlfunctions_old_obsolete.xml
+++ b/docsrc/xmlsource/funcref/xo/sqlfunctions_old_obsolete.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/vt_create_ftt.xml b/docsrc/xmlsource/funcref/xo/vt_create_ftt.xml
index 0b07934..c87082e 100644
--- a/docsrc/xmlsource/funcref/xo/vt_create_ftt.xml
+++ b/docsrc/xmlsource/funcref/xo/vt_create_ftt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xo/xml_view_schema.xml b/docsrc/xmlsource/funcref/xo/xml_view_schema.xml
index 1d9e8a6..1de5da0 100644
--- a/docsrc/xmlsource/funcref/xo/xml_view_schema.xml
+++ b/docsrc/xmlsource/funcref/xo/xml_view_schema.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xpath_eval.xml b/docsrc/xmlsource/funcref/xpath_eval.xml
index 0946b40..9f082c1 100644
--- a/docsrc/xmlsource/funcref/xpath_eval.xml
+++ b/docsrc/xmlsource/funcref/xpath_eval.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xper_cut.xml b/docsrc/xmlsource/funcref/xper_cut.xml
index 38b7d6e..655e703 100644
--- a/docsrc/xmlsource/funcref/xper_cut.xml
+++ b/docsrc/xmlsource/funcref/xper_cut.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xper_doc.xml b/docsrc/xmlsource/funcref/xper_doc.xml
index c5fa0e0..76f84de 100644
--- a/docsrc/xmlsource/funcref/xper_doc.xml
+++ b/docsrc/xmlsource/funcref/xper_doc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xper_locate_words.xml b/docsrc/xmlsource/funcref/xper_locate_words.xml
index f7b06d6..80dc570 100644
--- a/docsrc/xmlsource/funcref/xper_locate_words.xml
+++ b/docsrc/xmlsource/funcref/xper_locate_words.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xper_navigation.xml b/docsrc/xmlsource/funcref/xper_navigation.xml
index 54cb5ce..1ccab33 100644
--- a/docsrc/xmlsource/funcref/xper_navigation.xml
+++ b/docsrc/xmlsource/funcref/xper_navigation.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xpf_extension.xml b/docsrc/xmlsource/funcref/xpf_extension.xml
index 679399d..669b7bd 100644
--- a/docsrc/xmlsource/funcref/xpf_extension.xml
+++ b/docsrc/xmlsource/funcref/xpf_extension.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xpf_extension_remove.xml b/docsrc/xmlsource/funcref/xpf_extension_remove.xml
index 357d857..ec0e26b 100644
--- a/docsrc/xmlsource/funcref/xpf_extension_remove.xml
+++ b/docsrc/xmlsource/funcref/xpf_extension_remove.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xquery_eval.xml b/docsrc/xmlsource/funcref/xquery_eval.xml
index c3236ac..4b86908 100644
--- a/docsrc/xmlsource/funcref/xquery_eval.xml
+++ b/docsrc/xmlsource/funcref/xquery_eval.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xslt.xml b/docsrc/xmlsource/funcref/xslt.xml
index 7f1dd60..0deecdd 100644
--- a/docsrc/xmlsource/funcref/xslt.xml
+++ b/docsrc/xmlsource/funcref/xslt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xslt_format_number.xml b/docsrc/xmlsource/funcref/xslt_format_number.xml
index be25db6..f4b3415 100644
--- a/docsrc/xmlsource/funcref/xslt_format_number.xml
+++ b/docsrc/xmlsource/funcref/xslt_format_number.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xslt_prof_enable.xml b/docsrc/xmlsource/funcref/xslt_prof_enable.xml
index e9f2750..785f2c0 100644
--- a/docsrc/xmlsource/funcref/xslt_prof_enable.xml
+++ b/docsrc/xmlsource/funcref/xslt_prof_enable.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xslt_sheet.xml b/docsrc/xmlsource/funcref/xslt_sheet.xml
index d37e157..3ebd3e9 100644
--- a/docsrc/xmlsource/funcref/xslt_sheet.xml
+++ b/docsrc/xmlsource/funcref/xslt_sheet.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xslt_stale.xml b/docsrc/xmlsource/funcref/xslt_stale.xml
index 6b5be38..f6a7237 100644
--- a/docsrc/xmlsource/funcref/xslt_stale.xml
+++ b/docsrc/xmlsource/funcref/xslt_stale.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xte_head.xml b/docsrc/xmlsource/funcref/xte_head.xml
index fe9cfad..119da83 100644
--- a/docsrc/xmlsource/funcref/xte_head.xml
+++ b/docsrc/xmlsource/funcref/xte_head.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xte_node.xml b/docsrc/xmlsource/funcref/xte_node.xml
index 28518ee..8c71ed0 100644
--- a/docsrc/xmlsource/funcref/xte_node.xml
+++ b/docsrc/xmlsource/funcref/xte_node.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xte_node_from_nodebld.xml b/docsrc/xmlsource/funcref/xte_node_from_nodebld.xml
index 20ce640..1c12f06 100644
--- a/docsrc/xmlsource/funcref/xte_node_from_nodebld.xml
+++ b/docsrc/xmlsource/funcref/xte_node_from_nodebld.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xte_nodebld_acc.xml b/docsrc/xmlsource/funcref/xte_nodebld_acc.xml
index 2b0ed98..18518f5 100644
--- a/docsrc/xmlsource/funcref/xte_nodebld_acc.xml
+++ b/docsrc/xmlsource/funcref/xte_nodebld_acc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xte_nodebld_final.xml b/docsrc/xmlsource/funcref/xte_nodebld_final.xml
index 488a5af..a1e8ed8 100644
--- a/docsrc/xmlsource/funcref/xte_nodebld_final.xml
+++ b/docsrc/xmlsource/funcref/xte_nodebld_final.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xte_nodebld_init.xml b/docsrc/xmlsource/funcref/xte_nodebld_init.xml
index ebf1e38..8e32cb5 100644
--- a/docsrc/xmlsource/funcref/xte_nodebld_init.xml
+++ b/docsrc/xmlsource/funcref/xte_nodebld_init.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/xtree_doc.xml b/docsrc/xmlsource/funcref/xtree_doc.xml
index 55b0408..dcdd410 100644
--- a/docsrc/xmlsource/funcref/xtree_doc.xml
+++ b/docsrc/xmlsource/funcref/xtree_doc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/funcref/year.xml b/docsrc/xmlsource/funcref/year.xml
index 5a7b172..8536edc 100644
--- a/docsrc/xmlsource/funcref/year.xml
+++ b/docsrc/xmlsource/funcref/year.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/functions.xml b/docsrc/xmlsource/functions.xml
index 3a0e2ed..6c736f8 100644
--- a/docsrc/xmlsource/functions.xml
+++ b/docsrc/xmlsource/functions.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -167,12 +167,12 @@ built-in functions of the Virtuoso XPATH Processor. These can be used in XPATH,
&rdf_audit_metadata; &rdf_backup_metadata; &rdf_void_store;
<!-- TBD: &rdf_load_turtle; -->
&rdf_restore_metadata; &rdf_load_rdfxml_mt; &rdf_load_rdfxml; &rdf_load_rdfa; &ld_dir; &ttlp; &ttlp_mt; &ttlp_mt_local_file; &rdf_datatype_of_obj;
-&rdf_triples_to_rdf_xml_text; &rdf_triples_to_ttl; &rdf_64bit_upgrade; &rdf_view_sync_to_physical;
+&rdf_triples_to_rdf_xml_text;&rdf_triples_to_ttl;&rdf_64bit_upgrade;
&rdf_convert_rdfxml_to_ttl; &rdf_graph_group_create; &rdf_graph_group_ins; &rdfs_rule_set;
&rdf_graph_collect_fp_list; &rdf_graph_diff; &rdf_suo_apply_patch;
&rdf_suo_diff_ttl; &sparql_rdb2rdf_codegen; &sparql_rdb2rdf_list_tables; &sparql_select_known_graphs;
&rowvector_digit_sort; <!-- &rowvector_subj_sort; -->
- &isref; &SAMPLE; &GROUP_CONCAT; &GROUP_DIGEST; &http_nt_triple; &http_ttl_triple;
+ &isref; &SAMPLE; &GROUP_CONCAT; &http_nt_triple; &http_ttl_triple;
&ann_phrase_class_add; &ann_phrase_class_del; &ap_build_match_list; &ap_add_phrases;
@@ -247,7 +247,7 @@ built-in functions of the Virtuoso XPATH Processor. These can be used in XPATH,
&user_set_password; &username; &uudecode; &uuencode; &uuvalidate;
&vad_check; &vad_check_installability; &vad_check_uninstallability; &vad_fail_check;
-&vad_install; &vad_load_file; &vad_load_sql_file; &vad_pack; &vad_safe_exec; &vad_uninstall;
+&vad_install; &vad_load_file; &vad_pack; &vad_safe_exec; &vad_uninstall;
&vd_remote_data_source; &vd_remote_proc_wrapper; &vd_remote_table; &vd_statistics;
&vdd_disconnect_data_source; &vdd_measure_rpc_time; &vector; &vector_concat;
&vhost_define; &vhost_remove; &virtuoso_ini_path; &server_root; &vsp_calculate_digest; &vt_batch;
diff --git a/docsrc/xmlsource/hooks.xml b/docsrc/xmlsource/hooks.xml
index ee81011..c4afe59 100644
--- a/docsrc/xmlsource/hooks.xml
+++ b/docsrc/xmlsource/hooks.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/inprocess.xml b/docsrc/xmlsource/inprocess.xml
index 3cfb362..7f6fd23 100644
--- a/docsrc/xmlsource/inprocess.xml
+++ b/docsrc/xmlsource/inprocess.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/installation.xml b/docsrc/xmlsource/installation.xml
index 13af9bc..a57c8b8 100644
--- a/docsrc/xmlsource/installation.xml
+++ b/docsrc/xmlsource/installation.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -24,174 +24,5782 @@
<chapter label="installation.xml" id="installation">
<title>Installation Guide</title>
<abstract>
- <para>This chapter applies exclusively to the various commercial releases of Virtuoso. If you are working with the open source version, please refer to the instructions on the web site where you obtained it.
+<para>This chapter applies exclusively to the various commercial releases of Virtuoso. If you are working with the open source version, please refer to the instructions on the web site where you obtained it.
</para>
- <para>
+<para>
This chapter describes how to install OpenLink Virtuoso VDBMS. It
contains both a quick start install guide and full walk through install guides
for major platforms.</para>
- <para>Virtuoso has been designed from the ground-up to be easy to implement.</para>
- <para>The installation generally runs without problems, run the setup program or script and follow
+
+ <para>Virtuoso has been designed from the ground-up to be easy to implement.</para>
+ <para>The installation generally runs without problems, run the setup program or script and follow
the on screen instruction prompts. You will be asked some questions, if in any doubt please follow
the instructions in this guide in order to install and configure your Virtuoso components correctly. </para>
- <para>Once installed, each instance of Virtuoso is controlled by an
+
+ <para>Once installed, each instance of Virtuoso is controlled by an
INI (initialization) file. This file links the Virtuoso Server
process with an actual database file or device. For example, the demo
instance of Virtuoso on all platforms is controlled by the demo.ini
file that is found in the demo directory along with the demo.db and
related files. There is a one-to-one relationship between server
processes and database files.</para>
- <para>The INI file is a text file consisting of keys and key values.
+
+<para>The INI file is a text file consisting of keys and key values.
You will set several of these values during installation. At any time
thereafter, their values can be changed by editing the INI file with a
standard text editor.</para>
- <para>The details of the INI file sections, keys, and the meanings of
-the key values are described in the <link linkend="configsrvstupfiles">Configuring Server Startup Files</link>
+
+<para>The details of the INI file sections, keys, and the meanings of
+the key values are described in the <link
+linkend="configsrvstupfiles">Configuring Server Startup Files</link>
section.
</para>
- </abstract>
- <sect1 id="installallplatforms">
- <title>Virtuoso on All platforms Commmon Specifics</title>
- <sect2 id="srvadminstallreqt">
- <title>Installation Requirements</title>
- <para>A typical installation will require a minimum of 400Mb of hard disk space to install the code,
- samples, documentation and sample database. The database will need additional space for data inserted,
- backups, logs and reports, web pages, etc.</para>
- <para>The size of the database .db file will not reduce when data is removed. The spare space will
- however be reclaimed for later use.</para>
- </sect2>
- <sect2 id="srvadmopreq">
- <title>Operational Requirements</title>
- <para>The Virtuoso database requires a minimum of 64Mb of system memory for each instance to operate
- in. Each connection will take between 70kb and 130kb of memory.</para>
- <para>The memory usage is affected by the following parameters in the
+
+</abstract>
+
+
+
+ <sect1 id="installwin32">
+ <title>Virtuoso for Windows</title>
+ <sect2 id="b4ustart">
+ <title>Before You Start</title>
+ <para>To ensure a smooth installation, please review the
+ following checklist before you start the setup program.</para>
+ <sect3 id="haveudld">
+ <title>Have you downloaded the software?</title>
+ <para>If you have not already done so, please download your copy of OpenLink
+ Virtuoso from the OpenLink web site. The URL is
+ <ulink url="http://www.openlinksw.com">http://www.openlinksw.com</ulink>.
+ When you visit the site, select "Download & Evaluation". </para>
+ <orderedlist>
+ <listitem>
+ <para>Select product "OpenLink Virtuoso: Personal Edition "</para>
+ </listitem>
+ <listitem>
+ <para>From "Product Category" choose "Universal Server"</para>
+ </listitem>
+ <listitem>
+ <para>From "Product" choose "Virtuoso Universal Server"</para>
+ </listitem>
+ <listitem>
+ <para>Select "Database Version"</para>
+ </listitem>
+ <listitem>
+ <para>From "server OS" select "Windows" and click "Next"</para>
+ </listitem>
+ <listitem>
+ <para>Select a release and click "Next"</para>
+ </listitem>
+ <listitem>
+ <para>You will be prompt to login in not already.</para>
+ </listitem>
+ <listitem>
+ <para>Click "Next"</para>
+ </listitem>
+ <listitem>
+ <para>Download the desired component. For example, click the HTTP link for "Multi-Threaded Universal Server (Commercial Edition) for OpenLink Virtuoso 4.x"</para>
+ </listitem>
+ </orderedlist>
+ </sect3>
+ <sect3 id="douhavelic">
+ <title>Do you have the License file?</title>
+ <para>The server will need a license file, and this is automatically delivered by email
+ as part of the download process. It is therefore important to supply a valid email
+ address. The installer will prompt for the license file location.</para>
+ </sect3>
+
+ <sect3 id="srvadminstallreqt"><title>Installation Requirements</title>
+ <para>A typical installation will require a minimum of 400Mb of hard disk
+ space to install the code, samples, documentation and sample database.
+The database will need additional space for data inserted, backups, logs and reports, web pages, etc.
+</para>
+ <para>The size of the database .db file will not reduce when data is
+ removed. The spare space will however be reclaimed for later use.</para>
+ </sect3>
+
+ <sect3 id="srvadmopreq"><title>Operational Requirements</title>
+ <para>The Virtuoso database requires a minimum of 64Mb of system memory
+ for each instance to operate in. Each connection will take between 70kb
+ and 130kb of memory.</para>
+ <para>The memory usage is affected by the following parameters in the
<link linkend="VIRTINI">Virtuoso configuration file</link>.</para>
- <simplelist>
- <member>ServerThreads</member>
- <member>ServerThreadSize</member>
- <member>MainThreadSize</member>
- <member>FutureThreadSize</member>
- <member>NumberOfBuffers</member>
- </simplelist>
- <para>See the following <link linkend="parameters">Parameter section</link> for more details.</para>
+ <simplelist>
+ <member>ServerThreads</member>
+ <member>ServerThreadSize</member>
+ <member>MainThreadSize</member>
+ <member>FutureThreadSize</member>
+ <member>NumberOfBuffers</member>
+ </simplelist>
+ <para>See the following <link linkend="parameters">Parameter section</link>
+ for more details.</para>
+ </sect3>
+
+ <sect3 id="srvadmossupport"><title>Operating System Support</title>
+ <para>Virtuoso runs on the following operating systems:</para>
+ <simplelist>
+ <member>Windows</member>
+ <member>Linux</member>
+ <member>Unix: AIX, HP-UX, Solaris, etc.</member>
+ <member>Mac OS X</member>
+ </simplelist>
+ </sect3>
+
+
+<sect3 id="limitsandparameters">
+<title>Limits</title>
+
+<para>
+The below table lists the most important parameters and limits for a database or a Virtuoso server instance. For space consumption of individual data types, see <link linkend="SpaceConsump">Space Consumption</link>.
+</para>
+
+
+<table colsep="1" frame="all" rowsep="0" shortentry="0" tocentry="1" tabstyle="decimalstyle" orient="land" pgwide="0">
+ <title>Limits</title>
+ <tgroup align="char" charoff="50" char="." cols="2">
+ <colspec align="left" colnum="1" colsep="0" colwidth="20pc"/>
+ <thead>
+ <row>
+ <entry>Limit Description</entry>
+ <entry>Value</entry>
+ </row>
+ </thead>
+ <tbody>
+<row><entry>Identifier length</entry><entry>100</entry></row>
+<row><entry>User name and password length</entry><entry>100</entry></row>
+<row><entry>SQLstmt and proc text</entry><entry>100K+</entry></row>
+<row><entry>varchar length</entry><entry>Constrained by max row length when stored into non-LOB column, 10MB inside procedure code.</entry></row>
+<row><entry>Numeric precision</entry><entry>Max 40 digits</entry></row>
+<row><entry>LOB column length</entry><entry>2GB</entry></row>
+<row><entry>row length</entry><entry>4086</entry></row>
+<row><entry>Columns per row</entry><entry>200</entry></row>
+<row><entry>Database size</entry><entry>32TB for data, 32TB for temp data </entry></row>
+<row><entry>Page size</entry><entry>8K</entry></row>
+<row><entry>File size</entry><entry>64 bit file offsets on supporting OS's</entry></row>
+<row><entry>Files per database</entry><entry>unlimited</entry></row>
+<row><entry>Table size</entry><entry>Up to database size </entry></row>
+<row><entry>Tables per database</entry><entry>64K keys, a table takes 1 key for primary key, 1 key per index and 1 key for each obsolete primary key layout resulting from adding or dropping columns.</entry></row>
+<row><entry>Indexes per table</entry><entry>Unlimited, subject to global cap on keys.</entry></row>
+<row><entry>Row in sorting/distinct temp</entry><entry>4078b, as in tables </entry></row>
+<row><entry>Locks per transaction</entry><entry>Depends on memory, 16b per row lock, 60b per page with at least one row lock.</entry></row>
+<row><entry>Changes per transaction</entry><entry>Depends on memory, ini parameter allows cap on rollback before image.</entry></row>
+<row><entry>Virtual memory></entry><entry>Depends on OS, 64 bit pointers on 64 bit platforms</entry></row>
+<row><entry>Threads</entry><entry>Depends on OS, ini files specifies cap for pool for SQL client and web server worker thread pools.</entry></row>
+<row><entry>Max connections</entry><entry>Depends on OS fdset size, at least 2048, license can set a limit</entry></row>
+<row><entry>Memory per connection</entry><entry>22K plus up to 100 cached SQL statement compilations</entry></row>
+</tbody>
+ </tgroup>
+</table>
+
+ </sect3>
+
+
+ <sect3 id="reinstvirt">
+ <title>Reinstalling Virtuoso?</title>
+ <para>If you are reinstalling Virtuoso, you must first shutdown any
+ additional database servers you have configured on non default ports.
+ The databases on port 1111 and 1112 will automatically be stopped during the install process.
+ On Windows NT/2000/XP, go to the services applet in the Control Panel. There
+ you can stop services that appear with names of the form "OpenLink
+ Virtuoso DBMS Server [instance name]".</para>
+ <para>On Windows NT/2000/XP you can also shut them down with the following
+ commands in the Virtuoso\bin directory:</para>
+ <programlisting>
+virtuoso-odbc-t.exe +service stop
+virtuoso-odbc-t.exe +instance myinstance +service stop
+virtuoso-odbc-t.exe +instance anotherinstance +service stop
+</programlisting>
+
+<note><title>Note:</title>
+<para>There is an alternative executable available for Virtuoso
+called: virtuoso-odbc-f.exe, which you may have installed. This version is
+designed for versions of Windows that offer no native threading support
+such as Windows 98, and offers no advantages over virtuoso-odbc-t.exe
+for Windows NT/2000/XP.</para></note>
+
+ <para>You can list the services with their status using:</para>
+ <programlisting>virtuoso +service list</programlisting>
+ </sect3>
+ <sect3 id="allocoftcpports">
+ <title>Allocation of TCP/IP ports</title>
+ <para>The Default database have the following port allocations:</para>
+<table><title>Port Usage</title>
+ <tgroup cols="2">
+ <thead><row><entry>Port</entry><entry>Used by</entry></row></thead>
+ <tbody>
+<row>
+ <entry>1111</entry>
+ <entry>Default Virtuoso Server port</entry></row>
+<row>
+ <entry>8889</entry>
+ <entry>Default Virtuoso Visual Server Administration Interface HTTP port</entry></row>
+ </tbody>
+ </tgroup>
+</table>
+ <para>By default, the Virtuoso DBMS listens on port 1111.
+ This port number is not selectable at install time.
+ If the port is currently in use by another server then after the installation completes
+ you will need to change the port number in the Local Virtuoso ODBC DSN that is created
+ during the installation process, and also in the following file:</para>
+ <programlisting>
+C:\Program Files\OpenLink Software\Virtuoso 5.0\bin\virtuoso.ini
+</programlisting>
+ <para>To check if a port is in use on NT, you can use the
+ following command, and review the output:</para>
+ <programlisting>
+netstat -an | more
+</programlisting>
+ </sect3>
+ <sect3 id="prevworkodbcdsn">
+ <title>Do you already have an ODBC Data Source Name (DSN) that works?</title>
+ <para>The Virtual Database aspects of the Virtuoso for ODBC assumes that you already
+ have an ODBC driver on your machine from a database vendor, OpenLink Software, or from another 3rd party vendor.
+ It is a useful sanity-check to ensure that you have an ODBC System Data Source Name (DSN) on your
+ machine, and that it successfully connects to your database, and that it retrieve
+ data. Any ODBC compliant tool can be used to test that your ODBC Data Source Name
+ (DSN) works, such as the sample application we provide - C++ Demo32, and that it is
+ sufficiently robust to operate with Virtuoso. Virtuoso is ODBC Driver Independent and
+ certified to work with any drivers that are ODBC level 1 or higher.</para>
+ </sect3>
+ </sect2>
+ <sect2 id="knowthywinvirt">
+ <title>Getting To Know Your Virtuoso Components</title>
+ <para>Virtuoso is made up of several components, these components
+ fall into two distinct categories: Client Components and Server Components.</para>
+ <sect3 id="clicomppack">
+ <title>Client Components Package</title>
+ <para>These are the components typically used to communicate with
+ a local or remote Virtuoso server, this includes: </para>
+ <simplelist>
+ <member>Virtuoso Drivers for ODBC</member>
+ <member>Virtuoso Drivers for JDBC</member>
+ <member>ISQL Utility</member>
+ <member>ISQLO Utility</member>
+ <member>Documentation</member>
+ <member>Samples</member>
+ </simplelist>
+ </sect3>
+ <sect3 id="srvcomp">
+ <title>Server Components</title>
+ <para>These are the components that service Virtuoso clients,
+ these include:</para>
+ <simplelist>
+ <member>
+ Virtuoso Virtual Database Servers for: ODBC based
+ interfaces - the files "virtuoso-odbc-f" (for Virtuoso Lite)
+ and "virtuoso-odbc-t" (For Virtuoso Enterprise Edition).
+ </member>
+ <member>Virtuoso HTTP Server.
+ </member>
+ <member>Virtuoso System Manager to configure the database
+ through the HTTP interface.
+ </member>
+ </simplelist>
+ </sect3>
+ </sect2>
+ <sect2 id="InstallStepsWin">
+ <title>Installation Steps</title>
+ <para>You can install Virtuoso in any one of the following
+ configurations: Stand-Alone, 2-Tier Client-Server, or 3-Tier Client-Server.</para>
+ <sect3 id="standalone">
+ <title>Stand-Alone Configuration</title>
+ <para>In this scenario you have one machine making up your entire
+ solution, which implies that your Applications, Virtuoso's client and server components,
+ and the back end database engine(s) that you want to access via Virtuoso all reside on the
+ same machine. </para>
+ <para>Virtuoso Personal Edition Release 5.0 Installation on Windows</para>
+ <orderedlist>
+ <listitem>
+ <para>Double click on the Virtuoso Personal Edition installer (for example "ntvpz2zz.msi") to run the Windows installer.</para>
+ <figure id="winpersinst001" float="1">
+ <title>Run the installer</title>
+ <graphic fileref="inst/v50pex8601.png" width="194" depth="62"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>The installer Welcome dialog is loaded:</para>
+ <figure id="winpersinst002" float="1">
+ <title>The Welcome Screen</title>
+ <graphic fileref="inst/v50pex8602.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>Review the license agreement and 'agree' to the terms:</para>
+ <figure id="winpersinst003" float="1">
+ <title>License Agreement</title>
+ <graphic fileref="inst/v50pex8603.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>If a license file already exists the installer can place this in the correct
+location for use. Browse to the location of your installer file and the installer will use this for the
+Virtuoso Server. Alternatively the "Try & Buy" feature of the installer can be used to enable
+a trial or full license file to be obtained online:</para>
+ <figure id="winpersinst004" float="1">
+ <title>The License File Location</title>
+ <graphic fileref="inst/v50pex8604.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>Choose to obtain a Trial license for an evaluation or enter the shop
+ site to purchase a full license.</para>
+ <figure id="winpersinst005" float="1">
+ <title>The obtain Trial license screen</title>
+ <graphic fileref="inst/v50pex8605.png" width="976" depth="682"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>Click on the "Download License" button on the right to obtain the
+ license file immediately. An e-mail will also be sent with details of the license and the location on the ODS account
+ of the registered user where in can be obtained from at a later date. Once a license file is available on the machine
+ use the "Browse" button to locate it and the "Set License" button to initialize the Virtuoso
+ server with this license file.</para>
+ <figure id="winpersinst006" float="1">
+ <title>The Download license screen</title>
+ <graphic fileref="inst/v50pex8606.png" width="976" depth="680"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>Select the Installation Type to be performed from the options presented:</para>
+ <figure id="winpersinst007" float="1">
+ <title>Setup Type</title>
+ <graphic fileref="inst/v50pex8607.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>If the custom option was chosen, the installer prompts for the
+ Destination folder of the installation.</para>
+ <figure id="winpersinst008" float="1">
+ <title>Choose Destination Location</title>
+ <graphic fileref="inst/v50pex8608.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>Select the Product Features to be installed.</para>
+ <figure id="winpersinst009" float="1">
+ <title>Select Components</title>
+ <graphic fileref="inst/v50pex8609.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>The Installation is now ready to proceed.</para>
+ <figure id="winpersinst010" float="1">
+ <title>Proceed Installation</title>
+ <graphic fileref="inst/v50pex8610.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>The Progress of the installation is indicated in the Status bar.</para>
+ <figure id="winpersinst011" float="1">
+ <title>Status bar</title>
+ <graphic fileref="inst/v50pex8611.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>The installation is now complete.</para>
+ <figure id="winpersinst012" float="1">
+ <title>Complete Installation</title>
+ <graphic fileref="inst/v50pex8612.png" width="508" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>The installer may prompt for the machine to be reboot if required.</para>
+ <figure id="winpersinst013" float="1">
+ <title>Reboot prompt</title>
+ <graphic fileref="inst/v50pex8613.png" width="436" depth="161"/>
+ </figure>
+ </listitem>
+ <listitem>Post installation the Virtuoso Server can be started by running the "Virtuoso
+Service Manager" which gets added to the Windows "Icons Tray" in the status bar.
+ <figure id="winpinst14" float="1">
+ <title>Post installation</title>
+ <graphic fileref="ui/winpinst14.png"/>
+ </figure>
+ </listitem>
+ <listitem>Double click on the "Virtuoso Service Manager" icon in the "Icons Tray" to load
+the application, select the "OpenLink Virtuoso Server" instance and press the "Start" button to run
+the Service.
+ <figure id="winpinst15" float="1">
+ <title>Virtuoso Service Manager</title>
+ <graphic fileref="ui/winpinst15.png"/>
+ </figure>
+ </listitem>
+ <listitem>Once the Virtuoso service has successfully started, it is recommended that
+the default "dba" and "dav" passwords be changed to secure values by loading the URL
+"http://localhost:8890/install" in a Web Browser which loads the following page for making these changes:
+ <figure id="winpinst16" float="1">
+ <title>Default passwords</title>
+ <graphic fileref="ui/winpinst16.png"/>
+ </figure>
+ </listitem>
+ <listitem>The Virtuoso Server Welcome page will now be displayed indicating the server is
+online. This Web based page can be used for general configuration and usage of the Virtuoso Server:
+ <figure id="winpinst17" float="1">
+ <title>Virtuoso Server Welcome page</title>
+ <graphic fileref="ui/winpinst17.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ <para>The installation Virtuoso Universal Server is complete.</para>
+ </sect3>
+ <sect3 id="TwoTierConfigInst">
+ <title>2-Tier Client-Server Configuration</title>
+ <para>In this scenario you have two logically distinct machine
+ types making up your total solution, one machine hosts your Applications and Virtuoso
+ client components, while the other hosts your Virtuoso and back-end Database Servers. This
+ installation configuration format will allow Windows client machines to communicate with non
+ Windows server machines running Virtuoso, it also allows Virtuoso clients on non Windows
+ client machines to connect to Virtuoso servers on Windows server machines.</para>
+ <sect4 id="twotierclicomp">
+ <title>Client Components:</title>
+ <orderedlist>
+ <listitem>
+ <para>Move the Virtuoso installation archive into a temporary
+ installation folder on your Client machine</para>
+ </listitem>
+ <listitem>
+ <para>Choose the Client install option.
+ No further component selection will be required.</para>
+ <figure id="wininst103" float="1">
+ <title>Setup Screens</title>
+ <graphic fileref="inst/12clienttype.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>The installer will now extract and install your Virtuoso Client components</para>
+ </listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="twotiersrvcomp">
+ <title>Server Components:</title>
+ <orderedlist>
+ <listitem>
+ <para>Move the Virtuoso installation archive into a temporary
+ installation folder on your Server machine.</para>
+ </listitem>
+ <listitem>
+ <para>Choose the Server install option.</para>
+ <figure id="wininst203" float="1">
+ <title>Setup Screens</title>
+ <graphic fileref="inst/13installtype.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>At the component selection, uncheck the "Virtuoso Drivers for ODBC"
+ and "Virtuoso Drivers for JDBC" and the "Samples" check-boxes
+ since you are only installing Virtuoso's Server components on this machine.</para>
+ </listitem>
+ <listitem>
+ <para>The installer will now extract and install your Virtuoso Server components.</para>
+ </listitem>
+ </orderedlist>
+ </sect4>
+ </sect3>
+ <sect3 id="ThreeTierConfigInst">
+ <title>3-Tier Client-Server Configuration</title>
+ <para>In this scenario you have three logically distinct machine
+ types making up your total solution, the first machine hosts your Applications and
+ Virtuoso client components (Client Machine), the second hosts your Virtuoso server,
+ (Middle Tier Server Machine) and the third machine your back end Database Server (Database
+ Server Machine). This installation configuration format will allow Windows client machines
+ to communicate with non Windows middle-tier server machines running Virtuoso, as well as
+ allowing Virtuoso clients on non Windows client machines to connect to Virtuoso servers on
+ windows based middle-tier server machines. </para>
+ <sect4 id="threetierclicomp">
+ <title>Client Components:</title>
+ <orderedlist>
+ <listitem>
+ <para>Move the Virtuoso installation archive into a temporary
+ installation folder on your Client machine</para>
+ </listitem>
+ <listitem>
+ <para>Choose the Client install option.
+ No further component selection will be required.</para>
+ <figure id="wininst303" float="1">
+ <title>Setup Screens</title>
+ <graphic fileref="inst/12clienttype.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>The installer will now extract and install your Virtuoso Client components</para>
+ </listitem>
+ </orderedlist>
+ </sect4>
+ <sect4 id="threetiermidsrccomp">
+ <title>Middle-Tier Server Components:</title>
+ <para>You need to install both the Virtuoso client and server
+ components on this machine. This is due to the fact that in many cases this server will
+ double as an Application Server, which entails having clients connecting to an
+ application service that uses Virtuoso for data access.</para>
+ <orderedlist>
+ <listitem>
+ <para>Move the Virtuoso installation archive into a temporary
+ installation folder on your Server machine.</para>
+ </listitem>
+ <listitem>
+ <para>Choose the Server install option.</para>
+ <figure id="wininst403" float="1">
+ <title>Setup Screens</title>
+ <graphic fileref="inst/13installtype.png" width="504" depth="386"/>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>At the component selection, uncheck the "Sample Application" check-box then the
+ "Virtuoso Driver for ODBC" and "Virtuoso Drivers for JDBC"
+ check-boxes since you are only installing Virtuoso's Server components on this machine.</para>
+ </listitem>
+ <listitem>
+ <para>The installer will now extract and install your Virtuoso Server components.</para>
+ </listitem>
+ </orderedlist>
+ <para>You will not need to install anything on the remote database server since you will be connecting to remote
+ database either via ODBC or Native Drivers installed on this Server.</para>
+ </sect4>
+ </sect3>
</sect2>
- <sect2 id="srvadmossupport">
- <title>Operating System Support</title>
- <para>Virtuoso runs on the following operating systems:</para>
- <simplelist>
- <member>Windows</member>
- <member>Linux</member>
- <member>Unix: AIX, HP-UX, Solaris, etc.</member>
- <member>Mac OS X</member>
+
+ <sect2 id="wininstpost"><title>Post Installation</title>
+ <sect3 id="wininstpostsan">
+ <title>Post-Installation Sanity Check</title>
+ <para>A quick way to check that the database is running, is to point a browser to the
+ http port. The following example URLs will show the System Manager for
+ the default, and the demo Virtuoso databases:</para>
+ <programlisting>http://localhost:8889
+http://localhost:8890
+http://a_virtuoso_server.org:8890</programlisting>
+ </sect3>
+ <sect3 id="wininstposttrb"><title>Troubleshooting DB Startup Failures</title>
+ <para><emphasis>Install failure</emphasis></para>
+ <para>Check the .log file in your Virtuoso installation db location, for ex:</para>
+<programlisting><![CDATA[
+ C:\Program Files\OpenLink Software\Virtuoso 6.0\db\virtuoso.log
+]]></programlisting>
+<para>which is for the database and log files etc. in order to review the installed files
+binaries and databases (defaults) for issues if install fails.</para>
+ <para><emphasis>.lck existance</emphasis></para>
+ <para>Check .log in case of .lck issue</para>
+ <para>Delete the .lck file and repeat the steps from above.</para>
+ <para><emphasis>.trx incompatiblity issue</emphasis></para>
+ <para>Check .log in case of .trx incompatiblity issue</para>
+ </sect3>
+ </sect2>
+
+ <sect2 id="startvdbms">
+ <title>Starting Your Virtuoso Server</title>
+ <para>Due to subtle differences between the Windows 95 family (including Windows 98 and Windows ME)
+ and the Windows NT family (including Windows 2000, Windows XP, Vista, Windows 7, Windows 2000
+ Server, Windows Server 2003, and Windows Server 2008), specific instructions for starting and
+ stopping your Virtuoso server are supplied for each Windows family.</para>
+ <sect3 id="winnt">
+ <title>Windows NT family</title>
+ <para>You can start your Virtuoso server in one of two ways,
+ automatically or manually, the default mode configured by your installer is Automatic.</para>
+ <sect4 id="winntautostart">
+ <title>Automatic Startup</title>
+ <para>Your Virtuoso servers (default and demonstration databases)
+ are configured at installation time as "Automatic Startup" services. Thus,
+ rebooting your machine after installation is all that is required in order for your
+ Virtuoso servers to be ready to start receiving connections from client applications.
+ The service is actually started during the installation, however some files may be locked, so
+ a reboot is required to complete the install.</para>
+ </sect4>
+ <sect4 id="winntmanstart">
+ <title>Manual Startup</title>
+ <para>You can manually start your Virtuoso server in one of two
+ ways, either via the "services" control panel applet or from within a DOS shell.
+ When doing this via the "Services" control panel Applet you need to simply open
+ up your control panel and click on the "services" applet. This will present you
+ with a screen similar to the one below:</para>
+ <figure id="inst016" float="1">
+ <title>Services Applet</title>
+ <graphic fileref="virtinst12.gif" width="505" depth="277"/>
+ </figure>
+ <para>Click the "Start" or "Stop" button in
+ order to start or stop a highlighted Virtuoso Server.</para>
+ <para>To start your Virtuoso servers manually using DOS command
+ prompts, start a DOS shell and then enter the following command:</para>
+ <programlisting>virtuoso-odbc-f +service start</programlisting>
+ </sect4>
+ </sect3>
+ <sect3 id="win9x">
+ <title>Windows 95 family</title>
+ <para>You can start your Virtuoso server under Windows 95/98 in
+ one of two ways, automatically or manually, the default mode configured by your installer
+ is Automatic.</para>
+ <sect4 id="win9xautostart">
+ <title>Automatic Startup</title>
+ <para>Your Virtuoso servers (default and demonstration databases)
+ are configured at installation time as "Automatic Startup" services. Thus,
+ rebooting your machine after installation is all that is required in order for your
+ Virtuoso servers to be ready to start receiving connections from client applications.</para>
+ <para>If Virtuoso does not start automatically on Windows
+ 95/98 after installation you will need to add the following line to the system's
+ "autoexec.bat" file (assuming you have installed Virtuoso using the installers
+ default installation folder):</para>
+ <programlisting>C:\Program Files\OpenLink\Virtuoso\bin\virtuoso-odbc-f +service start</programlisting>
+ </sect4>
+ <sect4 id="sect4win9xmanstart">
+ <title>Manual Startup</title>
+ <para>You can start your Virtuoso servers manually by
+ entering the following commands at the DOS command line prompt:</para>
+ <programlisting>
+virtuoso-odbc-f +service start
+virtuoso-odbc-f +instance demo +service start
+</programlisting>
+ <note>
+ <title>Note:</title>
+ <para>If you encounter a "Program
+ Not Found" error this is because your Virtuoso installation's "bin"
+ sub-directory is not part of your PATH environment variable. </para>
+ </note>
+ </sect4>
+ </sect3>
+ </sect2>
+
+ <sect2 id="CreatingDeletingServices">
+ <title>Creating and Deleting Virtuoso Services </title>
+ <para>At sometime you may need to have multiple Virtuoso server
+ processes running on your Windows servers or simply need to add or delete existing
+ Virtuoso servers that have been registered with the "Services" control panel
+ applet. You do this by executing the following commands:</para>
+ <para>Adding new Virtuoso Server service: virtuoso-odbc-f +service create -I <your chosen service name></para>
+ <para>Deleting an existing Virtuoso service: virtuoso-odbc-f +service delete -I <service that you are deleting></para>
+ <para>Starting a new Virtuoso service manually: virtuoso-odbc-f +service start -I <service name> </para>
+ <para>Showing a list of existing Virtuoso services: virtuoso-odbc-f +service list</para>
+ <note>
+ <title>Note:</title>
+ <para>This functionality is only available on Windows NT/2000/XP.</para>
+ <para>Ensure that the services applet from the control panel is closed while
+ issuing the above commands to prevent locking.</para>
+ </note>
+ </sect2>
+ <sect2 id="ConfiguringVirtuosoClients">
+ <title>Configuring Virtuoso Client Components</title>
+ <para>The Virtuoso client components set consists of the following:</para>
+
+ <simplelist>
+ <member>Virtuoso Driver for ODBC</member>
+ <member>Virtuoso Driver for JDBC</member>
+ <member>Native Virtuoso Interactive SQL Query (ISQL)</member>
+ <member>ODBC based Interactive SQL Query Utility (ISQLO)</member>
</simplelist>
+
+ <para>The sections that follow address the configuration and
+ utilization of each one of these client components separately.</para>
+ <sect3 id="VirtuosoDriverODBC">
+ <title>Virtuoso Driver for ODBC</title>
+ <para>The Virtuoso Driver for ODBC conforms to both the ODBC
+ 1.x,2.x,and 3.x versions of the ODBC specification, it implements Core, Level 1, Level 2,
+ and Extensions functionality. This driver enables you to communicate with local or remote
+ Virtuoso servers across any combination of platforms supported by Virtuoso.</para>
+ <para>At installation time two ODBC data source names (DSN's)
+ are created with default values by the Virtuoso installer, the first DSN named "Local
+ Virtuoso" provides a link to a local default Virtuoso database server instance, while
+ the other named "Local Virtuoso Demo" provides a link to a local Virtuoso server
+ for the Virtuoso demonstration database.</para>
+ <tip><title>See Also:</title>
+ <para>the <link linkend="virtdsnsetup">Data Access Interfaces</link> chapter for more detailed information
+ regarding the Virtuoso ODBC Driver setup</para>
+ </tip>
+ </sect3>
+ <sect3 id="VirtuosoDriverJDBC">
+ <title>Virtuoso Drivers for JDBC</title>
+ <para>The Virtuoso Drivers for JDBC are available in
+ "jar" file formats for the JDBC 1.x, JDBC 2.x and JDBC 3.x JDBC specifications. These
+ are Type 4 Drivers implying that utilization is simply a case of adding the relevant
+ "jar" file to your CLASSPATH and then providing an appropriate JDBC URL format
+ in order to establish a JDBC session with a local or remote Virtuoso server. It is
+ important to note that when you make a JDBC connection to a Virtuoso Server, you do also
+ have access to Native and External Virtuoso tables. Thus, you actually have a type 4 JDBC
+ Driver for any number of different database types that have been linked into Virtuoso.</para>
+
+ <tip><title>See Also:</title>
+ <para>The <link linkend="VirtuosoDriverJDBC">JDBC Driver</link> section in
+ the Access Interfaces chapter.</para></tip>
+
+ </sect3>
+
+ <sect3 id="ISQL">
+ <title>Native Virtuoso Interactive SQL Query (ISQL)</title>
+ <para>To assist you with the use of Virtuoso an
+ interactive SQL interpreter utility called "ISQL" is bundled with all Virtuoso
+ installations. This utility allows you to enter and execute SQL statements from a command
+ line prompt against a local or remote Virtuoso server.</para>
+ <para>The command line format for executing this utility is: </para>
+ <programlisting>
+isql [<hostname>][:<port#>]</programlisting>
+ <para>The steps that follow guide you through the process of
+ using ISQL to verify your Virtuoso installation:</para>
+ <orderedlist>
+ <listitem>
+ <para>Open up a DOS shell</para>
+ </listitem>
+ <listitem>
+ <para>Move into the "bin" sub-directory of your
+ Virtuoso installation</para>
+ </listitem>
+ <listitem>
+ <para>Type the following command: isql</para>
+ <para>This will connect you to the default Virtuoso server at port "1111", if you want
+ to connect to your demonstration Virtuoso database (which listens at port 1112 by default)
+ then enter: isql 1112</para>
+ </listitem>
+ <listitem>
+ <para>At the ISQL command line prompt type in the following
+ command: </para>
+ <programlisting>
+tables ;</programlisting>
+ <para>This will produce a list of tables in the current Virtuoso database, you can also enter
+ other SQL statements e.g.: </para>
+ <programlisting>
+select * from Customers</programlisting>
+ <para>This will produce a listing of records in the "Customers" table.</para>
+ </listitem>
+ <listitem>
+ <para>If you are not able to perform these task that it implies
+ that your Virtuoso database server is not running or that it has not been installed
+ properly.</para>
+ </listitem>
+ </orderedlist>
+ </sect3>
+ <sect3 id="ISQLO">
+ <title>ODBC based Interactive SQL Query Utility (ISQLO)</title>
+ <para>In addition to a Native ISQL utility, your Virtuoso
+ installation includes an ODBC based version of "ISQL" called "ISQLO",
+ this enable you to connect to ODBC DSN's rather than Virtuoso only. To use this program
+ perform the following steps: </para>
+ <orderedlist>
+ <listitem>
+ <para>Open up a DOS shell</para>
+ </listitem>
+ <listitem>
+ <para>Move into the "bin" sub-directory of your
+ Virtuoso installation</para>
+ </listitem>
+ <listitem>
+ <para>Type the following command :</para>
+ <programlisting>
+isqlo <enter a valid ODBC Data Source Name></programlisting>
+ <note>
+ <title>Note:</title>
+ <para>If your DSN contains spaces you will need to enclose it within
+ double quotes when passing it as a parameter to ISQLO</para>
+ </note>
+ </listitem>
+ <listitem>
+ <para>Enter any valid SQL at the ISQLO command line prompt.</para>
+ </listitem>
+ <listitem>
+ <para>You can also use this utility from within the Virtuoso Conductor</para>
+ </listitem>
+ </orderedlist>
+ </sect3>
+ </sect2>
+ <sect2 id="defpasschgwin">
+ <title>Default passwords</title>
+ <para>See the following Quick Start chapter for very important information about
+ <link linkend="defpasschange">changing the default passwords</link>.</para>
+ </sect2>
+
+ </sect1>
+ <!-- ############################################################# -->
+ <sect1 id="linuxinstall">
+ <title>Virtuoso for Linux (Enterprise Edition)</title>
+ <!--sect2 id="lindoyouwannamigrate">
+ <title>Existing Virtuoso 2.7 Users</title>
+ <para>You can migrate your existing Virtuoso servers to 3.0 using
+ the migration utility. The Virtuoso database file structure has been considerably
+ altered between versions. Please consult the
+ <link linkend="migrate27to30">Migration of Virtuoso from Version 2.7 to Version 3.0</link>
+ section for more details.</para>
+ </sect2-->
+ <sect2 id="b4instlin">
+ <title>Before You Install</title>
+ <para>To ensure a smooth installation, please review the
+ following checklist before you start the setup program.</para>
+ <sect3 id="linhavudld">
+ <title>Have you downloaded the software?</title>
+ <para>If you have not already done so, please download your copy of OpenLink
+ Virtuoso from the Virtuoso web site. The URL is
+ <ulink url="http://www.openlinksw.com/virtuoso/">http://www.openlinksw.com/virtuoso/</ulink>.
+ When you visit the site, select "Software Download".</para>
+ </sect3>
+ <sect3 id="linreinstvirt">
+ <title>Reinstalling Virtuoso?</title>
+ <para>If you are reinstalling Virtuoso, you must first stop
+ the Database Servers. You can shut these services down with the following command
+ executed from your Linux shell prompt:</para>
+ <para>Beta 1 Users</para>
+ <programlisting>sh virtuoso-lite.rc stop</programlisting>
+ <para>or</para>
+ <programlisting>virtuoso-lite.rc stop</programlisting>
+ <para>or</para>
+ <programlisting>./virtuoso-lite.rc stop</programlisting>
+ <para>Beta 2 Users</para>
+ <programlisting>sh virtuoso-stop.sh</programlisting>
+ <para>or</para>
+ <programlisting>virtuoso-stop.sh</programlisting>
+ <para>or</para>
+ <programlisting>./virtuoso-stop.sh</programlisting>
+ <para>You may also want to first uninstall prior Virtuoso RPM packages.</para>
+ <para>The following command (executed as root) can be used to uninstall the package:</para>
+ <programlisting>rpm -e virtuoso-lite-1.1-3_glibc2</programlisting>
+ <para>or</para>
+ <programlisting>rpm -e virtuoso-enterprise-1.1-3_glibc2</programlisting>
+ <para>or</para>
+ <programlisting>rpm -e virtuoso-lite-1.1-3_libc5</programlisting>
+ <para>depending on Linux system and Virtuoso Server being used.</para>
+ </sect3>
+ <sect3 id="linportsfree">
+ <title>Are ports 1111,1112, 8889 and 8890 free?</title>
+ <para>During the installation you will be prompted for an HTTP port number for
+ use by each Virtuoso System Manager. If you are already running a web server
+ or other listener on that port, you will encounter problems, and should choose another
+ free port when you are prompted. </para>
+ <para>By default, the Virtuoso DBMS listens on port 1111, and the Demo Database
+ on 1112. If these ports is currently in use by another server then after the installation completes,
+ you will need to change the port numbers in the Local Virtuoso ODBC or UDBC DSN that is
+ created during the installation process, and also in the following file:</para>
+ <programlisting>$<Directory where Virtuoso is installed>/bin/virtuoso.ini</programlisting>
+ <para>typically</para>
+ <programlisting>/usr/local/virtuoso</programlisting>
+ <para>but can of course be any location of your choosing.</para>
+ <para>To check if a port is in use you can use the following command, and review the output:</para>
+ <programlisting>netstat -an | more </programlisting>
+ </sect3>
+ <sect3 id="lindouvirtuser">
+ <title>Do you already have a "virtuoso" user account on your Linux system?</title>
+ <para>Although this is no longer a requirement of the installation it
+may be suitable to create a new Virtuoso user account for administering the Virtuoso
+server.</para>
+ </sect3>
+ <sect3 id="liniodbc">
+ <title>Do you already have functional iODBC data sources on your system?</title>
+ <para>The OpenLink Virtuoso for Linux installation presumes the following:</para>
+ <simplelist>
+ <member>You intend to connect to a Local Virtuoso server using iODBC
+ or OpenLink UDBC</member>
+ <member>You intend to connect to one or more Remote Virtuoso servers
+ on your network using iODBC or UDBC </member>
+ <member>You intend to Attach tables hosted within non-local or
+ Remote Virtuoso database servers, into a Local or Remote Virtuoso Server</member>
+ <member>The existence of functional OpenLink or third-party iODBC
+ drivers for Linux that connect to the non database servers referred to above.</member>
+ <member>In the absence of iODBC drivers for your non Virtuoso
+ database, that a functional OpenLink or third-party UDBC Drivers exists for these database
+ servers. </member>
+ </simplelist>
+ <para>Instructions on how to manually configure iODBC Data Source
+ Names is available at the following URL:
+ <ulink url="http://www.openlinksw.com/info/docs/rel3doc/unix/odbcsdk.htm">http://www.openlinksw.com/info/docs/rel3doc/unix/odbcsdk.htm</ulink>
+ If you are using OpenLink Multi-Tier ODBC
+ Drivers for your remote database connections then we highly recommend the use of the Virtuoso
+ System Manager for creating iODBC Data Source Names.</para>
+ </sect3>
+ <sect3 id="liniodbcdsnfunc">
+ <title>Are your iODBC Data Source Names functional?</title>
+ <para>It is a useful sanity-check to ensure that your iODBC or UDBC
+ data sources are functional, OpenLink provides an "odbctest" program for
+ verifying basic usability of iODBC data sources. Both of these programs reside in the
+ "samples" directory situated beneath the directory into which RPM installs
+ Virtuoso.</para>
+ </sect3>
+ </sect2>
+ <sect2 id="instproclinux">
+ <title>Installation Process</title>
+ <para>Once you have downloaded the required tar file from the
+web or ftp site and have placed the file in a designated installation directory you are
+ready to commence the Virtuoso installation process. </para>
+ <para>You may want to specify a new user to own the Virtuoso
+installation and then you can place the installation tar file into that users home
+directory.</para>
+<orderedlist>
+ <listitem><para>First step is to un-tar the file to obtain the install script
+ and archive file. Use the following command:</para>
+ <programlisting>tar xvf <tar file>.tar</programlisting>
+ <para>replacing <tar file> with the relevant name of the file you downloaded.</para></listitem>
+ <listitem><para>run the install script using the following command:</para>
+<programlisting>[virtuoso at myserver virtuoso]$ sh /install.sh</programlisting>
+ <para>The installation process will now begin and prompt you for required information.</para>
+</listitem>
+
+<listitem>
+<para>The install script will first try and detect running Virtuoso server instances.
+In cases where an old Virtuoso server is being upgraded you must ensure that
+the old Virtuoso is first shutdown. It is advisable that you backup up your
+systems before continuing.</para>
+<programlisting><![CDATA[
+Checking requested components
+Checking for existing installations and/or instances of Virtuoso...
+ 7269 ? 00:06:23 virtuoso
+/proc/net/tcp: Permission denied
+
+** Alert: [running processes; ]
+
+** Warning: You have Virtuoso previously installed on this machine.
+**
+** To avoid existing data being overwritten or lost, you may press ^C to
+** exit this installer, terminate and remove the existing installation,
+** or proceed taking care to enter non-conflicting data below, by pressing
+** Enter.
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>If you are upgrading a server then the installer will save copies of
+old configuration data for later use.</para>
+<programlisting><![CDATA[
+Preserving any existing configurations...
+find: db: No such file or directory
+find: demo: No such file or directory
+find: bin: No such file or directory
+0 blocks
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>You should have received a license file via email. This file should be
+copied to the server installation directory prior to installation. The installer
+will ask you for its location if none is found. If you do not have the license
+file at this time the installer will still continue.</para>
+<programlisting><![CDATA[
+Checking licensing...
+
+A license file is required for the Virtuoso Server Instance(s) to
+start. Please enter the full path and name of a valid Virtuoso
+license file [./virtuoso.lic]:
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Now the installer will continue to install files from the package. Every
+file installed will be echoed to the screen. </para>
+<programlisting><![CDATA[
+Unpacking enterprise.tar.Z
+bin/
+bin/v27/
+bin/v27/bin/
+...
+...
+vsp/releasenotes.css
+vsp/releasenotes.html
+vsp/vsp_auth.sql
+...done
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>When the files have been installed from the package the location
+supplied for the license file will be checked. If one is not found then you will
+receive the following warning:</para>
+<programlisting><![CDATA[
+**
+** WARNING: The license file entered is not valid or does not exist.
+** You will need to copy a valid license file manually
+** to the demo and db directories after the Virtuoso installation completes.
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Virtuoso server installation has a few variations. The next question
+from the installer asks which one you want to make default. Even though each
+variation is installed, a convenient symbolic link will be made to
+<computeroutput>bin/virtuoso</computeroutput> from the selected type.
+Running <computeroutput>ls -l</computeroutput> in the bin directory after
+installation will reveal all.</para>
+<programlisting><![CDATA[
+Checking for installed optional components...
+Please choose which Virtuoso server you wish to install:
+ 1) Universal Server
+ 2) Universal Server with iODBC
+ 3) Universal Server with iODBC and support for Java
+ 4) Universal Server with iODBC and support for PHP
+ 5) Universal Server with iODBC and support for Java and PHP
+ 6) Universal Server with iODBC and support for CLR Hosting via Mono
+ 7) Universal Server with iODBC and support for CLR and Java
+ 8) Universal Server with iODBC and support for CLR, Java and PHP4
+
+[8] :
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The installer will search for required third-party components
+depending on which option is selected in the previous step. For example, choosing
+the Virtuoso with Java support will require a Java runtime. Results of the
+search are listed as suggestions from which you can confirm or type
+the actual location.</para>
+<programlisting><![CDATA[
+Attempting to locate the java runtime library (libjvm.so)...
+
+Suggested file locations:
+/usr/local/lib
+/usr/local/jdk1.3/jre/lib/i386/classic
+/usr/local/jdk1.3/jre/lib/i386/server
+/usr/local/jdk1.3/jre/lib/i386/client
+/usr/opt/blackdown-jdk-1.3.1/jre/lib/i386/classic
+/usr/opt/blackdown-jdk-1.3.1/jre/lib/i386/server
+/usr/opt/blackdown-jdk-1.3.1/jre/lib/i386/client
+/usr/local/jdk1.3/jre/lib/i386/classic
+/usr/local/jdk1.3/jre/lib/i386/server
+/usr/local/jdk1.3/jre/lib/i386/client
+
+Please select one of the above locations or press Enter to use
+the default (/usr/local/jdk1.3/jre/lib/i386/client):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Virtuoso installer includes a Mono runtime distribution, since
+Mono is a developing platform you may have your own installation that you
+can supply the path to here.</para>
+<programlisting><![CDATA[
+Please enter the full path to the Mono installation directory or
+Enter to use the default (/home/openlink/virtuoso/mono)
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Virtuoso now has enough information to configure its environment and
+startup scripts.</para>
+<programlisting><![CDATA[
+Setting up initial values in scripts and config files
+Setting up file bin/odbc.ini
+Setting up file bin/odbcinst.ini
+Setting up file bin/demo-start.sh
+Setting up file bin/demo-stop.sh
+Setting up file bin/virtuoso-start.sh
+Setting up file bin/virtuoso-stop.sh
+Setting up file db/virtuoso.ini
+Setting up file demo/demo.ini
+Setting up file mono/bin/mcs
+Setting up file virtuoso-enterprise.csh
+Setting up file virtuoso-enterprise.sh
+Setting up file initd_startup.template
+Setting up file initd_startup_demo.template
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The installer will now ask a series of questions for configuring the
+Virtuoso .INI files. First confirm or alter the default database SQL listener
+port number. This is the port number that this database will be available for
+ODBC connections and iSQL sessions.</para>
+<programlisting><![CDATA[
+Configuring port numbers for default and demo databases
+
+Please enter a port on which to run the default database
+SQL listener (default 1111):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Now you must specify the port number of the default database HTTP
+listener. This is the HTTP port that Virtuoso will listen on by default, you web-based
+administration interface for Virtuoso will be found here. If you confirm the
+default of 8889, then your Virtuoso will be available from:
+<computeroutput>http://server:8889/</computeroutput>, changing
+server to the name of your machine appropriately.</para>
+<programlisting><![CDATA[
+Please enter a port on which to run the default database
+HTTP listener (default 8889):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Now you must supply a friendly name that you wish to identify
+your Virtuoso server by on the network using Zero Configuration. </para>
+<tip><title>See Also:</title>
+<para>The <link linkend="rendezvous">Zero Configuration</link> section.</para></tip>
+<programlisting><![CDATA[
+Please enter a name for default database Zero Configuration
+(default "Virtuoso Universal Server at myserver:1111"):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Zero Configuration details need a default username to make the connection with.</para>
+<programlisting><![CDATA[
+Please enter a user name for default database Zero Configuration
+(default "dba"):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Now we have all of the above details to supply again for the Demo Virtuoso
+database. The port number supplied here must be different to those supplied previously.</para>
+<programlisting><![CDATA[
+Please enter a port on which to run the demo database
+SQL listener (default 1112):
+
+Please enter a port on which to run the demo database
+HTTP listener (default 8890):
+
+Please enter a name for demonstration database Zero Configuration
+(default Virtuoso Universal Server (demonstration) at myserver:1112):
+
+Please enter a user name for demonstration database Zero Configuration
+(default demo):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Virtuoso servers have default administrator usernames of "dba".
+The "dba" accounts have the default password of "dba". It is recommended that
+you alter this as soon as possibly for security. The installer now provides the
+opportunity to do this the first time the server is started.</para>
+<programlisting><![CDATA[
+Changing passwords for the Database Universal Server
+
+Please enter a replacement for the Default Database Server's
+SQL Administrative (dba) account password (twice) :
+Confirm Password :
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Virtuoso servers have default WebDAV administrator usernames
+of "dav". The "dav" accounts have the default password of "dav". It is
+recommended that you alter this as soon as possibly for security.
+The installer now provides the opportunity to do this the first time
+the server is started.</para>
+<programlisting><![CDATA[
+Please enter a replacement for the Default Database's
+WebDAV administrative (dav) account password (twice) :
+Confirm Password :
+
+Please wait while the passwords are changed:
+
+Changing passwords for the Demo Universal Server
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Likewise for the Demo server, you can change the default passwords:</para>
+<programlisting><![CDATA[
+Please enter a replacement for the Demonstration Database Server's
+SQL Administrative (dba) account password (twice) :
+Confirm Password :
+
+Please enter a replacement for the Demonstration Database Server's
+WebDAV Administrative (dav) account password (twice) :
+Confirm Password :
+
+Please wait while the passwords are changed:
+done.
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The file owner and group is changed at the end of the installation. You
+can choose what these shall be set to. By default the current user is selected.</para>
+<programlisting><![CDATA[
+Please enter the username:group for the user and group who should own
+files in this installation (default: openlink:openlink) :
+Setting owners:
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Finally the installer can start Virtuoso servers installed for you, but
+only if a valid license key has been supplied.</para>
+<programlisting><![CDATA[
+The Virtuoso Installer has not offered to start a database as
+no license key was found. Evaluation users should receive
+one via e-mail; in case of difficulties please contact
+<Technical.Support at openlinksw.com>.
+]]></programlisting>
+</listitem>
+</orderedlist>
</sect2>
- <sect2 id="limitsandparameters">
- <title>Limits</title>
- <para>The below table lists the most important parameters and limits for a database or a Virtuoso
- server instance. For space consumption of individual data types, see
- <link linkend="SpaceConsump">Space Consumption</link>.</para>
- <table colsep="1" frame="all" rowsep="0" shortentry="0" tocentry="1" tabstyle="decimalstyle" orient="land" pgwide="0">
- <title>Limits</title>
- <tgroup align="char" charoff="50" char="." cols="2">
- <colspec align="left" colnum="1" colsep="0" colwidth="20pc"/>
- <thead>
- <row>
- <entry>Limit Description</entry>
- <entry>Value</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>Identifier length</entry>
- <entry>100</entry>
- </row>
- <row>
- <entry>User name and password length</entry>
- <entry>100</entry>
- </row>
- <row>
- <entry>SQLstmt and proc text</entry>
- <entry>100K+</entry>
- </row>
- <row>
- <entry>varchar length</entry>
- <entry>Constrained by max row length when stored into non-LOB column, 10MB inside procedure code.</entry>
- </row>
- <row>
- <entry>Numeric precision</entry>
- <entry>Max 40 digits</entry>
- </row>
- <row>
- <entry>LOB column length</entry>
- <entry>2GB</entry>
- </row>
- <row>
- <entry>row length</entry>
- <entry>4086</entry>
- </row>
- <row>
- <entry>Columns per row</entry>
- <entry>200</entry>
- </row>
- <row>
- <entry>Database size</entry>
- <entry>32TB for data, 32TB for temp data </entry>
- </row>
- <row>
- <entry>Page size</entry>
- <entry>8K</entry>
- </row>
- <row>
- <entry>File size</entry>
- <entry>64 bit file offsets on supporting OS's</entry>
- </row>
- <row>
- <entry>Files per database</entry>
- <entry>unlimited</entry>
- </row>
- <row>
- <entry>Table size</entry>
- <entry>Up to database size </entry>
- </row>
- <row>
- <entry>Tables per database</entry>
- <entry>64K keys, a table takes 1 key for primary key, 1 key per index and 1 key for each obsolete primary key layout resulting from adding or dropping columns.</entry>
- </row>
- <row>
- <entry>Indexes per table</entry>
- <entry>Unlimited, subject to global cap on keys.</entry>
- </row>
- <row>
- <entry>Row in sorting/distinct temp</entry>
- <entry>4078b, as in tables </entry>
- </row>
- <row>
- <entry>Locks per transaction</entry>
- <entry>Depends on memory, 16b per row lock, 60b per page with at least one row lock.</entry>
- </row>
- <row>
- <entry>Changes per transaction</entry>
- <entry>Depends on memory, ini parameter allows cap on rollback before image.</entry>
- </row>
- <row>
- <entry>Virtual memory></entry>
- <entry>Depends on OS, 64 bit pointers on 64 bit platforms</entry>
- </row>
- <row>
- <entry>Threads</entry>
- <entry>Depends on OS, ini files specifies cap for pool for SQL client and web server worker thread pools.</entry>
- </row>
- <row>
- <entry>Max connections</entry>
- <entry>Depends on OS fdset size, at least 2048, license can set a limit</entry>
- </row>
- <row>
- <entry>Memory per connection</entry>
- <entry>22K plus up to 100 cached SQL statement compilations</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
+
+ <sect2 id="linuxinstpost"><title>Post Installation</title>
+ <sect3 id="linuxinstpostsan">
+ <title>Post-Installation Sanity Check</title>
+ <para>A quick way to check that the database is running, is to point a browser to the
+ http port. The following example URLs will show the System Manager for
+ the default, and the demo Virtuoso databases:</para>
+ <programlisting>http://localhost:8889
+http://localhost:8890
+http://a_virtuoso_server.org:8890</programlisting>
+ </sect3>
+ <sect3 id="linuxinstposttrb"><title>Troubleshooting DB Startup Failures</title>
+ <para><emphasis>Install failure</emphasis></para>
+ <para>Check the .log file in:</para>
+<programlisting><![CDATA[
+$<Directory where Virtuoso is installed>/bin/virtuoso.log
+]]></programlisting>
+ <para>in order to review the installed files binaries and databases (defaults)
+ for issues if install fails.</para>
+ <para><emphasis>.lck existance</emphasis></para>
+ <para>Check .log in case of .lck issue</para>
+ <para>Delete the .lck file and repeat the steps from above.</para>
+ <para><emphasis>.trx incompatiblity issue</emphasis></para>
+ <para>Check .log in case of .trx incompatiblity issue</para>
+ </sect3>
+ </sect2>
+
+ <sect2 id="linautovirt"><title>Starting Virtuoso Automatically on Reboot</title>
+
+ <para>Two files, named initd_startup.template and
+ initd_startup_demo.template, are placed in the top level of the
+ Virtuoso installation directory. On systems using SysVinit (most Linux
+ distributions, Solaris) the appropriate one should be copied into
+ /etc/init.d/ and symlinks created in the rcN.d/ directories, e.g.:</para>
+
+<programlisting><![CDATA[
+bash# cp initd_startup.template /etc/init.d/virtuoso
+]]></programlisting>
+
+ <para>Perform some sanity checks here, that the directory it uses exists, etc:</para>
+
+<programlisting><![CDATA[
+bash# vi /etc/init.d/virtuoso
+]]></programlisting>
+
+ <para>Test that it works correctly:</para>
+
+<programlisting><![CDATA[
+bash# /etc/init.d/virtuoso stop
+bash# /etc/init.d/virtuoso start
+]]></programlisting>
+
+ <para>Finally, create symbolic links in the regular runlevel directories
+ pointing to that script:</para>
+
+<programlisting><![CDATA[
+bash# cd /etc/rc2.d ; ln -s ../init.d/virtuoso S99virtuoso
+bash# cd /etc/rc3.d ; ln -s ../init.d/virtuoso S99virtuoso
+bash# cd /etc/rc5.d ; ln -s ../init.d/virtuoso S99virtuoso
+]]></programlisting>
+
+ <para>Virtuoso should now start when the service is restarted.</para>
+ </sect2>
+
+ <sect2 id="defpasschglin">
+ <title>Default passwords</title>
+ <para>See the following Quick Start chapter for very important information about
+ <link linkend="defpasschange">changing the default passwords</link>.</para>
+ </sect2>
+ </sect1>
+ <sect1 id="unxinstvirt">
+ <title>Virtuoso for Unix (Enterprise Edition)</title>
+ <!--sect2 id="unixdoyouwannamigrate">
+ <title>Existing Virtuoso 2.7 Users</title>
+ <para>You can migrate your existing Virtuoso servers to 3.0 using
+ the migration utility. The Virtuoso database file structure has been considerably
+ altered between versions. Please consult the
+ <link linkend="migrate27to30">Migration of Virtuoso from Version 2.7 to Version 3.0</link>
+ section for more details.</para>
+ </sect2-->
+ <sect2 id="b4instunx">
+ <title>Before You Install</title>
+ <para>To ensure a smooth installation, please review the
+ following checklist before you start the setup program.</para>
+ <sect3 id="unxdldsw">
+ <title>Have you downloaded the software?</title>
+ <para>If you have not already done so, please download your copy of OpenLink
+ Virtuoso from the Virtuoso web site. The URL is
+ <ulink url="http://www.openlinksw.com/virtuoso/">http://www.openlinksw.com/virtuoso/</ulink>.
+ When you visit the site, select "Software Download".</para>
+ </sect3>
+ <sect3 id="unxreinstvirt">
+ <title>Reinstalling Virtuoso?</title>
+ <para>If you are reinstalling Virtuoso, you must first stop the Database Servers.
+ You can shut these services down with the following command
+ executed from your UNIX shell prompt:</para>
+ <programlisting>sh virtuoso-stop.sh </programlisting>
+ <para>or</para>
+ <programlisting>virtuoso-stop.sh</programlisting>
+ <para>or</para>
+ <programlisting>./virtuoso-stop.sh</programlisting>
+ </sect3>
+ <sect3 id="unxfreeports">
+ <title>Are ports 1111, 1112, 8889 and 8890 free?</title>
+ <para>During the installation you will be prompted for an HTTP port number for
+ use by each Virtuoso System Manager. If you are already running a web server
+ or other listener on that port, you will encounter problems, and should choose another
+ free port when you are prompted. </para>
+ <para>By default, the Virtuoso DBMS listens on port 1111.
+ If this port is currently in use by another server then after the installation completes
+ you will need to change the port number in the Local Virtuoso ODBC or UDBC DSN that is
+ created during the installation process, and also in the following file:</para>
+ <programlisting>
+$<Installation Directory>/bin/virtuoso.ini</programlisting>
+ <para>typically</para>
+ <programlisting>/usr/home/virtuoso</programlisting>
+ <para>To check if a port is in use you can use the following
+ command, and review the output:</para>
+ <programlisting>netstat -an | more </programlisting>
+ </sect3>
+ <sect3 id="unxvirtuser">
+ <title>Do you already have a "virtuoso" user
+ account on your UNIX system ?</title>
+ <para>Please create a UNIX user account called "virtuoso".</para>
+ </sect3>
+ <sect3 id="unxiodbcexist">
+ <title>Do you already have functional iODBC data sources
+ on your system ?</title>
+ <para>The OpenLink Virtuoso for UNIX installation presumes the following:</para>
+ <simplelist>
+ <member>You intend to connect to a Local Virtuoso server using iODBC
+ or OpenLink UDBC</member>
+ <member>You intend to connect to one or more Remote Virtuoso servers
+ on your network using iODBC or UDBC</member>
+ <member>You intend to Attach tables hosted within non-local or
+ Remote Virtuoso database servers, into a Local or Remote Virtuoso Server</member>
+ <member>The existence of functional OpenLink or third-party iODBC
+ drivers for UNIX that connect to the non database servers referred to above.</member>
+ <member>In the absence of iODBC drivers for your non Virtuoso
+ database, that a functional OpenLink or third-party UDBC Drivers exists for these database
+ servers. </member>
+ </simplelist>
+ <para>If you are using OpenLink Multi-Tier ODBC
+ Drivers for your remote database connections then we highly recommend the use of the Web
+ Assistant for creating iODBC Data Source Names.</para>
+ </sect3>
+ <sect3 id="unxiodbcfunc">
+ <title>Are your iODBC Data Source Names functional ?</title>
+ <para>It is a useful sanity-check to ensure that your iODBC or UDBC
+ data sources are functional, OpenLink provides an "odbctest" program for
+ verifying basic usability of iODBC data sources. Both of these programs reside in the
+ "samples" directory situated beneath the directory into which Virtuoso is
+ installed.</para>
+ </sect3>
+ </sect2>
+ <sect2 id="instprocunx"><title>Installation Process</title>
+ <para>Once you have downloaded the required tar file from the
+web or ftp site and have placed the file in a designated installation directory you are
+ready to commence the Virtuoso installation process. </para>
+ <para>You may want to specify a new user to own the Virtuoso
+installation and then you can place the installation tar file into that users home
+directory.</para>
+<orderedlist>
+ <listitem><para>First step is to un-tar the file to obtain the install script
+ and archive file. Use the following command:</para>
+ <programlisting>tar xvf <tar file>.tar</programlisting>
+ <para>replacing <tar file> with the relevant name of the file you downloaded.</para></listitem>
+ <listitem><para>run the install script using the following command:</para>
+<programlisting>[virtuoso at myserver virtuoso]$ sh /install.sh</programlisting>
+ <para>The installation process will now begin and prompt you for required information.</para>
+</listitem>
+
+<listitem>
+<para>The install script will first try and detect running Virtuoso server instances.
+In cases where an old Virtuoso server is being upgraded you must ensure that
+the old Virtuoso is first shutdown. It is advisable that you backup up your
+systems before continuing.</para>
+<programlisting><![CDATA[
+Checking requested components
+Checking for existing installations and/or instances of Virtuoso...
+ 7269 ? 00:06:23 virtuoso
+/proc/net/tcp: Permission denied
+
+** Alert: [running processes; ]
+
+** Warning: You have Virtuoso previously installed on this machine.
+**
+** To avoid existing data being overwritten or lost, you may press ^C to
+** exit this installer, terminate and remove the existing installation,
+** or proceed taking care to enter non-conflicting data below, by pressing
+** Enter.
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>If you are upgrading a server then the installer will save copies of
+old configuration data for later use.</para>
+<programlisting><![CDATA[
+Preserving any existing configurations...
+find: db: No such file or directory
+find: demo: No such file or directory
+find: bin: No such file or directory
+0 blocks
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>You should have received a license file via email. This file should be
+copied to the server installation directory prior to installation. The installer
+will ask you for its location if none is found. If you do not have the license
+file at this time the installer will still continue.</para>
+<programlisting><![CDATA[
+Checking licensing...
+
+A license file is required for the Virtuoso Server Instance(s) to
+start. Please enter the full path and name of a valid Virtuoso
+license file [./virtuoso.lic]:
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Now the installer will continue to install files from the package. Every
+file installed will be echoed to the screen. </para>
+<programlisting><![CDATA[
+Unpacking enterprise.tar.Z
+bin/
+bin/v27/
+bin/v27/bin/
+...
+...
+vsp/releasenotes.css
+vsp/releasenotes.html
+vsp/vsp_auth.sql
+...done
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>When the files have been installed from the package the location
+supplied for the license file will be checked. If one is not found then you will
+receive the following warning:</para>
+<programlisting><![CDATA[
+**
+** WARNING: The license file entered is not valid or does not exist.
+** You will need to copy a valid license file manually
+** to the demo and db directories after the Virtuoso installation completes.
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Virtuoso server installation has a few variations. The next question
+from the installer asks which one you want to make default. Even though each
+variation is installed, a convenient symbolic link will be made to
+<computeroutput>bin/virtuoso</computeroutput> from the selected type.
+Running <computeroutput>ls -l</computeroutput> in the bin directory after
+installation will reveal all.</para>
+<programlisting><![CDATA[
+Checking for installed optional components...
+Please choose which Virtuoso server you wish to install:
+ 1) Universal Server
+ 2) Universal Server with iODBC
+ 3) Universal Server with iODBC and support for Java
+ 4) Universal Server with iODBC and support for PHP
+ 5) Universal Server with iODBC and support for Java and PHP
+ 6) Universal Server with iODBC and support for CLR Hosting via Mono
+ 7) Universal Server with iODBC and support for CLR and Java
+ 8) Universal Server with iODBC and support for CLR, Java and PHP4
+
+[8] :
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The installer will search for required third-party components
+depending on which option is selected in the previous step. For example, choosing
+the Virtuoso with Java support will require a Java runtime. Results of the
+search are listed as suggestions from which you can confirm or type
+the actual location.</para>
+<programlisting><![CDATA[
+Attempting to locate the java runtime library (libjvm.so)...
+
+Suggested file locations:
+/usr/local/lib
+/usr/local/jdk1.3/jre/lib/i386/classic
+/usr/local/jdk1.3/jre/lib/i386/server
+/usr/local/jdk1.3/jre/lib/i386/client
+/usr/opt/blackdown-jdk-1.3.1/jre/lib/i386/classic
+/usr/opt/blackdown-jdk-1.3.1/jre/lib/i386/server
+/usr/opt/blackdown-jdk-1.3.1/jre/lib/i386/client
+/usr/local/jdk1.3/jre/lib/i386/classic
+/usr/local/jdk1.3/jre/lib/i386/server
+/usr/local/jdk1.3/jre/lib/i386/client
+
+Please select one of the above locations or press Enter to use
+the default (/usr/local/jdk1.3/jre/lib/i386/client):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Virtuoso installer includes a Mono runtime distribution, since
+Mono is a developing platform you may have your own installation that you
+can supply the path to here.</para>
+<programlisting><![CDATA[
+Please enter the full path to the Mono installation directory or
+Enter to use the default (/home/openlink/virtuoso/mono)
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Virtuoso now has enough information to configure its environment and
+startup scripts.</para>
+<programlisting><![CDATA[
+Setting up initial values in scripts and config files
+Setting up file bin/odbc.ini
+Setting up file bin/odbcinst.ini
+Setting up file bin/demo-start.sh
+Setting up file bin/demo-stop.sh
+Setting up file bin/virtuoso-start.sh
+Setting up file bin/virtuoso-stop.sh
+Setting up file db/virtuoso.ini
+Setting up file demo/demo.ini
+Setting up file mono/bin/mcs
+Setting up file virtuoso-enterprise.csh
+Setting up file virtuoso-enterprise.sh
+Setting up file initd_startup.template
+Setting up file initd_startup_demo.template
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The installer will now ask a series of questions for configuring the
+Virtuoso .INI files. First confirm or alter the default database SQL listener
+port number. This is the port number that this database will be available for
+ODBC connections and iSQL sessions.</para>
+<programlisting><![CDATA[
+Configuring port numbers for default and demo databases
+
+Please enter a port on which to run the default database
+SQL listener (default 1111):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Now you must specify the port number of the default database HTTP
+listener. This is the HTTP port that Virtuoso will listen on by default, you web-based
+administration interface for Virtuoso will be found here. If you confirm the
+default of 8889, then your Virtuoso will be available from:
+<computeroutput>http://server:8889/</computeroutput>, changing
+server to the name of your machine appropriately.</para>
+<programlisting><![CDATA[
+Please enter a port on which to run the default database
+HTTP listener (default 8889):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Now you must supply a friendly name that you wish to identify
+your Virtuoso server by on the network using Zero Configuration. </para>
+<tip><title>See Also:</title>
+<para>The <link linkend="rendezvous">Zero Configuration</link> section.</para></tip>
+<programlisting><![CDATA[
+Please enter a name for default database Zero Configuration
+(default "Virtuoso Universal Server at myserver:1111"):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Zero Configuration details need a default username to make the connection with.</para>
+<programlisting><![CDATA[
+Please enter a user name for default database Zero Configuration
+(default "dba"):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Now we have all of the above details to supply again for the Demo Virtuoso
+database. The port number supplied here must be different to those supplied previously.</para>
+<programlisting><![CDATA[
+Please enter a port on which to run the demo database
+SQL listener (default 1112):
+
+Please enter a port on which to run the demo database
+HTTP listener (default 8890):
+
+Please enter a name for demonstration database Zero Configuration
+(default Virtuoso Universal Server (demonstration) at myserver:1112):
+
+Please enter a user name for demonstration database Zero Configuration
+(default demo):
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Virtuoso servers have default administrator usernames of "dba".
+The "dba" accounts have the default password of "dba". It is recommended that
+you alter this as soon as possibly for security. The installer now provides the
+opportunity to do this the first time the server is started.</para>
+<programlisting><![CDATA[
+Changing passwords for the Database Universal Server
+
+Please enter a replacement for the Default Database Server's
+SQL Administrative (dba) account password (twice) :
+Confirm Password :
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The Virtuoso servers have default WebDAV administrator usernames
+of "dav". The "dav" accounts have the default password of "dav". It is
+recommended that you alter this as soon as possibly for security.
+The installer now provides the opportunity to do this the first time
+the server is started.</para>
+<programlisting><![CDATA[
+Please enter a replacement for the Default Database's
+WebDAV administrative (dav) account password (twice) :
+Confirm Password :
+
+Please wait while the passwords are changed:
+
+Changing passwords for the Demo Universal Server
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Likewise for the Demo server, you can change the default passwords:</para>
+<programlisting><![CDATA[
+Please enter a replacement for the Demonstration Database Server's
+SQL Administrative (dba) account password (twice) :
+Confirm Password :
+
+Please enter a replacement for the Demonstration Database Server's
+WebDAV Administrative (dav) account password (twice) :
+Confirm Password :
+
+Please wait while the passwords are changed:
+done.
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>The file owner and group is changed at the end of the installation. You
+can choose what these shall be set to. By default the current user is selected.</para>
+<programlisting><![CDATA[
+Please enter the username:group for the user and group who should own
+files in this installation (default: openlink:openlink) :
+Setting owners:
+]]></programlisting>
+</listitem>
+
+<listitem>
+<para>Finally the installer can start Virtuoso servers installed for you, but
+only if a valid license key has been supplied.</para>
+<programlisting><![CDATA[
+The Virtuoso Installer has not offered to start a database as
+no license key was found. Evaluation users should receive
+one via e-mail; in case of difficulties please contact
+<Technical.Support at openlinksw.com>.
+]]></programlisting>
+</listitem>
+</orderedlist>
+ </sect2>
+
+ <sect2 id="unxinstvirtinstpost"><title>Post Installation</title>
+ <sect3 id="unxinstvirtpost">
+ <title>Post-Installation Sanity Check</title>
+ <para>A quick way to check that the database is running, is to point a browser to the
+ http port. The following example URLs will show the System Manager for
+ the default, and the demo Virtuoso databases:</para>
+ <programlisting>http://localhost:8889
+http://localhost:8890
+http://a_virtuoso_server.org:8890</programlisting>
+ </sect3>
+ <sect3 id="unxinstvirtinstposttrb"><title>Troubleshooting DB Startup Failures</title>
+ <para><emphasis>Install failure</emphasis></para>
+ <para>Check the .log file in:</para>
+<programlisting><![CDATA[
+$<Directory where Virtuoso is installed>/bin/virtuoso.log
+]]></programlisting>
+ <para>in order to review the installed files binaries and databases (defaults)
+ for issues if install fails.</para>
+ <para><emphasis>.lck existance</emphasis></para>
+ <para>Check .log in case of .lck issue</para>
+ <para>Delete the .lck file and repeat the steps from above.</para>
+ <para><emphasis>.trx incompatiblity issue</emphasis></para>
+ <para>Check .log in case of .trx incompatiblity issue</para>
+ </sect3>
+ </sect2>
+
+ <sect2 id="unxautovirt"><title>Starting Virtuoso Automatically on Reboot</title>
+
+ <para>Two files, named initd_startup.template and
+ initd_startup_demo.template, are placed in the top level of the
+ Virtuoso installation directory. On systems using SysVinit (most Linux
+ distributions, Solaris) the appropriate one should be copied into
+ /etc/init.d/ and symlinks created in the rcN.d/ directories, e.g.:</para>
+
+<programlisting><![CDATA[
+bash# cp initd_startup.template /etc/init.d/virtuoso
+]]></programlisting>
+
+ <para>Perform some sanity checks here, that the directory it uses exists, etc:</para>
+
+<programlisting><![CDATA[
+bash# vi /etc/init.d/virtuoso
+]]></programlisting>
+
+ <para>Test that it works correctly:</para>
+
+<programlisting><![CDATA[
+bash# /etc/init.d/virtuoso stop
+bash# /etc/init.d/virtuoso start
+]]></programlisting>
+
+ <para>Finally, create symbolic links in the regular runlevel directories
+ pointing to that script:</para>
+
+<programlisting><![CDATA[
+bash# cd /etc/rc2.d ; ln -s ../init.d/virtuoso S99virtuoso
+bash# cd /etc/rc3.d ; ln -s ../init.d/virtuoso S99virtuoso
+bash# cd /etc/rc5.d ; ln -s ../init.d/virtuoso S99virtuoso
+]]></programlisting>
+
+ <para>Virtuoso should now start when the service is restarted.</para>
+ </sect2>
+
+ <sect2 id="defpasschgunx">
+ <title>Default passwords</title>
+ <para>See the following Quick Start chapter for very important information about
+ <link linkend="defpasschange">changing the default passwords</link>.</para>
</sect2>
</sect1>
+<sect1 id="unixpersonainstall">
+ <title>Virtuoso for Unix (Personal Edition)</title>
+ <sect2 id="unixpersonainstalldescr">
+ <title>Installation</title>
+ <para>Once the required tar file has been downloaded from the web or ftp site and
+placed in a designated installation directory the installation process is ready to
+commence. Choose or create a suitable user account to own your Virtuoso installation.
+ </para>
+ <itemizedlist>
+ <listitem>The first step is to un-tar the file to obtain the install script and
+archive file. Use the following command, replacing with the relevant name of the file
+you downloaded:
+ </listitem>
+<programlisting><![CDATA[
+tar xvf <tar file>.tar
+]]></programlisting>
+ <listitem>
+If a license file exists place this in the same directory as installation files and it
+will be used during installation.
+ </listitem>
+ <listitem>
+If upgrading an existing Virtuoso instance ensure it is shutdown first and a backup of
+your database file is made, then run the install script using the following command:
+ </listitem>
+<programlisting><![CDATA[
+$ sh ./install.sh
+
+- Extracting Virtuoso Personal Edition v5.0
+
+- Creating default environment settings
+
+- Creating default database settings
+Installing new virtuoso.ini in $VIRTUOSO_HOME/database
+Installing new php.ini in $VIRTUOSO_HOME/database
+Creating symlink to $VIRTUOSO_HOME/bin/virtuoso-iodbc-t
+
+- Registering ODBC drivers
+
+- Registering .NET provider for Mono
+
+- Installing VAD packages in database (this can take some time)
+
+- Checking where license should be stored
+
+- Starting OpenLink License Manager
+
+- Checking for initial Virtuoso license
+
+- Starting Virtuoso server instance
+
+- Finalizing installation
+
+
+This concludes the first part of the installation.
+
+
+Please start a browser manually and open the following URL to finalize
+the installation process:
+
+ http://<hostname>:8890/install/
+
+
+Installation completed
+$
+]]></programlisting>
+ </itemizedlist>
+</sect2>
+ <sect2 id="unixpersonainstallinstpost"><title>Post Installation</title>
+ <sect3 id="unixpersonainstallpost">
+ <title>Post-Installation Sanity Check</title>
+ <para>A quick way to check that the database is running, is to point a browser to the
+ http port. The following example URLs will show the System Manager for
+ the default, and the demo Virtuoso databases:</para>
+ <programlisting>http://localhost:8889
+http://localhost:8890
+http://a_virtuoso_server.org:8890</programlisting>
+ </sect3>
+ <sect3 id="unixpersonainstallinstposttrb"><title>Troubleshooting DB Startup Failures</title>
+ <para><emphasis>Install failure</emphasis></para>
+ <para>Check the .log file in:</para>
+<programlisting><![CDATA[
+$<Directory where Virtuoso is installed>/bin/virtuoso.log
+]]></programlisting>
+ <para>in order to review the installed files binaries and databases (defaults)
+ for issues if install fails.</para>
+ <para><emphasis>.lck existance</emphasis></para>
+ <para>Check .log in case of .lck issue</para>
+ <para>Delete the .lck file and repeat the steps from above.</para>
+ <para><emphasis>.trx incompatiblity issue</emphasis></para>
+ <para>Check .log in case of .trx incompatiblity issue</para>
+ </sect3>
+ </sect2>
+<sect2 id="unixpersonainstallconfg">
+ <title>Configuration</title>
+ <itemizedlist>
+ <listitem>Once the URL above has been loaded a browser the first page can be
+used to select a license file for use with the installation if one is not already
+in place, otherwise the task can be skipped using the button provided:
+ <figure id="v50peunx00" float="1">
+ <title>License file</title>
+ <graphic fileref="inst/v50-pe-unx-00.png"/>
+ </figure>
+ </listitem>
+ <listitem>
+It is strongly advised that the standard "dba" and "dav" user account password be
+changed using the post installation page provided:
+ <figure id="v50peunx01" float="1">
+ <title>DAV/DBA authentication Setting page</title>
+ <graphic fileref="inst/v50-pe-unx-01.png"/>
+ </figure>
+ </listitem>
+ <listitem>The post installation page is now complete and the Virtuoso Welcome
+page is presented:
+ <figure id="v50peunx02" float="1">
+ <title>Post installation page</title>
+ <graphic fileref="inst/v50-pe-unx-02.png"/>
+ </figure>
+ </listitem>
+ </itemizedlist>
+ <para>The installation is now ready for use.</para>
+</sect2>
+ <sect2 id="installdemopersonaledition">
+ <title>Demo Database</title>
+ <para><link linkend="demodbinstallsteps">Installation steps</link>.</para>
+ </sect2>
+
+</sect1>
+<sect1 id="installmacosx"><title>Virtuoso for Mac OS X</title>
+
+ <!--sect2 id="macxdoyouwannamigrate">
+ <title>Existing Virtuoso 2.7 Users</title>
+ <para>You can migrate your existing Virtuoso servers to 3.0 using
+ the migration utility. The Virtuoso database file structure has been considerably
+ altered between versions. Please consult the
+ <link linkend="migrate27to30">Migration of Virtuoso from Version 2.7 to Version 3.0</link>
+ section for more details.</para>
+ </sect2-->
+ <sect2 id="macosxbeforeuinst"><title>Before You Install</title>
+ <para>Before installing the Virtuoso software for Mac OS X you must ensure
+ that you have the correct package from the <ulink url="http://www.openlinksw.com/">OpenLink</ulink>
+ Web Site.</para>
+
+ </sect2>
+
+ <sect2 id="macosxinst"><title>Installation Process</title>
+
+ <para>Open the Virtuoso Personal Edition Disk Image file ntvpz2zz.dmg by either double clicking on
+ the DMG file in the Finder windows or using the "open" command from a Terminal window, to mount
+ the Disk Image containing the VirtuosoPersonalEdition.mpkg installer.
+ </para>
+
+ <figure id="v50pe00" float="1"><title>Mounting the Disk Image</title>
+ <graphic fileref="mac/v50pe00.png" width="250" depth="217"/></figure>
+
+ <para>The installer will load the Introduction page.
+ </para>
+
+ <figure id="v50pe01" float="1"><title>Installer Introduction Page</title>
+ <graphic fileref="mac/v50pe01.png" width="626" depth="445"/></figure>
+
+ <para>Review the Readme page for any important information concerning the product installation.
+ </para>
+
+ <figure id="v50pe02" float="1"><title>Important Information</title>
+ <graphic fileref="mac/v50pe02.png" width="624" depth="441"/></figure>
+
+ <para>Read the license agreement and "agree" to the terms.
+ </para>
+
+ <figure id="v50pe03" float="1"><title>Software License Agreement</title>
+ <graphic fileref="mac/v50pe03.png" width="621" depth="442"/></figure>
+
+ <para>Select the Destination volume the software is to be installed on.
+ </para>
+
+ <figure id="v50pe04" float="1"><title>Select Destination</title>
+ <graphic fileref="mac/v50pe04.png" width="622" depth="440"/></figure>
+
+ <para>Choose to perform and Easy(default) installation or click on the "customize" button to perform a Custom installation.
+ </para>
+
+ <figure id="v50pe05" float="1"><title>Selecting the Type of Installation</title>
+ <graphic fileref="mac/v50pe05.png" width="622" depth="440"/></figure>
+
+ <para>If the "Custom" option was selected in the previous step then select the packages to be installed.
+ </para>
+
+ <figure id="v50pe06" float="1"><title>Customizing the Installation</title>
+ <graphic fileref="mac/v50pe06.png" width="619" depth="449"/></figure>
+
+
+ <para>The software must be install by a user with Administrative privileges on the machine.
+ </para>
+
+ <figure id="v50pe07" float="1"><title>Identifying yourself as Administrator</title>
+ <graphic fileref="mac/v50pe07.png" width="437" depth="238"/></figure>
+
+ <para>The software components will be installed the status of which is indicated by the progress bar.
+ </para>
+
+ <figure id="v50pe08" float="1"><title>Preparing ... </title>
+ <graphic fileref="mac/v50pe08.png" width="623" depth="441"/></figure>
+
+ <para>The Virtuoso Server is started at the end of this process and a Web page loaded enabling you
+ to obtain a trial or full license from the company order processing site online.
+ </para>
+
+ <figure id="v50pe09" float="1"><title>Admin Assistant</title>
+ <graphic fileref="mac/v50pe09.png" width="737" depth="361"/></figure>
+
+ <para>Choose to obtain a Trial license for an evaluation or enter the shop site to purchase a full license.
+ </para>
+
+ <figure id="v50pe10" float="1"><title>The Trial license page</title>
+ <graphic fileref="mac/v50pe10.png" width="905" depth="693"/></figure>
+
+ <para>Click on the "Download License" button on the right to obtain the license file immediately.
+ An e-mail will also be sent with details of the license and the location on the ODS account of the
+ registered user where in can be obtained from at a later date. Once a license file is available on the
+ machine use the "Browse" button to locate it and the "Set License" button to
+ initialize the Virtuoso server with this license file.
+ </para>
+
+ <figure id="v50pe11" float="1"><title>Download license</title>
+ <graphic fileref="mac/v50pe11.png" width="881" depth="759"/></figure>
+
+ <para>Choose to change the "dba" and "dav" administrative user passwords from their default
+ of "dba" and "dav" respectively to a value of your choice.
+ </para>
+
+ <figure id="v50pe12" float="1"><title>Change passwords</title>
+ <graphic fileref="mac/v50pe12.png" width="858" depth="503"/></figure>
+
+ <para>The Virtuoso Server Welcome page will now be displayed indicating the server is online.
+ This Web based page can be used for general configuration and usage of the Virtuoso Server.
+ </para>
+
+ <figure id="v50pe13" float="1"><title>Welcome</title>
+ <graphic fileref="mac/v50pe13.png" width="766" depth="622"/></figure>
+
+ <para>The Installation is now complete.
+ </para>
+
+ <figure id="v50pe14" float="1"><title>Installation complete</title>
+ <graphic fileref="mac/v50pe14.png" width="623" depth="439"/></figure>
+
+ </sect2>
+
+ <sect2 id="macosxconfigur"><title>Configuration</title>
+
+ <para>Click on the "Conductor" link in the left frame of the Welcome page to load the
+ Virtuoso Conductor which is the Administration interface for the installation.
+ Enter the "dba" username and password to login.
+ </para>
+
+ <figure id="v50pe15" float="1"><title>Configuration</title>
+ <graphic fileref="mac/v50pe15.png" width="877" depth="752"/></figure>
+
+ <para>Once logged into the conductor click on any of the "Tabs" along the top to Administer the various
+ features of the Virtuoso Universal Server installation.
+ </para>
+
+ <figure id="v50pe16" float="1"><title>Various features using Conductor Tabs</title>
+ <graphic fileref="mac/v50pe16.png" width="878" depth="749"/></figure>
+
+ <para>Apple scripts for starting and stopping your Virtuoso Universal Server installation are located in
+ the "/Application/OpenLink Virtuoso" folder of the machine.
+ </para>
+
+ <figure id="v50pe17" float="1"><title>Location of apple scripts</title>
+ <graphic fileref="mac/v50pe17.png" width="377" depth="438"/></figure>
+
+ </sect2>
+
+ <sect2 id="macosxinstpost"><title>Post Installation</title>
+ <sect3 id="macosxinstpostsan">
+ <title>Post-Installation Sanity Check</title>
+ <para>A quick way to check that the database is running, is to point a browser to the
+ http port. The following example URLs will show the System Manager for
+ the default, and the demo Virtuoso databases:</para>
+ <programlisting>http://localhost:8889
+http://localhost:8890
+http://a_virtuoso_server.org:8890</programlisting>
+ </sect3>
+ <sect3 id="macosxinstposttrb"><title>Troubleshooting DB Startup Failures</title>
+ <para><emphasis>Install failure</emphasis></para>
+ <para>Check the .log files for the database etc. in order to review the installed files binaries and databases (defaults)
+ for issues if install fails.</para>
+ <figure id="instmac" float="1">
+ <title>The .log file</title>
+ <graphic fileref="ui/instmac.png"/>
+ </figure>
+ <para><emphasis>.lck existance</emphasis></para>
+ <para>Check .log in case of .lck issue</para>
+ <para>Delete the .lck file and repeat the steps from above.</para>
+ <para><emphasis>.trx incompatiblity issue</emphasis></para>
+ <para>Check .log in case of .trx incompatiblity issue</para>
+ <figure id="instmac2" float="1">
+ <title>The .log file</title>
+ <graphic fileref="ui/instmac2.png"/>
+ </figure>
+ </sect3>
+ </sect2>
+
+ <sect2 id="macosxodbcdsnconf"><title>Configuring an ODBC Data Source</title>
+
+ <para>Launch the iODBC Administrator, assuming that you have the iODBC
+ Administrator installed.</para>
+
+ <para>On some Mac OS X systems installed on an HFS partition, the icons may
+ not be displayed correctly or at all, due to a Mac OS X bug. In such cases
+ a simple reboot of your system should correct this.</para>
+
+ <para>Once the iODBC Administrator window has appeared you can press the
+ <emphasis>Add</emphasis> button on the either the <emphasis>User DSN</emphasis>
+ or the <emphasis>System DSN</emphasis> panel to add a new Data Source entry.</para>
+
+ <figure id="macconfig01" float="1"><title>ODBC Administrator</title>
+ <graphic fileref="mac/config01.jpg"/></figure>
+
+ <para>Choose the driver that you wish to create a Data Source for, in this
+ case the Virtuoso Driver (3.0).</para>
+
+ <figure id="macconfig02" float="1"><title>ODBC Administrator - Choose Virtuoso Driver</title>
+ <graphic fileref="mac/config03.jpg"/></figure>
+
+ <para>Provide all required details in the fields provided by the setup panel.</para>
+
+ <figure id="macconfig03" float="1"><title>ODBC Administrator - Configure Virtuoso DSN</title>
+ <graphic fileref="mac/config04.jpg"/></figure>
+
+ <para>The server can be picked from the list of Zero Configuration Datasources
+ that is discovered.</para>
+
+ <figure id="osximage23" float="1"><title>Pick Zero Config</title>
+ <graphic fileref="mac/osximage23.gif" /></figure>
+
+ <para>Alternatively a manual selection can be made for the server.</para>
+
+ <figure id="osximage25" float="1"><title>Pick manual mode</title>
+ <graphic fileref="mac/osximage25.gif" /></figure>
+
+ <para>In this case enter the hostname (or IP) and port number.</para>
+
+ <figure id="osximage34" float="1"><title>Manual Server Entry</title>
+ <graphic fileref="mac/osximage34.gif" /></figure>
+
+
+ <figure id="macconfig04" float="1"><title>ODBC Administrator - Configure Virtuoso DSN</title>
+ <graphic fileref="mac/config05.jpg"/></figure>
+
+ <figure id="macconfig06" float="1"><title>ODBC Administrator - Configure Virtuoso DSN</title>
+ <graphic fileref="mac/config06.jpg"/></figure>
+
+ <para>Press the <emphasis>Finish</emphasis> button to save the Data Source
+ information.</para>
+
+ </sect2>
+
+ <sect2 id="macosxodbcdsntest"><title>Testing an ODBC Data Source</title>
+
+ <para>Select the Data Source from the DSN list, and press the <emphasis>Test</emphasis>
+ button.</para>
+
+ <para>You will be prompted for a username and password to establish a
+ connection with the Data Source.</para>
+
+ <figure id="macconfig07" float="1"><title>Login - Identity Tab</title>
+ <graphic fileref="mac/config07.jpg" /></figure>
+
+<para>The login dialogue also allows you to
+ alter the configuration if required.</para>
+
+ <para>Under the Connection Tab are the fields for the remote server,
+ and the authentication method. Typically the defaults are used.</para>
+
+ <figure id="macconfig30" float="1"><title>Login - Connection Tab</title>
+ <graphic fileref="mac/osximage30.gif" /></figure>
+
+ <para>The Options page has Database, Charset and daylight savings
+ configuration. Typically the defaults are used.</para>
+
+ <figure id="macconfig31" float="1"><title>Login - Options Tab</title>
+ <graphic fileref="mac/osximage31.gif" /></figure>
+
+ <para>The About page shows the software details.</para>
+
+ <figure id="macconfig32" float="1"><title>Login - About</title>
+ <graphic fileref="mac/osximage32.gif" /></figure>
+
+ <para>The result of the test is shown in a popup window.</para>
+
+ <figure id="macconfig33" float="1"><title>Test Result</title>
+ <graphic fileref="mac/osximage33.gif" /></figure>
+
+ </sect2>
+
+ <sect2 id="defpasschgmac">
+ <title>Default passwords</title>
+ <para>See the following Quick Start chapter for very important information about
+ <link linkend="defpasschange">changing the default passwords</link>.</para>
+ </sect2>
+ <sect2 id="installdemomac">
+ <title>Demo Database</title>
+<para><link linkend="demodbinstallsteps">Installation steps</link>.</para>
+ </sect2>
+
+</sect1>
+
+ <sect1 id="installvsgrid"><title>Virtuoso ADO.Net Data Grid Form Application</title>
+ <para>This section details the steps required to create a simple Visual Studio 2008 Windows Form
+application with associated DataGridView control for displaying data in selected tables from a Virtuoso
+database.</para>
+<orderedlist>
+ <listitem>Launch the Visual Studio 2008 SP1 IDE.
+ <figure id="insg1" float="1">
+ <title>Visual Studio</title>
+ <graphic fileref="ui/insg1.png"/>
+ </figure>
+ </listitem>
+ <listitem>Create a Web Application project by going to the File menu in Visual Studio and choosing New Project.
+ </listitem>
+ <listitem>When the New Project window appears, choose either Visual Basic or Visual C# as the programming language.
+ </listitem>
+ <listitem>Within the language category, click on Windows and select Windows Form Application from the right-hand panel.
+ </listitem>
+ <listitem>Choose a name for the project, for example VirtuosoDataGridApp, and click OK.
+ <figure id="insg5" float="1">
+ <title>name for the project</title>
+ <graphic fileref="ui/insg5.png"/>
+ </figure>
+ </listitem>
+ <listitem>From the Data, menu select the Show Data Sources menu item to display a list of available Data sources.
+ <figure id="insg6" float="1">
+ <title>Show Data Sources</title>
+ <graphic fileref="ui/insg6.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click on the Add New Data Source link to add a new data source.
+ <figure id="insg7" float="1">
+ <title>Add New Data Source</title>
+ <graphic fileref="ui/insg7.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the Data Source Configuration Wizard dialog Choose Data Source Type page, select the Database data source type and click Next.
+ <figure id="insg8" float="1">
+ <title>Data Source Configuration Wizard</title>
+ <graphic fileref="ui/insg8.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the Data Source Configuration Wizard dialog Choose your Data Connection page, select the New Connection button.
+ <figure id="insg9" float="1">
+ <title>Data Connection page</title>
+ <graphic fileref="ui/insg9.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the Choose Data Source dialog, select OpenLink Virtuoso Data Source from the list and click Continue.
+ <figure id="insg10" float="1">
+ <title>OpenLink Virtuoso Data Source</title>
+ <graphic fileref="ui/insg10.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the Add Connection dialog, specify the hostname, portno, username, and password
+for the target Virtuoso Server and check the Save Password check box.
+ <figure id="insg11" float="1">
+ <title>Add Connection dialog</title>
+ <graphic fileref="ui/insg11.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select the Select Database From List radio button and choose School from the drop down list
+of available databases.
+ <figure id="insg12" float="1">
+ <title>Select Database From List</title>
+ <graphic fileref="ui/insg12.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click the Test Connection button to verify the connection is successful and then
+click OK to add the connection.
+ <figure id="insg13" float="1">
+ <title>Test Connection</title>
+ <graphic fileref="ui/insg13.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select the Yes, include sensitive data in the connect string radio button and click Next to continue.
+ <figure id="insg14" float="1">
+ <title>connect string</title>
+ <graphic fileref="ui/insg14.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the Choose your Database Objects dialog select the table and columns to be queried, the shippers table is used in this example.
+ <figure id="insg15" float="1">
+ <title>Choose your Database Objects</title>
+ <graphic fileref="ui/insg15.png"/>
+ </figure>
+ </listitem>
+ <listitem>A DataSet for the shippers database object is created
+ <figure id="insg16" float="1">
+ <title>shippers database</title>
+ <graphic fileref="ui/insg16.png"/>
+ </figure>
+ </listitem>
+ <listitem>From the drop down list box next to the Shippers table ensure the DataGridView item is selected
+ <figure id="insg17" float="1">
+ <title>DataGridView</title>
+ <graphic fileref="ui/insg17.png"/>
+ </figure>
+ </listitem>
+ <listitem>Drag the Shippers DataSet item onto the Form to create a scrollable and editable association of the Shippers table object with the Data Grid View automatically.
+ <figure id="insg18" float="1">
+ <title>Drag</title>
+ <graphic fileref="ui/insg18.png"/>
+ </figure>
+ </listitem>
+ <listitem>From the Debug Menu select the Start Debugging menu item to run the application.
+ <figure id="insg19" float="1">
+ <title>Debug</title>
+ <graphic fileref="ui/insg19.png"/>
+ </figure>
+ </listitem>
+ <listitem>The data in the Shippers table will be displayed in the DataGrid application created.
+ <figure id="insg20" float="1">
+ <title>DataGrid</title>
+ <graphic fileref="ui/insg20.png"/>
+ </figure>
+ </listitem>
+ <listitem>A new row can be inserted (updated or deleted) as indicated for the new DHL record inserted below and the save button clicked to save the change to the database.
+ <figure id="insg21" float="1">
+ <title>new row</title>
+ <graphic fileref="ui/insg21.png"/>
+ </figure>
+ </listitem>
+ <listitem>The Virtuoso Interactive SQL tab of the Conductor can be used to run the query select * from Demo..Shippers.
+ <figure id="insg22" float="1">
+ <title>Interactive SQL tab</title>
+ <graphic fileref="ui/insg22.png"/>
+ </figure>
+ </listitem>
+ <listitem>To verify the change has been successfully made in the database.
+ <figure id="insg23" float="1">
+ <title>verify</title>
+ <graphic fileref="ui/insg23.png"/>
+ </figure>
+ </listitem>
+</orderedlist>
+ <para>The task is now complete.</para>
+</sect1>
+ <sect1 id="installvsent"><title>Using Visual Studio 2008 to Build an Entity Frameworks based Windows Form Application</title>
+ <formalpara><title>Virtuoso Entity Framework School DB Windows Form Application</title></formalpara>
+ <para>This section demonstrates how Visual Studio 2008 can be used to generate mapping files
+for an Entity Data Model (EDM), based on a 1:1 mapping to tables in the School database. This will be
+done by creating a Windows Forms application in Visual Studio, create queries that access data in the
+School model, bind the query results to display controls to show the results of the queries, and then
+make updates to objects and persist the changes to the database.</para>
+ <sect2 id="installvsentprereq">
+ <title>Pre-requisites</title>
+ <para>In order to create an Entity Framework Application in your own environment you will need:</para>
+ <orderedlist>
+ <listitem>Microsoft Visual Studio 2008 SP1, the ADO.NET Entity Framework runtime and associated tools are included in Visual Studio 2008 SP1.</listitem>
+ <listitem>A running Virtuoso Universal Server instance.</listitem>
+ </orderedlist>
+ </sect2>
+ <sect2 id="installvsentcreatedb">
+ <title>Create the School database and schema</title>
+ <orderedlist>
+ <listitem>Download the <ulink url="http://download.openlinksw.com/packages/5.0/virtuoso/schools_db_dav.vad">Schools Database</ulink> VAD (schools_db_dav.vad) package.</listitem>
+ <listitem>Navigate to the <emphasis>System Admin -> Packages</emphasis> tab of the Virtuoso Conductor.
+ <figure id="uado1" float="1">
+ <title>Conductor Packages</title>
+ <graphic fileref="ui/uado1.png"/>
+ </figure>
+ </listitem>
+ <listitem>Scroll down to the <emphasis>Install Package</emphasis> section of the tab, use the
+<emphasis>Upload Package</emphasis> option <emphasis>Browse</emphasis> button to locate the
+schools_db_dav.vad package and click <emphasis>proceed</emphasis>.
+ <figure id="uado2" float="1">
+ <title>Install package</title>
+ <graphic fileref="ui/uado2.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click the <emphasis>Proceed</emphasis> button to begin the installation process.
+ <figure id="uado3" float="1">
+ <title>Install package.</title>
+ <graphic fileref="ui/uado3.png"/>
+ </figure>
+ </listitem>
+ <listitem>Once complete return to the <emphasis>Packages</emphasis> tab and scroll down to confirm the *schools_db* package is listed as installed.
+ <figure id="uado4" float="1">
+ <title>Install package</title>
+ <graphic fileref="ui/uado4.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>Create the Course Manager application using Visual Studio</emphasis></para>
+ <orderedlist>
+ <listitem>Launch the Visual Studio 2008 SP1 IDE.
+ <figure id="uados1" float="1">
+ <title>Visual Studio 2008 SP1 IDE</title>
+ <graphic fileref="ui/uados1.png"/>
+ </figure>
+ </listitem>
+ <listitem>On the <emphasis>File menu</emphasis> click <emphasis>New Project</emphasis>.
+ </listitem>
+ <listitem>Choose either <emphasis>Visual Basic</emphasis> or <emphasis>Visual C#</emphasis> in the
+<emphasis>Project Types</emphasis> pane.
+ </listitem>
+ <listitem>Select <emphasis>Windows Forms Application</emphasis> in the
+<emphasis>Templates</emphasis> pane.
+ </listitem>
+ <listitem>Enter <emphasis>CourseManager</emphasis> for the project name, and then
+click <emphasis>OK</emphasis>.
+ <figure id="uado5" float="1">
+ <title>Create project</title>
+ <graphic fileref="ui/uado5.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>Create the Course Viewer form</emphasis></para>
+ <orderedlist>
+ <listitem>In the <emphasis>CourseManager</emphasis> project, select the default form (Form1).
+ </listitem>
+ <listitem>In the <emphasis>File Properties</emphasis> pane, change the File Name to
+<emphasis>CourseViewer.vb</emphasis> or <emphasis>CourseViewer.cs</emphasis>.
+ </listitem>
+ <listitem>In <emphasis>Solution Explorer</emphasis>, double-click
+<emphasis>CourseViewer.vb</emphasis> or <emphasis>CourseViewer.cs</emphasis> to open the form.
+ <figure id="uado6" float="1">
+ <title>CourseViewer.vb</title>
+ <graphic fileref="ui/uado6.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Toolbox</emphasis>, expand <emphasis>Common Controls</emphasis>,
+drag the <emphasis>ComboBox</emphasis> control to the form, and change the name of the control to
+<emphasis>departmentList</emphasis>.
+ </listitem>
+ <listitem>In the <emphasis>Toolbox</emphasis>, drag the <emphasis>Button</emphasis>
+control to the form, change the <emphasis>Name</emphasis> of the control to <emphasis>closeForm</emphasis>,
+and change the <emphasis>Text value</emphasis> to <emphasis>Close</emphasis>.
+ </listitem>
+ <listitem>In the <emphasis>Toolbox</emphasis>, expand <emphasis>Data</emphasis>, drag the
+<emphasis>DataGridView</emphasis> control to the form, and change the <emphasis>Name</emphasis> of
+the control to <emphasis>courseGridView</emphasis>.
+ <figure id="uado7" float="1">
+ <title>DataGridView</title>
+ <graphic fileref="ui/uado7.png"/>
+ </figure>
+ </listitem>Double-click the <emphasis>closeForm</emphasis> button control. This opens
+the code page for the form and creates the closeForm_Click event handler method.
+ <listitem>In the <emphasis>closeForm_Click</emphasis> event handler method, type the following code that closes the form:
+<programlisting><![CDATA[
+Visual Basic
+
+' Close the form.
+Me.Close()
+
+C#
+
+// Close the form.
+this.Close();
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect2>
+ <sect2 id="installvsentgenmodel">
+ <title>Generating the School Entity Data Mode</title>
+ <para><emphasis>Add the ADO.NET Entity Data Model item template</emphasis></para>
+ <orderedlist>
+ <listitem>Select the CourseManager project in Solution Explorer, right-click, point to Add, and then click New Item.</listitem>
+ <listitem>Select ADO.NET Entity Data Model in the Templates pane.</listitem>
+ <listitem>Type School.edmx for the model name and click Add. The opening page of the Entity Data Model Wizard is displayed.
+ <figure id="uado8" float="1">
+ <title>School.edmx</title>
+ <graphic fileref="ui/uado8.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>Generate the EDM</emphasis></para>
+ <orderedlist>
+ <listitem>Select <emphasis>Generate from database</emphasis> in the
+<emphasis>Choose Model Contents dialog box</emphasis>. Then click <emphasis>Next</emphasis>.
+ <figure id="uado9" float="1">
+ <title>Model Contents</title>
+ <graphic fileref="ui/uado9.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click the <emphasis>New Connection</emphasis> button.
+ <figure id="uado10" float="1">
+ <title>New Connection</title>
+ <graphic fileref="ui/uado10.png"/>
+ </figure>
+ </listitem>
+ <listitem>Choose the OpenLink <emphasis>Virtuoso Data Source</emphasis> and click
+<emphasis>Continue</emphasis>.
+ <figure id="uado11" float="1">
+ <title>Virtuoso Data Source</title>
+ <graphic fileref="ui/uado11.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Connection Properties</emphasis> dialog specify the
+<emphasis>hostname, portno, username and password</emphasis> for the target Virtuoso Server and click the
+<emphasis>Advanced</emphasis> button.
+ <figure id="uado12" float="1">
+ <title>Connection Properties</title>
+ <graphic fileref="ui/uado12.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Advanced Properties</emphasis> dialog set the
+<emphasis>Database parameter</emphasis> to <emphasis>School</emphasis> and click OK.
+ <figure id="uado13" float="1">
+ <title>Advanced Properties</title>
+ <graphic fileref="ui/uado13.png"/>
+ </figure>
+ </listitem>
+ <listitem>Press the <emphasis>Test Connection</emphasis> dialog to verify the database is accessible.
+ <figure id="uado14" float="1">
+ <title>Test Connection</title>
+ <graphic fileref="ui/uado14.png"/>
+ </figure>
+ </listitem>
+ <listitem>Set the <emphasis>entity connect string name</emphasis> to
+<emphasis>SchoolEntities</emphasis> and click <emphasis>Next</emphasis>.
+ <figure id="uado15" float="1">
+ <title>entity connect string name</title>
+ <graphic fileref="ui/uado15.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Choose your Database Objects</emphasis> page select the
+<emphasis>Tables</emphasis> check box to select all table in the <emphasis>School database</emphasis>
+for addition to the EDM, set the <emphasis>Model Namespace</emphasis> to <emphasis>SchoolModel</emphasis>
+and click <emphasis>Finish</emphasis>.
+ <figure id="uado16" float="1">
+ <title>Database Objects</title>
+ <graphic fileref="ui/uado16.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>View the EDM in the ADO.NET Entity Data Model Designer</emphasis></para>
+ <orderedlist>
+ <listitem>In the <emphasis>Solution Explorer</emphasis>, double-click the
+<emphasis>School.edmx</emphasis> file. This displays the School model in the ADO.NET Entity Data Model Designer window.
+ <figure id="uado17" float="1">
+ <title>Solution Explorer</title>
+ <graphic fileref="ui/uado17.png"/>
+ </figure>
+ </listitem>
+ <listitem>From the <emphasis>View</emphasis> menu, select <emphasis>Other Windows</emphasis>,
+and then click <emphasis>Model Browser</emphasis> to display the <emphasis>Entity Model Browser</emphasis> window.
+ </listitem>
+ <listitem>Expand the <emphasis>SchoolModel</emphasis> and <emphasis>SchoolModel.Store</emphasis> nodes to view conceptual and store definitions, respectively.
+ <figure id="uado20" float="1">
+ <title>SchoolModel</title>
+ <graphic fileref="ui/uado20.png"/>
+ </figure>
+ </listitem>
+ <listitem>From the <emphasis>View menu</emphasis>, select <emphasis>Other Windows</emphasis>,
+click <emphasis>Mapping Details</emphasis>, and then click an entity (Person for example) or association in the Entity Designer.
+ </listitem>
+ <listitem>This displays the Entity Mapping Details window with information about the object-relational mapping for the selected object.
+ <figure id="uado21" float="1">
+ <title>View menu</title>
+ <graphic fileref="ui/uado21.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ </sect2>
+ <sect2 id="installvsentqueryentity">
+ <title>Querying Entities and Associations</title>
+ <para>This section creates strongly-typed queries against the CLR objects that represent entities and associations in the School model, and bind display controls to the object collections returned from these queries.</para>
+ <para><emphasis>Query the departments in the School database</emphasis></para>
+ <orderedlist>
+ <listitem>At the beginning of the code file for the <emphasis>CourseViewer</emphasis> form,
+add the following <emphasis>using</emphasis> (C#) or <emphasis>Imports</emphasis> (Visual Basic) statements to reference the model created from the School database and the entity namespace.
+<programlisting><![CDATA[
+Visual Basic
+
+Imports System.Data.Objects
+Imports System.Data.Objects.DataClasses
+
+C#
+
+using System.Data.Objects;
+using System.Data.Objects.DataClasses;
+]]></programlisting>
+ </listitem>
+ <listitem>At the top of the partial class definition for the <emphasis>CourseViewer</emphasis>
+form, add the following code that creates an <emphasis>ObjectContext</emphasis> instance.
+<programlisting><![CDATA[
+Visual Basic
+
+' Create an ObjectContext instance based on SchoolEntity.
+Private schoolContext As SchoolEntities
+
+C#
+
+// Create an ObjectContext instance based on SchoolEntity.
+private SchoolEntities schoolContext;
+]]></programlisting>
+ </listitem>
+ <listitem>In the <emphasis>CourseViewer</emphasis> form designer, double-click
+the <emphasis>CourseViewer</emphasis> form. This opens the code page for the form and creates the
+<emphasis>courseViewer _Load</emphasis> event handler method.</listitem>
+ <listitem>In the <emphasis>courseViewer _Load</emphasis> event handler method, copy
+and paste the following code that defines the <emphasis>DataGridView</emphasis>, executes a query
+that returns a collection of departments (ordered by <emphasis>Name</emphasis>), and binds the
+collection of <emphasis>Department</emphasis> objects to the departmentList control.
+<programlisting><![CDATA[
+Visual Basic
+
+' Initialize the ObjectContext.
+schoolContext = New SchoolEntities()
+
+' Define a query that returns all Department objects and related
+' Course objects, ordered by name.
+Dim departmentQuery As ObjectQuery(Of Department) = _
+ schoolContext.Department.Include("Course").OrderBy("it.Name")
+
+Try
+ ' Bind the ComboBox control to the query, which is
+ ' executed during data binding.
+ Me.departmentList.DisplayMember = "Name"
+ Me.departmentList.DataSource = departmentQuery
+Catch ex As Exception
+ MessageBox.Show(ex.Message)
+End Try
+
+C#
+
+// Initialize the ObjectContext.
+schoolContext = new SchoolEntities();
+
+// Define a query that returns all Department objects and related
+// Course objects, ordered by name.
+ObjectQuery<Department> departmentQuery =
+ schoolContext.Department.Include("Course").OrderBy("it.Name");
+
+try
+{
+ // Bind the ComboBox control to the query, which is
+ // executed during data binding.
+ this.departmentList.DisplayMember = "Name";
+ this.departmentList.DataSource = departmentQuery;
+}
+catch (Exception ex)
+{
+ MessageBox.Show(ex.Message);
+}
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>Display courses for the selected department</emphasis></para>
+ <orderedlist>
+ <listitem>In the <emphasis>CourseViewer</emphasis> form designer, double-click the
+<emphasis>departmentList</emphasis> control. This creates the <emphasis>departmentList_SelectedIndexChanged</emphasis> event handler method.</listitem>
+ <listitem>Paste the following code that loads the courses that are related to the selected department.
+<programlisting><![CDATA[
+Visual Basic
+
+Try
+ ' Get the object for the selected department.
+ Dim department As Department = _
+ CType(Me.departmentList.SelectedItem, Department)
+
+ ' Bind the grid view to the collection of Course objects
+ ' that are related to the selected Department object.
+ courseGridView.DataSource = department.Course
+
+ ' Hide the columns that are bound to the navigation properties on Course.
+ courseGridView.Columns("Department").Visible = False
+ courseGridView.Columns("CourseGrade").Visible = False
+ courseGridView.Columns("OnlineCourse").Visible = False
+ courseGridView.Columns("OnsiteCourse").Visible = False
+ courseGridView.Columns("Person").Visible = False
+
+ courseGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells)
+Catch ex As Exception
+ MessageBox.Show(ex.Message)
+End Try
+
+C#
+
+try
+{
+ // Get the object for the selected department.
+ Department department =
+ (Department)this.departmentList.SelectedItem;
+
+ // Bind the grid view to the collection of Course objects
+ // that are related to the selected Department object.
+ courseGridView.DataSource = department.Course;
+
+ // Hide the columns that are bound to the navigation properties on Course.
+ courseGridView.Columns["Department"].Visible = false;
+ courseGridView.Columns["CourseGrade"].Visible = false;
+ courseGridView.Columns["OnlineCourse"].Visible = false;
+ courseGridView.Columns["OnsiteCourse"].Visible = false;
+ courseGridView.Columns["Person"].Visible = false;
+
+ courseGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
+}
+catch (Exception ex)
+{
+ MessageBox.Show(ex.Message);
+}
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect2>
+ <sect2 id="installvsentinsertandupdate">
+ <title>Inserting and Updating Data</title>
+ <para>In this section the changes made to Course objects bound are saved to the DataGridView control to the database and also run the completed Course Manager application.</para>
+ <para><emphasis>Save changes made to objects</emphasis></para>
+ <orderedlist>
+ <listitem>In the <emphasis>Toolbox</emphasis>, expand <emphasis>Common Controls</emphasis>,
+drag the <emphasis>Button</emphasis> control to the <emphasis>CourseViewer</emphasis> form designer,
+change the <emphasis>name</emphasis> of the control to <emphasis>saveChanges</emphasis>, and change the
+<emphasis>Text</emphasis> value to <emphasis>Update</emphasis>.</listitem>
+ <listitem>In the <emphasis>CourseViewer</emphasis> form designer, double-click the
+<emphasis>saveChanges</emphasis> control. This creates the <emphasis>saveChanges_Click</emphasis> event handler method.
+ </listitem>
+ <listitem>Paste the following code that saves object changes to the database.
+<programlisting><![CDATA[
+Visual Basic
+
+Try
+ ' Save object changes to the database, display a message,
+ ' and refresh the form.
+ schoolContext.SaveChanges()
+ MessageBox.Show("Changes saved to the database.")
+ Me.Refresh()
+Catch ex As Exception
+ MessageBox.Show(ex.Message)
+End Try
+
+C#
+
+try
+{
+ // Save object changes to the database, display a message,
+ // and refresh the form.
+ schoolContext.SaveChanges();
+ MessageBox.Show("Changes saved to the database.");
+ this.Refresh();
+}
+catch (Exception ex)
+{
+ MessageBox.Show(ex.Message);
+}
+]]></programlisting>
+ </listitem>
+ <listitem>In the <emphasis>closeForm_Click</emphasis> event handler method, type the
+following code. This code disposes of the object context before the form is closed.
+<programlisting><![CDATA[
+Visual Basic
+
+ ' Dispose the object context.
+ schoolContext.Dispose()
+
+C#
+
+ // Dispose the object context.
+ schoolContext.Dispose();
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>Build and run the Class Scheduling application</emphasis></para>
+ <orderedlist>
+ <listitem>From the <emphasis>Debug</emphasis> menu, select
+<emphasis>Start Debugging</emphasis> or <emphasis>Start Without Debugging</emphasis>, to build and
+run the application.</listitem>
+ <listitem>When the form loads, select a department from the <emphasis>ComboBox</emphasis>
+control to display the courses that belong to that department.
+ <figure id="uado18" float="1">
+ <title>ComboBox</title>
+ <graphic fileref="ui/uado18.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>DataGridView</emphasis>, update course information or add a
+new course and then click <emphasis>Update</emphasis> to save changes to the database and displays a
+message box that declares the number of saved changes.
+ <figure id="uado19" float="1">
+ <title>DataGridView</title>
+ <graphic fileref="ui/uado19.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ <para>The process is now complete</para>
+ </sect2>
+ </sect1>
+ <sect1 id="installusado"><title>Using Visual Studio 2008 to Build an ADO.NET Data Services based Application</title>
+ <formalpara><title>Using Microsoft ADO.Net Data Services with Virtuoso</title></formalpara>
+ <sect2 id="installusadointro">
+ <title>Introduction</title>
+ <para>The goal of Microsoft ADO.NET Data Services is to enable applications to expose data as a
+data service that can be consumed by web clients within corporate networks and across the internet. A data
+service is reachable via regular HTTP requests, using standard HTTP verbs such as GET, POST, PUT and DELETE
+to perform CRUD operations against the service. The payload format used by the service is controllable by the
+application, but all options are simple, open formats such as JSON and Atom/APP.
+ </para>
+ <para>The use of web-friendly technologies make ADO.NET Data Services ideal as a data back-end
+for AJAX-style applications, Rich Interactive Applications and other applications that need to operate
+against data that is stored across the web.
+ </para>
+ </sect2>
+ <sect2 id="installusadogetstart">
+ <title>Getting Started: Creating Data Services</title>
+ <para><emphasis>Pre-requisites</emphasis></para>
+ <para>In order to create a data service using ADO.NET Data Services in your own environment you
+will need Microsoft Visual Studio 2008 SP1. The ADO.NET Entity Framework runtime and associated tools are
+included in Visual Studio 2008 SP1.
+ </para>
+ <para><emphasis>Selecting a Data Source</emphasis></para>
+ <para>The ADO.NET Data Service server framework is comprised of two halves. The top-half is the
+runtime itself; this part is "fixed", and it implements URI translation, the Atom/JSON wire formats, the
+interaction protocol, etc. This is what makes an ADO.NET Data Service look like an ADO.NET Data Service.
+The bottom half is the data-access layer and is pluggable. Communication between layers happens in terms
+of the IQueryable interface plus a set of conventions to map CLR graphs into the URI/payload patterns
+of ADO.NET Data Services.
+ </para>
+ <para>The first step in creating an ADO.NET Data Service is to determine the data source that
+is to be exposed as a set of REST-based endpoints (ie. select or create a data access layer). For relational
+data stored in Microsoft SQL Server or other 3rd Party databases, ADO.NET Data Services currently enables
+easily exposing a conceptual model created using the ADO.NET Entity Framework (EF). For all other data
+sources (XML section, web service, application logic layer, etc) or to use additional database access
+technologies (ex. LINQ to SQL), a mechanism is provided which enables any data source, as per the plug-in
+model described above, to be exposed as an ADO.NET Data Service.
+ </para>
+ <para>To create a data service which exposes a relational database through an Entity Framework
+conceptual model see "Creating a Data Service using the ADO.NET Entity Framework". To create a data service
+which exposes another data source see "Creating a Data Service from any Data Source".
+ </para>
+ </sect2>
+ <sect2 id="installusadocreateservice">
+ <title>Creating a Data Service using the ADO.NET Entity Framework</title>
+ <para>ADO.NET Data Services are a specialized form of Windows Communication Foundation services,
+and thus can be hosted in various environments. The below example will create an ADO.NET Data Service which
+is hosted inside an ASP.NET site. In order to create a data service, you must first create a web project;
+you will then need to establish a connection with the database that will be exposed by the service, and
+then create the data service itself within the web application. Below is a step-by-step description of
+this process.
+ </para>
+ <para>The following steps can be used for creating a Data Service using the Virtuoso ADO.Net
+Provider for accessing the sample Northwind Demo database:
+ </para>
+ <orderedlist>
+ <listitem>Launch the Visual Studio 2008 SP1 IDE.
+ <figure id="ados1" float="1">
+ <title>Visual Studio 2008 SP1 IDE.</title>
+ <graphic fileref="ui/dora1.png"/>
+ </figure>
+ </listitem>
+ <listitem>Create a <emphasis>Web Application</emphasis> project by going to the
+<emphasis>File</emphasis> menu in Visual Studio and choosing <emphasis>New Project</emphasis>.
+ </listitem>
+ <listitem>When the New Project window appears, choose either <emphasis>Visual Basic</emphasis>
+or <emphasis>Visual C#</emphasis> as the programming language.
+ </listitem>
+ <listitem>Within the language category click on <emphasis>Web</emphasis>, and select <emphasis>ASP.NET Web Application</emphasis> from the right-hand panel.
+ </listitem>
+ <listitem>Choose a name for the project, for example <emphasis>VirtuosoDataService</emphasis>, and click <emphasis>OK</emphasis>.
+ <figure id="ados2" float="1">
+ <title>Name project</title>
+ <graphic fileref="ui/eora2.png"/>
+ </figure>
+ </listitem>
+ <listitem>This will create a new project called <emphasis>VirtuosoDataService</emphasis>.
+ <figure id="ados3" float="1">
+ <title>Create project</title>
+ <graphic fileref="ui/eora3.png"/>
+ </figure>
+ </listitem>
+ <listitem>Right click on the <emphasis>VirtuosoDataService</emphasis> project name of the
+Solution Explorer pane, then select the <emphasis>Add -> New Item</emphasis> menu options.
+ <figure id="ados4" float="1">
+ <title>New Item</title>
+ <graphic fileref="ui/einf4.png"/>
+ </figure>
+ </listitem>
+ <listitem>The <emphasis>Add</emphasis> New Item dialog will appear, choose the
+<emphasis>ADO.NET Entity Data Model</emphasis> template, give it the name <emphasis>Virtuoso.edmx</emphasis>
+and click <emphasis>Add</emphasis> to start the creation of the ADO.Net Entity Data Model.
+ <figure id="ados5" float="1">
+ <title>Entity Model</title>
+ <graphic fileref="ui/eora5.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Entity Data Model Wizard</emphasis> dialog
+<emphasis>Choose Model Contents</emphasis> page select the <emphasis>Generate from Database</emphasis> model
+type and click <emphasis>Next</emphasis>.
+ <figure id="ados6" float="1">
+ <title>Model Contents</title>
+ <graphic fileref="ui/eora6.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Entity Data Model Wizard</emphasis> dialog
+<emphasis>Choose your Data Connection</emphasis> page select the <emphasis>New Connection</emphasis> button
+ <figure id="ados7" float="1">
+ <title>Data Connection</title>
+ <graphic fileref="ui/ados7.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Choose Data Source</emphasis> dialog, select the
+OpenLink <emphasis>Virtuoso Data Source</emphasis> from the list displayed and click <emphasis>Continue</emphasis>.
+ <figure id="ados8" float="1">
+ <title>Data Source</title>
+ <graphic fileref="ui/dora9.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Add Connection</emphasis> dialog, specify the
+<emphasis>hostname, portno, username and password</emphasis> for the target Virtuoso Server and check the <b>Save Password</b> check box.
+ <figure id="ados9" float="1">
+ <title>Connection Properties</title>
+ <graphic fileref="ui/dora10.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select the <emphasis>Select Database From List</emphasis> radio button and choose
+<emphasis>Demo</emphasis> from the drop down list, assuming the Virtuoso Demo Database is installed.
+ <figure id="ados10" float="1">
+ <title>Advanced Properties</title>
+ <graphic fileref="ui/ados10.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click the <emphasis>Test Connection</emphasis> button to verify the connection is
+successful and then click OK to add the connection.
+ <figure id="ados11" float="1">
+ <title>Test Connection</title>
+ <graphic fileref="ui/ados11.png"/>
+ </figure>
+ </listitem>
+ <listitem>Set the <emphasis>entity connect string</emphasis> name to
+<emphasis>VirtuosoDemoEntities</emphasis> (note this name as it is required in step 17 below)
+and click <emphasis>Next</emphasis>.
+ <figure id="ados12" float="1">
+ <title>entity connect string</title>
+ <graphic fileref="ui/ados12.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Choose your Database Objects</emphasis>
+page select the <emphasis>Tables</emphasis> check box to select all tables in the Demo database for
+addition to the Entity Data Model, set the <emphasis>Model Namespace</emphasis> to
+<emphasis>VirtuosoDemoModel</emphasis> and click <emphasis>Finish</emphasis>.
+ <figure id="ados13" float="1">
+ <title>Database Objects</title>
+ <graphic fileref="ui/ados13.png"/>
+ </figure>
+ </listitem>
+ <listitem>The <emphasis>Virtuoso.edmx</emphasis> EDM will be created with the tables and relationships displayed in the Visual Studio IDE
+ <figure id="ados14" float="1">
+ <title>Virtuoso.edmx</title>
+ <graphic fileref="ui/ados14.png"/>
+ </figure>
+ </listitem>
+ <listitem>Right click on the <emphasis>VirtuosoDataService</emphasis> project name of the
+<emphasis>Solution Explorer pane</emphasis>, then select the <emphasis>Add -> New Item</emphasis> menu options.
+ <figure id="ados4" float="1">
+ <title>New Item</title>
+ <graphic fileref="ui/ados4.png"/>
+ </figure>
+ </listitem>
+ <listitem>The <emphasis>Add New Item</emphasis> dialog will appear, choose the
+<emphasis>ADO.NET Data Service</emphasis> template, give it the name <emphasis>Virtuoso.svc</emphasis> and
+click <emphasis>Add</emphasis> to create the ADO.Net Data Service.
+ <figure id="ados15" float="1">
+ <title>ADO.NET Data Service</title>
+ <graphic fileref="ui/ados15.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Virtuoso.svc.cs</emphasis> Data Service file created add the
+data source class name of <emphasis>VirtuosoDemoEntities</emphasis> (note this is the name set in step 12)
+as the <emphasis>DataService</emphasis> name and enable the access to the Data Service by adding
+the entry <emphasis>config.SetEntitySetAccessRule("*", EntitySetRights.All);</emphasis> in the
+<emphasis>InitializeService</emphasis> method.
+<programlisting><![CDATA[
+// C#
+
+using System;
+using System.Web;
+using System.Collections.Generic;
+using System.ServiceModel.Web;
+using System.Linq;
+using System.Data.Services;
+
+namespace SimpleDataService
+{
+ public class Northwind : DataService<VirtuosoDemoEntities>
+ {
+ public static void InitializeService(IDataServiceConfiguration config)
+ {
+ config.SetEntitySetAccessRule("*", EntitySetRights.All);
+ }
+ }
+}
+]]></programlisting>
+ <figure id="ados16" float="1">
+ <title>Data Service</title>
+ <graphic fileref="ui/ados16.png"/>
+ </figure>
+ </listitem>
+ <listitem>To test the Data Service, simply hit <emphasis>Ctrl+F5</emphasis> within Visual Studio, which will start the development web server, run the Data Services server inside and load a Web browser page displaying the list of available tables/entities of the Demo database.
+ <figure id="ados17" float="1">
+ <title>test the Data Service</title>
+ <graphic fileref="ui/ados17.png"/>
+ </figure>
+ </listitem>
+ <listitem>To access a specific entity instance like the <emphasis>Customers</emphasis> table
+<emphasis>ALFKI</emphasis> record, this would be specified as http://host/vdir/Virtuoso.svc/Customers('ALFKI') .
+ <figure id="ados18" float="1">
+ <title>Access a specific entity instance</title>
+ <graphic fileref="ui/ados18.png"/>
+ </figure>
+ </listitem>
+ </orderedlist>
+ <para><emphasis>NOTES</emphasis></para>
+ <orderedlist>
+ <listitem><emphasis>Important</emphasis> - To view <emphasis>Atom</emphasis> (the default
+format returned by an ADO.NET Data Service) in Internet Explorer, you must first ensure that
+<emphasis>Feed Reading View</emphasis> is turned <emphasis>off</emphasis>. This can be done on
+the <emphasis>Content tab</emphasis> of <emphasis>Tools in Internet Options</emphasis>.
+ </listitem>
+ <listitem>If a Data Services entity instance URI page fails to load you can turn
+<emphasis>Verbose</emphasis> errors on by adding <emphasis>config.UseVerboseErrors = true;</emphasis>
+in the <emphasis>virtuoso.svc.cs InitializeService</emphasis> method to obtain more detailed
+information from the server as to why the page failed to load:
+<programlisting><![CDATA[
+public static void InitializeService(IDataServiceConfiguration config)
+
+{
+
+config.UseVerboseErrors = true;
+
+config.SetEntitySetAccessRule("*", EntitySetRights.All);
+
+}
+]]></programlisting>
+ </listitem>
+ </orderedlist>
+ </sect2>
+ </sect1>
+
+<sect1 id="installwfas"><title>Windows Form Application for accessing Virtuoso RDF data via SPASQL using the Virtuoso ADO.Net Provider</title>
+ <para>This section will guide you through creating a simple application that allows you to access RDF
+data in a Virtuoso database as an Entity DataSet and explore that RDF data in an intuitive way by clicking
+on dereferenceable <link linkend="rdfiriidtype">IRIs</link>.</para>
+ <sect2 id="installwfasintro">
+ <title>Pre-requisites</title>
+<orderedlist>
+ <listitem>Microsoft Visual Studio 2008</listitem>
+ <listitem>The Virtuoso ADO.Net provider for .Net 3.5 and the Entity Framework.</listitem>
+ <listitem>The example assumes that you have a local Virtuoso server with the Northwind demo database
+installed. If the demo database is not already installed then download the <ulink url="http://download.openlinksw.com/packages/5.0/virtuoso/demo_dav.vad">demo database VAD package</ulink>
+(demo_dav.vad) and install it. The VAD package will create a new database in Virtuoso called demo
+containing the familiar Northwind tables. It will also creates <ulink url="http://docs.openlinksw.com/virtuoso/rdfsparqlintegrationmiddleware.html#rdfviews">RDF views</ulink> of the Northwind tables.
+In the example we assume the database is accessible on a hostname of "demo.openlinksw.com" on the
+default port 80, where an actually live instance of the Virtuoso Demo database is hosted. Users would
+use the appropriate hostname and port number of their Virtuoso installation to create the sample
+application, and would be would be localhost:8890 for a default installation or whatever the <link linkend="ini_URIQA">URIQA DefaultHost</link>
+Virtuoso configuration parameter is set to when the demo database VAD package is installed.
+ </listitem>
+</orderedlist>
+ </sect2>
+ <sect2 id="installwfasgetstart">
+ <title>Creating the Application</title>
+ <para><emphasis>Step 1 - Create a view of the RDF data.</emphasis></para>
+ <para>We want to be able to access the RDF data in Visual Studio and the easiest way to do this is to
+create a view of the data that we are interested in and bind that view to a DataSet. This can be considered
+as using server side <link linkend="rdfsparql">SPARQL</link>. Virtuoso supports an
+<link linkend="rdfsparqlinline">extension to standard SQL that allows</link> execution of SPARQL.
+If a SQL query begins with the keyword SPARQL then the rest of the query is interpreted by as SPARQL.
+If a SPARQL query is used as the definition of a view then that view can be manipulated using SQL like
+any other view. In this way the result set from a SPARQL query can be easily accessed from Visual Studio
+using ADO.Net and the Entity Framework.
+ </para>
+ <para>
+To create a view of the customers in the Northwind first open the Virtuoso Conductor and log in as dba.
+Then open iSQL from the menu on the left and execute the following statement.
+ </para>
+<programlisting><![CDATA[
+
+CREATE VIEW Demo.demo.sparqlview as
+SPARQL
+PREFIX nwind: <http://demo.openlinksw.com/schemas/northwind#>
+SELECT DISTINCT ?s
+FROM <http://demo.openlinksw.com/Northwind>
+WHERE {?s a nwind:Customer}
+]]></programlisting>
+<para>
+<emphasis>Note:</emphasis> If the view is added to the Visual Studio project as user "demo" (or any other
+than "dba'), then it must be ensured that the "SPARQL_SELECT" and "SPARQL_SPONGE" roles are assigned to
+this user, which can be done via the Virtuoso Conductor in the "System Admin" -> "User Accounts" tab.
+</para>
+ <figure id="sparqlwinf1" float="1">
+ <title>SPARQL_SPONGE</title>
+ <graphic fileref="ui/sparqlwinf1.png"/>
+ </figure>
+ <para><emphasis>Step 2 - Create a simple grid form in Visual Studio</emphasis></para>
+<orderedlist>
+ <listitem>Open <emphasis>Visual Studio</emphasis> and create a new <emphasis>Windows Forms Application</emphasis> called RDFDemo.</listitem>
+ <listitem>In the <emphasis>Form Designer</emphasis> drag a <emphasis>DataGridView</emphasis> on to the form.</listitem>
+ <listitem>Click the <emphasis>Choose Data Source</emphasis> drop down and select <emphasis>Add Project Data Source</emphasis>.
+ <figure id="sparqlwinf2" float="1">
+ <title>Data Source</title>
+ <graphic fileref="ui/sparqlwinf2.png"/>
+ </figure>
+ </listitem>
+ <listitem>In the <emphasis>Data Source Configuration Wizard</emphasis> choose Database and then set up a connection to the demo database on your local Virtuoso server. </listitem>
+ <listitem>On the <emphasis>Choose Your Data Objects</emphasis> page expand the <emphasis>Views</emphasis> and select sparqlview.
+ <figure id="sparqlwinf3" float="1">
+ <title>Data Source Configuration Wizard</title>
+ <graphic fileref="ui/sparqlwinf3.png"/>
+ </figure>
+ </listitem>
+ <listitem>Click <emphasis>Finish</emphasis>.</listitem>
+ <listitem>In the <emphasis>Form Designer</emphasis> select dataGridView1 and change the <emphasis>AutoSizeColumnsMode</emphasis> to AllCellsExceptHeader.</listitem>
+ <listitem>Select the <emphasis>DefaultCellStyle</emphasis> and click on the ellipsis. This will open the
+<emphasis>CellStyleBuilder</emphasis>. Change the <emphasis>ForeColor</emphasis> to Blue.
+ <figure id="sparqlwinf4" float="1">
+ <title>CellStyleBuilder</title>
+ <graphic fileref="ui/sparqlwinf4.png"/>
+ </figure>
+ </listitem>
+ <listitem>Expand <emphasis>Font</emphasis> and change <emphasis>Underline</emphasis> to True.
+Click <emphasis>OK</emphasis>.</listitem>
+</orderedlist>
+ <para><emphasis>Step 3 - Change the mapping of the DataSet.</emphasis></para>
+<para>In the Solution Explorer you will now have a DataSet called DemoDataSet.xsd. If you double click on
+this it opens the DataSet Designer. Select the column called s in the sparqlview table and in the Properties
+pane change the DataType from System.String to System.Object.</para>
+<para>The data returned by a SPARQL query can either be an <link linkend="rdfiriidtype">IRI</link> or a
+literal value. In order to distinguish between the two the Virtuoso ADO.Net provider defines an additional
+data type, SQLExtendedString. By setting the column type to System.Object we can cast the fetched data back
+to SQLExtendedString and find out if an individual value is an IRI or a literal and handle it appropriately.
+</para>
+<para><emphasis>Step 4 - Create the on_click event handler for the cells in the DataGridView.</emphasis></para>
+<para>Return to the <emphasis>Form Designer</emphasis> and double click on the cell of the
+<emphasis>DataGridView</emphasis>. This creates the <emphasis>dataGridView1_CellContentClick</emphasis> method in Form1.cs. This is the method that handles clicking on IRI objects in the grid.
+</para>
+<para>Paste in the following block of code into the body of the <emphasis>dataGridView1_CellContentClick</emphasis> method.
+</para>
+<programlisting><![CDATA[
+int column = e.ColumnIndex;
+ object o = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
+ Type t = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].ValueType;
+
+ if (o is SqlExtendedString)
+ {
+ SqlExtendedString se = (SqlExtendedString) o;
+ ExtendedStringHandler seHandler = new ExtendedStringHandler(se, this.sparqlviewTableAdapter.Connection);
+ seHandler.displayData();
+ }
+ else if (o is SqlRdfBox)
+ {
+ //doesn't do anything at the moment
+ }
+
+]]></programlisting>
+<para>
+As we are using the SQLExtendedString extension from the Virtuoso ADO.Net provider you will also need to add
+</para>
+<programlisting><![CDATA[
+using OpenLink.Data.Virtuoso;
+]]></programlisting>
+<para>
+at the top of the file.
+</para>
+<para><emphasis>Step 5 - Create a class to handle exploring the RDF data.</emphasis></para>
+<itemizedlist mark="bullet">
+ <listitem>Add a new C# class to the project called ExtendedStringHandler, by Right clicking on
+RDFDemo in the <emphasis>Solution Explorer</emphasis> and <emphasis>Add</emphasis> a
+<emphasis>Class</emphasis>.</listitem>
+ <listitem>Add the following using statements to the top of the file
+<programlisting><![CDATA[
+using OpenLink.Data.Virtuoso;
+using System.Data;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data.Mapping;
+using System.Data.Common;
+]]></programlisting>
+</listitem>
+ <listitem>Paste the following block of code into the class definition.
+<programlisting><![CDATA[
+StringBuilder DescribeCommand;
+VirtuosoConnection ParentConnection;
+List<Label> labelList = new List<Label>();
+List<TextBox> textBoxList = new List<TextBox>();
+DescribeDataSet describeDataSet = new DescribeDataSet();
+Boolean isIRI = false;
+
+public ExtendedStringHandler(SqlExtendedString iri, VirtuosoConnection parentConnection)
+ {
+ ParentConnection = parentConnection;
+ if (iri.IriType == SqlExtendedStringType.IRI)
+ {
+ isIRI = true;
+ DescribeCommand = new StringBuilder("sparql select * from <http://demo.openlinksw.com/Northwind> where {<" + iri.ToString() + "> ?p ?o}"); // Replace demo.openlinksw.com with your URIQA DefaultHost setting
+ }
+ }
+
+ public string describeCommandText
+ {
+ get
+ {
+ return DescribeCommand.ToString();
+ }
+ }
+
+ public void getDescribeData()
+ {
+ VirtuosoCommand myCommand = new VirtuosoCommand(this.describeCommandText, this.ParentConnection);
+ VirtuosoDataAdapter myAdapter = new VirtuosoDataAdapter();
+ myAdapter.SelectCommand = myCommand;
+ myAdapter.Fill(describeDataSet.DataTable1);
+ }
+
+ public void displayData()
+ {
+ if (isIRI)
+ {
+ getDescribeData();
+ Form describeForm = new Form();
+ describeForm.AutoScroll = true;
+ describeForm.Width = 840;
+
+ Label label1 = new Label();
+ label1.AutoSize = true;
+ label1.Font = new Font(label1.Font.FontFamily, label1.Font.Size + 3.0F, label1.Font.Style | FontStyle.Bold, label1.Font.Unit);
+ describeForm.Controls.Add(label1);
+
+ DataTable table1 = describeDataSet.Tables[0];
+ if (table1.Rows.Count == 0)
+ label1.Text = "No Details Available";
+ else
+ {
+ foreach (DataRow row in table1.Rows)
+ if (row[0].ToString() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
+ {
+ StringBuilder title = new StringBuilder(row[1].ToString() + " details");
+ label1.Text = title.ToString();
+ break;
+ }
+
+ foreach (DataRow row in table1.Rows)
+ {
+ Label propertyLabel = new Label();
+ TextBox valueBox = new TextBox();
+ valueBox.Width = 400;
+
+ object property = row[0];
+ object value = row[1];
+
+ if (value is SqlExtendedString)
+ {
+ valueBox.ForeColor = Color.Blue;
+ valueBox.Font = new Font(valueBox.Font.FontFamily, valueBox.Font.Size, valueBox.Font.Style | FontStyle.Underline, valueBox.Font.Unit);
+ }
+ propertyLabel.Text = row[0].ToString();
+ propertyLabel.AutoEllipsis = true;
+ propertyLabel.AutoSize = false;
+ propertyLabel.Width = propertyLabel.PreferredWidth > 380 ? 380 : propertyLabel.PreferredWidth;
+
+ Binding bind = new Binding("Text", row[1], "");
+ valueBox.DataBindings.Add(bind);
+
+ labelList.Add(propertyLabel);
+ textBoxList.Add(valueBox);
+ }
+
+ for (int i = 0; i < table1.Rows.Count; i++)
+ {
+ textBoxList[i].Click += new EventHandler(this.iri_Click);
+ labelList[i].Location = new Point(10, i * 20 + 50);
+ textBoxList[i].Location = new Point(400, i * 20 + 50);
+ describeForm.Controls.Add(labelList[i]);
+ describeForm.Controls.Add(textBoxList[i]);
+ }
+
+ describeForm.Height = labelList.Count * 20 + 100 > 500 ? 500 : labelList.Count * 20 + 100;
+ }
+ describeForm.ShowDialog();
+ }
+ else
+ {
+ Form blankForm = new Form();
+ Label label1 = new Label();
+ label1.Text = "Blank Node";
+ label1.Font = new Font(label1.Font.FontFamily, label1.Font.Size + 3.0F, label1.Font.Style | FontStyle.Bold, label1.Font.Unit);
+ blankForm.ShowDialog();
+ }
+ }
+
+ public void iri_Click(object sender, EventArgs e)
+ {
+ int boxNum = 0;
+
+ for (int i = 0; i < textBoxList.Count; i++)
+ {
+ if (sender == textBoxList[i])
+ {
+ boxNum = i;
+ break;
+ }
+ }
+
+ Object o = describeDataSet.DataTable1.Rows[boxNum][1];
+ if (o is SqlExtendedString)
+ {
+ SqlExtendedString se = (SqlExtendedString)o;
+ ExtendedStringHandler seHandler = new ExtendedStringHandler(se, ParentConnection);
+ seHandler.displayData();
+ }
+ else if (o is SqlRdfBox)
+ {
+ //doesn't do anything at the moment
+ }
+ }
+]]></programlisting>
+</listitem>
+</itemizedlist>
+<para>
+The ExtendedStringHandler class creates a new SPARQL query based on the IRI that was clicked. This
+query is executed against Virtuoso using the ADO.Net connection in the same way that any SQL statement
+would be executed across an ADO.Net connection. This can be considered as Client Side SPARQL. The result
+set from the query describes the selected object and is returned as an ADO.Net DataAdapter. The
+DataAdapter is used to fill a DataTable which is displayed on a new form. We now need to add the
+new DataSet to the project and define the DataTable that will hold the query results.
+</para>
+ <para><emphasis>Step 6 - Add a new DataSet to hold the query results.</emphasis></para>
+<orderedlist>
+ <listitem>Right click RDFDemo in the <emphasis>Solution Explorer</emphasis> and add a new
+<emphasis>DataSet</emphasis>. Call the new <emphasis>DataSet</emphasis> DescribeDataSet.
+ <figure id="sparqlwinf5" float="1">
+ <title>Add a new DataSet</title>
+ <graphic fileref="ui/sparqlwinf5.png"/>
+ </figure>
+</listitem>
+ <listitem>Double click on DescribeDataSet in the <emphasis>Solution Explorer</emphasis> to open the
+<emphasis>DataSet</emphasis> Designer and drag a <emphasis>DataTable</emphasis> from the
+<emphasis>Toolbox</emphasis> into it.</listitem>
+ <listitem>Add two columns, p and o, to the <emphasis>DataTable</emphasis> and set the
+<emphasis>DataType</emphasis> of each column to System.Object.
+ <figure id="sparqlwinf6" float="1">
+ <title>Add two columns</title>
+ <graphic fileref="ui/sparqlwinf6.png"/>
+ </figure></listitem>
+</orderedlist>
+ <para><emphasis>Step 7 - Build and run the application.</emphasis></para>
+<para>You should see a form displaying all the Northwind customers, like this.
+</para>
+ <figure id="sparqlwinf7" float="1">
+ <title>Northwind customers</title>
+ <graphic fileref="ui/sparqlwinf7.png"/>
+ </figure>
+<para>When any customer is clicked it opens a new form showing customer details.
+</para>
+ <figure id="sparqlwinf8" float="1">
+ <title>Customer details</title>
+ <graphic fileref="ui/sparqlwinf8.png"/>
+ </figure>
+<para>Clicking on the links in the new form allows you to drill down further to get
+order, product, location details etc.
+</para>
+ <figure id="sparqlwinf9" float="1">
+ <title>Order, product, location details</title>
+ <graphic fileref="ui/sparqlwinf9.png"/>
+ </figure>
+<para>and</para>
+ <figure id="sparqlwinf10" float="1">
+ <title>Order, product, location details</title>
+ <graphic fileref="ui/sparqlwinf10.png"/>
+ </figure>
+ <para><emphasis>Next Steps</emphasis></para>
+<para>
+You will notice if you keep clicking on the links that this application will only display data that
+is held in the Northwind graph. Clicking on an external link, for example the link to Berlin in
+dbpedia, http://dbpedia.org/resource/Berlin, results in a empty window and an error message. The
+next step is to extend this application so that it can handle dereferencing external IRIs.
+</para>
+ </sect2>
+ <sect2 id="installwfasxtendcomlab">
+ <title>Extending RDFDemo to Allow Dereferencing of External IRIs</title>
+<para>
+This section will guide you through extending the application created in
+<link linkend="installwfasgetstart">Creating a Windows Forms Application To Access RDF Data Using The
+Virtuoso ADO.Net Provider</link> so that it will dereference external IRIs.
+</para>
+ <para><emphasis>Pre-requisites</emphasis></para>
+<orderedlist>
+ <listitem>A working copy of the RDFDemo application created in
+<link linkend="installwfasgetstart">Creating a Windows Forms Application To
+Access RDF Data Using The Virtuoso ADO.Net Provider.</link></listitem>
+</orderedlist>
+ <sect3 id="installwfasxtendcomlabextappl">
+ <title>Extending the Application</title>
+<para>In RDFDemo when the sparql endpoint is queried to get the description of the selected item it executes
+a query that is restricted to the local Northwind dataset. The query is something like
+</para>
+<programlisting><![CDATA[
+SPARQL
+PREFIX nwind: <http://demo.openlinksw.com/schemas/northwind#>
+SELECT DISTINCT ?s
+FROM <http://demo.openlinksw.com/Northwind>
+WHERE {?s a nwind:Customer}
+]]></programlisting>
+<para>If you examine the ExtendedStringHandler class you will see that the dataset clause, from
+<http://localhost:8890/Northwind>, is hard coded. This means that when when the selected IRI is
+a link to an external data store, such as dbpedia, there is no matching data and an error is displayed.
+If the application is to be able to dereference external IRIs then the hard coded dataset clause needs
+to be removed and then we can use a Virtuoso extension to SPARQL, get:soft, that tells Virtuoso that it
+needs to go and look elsewhere for the graph. However, this will result in a loss of performance when
+exploring the local Northwind dataset. To minimize the impact on performance we will first query the
+local Northwind dataset and if there are no matching triples returned then we will use a more generic
+query that will look elsewhere for matching data.
+</para>
+ <para><emphasis>Step 1 - Add the alternative query to the ExtendedString Class.</emphasis></para>
+<itemizedlist mark="bullet">
+ <listitem>Open the RDFDemo project in Visual Studio </listitem>
+ <listitem>Open the ExtendedStringHandler class.</listitem>
+ <listitem>Remove DescribeCommand by removing the line
+<programlisting><![CDATA[
+StringBuilder DescribeCommand;
+]]></programlisting>
+<para>
+and substitute the following:
+</para>
+<programlisting><![CDATA[
+StringBuilder DescribeCommandSimple, DescribeCommandGeneral;
+]]></programlisting>
+</listitem>
+ <listitem>In the ExtendedStringHandler constructor the sparql query that was DescribeCommand becomes
+DescribeCommandSimple and we define a new query for DescribeCommandGeneral.
+<programlisting><![CDATA[
+DescribeCommandSimple = new StringBuilder("sparql select * from <http://demo.openlinksw.com/Northwind> where {<" + iri.ToString() + "> ?p ?o}"); // Replace demo.openlinksw.com with your URIQA DefaultHost setting
+DescribeCommandGeneral = new StringBuilder("sparql define get:soft " + '"'.ToString() + "soft" + '"'.ToString() + " select * from <" + iri.ToString() + "> where { <" + iri.ToString() + "> ?p ?o }");
+]]></programlisting>
+</listitem>
+ <listitem>The single describeCommand property needs to be replaced with the two new properties,
+DescribeCommandSimple and DescribeCommandGeneral
+<programlisting><![CDATA[
+public string describeCommandSimpleText
+{
+ get
+ {
+ return DescribeCommandSimple.ToString();
+ }
+}
+public string describeCommandGeneralText
+{
+ get
+ {
+ return DescribeCommandGeneral.ToString();
+ }
+}
+]]></programlisting>
+</listitem>
+ <listitem>Finally, the getDescribeData method needs changing to:
+<programlisting><![CDATA[
+public void getDescribeData()
+{
+ VirtuosoCommand myCommand = new VirtuosoCommand(this.describeCommandSimpleText, this.ParentConnection);
+ VirtuosoDataAdapter myAdapter = new VirtuosoDataAdapter();
+ myAdapter.SelectCommand = myCommand;
+ myAdapter.Fill(describeDataSet.DataTable1);
+ // Tried the simple version if fails to get the data try
+ // to look elsewhere.
+ if (describeDataSet.DataTable1.Rows.Count == 0)
+ {
+ myCommand.CommandText = describeCommandGeneralText;
+ myAdapter.Fill(describeDataSet.DataTable1);
+ }
+}
+]]></programlisting>
+</listitem>
+</itemizedlist>
+ <para><emphasis>Step 2 - Build and Run the Application</emphasis></para>
+<para>
+You will see the same starting form:
+</para>
+ <figure id="sparqlwinf11" float="1">
+ <title>Build and Run the Application</title>
+ <graphic fileref="ui/sparqlwinf11.png"/>
+ </figure>
+<para>
+Select a Customer and then select the link to the City in dbpedia. This will now open up another window
+displaying information about the city from dbpedia. Be patient as it may take a little while to open.
+</para>
+ <figure id="sparqlwinf12" float="1">
+ <title>Customer</title>
+ <graphic fileref="ui/sparqlwinf12.png"/>
+ </figure>
+ <para><emphasis>Step 3 - Changing the Form Title</emphasis></para>
+<para>
+Notice that in displayData method that we look for a
+http://www.w3.org/1999/02/22-rdf-syntax-ns#type and create a title for the form from it.
+</para>
+<programlisting><![CDATA[
+foreach (DataRow row in table1.Rows)
+ if (row[0].ToString() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
+ {
+ StringBuilder title = new StringBuilder(row[1].ToString() + " details");
+ label1.Text = title.ToString();
+ break;
+ }
+]]></programlisting>
+<para>
+This worked well for the Northwind subjects but less well now we are getting data from other graphs.
+To change the title of the forms used to display the data:
+</para>
+<itemizedlist mark="bullet">
+ <listitem>Add an new member variable to hold the IRI that we exploring to the bock of member variables
+<programlisting><![CDATA[
+StringBuilder DescribeCommandSimple, DescribeCommandGeneral;
+VirtuosoConnection ParentConnection;
+List<Label> labelList = new List<Label>();
+List<TextBox> textBoxList = new List<TextBox>();
+DescribeDataSet describeDataSet = new DescribeDataSet();
+Boolean isIRI = false;
+SqlExtendedString ParentIRI;
+]]></programlisting>
+</listitem>
+ <listitem>Assign a value to ParentIRI in the constructor:
+<programlisting><![CDATA[
+public ExtendedStringHandler(SqlExtendedString iri, VirtuosoConnection parentConnection)
+ {
+ ParentConnection = parentConnection;
+ if (iri.IriType == SqlExtendedStringType.IRI)
+ {
+ ParentIRI = iri;
+ isIRI = true;
+ DescribeCommandSimple = new StringBuilder("sparql select * from <http://demo.openlinksw.com/Northwind> where {<" + iri.ToString() + "> ?p ?o}"); // Replace demo.openlinksw.com with your URIQA DefaultHost setting
+ DescribeCommandGeneral = new StringBuilder("sparql define get:soft " + '"'.ToString() + "soft" + '"'.ToString() + " select * from <" + iri.ToString() + "> where { <" + iri.ToString() + "> ?p ?o }");
+ }
+ }
+]]></programlisting>
+</listitem>
+ <listitem>Remove the existing foreach block that sets the form title and replace with the following lines:
+<programlisting><![CDATA[
+StringBuilder title = new StringBuilder(ParentIRI.ToString() + " details");
+label1.Text = title.ToString();
+]]></programlisting>
+</listitem>
+ <listitem>Build and run the application.
+ <figure id="sparqlwinf13" float="1">
+ <title>Build and run the application</title>
+ <graphic fileref="ui/sparqlwinf13.png"/>
+ </figure>
+</listitem>
+</itemizedlist>
+<para><emphasis>Next Steps</emphasis></para>
+<para>The application now allows you to explore data and follow links from your locally held data into the
+external web of data. Looking at the data displayed in the form it would be nice to make the labels for
+the properties more compact. The label http://dbpedia.org/property/population is a very precise definition
+but for our purposes it would be clearer to label the property just population. In the next step will be
+to modify the application so that it displays more readable labels.
+</para>
+ </sect3>
+ </sect2>
+ <sect2 id="installwfasxtendcomplab">
+ <title>Extending RDFDemo to Display More Compact Labels</title>
+<para>
+This section will guide you through extending the application created in
+<link linkend="installwfasxtendcomlab">Extending RDFDemo to Allow Dereferencing of External IRIs</link> so that the data is displayed in a more readable form.
+</para>
+ <para><emphasis>Pre-requisites</emphasis></para>
+<orderedlist>
+ <listitem>A working copy of the RDFDemo application created in
+<link linkend="installwfasxtendcomlab">Extending RDFDemo to Allow Dereferencing of External IRIs</link></listitem>
+</orderedlist>
+ <sect3 id="installwfasxtendcomplabextapp">
+ <title>Extending the Application</title>
+<para>The RDF demo application presents the user with a list of Customers from the Northwind database in
+the form of dereferenceable IRIs. When a customer is selected from the list the application uses a sparql
+query to describe that customer and the results are displayed in a form as rows of labels and data. The
+labels correspond to RDF predicates and the data corresponds to RDF objects while the subject is the
+customer initially selected. In many cases the objects are dereferencable IRIs which are then used as
+the subject when the 'drilling down' into the data. However, the predicates are also IRIs so it is
+possible to gain more information about these as well.
+</para>
+<para>The RDF Schema defines a property http://www.w3.org/2000/01/rdf-schema#label that may be used to
+provide a human-readable version of a resource's name. We can obtain further details of each of the
+predicates in a resultset and check to see if one of the properties is an
+http://www.w3.org/2000/01/rdf-schema#label. If it is we can use the associated text as the label in
+our form instead of the the predicate IRI. The benefit should be a more human readable form.
+</para>
+ <para><emphasis>Step 1 - Add a New Method to Get the Label Text</emphasis></para>
+<para>This method takes the predicate IRI and issues a sparql query to get its description. It then
+cycles through the returned dataset to find a http://www.w3.org/2000/01/rdf-schema#label. If there is
+one then the associated text is returned by the method. Otherwise the method returns the IRI string.
+</para>
+<itemizedlist mark="bullet">
+ <listitem>Add the following method to the ExtendedStringHandlerClass
+<programlisting><![CDATA[
+private string getLabelText(Object label)
+ {
+ string labelText = label.ToString();
+ if (label is SqlExtendedString)
+ {
+ SqlExtendedString se = (SqlExtendedString)label;
+ StringBuilder getLabelCommandText = new StringBuilder("sparql define get:soft \"soft\" select * from <" + se.ToString() + "> where {<" + se.ToString() + "> ?p ?o}");
+ VirtuosoCommand getLabelCommand = new VirtuosoCommand(getLabelCommandText.ToString(), ParentConnection);
+ VirtuosoDataAdapter getLabelAdapter = new VirtuosoDataAdapter();
+ getLabelAdapter.SelectCommand = getLabelCommand;
+ DataSet getLabelDataSet = new DataSet();
+ try
+ {
+ getLabelAdapter.Fill(getLabelDataSet);
+ foreach (DataRow getLabelRow in getLabelDataSet.Tables[0].Rows)
+ {
+ if (getLabelRow[0].ToString() == "http://www.w3.org/2000/01/rdf-schema#label")
+ {
+ labelText = getLabelRow[1].ToString();
+ break;
+ }
+ }
+ }
+ catch
+ {
+ }
+ }
+ return labelText;
+ }
+]]></programlisting>
+</listitem>
+ <listitem>Change the line in displayData from
+<programlisting><![CDATA[
+propertyLabel.Text = row[0].ToString();
+]]></programlisting>
+</listitem>
+ <listitem>to
+<programlisting><![CDATA[
+propertyLabel.Text = getLabelText(row[0]);
+]]></programlisting>
+</listitem>
+</itemizedlist>
+ <para><emphasis>Step 1 - Add a New Method to Get the Label Text</emphasis></para>
+<para>When you run the application you will see that the initial form is the same. In fact, when you
+select the Customer you will also see that the customer details are also the same. It is only when you
+start exploring data outside the Northwind graph that you will see the labels in the form change.
+</para>
+ <figure id="sparqlwinf14" float="1">
+ <title>Northwind graph</title>
+ <graphic fileref="ui/sparqlwinf14.png"/>
+ </figure>
+ <para><emphasis>Next Steps</emphasis></para>
+<para>It is clear from running the application that the Northwind ontology does not define an
+http://www.w3.org/2000/01/rdf-schema#label for its members. In order to benefit from this modified
+version of RDFDemo we need to update our Northwind ontology so that
+http://www.w3.org/2000/01/rdf-schema#label is defined for each resource. The next step will be to modify
+our Northwind ontology.
+</para>
+ </sect3>
+ </sect2>
+ <sect2 id="installwfasmodify">
+ <title>Modifying the Northwind Ontology to Add Labels</title>
+<para>This section will guide you through modifying the Northwind Ontology created when you installed
+the <ulink url="http://download.openlinksw.com/packages/5.0/virtuoso/demo_dav.vad">demo database VAD package</ulink> so that each resources is identified by an
+http://www.w3.org/2000/01/rdf-schema#label. This will improve the readability of the information displayed by
+the application created in <link linkend="installwfasxtendcomplab">Extending RDFDemo to Display More Compact Labels</link>.
+</para>
+<para><emphasis>Pre-requisites</emphasis></para>
+<orderedlist>
+ <listitem>A working copy of the RDFDemo application created in <link linkend="installwfasxtendcomplab">Extending RDFDemo to Display More Compact Labels</link></listitem>
+</orderedlist>
+ <sect3 id="installwfasmodifyeditont">
+ <title>Editing the Ontology</title>
+ <para><emphasis>Get a Working Copy of the Northwind Ontology</emphasis></para>
+<para>The the file describing the Northwind Ontology, nw.owl, is installed in the DAV when the demo vad
+is loaded. To get a working copy open the Virtuoso Conductor and log in as dba. Select WebDAV Browser in
+the navigation panel on the left. This will open a window that allows you to browse the WebDAV Repository.
+The Northwind Ontology file can be found in DAV/VAD/demo/sql. Take a copy of the file.
+</para>
+ <para><emphasis>Editing nw.owl</emphasis></para>
+<para>In the first instance is edited nw.owl so that the property name consistently begin with a lower
+case letter. This matches the results for describing resources held in the Northwind database. Also are
+added missing properties so that there should be a label in all cases.
+</para>
+ <para><emphasis>Registering the Changes in Virtuoso</emphasis></para>
+<para>There are two methods for registering the changes in Virtuoso:
+</para>
+<orderedlist>
+ <listitem>Method I:
+ <itemizedlist mark="bullet">
+ <listitem>Copy the edited version of nw.owl back into the DAV.</listitem>
+ <listitem>In isql, load the script load_ontology_dav.sql and execute it. The new version of
+nw.owl will then be used</listitem>
+ </itemizedlist>
+</listitem>
+ <listitem>
+ <itemizedlist mark="bullet">
+ <listitem>Ensure that your new version of nw.owl is in a folder accessible by Virtuoso. You may
+need to edit your virtuoso.ini file and restart the server.</listitem>
+ <listitem>In isql, load the script load_ontology_file.sql and edit it so that it has the full
+path to the new version of nw.owl</listitem>
+ <listitem>Run the script. The new version of nw.owl will then be used.</listitem>
+ </itemizedlist>
+</listitem>
+</orderedlist>
+ <para>Modify RDFDemo so that it looks for the graph used to describe the Northwind data and
+searches that graph for the predicate details:</para>
+<orderedlist>
+ <listitem>Add a new member variable to the ExtendedStringHandler class to hold the graphs that
+we need to search for the predicate information.
+<programlisting><![CDATA[
+StringBuilder DescribeCommandSimple, DescribeCommandGeneral;
+VirtuosoConnection ParentConnection;
+List<Label> labelList = new List<Label>();
+List<TextBox> textBoxList = new List<TextBox>();
+List<String> graphList = new List<String>();
+DescribeDataSet describeDataSet = new DescribeDataSet();
+Boolean isIRI = false;
+SqlExtendedString ParentIRI;
+]]></programlisting></listitem>
+ <listitem>In displayData, after we have set the title of the form, add the following block of code:
+<programlisting><![CDATA[
+// Later we will want to get property labels and for that
+ // we will need the graph where the resource is defined.
+foreach (DataRow row in table1.Rows)
+ if (row[0].ToString() == "http://www.openarchives.org/ore/terms/isDescribedBy"
+ && row[1].ToString() != ParentIRI.ToString())
+ {
+ String graph = row[1].ToString();
+ graphList.Add(graph);
+ }
+]]></programlisting>
+</listitem>
+ <listitem>Replace the existing getLabelText method with an extended version
+<programlisting><![CDATA[
+ private string getLabelText(Object label)
+ {
+ string labelText = label.ToString();
+ if (label is SqlExtendedString)
+ {
+ Boolean foundLabel = false;
+ SqlExtendedString se = (SqlExtendedString)label;
+ VirtuosoDataAdapter getLabelAdapter = new VirtuosoDataAdapter();
+ DataSet getLabelDataSet = new DataSet();
+
+ //Try finding it in resources graph first
+ foreach (String graph in graphList)
+ {
+ StringBuilder getLabelCommandText = new StringBuilder("sparql select * from <" + graph + "> where {<" + se.ToString() + "> ?p ?o}");
+ VirtuosoCommand getLabelCommand = new VirtuosoCommand(getLabelCommandText.ToString(), ParentConnection);
+ getLabelAdapter.SelectCommand = getLabelCommand;
+
+ try
+ {
+ getLabelAdapter.Fill(getLabelDataSet);
+ foreach (DataRow getLabelRow in getLabelDataSet.Tables[0].Rows)
+ {
+ if (getLabelRow[0].ToString() == "http://www.w3.org/2000/01/rdf-schema#label")
+ {
+ labelText = getLabelRow[1].ToString();
+ foundLabel = true;
+ break;
+ }
+ }
+ }
+ catch
+ {
+ }
+ if (foundLabel)
+ break;
+ }
+ // If we still have no label try the predicate itself as the graph
+ if (!foundLabel)
+ {
+ StringBuilder getLabelCommandText = new StringBuilder("sparql define get:soft \"soft\" select * from <" + se.ToString() + "> where {<" + se.ToString() + "> ?p ?o}");
+ VirtuosoCommand getLabelCommand = new VirtuosoCommand(getLabelCommandText.ToString(), ParentConnection);
+ getLabelAdapter.SelectCommand = getLabelCommand;
+ try
+ {
+ getLabelAdapter.Fill(getLabelDataSet);
+ foreach (DataRow getLabelRow in getLabelDataSet.Tables[0].Rows)
+ {
+ if (getLabelRow[0].ToString() == "http://www.w3.org/2000/01/rdf-schema#label")
+ {
+ labelText = getLabelRow[1].ToString();
+ break;
+ }
+ }
+ }
+ catch
+ {
+ }
+ }
+ }
+ return labelText;
+ }
+]]></programlisting>
+<para>This extended method first checks the graphs in the graph list for the predicate information then
+if no label has been found tries the predicate itself as the graph.
+</para>
+</listitem>
+ <listitem>Build and run, the Northwind resources should now be correctly and concisely labeled
+ <figure id="sparqlwinf15" float="1">
+ <title>Northwind resources</title>
+ <graphic fileref="ui/sparqlwinf15.png"/>
+ </figure>
+</listitem>
+</orderedlist>
+<para>
+</para>
+ <para><emphasis>Improving The Appearance of the Form</emphasis></para>
+<para>The following changes are not strictly necessary but improve the appearance of the form:
+</para>
+<itemizedlist mark="bullet">
+ <listitem>Line up the right hand edge of the labels with the text boxes by setting TextAlign to
+MiddleRight and reduce the width of the labels.
+<programlisting><![CDATA[
+propertyLabel.Text = getLabelText(row[0]);
+propertyLabel.AutoEllipsis = true;
+propertyLabel.AutoSize = false;
+propertyLabel.Width = 130;
+propertyLabel.TextAlign = ContentAlignment.MiddleRight;
+]]></programlisting>
+</listitem>
+ <listitem>Make the form narrower:
+<programlisting><![CDATA[
+describeForm.Width = 660;
+]]></programlisting>
+</listitem>
+ <listitem>Alter the positioning of the labels and TextBoxes on the form:
+<programlisting><![CDATA[
+textBoxList[i].Click += new EventHandler(this.iri_Click);
+labelList[i].Location = new Point(10, i * 22 + 50);
+textBoxList[i].Location = new Point(150, i * 22 + 50);
+describeForm.Controls.Add(labelList[i]);
+describeForm.Controls.Add(textBoxList[i]);
+]]></programlisting>
+ <figure id="sparqlwinf16" float="1">
+ <title>Alter the positioning</title>
+ <graphic fileref="ui/sparqlwinf16.png"/>
+ </figure>
+</listitem>
+</itemizedlist>
+ <para><emphasis>Next Steps</emphasis></para>
+<para>The image below shows some of the information about an employee in the Northwind dataset.
+</para>
+ <figure id="sparqlwinf17" float="1">
+ <title>employee</title>
+ <graphic fileref="ui/sparqlwinf17.png"/>
+ </figure>
+<para>In the next step we will extend the application so the images and web pages can be viewed
+and long text fields are displayed in full.
+</para>
+ </sect3>
+ </sect2>
+
+ <sect2 id="installwfasxtendlongtext">
+ <title>Extending RDFDemo to Display Images and Longer Text Fields.</title>
+<para>This section will guide you through extending RDFDemo so that longer text fields can be displayed
+as a block of text and so that links to images and web pages can be viewed in a browser window.
+</para>
+<para><emphasis>Pre-requisites</emphasis></para>
+<orderedlist>
+ <listitem>A working copy of the RDFDemo application created in
+<link linkend="installwfasmodify">Modifying the Northwind Ontology to Add Labels</link></listitem>
+</orderedlist>
+ <sect3 id="installwfasxtendlongtextmodf">
+ <title>Modifying the Application</title>
+ <para><emphasis>Displaying Text</emphasis></para>
+<para>We will modify the form that show the details of the selected item so that when the text in the boxes
+is too long to be seen in full a button will appear beside the box on the form and if you click the button
+the complete text will be displayed in a separate window.
+</para>
+<orderedlist>
+ <listitem>Add a new class, MoreButton that extends System.Windows.Forms.Button.
+<itemizedlist mark="bullet">
+ <listitem>In the <emphasis>Solution Explorer</emphasis> right click on the RDFDemo project and select
+<emphasis>Add</emphasis> then <emphasis>New Item</emphasis>.</listitem>
+ <listitem>Add a new class called MoreButton.cs.
+ <figure id="sparqlwinf18" float="1">
+ <title>Add a new class</title>
+ <graphic fileref="ui/sparqlwinf18.png"/>
+ </figure>
+</listitem>
+ <listitem>The following using statement goes at the top of the file:
+<programlisting><![CDATA[
+using System.Windows.Forms;
+]]></programlisting>
+</listitem>
+ <listitem>The MoreButton class must inherit from System.Windows.Forms.Button
+so the class definition line should look like this:
+<programlisting><![CDATA[
+class MoreButton : Button
+]]></programlisting>
+</listitem>
+ <listitem>Add the following code to the body of the MoreButton class:
+<programlisting><![CDATA[
+ String longText;
+
+ public MoreButton(String text)
+ {
+ longText = text;
+ this.Text = "More";
+ }
+
+ protected override void OnClick(EventArgs e)
+ {
+ Form moreForm = new Form();
+ TextBox moreBox = new TextBox();
+ moreBox.Text = longText;
+ moreBox.Width = 300;
+ moreBox.Height = 250;
+ moreBox.ScrollBars = ScrollBars.Vertical;
+ moreBox.Multiline = true;
+ moreBox.WordWrap = true;
+ moreBox.Select(0, 0);
+ moreBox.ReadOnly = true;
+ moreForm.Controls.Add(moreBox);
+ moreForm.Width = 320;
+ moreForm.Height = 280;
+ moreForm.ShowDialog();
+ }
+]]></programlisting>
+</listitem>
+</itemizedlist>
+</listitem>
+ <listitem>In displayData in the ExtendedStringHandler class, when the labels and TextBoxes are added to
+the form check if the text is too big for the box. If it is then add a MoreButton that will display all
+the text in a separate window.
+<programlisting><![CDATA[
+if (textBoxList[i].DataBindings[0].DataSource.ToString().Length > 80
+ && !(textBoxList[i].DataBindings[0].DataSource is SqlExtendedString))
+{
+ moreButtonList.Add(new MoreButton(textBoxList[i].DataBindings[0].DataSource.ToString()));
+ moreButtonList[moreButtonList.Count - 1].Location = new Point(550, i * 22 + 50);
+ describeForm.Controls.Add(moreButtonList[moreButtonList.Count -1]);
+}
+]]></programlisting>
+</listitem>
+ <listitem>We will also need a list to hold the buttons as they are created so the following needs to
+be added to the member variables at the top of the ExtendedStringHandler class.
+<programlisting><![CDATA[
+List<MoreButton> moreButtonList = new List<MoreButton>();
+]]></programlisting>
+</listitem>
+ <listitem>Build and run the application. If you click through to an Employee page you will see the
+Notes field now has a button labeled More next to it. If you click on that button the text from the Notes
+field is displayed in a new window.
+ <figure id="sparqlwinf19" float="1">
+ <title>Notes</title>
+ <graphic fileref="ui/sparqlwinf19.png"/>
+ </figure>
+</listitem>
+</orderedlist>
+ <para><emphasis>Displaying Images and Web Pages</emphasis></para>
+<para>Next we will modify the form so that item identified as images or web pages will be opened in a
+browser window. Again we will do this by adding a button beside the box on the form that will open the
+browser window.
+</para>
+<orderedlist>
+ <listitem>Add a new class, OpenButton that extends System.Windows.Forms.Button.
+<itemizedlist mark="bullet">
+ <listitem>In the <emphasis>Solution Explorer</emphasis> right click on the RDFDemo project and select
+<emphasis>Add</emphasis> then <emphasis>New Item</emphasis>
+</listitem>
+ <listitem>Add a new class called OpenButton.cs.
+</listitem>
+ <listitem>The following using statement goes at the top of the file:
+<programlisting><![CDATA[
+using System.Windows.Forms;
+]]></programlisting>
+</listitem>
+ <listitem>The OpenButton class must inherit from System.Windows.Forms.Button so the class
+definition line should look like this:
+<programlisting><![CDATA[
+class OpenButton : Button
+]]></programlisting>
+</listitem>
+ <listitem>Add the following code to the body of the OpenButton class:
+<programlisting><![CDATA[
+String urlText;
+
+public OpenButton(String text)
+{
+ urlText = text;
+ this.Text = "Open";
+}
+
+protected override void OnClick(EventArgs e)
+{
+ System.Diagnostics.Process.Start(urlText);
+}
+]]></programlisting>
+</listitem>
+</itemizedlist>
+</listitem>
+ <listitem>In displayData in the ExtendedStringHandler class, where we added the code to check for long
+text fields we now need to check for IRIs that identify images and web pages. As a simple first attempt
+we will check for matching labels. So for example, if a property label is 'image' or 'webpage', we will
+assume it can be opened in a browser window and put an OpenButton beside it.
+<programlisting><![CDATA[
+if (labelList[i].Text == "website"
+ || labelList[i].Text == "image"
+ || labelList[i].Text == "depiction"
+ || labelList[i].Text == "page"
+ || labelList[i].Text == "url"
+ || labelList[i].Text == "image skyline")
+{
+ openButtonList.Add(new OpenButton(textBoxList[i].DataBindings[0].DataSource.ToString()));
+ openButtonList[openButtonList.Count - 1].Location = new Point (550, i * 22 + 50);
+ describeForm.Controls.Add(openButtonList[openButtonList.Count - 1]);
+}
+]]></programlisting>
+</listitem>
+ <listitem>We will also need a list to hold the buttons as they are created so the following needs to
+be added to the member variables at the top of the ExtendedStringHandler class.
+<programlisting><![CDATA[
+List<OpenButton> openButtonList = new List<OpenButton>();
+]]></programlisting>
+</listitem>
+ <listitem>Build and run the application. If you click through to an Employee page now you will see that
+the Image field now has a button labeled Open next to it. If you click on that button the image is opened
+in your default browser.
+ <figure id="sparqlwinf20" float="1">
+ <title>Image</title>
+ <graphic fileref="ui/sparqlwinf20.png"/>
+ </figure>
+</listitem>
+</orderedlist>
+ <para><emphasis>Next Steps</emphasis></para>
+<para>It has already been mentioned that the property labels are also dereferenceable IRIs. We used this
+feature to find a short name to display rather that the complete IRI. The next step is to make the labels
+clickable so the ontology itself can also be explored.
+</para>
+ </sect3>
+ </sect2>
+
+
+ <sect2 id="installwfasxtendproplab">
+ <title>Extending RDFDemo To Make The Property Labels Clickable</title>
+<para>This section will guide you through extending RDFDemo to make the property labels clickable. Clicking
+on the property label will take you to a page describing that property.
+</para>
+<para><emphasis>Pre-requisites</emphasis></para>
+<orderedlist>
+ <listitem>A working copy of the RDFDemo application created in
+<link linkend="installwfasxtendlongtext">Extending RDFDemo to Display Images and Longer Text Fields</link></listitem>
+</orderedlist>
+ <sect3 id="installwfasxtendproplabmod">
+ <title>Modifying the Application</title>
+ <para><emphasis>Making the Labels Clickable</emphasis></para>
+<para>Making the property labels clickable is fairly straight forward. We will use basically the same code
+as is used to make the values clickable.
+</para>
+<orderedlist>
+ <listitem>First we need to add a new event handler. In the ExtendedStringHandler class modify displayData
+to add an event handler for each of the property labels.
+<programlisting><![CDATA[
+for (int i = 0; i < table1.Rows.Count; i++)
+{
+ textBoxList[i].Click += new EventHandler(this.iri_Click);
+ labelList[i].Location = new Point(10, i * 22 + 50);
+ textBoxList[i].Location = new Point(150, i * 22 + 50);
+ describeForm.Controls.Add(labelList[i]);
+ describeForm.Controls.Add(textBoxList[i]);
+]]></programlisting>
+<para>becomes
+</para>
+<programlisting><![CDATA[
+for (int i = 0; i < table1.Rows.Count; i++)
+{
+ textBoxList[i].Click += new EventHandler(this.iri_Click);
+ labelList[i].Location = new Point(10, i * 22 + 50);
+ labelList[i].Click += new EventHandler(this.label_Click);
+ textBoxList[i].Location = new Point(150, i * 22 + 50);
+ describeForm.Controls.Add(labelList[i]);
+ describeForm.Controls.Add(textBoxList[i]);
+]]></programlisting>
+</listitem>
+ <listitem>Then we need to add the EventHandler method. Add the following to the ExtendedStringHandler Class:
+<programlisting><![CDATA[
+public void label_Click(object sender, EventArgs e)
+ {
+ int labelNum = 0;
+
+ for (int i = 0; i < labelList.Count; i++)
+ {
+ if (sender == labelList[i])
+ {
+ labelNum = i;
+ break;
+ }
+ }
+
+ Object o = describeDataSet.DataTable1.Rows[labelNum][0];
+ if (o is SqlExtendedString)
+ {
+ SqlExtendedString se = (SqlExtendedString)o;
+ ExtendedStringHandler seHandler = new ExtendedStringHandler(se, ParentConnection);
+ seHandler.displayData();
+ }
+ else if (o is SqlRdfBox)
+ {
+ //doesn't do anything at the moment
+ }
+ }
+]]></programlisting>
+<para>
+If you compare this method to the EventHandler for the values, iri_Click, you will see that it is basically
+the same. The only difference is that it uses the property element from the data table rather than value.
+</para>
+</listitem>
+ <listitem>Finally, to make it clear that the labels are now active links, we will change the label colour
+to blue and underline them.
+<programlisting><![CDATA[
+ propertyLabel.Text = getLabelText(row[0]);
+ propertyLabel.AutoEllipsis = true;
+ propertyLabel.AutoSize = false;
+ propertyLabel.Width = 130;
+ propertyLabel.TextAlign = ContentAlignment.MiddleRight;
+]]></programlisting>
+<para>becomes:
+</para>
+<programlisting><![CDATA[
+propertyLabel.Text = getLabelText(row[0]);
+propertyLabel.ForeColor = Color.Blue;
+propertyLabel.Font = new Font(propertyLabel.Font.FontFamily, propertyLabel.Font.Size, propertyLabel.Font.Style | FontStyle.Underline, propertyLabel.Font.Unit);
+propertyLabel.AutoEllipsis = true;
+propertyLabel.AutoSize = false;
+propertyLabel.Width = 130;
+propertyLabel.TextAlign = ContentAlignment.MiddleRight;
+]]></programlisting>
+</listitem>
+ <listitem>Build and run the application. You will see the familiar starting page. If you then select one
+of the Customers you will notice the property labels now look like hyperlinks.
+ <figure id="sparqlwinf21" float="1">
+ <title>hyperlinks</title>
+ <graphic fileref="ui/sparqlwinf21.png"/>
+ </figure>
+<para>If you click on one of the label hyperlinks you will see a new form showing detailed information about
+the property which can itself be explored further by clicking on labels and values.
+ <figure id="sparqlwinf22" float="1">
+ <title>labels and values</title>
+ <graphic fileref="ui/sparqlwinf22.png"/>
+ </figure>
+</para>
+</listitem>
+</orderedlist>
+<para>These simple changes work up to a point but are not robust. If you explore the properties used by the
+local Northwind graph you quickly find that the property details are not found. The application needs some
+further changes to work consistently. The problem is finding the graph where the property information is
+defined. The general handler for Extended Strings first checks the local Northwind graph,
+http://localhost:8890/Northwind, where the Northwind data is held, and then uses the IRI itself as the graph
+and tries to load that dynamically. This is not working for information about the Northwind properties.
+These properties are defined in the Northwind ontology, http://demo.openlinksw.com/schemas/northwind. We
+have already had to find this graph when getting the short label name. We need to be able to associate the
+property label with the graph where its definition is stored. Then we can search this graph for details
+about the property when the label is clicked.
+</para>
+ <para><emphasis>Using the Graph Where the Property Label was Found to Find the Property Details</emphasis></para>
+<orderedlist>
+ <listitem>Create a new class, IRILabel, that inherits from System.Windows.Forms.Label.
+<itemizedlist mark="bullet">
+ <listitem>In the <emphasis>Solution Explorer</emphasis> right click on the RDFDemo project and select
+<emphasis>Add</emphasis> then <emphasis>New Item</emphasis>.</listitem>
+ <listitem>Add a new class called IRILabel.cs.
+ <figure id="sparqlwinf23" float="1">
+ <title>Add a new class</title>
+ <graphic fileref="ui/sparqlwinf23.png"/>
+ </figure>
+</listitem>
+</itemizedlist>
+</listitem>
+ <listitem>We need to reference System.Windows.Forms, System.Data and OpenLink.Data.Virtuoso so add
+<programlisting><![CDATA[
+using System.Windows.Forms;
+using OpenLink.Data.Virtuoso;
+using System.Data;
+]]></programlisting>
+<para>to the using block at the top of the class file. The class definition should look like this:
+</para>
+<programlisting><![CDATA[
+class IRILabel : Label
+]]></programlisting>
+</listitem>
+ <listitem>Paste the following code into the body of the class:
+<programlisting><![CDATA[
+SqlExtendedString SourceIRI;
+String GraphUsed;
+VirtuosoConnection ParentConnection;
+
+public IRILabel(Object iri, List<String> graphList, VirtuosoConnection parentConnection)
+{
+ ParentConnection = parentConnection;
+ if (iri is SqlExtendedString)
+ {
+ SourceIRI = (SqlExtendedString)iri;
+ Text = this.getLabelText(graphList);
+ }
+ else
+ Text = iri.ToString();
+}
+
+public SqlExtendedString iri
+{
+ get
+ {
+ return SourceIRI;
+ }
+}
+
+public String graph
+{
+ get
+ {
+ return GraphUsed;
+ }
+}
+
+private string getLabelText(List<String> graphList)
+{
+ string labelText = SourceIRI.ToString();
+ Boolean foundLabel = false;
+ VirtuosoDataAdapter getLabelAdapter = new VirtuosoDataAdapter();
+ DataSet getLabelDataSet = new DataSet();
+
+ //Try finding it in resources graph first
+ foreach (String graph in graphList)
+ {
+ StringBuilder getLabelCommandText = new StringBuilder("sparql select * from <" + graph + "> where {<" + SourceIRI.ToString() + "> ?p ?o}");
+ VirtuosoCommand getLabelCommand = new VirtuosoCommand(getLabelCommandText.ToString(), ParentConnection);
+ getLabelAdapter.SelectCommand = getLabelCommand;
+
+ try
+ {
+ getLabelAdapter.Fill(getLabelDataSet);
+ foreach (DataRow getLabelRow in getLabelDataSet.Tables[0].Rows)
+ {
+ if (getLabelRow[0].ToString() == "http://www.w3.org/2000/01/rdf-schema#label")
+ {
+ labelText = getLabelRow[1].ToString();
+ foundLabel = true;
+ break;
+ }
+ }
+ }
+ catch
+ {
+ }
+ if (foundLabel)
+ {
+ GraphUsed = graph;
+ break;
+ }
+ }
+
+ // If we still have no label try the predicate itself as the graph
+ if (!foundLabel)
+ {
+ GraphUsed = SourceIRI.ToString();
+ StringBuilder getLabelCommandText = new StringBuilder("sparql define get:soft \"soft\" select * from <" + GraphUsed + "> where {<" + SourceIRI.ToString() + "> ?p ?o}");
+ VirtuosoCommand getLabelCommand = new VirtuosoCommand(getLabelCommandText.ToString(), ParentConnection);
+ getLabelAdapter.SelectCommand = getLabelCommand;
+ try
+ {
+ getLabelAdapter.Fill(getLabelDataSet);
+ foreach (DataRow getLabelRow in getLabelDataSet.Tables[0].Rows)
+ {
+ if (getLabelRow[0].ToString() == "http://www.w3.org/2000/01/rdf-schema#label")
+ {
+ labelText = getLabelRow[1].ToString();
+ break;
+ }
+ }
+ }
+ catch
+ {
+ }
+ }
+ return labelText;
+}
+]]></programlisting>
+<para>Notice that the getLabelText method has been moved into this new class and is now called from the
+constructor. When the IRILabel is constructed the label text is found using the list of graphs provided to
+the constructor. The graph containing the label is noted. We need to alter ExtendedStringHandler so that
+the labels are the new IRILabel type and so that the correct information is supplied to the constructor.
+</para>
+ </listitem>
+ <listitem>Change the labelList member variable declaration so it looks like this:
+<programlisting><![CDATA[
+List<IRILabel> labelList = new List<IRILabel>();
+]]></programlisting>
+ </listitem>
+ <listitem>Each propertyLabel created must be the new IRILabel type so the line:
+<programlisting><![CDATA[
+Label propertyLabel = new Label();
+]]></programlisting>
+<para>becomes:
+</para>
+<programlisting><![CDATA[
+IRILabel propertyLabel = new IRILabel(row[0], graphList, ParentConnection);
+]]></programlisting>
+ </listitem>
+ <listitem>As getLabelText is now called by the IRILabel constructor we can remove the line:
+<programlisting><![CDATA[
+propertyLabel.Text = getLabelText(row[0]);
+]]></programlisting>
+<para>from describeData in ExtendedStringHandler.
+</para>
+ </listitem>
+ <listitem>Now we modify the label_Click EventHandler so that it uses the graph information. Replace the
+existing method with:
+<programlisting><![CDATA[
+public void label_Click(object sender, EventArgs e)
+ {
+ int labelNum = 0;
+
+ for (int i = 0; i < labelList.Count; i++)
+ {
+ if (sender == labelList[i])
+ {
+ labelNum = i;
+ break;
+ }
+ }
+
+ SqlExtendedString se = labelList[labelNum].iri;
+ ExtendedStringHandler seHandler = new ExtendedStringHandler(se, ParentConnection, labelList[labelNum].graph);
+ seHandler.displayData();
+
+ }
+]]></programlisting>
+ </listitem>
+ <listitem>Note that this method uses a new constructor for the ExtendedStringHandler that takes the graph
+as an additional argument. We need to add this new constructor.
+<programlisting><![CDATA[
+public ExtendedStringHandler(SqlExtendedString iri, VirtuosoConnection parentConnection, String graph)
+ {
+ ParentConnection = parentConnection;
+ if (iri.IriType == SqlExtendedStringType.IRI)
+ {
+ ParentIRI = iri;
+ isIRI = true;
+ DescribeCommandSimple = new StringBuilder("sparql select * from <http://localhost:8890/Northwind> where {<" + iri.ToString() + "> ?p ?o}");
+ DescribeCommandGeneral = new StringBuilder("sparql define get:soft " + '"'.ToString() + "soft" + '"'.ToString() + " select * from <" + graph + "> where { <" + iri.ToString() + "> ?p ?o }");
+ }
+ }
+]]></programlisting>
+<para>This new constructor uses the supplied graph to build the alternative sparql select statement that
+looks for the details about the supplied IRI. With these changes in place the application will find the
+description of the Northwind properties.
+</para>
+ </listitem>
+ <listitem>Build and run. As you explore the data you will see that you can find descriptions of the
+properties used to describe the entities in the Northwind dataset:
+ <figure id="sparqlwinf24" float="1">
+ <title>Northwind dataset</title>
+ <graphic fileref="ui/sparqlwinf24.png"/>
+ </figure>
+ </listitem>
+</orderedlist>
+ </sect3>
+ </sect2>
+ </sect1>
+
+<sect1 id="installcrweb">
+ <title>Creating a Web Browser Application to Access RDF Data Using The Virtuoso ADO.Net Provider</title>
+<para>This section will guide you through creating first a Web Service that exposes RDF data from Virtuoso
+and then a simple web browser application that consumes the Web Service and allowing you to access and
+explore the RDF data by clicking on dereferenceable <link linkend="rdfiriidtype">IRIs</link>.
+</para>
+<sect2 id="installcrwebintro">
+ <title>Pre-requisites</title>
+<orderedlist>
+ <listitem>The example assumes that you have a local Virtuoso server with the Northwind demo database
+installed. If the demo database is not already installed then download the <ulink url="http://download.openlinksw.com/packages/5.0/virtuoso/demo_dav.vad">demo database VAD package</ulink>
+(demo_dav.vad) and install it. The VAD package will create a new database in Virtuoso called demo
+containing the familiar Northwind tables. It will also creates <ulink url="http://docs.openlinksw.com/virtuoso/rdfsparqlintegrationmiddleware.html#rdfviews">RDF views</ulink> of the Northwind tables.
+In the example we assume the database is accessible on a hostname of "demo.openlinksw.com" on the
+default port 80, where an actually live instance of the Virtuoso Demo database is hosted. Users would
+use the appropriate hostname and port number of their Virtuoso installation to create the sample
+application, and would be would be localhost:8890 for a default installation or whatever the <link linkend="ini_URIQA">URIQA DefaultHost</link>
+Virtuoso configuration parameter is set to when the demo database VAD package is installed.
+ </listitem>
+ <listitem>The Virtuoso ADO.Net provider for .Net 3.5 and the Entity Framework.</listitem>
+ <listitem>Microsoft Visual Studio 2008</listitem>
+ <listitem>The Virtuoso <link linkend="http://download.openlinksw.com/packages/5.0/virtuoso/rdf_mappers_dav.vad">RDF Mappers VAD package</link>.</listitem>
+</orderedlist>
+ </sect2>
+ <sect2 id="installcrwebcrserv">
+ <title>Creating the Web Service</title>
+ <para><emphasis>Step 1 - Create a view of the RDF data</emphasis></para>
+<para>To create a view of the customers in the Northwind first open the Virtuoso Conductor and log in as
+dba. Then open iSQL from the menu on the left and execute the following statement.
+</para>
+<programlisting><![CDATA[
+create view Demo.demo.sparqlview as
+sparql
+select distinct ?s from <http://localhost:8890/Northwind>
+where {?s a <http://demo.openlinksw.com/schemas/northwind#Customer>}
+]]></programlisting>
+ <para>Note:</para>
+ <itemizedlist mark="bullet">
+ <listitem>If the view is added to the Visual Studio project as user "demo" (or any other than "dba'),
+then it must be ensured that the "SPARQL_SELECT" and "SPARQL_SPONGE" roles are assigned to this user, which
+can be done via the Virtuoso Conductor in the "System Admin" -> "User Accounts" tab. </listitem>
+ <listitem>Execute permissions will also need to be granted to the following procedure:
+<programlisting><![CDATA[
+grant execute on DB.DBA.RDF_MAKE_LONG_OF_SQLVAL to "demo"
+]]></programlisting>
+ </listitem>
+ </itemizedlist>
+ <figure id="sparqlwinf25" float="1">
+ <title>create a view</title>
+ <graphic fileref="ui/sparqlwinf25.png"/>
+ </figure>
+ <para><emphasis>Step 2 - Create the Visual Studio Project and Add the Model</emphasis></para>
+<orderedlist>
+ <listitem>Open <emphasis>Visual Studio</emphasis> and create a new <emphasis>ASP .NET Web Application
+</emphasis> called RDFWebDemo.
+ <figure id="sparqlwinf26" float="1">
+ <title>create new application</title>
+ <graphic fileref="ui/sparqlwinf26.png"/>
+ </figure>
+</listitem>
+ <listitem>Right click RDFWebDemo in the <emphasis>Solution Explorer</emphasis> and add a new
+<emphasis>ADO.NET Entity Data Model</emphasis> called Model1.edmx.
+This will open the Entity Data Model Wizard.</listitem>
+ <listitem>Choose <emphasis>Generate From Database</emphasis> and click <emphasis>Next</emphasis>.</listitem>
+ <listitem>Set up a connection to the Demo database on your local Virtuoso Server, select
+<emphasis>Yes, include the sensitive data in the connection string</emphasis> and set the name of the
+entities to DemoEntities. Click <emphasis>Next</emphasis>.</listitem>
+ <listitem>On the <emphasis>Choose Your Database Objects</emphasis> page expand <emphasis>Views</emphasis>
+and select sparqlview. Check that the Model Namespace is DemoModel and click Finish.
+ <figure id="sparqlwinf27" float="1">
+ <title>Model Namespace</title>
+ <graphic fileref="ui/sparqlwinf27.png"/>
+ </figure>
+</listitem>
+</orderedlist>
+<para>
+</para>
+ <para><emphasis>Step 3 - Add the Web Service</emphasis></para>
+<orderedlist>
+ <listitem>Right click RDFWebDemo in the <emphasis>Solution Explorer</emphasis> and add a new
+<emphasis>ADO.NET Data Service</emphasis> called WebDataService1.svc. Click <emphasis>Add</emphasis>.</listitem>
+ <listitem>In the class definition of WebDataService1 in the newly created file WebDataService1.svc.cs replace /* TODO: put your data source class name here */ with the name of our model, DemoEntities.
+<programlisting><![CDATA[
+public class WebDataService1 : DataService<DemoEntities>
+]]></programlisting>
+</listitem>
+ <listitem>In the InitializeService method add the line:
+<programlisting><![CDATA[
+config.SetEntitySetAccessRule("*", EntitySetRights.All);
+]]></programlisting>
+<para>The method should look like this:
+</para>
+<programlisting><![CDATA[
+ public static void InitializeService(IDataServiceConfiguration config)
+ {
+ // TODO: set rules to indicate which entity sets and service operations are visible, updatable, etc.
+ // Examples:
+ // config.SetEntitySetAccessRule("MyEntityset", EntitySetRights.AllRead);
+ // config.SetServiceOperationAccessRule("MyServiceOperation", ServiceOperationRights.All);
+
+ config.SetEntitySetAccessRule("*", EntitySetRights.All);
+ }
+]]></programlisting>
+</listitem>
+</orderedlist>
+ <para><emphasis>Step 4 - Compile and Run</emphasis></para>
+<para>Hit <emphasis>F5</emphasis> to compile and run the service. Select <emphasis>OK</emphasis> when
+prompted to enable debugging. The default browser will be launched showing a page like:
+</para>
+<programlisting><![CDATA[
+ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+- <service xml:base="http://localhost:1241/WebDataService1.svc/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns="http://www.w3.org/2007/app">
+- <workspace>
+ <atom:title>Default</atom:title>
+- <collection href="sparqlview">
+ <atom:title>sparqlview</atom:title>
+ </collection>
+ </workspace>
+ </service>
+]]></programlisting>
+<para>The service is now running.
+</para>
+<para>Note the address on which the service is made available. You will need to know this when creating
+the app to consume the service. Look in the Address Bar of the browser. It will be something like:
+http://localhost:1492/WebDataService1.svc/
+</para>
+ </sect2>
+ <sect2 id="installcrbrappl">
+ <title>Creating the Browser Application</title>
+<para><emphasis>Step 1 - Create the Visual Studio Project.</emphasis></para>
+<orderedlist>
+ <listitem>Open <emphasis>Visual Studio</emphasis> and create a new
+<emphasis>ASP.NET Web Application</emphasis> called RDFWebApp.
+ <figure id="sparqlwinf28" float="1">
+ <title>New Web Application</title>
+ <graphic fileref="ui/sparqlwinf28.png"/>
+ </figure>
+</listitem>
+ <listitem>Create client side entities with datasvcutil.exe
+<itemizedlist mark="bullet">
+ <listitem>Open a command prompt.</listitem>
+ <listitem>Navigate to *C:\WINDOWS\Microsoft.NET\Framework\v3.5*.</listitem>
+ <listitem>Generate the client classes using the following command:
+<programlisting><![CDATA[
+datasvcutil.exe /uri:http://localhost:1492/WebDataService1.svc /out:DemoEntities.cs
+]]></programlisting>
+<para>Note the address of the service - you may need to change the port number to
+match the one seen in the address at the end of Step 4 in Creating the Web Service.
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+ <listitem>Add the classes to RDFWebApp.
+<itemizedlist mark="bullet">
+ <listitem>Right click RDFWebApp</listitem>
+ <listitem>Choose to add an existing item and add c:\WINDOWS\Microsoft.NET\Framework\v3.5\DemoEntities.cs.</listitem>
+</itemizedlist>
+</listitem>
+ <listitem>Add a reference to System.Data.Services.Client to the project.</listitem>
+</orderedlist>
+<para>
+</para>
+ <para><emphasis>Step 2 - Display the contents of sparqlview as a table on the page</emphasis></para>
+<para>To display the RDF data on the web page we create a table with a row for each item in sparqlview.
+We then use each IRI from sparqlview to create a hyperlink. The hyperlinks are displayed in the table
+cells. To do this add the following block of code to the page_load method in Default.aspx.cs.
+</para>
+<programlisting><![CDATA[
+ DemoModel.DemoEntities svc = new DemoModel.DemoEntities(new Uri("http://localhost:1492/WebDataService1.svc"));
+
+ var query = svc.sparqlview;
+ Table iriTable = new Table();
+ this.Controls.Add(iriTable);
+
+ foreach (DemoModel.sparqlview sv in query)
+ {
+ TableRow tRow = new TableRow();
+ iriTable.Rows.Add(tRow);
+ TableCell tCell = new TableCell();
+ tRow.Cells.Add(tCell);
+ HyperLink h = new HyperLink();
+ h.Text = sv.s;
+ h.NavigateUrl = sv.s;
+ tCell.Controls.Add(h);
+ }
+]]></programlisting>
+<para>Note the address of the service in the first line - you may need to change the port number to match
+the one seen in the address at the end of Step 4 in Creating the Web Service.
+</para>
+<para>Compile and run RDFWebApp (ensuring that the service created above is still running). This will
+launch a browser and display the IRIs from sparqlview as a list of hyperlinks.
+</para>
+ <figure id="sparqlwinf29" float="1">
+ <title>list of hyperlinks</title>
+ <graphic fileref="ui/sparqlwinf29.png"/>
+ </figure>
+<para>With the <ulink url="http://download.openlinksw.com/packages/5.0/virtuoso/rdf_mappers_dav.vad">RDF Mappers VAD package</ulink> installed in Virtuoso, clicking on these
+links will take you to a description page of the referenced resource. The description page is created
+using <ulink url="http://virtuoso.openlinksw.com/Whitepapers/html/vdld_html/VirtDeployingLinkedDataGuide_Glossary.html#mozTocId13075">description.vsp</ulink>.
+</para>
+ <figure id="sparqlwinf30" float="1">
+ <title>Description page</title>
+ <graphic fileref="ui/sparqlwinf30.png"/>
+ </figure>
+ </sect2>
+ <sect2 id="installcrwebiis"><title>Deploy With IIS</title>
+<para>To create and test this simple Web Service we have used the Visual Studio Development Server. This
+section describes how to deploy the service using IIS.
+</para>
+ <sect3 id="installcrwebiiswebs"><title>Web Service</title>
+<para>To deploy the service using IIS:
+</para><itemizedlist mark="bullet">
+ <listitem>Open the RDFWebDemo project in Visual Studio, go to the <emphasis>Project</emphasis> menu
+and select RDFWebDemo <emphasis>Properties</emphasis>.</listitem>
+ <listitem>Select the <emphasis>Web</emphasis> tab and scroll down to the <emphasis>Servers</emphasis>
+section. Select <emphasis>Use local IIS Server</emphasis>. The project URL defaults to using localhost.</listitem>
+ <listitem>Click the <emphasis>Create Virtual Directory</emphasis> button then check that the Service works on localhost.</listitem>
+ <listitem>Build the project then start without debugging (ctrl F5).</listitem>
+</itemizedlist>
+<para>The start page that you see when you test the service will look the same as before but the address
+in the browser bar will be something like http://localhost/RDFWebDemo1/WebDataService1.svc/. You can now
+access your service remotely using the hostname or IP address of your server.
+</para>
+<para>If at this point you get an Access is denied error, 401.3, then you will need to add the Internet
+Guest Account (IUSR_XXX where XXX is your computer name) to the users allowed to access the folder
+containing the RDFWebDemo project.
+</para>
+ </sect3>
+ <sect3 id="installcrwebiisweba"><title>Web Application</title>
+<para>You will now need to modify RDFWebApp to access the service at the new address. At the same time
+we will also change RDFWebApp so that it too is deployed using IIS
+</para>
+<itemizedlist mark="bullet">
+ <listitem>Open The RDFWebApp project in Visual Studio.</listitem>
+ <listitem>Go to the <emphasis>Project</emphasis> menu and select RDFWebApp <emphasis>Properties</emphasis>.</listitem>
+ <listitem>Select the <emphasis>Web</emphasis> tab and scroll down to the <emphasis>Servers</emphasis>
+section. Select <emphasis>Use local IIS Server</emphasis>. The project URL defaults to using localhost.</listitem>
+ <listitem>Click the <emphasis>Create Virtual Directory</emphasis> button. The web application will then run on the local IIS.
+<programlisting><![CDATA[
+DemoModel.DemoEntities svc = new DemoModel.DemoEntities(new Uri("http://localhost:1492/WebDataService1.svc"));
+]]></programlisting>
+<para>to
+</para>
+<programlisting><![CDATA[
+DemoModel.DemoEntities svc = new DemoModel.DemoEntities(new Uri("http://localhost/RDFWebDemo/WebDataService1.svc/"));
+]]></programlisting>
+</listitem>
+ <listitem>To reference the web service running on IIS you will need to edit Default.aspx.cs. Change </listitem>
+ <listitem>Build the project then start without debugging (ctrl F5).</listitem>
+</itemizedlist>
+<para>
+The web application is accessible on http://localhost/RDFWebApp/Default.aspx and can also be accessed using
+the hostname or IP address of you server e.g. http://192.168.7.129/RDFWebApp/Default.aspx
+</para>
+ <figure id="sparqlwinf31" float="1">
+ <title>Default.aspx</title>
+ <graphic fileref="ui/sparqlwinf31.png"/>
+ </figure>
+ </sect3>
+ <para><emphasis>Next Steps</emphasis></para>
+<para>The next example shows you how to quickly create an ADO.Net Data Service that exposes RDF data in
+Virtuoso and how to create a basic Web application to consume that service. The next step is to
+<link linkend="installsilver">create a Silverlight Application to consume the same service</link>.
+</para>
+ </sect2>
+ </sect1>
+
+
+<sect1 id="installsilver"><title>Creating a Silverlight Application to consume the service</title>
+<para>This section will guide you through creating an application for Silverlight that will consume
+the ADO.Net Data Service created in <link linkend="installcrweb">Creating a Web Browser Application to Access RDF Data Using The
+Virtuoso ADO.Net Provider.</link>
+</para>
+ <sect2 id="installsilverpreq">
+ <title>Pre-requisites</title>
+<orderedlist>
+ <listitem>The <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyId=c22d6a7b-546f-4407-8ef6-d60c8ee221ed&displaylang=en">Microsoft Silverlight 2 Tools for Visual Studio 2008 SP1</ulink></listitem>
+ <listitem>The ADO.Net Data Service created in <link linkend="installcrweb">Creating a Web Browser Application to Access RDF Data Using The
+Virtuoso ADO.Net Provider.</link></listitem>
+ <listitem>The Visual Studio project used to create the ADO.Net Data Service.</listitem>
+</orderedlist>
+ </sect2>
+ <sect2 id="installsilvercrser">
+ <title>Creating the Application for Silverlight.</title>
+<orderedlist>
+ <listitem>Open the ADO.Net Data Service project in <emphasis>Visual Studio</emphasis></listitem>
+ <listitem>In the <emphasis>Solution Explorer</emphasis> right click on the RDFWebDemo solution and add a new Project. </listitem>
+ <listitem>In the <emphasis>Add New Project</emphasis> dialog select
+<emphasis>Silverlight Application</emphasis> and click <emphasis>OK</emphasis>. This will open
+the <emphasis>Add Silverlight Application</emphasis> dialog.
+ <figure id="sparqlwinf32" float="1">
+ <title>Add Silverlight Application</title>
+ <graphic fileref="ui/sparqlwinf32.png"/>
+ </figure>
+ </listitem>
+ <listitem>Select <emphasis>Link this Silverlight Control into an existing Web Site</emphasis> and make
+sure the Web Site selected is RDFWebDemo. Select
+<emphasis>Add a test page that references the application</emphasis> and <emphasis>Make it the start
+page</emphasis>.
+ <figure id="sparqlwinf33" float="1">
+ <title>Add a test page</title>
+ <graphic fileref="ui/sparqlwinf33.png"/>
+ </figure>
+ </listitem>
+ <listitem>In Solution Explorer, select RDFWebDemo, open the Project menu and select Properties. </listitem>
+ <listitem>Select the <emphasis>Web</emphasis> tab, and select <emphasis>Specific Page</emphasis>
+in the <emphasis>Start Action</emphasis> section. Click on the ellipsis and select
+SilverlightApplication1TestPage.html as the start page. </listitem>
+ <listitem>Add a reference to the data service. In the <emphasis>Solution Explorer</emphasis> right click
+on SilverlightApplication1 and select <emphasis>Add Service Reference</emphasis></listitem>
+ <listitem>In the <emphasis>Add Service Reference</emphasis> dialog click the <emphasis>Discover</emphasis>
+button. Your ADO.Net Data Service should appear in the Address box and the Services box. </listitem>
+ <listitem>Select the service and click <emphasis>OK</emphasis>. ServiceReference1 will now be added to
+the ServiceReferences. </listitem>
+ <listitem>Open page.xaml.cs and add references to the service and to the System.Data.Services.Client
+assembly by adding the following using statements at the top of the file:
+ <programlisting><![CDATA[
+using System.Data.Services.Client;
+using SilverlightApplication1.ServiceReference1;
+]]></programlisting>
+ </listitem>
+ <listitem>We need at create a data service context to reference the data from the service and to load data
+from the view, sparqlview, exposed by the service. Add the following lines to the page constructor after
+InitializeComponent()
+<programlisting><![CDATA[
+DataServiceContext svcCtx = new DataServiceContext(new Uri("WebDataService1.svc", UriKind.Relative));
+svcCtx.BeginExecute<sparqlview>(new Uri("sparqlview", UriKind.Relative), loadSCallback, svcCtx);
+]]></programlisting>
+ </listitem>
+ <listitem>Add the loadSCallback method to the page class. The method loads the data from sparqlview and
+puts it in a List. This List populates a list box on the page.
+<programlisting><![CDATA[
+private void loadSCallback(IAsyncResult asyncResult)
+{ List<Uri> uList = new List<Uri>();
+ DataServiceContext ctx = asyncResult.AsyncState as DataServiceContext;
+ foreach (sparqlview sv in ctx.EndExecute<sparqlview>(asyncResult))
+ uList.Add(new Uri(sv.s));
+ listBox1.DataContext = uList;
+}
+]]></programlisting>
+ </listitem>
+ <listitem>Add the list box to the page. In the <emphasis>Solution Explorer</emphasis> double click on
+page.xaml to open it in the editor. Add the following code between the <grid> and </grid> tags.
+<programlisting><![CDATA[
+<ListBox x:Name="listBox1"
+ HorizontalAlignment="Stretch"
+ Margin="25,8,26,-78" Grid.RowSpan="1"
+ Grid.Row="0" VerticalAlignment="Stretch"
+ ItemsSource="{Binding Mode=OneWay}" >
+ <ListBox.ItemTemplate>
+ <DataTemplate>
+ <StackPanel x:Name="DisplayListData"
+ Orientation="Horizontal"
+ VerticalAlignment="Bottom"
+ Margin="5" >
+ <HyperlinkButton
+ Content ="{Binding}"
+ NavigateUri="{Binding}"
+ Margin="5,0,0,0"
+ VerticalAlignment="Bottom"
+ HorizontalAlignment="Left"
+ FontSize="12">
+ </HyperlinkButton>
+ </StackPanel>
+ </DataTemplate>
+ </ListBox.ItemTemplate>
+</ListBox>
+]]></programlisting>
+ </listitem>
+ <listitem>Build the Silverlight application and launch without debugging using <emphasis>Ctrl F5</emphasis>.
+This will launch the browser and open SilverlightApplication1TestPage.aspx.
+ <figure id="sparqlwinf34" float="1">
+ <title>SilverlightApplication1TestPage.aspx</title>
+ <graphic fileref="ui/sparqlwinf34.png"/>
+ </figure>
+ </listitem>
+</orderedlist>
+<para>
+Clicking on one of the IRIs will open the page using description.vsp.
+</para>
+ <figure id="sparqlwinf35" float="1">
+ <title>using description.vsp</title>
+ <graphic fileref="ui/sparqlwinf35.png"/>
+ </figure>
+ </sect2>
+</sect1>
+
+<sect1 id="installnetriadd"><title>Creating A Simple .NET RIA Services Application To Display Data
+From Virtuoso</title>
+<para>.NET RIA Services is a new framework from Microsoft that simplifies the development of n-tier web
+applications. A typical application will consist of a presentation layer, application logic and a data
+access layer. In these examples a combination of Silverlight 3 and .NET RIA Services will provide the
+presentation layer and application layer while the data will reside in Virtuoso and be accessed using
+the Virtuoso ADO.NET provider. The first example demonstrates how to display data from the Employee
+table in the Demo database in a grid on a web page. The second example shows how to display IRIs from
+the RDF views of the demo data. The IRIs are used to create hyperlinks that are the starting point
+for exploring the linked data.
+</para>
+ <sect2 id="installnetriaddpreq">
+ <title>Pre-requisites</title>
+<orderedlist>
+ <listitem>The example assumes that you have a local Virtuoso server with the Northwind demo database
+installed. If the demo database is not already installed then download the demo database VAD package
+(demo_dav.vad) and install it. The VAD package will create a new database in Virtuoso called demo
+containing the familiar Northwind tables. It will also creates RDF views of the Northwind tables.
+In the example we assume the database is accessible on a hostname of "demo.openlinksw.com" on the
+default port 80, where an actually live instance of the Virtuoso Demo database is hosted. Users
+would use the appropriate hostname and port number of their Virtuoso installation to create the
+sample application, and would be would be localhost:8890 for a default installation or whatever
+the URIQA DefaultHost Virtuoso configuration parameter is set to when the demo database VAD package
+is installed.</listitem>
+ <listitem>The Virtuoso ADO.Net provider for .Net 3.5 and the Entity Framework.</listitem>
+ <listitem>Microsoft Visual Studio 2008</listitem>
+ <listitem>The Virtuoso RDF Mappers VAD package.</listitem>
+ <listitem><ulink url="http://www.microsoft.com/downloads/details.aspx?familyid=9442b0f2-7465-417a-88f3-5e7b5409e9dd&displaylang=en">Silverlight 3 Tools for Visual Studio 2008 SP1</ulink>.</listitem>
+ <listitem><ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyID=76bb3a07-3846-4564-b0c3-27972bcaabce&displaylang=en">Microsoft .NET RIA Services July 2009 Preview</ulink>.</listitem>
+</orderedlist>
+ </sect2>
+ <sect2 id="installnetriaddcrser">
+ <title>Creating the Application</title>
+<para><emphasis>Step 1 - Create the Visual Studio Projects.</emphasis></para>
+<orderedlist>
+ <listitem>Open <emphasis>Visual Studio</emphasis> and create a new <emphasis>Silverlight Application</emphasis> project. Call the project DemoApplication.</listitem>
+ <listitem>In the New Silverlight Application dialog ensure that <emphasis>Enable .NET RIA Services</emphasis> is checked. Click the <emphasis>OK</emphasis> button.
+ <figure id="ria1" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria1.png"/>
+ </figure>
+ </listitem>
+</orderedlist>
+ <para>At this point a skeleton solution is created that consists of a client project called DemoApplication
+and a server project called DemoApplication.Web. This application will use data from the Virtuoso database.
+We add the data and its schema to the application by adding an ADO.NET entity data model to the server
+project.</para>
+<para><emphasis>Step 2 - Add the Data Model</emphasis></para>
+<orderedlist>
+ <listitem>Right click the server project in the <emphasis>Solution Explorer</emphasis> and
+<emphasis>Add New Item</emphasis>. In the dialog box select <emphasis>ADO.NET Entity Data Model</emphasis>
+and call it demo.edmx. Click the <emphasis>Add</emphasis> button. This will open the
+<emphasis>Entity Data Model Wizard</emphasis>.</listitem>
+ <listitem>Choose <emphasis>Generate From Database</emphasis> and click <emphasis>Next</emphasis>.</listitem>
+ <listitem>Set up a connection to the Demo database on your local Virtuoso Server, select
+<emphasis>Yes, include the sensitive data in the connection string</emphasis> and set the name of the
+entities to DemoEntities. Click <emphasis>Next</emphasis>.</listitem>
+ <listitem>On the <emphasis>Choose Your Database Objects</emphasis> page expand <emphasis>Tables</emphasis>
+and select Employees. Check that the Model Namespace is DemoModel and click <emphasis>Finish</emphasis>.</listitem>
+</orderedlist>
+ <figure id="ria2" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria2.png"/>
+ </figure>
+ <para>We want to make the entities in the model available to both the client and server parts of the
+solution. To do this we need to add a DomainService to the solution. However, to make the entities from
+the data model available to the domain service we must first build the solution.</para>
+<para><emphasis>Step 3 - Add a Domain Service.</emphasis></para>
+<orderedlist>
+ <listitem>First build the solution.</listitem>
+ <listitem>Right click the server project in the <emphasis>Solution Explorer</emphasis> and
+<emphasis>Add New Item</emphasis>. In the dialog box choose <emphasis>Domain Service Class</emphasis>
+from the Templates pane and call it EmployeeService.cs. Click <emphasis>Add</emphasis>. This will open the
+<emphasis>Add New Domain Service Class</emphasis> dialog.</listitem>
+ <listitem>The entities from the model we have just added to the project are listed under
+<emphasis>Entities</emphasis>. Tick the box next to Employees. and click OK.</listitem>
+</orderedlist>
+ <figure id="ria3" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria3.png"/>
+ </figure>
+<para>This will create the DomainService class and generated code in both the client and server parts of
+the application. The Silverlight client can now interact with the data through the DomainContext class
+in the client project. At this point you need to build the solution again.
+</para>
+<para><emphasis>Step 4 - Display The Data</emphasis></para>
+<orderedlist>
+ <listitem>From the <emphasis>Silverlight XAML Controls</emphasis> in the <emphasis>Toolbox</emphasis>
+drag a <emphasis>DataGrid</emphasis> between the <Grid> </Grid> tags on MainPage.xaml in the client. Call the grid EmployeeGrid.
+<programlisting><![CDATA[
+<data:DataGrid Name="EmployeeGrid"></data:DataGrid>
+]]></programlisting>
+</listitem>
+ <listitem>Instantiate the DomainContext to get the list of employees and add them to the grid by
+adding code to MainPage.xaml.cs so it looks like this:
+<programlisting><![CDATA[
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using DemoApplication.Web;
+using System.Windows.Ria.Data;
+
+namespace DemoApplication
+{
+ public partial class MainPage : UserControl
+ {
+ private EmployeeContext _employeeContext = new EmployeeContext();
+ public MainPage()
+ {
+ InitializeComponent();
+ LoadOperation<Employees> LoadOp =
+ this._employeeContext.Load(this._employeeContext.GetEmployeesQuery());
+ this.EmployeeGrid.ItemsSource = LoadOp.Entities;
+ }
+ }
+}
+]]></programlisting>
+</listitem>
+ <listitem>Build and run the application. Internet Explorer will be launched and you will see the data
+displayed on the page as a grid.
+</listitem>
+</orderedlist>
+ <figure id="ria4" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria4.png"/>
+ </figure>
+ </sect2>
+ <sect2 id="installnetriaddcrdf">
+ <title>Displaying RDF Data</title>
+ <para>One advantage of using Virtuoso as the data store is the seamless way in which we can use
+this use this application to display dereferencable IRIs and explore RDF linked data.
+ </para>
+ <para>The Virtuoso SPASQL interface allows RDF data in the Virtuoso Quad store to be queried
+using SPARQL from any SQL interface by simply prefixing the SPARQL query with the keyword SPARQL.
+We will use the SPASQL interface to create a view containing the IRIs of the Employees in the
+the Demo RDF data in Virtuoso.
+ </para>
+<para><emphasis>Step 1 - Create the View in Virtuoso</emphasis></para>
+<orderedlist>
+ <listitem>Open the Virtuoso Conductor.</listitem>
+ <listitem>In isql execute the following statement. Remember to use the appropriate hostname and port
+number of your Virtuoso installation, typically localhost:8890 for a default installation or whatever
+the <link linkend="ini_URIQA">URIQA DefaultHost</link> Virtuoso configuration parameter was set to when
+the demo database VAD package was installed.
+<programlisting><![CDATA[
+CREATE VIEW Demo.demo.sparqlview as
+SPARQL
+PREFIX nwind: <http://demo.openlinksw.com/schemas/northwind#>
+SELECT DISTINCT ?s
+FROM <http://demo.openlinksw.com/Northwind>
+WHERE
+ {
+ ?s a nwind:Employee
+ }
+]]></programlisting>
+</listitem>
+</orderedlist>
+<para><emphasis>Step 2 - Modify the Solution To use the View</emphasis></para>
+<orderedlist>
+ <listitem>Delete the existing Employee model and add a new one that comprises this new view.
+ <figure id="ria5" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria5.png"/>
+ </figure>
+ </listitem>
+ <listitem>Delete the DomainService. Build the solution and add a new DomainService called
+EmployeeService. Select the sparqlview entity. Build the solution.
+ <figure id="ria6" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria6.png"/>
+ </figure>
+ </listitem>
+ <listitem>Modify the code in mainpage.xaml.cs so it uses the sparqview entity. It should look like this:
+<programlisting><![CDATA[
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using DemoApplication.Web;
+using System.Windows.Ria.Data;
+
+namespace DemoApplication
+{
+ public partial class MainPage : UserControl
+ {
+ private EmployeeContext _employeeContext = new EmployeeContext();
+ public MainPage()
+ {
+ InitializeComponent();
+ LoadOperation<sparqlview> LoadOp =
+ this._employeeContext.Load(this._employeeContext.GetSparqlviewQuery());
+ this.EmployeeGrid.ItemsSource = LoadOp.Entities;
+ }
+ }
+}
+]]></programlisting>
+</listitem>
+ <listitem>Build and run the application. You will see a list of IRIs that identify the Northwind employees.
+ <figure id="ria7" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria7.png"/>
+ </figure>
+ </listitem>
+</orderedlist>
+<para>To realize the power of linked data we would now liked to begin exploring this data by clicking on
+these IRIs.</para>
+<para><emphasis>Step 3 - Make Hyperlinks From IRIs</emphasis></para>
+<orderedlist>
+ <listitem>Modify the DataGrid in MainPage.xaml to bind the IRI in each cell of the grid to a
+Hyperlink button. We set the AutoGenerateColumns property of the DataGrid to False then add our
+own Template for the column. MainPage.xaml should look like this:
+<programlisting><![CDATA[
+<UserControl xmlns:data="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Data" x:Class="DemoApplication.MainPage"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ mc:Ignorable="d" d:DesignWidth="640" d:DesignHeight="480">
+ <Grid x:Name="LayoutRoot">
+ <data:DataGrid Name="EmployeeGrid" AutoGenerateColumns="False">
+ <data:DataGrid.Columns>
+ <data:DataGridTemplateColumn Header="Employee">
+ <data:DataGridTemplateColumn.CellTemplate>
+ <DataTemplate>
+ <StackPanel x:Name="DisplayEmployeeData"
+ Orientation="Horizontal"
+ VerticalAlignment="Bottom"
+ Margin="5" >
+ <HyperlinkButton Content ="{Binding s}"
+ NavigateUri="{Binding s}"
+ Margin="5,0,0,0"
+ VerticalAlignment="Bottom"
+ HorizontalAlignment="Left"
+ FontSize="12">
+ </HyperlinkButton>
+ </StackPanel>
+ </DataTemplate>
+ </data:DataGridTemplateColumn.CellTemplate>
+ </data:DataGridTemplateColumn>
+ </data:DataGrid.Columns>
+ </data:DataGrid>
+ </Grid>
+</UserControl>
+]]></programlisting>
+</listitem>
+ <listitem>If we build and run the project now each IRI in the list appears as a hyperlink.
+ <figure id="ria8" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria8.png"/>
+ </figure>
+</listitem>
+ <listitem>Clicking on each of the links takes you to a new document that contains further links
+to information about each Employee. The Demo dataset can be explored further by following the
+dereferenceable IRIs in the description pages.
+ <figure id="ria9" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria9.png"/>
+ </figure>
+ <figure id="ria10" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/ria10.png"/>
+ </figure>
+</listitem>
+</orderedlist>
+ </sect2>
+ <sect2 id="installnetriaddcnext">
+ <title>Next Steps</title>
+ <para>The examples in this document show you how to simply display data in a browser using
+Silverlight 3 and .NET RIA Services. See an <link linkend="installnetriavd">example</link> of a
+more complicated application.</para>
+ </sect2>
+</sect1>
+
+<sect1 id="installnetriavd"><title>Creating a .Net RIA Services Application That Will Update Virtuoso Data</title>
+<para>This example demonstrates how data in Virtuoso can be updated from a Microsoft .NET RIA Services
+application. The example is a continuation of the first example in <link linkend="installnetriadd">Creating a Simple .Net RIA Services
+Application to Display Data From Virtuoso</link>.</para>
+ <sect2 id="installnetriavdpreq">
+ <title>Pre-requisites</title>
+<orderedlist>
+ <listitem>A working copy of the application created in <link linkend="installnetriadd">Creating a
+Simple .Net RIA Services Application to Display Data From Virtuoso</link>.</listitem>
+</orderedlist>
+ </sect2>
+ <sect2 id="installnetriavdcrser">
+ <title>Creating the Application</title>
+<para><emphasis>Step 1 - Add A New Domain Service Class</emphasis></para>
+<para>The EmployeeService Domain Service Class was only used to display data so was created
+read only. In this example we need to be able to update the data so we need to remove the read
+only Domain Service Class and create a new on.</para>
+<orderedlist>
+ <listitem>In the <emphasis>Server Explorer</emphasis> right click EmployeeService and select <emphasis>Delete</emphasis></listitem>
+ <listitem>Right click the server project and <emphasis>Add New Item</emphasis>. In the dialog box choose Domain Service Class from the Templates pane and again call it EmployeeService.cs. Click Add.</listitem>
+ <listitem>Select the Employees entity and tick <emphasis>Enable editing</emphasis>. Also tick <emphasis>Generated associated classes for metadata</emphasis>.
+ <figure id="riad1" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/riad1.png"/>
+ </figure>
+ </listitem>
+ <listitem>Update MainPage.xaml.cs to use EmployeeService2 the new domain service rather than EmployeeContext.</listitem>
+</orderedlist>
+ <para>We want to create a master detail style page. To do this we will use the DomainDataSourceComponent
+from the Silverlight Components. But first we will add a pager so only 5 records are displayed at a time.</para>
+<para><emphasis>Step 2 - Add a DataPager</emphasis></para>
+<orderedlist>
+ <listitem>Add two new namespaces to MainPage.xaml
+<programlisting><![CDATA[
+xmlns:riaControls="clr-namespace:System.Windows.Controls;assembly=System.Windows.Ria.Controls"
+xmlns:ds="clr-namespace:DemoApplication.Web"
+]]></programlisting>
+ </listitem>
+ <listitem>Use a DomainDataSource to provide the data to fill the grid. Add the following to
+MainPage.xaml before the DataGrid.
+<programlisting><![CDATA[
+<riaControls:DomainDataSource x:Name="EmployeeDataSource"
+ QueryName="GetEmployeesQuery"
+ LoadSize="10"
+ AutoLoad="True">
+ <riaControls:DomainDataSource.DomainContext>
+ <ds:EmployeeService2/>
+ </riaControls:DomainDataSource.DomainContext>
+</riaControls:DomainDataSource>
+]]></programlisting>
+ </listitem>
+ <listitem>Update the MainPage.xaml.cs code behind file. Using the DomainDataSource means you no
+longer need to instantiate the context and load the grid in MainPage.xaml.cs so it becomes:
+<programlisting><![CDATA[
+public partial class MainPage : UserControl
+{
+ public MainPage()
+ {
+ InitializeComponent();
+ }
+}
+]]></programlisting>
+ </listitem>
+ <listitem>Set the binding source of the DataGrid to the DomainDataSource
+<programlisting><![CDATA[
+<data:DataGrid MinHeight="100" IsReadOnly="True" ItemsSource="{Binding Data, ElementName=EmployeeDataSource}" x:Name="DataGrid1"></data:DataGrid> />
+]]></programlisting>
+ </listitem>
+ <listitem>Drag a DataPager form the tool box onto MainPage.xaml just after the DataGrid.
+ </listitem>
+ <listitem>Add a page size and binding element to the DataPager.
+<programlisting><![CDATA[
+<data:DataPager PageSize="5" Source="{Binding Data, ElementName=employeeDataSource}"
+ Margin="0,-1,0,0"></data:DataPager>
+]]></programlisting>
+ </listitem>
+ <listitem>Build and run the application. The data should be displayed 5 rows at a time.
+ <figure id="riad2" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/riad2.png"/>
+ </figure>
+ </listitem>
+</orderedlist>
+ <para>We now need to add a DataForm to display the details.</para>
+<para><emphasis>Step 3 - Add a DataForm</emphasis></para>
+<orderedlist>
+ <listitem>Add the following namespace to MainPage.xaml
+<programlisting><![CDATA[
+xmlns:dataForm="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Data.DataForm.Toolkit"
+]]></programlisting>
+</listitem>
+ <listitem>Add the form to MainPage.xaml
+<programlisting><![CDATA[
+<dataForm:DataForm x:Name="dataForm1" Header="Employee Information" AutoGenerateFields="False" AutoEdit="False" AutoCommit="False" CurrentItem="{Binding SelectedItem, ElementName=DataGrid1}" Margin="0,12,0,0">
+ <dataForm:DataForm.EditTemplate>
+ <DataTemplate>
+ <StackPanel>
+ <dataForm:DataField Label="Employee ID">
+ <TextBox Text="{Binding EmployeeID, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="First Name">
+ <TextBox Text="{Binding FirstName, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Last Name">
+ <TextBox Text="{Binding LastName, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Courtesy Title">
+ <TextBox Text="{Binding TitleOfCourtesy, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Hire Date">
+ <TextBox Text="{Binding HireDate, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Title">
+ <TextBox Text="{Binding Title, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Reports To">
+ <TextBox Text="{Binding ReportsTo, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Region">
+ <TextBox Text="{Binding Region, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Address">
+ <TextBox Text="{Binding Address, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="City">
+ <TextBox Text="{Binding City, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Country Code">
+ <TextBox Text="{Binding CountryCode, Mode=TwoWay}" />
+ </dataForm:DataField>
+ <dataForm:DataField Label="Postal Code">
+ <TextBox Text="{Binding PostalCode, Mode=TwoWay}" />
+ </dataForm:DataField>
+ </StackPanel>
+ </DataTemplate>
+ </dataForm:DataForm.EditTemplate>
+ </dataForm:DataForm>
+]]></programlisting>
+</listitem>
+ <listitem>Surround the DomainDataSource, DataGrid and DataForm with
+<programlisting><![CDATA[
+ <ScrollViewer BorderThickness="0" VerticalScrollBarVisibility="Auto" Padding="12,0,12,0" Margin="-2">
+ <StackPanel Margin="0,12,0,12" Orientation="Vertical" >
+.
+.
+.
+ </StackPanel>
+ </ScrollViewer>
+]]></programlisting>
+</listitem>
+ <listitem>Build and run the application. As each employee is selected the data form fill with their details
+ <figure id="riad3" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/riad3.png"/>
+ </figure>
+</listitem>
+</orderedlist>
+<para>By clicking on the pencil symbol in the top right hand corner the data in the form can be edited
+but it is not propagated back to the database.</para>
+ </sect2>
+ <sect2 id="installnetriavdcrprup">
+ <title>Propagate Updates to Virtuoso</title>
+<orderedlist>
+ <listitem>Add a 'Submit' button just after the DataForm in MainPage.xaml by adding the following code.
+<programlisting><![CDATA[
+<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,12,0,0">
+ <Button x:Name="submitButton" Width="75" Height="23" Content="Submit" Margin="4,0,0,0" Click="submitButton_Click"/>
+</StackPanel>
+]]></programlisting>
+</listitem>
+ <listitem>Handle the button click event in MainPage.xaml.cs by adding the following code:
+<programlisting><![CDATA[
+private void submitButton_Click(object sender, RoutedEventArgs e)
+ {
+ EmployeeDataSource.SubmitChanges();
+ }
+]]></programlisting>
+</listitem>
+ <listitem>Build and run the application. If you now edit data in the form and click the submit button
+the data in Virtuoso will be updated.
+ <figure id="riad4" float="1">
+ <title>.NET RIA Services Application</title>
+ <graphic fileref="ui/riad4.png"/>
+ </figure>
+</listitem>
+</orderedlist>
+ </sect2>
+</sect1>
+
+
+<sect1 id="clusterstcnf"><title>Cluster Installation and Config</title>
+ <sect2 id="clusterstcnfsetup"><title>Creating New Cluster Setup</title>
+ <para>After the installation of V6 is done, in order to setup a Cluster you need to perform the
+following steps (working on Unix and MacOsX):</para>
+<orderedlist>
+ <listitem>Determine how many nodes you want to start the cluster with: 2, 4, 6, 8
+<itemizedlist mark="bullet">
+ <listitem>Note: the number of the nodes should be >= 2 </listitem>
+</itemizedlist>
+</listitem>
+ <listitem>Place the following files respectively to your Virtuoso installation folders:
+<itemizedlist mark="bullet">
+ <listitem>bin folder: the virtuoso-restore.sh file:
+<programlisting><![CDATA[
+#!/bin/sh
+#
+# $Id: installation.xml,v 1.5.2.3 2010/10/07 12:44:59 source Exp $
+#
+# (C) 2007 OpenLink Software
+#
+# The copyright above and this notice must be preserved in all
+# copies of this source code. The copyright above does not
+# evidence any actual or intended publication of this source code.
+#
+# This is unpublished proprietary trade secret of OpenLink Software.
+# This source code may not be copied, disclosed, distributed, demonstrated
+# or licensed except as authorized by OpenLink Software.
+#
+# To learn more about this product, or any other product in our
+# portfolio, please check out our web site at:
+#
+# http://www.openlinksw.com
+#
+# or contact us at:
+#
+# general.information at openlinksw.com
+#
+# If you have any technical questions, please contact our support
+# staff at:
+#
+# technical.support at openlinksw.com
+#
+
+
+#
+# Set up the script
+#
+umask 022
+
+#
+# Optional argument which database to start/stop
+#
+DBDIR=${1-all}
+BPREF=${2-bkp}
+
+
+#
+# Check if we need to be silent
+#
+SILENT=${SILENT-"0"}
+if test "$SILENT" = "0"
+then
+ ECHO=echo
+else
+ ECHO=:
+fi
+
+
+#
+# Script information
+#
+SCRIPT_NAME=`basename $0`
+SCRIPT_VERSION="1.0"
+SCRIPT_DATE="Wed Apr 18 2007"
+
+
+#
+# Where to look
+#
+if test "x$VIRTUOSO_HOME" = "x"
+then
+ VIRTUOSO_HOME="`dirname $0`/.."
+ VIRTUOSO_HOME=`cd $VIRTUOSO_HOME >/dev/null && pwd`
+fi
+if test "x$VIRTUOSO_HOME" = "x"
+then
+ echo ""
+ echo "***"
+ echo "*** ERROR: Unable to determine value for \$VIRTUOSO_HOME"
+ echo "***"
+
+ exit 1
+fi
+if test \! -f "$VIRTUOSO_HOME/bin/virtuoso-iodbc-t"
+then
+ echo ""
+ echo "***"
+ echo "*** ERROR: \$VIRTUOSO_HOME does not appear to contain standard virtuoso binary"
+ echo "***"
+
+ exit 1
+fi
+export VIRTUOSO_HOME SCRIPT_NAME
+
+#
+# Read local environment
+#
+if test -f "$VIRTUOSO_HOME/virtuoso-environment.sh"
+then
+ . "$VIRTUOSO_HOME/virtuoso-environment.sh"
+fi
+
+
+#
+# Try to start the oplmgr if available
+#
+cd "$VIRTUOSO_HOME/bin"
+if test -x oplmgr
+then
+ ./oplmgr +start 2>/dev/null
+fi
+
+
+#
+# Check which database(s) to start
+#
+cd "$VIRTUOSO_HOME"
+if test "$DBDIR" = "all"
+then
+ DBDIR=""
+ for f in `ls -1 */virtuoso.ini 2>/dev/null`
+ do
+ d=`dirname $f`
+
+ if test -d "$d"
+ then
+ DBDIR="$DBDIR $d"
+ fi
+ done
+fi
+
+
+#
+# Perform the start/stop command
+#
+for d in $DBDIR
+do
+ $ECHO "Starting Virtuoso instance in [$d]"
+ $VIRTUOSO_HOME/install/command-restore.sh $d $BPREF
+done
+
+exit 0
+
+]]></programlisting>
+</listitem>
+ <listitem>folder install: the files command-restore.sh and mk_cluster.sh:
+<para>command-restore.sh</para>
+<programlisting><![CDATA[
+#!/bin/sh
+#
+# $Id: installation.xml,v 1.5.2.3 2010/10/07 12:44:59 source Exp $
+#
+# (C) 2007 OpenLink Software
+#
+# The copyright above and this notice must be preserved in all
+# copies of this source code. The copyright above does not
+# evidence any actual or intended publication of this source code.
+#
+# This is unpublished proprietary trade secret of OpenLink Software.
+# This source code may not be copied, disclosed, distributed, demonstrated
+# or licensed except as authorized by OpenLink Software.
+#
+# To learn more about this product, or any other product in our
+# portfolio, please check out our web site at:
+#
+# http://www.openlinksw.com
+#
+# or contact us at:
+#
+# general.information at openlinksw.com
+#
+# If you have any technical questions, please contact our support
+# staff at:
+#
+# technical.support at openlinksw.com
+#
+
+
+#
+# Set up the script
+#
+umask 022
+
+
+#
+# Optional argument which database to startup
+#
+DBDIR=${1-database}
+BPREF=${2-bkp}
+
+#
+# Script information
+#
+SCRIPT_NAME=`basename $0`
+SCRIPT_VERSION="1.0"
+SCRIPT_DATE="Wed Apr 18 2007"
+
+
+#
+# Where to look
+#
+if test "x$VIRTUOSO_HOME" = "x"
+then
+ VIRTUOSO_HOME="`dirname $0`/.."
+ VIRTUOSO_HOME=`cd $VIRTUOSO_HOME >/dev/null && pwd`
+fi
+if test "x$VIRTUOSO_HOME" = "x"
+then
+ echo ""
+ echo "***"
+ echo "*** ERROR: Unable to determine value for \$VIRTUOSO_HOME"
+ echo "***"
+
+ exit 1
+fi
+if test \! -f "$VIRTUOSO_HOME/bin/virtuoso-iodbc-t"
+then
+ echo ""
+ echo "***"
+ echo "*** ERROR: \$VIRTUOSO_HOME does not appear to contain standard virtuoso binary"
+ echo "***"
+
+ exit 1
+fi
+export VIRTUOSO_HOME SCRIPT_NAME
+
+
+#
+# Settings
+#
+SLEEP=5
+INIFILE="$VIRTUOSO_HOME/bin/inifile"
+INIFLAGS="+inifile virtuoso.ini"
+
+
+#
+# Read local environment
+#
+if test -f "$VIRTUOSO_HOME/virtuoso-environment.sh"
+then
+ . "$VIRTUOSO_HOME/virtuoso-environment.sh"
+fi
+
+
+#
+# Check if database directory exists
+#
+if test \! -d "$VIRTUOSO_HOME/$DBDIR"
+then
+ echo ""
+ echo "***"
+ echo "*** WARNING: \$VIRTUOSO_HOME/$DBDIR does not exist"
+ echo "***"
+
+ exit 1
+fi
+
+
+#
+# Check if we are allowed to startup the database at all
+#
+
+if test \! -w "$VIRTUOSO_HOME/$DBDIR"
+then
+ echo ""
+ echo "***"
+ echo "*** ERROR: You do not have permission to startup this virtuoso instance"
+ echo "***"
+
+ exit 1
+fi
+
+
+#
+# Check if there is any lock file in this directory
+#
+cd "$VIRTUOSO_HOME/$DBDIR"
+LCK=virtuoso.lck
+for i in *.lck
+do
+ if test -f "$i"
+ then
+ LCK="$i"
+ fi
+done
+
+
+#
+# If there is a lock file present, consider the database running
+#
+if test -f "$LCK"
+then
+ echo ""
+ echo "***"
+ echo "*** WARNING: Lock file already exists."
+ echo "***"
+ echo "*** This Virtuoso instance is probably already running."
+ echo "***"
+
+ exit 0
+fi
+
+DBFILE=`$INIFILE $INIFLAGS +section Database +key DatabaseFile`
+TRXFILE=`$INIFILE $INIFLAGS +section Database +key TransactionFile`
+
+if test -f "$DBFILE"
+then
+ echo ""
+ echo "***"
+ echo "*** WARNING: DataBase file already exists."
+ echo "***"
+ echo "*** This Virtuoso instance cannot be restored."
+ echo "***"
+
+ exit 0
+fi
+
+if test -f "$TRXFILE"
+then
+ echo ""
+ echo "***"
+ echo "*** WARNING: TransactionFile file already exists."
+ echo "***"
+ echo "*** This Virtuoso instance cannot be restored."
+ echo "***"
+
+ exit 0
+fi
+
+#
+# Start the engine
+#
+./virtuoso +restore-backup "$BPREF" +backup-dirs backup
+if test $? -ne 0
+then
+ echo ""
+ echo "***"
+ echo "*** ERROR: Could not start this Virtuoso Instance."
+ echo "***"
+
+ LOG=`$INIFILE $INIFLAGS +section Database +key ErrorLogFile`
+ tail "$LOG"
+
+ echo "***"
+ echo "*** Please fix the above issue(s) before trying again."
+ echo "***"
+
+ exit 1
+fi
+
+
+# All done
+exit 0
+
+]]></programlisting>
+<para>mk_cluster.sh</para>
+<programlisting><![CDATA[
+#!/bin/bash
+
+export NUM_NODES=${1-8}
+export NUM_DISKS=4
+
+SPACE=256
+echo diskspace per NODE = ${SPACE}M
+
+#
+# Goto TOP
+#
+
+if test "x$VIRTUOSO_HOME" = "x"
+then
+ VIRTUOSO_HOME="`dirname $0`/.."
+ VIRTUOSO_HOME=`cd $VIRTUOSO_HOME >/dev/null && pwd`
+fi
+if test "x$VIRTUOSO_HOME" = "x"
+then
+ echo ""
+ echo "***"
+ echo "*** ERROR: Unable to determine value for \$VIRTUOSO_HOME"
+ echo "***"
+
+ exit 1
+fi
+
+cd $VIRTUOSO_HOME
+
+#cd /opt/virtuoso
+#mkdir -p /dbs1/lod_database
+#mkdir -p /dbs2/lod_database
+#mkdir -p /dbs3/lod_database
+#mkdir -p /dbs4/lod_database
+
+#
+# Create various directories
+#
+i=1
+while true
+do
+ PORT=`expr 12200 + $i`
+ CLUSTER=`printf "cluster_%02d" $i`
+ HOST=`printf "Host%d" $i`
+ LOD=`printf "lod-%02d" $i`
+
+ echo "Creating $CLUSTER on Host $HOST port $PORT"
+
+ mkdir -p "$CLUSTER"
+ mkdir -p "$CLUSTER"/logs
+ mkdir -p "$CLUSTER"/backup
+
+ cat > "$CLUSTER"/virtuoso.ini <<-EOF_VIRTUOSO
+ ; virtuoso.ini
+ ;
+ ; Configuration file for the OpenLink Virtuoso VDBMS Server
+ ;
+ ;
+ ; Database setup
+ ;
+ [Database]
+ DatabaseFile = virtuoso.db
+ TransactionFile = virtuoso.trx
+ ErrorLogFile = virtuoso.log
+ ErrorLogLevel = 7
+ Syslog = 0
+ TempStorage = TempDatabase
+ FileExtend = 200
+ MaxCheckpointRemap = 2500000
+ Striping = 0
+
+ [TempDatabase]
+ DatabaseFile = virtuoso.tdb
+ TransactionFile = virtuoso.ttr
+ FileExtend = 200
+
+ ;
+ ; Server parameters
+ ;
+ [Parameters]
+ ServerPort = $PORT
+ ServerThreads = 100
+ CheckpointInterval = 600
+ NumberOfBuffers = 20000
+ MaxDirtyBuffers = 130000
+ DefaultIsolation = 2
+ UnremapQuota = 0
+ AtomicDive = 1
+ PrefixResultNames = 0
+ CaseMode = 2
+ DisableMtWrite = 0
+ ;MinAutoCheckpointSize = 4000000
+ ;CheckpointAuditTrail = 1
+ DirsAllowed = /
+ PLDebug = 0
+ TestCoverage = cov.xml
+ ;Charset=ISO-8859-1
+ ResourcesCleanupInterval = 1
+ ThreadCleanupInterval = 1
+ TransactionAfterImageLimit = 1500000000
+ FDsPerFile = 4
+ MaxMemPoolSize = 40000000
+ IndexTreeMaps = 64
+
+ [VDB]
+ VDBDisconnectTimeout = 1000
+ ArrayOptimization = 2
+ NumArrayParameters = 10
+
+ [Client]
+ SQL_QUERY_TIMEOUT = 0
+ SQL_TXN_TIMEOUT = 0
+ SQL_ROWSET_SIZE = 10
+ SQL_PREFETCH_BYTES = 12000
+
+ [AutoRepair]
+ BadParentLinks = 0
+ BadDTP = 0
+
+ ;[Striping]
+ ;Segment1 = ${SPACE}M, /dbs1/lod_database/${LOD}-sl1.db = q1, /dbs2/lod_database/${LOD}-sl2.db = q2, /dbs3/lod_database/${LOD}-sl3.db = q3, /dbs4/lod_database/${LOD}-sl4.db = q4
+
+ [Replication]
+ ServerName = $LOD
+ ServerEnable = 1
+
+ [!URIQA]
+ DefaultHost = localhost:8890
+EOF_VIRTUOSO
+
+if test $i -eq 1
+then
+ cat >> "$CLUSTER"/virtuoso.ini <<-EOF_VIRTUOSO_HTTP
+
+ [HTTPServer]
+ ServerPort = 8890
+ ServerRoot = $VIRTUOSO_HOME/vsp
+ ServerThreads = 15
+ MaxKeepAlives = 10
+ KeepAliveTimeout = 10
+ MaxCachedProxyConnections = 10
+ ProxyConnectionCacheTimeout = 10
+ DavRoot = DAV
+ HTTPLogFile = logs/http.log
+EOF_VIRTUOSO_HTTP
+fi
+ # Create cluster control
+ cat > "$CLUSTER"/cluster.ini <<-EOF_CLUSTER
+ [Cluster]
+ Threads = 50
+ ThisHost = $HOST
+ Master = Host1
+ ReqBatchSize = 10000
+ BatchesPerRPC = 4
+ BatchBufferBytes = 20000
+ LocalOnly = 2
+ MaxKeepAlivesMissed = 1000
+ MaxHosts = 100
+
+EOF_CLUSTER
+ let n=0
+ while true
+ do
+ let n+=1
+ CLPORT="`expr 22200 + $n`"
+ echo "Host$n = $CLPORT" >> "$CLUSTER"/cluster.ini
+ if test $n -ge $NUM_NODES
+ then
+ break
+ fi
+ done
+
+ # Linking virtuoso executable in place
+ cd "$CLUSTER"
+ ln -sf "$VIRTUOSO_HOME"/bin/virtuoso-iodbc-t virtuoso
+ cd ..
+
+ let i+=1
+ if test $i -gt $NUM_NODES
+ then
+ break
+ fi
+done
+
+exit 0
+
+]]></programlisting>
+</listitem>
+</itemizedlist>
+</listitem>
+ <listitem>If you are using EC2 instance, make sure you set the environment by running:
+<programlisting><![CDATA[
+. ./virtuoso-environment.sh
+]]></programlisting>
+ </listitem>
+ <listitem>Run the mk_cluster.sh file from the .\install folder with option number of the desired nodes:
+<programlisting><![CDATA[
+..# bash
+..# . ./mk_cluster.sh 4
+....
+Creating cluster_01 on Host Host1 port 12201
+Creating cluster_02 on Host Host2 port 12202
+Creating cluster_03 on Host Host3 port 12203
+Creating cluster_04 on Host Host4 port 12204
+
+]]></programlisting>
+</listitem>
+</orderedlist>
+<sect3 id="clusterstcnfbackuprestore">
+<title>Backup and Restore</title>
+ <para><emphasis>Backup</emphasis></para>
+<para>There are 2 ways to backup Virtuoso Cluster DB:</para>
+<orderedlist>
+ <listitem>Backup every node using <link linkend="fn_backup_online"><function>back_online</function></link>
+ <para><emphasis>For example, for every cluster in its backup folder execute:</emphasis></para>
+<programlisting><![CDATA[
+backup_online ('dbp', 10000000, 0, 'backup');
+]]></programlisting>
+</listitem>
+ <listitem>Make backup of all nodes at once using
+<link linkend="clusteroperationadmclexec"><function>cl_exec</function></link>. For example, execute:
+<programlisting><![CDATA[
+cl_exec ('backup_online ('dbp', 10000000, 0, 'backup')', vector ('dbp', 0, 10000000, './backup'));
+]]></programlisting>
+</listitem>
+</orderedlist>
+ <para><emphasis>Restore from Backup</emphasis></para>
+<para>After backup is done for every node in its backup folder, in order to restore,
+execute from the ..\bin folder the virtuoso-restore.sh:</para>
+<programlisting><![CDATA[
+# . ./virtuoso-restore.sh all dbp
+]]></programlisting>
+<para>where the second parameter is the restore prefix.</para>
+</sect3>
+ </sect2>
+ <sect2 id="clusterstcnfconfig"><title>Cluster Config</title>
+<orderedlist>
+ <listitem>Set "FAST_START=1" in the viruoso-start.sh file and then run:
+<programlisting><![CDATA[
+viruoso-start.sh
+]]></programlisting>
+<para>or</para>
+ </listitem>
+ <listitem>Execute the following line:
+<programlisting><![CDATA[
+# /etc/init.d/virtuoso start
+Starting OpenLink Virtuoso: [ OK ]
+]]></programlisting>
+</listitem>
+ <listitem>In order to check the nodes, connect to port 12201 using the ISQL tool:
+<programlisting><![CDATA[
+isql 12201
+]]></programlisting>
+</listitem>
+ <listitem>To check the cluster status, execute the following command:
+<programlisting><![CDATA[
+SQL> status('cluster');
+REPORT
+VARCHAR
+_______________________________________________________________________________
+
+Cluster 4 nodes, 293 s. 0 m/s 0 KB/s 0% cpu 0% read 0% clw threads 1r 0w 0i buffers 1781 0 d 0 w 0 pfs
+
+1 Rows. -- 4 msec.
+]]></programlisting>
+</listitem>
+</orderedlist>
+ </sect2>
+ <tip><title>See Also:</title>
+ <para><link linkend="clusteroperation">Setting up and operating Virtuoso on a cluster.</link></para>
+ <para><link linkend="clusterprogramming">Virtuoso Cluster Programming</link></para>
+ <para><link linkend="fault">Virtuoso Cluster Fault Tolerance.</link></para>
+ </tip>
+</sect1>
+
</chapter>
diff --git a/docsrc/xmlsource/internetservices.xml b/docsrc/xmlsource/internetservices.xml
index 0d491f8..61412f4 100644
--- a/docsrc/xmlsource/internetservices.xml
+++ b/docsrc/xmlsource/internetservices.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/intl.xml b/docsrc/xmlsource/intl.xml
index 8575630..799d8f2 100644
--- a/docsrc/xmlsource/intl.xml
+++ b/docsrc/xmlsource/intl.xml
@@ -5,7 +5,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -23,7 +23,8 @@
-
-->
<!--
- $Id: intl.xml,v 1.2.2.2 2012/03/08 13:13:48 source Exp $
+ $Id: intl.xml,v 1.2 2008/02/06 23:09:33 source Exp $
+ (C)Copyright 2005 OpenLink Software
-->
<chapter label="intl.xml" id="intl">
<title>International Character Support and Compatibility</title>
diff --git a/docsrc/xmlsource/isql.xml b/docsrc/xmlsource/isql.xml
index 71a2e6c..58cd07e 100644
--- a/docsrc/xmlsource/isql.xml
+++ b/docsrc/xmlsource/isql.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/jsphosting.xml b/docsrc/xmlsource/jsphosting.xml
index 9d34e5c..1c8261e 100644
--- a/docsrc/xmlsource/jsphosting.xml
+++ b/docsrc/xmlsource/jsphosting.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/jvmapi.xml b/docsrc/xmlsource/jvmapi.xml
index e265cf5..f069668 100644
--- a/docsrc/xmlsource/jvmapi.xml
+++ b/docsrc/xmlsource/jvmapi.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/ldap.xml b/docsrc/xmlsource/ldap.xml
index a9911c5..433398f 100644
--- a/docsrc/xmlsource/ldap.xml
+++ b/docsrc/xmlsource/ldap.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/mailsrv.xml b/docsrc/xmlsource/mailsrv.xml
index f283088..0abea41 100644
--- a/docsrc/xmlsource/mailsrv.xml
+++ b/docsrc/xmlsource/mailsrv.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/migrate27to30.xml b/docsrc/xmlsource/migrate27to30.xml
index 94d928c..0f3a75d 100644
--- a/docsrc/xmlsource/migrate27to30.xml
+++ b/docsrc/xmlsource/migrate27to30.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/mime.xml b/docsrc/xmlsource/mime.xml
index eeb4f02..11a3c1a 100644
--- a/docsrc/xmlsource/mime.xml
+++ b/docsrc/xmlsource/mime.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/odbcimplementation.xml b/docsrc/xmlsource/odbcimplementation.xml
index b7e0925..b00832b 100644
--- a/docsrc/xmlsource/odbcimplementation.xml
+++ b/docsrc/xmlsource/odbcimplementation.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1288,7 +1288,7 @@ gcc -o odbc_iri -I/usr/local/iODBC odbc_iri.c -L/usr/local/iODBC/lib -liodbc -ld
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/docsrc/xmlsource/oledbimplementation.xml b/docsrc/xmlsource/oledbimplementation.xml
index 355e214..99242e6 100644
--- a/docsrc/xmlsource/oledbimplementation.xml
+++ b/docsrc/xmlsource/oledbimplementation.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/overview.xml b/docsrc/xmlsource/overview.xml
index 523fc5e..5d77f0c 100644
--- a/docsrc/xmlsource/overview.xml
+++ b/docsrc/xmlsource/overview.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -698,7 +698,7 @@ These are then enforced for SPARUL (the SPARQL update language) and SPARQL.
</para>
<para>
When an RDF graph is based on relationally stored data in Virtuoso or another RDBMS through Virtuoso's
-SQL federation feature (i.e., if the graph is an Linked Data View of underlying SQL data), then all relational
+SQL federation feature (i.e., if the graph is an RDF View of underlying SQL data), then all relational
security controls apply.
</para>
<para>
@@ -780,12 +780,12 @@ MaxCheckpointRemap = 246837
say 1/4 of the DB size will resolve the issue.</para>
</sect2>
<sect2 id="virtuosotipsandtricksrdftriggersoptions">
- <title>What are "Generate RDB2RDF triggers" and "Enable Data Syncs with Physical Quad Store" Linked Data Views options?</title>
- <para>These Linked Data Views options basically persist the triples in the transient View Graph in the Native Quad Store. The Data Sync is how you keep the transient views in sync with the persisted triples.</para>
+ <title>What are "Generate RDB2RDF triggers" and "Enable Data Syncs with Physical Quad Store" RDF Views options?</title>
+ <para>These RDF Views options basically persist the triples in the transient View Graph in the Native Quad Store. The Data Sync is how you keep the transient views in sync with the persisted triples.</para>
<para>Without this capability you cannot exploit faceted browsing without severe performance overhead when using Linked Data based conceptual views over ODBC or JDBC accessible data sources.</para>
<para>Note: Using these options when the RFViews have already been created is not currently possible via the Conductor UI. Instead you should be able to add them manually from isql:</para>
<orderedlist>
- <listitem>Drop the Linked Data View graph and Quad Map.</listitem>
+ <listitem>Drop the RDF View graph and Quad Map.</listitem>
<listitem>Create it again with the RDB2RDF Triggers options enabled.</listitem>
</orderedlist>
<tip><title>See Also:</title>
@@ -834,7 +834,7 @@ LIMIT 10
</sect2>
<sect2 id="virtuosotipsandtricksquadstorageinternally">
<title>How can I see which quad storages exist and in which quad storage a graph resides?</title>
- <para>Let's take for example a <ulink url="http://virtuoso.openlinksw.com/whitepapers/relational%20rdf%20views%20mapping.html">created Linked Data View from relational data in Virtuoso</ulink>. The RDF output therefor should have two graphs which reside in a quad storage named for ex.:
+ <para>Let's take for example a <ulink url="http://virtuoso.openlinksw.com/whitepapers/relational%20rdf%20views%20mapping.html">created RDF view from relational data in Virtuoso</ulink>. The RDF output therefor should have two graphs which reside in a quad storage named for ex.:
</para>
<programlisting><![CDATA[
http://localhost:8890/rdfv_demo/quad_storage/default
@@ -876,10 +876,10 @@ http://www.openlinksw.com/schemas/virtrdf#SyncToQuads
<listitem><emphasis>virtrdf:DefaultServiceStorage</emphasis> will be used for SPARQL federation.</listitem>
<listitem><emphasis>virtrdf:SyncToQuads</emphasis> is to keep the list of Linked Data Views that are translated into RDB2RDF triggers.</listitem>
</itemizedlist>
- <para>There are two ways of using the Linked Data View from above in SPARQL endpoint without
+ <para>There are two ways of using the RDF View from above in SPARQL endpoint without
<emphasis>define input:storage</emphasis>:</para>
<orderedlist>
- <listitem>Create Linked Data View right in <emphasis>virtrdf:DefaultQuadStorage</emphasis> or add the
+ <listitem>Create RDF View right in <emphasis>virtrdf:DefaultQuadStorage</emphasis> or add the
view in other storage and then copy it from there to <emphasis>virtrdf:DefaultQuadStorage</emphasis>.
<itemizedlist mark="bullet">
<listitem>In any of these two variants, use:
@@ -2541,7 +2541,7 @@ DB.DBA.TTLP (http_get ('http://purl.org/ontology/mo/', null, 'GET', 'Accept: tex
<para>Existing RDF data can be added to the Virtuoso RDF Quad Store via a variety of built-in data loader utilities.</para>
<para>Many options allow you to easily and quickly generate RDF data from other data sources:</para>
<itemizedlist mark="bullet">
- <listitem>Install the Sponger Bookmarklet for the URIBurner service. Bind this to your own SPARQL-compliant backend RDF database (in this scenario, your local Virtuoso instance), and then perform Network Resource Fetch of some HTTP-accessible resources.</listitem>
+ <listitem>Install the Sponger Bookmarklet for the URIBurner service. Bind this to your own SPARQL-compliant backend RDF database (in this scenario, your local Virtuoso instance), and then Sponge some HTTP-accessible resources.</listitem>
<listitem>Convert relational DBMS data to RDF using the Virtuoso Linked Data Views Wizard.</listitem>
<listitem>Starting with CSV files, you can:
<itemizedlist mark="bullet">
@@ -2834,7 +2834,7 @@ _______________________________________________________________________________
]]></programlisting>
</listitem>
</orderedlist>
- <para>If you want to use the procedure's output inside SPARQL queries, it can be wrapped by a procedure view and it in turn can be used in an Linked Data View but it is redundant for most applications.</para>
+ <para>If you want to use the procedure's output inside SPARQL queries, it can be wrapped by a procedure view and it in turn can be used in an RDF View but it is redundant for most applications.</para>
<para>For typical "almost static" data, it is more practical to write a procedure that will store all found predicates in some dedicated "dictionary" graph and then use the graph as usual.</para>
</sect2>
<sect2 id="constrinserst">
@@ -3068,7 +3068,7 @@ SQL>
<listitem><emphasis>OFFBAND</emphasis>: See description for this free-text option in
<link linkend="offbanddata">this section</link>.
<itemizedlist mark="bullet">
- <listitem>Note: it is useful only if data comers via an Linked Data View and the source
+ <listitem>Note: it is useful only if data comers via an RDF View and the source
relational table uses this trick;</listitem>
</itemizedlist>
</listitem>
diff --git a/docsrc/xmlsource/perfdiag.xml b/docsrc/xmlsource/perfdiag.xml
index 72ef444..73ba448 100644
--- a/docsrc/xmlsource/perfdiag.xml
+++ b/docsrc/xmlsource/perfdiag.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/perl.xml b/docsrc/xmlsource/perl.xml
index 5af3fa4..85588b4 100644
--- a/docsrc/xmlsource/perl.xml
+++ b/docsrc/xmlsource/perl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/php.xml b/docsrc/xmlsource/php.xml
index c6dd61a..fc5011e 100644
--- a/docsrc/xmlsource/php.xml
+++ b/docsrc/xmlsource/php.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/pldebugger.xml b/docsrc/xmlsource/pldebugger.xml
index aee34b8..3cde2fd 100644
--- a/docsrc/xmlsource/pldebugger.xml
+++ b/docsrc/xmlsource/pldebugger.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/plugins.xml b/docsrc/xmlsource/plugins.xml
index c212fa0..59a004d 100644
--- a/docsrc/xmlsource/plugins.xml
+++ b/docsrc/xmlsource/plugins.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/preface.xml b/docsrc/xmlsource/preface.xml
index 04843ec..11e57f2 100644
--- a/docsrc/xmlsource/preface.xml
+++ b/docsrc/xmlsource/preface.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/ptune.xml b/docsrc/xmlsource/ptune.xml
index d6fab40..504797b 100644
--- a/docsrc/xmlsource/ptune.xml
+++ b/docsrc/xmlsource/ptune.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/python.xml b/docsrc/xmlsource/python.xml
index 9922efc..9962b91 100644
--- a/docsrc/xmlsource/python.xml
+++ b/docsrc/xmlsource/python.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/quicktours.xml b/docsrc/xmlsource/quicktours.xml
index ebbdc0f..a068510 100644
--- a/docsrc/xmlsource/quicktours.xml
+++ b/docsrc/xmlsource/quicktours.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/rdfandsparql.xml b/docsrc/xmlsource/rdfandsparql.xml
index 4eb5c08..a4b1319 100644
--- a/docsrc/xmlsource/rdfandsparql.xml
+++ b/docsrc/xmlsource/rdfandsparql.xml
@@ -200,7 +200,7 @@ O to the explicit SQL type in a programmatic way, should be used the following h
<listitem>The language can be extracted as <emphasis>DB.DBA.RDF_LANGUAGE_OF_OBJ (O)</emphasis>.</listitem>
</itemizedlist>
-<para>It could be helpful to be created an Linked Data View for a custom table with formats rdfdf:default or rdfdf:default-nullable
+<para>It could be helpful to be created an RDF View for a custom table with formats rdfdf:default or rdfdf:default-nullable
for columns similar to O, and let SPARQL perform the rest.</para>
<para>To track SPARQL, use the following functions:</para>
@@ -1069,44 +1069,6 @@ Results in JSON". When a client specifies obsolete MIME type but not its standar
variant is returned for interoperability.
</para>
</sect4>
-<sect4 id="viewresultspagesparqlqex"><title>View Results Page of SPARQL Query Execution</title>
-<para>To view SPARQL Endpoint Results page of SPARQL query execution should be used the parameter
-<emphasis>query</emphasis> i.e the SPARQL Protocol URL should look like:</para>
-<programlisting><![CDATA[
-http://cname/sparql?default-graph-uri=&query=...
-]]></programlisting>
-<para><emphasis>Example</emphasis></para>
-<para>Suppose the following simple query:</para>
-<programlisting><![CDATA[
-SELECT *
-WHERE
- {
- ?s ?p ?o
- }
-LIMIT 10
-]]></programlisting>
-<para>See <ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=SELECT+*+%0D%0AWHERE+%0D%0A++{%0D%0A++++%3Fs+%3Fp+%3Fo%0D%0A++}%09%0D%0ALIMIT+10++&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">this example link</ulink> against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URL.</para>
-</sect4>
-<sect4 id="viewresultspagesparqlqed"><title>View Editor Page of SPARQL Query </title>
-<para>To view the SPARQL Endpoint editor page of SPARQL query execution should be used the parameter
-<emphasis>qtxt</emphasis> i.e the SPARQL Protocol URL should look like:</para>
-<programlisting><![CDATA[
-http://cname/sparql?default-graph-uri=&qtxt=...
-]]></programlisting>
-<para><emphasis>Example</emphasis></para>
-<para>Suppose the following simple query:</para>
-<programlisting><![CDATA[
-SELECT *
-WHERE
- {
- ?s ?p ?o
- }
-LIMIT 10
-]]></programlisting>
-<para>Suppose also <ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=SELECT+*+%0D%0AWHERE+%0D%0A++{%0D%0A++++%3Fs+%3Fp+%3Fo%0D%0A++}%09%0D%0ALIMIT+10++&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">this results page link</ulink> against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URL. </para>
-<para>Replace the parameter name <emphasis>query</emphasis> with <emphasis>qtxt</emphasis>.</para>
-<para><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=SELECT+*+%0D%0AWHERE+%0D%0A++{%0D%0A++++%3Fs+%3Fp+%3Fo%0D%0A++}%09%0D%0ALIMIT+10++&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">Access the new link</ulink>, which should present the SPARQL Endpoint Editor page with "Query Text" area filled in with the SPARQL Query from above.</para>
-</sect4>
<sect4 id="rdfsupportedmimesaddofprotocol"><title>Virtuoso/PL APIs</title>
<para>Virtuoso also provides SPARQL protocol client APIs in Virtuoso PL, so you can communicate with SPARQL
Query Services from Virtuoso stored procedures. The APIs are as follows:
@@ -1213,12 +1175,11 @@ DB.DBA.TABLE_SET_POLICY ('DB.DBA.RDF_QUAD', 'DB.DBA.RDF_POLICY', 'S');
where DB.DBA.WA_CNAME () is an ODS function returning the default host name.
</para>
<para>The effect of this policy is to restrict user 'user' to the graph http://cname/dataspace/user/private#</para>
-<sect4 id="rdfsupportedprotocolendpointurisparqlauthex"><title>SPARQL Auth Endpoint Usage Example</title>
<para>Virtuoso reserves the path '/sparql-auth/' for a SPARQL service supporting authenticated SPARUL.
This endpoint allows specific SQL accounts to perform SPARUL over the SPARQL protocol.
To be allowed to login via SQL or ODBC and update physical triples, a user must be granted "SPARQL_UPDATE" privileges. To grant this role:
</para>
-<orderedlist>
+<itemizedlist>
<listitem>Go to the Virtuoso administration UI i.e. http://host:port/conductor</listitem>
<listitem>Login as user dba</listitem>
<listitem>Go to System Admin->User Accounts->Users
@@ -1228,7 +1189,7 @@ To be allowed to login via SQL or ODBC and update physical triples, a user must
</figure>
</listitem>
<listitem>Click the link "Edit"</listitem>
- <listitem>Set "User type" to "SQL/ODBC Logins and WebDAV".</listitem>
+ <listitem>In the displayed form check the "Allow SQL/ODBC Logins" check-box.</listitem>
<listitem>Select from the list of available Account Roles "SPARQL_UPDATE" role and
click the ">>" button so to add it to the right-hand list.</listitem>
<figure id="rdf2" float="1">
@@ -1236,13 +1197,11 @@ click the ">>" button so to add it to the right-hand list.</listitem>
<graphic fileref="ui/usr2.png"/>
</figure>
<listitem>Click the "Save" button.</listitem>
-</orderedlist>
-<para>Note that if a table is used in an Linked Data View, and this table is not granted to SPARQL_SELECT permission
-(or SPARQL_UPDATE, which implicitly confers SPARQL_SELECT), then all SELECTs on a graph defined by an
-Linked Data View will return an access violation error as the user
+</itemizedlist>
+<para>Note that if a table is used in an RDF view, and this table is not granted to SPARQL_SELECT permission
+(or SPARQL_UPDATE, which implicitly confers SPARQL_SELECT), then all SELECTs on a graph defined by an RDF view will return an access violation error as the user
account has no permissions to read the table. The user must have appropriate privileges on all tables included
-in an Linked Data View in order to be able to select on <emphasis>all</emphasis> graphs.</para>
-</sect4>
+in an RDF View in order to be able to select on <emphasis>all</emphasis> graphs.</para>
<sect4 id="sparqwebservicetbl"><title>Managing a SPARQL Web Service Endpoint</title>
<para>
Virtuoso web service endpoints may provide different default configurations for different host names mentioned in an HTTP request.
@@ -1275,7 +1234,7 @@ Virtuoso 5.0.11 onwards added three new methods for securing SPARQL endpoints th
<para>
Each of these authentication methods is associated with a purpose specific default SPARQL endpoint along the following lines:
</para>
-<itemizedlist>
+<itemizedlist mark="bullet">
<listitem>http://<cname>/sparql-auth (SQL authentication)</listitem>
<listitem>http://<cname>/sparql-oauth (OAuth)</listitem>
<listitem>http://<cname>/sparql-graph-crud-auth (OAuth CRUD)</listitem>
@@ -1296,7 +1255,7 @@ yet secure authentication system that functions with existing browsers.</listite
<para>Virtuoso Authentication Server can be installed by downloading and installing the
conductor_dav.vad package.</para>
<para>The Authentication UI is accessible from the Conductor UI -> Linked Data -> Access Control -> SPARQL-SSL. Here is sample scenario:</para>
-<orderedlist>
+<itemizedlist mark="bullet">
<listitem>Download and install the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.1/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink> package.</listitem>
<listitem><ulink url="http://ods.openlinksw.com/dataspace/dav/wiki/ODS/ODSGenerateX509Certificate">Generate an X.509 Certificate hosted WebID</ulink>.</listitem>
<listitem>Go to http://<cname>:<port>/conductor, where <cname>:<port> are replaced by your
@@ -1344,7 +1303,7 @@ http://id.myopenlink.net/dataspace/person/demo#this
<graphic fileref="ui/auth6.png"/>
</figure>
</listitem>
-</orderedlist>
+</itemizedlist>
</sect4>
<sect4 id="sparqloauthendpoint"><title>SPARQL OAuth Endpoint</title>
<para>OAuth provides a secure data transmission level mechanism for your SPARQL endpoint.
@@ -1518,7 +1477,7 @@ URL http://cname:port/conductor -> Linked Data -> Access Controls -> SP
Configuring WebID Protocol ACLs is with a WebID Protocol certificate and a Web ID allows secure SPARQL queries to be performed against a Virtuoso SPARQL-SSL endpoint and viewing of the query results.
The SPARQL-SSL endpoint URL is of the form https://cname:port/sparql-ssl</para>
<para>The steps required to configure a sample WebID Protocol ACL are outlined below:</para>
-<orderedlist>
+<itemizedlist mark="bullet">
<listitem>Download and install the <ulink url="http://s3.amazonaws.com/opldownload/uda/vad-packages/6.1/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink> package.</listitem>
<listitem><ulink url="http://ods.openlinksw.com/dataspace/dav/wiki/ODS/ODSGenerateX509Certificate">Generate an X.509 Certificate hosted WebID</ulink>.</listitem>
<listitem>Go to http://<cname>:<port>/conductor, where <cname>:<port> are replaced by your
@@ -1566,7 +1525,7 @@ http://id.myopenlink.net/dataspace/person/demo#this
<graphic fileref="ui/auth6.png"/>
</figure>
</listitem>
-</orderedlist>
+</itemizedlist>
<tip><title>See Also:</title>
<para><link linkend="secureodbcx509foafsll">WebID Protocol ODBC Login</link></para>
</tip>
@@ -1798,7 +1757,7 @@ _:_ res:solution [
</sect4>
<sect4 id="sparqloauthendpointfoafsslsparqldisable"><title>Disable Default SPARQL Endpoint</title>
<sect5 id="sparqloauthendpointfoafsslsparqldisableisql"><title>Using iSQL:</title>
- <orderedlist>
+ <itemizedlist mark="bullet">
<listitem>To disable /sparql, execute:
<programlisting><![CDATA[
DB.DBA.VHOST_REMOVE (lpath=>'/sparql');
@@ -1809,10 +1768,10 @@ DB.DBA.VHOST_REMOVE (lpath=>'/sparql');
DB.DBA.VHOST_DEFINE (lpath=>'/sparql/', ppath => '/!sparql/', is_dav => 1, vsp_user => 'dba', opts => vector('noinherit', 1));
]]></programlisting>
</listitem>
- </orderedlist>
+ </itemizedlist>
</sect5>
<sect5 id="sparqloauthendpointfoafsslsparqldisablecond"><title>Using Conductor UI:</title>
- <orderedlist>
+ <itemizedlist mark="bullet">
<listitem>Go to http://cname:port/conductor .</listitem>
<listitem>Enter user dba credentials.</listitem>
<listitem>Go to "Web Application Server" -> "Virtual Domains & Directories".
@@ -1846,7 +1805,7 @@ DB.DBA.VHOST_DEFINE (lpath=>'/sparql/', ppath => '/!sparql/', is_dav => 1, vsp_u
<graphic fileref="ui/s5.png"/>
</figure>
</listitem>
- </orderedlist>
+ </itemizedlist>
</sect5>
</sect4>
</sect3>
@@ -2452,7 +2411,7 @@ w9yJ2saU1vgHuFxWcughai5cZY%3D"
SELECT * WHERE {?s ?p ?o}
</programlisting>
<para>Click the "Run Query" button.</para>
-<para>The query results, shown below, are cached locally ( network resources being fetched ). The remote RDF data is saved in the local RDF quad store as graph http://www.w3.org/2001/sw/DataAccess/proto-tests/data/construct/simple-data.rdf</para>
+<para>The query results, shown below, are cached locally (sponged). The remote RDF data is saved in the local RDF quad store as graph http://www.w3.org/2001/sw/DataAccess/proto-tests/data/construct/simple-data.rdf</para>
<programlisting>
s p o
http://www.example/jose/foaf.rdf#jose http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://xmlns.com/foaf/0.1/Person
@@ -2659,18 +2618,18 @@ initialized from the contents of a given graph.
The piggybank-generated-name is a Virtuoso DAV user ID.
</para>
</sect3>
-<sect3 id="rdfsparqlexnpointnorthwindexample"><title>Making Linked Data Views Dereferenceable - Northwind Example</title>
-<para>Consider an application that makes some relational data available for SPARQL requests, as described in the <link linkend="rdfviewnorthwindexample1">first part of the Northwind Linked Data View example</link>. This may be sufficient for some clients but the IRIs of the described subjects are not dereferenceable.
+<sect3 id="rdfsparqlexnpointnorthwindexample"><title>Making RDF Views Dereferenceable - Northwind Example</title>
+<para>Consider an application that makes some relational data available for SPARQL requests, as described in the <link linkend="rdfviewnorthwindexample1">first part of the Northwind RDF View example</link>. This may be sufficient for some clients but the IRIs of the described subjects are not dereferenceable.
This means that external SPARQL processors cannot retrieve that data using the Virtuoso Sponger or the like. It also means that if some external resources refer to the IRI of
some Northwind subject and a user browses that resource then he cannot look at the application's data by clicking on the subject link.</para>
<para>To make RDF access complete, applications can do the following:</para>
-<orderedlist>
+<itemizedlist mark="bullet" spacing="compact">
<listitem>Create a virtual directory</listitem>
<listitem>Instruct the server how to prepare RDF resources on demand</listitem>
<listitem>Configure rendering of RDF resources for non-RDF clients (including Web search engines)</listitem>
<listitem>Make the used ontology available</listitem>
<listitem>Provide an index or sitemap page to help users who try to browse published data but do not know the proper URLs</listitem>
-</orderedlist>
+</itemizedlist>
<para>The following sequence of operations demonstrates how to implement the listed features without writing any special web pages.
All requests (except the application-specific index/sitemap) will be handled by existing web service endpoints.</para>
<para>As a precaution, we erase any URL rewriting rule lists created by this example that may be in the database following a previous run of the script.</para>
@@ -2754,7 +2713,7 @@ SQL>DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
null
);
]]></programlisting>
-<para>To configure the server to furnish the ontology underpinning the example Northwind Linked Data View, the procedure LOAD_NW_ONTOLOGY_FROM_DAV, listed
+<para>To configure the server to furnish the ontology underpinning the example Northwind RDF view, the procedure LOAD_NW_ONTOLOGY_FROM_DAV, listed
below, takes the ontology described in file /DAV/VAD/demo/sql/nw.owl and loads it into graph http://demo.openlinksw.com/schemas/NorthwindOntology/1.0/
in the local quad store. A rewrite rule is then created to query this graph when the input path identifies entities from this ontology.
</para>
@@ -2844,7 +2803,7 @@ you must grant the SPARQL_UPDATE role to user SPARQL and grant execute permissio
<para>
To enable SPARQL_UPDATE using the Conductor UI:
</para>
-<orderedlist>
+<itemizedlist>
<listitem>Go to the Virtuoso Administration Conductor i.e. http://host:port/conductor</listitem>
<listitem>Login as dba user</listitem>
<listitem>Go to System Admin->User Accounts->Roles</listitem>
@@ -2859,7 +2818,7 @@ To enable SPARQL_UPDATE using the Conductor UI:
<graphic fileref="ui/cn2.png"/>
</figure>
<listitem>Click the button "Update".</listitem>
-</orderedlist>
+</itemizedlist>
<para>
To grant execute permission on RDF_SPONGE_UP:
</para>
@@ -2994,11 +2953,10 @@ aml.org/services/owl-s/1.1/Service.owl#ServiceProfile" }} ] } })
especially if data comes from many quad map patterns. A moderately sized
application with 50 tables and 10 columns per table may create
thousands of quad map patterns for subjects spanning hundreds of different
-types. An attempt to "select everything" from Linked Data View of
+types. An attempt to "select everything" from RDF view of
that complexity may easily create 5000 lines of SQL code. Thus it is
to be expected that some queries will be rejected even if the same
-queries would work fine if the RDF data were held as physical quads in default storage, rather than
-synthesized through an Linked Data View.
+queries would work fine if the RDF data were held as physical quads in default storage, rather than synthesized through an RDF view.
</para>
<para>In addition, the SQL compiler catches typos efficiently, signalling an error if a table or column
@@ -3031,7 +2989,7 @@ recognition and plain old code inspection. "Automatic" means
"cheap" so the very first step of debugging is to ensure
that every triple pattern of the query may in principle return
something. This helps in finding typos when the query gets data from
-Linked Data Views. It also helps when a query tries to join two disjoint
+RDF views. It also helps when a query tries to join two disjoint
sorts of subjects. If the <emphasis>define sql:signal-void-variables
1</emphasis> directive is placed in the preamble of the SPARQL query,
the compiler will signal an error if it finds any triple pattern that cannot
@@ -3055,7 +3013,7 @@ QUAD MAP quad-map-name { group-pattern }
MAP</emphasis> to improve the performance of a query that tries to
access redundant Linked Data Views, it is much better to achieve the same
effect by providing a more restrictive query or by changing/extending
-the Linked Data View. If an application relies on this trick then interoperable third-party SPARQL
+the RDF View. If an application relies on this trick then interoperable third-party SPARQL
clients may experience problems because they cannot use Virtuoso-specific
extensions.</para></note>
@@ -4117,7 +4075,7 @@ ns1:me foaf:knows ns9:me .
<para>In each pair, both procedures have the same semantics but the second one is used if and
only if the SPARQL compiler can prove that all subjects to process are
from physical storage <emphasis>(DB.DBA.RDF_QUAD)</emphasis>. Thus the second procedure
-will not search for subjects in Linked Data Views.
+will not search for subjects in RDF Views.
</para>
<para>Each procedure should return a dictionary with triples as keys and
integer 1 as values. So the dictionary is filled by calls like:
@@ -4211,23 +4169,21 @@ _______________________________________________________________________________
<para>The SPARQL syntax is slightly different from the SQL, although the option names
and meanings are the same.</para>
<para>In SPARQL, the transitive options occur after a subquery enclosed in braces:</para>
- <para>The below produces all the IRI's that are the same as <http://dbpedia.org/resource/New_York>.</para>
+ <para>The below produces all the IRI's that are the same as <alice>.</para>
<programlisting><![CDATA[
SPARQL
SELECT ?syn
-WHERE
+where
{
{
SELECT ?x ?syn
- WHERE
+ where
{
- { ?x owl:sameAs ?syn }
- UNION
- { ?syn owl:sameAs ?x }
+ { ?x owl:sameAs ?syn } union { ?syn owl:sameAs ?x }
}
}
- OPTION ( TRANSITIVE, t_in (?x), t_out (?syn), t_distinct, t_min (0) )
- FILTER (?x = <http://dbpedia.org/resource/New_York>) .
+ option ( transitive, t_in (?x), t_out (?syn), t_distinct, t_min (0) )
+ filter (?x = <Alice>) .
}
]]></programlisting>
<para>In this case, we provide a binding for ?x in the filter outside of the
@@ -4244,11 +4200,7 @@ WHERE
{
{ SELECT ?x ?syn
WHERE
- {
- { ?x owl:sameAs ?syn }
- UNION
- { ?syn owl:sameAs ?x}
- }
+ {{ ?x owl:sameAs ?syn } UNION { ?syn owl:sameAs ?x}}
} OPTION (TRANSITIVE, t_in (?x), t_out (?syn), t_distinct, t_min (0) )
}
} .
@@ -4293,23 +4245,13 @@ WHERE
<programlisting><![CDATA[
SELECT ?g ?x count (*) as ?count
WHERE {
- {
- SELECT ?x ?alias ?g
+ {SELECT ?x ?alias ?g
WHERE {
- {
- GRAPH ?g {?x owl:sameAs ?alias }
+ { GRAPH ?g {?x owl:sameAs ?alias }
}
UNION
- {
- GRAPH ?g {?alias owl:sameAs ?x}
- }
- }
- }
- OPTION ( TRANSITIVE,
- t_in (?x),
- t_out (?alias),
- t_distinct,
- t_min (1)) .
+ {GRAPH ?g {?alias owl:sameAs ?x}}}}
+ OPTION (TRANSITIVE, t_in (?x), t_out (?alias), t_distinct, t_min (1)) .
FILTER (?x = <http://dbpedia.org/resource/New_York> ) .
}
]]></programlisting>
@@ -4338,42 +4280,7 @@ WHERE
{
?s foaf:knows ?o
}
- } OPTION ( TRANSITIVE,
- t_distinct,
- t_in(?s),
- t_out(?o),
- t_min (1),
- t_max (4),
- t_step ('step_no') as ?dist ) .
- FILTER (?s= <http://www.w3.org/People/Berners-Lee/card#i>)
- }
- ORDER BY ?dist DESC 3
- LIMIT 50
- ]]></programlisting>
-</sect4>
-<sect4 id="rdfsparqlimplementatiotransexamples3"><title>Example for query that takes all the people known by Tim Berners-Lee, to a depth between 2 and 4 applications of the subquery</title>
- <para>This query takes all the people known by kidehen, to a depth between 2
- and 4 applications of the subquery. It then sorts them by the
- distance and the descending count of connections of each found connection. This is
- equivalent to the default connections list shown by LinkedIn.</para>
- <programlisting><![CDATA[
- SPARQL
- SELECT ?o ?dist ((SELECT COUNT (*) WHERE {?o foaf:knows ?xx}))
- WHERE
- {
- {
- SELECT ?s ?o
- WHERE
- {
- ?s foaf:knows ?o
- }
- } OPTION ( TRANSITIVE,
- t_distinct,
- t_in(?s),
- t_out(?o),
- t_min (2),
- t_max (4),
- t_step ('step_no') as ?dist) .
+ } OPTION (TRANSITIVE, t_distinct, t_in(?s), t_out(?o), t_min (1), t_max (4), t_step ('step_no') as ?dist) .
FILTER (?s= <http://www.w3.org/People/Berners-Lee/card#i>)
}
ORDER BY ?dist DESC 3
@@ -4393,16 +4300,8 @@ WHERE
{
graph ?g {?s foaf:knows ?o }
}
- } OPTION ( TRANSITIVE,
- t_distinct,
- t_in(?s),
- t_out(?o),
- t_no_cycles,
- T_shortest_only,
- t_step (?s) as ?link,
- t_step ('path_id') as ?path,
- t_step ('step_no') as ?step,
- t_direction 3) .
+ } OPTION (TRANSITIVE, t_distinct, t_in(?s), t_out(?o), t_no_cycles, T_shortest_only,
+ t_step (?s) as ?link, t_step ('path_id') as ?path, t_step ('step_no') as ?step, t_direction 3) .
FILTER (?s= <http://www.w3.org/People/Berners-Lee/card#i>
&& ?o = <http://www.advogato.org/person/mparaz/foaf.rdf#me>)
}
@@ -4422,9 +4321,6 @@ LIMIT 20
<para>Yago Class Hierarchy (TBox) Subsumption</para>
<para>AlphaReceptors</para>
<programlisting><![CDATA[
-# all subjects with IRI: <http://dbpedia.org/class/yago/AlphaReceptor105609111>,
-# that are sub-classes of anything (hence ?y)
-# without restrictions on tree levels
SELECT ?y
FROM <http://dbpedia.org/resource/classes/yago#>
WHERE
@@ -4553,12 +4449,8 @@ WHERE
?m skos:subject ?c.
?c skos:broaderTransitive category:Protestant_churches .
?c skos:broaderTransitive ?trans
- OPTION ( TRANSITIVE,
- t_distinct,
- t_in (?c),
- t_out (?trans),
- t_max (3),
- t_step ( 'step_no' ) as ?dist ) .
+ OPTION ( TRANSITIVE, t_distinct, t_in (?c), t_out (?trans),
+ t_max (3), t_step ( 'step_no' ) as ?dist ) .
?m p:abstract ?d.
?m geo:point ?p
FILTER ( lang(?n) = "en" )
@@ -4622,19 +4514,19 @@ input:named-graph-exclude works like "NOT FROM NAMED" clause.
does not understand SPARQL-BI extensions then the text may contain variable ?X and define
input:param "X" . This does not work for positional parameters, one can not replace a reference
to ?::3 with ?3 and define input:param "3".</listitem>
- <listitem><code>input:grab-var</code>: Network Resource Fetch values of variable;</listitem>
- <listitem><code>input:grab-iri</code>: Network Resource Fetch the constant IRI;</listitem>
- <listitem><code>input:grab-all</code>: Network Resource Fetch all constants and variables of the query;</listitem>
+ <listitem><code>input:grab-var</code>: sponge values of variable;</listitem>
+ <listitem><code>input:grab-iri</code>: sponge the constant IRI;</listitem>
+ <listitem><code>input:grab-all</code>: sponge all constants and variables of the query;</listitem>
<listitem><code>input:grab-seealso (and synonym input:grab-follow-predicate)</code>: sets predicate
- that tells where to Fetch more Network Resource data about a subject;</listitem>
- <listitem><code>input:grab-limit</code>: how many resources can be fetched;</listitem>
+ that tells where to sponge more data about a subject;</listitem>
+ <listitem><code>input:grab-limit</code>: how many resources can be sponged;</listitem>
<listitem><code>input:grab-depth</code>: how many iterations can be done, sponging additional data
on each iteration;</listitem>
- <listitem><code>input:grab-base</code>: base to resolve relative IRIs before passing to Sponger;</listitem>
+ <listitem><code>input:grab-base</code>: base to resolve relative IRIs before passing to sponge;</listitem>
<listitem><code>input:grab-resolver</code>: IRI resolving procedure (i.e., one that turns base and
relative IRI to an absolute IRI);</listitem>
<listitem><code>input:grab-destination</code>: single resource that should be filled in with results
- of all fetchings;</listitem>
+ of all sponges;</listitem>
<listitem><code>input:grab-loader</code>: a name of procedure that retrieve the resource via HTTP,
parse it and store it.</listitem>
</itemizedlist>
@@ -4644,12 +4536,12 @@ input:named-graph-exclude works like "NOT FROM NAMED" clause.
</para>
<itemizedlist mark="bullet">
<listitem><code>input:grab-intermediate</code>: extends the set of IRIs to sponge, useful in
- combination with input:grab-seealso. If present then for a given subject, Network Resource Fetch will retrieve
+ combination with input:grab-seealso. If present then for a given subject, sponge will retrieve
not only values of see-also predicates for that subject but the subject itself. The define value
is not used in current implementation.</listitem>
<listitem><code>input:grab-group-destination</code>: resembles input:grab-destination but sponges will
- create individual graphs for Network Resource Fetch results, and in additional to this common routine, a copy of each
- Network Resource Fetch result is added to the resource specified by the value of input:grab-group-destination.
+ create individual graphs for sponge results, and in additional to this common routine, a copy of each
+ sponge result is added to the resource specified by the value of input:grab-group-destination.
input:grab-destination redirects loadings, input:grab-group-destination duplicates them.</listitem>
<listitem><code>get:soft</code>: "soft" or "replacing", depending on mode of loading source graph;
</listitem>
@@ -4826,93 +4718,6 @@ WHERE
</listitem>
</itemizedlist>
</sect2>
-<sect2 id="rdfsparqlsoap"><title>Sending SOAP Requests to Virtuoso SPARQL Endpoint</title>
- <para>This section presents a sample scenario on how to execute a SPARQL query as a SOAP
- request to the Virtuoso SPARQL Endpoint.
- </para>
- <orderedlist>
- <listitem>Assume the following sample SOAP request containing simple SPARQL query:
-<programlisting><![CDATA[
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <soapenv:Body>
- <query-request xmlns="http://www.w3.org/2005/09/sparql-protocol-types/#">
- <query xmlns="">SELECT DISTINCT ?z FROM virtrdf: {?x ?y ?z .} LIMIT 10</query>
- </query-request>
- </soapenv:Body>
-</soapenv:Envelope>
-]]></programlisting>
- </listitem>
- <listitem>Save locally the content from above for ex. to file with the name "soap.xml".</listitem>
- <listitem>To pass the SOAP request to a Virtuoso SPARQL Endpoint, execute the following curl command:
-<programlisting><![CDATA[
-$ curl -d at soap.xml -H "Content-Type:text/xml" -H "SOAPAction: ''" http://localhost:8890/sparql
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
- <soapenv:Body>
- <query-result xmlns="http://www.w3.org/2005/09/sparql-protocol-types/#">
- <sparql xmlns="http://www.w3.org/2005/sparql-results#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/2001/sw/DataAccess/rf1/result2.xsd">
- <head>
- <variable name="z"/>
- </head>
- <results distinct="false" ordered="true">
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#QuadMapFormat</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#QuadStorage</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#array-of-QuadMapFormat</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#QuadMap</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#QuadMapValue</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#array-of-QuadMapColumn</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#QuadMapColumn</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#array-of-QuadMapATable</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#QuadMapATable</uri>
- </binding>
- </result>
- <result>
- <binding name="z">
- <uri>http://www.openlinksw.com/schemas/virtrdf#QuadMapFText</uri>
- </binding>
- </result>
- </results>
- </sparql>
- </query-result>
- </soapenv:Body>
-</soapenv:Envelope>
-]]></programlisting>
- </listitem>
- </orderedlist>
-</sect2>
</sect1>
@@ -5337,8 +5142,8 @@ Insert into <http://mygraph.com>, 1 triples -- done
</sect4>
<sect4 id="rdfsparulexamples2"><title>Example for delete graph equivalence</title>
<para>The following two statements are equivalent but the latter may work faster, especially
-if there are many Linked Data Views in the system or if the graph in question contains triples from Linked Data Views.
-Note that neither of these two statements affects data coming from Linked Data Views.
+if there are many RDF views in the system or if the graph in question contains triples from RDF views.
+Note that neither of these two statements affects data coming from RDF views.
</para>
<programlisting><![CDATA[
SQL> SPARQL DELETE FROM GRAPH <http://mygraph.com> { ?s ?p ?o } FROM <http://mygraph> WHERE { ?s ?p ?o };
@@ -5585,7 +5390,7 @@ DELETE FROM GRAPH <http://mygraph.com> { <http://myopenlink.net/dataspace/Caroli
</sect4>
<sect4 id="rdfsparulexamples8"><title>Example for generating RDF information resource URI</title>
<para>The RDF information resource URI can be generated via a string expression.</para>
-<orderedlist>
+<itemizedlist mark="bullet">
<listitem>Suppose there is a sample file kidehen.n3:
<programlisting><![CDATA[
<http://www.openlinksw.com/dataspace/kidehen@openlinksw.com#this> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://rdfs.org/sioc/ns#User> .
@@ -5648,7 +5453,7 @@ http://www.openlinksw.com/dataspace/kidehen@openlinksw.com#this http://www.w3
3 Rows. -- 10 msec.
]]></programlisting>
</listitem>
-</orderedlist>
+</itemizedlist>
</sect4>
<sect4 id="rdfsparulexamples9"><title>Example for operations over a web service endpoint</title>
<para>Several operations can be sent to a web service endpoint as a single statement and
@@ -6646,108 +6451,6 @@ __________________________________________________
SQL>
]]></programlisting>
</sect4>
- <sect4 id="rdfsparulexamples22"><title>Example for executing INSERT/DELETE (SPARUL) statements
- against a WebID protected SPARQL endpoint</title>
- <para>The following sample scenario demonstrates how to perform INSERT/DELETE (SPARUL) statements
- against a protected SPARQL Endpoint by setting WebID Protocol ACLs using the Virtuoso
- Authentication Server UI:</para>
- <orderedlist>
- <listitem>Obtain a WebID:
- <orderedlist>
- <listitem>Download and install the <ulink url="http://opldownload.s3.amazonaws.com/uda/vad-packages/6.3/virtuoso/ods_framework_dav.vad">ods_framework_dav.vad</ulink>.
- <itemizedlist mark="bullet">
- <listitem>Note: an existing ODS DataSpace user instance can also be used, for example at
- <ulink url="http://id.myopenlink.net/ods/">http://id.myopenlink.net/ods/</ulink>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>Register an ODS Data Space user, for example with name "demo".</listitem>
- <listitem>The generated WebID will be for example:
-<programlisting><![CDATA[
-http://id.myopenlink.net/dataspace/person/demo#this
-]]></programlisting>
- </listitem>
- <listitem><ulink url="http://ods.openlinksw.com/wiki/ODS/ODSGenerateX509Certificate">Generate a Personal HTTP based Identifier</ulink>
- for the "demo" user and then bind the personal Identifier to an X.509 Certificate, thereby
- giving assigning the user a WebID.
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>Download and install the
- <ulink url="http://opldownload.s3.amazonaws.com/uda/vad-packages/6.3/virtuoso/conductor_dav.vad">conductor_dav.vad</ulink>
- package, if not already installed.
- </listitem>
- <listitem>Go to http://<cname>:<port>/conductor, where <cname>:<port>
- are replaced by your local server values.</listitem>
- <listitem>Go to System Admin -> Linked Data -> Access Control -> SPARQL-SSL
- <figure id="si1" float="1">
- <title>Conductor SPARQL-SSL</title>
- <graphic fileref="ui/si1.png"/>
- </figure>
- </listitem>
- <listitem>In the displayed form:
- <orderedlist>
- <listitem>Enter the Web ID for the user registered above, for example:
-<programlisting><![CDATA[
-http://id.myopenlink.net/dataspace/person/demo#this
-]]></programlisting>
- </listitem>
- <listitem>Select "SPARQL Role": "<emphasis>UPDATE</emphasis>".
- <figure id="si2" float="1">
- <title>Conductor SPARQL-SSL</title>
- <graphic fileref="ui/si2.png"/>
- </figure>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>Click the "Register" button.</listitem>
- <listitem>The WebID Protocol ACL will be created:
- <figure id="si3" float="1">
- <title>Conductor SPARQL-SSL</title>
- <graphic fileref="ui/si3.png"/>
- </figure>
- </listitem>
- <listitem>Go to the SPARQL+SSL endpoint, https://<cname>:<port>/sparql-ssl,
- where <cname>:<port> are replaced by your local server values.
- </listitem>
- <listitem>Select the user's certificate:
- <figure id="si4" float="1">
- <title>Conductor SPARQL-SSL</title>
- <graphic fileref="ui/si4.png"/>
- </figure>
- </listitem>
- <listitem>The SPARQL Query UI will be displayed:
- <figure id="si5" float="1">
- <title>Conductor SPARQL-SSL</title>
- <graphic fileref="ui/si5.png"/>
- </figure>
- </listitem>
- <listitem>Execute the query:
-<programlisting><![CDATA[
-INSERT INTO GRAPH <http://mytest.com> {
- <s1> <p1> <o1> .
- <s2> <p2> <o2> .
- <s3> <p3> <o3>
-}
-]]></programlisting>
- <figure id="si6" float="1">
- <title>Conductor SPARQL-SSL</title>
- <graphic fileref="ui/si6.png"/>
- </figure>
- <figure id="si7" float="1">
- <title>Conductor SPARQL-SSL</title>
- <graphic fileref="ui/si7.png"/>
- </figure>
- </listitem>
- </orderedlist>
- <para>Note: If the SPARQL Role "Sponge" is set instead, in order to be able to execute
- DELETE/INSERT statements over the protected SPARQL Endpoint, the following grants need to be
- performed for the user, associated with the WebID ACL Role:</para>
-<programlisting><![CDATA[
-grant execute on DB.DBA.SPARQL_INSERT_DICT_CONTENT to "demo";
-grant execute on DB.DBA.SPARQL_DELETE_DICT_CONTENT to "demo";
-]]></programlisting>
- </sect4>
</sect3>
</sect2>
<sect2 id="sparqlbi"><title>Business Intelligence Extensions for SPARQL</title>
@@ -6755,7 +6458,7 @@ grant execute on DB.DBA.SPARQL_DELETE_DICT_CONTENT to "demo";
Virtuoso extends SPARQL with expressions in results, subqueries, aggregates and grouping.
These extensions allow a straightforward translation of arbitrary SQL queries to SPARQL.
This extension is called "SPARQL BI", because the primary objective is to match needs of Business Intelligence.
-The extended features apply equally to querying physical quads or relational tables mapped through Linked Data Views.
+The extended features apply equally to querying physical quads or relational tables mapped through RDF views.
</para>
<note><para>In this section, many examples use the TPC-H namespace. You may test them on your local demo database.
They use data from the TPC-H dataset that is mapped into a graph with an IRI of the form
@@ -6805,7 +6508,7 @@ simple paths in expressions and has a separate feature for transitivity:</para>
<listitem>S*>P: for "zero or many values of P of S", so *> may form a LEFT OUTER JOIN whereas +> forms an INNER JOIN.</listitem>
<listitem>S|>P: is reserved for potential "single value of P of S or an error if there are many values"</listitem>
</itemizedlist>
-<para>If this property is set (for example by an Linked Data View) then +> should be used.</para>
+<para>If this property is set (for example by an RDF View) then +> should be used.</para>
<para><emphasis>Simple Example</emphasis></para>
<programlisting><![CDATA[
@@ -7497,7 +7200,7 @@ the order of checks is as follows:</para>
<para>It is convenient to configure the RDF storage security by adding restrictions in the order inverse
to the order of checks:</para>
-<orderedlist>
+<itemizedlist mark="bullet">
<listitem>Step 1: Set public permissions on all graphs to the most restricted level of any application
that will be installed. So if any single graph will be unreadable for public, then public permissions on
all graphs should be set to 0 or 8.</listitem>
@@ -7507,16 +7210,16 @@ may be set to 1.</listitem>
<listitem>Step3: Configure trusted users, such as administrative DBA-like accounts, and to specify their
permissions on all graphs.</listitem>
<listitem>Step 4: Some additional right can be granted to some specific users on some specific graphs.</listitem>
-</orderedlist>
+</itemizedlist>
<para>Note that there's no need to permit something to DBA itself, because DBA's default permissions are
set automatically.</para>
<sect3 id="rdfgraphsecurityintconfsecuser"><title>Configuring New User</title>
-<orderedlist>
+<itemizedlist mark="bullet">
<listitem>Step 1: Grant SPARQL_SELECT, SPARQL_SPONGE or SPARQL_UPDATE to the user.</listitem>
<listitem>Step 2: Set user's permissions on all graphs.</listitem>
<listitem>Step 3: Grant rights on some specific graphs.</listitem>
-</orderedlist>
+</itemizedlist>
</sect3>
<sect3 id="rdfgraphsecurityintex"><title>Example: Blogs and Resource Sharing</title>
<para>Consider a "groupware" application that let users create personal resources with access policies.</para>
@@ -7634,15 +7337,15 @@ SELECT ?g ?s WHERE { ?s <p> ?o }
<sect1 id="rdfviews"><title>Linked Data Views over RDBMS Data Source</title>
<para>
-Linked Data Views map relational data into RDF and allow customizing RDF representation of locally stored RDF data.
+RDF Views map relational data into RDF and allow customizing RDF representation of locally stored RDF data.
To let SPARQL clients access relational data as well as physical RDF graphs in a single query, we introduce a declarative Meta Schema Language for mapping SQL Data to RDF Ontologies.
As a result, all types of clients can efficiently access all data stored on the server.
The mapping functionality dynamically generates RDF Data Sets for popular ontologies such as SIOC, SKOS, FOAF, and ATOM/OWL without disruption to the existing database infrastructure of Web 1.0 or Web 2.0 solutions.
-Linked Data Views are also suitable for declaring custom representation for RDF triples, e.g. property tables, where one row holds many single-valued properties.
+RDF views are also suitable for declaring custom representation for RDF triples, e.g. property tables, where one row holds many single-valued properties.
</para>
<sect2 id="rdfviewsintro"><title>Introduction</title>
<para>
-The Virtuoso Linked Data Views meta schema is a built-in feature of Virtuoso's SPARQL to SQL translator.
+The Virtuoso RDF Views meta schema is a built-in feature of Virtuoso's SPARQL to SQL translator.
It recognizes triple patterns that refer to graphs for which an alternate representation is declared and translates these into SQL accordingly.
The main purpose of this is evaluating SPARQL queries against existing relational databases.
There exists previous work from many parties for rendering relational data as RDF and opening it to SPARQL access.
@@ -7707,7 +7410,7 @@ E.g., variable <emphasis>?g</emphasis> in expression <emphasis>GRAPH ?g {...}</e
SPARQL has special syntax for "graph group patterns" that is convenient for sets of triple patterns with a common graph, but it also has shorthands for common subject and predicate, so the difference is no more than in syntax.
There is only one feature that is specific for graphs but not for other fields: the SPARQL compiler can create restrictions on graphs according to <emphasis>FROM</emphasis> and <emphasis>FROM NAMED</emphasis> clauses.
</para><para>
-Virtuoso Linked Data Views should offer the same flexibility with the graphs as SPARQL addressing physical triples.
+Virtuoso RDF Views should offer the same flexibility with the graphs as SPARQL addressing physical triples.
A transformation cannot always be identified by the graph used for ranges because graph may be composed from SQL data. The key element of the meta schema is a "<emphasis>quad map pattern</emphasis>".
A simple quad map pattern fully defines one particular transformation from one set of relational columns into triples that match one SPARQL graph pattern.
The main part of quad map pattern is four declarations of "<emphasis>quad map values</emphasis>", each declaration specifies how to calculate the value of the corresponding triple field from the SQL data.
@@ -8290,25 +7993,25 @@ Subclasses can be declared for literal classes as well as for IRI classes, but t
</sect2>
<sect2 id="rdfmetadatarecovery"><title>RDF Metadata Maintenance and Recovery</title>
<para>
-This section refers to checking and backing up Linked Data View and storage declarations only. The checks and backup/restore do not affect physical quads, relational schema or tables or data therein. For general backup and restore, see server administration.
+This section refers to checking and backing up RDF view and storage declarations only. The checks and backup/restore do not affect physical quads, relational schema or tables or data therein. For general backup and restore, see server administration.
To detect and fix automatically most popular sorts of RDF metadata corruption use <link linkend="fn_rdf_audit_metadata"><function>DB.DBA.RDF_AUDIT_METADATA</function></link>.
It is also possible to backup RDF data by
<link linkend="fn_rdf_backup_metadata"><function>DB.DBA.RDF_BACKUP_METADATA</function></link>
and restore the saved state later by using
<link linkend="fn_rdf_restore_metadata"><function>DB.DBA.RDF_RESTORE_METADATA</function></link>.
-It is convenient to make a backup before any modification of quad storages, quad map patterns or IRI classes, especially during debugging new Linked Data Views.
+It is convenient to make a backup before any modification of quad storages, quad map patterns or IRI classes, especially during debugging new RDF Views.
</para>
<note><para>In SQL, adding a new view can not break anything. This is because SQL lacks the ability of querying "everything" so data sources are always specified. This is not true for SPARQL, so please treat <emphasis>any</emphasis> metadata manipulation as potentially destructive operation. If an RDF storage is supposed to be used by more than one application then these applications should be tested together, not one after other, and they should be installed/upgraded on live database in the very same order as they were installed/upgraded on instrumental machine during testing. Always remember that these applications share RDF tables so they may interfere.</para></note>
</sect2>
-<sect2 id="splitrdfview"><title>Split Linked Data View</title>
-<para>Linked Data View can be created by two or more "sparql alter storage" statements. In each statement
+<sect2 id="splitrdfview"><title>Split RDF View</title>
+<para>RDF View can be created by two or more "sparql alter storage" statements. In each statement
can be created one quad map that contains mappings for half or a third of all tables. Quad maps
created should have distinct names but may mention same graph. The important fact is that if the
-Linked Data View in question is exclusive for a graph then only the last quad map should be exclusive but
+RDF View in question is exclusive for a graph then only the last quad map should be exclusive but
all previous should not have this option. This is because if a map is exclusive on a graph the rest
of maps on that graph will be silently ignored.</para>
<para>The example below shows a sample part of the Virtuoso eCRM Views code,
-where the Linked Data View is split in two parts: with quad map virtrdf:ecrmDemo1 and with
+where the RDF view is split in two parts: with quad map virtrdf:ecrmDemo1 and with
quad map virtrdf:ecrmDemo2:</para>
<programlisting><![CDATA[
SPARQL
@@ -8614,7 +8317,7 @@ WHERE (^{products_table.}^.FREETEXT_ID = ^{products.}^.FREETEXT_ID)
]]></programlisting>
</sect2>
-<sect2 id="rdfviewsrcur"><title>Linked Data Views and recursive FK relationships</title>
+<sect2 id="rdfviewsrcur"><title>RDF views and recursive FK relationships</title>
<para>Here is sample example of a script to include an additional table alias for a table:</para>
<programlisting><![CDATA[
alter quad storage virtrdf:DefaultQuadStorage
@@ -8636,7 +8339,7 @@ are needed two different aliases for one table if you want to join it with itsel
</para>
</sect2>
</sect1>
-<sect1 id="rdfrdfviewgnr"><title>Automated Generation of Linked Data Views over Relational Data Sources</title>
+<sect1 id="rdfrdfviewgnr"><title>Automated Generation of RDF Views over Relational Data Sources</title>
<sect2 id="rdfrdfviewgnrintro"><title>Introduction</title>
<para>Virtuoso offers from Conductor UI an HTML based Wizard interface for dynamically generating &
publishing RDF based Linked Data from ODBC or JDBC accessible relational data sources. Basically,
@@ -8749,11 +8452,11 @@ exercise</listitem>
<listitem>For images or other binary data in MIME formats to be revealed as anything other than generic "binary objects", you must map large
varbinary types to the appropriate MIME types like image/gif. To do so, select the Edit link for Binding/MIME Type of the relevant table columns.
You can:
- <orderedlist>
+ <itemizedlist mark="bullet">
<listitem>Leave the Binding/MIME Type literal; or</listitem>
<listitem>Set to skip, such that the column will not be used in RDF generation; or </listitem>
<listitem>Select the binary object value in order for the column to be referenced as binary.</listitem>
- </orderedlist>
+ </itemizedlist>
<figure id="rd14" float="1">
<title>Binding/MIME Types</title>
<graphic fileref="ui/rd14.png"/>
@@ -8810,10 +8513,10 @@ system</listitem>
<listitem>Save Ontology Mappings: when clicked, offers to save the generated Ontology to local file
system</listitem>
<listitem>Export as WebDAV resource: exports the selected objects/items as a WebDAV resource:
- <orderedlist>
+ <itemizedlist mark="bullet">
<listitem>Click "Browse"</listitem>
<listitem>Enter a WebDAV resource and click the "Select" button.</listitem>
- </orderedlist>
+</itemizedlist>
<figure id="rd7" float="1">
<title>WebDAV resource</title>
<graphic fileref="ui/rd7.png"/>
@@ -8828,10 +8531,9 @@ system</listitem>
<graphic fileref="ui/rd8.png"/>
</figure>
</listitem>
- <listitem>Error messages will be presented if the Wizard encounters problems. If there are no error
- messages, your Linked Data View declarations and Linked Data publishing activities will have completed successfully.
+ <listitem>Error messages will be presented if the Wizard encounters problems. If there are no error messages, your RDF view declarations and Linked Data publishing activities will have completed successfully.
<figure id="rd9" float="1">
- <title>Linked Data View declarations and Linked Data publishing activities Finish</title>
+ <title>RDF view declarations and Linked Data publishing activities Finish</title>
<graphic fileref="ui/rd9.png"/>
</figure>
</listitem>
@@ -8939,7 +8641,7 @@ MS-Author-Via: SPARQL
Content-Length: 0
]]></programlisting>
<para>Now let's check the inserted triples. Go to the sparql endpoint, i.e. http://localhost:8890/sparql and:</para>
-<orderedlist>
+<itemizedlist>
<listitem>Enter for Default Graph URI:
<programlisting><![CDATA[
http://mygraph.com
@@ -8959,7 +8661,7 @@ http://www.openlinksw.com/dataspace/kidehen@openlinksw.com#this http://www.w3.
http://www.openlinksw.com/dataspace/kidehen@openlinksw.com#this http://rdfs.org/sioc/ns#creator_of http://www.openlinksw.com/dataspace/kidehen@openlinksw.com/weblog/kidehen@openlinksw.com%27s%20BLOG%20%5B127%5D/1300
]]></programlisting>
</listitem>
-</orderedlist>
+</itemizedlist>
</sect2>
<sect2 id="rdfinsertmethodshttpput"><title>HTTP PUT using Content-Type: application/rdf+xml</title>
<para>The URI in a PUT request identifies the entity enclosed with the request. Therefore using HTTP PUT is a more useful and meaningful command than using POST (which is more about submitting data to a script).</para>
@@ -9112,7 +8814,7 @@ SPARQL insert in graph <http://mygraph.com>
]]></programlisting>
</listitem>
<listitem>Load from .rq file:
- <orderedlist>
+ <itemizedlist mark="bullet">
<listitem>Create DAV collection which is visible to public, for ex: http://localhost:8890/DAV/tmp</listitem>
<listitem>Upload to the DAV collection the following file for ex. with name listall.rq and with the following content:
<programlisting><![CDATA[
@@ -9148,7 +8850,7 @@ Load <http://localhost:8890/DAV/tmp/listall.rq> into graph <http://myNewGraph.co
1 Rows. -- 321 msec.
]]></programlisting>
</listitem>
- </orderedlist>
+ </itemizedlist>
</listitem>
<listitem>Load from Resource URL:
<programlisting><![CDATA[
@@ -9170,7 +8872,7 @@ SQL>
<para>SPARQL INSERT operation can be sent to a web service endpoint as a single statement and executed in sequence.</para>
<para><emphasis>Example:</emphasis></para>
<para>Using the Virtuoso ISQL tool or using the /sparql UI at http://host:port/sparql, execute the following:</para>
-<orderedlist>
+<itemizedlist>
<listitem>Insert into graph http://BookStore.com 3 triples:
<programlisting><![CDATA[
SQL>SPARQL insert in graph <http://BookStore.com>
@@ -9248,7 +8950,7 @@ http://www.dajobe.org/foaf.rdf#i http://purl.org/dc/elements/1.1/da
2 Rows. -- 10 msec.
]]></programlisting>
</listitem>
-</orderedlist>
+</itemizedlist>
</sect2>
<sect2 id="rdfinsertmethodsparqlqueryandodswiki"><title>SPARQL Insert via SPARQL endpoint REST API and ODS wiki</title>
<para>With HTTP Post and ODS wiki can be written an rdf document and respectively to be performed over it INSERT/UPDATE action.</para>
@@ -9288,7 +8990,7 @@ i.e. the content will be "test".
</listitem>
</itemizedlist>
<para>Now let's check what data was inserted in the Quad Store:</para>
-<orderedlist>
+<itemizedlist>
<listitem>Go to the sparql endpoint, i.e. for ex. to http://localhost:8890/sparql</listitem>
<listitem>Enter for Default Graph URI:
<programlisting><![CDATA[
@@ -9317,7 +9019,7 @@ http://localhost:8890/dataspace/test3/wiki/testWiki/MyTest http://rdfs.org/sioc
http://localhost:8890/dataspace/test3/wiki/testWiki/MyTest http://atomowl.org/ontologies/atomrdf#source http://localhost:8890/dataspace/test3/wiki/testWiki
]]></programlisting>
</listitem>
-</orderedlist>
+</itemizedlist>
</sect2>
<sect2 id="rdfinsertmethodwebdav">
<title>Using WebDAV</title>
@@ -9325,7 +9027,7 @@ http://localhost:8890/dataspace/test3/wiki/testWiki/MyTest http://atomowl.org/o
the Quad Store is updated automatically, or you can load from DAV manually to quad store)</para>
<para><emphasis>Example:</emphasis></para>
<para><emphasis>Example 1: Using ODS Briefcase</emphasis></para>
- <orderedlist>
+ <itemizedlist>
<listitem>Go to your ods location, for ex. http://localhost:8890/ods</listitem>
<listitem>Register user, for ex. user test1</listitem>
<listitem>Login if not already in ods</listitem>
@@ -9385,7 +9087,7 @@ the Quad Store is updated automatically, or you can load from DAV manually to qu
<listitem>You can also perform the steps from above by uploading the file in the rdf_sink
folder i.e. in Briefcase it will be with this path: DAV/home/test2/rdf_sink and respectively the "RDF graph name"
will have this value: http://host:port/DAV/home/username/rdf_sink/</listitem>
- </orderedlist>
+ </itemizedlist>
<para>Execute from ISQL or from the SPARQL endpoint the following query:</para>
<programlisting><![CDATA[
SELECT * FROM <http://localhost:8890/DAV/home/test2/mytest/>
@@ -9407,7 +9109,7 @@ http://www.example/jose/foaf.rdf#juan http://www.w3.org/1999/02/22-rdf-syntax
http://www.example/jose/foaf.rdf#juan http://xmlns.com/foaf/0.1/mbox mailto:juan at mail.example
]]></programlisting>
<para><emphasis>Example 2: Using Conductor UI</emphasis></para>
- <orderedlist>
+ <itemizedlist>
<listitem>Go to Conductor UI, for ex. at http://localhost:8890/conductor</listitem>
<listitem>Login as dba user</listitem>
<listitem>Go to Linked Data -> Quad Store Upload
@@ -9429,21 +9131,20 @@ http://www.example/jose/foaf.rdf#juan http://xmlns.com/foaf/0.1/mbox
<graphic fileref="ui/uc3.png"/>
</figure>
</listitem>
- </orderedlist>
+ </itemizedlist>
</sect2>
<sect2 id="rdfinsertmethodvirtuosocrawler">
<title>Using Virtuoso Crawler</title>
<para>Using Virtuoso Crawler (which includes the Sponger options so you crawl
non-RDF but get RDF and this can go to the Quad Store)</para>
<para><emphasis>Example:</emphasis></para>
- <orderedlist>
- <listitem>Go to Conductor UI. For ex. at http://localhost:8890/conductor</listitem>
- <listitem>Login as dba user</listitem>
- <listitem>Go to tab Web Application Server</listitem>
- <listitem>Go to tab Content Imports</listitem>
- <listitem>Click the "New Target" button</listitem>
- <listitem>In the shown form:
- <orderedlist>
+ <para>Go to Conductor UI. For ex. at http://localhost:8890/conductor</para>
+ <para>Login as dba user</para>
+ <para>Go to tab Web Application Server</para>
+ <para>Go to tab Content Imports</para>
+ <para>Click the "New Target" button</para>
+ <para>In the shown form:</para>
+ <itemizedlist>
<listitem>Enter for "Target description": Tim Berners-Lee's electronic Business Card</listitem>
<listitem>Enter for "Target URL": http://www.w3.org/People/Berners-Lee/</listitem>
<listitem>Enter for "Copy to local DAV collection" for ex.: /DAV/home/demo/rdf_sink/</listitem>
@@ -9457,26 +9158,23 @@ non-RDF but get RDF and this can go to the Quad Store)</para>
<graphic fileref="ui/rdfinsert1.png"/>
</figure>
</listitem>
- </orderedlist>
- </listitem>
- <listitem>Click the button "Import Queues".</listitem>
- <listitem>For "Robot target" with label "Tim Berners-Lee's electronic Business Card"
-click the start link.</listitem>
- <listitem>As result should be shown the number of the pages retrieved.
+ </itemizedlist>
+ <para>Click the button "Import Queues".</para>
+ <para>For "Robot target" with label "Tim Berners-Lee's electronic Business Card"
+click the start link.</para>
+ <para>As result should be shown the number of the pages retrieved.</para>
<figure id="rdfinsertwebdav2" float="1">
<title>Using Virtuoso Crawler</title>
<graphic fileref="ui/rdfinsert2.png"/>
</figure>
- </listitem>
- <listitem>Now using the sparql endpoint with sponger option "Use only local data"
-enter for Default Graph URI: http://www.w3.org/People/Berners-Lee and execute the following query:
+ <para>Now using the sparql endpoint with sponger option "Use only local data"
+enter for Default Graph URI: http://www.w3.org/People/Berners-Lee and execute the following query: </para>
<programlisting><![CDATA[
SELECT *
FROM <http://www.w3.org/People/Berners-Lee>
WHERE {?s ?p ?o}
]]></programlisting>
- </listitem>
- <listitem>As result should be shown the following triples:
+ <para>As result should be shown the following triples:</para>
<programlisting><![CDATA[
s p o
http://www.w3.org/People/Berners-Lee http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://xmlns.com/foaf/0.1/Document
@@ -9497,9 +9195,6 @@ http://www.w3.org/People/Berners-Lee http://purl.org/dc/elements/1.1/title
http://www.w3.org/People/Berners-Lee http://purl.org/dc/elements/1.1/title Tim Berners-Lee: WWW and UU and I
http://www.w3.org/People/Berners-Lee http://purl.org/dc/elements/1.1/title Tim Berners-Lee: WorldWideWeb, the first Web client
]]></programlisting>
- </listitem>
- <listitem></listitem>
- </orderedlist>
<para><emphasis>Example: Use of schedular to interface Virtuoso Quad Store with PTSW using the following program:</emphasis></para>
<programlisting><![CDATA[
@@ -9536,7 +9231,7 @@ insert soft SYS_SCHEDULED_EVENT (SE_SQL, SE_START, SE_INTERVAL, SE_NAME)
</tip>
</sect2>
<sect2 id="rdfinsertmethodsparqlqueryandsponger">
- <title>Using SPARQL Query and Sponger (i.e. we Fetch the Network Resources in the FROM Clause or values for the graph-uri parameter in SPARQL protocol URLs)</title>
+ <title>Using SPARQL Query and Sponger (i.e. we Sponge the Resources in the FROM Clause or values for the graph-uri parameter in SPARQL protocol URLs)</title>
<para><emphasis>Example:</emphasis></para>
<para>Execute the following query: </para>
<programlisting><![CDATA[
@@ -9659,7 +9354,7 @@ http://cname/DAV/home/username/Public/summary.txt urn:txt:v0.0:Chars
</orderedlist>
<para><emphasis>Important: Setting Sponger Permissions</emphasis></para>
<para>In order to allow the Sponger to update the local RDF quad store with triples
-constituting the fetched Network Resource structured data, the role "SPARQL_SPONGE" must be granted to the
+constituting the sponged structured data, the role "SPARQL_SPONGE" must be granted to the
account "SPARQL", i.e., to the owner account of /sparql web service endpoint.
This should normally be the case. If not, you must manually grant this
permission. As with most Virtuoso DBA tasks, the Conductor provides the simplest means of
@@ -9946,8 +9641,8 @@ limit 10;
<para>But what if some or all of these resources were not present in Virtuoso's quad store?
The highly distributed nature of the Linked Data Web makes it highly likely that these
interlinked resources would be spread across several data spaces. Virtuoso's 'input:grab-...'
- extensions to SPARQL enable IRI dereferencing in such a way that all appropriate Network resources
- are loaded, i.e. "being fetched", during query execution, even if some of the Network resources are not
+ extensions to SPARQL enable IRI dereferencing in such a way that all appropriate resources
+ are loaded, i.e. "sponged", during query execution, even if some of the resources are not
known beforehand. For any particular resource matched, and if necessary downloaded, by the
query, it is possible to download related resources via a designated predicate path(s) to
a specifiable depth i.e. number of 'hops', distance, or degrees of separation (i.e compute
@@ -10016,7 +9711,7 @@ limit 10;
</itemizedlist>
</sect4>
<sect4 id="virtuosospongerusageprocessorex"><title>SPARQL Processor Usage Example</title>
- <para>Network Resource Fetch can be performed directly from within the SPARQL processor.</para>
+ <para>Sponge can be performed directly from within the SPARQL processor.</para>
<para>After logging into Virtuoso's Conductor interface, the following query can be
issued from the Interactive SQL (iSQL) panel:
</para>
@@ -10027,7 +9722,7 @@ define get:soft "soft"
select * from <http://mygraph> where {?s ?p ?o}
]]></programlisting>
<para>Here the sparql keyword invokes the SPARQL processor from the SQL interface and the
- RDF data fetched from page http://www.ivan-herman.net/foaf.html is loaded into the local
+ RDF data sponged from page http://www.ivan-herman.net/foaf.html is loaded into the local
RDF quad store as graph http://mygraph .
</para>
<para>The new graph can then be queried using the basic SPARQL client normally available
@@ -10050,7 +9745,7 @@ the service uses the path '/proxy/rdf/'.</para>
<para>Note: The old Sponger Proxy URI Service pattern '/proxy/' is now deprecated.</para>
<sect4 id="virtuosospongerusageproxyex1"><title>Example 1</title>
<para>The following URLs return information about musician John Cale, gleaned from the MusicBrainz
-music metadatabase, rendered as RDF or HTML respectively. (The Network Resource fetched data is available in the HTML
+music metadatabase, rendered as RDF or HTML respectively. (The sponged data is available in the HTML
rendering through the foaf:primaryTopic property.)</para>
<itemizedlist mark="bullet">
<listitem>http://demo.openlinksw.com/about/rdf/http://musicbrainz.org/artist/72c090b6-a68e-4cb9-b330-85278681a714.html</listitem>
@@ -10064,63 +9759,14 @@ rendering through the foaf:primaryTopic property.)</para>
RDF, as can be seen by executing:
</para>
<programlisting><![CDATA[
-$ curl -L -H "Accept:application/rdf+xml" http://linkeddata.uriburner.com/about/id/entity/http/www.ivan-herman.net/foaf.html
-<?xml version="1.0" encoding="utf-8" ?>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
- <rdf:Description rdf:about="http://linkeddata.uriburner.com/about/id/http/www.ivan-herman.net/foaf.html#Person1Stat"><scovo:dimension xmlns:scovo="http://purl.org/NET/scovo#" rdf:resource="http://rdfs.org/ns/void#numberOfResources"/></rdf:Description>
- <rdf:Description rdf:nodeID="b145981159"><rdf:rest rdf:nodeID="b145981158"/></rdf:Description>
- <rdf:Description rdf:about="http://linkeddata.uriburner.com/about/id/entity/http/www.mendeley.com/profiles/ivan-herman"><foaf:accountName xmlns:foaf="http://xmlns.com/foaf/0.1/">ivan-herman</foaf:accountName></rdf:Description>
- etc ..
- <rdf:Description rdf:nodeID="b145981130"><http-voc:elementName xmlns:http-voc="http://www.w3.org/2006/http#">text/html</http-voc:elementName></rdf:Description>
-</rdf:RDF>
+curl -H "Accept: application/rdf+xml" http://linkeddata.uriburner.com/about/rdf/http://www.ivan-herman.net/foaf.html
]]></programlisting>
<para>(linkeddata.uriburner.com hosts a public Virtuoso instance.) Though this example
- demonstrates the action of the /about/id/entity/ service quite transparently, it is a basic and
+ demonstrates the action of the /about/rdf/ service quite transparently, it is a basic and
unwieldy way to view RDF. As described earlier, the OpenLink Data Explorer uses the same
- proxy service to provide a more polished means to extract and view fetched RDF data.
+ proxy service to provide a more polished means to extract and view sponged RDF data.
</para>
</sect4>
- <sect4 id="virtuosospongerusageproxyurlist"><title>Usage of the Sponger Middleware via REST patterns</title>
- <para>Delegation and proxies are part of the Internet and Web's federated architecture. Thus,
- developers of RESTful applications benefit immensely from the ability to leverage Sponger
- functionality via delegation to it as a proxy.</para>
- <para>The following table presents list of the supported URL parameters:</para>
- <table>
- <tgroup cols="4">
- <thead>
- <row>
- <entry>Parameter</entry><entry>Value</entry><entry>Description</entry><entry>Example</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><emphasis>refresh</emphasis></entry>
- <entry>clean</entry>
- <entry><emphasis>Usage</emphasis>: for overwriting. <br/>The 'clean' usage explicitly clears the graph i.e. will cause the Sponger to drop cache even if it is marked to be in the fly.<br/>Thus, if fetched cache by some reason is left in some inconsistent state like shutdown during Network Resource fetching, then 'clean' is required as it doesn't check cache state.<br/><emphasis>Note</emphasis>: must be used with caution as other threads may be doing fetching of network resources at same time.</entry>
- <entry><ulink url="http://linkeddata.uriburner.com/about/html/http://linkeddata.uriburner.com/about/id/entity/http/twitter.com/kidehen?@Lookup@=&refresh=clean">Explicitly clear the graph</ulink></entry>
- </row>
- <row>
- <entry><emphasis>sponger:get</emphasis></entry>
- <entry>add</entry>
- <entry><emphasis>Usage</emphasis>: Add new triples to named graphs, progressively. This is the default value for the parameter sponger:get. May be used together with refresh=<seconds> to overwrite the expiration in the cache.</entry>
- <entry><ulink url="http://linkeddata.uriburner.com/about/html/http://linkeddata.uriburner.com/about/id/entity/http/twitter.com/kidehen?sponger:get=add&refresh=10">Add new triples and refresh on every 10 seconds</ulink></entry>
- </row>
- <row>
- <entry><emphasis>sponger:get</emphasis></entry>
- <entry>soft</entry>
- <entry><emphasis>Usage</emphasis>: Network Resource Fetch data subject to cache invalidation mode and associated rules of instance. May be used together with refresh=<seconds> to overwrite the expiration in the cache.</entry>
- <entry><ulink url="http://linkeddata.uriburner.com/about/html/http://linkeddata.uriburner.com/about/id/entity/http/twitter.com/kidehen?sponger:get=soft&refresh=10">Network Resource Fetch data with option <emphasis>soft</emphasis> and refresh on every 10 seconds</ulink></entry>
- </row>
- <row>
- <entry><emphasis>sponger:get</emphasis></entry>
- <entry>replace</entry>
- <entry><emphasis>Usage</emphasis>: Replace subject to cache invalidation mode and rules, but coverage includes non fetched triples if such exist in a given named graph. may be used together with refresh=<seconds> to overwrite the expiration in the cache.</entry>
- <entry><ulink url="http://linkeddata.uriburner.com/about/html/http://linkeddata.uriburner.com/about/id/entity/http/twitter.com/kidehen?sponger:get=replace&refresh=10">Replace data and refresh on every 10 seconds</ulink></entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </sect4>
</sect3>
<sect3 id="virtuosospongerusageclapp"><title>OpenLink RDF Client Applications</title>
<para>OpenLink currently provides two main RDF client applications:</para>
@@ -10142,9 +9788,9 @@ $ curl -L -H "Accept:application/rdf+xml" http://linkeddata.uriburner.com/about/
<title>Launching ODE's RDF browser</title>
<graphic fileref="twitter_home.png"/>
</figure>
- <para>The RDF browser then displays RDF data fetched via the Crunchbase cartridge.</para>
+ <para>The RDF browser then displays RDF data sponged via the Crunchbase cartridge.</para>
<figure id="ODEBrowserRDF" float="1">
- <title>ODE RDF browser displaying Crunchbase network resource fetched data</title>
+ <title>ODE RDF browser displaying sponged Crunchbase data</title>
<graphic fileref="twitter_ode_rdf.png"/>
</figure>
<para>iSPARQL directs queries to the configured SPARQL endpoint. When targetting a Virtuoso
@@ -10736,10 +10382,10 @@ SPARQL clear graph <A-Named-Graph>;
<entry><emphasis>refresh=clean</emphasis></entry>
<entry></entry>
<entry><emphasis>Usage</emphasis>: for overwriting. The 'clean' usage explicitly clears the graph i.e.
- will cause the Sponger to drop cache even if it is marked to be in the fly. Thus, if
- network resource fetched cache by some reason is left in some inconsistent state like shutdown during the fetching, then 'clean' is required
+ will cause the Sponger to drop cache even if it is marked to be in the fly. Thus, if sponged cache by
+ some reason is left in some inconsistent state like shutdown during sponge, then 'clean' is required
as it doesn't check cache state. <emphasis>Note</emphasis>: must be used with caution as other threads
- may be doing Network Resource Fetch at same time.</entry>
+ may be doing sponge at same time.</entry>
<entry></entry>
</row>
</tbody>
@@ -10835,8 +10481,8 @@ pre-written cartridges for RDF data extraction from a wide range of data sources
are free to develop their own custom cartridges. This programmer's guide describes how.</para>
<para>The guide is a companion to the <ulink url="http://virtuoso.openlinksw.com/Whitepapers/pdf/sponger_whitepaper_10102007.pdf">Virtuoso Sponger</ulink> whitepaper. The latter describes the Sponger in depth, its architecture, configuration, use and integration with other Virtuoso facilities such as the Open Data Services (ODS) application framework. This guide focuses solely on custom cartridge development.</para>
<sect3 id="virtuosospongeroverviewxmlset">
- <title>Configuration of CURIEs used by the Sponger</title>
- <para>For configuring CURIEs used by the Sponger which is exposed via Sponger
+ <title>Configuration of CURIEs used by the sponger</title>
+ <para>For configuring CURIEs used by the Sponger which is exposed via sponger
clients such as "description.vsp" - the VSP based information resource description utility,
you can use the <link linkend="fn_xml_set_ns_decl"><function>xml_set_ns_decl</function></link> function.</para>
<para>Here is sample example to add curie pattern:</para>
@@ -10921,7 +10567,7 @@ PRIMARY KEY ("RM_PATTERN", "RM_TYPE")
<sect3 id="virtuosospongeroverviewcartinvo">
<title>Cartridge Invocation</title>
<para>The Virtuoso SPARQL processor supports IRI dereferencing via the Sponger. If a SPARQL query
-references non-default graph URIs, the Sponger goes out (via HTTP) to Fetch the Network Resource data source URIs and
+references non-default graph URIs, the Sponger goes out (via HTTP) to sponge the data source URIs and
inserts the extracted RDF data into the local RDF quad store. The Sponger invokes the appropriate
cartridge for the data source type to produce RDF instance data. If none of the registered cartridges
are capable of handling the received content type, the Sponger will attempt to obtain RDF instance
@@ -11055,7 +10701,7 @@ on the ESW Wiki. The list covers a range of microformats, syndication formats an
<sect3 id="virtuosospongercreatecustcartr">
<title>Creating Custom Cartridges</title>
<para>The Sponger is fully extensible by virtue of its pluggable cartridge architecture. New data formats can
-be fetched by creating new cartridges. While OpenLink is active in adding cartridges for new data sources,
+be sponged by creating new cartridges. While OpenLink is active in adding cartridges for new data sources,
you are free to develop your own custom cartridges. Entity extractors can be built using Virtuoso PL,
C/C++, Java or any other external language supported by Virtuoso's Server Extension API. Of course,
Virtuoso's own entity extractors are written in Virtuoso PL.</para>
@@ -11093,7 +10739,7 @@ how you might do this:</para>
<programlisting><![CDATA[
if (xd is not null)
{
- -- Sponging successful. Load network resource data being fetched in the Virtuoso Quad Store:
+ -- Sponging successful. Load sponged data in Virtuoso quad store
DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
flag := 1;
}
@@ -11119,13 +10765,13 @@ of origin.</para>
<para>So, under some circumstances depending on how the Sponger has been invoked and whether
it is being used to crawl an existing RDF graph, or derive RDF data from a non-RDF data source,
dest may be null.</para>
- <para>Consequently, when loading network resource being fetched as RDF data into the quad store, cartridges typically
+ <para>Consequently, when loading sponged RDF data into the quad store, cartridges typically
specify the graph to receive the data using the coalesce function which returns the first non-null
parameter. e.g.</para>
<programlisting><![CDATA[
DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
]]></programlisting>
- <para>Here xd is an RDF/XML string holding the fetched RDF.</para>
+ <para>Here xd is an RDF/XML string holding the sponged RDF.</para>
<para><emphasis>Specifying & Retrieving Cartridge Specific Options</emphasis></para>
<para>The hook function prototype allows cartridge specific data to be passed to a cartridge
through the RM_OPTIONS parameter, a Virtuoso/PL vector which acts as a heterogeneous array.</para>
@@ -11203,7 +10849,7 @@ http://musicbrainz.org/artist/4d5447d7-c61c-4120-ba1b-d7f471d385b9.html takes yo
for John Lennon.</para>
<para>If you were to look at this page in your browser, you would see that the information about
the artist contains no RDF data. However, the cartridge is configured to intercept requests to URLs of
-the form http://musicbrainz.org/([^/]*)/([^.]*) and redirect to the cartridge to Fetch all the
+the form http://musicbrainz.org/([^/]*)/([^.]*) and redirect to the cartridge to sponge all the
available information on the given artist, release, track or label.</para>
<para>The cartridge extracts entities by redirecting to the MusicBrainz XML Web Service using
as the basis for the initial query the item ID, e.g. an artist or label ID, extracted from the original
@@ -11221,7 +10867,7 @@ DB.DBA.RM_RDF_LOAD_RDFXML (xd, new_origin_uri, coalesce (dest, graph_iri));
]]></programlisting>
<para>In the above outline, RDF_HTTP_URL_GET sends a query to the MusicBrainz web service,
using query parameters appropriate for the original request, and retrieves the response using
-Network Resource Fetch.</para>
+HTTP GET.</para>
<para>The returned XML is parsed into an in-memory parse tree by xtree_doc. Virtuoso/PL
function RDF_MAPPER_XSLT is a simple wrapper around the function xslt which sets the current user
to dba before returning an XML document transformed by an XSLT stylesheet, in this case mbz2rdf.xsl.
@@ -11308,7 +10954,7 @@ graph an indication of the external ontologies being used. The attribution takes
]]></programlisting>
<para>where prefix opl: denotes the ontology http://www.openlinksw.com/schema/attribution#.</para>
<para><emphasis>Deleting Existing Graphs</emphasis></para>
- <para>Before loading network resource fetched RDF data into a graph, you may want to delete any existing graph
+ <para>Before loading sponged RDF data into a graph, you may want to delete any existing graph
with the same URI. To do so, select the 'RDF' > 'List of Graphs' menu commands in Conductor, then use
the 'Delete' command for the appropriate graph. Alternatively, you can use one of the following SQL
commands:</para>
@@ -11368,7 +11014,7 @@ vector ('baseUri', coalesce (dest, graph_iri), 'base', base, 'suffix', suffix)
<para><emphasis>An RDF Description Template</emphasis></para>
<para><emphasis>Defining A Generic Resource Description Wrapper</emphasis></para>
<para>Many of the OpenLink cartridges create a resource description formed to a common "wrapper"
-template which describes the relationship between the (usually) non-RDF source network resource being fetched
+template which describes the relationship between the (usually) non-RDF source resource being sponged
and the RDF description generated by the Sponger. The wrapper is appropriate for resources which can
broadly be conceived as documents. It provides a generic minimal description of the source document,
but also links to the much more detailed description provided by the Sponger. So, instead of just
@@ -11428,9 +11074,9 @@ SIOC provides a useful framework for the description which complements the SIOC-
adopted throughout the ODS framework.</para>
<para><emphasis>Naming Conventions for Sponger Generated Descriptions</emphasis></para>
<para>As can be seen from the stylesheet extract just shown, the URI of the resource
-description generated by the Sponger to describe the network resource being fetched, is given by the
-function {vi:proxyIRI ($resourceURL)} where resourceURL is the URL of the original network resource
-being fetched. proxyIRI is an XPath extension function defined in rdf_mappers.sql as</para>
+description generated by the Sponger to describe the sponged resource is given by the
+function {vi:proxyIRI ($resourceURL)} where resourceURL is the URL of the original resource
+being sponged. proxyIRI is an XPath extension function defined in rdf_mappers.sql as</para>
<programlisting><![CDATA[
xpf_extension ('http://www.openlinksw.com/virtuoso/xslt/:proxyIRI', 'DB.DBA.RDF_SPONGE_PROXY_IRI');
]]></programlisting>
@@ -11450,7 +11096,7 @@ a row to the SYS_REF_MAPPERS table directly using SQL, or by using the Conductor
<para>If you choose register your cartridge using SQL, possibly as part of a Virtuoso/PL
script, the required SQL will typically mirror one of the following INSERT commands.</para>
<para>Below, a cartridge for OpenCalais is being installed which will be tried when
-the MIME type of the network resource data being fetched is one of text/plain, text/xml or text/html.
+the MIME type of the data being sponged is one of text/plain, text/xml or text/html.
(The definition of the SYS_RDF_MAPPERS table was introduced earlier in section
'Cartridge Registry'.)</para>
<programlisting><![CDATA[
@@ -11961,7 +11607,7 @@ FROM <URL-of-a-txt-file>
WHERE { ?s ?p ?o }
]]></programlisting>
<para>It is important that the SPARQL_UPDATE role to be granted to "SPARQL" account in order
-to allow local repository update via Network Resource Fetch feature.</para>
+to allow local repository update via sponge feature.</para>
<para><emphasis>Authentication in Sponger</emphasis></para>
<para>To enable usage of user defined authentication, there are added more parameters to the
/proxy/rdf and /sparql endpoints. So to use it, the RDF browser and iSPARQL should send following
@@ -12179,12 +11825,12 @@ SQL> SELECT APERTURE.DBA."MetaExtractor"().getMetaFromFile ('some_pdf_in_server_
]]></programlisting>
</listitem>
</itemizedlist>
-<para>You should now be able to Fetch all Network Resource document types supported by the Aperture framework, (using
+<para>You should now be able to sponge all document types supported by the Aperture framework, (using
one of the standard Sponger invocation mechanisms, for instance with a URL of the form
http://localhost:8890/about/rdf/http://targethost/targetfile.pdf), subject to the MIME type pattern
filters configured for the cartridge in the Conductor UI. By default the Aperture cartridge is
registered to match MIME types (application/octet-stream)|(application/pdf)|(application/mspowerpoint).
-To Fetch all the Network Resource MIME types Aperture is capable of handling, changed the MIME type pattern to
+To sponge all the MIME types Aperture is capable of handling, changed the MIME type pattern to
'application/.*'.</para>
<para>Important: The installation guidelines presented above have been verified on Mac OS X with
Aperture 1.2.0. Some adjustment may be needed for different operating systems or versions of Aperture.</para>
@@ -12247,8 +11893,8 @@ MC_ENABLED INTEGER -- a 0 or 1 integer flag to exclude or include
registered using SQL. A Conductor interface for this task will be added in due course.)</para>
<para><emphasis>Invocation</emphasis></para>
<para>Meta-cartridges are invoked through the post-processing hook procedure RDF_LOAD_POST_PROCESS
-which is called, for every document retrieved, after RDF_LOAD_RDFXML loads fetched data into the Quad
-Store.</para>
+which is called, for every document retrieved, after RDF_LOAD_RDFXML loads sponged data into the quad
+store.</para>
<para>Cartridges in the meta-cartridge registry (RDF_META_CARTRIDGES) are configured to match a given
MIME type or URI pattern. Matching meta-cartridges are invoked in order of their MC_SEQ value. Ordinarily
a meta-cartridge should return 0, in which case the next meta-cartridge in the post-processing chain will
@@ -12321,19 +11967,19 @@ http://api.nytimes.com/svc/elections/us/v2/president/2008/finances/candidates/ob
<para>The following instructions assume you have the <ulink url="http://ode.openlinksw.com/">OpenLink Data Explorer (ODE)</ulink> browser extension installed in your browser.</para>
<para>An HTML description of Barack Obama can be obtained directly from Freebase by pasting the
following URL into your browser: http://www.freebase.com/view/en/barack_obama</para>
- <para>To view RDF data fetched from this page, select 'Linked Data Sources' from the browser's
+ <para>To view RDF data sponged from this page, select 'Linked Data Sources' from the browser's
'View' menu. An OpenLink Data Explorer interface will load in a new tab.</para>
- <para>Clicking on the 'Barack Obama' link under the 'Person' category displayed by ODE fetches
+ <para>Clicking on the 'Barack Obama' link under the 'Person' category displayed by ODE sponges
RDF data using the Freebase cartridge. Click the 'down arrow' adjacent to the 'Barack Obama' link to
explore the retrieved data.</para>
<para>Assuming your Virtuoso instance is running on port 8890 on localhost, the list of data caches displayed
by ODE should include: http://localhost:8890/about/html/http/www.freebase.com/view/en/barack_obama#this</para>
<para>The information displayed in the rest of the page relates to the entity instance identified by this URI. The prefix http://localhost:8890/about/html/http/ prepended to the
original URI indicates that the Sponger Proxy Service has been invoked. The Sponger creates an associated
-entity instance (identified by the above URI with the #this suffix) which holds network resource information being fetched
+entity instance (identified by the above URI with the #this suffix) which holds sponged information
about the original entity.</para>
<para><emphasis>Using the Command Line</emphasis></para>
- <para>As an alternative to ODE, you can perform Network Resource Fetch from the command line with the command:</para>
+ <para>As an alternative to ODE, you can sponge from the command line with the command:</para>
<programlisting><![CDATA[
curl -H "Accept: text/xml" "http://localhost:8890/about/html/http/www.freebase.com/view/en/barack_obama"
]]></programlisting>
@@ -12357,7 +12003,7 @@ create procedure INSTALL_RDF_LOAD_NYTCF ()
};
]]></programlisting>
<para>Looking at the list of cartridges in Conductor's 'RDF Cartridges' screen, you will
-see that the Freebase cartridge is configured by default to perform Network Resource Fetch of URIs which match the pattern
+see that the Freebase cartridge is configured by default to sponge URIs which match the pattern
"http://www.freebase.com/view/.*" The meta-cartridge is configured to match on the same URI pattern.</para>
<para>To use the Campaign Finance API, you must register and request an API key. The script
above shows an invalid key. Replace it with your own key before executing the procedure.</para>
@@ -12715,7 +12361,7 @@ Only then does it make sense to query for campaign finance data from the NYTCF d
DB.DBA.RDF_SPONGER_QUEUE_ADD (url, options);
]]></programlisting>
<itemizedlist mark="bullet">
- <listitem><emphasis>url</emphasis>: the URI to perform Network Resource Fetch</listitem>
+ <listitem><emphasis>url</emphasis>: the URI to sponge </listitem>
<listitem><emphasis>options</emphasis>: an array usually typical sponger pragmas, for ex:
<programlisting><![CDATA[
vector ('get:soft', 'soft', 'refresh_free_text', 1);
@@ -13074,12 +12720,12 @@ create procedure DB.DBA.RDF_LOAD_MQL (in graph_iri varchar, in new_origin_uri va
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- - $Id: rdfandsparql.xml,v 1.95.2.49 2012/03/14 14:12:40 source Exp $
+ - $Id: rdfandsparql.xml,v 1.95.2.47 2011/10/26 00:21:16 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2008 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
@@ -13417,18 +13063,18 @@ Note this should be run periodically as the data grows to re-rank the IRIs.
s_rank()
]]></programlisting>
</listitem>
- <listitem>Perform Network Resource Fetch of some data to load some RDF triples in the quad store. This can easily be done using
+ <listitem>Sponge some data to load some RDF triples in the quad store. This can easily be done using
the Virtuoso <emphasis>description.vsp</emphasis> page which provides a hypertext description of RDF Linked Data, by describing
the following page for example (or one of your choice):
<programlisting><![CDATA[
http://cname/about/html/http/news.cnet.com
]]></programlisting>
<figure id="fctinst4" float="1">
- <title>Network Resource Fetch data</title>
+ <title>Sponge data</title>
<graphic fileref="ui/fb3.png"/>
</figure>
<figure id="fctinst4" float="1">
- <title>Network Resource Fetch data</title>
+ <title>Sponge data</title>
<graphic fileref="ui/fb4.png"/>
</figure>
</listitem>
@@ -13438,7 +13084,7 @@ http://cname/about/html/http/news.cnet.com
<graphic fileref="ui/fb5.png"/>
</figure>
</listitem>
- <listitem>Results of the following form should be returned for the network resource data being fetched.
+ <listitem>Results of the following form should be returned for the data sponged.
<figure id="fctinst6" float="1">
<title>Faceted Browser Search Results</title>
<graphic fileref="ui/fb6.png"/>
@@ -13686,7 +13332,7 @@ VT_INC_INDEX_DB_DBA_RDF_OBJ ()
<graphic fileref="ui/fb24.png"/>
</figure>
</listitem>
- <listitem>Results of the following form should be returned for the network resource data being fetched.
+ <listitem>Results of the following form should be returned for the data sponged:
<figure id="VirtFacetUsage2" float="1">
<title>Usage Statistics</title>
<graphic fileref="ui/fb25.png"/>
@@ -15663,11 +15309,11 @@ we will stick with the nice to long conversion using regex-based rules.
</sect4>
</sect3>
<sect3 id="urlrewriteruleexamplenorthwind">
- <title>Example - URL Rewriting For the Northwind Linked Data View</title>
+ <title>Example - URL Rewriting For the Northwind RDF View</title>
<para>The Northwind schema is comprised of commonly understood SQL Tables that include: Customers,
Orders, Employees, Products, Product Categories, Shippers, Countries, Provinces etc.
</para>
-<para>An Linked Data View of SQL data is an RDF named graph (RDF data set) comprised of RDF Linked Data
+<para>An RDF View of SQL data is an RDF named graph (RDF data set) comprised of RDF Linked Data
(triples) stored in a Virtuoso Quad Store (the native RDF Data Management realm of Virtuoso).
</para>
<para>In this example we are going interact with Linked Data deployed into the Data-Web from
@@ -16310,7 +15956,7 @@ condition on ?o1.
</para>
<para>This query is a typical example of queries that are executed all the time when a user refines a
search. We will now look at how we can make an efficient execution plan for the query. First, we must
-know the cardinalities of the search conditions.
+know the cardinalities of the search conditions:
</para>
<para>To see the count of subclasses of Yago performer, we can do:
</para>
@@ -16483,7 +16129,8 @@ WHERE
T_MIN (0),
T_MAX (1)
)
- FILTER ( ?org = ?k ) .
+ FILTER
+ ( ?org = ?k ) .
?syn foaf:knows ?f .
}
]]></programlisting>
@@ -16845,7 +16492,7 @@ managed by a separate server process.
<sect1 id="rdfsparqlrule"><title>Inference Rules & Reasoning</title>
<sect2 id="rdfsparqlruleintro"><title>Introduction</title>
<para>Virtuoso SPARQL can use an inference context for inferring triples that are not physically stored.
-This functionality applies to physically stored quads and not to virtual triples generated from relational data with Linked Data Views.
+This functionality applies to physically stored quads and not to virtual triples generated from relational data with RDF views.
Such an inference context can be built from one or more graphs containing RDF Schema triples. The supported
RDF Schema or OWL constraints are imported from these graphs and are grouped together into rule bases.
A rule base is a persistent entity that can be referenced by a SPARQL query or end point. Queries running
@@ -16883,7 +16530,8 @@ the rule set to correspond to the state of the stored graphs.
</para>
</sect2>
<sect2 id="rdfsparqlrulesubclassandsubprop"><title>Subclasses and Subproperties</title>
- <para>Virtuoso SPARQL supports RDF Schema subclasses and subproperties.</para>
+<para>Virtuoso SPARQL supports RDF Schema subclasses and subproperties.
+</para>
<para>The predicates <emphasis>rdfs:subClassOf</emphasis> and <emphasis>rdfs:subPropertyOf</emphasis> are
recognized when they appear in graphs included in a rule set. When such a rule set is specified as a context
for a SPARQL query, the following extra triples are generated as needed.
@@ -16901,394 +16549,6 @@ of <emphasis>?predicate</emphasis>. This is done by having the triple <emphasis>
as part of the graphs making up the rule context. Transitivity is observed, thus if a is a subpredicate of b and b
a subpredicate of c, then a is also a subpredicate of c.
</para>
-
- <para>Two methods can be used for typical recursions, transitivity on inference and plain transitive patterns
-(or subqueries).</para>
- <para>The advantage of inference is that queries are short and one inference rule set may be maintained for
-numerous queries.</para>
- <para>If queries are about trees of classes or properties, or about equivalences of nodes, consider using
-inference rule sets.</para>
- <para>Transitive patterns are inconvenient and may easily result in queries that runs too long or hard
-to debug, but they're unavoidable in traversing social networks or plain querying of RDF lists.</para>
- <para>So consider a rule set, a handful of nodes with classes from the rule set and a couple of RDF
-Lisp-style lists defined on demo.openlinksw.com:</para>
-<programlisting><![CDATA[
-SQL> SPARQL CLEAR GRAPH <http://example.com/2/owl>;
-callret-0
-VARCHAR
-_______________________________________________________________________________
-
-Clear <http://example.com/2/owl> -- done
-
-1 Rows. -- 0 msec.
-
-SQL> TTLP (' @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
- @prefix owl: <http://www.w3.org/2002/07/owl#> .
- @prefix e: <http://example.com/e/> .
- e:c1 rdfs:subClassOf e:c1or2 .
- e:c2 rdfs:subClassOf e:c1or2 .
- e:c1-10 rdfs:subClassOf e:c1 .
- e:c1-20 rdfs:subClassOf e:c1 .
- e:c2-30 rdfs:subClassOf e:c2 .
- e:c2-40 rdfs:subClassOf e:c2 .
- ', 'http://example.com/2/owl', 'http://example.com/2/owl' );
-
-Done. -- 0 msec.
-]]></programlisting>
- <para>You can also use the SPARUL equivalent variant:</para>
-<programlisting><![CDATA[
-SPARQL
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX owl: <http://www.w3.org/2002/07/owl#>
-PREFIX e: <http://example.com/e/>
-
-INSERT IN GRAPH <http://example.com/2/owl>
- {
- e:c1 rdfs:subClassOf e:c1or2 .
- e:c2 rdfs:subClassOf e:c1or2 .
- e:c1-10 rdfs:subClassOf e:c1 .
- e:c1-20 rdfs:subClassOf e:c1 .
- e:c2-30 rdfs:subClassOf e:c2 .
- e:c2-40 rdfs:subClassOf e:c2 .
- } ;
-]]></programlisting>
- <para>Define the inference rule:</para>
-<programlisting><![CDATA[
-SQL> rdfs_rule_set ('http://example.com/2/owl', 'http://example.com/2/owl');
-
-Done. -- 0 msec.
-
-SQL> SPARQL CLEAR GRAPH <http://example.com/2/data> ;
-callret-0
-VARCHAR
-_______________________________________________________________________________
-
-Clear <http://example.com/2/data> -- done
-
-1 Rows. -- 0 msec.
-
-SQL> TTLP ('
- @prefix e: <http://example.com/e/> .
- @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- @prefix owl: <http://www.w3.org/2002/07/owl#> .
- e:s1 a e:c1 ; e:p1 "Value of p1 for s1" .
- e:s2 a e:c2 ; e:p1 "Value of p1 for s2" .
- e:s1-10 a e:c1-10 ; e:p1 "Value of p1 for s1-10" .
- e:s1-20 a e:c1-20 ; e:p1 "Value of p1 for s1-20" .
- e:s2-30 a e:c2-30 ; e:p1 "Value of p1 for s2-30" .
- e:s2-40 a e:c2-40 ; e:p1 "Value of p1 for s2-40" .
- e:lists
- rdf:_1 ( e:list1-item1 e:list1-item2 e:list1-item3 ) ;
- rdf:_2 (
- [ e:p2 "Value of p2 of item1 of list2" ; e:p3 "Value of p3 of item1 of list2" ]
- [ e:p2 "Value of p2 of item2 of list2" ; e:p3 "Value of p3 of item2 of list2" ]
- [ e:p2 "Value of p2 of item3 of list2" ; e:p3 "Value of p3 of item3 of list2" ] ) .
- ', 'http://example.com/2/data', 'http://example.com/2/data' );
-
-Done. -- 0 msec.
-]]></programlisting>
- <para>You can also use the SPARUL equivalent variant:</para>
-<programlisting><![CDATA[
-SPARQL
-PREFIX e: <http://example.com/e/>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX owl: <http://www.w3.org/2002/07/owl#>
-
-INSERT IN GRAPH <http://example.com/2/data>
- {
- e:s1 a e:c1 ; e:p1 "Value of p1 for s1" .
- e:s2 a e:c2 ; e:p1 "Value of p1 for s2" .
- e:s1-10 a e:c1-10 ; e:p1 "Value of p1 for s1-10" .
- e:s1-20 a e:c1-20 ; e:p1 "Value of p1 for s1-20" .
- e:s2-30 a e:c2-30 ; e:p1 "Value of p1 for s2-30" .
- e:s2-40 a e:c2-40 ; e:p1 "Value of p1 for s2-40" .
- e:lists
- rdf:_1 ( e:list1-item1 e:list1-item2 e:list1-item3 ) ;
- rdf:_2 (
- [ e:p2 "Value of p2 of item1 of list2" ; e:p3 "Value of p3 of item1 of list2" ]
- [ e:p2 "Value of p2 of item2 of list2" ; e:p3 "Value of p3 of item2 of list2" ]
- [ e:p2 "Value of p2 of item3 of list2" ; e:p3 "Value of p3 of item3 of list2" ] )
- };
-]]></programlisting>
- <para>SPARQL DESCRIBE works fine with inference, deriving additional type information:</para>
-<programlisting><![CDATA[
-DEFINE input:inference <http://example.com/2/owl>
-DESCRIBE <http://example.com/e/s1>
-FROM <http://example.com/2/data>
-
-fmtaggret-
-LONG VARCHAR
-_______________________________________________________________________________
-
- at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- at prefix ns1: <http://example.com/e/> .
-ns1:s1 rdf:type ns1:c1or2 ,
-ns1:c1 ;
-ns1:p1 "Value of p1 for s1" .
-
-1 Rows. -- 0 msec.
-]]></programlisting>
-
- <para>Example links against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URLs:</para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E%0D%0ADESCRIBE+%3Chttp%3A%2F%2Fexample.com%2Fe%2Fs1%3E%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E&should-sponge=&format=application%2Frdf%2Bxml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View results page</ulink></listitem>
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E%0D%0ADESCRIBE+%3Chttp%3A%2F%2Fexample.com%2Fe%2Fs1%3E%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E&should-sponge=&format=application%2Frdf%2Bxml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View editor page</ulink></listitem>
- </itemizedlist>
-
-<programlisting><![CDATA[
-DEFINE input:inference <http://example.com/2/owl>
-DESCRIBE <http://example.com/e/s2>
-FROM <http://example.com/2/data>
-fmtaggret-
-LONG VARCHAR
-_______________________________________________________________________________
-
- at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- at prefix ns1: <http://example.com/e/> .
-ns1:s2 rdf:type ns1:c1or2 ,
-ns1:c2 ;
-ns1:p1 "Value of p1 for s2" .
-
-1 Rows. -- 0 msec.
-]]></programlisting>
-
- <para>Example links against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URLs:</para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E%0D%0ADESCRIBE+%3Chttp%3A%2F%2Fexample.com%2Fe%2Fs2%3E+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E&should-sponge=&format=application%2Frdf%2Bxml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View results page</ulink></listitem>
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E%0D%0ADESCRIBE+%3Chttp%3A%2F%2Fexample.com%2Fe%2Fs2%3E+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E&should-sponge=&format=application%2Frdf%2Bxml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View editor page</ulink></listitem>
- </itemizedlist>
-
- <para>Querying is simple as well:</para>
-
-<programlisting><![CDATA[
-SQL>SPARQL DEFINE input:inference <http://example.com/2/owl>
-PREFIX e:<http://example.com/e/>
-SELECT *
-FROM <http://example.com/2/data>
-WHERE
- {
- ?s a e:c1or2 ;
- e:p1 ?o
- }
-
-s o
-VARCHAR VARCHAR
-___________________________
-
-http://example.com/e/s1 Value of p1 for s1
-http://example.com/e/s1-10 Value of p1 for s1-10
-http://example.com/e/s1-20 Value of p1 for s1-20
-http://example.com/e/s2-30 Value of p1 for s2-30
-http://example.com/e/s2-40 Value of p1 for s2-40
-http://example.com/e/s2 Value of p1 for s2
-
-6 Rows. -- 0 msec.
-]]></programlisting>
-
- <para>Example links against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URLs:</para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E++%0D%0APREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+*+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E+%0D%0AWHERE+%0D%0A++{+%0D%0A++++%3Fs+a+e%3Ac1or2+%3B+%0D%0A++++++++++e%3Ap1+%3Fo+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View results page</ulink></listitem>
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E++%0D%0APREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+*+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E+%0D%0AWHERE+%0D%0A++{+%0D%0A++++%3Fs+a+e%3Ac1or2+%3B+%0D%0A++++++++++e%3Ap1+%3Fo+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View editor page</ulink></listitem>
- </itemizedlist>
-
-<programlisting><![CDATA[
-SQL>SPARQL DEFINE input:inference <http://example.com/2/owl>
-PREFIX e:<http://example.com/e/>
-SELECT * FROM <http://example.com/2/data>
-WHERE
- {
- ?s a e:c1 ;
- e:p1 ?o
- }
-
-s o
-VARCHAR VARCHAR
-___________________________
-
-http://example.com/e/s1 Value of p1 for s1
-http://example.com/e/s1-10 Value of p1 for s1-10
-http://example.com/e/s1-20 Value of p1 for s1-20
-
-3 Rows. -- 0 msec.
-]]></programlisting>
-
- <para>Example links against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URLs:</para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E++%0D%0APREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+*+FROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{+%0D%0A++++%3Fs+a+e%3Ac1+%3B+%0D%0A+++++++e%3Ap1+%3Fo+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View results page</ulink></listitem>
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E++%0D%0APREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+*+FROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{+%0D%0A++++%3Fs+a+e%3Ac1+%3B+%0D%0A+++++++e%3Ap1+%3Fo+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View editor page</ulink></listitem>
- </itemizedlist>
-
-
- <para>However you should care about duplicates if both types and properties are queried: the join will
- result in all combinations of types and property values.</para>
-
-<programlisting><![CDATA[
-SQL>SPARQL DEFINE input:inference <http://example.com/2/owl>
-PREFIX e:<http://example.com/e/>
-SELECT * FROM <http://example.com/2/data>
-WHERE
- {
- ?s a ?t ;
- e:p1 ?o
- }
-
-s t o
-VARCHAR VARCHAR VARCHAR
-___________________________
-
-http://example.com/e/s1 http://example.com/e/c1 Value of p1 for s1
-http://example.com/e/s1 http://example.com/e/c1or2 Value of p1 for s1
-http://example.com/e/s1-10 http://example.com/e/c1-10 Value of p1 for s1-10
-http://example.com/e/s1-10 http://example.com/e/c1 Value of p1 for s1-10
-http://example.com/e/s1-10 http://example.com/e/c1or2 Value of p1 for s1-10
-http://example.com/e/s1-20 http://example.com/e/c1-20 Value of p1 for s1-20
-http://example.com/e/s1-20 http://example.com/e/c1 Value of p1 for s1-20
-http://example.com/e/s1-20 http://example.com/e/c1or2 Value of p1 for s1-20
-http://example.com/e/s2-30 http://example.com/e/c2-30 Value of p1 for s2-30
-http://example.com/e/s2-30 http://example.com/e/c2 Value of p1 for s2-30
-http://example.com/e/s2-30 http://example.com/e/c1or2 Value of p1 for s2-30
-http://example.com/e/s2-40 http://example.com/e/c2-40 Value of p1 for s2-40
-http://example.com/e/s2-40 http://example.com/e/c2 Value of p1 for s2-40
-http://example.com/e/s2-40 http://example.com/e/c1or2 Value of p1 for s2-40
-http://example.com/e/s2 http://example.com/e/c2 Value of p1 for s2
-http://example.com/e/s2 http://example.com/e/c1or2 Value of p1 for s2
-
-16 Rows. -- 0 msec.
-]]></programlisting>
-
- <para>Example links against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URLs:</para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E++%0D%0APREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+*+FROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{+%0D%0A++++%3Fs+a+%3Ft+%3B+%0D%0A+++++e%3Ap1+%3Fo+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View results page</ulink></listitem>
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=DEFINE+input%3Ainference+%3Chttp%3A%2F%2Fexample.com%2F2%2Fowl%3E++%0D%0APREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+*+FROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{+%0D%0A++++%3Fs+a+%3Ft+%3B+%0D%0A+++++e%3Ap1+%3Fo+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View editor page</ulink></listitem>
- </itemizedlist>
-
-
- <para>Transitive queries are convenient as SPARQL 1.1 "predicate+" equivalent. The equivalent of
- "predicate*" requires the use of a union:</para>
-
-<programlisting><![CDATA[
-SQL>SPARQL PREFIX e:<http://example.com/e/>
-SELECT ?item
-FROM <http://example.com/2/data>
-WHERE
- {
- {
- ?lists rdf:_1 ?node
- }
- UNION
- {
- ?lists rdf:_1 ?l .
- ?l rdf:rest ?node option (transitive) .
- }
- ?node rdf:first ?item
- }
-
-item
-VARCHAR
-_______________________________________________________________________________
-
-http://example.com/e/list1-item1
-http://example.com/e/list1-item2
-http://example.com/e/list1-item3
-
-3 Rows. -- 0 msec.
-]]></programlisting>
-
- <para>Example links against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URLs:</para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=PREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+%3Fitem+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_1+%3Fnode+%0D%0A++++}%0D%0A++++UNION%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_1+%3Fl+.%0D%0A++++++%3Fl+rdf%3Arest+%3Fnode+option+%28transitive%29+.+%0D%0A++++}%0D%0A++++%3Fnode+rdf%3Afirst+%3Fitem+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View results page</ulink></listitem>
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=PREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+%3Fitem+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_1+%3Fnode+%0D%0A++++}%0D%0A++++UNION%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_1+%3Fl+.%0D%0A++++++%3Fl+rdf%3Arest+%3Fnode+option+%28transitive%29+.+%0D%0A++++}%0D%0A++++%3Fnode+rdf%3Afirst+%3Fitem+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View editor page</ulink></listitem>
- </itemizedlist>
-
-
-<programlisting><![CDATA[
-SQL> SPARQL PREFIX e:<http://example.com/e/>
-SELECT ?p ?o
-FROM <http://example.com/2/data>
-WHERE
- {
- {
- ?lists rdf:_2 ?node
- }
- UNION
- {
- ?lists rdf:_2 ?l .
- ?l rdf:rest ?node option (transitive) .
- }
- ?node rdf:first ?item .
- ?item ?p ?o
- }
-
-p o
-VARCHAR VARCHAR
-________________________
-
-http://example.com/e/p2 Value of p2 of item1 of list2
-http://example.com/e/p3 Value of p3 of item1 of list2
-http://example.com/e/p2 Value of p2 of item2 of list2
-http://example.com/e/p3 Value of p3 of item2 of list2
-http://example.com/e/p2 Value of p2 of item3 of list2
-http://example.com/e/p3 Value of p3 of item3 of list2
-
-6 Rows. -- 0 msec.
-]]></programlisting>
-
-
- <para>Example links against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URLs:</para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=PREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+%3Fp+%3Fo+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_2+%3Fnode+%0D%0A++++}%0D%0A++++UNION%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_2+%3Fl+.%0D%0A++++++%3Fl+rdf%3Arest+%3Fnode+option+%28transitive%29+.+%0D%0A++++}%0D%0A++++%3Fnode+rdf%3Afirst+%3Fitem+.%0D%0A++++%3Fitem+%3Fp+%3Fo+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View results page</ulink></listitem>
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=PREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+%3Fp+%3Fo+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_2+%3Fnode+%0D%0A++++}%0D%0A++++UNION%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_2+%3Fl+.%0D%0A++++++%3Fl+rdf%3Arest+%3Fnode+option+%28transitive%29+.+%0D%0A++++}%0D%0A++++%3Fnode+rdf%3Afirst+%3Fitem+.%0D%0A++++%3Fitem+%3Fp+%3Fo+%0D%0A++}&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View editor page</ulink></listitem>
- </itemizedlist>
-
-
- <para>Note that the result set can be in order of items in the list, but it don't have to.
- If the order should be preserved, then fix the direction of transitive scan, get step number as a
- variable, order by that variable.</para>
-
-<programlisting><![CDATA[
--- Line 82:
-SQL> SPARQL PREFIX e:<http://example.com/e/>
-SELECT ?p ?o bif:coalesce(?step_no, 0)
-FROM <http://example.com/2/data>
-WHERE
- {
- {
- ?lists rdf:_2 ?node
- }
- UNION
- {
- ?lists rdf:_2 ?l .
- ?l rdf:rest ?node OPTION (transitive, t_direction 1, t_step("step_no") as ?step_no) .
- }
- ?node rdf:first ?item .
- ?item ?p ?o
- }
-ORDER BY ASC (?step_no)
-
-p o callret-2
-VARCHAR VARCHAR VARCHAR
-________________________
-
-http://example.com/e/p2 Value of p2 of item1 of list2 0
-http://example.com/e/p3 Value of p3 of item1 of list2 0
-http://example.com/e/p2 Value of p2 of item2 of list2 1
-http://example.com/e/p3 Value of p3 of item2 of list2 1
-http://example.com/e/p2 Value of p2 of item3 of list2 2
-http://example.com/e/p3 Value of p3 of item3 of list2 2
-
-6 Rows. -- 7 msec.
-]]></programlisting>
-
-
- <para>Example links against <ulink url="http://demo.openlinksw.com/sparql">Virtuoso Demo Server SPARQL Endpoint</ulink> with SPARQl Protocol URLs:</para>
- <itemizedlist mark="bullet">
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&query=PREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+%3Fp+%3Fo+bif%3Acoalesce%28%3Fstep_no%2C+0%29+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_2+%3Fnode+%0D%0A++++}%0D%0A++++UNION%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_2+%3Fl+.%0D%0A++++++%3Fl+rdf%3Arest+%3Fnode+OPTION+%28transitive%2C+t_direction+1%2C+t_step%28%22step_no%22%29+as+%3Fstep_no%29+.+%0D%0A++++}%0D%0A++++%3Fnode+rdf%3Afirst+%3Fitem+.%0D%0A++++%3Fitem+%3Fp+%3Fo+%0D%0A++}+%0D%0AORDER+BY+ASC+%28%3Fstep_no%29%0D%0A&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View results page</ulink></listitem>
- <listitem><ulink url="http://demo.openlinksw.com/sparql?default-graph-uri=&qtxt=PREFIX+e%3A%3Chttp%3A%2F%2Fexample.com%2Fe%2F%3E%0D%0ASELECT+%3Fp+%3Fo+bif%3Acoalesce%28%3Fstep_no%2C+0%29+%0D%0AFROM+%3Chttp%3A%2F%2Fexample.com%2F2%2Fdata%3E++%0D%0AWHERE+%0D%0A++{%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_2+%3Fnode+%0D%0A++++}%0D%0A++++UNION%0D%0A++++{+%0D%0A++++++%3Flists+rdf%3A_2+%3Fl+.%0D%0A++++++%3Fl+rdf%3Arest+%3Fnode+OPTION+%28transitive%2C+t_direction+1%2C+t_step%28%22step_no%22%29+as+%3Fstep_no%29+.+%0D%0A++++}%0D%0A++++%3Fnode+rdf%3Afirst+%3Fitem+.%0D%0A++++%3Fitem+%3Fp+%3Fo+%0D%0A++}+%0D%0AORDER+BY+ASC+%28%3Fstep_no%29%0D%0A&should-sponge=&format=text%2Fhtml&CXML_redir_for_subjs=121&CXML_redir_for_hrefs=&timeout=0&debug=on">View editor page</ulink></listitem>
- </itemizedlist>
-
-
</sect2>
<sect2 id="rdfsameas"><title>OWL sameAs Support</title>
<para>
@@ -19676,7 +18936,7 @@ will provide meaningful queries. If no graph names are specified then the query
preset graph because this will give the compiler some more indexes to choose from -- indexes that begin
with G.</para>
<para>Sometimes web service endpoint is used to access data of only one application, not all data in the
-system. In that case one may wish to declare a separate storage that consists of only Linked Data Views made
+system. In that case one may wish to declare a separate storage that consists of only RDF Views made
by that application and define <emphasis>input:storage</emphasis> in appropriate row of
<emphasis>DB.DBA.SYS_SPARQL_HOST</emphasis>.</para>
</sect2>
@@ -19946,7 +19206,7 @@ SQL>dump_one_graph ('http://daas.openlinksw.com/data#', './bbc_data_', 100000000
SQL>dump_one_graph ('http://daas.openlinksw.com/data#', './bbc_data_');
</sect3>
</sect2>
-<sect2 id="rdfperfdumpandreloadgraphsn3"><title>Dump Linked Data View Graph to n3</title>
+<sect2 id="rdfperfdumpandreloadgraphsn3"><title>Dump RDF View Graph to n3</title>
<para>The RDF_QM_TREE_DUMP procedure and its associated procedures below are used
for dumping one or more RDFView Graphs in a Virtuoso server to a set of
turtle ttl dataset files in the specified dump directory. The dump generation
@@ -19973,7 +19233,7 @@ a Virtuoso RDF QUAD store.
<listitem><code>in</code> <emphasis>dest_dir</emphasis> <code>VARCHAR</code> - dump directory </listitem>
<listitem><code>in</code> <emphasis>graph_iri</emphasis> <code>VARCHAR</code> - IRI of the graph to be dumped; triples from other graphs will be excluded. If NULL, then there's no restriction by graph.</listitem>
<listitem><code>in</code> <emphasis>storage</emphasis> <code>VARCHAR</code> - IRI of the quad map storage to use. NULL means use default storage.</listitem>
- <listitem><code>in</code> <emphasis>root</emphasis> <code>VARCHAR</code> - IRI of the quad map to use, e.g., an IRI of an Linked Data View (or its part). NULL means use all Linked Data Views of the storage (and the default mapping as well).</listitem>
+ <listitem><code>in</code> <emphasis>root</emphasis> <code>VARCHAR</code> - IRI of the quad map to use, e.g., an IRI of an RDF View (or its part). NULL means use all RDF Views of the storage (and the default mapping as well).</listitem>
</itemizedlist>
</sect3>
<sect3 id="rdfperfdumpandreloadgraphsn3code"><title>Procedure Code</title>
@@ -20347,14 +19607,14 @@ cl_exec ('checkpoint');
<listitem>Execute the file:
<programlisting><![CDATA[
--
--- $Id: rdfandsparql.xml,v 1.95.2.49 2012/03/14 14:12:40 source Exp $
+-- $Id: rdfandsparql.xml,v 1.95.2.47 2011/10/26 00:21:16 source Exp $
--
-- 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-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -21195,35 +20455,35 @@ if the patch can not be reverted then the result is "suspicious".
</sect3>
</sect2>
<sect2 id="rdb2rdftriggers"><title>RDB2RDF Triggers</title>
-<para>Linked Data Views have many advantages, if compared to static dumps of the database in RDF triples.
+<para>RDF Views have many advantages, if compared to static dumps of the database in RDF triples.
However, they does not solve few problems. First, inference is supported only for physically stored
- triples, so one had to chose between convenience of inference and convenience of Linked Data Views. Next,
+ triples, so one had to chose between convenience of inference and convenience of RDF Views. Next,
algorithms that selects triples with non-constant graphs and predicates tend to produce enormous
- texts of SQL queries if Linked Data Views are complicated enough. Finally, there may be a need in export
+ texts of SQL queries if RDF Views are complicated enough. Finally, there may be a need in export
of big and fresh static RDF dump but preparing this dump would take too much time via both RDF
Views and traditional methods.
</para>
-<para>The solution is set of triggers on source tables of an Linked Data View that edit parts of physical
- dump on each change of source data. Unlike Linked Data Views that cost nothing while not queried, these
+<para>The solution is set of triggers on source tables of an RDF View that edit parts of physical
+ dump on each change of source data. Unlike RDF Views that cost nothing while not queried, these
triggers add a significant overhead on any data manipulation on sources, continuously. To
- compensate this, the dump should be in an intensive use and not replaceable by Linked Data Views. In
+ compensate this, the dump should be in an intensive use and not replaceable by RDF Views. In
other cases, do not add these triggers.
</para>
<para>It is next to impossible to write such triggers by hands so a small API is provided to
- generate SQL texts from metadata of Linked Data Views.
+ generate SQL texts from metadata of RDF Views.
</para>
<para>First of all, views in an RDF storage does not work in full isolation from each other.
Some of them may partially disable others due to OPTION(EXCLUSIVE) and some may produce one
triple in different ways. As a result, triggers are not made on per-view basis. Instead, a
special RDF storage is introduced, namely virtrdf:SyncToQuads , all required triples are
- added to it and triggers are created for the whole storage. Typically an Linked Data View is created
+ added to it and triggers are created for the whole storage. Typically an RDF View is created
in some other storage, e.g., virtrdf:DefaultQuadStorage and then added to virtrdf:SyncToQuads via:
</para>
<programlisting><![CDATA[
sparql alter quad storage virtrdf:SyncToQuads {
create <my_rdf_view> using storage virtrdf:DefaultQuadStorage };
]]></programlisting>
-<para>The following example procedure copies all user-defined Linked Data Views from default quad storage
+<para>The following example procedure copies all user-defined RDF Views from default quad storage
to virtrdf:SyncToQuads:
</para>
<programlisting><![CDATA[
@@ -21242,10 +20502,10 @@ create procedure DB.DBA.RDB2RDF_COPY_ALL_RDF_VIEWS_TO_SYNC ()
</para>
<itemizedlist mark="bullet">
<listitem><link linkend="fn_sparql_rdb2rdf_list_tables">DB.DBA.SPARQL_RDB2RDF_LIST_TABLES</link>:
- The function returns a vector of names of tables that are used as sources for Linked Data Views. Application
+ The function returns a vector of names of tables that are used as sources for RDF Views. Application
developer should decide what to do with each of them - create triggers or do some application-specific
workarounds.
- <para>Note that if some SQL views are used as sources for Linked Data Views and these views does not have
+ <para>Note that if some SQL views are used as sources for RDF Views and these views does not have
INSTEAD triggers then workarounds become mandatory for them, not just a choice, because BEFORE
or AFTER triggers on views are not allowed if there is no appropriate INSTEAD trigger. The mode
argument should be zero in current version.
@@ -21255,7 +20515,7 @@ create procedure DB.DBA.RDB2RDF_COPY_ALL_RDF_VIEWS_TO_SYNC ()
function creates an SQL text for a given table and an operation specified by an opcode.
</listitem>
</itemizedlist>
-<para>In some cases, Linked Data Views are complicated enough so that BEFORE UPDATE and AFTER DELETE
+<para>In some cases, RDF Views are complicated enough so that BEFORE UPDATE and AFTER DELETE
triggers are required in additional to the minimal set. In this case, sparql_rdb2rdf_codegen
calls will return a vector of two string sessions, not single string session, and both sessions
are sql texts to inspect or execute. In this case, the BEFORE trigger will not delete obsolete
@@ -21320,7 +20580,7 @@ create procedure DB.DBA.RDB2RDF_PREPARE_TABLE (in dump_prefix varchar, in tbl va
}
;
--- This creates and loads all triggers, init procedure and debug dump related to all tables used by and Linked Data View.
+-- This creates and loads all triggers, init procedure and debug dump related to all tables used by and RDF View.
create procedure DB.DBA.RDB2RDF_PREPARE_ALL_TABLES (in dump_prefix varchar)
{
declare tbl_list any;
@@ -21332,7 +20592,7 @@ create procedure DB.DBA.RDB2RDF_PREPARE_ALL_TABLES (in dump_prefix varchar)
}
;
]]></programlisting>
-<para>The following combination of calls prepares all triggers for all Linked Data Views of the default storage:
+<para>The following combination of calls prepares all triggers for all RDF Views of the default storage:
</para>
<programlisting><![CDATA[
DB.DBA.RDB2RDF_COPY_ALL_RDF_VIEWS_TO_SYNC ();
diff --git a/docsrc/xmlsource/rdfviewssamples.xml b/docsrc/xmlsource/rdfviewssamples.xml
index 8bab858..6d31d00 100644
--- a/docsrc/xmlsource/rdfviewssamples.xml
+++ b/docsrc/xmlsource/rdfviewssamples.xml
@@ -1,18 +1,8 @@
<sect1 id="rdfviewsenterpr"><title>Examples of Linked Data Views</title>
-<sect2 id="rdfviewnorthwindexample1"><title>Simple Mapping Example -- Northwind Linked Data View</title>
-<para>Here is example of the basic Northwind Linked Data Views deployment. The sequence of operations is very common for adding SPARQL access to existing application.</para>
-<para>There exist few important questions to answer. Who should have access to data behind Linked Data View? Should someone have access to other sorts of RDF data but not to the new View? What are applications that should be interoperable with the new RDF data source? Are there any applications that produce similar data but that data sould be kept apart from data made by view? How to ensure that deployment the view will not cause problems for other applications?</para>
-<para>First of all, we decide whether the default web service endpoint should have access to the data
- in question. If it should then we have to grant SELECT privileges to the account "SPARQL" that is used
- for the default endpoint; if it should not but some custom edpoint should then grant to the owner
- account of that account. Granting access is less trivial that it is usual. On one hand, those who
- can make SQL SELECT statements on application's tables can also make SPARQL queries on Linked Data View
- over that tables, because it makes SQL inside. On the other hand, those who do not intend to query that
- data at all may get unexpected "permission denied" errors on queries that worked fine before
- adding an Linked Data View. If SPARQL compiler can not prove that the query can not access data from the view
- then it will generate SQL code that will access tables behind the view. In some cases permission
- problems should be resolved by creating Linked Data View in a separate
- <link linkend="rdfviewconfiguringrdfstorages">RDF storage</link>. In this example, data are public:</para>
+<sect2 id="rdfviewnorthwindexample1"><title>Simple Mapping Example -- Northwind RDF View</title>
+<para>Here is example of the basic Northwind RDF Views deployment. The sequence of operations is very common for adding SPARQL access to existing application.</para>
+<para>There exist few important questions to answer. Who should have access to data behind RDF View? Should someone have access to other sorts of RDF data but not to the new View? What are applications that should be interoperable with the new RDF data source? Are there any applications that produce similar data but that data sould be kept apart from data made by view? How to ensure that deployment the view will not cause problems for other applications?</para>
+<para>First of all, we decide whether the default web service endpoint should have access to the data in question. If it should then we have to grant SELECT privileges to the account "SPARQL" that is used for the default endpoint; if it should not but some custom edpoint should then grant to the owner account of that account. Granting access is less trivial that it is usual. On one hand, those who can make SQL SELECT statements on application's tables can also make SPARQL queries on RDF View over that tables, because it makes SQL inside. On the other hand, those who do not intend to query that data at all may get unexpected "permission denied" errors on queries that worked fine before adding an RDF View. If SPARQL compiler can not prove that the query can not access data from the view then it will generate SQL code that will access tables behind the view. In some cases permission problems should be resolved by creating RDF View in a separate <link linkend="rdfviewconfiguringrdfstorages">RDF storage</link>. In this example, data are public:</para>
<programlisting><![CDATA[
use DB;
@@ -56,7 +46,7 @@ access more than one installation of the application. If this is
the case, use some fixed graph IRI, not necessarily starting with
hostname at all; this is much more convenient for querying because you
don't have to calculate the graph name in each query. With fixed graph
-in use, it is still possible to clone the Linked Data View to map to a unique
+in use, it is still possible to clone the RDF View to map to a unique
graph as soon as the application become "public" and requires
merging data from many installations.</para></note>
@@ -468,9 +458,7 @@ where (^{orders.}^.ShipCountry = ^{countries.}^.Name)
}.
;
]]></programlisting>
-<para>The created Linked Data View is sufficient for querying relational data via SPARQL but not for
- accessing data by dereferencing IRIs of subjects. Making IRIs dereferenceable requires configuring
- HTTP server; that is explained in <link linkend="rdfsparqlexnpointnorthwindexample">second part of the example</link>.</para>
+<para>The created RDF View is sufficient for querying relational data via SPARQL but not for accessing data by dereferencing IRIs of subjects. Making IRIs dereferenceable requires configuring HTTP server; that is explained in <link linkend="rdfsparqlexnpointnorthwindexample">second part of the example</link>.</para>
</sect2>
<sect2 id="rdfviewsenterprbsm">
<title>BSBM to RDF</title>
@@ -2460,7 +2448,7 @@ WHERE
</sect2>
<sect2 id="rdfviewsbusintmbr">
<title>Musicbrainz to RDF</title>
-<para>The following code creates the Musicbrainz Linked Data Views Deployment and Demo Scripts:</para>
+<para>The following code creates the Musicbrainz RDF Views Deployment and Demo Scripts:</para>
<programlisting><![CDATA[
create text index on ZITGIST.MO.artist ("name") with key id;
create text index on ZITGIST.MO.artistalias ("name") with key id;
@@ -3364,7 +3352,7 @@ DB.DBA.XML_SET_NS_DECL ('mbz', 'http://musibrainz.org/schemas/mbz#', 2);
</sect2>
<sect2 id="rdfviewsbusintods">
<title>Virtuoso ODS to RDF</title>
-<para><emphasis>Linked Data View for ODS (the consolidated Graph)</emphasis></para>
+<para><emphasis>RDF View for ODS (the consolidated Graph)</emphasis></para>
<programlisting><![CDATA[
SPARQL drop quad map virtrdf:ODS_DS . ;
@@ -4888,10 +4876,5041 @@ DB.DBA.URLREWRITE_CREATE_RULELIST ('ods_rule_list1', 1,
DB.DBA.XML_SET_NS_DECL ('ods', 'http://www.openlinksw.com/virtuoso/ods/', 2);
]]></programlisting>
</sect2>
+<sect2 id="rdfviewsbusintoplweb">
+ <title>Oplweb to RDF</title>
+<programlisting><![CDATA[
+-- Setup script for RDF view of OpenLink Product Portfolio version 2
+--
+
+/*
+ * This view is currently designed to SPECIFICALLY load on data.openlinksw.com. We recommend you
+ * search for `openlinksw.com' (as `http://' is sometimes encoded) and replace with either the default
+ * URIQA macro or your own hostname as appropriate.
+ */
+
+-- views to get the codes out instead of the id's
+---- in hindsight these should ALL have been handled with
+---- proper IRI functions like the rest, oh well, no harm AFAIK
+---- will know for next time or might even replace this later.
+DROP VIEW oplweb2.oplweb.product_formats_categories;
+
+CREATE VIEW oplweb2.oplweb.product_formats_categories (
+ product_cat_code, product_cat_id, product_format_code, product_format_id, product_family_id
+ ) as
+SELECT distinct
+ pc.product_cat_code,
+ pc.product_cat_id,
+ pf.product_format_code,
+ pf.product_format_id,
+ pc.product_family_id
+FROM
+ oplweb2.oplweb.product_category pc,
+ oplweb2.oplweb.product_format pf,
+ oplweb2.oplweb.product p
+WHERE
+ p.product_cat_id = pc.product_cat_id and
+ p.product_format_id = pf.product_format_id
+ AND EXISTS (
+ SELECT 1 FROM oplweb2.oplweb.component_archive ca
+ WHERE ca.product_id = p.product_id
+ )
+;
+
+
+DROP VIEW oplweb2.oplweb.product_with_code;
+
+CREATE VIEW oplweb2.oplweb.product_with_code as
+ SELECT p.*, pc.product_cat_code, pf.product_format_code
+ FROM
+ oplweb2.oplweb.product_category pc,
+ oplweb2.oplweb.product_format pf,
+ oplweb2.oplweb.product p
+WHERE
+ p.product_cat_id = pc.product_cat_id and
+ p.product_format_id = pf.product_format_id ;
+
+
+DROP VIEW oplweb2.oplweb.product_category_with_code;
+
+CREATE VIEW oplweb2.oplweb.product_category_with_code as
+ SELECT pc.*, pf.product_family_code
+ from
+ oplweb2.oplweb.product_category pc,
+ oplweb2.oplweb.product_family pf
+where
+ pc.product_family_id = pf.product_family_id ;
+
+
+DROP VIEW oplweb2.oplweb.product_family_features_with_code;
+
+CREATE VIEW oplweb2.oplweb.product_family_features_with_code as
+ SELECT a.*, b.product_family_code
+ from
+ oplweb2.oplweb.product_family_features a,
+ oplweb2.oplweb.product_family b
+where
+ a.product_family_id = b.product_family_id
+;
+
+DROP VIEW oplweb2.oplweb.product_format_features_with_code;
+
+CREATE VIEW oplweb2.oplweb.product_format_features_with_code as
+ SELECT a.*, b.product_format_code
+ from
+ oplweb2.oplweb.product_format_features a,
+ oplweb2.oplweb.product_format b
+where
+ a.product_format_id = b.product_format_id
+;
+
+DROP VIEW oplweb2.oplweb.product_category_features_with_code;
+
+CREATE VIEW oplweb2.oplweb.product_category_features_with_code as
+ SELECT a.*, b.product_cat_code
+ from
+ oplweb2.oplweb.product_category_features a,
+ oplweb2.oplweb.product_category b
+where
+ a.product_cat_id = b.product_cat_id
+;
+
+DROP VIEW oplweb2.oplweb.components_for_rdfs;
+
+CREATE VIEW oplweb2.oplweb.components_for_rdfs as
+ SELECT *, cast(filesize as varchar) as str_filesize
+ from
+ oplweb2.oplweb.components
+;
+
+
+DROP VIEW oplweb2.oplweb.product_release_with_family;
+
+CREATE VIEW oplweb2.oplweb.product_release_with_family as
+ SELECT a.*, b.opsys_family_id, c.dbms_family_id
+ from
+ oplweb2.oplweb.product_release a,
+ oplweb2.oplweb.opsys b,
+ oplweb2.oplweb.dbms_engine c
+where
+ a.opsys_name = b.opsys_name and
+ a.dbms_name = c.dbms_name
+;
+
+drop view oplweb2.oplweb.archive_coverage_osdb;
+
+create view oplweb2.oplweb.archive_coverage_osdb as
+ SELECT distinct
+ pfam.product_family_id, pfam.product_family_code,
+ p.product_format_id, pf.product_format_code,
+ p.product_cat_id, pc.product_cat_code,
+ p.product_id,
+ ca.opsys_name,
+ os.opsys_family_id,
+ ca.dbms_name,
+ db.dbms_family_id,
+ pr.processor_name,
+ pr.processor_mode_id,
+ pr.processor_family_id
+ from
+ oplweb2.oplweb.product p
+ join oplweb2.oplweb.product_category pc on (p.product_cat_id = pc.product_cat_id)
+ join oplweb2.oplweb.product_format pf on (p.product_format_id = pf.product_format_id)
+ join oplweb2.oplweb.product_family pfam on (pc.product_family_id = pfam.product_family_id)
+ join oplweb2.oplweb.component_archive ca on (ca.product_id = p.product_id)
+ join oplweb2.oplweb.opsys os on (os.opsys_name = ca.opsys_name)
+ join oplweb2.oplweb.dbms_engine db on (db.dbms_name = ca.dbms_name)
+ join oplweb2.oplweb.processors pr on (pr.processor_name = os.processor_name and pr.processor_mode_id = os.processor_mode_id)
+;
+
+GRANT SELECT ON oplweb2.oplweb.component_archive TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.component_archive_type TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.component_category TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.component_mode TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.component_type TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.components TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.components_for_rdfs TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.dbms_engine TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.dbms_family TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.download_location TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.download_protocol TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.download_partner TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.opsys TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.opsys_family TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.opsys_type TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.processor_family TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.processor_mode TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.processors TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_benefits TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_benefits_category TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_category TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_category_with_code TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_category_features TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_family TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_family_features TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_features TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_format TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_format_features TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_feature_category TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_release TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_release_features TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.vendor_category TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.vendor_category_family TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.vendors TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_formats_categories TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_with_code TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_family_features_with_code TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_format_features_with_code TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_category_features_with_code TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.product_release_with_family TO "SPARQL", "SPARQL_UPDATE";
+GRANT SELECT ON oplweb2.oplweb.archive_coverage_osdb TO "SPARQL", "SPARQL_UPDATE";
+
+
+drop index oplweb2_product_price_format_cat;
+
+create index oplweb2_product_price_format_cat on oplweb2.oplweb.product_price(product_cat_id, product_format_id, product_price_type_id);
+
+drop index oplweb2_product_discount_format_cat;
+
+create index oplweb2_product_discount_format_cat on oplweb2.oplweb.product_general_discount(product_cat_id, product_format_id, product_price_type_id);
+
+
+drop view oplweb2.DBA.license_model_type;
+
+create view oplweb2.DBA.license_model_type (
+ product_release_id, product_cat_id, product_format_id, product_id, product_price_type_id
+ )
+ as
+ SELECT distinct
+ product_release_id,
+ pp.product_cat_id, pp.product_format_id, product_id,
+ product_price_type_id
+ FROM
+ oplweb2.oplweb.product_price pp,
+ oplweb2.oplweb.product p
+ WHERE p.product_cat_id = pp.product_cat_id AND
+ p.product_format_id = pp.product_format_id
+ ;
+
+grant SELECT on oplweb2.DBA.license_model_type to "SPARQL", "SPARQL_UPDATE";--, rdf;
+
+
+
+drop view oplweb2.DBA.license_model;
+
+create view oplweb2.DBA.license_model as
+ SELECT distinct
+ product_release_id,
+ pc.product_cat_id,
+ pc.product_format_id,
+ pc.product_cat_code,
+ pc.product_format_code,
+ pc.product_id,
+ pp.opsys_family_id, pp.dbms_family_id,
+ replace(oo.opsys_family_name, ' ', '') as opsys_family_name,
+ replace(dd.dbms_family_name, ' ', '') as dbms_family_name,
+ pp.opsys_type_id,
+ pp.product_price_type_id,
+ pp.product_price_unit_type_id
+ from
+ oplweb2.oplweb.product_price pp,
+ oplweb2.oplweb.product_with_code pc, --category pc,
+ --oplweb2.oplweb.product_format pf,
+ oplweb2.oplweb.opsys os,
+ oplweb2.oplweb.dbms_engine dbe,
+ oplweb2.oplweb.dbms_family dd,
+ oplweb2.oplweb.opsys_family oo
+ --oplweb2.oplweb.product p
+ where
+ pp.product_format_id = pc.product_format_id and
+ pp.product_cat_id = pc.product_cat_id and
+ pp.opsys_family_id = oo.opsys_family_id and
+ pp.dbms_family_id = dd.dbms_family_id
+ --p.product_cat_id = pc.product_cat_id and
+ --p.product_format_id = pf.product_format_id and
+ ;
+
+grant SELECT on oplweb2.DBA.license_model to "SPARQL", "SPARQL_UPDATE";--, rdf;
+
+
+drop view oplweb2.DBA.license_model_units;
+
+create view oplweb2.DBA.license_model_units as
+ SELECT distinct
+ lm1.product_release_id,
+ lm1.product_id,
+ lm1.opsys_family_
+ pp.opsys_family_id, pp.dbms_family_id,
+ replace(oo.opsys_family_name, ' ', '') as opsys_family_name,
+ replace(dd.dbms_family_name, ' ', '') as dbms_family_name,
+ pp.opsys_type_id, ot.short_description as opsys_type_code
+ from
+ oplweb2.oplweb.product_price pp,
+ oplweb2.oplweb.opsys_type ot,
+ oplweb2.oplweb.dbms_family dd,
+ oplweb2.oplweb.opsys_family oo
+ where
+ pp.opsys_type_id = ot.opsys_type_id and
+ pp.opsys_family_id = oo.opsys_family_id and
+ pp.dbms_family_id = dd.dbms_family_id
+ and
+ pp.product_release_id = '6.1'
+ ;
+
+grant SELECT on oplweb2.DBA.license_model_units to "SPARQL", "SPARQL_UPDATE";--, rdf;
+
+
+
+drop view oplweb2.DBA.product_general_discount_vc;
+
+create view oplweb2.DBA.product_general_discount_vc as
+ SELECT distinct
+ product_release_id,
+ pgd.product_cat_id, pc.product_cat_code,
+ pgd.product_format_id, pc.product_format_code,
+ pc.product_id,
+ pgd.opsys_family_id, pgd.dbms_family_id,
+ pgd.opsys_type_id,
+ product_discount_description,
+ product_price_type_id,
+ cast(unit_discount as varchar) as unit_discount,
+ discount_start,
+ discount_end,
+ discount_token
+ from
+ oplweb2.oplweb.product_general_discount pgd,
+ oplweb2.oplweb.product_with_code pc
+ where
+ pgd.product_format_id = pc.product_format_id and
+ pgd.product_cat_id = pc.product_cat_id
+ ;
+
+drop view oplweb2.DBA.product_price_varchar;
+
+create view oplweb2.DBA.product_price_varchar as
+ select
+ pp.product_price_id,
+ pp.product_release_id,
+ pp.product_cat_id, pc.product_cat_code,
+ pp.product_format_id, pf.product_format_code,
+ pp.opsys_family_id, pp.dbms_family_id,
+ replace(oo.opsys_family_name, ' ', '') as opsys_family_name,
+ replace(dd.dbms_family_name, ' ', '') as dbms_family_name,
+ pp.opsys_type_id, ot.short_description as opsys_type_code,
+ pp.product_price_type_id,
+ pp.product_price_unit_type_id, cast(pp.unit_price as varchar) as unit_price,
+ pp.component_archive_available
+ from
+ oplweb2.oplweb.product_price pp,
+ oplweb2.oplweb.product_category pc,
+ oplweb2.oplweb.product_format pf,
+ oplweb2.oplweb.opsys_type ot,
+ oplweb2.oplweb.dbms_family dd,
+ oplweb2.oplweb.opsys_family oo
+ where
+ pp.product_format_id = pf.product_format_id and
+ pp.product_cat_id = pc.product_cat_id and
+ pp.opsys_type_id = ot.opsys_type_id and
+ pp.opsys_family_id = oo.opsys_family_id and
+ pp.dbms_family_id = dd.dbms_family_id
+ --and
+ --pp.product_release_id = '6.1'
+ ;
+
+grant SELECT on oplweb2.oplweb.product_price to "SPARQL", "SPARQL_UPDATE";--, rdf;
+grant SELECT on oplweb2.oplweb.product_price_type to "SPARQL", "SPARQL_UPDATE";--, rdf;
+grant SELECT on oplweb2.oplweb.product_price_unit_type to "SPARQL", "SPARQL_UPDATE";--, rdf;
+grant SELECT on oplweb2.DBA.product_general_discount_vc to "SPARQL", "SPARQL_UPDATE";--, rdf;
+grant SELECT on oplweb2.DBA.product_price_varchar to "SPARQL", "SPARQL_UPDATE";--, rdf;
+grant SELECT on oplweb2.DBA.license_model_type to "SPARQL", "SPARQL_UPDATE";--, rdf;
+
+
+
+DB.DBA.RDF_AUDIT_METADATA (1, '*');
+--DB.DBA.RDF_AUDIT_METADATA (2, '*');
+
+--sparql drop graph <http://www.openlinksw.com/dataspace/organization/openlink/ProductPortfolioOntology/1.0/>;
+
+--possible previous graph now merging with this oplweb graph
+sparql drop graph <http://data.openlinksw.com/shop_pricing/>;
+
+--others that have a dependency on this graph that may need kicking first
+--sparql drop graph <http://data.openlinksw.com/customer/>;
+--sparql drop graph <http://data.openlinksw.com/support/>;
+--sparql drop graph <http://data.openlinksw.com/shop_pricing/>;
+
+SPARQL drop graph <http://www.openlinksw.com/schemas/oplweb#> ;
+
+SPARQL drop graph <http://www.openlinksw.com/dataspace/organization/openlink/oplweb#> ;
+SPARQL drop graph <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/> ;
+
+
+-- should now use <http://www.openlinksw.com/dataspace/organization/openlink#this>
+
+SPARQL drop quad map virtrdf:product_portfolio ;
+
+--only use this if you really really mean it, it will totally nuke your RDF data, useful on
+--test boxes in a bit of jam (hasn't happened to me for a while now)
+--rdf_global_reset();
+
+--utility for stripping url killing stuff from friendly strings used as ids
+create function oplweb2.oplweb.FIXUP4URI (in _string varchar)
+ returns varchar
+ {
+ declare _s varchar;
+ _s := replace (_string, ' ', '');
+ _s := replace (_s, '&', '_');
+ _s := replace (_s, '/', '');
+ return _s;
+ }
+ ;
+
+--URI-IRI mapping functions
+create function oplweb2.oplweb.DOWNLOAD_LOCATION_URI (in uri varchar)
+returns varchar
+{
+ return sprintf('http://data.openlinksw.com/oplweb/download_location/%s#this',
+ replace(uri, 'http://', ''));
+};
+
+create function oplweb2.oplweb.DOWNLOAD_LOCATION_URI_INVERSE (in dl_iri varchar)
+returns varchar
+{
+ declare parts any;
+
+ parts := sprintf_inverse(dl_iri,
+ 'http://data.openlinksw.com/oplweb/download_location/%s#this', 1);
+ if (parts is not null)
+ {
+ return sprintf('http://%s', parts[0]);
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.DOWNLOAD_LOCATION_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.DOWNLOAD_LOCATION_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.DBMS_FAMILY_URI (in _family_id integer)
+returns varchar
+{
+ declare _family_string varchar;
+ SELECT dbms_family_name into _family_string
+ FROM oplweb2.oplweb.dbms_family
+ WHERE dbms_family_id = _family_id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/dbms_family/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_family_string));
+};
+
+create function oplweb2.oplweb.DBMS_FAMILY_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _family_id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/dbms_family/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 dbms_family_id into _family_id FROM oplweb2.oplweb.dbms_family
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(dbms_family_name)) = lower(parts[0]);
+ return _family_id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.DBMS_FAMILY_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.DBMS_FAMILY_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.COMPONENT_CATEGORY_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.component_category
+ WHERE component_category_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/component_category/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.COMPONENT_CATEGORY_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/component_category/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 component_category_id into _id FROM oplweb2.oplweb.component_category
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.COMPONENT_CATEGORY_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.COMPONENT_CATEGORY_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.COMPONENT_MODE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.component_mode
+ WHERE component_mode_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/component_mode/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.COMPONENT_MODE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/component_mode/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 component_mode_id into _id FROM oplweb2.oplweb.component_mode
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.COMPONENT_MODE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.COMPONENT_MODE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.COMPONENT_TYPE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.component_type
+ WHERE component_type_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/component_type/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.COMPONENT_TYPE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/component_type/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 component_type_id into _id FROM oplweb2.oplweb.component_type
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.COMPONENT_TYPE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.COMPONENT_TYPE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+
+create function oplweb2.oplweb.COMPONENT_ARCHIVE_TYPE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT component_archive_short_name into _string
+ FROM oplweb2.oplweb.component_archive_type
+ WHERE component_archive_type_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/component_archive_type/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.COMPONENT_ARCHIVE_TYPE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/component_archive_type/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 component_archive_type_id into _id FROM oplweb2.oplweb.component_archive_type
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(component_archive_short_name)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.COMPONENT_ARCHIVE_TYPE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.COMPONENT_ARCHIVE_TYPE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+
+create function oplweb2.oplweb.FEATURE_BENEFIT_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT product_benefit_desc into _string
+ FROM oplweb2.oplweb.product_benefits
+ WHERE product_benefit_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/feature_benefit/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.FEATURE_BENEFIT_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/feature_benefit/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_benefit_id into _id FROM oplweb2.oplweb.product_benefits
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(product_benefit_desc)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.FEATURE_BENEFIT_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.FEATURE_BENEFIT_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+
+create function oplweb2.oplweb.OPSYS_FAMILY_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT opsys_family_name into _string
+ FROM oplweb2.oplweb.opsys_family
+ WHERE opsys_family_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/opsys_family/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.OPSYS_FAMILY_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/opsys_family/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 opsys_family_id into _id FROM oplweb2.oplweb.opsys_family
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(opsys_family_name)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.OPSYS_FAMILY_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.OPSYS_FAMILY_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+
+create function oplweb2.oplweb.OPSYS_TYPE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.opsys_type
+ WHERE opsys_type_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/opsys_type/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.OPSYS_TYPE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/opsys_type/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT TOP 1 opsys_type_id into _id FROM oplweb2.oplweb.opsys_type
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.OPSYS_TYPE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.OPSYS_TYPE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PROCESSOR_FAMILY_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT processor_family_name into _string
+ FROM oplweb2.oplweb.processor_family
+ WHERE processor_family_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/processor_family/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PROCESSOR_FAMILY_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/processor_family/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 processor_family_id into _id FROM oplweb2.oplweb.processor_family
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(processor_family_name)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PROCESSOR_FAMILY_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PROCESSOR_FAMILY_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+--FIXME might have to do something with possible & symbols
+create function oplweb2.oplweb.PROCESSOR_MODE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT processor_mode_name into _string
+ FROM oplweb2.oplweb.processor_mode
+ where processor_mode_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/processor_mode/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PROCESSOR_MODE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/processor_mode/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 processor_mode_id into _id FROM oplweb2.oplweb.processor_mode
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(processor_mode_name)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PROCESSOR_MODE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PROCESSOR_MODE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PRODUCT_CATEGORY_FEATURE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.product_category_features
+ WHERE product_category_feature_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/product_category_feature/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PRODUCT_CATEGORY_FEATURE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/product_category_feature/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_category_feature_id into _id FROM oplweb2.oplweb.product_category_features
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_CATEGORY_FEATURE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_CATEGORY_FEATURE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PRODUCT_FAMILY_FEATURE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.product_family_features
+ WHERE product_family_feature_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/product_family_feature/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PRODUCT_FAMILY_FEATURE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/product_family_feature/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_family_feature_id into _id FROM oplweb2.oplweb.product_family_features
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_FAMILY_FEATURE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_FAMILY_FEATURE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PRODUCT_FEATURE_CATEGORY_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_desc into _string
+ FROM oplweb2.oplweb.product_feature_category
+ WHERE product_feature_category_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/product_feature_category/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PRODUCT_FEATURE_CATEGORY_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/product_feature_category/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_feature_category_id into _id FROM oplweb2.oplweb.product_feature_category
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_desc)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_FEATURE_CATEGORY_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_FEATURE_CATEGORY_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PRODUCT_FEATURE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.product_features
+ WHERE product_feature_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/product_feature/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PRODUCT_FEATURE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/product_feature/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_feature_id into _id FROM oplweb2.oplweb.product_features
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_FEATURE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_FEATURE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PRODUCT_FORMAT_FEATURE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.product_format_features
+ WHERE product_format_feature_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/product_format_feature/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PRODUCT_FORMAT_FEATURE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/product_format_feature/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_format_feature_id into _id FROM oplweb2.oplweb.product_format_features
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_FORMAT_FEATURE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_FORMAT_FEATURE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PRODUCT_RELEASE_FEATURE_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT short_description into _string
+ FROM oplweb2.oplweb.product_release_features
+ WHERE product_release_feature_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/product_release_feature/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PRODUCT_RELEASE_FEATURE_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/product_release_feature/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_release_feature_id into _id FROM oplweb2.oplweb.product_release_features
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(short_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_RELEASE_FEATURE_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_RELEASE_FEATURE_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PRODUCT_BENEFIT_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT product_benefit_desc into _string
+ FROM oplweb2.oplweb.product_benefits
+ WHERE product_benefit_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/product_benefit/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PRODUCT_BENEFIT_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/product_benefit/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_benefit_id into _id FROM oplweb2.oplweb.product_benefits
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(product_benefit_desc)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_BENEFIT_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_BENEFIT_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.PRODUCT_BENEFIT_CATEGORY_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT description into _string
+ FROM oplweb2.oplweb.product_benefits_category
+ WHERE product_benefit_category_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/product_benefit_category/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.PRODUCT_BENEFIT_CATEGORY_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/product_benefit_category/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 product_benefit_category_id into _id FROM oplweb2.oplweb.product_benefits_category
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_BENEFIT_CATEGORY_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.PRODUCT_BENEFIT_CATEGORY_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.VENDOR_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT vendor_name into _string
+ FROM oplweb2.oplweb.vendors
+ where vendor_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/vendor/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.VENDOR_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/vendor/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 vendor_id into _id FROM oplweb2.oplweb.vendors
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(vendor_name)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.VENDOR_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.VENDOR_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.VENDOR_CATEGORY_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT vendor_category_description into _string
+ FROM oplweb2.oplweb.vendor_category
+ where vendor_category_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/vendor_category/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.VENDOR_CATEGORY_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/vendor_category/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 vendor_category_id into _id FROM oplweb2.oplweb.vendor_category
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(vendor_category_description)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.VENDOR_CATEGORY_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.VENDOR_CATEGORY_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.VENDOR_CATEGORY_FAMILY_URI (in _id integer)
+returns varchar
+{
+ declare _string varchar;
+ SELECT vendor_category_family_desc into _string
+ FROM oplweb2.oplweb.vendor_category_family
+ where vendor_category_family_id = _id ;
+
+ return sprintf('http://data.openlinksw.com/oplweb/vendor_category_family/%s#this',
+ oplweb2.oplweb.FIXUP4URI(_string));
+};
+
+create function oplweb2.oplweb.VENDOR_CATEGORY_FAMILY_URI_INVERSE (in _iri varchar)
+returns integer
+{
+ declare parts any;
+ declare _id integer;
+
+ parts := sprintf_inverse(_iri,
+ 'http://data.openlinksw.com/oplweb/vendor_category_family/%s#this', 1);
+ if (parts is not null)
+ {
+ declare exit handler for not found return null;
+ SELECT top 1 vendor_category_family_id into _id FROM oplweb2.oplweb.vendor_category_family
+ WHERE lower(oplweb2.oplweb.FIXUP4URI(vendor_category_family_desc)) = lower(parts[0]);
+ return _id;
+ }
+ return NULL;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.VENDOR_CATEGORY_FAMILY_URI TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON oplweb2.oplweb.VENDOR_CATEGORY_FAMILY_URI_INVERSE TO "SPARQL", "SPARQL_UPDATE";
+
+
+
+
+
+create function oplweb2.oplweb.LIT_PRODUCT_RELEASE_LABEL (
+ in _product_id varchar, in _id integer, in _opsys_name varchar, in _dbms_name varchar
+ )
+returns varchar
+{
+ declare _string varchar;
+ SELECT 'OpenLink ' || poduct_description || ' (Release ' || product_release_id || ') on ' || commercial_name into _string
+ FROM oplweb2.oplweb.product_release pr,
+ oplweb2.oplweb.product p,
+ oplweb2.oplweb.opsys o
+ where
+ p.product_id = pr.product_id and
+ o.opsys_name = pr.opsys_name and
+ pr.product_release_id = _id and
+ pr.product_id = _product_id and
+ pr.opsys_name = _opsys_name and
+ pr.dbms_name = _dbms_name ;
+
+ return _string;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LIT_PRODUCT_RELEASE_LABEL TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.LIT_FORMAT_CAT_LABEL (
+ in _format integer, in _cat integer
+ )
+returns varchar
+{
+ declare _string varchar;
+ SELECT top 1 'OpenLink ' || cast(product_format_description as varchar) || ' ' || cast(product_category_description as varchar) into _string
+ from
+ oplweb2.oplweb.product_formats_categories fc,
+ oplweb2.oplweb.product_format f,
+ oplweb2.oplweb.product_category c
+ where
+fc.product_format_id = f.product_format_id and
+fc.product_cat_id = c.product_cat_id and
+ fc.product_format_id = _format and
+ fc.product_cat_id = _cat;
+
+ return _string;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LIT_FORMAT_CAT_LABEL TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.LITRDF_openlink_logo (in _code varchar)
+returns varchar
+{
+ declare _string varchar;
+ SELECT top 1 product_family_logo_url into _string
+ FROM oplweb2.oplweb.product_family
+ WHERE product_family_code = _code;
+
+ return _string;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LITRDF_openlink_logo TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.LITRDF_homepage (in _code varchar)
+returns varchar
+{
+ declare _string varchar;
+ SELECT top 1 product_family_homepage into _string
+ FROM oplweb2.oplweb.product_family
+ WHERE product_family_code = _code;
+
+ return _string;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LITRDF_homepage TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.LITRDF_opsys_icon (in _id integer)
+returns varchar
+{
+ declare _string varchar; _string := '';
+ SELECT top 1 opsys_icon_name into _string
+ FROM oplweb2.oplweb.opsys_family
+ where opsys_family_id = _id;
+
+ _string := 'http://download.openlinksw.com/download/images/'||_string;
+
+ return _string;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LITRDF_opsys_icon TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.LITRDF_to_shop (
+ in release_id varchar,
+ in product_id varchar,
+ in opsys varchar,
+ in dbms varchar
+ )
+returns varchar
+{
+ declare _string varchar; _string := '';
+ declare _cat, _format, _prod varchar;
+
+ _prod := product_id;
+
+ SELECT top 1 cast(product_cat_id as varchar), cast(product_format_id as varchar)
+ into _cat, _format
+ FROM oplweb2.oplweb.product p
+ WHERE p.product_id = _prod;
+
+ _string := sprintf(
+ 'https://shop.openlinksw.com/?product_release_id=%s&product=%s&product_cat=%V&product_format=%V&os=%s&db=%s&buyme=yes',
+ release_id, product_id, _cat, _format, opsys, dbms
+ );
+
+ return _string;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LITRDF_to_shop TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.LITRDF_license_model_type (
+ in _product_price_type_id integer
+ )
+returns varchar
+{
+ declare _string varchar; _string := '';
+
+ SELECT top 1 product_price_type_description into _string FROM oplweb2.oplweb.product_price_type
+ WHERE product_price_type_id = _product_price_type_id;
+
+ return _string || ' License';
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LITRDF_license_model_type TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.LITRDF_license_model_explain (
+ in _product_price_type_id integer
+ )
+returns varchar
+{
+ declare _string varchar; _string := '';
+
+ SELECT top 1 product_price_type_long_description into _string FROM oplweb2.oplweb.product_price_type
+ WHERE product_price_type_id = _product_price_type_id;
+
+ return _string;
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LITRDF_license_model_explain TO "SPARQL", "SPARQL_UPDATE";
+
+
+create function oplweb2.oplweb.LITRDF_shop_sample (
+ in release_id varchar,
+ in product_id varchar,
+ in opsys varchar,
+ in dbms varchar
+ )
+returns varchar
+{
+ declare _string varchar; _string := '';
+ declare _cat, _format, _prod, _pricetype varchar;
+
+ _prod := product_id;
+
+ SELECT top 1 cast(product_cat_id as varchar), cast(product_format_id as varchar), cast(product_price_type_id as varchar)
+ into _cat, _format, _pricetype
+ FROM oplweb2.DBA.license_model p, oplweb2.oplweb.opsys o, oplweb2.oplweb.dbms_engine e
+ WHERE p.product_id = _prod and product_release_id = release_id and o.opsys_name = opsys and e.dbms_name = dbms
+ and p.dbms_family_id = e.dbms_family_id and o.opsys_family_id = p.opsys_family_id;
+
+ _string := sprintf(
+ 'https://shop.openlinksw.com/price_calc.vsp?release=%s&cat=%V&format=%V&os=%s&db=%s&lictype=%V',
+ release_id, _cat, _format, opsys, dbms, _pricetype
+ );
+
+ return http_client(_string);
+};
+
+GRANT EXECUTE ON oplweb2.oplweb.LITRDF_shop_sample TO "SPARQL", "SPARQL_UPDATE";
+
+
+-- $Id: rdfviewssamples.xml,v 1.1.2.2 2011/09/09 14:09:19 source Exp $
+-- Setup script for RDF view of OpenLink Product Portfolio version 2
+--
+
+--
+-- This view is currently designed to SPECIFICALLY load on data.openlinksw.com. The default URI macro has NOT
+-- been used here because it makes no sense on the target box which is actually my.usnet.private:8891 or
+-- something similar. If you want to use this view on another box, a simple search-replace should do the trick,
+-- but search-replace just`data.openlinksw.com' because http:// is sometimes encoded and you would miss it.
+--
+--
+
+
+
+SPARQL drop quad map virtrdf:product_portfolio2 ;
+SPARQL drop quad map virtrdf:product_portfolio ;
+
+SPARQL
+
+prefix opl: <http://www.openlinksw.com/schemas/oplweb#>
+
+drop iri class opl:DownloadLocation .
+drop iri class opl:ComponentCategory .
+drop iri class opl:Component .
+drop iri class opl:ComponentArchive .
+drop iri class opl:ComponentArchiveType .
+drop iri class opl:ComponentCategory .
+drop iri class opl:ComponentMode .
+drop iri class opl:ComponentType .
+drop iri class opl:DbmsEngine .
+drop iri class opl:DbmsFamily .
+drop iri class opl:DownloadProtocol .
+drop iri class opl:DownloadPartner .
+drop iri class opl:FeatureBenefit .
+drop iri class opl:Opsys .
+drop iri class opl:OpsysFamily .
+drop iri class opl:OpsysType .
+drop iri class opl:Processor .
+drop iri class opl:ProcessorFamily .
+drop iri class opl:ProcessorMode .
+drop iri class opl:ProductRelease .
+drop iri class opl:Product .
+drop iri class opl:ProductCategory .
+drop iri class opl:ProductCategoryFeature .
+drop iri class opl:ProductPortfolio .
+drop iri class opl:ProductFamily .
+drop iri class opl:ProductFamilyFeature .
+drop iri class opl:ProductFeatureCategory .
+drop iri class opl:ProductFeature .
+drop iri class opl:ProductFormat .
+drop iri class opl:ProductFormatCategory .
+drop iri class opl:ProductFormatFeature .
+drop iri class opl:ProductReleaseFeature .
+drop iri class opl:ProductBenefit .
+drop iri class opl:ProductBenefitCategory .
+drop iri class opl:Vendor .
+drop iri class opl:VendorCategory .
+drop iri class opl:VendorCategoryFamily .
+drop iri class opl:PriceType .
+drop iri class opl:PriceUnitType .
+drop iri class opl:PriceUnitIncrementalDiscount .
+drop iri class opl:ProductPrice .
+drop iri class opl:LicenseType .
+drop iri class opl:LicenseModel .
+drop iri class opl:LicenseClass .
+drop iri class opl:Discount .
+drop literal class opl:lit_product_release_label .
+drop literal class opl:lit_format_cat_label .
+drop literal class opl:lit_openlink_logo .
+drop iri class opl:lit_openlink_logo .
+drop literal class opl:lit_homepage .
+drop iri class opl:lit_homepage .
+drop literal class opl:lit_opsys_icon .
+drop iri class opl:lit_opsys_icon .
+drop literal class opl:lit_to_shop .
+drop iri class opl:lit_to_shop .
+drop literal class opl:lit_license_model_type .
+drop literal class opl:lit_license_model_explain .
+drop literal class opl:lit_shop_sample .
+drop literal class opl:lit_wikipedia_to_dbpedia .
+drop iri class opl:lit_wikipedia_to_dbpedia .
+drop literal class opl:lit_to_string .
+drop iri class opl:wwwsitefamily .
+drop iri class opl:wwwsiteformat .
+drop iri class opl:wwwsitecategory .
+drop iri class opl:wwwsiteproduct .
+;
+
+DB.DBA.RDF_AUDIT_METADATA (1, '*');
+
+
+SPARQL
+
+prefix opl: <http://www.openlinksw.com/schemas/oplweb#>
+
+create iri class opl:Component "http://data.openlinksw.com/oplweb/component/%s#this"
+ (in component_name varchar not null) .
+
+create iri class opl:ComponentArchive "http://data.openlinksw.com/oplweb/component_archive/%s#this"
+ (in component_archive_name varchar not null) .
+
+create iri class opl:ComponentArchiveType using
+ function oplweb2.oplweb.COMPONENT_CATEGORY_URI (in _id integer not null)
+ returns varchar,
+ function oplweb2.oplweb.COMPONENT_CATEGORY_URI_INVERSE (in _iri varchar)
+ returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/component_archive_type/%s#this' ).
+
+
+create iri class opl:ComponentCategory using
+ function oplweb2.oplweb.COMPONENT_CATEGORY_URI (in _id integer not null)
+ returns varchar,
+ function oplweb2.oplweb.COMPONENT_CATEGORY_URI_INVERSE (in _iri varchar)
+ returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/component_category/%s#this' ).
+
+create iri class opl:ComponentMode using
+ function oplweb2.oplweb.COMPONENT_MODE_URI (in _id integer not null)
+ returns varchar,
+ function oplweb2.oplweb.COMPONENT_MODE_URI_INVERSE (in _iri varchar)
+ returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/component_mode/%s#this' ).
+
+create iri class opl:ComponentType using
+ function oplweb2.oplweb.COMPONENT_TYPE_URI (in _id integer not null)
+ returns varchar,
+ function oplweb2.oplweb.COMPONENT_TYPE_URI_INVERSE (in _iri varchar)
+ returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/component_type/%s#this' ).
+
+create iri class opl:DbmsFamily using
+ function oplweb2.oplweb.DBMS_FAMILY_URI (in _family_id integer not null)
+ returns varchar,
+ function oplweb2.oplweb.DBMS_FAMILY_URI_INVERSE (in _iri varchar)
+ returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/dbms_family/%s#this' ).
+
+create iri class opl:DbmsEngine "http://data.openlinksw.com/oplweb/dbms_engine/%s#this"
+ (in dbms_name varchar not null) .
+
+create iri class opl:DownloadLocation using
+ function oplweb2.oplweb.DOWNLOAD_LOCATION_URI (in uri varchar not null)
+ returns varchar,
+ function oplweb2.oplweb.DOWNLOAD_LOCATION_URI_INVERSE (in dl_iri varchar)
+ returns varchar
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/download_location/%s#this' ).
+
+create iri class opl:DownloadProtocol "http://data.openlinksw.com/oplweb/download_protocol/%s#this"
+ (in protocol_name varchar not null) .
+
+create iri class opl:DownloadPartner "http://data.openlinksw.com/oplweb/download_partner/%s/%s#this"
+ (
+ in host_name varchar not null,
+ in domain_name varchar not null
+ ) .
+
+create iri class opl:FeatureBenefit using
+ function oplweb2.oplweb.FEATURE_BENEFIT_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.FEATURE_BENEFIT_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/feature_benefit/%s#this' ).
+
+create iri class opl:Opsys "http://data.openlinksw.com/oplweb/opsys/%s#this"
+ (in opsys_name varchar not null) .
+
+create iri class opl:OpsysFamily using
+ function oplweb2.oplweb.OPSYS_FAMILY_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.OPSYS_FAMILY_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/opsys_family/%s#this' ).
+
+create iri class opl:OpsysType using
+ function oplweb2.oplweb.OPSYS_TYPE_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.OPSYS_TYPE_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/opsys_type/%s#this' ).
+
+create iri class opl:Processor "http://data.openlinksw.com/oplweb/processor/%s/%d#this"
+ (in processor_name varchar not null, in processor_mode_id integer not null) .
+
+create iri class opl:ProcessorFamily using
+ function oplweb2.oplweb.PROCESSOR_FAMILY_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PROCESSOR_FAMILY_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/processor_family/%s#this' ).
+
+create iri class opl:ProcessorMode using
+ function oplweb2.oplweb.PROCESSOR_MODE_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PROCESSOR_MODE_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/processor_mode/%s#this' ).
+
+create iri class opl:Product "http://data.openlinksw.com/oplweb/product/%s#this"
+ (in product_id varchar not null) .
+
+create iri class opl:ProductCategory "http://data.openlinksw.com/oplweb/product_category/%s#this"
+ (in product_cat_code varchar not null) .
+
+create iri class opl:ProductCategoryFeature using
+ function oplweb2.oplweb.PRODUCT_CATEGORY_FEATURE_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PRODUCT_CATEGORY_FEATURE_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/product_category_feature/%s#this' ).
+
+create iri class opl:ProductPortfolio "http://data.openlinksw.com/oplweb/portfolio/%s#this"
+ (in x varchar not null) .
+
+create iri class opl:ProductFamily "http://data.openlinksw.com/oplweb/product_family/%s#this"
+ (in product_family_code varchar not null) .
+
+create iri class opl:ProductFamilyFeature using
+ function oplweb2.oplweb.PRODUCT_FAMILY_FEATURE_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PRODUCT_FAMILY_FEATURE_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/product_family_feature/%s#this' ).
+
+create iri class opl:ProductFeatureCategory using
+ function oplweb2.oplweb.PRODUCT_FEATURE_CATEGORY_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PRODUCT_FEATURE_CATEGORY_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/product_feature_category/%s#this' ).
+
+create iri class opl:ProductFeature using
+ function oplweb2.oplweb.PRODUCT_FEATURE_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PRODUCT_FEATURE_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/product_feature/%s#this' ).
+
+create iri class opl:ProductFormat "http://data.openlinksw.com/oplweb/product_format/%s#this"
+ (in product_format_code varchar not null) .
+
+create iri class opl:ProductFormatCategory "http://data.openlinksw.com/oplweb/product_format_category/%s/%s#this"
+ (in product_format_code varchar not null, in product_cat_code varchar not null) .
+
+create iri class opl:ProductFormatFeature using
+ function oplweb2.oplweb.PRODUCT_FORMAT_FEATURE_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PRODUCT_FORMAT_FEATURE_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/product_format_feature/%s#this' ).
+
+create iri class opl:ProductReleaseFeature using
+ function oplweb2.oplweb.PRODUCT_RELEASE_FEATURE_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PRODUCT_RELEASE_FEATURE_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/product_release_feature/%s#this' ).
+
+create iri class opl:ProductBenefit using
+ function oplweb2.oplweb.PRODUCT_BENEFIT_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PRODUCT_BENEFIT_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/product_benefit/%s#this' ).
+
+create iri class opl:ProductBenefitCategory using
+ function oplweb2.oplweb.PRODUCT_BENEFIT_CATEGORY_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.PRODUCT_BENEFIT_CATEGORY_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/product_benefit_category/%s#this' ).
+
+create iri class opl:ProductRelease "http://data.openlinksw.com/oplweb/product_release/%s/%s/%s/%s#this"
+ (
+ in product_id varchar not null,
+ in product_release_id varchar not null,
+ in opsys_name varchar not null,
+ in dbms_name varchar not null
+ ) .
+
+create iri class opl:Vendor using
+ function oplweb2.oplweb.VENDOR_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.VENDOR_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/vendor/%s#this' ).
+
+create iri class opl:VendorCategory using
+ function oplweb2.oplweb.VENDOR_CATEGORY_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.VENDOR_CATEGORY_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/vendor_category/%s#this' ).
+
+create iri class opl:VendorCategoryFamily using
+ function oplweb2.oplweb.VENDOR_CATEGORY_FAMILY_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.VENDOR_CATEGORY_FAMILY_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/vendor_category_family/%s#this' ).
+
+create iri class opl:PriceType "http://data.openlinksw.com/oplweb/price_type/%d#this"
+ (in product_price_type_id integer not null) .
+
+create iri class opl:LicenseType using
+ function oplweb2.oplweb.LICENSE_MODEL_TYPE_URI (in _id integer not null) returns varchar,
+ function oplweb2.oplweb.LICENSE_MODEL_TYPE_URI_INVERSE (in _iri varchar) returns integer
+ option (bijection, returns 'http://data.openlinksw.com/oplweb/license_type/%s#this' ).
+
+create iri class opl:PriceUnitType "http://data.openlinksw.com/oplweb/price_unit_type/%s_%s_%d_%d_%d_%s#this"
+ (
+ in product_release_id varchar not null,
+ in product_id varchar not null,
+ in opsys_family_id integer not null,
+ in dbms_family_id integer not null,
+ in product_price_type_id integer not null,
+ in product_price_unit_type_id varchar not null) .
+
+create iri class opl:PriceUnitIncrementalDiscount "http://data.openlinksw.com/oplweb/price_unit_discount/%s_%s_%d_%d_%d_%s#this"
+ (
+ in product_release_id varchar not null,
+ in product_id varchar not null,
+ in opsys_family_id integer not null,
+ in dbms_family_id integer not null,
+ in product_price_type_id integer not null,
+ in product_price_unit_type_id varchar not null) .
+
+create iri class opl:ProductPrice "http://data.openlinksw.com/oplweb/product_price/%d#this"
+ (in product_price_id integer not null) .
+
+
+create iri class opl:LicenseModel "http://data.openlinksw.com/oplweb/license_model/%s_%s_%d_%d_%d#this"
+ (
+ in product_release_id varchar not null,
+ in product_id varchar not null,
+ in opsys_family_id integer not null,
+ in dbms_family_id integer not null,
+ in product_price_type_id integer not null
+ ) .
+
+create iri class opl:Discount "http://data.openlinksw.com/oplweb/discount/%s/%d/%s/%d/%d/%d#this"
+ (
+ in product_release_id varchar not null,
+ in opsys_type_id integer not null,
+ in product_id varchar not null,
+ in opsys_family_id integer not null,
+ in dbms_family_id integer not null,
+ in product_price_type_id integer not null
+ ) .
+
+create iri class opl:wwwsitefamily "http://%s.openlinksw.com/"
+ (
+ in product_family_code varchar not null
+ ) .
+
+create iri class opl:wwwsitecategory "http://%s.openlinksw.com/%s/"
+ (
+ in product_family_code varchar not null,
+ in product_category_code varchar not null
+ ) .
+
+create iri class opl:wwwsiteformat "http://%s.openlinksw.com/%s/%s/"
+ (
+ in product_family_code varchar not null,
+ in product_category_code varchar not null,
+ in product_format_code varchar not null
+ ) .
+
+create iri class opl:Uri "%s"
+ ( in uri varchar not null
+ ) .
+
+create literal class opl:lit_product_release_label using
+ function oplweb2.oplweb.LIT_PRODUCT_RELEASE_LABEL(
+ in _product_id varchar, in _id integer, in _opsys_name varchar, in _dbms_name varchar
+ )
+ returns varchar .
+
+create literal class opl:lit_format_cat_label using
+ function oplweb2.oplweb.LIT_FORMAT_CAT_LABEL(
+ in _format integer, in _cat integer
+ )
+ returns varchar .
+
+create iri class opl:lit_openlink_logo using
+ function oplweb2.oplweb.LITRDF_openlink_logo(
+ in _code varchar
+ )
+ returns varchar .
+
+create iri class opl:lit_homepage using
+ function oplweb2.oplweb.LITRDF_homepage(
+ in _code varchar
+ )
+ returns varchar .
+
+create iri class opl:lit_opsys_icon using
+ function oplweb2.oplweb.LITRDF_opsys_icon(
+ in _id integer
+ )
+ returns varchar .
+
+create iri class opl:lit_to_shop using
+ function oplweb2.oplweb.LITRDF_to_shop(
+ in release_id varchar,
+ in product_id varchar,
+ in opsys varchar,
+ in dbms varchar
+ )
+ returns varchar .
+
+create literal class opl:lit_license_model_type using
+ function oplweb2.oplweb.LITRDF_license_model_type (
+ in _product_price_type_id integer
+ )
+ returns varchar .
+
+create literal class opl:lit_license_model_explain using
+ function oplweb2.oplweb.LITRDF_license_model_explain (
+ in _product_price_type_id integer
+ )
+ returns varchar .
+
+create literal class opl:lit_shop_sample using
+ function oplweb2.oplweb.LITRDF_shop_sample (
+ in release_id varchar,
+ in product_id varchar,
+ in opsys varchar,
+ in dbms varchar
+ )
+ returns varchar .
+
+create iri class opl:lit_wikipedia_to_dbpedia using
+ function oplweb2.oplweb.LITRDF_wikipedia_to_dbpedia (
+ in wikipedia_url varchar
+ )
+ returns varchar .
+
+create literal class opl:lit_to_string using
+ function oplweb2.oplweb.LITRDF_to_string (
+ in _s varchar
+ )
+ returns varchar .
+
+create iri class opl:wwwsiteproduct using
+ function oplweb2.oplweb.wwwsiteproduct_URI (in _id varchar not null) returns varchar,
+ function oplweb2.oplweb.wwwsiteproduct_URI_INVERSE (in _iri varchar) returns varchar
+ .
+
+
+make opl:ProductCategory subclass of opl:ProductFamily .
+make opl:Product subclass of opl:ProductCategory .
+make opl:Product subclass of opl:ProductFormat .
+make opl:ProductRelease subclass of opl:Product .
+make opl:Opsys subclass of opl:OpsysFamily .
+make opl:DbmsEngine subclass of opl:DbmsFamily .
+
+;
+
+
+
+DB.DBA.RDF_AUDIT_METADATA (1, '*');
+
+
+SPARQL
+prefix opl: <http://www.openlinksw.com/schemas/oplweb#>
+prefix dc: <http://purl.org/dc/terms#>
+prefix oplsioc: <http://www.openlinksw.com/schemas/oplsioc#>
+prefix sioc: <http://rdfs.org/sioc/ns#>
+prefix foaf: <http://xmlns.com/foaf/0.1/>
+prefix wgs: <http://www.w3.org/2003/01/geo/wgs84_pos#>
+prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+prefix oplds: <http://www.openlinksw.com/dataspace/organization/openlink#>
+prefix owl: <http://www.w3.org/2002/07/owl#>
+prefix umbel: <http://umbel.org/umbel/sc/>
+prefix gr: <http://purl.org/goodrelations/v1#>
+
+alter quad storage virtrdf:DefaultQuadStorage
+FROM oplweb2.oplweb.component_archive as component_archive_tbl
+FROM oplweb2.oplweb.component_archive_type as component_archive_type_tbl
+FROM oplweb2.oplweb.component_category as component_category_tbl text literal component_category_long_description
+FROM oplweb2.oplweb.component_mode as component_mode_tbl
+FROM oplweb2.oplweb.component_type as component_type_tbl
+FROM oplweb2.oplweb.components_for_rdfs as components_tbl
+FROM oplweb2.oplweb.dbms_engine as dbms_engine_tbl
+FROM oplweb2.oplweb.dbms_family as dbms_family_tbl
+FROM oplweb2.oplweb.download_location as download_location_tbl
+FROM oplweb2.oplweb.download_protocol as download_protocol_tbl
+FROM oplweb2.oplweb.download_partner as download_partner_tbl
+FROM oplweb2.oplweb.opsys as opsys_tbl
+FROM oplweb2.oplweb.opsys_family as opsys_family_tbl
+FROM oplweb2.oplweb.opsys_type as opsys_type_tbl
+FROM oplweb2.oplweb.processor_family as processor_family_tbl
+FROM oplweb2.oplweb.processor_mode as processor_mode_tbl
+FROM oplweb2.oplweb.processors as processors_tbl
+FROM oplweb2.oplweb.product as product_tbl text literal long_description
+FROM oplweb2.oplweb.product_benefits as product_benefits_tbl text literal product_benefit_explanation
+FROM oplweb2.oplweb.product_benefits_category as product_benefits_category_tbl
+FROM oplweb2.oplweb.product_category as product_category_tbl
+FROM oplweb2.oplweb.product_category_features_with_code as product_category_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_family as product_family_tbl
+FROM oplweb2.oplweb.product_family as product_family_tbl_2
+FROM oplweb2.oplweb.product_family_features_with_code as product_family_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_features as product_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_feature_category as product_feature_category_tbl text literal description
+FROM oplweb2.oplweb.product_format_features_with_code as product_format_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_release_features as product_release_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_release_with_family as product_release_tbl
+FROM oplweb2.oplweb.vendor_category as vendor_category_tbl
+FROM oplweb2.oplweb.vendor_category_family as vendor_category_family_tbl
+FROM oplweb2.oplweb.vendors as vendors_tbl
+FROM oplweb2.oplweb.product_formats_categories as product_formats_categories
+FROM oplweb2.oplweb.product_with_code as product_with_code
+FROM oplweb2.oplweb.product_category_with_code as product_category_with_code
+FROM oplweb2.oplweb.product_format as product_format_with_code
+FROM oplweb2.oplweb.product_price as pp
+FROM oplweb2.oplweb.product_price_type as pt
+FROM oplweb2.DBA.license_model_unit_type as put
+FROM oplweb2.DBA.license_model_unit_type as put2
+FROM oplweb2.DBA.license_model as lm
+FROM oplweb2.DBA.license_model as lm2
+FROM oplweb2.DBA.license_model_type as license_model_type_tbl
+FROM oplweb2.DBA.product_price_varchar as ppv
+FROM oplweb2.DBA.product_general_discount_vc as gd
+FROM oplweb2.oplweb.archive_coverage_osdb as ac1
+{
+ create virtrdf:product_portfolio as
+ graph <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ {
+ opl:ProductPortfolio(product_family_tbl.product_family_code)
+ a opl:ProductPortfolio
+ as virtrdf:OplProductPortfolio .
+
+ opl:ProductPortfolio(product_family_tbl.product_family_code) opl:hasProductFamilies
+ opl:ProductFamily(product_family_tbl.product_family_code)
+ as virtrdf:OplProductPortfolioProductFamily .
+
+ opl:ProductFamily(product_family_tbl.product_family_code)
+ a opl:ProductFamily
+ as virtrdf:OplProductFamily ;
+ rdfs:label product_family_tbl.product_family_description
+ as virtrdf:rdfsOplProductFamilyDescription ;
+ foaf:name product_family_tbl.product_family_description
+ as virtrdf:nameOplProductFamilyDescription ;
+ foaf:logo opl:lit_openlink_logo(product_family_tbl.product_family_code)
+ as virtrdf:logoOpenLinkSoftware ;
+ foaf:homepage opl:lit_homepage(product_family_tbl.product_family_code)
+ as virtrdf:homepageProductFamily ;
+ foaf:homepage opl:wwwsitefamily(product_family_tbl.product_family_code)
+# where (
+# ^{product_family_tbl.}^.product_family_code = 'uda'
+# )
+ as virtrdf:homepageProductFamilyUda ;
+ foaf:maker oplds:this
+ as virtrdf:OplDataspaceOpenLinkUri ;
+ owl:sameAs product_family_tbl.dbpedia_uri
+ as virtrdf:OplFamilyOwlSameAsDBPediaUri ;
+ opl:ProductFamilyCode product_family_tbl.product_family_code
+ as virtrdf:OplProductFamilyCode ;
+ opl:ProductFamilyDescription product_family_tbl.product_family_description
+ as virtrdf:OplProductFamilyDescription ;
+ dc:description opl:lit_to_string(product_family_tbl.long_description)
+ as virtrdf:OplProductFamilyLongDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy foaf: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy owl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ProductCategory(product_category_with_code.product_cat_code)
+ a opl:ProductCategory
+ as virtrdf:OplProductCategory ;
+ a opl:ProductFamily
+ as virtrdf:OplProductCategorySubClassOfProductFamily ;
+ rdfs:label product_category_with_code.product_category_description
+ as virtrdf:rdfsOplProductCategoryDescription ;
+ foaf:homepage opl:wwwsitecategory(product_category_with_code.product_family_code, product_category_with_code.product_cat_code)
+# where (
+# ^{product_category_with_code.}^.product_family_code = 'uda'
+# )
+ as virtrdf:homepageProductFamilyCategoryUda ;
+ opl:ProductCategoryCode product_category_with_code.product_cat_code
+ as virtrdf:OplProductCategoryCode ;
+ owl:sameAs product_category_with_code.dbpedia_uri
+ as virtrdf:OplCategoryOwlSameAsDBPediaUri ;
+ opl:hasFamily opl:ProductFamily(product_category_with_code.product_family_code)
+ as virtrdf:OplProductCategoryIsOfFamily ;
+ opl:ProductCategoryDescription product_category_with_code.product_category_description
+ as virtrdf:OplProductCategoryDescription ;
+ dc:description opl:lit_to_string(product_category_with_code.long_description)
+ as virtrdf:OplProductCategoryLongDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs: ;
+ rdfs:isDefinedBy foaf: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy owl:
+ .
+
+ opl:ProductFormat(product_format_with_code.product_format_code)
+ a opl:ProductFormat
+ as virtrdf:OplProductFormat ;
+ opl:ProductFormatCode product_format_with_code.product_format_code
+ as virtrdf:OplProductFormatCode ;
+ rdfs:label product_format_with_code.product_format_description
+ as virtrdf:rdfsOplProductFormatDescription ;
+ dc:description product_format_with_code.product_format_description
+ as virtrdf:OplProductFormatDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs: ;
+ rdfs:isDefinedBy dc:
+ .
+
+ opl:ProductFormatCategory(product_formats_categories.product_format_code, product_formats_categories.product_cat_code)
+ a opl:ProductFormatCategory
+ as virtrdf:OplProductFormatCategory ;
+ a opl:ProductFormat
+ as virtrdf:OplProductFormatCategoryProductFormat ;
+ a opl:ProductCategory
+ as virtrdf:OplProductFormatCategoryProductCategory ;
+ foaf:homepage opl:wwwsiteformat(product_category_with_code.product_family_code, product_formats_categories.product_cat_code, product_formats_categories.product_format_code)
+ where (
+ ^{product_category_with_code.}^.product_cat_code = ^{product_formats_categories.}^.product_cat_code
+# and
+# ^{product_category_with_code.}^.product_family_code = 'uda'
+ )
+ as virtrdf:homepageProductFamilyCategoryFormatUda ;
+ opl:ProductFormatCode product_formats_categories.product_format_code
+ as virtrdf:OplProductFormatCategoryFormatCode ;
+ opl:ProductCategoryCode product_formats_categories.product_cat_code
+ as virtrdf:OplProductFormatCategoryCategoryCode ;
+ opl:isProductCategory opl:ProductCategory(product_formats_categories.product_cat_code)
+ as virtrdf:OplProductFormatCategoryisCategory ;
+ opl:isProductFormat opl:ProductFormat(product_formats_categories.product_format_code)
+ as virtrdf:OplProductFormatCategoryisFormat ;
+ rdfs:label opl:lit_format_cat_label(product_formats_categories.product_format_id, product_formats_categories.product_cat_id)
+ as virtrdf:rdfsOplProductFormatCategoryDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy foaf: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ opl:ProductCategory(product_category_with_code.product_cat_code) opl:hasProduct
+ opl:Product(product_with_code.product_id)
+ where (^{product_with_code.}^.product_cat_id = ^{product_category_with_code.}^.product_cat_id)
+ as virtrdf:OplProductCategoryIsCategoryOfProduct .
+
+ opl:ProductFormat(product_format_with_code.product_format_code) opl:hasProduct
+ opl:Product(product_with_code.product_id)
+ where (^{product_with_code.}^.product_format_id = ^{product_format_with_code.}^.product_format_id)
+ as virtrdf:OplProductFormatIsFormatOfProduct .
+
+ opl:ProductFamily(product_family_tbl.product_family_code) opl:hasCategory
+ opl:ProductCategory(product_category_with_code.product_cat_code)
+ where (^{product_family_tbl.}^.product_family_id = ^{product_category_with_code.}^.product_family_id)
+ as virtrdf:OplProductFamilyIsFamilyOfProductCategory .
+
+ opl:ProductFamily(product_family_tbl.product_family_code) opl:hasFormat
+ opl:ProductFormat(product_formats_categories.product_format_code)
+ where (
+ ^{product_family_tbl.}^.product_family_id = ^{product_formats_categories.}^.product_family_id
+ )
+ as virtrdf:OplProductFamilyIsFamilyOfProductFormats .
+
+ opl:ProductFamily(product_family_tbl.product_family_code) opl:otherProductFamilies
+ opl:ProductFamily(product_family_tbl_2.product_family_code)
+ where (
+ ^{product_family_tbl.}^.product_family_id <> ^{product_family_tbl_2.}^.product_family_id
+ )
+ as virtrdf:OplProductFamilyHasOtherProductFamilies .
+
+ opl:ProductFormat(product_format_with_code.product_format_code) opl:hasCategory
+ opl:ProductFormatCategory(product_formats_categories.product_format_code, product_formats_categories.product_cat_code)
+ where (^{product_formats_categories.}^.product_format_id = ^{product_format_with_code.}^.product_format_id)
+ as virtrdf:OplProductFormatIsFormatOfProductFormatCategories .
+
+ opl:ProductFormatCategory(product_formats_categories.product_format_code, product_formats_categories.product_cat_code)
+ opl:hasProduct
+ opl:Product(product_with_code.product_id)
+ where (
+ ^{product_with_code.}^.product_cat_id = ^{product_formats_categories.}^.product_cat_id
+ and
+ ^{product_with_code.}^.product_format_id = ^{product_formats_categories.}^.product_format_id
+ )
+ as virtrdf:OplProductFormatCategoryIsFormatCategoryOfProduct .
+
+
+
+ opl:VendorCategoryFamily(vendor_category_family_tbl.vendor_category_family_id)
+ a opl:VendorCategoryFamily
+ as virtrdf:OplVendorCategoryFamily ;
+ opl:VendorCategoryFamilyDescription vendor_category_family_tbl.vendor_category_family_desc
+ as virtrdf:OplVendorCategoryFamilyDesc .
+
+
+ opl:VendorCategory(vendor_category_tbl.vendor_category_id)
+ a opl:VendorCategory
+ as virtrdf:OplVendorCategory ;
+ a opl:VendorCategoryFamily
+ as virtrdf:OplVendorCategorySubClassOfVendorCategoryFamily ;
+ rdfs:label vendor_category_tbl.vendor_category_description
+ as virtrdf:rdfsOplVendorCategoryDescription ;
+ opl:VendorCategoryDescription vendor_category_tbl.vendor_category_description
+ as virtrdf:OplVendorCategoryDescription ;
+ opl:isVendorCategoryOf opl:VendorCategoryFamily(vendor_category_tbl.vendor_category_family_id)
+ as virtrdf:OplVendorCategoryIsOfCategoryFamily ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:Vendor(vendors_tbl.vendor_id)
+ a opl:Vendor
+ as virtrdf:OplVendor ;
+ a opl:VendorCategory
+ as virtrdf:OplVendorSubClassOfVendorCategory ;
+ rdfs:label vendors_tbl.vendor_name
+ as virtrdf:rdfsOplVendorsName ;
+ opl:VendorName vendors_tbl.vendor_name
+ as virtrdf:OplVendorsName ;
+ opl:WikipediaPage opl:Uri(vendors_tbl.wikipedia_url)
+ as virtrdf:OplVendorsWikipediaUrl ;
+ owl:sameAs opl:lit_wikipedia_to_dbpedia(vendors_tbl.wikipedia_url)
+ as virtrdf:OplVendorsWikipediaUrlOwlSameAs ;
+ foaf:homepage opl:Uri(vendors_tbl.vendor_homepage)
+ as virtrdf:OplFoafVendorHomepage ;
+ opl:isOfVendorCategory opl:VendorCategory(vendors_tbl.vendor_category_id)
+ as virtrdf:OplVendorIsOfVendorCategory ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs: ;
+ rdfs:isDefinedBy foaf: ;
+ rdfs:isDefinedBy owl:
+ .
+
+ opl:VendorCategoryFamily(vendor_category_family_tbl.vendor_category_family_id)
+ opl:hasVendorCategory
+ opl:VendorCategory(vendor_category_tbl.vendor_category_id)
+ where (
+ ^{vendor_category_family_tbl.}^.vendor_category_family_id = ^{vendor_category_tbl.}^.vendor_category_family_id
+ )
+ as virtrdf:OplVendorCategoryFamilyHasVendorCategory .
+
+ opl:VendorCategory(vendor_category_tbl.vendor_category_id)
+ opl:hasVendorCategory
+ opl:Vendor(vendors_tbl.vendor_id)
+ where (
+ ^{vendor_category_tbl.}^.vendor_category_id = ^{vendors_tbl.}^.vendor_category_id
+ )
+ as virtrdf:OplVendorCategoryHasVendors .
+
+ opl:OpsysFamily(opsys_family_tbl.opsys_family_id)
+ a opl:OpsysFamily
+ as virtrdf:OplOpsysFamily ;
+ rdfs:label opsys_family_tbl.opsys_family_name
+ as virtrdf:rdfsOplOpsysFamilyName ;
+ opl:OpsysFamilyName opsys_family_tbl.opsys_family_name
+ as virtrdf:OplOpsysFamilyName ;
+ opl:OpsysFamilyLicenseCode opsys_family_tbl.opsys_license_code
+ as virtrdf:OplOpsysFamilyLicenseCode ;
+ opl:OpsysFamilyVendor opl:Vendor(opsys_family_tbl.vendor_id)
+ as virtrdf:OplOpsysFamilyVendor ;
+ opl:OpsysFamilyRating opsys_family_tbl.rating
+ as virtrdf:OplOpsysFamilyRating ;
+ foaf:logo opl:lit_opsys_icon(opsys_family_tbl.opsys_family_id)
+ as virtrdf:OplLogoOpsysFamily ;
+ foaf:homepage opl:Uri(opsys_family_tbl.wikipedia_url)
+ as virtrdf:FoafHomepageOpsysFamilyWikipediaUrl ;
+ owl:sameAs opl:lit_wikipedia_to_dbpedia(opsys_family_tbl.wikipedia_url)
+ as virtrdf:FoafHomepageOpsysFamilyPediaUrlOwlSameAs ;
+ opl:WikipediaPage opl:Uri(opsys_family_tbl.wikipedia_url)
+ as virtrdf:OplOpsysFamilyWikipediaUrl ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs: ;
+ rdfs:isDefinedBy foaf: ;
+ rdfs:isDefinedBy owl:
+ .
+
+ opl:OpsysFamily(opsys_family_tbl.opsys_family_id) opl:hasOpsys
+ opl:Opsys(opsys_tbl.opsys_name)
+ where (^{opsys_tbl.}^.opsys_family_id = ^{opsys_family_tbl.}^.opsys_family_id)
+ as virtrdf:OplOpsysFamilyIsOpsysFamilyOfOpsys .
+
+
+ opl:DbmsFamily(dbms_family_tbl.dbms_family_id)
+ a opl:DbmsFamily
+ as virtrdf:OplDbmsFamily ;
+ rdfs:label dbms_family_tbl.dbms_family_name
+ as virtrdf:rdfsOplDbmsFamilyName ;
+ opl:DbmsFamilyName dbms_family_tbl.dbms_family_name
+ as virtrdf:OplDbmsFamilyName ;
+ opl:DbmsFamilyVendor opl:Vendor(dbms_family_tbl.vendor_id)
+ as virtrdf:OplDbmsFamilyVendor ;
+ foaf:homepage opl:Uri(dbms_family_tbl.wikipedia_url)
+ as virtrdf:FoafHomepageDbmsFamilyWikipediaUrl ;
+ owl:sameAs opl:lit_wikipedia_to_dbpedia(dbms_family_tbl.wikipedia_url)
+ as virtrdf:OwnSameAsDbmsFamilyPediaUrl ;
+ opl:WikipediaPage opl:Uri(dbms_family_tbl.wikipedia_url)
+ as virtrdf:OplDbmsFamilyWikipediaUrl ;
+ opl:DbmsFamilyRating dbms_family_tbl.rating
+ as virtrdf:OplDbmsFamilyRating ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs: ;
+ rdfs:isDefinedBy foaf: ;
+ rdfs:isDefinedBy owl:
+ .
+
+ opl:DbmsEngine(dbms_engine_tbl.dbms_name)
+ a opl:DbmsEngine
+ as virtrdf:OplDbmsEngine ;
+ a opl:DbmsFamily
+ as virtrdf:DbmsEngineSubClassOfDbmsFamily ;
+ a umbel:RelationalDatabaseServerProgram
+ as virtrdf:DbmEngineSubClassOfUmbel ;
+ opl:isOfDbmsFamily opl:DbmsFamily(dbms_engine_tbl.dbms_family_id)
+ as virtrdf:OplDbmsEngineisOfDbmsFamily ;
+ rdfs:label dbms_engine_tbl.dbms_name
+ as virtrdf:rdfsOplLabelDbmsName ;
+ opl:DbmsEngineVersion dbms_engine_tbl.dbms_version
+ as virtrdf:OplDbmsEngineVersion ;
+ opl:DbmsEngineUpwardCompatible dbms_engine_tbl.upward_compatible
+ as virtrdf:OplDbmsEngineUpwardCompatible ;
+ opl:DbmsEngineDownwardCompatible dbms_engine_tbl.downward_compatible
+ as virtrdf:OplDbmsEngineDownwardCompatible ;
+ opl:DbmsEngineRating dbms_engine_tbl.rating
+ as virtrdf:OplDbmsEngineRating ;
+ opl:DbmsEngineOldArchiveCode dbms_engine_tbl.old_archive_code
+ as virtrdf:OplDbmsEngineOldArchiveCode ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ opl:DbmsFamily(dbms_family_tbl.dbms_family_id)
+ opl:hasDatabaseVersions
+ opl:DbmsEngine(dbms_engine_tbl.dbms_name)
+ where (
+ ^{dbms_family_tbl.}^.dbms_family_id = ^{dbms_engine_tbl.}^.dbms_family_id
+ )
+ as virtrdf:OplDbmsFamilyToDbms .
+
+
+ opl:OpsysType(opsys_type_tbl.opsys_type_id)
+ a opl:OpsysType
+ as virtrdf:OplOpsysType ;
+ rdfs:label opsys_type_tbl.opsys_type_description
+ as virtrdf:rdfsOplOpsysTypeDescription ;
+ opl:OpsysTypeDescription opsys_type_tbl.opsys_type_description
+ as virtrdf:OplOpsysTypeDescription ;
+ opl:OpsysTypeShortDescription opsys_type_tbl.short_description
+ as virtrdf:OplOpsysTypeShortDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ opl:OpsysType(opsys_type_tbl.opsys_type_id) opl:hasOpsys
+ opl:Opsys(opsys_tbl.opsys_name)
+ where (^{opsys_tbl.}^.opsys_type_id = ^{opsys_type_tbl.}^.opsys_type_id)
+ as virtrdf:OplOpsysTypeIsOpsysTypeOfOpsys .
+
+
+ opl:ProcessorMode(processor_mode_tbl.processor_mode_id)
+ a opl:ProcessorMode
+ as virtrdf:OplProcessorMode ;
+ opl:ProcessorModeName processor_mode_tbl.processor_mode_name
+ as virtrdf:OplProcessorModeName .
+
+ opl:Processor(processors_tbl.processor_name, processors_tbl.processor_mode_id)
+ a opl:Processor
+ as virtrdf:OplProcessor ;
+ opl:ProcessorName processors_tbl.processor_name
+ as virtrdf:OplProcessorName ;
+ opl:ProcessorVersion processors_tbl.processor_version
+ as virtrdf:OplProcessorVersion ;
+ rdfs:label processors_tbl.processor_description
+ as virtrdf:rdfsOplProcessorDescription ;
+ opl:ProcessorDescription processors_tbl.processor_description
+ as virtrdf:OplProcessorDescription ;
+ opl:ProcessorMode opl:ProcessorMode(processors_tbl.processor_mode_id)
+ as virtrdf:OplProcessorProcessorMode ;
+ opl:isOfProcessorFamily opl:ProcessorFamily(processors_tbl.processor_family_id)
+ as virtrdf:OplProcessorIsOfProcessorFamily ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ProcessorFamily(processor_family_tbl.processor_family_id)
+ a opl:ProcessorFamily
+ as virtrdf:OplProcessorFamily ;
+ opl:ProcessorFamilyName processor_family_tbl.processor_family_name
+ as virtrdf:OplProcessorFamilyName ;
+ opl:ProcessorFamilyVendor opl:Vendor(processor_family_tbl.vendor_id)
+ as virtrdf:OplProcessorFamilyVendor ;
+ foaf:homepage opl:Uri(processor_family_tbl.wikipedia_url)
+ as virtrdf:FoafHomepageProcessorFamilyWikipediaUrl ;
+ owl:sameAs opl:lit_wikipedia_to_dbpedia(processor_family_tbl.wikipedia_url)
+ as virtrdf:OwlSameAsProcessorFamilyPediaUrl ;
+ opl:WikipediaPage opl:Uri(processor_family_tbl.wikipedia_url)
+ as virtrdf:OplProcessorFamilyWikipediaUrl ;
+ rdfs:label processor_family_tbl.processor_family_description
+ as virtrdf:rdfsOplProcessorFamilyDescription ;
+ opl:ProcessorFamilyDescription processor_family_tbl.processor_family_description
+ as virtrdf:OplProcessorFamilyDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy foaf: ;
+ rdfs:isDefinedBy owl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:Opsys(opsys_tbl.opsys_name)
+ a opl:Opsys
+ as virtrdf:OplOpsys ;
+ a opl:OpsysFamily
+ as virtrdf:OpsysSubClassOfOplOpsysFamily ;
+ a umbel:OperatingSystem
+ as virtrdf:OpsysSubClassOfUmbelOpsys ;
+ opl:OpsysVersion opsys_tbl.opsys_version
+ as virtrdf:OplOpsysVersion ;
+ opl:OpsysUpwardCompatible opsys_tbl.upward_compatible
+ as virtrdf:OplOpsysUpwardCompatible ;
+ opl:OpsysDownwardCompatible opsys_tbl.downward_compatible
+ as virtrdf:OplOpsysDownwardCompatible ;
+ opl:OpsysSupported opsys_tbl.supported
+ as virtrdf:OplOpsysSupported ;
+ opl:OpsysLicenseCode opsys_tbl.opsys_license_code
+ as virtrdf:OplOpsysLicenseCode ;
+ rdfs:label opsys_tbl.commercial_name
+ as virtrdf:rdfsOplOpsysCommercialName ;
+ opl:OpsysCommercialName opsys_tbl.commercial_name
+ as virtrdf:OplOpsysCommercialName ;
+ opl:OpsysEmulationMode opl:ProcessorMode(opsys_tbl.emulation_mode_id)
+ as virtrdf:OplOpsysEmulationMode ;
+ opl:OpsysProcessor opl:Processor(opsys_tbl.processor_name, opsys_tbl.processor_mode_id)
+ as virtrdf:OplOpsysProcessor ;
+ opl:isOfOpsysFamily opl:OpsysFamily(opsys_tbl.opsys_family_id)
+ as virtrdf:OplOpsysIsOfOpsysFamily ;
+ opl:isOfOpsysType opl:OpsysType(opsys_tbl.opsys_type_id)
+ as virtrdf:OplOpsysIsOfOpsysType ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ opl:Product(product_with_code.product_id)
+ a opl:Product
+ as virtrdf:OplProduct ;
+ a opl:ProductFormat
+ as virtrdf:ProductSubClassOfProductFormat ;
+ a opl:ProductCategory
+ as virtrdf:ProductSubClassOfProductCategory ;
+ a opl:ProductFormatCategory
+ as virtrdf:OplProductProductFormatCategory ;
+ rdfs:label product_with_code.poduct_description
+ as virtrdf:rdfsOplProductDescription ;
+ foaf:homepage opl:wwwsiteproduct(product_with_code.product_id)
+ as virtrdf:homepageProductFamilyCategoryFormatProductUda ;
+ opl:ProductDescription product_with_code.poduct_description
+ as virtrdf:OplProductDescription ;
+ dc:description opl:lit_to_string(product_with_code.long_description)
+ as virtrdf:OplProductLongDescription ;
+ opl:isOfCategory opl:ProductCategory(product_with_code.product_cat_code)
+ as virtrdf:OplProductIsOfCategory ;
+ opl:isOfFormat opl:ProductFormat(product_with_code.product_format_code)
+ as virtrdf:OplProductIsOfFormat ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy foaf: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ opl:Product(product_with_code.product_id) opl:hasProductRelease
+ opl:ProductRelease(
+ product_release_tbl.product_id,
+ product_release_tbl.product_release_id,
+ product_release_tbl.opsys_name,
+ product_release_tbl.dbms_name
+ )
+ where (^{product_with_code.}^.product_id = ^{product_release_tbl.}^.product_id)
+ as virtrdf:OplProductIsProductOfProductRelease .
+
+
+
+ opl:ProductRelease(
+ product_release_tbl.product_id,
+ product_release_tbl.product_release_id,
+ product_release_tbl.opsys_name,
+ product_release_tbl.dbms_name
+ )
+ a opl:ProductRelease
+ as virtrdf:OplProductRelease ;
+ a opl:Product
+ as virtrdf:OplProductReleaseSubClassProduct ;
+ a gr:ProductOrService
+ as virtrdf:OplProductReleaseAgrProductOrService ;
+ rdfs:label opl:lit_product_release_label(
+ product_release_tbl.product_id,
+ product_release_tbl.product_release_id,
+ product_release_tbl.opsys_name,
+ product_release_tbl.dbms_name
+ )
+ as virtrdf:rdfsOplProductReleaseProductReleaseId ;
+ opl:ProductReleaseProductReleaseId product_release_tbl.product_release_id
+ as virtrdf:OplProductReleaseProductReleaseId ;
+ opl:isOfProduct opl:Product(product_release_tbl.product_id)
+ as virtrdf:OplProductReleaseIsOfProduct ;
+ opl:isForOpsys opl:Opsys(product_release_tbl.opsys_name)
+ as virtrdf:OplProductReleaseIsForOpsys ;
+ opl:isForDbmsEngine opl:DbmsEngine(product_release_tbl.dbms_name)
+ as virtrdf:OplProductReleaseIsForDbmsEngine ;
+ opl:UpwardCompatible product_release_tbl.upward_compatible
+ as virtrdf:OplProductReleaseUpwardCompatible ;
+ opl:DownwardCompatible product_release_tbl.downward_compatible
+ as virtrdf:OplProductReleaseDownwardCompatible ;
+ opl:PurchaseInShop opl:lit_to_shop (
+ product_release_tbl.product_release_id,
+ product_release_tbl.product_id,
+ product_release_tbl.opsys_name,
+ product_release_tbl.dbms_name
+ )
+ as virtrdf:OplProductReleaseToShop ;
+ gr:hasBusinessFunction gr:Sell as virtrdf:grbusinessfunctionsell;
+ opl:Supported product_release_tbl.supported
+ as virtrdf:OplProductReleaseSupported ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy gr:
+ .
+
+ opl:ProductRelease(
+ product_release_tbl.product_id,
+ product_release_tbl.product_release_id,
+ product_release_tbl.opsys_name,
+ product_release_tbl.dbms_name
+ ) opl:hasComponentArchive
+ opl:ComponentArchive(component_archive_tbl.component_archive_name)
+ where (
+ ^{product_release_tbl.}^.product_id = ^{component_archive_tbl.}^.product_id and
+ ^{product_release_tbl.}^.product_release_id = ^{component_archive_tbl.}^.product_release_id and
+ ^{product_release_tbl.}^.opsys_name = ^{component_archive_tbl.}^.opsys_name and
+ ^{product_release_tbl.}^.dbms_name = ^{component_archive_tbl.}^.dbms_name
+ )
+ as virtrdf:OplProductReleaseIsProductReleaseOfComponentArchive .
+
+
+ opl:Component(components_tbl.component_name)
+ a opl:Component
+ as virtrdf:OplComponent ;
+ opl:isOfComponentCategory opl:ComponentCategory(components_tbl.component_category_id)
+ as virtrdf:OplComponentIsOfComponentCategory ;
+ opl:isOfComponentType opl:ComponentType(components_tbl.component_type_id)
+ as virtrdf:OplComponentIsOfComponentType ;
+ opl:isOfComponentMode opl:ComponentMode(components_tbl.component_mode_id)
+ as virtrdf:OplComponentIsOfComponentMode ;
+ opl:isForOpsys opl:Opsys(components_tbl.opsys_name)
+ as virtrdf:OplComponentIsForOpsys ;
+ opl:isForDbmsEngine opl:DbmsEngine(components_tbl.dbms_name)
+ as virtrdf:OplComponentIsForDbmsEngine ;
+ opl:ComponentCvsid components_tbl.component_cvsid
+ as virtrdf:OplComponentComponentCvsId ;
+ opl:ComponentBuildDate components_tbl.component_build_date
+ as virtrdf:OplComponentComponentBuildDate ;
+ opl:Notes components_tbl.notes
+ as virtrdf:OplComponentNotes ;
+ opl:BuildComments components_tbl.build_comments
+ as virtrdf:OplComponentBuildComments ;
+ opl:Filesize components_tbl.str_filesize
+ as virtrdf:OplComponentFilesize ;
+ rdfs:isDefinedBy opl:
+ .
+
+ opl:DbmsEngine (dbms_engine_tbl.dbms_name) opl:hasComponents
+ opl:Component(components_tbl.component_name)
+ where (^{components_tbl.}^.dbms_name = ^{dbms_engine_tbl.}^.dbms_name)
+ as virtrdf:OplDbmsEngineForComponents .
+
+ opl:Opsys (opsys_tbl.opsys_name) opl:hasComponents
+ opl:Component(components_tbl.component_name)
+ where (^{components_tbl.}^.opsys_name = ^{opsys_tbl.}^.opsys_name)
+ as virtrdf:OplOpsysForComponents .
+
+
+ opl:ComponentMode(component_mode_tbl.component_mode_id)
+ a opl:ComponentMode
+ as virtrdf:OplComponentMode ;
+ rdfs:label component_mode_tbl.component_mode_description
+ as virtrdf:rdfsOplComponentModeDescription ;
+ opl:ComponentModeDescription component_mode_tbl.component_mode_description
+ as virtrdf:OplComponentModeDescription ;
+ opl:ComponentModeShortDescription component_mode_tbl.short_description
+ as virtrdf:OplComponentModeShortDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ComponentType(component_type_tbl.component_type_id)
+ a opl:ComponentType
+ as virtrdf:OplComponentType ;
+ rdfs:label component_type_tbl.component_type_description
+ as virtrdf:rdfsOplComponentTypeDescription ;
+ opl:ComponentTypeDescription component_type_tbl.component_type_description
+ as virtrdf:OplComponentTypeDescription ;
+ opl:ComponentTypeShortDescription component_type_tbl.short_description
+ as virtrdf:OplComponentTypeShortDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ComponentCategory(component_category_tbl.component_category_id)
+ a opl:ComponentCategory
+ as virtrdf:OplComponentCategory ;
+ rdfs:label component_category_tbl.component_category_description
+ as virtrdf:rdfsOplComponentCategoryDescription ;
+ opl:ComponentCategoryDescription component_category_tbl.component_category_description
+ as virtrdf:OplComponentCategoryDescription ;
+ opl:ComponentCategoryShortDescription component_category_tbl.short_description
+ as virtrdf:OplComponentCategoryShortDescription ;
+ dc:description opl:lit_to_string(component_category_tbl.component_category_long_description)
+ as virtrdf:OplComponentCategoryLongDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ComponentArchive(component_archive_tbl.component_archive_name)
+ a opl:ComponentArchive
+ as virtrdf:OplComponentArchive ;
+ a opl:Component
+ as virtrdf:ComponentArchiveSubClassOfComponent ;
+ opl:ComponentArchiveName component_archive_tbl.component_archive_name
+ as virtrdf:OplComponentArchiveComponentArchiveName ;
+ rdfs:label component_archive_tbl.component_archive_name
+ as virtrdf:rdfsComponentArchiveComponentArchiveName ;
+ opl:ComponentArchiveType opl:ComponentArchiveType(component_archive_tbl.component_archive_type_id)
+ as virtrdf:ComponentArchiveComponentArchiveType ;
+ opl:isOfComponent opl:Component(component_archive_tbl.component_name)
+ as virtrdf:OplComponentArchiveIsOfComponent ;
+ opl:isOfProductRelease opl:ProductRelease(
+ component_archive_tbl.product_id,
+ component_archive_tbl.product_release_id,
+ component_archive_tbl.opsys_name,
+ component_archive_tbl.dbms_name
+ )
+ as virtrdf:OplComponentArchiveIsOfProductRelease ;
+ opl:AssemblyDate component_archive_tbl.assembly_date
+ as virtrdf:OplComponentArchiveAssemblyDate ;
+ opl:FileUri component_archive_tbl.file_uri
+ as virtrdf:OplComponentArchiveFileUri ;
+ opl:LicenseCode component_archive_tbl.license_code
+ as virtrdf:OplComponentArchiveLicenseCode ;
+ opl:ResFullPath component_archive_tbl.res_full_path
+ as virtrdf:OplComponentArchiveResFullPath ;
+ opl:ResName component_archive_tbl.res_name
+ as virtrdf:OplComponentArchiveResName ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ opl:ComponentArchiveType(component_archive_type_tbl.component_archive_type_id)
+ a opl:ComponentArchiveType
+ as virtrdf:OplComponentArchiveType ;
+ opl:ComponentArchiveShortName component_archive_type_tbl.component_archive_short_name
+ as virtrdf:OplComponentArchiveTypeComponentArchiveShortName ;
+ rdfs:label component_archive_type_tbl.component_archive_type_name
+ as virtrdf:rdfsOplComponentArchiveTypeComponentArchiveTypeName ;
+ opl:ComponentArchiveTypeName component_archive_type_tbl.component_archive_type_name
+ as virtrdf:OplComponentArchiveTypeComponentArchiveTypeName ;
+ opl:Extension component_archive_type_tbl.extension
+ as virtrdf:OplComponentArchiveTypeExtension ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ opl:DownloadLocation(download_location_tbl.uri)
+ a opl:DownloadLocation
+ as virtrdf:OplDownloadLocation ;
+ opl:isOfComponentArchive opl:ComponentArchive(download_location_tbl.component_archive_name)
+ as virtrdf:OplDownloadLocationIsOfComponentArchive ;
+ opl:hasDownloadProtocol opl:DownloadProtocol(download_location_tbl.protocol_name)
+ as virtrdf:DownloadLocationHasProtocolName ;
+ rdfs:label download_location_tbl.uri_old
+ as virtrdf:rdfsOplDownloadLocationLabel ;
+ opl:isOfProductRelease opl:ProductRelease(
+ download_location_tbl.product_id,
+ download_location_tbl.product_release_id,
+ download_location_tbl.opsys_name,
+ download_location_tbl.dbms_name
+ )
+ as virtrdf:OplDownloadLocationIsOfProductRelease ;
+ opl:Uri download_location_tbl.uri
+ as virtrdf:OplDownloadLocationUri ;
+ opl:UriOld download_location_tbl.uri_old
+ as virtrdf:OplDownloadLocationUriOld ;
+ opl:hasDownloadPartner opl:DownloadPartner(
+ download_location_tbl.host_name,
+ download_location_tbl.domain_name
+ )
+ as virtrdf:OplDownloadLocationHasDownloadPartner ;
+ opl:DomainName download_location_tbl.domain_name
+ as virtrdf:OplDownloadLocationDomainName ;
+ opl:HostName download_location_tbl.host_name
+ as virtrdf:OplDownloadLocationHostName ;
+ opl:ResName download_location_tbl.res_name
+ as virtrdf:OplDownloadLocationResName ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:DownloadProtocol(download_protocol_tbl.protocol_name)
+ a opl:DownloadProtocol
+ as virtrdf:OplDownloadProtocolProtocolName ;
+ opl:ProtocolDescription download_protocol_tbl.protocol_description
+ as virtrdf:OplDownloadProtocolProtocolDescription .
+
+ opl:DownloadPartner(
+ download_partner_tbl.host_name,
+ download_partner_tbl.domain_name
+ )
+ a opl:DownloadPartner
+ as virtrdf:OplDownloadPartner;
+ rdfs:label download_partner_tbl.partner_name
+ as virtrdf:rdfsOplDownloadPartnerPartnerNamelabel ;
+ opl:DownloadPartner download_partner_tbl.partner_name
+ as virtrdf:OplDownloadPartnerPartnerName ;
+ opl:PortNumber download_partner_tbl.port_number
+ as virtrdf:OplDownloadPartnerPortNumber ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ComponentArchive(component_archive_tbl.component_archive_name)
+ opl:hasDownloadLocation
+ opl:DownloadLocation(download_location_tbl.uri)
+ where (
+ ^{component_archive_tbl.}^.component_archive_name = ^{download_location_tbl.}^.component_archive_name
+ )
+ as virtrdf:OplComponentArchiveIsComponentArchiveOfDownloadLocation .
+
+ opl:DownloadLocation(download_location_tbl.uri)
+ opl:isDownloadLocationOf
+ opl:ComponentArchive(component_archive_tbl.component_archive_name)
+ where (
+ ^{download_location_tbl.}^.component_archive_name = ^{component_archive_tbl.}^.component_archive_name
+ )
+ as virtrdf:OplDownloadLocationIsDownloadLocationOfComponentArchive .
+
+
+#
+# Extra Peripheral family/cat/format/etc... to/from... dbfamily/opsysfamily/....
+# ==================================================================================
+
+
+# ---------------------> product_family
+
+# opl:ProductFamily(product_family_tbl.product_family_code)
+# opl:OperatingSystems
+# opl:Opsys(ac1.opsys_name)
+# where (
+# ^{product_family_tbl.}^.product_family_code = ^{ac1.}^.product_family_code
+# )
+# as virtrdf:OplProductFamilyToOpsys .
+
+ opl:ProductFamily(product_family_tbl.product_family_code)
+ opl:OperatingSystemsFamilies
+ opl:OpsysFamily(ac1.opsys_family_id)
+ where (
+ ^{product_family_tbl.}^.product_family_code = ^{ac1.}^.product_family_code
+ )
+ as virtrdf:OplProductFamilyToOpsysFamily .
+
+# opl:ProductFamily(product_family_tbl.product_family_code)
+# opl:Databases
+# opl:DbmsEngine(ac1.dbms_name)
+# where (
+# ^{product_family_tbl.}^.product_family_code = ^{ac1.}^.product_family_code
+# )
+# as virtrdf:OplProductFamilyToDbms .
+
+ opl:ProductFamily(product_family_tbl.product_family_code)
+ opl:DatabaseFamilies
+ opl:DbmsFamily(ac1.dbms_family_id)
+ where (
+ ^{product_family_tbl.}^.product_family_code = ^{ac1.}^.product_family_code
+ )
+ as virtrdf:OplProductFamilyToDbmsFamily .
+
+# opl:ProductFamily(product_family_tbl.product_family_code)
+# opl:Processors
+# opl:Processor(ac1.processor_name, ac1.processor_mode_id)
+# where (
+# ^{product_family_tbl.}^.product_family_code = ^{ac1.}^.product_family_code
+# )
+# as virtrdf:OplProductFamilyToProcessor .
+
+ opl:ProductFamily(product_family_tbl.product_family_code)
+ opl:ProcessorFamilies
+ opl:ProcessorFamily(ac1.processor_family_id)
+ where (
+ ^{product_family_tbl.}^.product_family_code = ^{ac1.}^.product_family_code
+ )
+ as virtrdf:OplProductFamilyToProcessorFamily .
+
+
+
+# ---------------------> product_format
+
+# opl:ProductFormat(product_format_with_code.product_format_code)
+# opl:OperatingSystems
+# opl:Opsys(ac1.opsys_name)
+# where (
+# ^{product_format_with_code.}^.product_format_code = ^{ac1.}^.product_format_code
+# )
+# as virtrdf:OplProductFormatToOpsys .
+
+ opl:ProductFormat(product_format_with_code.product_format_code)
+ opl:OperatingSystemsFamilies
+ opl:OpsysFamily(ac1.opsys_family_id)
+ where (
+ ^{product_format_with_code.}^.product_format_code = ^{ac1.}^.product_format_code
+ )
+ as virtrdf:OplProductFormatToOpsysFamily .
+
+# opl:ProductFormat(product_format_with_code.product_format_code)
+# opl:Databases
+# opl:DbmsEngine(ac1.dbms_name)
+# where (
+# ^{product_format_with_code.}^.product_format_code = ^{ac1.}^.product_format_code
+# )
+# as virtrdf:OplProductFormatToDbms .
+
+ opl:ProductFormat(product_format_with_code.product_format_code)
+ opl:DatabaseFamilies
+ opl:DbmsFamily(ac1.dbms_family_id)
+ where (
+ ^{product_format_with_code.}^.product_format_code = ^{ac1.}^.product_format_code
+ )
+ as virtrdf:OplProductFormatToDbmsFamily .
+
+ opl:ProductFormat(product_format_with_code.product_format_code)
+ opl:Processors
+ opl:Processor(ac1.processor_name, ac1.processor_mode_id)
+ where (
+ ^{product_format_with_code.}^.product_format_code = ^{ac1.}^.product_format_code
+ )
+ as virtrdf:OplProductFormatToProcessor .
+
+ opl:ProductFormat(product_format_with_code.product_format_code)
+ opl:ProcessorFamilies
+ opl:ProcessorFamily(ac1.processor_family_id)
+ where (
+ ^{product_format_with_code.}^.product_format_code = ^{ac1.}^.product_format_code
+ )
+ as virtrdf:OplProductFormatToProcessorFamily .
+
+
+
+# ---------------------> product_category
+
+# opl:ProductCategory(product_category_with_code.product_cat_code)
+# opl:OperatingSystems
+# opl:Opsys(ac1.opsys_name)
+# where (
+# ^{product_category_with_code.}^.product_cat_code = ^{ac1.}^.product_cat_code
+# )
+# as virtrdf:OplProductCatToOpsys .
+
+ opl:ProductCategory(product_category_with_code.product_cat_code)
+ opl:OperatingSystemsFamilies
+ opl:OpsysFamily(ac1.opsys_family_id)
+ where (
+ ^{product_category_with_code.}^.product_cat_code = ^{ac1.}^.product_cat_code
+ )
+ as virtrdf:OplProductCatToOpsysFamily .
+
+# opl:ProductCategory(product_category_with_code.product_cat_code)
+# opl:Databases
+# opl:DbmsEngine(ac1.dbms_name)
+# where (
+# ^{product_category_with_code.}^.product_cat_code = ^{ac1.}^.product_cat_code
+# )
+# as virtrdf:OplProductCatToDbms .
+
+ opl:ProductCategory(product_category_with_code.product_cat_code)
+ opl:DatabaseFamilies
+ opl:DbmsFamily(ac1.dbms_family_id)
+ where (
+ ^{product_category_with_code.}^.product_cat_code = ^{ac1.}^.product_cat_code
+ )
+ as virtrdf:OplProductCatToDbmsFamily .
+
+# opl:ProductCategory(product_category_with_code.product_cat_code)
+# opl:Processors
+# opl:Processor(ac1.processor_name, ac1.processor_mode_id)
+# where (
+# ^{product_category_with_code.}^.product_cat_code = ^{ac1.}^.product_cat_code
+# )
+# as virtrdf:OplProductCatToProcessor .
+
+ opl:ProductCategory(product_category_with_code.product_cat_code)
+ opl:ProcessorFamilies
+ opl:ProcessorFamily(ac1.processor_family_id)
+ where (
+ ^{product_category_with_code.}^.product_cat_code = ^{ac1.}^.product_cat_code
+ )
+ as virtrdf:OplProductCatToProcessorFamily .
+
+
+
+
+# ---------------------> product
+
+ opl:Product(product_with_code.product_id)
+ opl:OperatingSystems
+ opl:Opsys(ac1.opsys_name)
+ where (
+ ^{product_with_code.}^.product_id = ^{ac1.}^.product_id
+ )
+ as virtrdf:OplProductToOpsys .
+
+ opl:Product(product_with_code.product_id)
+ opl:OperatingSystemsFamilies
+ opl:OpsysFamily(ac1.opsys_family_id)
+ where (
+ ^{product_with_code.}^.product_id = ^{ac1.}^.product_id
+ )
+ as virtrdf:OplProductToOpsysFamily .
+
+ opl:Product(product_with_code.product_id)
+ opl:Databases
+ opl:DbmsEngine(ac1.dbms_name)
+ where (
+ ^{product_with_code.}^.product_id = ^{ac1.}^.product_id
+ )
+ as virtrdf:OplProductToDbms .
+
+ opl:Product(product_with_code.product_id)
+ opl:DatabaseFamilies
+ opl:DbmsFamily(ac1.dbms_family_id)
+ where (
+ ^{product_with_code.}^.product_id = ^{ac1.}^.product_id
+ )
+ as virtrdf:OplProductToDbmsFamily .
+
+ opl:Product(product_with_code.product_id)
+ opl:Processors
+ opl:Processor(ac1.processor_name, ac1.processor_mode_id)
+ where (
+ ^{product_with_code.}^.product_id = ^{ac1.}^.product_id
+ )
+ as virtrdf:OplProductToProcessor .
+
+ opl:Product(product_with_code.product_id)
+ opl:ProcessorFamilies
+ opl:ProcessorFamily(ac1.processor_family_id)
+ where (
+ ^{product_with_code.}^.product_id = ^{ac1.}^.product_id
+ )
+ as virtrdf:OplProductToProcessorFamily .
+
+
+
+
+# ---------------------> to product
+
+ opl:Opsys(opsys_tbl.opsys_name)
+ opl:hasProducts
+ opl:Product(ac1.product_id)
+ where (
+ ^{opsys_tbl.}^.opsys_name = ^{ac1.}^.opsys_name
+ )
+ as virtrdf:OplOpsysToProduct .
+
+ opl:OpsysFamily(opsys_family_tbl.opsys_family_id)
+ opl:hasProducts
+ opl:Product(ac1.product_id)
+ where (
+ ^{opsys_family_tbl.}^.opsys_family_id = ^{ac1.}^.opsys_family_id
+ )
+ as virtrdf:OplOpsysFamilyToProduct .
+
+ opl:DbmsEngine(dbms_engine_tbl.dbms_name)
+ opl:hasProducts
+ opl:Product(ac1.product_id)
+ where (
+ ^{dbms_engine_tbl.}^.dbms_name = ^{ac1.}^.dbms_name
+ )
+ as virtrdf:OplDbmsToProduct .
+
+ opl:DbmsFamily(dbms_family_tbl.dbms_family_id)
+ opl:hasProducts
+ opl:Product(ac1.product_id)
+ where (
+ ^{dbms_family_tbl.}^.dbms_family_id = ^{ac1.}^.dbms_family_id
+ )
+ as virtrdf:OplDbmsFamilyToProduct .
+
+ opl:Processor(processors_tbl.processor_name, processors_tbl.processor_mode_id)
+ opl:hasProducts
+ opl:Product(ac1.product_id)
+ where (
+ ^{processors_tbl.}^.processor_name = ^{ac1.}^.processor_name
+ and
+ ^{processors_tbl.}^.processor_mode_id = ^{ac1.}^.processor_mode_id
+ )
+ as virtrdf:OplProcessorToProduct .
+
+ opl:ProcessorFamily(processor_family_tbl.processor_family_id)
+ opl:hasProducts
+ opl:Product(ac1.product_id)
+ where (
+ ^{processor_family_tbl.}^.processor_family_id = ^{ac1.}^.processor_family_id
+ )
+ as virtrdf:OplProcessorFamilyProduct .
+
+
+
+
+# ---------------------> to product_cat
+
+# opl:Opsys(opsys_tbl.opsys_name)
+# opl:hasProductCategory
+# opl:ProductCategory(ac1.product_cat_code)
+# where (
+# ^{opsys_tbl.}^.opsys_name = ^{ac1.}^.opsys_name
+# )
+# as virtrdf:OplOpsysToProductCategory .
+
+ opl:OpsysFamily(opsys_family_tbl.opsys_family_id)
+ opl:hasProductCategory
+ opl:ProductCategory(ac1.product_cat_code)
+ where (
+ ^{opsys_family_tbl.}^.opsys_family_id = ^{ac1.}^.opsys_family_id
+ )
+ as virtrdf:OplOpsysFamilyToProductCategory .
+
+# opl:DbmsEngine(dbms_engine_tbl.dbms_name)
+# opl:hasProductCategory
+# opl:ProductCategory(ac1.product_cat_code)
+# where (
+# ^{dbms_engine_tbl.}^.dbms_name = ^{ac1.}^.dbms_name
+# )
+# as virtrdf:OplDbmsToProductCategory .
+
+ opl:DbmsFamily(dbms_family_tbl.dbms_family_id)
+ opl:hasProductCategory
+ opl:ProductCategory(ac1.product_cat_code)
+ where (
+ ^{dbms_family_tbl.}^.dbms_family_id = ^{ac1.}^.dbms_family_id
+ )
+ as virtrdf:OplDbmsFamilyToProductCategory .
+
+# opl:Processor(processors_tbl.processor_name, processors_tbl.processor_mode_id)
+# opl:hasProductCategory
+# opl:ProductCategory(ac1.product_cat_code)
+# where (
+# ^{processors_tbl.}^.processor_name = ^{ac1.}^.processor_name
+# and
+# ^{processors_tbl.}^.processor_mode_id = ^{ac1.}^.processor_mode_id
+# )
+# as virtrdf:OplProcessorToProductCategory .
+
+ opl:ProcessorFamily(processor_family_tbl.processor_family_id)
+ opl:hasProductCategory
+ opl:ProductCategory(ac1.product_cat_code)
+ where (
+ ^{processor_family_tbl.}^.processor_family_id = ^{ac1.}^.processor_family_id
+ )
+ as virtrdf:OplProcessorFamilyProductCategory .
+
+
+
+
+# ---------------------> to product_format
+
+# opl:Opsys(opsys_tbl.opsys_name)
+# opl:hasProductFormat
+# opl:ProductFormat(ac1.product_format_code)
+# where (
+# ^{opsys_tbl.}^.opsys_name = ^{ac1.}^.opsys_name
+# )
+# as virtrdf:OplOpsysToProductFormat .
+
+ opl:OpsysFamily(opsys_family_tbl.opsys_family_id)
+ opl:hasProductFormat
+ opl:ProductFormat(ac1.product_format_code)
+ where (
+ ^{opsys_family_tbl.}^.opsys_family_id = ^{ac1.}^.opsys_family_id
+ )
+ as virtrdf:OplOpsysFamilyToProductFormat .
+
+# opl:DbmsEngine(dbms_engine_tbl.dbms_name)
+# opl:hasProductFormat
+# opl:ProductFormat(ac1.product_format_code)
+# where (
+# ^{dbms_engine_tbl.}^.dbms_name = ^{ac1.}^.dbms_name
+# )
+# as virtrdf:OplDbmsToProductFormat .
+
+ opl:DbmsFamily(dbms_family_tbl.dbms_family_id)
+ opl:hasProductFormat
+ opl:ProductFormat(ac1.product_format_code)
+ where (
+ ^{dbms_family_tbl.}^.dbms_family_id = ^{ac1.}^.dbms_family_id
+ )
+ as virtrdf:OplDbmsFamilyToProductFormat .
+
+# opl:Processor(processors_tbl.processor_name, processors_tbl.processor_mode_id)
+# opl:hasProductFormat
+# opl:ProductFormat(ac1.product_format_code)
+# where (
+# ^{processors_tbl.}^.processor_name = ^{ac1.}^.processor_name
+# and
+# ^{processors_tbl.}^.processor_mode_id = ^{ac1.}^.processor_mode_id
+# )
+# as virtrdf:OplProcessorToProductFormat .
+
+ opl:ProcessorFamily(processor_family_tbl.processor_family_id)
+ opl:hasProductFormat
+ opl:ProductFormat(ac1.product_format_code)
+ where (
+ ^{processor_family_tbl.}^.processor_family_id = ^{ac1.}^.processor_family_id
+ )
+ as virtrdf:OplProcessorFamilyProductFormat .
+
+
+
+
+# ---------------------> to product_family
+
+# opl:Opsys(opsys_tbl.opsys_name)
+# opl:hasProductFamily
+# opl:ProductFamily(ac1.product_family_code)
+# where (
+# ^{opsys_tbl.}^.opsys_name = ^{ac1.}^.opsys_name
+# )
+# as virtrdf:OplOpsysToProductFamily .
+
+ opl:OpsysFamily(opsys_family_tbl.opsys_family_id)
+ opl:hasProductFamily
+ opl:ProductFamily(ac1.product_family_code)
+ where (
+ ^{opsys_family_tbl.}^.opsys_family_id = ^{ac1.}^.opsys_family_id
+ )
+ as virtrdf:OplOpsysFamilyToProductFamily .
+
+# opl:DbmsEngine(dbms_engine_tbl.dbms_name)
+# opl:hasProductFamily
+# opl:ProductFamily(ac1.product_family_code)
+# where (
+# ^{dbms_engine_tbl.}^.dbms_name = ^{ac1.}^.dbms_name
+# )
+# as virtrdf:OplDbmsToProductFamily .
+
+ opl:DbmsFamily(dbms_family_tbl.dbms_family_id)
+ opl:hasProductFamily
+ opl:ProductFamily(ac1.product_family_code)
+ where (
+ ^{dbms_family_tbl.}^.dbms_family_id = ^{ac1.}^.dbms_family_id
+ )
+ as virtrdf:OplDbmsFamilyToProductFamily .
+
+# opl:Processor(processors_tbl.processor_name, processors_tbl.processor_mode_id)
+# opl:hasProductFamily
+# opl:ProductFamily(ac1.product_family_code)
+# where (
+# ^{processors_tbl.}^.processor_name = ^{ac1.}^.processor_name
+# and
+# ^{processors_tbl.}^.processor_mode_id = ^{ac1.}^.processor_mode_id
+# )
+# as virtrdf:OplProcessorToProductFamily .
+
+ opl:ProcessorFamily(processor_family_tbl.processor_family_id)
+ opl:hasProductFamily
+ opl:ProductFamily(ac1.product_family_code)
+ where (
+ ^{processor_family_tbl.}^.processor_family_id = ^{ac1.}^.processor_family_id
+ )
+ as virtrdf:OplProcessorFamilyProductFamily .
+
+
+#
+# Product Benefits and things
+# =========================================
+
+ opl:ProductBenefit(product_benefits_tbl.product_benefit_id)
+ a opl:ProductBenefit
+ as virtrdf:OplProductBenefit ;
+ rdfs:label product_benefits_tbl.product_benefit_desc
+ as virtrdf:rdfsLabelProductBenefitDescription ;
+ opl:isOfProductBenefitCategory opl:ProductBenefitCategory(product_benefits_tbl.product_benefit_category_id)
+ as virtrdf:OplProductBenefitIsOfProductBenefitCategory ;
+ opl:Description product_benefits_tbl.product_benefit_desc
+ as virtrdf:OplProductBenefitDescription ;
+ opl:Acronym product_benefits_tbl.product_benefit_acronym
+ as virtrdf:OplProductBenefitAcronym ;
+ opl:Explanation product_benefits_tbl.product_benefit_explanation
+ as virtrdf:OplProductBenefitExplanation ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ProductBenefitCategory(product_benefits_category_tbl.product_benefit_category_id)
+ a opl:ProductBenefitCategory
+ as virtrdf:OplProductBenefitCategory ;
+ rdfs:label product_benefits_category_tbl.description
+ as virtrdf:rdfsLabelProductBenefitCategoryDescription ;
+ opl:Description product_benefits_category_tbl.description
+ as virtrdf:OplProductBenefitCategoryDescription ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ProductFeatureCategory(product_feature_category_tbl.product_feature_category_id)
+ a opl:ProductFeatureCategory
+ as virtrdf:OplProductFeatureCategory ;
+ rdfs:label product_feature_category_tbl.short_desc
+ as virtrdf:rdfsLabelProductFeatureCategoryShortDescription ;
+ opl:ShortDescription product_feature_category_tbl.short_desc
+ as virtrdf:OplProductFeatureCategoryShortDescription ;
+ opl:Description product_feature_category_tbl.description
+ as virtrdf:OplProductFeatureCategoryDescription ;
+ opl:StandardsId product_feature_category_tbl.standards_id
+ as virtrdf:OplProductFeatureCategoryStandardsId ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ProductFeature(product_features_tbl.product_feature_id)
+ a opl:ProductFeature
+ as virtrdf:OplProductFeature ;
+ rdfs:label product_features_tbl.short_description
+ as virtrdf:rdfsLabelProductFeaturesShortDescription ;
+ opl:Description product_features_tbl.short_description
+ as virtrdf:OplProductFeaturesShortDescription ;
+ dc:description opl:lit_to_string(product_features_tbl.long_description)
+ as virtrdf:OplProductFeaturesLongDescription ;
+ opl:isOfProductBenefit opl:ProductBenefit(product_features_tbl.product_feature_benefit_id)
+ as virtrdf:ProductFeaturesIsOfProductBenefit ;
+ opl:isOfProductFeatureCategory opl:ProductFeatureCategory(product_features_tbl.product_feature_category_id)
+ as virtrdf:ProductFeaturesIsOfProductFeatureCategory ;
+ opl:isOfProduct opl:Product(product_features_tbl.product_id)
+ as virtrdf:ProductFeaturesIsOfProduct ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:Product(product_with_code.product_id)
+ opl:hasFeature
+ opl:ProductFeature(product_features_tbl.product_feature_id)
+ where (
+ ^{product_with_code.}^.product_id = ^{product_features_tbl.}^.product_id
+ )
+ as virtrdf:OplProductHasProductFeaturesProductFeatures .
+
+ opl:ProductFeature(product_features_tbl.product_feature_id)
+ opl:isFeatureOf
+ opl:Product(product_with_code.product_id)
+ where (
+ ^{product_with_code.}^.product_id = ^{product_features_tbl.}^.product_id
+ )
+ as virtrdf:OplProductFeaturesAreProductFeaturesProduct .
+
+
+ opl:ProductFamilyFeature(product_family_features_tbl.product_family_feature_id)
+ a opl:ProductFamilyFeature
+ as virtrdf:OplProductFamilyFeature ;
+ rdfs:label product_family_features_tbl.short_description
+ as virtrdf:rdfsLabelProductFamilyFeaturesShortDescription ;
+ opl:Description product_family_features_tbl.short_description
+ as virtrdf:OplProductFamilyFeaturesShortDescription ;
+ dc:description opl:lit_to_string(product_family_features_tbl.long_description)
+ as virtrdf:OplProductFamilyFeaturesLongDescription ;
+ opl:isOfProductBenefit opl:ProductBenefit(product_family_features_tbl.product_family_feature_benefit_id)
+ as virtrdf:ProductFamilyFeaturesIsOfProductBenefit ;
+ opl:isOfProductFeatureCategory opl:ProductFeatureCategory(product_family_features_tbl.product_family_feature_cat_id)
+ as virtrdf:ProductFamilyFeaturesIsOfProductFeatureCategory ;
+ opl:isOfProductFamily opl:ProductFamily(product_family_features_tbl.product_family_code)
+ as virtrdf:ProductFamilyFeaturesIsOfProductFamily ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ProductFamily(product_family_tbl.product_family_code)
+ opl:hasFeature
+ opl:ProductFamilyFeature(product_family_features_tbl.product_family_feature_id)
+ where (
+ ^{product_family_tbl.}^.product_family_id = ^{product_family_features_tbl.}^.product_family_id
+ )
+ as virtrdf:OplProductFamilyHasProductFamilyFeaturesProductFamilyFeatures .
+
+ opl:ProductFamilyFeature(product_family_features_tbl.product_family_feature_id)
+ opl:isFeatureOf
+ opl:Product(product_family_tbl.product_family_code)
+ where (
+ ^{product_family_tbl.}^.product_family_id = ^{product_family_features_tbl.}^.product_family_id
+ )
+ as virtrdf:OplProductFamilyFeaturesAreProductFamilyFeaturesProductFamily .
+
+
+ opl:ProductFormatFeature(product_format_features_tbl.product_format_feature_id)
+ a opl:ProductFormatFeature
+ as virtrdf:OplProductFormatFeature ;
+ rdfs:label product_format_features_tbl.short_description
+ as virtrdf:rdfsLabelProductFormatFeaturesShortDescription ;
+ opl:Description product_format_features_tbl.short_description
+ as virtrdf:OplProductFormatFeaturesShortDescription ;
+ dc:description opl:lit_to_string(product_format_features_tbl.long_description)
+ as virtrdf:OplProductFormatFeaturesLongDescription ;
+ opl:isOfProductBenefit opl:ProductBenefit(product_format_features_tbl.product_format_feature_benefit_id)
+ as virtrdf:ProductFormatFeaturesIsOfProductBenefit ;
+ opl:isOfProductFeatureCategory opl:ProductFeatureCategory(product_format_features_tbl.product_format_feature_cat_id)
+ as virtrdf:ProductFormatFeaturesIsOfProductFeatureCategory ;
+ opl:isOfProductFormat opl:ProductFormat(product_format_features_tbl.product_format_code)
+ as virtrdf:ProductFormatFeaturesIsOfProductFormat ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ProductFormat(product_format_with_code.product_format_code)
+ opl:hasFeature
+ opl:ProductFormatFeature(product_format_features_tbl.product_format_feature_id)
+ where (
+ ^{product_format_with_code.}^.product_format_id = ^{product_format_features_tbl.}^.product_format_id
+ )
+ as virtrdf:OplProductFormatHasProductFormatFeaturesProductFormatFeatures .
+
+ opl:ProductFormatFeature(product_format_features_tbl.product_format_feature_id)
+ opl:isFeatureOf
+ opl:ProductFormat(product_format_with_code.product_format_code)
+ where (
+ ^{product_format_with_code.}^.product_format_id = ^{product_format_features_tbl.}^.product_format_id
+ )
+ as virtrdf:OplProductFormatFeaturesAreProductFormatFeaturesProductFormat .
+
+
+
+ opl:ProductCategoryFeature(product_category_features_tbl.product_category_feature_id)
+ a opl:ProductCategoryFeature
+ as virtrdf:OplProductCategoryFeature ;
+ rdfs:label product_category_features_tbl.short_description
+ as virtrdf:rdfsLabelProductCategoryFeaturesShortDescription ;
+ opl:Description product_category_features_tbl.short_description
+ as virtrdf:OplProductCategoryFeaturesShortDescription ;
+ dc:description opl:lit_to_string(product_category_features_tbl.long_description)
+ as virtrdf:OplProductCategoryFeaturesLongDescription ;
+ opl:isOfProductBenefit opl:ProductBenefit(product_category_features_tbl.product_category_feature_benefit_id)
+ as virtrdf:ProductCategoryFeaturesIsOfProductBenefit ;
+ opl:isOfProductFeatureCategory opl:ProductFeatureCategory(product_category_features_tbl.product_category_feature_category_id)
+ as virtrdf:ProductCategoryFeaturesIsOfProductFeatureCategory ;
+ opl:isOfProductCategory opl:ProductCategory(product_category_features_tbl.product_cat_code)
+ as virtrdf:ProductCategoryFeaturesIsOfProductCategory ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:ProductCategory(product_category_with_code.product_cat_code)
+ opl:hasFeature
+ opl:ProductCategoryFeature(product_category_features_tbl.product_category_feature_id)
+ where (
+ ^{product_category_with_code.}^.product_cat_id = ^{product_category_features_tbl.}^.product_cat_id
+ )
+ as virtrdf:OplProductCategoryHasProductCategoryFeaturesProductCategoryFeatures .
+
+ opl:ProductCategoryFeature(product_category_features_tbl.product_category_feature_id)
+ opl:isFeatureOf
+ opl:ProductCategory(product_category_with_code.product_cat_code)
+ where (
+ ^{product_category_with_code.}^.product_cat_id = ^{product_category_features_tbl.}^.product_cat_id
+ )
+ as virtrdf:OplProductCategoryFeaturesAreProductCategoryFeaturesProductCategory .
+
+
+ opl:ProductReleaseFeature(product_release_features_tbl.product_release_feature_id)
+ a opl:ProductReleaseFeature
+ as virtrdf:OplProductReleaseFeature ;
+ rdfs:label product_release_features_tbl.short_description
+ as virtrdf:rdfsLabelProductReleaseFeaturesShortDescription ;
+ opl:Description product_release_features_tbl.short_description
+ as virtrdf:OplProductReleaseFeaturesShortDescription ;
+ dc:description opl:lit_to_string(product_release_features_tbl.long_description)
+ as virtrdf:OplProductReleaseFeaturesLongDescription ;
+ opl:isOfProductBenefit opl:ProductBenefit(product_release_features_tbl.product_release_feature_benefit_id)
+ as virtrdf:ProductReleaseFeaturesIsOfProductBenefit ;
+ opl:isOfProductFeatureCategory opl:ProductFeatureCategory(product_release_features_tbl.product_release_feature_cat_id)
+ as virtrdf:ProductReleaseFeaturesIsOfProductFeatureCategory ;
+ opl:isOfProduct opl:Product(product_release_features_tbl.product_id)
+ as virtrdf:ProductReleaseFeaturesIsOfProduct ;
+ opl:ProductReleaseId product_release_features_tbl.product_release_id
+ as virtrdf:ProductReleaseFeaturesProductRelease ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ } .
+} .
+;
+
+
+
+
+DB.DBA.RDF_AUDIT_METADATA (1, '*');
+
+
+SPARQL
+prefix opl: <http://www.openlinksw.com/schemas/oplweb#>
+prefix dc: <http://purl.org/dc/terms#>
+prefix oplsioc: <http://www.openlinksw.com/schemas/oplsioc#>
+prefix sioc: <http://rdfs.org/sioc/ns#>
+prefix foaf: <http://xmlns.com/foaf/0.1/>
+prefix wgs: <http://www.w3.org/2003/01/geo/wgs84_pos#>
+prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+prefix oplds: <http://www.openlinksw.com/dataspace/organization/openlink#>
+prefix owl: <http://www.w3.org/2002/07/owl#>
+prefix umbel: <http://umbel.org/umbel/sc/>
+prefix gr: <http://purl.org/goodrelations/v1#>
+
+alter quad storage virtrdf:DefaultQuadStorage
+FROM oplweb2.oplweb.component_archive as component_archive_tbl
+FROM oplweb2.oplweb.component_archive_type as component_archive_type_tbl
+FROM oplweb2.oplweb.component_category as component_category_tbl text literal component_category_long_description
+FROM oplweb2.oplweb.component_mode as component_mode_tbl
+FROM oplweb2.oplweb.component_type as component_type_tbl
+FROM oplweb2.oplweb.components_for_rdfs as components_tbl
+FROM oplweb2.oplweb.dbms_engine as dbms_engine_tbl
+FROM oplweb2.oplweb.dbms_family as dbms_family_tbl
+FROM oplweb2.oplweb.download_location as download_location_tbl
+FROM oplweb2.oplweb.download_protocol as download_protocol_tbl
+FROM oplweb2.oplweb.download_partner as download_partner_tbl
+FROM oplweb2.oplweb.opsys as opsys_tbl
+FROM oplweb2.oplweb.opsys_family as opsys_family_tbl
+FROM oplweb2.oplweb.opsys_type as opsys_type_tbl
+FROM oplweb2.oplweb.processor_family as processor_family_tbl
+FROM oplweb2.oplweb.processor_mode as processor_mode_tbl
+FROM oplweb2.oplweb.processors as processors_tbl
+FROM oplweb2.oplweb.product as product_tbl text literal long_description
+FROM oplweb2.oplweb.product_benefits as product_benefits_tbl text literal product_benefit_explanation
+FROM oplweb2.oplweb.product_benefits_category as product_benefits_category_tbl
+FROM oplweb2.oplweb.product_category as product_category_tbl
+FROM oplweb2.oplweb.product_category_features_with_code as product_category_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_family as product_family_tbl
+FROM oplweb2.oplweb.product_family as product_family_tbl_2
+FROM oplweb2.oplweb.product_family_features_with_code as product_family_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_features as product_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_feature_category as product_feature_category_tbl text literal description
+FROM oplweb2.oplweb.product_format_features_with_code as product_format_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_release_features as product_release_features_tbl text literal long_description
+FROM oplweb2.oplweb.product_release_with_family as product_release_tbl
+FROM oplweb2.oplweb.vendor_category as vendor_category_tbl
+FROM oplweb2.oplweb.vendor_category_family as vendor_category_family_tbl
+FROM oplweb2.oplweb.vendors as vendors_tbl
+FROM oplweb2.oplweb.product_formats_categories as product_formats_categories
+FROM oplweb2.oplweb.product_with_code as product_with_code
+FROM oplweb2.oplweb.product_category_with_code as product_category_with_code
+FROM oplweb2.oplweb.product_format as product_format_with_code
+FROM oplweb2.oplweb.product_price as pp
+FROM oplweb2.oplweb.product_price_type as pt
+FROM oplweb2.DBA.license_model_unit_type as put
+FROM oplweb2.DBA.license_model_unit_type as put2
+FROM oplweb2.DBA.license_model as lm
+FROM oplweb2.DBA.license_model as lm2
+FROM oplweb2.DBA.license_model_type as license_model_type_tbl
+FROM oplweb2.DBA.product_price_varchar as ppv
+FROM oplweb2.DBA.product_general_discount_vc as gd
+FROM oplweb2.oplweb.archive_coverage_osdb as ac1
+{
+ create virtrdf:product_portfolio2 as
+ graph <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ option (exclusive)
+ {
+
+ opl:ProcessorFamily(processor_family_tbl.processor_family_id)
+ opl:hasProcessors
+ opl:Processor(processors_tbl.processor_name, processors_tbl.processor_mode_id)
+ where (
+ ^{processor_family_tbl.}^.processor_family_id = ^{processors_tbl.}^.processor_family_id
+ )
+ as virtrdf:OplProcessorFamilyHasProcessors .
+
+
+ opl:Processor(processors_tbl.processor_name, processors_tbl.processor_mode_id)
+ opl:hasProductFamily
+ opl:ProductFamily(ac1.product_family_code)
+ where (
+ ^{processors_tbl.}^.processor_name = ^{ac1.}^.processor_name
+ and
+ ^{processors_tbl.}^.processor_mode_id = ^{ac1.}^.processor_mode_id
+ )
+ as virtrdf:OplProcessorToProductFamily .
+
+
+
+#
+# Product Licensing and Shop stuff
+# =========================================
+
+
+ opl:ProductRelease(
+ product_release_tbl.product_id,
+ product_release_tbl.product_release_id,
+ product_release_tbl.opsys_name,
+ product_release_tbl.dbms_name
+ )
+ opl:hasLicenseModel
+ opl:LicenseModel(
+ lm.product_release_id,
+ lm.product_id,
+ lm.opsys_family_id,
+ lm.dbms_family_id,
+ lm.product_price_type_id
+ )
+ where (
+ ^{lm.}^.product_id = ^{product_release_tbl.}^.product_id and
+ ^{lm.}^.product_release_id = ^{product_release_tbl.}^.product_release_id and
+ ^{lm.}^.opsys_family_id = ^{product_release_tbl.}^.opsys_family_id and
+ ^{lm.}^.dbms_family_id = ^{product_release_tbl.}^.dbms_family_id
+ )
+ as virtrdf:OplProductReleaseHasLicenseModel .
+
+ opl:ProductRelease(
+ product_release_tbl.product_id,
+ product_release_tbl.product_release_id,
+ product_release_tbl.opsys_name,
+ product_release_tbl.dbms_name
+ )
+ opl:hasPriceSample
+ opl:lit_shop_sample (
+ product_release_tbl.product_release_id,
+ product_release_tbl.product_id,
+ product_release_tbl.opsys_name,
+ product_release_tbl.dbms_name
+ )
+ as virtrdf:OplPriceSamples .
+
+
+ opl:LicenseModel(
+ lm.product_release_id,
+ lm.product_id,
+ lm.opsys_family_id,
+ lm.dbms_family_id,
+ lm.product_price_type_id)
+ a opl:LicenseModel
+ as virtrdf:OplLicenseModel;
+ a gr:Sell
+ as virtrdf:OplLicenseModelAgrSell ;
+ a gr:ActualProductOrServiceInstance
+ as virtrdf:OplLicenseModelAgrProductOrServiceInstance ;
+ rdfs:label opl:lit_license_model_type(
+ lm.product_price_type_id
+ ) as virtrdf:OplLabelLicenseModel ;
+ rdfs:description opl:lit_license_model_explain (
+ lm.product_price_type_id
+ ) as virtrdf:OplLicenseModelExplain ;
+ opl:ProductReleaseId
+ lm.product_release_id
+ as virtrdf:lm_shop_price_product_release;
+ opl:isOfFormat
+ opl:ProductFormat(lm.product_format_code)
+ as virtrdf:lm_shop_price_product_format;
+ opl:isOfCategory
+ opl:ProductCategory(lm.product_cat_code)
+ as virtrdf:lm_shop_price_product_cat;
+ opl:OpsysFamily
+ opl:OpsysFamily(lm.opsys_family_id)
+ as virtrdf:lm_shop_price_opsys_family_oplweb;
+ opl:OpsysType
+ opl:OpsysType(lm.opsys_type_id)
+ as virtrdf:lm_shop_price_opsys_type;
+ opl:DbmsFamily
+ opl:DbmsFamily(lm.dbms_family_id)
+ as virtrdf:lm_shop_price_dbms_family ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs: ;
+ rdfs:isDefinedBy gr:
+ .
+
+
+ opl:LicenseModel(
+ lm.product_release_id,
+ lm.product_id,
+ lm.opsys_family_id,
+ lm.dbms_family_id,
+ lm.product_price_type_id)
+ opl:hasPriceUnitType
+ opl:PriceUnitType(
+ lm2.product_release_id,
+ lm2.product_id,
+ lm2.opsys_family_id,
+ lm2.dbms_family_id,
+ lm2.product_price_type_id,
+ lm2.product_price_unit_type_id)
+ where (
+ ^{lm.}^.product_release_id = ^{lm2.}^.product_release_id AND
+ ^{lm.}^.product_id = ^{lm2.}^.product_id AND
+ ^{lm.}^.opsys_family_id = ^{lm2.}^.opsys_family_id AND
+ ^{lm.}^.opsys_type_id = ^{lm2.}^.opsys_type_id AND
+ ^{lm.}^.product_price_type_id = ^{lm2.}^.product_price_type_id AND
+ ^{lm2.}^.product_price_unit_type_id <> 'db_sessions'
+ and
+ (
+ ^{lm.}^.dbms_family_id = ^{lm2.}^.dbms_family_id
+ OR
+ ^{lm2.}^.dbms_family_id = 15
+ )
+ )
+ as virtrdf:OplLicenseModelPriceUnitTypes .
+
+
+
+ opl:LicenseModel(
+ lm.product_release_id,
+ lm.product_id,
+ lm.opsys_family_id,
+ lm.dbms_family_id,
+ lm.product_price_type_id)
+ gr:hasPriceSpecification
+ opl:PriceUnitType(
+ lm2.product_release_id,
+ lm2.product_id,
+ lm2.opsys_family_id,
+ lm2.dbms_family_id,
+ lm2.product_price_type_id,
+ lm2.product_price_unit_type_id)
+ where (
+ ^{lm.}^.product_release_id = ^{lm2.}^.product_release_id AND
+ ^{lm.}^.product_id = ^{lm2.}^.product_id AND
+ ^{lm.}^.opsys_family_id = ^{lm2.}^.opsys_family_id AND
+ ^{lm.}^.opsys_type_id = ^{lm2.}^.opsys_type_id AND
+ ^{lm.}^.product_price_type_id = ^{lm2.}^.product_price_type_id AND
+ ^{lm2.}^.product_price_unit_type_id = 'db_sessions'
+ and
+ (
+ ^{lm.}^.dbms_family_id = ^{lm2.}^.dbms_family_id
+ OR
+ ^{lm2.}^.dbms_family_id = 15
+ )
+ )
+ as virtrdf:OplLicenseModelBasePriceUnitTypes .
+
+
+ opl:Discount(
+ gd.product_release_id,
+ gd.opsys_type_id,
+ gd.product_id,
+ gd.opsys_family_id,
+ gd.dbms_family_id,
+ gd.product_price_type_id)
+ a opl:Discount
+ as virtrdf:product_discount;
+ rdfs:label gd.product_discount_description as virtrdf:OplLabelDiscount ;
+ rdfs:description gd.product_discount_description as virtrdf:OplDiscountExplain ;
+ opl:discount_description
+ gd.product_discount_description
+ as virtrdf:gd_discount_description;
+ opl:discount_start
+ gd.discount_start
+ as virtrdf:gd_discount_start;
+ opl:discount_end
+ gd.discount_end
+ as virtrdf:gd_discount_end;
+ opl:ProductPriceType
+ opl:PriceType(gd.product_price_type_id)
+ as virtrdf:gd_shop_price_type;
+ gr:hasUnitOfMeasurement
+ opl:PriceType(gd.product_price_type_id)
+ as virtrdf:gd_shop_price_type_grUnitOfMeasurement;
+ opl:ProductReleaseId
+ gd.product_release_id
+ as virtrdf:gd_shop_price_product_release;
+ opl:ProductFormat
+ opl:ProductFormat(gd.product_format_code)
+ as virtrdf:gd_shop_price_product_format;
+ opl:ProductCategory
+ opl:ProductCategory(gd.product_cat_code)
+ as virtrdf:gd_shop_price_product_cat;
+ opl:OpsysFamily
+ opl:OpsysFamily(gd.opsys_family_id)
+ as virtrdf:gd_shop_price_opsys_family_oplweb;
+ opl:OpsysType
+ opl:OpsysType(gd.opsys_type_id)
+ as virtrdf:gd_shop_price_opsys_type;
+ opl:DbmsFamily
+ opl:DbmsFamily(gd.dbms_family_id)
+ as virtrdf:gd_shop_price_dbms_family;
+ opl:discount_token
+ gd.discount_token
+ as virtrdf:gd_discount_token ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+
+
+ opl:PriceType(pt.product_price_type_id)
+ a opl:PriceType
+ as virtrdf:shop_product_price_type;
+ rdfs:label pt.product_price_type_description as virtrdf:OplLabelPriceType ;
+ rdfs:description pt.product_price_type_description as virtrdf:OplPriceTypeExplain ;
+ opl:PriceTypeDescription
+ pt.product_price_type_description
+ as virtrdf:shop_product_price_type_description;
+ dc:description
+ pt.product_price_type_long_description
+ as virtrdf:shop_product_price_type_long_description ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy dc: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+ opl:PriceUnitType(
+ put.product_release_id,
+ put.product_id,
+ put.opsys_family_id,
+ put.dbms_family_id,
+ put.product_price_type_id,
+ put.product_price_unit_type_id)
+ a opl:PriceUnitType
+ as virtrdf:shop_product_price_unit_type;
+ rdfs:label put.product_price_unit_description as virtrdf:OplLabelproductpriceunitdescription ;
+ rdfs:description put.product_price_unit_description as virtrdf:OplproductpriceunitdescriptionExplain ;
+ gr:hasUnitOfMeasurement
+ opl:PriceType(put.product_price_type_id)
+ as virtrdf:put_shop_price_type_grUnitOfMeasurement;
+ opl:unitValue
+ put.unit_price
+ as virtrdf:unit_type_unit_price;
+ gr:hasValue
+ put.unit_price
+ as virtrdf:unit_type_unit_price_grHasValue;
+ opl:graceUnits
+ put.unit_grace
+ as virtrdf:unit_type_unit_grace;
+ opl:minUnits
+ put.unit_low
+ as virtrdf:unit_type_unit_low;
+ opl:maxUnits
+ put.unit_cap
+ as virtrdf:unit_type_unit_cap;
+ opl:unit_type_description
+ put.product_price_unit_description
+ as virtrdf:unit_type_description ;
+ rdfs:isDefinedBy opl: ;
+ rdfs:isDefinedBy rdfs:
+ .
+
+
+ opl:PriceUnitType(
+ put.product_release_id,
+ put.product_id,
+ put.opsys_family_id,
+ put.dbms_family_id,
+ put.product_price_type_id,
+ put.product_price_unit_type_id
+ )
+ opl:hasIncrementalDiscount
+ opl:PriceUnitIncrementalDiscount(
+ put2.product_release_id,
+ put2.product_id,
+ put2.opsys_family_id,
+ put2.dbms_family_id,
+ put2.product_price_type_id,
+ put2.product_price_unit_type_id
+ )
+ where (
+ ^{put.}^.product_release_id = ^{put2.}^.product_release_id and
+ ^{put.}^.product_id = ^{put2.}^.product_id and
+ ^{put.}^.opsys_family_id = ^{put2.}^.opsys_family_id and
+ ^{put.}^.dbms_family_id = ^{put2.}^.dbms_family_id and
+ ^{put.}^.product_price_type_id = ^{put2.}^.product_price_type_id and
+ ^{put.}^.product_price_unit_type_id = ^{put2.}^.product_price_unit_type_id
+ )
+ as virtrdf:OplLicenseModelUnitsIncrementalDiscounts .
+
+
+ opl:PriceUnitIncrementalDiscount(
+ put.product_release_id,
+ put.product_id,
+ put.opsys_family_id,
+ put.dbms_family_id,
+ put.product_price_type_id,
+ put.product_price_unit_type_id)
+ a opl:PriceUnitIncrementalDiscount
+ as virtrdf:shop_product_price_unit_type_incremental_discount;
+ rdfs:label put.product_price_unit_description as virtrdf:OplLabelproductpriceunitIncDisdescription ;
+ rdfs:description put.product_price_unit_description as virtrdf:OplproductpriceunitIncDisdescriptionExplain ;
+ opl:percentageOfBase
+ put.unit_discount
+ as virtrdf:unit_type_unit_discount;
+ opl:triggerPoint
+ put.quantity
+ as virtrdf:unit_type_unit_discount_quantity
+ .
+
+
+ opl:LicenseModel(
+ lm.product_release_id,
+ lm.product_id,
+ lm.opsys_family_id,
+ lm.dbms_family_id,
+ lm.product_price_type_id
+ )
+ opl:hasGeneralDiscounts
+ opl:Discount(
+ gd.product_release_id,
+ gd.opsys_type_id,
+ gd.product_id,
+ gd.opsys_family_id,
+ gd.dbms_family_id,
+ gd.product_price_type_id
+ )
+ where (
+ ^{lm.}^.product_release_id = ^{gd.}^.product_release_id AND
+ ^{lm.}^.product_id = ^{gd.}^.product_id AND
+ ^{lm.}^.opsys_family_id = ^{gd.}^.opsys_family_id AND
+ ^{lm.}^.dbms_family_id = ^{gd.}^.dbms_family_id AND
+ ^{lm.}^.opsys_type_id = ^{gd.}^.opsys_type_id AND
+ ^{lm.}^.product_price_type_id = ^{gd.}^.product_price_type_id
+ )
+ as virtrdf:OplLicenseModelGeneralDiscounts .
+
+
+
+ } .
+} .
+;
+
+
+DB.DBA.XML_SET_NS_DECL ('OpenLink', 'http://www.openlinksw.com/schemas/oplweb#', 2);
+DB.DBA.XML_SET_NS_DECL ('OplProductCategory', 'http://data.openlinksw.com/oplweb/product_category/', 2);
+DB.DBA.XML_SET_NS_DECL ('OplProductFamily', 'http://data.openlinksw.com/oplweb/product_family/', 2);
+DB.DBA.XML_SET_NS_DECL ('OplProductFormat', 'http://data.openlinksw.com/oplweb/product_format/', 2);
+DB.DBA.XML_SET_NS_DECL ('OplProduct', 'http://data.openlinksw.com/oplweb/product/', 2);
+DB.DBA.XML_SET_NS_DECL ('OplProductRelease', 'http://data.openlinksw.com/oplweb/product_release/', 2);
+
+
+DB.DBA.RDF_AUDIT_METADATA (1, '*');
+
+
+commit work;
+-- Clear the 'cache' for immediate effects
+SELECT hs_local_iri, exec ('SPARQL clear graph <'||hs_local_iri||'>')
+ FROM sys_http_sponge
+ WHERE hs_local_iri like '%oplweb%';
+
+SELECT id_to_iri(G), exec ('SPARQL clear graph <'||id_to_iri(G)||'>')
+ FROM rdf_quad
+ WHERE id_to_iri(G) like '%oplweb%';
+
+SPARQL CLEAR GRAPH <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>;
+commit work;
+
+
+SPARQL CONSTRUCT { <http://data.openlinksw.com/oplweb/product_family/uda#this> ?p ?o }
+ FROM <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ WHERE { <http://data.openlinksw.com/oplweb/product_family/uda#this> ?p ?o }
+;
+
+SPARQL SELECT *
+ FROM <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ WHERE { <http://data.openlinksw.com/oplweb/product_category/odbc#this> ?p ?o }
+ limit 100
+;
+
+SPARQL define get:soft "soft" SELECT *
+ FROM <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ WHERE { <http://data.openlinksw.com/oplweb/product_category/odbc#this> ?p ?o }
+ limit 100
+;
+
+SPARQL CONSTRUCT { <http://data.openlinksw.com/oplweb/product_category/jdbc#this> ?p ?o }
+ FROM <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ WHERE { <http://data.openlinksw.com/oplweb/product_category/jdbc#this> ?p ?o }
+ limit 100
+;
+
+SPARQL CONSTRUCT { <http://data.openlinksw.com/oplweb/product_format/mt#this> ?p ?o }
+ FROM <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ WHERE { <http://data.openlinksw.com/oplweb/product_format/mt#this> ?p ?o }
+ limit 1
+;
+
+
+SPARQL SELECT ?p ?o
+ FROM <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ WHERE { <http://data.openlinksw.com/oplweb/product_family/uda#this> ?p ?o }
+ limit 1
+;
+
+SPARQL
+prefix opl: <http://www.openlinksw.com/schemas/oplweb#>
+SELECT ?s ?o
+ FROM <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ WHERE { ?s opl:hasProcessors ?o }
+ limit 1
+;
+
+SPARQL
+prefix opl: <http://www.openlinksw.com/schemas/oplweb#>
+SELECT distinct ?o
+ FROM <http://www.openlinksw.com/dataspace/organization/openlink/oplweb/>
+ WHERE { <http://data.openlinksw.com/oplweb/processor/i686_1#this> opl:hasProductFamily ?o }
+ limit 10
+;
+
+-- curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/price_unit_type/6.1_odbc-sqlserver-st_1_2_1_db_sessions#this"
+-- curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/price_unit_type/6.1_odbc-sqlserver-st_1_2_1_cpu#this"
+
+--SELECT top 10 * FROM oplweb2.DBA.license_model_unit_type WHERE product_release_id = '6.1' and product_id = 'odbc-sqlserver-st'
+-- and opsys_family_id = 1 and dbms_family_id = 15 and product_price_type_id = 1 and product_price_unit_type_id = 'cpu';
+
+-- curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/rdfbrowser/index.html?uri=http%3A//data.openlinksw.com/oplweb/component_archive/6.1-odbc-oracle-st-i686-generic-win-32-ora10-odbclt-clnt-only_mv.msi"
+-- curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/product_family/uda"
+-- curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/product_category/odbc"
+-- curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/dbms_family/MySQL"
+-- curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/product_release/odbc-oracle-mt_6.1_i686-generic-win-32_ora9"
+-- curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/license_model/6.1_odbc-sqlserver-st_1_2_1"
+
+
+
+
+curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/rdfbrowser/index.html?uri=http%3A//data.openlinksw.com/oplweb/component_archive/6.1-odbc-oracle-st-i686-generic-win-32-ora10-odbclt-clnt-only_mv.msi"
+curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/product_family/uda"
+curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/product_release/odbc-oracle-mt_6.1_i686-generic-win-32_ora9"
+curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/license_model/6.1_odbc-sqlserver-st_1_2_1"
+
+--
+-- XXX: note , the below would work only if www.openlinksw.com has the GRAPH <http://data.openlinksw.com/oplweb/>
+-- if experimenting on other box, then www.openlinksw.com should be replaced with [URIQA] DefaultHost INI value
+--
+
+
+
+DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
+ 'oplweb2_rule2',
+ 1,
+ '/oplweb(/[^#]*)',
+ vector('path'),
+ 1,
+ '/sparql?query=CONSTRUCT+{+%%3Chttp%%3A//data.openlinksw.com/oplweb%U%%23this%%3E+%%3Fp+%%3Fo+}+FROM+%%3Chttp%%3A//www.openlinksw.com/dataspace/organization/openlink/oplweb/%%3E+WHERE+{+%%3Chttp%%3A//data.openlinksw.com/oplweb%U%%23this%%3E+%%3Fp+%%3Fo+}&format=%U',
+ vector('path', 'path', '*accept*'),
+ null,
+ '(text/rdf.n3)|(application/rdf.xml)',
+ 0,
+ null
+ );
+
+DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
+ 'oplweb2_rule1',
+ 1,
+ '(/oplweb/[^#]*)',
+ vector('path'),
+ 1,
+ '/rdfbrowser/index.html?uri=http%%3A//data.openlinksw.com%U%',
+-- '/DAV/RDF/rdfqry.vsp?uri=http%%3A//data.openlinksw.com%U%%23this',
+ vector('path'),
+ null,
+ '(text/html)|(\\*/\\*)',
+ 0,
+ 303
+ );
+
+DB.DBA.URLREWRITE_CREATE_REGEX_RULE (
+ 'oplweb2_rule3',
+ 1,
+ '(/[^#]*)/\x24',
+ vector('path'),
+ 1,
+ '%s',
+ vector('path'),
+ null,
+ null,
+ 0,
+ null
+ );
+
+
+
+create procedure DB.DBA.REDO_OPLWEB2_RDF_DET()
+{
+ declare colid int;
+ colid := DAV_SEARCH_ID('/DAV/RDF/oplweb2/', 'C');
+ if (colid < 0)
+ return;
+ update WS.WS.SYS_DAV_COL set COL_DET=null where COL_ID = colid;
+}
+;
+
+DB.DBA.REDO_OPLWEB2_RDF_DET();
+
+drop procedure DB.DBA.REDO_OPLWEB2_RDF_DET;
+
+DB.DBA."RDFData_MAKE_DET_COL" ('/DAV/RDF/oplweb2/', 'http://data.openlinksw.com/oplweb', NULL);
+VHOST_REMOVE (lpath=>'/oplweb/data/rdf');
+DB.DBA.VHOST_DEFINE (lpath=>'/oplweb/data/rdf', ppath=>'/DAV/RDF/oplweb2/All/', is_dav=>1, vsp_user=>'dba');
+
+-- procedure to convert path to DET resource name
+create procedure DB.DBA.OPLWEB2_DET_REF (in par varchar, in fmt varchar, in val varchar)
+{
+ declare res, iri any;
+ iri := 'http://data.openlinksw.com/oplweb' || val;
+ res := sprintf ('iid (%d).rdf', iri_id_num (iri_to_id (iri)));
+ return sprintf (fmt, res);
+}
+;
+
+DB.DBA.URLREWRITE_CREATE_REGEX_RULE ('oplweb2_rdf', 1,
+ '/oplweb/(.*)', vector('path'), 1,
+ '/oplweb/data/rdf/%U', vector('path'),
+ 'DB.DBA.OPLWEB2_DET_REF',
+ 'application/rdf.xml',
+ 2,
+ 303);
+
+
+DB.DBA.URLREWRITE_CREATE_RULELIST (
+ 'oplweb2_rule_list1',
+ 1,
+ vector (
+ 'oplweb2_rule1',
+ 'oplweb2_rule2',
+ 'oplweb2_rule3',
+ 'oplweb2_rdf'
+ ));
+
+
+VHOST_REMOVE (vhost=>'data.openlinksw.com:80', lpath=>'/oplweb');
+DB.DBA.VHOST_DEFINE (vhost=>'data.openlinksw.com:80', lpath=>'/oplweb', ppath=>'/DAV/RDF/oplweb2/',
+ vsp_user=>'dba', is_dav=>1, def_page=>'sfront.vspx', is_brws=>0, opts=>vector ('url_rewrite', 'oplweb2_rule_list1'));
+
+
+/*
+
+DB.DBA.VHOST_DEFINE (vhost=>'data.openlinksw.com:80', lhost=>':80', lpath=>'/rdf_net', ppath=>'/rdf_net');
+DB.DBA.VHOST_DEFINE (vhost=>'data.openlinksw.com:80', lhost=>':80', lpath=>'/sparql/',
+ ppath => '/!sparql/', is_dav => 1, vsp_user => 'dba', opts => vector('noinherit', 1));
+
+VHOST_REMOVE (vhost=>'data.openlinksw.com', lpath=>'/proxy');
+DB.DBA.VHOST_DEFINE (vhost=>'data.openlinksw.com', lhost=>':80', lpath=>'/proxy',
+ ppath=>'/SOAP/Http/ext_http_proxy', soap_user=>'PROXY');
+
+DB.DBA.VHOST_DEFINE (vhost=>'data.openlinksw.com:80', lhost=>':80', lpath=>'/xml_a',
+ ppath=>'/SOAP/',soap_user=>'XML_A');
+DB.DBA.VHOST_DEFINE (vhost=>'data.openlinksw.com:80', lhost=>':80', lpath=>'/XMLA',
+ ppath=>'/SOAP/', soap_user=>'XMLA', soap_opts => vector ('ServiceName', 'XMLAnalysis', 'elementFormDefault', 'qualified'))
+
+GRANT EXECUTE ON DB.DBA.RDF_SPONGE_UP TO "SPARQL", "SPARQL_UPDATE";
+GRANT EXECUTE ON DB.DBA.TTLP_EV_NEW_GRAPH TO "SPARQL", "SPARQL_UPDATE";
+grant SPARQL_UPDATE to "SPARQL";
+
+curl -H "Accept: application/rdf+xml" "http://data.openlinksw.com/oplweb/product_family/uda#this"
+
+SELECT hs_local_iri, exec ('sparql clear graph <'||hs_local_iri||'>') from sys_http_sponge;
+
+*/
+
+
+
+OWL based Ontology
+
+--sparql construct { ?x ?y ?z } from --<http://www.openlinksw.com/dataspace/organization/openlink#this>
+-- where { ?x ?y ?z }
+
+DB.DBA.RDF_LOAD_RDFXML_MT (
+'<?xml version="1.0"?>
+<rdf:RDF
+ xmlns="http://www.openlinksw.com/dataspace/organization/openlink/oplweb#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:owl="http://www.w3.org/2002/07/owl#"
+ xmlns:foaf="http://xmlns.com/foaf/0.1/"
+ xmlns:virtrdf="http://www.openlinksw.com/schemas/virtrdf#"
+ xml:base="http://www.openlinksw.com/schemas/oplweb#">
+ <owl:Ontology rdf:about="http://www.openlinksw.com/schemas/oplweb#">
+ <rdfs:label>ProductPortfolio</rdfs:label>
+ <rdfs:comment>OpenLink Product Portfolio</rdfs:comment>
+ <virtrdf:catName>oplweb</virtrdf:catName>
+ <virtrdf:version>1.00</virtrdf:version>
+ </owl:Ontology>
+
+ <!-- Family / Category / Format -->
+
+ <rdfs:Class rdf:ID="ProductFamily">
+ <rdfs:label>Product Family</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Family
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductCategory">
+ <rdfs:label>Product Category</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Category
+ </rdfs:comment>
+ <rdfs:subPropertyOf rdf:resource="#ProductFamily"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductFormat">
+ <rdfs:label>Product Format</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Format
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductFormatCategory">
+ <rdfs:label>Product Format Category</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Format Category
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="ProductFamilyDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:label>Product Family Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductFamilyLongDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:label>Product Family Long Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductFamilyCode">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:label>Product Family Long Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductFormatDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:label>Product Format Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductFormatLongDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:label>Product Format Long Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductFormatCode">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:domain rdf:resource="#ProductFormatCategory"/>
+ <rdfs:label>Product Format Long Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductCategoryDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductCategory"/>
+ <rdfs:label>Product Category Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductCategoryLongDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductCategory"/>
+ <rdfs:label>Product Category Long Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductCategoryCode">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductCategory"/>
+ <rdfs:domain rdf:resource="#ProductFormatCategory"/>
+ <rdfs:label>Product Category Long Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="hasProduct">
+ <rdfs:range rdf:resource="#Product"/>
+ <rdfs:domain rdf:resource="#ProductCategory"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:domain rdf:resource="#ProductFormatCategory"/>
+ <rdfs:label>Product</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="hasCategory">
+ <rdfs:range rdf:resource="#ProductCategory"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:domain rdf:resource="#Product"/>
+ <rdfs:label>Product</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="hasFormat">
+ <rdfs:range rdf:resource="#ProductFormat"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:label>Product</rdfs:label>
+ </rdf:Property>
+
+
+ <!-- Vendor -->
+
+ <rdfs:Class rdf:ID="VendorCategoryFamily">
+ <rdfs:label>vendor_category_family</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ vendor_category_family
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="VendorCategory">
+ <rdfs:label>vendor_category</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ vendor_category
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="VendorCategoryFamily"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="Vendors">
+ <rdfs:label>vendors</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ vendors
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="VendorCategory"/>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="VendorName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Vendors"/>
+ <rdfs:label>vendor name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="VendorCategoryFamilyDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#VendorCategoryFamily"/>
+ <rdfs:label>vendor_category_family_description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="VendorCategoryDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#VendorCategory"/>
+ <rdfs:label>vendor_category_description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="isOfVendorCategory">
+ <rdfs:range rdf:resource="#VendorCategory"/>
+ <rdfs:domain rdf:resource="#Vendors"/>
+ <rdfs:label>vendor_category_description</rdfs:label>
+ </rdf:Property>
+
+ <!-- Opsys / DBMS -->
+
+ <rdfs:Class rdf:ID="OpsysFamily">
+ <rdfs:label>Opsys Family</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Opsys Family
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="DbmsFamily">
+ <rdfs:label>Dbms Family</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Dbms Family
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="DbmsEngine">
+ <rdfs:label>Dbms Engine</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Dbms Engine
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="DbmsFamily"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="OpsysType">
+ <rdfs:label>Opsys Type</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Opsys Type
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProcessorMode">
+ <rdfs:label>Processor Mode</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Processor Mode
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="Processor">
+ <rdfs:label>Processor</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Processor
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="ProcessorFamily"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProcessorFamily">
+ <rdfs:label>Processor Family</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Processor Family
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="Opsys">
+ <rdfs:label>Dbms Engine</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ opsys
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="OpsysFamily"/>
+ <rdfs:subClassOf rdf:resource="OpsysType"/>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="OpsysFamilyName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#OpsysFamily"/>
+ <rdfs:label>Opsys Family Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysFamilyRating">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#OpsysFamily"/>
+ <rdfs:label>Opsys Family Rating</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysFamilyLicenseCode">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#OpsysFamily"/>
+ <rdfs:label>Opsys Family License Code</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysFamilyVendor">
+ <rdfs:range rdf:resource="#Vendors"/>
+ <rdfs:domain rdf:resource="#OpsysFamily"/>
+ <rdfs:label>Opsys Family Vendor</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DbmsFamilyName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DbmsFamily"/>
+ <rdfs:label>DBMS Family Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DbmsFamilyVendor">
+ <rdfs:range rdf:resource="#Vendors"/>
+ <rdfs:domain rdf:resource="#DbmsFamily"/>
+ <rdfs:label>DBMS Family Vendor</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DbmsName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DbmsEngine"/>
+ <rdfs:label>DBMS Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DbmsVersion">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DbmsEngine"/>
+ <rdfs:label>DBMS Version</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DbmsEngineRating">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DbmsEngine"/>
+ <rdfs:label>DBMS Engine Rating</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DbmsEngineOldArchiveCode">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DbmsEngine"/>
+ <rdfs:label>DBMS Engine old Archive Code</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DbmsUpwardCompatible">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DbmsEngine"/>
+ <rdfs:label>DBMS Upward Compatible</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DbmsDownwardCompatible">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DbmsEngine"/>
+ <rdfs:label>DBMS Downward Compatible</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysTypeDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#OpsysType"/>
+ <rdfs:label>Opsys Type Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysTypeShortDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#OpsysType"/>
+ <rdfs:label>Opsys Type Short Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:label>Opsys Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysVersion">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:label>Opsys Version</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysUpwardCompatible">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:label>Opsys Compatible</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysDownwardCompatible">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:label>Opsys Downward Compatible</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysLicenseCode">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:label>Opsys License Code</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysCommercialName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:label>Opsys Commercial Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysProcessor">
+ <rdfs:range rdf:resource="#Processor"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:label>Opsys Processor</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="OpsysEmulation">
+ <rdfs:range rdf:resource="#ProcessorMode"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:label>Opsys Emulation Mode</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProcessorModeName">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProcessorMode"/>
+ <rdfs:label>Processor Mode Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProcessorName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Processor"/>
+ <rdfs:label>Processor Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProcessorProcessorMode">
+ <rdfs:range rdf:resource="#ProcessorMode"/>
+ <rdfs:domain rdf:resource="#Processor"/>
+ <rdfs:label>Processor Mode</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProcessorDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Processor"/>
+ <rdfs:label>Processor Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProcessorFamilyName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProcessorFamily"/>
+ <rdfs:label>Processor Family Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProcessorFamilyDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProcessorFamily"/>
+ <rdfs:label>Processor Family Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProcessorFamilyVendor">
+ <rdfs:range rdf:resource="#Vendors"/>
+ <rdfs:domain rdf:resource="#ProcessorFamily"/>
+ <rdfs:label>Processor Family Vendor</rdfs:label>
+ </rdf:Property>
+
+
+ <!-- Product / Product Release -->
+
+ <rdfs:Class rdf:ID="Product">
+ <rdfs:label>Product</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product
+ </rdfs:comment>
+ <rdfs:subPropertyOf rdf:resource="#ProductFormat"/>
+ <rdfs:subPropertyOf rdf:resource="#ProductCategory"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductRelease">
+ <rdfs:label>Product Release</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Release
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#Product"/>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="ProductId">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Product"/>
+ <rdfs:label>Product ID</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="isOfCategory">
+ <rdfs:range rdf:resource="#ProductCategory"/>
+ <rdfs:domain rdf:resource="#Product"/>
+ <rdfs:label>Product Category</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="isOfFormat">
+ <rdfs:range rdf:resource="#ProductFormat"/>
+ <rdfs:domain rdf:resource="#Product"/>
+ <rdfs:label>Product Category</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductDescription">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Product"/>
+ <rdfs:label>Product Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductLongDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Product"/>
+ <rdfs:label>Product Long Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductReleaseId">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:label>Product Release ID</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductReleaseOpsys">
+ <rdfs:range rdf:resource="#Opsys"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:label>Product Release Opsys</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductReleaseDbms">
+ <rdfs:range rdf:resource="#DbmsEngine"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:label>Product Release DBMS</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductReleaseUpwardCompatible">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:label>Product Release upward compatible</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductReleaseDownwardCompatible">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:label>Product Release downward compatible</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductReleaseSupported">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:label>Product Release Supported</rdfs:label>
+ </rdf:Property>
+
+ <!-- Components -->
+
+ <rdfs:Class rdf:ID="Component">
+ <rdfs:label>Components</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Components
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ComponentMode">
+ <rdfs:label>Component Mode</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Component
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ComponentType">
+ <rdfs:label>Component</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Component Type
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ComponentCategory">
+ <rdfs:label>Component Category</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Component
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="ComponentModeDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentMode"/>
+ <rdfs:label>Component Mode Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentModeShortDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentMode"/>
+ <rdfs:label>Component Mode Short Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentTypeDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentType"/>
+ <rdfs:label>Component Type Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentTypeShortDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentType"/>
+ <rdfs:label>Component Type Short Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentCategoryDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentCategory"/>
+ <rdfs:label>Component Category Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentCategoryLongDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentCategory"/>
+ <rdfs:label>Component Category Long Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentCategoryShortDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentCategory"/>
+ <rdfs:label>Component Category Short Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentCvsid">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components CVSID</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentBuildDate">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Build Date</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="Notes">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Notes</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="BuildComments">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Build Comments</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="Filesize">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentComponentCategory">
+ <rdfs:range rdf:resource="#ComponentCategory"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Component Category</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentComponentType">
+ <rdfs:range rdf:resource="#ComponentType"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Component Type</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentComponentMode">
+ <rdfs:range rdf:resource="#ComponentMode"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Component Mode</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentOpsys">
+ <rdfs:range rdf:resource="#Opsys"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components Opsys</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentDbmsEngine">
+ <rdfs:range rdf:resource="#DbmsEngine"/>
+ <rdfs:domain rdf:resource="#Component"/>
+ <rdfs:label>Components DBMS</rdfs:label>
+ </rdf:Property>
+
+ <!-- Component Archives -->
+
+ <rdfs:Class rdf:ID="ComponentArchive">
+ <rdfs:label>Component Archive</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Component Archives
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#ProductRelease"/>
+ <rdfs:subClassOf rdf:resource="#Component"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ComponentArchiveType">
+ <rdfs:label>Component Archive Type</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Component Archives Type
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="ComponentArchiveTypeName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchiveType"/>
+ <rdfs:label>Component Archive Type Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveTypeShortName">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchiveType"/>
+ <rdfs:label>Component Archive Type Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveTypeExtension">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchiveType"/>
+ <rdfs:label>Component Archive Type Extension</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveComponentArchiveType">
+ <rdfs:range rdf:resource="#ComponentArchiveType"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:label>Component Archive Component Archive Type</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveName">
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:label>Component Archive Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveAssemblyDate">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:label>Component Archive Assembly Date</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveFileUri">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:label>Component Archive File URI</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveLicenseCode">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:label>Component Archive License Code</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveResName">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:label>Component Archive DAV Resource Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveResFullPath">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:label>Component Archive DAV Full Path</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ComponentArchiveResFileSize">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:label>Component Archive File Size in DAV</rdfs:label>
+ </rdf:Property>
+
+ <!-- Download locations -->
+
+ <rdfs:Class rdf:ID="DownloadLocation">
+ <rdfs:label>Download Location</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Download Location
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#ComponentArchive"/>
+ <rdfs:subClassOf rdf:resource="#DownloadPartner"/>
+ <rdfs:subClassOf rdf:resource="#DownloadProtocol"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="DownloadProtocol">
+ <rdfs:label>Download Protocol</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Download Protocol
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="DownloadPartner">
+ <rdfs:label>Download Partner</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Download Partner
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="ProtocolName">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadProtocol"/>
+ <rdfs:label>Protocol Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProtocolDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadProtocol"/>
+ <rdfs:label>Protocol Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProtocolActive">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadProtocol"/>
+ <rdfs:label>Protocol Active</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="PartnerName">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadPartner"/>
+ <rdfs:label>Download Partner Partner Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="HostName">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadPartner"/>
+ <rdfs:label>Download Partner Hostname</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DomainName">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadPartner"/>
+ <rdfs:label>Download Partner Domain Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="PortNumber">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadPartner"/>
+ <rdfs:label>Download Partner Port Number</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="Uri">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadLocation"/>
+ <rdfs:label>Download Location URI</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="UriOld">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#DownloadLocation"/>
+ <rdfs:label>Download Location URI Old</rdfs:label>
+ </rdf:Property>
+
+ <!-- Features and Benefits -->
+
+ <rdfs:Class rdf:ID="ProductBenefit">
+ <rdfs:label>Product Benefit</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Benefit
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#ProductBenefitCategory"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductBenefitCategory">
+ <rdfs:label>Product Benefit</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Benefit
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductFeatureCategory">
+ <rdfs:label>Product Feature Category</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Feature Category
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductFeature">
+ <rdfs:label>Product Features</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Features
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#ProductFeatureCategory"/>
+ <rdfs:subClassOf rdf:resource="#ProductBenefit"/>
+ <rdfs:subClassOf rdf:resource="#Product"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductFamilyFeature">
+ <rdfs:label>Product Family Features</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Family Features
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#ProductFeatureCategory"/>
+ <rdfs:subClassOf rdf:resource="#ProductBenefit"/>
+ <rdfs:subClassOf rdf:resource="#ProductFamily"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductFormatFeature">
+ <rdfs:label>Product Format Features</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Format Features
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#ProductFeatureCategory"/>
+ <rdfs:subClassOf rdf:resource="#ProductBenefit"/>
+ <rdfs:subClassOf rdf:resource="#ProductFormat"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductCategoryFeature">
+ <rdfs:label>Product Category Features</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Category Features
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#ProductFeatureCategory"/>
+ <rdfs:subClassOf rdf:resource="#ProductBenefit"/>
+ <rdfs:subClassOf rdf:resource="#ProductCategory"/>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="ProductReleaseFeature">
+ <rdfs:label>Product Benefit</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Product Benefit
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#ProductFeatureCategory"/>
+ <rdfs:subClassOf rdf:resource="#ProductBenefit"/>
+ <rdfs:subClassOf rdf:resource="#ProductRelease"/>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="ProductBenefitsCategoryDescription">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductBenefitsCategory"/>
+ <rdfs:label>product Benefits Category</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="Description">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductBenefit"/>
+ <rdfs:domain rdf:resource="#ProductBenefitCategory"/>
+ <rdfs:domain rdf:resource="#ProductFeatureCategory"/>
+ <rdfs:domain rdf:resource="#ProductFeature"/>
+ <rdfs:domain rdf:resource="#ProductFamilyFeature"/>
+ <rdfs:domain rdf:resource="#ProductFormatFeature"/>
+ <rdfs:domain rdf:resource="#ProductCategoryFeature"/>
+ <rdfs:domain rdf:resource="#ProductReleaseFeature"/>
+ <rdfs:label>Product Benefits Description</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="Details">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductFeature"/>
+ <rdfs:domain rdf:resource="#ProductFamilyFeature"/>
+ <rdfs:domain rdf:resource="#ProductFormatFeature"/>
+ <rdfs:domain rdf:resource="#ProductCategoryFeature"/>
+ <rdfs:domain rdf:resource="#ProductReleaseFeature"/>
+ <rdfs:label>Product Benefits Description Details</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductBenefitsAcronym">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductBenefit"/>
+ <rdfs:label>Product Benefits Acronym</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="ProductBenefitsExplanation">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductBenefit"/>
+ <rdfs:label>Product Benefits Explanation</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="DemoUrl">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductCategoryFeature"/>
+ <rdfs:domain rdf:resource="#ProductFormatFeature"/>
+ <rdfs:domain rdf:resource="#ProductFamilyFeature"/>
+ <rdfs:domain rdf:resource="#ProductReleaseFeature"/>
+ <rdfs:label>The Features Demo URL</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="HypesPerSecond">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+ <rdfs:domain rdf:resource="#ProductCategoryFeature"/>
+ <rdfs:domain rdf:resource="#ProductFormatFeature"/>
+ <rdfs:domain rdf:resource="#ProductFamilyFeature"/>
+ <rdfs:domain rdf:resource="#ProductreleaseFeature"/>
+ <rdfs:label>The Features Number of Hypes per second</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="Implemented">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#ProductCategoryFeature"/>
+ <rdfs:domain rdf:resource="#ProductFormatFeature"/>
+ <rdfs:domain rdf:resource="#ProductFamilyFeature"/>
+ <rdfs:domain rdf:resource="#ProductReleaseFeature"/>
+ <rdfs:label>The Features Short Description</rdfs:label>
+ </rdf:Property>
+
+<!-- shop / pricing stuff -->
+
+ <rdfs:Class rdf:ID="LicenseType">
+ <rdfs:label>License Type</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ License Type
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="UnitType">
+ <rdfs:label>Unit Type</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Unit Type
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="GeneralDiscount">
+ <rdfs:label>General Discount</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ General Discount
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="IncrementalDiscount">
+ <rdfs:label>Incremental Discount</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ Incremental Discount
+ </rdfs:comment>
+ </rdfs:Class>
+
+ <rdfs:Class rdf:ID="License">
+ <rdfs:label>License</rdfs:label>
+ <rdfs:comment rdf:datatype="http://www.w3.org/2001/XMLSchema#string">
+ License
+ </rdfs:comment>
+ <rdfs:subClassOf rdf:resource="#LicenseType"/>
+ <rdfs:subClassOf rdf:resource="#ProductRelease"/>
+ </rdfs:Class>
+
+ <rdf:Property rdf:ID="BaseCostUnit">
+ <rdfs:range rdf:resource="#UnitType"/>
+ <rdfs:domain rdf:resource="#License"/>
+ <rdfs:label>Base Unit Cost</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="PriceUnit">
+ <rdfs:range rdf:resource="#UnitType"/>
+ <rdfs:domain rdf:resource="#License"/>
+ <rdfs:label>Price Unit Cost</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="hasDiscount">
+ <rdfs:range rdf:resource="#IncrementalDiscount"/>
+ <rdfs:domain rdf:resource="#UnitType"/>
+ <rdfs:label>Base Unit Cost</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="hasGeneralDiscount">
+ <rdfs:range rdf:resource="#GeneralDiscount"/>
+ <rdfs:domain rdf:resource="#License"/>
+ <rdfs:label>General Discount</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="unitValue">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#UnitType"/>
+ <rdfs:label>Unit Value</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="graceUnit">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#UnitType"/>
+ <rdfs:label>Grace Unit</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="minUnits">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#UnitType"/>
+ <rdfs:label>Minimum Units</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="maxUnits">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#UnitType"/>
+ <rdfs:label>Maximum Units</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="codeWord">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#GeneralDiscount"/>
+ <rdfs:label>Code Word needed to activate this discount</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="startDate">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#GeneralDiscount"/>
+ <rdfs:label>Discount Start Date</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="endDate">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#GeneralDiscount"/>
+ <rdfs:label>Discount End Date</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="percentageOfCost">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#GeneralDiscount"/>
+ <rdfs:label>Percentage of cost attributing as discount</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="triggerPoint">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#IncrementalDiscount"/>
+ <rdfs:label>Discount Trigger Point</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="percentageOfBase">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:domain rdf:resource="#IncrementalDiscount"/>
+ <rdfs:label>Percentage of base cost attributing as discount</rdfs:label>
+ </rdf:Property>
+
+<!-- common properties -->
+
+ <rdf:Property rdf:ID="label">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2001/XMLSchema#label"/>
+ <rdfs:domain rdf:resource="#ProductCategory"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:domain rdf:resource="#VendorCategory"/>
+ <rdfs:domain rdf:resource="#Vendor"/>
+ <rdfs:domain rdf:resource="#OpsysFamily"/>
+ <rdfs:domain rdf:resource="#DbmsFamily"/>
+ <rdfs:domain rdf:resource="#DbmsEngine"/>
+ <rdfs:domain rdf:resource="#OpsysType"/>
+ <rdfs:domain rdf:resource="#Processor"/>
+ <rdfs:domain rdf:resource="#ProcessorFamily"/>
+ <rdfs:domain rdf:resource="#Opsys"/>
+ <rdfs:domain rdf:resource="#Product"/>
+ <rdfs:domain rdf:resource="#ComponentMode"/>
+ <rdfs:domain rdf:resource="#ComponentType"/>
+ <rdfs:domain rdf:resource="#ComponentCategory"/>
+ <rdfs:domain rdf:resource="#ComponentArchive"/>
+ <rdfs:domain rdf:resource="#ComponentArchiveType"/>
+ <rdfs:domain rdf:resource="#DownloadLocation"/>
+ <rdfs:domain rdf:resource="#ProductBenefit"/>
+ <rdfs:domain rdf:resource="#ProductBenefitCategory"/>
+ <rdfs:domain rdf:resource="#ProductFeatureCategory"/>
+ <rdfs:domain rdf:resource="#ProductFeature"/>
+ <rdfs:domain rdf:resource="#ProductFamilyFeature"/>
+ <rdfs:domain rdf:resource="#ProductFormatFeature"/>
+ <rdfs:domain rdf:resource="#ProductCategoryFeature"/>
+ <rdfs:domain rdf:resource="#ProductReleaseFeature"/>
+ <rdfs:domain rdf:resource="#LicenseModel"/>
+ <rdfs:domain rdf:resource="#Discount"/>
+ <rdfs:domain rdf:resource="#PriceType"/>
+ <rdfs:domain rdf:resource="#PriceUnitType"/>
+ <rdfs:label>Label</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="name">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/name"/>
+ <rdfs:domain rdf:resource="#ProductCategory"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:label>Name</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="logo">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/logo"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:label>logo</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="homepage">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/homepage"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:domain rdf:resource="#ProcessorFamily"/>
+ <rdfs:domain rdf:resource="#OpsysFamily"/>
+ <rdfs:domain rdf:resource="#DbmsFamily"/>
+ <rdfs:label>homepage</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="maker">
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+ <rdfs:subPropertyOf rdf:resource="http://xmlns.com/foaf/0.1/maker"/>
+ <rdfs:domain rdf:resource="#ProductCategory"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:label>Maker</rdfs:label>
+ </rdf:Property>
+
+ <rdf:Property rdf:ID="sameAs">
+ <rdfs:range rdf:resource="owl#sameAs"/>
+ <rdfs:domain rdf:resource="#ProductCategory"/>
+ <rdfs:domain rdf:resource="#ProductFormat"/>
+ <rdfs:domain rdf:resource="#ProductFamily"/>
+ <rdfs:domain rdf:resource="#ProductRelease"/>
+ <rdfs:domain rdf:resource="#ProductFormatCategory"/>
+ <rdfs:label>Name</rdfs:label>
+ </rdf:Property>
+
+</rdf:RDF>
+
+',
+'http://www.openlinksw.com/schemas/oplweb#',
+'http://www.openlinksw.com/schemas/oplweb#')
+--'http://www.openlinksw.com/dataspace/organization/openlink/ProductPortfolioOntology/1.0/')
+;
+
+rdfs_rule_set ('oplweb2_owlset', 'http://www.openlinksw.com/schemas/oplweb#', 1);
+
+DB.DBA.XML_SET_NS_DECL ('opl', 'http://www.openlinksw.com/schemas/oplweb#', 2);
+]]></programlisting>
+</sect2>
<sect2 id="rdfviewsenterprsyb">
<title>Sybase using demonstration 'pubs2' database</title>
<programlisting><![CDATA[
--- Setup script for Linked Data Views of Sybase 15 PUBS2 Sample Database --
+-- Setup script for RDF views of Sybase 15 PUBS2 Sample Database --
DB..vd_remote_data_source ('syb15ma-pubs2', '', '<uid>','<pwd>');
@@ -7051,7 +12070,7 @@ DB.DBA.XML_SET_NS_DECL ('northwind', 'http://demo.openlinksw.com/schemas/northwi
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
@@ -7517,7 +12536,7 @@ DB.DBA.XML_SET_NS_DECL ('northwind', 'http://demo.openlinksw.com/schemas/northwi
</itemizedlist>
<para><emphasis>Script to set up your own instance</emphasis></para>
<programlisting><![CDATA[
--- Setup script for Linked Data Views of Oracle 10 Human Resources Sample Database --
+-- Setup script for RDF views of Oracle 10 Human Resources Sample Database --
GRANT SELECT ON HR.orama.COUNTRIES TO "SPARQL", "SPARQL_UPDATE";
GRANT SELECT ON HR.orama.REGIONS TO "SPARQL", "SPARQL_UPDATE";
@@ -8007,7 +13026,7 @@ DB.DBA.XML_SET_NS_DECL ('hr', 'http://^{URIQADefaultHost}^/schemas/oraclehr/', 2
</itemizedlist>
<para><emphasis>Script to set up your own instance</emphasis></para>
<programlisting><![CDATA[
--- Setup script for Linked Data Views of Oracle 10 Human Resources Sample Database --
+-- Setup script for RDF views of Oracle 10 Human Resources Sample Database --
GRANT SELECT ON HR.orama.COUNTRIES TO "SPARQL", "SPARQL_UPDATE";
GRANT SELECT ON HR.orama.REGIONS TO "SPARQL", "SPARQL_UPDATE";
@@ -8492,8 +13511,8 @@ DB.DBA.XML_SET_NS_DECL ('hr', 'http://^{URIQADefaultHost}^/schemas/oraclehr/', 2
<title>DB2 using the demonstration 'Sample' database</title>
<para><emphasis>Version defined using explicit host - localhost:8890</emphasis></para>
<programlisting><![CDATA[
--- $Id: rdfviewssamples.xml,v 1.1.2.3 2012/03/07 15:28:57 source Exp $
--- Setup script for Linked Data Views of portions of DB2 SAMPLE database included
+-- $Id: rdfviewssamples.xml,v 1.1.2.2 2011/09/09 14:09:19 source Exp $
+-- Setup script for RDF view of portions of DB2 SAMPLE database included
-- in DB2 Express Edition v9.5
--
-- The script assumes external DB2 tables are linked into Virtuoso using
@@ -10148,7 +15167,7 @@ DB.DBA.XML_SET_NS_DECL ('custc', 'http://^{URIQADefaultHost}^/schemas/informix
<sect2 id="rdfviewsenterpringr">
<title>Ingres using demonstration 'Tutorial' database</title>
<programlisting><![CDATA[
--- Setup script for Linked Data Views of Ingres R3 Tutorial Sample Database --
+-- Setup script for RDF views of Ingres R3 Tutorial Sample Database --
DB..vd_remote_data_source ('ingiima-tut', '', '<uid>','<pwd>');
diff --git a/docsrc/xmlsource/relnotes.xml b/docsrc/xmlsource/relnotes.xml
index 202e180..e8c1c9f 100644
--- a/docsrc/xmlsource/relnotes.xml
+++ b/docsrc/xmlsource/relnotes.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/rendezvous.xml b/docsrc/xmlsource/rendezvous.xml
index 7c44ebe..50bfe4d 100644
--- a/docsrc/xmlsource/rendezvous.xml
+++ b/docsrc/xmlsource/rendezvous.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/repl.xml b/docsrc/xmlsource/repl.xml
index df52e4d..32dc0b9 100644
--- a/docsrc/xmlsource/repl.xml
+++ b/docsrc/xmlsource/repl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/rowlevelsecurity.xml b/docsrc/xmlsource/rowlevelsecurity.xml
index 602ac20..710f35d 100644
--- a/docsrc/xmlsource/rowlevelsecurity.xml
+++ b/docsrc/xmlsource/rowlevelsecurity.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/rth.aspx.xml b/docsrc/xmlsource/rth.aspx.xml
index 89b6d8d..8162dcc 100644
--- a/docsrc/xmlsource/rth.aspx.xml
+++ b/docsrc/xmlsource/rth.aspx.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/ruby.xml b/docsrc/xmlsource/ruby.xml
index 6dd0cb2..91b4518 100644
--- a/docsrc/xmlsource/ruby.xml
+++ b/docsrc/xmlsource/ruby.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/runtimehosting.xml b/docsrc/xmlsource/runtimehosting.xml
index ae04893..1db522a 100644
--- a/docsrc/xmlsource/runtimehosting.xml
+++ b/docsrc/xmlsource/runtimehosting.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/sampleapps.xml b/docsrc/xmlsource/sampleapps.xml
index 66fa9e8..ee5221c 100644
--- a/docsrc/xmlsource/sampleapps.xml
+++ b/docsrc/xmlsource/sampleapps.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/secureodbc.xml b/docsrc/xmlsource/secureodbc.xml
index 9d8c8d6..eb01119 100644
--- a/docsrc/xmlsource/secureodbc.xml
+++ b/docsrc/xmlsource/secureodbc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/server.xml b/docsrc/xmlsource/server.xml
index d569b45..c99bd27 100644
--- a/docsrc/xmlsource/server.xml
+++ b/docsrc/xmlsource/server.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1618,17 +1618,6 @@ Section <link linkend="rdfandsparql">RDF Data Access and Data Management</link>
</para>
</formalpara>
</listitem>
-<listitem id="ini_SPARQL_ShortenLongURIs">
- <formalpara>
- <title>ShortenLongURIs = 1</title>
- <para>Shorten extremely long URIs in datasets when loading with the RDF Bulk Loader. Default is 0. </para>
- <para><emphasis>Note</emphasis>: This parameter is only in the Virtuoso 06.03.3131+ commercial builds,
- at the time of writing it is not included in the open source 6.1.4 archives but will be in the
- next 6.1.5 release. A patch to enable this feature is however available from the
- <ulink url="http://sourceforge.net/tracker/?func=detail&aid=3496331&group_id=161622&atid=820576">Virtuso patches page on source forge</ulink>, which can be applied to a 6.1.4 archive from source forge and the Virtuoso
- server binary rebuilt.</para>
- </formalpara>
-</listitem>
<listitem id="ini_SPARQL_MaxMemInUse">
<formalpara>
<title>MaxMemInUse = 0</title>
diff --git a/docsrc/xmlsource/soap.xml b/docsrc/xmlsource/soap.xml
index 986ef1f..44b1f49 100644
--- a/docsrc/xmlsource/soap.xml
+++ b/docsrc/xmlsource/soap.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/sqlinverse.xml b/docsrc/xmlsource/sqlinverse.xml
index 902a706..1d5a07f 100644
--- a/docsrc/xmlsource/sqlinverse.xml
+++ b/docsrc/xmlsource/sqlinverse.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/sqloptimizer.xml b/docsrc/xmlsource/sqloptimizer.xml
index 27a3273..81026db 100644
--- a/docsrc/xmlsource/sqloptimizer.xml
+++ b/docsrc/xmlsource/sqloptimizer.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/sqlprocedures.xml b/docsrc/xmlsource/sqlprocedures.xml
index 8406afc..ddb6000 100644
--- a/docsrc/xmlsource/sqlprocedures.xml
+++ b/docsrc/xmlsource/sqlprocedures.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/sqlreference.xml b/docsrc/xmlsource/sqlreference.xml
index c000d5d..d1152fd 100644
--- a/docsrc/xmlsource/sqlreference.xml
+++ b/docsrc/xmlsource/sqlreference.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/support.xml b/docsrc/xmlsource/support.xml
index 8878b3c..92462df 100644
--- a/docsrc/xmlsource/support.xml
+++ b/docsrc/xmlsource/support.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/syncml.xml b/docsrc/xmlsource/syncml.xml
index 043d164..b2cc431 100644
--- a/docsrc/xmlsource/syncml.xml
+++ b/docsrc/xmlsource/syncml.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/systemtables.xml b/docsrc/xmlsource/systemtables.xml
index 925d992..07c4683 100644
--- a/docsrc/xmlsource/systemtables.xml
+++ b/docsrc/xmlsource/systemtables.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/tpcc.xml b/docsrc/xmlsource/tpcc.xml
index 5654ce2..f862681 100644
--- a/docsrc/xmlsource/tpcc.xml
+++ b/docsrc/xmlsource/tpcc.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: tpcc.xml,v 1.4.2.2 2012/03/07 15:28:58 source Exp $
+ $Id: tpcc.xml,v 1.4.2.1 2010/01/25 22:55:37 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2010 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
@@ -618,7 +618,7 @@ read in the client (SQL_CONCURRENCY option).
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2010 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
@@ -784,7 +784,7 @@ CREATE TABLE STOCK (
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2010 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
diff --git a/docsrc/xmlsource/uddi.xml b/docsrc/xmlsource/uddi.xml
index 610d39f..d74ff80 100644
--- a/docsrc/xmlsource/uddi.xml
+++ b/docsrc/xmlsource/uddi.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/udt.xml b/docsrc/xmlsource/udt.xml
index 4e8ba87..ee25d53 100644
--- a/docsrc/xmlsource/udt.xml
+++ b/docsrc/xmlsource/udt.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/uriqa.xml b/docsrc/xmlsource/uriqa.xml
index ae1fe89..e616f4a 100644
--- a/docsrc/xmlsource/uriqa.xml
+++ b/docsrc/xmlsource/uriqa.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/usermodel.xml b/docsrc/xmlsource/usermodel.xml
index 2c29e2e..e4c28d0 100644
--- a/docsrc/xmlsource/usermodel.xml
+++ b/docsrc/xmlsource/usermodel.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vad.xml b/docsrc/xmlsource/vad.xml
index 535c3a1..f1b22d0 100644
--- a/docsrc/xmlsource/vad.xml
+++ b/docsrc/xmlsource/vad.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -712,7 +712,7 @@ set of documentation files. </para>
<name package="rdf_lib">
<prop name="Title" value="RDF Support Library" />
<prop name="Developer" value="OpenLink Software" />
- <prop name="Copyright" value="(C) 2012 OpenLink Software" />
+ <prop name="Copyright" value="(C) 2003 OpenLink Software" />
<prop name="Download" value="http://www.openlinksw.com/virtuoso/rdf_lib/download" />
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/rdf_lib/download" />
</name>
diff --git a/docsrc/xmlsource/vaddistr.xml b/docsrc/xmlsource/vaddistr.xml
index a9d3794..46716dc 100644
--- a/docsrc/xmlsource/vaddistr.xml
+++ b/docsrc/xmlsource/vaddistr.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -707,7 +707,7 @@ set of documentation files.</para>
<name package="rdf_lib">
<prop name="Title" value="RDF Support Library" />
<prop name="Developer" value="OpenLink Software" />
- <prop name="Copyright" value="(C) 2012 OpenLink Software" />
+ <prop name="Copyright" value="(C) 2003 OpenLink Software" />
<prop name="Download" value="http://www.openlinksw.com/virtuoso/rdf_lib/download" />
<prop name="Download" value="http://www.openlinksw.co.uk/virtuoso/rdf_lib/download" />
</name>
diff --git a/docsrc/xmlsource/vdbconcepts.xml b/docsrc/xmlsource/vdbconcepts.xml
index a6a1d7b..8a26707 100644
--- a/docsrc/xmlsource/vdbconcepts.xml
+++ b/docsrc/xmlsource/vdbconcepts.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vfoafssl.xml b/docsrc/xmlsource/vfoafssl.xml
index 6f95a4a..1bd220f 100644
--- a/docsrc/xmlsource/vfoafssl.xml
+++ b/docsrc/xmlsource/vfoafssl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/virtclientref.xml b/docsrc/xmlsource/virtclientref.xml
index 1f9fb2d..4f748b5 100644
--- a/docsrc/xmlsource/virtclientref.xml
+++ b/docsrc/xmlsource/virtclientref.xml
@@ -5,7 +5,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/virtdocs.xml b/docsrc/xmlsource/virtdocs.xml
index 2747f49..e45caa8 100644
--- a/docsrc/xmlsource/virtdocs.xml
+++ b/docsrc/xmlsource/virtdocs.xml
@@ -318,8 +318,6 @@
<!ENTITY rdf_graph_group_create SYSTEM "funcref/rdf_graph_group_create.xml">
<!ENTITY rdf_graph_group_ins SYSTEM "funcref/rdf_graph_group_ins.xml">
<!ENTITY rdfs_rule_set SYSTEM "funcref/rdfs_rule_set.xml">
-<!ENTITY rdf_view_sync_to_physical SYSTEM "funcref/rdf_view_sync_to_physical.xml">
-
<!ENTITY rdf_load_rdfa SYSTEM "funcref/rdf_load_rdfa.xml">
<!ENTITY rdf_load_rdfxml SYSTEM "funcref/rdf_load_rdfxml.xml">
@@ -349,7 +347,6 @@
<!ENTITY isref SYSTEM "funcref/isref.xml">
<!ENTITY SAMPLE SYSTEM "funcref/SAMPLE.xml">
<!ENTITY GROUP_CONCAT SYSTEM "funcref/GROUP_CONCAT.xml">
-<!ENTITY GROUP_DIGEST SYSTEM "funcref/GROUP_DIGEST.xml">
<!--
- Uncommented for Virtuoso 6 Release-->
@@ -591,7 +588,6 @@
<!ENTITY vad_fail_check SYSTEM "funcref/vad_fail_check.xml">
<!ENTITY vad_install SYSTEM "funcref/vad_install.xml">
<!ENTITY vad_load_file SYSTEM "funcref/vad_load_file.xml">
-<!ENTITY vad_load_sql_file SYSTEM "funcref/vad_load_sql_file.xml">
<!ENTITY vad_pack SYSTEM "funcref/vad_pack.xml">
<!ENTITY vad_safe_exec SYSTEM "funcref/vad_safe_exec.xml">
<!ENTITY vad_uninstall SYSTEM "funcref/vad_uninstall.xml">
diff --git a/docsrc/xmlsource/virtwhitepaper.xml b/docsrc/xmlsource/virtwhitepaper.xml
index 01111a0..6139a03 100644
--- a/docsrc/xmlsource/virtwhitepaper.xml
+++ b/docsrc/xmlsource/virtwhitepaper.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/voauth.xml b/docsrc/xmlsource/voauth.xml
index 8f5c7c5..856948b 100644
--- a/docsrc/xmlsource/voauth.xml
+++ b/docsrc/xmlsource/voauth.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vsmx.xml b/docsrc/xmlsource/vsmx.xml
index 764638a..43fb4d1 100644
--- a/docsrc/xmlsource/vsmx.xml
+++ b/docsrc/xmlsource/vsmx.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vsp.xml b/docsrc/xmlsource/vsp.xml
index b158597..e08e158 100644
--- a/docsrc/xmlsource/vsp.xml
+++ b/docsrc/xmlsource/vsp.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vsptraining.xml b/docsrc/xmlsource/vsptraining.xml
index d3b6d43..f2c8705 100644
--- a/docsrc/xmlsource/vsptraining.xml
+++ b/docsrc/xmlsource/vsptraining.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx.xml b/docsrc/xmlsource/vspx.xml
index 0f6321b..3572527 100644
--- a/docsrc/xmlsource/vspx.xml
+++ b/docsrc/xmlsource/vspx.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_button.xml b/docsrc/xmlsource/vspx_ref/vc_button.xml
index 7f0b4ff..ac9a59a 100644
--- a/docsrc/xmlsource/vspx_ref/vc_button.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_button.xml
@@ -322,12 +322,12 @@ constructor method vspx_button (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: button__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -373,12 +373,12 @@ placed into the resulting HTML with no changes.
<?xml version="1.0"?>
<!--
-
- - $Id: button__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -429,12 +429,12 @@ The form accepts two numbers and calculates their sum.
<?xml version="1.0"?>
<!--
-
- - $Id: button__2.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__2.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -486,12 +486,12 @@ The form allows to select a file from server's file system
<?xml version="1.0"?>
<!--
-
- - $Id: button__3.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__3.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -539,12 +539,12 @@ The form allows to select a two values from a different page
<?xml version="1.0"?>
<!--
-
- - $Id: button__4.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__4.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_calendar.xml b/docsrc/xmlsource/vspx_ref/vc_calendar.xml
index 6a7f503..5a26264 100644
--- a/docsrc/xmlsource/vspx_ref/vc_calendar.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_calendar.xml
@@ -137,12 +137,12 @@ constructor method vspx_calendar (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: calendar__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: calendar__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_check_box.xml b/docsrc/xmlsource/vspx_ref/vc_check_box.xml
index ec3ead6..3fa9d9b 100644
--- a/docsrc/xmlsource/vspx_ref/vc_check_box.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_check_box.xml
@@ -274,12 +274,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: check_box__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: check_box__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_code_file.xml b/docsrc/xmlsource/vspx_ref/vc_code_file.xml
index 3358880..4312f54 100644
--- a/docsrc/xmlsource/vspx_ref/vc_code_file.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_code_file.xml
@@ -65,12 +65,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: code_file__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: code_file__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_data_grid.xml b/docsrc/xmlsource/vspx_ref/vc_data_grid.xml
index 61923c9..c659ab6 100644
--- a/docsrc/xmlsource/vspx_ref/vc_data_grid.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_data_grid.xml
@@ -239,12 +239,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: data_grid__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_grid__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_data_list.xml b/docsrc/xmlsource/vspx_ref/vc_data_list.xml
index 1cae64b..339f612 100644
--- a/docsrc/xmlsource/vspx_ref/vc_data_list.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_data_list.xml
@@ -303,12 +303,12 @@ constructor method vspx_data_list (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: data_list__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_list__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -350,12 +350,12 @@ with a option values their customer IDs.
<?xml version="1.0"?>
<!--
-
- - $Id: data_list__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_list__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_data_set.xml b/docsrc/xmlsource/vspx_ref/vc_data_set.xml
index 9af2c80..2448209 100644
--- a/docsrc/xmlsource/vspx_ref/vc_data_set.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_data_set.xml
@@ -264,12 +264,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_set__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -370,12 +370,12 @@ Allows editing, addtion and removal of existing records.
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_set__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_data_source.xml b/docsrc/xmlsource/vspx_ref/vc_data_source.xml
index 0d5ada3..78bccdd 100644
--- a/docsrc/xmlsource/vspx_ref/vc_data_source.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_data_source.xml
@@ -284,12 +284,12 @@ constructor method vspx_data_source (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: data_source__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_source__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_error_summary.xml b/docsrc/xmlsource/vspx_ref/vc_error_summary.xml
index 3febe29..397ed01 100644
--- a/docsrc/xmlsource/vspx_ref/vc_error_summary.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_error_summary.xml
@@ -67,12 +67,12 @@ different places of the page to print errors for different controls.
<?xml version="1.0"?>
<!--
-
- - $Id: error_summary__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: error_summary__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -127,12 +127,12 @@ in the place specified by v:error-summary element.
<?xml version="1.0"?>
<!--
-
- - $Id: error_summary__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: error_summary__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_form.xml b/docsrc/xmlsource/vspx_ref/vc_form.xml
index bd9b03a..21fcf60 100644
--- a/docsrc/xmlsource/vspx_ref/vc_form.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_form.xml
@@ -226,12 +226,12 @@ create type vspx_form under vspx_control
<?xml version="1.0"?>
<!--
-
- - $Id: form__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -278,12 +278,12 @@ The OK button of the form submits data from the form back to the same page.
<?xml version="1.0"?>
<!--
-
- - $Id: form__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: form__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_include.xml b/docsrc/xmlsource/vspx_ref/vc_include.xml
index 40e08a4..701bd6e 100644
--- a/docsrc/xmlsource/vspx_ref/vc_include.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_include.xml
@@ -86,12 +86,12 @@ Unlike 'active' attribute, this one is effective only when the page is d
<?xml version="1.0"?>
<!--
-
- - $Id: include__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: include__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_label.xml b/docsrc/xmlsource/vspx_ref/vc_label.xml
index 40e652d..08678b6 100644
--- a/docsrc/xmlsource/vspx_ref/vc_label.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_label.xml
@@ -225,12 +225,12 @@ overriding method vc_render () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: label__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: label__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_login.xml b/docsrc/xmlsource/vspx_ref/vc_login.xml
index 6985b9b..46564c3 100644
--- a/docsrc/xmlsource/vspx_ref/vc_login.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_login.xml
@@ -238,12 +238,12 @@ constructor method vspx_login (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: login__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: login__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_login_form.xml b/docsrc/xmlsource/vspx_ref/vc_login_form.xml
index 30ead50..84fecd6 100644
--- a/docsrc/xmlsource/vspx_ref/vc_login_form.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_login_form.xml
@@ -181,12 +181,12 @@ overriding method vc_render () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: login_form__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: login_form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_page.xml b/docsrc/xmlsource/vspx_ref/vc_page.xml
index 8ebd893..ef4fa17 100644
--- a/docsrc/xmlsource/vspx_ref/vc_page.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_page.xml
@@ -178,12 +178,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: page__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: page__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_radio_button.xml b/docsrc/xmlsource/vspx_ref/vc_radio_button.xml
index 4df443c..563b774 100644
--- a/docsrc/xmlsource/vspx_ref/vc_radio_button.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_radio_button.xml
@@ -243,12 +243,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: radio_button__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: radio_button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_radio_group.xml b/docsrc/xmlsource/vspx_ref/vc_radio_group.xml
index a8431a2..45edd27 100644
--- a/docsrc/xmlsource/vspx_ref/vc_radio_group.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_radio_group.xml
@@ -151,12 +151,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: radio_group__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: radio_group__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_select_list.xml b/docsrc/xmlsource/vspx_ref/vc_select_list.xml
index 092d5df..7150068 100644
--- a/docsrc/xmlsource/vspx_ref/vc_select_list.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_select_list.xml
@@ -253,12 +253,12 @@ constructor method vspx_select_list (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: select_list__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: select_list__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_tab.xml b/docsrc/xmlsource/vspx_ref/vc_tab.xml
index 1293e53..7ff177a 100644
--- a/docsrc/xmlsource/vspx_ref/vc_tab.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_tab.xml
@@ -175,12 +175,12 @@ as
<?xml version="1.0"?>
<!--
-
- - $Id: tab__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: tab__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_text.xml b/docsrc/xmlsource/vspx_ref/vc_text.xml
index 2f8af3a..c89e24a 100644
--- a/docsrc/xmlsource/vspx_ref/vc_text.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_text.xml
@@ -293,12 +293,12 @@ as
<?xml version="1.0"?>
<!--
-
- - $Id: text__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: text__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_tree.xml b/docsrc/xmlsource/vspx_ref/vc_tree.xml
index 5791654..9836d47 100644
--- a/docsrc/xmlsource/vspx_ref/vc_tree.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_tree.xml
@@ -247,12 +247,12 @@ constructor method vspx_tree (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: tree__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: tree__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_url.xml b/docsrc/xmlsource/vspx_ref/vc_url.xml
index 5b9d53a..7f9d8f2 100644
--- a/docsrc/xmlsource/vspx_ref/vc_url.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_url.xml
@@ -242,12 +242,12 @@ constructor method vspx_url (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: url__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: url__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_validator.xml b/docsrc/xmlsource/vspx_ref/vc_validator.xml
index d107058..4d71a28 100644
--- a/docsrc/xmlsource/vspx_ref/vc_validator.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_validator.xml
@@ -178,12 +178,12 @@ The value of this attribute will not be used when the resulting HTML is rendered
<?xml version="1.0"?>
<!--
-
- - $Id: validator__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: validator__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_variable.xml b/docsrc/xmlsource/vspx_ref/vc_variable.xml
index 3a94d9e..7e57f35 100644
--- a/docsrc/xmlsource/vspx_ref/vc_variable.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_variable.xml
@@ -152,12 +152,12 @@ The value of this attribute will not be used when the resulting HTML is rendered
<?xml version="1.0"?>
<!--
-
- - $Id: variable__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: variable__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vc_vscx.xml b/docsrc/xmlsource/vspx_ref/vc_vscx.xml
index 59e93ab..2aa9d0d 100644
--- a/docsrc/xmlsource/vspx_ref/vc_vscx.xml
+++ b/docsrc/xmlsource/vspx_ref/vc_vscx.xml
@@ -136,12 +136,12 @@ overriding method vc_pre_render (stream any, n int) returns any
<?xml version="1.0"?>
<!--
-
- - $Id: vscx__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: vscx__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -197,12 +197,12 @@ as a child of outer page.
<?xml version="1.0"?>
<!--
-
- - $Id: vscx__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: vscx__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_button.xml b/docsrc/xmlsource/vspx_ref/vspx_button.xml
index 8964a8b..656eb84 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_button.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_button.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_check_box.xml b/docsrc/xmlsource/vspx_ref/vspx_check_box.xml
index 31667a2..d2600e5 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_check_box.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_check_box.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml b/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml
index 0ff605d..dedac92 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_list.xml b/docsrc/xmlsource/vspx_ref/vspx_data_list.xml
index 3041d46..c02b163 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_data_list.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_data_list.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_set.xml b/docsrc/xmlsource/vspx_ref/vspx_data_set.xml
index 215f632..9cf7d1e 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_data_set.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_data_set.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml b/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml
index 5abdbce..3aecac1 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_field.xml b/docsrc/xmlsource/vspx_ref/vspx_field.xml
index 8131d26..84a1a61 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_field.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_field.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_form.xml b/docsrc/xmlsource/vspx_ref/vspx_form.xml
index 3928ba2..5d45572 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_form.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_form.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_include.xml b/docsrc/xmlsource/vspx_ref/vspx_include.xml
index 224ddbd..91f8770 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_include.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_include.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_label.xml b/docsrc/xmlsource/vspx_ref/vspx_label.xml
index 3dd9b78..1fcc43f 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_label.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_label.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_login.xml b/docsrc/xmlsource/vspx_ref/vspx_login.xml
index 0e70fe8..24421ce 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_login.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_login.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_login_form.xml b/docsrc/xmlsource/vspx_ref/vspx_login_form.xml
index 3a7b9e6..2608644 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_login_form.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_login_form.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_page.xml b/docsrc/xmlsource/vspx_ref/vspx_page.xml
index 9c7abbe..67c7a8c 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_page.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_page.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml b/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml
index 53e90df..10a305c 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_select_list.xml b/docsrc/xmlsource/vspx_ref/vspx_select_list.xml
index 2d356e6..da9e07c 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_select_list.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_select_list.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_tab.xml b/docsrc/xmlsource/vspx_ref/vspx_tab.xml
index a590bc5..091814e 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_tab.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_tab.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_template.xml b/docsrc/xmlsource/vspx_ref/vspx_template.xml
index 21389c7..dc0941f 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_template.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_template.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_text.xml b/docsrc/xmlsource/vspx_ref/vspx_text.xml
index e3ce27b..d822ae6 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_text.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_text.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_textarea.xml b/docsrc/xmlsource/vspx_ref/vspx_textarea.xml
index 128a883..4bf0f4c 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_textarea.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_textarea.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_tree.xml b/docsrc/xmlsource/vspx_ref/vspx_tree.xml
index 905034e..bcbf0de 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_tree.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_tree.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_update_field.xml b/docsrc/xmlsource/vspx_ref/vspx_update_field.xml
index b978fb7..9a7ec41 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_update_field.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_update_field.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_url.xml b/docsrc/xmlsource/vspx_ref/vspx_url.xml
index 1d746c5..bae0897 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_url.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_url.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_validator.xml b/docsrc/xmlsource/vspx_ref/vspx_validator.xml
index 8f4a939..1225397 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_validator.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_validator.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspx_ref/vspx_variable.xml b/docsrc/xmlsource/vspx_ref/vspx_variable.xml
index b47ec07..7912b31 100644
--- a/docsrc/xmlsource/vspx_ref/vspx_variable.xml
+++ b/docsrc/xmlsource/vspx_ref/vspx_variable.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/vspxdoc.xml b/docsrc/xmlsource/vspxdoc.xml
index d340bea..bf665ad 100644
--- a/docsrc/xmlsource/vspxdoc.xml
+++ b/docsrc/xmlsource/vspxdoc.xml
@@ -564,12 +564,12 @@ constructor method vspx_button (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: button__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -615,12 +615,12 @@ placed into the resulting HTML with no changes.
<?xml version="1.0"?>
<!--
-
- - $Id: button__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -671,12 +671,12 @@ The form accepts two numbers and calculates their sum.
<?xml version="1.0"?>
<!--
-
- - $Id: button__2.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__2.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -728,12 +728,12 @@ The form allows to select a file from server's file system
<?xml version="1.0"?>
<!--
-
- - $Id: button__3.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__3.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -781,12 +781,12 @@ The form allows to select a two values from a different page
<?xml version="1.0"?>
<!--
-
- - $Id: button__4.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: button__4.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -978,12 +978,12 @@ constructor method vspx_calendar (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: calendar__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: calendar__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1341,12 +1341,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: check_box__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: check_box__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1458,12 +1458,12 @@ Depending on the state of the checkbox, the submitted value is either 'check
<?xml version="1.0"?>
<!--
-
- - $Id: code_file__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: code_file__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -1867,12 +1867,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: data_grid__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_grid__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2271,12 +2271,12 @@ constructor method vspx_data_list (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: data_list__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_list__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2318,12 +2318,12 @@ with a option values their customer IDs.
<?xml version="1.0"?>
<!--
-
- - $Id: data_list__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_list__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2631,12 +2631,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_set__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -2737,12 +2737,12 @@ Allows editing, addtion and removal of existing records.
<?xml version="1.0"?>
<!--
-
- - $Id: data_set__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_set__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -3094,12 +3094,12 @@ constructor method vspx_data_source (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: data_source__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: data_source__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -3226,12 +3226,12 @@ different places of the page to print errors for different controls.
<?xml version="1.0"?>
<!--
-
- - $Id: error_summary__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: error_summary__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -3286,12 +3286,12 @@ in the place specified by v:error-summary element.
<?xml version="1.0"?>
<!--
-
- - $Id: error_summary__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: error_summary__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -3742,12 +3742,12 @@ create type vspx_form under vspx_control
<?xml version="1.0"?>
<!--
-
- - $Id: form__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -3794,12 +3794,12 @@ The OK button of the form submits data from the form back to the same page.
<?xml version="1.0"?>
<!--
-
- - $Id: form__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: form__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -4130,12 +4130,12 @@ Unlike 'active' attribute, this one is effective only when the page is d
<?xml version="1.0"?>
<!--
-
- - $Id: include__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: include__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -4789,12 +4789,12 @@ overriding method vc_render () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: label__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: label__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -5369,12 +5369,12 @@ constructor method vspx_login (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: login__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: login__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -5611,12 +5611,12 @@ overriding method vc_render () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: login_form__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: login_form__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -6148,12 +6148,12 @@ as (
<?xml version="1.0"?>
<!--
-
- - $Id: page__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: page__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -6563,12 +6563,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: radio_button__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: radio_button__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -6782,12 +6782,12 @@ overriding method vc_set_model () returns any
<?xml version="1.0"?>
<!--
-
- - $Id: radio_group__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: radio_group__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -7146,12 +7146,12 @@ constructor method vspx_select_list (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: select_list__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: select_list__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -7429,12 +7429,12 @@ as
<?xml version="1.0"?>
<!--
-
- - $Id: tab__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: tab__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -8095,12 +8095,12 @@ as
<?xml version="1.0"?>
<!--
-
- - $Id: text__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: text__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -8658,12 +8658,12 @@ constructor method vspx_tree (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: tree__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: tree__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -8961,12 +8961,12 @@ constructor method vspx_url (name varchar, parent vspx_control)
<?xml version="1.0"?>
<!--
-
- - $Id: url__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: url__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -9180,12 +9180,12 @@ The value of this attribute will not be used when the resulting HTML is rendered
<?xml version="1.0"?>
<!--
-
- - $Id: validator__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: validator__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -9390,12 +9390,12 @@ The value of this attribute will not be used when the resulting HTML is rendered
<?xml version="1.0"?>
<!--
-
- - $Id: variable__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: variable__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -9573,12 +9573,12 @@ overriding method vc_pre_render (stream any, n int) returns any
<?xml version="1.0"?>
<!--
-
- - $Id: vscx__0.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: vscx__0.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
@@ -9634,12 +9634,12 @@ as a child of outer page.
<?xml version="1.0"?>
<!--
-
- - $Id: vscx__1.vspx,v 1.2.2.1 2012/03/08 12:55:23 source Exp $
+ - $Id: vscx__1.vspx,v 1.2 2006/08/16 00:04:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/web_acl.xml b/docsrc/xmlsource/web_acl.xml
index efc940f..158c909 100644
--- a/docsrc/xmlsource/web_acl.xml
+++ b/docsrc/xmlsource/web_acl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/webandxml.xml b/docsrc/xmlsource/webandxml.xml
index d8919e6..060cdd8 100644
--- a/docsrc/xmlsource/webandxml.xml
+++ b/docsrc/xmlsource/webandxml.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/webappdevelopment.xml b/docsrc/xmlsource/webappdevelopment.xml
index 8c491cd..32f446d 100644
--- a/docsrc/xmlsource/webappdevelopment.xml
+++ b/docsrc/xmlsource/webappdevelopment.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/webdav.xml b/docsrc/xmlsource/webdav.xml
index 815438c..89fd283 100644
--- a/docsrc/xmlsource/webdav.xml
+++ b/docsrc/xmlsource/webdav.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/webserver.xml b/docsrc/xmlsource/webserver.xml
index 5d27a6e..f5c14c0 100644
--- a/docsrc/xmlsource/webserver.xml
+++ b/docsrc/xmlsource/webserver.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/webservices.xml b/docsrc/xmlsource/webservices.xml
index 21316da..5972b44 100644
--- a/docsrc/xmlsource/webservices.xml
+++ b/docsrc/xmlsource/webservices.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/ws-rm.xml b/docsrc/xmlsource/ws-rm.xml
index 3b74cf2..ff0b0b2 100644
--- a/docsrc/xmlsource/ws-rm.xml
+++ b/docsrc/xmlsource/ws-rm.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/ws-routing.xml b/docsrc/xmlsource/ws-routing.xml
index 1b9f7ed..f20f1fc 100644
--- a/docsrc/xmlsource/ws-routing.xml
+++ b/docsrc/xmlsource/ws-routing.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/ws-security.xml b/docsrc/xmlsource/ws-security.xml
index 49c97bb..264ffcc 100644
--- a/docsrc/xmlsource/ws-security.xml
+++ b/docsrc/xmlsource/ws-security.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/ws-trust.xml b/docsrc/xmlsource/ws-trust.xml
index 6e2f87c..4cf5971 100644
--- a/docsrc/xmlsource/ws-trust.xml
+++ b/docsrc/xmlsource/ws-trust.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/wsdl.xml b/docsrc/xmlsource/wsdl.xml
index 04ff958..31b9147 100644
--- a/docsrc/xmlsource/wsdl.xml
+++ b/docsrc/xmlsource/wsdl.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xa.xml b/docsrc/xmlsource/xa.xml
index ae7d92b..b68cbc4 100644
--- a/docsrc/xmlsource/xa.xml
+++ b/docsrc/xmlsource/xa.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmla.xml b/docsrc/xmlsource/xmla.xml
index d656148..705f4e6 100644
--- a/docsrc/xmlsource/xmla.xml
+++ b/docsrc/xmlsource/xmla.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/_xpf_template.xml b/docsrc/xmlsource/xmlref/_xpf_template.xml
index f4efdb3..0403de5 100644
--- a/docsrc/xmlsource/xmlref/_xpf_template.xml
+++ b/docsrc/xmlsource/xmlref/_xpf_template.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf__sql__column.xml b/docsrc/xmlsource/xmlref/xpf__sql__column.xml
index f45a0c0..72cc6ab 100644
--- a/docsrc/xmlsource/xmlref/xpf__sql__column.xml
+++ b/docsrc/xmlsource/xmlref/xpf__sql__column.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_and.xml b/docsrc/xmlsource/xmlref/xpf_and.xml
index 0d20c83..bd59d4c 100644
--- a/docsrc/xmlsource/xmlref/xpf_and.xml
+++ b/docsrc/xmlsource/xmlref/xpf_and.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_append.xml b/docsrc/xmlsource/xmlref/xpf_append.xml
index 58ccd98..31c0685 100644
--- a/docsrc/xmlsource/xmlref/xpf_append.xml
+++ b/docsrc/xmlsource/xmlref/xpf_append.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_assign.xml b/docsrc/xmlsource/xmlref/xpf_assign.xml
index 63b8db8..7025809 100644
--- a/docsrc/xmlsource/xmlref/xpf_assign.xml
+++ b/docsrc/xmlsource/xmlref/xpf_assign.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_avg.xml b/docsrc/xmlsource/xmlref/xpf_avg.xml
index 867a412..65a4b6d 100644
--- a/docsrc/xmlsource/xmlref/xpf_avg.xml
+++ b/docsrc/xmlsource/xmlref/xpf_avg.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_boolean.xml b/docsrc/xmlsource/xmlref/xpf_boolean.xml
index 8d5e48d..8a16027 100644
--- a/docsrc/xmlsource/xmlref/xpf_boolean.xml
+++ b/docsrc/xmlsource/xmlref/xpf_boolean.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_ceiling.xml b/docsrc/xmlsource/xmlref/xpf_ceiling.xml
index 93e5aa8..bcd6e44 100644
--- a/docsrc/xmlsource/xmlref/xpf_ceiling.xml
+++ b/docsrc/xmlsource/xmlref/xpf_ceiling.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_collection.xml b/docsrc/xmlsource/xmlref/xpf_collection.xml
index ad0b327..9e99aae 100644
--- a/docsrc/xmlsource/xmlref/xpf_collection.xml
+++ b/docsrc/xmlsource/xmlref/xpf_collection.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_concat.xml b/docsrc/xmlsource/xmlref/xpf_concat.xml
index 2158752..ddf0689 100644
--- a/docsrc/xmlsource/xmlref/xpf_concat.xml
+++ b/docsrc/xmlsource/xmlref/xpf_concat.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_contains.xml b/docsrc/xmlsource/xmlref/xpf_contains.xml
index ca4eb96..a405d88 100644
--- a/docsrc/xmlsource/xmlref/xpf_contains.xml
+++ b/docsrc/xmlsource/xmlref/xpf_contains.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_count.xml b/docsrc/xmlsource/xmlref/xpf_count.xml
index 16ccdc2..bb5821c 100644
--- a/docsrc/xmlsource/xmlref/xpf_count.xml
+++ b/docsrc/xmlsource/xmlref/xpf_count.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_create_attribute.xml b/docsrc/xmlsource/xmlref/xpf_create_attribute.xml
index 0816b3e..512c9e5 100644
--- a/docsrc/xmlsource/xmlref/xpf_create_attribute.xml
+++ b/docsrc/xmlsource/xmlref/xpf_create_attribute.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_create_comment.xml b/docsrc/xmlsource/xmlref/xpf_create_comment.xml
index 789b8a6..64be7a1 100644
--- a/docsrc/xmlsource/xmlref/xpf_create_comment.xml
+++ b/docsrc/xmlsource/xmlref/xpf_create_comment.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_create_element.xml b/docsrc/xmlsource/xmlref/xpf_create_element.xml
index 6edc294..b59ca82 100644
--- a/docsrc/xmlsource/xmlref/xpf_create_element.xml
+++ b/docsrc/xmlsource/xmlref/xpf_create_element.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_create_pi.xml b/docsrc/xmlsource/xmlref/xpf_create_pi.xml
index 8734e1d..a56585e 100644
--- a/docsrc/xmlsource/xmlref/xpf_create_pi.xml
+++ b/docsrc/xmlsource/xmlref/xpf_create_pi.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_current.xml b/docsrc/xmlsource/xmlref/xpf_current.xml
index 431d70f..77af5c4 100644
--- a/docsrc/xmlsource/xmlref/xpf_current.xml
+++ b/docsrc/xmlsource/xmlref/xpf_current.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_deass.xml b/docsrc/xmlsource/xmlref/xpf_deass.xml
index f4efdb3..0403de5 100644
--- a/docsrc/xmlsource/xmlref/xpf_deass.xml
+++ b/docsrc/xmlsource/xmlref/xpf_deass.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_distinct.xml b/docsrc/xmlsource/xmlref/xpf_distinct.xml
index e9a58b6..1960c6d 100644
--- a/docsrc/xmlsource/xmlref/xpf_distinct.xml
+++ b/docsrc/xmlsource/xmlref/xpf_distinct.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_doc.xml b/docsrc/xmlsource/xmlref/xpf_doc.xml
index f2a0131..bea3f9f 100644
--- a/docsrc/xmlsource/xmlref/xpf_doc.xml
+++ b/docsrc/xmlsource/xmlref/xpf_doc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_document.xml b/docsrc/xmlsource/xmlref/xpf_document.xml
index a302f18..48c7d6a 100644
--- a/docsrc/xmlsource/xmlref/xpf_document.xml
+++ b/docsrc/xmlsource/xmlref/xpf_document.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_document_literal.xml b/docsrc/xmlsource/xmlref/xpf_document_literal.xml
index bbccfef..70c62eb 100644
--- a/docsrc/xmlsource/xmlref/xpf_document_literal.xml
+++ b/docsrc/xmlsource/xmlref/xpf_document_literal.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_empty.xml b/docsrc/xmlsource/xmlref/xpf_empty.xml
index 3f2e0c8..3ad3fd0 100644
--- a/docsrc/xmlsource/xmlref/xpf_empty.xml
+++ b/docsrc/xmlsource/xmlref/xpf_empty.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_ends_with.xml b/docsrc/xmlsource/xmlref/xpf_ends_with.xml
index cd3983a..073efdb 100644
--- a/docsrc/xmlsource/xmlref/xpf_ends_with.xml
+++ b/docsrc/xmlsource/xmlref/xpf_ends_with.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_every.xml b/docsrc/xmlsource/xmlref/xpf_every.xml
index 3cb6765..c2678f4 100644
--- a/docsrc/xmlsource/xmlref/xpf_every.xml
+++ b/docsrc/xmlsource/xmlref/xpf_every.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_except.xml b/docsrc/xmlsource/xmlref/xpf_except.xml
index 3d58468..bc35788 100644
--- a/docsrc/xmlsource/xmlref/xpf_except.xml
+++ b/docsrc/xmlsource/xmlref/xpf_except.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_false.xml b/docsrc/xmlsource/xmlref/xpf_false.xml
index dc9a1ab..bb9aa81 100644
--- a/docsrc/xmlsource/xmlref/xpf_false.xml
+++ b/docsrc/xmlsource/xmlref/xpf_false.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_filter.xml b/docsrc/xmlsource/xmlref/xpf_filter.xml
index 71472bb..06fc213 100644
--- a/docsrc/xmlsource/xmlref/xpf_filter.xml
+++ b/docsrc/xmlsource/xmlref/xpf_filter.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_floor.xml b/docsrc/xmlsource/xmlref/xpf_floor.xml
index dc2fce9..373088f 100644
--- a/docsrc/xmlsource/xmlref/xpf_floor.xml
+++ b/docsrc/xmlsource/xmlref/xpf_floor.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_for.xml b/docsrc/xmlsource/xmlref/xpf_for.xml
index f84a258..eef5893 100644
--- a/docsrc/xmlsource/xmlref/xpf_for.xml
+++ b/docsrc/xmlsource/xmlref/xpf_for.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_format_number.xml b/docsrc/xmlsource/xmlref/xpf_format_number.xml
index 0ceaa38..e2ce92c 100644
--- a/docsrc/xmlsource/xmlref/xpf_format_number.xml
+++ b/docsrc/xmlsource/xmlref/xpf_format_number.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_function_available.xml b/docsrc/xmlsource/xmlref/xpf_function_available.xml
index 321a471..e277ff6 100644
--- a/docsrc/xmlsource/xmlref/xpf_function_available.xml
+++ b/docsrc/xmlsource/xmlref/xpf_function_available.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_generate_id.xml b/docsrc/xmlsource/xmlref/xpf_generate_id.xml
index 4fc91aa..ac23bcd 100644
--- a/docsrc/xmlsource/xmlref/xpf_generate_id.xml
+++ b/docsrc/xmlsource/xmlref/xpf_generate_id.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_id.xml b/docsrc/xmlsource/xmlref/xpf_id.xml
index 0338be1..48fdce8 100644
--- a/docsrc/xmlsource/xmlref/xpf_id.xml
+++ b/docsrc/xmlsource/xmlref/xpf_id.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_if.xml b/docsrc/xmlsource/xmlref/xpf_if.xml
index 3fcc022..9a8e7e4 100644
--- a/docsrc/xmlsource/xmlref/xpf_if.xml
+++ b/docsrc/xmlsource/xmlref/xpf_if.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_intersect.xml b/docsrc/xmlsource/xmlref/xpf_intersect.xml
index 02eeae3..a748ebe 100644
--- a/docsrc/xmlsource/xmlref/xpf_intersect.xml
+++ b/docsrc/xmlsource/xmlref/xpf_intersect.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_is_after.xml b/docsrc/xmlsource/xmlref/xpf_is_after.xml
index e78b907..9c1c890 100644
--- a/docsrc/xmlsource/xmlref/xpf_is_after.xml
+++ b/docsrc/xmlsource/xmlref/xpf_is_after.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_is_before.xml b/docsrc/xmlsource/xmlref/xpf_is_before.xml
index ce4da8b..fd103c5 100644
--- a/docsrc/xmlsource/xmlref/xpf_is_before.xml
+++ b/docsrc/xmlsource/xmlref/xpf_is_before.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_iterate.xml b/docsrc/xmlsource/xmlref/xpf_iterate.xml
index 35b6563..6c40532 100644
--- a/docsrc/xmlsource/xmlref/xpf_iterate.xml
+++ b/docsrc/xmlsource/xmlref/xpf_iterate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml b/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml
index 77c43f7..883456e 100644
--- a/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml
+++ b/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_key.xml b/docsrc/xmlsource/xmlref/xpf_key.xml
index ca75eeb..79178ec 100644
--- a/docsrc/xmlsource/xmlref/xpf_key.xml
+++ b/docsrc/xmlsource/xmlref/xpf_key.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_lang.xml b/docsrc/xmlsource/xmlref/xpf_lang.xml
index ecf4daa..ec18420 100644
--- a/docsrc/xmlsource/xmlref/xpf_lang.xml
+++ b/docsrc/xmlsource/xmlref/xpf_lang.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_last.xml b/docsrc/xmlsource/xmlref/xpf_last.xml
index f18f4d4..902f567 100644
--- a/docsrc/xmlsource/xmlref/xpf_last.xml
+++ b/docsrc/xmlsource/xmlref/xpf_last.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_let.xml b/docsrc/xmlsource/xmlref/xpf_let.xml
index 70f0270..81addbf 100644
--- a/docsrc/xmlsource/xmlref/xpf_let.xml
+++ b/docsrc/xmlsource/xmlref/xpf_let.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_list.xml b/docsrc/xmlsource/xmlref/xpf_list.xml
index f578993..fc267db 100644
--- a/docsrc/xmlsource/xmlref/xpf_list.xml
+++ b/docsrc/xmlsource/xmlref/xpf_list.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_local_name.xml b/docsrc/xmlsource/xmlref/xpf_local_name.xml
index 79efcf3..c065f3a 100644
--- a/docsrc/xmlsource/xmlref/xpf_local_name.xml
+++ b/docsrc/xmlsource/xmlref/xpf_local_name.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_max.xml b/docsrc/xmlsource/xmlref/xpf_max.xml
index ed71c12..8a57bc7 100644
--- a/docsrc/xmlsource/xmlref/xpf_max.xml
+++ b/docsrc/xmlsource/xmlref/xpf_max.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_min.xml b/docsrc/xmlsource/xmlref/xpf_min.xml
index f690a28..7163ea3 100644
--- a/docsrc/xmlsource/xmlref/xpf_min.xml
+++ b/docsrc/xmlsource/xmlref/xpf_min.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_name.xml b/docsrc/xmlsource/xmlref/xpf_name.xml
index 0554e2d..e2cfc2c 100644
--- a/docsrc/xmlsource/xmlref/xpf_name.xml
+++ b/docsrc/xmlsource/xmlref/xpf_name.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml b/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml
index b67ea6a..4cc087e 100644
--- a/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml
+++ b/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_normalize_space.xml b/docsrc/xmlsource/xmlref/xpf_normalize_space.xml
index 7d48f4f..2aef058 100644
--- a/docsrc/xmlsource/xmlref/xpf_normalize_space.xml
+++ b/docsrc/xmlsource/xmlref/xpf_normalize_space.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_not.xml b/docsrc/xmlsource/xmlref/xpf_not.xml
index 53ab01e..9e04660 100644
--- a/docsrc/xmlsource/xmlref/xpf_not.xml
+++ b/docsrc/xmlsource/xmlref/xpf_not.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_number.xml b/docsrc/xmlsource/xmlref/xpf_number.xml
index 0131a37..d63d455 100644
--- a/docsrc/xmlsource/xmlref/xpf_number.xml
+++ b/docsrc/xmlsource/xmlref/xpf_number.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_or.xml b/docsrc/xmlsource/xmlref/xpf_or.xml
index b0aac07..80d9578 100644
--- a/docsrc/xmlsource/xmlref/xpf_or.xml
+++ b/docsrc/xmlsource/xmlref/xpf_or.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_position.xml b/docsrc/xmlsource/xmlref/xpf_position.xml
index c26f508..20c3856 100644
--- a/docsrc/xmlsource/xmlref/xpf_position.xml
+++ b/docsrc/xmlsource/xmlref/xpf_position.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_processXQuery.xml b/docsrc/xmlsource/xmlref/xpf_processXQuery.xml
index 3909c6f..fb312b0 100644
--- a/docsrc/xmlsource/xmlref/xpf_processXQuery.xml
+++ b/docsrc/xmlsource/xmlref/xpf_processXQuery.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_processXSLT.xml b/docsrc/xmlsource/xmlref/xpf_processXSLT.xml
index 60383d2..983208e 100644
--- a/docsrc/xmlsource/xmlref/xpf_processXSLT.xml
+++ b/docsrc/xmlsource/xmlref/xpf_processXSLT.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_processXSQL.xml b/docsrc/xmlsource/xmlref/xpf_processXSQL.xml
index c3c2cc0..99790b2 100644
--- a/docsrc/xmlsource/xmlref/xpf_processXSQL.xml
+++ b/docsrc/xmlsource/xmlref/xpf_processXSQL.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_progn.xml b/docsrc/xmlsource/xmlref/xpf_progn.xml
index 48b1919..4da7a4a 100644
--- a/docsrc/xmlsource/xmlref/xpf_progn.xml
+++ b/docsrc/xmlsource/xmlref/xpf_progn.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_replace.xml b/docsrc/xmlsource/xmlref/xpf_replace.xml
index d1c49e0..6d1c8af 100644
--- a/docsrc/xmlsource/xmlref/xpf_replace.xml
+++ b/docsrc/xmlsource/xmlref/xpf_replace.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_round.xml b/docsrc/xmlsource/xmlref/xpf_round.xml
index 16a47b8..1f62b6b 100644
--- a/docsrc/xmlsource/xmlref/xpf_round.xml
+++ b/docsrc/xmlsource/xmlref/xpf_round.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_round_number.xml b/docsrc/xmlsource/xmlref/xpf_round_number.xml
index a2d46fb..14f67ac 100644
--- a/docsrc/xmlsource/xmlref/xpf_round_number.xml
+++ b/docsrc/xmlsource/xmlref/xpf_round_number.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_serialize.xml b/docsrc/xmlsource/xmlref/xpf_serialize.xml
index 9dffaf9..714dfdf 100644
--- a/docsrc/xmlsource/xmlref/xpf_serialize.xml
+++ b/docsrc/xmlsource/xmlref/xpf_serialize.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_shallow.xml b/docsrc/xmlsource/xmlref/xpf_shallow.xml
index e7f7df0..a367a6b 100644
--- a/docsrc/xmlsource/xmlref/xpf_shallow.xml
+++ b/docsrc/xmlsource/xmlref/xpf_shallow.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_some.xml b/docsrc/xmlsource/xmlref/xpf_some.xml
index b6c298c..c36434c 100644
--- a/docsrc/xmlsource/xmlref/xpf_some.xml
+++ b/docsrc/xmlsource/xmlref/xpf_some.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_starts_with.xml b/docsrc/xmlsource/xmlref/xpf_starts_with.xml
index b16dbf0..81aadb9 100644
--- a/docsrc/xmlsource/xmlref/xpf_starts_with.xml
+++ b/docsrc/xmlsource/xmlref/xpf_starts_with.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_string.xml b/docsrc/xmlsource/xmlref/xpf_string.xml
index a747ec3..ff683ed 100644
--- a/docsrc/xmlsource/xmlref/xpf_string.xml
+++ b/docsrc/xmlsource/xmlref/xpf_string.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_string_length.xml b/docsrc/xmlsource/xmlref/xpf_string_length.xml
index 1b875f0..6430790 100644
--- a/docsrc/xmlsource/xmlref/xpf_string_length.xml
+++ b/docsrc/xmlsource/xmlref/xpf_string_length.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_substring.xml b/docsrc/xmlsource/xmlref/xpf_substring.xml
index 42317a4..fa7e1f5 100644
--- a/docsrc/xmlsource/xmlref/xpf_substring.xml
+++ b/docsrc/xmlsource/xmlref/xpf_substring.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_substring_after.xml b/docsrc/xmlsource/xmlref/xpf_substring_after.xml
index 4bcc928..e943cab 100644
--- a/docsrc/xmlsource/xmlref/xpf_substring_after.xml
+++ b/docsrc/xmlsource/xmlref/xpf_substring_after.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_substring_before.xml b/docsrc/xmlsource/xmlref/xpf_substring_before.xml
index ddcc638..df60e92 100644
--- a/docsrc/xmlsource/xmlref/xpf_substring_before.xml
+++ b/docsrc/xmlsource/xmlref/xpf_substring_before.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_sum.xml b/docsrc/xmlsource/xmlref/xpf_sum.xml
index c79fa1c..8beb316 100644
--- a/docsrc/xmlsource/xmlref/xpf_sum.xml
+++ b/docsrc/xmlsource/xmlref/xpf_sum.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_system_property.xml b/docsrc/xmlsource/xmlref/xpf_system_property.xml
index 61d678c..5e64a69 100644
--- a/docsrc/xmlsource/xmlref/xpf_system_property.xml
+++ b/docsrc/xmlsource/xmlref/xpf_system_property.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_text_contains.xml b/docsrc/xmlsource/xmlref/xpf_text_contains.xml
index 07e35e3..0721c67 100644
--- a/docsrc/xmlsource/xmlref/xpf_text_contains.xml
+++ b/docsrc/xmlsource/xmlref/xpf_text_contains.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_translate.xml b/docsrc/xmlsource/xmlref/xpf_translate.xml
index 63635cc..acf7f98 100644
--- a/docsrc/xmlsource/xmlref/xpf_translate.xml
+++ b/docsrc/xmlsource/xmlref/xpf_translate.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_true.xml b/docsrc/xmlsource/xmlref/xpf_true.xml
index d1cf05b..2bbab60 100644
--- a/docsrc/xmlsource/xmlref/xpf_true.xml
+++ b/docsrc/xmlsource/xmlref/xpf_true.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_tuple.xml b/docsrc/xmlsource/xmlref/xpf_tuple.xml
index 30d3494..3e181c3 100644
--- a/docsrc/xmlsource/xmlref/xpf_tuple.xml
+++ b/docsrc/xmlsource/xmlref/xpf_tuple.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_union.xml b/docsrc/xmlsource/xmlref/xpf_union.xml
index 6e18056..da3b825 100644
--- a/docsrc/xmlsource/xmlref/xpf_union.xml
+++ b/docsrc/xmlsource/xmlref/xpf_union.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_unordered.xml b/docsrc/xmlsource/xmlref/xpf_unordered.xml
index aada128..0130bda 100644
--- a/docsrc/xmlsource/xmlref/xpf_unordered.xml
+++ b/docsrc/xmlsource/xmlref/xpf_unordered.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml b/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml
index a19188f..e79ce80 100644
--- a/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml
+++ b/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_urlify.xml b/docsrc/xmlsource/xmlref/xpf_urlify.xml
index 6f14571..af25373 100644
--- a/docsrc/xmlsource/xmlref/xpf_urlify.xml
+++ b/docsrc/xmlsource/xmlref/xpf_urlify.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlref/xpf_xmlview.xml b/docsrc/xmlsource/xmlref/xpf_xmlview.xml
index a31108a..7ef7763 100644
--- a/docsrc/xmlsource/xmlref/xpf_xmlview.xml
+++ b/docsrc/xmlsource/xmlref/xpf_xmlview.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlrpc.xml b/docsrc/xmlsource/xmlrpc.xml
index a9eda3f..b6e658b 100644
--- a/docsrc/xmlsource/xmlrpc.xml
+++ b/docsrc/xmlsource/xmlrpc.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlschema.xml b/docsrc/xmlsource/xmlschema.xml
index 1ac6d36..1bc4dd6 100644
--- a/docsrc/xmlsource/xmlschema.xml
+++ b/docsrc/xmlsource/xmlschema.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmltableview.xml b/docsrc/xmlsource/xmltableview.xml
index eed7725..163725c 100644
--- a/docsrc/xmlsource/xmltableview.xml
+++ b/docsrc/xmlsource/xmltableview.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmltemplates.xml b/docsrc/xmlsource/xmltemplates.xml
index f040e75..4a990c7 100644
--- a/docsrc/xmlsource/xmltemplates.xml
+++ b/docsrc/xmlsource/xmltemplates.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xmlview.xml b/docsrc/xmlsource/xmlview.xml
index e6551dd..db39ba0 100644
--- a/docsrc/xmlsource/xmlview.xml
+++ b/docsrc/xmlsource/xmlview.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xpfs.xml b/docsrc/xmlsource/xpfs.xml
index cb39a84..76d5efa 100644
--- a/docsrc/xmlsource/xpfs.xml
+++ b/docsrc/xmlsource/xpfs.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xquery.xml b/docsrc/xmlsource/xquery.xml
index 0fe30eb..32d7c62 100644
--- a/docsrc/xmlsource/xquery.xml
+++ b/docsrc/xmlsource/xquery.xml
@@ -3,7 +3,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xslttrans.xml b/docsrc/xmlsource/xslttrans.xml
index 13036e8..9bbe8a8 100644
--- a/docsrc/xmlsource/xslttrans.xml
+++ b/docsrc/xmlsource/xslttrans.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/xsql.xml b/docsrc/xmlsource/xsql.xml
index 7e78f01..e1d7358 100644
--- a/docsrc/xmlsource/xsql.xml
+++ b/docsrc/xmlsource/xsql.xml
@@ -4,7 +4,7 @@
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/docsrc/xmlsource/yacsqlgrammar.xml b/docsrc/xmlsource/yacsqlgrammar.xml
index 2067a69..e796010 100644
--- a/docsrc/xmlsource/yacsqlgrammar.xml
+++ b/docsrc/xmlsource/yacsqlgrammar.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- $Id: yacsqlgrammar.xml,v 1.1.1.1.2.2 2012/03/07 15:28:58 source Exp $
+ $Id: yacsqlgrammar.xml,v 1.1.1.1.2.1 2010/01/25 22:55:37 source Exp $
This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
project.
- Copyright (C) 1998-2012 OpenLink Software
+ Copyright (C) 1998-2010 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
@@ -32,7 +32,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/Dk.h b/libsrc/Dk.h
index b967563..2734876 100644
--- a/libsrc/Dk.h
+++ b/libsrc/Dk.h
@@ -1,14 +1,14 @@
/*
* Dk.h
*
- * $Id: Dk.h,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dk.h,v 1.2 2009/04/09 17:39:31 source Exp $
*
* All configuration options
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkalloc.c b/libsrc/Dk/Dkalloc.c
index fba4277..9e10f64 100644
--- a/libsrc/Dk/Dkalloc.c
+++ b/libsrc/Dk/Dkalloc.c
@@ -1,14 +1,14 @@
/*
* Dkalloc.c
*
- * $Id: Dkalloc.c,v 1.9.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkalloc.c,v 1.9.2.1 2011/02/14 12:33:59 source Exp $
*
* Memory Allocation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkalloc.h b/libsrc/Dk/Dkalloc.h
index 9409e6e..19d9e66 100644
--- a/libsrc/Dk/Dkalloc.h
+++ b/libsrc/Dk/Dkalloc.h
@@ -1,14 +1,14 @@
/*
* Dkalloc.h
*
- * $Id: Dkalloc.h,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkalloc.h,v 1.2 2009/04/07 22:00:54 source Exp $
*
* Memory Allocation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkbasket.c b/libsrc/Dk/Dkbasket.c
index 0244cd3..4744ca8 100644
--- a/libsrc/Dk/Dkbasket.c
+++ b/libsrc/Dk/Dkbasket.c
@@ -1,14 +1,14 @@
/*
* Dkbasket.c
*
- * $Id: Dkbasket.c,v 1.4.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkbasket.c,v 1.4.2.1 2009/04/15 15:35:41 source Exp $
*
* Baskets
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkbasket.h b/libsrc/Dk/Dkbasket.h
index d83bcca..8c2eaf7 100644
--- a/libsrc/Dk/Dkbasket.h
+++ b/libsrc/Dk/Dkbasket.h
@@ -1,14 +1,14 @@
/*
* Dkbasket.c
*
- * $Id: Dkbasket.h,v 1.4.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkbasket.h,v 1.4.2.1 2009/04/15 15:35:41 source Exp $
*
* Baskets
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkbox.c b/libsrc/Dk/Dkbox.c
index 1fa4259..e12ef00 100644
--- a/libsrc/Dk/Dkbox.c
+++ b/libsrc/Dk/Dkbox.c
@@ -1,7 +1,7 @@
/*
* Dkbox.c
*
- * $Id: Dkbox.c,v 1.22.2.12 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkbox.c,v 1.22.2.9 2011/10/25 19:36:36 source Exp $
*
* Boxes
*
@@ -18,7 +18,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -803,8 +803,6 @@ dk_check_tree_heads_iter (box_t box, box_t parent, dk_hash_t * known, int count_
GPF_T1 ("Tree contains a pointer to a freed box");
if (TAG_BAD == tag)
GPF_T1 ("Tree contains a pointer to a box marked bad");
- if (tag < FIRST_DV_DTP)
- GPF_T1 ("Tree contains a pointer to a Box with weird tag");
if (!box_can_appear_twice_in_tree[tag])
{
box_t other_parent = gethash (box, known);
@@ -1008,17 +1006,6 @@ DBG_NAME (box_num_nonull) (DBG_PARAMS boxint n)
}
-box_t
-DBG_NAME (box_iri_id) (DBG_PARAMS int64 n)
-{
- iri_id_t * box = (iri_id_t*) dk_alloc_box (sizeof (iri_id_t), DV_IRI_ID);
- *box = n;
- return (caddr_t) box;
-}
-
-
-
-
/*
* Box a null-terminated string into a
* DV_<XX>_STRING tagged box
@@ -1153,10 +1140,6 @@ DBG_NAME (box_copy) (DBG_PARAMS cbox_t box)
#endif
default:
-#ifdef MALLOC_DEBUG
- if (tag < FIRST_DV_DTP)
- GPF_T1 ("Copy of a box with weird tag");
-#endif
if (box_copier[tag])
return (box_copier[tag] ((caddr_t) box));
}
@@ -1208,10 +1191,6 @@ box_t DBG_NAME (box_copy_tree) (DBG_PARAMS cbox_t box)
#endif
default:
-#ifdef MALLOC_DEBUG
- if (tag < FIRST_DV_DTP)
- GPF_T1 ("Copy of a box with weird tag");
-#endif
if (box_copier[tag])
return (box_copier[tag] ((caddr_t) box));
}
@@ -1296,10 +1275,6 @@ DBG_NAME (box_try_copy_tree) (DBG_PARAMS box_t box, box_t stub)
#endif
default:
-#ifdef MALLOC_DEBUG
- if (tag < FIRST_DV_DTP)
- GPF_T1 ("Copy of a box with weird tag");
-#endif
if (box_copier[tag])
return (box_copier[tag] (box));
}
@@ -2040,7 +2015,6 @@ box_dv_uname_make_immortal (caddr_t tree)
switch (DV_TYPE_OF (tree))
{
case DV_UNAME:
- /*printf ("\nUNAME %s is about to become immortal", tree);*/
mutex_enter (uname_mutex);
#ifdef MALLOC_DEBUG
len = box_length (tree) - 1;
@@ -2445,14 +2419,6 @@ box_num_nonull (boxint n)
}
-#undef box_iri_id
-box_t
-box_iri_id (int64 n)
-{
- return dbg_box_iri_id (__FILE__, __LINE__, n);
-}
-
-
#undef box_dv_ubuf
char *
box_dv_ubuf (size_t buf_strlen)
diff --git a/libsrc/Dk/Dkbox.h b/libsrc/Dk/Dkbox.h
index 7cbf6d3..90b5a94 100644
--- a/libsrc/Dk/Dkbox.h
+++ b/libsrc/Dk/Dkbox.h
@@ -1,14 +1,14 @@
/*
* Dkbox.h
*
- * $Id: Dkbox.h,v 1.32.2.15 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkbox.h,v 1.32.2.11 2011/10/25 19:36:36 source Exp $
*
* Boxes
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -307,7 +307,7 @@ ptr += 4
#define DV_NON_BOX 101
-#define FIRST_DV_DTP 125
+#define FIRST_DV_DTP 180
/* Data types */
@@ -663,7 +663,6 @@ EXE_EXPORT (box_t, dk_try_alloc_box, (size_t bytes, dtp_t tag));
EXE_EXPORT (box_t, dk_alloc_box_zero, (size_t bytes, dtp_t tag));
#define dk_alloc_list(n) ((caddr_t *)dk_alloc_box ((n) * sizeof (caddr_t), DV_ARRAY_OF_POINTER))
-#define dk_alloc_list_zero(n) ((caddr_t *)dk_alloc_box_zero ((n) * sizeof (caddr_t), DV_ARRAY_OF_POINTER))
#ifdef MALLOC_DEBUG
#define DK_ALLOC_BOX_DEBUG
@@ -697,7 +696,6 @@ EXE_EXPORT (ptrlong, unbox_ptrlong, (ccaddr_t n));
EXE_EXPORT (int64, unbox_int64, (ccaddr_t n));
EXE_EXPORT (box_t, box_num, (boxint n));
EXE_EXPORT (box_t, box_num_nonull, (boxint n));
-EXE_EXPORT (box_t, box_iri_id, (int64 n));
EXE_EXPORT (box_t, box_string, (const char *string));
EXE_EXPORT (box_t, box_dv_short_string, (const char *string));
EXE_EXPORT (box_t, box_dv_short_nchars, (const char *buf, size_t buf_len));
@@ -770,7 +768,6 @@ box_t dbg_box_copy_tree (const char *file, int line, cbox_t box);
box_t dbg_box_try_copy_tree (const char *file, int line, cbox_t box, box_t stub);
box_t dbg_box_num (const char *file, int line, boxint n);
box_t dbg_box_num_nonull (const char *file, int line, boxint n);
-box_t dbg_box_iri_id (const char *file, int line, int64 n);
char *dbg_box_dv_ubuf (const char *file, int line, size_t buf_strlen);
box_t dbg_box_dv_uname_from_ubuf (const char *file, int line, char *ubuf);
box_t dbg_box_dv_uname_string (const char *file, int line, const char *string);
@@ -801,7 +798,6 @@ caddr_t dbg_box_vsprintf (const char *file, int line, size_t buflen_eval, const
#define box_try_copy_tree(S,STUB) dbg_box_try_copy_tree (__FILE__, __LINE__, (S), (STUB))
#define box_num(S) dbg_box_num (__FILE__, __LINE__, (S))
#define box_num_nonull(S) dbg_box_num_nonull (__FILE__, __LINE__, (S))
-#define box_iri_id(S) dbg_box_iri_id (__FILE__, __LINE__, (S))
#define box_dv_ubuf(B) dbg_box_dv_ubuf (__FILE__, __LINE__, (B))
#define box_dv_uname_from_ubuf(U) dbg_box_dv_uname_from_ubuf (__FILE__, __LINE__, (U))
#define box_dv_uname_string(S) dbg_box_dv_uname_string (__FILE__, __LINE__, (S))
diff --git a/libsrc/Dk/Dkconfig.h b/libsrc/Dk/Dkconfig.h
index bab9add..d03c02f 100644
--- a/libsrc/Dk/Dkconfig.h
+++ b/libsrc/Dk/Dkconfig.h
@@ -1,14 +1,14 @@
/*
* Dkconfig.h
*
- * $Id: Dkconfig.h,v 1.2.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkconfig.h,v 1.2.2.1 2009/10/14 20:13:10 source Exp $
*
* Configuration
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkconfig.w32 b/libsrc/Dk/Dkconfig.w32
index 0a8d9e4..0b16b13 100644
--- a/libsrc/Dk/Dkconfig.w32
+++ b/libsrc/Dk/Dkconfig.w32
@@ -1,12 +1,12 @@
/*
- * $Id: Dkconfig.w32,v 1.6.2.3 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkconfig.w32,v 1.6.2.2 2010/02/02 19:39:43 source Exp $
*
* Configuration Options for win32
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/Dk/Dkconfig.w64 b/libsrc/Dk/Dkconfig.w64
index f1aab01..712a1b1 100644
--- a/libsrc/Dk/Dkconfig.w64
+++ b/libsrc/Dk/Dkconfig.w64
@@ -1,10 +1,10 @@
/*
- * $Id: Dkconfig.w64,v 1.5.2.3 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkconfig.w64,v 1.5.2.2 2010/02/02 19:39:43 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/Dk/Dkdevice.c b/libsrc/Dk/Dkdevice.c
index 2591d03..bbeb099 100644
--- a/libsrc/Dk/Dkdevice.c
+++ b/libsrc/Dk/Dkdevice.c
@@ -1,14 +1,14 @@
/*
* Dkdevice.c
*
- * $Id: Dkdevice.c,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkdevice.c,v 1.2 2009/04/07 22:00:54 source Exp $
*
* Devices
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkdevice.h b/libsrc/Dk/Dkdevice.h
index ae1c3c3..0620a4f 100644
--- a/libsrc/Dk/Dkdevice.h
+++ b/libsrc/Dk/Dkdevice.h
@@ -1,14 +1,14 @@
/*
* Dkdevice.h
*
- * $Id: Dkdevice.h,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkdevice.h,v 1.2 2009/04/07 22:00:54 source Exp $
*
* Devices
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkernel.c b/libsrc/Dk/Dkernel.c
index ecb381e..8b9b7f2 100644
--- a/libsrc/Dk/Dkernel.c
+++ b/libsrc/Dk/Dkernel.c
@@ -1,14 +1,14 @@
/*
* Dkernel.c
*
- * $Id: Dkernel.c,v 1.25.2.16 2012/03/14 13:58:52 source Exp $
+ * $Id: Dkernel.c,v 1.25.2.14 2011/06/17 00:11:07 source Exp $
*
* RPC Kernel
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -4644,13 +4644,19 @@ ssl_report_errors (char *client_ip)
int
cli_ssl_get_error_string (char *out_data, int out_data_len)
{
- unsigned long err = ERR_get_error ();
- const char *reason = ERR_reason_error_string (err);
- const char *lib = ERR_lib_error_string (err);
- const char *func = ERR_func_error_string (err);
- out_data[out_data_len - 1] = 0;
- snprintf (out_data, out_data_len - 1, "%s (%s:%s)",
- reason ? reason : (err == 0 ? "No error" : "Unknown error"), lib ? lib : "?", func ? func : "?");
+ unsigned long l;
+ const char *file, *data;
+ int line, flags;
+
+ if ((l = ERR_get_error_line_data (&file, &line, &data, &flags)) != 0)
+ {
+#if 0
+ ERR_error_string_n (l, out_data, out_data_len);
+#else
+ ERR_error_string (l, out_data);
+#endif
+ return 1;
+ }
return 0;
}
@@ -4758,12 +4764,9 @@ ssl_cert_verify_callback (int ok, void *_ctx)
ok = 1;
}
-#if 0
log_debug ("%s Certificate Verification: depth: %d, subject: %s, issuer: %s",
app_ctx->ssci_name_ptr, errdepth, cp != NULL ? cp : "-unknown-",
cp2 != NULL ? cp2 : "-unknown");
-#endif
-
/*
* Additionally perform CRL-based revocation checks
*
@@ -4843,50 +4846,50 @@ dk_ssl_free (void *old)
#if defined (_SSL) && !defined (NO_THREAD)
int ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * cert_name, char * key_name);
-static int
+static void
ssl_server_key_setup ()
{
- if (!c_ssl_server_cert || !c_ssl_server_key)
- {
- log_error ("SSL: Server certificate and private key must both be specified");
- return 0;
- }
+ char err_buf[1024];
+
+ if (!c_ssl_server_port)
+ return;
+ if (!c_ssl_server_key)
+ log_error ("ODBC Server X509 private key is required");
+ if (!c_ssl_server_cert)
+ log_error ("ODBC Server X509 certificate is required");
if (!ssl_server_set_certificate (ssl_server_ctx, c_ssl_server_cert, c_ssl_server_key))
- return 0;
+ {
+ call_exit (-1);
+ }
if (ssl_server_verify)
{
int i, session_id_context = 2, verify = SSL_VERIFY_NONE;
STACK_OF (X509_NAME) * skCAList = NULL;
- if (ssl_server_verify_file && ssl_server_verify_file[0])
- {
- SSL_CTX_load_verify_locations (ssl_server_ctx, ssl_server_verify_file, NULL);
- SSL_CTX_set_client_CA_list (ssl_server_ctx, SSL_load_client_CA_file (ssl_server_verify_file));
- }
+ SSL_CTX_load_verify_locations (ssl_server_ctx, ssl_server_verify_file, NULL);
+ SSL_CTX_set_client_CA_list (ssl_server_ctx, SSL_load_client_CA_file (ssl_server_verify_file));
SSL_CTX_set_app_data (ssl_server_ctx, &ssl_server_ctx_info);
- if (ssl_server_verify == 1) /* required */
+ if (ssl_server_verify == 1) /* required */
verify |= SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE;
- else /* 2 optional OR 3 optional no ca */
+ else /* 2 optional OR 3 optional no ca */
verify |= SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
SSL_CTX_set_verify (ssl_server_ctx, verify, (int (*)(int, X509_STORE_CTX *)) ssl_cert_verify_callback);
SSL_CTX_set_verify_depth (ssl_server_ctx, (int) ssl_server_verify_depth);
SSL_CTX_set_session_id_context (ssl_server_ctx, (unsigned char *) &session_id_context, sizeof session_id_context);
skCAList = SSL_CTX_get_client_CA_list (ssl_server_ctx);
- if (ssl_server_verify != 3 && sk_X509_NAME_num (skCAList) == 0)
- log_warning ("SSL: Client authentication requested but no CA known for verification");
+ if (sk_X509_NAME_num (skCAList) == 0)
+ log_warning ("ODBC X509 Client authentication requested but no CA known for verification");
for (i = 0; i < sk_X509_NAME_num (skCAList); i++)
{
char ca_buf[1024];
X509_NAME *ca_name = (X509_NAME *) sk_X509_NAME_value (skCAList, i);
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
- log_debug ("SSL: Using X509 client CA %s", ca_buf);
+ log_debug ("ODBC Server Using X509 Client CA %s", ca_buf);
}
}
-
- return 1;
}
#endif
@@ -4894,26 +4897,42 @@ static void
ssl_server_init ()
{
const SSL_METHOD *ssl_server_method;
-
+ unsigned char tmp[1024];
+#ifndef NO_THREAD
+ char err_buf[1024];
#ifdef SSL_DK_ALLOC
CRYPTO_set_mem_functions (dk_ssl_alloc, dk_ssl_realloc, dk_ssl_free);
CRYPTO_set_locked_mem_functions (dk_ssl_alloc, dk_ssl_free);
#endif
SSL_load_error_strings ();
- ERR_load_crypto_strings ();
+ ERR_load_X509_strings ();
#ifndef WIN32
- {
- unsigned char tmp[1024];
- RAND_bytes (tmp, sizeof (tmp));
- RAND_add (tmp, sizeof (tmp), (double) (sizeof (tmp)));
- }
+ RAND_bytes (tmp, sizeof (tmp));
+ RAND_add (tmp, sizeof (tmp), (double) (sizeof (tmp)));
#endif
# if (OPENSSL_VERSION_NUMBER >= 0x00908000L)
SSL_library_init ();
# endif
SSLeay_add_all_algorithms ();
- PKCS12_PBE_add (); /* stub */
-
+#else
+#ifdef SSL_DK_ALLOC
+ CRYPTO_set_mem_functions (dk_ssl_alloc, dk_ssl_realloc, dk_ssl_free);
+ CRYPTO_set_locked_mem_functions (dk_ssl_alloc, dk_ssl_free);
+#endif
+ SSL_load_error_strings ();
+ ERR_load_X509_strings ();
+ ERR_load_PKCS12_strings ();
+#ifndef WIN32
+ RAND_bytes (tmp, sizeof (tmp));
+ RAND_add (tmp, sizeof (tmp), (double) (sizeof (tmp)));
+#endif
+# if (OPENSSL_VERSION_NUMBER >= 0x00908000L)
+ SSL_library_init ();
+# else
+ SSLeay_add_ssl_algorithms ();
+# endif
+ PKCS12_PBE_add ();
+#endif
#ifdef NO_THREAD
ssl_server_method = SSLv23_client_method ();
#else
@@ -4925,6 +4944,7 @@ ssl_server_init ()
ERR_print_errors_fp (stderr);
call_exit (-1);
}
+
}
@@ -5055,53 +5075,69 @@ int
ssl_client_use_pkcs12 (SSL * ssl, char *pkcs12file, char *passwd, char *ca)
{
int /*session_id_context = 2, */ i;
- FILE *fi;
- PKCS12 *p12 = NULL;
+ FILE *fi = fopen (pkcs12file, "rb");
+ PKCS12 *p12;
EVP_PKEY *pkey;
X509 *cert;
STACK_OF (X509) * ca_list = NULL;
SSL_CTX *ssl_ctx = SSL_get_SSL_CTX (ssl);
- if (0 == PEM_parse (pkcs12file, passwd, &pkey, &cert, &ca_list))
+ if (0 != PEM_parse (pkcs12file, passwd, &pkey, &cert, &ca_list))
+ goto ssl_setup;
+
+ if (!fi || NULL == (p12 = d2i_PKCS12_fp (fi, NULL)))
{
- if ((fi = fopen (pkcs12file, "rb")) != NULL)
- {
- p12 = d2i_PKCS12_fp (fi, NULL);
- fclose (fi);
- }
- if (p12)
- {
- i = PKCS12_parse (p12, passwd, &pkey, &cert, &ca_list);
- PKCS12_free (p12);
- if (!i)
- return 0;
- }
+ if (fi)
+ fclose (fi);
+ return 0;
+ }
+ if (!PKCS12_parse (p12, passwd, &pkey, &cert, &ca_list))
+ {
+ if (fi)
+ fclose (fi);
+ return 0;
}
+ PKCS12_free (p12);
+
+ssl_setup:
+ fclose (fi);
if (ca && ca[0] != 0)
{
sk_X509_pop_free (ca_list, X509_free);
+ ca_list = NULL;
ca_list = PEM_load_certs (ca, passwd);
}
- i = SSL_use_certificate (ssl, cert);
- if (i)
- i = SSL_use_PrivateKey (ssl, pkey);
- if (i)
- i = SSL_check_private_key (ssl);
- if (i)
+ if (!SSL_use_PrivateKey (ssl, pkey))
{
- for (i = 0; i < sk_X509_num (ca_list); i++)
- {
- X509 *ca = (X509 *) sk_X509_value (ca_list, i);
- SSL_add_client_CA (ssl, ca);
- X509_STORE_add_cert (SSL_CTX_get_cert_store (ssl_ctx), ca);
- }
+ X509_free (cert);
+ EVP_PKEY_free (pkey);
+ sk_X509_pop_free (ca_list, X509_free);
+ return 0;
}
- X509_free (cert);
EVP_PKEY_free (pkey);
+ if (!SSL_use_certificate (ssl, cert))
+ {
+ X509_free (cert);
+ sk_X509_pop_free (ca_list, X509_free);
+ return 0;
+ }
+ X509_free (cert);
+
+ if (!SSL_check_private_key (ssl))
+ {
+ sk_X509_pop_free (ca_list, X509_free);
+ return 0;
+ }
+ for (i = 0; i < sk_X509_num (ca_list); i++)
+ {
+ X509 *ca = (X509 *) sk_X509_value (ca_list, i);
+ SSL_add_client_CA (ssl, ca);
+ X509_STORE_add_cert (SSL_CTX_get_cert_store (ssl_ctx), ca);
+ }
sk_X509_pop_free (ca_list, X509_free);
- return i ? 1 : 0;
+ return 1;
}
@@ -5329,20 +5365,18 @@ ssl_server_listen ()
dk_session_t *listening;
if (!c_ssl_server_port)
return;
-
- if (!ssl_server_key_setup ())
- goto failed;
-
+ ssl_server_key_setup ();
listening = PrpcListen (c_ssl_server_port, SESCLASS_TCPIP);
if (!SESSTAT_ISSET (listening->dks_session, SST_LISTENING))
{
- failed:
- log_error ("SSL: Failed listen at %s", c_ssl_server_port);
- return;
- }
+ log_error ("Failed ODBC Server SSL listen at %s.", c_ssl_server_port);
+ call_exit (-1);
+ };
ssl_server_port = tcpses_get_port (listening->dks_session);
-
- log_info ("SSL server online at %s", c_ssl_server_port);
+ if (ssl_server_verify)
+ log_info ("ODBC SSL/X509 server online at %s", c_ssl_server_port);
+ else
+ log_info ("ODBC SSL server online at %s", c_ssl_server_port);
#endif
}
diff --git a/libsrc/Dk/Dkernel.h b/libsrc/Dk/Dkernel.h
index 4dc25d0..93ce380 100644
--- a/libsrc/Dk/Dkernel.h
+++ b/libsrc/Dk/Dkernel.h
@@ -1,14 +1,14 @@
/*
* Dkernel.h
*
- * $Id: Dkernel.h,v 1.19.2.5 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkernel.h,v 1.19.2.3 2011/01/05 12:50:32 source Exp $
*
* RPC Kernel
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -750,7 +750,6 @@ extern timeout_t time_now;
EXE_EXPORT (dk_session_t *, strses_allocate, (void));
EXE_EXPORT (caddr_t, strses_string, (dk_session_t * ses));
-EXE_EXPORT (caddr_t, strses_wide_string, (dk_session_t * ses));
extern caddr_t t_strses_string (dk_session_t * ses);
void strses_set_utf8 (dk_session_t * ses, int is_utf8);
int strses_is_utf8 (dk_session_t * ses);
@@ -758,12 +757,10 @@ int strses_is_utf8 (dk_session_t * ses);
#ifdef MALLOC_DEBUG
dk_session_t *dbg_strses_allocate (DBG_PARAMS_0);
caddr_t dbg_strses_string (DBG_PARAMS dk_session_t * ses);
-caddr_t dbg_strses_wide_string (DBG_PARAMS dk_session_t * ses);
#ifndef _USRDLL
#ifndef EXPORT_GATE
#define strses_allocate() dbg_strses_allocate (__FILE__, __LINE__)
#define strses_string(S) dbg_strses_string (__FILE__, __LINE__, (S))
-#define strses_wide_string(S) dbg_strses_wide_string (__FILE__, __LINE__, (S))
#endif
#endif
#endif
diff --git a/libsrc/Dk/Dkhash.c b/libsrc/Dk/Dkhash.c
index 75a1e1a..4718dac 100644
--- a/libsrc/Dk/Dkhash.c
+++ b/libsrc/Dk/Dkhash.c
@@ -1,14 +1,14 @@
/*
* Dkhash.c
*
- * $Id: Dkhash.c,v 1.8.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkhash.c,v 1.8 2009/04/07 22:00:54 source Exp $
*
* Hash tables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkhash.h b/libsrc/Dk/Dkhash.h
index da39c51..d810291 100644
--- a/libsrc/Dk/Dkhash.h
+++ b/libsrc/Dk/Dkhash.h
@@ -1,14 +1,14 @@
/*
* Dkhash.h
*
- * $Id: Dkhash.h,v 1.11.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkhash.h,v 1.11.2.1 2011/03/08 13:41:56 source Exp $
*
* Hash tables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkhash64.h b/libsrc/Dk/Dkhash64.h
index c6f4c65..70899ef 100644
--- a/libsrc/Dk/Dkhash64.h
+++ b/libsrc/Dk/Dkhash64.h
@@ -1,14 +1,14 @@
/*
* Dkhash64.h
*
- * $Id: Dkhash64.h,v 1.4.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkhash64.h,v 1.4 2009/04/07 22:00:54 source Exp $
*
* int64 hashtable for 32 bit platforms
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Dk/Dkhashext.c b/libsrc/Dk/Dkhashext.c
index cace2f6..3aa6551 100644
--- a/libsrc/Dk/Dkhashext.c
+++ b/libsrc/Dk/Dkhashext.c
@@ -1,14 +1,14 @@
/*
* Dkhashext.c
*
- * $Id: Dkhashext.c,v 1.17.2.3 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkhashext.c,v 1.17.2.2 2010/05/07 09:14:31 source Exp $
*
* Hashing
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkhashext.h b/libsrc/Dk/Dkhashext.h
index d30087d..6dcd0af 100644
--- a/libsrc/Dk/Dkhashext.h
+++ b/libsrc/Dk/Dkhashext.h
@@ -1,12 +1,12 @@
/*
* hashext.h
*
- * $Id: Dkhashext.h,v 1.15.2.3 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkhashext.h,v 1.15.2.2 2011/04/21 13:09:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkhashext_t.c b/libsrc/Dk/Dkhashext_t.c
index dfc4cdb..6baa2de 100644
--- a/libsrc/Dk/Dkhashext_t.c
+++ b/libsrc/Dk/Dkhashext_t.c
@@ -1,14 +1,14 @@
/*
* Dkstkern.c
*
- * $Id: Dkhashext_t.c,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkhashext_t.c,v 1.2 2009/04/07 22:00:54 source Exp $
*
* RPC Kernel (single threaded, without server side support)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkhashext_template.c b/libsrc/Dk/Dkhashext_template.c
index fd6d2c2..49fbef1 100644
--- a/libsrc/Dk/Dkhashext_template.c
+++ b/libsrc/Dk/Dkhashext_template.c
@@ -1,12 +1,12 @@
/*
* Dkhashext_template.c
*
- * $Id: Dkhashext_template.c,v 1.9.2.3 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkhashext_template.c,v 1.9.2.2 2010/06/25 11:22:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dklongjmp.c b/libsrc/Dk/Dklongjmp.c
index 3e6626f..55b11e8 100644
--- a/libsrc/Dk/Dklongjmp.c
+++ b/libsrc/Dk/Dklongjmp.c
@@ -1,12 +1,12 @@
/*
* Dklongjump.c
*
- * $Id: Dklongjmp.c,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dklongjmp.c,v 1.2 2009/04/07 22:00:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkmarshal.c b/libsrc/Dk/Dkmarshal.c
index abe2dde..0010c85 100644
--- a/libsrc/Dk/Dkmarshal.c
+++ b/libsrc/Dk/Dkmarshal.c
@@ -1,14 +1,14 @@
/*
* Dkmarshal.c
*
- * $Id: Dkmarshal.c,v 1.16.2.6 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkmarshal.c,v 1.16.2.5 2011/01/25 14:32:56 source Exp $
*
* Marshalling on top of sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkmarshal.h b/libsrc/Dk/Dkmarshal.h
index b85bc21..92438ec 100644
--- a/libsrc/Dk/Dkmarshal.h
+++ b/libsrc/Dk/Dkmarshal.h
@@ -1,14 +1,14 @@
/*
* nmarsh.h
*
- * $Id: Dkmarshal.h,v 1.5.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkmarshal.h,v 1.5.2.1 2009/11/17 21:38:44 source Exp $
*
* Marshalling on top of sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkparam.h b/libsrc/Dk/Dkparam.h
index c9b619b..e24120c 100644
--- a/libsrc/Dk/Dkparam.h
+++ b/libsrc/Dk/Dkparam.h
@@ -1,14 +1,14 @@
/*
* Dkparam.h
*
- * $Id: Dkparam.h,v 1.4.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkparam.h,v 1.4 2009/04/07 22:00:54 source Exp $
*
* Global parameters
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkpool.c b/libsrc/Dk/Dkpool.c
index bd02b79..55ed6b8 100644
--- a/libsrc/Dk/Dkpool.c
+++ b/libsrc/Dk/Dkpool.c
@@ -1,7 +1,7 @@
/*
* Dkpool.c
*
- * $Id: Dkpool.c,v 1.24.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkpool.c,v 1.24.2.1 2009/09/22 09:32:30 source Exp $
*
* Temp memory pool for objects that should be allocated one by one but freed
* together.
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkpool.h b/libsrc/Dk/Dkpool.h
index 6d4caba..8ab1acf 100644
--- a/libsrc/Dk/Dkpool.h
+++ b/libsrc/Dk/Dkpool.h
@@ -1,7 +1,7 @@
/*
* Dkpool.h
*
- * $Id: Dkpool.h,v 1.20.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkpool.h,v 1.20.2.1 2009/04/15 15:35:41 source Exp $
*
* Temp memory pool for objects that should be allocated one by one but freed
* together.
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkresource.c b/libsrc/Dk/Dkresource.c
index 5168b4d..82048ad 100644
--- a/libsrc/Dk/Dkresource.c
+++ b/libsrc/Dk/Dkresource.c
@@ -1,14 +1,14 @@
/*
* Dkresource.c
*
- * $Id: Dkresource.c,v 1.3.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkresource.c,v 1.3 2009/04/07 22:00:54 source Exp $
*
* Resource management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkresource.h b/libsrc/Dk/Dkresource.h
index 41ad247..a8fe771 100644
--- a/libsrc/Dk/Dkresource.h
+++ b/libsrc/Dk/Dkresource.h
@@ -1,14 +1,14 @@
/*
* Dkresource.h
*
- * $Id: Dkresource.h,v 1.3.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkresource.h,v 1.3 2009/04/07 22:00:54 source Exp $
*
* Resource Management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkrusage.c b/libsrc/Dk/Dkrusage.c
index 82ed63d..2a9386f 100644
--- a/libsrc/Dk/Dkrusage.c
+++ b/libsrc/Dk/Dkrusage.c
@@ -1,14 +1,14 @@
/*
* Dkrusage.c
*
- * $Id: Dkrusage.c,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkrusage.c,v 1.2 2009/04/07 22:00:54 source Exp $
*
* Helper function to increase server resources on BSD machines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkses2.c b/libsrc/Dk/Dkses2.c
index 93a56fc..e9d6d51 100644
--- a/libsrc/Dk/Dkses2.c
+++ b/libsrc/Dk/Dkses2.c
@@ -1,14 +1,14 @@
/*
* Dkses2.h
*
- * $Id: Dkses2.c,v 1.8.2.2 2012/03/08 12:55:30 source Exp $
+ * $Id: Dkses2.c,v 1.8.2.1 2009/06/14 18:35:42 source Exp $
*
* Upper layer sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksesinp.c b/libsrc/Dk/Dksesinp.c
index 79cebbf..bab35c4 100644
--- a/libsrc/Dk/Dksesinp.c
+++ b/libsrc/Dk/Dksesinp.c
@@ -1,14 +1,14 @@
/*
* Dksesinp.c
*
- * $Id: Dksesinp.c,v 1.2.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dksesinp.c,v 1.2 2009/04/07 22:00:54 source Exp $
*
* In-process sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksession.c b/libsrc/Dk/Dksession.c
index 82f2284..a6d97b9 100644
--- a/libsrc/Dk/Dksession.c
+++ b/libsrc/Dk/Dksession.c
@@ -1,14 +1,14 @@
/*
* Dksession.c
*
- * $Id: Dksession.c,v 1.4.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: Dksession.c,v 1.4 2009/04/07 22:00:54 source Exp $
*
* Sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksession.h b/libsrc/Dk/Dksession.h
index dc69c3b..b0272cc 100644
--- a/libsrc/Dk/Dksession.h
+++ b/libsrc/Dk/Dksession.h
@@ -1,14 +1,14 @@
/*
* Dksession.h
*
- * $Id: Dksession.h,v 1.8.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksession.h,v 1.8 2009/04/10 23:06:43 source Exp $
*
* Lower layer sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksesstr.c b/libsrc/Dk/Dksesstr.c
index 4698a17..f428f2b 100644
--- a/libsrc/Dk/Dksesstr.c
+++ b/libsrc/Dk/Dksesstr.c
@@ -1,14 +1,14 @@
/*
* Dksesstr.c
*
- * $Id: Dksesstr.c,v 1.15.2.3 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksesstr.c,v 1.15.2.1 2011/04/21 13:09:46 source Exp $
*
* String sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1110,19 +1110,6 @@ DBG_NAME (strses_string) (DBG_PARAMS dk_session_t * ses)
caddr_t
-DBG_NAME (strses_wide_string) (DBG_PARAMS dk_session_t * ses)
-{
- int64 len = strses_length (ses);
- caddr_t box;
- if (NULL == (box = DBG_NAME (dk_alloc_box) (DBG_ARGS len + sizeof (wchar_t), DV_WIDE)))
- return NULL;
- strses_to_array (ses, box);
- ((wchar_t *)(box+len))[0] = 0;
- return box;
-}
-
-
-caddr_t
t_strses_string (dk_session_t * ses)
{
int64 len = strses_length (ses);
@@ -1669,14 +1656,6 @@ strses_string (dk_session_t * ses)
{
return dbg_strses_string (__FILE__, __LINE__, ses);
}
-
-
-#undef strses_wide_string
-caddr_t
-strses_wide_string (dk_session_t * ses)
-{
- return dbg_strses_wide_string (__FILE__, __LINE__, ses);
-}
#endif
caddr_t
diff --git a/libsrc/Dk/Dksesstr.h b/libsrc/Dk/Dksesstr.h
index ab7c5de..23495e6 100644
--- a/libsrc/Dk/Dksesstr.h
+++ b/libsrc/Dk/Dksesstr.h
@@ -1,14 +1,14 @@
/*
* Dksesstr.h
*
- * $Id: Dksesstr.h,v 1.2.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksesstr.h,v 1.2 2009/04/07 22:00:54 source Exp $
*
* String sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksestcp.c b/libsrc/Dk/Dksestcp.c
index 6456abc..6027eb7 100644
--- a/libsrc/Dk/Dksestcp.c
+++ b/libsrc/Dk/Dksestcp.c
@@ -1,14 +1,14 @@
/*
* Dksestcp.c
*
- * $Id: Dksestcp.c,v 1.14.2.4 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksestcp.c,v 1.14.2.3 2011/09/09 13:30:40 source Exp $
*
* TCP/IP sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksestcp.h b/libsrc/Dk/Dksestcp.h
index 56f689b..feb66b3 100644
--- a/libsrc/Dk/Dksestcp.h
+++ b/libsrc/Dk/Dksestcp.h
@@ -1,14 +1,14 @@
/*
* Dksestcp.h
*
- * $Id: Dksestcp.h,v 1.3.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksestcp.h,v 1.3.2.1 2011/05/03 18:01:15 source Exp $
*
* TCP sessions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksestcpint.h b/libsrc/Dk/Dksestcpint.h
index 80a6e50..e775dc7 100644
--- a/libsrc/Dk/Dksestcpint.h
+++ b/libsrc/Dk/Dksestcpint.h
@@ -1,14 +1,14 @@
/*
* Dksestcpint.h
*
- * $Id: Dksestcpint.h,v 1.2.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksestcpint.h,v 1.2 2009/04/07 22:00:54 source Exp $
*
* Internal of Dksestcp.h
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Dk/Dksets.c b/libsrc/Dk/Dksets.c
index 81f2d45..b87e5ef 100644
--- a/libsrc/Dk/Dksets.c
+++ b/libsrc/Dk/Dksets.c
@@ -1,14 +1,14 @@
/*
* Dksets.c
*
- * $Id: Dksets.c,v 1.7.2.3 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksets.c,v 1.7.2.2 2010/12/06 10:37:13 source Exp $
*
* Sets
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksets.h b/libsrc/Dk/Dksets.h
index 84598fd..faf0011 100644
--- a/libsrc/Dk/Dksets.h
+++ b/libsrc/Dk/Dksets.h
@@ -1,14 +1,14 @@
/*
* Dksets.h
*
- * $Id: Dksets.h,v 1.7.2.3 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksets.h,v 1.7.2.2 2010/12/06 10:37:13 source Exp $
*
* Sets
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkstkern.c b/libsrc/Dk/Dkstkern.c
index 187a181..e8dab00 100644
--- a/libsrc/Dk/Dkstkern.c
+++ b/libsrc/Dk/Dkstkern.c
@@ -1,14 +1,14 @@
/*
* Dkstkern.c
*
- * $Id: Dkstkern.c,v 1.2.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dkstkern.c,v 1.2 2009/04/07 22:00:54 source Exp $
*
* RPC Kernel (single threaded, without server side support)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkstubs.c b/libsrc/Dk/Dkstubs.c
index 3c6ce64..8b88703 100644
--- a/libsrc/Dk/Dkstubs.c
+++ b/libsrc/Dk/Dkstubs.c
@@ -1,14 +1,14 @@
/*
* Dkstubs.c
*
- * $Id: Dkstubs.c,v 1.2.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dkstubs.c,v 1.2 2009/04/07 22:00:54 source Exp $
*
* Systems specific code
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkstubs.h b/libsrc/Dk/Dkstubs.h
index 1d26aa6..cb5d39e 100644
--- a/libsrc/Dk/Dkstubs.h
+++ b/libsrc/Dk/Dkstubs.h
@@ -1,14 +1,14 @@
/*
* Dkstubs.h
*
- * $Id: Dkstubs.h,v 1.3.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dkstubs.h,v 1.3 2009/04/07 22:00:54 source Exp $
*
* Systems specific code
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dksystem.h b/libsrc/Dk/Dksystem.h
index 8ff478a..38da468 100644
--- a/libsrc/Dk/Dksystem.h
+++ b/libsrc/Dk/Dksystem.h
@@ -1,14 +1,14 @@
/*
* Dksystem.h
*
- * $Id: Dksystem.h,v 1.5.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dksystem.h,v 1.5 2009/04/07 22:00:54 source Exp $
*
* system common include files
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dktrace.h b/libsrc/Dk/Dktrace.h
index 8e7b58d..61e221b 100644
--- a/libsrc/Dk/Dktrace.h
+++ b/libsrc/Dk/Dktrace.h
@@ -1,14 +1,14 @@
/*
* Dktrace.h
*
- * $Id: Dktrace.h,v 1.3.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: Dktrace.h,v 1.3.2.1 2011/03/08 13:41:57 source Exp $
*
* Tracing & Debugging
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dktypes.h b/libsrc/Dk/Dktypes.h
index 8871169..18012c9 100644
--- a/libsrc/Dk/Dktypes.h
+++ b/libsrc/Dk/Dktypes.h
@@ -1,14 +1,14 @@
/*
* Dktypes.c
*
- * $Id: Dktypes.h,v 1.5.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dktypes.h,v 1.5 2009/04/07 22:00:54 source Exp $
*
* Global types
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkutil.c b/libsrc/Dk/Dkutil.c
index 047007c..f662d22 100644
--- a/libsrc/Dk/Dkutil.c
+++ b/libsrc/Dk/Dkutil.c
@@ -1,14 +1,14 @@
/*
* Dkutil.c
*
- * $Id: Dkutil.c,v 1.3.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dkutil.c,v 1.3 2009/04/07 22:00:54 source Exp $
*
* Helper functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkutil.h b/libsrc/Dk/Dkutil.h
index 5fb7950..a972610 100644
--- a/libsrc/Dk/Dkutil.h
+++ b/libsrc/Dk/Dkutil.h
@@ -1,14 +1,14 @@
/*
* Dkutil.h
*
- * $Id: Dkutil.h,v 1.2.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dkutil.h,v 1.2 2009/04/07 22:00:54 source Exp $
*
* Helper functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Dkword.h b/libsrc/Dk/Dkword.h
index 018dc57..1877834 100644
--- a/libsrc/Dk/Dkword.h
+++ b/libsrc/Dk/Dkword.h
@@ -1,12 +1,12 @@
/*
* Dkword.h
*
- * $Id: Dkword.h,v 1.2.2.1 2012/03/08 12:55:31 source Exp $
+ * $Id: Dkword.h,v 1.2 2009/04/07 22:00:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/libsrc/Dk/Makefile.am b/libsrc/Dk/Makefile.am
index 8b78c2a..aef20a2 100644
--- a/libsrc/Dk/Makefile.am
+++ b/libsrc/Dk/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/Dk/Makefile.in b/libsrc/Dk/Makefile.in
index 524fe6e..b6b0330 100644
--- a/libsrc/Dk/Makefile.in
+++ b/libsrc/Dk/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -150,7 +150,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -199,7 +198,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -251,7 +249,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -298,6 +295,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/JDBCDriverType4/Makefile.am b/libsrc/JDBCDriverType4/Makefile.am
index 6239b2d..30cacf0 100644
--- a/libsrc/JDBCDriverType4/Makefile.am
+++ b/libsrc/JDBCDriverType4/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/JDBCDriverType4/Makefile.in b/libsrc/JDBCDriverType4/Makefile.in
index b080f6b..60f752f 100644
--- a/libsrc/JDBCDriverType4/Makefile.in
+++ b/libsrc/JDBCDriverType4/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -139,7 +139,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -188,7 +187,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -240,7 +238,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -287,6 +284,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java b/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java
index fc58bee..5f81ef6 100644
--- a/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java
+++ b/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java
@@ -1,12 +1,12 @@
/*
- * $Id: BaseMessage.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: BaseMessage.java,v 1.2.2.1 2010/02/02 23:03:58 source Exp $
*
* Implementation of the BaseMessage class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java
index f9ee2f4..94b0785 100644
--- a/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java
+++ b/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java
@@ -1,12 +1,12 @@
/*
- * $Id: OPLHeapBlob.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: OPLHeapBlob.java,v 1.2.2.1 2010/02/02 23:03:58 source Exp $
*
* Implementation of the JDBC Blob class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java
index e1d2890..5be8524 100644
--- a/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java
+++ b/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java
@@ -1,12 +1,12 @@
/*
- * $Id: OPLHeapClob.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: OPLHeapClob.java,v 1.2.2.1 2010/02/02 23:03:58 source Exp $
*
* Implementation of the JDBC Clob class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java
index e2c1c8b..34e5d0b 100644
--- a/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java
+++ b/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java
@@ -1,12 +1,12 @@
/*
- * $Id: OPLHeapNClob.java,v 1.1.2.3 2012/03/08 12:55:31 source Exp $
+ * $Id: OPLHeapNClob.java,v 1.1.2.2 2010/02/02 23:03:58 source Exp $
*
* Implementation of the JDBC Clob class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java b/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java
index a3be996..1e2b069 100644
--- a/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java
+++ b/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java
@@ -1,12 +1,12 @@
/*
- * $Id: OPLMessage_u.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: OPLMessage_u.java,v 1.2.2.1 2010/02/02 23:03:58 source Exp $
*
* Implementation of the OPLMessage_x class
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/Vector.java b/libsrc/JDBCDriverType4/openlink/util/Vector.java
index 3827221..5e2d1d0 100644
--- a/libsrc/JDBCDriverType4/openlink/util/Vector.java
+++ b/libsrc/JDBCDriverType4/openlink/util/Vector.java
@@ -1,10 +1,10 @@
/*
- * $Id: Vector.java,v 1.1.1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: Vector.java,v 1.1.1.1.2.1 2010/02/02 23:03:58 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java
index 89e4ba9..10ef159 100644
--- a/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java
+++ b/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java
@@ -1,10 +1,10 @@
/*
- * $Id: VectorOfDouble.java,v 1.1.1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: VectorOfDouble.java,v 1.1.1.1.2.1 2010/02/02 23:03:58 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java
index 3a37ed7..7f86a7d 100644
--- a/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java
+++ b/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java
@@ -1,10 +1,10 @@
/*
- * $Id: VectorOfFloat.java,v 1.1.1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: VectorOfFloat.java,v 1.1.1.1.2.1 2010/02/02 23:03:58 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java
index 31527b3..9832c73 100644
--- a/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java
+++ b/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java
@@ -1,10 +1,10 @@
/*
- * $Id: VectorOfLong.java,v 1.1.1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: VectorOfLong.java,v 1.1.1.1.2.1 2010/02/02 23:03:58 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/openlink/util/messages_u.java b/libsrc/JDBCDriverType4/openlink/util/messages_u.java
index df3c88b..9a71292 100644
--- a/libsrc/JDBCDriverType4/openlink/util/messages_u.java
+++ b/libsrc/JDBCDriverType4/openlink/util/messages_u.java
@@ -1,12 +1,12 @@
/*
- * $Id: messages_u.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: messages_u.java,v 1.2.2.1 2010/02/02 23:03:58 source Exp $
*
* Error messages
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/JDBCDriverType4/test.bat b/libsrc/JDBCDriverType4/test.bat
index 23cd6cf..26dd435 100644
--- a/libsrc/JDBCDriverType4/test.bat
+++ b/libsrc/JDBCDriverType4/test.bat
@@ -1,10 +1,10 @@
rem
-rem $Id: test.bat,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+rem $Id: test.bat,v 1.2.2.1 2009/07/01 10:30:28 source Exp $
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2009 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/libsrc/JDBCDriverType4/test.sh b/libsrc/JDBCDriverType4/test.sh
index 299d832..684a5ad 100755
--- a/libsrc/JDBCDriverType4/test.sh
+++ b/libsrc/JDBCDriverType4/test.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test.sh,v 1.2.2.3 2012/03/08 12:55:31 source Exp $
+# $Id: test.sh,v 1.2.2.2 2009/07/14 20:15:00 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/test2.bat b/libsrc/JDBCDriverType4/test2.bat
index 3073a8c..f188bc7 100644
--- a/libsrc/JDBCDriverType4/test2.bat
+++ b/libsrc/JDBCDriverType4/test2.bat
@@ -1,10 +1,10 @@
rem
-rem $Id: test2.bat,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+rem $Id: test2.bat,v 1.2.2.1 2009/07/01 10:30:28 source Exp $
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2009 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/libsrc/JDBCDriverType4/test2.sh b/libsrc/JDBCDriverType4/test2.sh
index 18c43f7..9632b17 100755
--- a/libsrc/JDBCDriverType4/test2.sh
+++ b/libsrc/JDBCDriverType4/test2.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test2.sh,v 1.2.2.3 2012/03/08 12:55:31 source Exp $
+# $Id: test2.sh,v 1.2.2.2 2009/07/14 20:15:00 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/test3.bat b/libsrc/JDBCDriverType4/test3.bat
index e655a90..c44e7fc 100644
--- a/libsrc/JDBCDriverType4/test3.bat
+++ b/libsrc/JDBCDriverType4/test3.bat
@@ -1,10 +1,10 @@
rem
-rem $Id: test3.bat,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+rem $Id: test3.bat,v 1.2.2.1 2009/07/01 10:30:29 source Exp $
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2009 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/libsrc/JDBCDriverType4/test3.sh b/libsrc/JDBCDriverType4/test3.sh
index bb9d155..c564f9a 100755
--- a/libsrc/JDBCDriverType4/test3.sh
+++ b/libsrc/JDBCDriverType4/test3.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test3.sh,v 1.2.2.4 2012/03/08 12:55:31 source Exp $
+# $Id: test3.sh,v 1.2.2.3 2009/07/14 20:15:00 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/test4.bat b/libsrc/JDBCDriverType4/test4.bat
index ac39d01..b121e91 100644
--- a/libsrc/JDBCDriverType4/test4.bat
+++ b/libsrc/JDBCDriverType4/test4.bat
@@ -1,10 +1,10 @@
rem
-rem $Id: test4.bat,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+rem $Id: test4.bat,v 1.2.2.1 2009/07/01 10:30:29 source Exp $
rem
rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
rem project.
rem
-rem Copyright (C) 1998-2012 OpenLink Software
+rem Copyright (C) 1998-2009 OpenLink Software
rem
rem This project is free software; you can redistribute it and/or modify it
rem under the terms of the GNU General Public License as published by the
diff --git a/libsrc/JDBCDriverType4/test4.sh b/libsrc/JDBCDriverType4/test4.sh
index db9903d..86935c1 100755
--- a/libsrc/JDBCDriverType4/test4.sh
+++ b/libsrc/JDBCDriverType4/test4.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: test4.sh,v 1.2.2.3 2012/03/08 12:55:31 source Exp $
+# $Id: test4.sh,v 1.2.2.2 2009/07/14 20:15:00 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am
index f0eb6b7..02070f1 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.in b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.in
index debbdf9..673a579 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.in
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java
index f964ed9..86e3883 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java
index d429814..c7378ca 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java
index 553c03b..6ce7452 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java
index e1e2f35..849f99a 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java
index f42d01b..5032f8f 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java
index 34198cb..8462d2f 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java
index 5fb4636..92a641a 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java
index 2b412d8..385df1c 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java
index c5a279e..7d2a47a 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java
index e6ba210..a5fcaa1 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java
index 49d11c3..a849c40 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java
index 3a05265..ba137ae 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java
index 41d345b..3e971de 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java
index 4965ec3..32c15c9 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java
index 8f368cd..f0826da 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java
index ee7f2b4..aaf23ef 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java
index 5f7cd4e..8aec913 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java
index 3ad2fa7..2904d4e 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java
index 15f708a..08f0232 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java
index 46758ca..801867b 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java
index 6db1df8..b952360 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql b/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql
index 6d5fd27..2c024da 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql
@@ -1,10 +1,10 @@
--
--- $Id: tagproc.sql,v 1.2.2.1 2012/03/08 12:55:31 source Exp $
+-- $Id: tagproc.sql,v 1.2 2006/08/16 07:58:14 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java
index 819290e..12d3e5a 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am
index 08e563e..8d70271 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.in b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.in
index bf94a77..458b523 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.in
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java
index e9adff5..7a1ab78 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java
index 15b9225..62809b3 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java
index 40daca4..c7fdfac 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java
index d733522..a3b520d 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java
index 8546adb..dfa792e 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java
index dc1f916..8b4b7c1 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java
index b7a3c94..b599294 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java
index b290b0b..abcdbb0 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java
index dbfc250..a947179 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java
index 2022587..7d952e7 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java
index 19f2079..0e16991 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java
index 295db68..541d501 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java
index d33f3fe..f6aa245 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java
index 8be79e7..1758720 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java
index 5d4ca91..91d97a0 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java
index f6715e4..f688ace 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java
index 5187087..d4514fe 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java
index c068407..93e20ee 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java
index f22946f..978da8a 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java
index d7cd150..cc72151 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java
index b700992..08ce511 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java
index 13ce3e6..0c6179c 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java
index c9db19a..9b75ca5 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java
index abf6d06..9be4f3a 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am
index f7fe139..35ef4b4 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.in b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.in
index f175cf2..1cfceb0 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.in
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java
index 2a6c81c..06d7837 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java
index 2abd077..b1be52d 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java
index 27930d2..8b84538 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java
index 83a7d50..b10ccb2 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java
index c8dbf37..4213f99 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java
index c8dd605..955d1b9 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java
index 48bb38a..a0506c0 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java
index 5e2fbdb..93f6cbc 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java
index 387f36f..878c2f3 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java
index ed00a98..a2edd2d 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java
index 4efb659..4ac7874 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java
index 1881fc2..83d1561 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java
index 025e95b..8eabf0e 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java
index 6b31425..9430f2c 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java
index b221739..6fae219 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java
index 71f4e99..94e68e9 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java
index 448a7de..e35cbf0 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java
index 68d3903..a5d5cbe 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java
index 6a7bc48..1399c17 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java
index a5cf567..7ded213 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java
index aa0f56f..658e975 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java
index b8cda99..6232d90 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java
index 1bda35d..515e016 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java
index 606bfc0..148bd34 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java
@@ -2,7 +2,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/Makefile.am b/libsrc/JDBCDriverType4/virtuoso/Makefile.am
index 56a8462..b7bd501 100644
--- a/libsrc/JDBCDriverType4/virtuoso/Makefile.am
+++ b/libsrc/JDBCDriverType4/virtuoso/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/Makefile.in b/libsrc/JDBCDriverType4/virtuoso/Makefile.in
index 7ec86d6..55096fc 100644
--- a/libsrc/JDBCDriverType4/virtuoso/Makefile.in
+++ b/libsrc/JDBCDriverType4/virtuoso/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -139,7 +139,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -188,7 +187,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -240,7 +238,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -287,6 +284,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java
index e74004f..6acab22 100644
--- a/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java
+++ b/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java
@@ -1,10 +1,10 @@
/*
- * $Id: BaseRowSet.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: BaseRowSet.java,v 1.2.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java
index 7f2cab1..d3912e0 100644
--- a/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java
+++ b/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java
@@ -1,10 +1,10 @@
/*
- * $Id: OPLCachedRowSet.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: OPLCachedRowSet.java,v 1.2.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java
index 07d3175..4c7142a 100644
--- a/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java
+++ b/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java
@@ -1,10 +1,10 @@
/*
- * $Id: OPLJdbcRowSet.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: OPLJdbcRowSet.java,v 1.2.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java
index f17cfbd..da56eae 100644
--- a/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java
+++ b/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java
@@ -1,10 +1,10 @@
/*
- * $Id: OPLMessage_x.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: OPLMessage_x.java,v 1.2.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java
index 78d0bd5..1486eb4 100644
--- a/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java
+++ b/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java
@@ -1,10 +1,10 @@
/*
- * $Id: OPLRowSetMetaData.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: OPLRowSetMetaData.java,v 1.2.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java b/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java
index ef9f559..6d6f818 100644
--- a/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java
+++ b/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java
@@ -1,10 +1,10 @@
/*
- * $Id: messages_x.java,v 1.2.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: messages_x.java,v 1.2.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java
index 92c5f7d..8534b42 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java
@@ -1,10 +1,10 @@
/*
- * $Id: BatchUpdateException.java,v 1.1.1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: BatchUpdateException.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java
index 00fcaa2..f8738e7 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java
@@ -1,10 +1,10 @@
/*
- * $Id: CallableStatementWrapper.java,v 1.2.2.3 2012/03/08 12:55:31 source Exp $
+ * $Id: CallableStatementWrapper.java,v 1.2.2.2 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java
index 5e74428..d660b70 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java
@@ -1,10 +1,10 @@
/*
- * $Id: Closeable.java,v 1.2.2.3 2012/03/08 12:55:31 source Exp $
+ * $Id: Closeable.java,v 1.2.2.2 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java
index 8290960..4c741d2 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java
@@ -1,10 +1,10 @@
/*
- * $Id: ConnectionWrapper.java,v 1.2.2.9 2012/03/08 12:55:31 source Exp $
+ * $Id: ConnectionWrapper.java,v 1.2.2.8 2010/01/15 12:22:15 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java
index b7247ac..6b8ea88 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java
@@ -1,10 +1,10 @@
/*
- * $Id: Driver.java,v 1.16.2.35 2012/03/15 11:17:00 source Exp $
+ * $Id: Driver.java,v 1.16.2.32 2011/08/21 12:44:02 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -62,7 +62,7 @@ public class Driver implements java.sql.Driver
// The major and minor version number
protected static final int major = 3;
- protected static final int minor = 61;
+ protected static final int minor = 59;
// Some variables
private String host = "localhost";
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java
index 09528e9..ef8be59 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java
@@ -1,10 +1,10 @@
/*
- * $Id: LRUCache.java,v 1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: LRUCache.java,v 1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am
index cbe0385..4c1f724 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.in b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.in
index 28c5ab6..4e5f6cb 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.in
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -152,7 +151,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -204,7 +202,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -251,6 +248,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java
index b1b4c61..ca818eb 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java
@@ -1,10 +1,10 @@
/*
- * $Id: PreparedStatementWrapper.java,v 1.2.2.5 2012/03/08 12:55:31 source Exp $
+ * $Id: PreparedStatementWrapper.java,v 1.2.2.4 2011/08/21 12:44:02 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java
index 93c87a2..56f7b26 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java
@@ -1,10 +1,10 @@
/*
- * $Id: ResultSetWrapper.java,v 1.2.2.4 2012/03/08 12:55:31 source Exp $
+ * $Id: ResultSetWrapper.java,v 1.2.2.3 2011/08/17 17:46:30 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java
index 3e96291..b4da882 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java
@@ -1,10 +1,10 @@
/*
- * $Id: StatementWrapper.java,v 1.2.2.4 2012/03/08 12:55:31 source Exp $
+ * $Id: StatementWrapper.java,v 1.2.2.3 2009/09/18 16:12:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java
index 8186c33..5058d7e 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java
@@ -1,10 +1,10 @@
/*
- * $Id: Types.java,v 1.1.1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: Types.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java
index 9de29e6..c5adcc1 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoAsciiInputStream.java,v 1.1.1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: VirtuosoAsciiInputStream.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java
index 845a802..de2c9ce 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoBlob.java,v 1.3.2.3 2012/03/08 12:55:31 source Exp $
+ * $Id: VirtuosoBlob.java,v 1.3.2.2 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java
index a33bc14..af5b15a 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoBlobStream.java,v 1.1.1.1.2.2 2012/03/08 12:55:31 source Exp $
+ * $Id: VirtuosoBlobStream.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java
index f399482..4008a67 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoCallableStatement.java,v 1.2.2.5 2012/03/08 12:55:31 source Exp $
+ * $Id: VirtuosoCallableStatement.java,v 1.2.2.4 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java
index b1af1ec..f1a7fdf 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoClob.java,v 1.1.1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoClob.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java
index e6f5d7b..3a5eae1 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoClobCharStream.java,v 1.1.1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoClobCharStream.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java
index e8bf15f..ccc81b6 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoClobStream.java,v 1.1.1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoClobStream.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java
index 049fbac..28ffd25 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoColumn.java,v 1.2.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoColumn.java,v 1.2.2.2 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java
index b8d5f7e..4ce0ba9 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoConnection.java,v 1.9.2.14 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoConnection.java,v 1.9.2.13 2011/10/28 21:37:06 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java
index 4f45bd8..9ddc283 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoConnectionPoolDataSource.java,v 1.1.1.1.2.7 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoConnectionPoolDataSource.java,v 1.1.1.1.2.6 2011/08/18 09:26:38 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java
index 3c9e3fe..48e1585 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoDataSource.java,v 1.2.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoDataSource.java,v 1.2.2.2 2009/08/21 11:36:14 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java
index 8b82bc5..1589c92 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoDataSourceFactory.java,v 1.1.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoDataSourceFactory.java,v 1.1.2.2 2009/08/21 11:36:14 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java
index 74e4164..88813fd 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoDatabaseMetaData.java,v 1.3.2.5 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoDatabaseMetaData.java,v 1.3.2.4 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java
index dea0fd7..25646d0 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoException.java,v 1.1.1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoException.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java
index 8dbfe80..a95edea 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoExplicitString.java,v 1.4.2.4 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoExplicitString.java,v 1.4.2.3 2011/03/23 12:01:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java
index d26bbf9..14d4364 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoExtendedString.java,v 1.3.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoExtendedString.java,v 1.3.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java
index 7b72e7f..87f6af1 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoFNSException.java,v 1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoFNSException.java,v 1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java
index 0976090..923e1a9 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoFuture.java,v 1.1.1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoFuture.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java
index 280b530..a6bff7f 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoInputStream.java,v 1.9.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoInputStream.java,v 1.9.2.2 2010/05/29 12:22:05 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java
index e647926..5a3c981 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoNullParameter.java,v 1.1.1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoNullParameter.java,v 1.1.1.1.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java
index ad37bad..86eb87f 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoOutputStream.java,v 1.7.2.4 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoOutputStream.java,v 1.7.2.3 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java
index 8dace50..38e8e61 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoParameterMetaData.java,v 1.2.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoParameterMetaData.java,v 1.2.2.1 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java
index 933ef3a..bfa6eb9 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoPoolManager.java,v 1.2.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoPoolManager.java,v 1.2.2.2 2009/08/20 20:13:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java
index 93274da..754237b 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoPooledConnection.java,v 1.2.2.8 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoPooledConnection.java,v 1.2.2.7 2011/02/18 10:25:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java
index 38af975..e5c8848 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoPreparedStatement.java,v 1.6.2.9 2012/03/15 11:17:00 source Exp $
+ * $Id: VirtuosoPreparedStatement.java,v 1.6.2.7 2011/03/23 12:01:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -340,8 +340,7 @@ public class VirtuosoPreparedStatement extends VirtuosoStatement implements Prep
// Build the args array
Object[] args = new Object[2];
args[0] = statid;
-// args[1] = new Long(VirtuosoTypes.STAT_CLOSE);
- args[1] = new Long(VirtuosoTypes.STAT_DROP);
+ args[1] = new Long(VirtuosoTypes.STAT_CLOSE);
// Create and get a future for this
future = connection.getFuture(VirtuosoFuture.close,args, this.rpc_timeout);
// Read the answer
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRdfBox.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRdfBox.java
index 7b6e76b..054059f 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRdfBox.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRdfBox.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoRdfBox.java,v 1.2.2.5 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoRdfBox.java,v 1.2.2.4 2010/07/09 14:22:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java
index c605b2d..9eb369e 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoResultSet.java,v 1.4.2.9 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoResultSet.java,v 1.4.2.8 2010/11/22 11:27:19 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java
index b8b70dc..6ccdcc8 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoResultSetMetaData.java,v 1.2.2.4 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoResultSetMetaData.java,v 1.2.2.3 2009/08/21 11:36:14 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java
index 6c521d8..73439d7 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoRow.java,v 1.1.1.1.2.5 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoRow.java,v 1.1.1.1.2.3 2009/08/21 11:36:14 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -740,20 +740,6 @@ class VirtuosoRow
return (new java.sql.Time (ts.getTime())).toString();
}
}
- else if (obj instanceof VirtuosoBlob)
- {
- try {
- Reader r = ((VirtuosoBlob)obj).getCharacterStream();
- char[] data = new char[1024];
- StringWriter w = new StringWriter();
- int l;
- while((l = r.read(data)) != -1)
- w.write(data,0,l);
- return w.toString();
- } catch (IOException e) {
- throw new VirtuosoException(e, VirtuosoException.MISCERROR);
- }
- }
return obj.toString();
}
resultSet.wasNull(true);
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoStatement.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoStatement.java
index 07472f5..dc1fd40 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoStatement.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoStatement.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoStatement.java,v 1.5.2.6 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoStatement.java,v 1.5.2.5 2010/11/22 11:27:19 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java
index 0d40f1f..aaf3694 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoString.java,v 1.1.1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoString.java,v 1.1.1.1.2.1 2009/08/20 20:13:29 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java
index 3445987..b591634 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoTypes.java,v 1.6.2.5 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoTypes.java,v 1.6.2.4 2011/03/23 12:01:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java
index 43324bc..a242a14 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoXAConnection.java,v 1.1.1.1.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoXAConnection.java,v 1.1.1.1.2.2 2009/09/17 14:26:37 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java
index a8cb12e..8515992 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoXADataSource.java,v 1.1.1.1.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoXADataSource.java,v 1.1.1.1.2.2 2009/08/21 11:36:14 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java
index 055a8a3..0bc4a50 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoXAResource.java,v 1.1.1.1.2.9 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoXAResource.java,v 1.1.1.1.2.8 2010/03/04 12:18:04 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java
index f1acded..2d86c03 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java
@@ -1,10 +1,10 @@
/*
- * $Id: VirtuosoXid.java,v 1.1.1.1.2.4 2012/03/08 12:55:32 source Exp $
+ * $Id: VirtuosoXid.java,v 1.1.1.1.2.3 2009/09/17 14:26:37 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java
index 001c3d0..f4bcebd 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java
@@ -1,10 +1,10 @@
/*
- * $Id: XAResourceManager.java,v 1.1.1.1.2.4 2012/03/08 12:55:32 source Exp $
+ * $Id: XAResourceManager.java,v 1.1.1.1.2.3 2009/11/05 19:49:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java b/libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java
index 1851366..0b5b30e 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java
@@ -1,10 +1,10 @@
/*
- * $Id: XATransaction.java,v 1.1.1.1.2.6 2012/03/08 12:55:32 source Exp $
+ * $Id: XATransaction.java,v 1.1.1.1.2.5 2010/03/26 19:48:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java b/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java
index 3b565c8..85ffcd2 100644
--- a/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java
+++ b/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java
@@ -1,10 +1,10 @@
/*
- * $Id: ExtendedString.java,v 1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: ExtendedString.java,v 1.1.2.1 2009/08/20 20:13:29 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java b/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java
index 6e2d2bc..02dda3b 100644
--- a/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java
+++ b/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java
@@ -1,10 +1,10 @@
/*
- * $Id: RdfBox.java,v 1.1.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: RdfBox.java,v 1.1.2.1 2009/08/20 20:13:29 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Makefile.am b/libsrc/Makefile.am
index 7f264ab..3f61ce4 100644
--- a/libsrc/Makefile.am
+++ b/libsrc/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/Makefile.in b/libsrc/Makefile.in
index b2970c4..ca8ebb9 100644
--- a/libsrc/Makefile.in
+++ b/libsrc/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -142,7 +142,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -191,7 +190,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -243,7 +241,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -290,6 +287,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/Thread/Dkthread.h b/libsrc/Thread/Dkthread.h
index 426a3eb..3b4c311 100644
--- a/libsrc/Thread/Dkthread.h
+++ b/libsrc/Thread/Dkthread.h
@@ -1,14 +1,14 @@
/*
* Dkthread.h
*
- * $Id: Dkthread.h,v 1.7.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: Dkthread.h,v 1.7 2008/04/02 10:13:42 source Exp $
*
* Threads, Mutexes and Semaphores
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/Makefile.am b/libsrc/Thread/Makefile.am
index f55d2f9..a08cb56 100644
--- a/libsrc/Thread/Makefile.am
+++ b/libsrc/Thread/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/Makefile.in b/libsrc/Thread/Makefile.in
index d403ee7..b94aeb8 100644
--- a/libsrc/Thread/Makefile.in
+++ b/libsrc/Thread/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -150,7 +150,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -199,7 +198,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -251,7 +249,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -298,6 +295,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/Thread/fiber1_generic.c b/libsrc/Thread/fiber1_generic.c
index 72ba4a8..ff02eae 100644
--- a/libsrc/Thread/fiber1_generic.c
+++ b/libsrc/Thread/fiber1_generic.c
@@ -1,7 +1,7 @@
/*
* fiber1_generic.c
*
- * $Id: fiber1_generic.c,v 1.2.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: fiber1_generic.c,v 1.2 2008/07/11 11:44:32 source Exp $
*
* _fiber_boot and _fiber_switch
* Implementations for simulated threads
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/fiber1_win32.c b/libsrc/Thread/fiber1_win32.c
index 319c3c9..f27b1c2 100644
--- a/libsrc/Thread/fiber1_win32.c
+++ b/libsrc/Thread/fiber1_win32.c
@@ -1,7 +1,7 @@
/*
* fiber1_win32.c
*
- * $Id: fiber1_win32.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: fiber1_win32.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Win32 Native implementation for fibers
* Use this instead of fiber[12]_generic.c
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/fiber2_generic.c b/libsrc/Thread/fiber2_generic.c
index f318a01..5c76299 100644
--- a/libsrc/Thread/fiber2_generic.c
+++ b/libsrc/Thread/fiber2_generic.c
@@ -1,7 +1,7 @@
/*
* fiber2_generic.c
*
- * $Id: fiber2_generic.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: fiber2_generic.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* _fiber_for_thread and spinlocks
* Implementation for simulated threads
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/fiber_unix.c b/libsrc/Thread/fiber_unix.c
index e6815f4..71b6e6a 100644
--- a/libsrc/Thread/fiber_unix.c
+++ b/libsrc/Thread/fiber_unix.c
@@ -1,14 +1,14 @@
/*
* fiber_unix.c
*
- * $Id: fiber_unix.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: fiber_unix.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Fiber Event Loop (Unix implementation)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/fiber_win32.c b/libsrc/Thread/fiber_win32.c
index f6dac07..59b3d0f 100644
--- a/libsrc/Thread/fiber_win32.c
+++ b/libsrc/Thread/fiber_win32.c
@@ -1,14 +1,14 @@
/*
* fiber_win32.c
*
- * $Id: fiber_win32.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: fiber_win32.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Fiber Event Loop (Win32 implementation)
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/io_unix.c b/libsrc/Thread/io_unix.c
index ff1f137..d3a5eb4 100644
--- a/libsrc/Thread/io_unix.c
+++ b/libsrc/Thread/io_unix.c
@@ -1,14 +1,14 @@
/*
* io_unix.c
*
- * $Id: io_unix.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: io_unix.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Unix specific I/O for fibers
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/mtest.c b/libsrc/Thread/mtest.c
index 3d3db21..c627d02 100644
--- a/libsrc/Thread/mtest.c
+++ b/libsrc/Thread/mtest.c
@@ -1,14 +1,14 @@
/*
* mtest.c
*
- * $Id: mtest.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: mtest.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Fiber test program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/mtest1.c b/libsrc/Thread/mtest1.c
index 760e9fa..e4f0caf 100644
--- a/libsrc/Thread/mtest1.c
+++ b/libsrc/Thread/mtest1.c
@@ -1,14 +1,14 @@
/*
* mtest1.c
*
- * $Id: mtest1.c,v 1.2.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: mtest1.c,v 1.2 2009/03/19 10:12:21 source Exp $
*
* Fiber test program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/mtest2.c b/libsrc/Thread/mtest2.c
index 48b9904..c9b4d34 100644
--- a/libsrc/Thread/mtest2.c
+++ b/libsrc/Thread/mtest2.c
@@ -1,14 +1,14 @@
/*
* mtest1.c
*
- * $Id: mtest2.c,v 1.2.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: mtest2.c,v 1.2 2009/03/19 10:12:21 source Exp $
*
* Fiber test program
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/sched_fiber.c b/libsrc/Thread/sched_fiber.c
index 0a9ef36..6cf88ef 100644
--- a/libsrc/Thread/sched_fiber.c
+++ b/libsrc/Thread/sched_fiber.c
@@ -1,14 +1,14 @@
/*
* sched_fiber.c
*
- * $Id: sched_fiber.c,v 1.3.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: sched_fiber.c,v 1.3 2008/01/18 14:03:32 source Exp $
*
* Simulated threads, using fibers
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/sched_pthread.c b/libsrc/Thread/sched_pthread.c
index 2800747..84c4260 100644
--- a/libsrc/Thread/sched_pthread.c
+++ b/libsrc/Thread/sched_pthread.c
@@ -1,14 +1,14 @@
/*
* sched_pthread.c
*
- * $Id: sched_pthread.c,v 1.8.2.6 2012/03/12 14:28:38 source Exp $
+ * $Id: sched_pthread.c,v 1.8.2.4 2011/10/13 18:34:19 source Exp $
*
* Scheduler for pthreads
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -883,11 +883,6 @@ semaphore_allocate (int entry_count)
sem->sem_entry_count = entry_count;
sem->sem_handle = (void *) ptm;
-#ifdef SEM_NO_ORDER
- sem->sem_cv = _alloc_cv ();
- if (!sem->sem_cv) goto failed;
- sem->sem_any_signalled = 0;
-#endif
thread_queue_init (&sem->sem_waiting);
return sem;
@@ -903,9 +898,6 @@ semaphore_free (semaphore_t *sem)
{
pthread_mutex_destroy ((pthread_mutex_t*) sem->sem_handle);
dk_free (sem->sem_handle, sizeof (pthread_mutex_t));
-#ifdef SEM_NO_ORDER
- dk_free (sem->sem_cv, sizeof (pthread_cond_t));
-#endif
dk_free (sem, sizeof (semaphore_t));
}
@@ -923,7 +915,6 @@ semaphore_enter (semaphore_t * sem)
sem->sem_entry_count--;
else
{
-#ifndef SEM_NO_ORDER
thread_queue_to (&sem->sem_waiting, thr);
_thread_num_wait++;
thr->thr_status = WAITSEM;
@@ -932,20 +923,6 @@ semaphore_enter (semaphore_t * sem)
rc = pthread_cond_wait ((pthread_cond_t *) thr->thr_cv, (pthread_mutex_t*) sem->sem_handle);
CKRET (rc);
} while (thr->thr_status == WAITSEM);
-#else
- thread_queue_to (&sem->sem_waiting, thr);
- _thread_num_wait++;
- thr->thr_status = WAITSEM;
- do
- {
- rc = pthread_cond_wait ((pthread_cond_t *) sem->sem_cv, (pthread_mutex_t*) sem->sem_handle);
- CKRET (rc);
- }
- while (!sem->sem_any_signalled);
- thr->thr_status = RUNNING;
- sem->sem_any_signalled = 0;
- thread_queue_remove (&sem->sem_waiting, thr);
-#endif
}
pthread_mutex_unlock ((pthread_mutex_t*) sem->sem_handle);
@@ -1011,7 +988,6 @@ semaphore_leave (semaphore_t *sem)
sem->sem_entry_count++;
else
{
-#ifndef SEM_NO_ORDER
thr = thread_queue_from (&sem->sem_waiting);
if (thr)
{
@@ -1022,16 +998,6 @@ semaphore_leave (semaphore_t *sem)
}
else
sem->sem_entry_count++;
-#else
- if (sem->sem_waiting.thq_count)
- {
- _thread_num_wait--;
- sem->sem_any_signalled = 1;
- pthread_cond_signal ((pthread_cond_t *) sem->sem_cv);
- }
- else
- sem->sem_entry_count++;
-#endif
}
rc = pthread_mutex_unlock ((pthread_mutex_t*) sem->sem_handle);
diff --git a/libsrc/Thread/sched_pthread_gc.c b/libsrc/Thread/sched_pthread_gc.c
index cea6686..b04bb52 100644
--- a/libsrc/Thread/sched_pthread_gc.c
+++ b/libsrc/Thread/sched_pthread_gc.c
@@ -1,14 +1,14 @@
/*
* sched_pthread_gc.c
*
- * $Id: sched_pthread_gc.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: sched_pthread_gc.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Scheduler for pthreads
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/sched_single.c b/libsrc/Thread/sched_single.c
index b985328..cdb8c28 100644
--- a/libsrc/Thread/sched_single.c
+++ b/libsrc/Thread/sched_single.c
@@ -1,14 +1,14 @@
/*
* sched_dummy.c
*
- * $Id: sched_single.c,v 1.6.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: sched_single.c,v 1.6 2008/07/11 11:44:32 source Exp $
*
* Stubs for NO_THREAD implementation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/sched_winthread.c b/libsrc/Thread/sched_winthread.c
index ab647ab..b22a32e 100644
--- a/libsrc/Thread/sched_winthread.c
+++ b/libsrc/Thread/sched_winthread.c
@@ -1,14 +1,14 @@
/*
* sched_winthread.c
*
- * $Id: sched_winthread.c,v 1.3.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: sched_winthread.c,v 1.3 2007/02/27 13:23:35 source Exp $
*
* Scheduler for Win32 threads
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -831,7 +831,6 @@ mutex_enter (dk_mutex_t *mtx)
EnterCriticalSection(mtx->mtx_handle);
_thread_num_wait--;
#ifdef MTX_DEBUG
- assert (mtx->mtx_owner == NULL);
mtx->mtx_owner = thr;
mtx->mtx_entry_file = file;
mtx->mtx_entry_line = line;
@@ -841,43 +840,30 @@ mutex_enter (dk_mutex_t *mtx)
int
-mutex_try_enter (dk_mutex_t *mtx)
+mutex_try_enter (dk_mutex_t *self)
{
#ifdef MTX_DEBUG
thread_t* thr = thread_current();
#endif
- if (mtx->mtx_type == MUTEX_TYPE_LONG)
- {
- if (WaitForSingleObject (mtx->mtx_handle, 0) == WAIT_TIMEOUT)
- return 0;
- }
- else
+ if (self->mtx_type == MUTEX_TYPE_LONG)
{
- if (!TryEnterCriticalSection (mtx->mtx_handle))
+ if (WaitForSingleObject (self->mtx_handle, 0) == WAIT_TIMEOUT)
return 0;
}
+ EnterCriticalSection(self->mtx_handle);
#ifdef MTX_DEBUG
- assert (mtx->mtx_owner == NULL);
- mtx->mtx_owner = thr;
- mtx->mtx_entry_file = __FILE__;
- mtx->mtx_entry_line = __LINE__;
+ self->mtx_owner = thr;
#endif
return 1;
}
-#ifdef MTX_DEBUG
-void mutex_leave_dbg (int line, char * file, dk_mutex_t *self)
-#else
-void mutex_leave (dk_mutex_t *self)
-#endif
+void
+mutex_leave (dk_mutex_t *self)
{
#ifdef MTX_DEBUG
- assert (self->mtx_owner == thread_current ());
self->mtx_owner = NULL;
- self->mtx_leave_line = line;
- self->mtx_leave_file = file;
#endif
if (self->mtx_type == MUTEX_TYPE_LONG)
ReleaseMutex (self->mtx_handle);
@@ -950,10 +936,4 @@ mutex_enter (dk_mutex_t * mtx)
{
return (mutex_enter_dbg (__LINE__, __FILE__, mtx));
}
-#undef mutex_leave
-void
-mutex_leave (dk_mutex_t * mtx)
-{
- mutex_leave_dbg (__LINE__, __FILE__, mtx);
-}
#endif
diff --git a/libsrc/Thread/sched_winthread_gc.c b/libsrc/Thread/sched_winthread_gc.c
index 81045a0..9723fe2 100644
--- a/libsrc/Thread/sched_winthread_gc.c
+++ b/libsrc/Thread/sched_winthread_gc.c
@@ -1,14 +1,14 @@
/*
* sched_pthread_gc.c
*
- * $Id: sched_winthread_gc.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: sched_winthread_gc.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Scheduler for pthreads
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/thread_attr.c b/libsrc/Thread/thread_attr.c
index 53189a3..17745cf 100644
--- a/libsrc/Thread/thread_attr.c
+++ b/libsrc/Thread/thread_attr.c
@@ -1,14 +1,14 @@
/*
* thread_attr.c
*
- * $Id: thread_attr.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: thread_attr.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Manages thread local storage attributes
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/thread_int.h b/libsrc/Thread/thread_int.h
index 9bb31c3..aa8b751 100644
--- a/libsrc/Thread/thread_int.h
+++ b/libsrc/Thread/thread_int.h
@@ -1,14 +1,14 @@
/*
* thread_int.h
*
- * $Id: thread_int.h,v 1.6.2.5 2012/03/12 14:28:38 source Exp $
+ * $Id: thread_int.h,v 1.6.2.3 2011/10/13 18:34:19 source Exp $
*
* Thread internals
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -38,13 +38,6 @@
/*#include <Wi/statuslog.h>*/
#undef _THREAD_INT_HS
-#if defined (__APPLE__)
-#include <AvailabilityMacros.h>
-
-# if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)
-# define SEM_NO_ORDER 1
-# endif
-#endif
/* Default stack size for the main thread */
#define MAIN_STACK_SIZE 800000
@@ -185,10 +178,6 @@ struct semaphore_s
/* simulated threads */
int sem_entry_count;
thread_queue_t sem_waiting;
-#ifdef SEM_NO_ORDER
- void * sem_cv; /* condition variable */
- int sem_any_signalled;
-#endif
#ifdef SEM_DEBUG
int sem_last_left_line[MAX_SEM_ENT];
char * sem_last_left_file[MAX_SEM_ENT];
diff --git a/libsrc/Thread/thread_queue.c b/libsrc/Thread/thread_queue.c
index 101c04e..eb291ed 100644
--- a/libsrc/Thread/thread_queue.c
+++ b/libsrc/Thread/thread_queue.c
@@ -1,14 +1,14 @@
/*
* threadqueue.c
*
- * $Id: thread_queue.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: thread_queue.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Thread Queues
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/thread_rwlock.c b/libsrc/Thread/thread_rwlock.c
index 175bf98..896e9ac 100644
--- a/libsrc/Thread/thread_rwlock.c
+++ b/libsrc/Thread/thread_rwlock.c
@@ -1,14 +1,14 @@
/*
* thread_rwlock.c
*
- * $Id: thread_rwlock.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: thread_rwlock.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Read-write locks implementation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/timer_queue.c b/libsrc/Thread/timer_queue.c
index 49e907d..5fc579a 100644
--- a/libsrc/Thread/timer_queue.c
+++ b/libsrc/Thread/timer_queue.c
@@ -1,14 +1,14 @@
/*
* timer_queue.c
*
- * $Id: timer_queue.c,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: timer_queue.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Timers and Timer Queues
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/timer_queue.h b/libsrc/Thread/timer_queue.h
index f2874be..d004996 100644
--- a/libsrc/Thread/timer_queue.h
+++ b/libsrc/Thread/timer_queue.h
@@ -1,14 +1,14 @@
/*
* timer_queue.h
*
- * $Id: timer_queue.h,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: timer_queue.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Timers and Timer Queues
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Thread/tvmac.h b/libsrc/Thread/tvmac.h
index 2398a43..3419a8b 100644
--- a/libsrc/Thread/tvmac.h
+++ b/libsrc/Thread/tvmac.h
@@ -1,14 +1,14 @@
/*
* tvmac.c
*
- * $Id: tvmac.h,v 1.1.1.1.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: tvmac.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Macros for time structure manipulation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Tidy/Makefile.am b/libsrc/Tidy/Makefile.am
index dee84a5..eb956b4 100644
--- a/libsrc/Tidy/Makefile.am
+++ b/libsrc/Tidy/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
diff --git a/libsrc/Tidy/Makefile.in b/libsrc/Tidy/Makefile.in
index a062888..c2ade91 100644
--- a/libsrc/Tidy/Makefile.in
+++ b/libsrc/Tidy/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2010 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
@@ -129,7 +129,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -178,7 +177,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -230,7 +228,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -277,6 +274,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/Wi/2pc.c b/libsrc/Wi/2pc.c
index ff38be4..9967381 100644
--- a/libsrc/Wi/2pc.c
+++ b/libsrc/Wi/2pc.c
@@ -1,12 +1,12 @@
/*
* 2pc.c
*
- * $Id: 2pc.c,v 1.15.2.18 2012/03/08 12:55:32 source Exp $
+ * $Id: 2pc.c,v 1.15.2.17 2010/10/05 09:39:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/2pc.h b/libsrc/Wi/2pc.h
index 0e2528e..4a07adf 100644
--- a/libsrc/Wi/2pc.h
+++ b/libsrc/Wi/2pc.h
@@ -1,12 +1,12 @@
/*
* 2pc.h
*
- * $Id: 2pc.h,v 1.5.2.5 2012/03/08 12:55:32 source Exp $
+ * $Id: 2pc.h,v 1.5.2.4 2010/03/04 16:39:40 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/2pc.sql b/libsrc/Wi/2pc.sql
index f1eaac0..53354f2 100644
--- a/libsrc/Wi/2pc.sql
+++ b/libsrc/Wi/2pc.sql
@@ -1,10 +1,10 @@
--
--- $Id: 2pc.sql,v 1.3.2.3 2012/03/08 12:55:32 source Exp $
+-- $Id: 2pc.sql,v 1.3.2.2 2009/07/21 19:24:57 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/2pc_client.c b/libsrc/Wi/2pc_client.c
index d5dd552..0a8a5ab 100644
--- a/libsrc/Wi/2pc_client.c
+++ b/libsrc/Wi/2pc_client.c
@@ -1,12 +1,12 @@
/*
* 2pc_client.c
*
- * $Id: 2pc_client.c,v 1.3.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: 2pc_client.c,v 1.3.2.1 2009/04/18 21:55:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/2pc_client.h b/libsrc/Wi/2pc_client.h
index 1e9c158..00ef622 100644
--- a/libsrc/Wi/2pc_client.h
+++ b/libsrc/Wi/2pc_client.h
@@ -1,12 +1,12 @@
/*
* 2pc_client.h
*
- * $Id: 2pc_client.h,v 1.3.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: 2pc_client.h,v 1.3.2.1 2009/04/18 21:55:09 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/CLI.h b/libsrc/Wi/CLI.h
index 17b0e5f..7adb70a 100644
--- a/libsrc/Wi/CLI.h
+++ b/libsrc/Wi/CLI.h
@@ -1,14 +1,14 @@
/*
* CLI.h
*
- * $Id: CLI.h,v 1.17.2.5 2012/03/08 12:55:32 source Exp $
+ * $Id: CLI.h,v 1.17.2.4 2011/07/14 19:14:14 source Exp $
*
* SQL client data structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/CLIcr.c b/libsrc/Wi/CLIcr.c
index 2e22451..11834fb 100644
--- a/libsrc/Wi/CLIcr.c
+++ b/libsrc/Wi/CLIcr.c
@@ -1,14 +1,14 @@
/*
* CLIcr.c
*
- * $Id: CLIcr.c,v 1.8.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: CLIcr.c,v 1.8 2006/07/17 13:28:25 source Exp $
*
* Client API, ODBC Extensions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/CLIodbc3.c b/libsrc/Wi/CLIodbc3.c
index 24461ab..0376f9b 100644
--- a/libsrc/Wi/CLIodbc3.c
+++ b/libsrc/Wi/CLIodbc3.c
@@ -1,12 +1,12 @@
/*
* CLIodbc3.c
*
- * $Id: CLIodbc3.c,v 1.26.2.5 2012/03/08 12:55:32 source Exp $
+ * $Id: CLIodbc3.c,v 1.26.2.4 2011/03/04 14:46:59 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/CLIsql1.c b/libsrc/Wi/CLIsql1.c
index 4ec2d9b..3e1d77f 100644
--- a/libsrc/Wi/CLIsql1.c
+++ b/libsrc/Wi/CLIsql1.c
@@ -1,14 +1,14 @@
/*
* CLIsql1.c
*
- * $Id: CLIsql1.c,v 1.22.2.11 2012/03/08 12:55:32 source Exp $
+ * $Id: CLIsql1.c,v 1.22.2.10 2011/06/06 08:02:03 source Exp $
*
* Client API
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/CLIsql2.c b/libsrc/Wi/CLIsql2.c
index 9c32b4c..a78ba0f 100644
--- a/libsrc/Wi/CLIsql2.c
+++ b/libsrc/Wi/CLIsql2.c
@@ -1,14 +1,14 @@
/*
* CLIsql2.c
*
- * $Id: CLIsql2.c,v 1.21.2.6 2012/03/08 12:55:32 source Exp $
+ * $Id: CLIsql2.c,v 1.21.2.5 2011/03/02 12:24:08 source Exp $
*
* Client API, ODBC Extensions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/CLIsql3.c b/libsrc/Wi/CLIsql3.c
index 4104808..c29a15b 100644
--- a/libsrc/Wi/CLIsql3.c
+++ b/libsrc/Wi/CLIsql3.c
@@ -1,14 +1,14 @@
/*
* CLIsql3.c
*
- * $Id: CLIsql3.c,v 1.14.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: CLIsql3.c,v 1.14.2.2 2010/07/06 14:24:06 source Exp $
*
* ODBC API - SQLDriverConnect & SQLConnect
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2008 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
diff --git a/libsrc/Wi/CLIsql3W.c b/libsrc/Wi/CLIsql3W.c
index 063d233..00f36dc 100644
--- a/libsrc/Wi/CLIsql3W.c
+++ b/libsrc/Wi/CLIsql3W.c
@@ -1,14 +1,14 @@
/*
* CLIsql3.c
*
- * $Id: CLIsql3W.c,v 1.2.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: CLIsql3W.c,v 1.2 2006/06/22 21:05:22 source Exp $
*
* ODBC API - SQLDriverConnect & SQLConnect
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/CLIuti.c b/libsrc/Wi/CLIuti.c
index 55acdc6..0e02a1f 100644
--- a/libsrc/Wi/CLIuti.c
+++ b/libsrc/Wi/CLIuti.c
@@ -1,14 +1,14 @@
/*
* CLIuti.c
*
- * $Id: CLIuti.c,v 1.35.2.7 2012/03/14 19:47:17 source Exp $
+ * $Id: CLIuti.c,v 1.35.2.5 2010/12/20 18:09:05 source Exp $
*
* Auxiliary functions for the ODBC driver
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -205,7 +205,7 @@ dv_to_sql_type (dtp_t dv, int cli_binary_timestamp)
return SQL_WVARCHAR;
case DV_ANY:
- return SQL_LONGVARCHAR;
+ return SQL_VARCHAR;
case DV_INT64:
return SQL_INTEGER;
diff --git a/libsrc/Wi/CLIw.c b/libsrc/Wi/CLIw.c
index 844cb42..872d1fe 100644
--- a/libsrc/Wi/CLIw.c
+++ b/libsrc/Wi/CLIw.c
@@ -1,12 +1,12 @@
/*
* CLIw.c
*
- * $Id: CLIw.c,v 1.10.2.1 2012/03/08 12:55:32 source Exp $
+ * $Id: CLIw.c,v 1.10 2009/04/10 11:33:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/Makefile.am b/libsrc/Wi/Makefile.am
index 117fdde..be65816 100644
--- a/libsrc/Wi/Makefile.am
+++ b/libsrc/Wi/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -61,8 +61,7 @@ noinst_HEADERS = \
wiservic.h wi_xid.h xmlenc_algos.h xmlenc.h xmlenc_test.h xmlgen.h \
xml.h xmlnode.h xmlres.h xmltree.h xpath.h xpathp.h xpathp_impl.h \
xpf.h xqf.h xslt_impl.h aqueue.h rdf_mapping_jso.h bitmap.h jso.h \
- json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h \
- sparqlwords.h
+ json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h
generated_code = \
@@ -80,7 +79,6 @@ generated_code = \
sparql_l.c \
sparql_p.c \
sparql_p.h \
- sparqlwords.h \
sql3.c \
sql_code.c \
sql_code_1.c \
@@ -95,7 +93,6 @@ generated_code = \
sql_code_pldbg.c \
sql_code_repl.c \
sql_code_sparql.c \
- sql_code_sparql_init.c \
sql_code_sys.c \
sql_code_uddi.c \
sql_code_vad.c \
@@ -135,7 +132,6 @@ C_FILES_SPARQL = \
sparql_rdb2rdf.c \
sparul2sql.c \
sql_code_sparql.c \
- sql_code_sparql_init.c \
turtle_l.c \
turtle_p.c
@@ -212,7 +208,6 @@ libwi_la_SOURCES = \
sql_code_pldbg.c \
sql_code_repl.c \
sql_code_sparql.c \
- sql_code_sparql_init.c \
sql_code_sys.c \
sql_code_uddi.c \
sql_code_vad.c \
@@ -331,7 +326,6 @@ libwi_odbc_la_SOURCES = \
sql_code_pldbg.c \
sql_code_repl.c \
sql_code_sparql.c \
- sql_code_sparql_init.c \
sql_code_sys.c \
sql_code_uddi.c \
sql_code_vad.c \
@@ -538,6 +532,7 @@ SQL_FILES = \
$(srcdir)/system.sql \
$(srcdir)/system2.sql \
$(srcdir)/odbccat.sql \
+ $(srcdir)/useraggr.sql \
$(srcdir)/vt_text.sql \
$(srcdir)/phrasematch.sql \
$(srcdir)/hosting.sql
@@ -616,10 +611,6 @@ SQL_FILES_REPL = \
$(srcdir)/snapshot_repl.sql \
$(srcdir)/repl.sql
-SQL_FILES_SPARQL_INIT = \
- $(srcdir)/useraggr.sql \
- $(srcdir)/sparql_init.sql
-
SQL_FILES_SPARQL = \
$(srcdir)/sparql.sql \
$(srcdir)/sparql_io.sql \
@@ -691,20 +682,20 @@ json_l.c: $(srcdir)/json.l json_p.h Makefile.am
@$(GEN) $(LEX) -o json_l.c -Pjsonyy $(srcdir)/json.l
-sqlwords.h: $(srcdir)/sqlwords.gperf Makefile.am
+sqlwords.h: $(srcdir)/sqlwords.gperf
@${GEN} --stdout ${GPERF} \
-o sqlwords.h \
-aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$$ \
-Nlex_hash_kw \
$(srcdir)/sqlwords.gperf
-sql3.c sql3.h: sql3.y Makefile.am
+sql3.c sql3.h: sql3.y
@$(GEN) $(YACC) -o sql3.c -vd $(srcdir)/sql3.y
-scn3.c: scn3.l sql3.c sqlwords.h Makefile.am
+scn3.c: scn3.l sql3.c sqlwords.h
@$(GEN) $(LEX) -o scn3.c $(srcdir)/scn3.l
-scn3split.c: scn3.l sql3.c sqlwords.h Makefile.am
+scn3split.c: scn3.l sql3.c sqlwords.h
@$(GEN) $(LEX) -o scn3split.c -Pscn3splityy $(srcdir)/scn3.l
$(top_srcdir)/binsrc/cached_resources/cached_resources.c:
@@ -716,48 +707,38 @@ sql_code_cache.c: $(top_srcdir)/binsrc/cached_resources/cached_resources.c sql_c
@echo "#include \"sql_code_cache_impl.c\"" >> $@
@echo "#include \"$(top_srcdir)/binsrc/cached_resources/cached_resources.c\"" >> $@
-xpathp.c xpathp.h : xpathp.y Makefile.am
+xpathp.c xpathp.h : xpathp.y
@$(GEN) $(YACC) -o xpathp.c -vd -pxpyy $(srcdir)/xpathp.y
-xpathp_lex_props.c: list_lex_props.sh xpathp.y Makefile.am
+xpathp_lex_props.c: list_lex_props.sh xpathp.y
list_lex_props.sh xpathp.y xpathp_lex_props.c
-xpscn.c: xpscn.l xpathp.h Makefile.am
+xpscn.c: xpscn.l xpathp.h
@$(GEN) $(LEX) -o xpscn.c -Pxpyy $(srcdir)/xpscn.l
-sparqlwords.h: sparqlwords.gperf Makefile.am
- @$(GEN) --stdout $(GPERF) -o $@ \
- -aCDGptr \
- -Kkwd \
- -L ANSI-C \
- -k1,2,3,5,7,$$ \
- --ignore-case \
- -Nsparql_lex_hash_kw \
- sparqlwords.gperf
-
-sparql_p.c sparql_p.h: sparql_p.y Makefile.am
+sparql_p.c sparql_p.h: sparql_p.y
@$(GEN) $(YACC) -o sparql_p.c -vd -psparyy $(srcdir)/sparql_p.y
-sparql_lex_props.c: list_lex_props.sh sparql_p.y Makefile.am
+sparql_lex_props.c: list_lex_props.sh sparql_p.y
list_lex_props.sh sparql_p.y sparql_lex_props.c
-sparql_l.c: sparql_l.l sparql_p.h Makefile.am
+sparql_l.c: sparql_l.l sparql_p.h
@$(GEN) $(LEX) -o sparql_l.c -Psparyy $(srcdir)/sparql_l.l
-nquad_p.c nquad_p.h: nquad_p.y Makefile.am
+nquad_p.c nquad_p.h: nquad_p.y
@$(GEN) $(YACC) -o nquad_p.c -vd -pnqyy $(srcdir)/nquad_p.y
-turtle_p.c turtle_p.h: turtle_p.y Makefile.am
+turtle_p.c turtle_p.h: turtle_p.y
@$(GEN) $(YACC) -o turtle_p.c -vd -pttlyy $(srcdir)/turtle_p.y
-turtle_lex_props.c: list_lex_props.sh turtle_p.y Makefile.am
+turtle_lex_props.c: list_lex_props.sh turtle_p.y
list_lex_props.sh turtle_p.y turtle_lex_props.c
-turtle_l.c: turtle_l.l turtle_p.h Makefile.am
+turtle_l.c: turtle_l.l turtle_p.h
@$(GEN) $(LEX) -o turtle_l.c -Pttlyy $(srcdir)/turtle_l.l
-AWK_FILES = $(srcdir)/sql_to_c.awk Makefile.am
+AWK_FILES = $(srcdir)/sql_to_c.awk
sql_code.c: $(SQL_FILES) $(AWK_FILES) Makefile.am
@${GEN} ${GAWK} \
@@ -846,7 +827,7 @@ sql_code_2pc.c: $(SQL_FILES_2PC) $(AWK_FILES) Makefile.am
-v pl_stats=$(PLSTATS) \
$(SQL_FILES_2PC)
-#sql_code_blog.c: $(SQL_FILES_BLOG) $(AWK_FILES) Makefile.am
+#sql_code_blog.c: $(SQL_FILES_BLOG) $(AWK_FILES)
# @${GEN} ${GAWK} -o sql_code_2pc.c -f $(srcdir)/sql_to_c.awk \
# -v init_name=_blog -v pl_stats=$(PLSTATS) $(SQL_FILES_BLOG)
@@ -858,14 +839,6 @@ sql_code_vdb.c: $(SQL_FILES_VDB) $(AWK_FILES) Makefile.am
-v pl_stats=$(PLSTATS) \
$(SQL_FILES_VDB)
-sql_code_sparql_init.c: $(SQL_FILES_SPARQL_INIT) $(AWK_FILES) Makefile.am
- @${GEN} ${GAWK} \
- -o sql_code_sparql_init.c \
- -f $(srcdir)/sql_to_c.awk \
- -v init_name=_sparql_init \
- -v pl_stats=$(PLSTATS) \
- $(SQL_FILES_SPARQL_INIT)
-
sql_code_sparql.c: $(SQL_FILES_SPARQL) $(AWK_FILES) Makefile.am
@${GEN} ${GAWK} \
-o sql_code_sparql.c \
@@ -956,7 +929,6 @@ generated: \
sparql_l.c \
sparql_p.c \
sparql_p.h \
- sparqlwords.h \
sql3.c \
sql_code.c \
sql_code_1.c \
@@ -1017,6 +989,5 @@ EXTRA_DIST = \
sql_code_cache_impl.c \
sql_to_c.awk \
sqlwords.gperf \
- sparqlwords.gperf \
ssl.c \
string_tmpl.c
diff --git a/libsrc/Wi/Makefile.in b/libsrc/Wi/Makefile.in
index 8183c2c..4b42f2d 100644
--- a/libsrc/Wi/Makefile.in
+++ b/libsrc/Wi/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -88,16 +88,16 @@ am__libwi_la_SOURCES_DIST = aqueue.c arith.c auxfiles.c bif_audio.c \
sql_code_1.c sql_code_2pc.c sql_code_adm.c sql_code_auto.c \
sql_code_blog.c sql_code_cache.c sql_code_dav.c sql_code_dbp.c \
sql_code_ddk.c sql_code_imsg.c sql_code_pldbg.c \
- sql_code_repl.c sql_code_sparql.c sql_code_sparql_init.c \
- sql_code_sys.c sql_code_uddi.c sql_code_vad.c sql_code_vdb.c \
- sql_code_ws.c sqlcomp2.c sqlcomp.c sqlcost.c sqlcr.c sqldf.c \
- sqlexp.c sqlgen.c sqlhash.c sqlintrp.c sqlinx.c sqloby.c \
- sqlo.c sqlocr.c sqloinv.c sqloinx.c sqloprt.c sqlorder.c \
- sqlovdb.c sqlpfn.c sqlprocc.c sqlprt.c sqlrun.c sqlsrv.c \
- sqlstmts.c sqltrig.c sqltype.c sqlver.c sqlview.c srvcr.c \
- srvmultibyte.c srvstat.c string.c trans.c update.c uuencode.c \
- wirpc.c wiservic.c xpathp.c xpscn.c jso.c rdfbox.c rdf_core.c \
- rdfinf.c rdf_mapping_jso.c rdfxml_parser.c nquad_p.c nquad_p.h \
+ sql_code_repl.c sql_code_sparql.c sql_code_sys.c \
+ sql_code_uddi.c sql_code_vad.c sql_code_vdb.c sql_code_ws.c \
+ sqlcomp2.c sqlcomp.c sqlcost.c sqlcr.c sqldf.c sqlexp.c \
+ sqlgen.c sqlhash.c sqlintrp.c sqlinx.c sqloby.c sqlo.c \
+ sqlocr.c sqloinv.c sqloinx.c sqloprt.c sqlorder.c sqlovdb.c \
+ sqlpfn.c sqlprocc.c sqlprt.c sqlrun.c sqlsrv.c sqlstmts.c \
+ sqltrig.c sqltype.c sqlver.c sqlview.c srvcr.c srvmultibyte.c \
+ srvstat.c string.c trans.c update.c uuencode.c wirpc.c \
+ wiservic.c xpathp.c xpscn.c jso.c rdfbox.c rdf_core.c rdfinf.c \
+ rdf_mapping_jso.c rdfxml_parser.c nquad_p.c nquad_p.h \
sparql2sql.c sparql2sqltext.c sparqld.c sparql_core.c \
sparql_l.c sparql_p.c sparql_qm.c sparql_sff.c sparql_tree.c \
sparql_rdb2rdf.c sparul2sql.c turtle_l.c turtle_p.c pldebug.c \
@@ -118,8 +118,8 @@ am__objects_1 = libwi_la-jso.lo libwi_la-rdfbox.lo \
libwi_la-sparql_p.lo libwi_la-sparql_qm.lo \
libwi_la-sparql_sff.lo libwi_la-sparql_tree.lo \
libwi_la-sparql_rdb2rdf.lo libwi_la-sparul2sql.lo \
- libwi_la-sql_code_sparql.lo libwi_la-sql_code_sparql_init.lo \
- libwi_la-turtle_l.lo libwi_la-turtle_p.lo
+ libwi_la-sql_code_sparql.lo libwi_la-turtle_l.lo \
+ libwi_la-turtle_p.lo
@WITH_PLDEBUG_TRUE at am__objects_2 = libwi_la-pldebug.lo
@WITH_LDAP_TRUE at am__objects_3 = libwi_la-bif_ldapcli.lo
@WITH_KERBEROS_TRUE at am__objects_4 = libwi_la-bif_kerberoscli.lo
@@ -153,38 +153,38 @@ am_libwi_la_OBJECTS = libwi_la-aqueue.lo libwi_la-arith.lo \
libwi_la-sql_code_dbp.lo libwi_la-sql_code_ddk.lo \
libwi_la-sql_code_imsg.lo libwi_la-sql_code_pldbg.lo \
libwi_la-sql_code_repl.lo libwi_la-sql_code_sparql.lo \
- libwi_la-sql_code_sparql_init.lo libwi_la-sql_code_sys.lo \
- libwi_la-sql_code_uddi.lo libwi_la-sql_code_vad.lo \
- libwi_la-sql_code_vdb.lo libwi_la-sql_code_ws.lo \
- libwi_la-sqlcomp2.lo libwi_la-sqlcomp.lo libwi_la-sqlcost.lo \
- libwi_la-sqlcr.lo libwi_la-sqldf.lo libwi_la-sqlexp.lo \
- libwi_la-sqlgen.lo libwi_la-sqlhash.lo libwi_la-sqlintrp.lo \
- libwi_la-sqlinx.lo libwi_la-sqloby.lo libwi_la-sqlo.lo \
- libwi_la-sqlocr.lo libwi_la-sqloinv.lo libwi_la-sqloinx.lo \
- libwi_la-sqloprt.lo libwi_la-sqlorder.lo libwi_la-sqlovdb.lo \
- libwi_la-sqlpfn.lo libwi_la-sqlprocc.lo libwi_la-sqlprt.lo \
- libwi_la-sqlrun.lo libwi_la-sqlsrv.lo libwi_la-sqlstmts.lo \
- libwi_la-sqltrig.lo libwi_la-sqltype.lo libwi_la-sqlver.lo \
- libwi_la-sqlview.lo libwi_la-srvcr.lo libwi_la-srvmultibyte.lo \
- libwi_la-srvstat.lo libwi_la-string.lo libwi_la-trans.lo \
- libwi_la-update.lo libwi_la-uuencode.lo libwi_la-wirpc.lo \
- libwi_la-wiservic.lo libwi_la-xpathp.lo libwi_la-xpscn.lo \
- $(am__objects_1) $(am__objects_2) libwi_la-bif_date.lo \
- libwi_la-bif_dav.lo libwi_la-bif_explain.lo \
- libwi_la-bif_file.lo libwi_la-bif_phrasematch.lo \
- libwi_la-bif_smtp.lo libwi_la-bif_soap.lo libwi_la-bif_text.lo \
- libwi_la-bif_tidy.lo libwi_la-http_client.lo \
- libwi_la-shuric.lo libwi_la-subseq.lo libwi_la-text.lo \
- libwi_la-uname_const_decl.lo libwi_la-xmlenc_algos.lo \
- libwi_la-xmlenc.lo libwi_la-xmlenc-dec.lo \
- libwi_la-xmlschema.lo libwi_la-xmlsearch.lo libwi_la-xmlsql.lo \
- libwi_la-xmllazy.lo libwi_la-xmltree.lo libwi_la-xpath.lo \
- libwi_la-xpf.lo libwi_la-xqf.lo libwi_la-xslt.lo \
- libwi_la-xslt_fmt.lo libwi_la-xslt_opt.lo $(am__objects_3) \
- $(am__objects_4) $(am__objects_5) libwi_la-bif_xper.lo \
- libwi_la-2pc.lo libwi_la-bif_repl.lo libwi_la-bif_xml.lo \
- libwi_la-odbccat.lo libwi_la-sqlrbuf.lo libwi_la-sqlrcomp.lo \
- libwi_la-sqlrrun.lo libwi_la-wi_xid.lo
+ libwi_la-sql_code_sys.lo libwi_la-sql_code_uddi.lo \
+ libwi_la-sql_code_vad.lo libwi_la-sql_code_vdb.lo \
+ libwi_la-sql_code_ws.lo libwi_la-sqlcomp2.lo \
+ libwi_la-sqlcomp.lo libwi_la-sqlcost.lo libwi_la-sqlcr.lo \
+ libwi_la-sqldf.lo libwi_la-sqlexp.lo libwi_la-sqlgen.lo \
+ libwi_la-sqlhash.lo libwi_la-sqlintrp.lo libwi_la-sqlinx.lo \
+ libwi_la-sqloby.lo libwi_la-sqlo.lo libwi_la-sqlocr.lo \
+ libwi_la-sqloinv.lo libwi_la-sqloinx.lo libwi_la-sqloprt.lo \
+ libwi_la-sqlorder.lo libwi_la-sqlovdb.lo libwi_la-sqlpfn.lo \
+ libwi_la-sqlprocc.lo libwi_la-sqlprt.lo libwi_la-sqlrun.lo \
+ libwi_la-sqlsrv.lo libwi_la-sqlstmts.lo libwi_la-sqltrig.lo \
+ libwi_la-sqltype.lo libwi_la-sqlver.lo libwi_la-sqlview.lo \
+ libwi_la-srvcr.lo libwi_la-srvmultibyte.lo libwi_la-srvstat.lo \
+ libwi_la-string.lo libwi_la-trans.lo libwi_la-update.lo \
+ libwi_la-uuencode.lo libwi_la-wirpc.lo libwi_la-wiservic.lo \
+ libwi_la-xpathp.lo libwi_la-xpscn.lo $(am__objects_1) \
+ $(am__objects_2) libwi_la-bif_date.lo libwi_la-bif_dav.lo \
+ libwi_la-bif_explain.lo libwi_la-bif_file.lo \
+ libwi_la-bif_phrasematch.lo libwi_la-bif_smtp.lo \
+ libwi_la-bif_soap.lo libwi_la-bif_text.lo libwi_la-bif_tidy.lo \
+ libwi_la-http_client.lo libwi_la-shuric.lo libwi_la-subseq.lo \
+ libwi_la-text.lo libwi_la-uname_const_decl.lo \
+ libwi_la-xmlenc_algos.lo libwi_la-xmlenc.lo \
+ libwi_la-xmlenc-dec.lo libwi_la-xmlschema.lo \
+ libwi_la-xmlsearch.lo libwi_la-xmlsql.lo libwi_la-xmllazy.lo \
+ libwi_la-xmltree.lo libwi_la-xpath.lo libwi_la-xpf.lo \
+ libwi_la-xqf.lo libwi_la-xslt.lo libwi_la-xslt_fmt.lo \
+ libwi_la-xslt_opt.lo $(am__objects_3) $(am__objects_4) \
+ $(am__objects_5) libwi_la-bif_xper.lo libwi_la-2pc.lo \
+ libwi_la-bif_repl.lo libwi_la-bif_xml.lo libwi_la-odbccat.lo \
+ libwi_la-sqlrbuf.lo libwi_la-sqlrcomp.lo libwi_la-sqlrrun.lo \
+ libwi_la-wi_xid.lo
libwi_la_OBJECTS = $(am_libwi_la_OBJECTS)
libwi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(libwi_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -204,15 +204,15 @@ am__libwi_odbc_la_SOURCES_DIST = aqueue.c arith.c auxfiles.c \
sql_code_adm.c sql_code_auto.c sql_code_blog.c \
sql_code_cache.c sql_code_dav.c sql_code_dbp.c sql_code_ddk.c \
sql_code_imsg.c sql_code_pldbg.c sql_code_repl.c \
- sql_code_sparql.c sql_code_sparql_init.c sql_code_sys.c \
- sql_code_uddi.c sql_code_vad.c sql_code_vdb.c sql_code_ws.c \
- sqlcomp2.c sqlcomp.c sqlcost.c sqlcr.c sqldf.c sqlexp.c \
- sqlgen.c sqlhash.c sqlintrp.c sqlinx.c sqloby.c sqlo.c \
- sqlocr.c sqloinv.c sqloinx.c sqloprt.c sqlorder.c sqlovdb.c \
- sqlpfn.c sqlprocc.c sqlprt.c sqlrun.c sqlsrv.c sqlstmts.c \
- sqltrig.c sqltype.c sqlver.c sqlview.c srvcr.c srvmultibyte.c \
- srvstat.c string.c trans.c update.c uuencode.c wirpc.c \
- wiservic.c xpathp.c xpscn.c jso.c rdfbox.c rdf_core.c rdfinf.c \
+ sql_code_sparql.c sql_code_sys.c sql_code_uddi.c \
+ sql_code_vad.c sql_code_vdb.c sql_code_ws.c sqlcomp2.c \
+ sqlcomp.c sqlcost.c sqlcr.c sqldf.c sqlexp.c sqlgen.c \
+ sqlhash.c sqlintrp.c sqlinx.c sqloby.c sqlo.c sqlocr.c \
+ sqloinv.c sqloinx.c sqloprt.c sqlorder.c sqlovdb.c sqlpfn.c \
+ sqlprocc.c sqlprt.c sqlrun.c sqlsrv.c sqlstmts.c sqltrig.c \
+ sqltype.c sqlver.c sqlview.c srvcr.c srvmultibyte.c srvstat.c \
+ string.c trans.c update.c uuencode.c wirpc.c wiservic.c \
+ xpathp.c xpscn.c jso.c rdfbox.c rdf_core.c rdfinf.c \
rdf_mapping_jso.c rdfxml_parser.c nquad_p.c nquad_p.h \
sparql2sql.c sparql2sqltext.c sparqld.c sparql_core.c \
sparql_l.c sparql_p.c sparql_qm.c sparql_sff.c sparql_tree.c \
@@ -235,7 +235,6 @@ am__objects_6 = libwi_odbc_la-jso.lo libwi_odbc_la-rdfbox.lo \
libwi_odbc_la-sparql_qm.lo libwi_odbc_la-sparql_sff.lo \
libwi_odbc_la-sparql_tree.lo libwi_odbc_la-sparql_rdb2rdf.lo \
libwi_odbc_la-sparul2sql.lo libwi_odbc_la-sql_code_sparql.lo \
- libwi_odbc_la-sql_code_sparql_init.lo \
libwi_odbc_la-turtle_l.lo libwi_odbc_la-turtle_p.lo
@WITH_PLDEBUG_TRUE at am__objects_7 = libwi_odbc_la-pldebug.lo
@WITH_LDAP_TRUE at am__objects_8 = libwi_odbc_la-bif_ldapcli.lo
@@ -279,38 +278,36 @@ am_libwi_odbc_la_OBJECTS = libwi_odbc_la-aqueue.lo \
libwi_odbc_la-sql_code_dav.lo libwi_odbc_la-sql_code_dbp.lo \
libwi_odbc_la-sql_code_ddk.lo libwi_odbc_la-sql_code_imsg.lo \
libwi_odbc_la-sql_code_pldbg.lo libwi_odbc_la-sql_code_repl.lo \
- libwi_odbc_la-sql_code_sparql.lo \
- libwi_odbc_la-sql_code_sparql_init.lo \
- libwi_odbc_la-sql_code_sys.lo libwi_odbc_la-sql_code_uddi.lo \
- libwi_odbc_la-sql_code_vad.lo libwi_odbc_la-sql_code_vdb.lo \
- libwi_odbc_la-sql_code_ws.lo libwi_odbc_la-sqlcomp2.lo \
- libwi_odbc_la-sqlcomp.lo libwi_odbc_la-sqlcost.lo \
- libwi_odbc_la-sqlcr.lo libwi_odbc_la-sqldf.lo \
- libwi_odbc_la-sqlexp.lo libwi_odbc_la-sqlgen.lo \
- libwi_odbc_la-sqlhash.lo libwi_odbc_la-sqlintrp.lo \
- libwi_odbc_la-sqlinx.lo libwi_odbc_la-sqloby.lo \
- libwi_odbc_la-sqlo.lo libwi_odbc_la-sqlocr.lo \
- libwi_odbc_la-sqloinv.lo libwi_odbc_la-sqloinx.lo \
- libwi_odbc_la-sqloprt.lo libwi_odbc_la-sqlorder.lo \
- libwi_odbc_la-sqlovdb.lo libwi_odbc_la-sqlpfn.lo \
- libwi_odbc_la-sqlprocc.lo libwi_odbc_la-sqlprt.lo \
- libwi_odbc_la-sqlrun.lo libwi_odbc_la-sqlsrv.lo \
- libwi_odbc_la-sqlstmts.lo libwi_odbc_la-sqltrig.lo \
- libwi_odbc_la-sqltype.lo libwi_odbc_la-sqlver.lo \
- libwi_odbc_la-sqlview.lo libwi_odbc_la-srvcr.lo \
- libwi_odbc_la-srvmultibyte.lo libwi_odbc_la-srvstat.lo \
- libwi_odbc_la-string.lo libwi_odbc_la-trans.lo \
- libwi_odbc_la-update.lo libwi_odbc_la-uuencode.lo \
- libwi_odbc_la-wirpc.lo libwi_odbc_la-wiservic.lo \
- libwi_odbc_la-xpathp.lo libwi_odbc_la-xpscn.lo \
- $(am__objects_6) $(am__objects_7) libwi_odbc_la-bif_date.lo \
- libwi_odbc_la-bif_dav.lo libwi_odbc_la-bif_explain.lo \
- libwi_odbc_la-bif_file.lo libwi_odbc_la-bif_phrasematch.lo \
- libwi_odbc_la-bif_smtp.lo libwi_odbc_la-bif_soap.lo \
- libwi_odbc_la-bif_text.lo libwi_odbc_la-bif_tidy.lo \
- libwi_odbc_la-http_client.lo libwi_odbc_la-shuric.lo \
- libwi_odbc_la-subseq.lo libwi_odbc_la-text.lo \
- libwi_odbc_la-uname_const_decl.lo \
+ libwi_odbc_la-sql_code_sparql.lo libwi_odbc_la-sql_code_sys.lo \
+ libwi_odbc_la-sql_code_uddi.lo libwi_odbc_la-sql_code_vad.lo \
+ libwi_odbc_la-sql_code_vdb.lo libwi_odbc_la-sql_code_ws.lo \
+ libwi_odbc_la-sqlcomp2.lo libwi_odbc_la-sqlcomp.lo \
+ libwi_odbc_la-sqlcost.lo libwi_odbc_la-sqlcr.lo \
+ libwi_odbc_la-sqldf.lo libwi_odbc_la-sqlexp.lo \
+ libwi_odbc_la-sqlgen.lo libwi_odbc_la-sqlhash.lo \
+ libwi_odbc_la-sqlintrp.lo libwi_odbc_la-sqlinx.lo \
+ libwi_odbc_la-sqloby.lo libwi_odbc_la-sqlo.lo \
+ libwi_odbc_la-sqlocr.lo libwi_odbc_la-sqloinv.lo \
+ libwi_odbc_la-sqloinx.lo libwi_odbc_la-sqloprt.lo \
+ libwi_odbc_la-sqlorder.lo libwi_odbc_la-sqlovdb.lo \
+ libwi_odbc_la-sqlpfn.lo libwi_odbc_la-sqlprocc.lo \
+ libwi_odbc_la-sqlprt.lo libwi_odbc_la-sqlrun.lo \
+ libwi_odbc_la-sqlsrv.lo libwi_odbc_la-sqlstmts.lo \
+ libwi_odbc_la-sqltrig.lo libwi_odbc_la-sqltype.lo \
+ libwi_odbc_la-sqlver.lo libwi_odbc_la-sqlview.lo \
+ libwi_odbc_la-srvcr.lo libwi_odbc_la-srvmultibyte.lo \
+ libwi_odbc_la-srvstat.lo libwi_odbc_la-string.lo \
+ libwi_odbc_la-trans.lo libwi_odbc_la-update.lo \
+ libwi_odbc_la-uuencode.lo libwi_odbc_la-wirpc.lo \
+ libwi_odbc_la-wiservic.lo libwi_odbc_la-xpathp.lo \
+ libwi_odbc_la-xpscn.lo $(am__objects_6) $(am__objects_7) \
+ libwi_odbc_la-bif_date.lo libwi_odbc_la-bif_dav.lo \
+ libwi_odbc_la-bif_explain.lo libwi_odbc_la-bif_file.lo \
+ libwi_odbc_la-bif_phrasematch.lo libwi_odbc_la-bif_smtp.lo \
+ libwi_odbc_la-bif_soap.lo libwi_odbc_la-bif_text.lo \
+ libwi_odbc_la-bif_tidy.lo libwi_odbc_la-http_client.lo \
+ libwi_odbc_la-shuric.lo libwi_odbc_la-subseq.lo \
+ libwi_odbc_la-text.lo libwi_odbc_la-uname_const_decl.lo \
libwi_odbc_la-xmlenc_algos.lo libwi_odbc_la-xmlenc.lo \
libwi_odbc_la-xmlenc-dec.lo libwi_odbc_la-xmlschema.lo \
libwi_odbc_la-xmlsearch.lo libwi_odbc_la-xmlsql.lo \
@@ -393,7 +390,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -442,7 +438,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -494,7 +489,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -541,6 +535,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -589,8 +584,7 @@ noinst_HEADERS = \
wiservic.h wi_xid.h xmlenc_algos.h xmlenc.h xmlenc_test.h xmlgen.h \
xml.h xmlnode.h xmlres.h xmltree.h xpath.h xpathp.h xpathp_impl.h \
xpf.h xqf.h xslt_impl.h aqueue.h rdf_mapping_jso.h bitmap.h jso.h \
- json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h \
- sparqlwords.h
+ json_p.h bif_audio_tags.h shcompo.h cluster.h extent.h uname_const_decl.h
generated_code = \
json_l.c \
@@ -607,7 +601,6 @@ generated_code = \
sparql_l.c \
sparql_p.c \
sparql_p.h \
- sparqlwords.h \
sql3.c \
sql_code.c \
sql_code_1.c \
@@ -622,7 +615,6 @@ generated_code = \
sql_code_pldbg.c \
sql_code_repl.c \
sql_code_sparql.c \
- sql_code_sparql_init.c \
sql_code_sys.c \
sql_code_uddi.c \
sql_code_vad.c \
@@ -661,7 +653,6 @@ C_FILES_SPARQL = \
sparql_rdb2rdf.c \
sparul2sql.c \
sql_code_sparql.c \
- sql_code_sparql_init.c \
turtle_l.c \
turtle_p.c
@@ -684,16 +675,16 @@ libwi_la_SOURCES = aqueue.c arith.c auxfiles.c bif_audio.c \
sql_code_1.c sql_code_2pc.c sql_code_adm.c sql_code_auto.c \
sql_code_blog.c sql_code_cache.c sql_code_dav.c sql_code_dbp.c \
sql_code_ddk.c sql_code_imsg.c sql_code_pldbg.c \
- sql_code_repl.c sql_code_sparql.c sql_code_sparql_init.c \
- sql_code_sys.c sql_code_uddi.c sql_code_vad.c sql_code_vdb.c \
- sql_code_ws.c sqlcomp2.c sqlcomp.c sqlcost.c sqlcr.c sqldf.c \
- sqlexp.c sqlgen.c sqlhash.c sqlintrp.c sqlinx.c sqloby.c \
- sqlo.c sqlocr.c sqloinv.c sqloinx.c sqloprt.c sqlorder.c \
- sqlovdb.c sqlpfn.c sqlprocc.c sqlprt.c sqlrun.c sqlsrv.c \
- sqlstmts.c sqltrig.c sqltype.c sqlver.c sqlview.c srvcr.c \
- srvmultibyte.c srvstat.c string.c trans.c update.c uuencode.c \
- wirpc.c wiservic.c xpathp.c xpscn.c $(C_FILES_SPARQL) \
- $(PLDEBUG_FILES) bif_date.c bif_dav.c bif_explain.c bif_file.c \
+ sql_code_repl.c sql_code_sparql.c sql_code_sys.c \
+ sql_code_uddi.c sql_code_vad.c sql_code_vdb.c sql_code_ws.c \
+ sqlcomp2.c sqlcomp.c sqlcost.c sqlcr.c sqldf.c sqlexp.c \
+ sqlgen.c sqlhash.c sqlintrp.c sqlinx.c sqloby.c sqlo.c \
+ sqlocr.c sqloinv.c sqloinx.c sqloprt.c sqlorder.c sqlovdb.c \
+ sqlpfn.c sqlprocc.c sqlprt.c sqlrun.c sqlsrv.c sqlstmts.c \
+ sqltrig.c sqltype.c sqlver.c sqlview.c srvcr.c srvmultibyte.c \
+ srvstat.c string.c trans.c update.c uuencode.c wirpc.c \
+ wiservic.c xpathp.c xpscn.c $(C_FILES_SPARQL) $(PLDEBUG_FILES) \
+ bif_date.c bif_dav.c bif_explain.c bif_file.c \
bif_phrasematch.c bif_smtp.c bif_soap.c bif_text.c bif_tidy.c \
http_client.c shuric.c subseq.c text.c uname_const_decl.c \
xmlenc_algos.c xmlenc.c xmlenc-dec.c xmlschema.c xmlsearch.c \
@@ -716,16 +707,16 @@ libwi_odbc_la_SOURCES = aqueue.c arith.c auxfiles.c bif_audio.c \
sql_code_1.c sql_code_2pc.c sql_code_adm.c sql_code_auto.c \
sql_code_blog.c sql_code_cache.c sql_code_dav.c sql_code_dbp.c \
sql_code_ddk.c sql_code_imsg.c sql_code_pldbg.c \
- sql_code_repl.c sql_code_sparql.c sql_code_sparql_init.c \
- sql_code_sys.c sql_code_uddi.c sql_code_vad.c sql_code_vdb.c \
- sql_code_ws.c sqlcomp2.c sqlcomp.c sqlcost.c sqlcr.c sqldf.c \
- sqlexp.c sqlgen.c sqlhash.c sqlintrp.c sqlinx.c sqloby.c \
- sqlo.c sqlocr.c sqloinv.c sqloinx.c sqloprt.c sqlorder.c \
- sqlovdb.c sqlpfn.c sqlprocc.c sqlprt.c sqlrun.c sqlsrv.c \
- sqlstmts.c sqltrig.c sqltype.c sqlver.c sqlview.c srvcr.c \
- srvmultibyte.c srvstat.c string.c trans.c update.c uuencode.c \
- wirpc.c wiservic.c xpathp.c xpscn.c $(C_FILES_SPARQL) \
- $(PLDEBUG_FILES) bif_date.c bif_dav.c bif_explain.c bif_file.c \
+ sql_code_repl.c sql_code_sparql.c sql_code_sys.c \
+ sql_code_uddi.c sql_code_vad.c sql_code_vdb.c sql_code_ws.c \
+ sqlcomp2.c sqlcomp.c sqlcost.c sqlcr.c sqldf.c sqlexp.c \
+ sqlgen.c sqlhash.c sqlintrp.c sqlinx.c sqloby.c sqlo.c \
+ sqlocr.c sqloinv.c sqloinx.c sqloprt.c sqlorder.c sqlovdb.c \
+ sqlpfn.c sqlprocc.c sqlprt.c sqlrun.c sqlsrv.c sqlstmts.c \
+ sqltrig.c sqltype.c sqlver.c sqlview.c srvcr.c srvmultibyte.c \
+ srvstat.c string.c trans.c update.c uuencode.c wirpc.c \
+ wiservic.c xpathp.c xpscn.c $(C_FILES_SPARQL) $(PLDEBUG_FILES) \
+ bif_date.c bif_dav.c bif_explain.c bif_file.c \
bif_phrasematch.c bif_smtp.c bif_soap.c bif_text.c bif_tidy.c \
http_client.c shuric.c subseq.c text.c uname_const_decl.c \
xmlenc_algos.c xmlenc.c xmlenc-dec.c xmlschema.c xmlsearch.c \
@@ -759,6 +750,7 @@ SQL_FILES = \
$(srcdir)/system.sql \
$(srcdir)/system2.sql \
$(srcdir)/odbccat.sql \
+ $(srcdir)/useraggr.sql \
$(srcdir)/vt_text.sql \
$(srcdir)/phrasematch.sql \
$(srcdir)/hosting.sql
@@ -835,10 +827,6 @@ SQL_FILES_REPL = \
$(srcdir)/snapshot_repl.sql \
$(srcdir)/repl.sql
-SQL_FILES_SPARQL_INIT = \
- $(srcdir)/useraggr.sql \
- $(srcdir)/sparql_init.sql
-
SQL_FILES_SPARQL = \
$(srcdir)/sparql.sql \
$(srcdir)/sparql_io.sql \
@@ -902,7 +890,7 @@ SQL_FILES_WS = \
$(top_srcdir)/binsrc/vspx/vspx.xsd \
$(top_srcdir)/binsrc/vspx/vspx.xsl
-AWK_FILES = $(srcdir)/sql_to_c.awk Makefile.am
+AWK_FILES = $(srcdir)/sql_to_c.awk
#
# JSON
@@ -942,7 +930,6 @@ EXTRA_DIST = \
sql_code_cache_impl.c \
sql_to_c.awk \
sqlwords.gperf \
- sparqlwords.gperf \
ssl.c \
string_tmpl.c
@@ -1112,7 +1099,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_la-sql_code_pldbg.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_la-sql_code_repl.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_la-sql_code_sparql.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_la-sql_code_sparql_init.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_la-sql_code_sys.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_la-sql_code_uddi.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_la-sql_code_vad.Plo at am__quote@
@@ -1291,7 +1277,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_odbc_la-sql_code_pldbg.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_odbc_la-sql_code_repl.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_odbc_la-sql_code_sparql.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_odbc_la-sql_code_sparql_init.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_odbc_la-sql_code_sys.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_odbc_la-sql_code_uddi.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwi_odbc_la-sql_code_vad.Plo at am__quote@
@@ -1895,13 +1880,6 @@ libwi_la-sql_code_sparql.lo: sql_code_sparql.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwi_la_CFLAGS) $(CFLAGS) -c -o libwi_la-sql_code_sparql.lo `test -f 'sql_code_sparql.c' || echo '$(srcdir)/'`sql_code_sparql.c
-libwi_la-sql_code_sparql_init.lo: sql_code_sparql_init.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwi_la_CFLAGS) $(CFLAGS) -MT libwi_la-sql_code_sparql_init.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_sparql_init.Tpo -c -o libwi_la-sql_code_sparql_init.lo `test -f 'sql_code_sparql_init.c' || echo '$(srcdir)/'`sql_code_sparql_init.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_sparql_init.Tpo $(DEPDIR)/libwi_la-sql_code_sparql_init.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_sparql_init.c' object='libwi_la-sql_code_sparql_init.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwi_la_CFLAGS) $(CFLAGS) -c -o libwi_la-sql_code_sparql_init.lo `test -f 'sql_code_sparql_init.c' || echo '$(srcdir)/'`sql_code_sparql_init.c
-
libwi_la-sql_code_sys.lo: sql_code_sys.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwi_la_CFLAGS) $(CFLAGS) -MT libwi_la-sql_code_sys.lo -MD -MP -MF $(DEPDIR)/libwi_la-sql_code_sys.Tpo -c -o libwi_la-sql_code_sys.lo `test -f 'sql_code_sys.c' || echo '$(srcdir)/'`sql_code_sys.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_la-sql_code_sys.Tpo $(DEPDIR)/libwi_la-sql_code_sys.Plo
@@ -3148,13 +3126,6 @@ libwi_odbc_la-sql_code_sparql.lo: sql_code_sparql.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwi_odbc_la_CFLAGS) $(CFLAGS) -c -o libwi_odbc_la-sql_code_sparql.lo `test -f 'sql_code_sparql.c' || echo '$(srcdir)/'`sql_code_sparql.c
-libwi_odbc_la-sql_code_sparql_init.lo: sql_code_sparql_init.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwi_odbc_la_CFLAGS) $(CFLAGS) -MT libwi_odbc_la-sql_code_sparql_init.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_sparql_init.Tpo -c -o libwi_odbc_la-sql_code_sparql_init.lo `test -f 'sql_code_sparql_init.c' || echo '$(srcdir)/'`sql_code_sparql_init.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_sparql_init.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_sparql_init.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sql_code_sparql_init.c' object='libwi_odbc_la-sql_code_sparql_init.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwi_odbc_la_CFLAGS) $(CFLAGS) -c -o libwi_odbc_la-sql_code_sparql_init.lo `test -f 'sql_code_sparql_init.c' || echo '$(srcdir)/'`sql_code_sparql_init.c
-
libwi_odbc_la-sql_code_sys.lo: sql_code_sys.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwi_odbc_la_CFLAGS) $(CFLAGS) -MT libwi_odbc_la-sql_code_sys.lo -MD -MP -MF $(DEPDIR)/libwi_odbc_la-sql_code_sys.Tpo -c -o libwi_odbc_la-sql_code_sys.lo `test -f 'sql_code_sys.c' || echo '$(srcdir)/'`sql_code_sys.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libwi_odbc_la-sql_code_sys.Tpo $(DEPDIR)/libwi_odbc_la-sql_code_sys.Plo
@@ -4223,20 +4194,20 @@ json_p.c json_p.h: $(srcdir)/json.y Makefile.am
json_l.c: $(srcdir)/json.l json_p.h Makefile.am
@$(GEN) $(LEX) -o json_l.c -Pjsonyy $(srcdir)/json.l
-sqlwords.h: $(srcdir)/sqlwords.gperf Makefile.am
+sqlwords.h: $(srcdir)/sqlwords.gperf
@${GEN} --stdout ${GPERF} \
-o sqlwords.h \
-aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$$ \
-Nlex_hash_kw \
$(srcdir)/sqlwords.gperf
-sql3.c sql3.h: sql3.y Makefile.am
+sql3.c sql3.h: sql3.y
@$(GEN) $(YACC) -o sql3.c -vd $(srcdir)/sql3.y
-scn3.c: scn3.l sql3.c sqlwords.h Makefile.am
+scn3.c: scn3.l sql3.c sqlwords.h
@$(GEN) $(LEX) -o scn3.c $(srcdir)/scn3.l
-scn3split.c: scn3.l sql3.c sqlwords.h Makefile.am
+scn3split.c: scn3.l sql3.c sqlwords.h
@$(GEN) $(LEX) -o scn3split.c -Pscn3splityy $(srcdir)/scn3.l
$(top_srcdir)/binsrc/cached_resources/cached_resources.c:
@@ -4248,44 +4219,34 @@ sql_code_cache.c: $(top_srcdir)/binsrc/cached_resources/cached_resources.c sql_c
@echo "#include \"sql_code_cache_impl.c\"" >> $@
@echo "#include \"$(top_srcdir)/binsrc/cached_resources/cached_resources.c\"" >> $@
-xpathp.c xpathp.h : xpathp.y Makefile.am
+xpathp.c xpathp.h : xpathp.y
@$(GEN) $(YACC) -o xpathp.c -vd -pxpyy $(srcdir)/xpathp.y
-xpathp_lex_props.c: list_lex_props.sh xpathp.y Makefile.am
+xpathp_lex_props.c: list_lex_props.sh xpathp.y
list_lex_props.sh xpathp.y xpathp_lex_props.c
-xpscn.c: xpscn.l xpathp.h Makefile.am
+xpscn.c: xpscn.l xpathp.h
@$(GEN) $(LEX) -o xpscn.c -Pxpyy $(srcdir)/xpscn.l
-sparqlwords.h: sparqlwords.gperf Makefile.am
- @$(GEN) --stdout $(GPERF) -o $@ \
- -aCDGptr \
- -Kkwd \
- -L ANSI-C \
- -k1,2,3,5,7,$$ \
- --ignore-case \
- -Nsparql_lex_hash_kw \
- sparqlwords.gperf
-
-sparql_p.c sparql_p.h: sparql_p.y Makefile.am
+sparql_p.c sparql_p.h: sparql_p.y
@$(GEN) $(YACC) -o sparql_p.c -vd -psparyy $(srcdir)/sparql_p.y
-sparql_lex_props.c: list_lex_props.sh sparql_p.y Makefile.am
+sparql_lex_props.c: list_lex_props.sh sparql_p.y
list_lex_props.sh sparql_p.y sparql_lex_props.c
-sparql_l.c: sparql_l.l sparql_p.h Makefile.am
+sparql_l.c: sparql_l.l sparql_p.h
@$(GEN) $(LEX) -o sparql_l.c -Psparyy $(srcdir)/sparql_l.l
-nquad_p.c nquad_p.h: nquad_p.y Makefile.am
+nquad_p.c nquad_p.h: nquad_p.y
@$(GEN) $(YACC) -o nquad_p.c -vd -pnqyy $(srcdir)/nquad_p.y
-turtle_p.c turtle_p.h: turtle_p.y Makefile.am
+turtle_p.c turtle_p.h: turtle_p.y
@$(GEN) $(YACC) -o turtle_p.c -vd -pttlyy $(srcdir)/turtle_p.y
-turtle_lex_props.c: list_lex_props.sh turtle_p.y Makefile.am
+turtle_lex_props.c: list_lex_props.sh turtle_p.y
list_lex_props.sh turtle_p.y turtle_lex_props.c
-turtle_l.c: turtle_l.l turtle_p.h Makefile.am
+turtle_l.c: turtle_l.l turtle_p.h
@$(GEN) $(LEX) -o turtle_l.c -Pttlyy $(srcdir)/turtle_l.l
sql_code.c: $(SQL_FILES) $(AWK_FILES) Makefile.am
@@ -4375,7 +4336,7 @@ sql_code_2pc.c: $(SQL_FILES_2PC) $(AWK_FILES) Makefile.am
-v pl_stats=$(PLSTATS) \
$(SQL_FILES_2PC)
-#sql_code_blog.c: $(SQL_FILES_BLOG) $(AWK_FILES) Makefile.am
+#sql_code_blog.c: $(SQL_FILES_BLOG) $(AWK_FILES)
# @${GEN} ${GAWK} -o sql_code_2pc.c -f $(srcdir)/sql_to_c.awk \
# -v init_name=_blog -v pl_stats=$(PLSTATS) $(SQL_FILES_BLOG)
@@ -4387,14 +4348,6 @@ sql_code_vdb.c: $(SQL_FILES_VDB) $(AWK_FILES) Makefile.am
-v pl_stats=$(PLSTATS) \
$(SQL_FILES_VDB)
-sql_code_sparql_init.c: $(SQL_FILES_SPARQL_INIT) $(AWK_FILES) Makefile.am
- @${GEN} ${GAWK} \
- -o sql_code_sparql_init.c \
- -f $(srcdir)/sql_to_c.awk \
- -v init_name=_sparql_init \
- -v pl_stats=$(PLSTATS) \
- $(SQL_FILES_SPARQL_INIT)
-
sql_code_sparql.c: $(SQL_FILES_SPARQL) $(AWK_FILES) Makefile.am
@${GEN} ${GAWK} \
-o sql_code_sparql.c \
@@ -4478,7 +4431,6 @@ generated: \
sparql_l.c \
sparql_p.c \
sparql_p.h \
- sparqlwords.h \
sql3.c \
sql_code.c \
sql_code_1.c \
diff --git a/libsrc/Wi/aqueue.c b/libsrc/Wi/aqueue.c
index c142d52..b2bdba1 100644
--- a/libsrc/Wi/aqueue.c
+++ b/libsrc/Wi/aqueue.c
@@ -1,10 +1,10 @@
/*
- * $Id: aqueue.c,v 1.19.2.6 2012/03/08 12:55:32 source Exp $
+ * $Id: aqueue.c,v 1.19.2.5 2010/02/27 22:21:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/aqueue.h b/libsrc/Wi/aqueue.h
index 47b7e9e..576d963 100644
--- a/libsrc/Wi/aqueue.h
+++ b/libsrc/Wi/aqueue.h
@@ -1,10 +1,10 @@
/*
- * $Id: aqueue.h,v 1.4.2.4 2012/03/08 12:55:32 source Exp $
+ * $Id: aqueue.h,v 1.4.2.3 2010/01/28 01:14:04 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/arith.c b/libsrc/Wi/arith.c
index 3c14482..9ef85c7 100644
--- a/libsrc/Wi/arith.c
+++ b/libsrc/Wi/arith.c
@@ -1,14 +1,14 @@
/*
* arith.c
*
- * $Id: arith.c,v 1.13.2.7 2012/03/08 12:55:32 source Exp $
+ * $Id: arith.c,v 1.13.2.5 2011/05/17 21:14:47 source Exp $
*
* Arithmetic operators and comparisons.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -551,20 +551,12 @@ cmp_boxes_safe (ccaddr_t box1, ccaddr_t box2, collation_t *collation1, collation
default:
collation1 = NULL;
}
+
if (IS_WIDE_STRING_DTP (dtp1) && IS_STRING_DTP (dtp2))
- {
- if (box_flags (box2) & (BF_IRI | BF_UTF8))
- return compare_wide_to_utf8_with_collation ((wchar_t *) box1, n1, (utf8char *) box2, n2, NULL);
- else
- return compare_wide_to_latin1 ((wchar_t *) box1, n1, (unsigned char *) box2, n2);
- }
+ return compare_wide_to_narrow ((wchar_t *) box1, n1, (unsigned char *) box2, n2);
if (IS_STRING_DTP (dtp1) && IS_WIDE_STRING_DTP (dtp2))
{
- int res;
- if (box_flags (box2) & (BF_IRI | BF_UTF8))
- res = compare_wide_to_utf8_with_collation ((wchar_t *)box2, n2, (utf8char *) box1, n1, NULL);
- else
- res = compare_wide_to_latin1 ((wchar_t *)box2, n2, (unsigned char *) box1, n1);
+ int res = compare_wide_to_narrow ((wchar_t *)box2, n2, (unsigned char *) box1, n1);
return (res == DVC_LESS ? DVC_GREATER :
(res == DVC_GREATER ? DVC_LESS : res));
}
@@ -776,19 +768,10 @@ cmp_boxes (ccaddr_t box1, ccaddr_t box2, collation_t *collation1, collation_t *c
}
if (IS_WIDE_STRING_DTP (dtp1) && IS_STRING_DTP (dtp2))
- {
- if (box_flags (box2) & (BF_IRI | BF_UTF8))
- return compare_wide_to_utf8_with_collation ((wchar_t *) box1, n1, (utf8char *) box2, n2, NULL);
- else
- return compare_wide_to_latin1 ((wchar_t *) box1, n1, (unsigned char *) box2, n2);
- }
- if (IS_STRING_DTP (dtp1) && IS_WIDE_STRING_DTP (dtp2))
+ return compare_wide_to_narrow ((wchar_t *) box1, n1, (unsigned char *) box2, n2);
+ else if (IS_STRING_DTP (dtp1) && IS_WIDE_STRING_DTP (dtp2))
{
- int res;
- if (box_flags (box2) & (BF_IRI | BF_UTF8))
- res = compare_wide_to_utf8_with_collation ((wchar_t *)box2, n2, (utf8char *) box1, n1, NULL);
- else
- res = compare_wide_to_latin1 ((wchar_t *)box2, n2, (unsigned char *) box1, n1);
+ int res = compare_wide_to_narrow ((wchar_t *)box2, n2, (unsigned char *) box1, n1);
return (res == DVC_LESS ? DVC_GREATER :
(res == DVC_GREATER ? DVC_LESS : res));
}
diff --git a/libsrc/Wi/arith.h b/libsrc/Wi/arith.h
index 71eac30..5ea19eb 100644
--- a/libsrc/Wi/arith.h
+++ b/libsrc/Wi/arith.h
@@ -1,12 +1,12 @@
/*
* arith.h
*
- * $Id: arith.h,v 1.4.2.3 2012/03/08 12:55:32 source Exp $
+ * $Id: arith.h,v 1.4.2.2 2011/05/17 21:14:47 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/autoexec.sql b/libsrc/Wi/autoexec.sql
index 9f0b061..eb43db6 100644
--- a/libsrc/Wi/autoexec.sql
+++ b/libsrc/Wi/autoexec.sql
@@ -1,10 +1,10 @@
--
--- $Id: autoexec.sql,v 1.6.2.3 2012/03/08 12:55:32 source Exp $
+-- $Id: autoexec.sql,v 1.6.2.2 2010/01/31 20:36:37 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/auxfiles.c b/libsrc/Wi/auxfiles.c
index a0d5049..aa27404 100644
--- a/libsrc/Wi/auxfiles.c
+++ b/libsrc/Wi/auxfiles.c
@@ -1,7 +1,7 @@
/*
* auxfiles.c
*
- * $Id: auxfiles.c,v 1.20.2.10 2012/03/08 12:55:32 source Exp $
+ * $Id: auxfiles.c,v 1.20.2.9 2011/09/12 20:08:51 source Exp $
*
* License file (license.dat)
* Error logging (wi.err)
@@ -10,7 +10,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_audio.c b/libsrc/Wi/bif_audio.c
index 3ef6f19..cdd5c36 100644
--- a/libsrc/Wi/bif_audio.c
+++ b/libsrc/Wi/bif_audio.c
@@ -1,12 +1,12 @@
/*
* bif_audio.c
*
- * $Id: bif_audio.c,v 1.2.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: bif_audio.c,v 1.2.2.1 2010/03/08 12:02:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2007 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
diff --git a/libsrc/Wi/bif_audio_tags.h b/libsrc/Wi/bif_audio_tags.h
index e28410a..1473cd7 100644
--- a/libsrc/Wi/bif_audio_tags.h
+++ b/libsrc/Wi/bif_audio_tags.h
@@ -1,12 +1,12 @@
/*
- * $Id: bif_audio_tags.h,v 1.2.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: bif_audio_tags.h,v 1.2 2009/04/09 13:22:11 source Exp $
*
* Tag definitions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 2007 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
diff --git a/libsrc/Wi/bif_crypto.c b/libsrc/Wi/bif_crypto.c
index 6d18958..3764ba5 100644
--- a/libsrc/Wi/bif_crypto.c
+++ b/libsrc/Wi/bif_crypto.c
@@ -1,14 +1,14 @@
/*
* bif_crypto.c
*
- * $Id: bif_crypto.c,v 1.8.2.9 2012/03/08 12:55:32 source Exp $
+ * $Id: bif_crypto.c,v 1.8.2.5 2011/01/27 14:19:53 source Exp $
*
* Cryptography functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -529,11 +529,9 @@ bif_asn1_to_xml (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
int len = 0;
char tmpbuf[100000];
caddr_t bytes = bif_string_arg (qst, args, 0, "asn1_to_xml");
- long length = BOX_ELEMENTS (args) > 1 ? bif_long_arg (qst, args, 1, "asn1_to_xml") : 0;
+ long length = bif_long_arg (qst, args, 1, "asn1_to_xml");
if (!(out = BIO_new (BIO_s_mem ())))
return NEW_DB_NULL;
- if (0 == length)
- length = box_length (bytes) - 1;
if (asn1_parse_to_xml (out, (unsigned char **) &bytes, length, 0, 0, 0, 1) != 1)
{
res = NEW_DB_NULL;
@@ -1246,13 +1244,7 @@ BN_box (BIGNUM * x)
return buf;
}
-/*
- 1 - info type
- 2 - certificate
- 3 - certifcate file type (1 - DER, 2 - PKCS12, 0 - PEM, 3 - internal key name)
- 4 - password to open pkcs12 bundle
- 5 - extension OID (7); attribute e.g. CN (10)
-*/
+
static caddr_t
bif_get_certificate_info (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
@@ -1390,14 +1382,6 @@ bif_get_certificate_info (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
unsigned int n;
unsigned char md[EVP_MAX_MD_SIZE];
char tmp[4];
- char *digest_name = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_or_null_arg (qst, args, 4, "get_certificate_info") : NULL);
-
- if (digest_name)
- {
- digest = EVP_get_digestbyname (digest_name);
- if (!digest)
- sqlr_new_error ("22023", "SR...", "Can not find digest %s", digest_name);
- }
if (!X509_digest (cert, digest, md, &n))
{
@@ -1517,41 +1501,6 @@ bif_get_certificate_info (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
BIO_free (mem);
break;
}
- case 11:
- {
- X509_NAME *subj = X509_get_subject_name (cert);
- X509_NAME_ENTRY *ne;
- int n, i, len;
- char *s, *data_ptr;
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
- {
- val = NULL;
- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
- n = OBJ_obj2nid (ne->object);
- if ((n == NID_undef) || ((s = OBJ_nid2sn (n)) == NULL))
- {
- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
- s = buffer;
- }
- ASN1_STRING_print (mem, ne->value);
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
- val = dk_alloc_box (len + 1, DV_SHORT_STRING);
- memcpy (val, data_ptr, len);
- val[len] = 0;
- }
- dk_set_push (&set, box_dv_short_string (s));
- dk_set_push (&set, val ? val : NEW_DB_NULL);
- BIO_reset (mem);
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
- break;
- }
default:
{
if (!internal)
@@ -1583,33 +1532,6 @@ bif_bin2hex (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
}
static caddr_t
-bif_hex2bin (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t str = bif_string_arg (qst, args, 0, "hex2bin");
- caddr_t out;
- uint32 inx, len = box_length (str) - 1;
- unsigned int tmp;
-
- if (!len)
- return NEW_DB_NULL;
- if (len % 2)
- sqlr_new_error ("22023", "ENC..", "The input string must have a length multiple by two");
- out = dk_alloc_box (len / 2, DV_BIN);
- out[0] = 0;
- for (inx = 0; inx < len; inx += 2)
- {
- if (1 != sscanf (str+inx, "%02x", &tmp))
- {
- dk_free_box (out);
- sqlr_new_error ("22023", "ENC..", "The input string does not contains hexadecimal string");
- }
- out [inx/2] = (unsigned char) tmp;
- }
- return out;
-}
-
-
-static caddr_t
bif_sha1_digest (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t data = (caddr_t) bif_string_arg (qst, args, 0, "sha1");
@@ -1640,7 +1562,6 @@ bif_crypto_init (void)
bif_define_typed ("get_certificate_info", bif_get_certificate_info, &bt_any);
bif_define_typed ("x509_certificate_verify", bif_x509_certificate_verify, &bt_any);
bif_define_typed ("bin2hex", bif_bin2hex, &bt_varchar);
- bif_define_typed ("hex2bin", bif_hex2bin, &bt_bin);
}
#else /* _SSL dummy section for bifs that are defined here to not break existing apps */
diff --git a/libsrc/Wi/bif_date.c b/libsrc/Wi/bif_date.c
index cdd22c6..2fe342a 100644
--- a/libsrc/Wi/bif_date.c
+++ b/libsrc/Wi/bif_date.c
@@ -1,14 +1,14 @@
/*
* bif_date.c
*
- * $Id: bif_date.c,v 1.12.2.8 2012/03/08 12:55:32 source Exp $
+ * $Id: bif_date.c,v 1.12.2.5 2011/09/23 15:20:37 source Exp $
*
* Bifs for date
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -487,7 +487,7 @@ bif_merge_nasa_tjd_to_datetime (caddr_t * qst, caddr_t * err_ret, state_slot_t *
{
double frac = bif_double_arg (qst, args, 1, "merge_nasa_tjd_to_datetime");
boxint frac_microsec = frac * (60*60*24*1000000.0);
- if ((0 > frac_microsec) || (60*60*24*(boxint)(1000000) <= frac_microsec))
+ if ((0 > frac_microsec) || (60*60*24*1000000 <= frac_microsec))
sqlr_new_error ("22023", "SR644", "Fraction of julian day should be nonnegative and less than 1");
DT_SET_FRACTION (res, (frac_microsec % 1000000) * 1000);
frac_microsec = frac_microsec / 1000000;
@@ -531,12 +531,14 @@ bif_date_diff (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t unit = bif_string_arg (qst, args, 0, "datediff");
caddr_t dt1 = bif_date_arg (qst, args, 1, "datediff");
caddr_t dt2 = bif_date_arg (qst, args, 2, "datediff");
- boxint s1 = (boxint)DT_DAY (dt1) * 24 * 60 * 60 + (boxint)DT_HOUR (dt1) * 60 * 60 + (boxint)DT_MINUTE (dt1) * 60 + DT_SECOND (dt1);
- boxint s2 = (boxint)DT_DAY (dt2) * 24 * 60 * 60 + (boxint)DT_HOUR (dt2) * 60 * 60 + (boxint)DT_MINUTE (dt2) * 60 + DT_SECOND (dt2);
+ boxint s1 =
+ (boxint) DT_DAY (dt1) * 24 * 60 * 60 + (boxint) DT_HOUR (dt1) * 60 * 60 + (boxint) DT_MINUTE (dt1) * 60 + DT_SECOND (dt1);
+ boxint s2 =
+ (boxint) DT_DAY (dt2) * 24 * 60 * 60 + (boxint) DT_HOUR (dt2) * 60 * 60 + (boxint) DT_MINUTE (dt2) * 60 + DT_SECOND (dt2);
int frac1, frac2;
int diffyear, diffmonth;
if (0 == stricmp (unit, "day"))
- return box_num ((boxint)DT_DAY (dt2) - (boxint)DT_DAY (dt1));
+ return box_num ((boxint) DT_DAY (dt2) - (boxint) DT_DAY (dt1));
if (0 == stricmp (unit, "hour"))
return box_num ((s2 - s1) / (60 * 60));
if (0 == stricmp (unit, "minute"))
@@ -555,18 +557,18 @@ bif_date_diff (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
ts_add (&ts1, tz_tweak, "minute");
ts_add (&ts2, tz_tweak, "minute");
if (diffyear)
- return box_num ((boxint)ts2.year - (boxint)ts1.year);
+ return box_num ((boxint) ts2.year - (boxint) ts1.year);
if (diffmonth)
- return box_num ((boxint)(ts2.year * 12 + ts2.month) - (boxint)(ts1.year * 12 + ts1.month));
+ return box_num ((boxint) (ts2.year * 12 + ts2.month) - (boxint) (ts1.year * 12 + ts1.month));
}
- frac1 = DT_FRACTION(dt1);
- frac2 = DT_FRACTION(dt2);
+ frac1 = DT_FRACTION (dt1);
+ frac2 = DT_FRACTION (dt2);
if (0 == stricmp (unit, "millisecond"))
- return box_num ((s2 - s1) * (boxint)1000 + (frac2 / 1000000 - frac1 / 1000000));
+ return box_num ((s2 - s1) * (boxint) 1000 + (frac2 / 1000000 - frac1 / 1000000));
if (0 == stricmp (unit, "microsecond"))
- return box_num ((s2 - s1) * (boxint)1000000 + (frac2 / 1000 - frac1 / 1000));
+ return box_num ((s2 - s1) * (boxint) 1000000 + (frac2 / 1000 - frac1 / 1000));
if (0 == stricmp (unit, "nanosecond"))
- return box_num ((s2 - s1) * (boxint)1000000000 + (frac2 - frac1));
+ return box_num ((s2 - s1) * (boxint) 1000000000 + (frac2 - frac1));
sqlr_new_error ("22023", "DT002", "Bad unit in datediff: %s.", unit);
return NULL;
}
@@ -856,12 +858,6 @@ bif_date_init ()
bif_define_typed ("minute", bif_minute, &bt_integer);
bif_define_typed ("second", bif_second, &bt_integer);
bif_define_typed ("timezone", bif_timezone, &bt_integer);
- bif_define_typed ("rdf_now_impl", bif_timestamp, &bt_timestamp);
- bif_define_typed ("rdf_year_impl", bif_year, &bt_integer);
- bif_define_typed ("rdf_month_impl", bif_month, &bt_integer);
- bif_define_typed ("rdf_day_impl", bif_day, &bt_integer);
- bif_define_typed ("rdf_hours_impl", bif_hour, &bt_integer);
- bif_define_typed ("rdf_minutes_impl", bif_minute, &bt_integer);
bif_define_typed ("nasa_tjd_number", bif_nasa_tjd_number, &bt_integer);
bif_define_typed ("nasa_tjd_fraction", bif_nasa_tjd_fraction, &bt_double);
bif_define_typed ("merge_nasa_tjd_to_datetime", bif_merge_nasa_tjd_to_datetime, &bt_datetime);
diff --git a/libsrc/Wi/bif_dav.c b/libsrc/Wi/bif_dav.c
index 1500cfa..fe05be7 100644
--- a/libsrc/Wi/bif_dav.c
+++ b/libsrc/Wi/bif_dav.c
@@ -1,14 +1,14 @@
/*
* bif_dav.c
*
- * $Id: bif_dav.c,v 1.5.2.5 2012/03/08 12:55:32 source Exp $
+ * $Id: bif_dav.c,v 1.5.2.4 2011/07/19 23:33:43 source Exp $
*
* DAV support
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_diff.c b/libsrc/Wi/bif_diff.c
index 6bb41ba..6441815 100644
--- a/libsrc/Wi/bif_diff.c
+++ b/libsrc/Wi/bif_diff.c
@@ -1,14 +1,14 @@
/*
* sqlbif.c
*
- * $Id: bif_diff.c,v 1.4.2.2 2012/03/08 12:55:32 source Exp $
+ * $Id: bif_diff.c,v 1.4.2.1 2009/04/18 21:55:09 source Exp $
*
* Diff functionality
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_explain.c b/libsrc/Wi/bif_explain.c
index c888a8d..5138e7f 100644
--- a/libsrc/Wi/bif_explain.c
+++ b/libsrc/Wi/bif_explain.c
@@ -1,14 +1,14 @@
/*
* bif_explain.c
*
- * $Id: bif_explain.c,v 1.17.2.15 2012/03/08 12:55:32 source Exp $
+ * $Id: bif_explain.c,v 1.17.2.14 2011/06/07 12:30:28 source Exp $
*
* Implements bif 'explain'
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_file.c b/libsrc/Wi/bif_file.c
index 058e500..b1eab12 100644
--- a/libsrc/Wi/bif_file.c
+++ b/libsrc/Wi/bif_file.c
@@ -1,14 +1,14 @@
/*
* bif_file.c
*
- * $Id: bif_file.c,v 1.44.2.40 2012/03/08 12:55:32 source Exp $
+ * $Id: bif_file.c,v 1.44.2.37 2011/09/28 17:01:16 source Exp $
*
* Bifs for file I/O
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1340,111 +1340,77 @@ file_native_name (caddr_t se_name)
{
case DV_WIDE:
{
- int wchars;
- int bufsize;
- caddr_t buf;
- char *buf_end, *end_of_dat;
- wchars = box_length (se_name) / sizeof (wchar_t) - 1;
- if (wchars > (PATH_MAX * 10))
- wchars = PATH_MAX * 10;
- bufsize = wchars * i18n_volume_encoding->eh_maxsize;
- buf = dk_alloc_box (bufsize + 1, DV_STRING);
- buf_end = buf + bufsize;
- end_of_dat = i18n_volume_encoding->eh_encode_wchar_buffer (
- ((const wchar_t *) se_name), ((const wchar_t *) se_name) + wchars, buf, buf_end, i18n_volume_encoding);
- if (end_of_dat == buf_end)
- {
- buf_end[0] = '\0';
- volume_fname = buf;
- }
- else
- {
- volume_fname = box_dv_short_nchars (buf, end_of_dat - buf);
- dk_free_box (buf);
- }
- break;
+ int wchars;
+ int bufsize;
+ caddr_t buf;
+ char *buf_end, *end_of_dat;
+ wchars = box_length (se_name) / sizeof (wchar_t) - 1;
+ if (wchars > (PATH_MAX * 10))
+ wchars = PATH_MAX * 10;
+ bufsize = wchars * i18n_volume_encoding->eh_maxsize;
+ buf = dk_alloc_box (bufsize + 1, DV_STRING);
+ buf_end = buf + bufsize;
+ end_of_dat = i18n_volume_encoding->eh_encode_wchar_buffer (
+ ((const wchar_t *)se_name), ((const wchar_t *)se_name) + wchars, buf, buf_end,
+ i18n_volume_encoding );
+ if (end_of_dat == buf_end)
+ {
+ buf_end[0] = '\0';
+ volume_fname = buf;
+ }
+ else
+ {
+ volume_fname = box_dv_short_nchars (buf, end_of_dat - buf);
+ dk_free_box (buf);
+ }
+ break;
}
case DV_STRING:
{
- long len = box_length (se_name) - 1;
- if (len > PATH_MAX * 30)
- len = PATH_MAX * 30;
- volume_fname = box_dv_short_nchars (se_name, len);
- break;
+ long len = box_length (se_name) - 1;
+ if (len > PATH_MAX * 30)
+ len = PATH_MAX * 30;
+ volume_fname = box_dv_short_nchars (se_name, len);
+ break;
}
case DV_UNAME:
if (&eh__UTF8 == i18n_volume_encoding)
- {
- long len = box_length (se_name) - 1;
- if (len > PATH_MAX * 30)
- len = PATH_MAX * 30;
- volume_fname = box_dv_short_nchars (se_name, len);
- }
+ {
+ long len = box_length (se_name) - 1;
+ if (len > PATH_MAX * 30)
+ len = PATH_MAX * 30;
+ volume_fname = box_dv_short_nchars (se_name, len);
+ }
else
- {
- caddr_t se1, res;
- long len = box_length (se_name) - 1;
- if (len > PATH_MAX * 30)
- len = PATH_MAX * 30;
- se1 = box_utf8_as_wide_char (se_name, NULL, len, 0, DV_WIDE);
- res = file_native_name (se1);
- dk_free_box (se1);
- return res;
- }
+ {
+ caddr_t se1, res;
+ long len = box_length (se_name) - 1;
+ if (len > PATH_MAX * 30)
+ len = PATH_MAX * 30;
+ se1 = box_utf8_as_wide_char (se_name, NULL, len, 0, DV_WIDE);
+ res = file_native_name (se1);
+ dk_free_box (se1);
+ return res;
+ }
break;
default:
{
- GPF_T1 ("Bad box type for file name");
- volume_fname = NULL; /* to keep the compiler happy */
+ GPF_T1 ("Bad box type for file name");
+ volume_fname = NULL; /* to keep the compiler happy */
}
}
#ifdef HAVE_DIRECT_H
for (fname_tail = volume_fname; fname_tail[0]; fname_tail++)
{
- switch (fname_tail[0])
- {
- /* case '|': fname_tail[0] = ':'; break; */
- case '/':
- fname_tail[0] = '\\';
- break;
- }
+ if ('/' == fname_tail[0])
+ fname_tail[0] = '\\';
}
- if ((fname_tail - 1) >= volume_fname && *(fname_tail - 1) == '\\')
- *(fname_tail - 1) = 0;
+ if ((fname_tail - 1) >= volume_fname && *(fname_tail - 1) == '\\')
+ *(fname_tail - 1) = 0;
#endif
- dk_check_tree (volume_fname);
return volume_fname;
}
-caddr_t
-file_native_name_from_iri_path_nchars (const char *iri_path, size_t iri_path_len)
-{
- caddr_t fname;
-#ifdef WIN32
- char *fname_ptr, *fname_end;
- if (iri_path_len >= _MAX_PATH)
- iri_path_len = _MAX_PATH-1;
- fname = box_dv_short_nchars (iri_path, iri_path_len);
- fname_end = fname + iri_path_len;
- for (fname_ptr = fname; fname_ptr < fname_end; fname_ptr++)
- {
- switch (fname_ptr[0])
- {
- case '|':
- fname_ptr[0] = ':';
- break;
- case '/':
- fname_ptr[0] = '\\';
- break;
- }
- }
-#else
- fname = box_dv_short_nchars (iri_path, iri_path_len);
-#endif
- return fname;
-}
-
-
/* IvAn/WinFileNames/000815
1. File descriptor's leaks has removed.
2. Error handling extended by the case of "failed lseek".
diff --git a/libsrc/Wi/bif_gnw.c b/libsrc/Wi/bif_gnw.c
index e263f05..90b4a79 100644
--- a/libsrc/Wi/bif_gnw.c
+++ b/libsrc/Wi/bif_gnw.c
@@ -1,14 +1,14 @@
/*
* bif_gnw.c
*
- * $Id: bif_gnw.c,v 1.4.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_gnw.c,v 1.4.2.1 2009/04/18 21:55:10 source Exp $
*
* GNW specific extensions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_imap.c b/libsrc/Wi/bif_imap.c
index 39a2e08..a5e8432 100644
--- a/libsrc/Wi/bif_imap.c
+++ b/libsrc/Wi/bif_imap.c
@@ -1,14 +1,14 @@
/*
* bif_imap.c
*
- * $Id: bif_imap.c,v 1.1.2.11 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_imap.c,v 1.1.2.8 2011/01/28 13:32:49 source Exp $
*
* IMAP4 client function
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -70,7 +70,6 @@
} \
END_WRITE_FAIL (ses)
-
static int
is_ok (char *resp)
{
@@ -232,7 +231,6 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
char resp[1024];
char message[128], err_text[512], err_code[6], login_message[512], username[512], password[512];
char end_msg[1] = ")";
- char end_msg3[3] = ")\r\n";
char *s, *ps;
caddr_t target_folder_id = NULL;
dk_session_t *msg = NULL;
@@ -315,60 +313,60 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
if (!stricmp ("list", mode))
{
if (folder_id && strlen (folder_id) > 0)
- snprintf (message, sizeof (message), "3 LIST \"\" \"%s\"", folder_id);
+ snprintf (message, sizeof (message), "3 LIST \"\" \"%s\"", folder_id);
else
- snprintf (message, sizeof (message), "3 LIST \"\" \"%%\"");
+ snprintf (message, sizeof (message), "3 LIST \"\" \"%%\"");
SEND (ses, rc, message, "");
message_begin = 0;
strses_flush (msg);
strses_enable_paging (msg, http_ses_size);
CATCH_READ_FAIL (ses)
- {
- rc = dks_read_line (ses, resp, sizeof (resp));
- while (strlen (resp) > 2 && strncmp ("3 OK", resp, 4))
- {
- ps = resp;
+ {
+ rc = dks_read_line (ses, resp, sizeof (resp));
+ while (strlen (resp) > 2 && strncmp ("3 OK", resp, 4))
+ {
+ ps = resp;
+ ps = imap_next_word (ps);
+ if (!ascii_strncasecmp ("LIST", ps, 4))
ps = imap_next_word (ps);
- if (!ascii_strncasecmp ("LIST", ps, 4))
- ps = imap_next_word (ps);
- else
- {
- strcpy_ck (err_text, "Some error in the list of folders");
- strcpy_ck (err_code, "IM006");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- dk_set_push (ret_v, box_dv_short_string (ps));
- if (tcpses_check_disk_error (msg, qst, 0))
- {
- strcpy_ck (err_text, "Server error in accessing temp file");
- strcpy_ck (err_code, "IM007");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- rc = dks_read_line (ses, resp, sizeof (resp));
- }
- if (tcpses_check_disk_error (msg, NULL, 0))
- {
- strcpy_ck (err_text, "Server error in accessing temp file");
- strcpy_ck (err_code, "IM008");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- if (!STRSES_CAN_BE_STRING (msg))
- {
- strcpy_ck (err_text, "Server error in storing data into a string session");
- strcpy_ck (err_code, "IM009");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- }
+ else
+ {
+ strcpy_ck (err_text, "Some error in the list of folders");
+ strcpy_ck (err_code, "IM006");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ dk_set_push (ret_v, box_dv_short_string (ps));
+ if (tcpses_check_disk_error (msg, qst, 0))
+ {
+ strcpy_ck (err_text, "Server error in accessing temp file");
+ strcpy_ck (err_code, "IM007");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ rc = dks_read_line (ses, resp, sizeof (resp));
+ }
+ if (tcpses_check_disk_error (msg, NULL, 0))
+ {
+ strcpy_ck (err_text, "Server error in accessing temp file");
+ strcpy_ck (err_code, "IM008");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ if (!STRSES_CAN_BE_STRING (msg))
+ {
+ strcpy_ck (err_text, "Server error in storing data into a string session");
+ strcpy_ck (err_code, "IM009");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ }
FAILED
- {
- strcpy_ck (err_code, "IM010");
- strcpy_ck (err_text, "Failed reading output of LIST command on remote IMAP server");
- goto error_end;
- }
+ {
+ strcpy_ck (err_code, "IM010");
+ strcpy_ck (err_text, "Failed reading output of FETCH command on remote IMAP server");
+ goto error_end;
+ }
END_READ_FAIL (ses);
goto logout;
}
@@ -377,7 +375,7 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
if (!stricmp ("delete", mode))
{
if (folder_id && strlen (folder_id) > 0)
- snprintf (message, sizeof (message), "3 DELETE \"%s\"", folder_id);
+ snprintf (message, sizeof (message), "3 DELETE \"%s\"", folder_id);
else
{
strcpy_ck (err_code, "IM011");
@@ -409,7 +407,7 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
if (!stricmp ("create", mode))
{
if (folder_id && strlen (folder_id) > 0)
- snprintf (message, sizeof (message), "3 CREATE \"%s\"", folder_id);
+ snprintf (message, sizeof (message), "3 CREATE \"%s\"", folder_id);
else
{
strcpy_ck (err_code, "IM015");
@@ -442,9 +440,9 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
if (!stricmp ("select", mode) || !stricmp ("expunge", mode))
{
if (folder_id && strlen (folder_id) > 0)
- snprintf (message, sizeof (message), "4 SELECT \"%s\"", folder_id);
+ snprintf (message, sizeof (message), "4 SELECT \"%s\"", folder_id);
else
- snprintf (message, sizeof (message), "4 SELECT \"INBOX\"");
+ snprintf (message, sizeof (message), "4 SELECT \"INBOX\"");
SEND (ses, rc, message, "");
while (1)
{
@@ -494,82 +492,82 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
strses_flush (msg2);
strses_enable_paging (msg2, http_ses_size);
CATCH_READ_FAIL (ses)
- {
- rc = dks_read_line (ses, resp, sizeof (resp));
- if (strlen (resp) > 2 && !strncmp ("5 OK", resp, 4))
- break;
- while (strncmp (end_msg, resp, sizeof (end_msg)))
- {
- ps = resp;
- if (!message_begin)
- {
- message_begin = 1;
- ps = imap_next_word (ps);
- ps = imap_next_word (ps);
- if (!ascii_strncasecmp ("FETCH", ps, 5))
- {
- ps = imap_next_word (ps);
- if (ps[0] == '(')
- ps++;
- if (ascii_strncasecmp ("UID", ps, 3) == 0)
- {
- ps = imap_next_word (ps);
- uid = atoi (ps);
- ps = imap_next_word (ps);
- SES_PRINT (msg2, ps);
- if (tcpses_check_disk_error (msg2, qst, 0))
- {
- strcpy_ck (err_text, "Server error in accessing temp file");
- strcpy_ck (err_code, "IM024");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- goto next_statement;
- }
- }
- else
- {
- strcpy_ck (err_text, "Some error");
- strcpy_ck (err_code, "IM023");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- }
- SES_PRINT (msg, ps);
- if (tcpses_check_disk_error (msg, qst, 0))
- {
- strcpy_ck (err_text, "Server error in accessing temp file");
- strcpy_ck (err_code, "IM024");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- next_statement:
- rc = dks_read_line (ses, resp, sizeof (resp));
- }
- session_flush_1 (msg);
- session_flush_1 (msg2);
- if (tcpses_check_disk_error (msg, NULL, 0) || tcpses_check_disk_error (msg2, NULL, 0))
- {
- strcpy_ck (err_text, "Server error in accessing temp file");
- strcpy_ck (err_code, "IM025");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- if (!STRSES_CAN_BE_STRING (msg) || !STRSES_CAN_BE_STRING (msg2))
- {
- strcpy_ck (err_text, "Server error in storing data into a string session");
- strcpy_ck (err_code, "IM026");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- dk_set_push (ret_v, list (3, box_num (uid), strses_string (msg2), strses_string (msg)));
- }
+ {
+ rc = dks_read_line (ses, resp, sizeof (resp));
+ if (strlen (resp) > 2 && !strncmp ("5 OK", resp, 4))
+ break;
+ while (strncmp (end_msg, resp, sizeof (end_msg)))
+ {
+ ps = resp;
+ if (!message_begin)
+ {
+ message_begin = 1;
+ ps = imap_next_word (ps);
+ ps = imap_next_word (ps);
+ if (!ascii_strncasecmp ("FETCH", ps, 5))
+ {
+ ps = imap_next_word (ps);
+ if (ps[0] == '(')
+ ps++;
+ if (ascii_strncasecmp ("UID", ps, 3) == 0)
+ {
+ ps = imap_next_word (ps);
+ uid = atoi (ps);
+ ps = imap_next_word (ps);
+ SES_PRINT (msg2, ps);
+ if (tcpses_check_disk_error (msg2, qst, 0))
+ {
+ strcpy_ck (err_text, "Server error in accessing temp file");
+ strcpy_ck (err_code, "IM024");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ goto next_statement;
+ }
+ }
+ else
+ {
+ strcpy_ck (err_text, "Some error");
+ strcpy_ck (err_code, "IM023");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ }
+ SES_PRINT (msg, ps);
+ if (tcpses_check_disk_error (msg, qst, 0))
+ {
+ strcpy_ck (err_text, "Server error in accessing temp file");
+ strcpy_ck (err_code, "IM024");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ next_statement:
+ rc = dks_read_line (ses, resp, sizeof (resp));
+ }
+ session_flush_1 (msg);
+ session_flush_1 (msg2);
+ if (tcpses_check_disk_error (msg, NULL, 0) || tcpses_check_disk_error (msg2, NULL, 0))
+ {
+ strcpy_ck (err_text, "Server error in accessing temp file");
+ strcpy_ck (err_code, "IM025");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ if (!STRSES_CAN_BE_STRING (msg) || !STRSES_CAN_BE_STRING (msg2))
+ {
+ strcpy_ck (err_text, "Server error in storing data into a string session");
+ strcpy_ck (err_code, "IM026");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ dk_set_push (ret_v, list (3, uid, strses_string (msg2), strses_string (msg)));
+ }
FAILED
- {
- strcpy_ck (err_code, "IM027");
- strcpy_ck (err_text, "Failed reading output of FETCH command on remote IMAP server");
- goto error_end;
- }
+ {
+ strcpy_ck (err_code, "IM027");
+ strcpy_ck (err_text, "Failed reading output of FETCH command on remote IMAP server");
+ goto error_end;
+ }
END_READ_FAIL (ses);
}
}
@@ -596,7 +594,7 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
strcpy_ck (err_text, "There must be 2 string items in vector of argument 7 (old folder name to rename and a new name)");
goto logout;
}
- snprintf (message, sizeof (message), "4 RENAME \"%s\" \"%s\"", in[0], in[1]);
+ snprintf (message, sizeof (message), "4 RENAME \"%s\" \"%s\"", in[0], in[1]);
SEND (ses, rc, message, "");
while (1)
{
@@ -618,7 +616,7 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
if (!stricmp ("fetch", mode) || !stricmp ("message_delete", mode) || !stricmp ("message_copy", mode))
{
if (folder_id && strlen (folder_id) > 0)
- snprintf (message, sizeof (message), "4 SELECT \"%s\"", folder_id);
+ snprintf (message, sizeof (message), "4 SELECT \"%s\"", folder_id);
else
snprintf (message, sizeof (message), "4 SELECT INBOX");
SEND (ses, rc, message, "");
@@ -636,7 +634,7 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
if (inx_mails > 0)
{
volatile int l, br;
- int do_not_read, start = 0;
+ int start = 0;
dtp_t type;
if (in)
l = BOX_ELEMENTS (in);
@@ -662,116 +660,98 @@ imap_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
goto logout;
}
if (!stricmp ("fetch", mode))
- snprintf (message, sizeof (message), "5 UID FETCH %d BODY.PEEK[]", (int) (in[br]));
+ snprintf (message, sizeof (message), "5 UID FETCH %d BODY.PEEK[]", (int)(in[br]));
if (!stricmp ("message_delete", mode))
- snprintf (message, sizeof (message), "5 UID STORE %d +FLAGS (\\Deleted)", (int) (in[br]));
+ snprintf (message, sizeof (message), "5 UID STORE %d +FLAGS (\\Deleted)", (int)(in[br]));
if (!stricmp ("message_copy", mode))
- snprintf (message, sizeof (message), "5 UID COPY %d \"%s\"", (int) (in[br]), target_folder_id);
+ snprintf (message, sizeof (message), "5 UID COPY %d \"%s\"", (int)(in[br]), target_folder_id);
SEND (ses, rc, message, "");
- do_not_read = 0;
while (1)
{
message_begin = 0;
strses_flush (msg);
strses_enable_paging (msg, http_ses_size);
CATCH_READ_FAIL (ses)
- {
- if (!do_not_read)
- rc = dks_read_line (ses, resp, sizeof (resp));
- if (strlen (resp) > 2 && !strncmp ("5 OK", resp, 4))
+ {
+ rc = dks_read_line (ses, resp, sizeof (resp));
+ if (strlen (resp) > 2 && !strncmp ("5 OK", resp, 4))
+ break;
+ if (strlen (resp) > 2 && !strncmp ("5 BAD", resp, 5))
+ {
+ strcpy_ck (err_text, "Error in IMAP command UID STORE");
+ strcpy_ck (err_code, "IM035");
+ break;
+ }
+ if (strlen (resp) > 2 && !strncmp ("5 NO", resp, 4))
+ {
+ strcpy_ck (err_text, "Error in IMAP command UID STORE");
+ strcpy_ck (err_code, "IM036");
break;
- if (strlen (resp) > 2 && !strncmp ("5 BAD", resp, 5))
- {
- strcpy_ck (err_text, "Error in IMAP command UID STORE");
- strcpy_ck (err_code, "IM035");
- break;
- }
- if (strlen (resp) > 2 && !strncmp ("5 NO", resp, 4))
- {
- strcpy_ck (err_text, "Error in IMAP command UID STORE");
- strcpy_ck (err_code, "IM036");
- break;
- }
- while (resp)
- {
- ps = resp;
- if (!message_begin)
- {
- message_begin = 1;
- if (!ascii_strncasecmp ("* ", ps, 2))
- {
- ps = imap_next_word (ps);
- ps = imap_next_word (ps);
- if (!ascii_strncasecmp ("FETCH", ps, 5))
- {
- ps = imap_next_word (ps);
- if (ps[0] == '(')
- ps++;
- if (ascii_strncasecmp ("UID", ps, 3) == 0)
- {
- ps = imap_next_word (ps);
- uid = atoi (ps);
- }
- }
- }
- else
- {
- strcpy_ck (err_text, "Some error");
- strcpy_ck (err_code, "IM037");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- if (!stricmp ("message_delete", mode) || !stricmp ("message_copy", mode))
- break;
- goto next_message;
- }
- SES_PRINT (msg, ps);
- if (tcpses_check_disk_error (msg, qst, 0))
- {
- strcpy_ck (err_text, "Server error in accessing temp file");
- strcpy_ck (err_code, "IM038");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- next_message:
- rc = dks_read_line (ses, resp, sizeof (resp));
- if (strlen (resp) > 2 && (!strncmp ("5 OK", resp, 4) || !strncmp ("5 BAD", resp, 5)
- || !strncmp ("5 NO", resp, 4)))
- {
- do_not_read = 1;
+ }
+ while (strncmp (end_msg, resp, sizeof (end_msg)))
+ {
+ ps = resp;
+ if (!message_begin)
+ {
+ message_begin = 1;
+ ps = imap_next_word (ps);
+ ps = imap_next_word (ps);
+ if (!ascii_strncasecmp ("FETCH", ps, 5))
+ {
+ ps = imap_next_word (ps);
+ if (ps[0] == '(')
+ ps++;
+ if (ascii_strncasecmp ("UID", ps, 3) == 0)
+ {
+ ps = imap_next_word (ps);
+ uid = atoi (ps);
+ }
+ }
+ else
+ {
+ strcpy_ck (err_text, "Some error");
+ strcpy_ck (err_code, "IM037");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ if (!stricmp ("message_delete", mode) || !stricmp ("message_copy", mode))
break;
- }
- }
- session_flush_1 (msg);
- if (tcpses_check_disk_error (msg, NULL, 0))
- {
- strcpy_ck (err_text, "Server error in accessing temp file");
- strcpy_ck (err_code, "IM039");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- if (!STRSES_CAN_BE_STRING (msg))
- {
- strcpy_ck (err_text, "Server error in storing data into a string session");
- strcpy_ck (err_code, "IM040");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
- goto logout;
- }
- if (uid > 0)
- {
- caddr_t result = NULL;
- result = strses_string (msg);
- if (!strncmp (result + strlen (result) - 3, end_msg3, sizeof (end_msg3)))
- result[strlen (result) - 3] = 0;
- dk_set_push (ret_v, list (2, box_num (uid), result));
- }
- }
+ goto next_message;
+ }
+ SES_PRINT (msg, ps);
+ if (tcpses_check_disk_error (msg, qst, 0))
+ {
+ strcpy_ck (err_text, "Server error in accessing temp file");
+ strcpy_ck (err_code, "IM038");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ next_message:
+ rc = dks_read_line (ses, resp, sizeof (resp));
+ }
+ session_flush_1 (msg);
+ if (tcpses_check_disk_error (msg, NULL, 0))
+ {
+ strcpy_ck (err_text, "Server error in accessing temp file");
+ strcpy_ck (err_code, "IM039");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ if (!STRSES_CAN_BE_STRING (msg))
+ {
+ strcpy_ck (err_text, "Server error in storing data into a string session");
+ strcpy_ck (err_code, "IM040");
+ SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ goto logout;
+ }
+ dk_set_push (ret_v, list (2, uid, strses_string (msg)));
+ }
FAILED
- {
- strcpy_ck (err_code, "IM041");
- strcpy_ck (err_text, "Failed reading output of FETCH command on remote IMAP server");
- goto error_end;
- }
+ {
+ strcpy_ck (err_code, "IM041");
+ strcpy_ck (err_text, "Failed reading output of FETCH command on remote IMAP server");
+ goto error_end;
+ }
END_READ_FAIL (ses);
}
}
diff --git a/libsrc/Wi/bif_intl.c b/libsrc/Wi/bif_intl.c
index 1b3a9a2..3a481de 100644
--- a/libsrc/Wi/bif_intl.c
+++ b/libsrc/Wi/bif_intl.c
@@ -1,14 +1,14 @@
/*
* bif_intl.c
*
- * $Id: bif_intl.c,v 1.11.2.10 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_intl.c,v 1.11.2.8 2011/01/28 13:32:49 source Exp $
*
* Internationalization functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -29,7 +29,6 @@
#include <wchar.h>
#endif
#include <limits.h>
-#include "http.h" /* For WS_CHARSET */
#include "wi.h"
#include "libutil.h"
#include "sqlnode.h"
@@ -300,7 +299,7 @@ literal_as_utf8 (encoding_handler_t * enc, caddr_t literal, int len)
}
caddr_t
-charset_recode_from_named_to_named (query_instance_t *qi, caddr_t narrow, const char *cs1_uppercase, const char *cs2_uppercase, int *res_is_new_ret, caddr_t *err_ret)
+charset_recode_from_named_to_named (caddr_t narrow, const char *cs1_uppercase, const char *cs2_uppercase, int *res_is_new_ret, caddr_t *err_ret)
{
wcharset_t *cs1, *cs2;
int bom_skip_offset = 0;
@@ -318,18 +317,7 @@ charset_recode_from_named_to_named (query_instance_t *qi, caddr_t narrow, const
cs1 = CHARSET_WIDE;
if (cs2_uppercase && !cs2 && !strcmp (cs2_uppercase, "_WIDE_"))
cs2 = CHARSET_WIDE;
- if (cs1_uppercase && !cs1 && !strcmp (cs1_uppercase, "_WS_"))
- {
- cs1 = ((NULL != qi) ? WS_CHARSET (qi->qi_client->cli_ws, qi) : NULL);
- if (NULL == cs1)
- cs1 = default_charset;
- }
- if (cs2_uppercase && !cs2 && !strcmp (cs2_uppercase, "_WS_"))
- {
- cs2 = ((NULL != qi) ? WS_CHARSET (qi->qi_client->cli_ws, qi) : NULL);
- if (NULL == cs2)
- cs2 = default_charset;
- }
+
if (!cs1 && cs1_uppercase && box_length (cs1_uppercase) > 1)
{
if (!stricmp (cs1_uppercase, "UTF-16") && box_length (narrow) > 2
@@ -442,7 +430,7 @@ bif_charset_recode (caddr_t *qst, caddr_t *err_ret, state_slot_t ** args)
cs1_uname = cs1_name ? sqlp_box_upcase (cs1_name) : NULL;
cs2_uname = cs2_name ? sqlp_box_upcase (cs2_name) : NULL;
- res = charset_recode_from_named_to_named ((query_instance_t *)qst, narrow, cs1_uname, cs2_uname, &res_is_new, &err);
+ res = charset_recode_from_named_to_named (narrow, cs1_uname, cs2_uname, &res_is_new, &err);
dk_free_box (cs1_uname); dk_free_box (cs2_uname);
if (NULL != err)
{
diff --git a/libsrc/Wi/bif_json.c b/libsrc/Wi/bif_json.c
index 89b3ddf..320ea64 100644
--- a/libsrc/Wi/bif_json.c
+++ b/libsrc/Wi/bif_json.c
@@ -1,10 +1,10 @@
/*
- * $Id: bif_json.c,v 1.4.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_json.c,v 1.4.2.1 2009/04/18 21:55:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/bif_kerberoscli.c b/libsrc/Wi/bif_kerberoscli.c
index b0067e3..79132fb 100644
--- a/libsrc/Wi/bif_kerberoscli.c
+++ b/libsrc/Wi/bif_kerberoscli.c
@@ -1,12 +1,12 @@
/*
* bif_kerberoscli.c
*
- * $Id: bif_kerberoscli.c,v 1.3.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_kerberoscli.c,v 1.3.2.1 2009/04/18 21:55:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_ldapcli.c b/libsrc/Wi/bif_ldapcli.c
index 685bf90..ea6f45d 100644
--- a/libsrc/Wi/bif_ldapcli.c
+++ b/libsrc/Wi/bif_ldapcli.c
@@ -1,12 +1,12 @@
/*
* bif_ldapcli.c
*
- * $Id: bif_ldapcli.c,v 1.3.2.4 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_ldapcli.c,v 1.3.2.3 2011/05/19 13:15:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_mts.c b/libsrc/Wi/bif_mts.c
index 88a9e9d..acba651 100644
--- a/libsrc/Wi/bif_mts.c
+++ b/libsrc/Wi/bif_mts.c
@@ -1,12 +1,12 @@
/*
* bif_mts.c
*
- * $Id: bif_mts.c,v 1.2.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_mts.c,v 1.2.2.1 2009/04/18 21:55:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_nntp.c b/libsrc/Wi/bif_nntp.c
index 7b67e79..af020c0 100644
--- a/libsrc/Wi/bif_nntp.c
+++ b/libsrc/Wi/bif_nntp.c
@@ -1,12 +1,12 @@
/*
* bif_nntp.c
*
- * $Id: bif_nntp.c,v 1.2.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_nntp.c,v 1.2.2.1 2009/04/18 21:55:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_phrasematch.c b/libsrc/Wi/bif_phrasematch.c
index 40e1dc8..596a32d 100644
--- a/libsrc/Wi/bif_phrasematch.c
+++ b/libsrc/Wi/bif_phrasematch.c
@@ -1,12 +1,12 @@
/*
* bif_phrasematch.c
*
- * $Id: bif_phrasematch.c,v 1.23.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_phrasematch.c,v 1.23.2.1 2009/04/18 21:55:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_pop3.c b/libsrc/Wi/bif_pop3.c
index a59dee8..770cbf5 100644
--- a/libsrc/Wi/bif_pop3.c
+++ b/libsrc/Wi/bif_pop3.c
@@ -1,14 +1,14 @@
/*
* bif_pop3.c
*
- * $Id: bif_pop3.c,v 1.6.2.5 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_pop3.c,v 1.6.2.2 2010/08/02 11:20:51 source Exp $
*
* POP3 client function
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -74,14 +74,14 @@ is_ok (char *resp)
static void
pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
- long end_size, caddr_t mode, dk_set_t * ret_v, caddr_t * in, caddr_t * qst, long cert)
+ long end_size, caddr_t mode, dk_set_t * ret_v, caddr_t * in, caddr_t *qst, long cert)
{
int rc;
volatile int inx, inx_mails;
unsigned int number;
volatile long size;
dk_set_t uidl = NULL;
- caddr_t *volatile my_list = NULL;
+ caddr_t * volatile my_list = NULL;
dk_session_t *ses = dk_session_allocate (SESCLASS_TCPIP);
char num[11], resp[1024];
char message[16], err_text[512], err_code[6];
@@ -93,8 +93,7 @@ pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
SSL_METHOD *ssl_method;
#endif
- resp[0] = 0;
- err_code[0] = 0;
+ resp[0] = 0; err_code[0] = 0;
if (!_thread_sched_preempt)
{
ses->dks_read_block_timeout = dks_fibers_blocking_read_default_to;
@@ -161,9 +160,8 @@ pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
{
goto error_end;
}
- END_READ_FAIL (ses);
-
- /* IS_OK_NEXT (ses, resp, rc, "Bad user name and password"); */
+ END_READ_FAIL (ses)
+ /* IS_OK_NEXT (ses, resp, rc, "Bad user name and password"); */
inx_mails = 0;
size = 0;
@@ -186,11 +184,11 @@ pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
rc = dks_read_line (ses, resp, sizeof (resp));
if (!strncmp (end_msg, resp, sizeof (end_msg)))
break;
- sscanf (resp, "%i %100s", (int *) (&number), next);
+ sscanf (resp, "%i %100s", (int *)(&number), next);
if (in)
{
fl = 0;
- for (br = 0; br < l; br++)
+ for (br=0;br<l;br++)
{
if (!strcmp (in[br], next))
{
@@ -232,10 +230,10 @@ pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
sscanf (resp, "%10s %li", num, &msg_size);
if (atoi (num) == 0)
- if (num[0] != '.')
+ if (num[0] != '.')
break;
- if (my_list[atoi (num) - 1])
+ if (my_list[atoi(num)-1])
size = size + msg_size;
if (size < end_size)
@@ -253,11 +251,12 @@ pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
}
END_READ_FAIL (ses);
+
for (inx = 1; inx <= inx_mails; inx++)
{
snprintf (message, sizeof (message), "%i", inx);
- if (!my_list[inx - 1])
+ if (!my_list[inx-1])
continue;
if (stricmp ("uidl", mode))
@@ -274,13 +273,12 @@ pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
while (strncmp (end_msg, resp, sizeof (end_msg)))
{
rc = dks_read_line (ses, resp, sizeof (resp));
- if (strncmp (end_msg, resp, sizeof (end_msg)))
- SES_PRINT (msg, resp);
+ SES_PRINT (msg, resp);
if (tcpses_check_disk_error (msg, qst, 0))
{
strcpy_ck (err_text, "Server error in accessing temp file");
strcpy_ck (err_code, "PO010");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ SESSION_SCH_DATA(ses)->sio_read_fail_on = 0;
goto error_end;
}
}
@@ -289,22 +287,22 @@ pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
{
strcpy_ck (err_text, "Server error in accessing temp file");
strcpy_ck (err_code, "PO010");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ SESSION_SCH_DATA(ses)->sio_read_fail_on = 0;
goto error_end;
}
if (!STRSES_CAN_BE_STRING (msg))
{
strcpy_ck (err_text, "Server error in storing data into a string session");
strcpy_ck (err_code, "PO010");
- SESSION_SCH_DATA (ses)->sio_read_fail_on = 0;
+ SESSION_SCH_DATA(ses)->sio_read_fail_on = 0;
goto error_end;
}
- dk_set_push (ret_v, list (2, my_list[inx - 1], strses_string (msg)));
- my_list[inx - 1] = NULL;
+ dk_set_push (ret_v, list (2, my_list[inx-1], strses_string (msg)));
+ my_list[inx-1]=NULL;
}
FAILED
{
- strcpy_ck (err_code, "PO010");
+ strcpy_ck (err_code, "PO010");
strcpy_ck (err_text, "Failed reading output of LIST command on remote POP3 server");
goto error_end;
}
@@ -312,14 +310,15 @@ pop3_get (char *host, caddr_t * err_ret, caddr_t user, caddr_t pass,
}
else
{
- dk_set_push (ret_v, my_list[inx - 1]);
- my_list[inx - 1] = NULL;
+ dk_set_push (ret_v, my_list[inx-1]);
+ my_list[inx-1]=NULL;
}
if (!stricmp ("delete", mode))
{
SEND (ses, rc, "DELE ", message);
- IS_OK_NEXT (ses, resp, rc, "PO011", "Could not DELE messages from remote POP3 server");
+ IS_OK_NEXT (ses, resp, rc, "PO011",
+ "Could not DELE messages from remote POP3 server");
}
}
@@ -343,7 +342,7 @@ error_end:
SSL_CTX_free (ssl_ctx);
if (err_code[0] != 0)
- *err_ret = srv_make_new_error ("08006", err_code, "%s", err_text);
+ *err_ret = srv_make_new_error ("08006", err_code, "%s", err_text);
else
*err_ret = srv_make_new_error ("08006", "PO014", "Misc. error in connection in pop3_get");
return;
@@ -352,7 +351,7 @@ error_end:
static caddr_t
bif_pop3_get (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
- caddr_t *in_uidl = NULL;
+ caddr_t * in_uidl = NULL;
caddr_t addr = bif_string_arg (qst, args, 0, "pop3_get");
caddr_t user = bif_string_arg (qst, args, 1, "pop3_get");
caddr_t pass = bif_string_arg (qst, args, 2, "pop3_get");
@@ -363,7 +362,7 @@ bif_pop3_get (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t err = NULL;
long cert = 0;
dk_set_t volatile uidl_mes = NULL;
- IO_SECT (qst);
+ IO_SECT(qst);
if (BOX_ELEMENTS (args) > 4)
mode = bif_string_arg (qst, args, 4, "pop3_get");
@@ -378,7 +377,7 @@ bif_pop3_get (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
if (BOX_ELEMENTS (args) > 6)
cert = bif_long_arg (qst, args, 6, "pop3_get");
- pop3_get (addr, &err, user, pass, end_size, mode, (dk_set_t *) & uidl_mes, in_uidl, qst, cert);
+ pop3_get (addr, &err, user, pass, end_size, mode, (dk_set_t *) &uidl_mes, in_uidl, qst, cert);
if (err)
{
@@ -403,7 +402,7 @@ bif_ses_write (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
dk_session_t *out;
caddr_t string = bif_arg (qst, args, 0, "ses_write");
dtp_t volatile dtp = DV_TYPE_OF (string);
- IO_SECT (qst);
+ IO_SECT(qst);
if (BOX_ELEMENTS (args) > 1)
{
out = http_session_arg (qst, args, 1, "ses_write");
@@ -412,7 +411,7 @@ bif_ses_write (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
if (!qi->qi_client->cli_ws)
sqlr_new_error ("37000", "HT043",
- "ses_write with no argument defaults it direct to the raw client connection.\nAllowed only inside HTTP request");
+ "ses_write with no argument defaults it direct to the raw client connection.\nAllowed only inside HTTP request");
out = qi->qi_client->cli_ws->ws_session;
}
@@ -424,15 +423,18 @@ bif_ses_write (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
CATCH_WRITE_FAIL (out)
{
- if (dtp == DV_SHORT_STRING || dtp == DV_LONG_STRING || dtp == DV_C_STRING)
- session_buffered_write (out, string, box_length (string) - (IS_STRING_DTP (DV_TYPE_OF (string)) ? 1 : 0));
+ if (dtp == DV_SHORT_STRING || dtp == DV_LONG_STRING ||
+ dtp == DV_C_STRING)
+ session_buffered_write (out, string,
+ box_length (string) - (IS_STRING_DTP (DV_TYPE_OF (string)) ? 1 : 0));
else if ((dtp == DV_BLOB_HANDLE) || (dtp == DV_BLOB_WIDE_HANDLE))
{
- blob_handle_t *bh = (blob_handle_t *) string;
+ blob_handle_t *bh = (blob_handle_t *)string;
if (!bh->bh_length)
{
if (bh->bh_ask_from_client)
- sqlr_new_error ("22023", "HT001", "An interactive blob can't be passed as argument to ses_write");
+ sqlr_new_error ("22023", "HT001",
+ "An interactive blob can't be passed as argument to ses_write");
goto endwrite;
}
bh->bh_current_page = bh->bh_page;
@@ -446,7 +448,8 @@ bif_ses_write (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
strses_write_out ((dk_session_t *) string, out);
}
else
- *err_ret = srv_make_new_error ("22023", "HT002", "ses_write requires string, string_output or blob as argument 1");
+ *err_ret = srv_make_new_error ("22023", "HT002",
+ "ses_write requires string, string_output or blob as argument 1");
}
FAILED
{
diff --git a/libsrc/Wi/bif_purify.c b/libsrc/Wi/bif_purify.c
index 6fc0403..690b5f4 100644
--- a/libsrc/Wi/bif_purify.c
+++ b/libsrc/Wi/bif_purify.c
@@ -1,14 +1,14 @@
/*
* bif_purify.c
*
- * $Id: bif_purify.c,v 1.2.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_purify.c,v 1.2.2.1 2009/04/18 21:55:10 source Exp $
*
* Purify functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_regexp.c b/libsrc/Wi/bif_regexp.c
index 3021b2d..f8ab5a1 100644
--- a/libsrc/Wi/bif_regexp.c
+++ b/libsrc/Wi/bif_regexp.c
@@ -1,12 +1,12 @@
/*
* bif_regexp.c
*
- * $Id: bif_regexp.c,v 1.6.2.7 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_regexp.c,v 1.6.2.5 2009/08/19 07:29:52 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -82,7 +82,7 @@ static caddr_t get_regexp_code (safe_hash_t * rx_codes, const char *pattern,
caddr_t
bif_regexp_str_arg (caddr_t * qst, state_slot_t ** args, int nth,
- const char *func, int strg_is_utf8_by_default, int *utf8, caddr_t *ret_to_free, caddr_t *err_ret)
+ char *func, int strg_is_utf8_by_default, int *utf8, caddr_t *ret_to_free, caddr_t *err_ret)
{
caddr_t arg = NULL;
dtp_t arg_dtp;
@@ -406,139 +406,46 @@ done:
return *err_ret ? NULL : (ret_str ? ret_str : NEW_DB_NULL);
}
-ptrlong *
-regexp_offvect_to_array_of_long (utf8char *str, int *offvect, int result, int utf8_mode)
-{
- int i, idx_to_fill;
- int prev_ofs, ofs, prev_wide_len;
- dk_set_t skipped_i = NULL;
- ptrlong *ret_vec;
- virt_mbstate_t mb;
- if (0 >= result)
- return NULL;
- result *= 2;
- ret_vec = (ptrlong *)dk_alloc_box (sizeof (ptrlong) * result, DV_ARRAY_OF_LONG);
- if (!utf8_mode)
- {
- for (i = result; i--; /* no step */)
- ret_vec[i] = offvect[i];
- return ret_vec;
- }
- i = 0;
- idx_to_fill = 0;
- prev_ofs = 0;
- prev_wide_len = 0;
- memset (&mb, 0, sizeof (virt_mbstate_t));
-
-again:
- if ((i < result) && (0 >= offvect[i])) /* That's for fragments like "(.?)" that were matched to an empty string */
- {
- ret_vec [i] = offvect[i];
- i++;
- goto again; /* see above */
- }
-/*The result vector is { B,E, B1,E1, B2,E2... Bn,En } where B <= B1 <= B2... <= Bn but there's no good order for Es.
-However all out-of-order E-s form a proper backstack. */
-/*...so we push out-of-order E-s as soon as they're found in offvect */
- if (i % 2)
- {
- int next_nonnegative_ofs_i = i + 1;
- while (next_nonnegative_ofs_i < result)
- {
- if (0 > offvect[next_nonnegative_ofs_i])
- {
- next_nonnegative_ofs_i++;
- continue;
- }
- if (offvect[i] > offvect[next_nonnegative_ofs_i])
- {
- dk_set_push (&skipped_i, (void *)((ptrlong)i));
- i++;
- goto again;
- }
- break;
- }
- }
-/*...and we pop out-of-order E-s as soon as possible */
- if ((NULL != skipped_i) && ((i >= result) || ((prev_ofs <= offvect[(ptrlong)(skipped_i->data)]) && (offvect[i] >= offvect[(ptrlong)(skipped_i->data)]))))
- {
- idx_to_fill = (ptrlong)dk_set_pop (&skipped_i);
- goto idx_found; /* see below */
- }
- if (i >= result)
- goto done;
- idx_to_fill = i++;
-
-idx_found:
- ofs = offvect[idx_to_fill];
- if (ofs < prev_ofs)
- GPF_T1 ("Corrupted regexp result");
- else if (ofs == prev_ofs)
- {
- ret_vec [idx_to_fill] = prev_wide_len;
- goto again; /* see above */
- }
- else
- {
- int wide_len_diff = (int) virt_mbsnrtowcs (NULL, &str, ofs - prev_ofs, 0, &mb);
- prev_wide_len += wide_len_diff;
- prev_ofs = ofs;
- ret_vec [idx_to_fill] = prev_wide_len;
- goto again; /* see above */
- }
-
-done:
- return ret_vec;
-}
-
-
/*
- *Function Name: bif_regexp_parse / bif_regexp_parse_list
+ *Function Name: bif_regexp_parse
*
*Parameters: pattern - regular expression pattern,
* str - string to be parsed
* offset - offset from which parsing must be executed
- * options - string of regex option chars, like 'i', default is empty string
- * n_hits - number of hits to find (only for bif_regexp_parse_list)
- *Description: finds all substrings which match all parenthesised grroups of a pattern, in one iteration.
+ *Description: finds all substrings which match pattern in one iteration.
*
- *Returns if not a list:
- * vector of offset pairs:
+ *Returns: vector of offset pairs:
* 1 pair - index of begin of matched substring and
* index of matched substrings end
* 2...n pairs - indexes of begins and ends of matched substrings of first substring.
*
- * Returns if not a list:
*/
static caddr_t
-bif_regexp_parse_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, int parse_list, const char *fname)
+bif_regexp_parse (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
int utf8_mode, utf8_mode2;
char *pattern = NULL;
char *str = NULL;
- int offset, str_len;
+ int offset;
pcre_info_t cd_info;
- int c_opts = 0, r_opts = 0, max_n_hits = 0x1000000 / sizeof (ptrlong);
+ int c_opts = 0, r_opts = 0;
caddr_t p_to_free = NULL, str_to_free = NULL;
- int offvect[NOFFSETS];
- ptrlong *ret_vec = NULL;
- dk_set_t ret_revlist = NULL;
+ caddr_t ret_vec = NULL;
utf8_mode = utf8_mode2 = 0;
- offset = (int) bif_long_arg (qst, args, 2, fname);
- str = bif_regexp_str_arg (qst, args, 1, fname, REGEXP_BF, &utf8_mode, &str_to_free, err_ret);
+ offset = (int) bif_long_arg (qst, args, 2, "regexp_parse");
+ str = bif_regexp_str_arg (qst, args, 1, "regexp_parse", REGEXP_BF, &utf8_mode, &str_to_free, err_ret);
if (*err_ret) goto done;
utf8_mode2 = utf8_mode ? utf8_mode : 2;
- pattern = bif_regexp_str_arg (qst, args, 0, fname, REGEXP_BF, &utf8_mode2, &p_to_free, err_ret);
+ pattern = bif_regexp_str_arg (qst, args, 0, "regexp_parse", REGEXP_BF, &utf8_mode2, &p_to_free, err_ret);
if (*err_ret) goto done;
switch ((BOX_ELEMENTS (args)))
{
default:
- case 5: if (parse_list) max_n_hits = bif_long_range_arg (qst, args, 4, fname, 0, max_n_hits);
- case 4: c_opts |= regexp_optchars_to_bits (bif_string_arg (qst, args, 3, fname));
+ case 4: c_opts |= regexp_optchars_to_bits (bif_string_arg (qst, args, 3, "regexp_parse"));
case 3: case 2: case 1: case 0: ;
}
@@ -546,265 +453,43 @@ bif_regexp_parse_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, i
goto done;
*err_ret = get_regexp_code (®exp_codes, pattern, &cd_info, c_opts);
- if (*err_ret || !cd_info.code)
- goto done;
-
- str_len = (int) strlen (str);
- if (parse_list)
- {
- while (0 < max_n_hits--)
- {
- int result = pcre_exec (cd_info.code, cd_info.code_x, str, str_len, offset, r_opts,
- offvect, NOFFSETS);
- if (0 >= result)
- break;
- ret_vec = regexp_offvect_to_array_of_long ((utf8char *)str, offvect, result, utf8_mode);
- if (offset >= ret_vec[1])
- offset++;
- else
- offset = ret_vec[1];
- dk_set_push (&ret_revlist, ret_vec);
- }
- }
- else
+ if (cd_info.code && !*err_ret)
{
- int result = pcre_exec (cd_info.code, cd_info.code_x, str, str_len, offset, r_opts,
- offvect, NOFFSETS);
- ret_vec = regexp_offvect_to_array_of_long ((utf8char *)str, offvect, result, utf8_mode);
+ int offvect[NOFFSETS];
+ int result;
+ int str_len = (int) strlen (str);
+ result = pcre_exec (cd_info.code, cd_info.code_x, str, str_len, offset, r_opts,
+ offvect, NOFFSETS);
+ if (result != -1)
+ {
+ int i;
+ ret_vec = dk_alloc_box (sizeof (ptrlong) * 2 * result, DV_ARRAY_OF_LONG);
+ for (i = 0; i < (result * 2); i++)
+ {
+ if (utf8_mode)
+ {
+ virt_mbstate_t mb;
+ int wide_len;
+ unsigned char *str_tmp = (unsigned char *) str;
+
+ memset (&mb, 0, sizeof (virt_mbstate_t));
+ wide_len = (int) virt_mbsnrtowcs (NULL, &str_tmp, offvect[i], 0, &mb);
+ ((ptrlong *) ret_vec)[i] = wide_len;
+ }
+ else
+ ((ptrlong *) ret_vec)[i] = offvect[i];
+ }
+ }
}
done:
+ if (*err_ret)
+ dk_free_box (ret_vec);
dk_free_tree (p_to_free);
dk_free_tree (str_to_free);
- if (*err_ret)
- return NULL;
- if (parse_list)
- return revlist_to_array (ret_revlist);
- if (NULL != ret_vec)
- return (caddr_t)ret_vec;
- return NEW_DB_NULL;
+ return *err_ret ? NULL : (ret_vec ? ret_vec : NEW_DB_NULL);
}
-static caddr_t
-bif_regexp_parse (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_regexp_parse_impl (qst, err_ret, args, 0, "regexp_parse");
-}
-
-static caddr_t
-bif_regexp_parse_list (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_regexp_parse_impl (qst, err_ret, args, 1, "regexp_parse_list");
-}
-
-ptrlong *
-parse_replacing_template (caddr_t tmpl, int tmpl_syntax_is_xpf, int pos_count)
-{
- int tmpl_is_wide = (DV_WIDE == DV_TYPE_OF (tmpl));
- int charsize = tmpl_is_wide ? sizeof (wchar_t) : 1;
- char *tmpl_tail = tmpl;
- char *tmpl_end = tmpl + box_length (tmpl) - charsize;
- char *tmpl_cut_start = tmpl_tail;
- dk_set_t res = NULL;
- tmpl_cut_start = tmpl_tail;
-#define TMPL_TAIL_CHR(ofs) ((tmpl_is_wide) ? ((wchar_t *)tmpl_tail)[ofs] : tmpl_tail[ofs])
-#define PUSH_TO_RES(beg,end) do { dk_set_push (&res, (void *)((ptrlong)(beg))); dk_set_push (&res, (void *)((ptrlong)(end))); } while (0)
- if (tmpl_syntax_is_xpf)
- {
- while (tmpl_tail < tmpl_end)
- {
- if ('\\' == TMPL_TAIL_CHR(0))
- {
- if (tmpl_cut_start < tmpl_tail)
- PUSH_TO_RES ((tmpl_cut_start - tmpl) / charsize, ((tmpl_tail - tmpl) / charsize));
- tmpl_tail += charsize;
- tmpl_cut_start = tmpl_tail;
- if (tmpl_tail < tmpl_end)
- tmpl_tail += charsize;
- continue;
- }
- else if (('$' == TMPL_TAIL_CHR(0)) && (tmpl_tail < (tmpl_end - charsize))
- && ('0' <= TMPL_TAIL_CHR(1)) && ('9' >= TMPL_TAIL_CHR(1)) )
- {
- int pos_idx = TMPL_TAIL_CHR(1) - '0';
- if (tmpl_cut_start < tmpl_tail)
- PUSH_TO_RES ((tmpl_cut_start - tmpl) / charsize, ((tmpl_tail - tmpl) / charsize));
- tmpl_tail += charsize * 2;
- if ((pos_count > 9) && (tmpl_tail < tmpl_end) && ('0' <= TMPL_TAIL_CHR(0)) && ('9' >= TMPL_TAIL_CHR(0)))
- {
- pos_idx = pos_idx * 10 + TMPL_TAIL_CHR(0) - '0';
- tmpl_tail += charsize;
- }
- if (pos_idx < pos_count)
- PUSH_TO_RES (-1, pos_idx);
- tmpl_cut_start = tmpl_tail;
- continue;
- }
- tmpl_tail += charsize;
- }
- }
- else
- {
- while (tmpl_tail < tmpl_end)
- {
- if ('\\' == TMPL_TAIL_CHR(0))
- {
- if (tmpl_cut_start < tmpl_tail)
- PUSH_TO_RES ((tmpl_cut_start - tmpl) / charsize, ((tmpl_tail - tmpl) / charsize));
- tmpl_tail += charsize;
- if ((tmpl_tail < tmpl_end) && ('0' <= TMPL_TAIL_CHR(0)) && ('9' >= TMPL_TAIL_CHR(0)))
- {
- int pos_idx = TMPL_TAIL_CHR(0) - '0';
- tmpl_tail += charsize;
- if ((pos_count > 9) && (tmpl_tail < tmpl_end) && ('0' <= TMPL_TAIL_CHR(0)) && ('9' >= TMPL_TAIL_CHR(0)))
- {
- pos_idx = pos_idx * 10 + TMPL_TAIL_CHR(0) - '0';
- tmpl_tail += charsize;
- }
- if (pos_idx < pos_count)
- PUSH_TO_RES (-1, pos_idx);
- tmpl_cut_start = tmpl_tail;
- continue;
- }
- tmpl_cut_start = tmpl_tail;
- if (tmpl_tail < tmpl_end)
- tmpl_tail += charsize;
- continue;
- }
- tmpl_tail += charsize;
- }
- }
- if (tmpl_cut_start < tmpl_tail)
- PUSH_TO_RES ((tmpl_cut_start - tmpl) / charsize, ((tmpl_tail - tmpl) / charsize));
- return (ptrlong *)revlist_to_array (res);
-}
-
-static caddr_t
-bif_regexp_replace_hits_with_template (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- int hit_ctr, hit_count, src_is_wide;
- int src_charsize;
- int src_charcount;
- wcharset_t *src_cs, *tmpl_cs;
- int pos_count_in_hits;
- int prev_left_pos = 0;
- dk_session_t *ses;
- caddr_t src = bif_string_or_wide_or_uname_arg (qst, args, 0, "regexp_replace_hits_with_template");
- caddr_t orig_tmpl = bif_string_or_wide_or_uname_arg (qst, args, 1, "regexp_replace_hits_with_template");
- caddr_t *hit_list = bif_array_of_pointer_arg (qst, args, 2, "regexp_replace_hits_with_template");
- int tmpl_syntax_is_xpf = bif_long_arg (qst, args, 3, "regexp_replace_hits_with_template");
- caddr_t tmpl = NULL;
- ptrlong *parsed_tmpl, *parsed_tmpl_end;
- caddr_t res_strg;
- hit_count = BOX_ELEMENTS (hit_list);
- if (0 == hit_count)
- return box_copy (src);
- src_is_wide = (DV_WIDE == DV_TYPE_OF (src));
- src_charsize = src_is_wide ? sizeof (wchar_t) : 1;
- src_charcount = (box_length (src) / src_charsize) - 1;
-#define HIT_NTH_POS(pos) ((DV_ARRAY_OF_LONG == hit_dtp) ? hit[pos] : unbox ((caddr_t)(hit[pos])))
-/* Integrity check first */
- for (hit_ctr = 0; hit_ctr < hit_count; hit_ctr++)
- {
- ptrlong *hit = (ptrlong *)(hit_list[hit_ctr]);
- dtp_t hit_dtp = DV_TYPE_OF (hit);
- int pos_ctr, pos_count;
- ptrlong hit_b, hit_e;
- if ((DV_ARRAY_OF_LONG != hit_dtp) && (DV_ARRAY_OF_POINTER != hit_dtp))
- sqlr_new_error ("22023", "SR647",
- "Function regexp_replace_hits_with_template() has invalid hit list count as argument 2 (hit with index %d is not an array)", hit_ctr );
- pos_count = BOX_ELEMENTS (hit);
- if ((2 > pos_count) || (200 < pos_count) || (pos_count % 2))
- sqlr_new_error ("22023", "SR647",
- "Function regexp_replace_hits_with_template() has invalid hit (index %d) in argument 2 (invalid length of position list)", hit_ctr );
- if (0 == hit_ctr)
- pos_count_in_hits = pos_count;
- else if (pos_count_in_hits != pos_count)
- sqlr_new_error ("22023", "SR647",
- "Function regexp_replace_hits_with_template() has invalid hit (index %d) in argument 2 (the length of position list is %d, but it is %d for the first hit)", hit_ctr, pos_count, pos_count_in_hits );
- hit_b = HIT_NTH_POS(0);
- hit_e = HIT_NTH_POS(1);
- if ((hit_b < prev_left_pos) || (hit_e < hit_b) || (hit_e >= src_charcount))
- sqlr_new_error ("22023", "SR647",
- "Function regexp_replace_hits_with_template() has invalid hit (index %d) in argument 2 (from %d to %d, limits are %d to %d)",
- hit_ctr, (int)hit_b, (int)hit_e, prev_left_pos, src_charcount );
- for (pos_ctr = 2; pos_ctr < pos_count; pos_ctr += 2)
- {
- ptrlong pos_b = HIT_NTH_POS(pos_ctr);
- ptrlong pos_e = HIT_NTH_POS(pos_ctr+1);
- if ((-1 == pos_b) && (-1 == pos_e))
- continue;
- if ((pos_b < prev_left_pos) || (pos_e < pos_b) || (pos_e > hit_e))
- sqlr_new_error ("22023", "SR647",
- "Function regexp_replace_hits_with_template() has invalid pos pair (hit index %d, pos %d) in argument 2 (from %d to %d, limits are %d to %d, hit is from %d to %d)",
- hit_ctr, pos_ctr, (int)pos_b, (int)pos_e, prev_left_pos, (int)hit_e, (int)hit_b, (int)hit_e );
- prev_left_pos = pos_b;
- }
- }
-/* Now we know that the processing will hot hang so we can go on */
- src_cs = charset_native_for_box (src, tmpl_syntax_is_xpf ? BF_UTF8 : BF_DEFAULT_SERVER_ENC);
- tmpl_cs = charset_native_for_box (tmpl, tmpl_syntax_is_xpf ? BF_UTF8 : BF_DEFAULT_SERVER_ENC);
- if (src_cs != tmpl_cs)
- {
- int res_is_new = 0;
- caddr_t err = NULL;
- caddr_t tmpl_temp_copy = box_copy (orig_tmpl);
- tmpl = charset_recode_from_cs_or_eh_to_cs (orig_tmpl, 0, NULL, tmpl_cs, src_cs, &res_is_new, &err);
- if (res_is_new)
- dk_free_box (tmpl_temp_copy);
- if (err)
- sqlr_resignal (err);
- }
- else
- tmpl = orig_tmpl;
- parsed_tmpl = parse_replacing_template (tmpl, tmpl_syntax_is_xpf, pos_count_in_hits);
- parsed_tmpl_end = parsed_tmpl + BOX_ELEMENTS (parsed_tmpl);
- ses = strses_allocate ();
- prev_left_pos = 0;
-#define PASTE(strg,b,e) session_buffered_write (ses, (strg) + ((b) *src_charsize), ((e)-(b))*src_charsize)
- for (hit_ctr = 0; hit_ctr < hit_count; hit_ctr++)
- {
- ptrlong *hit = (ptrlong *)(hit_list[hit_ctr]);
- dtp_t hit_dtp = DV_TYPE_OF (hit);
- ptrlong *parsed_tmpl_tail;
- ptrlong hit_b = HIT_NTH_POS(0);
- ptrlong hit_e = HIT_NTH_POS(1);
- if (hit_b > prev_left_pos)
- PASTE (src, prev_left_pos,hit_b);
- for (parsed_tmpl_tail = parsed_tmpl; parsed_tmpl_tail < parsed_tmpl_end; parsed_tmpl_tail += 2)
- {
- if (-1 == parsed_tmpl_tail[0])
- {
- ptrlong pos_b = HIT_NTH_POS (parsed_tmpl_tail[1] * 2);
- ptrlong pos_e = HIT_NTH_POS (parsed_tmpl_tail[1] * 2 + 1);
- PASTE (src, pos_b, pos_e);
- }
- else
- {
- ptrlong pos_b = parsed_tmpl_tail[0];
- ptrlong pos_e = parsed_tmpl_tail[1];
- if (0 <= pos_b)
- PASTE (tmpl, pos_b, pos_e);
- }
- }
- prev_left_pos = hit_e;
- }
- if (prev_left_pos < src_charcount)
- PASTE (src, prev_left_pos, src_charcount);
- dk_free_box ((caddr_t)parsed_tmpl);
- if (tmpl != orig_tmpl)
- dk_free_box (tmpl);
- if (src_is_wide)
- res_strg = strses_wide_string (ses);
- else
- {
- res_strg = strses_string (ses);
- if (CHARSET_UTF8 == src_cs)
- box_flags (res_strg) |= BF_UTF8;
- }
- strses_free (ses);
- return res_strg;
-}
static caddr_t
get_regexp_code (safe_hash_t * rx_codes, const char *pattern,
@@ -875,8 +560,6 @@ bif_regexp_init ()
bif_define_typed ("rdf_regex_impl", bif_rdf_regex_impl, &bt_varchar);
bif_define_typed ("regexp_substr", bif_regexp_substr, &bt_varchar);
bif_define_typed ("regexp_parse", bif_regexp_parse, &bt_any);
- bif_define_typed ("regexp_parse_list", bif_regexp_parse_list, &bt_any);
- bif_define_typed ("regexp_replace_hits_with_template", bif_regexp_replace_hits_with_template, &bt_varchar);
bif_define_typed ("regexp_version", bif_regexp_version, &bt_varchar);
}
diff --git a/libsrc/Wi/bif_repl.c b/libsrc/Wi/bif_repl.c
index cb5fbc9..9fb555e 100644
--- a/libsrc/Wi/bif_repl.c
+++ b/libsrc/Wi/bif_repl.c
@@ -1,14 +1,14 @@
/*
* bif_repl.c
*
- * $Id: bif_repl.c,v 1.8.2.4 2012/03/09 13:42:56 source Exp $
+ * $Id: bif_repl.c,v 1.8.2.2 2011/05/03 17:50:38 source Exp $
*
* Replication functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -65,7 +65,7 @@ sched_do_round_1 (const char * text)
if (!err)
err = qr_quick_exec (qr, sched_cli, "", NULL, 0);
qr_free (qr);
- if (err && err != (caddr_t) SQL_NO_DATA_FOUND)
+ if (err && err != SQL_NO_DATA_FOUND)
{
if (strcmp ("40001", ERR_STATE (err)))
log_info ("Scheduler error %s : %s", ERR_STATE (err), ERR_MESSAGE (err));
diff --git a/libsrc/Wi/bif_search_excerpt.c b/libsrc/Wi/bif_search_excerpt.c
index ed872ed..d35016e 100644
--- a/libsrc/Wi/bif_search_excerpt.c
+++ b/libsrc/Wi/bif_search_excerpt.c
@@ -1,12 +1,12 @@
/*
* bif_search_excerpt.c
*
- * $Id: bif_search_excerpt.c,v 1.1.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_search_excerpt.c,v 1.1.2.1 2011/10/25 19:36:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2011 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
diff --git a/libsrc/Wi/bif_smtp.c b/libsrc/Wi/bif_smtp.c
index 05c4fbe..1d42e3e 100644
--- a/libsrc/Wi/bif_smtp.c
+++ b/libsrc/Wi/bif_smtp.c
@@ -1,14 +1,14 @@
/*
* bif_smtp.c
*
- * $Id: bif_smtp.c,v 1.3.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_smtp.c,v 1.3.2.1 2009/04/18 21:55:10 source Exp $
*
* SMTP client function
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_soap.c b/libsrc/Wi/bif_soap.c
index e61f3d8..5764d5a 100644
--- a/libsrc/Wi/bif_soap.c
+++ b/libsrc/Wi/bif_soap.c
@@ -1,12 +1,12 @@
/*
* bif_soap.c
*
- * $Id: bif_soap.c,v 1.26.2.10 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_soap.c,v 1.26.2.9 2010/11/15 10:13:33 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_text.c b/libsrc/Wi/bif_text.c
index 5cd10d5..fb07856 100644
--- a/libsrc/Wi/bif_text.c
+++ b/libsrc/Wi/bif_text.c
@@ -1,12 +1,12 @@
/*
- * $Id: bif_text.c,v 1.12.2.17 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_text.c,v 1.12.2.15 2011/03/14 15:46:28 source Exp $
*
* Bifs for text index
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -1841,7 +1841,7 @@ static char *vt_find_index_text =
static char *vt_create_text_index_text =
"create procedure vt_create_text_index (in tb varchar, in col varchar,\n"
" in use_id varchar, in is_xml integer, in defer_generation integer,"
-" in obd any, in _func any, in _lang varchar := \'*ini*\', in _enc varchar := \'*ini*\', in silent int := 0)\n"
+" in obd any, in _func any, in _lang varchar := \'*ini*\', in _enc varchar := \'*ini*\')\n"
"{\n"
" declare str, text_id_col, kn, vt_name, pk_suits, _colname, func, ufunc, vi_column, text_id_col_type varchar;\n"
" declare _coldtp smallint;\n"
@@ -1858,7 +1858,7 @@ static char *vt_create_text_index_text =
" signal (\'42S02\', sprintf (\'No table \\\'%s\\\' in create text index\', tb), \'FT021\');\n"
" }\n"
" if (exists (select 1 from DB.DBA.SYS_VT_INDEX where 0 = casemode_strcmp (VI_TABLE, tb))) {\n"
-" if (is_xml = 2 or silent) \n"
+" if (is_xml = 2) \n"
" return; \n"
" else\n"
" signal (\'42S01\', \'Only one text index allowed per table\', \'FT022\');\n"
diff --git a/libsrc/Wi/bif_text.h b/libsrc/Wi/bif_text.h
index e765f62..cf7b660 100644
--- a/libsrc/Wi/bif_text.h
+++ b/libsrc/Wi/bif_text.h
@@ -1,12 +1,12 @@
/*
* bif_text.h
*
- * $Id: bif_text.h,v 1.3.2.3 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_text.h,v 1.3.2.2 2009/04/18 21:55:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_tidy.c b/libsrc/Wi/bif_tidy.c
index e1a7b63..aa09ec8 100644
--- a/libsrc/Wi/bif_tidy.c
+++ b/libsrc/Wi/bif_tidy.c
@@ -1,14 +1,14 @@
/*
* bif_tidy.c
*
- * $Id: bif_tidy.c,v 1.2.2.6 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_tidy.c,v 1.2.2.5 2011/05/03 17:51:11 source Exp $
*
* Build in Functions for tidying HTML pages
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_uuencode.c b/libsrc/Wi/bif_uuencode.c
index 3b6d8e1..c62827a 100644
--- a/libsrc/Wi/bif_uuencode.c
+++ b/libsrc/Wi/bif_uuencode.c
@@ -1,7 +1,7 @@
/*
* bif_uuencode.c
*
- * $Id: bif_uuencode.c,v 1.4.2.3 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_uuencode.c,v 1.4.2.2 2010/02/10 16:05:05 source Exp $
*
* Build in Functions for UU, XX, Base64, MIME-PlainText and
* MIME-QuotedPrintable encodings
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bif_xml.c b/libsrc/Wi/bif_xml.c
index 4ad6650..a2aa023 100644
--- a/libsrc/Wi/bif_xml.c
+++ b/libsrc/Wi/bif_xml.c
@@ -1,12 +1,12 @@
/*
* bif_xml.c
*
- * $Id: bif_xml.c,v 1.31.2.16 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_xml.c,v 1.31.2.14 2011/08/26 10:58:39 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -630,6 +630,8 @@ xp_free (xparse_ctx_t * xp)
{
dk_hash_iterator_t hit;
caddr_t it, k;
+ xp_rdfxml_locals_t *xrl;
+ xp_rdfa_locals_t *xrdfal;
xp_node_t * xn;
dk_free_box (xp->xp_id);
dk_free_box (xp->xp_error_msg);
@@ -707,8 +709,33 @@ xp_free (xparse_ctx_t * xp)
if ((NULL != xp->xp_doc_cache) && (&(xp->xp_doc_cache) == xp->xp_doc_cache->xdc_owner))
xml_doc_cache_free (xp->xp_doc_cache);
dk_free_box (xp->xp_top_excl_res_prefx);
- if (NULL != xp->xp_tf)
- xp_free_rdf_parser_fields (xp);
+ while (NULL != xp->xp_rdfxml_locals)
+ xp_pop_rdf_locals (xp);
+ while (NULL != xp->xp_rdfa_locals)
+ {
+#ifndef NDEBUG
+ dk_free_tree (xp->xp_rdfa_locals->xrdfal_ict_buffer);
+ xp->xp_rdfa_locals->xrdfal_ict_buffer = NULL;
+#endif
+ xp_pop_rdfa_locals (xp);
+ }
+ xrl = xp->xp_rdfxml_free_list;
+ while (NULL != xrl)
+ {
+ xp_rdfxml_locals_t *next_xrl = xrl->xrl_parent;
+ dk_free (xrl, sizeof (xp_rdfxml_locals_t));
+ xrl = next_xrl;
+ }
+ xrdfal = xp->xp_rdfa_free_list;
+ while (NULL != xrdfal)
+ {
+ xp_rdfa_locals_t *next_xrdfal = xrdfal->xrdfal_parent;
+ dk_free_tree (xrdfal->xrdfal_ict_buffer);
+ dk_free (xrdfal, sizeof (xp_rdfa_locals_t));
+ xrdfal = next_xrdfal;
+ }
+ dk_free_tree (xp->xp_tmp);
+ /* Note that xp_xf is intentionally left untouched. */
}
diff --git a/libsrc/Wi/bif_xper.c b/libsrc/Wi/bif_xper.c
index bcbcaf4..3d71037 100644
--- a/libsrc/Wi/bif_xper.c
+++ b/libsrc/Wi/bif_xper.c
@@ -1,12 +1,12 @@
/*
* bif_xper.c
*
- * $Id: bif_xper.c,v 1.10.2.8 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_xper.c,v 1.10.2.6 2011/02/23 17:31:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -116,7 +116,6 @@ typedef struct xper_ctx_s
caddr_t vt_batch; /*!< batch of word indexing information, or NULL */
int xpc_index_attrs; /*!< Flags if attributes should be indexed */
id_hash_t *xpc_id_dict;
- caddr_t xpc_src_filename;
FILE *xpc_src_file;
vxml_parser_t *xpc_parser;
dk_set_t xpc_cut_chain; /* Chain of boxes, which will be written into the copy */
@@ -1395,11 +1394,6 @@ xper_destroy_ctx (xper_ctx_t * ctx)
VXmlParserDestroy (ctx->xpc_parser);
ctx->xpc_parser = NULL;
}
- if (NULL != ctx->xpc_src_filename)
- {
- dk_free_box (ctx->xpc_src_filename);
- ctx->xpc_src_filename = NULL;
- }
}
static caddr_t
@@ -2515,21 +2509,38 @@ xper_entity_t *
if ((dtp_of_source_arg == DV_SHORT_STRING_SERIAL) ||
(dtp_of_source_arg == DV_STRING) ||
(dtp_of_source_arg == DV_C_STRING))
- { /* 01234567 */
- if (!strncasecmp (source_arg, "file://", 7))
+ {
+ if (!strncasecmp (source_arg, "file://", 7 /* strlen(("file://") */ ))
{
- sec_check_dba (qi, "<read XML from URL of type file://...>");
- context.xpc_src_filename = file_native_name_from_iri_path_nchars (source_arg + 7, strlen (source_arg + 7));
- file_path_assert (context.xpc_src_filename, NULL, 1);
- xper_dbg_print_1 ("File '%s'\n", context.xpc_src_filename);
- context.xpc_src_file = fopen (context.xpc_src_filename, "rb");
- if (NULL == context.xpc_src_file)
- {
- caddr_t err = srv_make_new_error ("42000", "XP100", "Error opening file '%s'", context.xpc_src_filename);
- xper_destroy_ctx (&context);
- dk_free_box (uri);
- sqlr_resignal (err);
- }
+#ifdef WIN32
+ char fname[_MAX_PATH], *fname_ptr;
+ /*fname = dk_alloc(strlen(source+7/ * strlen("file://"* /)+1); */
+ strncpy (fname, source_arg + 7 /* strlen("file://" */ , _MAX_PATH);
+ fname[_MAX_PATH - 1] = '\0';
+ for (fname_ptr = fname; fname_ptr[0]; fname_ptr++)
+ {
+ switch (fname_ptr[0])
+ {
+ case '|':
+ fname_ptr[0] = ':';
+ break;
+ case '/':
+ fname_ptr[0] = '\\';
+ break;
+ }
+ }
+#else
+ char *fname = ((char *) source_arg) + 7 /* strlen("file://") */ ;
+#endif
+ sec_check_dba (qi, "<read XML from URL of type file://...>");
+ xper_dbg_print_1 ("File '%s'\n", fname);
+ context.xpc_src_file = fopen (fname, "rb");
+ if (NULL == context.xpc_src_file)
+ {
+ xper_destroy_ctx (&context);
+ dk_free_box (uri);
+ sqlr_new_error ("42000", "XP100", "Error opening file '%s'", fname);
+ }
source_type = 'F';
iter = file_read;
iter_data = context.xpc_src_file;
diff --git a/libsrc/Wi/bif_xper.h b/libsrc/Wi/bif_xper.h
index 55d3490..904b8f4 100644
--- a/libsrc/Wi/bif_xper.h
+++ b/libsrc/Wi/bif_xper.h
@@ -1,12 +1,12 @@
/*
* bif_xper.h
*
- * $Id: bif_xper.h,v 1.2.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: bif_xper.h,v 1.2.2.1 2009/04/18 21:55:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/bitmap.c b/libsrc/Wi/bitmap.c
index e477d0f..9b87d5b 100644
--- a/libsrc/Wi/bitmap.c
+++ b/libsrc/Wi/bitmap.c
@@ -1,14 +1,14 @@
/*
* bitmap.c
*
- * $Id: bitmap.c,v 1.17.2.18 2012/03/13 11:50:34 source Exp $
+ * $Id: bitmap.c,v 1.17.2.16 2011/04/07 21:16:12 source Exp $
*
* Bitmap Index
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -687,8 +687,7 @@ itc_bm_insert_in_row (it_cursor_t * itc, buffer_desc_t * buf, row_delta_t * rd)
if (!buf->bd_is_write || buf->bd_readers)
GPF_T1 ("should have excl buffer in bm ins in row");
itc_bm_ends (itc, buf, &bm_start, &last, &is_single);
- row = buf->bd_buffer + buf->bd_content_map->pm_entries[itc->itc_map_pos];
- if (is_single && !IE_ISSET (row, IEF_DELETE))
+ if (is_single)
{
GPF_T1 ("singleton bm not in use");
#if 0
@@ -729,12 +728,12 @@ itc_bm_insert_in_row (it_cursor_t * itc, buffer_desc_t * buf, row_delta_t * rd)
}
/* now the row is a collection of ce's. Insert in there. If the new value would make a new ce in front, make a singleton row so as not to have to reset the offsets of the c's and maybe splitting just because the start bit no changes. */
if (!BITS_IN_RANGE (bm_start, value)
- || value < bm_start
- || IE_ISSET (row, IEF_DELETE))
+ || value < bm_start)
{
itc_bm_insert_single (itc, buf, rd, DVC_INDEX_END);
return;
}
+ row = buf->bd_buffer + buf->bd_content_map->pm_entries[itc->itc_map_pos];
KEY_PRESENT_VAR_COL (itc->itc_insert_key, itc->itc_row_data, (*key->key_bm_cl), off, len);
row_reserved = row_length (row, itc->itc_insert_key);
row_align_len = ROW_ALIGN (off + len);
@@ -1136,11 +1135,7 @@ itc_bm_delete (it_cursor_t * itc, buffer_desc_t ** buf_ret)
BIT_COL (bm_start, (*buf_ret), itc->itc_row_data, itc->itc_insert_key);
rc = bm_delete (bm_start, itc->itc_row_data + off, &bm_len, itc->itc_bp.bp_value);
if (DVC_MATCH != rc)
- {
- if (0 == bm_len)
- GPF_T1("leaving bm with singeleton entry");
- return BM_DEL_DONE; /* the bit was not found, no change */
- }
+ return BM_DEL_DONE; /* the bit was not found, no change */
upd_truncate_row (itc, *buf_ret, off + bm_len);
CL_SET_LEN (key, key->key_bm_cl, itc->itc_row_data, bm_len);
itc->itc_bp.bp_is_pos_valid = 1;
diff --git a/libsrc/Wi/bitmap.h b/libsrc/Wi/bitmap.h
index 09030a7..d842425 100644
--- a/libsrc/Wi/bitmap.h
+++ b/libsrc/Wi/bitmap.h
@@ -1,10 +1,10 @@
/*
- * $Id: bitmap.h,v 1.9.2.4 2012/03/08 12:55:33 source Exp $
+ * $Id: bitmap.h,v 1.9.2.3 2010/03/08 12:04:11 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/blob.c b/libsrc/Wi/blob.c
index 3b4a3ff..60c52ba 100644
--- a/libsrc/Wi/blob.c
+++ b/libsrc/Wi/blob.c
@@ -1,14 +1,14 @@
/*
* blob.c
*
- * $Id: blob.c,v 1.16.2.10 2012/03/08 12:55:33 source Exp $
+ * $Id: blob.c,v 1.16.2.8 2010/05/12 12:24:29 source Exp $
*
* BLOBS
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -2624,15 +2624,15 @@ bh_string_output_n (lock_trx_t * lt, blob_handle_t * bh, int omit, int free_buff
return (string_output);
}
-#define bh_string_list(lt, bh, get_bytes, omit, blob_type) \
+#define bh_string_list(lt, bh, get_bytes, omit) \
((box_tag (bh) == DV_BLOB_WIDE_HANDLE) ? \
- bh_string_list_w (lt, bh, get_bytes, omit, blob_type) : \
- bh_string_list_n (lt, bh, get_bytes, omit, blob_type))
+ bh_string_list_w (lt, bh, get_bytes, omit) : \
+ bh_string_list_n (lt, bh, get_bytes, omit))
dk_set_t
bh_string_list_n (/* this was before 3.0: index_space_t * isp, */ lock_trx_t * lt, blob_handle_t * bh,
- long get_bytes, int omit, long blob_type)
+ long get_bytes, int omit)
{
/* take current page at current place and make string of
n bytes from the place and return as string list */
@@ -2682,14 +2682,10 @@ bh_string_list_n (/* this was before 3.0: index_space_t * isp, */ lock_trx_t * l
SET_DK_MEM_RESERVE_STATE (lt);
itc_bust_this_trx (tmp_itc, &buf, ITC_BUST_THROW);
}
- if (blob_type) /* BLOB_BIN */
- page_string = dk_alloc_box (bytes_on_page, DV_BIN);
- else
- page_string = dk_alloc_box (bytes_on_page + 1, DV_LONG_STRING);
+ page_string = dk_alloc_box (bytes_on_page + 1, DV_LONG_STRING);
memcpy (page_string, buf->bd_buffer + DP_DATA + from_byte,
bytes_on_page);
- if (!blob_type) /* BLOB_BIN */
- page_string[bytes_on_page] = 0;
+ page_string[bytes_on_page] = 0;
dk_set_push (&string_list, page_string);
}
bytes_filled += bytes_on_page;
@@ -3095,11 +3091,12 @@ bh_write_out (lock_trx_t * lt, blob_handle_t * bh, dk_session_t * ses)
void
blob_send_bytes (lock_trx_t * lt, caddr_t bhp, long get_bytes,
- int send_position, long blob_type)
+ int send_position)
{
blob_handle_t *bh = (blob_handle_t *) bhp;
caddr_t arr;
- dk_set_t string_list = bh_string_list (/*NULL,*/ lt, (blob_handle_t *) bhp, get_bytes, 0, blob_type);
+ dk_set_t string_list =
+ bh_string_list (/*NULL,*/ lt, (blob_handle_t *) bhp, get_bytes, 0);
if (BH_DIRTYREAD == string_list)
{
@@ -3180,7 +3177,7 @@ blob_subseq (lock_trx_t * lt, caddr_t bhp, size_t from, size_t to)
if (from)
{
bh->bh_position = 0;
- bh_string_list (/*NULL,*/ lt, bh, (long) from, 1, 0);
+ bh_string_list (/*NULL,*/ lt, bh, (long) from, 1);
}
}
}
@@ -3192,7 +3189,7 @@ blob_subseq (lock_trx_t * lt, caddr_t bhp, size_t from, size_t to)
{
bh->bh_position = 0;
- bh_string_list (/*NULL,*/ lt, bh, (long) from, 1, 0);
+ bh_string_list (/*NULL,*/ lt, bh, (long) from, 1);
}
else
{
@@ -3200,7 +3197,7 @@ blob_subseq (lock_trx_t * lt, caddr_t bhp, size_t from, size_t to)
bh_read_ahead (lt, bh, (unsigned) from, (unsigned) to);
}
}
- string_list = bh_string_list (/*NULL,*/ lt, bh, (long)(to - from), 0, 0);
+ string_list = bh_string_list (/*NULL,*/ lt, bh, (long)(to - from), 0);
strings_ready:
bh->bh_current_page = bh->bh_page;
bh->bh_position = 0;
@@ -3297,7 +3294,7 @@ blob_to_string_isp (lock_trx_t * lt, caddr_t bhp)
}
string_list = bh_string_list (lt, bh,
- 10000000, 0, 0); /* up to 10MB as varchar */
+ 10000000, 0); /* up to 10MB as varchar */
bh->bh_current_page = bh->bh_page;
bh->bh_position = 0;
diff --git a/libsrc/Wi/blobio.c b/libsrc/Wi/blobio.c
index 6109aca..c861f25 100644
--- a/libsrc/Wi/blobio.c
+++ b/libsrc/Wi/blobio.c
@@ -1,7 +1,7 @@
/*
* blobio.c
*
- * $Id: blobio.c,v 1.8.2.7 2012/03/08 12:55:33 source Exp $
+ * $Id: blobio.c,v 1.8.2.5 2010/06/25 16:39:58 source Exp $
*
* Marshallers for DV_BLOB_HANDLE and DV_TIMESTAMP_OBJ
* Should really be part of Dk
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -638,6 +638,15 @@ xx_encrypt_passwd (char *thing, int thing_len, char *user_name)
}
+caddr_t
+box_iri_id (int64 n)
+{
+ iri_id_t * box = (iri_id_t*) dk_alloc_box (sizeof (iri_id_t), DV_IRI_ID);
+ *box = n;
+ return (caddr_t) box;
+}
+
+
void
iri_id_write (iri_id_t * iid, dk_session_t * ses)
{
diff --git a/libsrc/Wi/blobio.h b/libsrc/Wi/blobio.h
index 1676f45..c5dcc91 100644
--- a/libsrc/Wi/blobio.h
+++ b/libsrc/Wi/blobio.h
@@ -1,12 +1,12 @@
/*
* blobio.h
*
- * $Id: blobio.h,v 1.13.2.5 2012/03/08 12:55:33 source Exp $
+ * $Id: blobio.h,v 1.13.2.3 2010/02/01 02:45:58 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -122,6 +122,7 @@ typedef struct blob_layout_s blob_layout_t;
void bh_free (blob_handle_t * bh);
+caddr_t box_iri_id (int64 n);
void iri_id_write (iri_id_t *iid, dk_session_t * ses);
void blobio_init (void);
diff --git a/libsrc/Wi/blog.xsl b/libsrc/Wi/blog.xsl
index d03a462..eb55679 100644
--- a/libsrc/Wi/blog.xsl
+++ b/libsrc/Wi/blog.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: blog.xsl,v 1.4.2.1 2012/03/08 12:55:33 source Exp $
+ - $Id: blog.xsl,v 1.4 2009/04/09 13:22:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/cl_stubs.c b/libsrc/Wi/cl_stubs.c
index 5cbd961..6e99aae 100644
--- a/libsrc/Wi/cl_stubs.c
+++ b/libsrc/Wi/cl_stubs.c
@@ -1,12 +1,12 @@
/*
- * $Id: cl_stubs.c,v 1.1.2.6 2012/03/08 12:55:33 source Exp $
+ * $Id: cl_stubs.c,v 1.1.2.5 2010/02/01 09:26:55 source Exp $
*
* Cluster stubs
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/clrdf23.sql b/libsrc/Wi/clrdf23.sql
index ed97bc4..942ed5c 100644
--- a/libsrc/Wi/clrdf23.sql
+++ b/libsrc/Wi/clrdf23.sql
@@ -1,12 +1,12 @@
--
--- $Id: clrdf23.sql,v 1.1.2.2 2012/03/08 12:55:33 source Exp $
+-- $Id: clrdf23.sql,v 1.1.2.1 2010/02/01 15:15:19 source Exp $
--
-- Migrate to 2+3 layout
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2010 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
diff --git a/libsrc/Wi/cluster.h b/libsrc/Wi/cluster.h
index c075799..5e9f2a4 100644
--- a/libsrc/Wi/cluster.h
+++ b/libsrc/Wi/cluster.h
@@ -1,12 +1,12 @@
/*
- * $Id: cluster.h,v 1.1.2.10 2012/03/08 12:55:33 source Exp $
+ * $Id: cluster.h,v 1.1.2.9 2011/07/20 00:01:06 source Exp $
*
* Cluster data structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/cov_report.xsl b/libsrc/Wi/cov_report.xsl
index 1fbeeea..0bf3e6d 100644
--- a/libsrc/Wi/cov_report.xsl
+++ b/libsrc/Wi/cov_report.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: cov_report.xsl,v 1.3.2.2 2012/03/08 12:55:33 source Exp $
+ - $Id: cov_report.xsl,v 1.3.2.1 2009/04/16 09:48:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/cov_time.xsl b/libsrc/Wi/cov_time.xsl
index 52adffb..4559562 100644
--- a/libsrc/Wi/cov_time.xsl
+++ b/libsrc/Wi/cov_time.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: cov_time.xsl,v 1.5.2.1 2012/03/08 12:55:33 source Exp $
+ - $Id: cov_time.xsl,v 1.5 2009/04/09 13:22:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/crsr.h b/libsrc/Wi/crsr.h
index 68cc09e..822aace 100644
--- a/libsrc/Wi/crsr.h
+++ b/libsrc/Wi/crsr.h
@@ -1,12 +1,12 @@
/*
* csrs.h
*
- * $Id: crsr.h,v 1.2.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: crsr.h,v 1.2.2.1 2009/04/18 21:55:11 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/crypt.c b/libsrc/Wi/crypt.c
index 02fdee5..ffba5f8 100644
--- a/libsrc/Wi/crypt.c
+++ b/libsrc/Wi/crypt.c
@@ -1,14 +1,14 @@
/*
* crypt.c
*
- * $Id: crypt.c,v 1.2.2.2 2012/03/08 12:55:33 source Exp $
+ * $Id: crypt.c,v 1.2.2.1 2009/04/18 21:55:11 source Exp $
*
* one-way crypting
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/date.h b/libsrc/Wi/date.h
index 5e59ba5..cd113b1 100644
--- a/libsrc/Wi/date.h
+++ b/libsrc/Wi/date.h
@@ -1,14 +1,14 @@
/*
* date.h
*
- * $Id: date.h,v 1.4.2.3 2012/03/08 12:55:33 source Exp $
+ * $Id: date.h,v 1.4.2.2 2011/05/10 12:18:50 source Exp $
*
* Date support
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/datesupp.c b/libsrc/Wi/datesupp.c
index 3e4e9da..89a28f9 100644
--- a/libsrc/Wi/datesupp.c
+++ b/libsrc/Wi/datesupp.c
@@ -1,14 +1,14 @@
/*
* datesupp.c
*
- * $Id: datesupp.c,v 1.16.2.7 2012/03/08 12:55:33 source Exp $
+ * $Id: datesupp.c,v 1.16.2.6 2011/05/10 12:18:51 source Exp $
*
* Date support functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/datesupp.h b/libsrc/Wi/datesupp.h
index 8e53691..f5a48d8 100644
--- a/libsrc/Wi/datesupp.h
+++ b/libsrc/Wi/datesupp.h
@@ -1,14 +1,14 @@
/*
* datesupp.c
*
- * $Id: datesupp.h,v 1.7.2.4 2012/03/08 12:55:33 source Exp $
+ * $Id: datesupp.h,v 1.7.2.3 2011/05/10 12:18:51 source Exp $
*
* Date support functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/ddlrun.c b/libsrc/Wi/ddlrun.c
index 58aaaf5..80fb403 100644
--- a/libsrc/Wi/ddlrun.c
+++ b/libsrc/Wi/ddlrun.c
@@ -1,14 +1,14 @@
/*
* ddlrun.c
*
- * $Id: ddlrun.c,v 1.34.2.16 2012/03/08 12:55:33 source Exp $
+ * $Id: ddlrun.c,v 1.34.2.15 2011/08/26 10:57:37 source Exp $
*
* SQL DDL Functionality
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/disk.c b/libsrc/Wi/disk.c
index 0135132..c0aa335 100644
--- a/libsrc/Wi/disk.c
+++ b/libsrc/Wi/disk.c
@@ -1,14 +1,14 @@
/*
* disk.c
*
- * $Id: disk.c,v 1.36.2.30 2012/03/08 12:55:33 source Exp $
+ * $Id: disk.c,v 1.36.2.29 2011/10/13 14:39:34 source Exp $
*
* Managing buffer rings and paging to disk.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/dks_esc.c b/libsrc/Wi/dks_esc.c
index 5fbf293..dc7f3b5 100644
--- a/libsrc/Wi/dks_esc.c
+++ b/libsrc/Wi/dks_esc.c
@@ -1,10 +1,10 @@
/*
- * $Id: dks_esc.c,v 1.13.2.6 2012/03/08 12:55:33 source Exp $
+ * $Id: dks_esc.c,v 1.13.2.4 2010/07/08 13:21:23 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -43,7 +43,7 @@ unsigned char dks_esc_char_props[0x100] = {
/* ` a b c d e f g h i j k l m n o */
'@','@','@','@','@','@','@','@','@','@','@','@','@','@','@','@',
/* p q r s t u v w x y z { | } ~ */
- '@','@','@','@','@','@','@','@','@','@','@','O','R','O','@','R',
+ '@','@','@','@','@','@','@','@','@','@','@','O','@','O','@','@',
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
'A','A','A','A','A','A','A','A','A','A','A','A','A','A','A','A',
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
@@ -84,7 +84,7 @@ unsigned char dks_esc_char_props[0x100] = {
#define REPEAT 'R'
-dks_charclass_props_t dks_charclasses['R'+1-'>'] = {
+dks_charclass_props_t dks_charclasses['Q'+1-'>'] = {
/* |0 |1 |2 |3 |4 |5 |6 |7 |8 |9 |10 |11 |12 |13 |13 */
/* |NONE |PTEXT |SQATTR |DQATTR |COMMENT|CDATA |URI |DAV |URI_R |URI_NR |TTL_SQ |TTL_DQ |TTLIRI |JS_SQ |JS_DQ */
/* > wide */ {0 ,0 ,0 ,0 ,0 ,0 ,PCT ,PCT ,PCT ,PCT ,BSLASHU,BSLASHU,BSLASHU,BSLASHU,BSLASHU},
@@ -106,8 +106,7 @@ dks_charclass_props_t dks_charclasses['R'+1-'>'] = {
/* N / */ {0 ,0 ,0 ,0 ,0 ,0 ,PCT ,0 ,PCT ,0 ,0 ,0 ,0 ,0 ,0 },
/* O * */ {0 ,0 ,0 ,0 ,0 ,0 ,PCT ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 },
/* P punct-! */ {0 ,0 ,0 ,0 ,0 ,0 ,PCT ,0 ,PCT ,0 ,0 ,0 ,0 ,0 ,0 },
-/* Q \ */ {0 ,0 ,0 ,0 ,0 ,0 ,PCT ,0 ,0 ,0 ,BSLASHC,BSLASHC,BSLASHU,BSLASHC,BSLASHC},
-/* R |, 0x7f */ {0 ,0 ,0 ,0 ,0 ,0 ,PCT ,PCT ,PCT ,PCT ,0 ,0 ,0 ,0 ,0 } };
+/* Q \ */ {0 ,0 ,0 ,0 ,0 ,0 ,PCT ,0 ,0 ,0 ,BSLASHC,BSLASHC,BSLASHU,BSLASHC,BSLASHC} };
unsigned char dks_esc_bslashc[0x80] = {
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
diff --git a/libsrc/Wi/eqlcomp.c b/libsrc/Wi/eqlcomp.c
index 0291c26..4415526 100644
--- a/libsrc/Wi/eqlcomp.c
+++ b/libsrc/Wi/eqlcomp.c
@@ -1,14 +1,14 @@
/*
* eqlcomp.c
*
- * $Id: eqlcomp.c,v 1.16.2.16 2012/03/14 19:47:17 source Exp $
+ * $Id: eqlcomp.c,v 1.16.2.14 2011/10/13 10:59:22 source Exp $
*
* SQL Query Node Constructors.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -2455,7 +2455,7 @@ retry_dupe_check:
desc->cd_scale = box_num (6);
}
if (desc->cd_dtp == DV_ANY)
- prec = 0x7fffffff;
+ prec = ROW_MAX_COL_BYTES;
if (IS_BLOB_DTP (desc->cd_dtp))
prec = 0x7fffffff;
desc->cd_precision = box_num (prec);
diff --git a/libsrc/Wi/eqlcomp.h b/libsrc/Wi/eqlcomp.h
index 7e94f7d..e40d9a7 100644
--- a/libsrc/Wi/eqlcomp.h
+++ b/libsrc/Wi/eqlcomp.h
@@ -1,12 +1,12 @@
/*
* eqlcomp.h
*
- * $Id: eqlcomp.h,v 1.8.2.6 2012/03/08 12:55:33 source Exp $
+ * $Id: eqlcomp.h,v 1.8.2.4 2009/12/01 22:38:19 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -46,7 +46,6 @@ query_t *eql_compile_2 (const char *string, client_connection_t * cli, caddr_t *
#define SQLC_QR_TEXT_IS_CONSTANT -8
#define SQLC_IS_RECOMPILE 0x100
#define SQLC_PARSE_ONLY_REC -9
-#define SQLC_STATIC_PRESERVES_TREE -10
query_t *eql_compile (const char *string, client_connection_t * cli);
diff --git a/libsrc/Wi/extent.c b/libsrc/Wi/extent.c
index 94e3b42..ef137d2 100644
--- a/libsrc/Wi/extent.c
+++ b/libsrc/Wi/extent.c
@@ -1,14 +1,14 @@
/*
* extent.c
*
- * $Id: extent.c,v 1.1.2.17 2012/03/08 12:55:33 source Exp $
+ * $Id: extent.c,v 1.1.2.16 2011/07/20 00:01:06 source Exp $
*
* Disk extent management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/extent.h b/libsrc/Wi/extent.h
index a4f6639..68576b3 100644
--- a/libsrc/Wi/extent.h
+++ b/libsrc/Wi/extent.h
@@ -1,12 +1,12 @@
/*
- * $Id: extent.h,v 1.1.2.6 2012/03/08 12:55:33 source Exp $
+ * $Id: extent.h,v 1.1.2.5 2011/07/20 00:01:06 source Exp $
*
* Disk extents
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/ftp.sql b/libsrc/Wi/ftp.sql
index 411c386..140b414 100644
--- a/libsrc/Wi/ftp.sql
+++ b/libsrc/Wi/ftp.sql
@@ -1,10 +1,10 @@
--
--- $Id: ftp.sql,v 1.7.2.3 2012/03/08 12:55:33 source Exp $
+-- $Id: ftp.sql,v 1.7.2.2 2011/09/28 17:01:16 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/gate.c b/libsrc/Wi/gate.c
index 868acbc..82ffa8b 100644
--- a/libsrc/Wi/gate.c
+++ b/libsrc/Wi/gate.c
@@ -1,14 +1,14 @@
/*
* gate.c
*
- * $Id: gate.c,v 1.20.2.10 2012/03/08 12:55:33 source Exp $
+ * $Id: gate.c,v 1.20.2.9 2011/06/10 22:45:37 source Exp $
*
* Hyperspace and gate.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/hash.c b/libsrc/Wi/hash.c
index be355db..b28a0e7 100644
--- a/libsrc/Wi/hash.c
+++ b/libsrc/Wi/hash.c
@@ -1,14 +1,14 @@
/*
* hash.c
*
- * $Id: hash.c,v 1.19.2.21 2012/03/08 12:55:33 source Exp $
+ * $Id: hash.c,v 1.19.2.19 2011/06/01 09:20:51 source Exp $
*
* Hash Index
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1081,10 +1081,9 @@ itc_ha_equal (it_cursor_t * itc, hash_area_t * ha, caddr_t * qst, db_buf_t hash_
}
if (IS_WIDE_STRING_DTP(v_dtp))
{
- if (DVC_MATCH == compare_wide_to_utf8_with_collation (
- (wchar_t *)value, (box_length(value) / sizeof (wchar_t)) - 1,
- (utf8char *) (hash_row + h_off), h_len,
- ssl->ssl_sqt.sqt_collation ) )
+ if (DVC_MATCH == compare_wide_to_utf8 ((caddr_t) (hash_row + h_off),
+ h_len, value, box_length(value) - sizeof (wchar_t),
+ ssl->ssl_sqt.sqt_collation))
continue;
return DVC_LESS;
}
diff --git a/libsrc/Wi/hosting.c b/libsrc/Wi/hosting.c
index 03280cc..049164a 100644
--- a/libsrc/Wi/hosting.c
+++ b/libsrc/Wi/hosting.c
@@ -1,14 +1,14 @@
/*
* hosting.c
*
- * $Id: hosting.c,v 1.11.2.3 2012/03/08 12:55:34 source Exp $
+ * $Id: hosting.c,v 1.11.2.2 2009/05/11 07:36:23 source Exp $
*
* hosting languages plugin type handler
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/hosting.h b/libsrc/Wi/hosting.h
index 5f1b74a..0841353 100644
--- a/libsrc/Wi/hosting.h
+++ b/libsrc/Wi/hosting.h
@@ -1,12 +1,12 @@
/*
* hosting.h
*
- * $Id: hosting.h,v 1.4.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: hosting.h,v 1.4.2.1 2009/04/18 21:55:11 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/hosting.sql b/libsrc/Wi/hosting.sql
index deeee02..03121b4 100644
--- a/libsrc/Wi/hosting.sql
+++ b/libsrc/Wi/hosting.sql
@@ -1,10 +1,10 @@
--
--- $Id: hosting.sql,v 1.7.2.4 2012/03/08 12:55:34 source Exp $
+-- $Id: hosting.sql,v 1.7.2.3 2010/02/09 14:34:24 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/http.c b/libsrc/Wi/http.c
index c43c45c..ff58dd9 100644
--- a/libsrc/Wi/http.c
+++ b/libsrc/Wi/http.c
@@ -1,14 +1,14 @@
/*
* http.c
*
- * $Id: http.c,v 1.71.2.71 2012/03/14 14:07:40 source Exp $
+ * $Id: http.c,v 1.71.2.64 2011/10/13 13:28:18 source Exp $
*
* HTTP access to Virtuoso
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -70,9 +70,6 @@
#else
#include <dirent.h>
#endif
-#ifdef _SSL
-#include "util/sslengine.h"
-#endif
#define XML_VERSION "1.0"
@@ -108,7 +105,7 @@ static id_hash_t * http_url_cache = NULL; /* WS cached URLs */
long http_ses_trap = 0;
int www_maintenance = 0;
-#define MAINTENANCE (NULL != www_maintenance_page && (wi_inst.wi_is_checkpoint_pending || www_maintenance || cpt_is_global_lock ()))
+#define MAINTENANCE (NULL != www_maintenance_page && (wi_inst.wi_is_checkpoint_pending || www_maintenance))
caddr_t
temp_aspx_dir_get (void)
@@ -400,7 +397,7 @@ static int http_acl_check_rate (ws_acl_t * elm, caddr_t name, int check_rate, in
}
static int
-http_acl_match (caddr_t *alist, caddr_t name, ccaddr_t dst, int obj_id, int rw_flag, int check_rate, acl_hit_t ** hit, ws_connection_t * ws)
+http_acl_match (caddr_t *alist, caddr_t name, caddr_t dst, int obj_id, int rw_flag, int check_rate, acl_hit_t ** hit, ws_connection_t * ws)
{
int inx;
DO_BOX (ws_acl_t *, elm, inx, alist)
@@ -411,7 +408,7 @@ http_acl_match (caddr_t *alist, caddr_t name, ccaddr_t dst, int obj_id, int rw_f
ws->ws_body_limit = elm->ha_limit;
if (dst == NULL && obj_id < 0 && rw_flag < 0)
return http_acl_check_rate (elm, name, check_rate, rw_flag, hit);
- else if (dst != NULL && DVC_MATCH == cmp_like (dst, elm->ha_dest ? elm->ha_dest : "*", NULL, 0, LIKE_ARG_CHAR, LIKE_ARG_CHAR))
+ else if (dst != NULL && DVC_MATCH == cmp_like (dst, elm->ha_dest, NULL, 0, LIKE_ARG_CHAR, LIKE_ARG_CHAR))
return http_acl_check_rate (elm, name, check_rate, rw_flag, hit);
else if (dst == NULL && elm->ha_obj == obj_id && rw_flag == elm->ha_rw)
return http_acl_check_rate (elm, name, check_rate, rw_flag, hit);
@@ -433,10 +430,7 @@ ws_check_acl (ws_connection_t * ws, acl_hit_t ** hit)
if (list)
{
- char * vd = ws->ws_req_line ? strchr (ws->ws_req_line, '\x20') : NULL;
- while (vd && isspace (*vd))
- vd++;
- if (http_acl_match (list, ws->ws_client_ip, vd, -1, -1, ACL_CHECK_HITS, hit, ws) > 0) /* 1:deny */
+ if (http_acl_match (list, ws->ws_client_ip, NULL, -1, -1, ACL_CHECK_HITS, hit, ws) > 0) /* 1:deny */
rc = 0;
}
return rc;
@@ -4110,7 +4104,7 @@ ws_serve_connection (ws_connection_t * ws)
SSL * new_ssl = NULL;
if (NULL != tcpses_get_ssl (ses->dks_session))
- sslses_to_tcpses (ses->dks_session);
+ SSL_free ((SSL *) tcpses_get_ssl (ses->dks_session));
to = ses->dks_read_block_timeout;
session_set_control (ses->dks_session, SC_TIMEOUT, (char *)(&to), sizeof (timeout_t));
dst = tcpses_get_fd (ses->dks_session);
@@ -5869,11 +5863,11 @@ http_proxy (ws_connection_t * ws, char * host, caddr_t * req, caddr_t * body, dk
#define ENC_B64_NAME "encode_base64"
#define DEC_B64_NAME "decode_base64"
-char base64_vec[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-char base64url_vec[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_\0";
+static char base64_vec[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
size_t
-encode_base64_impl (char * input, char * output, size_t len, char * table)
+encode_base64(char * input, char * output, size_t len)
{
unsigned char c;
int n = 0,
@@ -5901,7 +5895,7 @@ encode_base64_impl (char * input, char * output, size_t len, char * table)
}
for (i = 3; i >= 0; i--)
- output[x++] = table[enc[i]];
+ output[x++] = base64_vec[enc[i]];
n = 1;
count += 4;
val = c;
@@ -5941,7 +5935,7 @@ encode_base64_impl (char * input, char * output, size_t len, char * table)
if (n)
{
for (i = 3; i >= 0; i--)
- output[x++] = table[enc[i]];
+ output[x++] = base64_vec[enc[i]];
}
return x;
@@ -5972,30 +5966,6 @@ bif_encode_base64(caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return(res);
}
-caddr_t
-bif_encode_base64url(caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t dest;
- caddr_t res;
- caddr_t src = bif_string_arg (qst, args, 0, ENC_B64_NAME);
- dtp_t dtp = DV_TYPE_OF (src);
- size_t len = box_length(src);
-
- if (IS_STRING_DTP(dtp) || dtp == DV_C_STRING)
- len--;
-
- if ((len * 2 + 1) > MAX_BOX_LENGTH)
- sqlr_new_error ("22023", "HT081", "The input string is too large");
-
- dest = dk_alloc_box(len * 2 + 1, DV_SHORT_STRING);
- len = encode_base64_impl ((char *)src, (char *)dest, len, B64_URL);
- *(dest+len) = 0;
-
- res = box_dv_short_string(dest);
- dk_free_box(dest);
- return(res);
-}
-
static void
base64_store24(char ** d, char * c)
{
@@ -6005,7 +5975,7 @@ base64_store24(char ** d, char * c)
}
size_t
-decode_base64_impl (char * src, char * end, char * table)
+decode_base64(char * src, char * end)
{
char * start = src;
char c0, c[4], *p;
@@ -6016,8 +5986,8 @@ decode_base64_impl (char * src, char * end, char * table)
while ((c0 = *src++) && src < end) {
if (c0=='=')
break; /* a = symbol is end padding */
- if ((p=strchr(table, c0))) {
- c[i++]=(char) (p-table);
+ if ((p=strchr(base64_vec, c0))) {
+ c[i++]=(char) (p-base64_vec);
if (i==4) {
base64_store24(&d, c);
i=0;
@@ -6058,26 +6028,6 @@ bif_decode_base64(caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return (res);
}
-caddr_t
-bif_decode_base64url (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t src = bif_string_arg (qst, args, 0, DEC_B64_NAME);
- caddr_t res, buf;
- size_t len, blen;
-
- blen = box_length(src);
- buf = dk_alloc_box(blen, DV_SHORT_STRING);
- memcpy (buf, src, blen);
-
- len = decode_base64_impl (buf, buf + blen, B64_URL);
- res = dk_alloc_box (len + 1, DV_SHORT_STRING);
- memcpy (res, buf, len);
- res[len] = 0;
- dk_free_box(buf);
-
- return (res);
-}
-
dk_session_t *
http_connect (char * uri, caddr_t * err_ret, caddr_t ** head_ret, caddr_t method,
@@ -8186,31 +8136,31 @@ https_cert_verify_callback (int ok, void *_ctx)
SSL_CTX *ssl_ctx;
uptrlong ap;
- ctx = (X509_STORE_CTX *) _ctx;
- ssl = (SSL *) X509_STORE_CTX_get_app_data (ctx);
+ ctx = (X509_STORE_CTX *)_ctx;
+ ssl = (SSL *)X509_STORE_CTX_get_app_data(ctx);
ssl_ctx = SSL_get_SSL_CTX (ssl);
ap = (uptrlong) SSL_CTX_get_app_data (ssl_ctx);
- xs = X509_STORE_CTX_get_current_cert (ctx);
- errnum = X509_STORE_CTX_get_error (ctx);
- errdepth = X509_STORE_CTX_get_error_depth (ctx);
+ xs = X509_STORE_CTX_get_current_cert(ctx);
+ errnum = X509_STORE_CTX_get_error(ctx);
+ errdepth = X509_STORE_CTX_get_error_depth(ctx);
- cp = X509_NAME_oneline (X509_get_subject_name (xs), cp_buf, sizeof (cp_buf));
- cp2 = X509_NAME_oneline (X509_get_issuer_name (xs), cp2_buf, sizeof (cp2_buf));
+ cp = X509_NAME_oneline(X509_get_subject_name(xs), cp_buf, sizeof (cp_buf));
+ cp2 = X509_NAME_oneline(X509_get_issuer_name(xs), cp2_buf, sizeof (cp2_buf));
verify = (int) ((0xff000000 & ap) >> 24);
- depth = (int) (0xffffff & ap);
+ depth = (int) (0xffffff & ap);
- if ((errnum == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
+ if (( errnum == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
|| errnum == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN
|| errnum == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
#if OPENSSL_VERSION_NUMBER >= 0x00905000
- || errnum == X509_V_ERR_CERT_UNTRUSTED
+ || errnum == X509_V_ERR_CERT_UNTRUSTED
#endif
|| errnum == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE)
&& verify == HTTPS_VERIFY_OPTIONAL_NO_CA )
{
- SSL_set_verify_result (ssl, X509_V_OK);
+ SSL_set_verify_result(ssl, X509_V_OK);
ok = 1;
}
@@ -8233,23 +8183,20 @@ https_cert_verify_callback (int ok, void *_ctx)
int
ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * cert_name, char * key_name)
{
- char err_buf[1024];
- EVP_PKEY *pkey;
- X509 *x509;
-
+ char err_buf [1024];
if (strstr (cert_name, "db:") == cert_name || strstr (key_name, "db:") == key_name)
{
- xenc_key_t *k;
- client_connection_t *cli = GET_IMMEDIATE_CLIENT_OR_NULL;
- user_t *saved_user;
+ xenc_key_t * k;
+ client_connection_t * cli = GET_IMMEDIATE_CLIENT_OR_NULL;
+ user_t * saved_user;
if (!cli)
{
- log_error ("SSL: The certificate and private key stored in the database cannot be accessed");
+ log_error ("The certificate & key stored in database cannot be accessed.");
return 0;
}
if (strcmp (cert_name, key_name))
{
- log_error ("SSL: The certificate and private key stored in the database must have the same name");
+ log_error ("The certificate & key stored in database must have same name");
return 0;
}
saved_user = cli->cli_user;
@@ -8259,37 +8206,42 @@ ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * cert_name, char * key_name)
cli->cli_user = saved_user;
if (!k || !k->xek_x509 || !k->xek_evp_private_key)
{
- log_error ("SSL: The stored key '%s' is invalid", key_name);
+ log_error ("Invalid stored key %s", key_name);
+ return 0;
+ }
+ if (SSL_CTX_use_certificate (ssl_ctx, k->xek_x509) <= 0)
+ {
+ cli_ssl_get_error_string (err_buf, sizeof (err_buf));
+ log_error ("Invalid X509 certificate file %s : %s", cert_name, err_buf);
+ return 0;
+ }
+ if (SSL_CTX_use_PrivateKey (ssl_ctx, k->xek_evp_private_key) <= 0)
+ {
+ cli_ssl_get_error_string (err_buf, sizeof (err_buf));
+ log_error ("Invalid X509 private key file %s : %s", key_name, err_buf);
return 0;
}
- x509 = k->xek_x509;
- pkey = k->xek_evp_private_key;
}
else
{
- if ((x509 = ssl_load_x509 (cert_name)) == NULL)
+ if (SSL_CTX_use_certificate_file (ssl_ctx, cert_name, SSL_FILETYPE_PEM) <= 0)
{
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- log_error ("SSL: Unable to load certificate '%s': %s", cert_name, err_buf);
+ log_error ("Invalid X509 certificate file %s : %s", cert_name, err_buf);
return 0;
}
- if ((pkey = ssl_load_privkey (key_name, NULL)) == NULL)
+ if (SSL_CTX_use_PrivateKey_file (ssl_ctx, key_name, SSL_FILETYPE_PEM) <= 0)
{
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- log_error ("SSL: Unable to load private key '%s': %s", key_name, err_buf);
+ log_error ("Invalid X509 private key file %s : %s", key_name, err_buf);
return 0;
}
}
- if (SSL_CTX_use_certificate (ssl_ctx, x509) <= 0)
- {
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- log_error ("SSL: Unable to use certificate '%s': %s", cert_name, err_buf);
- return 0;
- }
- if (SSL_CTX_use_PrivateKey (ssl_ctx, pkey) <= 0)
+ if (!SSL_CTX_check_private_key (ssl_ctx))
{
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- log_error ("SSL: Unable to use private key '%s': %s", key_name, err_buf);
+ log_error ("X509 Private key %s does not match the X509 certificate public key %s : %s",
+ key_name, cert_name, err_buf);
return 0;
}
return 1;
@@ -8298,15 +8250,15 @@ ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * cert_name, char * key_name)
int
http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts)
{
- char err_buf[1024];
- SSL_CTX *ssl_ctx = NULL;
+ char err_buf [1024];
+ SSL_CTX* ssl_ctx = NULL;
const SSL_METHOD *ssl_meth = NULL;
- char *https_cvfile = NULL;
+ char * https_cvfile = NULL;
char *cert = NULL;
char *skey = NULL;
long https_cvdepth = -1;
int i, len, https_client_verify = -1;
- ssl_meth = SSLv23_server_method ();
+ ssl_meth = SSLv23_server_method();
ssl_ctx = SSL_CTX_new (ssl_meth);
/* Initialize the parameters */
@@ -8319,22 +8271,22 @@ http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts)
for (i = 0; i < len; i += 2)
{
- if (https_opts[i] && DV_STRINGP (https_opts[i]))
+ if (https_opts [i] && DV_STRINGP (https_opts [i]))
{
- if (!stricmp (https_opts[i], "https_cv") && DV_STRINGP (https_opts[i + 1])) /* CA file */
- https_cvfile = https_opts[i + 1];
- else if (!stricmp (https_opts[i], "https_cert") && DV_STRINGP (https_opts[i + 1])) /* x509 cert */
- cert = https_opts[i + 1];
- else if (!stricmp (https_opts[i], "https_key") && DV_STRINGP (https_opts[i + 1])) /* private key */
- skey = https_opts[i + 1];
- else if (!stricmp (https_opts[i], "https_cv_depth")) /* verification depth */
- https_cvdepth = unbox (https_opts[i + 1]);
- else if (!stricmp (https_opts[i], "https_verify")) /* verify mode */
- https_client_verify = unbox (https_opts[i + 1]);
+ if (!stricmp (https_opts [i], "https_cv") && DV_STRINGP (https_opts [i + 1])) /* CA file */
+ https_cvfile = https_opts [i + 1];
+ else if (!stricmp (https_opts [i], "https_cert") && DV_STRINGP (https_opts [i + 1])) /* x509 cert */
+ cert = https_opts [i + 1];
+ else if (!stricmp (https_opts [i], "https_key") && DV_STRINGP (https_opts [i + 1])) /* private key */
+ skey = https_opts [i + 1];
+ else if (!stricmp (https_opts [i], "https_cv_depth")) /* verification depth */
+ https_cvdepth = unbox(https_opts [i + 1]);
+ else if (!stricmp (https_opts [i], "https_verify")) /* verify mode */
+ https_client_verify = unbox(https_opts [i + 1]);
}
}
- if (https_client_verify < 0 && NULL != https_cvfile) /* compatibility with existing definitions */
+ if (https_client_verify < 0 && NULL != https_cvfile) /* compatibility with existing definitions */
https_client_verify = 1;
if (!ssl_ctx)
@@ -8344,9 +8296,6 @@ http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts)
goto err_exit;
}
- if (!ssl_server_set_certificate (ssl_ctx, cert, skey))
- goto err_exit;
-
if (https_cvfile)
{
if (!SSL_CTX_load_verify_locations (ssl_ctx, https_cvfile, NULL))
@@ -8356,6 +8305,8 @@ http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts)
goto err_exit;
}
}
+ if (ssl_server_set_certificate (ssl_ctx, cert, skey) <= 0)
+ goto err_exit;
if (https_client_verify > 0)
{
@@ -8370,29 +8321,29 @@ http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts)
SSL_CTX_set_verify_depth (ssl_ctx, https_cvdepth);
ap = ((0xff & https_client_verify) << 24) | (0xffffff & https_cvdepth);
SSL_CTX_set_app_data (ssl_ctx, ap);
- SSL_CTX_set_session_id_context (ssl_ctx, (unsigned char *) &session_id_context, sizeof session_id_context);
+ SSL_CTX_set_session_id_context(ssl_ctx, (unsigned char *)&session_id_context, sizeof session_id_context);
}
if (https_cvfile)
{
int i = 0;
- STACK_OF (X509_NAME) * skCAList = SSL_load_client_CA_file (https_cvfile);
+ STACK_OF(X509_NAME) *skCAList = SSL_load_client_CA_file (https_cvfile);
SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
- skCAList = SSL_CTX_get_client_CA_list (ssl_ctx);
+ skCAList = SSL_CTX_get_client_CA_list(ssl_ctx);
- if (sk_X509_NAME_num (skCAList) == 0)
- log_warning ("HTTPS: Client authentication requested but no CA known for verification");
+ if (sk_X509_NAME_num(skCAList) == 0)
+ log_warning ("HTTPS Client authentication requested but no CA known for verification");
- for (i = 0; i < sk_X509_NAME_num (skCAList); i++)
+ for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
{
char ca_buf[1024];
X509_NAME *ca_name = (X509_NAME *) sk_X509_NAME_value (skCAList, i);
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
- log_debug ("HTTPS: Using X509 Client CA %s", ca_buf);
+ log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
}
}
- tcpses_set_sslctx (listening->dks_session, (void *) ssl_ctx);
+ tcpses_set_sslctx (listening->dks_session, (void *)ssl_ctx);
return 1;
err_exit:
SSL_CTX_free (ssl_ctx);
@@ -9977,12 +9928,10 @@ http_on_message_ses_dropped (dk_session_t * ses)
static caddr_t
bif_http_on_message (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
- query_instance_t *qi = (query_instance_t *)qst;
caddr_t *conn = (caddr_t *) bif_arg (qst, args, 0, "http_on_message");
caddr_t func = bif_string_arg (qst, args, 1, "http_on_message");
caddr_t cd = bif_arg (qst, args, 2, "http_on_message");
dk_session_t * ses = NULL;
- ws_connection_t * ws = qi->qi_client->cli_ws;
if (DV_CONNECTION == DV_TYPE_OF (conn))
{
@@ -9992,17 +9941,6 @@ bif_http_on_message (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
else
ses = NULL;
}
- else if (ws && ws->ws_session)
- {
- /* We should mark the session so it will not be disconnected nor freed */
- if (ws->ws_flushed)
- sqlr_new_error ("42000", "HT000", "The client session is already flushed");
- mutex_enter (thread_mtx);
- ses = qi->qi_client->cli_ws->ws_session;
- ws->ws_session->dks_ws_status = DKS_WS_CACHED;
- ws->ws_session->dks_n_threads++;
- mutex_leave (thread_mtx);
- }
if (ses == NULL)
sqlr_new_error ("22023", "HT000", "The http_on_message expects an open connection as 1-st argument");
@@ -10265,8 +10203,6 @@ http_init_part_one ()
bif_define_typed ("http_request_status_get", bif_http_request_status_get, &bt_varchar);
bif_define_typed (ENC_B64_NAME, bif_encode_base64, &bt_varchar);
bif_define_typed (DEC_B64_NAME, bif_decode_base64, &bt_varchar);
- bif_define_typed ("encode_base64url", bif_encode_base64url, &bt_varchar);
- bif_define_typed ("decode_base64url", bif_decode_base64url, &bt_varchar);
bif_define_typed ("http_root", bif_http_root, &bt_varchar);
bif_define_typed ("dav_root", bif_dav_root, &bt_varchar);
bif_define_typed ("http_path", bif_http_path, &bt_varchar);
@@ -10493,8 +10429,6 @@ http_init_part_two ()
/* CRYPTO_malloc_init();*/
SSL_load_error_strings();
SSLeay_add_ssl_algorithms();
- if (!https_key) /* when key & certificate are in same file */
- https_key = https_cert;
if (https_port && https_cert && https_key)
{
char err_buf [1024];
@@ -10506,20 +10440,20 @@ http_init_part_two ()
{
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
log_error ("HTTPS: Error allocating SSL context: %s", err_buf);
- goto init_ssl_exit;
+ call_exit(-1);
}
- if (!ssl_server_set_certificate (ssl_ctx, https_cert, https_key))
- goto init_ssl_exit;
-
if (https_client_verify_file)
- {
if (!SSL_CTX_load_verify_locations (ssl_ctx, https_client_verify_file, NULL))
{
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
log_error ("HTTPS: Invalid X509 client CA file %s : %s", https_client_verify_file, err_buf);
- goto init_ssl_exit;
+ call_exit(-1);
}
+
+ if (ssl_server_set_certificate (ssl_ctx, https_cert, https_key) <= 0)
+ {
+ call_exit(-1);
}
if (https_client_verify > 0)
@@ -10538,7 +10472,7 @@ http_init_part_two ()
SSL_CTX_set_session_id_context(ssl_ctx, (unsigned char *)&session_id_context, sizeof session_id_context);
}
- if (https_client_verify_file)
+ if (NULL != https_client_verify_file)
{
int i;
STACK_OF(X509_NAME) *skCAList = SSL_load_client_CA_file (https_client_verify_file);
@@ -10546,44 +10480,45 @@ http_init_part_two ()
SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
skCAList = SSL_CTX_get_client_CA_list (ssl_ctx);
if (sk_X509_NAME_num(skCAList) == 0)
- log_warning ("HTTPS: Client authentication requested but no CA known for verification");
+ log_warning ("HTTPS Client authentication requested but no CA known for verification");
for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
{
char ca_buf[1024];
X509_NAME *ca_name = (X509_NAME *) sk_X509_NAME_value (skCAList, i);
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
- log_debug ("HTTPS: Using X509 Client CA %s", ca_buf);
+ log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
}
}
ssl_port = atoi (https_port);
if (ssl_port <= 0)
{
- log_error ("HTTPS: SSL port is invalid");
- goto init_ssl_exit;
+ log_error ("SSL port is not valid port number");
+ call_exit(-1);
}
ssl_listen = dk_session_allocate (SESCLASS_TCPIP);
tcpses_set_sslctx (ssl_listen->dks_session, (void *)ssl_ctx);
- SESSION_SCH_DATA (ssl_listen)->sio_default_read_ready_action = (io_action_func) ws_ready;
+ SESSION_SCH_DATA (ssl_listen)->sio_default_read_ready_action
+ = (io_action_func) ws_ready;
if (SER_SUCC != session_set_address (ssl_listen->dks_session, https_port))
{
- log_error ("HTTPS: Failed setting listen address at %s", https_port);
- goto init_ssl_exit;
+ log_error ("Failed setting the HTTPS listen address at %s.", https_port);
+ call_exit (-1);
}
session_listen (ssl_listen->dks_session);
+
if (!SESSTAT_ISSET (ssl_listen->dks_session, SST_LISTENING))
{
- log_error ("HTTPS: Failed listen at %s", https_port);
- goto init_ssl_exit;
- }
-
- log_info ("HTTPS server online at %s", https_port);
-
- init_ssl_exit:
- ;
+ log_error ("Failed HTTPS listen at %s.", https_port);
+ call_exit (-1);
+ };
+ log_info ((char *) (https_client_verify ?
+ "HTTPS/X509 server online at %s" :
+ "HTTPS server online at %s"),
+ https_port);
}
#endif
diff --git a/libsrc/Wi/http.h b/libsrc/Wi/http.h
index 8281e96..91d59f7 100644
--- a/libsrc/Wi/http.h
+++ b/libsrc/Wi/http.h
@@ -1,14 +1,14 @@
/*
* http.h
*
- * $Id: http.h,v 1.22.2.19 2012/03/08 12:55:34 source Exp $
+ * $Id: http.h,v 1.22.2.17 2011/10/13 13:11:18 source Exp $
*
* Definitions for HTTP server
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -330,7 +330,7 @@ the order of columns in dks_charclasses, file dks_esc.c */
extern unsigned char dks_esc_char_props[0x100];
typedef unsigned char dks_charclass_props_t[COUNTOF__DKS_ESC];
-extern dks_charclass_props_t dks_charclasses['R'+1-'>'];
+extern dks_charclass_props_t dks_charclasses['Q'+1-'>'];
#define DKS_ESC_CHARCLASS_ACTION(wc,mode) (dks_charclasses[((wc & ~0xff) ? 0 : (dks_esc_char_props[wc] - '>'))][mode])
#define isdatechar(c) (('\0' != (c)) && (NULL != strchr ("0123456789 GMTZ:-", (c))))
@@ -350,15 +350,8 @@ caddr_t ws_get_opt (caddr_t * opts, char *opt_name, char * def);
void session_buffered_read_n (dk_session_t * ses, char *buf, int max, int *inx);
-extern char base64_vec[];
-extern char base64url_vec[];
-#define B64_CANON base64_vec
-#define B64_URL base64url_vec
-
-size_t decode_base64_impl (char * src, char * end, char * table);
-size_t encode_base64_impl (char * input, char * output, size_t len, char * table);
-#define decode_base64(src,end) decode_base64_impl ((src), (end), B64_CANON)
-#define encode_base64(input,output,len) encode_base64_impl ((input), (output), (len), B64_CANON)
+size_t decode_base64(char * src, char * end);
+size_t encode_base64(char * input, char * output, size_t len);
void ws_strses_reply (ws_connection_t * ws, const char * volatile code);
void ws_write_failed (ws_connection_t * ws);
diff --git a/libsrc/Wi/http_auth.sql b/libsrc/Wi/http_auth.sql
index 8309d52..84c95d3 100644
--- a/libsrc/Wi/http_auth.sql
+++ b/libsrc/Wi/http_auth.sql
@@ -1,12 +1,12 @@
--
--- $Id: http_auth.sql,v 1.3.2.4 2012/03/08 12:55:34 source Exp $
+-- $Id: http_auth.sql,v 1.3.2.3 2011/10/13 11:03:35 source Exp $
--
-- Authenticate against names and passwords in SYS_USERS, using HP_SECURITY for level
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/http_client.c b/libsrc/Wi/http_client.c
index 2b27d07..d9edc8c 100644
--- a/libsrc/Wi/http_client.c
+++ b/libsrc/Wi/http_client.c
@@ -1,14 +1,14 @@
/*
* http_client.c
*
- * $Id: http_client.c,v 1.19.2.22 2012/03/08 12:55:34 source Exp $
+ * $Id: http_client.c,v 1.19.2.20 2011/04/29 11:56:19 source Exp $
*
* HTTP client for Virtuoso
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1150,7 +1150,6 @@ http_cli_parse_resp_hdr (http_cli_ctx * ctx, char* hdr, int num_chars)
if (!strnicmp ("Content-Length:", hdr, 15))
{
ctx->hcctx_resp_content_length = atol (hdr + 15);
- ctx->hcctx_resp_content_len_recd = 1;
if (ctx->hcctx_resp_content_length < 0)
{
@@ -1276,7 +1275,7 @@ http_cli_read_resp_body (http_cli_ctx * ctx)
if (F_ISSET (ctx, HC_F_BODY_READ)) return (HC_RET_OK);
ctx->hcctx_state = HC_STATE_READ_RESP_BODY;
- if (!ctx->hcctx_resp_content_length && !ctx->hcctx_is_chunked && (!ctx->hcctx_close || ctx->hcctx_resp_content_len_recd))
+ if (!ctx->hcctx_resp_content_length && !ctx->hcctx_is_chunked && !ctx->hcctx_close)
return (HC_RET_OK);
if (ctx->hcctx_method == HC_METHOD_HEAD || ctx->hcctx_respcode == 304)
@@ -2156,7 +2155,6 @@ http_cli_req_init (http_cli_ctx * ctx)
ctx->hcctx_is_chunked = 0;
ctx->hcctx_respcode = 0;
ctx->hcctx_resp_content_length = 0;
- ctx->hcctx_resp_content_len_recd = 0;
}
return (HC_RET_OK);
}
@@ -2190,7 +2188,6 @@ http_cli_resp_reset (http_cli_ctx * ctx)
ctx->hcctx_is_chunked = 0;
ctx->hcctx_respcode = 0;
ctx->hcctx_resp_content_length = 0;
- ctx->hcctx_resp_content_len_recd = 0;
}
HC_RET
diff --git a/libsrc/Wi/http_client.h b/libsrc/Wi/http_client.h
index 71852a4..9d15bca 100644
--- a/libsrc/Wi/http_client.h
+++ b/libsrc/Wi/http_client.h
@@ -1,10 +1,10 @@
/*
- * $Id: http_client.h,v 1.5.2.7 2012/03/08 12:55:34 source Exp $
+ * $Id: http_client.h,v 1.5.2.5 2010/06/25 16:41:24 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -188,7 +188,6 @@ typedef struct http_cli_ctx_s
dk_session_t * hcctx_prv_req_hdrs;
dk_session_t * hcctx_req_body;
char hcctx_resp_content_is_strses;
- char hcctx_resp_content_len_recd;
long hcctx_resp_content_length;
caddr_t hcctx_response;
dk_set_t hcctx_resp_hdrs;
diff --git a/libsrc/Wi/information_schema.sql b/libsrc/Wi/information_schema.sql
index 9713b1c..4fc439d 100644
--- a/libsrc/Wi/information_schema.sql
+++ b/libsrc/Wi/information_schema.sql
@@ -1,14 +1,14 @@
--
-- information schema.sql
--
--- $Id: information_schema.sql,v 1.10.2.1 2012/03/08 12:55:34 source Exp $
+-- $Id: information_schema.sql,v 1.10 2009/01/19 09:02:33 source Exp $
--
-- INFORMATION schema support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/insert.c b/libsrc/Wi/insert.c
index 7485ba8..f79472c 100644
--- a/libsrc/Wi/insert.c
+++ b/libsrc/Wi/insert.c
@@ -1,14 +1,14 @@
/*
* insert.c
*
- * $Id: insert.c,v 1.19.2.12 2012/03/08 12:55:34 source Exp $
+ * $Id: insert.c,v 1.19.2.11 2010/11/09 10:59:15 source Exp $
*
* Insert
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/inxop.c b/libsrc/Wi/inxop.c
index 171386c..85d5582 100644
--- a/libsrc/Wi/inxop.c
+++ b/libsrc/Wi/inxop.c
@@ -1,14 +1,14 @@
/*
* inxop.c
*
- * $Id: inxop.c,v 1.21.2.5 2012/03/08 12:55:34 source Exp $
+ * $Id: inxop.c,v 1.21.2.4 2010/08/26 18:03:48 source Exp $
*
* SQL query execution
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/iodbcinst.c b/libsrc/Wi/iodbcinst.c
index 7303845..476be70 100644
--- a/libsrc/Wi/iodbcinst.c
+++ b/libsrc/Wi/iodbcinst.c
@@ -1,7 +1,7 @@
/*
* iodbcinst.c
*
- * $Id: iodbcinst.c,v 1.4.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: iodbcinst.c,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
*
* Minimum set of ODBC Installer code to allow Virtuoso to edit odbc.ini
* udbc.ini and odbcinst.ini files
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/iodbcinst.h b/libsrc/Wi/iodbcinst.h
index 1b2a42b..faf39ad 100644
--- a/libsrc/Wi/iodbcinst.h
+++ b/libsrc/Wi/iodbcinst.h
@@ -1,13 +1,13 @@
/*
* iodbcinst.h
*
- * $Id: iodbcinst.h,v 1.4.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: iodbcinst.h,v 1.4 2009/04/09 13:22:12 source Exp $
*
* iODBC Installer defines
*
* The iODBC driver manager.
*
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1999 by OpenLink Software <iodbc at openlinksw.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/libsrc/Wi/jso.c b/libsrc/Wi/jso.c
index cd787a9..e1927c4 100644
--- a/libsrc/Wi/jso.c
+++ b/libsrc/Wi/jso.c
@@ -1,12 +1,12 @@
/*
* jso.c
*
- * $Id: jso.c,v 1.21.2.4 2012/03/08 12:55:34 source Exp $
+ * $Id: jso.c,v 1.21.2.2 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -231,19 +231,6 @@ bif_jso_delete (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
case JSO_STATUS_NEW: break;
default: goto end_delete_private_members; /* see below */
}
-#ifndef NDEBUG
- for (fld_ctr = cd->_.sd.jsosd_field_count; fld_ctr--; /*no step*/)
- {
- jso_field_descr_t *fldd = cd->_.sd.jsosd_field_list + fld_ctr;
- jso_class_descr_t *fld_type_cd = gethash (fldd->jsofd_type, jso_classes);
- jso_rtti_t *sub = (jso_rtti_t *)(JSO_FIELD_PTR (inst, fldd)[0]);
- if ((JSO_PRIVATE == fldd->jsofd_required) && (NULL != sub))
- {
- if ((NULL == fld_type_cd) && (DV_CUSTOM != DV_TYPE_OF (sub)))
- dk_check_tree (sub);
- }
- }
-#endif
for (fld_ctr = cd->_.sd.jsosd_field_count; fld_ctr--; /*no step*/)
{
jso_field_descr_t *fldd = cd->_.sd.jsosd_field_list + fld_ctr;
diff --git a/libsrc/Wi/jso.h b/libsrc/Wi/jso.h
index 49d2504..1020124 100644
--- a/libsrc/Wi/jso.h
+++ b/libsrc/Wi/jso.h
@@ -1,12 +1,12 @@
/*
* jso.h
*
- * $Id: jso.h,v 1.12.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: jso.h,v 1.12.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/jso_reformat.awk b/libsrc/Wi/jso_reformat.awk
index 3ffb643..26b79fb 100644
--- a/libsrc/Wi/jso_reformat.awk
+++ b/libsrc/Wi/jso_reformat.awk
@@ -1,14 +1,14 @@
#
# jso_metameta.awk
#
-# $Id: jso_reformat.awk,v 1.8.2.2 2012/03/08 12:55:34 source Exp $
+# $Id: jso_reformat.awk,v 1.8.2.1 2009/04/18 21:55:12 source Exp $
#
# Embeds SQL code into a C file
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/json.l b/libsrc/Wi/json.l
index b54fe36..9302cd3 100644
--- a/libsrc/Wi/json.l
+++ b/libsrc/Wi/json.l
@@ -1,10 +1,10 @@
/*
- * $Id: json.l,v 1.5.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: json.l,v 1.5.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/json.y b/libsrc/Wi/json.y
index 5dcbc50..c279278 100644
--- a/libsrc/Wi/json.y
+++ b/libsrc/Wi/json.y
@@ -1,10 +1,10 @@
/*
- * $Id: json.y,v 1.9.2.3 2012/03/08 12:55:34 source Exp $
+ * $Id: json.y,v 1.9.2.2 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/json_l.c b/libsrc/Wi/json_l.c
index 5492db5..634160d 100644
--- a/libsrc/Wi/json_l.c
+++ b/libsrc/Wi/json_l.c
@@ -543,12 +543,12 @@ static int yy_more_len = 0;
char *jsonyytext;
#line 1 "./json.l"
/*
- * $Id: json.l,v 1.5.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: json.l,v 1.5.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -670,7 +670,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( jsonyytext, jsonyyleng, 1, jsonyyout )) {} } while (0)
+#define ECHO fwrite( jsonyytext, jsonyyleng, 1, jsonyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -681,7 +681,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( jsonyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/libsrc/Wi/json_p.c b/libsrc/Wi/json_p.c
index 1d87d34..fe7c098 100644
--- a/libsrc/Wi/json_p.c
+++ b/libsrc/Wi/json_p.c
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,7 +29,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -45,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -53,64 +55,17 @@
/* Pure parsers. */
#define YYPURE 0
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
-#define yyparse jsonyyparse
-#define yylex jsonyylex
-#define yyerror jsonyyerror
-#define yylval jsonyylval
-#define yychar jsonyychar
-#define yydebug jsonyydebug
-#define yynerrs jsonyynerrs
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
-#line 24 "./json.y"
-
-#include <Dk.h>
-#include "sqlparext.h"
-#include "sqlfn.h"
-
-#define jsonyyerror(str) jsonyyerror_impl(str)
-void jsonyyerror_impl(const char *s);
-int jsonyy_string_input (char *buf, int max);
-caddr_t *json_tree;
-caddr_t json_str;
-int jsonyydebug;
-int jsonyylex (void);
-int json_line;
-
-
-/* Line 189 of yacc.c */
-#line 96 "json_p.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
+#define yyparse jsonyyparse
+#define yylex jsonyylex
+#define yyerror jsonyyerror
+#define yylval jsonyylval
+#define yychar jsonyychar
+#define yydebug jsonyydebug
+#define yynerrs jsonyynerrs
/* Tokens. */
@@ -148,33 +103,64 @@ int json_line;
+/* Copy the first part of user declarations. */
+#line 24 "./json.y"
+
+#include <Dk.h>
+#include "sqlparext.h"
+#include "sqlfn.h"
+
+#define jsonyyerror(str) jsonyyerror_impl(str)
+void jsonyyerror_impl(const char *s);
+int jsonyy_string_input (char *buf, int max);
+caddr_t *json_tree;
+caddr_t json_str;
+int jsonyydebug;
+int jsonyylex (void);
+int json_line;
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c */
#line 39 "./json.y"
-
+{
caddr_t box;
caddr_t *list;
dk_set_t set;
-
-
-
-/* Line 214 of yacc.c */
-#line 166 "json_p.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 187 of yacc.c. */
+#line 151 "json_p.c"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
+
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 178 "json_p.c"
+/* Line 216 of yacc.c. */
+#line 164 "json_p.c"
#ifdef short
# undef short
@@ -224,7 +210,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -249,14 +235,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -337,9 +323,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -373,12 +359,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -585,18 +571,9 @@ static const yytype_uint8 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
+ Once GCC version 2 has supplanted version 1, this can go. */
#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -653,7 +630,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -764,20 +741,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -811,11 +785,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -1095,8 +1069,10 @@ yydestruct (yymsg, yytype, yyvaluep)
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1112,10 +1088,11 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */
-/* The lookahead symbol. */
+
+/* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
/* Number of syntax errors so far. */
@@ -1123,9 +1100,9 @@ int yynerrs;
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1149,68 +1126,66 @@ yyparse ()
#endif
#endif
{
+
+ int yystate;
+ int yyn;
+ int yyresult;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Look-ahead token as an internal (translated) token number. */
+ int yytoken = 0;
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char yymsgbuf[128];
+ char *yymsg = yymsgbuf;
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss = yyssa;
+ yytype_int16 *yyssp;
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
- YYSIZE_T yystacksize;
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+
+ YYSIZE_T yystacksize = YYINITDEPTH;
- int yyn;
- int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
+
yyssp = yyss;
yyvsp = yyvs;
@@ -1240,6 +1215,7 @@ yyparse ()
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
+
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -1247,6 +1223,7 @@ yyparse ()
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -1269,8 +1246,9 @@ yyparse ()
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1281,6 +1259,7 @@ yyparse ()
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1290,9 +1269,6 @@ yyparse ()
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
- if (yystate == YYFINAL)
- YYACCEPT;
-
goto yybackup;
/*-----------.
@@ -1301,16 +1277,16 @@ yyparse ()
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
+ look-ahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1342,16 +1318,20 @@ yybackup:
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1391,22 +1371,16 @@ yyreduce:
switch (yyn)
{
case 2:
-
-/* Line 1464 of yacc.c */
#line 71 "./json.y"
{ json_tree = (caddr_t *) (yyvsp[(1) - (1)].box); }
break;
case 3:
-
-/* Line 1464 of yacc.c */
#line 72 "./json.y"
{ json_tree = (caddr_t *) (yyvsp[(1) - (1)].box); }
break;
case 4:
-
-/* Line 1464 of yacc.c */
#line 75 "./json.y"
{
(yyval.box) = (caddr_t)t_list_to_array (
@@ -1422,36 +1396,26 @@ yyreduce:
break;
case 5:
-
-/* Line 1464 of yacc.c */
#line 89 "./json.y"
{ (yyval.set) = NULL; }
break;
case 7:
-
-/* Line 1464 of yacc.c */
#line 93 "./json.y"
{ (yyval.set) = (yyvsp[(1) - (1)].set); }
break;
case 8:
-
-/* Line 1464 of yacc.c */
#line 94 "./json.y"
{ (yyval.set) = t_NCONC ((yyvsp[(1) - (3)].set), (yyvsp[(3) - (3)].set)); }
break;
case 9:
-
-/* Line 1464 of yacc.c */
#line 95 "./json.y"
{ jsonyyerror ("pair of field name and value is expected after ','"); }
break;
case 10:
-
-/* Line 1464 of yacc.c */
#line 99 "./json.y"
{
dk_set_t set = NULL;
@@ -1461,107 +1425,78 @@ yyreduce:
break;
case 11:
-
-/* Line 1464 of yacc.c */
#line 104 "./json.y"
{ jsonyyerror ("value is expected after ':'"); }
break;
case 12:
-
-/* Line 1464 of yacc.c */
#line 105 "./json.y"
{ jsonyyerror ("colon is expected after field name"); }
break;
case 13:
-
-/* Line 1464 of yacc.c */
#line 110 "./json.y"
{ (yyval.box) = (caddr_t)t_list_to_array ((yyvsp[(2) - (3)].set));}
break;
case 14:
-
-/* Line 1464 of yacc.c */
#line 114 "./json.y"
{ (yyval.set) = NULL; }
break;
case 16:
-
-/* Line 1464 of yacc.c */
#line 119 "./json.y"
{ (yyval.set) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 17:
-
-/* Line 1464 of yacc.c */
#line 120 "./json.y"
{ (yyval.set) = t_NCONC ((yyvsp[(1) - (3)].set), t_CONS((yyvsp[(3) - (3)].box), NULL)); }
break;
case 18:
-
-/* Line 1464 of yacc.c */
#line 121 "./json.y"
{ jsonyyerror ("array member is expected after ','"); }
break;
case 19:
-
-/* Line 1464 of yacc.c */
#line 125 "./json.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 20:
-
-/* Line 1464 of yacc.c */
#line 126 "./json.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 21:
-
-/* Line 1464 of yacc.c */
#line 127 "./json.y"
{ (yyval.box) = t_box_num (1); }
break;
case 22:
-
-/* Line 1464 of yacc.c */
#line 128 "./json.y"
{ (yyval.box) = t_box_num (0); }
break;
case 23:
-
-/* Line 1464 of yacc.c */
#line 129 "./json.y"
{ (yyval.box) = t_alloc_box (0, DV_DB_NULL); }
break;
case 24:
-
-/* Line 1464 of yacc.c */
#line 130 "./json.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 25:
-
-/* Line 1464 of yacc.c */
#line 131 "./json.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
-
-/* Line 1464 of yacc.c */
-#line 1565 "json_p.c"
+/* Line 1267 of yacc.c. */
+#line 1500 "json_p.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1572,6 +1507,7 @@ yyreduce:
*++yyvsp = yyval;
+
/* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -1636,7 +1572,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -1653,7 +1589,7 @@ yyerrlab:
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -1710,6 +1646,9 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -1734,7 +1673,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -1745,7 +1684,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
@@ -1771,8 +1710,6 @@ yyreturn:
}
-
-/* Line 1684 of yacc.c */
#line 134 "./json.y"
diff --git a/libsrc/Wi/json_p.h b/libsrc/Wi/json_p.h
index a0e38b5..f7edc3d 100644
--- a/libsrc/Wi/json_p.h
+++ b/libsrc/Wi/json_p.h
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,11 +29,10 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -69,25 +70,19 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
-
-/* Line 1685 of yacc.c */
#line 39 "./json.y"
-
+{
caddr_t box;
caddr_t *list;
dk_set_t set;
-
-
-
-/* Line 1685 of yacc.c */
-#line 85 "json_p.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1489 of yacc.c. */
+#line 81 "json_p.h"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
extern YYSTYPE jsonyylval;
-
diff --git a/libsrc/Wi/ksrvext.h b/libsrc/Wi/ksrvext.h
index c89135f..bb9a25d 100644
--- a/libsrc/Wi/ksrvext.h
+++ b/libsrc/Wi/ksrvext.h
@@ -1,14 +1,14 @@
/*
* ksrvext.h
*
- * $Id: ksrvext.h,v 1.9.2.7 2012/03/08 12:55:34 source Exp $
+ * $Id: ksrvext.h,v 1.9.2.6 2010/11/26 10:46:33 source Exp $
*
* Virtuoso Server Extension API
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/ksrvextphp.h b/libsrc/Wi/ksrvextphp.h
index 68d6bae..d56c10a 100644
--- a/libsrc/Wi/ksrvextphp.h
+++ b/libsrc/Wi/ksrvextphp.h
@@ -1,10 +1,10 @@
/*
- * $Id: ksrvextphp.h,v 1.7.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: ksrvextphp.h,v 1.7.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/lisprdr.c b/libsrc/Wi/lisprdr.c
index 07ee14b..77f2984 100644
--- a/libsrc/Wi/lisprdr.c
+++ b/libsrc/Wi/lisprdr.c
@@ -1,14 +1,14 @@
/*
* lisprdr.c
*
- * $Id: lisprdr.c,v 1.3.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: lisprdr.c,v 1.3.2.1 2009/04/18 21:55:12 source Exp $
*
* Reader for lisp expressions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/lisprdr.h b/libsrc/Wi/lisprdr.h
index 3e548fe..d0dd4bd 100644
--- a/libsrc/Wi/lisprdr.h
+++ b/libsrc/Wi/lisprdr.h
@@ -1,14 +1,14 @@
/*
* lisprdr.h
*
- * $Id: lisprdr.h,v 1.2.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: lisprdr.h,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
*
* Lisp Reader
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/list2.h b/libsrc/Wi/list2.h
index 2c0c473..06fccab 100644
--- a/libsrc/Wi/list2.h
+++ b/libsrc/Wi/list2.h
@@ -1,14 +1,14 @@
/*
* list2.h
*
- * $Id: list2.h,v 1.4.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: list2.h,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
*
* Doubly linked list
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/list_lex_props.sh b/libsrc/Wi/list_lex_props.sh
index df7e080..cbf458a 100755
--- a/libsrc/Wi/list_lex_props.sh
+++ b/libsrc/Wi/list_lex_props.sh
@@ -1,11 +1,11 @@
#!/bin/bash
#
-# $Id: list_lex_props.sh,v 1.4.2.2 2012/03/08 12:55:34 source Exp $
+# $Id: list_lex_props.sh,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/lock.c b/libsrc/Wi/lock.c
index 942b501..3497795 100644
--- a/libsrc/Wi/lock.c
+++ b/libsrc/Wi/lock.c
@@ -1,14 +1,14 @@
/*
* lock.c
*
- * $Id: lock.c,v 1.20.2.22 2012/03/08 12:55:34 source Exp $
+ * $Id: lock.c,v 1.20.2.21 2011/04/20 15:12:41 source Exp $
*
* Locking concurrency control
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/log.c b/libsrc/Wi/log.c
index d3174e9..d989746 100644
--- a/libsrc/Wi/log.c
+++ b/libsrc/Wi/log.c
@@ -1,14 +1,14 @@
/*
* log.c
*
- * $Id: log.c,v 1.16.2.24 2012/03/08 12:55:34 source Exp $
+ * $Id: log.c,v 1.16.2.23 2011/10/13 11:09:41 source Exp $
*
* Transaction log write and recovery
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/log.h b/libsrc/Wi/log.h
index b334fbb..20290a1 100644
--- a/libsrc/Wi/log.h
+++ b/libsrc/Wi/log.h
@@ -1,12 +1,12 @@
/*
* log.h
*
- * $Id: log.h,v 1.5.2.4 2012/03/08 12:55:34 source Exp $
+ * $Id: log.h,v 1.5.2.3 2010/05/12 12:24:29 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/ltrx.h b/libsrc/Wi/ltrx.h
index 350a74c..e98f94e 100644
--- a/libsrc/Wi/ltrx.h
+++ b/libsrc/Wi/ltrx.h
@@ -1,14 +1,14 @@
/*
* ltrx.h
*
- * $Id: ltrx.h,v 1.14.2.11 2012/03/08 12:55:34 source Exp $
+ * $Id: ltrx.h,v 1.14.2.10 2011/04/19 20:50:33 source Exp $
*
* Locking transaction structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/mail_cli.sql b/libsrc/Wi/mail_cli.sql
index b90f993..a089f86 100644
--- a/libsrc/Wi/mail_cli.sql
+++ b/libsrc/Wi/mail_cli.sql
@@ -1,14 +1,14 @@
--
-- mail_cli.sql
--
--- $Id: mail_cli.sql,v 1.2.2.3 2012/03/08 12:55:34 source Exp $
+-- $Id: mail_cli.sql,v 1.2.2.2 2009/04/18 21:55:12 source Exp $
--
-- Virtuoso mail client function support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/map_schema.c b/libsrc/Wi/map_schema.c
index 8d04cda..b018689 100644
--- a/libsrc/Wi/map_schema.c
+++ b/libsrc/Wi/map_schema.c
@@ -1,10 +1,10 @@
/*
- * $Id: map_schema.c,v 1.4.2.3 2012/03/08 12:55:34 source Exp $
+ * $Id: map_schema.c,v 1.4.2.2 2010/02/18 10:57:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/map_schema.h b/libsrc/Wi/map_schema.h
index 7a3149d..a92d4fe 100644
--- a/libsrc/Wi/map_schema.h
+++ b/libsrc/Wi/map_schema.h
@@ -1,10 +1,10 @@
/*
- * $Id: map_schema.h,v 1.3.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: map_schema.h,v 1.3.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/meta.c b/libsrc/Wi/meta.c
index 3d63ee0..b44ef7d 100644
--- a/libsrc/Wi/meta.c
+++ b/libsrc/Wi/meta.c
@@ -1,14 +1,14 @@
/*
* meta.c
*
- * $Id: meta.c,v 1.17.2.10 2012/03/08 12:55:34 source Exp $
+ * $Id: meta.c,v 1.17.2.9 2011/05/02 08:24:32 source Exp $
*
* META
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/msdtc.h b/libsrc/Wi/msdtc.h
index 9d5e30e..8ff848d 100644
--- a/libsrc/Wi/msdtc.h
+++ b/libsrc/Wi/msdtc.h
@@ -1,12 +1,12 @@
/*
* hosting.h
*
- * $Id: msdtc.h,v 1.3.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: msdtc.h,v 1.3.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/mts.h b/libsrc/Wi/mts.h
index 4d74799..fa2c4e5 100644
--- a/libsrc/Wi/mts.h
+++ b/libsrc/Wi/mts.h
@@ -1,14 +1,14 @@
/*
* mts.h
*
- * $Id: mts.h,v 1.2.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: mts.h,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
*
* MTS related functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/mts_client.c b/libsrc/Wi/mts_client.c
index 1483bbe..9821d13 100644
--- a/libsrc/Wi/mts_client.c
+++ b/libsrc/Wi/mts_client.c
@@ -1,12 +1,12 @@
/*
* mts_client.c
*
- * $Id: mts_client.c,v 1.7.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: mts_client.c,v 1.7.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/mts_client.h b/libsrc/Wi/mts_client.h
index 03badca..71327ea 100644
--- a/libsrc/Wi/mts_client.h
+++ b/libsrc/Wi/mts_client.h
@@ -1,12 +1,12 @@
/*
* mts_client.h
*
- * $Id: mts_client.h,v 1.2.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: mts_client.h,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/mts_com.cpp b/libsrc/Wi/mts_com.cpp
index 387a522..133ef97 100644
--- a/libsrc/Wi/mts_com.cpp
+++ b/libsrc/Wi/mts_com.cpp
@@ -1,14 +1,14 @@
/*
* mts_com.cpp
*
- * $Id: mts_com.cpp,v 1.1.1.1.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: mts_com.cpp,v 1.1.1.1.2.1 2009/04/18 21:55:12 source Exp $
*
* MS DTC support
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/mts_com.h b/libsrc/Wi/mts_com.h
index 194062e..85df3fe 100644
--- a/libsrc/Wi/mts_com.h
+++ b/libsrc/Wi/mts_com.h
@@ -1,12 +1,12 @@
/*
* mts_com.h
*
- * $Id: mts_com.h,v 1.2.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: mts_com.h,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/mtwrite.c b/libsrc/Wi/mtwrite.c
index 14b3872..d2c18bd 100644
--- a/libsrc/Wi/mtwrite.c
+++ b/libsrc/Wi/mtwrite.c
@@ -1,14 +1,14 @@
/*
* mtwrite.c
*
- * $Id: mtwrite.c,v 1.8.2.9 2012/03/08 12:55:34 source Exp $
+ * $Id: mtwrite.c,v 1.8.2.8 2010/03/08 12:04:12 source Exp $
*
* Manages buffer rings and paging to disk.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/mtx.cpp b/libsrc/Wi/mtx.cpp
index cdf0969..6bdeb0d 100644
--- a/libsrc/Wi/mtx.cpp
+++ b/libsrc/Wi/mtx.cpp
@@ -1,14 +1,14 @@
/*
* mtx.cpp
*
- * $Id: mtx.cpp,v 1.2.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: mtx.cpp,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
*
* MS DTC support
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/multibyte.c b/libsrc/Wi/multibyte.c
index 860d699..6dce82a 100644
--- a/libsrc/Wi/multibyte.c
+++ b/libsrc/Wi/multibyte.c
@@ -1,12 +1,12 @@
/*
* multibyte.c
*
- * $Id: multibyte.c,v 1.9.2.6 2012/03/08 12:55:34 source Exp $
+ * $Id: multibyte.c,v 1.9.2.4 2010/01/12 12:19:47 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -261,7 +261,7 @@ box_read_long_wide_string (dk_session_t *session, dtp_t macro)
size_t
-wide_char_length_of_utf8_string (const unsigned char *str, size_t utf8_length)
+wide_char_length_of_utf8_string (unsigned char *str, size_t utf8_length)
{
virt_mbstate_t state;
memset (&state, 0, sizeof (virt_mbstate_t));
@@ -355,20 +355,6 @@ virt_wcsstr (const wchar_t *wcs, const wchar_t *wc)
return NULL;
}
-wchar_t *
-virt_wcsrstr (const wchar_t *wcs, const wchar_t *wc)
-{
- size_t len;
- const wchar_t *cp;
- const wchar_t *ep;
-
- len = virt_wcslen (wc);
- for (cp = wcs + virt_wcslen (wcs) - len; cp >= wcs; --cp)
- if (*cp == *wc && !virt_wcsncmp (cp, wc, len))
- return (wchar_t *) cp;
-
- return NULL;
-}
static unsigned char
cli_wchar_to_char (wchar_t src, wcharset_t *charset)
diff --git a/libsrc/Wi/multibyte.h b/libsrc/Wi/multibyte.h
index aa79292..b224e2c 100644
--- a/libsrc/Wi/multibyte.h
+++ b/libsrc/Wi/multibyte.h
@@ -1,12 +1,12 @@
/*
* multibyte.h
*
- * $Id: multibyte.h,v 1.9.2.6 2012/03/08 12:55:34 source Exp $
+ * $Id: multibyte.h,v 1.9.2.3 2010/01/12 12:19:47 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -28,11 +28,6 @@
#include "libutil.h"
-#ifndef UTF8CHAR_DEFINED
-#define UTF8CHAR_DEFINED
-typedef unsigned char utf8char;
-#endif
-
typedef struct wcharset_s {
char chrs_name[100];
wchar_t chrs_table[256];
@@ -52,7 +47,6 @@ size_t virt_wcsrtombs (unsigned char *dst, wchar_t **src, size_t len, virt_mbsta
wchar_t *virt_wcschr (const wchar_t *__wcs, wchar_t __wc);
wchar_t *virt_wcsrchr (const wchar_t *__wcs, wchar_t __wc);
wchar_t *virt_wcsstr (const wchar_t *__wcs, const wchar_t *__wc);
-wchar_t *virt_wcsrstr (const wchar_t *__wcs, const wchar_t *__wc);
size_t virt_wcslen (const wchar_t *__wcs);
int virt_wcsncmp (const wchar_t *from, const wchar_t *to, size_t len);
@@ -75,7 +69,7 @@ wchar_t *virt_wcsdup(const wchar_t *s);
int virt_wcscasecmp(const wchar_t *s1, const wchar_t *s2);
/* long blob_fill_buffer_from_wide_string (caddr_t bh, caddr_t buf, int *at_end, long *char_len); moved to blob.c as static and excluded */
-size_t wide_char_length_of_utf8_string (const unsigned char *str, size_t utf8_length);
+size_t wide_char_length_of_utf8_string (unsigned char *str, size_t utf8_length);
struct query_instance_s;
extern wcharset_t *wcharset_by_name_or_dflt (ccaddr_t cs_name, struct query_instance_s *qi);
@@ -101,9 +95,6 @@ size_t wide_as_utf8_len (caddr_t _wide);
caddr_t box_wide_string (const wchar_t *wstr);
caddr_t box_wide_nchars (const wchar_t *wstr, size_t len);
-extern wcharset_t *charset_native_for_box (ccaddr_t box, int expected_bf_if_zero);
-
-
#ifdef UTF8_DEBUG
#define ASSERT_BOX_ENC_MATCHES_BF(box,expected_bf_if_zero) assert_box_enc_matches_bf (__FILE__, __LINE__, (box), (expected_bf_if_zero))
#define ASSERT_BOX_UTF8(box) assert_box_utf8 (__FILE__, __LINE__, (box))
diff --git a/libsrc/Wi/name.c b/libsrc/Wi/name.c
index af330bd..6b012ed 100644
--- a/libsrc/Wi/name.c
+++ b/libsrc/Wi/name.c
@@ -1,12 +1,12 @@
/*
* name.c
*
- * $Id: name.c,v 1.2.2.3 2012/03/08 12:55:34 source Exp $
+ * $Id: name.c,v 1.2.2.2 2010/02/18 10:57:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/neodisk.c b/libsrc/Wi/neodisk.c
index 5f2731d..1811e05 100644
--- a/libsrc/Wi/neodisk.c
+++ b/libsrc/Wi/neodisk.c
@@ -1,14 +1,14 @@
/*
* neodisk.c
*
- * $Id: neodisk.c,v 1.19.2.24 2012/03/08 12:55:34 source Exp $
+ * $Id: neodisk.c,v 1.19.2.23 2011/05/10 12:20:55 source Exp $
*
* Neodisk Checkpoint
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/nn_svr.sql b/libsrc/Wi/nn_svr.sql
index 3018e1f..ebf7f0c 100644
--- a/libsrc/Wi/nn_svr.sql
+++ b/libsrc/Wi/nn_svr.sql
@@ -1,10 +1,10 @@
--
--- $Id: nn_svr.sql,v 1.7.2.4 2012/03/08 12:55:34 source Exp $
+-- $Id: nn_svr.sql,v 1.7.2.3 2011/09/28 17:01:16 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/nquad_p.c b/libsrc/Wi/nquad_p.c
index bae193a..69c5b1b 100644
--- a/libsrc/Wi/nquad_p.c
+++ b/libsrc/Wi/nquad_p.c
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,7 +29,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -45,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -53,93 +55,17 @@
/* Pure parsers. */
#define YYPURE 1
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
-#define yyparse nqyyparse
-#define yylex nqyylex
-#define yyerror nqyyerror
-#define yylval nqyylval
-#define yychar nqyychar
-#define yydebug nqyydebug
-#define yynerrs nqyynerrs
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
-#line 31 "./nquad_p.y"
-
-
-#include "libutil.h"
-#include "sqlnode.h"
-#include "sqlparext.h"
-#include "rdf_core.h"
-#include "xmltree.h"
-/*#include "langfunc.h"*/
-#include "turtle_p.h"
-#define nqyylex ttlyylex
-#define nqyyerror ttlyyerror
-
-
-#ifdef DEBUG
-#define ttlyyerror(ttlp_arg,yyscan,strg) ttlyyerror_impl_1(ttlp_arg, NULL, yystate, yyssa, yyssp, (strg))
-#define ttlyyerror_action(strg) ttlyyerror_impl_1(ttlp_arg, NULL, yystate, yyssa, yyssp, (strg))
-#else
-#define ttlyyerror(ttlp_arg,yyscan,strg) ttlyyerror_impl(ttlp_arg, NULL, (strg))
-#define ttlyyerror_action(strg) ttlyyerror_impl(ttlp_arg, NULL, (strg))
-#endif
-
-#define TTLYYERROR_ACTION_COND(flag,strg) do { \
- if (!((flag) & ttlp_arg->ttlp_flags)) \
- ttlyyerror_action(strg); \
- else \
- tf_report (ttlp_arg->ttlp_tf, 'W', NULL, NULL, (strg)); \
- } while (0)
-
-
-extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
-
-
-#ifdef TTLDEBUG
-#define YYDEBUG 1
-#endif
-
-#define TTLP_URI_RESOLVE_IF_NEEDED(rel) \
- do { \
- if ((NULL != ttlp_arg->ttlp_tf->tf_base_uri) && strncmp ((rel), "http://", 7)) \
- (rel) = ttlp_uri_resolve (ttlp_arg, (rel)); \
- } while (0)
-
-
-
-/* Line 189 of yacc.c */
-#line 125 "nquad_p.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
+#define yyparse nqyyparse
+#define yylex nqyylex
+#define yyerror nqyyerror
+#define yylval nqyylval
+#define yychar nqyychar
+#define yydebug nqyydebug
+#define yynerrs nqyynerrs
/* Tokens. */
@@ -249,33 +175,93 @@ extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
+/* Copy the first part of user declarations. */
+#line 31 "./nquad_p.y"
+
+
+#include "libutil.h"
+#include "sqlnode.h"
+#include "sqlparext.h"
+#include "rdf_core.h"
+#include "xmltree.h"
+/*#include "langfunc.h"*/
+#include "turtle_p.h"
+#define nqyylex ttlyylex
+#define nqyyerror ttlyyerror
+
+
+#ifdef DEBUG
+#define ttlyyerror(ttlp_arg,yyscan,strg) ttlyyerror_impl_1(ttlp_arg, NULL, yystate, yyssa, yyssp, (strg))
+#define ttlyyerror_action(strg) ttlyyerror_impl_1(ttlp_arg, NULL, yystate, yyssa, yyssp, (strg))
+#else
+#define ttlyyerror(ttlp_arg,yyscan,strg) ttlyyerror_impl(ttlp_arg, NULL, (strg))
+#define ttlyyerror_action(strg) ttlyyerror_impl(ttlp_arg, NULL, (strg))
+#endif
+
+#define TTLYYERROR_ACTION_COND(flag,strg) do { \
+ if (!((flag) & ttlp_arg->ttlp_flags)) \
+ ttlyyerror_action(strg); \
+ else \
+ tf_report (ttlp_arg->ttlp_tf, 'W', NULL, NULL, (strg)); \
+ } while (0)
+
+
+extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
+
+
+#ifdef TTLDEBUG
+#define YYDEBUG 1
+#endif
+
+#define TTLP_URI_RESOLVE_IF_NEEDED(rel) \
+ do { \
+ if ((NULL != ttlp_arg->ttlp_tf->tf_base_uri) && strncmp ((rel), "http://", 7)) \
+ (rel) = ttlp_uri_resolve (ttlp_arg, (rel)); \
+ } while (0)
+
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c */
#line 76 "./nquad_p.y"
-
+{
caddr_t box;
ptrlong token_type;
void *nothing;
-
-
-
-/* Line 214 of yacc.c */
-#line 267 "nquad_p.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 187 of yacc.c. */
+#line 252 "nquad_p.c"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
+
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 279 "nquad_p.c"
+/* Line 216 of yacc.c. */
+#line 265 "nquad_p.c"
#ifdef short
# undef short
@@ -325,7 +311,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -350,14 +336,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -438,9 +424,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -474,12 +460,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -614,10 +600,10 @@ static const char *const yytname[] =
"TURTLE_DECIMAL", "TURTLE_DOUBLE", "TURTLE_STRING", "KEYWORD", "LANGTAG",
"QNAME", "QNAME_NS", "VARIABLE", "BLANK_NODE_LABEL", "Q_IRI_REF",
"_GARBAGE_BEFORE_DOT_WS", "TTL_RECOVERABLE_ERROR",
- "__NQUAD_NONPUNCT_END", "$accept", "nquaddoc", "clause", "$@1",
- "dot_opt", "subject", "keyword_list", "keyword", "pred",
- "literal_subject", "object_with_ctx", "$@2", "$@3", "$@4", "$@5", "$@6",
- "ctx_opt", "blank", "q_complete", 0
+ "__NQUAD_NONPUNCT_END", "$accept", "nquaddoc", "clause", "@1", "dot_opt",
+ "subject", "keyword_list", "keyword", "pred", "literal_subject",
+ "object_with_ctx", "@2", "@3", "@4", "@5", "@6", "ctx_opt", "blank",
+ "q_complete", 0
};
#endif
@@ -787,18 +773,9 @@ static const yytype_uint8 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
+ Once GCC version 2 has supplanted version 1, this can go. */
#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -855,7 +832,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -972,20 +949,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, ttlp_arg, yyscanner)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -1021,11 +995,11 @@ yy_reduce_print (yyvsp, yyrule, ttlp_arg, yyscanner)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
, ttlp_arg, yyscanner);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -1309,8 +1283,10 @@ yydestruct (yymsg, yytype, yyvaluep, ttlp_arg, yyscanner)
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1329,9 +1305,10 @@ int yyparse ();
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1356,46 +1333,22 @@ yyparse (ttlp_arg, yyscanner)
#endif
#endif
{
-/* The lookahead symbol. */
+ /* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
- /* Number of syntax errors so far. */
- int yynerrs;
-
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
+/* Number of syntax errors so far. */
+int yynerrs;
+ int yystate;
int yyn;
int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Look-ahead token as an internal (translated) token number. */
+ int yytoken = 0;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
@@ -1403,28 +1356,51 @@ YYSTYPE yylval;
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss = yyssa;
+ yytype_int16 *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
+
+
+
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ YYSIZE_T yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
+
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
+
yyssp = yyss;
yyvsp = yyvs;
@@ -1454,6 +1430,7 @@ YYSTYPE yylval;
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
+
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -1461,6 +1438,7 @@ YYSTYPE yylval;
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -1483,8 +1461,9 @@ YYSTYPE yylval;
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1495,6 +1474,7 @@ YYSTYPE yylval;
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1504,9 +1484,6 @@ YYSTYPE yylval;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
- if (yystate == YYFINAL)
- YYACCEPT;
-
goto yybackup;
/*-----------.
@@ -1515,16 +1492,16 @@ YYSTYPE yylval;
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
+ look-ahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1556,16 +1533,20 @@ yybackup:
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1605,27 +1586,21 @@ yyreduce:
switch (yyn)
{
case 4:
-
-/* Line 1464 of yacc.c */
#line 155 "./nquad_p.y"
{ ttlp_arg->ttlp_special_qnames = ~0; }
break;
case 6:
-
-/* Line 1464 of yacc.c */
#line 156 "./nquad_p.y"
{ dk_free_box (ttlp_arg->ttlp_tf->tf_base_uri); ttlp_arg->ttlp_tf->tf_base_uri = (yyvsp[(2) - (3)].box); }
break;
case 7:
-
-/* Line 1464 of yacc.c */
#line 157 "./nquad_p.y"
{
caddr_t *old_uri_ptr;
if (NULL != ttlp_arg->ttlp_namespaces_prefix2iri)
- old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, (caddr_t)(&((yyvsp[(2) - (4)].box))));
+ old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, &((yyvsp[(2) - (4)].box)));
else
{
ttlp_arg->ttlp_namespaces_prefix2iri = (id_hash_t *)box_dv_dict_hashtable (31);
@@ -1640,12 +1615,10 @@ yyreduce:
ttlyyerror_action ("Namespace prefix is re-used for a different namespace IRI");
}
else
- id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, (caddr_t)(&((yyvsp[(2) - (4)].box))), (caddr_t)(&((yyvsp[(3) - (4)].box)))); }
+ id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, &((yyvsp[(2) - (4)].box)), &((yyvsp[(3) - (4)].box))); }
break;
case 8:
-
-/* Line 1464 of yacc.c */
#line 176 "./nquad_p.y"
{
dk_free_box (ttlp_arg->ttlp_default_ns_uri);
@@ -1653,15 +1626,11 @@ yyreduce:
break;
case 13:
-
-/* Line 1464 of yacc.c */
#line 183 "./nquad_p.y"
{ ttlyyerror_action ("Only a triple or a special clause (like prefix declaration) is allowed here"); }
break;
case 16:
-
-/* Line 1464 of yacc.c */
#line 192 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = ttlp_arg->ttlp_last_complete_uri;
@@ -1669,24 +1638,18 @@ yyreduce:
break;
case 17:
-
-/* Line 1464 of yacc.c */
#line 195 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
case 18:
-
-/* Line 1464 of yacc.c */
#line 197 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
case 19:
-
-/* Line 1464 of yacc.c */
#line 199 "./nquad_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_SKIP_LITERAL_SUBJECTS, "Virtuoso does not support literal subjects");
@@ -1694,107 +1657,77 @@ yyreduce:
break;
case 20:
-
-/* Line 1464 of yacc.c */
#line 202 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = NULL; }
break;
case 21:
-
-/* Line 1464 of yacc.c */
#line 207 "./nquad_p.y"
{ ttlp_arg->ttlp_special_qnames &= ~((yyvsp[(1) - (1)].token_type)); }
break;
case 22:
-
-/* Line 1464 of yacc.c */
#line 208 "./nquad_p.y"
{ ttlp_arg->ttlp_special_qnames &= ~((yyvsp[(3) - (3)].token_type)); }
break;
case 23:
-
-/* Line 1464 of yacc.c */
#line 212 "./nquad_p.y"
{ (yyval.token_type) = ttlp_bit_of_special_qname ((yyvsp[(1) - (1)].box)); }
break;
case 24:
-
-/* Line 1464 of yacc.c */
#line 213 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_A; }
break;
case 25:
-
-/* Line 1464 of yacc.c */
#line 214 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_HAS; }
break;
case 26:
-
-/* Line 1464 of yacc.c */
#line 215 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_IS; }
break;
case 27:
-
-/* Line 1464 of yacc.c */
#line 216 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_OF; }
break;
case 28:
-
-/* Line 1464 of yacc.c */
#line 217 "./nquad_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_THIS; }
break;
case 29:
-
-/* Line 1464 of yacc.c */
#line 221 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = ttlp_arg->ttlp_last_complete_uri; ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
case 30:
-
-/* Line 1464 of yacc.c */
#line 222 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = (yyvsp[(1) - (1)].box); }
break;
case 31:
-
-/* Line 1464 of yacc.c */
#line 223 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = uname_rdf_ns_uri_type; }
break;
case 32:
-
-/* Line 1464 of yacc.c */
#line 224 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = box_dv_uname_string ("http://www.w3.org/2002/07/owl#sameAs"); }
break;
case 33:
-
-/* Line 1464 of yacc.c */
#line 225 "./nquad_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); }
break;
case 34:
-
-/* Line 1464 of yacc.c */
#line 227 "./nquad_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '[]') can not be used as a predicate");
@@ -1802,8 +1735,6 @@ yyreduce:
break;
case 35:
-
-/* Line 1464 of yacc.c */
#line 231 "./nquad_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '_:...' label) can not be used as a predicate");
@@ -1816,29 +1747,21 @@ yyreduce:
break;
case 36:
-
-/* Line 1464 of yacc.c */
#line 239 "./nquad_p.y"
{ ttlp_arg->ttlp_pred_is_reverse = 1; dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = ttlp_arg->ttlp_last_complete_uri; ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
case 37:
-
-/* Line 1464 of yacc.c */
#line 240 "./nquad_p.y"
{ ttlp_arg->ttlp_pred_is_reverse = 1; dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = (yyvsp[(2) - (3)].box); }
break;
case 38:
-
-/* Line 1464 of yacc.c */
#line 241 "./nquad_p.y"
{ ttlp_arg->ttlp_pred_is_reverse = 1; dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); /* Note this 'double reversed' meaning :) */ }
break;
case 46:
-
-/* Line 1464 of yacc.c */
#line 252 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
@@ -1846,8 +1769,6 @@ yyreduce:
break;
case 47:
-
-/* Line 1464 of yacc.c */
#line 258 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1856,16 +1777,12 @@ yyreduce:
break;
case 48:
-
-/* Line 1464 of yacc.c */
#line 262 "./nquad_p.y"
{
ttlp_triple_and_inf (ttlp_arg, ttlp_arg->ttlp_obj); }
break;
case 49:
-
-/* Line 1464 of yacc.c */
#line 264 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1873,16 +1790,12 @@ yyreduce:
break;
case 50:
-
-/* Line 1464 of yacc.c */
#line 267 "./nquad_p.y"
{
ttlp_triple_and_inf (ttlp_arg, (yyvsp[(1) - (3)].box)); }
break;
case 51:
-
-/* Line 1464 of yacc.c */
#line 269 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1890,32 +1803,24 @@ yyreduce:
break;
case 52:
-
-/* Line 1464 of yacc.c */
#line 272 "./nquad_p.y"
{
ttlp_triple_and_inf (ttlp_arg, (yyvsp[(1) - (3)].box)); }
break;
case 53:
-
-/* Line 1464 of yacc.c */
#line 274 "./nquad_p.y"
{
ttlp_triple_l_and_inf (ttlp_arg, (caddr_t)((ptrlong)1), uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
case 54:
-
-/* Line 1464 of yacc.c */
#line 276 "./nquad_p.y"
{
ttlp_triple_l_and_inf (ttlp_arg, (caddr_t)((ptrlong)0), uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
case 55:
-
-/* Line 1464 of yacc.c */
#line 278 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1924,8 +1829,6 @@ yyreduce:
break;
case 56:
-
-/* Line 1464 of yacc.c */
#line 282 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1934,8 +1837,6 @@ yyreduce:
break;
case 57:
-
-/* Line 1464 of yacc.c */
#line 286 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1944,8 +1845,6 @@ yyreduce:
break;
case 58:
-
-/* Line 1464 of yacc.c */
#line 290 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1954,8 +1853,6 @@ yyreduce:
break;
case 59:
-
-/* Line 1464 of yacc.c */
#line 294 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1966,8 +1863,6 @@ yyreduce:
break;
case 60:
-
-/* Line 1464 of yacc.c */
#line 300 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -1978,23 +1873,17 @@ yyreduce:
break;
case 61:
-
-/* Line 1464 of yacc.c */
#line 306 "./nquad_p.y"
{
ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, ttlp_arg->ttlp_obj_type, NULL); }
break;
case 62:
-
-/* Line 1464 of yacc.c */
#line 308 "./nquad_p.y"
{ }
break;
case 63:
-
-/* Line 1464 of yacc.c */
#line 309 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
@@ -2002,8 +1891,6 @@ yyreduce:
break;
case 64:
-
-/* Line 1464 of yacc.c */
#line 312 "./nquad_p.y"
{
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
@@ -2011,22 +1898,16 @@ yyreduce:
break;
case 65:
-
-/* Line 1464 of yacc.c */
#line 315 "./nquad_p.y"
{ }
break;
case 66:
-
-/* Line 1464 of yacc.c */
#line 316 "./nquad_p.y"
{ }
break;
case 67:
-
-/* Line 1464 of yacc.c */
#line 320 "./nquad_p.y"
{
triple_feed_t *tf = ttlp_arg->ttlp_tf;
@@ -2036,8 +1917,6 @@ yyreduce:
break;
case 68:
-
-/* Line 1464 of yacc.c */
#line 325 "./nquad_p.y"
{
triple_feed_t *tf = ttlp_arg->ttlp_tf;
@@ -2049,22 +1928,16 @@ yyreduce:
break;
case 69:
-
-/* Line 1464 of yacc.c */
#line 332 "./nquad_p.y"
{ }
break;
case 70:
-
-/* Line 1464 of yacc.c */
#line 333 "./nquad_p.y"
{ }
break;
case 71:
-
-/* Line 1464 of yacc.c */
#line 339 "./nquad_p.y"
{
if (ttlp_arg->ttlp_formula_iid)
@@ -2075,15 +1948,11 @@ yyreduce:
break;
case 72:
-
-/* Line 1464 of yacc.c */
#line 345 "./nquad_p.y"
{ (yyval.box) = tf_bnode_iid (ttlp_arg->ttlp_tf, NULL); }
break;
case 73:
-
-/* Line 1464 of yacc.c */
#line 350 "./nquad_p.y"
{
if (NULL != ttlp_arg->ttlp_last_complete_uri)
@@ -2094,8 +1963,6 @@ yyreduce:
break;
case 74:
-
-/* Line 1464 of yacc.c */
#line 357 "./nquad_p.y"
{
if (NULL != ttlp_arg->ttlp_last_complete_uri)
@@ -2107,8 +1974,6 @@ yyreduce:
break;
case 75:
-
-/* Line 1464 of yacc.c */
#line 365 "./nquad_p.y"
{
if (NULL != ttlp_arg->ttlp_last_complete_uri)
@@ -2120,9 +1985,8 @@ yyreduce:
break;
-
-/* Line 1464 of yacc.c */
-#line 2126 "nquad_p.c"
+/* Line 1267 of yacc.c. */
+#line 1990 "nquad_p.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2133,6 +1997,7 @@ yyreduce:
*++yyvsp = yyval;
+
/* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -2197,7 +2062,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -2214,7 +2079,7 @@ yyerrlab:
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -2271,6 +2136,9 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -2295,7 +2163,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2306,7 +2174,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval, ttlp_arg, yyscanner);
/* Do not reclaim the symbols of the rule which action triggered
diff --git a/libsrc/Wi/nquad_p.h b/libsrc/Wi/nquad_p.h
index d91fe7a..f27791b 100644
--- a/libsrc/Wi/nquad_p.h
+++ b/libsrc/Wi/nquad_p.h
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,11 +29,10 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -141,25 +142,19 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
-
-/* Line 1685 of yacc.c */
#line 76 "./nquad_p.y"
-
+{
caddr_t box;
ptrlong token_type;
void *nothing;
-
-
-
-/* Line 1685 of yacc.c */
-#line 157 "nquad_p.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1489 of yacc.c. */
+#line 153 "nquad_p.h"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
-
diff --git a/libsrc/Wi/nquad_p.y b/libsrc/Wi/nquad_p.y
index 03e308d..26f115f 100644
--- a/libsrc/Wi/nquad_p.y
+++ b/libsrc/Wi/nquad_p.y
@@ -1,10 +1,10 @@
/*
- * $Id: nquad_p.y,v 1.1.2.7 2012/03/08 12:55:34 source Exp $
+ * $Id: nquad_p.y,v 1.1.2.5 2011/04/26 12:16:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -157,7 +157,7 @@ clause
| _AT_prefix_L QNAME_NS Q_IRI_REF dot_opt {
caddr_t *old_uri_ptr;
if (NULL != ttlp_arg->ttlp_namespaces_prefix2iri)
- old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, (caddr_t)(&($2)));
+ old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, &($2));
else
{
ttlp_arg->ttlp_namespaces_prefix2iri = (id_hash_t *)box_dv_dict_hashtable (31);
@@ -172,7 +172,7 @@ clause
ttlyyerror_action ("Namespace prefix is re-used for a different namespace IRI");
}
else
- id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, (caddr_t)(&($2)), (caddr_t)(&($3))); }
+ id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, &($2), &($3)); }
| _AT_prefix_L _COLON Q_IRI_REF dot_opt {
dk_free_box (ttlp_arg->ttlp_default_ns_uri);
ttlp_arg->ttlp_default_ns_uri = $3; }
diff --git a/libsrc/Wi/numeric.c b/libsrc/Wi/numeric.c
index 391aa40..30dff28 100644
--- a/libsrc/Wi/numeric.c
+++ b/libsrc/Wi/numeric.c
@@ -1,14 +1,14 @@
/*
* numeric.c
*
- * $Id: numeric.c,v 1.13.2.6 2012/03/08 12:55:34 source Exp $
+ * $Id: numeric.c,v 1.13.2.4 2011/01/28 13:31:34 source Exp $
*
* Implements numeric data type
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -2180,53 +2180,6 @@ numeric_to_dv (numeric_t n, dtp_t *res, size_t reslength)
/*
* Very similar to _numeric_normalize
*
- * "Resizes" n from x to a new precision and a new scale.
- * Returns NUMERIC_STS_UNDERFLOW / NUMERIC_STS_OVERFLOW on failure.
- *
- * NOTE: new_prec here is SQL precision (n_len + n_scale)
- */
-int
-numeric_rescale_noround (numeric_t n, numeric_t x, int new_prec, int new_scale)
-{
- char *src;
-
- if (num_is_invalid (x))
- return numeric_copy (n, x);
-
- new_prec = MAX (0, MIN (NUMERIC_MAX_PRECISION, new_prec));
- new_scale = MAX (0, MIN (NUMERIC_MAX_SCALE, new_scale));
-
- /* too big? */
- if (x->n_len > new_prec)
- return _numeric_inf (n, x->n_neg);
-
- /* adjust scale if not enough digits available */
- if (x->n_len + new_scale > new_prec + ((1 == x->n_len && 0 == x->n_value[0])?1:0))
- new_scale = new_prec - x->n_len;
-
- /* too much fraction? */
- if (x->n_scale > new_scale)
- {
- numeric_copy (n, x);
- n->n_scale = new_scale;
- /* Check if we have to remove trailing zeroes. */
- if (n->n_scale)
- {
- src = n->n_value + n->n_len + n->n_scale;
- while (n->n_scale > 0 && *--src == 0)
- n->n_scale--;
- }
- }
- else
- numeric_copy (n, x);
-
- return NUMERIC_STS_SUCCESS;
-}
-
-
-/*
- * Very similar to _numeric_normalize
- *
* Rounds n from x to a new precision and a new scale.
* Returns NUMERIC_STS_UNDERFLOW / NUMERIC_STS_OVERFLOW on failure.
*
diff --git a/libsrc/Wi/numeric.h b/libsrc/Wi/numeric.h
index a68b2ba..f8d0a8e 100644
--- a/libsrc/Wi/numeric.h
+++ b/libsrc/Wi/numeric.h
@@ -1,14 +1,14 @@
/*
* numeric.h
*
- * $Id: numeric.h,v 1.5.2.6 2012/03/08 12:55:34 source Exp $
+ * $Id: numeric.h,v 1.5.2.4 2011/01/28 13:31:34 source Exp $
*
* Numeric data type
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -143,7 +143,6 @@ int numeric_to_double (numeric_t n, double *pvalue);
int numeric_to_dv (numeric_t n, dtp_t *res, size_t reslength);
int numeric_rescale (numeric_t y, numeric_t x, int prec, int scale);
-int numeric_rescale_noround (numeric_t y, numeric_t x, int prec, int scale);
/* arithmetic & comparison */
int numeric_compare (numeric_t x, numeric_t y);
@@ -174,8 +173,4 @@ int numeric_scale (numeric_t n);
int _numeric_size (void);
uint32 numeric_hash (numeric_t n);
-/* Internals listed below are not for common use.
-Functions that use them outside numeric.c should probably be splitted and low-level parts should be added to numeric.c API. */
-extern void num_add (numeric_t sum, numeric_t n1, numeric_t n2, int scale_min);
-
#endif /* _WI_NUMERIC_H */
diff --git a/libsrc/Wi/obackup.c b/libsrc/Wi/obackup.c
index e4e4a7c..3f66c1d 100644
--- a/libsrc/Wi/obackup.c
+++ b/libsrc/Wi/obackup.c
@@ -1,14 +1,14 @@
/*
* obackup.c
*
- * $Id: obackup.c,v 1.20.2.14 2012/03/08 12:55:34 source Exp $
+ * $Id: obackup.c,v 1.20.2.13 2010/09/17 23:10:41 source Exp $
*
* Online & Incremental Backup
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/odbccat.c b/libsrc/Wi/odbccat.c
index b8817d8..6d6338b 100644
--- a/libsrc/Wi/odbccat.c
+++ b/libsrc/Wi/odbccat.c
@@ -1,14 +1,14 @@
/*
* odbccat.c
*
- * $Id: odbccat.c,v 1.5.2.3 2012/03/08 12:55:34 source Exp $
+ * $Id: odbccat.c,v 1.5.2.2 2009/05/18 10:42:50 source Exp $
*
* ODBC Catalogs
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/odbccat.sql b/libsrc/Wi/odbccat.sql
index ab102c9..462b0b7 100644
--- a/libsrc/Wi/odbccat.sql
+++ b/libsrc/Wi/odbccat.sql
@@ -1,10 +1,10 @@
--
--- $Id: odbccat.sql,v 1.2.2.3 2012/03/08 12:55:34 source Exp $
+-- $Id: odbccat.sql,v 1.2.2.2 2009/05/18 10:42:50 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/odbcinc.h b/libsrc/Wi/odbcinc.h
index 7316820..f8864be 100644
--- a/libsrc/Wi/odbcinc.h
+++ b/libsrc/Wi/odbcinc.h
@@ -1,14 +1,14 @@
/*
* odbcinc.h
*
- * $Id: odbcinc.h,v 1.6.2.6 2012/03/08 12:55:34 source Exp $
+ * $Id: odbcinc.h,v 1.6.2.5 2010/09/17 22:49:23 source Exp $
*
* Include the ODBC header, whichever appropriate
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/oledb.sql b/libsrc/Wi/oledb.sql
index a4214d2..c32c349 100644
--- a/libsrc/Wi/oledb.sql
+++ b/libsrc/Wi/oledb.sql
@@ -1,14 +1,14 @@
--
-- oledb.sql
--
--- $Id: oledb.sql,v 1.2.2.2 2012/03/08 12:55:34 source Exp $
+-- $Id: oledb.sql,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
--
-- VIRTOLEDB supporting procedures.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/openxml.sql b/libsrc/Wi/openxml.sql
index 84362db..a1009a8 100644
--- a/libsrc/Wi/openxml.sql
+++ b/libsrc/Wi/openxml.sql
@@ -1,10 +1,10 @@
--
--- $Id: openxml.sql,v 1.4.2.2 2012/03/08 12:55:34 source Exp $
+-- $Id: openxml.sql,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/page.c b/libsrc/Wi/page.c
index ced6ac4..95451d7 100644
--- a/libsrc/Wi/page.c
+++ b/libsrc/Wi/page.c
@@ -1,12 +1,12 @@
/*
- * $Id: page.c,v 1.1.2.21 2012/03/08 12:55:34 source Exp $
+ * $Id: page.c,v 1.1.2.19 2011/10/18 12:45:50 source Exp $
*
* Page and Row Layout, Key Compression
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -913,8 +913,6 @@ buf_order_ck (buffer_desc_t * buf)
{
int inx;
page_map_t * pm = buf->bd_content_map;
- if (buf->bd_tree->it_key->key_id == KI_TEMP)
- return;
for (inx = 0; inx < pm->pm_count - 1; inx++)
{
if (DVC_LESS != buf_row_compare (buf, inx, inx + 1))
diff --git a/libsrc/Wi/phrasematch.sql b/libsrc/Wi/phrasematch.sql
index 13839ba..4f9426a 100644
--- a/libsrc/Wi/phrasematch.sql
+++ b/libsrc/Wi/phrasematch.sql
@@ -1,10 +1,10 @@
--
--- $Id: phrasematch.sql,v 1.5.2.3 2012/03/08 12:55:34 source Exp $
+-- $Id: phrasematch.sql,v 1.5.2.2 2009/04/18 21:55:12 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/pldbgcli.c b/libsrc/Wi/pldbgcli.c
index be5526a..b464f45 100644
--- a/libsrc/Wi/pldbgcli.c
+++ b/libsrc/Wi/pldbgcli.c
@@ -1,14 +1,14 @@
/*
* pldbgcli.c
*
- * $Id: pldbgcli.c,v 1.3.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: pldbgcli.c,v 1.3.2.1 2009/04/18 21:55:12 source Exp $
*
* PL debugger client API
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/pldebug.c b/libsrc/Wi/pldebug.c
index 539efc2..079825e 100644
--- a/libsrc/Wi/pldebug.c
+++ b/libsrc/Wi/pldebug.c
@@ -1,14 +1,14 @@
/*
* pldebug.c
*
- * $Id: pldebug.c,v 1.5.2.5 2012/03/08 12:55:34 source Exp $
+ * $Id: pldebug.c,v 1.5.2.2 2011/09/21 13:23:26 source Exp $
*
* PL Debugger
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -539,15 +539,12 @@ static query_t *
pldbg_get_qr (char * name)
{
int inx;
- query_t * qr = NULL;
- const char * pname;
+ query_t * qr;
if (!name)
return NULL;
- pname = sch_full_proc_name (wi_inst.wi_schema, name, "DB", "DBA");
- if (pname)
- qr = sch_proc_def (wi_inst.wi_schema, pname);
+ qr = sch_proc_def (wi_inst.wi_schema, name);
if (!qr) /* triggers */
{
dbe_table_t *tb;
@@ -832,7 +829,7 @@ pldbg_cmd_execute (dk_session_t * ses, caddr_t * args)
}
case PDI_THRE: /* stopped threads */
{
- char conn_id[30];
+ char conn_id[20];
client_connection_t * cli;
IN_TXN;
DO_SET (lock_trx_t *, lt, &all_trxs)
@@ -850,8 +847,7 @@ pldbg_cmd_execute (dk_session_t * ses, caddr_t * args)
cli->cli_pldbg->pd_id = box_copy (c_ses->dks_peer_name);
else
{
- char * ct = cli && cli->cli_ws ? "HTTP" : "INTERNAL";
- snprintf (conn_id, sizeof (conn_id), "%s:%lX", ct, (unsigned long) (uptrlong) cli);
+ snprintf (conn_id, sizeof (conn_id), "INTERNAL:%lX", (unsigned long) (uptrlong) cli);
cli->cli_pldbg->pd_id = box_dv_short_string (conn_id);
}
}
diff --git a/libsrc/Wi/pldebug.h b/libsrc/Wi/pldebug.h
index 1249110..52e37cd 100644
--- a/libsrc/Wi/pldebug.h
+++ b/libsrc/Wi/pldebug.h
@@ -1,14 +1,14 @@
/*
* pldebug.h
*
- * $Id: pldebug.h,v 1.4.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: pldebug.h,v 1.4.2.1 2009/04/18 21:55:12 source Exp $
*
* PL debugger structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/plugin_gate.c b/libsrc/Wi/plugin_gate.c
index 560ad00..8f7ced6 100644
--- a/libsrc/Wi/plugin_gate.c
+++ b/libsrc/Wi/plugin_gate.c
@@ -1,10 +1,10 @@
/*
- * $Id: plugin_gate.c,v 1.2.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: plugin_gate.c,v 1.2.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/plugin_loader.c b/libsrc/Wi/plugin_loader.c
index 345e2e1..985e410 100644
--- a/libsrc/Wi/plugin_loader.c
+++ b/libsrc/Wi/plugin_loader.c
@@ -1,10 +1,10 @@
/*
- * $Id: plugin_loader.c,v 1.5.2.2 2012/03/08 12:55:34 source Exp $
+ * $Id: plugin_loader.c,v 1.5.2.1 2009/04/18 21:55:12 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/pop3_svr.sql b/libsrc/Wi/pop3_svr.sql
index 25d1a86..0928cef 100644
--- a/libsrc/Wi/pop3_svr.sql
+++ b/libsrc/Wi/pop3_svr.sql
@@ -1,10 +1,10 @@
--
--- $Id: pop3_svr.sql,v 1.3.2.3 2012/03/08 12:55:34 source Exp $
+-- $Id: pop3_svr.sql,v 1.3.2.2 2011/09/28 17:01:16 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/rdf_core.c b/libsrc/Wi/rdf_core.c
index 744def6..b114590 100644
--- a/libsrc/Wi/rdf_core.c
+++ b/libsrc/Wi/rdf_core.c
@@ -1,10 +1,10 @@
/*
- * $Id: rdf_core.c,v 1.59.2.53 2012/03/08 12:55:34 source Exp $
+ * $Id: rdf_core.c,v 1.59.2.48 2011/10/13 13:59:06 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -209,9 +209,6 @@ tf_free (triple_feed_t *tf)
dk_free_tree (tf->tf_current_graph_uri);
dk_free_tree (tf->tf_default_graph_iid);
dk_free_tree (tf->tf_current_graph_iid);
- dk_free_tree (tf->tf_boxed_input_name);
- dk_free_tree (tf->tf_base_uri);
- dk_free_tree (tf->tf_default_graph_uri);
dk_free (tf, sizeof (triple_feed_t));
}
@@ -416,7 +413,7 @@ tf_report (triple_feed_t *tf, char msg_type, const char *sqlstate, const char *s
BOX_AUTO_TYPED (void **, params, params_buf, sizeof (caddr_t) * 11, DV_ARRAY_OF_POINTER);
msg_no_box = box_num (tf->tf_message_count++);
msg_type_box = box_dv_short_nchars (&msg_type, 1);
- inp_name_box = box_copy (tf->tf_boxed_input_name);
+ inp_name_box = box_dv_short_string (tf->tf_input_name);
line_no_box = ((NULL != tf->tf_line_no_ptr) ? box_num (tf->tf_line_no_ptr[0]) : NULL);
triple_no_box = box_num (tf->tf_triple_count);
sqlstate_box = box_dv_short_string (sqlstate);
@@ -513,7 +510,7 @@ tf_new_base (triple_feed_t *tf, caddr_t new_base)
caddr_t
-bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, int mode_bits, const char *bifname)
+bif_rdf_load_rdfxml (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t text_arg;
dtp_t dtp_of_text_arg;
@@ -527,17 +524,18 @@ bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
caddr_t graph_uri;
ccaddr_t *cbk_names;
caddr_t *app_env;
+ int mode_bits = 0;
int n_args = BOX_ELEMENTS (args);
/*wcharset_t * volatile charset = QST_CHARSET (qst) ? QST_CHARSET (qst) : default_charset;*/
- text_arg = bif_arg (qst, args, 0, bifname);
- mode_bits |= bif_long_arg (qst, args, 1, bifname);
- graph_uri = bif_string_or_wide_or_uname_arg (qst, args, 2, bifname);
- cbk_names = (ccaddr_t *)bif_strict_type_array_arg (DV_STRING, qst, args, 3, bifname);
- app_env = (caddr_t *) bif_arg (qst, args, 4, bifname);
+ text_arg = bif_arg (qst, args, 0, "rdf_load_rdfxml");
+ mode_bits = bif_long_arg (qst, args, 1, "rdf_load_rdfxml");
+ graph_uri = bif_string_or_wide_or_uname_arg (qst, args, 2, "rdf_load_rdfxml");
+ cbk_names = (ccaddr_t *)bif_strict_type_array_arg (DV_STRING, qst, args, 3, "rdf_load_rdfxml");
+ app_env = (caddr_t *) bif_arg (qst, args, 4, "rdf_load_rdfxml");
if ((COUNTOF__TRIPLE_FEED__REQUIRED > BOX_ELEMENTS (cbk_names)) || (COUNTOF__TRIPLE_FEED__ALL < BOX_ELEMENTS (cbk_names)))
sqlr_new_error ("22023", "RDF01",
- "The argument #4 of %.200s() should be a vector of %d to %d names of stored procedures",
- bifname, COUNTOF__TRIPLE_FEED__REQUIRED, COUNTOF__TRIPLE_FEED__ALL );
+ "The argument #4 of rdf_load_rdfxml() should be a vector of %d to %d names of stored procedures",
+ COUNTOF__TRIPLE_FEED__REQUIRED, COUNTOF__TRIPLE_FEED__ALL );
dtp_of_text_arg = DV_TYPE_OF (text_arg);
/*ns_2dict.xn2_size = 0;*/
do
@@ -558,12 +556,12 @@ bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
int ses_sort = looks_like_serialized_xml (((query_instance_t *)(qst)), text_arg);
if (XE_XPER_SERIALIZATION == ses_sort)
sqlr_error ("42000",
- "Function %.200s() does not support loading from string session with persistent XML data", bifname );
+ "Function rdf_load_rdfxml() does not support loading from string session with persistent XML data");
if (XE_XPACK_SERIALIZATION == ses_sort)
{
#if 1
sqlr_error ("42000",
- "Function %.200s() does not support loading from string session with packed XML data", bifname );
+ "Function rdf_load_rdfxml() does not support loading from string session with packed XML data");
#else
caddr_t *tree_tmp = NULL; /* Solely to avoid dummy warning C4090: 'function' : different 'volatile' qualifiers */
xte_deserialize_packed ((dk_session_t *)text_arg, &tree_tmp, dtd_ptr);
@@ -579,18 +577,18 @@ bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
}
if (dtp_of_text_arg == DV_BLOB_XPER_HANDLE)
sqlr_error ("42000",
- "Function %.200s() does not support loading from persistent XML objects", bifname );
+ "Function rdf_load_rdfxml() does not support loading from persistent XML objects");
if ((DV_BLOB_HANDLE == dtp_of_text_arg) || (DV_BLOB_WIDE_HANDLE == dtp_of_text_arg))
{
int blob_sort = looks_like_serialized_xml (((query_instance_t *)(qst)), text_arg);
if (XE_XPER_SERIALIZATION == blob_sort)
sqlr_error ("42000",
- "Function %.200s() does not support loading from BLOBs with persistent XML data", bifname );
+ "Function rdf_load_rdfxml() does not support loading from BLOBs with persistent XML data");
if (XE_XPACK_SERIALIZATION == blob_sort)
{
#if 1
sqlr_error ("42000",
- "Function %.200s() does not support loading from BLOBs with packed XML data", bifname );
+ "Function rdf_load_rdfxml() does not support loading from BLOBs with packed XML data");
#else
caddr_t *tree_tmp = NULL; /* Solely to avoid dummy warning C4090: 'function' : different 'volatile' qualifiers */
dk_session_t *ses = blob_to_string_output (((query_instance_t *)(qst))->qi_trx, text_arg);
@@ -600,7 +598,7 @@ bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
dtd_addref (dtd, 0);
strses_free (ses);
if ((NULL == tree) && (DEAD_HTML != (parser_mode & ~(FINE_XSLT | GE_XML | WEBIMPORT_HTML | FINE_XML_SRCPOS))))
- sqlr_error ("42000", "The BLOB passed to a function %.200s() contains corrupted packed XML serialization data", bifname);
+ sqlr_error ("42000", "The BLOB passed to a function rdf_load_rdfxml() contains corrupted packed XML serialization data");
goto tree_complete; /* see below */
#endif
}
@@ -608,8 +606,8 @@ bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
break;
}
sqlr_error ("42000",
- "Function %.200s() needs a string or string session or BLOB as argument 1, not an arg of type %s (%d), bifname",
- bifname, dv_type_title (dtp_of_text_arg), dtp_of_text_arg);
+ "Function rdf_load_rdfxml() needs a string or string session or BLOB as argument 1, not an arg of type %s (%d)",
+ dv_type_title (dtp_of_text_arg), dtp_of_text_arg);
} while (0);
/* Now we have \c text ready to process */
@@ -621,13 +619,13 @@ bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
{
default:
/* case 9:
- dtd_config = bif_array_or_null_arg (qst, args, 8, bifname);*/
+ dtd_config = bif_array_or_null_arg (qst, args, 8, "rdf_load_rdfxml");*/
case 8:
- lh = lh_get_handler (bif_string_arg (qst, args, 7, bifname));
+ lh = lh_get_handler (bif_string_arg (qst, args, 7, "rdf_load_rdfxml"));
case 7:
- enc = bif_string_arg (qst, args, 6, bifname);
+ enc = bif_string_arg (qst, args, 6, "rdf_load_rdfxml");
case 6:
- base_uri = bif_string_or_uname_or_wide_or_null_arg (qst, args, 5, bifname);
+ base_uri = bif_string_or_uname_arg (qst, args, 5, "rdf_load_rdfxml");
case 5:
case 4:
case 3:
@@ -644,27 +642,6 @@ bif_rdf_load_rdfxml_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
}
-caddr_t
-bif_rdf_load_rdfxml (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_load_rdfxml_impl (qst, err_ret, args, 0, "rdf_load_rdfxml");
-}
-
-
-caddr_t
-bif_rdf_load_rdfa (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_load_rdfxml_impl (qst, err_ret, args, RDFXML_IN_ATTRIBUTES, "rdf_load_rdfa");
-}
-
-
-caddr_t
-bif_rdf_load_microdata (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_load_rdfxml_impl (qst, err_ret, args, RDFXML_IN_MDATA, "rdf_load_microdata");
-}
-
-
ttlp_t *
ttlp_alloc (void)
{
@@ -678,46 +655,10 @@ ttlp_alloc (void)
}
void
-ttlp_enter_trig_group (ttlp_t *ttlp)
-{
- ttlp->ttlp_default_ns_uri_saved = ttlp->ttlp_default_ns_uri;
- ttlp->ttlp_base_uri_saved = ttlp->ttlp_base_uri;
- ttlp->ttlp_in_trig_graph = 1;
-}
-
-void
-ttlp_leave_trig_group (ttlp_t *ttlp)
-{
- if (ttlp->ttlp_default_ns_uri_saved != ttlp->ttlp_default_ns_uri)
- {
- dk_free_box (ttlp->ttlp_default_ns_uri);
- ttlp->ttlp_default_ns_uri = ttlp->ttlp_default_ns_uri_saved;
- ttlp->ttlp_default_ns_uri_saved = NULL;
- }
- if (ttlp->ttlp_base_uri_saved != ttlp->ttlp_base_uri)
- {
- dk_free_box (ttlp->ttlp_base_uri);
- ttlp->ttlp_base_uri = ttlp->ttlp_base_uri_saved;
- ttlp->ttlp_base_uri_saved = NULL;
- }
- dk_free_box ((caddr_t)(ttlp->ttlp_inner_namespaces_prefix2iri));
- ttlp->ttlp_inner_namespaces_prefix2iri = NULL;
- ttlp->ttlp_in_trig_graph = 0;
-}
-
-void
ttlp_free (ttlp_t *ttlp)
{
- if (ttlp->ttlp_in_trig_graph)
- {
- dk_free_box ((caddr_t)(ttlp->ttlp_inner_namespaces_prefix2iri));
- if (ttlp->ttlp_default_ns_uri_saved != ttlp->ttlp_default_ns_uri)
- dk_free_box (ttlp->ttlp_default_ns_uri_saved);
- if (ttlp->ttlp_base_uri_saved != ttlp->ttlp_base_uri)
- dk_free_box (ttlp->ttlp_base_uri_saved);
- }
dk_free_box (ttlp->ttlp_default_ns_uri);
- dk_free_box ((caddr_t)(ttlp->ttlp_namespaces_prefix2iri));
+ dk_free_box (ttlp->ttlp_namespaces_prefix2iri);
while (NULL != ttlp->ttlp_saved_uris)
dk_free_tree ((box_t) dk_set_pop (&(ttlp->ttlp_saved_uris)));
while (NULL != ttlp->ttlp_unused_seq_bnodes)
@@ -729,6 +670,8 @@ ttlp_free (ttlp_t *ttlp)
dk_free_tree (ttlp->ttlp_obj_type);
dk_free_tree (ttlp->ttlp_obj_lang);
dk_free_tree (ttlp->ttlp_formula_iid);
+ dk_free_tree (ttlp->ttlp_tf->tf_base_uri);
+ dk_free_tree (ttlp->ttlp_tf->tf_default_graph_uri);
tf_free (ttlp->ttlp_tf);
dk_free (ttlp, sizeof (ttlp_t));
}
@@ -854,7 +797,6 @@ caddr_t ttlp_strliteral (ttlp_t *ttlp_arg, const char *strg, int mode, char deli
}
}
res = box_dv_short_nchars (tmp_buf, tgt_tail - tmp_buf);
- box_flags (res) = BF_UTF8;
dk_free_box (tmp_buf);
return res;
@@ -924,28 +866,25 @@ this means that <#foo> can be written :foo and using @keywords one can reduce th
goto ns_uri_found; /* see below */
}
lname++;
+ ns_dict = ttlp_arg[0].ttlp_namespaces_prefix2iri;
ns_pref = box_dv_short_nchars (qname, lname - qname);
- do {
- if (ttlp_arg[0].ttlp_in_trig_graph)
+ ns_uri_ptr = ((NULL == ns_dict) ? NULL : (caddr_t *) id_hash_get (ns_dict, (caddr_t)(&ns_pref)));
+ if (NULL != ns_uri_ptr)
+ ns_uri = ns_uri_ptr[0];
+ else
+ {
+ if (!strcmp (ns_pref, "rdf:"))
+ ns_uri = uname_rdf_ns_uri;
+ else if (!strcmp (ns_pref, "xsd:"))
+ ns_uri = uname_xmlschema_ns_uri_hash;
+ else if (!strcmp (ns_pref, "virtrdf:"))
+ ns_uri = uname_virtrdf_ns_uri;
+ else
{
- ns_dict = ttlp_arg[0].ttlp_inner_namespaces_prefix2iri;
- ns_uri_ptr = ((NULL == ns_dict) ? NULL : (caddr_t *) id_hash_get (ns_dict, (caddr_t)(&ns_pref)));
- if (NULL != ns_uri_ptr)
- { ns_uri = ns_uri_ptr[0]; break; }
+ dk_free_box (ns_pref);
+ ttlyyerror_impl (ttlp_arg, qname, "Undefined namespace prefix");
}
- ns_dict = ttlp_arg[0].ttlp_namespaces_prefix2iri;
- ns_uri_ptr = ((NULL == ns_dict) ? NULL : (caddr_t *) id_hash_get (ns_dict, (caddr_t)(&ns_pref)));
- if (NULL != ns_uri_ptr)
- { ns_uri = ns_uri_ptr[0]; break; }
- if (!strcmp (ns_pref, "rdf:"))
- { ns_uri = uname_rdf_ns_uri; break; }
- if (!strcmp (ns_pref, "xsd:"))
- { ns_uri = uname_xmlschema_ns_uri_hash; break; }
- if (!strcmp (ns_pref, "virtrdf:"))
- { ns_uri = uname_virtrdf_ns_uri; break; }
- dk_free_box (ns_pref);
- ttlyyerror_impl (ttlp_arg, qname, "Undefined namespace prefix");
- } while (0);
+ }
dk_free_box (ns_pref);
ns_uri_len = box_length (ns_uri) - 1;
@@ -1047,7 +986,7 @@ ttlp_triple_l_and_inf (ttlp_t *ttlp_arg, caddr_t o_sqlval, caddr_t o_dt, caddr_t
}
void
-ttlp_triples_for_bnodes_debug (ttlp_t *ttlp_arg, caddr_t bnode_iid, int lineno, caddr_t label)
+ttlp_triples_for_bnodes_debug (ttlp_t *ttlp_arg, caddr_t bnode_iid, int lineno, const char *label)
{
triple_feed_t *tf = ttlp_arg[0].ttlp_tf;
if (NULL != ttlp_arg->ttlp_base_uri)
@@ -1541,13 +1480,13 @@ lt_nic_rollback_hook (lock_trx_t * lt)
caddr_t
-DBG_NAME(nic_id_name) (DBG_PARAMS name_id_cache_t * nic, boxint id)
+nic_id_name (name_id_cache_t * nic, boxint id)
{
caddr_t ret;
boxint r;
mutex_enter (nic->nic_mtx);
gethash_64 (r, id, nic->nic_id_to_name);
- ret = r ? DBG_NAME (box_copy) (DBG_ARGS (caddr_t) (ptrlong)r) : NULL;
+ ret = r ? box_copy ((caddr_t) (ptrlong)r) : NULL;
/* read the value inside the mtx because cache replacement may del it before the copy is made if not in the mtx */
mutex_leave(nic->nic_mtx);
return ret;
@@ -1684,8 +1623,9 @@ tb_string_and_id_check (dbe_table_t * tb, dbe_column_t ** str_col, dbe_column_t
return 1;
}
+int32 iri_range_size = 10000;
#define N_IRI_SEQS 19
-#define IRI_RANGE_SZ 10000
+#define IRI_RANGE_SZ iri_range_size
extern dk_mutex_t * log_write_mtx;
@@ -2523,13 +2463,13 @@ caddr_t
bif_iri_to_id_repl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t name = bif_arg (qst, args, 0, "iri_to_id_repl");
+ caddr_t tmp_name = NULL;
caddr_t err = NULL;
caddr_t res;
switch (DV_TYPE_OF (name))
{
case DV_LONG_INT: case DV_IRI_ID:
{
- /* caddr_t tmp_name = NULL; */
iri_id_t iid = unbox_iri_int64 (name);
if (iid < min_bnode_iri_id ())
sqlr_new_error ("22023", "SR626", "The argument of iri_to_id_repl() is an IRI_ID of URI");
@@ -3537,10 +3477,6 @@ rdf_core_init (void)
prefix_nic_rc = resource_allocate (10, NULL, (rc_destr_t)nic_free, (rc_destr_t)nic_clear, 0);
bif_define_typed ("rdf_load_rdfxml", bif_rdf_load_rdfxml, &bt_xml_entity);
bif_set_uses_index (bif_rdf_load_rdfxml);
- bif_define_typed ("rdf_load_rdfa", bif_rdf_load_rdfa, &bt_xml_entity);
- bif_set_uses_index (bif_rdf_load_rdfa);
- bif_define_typed ("rdf_load_microdata", bif_rdf_load_microdata, &bt_xml_entity);
- bif_set_uses_index (bif_rdf_load_microdata);
bif_define ("rdf_load_turtle", bif_rdf_load_turtle);
bif_set_uses_index (bif_rdf_load_turtle);
bif_define ("rdf_load_turtle_local_file", bif_rdf_load_turtle_local_file);
diff --git a/libsrc/Wi/rdf_core.h b/libsrc/Wi/rdf_core.h
index c7e6af1..042a9e9 100644
--- a/libsrc/Wi/rdf_core.h
+++ b/libsrc/Wi/rdf_core.h
@@ -1,10 +1,10 @@
/*
- * $Id: rdf_core.h,v 1.30.2.30 2012/03/08 12:55:34 source Exp $
+ * $Id: rdf_core.h,v 1.30.2.27 2011/10/13 12:14:27 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -44,7 +44,7 @@ extern int key_id_to_namespace_and_local (query_instance_t *qi, iri_id_t iid, ca
#define rdf_type_twobyte_to_iri(twobyte) nic_id_name (rdf_type_cache, (twobyte))
#define rdf_lang_twobyte_to_string(twobyte) nic_id_name (rdf_lang_cache, (twobyte))
/*! \returns NULL for string, (ccaddr_t)((ptrlong)1) for unsupported, 2 for NULL, UNAME for others */
-extern caddr_t xsd_type_of_box (caddr_t arg);
+extern ccaddr_t xsd_type_of_box (caddr_t arg);
/*! Casts \c new_val to some datatype appropriate for XPATH/XSLT and stores in an XSLT variable value or XQI slot passed as an address to free and set */
extern void rb_cast_to_xpath_safe (query_instance_t *qi, caddr_t new_val, caddr_t *retval_ptr);
#define BNODE_IID_TO_LABEL_BUFFER(buf,iid) (((iid) >= MIN_64BIT_BNODE_IRI_ID) ? \
@@ -81,10 +81,10 @@ typedef struct triple_feed_s {
query_instance_t *tf_qi;
id_hash_t *tf_blank_node_ids;
caddr_t *tf_app_env; /*!< Environment for use by callbacks, owned by caller. It's "caddr_t *" instead of plain "caddr_t" because it's vector in most cases. */
- caddr_t tf_boxed_input_name; /*!< URI or file name or other name of source, can be NULL, local */
- caddr_t tf_default_graph_uri; /*!< Default graph uri, local */
- caddr_t tf_current_graph_uri; /*!< Currently active graph uri, can be equal to tf_default_graph_uri, local */
- caddr_t tf_base_uri; /*!< Base URI to resolve relative URIs, local */
+ const char *tf_input_name; /*!< URI or file name or other name of source, can be NULL, owned by caller */
+ caddr_t tf_default_graph_uri; /*!< Default graph uri, owned by caller */
+ caddr_t tf_current_graph_uri; /*!< Currently active graph uri, owned by caller if equal to tf_default_graph_uri, local otherwise */
+ caddr_t tf_base_uri; /*!< Base URI to resolve relative URIs, owned by caller */
caddr_t tf_default_graph_iid; /*!< Default graph iri ID, local */
caddr_t tf_current_graph_iid; /*!< Current graph iri ID, local */
const char *tf_creator; /*!< Name of BIF that created the feed (this name is printed in diagnostics) */
@@ -197,18 +197,12 @@ typedef struct ttlp_s
caddr_t ttlp_obj_lang; /*!< Current object language mark */
int ttlp_pred_is_reverse; /*!< Flag if ttlp_pred_uri is used as reverse, e.g. in 'O is P of S' syntax */
caddr_t ttlp_formula_iid; /*!< IRI ID of the blank node of the formula ( '{ ... }' notation of N3 */
- int ttlp_in_trig_graph; /*!< The parser is inside TriG graph so \c ttlp_inner_namespaces_prefix2iri is in use etc. */
- id_hash_t *ttlp_inner_namespaces_prefix2iri; /*!< An equivalent of \c ttlp_namespaces_prefix2iri for prefixes defined inside TriG block */
- caddr_t ttlp_default_ns_uri_saved; /*!< In TriG, @prefix can be used inside the graph block, in that case global \c ttlp_default_ns_uri is temporarily saved here */
- caddr_t ttlp_base_uri_saved; /*!< In TriG, @base can be used inside the graph block, in that case global \c ttlp_base_uri is temporarily saved here */
/* feeder */
triple_feed_t *ttlp_tf;
} ttlp_t;
extern ttlp_t *ttlp_alloc (void);
-extern void ttlp_enter_trig_group (ttlp_t *ttlp);
-extern void ttlp_leave_trig_group (ttlp_t *ttlp);
extern void ttlp_free (ttlp_t *ttlp);
extern caddr_t rdf_load_turtle (
@@ -248,12 +242,11 @@ extern caddr_t ttl_lex_analyze (caddr_t str, int mode_bits, wcharset_t *query_ch
extern void ttlp_triple_and_inf (ttlp_t *ttlp_arg, caddr_t o_uri);
extern void ttlp_triple_l_and_inf (ttlp_t *ttlp_arg, caddr_t o_sqlval, caddr_t o_dt, caddr_t o_lang);
-extern void ttlp_triples_for_bnodes_debug (ttlp_t *ttlp_arg, caddr_t bnode_iid, int lineno, caddr_t label);
+extern void ttlp_triples_for_bnodes_debug (ttlp_t *ttlp_arg, caddr_t bnode_iid, int lineno, const char *label);
#define RDFXML_COMPLETE 0
#define RDFXML_OMIT_TOP_RDF 1
#define RDFXML_IN_ATTRIBUTES 2
-#define RDFXML_IN_MDATA 4
extern void
rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
diff --git a/libsrc/Wi/rdf_mapping.jso b/libsrc/Wi/rdf_mapping.jso
index a5dca4c..a7621f2 100644
--- a/libsrc/Wi/rdf_mapping.jso
+++ b/libsrc/Wi/rdf_mapping.jso
@@ -1,10 +1,10 @@
--
--- $Id: rdf_mapping.jso,v 1.24.2.7 2012/03/08 12:55:34 source Exp $
+-- $Id: rdf_mapping.jso,v 1.24.2.4 2010/09/17 22:49:23 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
@@ -78,7 +78,6 @@ JSO_SCALAR qmfIsrefOfShortTmpl STRING REQUIRED --!< ... whether the short is re
JSO_SCALAR qmfIsuriOfShortTmpl STRING REQUIRED --!< ... whether the short is uri
JSO_SCALAR qmfIsblankOfShortTmpl STRING REQUIRED --!< ... whether the short is blank node ref
JSO_SCALAR qmfIslitOfShortTmpl STRING REQUIRED --!< ... whether the short is literal
-JSO_SCALAR qmfIsnumericOfShortTmpl STRING OPTIONAL --!< ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
-- Templates of 0/1 integer expressions that tell whether the short is of some sort:
JSO_SCALAR qmf01uriOfShortTmpl STRING OPTIONAL --!< ... whether the short is uri, result is 1 or 0
JSO_SCALAR qmf01blankOfShortTmpl STRING OPTIONAL --!< ... whether the short is blank node ref, result is 1 or 0
@@ -215,19 +214,10 @@ JSO_SCALAR qmAllConds STRING_array PRIVATE --!< Complete list of all join condi
JSO_SCALAR qmAllCondCount INTEGER PRIVATE --!< Number of used elements in qmAllCondCount
JSO_STRUCT_END
-JSO_STRUCT_BEGIN sparql_macro_library virtrdf SparqlMacroLibrary --!< Library of SPARQL macro definitions that are loaded automatically when the storage is used
-JSO_SCALAR smlSourceText STRING REQUIRED --!< Source text of the library
-JSO_SCALAR smlCompilationState INTEGER PRIVATE --!< 2 for completely (and successfull compilation, 1 for compilation in progress, 0 for not even started
-JSO_SCALAR smlIncludes ANY PRIVATE --!< IRIs of included macro libraries
-JSO_SCALAR smlList ANY PRIVATE --!< The compiled library
-JSO_STRUCT_END
-
-
JSO_STRUCT_BEGIN quad_storage virtrdf QuadStorage --!< All mapping patterns plus tracking info
JSO_POINTER qsMjvMaps quad_map_array OPTIONAL
JSO_POINTER qsUserMaps quad_map_array OPTIONAL
JSO_POINTER qsDefaultMap quad_map OPTIONAL
-JSO_POINTER qsMacroLibrary sparql_macro_library OPTIONAL
JSO_SCALAR qsMatchingFlags BITMASK OPTIONAL
JSO_SCALAR qsAlterInProgress ANY OPTIONAL
JSO_STRUCT_END
diff --git a/libsrc/Wi/rdf_mapping_jso.c b/libsrc/Wi/rdf_mapping_jso.c
index 6bf26ec..f8993ad 100644
--- a/libsrc/Wi/rdf_mapping_jso.c
+++ b/libsrc/Wi/rdf_mapping_jso.c
@@ -1,10 +1,10 @@
/* */
-/* $Id: rdf_mapping.jso,v 1.24.2.7 2012/03/08 12:55:34 source Exp $ */
+/* $Id: rdf_mapping.jso,v 1.24.2.4 2010/09/17 22:49:23 source Exp $ */
/* */
/* This file is part of the OpenLink Software Virtuoso Open-Source (VOS) */
/* project. */
/* */
-/* Copyright (C) 1998-2012 OpenLink Software */
+/* Copyright (C) 1998-2009 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 */
@@ -79,7 +79,6 @@ jso_field_descr_t jso_fields__qm_format[] = {
{ NULL , "qmfIsuriOfShortTmpl" , JSO_STRING , JSO_REQUIRED , JSO_FIELD_OFFSET(qm_format_t,qmfIsuriOfShortTmpl) , NULL },
{ NULL , "qmfIsblankOfShortTmpl" , JSO_STRING , JSO_REQUIRED , JSO_FIELD_OFFSET(qm_format_t,qmfIsblankOfShortTmpl) , NULL },
{ NULL , "qmfIslitOfShortTmpl" , JSO_STRING , JSO_REQUIRED , JSO_FIELD_OFFSET(qm_format_t,qmfIslitOfShortTmpl) , NULL },
- { NULL , "qmfIsnumericOfShortTmpl" , JSO_STRING , JSO_OPTIONAL , JSO_FIELD_OFFSET(qm_format_t,qmfIsnumericOfShortTmpl) , NULL },
/* Templates of 0/1 integer expressions that tell whether the short is of some sort: */
{ NULL , "qmf01uriOfShortTmpl" , JSO_STRING , JSO_OPTIONAL , JSO_FIELD_OFFSET(qm_format_t,qmf01uriOfShortTmpl) , NULL },
{ NULL , "qmf01blankOfShortTmpl" , JSO_STRING , JSO_OPTIONAL , JSO_FIELD_OFFSET(qm_format_t,qmf01blankOfShortTmpl) , NULL },
@@ -304,31 +303,6 @@ jso_class_descr_t jso__quad_map = {
-1, jso_fields__quad_map, NULL },
{ NULL, 0, 0} } };
-jso_class_descr_t jso__sparql_macro_library_array = {
- JSO_CAT_ARRAY, "array of struct sparql_macro_library_s *",
- "http://www.openlinksw.com/schemas/virtrdf#array-of-SparqlMacroLibrary" ,
- "http://www.openlinksw.com/schemas/virtrdf#" , "array-of-SparqlMacroLibrary" ,
- NULL, {
- { 0, -1, NULL, NULL },
- { "http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary" , 0, (SMALLEST_POSSIBLE_POINTER-2)} } };
-
-jso_field_descr_t jso_fields__sparql_macro_library[] = {
- { NULL , "smlSourceText" , JSO_STRING , JSO_REQUIRED , JSO_FIELD_OFFSET(sparql_macro_library_t,smlSourceText) , NULL },
- { NULL , "smlCompilationState" , JSO_INTEGER , JSO_PRIVATE , JSO_FIELD_OFFSET(sparql_macro_library_t,smlCompilationState) , NULL },
- { NULL , "smlIncludes" , JSO_ANY , JSO_PRIVATE , JSO_FIELD_OFFSET(sparql_macro_library_t,smlIncludes) , NULL },
- { NULL , "smlList" , JSO_ANY , JSO_PRIVATE , JSO_FIELD_OFFSET(sparql_macro_library_t,smlList) , NULL },
- { NULL , NULL , NULL ,0xdeadce11 ,0xdeadce11 ,NULL } };
-
-jso_class_descr_t jso__sparql_macro_library = {
- JSO_CAT_STRUCT, "struct sparql_macro_library_s",
- "http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary" ,
- "http://www.openlinksw.com/schemas/virtrdf#" , "SparqlMacroLibrary" ,
- NULL, {
- {
- sizeof (sparql_macro_library_t),
- -1, jso_fields__sparql_macro_library, NULL },
- { NULL, 0, 0} } };
-
jso_class_descr_t jso__quad_storage_array = {
JSO_CAT_ARRAY, "array of struct quad_storage_s *",
"http://www.openlinksw.com/schemas/virtrdf#array-of-QuadStorage" ,
@@ -341,7 +315,6 @@ jso_field_descr_t jso_fields__quad_storage[] = {
{ NULL , "qsMjvMaps" , JSO_IRI_OF_quad_map_array , JSO_OPTIONAL , JSO_FIELD_OFFSET(quad_storage_t,qsMjvMaps) , NULL },
{ NULL , "qsUserMaps" , JSO_IRI_OF_quad_map_array , JSO_OPTIONAL , JSO_FIELD_OFFSET(quad_storage_t,qsUserMaps) , NULL },
{ NULL , "qsDefaultMap" , JSO_IRI_OF_quad_map , JSO_OPTIONAL , JSO_FIELD_OFFSET(quad_storage_t,qsDefaultMap) , NULL },
- { NULL , "qsMacroLibrary" , JSO_IRI_OF_sparql_macro_library , JSO_OPTIONAL , JSO_FIELD_OFFSET(quad_storage_t,qsMacroLibrary) , NULL },
{ NULL , "qsMatchingFlags" , JSO_BITMASK , JSO_OPTIONAL , JSO_FIELD_OFFSET(quad_storage_t,qsMatchingFlags) , NULL },
{ NULL , "qsAlterInProgress" , JSO_ANY , JSO_OPTIONAL , JSO_FIELD_OFFSET(quad_storage_t,qsAlterInProgress) , NULL },
{ NULL , NULL , NULL ,0xdeadce11 ,0xdeadce11 ,NULL } };
@@ -396,8 +369,6 @@ rdf_mapping_jso_init (void)
jso_define_class(&jso__qm_value);
jso_define_class(&jso__quad_map_array);
jso_define_class(&jso__quad_map);
- jso_define_class(&jso__sparql_macro_library_array);
- jso_define_class(&jso__sparql_macro_library);
jso_define_class(&jso__quad_storage_array);
jso_define_class(&jso__quad_storage);
}
diff --git a/libsrc/Wi/rdf_mapping_jso.h b/libsrc/Wi/rdf_mapping_jso.h
index 8196c0d..692bbbc 100644
--- a/libsrc/Wi/rdf_mapping_jso.h
+++ b/libsrc/Wi/rdf_mapping_jso.h
@@ -1,12 +1,12 @@
#ifndef __RFD_MAPPING_JSO_H
#define __RFD_MAPPING_JSO_H
/* */
-/* $Id: rdf_mapping.jso,v 1.24.2.7 2012/03/08 12:55:34 source Exp $ */
+/* $Id: rdf_mapping.jso,v 1.24.2.4 2010/09/17 22:49:23 source Exp $ */
/* */
/* This file is part of the OpenLink Software Virtuoso Open-Source (VOS) */
/* project. */
/* */
-/* Copyright (C) 1998-2012 OpenLink Software */
+/* Copyright (C) 1998-2009 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 */
@@ -90,7 +90,6 @@ typedef struct qm_format_s
ccaddr_t qmfIsuriOfShortTmpl; /*!< ... whether the short is uri */
ccaddr_t qmfIsblankOfShortTmpl; /*!< ... whether the short is blank node ref */
ccaddr_t qmfIslitOfShortTmpl; /*!< ... whether the short is literal */
- ccaddr_t qmfIsnumericOfShortTmpl; /*!< ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number) */
/* Templates of 0/1 integer expressions that tell whether the short is of some sort: */
ccaddr_t qmf01uriOfShortTmpl; /*!< ... whether the short is uri, result is 1 or 0 */
ccaddr_t qmf01blankOfShortTmpl; /*!< ... whether the short is blank node ref, result is 1 or 0 */
@@ -225,19 +224,6 @@ typedef struct quad_map_s
ptrlong qmAllCondCount; /*!< Number of used elements in qmAllCondCount */
} quad_map_t;
-#define JSO_IRI_OF_sparql_macro_library_array "http://www.openlinksw.com/schemas/virtrdf#array-of-SparqlMacroLibrary"
-typedef struct sparql_macro_library_s * *sparql_macro_library_array_t;
-
-/*! Library of SPARQL macro definitions that are loaded automatically when the storage is used */
-#define JSO_IRI_OF_sparql_macro_library "http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary"
-typedef struct sparql_macro_library_s
-{
- ccaddr_t smlSourceText; /*!< Source text of the library */
- ptrlong smlCompilationState; /*!< 2 for completely (and successfull compilation, 1 for compilation in progress, 0 for not even started */
- ccaddr_t smlIncludes; /*!< IRIs of included macro libraries */
- ccaddr_t smlList; /*!< The compiled library */
-} sparql_macro_library_t;
-
#define JSO_IRI_OF_quad_storage_array "http://www.openlinksw.com/schemas/virtrdf#array-of-QuadStorage"
typedef struct quad_storage_s * *quad_storage_array_t;
@@ -248,7 +234,6 @@ typedef struct quad_storage_s
quad_map_array_t qsMjvMaps; /*!< */
quad_map_array_t qsUserMaps; /*!< */
struct quad_map_s * qsDefaultMap; /*!< */
- struct sparql_macro_library_s * qsMacroLibrary; /*!< */
ptrlong qsMatchingFlags; /*!< */
ccaddr_t qsAlterInProgress; /*!< */
} quad_storage_t;
diff --git a/libsrc/Wi/rdf_mapping_jso.ttl b/libsrc/Wi/rdf_mapping_jso.ttl
index 06bb878..8db24a8 100644
--- a/libsrc/Wi/rdf_mapping_jso.ttl
+++ b/libsrc/Wi/rdf_mapping_jso.ttl
@@ -5,12 +5,12 @@
@prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#> .
<!-- -->
-<!-- $Id: rdf_mapping.jso,v 1.24.2.7 2012/03/08 12:55:34 source Exp $ -->
+<!-- $Id: rdf_mapping.jso,v 1.24.2.4 2010/09/17 22:49:23 source Exp $ -->
<!-- -->
<!-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -->
<!-- project. -->
<!-- -->
-<!-- Copyright (C) 1998-2012 OpenLink Software -->
+<!-- Copyright (C) 1998-2009 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 -->
@@ -287,13 +287,6 @@
rdfs:Range xsd:string ;
virtrdf:cardinality 'single' ;
.
- <http://www.openlinksw.com/schemas/virtrdf#qmfIsnumericOfShortTmpl>
- rdf:type rdf:Property ;
- rdfs:comment "... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)" ;
- rdfs:Domain <http://www.openlinksw.com/schemas/virtrdf#QuadMapFormat> ;
- rdfs:Range xsd:string ;
- virtrdf:cardinality 'single' ;
- .
<!-- Templates of 0/1 integer expressions that tell whether the short is of some sort: -->
<http://www.openlinksw.com/schemas/virtrdf#qmf01uriOfShortTmpl>
rdf:type rdf:Property ;
@@ -1030,43 +1023,6 @@
.
# end of description of quad_map
- <http://www.openlinksw.com/schemas/virtrdf#array-of-SparqlMacroLibrary>
- rdf:type rdfs:Class ;
- .
- <http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary>
- rdf:type rdfs:Class ;
- rdfs:comment "Library of SPARQL macro definitions that are loaded automatically when the storage is used" ;
- .
- <http://www.openlinksw.com/schemas/virtrdf#smlSourceText>
- rdf:type rdf:Property ;
- rdfs:comment "Source text of the library" ;
- rdfs:Domain <http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary> ;
- rdfs:Range xsd:string ;
- virtrdf:cardinality 'single' ;
- .
- <http://www.openlinksw.com/schemas/virtrdf#smlCompilationState>
- rdf:type rdf:Property ;
- rdfs:comment "2 for completely (and successfull compilation, 1 for compilation in progress, 0 for not even started" ;
- rdfs:Domain <http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary> ;
- rdfs:Range xsd:integer ;
- virtrdf:cardinality 'single' ;
- .
- <http://www.openlinksw.com/schemas/virtrdf#smlIncludes>
- rdf:type rdf:Property ;
- rdfs:comment "IRIs of included macro libraries" ;
- rdfs:Domain <http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary> ;
- rdfs:Range xsd:any ;
- virtrdf:cardinality 'single' ;
- .
- <http://www.openlinksw.com/schemas/virtrdf#smlList>
- rdf:type rdf:Property ;
- rdfs:comment "The compiled library" ;
- rdfs:Domain <http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary> ;
- rdfs:Range xsd:any ;
- virtrdf:cardinality 'single' ;
- .
-# end of description of sparql_macro_library
-
<http://www.openlinksw.com/schemas/virtrdf#array-of-QuadStorage>
rdf:type rdfs:Class ;
.
@@ -1092,12 +1048,6 @@
rdfs:Range <http://www.openlinksw.com/schemas/virtrdf#QuadMap> ;
virtrdf:cardinality 'single' ;
.
- <http://www.openlinksw.com/schemas/virtrdf#qsMacroLibrary>
- rdf:type rdf:Property ;
- rdfs:Domain <http://www.openlinksw.com/schemas/virtrdf#QuadStorage> ;
- rdfs:Range <http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary> ;
- virtrdf:cardinality 'single' ;
- .
<http://www.openlinksw.com/schemas/virtrdf#qsMatchingFlags>
rdf:type rdf:Property ;
rdfs:Domain <http://www.openlinksw.com/schemas/virtrdf#QuadStorage> ;
diff --git a/libsrc/Wi/rdf_mapping_jso.ttl-sample b/libsrc/Wi/rdf_mapping_jso.ttl-sample
index d7048a4..274cbc3 100644
--- a/libsrc/Wi/rdf_mapping_jso.ttl-sample
+++ b/libsrc/Wi/rdf_mapping_jso.ttl-sample
@@ -5,12 +5,12 @@
@prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#> .
<!-- -->
-<!-- $Id: rdf_mapping.jso,v 1.24.2.7 2012/03/08 12:55:34 source Exp $ -->
+<!-- $Id: rdf_mapping.jso,v 1.24.2.4 2010/09/17 22:49:23 source Exp $ -->
<!-- -->
<!-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -->
<!-- project. -->
<!-- -->
-<!-- Copyright (C) 1998-2012 OpenLink Software -->
+<!-- Copyright (C) 1998-2009 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 -->
@@ -60,7 +60,6 @@
ns0:qmfIsuriOfShortTmpl ''; # JSO_STRING REQUIRED ... whether the short is uri
ns0:qmfIsblankOfShortTmpl ''; # JSO_STRING REQUIRED ... whether the short is blank node ref
ns0:qmfIslitOfShortTmpl ''; # JSO_STRING REQUIRED ... whether the short is literal
- ns0:qmfIsnumericOfShortTmpl ''; # JSO_STRING OPTIONAL ... whether the short is number (unlike SSG_VALMODE_NUM, no DATE/TIME etc., only number)
<!-- Templates of 0/1 integer expressions that tell whether the short is of some sort: -->
ns0:qmf01uriOfShortTmpl ''; # JSO_STRING OPTIONAL ... whether the short is uri, result is 1 or 0
ns0:qmf01blankOfShortTmpl ''; # JSO_STRING OPTIONAL ... whether the short is blank node ref, result is 1 or 0
@@ -190,20 +189,11 @@
ns0:qmAllCondCount ''; # JSO_INTEGER PRIVATE Number of used elements in qmAllCondCount
.
@prefix ns0: <http://www.openlinksw.com/schemas/virtrdf#> .
- <http://example.com/jso-samples#SparqlMacroLibrarySample>
- rdf_type ns0:SparqlMacroLibrary ;
- ns0:smlSourceText ''; # JSO_STRING REQUIRED Source text of the library
- ns0:smlCompilationState ''; # JSO_INTEGER PRIVATE 2 for completely (and successfull compilation, 1 for compilation in progress, 0 for not even started
- ns0:smlIncludes ''; # JSO_ANY PRIVATE IRIs of included macro libraries
- ns0:smlList ''; # JSO_ANY PRIVATE The compiled library
- .
- at prefix ns0: <http://www.openlinksw.com/schemas/virtrdf#> .
<http://example.com/jso-samples#QuadStorageSample>
rdf_type ns0:QuadStorage ;
ns0:qsMjvMaps ''; # JSO_IRI_OF_quad_map_array OPTIONAL
ns0:qsUserMaps ''; # JSO_IRI_OF_quad_map_array OPTIONAL
ns0:qsDefaultMap ''; # JSO_IRI_OF_quad_map OPTIONAL
- ns0:qsMacroLibrary ''; # JSO_IRI_OF_sparql_macro_library OPTIONAL
ns0:qsMatchingFlags ''; # JSO_BITMASK OPTIONAL
ns0:qsAlterInProgress ''; # JSO_ANY OPTIONAL
.
diff --git a/libsrc/Wi/rdf_net.sql b/libsrc/Wi/rdf_net.sql
index bd52db5..c3d8355 100644
--- a/libsrc/Wi/rdf_net.sql
+++ b/libsrc/Wi/rdf_net.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdf_net.sql,v 1.1.2.1 2012/03/08 12:55:34 source Exp $
+-- $Id: rdf_net.sql,v 1.1 2007/07/26 13:49:42 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/rdf_schema_objects.sql b/libsrc/Wi/rdf_schema_objects.sql
index 3a55144..6fc3a78 100644
--- a/libsrc/Wi/rdf_schema_objects.sql
+++ b/libsrc/Wi/rdf_schema_objects.sql
@@ -1,12 +1,12 @@
--
--- $Id: rdf_schema_objects.sql,v 1.11.2.28 2012/03/08 12:55:34 source Exp $
+-- $Id: rdf_schema_objects.sql,v 1.11.2.21 2011/10/21 12:03:58 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
-- RDF Schema objects, generator of RDF Views
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -175,11 +175,13 @@ create procedure rdf_view_ns_get_1 (in cols any, inout dict any)
;
create procedure
-RDF_VIEW_DROP_STMT_BY_GRAPH (in gr varchar)
+RDF_VIEW_DROP_STMT (in qualifier varchar)
{
declare drop_map any;
+ declare gr varchar;
drop_map := '';
+ gr := sprintf ('http://%s/%s#', virtuoso_ini_item_value ('URIQA','DefaultHost'), qualifier);
for select "s" from (sparql define input:storage ""
select ?s from virtrdf:
{
@@ -193,18 +195,6 @@ RDF_VIEW_DROP_STMT_BY_GRAPH (in gr varchar)
;
create procedure
-RDF_VIEW_DROP_STMT (in qualifier varchar)
-{
- declare drop_map any;
- declare gr varchar;
-
- drop_map := '';
- gr := sprintf ('http://%s/%s#', virtuoso_ini_item_value ('URIQA','DefaultHost'), qualifier);
- return RDF_VIEW_DROP_STMT_BY_GRAPH (gr);
-}
-;
-
-create procedure
RDF_VIEW_FROM_TBL (in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any := null)
{
declare create_count_count, create_class_stmt, create_view_stmt, sparql_pref, ns, sns, uriqa_str, ret, drop_map any;
@@ -1136,43 +1126,21 @@ RDF_VIEW_CHECK_SYNC_TB (in tb varchar)
;
create procedure
-RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0, in pgraph varchar := null)
-{
- declare gr varchar;
- gr := sprintf ('http://%s/%s#', virtuoso_ini_item_value ('URIQA','DefaultHost'), qualifier);
- return RDF_VIEW_SYNC_TO_PHYSICAL (gr, load_data, pgraph);
-}
-;
-
-create procedure
-RDF_VIEW_SYNC_TO_PHYSICAL (in vgraph varchar, in load_data int := 0, in pgraph varchar := null, in log_mode int := 1, in load_atomic int := 1)
+RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0)
{
declare mask varchar;
- declare txt, tbls, err_ret, opt any;
- declare stat, msg, gr varchar;
- declare old_mode int;
-
- old_mode := log_enable (log_mode, 1);
- declare exit handler for sqlstate '*' {
- log_enable (old_mode, 1);
- if (load_atomic)
- __atomic (0);
- };
-
- if (load_atomic)
- __atomic (1);
+ declare txt, tbls, err_ret any;
+ declare stat, msg varchar;
+
tbls := vector ();
err_ret := vector ();
- opt := vector ();
- gr := vgraph;
- if (length (pgraph))
- opt := vector (gr, pgraph);
+ mask := sprintf ('http://%s/schemas/%s/qm-%%', virtuoso_ini_item_value ('URIQA','DefaultHost'), qualifier);
for select "o" from
(sparql define input:storage "" select ?o from virtrdf:
{
virtrdf:DefaultQuadStorage-UserMaps ?p ?o .
?o a virtrdf:QuadMap .
- ?o virtrdf:qmGraphRange-rvrFixedValue `iri(?:gr)` .
+ filter (?o like ?:mask)
}
order by asc (bif:sprintf_inverse (bif:concat (str(rdf:_), "%d"), str (?p), 1))) x do
{
@@ -1205,7 +1173,7 @@ RDF_VIEW_SYNC_TO_PHYSICAL (in vgraph varchar, in load_data int := 0, in pgraph v
{
for (declare ctr int, ctr := 1; ctr <= 4; ctr := ctr + 1)
{
- txt := sparql_rdb2rdf_codegen (tb, ctr, opt);
+ txt := sparql_rdb2rdf_codegen (tb, ctr);
stat := '00000';
if (isvector (txt))
{
@@ -1235,129 +1203,6 @@ RDF_VIEW_SYNC_TO_PHYSICAL (in vgraph varchar, in load_data int := 0, in pgraph v
if (stat <> '00000') err_ret := vector_concat (err_ret, vector (sprintf ('%s: %s', stat, msg)));
}
}
- log_enable (old_mode, 1);
- if (load_atomic)
- {
- __atomic (0);
- exec ('checkpoint');
- }
return err_ret;
}
;
-
----------------------
--- R2RML generator
----------------------
-create procedure
-R2RML_FROM_TBL (in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any := null)
-{
- declare create_view_stmt, ns, sns any;
- declare total_select, total_tb, total, qual, pkcols any;
- declare vname, mask, graph, uriqa_str varchar;
-
- rdf_view_tbl_pk_cols (_tbls, pkcols);
- cols := rdf_view_tbl_opts (_tbls, cols);
- sns := ns := sprintf ('@prefix rr: <http://www.w3.org/ns/r2rml#> .\n at prefix %s: <http://%s/schemas/%s/> .\n', qualifier, virtuoso_ini_item_value ('URIQA','DefaultHost'), qualifier);
-
- if (gen_stat)
- {
- ns := ns || sprintf ('@prefix %s-stat: <http://%s/%s/stat#> .\n', lcase (qualifier), virtuoso_ini_item_value ('URIQA','DefaultHost'),
- qualifier);
- ns := ns || '@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n';
- ns := ns || '@prefix void: <http://rdfs.org/ns/void#> .\n';
- ns := ns || '@prefix scovo: <http://purl.org/NET/scovo#> .\n';
- }
- ns := ns || '@prefix aowl: <http://bblfish.net/work/atom-owl/2006-06-06/> .\n';
- ns := ns || rdf_view_ns_get (cols, 1);
- ns := ns || '\n';
-
- uriqa_str := registry_get ('URIQADefaultHost');
- graph := 'http://' || uriqa_str || '/' || qualifier || '#';
- create_view_stmt := ns;
- for (declare inx int, inx := 0; inx < length (_tbls) ; inx := inx + 1)
- create_view_stmt := create_view_stmt || '\n' || r2rml_create_dataset (inx, qualifier, _tbls, gen_stat, cols, pkcols, graph) || '';
-
- return create_view_stmt;
-}
-;
-
-create procedure
-r2rml_create_dataset (in nth int, in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any, in pkcols any, in graph varchar := null)
-{
- declare ret, qual, qual_l, tbl_name, tbl_name_l, pks, pk_text, uriqa_str, graph_def any;
- declare suffix, tname, tbl, own, pref_l any;
- declare cols_arr, inx, col_name, owner, owner_l any;
-
- ret := '';
- suffix := '_s';
- uriqa_str := registry_get ('URIQADefaultHost');
- qual := name_part (_tbls[nth], 0);
- own := name_part (_tbls[nth], 1);
- qual_l := lcase (qual);
- pref_l := lcase (qualifier);
- tbl := _tbls[nth];
- cols_arr := get_keyword (tbl, cols);
- tbl_name := name_part (tbl, 2);
- owner := name_part (tbl, 1);
- tbl_name_l := rdf_view_tb (tbl_name);
- owner_l := rdf_view_tb (owner);
- tname := tbl_name_l || suffix;
- pks := get_keyword (tbl, pkcols);
-
- pk_text := '';
- for (declare i any, i := 0; i < length (pks) ; i := i + 1)
- pk_text := pk_text || sprintf ('/{%s}', pks[i][0]);
-
- if (graph is not null)
- graph_def := sprintf ('rr:graph <%s> ', graph);
- else
- graph_def := '';
- ret := ret || sprintf ('<#TriplesMap%s> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema "%s" ; rr:tableOwner "%s" ; rr:tableName "%s" ]; \n', tbl_name, qual, own, tbl_name);
- ret := ret || sprintf ('rr:subjectMap [ rr:termtype "IRI" ; rr:template "http://%s/%s/%s%s"; rr:class %s:%s; %s];\n', uriqa_str, qual, tbl_name_l, pk_text, qualifier, rdf_view_cls_name (tbl_name), graph_def);
-
- inx := 0;
- for select "COLUMN", COL_DTP from TABLE_COLS where "TABLE" = tbl order by COL_ID do
- {
- col_name := "COLUMN";
- if (not exists (select 1 from SYS_FOREIGN_KEYS where FK_TABLE = tbl and FKCOLUMN_NAME = col_name))
- ret := ret || sprintf ('rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s:%s ] ; rr:objectMap [ rr:column "%s" ]; ] ;\n',
- qualifier, lower (col_name), col_name);
- inx := inx + 1;
- }
- for select distinct PK_TABLE as pkt from SYS_FOREIGN_KEYS where FK_TABLE = tbl and PK_TABLE <> tbl do
- {
- pk_text := '';
- for select FKCOLUMN_NAME from SYS_FOREIGN_KEYS where FK_TABLE = tbl and PK_TABLE = pkt order by KEY_SEQ do
- {
- pk_text := pk_text || sprintf ('/{%s}', FKCOLUMN_NAME);
- }
- ret := ret || sprintf ('rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s:%s_has_%s ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://%s/%s/%s%s" ]; ] ;\n',
- qualifier, tbl_name_l, lower (name_part (pkt, 3)), uriqa_str, qual, lower (name_part (pkt, 3)), pk_text);
- }
-
- for select distinct FK_TABLE as fkt from SYS_FOREIGN_KEYS where PK_TABLE = tbl and position (FK_TABLE, _tbls) do
- {
- declare jc varchar;
- jc := '';
- pk_text := '';
- for select FKCOLUMN_NAME, PKCOLUMN_NAME from SYS_FOREIGN_KEYS where FK_TABLE = fkt and PK_TABLE = tbl order by KEY_SEQ do
- {
- jc := jc || sprintf (' rr:joinCondition [ rr:child "%s" ; rr:parent "%s" ] ;', FKCOLUMN_NAME, PKCOLUMN_NAME);
- pk_text := pk_text || sprintf ('/{%s}', FKCOLUMN_NAME);
- }
- if (tbl <> fkt)
- {
- ret := ret || sprintf ('rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s:%s_of_%s ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMap%s>; %s ]; ] ;\n',
- qualifier, tbl_name_l, lower (name_part (fkt, 3)), name_part (fkt, 3), jc);
- }
- else
- {
- ret := ret || sprintf ('rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s:%s_has_%s ] ; rr:objectMap [ rr:termtype "IRI" ; rr:template "http://%s/%s/%s%s" ]; ] ;\n',
- qualifier, tbl_name_l, lower (name_part (fkt, 3)), uriqa_str, qual, lower (name_part (fkt, 3)), pk_text);
- }
- }
-
- ret := rtrim (ret, ';\n') || '.\n';
- return ret;
-}
-;
diff --git a/libsrc/Wi/rdf_sponge.sql b/libsrc/Wi/rdf_sponge.sql
index 0d62041..f275c1c 100644
--- a/libsrc/Wi/rdf_sponge.sql
+++ b/libsrc/Wi/rdf_sponge.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdf_sponge.sql,v 1.5.2.56 2012/03/08 12:55:34 source Exp $
+-- $Id: rdf_sponge.sql,v 1.5.2.49 2011/10/13 11:00:23 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -21,28 +21,6 @@
--
--
--- Function is called from
--- RDF_FT_INDEX_GRABBED RDF_GRAB_SEEALSO, RDF_GRAB
--- RDF_GRAB_SINGLE RDF_GRAB_SINGLE_ASYNC
--- RDF_GRAB_SINGLE_ASYNC RDF_GRAB_SEEALSO, RDF_GRAB
--- RDF_GRAB_SEEALSO RDF_GRAB
--- RDF_GRAB code made from codegen for ssg_grabber_codegen() prepared by sparp_rewrite_grab()
--- RDF_GRAB_RESOLVER_DEFAULT passed as 'resolver' to RDF_GRAB_SINGLE from SPARUL_LOAD
--- SYS_HTTP_SPONGE_GET_CACHE_PARAMS SYS_HTTP_SPONGE_UP
--- SYS_HTTP_SPONGE_DEP_URL_NOT_CHANGED unused in server
--- RDF_HTTP_MAKE_HTTP_REQ SYS_HTTP_SPONGE_UP
--- RDF_HTTP_URL_GET SYS_HTTP_SPONGE_UP
--- SYS_HTTP_SPONGE_UP itself, RDF_SPONGE_UP_1
--- SYS_FILE_SPONGE_UP RDF_SPONGE_UP_1
--- RDF_SPONGE_GUESS_CONTENT_TYPE RDF_LOAD_HTTP_RESPONSE
--- RDF_SW_PING RDF_LOAD_HTTP_RESPONSE
--- RDF_PROC_COLS RDF_LOAD_HTTP_RESPONSE
--- RDF_LOAD_HTTP_RESPONSE SYS_FILE_SPONGE_UP, passed to SYS_HTTP_SPONGE_UP from RDF_SPONGE_UP_1
--- RDF_FORGET_HTTP_RESPONSE passed to SYS_FILE_SPONGE_UP and SYS_HTTP_SPONGE_UP from RDF_SPONGE_UP_1
--- RDF_SPONGE_UP RDF_SPONGE_UP_LIST, code made by ssg_grabber_codegen passes it to RDF_GRAB proc view as _grabber_loader
--- RDF_SPONGE_UP_1 RDF_SPONGE_UP
--- RDF_SPONGE_UP_LIST unused in server
-
-----
-- Procedures for graph grabber
@@ -517,11 +495,9 @@ create procedure DB.DBA.SYS_HTTP_SPONGE_GET_CACHE_PARAMS
ret_dt_expires := http_string_date (ret_expires, NULL, now());
ret_dt_last_modified := http_string_date (ret_last_modif, NULL, now());
-- if no cache directive we say it is now
- if (http_request_header (ret_hdr, 'Pragma', null, null) = 'no-cache' or http_request_header (ret_hdr, 'Cache-Control', null, null) like 'no-cache%' )
- {
+ if (http_request_header (ret_hdr, 'Pragma', null, null) = 'no-cache' or
+ http_request_header (ret_hdr, 'Cache-Control', null, null) like 'no-cache%' )
ret_dt_expires := now ();
- ret_etag := null;
- }
-- if not modified and no last given we take old last modified
if (ret_304_not_modified and ret_dt_last_modified is null)
ret_dt_last_modified := old_last_modified;
@@ -639,7 +615,6 @@ create function DB.DBA.SYS_HTTP_SPONGE_UP (in local_iri varchar, in get_uri varc
old_download_size, old_download_msec_time, old_read_count,
new_download_size, explicit_refresh, max_sz integer;
declare get_method varchar;
- declare get_soft varchar;
declare ret_hdr, immg, req_hdr_arr any;
declare req_hdr varchar;
declare ret_body, ret_content_type, ret_etag, ret_last_modified, ret_date, ret_last_modif, ret_expires varchar;
@@ -653,7 +628,6 @@ create function DB.DBA.SYS_HTTP_SPONGE_UP (in local_iri varchar, in get_uri varc
new_origin_uri := cast (get_keyword_ucase ('get:uri', options, get_uri) as varchar);
new_origin_login := cast (get_keyword_ucase ('get:login', options) as varchar);
explicit_refresh := get_keyword_ucase ('get:refresh', options);
- get_soft := get_keyword_ucase ('get:soft', options, '');
if (explicit_refresh is null)
{
max_refresh := virtuoso_ini_item_value ('SPARQL', 'MaxCacheExpiration');
@@ -753,12 +727,8 @@ perform_actual_load:
--!!!TBD: if (get_method in ('MGET', 'GET+MGET')) { ... }
if (get_method in ('POST', 'GET', 'GET+MGET'))
{
- declare acc_hdr varchar;
req_hdr := NULL;
get_proxy := get_keyword_ucase ('get:proxy', options);
- acc_hdr := trim (get_keyword_ucase ('get:accept', options));
- if (not length (acc_hdr))
- acc_hdr := 'application/rdf+xml; q=1.0, text/rdf+n3; q=0.9, application/rdf+turtle; q=0.5, application/x-turtle; q=0.6, application/turtle; q=0.5, text/turtle; q=0.7, application/xml; q=0.2, */*; q=0.1';
connection_set ('sparql-get:proxy', get_proxy);
--!!!TBD: proper support for POST
--!!!TBD: proper authentication if get:login / get:password is provided.
@@ -772,7 +742,7 @@ perform_actual_load:
-- then it may return rdf instead of html
req_hdr := req_hdr || case when length (req_hdr) > 0 then '\r\n' else '' end
|| 'User-Agent: OpenLink Virtuoso RDF crawler\r\n'
- || 'Accept: ' || acc_hdr;
+ || 'Accept: application/rdf+xml; q=1.0, text/rdf+n3; q=0.9, application/rdf+turtle; q=0.7, application/x-turtle; q=0.6, application/turtle; q=0.5, text/turtle; q=0.5, application/xml; q=0.2, */*; q=0.1';
--|| 'Accept: application/rdf+xml, text/rdf+n3, application/rdf+turtle, application/x-turtle, application/turtle, application/xml, */*';
-- dbg_obj_princ (get_method, ' method with ', req_hdr);
{
@@ -827,7 +797,7 @@ perform_actual_load:
}
goto resp_received;
}
- if (eraser is not null and (get_soft <> 'add'))
+ if (eraser is not null)
call (eraser) (local_iri, new_origin_uri, options);
signal ('RDFZZ', sprintf (
'Unable to get data from "%.1000s": This version of Virtuoso does not support OPTION (get:method "%.100s")',
@@ -894,7 +864,7 @@ resp_received:
whenever sqlstate '*' goto error_during_load;
parser_rc := 0;
req_hdr_arr := DB.DBA.RDF_HTTP_MAKE_HTTP_REQ (new_origin_uri, get_method, req_hdr);
- if (eraser is not null and (get_soft <> 'add'))
+ if (eraser is not null)
call (eraser) (local_iri, new_origin_uri, options);
parser_rc := call (parser) (local_iri, new_origin_uri, ret_content_type, ret_hdr, ret_body, options, req_hdr_arr);
-- dbg_obj_princ (parser, ' returned ', parser_rc, ' to SYS_HTTP_SPONGE_UP()');
@@ -970,22 +940,17 @@ create function DB.DBA.SYS_FILE_SPONGE_UP (in local_iri varchar, in get_uri varc
{
declare new_origin_uri, str, base_uri, mime_type, dummy, tmp any;
declare inx int;
- declare get_soft varchar;
new_origin_uri := cast (get_keyword_ucase ('get:uri', options, get_uri) as varchar);
- get_soft := get_keyword_ucase ('get:soft', options, '');
inx := 5;
base_uri := new_origin_uri;
base_uri := charset_recode (base_uri, 'UTF-8', NULL);
while (length (base_uri) > inx + 1 and aref (base_uri, inx) = ascii ('/'))
inx := inx + 1;
- if (inx = 8) -- i.e., it is 'file:///'
- str := file_to_string (subseq (base_uri, inx-1));
- else
str := file_to_string (concat (http_root(), '/' , subseq (base_uri, inx)));
dummy := vector ();
tmp := vector ('OK');
mime_type := null;
- if (eraser is not null and (get_soft <> 'add'))
+ if (eraser is not null)
call (eraser) (local_iri, new_origin_uri, options);
DB.DBA.RDF_LOAD_HTTP_RESPONSE (local_iri, new_origin_uri, mime_type, tmp, str, options, dummy);
return local_iri;
@@ -1011,8 +976,6 @@ create function DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE (in origin_uri varchar, in
strstr (ret_content_type, 'application/x-turtle') is not null or
strstr (ret_content_type, 'application/turtle') is not null )
return 'text/rdf+n3';
- if (strstr (ret_content_type, 'application/x-trig') is not null)
- return 'application/x-trig';
}
declare ret_begin, ret_html any;
ret_begin := subseq (ret_body, 0, 4096);
@@ -1213,11 +1176,11 @@ create procedure DB.DBA.RDF_PROC_COLS (in pname varchar)
-- /* Load the document in triple store. returns 1 if the document is an RDF , otherwise if it has links etc. it returns 0 */
create procedure DB.DBA.RDF_LOAD_HTTP_RESPONSE (in graph_iri varchar, in new_origin_uri varchar, inout ret_content_type varchar, inout ret_hdr any, inout ret_body any, inout options any, inout req_hdr_arr any)
{
- declare dest, groupdest, get_soft, cset, base, first_stat, first_msg varchar;
+ declare dest, groupdest, cset, base, first_stat, first_msg varchar;
declare rc any;
declare aq, ps any;
declare xd, xt any;
- declare saved_log_mode, only_rdfa, retr_count integer;
+ declare saved_log_mode, only_rdfa integer;
aq := null;
ps := virtuoso_ini_item_value ('SPARQL', 'PingService');
if (length (ps))
@@ -1231,7 +1194,6 @@ create procedure DB.DBA.RDF_LOAD_HTTP_RESPONSE (in graph_iri varchar, in new_ori
dest := get_keyword_ucase ('get:destination', options);
groupdest := get_keyword_ucase ('get:group-destination', options);
base := get_keyword ('http-redirect-to', options, new_origin_uri);
- get_soft := get_keyword_ucase ('get:soft', options);
if (get_keyword_ucase ('get:strategy', options, 'default') = 'rdfa-only')
only_rdfa := 1;
else
@@ -1240,7 +1202,6 @@ create procedure DB.DBA.RDF_LOAD_HTTP_RESPONSE (in graph_iri varchar, in new_ori
signal ('RDFXX', sprintf ('Unable to load RDF graph <%.500s> from <%.500s>: the sparql-results XML answer does not contain triples', graph_iri, new_origin_uri));
if (get_keyword ('http-headers', options) is null)
options := vector_concat (options, vector ('http-headers', vector (req_hdr_arr, ret_hdr)));
-retry_after_deadlock:
if (strstr (ret_content_type, 'application/rdf+xml') is not null)
{
--if (dest is null)
@@ -1310,20 +1271,6 @@ retry_after_deadlock:
-- }
load_grddl:;
- if (('40001' = __SQL_STATE) and (retr_count < 10))
- {
- rollback work;
- retr_count := retr_count + 1;
- goto retry_after_deadlock;
- }
- if (__proc_exists ('DB.DBA.RDF_RUN_CARTRIDGES') is not null)
- {
- rc := DB.DBA.RDF_RUN_CARTRIDGES (graph_iri, new_origin_uri, dest, ret_body, ret_content_type, options, ret_hdr, ps, aq, req_hdr_arr);
- if (rc)
- return rc;
- }
- else
- {
cset := http_request_header (ret_hdr, 'Content-Type', 'charset', null);
for select RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_OPTIONS, RM_DESCRIPTION from DB.DBA.SYS_RDF_MAPPERS where RM_ENABLED = 1 order by RM_ID do
{
@@ -1384,7 +1331,7 @@ load_grddl:;
}
if (__tag(rc) = 193 or rc < 0 or rc > 0)
{
- if (rc > 0 and __proc_exists ('DB.DBA.RDF_LOAD_POST_PROCESS')) -- optional step, by default skip
+ if (__proc_exists ('DB.DBA.RDF_LOAD_POST_PROCESS')) -- optional step, by default skip
call ('DB.DBA.RDF_LOAD_POST_PROCESS') (graph_iri, new_origin_uri, dest, ret_body, ret_content_type, options);
if (__tag(rc) = 193)
return rc;
@@ -1393,7 +1340,6 @@ load_grddl:;
}
try_next_mapper:;
}
- }
-- else if not handled with the above cases
--xd := DAV_EXTRACT_META_AS_RDF_XML (new_origin_uri, ret_body);
@@ -1405,7 +1351,7 @@ load_grddl:;
-- DB.DBA.RDF_LOAD_RDFXML (xd, new_origin_uri, groupdest);
-- return 1;
-- }
- if ((dest is null) and (get_soft is null or (get_soft <> 'add')))
+ if (dest is null)
{
DB.DBA.SPARUL_CLEAR (graph_iri, 1, 0);
commit work;
@@ -1445,12 +1391,6 @@ resignal_parse_error:
load_grddl_after_error:
first_stat := __SQL_STATE;
first_msg := __SQL_MESSAGE;
- if (('40001' = first_stat) and (retr_count < 10))
- {
- rollback work;
- retr_count := retr_count + 1;
- goto retry_after_deadlock;
- }
goto load_grddl;
}
;
@@ -1516,7 +1456,7 @@ create function DB.DBA.RDF_SPONGE_UP_1 (in graph_iri varchar, in options any, in
{
declare dest, get_soft, local_iri, immg, res_graph_iri, cookie varchar;
declare perms, log_mode integer;
- -- dbg_obj_princ ('DB.DBA.RDF_SPONGE_UP_1 (', graph_iri, options, ')');
+ -- dbg_obj_princ ('DB.DBA.RDF_SPONGE_UP (', graph_iri, options, ')');
graph_iri := cast (graph_iri as varchar);
--set_user_id ('dba', 1);
dest := get_keyword_ucase ('get:destination', options);
@@ -1534,7 +1474,7 @@ create function DB.DBA.RDF_SPONGE_UP_1 (in graph_iri varchar, in options any, in
log_mode := get_keyword ('__rdf_sponge_log_mode', options);
if (log_mode is not null) -- when in aq mode
log_enable (log_mode, 1);
- -- dbg_obj_princ ('DB.DBA.RDF_SPONGE_UP_1 (', graph_iri, options, ') set local_iri=', local_iri);
+ -- dbg_obj_princ ('DB.DBA.RDF_SPONGE_UP (', graph_iri, options, ') set local_iri=', local_iri);
perms := DB.DBA.RDF_GRAPH_USER_PERMS_GET (dest, case (uid) when -1 then http_nobody_uid() else uid end);
get_soft := get_keyword_ucase ('get:soft', options);
if ('soft' = get_soft)
@@ -1547,7 +1487,7 @@ create function DB.DBA.RDF_SPONGE_UP_1 (in graph_iri varchar, in options any, in
-- dbg_obj_princ ('Exists and get:soft=soft, leaving');
if (not bit_and (perms, 1))
{
- -- dbg_obj_princ (dest, ' graph is OK as it is but not returned from RDF_SPONGE_UP_1 due to lack of read permission for user ', uid);
+ -- dbg_obj_princ (dest, ' graph is OK as it is but not returned from RDF_SPONGE_UP due to lack of read permission for user ', uid);
return null;
}
res_graph_iri := local_iri;
@@ -1556,18 +1496,18 @@ create function DB.DBA.RDF_SPONGE_UP_1 (in graph_iri varchar, in options any, in
-- dbg_obj_princ ('Does not exists, continue despite get:soft=soft');
}
else
- if (('replacing' = get_soft) or ('replace' = get_soft) or ('add' = get_soft))
+ if (('replacing' = get_soft) or ('replace' = get_soft))
{
-- dbg_obj_princ ('get:soft=replacing');
;
}
else
signal ('RDFZZ', sprintf (
- 'This version of Virtuoso supports only "soft", "replacing" and "add" values of "define get:soft ...", not "%.500s"',
+ 'This version of Virtuoso supports only "soft" and "replacing" values of "define get:soft ...", not "%.500s"',
get_soft ) );
if (not bit_and (perms, 4))
{
- -- dbg_obj_princ (res_graph_iri, ' graph is not sponged by RDF_SPONGE_UP_1 due to lack of sponge permission for user ', uid);
+ -- dbg_obj_princ (res_graph_iri, ' graph is not sponged by RDF_SPONGE_UP due to lack of sponge permission for user ', uid);
return null;
}
-- if requested iri is immutable, do not try to get it at all
@@ -1629,7 +1569,7 @@ create function DB.DBA.RDF_SPONGE_UP_1 (in graph_iri varchar, in options any, in
}
}
graph_is_ready:
- -- dbg_obj_princ (res_graph_iri, ' graph is ready, about to return from RDF_SPONGE_UP_1');
+ -- dbg_obj_princ (res_graph_iri, ' graph is ready, about to return from RDF_SPONGE_UP');
if (__rdf_obj_ft_rule_check (iri_to_id (res_graph_iri), null) and
get_keyword ('refresh_free_text', options, 0) )
VT_INC_INDEX_DB_DBA_RDF_OBJ();
diff --git a/libsrc/Wi/rdf_void.sql b/libsrc/Wi/rdf_void.sql
index 63e4008..6a89f08 100644
--- a/libsrc/Wi/rdf_void.sql
+++ b/libsrc/Wi/rdf_void.sql
@@ -1,12 +1,12 @@
--
--- $Id: rdf_void.sql,v 1.10.2.9 2012/03/08 12:55:34 source Exp $
+-- $Id: rdf_void.sql,v 1.10.2.8 2011/09/28 17:01:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
-- RDF Schema objects, generator of RDF Views
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/rdfbox.c b/libsrc/Wi/rdfbox.c
index ea0e54f..cdd2041 100644
--- a/libsrc/Wi/rdfbox.c
+++ b/libsrc/Wi/rdfbox.c
@@ -1,10 +1,10 @@
/*
- * $Id: rdfbox.c,v 1.47.2.82 2012/03/08 12:55:34 source Exp $
+ * $Id: rdfbox.c,v 1.47.2.63 2011/10/14 12:47:29 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -215,15 +215,12 @@ bif_rdf_box (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
rbb->rbb_base.rb_serialize_id_only = is_complete >> 1;
rbb->rbb_base.rb_chksum_tail = 1;
dk_check_tree (chksum);
- rbb->rbb_chksum = chksum; /* Not box_copy_tree (chksum) */
+ rbb->rbb_chksum = box_copy_tree (chksum);
if (6 < BOX_ELEMENTS (args))
{
long dtp = bif_long_arg (qst, args, 6, "rdf_box");
if ((dtp &~0xFF) || ! (dtp & 0x80))
- {
- dk_free_box ((caddr_t *)rbb);
- sqlr_new_error ("22023", "SR556", "Invalid dtp %ld in call of rdf_box()", dtp);
- }
+ sqlr_new_error ("22023", "SR556", "Invalid dtp %ld in call of rdf_box()", dtp);
rbb->rbb_box_dtp = (dtp_t)dtp;
}
else
@@ -839,7 +836,7 @@ rb_serialize (caddr_t x, dk_session_t * ses)
rb_ext_serialize (rb, ses);
return;
}
- if (!unbox (rb->rb_box))
+ if (!unbox_inline (rb->rb_box))
{
if (!rb->rb_is_complete)
{
@@ -1051,7 +1048,7 @@ dv_rdf_compare (db_buf_t dv1, db_buf_t dv2)
flags1 = dv1[1];
if (RBS_EXT_TYPE & flags1)
return dv_rdf_ext_compare (dv1, dv2);
- if (dtp_canonical[dtp2] > DV_RDF) /* dtp_canonical because dv int64 is gt dv rdf but here it counts for dv long int */
+ if (dtp2 > DV_RDF)
return DVC_DTP_LESS;
if (RBS_SKIP_DTP & flags1)
{
@@ -1370,7 +1367,11 @@ rdf_box_hash_cmp (ccaddr_t a1, ccaddr_t a2)
{
rdf_box_t * rb1 = (rdf_box_t *) a1;
rdf_box_t * rb2 = (rdf_box_t *) a2;
+ rdf_box_t tmp_rb2;
dtp_t dtp1 = DV_TYPE_OF (rb1), dtp2 = DV_TYPE_OF (rb2);
+ dtp_t data_dtp1, data_dtp2;
+ int len1, len2, cmp_len, cmp_headlen, mcmp;
+ caddr_t data1 = NULL, data2 = NULL;
/* arrange so that if both are not rdf boxes, the one that is a box is first */
if (DV_RDF != dtp1)
{
@@ -1610,9 +1611,6 @@ bif_rdf_long_to_ttl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
case DV_STRING:
dks_esc_write (out, val, box_length (val) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_TTL_DQ);
break;
- case DV_WIDE:
- dks_esc_write (out, val, box_length (val) - sizeof (wchar_t), CHARSET_UTF8, CHARSET_WIDE, DKS_ESC_TTL_DQ);
- break;
default:
{
caddr_t tmp_utf8_box = box_cast_to_UTF8 (qst, val);
@@ -1814,15 +1812,11 @@ bif_rdf_dist_deser_long (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return deser;
}
-/*! Description of IRI reference in Turtle and similar formats */
typedef struct ttl_iriref_s {
- caddr_t colname; /*!< Name of column, used only for result sets, not for triples */
- caddr_t uri; /*!< A complete source URI */
- caddr_t ns; /*!< Namespace, if found in the URI, NULL for bnodes and unusual URIs */
- caddr_t prefix; /*!< Namespace prefix, if \c ns is not NULL and found in dictionary */
- caddr_t loc; /*!< Local part of URI, if namespace can be extracted */
- ptrlong is_bnode; /*!< 0 or 1 flag whether \c URI us blank node URI */
- ptrlong is_iri; /*!< 0 or 1 flag whether the rest of the structure is filled with URI data, functions that parse/print URI do not check it, it's for their callers only */
+ caddr_t colname;
+ caddr_t uri, ns, prefix, loc;
+ ptrlong is_bnode;
+ ptrlong is_iri;
} ttl_iriref_t;
typedef struct ttl_iriref_items_s {
@@ -1842,7 +1836,7 @@ iri_cast_and_split_ttl_qname (query_instance_t *qi, caddr_t iri, caddr_t *ns_pre
if ((iri_boxlen > 9) && !memcmp (iri, "nodeID://", 9))
{
ns_prefix_ret[0] = uname___empty;
- local_ret[0] = box_dv_short_nchars (iri + 9, iri_boxlen - 10);
+ local_ret[0] = box_dv_short_nchars (iri + 9, iri_boxlen - 9);
is_bnode_ret[0] = 1;
return 1;
}
@@ -1904,57 +1898,6 @@ iri_cast_and_split_ttl_qname (query_instance_t *qi, caddr_t iri, caddr_t *ns_pre
return 0;
}
-
-int
-iri_cast_rdfxml_qname (query_instance_t *qi, caddr_t iri, caddr_t *uri_ret, ptrlong *is_bnode_ret)
-{
- caddr_t old_uri_ret = uri_ret[0];
- is_bnode_ret[0] = 0;
- switch (DV_TYPE_OF (iri))
- {
- case DV_STRING: case DV_UNAME:
- {
- int iri_boxlen = box_length (iri);
- /* 0123456789 */
- if ((iri_boxlen > 9) && !memcmp (iri, "nodeID://", 9))
- {
- uri_ret[0] = box_dv_short_nchars (iri + 9, iri_boxlen - 10);
- is_bnode_ret[0] = 1;
- break;
- }
- if (uri_ret[0] != iri)
- {
- uri_ret[0] = box_dv_short_nchars (iri, iri_boxlen - 1);
- dk_free_box (old_uri_ret);
- }
- return 1;
- }
- case DV_IRI_ID: case DV_IRI_ID_8:
- {
- iri_id_t iid = unbox_iri_id (iri);
- if (0L == iid)
- return 0;
- if (min_bnode_iri_id () <= iid)
- {
- if (min_named_bnode_iri_id () > iid)
- {
- uri_ret[0] = BNODE_IID_TO_TTL_LABEL_LOCAL (iid);
- is_bnode_ret[0] = 1;
- dk_free_box (old_uri_ret);
- return 1;
- }
- uri_ret[0] = key_id_to_iri (qi, iid);
- return 1;
- }
- uri_ret[0] = key_id_to_iri (qi, iid);
- return 1;
- }
- default: return 0;
- }
- dk_free_box (old_uri_ret);
- return 1;
-}
-
int
iri_cast_nt_absname (query_instance_t *qi, caddr_t iri, caddr_t *iri_ret, ptrlong *is_bnode_ret)
{
@@ -2048,41 +1991,37 @@ bif_http_sys_find_best_sparql_accept (caddr_t * qst, caddr_t * err_ret, state_sl
{
int ctr;
caddr_t *tmp;
- tmp = (caddr_t *)list (34*2,
- "application/x-trig" , "TRIG" , /* 0 */
- "text/rdf+n3" , "TTL" , /* 1 */
- "text/rdf+ttl" , "TTL" , /* 2 */
- "text/rdf+turtle" , "TTL" , /* 3 */
- "text/turtle" , "TTL" , /* 4 */
- "text/n3" , "TTL" , /* 5 */
- "application/turtle" , "TTL" , /* 6 */
- "application/x-turtle" , "TTL" , /* 7 */
- "application/json" , "JSON" , /* 8 */
- "application/rdf+json" , "JSON;TALIS" , /* 9 */
- "application/x-rdf+json" , "JSON;TALIS" , /* 10 */
- "application/soap+xml" , "SOAP" , /* 11 */
- "application/soap+xml;11" , "SOAP" , /* 12 */
- "application/rdf+xml" , "RDFXML" , /* 13 */
- "text/rdf+nt" , "NT" , /* 14 */
- "application/xhtml+xml" , "RDFA;XHTML" , /* 15 */
- "text/plain" , "NT" , /* 16 */
- "application/sparql-results+json" , "JSON;RES" , /* 17 */
- "text/html" , "HTML;MICRODATA" , /* 18 */
- "application/vnd.ms-excel" , "HTML" , /* 19 */
- "application/javascript" , "JS" , /* 20 */
- "application/atom+xml" , "ATOM;XML" , /* 21 */
- "application/odata+json" , "JSON;ODATA" , /* 22 */
- "application/sparql-results+xml" , "XML" , /* 23 */
- "text/cxml+qrcode" , "CXML;QRCODE" , /* 24 */
- "text/cxml" , "CXML" , /* 25 */
- "text/x-html+ul" , "HTML;UL" , /* 26 */
- "text/x-html+tr" , "HTML;TR" , /* 27 */
- "text/md+html" , "HTML;MICRODATA" , /* 28 */
- "text/microdata+html" , "HTML;MICRODATA" , /* 29 */
- "application/microdata+json" , "JSON;MICRODATA" , /* 30 */
- "application/x-json+ld" , "JSON;LD" , /* 31 */
- "application/ld+json" , "JSON;LD" , /* 32 */
- "text/csv" , "CSV" /* 33 Increase count in this list() call when add more MIME types! */ );
+ tmp = (caddr_t *)list (30*2,
+ "text/rdf+n3" , "TTL" , /* 0 */
+ "text/rdf+ttl" , "TTL" , /* 1 */
+ "text/rdf+turtle" , "TTL" , /* 2 */
+ "text/turtle" , "TTL" , /* 3 */
+ "text/n3" , "TTL" , /* 4 */
+ "application/turtle" , "TTL" , /* 5 */
+ "application/x-turtle" , "TTL" , /* 6 */
+ "application/json" , "JSON" , /* 7 */
+ "application/rdf+json" , "JSON;TALIS" , /* 8 */
+ "application/x-rdf+json" , "JSON;TALIS" , /* 9 */
+ "application/soap+xml" , "SOAP" , /* 10 */
+ "application/soap+xml;11" , "SOAP" , /* 11 */
+ "application/rdf+xml" , "RDFXML" , /* 12 */
+ "text/rdf+nt" , "NT" , /* 13 */
+ "application/xhtml+xml" , "RDFA;XHTML" , /* 14 */
+ "text/plain" , "NT" , /* 15 */
+ "application/sparql-results+json" , "JSON;RES" , /* 16 */
+ "text/html" , "HTML;MICRODATA" , /* 17 */
+ "application/vnd.ms-excel" , "HTML" , /* 18 */
+ "application/javascript" , "JS" , /* 19 */
+ "application/atom+xml" , "ATOM;XML" , /* 20 */
+ "application/odata+json" , "JSON;ODATA" , /* 21 */
+ "application/sparql-results+xml" , "XML" , /* 22 */
+ "text/cxml+qrcode" , "CXML;QRCODE" , /* 23 */
+ "text/cxml" , "CXML" , /* 24 */
+ "text/md+html" , "HTML;MICRODATA" , /* 25 */
+ "text/microdata+html" , "HTML;MICRODATA" , /* 26 */
+ "application/microdata+json" , "JSON;MICRODATA" , /* 27 */
+ "application/x-json+ld" , "JSON;LD" , /* 28 */
+ "text/csv" , "CSV" /* 29 Increase count in this list() call when add more MIME types! */ );
for (ctr = BOX_ELEMENTS (tmp); ctr--; /* no step */)
tmp[ctr] = box_dv_short_string (tmp[ctr]);
supp_dict = tmp;
@@ -2111,7 +2050,7 @@ typedef struct ttl_env_s {
} ttl_env_t;
int
-ttl_try_to_cache_new_prefix (caddr_t *qst, dk_session_t *ses, ttl_env_t *env, ptrlong *ns_counter_ptr, ttl_iriref_t *ti)
+ttl_http_write_prefix_if_needed (caddr_t *qst, dk_session_t *ses, ttl_env_t *env, ptrlong *ns_counter_ptr, ttl_iriref_t *ti)
{
id_hash_iterator_t *ns2pref_hit = env->te_used_prefixes;
id_hash_t *ns2pref = ns2pref_hit->hit_hash;
@@ -2154,15 +2093,6 @@ ttl_try_to_cache_new_prefix (caddr_t *qst, dk_session_t *ses, ttl_env_t *env, pt
ti->prefix = box_copy (ti->prefix);
ns_counter_ptr[0] = ns_counter_val + 1;
ti->ns = box_copy (ti->ns);
- return 1;
-}
-
-int
-ttl_http_write_prefix_if_needed (caddr_t *qst, dk_session_t *ses, ttl_env_t *env, ptrlong *ns_counter_ptr, ttl_iriref_t *ti)
-{
- int cache_ok = ttl_try_to_cache_new_prefix (qst, ses, env, ns_counter_ptr, ti);
- if (!cache_ok)
- return 0;
if (NULL != env->te_prev_subj_ns)
{
session_buffered_write (ses, " .\n", 3);
@@ -2252,7 +2182,9 @@ http_ttl_or_nt_prepare_obj (query_instance_t *qi, caddr_t obj, dtp_t obj_dtp, tt
return;
dt_ret->uri = rdf_type_twobyte_to_iri (rb->rb_type);
if (dt_ret->uri) /* if by some reason rb_type is wrong */
- box_flags (dt_ret->uri) |= BF_IRI;
+ {
+ box_flags (dt_ret->uri) |= BF_IRI;
+ }
}
else
{
@@ -2355,26 +2287,22 @@ http_ttl_write_obj (dk_session_t *ses, ttl_env_t *env, query_instance_t *qi, cad
dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_TTL_DQ);
session_buffered_write_char ('"', ses);
break;
- case DV_WIDE:
- session_buffered_write_char ('"', ses);
- dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - sizeof (wchar_t), CHARSET_UTF8, CHARSET_WIDE, DKS_ESC_TTL_DQ);
- session_buffered_write_char ('"', ses);
- break;
case DV_XML_ENTITY:
- http_ttl_or_nt_write_xe (ses, qi, (xml_entity_t *)(obj_box_value),
- ((DV_RDF == obj_dtp) ? (RDF_BOX_DEFAULT_TYPE == ((rdf_box_t *)obj)->rb_type) : 1) );
- break;
+ {
+ http_ttl_or_nt_write_xe (ses, qi, (xml_entity_t *)(obj_box_value),
+ ((DV_RDF == obj_dtp) ? (RDF_BOX_DEFAULT_TYPE == ((rdf_box_t *)obj)->rb_type) : 1) );
+ break;
+ }
case DV_DB_NULL:
session_buffered_write (ses, "(NULL)", 6);
break;
default:
{
caddr_t tmp_utf8_box = box_cast_to_UTF8 ((caddr_t *)qi, obj_box_value);
- int need_quotes = ((DV_RDF == obj_dtp) || (DV_BLOB_HANDLE == obj_dtp) || (DV_BLOB_WIDE_HANDLE == obj_dtp));
- if (need_quotes)
+ if (DV_RDF == obj_dtp)
session_buffered_write_char ('"', ses);
session_buffered_write (ses, tmp_utf8_box, box_length (tmp_utf8_box) - 1);
- if (need_quotes)
+ if (DV_RDF == obj_dtp)
session_buffered_write_char ('"', ses);
dk_free_box (tmp_utf8_box);
break;
@@ -2403,76 +2331,6 @@ http_ttl_write_obj (dk_session_t *ses, ttl_env_t *env, query_instance_t *qi, cad
}
caddr_t
-bif_http_ttl_prefixes (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- query_instance_t *qi = (query_instance_t *)qst;
- ttl_env_t *env = (ttl_env_t *)bif_arg (qst, args, 0, "http_ttl_prefixes");
- caddr_t subj = bif_arg (qst, args, 1, "http_ttl_prefixes");
- caddr_t pred = bif_arg (qst, args, 2, "http_ttl_prefixes");
- caddr_t obj = bif_arg (qst, args, 3, "http_ttl_prefixes");
- dk_session_t *ses = http_session_no_catch_arg (qst, args, 4, "http_ttl_prefixes");
- int status = 0;
- int obj_is_iri = 0;
- dtp_t obj_dtp = 0;
- ttl_iriref_items_t tii;
- memset (&tii,0, sizeof (ttl_iriref_items_t));
- if (DV_ARRAY_OF_POINTER != DV_TYPE_OF ((caddr_t)env) ||
- (sizeof (ttl_env_t) != box_length ((caddr_t)env)) ||
- (DV_DICT_ITERATOR != DV_TYPE_OF (env->te_used_prefixes)) ||
- (((DV_STRING == DV_TYPE_OF (env->te_prev_subj_ns)) || (DV_UNAME == DV_TYPE_OF (env->te_prev_subj_ns))) &&
- ((DV_STRING != DV_TYPE_OF (env->te_prev_subj_loc)) ||
- ((DV_STRING != DV_TYPE_OF (env->te_prev_pred_ns)) && (DV_UNAME != DV_TYPE_OF (env->te_prev_pred_ns))) ||
- (DV_STRING != DV_TYPE_OF (env->te_prev_pred_loc)) ) ) ||
- (DV_LONG_INT != DV_TYPE_OF (env->te_ns_count_s_o)) ||
- (DV_LONG_INT != DV_TYPE_OF (env->te_ns_count_p_dt)) )
- sqlr_new_error ("22023", "SR601", "Argument 1 of http_ttl_prefixes() should be an array of special format");
- if (!iri_cast_and_split_ttl_qname (qi, subj, &tii.s.ns, &tii.s.loc, &tii.s.is_bnode))
- goto fail; /* see below */
- if (!iri_cast_and_split_ttl_qname (qi, pred, &tii.p.ns, &tii.p.loc, &tii.p.is_bnode))
- goto fail; /* see below */
- obj_dtp = DV_TYPE_OF (obj);
- switch (obj_dtp)
- {
- case DV_UNAME: case DV_IRI_ID: case DV_IRI_ID_8: obj_is_iri = 1; break;
- case DV_STRING: obj_is_iri = (BF_IRI & box_flags (obj)) ? 1 : 0; break;
- default: obj_is_iri = 0; break;
- }
- if (obj_is_iri)
- {
- if (!iri_cast_and_split_ttl_qname (qi, obj, &tii.o.ns, &tii.o.loc, &tii.o.is_bnode))
- goto fail; /* see below */
- }
- else
- {
- http_ttl_or_nt_prepare_obj (qi, obj, obj_dtp, &tii.dt);
- if (NULL != tii.dt.uri)
- iri_split_ttl_qname (tii.dt.uri, &(tii.dt.ns), &(tii.dt.loc), 1);
- }
- if ((DV_STRING != DV_TYPE_OF (env->te_prev_subj_ns)) && (DV_UNAME != DV_TYPE_OF (env->te_prev_subj_ns)))
- {
- dk_free_tree (env->te_prev_subj_ns); env->te_prev_subj_ns = NULL;
- dk_free_tree (env->te_prev_subj_loc); env->te_prev_subj_loc = NULL;
- dk_free_tree (env->te_prev_pred_ns); env->te_prev_pred_ns = NULL;
- dk_free_tree (env->te_prev_pred_loc); env->te_prev_pred_loc = NULL;
- }
- if ((NULL != tii.dt.ns) && ('\0' != tii.dt.ns[0]))
- status += ttl_http_write_prefix_if_needed (qst, ses, env, &(env->te_ns_count_p_dt), &(tii.dt));
- if ((NULL != tii.p.ns) && ('\0' != tii.p.ns[0]))
- status += ttl_http_write_prefix_if_needed (qst, ses, env, &(env->te_ns_count_p_dt), &(tii.p));
- if ((NULL != tii.s.ns) && ('\0' != tii.s.ns[0]))
- status += ttl_http_write_prefix_if_needed (qst, ses, env, &(env->te_ns_count_s_o), &(tii.s));
- if ((NULL != tii.o.ns) && ('\0' != tii.o.ns[0]))
- status += ttl_http_write_prefix_if_needed (qst, ses, env, &(env->te_ns_count_s_o), &(tii.o));
-fail:
- dk_free_box (tii.s.uri); dk_free_box (tii.s.ns); dk_free_box (tii.s.loc); dk_free_box (tii.s.prefix);
- dk_free_box (tii.p.uri); dk_free_box (tii.p.ns); dk_free_box (tii.p.loc); dk_free_box (tii.p.prefix);
- dk_free_box (tii.o.uri); dk_free_box (tii.o.ns); dk_free_box (tii.o.loc); dk_free_box (tii.o.prefix);
- dk_free_box (tii.dt.uri); dk_free_box (tii.dt.ns); dk_free_box (tii.dt.loc); dk_free_box (tii.dt.prefix);
- return (caddr_t)(ptrlong)(status);
-}
-
-
-caddr_t
bif_http_ttl_triple (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
query_instance_t *qi = (query_instance_t *)qst;
@@ -2585,346 +2443,6 @@ fail:
return (caddr_t)(ptrlong)(status);
}
-int
-rdfxml_http_write_prefix_if_needed (caddr_t *qst, dk_session_t *ses, ttl_env_t *env, ptrlong *ns_counter_ptr, ttl_iriref_t *ti)
-{
- int cache_ok = ttl_try_to_cache_new_prefix (qst, ses, env, ns_counter_ptr, ti);
- if (!cache_ok)
- return 0; /* .0.12345678 */
- session_buffered_write (ses, "\n\txmlns:", 8);
- session_buffered_write (ses, ti->prefix, strlen (ti->prefix));
- session_buffered_write (ses, "=\"", 2);
- dks_esc_write (ses, ti->ns, box_length (ti->ns) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_DQATTR);
- session_buffered_write_char ('"', ses);
- return 1;
-}
-
-caddr_t
-bif_http_rdfxml_p_ns (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- query_instance_t *qi = (query_instance_t *)qst;
- ttl_env_t *env = (ttl_env_t *)bif_arg (qst, args, 0, "http_rdfxml_p_ns");
- caddr_t pred = bif_arg (qst, args, 1, "http_rdfxml_p_ns");
- dk_session_t *ses = http_session_no_catch_arg (qst, args, 2, "http_rdfxml_p_ns");
- int status = 0;
- ttl_iriref_t ti;
- memset (&ti,0, sizeof (ttl_iriref_t));
- if (DV_ARRAY_OF_POINTER != DV_TYPE_OF ((caddr_t)env) ||
- (sizeof (ttl_env_t) != box_length ((caddr_t)env)) ||
- (DV_DICT_ITERATOR != DV_TYPE_OF (env->te_used_prefixes)) /* ||
- (((DV_STRING == DV_TYPE_OF (env->te_prev_subj_ns)) || (DV_UNAME == DV_TYPE_OF (env->te_prev_subj_ns))) &&
- ((DV_STRING != DV_TYPE_OF (env->te_prev_subj_loc)) ||
- ((DV_STRING != DV_TYPE_OF (env->te_prev_pred_ns)) && (DV_UNAME != DV_TYPE_OF (env->te_prev_pred_ns))) ||
- (DV_STRING != DV_TYPE_OF (env->te_prev_pred_loc)) ) ) */ ||
- (DV_LONG_INT != DV_TYPE_OF (env->te_ns_count_s_o)) ||
- (DV_LONG_INT != DV_TYPE_OF (env->te_ns_count_p_dt)) )
- sqlr_new_error ("22023", "SR601", "Argument 1 of http_rdfxml_p_ns() should be an array of special format");
- if (!iri_cast_and_split_ttl_qname (qi, pred, &ti.ns, &ti.loc, &ti.is_bnode))
- goto fail; /* see below */
- if ((NULL != ti.ns) && ('\0' != ti.ns[0]))
- status += rdfxml_http_write_prefix_if_needed (qst, ses, env, &(env->te_ns_count_p_dt), &(ti));
- fail:
- dk_free_box (ti.uri); dk_free_box (ti.ns); dk_free_box (ti.loc); dk_free_box (ti.prefix);
- return (caddr_t)(ptrlong)(status);
-}
-
-#define RDFXML_HTTP_WRITE_REF_ABOUT 1
-#define RDFXML_HTTP_WRITE_REF_P_OPEN 2
-#define RDFXML_HTTP_WRITE_REF_P_CLOSE 3
-#define RDFXML_HTTP_WRITE_REF_RES 4
-#define RDFXML_HTTP_WRITE_REF_DT 5
-
-void
-rdfxml_http_write_ref (dk_session_t *ses, ttl_env_t *env, ttl_iriref_t *ti, int opcode)
-{
- caddr_t full_uri;
- const char *prefix_to_use;
- caddr_t loc = ti->loc;
- int close_attr = 0;
- if (ti->is_bnode)
- {
- full_uri = ((NULL != ti->uri) ? ti->uri : loc);
- if ((RDFXML_HTTP_WRITE_REF_ABOUT != opcode) && (RDFXML_HTTP_WRITE_REF_RES != opcode))
- { /* 0123456789012345678901 */
- session_buffered_write (ses, "rdf:MisusedBlankNode_", 21);
- session_buffered_write (ses, full_uri, strlen (full_uri));
- return;
- } /* 012345678901.23 */
- session_buffered_write (ses, " rdf:nodeID=\"", 13);
- session_buffered_write (ses, full_uri, strlen (full_uri));
- session_buffered_write_char ('"', ses);
- return;
- }
- switch (opcode)
- {
- case RDFXML_HTTP_WRITE_REF_ABOUT: /* 01234567890.12 */
- session_buffered_write (ses, " rdf:about=\"", 12);
- prefix_to_use = NULL;
- close_attr = 1;
- break;
- case RDFXML_HTTP_WRITE_REF_P_OPEN: /* no break */
- case RDFXML_HTTP_WRITE_REF_P_CLOSE:
- prefix_to_use = ti->prefix;
- if ((NULL == prefix_to_use) && (NULL != ti->ns) && ('\0' != ti->ns[0]))
- prefix_to_use = "p";
- break;
- case RDFXML_HTTP_WRITE_REF_RES: /* 01234567890123.45 */
- session_buffered_write (ses, " rdf:resource=\"", 15);
- prefix_to_use = NULL;
- close_attr = 1;
- break;
- case RDFXML_HTTP_WRITE_REF_DT: /* 01234567890123.45 */
- session_buffered_write (ses, " rdf:datatype=\"", 15);
- prefix_to_use = ti->prefix;
- if ((NULL == prefix_to_use) && (NULL != ti->ns) && ('\0' != ti->ns[0]))
- prefix_to_use = "dt";
- close_attr = 1;
- break;
- default: prefix_to_use = NULL; GPF_T;
- }
- if (NULL != prefix_to_use)
- {
- session_buffered_write (ses, prefix_to_use, strlen (prefix_to_use));
- session_buffered_write_char (':', ses);
- dks_esc_write (ses, ti->loc, box_length (ti->loc) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_TTL_IRI);
- if ((prefix_to_use != ti->prefix) && (RDFXML_HTTP_WRITE_REF_P_CLOSE != opcode))
- {
- session_buffered_write (ses, " xmlns:", 7);
- session_buffered_write (ses, prefix_to_use, strlen (prefix_to_use));
- session_buffered_write (ses, "=\"", 2);
- dks_esc_write (ses, ti->ns, box_length (ti->ns) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_TTL_IRI);
- close_attr = 1;
- }
- }
- else
- {
- full_uri = ((NULL != ti->uri) ? ti->uri : loc);
- dks_esc_write (ses, full_uri, box_length (full_uri) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_PTEXT);
- }
- if (close_attr)
- session_buffered_write_char ('"', ses);
-}
-
-static void
-http_rdfxml_prepare_obj (query_instance_t *qi, caddr_t obj, dtp_t obj_dtp, ttl_iriref_t *dt_ret)
-{
- if (DV_RDF == obj_dtp)
- {
- rdf_box_t *rb = (rdf_box_t *)obj;
- if (!rb->rb_is_complete)
- rb_complete (rb, qi->qi_trx, qi);
- rb_dt_lang_check(rb);
- if (RDF_BOX_DEFAULT_TYPE != rb->rb_type)
- {
- dt_ret->uri = rdf_type_twobyte_to_iri (rb->rb_type);
- if ((uname_rdf_ns_uri_XMLLiteral == dt_ret->uri) && (DV_XML_ENTITY == DV_TYPE_OF (obj)))
- {
- dk_free_box (dt_ret->uri);
- dt_ret->uri = NULL;
- return;
- }
- if (NULL != dt_ret->uri) /* if by some reason rb_type is wrong */
- box_flags (dt_ret->uri) |= BF_IRI;
- return;
- }
- obj = rb->rb_box;
- }
- if ((DV_STRING == DV_TYPE_OF (obj)) || DV_XML_ENTITY == DV_TYPE_OF (obj))
- {
- dk_free_box (dt_ret->uri);
- dt_ret->uri = NULL;
- }
- else
- {
- caddr_t dt_iri = xsd_type_of_box (obj);
- if (!IS_BOX_POINTER (dt_iri))
- dt_ret->uri = NULL;
- else
- dt_ret->uri = dt_iri;
- }
-}
-
-static void
-http_rdfxml_write_obj (dk_session_t *ses, ttl_env_t *env, query_instance_t *qi, caddr_t obj, dtp_t obj_dtp, ttl_iriref_t *dt_ptr)
-{
- caddr_t obj_box_value;
- dtp_t obj_box_value_dtp;
- if (DV_RDF == obj_dtp)
- {
- obj_box_value = ((rdf_box_t *)obj)->rb_box;
- obj_box_value_dtp = DV_TYPE_OF (obj_box_value);
- }
- else
- {
- obj_box_value = obj;
- obj_box_value_dtp = obj_dtp;
- }
- switch (obj_box_value_dtp)
- {
- case DV_DATETIME:
- {
- char temp [50];
- dt_to_iso8601_string (obj_box_value, temp, sizeof (temp));
- session_buffered_write (ses, temp, strlen (temp));
- break;
- }
- case DV_STRING:
- dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_PTEXT);
- break;
- case DV_WIDE:
- dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - sizeof (wchar_t), CHARSET_UTF8, CHARSET_WIDE, DKS_ESC_PTEXT);
- break;
- case DV_XML_ENTITY:
- {
- client_connection_t *cli = qi->qi_client;
- wcharset_t *saved_charset = cli->cli_charset;
- xml_entity_t *xe = (xml_entity_t *)(obj_box_value);
- cli->cli_charset = CHARSET_UTF8;
- xe->_->xe_serialize (xe, ses);
- cli->cli_charset = saved_charset;
- break;
- }
- case DV_DB_NULL:
- session_buffered_write (ses, "(NULL)", 6);
- break;
- default:
- {
- caddr_t tmp_utf8_box = box_cast_to_UTF8 ((caddr_t *)qi, obj_box_value);
- session_buffered_write (ses, tmp_utf8_box, box_length (tmp_utf8_box) - 1);
- dk_free_box (tmp_utf8_box);
- break;
- }
- }
-}
-
-caddr_t
-bif_http_rdfxml_triple (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- query_instance_t *qi = (query_instance_t *)qst;
- ttl_env_t *env = (ttl_env_t *)bif_arg (qst, args, 0, "http_rdfxml_triple");
- caddr_t subj = bif_arg (qst, args, 1, "http_rdfxml_triple");
- caddr_t pred = bif_arg (qst, args, 2, "http_rdfxml_triple");
- caddr_t obj = bif_arg (qst, args, 3, "http_rdfxml_triple");
- dk_session_t *ses = http_session_no_catch_arg (qst, args, 4, "http_rdfxml_triple");
- int status = 0;
- int obj_is_iri = 0;
- int obj_is_xml = 0;
- dtp_t obj_dtp = 0;
- ttl_iriref_items_t tii;
- memset (&tii,0, sizeof (ttl_iriref_items_t));
- if (DV_ARRAY_OF_POINTER != DV_TYPE_OF ((caddr_t)env) ||
- (sizeof (ttl_env_t) != box_length ((caddr_t)env)) ||
- (DV_DICT_ITERATOR != DV_TYPE_OF (env->te_used_prefixes)) /* ||
- (((DV_STRING == DV_TYPE_OF (env->te_prev_subj_ns)) || (DV_UNAME == DV_TYPE_OF (env->te_prev_subj_ns))) &&
- ((DV_STRING != DV_TYPE_OF (env->te_prev_subj_loc)) ||
- ((DV_STRING != DV_TYPE_OF (env->te_prev_pred_ns)) && (DV_UNAME != DV_TYPE_OF (env->te_prev_pred_ns))) ||
- (DV_STRING != DV_TYPE_OF (env->te_prev_pred_loc)) ) ) */ ||
- (DV_LONG_INT != DV_TYPE_OF (env->te_ns_count_s_o)) ||
- (DV_LONG_INT != DV_TYPE_OF (env->te_ns_count_p_dt)) )
- sqlr_new_error ("22023", "SR601", "Argument 1 of http_rdfxml_triple() should be an array of special format");
- if (!iri_cast_rdfxml_qname (qi, subj, &tii.s.uri, &tii.s.is_bnode))
- goto fail; /* see below */
- if (!iri_cast_and_split_ttl_qname (qi, pred, &tii.p.ns, &tii.p.loc, &tii.p.is_bnode))
- goto fail; /* see below */
- if ((NULL != tii.p.ns) && ('\0' != tii.p.ns[0]) && (!tii.p.is_bnode))
- {
- id_hash_iterator_t *ns2pref_hit = env->te_used_prefixes;
- id_hash_t *ns2pref = ns2pref_hit->hit_hash;
-#ifndef NDEBUG
- if ('\0' == tii.p.ns[0])
- GPF_T1("ttl_" "bif_http_rdfxml_triple: empty p.ns");
-#endif
- if (('_' != tii.p.ns[0]) || (':' != tii.p.ns[1]))
- {
- caddr_t *prefx_ptr = (caddr_t *)id_hash_get (ns2pref, (caddr_t)(&tii.p.ns));
- if (NULL != prefx_ptr)
- tii.p.prefix = box_copy (prefx_ptr[0]);
- }
- }
- obj_dtp = DV_TYPE_OF (obj);
- switch (obj_dtp)
- {
- case DV_UNAME: case DV_IRI_ID: case DV_IRI_ID_8: obj_is_iri = 1; break;
- case DV_STRING: obj_is_iri = (BF_IRI & box_flags (obj)) ? 1 : 0; break;
- case DV_XML_ENTITY: obj_is_xml = 1; break;
- case DV_RDF: if (DV_XML_ENTITY == DV_TYPE_OF (((rdf_box_t *)obj)->rb_box)) obj_is_xml = 1; break;
- }
- if (obj_is_iri)
- {
- if (!iri_cast_rdfxml_qname (qi, obj, &tii.o.uri, &tii.o.is_bnode))
- goto fail; /* see below */
- }
- else
- {
- http_rdfxml_prepare_obj (qi, obj, obj_dtp, &tii.dt);
- if (NULL != tii.dt.uri)
- iri_cast_rdfxml_qname (qi, tii.dt.uri, &(tii.dt.uri), &(tii.dt.is_bnode));
- }
- if (DV_STRING != DV_TYPE_OF (env->te_prev_subj_loc))
- {
- dk_free_tree (env->te_prev_subj_loc); env->te_prev_subj_loc = NULL;
- }
- if ((NULL == env->te_prev_subj_loc) ||
- strcmp (env->te_prev_subj_loc, tii.s.uri) )
- {
- if (NULL != env->te_prev_subj_loc)
- { /* .0123456789012345678901 */
- session_buffered_write (ses, "\n </rdf:Description>", 21);
- dk_free_tree (env->te_prev_subj_loc); env->te_prev_subj_loc = NULL;
- dk_free_tree (env->te_prev_pred_ns); env->te_prev_pred_ns = NULL;
- dk_free_tree (env->te_prev_pred_loc); env->te_prev_pred_loc = NULL;
- }
- /* .01234567890123456789 */
- session_buffered_write (ses, "\n <rdf:Description", 19);
- rdfxml_http_write_ref (ses, env, &(tii.s), RDFXML_HTTP_WRITE_REF_ABOUT);
- session_buffered_write_char ('>', ses);
- env->te_prev_subj_loc = tii.s.uri;
- tii.s.uri = NULL;
- }
- /* .0123456 */
- session_buffered_write (ses, "\n <", 6);
- rdfxml_http_write_ref (ses, env, &(tii.p), RDFXML_HTTP_WRITE_REF_P_OPEN);
- if (obj_is_iri)
- {
- rdfxml_http_write_ref (ses, env, &(tii.o), RDFXML_HTTP_WRITE_REF_RES);
- session_buffered_write (ses, " />", 3);
- }
- else
- {
- if (NULL != tii.dt.uri)
- rdfxml_http_write_ref (ses, env, &(tii.dt), RDFXML_HTTP_WRITE_REF_DT);
- if (obj_is_xml) /* 012345678901234.56789012.34 */
- session_buffered_write (ses, " rdf:parseType=\"Literal\"", 24);
- if (DV_RDF == obj_dtp)
- {
- rdf_box_t *rb = (rdf_box_t *)obj;
- rb_dt_lang_check(rb);
- if (RDF_BOX_DEFAULT_LANG != rb->rb_lang)
- {
- caddr_t lang_id = rdf_lang_twobyte_to_string (rb->rb_lang);
- if (NULL != lang_id) /* just in case if lang cannot be found, may be signal an error ? */
- { /* 0123456789.01 */
- session_buffered_write (ses, " xml:lang=\"", 11);
- session_buffered_write (ses, lang_id, box_length (lang_id) - 1);
- session_buffered_write_char ('"', ses);
- dk_free_box (lang_id);
- }
- }
- }
- session_buffered_write_char ('>', ses);
- http_rdfxml_write_obj (ses, env, qi, obj, obj_dtp, &tii.dt);
- session_buffered_write (ses, "</", 2);
- rdfxml_http_write_ref (ses, env, &(tii.p), RDFXML_HTTP_WRITE_REF_P_CLOSE);
- session_buffered_write_char ('>', ses);
- }
-fail:
- dk_free_box (tii.s.uri); /* dk_free_box (tii.s.ns); dk_free_box (tii.s.loc); dk_free_box (tii.s.prefix); */
- dk_free_box (tii.p.uri); dk_free_box (tii.p.ns); dk_free_box (tii.p.loc); dk_free_box (tii.p.prefix);
- dk_free_box (tii.o.uri); /* dk_free_box (tii.o.ns); dk_free_box (tii.o.loc); dk_free_box (tii.o.prefix); */
- dk_free_box (tii.dt.uri); /* dk_free_box (tii.dt.ns); dk_free_box (tii.dt.loc); dk_free_box (tii.dt.prefix); */
- return (caddr_t)(ptrlong)(status);
-}
-
/*! Environment of Ntriples serializer */
typedef struct nt_env_s {
caddr_t ne_rowctr; /*!< Item 1 is row counter. */
@@ -3004,11 +2522,6 @@ http_nt_write_obj (dk_session_t *ses, nt_env_t *env, query_instance_t *qi, caddr
dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - 1, CHARSET_UTF8, CHARSET_UTF8, esc_mode);
session_buffered_write_char ('"', ses);
break;
- case DV_WIDE:
- session_buffered_write_char ('"', ses);
- dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - sizeof (wchar_t), CHARSET_UTF8, CHARSET_WIDE, esc_mode);
- session_buffered_write_char ('"', ses);
- break;
case DV_XML_ENTITY:
{
http_ttl_or_nt_write_xe (ses, qi, (xml_entity_t *)(obj_box_value),
@@ -3018,30 +2531,34 @@ http_nt_write_obj (dk_session_t *ses, nt_env_t *env, query_instance_t *qi, caddr
case DV_DB_NULL:
session_buffered_write (ses, "(NULL)", 6);
break;
+ case DV_STRING_SESSION:
+ session_buffered_write_char ('"', ses);
+ dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - 1, CHARSET_UTF8, CHARSET_UTF8, esc_mode);
+ session_buffered_write_char ('"', ses);
+ break;
default:
{
- caddr_t iri = xsd_type_of_box (obj_box_value);
+ ccaddr_t iri = xsd_type_of_box (obj_box_value);
caddr_t tmp_utf8_box = box_cast_to_UTF8 ((caddr_t *)qi, obj_box_value);
session_buffered_write_char ('"', ses);
session_buffered_write (ses, tmp_utf8_box, box_length (tmp_utf8_box) - 1);
dk_free_box (tmp_utf8_box);
session_buffered_write_char ('"', ses);
- if ((DV_RDF != obj_dtp) && (DV_WIDE != obj_box_value_dtp))
+ if (DV_RDF != obj_dtp)
{
if (!IS_BOX_POINTER (iri))
sqlr_new_error ("22023", "SR624", "Unsupported datatype %d in NT serialization of an object", obj_dtp);
SES_PRINT (ses, "^^");
- if (esc_mode == DKS_ESC_PTEXT)
- SES_PRINT (ses, "<");
- else
- session_buffered_write_char ('<', ses);
+ if (esc_mode == DKS_ESC_PTEXT)
+ SES_PRINT (ses, "<");
+ else
+ session_buffered_write_char ('<', ses);
dks_esc_write (ses, iri, box_length_inline (iri)-1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_TTL_IRI);
- if (esc_mode == DKS_ESC_PTEXT)
- SES_PRINT (ses, ">");
- else
- session_buffered_write_char ('>', ses);
+ if (esc_mode == DKS_ESC_PTEXT)
+ SES_PRINT (ses, ">");
+ else
+ session_buffered_write_char ('>', ses);
}
- dk_free_box (iri);
break;
}
}
@@ -3281,7 +2798,7 @@ http_talis_json_write_literal_obj (dk_session_t *ses, query_instance_t *qi, cadd
{
caddr_t obj_box_value;
dtp_t obj_box_value_dtp;
- caddr_t type_uri = NULL;
+ ccaddr_t type_uri = NULL, to_free = NULL;
if (DV_RDF == obj_dtp)
{
rdf_box_t *rb = (rdf_box_t *)obj;
@@ -3291,7 +2808,9 @@ http_talis_json_write_literal_obj (dk_session_t *ses, query_instance_t *qi, cadd
obj_box_value_dtp = DV_TYPE_OF (obj_box_value);
rb_dt_lang_check(rb);
if (RDF_BOX_DEFAULT_TYPE != rb->rb_type)
- type_uri = rdf_type_twobyte_to_iri (rb->rb_type);
+ {
+ to_free = type_uri = rdf_type_twobyte_to_iri (rb->rb_type);
+ }
}
else
{
@@ -3325,16 +2844,10 @@ http_talis_json_write_literal_obj (dk_session_t *ses, query_instance_t *qi, cadd
dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_JSWRITE_DQ);
session_buffered_write_char ('\"', ses);
break;
- case DV_WIDE:
- session_buffered_write_char ('\"', ses);
- dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - sizeof (wchar_t), CHARSET_UTF8, CHARSET_WIDE, DKS_ESC_JSWRITE_DQ);
- session_buffered_write_char ('\"', ses);
- break;
case DV_XML_ENTITY:
{
http_json_write_xe (ses, qi, (xml_entity_t *)(obj_box_value));
- if (NULL == type_uri)
- type_uri = uname_rdf_ns_uri_XMLLiteral;
+ type_uri = uname_rdf_ns_uri_XMLLiteral;
break;
}
case DV_DB_NULL:
@@ -3377,9 +2890,9 @@ http_talis_json_write_literal_obj (dk_session_t *ses, query_instance_t *qi, cadd
session_buffered_write (ses, " , \"datatype\" : \"", 17);
dks_esc_write (ses, type_uri, box_length (type_uri) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_JSWRITE_DQ);
session_buffered_write_char ('\"', ses);
- dk_free_box (type_uri);
}
session_buffered_write (ses, " }", 2);
+ dk_free_box (to_free);
}
caddr_t
@@ -3471,7 +2984,7 @@ http_ld_json_write_literal_obj (dk_session_t *ses, query_instance_t *qi, caddr_t
{
caddr_t obj_box_value;
dtp_t obj_box_value_dtp;
- caddr_t type_uri = NULL;
+ ccaddr_t type_uri = NULL;
if (DV_RDF == obj_dtp)
{
rdf_box_t *rb = (rdf_box_t *)obj;
@@ -3504,12 +3017,11 @@ http_ld_json_write_literal_obj (dk_session_t *ses, query_instance_t *qi, caddr_t
session_buffered_write (ses, "true", 4);
else
session_buffered_write (ses, "false", 5);
- dk_free_box (type_uri);
return;
}
- /* 0 1 */
- /* 01.2345678.90123 */
- session_buffered_write (ses, "{ \"@value\" : ", 13);
+ /* 0 1 */
+ /* 01.234567890.12345 */
+ session_buffered_write (ses, "{ \"@literal\" : ", 15);
switch (obj_box_value_dtp)
{
case DV_DATETIME:
@@ -3533,16 +3045,10 @@ http_ld_json_write_literal_obj (dk_session_t *ses, query_instance_t *qi, caddr_t
dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_JSWRITE_DQ);
session_buffered_write_char ('\"', ses);
break;
- case DV_WIDE:
- session_buffered_write_char ('\"', ses);
- dks_esc_write (ses, obj_box_value, box_length (obj_box_value) - sizeof (wchar_t), CHARSET_UTF8, CHARSET_WIDE, DKS_ESC_JSWRITE_DQ);
- session_buffered_write_char ('\"', ses);
- break;
case DV_XML_ENTITY:
{
http_json_write_xe (ses, qi, (xml_entity_t *)(obj_box_value));
- if (NULL == type_uri)
- type_uri = uname_rdf_ns_uri_XMLLiteral;
+ type_uri = uname_rdf_ns_uri_XMLLiteral;
break;
}
case DV_DB_NULL:
@@ -3583,12 +3089,11 @@ http_ld_json_write_literal_obj (dk_session_t *ses, query_instance_t *qi, caddr_t
{
if (!IS_BOX_POINTER (type_uri))
sqlr_new_error ("22023", "SR625", "Unsupported datatype %d in LD-style JSON serialization of an RDF object", obj_dtp);
- /* 0 1 */
- /* 012.345678.9012.34 */
- session_buffered_write (ses, " , \"@type\" : \"", 14);
+ /* 0 1 */
+ /* 012.3456789012.3456.78 */
+ session_buffered_write (ses, " , \"@datatype\" : \"", 18);
dks_esc_write (ses, type_uri, box_length (type_uri) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_JSWRITE_DQ);
session_buffered_write_char ('\"', ses);
- dk_free_box (type_uri);
}
session_buffered_write (ses, " }", 2);
}
@@ -3636,36 +3141,36 @@ bif_http_ld_json_triple (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
if ((NULL == env->tje_prev_subj) || strcmp (env->tje_prev_subj, subj_iri))
{
if (NULL != env->tje_prev_pred)
- { /* 012345.678901 */
- session_buffered_write (ses, " ] } ,\n ", 11);
+ { /* 012345.6789 */
+ session_buffered_write (ses, " ] } ,\n ", 9);
dk_free_tree (env->tje_prev_subj); env->tje_prev_subj = NULL;
dk_free_tree (env->tje_prev_pred); env->tje_prev_pred = NULL;
}
- /* 01.2345.678.90 */
- session_buffered_write (ses, "{ \"@id\": \"", 10);
+ /* 01.23.456.78 */
+ session_buffered_write (ses, "{ \"@\": \"", 8);
dks_esc_write (ses, subj_iri, box_length (subj_iri) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_JSWRITE_DQ);
- /* .01.23456789 */
- session_buffered_write (ses, "\",\n ", 9);
+ /* .01.23 */
+ session_buffered_write (ses, "\",\n", 3);
env->tje_prev_subj = subj_iri_is_new ? subj_iri : box_copy (subj_iri); subj_iri_is_new = 0;
}
if ((NULL == env->tje_prev_pred) || strcmp (env->tje_prev_pred, pred_iri))
{
if (NULL != env->tje_prev_pred)
- { /* 0123.45678901 */
- session_buffered_write (ses, " ] ,\n ", 11);
+ { /* 0123.456789 */
+ session_buffered_write (ses, " ] ,\n ", 9);
dk_free_tree (env->tje_prev_pred); env->tje_prev_pred = NULL;
}
session_buffered_write_char ('\"', ses);
if (!strcmp (pred_iri, uname_rdf_ns_uri_type))
- session_buffered_write (ses, "@type", 5);
+ session_buffered_write_char ('a', ses);
else
dks_esc_write (ses, pred_iri, box_length (pred_iri) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_JSWRITE_DQ);
/* .0123456 */
session_buffered_write (ses, "\" : [ ", 6);
env->tje_prev_pred = pred_iri_is_new ? pred_iri : box_copy (pred_iri); pred_iri_is_new = 0;
}
- else /* 01.2345678901 */
- session_buffered_write (ses, " ,\n ", 11);
+ else /* 01.23456789 */
+ session_buffered_write (ses, " ,\n ", 9);
if (obj_is_iri)
{
session_buffered_write_char ('\"', ses);
@@ -3980,13 +3485,6 @@ sparql_rset_xml_write_row_impl (query_instance_t *qi, dk_session_t *ses, caddr_t
}
break;
}
- case DV_WIDE:
- {
- SES_PRINT (ses, "<literal>");
- dks_esc_write (ses, val, box_length_inline (val) - sizeof (wchar_t), CHARSET_UTF8, CHARSET_WIDE, DKS_ESC_PTEXT);
- SES_PRINT (ses, "</literal>");
- break;
- }
case DV_STRING:
{
if (!(BF_IRI & box_flags (val)))
@@ -4019,7 +3517,6 @@ sparql_rset_xml_write_row_impl (query_instance_t *qi, dk_session_t *ses, caddr_t
SES_PRINT (ses, "<literal datatype=\"");
dks_esc_write (ses, iri, box_length_inline (iri)-1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_SQATTR);
SES_PRINT (ses, "\">");
- dk_free_box (iri);
goto literal_elt_printed; /* see below */
}
else
@@ -4033,7 +3530,6 @@ sparql_rset_xml_write_row_impl (query_instance_t *qi, dk_session_t *ses, caddr_t
SES_PRINT (ses, "<literal xml:lang=\"");
dks_esc_write (ses, l, box_length_inline (l)-1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_SQATTR);
SES_PRINT (ses, "\">");
- dk_free_box (l);
goto literal_elt_printed; /* see below */
}
else
@@ -4058,13 +3554,12 @@ literal_elt_printed:
}
default:
{
- caddr_t iri = xsd_type_of_box (val);
+ ccaddr_t iri = xsd_type_of_box (val);
if (IS_BOX_POINTER (iri))
{
SES_PRINT (ses, "<literal datatype=\"");
dks_esc_write (ses, iri, box_length_inline (iri)-1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_SQATTR);
SES_PRINT (ses, "\">");
- dk_free_box (iri);
}
else
SES_PRINT (ses, "<literal>");
@@ -4170,7 +3665,7 @@ bif_sparql_iri_split_rdfa_qname (caddr_t * qst, caddr_t * err_ret, state_slot_t
res = (flags & 0x2) ? list (3, NULL, box_dv_short_string (""), box_dv_short_nchars (iri, iri_strlen)) : NULL;
goto res_done; /* see below */
}
- if (tail > iri && tail[-1] == '%' && (tail <= (iri + iri_strlen - 2)))
+ if (tail > iri && tail[-1] == '%' && (tail < (iri + iri_strlen - 2)))
tail += 2;
to_free = ns_iri = box_dv_short_nchars (iri, tail-iri);
prefix_ptr = (caddr_t *)id_hash_get (ht, (caddr_t)(&ns_iri));
@@ -4700,7 +4195,7 @@ rdf_repl_feed_batch_of_rquads (query_instance_t *qi, caddr_t **rquads_vector, cc
tf->tf_current_graph_uri = NULL;
tf->tf_app_env = app_env;
tf->tf_creator = "__rdf_repl_action";
- tf->tf_boxed_input_name = NEW_DB_NULL;
+ tf->tf_input_name = NEW_DB_NULL;
tf->tf_line_no_ptr = &fake_lineno;
tf_set_cbk_names (tf, cbk_names);
DO_BOX_FAST (caddr_t *, rquad, rquad_ctr, rquads_vector)
@@ -4767,6 +4262,7 @@ rdf_repl_feed_batch_of_rquads (query_instance_t *qi, caddr_t **rquads_vector, cc
END_DO_BOX_FAST;
tf_commit (tf);
tf->tf_current_graph_uri = NULL; /* To not free it twice (there's no box_copy_tree from rquad[1] to it, just copying the pointer) */
+ dk_free_box ((caddr_t) tf->tf_input_name);
tf_free (tf);
dk_free_tree (rquads_vector);
}
@@ -5085,16 +4581,10 @@ rdf_box_init ()
bif_define_typed ("__rdf_redu_ser_long", bif_rdf_redu_ser_long, &bt_varchar);
bif_define_typed ("__rdf_redu_deser_long", bif_rdf_dist_deser_long, &bt_any);
bif_define ("http_sys_find_best_sparql_accept", bif_http_sys_find_best_sparql_accept);
- bif_define ("http_ttl_prefixes", bif_http_ttl_prefixes);
- bif_set_uses_index (bif_http_ttl_prefixes);
bif_define ("http_ttl_triple", bif_http_ttl_triple);
bif_set_uses_index (bif_http_ttl_triple);
bif_define ("http_nt_triple", bif_http_nt_triple);
bif_set_uses_index (bif_http_nt_triple);
- bif_define ("http_rdfxml_p_ns", bif_http_rdfxml_p_ns);
- bif_set_uses_index (bif_http_rdfxml_p_ns);
- bif_define ("http_rdfxml_triple", bif_http_rdfxml_triple);
- bif_set_uses_index (bif_http_rdfxml_triple);
bif_define ("http_talis_json_triple", bif_http_talis_json_triple);
bif_set_uses_index (bif_http_talis_json_triple);
bif_define ("http_ld_json_triple", bif_http_ld_json_triple);
diff --git a/libsrc/Wi/rdfinf.c b/libsrc/Wi/rdfinf.c
index e411829..752de8e 100644
--- a/libsrc/Wi/rdfinf.c
+++ b/libsrc/Wi/rdfinf.c
@@ -1,14 +1,14 @@
/*
* rdfinf.c
*
- * $Id: rdfinf.c,v 1.19.2.35 2012/03/08 12:55:35 source Exp $
+ * $Id: rdfinf.c,v 1.19.2.33 2011/10/13 14:06:54 source Exp $
*
* RDF Inference
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -347,7 +347,7 @@ char * tn_ifp_dist_text =
" where rorg.P in (rdf_inf_ifp_rel_list (:1)) and rsyn.P in (rdf_inf_ifp_rel_list (:1, rorg.P)) and rorg.S = :0 and isiri_id (:0) and rsyn.O = rorg.O and rorg.G in (:2) and rsyn.G in (:2) and not rdf_inf_ifp_is_excluded (:1, rorg.P, rorg.O) "
" option (any order)";
char * tn_ifp_dist_no_graph_text =
- " select syn.s from DB.DBA.RDF_QUAD org, DB.DBA.RDF_QUAD syn where org.p in (rdf_inf_ifp_list (:1)) and syn.p = org.p and org.s = :0 and isiri_id (:0) and syn.o = org.o and not rdf_inf_ifp_is_excluded (:1, org.P, org.O) "
+ " select syn.s from rdf_quad org, rdf_quad syn where org.p in (rdf_inf_ifp_list (:1)) and syn.p = org.p and org.s = :0 and isiri_id (:0) and syn.o = org.o and not rdf_inf_ifp_is_excluded (:1, org.P, org.O) "
" union all select rsyn.s from DB.DBA.RDF_QUAD rorg, DB.DBA.RDF_QUAD rsyn "
" where rorg.P in (rdf_inf_ifp_rel_list (:1)) and rsyn.P in (rdf_inf_ifp_rel_list (:1, rorg.P)) and rorg.S = :0 and isiri_id (:0) and rsyn.o = rorg.O and not rdf_inf_ifp_is_excluded (:1, rorg.P, rorg.O) "
" option (any order)";
diff --git a/libsrc/Wi/rdfinf.h b/libsrc/Wi/rdfinf.h
index 6096c0b..3db3344 100644
--- a/libsrc/Wi/rdfinf.h
+++ b/libsrc/Wi/rdfinf.h
@@ -1,10 +1,10 @@
/*
- * $Id: rdfinf.h,v 1.6.2.7 2012/03/08 12:55:35 source Exp $
+ * $Id: rdfinf.h,v 1.6.2.6 2011/01/10 20:49:47 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/rdflddir2.sql b/libsrc/Wi/rdflddir2.sql
index 9558a54..462d536 100644
--- a/libsrc/Wi/rdflddir2.sql
+++ b/libsrc/Wi/rdflddir2.sql
@@ -1,10 +1,10 @@
--
--- $Id: rdflddir2.sql,v 1.1.2.9 2012/03/08 12:55:35 source Exp $
+-- $Id: rdflddir2.sql,v 1.1.2.8 2011/10/28 13:16:44 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2011 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
diff --git a/libsrc/Wi/rdfxml_parser.c b/libsrc/Wi/rdfxml_parser.c
index af802ac..4afa507 100644
--- a/libsrc/Wi/rdfxml_parser.c
+++ b/libsrc/Wi/rdfxml_parser.c
@@ -1,14 +1,14 @@
/*
* rdfxml_parser.c
*
- * $Id: rdfxml_parser.c,v 1.17.2.25 2012/03/08 13:39:43 source Exp $
+ * $Id: rdfxml_parser.c,v 1.17.2.19 2011/05/16 09:04:22 source Exp $
*
* RDF/XML parser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -39,184 +39,12 @@ extern "C" {
}
#endif
-#ifdef NDEBUG
-#undef RDFXML_DEBUG
-#endif
-
#ifdef RDFXML_DEBUG
#define rdfxml_dbg_printf(x) dbg_printf (x)
#else
#define rdfxml_dbg_printf(x)
#endif
-/*!< RDF/XML parser mode, i.e. what does the parser expect to read */
-#define XRL_PARSETYPE_TOP_LEVEL 0x01 /*!< Top-level element (rdf:RDF) */
-#define XRL_PARSETYPE_RESOURCE 0x02 /*!< Resource description */
-#define XRL_PARSETYPE_LITERAL 0x04 /*!< Literal value */
-#define XRL_PARSETYPE_RES_OR_LIT 0x08 /*!< Either resource description or a literal */
-#define XRL_PARSETYPE_PROPLIST 0x10 /*!< Sequence of properties of a resource */
-#define XRL_PARSETYPE_EMPTYPROP 0x20 /*!< Nothing but ending tag of property */
-#define XRL_PARSETYPE_COLLECTION 0x40 /*!< First resource inside collection, other resources are recognized by */
-#define XRL_PARSETYPE_SET_EXPLICITLY 0x80 /*!< The parser mode is set explicitly by rdf:parseType attribute */
-
-/*! Stack part of RDF/XML-specific context of XML parser.
-These are fields of quad to be created.
-"Inheritable" fields are propagated from the parent. Pointers are copied, strings are not copied. */
-typedef struct xp_rdfxml_locals_s
-{
- struct xp_rdfxml_locals_s *xrl_parent; /*!< Pointer to parent context */
- xp_node_t * xrl_xn; /*!< Node whose not-yet-closed element corresponds to the given context */
- caddr_t xrl_subject; /*!< Subject (IRI of named node or blank node IRI_ID); subject is used for nested predicates */
- caddr_t xrl_predicate; /*!< Predicate (IRI of named node or blank node IRI_ID) */
- caddr_t xrl_base; /*!< Base to resolve relative URIs, inheritable */
- caddr_t xrl_language; /*!< Language tag as string or NULL, inheritable */
- caddr_t xrl_datatype; /*!< Object data type (named node IRI_ID), not inheritable */
- caddr_t xrl_reification_id; /*!< ID used to reify a statement as four quads for S,P,O and rdf:type rdfs:Statement. */
- int xrl_li_count; /*!< Counter of used LI, not inheritable */
- dk_set_t xrl_seq_items; /*!< Backstack of "Sequence" parseType subjects */
- unsigned char xrl_parsetype; /*!< Parse type (one of XRL_DATATYPE_NNN), not inheritable */
- char xrl_base_set;
- char xrl_language_set;
-} xp_rdfxml_locals_t;
-
-#define RDFA_ICT_PRED_REL_OR_TYPEOF 200 /*!< Forward with ref object */
-#define RDFA_ICT_PRED_REV 201 /*!< Reverse predicate */
-#define RDFA_ICT_PRED_PROPERTY 202 /*!< Forward predicate with literal object */
-
-/*! [I]n[C]omplete [T]riple.
-We should keep subject instead of use of innermost xrdfal_subj.
-This is for incomplete triples inside HEAD, they may wait for BASE definition and contain different "about" attributes. */
-typedef struct rdfa_ict_s
-{
- ptrlong ict_pred_type; /*!< Predicate type, one of RDFA_ICT_PRED_xxx values */
- caddr_t ict_left; /*!< Subject by default and object if \c ict_pred_type == RDFA_ICT_PRED_REV */
- caddr_t ict_pred; /*!< Predicate */
- caddr_t ict_right; /*!< Object by default and subject if \c ict_pred_type == RDFA_ICT_PRED_REV */
- caddr_t ict_datatype; /*!< Datatype of a literal object */
- caddr_t ict_language; /*!< Language of a literal object */
- ptrlong ict_used_as_template; /*!< The ICT itself was used as a template for cases like <X rel="p"><Y typeof="t" /></X> (even if was not completed) */
-} rdfa_ict_t;
-
-#define RDFA_IN_HTML 0x01 /*!< The current tag is XHTML top (or nested), respect <HEAD> and <BODY> if found inside */
-#define RDFA_IN_HEAD 0x02 /*!< The current tag is HEAD in XHTML (or nested), the doc is now default subject, do not feed triples immediately to handle <BASE> */
-#define RDFA_IN_BASE 0x04 /*!< The current tag is BASE in HEAD in XHTML (or nested), the content will go to all \c xrdfal_base throughout the stack. */
-#define RDFA_IN_BODY 0x08 /*!< The current tag is BODY in XHTML (or nested), the doc is now default subject, do feed triples as soon as they're complete */
-#define RDFA_IN_LITERAL 0x10 /*!< The parser runs inside an XML literal or a string literal or an unused subtree, because there was a "property" attribute */
-#define RDFA_IN_UNUSED 0x20 /*!< The parser runs inside an element with "content" attribute. The attribute is used as a string literal already so there's nothing to do in a subtree. Similarly, it is used for internals of <base href="...">...</base> */
-#define RDFA_IN_STRLITERAL 0x40 /*!< The parser runs inside an element with explicit datatype other than rdf:XMLLiteral, so all non-text items should be ignored, only texts are important. */
-#define RDFA_IN_XMLLITERAL 0x80 /*!< The parser runs inside an element with explicit rdf:XMLLiteral datatype or datatype is not present but non-text nodes were found. */
-
-/*! Stack part of RDFa-specific context of XML parser.
-Unlike RDF/XML, not every opened tag gets its own stack item, because many of them lacks RDFa-specific data at all.
-RDFa locals are popped only when an XML element to close corresponds to xrdfal_xn of the innermost local context */
-
-typedef struct xp_rdfa_locals_s
-{
- struct xp_rdfa_locals_s *xrdfal_parent; /*!< Pointer to parent context */
- xp_node_t * xrdfal_xn; /*!< Node whose not-yet-closed element corresponds to the given context */
- int xrdfal_place_bits; /*!< A combination of RDFA_IN_... bits */
- caddr_t xrdfal_subj; /*!< A [new subject] as set at the end of parsing the opening tag. It can be NULL, look up */
- caddr_t xrdfal_obj_res; /*!< A [current object resource] as set at the end of parsing the opening tag or created as bnode after that */
- caddr_t xrdfal_datatype; /*!< Datatype IRI */
- caddr_t xrdfal_base; /*!< Base to resolve relative links as set by <BASE> now in XSLT+RDFa and may be set by xml:base in other XML docs. Automatically inherited from parent */
- caddr_t xrdfal_language; /*!< Language label. Automatically inherited from parent */
- caddr_t xrdfal_vocab; /*!< Vocabulary URI. Automatically inherited from parent */
- caddr_t * xrdfal_profile_terms; /*!< Definitions of terms from an external RDFa profile resource, get-keyword style, sorted by terms for \c ecm_find_name(). Automatically inherited from parent */
- rdfa_ict_t * xrdfal_ict_buffer; /*!< Storage for incomplete triples, may contain NULLs at the end */
- int xrdfal_ict_count; /*!< Count of stored incomplete triples */
- int xrdfal_boring_opened_elts; /*!< Number of opened but not yet closed elements inside RDFA_IN_STRLITERAL or RDFA_IN_UNUSED or "uninteresting" elements between \c xrdfal_xn and next nested \c xp_rdfa_locals_t in chain */
-} xp_rdfa_locals_t;
-
-#define RDFA_ATTR_ABOUT 0
-#define RDFA_ATTR_CONTENT 1
-#define RDFA_ATTR_DATATYPE 2
-#define RDFA_ATTR_HREF 3
-#define RDFA_ATTR_PREFIX 4
-#define RDFA_ATTR_PROFILE 5
-#define RDFA_ATTR_PROPERTY 6
-#define RDFA_ATTR_REL 7
-#define RDFA_ATTR_RESOURCE 8
-#define RDFA_ATTR_REV 9
-#define RDFA_ATTR_SRC 10
-#define RDFA_ATTR_TYPEOF 11
-#define RDFA_ATTR_VOCAB 12
-#define RDFA_ATTR_XML_BASE 13
-#define RDFA_ATTR_XML_LANG 14
-#define COUNTOF__RDFA_ATTR 15
-
-#define MDATA_IN_UNUSED 0x01 /*!< The parser runs inside an "blocking" element. This is not used ATM, but can be used later for tags like XMP */
-#define MDATA_IN_STRLITERAL 0x02 /*!< The parser runs inside an element with explicit datatype other than rdf:XMLLiteral, so all non-text items should be ignored, only texts are important. */
-#define MDATA_IN_XMLLITERAL 0x04 /*!< The parser runs inside an element with explicit rdf:XMLLiteral datatype or datatype is not present but non-text nodes were found. */
-
-/*! Stack part of Microdata-specific context of XML parser.
-Unlike RDF/XML, not every opened tag gets its own stack item, because many of them lacks Microdata-specific data at all.
-Microdata locals are popped only when an XML element to close corresponds to xmdatal_xn of the innermost local context */
-
-typedef struct xp_mdata_locals_s
-{
- struct xp_mdata_locals_s *xmdatal_parent; /*!< Pointer to parent context */
- xp_node_t * xmdatal_xn; /*!< Node whose not-yet-closed element corresponds to the given context */
- int xmdatal_place_bits; /*!< A combination of MDATA_IN_... bits */
- caddr_t xmdatal_subj; /*!< An [item] as set at the end of parsing the opening tag. It can be NULL inside MDATA_IN_UNUSED, it can be set to Id instead of ITEMID. Automatically inherited from parent */
- int xmdatal_subj_is_id; /*!< Flags if \c xmldatal_subj is set by document-wide id, not by a global itemid or a "blank node" itemscope. Automatically inherited from parent */
- int xmdatal_prop_count; /*!< Count of predicates set above the current element, they're listed at the beginning of \c xmdatal_preds. Automatically inherited from parent */
- caddr_t * xmdatal_props; /*!< Buffer for predicates set above the current element. Automatically inherited from parent */
- caddr_t xmdatal_datatype; /*!< Datatype IRI. Automatically inherited from parent */
- int xmdatal_datatype_is_local; /*!< Datatype can be removed from \c xpt_subj2type at closing this tag. NOT inherited from parent! */
- caddr_t xmdatal_base; /*!< Base to resolve relative links as set by <BASE> now in XSLT+RDFa and may be set by xml:base in other XML docs. Automatically inherited from parent */
- caddr_t xmdatal_language; /*!< Language label. Automatically inherited from parent */
- int xmdatal_boring_opened_elts; /*!< Number of opened but not yet closed elements inside MDATA_IN_STRLITERAL or MDATA_IN_UNUSED or "uninteresting" elements between \c xmdatal_xn and next nested \c xp_mdata_locals_t in chain */
-} xp_mdata_locals_t;
-
-#define MDATA_ATTR_OBJ_CONTENT_STRLIT 0
-#define MDATA_ATTR_OBJ_DATETIME 1
-#define MDATA_ATTR_OBJ_STRLIT 2
-#define MDATA_ATTR_OBJ_CITE_REF 3
-#define MDATA_ATTR_OBJ_REF 4
-#define MDATA_ATTR_OBJ_NAME 5
-#define MDATA_ATTR_ID 6
-#define MDATA_ATTR_ITEMID 7
-#define MDATA_ATTR_ITEMPROP 8
-#define MDATA_ATTR_ITEMREF 9
-#define MDATA_ATTR_ITEMSCOPE 10
-#define MDATA_ATTR_ITEMTYPE 11
-#define MDATA_ATTR_REL 12
-#define MDATA_ATTR_XML_BASE 13
-#define MDATA_ATTR_XML_LANG 14
-#define COUNTOF__MDATA_ATTR 15
-
-
-/*! This structure is kept in RDFa and Microdata parsers as a DV_ARRAY_OF_POINTER and freed in case of error, to avoid memleaks.
-It is allocated once and only partially cleaned by callback calls. */
-typedef struct xp_tmp_s
-{
-/* Common part: */
- caddr_t xpt_base; /*!< Readed but not saved xml:base */
- caddr_t xpt_lang; /*!< Readed but not saved xml:lang */
-/* RDFa part: */
- caddr_t xpt_dt; /*!< Readed, not expanded and not saved datatype */
- caddr_t xpt_src; /*!< Readed, not expanded and not saved subj (obj for reverse preds) */
- caddr_t xpt_href; /*!< Readed, not expanded and not saved obj (subj for reverse preds or triple from element w/o "rel" or "rev") */
- caddr_t *xpt_rel_preds; /*!< Readed, not expanded and not saved "rel" predicates */
- caddr_t *xpt_rev_preds; /*!< Readed, not expanded and not saved "rev" predicates */
- caddr_t *xpt_prop_preds; /*!< Readed, not expanded and not saved "property" predicates */
- caddr_t *xpt_typeofs; /*!< Readed, not expanded and not saved "typeof" types */
- caddr_t xpt_obj_res; /*!< Readed, not expanded and not saved object resource OR composed and not saved bnode object */
- caddr_t xpt_obj_content; /*!< Readed but not saved content of literal object */
-/* Microdata part: */
- id_hash_t *xpt_subj2type; /*!< Hashtable that maps subjects to type IRIs. itemscopes with itemtype are added here and removed at end of document (if itemscope has itemrefs) or at closing tag (otherwise) */
- id_hash_t *xpt_id2desc; /*!< Hashtable that maps ids to \c mdata_id_desc_t (i.e., to validation data + accumulators of subjects that itemref-s to that ids) */
- id_hash_t *xpt_dangling_triples; /*!< Hashtable with triples as keys, values are bitmasks about replacing ids to IRIs in the key triple: 1 = no replaces, 2 = replace S, 4 = replace O, 8 = replace both */
-} xp_tmp_t;
-
-#define MDATA_DANGLING_TRIPLE_CVT_BITS(cvt_s,cvt_o) (1 << (((cvt_s) ? 1 : 0) + ((cvt_o) ? 2 : 0)))
-
-
-extern void xp_pop_rdf_locals (xparse_ctx_t *xp);
-extern void xp_pop_rdfa_locals (xparse_ctx_t *xp);
-extern xp_rdfxml_locals_t *xp_push_rdf_locals (xparse_ctx_t *xp);
-
-
/* Part 1. RDF/XML-specific functions */
#define XRL_SET_INHERITABLE(xrl,name,value,errmsg) do { \
@@ -348,12 +176,7 @@ xp_rdfxml_resolved_iid (xparse_ctx_t *xp, const char *avalue, int is_id_attr)
}
else
local = box_dv_short_string (avalue);
-#if 1
- res = rfc1808_expand_uri (xp->xp_rdfxml_locals->xrl_base, local,
- NULL /*output_cs_name*/, 0, NULL /*base_string_cs_name*/, NULL /*rel_string_cs_name*/, &err);
-#else
- res = xml_uri_resolve_like_get (xp->xp_qi, &err, xp->xp_rdfxml_locals->xrl_base, local, NULL /* No need to convert into "UTF-8" because it's UTF-8 already */);
-#endif
+ res = xml_uri_resolve_like_get (xp->xp_qi, &err, xp->xp_rdfxml_locals->xrl_base, local, "UTF-8");
dk_free_box (local);
if (NULL != err)
sqlr_resignal (err);
@@ -410,7 +233,7 @@ xp_rdfxml_triple_l (xparse_ctx_t *xp, caddr_t s, caddr_t p, caddr_t o, caddr_t d
void
xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata)
{
- xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
+ xparse_ctx_t * xp = (xparse_ctx_t*) userdata;
xp_rdfxml_locals_t *outer = xp->xp_rdfxml_locals;
xp_rdfxml_locals_t *inner;
xp_node_t *xn;
@@ -422,12 +245,12 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
#ifdef RECOVER_RDF_VALUE
caddr_t rdf_val = NULL;
#endif
- if (XRL_PARSETYPE_LITERAL & outer->xrl_parsetype)
+ if (XRL_PARSETYPE_LITERAL == outer->xrl_parsetype)
{
xp_element (userdata, name, attrdata);
return;
}
- else if (XRL_PARSETYPE_EMPTYPROP & outer->xrl_parsetype)
+ else if (XRL_PARSETYPE_EMPTYPROP == outer->xrl_parsetype)
xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Sub-element in a predicate element with object node attribute");
inner = xp_push_rdf_locals (xp);
xn = xp->xp_free_list;
@@ -462,17 +285,17 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
{
if (!strcmp ("RDF", tmp_local))
{
- if (!(XRL_PARSETYPE_TOP_LEVEL & outer->xrl_parsetype))
+ if (XRL_PARSETYPE_TOP_LEVEL != outer->xrl_parsetype)
xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 200, "Element rdf:RDF can appear only at top level");
inner->xrl_parsetype = XRL_PARSETYPE_RESOURCE;
}
else if (!strcmp ("Description", tmp_local))
{
- if (XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype)
+ if (XRL_PARSETYPE_PROPLIST == outer->xrl_parsetype)
xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 200, "Element rdf:Description can not appear in list of properties");
inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST;
}
- else if (XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype)
+ else if (XRL_PARSETYPE_PROPLIST == outer->xrl_parsetype)
{
caddr_t full_element_name;
if (!strcmp ("li", tmp_local))
@@ -498,56 +321,26 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
return;
}
#endif
- else
- {
- size_t l1, l2;
- caddr_t full_element_name;
- if (
- !strcmp ("Property", tmp_local) ||
- !strcmp ("Bag", tmp_local) ||
- !strcmp ("Seq", tmp_local) ||
- !strcmp ("Alt", tmp_local) ||
- !strcmp ("List", tmp_local) ||
- !strcmp ("Statement", tmp_local) ||
- !strcmp ("nil", tmp_local) )
- { ; }
- else if (
- !strcmp ("subject", tmp_local) ||
- !strcmp ("predicate", tmp_local) ||
- !strcmp ("object", tmp_local) ||
- !strcmp ("type", tmp_local) ||
- !strcmp ("value", tmp_local) ||
- !strcmp ("first", tmp_local) ||
- !strcmp ("rest", tmp_local) ||
- '_' == tmp_local[0] )
- {
- xmlparser_logprintf (xp->xp_parser, XCFG_WARNING, 200, "Name rdf:%.200s is used for node, not for property (legal, but strange)", tmp_local);
- }
- else if (
- !strcmp ("ID", tmp_local) ||
- !strcmp ("about", tmp_local) ||
- !strcmp ("bagID", tmp_local) ||
- !strcmp ("parseType", tmp_local) ||
- !strcmp ("resource", tmp_local) ||
- !strcmp ("nodeID", tmp_local) ||
- !strcmp ("li", tmp_local) ||
- !strcmp ("aboutEach", tmp_local) ||
- !strcmp ("aboutEachPrefix", tmp_local) )
- {
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 200, "Name rdf:%.200s is used for node", tmp_local);
- }
- else
- {
- xmlparser_logprintf (xp->xp_parser, XCFG_WARNING, 200, "Unknown name rdf:%.200s is used (legal, but strange)", tmp_local);
- }
- l1 = strlen (tmp_nsuri);
- l2 = strlen (tmp_local);
- full_element_name = dk_alloc_box (l1 + l2 + 1, DV_STRING);
+ else if (
+ !strcmp ("Property", tmp_local) ||
+ !strcmp ("Bag", tmp_local) ||
+ !strcmp ("Seq", tmp_local) ||
+ !strcmp ("Alt", tmp_local) ||
+ !strcmp ("List", tmp_local) ||
+ !strcmp ("Statement", tmp_local) )
+ {
+ size_t l1 = strlen (tmp_nsuri), l2 = strlen (tmp_local);
+ caddr_t full_element_name = dk_alloc_box (l1 + l2 + 1, DV_STRING);
memcpy (full_element_name, tmp_nsuri, l1);
strcpy (full_element_name + l1, tmp_local);
subj_type = xp->xp_boxed_name = full_element_name;
inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST;
}
+ else
+ {
+ xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 200, "Unknown element in RDF namespace");
+ return;
+ }
}
else
{
@@ -555,7 +348,7 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
caddr_t full_element_name = dk_alloc_box (l1 + l2 + 1, DV_STRING);
memcpy (full_element_name, tmp_nsuri, l1);
strcpy (full_element_name + l1, tmp_local);
- if (XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype)
+ if (XRL_PARSETYPE_PROPLIST == outer->xrl_parsetype)
{
dk_free_tree (inner->xrl_predicate);
inner->xrl_predicate = full_element_name;
@@ -580,7 +373,7 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
XRL_SET_INHERITABLE (inner, xrl_language, box_dv_short_string (avalue), "Attribute 'xml:lang' is used twice");
else if (!strcmp (tmp_local, "base"))
{
- XRL_SET_INHERITABLE (inner, xrl_base, box_dv_short_string (avalue), "Attribute 'xml:base' is used twice");
+ XRL_SET_INHERITABLE (inner, xrl_base, box_dv_short_string (avalue), "Attribute 'xml:base' is used twice");
TF_CHANGE_BASE_AND_DEFAULT_GRAPH(xp->xp_tf,box_dv_short_string (avalue));
}
else if (0 != strcmp (tmp_local, "space"))
@@ -598,7 +391,7 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
if (!strcmp (tmp_local, "about"))
{
caddr_t inner_subj;
- if (XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype)
+ if (XRL_PARSETYPE_PROPLIST == outer->xrl_parsetype)
{
xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Attribute 'rdf:about' can not appear in element that is supposed to be property name");
return;
@@ -610,7 +403,7 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
else if (!strcmp (tmp_local, "resource"))
{
caddr_t inner_subj;
- if (!(XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype))
+ if (XRL_PARSETYPE_PROPLIST != outer->xrl_parsetype)
{
xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Attribute 'rdf:resource' can appear only in element that is supposed to be property name");
return;
@@ -623,7 +416,7 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
{
caddr_t inner_subj = xp_rdfxml_bnode_iid (xp, box_dv_short_string (avalue));
XRL_SET_NONINHERITABLE (inner, xrl_subject, inner_subj, "Attribute 'rdf:nodeID' conflicts with other attribute that set the subject");
- if (XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype)
+ if (XRL_PARSETYPE_PROPLIST == outer->xrl_parsetype)
{
inner->xrl_parsetype = XRL_PARSETYPE_EMPTYPROP;
}
@@ -634,7 +427,7 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
}
else if (!strcmp (tmp_local, "ID"))
{
- if (XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype)
+ if (XRL_PARSETYPE_PROPLIST == outer->xrl_parsetype)
{
caddr_t reif_subj = xp_rdfxml_resolved_iid (xp, avalue, 1);
XRL_SET_NONINHERITABLE (inner, xrl_reification_id, reif_subj, "Reification ID of the statement is set twice by 'rdf:ID' attribute of a property element");
@@ -648,17 +441,17 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
}
else if (!strcmp (tmp_local, "datatype"))
{
- if (!(XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype))
+ if (XRL_PARSETYPE_PROPLIST != outer->xrl_parsetype)
{
xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Attribute 'rdf:datatype' can appear only in property elements");
return;
}
- XRL_SET_NONINHERITABLE (inner, xrl_datatype, xp_rdfxml_resolved_iid (xp, avalue, 0), "Attribute 'rdf:datatype' is used twice");
+ XRL_SET_NONINHERITABLE (inner, xrl_datatype, xp_rdfxml_resolved_iid (xp, avalue, 0), "Attribute 'rdf:datatype' us used twice");
inner->xrl_parsetype = XRL_PARSETYPE_LITERAL;
}
else if (!strcmp (tmp_local, "parseType"))
{
- if (!(XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype))
+ if (XRL_PARSETYPE_PROPLIST != outer->xrl_parsetype)
{
xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Attribute 'rdf:parseType' can appear only in property elements");
return;
@@ -667,15 +460,15 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
{
caddr_t inner_subj = xp_rdfxml_bnode_iid (xp, NULL);
XRL_SET_NONINHERITABLE (inner, xrl_subject, inner_subj, "Attribute parseType='Resource' can not be used if object is set by other attribute");
- inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST | XRL_PARSETYPE_SET_EXPLICITLY;
+ inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST;
}
else if (!strcmp (avalue, "Literal"))
{
- inner->xrl_parsetype = XRL_PARSETYPE_LITERAL | XRL_PARSETYPE_SET_EXPLICITLY;
+ inner->xrl_parsetype = XRL_PARSETYPE_LITERAL;
}
else if (!strcmp (avalue, "Collection"))
{
- inner->xrl_parsetype = XRL_PARSETYPE_COLLECTION | XRL_PARSETYPE_SET_EXPLICITLY;
+ inner->xrl_parsetype = XRL_PARSETYPE_COLLECTION;
return;
}
else
@@ -684,21 +477,21 @@ xp_rdfxml_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata
return;
}
}
- else if (!strcmp (tmp_local, "type"))
- {
+ else if (!strcmp (tmp_local, "type"))
+ {
dk_set_push (&inner_attr_props, avalue);
dk_set_push (&inner_attr_props, ((caddr_t)((ptrlong)'T')));
inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST;
continue;
- }
- else if (!strcmp (tmp_local, "value"))
- {
+ }
+ else if (!strcmp (tmp_local, "value"))
+ {
#ifdef RECOVER_RDF_VALUE
- rdf_val = avalue;
+ rdf_val = avalue;
#else
goto push_inner_attr_prop; /* see below */
#endif
- }
+ }
else
{
xmlparser_logprintf (xp->xp_parser, XCFG_WARNING, 200,
@@ -729,27 +522,30 @@ push_inner_attr_prop:
}
if ((NULL != inner->xrl_subject) || (NULL != inner_attr_props))
{
- if (XRL_PARSETYPE_LITERAL & inner->xrl_parsetype)
+ if (XRL_PARSETYPE_LITERAL == inner->xrl_parsetype)
{
xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 200,
"Conflicting attributes: property value can not be a node and a literal simultaneously" );
return;
}
}
+/* if ((XRL_PARSETYPE_PROPLIST == outer->xrl_parsetype) && (NULL != outer->xrl_subject))
+ XRL_SET_NONINHERITABLE (inner, xrl_subject, box_copy_tree (outer->xrl_subject));
+*/
if (NULL == inner->xrl_subject)
{
if ((NULL != inner_attr_props) || (NULL != subj_type) ||
#ifdef RECOVER_RDF_VALUE
(NULL != rdf_val) ||
#endif
- (XRL_PARSETYPE_PROPLIST & inner->xrl_parsetype) )
+ (XRL_PARSETYPE_PROPLIST == inner->xrl_parsetype) )
{
caddr_t inner_subj = xp_rdfxml_bnode_iid (xp, NULL);
XRL_SET_NONINHERITABLE (inner, xrl_subject, inner_subj, "Blank node object can not be defined here");
inner->xrl_parsetype = XRL_PARSETYPE_PROPLIST;
}
}
- if ((XRL_PARSETYPE_PROPLIST & inner->xrl_parsetype) && (NULL != outer->xrl_predicate))
+ if ((XRL_PARSETYPE_PROPLIST == inner->xrl_parsetype) && (NULL != outer->xrl_predicate))
XRL_SET_NONINHERITABLE (outer, xrl_subject, box_copy_tree (inner->xrl_subject), "A property can not have two object values");
if (NULL != subj_type)
xp_rdfxml_triple (xp, inner->xrl_subject, uname_rdf_ns_uri_type, subj_type);
@@ -784,11 +580,11 @@ push_inner_attr_prop:
xp->xp_boxed_name = aname = dk_alloc_box (l1 + l2 + 1, DV_STRING);
memcpy (aname, tmp_nsuri, l1);
strcpy (aname + l1, tmp_local);
- xp_rdfxml_triple_l (xp, inner->xrl_subject, aname, avalue, NULL, inner->xrl_language);
+ xp_rdfxml_triple_l (xp, inner->xrl_subject, aname, avalue, NULL, NULL);
dk_free_box (aname);
xp->xp_boxed_name = NULL;
}
- if ((XRL_PARSETYPE_PROPLIST & inner->xrl_parsetype) && (XRL_PARSETYPE_PROPLIST & outer->xrl_parsetype))
+ if ((XRL_PARSETYPE_PROPLIST == inner->xrl_parsetype) && (XRL_PARSETYPE_PROPLIST == outer->xrl_parsetype))
{ /* This means parseType="Resource". It should be handled immediately to prevent error in case of parseType="Resource" nested inside inner. */
xp_rdfxml_triple (xp, outer->xrl_subject, inner->xrl_predicate, inner->xrl_subject);
if (NULL != inner->xrl_reification_id)
@@ -809,12 +605,12 @@ xp_rdfxml_element_end (void *userdata, const char * name)
{
xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
xp_rdfxml_locals_t *inner = xp->xp_rdfxml_locals;
- if (!(XRL_PARSETYPE_LITERAL & inner->xrl_parsetype))
+ if (XRL_PARSETYPE_LITERAL != inner->xrl_parsetype)
{
xp_node_t *current_node = xp->xp_current;
xp_node_t *parent_node = xp->xp_current->xn_parent;
xp_rdfxml_locals_t *outer = inner->xrl_parent;
- if ((NULL != outer) && (XRL_PARSETYPE_COLLECTION & outer->xrl_parsetype))
+ if ((NULL != outer) && (XRL_PARSETYPE_COLLECTION == outer->xrl_parsetype))
{
xp_rdfxml_locals_t *outer = inner->xrl_parent;
caddr_t subj;
@@ -827,7 +623,7 @@ xp_rdfxml_element_end (void *userdata, const char * name)
}
dk_set_push (&(outer->xrl_seq_items), subj);
}
- else if (XRL_PARSETYPE_COLLECTION & inner->xrl_parsetype)
+ else if (XRL_PARSETYPE_COLLECTION == inner->xrl_parsetype)
{
caddr_t tail = uname_rdf_ns_uri_nil;
while (NULL != inner->xrl_seq_items)
@@ -844,31 +640,15 @@ xp_rdfxml_element_end (void *userdata, const char * name)
else if (NULL != inner->xrl_predicate)
{
xp_rdfxml_locals_t *outer = inner->xrl_parent;
- if ((NULL == inner->xrl_subject) && (XRL_PARSETYPE_RES_OR_LIT & inner->xrl_parsetype))
- {
- caddr_t obj = box_dv_short_string ("");
- xp_rdfxml_triple_l (xp, inner->xrl_parent->xrl_subject, inner->xrl_predicate, obj, inner->xrl_datatype, inner->xrl_language);
- if (NULL != inner->xrl_reification_id)
- {
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_subject, outer->xrl_subject);
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_predicate, inner->xrl_predicate);
- xp_rdfxml_triple_l (xp, inner->xrl_reification_id, uname_rdf_ns_uri_object, obj, inner->xrl_datatype, inner->xrl_language);
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_type, uname_rdf_ns_uri_Statement);
- }
- dk_free_tree (obj);
- }
- else
+ if (NULL == inner->xrl_subject)
+ inner->xrl_subject = xp_rdfxml_bnode_iid (xp, NULL);
+ xp_rdfxml_triple (xp, outer->xrl_subject, inner->xrl_predicate, inner->xrl_subject);
+ if (NULL != inner->xrl_reification_id)
{
- if (NULL == inner->xrl_subject)
- inner->xrl_subject = xp_rdfxml_bnode_iid (xp, NULL);
- xp_rdfxml_triple (xp, outer->xrl_subject, inner->xrl_predicate, inner->xrl_subject);
- if (NULL != inner->xrl_reification_id)
- {
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_subject, outer->xrl_subject);
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_predicate, inner->xrl_predicate);
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_object, inner->xrl_subject);
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_type, uname_rdf_ns_uri_Statement);
- }
+ xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_subject, outer->xrl_subject);
+ xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_predicate, inner->xrl_predicate);
+ xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_object, inner->xrl_subject);
+ xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_type, uname_rdf_ns_uri_Statement);
}
}
if (0 != strses_length (xp->xp_strses))
@@ -886,15 +666,12 @@ xp_rdfxml_element_end (void *userdata, const char * name)
{
xp_node_t * current_node = xp->xp_current;
xp_node_t * parent_node = xp->xp_current->xn_parent;
- xp_rdfxml_locals_t *outer = inner->xrl_parent;
- caddr_t lang_in_effect;
caddr_t obj;
xml_tree_ent_t *literal_xte;
- if ((NULL == xp->xp_current->xn_children) && !(XRL_PARSETYPE_SET_EXPLICITLY & inner->xrl_parsetype))
+ if (NULL == xp->xp_current->xn_children)
{
obj = strses_string (xp->xp_strses);
strses_flush (xp->xp_strses);
- lang_in_effect = inner->xrl_language;
}
else
{
@@ -908,20 +685,12 @@ xp_rdfxml_element_end (void *userdata, const char * name)
literal_tree = list_to_array (children);
literal_xte = xte_from_tree (literal_tree, xp->xp_qi);
obj = (caddr_t) literal_xte;
- lang_in_effect = NULL;
}
dk_free_tree (current_node->xn_attrs);
xp->xp_current = parent_node;
current_node->xn_parent = xp->xp_free_list;
xp->xp_free_list = current_node;
- xp_rdfxml_triple_l (xp, outer->xrl_subject, inner->xrl_predicate, obj, inner->xrl_datatype, lang_in_effect);
- if (NULL != inner->xrl_reification_id)
- {
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_subject, outer->xrl_subject);
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_predicate, inner->xrl_predicate);
- xp_rdfxml_triple_l (xp, inner->xrl_reification_id, uname_rdf_ns_uri_object, obj, inner->xrl_datatype, lang_in_effect);
- xp_rdfxml_triple (xp, inner->xrl_reification_id, uname_rdf_ns_uri_type, uname_rdf_ns_uri_Statement);
- }
+ xp_rdfxml_triple_l (xp, inner->xrl_parent->xrl_subject, inner->xrl_predicate, obj, inner->xrl_datatype, inner->xrl_language);
dk_free_tree (obj);
xp_pop_rdf_locals (xp);
return;
@@ -933,8 +702,8 @@ xp_rdfxml_element_end (void *userdata, const char * name)
void
xp_rdfxml_id (void *userdata, char * name)
{
- xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
- if (XRL_PARSETYPE_LITERAL & xp->xp_rdfxml_locals->xrl_parsetype)
+ xparse_ctx_t * xp = (xparse_ctx_t*) userdata;
+ if (XRL_PARSETYPE_LITERAL == xp->xp_rdfxml_locals->xrl_parsetype)
xp_id (userdata, name);
}
@@ -943,7 +712,7 @@ void
xp_rdfxml_character (vxml_parser_t * parser, char * s, int len)
{
xparse_ctx_t *xp = (xparse_ctx_t *) parser;
- switch (xp->xp_rdfxml_locals->xrl_parsetype & (XRL_PARSETYPE_LITERAL | XRL_PARSETYPE_RES_OR_LIT))
+ switch (xp->xp_rdfxml_locals->xrl_parsetype)
{
case XRL_PARSETYPE_LITERAL:
session_buffered_write (xp->xp_strses, s, len);
@@ -978,7 +747,7 @@ void
xp_rdfxml_entity (vxml_parser_t * parser, const char * refname, int reflen, int isparam, const xml_def_4_entity_t *edef)
{
xparse_ctx_t *xp = (xparse_ctx_t *) parser;
- switch (xp->xp_rdfxml_locals->xrl_parsetype & (XRL_PARSETYPE_LITERAL | XRL_PARSETYPE_RES_OR_LIT))
+ switch (xp->xp_rdfxml_locals->xrl_parsetype)
{
case XRL_PARSETYPE_LITERAL:
xp_entity (parser, refname, reflen, isparam, edef);
@@ -997,7 +766,7 @@ void
xp_rdfxml_pi (vxml_parser_t * parser, const char *target, const char *data)
{
xparse_ctx_t *xp = (xparse_ctx_t *) parser;
- switch (xp->xp_rdfxml_locals->xrl_parsetype & (XRL_PARSETYPE_LITERAL | XRL_PARSETYPE_TOP_LEVEL | XRL_PARSETYPE_RES_OR_LIT))
+ switch (xp->xp_rdfxml_locals->xrl_parsetype)
{
case XRL_PARSETYPE_LITERAL:
xp_pi (parser, target, data);
@@ -1009,7 +778,7 @@ xp_rdfxml_pi (vxml_parser_t * parser, const char *target, const char *data)
xp_pi (parser, target, data);
break;
default:
- xmlparser_logprintf (xp->xp_parser, XCFG_WARNING, 100, "Processing instruction found instead of XML element");
+ xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Processing instruction found instead of XML element");
break;
}
}
@@ -1110,7 +879,7 @@ xp_rdfa_expand_name (xp_node_t * xn, const char *name, const char *colon, int us
}
dk_free_box (ns_uri);
}
- return NULL; /* error: undefined namespace prefix */
+ return NULL; /* error: undefined namespace prefix */
}
relative = box_dv_short_string (name);
@@ -1342,7 +1111,7 @@ next_token:
if (!lpar_found && strchr (tail, '('))
lpar_found = 1; /* 012345678901 */
if (!lpar_found && strncmp ("javascript:", attrvalue, 11))
- break;
+ break;
}
tail++;
}
@@ -1426,22 +1195,22 @@ next_token:
else
{
#ifndef NDEBUG
- token_end[0] = '\0';
- if (('_' == token_start[0]) && (curie_colon == token_start + 1))
- expanded_token = tf_bnode_iid (xp->xp_tf, box_dv_short_nchars (token_start+2, token_end-(token_start+2)));
- else if (curie_colon == token_start)
- { /* Note that the default prefix mapping may differ from usage to usage, it is xhtml vocab namespace only for RDFa */
- expanded_token = box_dv_short_strconcat (uname_xhv_ns_uri, curie_colon+1);
- }
- else
- expanded_token = xp_rdfa_expand_name (xn, token_start, curie_colon, 1/*, base*/);
- token_end[0] = saved_token_delim;
+ token_end[0] = '\0';
+ if (('_' == token_start[0]) && (curie_colon == token_start + 1))
+ expanded_token = tf_bnode_iid (xp->xp_tf, box_dv_short_nchars (token_start+2, token_end-(token_start+2)));
+ else if (curie_colon == token_start)
+ { /* Note that the default prefix mapping may differ from usage to usage, it is xhtml vocab namespace only for RDFa */
+ expanded_token = box_dv_short_strconcat (uname_xhv_ns_uri, curie_colon+1);
+ }
+ else
+ expanded_token = xp_rdfa_expand_name (xn, token_start, curie_colon, 1/*, base*/);
+ token_end[0] = saved_token_delim;
#endif
- xmlparser_logprintf (xp->xp_parser, XCFG_ERROR, 100,
- "Bad token in the value of attribute \"%.20s\" (undeclared namespace?)",
+ xmlparser_logprintf (xp->xp_parser, XCFG_ERROR, 100,
+ "Bad token in the value of attribute \"%.20s\" (undeclared namespace?)",
rdfa_attribute_names[attr_id] );
- }
- }
+ }
+ }
}
else if (RDFA_ATTRSYNTAX_TERM & allowed_syntax)
{
@@ -1465,7 +1234,7 @@ next_token:
{
if ((RDFA_ATTRSYNTAX_REL_REV_RESERVED & allowed_syntax) ||
((NULL != xp->xp_rdfa_locals) && (RDFA_IN_HTML & xp->xp_rdfa_locals->xrdfal_place_bits)) )
- expanded_token = rdfa_rel_rev_value_is_reserved (token_start);
+ expanded_token = rdfa_rel_rev_value_is_reserved (token_start);
}
if (NULL == expanded_token)
{
@@ -1476,11 +1245,11 @@ next_token:
if (NULL == expanded_token)
{
#if 1
- goto next_token; /* see above */
+ goto next_token; /* see above */
#else
- expanded_token = box_dv_short_nchars (token_start, token_end-token_start);
+ expanded_token = box_dv_short_nchars (token_start, token_end-token_start);
#endif
- }
+ }
}
else if ((RDFA_ATTRSYNTAX_SAFECURIE & token_syntax) && (token_end == token_start))
{
@@ -1812,7 +1581,7 @@ rdfa_feed_or_make_ict (xparse_ctx_t *xp, xp_rdfa_locals_t *xrdfal, caddr_t left,
void
xp_rdfa_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata)
{
- xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
+ xparse_ctx_t * xp = (xparse_ctx_t*) userdata;
xp_rdfa_locals_t *outer = xp->xp_rdfa_locals;
xp_rdfa_locals_t *inner = NULL; /* This is not allocated at all if there's nothing "interesting" in the tag */
xp_tmp_t *xpt = xp->xp_tmp;
@@ -2016,16 +1785,16 @@ xp_rdfa_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata)
}
}
if (NULL != avalues[RDFA_ATTR_ABOUT])
- {
- if (1 <= src_prio)
{
- dk_free_tree (xpt->xpt_src);
- xpt->xpt_src = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
+ if (1 <= src_prio)
+ {
+ dk_free_tree (xpt->xpt_src);
+ xpt->xpt_src = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
xpt->xpt_src = xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_ABOUT, avalues,
RDFA_ATTRSYNTAX_SAFECURIE | RDFA_ATTRSYNTAX_CURIE | RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE,
- NULL, NULL );
- src_prio = 1;
- }
+ NULL, NULL );
+ src_prio = 1;
+ }
}
if (NULL != avalues[RDFA_ATTR_CONTENT])
{
@@ -2035,80 +1804,80 @@ xp_rdfa_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata)
{
xpt->xpt_dt = xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_DATATYPE, avalues,
RDFA_ATTRSYNTAX_TERM | RDFA_ATTRSYNTAX_CURIE | RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE,
- NULL, NULL );
+ NULL, NULL );
}
if (NULL != avalues[RDFA_ATTR_HREF])
{
- if (RDFA_IN_BASE & inner_place_bits)
- {
- dk_free_tree (xpt->xpt_href);
- xpt->xpt_href = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
+ if (RDFA_IN_BASE & inner_place_bits)
+ {
+ dk_free_tree (xpt->xpt_href);
+ xpt->xpt_href = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
xpt->xpt_href = xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_HREF, avalues,
- RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE | RDFA_ATTRSYNTAX_DIRTY_HREF,
- NULL, NULL );
- xp_rdfa_set_base (xp, outer, xpt->xpt_href);
- xpt->xpt_href = NULL;
- inner_place_bits |= RDFA_IN_UNUSED;
- }
- else if (4 <= href_prio)
- {
- dk_free_tree (xpt->xpt_href);
- xpt->xpt_href = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
+ RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE | RDFA_ATTRSYNTAX_DIRTY_HREF,
+ NULL, NULL );
+ xp_rdfa_set_base (xp, outer, xpt->xpt_href);
+ xpt->xpt_href = NULL;
+ inner_place_bits |= RDFA_IN_UNUSED;
+ }
+ else if (4 <= href_prio)
+ {
+ dk_free_tree (xpt->xpt_href);
+ xpt->xpt_href = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
xpt->xpt_href = xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_HREF, avalues,
- RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE | RDFA_ATTRSYNTAX_DIRTY_HREF,
- NULL, NULL );
- href_prio = 4;
- }
+ RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE | RDFA_ATTRSYNTAX_DIRTY_HREF,
+ NULL, NULL );
+ href_prio = 4;
+ }
}
if (NULL != avalues[RDFA_ATTR_PROPERTY])
{
xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_PROPERTY, avalues,
RDFA_ATTRSYNTAX_TERM | RDFA_ATTRSYNTAX_CURIE | RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_WS_LIST,
- &(xpt->xpt_prop_preds), &prop_pred_count );
+ &(xpt->xpt_prop_preds), &prop_pred_count );
}
if (NULL != avalues[RDFA_ATTR_REL])
{
xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_REL, avalues,
RDFA_ATTRSYNTAX_TERM | RDFA_ATTRSYNTAX_CURIE | RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_REL_REV_RESERVED | RDFA_ATTRSYNTAX_WS_LIST,
- &(xpt->xpt_rel_preds), &rel_pred_count );
- rel_rev_attrcount++;
+ &(xpt->xpt_rel_preds), &rel_pred_count );
+ rel_rev_attrcount++;
}
if (NULL != avalues[RDFA_ATTR_RESOURCE])
{
- if (3 <= href_prio)
- {
- dk_free_tree (xpt->xpt_href);
- xpt->xpt_href = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
+ if (3 <= href_prio)
+ {
+ dk_free_tree (xpt->xpt_href);
+ xpt->xpt_href = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
xpt->xpt_href = xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_RESOURCE, avalues,
RDFA_ATTRSYNTAX_SAFECURIE | RDFA_ATTRSYNTAX_CURIE | RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE,
- NULL, NULL );
- href_prio = 3;
- }
+ NULL, NULL );
+ href_prio = 3;
+ }
}
if (NULL != avalues[RDFA_ATTR_REV])
{
xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_REV, avalues,
RDFA_ATTRSYNTAX_TERM | RDFA_ATTRSYNTAX_CURIE | RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_REL_REV_RESERVED | RDFA_ATTRSYNTAX_WS_LIST,
- &(xpt->xpt_rev_preds), &rev_pred_count );
- rel_rev_attrcount++;
+ &(xpt->xpt_rev_preds), &rev_pred_count );
+ rel_rev_attrcount++;
}
if (NULL != avalues[RDFA_ATTR_SRC])
{
- if (2 <= src_prio)
- {
- dk_free_tree (xpt->xpt_src);
- xpt->xpt_src = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
+ if (2 <= src_prio)
+ {
+ dk_free_tree (xpt->xpt_src);
+ xpt->xpt_src = NULL; /* to avoid second delete of freed value in case of error inside xp_rdfa_parse_attr_value() */
xpt->xpt_src = xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_SRC, avalues,
- RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE,
- NULL, NULL );
- src_prio = 2;
- }
+ RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_EMPTY_ACCEPTABLE,
+ NULL, NULL );
+ src_prio = 2;
+ }
}
if (NULL != avalues[RDFA_ATTR_TYPEOF])
{
xp_rdfa_parse_attr_value (xp, xn, RDFA_ATTR_TYPEOF, avalues,
RDFA_ATTRSYNTAX_TERM | RDFA_ATTRSYNTAX_CURIE | RDFA_ATTRSYNTAX_URI | RDFA_ATTRSYNTAX_WS_LIST,
- &(xpt->xpt_typeofs), &typeof_count );
+ &(xpt->xpt_typeofs), &typeof_count );
}
if (NULL != avalues[RDFA_ATTR_XML_BASE])
{
@@ -2121,8 +1890,8 @@ xp_rdfa_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata)
}
if (NULL != avalues[RDFA_ATTR_XML_LANG])
{
- if (NULL != xpt->xpt_lang)
- dk_free_tree (xpt->xpt_lang);
+ if (NULL != xpt->xpt_lang)
+ dk_free_tree (xpt->xpt_lang);
xpt->xpt_lang = box_dv_short_string (avalues[RDFA_ATTR_XML_LANG]);
}
@@ -2190,7 +1959,7 @@ all_attributes_are_retrieved:
xp->xp_current = xn;
}
if (!inner_is_allocated)
- inner = xp_push_rdfa_locals (xp);
+ inner = xp_push_rdfa_locals (xp);
#ifdef DEBUG
if (NULL != xp->xp_boxed_name)
GPF_T1("Memory leak in xp->xp_boxed_name");
@@ -2370,7 +2139,7 @@ xp_rdfa_element_end (void *userdata, const char * name)
literal_head = (caddr_t *)list (1, uname__root);
children = CONS (literal_head, children);
literal_tree = list_to_array (children);
- current_node->xn_children = NULL;
+ current_node->xn_children = NULL;
if (obj_use_count)
{
xml_tree_ent_t *literal_xte;
@@ -2474,7 +2243,7 @@ xp_rdfa_element_end (void *userdata, const char * name)
void
xp_rdfa_id (void *userdata, char * name)
{
- xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
+ xparse_ctx_t * xp = (xparse_ctx_t*) userdata;
xp_rdfa_locals_t *inner = xp->xp_rdfa_locals;
if (RDFA_IN_XMLLITERAL & inner->xrdfal_place_bits)
xp_id (userdata, name);
@@ -2520,959 +2289,9 @@ xp_rdfa_comment (void *userdata, const char *text)
xp_comment (userdata, text);
}
-/* Part 3. Microdata parser */
-
-const char *mdata_attribute_lognames[COUNTOF__MDATA_ATTR] = {
- "meta content", /* MDATA_ATTR_OBJ_CONTENT_STRLIT 0 */
- "datetime", /* MDATA_ATTR_OBJ_DATETIME 1 */
- "literal content", /* MDATA_ATTR_OBJ_STRLIT 2 */
- "cite", /* MDATA_ATTR_OBJ_CITE 3 */
- "href/src/data", /* MDATA_ATTR_OBJ_REF 4 */
- "name", /* MDATA_ATTR_OBJ_NAME 5 */
- "id", /* MDATA_ATTR_ID 6 */
- "itemid", /* MDATA_ATTR_ITEMID 7 */
- "itemprop", /* MDATA_ATTR_ITEMPROP 8 */
- "itemref", /* MDATA_ATTR_ITEMREF 9 */
- "itemscope", /* MDATA_ATTR_ITEMSCOPE 10 */
- "itemtype", /* MDATA_ATTR_ITEMTYPE 11 */
- "rel", /* MDATA_ATTR_REL 12 */
- "xml:base", /* MDATA_ATTR_XML_BASE 13 */
- "xml:lang" }; /* MDATA_ATTR_XML_LANG 14 */
-
-int
-mdata_find_attr_idx (const char *attrname, const char *elname)
-{
- if (!strcmp (attrname, "href"))
- {
- if (!strcmp (elname, "a") || !strcmp (elname, "link") || !strcmp (elname, "area"))
- return MDATA_ATTR_OBJ_REF;
- return -1;
- }
- if (!strcmp (attrname, "src"))
- {
- if (!strcmp (elname, "img") || !strcmp (elname, "iframe") || !strcmp (elname, "audio")
- || !strcmp (elname, "embed") || !strcmp (elname, "source") || !strcmp (elname, "track") || !strcmp (elname, "video"))
- return MDATA_ATTR_OBJ_REF;
- return -1;
- }
- if (!strcmp (attrname, "data"))
- {
- if (!strcmp (elname, "object"))
- return MDATA_ATTR_OBJ_REF;
- return -1;
- }
- if (!strcmp (attrname, "content"))
- {
- if (!strcmp (elname, "meta"))
- return MDATA_ATTR_OBJ_CONTENT_STRLIT;
- return -2;
- }
- if (!strcmp (attrname, "cite"))
- {
- if (!strcmp (elname, "blockquote") || !strcmp (elname, "q"))
- return MDATA_ATTR_OBJ_CITE_REF;
- return -2;
- }
- if (!strcmp (attrname, "name"))
- {
- if (!strcmp (elname, "meta"))
- return MDATA_ATTR_OBJ_NAME;
- return -2;
- }
- if (!strcmp (attrname, "id"))
- return MDATA_ATTR_ID;
- if (!strcmp (attrname, "rel"))
- {
- if (!strcmp (elname, "a") || !strcmp (elname, "link") || !strcmp (elname, "area"))
- return MDATA_ATTR_REL;
- return -1;
- }
- if (!strncmp (attrname, "xml:", 4))
- {
- if (!strcmp (attrname, "xml:base"))
- return MDATA_ATTR_XML_BASE;
- if (!strcmp (attrname, "xml:lang"))
- return MDATA_ATTR_XML_LANG;
- return -3;
- }
- if (!strncmp (attrname, "item", 4))
- {
- if (!strcmp (attrname, "itemid"))
- return MDATA_ATTR_ITEMID;
- if (!strcmp (attrname, "itemprop"))
- return MDATA_ATTR_ITEMPROP;
- if (!strcmp (attrname, "itemref"))
- return MDATA_ATTR_ITEMREF;
- if (!strcmp (attrname, "itemscope"))
- return MDATA_ATTR_ITEMSCOPE;
- if (!strcmp (attrname, "itemtype"))
- return MDATA_ATTR_ITEMTYPE;
- return -4;
- }
- if (!strcmp (attrname, "datetime"))
- {
- if (!strcmp (elname, "time"))
- return MDATA_ATTR_OBJ_DATETIME;
- return -5;
- }
- return -6;
-}
-
-
-#define MDATA_ATTRSYNTAX_URI 0x01
-#define MDATA_ATTRSYNTAX_REL 0x02
-#define MDATA_ATTRSYNTAX_ID 0x04
-#define MDATA_ATTRSYNTAX_WS_LIST 0x08
-#define MDATA_ATTRSYNTAX_OPTIONAL 0x10
-#define MDATA_ATTRSYNTAX_SILENT 0x20
-
-caddr_t
-xp_mdata_parse_attr_value (xparse_ctx_t *xp, xp_node_t * xn, int attr_id, char **attrvalues, int allowed_syntax, caddr_t **values_ret, int *values_count_ret)
-{
- char *attrvalue = attrvalues[attr_id];
- char *tail = attrvalue;
- char *token_start, *token_end;
- int token_syntax;
- caddr_t expanded_token = NULL;
- int values_count, expanded_token_not_saved = 0;
-#define free_unsaved_token() do { \
- if (expanded_token_not_saved) { \
- dk_free_box (expanded_token); \
- expanded_token = NULL; \
- expanded_token_not_saved = 0; } \
- } while (0)
-#ifdef RDFXML_DEBUG
- if (((NULL != values_ret) ? 1 : 0) != ((NULL != values_count_ret) ? 1 : 0))
- GPF_T1 ("xp_" "mdata_parse_attr_value(): bad call (1)");
- if (((NULL != values_ret) ? 1 : 0) != ((MDATA_ATTRSYNTAX_WS_LIST & allowed_syntax) ? 1 : 0))
- GPF_T1 ("xp_" "mdata_parse_attr_value(): bad call (2)");
-#endif
- if (NULL != values_ret)
- {
- if (NULL == values_ret[0])
- values_ret[0] = dk_alloc_list_zero (1);
- values_count = values_count_ret[0];
- }
- else
- values_count = 0;
- if (NULL == attrvalue)
- {
- if (!(MDATA_ATTRSYNTAX_OPTIONAL & allowed_syntax))
- {
- free_unsaved_token();
- if (MDATA_ATTRSYNTAX_SILENT & allowed_syntax)
- return NULL;
- xmlparser_logprintf (xp->xp_parser, XCFG_ERROR, 100, "Missing attribute %.20s", mdata_attribute_lognames[attr_id]);
- }
- return NULL;
- }
-
-next_token:
- if ((MDATA_ATTRSYNTAX_WS_LIST | MDATA_ATTRSYNTAX_ID) & allowed_syntax)
- while (('\0' != tail[0]) && isspace (tail[0])) tail++;
- else if (isspace (tail[0]))
- {
- free_unsaved_token();
- if (MDATA_ATTRSYNTAX_SILENT & allowed_syntax)
- return NULL;
- xmlparser_logprintf (xp->xp_parser, XCFG_ERROR, 100, "Whitespaces are not allowed for attribute %.20s", mdata_attribute_lognames[attr_id]);
- return NULL;
- }
- if ('\0' == tail[0])
- {
- if (0 == values_count)
- {
- if (MDATA_ATTRSYNTAX_WS_LIST & allowed_syntax)
- return NULL;
- if (MDATA_ATTRSYNTAX_SILENT & allowed_syntax)
- return NULL;
- xmlparser_logprintf (xp->xp_parser, XCFG_ERROR, 100, "Empty value is not allowed for attribute %.20s", mdata_attribute_lognames[attr_id]);
- }
- if (NULL != values_count_ret)
- values_count_ret[0] = values_count;
- return expanded_token;
- }
- if ((1 == values_count) && !(MDATA_ATTRSYNTAX_WS_LIST & allowed_syntax))
- {
- free_unsaved_token();
- if (MDATA_ATTRSYNTAX_SILENT & allowed_syntax)
- return NULL;
- xmlparser_logprintf (xp->xp_parser, XCFG_ERROR, 100, "Multiple values are not allowed for attribute %.20s", mdata_attribute_lognames[attr_id]);
- if (NULL != values_count_ret)
- values_count_ret[0] = values_count;
- return NULL;
- }
- token_syntax = allowed_syntax & (MDATA_ATTRSYNTAX_URI | MDATA_ATTRSYNTAX_ID);
- token_start = tail;
- while (('\0' != tail[0]) && !isspace(tail[0]))
- tail++;
- token_end = tail;
- if (NULL != values_ret)
- {
- if (values_count == BOX_ELEMENTS (values_ret[0]))
- {
- caddr_t *new_buf = dk_alloc_list_zero (values_count * 2);
- memcpy (new_buf, values_ret[0], box_length (values_ret[0]));
- dk_free_box ((caddr_t)(values_ret[0]));
- values_ret[0] = (caddr_t *)new_buf;
- }
- else if (NULL != values_ret[0][values_count]) /* There's some old garbage to delete */
- {
-#ifdef RDFXML_DEBUG
- GPF_T1 ("xp_" "mdata_parse_attr_value(): garbage?");
-#endif
- dk_free_tree (values_ret[0][values_count]);
- values_ret[0][values_count] = NULL;
- }
- }
- expanded_token = box_dv_short_nchars (token_start, token_end-token_start);
- if (MDATA_ATTRSYNTAX_REL & token_syntax)
- {
- if (NULL != values_ret)
- {
- const char *alt_ssheet_compl_name = NULL;
- if (!strcasecmp (expanded_token, "alternate"))
- alt_ssheet_compl_name = "http://www.w3.org/1999/xhtml/vocab#stylesheet";
- else if (!strcasecmp (expanded_token, "stylesheet"))
- alt_ssheet_compl_name = "http://www.w3.org/1999/xhtml/vocab#alternate";
- if (NULL != alt_ssheet_compl_name)
- {
- int prev_ctr = values_count;
- while (0 < prev_ctr--)
- {
- if (strcmp (values_ret[0][prev_ctr], alt_ssheet_compl_name))
- continue;
- dk_free_box (values_ret[0][prev_ctr]);
- dk_free_box (expanded_token);
- values_ret[0][prev_ctr] = box_dv_short_string ("http://www.w3.org/1999/xhtml/vocab#ALTERNATE-STYLESHEET");
- goto token_done; /* see below */
- }
- }
- }
- if (NULL == strchr (expanded_token, ':'))
- {
- caddr_t vocab_token;
- char *ttail;
- for (ttail = expanded_token; ('\0' != ttail[0]) && !(ttail[0] & ~0x7f); ttail++) ttail[0] = tolower (ttail[0]);
- vocab_token = box_dv_short_strconcat ("http://www.w3.org/1999/xhtml/vocab#", expanded_token);
- dk_free_box (expanded_token);
- expanded_token = vocab_token;
- goto token_done; /* see below */
- }
- }
- if (MDATA_ATTRSYNTAX_URI & token_syntax)
- {
- caddr_t base = xn->xn_xp->xp_mdata_locals->xmdatal_base;
- xp_expand_relative_uri (base, &expanded_token);
- if (NULL == expanded_token)
- {
- if (MDATA_ATTRSYNTAX_SILENT & allowed_syntax)
- return NULL;
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Bad URI token in the value of attribute \"%.20s\"", mdata_attribute_lognames[attr_id]);
- }
- }
-token_done:
- expanded_token_not_saved = 1;
- if (NULL != values_ret)
- {
- values_ret[0][values_count] = expanded_token;
- expanded_token_not_saved = 0;
- }
- values_count++;
- goto next_token; /* see above */
-}
-
-typedef struct mdata_id_desc_s {
- ptrlong iddesc_found;
- ptrlong iddesc_refcount;
- caddr_t *iddesc_refs;
-}
-mdata_id_desc_t;
-
-void
-mdata_register_id_elt (xparse_ctx_t *xp, ccaddr_t id)
-{
- id_hash_t *ht = xp->xp_tmp->xpt_id2desc;
- mdata_id_desc_t **desc;
- mdata_id_desc_t *new_desc;
- desc = (mdata_id_desc_t **)id_hash_get (ht, (caddr_t)(&id));
- if (NULL != desc)
- {
- if (desc[0]->iddesc_found)
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Id %.200s is not unique", id);
- desc[0]->iddesc_found = 1;
- return;
- }
- id = box_copy (id);
- new_desc = (mdata_id_desc_t *)list (3, (ptrlong)1, (ptrlong)0, dk_alloc_list_zero (2));
- id_hash_set (ht, (caddr_t)(&id), (caddr_t)(&new_desc));
-}
-
-void
-mdata_register_id_usage (xparse_ctx_t *xp, ccaddr_t id, caddr_t itemid)
-{
- id_hash_t *ht = xp->xp_tmp->xpt_id2desc;
- mdata_id_desc_t **desc;
- mdata_id_desc_t *new_desc;
- desc = (mdata_id_desc_t **)id_hash_get (ht, (caddr_t)(&id));
- if (NULL != desc)
- {
- int refs_room = BOX_ELEMENTS (desc[0]->iddesc_refs);
- if (desc[0]->iddesc_refcount >= refs_room)
- {
- caddr_t *new_refs = dk_alloc_list_zero (refs_room * 2);
- memcpy (new_refs, desc[0]->iddesc_refs, refs_room * sizeof (caddr_t));
- dk_free_box ((caddr_t)(desc[0]->iddesc_refs));
- desc[0]->iddesc_refs = new_refs;
- }
- desc[0]->iddesc_refs [desc[0]->iddesc_refcount++] = box_copy_tree (itemid);
- return;
- }
- new_desc = (mdata_id_desc_t *)list (3, (ptrlong)0, (ptrlong)1, (caddr_t *)dk_alloc_list_zero (2));
- new_desc->iddesc_refs[0] = box_copy_tree (itemid);
- id = box_copy (id);
- id_hash_set (ht, (caddr_t)(&id), (caddr_t)(&new_desc));
-}
-
-void
-mdata_feed_or_keep (xparse_ctx_t *xp, xp_mdata_locals_t *subj_l, caddr_t prop, xp_mdata_locals_t *inner, caddr_t obj, int obj_type)
-{
- int obj_is_iri = ((MDATA_ATTR_ITEMID == obj_type) || (MDATA_ATTR_ID == obj_type) || (MDATA_ATTR_OBJ_REF == obj_type) || (MDATA_ATTR_OBJ_REF == obj_type));
- caddr_t obj_datatype = NULL;
- caddr_t obj_lang = (obj_is_iri ? NULL : inner->xmdatal_language);
- switch (obj_type)
- {
- case MDATA_ATTR_OBJ_DATETIME:
- {
- dtp_t dt_dtp = 0;
- caddr_t dt_obj;
- caddr_t dt_err = NULL;
- char month[4], weekday[10], tzstring[10];
- unsigned day, year, mnth, hour, minute, second;
- if (6 == sscanf (obj, "%4u-%2u-%2uT%2u:%2u:%2u",
- &year, &mnth, &day, &hour, &minute, &second) )
- dt_dtp = DV_DATETIME;
- else if (6 == sscanf (obj, "%4u-%2u-%2u %2u:%2u:%2u",
- &year, &mnth, &day, &hour, &minute, &second) )
- dt_dtp = DV_DATETIME;
- else if (8 == sscanf (obj, "%9s, %2u-%3s-%2u %2u:%2u:%u %9s",
- weekday, &day, month, &year, &hour, &minute, &second, tzstring) )
- dt_dtp = DV_DATETIME;
- else if (3 == sscanf (obj, "%4u-%2u-%2u",
- &year, &mnth, &day) )
- dt_dtp = DV_DATE;
- else if (3 == sscanf (obj, "%2u-%3s-%2u",
- &day, month, &year) )
- dt_dtp = DV_DATE;
- else if (3 == sscanf (obj, "%2u:%2u:%2u",
- &hour, &minute, &second) )
- dt_dtp = DV_TIME;
- if (0 != dt_dtp)
- {
- dt_obj = box_cast_to ((caddr_t *)(xp->xp_qi), obj, DV_STRING, dt_dtp, 0, 0, &dt_err);
- if (((dt_dtp == DV_TYPE_OF (dt_obj)) || (DV_DATETIME == DV_TYPE_OF (dt_obj))) && (NULL == dt_err))
- {
- dk_free_box (obj);
- obj = dt_obj;
- obj_datatype = NULL;
- obj_lang = NULL;
- }
- else
- dk_free_box (dt_obj);
- }
- break;
- }
- case MDATA_ATTR_OBJ_REF:
- {
- caddr_t base = xp->xp_mdata_locals->xmdatal_base;
- xp_expand_relative_uri (base, &obj);
- if (NULL == obj)
- {
- dk_free_box (prop);
- return;
- }
- break;
- }
- default: ;
- }
-
- if (subj_l->xmdatal_subj_is_id || (MDATA_ATTR_ID == obj_type))
- {
- ptrlong new_cvt_bits = MDATA_DANGLING_TRIPLE_CVT_BITS (subj_l->xmdatal_subj_is_id, ((MDATA_ATTR_ID == obj_type) ? 1 : 0));
- caddr_t *triple = (caddr_t *)list (6, box_copy (subj_l->xmdatal_subj), prop, obj,
- (ptrlong)(obj_is_iri ? 1 : 0),
- ((NULL != obj_datatype) ? NULL : box_copy_tree (obj_datatype)),
- ((NULL != obj_lang) ? NULL : box_copy_tree (obj_lang)) );
- ptrlong *cvt_bits_ptr = (ptrlong *)id_hash_get (xp->xp_tmp->xpt_dangling_triples, (caddr_t)(&triple));
- if (NULL == cvt_bits_ptr)
- {
- id_hash_set (xp->xp_tmp->xpt_dangling_triples, (caddr_t)(&triple), (caddr_t)(&new_cvt_bits));
- }
- else
- {
- cvt_bits_ptr[0] |= new_cvt_bits;
- dk_free_tree ((caddr_t)triple);
- }
- }
- else
- {
- if (obj_is_iri)
- tf_triple (xp->xp_tf, subj_l->xmdatal_subj, prop, obj);
- else
- tf_triple_l (xp->xp_tf, subj_l->xmdatal_subj, prop, obj, obj_datatype, obj_lang);
- dk_free_box (prop);
- dk_free_box (obj);
- }
-}
-
-void
-mdata_feed_single_pending (xparse_ctx_t *xp, caddr_t *triple, int s_is_id, int o_is_id)
-{
- caddr_t patched_triple[6];
- patched_triple[0] = triple[0];
- patched_triple[1] = triple[1];
- patched_triple[2] = triple[2];
- patched_triple[3] = triple[3];
- patched_triple[4] = triple[4];
- patched_triple[5] = triple[5];
- if (s_is_id)
- {
- caddr_t subj = triple[0];
- int ctr;
- mdata_id_desc_t **id_desc_ptr = (mdata_id_desc_t **)id_hash_get (xp->xp_tmp->xpt_id2desc, (caddr_t)(&subj));
- if (NULL == id_desc_ptr)
- GPF_T1("unknown id as subj");
- for (ctr = id_desc_ptr[0]->iddesc_refcount; ctr--; /* no step */)
- {
- patched_triple[0] = id_desc_ptr[0]->iddesc_refs[ctr];
- mdata_feed_single_pending (xp, patched_triple, 0, o_is_id);
- }
- }
- else if (o_is_id)
- {
- caddr_t obj = triple[2];
- int ctr;
- mdata_id_desc_t **id_desc_ptr = (mdata_id_desc_t **)id_hash_get (xp->xp_tmp->xpt_id2desc, (caddr_t)(&obj));
- if (NULL == id_desc_ptr)
- GPF_T1("unknown id as obj");
- for (ctr = id_desc_ptr[0]->iddesc_refcount; ctr--; /* no step */)
- {
- patched_triple[2] = id_desc_ptr[0]->iddesc_refs[ctr];
- mdata_feed_single_pending (xp, patched_triple, s_is_id, 0);
- }
- }
- else
- {
- if (triple[3])
- tf_triple (xp->xp_tf, triple[0], triple[1], triple[2]);
- else
- tf_triple_l (xp->xp_tf, triple[0], triple[1], triple[2], triple[4], triple[5]); /* index 3 is skipped intentionally ;) */
- }
-}
-void
-mdata_process_pending_triples (xparse_ctx_t *xp)
-{
- id_hash_iterator_t hit;
- mdata_id_desc_t **id_desc_ptr;
- caddr_t *id_ptr, **triple_ptr;
- ptrlong *flags_ptr;
- id_hash_iterator (&hit, xp->xp_tmp->xpt_id2desc);
- while (hit_next (&hit, (char **)&id_ptr, (char **)&id_desc_ptr))
- {
- if (!(id_desc_ptr[0]->iddesc_found))
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Id '%.200s' is mentioned in an itemref attribute of some itemscope but not found in the whole XHTML/Microdata resource", id_ptr[0]);
- }
- id_hash_iterator (&hit, xp->xp_tmp->xpt_dangling_triples);
- while (hit_next (&hit, (char **)&triple_ptr, (char **)&flags_ptr))
- {
- if (flags_ptr[0] & MDATA_DANGLING_TRIPLE_CVT_BITS (0, 0))
- mdata_feed_single_pending (xp, triple_ptr[0], 0, 0);
- if (flags_ptr[0] & MDATA_DANGLING_TRIPLE_CVT_BITS (0, 1))
- mdata_feed_single_pending (xp, triple_ptr[0], 0, 1);
- if (flags_ptr[0] & MDATA_DANGLING_TRIPLE_CVT_BITS (1, 0))
- mdata_feed_single_pending (xp, triple_ptr[0], 1, 0);
- if (flags_ptr[0] & MDATA_DANGLING_TRIPLE_CVT_BITS (1, 1))
- mdata_feed_single_pending (xp, triple_ptr[0], 1, 1);
- }
-}
-xp_mdata_locals_t *
-xp_push_mdata_locals (xparse_ctx_t *xp)
-{
- xp_mdata_locals_t *outer = xp->xp_mdata_locals;
- xp_mdata_locals_t *inner = xp->xp_mdata_free_list;
- if (NULL == inner)
- inner = dk_alloc (sizeof (xp_mdata_locals_t));
- else
- xp->xp_mdata_free_list = xp->xp_mdata_free_list->xmdatal_parent;
- memset (inner, 0, sizeof (xp_mdata_locals_t));
- if (NULL != outer)
- {
- inner->xmdatal_subj = outer->xmdatal_subj;
- inner->xmdatal_subj_is_id = outer->xmdatal_subj_is_id;
- inner->xmdatal_prop_count = outer->xmdatal_prop_count;
- inner->xmdatal_props = outer->xmdatal_props;
- inner->xmdatal_datatype = outer->xmdatal_datatype;
- inner->xmdatal_base = outer->xmdatal_base;
- inner->xmdatal_language = outer->xmdatal_language;
- }
- inner->xmdatal_parent = outer;
- xp->xp_mdata_locals = inner;
- return inner;
-}
-
-void
-xp_pop_mdata_locals (xparse_ctx_t *xp)
-{
- xp_mdata_locals_t *inner = xp->xp_mdata_locals;
- xp_mdata_locals_t *outer = inner->xmdatal_parent;
-#define XP_FREE_INNER_IF_NEQ_OUTER(fld) do { \
- if ((NULL != inner->fld) && ((NULL == outer) || (outer->fld != inner->fld))) \
- dk_free_tree ((caddr_t)(inner->fld)); } while (0)
- XP_FREE_INNER_IF_NEQ_OUTER (xmdatal_subj);
- XP_FREE_INNER_IF_NEQ_OUTER (xmdatal_props);
- XP_FREE_INNER_IF_NEQ_OUTER (xmdatal_datatype);
- XP_FREE_INNER_IF_NEQ_OUTER (xmdatal_base);
- XP_FREE_INNER_IF_NEQ_OUTER (xmdatal_language);
- inner->xmdatal_parent = xp->xp_mdata_free_list;
- xp->xp_mdata_free_list = inner;
- xp->xp_mdata_locals = outer;
-}
-
-void
-xp_mdata_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata)
-{
- xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
- xp_mdata_locals_t *outer = xp->xp_mdata_locals;
- xp_mdata_locals_t *inner = NULL; /* This is not allocated at all if there's nothing "interesting" in the tag */
- xp_tmp_t *xpt = xp->xp_tmp;
- xp_node_t *xn = xp->xp_current;
- caddr_t avalues[COUNTOF__MDATA_ATTR];
- int inx, fill, n_attrs, n_ns, xn_is_allocated = 0;
- char *local_name;
- int obj_attr_idx = -1;
- int outer_place_bits = outer->xmdatal_place_bits;
- int need_mdata_local = 0;
- int props_connect_local_id_to_local_itemscope = 0;
-#ifdef RDFXML_DEBUG
- if (xpt->xpt_base || xpt->xpt_dt || xpt->xpt_lang || xpt->xpt_obj_content || xpt->xpt_obj_res || xpt->xpt_src || xpt->xpt_href)
- GPF_T1("xp_" "mdata_element(): nonempty xpt");
-#endif
-#ifdef RECOVER_RDF_VALUE
- caddr_t rdf_val = NULL;
-#endif
- if ((MDATA_IN_UNUSED | MDATA_IN_STRLITERAL) & outer_place_bits)
- {
- outer->xmdatal_boring_opened_elts++;
- return;
- }
- if ((MDATA_IN_XMLLITERAL) & outer_place_bits)
- {
- xp_element (userdata, name, attrdata);
- return;
- }
-/* Let's make xp->xp_free_list nonempty just to not duplicate this code in few places below */
- if (NULL == xp->xp_free_list)
- {
- xp->xp_free_list = (xp_node_t *)dk_alloc (sizeof (xp_node_t));
- xp->xp_free_list->xn_parent = NULL;
- }
- n_ns = attrdata->local_nsdecls_count;
- if (n_ns)
- {
- caddr_t *save_ns;
- xn = xp->xp_free_list;
- xp->xp_free_list = xn->xn_parent;
- memset (xn, 0, sizeof (xp_node_t));
- xn->xn_xp = xp;
- xn->xn_parent = xp->xp_current;
- xp->xp_current = xn;
- xn_is_allocated = 1;
- need_mdata_local++;
- save_ns = (caddr_t*) dk_alloc_box (2 * n_ns * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
- /* Trick here: xn->xn_attrs is set to xn->xn_namespaces in order to free memory on errors or element end. */
- xn->xn_attrs = xn->xn_namespaces = save_ns;
- fill = 0;
- for (inx = 0; inx < n_ns; inx++)
- {
- save_ns[fill++] = box_dv_uname_string (attrdata->local_nsdecls[inx].nsd_prefix);
- save_ns[fill++] = box_dv_uname_string (attrdata->local_nsdecls[inx].nsd_uri);
- }
- }
-/* Setting place bits */
- local_name = strchr (name, ':');
- if (NULL == local_name)
- local_name = name;
- n_attrs = attrdata->local_attrs_count;
- memset (avalues, 0, sizeof (avalues));
- if (0 == n_attrs)
- goto all_attributes_are_retrieved; /* see below */
- for (inx = 0; inx < n_attrs; inx ++)
- {
- char *raw_aname = attrdata->local_attrs[inx].ta_raw_name.lm_memblock;
- int mdata_attr_idx = mdata_find_attr_idx (raw_aname, name);
- if (0 > mdata_attr_idx)
- continue;
- need_mdata_local++;
- if (NULL != avalues[mdata_attr_idx])
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Duplicate/conflicting attribute names in one element head");
- avalues[mdata_attr_idx] = attrdata->local_attrs[inx].ta_value;
- }
- if (!need_mdata_local)
- {
- goto all_attributes_are_retrieved; /* see below */
- }
- if (NULL != avalues[MDATA_ATTR_ITEMPROP])
- {
- if (NULL != avalues[MDATA_ATTR_OBJ_REF])
- obj_attr_idx = MDATA_ATTR_OBJ_REF;
- else if (NULL != avalues[MDATA_ATTR_OBJ_STRLIT])
- obj_attr_idx = MDATA_ATTR_OBJ_STRLIT;
- else if (NULL != avalues[MDATA_ATTR_OBJ_CONTENT_STRLIT])
- obj_attr_idx = MDATA_ATTR_OBJ_CONTENT_STRLIT;
- else if (NULL != avalues[MDATA_ATTR_OBJ_DATETIME])
- obj_attr_idx = MDATA_ATTR_OBJ_DATETIME;
- }
- if ((2 == need_mdata_local) && (NULL != outer->xmdatal_subj) && (0 <= obj_attr_idx))
- {
-
- int prop_ctr, prop_count = 0;
- caddr_t *props = NULL;
- xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_ITEMPROP, avalues,
- MDATA_ATTRSYNTAX_ID | MDATA_ATTRSYNTAX_WS_LIST, &props, &prop_count );
- for (prop_ctr = 0; prop_ctr < prop_count; prop_ctr++)
- {
- caddr_t prop = props[prop_ctr];
- props[prop_ctr] = NULL;
- mdata_feed_or_keep (xp, outer, prop, outer /* yes, not inner */, box_dv_short_string (avalues[obj_attr_idx]), obj_attr_idx );
- }
- dk_free_box ((caddr_t)props);
- outer->xmdatal_boring_opened_elts++; /* This is to disable processing of closing tag because it can not be interesting and it should do nothing. */
- return;
- }
- if (!xn_is_allocated)
- {
- xn = xp->xp_free_list;
- xp->xp_free_list = xn->xn_parent;
- memset (xn, 0, sizeof (xp_node_t));
- xn->xn_xp = xp;
- xn->xn_parent = xp->xp_current;
- xp->xp_current = xn;
- xn_is_allocated = 1;
- }
- inner = xp_push_mdata_locals (xp);
- inner->xmdatal_xn = xn;
- if (NULL != avalues[MDATA_ATTR_XML_BASE])
- {
- if (NULL != xpt->xpt_base)
- dk_free_tree (xpt->xpt_base);
- xpt->xpt_base = box_dv_short_string (avalues[MDATA_ATTR_XML_BASE]);
- }
- if (NULL != avalues[MDATA_ATTR_XML_LANG])
- {
- if (NULL != xpt->xpt_lang)
- dk_free_tree (xpt->xpt_lang);
- xpt->xpt_lang = box_dv_short_string (avalues[MDATA_ATTR_XML_LANG]);
- }
- if (NULL != xpt->xpt_base)
- {
- inner->xmdatal_base = xpt->xpt_base;
- xpt->xpt_base = NULL;
- }
- if (NULL != xpt->xpt_lang)
- {
- inner->xmdatal_language = xpt->xpt_lang;
- xpt->xpt_lang = NULL;
- }
- if ((NULL != avalues[MDATA_ATTR_ID]) && ((NULL == avalues[MDATA_ATTR_ITEMSCOPE]) || (NULL != avalues[MDATA_ATTR_ITEMPROP])))
- {
- caddr_t id = xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_ID, avalues, MDATA_ATTRSYNTAX_ID, NULL, NULL);
- mdata_register_id_elt (xp, id);
- inner->xmdatal_subj = id;
- inner->xmdatal_subj_is_id = 1;
- inner->xmdatal_props = NULL;
- inner->xmdatal_prop_count = 0;
- }
- if (NULL != avalues[MDATA_ATTR_ITEMSCOPE])
- {
- caddr_t itemid = xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_ITEMID, avalues,
- MDATA_ATTRSYNTAX_URI | MDATA_ATTRSYNTAX_OPTIONAL, NULL, NULL );
- if (NULL == itemid)
- itemid = tf_bnode_iid (xp->xp_tf, NULL);
- if ((NULL != avalues[MDATA_ATTR_ID]) && (NULL != avalues[MDATA_ATTR_ITEMPROP]))
- {
- int prop_ctr, prop_count = 0;
- caddr_t *props = NULL;
- xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_ITEMPROP, avalues,
- MDATA_ATTRSYNTAX_ID | MDATA_ATTRSYNTAX_WS_LIST, &props, &prop_count );
- inner->xmdatal_props = props;
- inner->xmdatal_prop_count = prop_count;
- for (prop_ctr = 0; prop_ctr < prop_count; prop_ctr++)
- {
- caddr_t prop = props[prop_ctr];
- props[prop_ctr] = NULL;
- mdata_feed_or_keep (xp, inner, prop, inner, box_copy (itemid), MDATA_ATTR_ITEMID);
- }
- dk_free_box (inner->xmdatal_subj);
- inner->xmdatal_subj = NULL;
- dk_free_box ((caddr_t)(inner->xmdatal_props));
- inner->xmdatal_props = NULL;
- inner->xmdatal_prop_count = 0;
- props_connect_local_id_to_local_itemscope = 1;
- }
- if (!(props_connect_local_id_to_local_itemscope || outer->xmdatal_prop_count) && (NULL != xp->xp_tf->tf_base_uri))
- tf_triple (xp->xp_tf, xp->xp_tf->tf_base_uri, box_dv_uname_string ("http://www.w3.org/1999/xhtml/microdata#item"), itemid);
- inner->xmdatal_subj = itemid;
- inner->xmdatal_subj_is_id = 0;
- inner->xmdatal_props = NULL;
- inner->xmdatal_prop_count = 0;
- if (NULL != avalues[MDATA_ATTR_ITEMREF])
- {
- caddr_t *ref_ids = 0;
- int ref_id_ctr, ref_id_count = 0;
- xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_ITEMREF, avalues,
- MDATA_ATTRSYNTAX_ID | MDATA_ATTRSYNTAX_WS_LIST, &ref_ids, &ref_id_count );
- for (ref_id_ctr = 0; ref_id_ctr < ref_id_count; ref_id_ctr++)
- mdata_register_id_usage (xp, ref_ids[ref_id_ctr], inner->xmdatal_subj);
- dk_free_tree ((caddr_t)ref_ids);
- }
- }
- else if (NULL != avalues[MDATA_ATTR_ITEMREF])
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Attribute itemref in an opening tag that has no itemscope attribute");
- if (outer->xmdatal_prop_count && (NULL != outer->xmdatal_subj) && ((NULL != avalues[MDATA_ATTR_ITEMSCOPE]) || (NULL != avalues[MDATA_ATTR_ID])))
- {
- int prop_ctr;
- for (prop_ctr = 0; prop_ctr < outer->xmdatal_prop_count; prop_ctr++)
- {
- caddr_t prop = outer->xmdatal_props[prop_ctr];
- mdata_feed_or_keep (xp, outer, box_copy (prop), inner,
- box_dv_short_string (inner->xmdatal_subj), ((NULL != avalues[MDATA_ATTR_ITEMSCOPE]) ? MDATA_ATTR_ITEMSCOPE : MDATA_ATTR_ID) );
- }
- }
- if (NULL != avalues[MDATA_ATTR_ITEMTYPE])
- {
- caddr_t itemtype, itemid;
- caddr_t *old_itemtype_ptr;
- if (NULL == avalues[MDATA_ATTR_ITEMSCOPE])
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Attribute itemtype without attribute itemscope");
- itemtype = xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_ITEMTYPE, avalues,
- MDATA_ATTRSYNTAX_URI, NULL, NULL );
- itemid = inner->xmdatal_subj;
- old_itemtype_ptr = (caddr_t *)id_hash_get (xpt->xpt_subj2type, (caddr_t)(&itemid));
- if (NULL != old_itemtype_ptr)
- {
- dk_free_tree (itemtype);
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "The subject '%.200s' has more than one itemtype definition", inner->xmdatal_subj);
- }
- mdata_feed_or_keep (xp, inner, uname_rdf_ns_uri_type, inner, box_copy (itemtype), MDATA_ATTR_ITEMSCOPE);
- itemid = box_copy (itemid);
- id_hash_set (xpt->xpt_subj2type, (caddr_t)(&itemid), (caddr_t)(&itemtype));
- }
- if ((NULL != avalues[MDATA_ATTR_ITEMPROP]) && !props_connect_local_id_to_local_itemscope)
- {
- int prop_ctr, prop_count = 0;
- caddr_t *props = NULL;
- if (NULL == inner->xmdatal_subj)
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Attribute itemprop outside any element with itemscope or id");
- xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_ITEMPROP, avalues,
- MDATA_ATTRSYNTAX_ID | MDATA_ATTRSYNTAX_WS_LIST, &props, &prop_count );
- inner->xmdatal_props = props;
- inner->xmdatal_prop_count = prop_count;
- if ((NULL != outer->xmdatal_subj) && (0 <= obj_attr_idx))
- {
- if (inner->xmdatal_subj != outer->xmdatal_subj)
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "An opening tag with itemscope or id can not contain both attribute itemprop and some object attribute");
- for (prop_ctr = 0; prop_ctr < prop_count; prop_ctr++)
- {
- caddr_t prop = props[prop_ctr];
- props[prop_ctr] = NULL;
- mdata_feed_or_keep (xp, outer, prop, inner, box_dv_short_string (avalues[obj_attr_idx]), obj_attr_idx );
- }
- inner->xmdatal_prop_count = 0;
- }
- else if ((NULL != outer->xmdatal_subj) && (inner->xmdatal_subj != outer->xmdatal_subj))
- {
- for (prop_ctr = 0; prop_ctr < prop_count; prop_ctr++)
- {
- caddr_t prop = props[prop_ctr];
- props[prop_ctr] = NULL;
- mdata_feed_or_keep (xp, outer, prop, inner, box_copy_tree (inner->xmdatal_subj),
- (inner->xmdatal_subj_is_id ? MDATA_ATTR_ID : MDATA_ATTR_ITEMID) );
- }
- inner->xmdatal_prop_count = 0;
- }
- else
- {
- inner->xmdatal_place_bits |= MDATA_IN_STRLITERAL;
- }
- }
- if ((NULL != avalues[MDATA_ATTR_REL]) && (NULL != avalues[MDATA_ATTR_OBJ_REF]))
- {
- int rel_ctr, rel_count = 0;
- caddr_t *rels = NULL;
- caddr_t ref;
- xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_REL, avalues,
- MDATA_ATTRSYNTAX_REL | MDATA_ATTRSYNTAX_URI | MDATA_ATTRSYNTAX_WS_LIST, &rels, &rel_count );
- ref = xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_OBJ_REF, avalues,
- MDATA_ATTRSYNTAX_URI | MDATA_ATTRSYNTAX_OPTIONAL, NULL, NULL );
- if ((NULL != ref) && (NULL != xp->xp_tf->tf_base_uri))
- for (rel_ctr = 0; rel_ctr < rel_count; rel_ctr++)
- {
- caddr_t prop = rels[rel_ctr];
- tf_triple (xp->xp_tf, xp->xp_tf->tf_base_uri, prop, ref);
- }
- dk_free_tree ((caddr_t)rels);
- dk_free_box (ref);
- }
- if ((NULL != avalues[MDATA_ATTR_OBJ_NAME]) && (NULL != avalues[MDATA_ATTR_OBJ_CONTENT_STRLIT]))
- {
- caddr_t rel = xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_OBJ_NAME, avalues,
- MDATA_ATTRSYNTAX_REL | MDATA_ATTRSYNTAX_URI | MDATA_ATTRSYNTAX_SILENT, NULL, NULL );
- if ((NULL != rel) && (NULL != xp->xp_tf->tf_base_uri))
- tf_triple_l (xp->xp_tf, xp->xp_tf->tf_base_uri, rel, avalues[MDATA_ATTR_OBJ_CONTENT_STRLIT], NULL, inner->xmdatal_language);
- dk_free_box (rel);
- }
- if (NULL != avalues[MDATA_ATTR_OBJ_CITE_REF])
- {
- caddr_t ref = xp_mdata_parse_attr_value (xp, xn, MDATA_ATTR_OBJ_CITE_REF, avalues,
- MDATA_ATTRSYNTAX_URI | MDATA_ATTRSYNTAX_OPTIONAL, NULL, NULL );
- if ((NULL != ref) && (NULL != xp->xp_tf->tf_base_uri))
- tf_triple (xp->xp_tf, xp->xp_tf->tf_base_uri, box_dv_uname_string ("http://purl.org/dc/terms/source"), ref);
- dk_free_box (ref);
- }
-
-all_attributes_are_retrieved:
-/* Escape if nothing interesting is detected at all */
- if (!need_mdata_local)
- {
- outer->xmdatal_boring_opened_elts++;
- return;
- }
-/* There is something interesting so the stack should grow */
- if (!xn_is_allocated)
- {
- xn = xp->xp_free_list;
- xp->xp_free_list = xn->xn_parent;
- memset (xn, 0, sizeof (xp_node_t));
- xn->xn_xp = xp;
- xn->xn_parent = xp->xp_current;
- xp->xp_current = xn;
- }
-}
-
-void
-xp_mdata_element_end (void *userdata, const char * name)
-{
- xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
- xp_mdata_locals_t *inner = xp->xp_mdata_locals;
- xp_node_t *current_node, *parent_node;
- int inner_place_bits = inner->xmdatal_place_bits;
- if (NULL == inner->xmdatal_xn)
- return; /* This happens for elements that are closed outside any "interesting" element */
- if (xp->xp_current != inner->xmdatal_xn)
- {
- if (!(MDATA_IN_XMLLITERAL & inner_place_bits))
- GPF_T1 ("xp_" "mdata_element_end(): misaligned stacks");
- xp_element_end (userdata, name);
- return;
- }
- if (inner->xmdatal_boring_opened_elts)
- {
- inner->xmdatal_boring_opened_elts--;
- return;
- }
- inner_place_bits = inner->xmdatal_place_bits;
- current_node = xp->xp_current;
- if ((MDATA_IN_STRLITERAL | MDATA_IN_XMLLITERAL) & inner_place_bits)
- {
- caddr_t obj = NULL;
- int prop_ctr, prop_count;
- if (MDATA_IN_XMLLITERAL & inner_place_bits)
- {
- dk_set_t children;
- caddr_t *literal_head;
- caddr_t literal_tree;
- xml_tree_ent_t *literal_xte;
- XP_STRSES_FLUSH (xp);
- children = dk_set_nreverse (current_node->xn_children);
- literal_head = (caddr_t *)list (1, uname__root);
- children = CONS (literal_head, children);
- literal_tree = list_to_array (children);
- current_node->xn_children = NULL;
- literal_xte = xte_from_tree (literal_tree, xp->xp_qi);
- obj = (caddr_t) literal_xte;
- }
- else
- {
- obj = strses_string (xp->xp_strses);
- strses_flush (xp->xp_strses);
- }
- prop_count = inner->xmdatal_prop_count;
- for (prop_ctr = prop_count; prop_ctr--; /* no step */)
- {
- caddr_t prop = inner->xmdatal_props[prop_ctr];
- inner->xmdatal_props[prop_ctr] = NULL;
- mdata_feed_or_keep (xp, inner, prop, inner, (prop_ctr ? box_copy_tree (obj) : obj), MDATA_ATTR_OBJ_STRLIT);
- }
- }
- parent_node = xp->xp_current->xn_parent;
- dk_free_tree ((caddr_t)(current_node->xn_attrs));
- xp->xp_current = parent_node;
- current_node->xn_parent = xp->xp_free_list;
- xp->xp_free_list = current_node;
- xp_pop_mdata_locals (xp);
-}
-
-void
-xp_mdata_id (void *userdata, char * name)
-{
- xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
- xp_mdata_locals_t *inner = xp->xp_mdata_locals;
- if (RDFA_IN_XMLLITERAL & inner->xmdatal_place_bits)
- xp_id (userdata, name);
-}
-
-void
-xp_mdata_character (void *userdata, char * s, int len)
-{
- xparse_ctx_t *xp = (xparse_ctx_t*) userdata;
- xp_mdata_locals_t *inner = xp->xp_mdata_locals;
- int inner_place_bits = inner->xmdatal_place_bits;
- if ((MDATA_IN_STRLITERAL | MDATA_IN_XMLLITERAL) & inner_place_bits)
- session_buffered_write (xp->xp_strses, s, len);
-}
-
-void
-xp_mdata_entity (void *userdata, const char * refname, int reflen, int isparam, const xml_def_4_entity_t *edef)
-{
- xparse_ctx_t *xp = (xparse_ctx_t *) userdata;
- xp_mdata_locals_t *inner = xp->xp_mdata_locals;
- if (MDATA_IN_XMLLITERAL & inner->xmdatal_place_bits)
- xp_entity (userdata, refname, reflen, isparam, edef);
- else if (MDATA_IN_STRLITERAL & inner->xmdatal_place_bits)
- xmlparser_logprintf (xp->xp_parser, XCFG_FATAL, 100, "Entities are not supported in string literal object");
-}
-
-void
-xp_mdata_pi (void *userdata, const char *target, const char *data)
-{
- xparse_ctx_t *xp = (xparse_ctx_t *) userdata;
- xp_mdata_locals_t *inner = xp->xp_mdata_locals;
- if (MDATA_IN_XMLLITERAL & inner->xmdatal_place_bits)
- xp_pi (userdata, target, data);
-}
-
-void
-xp_mdata_comment (void *userdata, const char *text)
-{
- xparse_ctx_t *xp = (xparse_ctx_t *) userdata;
- xp_mdata_locals_t *inner = xp->xp_mdata_locals;
- if (MDATA_IN_XMLLITERAL & inner->xmdatal_place_bits)
- xp_comment (userdata, text);
-}
-
-/* Part 4. Common parser invocation routine */
+/* Part 3. Common parser invocation routine */
void
rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
@@ -3498,18 +2317,14 @@ rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
if (!xml_set_xml_read_iter (qi, text, &xrie, &enc))
sqlr_new_error ("42000", "XM032",
"Unable to parse RDF/XML from data of type %s (%d)", dv_type_title (dtp_of_text), dtp_of_text);
- if (DV_WIDE == DV_TYPE_OF (base_uri))
- base_uri = box_cast_to_UTF8 ((caddr_t *)qi, base_uri);
- else
- base_uri = box_copy (base_uri);
xn = (xp_node_t *) dk_alloc (sizeof (xp_node_t));
memset (xn, 0, sizeof(xp_node_t));
memset (&context, 0, sizeof (context));
context.xp_current = xn;
xn->xn_xp = &context;
- root_xrl = (xp_rdfxml_locals_t *) dk_alloc_zero (sizeof (xp_rdfxml_locals_t));
+ root_xrl = (xp_rdfxml_locals_t *) dk_alloc (sizeof (xp_rdfxml_locals_t));
+ memset (root_xrl, 0, sizeof (xp_rdfxml_locals_t));
root_xrl->xrl_base = base_uri;
- root_xrl->xrl_base_set = 1;
root_xrl->xrl_parsetype = XRL_PARSETYPE_TOP_LEVEL;
root_xrl->xrl_xn = xn;
context.xp_strses = strses_allocate ();
@@ -3538,26 +2353,11 @@ rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
parser->fill_ns_2dict = 0;
context.xp_parser = parser;
VXmlSetUserData (parser, &context);
- if (mode_bits & RDFXML_IN_MDATA)
- {
- xp_mdata_locals_t *root_xmdatal = xp_push_mdata_locals (&context);
- root_xmdatal->xmdatal_base = box_copy (base_uri);
- context.xp_tmp = (xp_tmp_t *)dk_alloc_box_zero (sizeof (xp_tmp_t), DV_ARRAY_OF_POINTER);
- context.xp_tmp->xpt_id2desc = (id_hash_t *)box_dv_dict_hashtable (30);
- context.xp_tmp->xpt_dangling_triples = (id_hash_t *)box_dv_dict_hashtable (100);
- context.xp_tmp->xpt_subj2type = (id_hash_t *)box_dv_dict_hashtable (30);
- VXmlSetElementHandler (parser, (VXmlStartElementHandler) xp_mdata_element, xp_mdata_element_end);
- VXmlSetIdHandler (parser, (VXmlIdHandler)xp_mdata_id);
- VXmlSetCharacterDataHandler (parser, (VXmlCharacterDataHandler) xp_mdata_character);
- VXmlSetEntityRefHandler (parser, (VXmlEntityRefHandler) xp_mdata_entity);
- VXmlSetProcessingInstructionHandler (parser, (VXmlProcessingInstructionHandler) xp_mdata_pi);
- VXmlSetCommentHandler (parser, (VXmlCommentHandler) xp_mdata_comment);
- }
- else if (mode_bits & RDFXML_IN_ATTRIBUTES)
+ if (mode_bits & RDFXML_IN_ATTRIBUTES)
{
xp_rdfa_locals_t *root_xrdfal = xp_push_rdfa_locals (&context);
root_xrdfal->xrdfal_base = box_copy (base_uri);
- context.xp_tmp = (xp_tmp_t *)dk_alloc_box_zero (sizeof (xp_tmp_t), DV_ARRAY_OF_POINTER);
+ context.xp_tmp = dk_alloc_box_zero (sizeof (xp_tmp_t), DV_ARRAY_OF_POINTER);
VXmlSetElementHandler (parser, (VXmlStartElementHandler) xp_rdfa_element, xp_rdfa_element_end);
VXmlSetIdHandler (parser, (VXmlIdHandler)xp_rdfa_id);
VXmlSetCharacterDataHandler (parser, (VXmlCharacterDataHandler) xp_rdfa_character);
@@ -3585,11 +2385,10 @@ rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
}
tf = tf_alloc ();
tf->tf_qi = qi;
- tf->tf_base_uri = box_copy (base_uri);
- tf->tf_default_graph_uri = box_copy (graph_uri);
+ tf->tf_default_graph_uri = graph_uri;
tf->tf_app_env = app_env;
tf->tf_creator = "rdf_load_rdfxml";
- tf->tf_boxed_input_name = box_dv_short_string (source_name);
+ tf->tf_input_name = source_name;
tf->tf_line_no_ptr = &(parser->curr_pos.line_num);
context.xp_tf = tf;
QR_RESET_CTX
@@ -3599,9 +2398,7 @@ rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
if (0 == setjmp (context.xp_error_ctx))
rc = VXmlParse (parser, text, xrie.xrie_text_len);
else
- rc = 0;
- if (mode_bits & RDFXML_IN_MDATA)
- mdata_process_pending_triples (&context);
+ rc = 0;
tf_commit (tf);
}
QR_RESET_CODE
@@ -3657,47 +2454,3 @@ rdfxml_parse (query_instance_t * qi, caddr_t text, caddr_t *err_ret,
tf_free (tf);
return;
}
-
-void
-xp_free_rdf_parser_fields (xparse_ctx_t *xp)
-{
- xp_rdfxml_locals_t *xrl;
- xp_rdfa_locals_t *xrdfal;
- xp_mdata_locals_t *xmdatal;
- while (NULL != xp->xp_rdfxml_locals)
- xp_pop_rdf_locals (xp);
- while (NULL != xp->xp_rdfa_locals)
- {
-#ifndef NDEBUG
- dk_free_tree (xp->xp_rdfa_locals->xrdfal_ict_buffer);
- xp->xp_rdfa_locals->xrdfal_ict_buffer = NULL;
-#endif
- xp_pop_rdfa_locals (xp);
- }
- while (NULL != xp->xp_mdata_locals)
- xp_pop_mdata_locals (xp);
- xrl = xp->xp_rdfxml_free_list;
- while (NULL != xrl)
- {
- xp_rdfxml_locals_t *next_xrl = xrl->xrl_parent;
- dk_free (xrl, sizeof (xp_rdfxml_locals_t));
- xrl = next_xrl;
- }
- xrdfal = xp->xp_rdfa_free_list;
- while (NULL != xrdfal)
- {
- xp_rdfa_locals_t *next_xrdfal = xrdfal->xrdfal_parent;
- dk_free_tree (xrdfal->xrdfal_ict_buffer);
- dk_free (xrdfal, sizeof (xp_rdfa_locals_t));
- xrdfal = next_xrdfal;
- }
- xmdatal = xp->xp_mdata_free_list;
- while (NULL != xmdatal)
- {
- xp_mdata_locals_t *next_xmdatal = xmdatal->xmdatal_parent;
- dk_free (xmdatal, sizeof (xp_mdata_locals_t));
- xmdatal = next_xmdatal;
- }
- dk_free_tree (xp->xp_tmp);
- /* Note that xp_tf is intentionally left untouched. */
-}
diff --git a/libsrc/Wi/recovery.c b/libsrc/Wi/recovery.c
index 6627b10..ec87f77 100644
--- a/libsrc/Wi/recovery.c
+++ b/libsrc/Wi/recovery.c
@@ -1,14 +1,14 @@
/*
* recovery.c
*
- * $Id: recovery.c,v 1.12.2.11 2012/03/08 12:55:35 source Exp $
+ * $Id: recovery.c,v 1.12.2.10 2011/06/13 09:29:12 source Exp $
*
* Backup & Recovery procedures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/recovery.h b/libsrc/Wi/recovery.h
index 28c935a..8a5ea44 100644
--- a/libsrc/Wi/recovery.h
+++ b/libsrc/Wi/recovery.h
@@ -1,10 +1,10 @@
/*
- * $Id: recovery.h,v 1.3.2.3 2012/03/08 12:55:35 source Exp $
+ * $Id: recovery.h,v 1.3.2.2 2009/04/18 21:55:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/regist.c b/libsrc/Wi/regist.c
index 01667d9..b050b52 100644
--- a/libsrc/Wi/regist.c
+++ b/libsrc/Wi/regist.c
@@ -1,14 +1,14 @@
/*
* regist.c
*
- * $Id: regist.c,v 1.13.2.7 2012/03/08 12:55:35 source Exp $
+ * $Id: regist.c,v 1.13.2.6 2010/05/12 12:24:29 source Exp $
*
* Database Registry
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/remote.h b/libsrc/Wi/remote.h
index 3db672f..b80e392 100644
--- a/libsrc/Wi/remote.h
+++ b/libsrc/Wi/remote.h
@@ -1,14 +1,14 @@
/*
* remote.h
*
- * $Id: remote.h,v 1.8.2.3 2012/03/08 12:55:35 source Exp $
+ * $Id: remote.h,v 1.8.2.2 2009/06/08 14:27:18 source Exp $
*
* Virtuoso Remote Data Source Access
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/rendezvous.c b/libsrc/Wi/rendezvous.c
index 170ce1c..616adcd 100644
--- a/libsrc/Wi/rendezvous.c
+++ b/libsrc/Wi/rendezvous.c
@@ -1,14 +1,14 @@
/*
* rendezvous.c
*
- * $Id: rendezvous.c,v 1.5.2.4 2012/03/08 12:55:35 source Exp $
+ * $Id: rendezvous.c,v 1.5.2.3 2010/09/17 20:49:12 source Exp $
*
* Rendezvous registration for Virtuoso
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/rendezvous.h b/libsrc/Wi/rendezvous.h
index 2128fb9..d536eff 100644
--- a/libsrc/Wi/rendezvous.h
+++ b/libsrc/Wi/rendezvous.h
@@ -1,10 +1,10 @@
/*
- * $Id: rendezvous.h,v 1.2.2.2 2012/03/08 12:55:35 source Exp $
+ * $Id: rendezvous.h,v 1.2.2.1 2009/04/18 21:55:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/repl.h b/libsrc/Wi/repl.h
index bbef864..d944e04 100644
--- a/libsrc/Wi/repl.h
+++ b/libsrc/Wi/repl.h
@@ -1,12 +1,12 @@
/*
* repl.h
*
- * $Id: repl.h,v 1.3.2.3 2012/03/08 12:55:35 source Exp $
+ * $Id: repl.h,v 1.3.2.2 2010/09/17 16:35:47 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/repl.sql b/libsrc/Wi/repl.sql
index 08f7520..0aa5b40 100644
--- a/libsrc/Wi/repl.sql
+++ b/libsrc/Wi/repl.sql
@@ -1,14 +1,14 @@
--
-- repl.sql
--
--- $Id: repl.sql,v 1.4.2.4 2012/03/08 12:55:35 source Exp $
+-- $Id: repl.sql,v 1.4.2.3 2011/09/12 20:04:31 source Exp $
--
-- TRX replication support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/replddk.sql b/libsrc/Wi/replddk.sql
index 6caa32a..56dd749 100644
--- a/libsrc/Wi/replddk.sql
+++ b/libsrc/Wi/replddk.sql
@@ -1,14 +1,14 @@
--
-- replddk.sql
--
--- $Id: replddk.sql,v 1.2.2.2 2012/03/08 12:55:35 source Exp $
+-- $Id: replddk.sql,v 1.2.2.1 2009/04/18 21:55:13 source Exp $
--
-- TRX replication support tables definition
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/replsr.h b/libsrc/Wi/replsr.h
index 29d8e20..85cdb12 100644
--- a/libsrc/Wi/replsr.h
+++ b/libsrc/Wi/replsr.h
@@ -1,12 +1,12 @@
/*
* replsr.h
*
- * $Id: replsr.h,v 1.3.2.3 2012/03/08 12:55:35 source Exp $
+ * $Id: replsr.h,v 1.3.2.2 2010/02/18 21:37:27 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/rltrx.c b/libsrc/Wi/rltrx.c
index a7f73cc..b541b34 100644
--- a/libsrc/Wi/rltrx.c
+++ b/libsrc/Wi/rltrx.c
@@ -1,14 +1,14 @@
/*
* rltrx.c
*
- * $Id: rltrx.c,v 1.18.2.22 2012/03/08 12:55:35 source Exp $
+ * $Id: rltrx.c,v 1.18.2.21 2011/10/19 15:14:10 source Exp $
*
* Locking concurrency control
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/row.c b/libsrc/Wi/row.c
index 9c449f8..458db37 100644
--- a/libsrc/Wi/row.c
+++ b/libsrc/Wi/row.c
@@ -1,14 +1,14 @@
/*
* row.c
*
- * $Id: row.c,v 1.18.2.13 2012/03/08 12:55:35 source Exp $
+ * $Id: row.c,v 1.18.2.11 2011/05/02 08:23:27 source Exp $
*
* Row Operations.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -641,7 +641,7 @@ rd_alloc_box (row_delta_t * rd, int len, dtp_t dtp)
}
#define RD_IRI_BOX(val) \
- { if (rd && (rd->rd_temp_fill + 16 < rd->rd_temp_max)) \
+ { if (rd->rd_temp_fill + 16 < rd->rd_temp_max) \
{ rd->rd_temp_fill += 16; *(int64*)(rd->rd_temp + rd->rd_temp_fill - 16) = DV_IRI_TAG_WORD_64; *(iri_id_t*)(rd->rd_temp + rd->rd_temp_fill - 8) = val; return (caddr_t)rd->rd_temp + rd->rd_temp_fill - 8;} \
else \
{ caddr_t box = rd_alloc_box (rd, sizeof (iri_id_t), DV_IRI_ID); *((iri_id_t*)box) = val; return box;}}
diff --git a/libsrc/Wi/schspace.c b/libsrc/Wi/schspace.c
index 5fae66f..c99e7bf 100644
--- a/libsrc/Wi/schspace.c
+++ b/libsrc/Wi/schspace.c
@@ -1,14 +1,14 @@
/*
* schspace.c
*
- * $Id: schspace.c,v 1.2.2.2 2012/03/08 12:55:35 source Exp $
+ * $Id: schspace.c,v 1.2.2.1 2009/04/18 21:55:13 source Exp $
*
* schema space resolution functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/schspace.h b/libsrc/Wi/schspace.h
index 210fa2f..d50c88f 100644
--- a/libsrc/Wi/schspace.h
+++ b/libsrc/Wi/schspace.h
@@ -1,12 +1,12 @@
/*
* schspace.h
*
- * $Id: schspace.h,v 1.2.2.2 2012/03/08 12:55:35 source Exp $
+ * $Id: schspace.h,v 1.2.2.1 2009/04/18 21:55:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/scn3.c b/libsrc/Wi/scn3.c
index fa4efcb..3a0a53f 100644
--- a/libsrc/Wi/scn3.c
+++ b/libsrc/Wi/scn3.c
@@ -1634,14 +1634,14 @@ char *yytext;
/*
* scn3.l
*
- * $Id: scn3.l,v 1.21.2.9 2012/03/08 12:55:35 source Exp $
+ * $Id: scn3.l,v 1.21.2.8 2011/09/21 15:23:23 source Exp $
*
* SQL Scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -2125,7 +2125,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -2136,7 +2136,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/libsrc/Wi/scn3.l b/libsrc/Wi/scn3.l
index 24ff27c..5bcedcc 100644
--- a/libsrc/Wi/scn3.l
+++ b/libsrc/Wi/scn3.l
@@ -1,14 +1,14 @@
/*
* scn3.l
*
- * $Id: scn3.l,v 1.21.2.9 2012/03/08 12:55:35 source Exp $
+ * $Id: scn3.l,v 1.21.2.8 2011/09/21 15:23:23 source Exp $
*
* SQL Scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/scn3split.c b/libsrc/Wi/scn3split.c
index c6abea1..6b719df 100644
--- a/libsrc/Wi/scn3split.c
+++ b/libsrc/Wi/scn3split.c
@@ -1653,14 +1653,14 @@ char *scn3splityytext;
/*
* scn3.l
*
- * $Id: scn3.l,v 1.21.2.9 2012/03/08 12:55:35 source Exp $
+ * $Id: scn3.l,v 1.21.2.8 2011/09/21 15:23:23 source Exp $
*
* SQL Scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -2144,7 +2144,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( scn3splityytext, scn3splityyleng, 1, scn3splityyout )) {} } while (0)
+#define ECHO fwrite( scn3splityytext, scn3splityyleng, 1, scn3splityyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -2155,7 +2155,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( scn3splityyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/libsrc/Wi/search.c b/libsrc/Wi/search.c
index adf3444..0109f19 100644
--- a/libsrc/Wi/search.c
+++ b/libsrc/Wi/search.c
@@ -1,14 +1,14 @@
/*
* search.c
*
- * $Id: search.c,v 1.35.2.36 2012/03/08 12:55:35 source Exp $
+ * $Id: search.c,v 1.35.2.34 2011/06/20 14:15:43 source Exp $
*
* Search
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -36,7 +36,6 @@
short db_buf_const_length[256];
-dtp_t dtp_canonical[256];
int itc_random_leaf (it_cursor_t * itc, buffer_desc_t *buf, dp_addr_t * leaf_ret);
int itc_down_rnd_check (it_cursor_t * itc, dp_addr_t leaf);
@@ -49,7 +48,6 @@ numeric_t num_int64_min;
void
const_length_init (void)
{
- int inx;
db_buf_const_length[DV_SHORT_INT] = 2;
db_buf_const_length[DV_LONG_INT] = 5;
db_buf_const_length[DV_INT64] = 9;
@@ -74,18 +72,6 @@ const_length_init (void)
num_int64_min = numeric_allocate ();
numeric_from_int64 (num_int64_max, INT64_MAX);
numeric_from_int64 (num_int64_min, INT64_MIN);
- for (inx = 0; inx < 256; inx++)
- dtp_canonical[inx] = inx;
- dtp_canonical[DV_IRI_ID_8] = DV_IRI_ID;
- dtp_canonical[DV_SHORT_INT] = DV_LONG_INT;
- dtp_canonical[DV_INT64] = DV_LONG_INT;
- dtp_canonical[DV_SHORT_STRING_SERIAL] = DV_STRING;
- dtp_canonical[DV_C_STRING] = DV_STRING;
- dtp_canonical[DV_WIDE] = DV_LONG_WIDE;
- dtp_canonical[DV_TIMESTAMP] = DV_DATETIME;
- dtp_canonical[DV_DATE] = DV_DATETIME;
- dtp_canonical[DV_TIME] = DV_DATETIME;
- dtp_canonical[DV_RDF_ID_8] = DV_RDF_ID;
}
diff --git a/libsrc/Wi/search_in.c b/libsrc/Wi/search_in.c
index 2da6145..c3eea52 100644
--- a/libsrc/Wi/search_in.c
+++ b/libsrc/Wi/search_in.c
@@ -1,14 +1,14 @@
/*
* search_in.c
*
- * $Id: search_in.c,v 1.5.2.6 2012/03/08 12:55:35 source Exp $
+ * $Id: search_in.c,v 1.5.2.5 2011/06/07 18:52:26 source Exp $
*
* Search
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/security.c b/libsrc/Wi/security.c
index 15182e0..0eb00b4 100644
--- a/libsrc/Wi/security.c
+++ b/libsrc/Wi/security.c
@@ -1,14 +1,14 @@
/*
* security.c
*
- * $Id: security.c,v 1.14.2.9 2012/03/08 12:55:35 source Exp $
+ * $Id: security.c,v 1.14.2.8 2010/11/11 15:53:45 source Exp $
*
* Security Checks
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/security.h b/libsrc/Wi/security.h
index 48b5075..9a6b6e8 100644
--- a/libsrc/Wi/security.h
+++ b/libsrc/Wi/security.h
@@ -1,12 +1,12 @@
/*
* security.h
*
- * $Id: security.h,v 1.6.2.5 2012/03/08 12:55:35 source Exp $
+ * $Id: security.h,v 1.6.2.4 2010/11/11 15:53:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/shcompo.c b/libsrc/Wi/shcompo.c
index 6be6de0..a5ca4ea 100644
--- a/libsrc/Wi/shcompo.c
+++ b/libsrc/Wi/shcompo.c
@@ -1,10 +1,10 @@
/*
- * $Id: shcompo.c,v 1.3.2.12 2012/03/08 12:55:35 source Exp $
+ * $Id: shcompo.c,v 1.3.2.11 2011/09/14 15:38:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/shcompo.h b/libsrc/Wi/shcompo.h
index 2cde214..961302e 100644
--- a/libsrc/Wi/shcompo.h
+++ b/libsrc/Wi/shcompo.h
@@ -1,10 +1,10 @@
/*
- * $Id: shcompo.h,v 1.3.2.5 2012/03/08 12:55:35 source Exp $
+ * $Id: shcompo.h,v 1.3.2.4 2011/09/14 15:38:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/shuric.c b/libsrc/Wi/shuric.c
index 8fcff81..c423f00 100644
--- a/libsrc/Wi/shuric.c
+++ b/libsrc/Wi/shuric.c
@@ -1,10 +1,10 @@
/*
- * $Id: shuric.c,v 1.4.2.3 2012/03/08 12:55:35 source Exp $
+ * $Id: shuric.c,v 1.4.2.2 2010/02/10 16:03:28 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/shuric.h b/libsrc/Wi/shuric.h
index c109cdc..c81cca2 100644
--- a/libsrc/Wi/shuric.h
+++ b/libsrc/Wi/shuric.h
@@ -1,10 +1,10 @@
/*
- * $Id: shuric.h,v 1.4.2.2 2012/03/08 12:55:35 source Exp $
+ * $Id: shuric.h,v 1.4.2.1 2009/04/18 21:55:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/simile.sql b/libsrc/Wi/simile.sql
index 1610c49..9b2d824 100644
--- a/libsrc/Wi/simile.sql
+++ b/libsrc/Wi/simile.sql
@@ -1,10 +1,10 @@
--
--- $Id: simile.sql,v 1.3.2.1 2012/03/08 12:55:35 source Exp $
+-- $Id: simile.sql,v 1.3 2008/11/19 11:24:53 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/snapshot_repl.sql b/libsrc/Wi/snapshot_repl.sql
index f7a90e2..9275fba 100644
--- a/libsrc/Wi/snapshot_repl.sql
+++ b/libsrc/Wi/snapshot_repl.sql
@@ -1,12 +1,12 @@
--
--- $Id: snapshot_repl.sql,v 1.3.2.2 2012/03/08 12:55:35 source Exp $
+-- $Id: snapshot_repl.sql,v 1.3.2.1 2009/04/18 21:55:13 source Exp $
--
-- SNP replication support
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/soap.h b/libsrc/Wi/soap.h
index 58b2a2e..52d6278 100644
--- a/libsrc/Wi/soap.h
+++ b/libsrc/Wi/soap.h
@@ -1,10 +1,10 @@
/*
- * $Id: soap.h,v 1.5.2.2 2012/03/08 12:55:35 source Exp $
+ * $Id: soap.h,v 1.5.2.1 2009/04/18 21:55:13 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/soap.sql b/libsrc/Wi/soap.sql
index 190f9c6..0d5e296 100644
--- a/libsrc/Wi/soap.sql
+++ b/libsrc/Wi/soap.sql
@@ -1,10 +1,10 @@
--
--- $Id: soap.sql,v 1.11.2.7 2012/03/08 12:55:35 source Exp $
+-- $Id: soap.sql,v 1.11.2.5 2011/09/28 17:01:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -2324,7 +2324,7 @@ err:;
?>
</TD></TR></TABLE>
</DIV>
-<DIV class="foot"><SPAN class="foot">Virtuoso Universal Server <?=sys_stat('st_dbms_ver')?> - Copyright© 1998-2012 OpenLink Software.</SPAN></DIV>
+<DIV class="foot"><SPAN class="foot">Virtuoso Universal Server <?=sys_stat('st_dbms_ver')?> - Copyright© 1998-2011 OpenLink Software.</SPAN></DIV>
</BODY>
</HTML>
<?vsp
diff --git a/libsrc/Wi/soap12_router.xsl b/libsrc/Wi/soap12_router.xsl
index 31f4687..b49100b 100644
--- a/libsrc/Wi/soap12_router.xsl
+++ b/libsrc/Wi/soap12_router.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: soap12_router.xsl,v 1.4.2.1 2012/03/08 12:55:35 source Exp $
+ - $Id: soap12_router.xsl,v 1.4 2009/04/09 13:22:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/soap_import_sch.xsl b/libsrc/Wi/soap_import_sch.xsl
index f2553ef..255f8c4 100644
--- a/libsrc/Wi/soap_import_sch.xsl
+++ b/libsrc/Wi/soap_import_sch.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: soap_import_sch.xsl,v 1.4.2.1 2012/03/08 12:55:35 source Exp $
+ - $Id: soap_import_sch.xsl,v 1.4 2009/04/09 13:22:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/soap_sch.xsl b/libsrc/Wi/soap_sch.xsl
index 12519ff..28e12b4 100644
--- a/libsrc/Wi/soap_sch.xsl
+++ b/libsrc/Wi/soap_sch.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: soap_sch.xsl,v 1.4.2.2 2012/03/08 12:55:35 source Exp $
+ - $Id: soap_sch.xsl,v 1.4.2.1 2010/11/05 10:56:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/soap_xmlrpc.xsl b/libsrc/Wi/soap_xmlrpc.xsl
index 6f9f109..f4e8e1c 100644
--- a/libsrc/Wi/soap_xmlrpc.xsl
+++ b/libsrc/Wi/soap_xmlrpc.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: soap_xmlrpc.xsl,v 1.4.2.1 2012/03/08 12:55:35 source Exp $
+ - $Id: soap_xmlrpc.xsl,v 1.4 2009/04/09 13:22:13 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sort.c b/libsrc/Wi/sort.c
index 530bbdf..ea5d304 100644
--- a/libsrc/Wi/sort.c
+++ b/libsrc/Wi/sort.c
@@ -1,14 +1,14 @@
/*
* sort.c
*
- * $Id: sort.c,v 1.14.2.9 2012/03/08 12:55:35 source Exp $
+ * $Id: sort.c,v 1.14.2.8 2011/09/14 15:38:19 source Exp $
*
* SQL ORDER BY sort and DISTINCT
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/space.c b/libsrc/Wi/space.c
index 3dd8218..046f697 100644
--- a/libsrc/Wi/space.c
+++ b/libsrc/Wi/space.c
@@ -1,14 +1,14 @@
/*
* space.c
*
- * $Id: space.c,v 1.7.2.10 2012/03/08 12:55:35 source Exp $
+ * $Id: space.c,v 1.7.2.9 2011/05/10 18:37:35 source Exp $
*
* Delta spaces
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sparql.h b/libsrc/Wi/sparql.h
index 0aebfbc..c4753e4 100644
--- a/libsrc/Wi/sparql.h
+++ b/libsrc/Wi/sparql.h
@@ -1,10 +1,10 @@
/*
- * $Id: sparql.h,v 1.58.2.34 2012/03/08 12:55:35 source Exp $
+ * $Id: sparql.h,v 1.58.2.27 2011/06/11 16:41:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -49,7 +49,7 @@ extern "C" {
/*! Number of NULLs should match number of fields in rdf_val_range_t */
#define SPART_RVR_LIST_OF_NULLS NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-#define SPAR_ALIAS (ptrlong)1001 /*!< Alias, (expn AS ?varname). spar_dealias() is identity function for non-aliases and returns expn for aliases. Alias of alias can be treated as an error. */
+#define SPAR_ALIAS (ptrlong)1001
#define SPAR_BLANK_NODE_LABEL (ptrlong)1002
#define SPAR_BUILT_IN_CALL (ptrlong)1003
#define SPAR_CONV (ptrlong)1004 /*!< Tree type for temporary use in SQL printer (conversion from one format to other) */
@@ -69,77 +69,12 @@ extern "C" {
#define SPAR_WHERE_MODIFS (ptrlong)1019
#define SPAR_SERVICE_INV (ptrlong)1020 /*!< Tree type for details of invocation of an external service endpoint */
#define SPAR_BINDINGS_INV (ptrlong)1021 /*!< Tree type for details of bindings associated with gp */
-#define SPAR_DEFMACRO (ptrlong)1022
-#define SPAR_MACROCALL (ptrlong)1023
-#define SPAR_MACROPU (ptrlong)1024 /*!< Macro parameter usage --- the occurence of a variable name in a macro body */
-#define SPAR_MIN_TREE_TYPE (ptrlong)1001
-#define SPAR_MAX_TREE_TYPE (ptrlong)1024 /* Don't forget to adjust */
/* Don't forget to update spart_count_specific_elems_by_type(), sparp_tree_full_clone_int(), sparp_tree_full_copy(), spart_dump() and comments inside typedef struct spar_tree_s */
-#define SPAR_BIF_ABS (ptrlong)1101
-#define SPAR_BIF_BNODE (ptrlong)1102
-#define SPAR_BIF_CEIL (ptrlong)1103
-#define SPAR_BIF_COALESCE (ptrlong)1104
-#define SPAR_BIF_CONCAT (ptrlong)1105
-#define SPAR_BIF_CONTAINS (ptrlong)1106
-#define SPAR_BIF_DAY (ptrlong)1107
-#define SPAR_BIF_ENCODE_FOR_URI (ptrlong)1108
-#define SPAR_BIF_FLOOR (ptrlong)1109
-#define SPAR_BIF_HOURS (ptrlong)1110
-#define SPAR_BIF_IF (ptrlong)1111
-#define SPAR_BIF_ISBLANK (ptrlong)1112
-#define SPAR_BIF_ISIRI (ptrlong)1113
-#define SPAR_BIF_ISLITERAL (ptrlong)1114
-#define SPAR_BIF_ISNUMERIC (ptrlong)1115
-#define SPAR_BIF_ISREF (ptrlong)1116
-#define SPAR_BIF_ISURI (ptrlong)1117
-#define SPAR_BIF_LANGMATCHES (ptrlong)1118
-#define SPAR_BIF_LCASE (ptrlong)1119
-#define SPAR_BIF_MD5 (ptrlong)1120
-#define SPAR_BIF_MINUTES (ptrlong)1121
-#define SPAR_BIF_MONTH (ptrlong)1122
-#define SPAR_BIF_NOW (ptrlong)1123
-#define SPAR_BIF_RAND (ptrlong)1124
-#define SPAR_BIF_REGEX (ptrlong)1125
-#define SPAR_BIF_REPLACE (ptrlong)1126
-#define SPAR_BIF_ROUND (ptrlong)1127
-#define SPAR_BIF_SAMETERM (ptrlong)1128
-#define SPAR_BIF_SECONDS (ptrlong)1129
-#define SPAR_BIF_SHA1 (ptrlong)1130
-#define SPAR_BIF_SHA224 (ptrlong)1131
-#define SPAR_BIF_SHA256 (ptrlong)1132
-#define SPAR_BIF_SHA384 (ptrlong)1133
-#define SPAR_BIF_SHA512 (ptrlong)1134
-#define SPAR_BIF_STR (ptrlong)1135
-#define SPAR_BIF_STRDT (ptrlong)1136
-#define SPAR_BIF_STRENDS (ptrlong)1137
-#define SPAR_BIF_STRLANG (ptrlong)1138
-#define SPAR_BIF_STRLEN (ptrlong)1139
-#define SPAR_BIF_STRSTARTS (ptrlong)1140
-#define SPAR_BIF_SUBSTR (ptrlong)1141
-#define SPAR_BIF_TIMEZONE (ptrlong)1142
-#define SPAR_BIF_TZ (ptrlong)1143
-#define SPAR_BIF_UCASE (ptrlong)1144
-#define SPAR_BIF_URI (ptrlong)1145
-#define SPAR_BIF_YEAR (ptrlong)1146
-
-#define SPAR_SML_CREATE (ptrlong)1201
-#define SPAR_SML_DROP (ptrlong)1202
-#define SPAR_SML_ATTACH (ptrlong)1203
-#define SPAR_SML_DETACH (ptrlong)1204
-
#define SPARP_MAX_LEXDEPTH 50
#define SPARP_MAX_SYNTDEPTH SPARP_MAX_LEXDEPTH+10
-#define SPARP_MAXLIMIT -1 /*!< Default value for LIMIT clause of SELECT */
-
-#define SPARP_CALLARG 1 /*!< The parser reads the macro call */
-#define SPARP_DEFARG 2 /*!< The parser reads the arglist of a defmacro and remembers variable names as is in order to know what should be substituted in body */
-#define SPARP_DEFBODY 4 /*!< The parser reads the body of a defmacro and remembers positions of variables in argument lists */
-
-#define SPARP_PU_IN_TRIPLE 1
-#define SPARP_PU_IN_READ 2
-#define SPARP_PU_BGP 3
+#define SPARP_MAXLIMIT 0x7Fffffff /* Default value for LIMIT clause of SELECT */
struct spar_sqlgen_s;
struct spar_tree_s;
@@ -162,6 +97,7 @@ typedef struct spar_lexbmk_s {
ptrlong sparlb_offset;
} spar_lexbmk_t;
+
#if 0
typedef struct spar_query_s
{
@@ -184,7 +120,7 @@ typedef struct spar_qm_ft_s {
caddr_t sparqft_type; /*!< NULL for plain free-text index, something else for text xml index */
SPART * sparqft_ft_sqlcol; /*!< Free-text indexed column */
SPART ** sparqft_qmv_sqlcols; /*!< Columns that are used in quad map value */
- SPART ** sparqft_options; /*!< Options as declared in 'OPTION (...)' list of 'TEXT LITERAL ...' clause */
+ SPART ** sparqft_options; /*!< Options as declared in 'OPTION (...)' list of 'TEXT LITERAL ...' clause */
int sparqft_use_ctr; /*!< Use counter. It is an error if a 'TEXT LITERAL ...' clause is not used in the QM statement */
} spar_qm_ft_t;
@@ -203,8 +139,8 @@ typedef struct spar_propvariable_s {
/*! Configuration of RDF grabber, A.K.A. 'IRI resolver'. */
typedef struct rdf_grab_config_s {
int rgc_pview_mode; /*!< The query is executed using procedure view that will form a result-set by calling more than one statement via exec() */
- int rgc_all; /*!< Automatically add all IRI constants/vars (except P) to spare_src.ssrc_grab_consts */
- int rgc_intermediate; /*!< Automatically add all IRI constants/vars (except P) to spare_src.ssrc_grab_consts */
+ int rgc_all; /*!< Automatically add all IRI constants/vars (except P) to spare_grab_consts */
+ int rgc_intermediate; /*!< Automatically add all IRI constants/vars (except P) to spare_grab_consts */
dk_set_t rgc_consts; /*!< Constants to be used as names of additional graphs */
dk_set_t rgc_vars; /*!< Names of variables whose values should be used as names of additional graphs */
dk_set_t rgc_sa_graphs; /*!< SeeAlso graph names. Every time a value can be downloaded, its seeAlso values can also be downloaded */
@@ -228,7 +164,6 @@ typedef struct sparp_sources_s
{
rdf_grab_config_t ssrc_grab; /*!< Grabber configuration */
dk_set_t ssrc_common_sponge_options; /*!< Options that are added to every FROM ... OPTION ( ... ) list */
- SPART * ssrc_graph_set_by_with; /*!< The precode expression of WITH clause, if exists */
dk_set_t ssrc_default_graphs; /*!< Default graphs and NOT FROM graphs as set by protocol or FROM graph-uri-precode. All NOT FROM are after all FROM! */
dk_set_t ssrc_named_graphs; /*!< Named graphs and NOT FROM NAMED graphs as set by protocol or clauses. All NOT FROM NAMED are after all FROM NAMED! */
int ssrc_default_graphs_listed; /*!< At least one default graph was set, so the list of default graphs is exhaustive even if empty or consists of solely NOT FROM (NOT FROM may remove all FROM, making the list empty) */
@@ -237,6 +172,16 @@ typedef struct sparp_sources_s
int ssrc_named_graphs_locked; /*!< Named graphs are set by protocol and can not be overwritten. There's no locking for NOT FROM NAMED */
} sparp_sources_t;
+#define spare_grab spare_src.ssrc_grab
+#define spare_common_sponge_options spare_src.ssrc_common_sponge_options
+#define spare_default_graphs spare_src.ssrc_default_graphs
+#define spare_named_graphs spare_src.ssrc_named_graphs
+#define spare_default_graphs_listed spare_src.ssrc_default_graphs_listed
+#define spare_named_graphs_listed spare_src.ssrc_named_graphs_listed
+#define spare_default_graphs_locked spare_src.ssrc_default_graphs_locked
+#define spare_named_graphs_locked spare_src.ssrc_named_graphs_locked
+
+
/* When a new field is added here, please check whether it should be added to sparp_clone_for_variant () */
typedef struct sparp_env_s
{
@@ -280,8 +225,6 @@ typedef struct sparp_env_s
dk_set_t spare_context_gp_subtypes; /*!< Subtypes of not-yet-completed graph patterns */
dk_set_t spare_acc_triples; /*!< Sets of accumulated triples of GPs */
dk_set_t spare_acc_filters; /*!< Sets of accumulated filters of GPs */
- int spare_ctor_dflt_g_tmpl_count; /*!< For CONSTRUCT and the like --- count of triple templates in the default graph, should be reset to zero after ctor to deal with DELETE{...} INSERT{...} */
- int spare_ctor_g_grp_count; /*!< For CONSTRUCT and the like --- count of graph {...} groups of triple templates, should be reset to zero after ctor to deal with DELETE{...} INSERT{...} */
SPART ** spare_bindings_vars; /*!< List of variables enumerated in local BINDINGS Var+ list */
SPART *** spare_bindings_rowset; /*!< Array of arrays of values in BINDINGS {...} */
dk_set_t spare_good_graph_varnames; /*!< Varnames found in non-optional triples before or outside, (including non-optional inside previous non-optional siblings), but not after or inside */
@@ -336,7 +279,7 @@ typedef struct sparp_s {
#ifdef XPYYDEBUG
int sparp_yydebug;
#endif
- ccaddr_t sparp_text;
+ caddr_t sparp_text;
int sparp_permitted_syntax; /*!< Bitmask of permitted syntax extensions, 0 for default */
int sparp_unictr; /*!< Unique counter for objects */
/* Environment of yacc */
@@ -365,21 +308,10 @@ typedef struct sparp_s {
spar_lexem_t * sparp_curr_lexem_buf_fill; /*!< Number of lexems in \c sparp_curr_lexem_buf */
/* Environment of term rewriter of the SPARQL-to-SQL compiler */
dk_set_t sparp_propvars; /*!< Set of propvars with distinct \c sparv_key fields that were ever used in the query */
- struct quad_storage_s *sparp_storage; /*!< Default storage that handles arbitrary quads of any sort plus maybe SPMJVs and relational mappings made by user, usually rdf_sys_storage */
- int sparp_storage_is_set; /*!< The field sparp_storage is set (or at least tried to set with error and the attempt to set should not be retried) */
- dk_set_t sparp_macro_libs; /*!< List of IRIs of used macro libraries. */
- int sparp_disable_storage_macro_lib; /*!< If nonzero, the macro library of the quad storage is not used. This is set e.g. when the query to compile is the declaration of the macro lib by itself. */
+ struct quad_storage_s *sparp_storage; /*!< Default storage that handles arbitrary quads of any sort plus maybe SPMJVs and relational mappings made by user, usually rdf_sys_storage */
struct sparp_trav_params_s *sparp_stp; /*!< Parameters of traverse (callbacks in use). It is filled in by sparp_gp_grav() only, not by sparp_gp_grav_int() */
struct sparp_trav_state_s *sparp_stss; /*!< Stack of traverse states. [0] is fake for parent on 'where', [1] is for 'where' etc. */
sparp_globals_t *sparp_sg; /*!< Pointer to data common for all sparp_t-s for whole stack of nested sparp-s */
- int sparp_macrolib_ignore_create; /*!< True if define input:macrolib-ignore-create is set */
- caddr_t sparp_macrolib_to_create; /*!< IRI of macro lib that should be created, NULL if that's not a CREATE MACRO LIBRARY statement */
- int sparp_macro_mode; /*!< Indicator of special mode of parsing DEFMACRO arguments, body, or invocation */
- SPART **sparp_macro_defs; /*!< Array of locally defined macro defs, with an unused end */
- int sparp_macro_def_count; /*!< Count of used items in \c sparp_macro_defs */
- dk_set_t sparp_funnames_in_defmacros; /*!< All names of functions used inside bodies of macro definitions. They should not be used later as names of new macro defs, to avoid confusion. */
- SPART * sparp_current_macro; /*!< The body of the macro that is being defined now */
- int sparp_macro_call_count; /*!< If nonzero then macroexpansion should be made */
int sparp_first_equiv_idx; /*!< The index of the first equivalence class allocated in this sparp, to avoid integrity checks of incomplete equivs of outer sparps */
int sparp_rewrite_dirty; /*!< An integer that is incremented when any optimization subroutine rewrites the tree. */
int sparp_trav_running; /*!< Flags that some traverse is in progress, in order to GPF if traverse procedure re-enters */
@@ -425,10 +357,7 @@ extern void spar_error_if_unsupported_syntax_imp (sparp_t *sparp, int feature_in
#define tr_subject tr_fields[1]
#define tr_predicate tr_fields[2]
#define tr_object tr_fields[3]
-#define SPART_TRIPLE_FIELDS_COUNT 4
-#define SPART_VAR_OUTSIDE_TRIPLE 5 /*!< This is a value set to var.tr_idx of variables and bnodes in FILTERs, return expressions and other const reads */
-
-extern ptrlong sparp_tr_usage_natural_restrictions[SPART_TRIPLE_FIELDS_COUNT];
+#define SPART_TRIPLE_FIELDS_COUNT 4
/* These values should be greater than any SQL opcode AND greater than 0x7F to not conflict with codepoints of "syntactically important" chars AND less than 0xFF to not conflict with YACC IDs for keywords. */
#define SPART_GRAPH_FROM 0x100
@@ -519,8 +448,7 @@ typedef struct spar_tree_s
} bin_exp;
struct {
/* #define SPAR_BUILT_IN_CALL (ptrlong)1003 */
- ptrlong btype; /*!< Type of particular BIF, as lexem (for lexems other than SPARQL_BIF) or SPAR_BIF_xxx */
- ptrlong desc_ofs; /*!< The offset of BIF description in \c sparp_bif_descs array */
+ ptrlong btype;
SPART **args;
} builtin;
struct {
@@ -663,7 +591,7 @@ typedef struct spar_tree_s
} wm;
struct {
/* define SPAR_SERVICE_INV (ptrlong)1020 */
- ptrlong own_idx; /*!< Serial of the sinv in the parser */
+ ptrlong own_idx; /*!< Boxed serial of the sinv in the parser */
caddr_t endpoint; /*!< An IRI of web service endpoint without static parameters */
SPART **iri_params; /*!< A get_keyword style array of parameters to pass in the IRI, like maxrows */
caddr_t syntax; /*!< Boxed bitmask of SSG_SD_xxx flags of allowed query serialization features */
@@ -676,35 +604,10 @@ typedef struct spar_tree_s
} sinv;
struct {
/* define SPAR_BINDINGS_INV (ptrlong)1021 */
- ptrlong own_idx; /*!< Serial of the bindings invocation in the parser */
+ ptrlong own_idx; /*!< Boxed serial of the bindings invocation in the parser */
SPART *vars; /*!< Names of variables that are passed as parameters */
- SPART ***data_rows; /*!< Rows of data. Note that they're not copied from spare_bindings_rowset and not duplicated if enclosing GP is duplicated. */
+ SPART ***data_rows; /*!< Rows of data. Note that they're not copied from spare_bindings_rowset and not duplicated if enclosing GP is duplicated. */
} binv;
- struct {
- /* define SPAR_DEFMACRO (ptrlong)1022 */
- ptrlong subtype;
- caddr_t mname; /*!< IRI of the macro */
- caddr_t sml_iri; /*!< IRI UNAME of SPARQL macro library where the macro comes from (as a result of define input:macro-lib... ) */
- caddr_t *paramnames; /*!< Names of parameters */
- caddr_t *localnames; /*!< Names of variables listed in LOCAL (...) clause */
- SPART **quad_pattern; /*!< The template of triple (or quad) patterns */
- SPART *body; /*!< The body of the macro, as group graph pattern or scalar expression */
- caddr_t selid; /*!< Outermost selid of the \c defmacro.body */
- ptrlong aggregate_count; /*!< Count of aggregate functions used inside the \c defmacro.body */
- } defmacro;
- struct {
- /* #define SPAR_MACROCALL (ptrlong)1023 */
- caddr_t mname;
- SPART **argtrees;
- SPART *context_graph;
- caddr_t mid;
- } macrocall;
- struct {
- /* #define SPAR_MACROPU (ptrlong)1024 */
- caddr_t pname;
- ptrlong pindex;
- ptrlong pumode;
- } macropu;
} _;
} sparp_tree_t;
@@ -716,18 +619,8 @@ typedef unsigned char SPART_buf[sizeof (sparp_tree_t) + BOX_AUTO_OVERHEAD];
(ptr)->type = t; \
} while (0)
-#ifndef NDEBUG
-extern SPART **t_spartlist_concat (SPART **list1, SPART **list2);
-#else
-#define t_spartlist_concat(list1,list2) ((SPART **)(t_list_concat((SPART **)(list1), (SPART **)(list2))))
-#endif
-
-extern sparp_t * sparp_query_parse (const char * str, spar_query_env_t *sparqre, int rewrite_all);
+extern sparp_t * sparp_query_parse (char * str, spar_query_env_t *sparqre, int rewrite_all);
extern int sparyyparse (void *sparp);
-/*! Finds storage by name and sets it, it also finds associated macro library (it it is set of the storage) and copies macro defs from the library
-The search for associated macro lib is disabled if the statement contains CREATE MACRO LIBRARY clause */
-extern void sparp_configure_storage_and_macro_libs (sparp_t *sparp);
-extern void sparp_compile_smllist (sparp_t *sparp, caddr_t sml_iri_uname, void /* actually struct sparql_macro_library_t */ *smlib);
extern const char *spart_dump_opname (ptrlong opname, int is_op);
extern void spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, int hint);
@@ -770,19 +663,6 @@ extern void spart_dump (void *tree_arg, dk_session_t *ses, int indent, const cha
#define SPAR_FT_XQUERY_CONTAINS 14
#define SPAR_GEO_CONTAINS 21
-/*! The context of the macro processor */
-typedef struct spar_mproc_ctx_s {
- SPART *smpc_context_gp; /*!< A gp where the macroexpansion takes place, if notnull. */
- caddr_t smpc_context_selid; /*!< Selid of gp where the macroexpansion takes place. If notnull. */
- caddr_t smpc_defbody_topselid; /*!< The topmost selid of a defbody. it is replaced with smpc_context_selid when the body is instantiated. */
- caddr_t smpc_defbody_currselid; /*!< The current selid inside a defbody. It is replaced with concatenation of smpc_context_selid and itself when the body is instantiated. */
- SPART *smpc_defm; /*!< The defmacro that is being instantiated ATM */
- SPART *smpc_mcall; /*!< The macro call that should be replaced with the instantiated \c smpc_defm */
- SPART **smpc_ins_membs; /*!< Members made by the instantiation of gp macro that should be placed to the end of list of members of the context */
- SPART **smpc_ins_filts; /*!< Filters made by the instantiation of gp macro that should be placed to the end of list of filters of the context */
- int smpc_unictr; /*!< An unique serial number of the processor invocation. */
-} spar_mproc_ctx_t;
-
extern caddr_t spar_var_name_of_ret_column (SPART *tree);
extern caddr_t spar_alias_name_of_ret_column (SPART *tree);
/*! If the tree has a fixed value that is either plain SQL value or a QName (but not a typed literal or a literal with language)
@@ -837,24 +717,14 @@ extern void sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_typ
extern caddr_t spar_selid_push (sparp_t *sparp);
extern caddr_t spar_selid_push_reused (sparp_t *sparp, caddr_t selid);
extern caddr_t spar_selid_pop (sparp_t *sparp);
-
-extern SPART *spar_find_defmacro_by_iri_or_fields (sparp_t *sparp, caddr_t mname, SPART **fields);
-extern void sparp_defmacro_store (sparp_t *sparp, SPART *defm);
-extern SPART *sparp_defmacro_init (sparp_t *sparp, caddr_t mname);
-extern void sparp_make_defmacro_paramnames_from_template (sparp_t *sparp, SPART *defm);
-extern void sparp_defmacro_finalize (sparp_t *sparp, SPART *body);
-extern void sparp_check_dm_arg_for_redecl (sparp_t *sparp, dk_set_t recent, caddr_t dm_arg_vname);
extern void spar_gp_init (sparp_t *sparp, ptrlong subtype);
#define SPARP_ENV_CONTEXT_GP_SUBTYPE(sparp) ((ptrlong)((sparp)->sparp_env->spare_context_gp_subtypes->data))
extern SPART *spar_gp_finalize (sparp_t *sparp, SPART **options);
extern SPART *spar_gp_finalize_with_subquery (sparp_t *sparp, SPART **options, SPART *subquery);
extern void spar_gp_add_member (sparp_t *sparp, SPART *memb);
-#define SPAR_ADD_TRIPLELIKE_NO_TRANSITIVE 0x1 /*!< ignore transitivity in inf rules or options */
-#define SPAR_ADD_TRIPLELIKE_NO_INV_UNION 0x2 /*!< ignore inverse props */
-#define SPAR_ADD_TRIPLELIKE_NO_MACRO 0x4 /*!< ignore macro */
-/*! Makes and adds a triple or a macro call or a filter like CONTAINS or a SELECT group for transitive prop or a UNION prop with inverse props or combination of few, with optional filter on graph.
-\c banned tricks is a bitmask that is 0 by default, SPAR_ADD_TRIPLELIKE_NO_xxx */
-extern SPART *spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *predicate, SPART *object, caddr_t qm_iri, SPART **options, int banned_tricks);
+/*! Makes and adds a triple or a filter like CONTAINS or a SELECT group for transitive prop or a UNION prop with inverse props or combination of few, with optional filter on graph.
+\c banned tricks is a bitmask that is 0 by default, 0x1 to ignore transitivity in inf rules or options, 0x2 to ignore inverse props */
+extern SPART *spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subject, SPART *predicate, SPART *object, caddr_t qm_iri, SPART **options, int banned_tricks);
/*! Checks if the given \c filt is a freetext filter. If it is so and \c base_triple is not NULL then it additionally checks if var name matches */
extern int spar_filter_is_freetext (sparp_t *sparp, SPART *filt, SPART *base_triple);
extern void spar_gp_add_filter (sparp_t *sparp, SPART *filt);
@@ -862,14 +732,8 @@ extern void spar_gp_add_filters_for_graph (sparp_t *sparp, SPART *graph_expn, in
extern void spar_gp_add_filters_for_named_graph (sparp_t *sparp);
extern SPART *spar_make_list_of_sources_expn (sparp_t *sparp, ptrlong from_subtype, ptrlong from_group_subtype, ptrlong from2_subtype, ptrlong req_perms, SPART *needle_in);
extern SPART *spar_add_propvariable (sparp_t *sparp, SPART *lvar, int opcode, SPART *verb_qname, int verb_lexem_type, caddr_t verb_lexem_text);
-/*! Creates a tree for service invocation but does not add it to the array of all invocations.
-Use spar_add_service_inv_to_sg() to assign sinv.own_idx and store it in sparp->sparp_sg->sg_sinvs .
-Also make sure that sparp->sparp_query_uses_sinvs++ is made somewhere before the creation for the current sparp. */
extern SPART *spar_make_service_inv (sparp_t *sparp, caddr_t endpoint, dk_set_t all_options, ptrlong permitted_syntax, SPART **sources, caddr_t sinv_storage_uri);
-/*! Assigns sinv->_.sinv.own_idx and store the pointer to invocation in sparp->sparp_sg->sg_sinvs. After that it is legal to refer to quad maps inside the sinv and to try optimizations */
-extern void spar_add_service_inv_to_sg (sparp_t *sparp, SPART *sinv);
extern caddr_t spar_compose_report_flag (sparp_t *sparp);
-extern SPART *spar_simplify_graph_to_patch (sparp_t *sparp, SPART *g);
extern void spar_compose_retvals_of_construct (sparp_t *sparp, SPART *top, SPART *ctor_gp, const char *formatter, const char *agg_formatter, const char *agg_mdata);
extern void spar_compose_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top, SPART *graph_to_patch, SPART *ctor_gp);
extern void spar_compose_retvals_of_modify (sparp_t *sparp, SPART *top, SPART *graph_to_patch, SPART *del_ctor_gp, SPART *ins_ctor_gp);
@@ -879,44 +743,30 @@ extern void spar_optimize_retvals_of_modify (sparp_t *sparp, SPART *top);
extern SPART **spar_retvals_of_describe (sparp_t *sparp, SPART **retvals, SPART *limit, SPART *offset);
extern void spar_add_rgc_vars_and_consts_from_retvals (sparp_t *sparp, SPART **retvals);
extern SPART *spar_make_wm (sparp_t *sparp, SPART *pattern, SPART **groupings, SPART *having, SPART **order, SPART *limit, SPART *offset);
-/*! Creates SPAR_REQ_TOP tree or a codegen for some special case. A macroexpansion is made before recognizing special cases. */
extern SPART *spar_make_top_or_special_case_from_wm (sparp_t *sparp, ptrlong subtype, SPART **retvals,
caddr_t retselid, SPART *wm );
extern void spar_alloc_fake_equivs_for_bindings_inv (sparp_t *sparp, SPART *binv);
-extern SPART **spar_make_sources_like_top (sparp_t *sparp, ptrlong top_subtype);
+extern SPART **spar_make_sources_like_top (sparp_t *sparp);
extern SPART *spar_make_top (sparp_t *sparp, ptrlong subtype, SPART **retvals,
caddr_t retselid, SPART *pattern, SPART **groupings, SPART *having, SPART **order, SPART *limit, SPART *offset);
extern SPART *spar_make_plain_triple (sparp_t *sparp, SPART *graph, SPART *subject, SPART *predicate, SPART *object, caddr_t qm_iri_or_pair, SPART **options);
extern SPART *spar_make_param_or_variable (sparp_t *sparp, caddr_t name);
extern SPART *spar_make_variable (sparp_t *sparp, caddr_t name);
-extern SPART *spar_make_macropu (sparp_t *sparp, caddr_t name, ptrlong pos);
extern SPART *spar_make_blank_node (sparp_t *sparp, caddr_t name, int bracketed);
extern SPART *spar_make_fake_blank_node (sparp_t *sparp); /*!< Not for use in real parse trees! */
extern SPART *spar_make_typed_literal (sparp_t *sparp, caddr_t strg, caddr_t type, caddr_t lang);
extern void sparp_make_and_push_new_graph_source (sparp_t *sparp, ptrlong subtype, SPART *iri_expn, SPART **options);
extern SPART *sparp_make_graph_precode (sparp_t *sparp, ptrlong subtype, SPART *iriref, SPART **options);
-extern SPART *spar_default_sparul_target (sparp_t *sparp, const char *clause_type, int may_return_null);
+extern SPART *spar_default_sparul_target (sparp_t *sparp, const char *clause_type);
extern SPART *spar_make_regex_or_like_or_eq (sparp_t *sparp, SPART *strg, SPART *regexpn);
extern void spar_verify_funcall_security (sparp_t *sparp, ccaddr_t fname, SPART **args);
extern SPART *spar_make_funcall (sparp_t *sparp, int aggregate_mode, const char *funname, SPART **arguments);
-extern SPART *sparp_make_builtin_call (sparp_t *sparp, ptrlong bif_id, SPART **arguments);
-extern SPART *sparp_make_macro_call (sparp_t *sparp, caddr_t funname, int call_is_explicit, SPART **arguments);
-extern int sparp_namesake_macro_param (sparp_t *sparp, SPART *dm, caddr_t param_name);
-extern SPART *spar_make_sparul_clear (sparp_t *sparp, SPART *graph_precode, int silent);
-extern SPART *spar_make_sparul_load (sparp_t *sparp, SPART *graph_precode, SPART *src_precode, int silent);
+extern SPART *spar_make_sparul_clear (sparp_t *sparp, SPART *graph_precode);
+extern SPART *spar_make_sparul_load (sparp_t *sparp, SPART *graph_precode, SPART *src_precode);
extern SPART *spar_make_sparul_create (sparp_t *sparp, SPART *graph_precode, int silent);
extern SPART *spar_make_sparul_drop (sparp_t *sparp, SPART *graph_precode, int silent);
-extern SPART *spar_make_sparul_copymoveadd (sparp_t *sparp, ptrlong opcode, SPART *from_graph_precode, SPART *to_graph_precode, int silent);
-
extern SPART *spar_make_topmost_sparul_sql (sparp_t *sparp, SPART **actions);
extern SPART *spar_make_fake_action_solution (sparp_t *sparp);
-extern SPART *spar_make_drop_macro_lib (sparp_t *sparp, SPART *sml_precode, int silent);
-
-/*! Do nothing or macroexpand something locally or alters values by spar_macroprocess_treelist. Returns new version of \c trees, destroying and/or reusing the original */
-extern SPART **spar_macroprocess_define_list (sparp_t *sparp, SPART **trees, spar_mproc_ctx_t *ctx);
-/*! Do nothing or macroexpand something locally or alters the whole list by inserting new items (if an item is expanded into list). Returns new version of \c trees, destroying and/or reusing the original */
-extern SPART **spar_macroprocess_treelist (sparp_t *sparp, SPART **trees, int begin_with, spar_mproc_ctx_t *ctx);
-extern SPART *spar_macroprocess_tree (sparp_t *sparp, SPART *tree, spar_mproc_ctx_t *ctx);
extern void spar_fill_lexem_bufs (sparp_t *sparp);
extern void spar_copy_lexem_bufs (sparp_t *tgt_sparp, spar_lexbmk_t *begin, spar_lexbmk_t *end, int skip_last_n);
diff --git a/libsrc/Wi/sparql.sql b/libsrc/Wi/sparql.sql
index b114497..f79ec22 100644
--- a/libsrc/Wi/sparql.sql
+++ b/libsrc/Wi/sparql.sql
@@ -1,10 +1,10 @@
--
--- $Id: sparql.sql,v 1.205.2.146 2012/03/15 12:00:39 source Exp $
+-- $Id: sparql.sql,v 1.205.2.113 2011/10/28 23:22:36 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -182,19 +182,19 @@ create table DB.DBA.RDF_QUAD_DELETE_QUEUE (
)
;
-create table DB.DBA.SYS_IDONLY_EMPTY
+create table DB.DBA.SYS_FAKE_0
(
ID integer not null primary key
)
;
-create table DB.DBA.SYS_IDONLY_ONE
+create table DB.DBA.SYS_FAKE_1
(
ID integer not null primary key
)
;
-insert soft DB.DBA.SYS_IDONLY_ONE (ID) values (0)
+insert soft DB.DBA.SYS_FAKE_1 (ID) values (0)
;
sequence_set ('RDF_URL_IID_NAMED', 1000000, 1)
@@ -949,7 +949,7 @@ create function rdf_geo_add (in v any)
insert into rdf_obj (ro_id, ro_val, ro_long, ro_dt_and_lang)
values (id, h, ser, 0hex1000101);
if (1 = sys_stat ('cl_run_local_only'))
- geo_insert ('DB.DBA.RDF_GEO', g, id);
+ geo_insert ('DB.DBA.RDF_GEO', g, id);
else
cl_rdf_geo_insert (id, g);
rdf_box_set_ro_id (v, id);
@@ -1302,7 +1302,6 @@ create function DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL (in v any) returns any
create function DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL_FT (in v any, in g_iid IRI_ID, in p_iid IRI_ID, in ro_id_dict any := null) returns any
{
declare t int;
- -- dbg_obj_princ ('DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL_FT (', v, g_iid, p_iid, ro_id_dict, ')');
t := __tag (v);
if (not (t in (126, __tag of varchar, 217, __tag of nvarchar, __tag of XML, __tag of rdf_box)))
return v;
@@ -1330,7 +1329,6 @@ create function DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL_FT (in v any, in g_iid IRI_ID, in
create function DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL (in v any, in dt_iid IRI_ID, in lang varchar) returns any
{
declare t, dt_twobyte, lang_twobyte int;
- -- dbg_obj_princ ('DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL (', v, dt_iid, lang, ')');
retry_unrdf:
t := __tag (v);
if (not (t in (126, __tag of varchar, 217, __tag of nvarchar, __tag of XML)))
@@ -1355,7 +1353,6 @@ retry_unrdf:
lang_twobyte := DB.DBA.RDF_TWOBYTE_OF_LANGUAGE (lang);
else
lang_twobyte := 257;
- -- dbg_obj_princ ('DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL (', v, dt_iid, lang, ') calls DB.DBA.RDF_OBJ_ADD (', dt_twobyte, v, lang_twobyte, ')');
return DB.DBA.RDF_OBJ_ADD (dt_twobyte, v, lang_twobyte);
}
;
@@ -1408,7 +1405,6 @@ retry_unrdf:
create function DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL_STRINGS (
in o_val any, in o_type varchar, in o_lang varchar ) returns any
{
- -- dbg_obj_princ ('DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL_STRINGS (', o_val, o_type, o_lang, ')');
if (__tag (o_type) in (__tag of varchar, 217))
{
declare parsed any;
@@ -1425,8 +1421,8 @@ create function DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL_STRINGS (
if (256 = rdf_box_type (parsed))
db..rdf_geo_add (parsed);
else
- rdf_box_set_type (parsed,
- DB.DBA.RDF_TWOBYTE_OF_DATATYPE (iri_to_id (o_type)));
+ rdf_box_set_type (parsed,
+ DB.DBA.RDF_TWOBYTE_OF_DATATYPE (iri_to_id (o_type)));
parsed := DB.DBA.RDF_OBJ_ADD (257, parsed, 257, null);
}
return parsed;
@@ -1461,11 +1457,9 @@ create function DB.DBA.RDF_DATATYPE_OF_OBJ (in shortobj any, in dflt varchar :=
return null;
if (isstring (shortobj) and bit_and (__box_flags (shortobj), 1))
return null;
- -- dbg_obj_princ ('DB.DBA.RDF_DATATYPE_OF_OBJ (', shortobj, ') will return ', __xsd_type (shortobj, dflt), ' for non-rdfbox');
return iri_to_id (__xsd_type (shortobj, dflt));
}
twobyte := rdf_box_type (shortobj);
- -- dbg_obj_princ ('DB.DBA.RDF_DATATYPE_OF_OBJ (', shortobj, ') found twobyte ', twobyte);
if (257 = twobyte)
return case (rdf_box_lang (shortobj)) when 257 then iri_to_id (dflt) else null end;
whenever not found goto badtype;
@@ -1488,11 +1482,9 @@ create function DB.DBA.RDF_LANGUAGE_OF_OBJ (in shortobj any, in dflt varchar :=
return null;
if (isstring (shortobj) and bit_and (__box_flags (shortobj), 1))
return null;
- -- dbg_obj_princ ('DB.DBA.RDF_LANGUAGE_OF_OBJ (', shortobj, ') got a non-rdfbox');
return dflt;
}
twobyte := rdf_box_lang (shortobj);
- -- dbg_obj_princ ('DB.DBA.RDF_LANGUAGE_OF_OBJ (', shortobj, ') found twobyte ', twobyte);
if (257 = twobyte)
return dflt;
whenever not found goto badtype;
@@ -1563,14 +1555,9 @@ create function DB.DBA.RDF_OBJ_OF_LONG (in longobj any) returns any
t := __tag (longobj);
if (__tag of rdf_box <> t)
{
- if (not (t in (__tag of varchar, 126, 217, __tag of nvarchar, 133, 226)))
- return longobj;
- if (t = 133)
- {
- longobj := cast (longobj as nvarchar);
- t := __tag (longobj);
- }
- if (__tag of nvarchar = t or t = 226)
+ if (not (t in (__tag of varchar, 126, 217, __tag of nvarchar)))
+ return longobj;
+ if (__tag of nvarchar = t)
longobj := charset_recode (longobj, '_WIDE_', 'UTF-8');
else if (t in (126, 217))
longobj := cast (longobj as varchar);
@@ -1615,7 +1602,7 @@ create function DB.DBA.RDF_OBJ_OF_SQLVAL (in v any) returns any
{
if (__tag of rdf_box = __tag(v) and 0 = rdf_box_ro_id (v))
return DB.DBA.RDF_OBJ_ADD (257, v, 257);
- return v;
+ return v;
}
if (__tag of nvarchar = t)
v := charset_recode (v, '_WIDE_', 'UTF-8');
@@ -1798,6 +1785,26 @@ badtype:
}
;
+create function DB.DBA.RDF_LANGUAGE_OF_LONG (in longobj any, in dflt varchar := '') returns any
+{
+ if (__tag of rdf_box = __tag (longobj))
+ {
+ declare twobyte integer;
+ declare res varchar;
+ twobyte := rdf_box_lang (longobj);
+ if (257 = twobyte)
+ return dflt;
+ whenever not found goto badlang;
+ select lower (RL_ID) into res from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = twobyte;
+ return res;
+
+badlang:
+ signal ('RDFXX', sprintf ('Unknown language in DB.DBA.RDF_LANGUAGE_OF_LONG, bad id %d', twobyte));
+ }
+ return case (isiri_id (longobj)) when 0 then dflt else null end;
+}
+;
+
create function DB.DBA.RDF_STRSQLVAL_OF_LONG (in longobj any) -- DEPRECATED
{
return __rdf_strsqlval (longobj, 0);
@@ -2176,189 +2183,6 @@ create function DB.DBA.__not (in e1 any) returns integer
}
;
------
--- SPARQL 1.1 built-in functions, implemented as stored procedures
-
-create function DB.DBA.rdf_strdt_impl (in str varchar, in dt_iri any)
-{
- declare dt_iid IRI_ID;
- declare parsed any;
- dt_iid := __i2id (dt_iri);
- if (dt_iid is null)
- signal ('22007', 'Function rdf_strdt_impl needs a valid datatype IRI as its second argument');
- if (__tag of IRI_ID = __tag (dt_iri))
- dt_iri := __id2i (dt_iri);
- parsed := __xqf_str_parse_to_rdf_box (str, dt_iri, isstring (str));
- if (parsed is not null)
- {
- if (__tag of rdf_box = __tag (parsed))
- rdf_box_set_type (parsed,
- DB.DBA.RDF_TWOBYTE_OF_DATATYPE (dt_iid));
- return parsed;
- }
- return DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (str, dt_iid, null);
-}
-;
-
-create function DB.DBA.rdf_strlang_impl (in str varchar, in lang any)
-{
-
- lang := cast (lang as varchar);
- if ((lang is null) or (regexp_match ('^(([a-z][a-z](-[A-Z][A-Z])?)|(x-[A-Za-z0-9]+))\044', lang) is null))
- signal ('22007', 'Function rdf_strlang_impl needs a valid language ID as its second argument');
- return DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (str, null, cast (lang as varchar));
-}
-;
-
---!AWK PUBLIC
-create function DB.DBA.rdf_replace_impl (in src varchar, in needle varchar, in rpl varchar, in opts varchar := '')
-{
- declare src_tag, needle_tag, rpl_tag integer;
- declare res varchar;
- src_tag := __tag (src);
- needle_tag := __tag (needle);
- rpl_tag := __tag (rpl);
- if (__tag of rdf_box = src_tag)
- {
- src := rdf_box_data (src);
- src_tag := __tag (src);
- }
- if (__tag of rdf_box = needle_tag)
- {
- needle := rdf_box_data (needle);
- needle_tag := __tag (needle);
- }
- if (__tag of rdf_box = rpl_tag)
- {
- rpl := rdf_box_data (rpl);
- rpl_tag := __tag (rpl);
- }
- if (__tag of nvarchar = src_tag)
- src := charset_recode (src, '_WIDE_', '_UTF8_');
- else if (__tag of varchar <> src_tag)
- src := cast (src as varchar);
- if (__tag of nvarchar = needle_tag)
- needle := charset_recode (needle, '_WIDE_', '_UTF8_');
- else if (__tag of varchar <> needle_tag)
- needle := cast (needle as varchar);
- if (__tag of nvarchar = rpl_tag)
- rpl := charset_recode (rpl, '_WIDE_', '_UTF8_');
- else if (__tag of varchar <> rpl_tag)
- rpl := cast (rpl as varchar);
- if (__tag of varchar <> __tag (opts))
- opts := cast (opts as varchar);
- if (opts is null)
- opts := '';
- if (src is null or needle is null or rpl is null)
- return null;
- if ('' = needle)
- return src;
- if (regexp_match ('^[^()|+?.:^\044\\\\\\[\\]-]+\044', needle, 0, 'u') is not null and strchr (rpl, '\044') is null and strchr (rpl, 92) is null)
- {
- if ('' = opts)
- {
- res := replace (src, needle, rpl);
- __box_flags_set (res, 2);
- return res;
- }
- if (opts in ('i', 'I'))
- {
- declare src_lc varchar;
- declare hit, needle_len integer;
- declare ses any;
- src_lc := lcase (src);
- needle := lcase (needle);
- hit := strstr (src_lc, needle);
- if (hit is null)
- {
- res := src;
- __box_flags_set (res, 2);
- return res;
- }
- ses := string_output();
- needle_len := length (needle);
- while (hit is not null)
- {
- http (subseq (src, 0, hit), ses);
- http (rpl, ses);
- src := subseq (src, hit + needle_len);
- src_lc := subseq (src_lc, hit + needle_len);
- hit := strstr (src_lc, needle);
- }
- http (src, ses);
- res := string_output_string (ses);
- __box_flags_set (res, 2);
- return res;
- }
- }
- if (strchr (opts, 'u') is null and strchr (opts, 'U') is null)
- opts := opts || 'u';
- res := regexp_xfn_replace (src, needle, rpl, 0, null, opts);
- __box_flags_set (res, 2);
- return res;
-}
-;
-
---!AWK PUBLIC
-create function DB.DBA.regexp_xfn_replace (in src varchar, in needle varchar, in tmpl varchar, in search_begin_pos integer, in hit_max_count integer, in opts varchar)
-{
- declare hit_list any;
- if (0 = length (src))
- return '';
- if (regexp_parse (needle, '', 0, opts) is not null)
- signal ('22023', 'The regex-based XPATH/XQuery/SPARQL replace() function can not search for a pattern that can be found even in an empty string');
- hit_list := regexp_parse_list (needle, src, search_begin_pos, opts, coalesce (hit_max_count, 2097152));
- return regexp_replace_hits_with_template (src, tmpl, hit_list, 1);
-}
-;
-
-
---!AWK PUBLIC
-create function DB.DBA.rdf_timezone_impl (in dt datetime)
-{
- declare minutes integer;
- declare sign, str varchar;
- minutes := timezone (dt);
- if (minutes is null)
- signal ('22007', 'Function rdf_timezone_impl needs a datetime with some timezone set as its argument');
- if (minutes < 0)
- {
- sign := '-';
- minutes := -minutes;
- }
- else
- sign := '';
- if (mod (minutes, 60))
- str := sprintf ('%sPT%dH%dM', sign, minutes / 60, mod (minutes, 60));
- else if (minutes = 0)
- str := 'PT0S';
- else
- str := sprintf ('%sPT%dH', sign, minutes / 60);
- return DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (str, __i2id (UNAME'http://www.w3.org/2001/XMLSchema#dayTimeDuration'), null);
-}
-;
-
---!AWK PUBLIC
-create function DB.DBA.rdf_tz_impl (in dt datetime)
-{
- declare minutes integer;
- declare sign varchar;
- minutes := timezone (dt);
- if (minutes is null)
- return '';
- if (minutes = 0)
- return 'Z';
- if (minutes < 0)
- {
- sign := '-';
- minutes := -minutes;
- }
- else
- sign := '';
- return sprintf ('%s%02d:%02d', sign, minutes / 60, mod (minutes, 60));
-}
-;
-
-----
-- Data loading
@@ -2449,16 +2273,11 @@ create procedure DB.DBA.RDF_QUAD_L_RDB2RDF (in g_iid varchar, in s_iid varchar,
t := __tag (o_val);
if (__tag of rdf_box <> t)
{
- if (not (t in (__tag of varchar, 126, 133, 217, __tag of nvarchar, 226)))
+ if (not (t in (__tag of varchar, 126, 217, __tag of nvarchar)))
{
goto o_val_done;
}
- if (t = 133)
- {
- o_val := cast (o_val as nvarchar);
- t := __tag (o_val);
- }
- if (__tag of nvarchar = t or t = 226)
+ if (__tag of nvarchar = t)
o_val := charset_recode (o_val, '_WIDE_', 'UTF-8');
else if (t in (126, 217))
o_val := cast (o_val as varchar);
@@ -2793,12 +2612,12 @@ create procedure DB.DBA.RDF_VALIDATE_RDFXML (in strg varchar, in base varchar, i
declare app_env any;
declare old_log_mode int;
if (graph = '')
- signal ('22023', 'Empty string is not a valid graph IRI in DB.DBA.RDF_VALIDATE_RDFXML()');
+ signal ('22023', 'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFXML()');
else if (graph is null)
{
graph := base;
if ((graph is null) or (graph = ''))
- signal ('22023', 'DB.DBA.RDF_VALIDATE_RDFXML() requires a valid IRI as a base argument if graph is not specified');
+ signal ('22023', 'DB.DBA.RDF_LOAD_RDFXML() requires a valid IRI as a base argument if graph is not specified');
}
rdf_load_rdfxml (strg, 0, graph, vector ( '', '', '', '', '', '', '' ), app_env, base );
return graph;
@@ -2840,70 +2659,21 @@ create procedure DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L (
inout o_val any, inout o_type varchar, inout o_lang varchar,
inout app_env any )
{
+ if (not isstring (o_type))
+ o_type := null;
+ if (not isstring (o_lang))
+ o_lang := null;
dict_put (app_env,
vector (
iri_to_id (s_uri),
iri_to_id (p_uri),
DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (o_val,
- case when (isstring (o_type) or __tag (o_type) = 217) then o_type else null end,
- case when (isstring (o_lang) or __tag (o_lang) = 217) then o_lang else null end) ),
+ case (isstring (o_type)) when 0 then null else o_type end,
+ case (isstring (o_lang)) when 0 then null else o_lang end) ),
0 );
}
;
-create procedure DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_XLAT (
- inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,
- inout o_uri varchar,
- inout app_env any )
-{
-
- declare xlat_cbk, s_xlat, o_xlat varchar;
- declare xlat_env, dict any;
- -- dbg_obj_princ (current_proc_name (), ' (', g_iid, s_uri, p_uri, o_uri, ');');
- dict := app_env[0];
- xlat_cbk := app_env[1];
- xlat_env := app_env[2];
- if (__proc_params_num (xlat_cbk) = 2)
- {
- s_xlat := call(xlat_cbk)(s_uri, xlat_env);
- o_xlat := call(xlat_cbk)(o_uri, xlat_env);
- }
- else
- {
- s_xlat := call(xlat_cbk)(s_uri, p_uri, 's', xlat_env);
- o_xlat := call(xlat_cbk)(o_uri, p_uri, 'o', xlat_env);
- }
-
- dict_put (dict, vector (iri_to_id (s_xlat), iri_to_id (p_uri), iri_to_id (o_xlat)), 0);
-}
-;
-
-create procedure DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L_XLAT (
- inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,
- inout o_val any, inout o_type varchar, inout o_lang varchar,
- inout app_env any )
-{
- declare xlat_cbk, s_xlat, o_xlat varchar;
- declare xlat_env, dict any;
- -- dbg_obj_princ (current_proc_name (),' (', g_iid, s_uri, p_uri, o_uri, ');');
- dict := app_env[0];
- xlat_cbk := app_env[1];
- xlat_env := app_env[2];
- if (__proc_params_num (xlat_cbk) = 2)
- s_xlat := call(xlat_cbk)(s_uri, xlat_env);
- else
- s_xlat := call(xlat_cbk)(s_uri, p_uri, 's', xlat_env);
- dict_put (dict,
- vector (
- iri_to_id (s_xlat),
- iri_to_id (p_uri),
- DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (o_val,
- case when (isstring (o_type) or __tag (o_type) = 217) then o_type else null end,
- case when (isstring (o_lang) or __tag (o_lang) = 217) then o_lang else null end) ),
- 0);
-}
-;
-
create function DB.DBA.RDF_TTL2HASH (in strg varchar, in base varchar, in graph varchar := null, in flags integer := 0) returns any
{
declare res any;
@@ -2925,26 +2695,6 @@ create function DB.DBA.RDF_TTL2HASH (in strg varchar, in base varchar, in graph
}
;
-create function DB.DBA.RDF_TTL_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, in dict any, in flags integer := 0) returns any
-{
- if (__tag (dict) <> 214)
- signal ('22023', 'RDFXX', 'The dict argument must be of type dictionary');
- if (126 = __tag (strg))
- strg := cast (strg as varchar);
- rdf_load_turtle (strg, base, graph, flags,
- vector (
- 'DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH',
- 'DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK',
- 'DB.DBA.RDF_TTL2HASH_EXEC_GET_IID',
- 'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE',
- 'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L',
- '',
- 'DB.DBA.TTLP_EV_REPORT_DEFAULT' ),
- dict);
- return;
-}
-;
-
create procedure DB.DBA.RDF_TTL2SQLHASH_EXEC_GET_IID (inout uri varchar, inout g_iid IRI_ID, inout app_env any, inout res IRI_ID) {
-- dbg_obj_princ ('DB.DBA.RDF_TTL2SQLHASH_EXEC_GET_IID (', uri, g_iid, app_env, ')');
res := __bft (uri, 1);
@@ -3007,18 +2757,18 @@ create function DB.DBA.RDF_TTL2SQLHASH (in strg varchar, in base varchar, in gra
}
;
-create procedure DB.DBA.RDF_LOAD_RDFXML_IMPL (inout strg varchar, in base varchar, in graph varchar,
- in parse_mode integer, in log_enable int := null, in transactional int := 0)
+create procedure DB.DBA.RDF_LOAD_RDFXML (in strg varchar, in base varchar, in graph varchar,
+ in log_enable int := null, in transactional int := 0)
{
declare app_env any;
declare old_log_mode int;
if (graph = '')
- signal ('22023', 'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFXML() and the like');
+ signal ('22023', 'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFXML()');
else if (graph is null)
{
graph := base;
if ((graph is null) or (graph = ''))
- signal ('22023', 'DB.DBA.RDF_LOAD_RDFXML() and similar functions require a valid IRI as a base argument if graph is not specified');
+ signal ('22023', 'DB.DBA.RDF_LOAD_RDFXML() requires a valid IRI as a base argument if graph is not specified');
}
old_log_mode := null;
if (transactional = 0)
@@ -3031,13 +2781,13 @@ create procedure DB.DBA.RDF_LOAD_RDFXML_IMPL (inout strg varchar, in base varcha
old_log_mode := log_enable (log_enable, 1);
}
if (1 <> sys_stat ('cl_run_local_only'))
- return DB.DBA.RDF_LOAD_RDFXML_CL (strg, base, graph, parse_mode);
+ return rdf_load_rdfxml_cl (strg, base, graph);
app_env := vector (
null,
null,
__max (length (strg) / 100, 100000),
null );
- rdf_load_rdfxml (strg, parse_mode,
+ rdf_load_rdfxml (strg, 0,
graph,
vector (
'DB.DBA.TTLP_EV_NEW_GRAPH',
@@ -3055,14 +2805,6 @@ create procedure DB.DBA.RDF_LOAD_RDFXML_IMPL (inout strg varchar, in base varcha
}
;
-create procedure DB.DBA.RDF_LOAD_RDFXML (in strg varchar, in base varchar, in graph varchar := null,
- in xml_parse_mode integer := 0, in log_enable int := null, in transactional int := 0 )
-{
- return DB.DBA.RDF_LOAD_RDFXML_IMPL (strg, base, graph, bit_shift (xml_parse_mode, 8), log_enable, transactional);
-}
-;
-
-
create procedure DB.DBA.RDF_RDFXML_TO_DICT (in strg varchar, in base varchar, in graph varchar := null)
{
declare res any;
@@ -3083,53 +2825,11 @@ create procedure DB.DBA.RDF_RDFXML_TO_DICT (in strg varchar, in base varchar, in
}
;
-create procedure DB.DBA.RDF_RDFXML_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, inout dict any, in flag int := 0, in xml_parse_mode int := 0)
-{
- if (__tag (dict) <> 214)
- signal ('22023', 'RDFXX', 'The dict argument must be of type dictionary');
- if (flag = 0)
- xml_parse_mode := 0;
- rdf_load_rdfxml (strg, bit_or (flag, bit_shift (xml_parse_mode, 8)), -- 0 rdfxml, 2 rdfa
- graph,
- vector (
- 'DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH',
- 'DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK',
- 'DB.DBA.RDF_TTL2HASH_EXEC_GET_IID',
- 'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE',
- 'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L',
- '',
- 'DB.DBA.TTLP_EV_REPORT_DEFAULT' ),
- dict,
- base );
-}
-;
-
-create procedure DB.DBA.RDFA_LOAD_DICT_XLAT (in strg varchar, in base varchar, in graph varchar, inout dict any, in xml_parse_mode int := 0, in iri_xlate_cbk varchar, in iri_xlate_env any)
-{
- declare app_env any;
- if (__tag (dict) <> 214)
- signal ('22023', 'RDFXX', 'The dict argument must be of type dictionary');
- rdf_load_rdfxml (strg, bit_or (2, bit_shift (xml_parse_mode, 8)), -- 0 rdfxml, 2 rdfa
- graph,
- vector (
- 'DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH',
- 'DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK',
- 'DB.DBA.RDF_TTL2HASH_EXEC_GET_IID',
- 'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_XLAT',
- 'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L_XLAT',
- '',
- 'DB.DBA.TTLP_EV_REPORT_DEFAULT' ),
- vector (dict, iri_xlate_cbk, iri_xlate_env),
- base );
-}
-;
-
-
create procedure DB.DBA.RDF_RDFA11_FETCH_PROFILES (in profile_iris any, inout prefixes any, inout terms any, inout vocab any)
{
declare agg any;
- -- dbg_obj_princ ('DB.DBA.RDF_RDFA11_FETCH_PROFILES (', profile_iris, ')');
+ --dbg_obj_princ ('DB.DBA.RDF_RDFA11_FETCH_PROFILES (', profile_iris, ')');
foreach (varchar profile_iri in profile_iris) do
{
if (not exists (sparql define input:storage "" ask where { graph `iri(?:profile_iri)` { ?s ?p ?o }}))
@@ -3187,20 +2887,49 @@ create procedure DB.DBA.RDF_RDFA11_FETCH_PROFILES (in profile_iris any, inout pr
goto vocab_is_set;
}
vocab_is_set: ;
- -- dbg_obj_princ ('DB.DBA.RDF_RDFA11_FETCH_PROFILES (', profile_iris, ' returned ', prefixes, terms, vocab);
+ --dbg_obj_princ ('DB.DBA.RDF_RDFA11_FETCH_PROFILES (', profile_iris, ' returned ', prefixes, terms, vocab);
}
;
-create procedure DB.DBA.RDF_LOAD_RDFA (in strg varchar, in base varchar, in graph varchar := null,
- in xml_parse_mode integer := 0, in log_enable int := null, in transactional int := 0 )
+create procedure DB.DBA.RDF_LOAD_RDFA (in strg varchar, in base varchar, in graph varchar := null, in xml_parse_mode integer := 0)
{
- return DB.DBA.RDF_LOAD_RDFXML_IMPL (strg, base, graph, bit_or (2, bit_shift (xml_parse_mode, 8)), log_enable, transactional);
+ declare app_env any;
+ if (graph = '')
+ signal ('22023', 'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFA()');
+ else if (graph is null)
+ {
+ graph := base;
+ if ((graph is null) or (graph = ''))
+ signal ('22023', 'DB.DBA.RDF_LOAD_RDFA() requires a valid IRI as a base argument if graph is not specified');
+ }
+ if (1 <> sys_stat ('cl_run_local_only'))
+ return DB.DBA.RDF_LOAD_RDFA_CL (strg, base, graph, xml_parse_mode);
+ app_env := vector (
+ null,
+ null,
+ __max (length (strg) / 100, 100000),
+ null );
+ rdf_load_rdfxml (strg, bit_or (2, bit_shift (xml_parse_mode, 8)),
+ graph,
+ vector (
+ 'DB.DBA.TTLP_EV_NEW_GRAPH',
+ 'DB.DBA.TTLP_EV_NEW_BLANK',
+ 'DB.DBA.TTLP_EV_GET_IID',
+ 'DB.DBA.TTLP_EV_TRIPLE',
+ 'DB.DBA.TTLP_EV_TRIPLE_L',
+ 'DB.DBA.TTLP_EV_COMMIT',
+ 'DB.DBA.TTLP_EV_REPORT_DEFAULT' ),
+ app_env,
+ base );
+ if (__rdf_graph_is_in_enabled_repl (iri_to_id (graph)))
+ repl_text ('__rdf_repl', '__rdf_repl_flush_queue ()');
+ return graph;
}
;
create procedure DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION (in strg varchar, in base varchar, in graph varchar, in xml_parse_mode integer,
- in iri_xlate_cbk varchar, in iri_xlate_env any)
+ in iri_xlate_cbk varchar, in iri_xlate_env any )
{
declare app_env any;
if (graph = '')
@@ -3258,13 +2987,6 @@ create procedure DB.DBA.RDF_RDFA_TO_DICT (in strg varchar, in base varchar, in g
}
;
-create procedure DB.DBA.RDF_LOAD_XHTML_MICRODATA (in strg varchar, in base varchar, in graph varchar := null,
- in xml_parse_mode integer := 1, in log_enable int := null, in transactional int := 0 )
-{
- return DB.DBA.RDF_LOAD_RDFXML_IMPL (strg, base, graph, bit_or (4, bit_shift (xml_parse_mode, 8)), log_enable, transactional);
-}
-;
-
-----
-- Fast rewriting from serialization to serialization without storing
@@ -3528,15 +3250,6 @@ create procedure DB.DBA.RDF_LONG_TO_TTL (inout obj any, inout ses any)
}
;
---
--- For VOS only
---
-create procedure DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (inout triples any)
-{
- return;
-}
-;
-
create procedure DB.DBA.RDF_TRIPLES_TO_VERBOSE_TTL (inout triples any, inout ses any)
{
@@ -3587,7 +3300,6 @@ create procedure DB.DBA.RDF_TRIPLES_TO_VERBOSE_TTL (inout triples any, inout ses
rowvector_digit_sort (triples, 1, 1);
if (not string_subjs_found)
rowvector_digit_sort (triples, 0, 1);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
prev_s := null;
prev_p := null;
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
@@ -3690,7 +3402,6 @@ end_pred_sort: ;
rowvector_subj_sort (triples, 0, 1);
end_subj_sort: ;
}
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
http_ttl_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);
@@ -3699,73 +3410,6 @@ end_subj_sort: ;
}
;
-create procedure DB.DBA.RDF_TRIPLES_TO_TRIG (inout triples any, inout ses any)
-{
- declare env any;
- declare tcount, tctr, first_dflt_g_idx integer;
- declare prev_g_iri varchar;
- declare first_g_idx integer;
- tcount := length (triples);
- if (0 = tcount)
- {
- http ('# Empty TriG\n', ses);
- return;
- }
- env := vector (dict_new (__min (tcount, 16000)), 0, '', '', '', 0, 0, 0, 0);
- { whenever sqlstate '*' goto end_pred_sort;
- rowvector_subj_sort (triples, 1, 1);
-end_pred_sort: ;
- }
- { whenever sqlstate '*' goto end_subj_sort;
- rowvector_subj_sort (triples, 0, 1);
-end_subj_sort: ;
- }
- rowvector_graph_sort (triples, 3, 1);
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_TRIG after sort:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) dbg_obj_princ (triples[tctr]);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
- for (tctr := 0; (tctr < tcount) and aref_or_default (triples, tctr, 3, null) is null; tctr := tctr + 1)
- {
- http_ttl_prefixes (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);
- }
- first_g_idx := tctr;
- for (tctr := first_g_idx; tctr < tcount; tctr := tctr + 1)
- {
- http_ttl_prefixes (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);
- }
- if (0 < first_g_idx)
- {
- http ('{\n', ses);
- for (tctr := 0; tctr < first_g_idx; tctr := tctr + 1)
- {
- http_ttl_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);
- }
- http (' .\n}\n', ses);
- }
- prev_g_iri := '';
- for (tctr := first_g_idx; tctr < tcount; tctr := tctr + 1)
- {
- declare g_iri varchar;
- g_iri := id_to_iri_nosignal (triples[tctr][3]);
- if (g_iri is not null)
- {
- if (g_iri <> prev_g_iri)
- {
- if (prev_g_iri <> '')
- http (' .\n}\n', ses);
- env[1] := 0;
- http ('<', ses);
- http_escape (g_iri, 12, ses, 1, 1);
- http ('> = {\n', ses);
- prev_g_iri := g_iri;
- }
- http_ttl_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);
- }
- }
- if (prev_g_iri <> '')
- http (' .\n}\n', ses);
-}
-;
-
create procedure DB.DBA.RDF_TRIPLES_TO_NT (inout triples any, inout ses any)
{
declare env any;
@@ -3778,7 +3422,6 @@ create procedure DB.DBA.RDF_TRIPLES_TO_NT (inout triples any, inout ses any)
return;
}
env := vector (0, 0, 0);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
http_nt_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);
@@ -3862,45 +3505,226 @@ print_o:
create procedure DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT (inout triples any, in print_top_level integer, inout ses any)
{
- declare ns_dict, env any;
declare tcount, tctr integer;
tcount := length (triples);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
- { whenever sqlstate '*' goto end_pred_sort;
- rowvector_subj_sort (triples, 1, 1);
-end_pred_sort: ;
- }
- ns_dict := dict_new (case (print_top_level) when 0 then 10 else __min (tcount, 16000) end);
- dict_put (ns_dict, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'rdf');
- dict_put (ns_dict, 'http://www.w3.org/2000/01/rdf-schema#', 'rdfs');
- env := vector (ns_dict, 0, 0, '', '', 0, 0, 0, 0);
if (print_top_level)
{
- http ('<?xml version="1.0" encoding="utf-8" ?>\n<rdf:RDF\n\txmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"\n\txmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"', ses);
- for (tctr := 0; tctr < tcount; tctr := tctr + 1)
- {
- http_rdfxml_p_ns (env, triples[tctr][1], ses);
- }
- http (' >', ses);
+ http ('<?xml version="1.0" encoding="utf-8" ?>\n<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" '||
+ 'xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">', ses);
}
- { whenever sqlstate '*' goto end_subj_sort;
- rowvector_subj_sort (triples, 0, 1);
-end_subj_sort: ;
- }
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
- http_rdfxml_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);
- }
- if (isstring (env[2]))
- http ('\n </rdf:Description>', ses);
- if (print_top_level)
- {
- http ('\n</rdf:RDF>', ses);
- }
-}
-;
-
---create procedure DB.DBA.TEST_SPARQL_RDF_XML_TEXT (in query varchar, in dflt_graph varchar)
+ declare subj, pred, obj any;
+ declare pred_tagname varchar;
+ declare res varchar;
+ subj := triples[tctr][0];
+ pred := triples[tctr][1];
+ obj := triples[tctr][2];
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT: subj:', subj, __tag(subj), __box_flags (subj));
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT: pred:', pred, __tag(pred), __box_flags (pred));
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT: obj:', obj, __tag(obj), __box_flags (obj));
+ http ('\n<rdf:Description', ses);
+ if (not isiri_id (subj))
+ {
+ if (isstring (subj) and (1 = __box_flags (subj)))
+ {
+ if (subj like 'nodeID://%')
+ {
+ http (' rdf:nodeID="b', ses); http_value (subseq (subj, 9), 0, ses); http ('">', ses);
+ }
+ else
+ {
+ subj := charset_recode (subj, 'UTF-8', '_WIDE_');
+ http (' rdf:about="', ses); http_value (subj, 0, ses); http ('">', ses);
+ }
+ }
+ else if (subj is null)
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): subject is NULL');
+ else
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): subject is literal');
+ }
+ else if (subj >= min_bnode_iri_id ())
+ http (sprintf (' rdf:nodeID="b%d">', iri_id_num (subj)), ses);
+ else
+ {
+ res := id_to_iri (subj);
+-- res := coalesce ((select RU_QNAME from DB.DBA.RDF_URL where RU_IID = subj));
+ res := charset_recode (res, 'UTF-8', '_WIDE_');
+ http (' rdf:about="', ses); http_value (res, 0, ses); http ('">', ses);
+ }
+ if (not isiri_id (pred))
+ {
+ if (isstring (pred) and (1 = __box_flags (pred)))
+ {
+ if (pred like 'nodeID://%')
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): blank node as predicate');
+ res := pred;
+ goto res_for_pred;
+ }
+ else if (pred is null)
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): predicate is NULL');
+ else
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): predicate is literal');
+ }
+ if (pred >= min_bnode_iri_id ())
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): blank node as predicate');
+ res := id_to_iri (pred);
+res_for_pred:
+ declare delim, delim1, delim2, delim3, delim4 integer;
+ delim1 := coalesce (strrchr (res, '/'), -1);
+ delim2 := coalesce (strrchr (res, '#'), -1);
+ delim3 := coalesce (strrchr (res, ':'), -1);
+ delim4 := coalesce (strrchr (res, '%'), -1);
+ if (delim4 > 0 and delim4 < (length (res) - 2))
+ delim4 := delim4 + 2;
+ delim := __max (delim1, delim2, delim3, delim4);
+ if (delim < 0)
+ delim := null;
+ if (delim is null)
+ {
+ pred_tagname := res;
+ http ('<', ses); http (pred_tagname, ses);
+ }
+ else
+ {
+ declare p_ns_uri, p_ns_pref varchar;
+ p_ns_uri := subseq (res, 0, delim+1);
+ if (p_ns_uri = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#')
+ {
+ pred_tagname := 'rdf:' || subseq (res, delim+1);
+ http ('<', ses); http (pred_tagname, ses);
+ }
+ else if (p_ns_uri = 'http://www.w3.org/2000/01/rdf-schema#')
+ {
+ pred_tagname := 'rdfs:' || subseq (res, delim+1);
+ http ('<', ses); http (pred_tagname, ses);
+ }
+ else
+ {
+ p_ns_pref := coalesce (__xml_get_ns_prefix (p_ns_uri, 3), 'n0pred');
+ pred_tagname := p_ns_pref || ':' || subseq (res, delim+1);
+ http ('<', ses); http (pred_tagname, ses);
+ http (' xmlns:' || p_ns_pref || '="', ses); http_value (p_ns_uri, 0, ses); http ('"', ses);
+ }
+ }
+ if (obj is null)
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): object is NULL');
+ if (isiri_id (obj))
+ {
+ if (obj >= min_bnode_iri_id ())
+ http (sprintf (' rdf:nodeID="b%d"/>', iri_id_num (obj)), ses);
+ else
+ {
+ res := coalesce (id_to_iri(obj), sprintf ('_:bad_iid_%d', iri_id_num (obj)));
+-- res := coalesce ((select RU_QNAME from DB.DBA.RDF_URL where RU_IID = obj), sprintf ('_:bad_iid_%d', iri_id_num (obj)));
+ res := charset_recode (res, 'UTF-8', '_WIDE_');
+ http (' rdf:resource="', ses); http_value (res, 0, ses); http ('"/>', ses);
+ }
+ }
+ else if (__tag of rdf_box = __tag (obj))
+ {
+ declare dat any;
+ if (257 <> rdf_box_type (obj))
+ {
+ res := coalesce ((select RDT_QNAME from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = rdf_box_type (obj)));
+ http (' rdf:datatype="', ses); http_value (res, 0, ses); http ('"', ses);
+ }
+ else if (257 <> rdf_box_lang (obj))
+ {
+ res := coalesce ((select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = rdf_box_lang (obj)));
+ http (' xml:lang="', ses); http_value (res, 0, ses); http ('"', ses);
+ }
+ dat := __rdf_sqlval_of_obj (obj, 1);
+ if (__tag of XML = __tag (dat))
+ {
+ http (' rdf:parseType="Literal">', ses);
+ http_value (dat, 0, ses);
+ http ('</', ses); http (pred_tagname, ses); http ('>', ses);
+ }
+ else if (__tag of datetime = rdf_box_data_tag (obj))
+ {
+ if (257 = rdf_box_type (obj))
+ {
+ http (' rdf:datatype="', ses);
+ http_escape (cast (__xsd_type (dat) as varchar), 12, ses, 1, 1);
+ http ('">', ses);
+ }
+ else
+ http ('>', ses);
+ __rdf_long_to_ttl (dat, ses);
+ http ('</', ses); http (pred_tagname, ses); http ('>', ses);
+ }
+ else
+ {
+ declare tmp any;
+ http ('>', ses);
+ tmp := __rdf_strsqlval (obj);
+ if (__tag of varchar = __tag (tmp))
+ tmp := charset_recode (tmp, 'UTF-8', '_WIDE_');
+ http_value (tmp, 0, ses);
+ http ('</', ses); http (pred_tagname, ses); http ('>', ses);
+ }
+ }
+ else if (__tag of varchar = __tag (obj))
+ {
+ if (1 = __box_flags (obj))
+ {
+ if (obj like 'nodeID://%')
+ {
+ http (' rdf:nodeID="b', ses); http_value (subseq (obj, 9), 0, ses); http ('"/>', ses);
+ }
+ else
+ {
+ obj := charset_recode (obj, 'UTF-8', '_WIDE_');
+ http (' rdf:resource="', ses); http_value (obj, 0, ses); http ('"/>', ses);
+ }
+ }
+ else
+ {
+ http ('>', ses);
+ obj := charset_recode (obj, 'UTF-8', '_WIDE_');
+ http_value (obj, 0, ses);
+ http ('</', ses); http (pred_tagname, ses); http ('>', ses);
+ }
+ }
+ else if (__tag of varbinary = __tag (obj))
+ {
+ http ('>', ses);
+ http_value (obj, 0, ses);
+ http ('</', ses); http (pred_tagname, ses); http ('>', ses);
+ }
+ else if (__tag of XML = __tag (obj))
+ {
+ http (' rdf:parseType="Literal">', ses);
+ http_value (obj, 0, ses);
+ http ('</', ses); http (pred_tagname, ses); http ('>', ses);
+ }
+ else if (__tag of datetime = rdf_box_data_tag (obj))
+ {
+ http (' rdf:datatype="', ses);
+ http_escape (cast (__xsd_type (obj) as varchar), 12, ses, 1, 1);
+ http ('">', ses);
+ __rdf_long_to_ttl (obj, ses);
+ http ('</', ses); http (pred_tagname, ses); http ('>', ses);
+ }
+ else
+ {
+ http (' rdf:datatype="', ses);
+ http_value (__xsd_type (obj), 0, ses);
+ http ('">', ses);
+ http_value (__rdf_strsqlval (obj), 0, ses);
+ http ('</', ses); http (pred_tagname, ses); http ('>', ses);
+ }
+ http ('</rdf:Description>', ses);
+ }
+ if (print_top_level)
+ {
+ http ('\n</rdf:RDF>', ses);
+ }
+}
+;
+
+--create procedure DB.DBA.TEST_SPARQL_RDF_XML_TEXT (in query varchar, in dflt_graph varchar)
--{
-- declare ses, rset, triples any;
-- declare txt varchar;
@@ -3928,7 +3752,6 @@ create procedure DB.DBA.RDF_TRIPLES_TO_TALIS_JSON (inout triples any, inout ses
-- No error handlers here because failed sorting by predicate or subject would result in poorly structured output.
rowvector_subj_sort (triples, 1, 1);
rowvector_subj_sort (triples, 0, 1);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
http ('{\n ', ses);
status := 0;
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
@@ -3957,8 +3780,7 @@ create procedure DB.DBA.RDF_TRIPLES_TO_JSON_LD (inout triples any, inout ses any
-- No error handlers here because failed sorting by predicate or subject would result in poorly structured output.
rowvector_subj_sort (triples, 1, 1);
rowvector_subj_sort (triples, 0, 1);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
- http ('{ "@id": [\n ', ses);
+ http ('{ "@": [\n ', ses);
status := 0;
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
@@ -3978,7 +3800,6 @@ create procedure DB.DBA.RDF_TRIPLES_TO_JSON (inout triples any, inout ses any)
http ('\n{ "head": { "link": [], "vars": [ "s", "p", "o" ] },\n "results": { "distinct": false, "ordered": true, "bindings": [', ses);
tcount := length (triples);
env := vector (0, 0, vector ('s', 'p', 'o'), null);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
declare triple any;
@@ -4001,7 +3822,6 @@ create procedure DB.DBA.RDF_TRIPLES_TO_CSV (inout triples any, inout ses any)
-- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_CSV:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
{ whenever sqlstate '*' goto p_done; rowvector_subj_sort (triples, 1, 1); p_done: ; }
{ whenever sqlstate '*' goto s_done; rowvector_subj_sort (triples, 0, 1); s_done: ; }
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, triples[tctr][0]);
@@ -4033,7 +3853,6 @@ This time the service made zero such statements, sorry.</p></body></html>', ses)
nsdict := dict_new (10 + cast (sqrt(tcount) as integer));
dict_put (nsdict, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'rdf');
dict_put (nsdict, 'http://www.w3.org/2001/XMLSchema#', 'xsdh');
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
for (tctr := 0; (tctr < tcount) and (1000 > dict_size (nsdict)); tctr := tctr + 1)
{
sparql_iri_split_rdfa_qname (triples[tctr][0], nsdict, 1);
@@ -4054,7 +3873,7 @@ This time the service made zero such statements, sorry.</p></body></html>', ses)
tcount), ses);
http ('<p>A generic web browser may not display them but the document can be saved on disk and used by some appropriate program or sent to a third party.
Use "Save As" or "Send To" menu item of the browser; choose "HTML" file type, not "text file" or "web archive".
-</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>\n<ul>', ses);
+</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>', ses);
env := vector (0, 0, 0, null);
rowvector_subj_sort (triples, 0, 1);
prev_subj := null;
@@ -4072,31 +3891,31 @@ Use "Save As" or "Send To" menu item of the browser; choose "HTML" file type, no
if (prev_subj is null or (subj <> prev_subj))
{
if (prev_subj is not null)
- http ('\n</ul></li>', ses);
- http ('\n<li about="[', ses);
+ http ('\n</div>', ses);
+ http ('\n<div about="[', ses);
split := sparql_iri_split_rdfa_qname (subj, nsdict, 2);
-- dbg_obj_princ ('Split of ', subj, ' is ', split);
if ('' = split[1])
{
http_escape (split[2], 3, ses, 1, 1);
- http (']">\n<ul>', ses);
+ http (']">', ses);
}
else if (isstring (split[0]))
{
http_escape (concat (split[0], ':', split[2]), 3, ses, 1, 1);
- http (']">\n<ul>', ses);
+ http (']">', ses);
}
else
{
http_escape (concat ('s:', split[2]), 3, ses, 1, 1);
http (']" xmlns:s="', ses);
http_escape (split[1], 3, ses, 1, 1);
- http ('">\n<ul>', ses);
+ http ('">', ses);
}
prev_subj := subj;
}
obj_iri_split := sparql_iri_split_rdfa_qname (obj, nsdict, 2);
- http (case (isvector (obj_iri_split)) when 0 then '\n<li property="' else '\n<li rel="' end, ses);
+ http (case (isvector (obj_iri_split)) when 0 then '\n<div property="' else '\n<div rel="' end, ses);
split := sparql_iri_split_rdfa_qname (pred, nsdict, 2);
if ('' = split[1])
{
@@ -4199,61 +4018,54 @@ Use "Save As" or "Send To" menu item of the browser; choose "HTML" file type, no
sqlval := charset_recode (sqlval, 'UTF-8', '_WIDE_');
http_value (sqlval, 0, ses);
}
- http ('</li>', ses);
+ http ('</div>', ses);
}
}
if (prev_subj is not null)
- http ('\n</ul></li></ul>', ses);
+ http ('\n</div>', ses);
http ('\n</body></html>\n', ses);
}
;
-create function DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT (in ul_or_tr varchar)
-{
- declare lpath varchar;
- lpath := virtuoso_ini_item_value ('URIQA','DefaultHost');
- if (lpath is null)
- lpath := '/sparql';
- else
- lpath := 'http://' || lpath || '/sparql';
- whenever sqlstate 'HT013' goto no_http_context;
- lpath := http_path ();
-no_http_context:
- return ' <a href=" ' || lpath || '?query=describe+%%3C%U%%3E&format=text%%2Fx-html%%2B' || ul_or_tr || '">describe</a> ';
-}
-;
-
-create function DB.DBA.RDF_PIVOT_DESCRIBE_LINK (in iri varchar)
-{
- return sprintf ('; <a href="/describe/?url=%U&sid=1&urilookup=1">facets</a> ', iri);
-}
-;
-
-create procedure DB.DBA.RDF_TRIPLES_TO_HTML_UL (inout triples any, inout ses any)
+create procedure DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (inout triples any, inout ses any)
{
- declare env, prev_subj, prev_pred any;
- declare can_pivot, ctr, len, tcount, tctr, status, obj_needs_br integer;
- declare endpoint_fmt, subj_iri, pred_iri varchar;
+ declare env, prev_subj, prev_pred, nsdict, nslist any;
+ declare ctr, len, tcount, tctr, status, obj_needs_br integer;
tcount := length (triples);
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_UL:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
- http ('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">\n', ses);
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
+ -- http ('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE html>\n', ses);
if (0 = tcount)
{
http ('<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Empty HTML RDFa and Microdata document</title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head><body>
+<head><title>Empty HTML Microdata document</title></head><body>
<p>This document is empty and basically useless. It is generated by a web service that can make some statements in HTML Microdata format.
This time the service made zero such statements, sorry.</p></body></html>', ses);
return;
}
- endpoint_fmt := DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT ('ul');
- can_pivot := case (isnull (DB.DBA.VAD_CHECK_VERSION ('PivotViewer'))) when 0 then 1 else 0 end;
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
+ nsdict := dict_new (10 + cast (sqrt(tcount) as integer));
+ dict_put (nsdict, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'rdf');
+ dict_put (nsdict, 'http://www.w3.org/2001/XMLSchema#', 'xsdh');
+ for (tctr := 0; (tctr < tcount) and (1000 > dict_size (nsdict)); tctr := tctr + 1)
+ {
+ sparql_iri_split_rdfa_qname (triples[tctr][0], nsdict, 1);
+ sparql_iri_split_rdfa_qname (triples[tctr][1], nsdict, 1);
+ sparql_iri_split_rdfa_qname (triples[tctr][2], nsdict, 1);
+ }
http ('<html xmlns="http://www.w3.org/1999/xhtml"', ses);
- http ('>\n<head><title>HTML RDFa and Microdata document</title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>\n<body>\n<ul>\n', ses);
+ http ('>\n<head><title>HTML Microdata document</title></head><body>\n', ses);
+ http (sprintf ('<p>This document contains %d facts in HTML Microdata format.</p>',
+ tcount), ses);
+ http ('<p>A generic web browser may not display them properly but the document can be saved on disk and used by some appropriate program or sent to a third party.
+Use "Save As" or "Send To" menu item of the browser; choose "HTML" file type, not "text file" or "web archive".
+</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>', ses);
+ http ('\n<table><tr><th>Prefix</th><th>Namespace IRI</th></tr>', ses);
+ nslist := dict_to_vector (nsdict, 0);
+ len := length (nslist);
+ for (ctr := len - 2; ctr >= 0; ctr := ctr-2)
+ {
+ http (sprintf ('\n<tr><td>%V</td><td>%V</td></tr>', nslist[ctr+1], nslist[ctr]), ses);
+ }
+ http ('</table>', ses);
env := vector (0, 0, 0, null);
rowvector_subj_sort (triples, 1, 1);
rowvector_subj_sort (triples, 0, 1);
@@ -4267,113 +4079,112 @@ This time the service made zero such statements, sorry.</p></body></html>', ses)
subj := triples[tctr][0];
pred := triples[tctr][1];
obj := triples[tctr][2];
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_UL: subj:', subj, __tag(subj), __box_flags (subj));
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_UL: pred:', pred, __tag(pred), __box_flags (pred));
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_UL: obj:', obj, __tag(obj), __box_flags (obj));
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA: subj:', subj, __tag(subj), __box_flags (subj));
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA: pred:', pred, __tag(pred), __box_flags (pred));
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA: obj:', obj, __tag(obj), __box_flags (obj));
if (prev_subj is null or (subj <> prev_subj))
{
if (prev_subj is not null)
- http ('\n </ul></li>\n </ul></li>', ses);
- subj_iri := id_to_iri (subj);
- http ('\n <li about="', ses);
- http_escape (subj_iri, 3, ses, 1, 1);
- http ('" itemscope="" itemid="', ses);
- http_escape (subj_iri, 3, ses, 1, 1);
- http ('"><a href="', ses);
- http_escape (subj_iri, 3, ses, 1, 1);
- http ('">', ses);
- http_escape (subj_iri, 1, ses, 1, 1);
- http ('</a> (', ses);
- http (sprintf (endpoint_fmt, subj_iri), ses);
- if (can_pivot)
- http (DB.DBA.RDF_PIVOT_DESCRIBE_LINK (subj_iri), ses);
- http (')\n <ul>', ses);
+ http ('\n</dd></dl>', ses);
+ http (sprintf ('\n<dl itemscope itemid="%s">', replace (id_to_iri (subj), '"', '%22')), ses);
+ split := sparql_iri_split_rdfa_qname (subj, nsdict, 2);
+ -- dbg_obj_princ ('Split of ', subj, ' is ', split);
+ if ('' = split[1])
+ http (sprintf ('\n<dt>Subject Item</dt><dd>%V</dd>', split[2]), ses);
+ else if (isstring (split[0]))
+ http (sprintf ('\n<dt>Subject Item</dt><dd>%V:%V</dd>', split[0], split[2]), ses);
+ else
+ http (sprintf ('\n<dt>Subject Item</dt><dd>%V%V</dd>', split[1], split[2]), ses);
prev_subj := subj;
prev_pred := null;
}
if (prev_pred is null or (pred <> prev_pred))
{
if (prev_pred is not null)
- http ('\n </ul></li>', ses);
- pred_iri := id_to_iri (pred);
- http ('\n <li><a href="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
- http ('">', ses);
- http_escape (pred_iri, 1, ses, 1, 1);
- http ('</a> (', ses);
- http (sprintf (endpoint_fmt, pred_iri), ses);
- if (can_pivot)
- http (DB.DBA.RDF_PIVOT_DESCRIBE_LINK (pred_iri), ses);
- http (')\n <ul>', ses);
+ http ('\n</dd>', ses);
+ split := sparql_iri_split_rdfa_qname (pred, nsdict, 2);
+ -- dbg_obj_princ ('Split of ', pred, ' is ', split);
+ if ('' = split[1])
+ http (sprintf ('\n<dt>%V</dt><dd>', split[2]), ses);
+ else if (isstring (split[0]))
+ http (sprintf ('\n<dt>%V:%V</dt><dd>', split[0], split[2]), ses);
+ else
+ http (sprintf ('\n<dt>%V%V</dt><dd>', split[1], split[2]), ses);
prev_pred := pred;
obj_needs_br := 0;
}
if (obj is null)
- signal ('RDFXX', 'DB.DBA.TRIPLES_TO_HTML_UL: object is NULL');
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_HTML_MICRODATA: object is NULL');
if (obj_needs_br)
http ('\n', ses);
else
obj_needs_br := 1;
- if (isiri_id (obj))
+ obj_iri_split := sparql_iri_split_rdfa_qname (obj, nsdict, 2);
+ if (isvector (obj_iri_split))
{
- declare obj_iri varchar;
- obj_iri := id_to_iri (obj);
- http ('\n <li><a rel="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
- http ('" resource="', ses);
- http_escape (obj_iri, 3, ses, 1, 1);
- http ('" itemprop="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
- http ('" href="', ses);
- http_escape (obj_iri, 3, ses, 1, 1);
- http ('">', ses);
- http_escape (obj_iri, 1, ses, 1, 1);
- http ('</a> (', ses);
- http (sprintf (endpoint_fmt, obj_iri), ses);
- if (can_pivot)
- http (DB.DBA.RDF_PIVOT_DESCRIBE_LINK (obj_iri), ses);
- http (')</li>', ses);
+ http (sprintf ('\n<a itemprop="%s" href="%s">', replace (id_to_iri (pred), '"', '%22'), replace (id_to_iri (obj), '"', '%22')), ses);
+ if ('' = obj_iri_split[1])
+ http (sprintf ('%V</a>', obj_iri_split[2]), ses);
+ else if (isstring (obj_iri_split[0]))
+ http (sprintf ('%V:%V</a>', obj_iri_split[0], obj_iri_split[2]), ses);
+ else
+ http (sprintf ('%V%V</a>', obj_iri_split[1], obj_iri_split[2]), ses);
}
else
{
declare sqlval any;
declare dt, lang, strval any;
- http ('\n <li property="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
- http ('" itemprop="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
+ http (sprintf ('\n<span itemprop="%s"', replace (id_to_iri (pred), '"', '%22')), ses);
dt := 0; lang := 0;
if (__tag of rdf_box = __tag (obj))
{
if (257 <> rdf_box_lang (obj))
lang := coalesce ((select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = rdf_box_lang (obj)));
- else if (257 <> rdf_box_type (obj))
- dt := coalesce ((select __bft (RDT_QNAME, 1) from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = rdf_box_type (obj)));
+--DT else if (257 <> rdf_box_type (obj))
+--DT dt := coalesce ((select __bft (RDT_QNAME, 1) from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = rdf_box_type (obj)));
sqlval := __rdf_sqlval_of_obj (obj, 1);
- if (__tag of datetime = __tag (sqlval))
- {
- if (257 = rdf_box_type (obj))
- dt := __xsd_type (sqlval);
- }
+--DT if (__tag of datetime = __tag (sqlval))
+--DT {
+--DT if (257 = rdf_box_type (obj))
+--DT dt := __xsd_type (sqlval);
+--DT }
}
else if (__tag (obj) not in (__tag of varchar, __tag of varbinary))
{
sqlval := obj;
- dt := __xsd_type (sqlval);
+--DT dt := __xsd_type (sqlval);
}
else
sqlval := obj;
- if (not (isinteger (dt)))
- {
- http ('" datatype="', ses);
- http_escape (dt, 3, ses, 1, 1);
- }
+--DT if (not (isinteger (dt)))
+--DT {
+--DT http (' datatype="', ses);
+--DT split := sparql_iri_split_rdfa_qname (dt, nsdict, 2);
+--DT if ('' = split[1])
+--DT {
+--DT http_escape (split[2], 3, ses, 1, 1);
+--DT http ('"', ses);
+--DT }
+--DT else if (isstring (split[0]))
+--DT {
+--DT http_escape (concat (split[0], ':', split[2]), 3, ses, 1, 1);
+--DT http ('"', ses);
+--DT }
+--DT else
+--DT {
+--DT http_escape (concat ('dt:', split[2]), 3, ses, 1, 1);
+--DT http ('" xmlns:dt="', ses);
+--DT http_escape (split[1], 3, ses, 1, 1);
+--DT http ('"', ses);
+--DT }
+--DT }
if (isstring (lang))
{
- http ('" xml:lang="', ses);
+ http (' xml:lang="', ses);
http_escape (lang, 3, ses, 1, 1);
+ http ('"', ses);
}
- http ('">', ses);
+ http ('>', ses);
if (__tag of datetime = __tag(sqlval))
__rdf_long_to_ttl (sqlval, ses);
else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))
@@ -4387,43 +4198,27 @@ This time the service made zero such statements, sorry.</p></body></html>', ses)
sqlval := charset_recode (sqlval, 'UTF-8', '_WIDE_');
http_value (sqlval, 0, ses);
}
- http ('</li>', ses);
+ http ('</span>', ses);
}
}
if (prev_subj is not null)
- http ('\n </ul></li></ul></li></ul>', ses);
+ http ('\n</dd></dl>', ses);
http ('\n</body></html>\n', ses);
}
;
-
-create procedure DB.DBA.RDF_TRIPLES_TO_HTML_TR (inout triples any, inout ses any)
+create procedure DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (inout triples any, inout ses any)
{
declare env, prev_subj, prev_pred any;
- declare can_pivot, ctr, len, tcount, tctr, status integer;
- declare endpoint_fmt, subj_iri, pred_iri, subj_recod, pred_recod, subj_trtd, pred_tdtd varchar;
+ declare ctr, len, tcount, tctr, status, obj_needs_comma integer;
tcount := length (triples);
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_TR:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
- -- http ('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE html>\n', ses);
- if (0 = tcount)
- {
- http ('<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Empty HTML RDFa and Microdata document</title></head><body>
-<p>This document is empty and basically useless. It is generated by a web service that can make some statements in HTML Microdata format.
-This time the service made zero such statements, sorry.</p></body></html>', ses);
- return;
- }
- endpoint_fmt := DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT ('tr');
- can_pivot := case (isnull (DB.DBA.VAD_CHECK_VERSION ('PivotViewer'))) when 0 then 1 else 0 end;
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
- http ('<html xmlns="http://www.w3.org/1999/xhtml"', ses);
- http ('>\n<head><title>HTML RDFa and Microdata document</title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>\n<body>\n<table>\n', ses);
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
+ http ('{ "items" : [', ses);
env := vector (0, 0, 0, null);
rowvector_subj_sort (triples, 1, 1);
rowvector_subj_sort (triples, 0, 1);
prev_subj := prev_pred := null;
+ obj_needs_comma := 0;
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
declare subj, pred, obj, split, obj_iri_split any;
@@ -4432,246 +4227,47 @@ This time the service made zero such statements, sorry.</p></body></html>', ses)
subj := triples[tctr][0];
pred := triples[tctr][1];
obj := triples[tctr][2];
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_TR: subj:', subj, __tag(subj), __box_flags (subj));
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_TR: pred:', pred, __tag(pred), __box_flags (pred));
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_TR: obj:', obj, __tag(obj), __box_flags (obj));
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA: subj:', subj, __tag(subj), __box_flags (subj));
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA: pred:', pred, __tag(pred), __box_flags (pred));
+ -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA: obj:', obj, __tag(obj), __box_flags (obj));
if (prev_subj is null or (subj <> prev_subj))
{
- declare trtd_ses any;
+ declare subj_iri varchar;
+ if (prev_subj is not null)
+ http (' ] } },\n', ses);
subj_iri := id_to_iri (subj);
- --subj_recod := replace (subj_iri, '"', '%22');
- --subj_trtd := sprintf ('\n<tr itemscope="itemscope" about="%s" itemid="%s">\n <td><a href="%s">%V</a> (' || endpoint_fmt || '%s)</td>',
- -- subj_recod, subj_recod, subj_recod, subj_iri, subj_iri,
- -- case when (can_pivot) then DB.DBA.RDF_PIVOT_DESCRIBE_LINK (id_to_iri (subj)) else '' end );
- trtd_ses := string_output ();
- http ('\n<tr itemscope="itemscope" about="', trtd_ses);
- http_escape (subj_iri, 3, trtd_ses, 1, 1);
- http ('" itemid="', trtd_ses);
- http_escape (subj_iri, 3, trtd_ses, 1, 1);
- http ('">\n <td><a href="', trtd_ses);
- http_escape (subj_iri, 3, trtd_ses, 1, 1);
- http (sprintf ('">%V</a> (' || endpoint_fmt || '%s)</td>', subj_iri, subj_iri,
- case when (can_pivot) then DB.DBA.RDF_PIVOT_DESCRIBE_LINK (id_to_iri (subj)) else '' end ),
- trtd_ses );
- subj_trtd := string_output_string (trtd_ses);
+ if (starts_with (subj_iri, 'nodeID://'))
+ subj_iri := '_:' || subseq (subj_iri, 9);
+ http ('\n { "id" : "', ses); http_escape (subj_iri, 14, ses, 1, 1); http ('"\n "properties" : {', ses);
prev_subj := subj;
+ prev_pred := null;
}
if (prev_pred is null or (pred <> prev_pred))
{
- declare tdtd_ses any;
- pred_iri := id_to_iri (pred);
- --pred_recod := replace (pred_iri, '"', '%22');
- --pred_tdtd := sprintf ('\n <td><a href="%s">%s</a> (' || endpoint_fmt || '%s)\n </td><td',
- -- pred_recod, pred_recod, pred_iri,
- -- case when (can_pivot) then DB.DBA.RDF_PIVOT_DESCRIBE_LINK (id_to_iri (pred)) else '' end );
- tdtd_ses := string_output ();
- http ('\n <td><a href="', tdtd_ses);
- http_escape (pred_iri, 3, tdtd_ses, 1, 1);
- http ('">', tdtd_ses);
- http_escape (pred_iri, 1, tdtd_ses, 1, 1);
- http (sprintf ('</a> (' || endpoint_fmt || '%s)\n </td><td', pred_iri,
- case when (can_pivot) then DB.DBA.RDF_PIVOT_DESCRIBE_LINK (id_to_iri (pred)) else '' end ),
- tdtd_ses );
- pred_tdtd := string_output_string (tdtd_ses);
+ if (prev_pred is not null)
+ http (' ] ,', ses);
+ http ('\n "', ses); http_escape (id_to_iri (pred), 14, ses, 1, 1); http ('" : [ ', ses);
prev_pred := pred;
+ obj_needs_comma := 0;
}
if (obj is null)
- signal ('RDFXX', 'DB.DBA.TRIPLES_TO_HTML_TR: object is NULL');
- http (subj_trtd, ses);
- http (pred_tdtd, ses);
- if (isiri_id (obj))
- {
- declare obj_iri varchar;
- obj_iri := id_to_iri (obj);
- http ('><a rel="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
- http ('" resource="', ses);
- http_escape (obj_iri, 3, ses, 1, 1);
- http ('" itemprop="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
- http ('" href="', ses);
- http_escape (obj_iri, 3, ses, 1, 1);
- http (sprintf ('">%V</a> (' || endpoint_fmt, obj_iri, obj_iri), ses);
- if (can_pivot)
- http (DB.DBA.RDF_PIVOT_DESCRIBE_LINK (obj_iri), ses);
- http (')</td></tr>', ses);
- }
- else
- {
- declare sqlval any;
- declare dt, lang, strval any;
- http (' property="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
- http ('" itemprop="', ses);
- http_escape (pred_iri, 3, ses, 1, 1);
- dt := 0; lang := 0;
- if (__tag of rdf_box = __tag (obj))
- {
- if (257 <> rdf_box_lang (obj))
- lang := coalesce ((select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = rdf_box_lang (obj)));
- else if (257 <> rdf_box_type (obj))
- dt := coalesce ((select __bft (RDT_QNAME, 1) from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = rdf_box_type (obj)));
- sqlval := __rdf_sqlval_of_obj (obj, 1);
- if (__tag of datetime = __tag (sqlval))
- {
- if (257 = rdf_box_type (obj))
- dt := __xsd_type (sqlval);
- }
- }
- else if (__tag (obj) not in (__tag of varchar, __tag of varbinary))
- {
- sqlval := obj;
- dt := __xsd_type (sqlval);
- }
- else
- sqlval := obj;
- if (not (isinteger (dt)))
- {
- http ('" datatype="', ses);
- http_escape (dt, 3, ses, 1, 1);
- }
- if (isstring (lang))
- {
- http ('" xml:lang="', ses);
- http_escape (lang, 3, ses, 1, 1);
- }
- http ('">', ses);
- if (__tag of datetime = __tag(sqlval))
- __rdf_long_to_ttl (sqlval, ses);
- else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))
- http_value (sqlval, 0, ses);
- else if (__tag of varchar = __tag (sqlval))
- http_value (charset_recode (sqlval, 'UTF-8', '_WIDE_'), 0, ses);
- else
- {
- sqlval := __rdf_strsqlval (obj);
- if (__tag of varchar = __tag (sqlval))
- sqlval := charset_recode (sqlval, 'UTF-8', '_WIDE_');
- http_value (sqlval, 0, ses);
- }
- http ('</td></tr>', ses);
- }
- }
- http ('\n</table></body></html>\n', ses);
-}
-;
-
-
-create procedure DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (inout triples any, inout ses any)
-{
- declare env, prev_subj, prev_pred, nsdict, nslist any;
- declare ctr, len, tcount, tctr, status, obj_needs_br integer;
- tcount := length (triples);
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
- -- http ('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE html>\n', ses);
- if (0 = tcount)
- {
- http ('<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Empty HTML Microdata document</title></head><body>
-<p>This document is empty and basically useless. It is generated by a web service that can make some statements in HTML Microdata format.
-This time the service made zero such statements, sorry.</p></body></html>', ses);
- return;
- }
- nsdict := dict_new (10 + cast (sqrt(tcount) as integer));
- dict_put (nsdict, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'rdf');
- dict_put (nsdict, 'http://www.w3.org/2001/XMLSchema#', 'xsdh');
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
- for (tctr := 0; (tctr < tcount) and (1000 > dict_size (nsdict)); tctr := tctr + 1)
- {
- sparql_iri_split_rdfa_qname (triples[tctr][0], nsdict, 1);
- sparql_iri_split_rdfa_qname (triples[tctr][1], nsdict, 1);
- sparql_iri_split_rdfa_qname (triples[tctr][2], nsdict, 1);
- }
- http ('<html xmlns="http://www.w3.org/1999/xhtml"', ses);
- http ('>\n<head><title>HTML Microdata document</title></head><body>\n', ses);
- http (sprintf ('<p>This document contains %d facts in HTML Microdata format.</p>',
- tcount), ses);
- http ('<p>A generic web browser may not display them properly but the document can be saved on disk and used by some appropriate program or sent to a third party.
-Use "Save As" or "Send To" menu item of the browser; choose "HTML" file type, not "text file" or "web archive".
-</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>', ses);
- http ('\n<table><tr><th>Prefix</th><th>Namespace IRI</th></tr>', ses);
- nslist := dict_to_vector (nsdict, 0);
- len := length (nslist);
- for (ctr := len - 2; ctr >= 0; ctr := ctr-2)
- {
- http (sprintf ('\n<tr><td>%V</td><td>%V</td></tr>', nslist[ctr+1], nslist[ctr]), ses);
- }
- http ('</table>', ses);
- env := vector (0, 0, 0, null);
- rowvector_subj_sort (triples, 1, 1);
- rowvector_subj_sort (triples, 0, 1);
- prev_subj := prev_pred := null;
- obj_needs_br := 0;
- for (tctr := 0; tctr < tcount; tctr := tctr + 1)
- {
- declare subj, pred, obj, split, obj_iri_split any;
- declare pred_tagname varchar;
- declare res varchar;
- subj := triples[tctr][0];
- pred := triples[tctr][1];
- obj := triples[tctr][2];
- if (isstring (subj))
- subj := iri_to_id (subj);
- if (isstring (pred))
- pred := iri_to_id (pred);
- if (isstring (obj) and __box_flags (obj) = 1)
- obj := iri_to_id (obj);
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA: subj:', subj, __tag(subj), __box_flags (subj));
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA: pred:', pred, __tag(pred), __box_flags (pred));
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA: obj:', obj, __tag(obj), __box_flags (obj));
- if (prev_subj is null or (subj <> prev_subj))
- {
- if (prev_subj is not null)
- http ('\n</dd></dl>', ses);
- http (sprintf ('\n<dl itemscope itemid="%s">', replace (id_to_iri (subj), '"', '%22')), ses);
- split := sparql_iri_split_rdfa_qname (subj, nsdict, 2);
- -- dbg_obj_princ ('Split of ', subj, ' is ', split);
- if ('' = split[1])
- http (sprintf ('\n<dt>Subject Item</dt><dd>%V</dd>', split[2]), ses);
- else if (isstring (split[0]))
- http (sprintf ('\n<dt>Subject Item</dt><dd>%V:%V</dd>', split[0], split[2]), ses);
- else
- http (sprintf ('\n<dt>Subject Item</dt><dd>%V%V</dd>', split[1], split[2]), ses);
- prev_subj := subj;
- prev_pred := null;
- }
- if (prev_pred is null or (pred <> prev_pred))
- {
- if (prev_pred is not null)
- http ('\n</dd>', ses);
- split := sparql_iri_split_rdfa_qname (pred, nsdict, 2);
- -- dbg_obj_princ ('Split of ', pred, ' is ', split);
- if ('' = split[1])
- http (sprintf ('\n<dt>%V</dt><dd>', split[2]), ses);
- else if (isstring (split[0]))
- http (sprintf ('\n<dt>%V:%V</dt><dd>', split[0], split[2]), ses);
- else
- http (sprintf ('\n<dt>%V%V</dt><dd>', split[1], split[2]), ses);
- prev_pred := pred;
- obj_needs_br := 0;
- }
- if (obj is null)
- signal ('RDFXX', 'DB.DBA.TRIPLES_TO_HTML_MICRODATA: object is NULL');
- if (obj_needs_br)
- http ('\n', ses);
+ signal ('RDFXX', 'DB.DBA.TRIPLES_TO_JSON_MICRODATA: object is NULL');
+ if (obj_needs_comma)
+ http (',\n ', ses);
else
- obj_needs_br := 1;
- obj_iri_split := sparql_iri_split_rdfa_qname (obj, nsdict, 2);
- if (isvector (obj_iri_split))
+ obj_needs_comma := 1;
+ if (isiri_id (obj))
{
- http (sprintf ('\n<a itemprop="%s" href="%s">', replace (id_to_iri (pred), '"', '%22'), replace (id_to_iri (obj), '"', '%22')), ses);
- if ('' = obj_iri_split[1])
- http (sprintf ('%V</a>', obj_iri_split[2]), ses);
- else if (isstring (obj_iri_split[0]))
- http (sprintf ('%V:%V</a>', obj_iri_split[0], obj_iri_split[2]), ses);
- else
- http (sprintf ('%V%V</a>', obj_iri_split[1], obj_iri_split[2]), ses);
+ declare obj_iri varchar;
+ obj_iri := id_to_iri (obj);
+ if (starts_with (obj_iri, 'nodeID://'))
+ obj_iri := '_:' || subseq (obj_iri, 9);
+ http ('{ "id" : "', ses); http_escape (obj_iri, 14, ses, 1, 1); http ('" }', ses);
}
else
{
declare sqlval any;
declare dt, lang, strval any;
- http (sprintf ('\n<span itemprop="%s"', replace (id_to_iri (pred), '"', '%22')), ses);
dt := 0; lang := 0;
if (__tag of rdf_box = __tag (obj))
{
@@ -4715,179 +4311,45 @@ Use "Save As" or "Send To" menu item of the browser; choose "HTML" file type, no
--DT http ('"', ses);
--DT }
--DT }
- if (isstring (lang))
+--DT if (isstring (lang))
+--DT {
+--DT http (' xml:lang="', ses);
+--DT http_escape (lang, 3, ses, 1, 1);
+--DT http ('"', ses);
+--DT }
+--DT http ('>', ses);
+ if (__tag (sqlval) in (__tag of integer, __tag of real, __tag of double precision, __tag of decimal))
+ http_value (sqlval, 0, ses);
+ else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))
{
- http (' xml:lang="', ses);
- http_escape (lang, 3, ses, 1, 1);
- http ('"', ses);
+ declare tmpses any;
+ tmpses := string_output();
+ http_value (sqlval, 0, tmpses);
+ http ('"', ses); http_escape (string_output_string (tmpses), 14, ses, 1, 1); http ('"', ses);
}
- http ('>', ses);
- if (__tag of datetime = __tag(sqlval))
- __rdf_long_to_ttl (sqlval, ses);
- else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))
- http_value (sqlval, 0, ses);
else if (__tag of varchar = __tag (sqlval))
- http_value (charset_recode (sqlval, 'UTF-8', '_WIDE_'), 0, ses);
+ {
+ http ('"', ses); http_escape (sqlval, 14, ses, 1, 1); http ('"', ses);
+ }
else
{
sqlval := __rdf_strsqlval (obj);
- if (__tag of varchar = __tag (sqlval))
- sqlval := charset_recode (sqlval, 'UTF-8', '_WIDE_');
- http_value (sqlval, 0, ses);
+ http ('"', ses); http_escape (sqlval, 14, ses, 1, 1); http ('"', ses);
}
- http ('</span>', ses);
}
}
if (prev_subj is not null)
- http ('\n</dd></dl>', ses);
- http ('\n</body></html>\n', ses);
+ http ('] } }', ses);
+ http (' }\n', ses);
}
;
-create procedure DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (inout triples any, inout ses any)
+-- /* OData ATOM format */
+create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ATOM_XML (inout triples_dict any) returns long varchar
{
- declare env, prev_subj, prev_pred any;
- declare ctr, len, tcount, tctr, status, obj_needs_comma integer;
- tcount := length (triples);
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA:'); for (tctr := 0; tctr < tcount; tctr := tctr + 1) -- dbg_obj_princ (triples[tctr]);
- http ('{ "items" : [', ses);
- env := vector (0, 0, 0, null);
- rowvector_subj_sort (triples, 1, 1);
- rowvector_subj_sort (triples, 0, 1);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
- prev_subj := prev_pred := null;
- obj_needs_comma := 0;
- for (tctr := 0; tctr < tcount; tctr := tctr + 1)
- {
- declare subj, pred, obj, split, obj_iri_split any;
- declare pred_tagname varchar;
- declare res varchar;
- subj := triples[tctr][0];
- pred := triples[tctr][1];
- obj := triples[tctr][2];
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA: subj:', subj, __tag(subj), __box_flags (subj));
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA: pred:', pred, __tag(pred), __box_flags (pred));
- -- dbg_obj_princ ('DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA: obj:', obj, __tag(obj), __box_flags (obj));
- if (prev_subj is null or (subj <> prev_subj))
- {
- declare subj_iri varchar;
- if (prev_subj is not null)
- http (' ] } },\n', ses);
- subj_iri := id_to_iri (subj);
- if (starts_with (subj_iri, 'nodeID://'))
- subj_iri := '_:' || subseq (subj_iri, 9);
- http ('\n { "id" : "', ses); http_escape (subj_iri, 14, ses, 1, 1); http ('"\n "properties" : {', ses);
- prev_subj := subj;
- prev_pred := null;
- }
- if (prev_pred is null or (pred <> prev_pred))
- {
- if (prev_pred is not null)
- http (' ] ,', ses);
- http ('\n "', ses); http_escape (id_to_iri (pred), 14, ses, 1, 1); http ('" : [ ', ses);
- prev_pred := pred;
- obj_needs_comma := 0;
- }
- if (obj is null)
- signal ('RDFXX', 'DB.DBA.TRIPLES_TO_JSON_MICRODATA: object is NULL');
- if (obj_needs_comma)
- http (',\n ', ses);
- else
- obj_needs_comma := 1;
- if (isiri_id (obj))
- {
- declare obj_iri varchar;
- obj_iri := id_to_iri (obj);
- if (starts_with (obj_iri, 'nodeID://'))
- obj_iri := '_:' || subseq (obj_iri, 9);
- http ('{ "id" : "', ses); http_escape (obj_iri, 14, ses, 1, 1); http ('" }', ses);
- }
- else
- {
- declare sqlval any;
- declare dt, lang, strval any;
- dt := 0; lang := 0;
- if (__tag of rdf_box = __tag (obj))
- {
- if (257 <> rdf_box_lang (obj))
- lang := coalesce ((select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = rdf_box_lang (obj)));
---DT else if (257 <> rdf_box_type (obj))
---DT dt := coalesce ((select __bft (RDT_QNAME, 1) from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = rdf_box_type (obj)));
- sqlval := __rdf_sqlval_of_obj (obj, 1);
---DT if (__tag of datetime = __tag (sqlval))
---DT {
---DT if (257 = rdf_box_type (obj))
---DT dt := __xsd_type (sqlval);
---DT }
- }
- else if (__tag (obj) not in (__tag of varchar, __tag of varbinary))
- {
- sqlval := obj;
---DT dt := __xsd_type (sqlval);
- }
- else
- sqlval := obj;
---DT if (not (isinteger (dt)))
---DT {
---DT http (' datatype="', ses);
---DT split := sparql_iri_split_rdfa_qname (dt, nsdict, 2);
---DT if ('' = split[1])
---DT {
---DT http_escape (split[2], 3, ses, 1, 1);
---DT http ('"', ses);
---DT }
---DT else if (isstring (split[0]))
---DT {
---DT http_escape (concat (split[0], ':', split[2]), 3, ses, 1, 1);
---DT http ('"', ses);
---DT }
---DT else
---DT {
---DT http_escape (concat ('dt:', split[2]), 3, ses, 1, 1);
---DT http ('" xmlns:dt="', ses);
---DT http_escape (split[1], 3, ses, 1, 1);
---DT http ('"', ses);
---DT }
---DT }
---DT if (isstring (lang))
---DT {
---DT http (' xml:lang="', ses);
---DT http_escape (lang, 3, ses, 1, 1);
---DT http ('"', ses);
---DT }
---DT http ('>', ses);
- if (__tag (sqlval) in (__tag of integer, __tag of real, __tag of double precision, __tag of decimal))
- http_value (sqlval, 0, ses);
- else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))
- {
- declare tmpses any;
- tmpses := string_output();
- http_value (sqlval, 0, tmpses);
- http ('"', ses); http_escape (string_output_string (tmpses), 14, ses, 1, 1); http ('"', ses);
- }
- else if (__tag of varchar = __tag (sqlval))
- {
- http ('"', ses); http_escape (sqlval, 14, ses, 1, 1); http ('"', ses);
- }
- else
- {
- sqlval := __rdf_strsqlval (obj);
- http ('"', ses); http_escape (sqlval, 14, ses, 1, 1); http ('"', ses);
- }
- }
- }
- if (prev_subj is not null)
- http ('] } }', ses);
- http (' }\n', ses);
-}
-;
-
--- /* OData ATOM format */
-create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ATOM_XML (inout triples_dict any) returns long varchar
-{
- declare triples, ses any;
- ses := string_output ();
- if (214 <> __tag (triples_dict))
+ declare triples, ses any;
+ ses := string_output ();
+ if (214 <> __tag (triples_dict))
{
triples := vector ();
}
@@ -4952,7 +4414,6 @@ create procedure DB.DBA.RDF_TRIPLES_TO_ODATA_JSON (inout triples any, inout ses
ns_dict := dict_new ();
ns_ctr := 0;
tcount := length (triples);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
http ('{ "d" : { \n "results": [ \n', ses);
for (tctr := 0; tctr < tcount; tctr := tctr + 1)
{
@@ -5039,7 +4500,6 @@ create procedure DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT (inout triples any, in prin
ns_dict := dict_new ();
ns_ctr := 0; pct := 0;
tcount := length (triples);
- DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);
if (print_top_level)
{
http ('<?xml version="1.0" encoding="utf-8" ?>\n<feed \n\t xmlns="http://www.w3.org/2005/Atom" \n'||
@@ -5101,7 +4561,7 @@ create procedure DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT (inout triples any, in prin
}
else
{
- http ('\t<id/>\n', ses);
+ http ('\t<id/>\n', ses);
range := 'en, */*;0.1';
}
http (sprintf ('\t<updated>%s</updated>\n', date_iso8601 (dt_set_tz (now (), 0))), ses);
@@ -5161,7 +4621,7 @@ create procedure DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT (inout triples any, in prin
rc := langmatches_pct_http (lang, range);
if (pct < rc)
{
- title := __rdf_strsqlval (obj);
+ title := __rdf_strsqlval (obj);
pct := rc;
}
}
@@ -5660,21 +5120,6 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TTL (inout triples_dict any) re
}
;
-create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TRIG (inout triples_dict any) returns long varchar
-{
- declare triples, ses any;
- ses := string_output ();
- if (214 <> __tag (triples_dict))
- {
- triples := vector ();
- }
- else
- triples := dict_list_keys (triples_dict, 1);
- DB.DBA.RDF_TRIPLES_TO_TRIG (triples, ses);
- return ses;
-}
-;
-
create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_NT (inout triples_dict any) returns long varchar
{
declare triples, ses any;
@@ -5735,36 +5180,6 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_LD (inout triples_dict any
}
;
-create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_UL (inout triples_dict any) returns long varchar
-{
- declare triples, ses any;
- ses := string_output ();
- if (214 <> __tag (triples_dict))
- {
- triples := vector ();
- }
- else
- triples := dict_list_keys (triples_dict, 1);
- DB.DBA.RDF_TRIPLES_TO_HTML_UL (triples, ses);
- return ses;
-}
-;
-
-create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_TR (inout triples_dict any) returns long varchar
-{
- declare triples, ses any;
- ses := string_output ();
- if (214 <> __tag (triples_dict))
- {
- triples := vector ();
- }
- else
- triples := dict_list_keys (triples_dict, 1);
- DB.DBA.RDF_TRIPLES_TO_HTML_TR (triples, ses);
- return ses;
-}
-;
-
create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_MICRODATA (inout triples_dict any) returns long varchar
{
declare triples, ses any;
@@ -6034,7 +5449,7 @@ create procedure DB.DBA.RDF_INSERT_TRIPLES_CL (inout graph_iri any, inout triple
connection_set ('g_iid', graph_iri);
dp := dpipe (0, 'IRI_TO_ID_1', 'IRI_TO_ID_1', 'IRI_TO_ID_1', 'MAKE_RO_1');
dpipe_set_rdf_load (dp);
- l := length (triples);
+ l := length (triples);
for (ctr := 0; ctr < l; ctr := ctr + 1)
{
declare r, o_val any;
@@ -6114,16 +5529,16 @@ create procedure DB.DBA.RDF_INSERT_TRIPLES (in graph_iri any, inout triples any,
o_final := DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL_FT (o_final, graph_iri, p_iid, ro_id_dict);
if (not rdf_box_is_storeable (o_final))
{
- -- dbg_obj_princ ('OBLOM', 'Bad O after DB.DBA.MAKE_OBJ_OF_SQLVAL_FT', o_orig, '=>', o_final);
+ -- dbg_obj_princ ('OBLOM', 'Bad O after MAKE_OBJ_OF_SQLVAL_FT', o_orig, '=>', o_final);
signal ('OBLOM', 'Bad O after MAKE_OBJ_OF_SQLVAL_FT');
- }
+ }
}
else
{
- o_final := DB.DBA.RDF_OBJ_ADD (257, o_final, 257);
+ o_final := DB.DBA.RDF_OBJ_ADD (257, o_final, 257);
if (not rdf_box_is_storeable (o_final))
{
- -- dbg_obj_princ ('OBLOM', 'Bad O after DB.DBA.RDF_OBJ_ADD', o_orig, '=>', o_final);
+ -- dbg_obj_princ ('OBLOM', 'Bad O after RDF_OBJ_OF_LONG', o_orig, '=>', o_final);
signal ('OBLOM', 'Bad O after DB.DBA.RDF_OBJ_ADD');
}
}
@@ -6201,9 +5616,9 @@ create procedure DB.DBA.RDF_DELETE_TRIPLES_AGG (in graph_iid any, inout triples
connection_set ('g_iid', graph_iid);
l := length (triples);
for (ctr := 0; ctr < l; ctr := ctr + 1)
- {
- declare r any;
- r := triples[ctr];
+ {
+ declare r any;
+ r := triples[ctr];
dpipe_input (dp, r[0], r[1], r[2]);
if (mod (ctr + 1, 40000) = 0 and l > 60000)
{
@@ -6212,23 +5627,23 @@ create procedure DB.DBA.RDF_DELETE_TRIPLES_AGG (in graph_iid any, inout triples
dpipe_reuse (dp);
if (bit_and (coalesce (log_mode, old_log_enable), 2))
commit work;
- }
+ }
}
dpipe_next (dp, 0);
dpipe_next (dp, 1);
if (bit_and (coalesce (log_mode, old_log_enable), 2))
- commit work;
+ commit work;
}
else
{
for (ctr := length (triples) - 1; ctr >= 0; ctr := ctr - 1)
- {
- declare o_short any;
- o_short := DB.DBA.RDF_OBJ_OF_LONG (triples[ctr][2]);
+ {
+ declare o_short any;
+ o_short := DB.DBA.RDF_OBJ_OF_LONG (triples[ctr][2]);
-- dbg_obj_princ ('DB.DBA.RDF_DELETE_TRIPLES_AGG: delete from DB.DBA.RDF_QUAD where G = ', graph_iid, ' and S = ', triples[ctr][0], ' and P = ', triples[ctr][1], ' and O = ', o_short);
- delete from DB.DBA.RDF_QUAD
+ delete from DB.DBA.RDF_QUAD
where G = graph_iid and S = triples[ctr][0] and P = triples[ctr][1] and O = o_short;
- }
+ }
log_enable (old_log_enable, 1);
}
}
@@ -6288,8 +5703,8 @@ create procedure DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL (inout _env any, in graph_ir
}
else if (2 = op)
{
- if (isinteger (blank_ids))
- blank_ids := vector (iri_id_from_num (sequence_next ('RDF_URL_IID_BLANK')));
+ if (isinteger (blank_ids))
+ blank_ids := vector (iri_id_from_num (sequence_next ('RDF_URL_IID_BLANK')));
while (arg >= length (blank_ids))
blank_ids := vector_concat (blank_ids, vector (iri_id_from_num (sequence_next ('RDF_URL_IID_BLANK'))));
if (1 = fld_ctr)
@@ -6585,60 +6000,44 @@ create procedure DB.DBA.RDF_REPL_DEL (inout rquads any)
--#IF VER=5
--!AFTER
--#ENDIF
-create function DB.DBA.SPARUL_CLEAR (in graph_iris any, in inside_sponge integer, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any
+create function DB.DBA.SPARUL_CLEAR (in graph_iri any, in inside_sponge integer, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0) returns any
{
+ declare g any;
declare g_iid IRI_ID;
declare old_log_enable integer;
- declare txtreport varchar;
- txtreport := '';
- if (__tag of vector <> __tag (graph_iris))
- graph_iris := vector (graph_iris);
- foreach (any g_iri in graph_iris) do
+ g := graph_iri;
+ if (isiri_id (g))
+ g := id_to_iri (g);
+ g_iid := iri_to_id (g);
+ __rgs_assert_cbk (graph_iri, uid, 2, 'SPARUL CLEAR GRAPH');
+ if (__rdf_graph_is_in_enabled_repl (g_iid))
{
- if (isiri_id (g_iri))
- g_iri := id_to_iri (g_iri);
- g_iid := iri_to_id (g_iri);
- __rgs_assert_cbk (g_iri, uid, 2, 'SPARUL CLEAR GRAPH');
+ repl_text ('__rdf_repl', '__rdf_repl_flush_queue()');
+ repl_text ('__rdf_repl', 'sparql define input:storage "" clear graph iri ( ?? )', g);
}
- foreach (any g_iri in graph_iris) do
+ old_log_enable := log_enable (log_mode, 1);
+ declare exit handler for sqlstate '*' { log_enable (old_log_enable, 1); resignal; };
+ exec (sprintf ('
+ delete from DB.DBA.RDF_QUAD
+ where G = __i2id (''%S'') ', g));
+ cl_exec ('delete from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS, index_only, no cluster) where G = ? option (index RDF_QUAD_GS)', vector (g_iid));
+ delete from DB.DBA.RDF_OBJ_RO_FLAGS_WORDS
+ where VT_WORD = rdf_graph_keyword (g_iid);
+ if (not inside_sponge)
{
- if (isiri_id (g_iri))
- g_iri := id_to_iri (g_iri);
- g_iid := iri_to_id (g_iri);
- if (__rdf_graph_is_in_enabled_repl (g_iid))
- {
- repl_text ('__rdf_repl', '__rdf_repl_flush_queue()');
- repl_text ('__rdf_repl', 'sparql define input:storage "" clear graph iri ( ?? )', g_iri);
- }
- old_log_enable := log_enable (log_mode, 1);
- declare exit handler for sqlstate '*' { log_enable (old_log_enable, 1); resignal; };
- exec (sprintf ('
- delete from DB.DBA.RDF_QUAD
- where G = __i2id (''%S'') ', g_iri));
- cl_exec ('delete from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS, index_only, no cluster) where G = ? option (index RDF_QUAD_GS)', vector (g_iid));
- delete from DB.DBA.RDF_OBJ_RO_FLAGS_WORDS
- where VT_WORD = rdf_graph_keyword (g_iid);
- if (not inside_sponge)
- {
- delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI = g_iri;
- delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI like concat ('destMD5=', md5 (g_iri), '&graphMD5=%');
- }
- if (compose_report)
- {
- if (txtreport <> '')
- txtreport := txtreport || '\n';
- txtreport := txtreport || sprintf ('Clear graph <%s> -- done', g_iri);
- }
+ delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI = g;
+ delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI like concat ('destMD5=', md5 (g), '&graphMD5=%');
}
/*091202 commit work; */
log_enable (old_log_enable, 1);
if (compose_report)
- return txtreport;
- return 1;
+ return sprintf ('Clear <%s> -- done', g);
+ else
+ return 1;
}
;
-create function DB.DBA.SPARUL_LOAD (in graph_iri any, in resource varchar, in uid integer, in log_mode integer, in compose_report integer, in options any := null, in silent integer := 0) returns any
+create function DB.DBA.SPARUL_LOAD (in graph_iri any, in resource varchar, in uid integer, in log_mode integer, in compose_report integer) returns any
{
declare old_log_enable integer;
declare grab_params any;
@@ -6646,21 +6045,18 @@ create function DB.DBA.SPARUL_LOAD (in graph_iri any, in resource varchar, in ui
declare res integer;
__rgs_assert_cbk (graph_iri, uid, 2, 'SPARUL LOAD');
old_log_enable := log_enable (log_mode, 1);
- declare exit handler for sqlstate '*' { log_enable (old_log_enable, 1); if (silent) goto fail; resignal; };
+ declare exit handler for sqlstate '*' { log_enable (old_log_enable, 1); resignal; };
grabbed := dict_new();
if (isiri_id (graph_iri))
graph_iri := id_to_iri (graph_iri);
- grab_params := vector_concat (vector (
- 'base_iri', resource,
- 'get:destination', graph_iri,
- 'resolver', 'DB.DBA.RDF_GRAB_RESOLVER_DEFAULT', 'loader', 'DB.DBA.RDF_SPONGE_UP',
- 'get:soft', get_keyword ('get:soft', options, 'replacing'),
- 'get:refresh', get_keyword ('get:refresh', options, -1),
- 'get:error-recovery', get_keyword ('get:error-recovery', options, 'signal'),
- -- 'flags', flags,
- 'get:strategy', get_keyword ('get:strategy', options, 'rdfa-only'),
- 'grabbed', grabbed ),
- options );
+ grab_params := vector ('base_iri', resource, 'get:destination', graph_iri,
+ 'resolver', 'DB.DBA.RDF_GRAB_RESOLVER_DEFAULT', 'loader', 'DB.DBA.RDF_SPONGE_UP',
+ 'get:soft', 'replacing',
+ 'get:refresh', -1,
+ 'get:error-recovery', 'signal',
+ -- 'flags', flags,
+ 'get:strategy', 'rdfa-only',
+ 'grabbed', grabbed );
commit work;
res := DB.DBA.RDF_GRAB_SINGLE (resource, grabbed, grab_params);
commit work;
@@ -6679,15 +6075,10 @@ create function DB.DBA.SPARUL_LOAD (in graph_iri any, in resource varchar, in ui
else
return 0;
}
-fail:
- if (compose_report)
- return sprintf ('Load silent <%s> into graph <%s> -- failed: %s: %s', resource, graph_iri, __SQL_STATE, __SQL_MESSAGE);
- else
- return 0;
}
;
-create function DB.DBA.SPARUL_CREATE (in graph_iri any, in silent1 integer, in uid integer, in log_mode integer, in compose_report integer, in options any := null, in silent integer := 0) returns any
+create function DB.DBA.SPARUL_CREATE (in graph_iri any, in silent integer, in uid integer, in log_mode integer, in compose_report integer) returns any
{
declare g_iid IRI_ID;
declare old_log_enable integer;
@@ -6695,8 +6086,6 @@ create function DB.DBA.SPARUL_CREATE (in graph_iri any, in silent1 integer, in u
g_iid := iri_to_id (graph_iri);
if (__rdf_graph_is_in_enabled_repl (g_iid))
repl_text ('__rdf_repl', 'sparql define input:storage "" create graph iri ( ?? )', graph_iri);
- if ((silent1 is not null) and silent1)
- silent := 1;
if (exists (select top 1 1 from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid))
{
if (silent)
@@ -6739,85 +6128,63 @@ create function DB.DBA.SPARUL_CREATE (in graph_iri any, in silent1 integer, in u
}
;
-create function DB.DBA.SPARUL_DROP (in graph_iris any, in silent1 integer, in uid integer, in log_mode integer, in compose_report integer, in options any := null, in silent integer := 0) returns any
+create function DB.DBA.SPARUL_DROP (in graph_iri any, in silent integer, in uid integer, in log_mode integer, in compose_report integer) returns any
{
declare g_iid IRI_ID;
declare old_log_enable integer;
- declare txtreport varchar;
- txtreport := '';
- if ((silent1 is not null) and silent1)
- silent := 1;
- if (__tag of vector <> __tag (graph_iris))
- graph_iris := vector (graph_iris);
- foreach (any g_iri in graph_iris) do
+ __rgs_assert_cbk (graph_iri, uid, 2, 'SPARUL DROP GRAPH');
+ g_iid := iri_to_id (graph_iri);
+ if (__rdf_graph_is_in_enabled_repl (g_iid))
{
- if (isiri_id (g_iri))
- g_iri := id_to_iri (g_iri);
- g_iid := iri_to_id (g_iri);
- __rgs_assert_cbk (g_iri, uid, 2, 'SPARUL DROP GRAPH');
+ repl_text ('__rdf_repl', '__rdf_repl_flush_queue()');
+ repl_text ('__rdf_repl', 'sparql define input:storage "" drop graph iri ( ?? )', graph_iri);
}
- foreach (any g_iri in graph_iris) do
+ old_log_enable := log_enable (log_mode, 1);
+ declare exit handler for sqlstate '*' { log_enable (old_log_enable, 1); resignal; };
+ if (not exists (select top 1 1 from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = iri_to_id (graph_iri)))
{
- if (isiri_id (g_iri))
- g_iri := id_to_iri (g_iri);
- g_iid := iri_to_id (g_iri);
- if (__rdf_graph_is_in_enabled_repl (g_iid))
- {
- repl_text ('__rdf_repl', '__rdf_repl_flush_queue()');
- repl_text ('__rdf_repl', 'sparql define input:storage "" drop graph iri ( ?? )', g_iri);
- }
- old_log_enable := log_enable (log_mode, 1);
- declare exit handler for sqlstate '*' { log_enable (old_log_enable, 1); resignal; };
- if (not exists (select top 1 1 from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid))
+ if (silent)
{
- if (silent)
+ if (exists (select top 1 1 from DB.DBA.RDF_QUAD where G = iri_to_id (graph_iri)))
{
- if (exists (select top 1 1 from DB.DBA.RDF_QUAD where G = g_iid))
- {
- DB.DBA.SPARUL_CLEAR (g_iri, 0, uid);
- log_enable (old_log_enable, 1);
- if (compose_report)
- return sprintf ('Drop silent graph <%s> -- graph has not been explicitly created before, triples were removed', g_iri);
- else
- return 2;
- }
+ DB.DBA.SPARUL_CLEAR (graph_iri, 0, uid);
+ log_enable (old_log_enable, 1);
if (compose_report)
- return sprintf ('Drop silent graph <%s> -- nothing to do', g_iri);
+ return sprintf ('Drop silent graph <%s> -- graph has not been explicitly created before, triples were removed', graph_iri);
else
- return 0;
+ return 2;
}
- else
- signal ('22023', 'SPARUL_DROP() failed: graph <' || g_iri || '> has not been explicitly created before');
- }
- if (silent)
- {
- DB.DBA.SPARUL_CLEAR (g_iri, 0, uid);
- delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid;
- /*091202 commit work; */
- log_enable (old_log_enable, 1);
if (compose_report)
- return sprintf ('Drop silent graph <%s> -- done', g_iri);
+ return sprintf ('Drop silent graph <%s> -- nothing to do', graph_iri);
else
- return 1;
- }
- if (exists (sparql define input:storage ""
- ask from <http://www.openlinksw.com/schemas/virtrdf#>
- where { ?qmv virtrdf:qmGraphRange-rvrFixedValue `iri(?:g_iri)` } ) )
- signal ('22023', 'SPARUL_DROP() failed: graph <' || g_iri || '> is used for mapping relational data to RDF');
- DB.DBA.SPARUL_CLEAR (g_iri, 0, uid);
- delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid;
- if (compose_report)
- {
- if (txtreport <> '')
- txtreport := txtreport || '\n';
- txtreport := txtreport || sprintf ('Drop graph <%s> -- done', g_iri);
+ return 0;
}
+ else
+ signal ('22023', 'SPARUL_DROP() failed: graph <' || graph_iri || '> has not been explicitly created before');
+ }
+ if (silent)
+ {
+ DB.DBA.SPARUL_CLEAR (graph_iri, 0, uid);
+ delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = iri_to_id (graph_iri);
+ /*091202 commit work; */
+ log_enable (old_log_enable, 1);
+ if (compose_report)
+ return sprintf ('Drop silent graph <%s> -- done', graph_iri);
+ else
+ return 1;
}
+ if (exists (sparql define input:storage ""
+ ask from <http://www.openlinksw.com/schemas/virtrdf#>
+ where { ?qmv virtrdf:qmGraphRange-rvrFixedValue `iri(?:graph_iri)` } ) )
+ signal ('22023', 'SPARUL_CREATE() failed: graph <' || graph_iri || '> is used for mapping relational data to RDF');
+ DB.DBA.SPARUL_CLEAR (graph_iri, 0, uid);
+ delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = iri_to_id (graph_iri);
log_enable (old_log_enable, 1);
/*091202 commit work; */
if (compose_report)
- return txtreport;
- return 1;
+ return sprintf ('Drop graph <%s> -- done', graph_iri);
+ else
+ return 1;
}
;
@@ -6848,261 +6215,44 @@ create function DB.DBA.SPARUL_RUN (in results any, in compose_report integer :=
}
;
--- SPARQL 1.1 UPDATE functions
-
-create function DB.DBA.SPARQL_INSERT_QUAD_DICT_CONTENT (in dflt_graph_iri any, in quads_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any
+create procedure DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS (in return_iris integer := 1, in lim integer := 2000000000)
{
- declare ins_count, ins_grp_count integer;
- declare res_ses any;
- ins_count := 0;
- ins_grp_count := 0;
- if (__tag of vector = __tag (dflt_graph_iri))
- {
- ins_count := dflt_graph_iri[2]; -- 2, not 1
- dflt_graph_iri := dflt_graph_iri[0]; -- the last op.
- }
- while (dict_size (quads_dict) > 0)
- {
- declare quads, groups any;
- declare group_ctr, group_count, g_ins_count integer;
- quads := dict_destructive_list_rnd_keys (quads_dict, 80000);
- rowvector_graph_sort (quads, 3, 1);
- groups := rowvector_graph_partition (quads, 3);
- group_count := length (groups);
- for (group_ctr := 0; group_ctr < group_count; group_ctr := group_ctr+1)
- {
- declare g_group, g any;
- g_group := aref_set_0 (groups, group_ctr);
- g := aref_or_default (g_group, 0, 3, dflt_graph_iri);
- __rgs_assert_cbk (g, uid, 2, 'SPARQL 1.1 INSERT');
- DB.DBA.RDF_INSERT_TRIPLES (g, g_group, log_mode);
- g_ins_count := length (g_group);
- ins_count := ins_count + g_ins_count;
- ins_grp_count := ins_grp_count + 1;
- if (isiri_id (g))
- g := id_to_iri (g);
- if (g is not null and __rdf_graph_is_in_enabled_repl (iri_to_id (g)))
- repl_text ('__rdf_repl', '__rdf_repl_flush_queue ()');
- if (compose_report and ins_grp_count < 1000)
- {
- if (group_ctr)
- http ('\n', res_ses);
- else
- res_ses := string_output();
- http (sprintf ('Insert into <%s>, %d (or less) quads -- done', g, g_ins_count), res_ses);
- }
- }
+ declare specials, specials_vec any;
+ declare last_iri_id, cur_iri_id IRI_ID;
+ declare cr cursor for select G from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where G > last_iri_id and not (dict_get (specials, G, 0));
+ declare cr_cl cursor for select G from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where G > last_iri_id and 0 >= position (G, specials_vec);
+ declare GRAPH_IRI varchar;
+ declare GRAPH_IID IRI_ID;
+ declare ctr, len integer;
+ if (return_iris)
+ result_names (GRAPH_IRI);
+ else
+ result_names (GRAPH_IID);
+ specials := dict_new (50);
+ set isolation = 'repeatable';
+ for (sparql define input:storage ""
+ select distinct ?graph_rvr_fixed
+ from <http://www.openlinksw.com/schemas/virtrdf#>
+ where { ?qmv virtrdf:qmGraphRange-rvrFixedValue ?graph_rvr_fixed } ) do
+ {
+ dict_put (specials, iri_to_id ("graph_rvr_fixed"), 1);
}
- if (compose_report)
+ if (dict_size (specials) >= lim)
+ goto done_all;
+ for (select REC_GRAPH_IID from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH) do
{
- if (ins_grp_count >= 1000)
- return sprintf ('Insert into %d (or more) graphs, total %d (or less) quads -- done', ins_grp_count, ins_count);
- if (ins_count)
- return string_output_string (res_ses);
- else
- return sprintf ('Insert into <%s>, 0 quads -- nothing to do', dflt_graph_iri);
+ dict_put (specials, REC_GRAPH_IID, 2);
}
- else
- return ins_count;
-}
-;
+ len := dict_size (specials);
+ if (len >= lim)
+ goto done_all;
+ last_iri_id := #i0;
-
-create function DB.DBA.SPARQL_DELETE_QUAD_DICT_CONTENT (in dflt_graph_iri any, in quads_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any
-{
- declare del_count, del_grp_count integer;
- declare res_ses any;
- del_count := 0;
- del_grp_count := 0;
- if (__tag of vector = __tag (dflt_graph_iri))
- {
- del_count := dflt_graph_iri[2]; -- 2, not 1
- dflt_graph_iri := dflt_graph_iri[0]; -- the last op.
- }
- while (dict_size (quads_dict) > 0)
- {
- declare quads, groups any;
- declare group_ctr, group_count, g_del_count integer;
- quads := dict_destructive_list_rnd_keys (quads_dict, 80000);
- rowvector_graph_sort (quads, 3, 1);
- groups := rowvector_graph_partition (quads, 3);
- group_count := length (groups);
- for (group_ctr := 0; group_ctr < group_count; group_ctr := group_ctr+1)
- {
- declare g_group, g any;
- g_group := aref_set_0 (groups, group_ctr);
- g := aref_or_default (g_group, 0, 3, dflt_graph_iri);
- __rgs_assert_cbk (g, uid, 2, 'SPARQL 1.1L DELETE');
- DB.DBA.RDF_DELETE_TRIPLES (g, g_group, log_mode);
- g_del_count := length (g_group);
- del_count := del_count + g_del_count;
- del_grp_count := del_grp_count + 1;
- if (isiri_id (g))
- g := id_to_iri (g);
- if (g is not null and __rdf_graph_is_in_enabled_repl (iri_to_id (g)))
- repl_text ('__rdf_repl', '__rdf_repl_flush_queue ()');
- if (compose_report and del_grp_count < 1000)
- {
- if (group_ctr)
- http ('\n', res_ses);
- else
- res_ses := string_output();
- http (sprintf ('Delete from <%s>, %d (or less) quads -- done', g, g_del_count), res_ses);
- }
- }
- }
- if (compose_report)
- {
- if (del_grp_count >= 1000)
- return sprintf ('Delete from %d (or more) graphs, total %d (or less) quads -- done', del_grp_count, del_count);
- if (del_count)
- return string_output_string (res_ses);
- else
- return sprintf ('Delete from <%s>, 0 quads -- nothing to do', dflt_graph_iri);
- }
- else
- return del_count;
-}
-;
-
-create function DB.DBA.SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS (in dflt_graph_iri any, in del_quads_dict any, in ins_quads_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any
-{
- declare del_count, ins_count integer;
- declare del_rep, ins_rep any;
- del_count := 0;
- ins_count := 0;
- if (__tag of vector = __tag (dflt_graph_iri))
- {
- del_count := dflt_graph_iri[1];
- ins_count := dflt_graph_iri[2];
- dflt_graph_iri := dflt_graph_iri[0]; -- the last op.
- }
- if (del_quads_dict is not null)
- {
- del_count := del_count + dict_size (del_quads_dict);
- del_rep := DB.DBA.SPARQL_DELETE_QUAD_DICT_CONTENT (dflt_graph_iri, del_quads_dict, uid, log_mode, compose_report);
- }
- else if (compose_report)
- del_rep := '';
- else
- del_rep := 0;
- if (ins_quads_dict is not null)
- {
- ins_count := ins_count + dict_size (ins_quads_dict);
- ins_rep := DB.DBA.SPARQL_INSERT_QUAD_DICT_CONTENT (dflt_graph_iri, ins_quads_dict, uid, log_mode, compose_report);
- }
- else if (compose_report)
- ins_rep := '';
- else
- ins_rep := 0;
- if (compose_report)
- return concat (del_rep, case when ins_rep <> '' and del_rep <> '' then '\n' else '' end, ins_rep);
- else
- return del_count + ins_count;
-}
-;
-
-create function DB.DBA.SPARUL_COPYMOVEADD_IMPL (in opname varchar, in src_g_iri any, in tgt_g_iri any, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any
-{
- declare src_g_iid IRI_ID;
- declare tgt_g_iid IRI_ID;
- declare old_log_enable, src_repl, tgt_repl integer;
- declare qry, stat, msg varchar;
- if (isiri_id (src_g_iri))
- src_g_iri := id_to_iri (src_g_iri);
- src_g_iid := iri_to_id (src_g_iri);
- if (isiri_id (tgt_g_iri))
- tgt_g_iri := id_to_iri (tgt_g_iri);
- tgt_g_iid := iri_to_id (tgt_g_iri);
- __rgs_assert_cbk (tgt_g_iri, uid, 2, 'SPARQL 1.1 ' || opname);
- __rgs_assert_cbk (src_g_iri, uid, case (opname) when 'MOVE' then 2 else 1 end, 'SPARQL 1.1 ' || opname);
- src_repl := __rdf_graph_is_in_enabled_repl (src_g_iid);
- tgt_repl := __rdf_graph_is_in_enabled_repl (tgt_g_iid);
- if (src_repl and not tgt_repl)
- signal ('22023', sprintf ('SPARQL 1.1 can not %s replicated graph <%s> to non-replicated graph <%s>, both should be in same replication status', src_g_iri, tgt_g_iri));
- if (tgt_repl and not src_repl)
- signal ('22023', sprintf ('SPARQL 1.1 can not %s non-replicated graph <%s> to replicated graph <%s>, both should be in same replication status', src_g_iri, tgt_g_iri));
- if ('ADD' <> opname)
- DB.DBA.SPARUL_CLEAR (tgt_g_iri, 0, uid, log_mode, 0, options, silent);
- if (src_repl and tgt_repl)
- {
- repl_text ('__rdf_repl', '__rdf_repl_flush_queue()');
- repl_text ('__rdf_repl', 'sparql define input:storage "" add iri( ?? ) to iri( ?? )', src_g_iri, tgt_g_iri);
- }
- old_log_enable := log_enable (log_mode, 1);
- declare exit handler for sqlstate '*' { log_enable (old_log_enable, 1); resignal; };
- stat := '00000';
- qry := sprintf ('insert soft DB.DBA.RDF_QUAD (G,S,P,O) select __i2id (''%S''), t.S, t.P, t.O from DB.DBA.RDF_QUAD t where t.G = __i2id (''%S'') ',
- tgt_g_iri, src_g_iri );
- exec (qry, stat, msg);
- if (stat <> '00000')
- signal (stat, msg);
- if ('MOVE' = opname)
- DB.DBA.SPARUL_CLEAR (src_g_iri, 0, uid, log_mode, 0, options, silent);
- /*091202 commit work; */
- log_enable (old_log_enable, 1);
- if (compose_report)
- return sprintf ('%s <%s> to <%s> -- done', opname, src_g_iri, tgt_g_iri);
- return 1;
-}
-;
-
-create function DB.DBA.SPARUL_COPY (in src_g_iri any, in tgt_g_iri any, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any
-{
- return DB.DBA.SPARUL_COPYMOVEADD_IMPL ('COPY', src_g_iri, tgt_g_iri, uid, log_mode, compose_report, options, silent);
-}
-;
-
-create function DB.DBA.SPARUL_MOVE (in src_g_iri any, in tgt_g_iri any, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any
-{
- return DB.DBA.SPARUL_COPYMOVEADD_IMPL ('MOVE', src_g_iri, tgt_g_iri, uid, log_mode, compose_report, options, silent);
-}
-;
-
-create function DB.DBA.SPARUL_ADD (in src_g_iri any, in tgt_g_iri any, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any
-{
- return DB.DBA.SPARUL_COPYMOVEADD_IMPL ('ADD', src_g_iri, tgt_g_iri, uid, log_mode, compose_report, options, silent);
-}
-;
-
-create procedure DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS (in return_iris integer := 1, in lim integer := 2000000000)
-{
- declare specials, specials_vec any;
- declare last_iri_id, cur_iri_id IRI_ID;
- declare cr cursor for select G from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where G > last_iri_id and not (dict_get (specials, G, 0));
- declare cr_cl cursor for select G from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where G > last_iri_id and 0 >= position (G, specials_vec);
- declare GRAPH_IRI varchar;
- declare GRAPH_IID IRI_ID;
- declare ctr, len integer;
- if (return_iris)
- result_names (GRAPH_IRI);
- else
- result_names (GRAPH_IID);
- specials := dict_new (50);
- set isolation = 'repeatable';
- for (sparql define input:storage ""
- select distinct ?graph_rvr_fixed
- from <http://www.openlinksw.com/schemas/virtrdf#>
- where { ?qmv virtrdf:qmGraphRange-rvrFixedValue ?graph_rvr_fixed } ) do
- {
- dict_put (specials, iri_to_id ("graph_rvr_fixed"), 1);
- }
- if (dict_size (specials) >= lim)
- goto done_all;
- for (select REC_GRAPH_IID from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH) do
- {
- dict_put (specials, REC_GRAPH_IID, 2);
- }
- len := dict_size (specials);
- if (len >= lim)
- goto done_all;
- last_iri_id := #i0;
-
--- if (1 <> sys_stat ('cl_run_local_only'))
--- {
- specials_vec := dict_list_keys (specials, 0);
- whenever not found goto done_rdf_quad_cl;
- open cr_cl (prefetch 1);
+-- if (1 <> sys_stat ('cl_run_local_only'))
+-- {
+ specials_vec := dict_list_keys (specials, 0);
+ whenever not found goto done_rdf_quad_cl;
+ open cr_cl (prefetch 1);
next_fetch_cr_cl:
fetch cr_cl into cur_iri_id;
@@ -7274,464 +6424,141 @@ create procedure DB.DBA.SPARQL_CONSTRUCT_ACC (inout _env any, in opcodes any, in
blank_ids := 0;
for (triple_ctr := length (opcodes) - 1; triple_ctr >= 0; triple_ctr := triple_ctr-1)
{
- declare fld_ctr, fld_count integer;
+ declare fld_ctr integer;
declare triple_vec any;
- declare g_opcode integer;
- g_opcode := aref_or_default (opcodes, triple_ctr, 6, null);
- if (g_opcode is null)
- {
- fld_count := 3;
- triple_vec := vector (0,0,0);
- }
- else
- {
- fld_count := 4;
- triple_vec := vector (0,0,0,0);
- }
+ triple_vec := vector (0,0,0);
-- dbg_obj_princ ('opcodes[triple_ctr]=', opcodes[triple_ctr]);
- for (fld_ctr := fld_count - 1; fld_ctr >= 0; fld_ctr := fld_ctr - 1)
- {
- declare op integer;
- declare arg any;
- op := opcodes[triple_ctr][fld_ctr * 2];
- arg := opcodes[triple_ctr][fld_ctr * 2 + 1];
- if (1 = op)
- {
- declare i any;
- i := vars[arg];
- if (i is null)
- goto end_of_adding_triple;
- if (isiri_id (i))
- {
- if (fld_ctr in (1,3) and is_bnode_iri_id (i))
- signal ('RDF01', 'Bad variable value in CONSTRUCT: blank node can not be used as predicate or graph');
- }
- else if ((isstring (i) and (1 = __box_flags (i))) or (217 = __tag(i)))
- {
- if (fld_ctr in (1,3) and (i like 'bnode://%'))
- signal ('RDF01', 'Bad variable value in CONSTRUCT: blank node can not be used as predicate or graph');
- i := iri_to_id (i);
- }
- else if (2 <> fld_ctr)
- signal ('RDF01',
- sprintf ('Bad variable value in CONSTRUCT: "%.100s" (tag %d box flags %d) is not a valid %s, only object of a triple can be a literal',
- __tag (i), __box_flags (i),
- __rdf_strsqlval (i),
- case (fld_ctr) when 1 then 'predicate' else 'subject' end ) );
- triple_vec[fld_ctr] := i;
- }
- else if (2 = op)
- {
- if (isinteger (blank_ids))
- blank_ids := vector (iri_id_from_num (sequence_next ('RDF_URL_IID_BLANK')));
- while (arg >= length (blank_ids))
- blank_ids := vector_concat (blank_ids, vector (iri_id_from_num (sequence_next ('RDF_URL_IID_BLANK'))));
- if (fld_ctr in (1,3))
- signal ('RDF01', 'Bad triple for CONSTRUCT: blank node can not be used as predicate or graph');
- triple_vec[fld_ctr] := blank_ids[arg];
- }
- else if (3 = op)
- {
- if (arg is null)
- goto end_of_adding_triple;
-
- if (isiri_id (arg))
- {
- if (fld_ctr in (1,3) and is_bnode_iri_id (arg))
- signal ('RDF01', 'Bad const value in CONSTRUCT: blank node can not be used as predicate or graph');
- }
- else if ((isstring (arg) and (1 = __box_flags (arg))) or (217 = __tag(arg)))
- {
- if (fld_ctr in (1,3) and (arg like 'bnode://%'))
- signal ('RDF01', 'Bad const value in CONSTRUCT: blank node can not be used as predicate or graph');
- arg := iri_to_id (arg);
- }
- else if (2 <> fld_ctr)
- signal ('RDF01',
- sprintf ('Bad const value in CONSTRUCT: "%.100s" (tag %d box flags %d) is not a valid %s, only object of a triple can be a literal',
- __tag (arg), __box_flags (arg),
- __rdf_strsqlval (arg),
- case (fld_ctr) when 1 then 'predicate' else 'subject' end ) );
- else if (__tag of vector = __tag (arg))
- arg := DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (arg[0], arg[1], arg[2]);
- triple_vec[fld_ctr] := arg;
- }
- else signal ('RDFXX', 'Bad opcode in DB.DBA.SPARQL_CONSTRUCT()');
- }
- -- dbg_obj_princ ('generated triple:', triple_vec);
- dict_put (_env, triple_vec, 0);
-end_of_adding_triple: ;
- }
-}
-;
-
---!AWK PUBLIC
-create procedure DB.DBA.SPARQL_CONSTRUCT_FIN (inout _env any)
-{
- if (214 <> __tag(_env))
- _env := dict_new ();
- return _env;
-}
-;
-
---!AWK PUBLIC
-create aggregate DB.DBA.SPARQL_CONSTRUCT (in opcodes any, in vars any, in stats any, in use_dict_limit integer) returns any
-from DB.DBA.SPARQL_CONSTRUCT_INIT, DB.DBA.SPARQL_CONSTRUCT_ACC, DB.DBA.SPARQL_CONSTRUCT_FIN
-;
-
-create procedure DB.DBA.SPARQL_DESC_AGG_INIT (inout _env any)
-{
- _env := 0; -- No actual initialization
-}
-;
-
-create procedure DB.DBA.SPARQL_DESC_AGG_ACC (inout _env any, in vars any)
-{
- declare var_ctr integer;
- declare blank_ids any;
- if (214 <> __tag(_env))
- {
- _env := dict_new (31, sys_stat ('sparql_result_set_max_rows'), sys_stat ('sparql_max_mem_in_use'));
- }
- for (var_ctr := length (vars) - 1; var_ctr >= 0; var_ctr := var_ctr - 1)
- {
- declare i any;
- i := vars[var_ctr];
- if (isiri_id (i))
- dict_put (_env, i, 0);
- }
-}
-;
-
-create procedure DB.DBA.SPARQL_DESC_AGG_FIN (inout _env any)
-{
- declare subjects, options, res any;
- declare subj_ctr integer;
- if (214 <> __tag(_env))
- return dict_new ();
- return _env;
-}
-;
-
-create aggregate DB.DBA.SPARQL_DESC_AGG (in vars any) returns any
-from DB.DBA.SPARQL_DESC_AGG_INIT, DB.DBA.SPARQL_DESC_AGG_ACC, DB.DBA.SPARQL_DESC_AGG_FIN
-;
-
-create procedure DB.DBA.SPARQL_DESC_DICT (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
-{
- declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, g_dict, res any;
- declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;
- declare gs_app_callback, gs_app_uid, inf_ruleset, sameas varchar;
- declare rdf_type_iid IRI_ID;
- uid := get_keyword ('uid', options, http_nobody_uid());
- gs_app_callback := get_keyword ('gs-app-callback', options);
- if (gs_app_callback is not null)
- gs_app_uid := get_keyword ('gs-app-uid', options);
- inf_ruleset := get_keyword ('inference', options);
- sameas := get_keyword ('same-as', options);
- rdf_type_iid := iri_to_id (UNAME'http://www.w3.org/1999/02/22-rdf-syntax-ns#type');
- res := dict_new ();
- if (isinteger (consts))
- return res;
- foreach (any c in consts) do
- {
- if (isiri_id (c))
- dict_put (subj_dict, c, 0);
- }
- all_subj_descs := dict_list_keys (subj_dict, 1);
- all_s_count := length (all_subj_descs);
- if (0 = all_s_count)
- return res;
- gvector_sort (all_subj_descs, 1, 0, 0);
- if (__tag of integer = __tag (good_graphs))
- graphs_listed := 0;
- else
- {
- vectorbld_init (sorted_good_graphs);
- foreach (any g in good_graphs) do
- {
- if (isiri_id (g) and g < min_bnode_iri_id () and
- __rgs_ack_cbk (g, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (g, gs_app_uid))) )
- vectorbld_acc (sorted_good_graphs, g);
- }
- vectorbld_final (sorted_good_graphs);
- good_g_count := length (sorted_good_graphs);
- if (0 = good_g_count)
- return res;
- graphs_listed := 1;
- }
- vectorbld_init (sorted_bad_graphs);
- foreach (any g in bad_graphs) do
- {
- if (isiri_id (g) and g < min_bnode_iri_id ())
- vectorbld_acc (sorted_bad_graphs, g);
- }
- vectorbld_final (sorted_bad_graphs);
- bad_g_count := length (sorted_bad_graphs);
- vectorbld_init (phys_subjects);
- if (storage_name is null)
- storage_name := 'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage';
- else if (('' = storage_name) and (inf_ruleset is null) and (sameas is null))
- {
- for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
- {
- declare s, phys_s any;
- s := all_subj_descs [s_ctr];
- if (isiri_id (s))
- vectorbld_acc (phys_subjects, s);
- else
- {
- phys_s := iri_to_id (s, 0, 0);
- if (not isinteger (phys_s))
- vectorbld_acc (phys_subjects, phys_s);
- }
- }
- vectorbld_final (phys_subjects);
- goto describe_physical_subjects;
- }
- -- dbg_obj_princ ('storage_name=',storage_name, ' sorted_good_graphs=', sorted_good_graphs, ' sorted_bad_graphs=', sorted_bad_graphs);
- for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
- {
- declare s, phys_s, maps_s, maps_o any;
- declare maps_s_len, maps_o_len integer;
- s := all_subj_descs [s_ctr];
- maps_s := sparql_quad_maps_for_quad (NULL, s, NULL, NULL, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);
- maps_o := sparql_quad_maps_for_quad (NULL, NULL, NULL, s, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);
- -- dbg_obj_princ ('s = ', s, ' maps_s = ', maps_s, ' maps_o = ', maps_o);
- maps_s_len := length (maps_s);
- maps_o_len := length (maps_o);
- if ((inf_ruleset is null) and (sameas is null))
- {
- declare phys_as_s, phys_as_o integer;
- phys_as_s := case when ((maps_s_len > 0) and (maps_s[maps_s_len-1][0] = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap')) then 1 else 0 end;
- phys_as_o := case when ((maps_o_len > 0) and (maps_o[maps_o_len-1][0] = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap')) then 1 else 0 end;
- if (phys_as_s or phys_as_o)
- {
- if (isiri_id (s))
- {
- phys_s := s;
- vectorbld_acc (phys_subjects, phys_s);
- }
- else
- {
- phys_s := iri_to_id (s, 0, 0);
- if (not isinteger (phys_s))
- vectorbld_acc (phys_subjects, phys_s);
- }
- if (phys_as_s)
- {
- maps_s := subseq (maps_s, 0, maps_s_len-1);
- maps_s_len := maps_s_len - 1;
- }
- if (phys_as_o)
- {
- maps_o := subseq (maps_o, 0, maps_o_len-1);
- maps_o_len := maps_o_len - 1;
- }
- }
- }
- if ((maps_s_len > 0) or (maps_o_len > 0))
- all_subj_descs [s_ctr] := vector (s, maps_s, maps_o);
- else
- all_subj_descs [s_ctr] := 0;
- -- dbg_obj_princ ('s = ', s, ' maps = ', maps);
- -- dbg_obj_princ ('all_subj_descs [', s_ctr, '] = ', all_subj_descs [s_ctr]);
- }
- vectorbld_final (phys_subjects);
- for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
- {
- declare s_desc, s, maps_s, maps_o any;
- declare map_ctr, maps_s_len, maps_o_len integer;
- declare fname varchar;
- s_desc := all_subj_descs [s_ctr];
- if (isinteger (s_desc))
- goto end_of_s;
- s := s_desc[0];
- maps_s := s_desc[1];
- maps_o := s_desc[2];
- maps_s_len := length (maps_s);
- maps_o_len := length (maps_o);
- fname := sprintf ('SPARQL_DESC_DICT_QMV1_%U', md5 (storage_name || ' ' || inf_ruleset || ' ' || sameas || ' ' || cast (graphs_listed as varchar) || md5_box (maps_s) || md5_box (maps_o) || md5_box (sorted_bad_graphs)));
- if (not exists (select top 1 1 from Db.DBA.SYS_PROCEDURES where P_NAME = 'DB.DBA.' || fname))
- {
- declare ses, txt, saved_user any;
- ses := string_output ();
- http ('create procedure DB.DBA."' || fname || '" (in subj any, in res any', ses);
- if (graphs_listed)
- http (', inout sorted_good_graphs any', ses);
- http (')\n', ses);
- http ('{\n', ses);
- http (' declare subj_iri varchar;\n', ses);
- http (' subj_iri := id_to_iri_nosignal (subj);\n', ses);
- http (' for (sparql define output:valmode "LONG" define input:storage <' || storage_name || '> ', ses);
- foreach (any g in sorted_bad_graphs) do
- {
- http (' define input:named-graph-exclude <' || id_to_iri_nosignal (g) || '>\n', ses);
- }
- if (inf_ruleset is not null)
- http (' define input:inference <' || inf_ruleset || '>\n', ses);
- if (sameas is not null)
- http (' define input:same-as <' || sameas || '>\n', ses);
- http ('select ?g1 ?p1 ?o1\n', ses);
- http (' where { graph ?g1 {\n', ses);
- for (map_ctr := 0; map_ctr < maps_s_len; map_ctr := map_ctr + 1)
- {
- if (map_ctr > 0) http (' union\n', ses);
- http (' { quad map <' || maps_s[map_ctr][0] || '> { ?:subj_iri ?p1 ?o1 } }\n', ses);
- }
- http (' } } ) do {\n', ses);
- if (graphs_listed)
- http (' if (position (__i2idn ("g1"), sorted_good_graphs))\n', ses);
- http (' dict_bitor_or_put (res, vector (subj, "p1", "o1"), 1); }\n', ses);
- http (' for (sparql define output:valmode "LONG" define input:storage <' || storage_name || '> ', ses);
- foreach (any g in sorted_bad_graphs) do
- {
- http (' define input:named-graph-exclude <' || id_to_iri_nosignal (g) || '>\n', ses);
- }
- if (inf_ruleset is not null)
- http (' define input:inference <' || inf_ruleset || '>\n', ses);
- if (sameas is not null)
- http (' define input:same-as <' || sameas || '>\n', ses);
- http ('select ?g1 ?s1 ?p1\n', ses);
- http (' where { graph ?g1 {\n', ses);
- for (map_ctr := 0; map_ctr < maps_o_len; map_ctr := map_ctr + 1)
- {
- if (map_ctr > 0) http (' union\n', ses);
- http (' { quad map <' || maps_o[map_ctr][0] || '> { ?s1 ?p1 ?o1 . FILTER (?p1 != rdf:type) . FILTER(isREF (?o1)) . FILTER (?o1 = iri(?:subj_iri)) } }\n', ses);
- }
- http (' } } ) do {\n', ses);
- if (graphs_listed)
- http (' if (position (__i2idn ("g1"), sorted_good_graphs))\n', ses);
- http (' dict_bitor_or_put (res, vector ("s1", "p1", subj), 4); }\n', ses);
- http (' }\n', ses);
- txt := string_output_string (ses);
- -- dbg_obj_princ ('Procedure text: ', txt);
- saved_user := user;
- set_user_id ('dba', 1);
- exec (txt);
- set_user_id (saved_user);
- }
- if (graphs_listed)
- {
- -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, res, sorted_good_graphs, ')');
- call ('DB.DBA.' || fname)(s, res, sorted_good_graphs);
- }
- else
- {
- -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, res, ')');
- call ('DB.DBA.' || fname)(s, res);
- }
-end_of_s: ;
- }
-
-describe_physical_subjects:
- gvector_sort (phys_subjects, 1, 0, 0);
- phys_s_count := length (phys_subjects);
- -- dbg_obj_princ ('phys_subjects = ', phys_subjects);
- if (0 = phys_s_count)
- return res;
- -- dbg_obj_princ ('sorted_bad_graphs = ', sorted_bad_graphs);
- if (graphs_listed)
- {
- gvector_sort (sorted_good_graphs, 1, 0, 0);
- -- dbg_obj_princ ('sorted_good_graphs = ', sorted_good_graphs);
- for (g_ctr := good_g_count - 1; g_ctr >= 0; g_ctr := g_ctr - 1)
- {
- declare graph any;
- graph := sorted_good_graphs [g_ctr];
- for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
- {
- declare subj any;
- subj := phys_subjects [s_ctr];
- for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do
- {
- -- dbg_obj_princ ('found5 ', subj, p1, ' in ', graph);
- dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
- }
- for (select S as s1, P as p1 from DB.DBA.RDF_QUAD
- where G = graph and O = subj and P <> rdf_type_iid
- option (QUIETCAST)) do
- {
- -- dbg_obj_princ ('found2 ', s1, p1, subj, ' in ', graph);
- dict_bitor_or_put (res, vector (s1, p1, subj), 4);
- }
- }
- }
- return res;
- }
- g_dict := dict_new ();
- for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
- {
- declare subj, graph any;
- subj := phys_subjects [s_ctr];
- graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where O = subj and
- 0 = position (G, sorted_bad_graphs) and
- __rgs_ack_cbk (G, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );
- if (graph is not null)
- dict_put (g_dict, graph, 0);
- }
- sorted_good_graphs := dict_list_keys (g_dict, 1);
- if (0 = length (sorted_good_graphs))
- {
- g_dict := dict_new ();
- for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
- {
- declare subj, graph any;
- subj := phys_subjects [s_ctr];
- graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where S = subj and P = rdf_type_iid and
- 0 = position (G, sorted_bad_graphs) and
- __rgs_ack_cbk (G, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );
- if (graph is not null)
- dict_put (g_dict, graph, 0);
- }
- sorted_good_graphs := dict_list_keys (g_dict, 1);
- }
- -- dbg_obj_princ ('sorted_good_graphs = ', sorted_good_graphs);
- gvector_sort (sorted_good_graphs, 1, 0, 0);
- good_g_count := length (sorted_good_graphs);
- -- dbg_obj_princ ('sorted_good_graphs = ', sorted_good_graphs);
- for (g_ctr := good_g_count - 1; g_ctr >= 0; g_ctr := g_ctr - 1)
- {
- declare graph any;
- graph := sorted_good_graphs [g_ctr];
- for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
+ for (fld_ctr := 2; fld_ctr >= 0; fld_ctr := fld_ctr - 1)
{
- declare subj any;
- subj := phys_subjects [s_ctr];
- for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do
+ declare op integer;
+ declare arg any;
+ op := opcodes[triple_ctr][fld_ctr * 2];
+ arg := opcodes[triple_ctr][fld_ctr * 2 + 1];
+ if (1 = op)
{
- -- dbg_obj_princ ('found1 ', subj, p1, ' in ', graph);
- dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
--- if (isiri_id (obj1))
--- {
--- for (select P as p2, O as obj2
--- from DB.DBA.RDF_QUAD
--- where G = graph and S = obj1 and not (isiri_id (O)) ) do
--- {
--- dict_bitor_or_put (dict, vector (obj1, p2, __rdf_long_of_obj (obj2)), 17);
--- }
--- }
+ declare i any;
+ i := vars[arg];
+ if (i is null)
+ goto end_of_adding_triple;
+ if (isiri_id (i))
+ {
+ if ((1 = fld_ctr) and is_bnode_iri_id (i))
+ signal ('RDF01', 'Bad variable value in CONSTRUCT: blank node can not be used as predicate');
+ }
+ else if ((isstring (i) and (1 = __box_flags (i))) or (217 = __tag(i)))
+ {
+ if ((1 = fld_ctr) and (i like 'bnode://%'))
+ signal ('RDF01', 'Bad variable value in CONSTRUCT: blank node can not be used as predicate');
+ i := iri_to_id (i);
+ }
+ else if (2 > fld_ctr)
+ signal ('RDF01',
+ sprintf ('Bad variable value in CONSTRUCT: "%.100s" (tag %d box flags %d) is not a valid %s, only object of a triple can be a literal',
+ __tag (i), __box_flags (i),
+ __rdf_strsqlval (i),
+ case (fld_ctr) when 1 then 'predicate' else 'subject' end ) );
+ triple_vec[fld_ctr] := i;
}
- for (select S as s1, P as p1 from DB.DBA.RDF_QUAD
- where G = graph and O = subj and P <> rdf_type_iid
- option (QUIETCAST)) do
+ else if (2 = op)
{
- -- dbg_obj_princ ('found2 ', s1, p1, subj, ' in ', graph);
- dict_bitor_or_put (res, vector (s1, p1, subj), 4);
+ if (isinteger (blank_ids))
+ blank_ids := vector (iri_id_from_num (sequence_next ('RDF_URL_IID_BLANK')));
+ while (arg >= length (blank_ids))
+ blank_ids := vector_concat (blank_ids, vector (iri_id_from_num (sequence_next ('RDF_URL_IID_BLANK'))));
+ if (1 = fld_ctr)
+ signal ('RDF01', 'Bad triple for CONSTRUCT: blank node can not be used as predicate');
+ triple_vec[fld_ctr] := blank_ids[arg];
+ }
+ else if (3 = op)
+ {
+ if (arg is null)
+ goto end_of_adding_triple;
+
+ if (isiri_id (arg))
+ {
+ if ((1 = fld_ctr) and is_bnode_iri_id (arg))
+ signal ('RDF01', 'Bad const value in CONSTRUCT: blank node can not be used as predicate');
+ }
+ else if ((isstring (arg) and (1 = __box_flags (arg))) or (217 = __tag(arg)))
+ {
+ if ((1 = fld_ctr) and (arg like 'bnode://%'))
+ signal ('RDF01', 'Bad const value in CONSTRUCT: blank node can not be used as predicate');
+ arg := iri_to_id (arg);
+ }
+ else if (2 > fld_ctr)
+ signal ('RDF01',
+ sprintf ('Bad const value in CONSTRUCT: "%.100s" (tag %d box flags %d) is not a valid %s, only object of a triple can be a literal',
+ __tag (arg), __box_flags (arg),
+ __rdf_strsqlval (arg),
+ case (fld_ctr) when 1 then 'predicate' else 'subject' end ) );
+ else if (__tag of vector = __tag (arg))
+ arg := DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (arg[0], arg[1], arg[2]);
+ triple_vec[fld_ctr] := arg;
}
+ else signal ('RDFXX', 'Bad opcode in DB.DBA.SPARQL_CONSTRUCT()');
}
+ -- dbg_obj_princ ('generated triple:', triple_vec);
+ dict_put (_env, triple_vec, 0);
+end_of_adding_triple: ;
}
- -- dbg_obj_princ ('final result is ', res);
- return res;
}
;
-create procedure DB.DBA.SPARQL_DESC_DICT_SPO (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
+--!AWK PUBLIC
+create procedure DB.DBA.SPARQL_CONSTRUCT_FIN (inout _env any)
{
- declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, res any;
+ if (214 <> __tag(_env))
+ _env := dict_new ();
+ return _env;
+}
+;
+
+--!AWK PUBLIC
+create aggregate DB.DBA.SPARQL_CONSTRUCT (in opcodes any, in vars any, in stats any, in use_dict_limit integer) returns any
+from DB.DBA.SPARQL_CONSTRUCT_INIT, DB.DBA.SPARQL_CONSTRUCT_ACC, DB.DBA.SPARQL_CONSTRUCT_FIN
+;
+
+create procedure DB.DBA.SPARQL_DESC_AGG_INIT (inout _env any)
+{
+ _env := 0; -- No actual initialization
+}
+;
+
+create procedure DB.DBA.SPARQL_DESC_AGG_ACC (inout _env any, in vars any)
+{
+ declare var_ctr integer;
+ declare blank_ids any;
+ if (214 <> __tag(_env))
+ {
+ _env := dict_new (31, sys_stat ('sparql_result_set_max_rows'), sys_stat ('sparql_max_mem_in_use'));
+ }
+ for (var_ctr := length (vars) - 1; var_ctr >= 0; var_ctr := var_ctr - 1)
+ {
+ declare i any;
+ i := vars[var_ctr];
+ if (isiri_id (i))
+ dict_put (_env, i, 0);
+ }
+}
+;
+
+create procedure DB.DBA.SPARQL_DESC_AGG_FIN (inout _env any)
+{
+ declare subjects, options, res any;
+ declare subj_ctr integer;
+ if (214 <> __tag(_env))
+ return dict_new ();
+ return _env;
+}
+;
+
+create aggregate DB.DBA.SPARQL_DESC_AGG (in vars any) returns any
+from DB.DBA.SPARQL_DESC_AGG_INIT, DB.DBA.SPARQL_DESC_AGG_ACC, DB.DBA.SPARQL_DESC_AGG_FIN
+;
+
+create procedure DB.DBA.SPARQL_DESC_DICT (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
+{
+ declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, g_dict, res any;
declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;
declare gs_app_callback, gs_app_uid, inf_ruleset, sameas varchar;
declare rdf_type_iid IRI_ID;
@@ -7805,30 +6632,46 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO (in subj_dict any, in consts any, i
-- dbg_obj_princ ('storage_name=',storage_name, ' sorted_good_graphs=', sorted_good_graphs, ' sorted_bad_graphs=', sorted_bad_graphs);
for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
{
- declare s, phys_s, maps any;
- declare maps_len integer;
+ declare s, phys_s, maps_s, maps_o any;
+ declare maps_s_len, maps_o_len integer;
s := all_subj_descs [s_ctr];
- maps := sparql_quad_maps_for_quad (NULL, s, NULL, NULL, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);
- -- dbg_obj_princ ('s = ', s, ' maps = ', maps);
- maps_len := length (maps);
- if ((maps_len > 0) and (inf_ruleset is null) and (sameas is null) and (maps[maps_len-1][0] = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap'))
+ maps_s := sparql_quad_maps_for_quad (NULL, s, NULL, NULL, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);
+ maps_o := sparql_quad_maps_for_quad (NULL, NULL, NULL, s, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);
+ -- dbg_obj_princ ('s = ', s, ' maps_s = ', maps_s, ' maps_o = ', maps_o);
+ maps_s_len := length (maps_s);
+ maps_o_len := length (maps_o);
+ if ((inf_ruleset is null) and (sameas is null))
{
- if (isiri_id (s))
- {
- phys_s := s;
- vectorbld_acc (phys_subjects, phys_s);
- }
- else
+ declare phys_as_s, phys_as_o integer;
+ phys_as_s := case when ((maps_s_len > 0) and (maps_s[maps_s_len-1][0] = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap')) then 1 else 0 end;
+ phys_as_o := case when ((maps_o_len > 0) and (maps_o[maps_o_len-1][0] = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap')) then 1 else 0 end;
+ if (phys_as_s or phys_as_o)
{
- phys_s := iri_to_id (s, 0, 0);
- if (not isinteger (phys_s))
- vectorbld_acc (phys_subjects, phys_s);
+ if (isiri_id (s))
+ {
+ phys_s := s;
+ vectorbld_acc (phys_subjects, phys_s);
+ }
+ else
+ {
+ phys_s := iri_to_id (s, 0, 0);
+ if (not isinteger (phys_s))
+ vectorbld_acc (phys_subjects, phys_s);
+ }
+ if (phys_as_s)
+ {
+ maps_s := subseq (maps_s, 0, maps_s_len-1);
+ maps_s_len := maps_s_len - 1;
+ }
+ if (phys_as_o)
+ {
+ maps_o := subseq (maps_o, 0, maps_o_len-1);
+ maps_o_len := maps_o_len - 1;
+ }
}
- maps := subseq (maps, 0, maps_len-1);
- maps_len := maps_len - 1;
}
- if (maps_len > 0)
- all_subj_descs [s_ctr] := vector (s, maps);
+ if ((maps_s_len > 0) or (maps_o_len > 0))
+ all_subj_descs [s_ctr] := vector (s, maps_s, maps_o);
else
all_subj_descs [s_ctr] := 0;
-- dbg_obj_princ ('s = ', s, ' maps = ', maps);
@@ -7837,16 +6680,18 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO (in subj_dict any, in consts any, i
vectorbld_final (phys_subjects);
for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
{
- declare s_desc, s, maps any;
- declare map_ctr, maps_len integer;
+ declare s_desc, s, maps_s, maps_o any;
+ declare map_ctr, maps_s_len, maps_o_len integer;
declare fname varchar;
s_desc := all_subj_descs [s_ctr];
if (isinteger (s_desc))
goto end_of_s;
s := s_desc[0];
- maps := s_desc[1];
- maps_len := length (maps);
- fname := sprintf ('SPARQL_DESC_DICT_QMV1_%U', md5 (storage_name || ' ' || inf_ruleset || ' ' || sameas || ' ' || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));
+ maps_s := s_desc[1];
+ maps_o := s_desc[2];
+ maps_s_len := length (maps_s);
+ maps_o_len := length (maps_o);
+ fname := sprintf ('SPARQL_DESC_DICT_QMV1_%U', md5 (storage_name || ' ' || inf_ruleset || ' ' || sameas || ' ' || cast (graphs_listed as varchar) || md5_box (maps_s) || md5_box (maps_o) || md5_box (sorted_bad_graphs)));
if (not exists (select top 1 1 from Db.DBA.SYS_PROCEDURES where P_NAME = 'DB.DBA.' || fname))
{
declare ses, txt, saved_user any;
@@ -7869,146 +6714,57 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO (in subj_dict any, in consts any, i
http (' define input:same-as <' || sameas || '>\n', ses);
http ('select ?g1 ?p1 ?o1\n', ses);
http (' where { graph ?g1 {\n', ses);
- for (map_ctr := 0; map_ctr < maps_len; map_ctr := map_ctr + 1)
+ for (map_ctr := 0; map_ctr < maps_s_len; map_ctr := map_ctr + 1)
{
if (map_ctr > 0) http (' union\n', ses);
- http (' { quad map <' || maps[map_ctr][0] || '> { ?:subj_iri ?p1 ?o1 } }\n', ses);
+ http (' { quad map <' || maps_s[map_ctr][0] || '> { ?:subj_iri ?p1 ?o1 } }\n', ses);
}
http (' } } ) do {\n', ses);
if (graphs_listed)
http (' if (position (__i2idn ("g1"), sorted_good_graphs))\n', ses);
- http (' dict_bitor_or_put (res, vector (subj, "p1", "o1"), 1); } }\n', ses);
- txt := string_output_string (ses);
- -- dbg_obj_princ ('Procedure text: ', txt);
- saved_user := user;
- set_user_id ('dba', 1);
- exec (txt);
- set_user_id (saved_user);
- }
- if (graphs_listed)
- {
- -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, res, sorted_good_graphs, ')');
- call ('DB.DBA.' || fname)(s, res, sorted_good_graphs);
- }
- else
- {
- -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, res, ')');
- call ('DB.DBA.' || fname)(s, res);
- }
-end_of_s: ;
- }
-
-describe_physical_subjects:
- gvector_sort (phys_subjects, 1, 0, 0);
- phys_s_count := length (phys_subjects);
- -- dbg_obj_princ ('phys_subjects = ', phys_subjects);
- if (0 = phys_s_count)
- return res;
- -- dbg_obj_princ ('sorted_bad_graphs = ', sorted_bad_graphs);
- if (graphs_listed)
- {
- gvector_sort (sorted_good_graphs, 1, 0, 0);
- -- dbg_obj_princ ('sorted_good_graphs = ', sorted_good_graphs);
- for (g_ctr := good_g_count - 1; g_ctr >= 0; g_ctr := g_ctr - 1)
- {
- declare graph any;
- graph := sorted_good_graphs [g_ctr];
- for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
+ http (' dict_bitor_or_put (res, vector (subj, "p1", "o1"), 1); }\n', ses);
+ http (' for (sparql define output:valmode "LONG" define input:storage <' || storage_name || '> ', ses);
+ foreach (any g in sorted_bad_graphs) do
{
- declare subj any;
- subj := phys_subjects [s_ctr];
- for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do
- {
- -- dbg_obj_princ ('found3 ', subj, p1, ' in ', graph);
- dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
- }
+ http (' define input:named-graph-exclude <' || id_to_iri_nosignal (g) || '>\n', ses);
+ }
+ if (inf_ruleset is not null)
+ http (' define input:inference <' || inf_ruleset || '>\n', ses);
+ if (sameas is not null)
+ http (' define input:same-as <' || sameas || '>\n', ses);
+ http ('select ?g1 ?s1 ?p1\n', ses);
+ http (' where { graph ?g1 {\n', ses);
+ for (map_ctr := 0; map_ctr < maps_o_len; map_ctr := map_ctr + 1)
+ {
+ if (map_ctr > 0) http (' union\n', ses);
+ http (' { quad map <' || maps_o[map_ctr][0] || '> { ?s1 ?p1 ?o1 . FILTER (?p1 != rdf:type) . FILTER(isREF (?o1)) . FILTER (?o1 = iri(?:subj_iri)) } }\n', ses);
}
+ http (' } } ) do {\n', ses);
+ if (graphs_listed)
+ http (' if (position (__i2idn ("g1"), sorted_good_graphs))\n', ses);
+ http (' dict_bitor_or_put (res, vector ("s1", "p1", subj), 4); }\n', ses);
+ http (' }\n', ses);
+ txt := string_output_string (ses);
+ -- dbg_obj_princ ('Procedure text: ', txt);
+ saved_user := user;
+ set_user_id ('dba', 1);
+ exec (txt);
+ set_user_id (saved_user);
}
- return res;
- }
- for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
- {
- declare subj any;
- subj := phys_subjects [s_ctr];
- for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where
- 0 = position (G, sorted_bad_graphs) and
- S = subj and
- __rgs_ack_cbk (G, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do
- {
- -- dbg_obj_princ ('found4 ', subj, p1);
- dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
- }
- }
- return res;
-}
-;
-
-create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
-{
- declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, g_dict, res any;
- declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;
- declare gs_app_callback, gs_app_uid varchar;
- declare rdf_type_iid IRI_ID;
- uid := get_keyword ('uid', options, http_nobody_uid());
- gs_app_callback := get_keyword ('gs-app-callback', options);
- if (gs_app_callback is not null)
- gs_app_uid := get_keyword ('gs-app-uid', options);
- rdf_type_iid := iri_to_id (UNAME'http://www.w3.org/1999/02/22-rdf-syntax-ns#type');
- res := dict_new ();
- if (isinteger (consts))
- return res;
- foreach (any c in consts) do
- {
- if (isiri_id (c))
- dict_put (subj_dict, c, 0);
- }
- all_subj_descs := dict_list_keys (subj_dict, 1);
- all_s_count := length (all_subj_descs);
- if (0 = all_s_count)
- return res;
- gvector_sort (all_subj_descs, 1, 0, 0);
- if (__tag of integer = __tag (good_graphs))
- graphs_listed := 0;
- else
- {
- vectorbld_init (sorted_good_graphs);
- foreach (any g in good_graphs) do
+ if (graphs_listed)
{
- if (isiri_id (g) and g < min_bnode_iri_id () and
- __rgs_ack_cbk (g, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (g, gs_app_uid))) )
- vectorbld_acc (sorted_good_graphs, g);
+ -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, res, sorted_good_graphs, ')');
+ call ('DB.DBA.' || fname)(s, res, sorted_good_graphs);
}
- vectorbld_final (sorted_good_graphs);
- good_g_count := length (sorted_good_graphs);
- if (0 = good_g_count)
- return res;
- graphs_listed := 1;
- }
- vectorbld_init (sorted_bad_graphs);
- foreach (any g in bad_graphs) do
- {
- if (isiri_id (g) and g < min_bnode_iri_id ())
- vectorbld_acc (sorted_bad_graphs, g);
- }
- vectorbld_final (sorted_bad_graphs);
- bad_g_count := length (sorted_bad_graphs);
- vectorbld_init (phys_subjects);
- for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
- {
- declare s, phys_s any;
- s := all_subj_descs [s_ctr];
- if (isiri_id (s))
- vectorbld_acc (phys_subjects, s);
else
{
- phys_s := iri_to_id (s, 0, 0);
- if (not isinteger (phys_s))
- vectorbld_acc (phys_subjects, phys_s);
+ -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, res, ')');
+ call ('DB.DBA.' || fname)(s, res);
}
+end_of_s: ;
}
- vectorbld_final (phys_subjects);
+
+describe_physical_subjects:
gvector_sort (phys_subjects, 1, 0, 0);
phys_s_count := length (phys_subjects);
-- dbg_obj_princ ('phys_subjects = ', phys_subjects);
@@ -8032,6 +6788,13 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in cons
-- dbg_obj_princ ('found5 ', subj, p1, ' in ', graph);
dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
}
+ for (select S as s1, P as p1 from DB.DBA.RDF_QUAD
+ where G = graph and O = subj and P <> rdf_type_iid
+ option (QUIETCAST)) do
+ {
+ -- dbg_obj_princ ('found2 ', s1, p1, subj, ' in ', graph);
+ dict_bitor_or_put (res, vector (s1, p1, subj), 4);
+ }
}
}
return res;
@@ -8042,9 +6805,9 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in cons
declare subj, graph any;
subj := phys_subjects [s_ctr];
graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where O = subj and
- 0 = position (G, sorted_bad_graphs) and
- __rgs_ack_cbk (G, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );
+ 0 = position (G, sorted_bad_graphs) and
+ __rgs_ack_cbk (G, uid, 1) and
+ (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );
if (graph is not null)
dict_put (g_dict, graph, 0);
}
@@ -8057,9 +6820,9 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in cons
declare subj, graph any;
subj := phys_subjects [s_ctr];
graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where S = subj and P = rdf_type_iid and
- 0 = position (G, sorted_bad_graphs) and
- __rgs_ack_cbk (G, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );
+ 0 = position (G, sorted_bad_graphs) and
+ __rgs_ack_cbk (G, uid, 1) and
+ (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );
if (graph is not null)
dict_put (g_dict, graph, 0);
}
@@ -8079,7 +6842,7 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in cons
subj := phys_subjects [s_ctr];
for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do
{
- -- dbg_obj_princ ('found6 ', subj, p1, ' in ', graph);
+ -- dbg_obj_princ ('found1 ', subj, p1, ' in ', graph);
dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
-- if (isiri_id (obj1))
-- {
@@ -8091,13 +6854,13 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in cons
-- }
-- }
}
--- for (select S as s1, P as p1 from DB.DBA.RDF_QUAD
--- where G = graph and O = subj and P <> rdf_type_iid
--- option (QUIETCAST)) do
--- {
- -- dbg_obj_princ ('found7 ', s1, p1, subj, ' in ', graph);
--- dict_bitor_or_put (res, vector (s1, p1, subj), 4);
--- }
+ for (select S as s1, P as p1 from DB.DBA.RDF_QUAD
+ where G = graph and O = subj and P <> rdf_type_iid
+ option (QUIETCAST)) do
+ {
+ -- dbg_obj_princ ('found2 ', s1, p1, subj, ' in ', graph);
+ dict_bitor_or_put (res, vector (s1, p1, subj), 4);
+ }
}
}
-- dbg_obj_princ ('final result is ', res);
@@ -8105,17 +6868,18 @@ create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in cons
}
;
-create procedure DB.DBA.SPARQL_DESC_DICT_CBD (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
+create procedure DB.DBA.SPARQL_DESC_DICT_SPO (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
{
- declare all_subjs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, next_iter_subjs, res any;
+ declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, res any;
declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;
- declare gs_app_callback, gs_app_uid, inf_ruleset varchar;
+ declare gs_app_callback, gs_app_uid, inf_ruleset, sameas varchar;
declare rdf_type_iid IRI_ID;
uid := get_keyword ('uid', options, http_nobody_uid());
gs_app_callback := get_keyword ('gs-app-callback', options);
if (gs_app_callback is not null)
gs_app_uid := get_keyword ('gs-app-uid', options);
inf_ruleset := get_keyword ('inference', options);
+ sameas := get_keyword ('same-as', options);
rdf_type_iid := iri_to_id (UNAME'http://www.w3.org/1999/02/22-rdf-syntax-ns#type');
res := dict_new ();
if (isinteger (consts))
@@ -8125,16 +6889,11 @@ create procedure DB.DBA.SPARQL_DESC_DICT_CBD (in subj_dict any, in consts any, i
if (isiri_id (c))
dict_put (subj_dict, c, 0);
}
- all_subjs := dict_list_keys (subj_dict, 0);
- next_iter_subjs := dict_new ();
- all_s_count := length (all_subjs);
+ all_subj_descs := dict_list_keys (subj_dict, 1);
+ all_s_count := length (all_subj_descs);
if (0 = all_s_count)
return res;
-
-next_iteration:
- all_s_count := length (all_subjs);
- gvector_sort (all_subjs, 1, 0, 0);
- -- dbg_obj_princ ('new iteration: all_subjs = ', all_subjs);
+ gvector_sort (all_subj_descs, 1, 0, 0);
if (__tag of integer = __tag (good_graphs))
graphs_listed := 0;
else
@@ -8164,12 +6923,12 @@ next_iteration:
vectorbld_init (phys_subjects);
if (storage_name is null)
storage_name := 'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage';
- else if (('' = storage_name) and (inf_ruleset is null))
+ else if (('' = storage_name) and (inf_ruleset is null) and (sameas is null))
{
for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
{
declare s, phys_s any;
- s := all_subjs [s_ctr];
+ s := all_subj_descs [s_ctr];
if (isiri_id (s))
vectorbld_acc (phys_subjects, s);
else
@@ -8187,11 +6946,11 @@ next_iteration:
{
declare s, phys_s, maps any;
declare maps_len integer;
- s := all_subjs [s_ctr];
+ s := all_subj_descs [s_ctr];
maps := sparql_quad_maps_for_quad (NULL, s, NULL, NULL, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);
- -- dbg_obj_princ ('s = ', s, id_to_iri (s), ' maps = ', maps);
+ -- dbg_obj_princ ('s = ', s, ' maps = ', maps);
maps_len := length (maps);
- if ((maps_len > 0) and (inf_ruleset is null) and (maps[maps_len-1][0] = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap'))
+ if ((maps_len > 0) and (inf_ruleset is null) and (sameas is null) and (maps[maps_len-1][0] = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap'))
{
if (isiri_id (s))
{
@@ -8208,11 +6967,11 @@ next_iteration:
maps_len := maps_len - 1;
}
if (maps_len > 0)
- all_subjs [s_ctr] := vector (s, maps);
+ all_subj_descs [s_ctr] := vector (s, maps);
else
- all_subjs [s_ctr] := 0;
+ all_subj_descs [s_ctr] := 0;
-- dbg_obj_princ ('s = ', s, ' maps = ', maps);
- -- dbg_obj_princ ('all_subjs [', s_ctr, '] = ', all_subjs [s_ctr]);
+ -- dbg_obj_princ ('all_subj_descs [', s_ctr, '] = ', all_subj_descs [s_ctr]);
}
vectorbld_final (phys_subjects);
for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
@@ -8220,18 +6979,18 @@ next_iteration:
declare s_desc, s, maps any;
declare map_ctr, maps_len integer;
declare fname varchar;
- s_desc := all_subjs [s_ctr];
+ s_desc := all_subj_descs [s_ctr];
if (isinteger (s_desc))
goto end_of_s;
s := s_desc[0];
maps := s_desc[1];
maps_len := length (maps);
- fname := sprintf ('SPARQL_DESC_DICT_CBD_QMV1_%U', md5 (storage_name || inf_ruleset || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));
+ fname := sprintf ('SPARQL_DESC_DICT_QMV1_%U', md5 (storage_name || ' ' || inf_ruleset || ' ' || sameas || ' ' || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));
if (not exists (select top 1 1 from Db.DBA.SYS_PROCEDURES where P_NAME = 'DB.DBA.' || fname))
{
declare ses, txt, saved_user any;
ses := string_output ();
- http ('create procedure DB.DBA."' || fname || '" (in subj any, in subj_dict any, in next_iter_subjs any, in res any', ses);
+ http ('create procedure DB.DBA."' || fname || '" (in subj any, in res any', ses);
if (graphs_listed)
http (', inout sorted_good_graphs any', ses);
http (')\n', ses);
@@ -8245,29 +7004,19 @@ next_iteration:
}
if (inf_ruleset is not null)
http (' define input:inference <' || inf_ruleset || '>\n', ses);
- http ('select ?g1 ?p1 ?o1 ?g2 ?st2\n', ses);
+ if (sameas is not null)
+ http (' define input:same-as <' || sameas || '>\n', ses);
+ http ('select ?g1 ?p1 ?o1\n', ses);
http (' where { graph ?g1 {\n', ses);
for (map_ctr := 0; map_ctr < maps_len; map_ctr := map_ctr + 1)
{
if (map_ctr > 0) http (' union\n', ses);
http (' { quad map <' || maps[map_ctr][0] || '> { ?:subj_iri ?p1 ?o1 } }\n', ses);
}
- http (' }\n', ses);
- http (' optional { graph ?g2 {\n', ses);
- http (' ?st2 a rdf:Statement ; rdf:subject ?:subj_iri ; rdf:predicate ?p1 ; rdf:object ?o1 } }\n', ses);
- http (' } ) do {\n', ses);
- if (graphs_listed)
- http (' if (position (__i2idn ("g1"), sorted_good_graphs)) {\n', ses);
- http (' dict_bitor_or_put (res, vector (subj, "p1", "o1"), 1);\n', ses);
- http (' if (isiri_id ("o1") and "o1" > min_bnode_iri_id() and dict_get (subj_dict, "o1") is null)\n', ses);
- http (' dict_put (next_iter_subjs, "o1", 1);\n', ses);
- if (graphs_listed)
- http (' if (position (__i2idn ("g2"), sorted_good_graphs)) {\n', ses);
- http (' if ("st2" is not null and dict_get (subj_dict, "st2") is null)\n', ses);
- http (' dict_put (next_iter_subjs, "o1", 1);\n', ses);
+ http (' } } ) do {\n', ses);
if (graphs_listed)
- http (' } }\n', ses);
- http (' } }\n', ses);
+ http (' if (position (__i2idn ("g1"), sorted_good_graphs))\n', ses);
+ http (' dict_bitor_or_put (res, vector (subj, "p1", "o1"), 1); } }\n', ses);
txt := string_output_string (ses);
-- dbg_obj_princ ('Procedure text: ', txt);
saved_user := user;
@@ -8277,13 +7026,13 @@ next_iteration:
}
if (graphs_listed)
{
- -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, subj_dict, next_iter_subjs, res, sorted_good_graphs, ')');
- call ('DB.DBA.' || fname)(s, subj_dict, next_iter_subjs, res, sorted_good_graphs);
+ -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, res, sorted_good_graphs, ')');
+ call ('DB.DBA.' || fname)(s, res, sorted_good_graphs);
}
else
{
- -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, subj_dict, next_iter_subjs, res, ')');
- call ('DB.DBA.' || fname)(s, subj_dict, next_iter_subjs, res);
+ -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, res, ')');
+ call ('DB.DBA.' || fname)(s, res);
}
end_of_s: ;
}
@@ -8311,66 +7060,33 @@ describe_physical_subjects:
{
-- dbg_obj_princ ('found3 ', subj, p1, ' in ', graph);
dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
- if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)
- dict_put (next_iter_subjs, obj1, 1);
- for (sparql define output:valmode "LONG"
- select ?g2 ?st2 where {
- graph ?g2 {
- ?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do
- {
- if (position ("g2", sorted_good_graphs) and dict_get (subj_dict, "st2") is null)
- dict_put (next_iter_subjs, "st2", 1);
- }
- }
- }
- }
- }
- else
- {
- for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
- {
- declare subj any;
- subj := phys_subjects [s_ctr];
- for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where
- 0 = position (G, sorted_bad_graphs) and
- S = subj and
- __rgs_ack_cbk (G, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do
- {
- -- dbg_obj_princ ('found4 ', subj, p1);
- dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
- if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)
- dict_put (next_iter_subjs, obj1, 1);
- for (sparql define output:valmode "LONG"
- select ?g2 ?st2 where {
- graph ?g2 {
- ?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do
- {
- if (0 = position ("g2", sorted_bad_graphs) and
- dict_get (subj_dict, "st2") is null and
- __rgs_ack_cbk ("g2", uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) ("g2", gs_app_uid))) )
- dict_put (next_iter_subjs, "st2", 1);
}
}
}
+ return res;
}
-ret_or_next_iter:
- if (0 = dict_size (next_iter_subjs))
+ for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
{
- -- dbg_obj_princ ('no new subjs, res = ', dict_list_keys (res, 0));
- return res;
+ declare subj any;
+ subj := phys_subjects [s_ctr];
+ for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where
+ 0 = position (G, sorted_bad_graphs) and
+ S = subj and
+ __rgs_ack_cbk (G, uid, 1) and
+ (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do
+ {
+ -- dbg_obj_princ ('found4 ', subj, p1);
+ dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
+ }
}
- all_subjs := dict_list_keys (next_iter_subjs, 1);
- foreach (IRI_ID s in all_subjs) do dict_put (subj_dict, s, 1);
- goto next_iteration;
+ return res;
}
;
-create procedure DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
+create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
{
- declare all_subjs, sorted_good_graphs, sorted_bad_graphs, next_iter_subjs, res any;
- declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count integer;
+ declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, g_dict, res any;
+ declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;
declare gs_app_callback, gs_app_uid varchar;
declare rdf_type_iid IRI_ID;
uid := get_keyword ('uid', options, http_nobody_uid());
@@ -8386,16 +7102,11 @@ create procedure DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL (in subj_dict any, in cons
if (isiri_id (c))
dict_put (subj_dict, c, 0);
}
- all_subjs := dict_list_keys (subj_dict, 0);
- next_iter_subjs := dict_new ();
- all_s_count := length (all_subjs);
+ all_subj_descs := dict_list_keys (subj_dict, 1);
+ all_s_count := length (all_subj_descs);
if (0 = all_s_count)
return res;
-
-next_iteration:
- all_s_count := length (all_subjs);
- gvector_sort (all_subjs, 1, 0, 0);
- -- dbg_obj_princ ('new iteration: all_subjs = ', all_subjs);
+ gvector_sort (all_subj_descs, 1, 0, 0);
if (__tag of integer = __tag (good_graphs))
graphs_listed := 0;
else
@@ -8422,8 +7133,25 @@ next_iteration:
}
vectorbld_final (sorted_bad_graphs);
bad_g_count := length (sorted_bad_graphs);
- -- dbg_obj_princ ('all_subjs = ', all_subjs);
- if (0 = all_s_count)
+ vectorbld_init (phys_subjects);
+ for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
+ {
+ declare s, phys_s any;
+ s := all_subj_descs [s_ctr];
+ if (isiri_id (s))
+ vectorbld_acc (phys_subjects, s);
+ else
+ {
+ phys_s := iri_to_id (s, 0, 0);
+ if (not isinteger (phys_s))
+ vectorbld_acc (phys_subjects, phys_s);
+ }
+ }
+ vectorbld_final (phys_subjects);
+ gvector_sort (phys_subjects, 1, 0, 0);
+ phys_s_count := length (phys_subjects);
+ -- dbg_obj_princ ('phys_subjects = ', phys_subjects);
+ if (0 = phys_s_count)
return res;
-- dbg_obj_princ ('sorted_bad_graphs = ', sorted_bad_graphs);
if (graphs_listed)
@@ -8434,75 +7162,92 @@ next_iteration:
{
declare graph any;
graph := sorted_good_graphs [g_ctr];
- for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
+ for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
{
declare subj any;
- subj := all_subjs [s_ctr];
+ subj := phys_subjects [s_ctr];
for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do
{
- -- dbg_obj_princ ('found3 ', subj, p1, ' in ', graph);
+ -- dbg_obj_princ ('found5 ', subj, p1, ' in ', graph);
dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
- if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)
- dict_put (next_iter_subjs, obj1, 1);
- for (sparql define output:valmode "LONG"
- select ?g2 ?st2 where {
- graph ?g2 {
- ?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do
- {
- if (position ("g2", sorted_good_graphs) and dict_get (subj_dict, "st2") is null)
- dict_put (next_iter_subjs, "st2", 1);
- }
}
}
}
+ return res;
+ }
+ g_dict := dict_new ();
+ for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
+ {
+ declare subj, graph any;
+ subj := phys_subjects [s_ctr];
+ graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where O = subj and
+ 0 = position (G, sorted_bad_graphs) and
+ __rgs_ack_cbk (G, uid, 1) and
+ (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );
+ if (graph is not null)
+ dict_put (g_dict, graph, 0);
+ }
+ sorted_good_graphs := dict_list_keys (g_dict, 1);
+ if (0 = length (sorted_good_graphs))
+ {
+ g_dict := dict_new ();
+ for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
+ {
+ declare subj, graph any;
+ subj := phys_subjects [s_ctr];
+ graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where S = subj and P = rdf_type_iid and
+ 0 = position (G, sorted_bad_graphs) and
+ __rgs_ack_cbk (G, uid, 1) and
+ (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );
+ if (graph is not null)
+ dict_put (g_dict, graph, 0);
+ }
+ sorted_good_graphs := dict_list_keys (g_dict, 1);
}
- else
+ -- dbg_obj_princ ('sorted_good_graphs = ', sorted_good_graphs);
+ gvector_sort (sorted_good_graphs, 1, 0, 0);
+ good_g_count := length (sorted_good_graphs);
+ -- dbg_obj_princ ('sorted_good_graphs = ', sorted_good_graphs);
+ for (g_ctr := good_g_count - 1; g_ctr >= 0; g_ctr := g_ctr - 1)
{
- for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
+ declare graph any;
+ graph := sorted_good_graphs [g_ctr];
+ for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
{
declare subj any;
- subj := all_subjs [s_ctr];
- for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where
- 0 = position (G, sorted_bad_graphs) and
- S = subj and
- __rgs_ack_cbk (G, uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do
+ subj := phys_subjects [s_ctr];
+ for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do
{
- -- dbg_obj_princ ('found4 ', subj, p1);
+ -- dbg_obj_princ ('found6 ', subj, p1, ' in ', graph);
dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
- if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)
- dict_put (next_iter_subjs, obj1, 1);
- for (sparql define output:valmode "LONG"
- select ?g2 ?st2 where {
- graph ?g2 {
- ?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do
- {
- if (0 = position ("g2", sorted_bad_graphs) and
- dict_get (subj_dict, "st2") is null and
- __rgs_ack_cbk ("g2", uid, 1) and
- (gs_app_callback is null or bit_and (1, call (gs_app_callback) ("g2", gs_app_uid))) )
- dict_put (next_iter_subjs, "st2", 1);
- }
+-- if (isiri_id (obj1))
+-- {
+-- for (select P as p2, O as obj2
+-- from DB.DBA.RDF_QUAD
+-- where G = graph and S = obj1 and not (isiri_id (O)) ) do
+-- {
+-- dict_bitor_or_put (dict, vector (obj1, p2, __rdf_long_of_obj (obj2)), 17);
+-- }
+-- }
}
+-- for (select S as s1, P as p1 from DB.DBA.RDF_QUAD
+-- where G = graph and O = subj and P <> rdf_type_iid
+-- option (QUIETCAST)) do
+-- {
+ -- dbg_obj_princ ('found7 ', s1, p1, subj, ' in ', graph);
+-- dict_bitor_or_put (res, vector (s1, p1, subj), 4);
+-- }
}
}
-
-ret_or_next_iter:
- if (0 = dict_size (next_iter_subjs))
- {
- -- dbg_obj_princ ('no new subjs, res = ', dict_list_keys (res, 0));
- return res;
- }
- all_subjs := dict_list_keys (next_iter_subjs, 1);
- foreach (IRI_ID s in all_subjs) do dict_put (subj_dict, s, 1);
- goto next_iteration;
+ -- dbg_obj_princ ('final result is ', res);
+ return res;
}
;
-create procedure DB.DBA.SPARQL_DESC_DICT_OBJCBD (in obj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
+create procedure DB.DBA.SPARQL_DESC_DICT_CBD (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
{
- declare all_objs, phys_objects, sorted_good_graphs, sorted_bad_graphs, next_iter_objs, res any;
- declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, obj_ctr, all_obj_count, phys_obj_count integer;
+ declare all_subjs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, next_iter_subjs, res any;
+ declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;
declare gs_app_callback, gs_app_uid, inf_ruleset varchar;
declare rdf_type_iid IRI_ID;
uid := get_keyword ('uid', options, http_nobody_uid());
@@ -8516,19 +7261,19 @@ create procedure DB.DBA.SPARQL_DESC_DICT_OBJCBD (in obj_dict any, in consts any,
return res;
foreach (any c in consts) do
{
- if (not isnumeric (c))
- dict_put (obj_dict, c, 0);
+ if (isiri_id (c))
+ dict_put (subj_dict, c, 0);
}
- all_objs := dict_list_keys (obj_dict, 0);
- next_iter_objs := dict_new ();
- all_obj_count := length (all_objs);
- if (0 = all_obj_count)
+ all_subjs := dict_list_keys (subj_dict, 0);
+ next_iter_subjs := dict_new ();
+ all_s_count := length (all_subjs);
+ if (0 = all_s_count)
return res;
next_iteration:
- all_obj_count := length (all_objs);
- gvector_sort (all_objs, 1, 0, 0);
- -- dbg_obj_princ ('new iteration: all_objs = ', all_objs);
+ all_s_count := length (all_subjs);
+ gvector_sort (all_subjs, 1, 0, 0);
+ -- dbg_obj_princ ('new iteration: all_subjs = ', all_subjs);
if (__tag of integer = __tag (good_graphs))
graphs_listed := 0;
else
@@ -8536,7 +7281,7 @@ next_iteration:
vectorbld_init (sorted_good_graphs);
foreach (any g in good_graphs) do
{
- if (is_named_iri_id (g) and
+ if (isiri_id (g) and g < min_bnode_iri_id () and
__rgs_ack_cbk (g, uid, 1) and
(gs_app_callback is null or bit_and (1, call (gs_app_callback) (g, gs_app_uid))) )
vectorbld_acc (sorted_good_graphs, g);
@@ -8550,94 +7295,88 @@ next_iteration:
vectorbld_init (sorted_bad_graphs);
foreach (any g in bad_graphs) do
{
- if (is_named_iri_id (g))
+ if (isiri_id (g) and g < min_bnode_iri_id ())
vectorbld_acc (sorted_bad_graphs, g);
}
vectorbld_final (sorted_bad_graphs);
bad_g_count := length (sorted_bad_graphs);
- vectorbld_init (phys_objects);
+ vectorbld_init (phys_subjects);
if (storage_name is null)
storage_name := 'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage';
else if (('' = storage_name) and (inf_ruleset is null))
{
- for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)
+ for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
{
- declare obj, phys_obj any;
- obj := all_objs [obj_ctr];
- if (not isnumeric (obj))
+ declare s, phys_s any;
+ s := all_subjs [s_ctr];
+ if (isiri_id (s))
+ vectorbld_acc (phys_subjects, s);
+ else
{
- if (isiri_id (obj))
- vectorbld_acc (phys_objects, obj);
- else
- {
- phys_obj := iri_to_id (obj, 0, 0);
- if (not isinteger (phys_obj))
- vectorbld_acc (phys_objects, phys_obj);
- }
+ phys_s := iri_to_id (s, 0, 0);
+ if (not isinteger (phys_s))
+ vectorbld_acc (phys_subjects, phys_s);
}
}
- vectorbld_final (phys_objects);
- goto describe_physical_objects;
+ vectorbld_final (phys_subjects);
+ goto describe_physical_subjects;
}
-- dbg_obj_princ ('storage_name=',storage_name, ' sorted_good_graphs=', sorted_good_graphs, ' sorted_bad_graphs=', sorted_bad_graphs);
- for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)
+ for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
{
- declare obj, phys_obj, maps any;
+ declare s, phys_s, maps any;
declare maps_len integer;
- obj := all_objs [obj_ctr];
- maps := sparql_quad_maps_for_quad (NULL, NULL, NULL, obj, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);
- -- dbg_obj_princ ('obj = ', obj, id_to_iri (obj), ' maps = ', maps);
+ s := all_subjs [s_ctr];
+ maps := sparql_quad_maps_for_quad (NULL, s, NULL, NULL, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);
+ -- dbg_obj_princ ('s = ', s, id_to_iri (s), ' maps = ', maps);
maps_len := length (maps);
if ((maps_len > 0) and (inf_ruleset is null) and (maps[maps_len-1][0] = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap'))
{
- if (not isnumeric (obj))
+ if (isiri_id (s))
{
- if (isiri_id (obj))
- {
- phys_obj := obj;
- vectorbld_acc (phys_objects, phys_obj);
- }
- else
- {
- phys_obj := iri_to_id (obj, 0, 0);
- if (not isinteger (phys_obj))
- vectorbld_acc (phys_objects, phys_obj);
- }
+ phys_s := s;
+ vectorbld_acc (phys_subjects, phys_s);
+ }
+ else
+ {
+ phys_s := iri_to_id (s, 0, 0);
+ if (not isinteger (phys_s))
+ vectorbld_acc (phys_subjects, phys_s);
}
maps := subseq (maps, 0, maps_len-1);
maps_len := maps_len - 1;
}
if (maps_len > 0)
- all_objs [obj_ctr] := vector (obj, maps);
+ all_subjs [s_ctr] := vector (s, maps);
else
- all_objs [obj_ctr] := 0;
- -- dbg_obj_princ ('obj = ', obj, ' maps = ', maps);
- -- dbg_obj_princ ('all_objs [', obj_ctr, '] = ', all_objs [obj_ctr]);
+ all_subjs [s_ctr] := 0;
+ -- dbg_obj_princ ('s = ', s, ' maps = ', maps);
+ -- dbg_obj_princ ('all_subjs [', s_ctr, '] = ', all_subjs [s_ctr]);
}
- vectorbld_final (phys_objects);
- for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)
+ vectorbld_final (phys_subjects);
+ for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)
{
- declare s_desc, obj, maps any;
+ declare s_desc, s, maps any;
declare map_ctr, maps_len integer;
declare fname varchar;
- s_desc := all_objs [obj_ctr];
+ s_desc := all_subjs [s_ctr];
if (isinteger (s_desc))
goto end_of_s;
- obj := s_desc[0];
+ s := s_desc[0];
maps := s_desc[1];
maps_len := length (maps);
- fname := sprintf ('SPARQL_DESC_DICT_OBJCBD_QMV1_%U', md5 (storage_name || inf_ruleset || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));
+ fname := sprintf ('SPARQL_DESC_DICT_CBD_QMV1_%U', md5 (storage_name || inf_ruleset || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));
if (not exists (select top 1 1 from Db.DBA.SYS_PROCEDURES where P_NAME = 'DB.DBA.' || fname))
{
declare ses, txt, saved_user any;
ses := string_output ();
- http ('create procedure DB.DBA."' || fname || '" (in obj any, in obj_dict any, in next_iter_objs any, in res any', ses);
+ http ('create procedure DB.DBA."' || fname || '" (in subj any, in subj_dict any, in next_iter_subjs any, in res any', ses);
if (graphs_listed)
http (', inout sorted_good_graphs any', ses);
http (')\n', ses);
http ('{\n', ses);
- http (' declare obj_iri varchar;\n', ses);
- http (' obj_iri := id_to_iri_nosignal (obj);\n', ses);
+ http (' declare subj_iri varchar;\n', ses);
+ http (' subj_iri := id_to_iri_nosignal (subj);\n', ses);
http (' for (sparql define output:valmode "LONG" define input:storage <' || storage_name || '> ', ses);
foreach (any g in sorted_bad_graphs) do
{
@@ -8645,26 +7384,26 @@ next_iteration:
}
if (inf_ruleset is not null)
http (' define input:inference <' || inf_ruleset || '>\n', ses);
- http ('select ?g1 ?p1 ?s1 ?g2 ?st2\n', ses);
+ http ('select ?g1 ?p1 ?o1 ?g2 ?st2\n', ses);
http (' where { graph ?g1 {\n', ses);
for (map_ctr := 0; map_ctr < maps_len; map_ctr := map_ctr + 1)
{
if (map_ctr > 0) http (' union\n', ses);
- http (' { quad map <' || maps[map_ctr][0] || '> { ?s1 ?p1 ?:obj_iri } }\n', ses);
+ http (' { quad map <' || maps[map_ctr][0] || '> { ?:subj_iri ?p1 ?o1 } }\n', ses);
}
http (' }\n', ses);
http (' optional { graph ?g2 {\n', ses);
- http (' ?st2 a rdf:Statement ; rdf:object ?:obj_iri ; rdf:predicate ?p1 ; rdf:subject ?s1 } }\n', ses);
+ http (' ?st2 a rdf:Statement ; rdf:subject ?:subj_iri ; rdf:predicate ?p1 ; rdf:object ?o1 } }\n', ses);
http (' } ) do {\n', ses);
if (graphs_listed)
http (' if (position (__i2idn ("g1"), sorted_good_graphs)) {\n', ses);
- http (' dict_bitor_or_put (res, vector ("s1", "p1", obj), 1);\n', ses);
- http (' if (is_bnode_iri_id ("s1") and dict_get (obj_dict, "s1") is null)\n', ses);
- http (' dict_put (next_iter_objs, "s1", 1);\n', ses);
+ http (' dict_bitor_or_put (res, vector (subj, "p1", "o1"), 1);\n', ses);
+ http (' if (isiri_id ("o1") and "o1" > min_bnode_iri_id() and dict_get (subj_dict, "o1") is null)\n', ses);
+ http (' dict_put (next_iter_subjs, "o1", 1);\n', ses);
if (graphs_listed)
http (' if (position (__i2idn ("g2"), sorted_good_graphs)) {\n', ses);
- http (' if ("st2" is not null and dict_get (obj_dict, "st2") is null)\n', ses);
- http (' dict_put (next_iter_objs, "s1", 1);\n', ses);
+ http (' if ("st2" is not null and dict_get (subj_dict, "st2") is null)\n', ses);
+ http (' dict_put (next_iter_subjs, "o1", 1);\n', ses);
if (graphs_listed)
http (' } }\n', ses);
http (' } }\n', ses);
@@ -8677,22 +7416,22 @@ next_iteration:
}
if (graphs_listed)
{
- -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', obj, obj_dict, next_iter_objs, res, sorted_good_graphs, ')');
- call ('DB.DBA.' || fname)(obj, obj_dict, next_iter_objs, res, sorted_good_graphs);
+ -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, subj_dict, next_iter_subjs, res, sorted_good_graphs, ')');
+ call ('DB.DBA.' || fname)(s, subj_dict, next_iter_subjs, res, sorted_good_graphs);
}
else
{
- -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', obj, obj_dict, next_iter_objs, res, ')');
- call ('DB.DBA.' || fname)(obj, obj_dict, next_iter_objs, res);
+ -- dbg_obj_princ ('call (''DB.DBA.', fname, ''')(', s, subj_dict, next_iter_subjs, res, ')');
+ call ('DB.DBA.' || fname)(s, subj_dict, next_iter_subjs, res);
}
end_of_s: ;
}
-describe_physical_objects:
- gvector_sort (phys_objects, 1, 0, 0);
- phys_obj_count := length (phys_objects);
- -- dbg_obj_princ ('phys_objects = ', phys_objects);
- if (0 = phys_obj_count)
+describe_physical_subjects:
+ gvector_sort (phys_subjects, 1, 0, 0);
+ phys_s_count := length (phys_subjects);
+ -- dbg_obj_princ ('phys_subjects = ', phys_subjects);
+ if (0 = phys_s_count)
return res;
-- dbg_obj_princ ('sorted_bad_graphs = ', sorted_bad_graphs);
if (graphs_listed)
@@ -8703,23 +7442,23 @@ describe_physical_objects:
{
declare graph any;
graph := sorted_good_graphs [g_ctr];
- for (obj_ctr := phys_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)
+ for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
{
- declare obj any;
- obj := phys_objects [obj_ctr];
- for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where G = graph and O = obj) do
+ declare subj any;
+ subj := phys_subjects [s_ctr];
+ for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do
{
- -- dbg_obj_princ ('found3 ', subj1, p1, obj, ' in ', graph);
- dict_bitor_or_put (res, vector (subj1, p1, __rdf_long_of_obj (obj)), 1);
- if (is_bnode_iri_id (subj1) and dict_get (obj_dict, subj1) is null)
- dict_put (next_iter_objs, subj1, 1);
+ -- dbg_obj_princ ('found3 ', subj, p1, ' in ', graph);
+ dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
+ if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)
+ dict_put (next_iter_subjs, obj1, 1);
for (sparql define output:valmode "LONG"
select ?g2 ?st2 where {
graph ?g2 {
- ?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do
+ ?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do
{
- if (position ("g2", sorted_good_graphs) and dict_get (obj_dict, "st2") is null)
- dict_put (next_iter_objs, "st2", 1);
+ if (position ("g2", sorted_good_graphs) and dict_get (subj_dict, "st2") is null)
+ dict_put (next_iter_subjs, "st2", 1);
}
}
}
@@ -8727,50 +7466,50 @@ describe_physical_objects:
}
else
{
- for (obj_ctr := phys_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)
+ for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
{
- declare obj any;
- obj := phys_objects [obj_ctr];
- for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where
+ declare subj any;
+ subj := phys_subjects [s_ctr];
+ for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where
0 = position (G, sorted_bad_graphs) and
- O = obj and
+ S = subj and
__rgs_ack_cbk (G, uid, 1) and
(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do
{
- -- dbg_obj_princ ('found4 ', obj, p1);
- dict_bitor_or_put (res, vector (subj1, p1, __rdf_long_of_obj (obj)), 1);
- if (is_bnode_iri_id (subj1) and dict_get (obj_dict, subj1) is null)
- dict_put (next_iter_objs, subj1, 1);
+ -- dbg_obj_princ ('found4 ', subj, p1);
+ dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
+ if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)
+ dict_put (next_iter_subjs, obj1, 1);
for (sparql define output:valmode "LONG"
select ?g2 ?st2 where {
graph ?g2 {
- ?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do
+ ?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do
{
if (0 = position ("g2", sorted_bad_graphs) and
- dict_get (obj_dict, "st2") is null and
+ dict_get (subj_dict, "st2") is null and
__rgs_ack_cbk ("g2", uid, 1) and
(gs_app_callback is null or bit_and (1, call (gs_app_callback) ("g2", gs_app_uid))) )
- dict_put (next_iter_objs, "st2", 1);
+ dict_put (next_iter_subjs, "st2", 1);
}
}
}
}
ret_or_next_iter:
- if (0 = dict_size (next_iter_objs))
+ if (0 = dict_size (next_iter_subjs))
{
- -- dbg_obj_princ ('no new objs, res = ', dict_list_keys (res, 0));
+ -- dbg_obj_princ ('no new subjs, res = ', dict_list_keys (res, 0));
return res;
}
- all_objs := dict_list_keys (next_iter_objs, 1);
- foreach (IRI_ID obj in all_objs) do dict_put (obj_dict, obj, 1);
+ all_subjs := dict_list_keys (next_iter_subjs, 1);
+ foreach (IRI_ID s in all_subjs) do dict_put (subj_dict, s, 1);
goto next_iteration;
}
;
-create procedure DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL (in obj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
+create procedure DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
{
- declare all_objs, sorted_good_graphs, sorted_bad_graphs, next_iter_objs, res any;
- declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, obj_ctr, all_obj_count integer;
+ declare all_subjs, sorted_good_graphs, sorted_bad_graphs, next_iter_subjs, res any;
+ declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count integer;
declare gs_app_callback, gs_app_uid varchar;
declare rdf_type_iid IRI_ID;
uid := get_keyword ('uid', options, http_nobody_uid());
@@ -8783,19 +7522,19 @@ create procedure DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL (in obj_dict any, in co
return res;
foreach (any c in consts) do
{
- if (not isnumeric (c))
- dict_put (obj_dict, c, 0);
+ if (isiri_id (c))
+ dict_put (subj_dict, c, 0);
}
- all_objs := dict_list_keys (obj_dict, 0);
- next_iter_objs := dict_new ();
- all_obj_count := length (all_objs);
- if (0 = all_obj_count)
+ all_subjs := dict_list_keys (subj_dict, 0);
+ next_iter_subjs := dict_new ();
+ all_s_count := length (all_subjs);
+ if (0 = all_s_count)
return res;
next_iteration:
- all_obj_count := length (all_objs);
- gvector_sort (all_objs, 1, 0, 0);
- -- dbg_obj_princ ('new iteration: all_objs = ', all_objs);
+ all_s_count := length (all_subjs);
+ gvector_sort (all_subjs, 1, 0, 0);
+ -- dbg_obj_princ ('new iteration: all_subjs = ', all_subjs);
if (__tag of integer = __tag (good_graphs))
graphs_listed := 0;
else
@@ -8803,7 +7542,7 @@ next_iteration:
vectorbld_init (sorted_good_graphs);
foreach (any g in good_graphs) do
{
- if (is_named_iri_id (g) and
+ if (isiri_id (g) and g < min_bnode_iri_id () and
__rgs_ack_cbk (g, uid, 1) and
(gs_app_callback is null or bit_and (1, call (gs_app_callback) (g, gs_app_uid))) )
vectorbld_acc (sorted_good_graphs, g);
@@ -8817,13 +7556,13 @@ next_iteration:
vectorbld_init (sorted_bad_graphs);
foreach (any g in bad_graphs) do
{
- if (isnamed_iri_id (g))
+ if (isiri_id (g) and g < min_bnode_iri_id ())
vectorbld_acc (sorted_bad_graphs, g);
}
vectorbld_final (sorted_bad_graphs);
bad_g_count := length (sorted_bad_graphs);
- -- dbg_obj_princ ('all_objs = ', all_objs);
- if (0 = all_obj_count)
+ -- dbg_obj_princ ('all_subjs = ', all_subjs);
+ if (0 = all_s_count)
return res;
-- dbg_obj_princ ('sorted_bad_graphs = ', sorted_bad_graphs);
if (graphs_listed)
@@ -8834,23 +7573,23 @@ next_iteration:
{
declare graph any;
graph := sorted_good_graphs [g_ctr];
- for (obj_ctr := all_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)
+ for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
{
- declare obj any;
- obj := all_objs [obj_ctr];
- for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where G = graph and O = obj) do
+ declare subj any;
+ subj := all_subjs [s_ctr];
+ for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do
{
- -- dbg_obj_princ ('found3 ', subj1, p1, obj, ' in ', graph);
- dict_bitor_or_put (res, vector (subj1, p1, __rdf_long_of_obj (obj)), 1);
- if (is_bnode_iri_id (subj1) and dict_get (obj_dict, subj1) is null)
- dict_put (next_iter_objs, subj1, 1);
+ -- dbg_obj_princ ('found3 ', subj, p1, ' in ', graph);
+ dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
+ if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)
+ dict_put (next_iter_subjs, obj1, 1);
for (sparql define output:valmode "LONG"
select ?g2 ?st2 where {
graph ?g2 {
- ?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do
+ ?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do
{
- if (position ("g2", sorted_good_graphs) and dict_get (obj_dict, "st2") is null)
- dict_put (next_iter_objs, "st2", 1);
+ if (position ("g2", sorted_good_graphs) and dict_get (subj_dict, "st2") is null)
+ dict_put (next_iter_subjs, "st2", 1);
}
}
}
@@ -8858,75 +7597,47 @@ next_iteration:
}
else
{
- for (obj_ctr := all_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)
+ for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)
{
- declare obj any;
- obj := all_objs [obj_ctr];
- for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where
+ declare subj any;
+ subj := all_subjs [s_ctr];
+ for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where
0 = position (G, sorted_bad_graphs) and
- O = obj and
+ S = subj and
__rgs_ack_cbk (G, uid, 1) and
(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do
{
- -- dbg_obj_princ ('found4 ', subj1, p1, obj);
- dict_bitor_or_put (res, vector (subj1, p1, __rdf_long_of_obj (obj)), 1);
- if (is_bnode_iri_id (subj1) and dict_get (obj_dict, subj1) is null)
- dict_put (next_iter_objs, subj1, 1);
+ -- dbg_obj_princ ('found4 ', subj, p1);
+ dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);
+ if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)
+ dict_put (next_iter_subjs, obj1, 1);
for (sparql define output:valmode "LONG"
select ?g2 ?st2 where {
graph ?g2 {
- ?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do
+ ?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do
{
if (0 = position ("g2", sorted_bad_graphs) and
- dict_get (obj_dict, "st2") is null and
+ dict_get (subj_dict, "st2") is null and
__rgs_ack_cbk ("g2", uid, 1) and
(gs_app_callback is null or bit_and (1, call (gs_app_callback) ("g2", gs_app_uid))) )
- dict_put (next_iter_objs, "st2", 1);
+ dict_put (next_iter_subjs, "st2", 1);
}
}
}
}
ret_or_next_iter:
- if (0 = dict_size (next_iter_objs))
+ if (0 = dict_size (next_iter_subjs))
{
- -- dbg_obj_princ ('no new objs, res = ', dict_list_keys (res, 0));
+ -- dbg_obj_princ ('no new subjs, res = ', dict_list_keys (res, 0));
return res;
}
- all_objs := dict_list_keys (next_iter_objs, 1);
- foreach (IRI_ID obj in all_objs) do dict_put (obj_dict, obj, 1);
+ all_subjs := dict_list_keys (next_iter_subjs, 1);
+ foreach (IRI_ID s in all_subjs) do dict_put (subj_dict, s, 1);
goto next_iteration;
}
;
-create procedure DB.DBA.SPARQL_DESC_DICT_SCBD (in node_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
-{
- declare cbd_res, objcbd_res, triples any;
- cbd_res := DB.DBA.SPARQL_DESC_DICT_CBD (node_dict, consts, good_graphs, bad_graphs, storage_name, options);
- objcbd_res := DB.DBA.SPARQL_DESC_DICT_OBJCBD (node_dict, consts, good_graphs, bad_graphs, storage_name, options);
-again:
- triples := dict_destructive_list_rnd_keys (objcbd_res, 80000);
- if (0 = length (triples))
- return cbd_res;
- foreach (any triple in triples) do { dict_put (cbd_res, triple, 1); }
- goto again;
-}
-;
-
-create procedure DB.DBA.SPARQL_DESC_DICT_SCBD_PHYSICAL (in node_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)
-{
- declare cbd_res, objcbd_res, triples any;
- cbd_res := DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL (node_dict, consts, good_graphs, bad_graphs, storage_name, options);
- objcbd_res := DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL (node_dict, consts, good_graphs, bad_graphs, storage_name, options);
-again:
- triples := dict_destructive_list_rnd_keys (objcbd_res, 80000);
- if (0 = length (triples))
- return cbd_res;
- foreach (any triple in triples) do { dict_put (cbd_res, triple, 1); }
- goto again;
-}
-;
-
--!AWK PUBLIC
create procedure DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS (in dict any, in destructive integer := 0)
{
@@ -8935,7 +7646,8 @@ create procedure DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS (in dict any, in destr
declare S, P, O_DT, O_LANG varchar;
declare O_IS_IRI, dt_twobyte, lang_twobyte integer;
dict := dict_list_keys (dict, destructive);
- exec_result_names (vector (vector ('S', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('P', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('O', 125, 0, 2147483647, 1, 0, 0, 0, 0, 0, 0, 0)));
+ result_names (S, P, O --, O_IS_IRI, O_DT, O_LANG
+ );
len := length (dict);
for (ctr := 0; ctr < len; ctr := ctr+1)
{
@@ -8957,7 +7669,7 @@ create procedure DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS (in dict any, in destr
-- (select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = lang_twobyte) ) end;
-- result (S, P, O, 0, O_DT, O_LANG);
-- }
- else if (S is not null and P is not null and O is not null)
+ else
result (S, P, O --, 0, __xsd_type (O, NULL), NULL
);
}
@@ -9172,6 +7884,312 @@ create function DB.DBA.RDF_DIST_DESER_LONG (in strg any) returns any
-----
-- JSO procedures
+create function DB.DBA.JSO_MAKE_INHERITANCE (in jgraph varchar, in class varchar, in rootinst varchar, in destinst varchar, in dest_iid iri_id, inout noinherits any, inout inh_stack any)
+{
+ declare base_iid iri_id;
+ declare baseinst varchar;
+ -- dbg_obj_princ ('JSO_MAKE_INHERITANCE (', jgraph, class, rootinst, destinst, ')');
+ inh_stack := vector_concat (inh_stack, vector (destinst));
+ baseinst := null;
+ if (not exists (sparql
+ define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ ask where {
+ graph ?:jgraph { ?:dest_iid rdf:type `iri(?:class)`
+ } } ) )
+ signal ('22023', 'JSO_MAKE_INHERITANCE has not found object <' || destinst || '> of type <' || class || '>');
+/* This fails. !!!TBD: fix sparql2sql.c to preserve data about equalities, fixed values and globals when triples are moved from gp to gp
+ for (sparql
+ define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ select ?srcinst
+ where {
+ graph ?:jgraph {
+ { {
+ ?destnode rdf:type `iri(?:class)` .
+ filter (?destnode = iri(?:destinst)) }
+ union
+ {
+ ?destnode rdf:type `iri(?:class)` .
+ ?destnode rdf:name `iri(?:destinst)` } } .
+ ?destnode virtrdf:inheritFrom ?srcinst .
+ ?srcinst rdf:type `iri(?:class)` .
+ } } ) do
+*/
+ for (sparql
+ define input:storage ""
+ define output:valmode "LONG"
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ select ?src_iid
+ where {
+ graph ?:jgraph { ?:dest_iid virtrdf:inheritFrom ?src_iid } } ) do
+ {
+ declare srcinst varchar;
+ srcinst := id_to_iri_nosignal ("src_iid");
+ if (baseinst is null)
+ {
+ if (not exists (sparql
+ define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ ask where { graph ?:jgraph { ?:"src_iid" rdf:type `iri(?:class)` } } ) )
+ signal ('22023', 'JSO_MAKE_INHERITANCE has found that the object <' || destinst || '> has wrong virtrdf:inheritFrom <' || srcinst || '> that is not an instance of type <' || class || '>');
+ base_iid := "src_iid";
+ baseinst := srcinst;
+ }
+ else if (baseinst <> srcinst)
+ signal ('22023', 'JSO_MAKE_INHERITANCE has found that the object <' || destinst || '> has multiple virtrdf:inheritFrom declarations: <' || baseinst || '> and <' || srcinst || '>');
+ }
+ if (position (baseinst, inh_stack))
+ signal ('22023', 'JSO_MAKE_INHERITANCE has found that the object <' || baseinst || '> is recursively inherited from itself');
+-- This fails. !!!TBD: fix sparql2sql.c to preserve data about equalities, fixed values and globals when triples are moved from gp to gp
+-- for (sparql
+-- define input:storage ""
+-- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+-- select ?pred
+-- where {
+-- graph ?:jgraph {
+-- { {
+-- ?destnode rdf:type `iri(?:class)` .
+-- filter (?destnode = iri(?:destinst)) }
+-- union
+-- {
+-- ?destnode rdf:type `iri(?:class)` .
+-- ?destnode rdf:name `iri(?:destinst)` } } .
+-- ?destnode virtrdf:noInherit ?pred .
+-- } } ) do
+ for (sparql
+ define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ select ?pred
+ where {
+ graph ?:jgraph {
+ ?:dest_iid virtrdf:noInherit ?pred
+ } } ) do
+ {
+ if (baseinst is null)
+ signal ('22023', 'JSO_MAKE_INHERITANCE has found that the object <' || destinst || '> has set virtrdf:noInherit but has no virtrdf:inheritFrom');
+ dict_put (noinherits, "pred", destinst);
+ }
+ if (baseinst is null)
+ return;
+ for (select "pred_id", "predval"
+ from (sparql
+ define input:storage ""
+ define output:valmode "LONG"
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ select ?pred_id, ?predval
+ where {
+ graph ?:jgraph {
+ ?:base_iid ?pred_id ?predval
+ } } ) as "t00"
+ where not exists (sparql
+ define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ ask where { graph ?:jgraph { ?:"t00"."pred_id" virtrdf:loadAs virtrdf:jsoTriple } } )
+ ) do
+ {
+ declare "pred" any;
+ "pred" := id_to_iri ("pred_id");
+ if (DB.DBA.RDF_LANGUAGE_OF_LONG ("predval", null) is not null)
+ signal ('22023', 'JSO_MAKE_INHERITANCE does not support language marks on objects');
+ if ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type' = "pred")
+ ;
+ else if ('http://www.w3.org/1999/02/22-rdf-syntax-ns#name' = "pred")
+ ;
+ else if ('http://www.openlinksw.com/schemas/virtrdf#inheritFrom' = "pred")
+ ;
+ else if ('http://www.openlinksw.com/schemas/virtrdf#noInherit' = "pred")
+ ;
+ else if (dict_get (noinherits, "pred", baseinst) = baseinst) -- trick here, instead of (dict_get (noinherits, pred, null) is null) that does not handle inheritance of booleans properly.
+ {
+ jso_set (class, rootinst, "pred", __rdf_sqlval_of_obj ("predval"), isiri_id ("predval"));
+ dict_put (noinherits, "pred", baseinst);
+ }
+ }
+ DB.DBA.JSO_MAKE_INHERITANCE (jgraph, class, rootinst, baseinst, base_iid, noinherits, inh_stack);
+}
+;
+
+create function DB.DBA.JSO_LOAD_INSTANCE (in jgraph varchar, in jinst varchar, in delete_first integer, in make_new integer, in jsubj_iid iri_id := 0)
+{
+ declare jinst_iid, jgraph_iid IRI_ID;
+ declare jclass varchar;
+ declare noinherits, inh_stack, "p" any;
+ -- dbg_obj_princ ('JSO_LOAD_INSTANCE (', jgraph, ')');
+ noinherits := dict_new ();
+ jinst_iid := iri_ensure (jinst);
+ jgraph_iid := iri_ensure (jgraph);
+ if (jsubj_iid is null)
+ {
+ jsubj_iid := (sparql
+ define input:storage ""
+ define output:valmode "LONG"
+ select ?s
+ where { graph ?:jgraph { ?s rdf:name ?:jinst } } );
+ if (jsubj_iid is null)
+ jsubj_iid := jinst_iid;
+ }
+ jclass := (sparql
+ define input:storage ""
+ select ?t
+ where {
+ graph ?:jgraph { ?:jsubj_iid rdf:type ?t } } );
+ if (jclass is null)
+ {
+ if (exists (sparql
+ define input:storage ""
+ select ?x
+ where { graph ?:jgraph {
+ { ?:jinst ?x ?o }
+ union
+ { ?x rdf:name ?ji .
+ filter (str (?ji) = ?:jinst)
+ } } } ) )
+ signal ('22023', 'JSO_LOAD_INSTANCE can not detect the type of <' || jinst || '>');
+ else
+ signal ('22023', 'JSO_LOAD_INSTANCE can not find an object <' || jinst || '>');
+ }
+ if (delete_first)
+ jso_delete (jclass, jinst, 1);
+ if (make_new)
+ jso_new (jclass, jinst);
+ for (select "p_id", coalesce ("o2", "o1") as "o"
+ from (sparql
+ define input:storage ""
+ define output:valmode "LONG"
+ select ?p_id ?o1 ?o2
+ where {
+ graph ?:jgraph {
+ { ?:jsubj_iid ?p_id ?o1 } optional { ?o1 rdf:name ?o2 }
+ } }
+ ) as "t00"
+ where not exists (sparql
+ define input:storage ""
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ ask where { graph ?:jgraph_iid { ?:"t00"."p_id" virtrdf:loadAs virtrdf:jsoTriple } } ) option (quietcast)
+ ) do
+ {
+ "p" := id_to_iri ("p_id");
+ if (DB.DBA.RDF_LANGUAGE_OF_LONG ("o", null) is not null)
+ signal ('22023', 'JSO_LOAD_INSTANCE does not support language marks on objects');
+ if ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type' = "p")
+ {
+ if (__rdf_sqlval_of_obj ("o") <> jclass)
+ signal ('22023', 'JSO_LOAD_INSTANCE has found that the object <' || jinst || '> has multiple type declarations');
+ }
+ else if ('http://www.w3.org/1999/02/22-rdf-syntax-ns#name' = "p")
+ ;
+ else if ('http://www.openlinksw.com/schemas/virtrdf#inheritFrom' = "p")
+ ;
+ else if ('http://www.openlinksw.com/schemas/virtrdf#noInherit' = "p")
+ ;
+ else
+ {
+ jso_set (jclass, jinst, "p", __rdf_sqlval_of_obj ("o"), isiri_id ("o"));
+ dict_put (noinherits, "p", jinst);
+ }
+ }
+ inh_stack := vector ();
+ DB.DBA.JSO_MAKE_INHERITANCE (jgraph, jclass, jinst, jinst, jsubj_iid, noinherits, inh_stack);
+}
+;
+
+create procedure DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (in jgraph varchar, out instances any)
+{
+ declare md, res, st, msg any;
+ st:= '00000';
+ exec (
+ 'select DB.DBA.VECTOR_AGG (
+ vector (
+ id_to_iri ("jclass"),
+ id_to_iri ("jinst"),
+ coalesce ("s", "jinst") ) )
+ from ( sparql
+ define output:valmode "LONG"
+ define input:storage ""
+ select ?jclass ?jinst ?s
+ where {
+ graph ?? {
+ { ?jinst rdf:type ?jclass .
+ filter (!isBLANK (?jinst)) }
+ union
+ { ?s rdf:type ?jclass .
+ ?s rdf:name ?jinst .
+ filter (isBLANK (?s))
+ } } }
+ ) as inst',
+ st, msg, vector (jgraph), 1, md, res);
+ if (st <> '00000') signal (st, msg);
+ instances := res[0][0];
+}
+;
+
+create function DB.DBA.JSO_LOAD_GRAPH (in jgraph varchar, in pin_now integer := 1)
+{
+ declare jgraph_iid IRI_ID;
+ declare instances, chk any;
+ -- dbg_obj_princ ('JSO_LOAD_GRAPH (', jgraph, ')');
+ jgraph_iid := iri_ensure (jgraph);
+ DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (jgraph, instances);
+/* Pass 1. Deleting all obsolete instances. */
+ foreach (any j in instances) do
+ jso_delete (j[0], j[1], 1);
+/* Pass 2. Creating all instances. */
+ foreach (any j in instances) do
+ jso_new (j[0], j[1]);
+/* Pass 3. Loading all instances, including loading inherited values. */
+ foreach (any j in instances) do
+ DB.DBA.JSO_LOAD_INSTANCE (jgraph, j[1], 0, 0, j[2]);
+/* Pass 4. Validation all instances. */
+ foreach (any j in instances) do
+ jso_validate (j[0], j[1], 1);
+/* Pass 5. Pin all instances. */
+ if (pin_now)
+ {
+ foreach (any j in instances) do
+ jso_pin (j[0], j[1]);
+ }
+/* Pass 6. Load all separate triples */
+ exec ('sparql
+ define input:storage ""
+ define sql:table-option "LOOP"
+ prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
+ select (bif:jso_triple_add (?s, ?p, ?o))
+ where { graph <' || id_to_iri (jgraph_iid) || '> { ?p virtrdf:loadAs virtrdf:jsoTriple . ?s ?p ?o } }');
+ chk := jso_triple_get_objs (
+ UNAME'http://www.openlinksw.com/schemas/virtrdf#loadAs',
+ UNAME'http://www.openlinksw.com/schemas/virtrdf#loadAs' );
+ if ((1 <> length (chk)) or (cast (chk[0] as varchar) <> 'http://www.openlinksw.com/schemas/virtrdf#jsoTriple'))
+ signal ('22023', 'JSO_LOAD_GRAPH has not found expected metadata in the graph');
+}
+;
+
+create function DB.DBA.JSO_PIN_GRAPH (in jgraph varchar)
+{
+ declare instances any;
+ DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (jgraph, instances);
+ foreach (any j in instances) do
+ jso_pin (j[0], j[1]);
+}
+;
+
+--!AWK PUBLIC
+create function DB.DBA.JSO_SYS_GRAPH () returns varchar
+{
+ return 'http://www.openlinksw.com/schemas/virtrdf#';
+}
+;
+
+-- same as DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH but no drop procedures
+create procedure DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO (in graphiri varchar := null)
+{
+ if (graphiri is null)
+ graphiri := DB.DBA.JSO_SYS_GRAPH();
+ DB.DBA.JSO_LOAD_GRAPH (graphiri, 0);
+ DB.DBA.JSO_PIN_GRAPH (graphiri);
+}
+;
+
create procedure DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH (in graphiri varchar := null)
{
if (graphiri is null)
@@ -9181,13 +8199,8 @@ create procedure DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH (in graphiri varchar := null)
DB.DBA.JSO_PIN_GRAPH (graphiri);
for (select P_NAME from SYS_PROCEDURES
where (
- (P_NAME > 'DB.DBA.SPARQL_DESC_DICT') and
- (P_NAME < 'DB.DBA.SPARQL_DESC_DICU') and
- (
(P_NAME like 'DB.DBA.SPARQL_DESC_DICT_QMV1_%') or
- (P_NAME like 'DB.DBA.SPARQL_DESC_DICT_CBD_QMV1_%') or
- (P_NAME like 'DB.DBA.SPARQL_DESC_DICT_OBJCBD_QMV1_%') or
- (P_NAME like 'DB.DBA.SPARQL_DESC_DICT_SCBD_QMV1_%') ) )
+ (P_NAME like 'DB.DBA.SPARQL_DESC_DICT_CBD_QMV1_%') )
for update) do
{
exec ('drop procedure DB.DBA."' || subseq (P_NAME, 7) || '"');
@@ -9705,7 +8718,7 @@ jso_load_failed:
;
-----
--- Internal routines for SPARQL macro library and quad map syntax extensions
+-- Internal routines for SPARQL quad map syntax extensions
create procedure DB.DBA.RDF_QM_CHANGE (in warninglist any)
{
@@ -9750,10 +8763,7 @@ create procedure DB.DBA.RDF_QM_CHANGE_OPT (in cmdlist any)
}
http (')', exectext);
STATE := '00000';
- warnings := exec (string_output_string (exectext), STATE, MESSAGE, arglist, 10000, md, rs);
- -- dbg_obj_princ ('md = ', md, ' rs = ', rs, ' warnings = ', warnings, STATE, MESSAGE);
- if (__tag of vector <> __tag (warnings) and __tag of vector = __tag (rs))
- warnings := case (length (rs)) when 0 then null else rs[0][0] end;
+ warnings := exec (string_output_string (exectext), STATE, MESSAGE, arglist, md, rs);
-- dbg_obj_princ ('warnings = ', warnings);
if (__tag of vector = __tag (warnings))
{
@@ -9785,16 +8795,10 @@ create function DB.DBA.RDF_QM_APPLY_CHANGES (in deleted any, in affected any) re
DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH ();
len := length (deleted);
for (ctr := 0; ctr < len; ctr := ctr + 2)
- {
- jso_delete (deleted [ctr], deleted [ctr+1], 1);
- log_text ('jso_delete (?,?,1)', deleted [ctr], deleted [ctr+1]);
- }
+ jso_delete (deleted [ctr], deleted [ctr+1], 1);
len := length (affected);
for (ctr := 0; ctr < len; ctr := ctr + 1)
- {
- jso_mark_affected (affected [ctr]);
- log_text ('jso_mark_affected (?)', affected [ctr]);
- }
+ jso_mark_affected (affected [ctr]);
return vector (vector ('00000', 'Transaction committed, SPARQL compiler re-configured'));
}
;
@@ -9882,6 +8886,13 @@ create procedure DB.DBA.RDF_QM_ASSERT_STORAGE_CONTAINS_MAPPING (in storage varch
}
;
+create procedure DB.DBA.RDF_QM_ASSERT_STORAGE_IS_FLAGGED (in storage varchar)
+{
+ if (not DB.DBA.RDF_QM_GET_STORAGE_FLAG (storage))
+ signal ('22023', 'The quad storage "' || storage || '" is not flagged as being edited' );
+}
+;
+
create function DB.DBA.RDF_QM_GC_SUBTREE (in seed any, in gc_flags integer := 0) returns integer
{ -- gc_flags: 0x1 = quick gc only, 0x2 = override virtrdf:isGcResistantType
declare graphiri varchar;
@@ -10084,8 +9095,6 @@ create function DB.DBA.RDF_QM_DROP_MAPPING (in storage varchar, in mapname any)
DB.DBA.RDF_QM_ASSERT_JSO_TYPE (qmid, 'http://www.openlinksw.com/schemas/virtrdf#QuadMap');
if (storage is null)
{
- declare report, storages any;
- vectorbld_init (storages);
for (sparql
define input:storage ""
select ?st where {
@@ -10096,23 +9105,11 @@ create function DB.DBA.RDF_QM_DROP_MAPPING (in storage varchar, in mapname any)
{ ?st virtrdf:qsDefaultMap `iri(?:qmid)` }
} } ) do
{
- DB.DBA.RDF_QM_ASSERT_STORAGE_FLAG ("st", 0);
- vectorbld_acc (storages, cast ("st" as varchar));
- }
- vectorbld_final (storages);
- vectorbld_init (report);
- foreach (varchar alt_st in storages) do
- {
- -- dbg_obj_princ ('Will run DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (', alt_st, ', NULL, ', qmid, ')');
- DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (alt_st, NULL, qmid);
- vectorbld_acc (report, vector ('00000', 'Quad map <' || qmid || '> is no longer used in storage <' || alt_st || '>'));
+ -- dbg_obj_princ ('Will run DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (', "st", ', NULL, ', qmid, ')');
+ DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE ("st", NULL, qmid);
}
DB.DBA.RDF_QM_GC_MAPPING_SUBTREE (qmid, 0);
- vectorbld_acc (report, vector ('00000', 'Quad map <' || qmid || '> is deleted'));
- vectorbld_final (report);
- if (length (storages))
- DB.DBA.RDF_QM_APPLY_CHANGES (null, storages);
- return report;
+ return vector (vector ('00000', 'Quad map <' || qmid || '> is deleted'));
}
else
{
@@ -11644,7 +10641,7 @@ create function DB.DBA.RDF_QM_DEFINE_MAPPING (in storage varchar,
qm_empty := NULL;
if (tablename is null)
{
- tablename := 'DB.DBA.SYS_IDONLY_ONE';
+ tablename := 'DB.DBA.SYS_FAKE_1';
if (0 < length (conds))
signal ('22023', 'Quad Mapping <' || qmid || '> has four constants and no one quad map value; it does not access tables so it can not have WHERE conditions');
}
@@ -11992,186 +10989,6 @@ create procedure DB.DBA.RDF_QM_SET_DEFAULT_MAPPING (in storage varchar, in qmid
}
;
-create function DB.DBA.RDF_SML_DROP (in smliri varchar, in silent integer, in compose_report integer := 1) returns any
-{
- declare report, affected any;
- report := '';
- vectorbld_init (affected);
- for (sparql define input:storage ""
- select ?storageiri
- from virtrdf:
- where { ?storageiri virtrdf:qsMacroLibrary `iri(?:smliri)` } ) do
- {
- report := report || 'SPARQL macro library <' || smliri || '> has been detached from quad storage <' || "storageiri" || '>\n';
- vectorbld_acc (affected, "storageiri");
- }
- vectorbld_final (affected);
- sparql define input:storage ""
- delete from virtrdf:
- { ?storageiri virtrdf:qsMacroLibrary `iri(?:smliri)` }
- from virtrdf:
- where { ?storageiri virtrdf:qsMacroLibrary `iri(?:smliri)` };
- commit work;
- if (not exists (
- sparql define input:storage ""
- select 1 from virtrdf: where { `iri(?:smliri)` ?p ?o } ) )
- {
- DB.DBA.RDF_QM_APPLY_CHANGES (null, affected);
- if (silent)
- {
- if (compose_report)
- return report || 'SPARQL macro library <' || smliri || '> does not exists, nothing to delete';
- else
- return 0;
- }
- else
- signal ('22023', 'SPARQL macro library <' || smliri || '> does not exists, nothing to delete');
- }
- DB.DBA.RDF_QM_ASSERT_JSO_TYPE (smliri, 'http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary');
- sparql define input:storage ""
- delete from graph virtrdf: {
- `iri(?:smliri)` ?p ?o }
- from virtrdf:
- where { `iri(?:smliri)` ?p ?o };
- DB.DBA.RDF_QM_APPLY_CHANGES (vector ('http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary', smliri), affected);
- if (compose_report)
- return report || 'SPARQL macro library <' || smliri || '> has been deleted';
- else
- return 1;
-}
-;
-
-create function DB.DBA.RDF_SML_CREATE (in smliri varchar, in txt varchar) returns any
-{
- declare stat, msg, smliri_copy varchar;
- declare mdata, rset, affected any;
- DB.DBA.RDF_QM_ASSERT_JSO_TYPE (smliri, 'http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary', 1);
- stat := '00000';
- if (__tag (txt) = __tag of nvarchar)
- txt := charset_recode (txt, '_WIDE_', 'UTF-8');
- exec ('sparql define input:macro-lib-ignore-create "yes" define input:disable-storage-macro-lib "yes" ' || txt, stat, msg, null, 1, mdata, rset);
- if (stat <> '00000')
- signal (stat, msg);
- if (length (rset))
- signal ('SPAR0', 'Assertion failed: the validation query of macro library should return nothing');
- vectorbld_init (affected);
- for (sparql define input:storage ""
- select ?storageiri
- from virtrdf:
- where { ?storageiri virtrdf:qsMacroLibrary `iri(?:smliri)` } ) do
- {
- vectorbld_acc (affected, "storageiri");
- }
- smliri_copy := smliri;
- vectorbld_acc (affected, smliri_copy);
- vectorbld_final (affected);
- sparql define input:storage ""
- delete from graph <http://www.openlinksw.com/schemas/virtrdf#> {
- `iri(?:smliri)` ?p ?o }
- from <http://www.openlinksw.com/schemas/virtrdf#>
- where { `iri(?:smliri)` ?p ?o };
- commit work;
- sparql define input:storage ""
- insert in graph <http://www.openlinksw.com/schemas/virtrdf#> {
- `iri(?:smliri)` a virtrdf:SparqlMacroLibrary ; virtrdf:smlSourceText ?:txt };
- DB.DBA.RDF_QM_APPLY_CHANGES (null, affected);
- return 'SPARQL macro library <' || smliri || '> has been (re)created';
-}
-;
-
-create function DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY (in storageiri varchar, in args any) returns any
-{
- declare expected_smliri varchar;
- declare old_ctr, expected_found integer;
- declare silent, report any;
- expected_smliri := get_keyword_ucase ('ID', args, NULL);
- silent := get_keyword_ucase ('SILENT', args, 0);
- expected_found := 0;
- old_ctr := 0;
- vectorbld_init (report);
- for (sparql define input:storage ""
- select ?oldsmliri
- from virtrdf:
- where { ?storageiri virtrdf:qsMacroLibrary ?oldsmliri } ) do
- {
- if (expected_smliri is not null and cast (expected_smliri as nvarchar) <> cast ("oldsmliri" as nvarchar))
- {
- if (silent)
- vectorbld_acc (report, vector ('00100', 'The SPARQL macro library to detach from <' || storageiri || '> is <' || expected_smliri || '> but actually attached one is <' || "oldsmliri" || '>, nothing to do'));
- else
- signal ('22023', 'The SPARQL macro library to detach from <' || storageiri || '> is <' || expected_smliri || '> but actually attached one is <' || "oldsmliri" || '>');
- }
- else
- {
- if (expected_smliri is not null)
- expected_found := 1;
- vectorbld_acc (report, vector ('00000', 'SPARQL macro library <' || "oldsmliri" || '> has been detached from quad storage <' || storageiri || '>'));
- }
- old_ctr := old_ctr + 1;
- }
- if (expected_smliri is not null)
- {
- sparql define input:storage ""
- delete from virtrdf:
- { ?storageiri virtrdf:qsMacroLibrary ?smliri }
- from virtrdf:
- where { ?storageiri virtrdf:qsMacroLibrary ?smliri };
- }
- else
- {
- sparql define input:storage ""
- delete from virtrdf:
- { ?storageiri virtrdf:qsMacroLibrary ?smliri }
- from virtrdf:
- where { ?storageiri virtrdf:qsMacroLibrary ?smliri };
- }
- commit work;
- if (old_ctr > 1)
- vectorbld_acc (report, vector ('00100', 'Note that there was a configuration error: more than one macro library was attached to the quad storage <' || storageiri || '>'));
- else if (old_ctr = 0)
- {
- if (silent)
- vectorbld_acc (report, vector ('00100', 'No one SPARQL macro library is attached to the quad storage <' || storageiri || '>, nothing to detach'));
- else
- signal ('22023', 'No one SPARQL macro library is attached to the quad storage <' || storageiri || '>, nothing to detach');
- }
- vectorbld_final (report);
--- dbg_obj_princ ('DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY (', storageiri, args, ') returns ', report);
- return report;
-}
-;
-
-create function DB.DBA.RDF_QM_ATTACH_MACRO_LIBRARY (in storageiri varchar, in args any) returns any
-{
- declare smliri varchar;
- smliri := get_keyword_ucase ('ID', args, NULL);
- DB.DBA.RDF_QM_ASSERT_JSO_TYPE (storageiri, 'http://www.openlinksw.com/schemas/virtrdf#QuadStorage');
- DB.DBA.RDF_QM_ASSERT_JSO_TYPE (smliri, 'http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary');
- declare report any;
- vectorbld_init (report);
- for (sparql define input:storage ""
- select ?oldsmliri
- from virtrdf:
- where { ?storageiri virtrdf:qsMacroLibrary ?oldsmliri } ) do
- {
- vectorbld_acc (report, vector ('00000', 'SPARQL macro library <' || "oldsmliri" || '> has been detached from quad storage <' || storageiri || '>'));
- }
- sparql define input:storage ""
- delete from virtrdf:
- { ?storageiri virtrdf:qsMacroLibrary ?oldsmliri }
- from virtrdf:
- where { ?storageiri virtrdf:qsMacroLibrary ?oldsmliri };
- commit work;
- sparql define input:storage ""
- prefix rdfdf: <http://www.openlinksw.com/virtrdf-data-formats#>
- insert in graph virtrdf: {
- `iri(?:storageiri)` virtrdf:qsMacroLibrary `iri(?:smliri)` };
- vectorbld_acc (report, vector ('00000', 'SPARQL macro library <' || smliri || '> has been attached to quad storage <' || storageiri || '>'));
- vectorbld_final (report);
- return report;
-}
-;
-
create procedure DB.DBA.RDF_ADD_qmAliasesKeyrefdByQuad (in qm_iri varchar)
{
declare kr_iri varchar;
@@ -12337,8 +11154,8 @@ create procedure DB.DBA.TTLP_EV_TRIPLE_L_W (
if (256 = rdf_box_type (parsed))
db..rdf_geo_add (parsed);
else
- rdf_box_set_type (parsed,
- DB.DBA.RDF_TWOBYTE_OF_DATATYPE (iri_to_id (o_type)));
+ rdf_box_set_type (parsed,
+ DB.DBA.RDF_TWOBYTE_OF_DATATYPE (iri_to_id (o_type)));
parsed := DB.DBA.RDF_OBJ_ADD (257, parsed, 257, ro_id_dict);
-- dbg_obj_princ ('rdf_box_type is set to ', rdf_box_type (parsed));
}
@@ -12642,7 +11459,7 @@ create function DB.DBA.RDF_LOAD_RDFXML_MT (in strg varchar, in base varchar, in
log_mode := log_mode + 2;
}
if (1 <> sys_stat ('cl_run_local_only'))
- return DB.DBA.RDF_LOAD_RDFXML_CL (strg, base, graph, 0);
+ return rdf_load_rdfxml_cl (strg, base, graph);
if (__rdf_obj_ft_rule_count_in_graph (iri_to_id (graph)))
ro_id_dict := dict_new ();
else
@@ -13643,7 +12460,7 @@ create procedure DB.DBA.RDF_DEFAULT_USER_PERMS_SET (in uname varchar, in perms i
affected_jso := vector (uname);
commit work;
DB.DBA.SECURITY_CL_EXEC_AND_LOG ('DB.DBA.RDF_DEFAULT_USER_PERMS_SET_MEMONLY (?,?,?,?,?,?)', vector (uname, uid, perms, special_iid, set_private, affected_jso));
-}
+ }
;
create procedure DB.DBA.RDF_GRAPH_USER_PERMS_SET_MEMONLY (in graph_iri varchar, in graph_iid IRI_ID, in uid integer, in perms integer)
@@ -13686,7 +12503,7 @@ create procedure DB.DBA.RDF_GRAPH_USER_PERMS_SET (in graph_iri varchar, in uname
signal ('RDF99', sprintf ('Default permissions of user "%s" on RDF quad store are broader than new permissions on specific graph <%s>', uname, graph_iri));
if (uname = 'nobody')
{
- jso_mark_affected (graph_iri);
+ jso_mark_affected (graph_iri);
if (isstring (registry_get ('DB.DBA.RDF_REPL')) and not (bit_and (perms, 1)) and
exists (select top 1 1 from DB.DBA.RDF_GRAPH_GROUP_MEMBER
where RGGM_GROUP_IID = iri_to_id (UNAME'http://www.openlinksw.com/schemas/virtrdf#rdf_repl_graph_group') and RGGM_MEMBER_IID = graph_iid) )
@@ -13713,38 +12530,6 @@ create procedure DB.DBA.RDF_GRAPH_USER_PERMS_SET (in graph_iri varchar, in uname
}
;
-create procedure DB.DBA.RDF_GRAPH_USER_PERMS_DEL_MEMONLY (in graph_iri varchar, in graph_iid IRI_ID, in uid integer)
-{
- graph_iri := cast (graph_iri as varchar);
- dict_put (__rdf_graph_iri2id_dict(), __uname(graph_iri), graph_iid);
- dict_put (__rdf_graph_id2iri_dict(), graph_iid, __uname(graph_iri));
- if (uid = http_nobody_uid())
- dict_remove (__rdf_graph_public_perms_dict(), graph_iid);
- else
- __rdf_graph_specific_perms_of_user (graph_iid, uid, -1);
- jso_mark_affected (graph_iri);
-}
-;
-
-create procedure DB.DBA.RDF_GRAPH_USER_PERMS_DEL (in graph_iri varchar, in uname varchar)
-{
- declare graph_iid IRI_ID;
- declare uid integer;
- declare special_iid IRI_ID;
- -- dbg_obj_princ ('gs_hist.sql'); string_to_file ('gs_hist.sql', sprintf ('-- DB.DBA.RDF_GRAPH_USER_PERMS_SET (''%s'', ''%s'', %d);\n', graph_iri, uname, perms), -1);
- graph_iid := iri_to_id (graph_iri);
- uid := ((select U_ID from DB.DBA.SYS_USERS where U_NAME = uname and (U_NAME='nobody' or (U_SQL_ENABLE and not U_ACCOUNT_DISABLED))));
- set isolation = 'serializable';
- commit work;
- if (uid is null)
- signal ('RDF99', sprintf ('No active SQL user "%s" found, can not change its permissions on graph <%s>', uname, graph_iri));
- delete from DB.DBA.RDF_GRAPH_USER where RGU_GRAPH_IID = graph_iid and RGU_USER_ID = uid;
- -- dbg_obj_princ ('gs_hist.sql'); string_to_file ('gs_hist.sql', sprintf ('delete from DB.DBA.RDF_GRAPH_USER where RGU_GRAPH_IID = %s and RGU_USER_ID = %d;\n', cast (graph_iid as varchar), uid), -1);
- commit work;
- DB.DBA.SECURITY_CL_EXEC_AND_LOG ('DB.DBA.RDF_GRAPH_USER_PERMS_DEL_MEMONLY (?,?,?)', vector (graph_iri, graph_iid, uid));
-}
-;
-
create function DB.DBA.RDF_GRAPH_GROUP_LIST_GET (in group_iri any, in extra_graphs any, in uid any, in gs_app_cbk varchar, in gs_app_uid varchar, in req_perms integer) returns any
{
declare group_iid IRI_ID;
@@ -13817,6 +12602,7 @@ create function DB.DBA.RDF_GRAPH_GROUP_LIST_GET (in group_iri any, in extra_grap
else
full_list := vector ();
}
+
if (bit_and (common_perms, req_perms) = req_perms)
{
declare ctr integer;
@@ -13871,7 +12657,7 @@ create procedure DB.DBA.SPARQL_RELOAD_QM_GRAPH ()
{
declare ver varchar;
declare inx int;
- ver := '2012-01-26 0002v6g';
+ ver := '2011-09-01 0001v6g';
if (USER <> 'dba')
signal ('RDFXX', 'Only DBA can reload quad map metadata');
if (not exists (sparql define input:storage "" ask where {
@@ -13987,8 +12773,8 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant all on DB.DBA.SYS_SPARQL_HOST to SPARQL_UPDATE',
'grant select on DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH to SPARQL_SELECT',
'grant all on DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH to SPARQL_UPDATE',
- 'grant select on DB.DBA.SYS_IDONLY_EMPTY to SPARQL_SELECT',
- 'grant select on DB.DBA.SYS_IDONLY_ONE to SPARQL_SELECT',
+ 'grant select on DB.DBA.SYS_FAKE_0 to SPARQL_SELECT',
+ 'grant select on DB.DBA.SYS_FAKE_1 to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_GLOBAL_RESET to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_MAKE_IID_OF_QNAME to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE to SPARQL_SELECT',
@@ -14030,8 +12816,6 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant execute on DB.DBA.RDF_STRSQLVAL_OF_LONG to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_WIDESTRSQLVAL_OF_LONG to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_LONG_OF_SQLVAL to SPARQL_SELECT',
- 'grant execute on DB.DBA.rdf_strdt_impl to SPARQL_SELECT',
- 'grant execute on DB.DBA.rdf_strlang_impl to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_QUAD_URI to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_QUAD_URI_L to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_QUAD_URI_L_TYPED to SPARQL_UPDATE',
@@ -14054,11 +12838,9 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant execute on DB.DBA.RDF_RDFA11_FETCH_PROFILES to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_LOAD_RDFA to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION to SPARQL_UPDATE',
- 'grant execute on DB.DBA.RDF_LOAD_XHTML_MICRODATA to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_RDFXML_TO_DICT to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_LONG_TO_TTL to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_TRIPLES_TO_TTL to SPARQL_SELECT',
- 'grant execute on DB.DBA.RDF_TRIPLES_TO_TRIG to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_TRIPLES_TO_NT to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_GRAPH_TO_TTL to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT to SPARQL_SELECT',
@@ -14066,8 +12848,6 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant execute on DB.DBA.RDF_TRIPLES_TO_JSON_LD to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_TRIPLES_TO_CSV to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML to SPARQL_SELECT',
- 'grant execute on DB.DBA.RDF_TRIPLES_TO_HTML_UL to SPARQL_SELECT',
- 'grant execute on DB.DBA.RDF_TRIPLES_TO_HTML_TR to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA to SPARQL_SELECT',
'grant execute on DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT to SPARQL_SELECT',
@@ -14108,18 +12888,12 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant execute on DB.DBA.RDF_DELETE_TRIPLES_AGG to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_MODIFY_TRIPLES to SPARQL_UPDATE',
'grant execute on DB.DBA.SPARQL_INSERT_DICT_CONTENT to SPARQL_UPDATE',
- 'grant execute on DB.DBA.SPARQL_INSERT_QUAD_DICT_CONTENT to SPARQL_UPDATE',
'grant execute on DB.DBA.SPARQL_DELETE_DICT_CONTENT to SPARQL_UPDATE',
- 'grant execute on DB.DBA.SPARQL_DELETE_QUAD_DICT_CONTENT to SPARQL_UPDATE',
'grant execute on DB.DBA.SPARQL_MODIFY_BY_DICT_CONTENTS to SPARQL_UPDATE',
- 'grant execute on DB.DBA.SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS to SPARQL_UPDATE',
- 'grant execute on DB.DBA.SPARUL_ADD to SPARQL_UPDATE',
'grant execute on DB.DBA.SPARUL_CLEAR to SPARQL_UPDATE',
- 'grant execute on DB.DBA.SPARUL_COPY to SPARQL_UPDATE',
+ 'grant execute on DB.DBA.SPARUL_LOAD to SPARQL_UPDATE',
'grant execute on DB.DBA.SPARUL_CREATE to SPARQL_UPDATE',
'grant execute on DB.DBA.SPARUL_DROP to SPARQL_UPDATE',
- 'grant execute on DB.DBA.SPARUL_LOAD to SPARQL_UPDATE',
- 'grant execute on DB.DBA.SPARUL_MOVE to SPARQL_UPDATE',
'grant execute on DB.DBA.SPARUL_RUN to SPARQL_UPDATE',
'grant execute on DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS to SPARQL_SELECT',
'grant execute on DB.DBA.SPARQL_DESC_AGG_INIT to SPARQL_SELECT',
@@ -14130,10 +12904,6 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant execute on DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL to SPARQL_SELECT',
'grant execute on DB.DBA.SPARQL_DESC_DICT_CBD to SPARQL_SELECT',
'grant execute on DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL to SPARQL_SELECT',
- 'grant execute on DB.DBA.SPARQL_DESC_DICT_OBJCBD to SPARQL_SELECT',
- 'grant execute on DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL to SPARQL_SELECT',
- 'grant execute on DB.DBA.SPARQL_DESC_DICT_SCBD to SPARQL_SELECT',
- 'grant execute on DB.DBA.SPARQL_DESC_DICT_SCBD_PHYSICAL to SPARQL_SELECT',
'grant execute on DB.DBA.SPARQL_CONSTRUCT_INIT to SPARQL_SELECT',
'grant execute on DB.DBA.SPARQL_CONSTRUCT_ACC to SPARQL_SELECT',
'grant execute on DB.DBA.SPARQL_CONSTRUCT_FIN to SPARQL_SELECT',
@@ -14155,9 +12925,9 @@ create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()
'grant execute on DB.DBA.RDF_FORGET_HTTP_RESPONSE to SPARQL_UPDATE',
'grant execute on DB.DBA.TTLP_EV_COMMIT to SPARQL_UPDATE',
'grant execute on DB.DBA.RDF_PROC_COLS to "SPARQL"',
- 'grant execute on DB.DBA.RDF_GRAPH_USER_PERMS_ACK to SPARQL_SELECT', -- DEPRECATED
- 'grant execute on DB.DBA.RDF_GRAPH_USER_PERMS_ASSERT to SPARQL_SELECT', -- DEPRECATED
- 'grant execute on DB.DBA.RDF_GRAPH_GROUP_LIST_GET to SPARQL_SELECT' );
+ 'grant execute on DB.DBA.RDF_GRAPH_USER_PERMS_ACK to "SPARQL_SELECT"', -- DEPRECATED
+ 'grant execute on DB.DBA.RDF_GRAPH_USER_PERMS_ASSERT to "SPARQL_SELECT"', -- DEPRECATED
+ 'grant execute on DB.DBA.RDF_GRAPH_GROUP_LIST_GET to "SPARQL_SELECT"' );
foreach (varchar cmd in cmds) do
{
exec (cmd, state, msg);
@@ -14247,7 +13017,7 @@ create procedure DB.DBA.RDF_QUAD_OUTLINE_ALL (in force integer := 0)
if ((registry_get ('__rb_id_only_for_plain_ro_obj') = '1') and not force)
return;
- if (not exists (select top 1 1 from DB.DBA.RDF_QUAD))
+ if (not exists (select top 1 1 from RDF_QUAD))
{
registry_set ('__rb_id_only_for_plain_ro_obj', '1');
return;
@@ -14257,7 +13027,7 @@ create procedure DB.DBA.RDF_QUAD_OUTLINE_ALL (in force integer := 0)
log_message ('such data is found.');
log_message ('This check will take some time but is made only once.');
- if (not exists (select top 1 1 from DB.DBA.RDF_QUAD table option (index RDF_QUAD_OP, index_only) where rdf_box_migrate_after_06_02_3129 (O)))
+ if (not exists (select top 1 1 from RDF_QUAD table option (index RDF_QUAD_OP, index_only) where rdf_box_migrate_after_06_02_3129 (O)))
{
log_message ('No need to update DB.DBA.RDF_QUAD.');
registry_set ('__rb_id_only_for_plain_ro_obj', '1');
@@ -14267,6 +13037,7 @@ create procedure DB.DBA.RDF_QUAD_OUTLINE_ALL (in force integer := 0)
log_message ('');
log_message ('An update is required.');
+
c_check := coalesce (virtuoso_ini_item_value ('Parameters', 'AnalyzeFixQuadStore'), '0');
if (coalesce (virtuoso_ini_item_value ('Parameters', 'LiteMode'), '0') <> '0') c_check := '1';
if (c_check <> '1')
@@ -14317,18 +13088,18 @@ create procedure DB.DBA.RDF_QUAD_OUTLINE_ALL (in force integer := 0)
}
old_mode := log_enable (2, 1);
- log_message ('Phase 1 of 9: Gathering statistics ...');
- c_main := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD) option (no cluster));
- c_pogs := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD_POGS) option (no cluster));
+ log_message ('Phase 1 of 9: Gathering statistics...');
+ c_main := (select count (1) from RDF_QUAD table option (index RDF_QUAD) option (no cluster));
+ c_pogs := (select count (1) from RDF_QUAD table option (index RDF_QUAD_POGS) option (no cluster));
if (c_main <> c_pogs)
log_message ('* Existing indexes are damaged, will try to recover...');
- c_op := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));
+ c_op := (select count (1) from RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));
log_message (sprintf (' * Index sizes before the processing: %09d RDF_QUAD, %09d POGS, %09d OP', c_main, c_pogs, c_op));
delete from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP, no cluster) option (index RDF_QUAD_RECOV_TMP, no cluster);
delete from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_POGS, no cluster) option (index RDF_QUAD_RECOV_TMP_POGS, no cluster);
delete from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only, no cluster) option (index RDF_QUAD_RECOV_TMP_OP, no cluster);
- log_message ('Phase 2 of 9: Copying all quads to a temporary table ...');
+ log_message ('Phase 2 of 9: Copying all quads to a temporary table...');
insert soft DB.DBA.RDF_QUAD_RECOV_TMP index RDF_QUAD_RECOV_TMP option (no cluster) (G1,S1,P1,O1) select G,S,P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD, no cluster);
insert soft DB.DBA.RDF_QUAD_RECOV_TMP index RDF_QUAD_RECOV_TMP_POGS option (no cluster) (G1,S1,P1,O1) select G,S,P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD_POGS, no cluster);
insert soft DB.DBA.RDF_QUAD_RECOV_TMP index RDF_QUAD_RECOV_TMP_OP option (index_only, no cluster) (P1,O1) select P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD_OP, index_only, no cluster);
@@ -14340,7 +13111,7 @@ create procedure DB.DBA.RDF_QUAD_OUTLINE_ALL (in force integer := 0)
if (c_pogs < c_main)
insert soft DB.DBA.RDF_QUAD_RECOV_TMP option (no cluster) (G1,S1,P1,O1) select G,S,P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD) option (no cluster);
}
- c_op_tmp := (select count (1) from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only) option (no cluster));
+ c_op_tmp := (select count (1) from RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only) option (no cluster));
log_message (sprintf ('* Index sizes of temporary table: %09d OP', c_op_tmp));
if (c_op_tmp < c_op)
log_message ('** Some data are lost or the corruption was strong before the processing.');
@@ -14361,9 +13132,9 @@ create procedure DB.DBA.RDF_QUAD_OUTLINE_ALL (in force integer := 0)
delete from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only, no cluster) option (index RDF_QUAD_RECOV_TMP_OP, no cluster);
log_message ('Phase 6 of 9: Gathering statistics again ...');
- c_main_fixed := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD) option (no cluster));
- c_pogs_fixed := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD_POGS) option (no cluster));
- c_op_fixed := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));
+ c_main_fixed := (select count (1) from RDF_QUAD table option (index RDF_QUAD) option (no cluster));
+ c_pogs_fixed := (select count (1) from RDF_QUAD table option (index RDF_QUAD_POGS) option (no cluster));
+ c_op_fixed := (select count (1) from RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));
log_message (sprintf ('* Index sizes after the processing: %09d RDF_QUAD, %09d POGS, %09d OP', c_main_fixed, c_pogs_fixed, c_op_fixed));
if ((__min (c_main_fixed, c_pogs_fixed) < __max (c_main, c_pogs)) or (c_op_fixed < c_op))
log_message ('** Some data are lost or the corruption was strong before the processing.');
@@ -14376,11 +13147,11 @@ create procedure DB.DBA.RDF_QUAD_OUTLINE_ALL (in force integer := 0)
--select * from DB.DBA.RDF_QUAD a table option (index RDF_QUAD_OP, index_only) where not exists (select top 1 1 from DB.DBA.RDF_QUAD b table option (index RDF_QUAD) where a.P=b.P and a.O=b.O);
--select * from DB.DBA.RDF_QUAD a table option (index RDF_QUAD) where not exists (select top 1 1 from DB.DBA.RDF_QUAD b table option (index RDF_QUAD_OP, index_only) where a.P=b.P and a.O=b.O);
- log_message ('Phase 7 of 9: integrity check (completeness of index RDF_QUAD_POGS of DB.DBA.RDF_QUAD) ...');
+ log_message ('Phase 7 of 9: integrity check (completeness of index RDF_QUAD_POGS of DB.DBA.RDF_QUAD)...');
if (exists (select top 1 1 from DB.DBA.RDF_QUAD a table option (index RDF_QUAD) where not exists (select 1 from DB.DBA.RDF_QUAD b table option (loop, index RDF_QUAD_POGS) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s)))
log_message ('** IMPORTANT WARNING: not all rows of DB.DBA.RDF_QUAD are found in RDF_QUAD_POGS, data reloading is strictly recommended.');
- log_message ('Phase 8 of 9: integrity check (completeness of primary key of DB.DBA.RDF_QUAD) ...');
+ log_message ('Phase 8 of 9: integrity check (completeness of primary key of DB.DBA.RDF_QUAD)...');
if (exists (select top 1 1 from DB.DBA.RDF_QUAD a table option (index RDF_QUAD_POGS) where not exists (select 1 from DB.DBA.RDF_QUAD b table option (loop, index primary key) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s)))
log_message ('** IMPORTANT WARNING: not all rows of DB.DBA.RDF_QUAD are found in RDF_QUAD_POGS, data reloading is strictly recommended.');
@@ -14431,9 +13202,6 @@ create procedure DB.DBA.RDF_QUAD_FT_UPGRADE ()
from DB.DBA.RDF_GRAPH_USER where RGU_GRAPH_IID = #i8192 );
fake := (select count (dict_put (__rdf_graph_public_perms_dict(), RGU_GRAPH_IID, RGU_PERMISSIONS))
from DB.DBA.RDF_GRAPH_USER where RGU_USER_ID = http_nobody_uid () );
- delete from DB.DBA.RDF_GRAPH_USER where not exists (select 1 from DB.DBA.SYS_USERS where RGU_USER_ID = U_ID);
- if (row_count ())
- log_message ('Non-existing users are removed from graph security list');
fake := (select count (__rdf_graph_specific_perms_of_user (RGU_GRAPH_IID, RGU_USER_ID, RGU_PERMISSIONS))
from DB.DBA.RDF_GRAPH_USER where RGU_USER_ID <> http_nobody_uid () and not (RGU_GRAPH_IID in (#i0, #i8192)) );
if (coalesce (virtuoso_ini_item_value ('SPARQL', 'RecoveryMode'), '0') > '0')
@@ -14469,8 +13237,8 @@ create procedure DB.DBA.RDF_QUAD_FT_UPGRADE ()
final_qm_reload:
DB.DBA.SPARQL_RELOAD_QM_GRAPH ();
- --VOS insert soft rdf_datatype (rdt_iid, rdt_twobyte, rdt_qname) values
- --VOS (iri_to_id ('http://www.openlinksw.com/schemas/virtrdf#Geometry'), 256, 'http://www.openlinksw.com/schemas/virtrdf#Geometry');
+ insert soft rdf_datatype (rdt_iid, rdt_twobyte, rdt_qname) values
+ (iri_to_id ('http://www.openlinksw.com/schemas/virtrdf#Geometry'), 256, 'http://www.openlinksw.com/schemas/virtrdf#Geometry');
return;
}
@@ -14563,19 +13331,19 @@ create function rdfs_load_schema (in ri_name varchar, in gn varchar := null) ret
txt := sprintf ('sparql define output:valmode "LONG" define input:storage "" select ?s ?o %s where { ?s <%s> ?o . filter (!isLITERAL (?o)) }',
from_text, id_to_iri (case (idx) when 4 then rdf_sas_iri () else rdf_owl_iri (idx) end) );
exec (txt, null, null, vector (), 0, meta, null, cc);
- while (0 = exec_next (cc, null, null, res))
- {
+ while (0 = exec_next (cc, null, null, res))
+ {
declare s, o any;
s := res[0]; o := res[1];
if (idx = 4)
- {
- rdf_inf_dir (ri_name, s, o, 2);
- rdf_inf_dir (ri_name, s, o, 3);
+ {
+ rdf_inf_dir (ri_name, s, o, 2);
+ rdf_inf_dir (ri_name, s, o, 3);
rules_count := rules_count + 2;
- }
- else
+ }
+ else
{
- rdf_inf_dir (ri_name, o, s, idx);
+ rdf_inf_dir (ri_name, o, s, idx);
rules_count := rules_count + 1;
}
}
@@ -14642,7 +13410,7 @@ create function rdfs_load_schema (in ri_name varchar, in gn varchar := null) ret
exec (txt, null, null, vector (v[inx]), 0, meta1, res1);
excl := meta1[0][0];
if (length (excl) > 0)
- rdf_inf_set_ifp_exclude_list (ri_name, v[inx], excl);
+ rdf_inf_set_ifp_exclude_list (ri_name, v[inx], excl);
}
}
-- Loading inverse functions
@@ -14686,6 +13454,7 @@ create function rdfs_load_schema (in ri_name varchar, in gn varchar := null) ret
}
;
+
create procedure rdf_schema_ld ()
{
if (1 <> sys_stat ('cl_run_local_only'))
@@ -14713,7 +13482,7 @@ create procedure CL_RDF_INF_CHANGED (in name varchar)
declare aq any;
if (2 = sys_stat ('cl_run_local_only'))
return;
- aq := async_queue (1);
+ aq := async_queue (1);
aq_request (aq, 'DB.DBA.CL_RDF_INF_CHANGED_SRV', vector (name));
aq_wait_all (aq);
}
@@ -14729,7 +13498,7 @@ create function rdfs_rule_set (in name varchar, in gn varchar, in remove int :=
commit work;
if (0 = sys_stat ('cl_run_local_only'))
{
- DB.DBA.SECURITY_CL_EXEC_AND_LOG ('DB.DBA.CL_RDF_INF_CHANGED (?)', vector (name));
+ DB.DBA.SECURITY_CL_EXEC_AND_LOG ('DB.DBA.CL_RDF_INF_CHANGED (?)', vector (name));
return 1;
}
else
diff --git a/libsrc/Wi/sparql2sql.c b/libsrc/Wi/sparql2sql.c
index febd2d0..8c44480 100644
--- a/libsrc/Wi/sparql2sql.c
+++ b/libsrc/Wi/sparql2sql.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparql2sql.c,v 1.88.2.52 2012/03/08 12:55:35 source Exp $
+ * $Id: sparql2sql.c,v 1.88.2.46 2011/07/19 23:27:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -370,7 +370,7 @@ sparp_gp_trav_preopt_expn_subq (sparp_t *sparp, SPART *curr, sparp_trav_state_t
void
sparp_rewrite_retvals (sparp_t *sparp, int safely_copy_retvals)
{
- rdf_grab_config_t *rgc = &(sparp->sparp_env->spare_src.ssrc_grab);
+ rdf_grab_config_t *rgc = &(sparp->sparp_env->spare_grab);
SPART *root = sparp->sparp_expr;
if (rgc->rgc_all)
spar_add_rgc_vars_and_consts_from_retvals (sparp, root->_.req_top.retvals);
@@ -383,6 +383,7 @@ spar_retvals_of_describe() should wait for obtaining all variables and then
sparp_expand_top_retvals () to process 'DESCRIBE * ...'. */
if (DESCRIBE_L == root->_.req_top.subtype)
{
+ sparp->sparp_storage = sparp_find_storage_by_name (sparp->sparp_expr->_.req_top.storage_name);
root->_.req_top.retvals =
spar_retvals_of_describe (sparp,
root->_.req_top.retvals,
@@ -752,7 +753,7 @@ sparp_rotate_comparisons_by_rank (SPART *filt)
break;
}
case SPAR_BUILT_IN_CALL:
- if (SPAR_BIF_SAMETERM == filt->_.builtin.btype)
+ if (SAMETERM_L == filt->_.builtin.btype)
{
SPART *l = filt->_.builtin.args[0];
SPART *r = filt->_.builtin.args[1];
@@ -869,7 +870,7 @@ sparp_merge_BOP_OR_of_INs (SPART *first, SPART *second, so_BOP_OR_filter_ctx_t *
memcpy (res_IN_args + 1, first_vals, first_val_count * sizeof (caddr_t));
memcpy (res_IN_args + 1 + first_val_count, second_vals, second_val_count * sizeof (caddr_t));
sparp_equiv_remove_var (sparp, SPARP_EQUIV (sparp, second_var->_.var.equiv_idx), second_var);
- return sparp_make_builtin_call (sparp, IN_L, res_IN_args);
+ return spartlist (sparp, 3, SPAR_BUILT_IN_CALL, IN_L, res_IN_args);
}
SPART *
@@ -926,7 +927,7 @@ sparp_optimize_BOP_OR_filter_walk (SPART *filt, so_BOP_OR_filter_ctx_t *ctx)
}
return filt;
}
- if (SPAR_BIF_SAMETERM != filt->_.builtin.btype)
+ if (SAMETERM_L != filt->_.builtin.btype)
goto cannot_optimize; /* see below */
/* no break, try get optimization hints like it is BOP_EQ */
case BOP_EQ: /* No break */
@@ -1010,7 +1011,7 @@ spar_var_eq_to_equiv (sparp_t *sparp, SPART *curr, sparp_equiv_t *eq_l, SPART *r
int ret = 0;
int flags = 0;
ptrlong tree_restr_bits = sparp_restr_bits_of_expn (sparp, r);
- eq_l->e_rvr.rvrRestrictions |= SPART_VARR_NOT_NULL | (tree_restr_bits & (
+ eq_l->e_rvr.rvrRestrictions |= (tree_restr_bits & (
SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_IS_BLANK |
SPART_VARR_IS_LIT | SPART_VARR_LONG_EQ_SQL |
SPART_VARR_NOT_NULL | SPART_VARR_ALWAYS_NULL ) );
@@ -1047,14 +1048,8 @@ spar_var_eq_to_equiv (sparp_t *sparp, SPART *curr, sparp_equiv_t *eq_l, SPART *r
{
switch (r->_.builtin.btype)
{
- case SPAR_BIF_STR: eq_l->e_rvr.rvrRestrictions |= SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL; break;
+ case STR_L: eq_l->e_rvr.rvrRestrictions |= SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL; break;
case IRI_L: eq_l->e_rvr.rvrRestrictions |= SPART_VARR_IS_REF | SPART_VARR_NOT_NULL; break;
- default:
- {
- const sparp_bif_desc_t *bif_desc = sparp_bif_descs + r->_.builtin.desc_ofs;
- if ((SSG_VALMODE_NUM == bif_desc->sbd_ret_valmode) || (SSG_VALMODE_BOOL == bif_desc->sbd_ret_valmode))
- eq_l->e_rvr.rvrRestrictions |= SPART_VARR_LONG_EQ_SQL;
- }
}
return 0;
}
@@ -1062,7 +1057,7 @@ spar_var_eq_to_equiv (sparp_t *sparp, SPART *curr, sparp_equiv_t *eq_l, SPART *r
}
if (sparp_equiv_contains_t_io (sparp, eq_l))
return 0;
- return flags | SPART_VARR_NOT_NULL;
+ return flags;
}
/* For an != in group \c curr between member of \c eq_l and expression \c r,
@@ -1154,7 +1149,7 @@ sparp_filter_to_equiv (sparp_t *sparp, SPART *curr, SPART *filt)
(lval == uname_xmlschema_ns_uri_hash_boolean) ||
(lval == uname_xmlschema_ns_uri_hash_string) )
{
- flags |= SPART_VARR_IS_LIT;
+ flags = SPART_VARR_IS_LIT;
}
else if (
(lval == uname_xmlschema_ns_uri_hash_date) ||
@@ -1165,7 +1160,7 @@ sparp_filter_to_equiv (sparp_t *sparp, SPART *curr, SPART *filt)
(lval == uname_xmlschema_ns_uri_hash_integer) ||
(lval == uname_xmlschema_ns_uri_hash_time) )
{
- flags |= SPART_VARR_IS_LIT | SPART_VARR_LONG_EQ_SQL;
+ flags = SPART_VARR_IS_LIT | SPART_VARR_LONG_EQ_SQL;
}
rarg1_eq->e_rvr.rvrRestrictions |= flags;
rarg1_eq->e_replaces_filter |= flags;
@@ -1187,7 +1182,7 @@ sparp_filter_to_equiv (sparp_t *sparp, SPART *curr, SPART *filt)
str_lval = (caddr_t)l;
break;
}
- if ((NULL != str_lval) && (SPAR_BUILT_IN_CALL == SPART_TYPE (r)) && (SPAR_BIF_STR == r->_.builtin.btype))
+ if ((NULL != str_lval) && (SPAR_BUILT_IN_CALL == SPART_TYPE (r)) && (STR_L == r->_.builtin.btype))
{
SPART *rarg1 = r->_.builtin.args[0];
if (SPAR_IS_BLANK_OR_VAR (rarg1))
@@ -1247,49 +1242,58 @@ because const=str(var) is never recognized as a special condition on t_in or t_o
{
SPART *arg1 = filt->_.builtin.args[0];
sparp_equiv_t *arg1_eq;
- if (SPAR_IS_BLANK_OR_VAR (arg1))
- arg1_eq = sparp_equiv_get (sparp, curr, arg1, 0);
- else
- break;
+ if (SPAR_IS_BLANK_OR_VAR (arg1))
+ arg1_eq = sparp_equiv_get (sparp, curr, arg1, 0);
+ else
+ break;
switch (filt->_.builtin.btype)
{
- case SPAR_BIF_ISIRI:
- case SPAR_BIF_ISURI:
+ case isIRI_L:
+ case isURI_L:
flags = SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_NOT_NULL;
arg1_eq->e_rvr.rvrRestrictions |= flags;
arg1_eq->e_replaces_filter |= flags;
return 1;
- case SPAR_BIF_ISBLANK:
+ case isBLANK_L:
flags = SPART_VARR_IS_REF | SPART_VARR_IS_BLANK | SPART_VARR_NOT_NULL;
arg1_eq->e_rvr.rvrRestrictions |= flags;
arg1_eq->e_replaces_filter |= flags;
return 1;
- case SPAR_BIF_ISREF:
+ case isREF_L:
flags = SPART_VARR_IS_REF | SPART_VARR_NOT_NULL;
arg1_eq->e_rvr.rvrRestrictions |= flags;
arg1_eq->e_replaces_filter |= flags;
return 1;
- case SPAR_BIF_ISLITERAL:
+ case isLITERAL_L:
flags = SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL;
arg1_eq->e_rvr.rvrRestrictions |= flags;
arg1_eq->e_replaces_filter |= flags;
return 1;
- case SPAR_BIF_ISNUMERIC:
- flags = SPART_VARR_IS_LIT | SPART_VARR_LONG_EQ_SQL | SPART_VARR_NOT_NULL;
- arg1_eq->e_rvr.rvrRestrictions |= flags;
- arg1_eq->e_replaces_filter |= flags;
- break;
case BOUND_L:
flags = SPART_VARR_NOT_NULL;
arg1_eq->e_rvr.rvrRestrictions |= flags;
arg1_eq->e_replaces_filter |= flags;
return 1;
- case SPAR_BIF_SAMETERM:
+ case SAMETERM_L:
{
SPART *arg2 = filt->_.builtin.args[1];
spar_var_eq_to_equiv (sparp, curr, arg1_eq, arg2); /* No return because sameTerm is more strict than merge of equivs */
break;
}
+#ifdef DEBUG
+ case COALESCE_L:
+ case IRI_L:
+ case STR_L:
+ case LANG_L: case LANGMATCHES_L: case DATATYPE_L:
+ case REGEX_L:
+ case LIKE_L:
+ case IF_L:
+ case IN_L:
+ break;
+ default: spar_internal_error (sparp, "sparp_" "filter_to_equiv(): unsupported built-in");
+#else
+ default: break;
+#endif
}
break;
}
@@ -2648,8 +2652,6 @@ sparp_check_mapping_of_sources (sparp_t *sparp, tc_context_t *tcc,
int chk_res;
if (SPART_GRAPH_MIN_NEGATION < source->_.graph.subtype)
{
- if (NULL == source->_.graph.iri)
- continue;
if ((NULL != rvr) && (NULL != rvr->rvrFixedValue) &&
sparp_fixedvalues_equal (sparp, (SPART *)(source->_.graph.iri), (SPART *)(rvr->rvrFixedValue)) )
return SSG_QM_NO_MATCH;
@@ -2660,10 +2662,7 @@ sparp_check_mapping_of_sources (sparp_t *sparp, tc_context_t *tcc,
}
if (tcc->tcc_source_invalidation_masks[source_ctr])
continue;
- if (NULL == source->_.graph.iri)
- chk_res = ((NULL != rvr->rvrFixedValue) ? SSG_QM_APPROX_MATCH : SSG_QM_PARTIAL_MATCH);
- else
- chk_res = sparp_check_field_mapping_of_cvalue (sparp, (SPART *)(source->_.graph.iri), qmv_or_fmt_rvr, rvr);
+ chk_res = sparp_check_field_mapping_of_cvalue (sparp, (SPART *)(source->_.graph.iri), qmv_or_fmt_rvr, rvr);
if (SSG_QM_NO_MATCH != chk_res)
{
if (chk_res < min_match)
@@ -5324,14 +5323,12 @@ void
sparp_rewrite_all (sparp_t *sparp, int safely_copy_retvals)
{
ptrlong top_type = SPART_TYPE (sparp->sparp_expr);
- if ((NULL == sparp->sparp_env->spare_storage_name) && (NULL == sparp->sparp_storage))
- sparp->sparp_storage = sparp_find_storage_by_name (NULL);
if (SPAR_QM_SQL_FUNCALL == top_type)
return;
if (SPAR_CODEGEN == top_type)
return;
sparp_rewrite_retvals (sparp, safely_copy_retvals);
- if ((sparp->sparp_env->spare_src.ssrc_grab.rgc_pview_mode) && (NULL == sparp->sparp_parent_sparp))
+ if ((sparp->sparp_env->spare_grab.rgc_pview_mode) && (NULL == sparp->sparp_parent_sparp))
{
sparp_rewrite_grab (sparp);
return;
@@ -5614,6 +5611,7 @@ retry_preopt:
spar_error (sparp, "Variable '%.100s' is used in subexpressions of the query but not assigned", eq->e_varnames[0]);
}
}
+ sparp->sparp_storage = sparp_find_storage_by_name (sparp->sparp_expr->_.req_top.storage_name);
/* Building qm_list for every triple in the tree. */
sparp_gp_trav (sparp, sparp->sparp_expr->_.req_top.pattern, NULL,
sparp_gp_trav_refresh_triple_cases, NULL,
@@ -6065,7 +6063,7 @@ void
sparp_rewrite_grab (sparp_t *sparp)
{
sparp_env_t *env = sparp->sparp_env;
- rdf_grab_config_t *rgc = &(env->spare_src.ssrc_grab);
+ rdf_grab_config_t *rgc = &(env->spare_grab);
sparp_t *sparp_of_seed; /* This will compile the statement that will collect the first set of graphs */
sparp_t *sparp_of_iter; /* This will compile the statement that will called while the set of graphs growth */
sparp_t *sparp_of_final; /* This will compile the statement that will produce the final result set */
@@ -6109,10 +6107,10 @@ sparp_rewrite_grab (sparp_t *sparp)
sparp_of_seed->sparp_expr->_.req_top.offset = 0;
sparp_of_seed->sparp_env->spare_globals_mode = SPARE_GLOBALS_ARE_COLONUMBERED;
sparp_of_seed->sparp_env->spare_global_num_offset = 1;
- sparp_of_seed->sparp_env->spare_src.ssrc_grab.rgc_sa_graphs = env->spare_src.ssrc_grab.rgc_sa_graphs;
- sparp_of_seed->sparp_env->spare_src.ssrc_grab.rgc_sa_preds = env->spare_src.ssrc_grab.rgc_sa_preds;
- sparp_of_seed->sparp_env->spare_src.ssrc_grab.rgc_sa_vars = env->spare_src.ssrc_grab.rgc_sa_vars;
- sparp_of_seed->sparp_env->spare_src.ssrc_grab.rgc_vars = env->spare_src.ssrc_grab.rgc_vars;
+ sparp_of_seed->sparp_env->spare_grab.rgc_sa_graphs = env->spare_grab.rgc_sa_graphs;
+ sparp_of_seed->sparp_env->spare_grab.rgc_sa_preds = env->spare_grab.rgc_sa_preds;
+ sparp_of_seed->sparp_env->spare_grab.rgc_sa_vars = env->spare_grab.rgc_sa_vars;
+ sparp_of_seed->sparp_env->spare_grab.rgc_vars = env->spare_grab.rgc_vars;
/* Making subqueries: iter */
sub_sparps[1] = sparp_of_iter = sparp_clone_for_variant (sparp_of_seed, 0);
sparp_of_iter->sparp_expr = sparp_tree_full_copy (sparp_of_seed, sparp_of_seed->sparp_expr, NULL);
@@ -6121,10 +6119,10 @@ sparp_rewrite_grab (sparp_t *sparp)
sparp_tweak_order_of_iter (sparp_of_iter, sparp_of_iter->sparp_expr->_.req_top.order);
sparp_of_iter->sparp_env->spare_globals_mode = SPARE_GLOBALS_ARE_COLONUMBERED;
sparp_of_iter->sparp_env->spare_global_num_offset = 1;
- sparp_of_iter->sparp_env->spare_src.ssrc_grab.rgc_sa_graphs = env->spare_src.ssrc_grab.rgc_sa_graphs;
- sparp_of_iter->sparp_env->spare_src.ssrc_grab.rgc_sa_preds = env->spare_src.ssrc_grab.rgc_sa_preds;
- sparp_of_iter->sparp_env->spare_src.ssrc_grab.rgc_sa_vars = env->spare_src.ssrc_grab.rgc_sa_vars;
- sparp_of_iter->sparp_env->spare_src.ssrc_grab.rgc_vars = env->spare_src.ssrc_grab.rgc_vars;
+ sparp_of_iter->sparp_env->spare_grab.rgc_sa_graphs = env->spare_grab.rgc_sa_graphs;
+ sparp_of_iter->sparp_env->spare_grab.rgc_sa_preds = env->spare_grab.rgc_sa_preds;
+ sparp_of_iter->sparp_env->spare_grab.rgc_sa_vars = env->spare_grab.rgc_sa_vars;
+ sparp_of_iter->sparp_env->spare_grab.rgc_vars = env->spare_grab.rgc_vars;
/* Only after making the iter subquery from the seed one, seed may loose its ORDER BY */
sparp_of_seed->sparp_expr->_.req_top.order = NULL;
/*!!! TBD: relax graph conditions in sparp_of_iter */
@@ -6407,7 +6405,7 @@ ssg_select_known_graphs_codegen (struct spar_sqlgen_s *ssg, struct spar_tree_s *
ssg_puts ((SSG_VALMODE_LONG == retvalmode) ? ".return_iris=0 " : ".return_iris=1 ");
ssg_puts (" AND ");
ssg_prin_id_with_suffix (ssg, retselid, "~pview");
- snprintf (limplusofs_strg, sizeof (limplusofs_strg), ".lim=" BOXINT_FMT, (SPARP_MAXLIMIT == lim) ? SPARP_MAXLIMIT : lim+ofs);
+ snprintf (limplusofs_strg, sizeof (limplusofs_strg), ".lim=" BOXINT_FMT, ((SPARP_MAXLIMIT-ofs) >= lim) ? lim+ofs : SPARP_MAXLIMIT);
ssg_puts (limplusofs_strg);
if ((NULL != formatter) || (NULL != agg_formatter))
{
diff --git a/libsrc/Wi/sparql2sql.h b/libsrc/Wi/sparql2sql.h
index 7612571..5c793e6 100644
--- a/libsrc/Wi/sparql2sql.h
+++ b/libsrc/Wi/sparql2sql.h
@@ -1,10 +1,10 @@
/*
- * $Id: sparql2sql.h,v 1.55.2.28 2012/03/08 12:55:35 source Exp $
+ * $Id: sparql2sql.h,v 1.55.2.24 2011/07/19 23:27:50 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -126,10 +126,6 @@ extern void sparp_up_from_sub (sparp_t *sparp, SPART *subq_gp_wrapper, sparp_t *
/*!< Continues the current traversal in the given gp with subquery */
extern void sparp_continue_gp_trav_in_sub (sparp_t *sparp, SPART *subq_gp_wrapper, void *common_env);
-extern SPART **spar_macroexpand_treelist (sparp_t *sparp, SPART **trees, int begin_with);
-/*!< Do nothing or macroexpand a single tree, returns the result, destroying and/or reusing the original */
-extern SPART *spar_macroexpand_tree (sparp_t *sparp, SPART *tree);
-
struct sparp_equiv_s;
/*! Equivalence class of variables. All instances of \c sparp_equiv_s are enumerated in \c sparp_sg->sg_equivs .
@@ -736,22 +732,6 @@ typedef struct rdf_ds_usage_s
caddr_t rdfdu_alias; /*!< Table alias used for the occurrence */
} rdf_ds_usage_t;
-/*! Description of SPARQL Built In Function (one mentioned in spec and in lang syntax) */
-typedef struct sparp_bif_desc_s {
- const char * sbd_name; /*!< Name, uppercased */
- int sbd_subtype; /*!< Assigned SPAR_BIF_xxx value */
- char sbd_implementation; /*!< Type of implementation. '-' for special code generation, 'B' for BIF, 'S' for stored procedures */
- int sbd_required_syntax; /*!< Bits of sparql dialect such that at least one bit should be set in dialect in order to allow the function */
- int sbd_minargs; /*!< Minimum allowed number of arguments */
- int sbd_maxargs; /*!< Maximum allowed number of arguments */
- ssg_valmode_t sbd_ret_valmode; /*!< Native valmode of the expression */
- ssg_valmode_t sbd_arg_valmodes[3]; /*!< Expected valmodes of the arguments. The valmode of last specified argument is used for the rest of arguments */
- int sbd_result_restr_bits; /*!< (Approximate) restriction bits of the result, they can be changed after inspecting restriction bits of arguments */
-} sparp_bif_desc_t;
-
-extern const sparp_bif_desc_t sparp_bif_descs[];
-
-
#define NULL_ASNAME ((const char *)NULL)
#define COL_IDX_ASNAME (((const char *)NULL) + 0x100)
@@ -857,15 +837,7 @@ extern void spar_sqlprint_error_impl (spar_sqlgen_t *ssg, const char *msg);
} while (0)
/*! Adds either iri of \c jso_inst or \c jso_name into dependencies of the generated query. \c jso_inst is used only if \c jso_name is NULL */
-extern void spar_qr_uses_jso_int (comp_context_t *cc, ccaddr_t jso_inst, ccaddr_t jso_name);
-
-#define sparp_qr_uses_jso(sparp,jso_inst,jso_name) do { \
- struct sql_comp_s *super_sc = (sparp)->sparp_sparqre->sparqre_super_sc; \
- if (NULL != super_sc) \
- spar_qr_uses_jso_int (super_sc->sc_cc, (jso_inst), (jso_name)); } while (0)
-
-#define ssg_qr_uses_jso(ssg,jso_inst,jso_name) spar_qr_uses_jso_int ((ssg)->ssg_sc->sc_cc, (jso_inst), (jso_name))
-
+extern void ssg_qr_uses_jso (spar_sqlgen_t *ssg, ccaddr_t jso_inst, ccaddr_t jso_name);
extern void ssg_qr_uses_table (spar_sqlgen_t *ssg, const char *tbl);
extern ssg_valmode_t sparp_lit_native_valmode (SPART *tree);
@@ -979,7 +951,6 @@ An occurrence of a non-blocking feature provides some hint to the optimizer of t
#define SSG_SD_VOS_6 0x1FFF /*!< Allows everything that is supported by Virtuoso Open Source 6.0.0 */
#define SSG_SD_VOS_CURRENT SSG_SD_VOS_6 /*!< Allows everything that is supported by current version of Virtuoso Open Source */
#define SSG_SD_SPARQL11 0x2000 /*!< Allows the use of SPARQL 1.1 extensions, blocking in most of cases */
-#define SSG_SD_BI_OR_SPARQL11 (SSG_SD_BI | SSG_SD_SPARQL11)
#define SSG_SD_DEPRECATED_MASK 0x0 /*!< All bits of deprecated flags (none so far) */
#define SSG_SD_MAXVALUE (SSG_SD_VOS_CURRENT | SSG_SD_DEPRECATED_MASK)
diff --git a/libsrc/Wi/sparql2sqltext.c b/libsrc/Wi/sparql2sqltext.c
index 2ded446..1d8fff9 100644
--- a/libsrc/Wi/sparql2sqltext.c
+++ b/libsrc/Wi/sparql2sqltext.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparql2sqltext.c,v 1.113.2.117 2012/03/15 14:44:19 source Exp $
+ * $Id: sparql2sqltext.c,v 1.113.2.100 2011/09/27 09:42:14 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -86,7 +86,6 @@ void rdf_ds_load_all (void)
qmf->qmfIsuriOfShortTmpl = box_dv_short_string (" (^{tree}^ < min_bnode_iri_id ())");
qmf->qmfIsblankOfShortTmpl = box_dv_short_string (" (^{tree}^ >= min_bnode_iri_id ())");
qmf->qmfIslitOfShortTmpl = box_dv_short_string (" 0");
- qmf->qmfIsnumericOfShortTmpl = box_dv_short_string (" 0");
qmf->qmf01uriOfShortTmpl = box_dv_short_string (" (lt (^{tree}^, min_bnode_iri_id ()))");
qmf->qmf01blankOfShortTmpl = box_dv_short_string (" (gte (^{tree}^, min_bnode_iri_id ()))");
qmf->qmfLongOfShortTmpl = box_dv_short_string (" ^{tree}^");
@@ -130,7 +129,6 @@ void rdf_ds_load_all (void)
qmf->qmfIsuriOfShortTmpl = box_dv_short_string (" is_named_iri_id (^{tree}^)");
qmf->qmfIsblankOfShortTmpl = box_dv_short_string (" is_bnode_iri_id (^{tree}^)");
qmf->qmfIslitOfShortTmpl = box_dv_short_string (" (1 - isiri_id (^{tree}^))");
- qmf->qmfIsnumericOfShortTmpl = box_dv_short_string (" isnumeric (^{tree}^)");
qmf->qmfLongOfShortTmpl = box_dv_short_string (" __ro2lo (^{tree}^)");
qmf->qmfDatatypeOfShortTmpl = box_dv_short_string (" DB.DBA.RDF_DATATYPE_OF_OBJ (__ro2sq (^{tree}^))");
qmf->qmfLanguageOfShortTmpl = box_dv_short_string (" DB.DBA.RDF_LANGUAGE_OF_OBJ (__ro2sq (^{tree}^))");
@@ -231,22 +229,11 @@ ssg_find_valmode_by_name (ccaddr_t name)
return NULL; /* to keep compiler happy */
}
-int
-ssg_is_odbc_cli ()
-{
- client_connection_t * cli = sqlc_client ();
- if (!cli || !cli->cli_session || cli->cli_ws || cli->cli_is_log)
- return 0;
- return 1;
-}
-
void
ssg_find_formatter_by_name_and_subtype (ccaddr_t name, ptrlong subtype,
const char **ret_formatter, const char **ret_agg_formatter, const char **ret_agg_mdata )
{
ret_formatter[0] = ret_agg_formatter[0] = ret_agg_mdata[0] = NULL;
- if (NULL == name && ssg_is_odbc_cli ())
- name = "_UDBC_";
if (NULL == name)
return;
if (!strncmp (name, "HTTP+", 5))
@@ -322,12 +309,6 @@ ssg_find_formatter_by_name_and_subtype (ccaddr_t name, ptrlong subtype,
case ASK_L: ret_formatter[0] = "DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL"; return;
default: return;
}
- if (!strcmp (name, "TRIG"))
- switch (subtype)
- {
- case CONSTRUCT_L: case DESCRIBE_L: ret_formatter[0] = "DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TRIG"; return;
- default: return;
- }
if (!strcmp (name, "NT"))
switch (subtype)
{
@@ -362,7 +343,7 @@ ssg_find_formatter_by_name_and_subtype (ccaddr_t name, ptrlong subtype,
case CONSTRUCT_L: case DESCRIBE_L: ret_formatter[0] = "DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_MICRODATA"; return;
default: return;
}
- if (!strcmp (name, "_JAVA_") || !strcmp (name, "_UDBC_"))
+ if (!strcmp (name, "_JAVA_"))
switch (subtype)
{
case ASK_L: ret_formatter[0] = "COUNT"; return;
@@ -432,6 +413,23 @@ sparp_jso_push_deleted (sparp_t *sparp, ccaddr_t class_iri, ccaddr_t inst_iri)
}
void
+ssg_qr_uses_jso (spar_sqlgen_t *ssg, ccaddr_t jso_inst, ccaddr_t jso_name)
+{
+ comp_context_t *cc = ssg->ssg_sc->sc_cc;
+ if (NULL == cc)
+ return;
+ if (NULL == jso_name)
+ {
+ jso_rtti_t *jso_rtti = gethash (jso_inst, jso_rttis_of_structs);
+ if (NULL == jso_rtti)
+ return; /* Built-in anonymous JSO, like one used when define input:storage "" */
+ jso_name = jso_rtti->jrtti_inst_iri;
+ }
+ box_dv_uname_make_immortal ((caddr_t)jso_name);
+ qr_uses_jso (cc->cc_super_cc->cc_query, jso_name);
+}
+
+void
ssg_qr_uses_table (spar_sqlgen_t *ssg, const char *tbl)
{
comp_context_t *cc;
@@ -1678,8 +1676,10 @@ sparp_expn_native_valmode (sparp_t *sparp, SPART *tree)
case SPAR_BUILT_IN_CALL:
switch (tree->_.builtin.btype)
{
- case IN_L: case LIKE_L: return SSG_VALMODE_BOOL;
- case SPAR_BIF_COALESCE:
+ case IN_L: case LIKE_L: case LANGMATCHES_L: case REGEX_L: case BOUND_L:
+ case isIRI_L: case isURI_L: case isBLANK_L: case isREF_L: case isLITERAL_L: return SSG_VALMODE_BOOL;
+ case IRI_L: case DATATYPE_L: return SSG_VALMODE_LONG;
+ case COALESCE_L:
{
ssg_valmode_t union_valmode = sparp_expn_native_valmode (sparp, tree->_.builtin.args[0]);
int argctr;
@@ -1690,17 +1690,13 @@ sparp_expn_native_valmode (sparp_t *sparp, SPART *tree)
}
return union_valmode;
}
- case SPAR_BIF_IF:
+ case IF_L:
{
ssg_valmode_t t_branch_valmode = sparp_expn_native_valmode (sparp, tree->_.builtin.args[1]);
ssg_valmode_t f_branch_valmode = sparp_expn_native_valmode (sparp, tree->_.builtin.args[2]);
return ssg_smallest_union_valmode (t_branch_valmode, f_branch_valmode);
}
- default:
- {
- const sparp_bif_desc_t *sbd = sparp_bif_descs + tree->_.builtin.desc_ofs;
- return sbd->sbd_ret_valmode;
- }
+ default: return SSG_VALMODE_SQLVAL;
}
case SPAR_FUNCALL:
return sparp_rettype_of_function (sparp, tree->_.funcall.qname, tree);
@@ -1871,18 +1867,7 @@ sparp_expn_native_valmode (sparp_t *sparp, SPART *tree)
sub_sparp->sparp_env = subq->_.req_top.shared_spare;
sub_sparp->sparp_parent_sparp = sparp;
res = sparp_expn_native_valmode (sub_sparp, subq->_.req_top.retvals[0]);
- if ((SSG_VALMODE_NUM == res) || (SSG_VALMODE_LONG == res) || (SSG_VALMODE_SQLVAL == res))
- return res;
-#if 0 /*!!! TBD extend ssg_print_scalar_subquery_exp() to support any valmodes and avoid using casts to SSG_VALMODE_LONG */
- if (IS_BOX_POINTER (res))
- {
- if (res->qmfIsSubformatOfLong)
- return SSG_VALMODE_LONG;
- }
return res;
-#else
- return SSG_VALMODE_LONG;
-#endif
}
default: break;
}
@@ -1975,99 +1960,92 @@ sparp_restr_bits_of_expn (sparp_t *sparp, SPART *tree)
case SPAR_ALIAS:
return sparp_restr_bits_of_expn (sparp, tree->_.alias.arg);
case SPAR_BUILT_IN_CALL:
- {
- const sparp_bif_desc_t *sbd = sparp_bif_descs + tree->_.builtin.desc_ofs;
- ptrlong res_bits = sbd->sbd_result_restr_bits;
- switch (tree->_.builtin.btype)
+ switch (tree->_.builtin.btype)
+ {
+ case IN_L: case LIKE_L: case LANGMATCHES_L: case REGEX_L:
+ return SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL;
+ case isIRI_L: case isURI_L: case isBLANK_L: case isREF_L: case isLITERAL_L: case BOUND_L:
{
- case SPAR_BIF_ISIRI: case SPAR_BIF_ISURI: case SPAR_BIF_ISBLANK: case SPAR_BIF_ISREF: case SPAR_BIF_ISLITERAL: case SPAR_BIF_ISNUMERIC: case BOUND_L:
- {
- ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
- if (!(arg_bits & SPART_VARR_NOT_NULL))
- return res_bits;
- if ((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (arg_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL)))
- return (res_bits | SPART_VARR_FIXED);
- switch (tree->_.builtin.btype)
- {
- case SPAR_BIF_ISIRI: case SPAR_BIF_ISURI: case SPAR_BIF_ISBLANK:
- if ((arg_bits & SPART_VARR_IS_IRI) || (arg_bits & SPART_VARR_IS_BLANK)
- || (arg_bits & SPART_VARR_ALWAYS_NULL) )
- return (res_bits | SPART_VARR_FIXED);
- /* no break; */
- case SPAR_BIF_ISREF: case SPAR_BIF_ISLITERAL:
- if ((arg_bits & SPART_VARR_IS_REF) || (arg_bits & SPART_VARR_IS_LIT)
- || (arg_bits & SPART_VARR_IS_IRI) || (arg_bits & SPART_VARR_IS_BLANK)
- || (arg_bits & SPART_VARR_ALWAYS_NULL))
- return (res_bits | SPART_VARR_FIXED);
- break;
- case SPAR_BIF_ISNUMERIC:
- if ((arg_bits & SPART_VARR_IS_REF)
- || (arg_bits & SPART_VARR_IS_IRI) || (arg_bits & SPART_VARR_IS_BLANK)
- || (arg_bits & SPART_VARR_ALWAYS_NULL))
- return (res_bits | SPART_VARR_FIXED);
- break;
- case BOUND_L: break;
- }
+ ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
+ ptrlong res_bits = (SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL);
+ if (!(arg_bits & SPART_VARR_NOT_NULL))
return res_bits;
- }
- case IRI_L:
- {
- ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
- if (SPART_VARR_ALWAYS_NULL & arg_bits)
- return (SPART_VARR_ALWAYS_NULL);
- if ((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (arg_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL)))
- return (SPART_VARR_IS_REF | SPART_VARR_FIXED | SPART_VARR_NOT_NULL);
- return SPART_VARR_IS_REF ;
- }
- case DATATYPE_L:
- {
- ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
- if (SPART_VARR_ALWAYS_NULL & arg_bits)
- return (SPART_VARR_ALWAYS_NULL);
- if ((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (arg_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL)))
- return (SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_FIXED);
- return SPART_VARR_IS_REF | SPART_VARR_IS_IRI ;
- }
- case SPAR_BIF_STR:
- {
- ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
- if (SPART_VARR_ALWAYS_NULL & arg_bits)
- return (SPART_VARR_ALWAYS_NULL);
- if ((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (arg_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL)))
- return (SPART_VARR_IS_LIT | SPART_VARR_FIXED | SPART_VARR_NOT_NULL);
- if (SPART_VARR_NOT_NULL & arg_bits)
- return (SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL);
- return SPART_VARR_IS_LIT ;
- }
- case SPAR_BIF_COALESCE:
- {
- ptrlong union_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
- int argctr;
- for (argctr = BOX_ELEMENTS (tree->_.builtin.args); --argctr /* not argctr-- */; /* no step */)
- {
- ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[argctr]);
- if (!(arg_bits & (SPART_VARR_ALWAYS_NULL | SPART_VARR_CONFLICT)))
- union_bits &= arg_bits;
- }
- return union_bits & ~SPART_VARR_NOT_NULL;
- }
- case SPAR_BIF_IF:
- {
- ptrlong t_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[1]);
- ptrlong f_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[2]);
- ptrlong res_bits = t_bits & f_bits;
- if (res_bits & SPART_VARR_FIXED)
- {
- ptrlong cond_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
- if (!((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (cond_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL))))
- res_bits &= ~SPART_VARR_FIXED;
- }
- return res_bits;
- }
- default:
+ if ((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (arg_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL)))
+ return (res_bits | SPART_VARR_FIXED);
+ switch (tree->_.builtin.btype)
+ {
+ case isIRI_L:
+ case isURI_L:
+ case isBLANK_L:
+ if ((arg_bits & SPART_VARR_IS_IRI) || (arg_bits & SPART_VARR_IS_BLANK)
+ || (arg_bits & SPART_VARR_ALWAYS_NULL) )
+ return (res_bits | SPART_VARR_FIXED);
+ case isREF_L:
+ case isLITERAL_L:
+ if ((arg_bits & SPART_VARR_IS_REF) || (arg_bits & SPART_VARR_IS_LIT)
+ || (arg_bits & SPART_VARR_IS_IRI) || (arg_bits & SPART_VARR_IS_BLANK)
+ || (arg_bits & SPART_VARR_ALWAYS_NULL))
+ return (res_bits | SPART_VARR_FIXED);
+ case BOUND_L: break;
+ }
return res_bits;
}
- }
+ case IRI_L:
+ {
+ ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
+ if (SPART_VARR_ALWAYS_NULL & arg_bits)
+ return (SPART_VARR_ALWAYS_NULL);
+ if ((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (arg_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL)))
+ return (SPART_VARR_IS_REF | SPART_VARR_FIXED | SPART_VARR_NOT_NULL);
+ return SPART_VARR_IS_REF ;
+ }
+ case DATATYPE_L:
+ {
+ ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
+ if (SPART_VARR_ALWAYS_NULL & arg_bits)
+ return (SPART_VARR_ALWAYS_NULL);
+ if ((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (arg_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL)))
+ return (SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_FIXED);
+ return SPART_VARR_IS_REF | SPART_VARR_IS_IRI ;
+ }
+ case STR_L:
+ {
+ ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
+ if (SPART_VARR_ALWAYS_NULL & arg_bits)
+ return (SPART_VARR_ALWAYS_NULL);
+ if ((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (arg_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL)))
+ return (SPART_VARR_IS_LIT | SPART_VARR_FIXED | SPART_VARR_NOT_NULL);
+ if (SPART_VARR_NOT_NULL & arg_bits)
+ return (SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL);
+ return SPART_VARR_IS_LIT ;
+ }
+ case COALESCE_L:
+ {
+ ptrlong union_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
+ int argctr;
+ for (argctr = BOX_ELEMENTS (tree->_.builtin.args); --argctr /* not argctr-- */; /* no step */)
+ {
+ ptrlong arg_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[argctr]);
+ if (!(arg_bits & (SPART_VARR_ALWAYS_NULL | SPART_VARR_CONFLICT)))
+ union_bits &= arg_bits;
+ }
+ return union_bits & ~SPART_VARR_NOT_NULL;
+ }
+ case IF_L:
+ {
+ ptrlong t_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[1]);
+ ptrlong f_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[2]);
+ ptrlong res_bits = t_bits & f_bits;
+ if (res_bits & SPART_VARR_FIXED)
+ {
+ ptrlong cond_bits = sparp_restr_bits_of_expn (sparp, tree->_.builtin.args[0]);
+ if (!((SPART_VARR_FIXED | SPART_VARR_NOT_NULL) == (cond_bits & (SPART_VARR_FIXED | SPART_VARR_NOT_NULL))))
+ res_bits &= ~ SPART_VARR_FIXED;
+ }
+ return res_bits;
+ }
+ default: return 0;
+ }
case SPAR_FUNCALL:
{
caddr_t qname = tree->_.funcall.qname;
@@ -2084,7 +2062,6 @@ sparp_restr_bits_of_expn (sparp_t *sparp, SPART *tree)
{
caddr_t iduqname = sqlp_box_id_upcase (qname+4);
bif_type_t ** bt = (bif_type_t **) id_hash_get (name_to_bif_type, (char *) &iduqname);
- dk_free_box (iduqname);
if (NULL == bt)
return 0;
return sparp_restr_bits_of_dtp (bt[0]->bt_dtp) & ~SPART_VARR_NOT_NULL;
@@ -2396,10 +2373,8 @@ ssg_print_literal_as_sqlval (spar_sqlgen_t *ssg, ccaddr_t type, SPART *lit)
}
if ((NULL != type) && (NULL == lang))
{
- caddr_t dflt_xsd_type_of_box = xsd_type_of_box (value);
- int box_is_plain_num = ((type == dflt_xsd_type_of_box) || ((uname_xmlschema_ns_uri_hash_decimal == type) && (uname_xmlschema_ns_uri_hash_double == dflt_xsd_type_of_box)));
- dk_free_box (dflt_xsd_type_of_box);
- if (box_is_plain_num)
+ ccaddr_t dflt_xsd_type_of_box = xsd_type_of_box (value);
+ if ((type == dflt_xsd_type_of_box) || ((uname_xmlschema_ns_uri_hash_decimal == type) && (uname_xmlschema_ns_uri_hash_double == dflt_xsd_type_of_box)))
{
ssg_print_box_as_sql_atom (ssg, value, SQL_ATOM_NARROW_OR_WIDE);
return;
@@ -3394,14 +3369,24 @@ ssg_print_bop_cmp_expn (spar_sqlgen_t *ssg, SPART *tree, const char *bool_op, co
void
ssg_print_builtin_expn (spar_sqlgen_t *ssg, SPART *tree, int top_filter_op, ssg_valmode_t needed)
{
- const sparp_bif_desc_t *sbd = sparp_bif_descs + tree->_.builtin.desc_ofs;
- SPART **args = tree->_.builtin.args;
- SPART *arg1 = ((NULL != args) ? args[0] : NULL);
- ssg_valmode_t arg1_native = ((NULL != args) ? sparp_expn_native_valmode (ssg->ssg_sparp, arg1) : NULL);
+ SPART *arg1 = tree->_.builtin.args[0];
+ ssg_valmode_t arg1_native = sparp_expn_native_valmode (ssg->ssg_sparp, arg1);
int argctr;
ssg_valmode_t op_fmt = NULL;
int arg1_restr_bits;
- if ((SSG_VALMODE_BOOL == sbd->sbd_ret_valmode) && (
+ int builtin_ret_bool;
+ switch (tree->_.builtin.btype)
+ {
+ case BOUND_L: case SAMETERM_L: case LIKE_L: case IN_L:
+ case isBLANK_L: case isURI_L: case isIRI_L: case isREF_L: case isLITERAL_L:
+ case REGEX_L: case LANGMATCHES_L:
+ builtin_ret_bool = 1;
+ break;
+ default:
+ builtin_ret_bool = 0;
+ break;
+ }
+ if (builtin_ret_bool && (
(SSG_VALMODE_LONG != needed) && (SSG_VALMODE_SQLVAL != needed) && (SSG_VALMODE_NUM != needed)
&& (SSG_VALMODE_SHORT_OR_LONG != needed) && (SSG_VALMODE_AUTO != needed) && (SSG_VALMODE_BOOL != needed) ) )
{
@@ -3448,7 +3433,7 @@ ssg_print_builtin_expn (spar_sqlgen_t *ssg, SPART *tree, int top_filter_op, ssg_
ssg_puts (rtext);
return;
}
- case SPAR_BIF_SAMETERM:
+ case SAMETERM_L:
{
SPART *arg2 = tree->_.builtin.args[1];
SPART *expanded;
@@ -3464,7 +3449,7 @@ ssg_print_builtin_expn (spar_sqlgen_t *ssg, SPART *tree, int top_filter_op, ssg_
{
SPART *potential_literal = ((arg1_restrs & SPART_VARR_IS_REF) ? arg2 : arg1);
expanded = spartlist (ssg->ssg_sparp, 3, BOP_AND,
- sparp_make_builtin_call (ssg->ssg_sparp, IRI_L, (SPART **)t_list (1, potential_literal)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isIRI_L, t_list (1, potential_literal)),
spartlist (ssg->ssg_sparp, 3, BOP_EQ, arg1, arg2) );
goto expanded_sameterm_ready; /* see below */
}
@@ -3473,29 +3458,29 @@ ssg_print_builtin_expn (spar_sqlgen_t *ssg, SPART *tree, int top_filter_op, ssg_
spartlist (ssg->ssg_sparp, 3, BOP_AND,
spartlist (ssg->ssg_sparp, 3, BOP_OR,
spartlist (ssg->ssg_sparp, 3, BOP_EQ,
- sparp_make_builtin_call (ssg->ssg_sparp, DATATYPE_L, (SPART **)t_list (1, arg1)),
- sparp_make_builtin_call (ssg->ssg_sparp, DATATYPE_L, (SPART **)t_list (1, arg2)) ),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)DATATYPE_L, t_list (1, arg1)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)DATATYPE_L, t_list (1, arg2)) ),
spartlist (ssg->ssg_sparp, 3, BOP_AND,
spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)t_list (1,
- sparp_make_builtin_call (ssg->ssg_sparp, DATATYPE_L, (SPART **)t_list (1, arg1)) ) ),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)BOUND_L, t_list (1,
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)DATATYPE_L, t_list (1, arg1)) ) ),
NULL ),
spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)t_list (1,
- sparp_make_builtin_call (ssg->ssg_sparp, DATATYPE_L, (SPART **)t_list (1, arg2)) ) ),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)BOUND_L, t_list (1,
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)DATATYPE_L, t_list (1, arg2)) ) ),
NULL ) ) ),
spartlist (ssg->ssg_sparp, 3, BOP_OR,
spartlist (ssg->ssg_sparp, 3, BOP_EQ,
- sparp_make_builtin_call (ssg->ssg_sparp, LANG_L, (SPART **)t_list (1, arg1)),
- sparp_make_builtin_call (ssg->ssg_sparp, LANG_L, (SPART **)t_list (1, arg2)) ),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)LANG_L, t_list (1, arg1)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)LANG_L, t_list (1, arg2)) ),
spartlist (ssg->ssg_sparp, 3, BOP_AND,
spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)t_list (1,
- sparp_make_builtin_call (ssg->ssg_sparp, LANG_L, (SPART **)t_list (1, arg1)) ) ),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)BOUND_L, t_list (1,
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)LANG_L, t_list (1, arg1)) ) ),
NULL ),
spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)t_list (1,
- sparp_make_builtin_call (ssg->ssg_sparp, LANG_L, (SPART **)t_list (1, arg2)) ) ),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)BOUND_L, t_list (1,
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)LANG_L, t_list (1, arg2)) ) ),
NULL ) ) ) ) );
expanded_sameterm_ready:
@@ -3518,7 +3503,7 @@ expanded_sameterm_ready:
ssg_puts (" as varchar))");
}
return;
- case SPAR_BIF_COALESCE:
+ case COALESCE_L:
{
ssg_valmode_t union_valmode = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
if (union_valmode != needed)
@@ -3536,7 +3521,7 @@ expanded_sameterm_ready:
}
return;
}
- case SPAR_BIF_IF:
+ case IF_L:
ssg_puts (" case ("); ssg->ssg_indent++;
ssg_print_valmoded_scalar_expn (ssg, arg1, SSG_VALMODE_BOOL, arg1_native, NULL_ASNAME);
ssg_puts (") when 0 then (");
@@ -3623,7 +3608,7 @@ IN_op_fnt_found:
END_DO_BOX_FAST;
ssg_puts ("))");
return;
- case SPAR_BIF_ISBLANK:
+ case isBLANK_L:
if ((SSG_VALMODE_BOOL != needed) && (SSG_VALMODE_SQLVAL != needed) && (SSG_VALMODE_LONG != needed))
ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_BOOL, NULL_ASNAME);
else
@@ -3638,17 +3623,14 @@ IN_op_fnt_found:
{
const char *tmpl = ((top_filter_op || (NULL == arg1_native->qmf01blankOfShortTmpl)) ?
arg1_native->qmfIsblankOfShortTmpl : arg1_native->qmf01blankOfShortTmpl );
- if ((arg1_restr_bits & SPART_VARR_NOT_NULL) && !strcmp (tmpl, " isnotnull (^{tree}^)"))
- ssg_puts_with_comment (" 1", "optimized isBLANK, isnotnull() of nonnull");
- else
- ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
+ ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
}
else if (SSG_VALMODE_LONG == arg1_native)
ssg_print_tmpl (ssg, arg1_native,
(top_filter_op ?
" ((isiri_id (^{tree}^) and (^{tree}^ >= min_bnode_iri_id ()))" :
" either (isiri_id (^{tree}^), gte (^{tree}^, min_bnode_iri_id ()), 0)" ),
- NULL, NULL, arg1, NULL_ASNAME );
+ NULL, NULL, arg1, NULL );
else if (SSG_VALMODE_SQLVAL == arg1_native)
ssg_print_tmpl (ssg, arg1_native, " DB.DBA.RDF_IS_BLANK_REF (^{tree}^)", NULL, NULL, arg1, NULL_ASNAME);
else
@@ -3669,15 +3651,15 @@ IN_op_fnt_found:
ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_LANGUAGE, NULL_ASNAME);
}
return;
- case SPAR_BIF_ISURI:
- case SPAR_BIF_ISIRI:
+ case isURI_L:
+ case isIRI_L:
arg1_restr_bits = sparp_restr_bits_of_expn (ssg->ssg_sparp, arg1);
if (arg1_restr_bits & (SPART_VARR_IS_LIT | SPART_VARR_ALWAYS_NULL | SPART_VARR_CONFLICT))
{
ssg_puts_with_comment (" 0", "optimized isIRI");
return;
}
- if ((arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_NOT_NULL)) == (SPART_VARR_IS_REF | SPART_VARR_NOT_NULL))
+ if (arg1_restr_bits & SPART_VARR_IS_REF & SPART_VARR_NOT_NULL)
{
ssg_puts_with_comment (" 1", "optimized isIRI");
return;
@@ -3686,42 +3668,33 @@ IN_op_fnt_found:
{
const char *tmpl = ((top_filter_op || (NULL == arg1_native->qmf01uriOfShortTmpl)) ?
arg1_native->qmfIsuriOfShortTmpl : arg1_native->qmf01uriOfShortTmpl );
- if ((arg1_restr_bits & SPART_VARR_NOT_NULL) && !strcmp (tmpl, " isnotnull (^{tree}^)"))
- ssg_puts_with_comment (" 1", "optimized isIRI, isnotnull() of nonnull");
- else
- ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
+ ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
}
else if (SSG_VALMODE_LONG == arg1_native)
ssg_print_tmpl (ssg, arg1_native,
(top_filter_op ?
" ((isiri_id (^{tree}^) and (^{tree}^ < min_bnode_iri_id ()))" :
" either (isiri_id (^{tree}^), lt (^{tree}^, min_bnode_iri_id ()), 0)" ),
- NULL, NULL, arg1, NULL_ASNAME );
+ NULL, NULL, arg1, NULL );
else if (SSG_VALMODE_SQLVAL == arg1_native)
ssg_print_tmpl (ssg, arg1_native, " DB.DBA.RDF_IS_URI_REF (^{tree}^)", NULL, NULL, arg1, NULL_ASNAME);
else
spar_sqlprint_error ("ssg_" "print_builtin_expn(): bad native type for isURI()");
return;
- case SPAR_BIF_ISREF:
+ case isREF_L:
arg1_restr_bits = sparp_restr_bits_of_expn (ssg->ssg_sparp, arg1);
if (arg1_restr_bits & (SPART_VARR_IS_LIT | SPART_VARR_ALWAYS_NULL | SPART_VARR_CONFLICT))
{
ssg_puts_with_comment (" 0", "optimized isREF");
return;
}
- if ((arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_NOT_NULL)) == (SPART_VARR_IS_REF | SPART_VARR_NOT_NULL))
+ if (arg1_restr_bits & SPART_VARR_IS_REF & SPART_VARR_NOT_NULL)
{
ssg_puts_with_comment (" 1", "optimized isREF");
return;
}
if (IS_BOX_POINTER (arg1_native))
- {
- const char *tmpl = arg1_native->qmfIsrefOfShortTmpl;
- if ((arg1_restr_bits & SPART_VARR_NOT_NULL) && !strcmp (tmpl, " isnotnull (^{tree}^)"))
- ssg_puts_with_comment (" 1", "optimized isREF, isnotnull() of nonnull");
- else
- ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
- }
+ ssg_print_tmpl (ssg, arg1_native, arg1_native->qmfIsrefOfShortTmpl, NULL, NULL, arg1, NULL_ASNAME);
else if (SSG_VALMODE_LONG == arg1_native)
ssg_print_tmpl (ssg, arg1_native, " isiri_id (^{tree}^)", NULL, NULL, arg1, NULL);
else if (SSG_VALMODE_SQLVAL == arg1_native)
@@ -3729,65 +3702,30 @@ IN_op_fnt_found:
else
spar_sqlprint_error ("ssg_" "print_builtin_expn(): bad native type for isREF()");
return;
- case SPAR_BIF_ISLITERAL:
+ case isLITERAL_L:
arg1_restr_bits = sparp_restr_bits_of_expn (ssg->ssg_sparp, arg1);
if (arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_ALWAYS_NULL | SPART_VARR_CONFLICT))
{
ssg_puts_with_comment (" 0", "optimized isLITERAL");
return;
}
- if ((arg1_restr_bits & (SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL)) == (SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL))
+ if (arg1_restr_bits & SPART_VARR_IS_LIT & SPART_VARR_NOT_NULL)
{
ssg_puts_with_comment (" 1", "optimized isLITERAL");
return;
}
if (IS_BOX_POINTER (arg1_native))
- {
- const char *tmpl = arg1_native->qmfIslitOfShortTmpl;
- if ((arg1_restr_bits & SPART_VARR_NOT_NULL) && !strcmp (tmpl, " isnotnull (^{tree}^)"))
- ssg_puts_with_comment (" 1", "optimized isLITERAL, isnotnull() of nonnull");
- else
- ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
- }
+ ssg_print_tmpl (ssg, arg1_native, arg1_native->qmfIslitOfShortTmpl, NULL, NULL, arg1, NULL_ASNAME);
else if (SSG_VALMODE_LONG == arg1_native)
ssg_print_tmpl (ssg, arg1_native,
(top_filter_op ?
" (not (isiri_id (^{tree}^)))" : " iszero (isiri_id (^{tree}^))" ),
- NULL, NULL, arg1, NULL_ASNAME );
+ NULL, NULL, arg1, NULL );
else if (SSG_VALMODE_SQLVAL == arg1_native)
ssg_print_tmpl (ssg, arg1_native, " DB.DBA.RDF_IS_LITERAL (^{tree}^)", NULL, NULL, arg1, NULL_ASNAME);
else
spar_sqlprint_error ("ssg_" "print_builtin_expn(): bad native type for isLITERAL()");
return;
- case SPAR_BIF_ISNUMERIC:
- arg1_restr_bits = sparp_restr_bits_of_expn (ssg->ssg_sparp, arg1);
- if (arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_ALWAYS_NULL | SPART_VARR_CONFLICT))
- {
- ssg_puts_with_comment (" 0", "optimized isNUMERIC");
- return;
- }
- if (IS_BOX_POINTER (arg1_native))
- {
- const char *tmpl = arg1_native->qmfIsnumericOfShortTmpl;
- if (NULL != tmpl)
- {
- if ((arg1_restr_bits & SPART_VARR_NOT_NULL) && !strcmp (tmpl, " isnotnull (^{tree}^)"))
- ssg_puts_with_comment (" 1", "optimized isNUMERIC, isnotnull() of nonnull");
- else
- ssg_print_tmpl (ssg, arg1_native, tmpl, NULL, NULL, arg1, NULL_ASNAME);
- }
- else
- {
- ssg_puts (" isnumeric (");
- ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_SQLVAL, NULL_ASNAME);
- ssg_putchar (')');
- }
- }
- else if ((SSG_VALMODE_LONG == arg1_native) || (SSG_VALMODE_SQLVAL == arg1_native))
- ssg_print_tmpl (ssg, arg1_native, " isnumeric (^{tree}^)", NULL, NULL, arg1, NULL_ASNAME);
- else
- spar_sqlprint_error ("ssg_" "print_builtin_expn(): bad native type for isNUMERIC()");
- return;
case IRI_L:
{
if (SSG_VALMODE_BOOL == arg1_native)
@@ -3842,7 +3780,7 @@ IN_op_fnt_found:
ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, NULL_ASNAME);
return;
}
- case SPAR_BIF_STR:
+ case STR_L:
{
if (SSG_VALMODE_SQLVAL == needed)
{
@@ -3865,7 +3803,20 @@ IN_op_fnt_found:
ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_SQLVAL, NULL_ASNAME);
return;
}
- case SPAR_BIF_LANGMATCHES:
+ case REGEX_L:
+ /*!!!TBD extra 'between'*/
+ ssg_puts (" rdf_regex_impl (");
+ ssg_print_scalar_expn (ssg, arg1, SSG_VALMODE_SQLVAL, NULL_ASNAME);
+ ssg_putchar (',');
+ ssg_print_scalar_expn (ssg, tree->_.builtin.args[1], SSG_VALMODE_SQLVAL, NULL_ASNAME);
+ if (3 == BOX_ELEMENTS (tree->_.builtin.args))
+ {
+ ssg_putchar (',');
+ ssg_print_scalar_expn (ssg, tree->_.builtin.args[2], SSG_VALMODE_SQLVAL, NULL_ASNAME);
+ }
+ ssg_putchar (')');
+ return;
+ case LANGMATCHES_L:
arg1_restr_bits = sparp_restr_bits_of_expn (ssg->ssg_sparp, arg1);
if (arg1_restr_bits & (SPART_VARR_IS_REF | SPART_VARR_ALWAYS_NULL))
{
@@ -3879,33 +3830,7 @@ IN_op_fnt_found:
ssg_putchar (')');
return;
default:
- {
- ssg_valmode_t prev_arg_valmode = SSG_VALMODE_AUTO, arg_valmode;
- int argctr;
- switch (sbd->sbd_implementation)
- {
- case 'B': ssg_puts (" rdf_"); break;
- case 'S': ssg_puts (" DB.DBA.rdf_"); break;
- default: spar_internal_error (ssg->ssg_sparp, "Built-in function is not implemented"); break;
- }
- ssg_puts (sbd->sbd_name);
- ssg_puts ("_impl");
- ssg_puts (" (");
- ssg->ssg_indent++;
- DO_BOX_FAST (SPART *, arg, argctr, tree->_.builtin.args)
- {
- if (argctr)
- ssg_puts (", ");
- arg_valmode = ((argctr < (sizeof (sbd->sbd_arg_valmodes) / sizeof (sbd->sbd_arg_valmodes[0]))) ? sbd->sbd_arg_valmodes[argctr] : NULL);
- if (NULL == arg_valmode)
- arg_valmode = prev_arg_valmode;
- ssg_print_scalar_expn (ssg, arg, arg_valmode, NULL_ASNAME);
- prev_arg_valmode = arg_valmode;
- }
- END_DO_BOX_FAST;
- ssg->ssg_indent--;
- ssg_putchar (')');
- }
+ spar_sqlprint_error ("ssg_" "print_builtin_expn(): unsupported builtin");
return;
}
}
@@ -4460,7 +4385,6 @@ ssg_print_valmoded_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t n
tmpl = ssg_tmpl_ref_short_of_X (needed, native);
else
tmpl = ssg_tmpl_literal_short_of_X (needed, native);
- /* \c needed is passed to ssg_print_tmpl, not native, because custom string is in needed, not in native */
ssg_print_tmpl (ssg, needed, tmpl, NULL, NULL, tree, asname);
return;
}
@@ -4539,12 +4463,11 @@ ssg_triple_retval_alias (spar_sqlgen_t *ssg, SPART *triple, int field_idx, int c
void
ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, const char *asname)
{
- ssg_valmode_t native = NULL;
if (THR_IS_STACK_OVERFLOW (THREAD_CURRENT_THREAD, &ssg, 4000))
spar_internal_error (NULL, "ssg_print_scalar_expn (): stack overflow");
if (SSG_VALMODE_AUTO == needed)
- needed = native = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
+ needed = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
switch (SPART_TYPE (tree))
{
case BOP_AND: ssg_print_bop_bool_expn (ssg, tree, " AND " , " __and (" , 0, needed); goto print_asname;
@@ -4587,6 +4510,16 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
case SPAR_BLANK_NODE_LABEL:
case SPAR_VARIABLE:
{
+#if 0
+ ssg_valmode_t vmode = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
+ if (vmode == needed)
+ {
+ sparp_equiv_t *eq = ssg->ssg_equivs[tree->_.var.equiv_idx];
+ ssg_print_equiv_retval_expn (ssg, sparp_find_gp_by_alias (ssg->ssg_sparp, tree->_.var.selid), eq, 0, 1, needed, NULL_ASNAME);
+ }
+ else
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, vmode);
+#else
if (SPART_VARNAME_IS_GLOB (tree->_.var.vname))
{
ssg_print_global_param (ssg, tree, needed);
@@ -4594,15 +4527,15 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
}
if (NULL == ssg->ssg_equivs) /* This is for case when parts of the SPARQL front-end are used to produce small SQL fragments */
{
- if (NULL == native)
- native = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
- if (native == needed)
+ ssg_valmode_t vmode;
+ vmode = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
+ if (vmode == needed)
{
ssg_putchar (' ');
ssg_prin_id (ssg, tree->_.var.vname);
goto print_asname; /* see below */
}
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, native, asname);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, vmode, asname);
}
else
{
@@ -4628,6 +4561,7 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
#endif
ssg_print_equiv_retval_expn (ssg, gp, eq, SSG_RETVAL_FROM_JOIN_MEMBER | SSG_RETVAL_MUST_PRINT_SOMETHING | SSG_RETVAL_CAN_PRINT_NULL | SSG_RETVAL_USES_ALIAS, needed, asname);
}
+#endif
return;
}
case SPAR_BUILT_IN_CALL:
@@ -4650,8 +4584,7 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
{
int curr_arg_is_long, prev_arg_is_long = 0, arg_ctr, arg_count = BOX_ELEMENTS (tree->_.funcall.argtrees);
xqf_str_parser_desc_t *parser_desc;
- if (NULL == native)
- native = sparp_rettype_of_function (ssg->ssg_sparp, tree->_.funcall.qname, tree);
+ ssg_valmode_t native = sparp_rettype_of_function (ssg->ssg_sparp, tree->_.funcall.qname, tree);
if (native != needed)
{
ssg_print_valmoded_scalar_expn (ssg, tree, needed, native, asname);
@@ -4817,8 +4750,7 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
}
if (SSG_VALMODE_NUM == needed)
{
- if (NULL == native)
- native = sparp_lit_native_valmode (tree);
+ ssg_valmode_t native = sparp_lit_native_valmode (tree);
if (SSG_VALMODE_NUM == native)
ssg_print_literal_as_sqlval (ssg, NULL, tree);
else
@@ -4912,14 +4844,13 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
goto print_asname;
case SPAR_RETVAL:
{
- if (NULL == native)
- native = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
- if (native != needed)
+ ssg_valmode_t vmode = sparp_expn_native_valmode (ssg->ssg_sparp, tree);
+ if (vmode != needed)
{
- ssg_print_valmoded_scalar_expn (ssg, tree, needed, native, asname);
+ ssg_print_valmoded_scalar_expn (ssg, tree, needed, vmode, asname);
return;
}
- ssg_print_retval (ssg, tree, native, asname);
+ ssg_print_retval (ssg, tree, vmode, asname);
return;
}
case SPAR_QM_SQL_FUNCALL:
@@ -4946,9 +4877,7 @@ ssg_print_scalar_expn (spar_sqlgen_t *ssg, SPART *tree, ssg_valmode_t needed, co
}
goto print_asname;
}
- /*if (NULL == native)
- native = sparp_expn_native_valmode (ssg->ssg_sparp, tree);*/
- if (/*(native != needed) &&*/ (SSG_VALMODE_SQLVAL != needed) && (SSG_VALMODE_LONG != needed) && (SSG_VALMODE_NUM != needed))
+ if ((SSG_VALMODE_SQLVAL != needed) && (SSG_VALMODE_LONG != needed) && (SSG_VALMODE_NUM != needed))
{
ssg_print_valmoded_scalar_expn (ssg, tree, needed, SSG_VALMODE_LONG, asname);
return;
@@ -5439,13 +5368,13 @@ ssg_print_fld_var_restrictions_ex (spar_sqlgen_t *ssg, quad_map_t *qmap, qm_valu
ssg_print_tmpl (ssg, field->qmvFormat, "(^{alias-0}^.^{column-0}^ is not null)", tabid, field, NULL, NULL_ASNAME);
}
/* SPONGE_SEEALSO () as a fake filter for a variable */
- if ((NULL != env->spare_src.ssrc_grab.rgc_sa_preds) &&
+ if ((NULL != env->spare_grab.rgc_sa_preds) &&
ssg->ssg_seealso_enabled &&
(SPAR_VARIABLE == SPART_TYPE (fld_tree)) &&
!(SPART_VARR_IS_LIT & tree_restr) &&
!(SPART_VARR_EXTERNAL & tree_restr) &&
- ((0 <= dk_set_position_of_string (env->spare_src.ssrc_grab.rgc_sa_vars, fld_tree->_.var.vname)) ||
- (0 <= dk_set_position_of_string (env->spare_src.ssrc_grab.rgc_vars, fld_tree->_.var.vname)) ) )
+ ((0 <= dk_set_position_of_string (env->spare_grab.rgc_sa_vars, fld_tree->_.var.vname)) ||
+ (0 <= dk_set_position_of_string (env->spare_grab.rgc_vars, fld_tree->_.var.vname)) ) )
{
/* External variable should be checked by this fake predicate at place of origin, hence no check here.
It's an open issue what to do if seealso is enabled only in scalar subquery.
@@ -5520,35 +5449,35 @@ ssg_print_retval_restrictions_ex (spar_sqlgen_t *ssg, SPART *retval, rdf_val_ran
{
ssg_print_where_or_and (ssg, "nullable retval is not null");
ssg_print_scalar_expn (ssg,
- sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)t_list (1, retval)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)BOUND_L, t_list (1, retval)),
SSG_VALMODE_BOOL, NULL_ASNAME);
}
if ((SPART_VARR_IS_BLANK & tree_restr) && (!(SPART_VARR_IS_BLANK & retval_restr)))
{
ssg_print_where_or_and (ssg, "retval is blank node");
ssg_print_scalar_expn (ssg,
- sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISBLANK, (SPART **)t_list (1, retval)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isBLANK_L, t_list (1, retval)),
SSG_VALMODE_BOOL, NULL_ASNAME);
}
else if ((SPART_VARR_IS_IRI & tree_restr) && (!(SPART_VARR_IS_IRI & retval_restr)))
{
ssg_print_where_or_and (ssg, "retval is IRI");
ssg_print_scalar_expn (ssg,
- sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISIRI, (SPART **)t_list (1, retval)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isIRI_L, t_list (1, retval)),
SSG_VALMODE_BOOL, NULL_ASNAME);
}
else if ((SPART_VARR_IS_REF & tree_restr) && (!(SPART_VARR_IS_REF & retval_restr)))
{
ssg_print_where_or_and (ssg, "'any' retval is a reference");
ssg_print_scalar_expn (ssg,
- sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISREF, (SPART **)t_list (1, retval)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isREF_L, t_list (1, retval)),
SSG_VALMODE_BOOL, NULL_ASNAME);
}
else if ((SPART_VARR_IS_LIT & tree_restr) && (!(SPART_VARR_IS_LIT & retval_restr)))
{
ssg_print_where_or_and (ssg, "'any' variable is a literal");
ssg_print_scalar_expn (ssg,
- sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISLITERAL, (SPART **)t_list (1, retval)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)isLITERAL_L, t_list (1, retval)),
SSG_VALMODE_BOOL, NULL_ASNAME);
}
/*!!! TBD: checks for type, lang */
@@ -5949,36 +5878,12 @@ ssg_print_equivalences (spar_sqlgen_t *ssg, SPART *gp, sparp_equiv_t *eq, dk_set
int good_eq_found = 0;
int retry_count = 0;
int weak_eq_skipped = 0;
- int restrs_not_filtered_in_subqs = eq->e_replaces_filter;
if (!print_equs_to_globals)
goto print_cross_equs; /* see below */;
- /* A special case exists: if the equiv replaces NOT NULL filter then it should be checked for the output of every OPTIONAL subq. */
- if ((SPART_VARR_NOT_NULL & restrs_not_filtered_in_subqs) && (UNION_L != eq->e_gp->_.gp.subtype))
- {
- int sub_ctr;
- DO_BOX_FAST (ptrlong, sub_eq_idx, sub_ctr, eq->e_subvalue_idxs)
- {
- sparp_equiv_t *sub_eq = SPARP_EQUIV (ssg->ssg_sparp, sub_eq_idx);
- SPART *sub_gp = sub_eq->e_gp;
- ssg_valmode_t sub_native;
- int col_count;
- if ((OPTIONAL_L != sub_gp->_.gp.subtype) && (SPART_VARR_NOT_NULL & sub_eq->e_rvr.rvrRestrictions))
- continue;
- sub_native = sparp_equiv_native_valmode (ssg->ssg_sparp, sub_gp, sub_eq);
- col_count = ((IS_BOX_POINTER (sub_native)) ? sub_native->qmfColumnCount : 1);
- if (0 < col_count)
- {
- const char *eq_asname = ((1 == col_count) ? NULL_ASNAME : (COL_IDX_ASNAME + 0));
- ssg_print_where_or_and (ssg, "an optional from subq is forced to be not null");
- ssg_print_equiv_retval_expn (ssg, sub_gp, sub_eq, SSG_RETVAL_FROM_GOOD_SELECTED | SSG_RETVAL_MUST_PRINT_SOMETHING, sub_native, eq_asname);
- ssg_puts (" IS NOT NULL");
- }
- }
- END_DO_BOX_FAST;
- }
- if (restrs_not_filtered_in_subqs && (0 == eq->e_gspo_uses) &&
+ if ((eq->e_replaces_filter) && (0 == eq->e_gspo_uses) &&
((0 != eq->e_nested_bindings) || (OPTIONAL_L != eq->e_gp->_.gp.subtype)) )
{
+ int restrs_not_filtered_in_subqs = eq->e_replaces_filter;
int sub_ctr;
if (eq->e_replaces_filter & ~(eq->e_rvr.rvrRestrictions) & ~SPART_VARR_EQ_VAR)
spar_internal_error (ssg->ssg_sparp, "lost filters in equivs");
@@ -6035,38 +5940,38 @@ ssg_print_equivalences (spar_sqlgen_t *ssg, SPART *gp, sparp_equiv_t *eq, dk_set
}
else if (SPART_VARR_IS_IRI & restrs_not_filtered_in_subqs)
{
- SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISIRI, (SPART **)t_list (1, sample_var));
+ SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(isIRI_L), t_list (1, sample_var));
ssg_print_where_or_and (ssg, "value of equiv class, isIRI check by replaced filter");
ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL);
}
else if (SPART_VARR_IS_BLANK & restrs_not_filtered_in_subqs)
{
- SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISBLANK, (SPART **)t_list (1, sample_var));
+ SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(isBLANK_L), t_list (1, sample_var));
ssg_print_where_or_and (ssg, "value of equiv class, isBLANK check by replaced filter");
ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL);
}
else if (SPART_VARR_IS_REF & restrs_not_filtered_in_subqs)
{
- SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISREF, (SPART **)t_list (1, sample_var));
+ SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(isREF_L), t_list (1, sample_var));
ssg_print_where_or_and (ssg, "value of equiv class, isREF check by replaced filter");
ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL);
}
else if (SPART_VARR_IS_LIT & restrs_not_filtered_in_subqs)
{
- SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, SPAR_BIF_ISLITERAL, (SPART **)t_list (1, sample_var));
+ SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(isLITERAL_L), t_list (1, sample_var));
ssg_print_where_or_and (ssg, "value of equiv class, isLITERAL check by replaced filter");
ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL);
}
else if (SPART_VARR_NOT_NULL & restrs_not_filtered_in_subqs)
{
- SPART *builtin = sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)t_list (1, sample_var));
+ SPART *builtin = spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(BOUND_L), t_list (1, sample_var));
ssg_print_where_or_and (ssg, "value of equiv class, BOUND check by replaced filter");
ssg_print_builtin_expn (ssg, builtin, 1, SSG_VALMODE_BOOL);
}
else if (SPART_VARR_ALWAYS_NULL & restrs_not_filtered_in_subqs)
{
SPART *not_builtin = spartlist (ssg->ssg_sparp, 3, BOP_NOT,
- sparp_make_builtin_call (ssg->ssg_sparp, BOUND_L, (SPART **)t_list (1, sample_var)),
+ spartlist (ssg->ssg_sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)(BOUND_L), t_list (1, sample_var)),
NULL );
ssg_print_where_or_and (ssg, "value of equiv class, !BOUND check by replaced filter");
ssg_print_scalar_expn (ssg, not_builtin, SSG_VALMODE_BOOL, NULL_ASNAME);
@@ -6931,7 +6836,7 @@ ssg_print_retval_list (spar_sqlgen_t *ssg, SPART *gp, SPART **retlist, int res_l
void
ssg_print_filter (spar_sqlgen_t *ssg, SPART *tree)
{
- if (tree == (SPART *)(1)) /* The filter has been disabled because it's printed already */
+ if (tree == (box_t)(1)) /* The filter has been disabled because it's printed already */
return;
if (spar_filter_is_freetext (ssg->ssg_sparp, tree, NULL))
{
@@ -7036,12 +6941,12 @@ ssg_patch_ft_arg1 (spar_sqlgen_t *ssg, SPART *ft_arg1, SPART *g, int contains_in
int good_len /*, bad_len*/;
if (SPART_IS_DEFAULT_GRAPH_BLANK(g))
{
- if (ssg->ssg_sparp->sparp_env->spare_src.ssrc_named_graphs_listed)
- chk_graphs = ssg->ssg_sparp->sparp_env->spare_src.ssrc_default_graphs;
+ if (ssg->ssg_sparp->sparp_env->spare_named_graphs_listed)
+ chk_graphs = ssg->ssg_sparp->sparp_env->spare_default_graphs;
else chk_graphs = NULL;
}
else
- chk_graphs = ssg->ssg_sparp->sparp_env->spare_src.ssrc_named_graphs;
+ chk_graphs = ssg->ssg_sparp->sparp_env->spare_named_graphs;
DO_SET (SPART *,src, &(chk_graphs))
{
if (!((SPART_GRAPH_NOT_FROM == src->_.graph.subtype) || (SPART_GRAPH_NOT_NAMED == src->_.graph.subtype)))
@@ -7190,7 +7095,7 @@ no_extra_ft_tables: ;
}
if (NULL == colcodes)
{ /* This is a special case of quad map with four constants and no one quad map value. */
- ssg_puts (" DB.DBA.SYS_IDONLY_ONE AS ");
+ ssg_puts (" DB.DBA.SYS_FAKE_1 AS ");
ssg_prin_id (ssg, tabid);
t_set_push (&(ssg->ssg_valid_ret_tabids), tabid);
ssg->ssg_indent--;
@@ -7837,7 +7742,7 @@ ssg_print_table_exp (spar_sqlgen_t *ssg, SPART *gp, SPART **trees, int tree_coun
if (SSG_TABLE_SELECT_PASS == pass)
{
char buf[200];
- snprintf (buf, sizeof (buf), " (select 1 as __fake_table_col_%d) as __fake_table_%d",
+ snprintf (buf, sizeof (buf), " (select top 1 1 as __fake_table_col_%d from DB.DBA.RDF_QUAD) as __fake_table_%d",
ssg->ssg_sparp->sparp_unictr, ssg->ssg_sparp->sparp_unictr );
ssg->ssg_sparp->sparp_unictr++;
ssg_puts (buf);
@@ -8331,9 +8236,9 @@ retval_list_complete:
ssg_newline (0);
snprintf (buf, sizeof (buf), "stub-%s", member->_.gp.selid);
if (SSG_PRINT_UNION_NONEMPTY_STUB & head_flags)
- ssg_puts ("(SELECT 1 as __stub) AS ");
+ ssg_puts ("(SELECT TOP 1 1 AS __stub FROM DB.DBA.RDF_QUAD) AS ");
else
- ssg_puts ("(SELECT TOP 1 1 AS __stub FROM DB.DBA.SYS_IDONLY_EMPTY WHERE 0) AS ");
+ ssg_puts ("(SELECT TOP 1 1 AS __stub FROM DB.DBA.RDF_QUAD WHERE 0) AS ");
ssg_prin_id (ssg, buf);
/* no t_set_push (&(ssg->ssg_valid_ret_selids), ...); because it's single-use stub */
need_self_joins_in_where = 'Y';
@@ -8344,7 +8249,7 @@ retval_list_complete:
char buf[105]; /* potentially 100 chars long see sparp_clone_id etc. */
ssg_newline (0);
snprintf (buf, sizeof (buf), "lojstub-%s", member->_.gp.selid);
- ssg_puts ("(SELECT 1 AS __stub) AS ");
+ ssg_puts ("(SELECT TOP 1 1 AS __stub FROM DB.DBA.RDF_QUAD) AS ");
ssg_prin_id (ssg, buf);
/* no t_set_push (&(ssg->ssg_valid_ret_selids), ...); because it's single-use stub */
if (OPTIONAL_L == first_itm->_.gp.subtype)
@@ -8543,8 +8448,7 @@ ssg_req_top_needs_rb_complete (spar_sqlgen_t *ssg)
ssg_valmode_t retvalmode;
if ((SELECT_L != subtype) && (DISTINCT_L != subtype))
return 0;
- if ((NULL == tree->_.req_top.formatmode_name && !ssg_is_odbc_cli ()) ||
- (NULL != tree->_.req_top.formatmode_name && (strcmp (tree->_.req_top.formatmode_name, "_JAVA_") && strcmp (tree->_.req_top.formatmode_name, "_UDBC_"))))
+ if (NULL != tree->_.req_top.formatmode_name && strcmp (tree->_.req_top.formatmode_name, "_JAVA_"))
return 0;
retvalmode = ssg_find_valmode_by_name (tree->_.req_top.retvalmode_name);
if ((SSG_VALMODE_SQLVAL != retvalmode) && (NULL != retvalmode))
@@ -8586,8 +8490,8 @@ void ssg_print_limofs_expn (spar_sqlgen_t *ssg)
char limofs_strg [50];
long lim_num = unbox ((caddr_t)(lim));
long ofs_num = unbox ((caddr_t)(ofs));
-/* if ((SPARP_MAXLIMIT == lim_num) && (0 < ofs_num))
- lim_num -= ofs_num;*/
+ if ((SPARP_MAXLIMIT == lim_num) && (0 < ofs_num))
+ lim_num -= ofs_num;
if (0 != ofs_num)
snprintf (limofs_strg, sizeof (limofs_strg), " TOP %ld, %ld", ofs_num, lim_num);
else
@@ -8648,7 +8552,6 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
{
int gby_ctr, oby_ctr;
int has_limofs = 0; /* 0 = no limit/offset clause in the output, 1 = it is in limofs_strg, 2 = should be printed in place */
- int three_cols_procedure = 0;
caddr_t limofs_alias = NULL;
SPART *tree = ssg->ssg_tree;
ptrlong subtype = tree->_.req_top.subtype;
@@ -8662,7 +8565,7 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
SSG_RETVAL_MUST_PRINT_SOMETHING |
SSG_RETVAL_CAN_PRINT_NULL |
SSG_RETVAL_USES_ALIAS ;
- caddr_t top_selid = tree->_.req_top.pattern->_.gp.selid;
+ ccaddr_t top_selid = tree->_.req_top.pattern->_.gp.selid;
retvals = tree->_.req_top.retvals;
if (NULL != ssg->ssg_sparp->sparp_env->spare_storage_name)
{
@@ -8771,12 +8674,9 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
break;
case CONSTRUCT_L:
case DESCRIBE_L:
- if ((NULL == tree->_.req_top.formatmode_name && ssg_is_odbc_cli ()) ||
- ((NULL != tree->_.req_top.formatmode_name) && (!strcmp ("_JAVA_", tree->_.req_top.formatmode_name) || !strcmp ("_UDBC_", tree->_.req_top.formatmode_name))))
- {
- ssg_puts (" DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS ((");
- three_cols_procedure = 1;
- }
+ if ((NULL != tree->_.req_top.formatmode_name) &&
+ !strcmp ("_JAVA_", tree->_.req_top.formatmode_name) )
+ ssg_puts (" DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS ((");
else if ((NULL == formatter) && (NULL == agg_formatter) && ssg->ssg_sparp->sparp_sparqre->sparqre_direct_client_call)
{
ssg_find_formatter_by_name_and_subtype ("TTL", subtype, &formatter, &agg_formatter, &agg_meta);
@@ -8794,8 +8694,6 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
case SPARUL_RUN_SUBTYPE:
case SPARUL_INSERT_DATA:
case SPARUL_DELETE_DATA:
- case SPAR_SML_CREATE:
- case SPAR_SML_DROP:
if ((SPARUL_RUN_SUBTYPE == subtype) && !unbox (spar_compose_report_flag (ssg->ssg_sparp)))
{
ssg_puts ("set_row_count (");
@@ -8852,19 +8750,10 @@ ssg_make_sql_query_text (spar_sqlgen_t *ssg)
const char *fmname = tree->_.req_top.formatmode_name;
ssg_puts ("SELECT "); ssg_puts (formatter); ssg_puts (" (");
ssg_prin_id (ssg, top_selid);
- if ((NULL == fmname && ssg_is_odbc_cli ()) ||
- ((NULL != fmname) && (!strcmp ("_JAVA_", fmname) || !strcmp ("_UDBC_", fmname))))
- {
- ssg_puts (".__ask_retval) AS __ask_retval");
- }
- else
- {
- ssg_puts (".__ask_retval) AS \"fmtaggret-");
- if (NULL != fmname)
- ssg_puts (fmname);
- ssg_puts ("\"");
- }
- ssg_puts (" LONG VARCHAR \nFROM (");
+ ssg_puts (".__ask_retval) AS \"fmtaggret-");
+ if (NULL != fmname)
+ ssg_puts (fmname);
+ ssg_puts ("\" LONG VARCHAR \nFROM (");
ssg->ssg_indent += 1;
}
ssg_puts ("SELECT TOP 1 1 AS __ask_retval");
@@ -8986,7 +8875,9 @@ The fix is to avoid printing constant expressions at all, with only exception fo
break;
}
}
- else if (three_cols_procedure)
+ else if (((CONSTRUCT_L == subtype) || (DESCRIBE_L == subtype)) &&
+ (NULL != tree->_.req_top.formatmode_name) &&
+ !strcmp ("_JAVA_", tree->_.req_top.formatmode_name) )
ssg_puts ("))");
}
diff --git a/libsrc/Wi/sparql_core.c b/libsrc/Wi/sparql_core.c
index 137352f..b5ea9c2 100644
--- a/libsrc/Wi/sparql_core.c
+++ b/libsrc/Wi/sparql_core.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparql_core.c,v 1.87.2.68 2012/03/08 12:55:36 source Exp $
+ * $Id: sparql_core.c,v 1.87.2.57 2011/10/13 13:00:20 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -87,9 +87,6 @@ spart_count_specific_elems_by_type (ptrlong type)
case SPAR_GRAPH: return sizeof (sample._.graph);
case SPAR_WHERE_MODIFS: return sizeof (sample._.wm);
case SPAR_SERVICE_INV: return sizeof (sample._.sinv);
- case SPAR_DEFMACRO: return sizeof (sample._.defmacro);
- case SPAR_MACROCALL: return sizeof (sample._.macrocall);
- case SPAR_MACROPU: return sizeof (sample._.macropu);
case ORDER_L: return sizeof (sample._.oby);
case BOP_NOT:
case BOP_OR: case BOP_AND:
@@ -504,6 +501,59 @@ sparp_expand_q_iri_ref (sparp_t *sparp, caddr_t ref)
return ref;
}
+#if 0
+caddr_t
+sparp_exec_Narg (sparp_t *sparp, const char *pl_call_text, query_t **cached_qr_ptr, caddr_t *err_ret, int argctr, ccaddr_t arg1)
+{
+ query_instance_t *qi = sparp->sparp_sparqre->sparqre_qi;
+ client_connection_t *cli = ((CALLER_LOCAL == qi) ? bootstrap_cli : sparp->sparp_sparqre->sparqre_cli);
+ local_cursor_t *lc = NULL;
+ caddr_t err = NULL;
+ if (NULL == cached_qr_ptr[0])
+ {
+ if (NULL == cli) /* This means that the call is made inside the SQL compiler, can't re-enter. */
+ spar_internal_error (sparp, "sparp_exec_Narg () tries to compile static inside the SQL compiler");
+ cached_qr_ptr[0] = sql_compile_static (pl_call_text, cli, &err, SQLC_DEFAULT);
+ if (SQL_SUCCESS != err)
+ {
+ cached_qr_ptr[0] = NULL;
+ if (err_ret)
+ *err_ret = err;
+ return NULL;
+ }
+ }
+ err = qr_rec_exec (cached_qr_ptr[0], cli, &lc, qi, NULL, 1,
+ ":0", box_copy_tree (arg1), QRP_RAW );
+ if (SQL_SUCCESS != err)
+ {
+ LC_FREE(lc);
+ if (err_ret)
+ *err_ret = err;
+ return NULL;
+ }
+ if (lc)
+ {
+ caddr_t ret = NULL;
+#if 1
+ while (lc_next (lc));
+ if (SQL_SUCCESS != lc->lc_error)
+ {
+ if (err_ret)
+ *err_ret = lc->lc_error;
+ lc_free (lc);
+ return NULL;
+ }
+ ret = t_full_box_copy_tree (((caddr_t *) lc->lc_proc_ret) [1]);
+#else
+ ret = t_full_box_copy_tree(lc_nth_col (lc, 0));
+#endif
+ lc_free (lc);
+ return ret;
+ }
+ return NULL;
+}
+
+#else
caddr_t
sparp_exec_Narg (sparp_t *sparp, const char *pl_call_text, query_t **cached_qr_ptr, caddr_t *err_ret, int argctr, ccaddr_t arg1)
{
@@ -528,9 +578,9 @@ sparp_exec_Narg (sparp_t *sparp, const char *pl_call_text, query_t **cached_qr_p
cli->cli_user = sec_name_to_user ("dba");
if (NULL == cached_qr_ptr[0])
{
- if (parse_sem && parse_sem->sem_entry_count) /* This means that the call is made inside the SQL compiler, can't re-enter. */
+ if (NULL == cli) /* This means that the call is made inside the SQL compiler, can't re-enter. */
spar_internal_error (sparp, "sparp_exec_Narg () tries to compile static inside the SQL compiler");
- cached_qr_ptr[0] = sql_compile_static (pl_call_text, cli, &err, SQLC_STATIC_PRESERVES_TREE);
+ cached_qr_ptr[0] = sql_compile_static (pl_call_text, cli, &err, SQLC_DEFAULT);
if (SQL_SUCCESS != err)
{
cached_qr_ptr[0] = NULL;
@@ -582,6 +632,7 @@ leave_and_ret:
}
return res;
}
+#endif
caddr_t
sparp_graph_sec_iri_to_id_nosignal (sparp_t *sparp, ccaddr_t qname)
@@ -741,7 +792,6 @@ caddr_t spar_strliteral (sparp_t *sparp, const char *strg, int strg_is_long, int
}
}
res = t_box_dv_short_nchars (tmp_buf, tgt_tail - tmp_buf);
- box_flags (res) = BF_UTF8;
dk_free_box (tmp_buf);
return res;
@@ -762,7 +812,7 @@ sparp_free (sparp_t * sparp)
caddr_t
spar_mkid (sparp_t * sparp, const char *prefix)
{
- return t_box_sprintf (0x100, "%s_%ld_%ld",
+ return t_box_sprintf (0x100, "%s-%ld-%ld",
prefix,
(long)((NULL != sparp->sparp_curr_lexem) ?
sparp->sparp_curr_lexem->sparl_lineno : 0),
@@ -791,7 +841,7 @@ void spar_change_sign (caddr_t *lit_ptr)
}
static const char *sparp_known_get_params[] = {
- "get:accept", "get:cartridge", "get:login", "get:method", "get:proxy", "get:query", "get:refresh", "get:soft", "get:uri", NULL };
+ "get:login", "get:method", "get:proxy", "get:query", "get:refresh", "get:soft", "get:uri", NULL };
static const char *sparp_integer_defines[] = {
"input:grab-depth", "input:grab-limit", "output:maxrows", "sql:big-data-const", "sql:log-enable", "sql:signal-void-variables", NULL };
@@ -852,8 +902,8 @@ sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t v
}
if (!strcmp (param, "input:freeze"))
{
- sparp->sparp_env->spare_src.ssrc_default_graphs_locked = 1;
- sparp->sparp_env->spare_src.ssrc_named_graphs_locked = 1;
+ sparp->sparp_env->spare_default_graphs_locked = 1;
+ sparp->sparp_env->spare_named_graphs_locked = 1;
return;
}
if (!strcmp (param, "input:default-graph-exclude"))
@@ -861,7 +911,7 @@ sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t v
sparp_make_and_push_new_graph_source ( sparp, SPART_GRAPH_NOT_FROM,
spartlist (sparp, 2, SPAR_QNAME, t_box_dv_uname_string (value)),
NULL );
- /* No sparp->sparp_env->spare_src.ssrc_default_graphs_locked = 1; here because NOT FROM can not be overridden */
+ /* No sparp->sparp_env->spare_default_graphs_locked = 1; here because NOT FROM can not be overridden */
return;
}
if (!strcmp (param, "input:named-graph-uri"))
@@ -876,7 +926,7 @@ sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t v
sparp_make_and_push_new_graph_source (sparp, SPART_GRAPH_NOT_NAMED,
spartlist (sparp, 2, SPAR_QNAME, t_box_dv_uname_string (value)),
NULL );
- /* No sparp->sparp_env->spare_src.ssrc_default_graphs_locked = 1; here because NOT FROM can not be overridden */
+ /* No sparp->sparp_env->spare_default_graphs_locked = 1; here because NOT FROM can not be overridden */
return;
}
if (!strcmp (param, "input:ifp"))
@@ -894,27 +944,6 @@ sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t v
if (NULL != sparp->sparp_env->spare_storage_name)
spar_error (sparp, "'define %.30s' is used more than once", param);
sparp->sparp_env->spare_storage_name = t_box_dv_uname_string (value);
- sparp->sparp_storage = sparp_find_storage_by_name (sparp->sparp_env->spare_storage_name);
- if ((NULL == sparp->sparp_storage) && ('\0' != value[0]))
- spar_error (sparp, "Quad storage <%.100s> does not exists or is in unusable state", value);
- return;
- }
- if (!strcmp (param, "input:macro-lib"))
- {
- caddr_t lib_iri_uname = t_box_dv_uname_string (value);
- if (0 <= dk_set_position (sparp->sparp_macro_libs, lib_iri_uname))
- spar_error (sparp, "The macro library <%.100s> is loaded more than once", value);
- t_set_push (&(sparp->sparp_macro_libs), lib_iri_uname);
- return;
- }
- if (!strcmp (param, "input:macro-lib-ignore-create"))
- {
- sparp->sparp_macrolib_ignore_create = 1;
- return;
- }
- if (!strcmp (param, "input:disable-storage-macro-lib"))
- {
- sparp->sparp_disable_storage_macro_lib = 1;
return;
}
if (!strcmp (param, "input:inference"))
@@ -931,12 +960,12 @@ sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t v
}
if ((11 < strlen (param)) && !memcmp (param, "input:grab-", 11))
{
- rdf_grab_config_t *rgc = &(sparp->sparp_env->spare_src.ssrc_grab);
+ rdf_grab_config_t *rgc = &(sparp->sparp_env->spare_grab);
const char *lock_pragma = NULL;
rgc->rgc_pview_mode = 1;
- if (sparp->sparp_env->spare_src.ssrc_default_graphs_locked)
+ if (sparp->sparp_env->spare_default_graphs_locked)
lock_pragma = "input:default-graph-uri";
- else if (sparp->sparp_env->spare_src.ssrc_named_graphs_locked)
+ else if (sparp->sparp_env->spare_named_graphs_locked)
lock_pragma = "input:named-graph-uri";
if (NULL != lock_pragma)
spar_error (sparp, "define %s should not appear after define %s", param, lock_pragma);
@@ -1031,7 +1060,7 @@ sparp_define (sparp_t *sparp, caddr_t param, ptrlong value_lexem_type, caddr_t v
for (chk = sparp_known_get_params; (NULL != chk[0]) && strcmp (chk[0], param); chk++) ;
if (NULL != chk[0])
{
- dk_set_t *opts_ptr = &(sparp->sparp_env->spare_src.ssrc_common_sponge_options);
+ dk_set_t *opts_ptr = &(sparp->sparp_env->spare_common_sponge_options);
if (0 < dk_set_position_of_string (opts_ptr[0], param))
spar_error (sparp, "'define %.30s' is used more than once", param);
t_set_push (opts_ptr, t_box_dv_short_string (value));
@@ -1118,291 +1147,16 @@ spar_selid_push_reused (sparp_t *sparp, caddr_t selid)
caddr_t spar_selid_pop (sparp_t *sparp)
{
- caddr_t selid = (caddr_t)t_set_pop (&(sparp->sparp_env->spare_selids));
+ caddr_t selid = t_set_pop (&(sparp->sparp_env->spare_selids));
spar_dbg_printf (("spar_selid_pop () pops %s\n", selid));
return selid;
}
-
-void
-sparp_configure_storage_and_macro_libs (sparp_t *sparp)
-{
- if (sparp->sparp_storage_is_set)
- return;
- sparp->sparp_storage_is_set = 1;
- sparp->sparp_storage = sparp_find_storage_by_name (sparp->sparp_env->spare_storage_name);
- if ((NULL != sparp->sparp_storage) && !sparp->sparp_disable_storage_macro_lib)
- {
- sparql_macro_library_t *smlib = sparp->sparp_storage->qsMacroLibrary;
- if (NULL != smlib)
- {
- SPART **smllist;
- int new_defm_ctr;
- if (0 == smlib->smlCompilationState)
- {
- jso_rtti_t *sml_rtti = (jso_rtti_t *)gethash (smlib, jso_rttis_of_structs);
- if (NULL == sml_rtti)
- spar_error (sparp, "Quad storage <%.100s> refers to inexisting or corrupted SPARQL macro library", sparp->sparp_env->spare_storage_name);
- sparp_compile_smllist (sparp, sml_rtti->jrtti_inst_iri, smlib);
- smllist = (SPART **)(smlib->smlList);
- if (!IS_BOX_POINTER (smllist))
- spar_error (sparp, "Compilation error in SPARQL macro library <%.100s> refered by quad storage <%.100s>", sml_rtti->jrtti_inst_iri, sparp->sparp_env->spare_storage_name);
- }
- smllist = (SPART **)(smlib->smlList);
- DO_BOX_FAST (SPART *, new_defm, new_defm_ctr, smllist)
- {
- sparp_defmacro_store (sparp, new_defm);
- }
- END_DO_BOX_FAST;
- sparp_qr_uses_jso (sparp, (caddr_t)smlib, NULL);
- }
- }
- if ((NULL != sparp->sparp_macro_libs) && (NULL == sparp->sparp_macrolib_to_create))
- {
- caddr_t *explicit_includes = t_revlist_to_array (sparp->sparp_macro_libs);
- jso_class_descr_t *sml_cd;
- int lib_ctr;
- DO_BOX_FAST (caddr_t, lib_name, lib_ctr, explicit_includes)
- {
- jso_rtti_t *sml_rtti;
- sparql_macro_library_t *sml;
- SPART **smllist;
- caddr_t *smlincludes;
- int new_defm_ctr, old_defm_count, incl_ctr;
- jso_get_cd_and_rtti (
- uname_virtrdf_ns_uri_QuadStorage,
- lib_name,
- &sml_cd, &sml_rtti, 1 );
- if ((NULL == sml_rtti) || (JSO_STATUS_LOADED != sml_rtti->jrtti_status))
- spar_error (sparp, "Unknown SPARQL macro library <%.100s>", lib_name);
- sml = (sparql_macro_library_t *)(sml_rtti->jrtti_self);
- sparp_qr_uses_jso (sparp, (caddr_t)sml, NULL);
- if (0 == sml->smlCompilationState)
- {
- sparp_compile_smllist (sparp, sml_rtti->jrtti_inst_iri, sml);
- smllist = (SPART **)(sml->smlList);
- if (!IS_BOX_POINTER (smllist))
- spar_error (sparp, "Compilation error in SPARQL macro library <%.100s>", lib_name);
- }
- smllist = (SPART **)(sml->smlList);
- old_defm_count = sparp->sparp_macro_def_count;
- DO_BOX_FAST (SPART *, new_defm, new_defm_ctr, smllist)
- {
- int old_defm_ctr;
- for (old_defm_ctr = old_defm_count; old_defm_ctr--; /* no step */)
- {
- SPART *old_defm = sparp->sparp_macro_defs [old_defm_ctr];
- if (strcmp (old_defm->_.defmacro.mname, new_defm->_.defmacro.mname))
- continue;
- if (old_defm->_.defmacro.sml_iri != new_defm->_.defmacro.sml_iri)
- spar_error (sparp, "Macro <%.100s> is defined in both <%100s> and <%100s>", old_defm->_.defmacro.mname, old_defm->_.defmacro.sml_iri, new_defm->_.defmacro.sml_iri);
- goto new_defm_done; /* see below */
- }
- sparp_defmacro_store (sparp, new_defm);
-new_defm_done: ;
- }
- END_DO_BOX_FAST;
- smlincludes = (caddr_t *)(sml->smlIncludes);
- DO_BOX_FAST (caddr_t, new_incl, incl_ctr, smlincludes)
- {
- t_set_pushnew (&(sparp->sparp_macro_libs), new_incl);
- }
- END_DO_BOX_FAST;
- }
- END_DO_BOX_FAST;
- }
-}
-
-void
-sparp_compile_smllist (sparp_t *outer_sparp, caddr_t sml_iri_uname, void /* actually struct sparql_macro_library_t */ *smlib_as_voidptr)
-{
- sparql_macro_library_t *smlib = (sparql_macro_library_t *)smlib_as_voidptr;
- spar_query_env_t sparqre;
- sparp_t *sparp;
- SPART **mdefs;
- int ctr;
- if (DV_STRING != DV_TYPE_OF (smlib->smlSourceText))
- spar_error (outer_sparp, "Ill metadata of SPARQL macro library that is associated with the quad storage");
- memset (&sparqre, 0, sizeof (spar_query_env_t));
- sparqre.sparqre_cli = bootstrap_cli;
- sparqre.sparqre_qi = outer_sparp->sparp_sparqre->sparqre_qi;
- sparp = sparp_query_parse (
- t_box_sprintf (50 + box_length (smlib->smlSourceText), "define input:disable-storage-macro-lib \"yes\" %s", smlib->smlSourceText),
- &sparqre, 0 );
- ctr = sparp->sparp_macro_def_count;
- mdefs = (SPART **)dk_alloc_box (ctr * sizeof (SPART *), DV_ARRAY_OF_POINTER);
- while (ctr--)
- {
- SPART *mdef = sparp->sparp_macro_defs[ctr];
- if (NULL == mdef->_.defmacro.sml_iri)
- mdef->_.defmacro.sml_iri = box_copy (sml_iri_uname);
- mdefs[ctr] = (SPART *)box_copy_tree ((caddr_t)(mdef));
- }
- dk_check_tree ((caddr_t)(mdefs));
- smlib->smlList = (ccaddr_t)mdefs;
- smlib->smlIncludes = box_copy_tree ((caddr_t)t_revlist_to_array (sparp->sparp_macro_libs));
-}
-
-int
-spar_triple_matches_macro_quad_pattern (sparp_t *sparp, SPART *defm, SPART *graph, SPART *subject, SPART *predicate, SPART *object)
-{
- SPART *tg, *ts, *tp, *to;
- if (NULL == defm->_.defmacro.quad_pattern)
- return 0;
-#define FLD_CHECK(templ_fld, templ_fld_idx, triple_fld) do { \
- templ_fld = defm->_.defmacro.quad_pattern[(templ_fld_idx)]; \
- if (SPAR_IS_LIT_OR_QNAME (templ_fld) && \
- !((SPART_TYPE (triple_fld) == SPART_TYPE (templ_fld)) && \
- sparp_fixedvalues_equal (sparp, triple_fld, templ_fld) ) ) \
- return 0; } while (0)
- FLD_CHECK(tp, SPART_TRIPLE_PREDICATE_IDX, predicate);
- FLD_CHECK(to, SPART_TRIPLE_OBJECT_IDX, object);
- FLD_CHECK(ts, SPART_TRIPLE_SUBJECT_IDX, subject);
-
- switch (defm->_.defmacro.subtype)
- {
- case DEFAULT_L:
- if (!SPART_IS_DEFAULT_GRAPH_BLANK(graph)) return 0;
- break;
- case GRAPH_L:
- if (SPART_IS_DEFAULT_GRAPH_BLANK(graph)) return 0;
- FLD_CHECK(tg, SPART_TRIPLE_GRAPH_IDX, graph);
- break;
- default:
- break;
- }
- return 1;
-}
-
-SPART *
-spar_find_defmacro_by_iri_or_fields (sparp_t *sparp, caddr_t mname, SPART **fields)
-{
- int ctr;
-#define spar_return_if_macro_matches(sparp,mname,fields,defm) do { \
- if (NULL == fields) { \
- if (!strcmp (defm->_.defmacro.mname, mname)) \
- return defm; } \
- else if (spar_triple_matches_macro_quad_pattern (sparp, defm, fields[0], fields[1], fields[2], fields[3])) \
- return defm; } while (0)
- if (!sparp->sparp_storage_is_set)
- spar_internal_error (sparp, "spar_" "find_defmacro_by_iri_or_fields(): storage is not set");
- for (ctr = 0; ctr < sparp->sparp_macro_def_count; ctr++)
- {
- SPART *defm = sparp->sparp_macro_defs[ctr];
- spar_return_if_macro_matches (sparp,mname,fields,defm);
- }
- if ((NULL != sparp->sparp_storage) && !sparp->sparp_disable_storage_macro_lib)
- {
- sparql_macro_library_t *smlib = sparp->sparp_storage->qsMacroLibrary;
- if (NULL != smlib)
- {
- SPART **smllist = (SPART **)smlib->smlList;
- if (IS_BOX_POINTER (smllist))
- {
- DO_BOX_FAST (SPART *, defm, ctr, smllist)
- {
- spar_return_if_macro_matches (sparp,mname,fields,defm);
- }
- END_DO_BOX_FAST;
- }
- }
- }
- return NULL;
-}
-
-void
-sparp_defmacro_store (sparp_t *sparp, SPART *defm)
-{
- int old_macro_def_count = sparp->sparp_macro_def_count;
- if (old_macro_def_count >= BOX_ELEMENTS_0(sparp->sparp_macro_defs))
- {
- SPART **new_defs = (SPART **)t_alloc_box ((old_macro_def_count + 2) * 2 * sizeof (SPART *), DV_ARRAY_OF_POINTER);
- if (old_macro_def_count)
- memcpy (new_defs, sparp->sparp_macro_defs, old_macro_def_count * sizeof (SPART *));
- sparp->sparp_macro_defs = new_defs;
- }
- sparp->sparp_macro_defs [sparp->sparp_macro_def_count++] = defm;
-}
-
-SPART *
-sparp_defmacro_init (sparp_t *sparp, caddr_t mname)
-{
- SPART *old, *res;
- caddr_t selid = spar_mkid (sparp, "@s");
- old = spar_find_defmacro_by_iri_or_fields (sparp, mname, NULL);
- if (NULL != old)
- spar_error (sparp, "Macro name <%.200s> is already defined", mname);
- if (0 <= dk_set_position_of_string (sparp->sparp_funnames_in_defmacros, mname))
- spar_error (sparp, "The name of macro <%.200s> is used above as a name of function in the body of other macro", mname);
- res = spartlist (sparp, 10, SPAR_DEFMACRO, (ptrlong)(1), mname, NULL, NULL, NULL, NULL, NULL, selid, (ptrlong)0);
- return res;
-}
-
-void
-sparp_make_defmacro_paramnames_from_template (sparp_t *sparp, SPART *defm)
-{
- dk_set_t paramnames = NULL;
- int ctr;
- DO_BOX_FAST (SPART *, fld, ctr, defm->_.defmacro.quad_pattern)
- {
- if (SPAR_VARIABLE == SPART_TYPE (fld))
- {
- caddr_t vname = fld->_.var.vname;
- if (0 <= dk_set_position_of_string (sparp->sparp_env->spare_protocol_params, vname))
- spar_error (sparp, "The name of protocol parameter ?%.200s is (mis)used in the template of the declaration of macro <%.200s>", vname, defm->_.defmacro.mname);
- if (0 <= dk_set_position_of_string (paramnames, vname))
- spar_error (sparp, "The name of valiable ?%.200s is used twice in the template of the declaration of macro <%.200s>", vname, defm->_.defmacro.mname);
- t_set_push (¶mnames, vname);
- }
- }
- END_DO_BOX_FAST;
- defm->_.defmacro.paramnames = t_revlist_to_array (paramnames);
-}
-
-void
-sparp_defmacro_finalize (sparp_t *sparp, SPART *body)
-{
- sparp->sparp_current_macro->_.defmacro.body = body;
- sparp->sparp_current_macro = NULL;
-}
-
-void
-sparp_check_dm_arg_for_redecl (sparp_t *sparp, dk_set_t recent, caddr_t dm_arg_vname)
-{
- SPART *mdef;
- int ctr;
- mdef = sparp->sparp_current_macro;
- if (0 <= dk_set_position_of_string (sparp->sparp_env->spare_protocol_params, dm_arg_vname))
- spar_error (sparp, "The name of protocol parameter ?%.200s is (mis)used in the declaration of macro <%.200s>", dm_arg_vname, mdef->_.defmacro.mname);
- if (0 <= dk_set_position_of_string (recent, dm_arg_vname))
- goto dupe;
- DO_BOX_FAST (caddr_t, old_vname, ctr, mdef->_.defmacro.paramnames)
- {
- if (!strcmp (old_vname, dm_arg_vname))
- goto dupe;
- }
- END_DO_BOX_FAST;
- return;
-dupe:
- spar_error (sparp, "Duplicate variable name ?%.200s in arguments of macro <%.200s>", dm_arg_vname, mdef->_.defmacro.mname);
-}
-
-void
-spar_gp_init (sparp_t *sparp, ptrlong subtype)
+void spar_gp_init (sparp_t *sparp, ptrlong subtype)
{
sparp_env_t *env = sparp->sparp_env;
spar_dbg_printf (("spar_gp_init (..., %ld)\n", (long)subtype));
- if (sparp->sparp_macro_mode)
- {
- caddr_t selid;
- if (DEFMACRO_L == subtype)
- selid = sparp->sparp_current_macro->_.defmacro.selid;
- else
- selid = spar_mkid (sparp, "@s");
- spar_selid_push_reused (sparp, selid);
- }
- else
- spar_selid_push (sparp);
+ spar_selid_push (sparp);
t_set_push (&(env->spare_acc_triples), NULL);
t_set_push (&(env->spare_acc_filters), NULL);
t_set_push (&(env->spare_context_gp_subtypes), (caddr_t)subtype);
@@ -1411,8 +1165,7 @@ spar_gp_init (sparp_t *sparp, ptrlong subtype)
t_set_push (&(sparp->sparp_env->spare_propvar_sets), NULL); /* For WHERE_L and CONSTRUCT_L it's done at beginning of the result-set. */
}
-void
-spar_gp_replace_selid (sparp_t *sparp, dk_set_t membs, caddr_t old_selid, caddr_t new_selid)
+void spar_gp_replace_selid (sparp_t *sparp, dk_set_t membs, caddr_t old_selid, caddr_t new_selid)
{
DO_SET (SPART *, memb, &membs)
{
@@ -1442,7 +1195,7 @@ SPART *
spar_gp_finalize (sparp_t *sparp, SPART **options)
{
sparp_env_t *env = sparp->sparp_env;
- caddr_t orig_selid = (caddr_t)(env->spare_selids->data);
+ caddr_t orig_selid = env->spare_selids->data;
dk_set_t membs;
int all_ctr, opt_ctr;
dk_set_t filts;
@@ -1458,7 +1211,7 @@ spar_gp_finalize (sparp_t *sparp, SPART **options)
{
if (_STAR_GT == pv->sparpv_op)
spar_gp_init (sparp, OPTIONAL_L);
- spar_gp_add_triplelike (sparp, NULL,
+ spar_gp_add_triple_or_special_filter (sparp, NULL,
spar_make_variable (sparp, pv->sparpv_subj_var->_.var.vname),
pv->sparpv_verb_qname,
spar_make_variable (sparp, pv->sparpv_obj_var_name),
@@ -1677,9 +1430,9 @@ spar_gp_add_filter (sparp_t *sparp, SPART *filt)
opt_value = (SPART *)t_box_copy_tree ((caddr_t)arg_value);
opt_value->_.var.tabid = triple_with_var_obj->_.triple.tabid;
opt_value->_.var.tr_idx = (ptrlong)args[argctr];
- triple_with_var_obj->_.triple.options = t_spartlist_concat (
- triple_with_var_obj->_.triple.options,
- (SPART **)t_list (2, args[argctr], opt_value) );
+ triple_with_var_obj->_.triple.options = (SPART **) t_list_concat (
+ (caddr_t)(triple_with_var_obj->_.triple.options),
+ (caddr_t)t_list (2, args[argctr], opt_value) );
}
for (fld_ctr = 0; fld_ctr < SPART_TRIPLE_FIELDS_COUNT; fld_ctr++)
spar_tree_is_var_with_forbidden_ft_name (sparp, triple_with_var_obj->_.triple.tr_fields[fld_ctr], 1);
@@ -1697,7 +1450,7 @@ void
spar_gp_add_filters_for_graph (sparp_t *sparp, SPART *graph_expn, int graph_is_named, int suppress_filters_for_good_names)
{
sparp_env_t *env = sparp->sparp_env;
- dk_set_t sources = (graph_is_named ? env->spare_src.ssrc_named_graphs : env->spare_src.ssrc_default_graphs);
+ dk_set_t sources = (graph_is_named ? env->spare_named_graphs : env->spare_default_graphs);
caddr_t varname = NULL;
SPART *good_list_expn, *bad_list_expn, *filter;
if (NULL == sources)
@@ -1759,7 +1512,7 @@ spar_make_list_of_sources_expn (sparp_t *sparp, ptrlong from_subtype, ptrlong fr
{
dk_set_t single_graphs = NULL;
dk_set_t graph_groups = NULL;
- DO_SET (SPART *, g, &(sparp->sparp_env->spare_src.ssrc_default_graphs))
+ DO_SET (SPART *, g, &(sparp->sparp_env->spare_default_graphs))
{
ptrlong st = g->_.graph.subtype;
if ((st == from_subtype) || (st == from2_subtype))
@@ -1768,7 +1521,7 @@ spar_make_list_of_sources_expn (sparp_t *sparp, ptrlong from_subtype, ptrlong fr
t_set_push (&graph_groups, g->_.graph.expn);
}
END_DO_SET()
- DO_SET (SPART *, g, &(sparp->sparp_env->spare_src.ssrc_named_graphs))
+ DO_SET (SPART *, g, &(sparp->sparp_env->spare_named_graphs))
{
ptrlong st = g->_.graph.subtype;
if ((st == from_subtype) || (st == from2_subtype))
@@ -1817,7 +1570,7 @@ spar_make_list_of_sources_expn (sparp_t *sparp, ptrlong from_subtype, ptrlong fr
return spar_make_funcall (sparp, 0, "LONG::bif:position",
(SPART **)t_list (2, needle_expn, lst_expn) );
#else
- return sparp_make_builtin_call (sparp, IN_L,
+ return spartlist (sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)IN_L,
(SPART **)t_list (2, needle_expn, lst_expn) );
#endif
}
@@ -1825,7 +1578,7 @@ spar_make_list_of_sources_expn (sparp_t *sparp, ptrlong from_subtype, ptrlong fr
return spar_make_funcall (sparp, 0, "LONG::bif:vector",
(SPART **)t_list_to_array (single_graphs) );
t_set_push (&single_graphs, needle_expn);
- return sparp_make_builtin_call (sparp, IN_L,
+ return spartlist (sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)IN_L,
(SPART **)t_list_to_array (single_graphs) );
}
@@ -1931,7 +1684,7 @@ in_local_set:
}
void
-spar_list_triple_varnames_and_macropunames_in_tree (sparp_t *sparp, SPART *tree, dk_set_t *all_varnames_ret, dk_set_t *undiscovered_ret)
+spar_list_triple_vars_in_gp (sparp_t *sparp, SPART *tree, dk_set_t *all_varnames_ret)
{
int ctr;
switch (SPART_TYPE (tree))
@@ -1942,17 +1695,14 @@ spar_list_triple_varnames_and_macropunames_in_tree (sparp_t *sparp, SPART *tree,
for (ctr = SPART_TRIPLE_FIELDS_COUNT; ctr--; /* no step */)
{
SPART *fld = tree->_.triple.tr_fields[ctr];
- switch (SPART_TYPE (fld))
- {
- case SPAR_VARIABLE: t_set_push_new_string (all_varnames_ret, fld->_.var.vname); break;
- case SPAR_MACROPU: t_set_push_new_string (all_varnames_ret, fld->_.macropu.pname); break;
- }
+ if (SPAR_VARIABLE == SPART_TYPE (fld))
+ t_set_push_new_string (all_varnames_ret, fld->_.var.vname);
}
break;
case SPAR_GP:
DO_BOX_FAST_REV (SPART *, memb, ctr, tree->_.gp.members)
{
- spar_list_triple_varnames_and_macropunames_in_tree (sparp, memb, all_varnames_ret, undiscovered_ret);
+ spar_list_triple_vars_in_gp (sparp, memb, all_varnames_ret);
}
END_DO_BOX_FAST_REV;
if (NULL != tree->_.gp.subquery)
@@ -1962,7 +1712,7 @@ spar_list_triple_varnames_and_macropunames_in_tree (sparp_t *sparp, SPART *tree,
{
DO_BOX_FAST_REV (SPART *, memb, ctr, retvals)
{
- spar_list_triple_varnames_and_macropunames_in_tree (sparp, memb, all_varnames_ret, undiscovered_ret);
+ spar_list_triple_vars_in_gp (sparp, memb, all_varnames_ret);
}
END_DO_BOX_FAST_REV;
}
@@ -1970,34 +1720,7 @@ spar_list_triple_varnames_and_macropunames_in_tree (sparp_t *sparp, SPART *tree,
spar_internal_error (sparp, "Usupported combination of subqueries and service invocations");
}
break;
- case SPAR_MACROCALL: case SPAR_MACROPU:
- t_set_push (undiscovered_ret, tree);
- break;
- }
-}
-
-void
-spar_add_service_inv_to_sg (sparp_t *sparp, SPART *sinv)
-{
- SPART **sinvs = sparp->sparp_sg->sg_sinvs;
- ptrlong sinvcount = sparp->sparp_sg->sg_sinv_count;
- if (IS_BOX_POINTER (sparp->sparp_sg->sg_sinv_count))
- spar_error (sparp, "Too many service invocations, probably due to abnormal macro expansion");
- sinv->_.sinv.own_idx = sinvcount;
- if (BOX_ELEMENTS_INT_0 (sinvs) == sinvcount)
- {
- size_t new_size = ((NULL == sinvs) ? 4 * sizeof (SPART *) : 2 * box_length (sinvs));
- SPART **new_sinvs = (SPART **)t_alloc_box (new_size, DV_ARRAY_OF_POINTER);
- if (NULL != sinvs)
- memcpy (new_sinvs, sinvs, box_length (sinvs));
-#ifdef DEBUG
- if (NULL != sinvs)
- memset (sinvs, -1, box_length (sinvs));
-#endif
- sparp->sparp_sg->sg_sinvs = sinvs = new_sinvs;
}
- sinvs[sinvcount] = sinv;
- sparp->sparp_sg->sg_sinv_count++;
}
SPART *
@@ -2008,6 +1731,8 @@ spar_make_service_inv (sparp_t *sparp, caddr_t endpoint, dk_set_t all_options, p
dk_set_t rset_varnames = NULL;
dk_set_t defines = NULL;
int in_list_implicit = 0;
+ ptrlong sinvcount = sparp->sparp_sg->sg_sinv_count;
+ SPART **sinvs = sparp->sparp_sg->sg_sinvs;
SPART *sinv;
while (NULL != all_options)
{
@@ -2027,10 +1752,7 @@ spar_make_service_inv (sparp_t *sparp, caddr_t endpoint, dk_set_t all_options, p
{
DO_SET (SPART *, member, &members_before)
{
- dk_set_t undiscovered = NULL;
- spar_list_triple_varnames_and_macropunames_in_tree (sparp, member, ¶m_varnames, &undiscovered);
- if (NULL != undiscovered)
- spar_error (sparp, "SERVICE invocation is used in combination with macro so it should have explicit list of IN variables in OPTIONS");
+ spar_list_triple_vars_in_gp (sparp, member, ¶m_varnames);
}
END_DO_SET()
}
@@ -2050,8 +1772,20 @@ spar_make_service_inv (sparp_t *sparp, caddr_t endpoint, dk_set_t all_options, p
}
/*! TBD: add other cases */
}
+ if (BOX_ELEMENTS_INT_0 (sinvs) == sinvcount)
+ {
+ size_t new_size = ((NULL == sinvs) ? 4 * sizeof (SPART *) : 2 * box_length (sinvs));
+ SPART **new_sinvs = (SPART **)t_alloc_box (new_size, DV_ARRAY_OF_POINTER);
+ if (NULL != sinvs)
+ memcpy (new_sinvs, sinvs, box_length (sinvs));
+#ifdef DEBUG
+ if (NULL != sinvs)
+ memset (sinvs, -1, box_length (sinvs));
+#endif
+ sparp->sparp_sg->sg_sinvs = sinvs = new_sinvs;
+ }
sinv = spartlist (sparp, 11, SPAR_SERVICE_INV,
- (ptrlong)(0),
+ sparp->sparp_sg->sg_sinv_count,
endpoint,
t_revlist_to_array (iri_params),
t_box_num (permitted_syntax),
@@ -2061,10 +1795,10 @@ spar_make_service_inv (sparp_t *sparp, caddr_t endpoint, dk_set_t all_options, p
t_revlist_to_array (defines),
sources,
sinv_storage );
+ sinvs[sparp->sparp_sg->sg_sinv_count++] = sinv;
return sinv;
}
-
int
spar_describe_restricted_by_physical (sparp_t *sparp, SPART **retvals)
{
@@ -2193,7 +1927,7 @@ spar_retvals_of_describe (sparp_t *sparp, SPART **retvals, SPART *limit_expn, SP
}
else
descr_name = "sql:SPARQL_DESC_DICT";
- if (sparp->sparp_env->spare_src.ssrc_default_graphs_listed || sparp->sparp_env->spare_src.ssrc_named_graphs_listed)
+ if (sparp->sparp_env->spare_default_graphs_listed || sparp->sparp_env->spare_named_graphs_listed)
good_graphs = spar_make_list_of_sources_expn (sparp, SPART_GRAPH_FROM, SPART_GRAPH_GROUP, SPART_GRAPH_NAMED, RDF_GRAPH_PERM_READ, NULL);
else
good_graphs = (SPART *)t_box_num_nonull (0);
@@ -2255,10 +1989,10 @@ sparp_gp_trav_add_rgc_vars_and_consts_from_retvals (sparp_t *sparp, SPART *curr,
{
case SPAR_VARIABLE:
if (!(SPART_VARR_GLOBAL & curr->_.var.rvr.rvrRestrictions))
- t_set_push_new_string (&(sparp->sparp_env->spare_src.ssrc_grab.rgc_vars), t_box_dv_uname_string (curr->_.var.vname));
+ t_set_push_new_string (&(sparp->sparp_env->spare_grab.rgc_vars), t_box_dv_uname_string (curr->_.var.vname));
break;
case SPAR_QNAME:
- t_set_push_new_string (&(sparp->sparp_env->spare_src.ssrc_grab.rgc_consts), curr->_.lit.val);
+ t_set_push_new_string (&(sparp->sparp_env->spare_grab.rgc_consts), curr->_.lit.val);
break;
}
return 0;
@@ -2326,30 +2060,47 @@ spar_make_top_or_special_case_from_wm (sparp_t *sparp, ptrlong subtype, SPART **
if (SPAR_WHERE_MODIFS != SPART_TYPE (wm))
spar_internal_error (sparp, "Ill wm");
#endif
- if (0 != sparp->sparp_macro_call_count)
- {
- spar_mproc_ctx_t ctx;
- memset (&ctx, 0, sizeof (spar_mproc_ctx_t));
- ctx.smpc_unictr = (sparp->sparp_unictr)++;
- ctx.smpc_context_gp = pattern;
- ctx.smpc_context_selid = pattern->_.gp.selid;
- pattern = spar_macroprocess_tree (sparp, pattern, &ctx);
- ctx.smpc_context_gp = pattern;
- ctx.smpc_context_selid = pattern->_.gp.selid;
- retvals = spar_macroprocess_treelist (sparp, retvals, 0, &ctx);
- groupings = spar_macroprocess_treelist (sparp, groupings, 0, &ctx);
- having = spar_macroprocess_tree (sparp, having, &ctx);
- order = spar_macroprocess_treelist (sparp, order, 0, &ctx);
- limit = spar_macroprocess_tree (sparp, limit, &ctx);
- offset = spar_macroprocess_tree (sparp, offset, &ctx);
+#if 0
+ if (NULL != having)
+ {
+ caddr_t old_pattern_selid = pattern->_.gp.selid;
+ int ctr;
+ SPART *sub_top, *sub_wrapper_gp, *new_pattern;
+ sparp_gp_trav (sparp, pattern, old_pattern_selid,
+ sparp_gp_trav_rename_for_having, NULL,
+ sparp_gp_trav_rename_for_having, NULL,
+ sparp_gp_trav_rename_for_having, NULL );
+ DO_BOX_FAST (SPART *, grp, ctr, groupings)
+ {
+ sparp_gp_trav (sparp, grp, old_pattern_selid,
+ sparp_gp_trav_rename_for_having, NULL,
+ sparp_gp_trav_rename_for_having, NULL,
+ sparp_gp_trav_rename_for_having, NULL );
+ }
+ END_DO_BOX_FAST;
+ sub_top = spar_make_top (sparp, subtype, (SPART **)((ptrlong)_STAR),
+ t_box_sprintf (100, "%.90s~wmret", old_pattern_selid),
+ pattern, groupings, (SPART **)t_list (0), t_box_num (SPARP_MAXLIMIT), t_box_num (0) );
+ if (SPAR_REQ_TOP == sub_top->type)
+ sparp_expand_top_retvals (sparp, sub_top, 1 /* safely_copy_all_vars */);
+ sub_top->_.req_top.retvalmode_name = t_box_dv_short_string ("AUTO");
+ sub_wrapper_gp = spartlist (sparp, 10, SPAR_GP, SELECT_L,
+ t_list (0), t_list (0), sub_top, t_box_sprintf (100, "%.90s~wmwrap", old_pattern_selid),
+ NULL, (ptrlong)0, (ptrlong)0, NULL );
+ new_pattern = spartlist (sparp, 10, SPAR_GP, WHERE_L,
+ t_list (1, sub_wrapper_gp), t_list (1, having), NULL, old_pattern_selid,
+ NULL, (ptrlong)0, (ptrlong)0, NULL );
+ pattern = new_pattern;
+ having = NULL;
}
+#endif
do { /* Special case for selection of all distinct graphs */
SPART *grp, *triple, *retvar, *gvar;
caddr_t retname, gname;
int ctr1, ctr2;
if (NULL != sparp->sparp_env->spare_parent_env) break;
if (DISTINCT_L != subtype) break;
- if (NULL != sparp->sparp_env->spare_src.ssrc_named_graphs) break;
+ if (NULL != sparp->sparp_env->spare_named_graphs) break;
if (!IS_BOX_POINTER (retvals)) break;
if (1 != BOX_ELEMENTS (retvals)) break;
if (0 != BOX_ELEMENTS_0 (groupings)) break;
@@ -2476,26 +2227,25 @@ spar_alloc_fake_equivs_for_bindings_inv (sparp_t *sparp, SPART *binv)
SPART **
-spar_make_sources_like_top (sparp_t *sparp, ptrlong top_subtype)
+spar_make_sources_like_top (sparp_t *sparp)
{
sparp_env_t *env = sparp->sparp_env;
dk_set_t src = NULL;
SPART **sources;
- DO_SET(SPART *, g, &(env->spare_src.ssrc_default_graphs))
+ DO_SET(SPART *, g, &(env->spare_default_graphs))
{
t_set_push (&src, sparp_tree_full_copy (sparp, g, NULL));
}
END_DO_SET()
- DO_SET(SPART *, g, &(env->spare_src.ssrc_named_graphs))
+ DO_SET(SPART *, g, &(env->spare_named_graphs))
{
t_set_push (&src, sparp_tree_full_copy (sparp, g, NULL));
}
END_DO_SET()
sources = (SPART **)t_revlist_to_array (src);
if ((0 == BOX_ELEMENTS (sources)) &&
- (NULL != (env->spare_src.ssrc_common_sponge_options)) &&
- (LOAD_L != top_subtype) )
- spar_error (sparp, "Retrieval options for source graphs (e.g., '%s') may be useless if the query does not contain 'FROM' or 'FROM NAMED'", env->spare_src.ssrc_common_sponge_options->data);
+ (NULL != (env->spare_common_sponge_options)) )
+ spar_error (sparp, "Retrieval options for source graphs (e.g., '%s') may be useless if the query does not contain 'FROM' or 'FROM NAMED'", env->spare_common_sponge_options->data);
return sources;
}
@@ -2505,7 +2255,7 @@ spar_make_top (sparp_t *sparp, ptrlong subtype, SPART **retvals,
{
sparp_env_t *env = sparp->sparp_env;
caddr_t final_output_format_name;
- SPART **sources = spar_make_sources_like_top (sparp, subtype);
+ SPART **sources = spar_make_sources_like_top (sparp);
switch (subtype)
{
case CONSTRUCT_L: case DESCRIBE_L:
@@ -2549,7 +2299,7 @@ spar_gp_add_union_of_triple_and_inverses (sparp_t *sparp, SPART *graph, SPART *s
spar_error (sparp, "Options are not supported for a triple pattern with property name \"%.200s\" that is declared in inference rules \"%.200s\" as a property with inverse",
predicate->_.qname.val, sparp->sparp_env->spare_inference_name );
sparp->sparp_env->spare_inference_ctx = NULL;
- triple = spar_gp_add_triplelike (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, banned_tricks | SPAR_ADD_TRIPLELIKE_NO_INV_UNION);
+ triple = spar_gp_add_triple_or_special_filter (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, banned_tricks & 0x2);
if (SPAR_TRIPLE != SPART_TYPE (triple))
spar_error (sparp, "Property name \"%.200s\" has special meaning that conflicts with its declaration in inference rules \"%.200s\" as a property with inverse",
predicate->_.qname.val, sparp->sparp_env->spare_inference_name );
@@ -2562,14 +2312,14 @@ spar_gp_add_union_of_triple_and_inverses (sparp_t *sparp, SPART *graph, SPART *s
{
caddr_t inv_p_name = t_box_dv_uname_string (t_set_pop (&inv_props));
spar_gp_init (sparp, 0);
- triple = spar_gp_add_triplelike (sparp,
+ triple = spar_gp_add_triple_or_special_filter (sparp,
(SPART *)t_full_box_copy_tree ((caddr_t)graph),
(SPART *)t_full_box_copy_tree ((caddr_t)object), /* object is swapped with subject*/
(SPART *)t_full_box_copy_tree ((caddr_t)predicate),
(SPART *)t_full_box_copy_tree ((caddr_t)subject),
t_full_box_copy_tree (qm_iri_or_pair),
(SPART **)t_full_box_copy_tree ((caddr_t)options),
- banned_tricks | SPAR_ADD_TRIPLELIKE_NO_INV_UNION );
+ banned_tricks & 0x2 );
if (SPAR_TRIPLE != SPART_TYPE (triple))
spar_error (sparp, "Property name \"%.200s\" has special meaning but it is declared in inference rules \"%.200s\" as an inverse property of \"%.200s\"",
inv_p_name, sparp->sparp_env->spare_inference_name, predicate->_.qname.val );
@@ -2649,7 +2399,7 @@ spar_gp_add_transitive_triple (sparp_t *sparp, SPART *graph, SPART *subject, SPA
if (SPAR_IS_BLANK_OR_VAR (fields[fld_ctr]))
fields[fld_ctr]->_.var.selid = gp_selid;
}
- spar_gp_add_triplelike (sparp, graph, subj_var, predicate, obj_var, qm_iri_or_pair, NULL, banned_tricks | SPAR_ADD_TRIPLELIKE_NO_TRANSITIVE);
+ spar_gp_add_triple_or_special_filter (sparp, graph, subj_var, predicate, obj_var, qm_iri_or_pair, NULL, 0x1);
sparp_set_option (sparp, &options, T_IN_L,
spartlist (sparp, 2, SPAR_LIST, t_list (1, spar_make_variable (sparp, subj_vname))),
SPARP_SET_OPTION_REPLACING );
@@ -2688,54 +2438,17 @@ spar_gp_add_transitive_triple (sparp_t *sparp, SPART *graph, SPART *subject, SPA
return wrapper_gp;
}
-
-#if 0
-SPART *
-spar_const_g_for_defm_search (sparp_env_t *env)
-{
- SPART *g = NULL;
- dk_set_t *dflts;
- if (env->spare_context_graphs)
- {
- g = (SPART *)t_box_copy_tree (env->spare_context_graphs->data);
- goto g_found; /* see below*/
- }
- dflts = env->spare_src.ssrc_default_graphs;
-/* Special case: if no FROM clauses specified but there are some FROM NAMED then default graph is totally empty.
-So that's conflict for plain triple, but the processing of a graph-insensitive macro can not be cancelled because the body of macro could be
-GRAPH <vald_named_graph> { ... } */
- if ((NULL == dflts) && (NULL != env->spare_src.ssrc_named_graphs))
- return NULL;
- if ((NULL != dflts) && (SPART_GRAPH_FROM == ((SPART *)(dflts->data))->_.graph.subtype) &&
- ((NULL == dflts->next) || (SPART_GRAPH_MIN_NEGATION <= ((SPART *)(dflts->next->data))->_.graph.subtype)) )
- { /* If there's only one default graph then we can cheat and optimize the query a little bit by adding a restriction to the variable */
- SPART *single_dflt = (SPART *)(dflts->data);
- caddr_t g_iri = single_dflt->_.graph.iri;
- if (!SPAR_IS_LIT_OR_QNAME (single_dflt->_.graph.expn) && (NULL != g_iri)) /* FROM iriref OPTION (...) case */
- g = g_iri;
- else
- g = single_dflt->_.graph.expn;
- }
-g_found:
- if (SPAR_IS_LIT_OR_QNAME (g))
- return g;
- return NULL;
-}
-#endif
-
-ptrlong sparp_tr_usage_natural_restrictions[SPART_TRIPLE_FIELDS_COUNT] = {
+static ptrlong usage_natural_restrictions[SPART_TRIPLE_FIELDS_COUNT] = {
SPART_VARR_IS_REF | SPART_VARR_IS_IRI | SPART_VARR_NOT_NULL, /* graph */
SPART_VARR_IS_REF | SPART_VARR_NOT_NULL, /* subject */
SPART_VARR_IS_REF | SPART_VARR_NOT_NULL, /* predicate */
SPART_VARR_NOT_NULL }; /* object */
SPART *
-spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *predicate, SPART *object, caddr_t qm_iri_or_pair, SPART **options, int banned_tricks)
+spar_gp_add_triple_or_special_filter (sparp_t *sparp, SPART *graph, SPART *subject, SPART *predicate, SPART *object, caddr_t qm_iri_or_pair, SPART **options, int banned_tricks)
{
sparp_env_t *env = sparp->sparp_env;
rdf_inf_ctx_t *inf_ctx = sparp->sparp_env->spare_inference_ctx;
- SPART *graph_eq_from_option_expn = NULL;
- int graph_can_bring_filters = 0;
SPART *triple;
if (NULL == subject)
subject = (SPART *)t_box_copy_tree (env->spare_context_subjects->data);
@@ -2745,15 +2458,7 @@ spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
object = (SPART *)t_box_copy_tree (env->spare_context_objects->data);
if (CONSTRUCT_L == SPARP_ENV_CONTEXT_GP_SUBTYPE(sparp))
{
- if ((NULL == graph) && (NULL != env->spare_context_graphs))
- {
- graph = (SPART *)t_box_copy_tree (env->spare_context_graphs->data);
- }
- if (NULL == graph)
- {
- graph = spar_make_blank_node (sparp, spar_mkid (sparp, "_::default"), 2);
- env->spare_ctor_dflt_g_tmpl_count++;
- }
+ graph = spar_make_blank_node (sparp, spar_mkid (sparp, "_::default"), 2);
goto plain_triple_in_ctor; /* see below */
}
#if 1
@@ -2815,8 +2520,8 @@ spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
if (NULL != options)
{
SPART *trans = sparp_get_option (sparp, options, TRANSITIVE_L);
- if ((NULL != trans) && !(SPAR_ADD_TRIPLELIKE_NO_TRANSITIVE & banned_tricks))
- return spar_gp_add_transitive_triple (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, SPAR_ADD_TRIPLELIKE_NO_TRANSITIVE | banned_tricks);
+ if ((NULL != trans) && !(0x1 & banned_tricks))
+ return spar_gp_add_transitive_triple (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, 0x1 | banned_tricks);
}
if ((NULL != inf_ctx) && (SPAR_QNAME == SPART_TYPE (predicate)))
{
@@ -2830,14 +2535,14 @@ spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
if (ECM_MEM_NOT_FOUND != pp_pos)
{
ptrlong flags = (ptrlong)(propprops[pp_pos * 2 + 1]);
- if ((1 & flags) && !(SPAR_ADD_TRIPLELIKE_NO_TRANSITIVE & banned_tricks))
+ if ((1 & flags) && !(0x1 & banned_tricks))
{
sparp_set_option (sparp, &options, TRANSITIVE_L, (SPART *)((ptrlong)1), SPARP_SET_OPTION_REPLACING);
- return spar_gp_add_transitive_triple (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, SPAR_ADD_TRIPLELIKE_NO_TRANSITIVE | banned_tricks);
+ return spar_gp_add_transitive_triple (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, 0x1 | banned_tricks);
}
}
}
- if ((NULL != invlist) && !(SPAR_ADD_TRIPLELIKE_NO_INV_UNION & banned_tricks))
+ if ((NULL != invlist) && !(0x2 & banned_tricks))
{
int invlistlen = BOX_ELEMENTS (invlist);
int inv_pos = ecm_find_name (p_name, invlist, invlistlen/2, 2 * sizeof (caddr_t));
@@ -2849,7 +2554,7 @@ spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
t_set_push (&inv_names, invlist [1 + 2 * inv_pos]);
while ((((inv_pos+1) * 2) < invlistlen) && !strcmp (invlist[(inv_pos+1) * 2], p_name))
t_set_push (&inv_names, invlist [1 + 2 * ++inv_pos]);
- return spar_gp_add_union_of_triple_and_inverses (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, SPAR_ADD_TRIPLELIKE_NO_INV_UNION | banned_tricks, inv_names);
+ return spar_gp_add_union_of_triple_and_inverses (sparp, graph, subject, predicate, object, qm_iri_or_pair, options, 0x2 | banned_tricks, inv_names);
}
}
}
@@ -2876,7 +2581,7 @@ spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
}
spar_gp_add_filter (sparp,
spar_make_funcall (sparp, 0, pname,
- t_spartlist_concat ((SPART **)t_list (2, subject, object), options) ) );
+ (SPART **)t_list_concat ((caddr_t)t_list (2, subject, object), (caddr_t)options) ) );
dk_free_tree (spec_pred_names);
return NULL;
}
@@ -2892,8 +2597,8 @@ spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
graph = (SPART *)t_box_copy_tree (env->spare_context_graphs->data);
break;
}
- dflts = env->spare_src.ssrc_default_graphs;
- if ((NULL == dflts) && (NULL != env->spare_src.ssrc_named_graphs))
+ dflts = env->spare_default_graphs;
+ if ((NULL == dflts) && (NULL != env->spare_named_graphs))
{ /* Special case: if no FROM clauses specified but there are some FROM NAMED then default graph is totally empty */
graph = spar_make_blank_node (sparp, spar_mkid (sparp, "_::default"), 2);
graph->_.var.rvr.rvrRestrictions |= SPART_VARR_CONFLICT;
@@ -2906,13 +2611,12 @@ spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
if (!SPAR_IS_LIT_OR_QNAME (single_dflt->_.graph.expn)) /* FROM iriref OPTION (...) case */
{
caddr_t iri_arg = single_dflt->_.graph.iri;
+ SPART *eq;
graph = spar_make_blank_node (sparp, spar_mkid (sparp, "_::default"), 2);
- graph_eq_from_option_expn = spartlist (sparp, 3, BOP_EQ, sparp_tree_full_copy (sparp, graph, NULL), sparp_tree_full_copy (sparp, single_dflt->_.graph.expn, NULL));
- if (NULL != iri_arg)
- {
- graph->_.var.rvr.rvrRestrictions |= SPART_VARR_FIXED | SPART_VARR_IS_REF | SPART_VARR_NOT_NULL;
- graph->_.var.rvr.rvrFixedValue = t_box_copy (iri_arg);
- }
+ eq = spartlist (sparp, 3, BOP_EQ, sparp_tree_full_copy (sparp, graph, NULL), sparp_tree_full_copy (sparp, single_dflt->_.graph.expn, NULL));
+ spar_gp_add_filter (sparp, eq);
+ graph->_.var.rvr.rvrRestrictions |= SPART_VARR_FIXED | SPART_VARR_IS_REF | SPART_VARR_NOT_NULL;
+ graph->_.var.rvr.rvrFixedValue = t_box_copy (iri_arg);
}
else /* Single FROM iriref without sponge options */
graph = sparp_tree_full_copy (sparp, single_dflt->_.graph.expn, NULL);
@@ -2921,49 +2625,12 @@ spar_gp_add_triplelike (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
}
else
graph = spar_make_blank_node (sparp, spar_mkid (sparp, "_::default"), 2);
- graph_can_bring_filters = 1;
+ spar_gp_add_filters_for_graph (sparp, graph, 0, 0);
break;
}
- if (!(banned_tricks & SPAR_ADD_TRIPLELIKE_NO_MACRO))
- {
- int ctr, argctr;
- SPART *match_defm = NULL;
- SPART *mcall, *fields[4];
- if (!sparp->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp);
- if (!sparp->sparp_macro_def_count)
- goto mcall_not_found; /* see below */
- fields[0] = graph;
- fields[1] = subject;
- fields[2] = predicate;
- fields[3] = object;
- match_defm = spar_find_defmacro_by_iri_or_fields (sparp, NULL, fields);
- if (NULL == match_defm)
- goto mcall_not_found; /* see below */
- mcall = sparp_make_macro_call (sparp, match_defm->_.defmacro.mname, 0,
- (SPART **)t_alloc_box (box_length (match_defm->_.defmacro.paramnames), DV_ARRAY_OF_POINTER) );
- argctr = 0;
- DO_BOX_FAST (SPART *, fld, ctr, match_defm->_.defmacro.quad_pattern)
- {
- if (SPAR_VARIABLE == SPART_TYPE (fld))
- mcall->_.macrocall.argtrees[argctr++] = fields[ctr];
- }
- END_DO_BOX_FAST;
- spar_gp_add_member (sparp, mcall);
- if (!(sparp->sparp_macro_mode & SPARP_DEFBODY))
- sparp->sparp_macro_call_count++;
- return mcall;
- }
-
-mcall_not_found: ;
plain_triple_in_ctor:
if (SPAR_IS_BLANK_OR_VAR (graph))
graph->_.var.selid = env->spare_selids->data;
- if (graph_can_bring_filters)
- spar_gp_add_filters_for_graph (sparp, graph, 0, 0);
- if (NULL != graph_eq_from_option_expn)
- spar_gp_add_filter (sparp, graph_eq_from_option_expn);
-
triple = spar_make_plain_triple (sparp, graph, subject, predicate, object, qm_iri_or_pair, options);
if (NULL != options)
sparp_validate_options_of_tree (sparp, triple, options);
@@ -2994,33 +2661,33 @@ spar_make_plain_triple (sparp_t *sparp, SPART *graph, SPART *subject, SPART *pre
ptrlong ft = SPART_TYPE(fld);
if ((SPAR_VARIABLE == ft) || (SPAR_BLANK_NODE_LABEL == ft))
{
- fld->_.var.rvr.rvrRestrictions |= sparp_tr_usage_natural_restrictions[fctr];
+ fld->_.var.rvr.rvrRestrictions |= usage_natural_restrictions[fctr];
fld->_.var.tabid = key;
fld->_.var.tr_idx = fctr;
if (!(SPART_VARR_GLOBAL & fld->_.var.rvr.rvrRestrictions))
t_set_push_new_string (&(env->spare_good_graph_varnames), fld->_.var.vname);
}
- if ((env->spare_src.ssrc_grab.rgc_all) && (SPART_TRIPLE_PREDICATE_IDX != fctr))
+ if ((env->spare_grab.rgc_all) && (SPART_TRIPLE_PREDICATE_IDX != fctr))
{
if ((SPAR_VARIABLE == ft) && !(SPART_VARR_GLOBAL & fld->_.var.rvr.rvrRestrictions))
- t_set_push_new_string (&(env->spare_src.ssrc_grab.rgc_vars), t_box_dv_uname_string (fld->_.var.vname));
+ t_set_push_new_string (&(env->spare_grab.rgc_vars), t_box_dv_uname_string (fld->_.var.vname));
else if (SPAR_QNAME == ft)
- t_set_push_new_string (&(env->spare_src.ssrc_grab.rgc_consts), fld->_.lit.val);
+ t_set_push_new_string (&(env->spare_grab.rgc_consts), fld->_.lit.val);
}
- if ((NULL != env->spare_src.ssrc_grab.rgc_sa_preds) &&
+ if ((NULL != env->spare_grab.rgc_sa_preds) &&
(SPART_TRIPLE_SUBJECT_IDX == fctr) &&
(SPAR_VARIABLE == ft) &&
- !(env->spare_src.ssrc_grab.rgc_all) )
+ !(env->spare_grab.rgc_all) )
{
SPART *obj = triple->_.triple.tr_object;
ptrlong objt = SPART_TYPE(obj);
if (
((SPAR_VARIABLE == objt) &&
- (0 <= dk_set_position_of_string (env->spare_src.ssrc_grab.rgc_vars, obj->_.var.vname)) ) ||
+ (0 <= dk_set_position_of_string (env->spare_grab.rgc_vars, obj->_.var.vname)) ) ||
((SPAR_QNAME == objt) &&
- (0 <= dk_set_position_of_string (env->spare_src.ssrc_grab.rgc_consts, obj->_.lit.val)) ) )
+ (0 <= dk_set_position_of_string (env->spare_grab.rgc_consts, obj->_.lit.val)) ) )
{
- t_set_push_new_string (&(env->spare_src.ssrc_grab.rgc_sa_vars), t_box_dv_uname_string (fld->_.var.vname));
+ t_set_push_new_string (&(env->spare_grab.rgc_sa_vars), t_box_dv_uname_string (fld->_.var.vname));
}
}
}
@@ -3072,18 +2739,11 @@ spar_make_variable (sparp_t *sparp, caddr_t name)
res = spartlist (sparp, 6 + (sizeof (rdf_val_range_t) / sizeof (caddr_t)),
SPAR_VARIABLE, name,
selid, NULL,
- (ptrlong)(SPART_VAR_OUTSIDE_TRIPLE), SPART_BAD_EQUIV_IDX, SPART_RVR_LIST_OF_NULLS );
+ (ptrlong)(0), SPART_BAD_EQUIV_IDX, SPART_RVR_LIST_OF_NULLS );
res->_.var.rvr.rvrRestrictions = (is_global ? SPART_VARR_GLOBAL : 0);
return res;
}
-SPART *
-spar_make_macropu (sparp_t *sparp, caddr_t name, ptrlong pos)
-{
- SPART *res = spartlist (sparp, 4, SPAR_MACROPU, name, pos, (ptrlong)0);
- return res;
-}
-
SPART *spar_make_blank_node (sparp_t *sparp, caddr_t name, int bracketed)
{
sparp_env_t *env = sparp->sparp_env;
@@ -3095,7 +2755,7 @@ SPART *spar_make_blank_node (sparp_t *sparp, caddr_t name, int bracketed)
res = spartlist (sparp, 7 + (sizeof (rdf_val_range_t) / sizeof (caddr_t)),
SPAR_BLANK_NODE_LABEL, name,
env->spare_selids->data, NULL,
- (ptrlong)SPART_VAR_OUTSIDE_TRIPLE, SPART_BAD_EQUIV_IDX, SPART_RVR_LIST_OF_NULLS, (ptrlong)bracketed );
+ (ptrlong)0, SPART_BAD_EQUIV_IDX, SPART_RVR_LIST_OF_NULLS, (ptrlong)bracketed );
res->_.var.rvr.rvrRestrictions = /*SPART_VARR_IS_REF | SPART_VARR_IS_BLANK |*/ SPART_VARR_NOT_NULL;
return res;
}
@@ -3184,7 +2844,7 @@ void
sparp_make_and_push_new_graph_source (sparp_t *sparp, ptrlong subtype, SPART *iri_expn, SPART **options)
{
sparp_env_t *spare = sparp->sparp_env;
- caddr_t iri = ((SPAR_QNAME == SPART_TYPE (iri_expn)) ? iri_expn->_.qname.val : NULL);
+ caddr_t iri = iri_expn->_.qname.val;
dk_set_t *set_ptr;
int *is_locked_ptr = NULL;
SPART *dupe_found = NULL;
@@ -3193,61 +2853,58 @@ sparp_make_and_push_new_graph_source (sparp_t *sparp, ptrlong subtype, SPART *ir
switch (subtype)
{
case SPART_GRAPH_FROM:
- spare->spare_src.ssrc_default_graphs_listed++;
- is_locked_ptr = &(spare->spare_src.ssrc_default_graphs_locked);
+ spare->spare_default_graphs_listed++;
+ is_locked_ptr = &(spare->spare_default_graphs_locked);
/* no break */
case SPART_GRAPH_NOT_FROM:
- set_ptr = &(spare->spare_src.ssrc_default_graphs);
+ set_ptr = &(spare->spare_default_graphs);
break;
case SPART_GRAPH_NAMED:
- spare->spare_src.ssrc_named_graphs_listed++;
- is_locked_ptr = &(spare->spare_src.ssrc_named_graphs_locked);
+ spare->spare_named_graphs_listed++;
+ is_locked_ptr = &(spare->spare_named_graphs_locked);
/* no break */
case SPART_GRAPH_NOT_NAMED:
- set_ptr = &(spare->spare_src.ssrc_named_graphs);
+ set_ptr = &(spare->spare_named_graphs);
break;
default:
spar_internal_error (sparp, "sparp_make_and_push_new_graph_source(): bad subtype");
set_ptr = NULL; /* To keep compiler happy */
break;
}
- if (NULL != iri)
+ DO_SET (SPART *, c, set_ptr)
{
- DO_SET (SPART *, c, set_ptr)
+ if ((subtype < SPART_GRAPH_MIN_NEGATION) && (SPART_GRAPH_MIN_NEGATION < c->_.graph.subtype))
{
- if (strcmp (c->_.graph.iri, iri))
- continue;
- if ((subtype < SPART_GRAPH_MIN_NEGATION) && (SPART_GRAPH_MIN_NEGATION < c->_.graph.subtype))
+ if (is_locked_ptr && is_locked_ptr[0])
{
- if (is_locked_ptr && is_locked_ptr[0])
- {
- const char *fty = ((SPART_GRAPH_NAMED == subtype) ? " NAMED" : "");
- spar_error (sparp, "An IRI <%.200s> can not be used in FROM%s clause because it is excluded by NOT FROM%s already",
- iri, fty, fty );
- }
- return; /* A (failed) attempt to overwrite NOT FROM with FROM */
- }
- if ((c->_.graph.subtype == subtype) && (SPAR_QNAME != SPART_TYPE (c->_.graph.expn)))
- t_set_delete (set_ptr, c);
- else
- {
- dupe_found = c;
- break;
+ const char *fty = ((SPART_GRAPH_NAMED == subtype) ? " NAMED" : "");
+ spar_error (sparp, "An IRI <%.200s> can not be used in FROM%s clause because it is excluded by NOT FROM%s already",
+ iri, fty, fty );
}
+ return; /* A (failed) attempt to overwrite NOT FROM with FROM */
+ }
+ if (strcmp (c->_.graph.iri, iri))
+ continue;
+ if ((c->_.graph.subtype == subtype) && (SPAR_QNAME != SPART_TYPE (c->_.graph.expn)))
+ t_set_delete (set_ptr, c);
+ else
+ {
+ dupe_found = c;
+ break;
}
- END_DO_SET()
}
+ END_DO_SET()
if ((NULL == dupe_found) && (subtype < SPART_GRAPH_MIN_NEGATION) && is_locked_ptr && is_locked_ptr[0])
{
const char *fty = ((SPART_GRAPH_NAMED == subtype) ? " NAMED" : "");
- spar_error (sparp, "FROM %s <%.200s> clause violates security restrictions on allowed graph names", fty, ((NULL != iri) ? "..." : iri));
+ spar_error (sparp, "FROM %s <%.200s> clause violates security restrictions on allowed graph names", fty, iri);
}
if ((SPART_GRAPH_MIN_NEGATION < subtype) && (NULL != options))
{
const char *fty = ((SPART_GRAPH_NAMED == subtype) ? " NAMED" : "");
- spar_error (sparp, "NOT FROM%s <%.200s> clause can not have options, only FROM and FROM NAMED can", fty, ((NULL != iri) ? "..." : iri));
+ spar_error (sparp, "NOT FROM%s <%.200s> clause can not have options, only FROM and FROM NAMED can", fty, iri);
}
- if ((NULL != iri) && rdf_graph_group_dict_htable->ht_count)
+ if (rdf_graph_group_dict_htable->ht_count)
{
caddr_t iid = sparp_graph_sec_iri_to_id_nosignal (sparp, iri);
if (NULL != iid)
@@ -3294,8 +2951,8 @@ sparp_make_and_push_new_graph_source (sparp_t *sparp, ptrlong subtype, SPART *ir
SPART *
sparp_make_graph_precode (sparp_t *sparp, ptrlong subtype, SPART *iriref, SPART **options)
{
- rdf_grab_config_t *rgc_ptr = &(sparp->sparp_env->spare_src.ssrc_grab);
- dk_set_t *opts_ptr = &(sparp->sparp_env->spare_src.ssrc_common_sponge_options);
+ rdf_grab_config_t *rgc_ptr = &(sparp->sparp_env->spare_grab);
+ dk_set_t *opts_ptr = &(sparp->sparp_env->spare_common_sponge_options);
SPART **mixed_options, **mixed_tail;
int common_count, ctr;
user_t *exec_user;
@@ -3315,12 +2972,12 @@ sparp_make_graph_precode (sparp_t *sparp, ptrlong subtype, SPART *iriref, SPART
END_DO_SET()
for (ctr = BOX_ELEMENTS_0 (options) - 2; 0 <= ctr; ctr -= 2)
{
- ccaddr_t param = (ccaddr_t)(options[ctr]);
+ caddr_t param = (caddr_t)(options[ctr]);
const char **chk;
for (chk = sparp_known_get_params; (NULL != chk[0]) && strcmp (chk[0], param); chk++) ;
if (NULL == chk[0])
spar_error (sparp, "Unsupported parameter '%.30s' in FROM ... (OPTION ...)", param);
- if (NULL != dk_set_getptr_keyword (opts_ptr[0], param))
+ if (0 < dk_set_position_of_string (opts_ptr[0], param))
spar_error (sparp, "FROM ... (OPTION ... %s ...) conflicts with 'DEFINE %s ...", param, param);
(mixed_tail++)[0] = (SPART *)t_full_box_copy_tree (param);
(mixed_tail++)[0] = (SPART *)t_full_box_copy_tree ((caddr_t)(options[ctr + 1]));
@@ -3341,28 +2998,13 @@ sparp_make_graph_precode (sparp_t *sparp, ptrlong subtype, SPART *iriref, SPART
}
SPART *
-spar_default_sparul_target (sparp_t *sparp, const char *clause_type, int may_return_null)
+spar_default_sparul_target (sparp_t *sparp, const char *clause_type)
{
- dk_set_t dflt_graphs = sparp->sparp_env->spare_src.ssrc_default_graphs;
- SPART *u_graph = sparp->sparp_env->spare_src.ssrc_graph_set_by_with;
- if (NULL != u_graph)
- {
- if (sparp->sparp_env->spare_src.ssrc_default_graphs_locked)
- spar_error (sparp, "USING clause is used but default graph is locked in the preamble");
- return sparp_tree_full_copy (sparp, (SPART *)(u_graph), NULL);
- }
+ dk_set_t dflt_graphs = sparp->sparp_env->spare_default_graphs;
if ((NULL == dflt_graphs) || (((SPART *)(dflt_graphs->data))->_.graph.subtype > SPART_GRAPH_MIN_NEGATION))
- {
- if (may_return_null)
- return NULL;
- spar_error (sparp, "No %.200s and no default graph specified in the preamble", clause_type);
- }
+ spar_error (sparp, "No %.200s and no default graph specified in the preamble", clause_type);
if ((NULL != dflt_graphs->next) && (((SPART *)(dflt_graphs->next->data))->_.graph.subtype < SPART_GRAPH_MIN_NEGATION))
- {
- if (may_return_null)
- return NULL;
- spar_error (sparp, "No %.200s and more than one default graph specified in the preamble", clause_type);
- }
+ spar_error (sparp, "No %.200s and more than one default graph specified in the preamble", clause_type);
if (SPART_GRAPH_GROUP == ((SPART *)(dflt_graphs->data))->_.graph.subtype)
spar_error (sparp, "No %.200s and the IRI in preamble refers to default graph group, not a single default graph", clause_type);
return sparp_tree_full_copy (sparp, (SPART *)(dflt_graphs->data), NULL);
@@ -3416,12 +3058,12 @@ spar_make_regex_or_like_or_eq (sparp_t *sparp, SPART *strg, SPART *regexpn)
if (tail != like_tmpl + final_len)
GPF_T1 ("spar_" "make_regex_or_like_or_eq (): pointer arithmetic error on like_tmpl");
/*#endif*/
- return sparp_make_builtin_call (sparp, LIKE_L,
- (SPART **)t_list (2, strg,
+ return spartlist (sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)LIKE_L,
+ t_list (2, strg,
spartlist (sparp, 4, SPAR_LIT, like_tmpl, NULL, NULL) ) );
bad_regex:
- return sparp_make_builtin_call (sparp, SPAR_BIF_REGEX, (SPART **)t_list (2, strg, regexpn));
+ return spartlist (sparp, 3, SPAR_BUILT_IN_CALL, (ptrlong)REGEX_L, t_list (2, strg, regexpn));
}
void
@@ -3433,25 +3075,13 @@ spar_verify_funcall_security (sparp_t *sparp, ccaddr_t fname, SPART **args)
char buf[30];
const char *unsafe_sql_names[] = {
"RDF_INSERT_TRIPLES",
- "RDF_INSERT_TRIPLES",
"RDF_DELETE_TRIPLES",
- "RDF_GLOBAL_RESET",
"RDF_GRAPH_GROUP_LIST_GET",
"RDF_LOAD_RDFXML",
"RDF_LOAD_RDFXML_MT",
"RDF_MODIFY_TRIPLES",
- "RDF_REPL_DELETE_TRIPLES",
- "RDF_REPL_GRAPH_DEL",
- "RDF_REPL_GRAPH_INS",
- "RDF_REPL_INSERT_TRIPLES",
- "RDF_REPL_START",
- "RDF_REPL_STOP",
- "RDF_REPL_SYNC",
- "RDF_SPONGE_UP",
"SPARQL_INSERT_DICT_CONTENT",
- "SPARQL_INSERT_QUAD_DICT_CONTENT",
"SPARQL_DELETE_DICT_CONTENT",
- "SPARQL_DELETE_QUAD_DICT_CONTENT",
"SPARQL_DESC_AGG",
"SPARQL_DESC_AGG_ACC",
"SPARQL_DESC_AGG_INIT",
@@ -3462,15 +3092,11 @@ spar_verify_funcall_security (sparp_t *sparp, ccaddr_t fname, SPART **args)
"SPARQL_DESC_DICT_SPO",
"SPARQL_DESC_DICT_SPO_PHYSICAL",
"SPARQL_MODIFY_BY_DICT_CONTENTS",
- "SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS",
"SPARQL_SELECT_KNOWN_GRAPHS",
- "SPARUL_ADD",
+ "SPARUL_LOAD",
"SPARUL_CLEAR",
- "SPARUL_COPY",
"SPARUL_CREATE",
"SPARUL_DROP",
- "SPARUL_LOAD",
- "SPARUL_MOVE",
"SPARUL_RUN",
"TTLP",
"TTLP_EV_GET_IID",
@@ -3610,195 +3236,24 @@ aggr_checked:
}
xpf_checked:
if (aggregate_mode)
- {
- if (SPARP_DEFBODY & sparp->sparp_macro_mode)
- sparp->sparp_current_macro->_.defmacro.aggregate_count++;
- else
- sparp->sparp_query_uses_aggregates++;
- }
+ sparp->sparp_query_uses_aggregates++;
return spartlist (sparp, 4, SPAR_FUNCALL, t_box_dv_short_string (funname), args, (ptrlong)aggregate_mode);
}
-const sparp_bif_desc_t sparp_bif_descs[] = {
-/* sbd_name | sbd_subtype , impl | sbd_required_syntax | min-/maxargs | ret_valmode | sbd_arg_valmodes | sbd_result_restr_bits */
- { "" , 0 , '-' , 0 , 0 , 0 , NULL , { SSG_VALMODE_SQLVAL, NULL, NULL} , 0 },
- { "abs" , SPAR_BIF_ABS , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , 0 },
- { "bnode" , SPAR_BIF_BNODE , '-' , SSG_SD_SPARQL11 , 0 , 1 , SSG_VALMODE_LONG , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_BLANK | SPART_VARR_IS_REF },
- { "bound" , BOUND_L , '-' , 0 , 1 , 1 , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "ceil" , SPAR_BIF_CEIL , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , 0 },
- { "coalesce" , SPAR_BIF_COALESCE , '-' , SSG_SD_SPARQL11 , 0 , 0xFFF , NULL , { SSG_VALMODE_SQLVAL, NULL, NULL} , 0 },
- { "concat" , SPAR_BIF_CONCAT , 'B' , SSG_SD_SPARQL11 , 0 , 0xFFF , NULL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "contains" , SPAR_BIF_CONTAINS , 'B' , SSG_SD_SPARQL11 , 2 , 2 , SSG_VALMODE_BOOL , { SSG_VALMODE_LONG, SSG_VALMODE_LONG, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "datatype" , DATATYPE_L , '-' , 0 , 1 , 1 , SSG_VALMODE_LONG , { SSG_VALMODE_LONG, NULL, NULL} , SPART_VARR_IS_IRI | SPART_VARR_IS_REF },
- { "day" , SPAR_BIF_DAY , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "encode_for_uri" , SPAR_BIF_ENCODE_FOR_URI , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "floor" , SPAR_BIF_FLOOR , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "hours" , SPAR_BIF_HOURS , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "if" , SPAR_BIF_IF , '-' , SSG_SD_SPARQL11 , 3 , 3 , NULL , { SSG_VALMODE_BOOL, NULL, NULL} , 0 },
- { "in operator" , IN_L , '-' , 0 , 1 , 0xFFF , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "iri" , IRI_L , '-' , SSG_SD_BI_OR_SPARQL11 , 1 , 1 , SSG_VALMODE_LONG , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_IRI | SPART_VARR_IS_REF | SPART_VARR_NOT_NULL },
- { "isblank" , SPAR_BIF_ISBLANK , '-' , 0 , 1 , 1 , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "isiri" , SPAR_BIF_ISIRI , '-' , 0 , 1 , 1 , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "isliteral" , SPAR_BIF_ISLITERAL , '-' , 0 , 1 , 1 , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "isnumeric" , SPAR_BIF_ISNUMERIC , '-' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_BOOL , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "isref" , SPAR_BIF_ISREF , '-' , SSG_SD_BI , 1 , 1 , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "isuri" , SPAR_BIF_ISURI , '-' , 0 , 1 , 1 , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "lang" , LANG_L , '-' , 0 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_LONG, NULL, NULL} , SPART_VARR_IS_LIT },
- { "langmatches" , SPAR_BIF_LANGMATCHES , '-' , 0 , 2 , 2 , SSG_VALMODE_BOOL , { SSG_VALMODE_LONG, SSG_VALMODE_SQLVAL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "like operator" , LIKE_L , '-' , 0 , 2 , 2 , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, SSG_VALMODE_SQLVAL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "lcase" , SPAR_BIF_LCASE , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_LONG , { SSG_VALMODE_LONG, NULL, NULL} , SPART_VARR_IS_LIT },
- { "md5" , SPAR_BIF_MD5 , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "minutes" , SPAR_BIF_MINUTES , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "month" , SPAR_BIF_MONTH , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "now" , SPAR_BIF_NOW , 'B' , SSG_SD_SPARQL11 , 0 , 0 , SSG_VALMODE_NUM , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "rand" , SPAR_BIF_RAND , 'B' , SSG_SD_SPARQL11 , 0 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "regex" , SPAR_BIF_REGEX , 'B' , 0 , 2 , 3 , SSG_VALMODE_BOOL , { SSG_VALMODE_SQLVAL, SSG_VALMODE_SQLVAL, SSG_VALMODE_SQLVAL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "replace" , SPAR_BIF_REPLACE , 'S' , SSG_SD_SPARQL11 , 3 , 4 , SSG_VALMODE_LONG , { SSG_VALMODE_LONG, SSG_VALMODE_SQLVAL, SSG_VALMODE_SQLVAL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "round" , SPAR_BIF_ROUND , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "sameterm" , SPAR_BIF_SAMETERM , '-' , 0 , 2 , 2 , SSG_VALMODE_BOOL , { SSG_VALMODE_LONG, SSG_VALMODE_LONG, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "seconds" , SPAR_BIF_SECONDS , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "sha1" , SPAR_BIF_SHA1 , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "sha224" , SPAR_BIF_SHA224 , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "sha256" , SPAR_BIF_SHA256 , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "sha384" , SPAR_BIF_SHA384 , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "sha512" , SPAR_BIF_SHA512 , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL },
- { "str" , SPAR_BIF_STR , '-' , 0 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT },
- { "strdt" , SPAR_BIF_STRDT , 'S' , SSG_SD_SPARQL11 , 2 , 2 , SSG_VALMODE_LONG , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT },
- { "strends" , SPAR_BIF_STRENDS , 'B' , SSG_SD_SPARQL11 , 2 , 2 , SSG_VALMODE_BOOL , { SSG_VALMODE_LONG, SSG_VALMODE_LONG, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "strlang" , SPAR_BIF_STRLANG , 'S' , SSG_SD_SPARQL11 , 2 , 2 , SSG_VALMODE_LONG , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT },
- { "strlen" , SPAR_BIF_STRLEN , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "strstarts" , SPAR_BIF_STRSTARTS , 'B' , SSG_SD_SPARQL11 , 2 , 2 , SSG_VALMODE_BOOL , { SSG_VALMODE_LONG, SSG_VALMODE_LONG, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "substr" , SPAR_BIF_SUBSTR , 'B' , SSG_SD_SPARQL11 , 2 , 3 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_LONG, SSG_VALMODE_NUM, SSG_VALMODE_NUM} , SPART_VARR_IS_LIT },
- { "timezone" , SPAR_BIF_TIMEZONE , 'S' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "tz" , SPAR_BIF_TZ , 'S' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_SQLVAL , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
- { "ucase" , SPAR_BIF_UCASE , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_LONG , { SSG_VALMODE_LONG, NULL, NULL} , SPART_VARR_IS_LIT },
- { "uri" , SPAR_BIF_URI , '-' , SSG_SD_BI_OR_SPARQL11 , 1 , 1 , SSG_VALMODE_LONG , { SSG_VALMODE_SQLVAL, NULL, NULL} , SPART_VARR_IS_IRI | SPART_VARR_IS_REF },
- { "year" , SPAR_BIF_YEAR , 'B' , SSG_SD_SPARQL11 , 1 , 1 , SSG_VALMODE_NUM , { SSG_VALMODE_NUM, NULL, NULL} , SPART_VARR_IS_LIT | SPART_VARR_NOT_NULL | SPART_VARR_LONG_EQ_SQL },
-};
-
-SPART *
-sparp_make_builtin_call (sparp_t *sparp, ptrlong bif_id, SPART **arguments)
-{
- ptrlong ofs;
- for (ofs = sizeof (sparp_bif_descs)/sizeof (sparp_bif_descs[0]); ofs--; /* no step */)
- {
- const sparp_bif_desc_t *sbd = sparp_bif_descs + ofs;
- int argcount;
- if (sbd->sbd_subtype != bif_id)
- continue;
- argcount = BOX_ELEMENTS_0 (arguments);
- if (argcount < sbd->sbd_minargs)
- sparyyerror_impl (sparp, NULL, t_box_sprintf (100, "Insufficient number of arguments of a standard built-in function %s()", sbd->sbd_name));
- if (argcount > sbd->sbd_maxargs)
- sparyyerror_impl (sparp, NULL, t_box_sprintf (100, "Too many arguments of a standard built-in function %s()", sbd->sbd_name));
- goto ofs_found; /* see below */
- }
- spar_internal_error (sparp, "sparp" "_make_builtin_call(): bad bif_id");
-ofs_found:
- return spartlist (sparp, 4, SPAR_BUILT_IN_CALL, bif_id, ofs, arguments);
-}
-
-SPART *
-sparp_make_macro_call (sparp_t *sparp, caddr_t mname, int call_is_explicit, SPART **args)
-{
- SPART *mdecl = spar_find_defmacro_by_iri_or_fields (sparp, mname, NULL);
- SPART *g_ctx, *res;
- dk_set_t g_ctxs;
- int argcount, paramcount;
- if (NULL == mdecl)
- spar_internal_error (sparp, "sparp_" "make_macro_call(): undefined macro");
- paramcount = BOX_ELEMENTS (mdecl->_.defmacro.paramnames);
- argcount = BOX_ELEMENTS_0 (args);
- if (paramcount != argcount)
- spar_error (sparp, "The macro <%.200s> is used with %d arguments, %d expected", mname, argcount, paramcount);
- g_ctxs = sparp->sparp_env->spare_context_graphs;
- g_ctx = ((NULL != g_ctxs) ? (SPART *)t_full_box_copy_tree ((caddr_t)(g_ctxs->data)) : NULL);
- res = spartlist (sparp, 5, SPAR_MACROCALL, t_box_dv_short_string (mname), args, g_ctx, spar_mkid (sparp, "m"));
- return res;
-}
-
-int
-sparp_namesake_macro_param (sparp_t *sparp, SPART *dm, caddr_t param_name)
-{
- int ctr;
- if (NULL == dm)
- {
- dm = sparp->sparp_current_macro;
- if (NULL == dm)
- return -3;
- }
- DO_BOX_FAST_REV (caddr_t, name, ctr, dm->_.defmacro.paramnames)
- {
- if (!strcmp (name, param_name))
- return ctr;
- }
- END_DO_BOX_FAST;
- DO_BOX_FAST_REV (caddr_t, name, ctr, dm->_.defmacro.localnames)
- {
- if (!strcmp (name, param_name))
- return -1;
- }
- END_DO_BOX_FAST;
- return -2;
-}
-
-SPART *
-spar_make_create_macro_lib (sparp_t *sparp)
-{
- SPART *fake_sol;
- SPART *call, *top;
- spar_selid_push (sparp);
- fake_sol = spar_make_fake_action_solution (sparp);
- call = spar_make_funcall (sparp, 0, t_box_dv_short_string ("sql:RDF_SML_CREATE"),
- (SPART **)t_list (2, sparp->sparp_macrolib_to_create, t_box_dv_short_string (sparp->sparp_text)) );
- top = spar_make_top_or_special_case_from_wm (sparp, SPAR_SML_CREATE,
- (SPART **)t_list (1, call),
- spar_selid_pop (sparp), fake_sol );
- return top;
-}
-
SPART *
-spar_make_drop_macro_lib (sparp_t *sparp, SPART *sml_precode, int silent)
+spar_make_sparul_mdw (sparp_t *sparp, ptrlong subtype, const char *opname, SPART *graph_precode, SPART *aux_op)
{
SPART *fake_sol;
SPART *call, *top;
- spar_selid_push (sparp);
- fake_sol = spar_make_fake_action_solution (sparp);
- call = spar_make_funcall (sparp, 0, t_box_dv_short_string ("sql:RDF_SML_DROP"),
- (SPART **)t_list (2, sml_precode, t_box_num_nonull (silent)) );
- top = spar_make_top_or_special_case_from_wm (sparp, SPAR_SML_DROP,
- (SPART **)t_list (1, call),
- spar_selid_pop (sparp), fake_sol );
- return top;
-}
-
-SPART *
-spar_make_sparul_mdw (sparp_t *sparp, ptrlong subtype, const char *opname, SPART *graph_precode, SPART *aux_op, int silent)
-{
- SPART *fake_sol;
- SPART *call, *top, **options = NULL, *options_vector_call;
caddr_t log_mode = sparp->sparp_env->spare_sparul_log_mode;
spar_selid_push (sparp);
fake_sol = spar_make_fake_action_solution (sparp);
if (NULL == log_mode)
log_mode = t_NEW_DB_NULL;
- if (LOAD_L == subtype)
- {
- dk_set_t *opts_ptr = &(sparp->sparp_env->spare_src.ssrc_common_sponge_options);
- options = (SPART **)t_full_box_copy_tree ((caddr_t)(t_list_to_array (opts_ptr[0])));
- if (NULL != dk_set_getptr_keyword (opts_ptr[0], "get:destination"))
- spar_error (sparp, "DEFINE get:destination ... is not applicable for SPARUL LOAD statement, use LOAD ... INTO ... form instead");
- if (NULL != dk_set_getptr_keyword (opts_ptr[0], "get:uri"))
- spar_error (sparp, "DEFINE get:uri ... is not applicable for SPARUL LOAD statement, use LOAD ... INTO ... form instead");
- }
- if (NULL == options)
- options_vector_call = (SPART *)t_NEW_DB_NULL;
- else
- options_vector_call = spar_make_funcall (sparp, 0, "bif:vector", options);
if (NULL != sparp->sparp_env->spare_output_route_name)
call = spar_make_funcall (sparp, 0,
t_box_sprintf (200, "sql:SPARQL_ROUTE_MDW_%.100s", sparp->sparp_env->spare_output_route_name),
- (SPART **)t_list (13, graph_precode,
+ (SPART **)t_list (11, graph_precode,
t_box_dv_short_string (opname),
((NULL == sparp->sparp_env->spare_storage_name) ? t_NEW_DB_NULL : sparp->sparp_env->spare_storage_name),
((NULL == sparp->sparp_env->spare_output_storage_name) ? t_NEW_DB_NULL : sparp->sparp_env->spare_output_storage_name),
@@ -3806,106 +3261,38 @@ spar_make_sparul_mdw (sparp_t *sparp, ptrlong subtype, const char *opname, SPART
aux_op,
t_NEW_DB_NULL,
t_NEW_DB_NULL,
- spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp), options_vector_call,
- (SPART *)t_box_num_nonull (silent) ) );
+ spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp)) );
else
call = spar_make_funcall (sparp, 0, t_box_sprintf (30, "sql:SPARUL_%.15s", opname),
- (SPART **)t_list (7, graph_precode, aux_op,
- spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp), options_vector_call,
- (SPART *)t_box_num_nonull (silent) ) );
+ (SPART **)t_list (5, graph_precode, aux_op, spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp)) );
top = spar_make_top_or_special_case_from_wm (sparp, subtype,
(SPART **)t_list (1, call),
spar_selid_pop (sparp), fake_sol );
return top;
}
-SPART *spar_make_graph_precode_for_clear (sparp_t *sparp, SPART *graph_precode, const char *opname)
-{
- int clear_default = 0;
- int clear_named = 0;
- dk_set_t graphs = NULL;
- switch ((ptrlong)graph_precode)
- {
- case DEFAULT_L: clear_default = 1; break;
- case NAMED_L: clear_named = 1; break;
- case ALL_L: clear_default = clear_named = 1; break;
- default: return graph_precode;
- }
- if (clear_default)
- {
- DO_SET (SPART *, src, &(sparp->sparp_env->spare_src.ssrc_default_graphs))
- {
- if (SPART_GRAPH_FROM != src->_.graph.subtype)
- spar_error (sparp, "Graph groups, NOT FROM and its equivalents are not supported for SPARQL %.200s DEFAULT and SPARQL %.200s ALL", opname, opname);
- t_set_push (&graphs, spar_simplify_graph_to_patch (sparp, src));
- }
- END_DO_SET ();
- }
- if (clear_named)
- {
- DO_SET (SPART *, src, &(sparp->sparp_env->spare_src.ssrc_named_graphs))
- {
- if (SPART_GRAPH_NAMED != src->_.graph.subtype)
- spar_error (sparp, "Graph groups, NOT FROM NAMED and its equivalents are not supported for SPARQL %.200s NAMED and SPARQL %.200s ALL", opname, opname);
- t_set_push (&graphs, spar_simplify_graph_to_patch (sparp, src));
- }
- END_DO_SET ();
- }
- return spar_make_funcall (sparp, 0, "bif:vector", (SPART **)t_revlist_to_array (graphs));
-}
-
SPART *
-spar_make_sparul_clear (sparp_t *sparp, SPART *graph_precode, int silent)
+spar_make_sparul_clear (sparp_t *sparp, SPART *graph_precode)
{
- SPART *graph_arg = spar_make_graph_precode_for_clear (sparp, graph_precode, "CLEAR");
- return spar_make_sparul_mdw (sparp, CLEAR_L, "CLEAR", graph_arg, (SPART *)t_box_num_nonull (0) /* i.e. not inside sponge */, silent);
+ return spar_make_sparul_mdw (sparp, CLEAR_L, "CLEAR", graph_precode, (SPART *)t_box_num_nonull (0) /* i.e. not inside sponge */);
}
SPART *
-spar_make_sparul_load (sparp_t *sparp, SPART *graph_precode, SPART *src_precode, int silent)
+spar_make_sparul_load (sparp_t *sparp, SPART *graph_precode, SPART *src_precode)
{
- return spar_make_sparul_mdw (sparp, LOAD_L, "LOAD", graph_precode, src_precode, silent);
+ return spar_make_sparul_mdw (sparp, LOAD_L, "LOAD", graph_precode, src_precode);
}
SPART *
spar_make_sparul_create (sparp_t *sparp, SPART *graph_precode, int silent)
{
- return spar_make_sparul_mdw (sparp, CREATE_L, "CREATE", graph_precode, NULL, silent);
+ return spar_make_sparul_mdw (sparp, CREATE_L, "CREATE", graph_precode, (SPART *)t_box_num_nonull (silent));
}
SPART *
spar_make_sparul_drop (sparp_t *sparp, SPART *graph_precode, int silent)
{
- SPART *graph_arg = spar_make_graph_precode_for_clear (sparp, graph_precode, "DROP");
- return spar_make_sparul_mdw (sparp, DROP_L, "DROP", graph_arg, NULL, silent);
-}
-
-SPART *
-spar_make_sparul_copymoveadd (sparp_t *sparp, ptrlong opcode, SPART *from_graph_precode, SPART *to_graph_precode, int silent)
-{
- const char *opname = NULL;
- switch (opcode)
- {
- case COPY_L: opname = "COPY"; break;
- case MOVE_L: opname = "MOVE"; break;
- case ADD_L: opname = "ADD"; break;
- default: GPF_T;
- }
- if ((DEFAULT_L == (ptrlong)(from_graph_precode)) || (DEFAULT_L == (ptrlong)(to_graph_precode)))
- {
- SPART *single_default;
- dk_set_t graphs = sparp->sparp_env->spare_src.ssrc_default_graphs;
- if ((NULL == graphs) || (SPART_GRAPH_FROM != ((SPART *)(graphs->data))->_.graph.subtype))
- spar_error (sparp, "SPARQL 1.1 %s...DEFAULT operator requires declaration of a plain default graph", opname);
- if ((NULL != graphs->next) && (SPART_GRAPH_MIN_NEGATION <= ((SPART *)(graphs->next->data))->_.graph.subtype))
- spar_error (sparp, "SPARQL 1.1 %s...DEFAULT operator requires exactly one default graph", opname);
- single_default = spar_simplify_graph_to_patch (sparp, (SPART *)(graphs->data));
- if (DEFAULT_L == (ptrlong)(from_graph_precode))
- from_graph_precode = single_default;
- if (DEFAULT_L == (ptrlong)(to_graph_precode))
- to_graph_precode = single_default;
- }
- return spar_make_sparul_mdw (sparp, DROP_L, opname, from_graph_precode, to_graph_precode, silent);
+ return spar_make_sparul_mdw (sparp, DROP_L, "DROP", graph_precode, (SPART *)t_box_num_nonull (silent));
}
SPART *
@@ -3933,6 +3320,7 @@ spar_make_topmost_sparul_sql (sparp_t *sparp, SPART **actions)
caddr_t action_sql;
sparp->sparp_expr = action;
sparp_rewrite_all (sparp, 0 /* no cloning -- no need in safely_copy_retvals */);
+ /*xt_check (sparp, sparp->sparp_expr);*/
#ifndef NDEBUG
t_check_tree (sparp->sparp_expr);
#endif
@@ -4061,22 +3449,6 @@ spar_exec_uid_and_gs_cbk (sparp_t *sparp)
(SPART **)t_list (3, uid, sparp->sparp_gs_app_callback, appid) );
}
-void
-spar_qr_uses_jso_int (comp_context_t *cc, ccaddr_t jso_inst, ccaddr_t jso_name)
-{
- if (NULL == cc)
- return;
- if (NULL == jso_name)
- {
- jso_rtti_t *jso_rtti = gethash (jso_inst, jso_rttis_of_structs);
- if (NULL == jso_rtti)
- return; /* Built-in anonymous JSO, like one used when define input:storage "" */
- jso_name = jso_rtti->jrtti_inst_iri;
- }
- box_dv_uname_make_immortal ((caddr_t)jso_name);
- qr_uses_jso (cc->cc_super_cc->cc_query, jso_name);
-}
-
int
spar_graph_static_perms (sparp_t *sparp, caddr_t graph_iri, int req_perms)
{
@@ -4290,7 +3662,7 @@ sparp_t * dbg_curr_sparp;
#endif
sparp_t *
-sparp_query_parse (const char * str, spar_query_env_t *sparqre, int rewrite_all)
+sparp_query_parse (char * str, spar_query_env_t *sparqre, int rewrite_all)
{
wcharset_t *query_charset = sparqre->sparqre_query_charset;
t_NEW_VAR (sparp_t, sparp);
@@ -4349,8 +3721,7 @@ sparp_query_parse (const char * str, spar_query_env_t *sparqre, int rewrite_all)
return sparp; /* see below */
}
END_QR_RESET
- if (NULL != sparp->sparp_macrolib_to_create && !sparp->sparp_macrolib_ignore_create)
- sparp->sparp_expr = spar_make_create_macro_lib (sparp);
+ /*xt_check (sparp, sparp->sparp_expr);*/
#ifndef NDEBUG
t_check_tree (sparp->sparp_expr);
#endif
@@ -4392,14 +3763,14 @@ sparp_clone_for_variant (sparp_t *sparp, int allow_output_formatting)
id_hash_t * spare_vars; /*!< Known variables as keys, equivs as values */
id_hash_t * spare_global_bindings; /*!< Dictionary of global bindings, varnames as keys, default value expns as values. DV_DB_NULL box for no expn! */
#endif
- /* No copy for spare_src.ssrc_grab_vars */
- ENV_SET_COPY (spare_src.ssrc_common_sponge_options);
- ENV_SET_COPY (spare_src.ssrc_default_graphs);
- ENV_SET_COPY (spare_src.ssrc_named_graphs);
- ENV_COPY (spare_src.ssrc_default_graphs_listed);
- ENV_COPY (spare_src.ssrc_named_graphs_listed);
- ENV_COPY (spare_src.ssrc_default_graphs_locked);
- ENV_COPY (spare_src.ssrc_named_graphs_locked);
+ /* No copy for spare_grab_vars */
+ ENV_SET_COPY (spare_common_sponge_options);
+ ENV_SET_COPY (spare_default_graphs);
+ ENV_SET_COPY (spare_named_graphs);
+ ENV_COPY (spare_default_graphs_listed);
+ ENV_COPY (spare_named_graphs_listed);
+ ENV_COPY (spare_default_graphs_locked);
+ ENV_COPY (spare_named_graphs_locked);
ENV_SET_COPY (spare_common_sql_table_options);
ENV_SET_COPY (spare_sql_select_options);
ENV_SET_COPY (spare_global_var_names);
@@ -4427,12 +3798,12 @@ spar_env_push (sparp_t *sparp)
id_hash_t * spare_vars; /*!< Known variables as keys, equivs as values */
id_hash_t * spare_global_bindings; /*!< Dictionary of global bindings, varnames as keys, default value expns as values. DV_DB_NULL box for no expn! */
#endif
- ENV_COPY (spare_src.ssrc_grab);
- ENV_COPY (spare_src.ssrc_common_sponge_options);
- ENV_COPY (spare_src.ssrc_default_graphs);
- ENV_COPY (spare_src.ssrc_default_graphs_locked);
- ENV_COPY (spare_src.ssrc_named_graphs);
- ENV_COPY (spare_src.ssrc_named_graphs_locked);
+ ENV_COPY (spare_grab);
+ ENV_COPY (spare_common_sponge_options);
+ ENV_COPY (spare_default_graphs);
+ ENV_COPY (spare_default_graphs_locked);
+ ENV_COPY (spare_named_graphs);
+ ENV_COPY (spare_named_graphs_locked);
ENV_COPY (spare_common_sql_table_options);
/* no copy for spare_groupings */
ENV_COPY (spare_sql_select_options);
@@ -4553,7 +3924,7 @@ sparp_compile_subselect (spar_query_env_t *sparqre)
caddr_t
bif_sparql_explain (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
- int ctr, param_ctr = 0;
+ int param_ctr = 0;
spar_query_env_t sparqre;
sparp_t * sparp;
caddr_t str = bif_string_arg (qst, args, 0, "sparql_explain");
@@ -4570,11 +3941,6 @@ bif_sparql_explain (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
sqlr_resignal (sparqre.sparqre_catched_error);
}
res = strses_allocate ();
- for (ctr = 0; ctr < sparp->sparp_macro_def_count; ctr++)
- {
- SPART *defm = sparp->sparp_macro_defs[ctr];
- spart_dump (defm, res, 0, "MACRO DEFINITION", -1);
- }
spart_dump (sparp->sparp_expr, res, 0, "QUERY", -1);
#if 1
{
@@ -5215,8 +4581,8 @@ sparql_init (void)
{
caddr_t err;
rdf_ds_load_all();
- iri_to_id_nosignal_cached_qr = sql_compile_static (iri_to_id_nosignal_text, bootstrap_cli, &err, SQLC_STATIC_PRESERVES_TREE);
- id_to_iri_cached_qr = sql_compile_static (id_to_iri_text, bootstrap_cli, &err, SQLC_STATIC_PRESERVES_TREE);
+ iri_to_id_nosignal_cached_qr = sql_compile_static (iri_to_id_nosignal_text, bootstrap_cli, &err, SQLC_DEFAULT);
+ id_to_iri_cached_qr = sql_compile_static (id_to_iri_text, bootstrap_cli, &err, SQLC_DEFAULT);
bif_define ("sparql_to_sql_text", bif_sparql_to_sql_text);
bif_define ("sparql_detalize", bif_sparql_detalize);
bif_define ("sparql_explain", bif_sparql_explain);
diff --git a/libsrc/Wi/sparql_init.sql b/libsrc/Wi/sparql_init.sql
deleted file mode 100644
index 7eee8d9..0000000
--- a/libsrc/Wi/sparql_init.sql
+++ /dev/null
@@ -1,359 +0,0 @@
---
--- $Id: sparql_init.sql,v 1.1.2.2 2012/03/07 11:16:29 source Exp $
---
--- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
--- project.
---
--- Copyright (C) 1998-2012 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 function DB.DBA.RDF_LANGUAGE_OF_LONG (in longobj any, in dflt varchar := '') returns any
-{
- if (__tag of rdf_box = __tag (longobj))
- {
- declare twobyte integer;
- declare res varchar;
- twobyte := rdf_box_lang (longobj);
- if (257 = twobyte)
- return dflt;
- whenever not found goto badlang;
- select lower (RL_ID) into res from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = twobyte;
- return res;
-
-badlang:
- signal ('RDFXX', sprintf ('Unknown language in DB.DBA.RDF_LANGUAGE_OF_LONG, bad id %d', twobyte));
- }
- return case (isiri_id (longobj)) when 0 then dflt else null end;
-}
-;
-
------
--- JSO procedures
-
-create function DB.DBA.JSO_MAKE_INHERITANCE (in jgraph varchar, in class varchar, in rootinst varchar, in destinst varchar, in dest_iid iri_id, inout noinherits any, inout inh_stack any)
-{
- declare base_iid iri_id;
- declare baseinst varchar;
- -- dbg_obj_princ ('JSO_MAKE_INHERITANCE (', jgraph, class, rootinst, destinst, ')');
- inh_stack := vector_concat (inh_stack, vector (destinst));
- baseinst := null;
- if (not exists (sparql
- define input:storage ""
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- ask where {
- graph ?:jgraph { ?:dest_iid rdf:type `iri(?:class)`
- } } ) )
- signal ('22023', 'JSO_MAKE_INHERITANCE has not found object <' || destinst || '> of type <' || class || '>');
-/* This fails. !!!TBD: fix sparql2sql.c to preserve data about equalities, fixed values and globals when triples are moved from gp to gp
- for (sparql
- define input:storage ""
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- select ?srcinst
- where {
- graph ?:jgraph {
- { {
- ?destnode rdf:type `iri(?:class)` .
- filter (?destnode = iri(?:destinst)) }
- union
- {
- ?destnode rdf:type `iri(?:class)` .
- ?destnode rdf:name `iri(?:destinst)` } } .
- ?destnode virtrdf:inheritFrom ?srcinst .
- ?srcinst rdf:type `iri(?:class)` .
- } } ) do
-*/
- for (sparql
- define input:storage ""
- define output:valmode "LONG"
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- select ?src_iid
- where {
- graph ?:jgraph { ?:dest_iid virtrdf:inheritFrom ?src_iid } } ) do
- {
- declare srcinst varchar;
- srcinst := id_to_iri_nosignal ("src_iid");
- if (baseinst is null)
- {
- if (not exists (sparql
- define input:storage ""
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- ask where { graph ?:jgraph { ?:"src_iid" rdf:type `iri(?:class)` } } ) )
- signal ('22023', 'JSO_MAKE_INHERITANCE has found that the object <' || destinst || '> has wrong virtrdf:inheritFrom <' || srcinst || '> that is not an instance of type <' || class || '>');
- base_iid := "src_iid";
- baseinst := srcinst;
- }
- else if (baseinst <> srcinst)
- signal ('22023', 'JSO_MAKE_INHERITANCE has found that the object <' || destinst || '> has multiple virtrdf:inheritFrom declarations: <' || baseinst || '> and <' || srcinst || '>');
- }
- if (position (baseinst, inh_stack))
- signal ('22023', 'JSO_MAKE_INHERITANCE has found that the object <' || baseinst || '> is recursively inherited from itself');
--- This fails. !!!TBD: fix sparql2sql.c to preserve data about equalities, fixed values and globals when triples are moved from gp to gp
--- for (sparql
--- define input:storage ""
--- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
--- select ?pred
--- where {
--- graph ?:jgraph {
--- { {
--- ?destnode rdf:type `iri(?:class)` .
--- filter (?destnode = iri(?:destinst)) }
--- union
--- {
--- ?destnode rdf:type `iri(?:class)` .
--- ?destnode rdf:name `iri(?:destinst)` } } .
--- ?destnode virtrdf:noInherit ?pred .
--- } } ) do
- for (sparql
- define input:storage ""
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- select ?pred
- where {
- graph ?:jgraph {
- ?:dest_iid virtrdf:noInherit ?pred
- } } ) do
- {
- if (baseinst is null)
- signal ('22023', 'JSO_MAKE_INHERITANCE has found that the object <' || destinst || '> has set virtrdf:noInherit but has no virtrdf:inheritFrom');
- dict_put (noinherits, "pred", destinst);
- }
- if (baseinst is null)
- return;
- for (select "pred_id", "predval"
- from (sparql
- define input:storage ""
- define output:valmode "LONG"
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- select ?pred_id, ?predval
- where {
- graph ?:jgraph {
- ?:base_iid ?pred_id ?predval
- } } ) as "t00"
- where not exists (sparql
- define input:storage ""
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- ask where { graph ?:jgraph { ?:"t00"."pred_id" virtrdf:loadAs virtrdf:jsoTriple } } )
- ) do
- {
- declare "pred" any;
- "pred" := id_to_iri ("pred_id");
- if (DB.DBA.RDF_LANGUAGE_OF_LONG ("predval", null) is not null)
- signal ('22023', 'JSO_MAKE_INHERITANCE does not support language marks on objects');
- if ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type' = "pred")
- ;
- else if ('http://www.w3.org/1999/02/22-rdf-syntax-ns#name' = "pred")
- ;
- else if ('http://www.openlinksw.com/schemas/virtrdf#inheritFrom' = "pred")
- ;
- else if ('http://www.openlinksw.com/schemas/virtrdf#noInherit' = "pred")
- ;
- else if (dict_get (noinherits, "pred", baseinst) = baseinst) -- trick here, instead of (dict_get (noinherits, pred, null) is null) that does not handle inheritance of booleans properly.
- {
- jso_set (class, rootinst, "pred", __rdf_sqlval_of_obj ("predval"), isiri_id ("predval"));
- dict_put (noinherits, "pred", baseinst);
- }
- }
- DB.DBA.JSO_MAKE_INHERITANCE (jgraph, class, rootinst, baseinst, base_iid, noinherits, inh_stack);
-}
-;
-
-create function DB.DBA.JSO_LOAD_INSTANCE (in jgraph varchar, in jinst varchar, in delete_first integer, in make_new integer, in jsubj_iid iri_id := 0)
-{
- declare jinst_iid, jgraph_iid IRI_ID;
- declare jclass varchar;
- declare noinherits, inh_stack, "p" any;
- -- dbg_obj_princ ('JSO_LOAD_INSTANCE (', jgraph, ')');
- noinherits := dict_new ();
- jinst_iid := iri_ensure (jinst);
- jgraph_iid := iri_ensure (jgraph);
- if (jsubj_iid is null)
- {
- jsubj_iid := (sparql
- define input:storage ""
- define output:valmode "LONG"
- select ?s
- where { graph ?:jgraph { ?s rdf:name ?:jinst } } );
- if (jsubj_iid is null)
- jsubj_iid := jinst_iid;
- }
- jclass := (sparql
- define input:storage ""
- select ?t
- where {
- graph ?:jgraph { ?:jsubj_iid rdf:type ?t } } );
- if (jclass is null)
- {
- if (exists (sparql
- define input:storage ""
- select ?x
- where { graph ?:jgraph {
- { ?:jinst ?x ?o }
- union
- { ?x rdf:name ?ji .
- filter (str (?ji) = ?:jinst)
- } } } ) )
- signal ('22023', 'JSO_LOAD_INSTANCE can not detect the type of <' || jinst || '>');
- else
- signal ('22023', 'JSO_LOAD_INSTANCE can not find an object <' || jinst || '>');
- }
- if (delete_first)
- jso_delete (jclass, jinst, 1);
- if (make_new)
- jso_new (jclass, jinst);
- for (select "p_id", coalesce ("o2", "o1") as "o"
- from (sparql
- define input:storage ""
- define output:valmode "LONG"
- select ?p_id ?o1 ?o2
- where {
- graph ?:jgraph {
- { ?:jsubj_iid ?p_id ?o1 } optional { ?o1 rdf:name ?o2 }
- } }
- ) as "t00"
- where not exists (sparql
- define input:storage ""
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- ask where { graph ?:jgraph_iid { ?:"t00"."p_id" virtrdf:loadAs virtrdf:jsoTriple } } ) option (quietcast)
- ) do
- {
- "p" := id_to_iri ("p_id");
- if (DB.DBA.RDF_LANGUAGE_OF_LONG ("o", null) is not null)
- signal ('22023', 'JSO_LOAD_INSTANCE does not support language marks on objects');
- if ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type' = "p")
- {
- if (__rdf_sqlval_of_obj ("o") <> jclass)
- signal ('22023', 'JSO_LOAD_INSTANCE has found that the object <' || jinst || '> has multiple type declarations');
- }
- else if ('http://www.w3.org/1999/02/22-rdf-syntax-ns#name' = "p")
- ;
- else if ('http://www.openlinksw.com/schemas/virtrdf#inheritFrom' = "p")
- ;
- else if ('http://www.openlinksw.com/schemas/virtrdf#noInherit' = "p")
- ;
- else
- {
- jso_set (jclass, jinst, "p", __rdf_sqlval_of_obj ("o"), isiri_id ("o"));
- dict_put (noinherits, "p", jinst);
- }
- }
- inh_stack := vector ();
- DB.DBA.JSO_MAKE_INHERITANCE (jgraph, jclass, jinst, jinst, jsubj_iid, noinherits, inh_stack);
-}
-;
-
-create procedure DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (in jgraph varchar, out instances any)
-{
- declare md, res, st, msg any;
- st:= '00000';
- exec (
- 'select DB.DBA.VECTOR_AGG (
- vector (
- id_to_iri ("jclass"),
- id_to_iri ("jinst"),
- coalesce ("s", "jinst") ) )
- from ( sparql
- define output:valmode "LONG"
- define input:storage ""
- select ?jclass ?jinst ?s
- where {
- graph ?? {
- { ?jinst rdf:type ?jclass .
- filter (!isBLANK (?jinst)) }
- union
- { ?s rdf:type ?jclass .
- ?s rdf:name ?jinst .
- filter (isBLANK (?s))
- } } }
- ) as inst',
- st, msg, vector (jgraph), 1, md, res);
- if (st <> '00000') signal (st, msg);
- instances := res[0][0];
-}
-;
-
-create function DB.DBA.JSO_LOAD_GRAPH (in jgraph varchar, in pin_now integer := 1)
-{
- declare jgraph_iid IRI_ID;
- declare instances, chk any;
- -- dbg_obj_princ ('JSO_LOAD_GRAPH (', jgraph, ')');
- log_text ('DB.DBA.JSO_LOAD_GRAPH (?,?)', jgraph, pin_now);
- jgraph_iid := iri_ensure (jgraph);
- DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (jgraph, instances);
-/* Pass 1. Deleting all obsolete instances. */
- foreach (any j in instances) do
- jso_delete (j[0], j[1], 1);
-/* Pass 2. Creating all instances. */
- foreach (any j in instances) do
- jso_new (j[0], j[1]);
-/* Pass 3. Loading all instances, including loading inherited values. */
- foreach (any j in instances) do
- DB.DBA.JSO_LOAD_INSTANCE (jgraph, j[1], 0, 0, j[2]);
-/* Pass 4. Validation all instances. */
- foreach (any j in instances) do
- jso_validate (j[0], j[1], 1);
-/* Pass 5. Pin all instances. */
- if (pin_now)
- {
- foreach (any j in instances) do
- jso_pin (j[0], j[1]);
- }
-/* Pass 6. Load all separate triples */
- exec ('sparql
- define input:storage ""
- define sql:table-option "LOOP"
- prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>
- select (bif:jso_triple_add (?s, ?p, ?o))
- where { graph <' || id_to_iri (jgraph_iid) || '> { ?p virtrdf:loadAs virtrdf:jsoTriple . ?s ?p ?o } }');
- chk := jso_triple_get_objs (
- UNAME'http://www.openlinksw.com/schemas/virtrdf#loadAs',
- UNAME'http://www.openlinksw.com/schemas/virtrdf#loadAs' );
- if ((1 <> length (chk)) or (cast (chk[0] as varchar) <> 'http://www.openlinksw.com/schemas/virtrdf#jsoTriple'))
- signal ('22023', 'JSO_LOAD_GRAPH has not found expected metadata in the graph');
-}
-;
-
-create function DB.DBA.JSO_PIN_GRAPH (in jgraph varchar)
-{
- declare instances any;
- log_text ('DB.DBA.JSO_PIN_GRAPH (?)', jgraph);
- DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (jgraph, instances);
- foreach (any j in instances) do
- jso_pin (j[0], j[1]);
-}
-;
-
---!AWK PUBLIC
-create function DB.DBA.JSO_SYS_GRAPH () returns varchar
-{
- return 'http://www.openlinksw.com/schemas/virtrdf#';
-}
-;
-
--- same as DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH but no drop procedures
-create procedure DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO (in graphiri varchar := null)
-{
- if (graphiri is null)
- graphiri := DB.DBA.JSO_SYS_GRAPH();
- if (not exists (select 1 from SYS_KEYS where KEY_TABLE = 'DB.DBA.RDF_QUAD'))
- return;
- DB.DBA.JSO_LOAD_GRAPH (graphiri, 0);
- DB.DBA.JSO_PIN_GRAPH (graphiri);
-}
-;
-
-DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO ()
-;
-
diff --git a/libsrc/Wi/sparql_io.sql b/libsrc/Wi/sparql_io.sql
index 7c9a5f2..5392cb0 100644
--- a/libsrc/Wi/sparql_io.sql
+++ b/libsrc/Wi/sparql_io.sql
@@ -1,10 +1,10 @@
--
--- $Id: sparql_io.sql,v 1.14.2.72 2012/03/08 12:55:36 source Exp $
+-- $Id: sparql_io.sql,v 1.14.2.67 2011/10/28 13:14:20 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2011 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
@@ -449,8 +449,8 @@ create procedure DB.DBA.SPARQL_REXEC_INT (
out_fields [var_pos] := DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL_STRINGS (
var_strval, dt, lang );
else
- out_fields [var_pos] := DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (
- var_strval, dt, lang );
+ out_fields [var_pos] := DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (
+ var_strval, dt, lang );
}
else
signal ('RDFZZ', sprintf (
@@ -1384,8 +1384,6 @@ create function DB.DBA.SPARQL_RESULTS_WRITE (inout ses any, inout metas any, ino
if (status is not null)
SPARQL_WRITE_EXEC_STATUS (ses, '#%015s: %s\n', status);
}
- else if (ret_format = 'TRIG')
- DB.DBA.RDF_TRIPLES_TO_TRIG (triples, ses);
else if (ret_format = 'NT')
DB.DBA.RDF_TRIPLES_TO_NT (triples, ses);
else if (ret_format in ('JSON', 'JSON;TALIS'))
@@ -1396,16 +1394,6 @@ create function DB.DBA.SPARQL_RESULTS_WRITE (inout ses any, inout metas any, ino
DB.DBA.RDF_TRIPLES_TO_JSON (triples, ses);
else if (ret_format = 'RDFA;XHTML')
DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML (triples, ses);
- else if (ret_format = 'HTML;UL')
- {
- DB.DBA.RDF_TRIPLES_TO_HTML_UL (triples, ses);
- ret_mime := 'text/html';
- }
- else if (ret_format = 'HTML;TR')
- {
- DB.DBA.RDF_TRIPLES_TO_HTML_TR (triples, ses);
- ret_mime := 'text/html';
- }
else if (ret_format = 'HTML;MICRODATA')
{
DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (triples, ses);
@@ -1945,17 +1933,14 @@ create procedure WS.WS.SPARQL_ENDPOINT_JAVASCRIPT (in can_cxml integer, in can_q
http(' format.options[6] = new Option(\'ATOM+XML\',\'application/atom+xml\');\n');
http(' format.options[7] = new Option(\'ODATA/JSON\',\'application/odata+json\');\n');
http(' format.options[8] = new Option(\'JSON-LD\',\'application/x-json+ld\');\n');
- http(' format.options[9] = new Option(\'HTML (list)\',\'text/x-html+ul\');\n');
- http(' format.options[10] = new Option(\'HTML (table)\',\'text/x-html+tr\');\n');
- http(' format.options[11] = new Option(\'HTML+Microdata\',\'text/html\');\n');
- http(' format.options[12] = new Option(\'Microdata/JSON\',\'application/microdata+json\');\n');
- http(' format.options[13] = new Option(\'CSV\',\'text/csv\');\n');
- http(' format.options[14] = new Option(\'TriG\',\'application/x-trig\');\n');
+ http(' format.options[9] = new Option(\'HTML+Microdata\',\'text/html\');\n');
+ http(' format.options[10] = new Option(\'Microdata/JSON\',\'application/microdata+json\');\n');
+ http(' format.options[11] = new Option(\'CSV\',\'text/csv\');\n');
if (can_cxml)
{
- http(' format.options[15] = new Option(\'CXML (Pivot Collection)\',\'text/cxml\');\n');
+ http(' format.options[12] = new Option(\'CXML (Pivot Collection)\',\'text/cxml\');\n');
if (can_qrcode)
- http(' format.options[16] = new Option(\'CXML (Pivot Collection with QRcodes)\',\'text/cxml+qrcode\');\n');
+ http(' format.options[13] = new Option(\'CXML (Pivot Collection with QRcodes)\',\'text/cxml+qrcode\');\n');
}
http(' format.selectedIndex = 1;\n');
http(' last_format = 2;\n');
@@ -2043,16 +2028,16 @@ create procedure WS.WS.SPARQL_ENDPOINT_FORMAT_OPTS (in can_cxml integer, in can_
{
format := (
case lower(format)
- when 'json' then 'application/sparql-results+json'
- when 'js' then 'application/javascript'
- when 'html' then 'text/html'
- when 'sparql' then 'application/sparql-results+xml'
- when 'xml' then 'application/sparql-results+xml'
- when 'rdf' then 'application/rdf+xml'
- when 'n3' then 'text/rdf+n3'
- when 'cxml' then 'text/cxml'
- when 'cxml+qrcode' then 'text/cxml+qrcode'
- when 'csv' then 'text/csv'
+ when 'json' then 'application/sparql-results+json'
+ when 'js' then 'application/javascript'
+ when 'html' then 'text/html'
+ when 'sparql' then 'application/sparql-results+xml'
+ when 'xml' then 'application/sparql-results+xml'
+ when 'rdf' then 'application/rdf+xml'
+ when 'n3' then 'text/rdf+n3'
+ when 'cxml' then 'text/cxml'
+ when 'cxml+qrcode' then 'text/cxml+qrcode'
+ when 'csv' then 'text/csv'
when 'json-ld' then 'application/ld+json'
else format
end);
@@ -2064,45 +2049,43 @@ create procedure WS.WS.SPARQL_ENDPOINT_FORMAT_OPTS (in can_cxml integer, in can_
)
{
opts := vector (
- vector ('text/rdf+n3' , 'N3/Turtle' ),
- vector ('application/rdf+json' , 'RDF/JSON' ),
- vector ('application/rdf+xml' , 'RDF/XML' ),
- vector ('text/plain' , 'N-Triples' ),
- vector ('application/xhtml+xml' , 'XHTML+RDFa' ),
- vector ('application/atom+xml' , 'ATOM+XML' ),
- vector ('application/odata+json' , 'ODATA/JSON' ),
- vector ('application/x-json+ld' , 'JSON-LD' ),
- vector ('text/x-html+ul' , 'HTML (list)' ),
- vector ('text/x-html+tr' , 'HTML (table)' ),
- vector ('text/html' , 'HTML+Microdata' ),
- vector ('application/microdata+json' , 'Microdata/JSON' ),
- vector ('text/csv' , 'CSV' ),
- vector ('application/x-trig' , 'TriG' ) );
+ vector ('text/rdf+n3', 'N3/Turtle'),
+ vector ('application/rdf+json', 'RDF/JSON'),
+ vector ('application/rdf+xml', 'RDF/XML'),
+ vector ('text/plain', 'NTriples'),
+ vector ('application/xhtml+xml', 'XHTML+RDFa'),
+ vector ('application/atom+xml', 'ATOM+XML'),
+ vector ('application/odata+json', 'ODATA/JSON'),
+ vector ('application/ld+json', 'JSON-LD'),
+ vector ('text/html', 'HTML+Microdata'),
+ vector ('application/microdata+json', 'Microdata/JSON')
+ );
}
else
{
if (not length (format)) format := 'text/html';
opts := vector (
- vector ('auto' , 'Auto' ),
- vector ('text/html' , 'HTML' ),
- vector ('application/vnd.ms-excel' , 'Spreadsheet' ),
- vector ('application/sparql-results+xml' , 'XML' ),
- vector ('application/sparql-results+json' , 'JSON' ),
- vector ('application/javascript' , 'Javascript' ),
- vector ('text/plain' , 'NTriples' ),
- vector ('application/rdf+xml' , 'RDF/XML' ) );
+ vector ('auto', 'Auto'),
+ vector ('text/html', 'HTML'),
+ vector ('application/vnd.ms-excel', 'Spreadsheet'),
+ vector ('application/sparql-results+xml', 'XML'),
+ vector ('application/sparql-results+json', 'JSON'),
+ vector ('application/javascript', 'Javascript'),
+ vector ('text/plain', 'NTriples'),
+ vector ('application/rdf+xml', 'RDF/XML')
+ );
}
foreach (any x in opts) do
{
- http(sprintf (' <option value="%V" %s>%V</option>\n',
+ http(sprintf ('<option value="%V" %s>%V</option>\n',
x[0], case when format = x[0] then 'selected="selected"' else '' end , x[1]));
}
- http(' <option value="text/csv">CSV</option>\n');
+ http(' <option value="text/csv">CSV</option>\n');
if (can_cxml)
{
- http(' <option value="text/cxml">CXML (Pivot Collection)</option>\n');
+ http(' <option value="text/cxml">CXML (Pivot Collection)</option>\n');
if (can_qrcode)
- http(' <option value="text/cxml+qrcode">CXML (Pivot Collection with QRcode)</option>\n');
+ http(' <option value="text/cxml+qrcode">CXML (Pivot Collection with QRcode)</option>\n');
}
}
;
@@ -2196,10 +2179,10 @@ create procedure WS.WS.sparql_predefined_nsdecl ()
http (' <br />\n');
http (' <table class="tableresult" border="1">\n');
http (sprintf (' <tr><th>Prefix</th><th>URI</th></tr>\n'));
- for select NS_PREFIX, NS_URL from SYS_XML_PERSISTENT_NS_DECL order by 1 do
- {
+ for select NS_PREFIX, NS_URL from SYS_XML_PERSISTENT_NS_DECL order by 1 do
+ {
http (sprintf (' <tr><td>%V</td><td>%V</td></tr>\n', NS_PREFIX, NS_URL));
- }
+ }
http (' </table>\n');
http (' </div>\n\n');
@@ -2208,7 +2191,7 @@ create procedure WS.WS.sparql_predefined_nsdecl ()
http('</p>\n');
WS.WS.SPARQL_ENDPOINT_FOOTER();
- http('</body>\n');
+ http(' </body>\n');
http('</html>\n');
}
;
@@ -2234,10 +2217,10 @@ create procedure WS.WS.sparql_predefined_rdfinf ()
http (' <br />\n');
http (' <table class="tableresult" border="1">\n');
http (sprintf (' <tr><th>Name</th><th>URI</th></tr>\n'));
- for select * from SYS_RDF_SCHEMA order by 1 do
- {
+ for select * from SYS_RDF_SCHEMA order by 1 do
+ {
http (sprintf (' <tr><td>%V</td><td>%V</td></tr>\n', RS_NAME, RS_URI));
- }
+ }
http (' </table>\n');
http (' </div>\n\n');
@@ -2246,7 +2229,7 @@ create procedure WS.WS.sparql_predefined_rdfinf ()
http('</p>\n');
WS.WS.SPARQL_ENDPOINT_FOOTER();
- http('</body>\n');
+ http(' </body>\n');
http('</html>\n');
}
;
@@ -2284,7 +2267,7 @@ create procedure WS.WS.SPARQL_ENDPOINT_GENERATE_FORM(
if (DAV_HIDE_ERROR (DAV_SEARCH_ID (save_dir, 'C')) is null)
save_dir := null;
else
- {
+{
save_dir := save_dir || 'saved-sparql-results/';
save_dir_id := DAV_SEARCH_ID (save_dir, 'C');
if (DAV_HIDE_ERROR (save_dir_id) is null)
@@ -2418,7 +2401,6 @@ create procedure WS.WS.SPARQL_ENDPOINT_GENERATE_FORM(
}
;
-
-- Web service endpoint.
create procedure WS.WS."/!sparql/" (inout path varchar, inout params any, inout lines any)
@@ -2482,7 +2464,6 @@ create procedure WS.WS."/!sparql/" (inout path varchar, inout params any, inout
hard_timeout := atoi (coalesce (virtuoso_ini_item_value ('SPARQL', 'MaxQueryExecutionTime'), '0')) * 1000;
timeout := atoi (coalesce (virtuoso_ini_item_value ('SPARQL', 'ExecutionTimeout'), '0')) * 1000;
client_supports_partial_res := 0;
-
user_id := connection_get ('SPARQLUserId', 'SPARQL');
help_topic := get_keyword ('help', params, null);
if (help_topic is not null)
@@ -2595,7 +2576,7 @@ create procedure WS.WS."/!sparql/" (inout path varchar, inout params any, inout
WS.WS.SPARQL_ENDPOINT_GENERATE_FORM(params, ini_dflt_graph, def_qry, timeout, debug, save_mode, dav_refresh);
- return;
+ return;
}
qry_params := dict_new (7);
for (paramctr := 0; paramctr < paramcount; paramctr := paramctr + 2)
@@ -3013,10 +2994,9 @@ host_found:
}
DB.DBA.SPARQL_PROTOCOL_ERROR_REPORT (path, params, lines,
'500', 'SPARQL Request Failed',
- full_query, state, msg, format);
+ full_query, state, msg, format);
return;
}
-
write_results:
if (save_mode is not null)
{
@@ -3082,12 +3062,12 @@ write_results:
"DynaRes_INSERT_RESOURCE" (
detcol_id => save_dir_id,
fname => fname,
- owner_uid => sparql_uid,
- refresh_seconds => refresh_sec,
- ttl_seconds => ttl_sec,
- mime => accept,
- exec_stmt => 'DB.DBA.SPARQL_REFRESH_DYNARES_RESULTS (?, ?, ?, ?, ?, ?, ?)',
- exec_params => vector (full_query, qry_params, maxrows, accept, user_id, hard_timeout, jsonp_callback),
+ owner_uid => sparql_uid,
+ refresh_seconds => refresh_sec,
+ ttl_seconds => ttl_sec,
+ mime => accept,
+ exec_stmt => 'DB.DBA.SPARQL_REFRESH_DYNARES_RESULTS (?, ?, ?, ?, ?, ?, ?)',
+ exec_params => vector (full_query, qry_params, maxrows, accept, user_id, hard_timeout, jsonp_callback),
exec_uname => user_id,
content => ses
);
@@ -3102,20 +3082,20 @@ write_results:
http (' <h1 id="title">Virtuoso SPARQL Query Editor</h1>\n');
http (' </div>\n\n');
http ('<h3>Saved to DAV</h3>');
- http ('<p>The SPARQL result is successfully saved in DAV storage as <a href="');
- http_value (full_uri);
- http ('">');
- http_value (full_uri);
- http ('</a></p>');
- if (refresh_sec is not null)
- http (sprintf ('<p>The content of the linked resource will be re-calculated on demand, and the result will be cached for %d minutes.</p>', refresh_sec/60));
- if (ttl_sec is not null)
- http (sprintf ('<p>The link will stay valid for %d days. To preserve the referenced document for future use, copy it to some other location before expiration.</p>', ttl_sec/(60*60*24)));
- if (accept <> 'text/html')
- http (sprintf ('<p>The resource MIME type is "%s". This type will be reported to the browser when you click on the link.
+ http ('<p>The SPARQL result is successfully saved in DAV storage as <a href="');
+ http_value (full_uri);
+ http ('">');
+ http_value (full_uri);
+ http ('</a></p>');
+ if (refresh_sec is not null)
+ http (sprintf ('<p>The content of the linked resource will be re-calculated on demand, and the result will be cached for %d minutes.</p>', refresh_sec/60));
+ if (ttl_sec is not null)
+ http (sprintf ('<p>The link will stay valid for %d days. To preserve the referenced document for future use, copy it to some other location before expiration.</p>', ttl_sec/(60*60*24)));
+ if (accept <> 'text/html')
+ http (sprintf ('<p>The resource MIME type is "%s". This type will be reported to the browser when you click on the link.
If the browser is unable to open the link itself it can prompt for action like launching an additional program.
The program may let you edit the loaded resource, in this case save the changed version should be saved to a different place, so use "Save As" command, not plain "Save".</p>', accept));
- http ('</body></html>');
+ http ('</body></html>');
}
}
else
@@ -3369,36 +3349,36 @@ good_host_found:
WS.WS.SPARQL_ENDPOINT_HTML_DOCTYPE();
- http('<head>\n');
+ http(' <head>\n');
WS.WS.SPARQL_ENDPOINT_HTML_HEAD('Virtuoso SPARQL 1.1 Uniform RDF Graph Query Form');
WS.WS.SPARQL_ENDPOINT_STYLE ();
- http('</head>\n');
+ http(' </head>\n');
- http('<body>\n');
- http(' <div id="header">\n');
- http(' <h1>Virtuoso SPARQL 1.1 Uniform RDF Graph Query Form</h1>\n');
+ http(' <body>\n');
+ http(' <div id="header">\n');
+ http(' <h1>Virtuoso SPARQL 1.1 Uniform RDF Graph Query Form</h1>\n');
http(' </div>\n\n');
http(' <div id="intro">\n');
- http(' <p>This page is designed to help you test support for <a href="http://www.w3.org/TR/sparql11-http-rdf-update">SPARQL 1.1 Graph Store HTTP Protocol</a> in OpenLink Virtuoso.</p>\n');
+ http(' <p>This page is designed to help you test support for <a href="http://www.w3.org/TR/sparql11-http-rdf-update">SPARQL 1.1 Graph Store HTTP Protocol</a> in OpenLink Virtuoso.</p>\n');
http(' </div>\n\n');
http(' <div id="main">\n');
http(' <form action="" method="post" enctype="multipart/form-data">\n');
- http(' <fieldset>\n');
- http(' <label for="graph-uri">Graph URI</label>\n');
- http(' <br />\n');
- http(' <input type="text" name="graph-uri" id="graph-uri" ');
+ http(' <fieldset>\n');
+ http(' <label for="graph-uri">Graph URI</label>\n');
+ http(' <br />\n');
+ http(' <input type="text" name="graph-uri" id="graph-uri" ');
http(sprintf ('value="%s" size="80"/>\n', coalesce ('')));
- http(' <br /><br />\n');
- http(' <label for="res-file">File to upload</label>\n');
- http(' <br />\n');
+ http(' <br /><br />\n');
+ http(' <label for="res-file">File to upload</label>\n');
+ http(' <br />\n');
http(' <input type="file" name="res-file" id="res-file"/>\n');
- http(' <br /><br />\n');
- http(' <input type="submit" value="Upload the resource"/>');
- http(' </fieldset>\n');
- http(' </form>\n');
+ http(' <br /><br />\n');
+ http('<input type="submit" value="Upload the resource"/>');
+ http(' </fieldset>\n');
+ http(' </form>\n');
http(' </div>\n\n');
WS.WS.SPARQL_ENDPOINT_FOOTER();
- http('</body>\n');
+ http(' </body>\n');
http('</html>\n');
return;
graph_processing:
@@ -3622,8 +3602,6 @@ create procedure DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV (
DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT (triples, 1, out_ses);
else if (('text/rdf+n3' = mime) or ('text/rdf+ttl' = mime) or ('text/rdf+turtle' = mime) or ('text/turtle' = mime) or ('text/n3' = mime))
DB.DBA.RDF_TRIPLES_TO_TTL (triples, out_ses);
- else if ('application/x-trig' = mime)
- DB.DBA.RDF_TRIPLES_TO_TRIG (triples, out_ses);
else if ('text/plain' = mime)
DB.DBA.RDF_TRIPLES_TO_NT (triples, out_ses);
else if (('application/json' = mime) or ('application/rdf+json' = mime) or ('application/x-rdf+json' = mime))
@@ -3698,7 +3676,6 @@ DB.DBA.http_rq_file_handler (in content any, in params any, in lines any, inout
strcasestr (accept, 'text/rdf+ttl') is not null or
strcasestr (accept, 'text/rdf+turtle') is not null or
strcasestr (accept, 'text/turtle') is not null or
- strcasestr (accept, 'application/x-trig') is not null or
strcasestr (accept, 'application/rdf+xml') is not null or
strcasestr (accept, 'application/javascript') is not null or
strcasestr (accept, 'application/soap+xml') is not null or
diff --git a/libsrc/Wi/sparql_l.c b/libsrc/Wi/sparql_l.c
index 461d112..9a79dd9 100644
--- a/libsrc/Wi/sparql_l.c
+++ b/libsrc/Wi/sparql_l.c
@@ -380,8 +380,8 @@ static void yy_fatal_error (yyconst char msg[] );
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 103
-#define YY_END_OF_BUFFER 104
+#define YY_NUM_RULES 230
+#define YY_END_OF_BUFFER 231
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -389,45 +389,107 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[335] =
+static yyconst flex_int16_t yy_accept[895] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 104, 103, 102, 94,
- 92, 92, 3, 57, 93, 102, 102, 56, 22, 23,
- 19, 15, 6, 13, 7, 18, 40, 30, 17, 12,
- 8, 10, 102, 36, 26, 27, 102, 36, 2, 21,
- 24, 102, 25, 102, 62, 60, 60, 58, 64, 63,
- 61, 61, 59, 65, 50, 48, 48, 54, 52, 51,
- 49, 49, 55, 53, 99, 94, 92, 93, 66, 99,
- 101, 94, 92, 74, 93, 73, 70, 69, 100, 94,
-
- 92, 93, 100, 75, 75, 75, 85, 83, 78, 79,
- 82, 103, 76, 77, 98, 98, 98, 98, 91, 87,
- 87, 86, 103, 94, 92, 14, 0, 0, 43, 93,
- 92, 92, 32, 0, 34, 1, 0, 43, 20, 16,
- 41, 41, 40, 0, 29, 0, 11, 28, 9, 35,
- 0, 0, 36, 30, 5, 0, 36, 0, 4, 0,
- 62, 0, 60, 0, 0, 63, 0, 61, 0, 0,
- 50, 0, 0, 48, 48, 48, 0, 0, 0, 51,
- 0, 0, 49, 49, 49, 0, 0, 0, 0, 0,
- 0, 68, 75, 75, 85, 81, 95, 98, 0, 97,
-
- 96, 91, 87, 90, 89, 88, 88, 43, 43, 45,
- 92, 32, 0, 0, 33, 33, 44, 41, 0, 42,
- 29, 0, 0, 0, 0, 37, 0, 37, 31, 0,
- 0, 0, 0, 0, 46, 0, 0, 0, 47, 0,
- 0, 0, 72, 71, 84, 81, 80, 80, 90, 89,
- 88, 88, 88, 0, 33, 0, 33, 33, 0, 33,
- 0, 33, 35, 0, 37, 0, 38, 37, 38, 37,
- 31, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 80, 80, 0, 33, 33, 0, 33, 0, 0,
- 38, 0, 38, 0, 38, 0, 0, 0, 0, 0,
-
- 0, 0, 0, 0, 0, 33, 33, 0, 39, 39,
- 0, 0, 0, 0, 0, 0, 39, 39, 39, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 67, 0,
- 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 231, 230, 229, 221,
+ 219, 219, 3, 184, 220, 229, 229, 183, 146, 147,
+ 19, 15, 6, 13, 7, 18, 167, 154, 17, 12,
+ 8, 10, 229, 229, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 150, 151, 229, 163,
+ 2, 21, 148, 229, 149, 229, 189, 187, 187, 185,
+ 191, 190, 188, 188, 186, 192, 177, 175, 175, 181,
+
+ 179, 178, 176, 176, 182, 180, 226, 221, 219, 220,
+ 193, 226, 228, 221, 219, 201, 220, 200, 197, 196,
+ 227, 221, 219, 220, 227, 202, 202, 202, 212, 210,
+ 205, 206, 209, 230, 203, 204, 225, 225, 225, 225,
+ 218, 214, 214, 213, 230, 221, 219, 14, 0, 0,
+ 170, 220, 219, 219, 157, 0, 161, 1, 0, 170,
+ 20, 16, 168, 168, 167, 0, 153, 0, 11, 152,
+ 9, 156, 0, 160, 162, 0, 0, 163, 154, 163,
+ 163, 23, 163, 163, 163, 163, 31, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+
+ 163, 163, 57, 59, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 88, 163, 145,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+ 5, 0, 163, 0, 4, 0, 189, 0, 187, 0,
+ 0, 190, 0, 188, 0, 0, 177, 0, 0, 175,
+ 175, 175, 0, 0, 0, 178, 0, 0, 176, 176,
+ 176, 0, 0, 0, 0, 0, 0, 195, 202, 202,
+ 212, 208, 222, 225, 0, 224, 223, 218, 214, 217,
+ 216, 215, 215, 170, 170, 172, 219, 157, 0, 0,
+
+ 159, 159, 171, 168, 0, 169, 153, 0, 156, 0,
+ 0, 158, 158, 0, 0, 0, 164, 163, 144, 24,
+ 25, 26, 163, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 58,
+ 163, 163, 163, 163, 64, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 77, 78, 79, 163,
+ 163, 83, 84, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 113, 163, 116, 163, 163, 163, 163, 163,
+
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 139, 0, 164, 155, 0, 0, 0,
+ 0, 0, 173, 0, 0, 0, 174, 0, 0, 0,
+ 199, 198, 211, 208, 207, 207, 217, 216, 215, 215,
+ 215, 0, 159, 0, 159, 159, 0, 159, 0, 159,
+ 0, 158, 0, 158, 158, 0, 158, 0, 158, 162,
+ 0, 164, 0, 165, 164, 163, 27, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 38, 163, 163, 163,
+ 163, 44, 163, 47, 163, 163, 163, 163, 52, 163,
+ 163, 163, 163, 163, 163, 163, 163, 63, 163, 163,
+
+ 163, 163, 163, 70, 72, 163, 163, 75, 76, 163,
+ 163, 163, 0, 86, 163, 163, 163, 163, 163, 163,
+ 163, 96, 163, 163, 163, 163, 163, 163, 163, 163,
+ 111, 163, 163, 163, 163, 163, 163, 138, 163, 133,
+ 163, 163, 163, 163, 163, 124, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 137, 165, 164, 155,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 207, 207, 0, 159, 159, 0, 159, 0, 0, 158,
+ 158, 0, 158, 0, 0, 165, 0, 165, 22, 163,
+ 163, 30, 32, 33, 163, 163, 36, 163, 163, 163,
+
+ 163, 163, 43, 163, 163, 163, 163, 50, 163, 163,
+ 54, 55, 163, 163, 60, 163, 163, 163, 66, 163,
+ 68, 69, 163, 73, 163, 80, 163, 82, 0, 163,
+ 163, 163, 163, 93, 163, 163, 163, 97, 163, 163,
+ 163, 100, 163, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 125, 126,
+ 163, 127, 163, 163, 163, 135, 136, 141, 0, 165,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 159, 159, 0, 158, 158, 0, 166, 163, 163, 163,
+ 163, 37, 163, 163, 41, 42, 163, 163, 163, 49,
+
+ 51, 163, 56, 163, 163, 62, 163, 163, 163, 163,
+ 81, 0, 87, 163, 90, 92, 163, 95, 163, 163,
+ 163, 163, 163, 108, 163, 110, 143, 163, 163, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 131, 163, 166, 0, 0, 0, 0, 0,
+ 0, 166, 166, 163, 163, 163, 163, 163, 40, 163,
+ 163, 163, 163, 163, 163, 65, 163, 163, 74, 0,
+ 89, 163, 163, 98, 99, 163, 102, 163, 109, 163,
+ 112, 163, 115, 163, 163, 163, 163, 163, 163, 163,
+ 163, 163, 163, 163, 134, 166, 0, 0, 0, 0,
+
+ 0, 163, 28, 34, 163, 39, 45, 46, 163, 53,
+ 163, 163, 163, 163, 85, 91, 163, 107, 163, 163,
+ 142, 114, 163, 163, 163, 163, 163, 163, 122, 163,
+ 163, 163, 163, 0, 0, 0, 0, 194, 29, 35,
+ 48, 163, 61, 67, 163, 94, 103, 104, 105, 163,
+ 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+ 0, 0, 0, 0, 140, 163, 163, 163, 163, 132,
+ 163, 163, 120, 121, 123, 163, 129, 163, 71, 106,
+ 101, 163, 163, 119, 128, 163, 117, 163, 163, 118,
+ 163, 163, 130, 0
+
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -438,376 +500,1127 @@ static yyconst flex_int32_t yy_ec[256] =
1, 2, 5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 20, 20,
20, 20, 20, 20, 20, 20, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 28,
- 33, 33, 34, 33, 33, 33, 33, 35, 33, 33,
- 33, 33, 36, 37, 38, 33, 33, 33, 39, 33,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-
- 50, 51, 52, 52, 53, 52, 52, 52, 52, 54,
- 52, 52, 52, 55, 56, 57, 58, 55, 52, 52,
- 59, 52, 60, 61, 62, 9, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 9
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 9, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 9
} ;
-static yyconst flex_int32_t yy_meta[64] =
+static yyconst flex_int32_t yy_meta[90] =
{ 0,
1, 1, 2, 3, 4, 5, 4, 4, 4, 4,
6, 7, 7, 4, 4, 4, 8, 9, 10, 11,
12, 4, 1, 4, 4, 13, 4, 14, 14, 14,
- 14, 14, 15, 15, 15, 15, 15, 16, 15, 4,
- 17, 4, 1, 18, 1, 19, 19, 14, 14, 14,
- 19, 15, 15, 16, 16, 15, 16, 16, 15, 20,
- 1, 20, 21
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 4, 15, 4, 1, 16, 1, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 17, 1, 17, 18
} ;
-static yyconst flex_int16_t yy_base[459] =
+static yyconst flex_int16_t yy_base[1005] =
{ 0,
- 0, 0, 0, 0, 61, 63, 65, 72, 76, 78,
- 80, 87, 93, 108, 123, 134, 145, 151, 196, 256,
- 95, 104, 140, 156, 0, 0, 1019, 1955, 1955, 1016,
- 1013, 1008, 983, 88, 128, 135, 996, 994, 1955, 1955,
- 979, 977, 1955, 1955, 981, 1955, 145, 0, 1955, 144,
- 1955, 955, 0, 154, 1955, 1955, 935, 52, 1955, 161,
- 1955, 914, 1955, 67, 930, 966, 966, 1955, 112, 927,
- 962, 962, 1955, 126, 92, 939, 939, 182, 138, 160,
- 935, 932, 184, 153, 1955, 932, 930, 200, 1955, 176,
- 1955, 930, 927, 923, 202, 898, 1955, 1955, 1955, 905,
-
- 903, 215, 173, 0, 899, 896, 0, 1955, 1955, 1955,
- 881, 883, 1955, 1955, 882, 1955, 202, 880, 0, 889,
- 871, 860, 223, 868, 1955, 1955, 216, 861, 222, 227,
- 860, 230, 0, 313, 1955, 1955, 849, 846, 1955, 1955,
- 215, 216, 221, 229, 834, 823, 820, 1955, 1955, 825,
- 224, 237, 259, 0, 1955, 232, 243, 0, 1955, 260,
- 798, 214, 1955, 0, 0, 794, 225, 1955, 0, 0,
- 263, 268, 232, 1955, 828, 825, 282, 0, 0, 276,
- 283, 249, 1955, 803, 801, 288, 0, 0, 252, 795,
- 786, 1955, 0, 0, 790, 292, 1955, 776, 761, 1955,
-
- 1955, 0, 1955, 0, 0, 767, 736, 706, 1955, 1955,
- 486, 0, 483, 231, 355, 394, 1955, 278, 468, 467,
- 468, 467, 0, 474, 295, 314, 472, 455, 454, 0,
- 0, 0, 0, 427, 1955, 0, 0, 415, 1955, 0,
- 0, 268, 1955, 1955, 1955, 299, 451, 317, 0, 0,
- 445, 439, 437, 415, 401, 412, 378, 0, 389, 0,
- 360, 0, 363, 373, 360, 368, 319, 379, 337, 336,
- 335, 321, 0, 0, 0, 0, 0, 0, 0, 0,
- 277, 1955, 323, 293, 1955, 0, 291, 0, 95, 278,
- 196, 428, 399, 183, 155, 0, 0, 0, 0, 0,
-
- 0, 0, 0, 279, 156, 1955, 0, 116, 418, 0,
- 0, 0, 0, 0, 308, 71, 1955, 420, 0, 0,
- 0, 0, 0, 269, 0, 0, 0, 0, 1955, 0,
- 0, 0, 0, 1955, 491, 512, 533, 554, 575, 596,
- 617, 638, 659, 680, 701, 722, 743, 754, 773, 784,
- 802, 810, 822, 835, 847, 868, 885, 904, 921, 940,
- 957, 976, 993, 1012, 1033, 1054, 1075, 1096, 1117, 1128,
- 1142, 1159, 1176, 1185, 433, 439, 440, 446, 1206, 1223,
- 450, 452, 1242, 1259, 456, 463, 1278, 1299, 1320, 1341,
- 1362, 1383, 1404, 1425, 1446, 1457, 1478, 1495, 1507, 1518,
-
- 1537, 1554, 1568, 1585, 1596, 1608, 465, 808, 881, 917,
- 1629, 953, 989, 1650, 1165, 1219, 1671, 1682, 1697, 1716,
- 1730, 1743, 1255, 1493, 1516, 1574, 1583, 1695, 1736, 1749,
- 1768, 1779, 1794, 1809, 1826, 1815, 1824, 1835, 1836, 1837,
- 1846, 1847, 1848, 1867, 1881, 1892, 1890, 1901, 1902, 1903,
- 1912, 1913, 1914, 1923, 1924, 1925, 1934, 1935
+ 0, 0, 0, 0, 87, 89, 91, 98, 102, 104,
+ 106, 113, 118, 124, 160, 171, 131, 182, 187, 204,
+ 137, 199, 216, 221, 0, 0, 978, 7631, 7631, 968,
+ 965, 954, 927, 133, 120, 122, 940, 938, 7631, 7631,
+ 923, 921, 7631, 7631, 920, 7631, 177, 0, 7631, 145,
+ 7631, 912, 124, 0, 213, 227, 243, 291, 221, 290,
+ 260, 312, 385, 232, 311, 324, 345, 394, 344, 417,
+ 424, 486, 408, 463, 307, 472, 7631, 7631, 875, 78,
+ 7631, 478, 7631, 843, 7631, 93, 865, 915, 913, 7631,
+ 520, 855, 905, 905, 7631, 529, 92, 902, 900, 225,
+
+ 563, 146, 893, 891, 293, 572, 7631, 888, 886, 176,
+ 7631, 158, 7631, 880, 877, 868, 262, 861, 7631, 7631,
+ 7631, 863, 860, 264, 153, 0, 858, 855, 0, 7631,
+ 7631, 7631, 837, 834, 7631, 7631, 828, 7631, 221, 826,
+ 0, 829, 829, 817, 303, 824, 7631, 7631, 208, 781,
+ 170, 341, 781, 353, 0, 648, 7631, 7631, 773, 772,
+ 7631, 7631, 314, 368, 459, 283, 764, 730, 729, 7631,
+ 7631, 0, 728, 7631, 736, 111, 650, 365, 0, 797,
+ 484, 799, 804, 570, 806, 586, 443, 813, 818, 832,
+ 834, 866, 839, 850, 897, 883, 908, 924, 917, 935,
+
+ 490, 943, 950, 970, 963, 1043, 997, 1029, 1023, 1079,
+ 1036, 1005, 1063, 1089, 1045, 1098, 1121, 1123, 1129, 1146,
+ 1153, 1163, 1180, 1165, 1182, 1208, 1223, 1215, 1243, 1213,
+ 1249, 1255, 1275, 1301, 1361, 1306, 1316, 1322, 1330, 1339,
+ 7631, 252, 734, 0, 7631, 373, 695, 1393, 7631, 1431,
+ 1447, 691, 1475, 7631, 1513, 1529, 388, 396, 1557, 7631,
+ 741, 741, 610, 1595, 1611, 309, 335, 1639, 7631, 738,
+ 738, 443, 1677, 1693, 205, 734, 727, 7631, 0, 0,
+ 731, 406, 7631, 722, 721, 7631, 7631, 0, 7631, 0,
+ 0, 703, 702, 686, 7631, 7631, 699, 0, 696, 227,
+
+ 1741, 1806, 7631, 566, 653, 644, 645, 644, 0, 649,
+ 408, 1842, 1907, 0, 644, 654, 730, 1348, 1072, 1282,
+ 1290, 1355, 1425, 1483, 1507, 1562, 1671, 1592, 1590, 1944,
+ 1580, 1946, 1951, 1959, 1964, 1980, 1987, 1971, 1982, 1992,
+ 2020, 2034, 2025, 1396, 2044, 2065, 1647, 2067, 2072, 1499,
+ 2078, 2084, 2100, 2003, 1645, 2107, 2113, 2126, 2120, 2142,
+ 2132, 2153, 2159, 2165, 2182, 2193, 1711, 1812, 2187, 2205,
+ 2215, 1913, 2222, 2235, 2243, 2241, 2248, 2271, 2260, 2278,
+ 2296, 2310, 2322, 2329, 2335, 2337, 2347, 2345, 2361, 2369,
+ 2354, 2371, 2386, 2402, 2404, 2424, 2435, 2444, 2451, 2459,
+
+ 2469, 2471, 2482, 2480, 2502, 2489, 2508, 2547, 2524, 2534,
+ 2562, 2556, 2572, 2578, 640, 623, 621, 2624, 2640, 2646,
+ 2662, 583, 7631, 2700, 2714, 580, 7631, 2720, 2738, 373,
+ 7631, 7631, 7631, 483, 627, 517, 0, 0, 0, 0,
+ 0, 616, 601, 611, 592, 0, 599, 574, 561, 2786,
+ 570, 554, 552, 535, 0, 547, 527, 521, 2822, 512,
+ 497, 482, 486, 2594, 2607, 2859, 2625, 2861, 2720, 2866,
+ 2868, 2875, 2877, 2884, 2890, 2895, 2904, 2882, 2917, 2960,
+ 2926, 2968, 2978, 2698, 2980, 2987, 2999, 3001, 2700, 3006,
+ 3008, 3019, 3030, 3037, 3056, 3061, 3075, 2828, 3081, 3093,
+
+ 3083, 3100, 3106, 3114, 3119, 3126, 3139, 3150, 3158, 3160,
+ 3176, 3170, 492, 3181, 3193, 3201, 3203, 3209, 3219, 3227,
+ 3235, 3225, 3251, 3256, 3267, 3276, 3283, 3288, 3310, 3308,
+ 3315, 3336, 3320, 3341, 3343, 3353, 3358, 3366, 3374, 3385,
+ 3394, 3416, 3410, 3418, 3427, 3432, 3458, 3449, 3460, 3467,
+ 3485, 3480, 3502, 3507, 3474, 3513, 3515, 457, 439, 406,
+ 404, 3555, 3577, 3593, 3615, 3631, 3653, 3669, 3691, 442,
+ 7631, 413, 398, 7631, 0, 371, 0, 268, 363, 7631,
+ 0, 325, 0, 461, 307, 275, 956, 3540, 3547, 3688,
+ 3686, 3577, 3582, 3651, 3720, 3725, 3727, 3740, 3747, 3761,
+
+ 3763, 3769, 3771, 3776, 3789, 3801, 3803, 3817, 3822, 3836,
+ 3824, 3838, 3852, 3866, 3859, 3876, 3898, 3903, 3905, 3911,
+ 3918, 3929, 3935, 3940, 3950, 3952, 3962, 3964, 518, 3980,
+ 3972, 3985, 3987, 3994, 4004, 3999, 4026, 4019, 4031, 4060,
+ 4068, 4077, 4050, 4082, 4084, 4089, 4101, 4096, 4119, 4124,
+ 4134, 4151, 4143, 4163, 4179, 4181, 4188, 4194, 4186, 4199,
+ 4207, 4212, 4226, 4224, 4238, 4243, 4255, 4268, 250, 204,
+ 4277, 4323, 4330, 4344, 4369, 4383, 4390, 4407, 523, 190,
+ 7631, 0, 159, 7631, 0, 152, 4277, 4439, 4407, 4444,
+ 4460, 4307, 4462, 4467, 4328, 4469, 4474, 4480, 4494, 4499,
+
+ 4501, 4506, 4508, 4526, 4536, 4543, 4549, 4554, 4561, 4568,
+ 4575, 573, 4583, 4585, 4593, 4600, 4605, 4624, 4635, 4637,
+ 4650, 4658, 4652, 4660, 4667, 4669, 4675, 4684, 4689, 4691,
+ 4725, 4717, 4734, 4701, 4727, 4749, 4765, 4758, 4779, 4790,
+ 4803, 4808, 4699, 4810, 0, 4873, 4880, 4887, 4894, 595,
+ 148, 7631, 4839, 4943, 4945, 4950, 4956, 4958, 4841, 4963,
+ 4979, 4981, 4971, 4988, 4986, 4864, 5025, 5019, 5033, 586,
+ 5046, 5048, 5055, 5061, 5071, 5073, 5078, 5080, 5086, 5088,
+ 5094, 5100, 5106, 5111, 5134, 5147, 5140, 5164, 5173, 5180,
+ 5121, 5186, 5196, 5203, 5213, 0, 5248, 5266, 5286, 5304,
+
+ 582, 5266, 5233, 5253, 5323, 5272, 5283, 5335, 5341, 5357,
+ 5359, 5364, 5369, 5371, 7631, 5376, 5383, 5392, 5399, 5404,
+ 5414, 5416, 5433, 5438, 5446, 5461, 5468, 5473, 5478, 5489,
+ 5497, 5507, 5520, 5552, 5559, 5573, 5598, 7631, 5543, 5552,
+ 5590, 5622, 5627, 5629, 5634, 5647, 5652, 5654, 5659, 5665,
+ 5670, 5675, 5682, 5687, 5704, 5692, 5714, 5745, 5728, 5751,
+ 5758, 5782, 5796, 5821, 5778, 5818, 5845, 5851, 5853, 5858,
+ 5871, 5873, 5882, 5884, 5892, 5899, 5904, 5911, 5918, 5920,
+ 5931, 5933, 5940, 5938, 5946, 5966, 5968, 5974, 5980, 5995,
+ 5997, 6007, 6013, 7631, 6102, 6120, 6138, 6156, 6174, 6192,
+
+ 6210, 6228, 6246, 6264, 6282, 6300, 6318, 6326, 6342, 6350,
+ 6365, 6373, 104, 6382, 6392, 6401, 6419, 6437, 6455, 6473,
+ 6491, 6509, 6527, 6545, 6563, 6581, 6599, 6607, 6625, 6636,
+ 6651, 6659, 529, 6673, 6684, 6692, 6706, 6714, 6720, 6738,
+ 6756, 6774, 6792, 6810, 6828, 6846, 6864, 6882, 6900, 6918,
+ 6936, 6954, 6962, 6980, 6994, 7003, 7011, 7029, 7043, 459,
+ 7059, 7073, 7084, 7095, 7109, 7117, 7126, 7144, 7162, 7180,
+ 7198, 7216, 7234, 7252, 7270, 7288, 7296, 7308, 7316, 7332,
+ 7350, 7358, 7370, 7378, 7387, 7401, 7419, 7430, 7441, 7452,
+ 7462, 7470, 7479, 7497, 7505, 7517, 7533, 7541, 7553, 7565,
+
+ 7579, 7595, 7606, 7614
} ;
-static yyconst flex_int16_t yy_def[459] =
+static yyconst flex_int16_t yy_def[1005] =
{ 0,
- 335, 335, 334, 3, 336, 336, 337, 337, 338, 338,
- 339, 339, 340, 340, 341, 341, 342, 342, 343, 343,
- 344, 344, 345, 345, 335, 335, 334, 334, 334, 334,
- 334, 334, 334, 346, 347, 348, 334, 349, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 350, 334, 351,
- 334, 334, 352, 353, 334, 334, 334, 354, 334, 353,
- 334, 334, 334, 355, 356, 334, 334, 334, 357, 358,
- 334, 334, 334, 359, 360, 334, 334, 360, 361, 362,
- 334, 334, 362, 363, 334, 334, 334, 347, 334, 334,
- 334, 334, 334, 334, 347, 334, 334, 334, 334, 334,
-
- 334, 347, 334, 364, 364, 364, 365, 334, 334, 334,
- 334, 334, 334, 334, 366, 334, 366, 334, 367, 334,
- 334, 334, 368, 334, 334, 334, 346, 369, 334, 347,
- 334, 347, 370, 334, 334, 334, 349, 334, 334, 334,
- 334, 334, 334, 334, 371, 351, 351, 334, 334, 352,
- 355, 372, 353, 350, 334, 373, 354, 374, 334, 355,
- 356, 357, 334, 375, 376, 358, 359, 334, 377, 378,
- 379, 379, 380, 334, 334, 334, 379, 381, 382, 383,
- 383, 384, 334, 334, 334, 383, 385, 386, 334, 334,
- 334, 334, 387, 387, 388, 389, 334, 390, 390, 334,
-
- 334, 391, 334, 392, 393, 394, 395, 334, 334, 334,
- 334, 396, 397, 398, 334, 215, 334, 334, 334, 334,
- 399, 399, 400, 401, 402, 403, 404, 405, 406, 407,
- 408, 409, 410, 411, 334, 412, 413, 414, 334, 415,
- 416, 334, 334, 334, 334, 389, 334, 389, 392, 393,
- 394, 394, 395, 397, 334, 417, 334, 418, 419, 216,
- 334, 215, 400, 401, 334, 420, 421, 403, 422, 405,
- 406, 406, 423, 424, 425, 426, 427, 428, 429, 430,
- 334, 334, 334, 417, 334, 418, 431, 432, 433, 420,
- 334, 434, 421, 435, 422, 436, 437, 438, 439, 440,
-
- 441, 442, 443, 334, 431, 334, 432, 444, 445, 446,
- 447, 448, 449, 450, 334, 444, 334, 445, 446, 451,
- 452, 453, 454, 334, 455, 456, 457, 458, 334, 437,
- 439, 441, 443, 0, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334
+ 895, 895, 894, 3, 896, 896, 897, 897, 898, 898,
+ 899, 899, 900, 900, 901, 901, 902, 902, 903, 903,
+ 904, 904, 905, 905, 895, 895, 894, 894, 894, 894,
+ 894, 894, 894, 906, 907, 908, 894, 909, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 910, 894, 911,
+ 894, 894, 912, 913, 914, 914, 914, 914, 914, 58,
+ 914, 914, 914, 914, 56, 56, 56, 914, 914, 914,
+ 914, 56, 58, 914, 914, 914, 894, 894, 894, 915,
+ 894, 914, 894, 894, 894, 916, 917, 894, 894, 894,
+ 894, 918, 894, 894, 894, 894, 919, 894, 894, 919,
+
+ 894, 920, 894, 894, 920, 894, 894, 894, 894, 907,
+ 894, 894, 894, 894, 894, 894, 907, 894, 894, 894,
+ 894, 894, 894, 907, 894, 921, 921, 921, 922, 894,
+ 894, 894, 894, 894, 894, 894, 923, 894, 923, 894,
+ 924, 894, 894, 894, 925, 894, 894, 894, 926, 927,
+ 894, 907, 894, 907, 928, 894, 894, 894, 929, 894,
+ 894, 894, 894, 894, 894, 894, 930, 931, 931, 894,
+ 894, 932, 894, 894, 933, 916, 934, 935, 936, 935,
+ 935, 935, 935, 935, 935, 935, 935, 935, 935, 935,
+ 935, 935, 935, 935, 935, 935, 935, 935, 935, 935,
+
+ 935, 935, 935, 935, 935, 935, 935, 935, 935, 935,
+ 935, 935, 935, 935, 935, 935, 935, 935, 935, 935,
+ 935, 935, 935, 935, 935, 935, 935, 935, 935, 935,
+ 935, 935, 935, 935, 204, 935, 935, 935, 935, 935,
+ 894, 937, 938, 939, 894, 916, 940, 894, 894, 894,
+ 894, 941, 894, 894, 894, 894, 942, 942, 894, 894,
+ 894, 894, 942, 894, 894, 943, 943, 894, 894, 894,
+ 894, 943, 894, 894, 894, 894, 894, 894, 944, 944,
+ 945, 946, 894, 947, 947, 894, 894, 948, 894, 949,
+ 950, 951, 952, 894, 894, 894, 894, 953, 954, 955,
+
+ 894, 301, 894, 894, 894, 894, 956, 956, 957, 958,
+ 959, 894, 312, 960, 961, 962, 963, 964, 964, 964,
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+
+ 964, 964, 964, 964, 964, 964, 964, 964, 964, 964,
+ 964, 964, 964, 964, 965, 966, 967, 894, 894, 894,
+ 894, 968, 894, 894, 894, 969, 894, 894, 894, 894,
+ 894, 894, 894, 970, 894, 970, 971, 972, 973, 973,
+ 974, 975, 894, 976, 894, 977, 978, 979, 894, 979,
+ 980, 894, 981, 894, 982, 983, 984, 894, 984, 985,
+ 986, 894, 987, 988, 989, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 894, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 991, 992, 993,
+ 993, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 976, 894, 977, 994, 995, 996, 981, 894,
+ 982, 997, 998, 999, 987, 894, 1000, 988, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 894, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 1001, 991,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 994,
+ 894, 995, 997, 894, 998, 1002, 1003, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 894, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 1004, 894, 894, 894, 894, 894,
+ 1002, 894, 1003, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 894,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 1004, 894, 894, 894, 894,
+
+ 894, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 894, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 894, 894, 894, 894, 894, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 894, 894, 894, 894, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
+ 990, 990, 990, 0, 894, 894, 894, 894, 894, 894,
+
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+
+ 894, 894, 894, 894
} ;
-static yyconst flex_int16_t yy_nxt[2019] =
+static yyconst flex_int16_t yy_nxt[7721] =
{ 0,
29, 30, 31, 32, 33, 34, 35, 36, 29, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 36, 53, 54, 54, 54,
- 54, 54, 54, 54, 54, 54, 54, 54, 54, 55,
- 29, 56, 57, 58, 59, 60, 54, 54, 54, 54,
- 54, 54, 54, 54, 54, 54, 54, 54, 54, 61,
- 62, 63, 64, 66, 67, 66, 67, 71, 72, 156,
- 73, 68, 158, 68, 71, 72, 317, 73, 76, 77,
- 76, 77, 81, 82, 160, 83, 78, 154, 78, 81,
- 82, 128, 83, 129, 86, 31, 87, 28, 116, 88,
-
- 213, 69, 172, 69, 89, 74, 28, 116, 117, 86,
- 31, 87, 74, 118, 88, 214, 79, 117, 79, 89,
- 84, 317, 118, 90, 92, 31, 93, 84, 94, 95,
- 131, 132, 173, 96, 97, 92, 31, 93, 90, 94,
- 95, 90, 120, 121, 96, 97, 100, 31, 101, 164,
- 122, 102, 100, 31, 101, 134, 90, 102, 120, 121,
- 135, 306, 142, 169, 143, 181, 122, 147, 148, 165,
- 151, 152, 294, 103, 154, 178, 144, 151, 152, 103,
- 123, 154, 98, 170, 175, 176, 184, 185, 308, 186,
- 187, 103, 177, 98, 144, 179, 123, 103, 105, 106,
-
- 182, 107, 131, 132, 131, 132, 108, 109, 110, 189,
- 188, 192, 111, 294, 112, 334, 151, 131, 132, 128,
- 200, 208, 173, 151, 182, 206, 207, 210, 189, 131,
- 132, 192, 211, 132, 141, 218, 256, 224, 142, 156,
- 143, 160, 224, 219, 154, 219, 144, 144, 220, 227,
- 257, 164, 144, 151, 225, 113, 151, 114, 105, 106,
- 156, 107, 169, 334, 144, 144, 108, 109, 110, 178,
- 144, 165, 111, 172, 112, 151, 152, 160, 234, 154,
- 334, 181, 170, 291, 175, 176, 187, 242, 238, 179,
- 184, 185, 235, 239, 247, 248, 306, 218, 285, 151,
-
- 266, 247, 248, 173, 281, 329, 188, 242, 173, 144,
- 304, 151, 160, 315, 151, 113, 182, 114, 213, 283,
- 248, 151, 173, 182, 281, 329, 282, 144, 182, 304,
- 151, 225, 315, 214, 154, 151, 292, 324, 272, 154,
- 215, 215, 215, 215, 215, 215, 215, 215, 215, 215,
- 215, 215, 272, 227, 294, 324, 216, 151, 216, 216,
- 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 259, 291, 260, 261, 151, 227, 265, 223,
- 289, 151, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 287, 151, 225, 257, 260, 154,
-
- 260, 260, 260, 260, 260, 260, 260, 260, 260, 260,
- 260, 260, 260, 260, 334, 151, 292, 285, 259, 154,
- 255, 260, 260, 260, 260, 260, 260, 260, 260, 260,
- 260, 260, 260, 308, 151, 160, 151, 160, 154, 334,
- 154, 151, 334, 230, 151, 160, 230, 151, 334, 231,
- 232, 230, 231, 232, 282, 182, 233, 231, 232, 233,
- 236, 151, 237, 236, 233, 237, 240, 173, 236, 240,
- 237, 272, 227, 241, 240, 273, 241, 266, 273, 265,
- 151, 241, 151, 273, 222, 222, 220, 220, 255, 125,
- 151, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 64, 75,
+ 76, 64, 64, 77, 29, 78, 79, 80, 81, 82,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 64,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 64, 75, 76, 64, 64, 83, 84, 85, 86, 88,
+ 89, 88, 89, 93, 94, 242, 95, 90, 244, 90,
+
+ 93, 94, 258, 95, 98, 99, 98, 99, 103, 104,
+ 246, 105, 100, 179, 100, 103, 104, 175, 105, 108,
+ 31, 109, 153, 154, 110, 108, 31, 109, 246, 111,
+ 110, 179, 122, 31, 123, 111, 150, 124, 151, 28,
+ 138, 91, 156, 91, 173, 96, 259, 157, 112, 174,
+ 139, 267, 96, 752, 112, 140, 101, 752, 101, 125,
+ 106, 114, 31, 115, 684, 116, 117, 106, 169, 170,
+ 118, 119, 114, 31, 115, 296, 116, 117, 153, 154,
+ 112, 118, 119, 122, 31, 123, 112, 242, 124, 127,
+ 128, 125, 129, 275, 164, 681, 165, 130, 131, 132,
+
+ 268, 28, 138, 133, 278, 134, 127, 128, 166, 129,
+ 125, 150, 139, 294, 130, 131, 132, 140, 142, 143,
+ 133, 669, 134, 142, 143, 275, 144, 261, 262, 176,
+ 177, 144, 444, 179, 894, 263, 278, 176, 177, 286,
+ 166, 179, 125, 176, 177, 120, 445, 179, 176, 177,
+ 430, 180, 179, 181, 184, 686, 120, 315, 182, 176,
+ 177, 183, 185, 179, 153, 154, 153, 154, 186, 415,
+ 145, 195, 135, 299, 136, 145, 176, 177, 187, 259,
+ 179, 188, 430, 180, 189, 181, 184, 190, 300, 135,
+ 182, 136, 669, 183, 185, 270, 271, 305, 272, 305,
+
+ 186, 176, 306, 195, 200, 292, 293, 176, 177, 176,
+ 187, 179, 586, 188, 267, 176, 189, 196, 191, 190,
+ 176, 178, 192, 176, 177, 197, 193, 179, 176, 177,
+ 684, 176, 179, 163, 198, 194, 200, 199, 207, 201,
+ 426, 238, 239, 153, 154, 166, 208, 268, 176, 196,
+ 191, 210, 209, 178, 192, 297, 154, 197, 193, 211,
+ 176, 177, 178, 268, 179, 212, 198, 194, 580, 199,
+ 207, 201, 213, 238, 239, 178, 681, 166, 208, 176,
+ 214, 176, 177, 210, 209, 179, 215, 304, 221, 268,
+ 246, 211, 216, 894, 178, 176, 178, 212, 258, 166,
+
+ 176, 176, 177, 574, 213, 179, 422, 178, 435, 436,
+ 176, 177, 214, 453, 179, 202, 571, 203, 215, 570,
+ 221, 561, 217, 561, 216, 204, 218, 454, 178, 205,
+ 206, 166, 176, 176, 177, 232, 219, 179, 220, 233,
+ 176, 177, 259, 178, 179, 270, 271, 202, 427, 203,
+ 259, 570, 234, 176, 217, 223, 415, 204, 218, 176,
+ 177, 205, 206, 179, 222, 235, 310, 232, 219, 460,
+ 220, 233, 460, 176, 669, 178, 164, 679, 165, 176,
+ 177, 311, 176, 179, 234, 435, 436, 223, 176, 177,
+ 166, 586, 179, 513, 176, 177, 222, 268, 179, 415,
+
+ 176, 177, 462, 236, 179, 176, 176, 177, 237, 679,
+ 179, 240, 176, 224, 319, 225, 180, 226, 181, 572,
+ 436, 227, 166, 182, 629, 247, 183, 228, 314, 229,
+ 247, 176, 230, 231, 252, 236, 175, 178, 348, 252,
+ 237, 584, 175, 240, 456, 224, 319, 225, 180, 226,
+ 181, 176, 582, 227, 454, 182, 629, 580, 183, 228,
+ 176, 229, 712, 750, 230, 231, 176, 250, 257, 178,
+ 348, 456, 176, 257, 247, 452, 255, 266, 176, 247,
+ 247, 578, 266, 252, 247, 304, 176, 177, 252, 252,
+ 179, 447, 247, 252, 712, 750, 247, 166, 247, 251,
+
+ 247, 252, 176, 177, 576, 252, 179, 252, 256, 252,
+ 264, 445, 261, 262, 770, 323, 574, 257, 447, 273,
+ 423, 443, 257, 257, 801, 815, 266, 257, 838, 166,
+ 571, 266, 266, 326, 268, 257, 266, 259, 561, 257,
+ 415, 257, 265, 257, 266, 463, 770, 323, 266, 462,
+ 266, 274, 266, 299, 452, 315, 801, 815, 176, 463,
+ 838, 308, 308, 306, 259, 326, 176, 316, 300, 176,
+ 176, 246, 306, 176, 176, 301, 301, 301, 301, 301,
+ 301, 301, 301, 301, 301, 301, 301, 301, 301, 301,
+ 301, 301, 301, 301, 301, 301, 301, 301, 301, 301,
+
+ 301, 443, 147, 242, 440, 302, 440, 302, 302, 302,
+ 302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+ 302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+ 302, 302, 302, 310, 894, 285, 433, 432, 176, 431,
+ 269, 269, 176, 260, 260, 253, 176, 316, 311, 248,
+ 179, 242, 314, 170, 170, 312, 312, 312, 312, 312,
+ 312, 312, 312, 312, 312, 312, 312, 312, 312, 312,
+ 312, 312, 312, 312, 312, 312, 312, 312, 312, 312,
+ 312, 308, 303, 295, 147, 313, 295, 313, 313, 313,
+ 313, 313, 313, 313, 313, 313, 313, 313, 313, 313,
+
+ 313, 313, 313, 313, 313, 313, 313, 313, 313, 313,
+ 313, 313, 313, 176, 177, 176, 177, 179, 176, 179,
+ 176, 177, 176, 177, 179, 146, 179, 290, 320, 176,
+ 177, 289, 289, 179, 176, 177, 321, 322, 179, 287,
+ 327, 285, 324, 318, 328, 329, 325, 283, 176, 177,
+ 176, 177, 179, 282, 179, 176, 177, 280, 330, 179,
+ 320, 280, 147, 332, 146, 331, 176, 177, 321, 322,
+ 179, 277, 327, 276, 324, 318, 328, 329, 325, 147,
+ 333, 146, 176, 177, 338, 176, 179, 176, 147, 146,
+ 330, 339, 176, 269, 176, 332, 269, 331, 334, 176,
+
+ 177, 176, 260, 179, 335, 260, 176, 254, 254, 253,
+ 336, 337, 333, 176, 177, 249, 338, 179, 249, 248,
+ 176, 342, 176, 339, 176, 177, 340, 176, 179, 245,
+ 334, 241, 341, 176, 177, 171, 335, 179, 176, 163,
+ 176, 177, 336, 337, 179, 162, 343, 161, 160, 158,
+ 148, 176, 177, 342, 176, 179, 147, 345, 340, 176,
+ 177, 686, 346, 179, 341, 344, 176, 177, 147, 146,
+ 179, 176, 176, 246, 349, 176, 347, 894, 343, 176,
+ 177, 894, 894, 179, 894, 176, 176, 177, 894, 345,
+ 179, 894, 350, 894, 346, 894, 176, 344, 355, 894,
+
+ 351, 894, 352, 894, 894, 176, 349, 894, 347, 894,
+ 894, 894, 176, 176, 177, 353, 354, 179, 894, 894,
+ 894, 176, 177, 176, 350, 179, 894, 894, 894, 894,
+ 355, 176, 351, 894, 352, 370, 894, 361, 176, 176,
+ 177, 894, 894, 179, 176, 176, 177, 353, 354, 179,
+ 365, 176, 176, 177, 894, 894, 179, 894, 176, 176,
+ 177, 176, 177, 179, 894, 179, 362, 370, 363, 361,
+ 894, 356, 894, 894, 894, 364, 369, 894, 357, 176,
+ 177, 358, 365, 179, 894, 176, 894, 359, 176, 177,
+ 360, 373, 179, 176, 894, 176, 177, 894, 362, 179,
+
+ 363, 894, 371, 356, 894, 176, 177, 364, 369, 179,
+ 357, 176, 894, 358, 176, 177, 366, 176, 179, 359,
+ 894, 367, 360, 373, 176, 894, 894, 372, 894, 368,
+ 894, 176, 894, 176, 371, 894, 374, 176, 177, 176,
+ 177, 179, 894, 179, 894, 176, 177, 894, 366, 179,
+ 894, 176, 894, 367, 894, 376, 894, 375, 894, 372,
+ 176, 368, 176, 177, 894, 894, 179, 176, 374, 176,
+ 177, 894, 894, 179, 894, 377, 378, 176, 894, 176,
+ 177, 176, 177, 179, 379, 179, 176, 376, 894, 375,
+ 380, 894, 894, 894, 894, 894, 176, 177, 176, 177,
+
+ 179, 894, 179, 894, 384, 894, 894, 377, 378, 176,
+ 381, 176, 894, 382, 894, 894, 379, 176, 894, 894,
+ 894, 894, 380, 385, 176, 177, 383, 894, 179, 176,
+ 177, 176, 177, 179, 176, 179, 384, 894, 894, 176,
+ 177, 176, 381, 179, 894, 382, 386, 389, 894, 894,
+ 894, 176, 387, 176, 392, 385, 894, 393, 383, 176,
+ 177, 388, 390, 179, 894, 176, 177, 894, 176, 179,
+ 176, 176, 177, 894, 894, 179, 894, 394, 386, 389,
+ 894, 391, 894, 396, 387, 894, 392, 894, 395, 393,
+ 894, 176, 177, 388, 390, 179, 176, 894, 176, 177,
+
+ 894, 176, 179, 176, 894, 894, 176, 177, 894, 394,
+ 179, 176, 894, 391, 894, 396, 894, 176, 177, 894,
+ 395, 179, 176, 177, 894, 397, 179, 894, 398, 894,
+ 894, 176, 176, 177, 409, 894, 179, 176, 176, 177,
+ 894, 410, 179, 176, 894, 894, 176, 177, 399, 894,
+ 179, 411, 894, 412, 894, 176, 177, 397, 894, 179,
+ 398, 894, 894, 176, 176, 177, 409, 894, 179, 894,
+ 176, 176, 177, 410, 894, 179, 413, 414, 176, 466,
+ 399, 894, 894, 411, 894, 412, 894, 894, 894, 176,
+ 400, 401, 402, 403, 176, 894, 404, 894, 247, 894,
+
+ 405, 406, 407, 247, 176, 894, 408, 178, 413, 414,
+ 176, 466, 176, 177, 894, 894, 179, 894, 176, 894,
+ 894, 894, 400, 401, 402, 403, 894, 176, 404, 894,
+ 894, 894, 405, 406, 407, 489, 176, 894, 408, 178,
+ 250, 176, 177, 176, 894, 179, 894, 247, 894, 894,
+ 418, 894, 247, 247, 894, 894, 467, 247, 418, 418,
+ 418, 418, 418, 418, 894, 247, 419, 489, 894, 247,
+ 894, 247, 251, 247, 419, 419, 419, 419, 419, 419,
+ 252, 894, 894, 894, 176, 252, 894, 894, 467, 894,
+ 418, 418, 418, 418, 418, 418, 894, 894, 894, 176,
+
+ 177, 894, 894, 179, 894, 894, 419, 419, 419, 419,
+ 419, 419, 894, 176, 468, 176, 177, 894, 894, 179,
+ 894, 894, 255, 176, 177, 894, 894, 179, 894, 252,
+ 894, 894, 420, 894, 252, 252, 894, 469, 894, 252,
+ 420, 420, 420, 420, 420, 420, 468, 252, 421, 894,
+ 894, 252, 894, 252, 256, 252, 421, 421, 421, 421,
+ 421, 421, 257, 894, 894, 894, 894, 257, 894, 469,
+ 894, 176, 420, 420, 420, 420, 420, 420, 176, 177,
+ 894, 894, 179, 894, 894, 894, 894, 176, 421, 421,
+ 421, 421, 421, 421, 894, 176, 176, 177, 894, 894,
+
+ 179, 894, 470, 894, 264, 894, 176, 177, 176, 177,
+ 179, 257, 179, 894, 424, 894, 257, 257, 894, 472,
+ 475, 257, 424, 424, 424, 424, 424, 424, 473, 257,
+ 425, 894, 894, 257, 470, 257, 265, 257, 425, 425,
+ 425, 425, 425, 425, 266, 894, 894, 894, 894, 266,
+ 176, 472, 475, 894, 424, 424, 424, 424, 424, 424,
+ 473, 176, 177, 176, 177, 179, 894, 179, 176, 894,
+ 425, 425, 425, 425, 425, 425, 894, 894, 176, 894,
+ 176, 894, 894, 894, 894, 894, 273, 176, 177, 894,
+ 894, 179, 894, 266, 492, 894, 428, 894, 266, 266,
+
+ 894, 894, 894, 266, 428, 428, 428, 428, 428, 428,
+ 894, 266, 429, 894, 894, 266, 471, 266, 274, 266,
+ 429, 429, 429, 429, 429, 429, 492, 176, 177, 894,
+ 894, 179, 894, 176, 894, 176, 428, 428, 428, 428,
+ 428, 428, 894, 894, 894, 894, 894, 894, 471, 894,
+ 894, 894, 429, 429, 429, 429, 429, 429, 447, 176,
+ 448, 449, 894, 894, 894, 894, 894, 894, 450, 450,
+ 450, 450, 450, 450, 450, 450, 450, 450, 450, 450,
+ 450, 450, 450, 450, 450, 450, 450, 450, 450, 450,
+ 450, 450, 450, 450, 894, 894, 894, 894, 448, 176,
+
+ 448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
+ 448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
+ 448, 448, 448, 448, 448, 448, 894, 894, 176, 177,
+ 894, 894, 179, 448, 448, 448, 448, 448, 448, 448,
+ 448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
+ 448, 448, 448, 448, 448, 448, 448, 448, 448, 456,
+ 894, 457, 458, 894, 894, 894, 894, 894, 894, 459,
+ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459,
+ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459,
+ 459, 459, 459, 459, 459, 894, 894, 894, 894, 457,
+
+ 176, 457, 457, 457, 457, 457, 457, 457, 457, 457,
+ 457, 457, 457, 457, 457, 457, 457, 457, 457, 457,
+ 457, 457, 457, 457, 457, 457, 457, 894, 894, 176,
+ 177, 894, 894, 179, 457, 457, 457, 457, 457, 457,
+ 457, 457, 457, 457, 457, 457, 457, 457, 457, 457,
+ 457, 457, 457, 457, 457, 457, 457, 457, 457, 457,
+ 176, 177, 176, 177, 179, 894, 179, 176, 177, 894,
+ 894, 179, 894, 476, 894, 176, 177, 894, 477, 179,
+ 176, 177, 894, 894, 179, 894, 478, 176, 177, 474,
+ 894, 179, 894, 894, 479, 480, 176, 177, 176, 177,
+
+ 179, 176, 179, 176, 177, 476, 894, 179, 176, 177,
+ 477, 481, 179, 894, 894, 894, 482, 483, 478, 176,
+ 177, 474, 894, 179, 484, 894, 479, 480, 894, 894,
+ 485, 894, 176, 894, 176, 894, 176, 177, 894, 176,
+ 179, 176, 177, 481, 498, 179, 894, 176, 482, 483,
+ 176, 177, 176, 894, 179, 894, 484, 894, 894, 176,
+ 176, 177, 485, 894, 179, 486, 894, 894, 176, 894,
+ 176, 488, 894, 490, 894, 176, 498, 894, 894, 487,
+ 176, 176, 177, 176, 177, 179, 894, 179, 176, 177,
+ 894, 176, 179, 894, 176, 177, 894, 486, 179, 894,
+
+ 176, 177, 493, 488, 179, 490, 894, 491, 176, 495,
+ 894, 487, 494, 176, 894, 496, 176, 177, 894, 894,
+ 179, 894, 176, 176, 177, 894, 894, 179, 894, 176,
+ 177, 497, 176, 179, 493, 894, 176, 177, 894, 491,
+ 179, 495, 176, 177, 494, 499, 179, 496, 176, 177,
+ 894, 502, 179, 176, 894, 176, 894, 500, 176, 177,
+ 176, 501, 179, 497, 894, 504, 176, 894, 894, 176,
+ 177, 894, 176, 179, 894, 176, 177, 499, 894, 179,
+ 894, 176, 177, 502, 505, 179, 503, 894, 176, 500,
+ 894, 894, 894, 501, 506, 176, 507, 504, 176, 177,
+
+ 894, 176, 179, 176, 177, 894, 894, 179, 176, 176,
+ 177, 894, 508, 179, 176, 894, 505, 894, 503, 894,
+ 176, 176, 177, 513, 509, 179, 506, 894, 507, 894,
+ 176, 176, 177, 894, 510, 179, 894, 894, 176, 177,
+ 511, 176, 179, 894, 508, 894, 512, 176, 894, 894,
+ 894, 176, 177, 176, 894, 179, 509, 176, 177, 176,
+ 177, 179, 894, 179, 176, 177, 510, 894, 179, 516,
+ 176, 894, 511, 514, 515, 176, 176, 177, 512, 894,
+ 179, 176, 894, 518, 894, 894, 517, 176, 177, 894,
+ 520, 179, 521, 176, 176, 177, 894, 894, 179, 894,
+
+ 894, 516, 519, 176, 894, 514, 515, 894, 522, 894,
+ 176, 894, 176, 177, 894, 518, 179, 894, 517, 894,
+ 894, 894, 520, 176, 521, 894, 176, 177, 894, 176,
+ 179, 176, 894, 894, 519, 894, 176, 894, 176, 177,
+ 522, 524, 179, 523, 894, 176, 177, 894, 176, 179,
+ 894, 176, 177, 176, 177, 179, 894, 179, 894, 176,
+ 526, 176, 177, 176, 177, 179, 176, 179, 528, 525,
+ 176, 177, 894, 524, 179, 523, 530, 176, 177, 527,
+ 894, 179, 894, 894, 176, 176, 177, 176, 177, 179,
+ 894, 179, 526, 894, 894, 529, 894, 533, 176, 894,
+
+ 528, 525, 176, 177, 894, 894, 179, 531, 530, 894,
+ 176, 527, 894, 532, 894, 534, 894, 176, 176, 177,
+ 176, 177, 179, 176, 179, 176, 894, 529, 894, 533,
+ 894, 535, 894, 176, 894, 176, 894, 894, 536, 531,
+ 176, 177, 176, 894, 179, 532, 894, 534, 894, 176,
+ 894, 176, 177, 894, 894, 179, 894, 176, 894, 176,
+ 176, 177, 537, 535, 179, 894, 894, 176, 177, 894,
+ 536, 179, 894, 894, 176, 176, 177, 894, 894, 179,
+ 894, 538, 540, 894, 539, 176, 177, 176, 177, 179,
+ 176, 179, 176, 894, 537, 894, 176, 177, 176, 177,
+
+ 179, 894, 179, 894, 542, 176, 177, 894, 894, 179,
+ 541, 543, 176, 538, 540, 894, 539, 545, 176, 177,
+ 546, 544, 179, 176, 176, 177, 894, 894, 179, 547,
+ 549, 894, 176, 894, 894, 894, 542, 548, 894, 176,
+ 176, 177, 541, 543, 179, 894, 894, 176, 894, 545,
+ 176, 177, 546, 544, 179, 550, 894, 176, 894, 176,
+ 894, 547, 549, 176, 177, 553, 894, 179, 176, 548,
+ 176, 894, 176, 177, 894, 554, 179, 176, 176, 177,
+ 894, 551, 179, 894, 894, 894, 894, 550, 176, 177,
+ 176, 894, 179, 552, 176, 177, 176, 553, 179, 894,
+
+ 556, 894, 555, 894, 894, 894, 557, 554, 894, 894,
+ 176, 587, 176, 551, 179, 894, 894, 894, 894, 894,
+ 894, 894, 176, 176, 316, 552, 894, 179, 894, 894,
+ 894, 894, 556, 894, 555, 176, 894, 894, 557, 894,
+ 894, 176, 177, 562, 176, 179, 894, 894, 894, 894,
+ 176, 562, 562, 562, 562, 562, 562, 894, 894, 563,
+ 176, 894, 894, 894, 894, 564, 176, 563, 563, 563,
+ 563, 563, 563, 564, 564, 564, 564, 564, 564, 894,
+ 894, 565, 176, 562, 562, 562, 562, 562, 562, 565,
+ 565, 565, 565, 565, 565, 176, 894, 894, 894, 563,
+
+ 563, 563, 563, 563, 563, 564, 564, 564, 564, 564,
+ 564, 894, 894, 176, 176, 177, 176, 177, 179, 566,
+ 179, 565, 565, 565, 565, 565, 565, 566, 566, 566,
+ 566, 566, 566, 567, 894, 894, 176, 177, 894, 568,
+ 179, 567, 567, 567, 567, 567, 567, 568, 568, 568,
+ 568, 568, 568, 894, 894, 591, 894, 569, 894, 566,
+ 566, 566, 566, 566, 566, 569, 569, 569, 569, 569,
+ 569, 894, 894, 567, 567, 567, 567, 567, 567, 568,
+ 568, 568, 568, 568, 568, 894, 176, 591, 176, 894,
+ 894, 894, 894, 894, 894, 894, 894, 569, 569, 569,
+
+ 569, 569, 569, 447, 894, 894, 449, 894, 176, 894,
+ 894, 894, 894, 450, 450, 450, 450, 450, 450, 450,
+ 450, 450, 450, 450, 450, 450, 450, 450, 450, 450,
+ 450, 450, 450, 450, 450, 450, 450, 450, 450, 456,
+ 894, 894, 458, 894, 176, 177, 894, 894, 179, 459,
+ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459,
+ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459,
+ 459, 459, 459, 459, 459, 176, 177, 176, 177, 179,
+ 894, 179, 176, 177, 176, 177, 179, 894, 179, 894,
+ 590, 176, 177, 176, 177, 179, 592, 179, 176, 177,
+
+ 176, 177, 179, 589, 179, 894, 176, 177, 595, 894,
+ 179, 176, 177, 593, 894, 179, 176, 894, 894, 594,
+ 176, 177, 590, 894, 179, 894, 894, 894, 592, 600,
+ 596, 894, 894, 176, 177, 589, 597, 179, 894, 894,
+ 595, 598, 176, 177, 894, 593, 179, 176, 894, 176,
+ 599, 594, 894, 894, 176, 894, 176, 601, 603, 894,
+ 894, 600, 596, 176, 894, 176, 894, 894, 597, 894,
+ 176, 894, 176, 598, 894, 894, 176, 177, 176, 894,
+ 179, 894, 599, 176, 176, 177, 894, 894, 179, 601,
+ 603, 894, 176, 894, 176, 177, 176, 177, 179, 894,
+
+ 179, 894, 894, 176, 177, 176, 602, 179, 894, 894,
+ 894, 894, 604, 605, 176, 176, 177, 176, 177, 179,
+ 894, 179, 176, 177, 176, 177, 179, 606, 179, 894,
+ 608, 894, 609, 607, 894, 176, 177, 894, 602, 179,
+ 894, 894, 611, 894, 604, 605, 176, 177, 176, 894,
+ 179, 894, 610, 176, 177, 894, 176, 179, 894, 606,
+ 894, 612, 608, 894, 609, 607, 176, 894, 176, 894,
+ 613, 894, 176, 177, 611, 176, 179, 176, 177, 894,
+ 894, 179, 894, 614, 610, 894, 894, 176, 894, 176,
+ 894, 176, 177, 612, 176, 179, 176, 176, 177, 176,
+
+ 177, 179, 613, 179, 894, 616, 615, 176, 618, 176,
+ 177, 894, 894, 179, 894, 614, 176, 177, 176, 617,
+ 179, 894, 176, 177, 894, 176, 179, 894, 619, 620,
+ 176, 177, 621, 894, 179, 176, 177, 616, 615, 179,
+ 618, 622, 176, 177, 176, 894, 179, 894, 894, 176,
+ 894, 617, 894, 623, 894, 176, 177, 894, 894, 179,
+ 619, 620, 894, 176, 621, 894, 176, 177, 894, 176,
+ 179, 176, 624, 622, 176, 177, 176, 177, 179, 894,
+ 179, 176, 894, 625, 894, 623, 176, 177, 176, 894,
+ 179, 894, 176, 177, 176, 894, 179, 176, 177, 894,
+
+ 628, 179, 176, 894, 624, 626, 894, 176, 627, 176,
+ 177, 894, 894, 179, 176, 625, 894, 176, 177, 176,
+ 177, 179, 630, 179, 894, 176, 177, 176, 631, 179,
+ 894, 894, 628, 894, 632, 176, 177, 626, 176, 179,
+ 627, 176, 177, 176, 177, 179, 176, 179, 176, 894,
+ 633, 176, 177, 894, 630, 179, 894, 894, 176, 894,
+ 631, 894, 635, 634, 176, 894, 632, 176, 177, 176,
+ 636, 179, 176, 177, 894, 894, 179, 894, 894, 894,
+ 637, 176, 633, 176, 177, 894, 894, 179, 894, 176,
+ 894, 176, 176, 177, 635, 634, 179, 176, 894, 176,
+
+ 177, 894, 636, 179, 176, 177, 638, 176, 179, 894,
+ 894, 639, 637, 176, 642, 176, 894, 643, 894, 894,
+ 894, 894, 640, 176, 176, 177, 176, 177, 179, 894,
+ 179, 176, 177, 641, 894, 179, 176, 177, 638, 176,
+ 179, 894, 894, 639, 176, 644, 642, 894, 645, 643,
+ 894, 894, 176, 177, 640, 176, 179, 176, 177, 176,
+ 177, 179, 894, 179, 176, 646, 894, 647, 648, 176,
+ 177, 176, 894, 179, 176, 177, 176, 644, 179, 894,
+ 645, 649, 176, 177, 650, 894, 179, 894, 894, 651,
+ 176, 177, 894, 894, 179, 894, 176, 646, 176, 647,
+
+ 648, 176, 177, 176, 894, 179, 894, 894, 176, 894,
+ 176, 177, 894, 649, 179, 894, 650, 894, 894, 652,
+ 894, 651, 894, 653, 176, 894, 176, 177, 894, 176,
+ 179, 176, 176, 177, 176, 177, 179, 894, 179, 894,
+ 656, 176, 894, 176, 177, 894, 176, 179, 176, 177,
+ 894, 652, 179, 657, 176, 653, 894, 894, 894, 894,
+ 654, 655, 176, 894, 894, 176, 177, 658, 894, 179,
+ 894, 894, 656, 176, 176, 177, 176, 177, 179, 894,
+ 179, 894, 176, 176, 177, 657, 894, 179, 894, 660,
+ 176, 177, 654, 655, 179, 894, 176, 177, 176, 658,
+
+ 179, 176, 177, 894, 176, 179, 176, 667, 659, 894,
+ 894, 664, 894, 662, 894, 176, 894, 661, 176, 177,
+ 176, 660, 179, 176, 177, 894, 663, 179, 894, 176,
+ 177, 176, 177, 179, 894, 179, 894, 176, 894, 667,
+ 659, 894, 894, 664, 668, 662, 176, 666, 176, 665,
+ 894, 894, 894, 894, 894, 176, 176, 587, 663, 894,
+ 179, 894, 176, 176, 177, 894, 894, 179, 176, 894,
+ 894, 894, 894, 176, 671, 894, 668, 894, 894, 666,
+ 894, 665, 671, 671, 671, 671, 671, 671, 894, 894,
+ 176, 894, 894, 176, 177, 176, 672, 179, 176, 177,
+
+ 894, 176, 179, 176, 672, 672, 672, 672, 672, 672,
+ 894, 894, 673, 894, 671, 671, 671, 671, 671, 671,
+ 673, 673, 673, 673, 673, 673, 894, 894, 176, 894,
+ 894, 894, 894, 894, 674, 176, 672, 672, 672, 672,
+ 672, 672, 674, 674, 674, 674, 674, 674, 894, 894,
+ 675, 894, 673, 673, 673, 673, 673, 673, 675, 675,
+ 675, 675, 675, 675, 894, 176, 894, 176, 177, 894,
+ 176, 179, 676, 894, 674, 674, 674, 674, 674, 674,
+ 676, 676, 676, 676, 676, 676, 894, 894, 677, 894,
+ 675, 675, 675, 675, 675, 675, 677, 677, 677, 677,
+
+ 677, 677, 176, 177, 176, 177, 179, 894, 179, 894,
+ 678, 894, 676, 676, 676, 676, 676, 676, 678, 678,
+ 678, 678, 678, 678, 894, 894, 689, 894, 677, 677,
+ 677, 677, 677, 677, 688, 894, 176, 177, 894, 176,
+ 179, 176, 177, 176, 177, 179, 894, 179, 894, 894,
+ 678, 678, 678, 678, 678, 678, 176, 177, 689, 894,
+ 179, 894, 894, 176, 177, 690, 688, 179, 894, 691,
+ 894, 692, 894, 894, 176, 894, 176, 176, 177, 176,
+ 177, 179, 894, 179, 894, 176, 177, 176, 177, 179,
+ 894, 179, 176, 177, 695, 894, 179, 690, 693, 694,
+
+ 696, 691, 894, 692, 894, 176, 177, 894, 176, 179,
+ 894, 697, 894, 176, 894, 176, 894, 176, 177, 176,
+ 177, 179, 894, 179, 894, 894, 695, 894, 176, 698,
+ 693, 694, 696, 176, 177, 176, 894, 179, 176, 177,
+ 176, 177, 179, 697, 179, 894, 699, 894, 700, 176,
+ 894, 176, 176, 177, 176, 177, 179, 176, 179, 176,
+ 894, 698, 894, 894, 176, 894, 701, 894, 176, 177,
+ 894, 702, 179, 894, 894, 176, 177, 176, 699, 179,
+ 700, 894, 176, 177, 894, 703, 179, 894, 894, 176,
+ 894, 176, 176, 177, 894, 894, 179, 894, 701, 894,
+
+ 894, 704, 894, 702, 894, 176, 894, 705, 894, 894,
+ 176, 894, 176, 894, 176, 177, 894, 703, 179, 176,
+ 177, 176, 177, 179, 176, 179, 176, 176, 177, 894,
+ 894, 179, 894, 704, 176, 177, 894, 894, 179, 705,
+ 176, 894, 708, 707, 706, 176, 177, 176, 894, 179,
+ 894, 176, 177, 894, 176, 179, 176, 177, 894, 894,
+ 179, 894, 709, 894, 176, 894, 176, 177, 176, 177,
+ 179, 894, 179, 894, 708, 707, 706, 710, 176, 177,
+ 176, 177, 179, 894, 179, 894, 176, 894, 176, 177,
+ 894, 176, 179, 176, 709, 894, 176, 177, 894, 176,
+
+ 179, 176, 177, 176, 177, 179, 176, 179, 894, 710,
+ 176, 177, 714, 711, 179, 176, 177, 176, 894, 179,
+ 176, 177, 894, 176, 179, 894, 713, 716, 176, 894,
+ 894, 715, 894, 717, 894, 176, 177, 894, 176, 179,
+ 176, 894, 176, 177, 714, 711, 179, 176, 177, 718,
+ 176, 179, 176, 894, 894, 894, 894, 719, 713, 716,
+ 176, 894, 894, 715, 894, 717, 176, 177, 176, 894,
+ 179, 720, 894, 176, 894, 176, 176, 177, 894, 894,
+ 179, 718, 176, 894, 176, 177, 894, 176, 179, 719,
+ 894, 721, 176, 176, 177, 722, 724, 179, 176, 177,
+
+ 176, 177, 179, 720, 179, 176, 177, 176, 894, 179,
+ 894, 725, 176, 177, 176, 894, 179, 176, 177, 176,
+ 727, 179, 894, 721, 894, 894, 894, 722, 724, 729,
+ 726, 894, 728, 894, 723, 176, 177, 894, 176, 179,
+ 176, 177, 894, 725, 179, 894, 730, 894, 176, 894,
+ 176, 177, 727, 731, 179, 894, 176, 894, 894, 176,
+ 177, 729, 726, 179, 728, 176, 894, 176, 177, 894,
+ 176, 179, 176, 894, 894, 894, 894, 176, 730, 176,
+ 177, 734, 894, 179, 176, 731, 733, 894, 894, 176,
+ 894, 732, 894, 894, 735, 176, 177, 176, 177, 179,
+
+ 894, 179, 176, 177, 176, 177, 179, 176, 179, 894,
+ 176, 177, 176, 734, 179, 176, 177, 894, 733, 179,
+ 894, 739, 176, 176, 177, 736, 735, 179, 176, 177,
+ 894, 176, 179, 738, 894, 894, 740, 894, 737, 176,
+ 176, 177, 176, 177, 179, 894, 179, 894, 741, 894,
+ 894, 176, 894, 739, 176, 177, 894, 736, 179, 176,
+ 177, 894, 894, 179, 894, 738, 743, 176, 740, 176,
+ 742, 176, 177, 894, 176, 179, 176, 894, 744, 894,
+ 741, 894, 176, 894, 176, 177, 894, 176, 179, 894,
+ 894, 894, 894, 176, 246, 176, 746, 179, 743, 894,
+
+ 176, 894, 742, 894, 746, 746, 746, 746, 746, 746,
+ 744, 894, 176, 894, 176, 894, 894, 894, 894, 894,
+ 894, 894, 894, 176, 177, 894, 176, 179, 894, 894,
+ 894, 176, 894, 894, 894, 894, 746, 746, 746, 746,
+ 746, 746, 247, 176, 176, 177, 894, 894, 179, 747,
+ 247, 247, 247, 247, 247, 247, 176, 747, 747, 747,
+ 747, 747, 747, 252, 894, 176, 894, 894, 894, 894,
+ 894, 252, 252, 252, 252, 252, 252, 894, 894, 894,
+ 894, 894, 247, 247, 247, 247, 247, 247, 748, 747,
+ 747, 747, 747, 747, 747, 176, 748, 748, 748, 748,
+
+ 748, 748, 257, 252, 252, 252, 252, 252, 252, 749,
+ 257, 257, 257, 257, 257, 257, 176, 749, 749, 749,
+ 749, 749, 749, 176, 177, 894, 266, 179, 748, 748,
+ 748, 748, 748, 748, 266, 266, 266, 266, 266, 266,
+ 755, 894, 257, 257, 257, 257, 257, 257, 894, 749,
+ 749, 749, 749, 749, 749, 176, 177, 894, 894, 179,
+ 176, 177, 894, 894, 179, 894, 266, 266, 266, 266,
+ 266, 266, 755, 756, 754, 894, 176, 177, 176, 177,
+ 179, 894, 179, 176, 177, 176, 177, 179, 894, 179,
+ 176, 177, 894, 894, 179, 176, 176, 177, 894, 894,
+
+ 179, 894, 760, 894, 758, 756, 754, 757, 894, 761,
+ 176, 177, 894, 759, 179, 176, 177, 176, 177, 179,
+ 894, 179, 176, 177, 176, 177, 179, 176, 179, 762,
+ 894, 894, 176, 894, 760, 894, 758, 894, 894, 757,
+ 894, 761, 176, 177, 894, 759, 179, 763, 176, 894,
+ 176, 894, 176, 177, 894, 176, 179, 176, 764, 176,
+ 177, 762, 176, 179, 894, 176, 177, 894, 176, 179,
+ 176, 177, 894, 894, 179, 894, 765, 176, 177, 763,
+ 894, 179, 176, 894, 176, 177, 766, 176, 179, 176,
+ 764, 176, 177, 894, 176, 179, 176, 894, 767, 176,
+
+ 177, 176, 177, 179, 894, 179, 769, 768, 765, 176,
+ 177, 894, 894, 179, 176, 771, 176, 177, 766, 894,
+ 179, 176, 177, 894, 176, 179, 894, 772, 894, 894,
+ 767, 176, 773, 894, 894, 894, 894, 176, 769, 768,
+ 176, 177, 176, 894, 179, 894, 894, 771, 894, 176,
+ 894, 176, 177, 176, 177, 179, 176, 179, 894, 772,
+ 894, 894, 894, 176, 773, 774, 176, 177, 176, 177,
+ 179, 176, 179, 176, 176, 177, 176, 177, 179, 894,
+ 179, 176, 775, 176, 177, 176, 177, 179, 176, 179,
+ 778, 176, 177, 176, 776, 179, 894, 774, 779, 894,
+
+ 176, 177, 894, 777, 179, 176, 177, 176, 177, 179,
+ 894, 179, 176, 894, 775, 176, 177, 176, 177, 179,
+ 781, 179, 778, 176, 894, 176, 776, 894, 780, 894,
+ 779, 894, 786, 176, 177, 777, 782, 179, 176, 894,
+ 176, 176, 177, 176, 177, 179, 176, 179, 176, 894,
+ 176, 177, 781, 894, 179, 176, 787, 176, 784, 894,
+ 780, 894, 894, 176, 786, 176, 177, 894, 782, 179,
+ 894, 783, 176, 894, 176, 177, 894, 176, 179, 176,
+ 785, 176, 177, 894, 788, 179, 894, 176, 787, 176,
+ 784, 894, 894, 894, 894, 176, 177, 789, 894, 179,
+
+ 894, 894, 894, 783, 790, 176, 176, 177, 894, 894,
+ 179, 894, 785, 176, 894, 176, 788, 791, 894, 176,
+ 177, 894, 176, 179, 176, 177, 176, 177, 179, 789,
+ 179, 894, 894, 894, 894, 894, 790, 176, 894, 894,
+ 795, 792, 894, 894, 894, 894, 176, 793, 894, 791,
+ 894, 894, 894, 176, 794, 176, 246, 176, 177, 179,
+ 894, 179, 894, 894, 894, 894, 894, 176, 894, 894,
+ 894, 894, 795, 792, 894, 894, 894, 894, 176, 793,
+ 176, 177, 894, 894, 179, 894, 794, 894, 894, 894,
+ 894, 176, 797, 894, 894, 894, 176, 894, 176, 798,
+
+ 797, 797, 797, 797, 797, 797, 799, 798, 798, 798,
+ 798, 798, 798, 800, 799, 799, 799, 799, 799, 799,
+ 894, 800, 800, 800, 800, 800, 800, 176, 894, 176,
+ 894, 894, 797, 797, 797, 797, 797, 797, 894, 798,
+ 798, 798, 798, 798, 798, 894, 799, 799, 799, 799,
+ 799, 799, 176, 800, 800, 800, 800, 800, 800, 176,
+ 177, 176, 177, 179, 894, 179, 176, 177, 894, 894,
+ 179, 894, 176, 177, 176, 177, 179, 894, 179, 176,
+ 177, 804, 894, 179, 802, 805, 894, 176, 177, 806,
+ 803, 179, 894, 894, 807, 176, 177, 176, 177, 179,
+
+ 894, 179, 176, 177, 176, 177, 179, 894, 179, 894,
+ 894, 810, 894, 804, 894, 812, 802, 805, 894, 894,
+ 894, 806, 803, 811, 894, 808, 807, 894, 894, 809,
+ 894, 176, 894, 176, 894, 176, 177, 894, 176, 179,
+ 894, 176, 177, 810, 176, 179, 176, 812, 814, 176,
+ 177, 176, 813, 179, 894, 811, 894, 808, 894, 176,
+ 894, 809, 176, 177, 176, 177, 179, 176, 179, 176,
+ 894, 176, 177, 894, 176, 179, 176, 176, 177, 894,
+ 814, 179, 894, 894, 813, 894, 816, 176, 177, 176,
+ 177, 179, 894, 179, 176, 177, 176, 177, 179, 894,
+
+ 179, 817, 176, 177, 176, 177, 179, 176, 179, 894,
+ 176, 177, 818, 176, 179, 820, 176, 177, 816, 894,
+ 179, 176, 176, 177, 894, 894, 179, 176, 177, 894,
+ 894, 179, 894, 817, 176, 819, 176, 176, 177, 821,
+ 894, 179, 894, 176, 818, 822, 894, 820, 894, 176,
+ 176, 177, 894, 823, 179, 894, 176, 177, 894, 176,
+ 179, 176, 894, 176, 177, 894, 176, 179, 176, 824,
+ 894, 821, 894, 894, 176, 894, 176, 822, 830, 894,
+ 176, 177, 176, 894, 179, 823, 826, 894, 176, 176,
+ 177, 894, 825, 179, 176, 894, 176, 177, 894, 176,
+
+ 179, 824, 176, 177, 827, 894, 179, 894, 894, 176,
+ 894, 828, 176, 177, 894, 831, 179, 894, 826, 176,
+ 177, 894, 176, 179, 825, 829, 832, 894, 176, 176,
+ 177, 894, 894, 179, 833, 176, 827, 894, 894, 894,
+ 894, 894, 894, 828, 894, 894, 894, 831, 894, 176,
+ 177, 894, 176, 179, 894, 894, 894, 829, 832, 894,
+ 894, 176, 894, 894, 894, 894, 833, 834, 176, 176,
+ 177, 894, 894, 179, 176, 834, 834, 834, 834, 834,
+ 834, 894, 176, 177, 176, 835, 179, 894, 176, 177,
+ 894, 176, 179, 835, 835, 835, 835, 835, 835, 176,
+
+ 177, 176, 894, 179, 894, 836, 839, 834, 834, 834,
+ 834, 834, 834, 836, 836, 836, 836, 836, 836, 894,
+ 894, 176, 894, 837, 894, 835, 835, 835, 835, 835,
+ 835, 837, 837, 837, 837, 837, 837, 894, 839, 176,
+ 177, 176, 894, 179, 894, 836, 836, 836, 836, 836,
+ 836, 176, 177, 894, 176, 179, 894, 176, 177, 894,
+ 176, 179, 894, 837, 837, 837, 837, 837, 837, 840,
+ 894, 176, 841, 176, 177, 176, 177, 179, 894, 179,
+ 176, 177, 894, 894, 179, 176, 177, 176, 177, 179,
+ 842, 179, 176, 177, 894, 843, 179, 894, 894, 176,
+
+ 177, 840, 894, 179, 841, 845, 894, 844, 176, 177,
+ 894, 176, 179, 894, 846, 176, 177, 894, 894, 179,
+ 176, 177, 842, 176, 179, 894, 894, 843, 894, 176,
+ 176, 177, 176, 177, 179, 894, 179, 845, 894, 844,
+ 847, 848, 894, 850, 849, 176, 846, 176, 894, 176,
+ 177, 894, 176, 179, 176, 177, 894, 176, 179, 176,
+ 894, 894, 176, 177, 176, 894, 179, 894, 894, 894,
+ 894, 176, 847, 848, 894, 850, 849, 176, 177, 851,
+ 176, 179, 894, 894, 176, 177, 852, 176, 179, 176,
+ 177, 894, 176, 179, 176, 177, 854, 855, 179, 894,
+
+ 856, 894, 176, 853, 176, 176, 177, 894, 894, 179,
+ 894, 851, 894, 176, 177, 894, 857, 179, 852, 894,
+ 894, 176, 894, 176, 177, 894, 176, 179, 854, 855,
+ 894, 894, 856, 894, 176, 858, 176, 177, 859, 894,
+ 179, 894, 894, 894, 894, 894, 894, 894, 857, 176,
+ 894, 894, 894, 894, 894, 894, 176, 894, 894, 176,
+ 177, 176, 894, 179, 894, 860, 176, 858, 176, 177,
+ 859, 861, 179, 894, 894, 894, 894, 176, 862, 861,
+ 861, 861, 861, 861, 861, 176, 862, 862, 862, 862,
+ 862, 862, 863, 894, 894, 176, 894, 860, 894, 894,
+
+ 863, 863, 863, 863, 863, 863, 176, 177, 176, 894,
+ 179, 861, 861, 861, 861, 861, 861, 864, 862, 862,
+ 862, 862, 862, 862, 894, 864, 864, 864, 864, 864,
+ 864, 176, 863, 863, 863, 863, 863, 863, 176, 177,
+ 176, 894, 179, 176, 177, 176, 177, 179, 894, 179,
+ 176, 177, 865, 894, 179, 894, 894, 864, 864, 864,
+ 864, 864, 864, 176, 177, 866, 894, 179, 176, 177,
+ 176, 177, 179, 894, 179, 176, 177, 894, 176, 179,
+ 894, 176, 177, 894, 865, 179, 176, 177, 894, 894,
+ 179, 176, 177, 894, 894, 179, 894, 866, 176, 177,
+
+ 868, 894, 179, 176, 177, 869, 870, 179, 176, 177,
+ 176, 894, 179, 894, 894, 176, 867, 176, 894, 894,
+ 176, 177, 176, 871, 179, 874, 894, 894, 872, 894,
+ 176, 177, 868, 894, 179, 176, 894, 869, 870, 894,
+ 176, 894, 176, 894, 176, 177, 894, 176, 179, 894,
+ 873, 894, 894, 176, 894, 871, 894, 874, 176, 875,
+ 872, 176, 177, 176, 894, 179, 894, 176, 177, 894,
+ 176, 179, 877, 894, 894, 176, 876, 247, 894, 894,
+ 176, 894, 873, 894, 894, 247, 247, 247, 247, 247,
+ 247, 875, 176, 894, 176, 177, 894, 878, 179, 894,
+
+ 894, 252, 176, 894, 877, 894, 894, 894, 876, 252,
+ 252, 252, 252, 252, 252, 257, 176, 247, 247, 247,
+ 247, 247, 247, 257, 257, 257, 257, 257, 257, 878,
+ 894, 894, 894, 176, 176, 177, 894, 894, 179, 176,
+ 266, 252, 252, 252, 252, 252, 252, 894, 266, 266,
+ 266, 266, 266, 266, 894, 257, 257, 257, 257, 257,
+ 257, 176, 177, 879, 894, 179, 176, 176, 177, 176,
+ 177, 179, 894, 179, 176, 177, 894, 894, 179, 894,
+ 266, 266, 266, 266, 266, 266, 880, 176, 177, 176,
+ 177, 179, 894, 179, 882, 879, 894, 881, 176, 177,
+
+ 176, 177, 179, 894, 179, 894, 176, 894, 176, 177,
+ 894, 883, 179, 884, 894, 176, 177, 894, 880, 179,
+ 176, 177, 894, 894, 179, 894, 882, 176, 177, 881,
+ 894, 179, 894, 176, 176, 177, 176, 177, 179, 176,
+ 179, 176, 894, 883, 885, 884, 176, 176, 177, 176,
+ 177, 179, 894, 179, 176, 177, 176, 177, 179, 176,
+ 179, 176, 176, 177, 894, 894, 179, 894, 886, 894,
+ 176, 894, 176, 887, 894, 894, 885, 894, 888, 894,
+ 176, 894, 176, 177, 176, 177, 179, 176, 179, 894,
+ 176, 177, 176, 894, 179, 894, 176, 177, 894, 176,
+
+ 179, 894, 894, 894, 894, 887, 176, 889, 176, 894,
+ 888, 176, 177, 176, 177, 179, 894, 179, 894, 176,
+ 891, 176, 894, 176, 177, 890, 176, 179, 176, 176,
+ 177, 894, 894, 179, 176, 892, 894, 894, 894, 889,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 891, 894, 176, 894, 176, 890, 893, 894,
+ 894, 894, 176, 894, 894, 894, 894, 892, 176, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 176, 894, 176, 894, 894, 894, 894,
+ 893, 894, 894, 894, 894, 176, 894, 894, 894, 894,
+
+ 894, 176, 28, 28, 28, 28, 28, 28, 28, 28,
28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
- 28, 28, 65, 65, 65, 65, 65, 65, 65, 65,
- 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
- 65, 65, 65, 70, 70, 70, 70, 70, 70, 70,
- 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
- 70, 70, 70, 70, 75, 75, 75, 75, 75, 75,
- 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
- 75, 75, 75, 75, 75, 80, 80, 80, 80, 80,
- 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
- 80, 80, 80, 80, 80, 80, 85, 85, 85, 85,
-
- 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 91, 91, 91,
- 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
- 91, 91, 91, 91, 91, 91, 91, 91, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
- 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
-
- 115, 119, 119, 119, 119, 119, 119, 119, 119, 119,
- 119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
- 119, 119, 127, 156, 127, 127, 127, 127, 127, 127,
- 127, 127, 127, 127, 127, 127, 127, 127, 252, 127,
- 127, 127, 127, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 133, 133, 133, 133, 133, 133,
- 252, 133, 133, 137, 334, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 199,
- 137, 137, 137, 137, 145, 245, 244, 145, 145, 145,
-
- 243, 145, 145, 183, 145, 146, 183, 146, 146, 146,
- 146, 146, 146, 146, 146, 146, 146, 146, 274, 146,
- 146, 274, 146, 150, 150, 150, 274, 174, 150, 153,
- 153, 174, 153, 153, 167, 153, 153, 153, 162, 153,
- 153, 223, 153, 157, 148, 157, 157, 148, 157, 157,
- 157, 222, 157, 157, 151, 151, 217, 151, 151, 209,
- 151, 151, 151, 125, 151, 151, 209, 151, 161, 124,
- 204, 161, 161, 203, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 161, 161, 161,
- 161, 275, 203, 201, 275, 199, 197, 196, 194, 275,
-
- 161, 161, 194, 161, 166, 125, 124, 166, 191, 166,
- 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
- 166, 166, 166, 166, 166, 166, 166, 276, 190, 125,
- 276, 124, 125, 124, 183, 276, 166, 166, 183, 166,
- 171, 174, 174, 171, 171, 171, 171, 171, 171, 171,
- 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
- 171, 171, 171, 277, 168, 168, 277, 167, 163, 163,
- 162, 277, 171, 171, 159, 171, 180, 155, 149, 180,
- 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
- 180, 180, 180, 180, 180, 180, 180, 180, 180, 278,
-
- 141, 140, 278, 139, 138, 136, 126, 278, 180, 180,
- 125, 180, 193, 193, 193, 193, 125, 124, 334, 334,
- 193, 334, 193, 193, 193, 193, 193, 193, 193, 193,
- 193, 334, 193, 195, 334, 334, 195, 334, 195, 195,
- 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
- 195, 195, 195, 195, 198, 334, 334, 198, 198, 198,
- 198, 198, 198, 334, 198, 198, 198, 198, 198, 198,
- 198, 198, 198, 198, 198, 202, 334, 334, 202, 202,
- 334, 202, 202, 202, 202, 202, 202, 202, 202, 202,
- 202, 334, 202, 202, 202, 202, 205, 205, 205, 205,
-
- 205, 205, 205, 205, 205, 205, 205, 205, 205, 205,
- 205, 205, 205, 205, 205, 205, 205, 128, 334, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 334, 128, 128, 128, 128, 212, 334,
- 334, 212, 212, 212, 334, 212, 212, 334, 212, 221,
- 221, 334, 221, 334, 334, 221, 221, 221, 334, 221,
- 221, 334, 221, 226, 334, 334, 226, 226, 334, 226,
- 334, 334, 226, 226, 226, 279, 226, 226, 279, 226,
- 228, 334, 334, 279, 228, 334, 334, 334, 334, 228,
- 228, 228, 334, 228, 228, 229, 334, 334, 229, 229,
-
- 229, 334, 229, 229, 334, 229, 171, 334, 334, 171,
- 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
- 171, 171, 171, 171, 171, 171, 171, 171, 171, 280,
- 334, 334, 280, 334, 334, 334, 334, 280, 171, 171,
- 334, 171, 180, 334, 334, 180, 180, 180, 180, 180,
- 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
- 180, 180, 180, 180, 180, 296, 334, 334, 296, 334,
- 334, 334, 334, 296, 180, 180, 334, 180, 193, 193,
- 193, 193, 334, 334, 334, 334, 193, 334, 193, 193,
- 193, 193, 193, 193, 193, 193, 193, 334, 193, 195,
-
- 334, 334, 195, 195, 195, 195, 195, 195, 195, 195,
- 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
- 246, 246, 246, 246, 246, 246, 246, 246, 246, 246,
- 246, 246, 246, 246, 246, 246, 246, 246, 246, 246,
- 246, 198, 334, 334, 198, 198, 198, 198, 198, 198,
- 334, 198, 198, 198, 198, 198, 198, 198, 198, 198,
- 198, 198, 202, 334, 334, 202, 202, 334, 202, 202,
- 202, 202, 202, 202, 202, 202, 202, 202, 334, 202,
- 202, 202, 202, 249, 334, 334, 249, 249, 334, 249,
- 249, 249, 249, 249, 249, 249, 249, 249, 249, 334,
-
- 249, 249, 249, 249, 250, 334, 334, 250, 250, 334,
- 250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
- 334, 250, 250, 250, 250, 251, 334, 251, 251, 251,
- 334, 251, 251, 251, 251, 251, 251, 251, 251, 251,
- 251, 334, 251, 251, 251, 251, 253, 253, 334, 253,
- 253, 334, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 334, 253, 253, 253, 253, 212, 334, 334,
- 212, 212, 212, 334, 212, 212, 334, 212, 254, 334,
- 334, 254, 254, 254, 254, 254, 254, 254, 254, 254,
- 254, 254, 254, 254, 334, 254, 254, 254, 254, 258,
-
- 334, 334, 334, 297, 334, 258, 297, 334, 258, 258,
- 258, 297, 258, 258, 221, 221, 334, 221, 334, 334,
- 221, 221, 221, 334, 221, 221, 298, 221, 263, 298,
- 334, 263, 263, 263, 298, 334, 263, 264, 334, 334,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 334, 264, 264, 264, 264, 267, 334,
- 334, 267, 267, 334, 267, 334, 334, 267, 267, 267,
- 334, 267, 267, 334, 267, 268, 268, 334, 268, 268,
- 334, 268, 268, 268, 299, 268, 268, 299, 268, 269,
- 334, 334, 299, 300, 334, 334, 300, 334, 269, 269,
-
- 269, 300, 269, 269, 270, 334, 270, 334, 334, 270,
- 270, 270, 334, 270, 270, 271, 271, 334, 271, 334,
- 334, 271, 271, 271, 334, 271, 271, 334, 271, 171,
- 334, 334, 171, 171, 334, 171, 171, 171, 171, 171,
- 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
- 180, 334, 334, 180, 334, 180, 180, 180, 180, 180,
- 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
- 180, 284, 334, 334, 284, 284, 284, 284, 284, 284,
- 284, 284, 284, 284, 284, 284, 284, 334, 284, 284,
- 284, 284, 286, 334, 334, 286, 286, 286, 334, 286,
-
- 286, 288, 334, 334, 334, 301, 334, 334, 301, 334,
- 288, 288, 288, 301, 288, 288, 290, 334, 334, 290,
- 290, 290, 290, 290, 290, 290, 290, 290, 290, 290,
- 290, 290, 334, 290, 290, 290, 290, 293, 293, 334,
- 293, 293, 334, 293, 293, 293, 302, 293, 293, 302,
- 293, 295, 334, 295, 302, 334, 295, 295, 295, 303,
- 295, 295, 303, 334, 334, 334, 334, 303, 305, 334,
- 334, 305, 305, 305, 305, 305, 305, 305, 305, 305,
- 305, 305, 305, 305, 334, 305, 305, 305, 305, 307,
- 334, 334, 307, 307, 307, 334, 307, 307, 216, 334,
-
- 334, 334, 334, 334, 334, 216, 334, 216, 216, 216,
- 334, 216, 216, 309, 334, 334, 309, 309, 334, 309,
- 334, 334, 309, 309, 309, 311, 309, 309, 311, 309,
- 310, 334, 334, 311, 161, 334, 334, 161, 334, 310,
- 310, 310, 161, 310, 310, 312, 166, 313, 312, 166,
- 313, 334, 334, 312, 166, 313, 171, 314, 180, 171,
- 314, 180, 334, 334, 171, 314, 180, 316, 334, 334,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 334, 316, 316, 316, 316, 318, 318,
- 334, 318, 318, 334, 318, 318, 318, 334, 318, 318,
-
- 320, 318, 319, 320, 334, 319, 319, 319, 320, 319,
- 319, 321, 322, 323, 321, 322, 323, 334, 334, 321,
- 322, 323, 325, 326, 327, 325, 326, 327, 334, 334,
- 325, 326, 327, 328, 330, 331, 328, 330, 331, 334,
- 334, 328, 330, 331, 332, 333, 334, 332, 333, 334,
- 334, 334, 332, 333, 27, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 92, 92,
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 92, 92, 92, 97, 97, 97, 97,
+ 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,
+ 97, 97, 97, 97, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 107, 107, 107, 107, 107, 107, 107, 107,
+
+ 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
+ 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
+ 113, 113, 113, 113, 113, 113, 113, 113, 121, 121,
+ 121, 121, 121, 121, 121, 121, 121, 121, 121, 121,
+ 121, 121, 121, 121, 121, 121, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 137, 137, 137, 137, 137, 137,
+ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
+ 137, 137, 141, 141, 141, 141, 141, 141, 141, 141,
+ 141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
+
+ 149, 894, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 894, 149, 149, 149, 152, 152,
+ 152, 152, 152, 152, 152, 152, 152, 152, 152, 152,
+ 152, 152, 152, 152, 152, 152, 155, 155, 155, 155,
+ 894, 155, 159, 894, 159, 159, 159, 159, 159, 159,
+ 159, 159, 159, 159, 159, 159, 894, 159, 159, 159,
+ 167, 894, 894, 167, 894, 167, 894, 167, 168, 894,
+ 168, 168, 168, 168, 168, 168, 168, 168, 168, 894,
+ 168, 894, 168, 172, 172, 172, 172, 894, 172, 178,
+ 178, 894, 178, 178, 894, 178, 894, 178, 894, 178,
+
+ 243, 894, 243, 243, 894, 243, 894, 243, 176, 176,
+ 894, 176, 176, 894, 176, 894, 176, 894, 176, 247,
+ 894, 894, 247, 247, 894, 247, 247, 247, 247, 247,
+ 247, 247, 247, 247, 247, 247, 247, 252, 894, 894,
+ 252, 894, 252, 252, 252, 252, 252, 252, 252, 252,
+ 252, 252, 252, 252, 252, 257, 894, 894, 257, 257,
+ 257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
+ 257, 257, 257, 266, 894, 894, 266, 266, 266, 266,
+ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ 266, 279, 279, 279, 279, 894, 894, 894, 894, 279,
+
+ 894, 279, 279, 279, 279, 279, 279, 894, 279, 281,
+ 894, 894, 281, 894, 281, 281, 281, 281, 281, 281,
+ 281, 281, 281, 281, 281, 281, 281, 284, 894, 894,
+ 284, 284, 284, 284, 284, 284, 894, 284, 284, 284,
+ 284, 284, 284, 284, 284, 288, 894, 894, 288, 288,
+ 894, 288, 288, 288, 288, 288, 288, 288, 288, 894,
+ 288, 288, 288, 291, 291, 291, 291, 291, 291, 291,
+ 291, 291, 291, 291, 291, 291, 291, 291, 291, 291,
+ 291, 149, 894, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 894, 149, 149, 149, 150,
+
+ 894, 150, 150, 150, 150, 150, 150, 150, 150, 150,
+ 150, 150, 150, 894, 150, 150, 150, 298, 894, 894,
+ 298, 894, 298, 894, 298, 159, 894, 159, 159, 159,
+ 159, 159, 159, 159, 159, 159, 159, 159, 159, 894,
+ 159, 159, 159, 307, 307, 894, 307, 894, 894, 307,
+ 894, 307, 894, 307, 168, 894, 168, 168, 168, 168,
+ 168, 168, 168, 168, 168, 894, 168, 894, 168, 309,
+ 894, 894, 309, 894, 309, 894, 309, 317, 894, 894,
+ 317, 317, 894, 317, 894, 894, 317, 894, 317, 894,
+ 317, 178, 178, 894, 178, 178, 894, 178, 894, 178,
+
+ 894, 178, 167, 894, 894, 167, 894, 167, 894, 167,
+ 416, 894, 894, 894, 416, 894, 894, 894, 894, 416,
+ 894, 416, 243, 894, 243, 894, 894, 243, 894, 243,
+ 417, 894, 894, 417, 894, 417, 894, 417, 247, 894,
+ 894, 247, 247, 894, 247, 247, 247, 247, 247, 247,
+ 247, 247, 247, 247, 247, 247, 252, 894, 894, 252,
+ 894, 252, 252, 252, 252, 252, 252, 252, 252, 252,
+ 252, 252, 252, 252, 257, 894, 894, 257, 257, 257,
+ 257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
+ 257, 257, 266, 894, 894, 266, 266, 266, 266, 266,
+
+ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ 279, 279, 279, 279, 894, 894, 894, 894, 279, 894,
+ 279, 279, 279, 279, 279, 279, 894, 279, 281, 894,
+ 894, 281, 281, 281, 281, 281, 281, 281, 281, 281,
+ 281, 281, 281, 281, 281, 281, 434, 434, 434, 434,
+ 434, 434, 434, 434, 434, 434, 434, 434, 434, 434,
+ 434, 434, 434, 434, 284, 894, 894, 284, 284, 284,
+ 284, 284, 284, 894, 284, 284, 284, 284, 284, 284,
+ 284, 284, 288, 894, 894, 288, 288, 894, 288, 288,
+ 288, 288, 288, 288, 288, 288, 894, 288, 288, 288,
+
+ 437, 894, 894, 437, 437, 894, 437, 437, 437, 437,
+ 437, 437, 437, 437, 894, 437, 437, 437, 438, 894,
+ 894, 438, 438, 894, 438, 438, 438, 438, 438, 438,
+ 438, 438, 894, 438, 438, 438, 439, 894, 439, 439,
+ 439, 894, 439, 439, 439, 439, 439, 439, 439, 439,
+ 894, 439, 439, 439, 441, 441, 894, 441, 441, 894,
+ 441, 441, 441, 441, 441, 441, 441, 441, 894, 441,
+ 441, 441, 298, 894, 894, 298, 894, 298, 894, 298,
+ 442, 894, 894, 442, 442, 442, 442, 442, 442, 442,
+ 442, 442, 442, 442, 894, 442, 442, 442, 446, 894,
+
+ 894, 894, 894, 894, 446, 894, 894, 446, 894, 446,
+ 307, 307, 894, 307, 894, 894, 307, 894, 307, 894,
+ 307, 309, 894, 894, 309, 894, 309, 894, 309, 451,
+ 894, 894, 451, 451, 451, 451, 451, 451, 451, 451,
+ 451, 451, 451, 894, 451, 451, 451, 455, 894, 894,
+ 894, 894, 894, 455, 894, 894, 455, 894, 455, 461,
+ 894, 894, 461, 461, 461, 461, 461, 461, 461, 461,
+ 461, 461, 461, 894, 461, 461, 461, 464, 894, 894,
+ 464, 464, 894, 464, 894, 894, 464, 894, 464, 894,
+ 464, 465, 465, 894, 465, 465, 894, 465, 894, 465,
+
+ 894, 465, 178, 178, 894, 178, 178, 894, 178, 894,
+ 178, 894, 178, 558, 894, 894, 894, 894, 894, 894,
+ 894, 894, 558, 894, 558, 559, 894, 559, 894, 894,
+ 559, 894, 559, 560, 560, 894, 560, 894, 894, 560,
+ 894, 560, 894, 560, 257, 894, 894, 257, 257, 894,
+ 257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
+ 257, 257, 266, 894, 894, 266, 894, 266, 266, 266,
+ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ 434, 434, 434, 434, 434, 434, 434, 434, 434, 434,
+ 434, 434, 434, 434, 434, 434, 434, 434, 437, 894,
+
+ 894, 437, 437, 894, 437, 437, 437, 437, 437, 437,
+ 437, 437, 894, 437, 437, 437, 438, 894, 894, 438,
+ 438, 894, 438, 438, 438, 438, 438, 438, 438, 438,
+ 894, 438, 438, 438, 439, 894, 894, 439, 439, 894,
+ 439, 439, 439, 439, 439, 439, 439, 439, 894, 439,
+ 439, 439, 441, 894, 894, 441, 441, 894, 441, 441,
+ 441, 441, 441, 441, 441, 441, 894, 441, 441, 441,
+ 442, 894, 894, 442, 442, 442, 442, 442, 442, 442,
+ 442, 442, 442, 442, 894, 442, 442, 442, 573, 894,
+ 894, 573, 573, 573, 573, 573, 573, 573, 573, 573,
+
+ 573, 573, 894, 573, 573, 573, 575, 894, 894, 575,
+ 894, 575, 577, 894, 894, 894, 894, 894, 894, 894,
+ 894, 577, 894, 577, 448, 894, 448, 894, 894, 448,
+ 894, 448, 451, 894, 894, 451, 451, 451, 451, 451,
+ 451, 451, 451, 451, 451, 451, 894, 451, 451, 451,
+ 579, 894, 894, 579, 579, 579, 579, 579, 579, 579,
+ 579, 579, 579, 579, 894, 579, 579, 579, 581, 894,
+ 894, 581, 894, 581, 583, 894, 894, 894, 894, 894,
+ 894, 894, 894, 583, 894, 583, 457, 894, 457, 894,
+ 894, 457, 894, 457, 460, 894, 894, 460, 894, 894,
+
+ 460, 461, 894, 894, 461, 461, 461, 461, 461, 461,
+ 461, 461, 461, 461, 461, 894, 461, 461, 461, 585,
+ 894, 894, 585, 585, 585, 585, 585, 585, 585, 585,
+ 585, 585, 585, 894, 585, 585, 585, 588, 588, 894,
+ 588, 588, 894, 588, 894, 588, 894, 588, 465, 465,
+ 894, 465, 465, 894, 465, 894, 465, 894, 465, 178,
+ 178, 894, 178, 178, 894, 178, 894, 178, 894, 178,
+ 670, 894, 670, 894, 894, 670, 894, 670, 559, 894,
+ 559, 894, 894, 559, 894, 559, 560, 560, 894, 560,
+ 894, 894, 560, 894, 560, 894, 560, 680, 894, 894,
+
+ 680, 680, 680, 680, 680, 680, 680, 680, 680, 680,
+ 680, 894, 680, 680, 680, 682, 894, 894, 682, 894,
+ 682, 302, 894, 894, 894, 894, 894, 894, 302, 894,
+ 302, 894, 302, 683, 894, 894, 683, 683, 683, 683,
+ 683, 683, 683, 683, 683, 683, 683, 894, 683, 683,
+ 683, 685, 894, 894, 685, 894, 685, 313, 894, 894,
+ 894, 894, 894, 894, 313, 894, 313, 894, 313, 687,
+ 894, 894, 687, 687, 894, 687, 894, 894, 687, 894,
+ 687, 894, 687, 745, 894, 894, 894, 894, 894, 894,
+ 894, 894, 745, 894, 745, 751, 894, 894, 751, 751,
+
+ 751, 751, 751, 751, 751, 751, 751, 751, 751, 894,
+ 751, 751, 751, 753, 753, 894, 753, 753, 894, 753,
+ 894, 753, 894, 753, 796, 894, 894, 796, 894, 796,
+ 27, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894
} ;
-static yyconst flex_int16_t yy_chk[2019] =
+static yyconst flex_int16_t yy_chk[7721] =
{ 0,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
@@ -815,222 +1628,849 @@ static yyconst flex_int16_t yy_chk[2019] =
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 5, 5, 6, 6, 7, 7, 58,
- 7, 5, 58, 6, 8, 8, 316, 8, 9, 9,
- 10, 10, 11, 11, 64, 11, 9, 64, 10, 12,
- 12, 34, 12, 34, 13, 13, 13, 21, 21, 13,
-
- 289, 5, 75, 6, 13, 7, 22, 22, 21, 14,
- 14, 14, 8, 21, 14, 289, 9, 22, 10, 14,
- 11, 308, 22, 13, 15, 15, 15, 12, 15, 15,
- 35, 35, 75, 15, 15, 16, 16, 16, 14, 16,
- 16, 13, 23, 23, 16, 16, 17, 17, 17, 69,
- 23, 17, 18, 18, 18, 36, 14, 18, 24, 24,
- 36, 305, 47, 74, 47, 80, 24, 50, 50, 69,
- 54, 54, 295, 17, 54, 79, 47, 60, 60, 18,
- 23, 60, 15, 74, 78, 78, 83, 83, 294, 83,
- 84, 17, 78, 16, 47, 79, 24, 18, 19, 19,
-
- 80, 19, 88, 88, 95, 95, 19, 19, 19, 90,
- 84, 103, 19, 291, 19, 117, 54, 102, 102, 127,
- 117, 127, 78, 60, 83, 123, 123, 129, 90, 130,
- 130, 103, 132, 132, 141, 142, 214, 156, 143, 129,
- 143, 151, 152, 144, 151, 144, 141, 142, 144, 156,
- 214, 162, 143, 152, 152, 19, 152, 19, 20, 20,
- 157, 20, 167, 157, 141, 142, 20, 20, 20, 173,
- 143, 162, 20, 171, 20, 153, 153, 160, 172, 153,
- 160, 180, 167, 290, 177, 177, 182, 189, 181, 173,
- 186, 186, 177, 186, 196, 196, 287, 218, 284, 152,
-
- 225, 246, 246, 171, 242, 324, 182, 189, 172, 218,
- 281, 225, 225, 304, 225, 20, 180, 20, 134, 248,
- 248, 153, 177, 181, 242, 324, 283, 218, 186, 281,
- 226, 226, 304, 134, 226, 267, 267, 315, 272, 267,
- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
- 134, 134, 271, 270, 269, 315, 134, 225, 134, 134,
- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
- 134, 134, 215, 266, 215, 215, 226, 265, 264, 263,
- 261, 267, 215, 215, 215, 215, 215, 215, 215, 215,
- 215, 215, 215, 215, 259, 268, 268, 257, 215, 268,
-
- 215, 215, 215, 215, 215, 215, 215, 215, 215, 215,
- 215, 215, 215, 215, 216, 293, 293, 256, 255, 293,
- 254, 216, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 216, 292, 309, 309, 318, 318, 309, 253,
- 318, 268, 252, 375, 292, 292, 375, 292, 251, 376,
- 377, 375, 376, 377, 247, 238, 378, 376, 377, 378,
- 381, 293, 382, 381, 378, 382, 385, 234, 381, 385,
- 382, 229, 228, 386, 385, 407, 386, 227, 407, 224,
- 309, 386, 318, 407, 222, 221, 220, 219, 213, 211,
- 292, 335, 335, 335, 335, 335, 335, 335, 335, 335,
-
- 335, 335, 335, 335, 335, 335, 335, 335, 335, 335,
- 335, 335, 336, 336, 336, 336, 336, 336, 336, 336,
- 336, 336, 336, 336, 336, 336, 336, 336, 336, 336,
- 336, 336, 336, 337, 337, 337, 337, 337, 337, 337,
- 337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
- 337, 337, 337, 337, 338, 338, 338, 338, 338, 338,
- 338, 338, 338, 338, 338, 338, 338, 338, 338, 338,
- 338, 338, 338, 338, 338, 339, 339, 339, 339, 339,
- 339, 339, 339, 339, 339, 339, 339, 339, 339, 339,
- 339, 339, 339, 339, 339, 339, 340, 340, 340, 340,
-
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 341, 341, 341,
- 341, 341, 341, 341, 341, 341, 341, 341, 341, 341,
- 341, 341, 341, 341, 341, 341, 341, 341, 342, 342,
- 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
- 342, 342, 342, 342, 342, 342, 342, 342, 342, 343,
- 343, 343, 343, 343, 343, 343, 343, 343, 343, 343,
- 343, 343, 343, 343, 343, 343, 343, 343, 343, 343,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
-
- 344, 345, 345, 345, 345, 345, 345, 345, 345, 345,
- 345, 345, 345, 345, 345, 345, 345, 345, 345, 345,
- 345, 345, 346, 208, 346, 346, 346, 346, 346, 346,
- 346, 346, 346, 346, 346, 346, 346, 346, 207, 346,
- 346, 346, 346, 347, 347, 347, 347, 347, 347, 347,
- 347, 347, 347, 347, 347, 347, 347, 347, 347, 347,
- 347, 347, 347, 347, 348, 348, 348, 348, 348, 348,
- 206, 348, 348, 349, 199, 349, 349, 349, 349, 349,
- 349, 349, 349, 349, 349, 349, 349, 349, 349, 198,
- 349, 349, 349, 349, 350, 195, 191, 350, 350, 350,
-
- 190, 350, 350, 185, 350, 351, 184, 351, 351, 351,
- 351, 351, 351, 351, 351, 351, 351, 351, 408, 351,
- 351, 408, 351, 352, 352, 352, 408, 176, 352, 353,
- 353, 175, 353, 353, 166, 353, 353, 353, 161, 353,
- 353, 150, 353, 354, 147, 354, 354, 146, 354, 354,
- 354, 145, 354, 354, 355, 355, 138, 355, 355, 137,
- 355, 355, 355, 131, 355, 355, 128, 355, 356, 124,
- 122, 356, 356, 121, 356, 356, 356, 356, 356, 356,
- 356, 356, 356, 356, 356, 356, 356, 356, 356, 357,
- 357, 409, 120, 118, 409, 115, 112, 111, 106, 409,
-
- 357, 357, 105, 357, 358, 101, 100, 358, 96, 358,
- 358, 358, 358, 358, 358, 358, 358, 358, 358, 358,
- 358, 358, 358, 358, 358, 359, 359, 410, 94, 93,
- 410, 92, 87, 86, 82, 410, 359, 359, 81, 359,
- 360, 77, 76, 360, 360, 360, 360, 360, 360, 360,
- 360, 360, 360, 360, 360, 360, 360, 360, 360, 360,
- 360, 361, 361, 412, 72, 71, 412, 70, 67, 66,
- 65, 412, 361, 361, 62, 361, 362, 57, 52, 362,
- 362, 362, 362, 362, 362, 362, 362, 362, 362, 362,
- 362, 362, 362, 362, 362, 362, 362, 363, 363, 413,
-
- 45, 42, 413, 41, 38, 37, 33, 413, 363, 363,
- 32, 363, 364, 364, 364, 364, 31, 30, 27, 0,
- 364, 0, 364, 364, 364, 364, 364, 364, 364, 364,
- 364, 0, 364, 365, 0, 0, 365, 0, 365, 365,
- 365, 365, 365, 365, 365, 365, 365, 365, 365, 365,
- 365, 365, 365, 365, 366, 0, 0, 366, 366, 366,
- 366, 366, 366, 0, 366, 366, 366, 366, 366, 366,
- 366, 366, 366, 366, 366, 367, 0, 0, 367, 367,
- 0, 367, 367, 367, 367, 367, 367, 367, 367, 367,
- 367, 0, 367, 367, 367, 367, 368, 368, 368, 368,
-
- 368, 368, 368, 368, 368, 368, 368, 368, 368, 368,
- 368, 368, 368, 368, 368, 368, 368, 369, 0, 369,
- 369, 369, 369, 369, 369, 369, 369, 369, 369, 369,
- 369, 369, 369, 0, 369, 369, 369, 369, 370, 0,
- 0, 370, 370, 370, 0, 370, 370, 0, 370, 371,
- 371, 0, 371, 0, 0, 371, 371, 371, 0, 371,
- 371, 0, 371, 372, 0, 0, 372, 372, 0, 372,
- 0, 0, 372, 372, 372, 415, 372, 372, 415, 372,
- 373, 0, 0, 415, 373, 0, 0, 0, 0, 373,
- 373, 373, 0, 373, 373, 374, 0, 0, 374, 374,
-
- 374, 0, 374, 374, 0, 374, 379, 0, 0, 379,
- 379, 379, 379, 379, 379, 379, 379, 379, 379, 379,
- 379, 379, 379, 379, 379, 379, 379, 380, 380, 416,
- 0, 0, 416, 0, 0, 0, 0, 416, 380, 380,
- 0, 380, 383, 0, 0, 383, 383, 383, 383, 383,
- 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
- 383, 383, 383, 384, 384, 423, 0, 0, 423, 0,
- 0, 0, 0, 423, 384, 384, 0, 384, 387, 387,
- 387, 387, 0, 0, 0, 0, 387, 0, 387, 387,
- 387, 387, 387, 387, 387, 387, 387, 0, 387, 388,
-
- 0, 0, 388, 388, 388, 388, 388, 388, 388, 388,
- 388, 388, 388, 388, 388, 388, 388, 388, 388, 388,
- 389, 389, 389, 389, 389, 389, 389, 389, 389, 389,
- 389, 389, 389, 389, 389, 389, 389, 389, 389, 389,
- 389, 390, 0, 0, 390, 390, 390, 390, 390, 390,
- 0, 390, 390, 390, 390, 390, 390, 390, 390, 390,
- 390, 390, 391, 0, 0, 391, 391, 0, 391, 391,
- 391, 391, 391, 391, 391, 391, 391, 391, 0, 391,
- 391, 391, 391, 392, 0, 0, 392, 392, 0, 392,
- 392, 392, 392, 392, 392, 392, 392, 392, 392, 0,
-
- 392, 392, 392, 392, 393, 0, 0, 393, 393, 0,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 0, 393, 393, 393, 393, 394, 0, 394, 394, 394,
- 0, 394, 394, 394, 394, 394, 394, 394, 394, 394,
- 394, 0, 394, 394, 394, 394, 395, 395, 0, 395,
- 395, 0, 395, 395, 395, 395, 395, 395, 395, 395,
- 395, 395, 0, 395, 395, 395, 395, 396, 0, 0,
- 396, 396, 396, 0, 396, 396, 0, 396, 397, 0,
- 0, 397, 397, 397, 397, 397, 397, 397, 397, 397,
- 397, 397, 397, 397, 0, 397, 397, 397, 397, 398,
-
- 0, 0, 0, 424, 0, 398, 424, 0, 398, 398,
- 398, 424, 398, 398, 399, 399, 0, 399, 0, 0,
- 399, 399, 399, 0, 399, 399, 425, 399, 400, 425,
- 0, 400, 400, 400, 425, 0, 400, 401, 0, 0,
- 401, 401, 401, 401, 401, 401, 401, 401, 401, 401,
- 401, 401, 401, 0, 401, 401, 401, 401, 402, 0,
- 0, 402, 402, 0, 402, 0, 0, 402, 402, 402,
- 0, 402, 402, 0, 402, 403, 403, 0, 403, 403,
- 0, 403, 403, 403, 426, 403, 403, 426, 403, 404,
- 0, 0, 426, 427, 0, 0, 427, 0, 404, 404,
-
- 404, 427, 404, 404, 405, 0, 405, 0, 0, 405,
- 405, 405, 0, 405, 405, 406, 406, 0, 406, 0,
- 0, 406, 406, 406, 0, 406, 406, 0, 406, 411,
- 0, 0, 411, 411, 0, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 414, 0, 0, 414, 0, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 417, 0, 0, 417, 417, 417, 417, 417, 417,
- 417, 417, 417, 417, 417, 417, 417, 0, 417, 417,
- 417, 417, 418, 0, 0, 418, 418, 418, 0, 418,
-
- 418, 419, 0, 0, 0, 428, 0, 0, 428, 0,
- 419, 419, 419, 428, 419, 419, 420, 0, 0, 420,
- 420, 420, 420, 420, 420, 420, 420, 420, 420, 420,
- 420, 420, 0, 420, 420, 420, 420, 421, 421, 0,
- 421, 421, 0, 421, 421, 421, 429, 421, 421, 429,
- 421, 422, 0, 422, 429, 0, 422, 422, 422, 430,
- 422, 422, 430, 0, 0, 0, 0, 430, 431, 0,
- 0, 431, 431, 431, 431, 431, 431, 431, 431, 431,
- 431, 431, 431, 431, 0, 431, 431, 431, 431, 432,
- 0, 0, 432, 432, 432, 0, 432, 432, 433, 0,
-
- 0, 0, 0, 0, 0, 433, 0, 433, 433, 433,
- 0, 433, 433, 434, 0, 0, 434, 434, 0, 434,
- 0, 0, 434, 434, 434, 436, 434, 434, 436, 434,
- 435, 0, 0, 436, 437, 0, 0, 437, 0, 435,
- 435, 435, 437, 435, 435, 438, 439, 440, 438, 439,
- 440, 0, 0, 438, 439, 440, 441, 442, 443, 441,
- 442, 443, 0, 0, 441, 442, 443, 444, 0, 0,
- 444, 444, 444, 444, 444, 444, 444, 444, 444, 444,
- 444, 444, 444, 0, 444, 444, 444, 444, 445, 445,
- 0, 445, 445, 0, 445, 445, 445, 0, 445, 445,
-
- 447, 445, 446, 447, 0, 446, 446, 446, 447, 446,
- 446, 448, 449, 450, 448, 449, 450, 0, 0, 448,
- 449, 450, 451, 452, 453, 451, 452, 453, 0, 0,
- 451, 452, 453, 454, 455, 456, 454, 455, 456, 0,
- 0, 454, 455, 456, 457, 458, 0, 457, 458, 0,
- 0, 0, 457, 458, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
-
- 334, 334, 334, 334, 334, 334, 334, 334, 334, 334,
- 334, 334, 334, 334, 334, 334, 334, 334
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 5,
+ 5, 6, 6, 7, 7, 80, 7, 5, 80, 6,
+
+ 8, 8, 97, 8, 9, 9, 10, 10, 11, 11,
+ 86, 11, 9, 86, 10, 12, 12, 913, 12, 13,
+ 13, 13, 35, 35, 13, 14, 14, 14, 176, 13,
+ 14, 176, 17, 17, 17, 14, 34, 17, 34, 21,
+ 21, 5, 36, 6, 53, 7, 97, 36, 13, 53,
+ 21, 102, 8, 751, 14, 21, 9, 686, 10, 17,
+ 11, 15, 15, 15, 683, 15, 15, 12, 50, 50,
+ 15, 15, 16, 16, 16, 151, 16, 16, 110, 110,
+ 13, 16, 16, 18, 18, 18, 14, 151, 18, 19,
+ 19, 17, 19, 112, 47, 680, 47, 19, 19, 19,
+
+ 102, 22, 22, 19, 125, 19, 20, 20, 47, 20,
+ 18, 149, 22, 149, 20, 20, 20, 22, 23, 23,
+ 20, 670, 20, 24, 24, 112, 23, 100, 100, 55,
+ 55, 24, 300, 55, 139, 100, 125, 59, 59, 139,
+ 47, 59, 18, 56, 56, 15, 300, 56, 64, 64,
+ 275, 55, 64, 55, 56, 669, 16, 242, 55, 57,
+ 57, 55, 56, 57, 117, 117, 124, 124, 56, 242,
+ 23, 59, 19, 578, 19, 24, 61, 61, 56, 100,
+ 61, 57, 275, 55, 57, 55, 56, 57, 578, 20,
+ 55, 20, 586, 55, 56, 105, 105, 166, 105, 166,
+
+ 56, 55, 166, 59, 61, 145, 145, 58, 58, 59,
+ 56, 58, 585, 57, 266, 56, 57, 60, 58, 57,
+ 64, 60, 58, 75, 75, 60, 58, 75, 62, 62,
+ 582, 57, 62, 163, 60, 58, 61, 60, 65, 62,
+ 267, 75, 75, 152, 152, 163, 65, 105, 61, 60,
+ 58, 66, 65, 60, 58, 154, 154, 60, 58, 66,
+ 69, 69, 65, 266, 69, 66, 60, 58, 579, 60,
+ 65, 62, 67, 75, 75, 66, 576, 163, 65, 58,
+ 67, 178, 178, 66, 65, 178, 67, 164, 69, 267,
+ 246, 66, 67, 246, 65, 75, 67, 66, 257, 164,
+
+ 62, 63, 63, 573, 67, 63, 258, 66, 282, 282,
+ 68, 68, 67, 311, 68, 63, 572, 63, 67, 430,
+ 69, 561, 68, 560, 67, 63, 68, 311, 67, 63,
+ 63, 164, 69, 70, 70, 73, 68, 70, 68, 73,
+ 71, 71, 257, 73, 71, 272, 272, 63, 272, 63,
+ 258, 430, 73, 178, 68, 71, 559, 63, 68, 187,
+ 187, 63, 63, 187, 70, 73, 584, 73, 68, 960,
+ 68, 73, 960, 63, 558, 73, 165, 570, 165, 74,
+ 74, 584, 68, 74, 73, 434, 434, 71, 76, 76,
+ 165, 463, 76, 513, 82, 82, 70, 272, 82, 462,
+
+ 181, 181, 461, 74, 181, 70, 201, 201, 74, 570,
+ 201, 76, 71, 72, 181, 72, 82, 72, 82, 436,
+ 436, 72, 165, 82, 513, 91, 82, 72, 460, 72,
+ 91, 187, 72, 72, 96, 74, 933, 72, 201, 96,
+ 74, 458, 933, 76, 457, 72, 181, 72, 82, 72,
+ 82, 74, 456, 72, 454, 82, 513, 453, 82, 72,
+ 76, 72, 629, 679, 72, 72, 82, 91, 101, 72,
+ 201, 452, 181, 101, 91, 451, 96, 106, 201, 91,
+ 91, 449, 106, 96, 91, 304, 184, 184, 96, 96,
+ 184, 448, 91, 96, 629, 679, 91, 304, 91, 91,
+
+ 91, 96, 186, 186, 447, 96, 186, 96, 96, 96,
+ 101, 445, 263, 263, 712, 184, 444, 101, 443, 106,
+ 263, 442, 101, 101, 750, 770, 106, 101, 801, 304,
+ 435, 106, 106, 186, 426, 101, 106, 422, 417, 101,
+ 416, 101, 101, 101, 106, 415, 712, 184, 106, 315,
+ 106, 106, 106, 156, 310, 177, 750, 770, 184, 316,
+ 801, 308, 307, 306, 263, 186, 177, 177, 156, 177,
+ 316, 316, 305, 316, 186, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+
+ 156, 299, 297, 294, 293, 156, 292, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 173, 285, 284, 281, 277, 177, 276,
+ 271, 270, 316, 262, 261, 252, 317, 317, 173, 247,
+ 317, 243, 175, 169, 168, 173, 173, 173, 173, 173,
+ 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+ 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+ 173, 167, 160, 159, 153, 173, 150, 173, 173, 173,
+ 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+
+ 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+ 173, 173, 173, 180, 180, 182, 182, 180, 317, 182,
+ 183, 183, 185, 185, 183, 146, 185, 144, 182, 188,
+ 188, 143, 142, 188, 189, 189, 182, 183, 189, 140,
+ 188, 137, 185, 180, 188, 189, 185, 134, 190, 190,
+ 191, 191, 190, 133, 191, 193, 193, 128, 189, 193,
+ 182, 127, 123, 190, 122, 189, 194, 194, 182, 183,
+ 194, 118, 188, 116, 185, 180, 188, 189, 185, 115,
+ 191, 114, 192, 192, 193, 180, 192, 182, 109, 108,
+ 189, 194, 183, 104, 185, 190, 103, 189, 192, 196,
+
+ 196, 188, 99, 196, 192, 98, 189, 94, 93, 92,
+ 192, 192, 191, 195, 195, 89, 193, 195, 88, 87,
+ 190, 196, 191, 194, 197, 197, 195, 193, 197, 84,
+ 192, 79, 195, 199, 199, 52, 192, 199, 194, 45,
+ 198, 198, 192, 192, 198, 42, 197, 41, 38, 37,
+ 33, 200, 200, 196, 192, 200, 32, 199, 195, 202,
+ 202, 587, 200, 202, 195, 198, 203, 203, 31, 30,
+ 203, 196, 587, 587, 202, 587, 200, 27, 197, 205,
+ 205, 0, 0, 205, 0, 195, 204, 204, 0, 199,
+ 204, 0, 203, 0, 200, 0, 197, 198, 205, 0,
+
+ 204, 0, 204, 0, 0, 199, 202, 0, 200, 0,
+ 0, 0, 198, 207, 207, 204, 204, 207, 0, 0,
+ 0, 212, 212, 200, 203, 212, 0, 0, 0, 0,
+ 205, 202, 204, 0, 204, 212, 0, 207, 203, 209,
+ 209, 0, 0, 209, 587, 208, 208, 204, 204, 208,
+ 209, 205, 211, 211, 0, 0, 211, 0, 204, 206,
+ 206, 215, 215, 206, 0, 215, 208, 212, 208, 207,
+ 0, 206, 0, 0, 0, 208, 211, 0, 206, 213,
+ 213, 206, 209, 213, 0, 207, 0, 206, 319, 319,
+ 206, 215, 319, 212, 0, 210, 210, 0, 208, 210,
+
+ 208, 0, 213, 206, 0, 214, 214, 208, 211, 214,
+ 206, 209, 0, 206, 216, 216, 210, 208, 216, 206,
+ 0, 210, 206, 215, 211, 0, 0, 214, 0, 210,
+ 0, 206, 0, 215, 213, 0, 216, 217, 217, 218,
+ 218, 217, 0, 218, 0, 219, 219, 0, 210, 219,
+ 0, 213, 0, 210, 0, 218, 0, 217, 0, 214,
+ 319, 210, 220, 220, 0, 0, 220, 210, 216, 221,
+ 221, 0, 0, 221, 0, 219, 220, 214, 0, 222,
+ 222, 224, 224, 222, 221, 224, 216, 218, 0, 217,
+ 222, 0, 0, 0, 0, 0, 223, 223, 225, 225,
+
+ 223, 0, 225, 0, 224, 0, 0, 219, 220, 217,
+ 223, 218, 0, 223, 0, 0, 221, 219, 0, 0,
+ 0, 0, 222, 225, 226, 226, 223, 0, 226, 230,
+ 230, 228, 228, 230, 220, 228, 224, 0, 0, 227,
+ 227, 221, 223, 227, 0, 223, 226, 228, 0, 0,
+ 0, 222, 226, 224, 230, 225, 0, 230, 223, 229,
+ 229, 227, 228, 229, 0, 231, 231, 0, 223, 231,
+ 225, 232, 232, 0, 0, 232, 0, 231, 226, 228,
+ 0, 229, 0, 232, 226, 0, 230, 0, 231, 230,
+ 0, 233, 233, 227, 228, 233, 226, 0, 320, 320,
+
+ 0, 230, 320, 228, 0, 0, 321, 321, 0, 231,
+ 321, 227, 0, 229, 0, 232, 0, 234, 234, 0,
+ 231, 234, 236, 236, 0, 233, 236, 0, 234, 0,
+ 0, 229, 237, 237, 236, 0, 237, 231, 238, 238,
+ 0, 236, 238, 232, 0, 0, 239, 239, 234, 0,
+ 239, 237, 0, 238, 0, 240, 240, 233, 0, 240,
+ 234, 0, 0, 233, 318, 318, 236, 0, 318, 0,
+ 320, 322, 322, 236, 0, 322, 239, 240, 321, 318,
+ 234, 0, 0, 237, 0, 238, 0, 0, 0, 234,
+ 235, 235, 235, 235, 236, 0, 235, 0, 248, 0,
+
+ 235, 235, 235, 248, 237, 0, 235, 235, 239, 240,
+ 238, 318, 344, 344, 0, 0, 344, 0, 239, 0,
+ 0, 0, 235, 235, 235, 235, 0, 240, 235, 0,
+ 0, 0, 235, 235, 235, 344, 318, 0, 235, 235,
+ 248, 323, 323, 322, 0, 323, 0, 248, 0, 0,
+ 250, 0, 248, 248, 0, 0, 323, 248, 250, 250,
+ 250, 250, 250, 250, 0, 248, 251, 344, 0, 248,
+ 0, 248, 248, 248, 251, 251, 251, 251, 251, 251,
+ 253, 0, 0, 0, 344, 253, 0, 0, 323, 0,
+ 250, 250, 250, 250, 250, 250, 0, 0, 0, 324,
+
+ 324, 0, 0, 324, 0, 0, 251, 251, 251, 251,
+ 251, 251, 0, 323, 324, 350, 350, 0, 0, 350,
+ 0, 0, 253, 325, 325, 0, 0, 325, 0, 253,
+ 0, 0, 255, 0, 253, 253, 0, 325, 0, 253,
+ 255, 255, 255, 255, 255, 255, 324, 253, 256, 0,
+ 0, 253, 0, 253, 253, 253, 256, 256, 256, 256,
+ 256, 256, 259, 0, 0, 0, 0, 259, 0, 325,
+ 0, 324, 255, 255, 255, 255, 255, 255, 326, 326,
+ 0, 0, 326, 0, 0, 0, 0, 350, 256, 256,
+ 256, 256, 256, 256, 0, 325, 331, 331, 0, 0,
+
+ 331, 0, 326, 0, 259, 0, 329, 329, 328, 328,
+ 329, 259, 328, 0, 264, 0, 259, 259, 0, 328,
+ 331, 259, 264, 264, 264, 264, 264, 264, 329, 259,
+ 265, 0, 0, 259, 326, 259, 259, 259, 265, 265,
+ 265, 265, 265, 265, 268, 0, 0, 0, 0, 268,
+ 326, 328, 331, 0, 264, 264, 264, 264, 264, 264,
+ 329, 355, 355, 347, 347, 355, 0, 347, 331, 0,
+ 265, 265, 265, 265, 265, 265, 0, 0, 329, 0,
+ 328, 0, 0, 0, 0, 0, 268, 327, 327, 0,
+ 0, 327, 0, 268, 347, 0, 273, 0, 268, 268,
+
+ 0, 0, 0, 268, 273, 273, 273, 273, 273, 273,
+ 0, 268, 274, 0, 0, 268, 327, 268, 268, 268,
+ 274, 274, 274, 274, 274, 274, 347, 367, 367, 0,
+ 0, 367, 0, 355, 0, 347, 273, 273, 273, 273,
+ 273, 273, 0, 0, 0, 0, 0, 0, 327, 0,
+ 0, 0, 274, 274, 274, 274, 274, 274, 301, 327,
+ 301, 301, 0, 0, 0, 0, 0, 0, 301, 301,
+ 301, 301, 301, 301, 301, 301, 301, 301, 301, 301,
+ 301, 301, 301, 301, 301, 301, 301, 301, 301, 301,
+ 301, 301, 301, 301, 0, 0, 0, 0, 301, 367,
+
+ 301, 301, 301, 301, 301, 301, 301, 301, 301, 301,
+ 301, 301, 301, 301, 301, 301, 301, 301, 301, 301,
+ 301, 301, 301, 301, 301, 301, 302, 0, 368, 368,
+ 0, 0, 368, 302, 302, 302, 302, 302, 302, 302,
+ 302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+ 302, 302, 302, 302, 302, 302, 302, 302, 302, 312,
+ 0, 312, 312, 0, 0, 0, 0, 0, 0, 312,
+ 312, 312, 312, 312, 312, 312, 312, 312, 312, 312,
+ 312, 312, 312, 312, 312, 312, 312, 312, 312, 312,
+ 312, 312, 312, 312, 312, 0, 0, 0, 0, 312,
+
+ 368, 312, 312, 312, 312, 312, 312, 312, 312, 312,
+ 312, 312, 312, 312, 312, 312, 312, 312, 312, 312,
+ 312, 312, 312, 312, 312, 312, 312, 313, 0, 372,
+ 372, 0, 0, 372, 313, 313, 313, 313, 313, 313,
+ 313, 313, 313, 313, 313, 313, 313, 313, 313, 313,
+ 313, 313, 313, 313, 313, 313, 313, 313, 313, 313,
+ 330, 330, 332, 332, 330, 0, 332, 333, 333, 0,
+ 0, 333, 0, 332, 0, 334, 334, 0, 333, 334,
+ 335, 335, 0, 0, 335, 0, 334, 338, 338, 330,
+ 0, 338, 0, 0, 334, 335, 336, 336, 339, 339,
+
+ 336, 372, 339, 337, 337, 332, 0, 337, 340, 340,
+ 333, 336, 340, 0, 0, 0, 337, 338, 334, 354,
+ 354, 330, 0, 354, 339, 0, 334, 335, 0, 0,
+ 340, 0, 330, 0, 332, 0, 341, 341, 0, 333,
+ 341, 343, 343, 336, 354, 343, 0, 334, 337, 338,
+ 342, 342, 335, 0, 342, 0, 339, 0, 0, 338,
+ 345, 345, 340, 0, 345, 341, 0, 0, 336, 0,
+ 339, 343, 0, 345, 0, 337, 354, 0, 0, 342,
+ 340, 346, 346, 348, 348, 346, 0, 348, 349, 349,
+ 0, 354, 349, 0, 351, 351, 0, 341, 351, 0,
+
+ 352, 352, 348, 343, 352, 345, 0, 346, 341, 351,
+ 0, 342, 349, 343, 0, 352, 353, 353, 0, 0,
+ 353, 0, 342, 356, 356, 0, 0, 356, 0, 357,
+ 357, 353, 345, 357, 348, 0, 359, 359, 0, 346,
+ 359, 351, 358, 358, 349, 356, 358, 352, 361, 361,
+ 0, 359, 361, 346, 0, 348, 0, 357, 360, 360,
+ 349, 358, 360, 353, 0, 361, 351, 0, 0, 362,
+ 362, 0, 352, 362, 0, 363, 363, 356, 0, 363,
+ 0, 364, 364, 359, 362, 364, 360, 0, 353, 357,
+ 0, 0, 0, 358, 363, 356, 364, 361, 365, 365,
+
+ 0, 357, 365, 369, 369, 0, 0, 369, 359, 366,
+ 366, 0, 365, 366, 358, 0, 362, 0, 360, 0,
+ 361, 370, 370, 373, 366, 370, 363, 0, 364, 0,
+ 360, 371, 371, 0, 369, 371, 0, 0, 373, 373,
+ 370, 362, 373, 0, 365, 0, 371, 363, 0, 0,
+ 0, 374, 374, 364, 0, 374, 366, 376, 376, 375,
+ 375, 376, 0, 375, 377, 377, 369, 0, 377, 376,
+ 365, 0, 370, 374, 375, 369, 379, 379, 371, 0,
+ 379, 366, 0, 377, 0, 0, 376, 378, 378, 0,
+ 379, 378, 379, 370, 380, 380, 0, 0, 380, 0,
+
+ 0, 376, 378, 371, 0, 374, 375, 0, 380, 0,
+ 373, 0, 381, 381, 0, 377, 381, 0, 376, 0,
+ 0, 0, 379, 374, 379, 0, 382, 382, 0, 376,
+ 382, 375, 0, 0, 378, 0, 377, 0, 383, 383,
+ 380, 382, 383, 381, 0, 384, 384, 0, 379, 384,
+ 0, 385, 385, 386, 386, 385, 0, 386, 0, 378,
+ 384, 388, 388, 387, 387, 388, 380, 387, 386, 383,
+ 391, 391, 0, 382, 391, 381, 388, 389, 389, 385,
+ 0, 389, 0, 0, 381, 390, 390, 392, 392, 390,
+ 0, 392, 384, 0, 0, 387, 0, 391, 382, 0,
+
+ 386, 383, 393, 393, 0, 0, 393, 389, 388, 0,
+ 383, 385, 0, 390, 0, 392, 0, 384, 394, 394,
+ 395, 395, 394, 385, 395, 386, 0, 387, 0, 391,
+ 0, 394, 0, 388, 0, 387, 0, 0, 394, 389,
+ 396, 396, 391, 0, 396, 390, 0, 392, 0, 389,
+ 0, 397, 397, 0, 0, 397, 0, 390, 0, 392,
+ 398, 398, 396, 394, 398, 0, 0, 399, 399, 0,
+ 394, 399, 0, 0, 393, 400, 400, 0, 0, 400,
+ 0, 397, 399, 0, 398, 401, 401, 402, 402, 401,
+ 394, 402, 395, 0, 396, 0, 404, 404, 403, 403,
+
+ 404, 0, 403, 0, 401, 406, 406, 0, 0, 406,
+ 400, 402, 396, 397, 399, 0, 398, 403, 405, 405,
+ 404, 402, 405, 397, 407, 407, 0, 0, 407, 405,
+ 406, 0, 398, 0, 0, 0, 401, 405, 0, 399,
+ 409, 409, 400, 402, 409, 0, 0, 400, 0, 403,
+ 410, 410, 404, 402, 410, 407, 0, 401, 0, 402,
+ 0, 405, 406, 408, 408, 409, 0, 408, 404, 405,
+ 403, 0, 412, 412, 0, 410, 412, 406, 411, 411,
+ 0, 408, 411, 0, 0, 0, 0, 407, 413, 413,
+ 405, 0, 413, 408, 414, 414, 407, 409, 414, 0,
+
+ 412, 0, 411, 0, 0, 0, 413, 410, 0, 0,
+ 464, 464, 409, 408, 464, 0, 0, 0, 0, 0,
+ 0, 0, 410, 465, 465, 408, 0, 465, 0, 0,
+ 0, 0, 412, 0, 411, 408, 0, 0, 413, 0,
+ 0, 467, 467, 418, 412, 467, 0, 0, 0, 0,
+ 411, 418, 418, 418, 418, 418, 418, 0, 0, 419,
+ 413, 0, 0, 0, 0, 420, 414, 419, 419, 419,
+ 419, 419, 419, 420, 420, 420, 420, 420, 420, 0,
+ 0, 421, 464, 418, 418, 418, 418, 418, 418, 421,
+ 421, 421, 421, 421, 421, 465, 0, 0, 0, 419,
+
+ 419, 419, 419, 419, 419, 420, 420, 420, 420, 420,
+ 420, 0, 0, 467, 484, 484, 489, 489, 484, 424,
+ 489, 421, 421, 421, 421, 421, 421, 424, 424, 424,
+ 424, 424, 424, 425, 0, 0, 469, 469, 0, 428,
+ 469, 425, 425, 425, 425, 425, 425, 428, 428, 428,
+ 428, 428, 428, 0, 0, 469, 0, 429, 0, 424,
+ 424, 424, 424, 424, 424, 429, 429, 429, 429, 429,
+ 429, 0, 0, 425, 425, 425, 425, 425, 425, 428,
+ 428, 428, 428, 428, 428, 0, 484, 469, 489, 0,
+ 0, 0, 0, 0, 0, 0, 0, 429, 429, 429,
+
+ 429, 429, 429, 450, 0, 0, 450, 0, 469, 0,
+ 0, 0, 0, 450, 450, 450, 450, 450, 450, 450,
+ 450, 450, 450, 450, 450, 450, 450, 450, 450, 450,
+ 450, 450, 450, 450, 450, 450, 450, 450, 450, 459,
+ 0, 0, 459, 0, 498, 498, 0, 0, 498, 459,
+ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459,
+ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459,
+ 459, 459, 459, 459, 459, 466, 466, 468, 468, 466,
+ 0, 468, 470, 470, 471, 471, 470, 0, 471, 0,
+ 468, 472, 472, 473, 473, 472, 470, 473, 478, 478,
+
+ 474, 474, 478, 466, 474, 0, 475, 475, 473, 0,
+ 475, 476, 476, 471, 0, 476, 498, 0, 0, 472,
+ 477, 477, 468, 0, 477, 0, 0, 0, 470, 478,
+ 474, 0, 0, 479, 479, 466, 475, 479, 0, 0,
+ 473, 476, 481, 481, 0, 471, 481, 466, 0, 468,
+ 477, 472, 0, 0, 470, 0, 471, 479, 481, 0,
+ 0, 478, 474, 472, 0, 473, 0, 0, 475, 0,
+ 478, 0, 474, 476, 0, 0, 480, 480, 475, 0,
+ 480, 0, 477, 476, 482, 482, 0, 0, 482, 479,
+ 481, 0, 477, 0, 483, 483, 485, 485, 483, 0,
+
+ 485, 0, 0, 486, 486, 479, 480, 486, 0, 0,
+ 0, 0, 482, 483, 481, 487, 487, 488, 488, 487,
+ 0, 488, 490, 490, 491, 491, 490, 485, 491, 0,
+ 487, 0, 488, 486, 0, 492, 492, 0, 480, 492,
+ 0, 0, 491, 0, 482, 483, 493, 493, 480, 0,
+ 493, 0, 490, 494, 494, 0, 482, 494, 0, 485,
+ 0, 492, 487, 0, 488, 486, 483, 0, 485, 0,
+ 493, 0, 495, 495, 491, 486, 495, 496, 496, 0,
+ 0, 496, 0, 494, 490, 0, 0, 487, 0, 488,
+ 0, 497, 497, 492, 490, 497, 491, 499, 499, 501,
+
+ 501, 499, 493, 501, 0, 496, 495, 492, 499, 500,
+ 500, 0, 0, 500, 0, 494, 502, 502, 493, 497,
+ 502, 0, 503, 503, 0, 494, 503, 0, 500, 501,
+ 504, 504, 502, 0, 504, 505, 505, 496, 495, 505,
+ 499, 503, 506, 506, 495, 0, 506, 0, 0, 496,
+ 0, 497, 0, 504, 0, 507, 507, 0, 0, 507,
+ 500, 501, 0, 497, 502, 0, 508, 508, 0, 499,
+ 508, 501, 506, 503, 509, 509, 510, 510, 509, 0,
+ 510, 500, 0, 507, 0, 504, 512, 512, 502, 0,
+ 512, 0, 511, 511, 503, 0, 511, 514, 514, 0,
+
+ 512, 514, 504, 0, 506, 510, 0, 505, 511, 515,
+ 515, 0, 0, 515, 506, 507, 0, 516, 516, 517,
+ 517, 516, 515, 517, 0, 518, 518, 507, 516, 518,
+ 0, 0, 512, 0, 517, 519, 519, 510, 508, 519,
+ 511, 522, 522, 520, 520, 522, 509, 520, 510, 0,
+ 518, 521, 521, 0, 515, 521, 0, 0, 512, 0,
+ 516, 0, 520, 519, 511, 0, 517, 523, 523, 514,
+ 521, 523, 524, 524, 0, 0, 524, 0, 0, 0,
+ 523, 515, 518, 525, 525, 0, 0, 525, 0, 516,
+ 0, 517, 526, 526, 520, 519, 526, 518, 0, 527,
+
+ 527, 0, 521, 527, 528, 528, 524, 519, 528, 0,
+ 0, 525, 523, 522, 527, 520, 0, 528, 0, 0,
+ 0, 0, 526, 521, 530, 530, 529, 529, 530, 0,
+ 529, 531, 531, 526, 0, 531, 533, 533, 524, 523,
+ 533, 0, 0, 525, 524, 529, 527, 0, 530, 528,
+ 0, 0, 532, 532, 526, 525, 532, 534, 534, 535,
+ 535, 534, 0, 535, 526, 532, 0, 533, 534, 536,
+ 536, 527, 0, 536, 537, 537, 528, 529, 537, 0,
+ 530, 535, 538, 538, 536, 0, 538, 0, 0, 537,
+ 539, 539, 0, 0, 539, 0, 530, 532, 529, 533,
+
+ 534, 540, 540, 531, 0, 540, 0, 0, 533, 0,
+ 541, 541, 0, 535, 541, 0, 536, 0, 0, 539,
+ 0, 537, 0, 541, 532, 0, 543, 543, 0, 534,
+ 543, 535, 542, 542, 544, 544, 542, 0, 544, 0,
+ 543, 536, 0, 545, 545, 0, 537, 545, 546, 546,
+ 0, 539, 546, 544, 538, 541, 0, 0, 0, 0,
+ 542, 542, 539, 0, 0, 548, 548, 545, 0, 548,
+ 0, 0, 543, 540, 547, 547, 549, 549, 547, 0,
+ 549, 0, 541, 550, 550, 544, 0, 550, 0, 548,
+ 555, 555, 542, 542, 555, 0, 552, 552, 543, 545,
+
+ 552, 551, 551, 0, 542, 551, 544, 555, 547, 0,
+ 0, 552, 0, 550, 0, 545, 0, 549, 553, 553,
+ 546, 548, 553, 554, 554, 0, 551, 554, 0, 556,
+ 556, 557, 557, 556, 0, 557, 0, 548, 0, 555,
+ 547, 0, 0, 552, 556, 550, 547, 554, 549, 553,
+ 0, 0, 0, 0, 0, 550, 588, 588, 551, 0,
+ 588, 0, 555, 589, 589, 0, 0, 589, 552, 0,
+ 0, 0, 0, 551, 562, 0, 556, 0, 0, 554,
+ 0, 553, 562, 562, 562, 562, 562, 562, 0, 0,
+ 553, 0, 0, 592, 592, 554, 563, 592, 593, 593,
+
+ 0, 556, 593, 557, 563, 563, 563, 563, 563, 563,
+ 0, 0, 564, 0, 562, 562, 562, 562, 562, 562,
+ 564, 564, 564, 564, 564, 564, 0, 0, 588, 0,
+ 0, 0, 0, 0, 565, 589, 563, 563, 563, 563,
+ 563, 563, 565, 565, 565, 565, 565, 565, 0, 0,
+ 566, 0, 564, 564, 564, 564, 564, 564, 566, 566,
+ 566, 566, 566, 566, 0, 592, 0, 594, 594, 0,
+ 593, 594, 567, 0, 565, 565, 565, 565, 565, 565,
+ 567, 567, 567, 567, 567, 567, 0, 0, 568, 0,
+ 566, 566, 566, 566, 566, 566, 568, 568, 568, 568,
+
+ 568, 568, 591, 591, 590, 590, 591, 0, 590, 0,
+ 569, 0, 567, 567, 567, 567, 567, 567, 569, 569,
+ 569, 569, 569, 569, 0, 0, 591, 0, 568, 568,
+ 568, 568, 568, 568, 590, 0, 595, 595, 0, 594,
+ 595, 596, 596, 597, 597, 596, 0, 597, 0, 0,
+ 569, 569, 569, 569, 569, 569, 598, 598, 591, 0,
+ 598, 0, 0, 599, 599, 595, 590, 599, 0, 596,
+ 0, 598, 0, 0, 591, 0, 590, 600, 600, 601,
+ 601, 600, 0, 601, 0, 602, 602, 603, 603, 602,
+ 0, 603, 604, 604, 601, 0, 604, 595, 599, 600,
+
+ 602, 596, 0, 598, 0, 605, 605, 0, 595, 605,
+ 0, 604, 0, 596, 0, 597, 0, 606, 606, 607,
+ 607, 606, 0, 607, 0, 0, 601, 0, 598, 605,
+ 599, 600, 602, 608, 608, 599, 0, 608, 609, 609,
+ 611, 611, 609, 604, 611, 0, 606, 0, 607, 600,
+ 0, 601, 610, 610, 612, 612, 610, 602, 612, 603,
+ 0, 605, 0, 0, 604, 0, 609, 0, 613, 613,
+ 0, 610, 613, 0, 0, 615, 615, 605, 606, 615,
+ 607, 0, 614, 614, 0, 613, 614, 0, 0, 606,
+ 0, 607, 616, 616, 0, 0, 616, 0, 609, 0,
+
+ 0, 614, 0, 610, 0, 608, 0, 616, 0, 0,
+ 609, 0, 611, 0, 617, 617, 0, 613, 617, 618,
+ 618, 619, 619, 618, 610, 619, 612, 620, 620, 0,
+ 0, 620, 0, 614, 621, 621, 0, 0, 621, 616,
+ 613, 0, 620, 618, 617, 622, 622, 615, 0, 622,
+ 0, 623, 623, 0, 614, 623, 624, 624, 0, 0,
+ 624, 0, 623, 0, 616, 0, 625, 625, 626, 626,
+ 625, 0, 626, 0, 620, 618, 617, 625, 627, 627,
+ 628, 628, 627, 0, 628, 0, 617, 0, 631, 631,
+ 0, 618, 631, 619, 623, 0, 630, 630, 0, 620,
+
+ 630, 632, 632, 633, 633, 632, 621, 633, 0, 625,
+ 634, 634, 631, 627, 634, 636, 636, 622, 0, 636,
+ 635, 635, 0, 623, 635, 0, 630, 633, 624, 0,
+ 0, 632, 0, 635, 0, 638, 638, 0, 625, 638,
+ 626, 0, 637, 637, 631, 627, 637, 639, 639, 636,
+ 627, 639, 628, 0, 0, 0, 0, 637, 630, 633,
+ 631, 0, 0, 632, 0, 635, 643, 643, 630, 0,
+ 643, 639, 0, 632, 0, 633, 640, 640, 0, 0,
+ 640, 636, 634, 0, 641, 641, 0, 636, 641, 637,
+ 0, 640, 635, 642, 642, 641, 643, 642, 644, 644,
+
+ 645, 645, 644, 639, 645, 646, 646, 638, 0, 646,
+ 0, 644, 648, 648, 637, 0, 648, 647, 647, 639,
+ 646, 647, 0, 640, 0, 0, 0, 641, 643, 648,
+ 645, 0, 647, 0, 642, 649, 649, 0, 643, 649,
+ 650, 650, 0, 644, 650, 0, 649, 0, 640, 0,
+ 651, 651, 646, 650, 651, 0, 641, 0, 0, 653,
+ 653, 648, 645, 653, 647, 642, 0, 652, 652, 0,
+ 644, 652, 645, 0, 0, 0, 0, 646, 649, 654,
+ 654, 653, 0, 654, 648, 650, 652, 0, 0, 647,
+ 0, 651, 0, 0, 654, 655, 655, 656, 656, 655,
+
+ 0, 656, 659, 659, 657, 657, 659, 649, 657, 0,
+ 658, 658, 650, 653, 658, 660, 660, 0, 652, 660,
+ 0, 658, 651, 661, 661, 655, 654, 661, 662, 662,
+ 0, 653, 662, 657, 0, 0, 661, 0, 656, 652,
+ 664, 664, 663, 663, 664, 0, 663, 0, 661, 0,
+ 0, 654, 0, 658, 665, 665, 0, 655, 665, 666,
+ 666, 0, 0, 666, 0, 657, 664, 655, 661, 656,
+ 663, 667, 667, 0, 659, 667, 657, 0, 665, 0,
+ 661, 0, 658, 0, 668, 668, 0, 660, 668, 0,
+ 0, 0, 0, 687, 687, 661, 671, 687, 664, 0,
+
+ 662, 0, 663, 0, 671, 671, 671, 671, 671, 671,
+ 665, 0, 664, 0, 663, 0, 0, 0, 0, 0,
+ 0, 0, 0, 692, 692, 0, 665, 692, 0, 0,
+ 0, 666, 0, 0, 0, 0, 671, 671, 671, 671,
+ 671, 671, 672, 667, 695, 695, 0, 0, 695, 673,
+ 672, 672, 672, 672, 672, 672, 668, 673, 673, 673,
+ 673, 673, 673, 674, 0, 687, 0, 0, 0, 0,
+ 0, 674, 674, 674, 674, 674, 674, 0, 0, 0,
+ 0, 0, 672, 672, 672, 672, 672, 672, 675, 673,
+ 673, 673, 673, 673, 673, 692, 675, 675, 675, 675,
+
+ 675, 675, 676, 674, 674, 674, 674, 674, 674, 677,
+ 676, 676, 676, 676, 676, 676, 695, 677, 677, 677,
+ 677, 677, 677, 689, 689, 0, 678, 689, 675, 675,
+ 675, 675, 675, 675, 678, 678, 678, 678, 678, 678,
+ 689, 0, 676, 676, 676, 676, 676, 676, 0, 677,
+ 677, 677, 677, 677, 677, 688, 688, 0, 0, 688,
+ 690, 690, 0, 0, 690, 0, 678, 678, 678, 678,
+ 678, 678, 689, 690, 688, 0, 691, 691, 693, 693,
+ 691, 0, 693, 694, 694, 696, 696, 694, 0, 696,
+ 697, 697, 0, 0, 697, 689, 698, 698, 0, 0,
+
+ 698, 0, 697, 0, 693, 690, 688, 691, 0, 698,
+ 699, 699, 0, 694, 699, 700, 700, 701, 701, 700,
+ 0, 701, 702, 702, 703, 703, 702, 688, 703, 699,
+ 0, 0, 690, 0, 697, 0, 693, 0, 0, 691,
+ 0, 698, 704, 704, 0, 694, 704, 702, 691, 0,
+ 693, 0, 705, 705, 0, 694, 705, 696, 704, 706,
+ 706, 699, 697, 706, 0, 707, 707, 0, 698, 707,
+ 708, 708, 0, 0, 708, 0, 705, 709, 709, 702,
+ 0, 709, 699, 0, 710, 710, 707, 700, 710, 701,
+ 704, 711, 711, 0, 702, 711, 703, 0, 708, 713,
+
+ 713, 714, 714, 713, 0, 714, 710, 709, 705, 715,
+ 715, 0, 0, 715, 704, 714, 716, 716, 707, 0,
+ 716, 717, 717, 0, 705, 717, 0, 716, 0, 0,
+ 708, 706, 717, 0, 0, 0, 0, 707, 710, 709,
+ 718, 718, 708, 0, 718, 0, 0, 714, 0, 709,
+ 0, 719, 719, 720, 720, 719, 710, 720, 0, 716,
+ 0, 0, 0, 711, 717, 719, 721, 721, 723, 723,
+ 721, 713, 723, 714, 722, 722, 724, 724, 722, 0,
+ 724, 715, 720, 725, 725, 726, 726, 725, 716, 726,
+ 723, 727, 727, 717, 721, 727, 0, 719, 725, 0,
+
+ 728, 728, 0, 722, 728, 729, 729, 730, 730, 729,
+ 0, 730, 718, 0, 720, 743, 743, 734, 734, 743,
+ 729, 734, 723, 719, 0, 720, 721, 0, 728, 0,
+ 725, 0, 734, 732, 732, 722, 730, 732, 721, 0,
+ 723, 731, 731, 735, 735, 731, 722, 735, 724, 0,
+ 733, 733, 729, 0, 733, 725, 735, 726, 732, 0,
+ 728, 0, 0, 727, 734, 736, 736, 0, 730, 736,
+ 0, 731, 728, 0, 738, 738, 0, 729, 738, 730,
+ 733, 737, 737, 0, 736, 737, 0, 743, 735, 734,
+ 732, 0, 0, 0, 0, 739, 739, 737, 0, 739,
+
+ 0, 0, 0, 731, 738, 732, 740, 740, 0, 0,
+ 740, 0, 733, 731, 0, 735, 736, 739, 0, 741,
+ 741, 0, 733, 741, 742, 742, 744, 744, 742, 737,
+ 744, 0, 0, 0, 0, 0, 738, 736, 0, 0,
+ 744, 740, 0, 0, 0, 0, 738, 741, 0, 739,
+ 0, 0, 0, 737, 742, 753, 753, 759, 759, 753,
+ 0, 759, 0, 0, 0, 0, 0, 739, 0, 0,
+ 0, 0, 744, 740, 0, 0, 0, 0, 740, 741,
+ 766, 766, 0, 0, 766, 0, 742, 0, 0, 0,
+ 0, 741, 746, 0, 0, 0, 742, 0, 744, 747,
+
+ 746, 746, 746, 746, 746, 746, 748, 747, 747, 747,
+ 747, 747, 747, 749, 748, 748, 748, 748, 748, 748,
+ 0, 749, 749, 749, 749, 749, 749, 753, 0, 759,
+ 0, 0, 746, 746, 746, 746, 746, 746, 0, 747,
+ 747, 747, 747, 747, 747, 0, 748, 748, 748, 748,
+ 748, 748, 766, 749, 749, 749, 749, 749, 749, 754,
+ 754, 755, 755, 754, 0, 755, 756, 756, 0, 0,
+ 756, 0, 757, 757, 758, 758, 757, 0, 758, 760,
+ 760, 756, 0, 760, 754, 757, 0, 763, 763, 758,
+ 755, 763, 0, 0, 760, 761, 761, 762, 762, 761,
+
+ 0, 762, 765, 765, 764, 764, 765, 0, 764, 0,
+ 0, 763, 0, 756, 0, 765, 754, 757, 0, 0,
+ 0, 758, 755, 764, 0, 761, 760, 0, 0, 762,
+ 0, 754, 0, 755, 0, 768, 768, 0, 756, 768,
+ 0, 767, 767, 763, 757, 767, 758, 765, 768, 769,
+ 769, 760, 767, 769, 0, 764, 0, 761, 0, 763,
+ 0, 762, 771, 771, 772, 772, 771, 761, 772, 762,
+ 0, 773, 773, 0, 765, 773, 764, 774, 774, 0,
+ 768, 774, 0, 0, 767, 0, 772, 775, 775, 776,
+ 776, 775, 0, 776, 777, 777, 778, 778, 777, 0,
+
+ 778, 773, 779, 779, 780, 780, 779, 768, 780, 0,
+ 781, 781, 776, 767, 781, 778, 782, 782, 772, 0,
+ 782, 769, 783, 783, 0, 0, 783, 784, 784, 0,
+ 0, 784, 0, 773, 771, 777, 772, 791, 791, 780,
+ 0, 791, 0, 773, 776, 782, 0, 778, 0, 774,
+ 785, 785, 0, 784, 785, 0, 787, 787, 0, 775,
+ 787, 776, 0, 786, 786, 0, 777, 786, 778, 785,
+ 0, 780, 0, 0, 779, 0, 780, 782, 791, 0,
+ 788, 788, 781, 0, 788, 784, 787, 0, 782, 789,
+ 789, 0, 786, 789, 783, 0, 790, 790, 0, 784,
+
+ 790, 785, 792, 792, 788, 0, 792, 0, 0, 791,
+ 0, 789, 793, 793, 0, 792, 793, 0, 787, 794,
+ 794, 0, 785, 794, 786, 790, 793, 0, 787, 795,
+ 795, 0, 0, 795, 794, 786, 788, 0, 0, 0,
+ 0, 0, 0, 789, 0, 0, 0, 792, 0, 803,
+ 803, 0, 788, 803, 0, 0, 0, 790, 793, 0,
+ 0, 789, 0, 0, 0, 0, 794, 797, 790, 804,
+ 804, 0, 0, 804, 792, 797, 797, 797, 797, 797,
+ 797, 0, 802, 802, 793, 798, 802, 0, 806, 806,
+ 0, 794, 806, 798, 798, 798, 798, 798, 798, 807,
+
+ 807, 795, 0, 807, 0, 799, 802, 797, 797, 797,
+ 797, 797, 797, 799, 799, 799, 799, 799, 799, 0,
+ 0, 803, 0, 800, 0, 798, 798, 798, 798, 798,
+ 798, 800, 800, 800, 800, 800, 800, 0, 802, 805,
+ 805, 804, 0, 805, 0, 799, 799, 799, 799, 799,
+ 799, 808, 808, 0, 802, 808, 0, 809, 809, 0,
+ 806, 809, 0, 800, 800, 800, 800, 800, 800, 805,
+ 0, 807, 809, 810, 810, 811, 811, 810, 0, 811,
+ 812, 812, 0, 0, 812, 813, 813, 814, 814, 813,
+ 811, 814, 816, 816, 0, 812, 816, 0, 0, 817,
+
+ 817, 805, 0, 817, 809, 814, 0, 813, 818, 818,
+ 0, 805, 818, 0, 817, 819, 819, 0, 0, 819,
+ 820, 820, 811, 808, 820, 0, 0, 812, 0, 809,
+ 821, 821, 822, 822, 821, 0, 822, 814, 0, 813,
+ 819, 819, 0, 820, 819, 810, 817, 811, 0, 823,
+ 823, 0, 812, 823, 824, 824, 0, 813, 824, 814,
+ 0, 0, 825, 825, 816, 0, 825, 0, 0, 0,
+ 0, 817, 819, 819, 0, 820, 819, 826, 826, 823,
+ 818, 826, 0, 0, 827, 827, 824, 819, 827, 828,
+ 828, 0, 820, 828, 829, 829, 826, 827, 829, 0,
+
+ 828, 0, 821, 825, 822, 830, 830, 0, 0, 830,
+ 0, 823, 0, 831, 831, 0, 830, 831, 824, 0,
+ 0, 823, 0, 832, 832, 0, 824, 832, 826, 827,
+ 0, 0, 828, 0, 825, 831, 833, 833, 832, 0,
+ 833, 0, 0, 0, 0, 0, 0, 0, 830, 826,
+ 0, 0, 0, 0, 0, 0, 827, 0, 0, 839,
+ 839, 828, 0, 839, 0, 833, 829, 831, 840, 840,
+ 832, 834, 840, 0, 0, 0, 0, 830, 835, 834,
+ 834, 834, 834, 834, 834, 831, 835, 835, 835, 835,
+ 835, 835, 836, 0, 0, 832, 0, 833, 0, 0,
+
+ 836, 836, 836, 836, 836, 836, 841, 841, 833, 0,
+ 841, 834, 834, 834, 834, 834, 834, 837, 835, 835,
+ 835, 835, 835, 835, 0, 837, 837, 837, 837, 837,
+ 837, 839, 836, 836, 836, 836, 836, 836, 842, 842,
+ 840, 0, 842, 843, 843, 844, 844, 843, 0, 844,
+ 845, 845, 842, 0, 845, 0, 0, 837, 837, 837,
+ 837, 837, 837, 846, 846, 845, 0, 846, 847, 847,
+ 848, 848, 847, 0, 848, 849, 849, 0, 841, 849,
+ 0, 850, 850, 0, 842, 850, 851, 851, 0, 0,
+ 851, 852, 852, 0, 0, 852, 0, 845, 853, 853,
+
+ 850, 0, 853, 854, 854, 851, 852, 854, 856, 856,
+ 842, 0, 856, 0, 0, 843, 849, 844, 0, 0,
+ 855, 855, 845, 853, 855, 856, 0, 0, 854, 0,
+ 857, 857, 850, 0, 857, 846, 0, 851, 852, 0,
+ 847, 0, 848, 0, 859, 859, 0, 849, 859, 0,
+ 855, 0, 0, 850, 0, 853, 0, 856, 851, 857,
+ 854, 858, 858, 852, 0, 858, 0, 860, 860, 0,
+ 853, 860, 859, 0, 0, 854, 858, 861, 0, 0,
+ 856, 0, 855, 0, 0, 861, 861, 861, 861, 861,
+ 861, 857, 855, 0, 865, 865, 0, 860, 865, 0,
+
+ 0, 862, 857, 0, 859, 0, 0, 0, 858, 862,
+ 862, 862, 862, 862, 862, 863, 859, 861, 861, 861,
+ 861, 861, 861, 863, 863, 863, 863, 863, 863, 860,
+ 0, 0, 0, 858, 866, 866, 0, 0, 866, 860,
+ 864, 862, 862, 862, 862, 862, 862, 0, 864, 864,
+ 864, 864, 864, 864, 0, 863, 863, 863, 863, 863,
+ 863, 867, 867, 866, 0, 867, 865, 868, 868, 869,
+ 869, 868, 0, 869, 870, 870, 0, 0, 870, 0,
+ 864, 864, 864, 864, 864, 864, 867, 871, 871, 872,
+ 872, 871, 0, 872, 869, 866, 0, 868, 873, 873,
+
+ 874, 874, 873, 0, 874, 0, 866, 0, 875, 875,
+ 0, 871, 875, 872, 0, 876, 876, 0, 867, 876,
+ 877, 877, 0, 0, 877, 0, 869, 878, 878, 868,
+ 0, 878, 0, 867, 879, 879, 880, 880, 879, 868,
+ 880, 869, 0, 871, 876, 872, 870, 881, 881, 882,
+ 882, 881, 0, 882, 884, 884, 883, 883, 884, 871,
+ 883, 872, 885, 885, 0, 0, 885, 0, 878, 0,
+ 873, 0, 874, 882, 0, 0, 876, 0, 883, 0,
+ 875, 0, 886, 886, 887, 887, 886, 876, 887, 0,
+ 888, 888, 877, 0, 888, 0, 889, 889, 0, 878,
+
+ 889, 0, 0, 0, 0, 882, 879, 886, 880, 0,
+ 883, 890, 890, 891, 891, 890, 0, 891, 0, 881,
+ 889, 882, 0, 892, 892, 888, 884, 892, 883, 893,
+ 893, 0, 0, 893, 885, 891, 0, 0, 0, 886,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 889, 0, 886, 0, 887, 888, 892, 0,
+ 0, 0, 888, 0, 0, 0, 0, 891, 889, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 890, 0, 891, 0, 0, 0, 0,
+ 892, 0, 0, 0, 0, 892, 0, 0, 0, 0,
+
+ 0, 893, 895, 895, 895, 895, 895, 895, 895, 895,
+ 895, 895, 895, 895, 895, 895, 895, 895, 895, 895,
+ 896, 896, 896, 896, 896, 896, 896, 896, 896, 896,
+ 896, 896, 896, 896, 896, 896, 896, 896, 897, 897,
+ 897, 897, 897, 897, 897, 897, 897, 897, 897, 897,
+ 897, 897, 897, 897, 897, 897, 898, 898, 898, 898,
+ 898, 898, 898, 898, 898, 898, 898, 898, 898, 898,
+ 898, 898, 898, 898, 899, 899, 899, 899, 899, 899,
+ 899, 899, 899, 899, 899, 899, 899, 899, 899, 899,
+ 899, 899, 900, 900, 900, 900, 900, 900, 900, 900,
+
+ 900, 900, 900, 900, 900, 900, 900, 900, 900, 900,
+ 901, 901, 901, 901, 901, 901, 901, 901, 901, 901,
+ 901, 901, 901, 901, 901, 901, 901, 901, 902, 902,
+ 902, 902, 902, 902, 902, 902, 902, 902, 902, 902,
+ 902, 902, 902, 902, 902, 902, 903, 903, 903, 903,
+ 903, 903, 903, 903, 903, 903, 903, 903, 903, 903,
+ 903, 903, 903, 903, 904, 904, 904, 904, 904, 904,
+ 904, 904, 904, 904, 904, 904, 904, 904, 904, 904,
+ 904, 904, 905, 905, 905, 905, 905, 905, 905, 905,
+ 905, 905, 905, 905, 905, 905, 905, 905, 905, 905,
+
+ 906, 0, 906, 906, 906, 906, 906, 906, 906, 906,
+ 906, 906, 906, 906, 0, 906, 906, 906, 907, 907,
+ 907, 907, 907, 907, 907, 907, 907, 907, 907, 907,
+ 907, 907, 907, 907, 907, 907, 908, 908, 908, 908,
+ 0, 908, 909, 0, 909, 909, 909, 909, 909, 909,
+ 909, 909, 909, 909, 909, 909, 0, 909, 909, 909,
+ 910, 0, 0, 910, 0, 910, 0, 910, 911, 0,
+ 911, 911, 911, 911, 911, 911, 911, 911, 911, 0,
+ 911, 0, 911, 912, 912, 912, 912, 0, 912, 914,
+ 914, 0, 914, 914, 0, 914, 0, 914, 0, 914,
+
+ 915, 0, 915, 915, 0, 915, 0, 915, 916, 916,
+ 0, 916, 916, 0, 916, 0, 916, 0, 916, 917,
+ 0, 0, 917, 917, 0, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 918, 0, 0,
+ 918, 0, 918, 918, 918, 918, 918, 918, 918, 918,
+ 918, 918, 918, 918, 918, 919, 0, 0, 919, 919,
+ 919, 919, 919, 919, 919, 919, 919, 919, 919, 919,
+ 919, 919, 919, 920, 0, 0, 920, 920, 920, 920,
+ 920, 920, 920, 920, 920, 920, 920, 920, 920, 920,
+ 920, 921, 921, 921, 921, 0, 0, 0, 0, 921,
+
+ 0, 921, 921, 921, 921, 921, 921, 0, 921, 922,
+ 0, 0, 922, 0, 922, 922, 922, 922, 922, 922,
+ 922, 922, 922, 922, 922, 922, 922, 923, 0, 0,
+ 923, 923, 923, 923, 923, 923, 0, 923, 923, 923,
+ 923, 923, 923, 923, 923, 924, 0, 0, 924, 924,
+ 0, 924, 924, 924, 924, 924, 924, 924, 924, 0,
+ 924, 924, 924, 925, 925, 925, 925, 925, 925, 925,
+ 925, 925, 925, 925, 925, 925, 925, 925, 925, 925,
+ 925, 926, 0, 926, 926, 926, 926, 926, 926, 926,
+ 926, 926, 926, 926, 926, 0, 926, 926, 926, 927,
+
+ 0, 927, 927, 927, 927, 927, 927, 927, 927, 927,
+ 927, 927, 927, 0, 927, 927, 927, 928, 0, 0,
+ 928, 0, 928, 0, 928, 929, 0, 929, 929, 929,
+ 929, 929, 929, 929, 929, 929, 929, 929, 929, 0,
+ 929, 929, 929, 930, 930, 0, 930, 0, 0, 930,
+ 0, 930, 0, 930, 931, 0, 931, 931, 931, 931,
+ 931, 931, 931, 931, 931, 0, 931, 0, 931, 932,
+ 0, 0, 932, 0, 932, 0, 932, 934, 0, 0,
+ 934, 934, 0, 934, 0, 0, 934, 0, 934, 0,
+ 934, 935, 935, 0, 935, 935, 0, 935, 0, 935,
+
+ 0, 935, 936, 0, 0, 936, 0, 936, 0, 936,
+ 937, 0, 0, 0, 937, 0, 0, 0, 0, 937,
+ 0, 937, 938, 0, 938, 0, 0, 938, 0, 938,
+ 939, 0, 0, 939, 0, 939, 0, 939, 940, 0,
+ 0, 940, 940, 0, 940, 940, 940, 940, 940, 940,
+ 940, 940, 940, 940, 940, 940, 941, 0, 0, 941,
+ 0, 941, 941, 941, 941, 941, 941, 941, 941, 941,
+ 941, 941, 941, 941, 942, 0, 0, 942, 942, 942,
+ 942, 942, 942, 942, 942, 942, 942, 942, 942, 942,
+ 942, 942, 943, 0, 0, 943, 943, 943, 943, 943,
+
+ 943, 943, 943, 943, 943, 943, 943, 943, 943, 943,
+ 944, 944, 944, 944, 0, 0, 0, 0, 944, 0,
+ 944, 944, 944, 944, 944, 944, 0, 944, 945, 0,
+ 0, 945, 945, 945, 945, 945, 945, 945, 945, 945,
+ 945, 945, 945, 945, 945, 945, 946, 946, 946, 946,
+ 946, 946, 946, 946, 946, 946, 946, 946, 946, 946,
+ 946, 946, 946, 946, 947, 0, 0, 947, 947, 947,
+ 947, 947, 947, 0, 947, 947, 947, 947, 947, 947,
+ 947, 947, 948, 0, 0, 948, 948, 0, 948, 948,
+ 948, 948, 948, 948, 948, 948, 0, 948, 948, 948,
+
+ 949, 0, 0, 949, 949, 0, 949, 949, 949, 949,
+ 949, 949, 949, 949, 0, 949, 949, 949, 950, 0,
+ 0, 950, 950, 0, 950, 950, 950, 950, 950, 950,
+ 950, 950, 0, 950, 950, 950, 951, 0, 951, 951,
+ 951, 0, 951, 951, 951, 951, 951, 951, 951, 951,
+ 0, 951, 951, 951, 952, 952, 0, 952, 952, 0,
+ 952, 952, 952, 952, 952, 952, 952, 952, 0, 952,
+ 952, 952, 953, 0, 0, 953, 0, 953, 0, 953,
+ 954, 0, 0, 954, 954, 954, 954, 954, 954, 954,
+ 954, 954, 954, 954, 0, 954, 954, 954, 955, 0,
+
+ 0, 0, 0, 0, 955, 0, 0, 955, 0, 955,
+ 956, 956, 0, 956, 0, 0, 956, 0, 956, 0,
+ 956, 957, 0, 0, 957, 0, 957, 0, 957, 958,
+ 0, 0, 958, 958, 958, 958, 958, 958, 958, 958,
+ 958, 958, 958, 0, 958, 958, 958, 959, 0, 0,
+ 0, 0, 0, 959, 0, 0, 959, 0, 959, 961,
+ 0, 0, 961, 961, 961, 961, 961, 961, 961, 961,
+ 961, 961, 961, 0, 961, 961, 961, 962, 0, 0,
+ 962, 962, 0, 962, 0, 0, 962, 0, 962, 0,
+ 962, 963, 963, 0, 963, 963, 0, 963, 0, 963,
+
+ 0, 963, 964, 964, 0, 964, 964, 0, 964, 0,
+ 964, 0, 964, 965, 0, 0, 0, 0, 0, 0,
+ 0, 0, 965, 0, 965, 966, 0, 966, 0, 0,
+ 966, 0, 966, 967, 967, 0, 967, 0, 0, 967,
+ 0, 967, 0, 967, 968, 0, 0, 968, 968, 0,
+ 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
+ 968, 968, 969, 0, 0, 969, 0, 969, 969, 969,
+ 969, 969, 969, 969, 969, 969, 969, 969, 969, 969,
+ 970, 970, 970, 970, 970, 970, 970, 970, 970, 970,
+ 970, 970, 970, 970, 970, 970, 970, 970, 971, 0,
+
+ 0, 971, 971, 0, 971, 971, 971, 971, 971, 971,
+ 971, 971, 0, 971, 971, 971, 972, 0, 0, 972,
+ 972, 0, 972, 972, 972, 972, 972, 972, 972, 972,
+ 0, 972, 972, 972, 973, 0, 0, 973, 973, 0,
+ 973, 973, 973, 973, 973, 973, 973, 973, 0, 973,
+ 973, 973, 974, 0, 0, 974, 974, 0, 974, 974,
+ 974, 974, 974, 974, 974, 974, 0, 974, 974, 974,
+ 975, 0, 0, 975, 975, 975, 975, 975, 975, 975,
+ 975, 975, 975, 975, 0, 975, 975, 975, 976, 0,
+ 0, 976, 976, 976, 976, 976, 976, 976, 976, 976,
+
+ 976, 976, 0, 976, 976, 976, 977, 0, 0, 977,
+ 0, 977, 978, 0, 0, 0, 0, 0, 0, 0,
+ 0, 978, 0, 978, 979, 0, 979, 0, 0, 979,
+ 0, 979, 980, 0, 0, 980, 980, 980, 980, 980,
+ 980, 980, 980, 980, 980, 980, 0, 980, 980, 980,
+ 981, 0, 0, 981, 981, 981, 981, 981, 981, 981,
+ 981, 981, 981, 981, 0, 981, 981, 981, 982, 0,
+ 0, 982, 0, 982, 983, 0, 0, 0, 0, 0,
+ 0, 0, 0, 983, 0, 983, 984, 0, 984, 0,
+ 0, 984, 0, 984, 985, 0, 0, 985, 0, 0,
+
+ 985, 986, 0, 0, 986, 986, 986, 986, 986, 986,
+ 986, 986, 986, 986, 986, 0, 986, 986, 986, 987,
+ 0, 0, 987, 987, 987, 987, 987, 987, 987, 987,
+ 987, 987, 987, 0, 987, 987, 987, 988, 988, 0,
+ 988, 988, 0, 988, 0, 988, 0, 988, 989, 989,
+ 0, 989, 989, 0, 989, 0, 989, 0, 989, 990,
+ 990, 0, 990, 990, 0, 990, 0, 990, 0, 990,
+ 991, 0, 991, 0, 0, 991, 0, 991, 992, 0,
+ 992, 0, 0, 992, 0, 992, 993, 993, 0, 993,
+ 0, 0, 993, 0, 993, 0, 993, 994, 0, 0,
+
+ 994, 994, 994, 994, 994, 994, 994, 994, 994, 994,
+ 994, 0, 994, 994, 994, 995, 0, 0, 995, 0,
+ 995, 996, 0, 0, 0, 0, 0, 0, 996, 0,
+ 996, 0, 996, 997, 0, 0, 997, 997, 997, 997,
+ 997, 997, 997, 997, 997, 997, 997, 0, 997, 997,
+ 997, 998, 0, 0, 998, 0, 998, 999, 0, 0,
+ 0, 0, 0, 0, 999, 0, 999, 0, 999, 1000,
+ 0, 0, 1000, 1000, 0, 1000, 0, 0, 1000, 0,
+ 1000, 0, 1000, 1001, 0, 0, 0, 0, 0, 0,
+ 0, 0, 1001, 0, 1001, 1002, 0, 0, 1002, 1002,
+
+ 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 1002, 0,
+ 1002, 1002, 1002, 1003, 1003, 0, 1003, 1003, 0, 1003,
+ 0, 1003, 0, 1003, 1004, 0, 0, 1004, 0, 1004,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894,
+ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894
} ;
static yy_state_type yy_last_accepting_state;
@@ -1051,12 +2491,12 @@ static int yy_more_len = 0;
char *sparyytext;
#line 1 "./sparql_l.l"
/*
- * $Id: sparql_l.l,v 1.37.2.20 2012/03/08 12:55:36 source Exp $
+ * $Id: sparql_l.l,v 1.37.2.17 2011/06/11 16:41:47 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -1078,7 +2518,6 @@ char *sparyytext;
#include "sparql.h"
#include "sparql_p.h"
#include "numeric.h"
-#include "sparqlwords.h"
#define sparyyerror(strg) sparyyerror_impl(sparp, sparyytext, (strg))
@@ -1355,7 +2794,7 @@ static int sparscn_NUMBER_double (void *yylval, sparp_t *sparp)
/* Special unreacheable state to fill the first item of sparp->sparp_lexstates */
-#line 1359 "sparql_l.c"
+#line 2798 "sparql_l.c"
#define INITIAL 0
#define SPARQL 1
@@ -1454,7 +2893,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( sparyytext, sparyyleng, 1, sparyyout )) {} } while (0)
+#define ECHO fwrite( sparyytext, sparyyleng, 1, sparyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -1465,7 +2904,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( sparyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1547,12 +2986,12 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 374 "./sparql_l.l"
+#line 373 "./sparql_l.l"
/* Plain non-keyword punctuators */
-#line 1556 "sparql_l.c"
+#line 2995 "sparql_l.c"
if ( !(yy_init) )
{
@@ -1611,13 +3050,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 335 )
+ if ( yy_current_state >= 895 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_current_state != 334 );
+ while ( yy_current_state != 894 );
yy_cp = (yy_last_accepting_cpos);
yy_current_state = (yy_last_accepting_state);
@@ -1639,618 +3078,1251 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 378 "./sparql_l.l"
+#line 377 "./sparql_l.l"
{ return _AMP_AMP ; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 379 "./sparql_l.l"
+#line 378 "./sparql_l.l"
{ return _BACKQUOTE ; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 380 "./sparql_l.l"
+#line 379 "./sparql_l.l"
{ return _BANG ; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 381 "./sparql_l.l"
+#line 380 "./sparql_l.l"
{ return _BAR_BAR ; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 382 "./sparql_l.l"
+#line 381 "./sparql_l.l"
{ return _CARET_CARET ; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 383 "./sparql_l.l"
+#line 382 "./sparql_l.l"
{ return _COMMA ; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 384 "./sparql_l.l"
+#line 383 "./sparql_l.l"
{ return _DOT ; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 385 "./sparql_l.l"
+#line 384 "./sparql_l.l"
{ return _EQ ; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 386 "./sparql_l.l"
+#line 385 "./sparql_l.l"
{ return _GE ; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 387 "./sparql_l.l"
+#line 386 "./sparql_l.l"
{ return _GT ; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 388 "./sparql_l.l"
+#line 387 "./sparql_l.l"
{ return _LE ; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 389 "./sparql_l.l"
+#line 388 "./sparql_l.l"
{ return _LT ; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 390 "./sparql_l.l"
+#line 389 "./sparql_l.l"
{ sparyylval.token_type = sparp->sparp_lexdepth; return _MINUS ; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 391 "./sparql_l.l"
+#line 390 "./sparql_l.l"
{ return _NOT_EQ ; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 392 "./sparql_l.l"
+#line 391 "./sparql_l.l"
{ sparyylval.token_type = sparp->sparp_lexdepth; return _PLUS ; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 393 "./sparql_l.l"
+#line 392 "./sparql_l.l"
{ return _PLUS_GT ; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 394 "./sparql_l.l"
+#line 393 "./sparql_l.l"
{ return _SEMI ; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 395 "./sparql_l.l"
+#line 394 "./sparql_l.l"
{ return _SLASH ; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 396 "./sparql_l.l"
+#line 395 "./sparql_l.l"
{ return _STAR ; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 397 "./sparql_l.l"
+#line 396 "./sparql_l.l"
{ return _STAR_GT ; }
YY_BREAK
/* Keyword punctuators */
case 21:
YY_RULE_SETUP
-#line 401 "./sparql_l.l"
+#line 400 "./sparql_l.l"
{ return a_L ; }
YY_BREAK
-/* Grouping non-keyword punctuators */
case 22:
YY_RULE_SETUP
-#line 405 "./sparql_l.l"
-TOKPAR_OPEN (_LPAR,')', GET_CURRENT_BEGIN)
+#line 401 "./sparql_l.l"
+{ return ALTER_L ; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 406 "./sparql_l.l"
-TOKPAR_CLOSE (_RPAR,')')
+#line 402 "./sparql_l.l"
+{ return AS_L ; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 407 "./sparql_l.l"
-TOKPAR_OPEN (_LBRA,'}', GET_CURRENT_BEGIN)
+#line 403 "./sparql_l.l"
+{ return ASC_L ; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 408 "./sparql_l.l"
-TOKPAR_CLOSE (_RBRA,'}')
+#line 404 "./sparql_l.l"
+{ return ASK_L ; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 409 "./sparql_l.l"
-TOKPAR_OPEN (_LSQBRA,']', GET_CURRENT_BEGIN)
+#line 405 "./sparql_l.l"
+{ return AVG_L ; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 410 "./sparql_l.l"
-TOKPAR_CLOSE (_RSQBRA,']')
+#line 406 "./sparql_l.l"
+{ return BASE_L ; }
YY_BREAK
-/* Name lexems */
case 28:
YY_RULE_SETUP
-#line 414 "./sparql_l.l"
-{
- sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 2);
- return Q_IRI_REF;
- }
+#line 407 "./sparql_l.l"
+{ return BINDINGS_L ; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 419 "./sparql_l.l"
-{ TOKBOX_Q(0,QNAME,"qualified URI"); }
+#line 408 "./sparql_l.l"
+{ return BIJECTION_L ; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 420 "./sparql_l.l"
-{ TOKBOX_Q(0,QNAME_NS,"namespace"); }
+#line 409 "./sparql_l.l"
+{ return BOUND_L ; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 421 "./sparql_l.l"
-{ TOKBOX_Q(0,BLANK_NODE_LABEL,"blank node label"); }
+#line 410 "./sparql_l.l"
+{ return BY_L ; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 423 "./sparql_l.l"
-{
- sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
- return QD_VARNAME;
- }
+#line 411 "./sparql_l.l"
+{ return CLASS_L ; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 428 "./sparql_l.l"
-{
- sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
- return QD_COLON_PARAMNAME;
- }
+#line 412 "./sparql_l.l"
+{ return CLEAR_L ; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 433 "./sparql_l.l"
-{
- char buf[20]; sprintf (buf, ":%d", sparp->sparp_sparqre->sparqre_param_ctr[0]);
- sparp->sparp_sparqre->sparqre_param_ctr[0] += 1;
- sparyylval.box = t_box_dv_uname_string (buf);
- return QD_COLON_PARAMNUM;
- }
+#line 413 "./sparql_l.l"
+{ return COALESCE_L ; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 440 "./sparql_l.l"
-{
- sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
- return LANGTAG;
- }
+#line 414 "./sparql_l.l"
+{ return CONSTRUCT_L ; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 445 "./sparql_l.l"
-{
- const struct sparql_keyword *sk = sparql_lex_hash_kw (sparyytext, sparyyleng);
- if (NULL == sk)
- {
- sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_PLAIN_ID;
- }
- switch (sk->token)
- {
- case COUNT_L: BEGIN SPARQL_AFTER_COUNT; break;
- case IDENTIFIED_L: BEGIN SPARQL_AFTER_IDENTIFIED; return IDENTIFIED_L;
- case WHERE_L: BEGIN SPARQL_AFTER_WHERE; return WHERE_L;
- case SQLQUERY_L: BEGIN SPARQL_AFTER_WHERE; return SQLQUERY_L;
- case SPARQL_BIF: sparyylval.token_type = sk->subtype; return SPARQL_BIF;
- default: return sk->token;
- } }
+#line 415 "./sparql_l.l"
+{ BEGIN SPARQL_AFTER_COUNT; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 461 "./sparql_l.l"
-{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_ALIASCOLNAME; }
+#line 416 "./sparql_l.l"
+{ return CREATE_L ; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 462 "./sparql_l.l"
-{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_QTABLENAME; }
+#line 417 "./sparql_l.l"
+{ return DATA_L ; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 463 "./sparql_l.l"
-{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_QTABLECOLNAME; }
+#line 418 "./sparql_l.l"
+{ return DATATYPE_L ; }
YY_BREAK
-/* Numeric lexems */
case 40:
YY_RULE_SETUP
-#line 467 "./sparql_l.l"
-{ return sparscn_NUMBER_int (yylval, sparp); }
+#line 419 "./sparql_l.l"
+{ return DEFAULT_L ; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 468 "./sparql_l.l"
-{ return sparscn_NUMBER_decimal (yylval, sparp); }
+#line 420 "./sparql_l.l"
+{ return DEFINE_L ; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 469 "./sparql_l.l"
-{ return sparscn_NUMBER_double (yylval, sparp); }
+#line 421 "./sparql_l.l"
+{ return DELETE_L ; }
YY_BREAK
-/* String lexems */
case 43:
YY_RULE_SETUP
-#line 473 "./sparql_l.l"
-{
- sparyylval.box = t_box_dv_short_nchars (sparyytext+1, sparyyleng - 2);
- return SPARQL_STRING;
- }
+#line 422 "./sparql_l.l"
+{ return DEREF_L ; }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 478 "./sparql_l.l"
-{ yymore(); SET_INNER_BEGIN(SPARQL_SSSQ); BEGIN_INNER; }
+#line 423 "./sparql_l.l"
+{ return DESC_L ; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 479 "./sparql_l.l"
-{ yymore(); SET_INNER_BEGIN(SPARQL_DDDQ); BEGIN_INNER; }
+#line 424 "./sparql_l.l"
+{ return DESCRIBE_L ; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 480 "./sparql_l.l"
-{ sparyylval.box = spar_strliteral (sparp, sparyytext, 1, 0); BEGIN_OUTER; return SPARQL_STRING; }
+#line 425 "./sparql_l.l"
+{ return DISTINCT_L ; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 481 "./sparql_l.l"
-{ sparyylval.box = spar_strliteral (sparp, sparyytext, 1, 0); BEGIN_OUTER; return SPARQL_STRING; }
+#line 426 "./sparql_l.l"
+{ return DROP_L ; }
YY_BREAK
case 48:
-/* rule 48 can match eol */
YY_RULE_SETUP
-#line 482 "./sparql_l.l"
-{ sparp->sparp_lexlineno++; yymore(); }
+#line 427 "./sparql_l.l"
+{ return EXCLUSIVE_L ; }
YY_BREAK
case 49:
-/* rule 49 can match eol */
YY_RULE_SETUP
-#line 483 "./sparql_l.l"
-{ sparp->sparp_lexlineno++; yymore(); }
+#line 428 "./sparql_l.l"
+{ return EXISTS_L ; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 484 "./sparql_l.l"
-{ yymore(); }
+#line 429 "./sparql_l.l"
+{ return false_L ; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 485 "./sparql_l.l"
-{ yymore(); }
+#line 430 "./sparql_l.l"
+{ return FILTER_L ; }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 486 "./sparql_l.l"
-{ sparyyerror ("Bad escape sequence in a long single-quoted string"); }
+#line 431 "./sparql_l.l"
+{ return FROM_L ; }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 487 "./sparql_l.l"
-{ sparyyerror ("Bad escape sequence in a long double-quoted string"); }
+#line 432 "./sparql_l.l"
+{ return FUNCTION_L ; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 488 "./sparql_l.l"
-{ sparyyerror ("Bad character in a long single-quoted string"); }
+#line 433 "./sparql_l.l"
+{ return GRAPH_L ; }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 489 "./sparql_l.l"
-{ sparyyerror ("Bad character in a long double-quoted string"); }
- YY_BREAK
-case YY_STATE_EOF(SPARQL_SSSQ):
-#line 490 "./sparql_l.l"
-{ sparyyerror ("Unterminated long single-quoted string"); }
- YY_BREAK
-case YY_STATE_EOF(SPARQL_DDDQ):
-#line 491 "./sparql_l.l"
-{ sparyyerror ("Unterminated long double-quoted string"); }
+#line 434 "./sparql_l.l"
+{ return GROUP_L ; }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 494 "./sparql_l.l"
-{ yymore(); SET_INNER_BEGIN(SPARQL_SQ); BEGIN_INNER; }
+#line 435 "./sparql_l.l"
+{ return HAVING_L ; }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 495 "./sparql_l.l"
-{ yymore(); SET_INNER_BEGIN(SPARQL_DQ); BEGIN_INNER; }
+#line 436 "./sparql_l.l"
+{ return IF_L ; }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 496 "./sparql_l.l"
-{ sparyylval.box = spar_strliteral (sparp, sparyytext, 0, 0); BEGIN_OUTER; return SPARQL_STRING; }
+#line 437 "./sparql_l.l"
+{ return IFP_L ; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 497 "./sparql_l.l"
-{ sparyylval.box = spar_strliteral (sparp, sparyytext, 0, 0); BEGIN_OUTER; return SPARQL_STRING; }
+#line 438 "./sparql_l.l"
+{ return IN_L ; }
YY_BREAK
case 60:
-/* rule 60 can match eol */
YY_RULE_SETUP
-#line 498 "./sparql_l.l"
-{ sparyyerror ("End-of-line in a short single-quoted string"); yymore(); }
+#line 439 "./sparql_l.l"
+{ return INDEX_L ; }
YY_BREAK
case 61:
-/* rule 61 can match eol */
YY_RULE_SETUP
-#line 499 "./sparql_l.l"
-{ sparyyerror ("End-of-line in a short double-quoted string"); yymore(); }
+#line 440 "./sparql_l.l"
+{ return INFERENCE_L ; }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 500 "./sparql_l.l"
-{ yymore(); }
+#line 441 "./sparql_l.l"
+{ return INSERT_L ; }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 501 "./sparql_l.l"
-{ yymore(); }
+#line 442 "./sparql_l.l"
+{ return INTO_L ; }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 502 "./sparql_l.l"
-{ sparyyerror ("Bad escape sequence in a short single-quoted string"); }
+#line 443 "./sparql_l.l"
+{ return IRI_L ; }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 503 "./sparql_l.l"
-{ sparyyerror ("Bad escape sequence in a short double-quoted string"); }
- YY_BREAK
-case YY_STATE_EOF(SPARQL_SQ):
-#line 504 "./sparql_l.l"
-{ sparyyerror ("Unterminated short single-quoted string"); }
- YY_BREAK
-case YY_STATE_EOF(SPARQL_DQ):
-#line 505 "./sparql_l.l"
-{ sparyyerror ("Unterminated short double-quoted string"); }
+#line 444 "./sparql_l.l"
+{ return isBLANK_L ; }
YY_BREAK
-/* Whitespace after COUNT keyword */
case 66:
YY_RULE_SETUP
-#line 509 "./sparql_l.l"
-{ BEGIN SPARQL; TOKPAR_OPEN (COUNT_LPAR, ')', GET_CURRENT_BEGIN) }
+#line 445 "./sparql_l.l"
+{ return isIRI_L ; }
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 510 "./sparql_l.l"
-{ BEGIN SPARQL; return COUNT_DISTINCT_L; }
- YY_BREAK
-case YY_STATE_EOF(SPARQL_AFTER_COUNT):
-#line 511 "./sparql_l.l"
-{ sparyyerror ("Unexpected end of SPARQL expression after IDENTIFIED keyword"); }
+#line 446 "./sparql_l.l"
+{ return isLITERAL_L ; }
YY_BREAK
-/* Whitespace after IDENTIFIED keyword */
case 68:
YY_RULE_SETUP
-#line 515 "./sparql_l.l"
-{ BEGIN SPARQL; return BY_L; }
- YY_BREAK
-case YY_STATE_EOF(SPARQL_AFTER_IDENTIFIED):
-#line 516 "./sparql_l.l"
-{ sparyyerror ("Unexpected end of SPARQL expression after IDENTIFIED keyword"); }
+#line 447 "./sparql_l.l"
+{ return isREF_L ; }
YY_BREAK
-/* SQL fragments */
case 69:
YY_RULE_SETUP
-#line 520 "./sparql_l.l"
-{ BEGIN SPARQL; TOKPAR_OPEN (_LBRA, '}', GET_CURRENT_BEGIN) }
+#line 448 "./sparql_l.l"
+{ return isURI_L ; }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 521 "./sparql_l.l"
-{ BEGIN SPARQL; TOKPAR_OPEN (_LPAR, ')', SPARQL_SQL_FRAGMENT) }
+#line 449 "./sparql_l.l"
+{ return LANG_L ; }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 522 "./sparql_l.l"
-{ SET_INNER_BEGIN(SPARQL_SSSQ); BEGIN_INNER; }
+#line 450 "./sparql_l.l"
+{ return LANGMATCHES_L ; }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 523 "./sparql_l.l"
-{ SET_INNER_BEGIN(SPARQL_DDDQ); BEGIN_INNER; }
+#line 451 "./sparql_l.l"
+{ return LIKE_L ; }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 524 "./sparql_l.l"
-{ SET_INNER_BEGIN(SPARQL_SQ); BEGIN_INNER; }
+#line 452 "./sparql_l.l"
+{ return LIMIT_L ; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 525 "./sparql_l.l"
-{ SET_INNER_BEGIN(SPARQL_DQ); BEGIN_INNER; }
- YY_BREAK
-case YY_STATE_EOF(SPARQL_AFTER_WHERE):
-#line 526 "./sparql_l.l"
-{ sparyyerror ("Unexpected end of SPARQL expression after WHERE keyword"); }
+#line 453 "./sparql_l.l"
+{ return LITERAL_L ; }
YY_BREAK
case 75:
-/* rule 75 can match eol */
YY_RULE_SETUP
-#line 528 "./sparql_l.l"
-{ yymore(); }
+#line 454 "./sparql_l.l"
+{ return LOAD_L ; }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 530 "./sparql_l.l"
-{ TOKPAR_FAKE_OPEN('}', SPARQL_SQL_FRAGMENT); yymore(); }
+#line 455 "./sparql_l.l"
+{ return MAKE_L ; }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 531 "./sparql_l.l"
-{ TOKPAR_FAKE_CLOSE('}'); yymore(); }
+#line 456 "./sparql_l.l"
+{ return MAP_L ; }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 532 "./sparql_l.l"
-{ TOKPAR_FAKE_OPEN(')', SPARQL_SQL_FRAGMENT); yymore(); }
+#line 457 "./sparql_l.l"
+{ return MAX_L ; }
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 533 "./sparql_l.l"
-{
- TOKPAR_FAKE_CLOSE(')');
- if (SPARQL == GET_CURRENT_BEGIN)
- {
- sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng-1);
- return SPARQL_SQLTEXT;
- }
- else
- yymore();
- }
+#line 458 "./sparql_l.l"
+{ return MIN_L ; }
YY_BREAK
case 80:
-/* rule 80 can match eol */
YY_RULE_SETUP
-#line 544 "./sparql_l.l"
-{ sparp->sparp_lexlineno++; yymore(); }
+#line 459 "./sparql_l.l"
+{ return MINUS_L ; }
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 545 "./sparql_l.l"
-{ sparyyerror ("Unterminated comment in SQL fragment after WHERE keyword"); }
+#line 460 "./sparql_l.l"
+{ return MODIFY_L ; }
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 546 "./sparql_l.l"
-{ yymore(); }
+#line 461 "./sparql_l.l"
+{ return NAMED_L ; }
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 547 "./sparql_l.l"
-{ BEGIN SPARQL_SQL_SQSTRING; yymore(); }
+#line 462 "./sparql_l.l"
+{ return NIL_L ; }
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 548 "./sparql_l.l"
-{ yymore(); }
+#line 463 "./sparql_l.l"
+{ return NOT_L ; }
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 549 "./sparql_l.l"
-{ sparyyerror ("Unterminated double-quoted identifier in SQL fragment after WHERE keyword"); }
+#line 464 "./sparql_l.l"
+{ return NOT_FROM_L ; }
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 551 "./sparql_l.l"
-{ BEGIN SPARQL_SQL_FRAGMENT; yymore(); }
+#line 465 "./sparql_l.l"
+{ return NULL_L ; }
YY_BREAK
case 87:
-/* rule 87 can match eol */
YY_RULE_SETUP
-#line 552 "./sparql_l.l"
-{ sparp->sparp_lexlineno++; yymore(); }
+#line 466 "./sparql_l.l"
+{ return OBJECT_L ; }
YY_BREAK
case 88:
-/* rule 88 can match eol */
YY_RULE_SETUP
-#line 553 "./sparql_l.l"
-{ sparp->sparp_lexlineno++; yymore(); }
+#line 467 "./sparql_l.l"
+{ return OF_L ; }
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 554 "./sparql_l.l"
-{ yymore(); }
+#line 468 "./sparql_l.l"
+{ return OFFBAND_L ; }
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 555 "./sparql_l.l"
-{ yymore(); }
+#line 469 "./sparql_l.l"
+{ return OFFSET_L ; }
YY_BREAK
case 91:
YY_RULE_SETUP
+#line 470 "./sparql_l.l"
+{ return OPTIONAL_L ; }
+ YY_BREAK
+case 92:
+YY_RULE_SETUP
+#line 471 "./sparql_l.l"
+{ return OPTION_L ; }
+ YY_BREAK
+case 93:
+YY_RULE_SETUP
+#line 472 "./sparql_l.l"
+{ return ORDER_L ; }
+ YY_BREAK
+case 94:
+YY_RULE_SETUP
+#line 473 "./sparql_l.l"
+{ return PREDICATE_L ; }
+ YY_BREAK
+case 95:
+YY_RULE_SETUP
+#line 474 "./sparql_l.l"
+{ return PREFIX_L ; }
+ YY_BREAK
+case 96:
+YY_RULE_SETUP
+#line 475 "./sparql_l.l"
+{ return QUAD_L ; }
+ YY_BREAK
+case 97:
+YY_RULE_SETUP
+#line 476 "./sparql_l.l"
+{ return REGEX_L ; }
+ YY_BREAK
+case 98:
+YY_RULE_SETUP
+#line 477 "./sparql_l.l"
+{ return REDUCED_L ; }
+ YY_BREAK
+case 99:
+YY_RULE_SETUP
+#line 478 "./sparql_l.l"
+{ return RETURNS_L ; }
+ YY_BREAK
+case 100:
+YY_RULE_SETUP
+#line 479 "./sparql_l.l"
+{ return SCORE_L ; }
+ YY_BREAK
+case 101:
+YY_RULE_SETUP
+#line 480 "./sparql_l.l"
+{ return SCORE_LIMIT_L ; }
+ YY_BREAK
+case 102:
+YY_RULE_SETUP
+#line 481 "./sparql_l.l"
+{ return SAME_AS_L ; }
+ YY_BREAK
+case 103:
+YY_RULE_SETUP
+#line 482 "./sparql_l.l"
+{ return SAME_AS_O_L ; }
+ YY_BREAK
+case 104:
+YY_RULE_SETUP
+#line 483 "./sparql_l.l"
+{ return SAME_AS_P_L ; }
+ YY_BREAK
+case 105:
+YY_RULE_SETUP
+#line 484 "./sparql_l.l"
+{ return SAME_AS_S_L ; }
+ YY_BREAK
+case 106:
+YY_RULE_SETUP
+#line 485 "./sparql_l.l"
+{ return SAME_AS_S_O_L ; }
+ YY_BREAK
+case 107:
+YY_RULE_SETUP
+#line 486 "./sparql_l.l"
+{ return SAMETERM_L ; }
+ YY_BREAK
+case 108:
+YY_RULE_SETUP
+#line 487 "./sparql_l.l"
+{ return SELECT_L ; }
+ YY_BREAK
+case 109:
+YY_RULE_SETUP
+#line 488 "./sparql_l.l"
+{ return SERVICE_L ; }
+ YY_BREAK
+case 110:
+YY_RULE_SETUP
+#line 489 "./sparql_l.l"
+{ return SILENT_L ; }
+ YY_BREAK
+case 111:
+YY_RULE_SETUP
+#line 490 "./sparql_l.l"
+{ return SOFT_L ; }
+ YY_BREAK
+case 112:
+YY_RULE_SETUP
+#line 491 "./sparql_l.l"
+{ return STORAGE_L ; }
+ YY_BREAK
+case 113:
+YY_RULE_SETUP
+#line 492 "./sparql_l.l"
+{ return STR_L ; }
+ YY_BREAK
+case 114:
+YY_RULE_SETUP
+#line 493 "./sparql_l.l"
+{ return SUBCLASS_L ; }
+ YY_BREAK
+case 115:
+YY_RULE_SETUP
+#line 494 "./sparql_l.l"
+{ return SUBJECT_L ; }
+ YY_BREAK
+case 116:
+YY_RULE_SETUP
+#line 495 "./sparql_l.l"
+{ return SUM_L ; }
+ YY_BREAK
+case 117:
+YY_RULE_SETUP
+#line 496 "./sparql_l.l"
+{ return TABLE_OPTION_L ; }
+ YY_BREAK
+case 118:
+YY_RULE_SETUP
+#line 497 "./sparql_l.l"
+{ return T_CYCLES_ONLY_L ; }
+ YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 498 "./sparql_l.l"
+{ return T_DIRECTION_L ; }
+ YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 499 "./sparql_l.l"
+{ return T_DISTINCT_L ; }
+ YY_BREAK
+case 121:
+YY_RULE_SETUP
+#line 500 "./sparql_l.l"
+{ return T_END_FLAG_L ; }
+ YY_BREAK
+case 122:
+YY_RULE_SETUP
+#line 501 "./sparql_l.l"
+{ return T_EXISTS_L ; }
+ YY_BREAK
+case 123:
+YY_RULE_SETUP
+#line 502 "./sparql_l.l"
+{ return T_FINAL_AS_L ; }
+ YY_BREAK
+case 124:
+YY_RULE_SETUP
+#line 503 "./sparql_l.l"
+{ return T_IN_L ; }
+ YY_BREAK
+case 125:
+YY_RULE_SETUP
+#line 504 "./sparql_l.l"
+{ return T_MAX_L ; }
+ YY_BREAK
+case 126:
+YY_RULE_SETUP
+#line 505 "./sparql_l.l"
+{ return T_MIN_L ; }
+ YY_BREAK
+case 127:
+YY_RULE_SETUP
+#line 506 "./sparql_l.l"
+{ return T_OUT_L ; }
+ YY_BREAK
+case 128:
+YY_RULE_SETUP
+#line 507 "./sparql_l.l"
+{ return T_NO_CYCLES_L ; }
+ YY_BREAK
+case 129:
+YY_RULE_SETUP
+#line 508 "./sparql_l.l"
+{ return T_NO_ORDER_L ; }
+ YY_BREAK
+case 130:
+YY_RULE_SETUP
+#line 509 "./sparql_l.l"
+{ return T_SHORTEST_ONLY_L ; }
+ YY_BREAK
+case 131:
+YY_RULE_SETUP
+#line 510 "./sparql_l.l"
+{ return T_STEP_L ; }
+ YY_BREAK
+case 132:
+YY_RULE_SETUP
+#line 511 "./sparql_l.l"
+{ return TRANSITIVE_L ; }
+ YY_BREAK
+case 133:
+YY_RULE_SETUP
+#line 512 "./sparql_l.l"
+{ return true_L ; }
+ YY_BREAK
+case 134:
+YY_RULE_SETUP
+#line 513 "./sparql_l.l"
+{ return UNBOUND_L ; }
+ YY_BREAK
+case 135:
+YY_RULE_SETUP
+#line 514 "./sparql_l.l"
+{ return UNION_L ; }
+ YY_BREAK
+case 136:
+YY_RULE_SETUP
+#line 515 "./sparql_l.l"
+{ return USING_L ; }
+ YY_BREAK
+case 137:
+YY_RULE_SETUP
+#line 516 "./sparql_l.l"
+{ return WITH_L ; }
+ YY_BREAK
+case 138:
+YY_RULE_SETUP
+#line 518 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return TEXT_BL ; }
+ YY_BREAK
+case 139:
+YY_RULE_SETUP
+#line 519 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return XML_BL ; }
+ YY_BREAK
+case 140:
+YY_RULE_SETUP
+#line 521 "./sparql_l.l"
+{ BEGIN SPARQL_AFTER_IDENTIFIED; return IDENTIFIED_L ; }
+ YY_BREAK
+case 141:
+YY_RULE_SETUP
+#line 522 "./sparql_l.l"
+{ BEGIN SPARQL_AFTER_WHERE; return WHERE_L ; }
+ YY_BREAK
+case 142:
+YY_RULE_SETUP
+#line 523 "./sparql_l.l"
+{ BEGIN SPARQL_AFTER_WHERE; return SQLQUERY_L ; }
+ YY_BREAK
+/* Keyword punctuators of the SPARQL described in first drafts of W3C spec */
+case 143:
+YY_RULE_SETUP
+#line 527 "./sparql_l.l"
+{ return GRAPH_L ; }
+ YY_BREAK
+case 144:
+YY_RULE_SETUP
+#line 528 "./sparql_l.l"
+{ return _AMP_AMP; }
+ YY_BREAK
+case 145:
+YY_RULE_SETUP
+#line 529 "./sparql_l.l"
+{ return _BAR_BAR; }
+ YY_BREAK
+/* Grouping non-keyword punctuators */
+case 146:
+YY_RULE_SETUP
+#line 533 "./sparql_l.l"
+TOKPAR_OPEN (_LPAR,')', GET_CURRENT_BEGIN)
+ YY_BREAK
+case 147:
+YY_RULE_SETUP
+#line 534 "./sparql_l.l"
+TOKPAR_CLOSE (_RPAR,')')
+ YY_BREAK
+case 148:
+YY_RULE_SETUP
+#line 535 "./sparql_l.l"
+TOKPAR_OPEN (_LBRA,'}', GET_CURRENT_BEGIN)
+ YY_BREAK
+case 149:
+YY_RULE_SETUP
+#line 536 "./sparql_l.l"
+TOKPAR_CLOSE (_RBRA,'}')
+ YY_BREAK
+case 150:
+YY_RULE_SETUP
+#line 537 "./sparql_l.l"
+TOKPAR_OPEN (_LSQBRA,']', GET_CURRENT_BEGIN)
+ YY_BREAK
+case 151:
+YY_RULE_SETUP
+#line 538 "./sparql_l.l"
+TOKPAR_CLOSE (_RSQBRA,']')
+ YY_BREAK
+/* Name lexems */
+case 152:
+YY_RULE_SETUP
+#line 542 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 2);
+ return Q_IRI_REF;
+ }
+ YY_BREAK
+case 153:
+YY_RULE_SETUP
+#line 547 "./sparql_l.l"
+{ TOKBOX_Q(0,QNAME,"qualified URI"); }
+ YY_BREAK
+case 154:
+YY_RULE_SETUP
+#line 548 "./sparql_l.l"
+{ TOKBOX_Q(0,QNAME_NS,"namespace"); }
+ YY_BREAK
+case 155:
+YY_RULE_SETUP
+#line 549 "./sparql_l.l"
+{ TOKBOX_Q(0,BLANK_NODE_LABEL,"blank node label"); }
+ YY_BREAK
+case 156:
+YY_RULE_SETUP
+#line 551 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return QUEST_VARNAME;
+ }
+ YY_BREAK
+case 157:
+YY_RULE_SETUP
#line 556 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return DOLLAR_VARNAME;
+ }
+ YY_BREAK
+case 158:
+YY_RULE_SETUP
+#line 561 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return QUEST_COLON_PARAMNAME;
+ }
+ YY_BREAK
+case 159:
+YY_RULE_SETUP
+#line 566 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return DOLLAR_COLON_PARAMNAME;
+ }
+ YY_BREAK
+case 160:
+YY_RULE_SETUP
+#line 571 "./sparql_l.l"
+{
+ char buf[20]; sprintf (buf, ":%d", sparp->sparp_sparqre->sparqre_param_ctr[0]);
+ sparp->sparp_sparqre->sparqre_param_ctr[0] += 1;
+ sparyylval.box = t_box_dv_uname_string (buf);
+ return QUEST_COLON_PARAMNUM;
+ }
+ YY_BREAK
+case 161:
+YY_RULE_SETUP
+#line 578 "./sparql_l.l"
+{
+ char buf[20]; sprintf (buf, ":%d", sparp->sparp_sparqre->sparqre_param_ctr[0]);
+ sparp->sparp_sparqre->sparqre_param_ctr[0] += 1;
+ sparyylval.box = t_box_dv_uname_string (buf);
+ return DOLLAR_COLON_PARAMNUM;
+ }
+ YY_BREAK
+case 162:
+YY_RULE_SETUP
+#line 585 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return LANGTAG;
+ }
+ YY_BREAK
+case 163:
+YY_RULE_SETUP
+#line 590 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_PLAIN_ID; }
+ YY_BREAK
+case 164:
+YY_RULE_SETUP
+#line 591 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_ALIASCOLNAME; }
+ YY_BREAK
+case 165:
+YY_RULE_SETUP
+#line 592 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_QTABLENAME; }
+ YY_BREAK
+case 166:
+YY_RULE_SETUP
+#line 593 "./sparql_l.l"
+{ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_QTABLECOLNAME; }
+ YY_BREAK
+/* Numeric lexems */
+case 167:
+YY_RULE_SETUP
+#line 597 "./sparql_l.l"
+{ return sparscn_NUMBER_int (yylval, sparp); }
+ YY_BREAK
+case 168:
+YY_RULE_SETUP
+#line 598 "./sparql_l.l"
+{ return sparscn_NUMBER_decimal (yylval, sparp); }
+ YY_BREAK
+case 169:
+YY_RULE_SETUP
+#line 599 "./sparql_l.l"
+{ return sparscn_NUMBER_double (yylval, sparp); }
+ YY_BREAK
+/* String lexems */
+case 170:
+YY_RULE_SETUP
+#line 603 "./sparql_l.l"
+{
+ sparyylval.box = t_box_dv_short_nchars (sparyytext+1, sparyyleng - 2);
+ return SPARQL_STRING;
+ }
+ YY_BREAK
+case 171:
+YY_RULE_SETUP
+#line 608 "./sparql_l.l"
+{ yymore(); SET_INNER_BEGIN(SPARQL_SSSQ); BEGIN_INNER; }
+ YY_BREAK
+case 172:
+YY_RULE_SETUP
+#line 609 "./sparql_l.l"
+{ yymore(); SET_INNER_BEGIN(SPARQL_DDDQ); BEGIN_INNER; }
+ YY_BREAK
+case 173:
+YY_RULE_SETUP
+#line 610 "./sparql_l.l"
+{ sparyylval.box = spar_strliteral (sparp, sparyytext, 1, 0); BEGIN_OUTER; return SPARQL_STRING; }
+ YY_BREAK
+case 174:
+YY_RULE_SETUP
+#line 611 "./sparql_l.l"
+{ sparyylval.box = spar_strliteral (sparp, sparyytext, 1, 0); BEGIN_OUTER; return SPARQL_STRING; }
+ YY_BREAK
+case 175:
+/* rule 175 can match eol */
+YY_RULE_SETUP
+#line 612 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
+ YY_BREAK
+case 176:
+/* rule 176 can match eol */
+YY_RULE_SETUP
+#line 613 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
+ YY_BREAK
+case 177:
+YY_RULE_SETUP
+#line 614 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 178:
+YY_RULE_SETUP
+#line 615 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 179:
+YY_RULE_SETUP
+#line 616 "./sparql_l.l"
+{ sparyyerror ("Bad escape sequence in a long single-quoted string"); }
+ YY_BREAK
+case 180:
+YY_RULE_SETUP
+#line 617 "./sparql_l.l"
+{ sparyyerror ("Bad escape sequence in a long double-quoted string"); }
+ YY_BREAK
+case 181:
+YY_RULE_SETUP
+#line 618 "./sparql_l.l"
+{ sparyyerror ("Bad character in a long single-quoted string"); }
+ YY_BREAK
+case 182:
+YY_RULE_SETUP
+#line 619 "./sparql_l.l"
+{ sparyyerror ("Bad character in a long double-quoted string"); }
+ YY_BREAK
+case YY_STATE_EOF(SPARQL_SSSQ):
+#line 620 "./sparql_l.l"
+{ sparyyerror ("Unterminated long single-quoted string"); }
+ YY_BREAK
+case YY_STATE_EOF(SPARQL_DDDQ):
+#line 621 "./sparql_l.l"
+{ sparyyerror ("Unterminated long double-quoted string"); }
+ YY_BREAK
+case 183:
+YY_RULE_SETUP
+#line 624 "./sparql_l.l"
+{ yymore(); SET_INNER_BEGIN(SPARQL_SQ); BEGIN_INNER; }
+ YY_BREAK
+case 184:
+YY_RULE_SETUP
+#line 625 "./sparql_l.l"
+{ yymore(); SET_INNER_BEGIN(SPARQL_DQ); BEGIN_INNER; }
+ YY_BREAK
+case 185:
+YY_RULE_SETUP
+#line 626 "./sparql_l.l"
+{ sparyylval.box = spar_strliteral (sparp, sparyytext, 0, 0); BEGIN_OUTER; return SPARQL_STRING; }
+ YY_BREAK
+case 186:
+YY_RULE_SETUP
+#line 627 "./sparql_l.l"
+{ sparyylval.box = spar_strliteral (sparp, sparyytext, 0, 0); BEGIN_OUTER; return SPARQL_STRING; }
+ YY_BREAK
+case 187:
+/* rule 187 can match eol */
+YY_RULE_SETUP
+#line 628 "./sparql_l.l"
+{ sparyyerror ("End-of-line in a short single-quoted string"); yymore(); }
+ YY_BREAK
+case 188:
+/* rule 188 can match eol */
+YY_RULE_SETUP
+#line 629 "./sparql_l.l"
+{ sparyyerror ("End-of-line in a short double-quoted string"); yymore(); }
+ YY_BREAK
+case 189:
+YY_RULE_SETUP
+#line 630 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 190:
+YY_RULE_SETUP
+#line 631 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 191:
+YY_RULE_SETUP
+#line 632 "./sparql_l.l"
+{ sparyyerror ("Bad escape sequence in a short single-quoted string"); }
+ YY_BREAK
+case 192:
+YY_RULE_SETUP
+#line 633 "./sparql_l.l"
+{ sparyyerror ("Bad escape sequence in a short double-quoted string"); }
+ YY_BREAK
+case YY_STATE_EOF(SPARQL_SQ):
+#line 634 "./sparql_l.l"
+{ sparyyerror ("Unterminated short single-quoted string"); }
+ YY_BREAK
+case YY_STATE_EOF(SPARQL_DQ):
+#line 635 "./sparql_l.l"
+{ sparyyerror ("Unterminated short double-quoted string"); }
+ YY_BREAK
+/* Whitespace after COUNT keyword */
+case 193:
+YY_RULE_SETUP
+#line 639 "./sparql_l.l"
+{ BEGIN SPARQL; TOKPAR_OPEN (COUNT_LPAR, ')', GET_CURRENT_BEGIN) }
+ YY_BREAK
+case 194:
+YY_RULE_SETUP
+#line 640 "./sparql_l.l"
+{ BEGIN SPARQL; return COUNT_DISTINCT_L; }
+ YY_BREAK
+case YY_STATE_EOF(SPARQL_AFTER_COUNT):
+#line 641 "./sparql_l.l"
+{ sparyyerror ("Unexpected end of SPARQL expression after IDENTIFIED keyword"); }
+ YY_BREAK
+/* Whitespace after IDENTIFIED keyword */
+case 195:
+YY_RULE_SETUP
+#line 645 "./sparql_l.l"
+{ BEGIN SPARQL; return BY_L; }
+ YY_BREAK
+case YY_STATE_EOF(SPARQL_AFTER_IDENTIFIED):
+#line 646 "./sparql_l.l"
+{ sparyyerror ("Unexpected end of SPARQL expression after IDENTIFIED keyword"); }
+ YY_BREAK
+/* SQL fragments */
+case 196:
+YY_RULE_SETUP
+#line 650 "./sparql_l.l"
+{ BEGIN SPARQL; TOKPAR_OPEN (_LBRA, '}', GET_CURRENT_BEGIN) }
+ YY_BREAK
+case 197:
+YY_RULE_SETUP
+#line 651 "./sparql_l.l"
+{ BEGIN SPARQL; TOKPAR_OPEN (_LPAR, ')', SPARQL_SQL_FRAGMENT) }
+ YY_BREAK
+case 198:
+YY_RULE_SETUP
+#line 652 "./sparql_l.l"
+{ SET_INNER_BEGIN(SPARQL_SSSQ); BEGIN_INNER; }
+ YY_BREAK
+case 199:
+YY_RULE_SETUP
+#line 653 "./sparql_l.l"
+{ SET_INNER_BEGIN(SPARQL_DDDQ); BEGIN_INNER; }
+ YY_BREAK
+case 200:
+YY_RULE_SETUP
+#line 654 "./sparql_l.l"
+{ SET_INNER_BEGIN(SPARQL_SQ); BEGIN_INNER; }
+ YY_BREAK
+case 201:
+YY_RULE_SETUP
+#line 655 "./sparql_l.l"
+{ SET_INNER_BEGIN(SPARQL_DQ); BEGIN_INNER; }
+ YY_BREAK
+case YY_STATE_EOF(SPARQL_AFTER_WHERE):
+#line 656 "./sparql_l.l"
+{ sparyyerror ("Unexpected end of SPARQL expression after WHERE keyword"); }
+ YY_BREAK
+case 202:
+/* rule 202 can match eol */
+YY_RULE_SETUP
+#line 658 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 203:
+YY_RULE_SETUP
+#line 660 "./sparql_l.l"
+{ TOKPAR_FAKE_OPEN('}', SPARQL_SQL_FRAGMENT); yymore(); }
+ YY_BREAK
+case 204:
+YY_RULE_SETUP
+#line 661 "./sparql_l.l"
+{ TOKPAR_FAKE_CLOSE('}'); yymore(); }
+ YY_BREAK
+case 205:
+YY_RULE_SETUP
+#line 662 "./sparql_l.l"
+{ TOKPAR_FAKE_OPEN(')', SPARQL_SQL_FRAGMENT); yymore(); }
+ YY_BREAK
+case 206:
+YY_RULE_SETUP
+#line 663 "./sparql_l.l"
+{
+ TOKPAR_FAKE_CLOSE(')');
+ if (SPARQL == GET_CURRENT_BEGIN)
+ {
+ sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng-1);
+ return SPARQL_SQLTEXT;
+ }
+ else
+ yymore();
+ }
+ YY_BREAK
+case 207:
+/* rule 207 can match eol */
+YY_RULE_SETUP
+#line 674 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
+ YY_BREAK
+case 208:
+YY_RULE_SETUP
+#line 675 "./sparql_l.l"
+{ sparyyerror ("Unterminated comment in SQL fragment after WHERE keyword"); }
+ YY_BREAK
+case 209:
+YY_RULE_SETUP
+#line 676 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 210:
+YY_RULE_SETUP
+#line 677 "./sparql_l.l"
+{ BEGIN SPARQL_SQL_SQSTRING; yymore(); }
+ YY_BREAK
+case 211:
+YY_RULE_SETUP
+#line 678 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 212:
+YY_RULE_SETUP
+#line 679 "./sparql_l.l"
+{ sparyyerror ("Unterminated double-quoted identifier in SQL fragment after WHERE keyword"); }
+ YY_BREAK
+case 213:
+YY_RULE_SETUP
+#line 681 "./sparql_l.l"
+{ BEGIN SPARQL_SQL_FRAGMENT; yymore(); }
+ YY_BREAK
+case 214:
+/* rule 214 can match eol */
+YY_RULE_SETUP
+#line 682 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
+ YY_BREAK
+case 215:
+/* rule 215 can match eol */
+YY_RULE_SETUP
+#line 683 "./sparql_l.l"
+{ sparp->sparp_lexlineno++; yymore(); }
+ YY_BREAK
+case 216:
+YY_RULE_SETUP
+#line 684 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 217:
+YY_RULE_SETUP
+#line 685 "./sparql_l.l"
+{ yymore(); }
+ YY_BREAK
+case 218:
+YY_RULE_SETUP
+#line 686 "./sparql_l.l"
{ yymore(); }
YY_BREAK
case YY_STATE_EOF(SPARQL_SQL_SQSTRING):
-#line 557 "./sparql_l.l"
+#line 687 "./sparql_l.l"
{ sparyyerror ("Unterminated single-quoted string in SQL fragment after WHERE keyword"); }
YY_BREAK
/* Whitespace and comments */
-case 92:
-/* rule 92 can match eol */
+case 219:
+/* rule 219 can match eol */
YY_RULE_SETUP
-#line 561 "./sparql_l.l"
+#line 691 "./sparql_l.l"
{ sparp->sparp_lexlineno++; }
YY_BREAK
-case 93:
+case 220:
YY_RULE_SETUP
-#line 562 "./sparql_l.l"
+#line 692 "./sparql_l.l"
{ }
YY_BREAK
-case 94:
+case 221:
YY_RULE_SETUP
-#line 563 "./sparql_l.l"
+#line 693 "./sparql_l.l"
{ }
YY_BREAK
-case 95:
+case 222:
YY_RULE_SETUP
-#line 565 "./sparql_l.l"
+#line 695 "./sparql_l.l"
{ BEGIN (SPARQL_SQL_COMMENT); yymore(); }
YY_BREAK
case YY_STATE_EOF(SPARQL_SQL_FRAGMENT):
-#line 566 "./sparql_l.l"
+#line 696 "./sparql_l.l"
{ sparyyerror ("Unterminated SQL fragment after WHERE keyword"); }
YY_BREAK
-case 96:
+case 223:
YY_RULE_SETUP
-#line 568 "./sparql_l.l"
+#line 698 "./sparql_l.l"
{ sparyyerror ("Nested C style comments not supported"); }
YY_BREAK
-case 97:
+case 224:
YY_RULE_SETUP
-#line 569 "./sparql_l.l"
+#line 699 "./sparql_l.l"
{ BEGIN (SPARQL_SQL_FRAGMENT); yymore(); }
YY_BREAK
-case 98:
+case 225:
YY_RULE_SETUP
-#line 570 "./sparql_l.l"
+#line 700 "./sparql_l.l"
{ yymore(); }
YY_BREAK
/* Traps; these rules should be latest rules in the file. */
-case 99:
+case 226:
YY_RULE_SETUP
-#line 574 "./sparql_l.l"
+#line 704 "./sparql_l.l"
{ sparyyerror ("Only '(' and 'DISTINCT' are allowed after COUNT keyword in SPARQL expression"); }
YY_BREAK
-case 100:
+case 227:
YY_RULE_SETUP
-#line 575 "./sparql_l.l"
+#line 705 "./sparql_l.l"
{ sparyyerror ("Ill formed IDENTIFIED BY term"); }
YY_BREAK
-case 101:
+case 228:
YY_RULE_SETUP
-#line 576 "./sparql_l.l"
+#line 706 "./sparql_l.l"
{ sparyyerror ("Only '{', '(' and a string literal are allowed after WHERE or SQLQUERY keyword in SPARQL expression"); }
YY_BREAK
-case 102:
+case 229:
YY_RULE_SETUP
-#line 577 "./sparql_l.l"
+#line 707 "./sparql_l.l"
{ sparyyerror ("Invalid character in SPARQL expression"); }
YY_BREAK
-case 103:
+case 230:
YY_RULE_SETUP
-#line 579 "./sparql_l.l"
+#line 709 "./sparql_l.l"
ECHO;
YY_BREAK
-#line 2254 "sparql_l.c"
+#line 4326 "sparql_l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(SPARQL):
case YY_STATE_EOF(SPARQL_SQL_COMMENT):
@@ -2546,7 +4618,7 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 335 )
+ if ( yy_current_state >= 895 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2574,11 +4646,11 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 335 )
+ if ( yy_current_state >= 895 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 334);
+ yy_is_jam = (yy_current_state == 894);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -3211,7 +5283,7 @@ void sparyyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 579 "./sparql_l.l"
+#line 709 "./sparql_l.l"
diff --git a/libsrc/Wi/sparql_l.l b/libsrc/Wi/sparql_l.l
index b4c02ef..9f34fe0 100644
--- a/libsrc/Wi/sparql_l.l
+++ b/libsrc/Wi/sparql_l.l
@@ -1,10 +1,10 @@
/*
- * $Id: sparql_l.l,v 1.37.2.20 2012/03/08 12:55:36 source Exp $
+ * $Id: sparql_l.l,v 1.37.2.17 2011/06/11 16:41:47 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -32,7 +32,6 @@
#include "sparql.h"
#include "sparql_p.h"
#include "numeric.h"
-#include "sparqlwords.h"
#define sparyyerror(strg) sparyyerror_impl(sparp, sparyytext, (strg))
@@ -399,6 +398,135 @@ SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQL
/* Keyword punctuators */
<SPARQL>"a" { return a_L ; }
+<SPARQL>{A}{L}{T}{E}{R} { return ALTER_L ; }
+<SPARQL>{A}{S} { return AS_L ; }
+<SPARQL>{A}{S}{C} { return ASC_L ; }
+<SPARQL>{A}{S}{K} { return ASK_L ; }
+<SPARQL>{A}{V}{G} { return AVG_L ; }
+<SPARQL>{B}{A}{S}{E} { return BASE_L ; }
+<SPARQL>{B}{I}{N}{D}{I}{N}{G}{S} { return BINDINGS_L ; }
+<SPARQL>{B}{I}{J}{E}{C}{T}{I}{O}{N} { return BIJECTION_L ; }
+<SPARQL>{B}{O}{U}{N}{D} { return BOUND_L ; }
+<SPARQL>{B}{Y} { return BY_L ; }
+<SPARQL>{C}{L}{A}{S}{S} { return CLASS_L ; }
+<SPARQL>{C}{L}{E}{A}{R} { return CLEAR_L ; }
+<SPARQL>{C}{O}{A}{L}{E}{S}{C}{E} { return COALESCE_L ; }
+<SPARQL>{C}{O}{N}{S}{T}{R}{U}{C}{T} { return CONSTRUCT_L ; }
+<SPARQL>{C}{O}{U}{N}{T} { BEGIN SPARQL_AFTER_COUNT; }
+<SPARQL>{C}{R}{E}{A}{T}{E} { return CREATE_L ; }
+<SPARQL>{D}{A}{T}{A} { return DATA_L ; }
+<SPARQL>{D}{A}{T}{A}{T}{Y}{P}{E} { return DATATYPE_L ; }
+<SPARQL>{D}{E}{F}{A}{U}{L}{T} { return DEFAULT_L ; }
+<SPARQL>{D}{E}{F}{I}{N}{E} { return DEFINE_L ; }
+<SPARQL>{D}{E}{L}{E}{T}{E} { return DELETE_L ; }
+<SPARQL>{D}{E}{R}{E}{F} { return DEREF_L ; }
+<SPARQL>{D}{E}{S}{C} { return DESC_L ; }
+<SPARQL>{D}{E}{S}{C}{R}{I}{B}{E} { return DESCRIBE_L ; }
+<SPARQL>{D}{I}{S}{T}{I}{N}{C}{T} { return DISTINCT_L ; }
+<SPARQL>{D}{R}{O}{P} { return DROP_L ; }
+<SPARQL>{E}{X}{C}{L}{U}{S}{I}{V}{E} { return EXCLUSIVE_L ; }
+<SPARQL>{E}{X}{I}{S}{T}{S} { return EXISTS_L ; }
+<SPARQL>{F}{A}{L}{S}{E} { return false_L ; }
+<SPARQL>{F}{I}{L}{T}{E}{R} { return FILTER_L ; }
+<SPARQL>{F}{R}{O}{M} { return FROM_L ; }
+<SPARQL>{F}{U}{N}{C}{T}{I}{O}{N} { return FUNCTION_L ; }
+<SPARQL>{G}{R}{A}{P}{H} { return GRAPH_L ; }
+<SPARQL>{G}{R}{O}{U}{P} { return GROUP_L ; }
+<SPARQL>{H}{A}{V}{I}{N}{G} { return HAVING_L ; }
+<SPARQL>{I}{F} { return IF_L ; }
+<SPARQL>{I}{F}{P} { return IFP_L ; }
+<SPARQL>{I}{N} { return IN_L ; }
+<SPARQL>{I}{N}{D}{E}{X} { return INDEX_L ; }
+<SPARQL>{I}{N}{F}{E}{R}{E}{N}{C}{E} { return INFERENCE_L ; }
+<SPARQL>{I}{N}{S}{E}{R}{T} { return INSERT_L ; }
+<SPARQL>{I}{N}{T}{O} { return INTO_L ; }
+<SPARQL>{I}{R}{I} { return IRI_L ; }
+<SPARQL>{I}{S}{B}{L}{A}{N}{K} { return isBLANK_L ; }
+<SPARQL>{I}{S}{I}{R}{I} { return isIRI_L ; }
+<SPARQL>{I}{S}{L}{I}{T}{E}{R}{A}{L} { return isLITERAL_L ; }
+<SPARQL>{I}{S}{R}{E}{F} { return isREF_L ; }
+<SPARQL>{I}{S}{U}{R}{I} { return isURI_L ; }
+<SPARQL>{L}{A}{N}{G} { return LANG_L ; }
+<SPARQL>{L}{A}{N}{G}{M}{A}{T}{C}{H}{E}{S} { return LANGMATCHES_L ; }
+<SPARQL>{L}{I}{K}{E} { return LIKE_L ; }
+<SPARQL>{L}{I}{M}{I}{T} { return LIMIT_L ; }
+<SPARQL>{L}{I}{T}{E}{R}{A}{L} { return LITERAL_L ; }
+<SPARQL>{L}{O}{A}{D} { return LOAD_L ; }
+<SPARQL>{M}{A}{K}{E} { return MAKE_L ; }
+<SPARQL>{M}{A}{P} { return MAP_L ; }
+<SPARQL>{M}{A}{X} { return MAX_L ; }
+<SPARQL>{M}{I}{N} { return MIN_L ; }
+<SPARQL>{M}{I}{N}{U}{S} { return MINUS_L ; }
+<SPARQL>{M}{O}{D}{I}{F}{Y} { return MODIFY_L ; }
+<SPARQL>{N}{A}{M}{E}{D} { return NAMED_L ; }
+<SPARQL>{N}{I}{L} { return NIL_L ; }
+<SPARQL>{N}{O}{T} { return NOT_L ; }
+<SPARQL>{N}{O}{T}[ \t]+{F}{R}{O}{M} { return NOT_FROM_L ; }
+<SPARQL>{N}{U}{L}{L} { return NULL_L ; }
+<SPARQL>{O}{B}{J}{E}{C}{T} { return OBJECT_L ; }
+<SPARQL>{O}{F} { return OF_L ; }
+<SPARQL>{O}{F}{F}{B}{A}{N}{D} { return OFFBAND_L ; }
+<SPARQL>{O}{F}{F}{S}{E}{T} { return OFFSET_L ; }
+<SPARQL>{O}{P}{T}{I}{O}{N}{A}{L} { return OPTIONAL_L ; }
+<SPARQL>{O}{P}{T}{I}{O}{N} { return OPTION_L ; }
+<SPARQL>{O}{R}{D}{E}{R} { return ORDER_L ; }
+<SPARQL>{P}{R}{E}{D}{I}{C}{A}{T}{E} { return PREDICATE_L ; }
+<SPARQL>{P}{R}{E}{F}{I}{X} { return PREFIX_L ; }
+<SPARQL>{Q}{U}{A}{D} { return QUAD_L ; }
+<SPARQL>{R}{E}{G}{E}{X} { return REGEX_L ; }
+<SPARQL>{R}{E}{D}{U}{C}{E}{D} { return REDUCED_L ; }
+<SPARQL>{R}{E}{T}{U}{R}{N}{S} { return RETURNS_L ; }
+<SPARQL>{S}{C}{O}{R}{E} { return SCORE_L ; }
+<SPARQL>{S}{C}{O}{R}{E}_{L}{I}{M}{I}{T} { return SCORE_LIMIT_L ; }
+<SPARQL>{S}{A}{M}{E}_{A}{S} { return SAME_AS_L ; }
+<SPARQL>{S}{A}{M}{E}_{A}{S}_{O} { return SAME_AS_O_L ; }
+<SPARQL>{S}{A}{M}{E}_{A}{S}_{P} { return SAME_AS_P_L ; }
+<SPARQL>{S}{A}{M}{E}_{A}{S}_{S} { return SAME_AS_S_L ; }
+<SPARQL>{S}{A}{M}{E}_{A}{S}_{S}_{O} { return SAME_AS_S_O_L ; }
+<SPARQL>{S}{A}{M}{E}{T}{E}{R}{M} { return SAMETERM_L ; }
+<SPARQL>{S}{E}{L}{E}{C}{T} { return SELECT_L ; }
+<SPARQL>{S}{E}{R}{V}{I}{C}{E} { return SERVICE_L ; }
+<SPARQL>{S}{I}{L}{E}{N}{T} { return SILENT_L ; }
+<SPARQL>{S}{O}{F}{T} { return SOFT_L ; }
+<SPARQL>{S}{T}{O}{R}{A}{G}{E} { return STORAGE_L ; }
+<SPARQL>{S}{T}{R} { return STR_L ; }
+<SPARQL>{S}{U}{B}{C}{L}{A}{S}{S} { return SUBCLASS_L ; }
+<SPARQL>{S}{U}{B}{J}{E}{C}{T} { return SUBJECT_L ; }
+<SPARQL>{S}{U}{M} { return SUM_L ; }
+<SPARQL>{T}{A}{B}{L}{E}_{O}{P}{T}{I}{O}{N} { return TABLE_OPTION_L ; }
+<SPARQL>{T}_{C}{Y}{C}{L}{E}{S}_{O}{N}{L}{Y} { return T_CYCLES_ONLY_L ; }
+<SPARQL>{T}_{D}{I}{R}{E}{C}{T}{I}{O}{N} { return T_DIRECTION_L ; }
+<SPARQL>{T}_{D}{I}{S}{T}{I}{N}{C}{T} { return T_DISTINCT_L ; }
+<SPARQL>{T}_{E}{N}{D}_{F}{L}{A}{G} { return T_END_FLAG_L ; }
+<SPARQL>{T}_{E}{X}{I}{S}{T}{S} { return T_EXISTS_L ; }
+<SPARQL>{T}_{F}{I}{N}{A}{L}_{A}{S} { return T_FINAL_AS_L ; }
+<SPARQL>{T}_{I}{N} { return T_IN_L ; }
+<SPARQL>{T}_{M}{A}{X} { return T_MAX_L ; }
+<SPARQL>{T}_{M}{I}{N} { return T_MIN_L ; }
+<SPARQL>{T}_{O}{U}{T} { return T_OUT_L ; }
+<SPARQL>{T}_{N}{O}_{C}{Y}{C}{L}{E}{S} { return T_NO_CYCLES_L ; }
+<SPARQL>{T}_{N}{O}_{O}{R}{D}{E}{R} { return T_NO_ORDER_L ; }
+<SPARQL>{T}_{S}{H}{O}{R}{T}{E}{S}{T}_{O}{N}{L}{Y} { return T_SHORTEST_ONLY_L ; }
+<SPARQL>{T}_{S}{T}{E}{P} { return T_STEP_L ; }
+<SPARQL>{T}{R}{A}{N}{S}{I}{T}{I}{V}{E} { return TRANSITIVE_L ; }
+<SPARQL>{T}{R}{U}{E} { return true_L ; }
+<SPARQL>{U}{N}{B}{O}{U}{N}{D} { return UNBOUND_L ; }
+<SPARQL>{U}{N}{I}{O}{N} { return UNION_L ; }
+<SPARQL>{U}{S}{I}{N}{G} { return USING_L ; }
+<SPARQL>{W}{I}{T}{H} { return WITH_L ; }
+
+<SPARQL>{T}{E}{X}{T} { sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return TEXT_BL ; }
+<SPARQL>{X}{M}{L} { sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return XML_BL ; }
+
+<SPARQL>{I}{D}{E}{N}{T}{I}{F}{I}{E}{D} { BEGIN SPARQL_AFTER_IDENTIFIED; return IDENTIFIED_L ; }
+<SPARQL>{W}{H}{E}{R}{E} { BEGIN SPARQL_AFTER_WHERE; return WHERE_L ; }
+<SPARQL>{S}{Q}{L}{Q}{U}{E}{R}{Y} { BEGIN SPARQL_AFTER_WHERE; return SQLQUERY_L ; }
+
+ /* Keyword punctuators of the SPARQL described in first drafts of W3C spec */
+
+<SPARQL>{S}{O}{U}{R}{C}{E} { return GRAPH_L ; }
+<SPARQL>{A}{N}{D} { return _AMP_AMP; }
+<SPARQL>{O}{R} { return _BAR_BAR; }
/* Grouping non-keyword punctuators */
@@ -420,21 +548,38 @@ SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQL
<SPARQL>({PN_PREFIX}?)":" { TOKBOX_Q(0,QNAME_NS,"namespace"); }
<SPARQL>"_:"{PN_LOCAL} { TOKBOX_Q(0,BLANK_NODE_LABEL,"blank node label"); }
-<SPARQL>[?$]{SPAR_VARNAME} {
+<SPARQL>"?"{SPAR_VARNAME} {
sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
- return QD_VARNAME;
+ return QUEST_VARNAME;
}
-<SPARQL>[?$]":"{SPAR_PARAMNAME} {
+<SPARQL>[$]{SPAR_VARNAME} {
sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
- return QD_COLON_PARAMNAME;
+ return DOLLAR_VARNAME;
}
-<SPARQL>[?$]"?" {
+<SPARQL>"?:"{SPAR_PARAMNAME} {
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return QUEST_COLON_PARAMNAME;
+ }
+
+<SPARQL>[$]":"{SPAR_PARAMNAME} {
+ sparyylval.box = t_box_dv_uname_nchars (sparyytext + 1, sparyyleng - 1);
+ return DOLLAR_COLON_PARAMNAME;
+ }
+
+<SPARQL>"??" {
char buf[20]; sprintf (buf, ":%d", sparp->sparp_sparqre->sparqre_param_ctr[0]);
sparp->sparp_sparqre->sparqre_param_ctr[0] += 1;
sparyylval.box = t_box_dv_uname_string (buf);
- return QD_COLON_PARAMNUM;
+ return QUEST_COLON_PARAMNUM;
+ }
+
+<SPARQL>[$]"?" {
+ char buf[20]; sprintf (buf, ":%d", sparp->sparp_sparqre->sparqre_param_ctr[0]);
+ sparp->sparp_sparqre->sparqre_param_ctr[0] += 1;
+ sparyylval.box = t_box_dv_uname_string (buf);
+ return DOLLAR_COLON_PARAMNUM;
}
<SPARQL>"@"([a-zA-Z]+)(("-"([a-zA-Z0-9]+))*) {
@@ -442,22 +587,7 @@ SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQL
return LANGTAG;
}
-<SPARQL>{SPAR_PLAIN_SQLNAME} {
- const struct sparql_keyword *sk = sparql_lex_hash_kw (yytext, yyleng);
- if (NULL == sk)
- {
- sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_PLAIN_ID;
- }
- switch (sk->token)
- {
- case COUNT_L: BEGIN SPARQL_AFTER_COUNT; break;
- case IDENTIFIED_L: BEGIN SPARQL_AFTER_IDENTIFIED; return IDENTIFIED_L;
- case WHERE_L: BEGIN SPARQL_AFTER_WHERE; return WHERE_L;
- case SQLQUERY_L: BEGIN SPARQL_AFTER_WHERE; return SQLQUERY_L;
- case SPARQL_BIF: sparyylval.token_type = sk->subtype; return SPARQL_BIF;
- default: return sk->token;
- } }
-
+<SPARQL>{SPAR_PLAIN_SQLNAME} { sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_PLAIN_ID; }
<SPARQL>{SPAR_SQLNAME}"."{SPAR_SQLNAME} { sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_ALIASCOLNAME; }
<SPARQL>{SPAR_SQLNAME}"."{SPAR_SQLNAME}?"."{SPAR_SQLNAME} { sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_QTABLENAME; }
<SPARQL>{SPAR_SQLNAME}"."{SPAR_SQLNAME}?"."{SPAR_SQLNAME}"."{SPAR_SQLNAME} { sparyylval.box = t_box_dv_short_nchars (sparyytext, sparyyleng); return SPARQL_SQL_QTABLECOLNAME; }
diff --git a/libsrc/Wi/sparql_p.c b/libsrc/Wi/sparql_p.c
index 443adce..601ab66 100644
--- a/libsrc/Wi/sparql_p.c
+++ b/libsrc/Wi/sparql_p.c
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,7 +29,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -45,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -53,104 +55,17 @@
/* Pure parsers. */
#define YYPURE 1
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
-#define yyparse sparyyparse
-#define yylex sparyylex
-#define yyerror sparyyerror
-#define yylval sparyylval
-#define yychar sparyychar
-#define yydebug sparyydebug
-#define yynerrs sparyynerrs
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
-#line 42 "./sparql_p.y"
-
-
-#define YYPARSE_PARAM sparp_as_void
-#define YYLEX_PARAM YYPARSE_PARAM
-#include "libutil.h"
-#include "sqlnode.h"
-#include "sqlparext.h"
-#include "sparql.h"
-#include "sparql2sql.h"
-#include "xmltree.h"
-/*#include "langfunc.h"*/
-
-#define sparp_arg ((sparp_t *)(sparp_as_void))
-
-#ifdef DEBUG
-#define sparyyerror(strg) sparyyerror_impl_1(sparp_arg, NULL, yystate, yyssa, yyssp, (strg))
-#else
-#define sparyyerror(strg) sparyyerror_impl(sparp_arg, NULL, (strg))
-#endif
-
-#ifdef XPYYDEBUG
-#define YYDEBUG 1
-#endif
-
-#define sparyylex(lval_ptr, param) sparyylex_from_sparp_bufs ((caddr_t *)(lval_ptr), ((sparp_t *)(param)))
-
-#define SPAR_BIN_OP(dst,op,l,r) (dst) = spartlist (sparp_arg, 3, (op), (l), (r))
-
-
-#define bmk_offset sparp_curr_lexem_bmk.sparlb_offset
-#define bmk_bufs_tail sparp_curr_lexem_bmk.sparlb_lexem_bufs_tail
-
-int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
-{
- spar_lexem_t *sparl;
- while (sparp->bmk_offset >= sparp->sparp_lexem_buf_len)
- {
- sparp->bmk_bufs_tail = sparp->bmk_bufs_tail->next;
- if (NULL == sparp->bmk_bufs_tail)
- {
- /*sparp->sparp_curr_lexem = NULL; -- commented out to have at least 'some' current lexem */
- return 0;
- }
- sparp->sparp_lexem_buf_len = box_length (sparp->bmk_bufs_tail->data) / sizeof (spar_lexem_t);
- sparp->bmk_offset = 0;
- }
- sparl = ((spar_lexem_t *)(sparp->bmk_bufs_tail->data)) + sparp->bmk_offset;
- yylval[0] = sparl->sparl_sem_value;
- sparp->sparp_curr_lexem = sparl;
- sparp->bmk_offset += 1;
- return (int) sparl->sparl_lex_value;
-}
-
-
-
-/* Line 189 of yacc.c */
-#line 136 "sparql_p.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
+#define yyparse sparyyparse
+#define yylex sparyylex
+#define yyerror sparyyerror
+#define yylval sparyylval
+#define yychar sparyychar
+#define yydebug sparyydebug
+#define yynerrs sparyynerrs
/* Tokens. */
@@ -187,92 +102,92 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
_STAR = 283,
_STAR_GT = 284,
a_L = 285,
- ADD_L = 286,
- ALL_L = 287,
- ALTER_L = 288,
- AS_L = 289,
- ASC_L = 290,
- ASK_L = 291,
- ATTACH_L = 292,
- AVG_L = 293,
- BASE_L = 294,
- BIJECTION_L = 295,
- BINDINGS_L = 296,
- BOUND_L = 297,
- BY_L = 298,
- CLASS_L = 299,
- CLEAR_L = 300,
- CREATE_L = 301,
- CONSTRUCT_L = 302,
- COPY_L = 303,
- COUNT_L = 304,
- COUNT_LPAR = 305,
- COUNT_DISTINCT_L = 306,
- DATA_L = 307,
- DATATYPE_L = 308,
- DEFAULT_L = 309,
- DEFINE_L = 310,
- DEFMACRO_L = 311,
- DELETE_L = 312,
- DEREF_L = 313,
- DESC_L = 314,
- DESCRIBE_L = 315,
- DETACH_L = 316,
- DISTINCT_L = 317,
- DROP_L = 318,
- EXCLUSIVE_L = 319,
- EXISTS_L = 320,
- false_L = 321,
- FILTER_L = 322,
- FROM_L = 323,
- FUNCTION_L = 324,
- GRAPH_L = 325,
- GROUP_L = 326,
- HAVING_L = 327,
- IDENTIFIED_L = 328,
- IFP_L = 329,
- IN_L = 330,
- INDEX_L = 331,
- INFERENCE_L = 332,
- INSERT_L = 333,
- INTO_L = 334,
- IRI_L = 335,
+ ALTER_L = 286,
+ AS_L = 287,
+ ASC_L = 288,
+ ASK_L = 289,
+ AVG_L = 290,
+ BASE_L = 291,
+ BIJECTION_L = 292,
+ BINDINGS_L = 293,
+ BOUND_L = 294,
+ BY_L = 295,
+ CLASS_L = 296,
+ CLEAR_L = 297,
+ CREATE_L = 298,
+ COALESCE_L = 299,
+ CONSTRUCT_L = 300,
+ COUNT_LPAR = 301,
+ COUNT_DISTINCT_L = 302,
+ DATA_L = 303,
+ DATATYPE_L = 304,
+ DEFAULT_L = 305,
+ DEFINE_L = 306,
+ DELETE_L = 307,
+ DEREF_L = 308,
+ DESC_L = 309,
+ DESCRIBE_L = 310,
+ DISTINCT_L = 311,
+ DROP_L = 312,
+ EXCLUSIVE_L = 313,
+ EXISTS_L = 314,
+ false_L = 315,
+ FILTER_L = 316,
+ FROM_L = 317,
+ FUNCTION_L = 318,
+ GRAPH_L = 319,
+ GROUP_L = 320,
+ HAVING_L = 321,
+ IDENTIFIED_L = 322,
+ IF_L = 323,
+ IFP_L = 324,
+ IN_L = 325,
+ INDEX_L = 326,
+ INFERENCE_L = 327,
+ INSERT_L = 328,
+ INTO_L = 329,
+ IRI_L = 330,
+ isBLANK_L = 331,
+ isIRI_L = 332,
+ isLITERAL_L = 333,
+ isREF_L = 334,
+ isURI_L = 335,
LANG_L = 336,
- LIBRARY_L = 337,
+ LANGMATCHES_L = 337,
LIKE_L = 338,
LIMIT_L = 339,
LITERAL_L = 340,
- LOCAL_L = 341,
- LOAD_L = 342,
- MACRO_L = 343,
- MAKE_L = 344,
- MAP_L = 345,
- MAX_L = 346,
- MIN_L = 347,
- MINUS_L = 348,
- MODIFY_L = 349,
- MOVE_L = 350,
- NAMED_L = 351,
- NIL_L = 352,
- NOT_L = 353,
- NULL_L = 354,
- OBJECT_L = 355,
- OF_L = 356,
- OFFBAND_L = 357,
- OFFSET_L = 358,
- OPTIONAL_L = 359,
- OPTION_L = 360,
- ORDER_L = 361,
- PREDICATE_L = 362,
- PREFIX_L = 363,
- QUAD_L = 364,
- REDUCED_L = 365,
- RETURNS_L = 366,
- SAME_AS_L = 367,
- SAME_AS_O_L = 368,
- SAME_AS_P_L = 369,
- SAME_AS_S_L = 370,
- SAME_AS_S_O_L = 371,
+ LOAD_L = 341,
+ MAKE_L = 342,
+ MAP_L = 343,
+ MAX_L = 344,
+ MIN_L = 345,
+ MINUS_L = 346,
+ MODIFY_L = 347,
+ NAMED_L = 348,
+ NIL_L = 349,
+ NOT_L = 350,
+ NOT_FROM_L = 351,
+ NULL_L = 352,
+ OBJECT_L = 353,
+ OF_L = 354,
+ OFFBAND_L = 355,
+ OFFSET_L = 356,
+ OPTIONAL_L = 357,
+ OPTION_L = 358,
+ ORDER_L = 359,
+ PREDICATE_L = 360,
+ PREFIX_L = 361,
+ QUAD_L = 362,
+ REGEX_L = 363,
+ REDUCED_L = 364,
+ RETURNS_L = 365,
+ SAME_AS_L = 366,
+ SAME_AS_O_L = 367,
+ SAME_AS_P_L = 368,
+ SAME_AS_S_L = 369,
+ SAME_AS_S_O_L = 370,
+ SAMETERM_L = 371,
SCORE_L = 372,
SCORE_LIMIT_L = 373,
SELECT_L = 374,
@@ -281,11 +196,11 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
SOFT_L = 377,
SQLQUERY_L = 378,
STORAGE_L = 379,
- SUBCLASS_L = 380,
- SUBJECT_L = 381,
- SUM_L = 382,
- TABLE_OPTION_L = 383,
- TEXT_L = 384,
+ STR_L = 380,
+ SUBCLASS_L = 381,
+ SUBJECT_L = 382,
+ SUM_L = 383,
+ TABLE_OPTION_L = 384,
T_CYCLES_ONLY_L = 385,
T_DIRECTION_L = 386,
T_DISTINCT_L = 387,
@@ -300,45 +215,46 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
T_NO_ORDER_L = 396,
T_SHORTEST_ONLY_L = 397,
T_STEP_L = 398,
- TO_L = 399,
- TRANSITIVE_L = 400,
- true_L = 401,
- UNBOUND_L = 402,
- UNION_L = 403,
- USING_L = 404,
- WHERE_L = 405,
- WITH_L = 406,
- XML_L = 407,
- __SPAR_PUNCT_END = 408,
- START_OF_SPARQL_TEXT = 409,
- END_OF_SPARQL_TEXT = 410,
- SPARUL_RUN_SUBTYPE = 411,
- SPARUL_INSERT_DATA = 412,
- SPARUL_DELETE_DATA = 413,
- __SPAR_NONPUNCT_START = 414,
- SPARQL_BIF = 415,
- SPARQL_INTEGER = 416,
- SPARQL_DECIMAL = 417,
- SPARQL_DOUBLE = 418,
- SPARQL_STRING = 419,
- SPARQL_SQLTEXT = 420,
- LANGTAG = 421,
- QNAME = 422,
- QNAME_NS = 423,
- BLANK_NODE_LABEL = 424,
- Q_IRI_REF = 425,
- QD_VARNAME = 426,
- QD_COLON_PARAMNAME = 427,
- QD_COLON_PARAMNUM = 428,
- SPARQL_PLAIN_ID = 429,
- SPARQL_SQL_ALIASCOLNAME = 430,
- SPARQL_SQL_QTABLENAME = 431,
- SPARQL_SQL_QTABLECOLNAME = 432,
- __SPAR_NONPUNCT_END = 433,
- PRECODE_EXPN_PREC = 434,
- _COLON = 435,
- UMINUS = 436,
- UPLUS = 437
+ TRANSITIVE_L = 399,
+ true_L = 400,
+ UNBOUND_L = 401,
+ UNION_L = 402,
+ USING_L = 403,
+ WHERE_L = 404,
+ WITH_L = 405,
+ __SPAR_PUNCT_END = 406,
+ START_OF_SPARQL_TEXT = 407,
+ END_OF_SPARQL_TEXT = 408,
+ SPARUL_RUN_SUBTYPE = 409,
+ SPARUL_INSERT_DATA = 410,
+ SPARUL_DELETE_DATA = 411,
+ __SPAR_NONPUNCT_START = 412,
+ TEXT_BL = 413,
+ XML_BL = 414,
+ SPARQL_INTEGER = 415,
+ SPARQL_DECIMAL = 416,
+ SPARQL_DOUBLE = 417,
+ SPARQL_STRING = 418,
+ SPARQL_SQLTEXT = 419,
+ LANGTAG = 420,
+ QNAME = 421,
+ QNAME_NS = 422,
+ BLANK_NODE_LABEL = 423,
+ Q_IRI_REF = 424,
+ QUEST_VARNAME = 425,
+ DOLLAR_VARNAME = 426,
+ QUEST_COLON_PARAMNAME = 427,
+ DOLLAR_COLON_PARAMNAME = 428,
+ QUEST_COLON_PARAMNUM = 429,
+ DOLLAR_COLON_PARAMNUM = 430,
+ SPARQL_PLAIN_ID = 431,
+ SPARQL_SQL_ALIASCOLNAME = 432,
+ SPARQL_SQL_QTABLENAME = 433,
+ SPARQL_SQL_QTABLECOLNAME = 434,
+ __SPAR_NONPUNCT_END = 435,
+ _COLON = 436,
+ UMINUS = 437,
+ UPLUS = 438
};
#endif
/* Tokens. */
@@ -370,92 +286,92 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
#define _STAR 283
#define _STAR_GT 284
#define a_L 285
-#define ADD_L 286
-#define ALL_L 287
-#define ALTER_L 288
-#define AS_L 289
-#define ASC_L 290
-#define ASK_L 291
-#define ATTACH_L 292
-#define AVG_L 293
-#define BASE_L 294
-#define BIJECTION_L 295
-#define BINDINGS_L 296
-#define BOUND_L 297
-#define BY_L 298
-#define CLASS_L 299
-#define CLEAR_L 300
-#define CREATE_L 301
-#define CONSTRUCT_L 302
-#define COPY_L 303
-#define COUNT_L 304
-#define COUNT_LPAR 305
-#define COUNT_DISTINCT_L 306
-#define DATA_L 307
-#define DATATYPE_L 308
-#define DEFAULT_L 309
-#define DEFINE_L 310
-#define DEFMACRO_L 311
-#define DELETE_L 312
-#define DEREF_L 313
-#define DESC_L 314
-#define DESCRIBE_L 315
-#define DETACH_L 316
-#define DISTINCT_L 317
-#define DROP_L 318
-#define EXCLUSIVE_L 319
-#define EXISTS_L 320
-#define false_L 321
-#define FILTER_L 322
-#define FROM_L 323
-#define FUNCTION_L 324
-#define GRAPH_L 325
-#define GROUP_L 326
-#define HAVING_L 327
-#define IDENTIFIED_L 328
-#define IFP_L 329
-#define IN_L 330
-#define INDEX_L 331
-#define INFERENCE_L 332
-#define INSERT_L 333
-#define INTO_L 334
-#define IRI_L 335
+#define ALTER_L 286
+#define AS_L 287
+#define ASC_L 288
+#define ASK_L 289
+#define AVG_L 290
+#define BASE_L 291
+#define BIJECTION_L 292
+#define BINDINGS_L 293
+#define BOUND_L 294
+#define BY_L 295
+#define CLASS_L 296
+#define CLEAR_L 297
+#define CREATE_L 298
+#define COALESCE_L 299
+#define CONSTRUCT_L 300
+#define COUNT_LPAR 301
+#define COUNT_DISTINCT_L 302
+#define DATA_L 303
+#define DATATYPE_L 304
+#define DEFAULT_L 305
+#define DEFINE_L 306
+#define DELETE_L 307
+#define DEREF_L 308
+#define DESC_L 309
+#define DESCRIBE_L 310
+#define DISTINCT_L 311
+#define DROP_L 312
+#define EXCLUSIVE_L 313
+#define EXISTS_L 314
+#define false_L 315
+#define FILTER_L 316
+#define FROM_L 317
+#define FUNCTION_L 318
+#define GRAPH_L 319
+#define GROUP_L 320
+#define HAVING_L 321
+#define IDENTIFIED_L 322
+#define IF_L 323
+#define IFP_L 324
+#define IN_L 325
+#define INDEX_L 326
+#define INFERENCE_L 327
+#define INSERT_L 328
+#define INTO_L 329
+#define IRI_L 330
+#define isBLANK_L 331
+#define isIRI_L 332
+#define isLITERAL_L 333
+#define isREF_L 334
+#define isURI_L 335
#define LANG_L 336
-#define LIBRARY_L 337
+#define LANGMATCHES_L 337
#define LIKE_L 338
#define LIMIT_L 339
#define LITERAL_L 340
-#define LOCAL_L 341
-#define LOAD_L 342
-#define MACRO_L 343
-#define MAKE_L 344
-#define MAP_L 345
-#define MAX_L 346
-#define MIN_L 347
-#define MINUS_L 348
-#define MODIFY_L 349
-#define MOVE_L 350
-#define NAMED_L 351
-#define NIL_L 352
-#define NOT_L 353
-#define NULL_L 354
-#define OBJECT_L 355
-#define OF_L 356
-#define OFFBAND_L 357
-#define OFFSET_L 358
-#define OPTIONAL_L 359
-#define OPTION_L 360
-#define ORDER_L 361
-#define PREDICATE_L 362
-#define PREFIX_L 363
-#define QUAD_L 364
-#define REDUCED_L 365
-#define RETURNS_L 366
-#define SAME_AS_L 367
-#define SAME_AS_O_L 368
-#define SAME_AS_P_L 369
-#define SAME_AS_S_L 370
-#define SAME_AS_S_O_L 371
+#define LOAD_L 341
+#define MAKE_L 342
+#define MAP_L 343
+#define MAX_L 344
+#define MIN_L 345
+#define MINUS_L 346
+#define MODIFY_L 347
+#define NAMED_L 348
+#define NIL_L 349
+#define NOT_L 350
+#define NOT_FROM_L 351
+#define NULL_L 352
+#define OBJECT_L 353
+#define OF_L 354
+#define OFFBAND_L 355
+#define OFFSET_L 356
+#define OPTIONAL_L 357
+#define OPTION_L 358
+#define ORDER_L 359
+#define PREDICATE_L 360
+#define PREFIX_L 361
+#define QUAD_L 362
+#define REGEX_L 363
+#define REDUCED_L 364
+#define RETURNS_L 365
+#define SAME_AS_L 366
+#define SAME_AS_O_L 367
+#define SAME_AS_P_L 368
+#define SAME_AS_S_L 369
+#define SAME_AS_S_O_L 370
+#define SAMETERM_L 371
#define SCORE_L 372
#define SCORE_LIMIT_L 373
#define SELECT_L 374
@@ -464,11 +380,11 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
#define SOFT_L 377
#define SQLQUERY_L 378
#define STORAGE_L 379
-#define SUBCLASS_L 380
-#define SUBJECT_L 381
-#define SUM_L 382
-#define TABLE_OPTION_L 383
-#define TEXT_L 384
+#define STR_L 380
+#define SUBCLASS_L 381
+#define SUBJECT_L 382
+#define SUM_L 383
+#define TABLE_OPTION_L 384
#define T_CYCLES_ONLY_L 385
#define T_DIRECTION_L 386
#define T_DISTINCT_L 387
@@ -483,56 +399,129 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
#define T_NO_ORDER_L 396
#define T_SHORTEST_ONLY_L 397
#define T_STEP_L 398
-#define TO_L 399
-#define TRANSITIVE_L 400
-#define true_L 401
-#define UNBOUND_L 402
-#define UNION_L 403
-#define USING_L 404
-#define WHERE_L 405
-#define WITH_L 406
-#define XML_L 407
-#define __SPAR_PUNCT_END 408
-#define START_OF_SPARQL_TEXT 409
-#define END_OF_SPARQL_TEXT 410
-#define SPARUL_RUN_SUBTYPE 411
-#define SPARUL_INSERT_DATA 412
-#define SPARUL_DELETE_DATA 413
-#define __SPAR_NONPUNCT_START 414
-#define SPARQL_BIF 415
-#define SPARQL_INTEGER 416
-#define SPARQL_DECIMAL 417
-#define SPARQL_DOUBLE 418
-#define SPARQL_STRING 419
-#define SPARQL_SQLTEXT 420
-#define LANGTAG 421
-#define QNAME 422
-#define QNAME_NS 423
-#define BLANK_NODE_LABEL 424
-#define Q_IRI_REF 425
-#define QD_VARNAME 426
-#define QD_COLON_PARAMNAME 427
-#define QD_COLON_PARAMNUM 428
-#define SPARQL_PLAIN_ID 429
-#define SPARQL_SQL_ALIASCOLNAME 430
-#define SPARQL_SQL_QTABLENAME 431
-#define SPARQL_SQL_QTABLECOLNAME 432
-#define __SPAR_NONPUNCT_END 433
-#define PRECODE_EXPN_PREC 434
-#define _COLON 435
-#define UMINUS 436
-#define UPLUS 437
+#define TRANSITIVE_L 399
+#define true_L 400
+#define UNBOUND_L 401
+#define UNION_L 402
+#define USING_L 403
+#define WHERE_L 404
+#define WITH_L 405
+#define __SPAR_PUNCT_END 406
+#define START_OF_SPARQL_TEXT 407
+#define END_OF_SPARQL_TEXT 408
+#define SPARUL_RUN_SUBTYPE 409
+#define SPARUL_INSERT_DATA 410
+#define SPARUL_DELETE_DATA 411
+#define __SPAR_NONPUNCT_START 412
+#define TEXT_BL 413
+#define XML_BL 414
+#define SPARQL_INTEGER 415
+#define SPARQL_DECIMAL 416
+#define SPARQL_DOUBLE 417
+#define SPARQL_STRING 418
+#define SPARQL_SQLTEXT 419
+#define LANGTAG 420
+#define QNAME 421
+#define QNAME_NS 422
+#define BLANK_NODE_LABEL 423
+#define Q_IRI_REF 424
+#define QUEST_VARNAME 425
+#define DOLLAR_VARNAME 426
+#define QUEST_COLON_PARAMNAME 427
+#define DOLLAR_COLON_PARAMNAME 428
+#define QUEST_COLON_PARAMNUM 429
+#define DOLLAR_COLON_PARAMNUM 430
+#define SPARQL_PLAIN_ID 431
+#define SPARQL_SQL_ALIASCOLNAME 432
+#define SPARQL_SQL_QTABLENAME 433
+#define SPARQL_SQL_QTABLECOLNAME 434
+#define __SPAR_NONPUNCT_END 435
+#define _COLON 436
+#define UMINUS 437
+#define UPLUS 438
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+/* Copy the first part of user declarations. */
+#line 41 "./sparql_p.y"
+
+
+#define YYPARSE_PARAM sparp_as_void
+#define YYLEX_PARAM YYPARSE_PARAM
+#include "libutil.h"
+#include "sqlnode.h"
+#include "sqlparext.h"
+#include "sparql.h"
+#include "sparql2sql.h"
+#include "xmltree.h"
+/*#include "langfunc.h"*/
+
+#define sparp_arg ((sparp_t *)(sparp_as_void))
+
+#ifdef DEBUG
+#define sparyyerror(strg) sparyyerror_impl_1(sparp_arg, NULL, yystate, yyssa, yyssp, (strg))
+#else
+#define sparyyerror(strg) sparyyerror_impl(sparp_arg, NULL, (strg))
+#endif
+
+#ifdef XPYYDEBUG
+#define YYDEBUG 1
+#endif
+
+#define sparyylex(lval_ptr, param) sparyylex_from_sparp_bufs ((caddr_t *)(lval_ptr), ((sparp_t *)(param)))
+
+#define SPAR_BIN_OP(dst,op,l,r) (dst) = spartlist (sparp_arg, 3, (op), (l), (r))
+
+
+#define bmk_offset sparp_curr_lexem_bmk.sparlb_offset
+#define bmk_bufs_tail sparp_curr_lexem_bmk.sparlb_lexem_bufs_tail
+
+int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
{
+ spar_lexem_t *sparl;
+ while (sparp->bmk_offset >= sparp->sparp_lexem_buf_len)
+ {
+ sparp->bmk_bufs_tail = sparp->bmk_bufs_tail->next;
+ if (NULL == sparp->bmk_bufs_tail)
+ {
+ /*sparp->sparp_curr_lexem = NULL; -- commented out to have at least 'some' current lexem */
+ return 0;
+ }
+ sparp->sparp_lexem_buf_len = box_length (sparp->bmk_bufs_tail->data) / sizeof (spar_lexem_t);
+ sparp->bmk_offset = 0;
+ }
+ sparl = ((spar_lexem_t *)(sparp->bmk_bufs_tail->data)) + sparp->bmk_offset;
+ yylval[0] = sparl->sparl_sem_value;
+ sparp->sparp_curr_lexem = sparl;
+ sparp->bmk_offset += 1;
+ return (int) sparl->sparl_lex_value;
+}
+
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
-/* Line 214 of yacc.c */
-#line 98 "./sparql_p.y"
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 97 "./sparql_p.y"
+{
caddr_t box;
caddr_t *boxes;
ptrlong token_type;
@@ -542,23 +531,22 @@ typedef union YYSTYPE
dk_set_t backstack;
spar_lexbmk_t *bookmark;
void *nothing;
-
-
-
-/* Line 214 of yacc.c */
-#line 550 "sparql_p.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 187 of yacc.c. */
+#line 537 "sparql_p.c"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
+
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 562 "sparql_p.c"
+/* Line 216 of yacc.c. */
+#line 550 "sparql_p.c"
#ifdef short
# undef short
@@ -608,7 +596,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -633,14 +621,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -721,9 +709,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -757,12 +745,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -773,20 +761,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 7
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 3373
+#define YYLAST 3778
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 183
+#define YYNTOKENS 184
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 317
+#define YYNNTS 271
/* YYNRULES -- Number of rules. */
-#define YYNRULES 700
+#define YYNRULES 619
/* YYNRULES -- Number of states. */
-#define YYNSTATES 1150
+#define YYNSTATES 1036
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 437
+#define YYMAXUTOK 438
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -837,7 +825,7 @@ static const yytype_uint8 yytranslate[] =
145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182
+ 175, 176, 177, 178, 179, 180, 181, 182, 183
};
#if YYDEBUG
@@ -845,363 +833,323 @@ static const yytype_uint8 yytranslate[] =
YYRHS. */
static const yytype_uint16 yyprhs[] =
{
- 0, 0, 3, 9, 14, 19, 22, 27, 29, 31,
- 33, 35, 37, 43, 44, 47, 48, 53, 55, 59,
- 61, 63, 65, 67, 69, 70, 73, 76, 77, 80,
- 84, 87, 90, 91, 92, 101, 102, 105, 106, 111,
- 112, 113, 121, 122, 123, 131, 133, 139, 147, 155,
- 156, 161, 166, 167, 169, 171, 175, 179, 181, 184,
- 186, 188, 190, 192, 194, 196, 198, 201, 204, 206,
- 208, 210, 212, 213, 218, 220, 222, 223, 230, 232,
- 235, 238, 241, 242, 245, 247, 249, 251, 252, 260,
- 261, 269, 271, 273, 274, 279, 280, 283, 287, 289,
- 291, 293, 296, 299, 303, 305, 308, 311, 315, 316,
- 317, 322, 324, 327, 330, 335, 336, 339, 340, 342,
- 343, 350, 351, 356, 359, 360, 362, 363, 364, 372,
- 374, 377, 379, 381, 382, 384, 386, 389, 393, 395,
- 398, 400, 402, 404, 406, 408, 410, 414, 420, 426,
- 427, 428, 433, 435, 438, 442, 446, 448, 450, 452,
- 453, 454, 458, 459, 460, 465, 467, 470, 475, 480,
- 483, 485, 487, 489, 490, 492, 494, 495, 497, 500,
- 501, 503, 506, 510, 511, 520, 522, 526, 531, 535,
- 537, 539, 541, 543, 545, 547, 548, 553, 556, 557,
- 558, 559, 568, 569, 570, 577, 578, 582, 583, 589,
- 594, 597, 600, 604, 607, 609, 612, 613, 618, 619,
- 620, 621, 631, 632, 636, 638, 641, 644, 648, 651,
- 654, 655, 660, 661, 663, 665, 668, 670, 674, 677,
- 679, 683, 686, 687, 689, 691, 695, 696, 697, 705,
- 706, 710, 711, 715, 717, 718, 720, 721, 725, 726,
- 732, 736, 740, 742, 744, 748, 752, 756, 760, 762,
- 765, 766, 767, 773, 775, 779, 781, 784, 787, 790,
- 793, 796, 799, 802, 805, 807, 810, 812, 815, 817,
- 820, 825, 828, 831, 833, 835, 840, 842, 849, 856,
- 858, 863, 865, 867, 871, 873, 875, 877, 879, 881,
- 883, 885, 887, 888, 893, 894, 899, 902, 904, 907,
- 909, 912, 914, 916, 918, 920, 922, 925, 927, 929,
- 931, 935, 937, 939, 941, 943, 945, 947, 949, 953,
- 957, 959, 962, 966, 970, 975, 977, 979, 982, 985,
- 988, 991, 993, 995, 998, 1000, 1002, 1004, 1006, 1008,
- 1010, 1013, 1016, 1018, 1020, 1022, 1024, 1025, 1030, 1034,
- 1038, 1042, 1046, 1050, 1051, 1056, 1057, 1064, 1068, 1072,
- 1076, 1080, 1084, 1088, 1092, 1096, 1099, 1102, 1105, 1108,
- 1112, 1113, 1121, 1122, 1132, 1134, 1136, 1137, 1141, 1143,
- 1145, 1147, 1149, 1151, 1153, 1156, 1161, 1166, 1171, 1176,
- 1177, 1181, 1182, 1187, 1188, 1190, 1192, 1195, 1199, 1201,
- 1205, 1209, 1212, 1213, 1215, 1217, 1220, 1224, 1226, 1230,
- 1234, 1237, 1239, 1240, 1245, 1247, 1249, 1251, 1253, 1256,
- 1260, 1262, 1264, 1266, 1268, 1270, 1272, 1274, 1277, 1280,
- 1283, 1286, 1288, 1290, 1292, 1294, 1296, 1299, 1301, 1304,
- 1306, 1308, 1310, 1312, 1314, 1316, 1318, 1320, 1322, 1324,
- 1330, 1331, 1337, 1338, 1344, 1345, 1351, 1352, 1358, 1359,
- 1368, 1372, 1376, 1383, 1388, 1392, 1393, 1398, 1402, 1406,
- 1408, 1410, 1412, 1415, 1417, 1420, 1421, 1424, 1425, 1430,
- 1432, 1434, 1435, 1437, 1439, 1441, 1443, 1444, 1450, 1451,
- 1456, 1457, 1460, 1466, 1468, 1470, 1472, 1474, 1475, 1480,
- 1482, 1484, 1486, 1488, 1490, 1492, 1494, 1496, 1504, 1512,
- 1518, 1526, 1532, 1533, 1537, 1542, 1544, 1548, 1551, 1554,
- 1557, 1559, 1561, 1564, 1566, 1570, 1571, 1572, 1582, 1584,
- 1586, 1587, 1588, 1598, 1604, 1610, 1617, 1621, 1626, 1627,
- 1628, 1636, 1642, 1643, 1652, 1655, 1656, 1659, 1666, 1667,
- 1669, 1670, 1675, 1676, 1681, 1683, 1687, 1689, 1692, 1694,
- 1697, 1701, 1703, 1704, 1709, 1711, 1713, 1715, 1717, 1719,
- 1724, 1730, 1735, 1737, 1740, 1744, 1746, 1747, 1752, 1753,
- 1759, 1766, 1774, 1775, 1781, 1783, 1785, 1786, 1792, 1796,
- 1797, 1801, 1803, 1806, 1809, 1812, 1815, 1816, 1817, 1824,
- 1826, 1827, 1832, 1833, 1837, 1839, 1842, 1843, 1849, 1850,
- 1851, 1852, 1853, 1863, 1865, 1866, 1869, 1870, 1873, 1879,
- 1882, 1883, 1886, 1889, 1891, 1894, 1896, 1898, 1901, 1903,
- 1905, 1907, 1912, 1914, 1915, 1917, 1919, 1922, 1926, 1929,
- 1932, 1934, 1935, 1939, 1944, 1946, 1950, 1953, 1955, 1958,
- 1961, 1962, 1964, 1966, 1970, 1972, 1976, 1982, 1986, 1987,
- 1989, 1991, 1995, 1999, 2001, 2005, 2007, 2009, 2011, 2013,
- 2015, 2017, 2019, 2021, 2023, 2028, 2029, 2031, 2033, 2037,
- 2039
+ 0, 0, 3, 8, 13, 16, 21, 23, 25, 27,
+ 29, 31, 35, 36, 39, 40, 45, 47, 51, 53,
+ 55, 57, 59, 61, 62, 65, 68, 69, 72, 76,
+ 79, 82, 83, 90, 92, 95, 98, 101, 102, 105,
+ 107, 109, 111, 112, 120, 121, 129, 131, 133, 134,
+ 139, 140, 143, 147, 149, 152, 155, 159, 161, 164,
+ 165, 166, 171, 173, 176, 179, 184, 185, 188, 189,
+ 191, 192, 199, 200, 205, 208, 209, 211, 212, 213,
+ 221, 223, 226, 228, 230, 232, 233, 235, 237, 240,
+ 244, 246, 249, 251, 253, 255, 257, 259, 261, 265,
+ 271, 277, 278, 279, 284, 286, 289, 293, 297, 299,
+ 301, 303, 304, 305, 309, 310, 311, 316, 318, 321,
+ 326, 331, 334, 336, 338, 340, 341, 343, 345, 346,
+ 348, 351, 352, 354, 357, 361, 362, 371, 373, 377,
+ 382, 384, 386, 388, 390, 392, 394, 395, 400, 403,
+ 404, 405, 406, 415, 416, 417, 424, 425, 429, 430,
+ 436, 441, 444, 447, 451, 454, 456, 459, 460, 465,
+ 466, 467, 468, 478, 479, 483, 485, 488, 491, 495,
+ 498, 501, 502, 507, 508, 510, 513, 515, 519, 520,
+ 522, 524, 528, 529, 533, 534, 538, 539, 541, 544,
+ 548, 549, 553, 554, 560, 564, 568, 570, 572, 576,
+ 580, 584, 588, 590, 593, 594, 595, 601, 603, 607,
+ 609, 612, 615, 618, 621, 624, 627, 630, 633, 635,
+ 638, 640, 643, 645, 648, 653, 656, 659, 661, 663,
+ 668, 670, 677, 684, 686, 691, 693, 695, 699, 701,
+ 703, 705, 707, 709, 711, 713, 715, 716, 721, 722,
+ 727, 730, 732, 735, 737, 740, 742, 744, 746, 748,
+ 750, 753, 755, 757, 759, 763, 765, 767, 769, 771,
+ 773, 775, 777, 781, 785, 787, 790, 794, 798, 803,
+ 805, 807, 810, 813, 816, 819, 821, 823, 825, 828,
+ 830, 832, 834, 836, 838, 840, 842, 844, 847, 850,
+ 852, 854, 856, 858, 859, 864, 868, 872, 876, 880,
+ 884, 888, 889, 894, 895, 902, 906, 910, 914, 918,
+ 922, 926, 930, 934, 937, 940, 943, 946, 950, 951,
+ 959, 960, 970, 972, 974, 977, 979, 981, 983, 985,
+ 987, 992, 997, 1004, 1009, 1014, 1021, 1026, 1031, 1036,
+ 1041, 1043, 1044, 1050, 1051, 1057, 1066, 1071, 1078, 1087,
+ 1090, 1091, 1093, 1095, 1098, 1102, 1104, 1108, 1112, 1115,
+ 1117, 1119, 1121, 1123, 1126, 1130, 1132, 1134, 1136, 1138,
+ 1140, 1142, 1144, 1147, 1150, 1153, 1156, 1158, 1160, 1162,
+ 1164, 1166, 1169, 1171, 1174, 1176, 1178, 1180, 1182, 1184,
+ 1186, 1188, 1190, 1192, 1193, 1199, 1200, 1206, 1207, 1213,
+ 1214, 1220, 1221, 1230, 1233, 1236, 1242, 1247, 1252, 1253,
+ 1258, 1259, 1263, 1264, 1268, 1269, 1272, 1274, 1276, 1277,
+ 1279, 1281, 1282, 1287, 1289, 1291, 1293, 1295, 1297, 1299,
+ 1301, 1303, 1311, 1319, 1325, 1333, 1339, 1340, 1344, 1349,
+ 1351, 1355, 1358, 1361, 1364, 1366, 1368, 1371, 1373, 1377,
+ 1378, 1379, 1389, 1391, 1393, 1394, 1395, 1405, 1411, 1417,
+ 1424, 1428, 1433, 1434, 1435, 1443, 1449, 1450, 1459, 1462,
+ 1463, 1466, 1473, 1474, 1476, 1477, 1482, 1483, 1488, 1490,
+ 1494, 1496, 1499, 1501, 1504, 1508, 1510, 1511, 1516, 1518,
+ 1520, 1522, 1524, 1527, 1531, 1533, 1534, 1539, 1540, 1546,
+ 1553, 1561, 1562, 1568, 1570, 1572, 1573, 1579, 1583, 1584,
+ 1588, 1590, 1593, 1596, 1599, 1602, 1603, 1604, 1611, 1613,
+ 1614, 1619, 1620, 1624, 1626, 1629, 1630, 1636, 1637, 1638,
+ 1639, 1640, 1650, 1652, 1653, 1656, 1657, 1660, 1666, 1669,
+ 1670, 1673, 1676, 1678, 1681, 1683, 1685, 1688, 1690, 1692,
+ 1694, 1699, 1701, 1702, 1704, 1706, 1709, 1713, 1716, 1719,
+ 1721, 1722, 1726, 1731, 1733, 1737, 1740, 1742, 1745, 1748,
+ 1749, 1751, 1753, 1757, 1759, 1763, 1769, 1773, 1774, 1776,
+ 1778, 1782, 1786, 1788, 1792, 1794, 1796, 1798, 1800, 1802,
+ 1804, 1806, 1808, 1810, 1815, 1816, 1818, 1820, 1824, 1826
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 184, 0, -1, 154, 186, 195, 185, 155, -1, 154,
- 186, 374, 155, -1, 154, 186, 400, 155, -1, 154,
- 155, -1, 154, 186, 408, 499, -1, 1, -1, 215,
- -1, 221, -1, 223, -1, 226, -1, 187, 192, 193,
- 197, 397, -1, -1, 187, 188, -1, -1, 55, 189,
- 167, 190, -1, 191, -1, 190, 9, 191, -1, 167,
- -1, 170, -1, 164, -1, 161, -1, 341, -1, -1,
- 39, 170, -1, 39, 1, -1, -1, 193, 194, -1,
- 108, 168, 170, -1, 108, 168, -1, 108, 1, -1,
- -1, -1, 46, 88, 82, 371, 196, 14, 197, 23,
- -1, -1, 197, 198, -1, -1, 56, 371, 199, 200,
- -1, -1, -1, 16, 207, 24, 201, 206, 202, 213,
- -1, -1, -1, 205, 203, 206, 14, 204, 273, 23,
- -1, 1, -1, 14, 210, 211, 212, 23, -1, 70,
- 210, 14, 210, 211, 212, 23, -1, 54, 70, 14,
- 210, 211, 212, 23, -1, -1, 86, 16, 209, 24,
- -1, 86, 16, 208, 24, -1, -1, 209, -1, 208,
- -1, 171, 9, 171, -1, 208, 9, 171, -1, 171,
- -1, 209, 171, -1, 171, -1, 371, -1, 171, -1,
- 30, -1, 371, -1, 171, -1, 365, -1, 21, 365,
- -1, 19, 365, -1, 97, -1, 366, -1, 367, -1,
- 371, -1, -1, 14, 214, 273, 23, -1, 346, -1,
- 1, -1, -1, 217, 216, 218, 228, 240, 255, -1,
- 119, -1, 119, 110, -1, 119, 62, -1, 119, 51,
- -1, -1, 219, 220, -1, 28, -1, 336, -1, 335,
- -1, -1, 47, 222, 298, 228, 243, 255, 244, -1,
- -1, 60, 224, 225, 228, 239, 255, 244, -1, 28,
- -1, 331, -1, -1, 36, 227, 228, 243, -1, -1,
- 228, 229, -1, 230, 371, 233, -1, 231, -1, 232,
- -1, 68, -1, 68, 96, -1, 98, 68, -1, 98,
- 68, 96, -1, 149, -1, 149, 96, -1, 98, 149,
- -1, 98, 149, 96, -1, -1, -1, 105, 16, 234,
- 235, -1, 24, -1, 236, 24, -1, 167, 237, -1,
- 236, 9, 167, 237, -1, -1, 238, 346, -1, -1,
- 243, -1, -1, 150, 14, 241, 273, 23, 244, -1,
- -1, 14, 242, 273, 23, -1, 240, 244, -1, -1,
- 245, -1, -1, -1, 41, 246, 248, 14, 247, 250,
- 23, -1, 249, -1, 248, 249, -1, 171, -1, 341,
- -1, -1, 251, -1, 252, -1, 251, 252, -1, 16,
- 253, 24, -1, 254, -1, 253, 254, -1, 371, -1,
- 365, -1, 366, -1, 367, -1, 373, -1, 147, -1,
- 256, 260, 262, -1, 256, 260, 262, 268, 269, -1,
- 256, 260, 262, 270, 267, -1, -1, -1, 71, 43,
- 257, 258, -1, 259, -1, 258, 259, -1, 16, 346,
- 24, -1, 17, 346, 25, -1, 352, -1, 353, -1,
- 340, -1, -1, -1, 72, 261, 346, -1, -1, -1,
- 106, 43, 263, 264, -1, 265, -1, 264, 265, -1,
- 266, 16, 346, 24, -1, 266, 17, 346, 25, -1,
- 266, 161, -1, 352, -1, 353, -1, 340, -1, -1,
- 35, -1, 59, -1, -1, 268, -1, 84, 237, -1,
- -1, 270, -1, 103, 237, -1, 273, 23, 317, -1,
- -1, 217, 272, 218, 228, 240, 255, 23, 317, -1,
- 303, -1, 303, 274, 273, -1, 303, 274, 10, 273,
- -1, 171, 10, 273, -1, 277, -1, 275, -1, 284,
- -1, 281, -1, 291, -1, 287, -1, -1, 104, 14,
- 276, 271, -1, 104, 1, -1, -1, -1, -1, 109,
- 90, 278, 368, 279, 14, 280, 271, -1, -1, -1,
- 70, 334, 282, 14, 283, 271, -1, -1, 14, 285,
- 271, -1, -1, 284, 148, 14, 286, 271, -1, 67,
- 16, 346, 24, -1, 67, 352, -1, 67, 353, -1,
- 67, 288, 289, -1, 93, 289, -1, 65, -1, 98,
- 65, -1, -1, 290, 228, 243, 317, -1, -1, -1,
- -1, 120, 496, 292, 295, 293, 228, 14, 294, 271,
- -1, -1, 16, 296, 24, -1, 297, -1, 296, 297,
- -1, 167, 190, -1, 55, 167, 190, -1, 75, 321,
- -1, 75, 28, -1, -1, 14, 299, 300, 23, -1,
- -1, 302, -1, 301, -1, 301, 10, -1, 308, -1,
- 301, 10, 308, -1, 302, 308, -1, 305, -1, 301,
- 10, 305, -1, 302, 305, -1, -1, 304, -1, 308,
- -1, 308, 10, 303, -1, -1, -1, 70, 306, 334,
- 307, 14, 304, 23, -1, -1, 330, 309, 312, -1,
- -1, 324, 310, 311, -1, 355, -1, -1, 312, -1,
- -1, 323, 313, 315, -1, -1, 312, 26, 323, 314,
- 315, -1, 312, 26, 10, -1, 312, 26, 1, -1,
- 1, -1, 316, -1, 315, 9, 316, -1, 315, 9,
- 26, -1, 315, 9, 10, -1, 315, 9, 1, -1,
- 1, -1, 329, 317, -1, -1, -1, 105, 16, 318,
- 319, 24, -1, 320, -1, 319, 9, 320, -1, 74,
- -1, 77, 174, -1, 77, 167, -1, 77, 170, -1,
- 77, 164, -1, 102, 340, -1, 117, 340, -1, 118,
- 346, -1, 128, 164, -1, 130, -1, 131, 161, -1,
- 132, -1, 133, 161, -1, 134, -1, 135, 340, -1,
- 136, 16, 321, 24, -1, 138, 346, -1, 137, 346,
- -1, 140, -1, 141, -1, 139, 16, 321, 24, -1,
- 142, -1, 143, 16, 340, 24, 34, 340, -1, 143,
- 16, 164, 24, 34, 340, -1, 145, -1, 322, 16,
- 359, 24, -1, 322, -1, 340, -1, 321, 9, 340,
- -1, 112, -1, 113, -1, 114, -1, 115, -1, 116,
- -1, 333, -1, 30, -1, 1, -1, -1, 17, 325,
- 312, 327, -1, -1, 16, 326, 328, 24, -1, 16,
- 24, -1, 25, -1, 26, 25, -1, 329, -1, 328,
- 329, -1, 330, -1, 324, -1, 340, -1, 343, -1,
- 332, -1, 331, 332, -1, 340, -1, 371, -1, 344,
- -1, 16, 346, 24, -1, 340, -1, 371, -1, 344,
- -1, 340, -1, 373, -1, 371, -1, 344, -1, 346,
- 9, 346, -1, 335, 9, 346, -1, 346, -1, 336,
- 346, -1, 338, 346, 24, -1, 338, 28, 24, -1,
- 338, 62, 346, 24, -1, 339, -1, 50, -1, 38,
- 16, -1, 92, 16, -1, 91, 16, -1, 127, 16,
- -1, 171, -1, 341, -1, 340, 370, -1, 342, -1,
- 172, -1, 173, -1, 371, -1, 366, -1, 365, -1,
- 21, 365, -1, 19, 365, -1, 367, -1, 373, -1,
- 97, -1, 344, -1, -1, 5, 345, 346, 5, -1,
- 346, 34, 171, -1, 346, 7, 346, -1, 346, 4,
- 346, -1, 346, 11, 346, -1, 346, 20, 346, -1,
- -1, 346, 83, 347, 346, -1, -1, 346, 75, 348,
- 16, 359, 24, -1, 346, 18, 346, -1, 346, 13,
- 346, -1, 346, 15, 346, -1, 346, 12, 346, -1,
- 346, 21, 346, -1, 346, 19, 346, -1, 346, 28,
- 346, -1, 346, 27, 346, -1, 6, 346, -1, 98,
- 346, -1, 21, 346, -1, 19, 346, -1, 16, 346,
- 24, -1, -1, 16, 36, 349, 228, 243, 317, 24,
- -1, -1, 16, 217, 350, 218, 228, 240, 255, 317,
- 24, -1, 337, -1, 352, -1, -1, 371, 351, 357,
- -1, 366, -1, 365, -1, 367, -1, 373, -1, 340,
- -1, 355, -1, 160, 358, -1, 80, 16, 346, 24,
- -1, 81, 16, 346, 24, -1, 53, 16, 346, 24,
- -1, 42, 16, 340, 24, -1, -1, 371, 354, 358,
- -1, -1, 88, 371, 356, 360, -1, -1, 358, -1,
- 97, -1, 16, 24, -1, 16, 359, 24, -1, 346,
- -1, 359, 9, 346, -1, 359, 9, 1, -1, 359,
- 1, -1, -1, 361, -1, 97, -1, 16, 24, -1,
- 16, 362, 24, -1, 363, -1, 362, 9, 363, -1,
- 362, 9, 1, -1, 362, 1, -1, 346, -1, -1,
- 14, 364, 273, 23, -1, 161, -1, 162, -1, 163,
- -1, 164, -1, 164, 166, -1, 164, 8, 371, -1,
- 146, -1, 66, -1, 371, -1, 28, -1, 54, -1,
- 22, -1, 29, -1, 369, 170, -1, 369, 167, -1,
- 369, 168, -1, 369, 1, -1, 170, -1, 372, -1,
- 167, -1, 168, -1, 169, -1, 17, 25, -1, 375,
- -1, 374, 375, -1, 377, -1, 379, -1, 381, -1,
- 383, -1, 385, -1, 387, -1, 388, -1, 389, -1,
- 390, -1, 376, -1, 63, 399, 88, 82, 237, -1,
- -1, 78, 392, 378, 298, 391, -1, -1, 78, 52,
- 392, 380, 298, -1, -1, 57, 393, 382, 298, 391,
- -1, -1, 57, 52, 393, 384, 298, -1, -1, 94,
- 396, 386, 57, 298, 78, 298, 391, -1, 45, 399,
- 394, -1, 87, 399, 237, -1, 87, 399, 237, 398,
- 497, 237, -1, 46, 399, 498, 237, -1, 63, 399,
- 394, -1, -1, 228, 243, 255, 244, -1, 398, 497,
- 237, -1, 68, 497, 237, -1, 32, -1, 54, -1,
- 96, -1, 498, 237, -1, 54, -1, 497, 237, -1,
- -1, 497, 237, -1, -1, 151, 497, 237, 233, -1,
- 75, -1, 79, -1, -1, 121, -1, 401, -1, 403,
- -1, 406, -1, -1, 57, 402, 298, 405, 391, -1,
- -1, 78, 404, 298, 391, -1, -1, 78, 298, -1,
- 407, 399, 395, 144, 395, -1, 48, -1, 95, -1,
- 31, -1, 410, -1, -1, 408, 10, 409, 410, -1,
- 411, -1, 419, -1, 423, -1, 412, -1, 413, -1,
- 414, -1, 426, -1, 427, -1, 46, 422, 44, 496,
- 164, 488, 415, -1, 46, 422, 44, 496, 149, 486,
- 415, -1, 63, 399, 422, 44, 496, -1, 89, 80,
- 44, 496, 125, 101, 496, -1, 89, 496, 125, 101,
- 496, -1, -1, 105, 16, 24, -1, 105, 16, 416,
- 24, -1, 417, -1, 416, 9, 417, -1, 53, 496,
- -1, 81, 164, -1, 81, 495, -1, 40, -1, 58,
- -1, 111, 418, -1, 164, -1, 418, 148, 164, -1,
- -1, -1, 46, 109, 124, 496, 420, 429, 14, 421,
- 439, -1, 80, -1, 85, -1, -1, -1, 33, 109,
- 124, 496, 424, 429, 14, 425, 439, -1, 63, 399,
- 109, 124, 496, -1, 63, 399, 109, 90, 496, -1,
- 63, 399, 109, 90, 498, 496, -1, 63, 399, 496,
- -1, 63, 399, 498, 496, -1, -1, -1, 429, 68,
- 176, 34, 174, 430, 432, -1, 429, 68, 174, 34,
- 174, -1, -1, 429, 68, 123, 480, 34, 174, 431,
- 432, -1, 429, 479, -1, -1, 432, 433, -1, 129,
- 434, 85, 494, 435, 436, -1, -1, 152, -1, -1,
- 101, 16, 485, 24, -1, -1, 105, 16, 437, 24,
- -1, 438, -1, 437, 9, 438, -1, 174, -1, 174,
- 164, -1, 23, -1, 440, 23, -1, 440, 10, 23,
- -1, 442, -1, -1, 440, 10, 441, 442, -1, 448,
- -1, 428, -1, 427, -1, 443, -1, 444, -1, 37,
- 88, 82, 496, -1, 61, 399, 88, 82, 496, -1,
- 61, 399, 88, 82, -1, 23, -1, 446, 23, -1,
- 446, 10, 23, -1, 448, -1, -1, 446, 10, 447,
- 448, -1, -1, 46, 496, 34, 449, 451, -1, 46,
- 496, 149, 124, 496, 481, -1, 46, 498, 496, 149,
- 124, 496, 481, -1, -1, 456, 481, 14, 450, 445,
- -1, 454, -1, 453, -1, -1, 456, 481, 14, 452,
- 445, -1, 475, 474, 466, -1, -1, 475, 455, 460,
- -1, 457, -1, 456, 457, -1, 70, 476, -1, 126,
- 476, -1, 107, 476, -1, -1, -1, 100, 476, 458,
- 472, 459, 473, -1, 462, -1, -1, 460, 26, 461,
- 462, -1, -1, 474, 463, 464, -1, 1, -1, 466,
- 471, -1, -1, 464, 9, 465, 466, 471, -1, -1,
- -1, -1, -1, 475, 467, 472, 468, 473, 469, 477,
- 470, 481, -1, 1, -1, -1, 34, 496, -1, -1,
- 53, 371, -1, 53, 80, 16, 164, 24, -1, 53,
- 494, -1, -1, 81, 164, -1, 81, 494, -1, 476,
- -1, 17, 25, -1, 30, -1, 476, -1, 17, 25,
- -1, 496, -1, 365, -1, 366, -1, 496, 16, 484,
- 24, -1, 494, -1, -1, 478, -1, 479, -1, 478,
- 479, -1, 150, 16, 165, -1, 150, 164, -1, 16,
- 165, -1, 164, -1, -1, 105, 16, 24, -1, 105,
- 16, 482, 24, -1, 483, -1, 482, 9, 483, -1,
- 122, 64, -1, 64, -1, 106, 161, -1, 149, 174,
- -1, -1, 485, -1, 494, -1, 485, 9, 494, -1,
- 487, -1, 486, 9, 487, -1, 69, 176, 488, 111,
- 492, -1, 16, 489, 24, -1, -1, 490, -1, 491,
- -1, 490, 9, 491, -1, 493, 495, 492, -1, 495,
- -1, 495, 98, 99, -1, 75, -1, 495, -1, 495,
- -1, 175, -1, 177, -1, 174, -1, 129, -1, 152,
- -1, 371, -1, 80, 16, 164, 24, -1, -1, 498,
- -1, 70, -1, 70, 73, 43, -1, 155, -1, 10,
- 155, -1
+ 185, 0, -1, 152, 187, 186, 153, -1, 152, 187,
+ 343, 153, -1, 152, 153, -1, 152, 187, 365, 454,
+ -1, 1, -1, 196, -1, 202, -1, 204, -1, 207,
+ -1, 188, 193, 194, -1, -1, 188, 189, -1, -1,
+ 51, 190, 166, 191, -1, 192, -1, 191, 9, 192,
+ -1, 166, -1, 169, -1, 163, -1, 160, -1, 316,
+ -1, -1, 36, 169, -1, 36, 1, -1, -1, 194,
+ 195, -1, 106, 167, 169, -1, 106, 167, -1, 106,
+ 1, -1, -1, 198, 197, 199, 209, 219, 234, -1,
+ 119, -1, 119, 109, -1, 119, 56, -1, 119, 47,
+ -1, -1, 200, 201, -1, 28, -1, 311, -1, 310,
+ -1, -1, 45, 203, 277, 209, 222, 234, 223, -1,
+ -1, 55, 205, 206, 209, 218, 234, 223, -1, 28,
+ -1, 306, -1, -1, 34, 208, 209, 222, -1, -1,
+ 209, 210, -1, 211, 340, 212, -1, 62, -1, 62,
+ 93, -1, 95, 62, -1, 95, 62, 93, -1, 96,
+ -1, 96, 93, -1, -1, -1, 103, 16, 213, 214,
+ -1, 24, -1, 215, 24, -1, 166, 216, -1, 215,
+ 9, 166, 216, -1, -1, 217, 321, -1, -1, 222,
+ -1, -1, 149, 14, 220, 252, 23, 223, -1, -1,
+ 14, 221, 252, 23, -1, 219, 223, -1, -1, 224,
+ -1, -1, -1, 38, 225, 227, 14, 226, 229, 23,
+ -1, 228, -1, 227, 228, -1, 170, -1, 171, -1,
+ 316, -1, -1, 230, -1, 231, -1, 230, 231, -1,
+ 16, 232, 24, -1, 233, -1, 232, 233, -1, 340,
+ -1, 334, -1, 335, -1, 336, -1, 342, -1, 146,
+ -1, 235, 239, 241, -1, 235, 239, 241, 247, 248,
+ -1, 235, 239, 241, 249, 246, -1, -1, -1, 65,
+ 40, 236, 237, -1, 238, -1, 237, 238, -1, 16,
+ 321, 24, -1, 17, 321, 25, -1, 326, -1, 330,
+ -1, 315, -1, -1, -1, 66, 240, 321, -1, -1,
+ -1, 104, 40, 242, 243, -1, 244, -1, 243, 244,
+ -1, 245, 16, 321, 24, -1, 245, 17, 321, 25,
+ -1, 245, 160, -1, 326, -1, 330, -1, 315, -1,
+ -1, 33, -1, 54, -1, -1, 247, -1, 84, 216,
+ -1, -1, 249, -1, 101, 216, -1, 252, 23, 292,
+ -1, -1, 198, 251, 199, 209, 219, 234, 23, 292,
+ -1, 281, -1, 281, 253, 252, -1, 281, 253, 10,
+ 252, -1, 256, -1, 254, -1, 263, -1, 260, -1,
+ 270, -1, 266, -1, -1, 102, 14, 255, 250, -1,
+ 102, 1, -1, -1, -1, -1, 107, 88, 257, 337,
+ 258, 14, 259, 250, -1, -1, -1, 64, 309, 261,
+ 14, 262, 250, -1, -1, 14, 264, 250, -1, -1,
+ 263, 147, 14, 265, 250, -1, 61, 16, 321, 24,
+ -1, 61, 326, -1, 61, 330, -1, 61, 267, 268,
+ -1, 91, 268, -1, 59, -1, 95, 59, -1, -1,
+ 269, 209, 222, 292, -1, -1, -1, -1, 120, 451,
+ 271, 274, 272, 209, 14, 273, 250, -1, -1, 16,
+ 275, 24, -1, 276, -1, 275, 276, -1, 166, 191,
+ -1, 51, 166, 191, -1, 70, 296, -1, 70, 28,
+ -1, -1, 14, 278, 279, 23, -1, -1, 280, -1,
+ 280, 10, -1, 283, -1, 280, 10, 283, -1, -1,
+ 282, -1, 283, -1, 283, 10, 281, -1, -1, 305,
+ 284, 287, -1, -1, 299, 285, 286, -1, -1, 287,
+ -1, 287, 26, -1, 287, 26, 10, -1, -1, 298,
+ 288, 290, -1, -1, 287, 26, 298, 289, 290, -1,
+ 287, 26, 10, -1, 287, 26, 1, -1, 1, -1,
+ 291, -1, 290, 9, 291, -1, 290, 9, 26, -1,
+ 290, 9, 10, -1, 290, 9, 1, -1, 1, -1,
+ 304, 292, -1, -1, -1, 103, 16, 293, 294, 24,
+ -1, 295, -1, 294, 9, 295, -1, 69, -1, 72,
+ 176, -1, 72, 166, -1, 72, 169, -1, 72, 163,
+ -1, 100, 315, -1, 117, 315, -1, 118, 321, -1,
+ 129, 163, -1, 130, -1, 131, 160, -1, 132, -1,
+ 133, 160, -1, 134, -1, 135, 315, -1, 136, 16,
+ 296, 24, -1, 138, 321, -1, 137, 321, -1, 140,
+ -1, 141, -1, 139, 16, 296, 24, -1, 142, -1,
+ 143, 16, 315, 24, 32, 315, -1, 143, 16, 163,
+ 24, 32, 315, -1, 144, -1, 297, 16, 333, 24,
+ -1, 297, -1, 315, -1, 296, 9, 315, -1, 111,
+ -1, 112, -1, 113, -1, 114, -1, 115, -1, 308,
+ -1, 30, -1, 1, -1, -1, 17, 300, 287, 302,
+ -1, -1, 16, 301, 303, 24, -1, 16, 24, -1,
+ 25, -1, 26, 25, -1, 304, -1, 303, 304, -1,
+ 305, -1, 299, -1, 315, -1, 318, -1, 307, -1,
+ 306, 307, -1, 315, -1, 340, -1, 319, -1, 16,
+ 321, 24, -1, 315, -1, 340, -1, 319, -1, 315,
+ -1, 342, -1, 340, -1, 319, -1, 321, 9, 321,
+ -1, 310, 9, 321, -1, 321, -1, 311, 321, -1,
+ 313, 321, 24, -1, 313, 28, 24, -1, 313, 56,
+ 321, 24, -1, 314, -1, 46, -1, 35, 16, -1,
+ 90, 16, -1, 89, 16, -1, 128, 16, -1, 170,
+ -1, 171, -1, 316, -1, 315, 339, -1, 317, -1,
+ 172, -1, 173, -1, 174, -1, 175, -1, 340, -1,
+ 335, -1, 334, -1, 21, 334, -1, 19, 334, -1,
+ 336, -1, 342, -1, 94, -1, 319, -1, -1, 5,
+ 320, 321, 5, -1, 321, 32, 170, -1, 321, 32,
+ 171, -1, 321, 7, 321, -1, 321, 4, 321, -1,
+ 321, 11, 321, -1, 321, 20, 321, -1, -1, 321,
+ 83, 322, 321, -1, -1, 321, 70, 323, 16, 333,
+ 24, -1, 321, 18, 321, -1, 321, 13, 321, -1,
+ 321, 15, 321, -1, 321, 12, 321, -1, 321, 21,
+ 321, -1, 321, 19, 321, -1, 321, 28, 321, -1,
+ 321, 27, 321, -1, 6, 321, -1, 95, 321, -1,
+ 21, 321, -1, 19, 321, -1, 16, 321, 24, -1,
+ -1, 16, 34, 324, 209, 222, 24, 292, -1, -1,
+ 16, 198, 325, 199, 209, 219, 234, 24, 292, -1,
+ 312, -1, 326, -1, 340, 331, -1, 335, -1, 334,
+ -1, 336, -1, 342, -1, 315, -1, 125, 16, 321,
+ 24, -1, 81, 16, 321, 24, -1, 82, 16, 321,
+ 9, 321, 24, -1, 49, 16, 321, 24, -1, 39,
+ 16, 315, 24, -1, 116, 16, 321, 9, 321, 24,
+ -1, 77, 16, 321, 24, -1, 80, 16, 321, 24,
+ -1, 76, 16, 321, 24, -1, 78, 16, 321, 24,
+ -1, 329, -1, -1, 75, 327, 16, 321, 24, -1,
+ -1, 79, 328, 16, 321, 24, -1, 68, 16, 321,
+ 9, 321, 9, 321, 24, -1, 44, 16, 333, 24,
+ -1, 108, 16, 321, 9, 321, 24, -1, 108, 16,
+ 321, 9, 321, 9, 321, 24, -1, 340, 332, -1,
+ -1, 332, -1, 94, -1, 16, 24, -1, 16, 333,
+ 24, -1, 321, -1, 333, 9, 321, -1, 333, 9,
+ 1, -1, 333, 1, -1, 160, -1, 161, -1, 162,
+ -1, 163, -1, 163, 165, -1, 163, 8, 340, -1,
+ 145, -1, 60, -1, 340, -1, 28, -1, 50, -1,
+ 22, -1, 29, -1, 338, 169, -1, 338, 166, -1,
+ 338, 167, -1, 338, 1, -1, 169, -1, 341, -1,
+ 166, -1, 167, -1, 168, -1, 17, 25, -1, 344,
+ -1, 343, 344, -1, 345, -1, 347, -1, 349, -1,
+ 351, -1, 353, -1, 355, -1, 356, -1, 357, -1,
+ 358, -1, -1, 73, 360, 346, 277, 359, -1, -1,
+ 73, 48, 360, 348, 277, -1, -1, 52, 361, 350,
+ 277, 359, -1, -1, 52, 48, 361, 352, 277, -1,
+ -1, 92, 362, 354, 52, 277, 73, 277, 359, -1,
+ 42, 362, -1, 86, 216, -1, 86, 216, 363, 452,
+ 216, -1, 43, 364, 453, 216, -1, 57, 364, 453,
+ 216, -1, -1, 209, 222, 234, 223, -1, -1, 363,
+ 452, 216, -1, -1, 62, 452, 216, -1, -1, 452,
+ 216, -1, 70, -1, 74, -1, -1, 121, -1, 367,
+ -1, -1, 365, 10, 366, 367, -1, 368, -1, 376,
+ -1, 380, -1, 369, -1, 370, -1, 371, -1, 383,
+ -1, 384, -1, 43, 379, 41, 451, 163, 443, 372,
+ -1, 43, 379, 41, 451, 148, 441, 372, -1, 57,
+ 364, 379, 41, 451, -1, 87, 75, 41, 451, 126,
+ 99, 451, -1, 87, 451, 126, 99, 451, -1, -1,
+ 103, 16, 24, -1, 103, 16, 373, 24, -1, 374,
+ -1, 373, 9, 374, -1, 49, 451, -1, 81, 163,
+ -1, 81, 450, -1, 37, -1, 53, -1, 110, 375,
+ -1, 163, -1, 375, 147, 163, -1, -1, -1, 43,
+ 107, 124, 451, 377, 386, 14, 378, 396, -1, 75,
+ -1, 85, -1, -1, -1, 31, 107, 124, 451, 381,
+ 386, 14, 382, 396, -1, 57, 364, 107, 124, 451,
+ -1, 57, 364, 107, 88, 451, -1, 57, 364, 107,
+ 88, 453, 451, -1, 57, 364, 451, -1, 57, 364,
+ 453, 451, -1, -1, -1, 386, 62, 178, 32, 176,
+ 387, 389, -1, 386, 62, 176, 32, 176, -1, -1,
+ 386, 62, 123, 435, 32, 176, 388, 389, -1, 386,
+ 434, -1, -1, 389, 390, -1, 158, 391, 85, 449,
+ 392, 393, -1, -1, 159, -1, -1, 99, 16, 440,
+ 24, -1, -1, 103, 16, 394, 24, -1, 395, -1,
+ 394, 9, 395, -1, 176, -1, 176, 163, -1, 23,
+ -1, 397, 23, -1, 397, 10, 23, -1, 399, -1,
+ -1, 397, 10, 398, 399, -1, 403, -1, 385, -1,
+ 384, -1, 23, -1, 401, 23, -1, 401, 10, 23,
+ -1, 403, -1, -1, 401, 10, 402, 403, -1, -1,
+ 43, 451, 32, 404, 406, -1, 43, 451, 148, 124,
+ 451, 436, -1, 43, 453, 451, 148, 124, 451, 436,
+ -1, -1, 411, 436, 14, 405, 400, -1, 409, -1,
+ 408, -1, -1, 411, 436, 14, 407, 400, -1, 430,
+ 429, 421, -1, -1, 430, 410, 415, -1, 412, -1,
+ 411, 412, -1, 64, 431, -1, 127, 431, -1, 105,
+ 431, -1, -1, -1, 98, 431, 413, 427, 414, 428,
+ -1, 417, -1, -1, 415, 26, 416, 417, -1, -1,
+ 429, 418, 419, -1, 1, -1, 421, 426, -1, -1,
+ 419, 9, 420, 421, 426, -1, -1, -1, -1, -1,
+ 430, 422, 427, 423, 428, 424, 432, 425, 436, -1,
+ 1, -1, -1, 32, 451, -1, -1, 49, 340, -1,
+ 49, 75, 16, 163, 24, -1, 49, 449, -1, -1,
+ 81, 163, -1, 81, 449, -1, 431, -1, 17, 25,
+ -1, 30, -1, 431, -1, 17, 25, -1, 451, -1,
+ 334, -1, 335, -1, 451, 16, 439, 24, -1, 449,
+ -1, -1, 433, -1, 434, -1, 433, 434, -1, 149,
+ 16, 164, -1, 149, 163, -1, 16, 164, -1, 163,
+ -1, -1, 103, 16, 24, -1, 103, 16, 437, 24,
+ -1, 438, -1, 437, 9, 438, -1, 122, 58, -1,
+ 58, -1, 104, 160, -1, 148, 176, -1, -1, 440,
+ -1, 449, -1, 440, 9, 449, -1, 442, -1, 441,
+ 9, 442, -1, 63, 178, 443, 110, 447, -1, 16,
+ 444, 24, -1, -1, 445, -1, 446, -1, 445, 9,
+ 446, -1, 448, 450, 447, -1, 450, -1, 450, 95,
+ 97, -1, 70, -1, 450, -1, 450, -1, 177, -1,
+ 179, -1, 176, -1, 158, -1, 159, -1, 340, -1,
+ 75, 16, 163, 24, -1, -1, 453, -1, 64, -1,
+ 64, 67, 40, -1, 153, -1, 10, 153, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 555, 555, 557, 560, 563, 566, 569, 575, 576,
- 577, 578, 583, 587, 588, 592, 592, 602, 603, 607,
- 608, 609, 610, 611, 615, 616, 620, 624, 625, 629,
- 634, 635, 638, 640, 640, 649, 650, 656, 656, 672,
- 674, 672, 680, 683, 680, 690, 695, 700, 705, 713,
- 714, 715, 719, 720, 721, 725, 730, 737, 738, 745,
- 746, 750, 751, 752, 757, 758, 759, 760, 761, 762,
- 763, 764, 769, 769, 774, 775, 781, 781, 797, 798,
- 799, 800, 804, 804, 809, 811, 812, 818, 818, 836,
- 836, 852, 853, 857, 857, 868, 869, 877, 882, 886,
- 892, 893, 894, 895, 899, 900, 901, 902, 906, 907,
- 907, 912, 913, 917, 919, 924, 924, 930, 933, 937,
- 937, 941, 941, 948, 952, 953, 957, 963, 957, 975,
- 976, 980, 981, 985, 986, 990, 991, 995, 1002, 1003,
- 1007, 1008, 1009, 1010, 1011, 1012, 1017, 1018, 1019, 1023,
- 1024, 1024, 1033, 1034, 1039, 1040, 1041, 1042, 1043, 1047,
- 1048, 1048, 1057, 1058, 1058, 1067, 1068, 1073, 1074, 1075,
- 1076, 1077, 1078, 1082, 1083, 1084, 1088, 1089, 1093, 1097,
- 1098, 1102, 1106, 1109, 1109, 1147, 1148, 1149, 1150, 1167,
- 1168, 1169, 1170, 1171, 1172, 1176, 1176, 1177, 1181, 1182,
- 1183, 1181, 1190, 1191, 1189, 1198, 1198, 1199, 1199, 1210,
- 1211, 1212, 1213, 1218, 1224, 1225, 1229, 1229, 1250, 1255,
- 1259, 1250, 1279, 1280, 1284, 1285, 1289, 1290, 1300, 1301,
- 1305, 1305, 1325, 1326, 1327, 1328, 1332, 1333, 1334, 1338,
- 1339, 1340, 1344, 1345, 1349, 1350, 1354, 1355, 1354, 1362,
- 1362, 1364, 1364, 1366, 1370, 1371, 1377, 1377, 1380, 1379,
- 1382, 1383, 1384, 1388, 1389, 1390, 1391, 1392, 1393, 1397,
- 1402, 1403, 1403, 1411, 1412, 1416, 1417, 1422, 1424, 1425,
- 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434, 1435,
- 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445,
- 1446, 1447, 1451, 1452, 1456, 1457, 1458, 1459, 1460, 1464,
- 1465, 1466, 1470, 1470, 1475, 1475, 1487, 1491, 1492, 1496,
- 1500, 1513, 1514, 1518, 1519, 1523, 1524, 1528, 1529, 1530,
- 1531, 1535, 1536, 1537, 1541, 1542, 1543, 1544, 1548, 1549,
- 1553, 1554, 1558, 1559, 1560, 1564, 1568, 1569, 1570, 1571,
- 1572, 1576, 1593, 1598, 1606, 1611, 1612, 1617, 1618, 1619,
- 1620, 1621, 1622, 1623, 1624, 1625, 1629, 1629, 1651, 1652,
- 1654, 1657, 1661, 1662, 1662, 1665, 1665, 1679, 1680, 1681,
- 1682, 1683, 1687, 1691, 1693, 1694, 1696, 1698, 1701, 1724,
- 1727, 1727, 1745, 1745, 1770, 1776, 1777, 1777, 1809, 1810,
- 1811, 1812, 1813, 1814, 1818, 1835, 1837, 1839, 1841, 1846,
- 1846, 1876, 1876, 1898, 1899, 1903, 1904, 1905, 1909, 1910,
- 1911, 1912, 1916, 1917, 1921, 1922, 1923, 1927, 1928, 1929,
- 1930, 1934, 1935, 1935, 1941, 1942, 1943, 1947, 1948, 1949,
- 1953, 1954, 1958, 1959, 1960, 1964, 1965, 1969, 1973, 1977,
- 1981, 1985, 1986, 1990, 1991, 1995, 1996, 2002, 2003, 2010,
- 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2023,
- 2030, 2030, 2042, 2042, 2057, 2057, 2069, 2069, 2085, 2085,
- 2096, 2102, 2104, 2109, 2114, 2119, 2120, 2127, 2131, 2135,
- 2136, 2137, 2138, 2142, 2143, 2147, 2148, 2152, 2153, 2160,
- 2161, 2165, 2166, 2174, 2175, 2176, 2183, 2183, 2205, 2205,
- 2217, 2218, 2222, 2228, 2229, 2230, 2236, 2237, 2237, 2243,
- 2244, 2245, 2251, 2252, 2253, 2254, 2255, 2261, 2270, 2282,
- 2292, 2295, 2301, 2302, 2303, 2307, 2311, 2318, 2320, 2322,
- 2324, 2326, 2328, 2334, 2335, 2339, 2353, 2339, 2364, 2365,
- 2369, 2376, 2369, 2387, 2398, 2404, 2413, 2419, 2428, 2429,
- 2429, 2434, 2437, 2437, 2443, 2448, 2449, 2453, 2460, 2461,
- 2465, 2466, 2470, 2471, 2475, 2479, 2486, 2487, 2491, 2492,
- 2493, 2497, 2498, 2498, 2505, 2506, 2508, 2510, 2512, 2517,
- 2526, 2532, 2541, 2542, 2543, 2547, 2548, 2548, 2556, 2555,
- 2558, 2565, 2573, 2572, 2582, 2586, 2588, 2587, 2602, 2616,
- 2616, 2621, 2622, 2626, 2627, 2628, 2629, 2630, 2629, 2638,
- 2639, 2639, 2645, 2645, 2650, 2654, 2657, 2657, 2665, 2669,
- 2671, 2673, 2665, 2676, 2680, 2681, 2685, 2686, 2687, 2688,
- 2692, 2693, 2694, 2698, 2699, 2700, 2704, 2705, 2709, 2710,
- 2711, 2712, 2715, 2720, 2721, 2725, 2726, 2730, 2731, 2735,
- 2736, 2740, 2741, 2742, 2746, 2750, 2757, 2758, 2759, 2760,
- 2764, 2765, 2769, 2770, 2774, 2775, 2779, 2785, 2789, 2790,
- 2794, 2795, 2799, 2805, 2806, 2810, 2811, 2815, 2816, 2817,
- 2821, 2822, 2823, 2828, 2829, 2834, 2835, 2839, 2840, 2844,
- 2845
+ 0, 520, 520, 526, 529, 532, 535, 541, 542, 543,
+ 544, 548, 552, 553, 557, 557, 567, 568, 572, 573,
+ 574, 575, 576, 580, 581, 585, 589, 590, 594, 599,
+ 600, 605, 605, 621, 622, 623, 624, 628, 628, 633,
+ 635, 636, 642, 642, 660, 660, 676, 677, 681, 681,
+ 692, 693, 701, 706, 707, 708, 709, 710, 711, 715,
+ 716, 716, 721, 722, 726, 728, 733, 733, 739, 742,
+ 746, 746, 750, 750, 757, 761, 762, 766, 770, 766,
+ 782, 783, 787, 788, 789, 793, 794, 798, 799, 803,
+ 810, 811, 815, 816, 817, 818, 819, 820, 825, 826,
+ 827, 831, 832, 832, 841, 842, 847, 848, 849, 850,
+ 851, 855, 856, 856, 865, 866, 866, 875, 876, 881,
+ 882, 883, 884, 885, 886, 890, 891, 892, 896, 897,
+ 901, 905, 906, 910, 914, 917, 917, 955, 956, 957,
+ 961, 962, 963, 964, 965, 966, 970, 970, 971, 975,
+ 976, 977, 975, 984, 985, 983, 992, 992, 993, 993,
+ 1004, 1005, 1006, 1007, 1012, 1018, 1019, 1023, 1023, 1044,
+ 1049, 1053, 1044, 1072, 1073, 1077, 1078, 1082, 1083, 1093,
+ 1094, 1098, 1098, 1103, 1104, 1105, 1109, 1110, 1114, 1115,
+ 1119, 1120, 1124, 1124, 1126, 1126, 1131, 1132, 1133, 1134,
+ 1138, 1138, 1141, 1140, 1143, 1144, 1145, 1149, 1150, 1151,
+ 1152, 1153, 1154, 1158, 1163, 1164, 1164, 1172, 1173, 1177,
+ 1178, 1183, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192,
+ 1193, 1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202,
+ 1203, 1204, 1205, 1206, 1207, 1208, 1212, 1213, 1217, 1218,
+ 1219, 1220, 1221, 1225, 1226, 1227, 1231, 1231, 1236, 1236,
+ 1248, 1252, 1253, 1257, 1261, 1274, 1275, 1279, 1280, 1284,
+ 1285, 1289, 1290, 1291, 1292, 1296, 1297, 1298, 1302, 1303,
+ 1304, 1305, 1309, 1310, 1314, 1315, 1319, 1320, 1321, 1325,
+ 1329, 1330, 1331, 1332, 1333, 1337, 1338, 1339, 1340, 1344,
+ 1349, 1350, 1351, 1352, 1357, 1358, 1359, 1360, 1361, 1362,
+ 1363, 1364, 1365, 1369, 1369, 1389, 1390, 1391, 1393, 1396,
+ 1400, 1401, 1401, 1404, 1404, 1418, 1419, 1420, 1421, 1422,
+ 1426, 1430, 1432, 1433, 1435, 1437, 1440, 1463, 1466, 1466,
+ 1484, 1484, 1509, 1515, 1516, 1526, 1527, 1528, 1529, 1530,
+ 1534, 1536, 1538, 1540, 1542, 1544, 1546, 1548, 1550, 1552,
+ 1554, 1556, 1555, 1560, 1559, 1563, 1566, 1572, 1574, 1579,
+ 1587, 1588, 1592, 1593, 1594, 1598, 1599, 1600, 1601, 1605,
+ 1606, 1607, 1611, 1612, 1613, 1617, 1618, 1622, 1623, 1624,
+ 1628, 1629, 1633, 1637, 1641, 1645, 1649, 1650, 1654, 1655,
+ 1659, 1660, 1666, 1667, 1674, 1675, 1676, 1677, 1678, 1679,
+ 1680, 1681, 1682, 1688, 1688, 1700, 1700, 1715, 1715, 1727,
+ 1727, 1743, 1743, 1754, 1759, 1761, 1766, 1771, 1776, 1777,
+ 1784, 1785, 1789, 1790, 1794, 1795, 1799, 1800, 1804, 1805,
+ 1811, 1812, 1812, 1818, 1819, 1820, 1826, 1827, 1828, 1829,
+ 1830, 1836, 1846, 1859, 1870, 1874, 1881, 1882, 1883, 1887,
+ 1891, 1898, 1900, 1902, 1904, 1906, 1908, 1914, 1915, 1919,
+ 1933, 1919, 1944, 1945, 1949, 1956, 1949, 1967, 1978, 1984,
+ 1993, 1999, 2008, 2009, 2009, 2014, 2017, 2017, 2023, 2028,
+ 2029, 2033, 2040, 2041, 2045, 2046, 2050, 2051, 2055, 2059,
+ 2066, 2067, 2071, 2072, 2073, 2077, 2078, 2078, 2085, 2086,
+ 2088, 2093, 2094, 2095, 2099, 2100, 2100, 2108, 2107, 2110,
+ 2117, 2125, 2124, 2134, 2138, 2140, 2139, 2154, 2168, 2168,
+ 2173, 2174, 2178, 2179, 2180, 2181, 2182, 2181, 2190, 2191,
+ 2191, 2197, 2197, 2202, 2206, 2209, 2209, 2217, 2221, 2223,
+ 2225, 2217, 2228, 2232, 2233, 2237, 2238, 2239, 2240, 2244,
+ 2245, 2246, 2250, 2251, 2252, 2256, 2257, 2261, 2262, 2263,
+ 2264, 2267, 2272, 2273, 2277, 2278, 2282, 2283, 2287, 2288,
+ 2292, 2293, 2294, 2298, 2302, 2309, 2310, 2311, 2312, 2316,
+ 2317, 2321, 2322, 2326, 2327, 2331, 2337, 2341, 2342, 2346,
+ 2347, 2351, 2357, 2358, 2362, 2363, 2367, 2368, 2369, 2373,
+ 2374, 2375, 2380, 2381, 2386, 2387, 2391, 2392, 2396, 2397
};
#endif
@@ -1214,125 +1162,110 @@ static const char *const yytname[] =
"_BACKQUOTE", "_BANG", "_BAR_BAR", "_CARET_CARET", "_COMMA", "_DOT",
"_EQ", "_GE", "_GT", "_LBRA", "_LE", "_LPAR", "_LSQBRA", "_LT", "_MINUS",
"_NOT_EQ", "_PLUS", "_PLUS_GT", "_RBRA", "_RPAR", "_RSQBRA", "_SEMI",
- "_SLASH", "_STAR", "_STAR_GT", "a_L", "ADD_L", "ALL_L", "ALTER_L",
- "AS_L", "ASC_L", "ASK_L", "ATTACH_L", "AVG_L", "BASE_L", "BIJECTION_L",
- "BINDINGS_L", "BOUND_L", "BY_L", "CLASS_L", "CLEAR_L", "CREATE_L",
- "CONSTRUCT_L", "COPY_L", "COUNT_L", "COUNT_LPAR", "COUNT_DISTINCT_L",
- "DATA_L", "DATATYPE_L", "DEFAULT_L", "DEFINE_L", "DEFMACRO_L",
- "DELETE_L", "DEREF_L", "DESC_L", "DESCRIBE_L", "DETACH_L", "DISTINCT_L",
+ "_SLASH", "_STAR", "_STAR_GT", "a_L", "ALTER_L", "AS_L", "ASC_L",
+ "ASK_L", "AVG_L", "BASE_L", "BIJECTION_L", "BINDINGS_L", "BOUND_L",
+ "BY_L", "CLASS_L", "CLEAR_L", "CREATE_L", "COALESCE_L", "CONSTRUCT_L",
+ "COUNT_LPAR", "COUNT_DISTINCT_L", "DATA_L", "DATATYPE_L", "DEFAULT_L",
+ "DEFINE_L", "DELETE_L", "DEREF_L", "DESC_L", "DESCRIBE_L", "DISTINCT_L",
"DROP_L", "EXCLUSIVE_L", "EXISTS_L", "false_L", "FILTER_L", "FROM_L",
- "FUNCTION_L", "GRAPH_L", "GROUP_L", "HAVING_L", "IDENTIFIED_L", "IFP_L",
- "IN_L", "INDEX_L", "INFERENCE_L", "INSERT_L", "INTO_L", "IRI_L",
- "LANG_L", "LIBRARY_L", "LIKE_L", "LIMIT_L", "LITERAL_L", "LOCAL_L",
- "LOAD_L", "MACRO_L", "MAKE_L", "MAP_L", "MAX_L", "MIN_L", "MINUS_L",
- "MODIFY_L", "MOVE_L", "NAMED_L", "NIL_L", "NOT_L", "NULL_L", "OBJECT_L",
- "OF_L", "OFFBAND_L", "OFFSET_L", "OPTIONAL_L", "OPTION_L", "ORDER_L",
- "PREDICATE_L", "PREFIX_L", "QUAD_L", "REDUCED_L", "RETURNS_L",
- "SAME_AS_L", "SAME_AS_O_L", "SAME_AS_P_L", "SAME_AS_S_L",
- "SAME_AS_S_O_L", "SCORE_L", "SCORE_LIMIT_L", "SELECT_L", "SERVICE_L",
- "SILENT_L", "SOFT_L", "SQLQUERY_L", "STORAGE_L", "SUBCLASS_L",
- "SUBJECT_L", "SUM_L", "TABLE_OPTION_L", "TEXT_L", "T_CYCLES_ONLY_L",
+ "FUNCTION_L", "GRAPH_L", "GROUP_L", "HAVING_L", "IDENTIFIED_L", "IF_L",
+ "IFP_L", "IN_L", "INDEX_L", "INFERENCE_L", "INSERT_L", "INTO_L", "IRI_L",
+ "isBLANK_L", "isIRI_L", "isLITERAL_L", "isREF_L", "isURI_L", "LANG_L",
+ "LANGMATCHES_L", "LIKE_L", "LIMIT_L", "LITERAL_L", "LOAD_L", "MAKE_L",
+ "MAP_L", "MAX_L", "MIN_L", "MINUS_L", "MODIFY_L", "NAMED_L", "NIL_L",
+ "NOT_L", "NOT_FROM_L", "NULL_L", "OBJECT_L", "OF_L", "OFFBAND_L",
+ "OFFSET_L", "OPTIONAL_L", "OPTION_L", "ORDER_L", "PREDICATE_L",
+ "PREFIX_L", "QUAD_L", "REGEX_L", "REDUCED_L", "RETURNS_L", "SAME_AS_L",
+ "SAME_AS_O_L", "SAME_AS_P_L", "SAME_AS_S_L", "SAME_AS_S_O_L",
+ "SAMETERM_L", "SCORE_L", "SCORE_LIMIT_L", "SELECT_L", "SERVICE_L",
+ "SILENT_L", "SOFT_L", "SQLQUERY_L", "STORAGE_L", "STR_L", "SUBCLASS_L",
+ "SUBJECT_L", "SUM_L", "TABLE_OPTION_L", "T_CYCLES_ONLY_L",
"T_DIRECTION_L", "T_DISTINCT_L", "T_END_FLAG_L", "T_EXISTS_L",
"T_FINAL_AS_L", "T_IN_L", "T_MAX_L", "T_MIN_L", "T_OUT_L",
- "T_NO_CYCLES_L", "T_NO_ORDER_L", "T_SHORTEST_ONLY_L", "T_STEP_L", "TO_L",
+ "T_NO_CYCLES_L", "T_NO_ORDER_L", "T_SHORTEST_ONLY_L", "T_STEP_L",
"TRANSITIVE_L", "true_L", "UNBOUND_L", "UNION_L", "USING_L", "WHERE_L",
- "WITH_L", "XML_L", "__SPAR_PUNCT_END", "START_OF_SPARQL_TEXT",
+ "WITH_L", "__SPAR_PUNCT_END", "START_OF_SPARQL_TEXT",
"END_OF_SPARQL_TEXT", "SPARUL_RUN_SUBTYPE", "SPARUL_INSERT_DATA",
- "SPARUL_DELETE_DATA", "__SPAR_NONPUNCT_START", "SPARQL_BIF",
+ "SPARUL_DELETE_DATA", "__SPAR_NONPUNCT_START", "TEXT_BL", "XML_BL",
"SPARQL_INTEGER", "SPARQL_DECIMAL", "SPARQL_DOUBLE", "SPARQL_STRING",
"SPARQL_SQLTEXT", "LANGTAG", "QNAME", "QNAME_NS", "BLANK_NODE_LABEL",
- "Q_IRI_REF", "QD_VARNAME", "QD_COLON_PARAMNAME", "QD_COLON_PARAMNUM",
- "SPARQL_PLAIN_ID", "SPARQL_SQL_ALIASCOLNAME", "SPARQL_SQL_QTABLENAME",
- "SPARQL_SQL_QTABLECOLNAME", "__SPAR_NONPUNCT_END", "PRECODE_EXPN_PREC",
- "_COLON", "UMINUS", "UPLUS", "$accept", "sparql", "spar_query_body",
- "spar_prolog", "spar_defines_opt", "spar_define", "$@1",
- "spar_define_val_commalist", "spar_define_val", "spar_base_decl_opt",
- "spar_prefix_decls_opt", "spar_prefix_decl", "spar_create_macro_lib_opt",
- "$@2", "spar_defmacros_opt", "spar_defmacro", "$@3",
- "spar_dm_args_and_body", "$@4", "$@5", "$@6", "$@7",
- "spar_dm_match_template", "spar_dm_local_args_opt", "spar_dm_args_opt",
- "spar_dm_arg_commalist", "spar_dm_args", "spar_dm_patitem_gs",
- "spar_dm_patitem_p", "spar_dm_patitem_o", "spar_dm_gp_or_expn", "$@8",
- "spar_select_query", "$@9", "spar_select_query_mode", "spar_select_rset",
- "@10", "spar_select_rset_1", "spar_construct_query", "$@11",
- "spar_describe_query", "$@12", "spar_describe_rset", "spar_ask_query",
- "$@13", "spar_dataset_clauses_opt", "spar_dataset_clause",
- "spar_dataset_clause_subtype", "spar_dataset_clause_subtype_from",
- "spar_dataset_clause_subtype_using", "spar_sponge_optionlist_opt",
- "$@14", "spar_sponge_option_commalist_opt_rpar",
- "spar_sponge_option_commalist", "spar_precode_expn", "$@15",
- "spar_wherebindings_clause_opt", "spar_where_clause", "$@16", "$@17",
- "spar_wherebindings_clause", "spar_bindings_clause_opt",
- "spar_bindings_clause", "$@18", "$@19", "spar_bindings_vars",
- "spar_bindings_var", "spar_bindings_opt", "spar_bindings",
- "spar_binding", "spar_bindvals", "spar_bindval",
- "spar_solution_modifier", "spar_group_clause_opt", "$@20",
- "spar_group_expns", "spar_group_expn", "spar_having_clause_opt", "$@21",
- "spar_order_clause_opt", "$@22", "spar_order_conditions",
+ "Q_IRI_REF", "QUEST_VARNAME", "DOLLAR_VARNAME", "QUEST_COLON_PARAMNAME",
+ "DOLLAR_COLON_PARAMNAME", "QUEST_COLON_PARAMNUM",
+ "DOLLAR_COLON_PARAMNUM", "SPARQL_PLAIN_ID", "SPARQL_SQL_ALIASCOLNAME",
+ "SPARQL_SQL_QTABLENAME", "SPARQL_SQL_QTABLECOLNAME",
+ "__SPAR_NONPUNCT_END", "_COLON", "UMINUS", "UPLUS", "$accept", "sparql",
+ "spar_query_body", "spar_prolog", "spar_defines_opt", "spar_define",
+ "@1", "spar_define_val_commalist", "spar_define_val",
+ "spar_base_decl_opt", "spar_prefix_decls_opt", "spar_prefix_decl",
+ "spar_select_query", "@2", "spar_select_query_mode", "spar_select_rset",
+ "@3", "spar_select_rset_1", "spar_construct_query", "@4",
+ "spar_describe_query", "@5", "spar_describe_rset", "spar_ask_query",
+ "@6", "spar_dataset_clauses_opt", "spar_dataset_clause",
+ "spar_dataset_clause_subtype", "spar_sponge_optionlist_opt", "@7",
+ "spar_sponge_option_commalist_opt_rpar", "spar_sponge_option_commalist",
+ "spar_precode_expn", "@8", "spar_wherebindings_clause_opt",
+ "spar_where_clause", "@9", "@10", "spar_wherebindings_clause",
+ "spar_bindings_clause_opt", "spar_bindings_clause", "@11", "@12",
+ "spar_bindings_vars", "spar_bindings_var", "spar_bindings_opt",
+ "spar_bindings", "spar_binding", "spar_bindvals", "spar_bindval",
+ "spar_solution_modifier", "spar_group_clause_opt", "@13",
+ "spar_group_expns", "spar_group_expn", "spar_having_clause_opt", "@14",
+ "spar_order_clause_opt", "@15", "spar_order_conditions",
"spar_order_condition", "spar_asc_or_desc_opt", "spar_limit_clause_opt",
"spar_limit_clause", "spar_offset_clause_opt", "spar_offset_clause",
- "spar_group_gp", "@23", "spar_gp", "spar_gp_not_triples",
- "spar_optional_gp", "$@24", "spar_quad_map_gp", "$@25", "$@26", "$@27",
- "spar_graph_gp", "$@28", "$@29", "spar_group_or_union_gp", "$@30",
- "$@31", "spar_constraint", "spar_exists_or_not_exists",
- "spar_constraint_exists_int", "$@32", "spar_service_req", "@33", "@34",
- "$@35", "spar_service_options_list_opt", "spar_service_options",
- "spar_service_option", "spar_ctor_template", "$@36",
- "spar_ctor_triples_or_quads_opt", "spar_ctor_triples_or_quads_triples",
- "spar_ctor_triples_or_quads_quads", "spar_triples_opt", "spar_triples",
- "spar_quads1", "$@37", "$@38", "spar_triples1", "$@39", "$@40",
- "spar_props_opt", "spar_props", "$@41", "$@42", "spar_objects",
- "spar_ograph_node", "spar_triple_optionlist_opt", "$@43",
- "spar_triple_option_commalist", "spar_triple_option",
- "spar_triple_option_var_commalist", "spar_same_as_option", "spar_verb",
- "spar_triples_node", "$@44", "$@45", "spar_triples_opt_semi_rsqbra",
- "spar_cons_collection", "spar_graph_node", "spar_var_or_term",
+ "spar_group_gp", "@16", "spar_gp", "spar_gp_not_triples",
+ "spar_optional_gp", "@17", "spar_quad_map_gp", "@18", "@19", "@20",
+ "spar_graph_gp", "@21", "@22", "spar_group_or_union_gp", "@23", "@24",
+ "spar_constraint", "spar_exists_or_not_exists",
+ "spar_constraint_exists_int", "@25", "spar_service_req", "@26", "@27",
+ "@28", "spar_service_options_list_opt", "spar_service_options",
+ "spar_service_option", "spar_ctor_template", "@29",
+ "spar_ctor_triples_opt", "spar_ctor_triples", "spar_triples_opt",
+ "spar_triples", "spar_triples1", "@30", "@31", "spar_props_opt",
+ "spar_props", "@32", "@33", "spar_objects", "spar_ograph_node",
+ "spar_triple_optionlist_opt", "@34", "spar_triple_option_commalist",
+ "spar_triple_option", "spar_triple_option_var_commalist",
+ "spar_same_as_option", "spar_verb", "spar_triples_node", "@35", "@36",
+ "spar_triples_opt_semi_rsqbra", "spar_cons_collection",
+ "spar_graph_node", "spar_var_or_term",
"spar_var_or_iriref_or_pexpn_or_backquoteds",
"spar_var_or_iriref_or_pexpn_or_backquoted",
"spar_var_or_iriref_or_backquoted",
"spar_var_or_blank_node_or_iriref_or_backquoted",
"spar_retcol_commalist", "spar_retcols", "spar_ret_agg_call",
"spar_agg_name", "spar_agg_name_int", "spar_var", "spar_global_var",
- "spar_global_var_int", "spar_graph_term", "spar_backquoted", "@46",
- "spar_expn", "$@47", "$@48", "$@49", "$@50", "@51", "spar_built_in_call",
- "spar_function_call", "@52", "spar_macro_call", "@53",
- "spar_arg_list_opt", "spar_arg_list", "spar_expns",
- "spar_macro_arg_list_opt", "spar_macro_arg_list", "spar_expn_or_ggps",
- "spar_expn_or_ggp", "$@54", "spar_numeric_literal", "spar_rdf_literal",
- "spar_boolean_literal", "spar_iriref_or_star_or_default", "spar_arrow",
- "spar_arrow_iriref", "spar_iriref", "spar_qname", "spar_blank_node",
- "spar_sparul_action_or_drop_macro_libs",
- "spar_sparul_action_or_drop_macro_lib", "spar_drop_macro_lib",
- "spar_sparul_insert", "$@55", "spar_sparul_insertdata", "$@56",
- "spar_sparul_delete", "$@57", "spar_sparul_deletedata", "$@58",
- "spar_sparul_modify", "$@59", "spar_sparul_clear", "spar_sparul_load",
- "spar_sparul_create", "spar_sparul_drop", "spar_action_solution",
- "spar_in_graph_precode", "spar_from_graph_precode",
- "spar_all_or_named_or_default_or_graph_precode",
- "spar_default_or_graph_precode", "spar_graph_precode_opt",
- "spar_with_graph_precode_opt", "spar_in_or_into", "spar_silent_opt",
- "spar_sparul11_action", "spar_sparul11_deleteinsert", "@60",
- "spar_sparul11_insert", "@61", "spar_sparul11_insert_opt",
- "spar_sparul11_copymoveadd", "spar_sparul11_copymoveadd_op",
- "spar_qm_stmts", "$@62", "spar_qm_stmt", "spar_qm_simple_stmt",
- "spar_qm_create_iol_class", "spar_qm_drop_iol_class",
- "spar_qm_create_iri_subclass", "spar_qm_iol_class_optionlist_opt",
- "spar_qm_iol_class_option_commalist", "spar_qm_iol_class_option",
- "spar_qm_sprintff_list", "spar_qm_create_quad_storage", "$@63", "$@64",
- "spar_iol", "spar_qm_alter_quad_storage", "$@65", "$@66",
- "spar_qm_drop_quad_storage", "spar_qm_drop_quad_map_mapping",
- "spar_qm_drop_mapping", "spar_qm_from_where_list_opt", "$@67", "$@68",
+ "spar_global_var_int", "spar_graph_term", "spar_backquoted", "@37",
+ "spar_expn", "@38", "@39", "@40", "@41", "spar_built_in_call", "@42",
+ "@43", "spar_built_in_regex", "spar_function_call", "spar_arg_list_opt",
+ "spar_arg_list", "spar_expns", "spar_numeric_literal",
+ "spar_rdf_literal", "spar_boolean_literal",
+ "spar_iriref_or_star_or_default", "spar_arrow", "spar_arrow_iriref",
+ "spar_iriref", "spar_qname", "spar_blank_node", "spar_sparul_actions",
+ "spar_sparul_action", "spar_sparul_insert", "@44",
+ "spar_sparul_insertdata", "@45", "spar_sparul_delete", "@46",
+ "spar_sparul_deletedata", "@47", "spar_sparul_modify", "@48",
+ "spar_sparul_clear", "spar_sparul_load", "spar_sparul_create",
+ "spar_sparul_drop", "spar_action_solution", "spar_in_graph_precode_opt",
+ "spar_from_graph_precode_opt", "spar_graph_precode_opt",
+ "spar_in_or_into", "spar_silent_opt", "spar_qm_stmts", "@49",
+ "spar_qm_stmt", "spar_qm_simple_stmt", "spar_qm_create_iol_class",
+ "spar_qm_drop_iol_class", "spar_qm_create_iri_subclass",
+ "spar_qm_iol_class_optionlist_opt", "spar_qm_iol_class_option_commalist",
+ "spar_qm_iol_class_option", "spar_qm_sprintff_list",
+ "spar_qm_create_quad_storage", "@50", "@51", "spar_iol",
+ "spar_qm_alter_quad_storage", "@52", "@53", "spar_qm_drop_quad_storage",
+ "spar_qm_drop_quad_map_mapping", "spar_qm_drop_mapping",
+ "spar_qm_from_where_list_opt", "@54", "@55",
"spar_qm_text_literal_list_opt", "spar_qm_text_literal_decl",
"spar_xml_opt", "spar_of_sqlcol_opt", "spar_qm_text_literal_options_opt",
"spar_qm_text_literal_option_commalist", "spar_qm_text_literal_option",
- "spar_qm_map_top_group", "spar_qm_map_top_dotlist", "$@69",
- "spar_qm_map_top_op", "spar_qm_attach_macro_lib",
- "spar_qm_detach_macro_lib", "spar_qm_map_group", "spar_qm_map_dotlist",
- "$@70", "spar_qm_map_op", "$@71", "$@72", "spar_qm_map_iddef", "$@73",
- "spar_qm_map_single", "spar_qm_triples1", "$@74", "spar_qm_named_fields",
- "spar_qm_named_field", "$@75", "$@76", "spar_qm_props", "$@77",
- "spar_qm_prop", "$@78", "spar_qm_obj_field_commalist", "$@79",
- "spar_qm_obj_field", "$@80", "$@81", "$@82", "$@83", "spar_qm_as_id_opt",
+ "spar_qm_map_top_group", "spar_qm_map_top_dotlist", "@56",
+ "spar_qm_map_top_op", "spar_qm_map_group", "spar_qm_map_dotlist", "@57",
+ "spar_qm_map_op", "@58", "@59", "spar_qm_map_iddef", "@60",
+ "spar_qm_map_single", "spar_qm_triples1", "@61", "spar_qm_named_fields",
+ "spar_qm_named_field", "@62", "@63", "spar_qm_props", "@64",
+ "spar_qm_prop", "@65", "spar_qm_obj_field_commalist", "@66",
+ "spar_qm_obj_field", "@67", "@68", "@69", "@70", "spar_qm_as_id_opt",
"spar_qm_obj_datatype_opt", "spar_qm_obj_language_opt", "spar_qm_verb",
"spar_qm_field_or_blank", "spar_qm_field", "spar_qm_where_list_opt",
"spar_qm_where_list", "spar_qm_where", "spar_qm_sqlquery",
@@ -1371,160 +1304,142 @@ static const yytype_uint16 yytoknum[] =
405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
415, 416, 417, 418, 419, 420, 421, 422, 423, 424,
425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
- 435, 436, 437
+ 435, 436, 437, 438
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint16 yyr1[] =
{
- 0, 183, 184, 184, 184, 184, 184, 184, 185, 185,
- 185, 185, 186, 187, 187, 189, 188, 190, 190, 191,
- 191, 191, 191, 191, 192, 192, 192, 193, 193, 194,
- 194, 194, 195, 196, 195, 197, 197, 199, 198, 201,
- 202, 200, 203, 204, 200, 200, 205, 205, 205, 206,
- 206, 206, 207, 207, 207, 208, 208, 209, 209, 210,
- 210, 211, 211, 211, 212, 212, 212, 212, 212, 212,
- 212, 212, 214, 213, 213, 213, 216, 215, 217, 217,
- 217, 217, 219, 218, 220, 220, 220, 222, 221, 224,
- 223, 225, 225, 227, 226, 228, 228, 229, 230, 230,
- 231, 231, 231, 231, 232, 232, 232, 232, 233, 234,
- 233, 235, 235, 236, 236, 238, 237, 239, 239, 241,
- 240, 242, 240, 243, 244, 244, 246, 247, 245, 248,
- 248, 249, 249, 250, 250, 251, 251, 252, 253, 253,
- 254, 254, 254, 254, 254, 254, 255, 255, 255, 256,
- 257, 256, 258, 258, 259, 259, 259, 259, 259, 260,
- 261, 260, 262, 263, 262, 264, 264, 265, 265, 265,
- 265, 265, 265, 266, 266, 266, 267, 267, 268, 269,
- 269, 270, 271, 272, 271, 273, 273, 273, 273, 274,
- 274, 274, 274, 274, 274, 276, 275, 275, 278, 279,
- 280, 277, 282, 283, 281, 285, 284, 286, 284, 287,
- 287, 287, 287, 287, 288, 288, 290, 289, 292, 293,
- 294, 291, 295, 295, 296, 296, 297, 297, 297, 297,
- 299, 298, 300, 300, 300, 300, 301, 301, 301, 302,
- 302, 302, 303, 303, 304, 304, 306, 307, 305, 309,
- 308, 310, 308, 308, 311, 311, 313, 312, 314, 312,
- 312, 312, 312, 315, 315, 315, 315, 315, 315, 316,
- 317, 318, 317, 319, 319, 320, 320, 320, 320, 320,
- 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
- 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
- 320, 320, 321, 321, 322, 322, 322, 322, 322, 323,
- 323, 323, 325, 324, 326, 324, 324, 327, 327, 328,
- 328, 329, 329, 330, 330, 331, 331, 332, 332, 332,
- 332, 333, 333, 333, 334, 334, 334, 334, 335, 335,
- 336, 336, 337, 337, 337, 338, 339, 339, 339, 339,
- 339, 340, 340, 340, 341, 342, 342, 343, 343, 343,
- 343, 343, 343, 343, 343, 343, 345, 344, 346, 346,
- 346, 346, 346, 347, 346, 348, 346, 346, 346, 346,
- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
- 349, 346, 350, 346, 346, 346, 351, 346, 346, 346,
- 346, 346, 346, 346, 352, 352, 352, 352, 352, 354,
- 353, 356, 355, 357, 357, 358, 358, 358, 359, 359,
- 359, 359, 360, 360, 361, 361, 361, 362, 362, 362,
- 362, 363, 364, 363, 365, 365, 365, 366, 366, 366,
- 367, 367, 368, 368, 368, 369, 369, 370, 370, 370,
- 370, 371, 371, 372, 372, 373, 373, 374, 374, 375,
- 375, 375, 375, 375, 375, 375, 375, 375, 375, 376,
- 378, 377, 380, 379, 382, 381, 384, 383, 386, 385,
- 387, 388, 388, 389, 390, 391, 391, 392, 393, 394,
- 394, 394, 394, 395, 395, 396, 396, 397, 397, 398,
- 398, 399, 399, 400, 400, 400, 402, 401, 404, 403,
- 405, 405, 406, 407, 407, 407, 408, 409, 408, 410,
- 410, 410, 411, 411, 411, 411, 411, 412, 412, 413,
- 414, 414, 415, 415, 415, 416, 416, 417, 417, 417,
- 417, 417, 417, 418, 418, 420, 421, 419, 422, 422,
- 424, 425, 423, 426, 427, 427, 428, 428, 429, 430,
- 429, 429, 431, 429, 429, 432, 432, 433, 434, 434,
- 435, 435, 436, 436, 437, 437, 438, 438, 439, 439,
- 439, 440, 441, 440, 442, 442, 442, 442, 442, 443,
- 444, 444, 445, 445, 445, 446, 447, 446, 449, 448,
- 448, 448, 450, 448, 448, 451, 452, 451, 453, 455,
- 454, 456, 456, 457, 457, 457, 458, 459, 457, 460,
- 461, 460, 463, 462, 462, 464, 465, 464, 467, 468,
- 469, 470, 466, 466, 471, 471, 472, 472, 472, 472,
- 473, 473, 473, 474, 474, 474, 475, 475, 476, 476,
- 476, 476, 476, 477, 477, 478, 478, 479, 479, 480,
- 480, 481, 481, 481, 482, 482, 483, 483, 483, 483,
- 484, 484, 485, 485, 486, 486, 487, 488, 489, 489,
- 490, 490, 491, 492, 492, 493, 493, 494, 494, 494,
- 495, 495, 495, 496, 496, 497, 497, 498, 498, 499,
- 499
+ 0, 184, 185, 185, 185, 185, 185, 186, 186, 186,
+ 186, 187, 188, 188, 190, 189, 191, 191, 192, 192,
+ 192, 192, 192, 193, 193, 193, 194, 194, 195, 195,
+ 195, 197, 196, 198, 198, 198, 198, 200, 199, 201,
+ 201, 201, 203, 202, 205, 204, 206, 206, 208, 207,
+ 209, 209, 210, 211, 211, 211, 211, 211, 211, 212,
+ 213, 212, 214, 214, 215, 215, 217, 216, 218, 218,
+ 220, 219, 221, 219, 222, 223, 223, 225, 226, 224,
+ 227, 227, 228, 228, 228, 229, 229, 230, 230, 231,
+ 232, 232, 233, 233, 233, 233, 233, 233, 234, 234,
+ 234, 235, 236, 235, 237, 237, 238, 238, 238, 238,
+ 238, 239, 240, 239, 241, 242, 241, 243, 243, 244,
+ 244, 244, 244, 244, 244, 245, 245, 245, 246, 246,
+ 247, 248, 248, 249, 250, 251, 250, 252, 252, 252,
+ 253, 253, 253, 253, 253, 253, 255, 254, 254, 257,
+ 258, 259, 256, 261, 262, 260, 264, 263, 265, 263,
+ 266, 266, 266, 266, 266, 267, 267, 269, 268, 271,
+ 272, 273, 270, 274, 274, 275, 275, 276, 276, 276,
+ 276, 278, 277, 279, 279, 279, 280, 280, 281, 281,
+ 282, 282, 284, 283, 285, 283, 286, 286, 286, 286,
+ 288, 287, 289, 287, 287, 287, 287, 290, 290, 290,
+ 290, 290, 290, 291, 292, 293, 292, 294, 294, 295,
+ 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295, 295, 295, 295, 296, 296, 297, 297,
+ 297, 297, 297, 298, 298, 298, 300, 299, 301, 299,
+ 299, 302, 302, 303, 303, 304, 304, 305, 305, 306,
+ 306, 307, 307, 307, 307, 308, 308, 308, 309, 309,
+ 309, 309, 310, 310, 311, 311, 312, 312, 312, 313,
+ 314, 314, 314, 314, 314, 315, 315, 315, 315, 316,
+ 317, 317, 317, 317, 318, 318, 318, 318, 318, 318,
+ 318, 318, 318, 320, 319, 321, 321, 321, 321, 321,
+ 321, 322, 321, 323, 321, 321, 321, 321, 321, 321,
+ 321, 321, 321, 321, 321, 321, 321, 321, 324, 321,
+ 325, 321, 321, 321, 321, 321, 321, 321, 321, 321,
+ 326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
+ 326, 327, 326, 328, 326, 326, 326, 329, 329, 330,
+ 331, 331, 332, 332, 332, 333, 333, 333, 333, 334,
+ 334, 334, 335, 335, 335, 336, 336, 337, 337, 337,
+ 338, 338, 339, 339, 339, 339, 340, 340, 341, 341,
+ 342, 342, 343, 343, 344, 344, 344, 344, 344, 344,
+ 344, 344, 344, 346, 345, 348, 347, 350, 349, 352,
+ 351, 354, 353, 355, 356, 356, 357, 358, 359, 359,
+ 360, 360, 361, 361, 362, 362, 363, 363, 364, 364,
+ 365, 366, 365, 367, 367, 367, 368, 368, 368, 368,
+ 368, 369, 369, 370, 371, 371, 372, 372, 372, 373,
+ 373, 374, 374, 374, 374, 374, 374, 375, 375, 377,
+ 378, 376, 379, 379, 381, 382, 380, 383, 384, 384,
+ 385, 385, 386, 387, 386, 386, 388, 386, 386, 389,
+ 389, 390, 391, 391, 392, 392, 393, 393, 394, 394,
+ 395, 395, 396, 396, 396, 397, 398, 397, 399, 399,
+ 399, 400, 400, 400, 401, 402, 401, 404, 403, 403,
+ 403, 405, 403, 403, 406, 407, 406, 408, 410, 409,
+ 411, 411, 412, 412, 412, 413, 414, 412, 415, 416,
+ 415, 418, 417, 417, 419, 420, 419, 422, 423, 424,
+ 425, 421, 421, 426, 426, 427, 427, 427, 427, 428,
+ 428, 428, 429, 429, 429, 430, 430, 431, 431, 431,
+ 431, 431, 432, 432, 433, 433, 434, 434, 435, 435,
+ 436, 436, 436, 437, 437, 438, 438, 438, 438, 439,
+ 439, 440, 440, 441, 441, 442, 443, 444, 444, 445,
+ 445, 446, 447, 447, 448, 448, 449, 449, 449, 450,
+ 450, 450, 451, 451, 452, 452, 453, 453, 454, 454
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
- 0, 2, 5, 4, 4, 2, 4, 1, 1, 1,
- 1, 1, 5, 0, 2, 0, 4, 1, 3, 1,
- 1, 1, 1, 1, 0, 2, 2, 0, 2, 3,
- 2, 2, 0, 0, 8, 0, 2, 0, 4, 0,
- 0, 7, 0, 0, 7, 1, 5, 7, 7, 0,
- 4, 4, 0, 1, 1, 3, 3, 1, 2, 1,
- 1, 1, 1, 1, 1, 1, 2, 2, 1, 1,
- 1, 1, 0, 4, 1, 1, 0, 6, 1, 2,
- 2, 2, 0, 2, 1, 1, 1, 0, 7, 0,
- 7, 1, 1, 0, 4, 0, 2, 3, 1, 1,
- 1, 2, 2, 3, 1, 2, 2, 3, 0, 0,
- 4, 1, 2, 2, 4, 0, 2, 0, 1, 0,
- 6, 0, 4, 2, 0, 1, 0, 0, 7, 1,
- 2, 1, 1, 0, 1, 1, 2, 3, 1, 2,
- 1, 1, 1, 1, 1, 1, 3, 5, 5, 0,
- 0, 4, 1, 2, 3, 3, 1, 1, 1, 0,
- 0, 3, 0, 0, 4, 1, 2, 4, 4, 2,
- 1, 1, 1, 0, 1, 1, 0, 1, 2, 0,
- 1, 2, 3, 0, 8, 1, 3, 4, 3, 1,
- 1, 1, 1, 1, 1, 0, 4, 2, 0, 0,
- 0, 8, 0, 0, 6, 0, 3, 0, 5, 4,
- 2, 2, 3, 2, 1, 2, 0, 4, 0, 0,
- 0, 9, 0, 3, 1, 2, 2, 3, 2, 2,
- 0, 4, 0, 1, 1, 2, 1, 3, 2, 1,
- 3, 2, 0, 1, 1, 3, 0, 0, 7, 0,
- 3, 0, 3, 1, 0, 1, 0, 3, 0, 5,
- 3, 3, 1, 1, 3, 3, 3, 3, 1, 2,
- 0, 0, 5, 1, 3, 1, 2, 2, 2, 2,
- 2, 2, 2, 2, 1, 2, 1, 2, 1, 2,
- 4, 2, 2, 1, 1, 4, 1, 6, 6, 1,
- 4, 1, 1, 3, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 4, 0, 4, 2, 1, 2, 1,
- 2, 1, 1, 1, 1, 1, 2, 1, 1, 1,
- 3, 1, 1, 1, 1, 1, 1, 1, 3, 3,
- 1, 2, 3, 3, 4, 1, 1, 2, 2, 2,
- 2, 1, 1, 2, 1, 1, 1, 1, 1, 1,
- 2, 2, 1, 1, 1, 1, 0, 4, 3, 3,
- 3, 3, 3, 0, 4, 0, 6, 3, 3, 3,
- 3, 3, 3, 3, 3, 2, 2, 2, 2, 3,
- 0, 7, 0, 9, 1, 1, 0, 3, 1, 1,
- 1, 1, 1, 1, 2, 4, 4, 4, 4, 0,
- 3, 0, 4, 0, 1, 1, 2, 3, 1, 3,
- 3, 2, 0, 1, 1, 2, 3, 1, 3, 3,
- 2, 1, 0, 4, 1, 1, 1, 1, 2, 3,
- 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
- 2, 1, 1, 1, 1, 1, 2, 1, 2, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 5,
- 0, 5, 0, 5, 0, 5, 0, 5, 0, 8,
- 3, 3, 6, 4, 3, 0, 4, 3, 3, 1,
- 1, 1, 2, 1, 2, 0, 2, 0, 4, 1,
- 1, 0, 1, 1, 1, 1, 0, 5, 0, 4,
- 0, 2, 5, 1, 1, 1, 1, 0, 4, 1,
- 1, 1, 1, 1, 1, 1, 1, 7, 7, 5,
- 7, 5, 0, 3, 4, 1, 3, 2, 2, 2,
- 1, 1, 2, 1, 3, 0, 0, 9, 1, 1,
- 0, 0, 9, 5, 5, 6, 3, 4, 0, 0,
- 7, 5, 0, 8, 2, 0, 2, 6, 0, 1,
- 0, 4, 0, 4, 1, 3, 1, 2, 1, 2,
- 3, 1, 0, 4, 1, 1, 1, 1, 1, 4,
- 5, 4, 1, 2, 3, 1, 0, 4, 0, 5,
- 6, 7, 0, 5, 1, 1, 0, 5, 3, 0,
- 3, 1, 2, 2, 2, 2, 0, 0, 6, 1,
- 0, 4, 0, 3, 1, 2, 0, 5, 0, 0,
- 0, 0, 9, 1, 0, 2, 0, 2, 5, 2,
- 0, 2, 2, 1, 2, 1, 1, 2, 1, 1,
- 1, 4, 1, 0, 1, 1, 2, 3, 2, 2,
- 1, 0, 3, 4, 1, 3, 2, 1, 2, 2,
- 0, 1, 1, 3, 1, 3, 5, 3, 0, 1,
- 1, 3, 3, 1, 3, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 4, 0, 1, 1, 3, 1,
- 2
+ 0, 2, 4, 4, 2, 4, 1, 1, 1, 1,
+ 1, 3, 0, 2, 0, 4, 1, 3, 1, 1,
+ 1, 1, 1, 0, 2, 2, 0, 2, 3, 2,
+ 2, 0, 6, 1, 2, 2, 2, 0, 2, 1,
+ 1, 1, 0, 7, 0, 7, 1, 1, 0, 4,
+ 0, 2, 3, 1, 2, 2, 3, 1, 2, 0,
+ 0, 4, 1, 2, 2, 4, 0, 2, 0, 1,
+ 0, 6, 0, 4, 2, 0, 1, 0, 0, 7,
+ 1, 2, 1, 1, 1, 0, 1, 1, 2, 3,
+ 1, 2, 1, 1, 1, 1, 1, 1, 3, 5,
+ 5, 0, 0, 4, 1, 2, 3, 3, 1, 1,
+ 1, 0, 0, 3, 0, 0, 4, 1, 2, 4,
+ 4, 2, 1, 1, 1, 0, 1, 1, 0, 1,
+ 2, 0, 1, 2, 3, 0, 8, 1, 3, 4,
+ 1, 1, 1, 1, 1, 1, 0, 4, 2, 0,
+ 0, 0, 8, 0, 0, 6, 0, 3, 0, 5,
+ 4, 2, 2, 3, 2, 1, 2, 0, 4, 0,
+ 0, 0, 9, 0, 3, 1, 2, 2, 3, 2,
+ 2, 0, 4, 0, 1, 2, 1, 3, 0, 1,
+ 1, 3, 0, 3, 0, 3, 0, 1, 2, 3,
+ 0, 3, 0, 5, 3, 3, 1, 1, 3, 3,
+ 3, 3, 1, 2, 0, 0, 5, 1, 3, 1,
+ 2, 2, 2, 2, 2, 2, 2, 2, 1, 2,
+ 1, 2, 1, 2, 4, 2, 2, 1, 1, 4,
+ 1, 6, 6, 1, 4, 1, 1, 3, 1, 1,
+ 1, 1, 1, 1, 1, 1, 0, 4, 0, 4,
+ 2, 1, 2, 1, 2, 1, 1, 1, 1, 1,
+ 2, 1, 1, 1, 3, 1, 1, 1, 1, 1,
+ 1, 1, 3, 3, 1, 2, 3, 3, 4, 1,
+ 1, 2, 2, 2, 2, 1, 1, 1, 2, 1,
+ 1, 1, 1, 1, 1, 1, 1, 2, 2, 1,
+ 1, 1, 1, 0, 4, 3, 3, 3, 3, 3,
+ 3, 0, 4, 0, 6, 3, 3, 3, 3, 3,
+ 3, 3, 3, 2, 2, 2, 2, 3, 0, 7,
+ 0, 9, 1, 1, 2, 1, 1, 1, 1, 1,
+ 4, 4, 6, 4, 4, 6, 4, 4, 4, 4,
+ 1, 0, 5, 0, 5, 8, 4, 6, 8, 2,
+ 0, 1, 1, 2, 3, 1, 3, 3, 2, 1,
+ 1, 1, 1, 2, 3, 1, 1, 1, 1, 1,
+ 1, 1, 2, 2, 2, 2, 1, 1, 1, 1,
+ 1, 2, 1, 2, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 0, 5, 0, 5, 0, 5, 0,
+ 5, 0, 8, 2, 2, 5, 4, 4, 0, 4,
+ 0, 3, 0, 3, 0, 2, 1, 1, 0, 1,
+ 1, 0, 4, 1, 1, 1, 1, 1, 1, 1,
+ 1, 7, 7, 5, 7, 5, 0, 3, 4, 1,
+ 3, 2, 2, 2, 1, 1, 2, 1, 3, 0,
+ 0, 9, 1, 1, 0, 0, 9, 5, 5, 6,
+ 3, 4, 0, 0, 7, 5, 0, 8, 2, 0,
+ 2, 6, 0, 1, 0, 4, 0, 4, 1, 3,
+ 1, 2, 1, 2, 3, 1, 0, 4, 1, 1,
+ 1, 1, 2, 3, 1, 0, 4, 0, 5, 6,
+ 7, 0, 5, 1, 1, 0, 5, 3, 0, 3,
+ 1, 2, 2, 2, 2, 0, 0, 6, 1, 0,
+ 4, 0, 3, 1, 2, 0, 5, 0, 0, 0,
+ 0, 9, 1, 0, 2, 0, 2, 5, 2, 0,
+ 2, 2, 1, 2, 1, 1, 2, 1, 1, 1,
+ 4, 1, 0, 1, 1, 2, 3, 2, 2, 1,
+ 0, 3, 4, 1, 3, 2, 1, 2, 2, 0,
+ 1, 1, 3, 1, 3, 5, 3, 0, 1, 1,
+ 3, 3, 1, 3, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 4, 0, 1, 1, 3, 1, 2
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1532,1127 +1447,1166 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 0, 7, 13, 0, 5, 32, 24, 1, 515, 0,
- 501, 501, 513, 506, 501, 508, 501, 0, 695, 514,
- 0, 0, 457, 468, 459, 460, 461, 462, 463, 464,
- 465, 466, 467, 0, 503, 504, 505, 501, 0, 516,
- 519, 522, 523, 524, 520, 521, 525, 526, 0, 15,
- 14, 27, 0, 502, 0, 548, 549, 0, 0, 0,
- 0, 0, 695, 474, 0, 0, 0, 499, 500, 470,
- 695, 0, 115, 0, 453, 454, 451, 693, 452, 0,
- 697, 478, 115, 696, 93, 87, 89, 78, 0, 8,
- 76, 9, 10, 11, 501, 0, 501, 0, 3, 458,
- 4, 695, 517, 699, 6, 26, 25, 0, 35, 0,
- 489, 490, 491, 480, 115, 0, 0, 115, 0, 476,
- 115, 0, 230, 510, 0, 0, 484, 0, 472, 0,
- 115, 95, 481, 0, 0, 0, 0, 0, 0, 496,
- 95, 0, 0, 81, 80, 79, 2, 82, 0, 493,
- 0, 115, 700, 0, 0, 0, 28, 497, 0, 550,
- 492, 33, 545, 483, 0, 0, 488, 485, 232, 0,
- 95, 115, 0, 0, 0, 0, 485, 487, 0, 509,
- 695, 0, 0, 0, 0, 0, 0, 0, 346, 0,
- 441, 0, 0, 0, 0, 0, 0, 0, 440, 0,
- 434, 435, 436, 437, 455, 351, 355, 356, 394, 0,
- 345, 402, 352, 354, 116, 395, 403, 399, 398, 400,
- 396, 401, 0, 0, 0, 698, 0, 0, 95, 366,
- 0, 91, 95, 92, 325, 327, 329, 328, 95, 0,
- 695, 494, 0, 501, 518, 22, 21, 19, 20, 16,
- 17, 23, 31, 30, 0, 695, 36, 12, 558, 0,
- 558, 0, 0, 477, 475, 314, 312, 0, 0, 246,
- 364, 0, 234, 233, 239, 236, 251, 249, 323, 324,
- 365, 253, 359, 358, 362, 357, 363, 511, 507, 469,
- 554, 0, 553, 529, 473, 471, 121, 100, 0, 104,
- 0, 96, 0, 98, 99, 124, 149, 115, 385, 390,
- 392, 0, 456, 388, 387, 347, 0, 0, 0, 0,
- 411, 349, 348, 386, 350, 0, 415, 404, 0, 438,
- 0, 0, 0, 445, 446, 0, 353, 0, 0, 0,
+ 0, 6, 12, 0, 4, 0, 23, 1, 0, 48,
+ 614, 438, 42, 432, 44, 438, 430, 66, 0, 614,
+ 33, 0, 7, 31, 8, 9, 10, 0, 402, 404,
+ 405, 406, 407, 408, 409, 410, 411, 412, 0, 440,
+ 443, 446, 447, 448, 444, 445, 449, 450, 0, 14,
+ 13, 26, 0, 50, 616, 423, 66, 615, 472, 473,
+ 0, 439, 0, 0, 0, 432, 614, 417, 0, 0,
+ 430, 436, 437, 413, 614, 424, 0, 0, 398, 399,
+ 396, 612, 397, 0, 421, 36, 35, 34, 2, 37,
+ 438, 438, 3, 403, 441, 618, 5, 25, 24, 0,
+ 11, 0, 0, 0, 435, 0, 66, 0, 181, 50,
+ 419, 66, 0, 313, 0, 46, 295, 296, 300, 301,
+ 302, 303, 50, 47, 269, 271, 297, 299, 273, 272,
+ 0, 0, 66, 415, 0, 66, 614, 0, 0, 0,
+ 0, 0, 0, 0, 0, 290, 0, 386, 0, 361,
+ 0, 0, 0, 363, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 385, 379, 380, 381, 382, 400,
+ 342, 0, 289, 349, 67, 343, 360, 346, 345, 347,
+ 370, 348, 0, 0, 0, 0, 50, 0, 0, 619,
+ 0, 0, 0, 27, 0, 474, 72, 53, 0, 57,
+ 0, 51, 0, 75, 49, 617, 469, 426, 0, 183,
+ 0, 0, 433, 428, 0, 0, 68, 270, 390, 391,
+ 0, 298, 0, 0, 0, 427, 0, 428, 431, 66,
+ 333, 338, 340, 0, 401, 336, 335, 291, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 293, 292, 334, 0, 0, 0, 294, 0, 383, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 323, 321, 0, 372, 344,
+ 371, 0, 0, 0, 0, 0, 39, 38, 41, 40,
+ 284, 0, 438, 442, 21, 20, 18, 19, 15, 16,
+ 22, 30, 29, 482, 188, 54, 55, 58, 70, 59,
+ 77, 74, 76, 482, 0, 0, 258, 256, 0, 0,
+ 311, 0, 184, 186, 194, 192, 267, 268, 312, 306,
+ 305, 309, 304, 310, 101, 420, 0, 418, 0, 274,
+ 101, 69, 395, 393, 394, 392, 478, 0, 477, 453,
+ 416, 414, 425, 50, 37, 337, 0, 375, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 375, 373, 413, 694, 0, 531, 0, 94, 0, 0,
- 0, 117, 326, 0, 84, 83, 86, 85, 340, 512,
- 0, 0, 29, 37, 115, 0, 35, 0, 0, 532,
- 674, 678, 532, 316, 0, 0, 361, 360, 0, 231,
- 235, 241, 238, 0, 0, 555, 242, 101, 102, 106,
- 105, 119, 108, 126, 123, 125, 0, 124, 159, 482,
- 95, 82, 389, 0, 0, 0, 0, 422, 416, 418,
- 0, 439, 343, 0, 342, 450, 448, 449, 447, 370,
- 369, 371, 380, 378, 379, 377, 382, 372, 381, 384,
- 383, 368, 0, 0, 397, 414, 0, 0, 149, 0,
- 330, 149, 118, 149, 0, 341, 0, 18, 0, 108,
- 551, 0, 0, 564, 0, 546, 0, 0, 0, 528,
- 685, 691, 692, 690, 0, 679, 680, 0, 686, 527,
- 322, 0, 319, 321, 311, 310, 0, 256, 309, 331,
- 333, 332, 247, 334, 337, 336, 335, 240, 237, 252,
- 255, 250, 351, 0, 185, 243, 244, 103, 107, 242,
- 0, 97, 0, 150, 486, 160, 162, 0, 95, 408,
- 407, 405, 406, 0, 424, 412, 423, 421, 0, 417,
- 344, 0, 374, 530, 485, 124, 367, 124, 77, 339,
- 338, 45, 0, 52, 0, 0, 38, 42, 498, 0,
- 0, 0, 0, 0, 658, 34, 0, 0, 675, 0,
- 677, 0, 0, 315, 320, 317, 0, 313, 0, 0,
- 0, 242, 122, 205, 0, 0, 216, 0, 0, 0,
- 242, 190, 189, 192, 191, 194, 193, 242, 0, 109,
- 131, 0, 129, 132, 0, 0, 0, 146, 270, 0,
- 432, 425, 431, 0, 427, 420, 419, 0, 479, 88,
- 90, 59, 0, 60, 57, 0, 54, 53, 0, 0,
- 49, 0, 578, 0, 0, 501, 501, 0, 0, 0,
- 0, 688, 689, 649, 650, 586, 585, 552, 0, 581,
- 587, 588, 584, 604, 661, 611, 609, 646, 652, 687,
- 648, 0, 660, 0, 0, 0, 657, 547, 0, 533,
- 540, 0, 541, 0, 0, 0, 535, 681, 682, 683,
- 311, 260, 318, 258, 268, 257, 263, 270, 0, 188,
- 242, 0, 214, 0, 216, 210, 211, 409, 202, 213,
- 95, 197, 195, 198, 218, 242, 186, 0, 245, 124,
- 0, 127, 130, 0, 0, 151, 152, 158, 156, 157,
- 161, 163, 115, 115, 179, 176, 0, 0, 149, 242,
- 430, 0, 426, 376, 62, 61, 0, 63, 0, 39,
- 0, 58, 0, 0, 0, 0, 647, 0, 0, 0,
- 0, 0, 613, 616, 615, 614, 582, 579, 0, 612,
- 0, 0, 670, 659, 0, 561, 559, 676, 537, 538,
- 539, 543, 542, 0, 534, 0, 0, 0, 269, 0,
- 183, 206, 0, 0, 215, 212, 0, 0, 0, 242,
- 0, 222, 187, 207, 120, 111, 115, 110, 0, 133,
- 0, 0, 153, 173, 178, 181, 147, 180, 148, 177,
- 271, 391, 270, 0, 429, 428, 0, 0, 68, 64,
- 0, 65, 69, 70, 71, 55, 49, 56, 0, 0,
- 0, 43, 0, 598, 0, 0, 0, 0, 556, 0,
- 636, 580, 0, 0, 602, 624, 0, 645, 610, 619,
- 622, 643, 0, 671, 672, 562, 565, 0, 536, 684,
- 259, 267, 266, 265, 264, 248, 82, 270, 209, 410,
- 203, 270, 196, 443, 444, 199, 442, 0, 219, 242,
- 113, 0, 112, 0, 0, 134, 135, 154, 155, 174,
- 175, 164, 165, 0, 172, 170, 171, 0, 0, 433,
- 67, 66, 46, 40, 0, 0, 0, 0, 242, 589,
- 0, 0, 0, 591, 557, 0, 617, 583, 662, 667,
- 0, 0, 0, 0, 664, 0, 644, 620, 0, 651,
- 0, 565, 560, 544, 95, 182, 242, 217, 0, 0,
- 0, 0, 0, 224, 95, 208, 115, 145, 0, 138,
- 141, 142, 143, 140, 144, 128, 136, 166, 0, 0,
- 169, 275, 0, 0, 304, 305, 306, 307, 308, 0,
- 0, 0, 284, 0, 286, 0, 288, 0, 0, 0,
- 0, 0, 293, 294, 296, 0, 299, 0, 273, 301,
- 393, 0, 0, 0, 51, 50, 0, 599, 605, 661,
- 0, 661, 0, 590, 0, 637, 639, 640, 668, 666,
- 669, 0, 663, 592, 603, 0, 595, 0, 633, 623,
- 634, 628, 673, 563, 568, 566, 0, 204, 200, 0,
- 229, 228, 302, 226, 223, 225, 0, 114, 137, 139,
- 0, 0, 279, 277, 278, 276, 280, 281, 282, 283,
- 285, 287, 289, 0, 292, 291, 0, 0, 0, 272,
- 0, 75, 72, 41, 74, 48, 47, 44, 0, 0,
- 600, 661, 0, 0, 618, 665, 596, 593, 621, 626,
- 0, 625, 636, 569, 0, 149, 242, 227, 0, 220,
- 167, 168, 0, 0, 0, 0, 274, 0, 242, 606,
- 608, 601, 0, 641, 642, 594, 0, 0, 635, 629,
- 0, 0, 201, 303, 242, 290, 295, 0, 0, 300,
- 0, 0, 638, 597, 634, 640, 570, 270, 221, 0,
- 0, 73, 607, 627, 630, 0, 572, 184, 298, 297,
- 653, 0, 0, 567, 631, 654, 655, 0, 0, 661,
- 656, 571, 576, 0, 574, 632, 577, 0, 573, 575
+ 0, 0, 384, 287, 0, 286, 318, 317, 319, 328,
+ 326, 327, 325, 330, 320, 329, 332, 331, 315, 316,
+ 0, 0, 373, 0, 613, 0, 455, 0, 101, 0,
+ 285, 0, 0, 0, 28, 0, 0, 137, 189, 190,
+ 56, 188, 0, 52, 0, 0, 0, 456, 593, 597,
+ 456, 260, 0, 0, 308, 307, 182, 185, 0, 0,
+ 0, 75, 111, 101, 314, 75, 479, 0, 50, 354,
+ 378, 0, 366, 353, 0, 0, 358, 356, 359, 0,
+ 357, 351, 0, 0, 0, 350, 288, 0, 322, 374,
+ 0, 0, 32, 283, 282, 17, 475, 0, 0, 488,
+ 73, 156, 0, 0, 167, 0, 0, 0, 188, 141,
+ 140, 143, 142, 145, 144, 188, 0, 60, 82, 83,
+ 0, 80, 84, 470, 0, 0, 0, 452, 604, 610,
+ 611, 609, 0, 598, 599, 0, 605, 451, 266, 0,
+ 263, 265, 255, 254, 0, 200, 253, 275, 277, 276,
+ 187, 195, 197, 193, 102, 43, 112, 114, 75, 45,
+ 0, 0, 377, 376, 0, 362, 364, 0, 0, 0,
+ 0, 454, 428, 0, 0, 0, 0, 0, 577, 188,
+ 0, 165, 0, 167, 161, 162, 0, 153, 278, 281,
+ 280, 279, 164, 50, 148, 146, 149, 169, 188, 138,
+ 0, 191, 75, 0, 78, 81, 0, 0, 594, 0,
+ 596, 0, 0, 259, 264, 261, 0, 257, 0, 0,
+ 0, 0, 0, 0, 98, 429, 214, 101, 0, 352,
+ 0, 367, 355, 324, 422, 0, 502, 0, 438, 0,
+ 0, 0, 0, 607, 608, 568, 569, 510, 509, 476,
+ 0, 505, 508, 523, 580, 530, 528, 565, 571, 606,
+ 567, 0, 579, 0, 0, 0, 576, 135, 157, 0,
+ 0, 166, 163, 369, 0, 0, 188, 0, 173, 139,
+ 158, 71, 62, 66, 61, 0, 85, 471, 0, 457,
+ 464, 0, 465, 0, 0, 0, 459, 600, 601, 602,
+ 255, 204, 262, 202, 212, 201, 207, 214, 199, 0,
+ 0, 103, 104, 110, 108, 109, 113, 115, 66, 66,
+ 131, 128, 0, 339, 0, 0, 0, 566, 0, 0,
+ 0, 532, 535, 534, 533, 506, 503, 0, 531, 0,
+ 0, 589, 578, 0, 485, 483, 37, 214, 160, 154,
+ 214, 147, 388, 389, 150, 387, 0, 170, 188, 64,
+ 0, 63, 0, 0, 86, 87, 595, 461, 462, 463,
+ 467, 466, 0, 458, 0, 0, 0, 213, 0, 0,
+ 105, 125, 130, 133, 99, 132, 100, 129, 215, 214,
+ 365, 368, 517, 0, 0, 0, 480, 0, 555, 504,
+ 0, 0, 521, 543, 0, 564, 529, 538, 541, 562,
+ 0, 590, 591, 486, 489, 50, 134, 188, 168, 0,
+ 0, 0, 0, 0, 175, 50, 159, 66, 97, 0,
+ 90, 93, 94, 95, 92, 96, 79, 88, 0, 460,
+ 603, 203, 211, 210, 209, 208, 106, 107, 126, 127,
+ 116, 117, 0, 124, 122, 123, 0, 341, 0, 0,
+ 0, 481, 0, 536, 507, 581, 586, 0, 0, 0,
+ 0, 583, 0, 563, 539, 0, 570, 0, 489, 484,
+ 0, 155, 151, 0, 180, 179, 246, 177, 174, 176,
+ 0, 65, 89, 91, 468, 118, 0, 0, 121, 219,
+ 0, 0, 248, 249, 250, 251, 252, 0, 0, 0,
+ 228, 0, 230, 0, 232, 0, 0, 0, 0, 0,
+ 237, 238, 240, 0, 243, 0, 217, 245, 518, 524,
+ 580, 0, 580, 0, 0, 556, 558, 559, 587, 585,
+ 588, 0, 582, 511, 522, 0, 514, 0, 552, 542,
+ 553, 547, 592, 487, 492, 490, 101, 188, 178, 0,
+ 171, 0, 0, 223, 221, 222, 220, 224, 225, 226,
+ 227, 229, 231, 233, 0, 236, 235, 0, 0, 0,
+ 216, 0, 0, 0, 519, 580, 0, 0, 537, 584,
+ 515, 512, 540, 545, 0, 544, 555, 493, 0, 0,
+ 152, 247, 188, 119, 120, 0, 0, 0, 0, 218,
+ 0, 525, 527, 520, 0, 560, 561, 513, 0, 0,
+ 554, 548, 0, 214, 172, 234, 239, 0, 0, 244,
+ 0, 557, 516, 553, 559, 494, 136, 0, 0, 526,
+ 546, 549, 0, 496, 242, 241, 572, 0, 0, 491,
+ 550, 573, 574, 0, 0, 580, 575, 495, 500, 0,
+ 498, 551, 501, 0, 497, 499
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 3, 88, 5, 6, 50, 107, 249, 250, 51,
- 108, 156, 20, 259, 157, 256, 458, 546, 816, 981,
- 620, 898, 547, 735, 615, 616, 617, 612, 726, 810,
- 1053, 1088, 89, 147, 770, 238, 239, 365, 91, 141,
- 92, 142, 232, 93, 140, 178, 301, 302, 303, 304,
- 511, 700, 787, 788, 132, 133, 451, 305, 509, 396,
- 306, 404, 405, 512, 789, 591, 592, 874, 875, 876,
- 938, 939, 407, 408, 594, 705, 706, 516, 595, 597,
- 793, 881, 882, 883, 798, 714, 796, 715, 771, 856,
- 772, 580, 581, 779, 582, 780, 928, 1076, 583, 777,
- 926, 584, 680, 869, 585, 684, 689, 690, 586, 781,
- 934, 1104, 868, 932, 933, 123, 168, 271, 272, 273,
- 504, 505, 274, 388, 569, 506, 394, 393, 499, 486,
- 568, 766, 675, 676, 717, 887, 977, 978, 1021, 979,
- 487, 276, 385, 384, 567, 481, 677, 277, 233, 234,
- 488, 492, 366, 367, 208, 209, 210, 211, 212, 213,
- 279, 280, 359, 419, 443, 442, 410, 411, 352, 215,
- 709, 776, 216, 417, 444, 327, 420, 525, 526, 603,
- 604, 719, 217, 218, 219, 865, 335, 336, 220, 78,
- 221, 21, 22, 23, 24, 129, 25, 175, 26, 121,
- 27, 165, 28, 138, 29, 30, 31, 32, 179, 69,
- 63, 126, 150, 81, 257, 70, 59, 33, 34, 64,
- 35, 71, 170, 36, 37, 38, 153, 39, 40, 41,
- 42, 43, 469, 665, 666, 762, 44, 260, 556, 60,
- 45, 258, 549, 46, 635, 636, 375, 846, 921, 922,
- 1015, 1074, 1126, 1133, 1143, 1144, 637, 638, 832, 639,
- 640, 641, 1004, 1005, 1096, 642, 900, 915, 987, 1111,
- 988, 643, 751, 644, 645, 830, 997, 838, 1007, 839,
- 918, 1009, 1097, 1010, 1072, 1115, 1130, 1139, 1071, 906,
- 1064, 840, 646, 647, 1134, 1135, 463, 653, 750, 913,
- 914, 842, 843, 379, 380, 382, 474, 475, 476, 668,
- 477, 648, 649, 650, 151, 83, 104
+ -1, 3, 21, 5, 6, 50, 99, 298, 299, 51,
+ 100, 193, 22, 89, 637, 186, 187, 287, 24, 64,
+ 25, 68, 122, 26, 53, 336, 201, 202, 413, 573,
+ 654, 655, 75, 76, 340, 203, 411, 304, 204, 311,
+ 312, 414, 656, 490, 491, 733, 734, 735, 799, 800,
+ 431, 432, 591, 681, 682, 527, 592, 594, 751, 820,
+ 821, 822, 756, 690, 754, 691, 638, 716, 639, 478,
+ 479, 646, 480, 647, 789, 927, 481, 644, 787, 482,
+ 549, 728, 483, 553, 562, 563, 484, 648, 795, 972,
+ 727, 793, 794, 109, 209, 321, 322, 407, 408, 409,
+ 429, 428, 521, 514, 588, 745, 675, 676, 693, 826,
+ 895, 896, 855, 897, 515, 324, 423, 422, 587, 509,
+ 677, 325, 123, 124, 516, 557, 288, 289, 170, 171,
+ 172, 173, 126, 127, 327, 328, 214, 357, 391, 390,
+ 353, 354, 175, 242, 246, 176, 685, 279, 280, 358,
+ 177, 178, 179, 724, 220, 221, 180, 82, 181, 27,
+ 28, 29, 134, 30, 226, 31, 112, 32, 211, 33,
+ 185, 34, 35, 36, 37, 337, 73, 67, 55, 74,
+ 62, 38, 190, 39, 40, 41, 42, 43, 497, 665,
+ 666, 741, 44, 313, 576, 63, 45, 303, 543, 46,
+ 617, 618, 405, 784, 848, 849, 925, 968, 1013, 1019,
+ 1029, 1030, 619, 620, 770, 621, 914, 915, 988, 622,
+ 828, 842, 898, 1000, 899, 623, 710, 624, 625, 768,
+ 907, 776, 917, 777, 845, 919, 989, 920, 966, 1004,
+ 1016, 1025, 965, 833, 958, 778, 626, 627, 1020, 1021,
+ 469, 633, 709, 840, 841, 780, 781, 417, 418, 420,
+ 502, 503, 504, 668, 505, 628, 629, 630, 56, 57,
+ 96
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -1049
+#define YYPACT_NINF -942
static const yytype_int16 yypact[] =
{
- 51, -1049, -80, 152, -1049, 2453, 103, -1049, -1049, 64,
- 76, 373, -1049, 38, 76, 252, 76, 366, 187, -1049,
- 236, 673, -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049,
- -1049, -1049, -1049, 25, -1049, -1049, -1049, 76, 53, -1049,
- -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049, 56, -1049,
- -1049, -1049, 114, -1049, 260, -1049, -1049, 165, 134, 129,
- 284, 212, 129, -1049, 351, 659, 546, -1049, -1049, -1049,
- 129, 351, -1049, 86, -1049, -1049, -1049, -1049, -1049, 257,
- 316, -1049, -1049, -1049, -1049, -1049, -1049, 131, 283, -1049,
- -1049, -1049, -1049, -1049, 76, 38, 76, 252, -1049, -1049,
- -1049, 224, 308, -1049, -1049, -1049, -1049, 318, 383, 460,
- -1049, -1049, -1049, -1049, -1049, 654, 460, -1049, 460, -1049,
- -1049, 351, -1049, 426, 439, 5, -1049, 500, -1049, 351,
- -1049, 406, 546, 2626, 400, 460, 471, 535, 531, -1049,
- -1049, 351, 375, -1049, -1049, -1049, -1049, -1049, 254, -1049,
- 462, -1049, -1049, 307, 605, 49, -1049, 15, 574, -1049,
- -1049, -1049, -1049, -1049, -16, 351, -1049, 214, 1408, 351,
- 406, -1049, 329, 460, 460, 351, 214, -1049, 388, -1049,
- 129, 2626, 2216, 584, 2626, 2626, 600, 615, -1049, 640,
- -1049, 644, 648, 654, 660, 661, 2626, 665, -1049, 146,
- -1049, -1049, -1049, 57, -1049, -1049, -1049, -1049, -1049, 2267,
- -1049, 67, -1049, -1049, 3290, -1049, -1049, -1049, -1049, -1049,
- -1049, -1049, 595, 530, 460, -1049, 351, 388, -1049, -1049,
- 2626, -1049, -1049, 305, -1049, 67, -1049, -1049, -1049, 2447,
- 224, -1049, 380, 76, -1049, -1049, -1049, -1049, -1049, 674,
- -1049, -1049, -1049, 516, 654, 129, -1049, -1049, -1049, 656,
- -1049, 620, 678, -1049, -1049, 666, 584, 185, 185, -1049,
- -1049, 676, 691, 1408, -1049, -1049, -1049, -1049, 67, -1049,
- -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049,
- -1049, 460, -1049, -1049, -1049, -1049, -1049, 624, 4, 627,
- 711, -1049, 654, -1049, -1049, 686, 657, -1049, 1909, -1049,
- -1049, 2551, -1049, -1049, -1049, -1049, 532, 2626, 2626, 2626,
- -1049, -1049, -1049, 1909, -1049, 2606, -1049, -1049, 654, -1049,
- 707, 2626, 2906, -1049, -1049, 44, -1049, 2626, 2626, 2626,
- 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 2626, 562,
- -1049, -1049, 146, -1049, 641, -1049, 667, -1049, 388, 2626,
- 2952, 388, -1049, 388, -1049, -1049, 744, 2626, 2981, -1049,
- 410, 605, -1049, -1049, -1049, 52, -1049, 77, 581, 85,
- -1049, 9, 649, -1049, 2078, 413, -1049, -1049, 432, -1049,
- 1408, -1049, -1049, 1135, 413, -1049, 1959, -1049, 668, 684,
- -1049, -1049, 680, -1049, -1049, -1049, 716, 686, 689, -1049,
- -1049, -1049, -1049, 611, 3010, 3039, 3068, 172, -1049, 3290,
- 357, -1049, -1049, 3097, -1049, -1049, -1049, -1049, -1049, 1909,
- 1519, 2060, 1028, 1028, 1028, 1028, 393, 2060, 393, -1049,
- -1049, -1049, 749, 2626, -1049, -1049, 460, 351, 657, 3129,
- -1049, 657, -1049, 657, 2626, 3290, 2626, -1049, 371, 680,
- -1049, 75, 46, -1049, 70, -1049, 678, 620, 754, -1049,
- -1049, -1049, -1049, -1049, 750, 778, -1049, 209, -1049, -1049,
- -1049, 1995, -1049, -1049, 2713, -1049, 402, -1049, -1049, 67,
- -1049, -1049, -1049, 67, -1049, -1049, -1049, -1049, -1049, -1049,
- 762, 762, 785, 773, 578, -1049, 790, -1049, -1049, 1959,
- 798, -1049, 663, -1049, -1049, -1049, 710, 388, -1049, -1049,
- -1049, -1049, -1049, 2427, -1049, -1049, -1049, -1049, 1703, -1049,
- -1049, 2626, 771, -1049, 214, 686, -1049, 686, -1049, 3290,
- 3290, -1049, 639, 646, 760, 639, -1049, -1049, -1049, 2164,
- 60, 786, 797, 683, -1049, -1049, 2164, 727, -1049, 536,
- -1049, 9, 209, -1049, -1049, -1049, 263, -1049, 1826, 835,
- 344, 1959, -1049, -1049, 1569, 432, -1049, 374, 763, 460,
- 1741, -1049, -1049, -1049, 702, -1049, -1049, 2027, 832, -1049,
- -1049, 59, -1049, -1049, 1510, 2626, 815, 1, 755, 388,
- -1049, -1049, 3290, 446, -1049, -1049, 3290, 517, -1049, -1049,
- -1049, -1049, 149, -1049, 850, 837, 854, 698, 856, 857,
- 787, 860, -1049, 791, 329, 76, 76, 1198, 1198, 1198,
- 1198, -1049, -1049, -1049, -1049, -1049, -1049, -1049, 422, -1049,
- -1049, -1049, -1049, -1049, 401, -1049, -1049, -1049, -1049, -1049,
- 866, 722, -1049, 855, 717, 720, -1049, -1049, 209, -1049,
- -1049, 460, -1049, 161, 726, 130, -1049, -1049, -1049, 804,
- 2795, -1049, -1049, -1049, -1049, 886, -1049, 755, 2027, -1049,
- 1940, 2626, -1049, 838, -1049, -1049, -1049, -1049, -1049, -1049,
- -1049, -1049, -1049, -1049, -1049, 1959, -1049, 890, -1049, 686,
- 37, -1049, -1049, 2626, 2626, 1510, -1049, 67, -1049, -1049,
- 3290, -1049, -1049, -1049, 803, 823, 892, 891, 657, 1959,
- -1049, 1469, -1049, -1049, -1049, -1049, 1172, -1049, 743, -1049,
- 745, -1049, 639, 639, 902, 906, -1049, 841, 35, 460,
- 840, 225, -1049, -1049, -1049, -1049, 903, -1049, 909, -1049,
- 917, 249, 652, -1049, 758, -1049, -1049, -1049, -1049, -1049,
- -1049, -1049, 792, 515, -1049, 834, 1826, 1771, -1049, 922,
- -1049, -1049, 927, 3155, -1049, -1049, 146, 938, 388, 1940,
- 95, 937, -1049, -1049, -1049, -1049, -1049, -1049, 328, 939,
- 3181, 3206, -1049, 1798, -1049, -1049, -1049, -1049, -1049, -1049,
- -1049, -1049, 755, 931, -1049, -1049, 185, 185, -1049, -1049,
- 934, -1049, -1049, -1049, -1049, -1049, 787, -1049, 149, 149,
- 646, -1049, 460, -1049, 843, 809, 879, 872, -1049, 460,
- 915, -1049, 2684, 235, -1049, -1049, 949, -1049, 951, -1049,
- -1049, -1049, 954, 970, -1049, -1049, -1049, 816, -1049, -1049,
- 886, -1049, -1049, -1049, -1049, -1049, -1049, 755, -1049, -1049,
- -1049, 755, -1049, -1049, -1049, -1049, -1049, 88, -1049, 1940,
- -1049, 814, -1049, 802, 969, 939, -1049, -1049, -1049, -1049,
- -1049, 858, -1049, 42, 67, -1049, -1049, 3221, 971, -1049,
- -1049, -1049, -1049, -1049, 1172, 1172, 335, 29, 1959, -1049,
- 1046, 460, 870, 460, -1049, 767, -1049, -1049, -1049, -1049,
- 836, 932, 824, 435, -1049, 2712, -1049, -1049, 929, -1049,
- 652, -1049, 871, -1049, -1049, -1049, 1940, -1049, 988, 839,
- 81, 605, 117, -1049, -1049, -1049, -1049, -1049, 505, -1049,
- -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049, 2626, 2626,
- -1049, -1049, 547, 532, -1049, -1049, -1049, -1049, -1049, 532,
- 2626, 844, -1049, 842, -1049, 846, -1049, 532, 989, 2626,
- 2626, 994, -1049, -1049, -1049, 996, -1049, 445, -1049, 997,
- -1049, 1652, 991, 992, -1049, -1049, 998, -1049, -1049, 401,
- 1287, 918, 460, -1049, 1008, -1049, -1049, 946, -1049, -1049,
- -1049, 492, -1049, -1049, -1049, 457, -1049, 249, -1049, 1026,
- 1004, -1049, -1049, 871, 893, -1049, 388, -1049, -1049, 605,
- -1049, 1035, 67, 674, -1049, -1049, 96, -1049, -1049, -1049,
- 3239, 3265, -1049, -1049, -1049, -1049, 67, 67, 3290, -1049,
- -1049, -1049, 67, 532, 3290, 3290, 532, 669, 3221, -1049,
- 2626, -1049, -1049, -1049, 3290, -1049, -1049, -1049, 1034, 929,
- -1049, 918, 888, 533, -1049, -1049, 1027, -1049, -1049, -1049,
- 460, -1049, 915, -1049, 972, 657, 1940, 674, 532, -1049,
- -1049, -1049, 478, 489, 1030, 719, -1049, 573, 1959, -1049,
- -1049, -1049, 1036, -1049, -1049, -1049, 2783, 929, -1049, -1049,
- 652, 1039, -1049, 67, 1940, -1049, -1049, 1031, 1033, -1049,
- 1041, 2712, -1049, -1049, 1004, 946, 968, 755, -1049, 532,
- 532, -1049, -1049, -1049, -1049, 1054, 967, -1049, 67, 67,
- 923, 652, 1058, -1049, -1049, 923, -1049, 511, 904, 918,
- -1049, -1049, 912, 541, -1049, -1049, -1049, 904, -1049, -1049
+ 56, -942, -45, 120, -942, 1867, 180, -942, 23, -942,
+ 1042, 285, -942, 106, -942, 1, 219, -942, -23, 62,
+ 173, 65, -942, -942, -942, -942, -942, 1087, -942, -942,
+ -942, -942, -942, -942, -942, -942, -942, -942, 25, -942,
+ -942, -942, -942, -942, -942, -942, -942, -942, 31, -942,
+ -942, -942, 103, -942, 113, -942, -942, -942, -942, -942,
+ 150, -942, 221, 250, 291, 273, 221, -942, 205, 332,
+ 364, -942, -942, -942, 221, 364, 2533, 60, -942, -942,
+ -942, -942, -942, 231, -942, -942, -942, -942, -942, -942,
+ 1, 1, -942, -942, 209, -942, -942, -942, -942, 198,
+ 323, 77, 245, 400, -942, 77, -942, 77, -942, -942,
+ -942, -942, 291, -942, 2533, -942, -942, -942, -942, -942,
+ -942, -942, -942, 908, -942, 240, -942, -942, -942, -942,
+ -14, 405, -942, -942, 291, -942, 221, 2533, 1853, 427,
+ 2533, 2533, 447, 453, 457, -942, 468, -942, 469, -942,
+ 472, 474, 487, -942, 489, 502, 504, 513, 514, 2533,
+ 523, 526, 529, 533, -942, -942, -942, -942, 33, -942,
+ -942, 2023, -942, 240, 3672, -942, -942, -942, -942, -942,
+ 37, -942, 380, 77, 365, 507, -942, 2193, 221, -942,
+ 282, 681, 36, -942, 539, -942, -942, 471, 499, 481,
+ 548, -942, 357, 541, -942, -942, -942, -942, 146, 1683,
+ 245, 291, -942, 294, 2533, 2143, 245, -942, -942, -942,
+ 27, -942, 4, 77, 77, -942, 291, 294, -942, -942,
+ 2662, -942, -942, 2313, -942, -942, -942, -942, 634, 2533,
+ 2533, 2533, 561, 2533, 2533, 2533, 574, 2533, 2533, 2533,
+ -942, -942, 2662, 2533, 2533, 2533, -942, 357, -942, 571,
+ 2533, 2483, 2533, 2533, 2533, 2533, 2533, 2533, 2533, 2533,
+ 2533, 2533, 2533, 2533, 174, -942, -942, 2363, -942, -942,
+ -942, 575, 439, 77, 291, 245, -942, -942, 598, 2533,
+ 861, 140, 1, -942, -942, -942, -942, -942, 603, -942,
+ -942, -942, 444, -942, 1683, -942, 530, -942, -942, 522,
+ -942, -942, -942, -942, 564, 624, 617, 427, 475, 475,
+ -942, 619, 637, -942, -942, -942, 240, -942, -942, -942,
+ -942, -942, -942, -942, 583, -942, 245, -942, 2968, -942,
+ 583, -942, -942, -942, -942, -942, -942, 77, -942, -942,
+ -942, -942, -942, -942, -942, -942, 478, 3672, 318, 3004,
+ 3064, 2533, 3082, 3100, 3118, 2533, 3178, 3196, 3218, 3263,
+ 3285, 3303, -942, -942, 3330, -942, 2662, 2627, 2794, 1175,
+ 1175, 1175, 1175, 147, 2794, 147, -942, -942, -942, -942,
+ 636, 2533, -942, 319, -942, 563, -942, 591, 583, 2533,
+ 3672, 2533, 157, 681, -942, 85, 642, 431, -942, 658,
+ -942, 1683, 653, -942, 949, 88, 496, 39, -942, -21,
+ 576, -942, 1683, 665, -942, -942, -942, 1683, 1316, 665,
+ 638, 541, 611, 583, -942, 541, -942, 245, -942, -942,
+ -942, 1502, -942, -942, 2533, 3363, -942, -942, -942, 3390,
+ -942, -942, 2533, 2533, 2533, -942, -942, 2533, 1978, -942,
+ 77, 291, -942, 3672, 3672, -942, -942, -25, 24, -942,
+ -942, -942, 2837, 895, -942, 234, 592, 77, 1547, -942,
+ -942, -942, 536, -942, -942, 1683, 661, -942, -942, -942,
+ 105, -942, -942, -942, 624, 564, 669, -942, -942, -942,
+ -942, -942, 662, 682, -942, -10, -942, -942, -942, 1596,
+ -942, -942, 1264, -942, 387, -942, -942, 240, -942, -942,
+ -942, -942, 664, 677, -942, -942, -942, 607, 541, -942,
+ 692, 245, -942, 3672, 3416, -942, -942, 3438, 1806, 3464,
+ 497, -942, 294, 800, 26, 685, 686, 555, -942, 1633,
+ 2533, -942, 667, -942, -942, -942, 37, -942, 240, -942,
+ -942, -942, -942, -942, -942, -942, -942, -942, 1683, -942,
+ 707, -942, 541, 15, -942, -942, 800, 614, -942, 551,
+ -942, -21, -10, -942, -942, -942, 527, -942, 1132, 1512,
+ 621, 2718, 2533, 689, 28, -942, 627, 583, 2533, -942,
+ 2533, -942, -942, -942, -942, 706, -942, 4, 1, 1297,
+ 1297, 1297, 1297, -942, -942, -942, -942, -942, -942, -942,
+ 228, -942, -942, -942, 185, -942, -942, -942, -942, -942,
+ 716, 570, -942, 704, 565, 566, -942, -942, -942, 717,
+ 3491, -942, -942, -942, 725, 245, 1633, 57, 730, -942,
+ -942, -942, -942, -942, -942, 307, 731, -942, -10, -942,
+ -942, 77, -942, 299, 585, 309, -942, -942, -942, 655,
+ 1324, -942, -942, -942, -942, 742, -942, 627, 734, 2533,
+ 2533, 2718, -942, 240, -942, -942, 3672, -942, -942, -942,
+ 656, 680, 745, -942, 743, 3518, 3544, -942, 19, 77,
+ 284, -942, -942, -942, -942, 747, -942, 750, -942, 754,
+ 94, 408, -942, 595, -942, -942, -942, 627, -942, -942,
+ 627, -942, -942, -942, -942, -942, -6, -942, 1633, -942,
+ 608, -942, 348, 753, 731, -942, -942, -942, -942, -942,
+ -942, 630, 549, -942, 683, 1132, 1086, -942, 3566, 3592,
+ -942, 2889, -942, -942, -942, -942, -942, -942, -942, 627,
+ -942, -942, -942, 654, 641, 694, -942, 77, 735, -942,
+ 2561, 326, -942, -942, 760, -942, 771, -942, -942, -942,
+ 762, 789, -942, -942, -942, -942, -942, 1633, -942, 785,
+ 635, 253, 681, 22, -942, -942, -942, -942, -942, 835,
+ -942, -942, -942, -942, -942, -942, -942, -942, 640, -942,
+ -942, 742, -942, -942, -942, -942, -942, -942, -942, -942,
+ 2700, -942, 49, 240, -942, -942, 3634, -942, 2306, 77,
+ 695, -942, 596, -942, -942, -942, -942, 660, 755, 645,
+ 314, -942, 1966, -942, -942, 320, -942, 408, -942, 668,
+ 245, -942, -942, 681, -942, 807, 240, 603, -942, -942,
+ 63, -942, -942, -942, -942, -942, 2533, 2533, -942, -942,
+ 448, 634, -942, -942, -942, -942, -942, 634, 2533, 659,
+ -942, 670, -942, 673, -942, 634, 809, 2533, 2533, 812,
+ -942, -942, -942, 813, -942, 374, -942, 832, -942, -942,
+ 185, 546, 746, 77, 842, -942, -942, 780, -942, -942,
+ -942, 35, -942, -942, -942, 301, -942, 94, -942, 857,
+ 839, -942, -942, 668, 719, -942, 583, 1633, 603, 634,
+ -942, 3619, 3646, -942, -942, -942, -942, 240, 240, 3672,
+ -942, -942, -942, 240, 634, 3672, 3672, 634, 483, 3634,
+ -942, 2533, 872, 320, -942, 746, 724, 377, -942, -942,
+ 867, -942, -942, -942, 77, -942, 735, -942, 806, 871,
+ -942, 240, 1633, -942, -942, 376, 392, 873, 586, -942,
+ 503, -942, -942, -942, 877, -942, -942, -942, 2136, 320,
+ -942, -942, 408, 627, -942, -942, -942, 864, 870, -942,
+ 1966, -942, -942, 839, 780, 804, -942, 634, 634, -942,
+ -942, -942, 888, 803, 240, 240, 765, 408, 899, -942,
+ -942, 765, -942, 409, 740, 746, -942, -942, 757, 423,
+ -942, -942, -942, 740, -942, -942
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -1049, -1049, -1049, -1049, -1049, -1049, -1049, -852, 706, -1049,
- -1049, -1049, -1049, -1049, 709, -1049, -1049, -1049, -1049, -1049,
- -1049, -1049, -1049, 267, -1049, 266, 268, -497, -288, -328,
- -1049, -1049, -1049, -1049, 31, -406, -1049, -1049, -1049, -1049,
- -1049, -1049, -1049, -1049, -1049, -121, -1049, -1049, -1049, -1049,
- 630, -1049, -1049, -1049, -74, -1049, -1049, -357, -1049, -1049,
- -226, -360, -1049, -1049, -1049, -1049, 504, -1049, -1049, 223,
- -1049, 162, -441, -1049, -1049, -1049, 396, -1049, -1049, -1049,
- -1049, -1049, 221, -1049, -1049, 390, -1049, 397, -761, -1049,
- -393, -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049,
- -1049, -1049, -1049, -1049, -1049, -1049, 429, -1049, -1049, -1049,
- -1049, -1049, -1049, -1049, 178, -41, -1049, -1049, -1049, -1049,
- 527, 437, -209, -1049, -1049, -129, -1049, -1049, -1049, 243,
- -1049, -1049, 352, 350, -666, -1049, -1049, 71, -896, -1049,
- 84, -362, -1049, -1049, -1049, -1049, -310, -359, -1049, 887,
- -1049, 549, -1049, -1049, -1049, -1049, -1049, -87, -152, -1049,
- -1049, -118, -1049, 1061, -1049, -1049, -1049, -1049, -1049, -545,
- -559, -1049, 113, -1049, -1049, -336, -527, -1049, -1049, -1049,
- 404, -1049, 356, 603, 342, -1049, -1049, -1049, -17, -1049,
- 78, -1049, 1106, -1049, -1049, -1049, -1049, -1049, -1049, -1049,
- -1049, -1049, -1049, -1049, -1049, -1049, -1049, -1049, -144, 1062,
- 1068, 1076, 894, -1049, -1049, 999, 17, -1049, -1049, -1049,
- -1049, -1049, -1049, -1049, -1049, -1049, -1049, 979, -1049, -1049,
- -1049, -1049, 751, -1049, 376, -1049, -1049, -1049, -1049, -37,
- -1049, -1049, -1049, -1049, 62, -1049, 877, -1049, -1049, 217,
- -1049, -1049, -1049, -1049, -1049, -6, 586, -1049, -1049, 311,
- -1049, -1049, 33, -1049, -1049, -871, -1049, -1049, -1049, -1049,
- -1049, -1049, -1049, 247, -627, -1049, -1049, -1049, -1049, 141,
- -1049, -1049, -1049, -976, -1049, -1049, -1049, -1049, 36, 79,
- 40, 166, -858, -592, -1049, -1049, -1048, -1049, -921, -1049,
- 156, -1049, 30, -1049, 693, 701, -1049, -1049, 607, 506,
- -1049, -731, -340, -4, 16, -45, -1049
+ -942, -942, -942, -942, -942, -942, -942, -708, 519, -942,
+ -942, -942, -942, -942, 38, -348, -942, -942, -942, -942,
+ -942, -942, -942, -942, -942, -50, -942, -942, -942, -942,
+ -942, -942, -44, -942, -942, -281, -942, -942, -201, -314,
+ -942, -942, -942, -942, 433, -942, -942, 183, -942, 127,
+ -329, -942, -942, -942, 247, -942, -942, -942, -942, -942,
+ 110, -942, -942, 241, -942, 243, -625, -942, -271, -942,
+ -942, -942, -942, -942, -942, -942, -942, -942, -942, -942,
+ -942, -942, -942, -942, 381, -942, -942, -942, -942, -942,
+ -942, -942, 145, -98, -942, -942, -942, 458, -942, -182,
+ -942, -942, -942, 7, -942, -942, 197, 199, -659, -942,
+ -942, -2, -545, -942, -118, -393, -942, -942, -942, -942,
+ -375, -391, -942, 825, -942, -942, -942, -942, -942, -942,
+ -942, -8, -186, -942, -942, -42, -942, 770, -942, -942,
+ -942, -942, -459, -942, -942, -942, -453, -942, 394, -275,
+ 440, 633, -112, -942, -942, -942, -18, -942, -127, -942,
+ 924, -942, -942, -942, -942, -942, -942, -942, -942, -942,
+ -942, -942, -942, -942, -942, -210, 882, 890, 937, 893,
+ -5, -942, -942, 775, -942, -942, -942, -942, 552, -942,
+ 232, -942, -942, -942, -942, -53, -942, -942, -942, -942,
+ 29, -942, 672, -942, -942, 125, -942, -942, -942, -942,
+ -942, -58, 402, -942, -942, 216, -13, -942, -942, -798,
+ -942, -942, -942, -942, -942, -942, -942, 160, -594, -942,
+ -942, -942, -942, 73, -942, -942, -942, -883, -942, -942,
+ -942, -942, -12, 40, 3, 91, -790, -587, -942, -942,
+ -941, -942, -846, -942, 82, -942, 5, -942, 510, 500,
+ -942, -942, 428, 354, -942, -691, -341, -11, -3, -61,
+ -942
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -496
+#define YYTABLE_NINF -435
static const yytype_int16 yytable[] =
{
- 77, 357, 251, 503, 607, 518, 453, 535, 139, 114,
- 537, 768, 538, 79, 117, 686, 445, 749, 862, 227,
- 114, 844, 480, 264, 236, 483, 288, 54, 127, 685,
- 131, 65, 295, 72, 82, 742, 743, 744, 745, 275,
- 160, 478, 990, 163, 1006, 425, 166, 514, 619, 708,
- 252, 90, 1, 985, 101, 235, 177, 105, 948, 949,
- 1011, 785, 553, 102, 391, 328, 460, 47, 1058, 823,
- 1060, 254, 398, 701, 482, 4, 651, 241, 120, 1023,
- 167, 278, 1136, 1090, 470, 712, 130, 1140, 176, 333,
- 61, 465, 77, 555, 467, 172, 334, 289, 161, 77,
- 228, 77, 134, 114, 713, 159, 62, 358, 935, 1020,
- 1079, 361, 162, 148, 164, 236, 588, 363, 77, 480,
- 461, 1114, 483, 863, 263, 237, 254, 291, 287, 173,
- 135, 223, 448, 261, 294, 452, 888, 562, 471, 763,
- 1091, 1024, 48, 929, 392, 461, 235, 1082, 262, 864,
- 1083, 285, 7, 399, 764, 77, 77, 77, 49, 841,
- 708, 472, 325, 930, 297, 1017, 255, 1077, 290, 292,
- 293, 564, 929, 52, 996, 609, 320, 610, 679, 724,
- 100, 497, 143, 473, 824, 356, 278, 696, 523, 1012,
- 468, 925, 930, 144, 298, 927, 307, 53, 550, 80,
- 731, 1011, 462, 950, 786, 2, 480, 77, 103, 483,
- 554, 426, 427, 310, 428, 47, 237, 253, 1145, 251,
- 355, 478, 669, 329, 652, 1113, 106, 462, -95, 413,
- 590, 206, 207, 409, 886, 818, 819, 373, 109, 1011,
- 1006, 145, 718, 326, -495, 299, 286, 115, 885, 551,
- 835, 552, 205, 206, 207, 931, 285, 80, 116, 908,
- 370, 498, 74, 75, 670, 76, 836, 490, 229, 524,
- 494, 374, 84, 671, 77, 490, 490, 802, 149, 837,
- 62, 281, -95, 85, 931, 402, 110, 395, 672, 517,
- 471, 598, 110, 485, 80, 80, 86, 278, 489, 909,
- 459, 493, 782, 278, 66, 158, 489, 489, 111, 278,
- 229, 421, -95, 472, 111, 1102, 74, 75, 669, 76,
- 725, 230, 886, 760, 80, 759, 803, 67, 118, 158,
- 80, 68, 1094, 127, 827, 473, 885, 871, 471, 784,
- 9, 910, 124, 1118, 730, 670, 200, 201, 202, 229,
- 112, 286, 872, 242, 671, 87, 112, 911, 527, 984,
- 593, 472, 749, -95, -95, 122, 528, 285, 491, 1116,
- 243, 495, 541, 285, 485, 691, 491, 491, 471, 285,
- 229, 529, 136, 473, 912, 542, 281, 543, 692, 137,
- 608, 230, 74, 75, 278, 76, 17, 599, 841, 80,
- 844, 472, 296, 231, 480, 480, 534, 483, 483, 158,
- 200, 201, 202, 203, 484, 841, 74, 75, 229, 76,
- 347, 348, 278, 473, 631, 544, 632, 565, 566, 77,
- 74, 75, 746, 76, 205, 206, 207, 229, 146, 593,
- 859, 545, 533, 485, 1001, 747, 73, 720, 490, 183,
- 924, 1127, 490, 55, 1048, 721, 297, 494, 56, 1002,
- 55, 57, 286, 152, 285, 56, 496, 1066, 286, 1049,
- 722, 627, 74, 75, 286, 76, 205, 206, 207, 489,
- 1067, 278, 58, 489, 278, 154, 298, 1078, 493, 58,
- 55, 155, 285, 278, 53, 56, 74, 75, 1078, 76,
- 278, 628, 1105, 281, 169, 986, 748, 707, 629, 281,
- 284, 74, 75, 1106, 76, 205, 206, 207, 527, 125,
- 920, 171, 183, 1087, 282, 613, 528, 630, 613, 1028,
- 894, 895, 77, 74, 75, 1141, 76, 299, 300, 77,
- 158, 723, 74, 75, 174, 76, 205, 206, 207, 491,
- 1147, 285, 861, 491, 285, 660, 909, 687, 495, 286,
- 659, -485, 77, 285, 222, 1148, 982, 983, 661, 778,
- 285, 190, 224, 662, 527, 694, 660, 687, 225, 739,
- 74, 75, 528, 76, 205, 206, 207, 286, 226, 661,
- 134, 278, 573, 278, 662, 727, 663, 1109, 910, 74,
- 75, 204, 76, 205, 206, 207, 240, 77, 278, 312,
- 77, 77, 77, 77, 911, 284, 315, 663, 707, 353,
- 738, 67, 281, 386, 387, 68, 664, 74, 75, 282,
- 76, 316, 278, 333, 1101, 519, 500, 501, 794, 795,
- 334, 912, 740, 741, 77, 574, 286, 664, 575, 286,
- 673, 198, 937, 496, 673, 354, 317, 758, 286, 1075,
- 318, 285, 471, 285, 319, 286, 200, 201, 202, 203,
- 376, 576, 74, 75, 204, 76, 321, 322, 285, 278,
- 278, 324, 577, 371, 281, 472, 372, 578, 687, 378,
- 383, 110, 278, 281, 381, 1110, 829, 1093, 579, 389,
- 281, 390, 285, 205, 206, 207, 884, 473, 631, 814,
- 632, 1032, 870, 111, 1033, 613, 613, 1034, 10, 94,
- 397, 1035, 77, 400, 77, 401, 284, 403, 406, 80,
- 95, 422, 284, 441, 77, 825, 96, 828, 284, 55,
- 282, 333, 446, 1108, 56, 447, 282, 124, 334, 285,
- 285, 97, 282, 454, 468, 112, 286, 466, 286, 513,
- 16, 515, 285, 866, 507, 531, 245, 18, 125, 246,
- 559, 283, 247, 286, 560, 248, 687, 206, 207, 251,
- 508, 471, 278, 340, 341, 510, 342, 561, 570, 343,
- 344, 281, 346, 281, 884, 571, 572, 286, 347, 348,
- 587, 727, 727, 1016, 472, 77, 74, 75, 281, 76,
- 611, 278, 77, 1026, 589, 77, 596, 614, 899, 183,
- 654, 74, 75, 284, 76, 904, 473, 631, 98, 632,
- 618, 655, 281, 1084, 590, 206, 207, 282, 658, 278,
- 205, 206, 207, 1022, 286, 286, -496, 994, 656, 678,
- 697, 284, 285, 693, -496, 699, 943, 286, 711, 728,
- 716, 729, 1027, 730, 687, 282, 1036, 251, 190, 731,
- 732, 733, 1037, 734, -173, -173, 283, 814, 814, 737,
- 1042, 285, 752, 77, 77, 736, 77, 753, 995, 754,
- 761, 755, 281, 879, 756, 767, 471, 991, 77, 993,
- 187, 77, 765, 774, 783, 633, 713, 712, 800, 285,
- 284, 189, 633, 284, 815, 801, 817, 880, 820, 472,
- 821, 943, 284, 822, 282, 833, 831, 282, 826, 284,
- 1008, 834, 845, 849, 74, 75, 282, 76, 191, 192,
- 847, 473, 631, 282, 632, 855, 621, 286, 198, 937,
- 857, 944, 860, 867, 889, 873, 1022, 892, 902, 1022,
- 1085, 903, 172, 200, 201, 202, 203, 901, 905, 74,
- 75, 204, 76, 77, 916, 77, 286, 917, 919, 920,
- 923, 936, 281, 633, 633, 633, 633, 283, 1061, 278,
- 77, 1103, 945, 283, 992, 980, 999, 998, 1000, 283,
- 1014, 278, 1018, 1040, 286, 1043, 1019, 1041, 1039, 158,
- 1046, 281, 1047, 1050, 1055, 1056, 944, 278, 199, -173,
- 284, 1057, 284, 748, 1062, 74, 75, 1063, 76, 205,
- 206, 207, 1128, 1129, 282, 1069, 282, 284, 1070, 281,
- -496, -496, 77, -496, 1078, 1073, -496, 344, 1089, 346,
- 1095, 282, 1092, 77, 1107, 347, 348, 1100, 471, 285,
- 1112, 284, 1117, 621, 1121, 1119, 1098, 1120, 813, 1125,
- 1131, 285, 1132, 462, 1138, 282, 1146, 457, 1142, 77,
- 77, 472, 811, 893, 283, 464, 896, 285, 897, 548,
- 200, 201, 202, 203, 77, 702, 74, 75, 946, 76,
- 1029, 792, 947, 473, 631, 799, 632, 633, 284, 284,
- 1025, 797, 283, 775, 698, 769, 627, 854, 850, 1086,
- 362, 284, 282, 282, 688, 805, 158, 99, 128, 119,
- 113, 180, 244, 479, 369, 282, 484, 377, 1013, 848,
- 229, 1149, 657, 907, 1122, -254, 628, 989, 1068, -254,
- 1123, 1099, 634, 629, 286, 1124, 1059, 1065, -254, 634,
- 558, 1137, 890, 891, 757, 485, 286, 557, 667, 0,
- 0, 283, 630, 0, 283, 471, 0, 0, 0, 0,
- 0, 0, 286, 283, 0, 0, 0, 0, 633, 281,
- 283, 806, 0, 807, 214, 0, 0, 0, 472, 0,
- 0, 281, -254, 0, 0, -254, 0, 200, 201, 202,
- 203, 284, 0, 74, 75, 942, 76, 281, 0, 0,
- 473, 631, 0, 632, 0, 282, 0, 0, -254, 940,
- 634, 634, 634, 634, 0, 0, 813, 813, 190, -254,
- 284, 0, 308, 311, -254, 313, 314, 0, 0, 0,
- 811, 811, 0, 0, 282, -254, 633, 323, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 284, 808,
- 332, 633, 0, 0, 633, 0, 0, 0, 158, 0,
- 942, 283, 282, 283, 0, 0, 0, 0, 0, 0,
- 0, 360, 0, 0, 940, 0, 0, 0, 283, 0,
- 368, 0, 74, 75, 836, 76, 205, 206, 207, 0,
- 0, 0, 0, 0, 0, 0, 0, 837, 198, 0,
- 0, 0, 283, 0, 0, 0, 0, 471, 0, 812,
- 0, 0, 0, 200, 201, 202, 203, 0, 0, 74,
- 75, 0, 76, 809, 0, 0, 633, 0, 0, 0,
- 472, 0, 0, 0, 634, 0, 0, 0, 0, 200,
- 201, 202, 203, 633, 0, 74, 75, 158, 76, 283,
- 283, 0, 473, 631, 0, 632, 0, 0, 414, 415,
- 416, 0, 283, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 423, 0, 0, 0, 0, 0, 429, 430,
- 431, 432, 433, 434, 435, 436, 437, 438, 439, 440,
- 0, 0, 0, 229, 0, 633, 471, 0, 284, 0,
- 449, 0, 0, 0, 265, 266, 0, 267, 455, 268,
- 284, 0, 282, 0, 0, 634, 0, 0, 0, 472,
- 0, 0, 0, 0, 282, 0, 284, 0, 200, 201,
- 202, 203, 633, 633, 74, 75, 0, 76, 0, 0,
- 282, 473, 631, 0, 632, 0, 0, 633, 0, 0,
- 804, 0, 283, 0, 190, 181, 941, 0, 269, 0,
- 0, 0, 0, 600, 0, 182, 183, 0, 184, 0,
- 185, 0, 0, 0, 0, 0, 193, 812, 812, 0,
- 0, 283, 0, 634, 532, 270, 0, 186, 0, 0,
- 0, 187, 0, 0, 0, 539, 0, 540, 634, 188,
- 0, 634, 189, 337, 0, 0, 703, 704, 0, 283,
- 339, 340, 341, 0, 342, 190, 0, 343, 344, 345,
- 346, 941, 0, 0, 0, 0, 347, 348, 0, 191,
- 192, 0, 187, 0, 198, 0, 0, 193, 0, 0,
- 194, 195, 0, 189, 0, 0, 0, 196, 0, 200,
- 201, 202, 203, 0, 0, 74, 75, 204, 76, 205,
- 206, 207, 0, 0, 602, 681, 0, 0, 0, 606,
- 191, 192, 0, 634, 350, 0, 197, 0, 0, 0,
- 0, 0, 351, 0, 0, 0, 0, 0, 0, 0,
- 634, 187, 0, 0, 0, 198, 0, 0, 0, 0,
- 0, 0, 189, 0, 0, 0, 0, 0, 0, 199,
- 200, 201, 202, 203, 682, 0, 74, 75, 204, 76,
- 205, 206, 207, 0, 0, 0, 0, 0, 0, 191,
- 192, 0, 0, 1051, 0, 0, 710, 0, 181, 0,
- 0, 0, 634, 0, 0, 0, 1052, 683, 182, 183,
- 199, 184, 0, 185, 0, 0, 0, 74, 75, 283,
- 76, 205, 206, 207, 0, 0, 0, 0, 0, 0,
- 186, 283, 0, 0, 187, 0, 0, 0, 0, 634,
- 634, 0, 188, 0, 605, 189, 0, 283, 0, 181,
- 0, 0, 0, 0, 634, 0, 0, 0, 190, 182,
- 183, 0, 184, 0, 185, 0, 0, 0, 0, 199,
- 0, 0, 191, 192, 0, 0, 74, 75, 0, 76,
- 193, 186, 773, 194, 195, 187, 229, 0, 0, 0,
- 196, 695, 0, 188, 0, 0, 189, 265, 266, 0,
- 267, 0, 268, 0, 790, 791, 0, 0, 0, 190,
- 0, 0, 851, 0, 0, 0, 229, 0, 0, 197,
- 0, 852, 602, 191, 192, 0, 0, 265, 266, 0,
- 267, 193, 268, 0, 194, 195, 0, 853, 198, 0,
- 0, 196, 0, 0, 0, 0, 0, 190, 0, 0,
- 0, 0, 199, 200, 201, 202, 203, 0, 0, 74,
- 75, 204, 76, 205, 206, 207, 0, 674, 0, 193,
- 197, 229, 0, 879, 0, 0, 0, 190, 270, 0,
- 187, 0, 265, 266, 0, 267, 0, 268, 0, 198,
- 0, 189, 0, 0, 0, 0, 0, 880, 0, 0,
- 0, 0, 0, 199, 200, 201, 202, 203, 270, 0,
- 74, 75, 204, 76, 205, 206, 207, 0, 191, 192,
- 0, 0, 0, 0, 0, 0, 0, 198, 0, 0,
- 0, 0, 190, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 200, 201, 202, 203, 0, 0, 74, 75,
- 204, 76, 502, 206, 207, 0, 0, 198, 0, 0,
- 339, 340, 341, 270, 342, 0, 0, 343, 344, 345,
- 346, 0, 200, 201, 202, 203, 347, 348, 74, 75,
- 204, 76, 205, 206, 207, 229, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 265, 266, 199, 267,
- 0, 268, 0, 0, 229, 74, 75, 0, 76, 205,
- 206, 207, 198, 0, 0, 265, 266, 0, 267, 0,
- 268, 0, 0, 0, 350, 0, 0, 200, 201, 202,
- 203, 0, 351, 74, 75, 204, 76, 205, 206, 207,
- 229, 0, 0, 0, 0, 0, 190, 0, 0, 1030,
- 1031, 265, 266, 0, 267, 0, 268, 0, 0, 563,
- 0, 1038, 0, 0, 0, 190, 0, 0, 193, 0,
- 1044, 1045, 229, 0, 0, 0, 0, 270, 0, 0,
- 0, 0, 1054, 265, 266, 0, 267, 193, 268, 0,
- 0, 0, 0, 0, 0, 0, 270, 0, 0, 87,
- 0, 190, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -496, 340, 341, 0, 342, 0, 0, 343, 344,
- -496, 346, 0, 229, 0, 0, 198, 347, 348, 0,
- 0, 0, 270, 190, 265, 266, 0, 267, 0, 268,
- 0, 200, 201, 202, 203, 198, 0, 74, 75, 204,
- 76, 502, 206, 207, 0, 193, 0, 0, 0, 0,
- 200, 201, 202, 203, 270, 0, 74, 75, 204, 76,
- 502, 206, 207, 0, 0, 350, 0, 0, 0, 0,
- 0, 198, 0, 351, 190, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 200, 201, 202, 203,
- 0, 0, 74, 75, 204, 76, 205, 206, 207, 0,
- 0, 0, 0, 198, 0, 270, 0, 0, 0, 0,
- 0, 621, 0, 0, 0, 0, 0, 622, 200, 201,
- 202, 203, 0, 0, 74, 75, 204, 76, 205, 206,
- 207, 623, 0, 0, 0, 0, 0, 0, 0, 0,
- 624, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 181, 0, 198, 625, 0, 626, 0, 0,
- 0, 0, 182, 183, 627, 184, 0, 185, 0, 200,
- 201, 202, 203, 0, 158, 74, 75, 204, 76, 205,
- 206, 207, 309, 0, 186, 0, 0, 0, 187, 0,
- 0, 0, 0, 0, 628, 0, 188, 0, 0, 189,
- 0, 629, 0, 181, 0, 0, 0, 0, 0, 0,
- 0, 0, 190, 182, 183, 0, 184, 0, 185, 0,
- 630, 0, 0, 471, 0, 330, 191, 192, 0, 0,
- 0, 0, 0, 0, 193, 186, 0, 194, 195, 187,
- 0, 0, 0, 0, 196, 0, 472, 188, 0, 0,
- 189, 0, 0, 0, 0, 200, 201, 202, 203, 331,
- 0, 74, 75, 190, 76, 87, 0, 0, 473, 631,
- 0, 632, 0, 197, 0, 0, 0, 191, 192, 0,
- 0, 0, 0, 0, 0, 193, 0, 0, 194, 195,
- 0, 0, 198, 0, 0, 196, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 199, 200, 201, 202,
- 203, 0, 0, 74, 75, 204, 76, 205, 206, 207,
- 0, 0, 0, 0, 197, 0, 0, 0, 0, 0,
+ 81, 106, 393, 102, 398, 300, 438, 83, 132, 334,
+ 69, 435, 104, 554, 213, 341, 131, 351, 747, 555,
+ 782, 721, 701, 702, 703, 704, 128, 323, 342, 508,
+ 708, 511, 97, 406, 47, 94, 227, 301, 901, 652,
+ 547, 257, 631, 23, 916, 790, 858, 510, 495, 498,
+ 129, 762, 77, 277, 952, 921, 954, 1, 786, 210,
+ 125, 788, 207, 111, 791, 866, 867, 212, 54, 462,
+ 982, 135, 216, 790, 222, 1022, 182, 930, 506, 194,
+ 1026, 128, 333, 81, 857, 722, 188, 81, 225, 81,
+ 195, 228, 791, 836, 206, 773, 208, 331, 544, 466,
+ 827, 183, 493, 796, 528, 129, 1003, 723, 4, 983,
+ 223, 774, 688, 335, -434, 125, 508, 525, 511, 574,
+ 7, 529, 61, 779, 775, 197, 54, 132, 350, 689,
+ 52, 278, 684, 229, 584, 433, 285, 499, 500, 837,
+ 486, 906, 496, 78, 79, 928, 80, 467, 499, 500,
+ 467, 545, 194, 546, 65, 501, 922, 838, 198, 199,
+ 792, 347, 851, 921, 582, 81, 501, 763, 66, 194,
+ 78, 79, 282, 80, 272, 273, 232, 333, 95, 1031,
+ 103, 653, 540, 839, 309, 352, 397, 548, 792, 632,
+ 1002, 332, 331, 343, 344, 508, 345, 511, 258, 921,
+ 98, 326, 916, 302, 81, 81, 81, 569, 2, 868,
+ 113, 346, 348, 349, 595, 58, 48, 300, 88, 47,
+ 85, 114, 684, 78, 79, 59, 80, 101, 492, 86,
+ 356, 49, 58, 115, 468, 564, 530, 468, 705, 372,
+ 506, 669, 59, 78, 79, 520, 80, 60, 565, 609,
+ 597, 706, 499, 500, 165, 166, 167, 168, 651, 196,
+ 78, 79, 218, 80, 130, 81, 986, 70, 694, 219,
+ 501, 613, 396, 614, 105, 488, 489, 118, 119, 120,
+ 121, 854, 87, 610, 333, 54, 332, 402, 707, 71,
+ 611, 107, 824, 72, 314, 333, 326, 649, 825, 331,
+ 333, 1005, 970, 437, 492, 108, 708, 197, -50, 315,
+ 331, 960, 612, 8, 779, 331, 730, 669, 742, 440,
+ 440, 918, 739, 911, 961, 291, 782, 441, 441, 81,
+ 779, 731, 604, 743, 1006, 66, 436, 605, 912, 292,
+ 198, 199, 442, 459, 388, 389, 561, 994, 54, 131,
+ 835, 333, 508, 508, 511, 511, -50, 184, 333, 194,
+ 58, 824, 189, 542, 191, 139, 331, 825, 785, 18,
+ 59, 78, 79, 331, 80, 116, 117, 118, 119, 120,
+ 121, 518, 333, 949, 836, 929, 518, 518, 531, -50,
+ -50, 765, 60, 332, 200, 194, 54, 331, 950, 975,
+ 995, 929, 976, 326, 332, 519, 61, 58, 147, 332,
+ 519, 519, 585, 586, 326, 517, 996, 59, 847, 326,
+ 517, 517, 333, 116, 117, 118, 119, 120, 121, 192,
+ 837, 559, 1033, 1027, 71, 522, 523, 331, 72, 130,
+ 205, 333, 81, -50, 720, 471, 224, 1034, 838, 541,
+ 78, 79, 234, 80, 556, 560, 331, 499, 500, 81,
+ 332, 333, 738, 237, 283, 558, 567, 332, 673, 238,
+ 326, 673, 673, 239, 839, 501, 331, 326, 499, 500,
+ 165, 166, 167, 168, 240, 241, 78, 79, 243, 80,
+ 244, 332, 472, 164, 798, 473, 501, 613, 440, 614,
+ 218, 326, 439, 245, 440, 247, 441, 219, 165, 166,
+ 167, 168, 441, 645, 78, 79, 169, 80, 248, 333,
+ 249, 603, 474, 78, 79, 81, 80, 999, 670, 250,
+ 251, 332, 113, 475, 331, 499, 500, 671, 476, 253,
+ 985, 326, 254, 281, 518, 255, 699, 518, 518, 256,
+ 332, 477, 672, 501, 613, 182, 614, 513, 81, 284,
+ 326, 306, 308, 774, 305, 395, 499, 500, 519, 926,
+ 332, 519, 519, 556, 307, 659, 775, 361, 517, 310,
+ 326, 517, 517, 683, 501, 613, 660, 614, 660, 81,
+ 365, 81, 81, 81, 81, 373, 698, 969, 661, 394,
+ 661, 333, 662, 700, 662, 805, 300, 399, 218, 729,
+ 998, 933, 403, 404, 934, 219, 331, 935, 333, 333,
+ 803, 194, 670, 410, 936, 412, 113, 416, 332, 725,
+ 663, 671, 663, 331, 331, 165, 166, 167, 326, 767,
+ 419, 421, 426, 81, 752, 753, 977, 427, 430, 329,
+ 737, 513, 457, 116, 117, 118, 119, 120, 121, 664,
+ 333, 664, 460, 556, 461, 470, 512, 300, 485, 487,
+ 113, 904, 805, 683, 494, 331, 980, 526, 524, 496,
+ 566, 81, 81, 570, 572, 579, 580, 803, 764, 766,
+ 589, 581, 81, 78, 79, 513, 80, 116, 117, 118,
+ 119, 120, 121, 590, 499, 500, 165, 166, 167, 168,
+ 332, 593, 78, 79, 804, 80, 596, 634, 635, 636,
+ 326, 650, 501, 613, 658, 614, 641, 332, 332, 687,
+ 692, 697, 711, 556, 712, 850, 713, 326, 326, 719,
+ 717, 714, 715, 823, 329, 860, 726, 732, 740, 81,
+ 744, 746, 81, 861, 499, 500, 831, 689, 424, 425,
+ -204, 758, 78, 79, 688, 80, 771, 759, 772, 332,
+ 769, 783, 501, 613, 797, 614, 806, 808, 829, 326,
+ 810, 804, 222, 856, 832, 843, 846, 78, 79, 830,
+ 80, 116, 117, 118, 119, 120, 121, 844, 847, 852,
+ 333, 853, 556, 864, 116, 117, 118, 119, 120, 121,
+ 81, 81, 823, 909, 905, 331, 929, 605, 902, 903,
+ 908, 910, 940, 606, 81, 944, 924, 81, 947, 948,
+ 941, 78, 79, 942, 80, 116, 117, 118, 119, 120,
+ 121, 294, 330, 607, 295, 333, 174, 296, 951, 707,
+ 297, 329, 139, 118, 119, 120, 121, 608, 956, 862,
+ 331, 957, 329, 937, 609, 262, 963, 329, 263, 938,
+ 401, 964, 264, 265, 266, 194, 267, 943, 967, 268,
+ 269, 270, 271, 81, 215, 81, 981, 984, 272, 273,
+ 987, 992, 955, 274, 993, 147, 1007, 997, 610, 81,
+ 113, 1001, 1008, 1012, 1017, 611, 1018, 230, 233, 332,
+ 235, 236, 139, 113, 468, 1024, 1028, 807, 329, 326,
+ 1032, 971, 465, 575, 114, 329, 863, 612, 750, 252,
+ 865, 275, 757, 755, 642, 81, 856, 330, 859, 856,
+ 978, 261, 811, 571, 276, 815, 81, 979, 217, 329,
+ 643, 93, 133, 990, 332, 110, 84, 290, 499, 500,
+ 165, 166, 167, 168, 326, 293, 78, 79, 136, 80,
+ 81, 81, 507, 923, 809, 1035, 501, 613, 657, 614,
+ 164, 798, 81, 615, 338, 415, 834, 1009, 900, 329,
+ 962, 1010, 953, 959, 577, 165, 166, 167, 168, 1014,
+ 1015, 78, 79, 169, 80, 578, 991, 1011, 329, 667,
+ 359, 360, 736, 362, 363, 364, 615, 366, 367, 368,
+ 0, 0, 1023, 369, 370, 371, 0, 0, 329, 0,
+ 374, 0, 376, 377, 378, 379, 380, 381, 382, 383,
+ 384, 385, 386, 387, 330, 0, 0, 0, 0, 615,
+ 615, 615, 615, 0, 0, 330, 0, 0, 0, 400,
+ 330, 78, 79, 169, 80, 116, 117, 118, 119, 120,
+ 121, 0, 0, 0, 78, 79, 0, 80, 116, 117,
+ 118, 119, 120, 121, -434, -434, 329, 812, 0, 0,
+ 0, 113, 0, 0, -434, 0, 813, 0, 0, -434,
+ 0, 0, 316, 317, 0, 318, 54, 319, 0, 0,
+ 0, 330, 814, 0, 0, -434, 0, 0, 330, 488,
+ 489, 118, 119, 120, 121, 0, 0, 0, -434, 10,
+ 90, 445, 0, 674, -434, 449, 0, 113, 0, 13,
+ 0, 0, 330, 0, 91, 0, 147, 0, 316, 317,
+ 615, 318, 0, 319, 0, 0, 0, 0, 0, 0,
+ 16, 458, 0, 0, 0, 0, 0, 0, 329, 463,
+ 0, 464, 801, 17, 0, 0, 616, 0, 0, 19,
+ 320, 0, 330, 0, 0, 329, 329, -435, -435, 0,
+ -435, 0, 147, -435, 269, -434, 271, 0, 0, 0,
+ 0, 330, 272, 273, 0, 0, 0, 0, 0, 616,
+ 615, 533, 0, 0, 534, 0, 0, 0, 0, 0,
+ 0, 330, 537, 538, 539, 0, 320, 329, 0, 0,
+ 0, 164, 0, 0, 0, 0, 0, 0, 0, 801,
+ 92, 0, 616, 616, 616, 616, 165, 166, 167, 168,
+ 0, 0, 78, 79, 169, 80, 116, 117, 118, 119,
+ 120, 121, 0, 0, 0, 0, 0, 0, 615, 0,
+ 0, 0, 0, 0, -206, 0, 0, 164, -206, 330,
+ 0, 0, 615, 0, 0, 615, 0, -206, 0, -206,
+ -206, 0, 165, 166, 167, 168, 0, 0, 78, 79,
+ 169, 80, 116, 117, 118, 119, 120, 121, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 512, 0, 0,
+ 640, 113, 0, 0, 0, -206, -196, 0, -206, 0,
+ -196, 0, 0, 0, -205, 0, 0, 0, -205, -196,
+ 0, 615, 0, 616, 0, 0, 513, -205, 0, -205,
+ -205, 0, 0, 0, 0, -206, 0, 615, 0, 0,
+ 0, 330, 686, 0, 0, 802, -206, 329, 695, 0,
+ 696, -206, 194, 0, 0, 0, 0, -196, 330, 330,
+ -196, 0, 0, 0, -206, -205, 0, 0, -205, 0,
+ 0, 0, 0, 615, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 616, 0, 0, 0, -196, 0, 0,
+ 0, 0, 329, 0, 0, -205, 0, 0, -196, 0,
+ 330, 0, 0, -196, 0, 0, -205, 0, 615, 615,
+ 0, -205, 802, 0, 0, 0, -196, 0, 0, 0,
+ 615, 0, 0, 0, -205, 0, 0, 0, 0, 748,
+ 749, 0, 0, 0, 0, 499, 500, 165, 166, 167,
+ 168, 616, 0, 78, 79, 0, 80, 0, 0, 0,
+ 0, 0, 0, 501, 613, 616, 614, 0, 616, 0,
+ 0, 0, 78, 79, 0, 80, 116, 117, 118, 119,
+ 120, 121, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 532, 0, 0, 0, 0, 137, 0,
+ 0, 0, 0, 670, 0, 0, 0, 113, 138, 139,
+ 0, 140, 678, 141, 0, 0, -198, 0, 0, 0,
+ 0, 0, 0, 0, 616, -198, 0, 142, 0, 0,
+ 0, 143, 513, 0, 0, 0, 144, 0, 145, 0,
+ 616, 146, 113, 0, 0, 0, 0, 568, 0, 0,
+ 330, 0, 147, 316, 317, 0, 318, 0, 319, 0,
+ 148, 0, 0, -198, 0, 0, -198, 149, 150, 151,
+ 152, 153, 154, 155, 156, 0, 616, 0, 0, 0,
+ 0, 157, 158, 0, 0, 0, 0, 159, 0, 0,
+ 0, 113, 0, -198, 0, 330, 0, 147, 0, 0,
+ 160, 0, 316, 317, -198, 318, 0, 319, 161, -198,
+ 583, 616, 616, 0, 0, 0, 0, 162, 0, 0,
+ 163, 0, -198, 616, 0, 0, 931, 932, 113, 0,
+ 0, 320, 0, 0, 0, 0, 0, 164, 939, 316,
+ 317, 0, 318, 0, 319, 0, 147, 945, 946, 0,
+ 0, 0, 165, 166, 167, 168, 0, 0, 78, 79,
+ 169, 80, 116, 117, 118, 119, 120, 121, 78, 79,
+ 0, 80, 116, 117, 118, 119, 120, 121, 113, 0,
+ 320, 0, 164, 147, 0, 0, 0, 0, 0, 316,
+ 317, 0, 318, 0, 319, 0, 0, 165, 166, 167,
+ 168, 0, 0, 78, 79, 169, 80, 116, 117, 118,
+ 119, 120, 121, 0, 0, 0, 0, 320, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 198, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 199, 200, 201,
- 202, 203, 0, 181, 74, 75, 204, 76, 205, 206,
- 207, 600, 0, 182, 183, 0, 184, 0, 185, 0,
- 0, 601, 0, 181, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 182, 183, 186, 184, 0, 185, 187,
- 0, 0, 0, 0, 0, 364, 0, 188, 0, 0,
- 189, 0, 0, 0, 8, 186, 9, 0, 0, 187,
- 0, 0, 0, 190, 0, 0, 0, 188, 10, 11,
- 189, 12, 0, 0, 0, 0, 0, 191, 192, 0,
- 13, 0, 0, 190, 0, 193, 14, 0, 194, 195,
- 0, 0, 0, 0, 0, 196, 0, 191, 192, 0,
- 0, 15, 0, 0, 0, 193, 0, 0, 194, 195,
- 16, 0, 17, 0, 0, 196, 0, 18, 19, 0,
- 0, 0, 0, 0, 197, 337, 0, 0, 338, 0,
- 0, 0, 339, 340, 341, 0, 342, 0, 0, 343,
- 344, 345, 346, 198, 197, 412, 0, 0, 347, 348,
- 0, 0, 0, 0, 0, 349, 0, 199, 200, 201,
- 202, 203, 0, 198, 74, 75, 204, 76, 205, 206,
- 207, 0, 0, 0, 0, 0, 0, 199, 200, 201,
- 202, 203, 181, 0, 74, 75, 204, 76, 205, 206,
- 207, 0, 182, 183, 0, 184, 350, 185, 0, 0,
- 418, 0, 181, 0, 351, 0, 0, 0, 0, 0,
- 0, 0, 182, 183, 186, 184, 0, 185, 187, 0,
- 0, 0, 0, 0, 0, 0, 188, 0, 0, 189,
- 0, 0, 0, 0, 186, 0, 0, 0, 187, 0,
- 0, 0, 190, 0, 0, 0, 188, 0, 0, 189,
- 0, 0, 0, 0, 0, 0, 191, 192, 0, 0,
- 0, 0, 190, 0, 193, 0, 0, 194, 195, 0,
- 0, 621, 0, 0, 196, 0, 191, 192, 0, 0,
- 0, 0, 0, 0, 193, 0, 0, 194, 195, 0,
- 0, 623, 0, -262, 196, 0, 0, -262, 0, 621,
- 624, 0, 0, 197, 0, 1003, -262, 0, -262, -262,
- 0, 0, 0, 0, 0, 625, 0, 626, 0, 0,
- 0, 0, 198, 197, 627, 0, 0, 0, 624, 0,
- 0, 0, 0, 0, 158, 0, 199, 200, 201, 202,
- 203, 0, 198, 74, 75, 204, 76, 205, 206, 207,
- -262, 0, 627, -262, 628, 0, 199, 200, 201, 202,
- 203, 629, 158, 74, 75, 204, 76, 205, 206, 207,
- 621, 0, 0, 0, 0, -261, -262, 0, 0, -261,
- 630, 0, 628, 471, 0, 0, 0, -262, -261, 629,
- -261, -261, -262, 0, 0, 0, 0, 0, 0, 624,
- 0, 0, 0, -262, 0, 0, 472, 0, 630, 0,
- 0, 471, 0, 0, 0, 200, 201, 202, 203, 0,
- 0, 74, 75, 627, 76, 0, 0, 0, 473, 631,
- 0, 632, -261, 158, 472, -261, 0, 0, 0, 0,
- 0, 0, 0, 200, 201, 202, 203, 0, 0, 74,
- 75, 0, 76, 628, 0, 0, 473, 631, -261, 632,
- 629, 0, 0, 0, 0, 0, 0, 0, 0, -261,
- 0, 0, 0, 0, -261, 0, 0, 0, 0, 630,
- 337, 0, 471, 338, 0, -261, 0, 339, 340, 341,
- 0, 342, 0, 0, 343, 344, 345, 346, 0, 0,
- 424, 0, 0, 347, 348, 472, 0, 0, 0, 0,
- 349, 0, 0, 0, 200, 201, 202, 203, 0, 0,
- 74, 75, 0, 76, 0, 0, 337, 473, 631, 338,
- 632, 0, 0, 339, 340, 341, 0, 342, 0, 0,
- 343, 344, 345, 346, 0, 0, 450, 0, 0, 347,
- 348, 350, 0, 0, 0, 337, 349, 0, 338, 351,
- 456, 0, 339, 340, 341, 0, 342, 0, 0, 343,
- 344, 345, 346, 0, 0, 0, 0, 0, 347, 348,
- 0, 0, 0, 0, 337, 349, 0, 338, 0, 0,
- 0, 339, 340, 341, 0, 342, 0, 350, 343, 344,
- 345, 346, 0, 0, 520, 351, 0, 347, 348, 0,
- 0, 0, 0, 337, 349, 0, 338, 0, 0, 0,
- 339, 340, 341, 0, 342, 0, 350, 343, 344, 345,
- 346, 0, 0, 521, 351, 0, 347, 348, 0, 0,
- 0, 0, 337, 349, 0, 338, 0, 0, 0, 339,
- 340, 341, 0, 342, 0, 350, 343, 344, 345, 346,
- 0, 0, 522, 351, 0, 347, 348, 0, 0, 0,
- 0, 337, 349, 0, 338, 0, 0, 0, 339, 340,
- 341, 0, 342, 0, 350, 343, 344, 345, 346, 0,
- 0, 530, 351, 0, 347, 348, 0, 0, 0, 0,
- 0, 349, 0, 337, 536, 0, 338, 0, 0, 0,
- 339, 340, 341, 350, 342, 0, 0, 343, 344, 345,
- 346, 351, 0, 0, 0, 0, 347, 348, 0, 337,
- 0, 0, 338, 349, 0, 0, 339, 340, 341, 0,
- 342, 0, 350, 343, 344, 345, 346, 0, 0, 858,
- 351, 0, 347, 348, 0, 337, 0, 0, 338, 349,
- 0, 0, 339, 340, 341, 0, 342, 0, 0, 343,
- 344, 345, 346, 0, 350, 877, 0, 0, 347, 348,
- 337, 0, 351, 338, 0, 349, 0, 339, 340, 341,
- 0, 342, 0, 0, 343, 344, 345, 346, 0, 0,
- 350, 878, 0, 347, 348, 0, 0, 0, 351, 0,
- 349, 0, 0, 337, 0, 0, 338, 0, 0, 0,
- 339, 340, 341, 0, 342, 0, 350, 343, 344, 345,
- 346, 0, 0, 1080, 351, 0, 347, 348, 0, 337,
- 0, 0, 338, 349, 0, 0, 339, 340, 341, 0,
- 342, 350, 0, 343, 344, 345, 346, 0, 0, 351,
- 1081, 0, 347, 348, 337, 951, 0, 338, 952, 349,
- 0, 339, 340, 341, 0, 342, 0, 0, 343, 344,
- 345, 346, 0, 0, 350, 0, 0, 347, 348, 0,
- 0, 0, 351, 953, 349, 0, 0, 0, 0, 0,
- 0, 0, 0, 954, 955, 956, 957, 958, 959, 960,
- 350, 0, 0, 0, 0, 0, 0, 0, 351, 961,
- 0, 962, 963, 964, 965, 966, 967, 968, 969, 970,
- 971, 972, 973, 974, 975, 350, 976, 0, 0, 0,
- 0, 0, 0, 351
+ 0, 164, 0, 147, 0, 0, 0, 0, 0, 0,
+ 0, 0, 20, 0, 0, 0, 165, 166, 167, 168,
+ 0, 0, 78, 79, 169, 80, 116, 117, 118, 119,
+ 120, 121, 0, 0, 0, 0, 0, 320, 164, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 165, 166, 167, 168, 0, 0, 78,
+ 79, 169, 80, 116, 117, 118, 119, 120, 121, 0,
+ 262, 0, 0, 263, 0, 600, 0, 264, 265, 266,
+ 0, 267, 0, 0, 268, 269, 270, 271, 164, 0,
+ 601, 0, 0, 272, 273, 0, 0, 0, 274, 0,
+ 0, 0, 0, 165, 166, 167, 168, 0, 0, 78,
+ 79, 169, 80, 116, 117, 118, 119, 120, 121, 137,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 138,
+ 139, 0, 140, 0, 141, 0, 275, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 231, 142, 276,
+ 0, 0, 143, 0, 0, 0, 0, 144, 8, 145,
+ 0, 9, 146, 0, 0, 0, 0, 0, 0, 10,
+ 11, 0, 12, 147, 0, 0, 0, 0, 0, 13,
+ 0, 148, 14, 0, 15, 0, 0, 0, 149, 150,
+ 151, 152, 153, 154, 155, 156, 0, 0, 0, 0,
+ 16, 0, 157, 158, 0, 0, 0, 0, 159, 0,
+ 0, 0, 0, 17, 18, 0, 0, 0, 0, 19,
+ 0, 160, 0, 0, 0, 0, 0, 0, 0, 161,
+ 0, 0, 20, 0, 0, 0, 0, 0, 162, 0,
+ 0, 163, 0, 605, 0, 0, 20, 0, 0, 913,
+ 265, 266, 0, 267, 0, 0, 268, 269, 164, 271,
+ 0, 0, 0, 0, 0, 272, 273, 0, 0, 607,
+ 0, 0, 0, 165, 166, 167, 168, 0, 0, 78,
+ 79, 169, 80, 116, 117, 118, 119, 120, 121, 137,
+ 609, 0, 0, 0, 0, 0, 0, 0, 0, 138,
+ 139, 194, 140, 0, 141, 0, 0, 0, -435, 0,
+ 0, 259, 0, 0, 0, 0, 0, 0, 142, 0,
+ 0, -435, 143, 0, 610, 0, 0, 144, 0, 145,
+ 0, 611, 146, 0, 0, 0, 0, 0, 0, 260,
+ 0, 0, 0, 147, 0, 0, 0, 0, 0, 0,
+ 0, 148, 0, 612, 0, 0, 0, 0, 149, 150,
+ 151, 152, 153, 154, 155, 156, 0, 0, 0, 0,
+ 0, 0, 157, 158, 0, 0, 0, 0, 159, 0,
+ 0, 0, 0, 0, 499, 500, 165, 166, 167, 168,
+ 0, 160, 78, 79, 0, 80, 0, 0, 0, 161,
+ 0, 0, 501, 613, 0, 614, 0, 262, 162, 0,
+ 263, 163, 0, 605, 264, 265, 266, 0, 267, 0,
+ 0, 268, 269, 270, 271, 0, 0, 339, 164, 0,
+ 272, 273, 0, 0, 0, 274, 0, 0, 0, 607,
+ 0, 0, 0, 165, 166, 167, 168, 0, 0, 78,
+ 79, 169, 80, 116, 117, 118, 119, 120, 121, 137,
+ 609, 0, 0, 0, 0, 0, 0, 0, 0, 138,
+ 139, 194, 140, 275, 141, 0, 0, 0, 0, 0,
+ 0, 286, 0, 0, 0, 0, 276, 0, 142, 0,
+ 0, 0, 143, 0, 610, 0, 0, 144, 0, 145,
+ 0, 611, 146, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 147, 0, 0, 0, 0, 0, 0,
+ 0, 148, 0, 612, 0, 0, 0, 0, 149, 150,
+ 151, 152, 153, 154, 155, 156, 0, 0, 0, 0,
+ 0, 0, 157, 158, 0, 0, 0, 0, 159, 0,
+ 0, 0, 0, 0, 499, 500, 165, 166, 167, 168,
+ 0, 160, 78, 79, 0, 80, 0, 0, 0, 161,
+ 0, 0, 501, 613, 0, 614, 0, 262, 162, 0,
+ 263, 163, 0, 605, 264, 265, 266, 0, 267, 0,
+ 0, 268, 269, 270, 271, 0, 0, 355, 164, 0,
+ 272, 273, 0, 0, 0, 274, 0, 0, 0, 0,
+ 0, 0, 0, 165, 166, 167, 168, 0, 0, 78,
+ 79, 169, 80, 116, 117, 118, 119, 120, 121, 137,
+ 609, 0, 0, 0, 0, 0, 0, 0, 0, 138,
+ 139, 194, 140, 275, 141, 0, 0, 392, 0, 0,
+ 0, 0, 0, 0, 0, 0, 276, 0, 142, 0,
+ 0, 0, 143, 0, 610, 0, 0, 144, 0, 145,
+ 0, 611, 146, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 147, 0, 0, 0, 0, 0, 0,
+ 0, 148, 0, 612, 0, 0, 0, 0, 149, 150,
+ 151, 152, 153, 154, 155, 156, 0, 0, 0, 0,
+ 0, 0, 157, 158, 0, 0, 0, 0, 159, 0,
+ 0, 0, 0, 0, 499, 500, 165, 166, 167, 168,
+ 0, 160, 78, 79, 0, 80, 0, 0, 0, 161,
+ 0, 0, 501, 613, 0, 614, 0, 262, 162, 0,
+ 263, 163, 0, 0, 264, 265, 266, 0, 267, 0,
+ 0, 268, 269, 270, 271, 0, 0, 375, 164, 0,
+ 272, 273, 0, 0, 0, 274, 0, 0, 0, 0,
+ 0, 0, 0, 165, 166, 167, 168, 0, 0, 78,
+ 79, 169, 80, 116, 117, 118, 119, 120, 121, 137,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 138,
+ 139, 0, 140, 275, 141, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 276, 0, 142, 0,
+ 0, 0, 143, 0, 0, 0, 0, 144, 605, 145,
+ 0, 0, 146, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 147, 0, 0, 0, 0, 0, 0,
+ 0, 148, 0, 0, 607, 0, 0, 0, 149, 150,
+ 151, 152, 153, 154, 155, 156, 0, 0, 608, 0,
+ 0, 0, 157, 158, 0, 609, 0, 0, 159, 0,
+ 0, 262, 0, 0, 0, 0, 194, 0, 264, 265,
+ 266, 160, 267, 0, 0, 268, 269, 270, 271, 161,
+ 0, 0, 0, 0, 272, 273, 0, 0, 162, 610,
+ 0, 163, 0, 0, 0, 0, 611, 0, 0, 0,
+ 0, 0, 0, 264, 265, 266, 0, 267, 164, 0,
+ 268, 269, 270, 271, 0, 0, 0, 0, 612, 272,
+ 273, 0, 0, 165, 166, 167, 168, 275, 0, 78,
+ 79, 169, 80, 116, 117, 118, 119, 120, 121, 0,
+ 276, 0, 0, 0, 0, 0, -125, -125, 0, 499,
+ 500, 165, 166, 167, 168, 0, 0, 78, 79, 0,
+ 80, 0, 275, 818, 679, 680, 0, 501, 613, 143,
+ 614, 0, 0, 0, 144, 276, 0, 0, 0, 146,
+ 0, 0, 0, 0, 819, 0, 0, 143, 0, 0,
+ 0, 0, 144, 0, 0, 0, 0, 146, 148, 0,
+ 0, 0, 0, 0, 0, 149, 150, 151, 152, 153,
+ 154, 155, 156, 0, 0, 0, 148, 0, 0, 0,
+ 0, 0, 0, 149, 150, 151, 152, 153, 154, 155,
+ 156, 0, 0, 0, 0, -435, 265, 266, 160, 267,
+ 0, 0, 268, 269, -435, 271, 161, 0, 0, 0,
+ 0, 272, 273, 0, 0, 162, 160, 0, 0, 0,
+ 0, 0, 0, 0, 161, 0, 0, 0, 0, 0,
+ 0, 0, 0, 162, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 550, 0, 0, 0, 0, 0, 0,
+ -125, 0, 0, 0, 275, 0, 78, 79, 0, 80,
+ 116, 117, 118, 119, 120, 121, 143, 276, 0, 0,
+ 0, 144, 0, 0, 78, 79, 146, 80, 116, 117,
+ 118, 119, 120, 121, 0, 0, 551, 0, 0, 0,
+ 0, 0, 0, 0, 0, 148, 0, 0, 0, 0,
+ 0, 0, 149, 150, 151, 152, 153, 154, 155, 156,
+ 0, 0, 818, 0, 0, 0, 0, 0, 143, 0,
+ 0, 0, 552, 144, 0, 0, 0, 0, 146, 0,
+ 0, 0, 0, 819, 0, 160, 0, 0, 0, 0,
+ 0, 0, 0, 161, 0, 0, 0, 148, 0, 0,
+ 0, 0, 162, 0, 149, 150, 151, 152, 153, 154,
+ 155, 156, 262, 434, 0, 263, 0, 0, 0, 264,
+ 265, 266, 0, 267, 0, 0, 268, 269, 270, 271,
+ 0, 0, 0, 0, 0, 272, 273, 160, 0, 0,
+ 274, 0, 0, 78, 79, 161, 80, 0, 262, 0,
+ 0, 263, 0, 0, 162, 264, 265, 266, 0, 267,
+ 0, 0, 268, 269, 270, 271, 0, 0, 443, 0,
+ 0, 272, 273, 0, 0, 0, 274, 0, 275, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 276, 0, 0, 0, 78, 79, 0, 80, 116,
+ 117, 118, 119, 120, 121, 0, 0, 0, 262, 0,
+ 0, 263, 0, 444, 275, 264, 265, 266, 0, 267,
+ 0, 0, 268, 269, 270, 271, 262, 276, 0, 263,
+ 0, 272, 273, 264, 265, 266, 274, 267, 0, 0,
+ 268, 269, 270, 271, 262, 0, 446, 263, 0, 272,
+ 273, 264, 265, 266, 274, 267, 0, 0, 268, 269,
+ 270, 271, 262, 0, 447, 263, 0, 272, 273, 264,
+ 265, 266, 274, 267, 275, 0, 268, 269, 270, 271,
+ 0, 0, 448, 0, 0, 272, 273, 276, 0, 0,
+ 274, 0, 275, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 276, 0, 0, 0, 0,
+ 275, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 262, 276, 0, 263, 0, 0, 275, 264,
+ 265, 266, 0, 267, 0, 0, 268, 269, 270, 271,
+ 262, 276, 450, 263, 0, 272, 273, 264, 265, 266,
+ 274, 267, 0, 0, 268, 269, 270, 271, 0, 0,
+ 451, 0, 262, 272, 273, 263, 0, 452, 274, 264,
+ 265, 266, 0, 267, 0, 0, 268, 269, 270, 271,
+ 0, 0, 0, 0, 0, 272, 273, 0, 275, 0,
+ 274, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 276, 0, 0, 0, 0, 275, 262, 0, 0,
+ 263, 0, 453, 0, 264, 265, 266, 0, 267, 276,
+ 0, 268, 269, 270, 271, 0, 0, 0, 275, 262,
+ 272, 273, 263, 0, 454, 274, 264, 265, 266, 0,
+ 267, 276, 0, 268, 269, 270, 271, 262, 0, 0,
+ 263, 0, 272, 273, 264, 265, 266, 274, 267, 0,
+ 0, 268, 269, 270, 271, 0, 0, 455, 0, 0,
+ 272, 273, 0, 275, 262, 274, 0, 263, 0, 0,
+ 0, 264, 265, 266, 0, 267, 276, 0, 268, 269,
+ 270, 271, 0, 0, 456, 275, 0, 272, 273, 0,
+ 0, 0, 274, 0, 0, 0, 0, 262, 276, 0,
+ 263, 0, 0, 275, 264, 265, 266, 0, 267, 0,
+ 0, 268, 269, 270, 271, 0, 276, 535, 0, 0,
+ 272, 273, 0, 0, 262, 274, 0, 263, 0, 0,
+ 275, 264, 265, 266, 0, 267, 0, 0, 268, 269,
+ 270, 271, 0, 276, 536, 0, 0, 272, 273, 0,
+ 262, 0, 274, 263, 0, 598, 0, 264, 265, 266,
+ 0, 267, 0, 275, 268, 269, 270, 271, 0, 0,
+ 0, 0, 262, 272, 273, 263, 276, 0, 274, 264,
+ 265, 266, 0, 267, 0, 0, 268, 269, 270, 271,
+ 275, 0, 599, 0, 0, 272, 273, 0, 262, 0,
+ 274, 263, 0, 276, 0, 264, 265, 266, 0, 267,
+ 0, 0, 268, 269, 270, 271, 275, 0, 602, 0,
+ 0, 272, 273, 0, 0, 262, 274, 0, 263, 276,
+ 0, 0, 264, 265, 266, 0, 267, 0, 275, 268,
+ 269, 270, 271, 0, 0, 718, 0, 0, 272, 273,
+ 0, 276, 262, 274, 0, 263, 0, 0, 0, 264,
+ 265, 266, 0, 267, 275, 0, 268, 269, 270, 271,
+ 0, 0, 760, 0, 0, 272, 273, 276, 262, 0,
+ 274, 263, 0, 0, 0, 264, 265, 266, 0, 267,
+ 0, 275, 268, 269, 270, 271, 0, 0, 761, 0,
+ 262, 272, 273, 263, 276, 0, 274, 264, 265, 266,
+ 0, 267, 0, 0, 268, 269, 270, 271, 275, 0,
+ 816, 0, 0, 272, 273, 0, 262, 0, 274, 263,
+ 0, 276, 0, 264, 265, 266, 0, 267, 0, 0,
+ 268, 269, 270, 271, 275, 0, 0, 817, 0, 272,
+ 273, 0, 0, 262, 274, 0, 263, 276, 0, 0,
+ 264, 265, 266, 0, 267, 0, 275, 268, 269, 270,
+ 271, 0, 0, 973, 0, 0, 272, 273, 0, 276,
+ 262, 274, 0, 263, 0, 0, 0, 264, 265, 266,
+ 0, 267, 275, 0, 268, 269, 270, 271, 0, 0,
+ 0, 974, 0, 272, 273, 276, 262, 0, 274, 263,
+ 0, 0, 0, 264, 265, 266, 0, 267, 0, 275,
+ 268, 269, 270, 271, 0, 0, 0, 0, 0, 272,
+ 273, 0, 276, 869, 274, 0, 870, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 275, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 276,
+ 0, 0, 0, 0, 871, 0, 0, 0, 0, 0,
+ 0, 0, 275, 0, 0, 872, 873, 874, 875, 876,
+ 0, 877, 878, 0, 0, 276, 0, 0, 0, 0,
+ 0, 0, 0, 879, 880, 881, 882, 883, 884, 885,
+ 886, 887, 888, 889, 890, 891, 892, 893, 894
};
static const yytype_int16 yycheck[] =
{
- 17, 227, 154, 396, 531, 411, 363, 448, 82, 54,
- 451, 677, 453, 17, 59, 574, 352, 644, 779, 140,
- 65, 752, 384, 167, 142, 384, 170, 10, 65, 574,
- 71, 14, 176, 16, 18, 627, 628, 629, 630, 168,
- 114, 381, 900, 117, 915, 1, 120, 407, 545, 594,
- 1, 20, 1, 24, 37, 142, 130, 1, 16, 17,
- 918, 24, 16, 10, 273, 8, 14, 5, 989, 34,
- 991, 56, 68, 14, 384, 155, 16, 151, 62, 931,
- 121, 168, 1130, 1059, 75, 84, 70, 1135, 129, 22,
- 52, 14, 109, 23, 9, 90, 29, 171, 115, 116,
- 141, 118, 16, 148, 103, 109, 68, 228, 869, 28,
- 14, 232, 116, 96, 118, 233, 509, 238, 135, 481,
- 68, 1097, 481, 28, 165, 142, 56, 172, 169, 124,
- 44, 135, 358, 149, 175, 361, 802, 477, 129, 9,
- 1061, 24, 39, 55, 273, 68, 233, 1043, 164, 54,
- 1046, 168, 0, 149, 24, 172, 173, 174, 55, 751,
- 705, 152, 16, 75, 68, 926, 151, 1019, 172, 173,
- 174, 481, 55, 109, 905, 535, 193, 537, 571, 30,
- 155, 390, 51, 174, 149, 226, 273, 580, 16, 920,
- 105, 857, 75, 62, 98, 861, 180, 121, 123, 70,
- 171, 1059, 150, 161, 167, 154, 568, 224, 155, 568,
- 164, 167, 168, 182, 170, 153, 233, 168, 1139, 371,
- 224, 561, 562, 166, 164, 1096, 170, 150, 14, 316,
- 171, 172, 173, 307, 793, 732, 733, 254, 124, 1097,
- 1111, 110, 599, 97, 57, 149, 168, 82, 793, 174,
- 1, 176, 171, 172, 173, 167, 273, 70, 124, 24,
- 243, 390, 167, 168, 1, 170, 17, 385, 5, 97,
- 388, 255, 36, 10, 291, 393, 394, 718, 54, 30,
- 68, 168, 68, 47, 167, 302, 32, 291, 25, 410,
- 129, 517, 32, 30, 70, 70, 60, 384, 385, 64,
- 374, 388, 695, 390, 52, 80, 393, 394, 54, 396,
- 5, 328, 98, 152, 54, 1076, 167, 168, 658, 170,
- 171, 16, 881, 663, 70, 164, 719, 75, 44, 80,
- 70, 79, 1063, 370, 109, 174, 881, 9, 129, 699,
- 33, 106, 88, 1104, 9, 1, 161, 162, 163, 5,
- 96, 273, 24, 46, 10, 119, 96, 122, 1, 24,
- 512, 152, 989, 149, 150, 14, 9, 384, 385, 1100,
- 63, 388, 1, 390, 30, 1, 393, 394, 129, 396,
- 5, 24, 125, 174, 149, 14, 273, 16, 14, 73,
- 534, 16, 167, 168, 481, 170, 89, 518, 990, 70,
- 1131, 152, 14, 28, 766, 767, 447, 766, 767, 80,
- 161, 162, 163, 164, 1, 1007, 167, 168, 5, 170,
- 27, 28, 509, 174, 175, 54, 177, 25, 26, 446,
- 167, 168, 10, 170, 171, 172, 173, 5, 155, 591,
- 776, 70, 446, 30, 9, 23, 80, 1, 566, 17,
- 856, 1117, 570, 80, 9, 9, 68, 575, 85, 24,
- 80, 88, 384, 155, 481, 85, 388, 10, 390, 24,
- 24, 70, 167, 168, 396, 170, 171, 172, 173, 566,
- 23, 568, 109, 570, 571, 167, 98, 9, 575, 109,
- 80, 108, 509, 580, 121, 85, 167, 168, 9, 170,
- 587, 100, 24, 390, 78, 898, 105, 594, 107, 396,
- 168, 167, 168, 24, 170, 171, 172, 173, 1, 109,
- 9, 82, 17, 1050, 168, 542, 9, 126, 545, 24,
- 818, 819, 549, 167, 168, 24, 170, 149, 150, 556,
- 80, 24, 167, 168, 44, 170, 171, 172, 173, 566,
- 9, 568, 778, 570, 571, 40, 64, 574, 575, 481,
- 24, 155, 579, 580, 164, 24, 894, 895, 53, 690,
- 587, 66, 101, 58, 1, 579, 40, 594, 43, 624,
- 167, 168, 9, 170, 171, 172, 173, 509, 57, 53,
- 16, 678, 14, 680, 58, 612, 81, 24, 106, 167,
- 168, 169, 170, 171, 172, 173, 144, 624, 695, 25,
- 627, 628, 629, 630, 122, 273, 16, 81, 705, 24,
- 624, 75, 509, 267, 268, 79, 111, 167, 168, 273,
- 170, 16, 719, 22, 1075, 24, 393, 394, 712, 713,
- 29, 149, 625, 626, 661, 67, 568, 111, 70, 571,
- 566, 146, 147, 575, 570, 125, 16, 661, 580, 1016,
- 16, 678, 129, 680, 16, 587, 161, 162, 163, 164,
- 14, 93, 167, 168, 169, 170, 16, 16, 695, 766,
- 767, 16, 104, 9, 571, 152, 170, 109, 705, 69,
- 24, 32, 779, 580, 16, 1088, 741, 164, 120, 23,
- 587, 10, 719, 171, 172, 173, 793, 174, 175, 726,
- 177, 164, 786, 54, 167, 732, 733, 170, 45, 46,
- 96, 174, 739, 96, 741, 14, 384, 41, 71, 70,
- 57, 24, 390, 171, 751, 739, 63, 741, 396, 80,
- 384, 22, 101, 24, 85, 78, 390, 88, 29, 766,
- 767, 78, 396, 9, 105, 96, 678, 176, 680, 43,
- 87, 72, 779, 780, 96, 16, 161, 94, 109, 164,
- 16, 168, 167, 695, 24, 170, 793, 172, 173, 931,
- 96, 129, 869, 12, 13, 105, 15, 9, 26, 18,
- 19, 678, 21, 680, 881, 10, 23, 719, 27, 28,
- 10, 818, 819, 924, 152, 822, 167, 168, 695, 170,
- 171, 898, 829, 934, 16, 832, 106, 171, 822, 17,
- 34, 167, 168, 481, 170, 829, 174, 175, 155, 177,
- 70, 34, 719, 164, 171, 172, 173, 481, 111, 926,
- 171, 172, 173, 930, 766, 767, 75, 80, 165, 14,
- 148, 509, 869, 90, 83, 23, 873, 779, 43, 9,
- 105, 24, 936, 9, 881, 509, 953, 1019, 66, 171,
- 14, 14, 959, 86, 16, 17, 273, 894, 895, 88,
- 967, 898, 16, 900, 901, 25, 903, 165, 905, 34,
- 164, 174, 779, 35, 174, 9, 129, 901, 915, 903,
- 42, 918, 98, 65, 14, 549, 103, 84, 16, 926,
- 568, 53, 556, 571, 171, 24, 171, 59, 16, 152,
- 14, 938, 580, 82, 568, 16, 23, 571, 88, 587,
- 1, 14, 174, 99, 167, 168, 580, 170, 80, 81,
- 148, 174, 175, 587, 177, 23, 17, 869, 146, 147,
- 23, 873, 14, 16, 23, 16, 1043, 23, 149, 1046,
- 1047, 82, 90, 161, 162, 163, 164, 124, 53, 167,
- 168, 169, 170, 990, 25, 992, 898, 26, 24, 9,
- 164, 167, 869, 627, 628, 629, 630, 384, 992, 1076,
- 1007, 1078, 23, 390, 124, 24, 64, 161, 174, 396,
- 129, 1088, 14, 161, 926, 16, 167, 161, 164, 80,
- 16, 898, 16, 16, 23, 23, 938, 1104, 160, 161,
- 678, 23, 680, 105, 16, 167, 168, 81, 170, 171,
- 172, 173, 1119, 1120, 678, 9, 680, 695, 34, 926,
- 12, 13, 1059, 15, 9, 152, 18, 19, 14, 21,
- 23, 695, 164, 1070, 24, 27, 28, 85, 129, 1076,
- 24, 719, 23, 17, 23, 34, 1070, 34, 726, 101,
- 16, 1088, 105, 150, 16, 719, 164, 371, 174, 1096,
- 1097, 152, 726, 816, 481, 376, 820, 1104, 820, 459,
- 161, 162, 163, 164, 1111, 591, 167, 168, 875, 170,
- 938, 705, 881, 174, 175, 715, 177, 751, 766, 767,
- 932, 714, 509, 684, 587, 678, 70, 767, 766, 1048,
- 233, 779, 766, 767, 575, 721, 80, 21, 66, 61,
- 54, 132, 153, 382, 240, 779, 1, 260, 921, 763,
- 5, 1147, 556, 832, 1111, 10, 100, 900, 1007, 14,
- 1114, 1072, 549, 107, 1076, 1115, 990, 1001, 23, 556,
- 467, 1131, 806, 807, 658, 30, 1088, 466, 561, -1,
- -1, 568, 126, -1, 571, 129, -1, -1, -1, -1,
- -1, -1, 1104, 580, -1, -1, -1, -1, 832, 1076,
- 587, 19, -1, 21, 133, -1, -1, -1, 152, -1,
- -1, 1088, 67, -1, -1, 70, -1, 161, 162, 163,
- 164, 869, -1, 167, 168, 873, 170, 1104, -1, -1,
- 174, 175, -1, 177, -1, 869, -1, -1, 93, 873,
- 627, 628, 629, 630, -1, -1, 894, 895, 66, 104,
- 898, -1, 181, 182, 109, 184, 185, -1, -1, -1,
- 894, 895, -1, -1, 898, 120, 900, 196, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 926, 97,
- 209, 915, -1, -1, 918, -1, -1, -1, 80, -1,
- 938, 678, 926, 680, -1, -1, -1, -1, -1, -1,
- -1, 230, -1, -1, 938, -1, -1, -1, 695, -1,
- 239, -1, 167, 168, 17, 170, 171, 172, 173, -1,
- -1, -1, -1, -1, -1, -1, -1, 30, 146, -1,
- -1, -1, 719, -1, -1, -1, -1, 129, -1, 726,
- -1, -1, -1, 161, 162, 163, 164, -1, -1, 167,
- 168, -1, 170, 171, -1, -1, 990, -1, -1, -1,
- 152, -1, -1, -1, 751, -1, -1, -1, -1, 161,
- 162, 163, 164, 1007, -1, 167, 168, 80, 170, 766,
- 767, -1, 174, 175, -1, 177, -1, -1, 317, 318,
- 319, -1, 779, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 331, -1, -1, -1, -1, -1, 337, 338,
- 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- -1, -1, -1, 5, -1, 1059, 129, -1, 1076, -1,
- 359, -1, -1, -1, 16, 17, -1, 19, 367, 21,
- 1088, -1, 1076, -1, -1, 832, -1, -1, -1, 152,
- -1, -1, -1, -1, 1088, -1, 1104, -1, 161, 162,
- 163, 164, 1096, 1097, 167, 168, -1, 170, -1, -1,
- 1104, 174, 175, -1, 177, -1, -1, 1111, -1, -1,
- 1, -1, 869, -1, 66, 6, 873, -1, 70, -1,
- -1, -1, -1, 14, -1, 16, 17, -1, 19, -1,
- 21, -1, -1, -1, -1, -1, 88, 894, 895, -1,
- -1, 898, -1, 900, 443, 97, -1, 38, -1, -1,
- -1, 42, -1, -1, -1, 454, -1, 456, 915, 50,
- -1, 918, 53, 4, -1, -1, 16, 17, -1, 926,
- 11, 12, 13, -1, 15, 66, -1, 18, 19, 20,
- 21, 938, -1, -1, -1, -1, 27, 28, -1, 80,
- 81, -1, 42, -1, 146, -1, -1, 88, -1, -1,
- 91, 92, -1, 53, -1, -1, -1, 98, -1, 161,
- 162, 163, 164, -1, -1, 167, 168, 169, 170, 171,
- 172, 173, -1, -1, 523, 16, -1, -1, -1, 528,
- 80, 81, -1, 990, 75, -1, 127, -1, -1, -1,
- -1, -1, 83, -1, -1, -1, -1, -1, -1, -1,
- 1007, 42, -1, -1, -1, 146, -1, -1, -1, -1,
- -1, -1, 53, -1, -1, -1, -1, -1, -1, 160,
- 161, 162, 163, 164, 65, -1, 167, 168, 169, 170,
- 171, 172, 173, -1, -1, -1, -1, -1, -1, 80,
- 81, -1, -1, 1, -1, -1, 595, -1, 6, -1,
- -1, -1, 1059, -1, -1, -1, 14, 98, 16, 17,
- 160, 19, -1, 21, -1, -1, -1, 167, 168, 1076,
- 170, 171, 172, 173, -1, -1, -1, -1, -1, -1,
- 38, 1088, -1, -1, 42, -1, -1, -1, -1, 1096,
- 1097, -1, 50, -1, 1, 53, -1, 1104, -1, 6,
- -1, -1, -1, -1, 1111, -1, -1, -1, 66, 16,
- 17, -1, 19, -1, 21, -1, -1, -1, -1, 160,
- -1, -1, 80, 81, -1, -1, 167, 168, -1, 170,
- 88, 38, 681, 91, 92, 42, 5, -1, -1, -1,
- 98, 10, -1, 50, -1, -1, 53, 16, 17, -1,
- 19, -1, 21, -1, 703, 704, -1, -1, -1, 66,
- -1, -1, 1, -1, -1, -1, 5, -1, -1, 127,
- -1, 10, 721, 80, 81, -1, -1, 16, 17, -1,
- 19, 88, 21, -1, 91, 92, -1, 26, 146, -1,
- -1, 98, -1, -1, -1, -1, -1, 66, -1, -1,
- -1, -1, 160, 161, 162, 163, 164, -1, -1, 167,
- 168, 169, 170, 171, 172, 173, -1, 1, -1, 88,
- 127, 5, -1, 35, -1, -1, -1, 66, 97, -1,
- 42, -1, 16, 17, -1, 19, -1, 21, -1, 146,
- -1, 53, -1, -1, -1, -1, -1, 59, -1, -1,
- -1, -1, -1, 160, 161, 162, 163, 164, 97, -1,
- 167, 168, 169, 170, 171, 172, 173, -1, 80, 81,
- -1, -1, -1, -1, -1, -1, -1, 146, -1, -1,
- -1, -1, 66, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 161, 162, 163, 164, -1, -1, 167, 168,
- 169, 170, 171, 172, 173, -1, -1, 146, -1, -1,
- 11, 12, 13, 97, 15, -1, -1, 18, 19, 20,
- 21, -1, 161, 162, 163, 164, 27, 28, 167, 168,
- 169, 170, 171, 172, 173, 5, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 16, 17, 160, 19,
- -1, 21, -1, -1, 5, 167, 168, -1, 170, 171,
- 172, 173, 146, -1, -1, 16, 17, -1, 19, -1,
- 21, -1, -1, -1, 75, -1, -1, 161, 162, 163,
- 164, -1, 83, 167, 168, 169, 170, 171, 172, 173,
- 5, -1, -1, -1, -1, -1, 66, -1, -1, 948,
- 949, 16, 17, -1, 19, -1, 21, -1, -1, 24,
- -1, 960, -1, -1, -1, 66, -1, -1, 88, -1,
- 969, 970, 5, -1, -1, -1, -1, 97, -1, -1,
- -1, -1, 981, 16, 17, -1, 19, 88, 21, -1,
- -1, -1, -1, -1, -1, -1, 97, -1, -1, 119,
- -1, 66, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 11, 12, 13, -1, 15, -1, -1, 18, 19,
- 20, 21, -1, 5, -1, -1, 146, 27, 28, -1,
- -1, -1, 97, 66, 16, 17, -1, 19, -1, 21,
- -1, 161, 162, 163, 164, 146, -1, 167, 168, 169,
- 170, 171, 172, 173, -1, 88, -1, -1, -1, -1,
- 161, 162, 163, 164, 97, -1, 167, 168, 169, 170,
- 171, 172, 173, -1, -1, 75, -1, -1, -1, -1,
- -1, 146, -1, 83, 66, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 161, 162, 163, 164,
- -1, -1, 167, 168, 169, 170, 171, 172, 173, -1,
- -1, -1, -1, 146, -1, 97, -1, -1, -1, -1,
- -1, 17, -1, -1, -1, -1, -1, 23, 161, 162,
- 163, 164, -1, -1, 167, 168, 169, 170, 171, 172,
- 173, 37, -1, -1, -1, -1, -1, -1, -1, -1,
- 46, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 6, -1, 146, 61, -1, 63, -1, -1,
- -1, -1, 16, 17, 70, 19, -1, 21, -1, 161,
- 162, 163, 164, -1, 80, 167, 168, 169, 170, 171,
- 172, 173, 36, -1, 38, -1, -1, -1, 42, -1,
- -1, -1, -1, -1, 100, -1, 50, -1, -1, 53,
- -1, 107, -1, 6, -1, -1, -1, -1, -1, -1,
- -1, -1, 66, 16, 17, -1, 19, -1, 21, -1,
- 126, -1, -1, 129, -1, 28, 80, 81, -1, -1,
- -1, -1, -1, -1, 88, 38, -1, 91, 92, 42,
- -1, -1, -1, -1, 98, -1, 152, 50, -1, -1,
- 53, -1, -1, -1, -1, 161, 162, 163, 164, 62,
- -1, 167, 168, 66, 170, 119, -1, -1, 174, 175,
- -1, 177, -1, 127, -1, -1, -1, 80, 81, -1,
- -1, -1, -1, -1, -1, 88, -1, -1, 91, 92,
- -1, -1, 146, -1, -1, 98, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 160, 161, 162, 163,
- 164, -1, -1, 167, 168, 169, 170, 171, 172, 173,
- -1, -1, -1, -1, 127, -1, -1, -1, -1, -1,
+ 18, 62, 277, 53, 285, 191, 354, 18, 69, 210,
+ 15, 340, 56, 472, 112, 216, 69, 227, 677, 472,
+ 711, 646, 609, 610, 611, 612, 68, 209, 1, 422,
+ 624, 422, 1, 304, 5, 10, 134, 1, 828, 24,
+ 16, 8, 16, 5, 842, 51, 24, 422, 9, 70,
+ 68, 32, 75, 16, 900, 845, 902, 1, 717, 109,
+ 68, 720, 106, 66, 70, 16, 17, 111, 64, 398,
+ 953, 74, 122, 51, 88, 1016, 16, 14, 419, 75,
+ 1021, 123, 209, 101, 792, 28, 91, 105, 132, 107,
+ 101, 135, 70, 58, 105, 1, 107, 209, 123, 14,
+ 759, 41, 14, 728, 433, 123, 989, 50, 153, 955,
+ 124, 17, 84, 211, 52, 123, 509, 431, 509, 14,
+ 0, 435, 121, 710, 30, 62, 64, 188, 226, 101,
+ 107, 94, 591, 136, 509, 336, 186, 158, 159, 104,
+ 411, 832, 103, 166, 167, 853, 169, 62, 158, 159,
+ 62, 176, 75, 178, 48, 176, 847, 122, 95, 96,
+ 166, 222, 787, 953, 505, 183, 176, 148, 62, 75,
+ 166, 167, 183, 169, 27, 28, 138, 304, 153, 1025,
+ 67, 166, 457, 148, 202, 229, 284, 163, 166, 163,
+ 988, 209, 304, 166, 167, 588, 169, 588, 165, 989,
+ 169, 209, 1000, 167, 222, 223, 224, 478, 152, 160,
+ 5, 222, 223, 224, 528, 75, 36, 403, 153, 190,
+ 47, 16, 681, 166, 167, 85, 169, 124, 414, 56,
+ 238, 51, 75, 28, 149, 1, 437, 149, 10, 257,
+ 581, 582, 85, 166, 167, 427, 169, 107, 14, 64,
+ 531, 23, 158, 159, 160, 161, 162, 163, 572, 14,
+ 166, 167, 22, 169, 107, 283, 957, 48, 597, 29,
+ 176, 177, 283, 179, 124, 170, 171, 172, 173, 174,
+ 175, 28, 109, 98, 411, 64, 304, 292, 103, 70,
+ 105, 41, 751, 74, 148, 422, 304, 568, 751, 411,
+ 427, 992, 927, 353, 490, 14, 900, 62, 14, 163,
+ 422, 10, 127, 31, 901, 427, 9, 658, 9, 1,
+ 1, 1, 663, 9, 23, 43, 1017, 9, 9, 347,
+ 917, 24, 542, 24, 993, 62, 347, 17, 24, 57,
+ 95, 96, 24, 24, 170, 171, 473, 972, 64, 402,
+ 24, 478, 745, 746, 745, 746, 62, 126, 485, 75,
+ 75, 820, 153, 461, 166, 17, 478, 820, 716, 87,
+ 85, 166, 167, 485, 169, 170, 171, 172, 173, 174,
+ 175, 423, 509, 9, 58, 9, 428, 429, 438, 95,
+ 96, 107, 107, 411, 149, 75, 64, 509, 24, 944,
+ 24, 9, 947, 411, 422, 423, 121, 75, 60, 427,
+ 428, 429, 25, 26, 422, 423, 24, 85, 9, 427,
+ 428, 429, 549, 170, 171, 172, 173, 174, 175, 106,
+ 104, 473, 9, 24, 70, 428, 429, 549, 74, 107,
+ 40, 568, 460, 149, 645, 14, 41, 24, 122, 460,
+ 166, 167, 25, 169, 472, 473, 568, 158, 159, 477,
+ 478, 588, 163, 16, 99, 473, 477, 485, 586, 16,
+ 478, 589, 590, 16, 148, 176, 588, 485, 158, 159,
+ 160, 161, 162, 163, 16, 16, 166, 167, 16, 169,
+ 16, 509, 61, 145, 146, 64, 176, 177, 1, 179,
+ 22, 509, 24, 16, 1, 16, 9, 29, 160, 161,
+ 162, 163, 9, 563, 166, 167, 168, 169, 16, 646,
+ 16, 24, 91, 166, 167, 543, 169, 24, 1, 16,
+ 16, 549, 5, 102, 646, 158, 159, 10, 107, 16,
+ 163, 549, 16, 163, 586, 16, 607, 589, 590, 16,
+ 568, 120, 25, 176, 177, 16, 179, 30, 576, 52,
+ 568, 62, 14, 17, 93, 126, 158, 159, 586, 850,
+ 588, 589, 590, 591, 93, 24, 30, 16, 586, 38,
+ 588, 589, 590, 591, 176, 177, 37, 179, 37, 607,
+ 16, 609, 610, 611, 612, 24, 607, 926, 49, 24,
+ 49, 728, 53, 608, 53, 732, 792, 9, 22, 653,
+ 24, 163, 9, 169, 166, 29, 728, 169, 745, 746,
+ 732, 75, 1, 93, 176, 103, 5, 63, 646, 647,
+ 81, 10, 81, 745, 746, 160, 161, 162, 646, 700,
+ 16, 24, 23, 661, 688, 689, 163, 10, 65, 209,
+ 661, 30, 16, 170, 171, 172, 173, 174, 175, 110,
+ 787, 110, 99, 681, 73, 23, 1, 853, 10, 16,
+ 5, 75, 799, 681, 178, 787, 951, 66, 40, 103,
+ 88, 699, 700, 147, 23, 16, 24, 799, 699, 700,
+ 26, 9, 710, 166, 167, 30, 169, 170, 171, 172,
+ 173, 174, 175, 26, 158, 159, 160, 161, 162, 163,
+ 728, 104, 166, 167, 732, 169, 24, 32, 32, 164,
+ 728, 14, 176, 177, 110, 179, 59, 745, 746, 40,
+ 103, 25, 16, 751, 164, 785, 32, 745, 746, 14,
+ 23, 176, 176, 751, 304, 795, 16, 16, 163, 767,
+ 95, 9, 770, 797, 158, 159, 767, 101, 318, 319,
+ 26, 16, 166, 167, 84, 169, 16, 24, 14, 787,
+ 23, 176, 176, 177, 166, 179, 23, 147, 124, 787,
+ 97, 799, 88, 791, 49, 25, 24, 166, 167, 148,
+ 169, 170, 171, 172, 173, 174, 175, 26, 9, 14,
+ 927, 166, 820, 163, 170, 171, 172, 173, 174, 175,
+ 828, 829, 820, 58, 832, 927, 9, 17, 829, 124,
+ 160, 176, 163, 23, 842, 16, 158, 845, 16, 16,
+ 160, 166, 167, 160, 169, 170, 171, 172, 173, 174,
+ 175, 160, 209, 43, 163, 972, 76, 166, 16, 103,
+ 169, 411, 17, 172, 173, 174, 175, 57, 16, 24,
+ 972, 81, 422, 871, 64, 4, 9, 427, 7, 877,
+ 9, 32, 11, 12, 13, 75, 15, 885, 159, 18,
+ 19, 20, 21, 901, 114, 903, 14, 163, 27, 28,
+ 23, 85, 903, 32, 23, 60, 32, 24, 98, 917,
+ 5, 24, 32, 99, 16, 105, 103, 137, 138, 927,
+ 140, 141, 17, 5, 149, 16, 176, 734, 478, 927,
+ 163, 929, 403, 490, 16, 485, 799, 127, 681, 159,
+ 820, 70, 691, 690, 553, 953, 944, 304, 793, 947,
+ 948, 171, 745, 485, 83, 746, 964, 949, 123, 509,
+ 556, 27, 70, 964, 972, 65, 19, 187, 158, 159,
+ 160, 161, 162, 163, 972, 190, 166, 167, 75, 169,
+ 988, 989, 420, 848, 742, 1033, 176, 177, 576, 179,
+ 145, 146, 1000, 543, 214, 313, 770, 1000, 828, 549,
+ 917, 1003, 901, 911, 494, 160, 161, 162, 163, 1007,
+ 1008, 166, 167, 168, 169, 495, 966, 1004, 568, 581,
+ 240, 241, 658, 243, 244, 245, 576, 247, 248, 249,
+ -1, -1, 1017, 253, 254, 255, -1, -1, 588, -1,
+ 260, -1, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 411, -1, -1, -1, -1, 609,
+ 610, 611, 612, -1, -1, 422, -1, -1, -1, 289,
+ 427, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 175, -1, -1, -1, 166, 167, -1, 169, 170, 171,
+ 172, 173, 174, 175, 42, 43, 646, 1, -1, -1,
+ -1, 5, -1, -1, 52, -1, 10, -1, -1, 57,
+ -1, -1, 16, 17, -1, 19, 64, 21, -1, -1,
+ -1, 478, 26, -1, -1, 73, -1, -1, 485, 170,
+ 171, 172, 173, 174, 175, -1, -1, -1, 86, 42,
+ 43, 361, -1, 1, 92, 365, -1, 5, -1, 52,
+ -1, -1, 509, -1, 57, -1, 60, -1, 16, 17,
+ 710, 19, -1, 21, -1, -1, -1, -1, -1, -1,
+ 73, 391, -1, -1, -1, -1, -1, -1, 728, 399,
+ -1, 401, 732, 86, -1, -1, 543, -1, -1, 92,
+ 94, -1, 549, -1, -1, 745, 746, 12, 13, -1,
+ 15, -1, 60, 18, 19, 153, 21, -1, -1, -1,
+ -1, 568, 27, 28, -1, -1, -1, -1, -1, 576,
+ 770, 441, -1, -1, 444, -1, -1, -1, -1, -1,
+ -1, 588, 452, 453, 454, -1, 94, 787, -1, -1,
+ -1, 145, -1, -1, -1, -1, -1, -1, -1, 799,
+ 153, -1, 609, 610, 611, 612, 160, 161, 162, 163,
+ -1, -1, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, -1, -1, -1, -1, -1, -1, 828, -1,
+ -1, -1, -1, -1, 10, -1, -1, 145, 14, 646,
+ -1, -1, 842, -1, -1, 845, -1, 23, -1, 25,
+ 26, -1, 160, 161, 162, 163, -1, -1, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 1, -1, -1,
+ 550, 5, -1, -1, -1, 61, 10, -1, 64, -1,
+ 14, -1, -1, -1, 10, -1, -1, -1, 14, 23,
+ -1, 901, -1, 710, -1, -1, 30, 23, -1, 25,
+ 26, -1, -1, -1, -1, 91, -1, 917, -1, -1,
+ -1, 728, 592, -1, -1, 732, 102, 927, 598, -1,
+ 600, 107, 75, -1, -1, -1, -1, 61, 745, 746,
+ 64, -1, -1, -1, 120, 61, -1, -1, 64, -1,
+ -1, -1, -1, 953, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 770, -1, -1, -1, 91, -1, -1,
+ -1, -1, 972, -1, -1, 91, -1, -1, 102, -1,
+ 787, -1, -1, 107, -1, -1, 102, -1, 988, 989,
+ -1, 107, 799, -1, -1, -1, 120, -1, -1, -1,
+ 1000, -1, -1, -1, 120, -1, -1, -1, -1, 679,
+ 680, -1, -1, -1, -1, 158, 159, 160, 161, 162,
+ 163, 828, -1, 166, 167, -1, 169, -1, -1, -1,
+ -1, -1, -1, 176, 177, 842, 179, -1, 845, -1,
+ -1, -1, 166, 167, -1, 169, 170, 171, 172, 173,
+ 174, 175, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 1, -1, -1, -1, -1, 6, -1,
+ -1, -1, -1, 1, -1, -1, -1, 5, 16, 17,
+ -1, 19, 10, 21, -1, -1, 14, -1, -1, -1,
+ -1, -1, -1, -1, 901, 23, -1, 35, -1, -1,
+ -1, 39, 30, -1, -1, -1, 44, -1, 46, -1,
+ 917, 49, 5, -1, -1, -1, -1, 10, -1, -1,
+ 927, -1, 60, 16, 17, -1, 19, -1, 21, -1,
+ 68, -1, -1, 61, -1, -1, 64, 75, 76, 77,
+ 78, 79, 80, 81, 82, -1, 953, -1, -1, -1,
+ -1, 89, 90, -1, -1, -1, -1, 95, -1, -1,
+ -1, 5, -1, 91, -1, 972, -1, 60, -1, -1,
+ 108, -1, 16, 17, 102, 19, -1, 21, 116, 107,
+ 24, 988, 989, -1, -1, -1, -1, 125, -1, -1,
+ 128, -1, 120, 1000, -1, -1, 866, 867, 5, -1,
+ -1, 94, -1, -1, -1, -1, -1, 145, 878, 16,
+ 17, -1, 19, -1, 21, -1, 60, 887, 888, -1,
+ -1, -1, 160, 161, 162, 163, -1, -1, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 166, 167,
+ -1, 169, 170, 171, 172, 173, 174, 175, 5, -1,
+ 94, -1, 145, 60, -1, -1, -1, -1, -1, 16,
+ 17, -1, 19, -1, 21, -1, -1, 160, 161, 162,
+ 163, -1, -1, 166, 167, 168, 169, 170, 171, 172,
+ 173, 174, 175, -1, -1, -1, -1, 94, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 145, -1, 60, -1, -1, -1, -1, -1, -1,
+ -1, -1, 119, -1, -1, -1, 160, 161, 162, 163,
+ -1, -1, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, -1, -1, -1, -1, -1, 94, 145, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 160, 161, 162, 163, -1, -1, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, -1,
+ 4, -1, -1, 7, -1, 9, -1, 11, 12, 13,
+ -1, 15, -1, -1, 18, 19, 20, 21, 145, -1,
+ 24, -1, -1, 27, 28, -1, -1, -1, 32, -1,
+ -1, -1, -1, 160, 161, 162, 163, -1, -1, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 6,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 16,
+ 17, -1, 19, -1, 21, -1, 70, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 34, 35, 83,
+ -1, -1, 39, -1, -1, -1, -1, 44, 31, 46,
+ -1, 34, 49, -1, -1, -1, -1, -1, -1, 42,
+ 43, -1, 45, 60, -1, -1, -1, -1, -1, 52,
+ -1, 68, 55, -1, 57, -1, -1, -1, 75, 76,
+ 77, 78, 79, 80, 81, 82, -1, -1, -1, -1,
+ 73, -1, 89, 90, -1, -1, -1, -1, 95, -1,
+ -1, -1, -1, 86, 87, -1, -1, -1, -1, 92,
+ -1, 108, -1, -1, -1, -1, -1, -1, -1, 116,
+ -1, -1, 119, -1, -1, -1, -1, -1, 125, -1,
+ -1, 128, -1, 17, -1, -1, 119, -1, -1, 23,
+ 12, 13, -1, 15, -1, -1, 18, 19, 145, 21,
+ -1, -1, -1, -1, -1, 27, 28, -1, -1, 43,
+ -1, -1, -1, 160, 161, 162, 163, -1, -1, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 6,
+ 64, -1, -1, -1, -1, -1, -1, -1, -1, 16,
+ 17, 75, 19, -1, 21, -1, -1, -1, 70, -1,
+ -1, 28, -1, -1, -1, -1, -1, -1, 35, -1,
+ -1, 83, 39, -1, 98, -1, -1, 44, -1, 46,
+ -1, 105, 49, -1, -1, -1, -1, -1, -1, 56,
+ -1, -1, -1, 60, -1, -1, -1, -1, -1, -1,
+ -1, 68, -1, 127, -1, -1, -1, -1, 75, 76,
+ 77, 78, 79, 80, 81, 82, -1, -1, -1, -1,
+ -1, -1, 89, 90, -1, -1, -1, -1, 95, -1,
+ -1, -1, -1, -1, 158, 159, 160, 161, 162, 163,
+ -1, 108, 166, 167, -1, 169, -1, -1, -1, 116,
+ -1, -1, 176, 177, -1, 179, -1, 4, 125, -1,
+ 7, 128, -1, 17, 11, 12, 13, -1, 15, -1,
+ -1, 18, 19, 20, 21, -1, -1, 24, 145, -1,
+ 27, 28, -1, -1, -1, 32, -1, -1, -1, 43,
+ -1, -1, -1, 160, 161, 162, 163, -1, -1, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 6,
+ 64, -1, -1, -1, -1, -1, -1, -1, -1, 16,
+ 17, 75, 19, 70, 21, -1, -1, -1, -1, -1,
+ -1, 28, -1, -1, -1, -1, 83, -1, 35, -1,
+ -1, -1, 39, -1, 98, -1, -1, 44, -1, 46,
+ -1, 105, 49, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 60, -1, -1, -1, -1, -1, -1,
+ -1, 68, -1, 127, -1, -1, -1, -1, 75, 76,
+ 77, 78, 79, 80, 81, 82, -1, -1, -1, -1,
+ -1, -1, 89, 90, -1, -1, -1, -1, 95, -1,
+ -1, -1, -1, -1, 158, 159, 160, 161, 162, 163,
+ -1, 108, 166, 167, -1, 169, -1, -1, -1, 116,
+ -1, -1, 176, 177, -1, 179, -1, 4, 125, -1,
+ 7, 128, -1, 17, 11, 12, 13, -1, 15, -1,
+ -1, 18, 19, 20, 21, -1, -1, 24, 145, -1,
+ 27, 28, -1, -1, -1, 32, -1, -1, -1, -1,
+ -1, -1, -1, 160, 161, 162, 163, -1, -1, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 6,
+ 64, -1, -1, -1, -1, -1, -1, -1, -1, 16,
+ 17, 75, 19, 70, 21, -1, -1, 24, -1, -1,
+ -1, -1, -1, -1, -1, -1, 83, -1, 35, -1,
+ -1, -1, 39, -1, 98, -1, -1, 44, -1, 46,
+ -1, 105, 49, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 60, -1, -1, -1, -1, -1, -1,
+ -1, 68, -1, 127, -1, -1, -1, -1, 75, 76,
+ 77, 78, 79, 80, 81, 82, -1, -1, -1, -1,
+ -1, -1, 89, 90, -1, -1, -1, -1, 95, -1,
+ -1, -1, -1, -1, 158, 159, 160, 161, 162, 163,
+ -1, 108, 166, 167, -1, 169, -1, -1, -1, 116,
+ -1, -1, 176, 177, -1, 179, -1, 4, 125, -1,
+ 7, 128, -1, -1, 11, 12, 13, -1, 15, -1,
+ -1, 18, 19, 20, 21, -1, -1, 24, 145, -1,
+ 27, 28, -1, -1, -1, 32, -1, -1, -1, -1,
+ -1, -1, -1, 160, 161, 162, 163, -1, -1, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 6,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 16,
+ 17, -1, 19, 70, 21, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 83, -1, 35, -1,
+ -1, -1, 39, -1, -1, -1, -1, 44, 17, 46,
+ -1, -1, 49, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 60, -1, -1, -1, -1, -1, -1,
+ -1, 68, -1, -1, 43, -1, -1, -1, 75, 76,
+ 77, 78, 79, 80, 81, 82, -1, -1, 57, -1,
+ -1, -1, 89, 90, -1, 64, -1, -1, 95, -1,
+ -1, 4, -1, -1, -1, -1, 75, -1, 11, 12,
+ 13, 108, 15, -1, -1, 18, 19, 20, 21, 116,
+ -1, -1, -1, -1, 27, 28, -1, -1, 125, 98,
+ -1, 128, -1, -1, -1, -1, 105, -1, -1, -1,
+ -1, -1, -1, 11, 12, 13, -1, 15, 145, -1,
+ 18, 19, 20, 21, -1, -1, -1, -1, 127, 27,
+ 28, -1, -1, 160, 161, 162, 163, 70, -1, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, -1,
+ 83, -1, -1, -1, -1, -1, 16, 17, -1, 158,
+ 159, 160, 161, 162, 163, -1, -1, 166, 167, -1,
+ 169, -1, 70, 33, 16, 17, -1, 176, 177, 39,
+ 179, -1, -1, -1, 44, 83, -1, -1, -1, 49,
+ -1, -1, -1, -1, 54, -1, -1, 39, -1, -1,
+ -1, -1, 44, -1, -1, -1, -1, 49, 68, -1,
+ -1, -1, -1, -1, -1, 75, 76, 77, 78, 79,
+ 80, 81, 82, -1, -1, -1, 68, -1, -1, -1,
+ -1, -1, -1, 75, 76, 77, 78, 79, 80, 81,
+ 82, -1, -1, -1, -1, 11, 12, 13, 108, 15,
+ -1, -1, 18, 19, 20, 21, 116, -1, -1, -1,
+ -1, 27, 28, -1, -1, 125, 108, -1, -1, -1,
+ -1, -1, -1, -1, 116, -1, -1, -1, -1, -1,
+ -1, -1, -1, 125, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 16, -1, -1, -1, -1, -1, -1,
+ 160, -1, -1, -1, 70, -1, 166, 167, -1, 169,
+ 170, 171, 172, 173, 174, 175, 39, 83, -1, -1,
+ -1, 44, -1, -1, 166, 167, 49, 169, 170, 171,
+ 172, 173, 174, 175, -1, -1, 59, -1, -1, -1,
+ -1, -1, -1, -1, -1, 68, -1, -1, -1, -1,
+ -1, -1, 75, 76, 77, 78, 79, 80, 81, 82,
+ -1, -1, 33, -1, -1, -1, -1, -1, 39, -1,
+ -1, -1, 95, 44, -1, -1, -1, -1, 49, -1,
+ -1, -1, -1, 54, -1, 108, -1, -1, -1, -1,
+ -1, -1, -1, 116, -1, -1, -1, 68, -1, -1,
+ -1, -1, 125, -1, 75, 76, 77, 78, 79, 80,
+ 81, 82, 4, 5, -1, 7, -1, -1, -1, 11,
+ 12, 13, -1, 15, -1, -1, 18, 19, 20, 21,
+ -1, -1, -1, -1, -1, 27, 28, 108, -1, -1,
+ 32, -1, -1, 166, 167, 116, 169, -1, 4, -1,
+ -1, 7, -1, -1, 125, 11, 12, 13, -1, 15,
+ -1, -1, 18, 19, 20, 21, -1, -1, 24, -1,
+ -1, 27, 28, -1, -1, -1, 32, -1, 70, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 146, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 160, 161, 162,
- 163, 164, -1, 6, 167, 168, 169, 170, 171, 172,
- 173, 14, -1, 16, 17, -1, 19, -1, 21, -1,
- -1, 24, -1, 6, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 16, 17, 38, 19, -1, 21, 42,
- -1, -1, -1, -1, -1, 28, -1, 50, -1, -1,
- 53, -1, -1, -1, 31, 38, 33, -1, -1, 42,
- -1, -1, -1, 66, -1, -1, -1, 50, 45, 46,
- 53, 48, -1, -1, -1, -1, -1, 80, 81, -1,
- 57, -1, -1, 66, -1, 88, 63, -1, 91, 92,
- -1, -1, -1, -1, -1, 98, -1, 80, 81, -1,
- -1, 78, -1, -1, -1, 88, -1, -1, 91, 92,
- 87, -1, 89, -1, -1, 98, -1, 94, 95, -1,
- -1, -1, -1, -1, 127, 4, -1, -1, 7, -1,
- -1, -1, 11, 12, 13, -1, 15, -1, -1, 18,
- 19, 20, 21, 146, 127, 24, -1, -1, 27, 28,
- -1, -1, -1, -1, -1, 34, -1, 160, 161, 162,
- 163, 164, -1, 146, 167, 168, 169, 170, 171, 172,
- 173, -1, -1, -1, -1, -1, -1, 160, 161, 162,
- 163, 164, 6, -1, 167, 168, 169, 170, 171, 172,
- 173, -1, 16, 17, -1, 19, 75, 21, -1, -1,
- 24, -1, 6, -1, 83, -1, -1, -1, -1, -1,
- -1, -1, 16, 17, 38, 19, -1, 21, 42, -1,
- -1, -1, -1, -1, -1, -1, 50, -1, -1, 53,
- -1, -1, -1, -1, 38, -1, -1, -1, 42, -1,
- -1, -1, 66, -1, -1, -1, 50, -1, -1, 53,
- -1, -1, -1, -1, -1, -1, 80, 81, -1, -1,
- -1, -1, 66, -1, 88, -1, -1, 91, 92, -1,
- -1, 17, -1, -1, 98, -1, 80, 81, -1, -1,
- -1, -1, -1, -1, 88, -1, -1, 91, 92, -1,
- -1, 37, -1, 10, 98, -1, -1, 14, -1, 17,
- 46, -1, -1, 127, -1, 23, 23, -1, 25, 26,
- -1, -1, -1, -1, -1, 61, -1, 63, -1, -1,
- -1, -1, 146, 127, 70, -1, -1, -1, 46, -1,
- -1, -1, -1, -1, 80, -1, 160, 161, 162, 163,
- 164, -1, 146, 167, 168, 169, 170, 171, 172, 173,
- 67, -1, 70, 70, 100, -1, 160, 161, 162, 163,
- 164, 107, 80, 167, 168, 169, 170, 171, 172, 173,
- 17, -1, -1, -1, -1, 10, 93, -1, -1, 14,
- 126, -1, 100, 129, -1, -1, -1, 104, 23, 107,
- 25, 26, 109, -1, -1, -1, -1, -1, -1, 46,
- -1, -1, -1, 120, -1, -1, 152, -1, 126, -1,
- -1, 129, -1, -1, -1, 161, 162, 163, 164, -1,
- -1, 167, 168, 70, 170, -1, -1, -1, 174, 175,
- -1, 177, 67, 80, 152, 70, -1, -1, -1, -1,
- -1, -1, -1, 161, 162, 163, 164, -1, -1, 167,
- 168, -1, 170, 100, -1, -1, 174, 175, 93, 177,
- 107, -1, -1, -1, -1, -1, -1, -1, -1, 104,
- -1, -1, -1, -1, 109, -1, -1, -1, -1, 126,
- 4, -1, 129, 7, -1, 120, -1, 11, 12, 13,
- -1, 15, -1, -1, 18, 19, 20, 21, -1, -1,
- 24, -1, -1, 27, 28, 152, -1, -1, -1, -1,
- 34, -1, -1, -1, 161, 162, 163, 164, -1, -1,
- 167, 168, -1, 170, -1, -1, 4, 174, 175, 7,
- 177, -1, -1, 11, 12, 13, -1, 15, -1, -1,
- 18, 19, 20, 21, -1, -1, 24, -1, -1, 27,
- 28, 75, -1, -1, -1, 4, 34, -1, 7, 83,
- 9, -1, 11, 12, 13, -1, 15, -1, -1, 18,
- 19, 20, 21, -1, -1, -1, -1, -1, 27, 28,
- -1, -1, -1, -1, 4, 34, -1, 7, -1, -1,
- -1, 11, 12, 13, -1, 15, -1, 75, 18, 19,
- 20, 21, -1, -1, 24, 83, -1, 27, 28, -1,
- -1, -1, -1, 4, 34, -1, 7, -1, -1, -1,
- 11, 12, 13, -1, 15, -1, 75, 18, 19, 20,
- 21, -1, -1, 24, 83, -1, 27, 28, -1, -1,
- -1, -1, 4, 34, -1, 7, -1, -1, -1, 11,
- 12, 13, -1, 15, -1, 75, 18, 19, 20, 21,
- -1, -1, 24, 83, -1, 27, 28, -1, -1, -1,
- -1, 4, 34, -1, 7, -1, -1, -1, 11, 12,
- 13, -1, 15, -1, 75, 18, 19, 20, 21, -1,
- -1, 24, 83, -1, 27, 28, -1, -1, -1, -1,
- -1, 34, -1, 4, 5, -1, 7, -1, -1, -1,
- 11, 12, 13, 75, 15, -1, -1, 18, 19, 20,
- 21, 83, -1, -1, -1, -1, 27, 28, -1, 4,
- -1, -1, 7, 34, -1, -1, 11, 12, 13, -1,
- 15, -1, 75, 18, 19, 20, 21, -1, -1, 24,
- 83, -1, 27, 28, -1, 4, -1, -1, 7, 34,
- -1, -1, 11, 12, 13, -1, 15, -1, -1, 18,
- 19, 20, 21, -1, 75, 24, -1, -1, 27, 28,
- 4, -1, 83, 7, -1, 34, -1, 11, 12, 13,
- -1, 15, -1, -1, 18, 19, 20, 21, -1, -1,
- 75, 25, -1, 27, 28, -1, -1, -1, 83, -1,
- 34, -1, -1, 4, -1, -1, 7, -1, -1, -1,
- 11, 12, 13, -1, 15, -1, 75, 18, 19, 20,
- 21, -1, -1, 24, 83, -1, 27, 28, -1, 4,
- -1, -1, 7, 34, -1, -1, 11, 12, 13, -1,
- 15, 75, -1, 18, 19, 20, 21, -1, -1, 83,
- 25, -1, 27, 28, 4, 74, -1, 7, 77, 34,
- -1, 11, 12, 13, -1, 15, -1, -1, 18, 19,
- 20, 21, -1, -1, 75, -1, -1, 27, 28, -1,
- -1, -1, 83, 102, 34, -1, -1, -1, -1, -1,
- -1, -1, -1, 112, 113, 114, 115, 116, 117, 118,
- 75, -1, -1, -1, -1, -1, -1, -1, 83, 128,
- -1, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 75, 145, -1, -1, -1,
- -1, -1, -1, 83
+ -1, 83, -1, -1, -1, 166, 167, -1, 169, 170,
+ 171, 172, 173, 174, 175, -1, -1, -1, 4, -1,
+ -1, 7, -1, 9, 70, 11, 12, 13, -1, 15,
+ -1, -1, 18, 19, 20, 21, 4, 83, -1, 7,
+ -1, 27, 28, 11, 12, 13, 32, 15, -1, -1,
+ 18, 19, 20, 21, 4, -1, 24, 7, -1, 27,
+ 28, 11, 12, 13, 32, 15, -1, -1, 18, 19,
+ 20, 21, 4, -1, 24, 7, -1, 27, 28, 11,
+ 12, 13, 32, 15, 70, -1, 18, 19, 20, 21,
+ -1, -1, 24, -1, -1, 27, 28, 83, -1, -1,
+ 32, -1, 70, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 83, -1, -1, -1, -1,
+ 70, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 4, 83, -1, 7, -1, -1, 70, 11,
+ 12, 13, -1, 15, -1, -1, 18, 19, 20, 21,
+ 4, 83, 24, 7, -1, 27, 28, 11, 12, 13,
+ 32, 15, -1, -1, 18, 19, 20, 21, -1, -1,
+ 24, -1, 4, 27, 28, 7, -1, 9, 32, 11,
+ 12, 13, -1, 15, -1, -1, 18, 19, 20, 21,
+ -1, -1, -1, -1, -1, 27, 28, -1, 70, -1,
+ 32, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 83, -1, -1, -1, -1, 70, 4, -1, -1,
+ 7, -1, 9, -1, 11, 12, 13, -1, 15, 83,
+ -1, 18, 19, 20, 21, -1, -1, -1, 70, 4,
+ 27, 28, 7, -1, 9, 32, 11, 12, 13, -1,
+ 15, 83, -1, 18, 19, 20, 21, 4, -1, -1,
+ 7, -1, 27, 28, 11, 12, 13, 32, 15, -1,
+ -1, 18, 19, 20, 21, -1, -1, 24, -1, -1,
+ 27, 28, -1, 70, 4, 32, -1, 7, -1, -1,
+ -1, 11, 12, 13, -1, 15, 83, -1, 18, 19,
+ 20, 21, -1, -1, 24, 70, -1, 27, 28, -1,
+ -1, -1, 32, -1, -1, -1, -1, 4, 83, -1,
+ 7, -1, -1, 70, 11, 12, 13, -1, 15, -1,
+ -1, 18, 19, 20, 21, -1, 83, 24, -1, -1,
+ 27, 28, -1, -1, 4, 32, -1, 7, -1, -1,
+ 70, 11, 12, 13, -1, 15, -1, -1, 18, 19,
+ 20, 21, -1, 83, 24, -1, -1, 27, 28, -1,
+ 4, -1, 32, 7, -1, 9, -1, 11, 12, 13,
+ -1, 15, -1, 70, 18, 19, 20, 21, -1, -1,
+ -1, -1, 4, 27, 28, 7, 83, -1, 32, 11,
+ 12, 13, -1, 15, -1, -1, 18, 19, 20, 21,
+ 70, -1, 24, -1, -1, 27, 28, -1, 4, -1,
+ 32, 7, -1, 83, -1, 11, 12, 13, -1, 15,
+ -1, -1, 18, 19, 20, 21, 70, -1, 24, -1,
+ -1, 27, 28, -1, -1, 4, 32, -1, 7, 83,
+ -1, -1, 11, 12, 13, -1, 15, -1, 70, 18,
+ 19, 20, 21, -1, -1, 24, -1, -1, 27, 28,
+ -1, 83, 4, 32, -1, 7, -1, -1, -1, 11,
+ 12, 13, -1, 15, 70, -1, 18, 19, 20, 21,
+ -1, -1, 24, -1, -1, 27, 28, 83, 4, -1,
+ 32, 7, -1, -1, -1, 11, 12, 13, -1, 15,
+ -1, 70, 18, 19, 20, 21, -1, -1, 24, -1,
+ 4, 27, 28, 7, 83, -1, 32, 11, 12, 13,
+ -1, 15, -1, -1, 18, 19, 20, 21, 70, -1,
+ 24, -1, -1, 27, 28, -1, 4, -1, 32, 7,
+ -1, 83, -1, 11, 12, 13, -1, 15, -1, -1,
+ 18, 19, 20, 21, 70, -1, -1, 25, -1, 27,
+ 28, -1, -1, 4, 32, -1, 7, 83, -1, -1,
+ 11, 12, 13, -1, 15, -1, 70, 18, 19, 20,
+ 21, -1, -1, 24, -1, -1, 27, 28, -1, 83,
+ 4, 32, -1, 7, -1, -1, -1, 11, 12, 13,
+ -1, 15, 70, -1, 18, 19, 20, 21, -1, -1,
+ -1, 25, -1, 27, 28, 83, 4, -1, 32, 7,
+ -1, -1, -1, 11, 12, 13, -1, 15, -1, 70,
+ 18, 19, 20, 21, -1, -1, -1, -1, -1, 27,
+ 28, -1, 83, 69, 32, -1, 72, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 70, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 83,
+ -1, -1, -1, -1, 100, -1, -1, -1, -1, -1,
+ -1, -1, 70, -1, -1, 111, 112, 113, 114, 115,
+ -1, 117, 118, -1, -1, 83, -1, -1, -1, -1,
+ -1, -1, -1, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint16 yystos[] =
{
- 0, 1, 154, 184, 155, 186, 187, 0, 31, 33,
- 45, 46, 48, 57, 63, 78, 87, 89, 94, 95,
- 195, 374, 375, 376, 377, 379, 381, 383, 385, 387,
- 388, 389, 390, 400, 401, 403, 406, 407, 408, 410,
- 411, 412, 413, 414, 419, 423, 426, 427, 39, 55,
- 188, 192, 109, 121, 399, 80, 85, 88, 109, 399,
- 422, 52, 68, 393, 402, 399, 52, 75, 79, 392,
- 398, 404, 399, 80, 167, 168, 170, 371, 372, 496,
- 70, 396, 497, 498, 36, 47, 60, 119, 185, 215,
- 217, 221, 223, 226, 46, 57, 63, 78, 155, 375,
- 155, 399, 10, 155, 499, 1, 170, 189, 193, 124,
- 32, 54, 96, 394, 498, 82, 124, 498, 44, 393,
- 497, 382, 14, 298, 88, 109, 394, 422, 392, 378,
- 497, 298, 237, 238, 16, 44, 125, 73, 386, 237,
- 227, 222, 224, 51, 62, 110, 155, 216, 399, 54,
- 395, 497, 155, 409, 167, 108, 194, 197, 80, 496,
- 237, 371, 496, 237, 496, 384, 237, 298, 299, 78,
- 405, 82, 90, 124, 44, 380, 298, 237, 228, 391,
- 398, 6, 16, 17, 19, 21, 38, 42, 50, 53,
- 66, 80, 81, 88, 91, 92, 98, 127, 146, 160,
- 161, 162, 163, 164, 169, 171, 172, 173, 337, 338,
- 339, 340, 341, 342, 346, 352, 355, 365, 366, 367,
- 371, 373, 164, 496, 101, 43, 57, 228, 298, 5,
- 16, 28, 225, 331, 332, 340, 344, 371, 218, 219,
- 144, 237, 46, 63, 410, 161, 164, 167, 170, 190,
- 191, 341, 1, 168, 56, 151, 198, 397, 424, 196,
- 420, 149, 164, 298, 391, 16, 17, 19, 21, 70,
- 97, 300, 301, 302, 305, 308, 324, 330, 340, 343,
- 344, 355, 365, 366, 367, 371, 373, 298, 391, 237,
- 496, 498, 496, 496, 298, 391, 14, 68, 98, 149,
- 150, 229, 230, 231, 232, 240, 243, 497, 346, 36,
- 217, 346, 25, 346, 346, 16, 16, 16, 16, 16,
- 371, 16, 16, 346, 16, 16, 97, 358, 8, 166,
- 28, 62, 346, 22, 29, 369, 370, 4, 7, 11,
- 12, 13, 15, 18, 19, 20, 21, 27, 28, 34,
- 75, 83, 351, 24, 125, 496, 298, 243, 228, 345,
- 346, 228, 332, 228, 28, 220, 335, 336, 346, 395,
- 399, 9, 170, 371, 497, 429, 14, 429, 69, 486,
- 487, 16, 488, 24, 326, 325, 365, 365, 306, 23,
- 10, 305, 308, 310, 309, 496, 242, 96, 68, 149,
- 96, 14, 371, 41, 244, 245, 71, 255, 256, 237,
- 349, 350, 24, 340, 346, 346, 346, 356, 24, 346,
- 359, 371, 24, 346, 24, 1, 167, 168, 170, 346,
- 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
- 346, 171, 348, 347, 357, 358, 101, 78, 243, 346,
- 24, 239, 243, 240, 9, 346, 9, 191, 199, 237,
- 14, 68, 150, 479, 197, 14, 176, 9, 105, 415,
- 75, 129, 152, 174, 489, 490, 491, 493, 495, 415,
- 324, 328, 329, 330, 1, 30, 312, 323, 333, 340,
- 344, 371, 334, 340, 344, 371, 373, 305, 308, 311,
- 312, 312, 171, 273, 303, 304, 308, 96, 96, 241,
- 105, 233, 246, 43, 244, 72, 260, 228, 218, 24,
- 24, 24, 24, 16, 97, 360, 361, 1, 9, 24,
- 24, 16, 346, 496, 298, 255, 5, 255, 255, 346,
- 346, 1, 14, 16, 54, 70, 200, 205, 233, 425,
- 123, 174, 176, 16, 164, 23, 421, 488, 487, 16,
- 24, 9, 495, 24, 329, 25, 26, 327, 313, 307,
- 26, 10, 23, 14, 67, 70, 93, 104, 109, 120,
- 274, 275, 277, 281, 284, 287, 291, 10, 273, 16,
- 171, 248, 249, 341, 257, 261, 106, 262, 243, 228,
- 14, 24, 346, 362, 363, 1, 346, 359, 391, 244,
- 244, 171, 210, 371, 171, 207, 208, 209, 70, 210,
- 203, 17, 23, 37, 46, 61, 63, 70, 100, 107,
- 126, 175, 177, 365, 366, 427, 428, 439, 440, 442,
- 443, 444, 448, 454, 456, 457, 475, 476, 494, 495,
- 496, 16, 164, 480, 34, 34, 165, 439, 111, 24,
- 40, 53, 58, 81, 111, 416, 417, 491, 492, 495,
- 1, 10, 25, 323, 1, 315, 316, 329, 14, 273,
- 285, 16, 65, 98, 288, 352, 353, 371, 334, 289,
- 290, 1, 14, 90, 496, 10, 273, 148, 303, 23,
- 234, 14, 249, 16, 17, 258, 259, 340, 352, 353,
- 346, 43, 84, 103, 268, 270, 105, 317, 240, 364,
- 1, 9, 24, 24, 30, 171, 211, 371, 9, 24,
- 9, 171, 14, 14, 86, 206, 25, 88, 496, 498,
- 399, 399, 476, 476, 476, 476, 10, 23, 105, 457,
- 481, 455, 16, 165, 34, 174, 174, 492, 496, 164,
- 495, 164, 418, 9, 24, 98, 314, 9, 317, 304,
- 217, 271, 273, 346, 65, 289, 354, 282, 228, 276,
- 278, 292, 273, 14, 244, 24, 167, 235, 236, 247,
- 346, 346, 259, 263, 237, 237, 269, 270, 267, 268,
- 16, 24, 255, 273, 1, 363, 19, 21, 97, 171,
- 212, 365, 366, 367, 371, 171, 201, 171, 210, 210,
- 16, 14, 82, 34, 149, 496, 88, 109, 496, 498,
- 458, 23, 441, 16, 14, 1, 17, 30, 460, 462,
- 474, 476, 484, 485, 494, 174, 430, 148, 417, 99,
- 315, 1, 10, 26, 316, 23, 272, 23, 24, 358,
- 14, 243, 271, 28, 54, 368, 371, 16, 295, 286,
- 237, 9, 24, 16, 250, 251, 252, 24, 25, 35,
- 59, 264, 265, 266, 340, 352, 353, 318, 317, 23,
- 365, 365, 23, 206, 211, 211, 208, 209, 204, 496,
- 449, 124, 149, 82, 496, 53, 472, 442, 24, 64,
- 106, 122, 149, 482, 483, 450, 25, 26, 463, 24,
- 9, 431, 432, 164, 218, 317, 283, 317, 279, 55,
- 75, 167, 296, 297, 293, 271, 167, 147, 253, 254,
- 365, 366, 367, 371, 373, 23, 252, 265, 16, 17,
- 161, 74, 77, 102, 112, 113, 114, 115, 116, 117,
- 118, 128, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 145, 319, 320, 322,
- 24, 202, 212, 212, 24, 24, 273, 451, 453, 456,
- 475, 496, 124, 496, 80, 371, 494, 459, 161, 64,
- 174, 9, 24, 23, 445, 446, 448, 461, 1, 464,
- 466, 475, 494, 432, 129, 433, 228, 271, 14, 167,
- 28, 321, 340, 190, 24, 297, 228, 237, 24, 254,
- 346, 346, 164, 167, 170, 174, 340, 340, 346, 164,
- 161, 161, 340, 16, 346, 346, 16, 16, 9, 24,
- 16, 1, 14, 213, 346, 23, 23, 23, 481, 474,
- 481, 496, 16, 81, 473, 483, 10, 23, 462, 9,
- 34, 471, 467, 152, 434, 240, 280, 190, 9, 14,
- 24, 25, 321, 321, 164, 340, 320, 359, 214, 14,
- 466, 481, 164, 164, 494, 23, 447, 465, 496, 472,
- 85, 255, 271, 340, 294, 24, 24, 24, 24, 24,
- 273, 452, 24, 448, 466, 468, 494, 23, 271, 34,
- 34, 23, 445, 471, 473, 101, 435, 317, 340, 340,
- 469, 16, 105, 436, 477, 478, 479, 485, 16, 470,
- 479, 24, 174, 437, 438, 481, 164, 9, 24, 438
+ 0, 1, 152, 185, 153, 187, 188, 0, 31, 34,
+ 42, 43, 45, 52, 55, 57, 73, 86, 87, 92,
+ 119, 186, 196, 198, 202, 204, 207, 343, 344, 345,
+ 347, 349, 351, 353, 355, 356, 357, 358, 365, 367,
+ 368, 369, 370, 371, 376, 380, 383, 384, 36, 51,
+ 189, 193, 107, 208, 64, 362, 452, 453, 75, 85,
+ 107, 121, 364, 379, 203, 48, 62, 361, 205, 364,
+ 48, 70, 74, 360, 363, 216, 217, 75, 166, 167,
+ 169, 340, 341, 451, 362, 47, 56, 109, 153, 197,
+ 43, 57, 153, 344, 10, 153, 454, 1, 169, 190,
+ 194, 124, 209, 67, 216, 124, 453, 41, 14, 277,
+ 361, 452, 350, 5, 16, 28, 170, 171, 172, 173,
+ 174, 175, 206, 306, 307, 315, 316, 317, 319, 340,
+ 107, 379, 453, 360, 346, 452, 363, 6, 16, 17,
+ 19, 21, 35, 39, 44, 46, 49, 60, 68, 75,
+ 76, 77, 78, 79, 80, 81, 82, 89, 90, 95,
+ 108, 116, 125, 128, 145, 160, 161, 162, 163, 168,
+ 312, 313, 314, 315, 321, 326, 329, 334, 335, 336,
+ 340, 342, 16, 41, 126, 354, 199, 200, 364, 153,
+ 366, 166, 106, 195, 75, 451, 14, 62, 95, 96,
+ 149, 210, 211, 219, 222, 40, 451, 216, 451, 278,
+ 209, 352, 216, 277, 320, 321, 209, 307, 22, 29,
+ 338, 339, 88, 124, 41, 216, 348, 277, 216, 452,
+ 321, 34, 198, 321, 25, 321, 321, 16, 16, 16,
+ 16, 16, 327, 16, 16, 16, 328, 16, 16, 16,
+ 16, 16, 321, 16, 16, 16, 16, 8, 165, 28,
+ 56, 321, 4, 7, 11, 12, 13, 15, 18, 19,
+ 20, 21, 27, 28, 32, 70, 83, 16, 94, 331,
+ 332, 163, 451, 99, 52, 209, 28, 201, 310, 311,
+ 321, 43, 57, 367, 160, 163, 166, 169, 191, 192,
+ 316, 1, 167, 381, 221, 93, 62, 93, 14, 340,
+ 38, 223, 224, 377, 148, 163, 16, 17, 19, 21,
+ 94, 279, 280, 283, 299, 305, 315, 318, 319, 334,
+ 335, 336, 340, 342, 222, 277, 209, 359, 321, 24,
+ 218, 222, 1, 166, 167, 169, 451, 453, 451, 451,
+ 277, 359, 216, 324, 325, 24, 315, 321, 333, 321,
+ 321, 16, 321, 321, 321, 16, 321, 321, 321, 321,
+ 321, 321, 340, 24, 321, 24, 321, 321, 321, 321,
+ 321, 321, 321, 321, 321, 321, 321, 321, 170, 171,
+ 323, 322, 24, 333, 24, 126, 451, 277, 219, 9,
+ 321, 9, 364, 9, 169, 386, 252, 281, 282, 283,
+ 93, 220, 103, 212, 225, 386, 63, 441, 442, 16,
+ 443, 24, 301, 300, 334, 334, 23, 10, 285, 284,
+ 65, 234, 235, 222, 5, 234, 451, 209, 199, 24,
+ 1, 9, 24, 24, 9, 321, 24, 24, 24, 321,
+ 24, 24, 9, 9, 9, 24, 24, 16, 321, 24,
+ 99, 73, 234, 321, 321, 192, 14, 62, 149, 434,
+ 23, 14, 61, 64, 91, 102, 107, 120, 253, 254,
+ 256, 260, 263, 266, 270, 10, 252, 16, 170, 171,
+ 227, 228, 316, 14, 178, 9, 103, 372, 70, 158,
+ 159, 176, 444, 445, 446, 448, 450, 372, 299, 303,
+ 304, 305, 1, 30, 287, 298, 308, 315, 319, 340,
+ 283, 286, 287, 287, 40, 223, 66, 239, 234, 223,
+ 222, 209, 1, 321, 321, 24, 24, 321, 321, 321,
+ 333, 451, 277, 382, 123, 176, 178, 16, 163, 264,
+ 16, 59, 95, 267, 326, 330, 340, 309, 315, 319,
+ 340, 342, 268, 269, 1, 14, 88, 451, 10, 252,
+ 147, 281, 23, 213, 14, 228, 378, 443, 442, 16,
+ 24, 9, 450, 24, 304, 25, 26, 302, 288, 26,
+ 26, 236, 240, 104, 241, 223, 24, 219, 9, 24,
+ 9, 24, 24, 24, 359, 17, 23, 43, 57, 64,
+ 98, 105, 127, 177, 179, 334, 335, 384, 385, 396,
+ 397, 399, 403, 409, 411, 412, 430, 431, 449, 450,
+ 451, 16, 163, 435, 32, 32, 164, 198, 250, 252,
+ 321, 59, 268, 332, 261, 209, 255, 257, 271, 252,
+ 14, 223, 24, 166, 214, 215, 226, 396, 110, 24,
+ 37, 49, 53, 81, 110, 373, 374, 446, 447, 450,
+ 1, 10, 25, 298, 1, 290, 291, 304, 10, 16,
+ 17, 237, 238, 315, 326, 330, 321, 40, 84, 101,
+ 247, 249, 103, 292, 234, 321, 321, 25, 451, 453,
+ 364, 431, 431, 431, 431, 10, 23, 103, 412, 436,
+ 410, 16, 164, 32, 176, 176, 251, 23, 24, 14,
+ 222, 250, 28, 50, 337, 340, 16, 274, 265, 216,
+ 9, 24, 16, 229, 230, 231, 447, 451, 163, 450,
+ 163, 375, 9, 24, 95, 289, 9, 292, 321, 321,
+ 238, 242, 216, 216, 248, 249, 246, 247, 16, 24,
+ 24, 24, 32, 148, 451, 107, 451, 453, 413, 23,
+ 398, 16, 14, 1, 17, 30, 415, 417, 429, 431,
+ 439, 440, 449, 176, 387, 199, 292, 262, 292, 258,
+ 51, 70, 166, 275, 276, 272, 250, 166, 146, 232,
+ 233, 334, 335, 336, 340, 342, 23, 231, 147, 374,
+ 97, 290, 1, 10, 26, 291, 24, 25, 33, 54,
+ 243, 244, 245, 315, 326, 330, 293, 292, 404, 124,
+ 148, 451, 49, 427, 399, 24, 58, 104, 122, 148,
+ 437, 438, 405, 25, 26, 418, 24, 9, 388, 389,
+ 209, 250, 14, 166, 28, 296, 315, 191, 24, 276,
+ 209, 216, 24, 233, 163, 244, 16, 17, 160, 69,
+ 72, 100, 111, 112, 113, 114, 115, 117, 118, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 294, 295, 297, 406, 408,
+ 411, 430, 451, 124, 75, 340, 449, 414, 160, 58,
+ 176, 9, 24, 23, 400, 401, 403, 416, 1, 419,
+ 421, 430, 449, 389, 158, 390, 219, 259, 191, 9,
+ 14, 321, 321, 163, 166, 169, 176, 315, 315, 321,
+ 163, 160, 160, 315, 16, 321, 321, 16, 16, 9,
+ 24, 16, 436, 429, 436, 451, 16, 81, 428, 438,
+ 10, 23, 417, 9, 32, 426, 422, 159, 391, 234,
+ 250, 315, 273, 24, 25, 296, 296, 163, 315, 295,
+ 333, 14, 421, 436, 163, 163, 449, 23, 402, 420,
+ 451, 427, 85, 23, 250, 24, 24, 24, 24, 24,
+ 407, 24, 403, 421, 423, 449, 292, 32, 32, 400,
+ 426, 428, 99, 392, 315, 315, 424, 16, 103, 393,
+ 432, 433, 434, 440, 16, 425, 434, 24, 176, 394,
+ 395, 436, 163, 9, 24, 395
};
#define yyerrok (yyerrstatus = 0)
@@ -2667,18 +2621,9 @@ static const yytype_uint16 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
+ Once GCC version 2 has supplanted version 1, this can go. */
#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -2735,7 +2680,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -2846,20 +2791,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -2893,11 +2835,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -3177,8 +3119,10 @@ yydestruct (yymsg, yytype, yyvaluep)
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -3197,9 +3141,10 @@ int yyparse ();
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -3223,46 +3168,22 @@ yyparse ()
#endif
#endif
{
-/* The lookahead symbol. */
+ /* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
- /* Number of syntax errors so far. */
- int yynerrs;
-
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
+/* Number of syntax errors so far. */
+int yynerrs;
+ int yystate;
int yyn;
int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Look-ahead token as an internal (translated) token number. */
+ int yytoken = 0;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
@@ -3270,28 +3191,51 @@ YYSTYPE yylval;
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss = yyssa;
+ yytype_int16 *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
+
+
+
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ YYSIZE_T yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
+
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
+
yyssp = yyss;
yyvsp = yyvs;
@@ -3321,6 +3265,7 @@ YYSTYPE yylval;
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
+
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -3328,6 +3273,7 @@ YYSTYPE yylval;
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -3350,8 +3296,9 @@ YYSTYPE yylval;
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -3362,6 +3309,7 @@ YYSTYPE yylval;
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -3371,9 +3319,6 @@ YYSTYPE yylval;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
- if (yystate == YYFINAL)
- YYACCEPT;
-
goto yybackup;
/*-----------.
@@ -3382,16 +3327,16 @@ YYSTYPE yylval;
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
+ look-ahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -3423,16 +3368,20 @@ yybackup:
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -3472,80 +3421,53 @@ yyreduce:
switch (yyn)
{
case 2:
-
-/* Line 1464 of yacc.c */
-#line 556 "./sparql_p.y"
- { sparp_arg->sparp_expr = (yyval.tree) = (yyvsp[(4) - (5)].tree); }
+#line 525 "./sparql_p.y"
+ { sparp_arg->sparp_expr = (yyval.tree) = (yyvsp[(3) - (4)].tree); }
break;
case 3:
-
-/* Line 1464 of yacc.c */
-#line 557 "./sparql_p.y"
+#line 526 "./sparql_p.y"
{
sparp_arg->sparp_expr = (yyval.tree) = spar_make_topmost_sparul_sql (sparp_arg,
(SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)) ); }
break;
case 4:
-
-/* Line 1464 of yacc.c */
-#line 560 "./sparql_p.y"
- {
- sparp_arg->sparp_expr = (yyval.tree) = spar_make_topmost_sparul_sql (sparp_arg,
- (SPART **)t_list (1, (yyvsp[(3) - (4)].tree)) ); }
- break;
-
- case 5:
-
-/* Line 1464 of yacc.c */
-#line 563 "./sparql_p.y"
+#line 529 "./sparql_p.y"
{
sparp_arg->sparp_expr = (yyval.tree) = spar_make_topmost_sparul_sql (sparp_arg,
(SPART **)t_list (0) ); }
break;
- case 6:
-
-/* Line 1464 of yacc.c */
-#line 566 "./sparql_p.y"
+ case 5:
+#line 532 "./sparql_p.y"
{
(yyval.tree) = spar_make_topmost_qm_sql (sparp_arg);
sparp_arg->sparp_expr = (yyval.tree); }
break;
- case 7:
-
-/* Line 1464 of yacc.c */
-#line 569 "./sparql_p.y"
+ case 6:
+#line 535 "./sparql_p.y"
{ sparyyerror ("(internal SPARQL processing error) SPARQL mark expected"); }
break;
- case 13:
-
-/* Line 1464 of yacc.c */
-#line 587 "./sparql_p.y"
+ case 12:
+#line 552 "./sparql_p.y"
{ ; }
break;
- case 14:
-
-/* Line 1464 of yacc.c */
-#line 588 "./sparql_p.y"
+ case 13:
+#line 553 "./sparql_p.y"
{ ; }
break;
- case 15:
-
-/* Line 1464 of yacc.c */
-#line 592 "./sparql_p.y"
+ case 14:
+#line 557 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_VIRTSPECIFIC, "DEFINE"); }
break;
- case 16:
-
-/* Line 1464 of yacc.c */
-#line 593 "./sparql_p.y"
+ case 15:
+#line 558 "./sparql_p.y"
{
dk_set_t vals = (yyvsp[(4) - (4)].backstack);
while (NULL != vals) {
@@ -3554,97 +3476,71 @@ yyreduce:
} }
break;
- case 17:
-
-/* Line 1464 of yacc.c */
-#line 602 "./sparql_p.y"
+ case 16:
+#line 567 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 18:
-
-/* Line 1464 of yacc.c */
-#line 603 "./sparql_p.y"
+ case 17:
+#line 568 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 19:
+ case 18:
+#line 572 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, QNAME, (yyvsp[(1) - (1)].box)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 607 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, (ptrlong)QNAME, (yyvsp[(1) - (1)].box)); }
+ case 19:
+#line 573 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, Q_IRI_REF, (yyvsp[(1) - (1)].box)); }
break;
case 20:
-
-/* Line 1464 of yacc.c */
-#line 608 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, (ptrlong)Q_IRI_REF, (yyvsp[(1) - (1)].box)); }
+#line 574 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, SPARQL_STRING, (yyvsp[(1) - (1)].box)); }
break;
case 21:
-
-/* Line 1464 of yacc.c */
-#line 609 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, (ptrlong)SPARQL_STRING, (yyvsp[(1) - (1)].box)); }
+#line 575 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, SPARQL_INTEGER, (yyvsp[(1) - (1)].box)); }
break;
case 22:
-
-/* Line 1464 of yacc.c */
-#line 610 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, (ptrlong)SPARQL_INTEGER, (yyvsp[(1) - (1)].box)); }
+#line 576 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_list (2, SPAR_VARIABLE, (caddr_t)(yyvsp[(1) - (1)].tree)); }
break;
case 23:
-
-/* Line 1464 of yacc.c */
-#line 611 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_list (2, (ptrlong)SPAR_VARIABLE, (caddr_t)(yyvsp[(1) - (1)].tree)); }
- break;
-
- case 24:
-
-/* Line 1464 of yacc.c */
-#line 615 "./sparql_p.y"
+#line 580 "./sparql_p.y"
{ ; }
break;
- case 25:
-
-/* Line 1464 of yacc.c */
-#line 616 "./sparql_p.y"
+ case 24:
+#line 581 "./sparql_p.y"
{
if (NULL != sparp_env()->spare_base_uri)
sparyyerror ("Only one base declaration is allowed");
sparp_env()->spare_base_uri = (yyvsp[(2) - (2)].box); }
break;
- case 26:
-
-/* Line 1464 of yacc.c */
-#line 620 "./sparql_p.y"
+ case 25:
+#line 585 "./sparql_p.y"
{ sparyyerror ("Missing <iri-string> after BASE keyword"); }
break;
- case 27:
-
-/* Line 1464 of yacc.c */
-#line 624 "./sparql_p.y"
+ case 26:
+#line 589 "./sparql_p.y"
{ ; }
break;
- case 28:
-
-/* Line 1464 of yacc.c */
-#line 625 "./sparql_p.y"
+ case 27:
+#line 590 "./sparql_p.y"
{ ; }
break;
- case 29:
-
-/* Line 1464 of yacc.c */
-#line 629 "./sparql_p.y"
+ case 28:
+#line 594 "./sparql_p.y"
{
if ((!strcmp ("sql:", (yyvsp[(2) - (3)].box)) && strcmp ("sql:", (yyvsp[(3) - (3)].box))) || (!strcmp ("bif:", (yyvsp[(2) - (3)].box)) && strcmp ("bif:", (yyvsp[(3) - (3)].box))))
sparyyerror ("Prefixes 'sql:' and 'bif:' are reserved for SQL names");
@@ -3652,1053 +3548,562 @@ yyreduce:
t_set_push (&(sparp_env()->spare_namespace_prefixes), t_box_dv_short_nchars ((yyvsp[(2) - (3)].box), box_length ((yyvsp[(2) - (3)].box))-2)); }
break;
- case 30:
-
-/* Line 1464 of yacc.c */
-#line 634 "./sparql_p.y"
+ case 29:
+#line 599 "./sparql_p.y"
{ sparyyerror ("Missing <namespace-iri-string> in PREFIX declaration"); }
break;
+ case 30:
+#line 600 "./sparql_p.y"
+ { sparyyerror ("Missing namespace prefix after PREFIX keyword"); }
+ break;
+
case 31:
+#line 605 "./sparql_p.y"
+ {
+ sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
+ t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL);
+ sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
+ break;
-/* Line 1464 of yacc.c */
-#line 635 "./sparql_p.y"
- { sparyyerror ("Missing namespace prefix after PREFIX keyword"); }
+ case 32:
+#line 610 "./sparql_p.y"
+ {
+ SPART *where_gp = spar_gp_finalize (sparp_arg, NULL);
+ SPART *wm = (yyvsp[(6) - (6)].tree);
+ caddr_t retselid = spar_selid_pop (sparp_arg);
+ wm->_.wm.where_gp = where_gp;
+ (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, (yyvsp[(1) - (6)].token_type), (yyvsp[(3) - (6)].trees), retselid, wm );
+ if (SPAR_REQ_TOP == (yyval.tree)->type)
+ sparp_expand_top_retvals (sparp_arg, (yyval.tree), 0 /* never cloned, hence 0 == safely_copy_all_vars */); }
break;
case 33:
+#line 621 "./sparql_p.y"
+ { (yyval.token_type) = SELECT_L; }
+ break;
-/* Line 1464 of yacc.c */
-#line 640 "./sparql_p.y"
- {
- if (sparp_arg->sparp_macro_def_count)
- sparyyerror ("Some macro are defined before CREATE MACRO LIBRARY");
- sparp_arg->sparp_macrolib_to_create = (yyvsp[(4) - (4)].tree)->_.qname.val;
- sparp_arg->sparp_disable_storage_macro_lib = 2; }
+ case 34:
+#line 622 "./sparql_p.y"
+ { (yyval.token_type) = SELECT_L; }
break;
case 35:
-
-/* Line 1464 of yacc.c */
-#line 649 "./sparql_p.y"
- { ; }
+#line 623 "./sparql_p.y"
+ { (yyval.token_type) = DISTINCT_L; }
break;
case 36:
-
-/* Line 1464 of yacc.c */
-#line 650 "./sparql_p.y"
- { ; }
+#line 624 "./sparql_p.y"
+ { (yyval.token_type) = COUNT_DISTINCT_L; }
break;
case 37:
-
-/* Line 1464 of yacc.c */
-#line 656 "./sparql_p.y"
- {
- SPART *new_macro;
- if (!sparp_arg->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp_arg);
- spar_selid_push_reused (sparp_arg, (yyvsp[(2) - (2)].tree)->_.qname.val );
- sparp_arg->sparp_macro_mode = SPARP_DEFARG;
- new_macro = sparp_arg->sparp_current_macro = sparp_defmacro_init (sparp_arg, (yyvsp[(2) - (2)].tree)->_.qname.val);
- sparp_defmacro_store (sparp_arg, new_macro); }
+#line 628 "./sparql_p.y"
+ { (yyval.token_type) = sparp_arg->sparp_rset_lexdepth_plus_1; sparp_arg->sparp_rset_lexdepth_plus_1 = sparp_arg->sparp_lexdepth + 1; }
break;
case 38:
-
-/* Line 1464 of yacc.c */
-#line 664 "./sparql_p.y"
- {
- sparp_defmacro_finalize (sparp_arg, (yyvsp[(4) - (4)].tree));
- sparp_arg->sparp_macro_mode = 0;
- spar_selid_pop (sparp_arg);
- }
+#line 629 "./sparql_p.y"
+ { sparp_arg->sparp_rset_lexdepth_plus_1 = (yyvsp[(1) - (2)].token_type); (yyval.trees) = (yyvsp[(2) - (2)].trees); }
break;
case 39:
-
-/* Line 1464 of yacc.c */
-#line 672 "./sparql_p.y"
- {
- sparp_arg->sparp_current_macro->_.defmacro.paramnames = t_revlist_to_array ((yyvsp[(2) - (3)].backstack)); }
+#line 633 "./sparql_p.y"
+ { (yyval.trees) = (SPART **) _STAR; }
break;
case 40:
-
-/* Line 1464 of yacc.c */
-#line 674 "./sparql_p.y"
- {
- SPART *curr = sparp_arg->sparp_current_macro;
- if (NULL != (yyvsp[(5) - (5)].backstack))
- curr->_.defmacro.localnames = t_revlist_to_array ((yyvsp[(5) - (5)].backstack));
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY; }
+#line 635 "./sparql_p.y"
+ { (yyval.trees) = (SPART **) t_revlist_to_array ((yyvsp[(1) - (1)].backstack)); }
break;
case 41:
-
-/* Line 1464 of yacc.c */
-#line 679 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(7) - (7)].tree); }
+#line 636 "./sparql_p.y"
+ {
+ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_VIRTSPECIFIC, "comma-delimited list of result set expressions");
+ (yyval.trees) = (SPART **) t_revlist_to_array ((yyvsp[(1) - (1)].backstack)); }
break;
case 42:
-
-/* Line 1464 of yacc.c */
-#line 680 "./sparql_p.y"
+#line 642 "./sparql_p.y"
{
- SPART *curr = sparp_arg->sparp_current_macro;
- sparp_make_defmacro_paramnames_from_template (sparp_arg, curr); }
+ sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
+ t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
break;
case 43:
-
-/* Line 1464 of yacc.c */
-#line 683 "./sparql_p.y"
+#line 646 "./sparql_p.y"
{
- SPART *curr = sparp_arg->sparp_current_macro;
- if (NULL != (yyvsp[(3) - (4)].backstack))
- curr->_.defmacro.localnames = t_revlist_to_array ((yyvsp[(3) - (4)].backstack));
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY;
- spar_gp_init (sparp_arg, DEFMACRO_L); }
+ const char *formatter, *agg_formatter, *agg_mdata;
+ SPART *where_gp = spar_gp_finalize (sparp_arg, NULL);
+ SPART *wm = (yyvsp[(6) - (7)].tree);
+ caddr_t retselid = spar_selid_pop (sparp_arg);
+ wm->_.wm.where_gp = where_gp;
+ (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, CONSTRUCT_L, NULL,
+ retselid, wm );
+ ssg_find_formatter_by_name_and_subtype ((yyval.tree)->_.req_top.formatmode_name, CONSTRUCT_L, &formatter, &agg_formatter, &agg_mdata);
+ spar_compose_retvals_of_construct (sparp_arg, (yyval.tree), (yyvsp[(3) - (7)].tree), formatter, agg_formatter, agg_mdata); }
break;
case 44:
-
-/* Line 1464 of yacc.c */
-#line 689 "./sparql_p.y"
- { (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
+#line 660 "./sparql_p.y"
+ {
+ sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
+ t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
break;
case 45:
-
-/* Line 1464 of yacc.c */
-#line 690 "./sparql_p.y"
- { sparyyerror ("List of arguments or template is expected after macro name"); }
+#line 664 "./sparql_p.y"
+ {
+ SPART * where_gp = spar_gp_finalize (sparp_arg, NULL);
+ SPART *wm = (yyvsp[(6) - (7)].tree);
+ caddr_t retselid = spar_selid_pop (sparp_arg);
+ wm->_.wm.where_gp = where_gp;
+ (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, DESCRIBE_L, (yyvsp[(3) - (7)].trees),
+ retselid, wm );
+ if (((SPART **)_STAR == (yyvsp[(3) - (7)].trees)) && (SPAR_REQ_TOP == (yyval.tree)->type))
+ sparp_expand_top_retvals (sparp_arg, (yyval.tree), 0 /* never cloned, hence 0 == safely_copy_all_vars */); }
break;
case 46:
-
-/* Line 1464 of yacc.c */
-#line 695 "./sparql_p.y"
- {
- SPART *curr = sparp_arg->sparp_current_macro;
- curr->_.defmacro.subtype = 0;
- curr->_.defmacro.quad_pattern = (SPART **)t_list (4, NULL, (yyvsp[(2) - (5)].tree), (yyvsp[(3) - (5)].tree), (yyvsp[(4) - (5)].tree));
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY; }
+#line 676 "./sparql_p.y"
+ { (yyval.trees) = (SPART **) _STAR; }
break;
case 47:
-
-/* Line 1464 of yacc.c */
-#line 700 "./sparql_p.y"
- {
- SPART *curr = sparp_arg->sparp_current_macro;
- curr->_.defmacro.subtype = GRAPH_L;
- curr->_.defmacro.quad_pattern = (SPART **)t_list (4, (yyvsp[(2) - (7)].tree), (yyvsp[(4) - (7)].tree), (yyvsp[(5) - (7)].tree), (yyvsp[(6) - (7)].tree));
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY; }
+#line 677 "./sparql_p.y"
+ { (yyval.trees) = (SPART **) t_list_to_array ((yyvsp[(1) - (1)].backstack)); }
break;
case 48:
-
-/* Line 1464 of yacc.c */
-#line 705 "./sparql_p.y"
+#line 681 "./sparql_p.y"
{
- SPART *curr = sparp_arg->sparp_current_macro;
- curr->_.defmacro.subtype = DEFAULT_L;
- curr->_.defmacro.quad_pattern = (SPART **)t_list (4, NULL, (yyvsp[(4) - (7)].tree), (yyvsp[(5) - (7)].tree), (yyvsp[(6) - (7)].tree));
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY; }
+ sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
+ t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
break;
case 49:
-
-/* Line 1464 of yacc.c */
-#line 713 "./sparql_p.y"
- { (yyval.backstack) = NULL; }
+#line 685 "./sparql_p.y"
+ {
+ SPART * where_gp = spar_gp_finalize (sparp_arg, NULL);
+ (yyval.tree) = spar_make_top (sparp_arg, ASK_L, (SPART **)t_list(0), spar_selid_pop (sparp_arg),
+ where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0) ); }
break;
case 50:
-
-/* Line 1464 of yacc.c */
-#line 714 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(3) - (4)].backstack); }
+#line 692 "./sparql_p.y"
+ { }
break;
case 51:
-
-/* Line 1464 of yacc.c */
-#line 715 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(3) - (4)].backstack); }
+#line 693 "./sparql_p.y"
+ { }
break;
case 52:
+#line 701 "./sparql_p.y"
+ {
+ sparp_make_and_push_new_graph_source (sparp_arg, (yyvsp[(1) - (3)].token_type), (yyvsp[(2) - (3)].tree), (yyvsp[(3) - (3)].trees)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 719 "./sparql_p.y"
- { (yyval.backstack) = NULL; }
+ case 53:
+#line 706 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_FROM; }
break;
- case 55:
+ case 54:
+#line 707 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NAMED; }
+ break;
-/* Line 1464 of yacc.c */
-#line 725 "./sparql_p.y"
- {
- (yyval.backstack) = NULL;
- t_set_push (&((yyval.backstack)), (yyvsp[(1) - (3)].box));
- sparp_check_dm_arg_for_redecl (sparp_arg, (yyval.backstack), (yyvsp[(3) - (3)].box));
- t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].box)); }
+ case 55:
+#line 708 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NOT_FROM; }
break;
case 56:
-
-/* Line 1464 of yacc.c */
-#line 730 "./sparql_p.y"
- {
- (yyval.backstack) = (yyvsp[(1) - (3)].backstack);
- sparp_check_dm_arg_for_redecl (sparp_arg, (yyval.backstack), (yyvsp[(3) - (3)].box));
- t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].box)); }
+#line 709 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NOT_NAMED; }
break;
case 57:
-
-/* Line 1464 of yacc.c */
-#line 737 "./sparql_p.y"
- { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].box)); }
+#line 710 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NOT_FROM; }
break;
case 58:
-
-/* Line 1464 of yacc.c */
-#line 738 "./sparql_p.y"
- {
- (yyval.backstack) = (yyvsp[(1) - (2)].backstack);
- sparp_check_dm_arg_for_redecl (sparp_arg, (yyval.backstack), (yyvsp[(2) - (2)].box));
- t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].box)); }
+#line 711 "./sparql_p.y"
+ { (yyval.token_type) = SPART_GRAPH_NOT_NAMED; }
break;
case 59:
+#line 715 "./sparql_p.y"
+ { (yyval.trees) = NULL; }
+ break;
-/* Line 1464 of yacc.c */
-#line 745 "./sparql_p.y"
- { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
+ case 60:
+#line 716 "./sparql_p.y"
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_OPTION, "OPTION () sponge configuration"); }
break;
case 61:
-
-/* Line 1464 of yacc.c */
-#line 750 "./sparql_p.y"
- { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
+#line 717 "./sparql_p.y"
+ { (yyval.trees) = (yyvsp[(4) - (4)].trees); }
break;
case 62:
+#line 721 "./sparql_p.y"
+ { (yyval.trees) = (SPART **)t_list (0); }
+ break;
-/* Line 1464 of yacc.c */
-#line 751 "./sparql_p.y"
- { (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_type); }
+ case 63:
+#line 722 "./sparql_p.y"
+ { (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(1) - (2)].backstack)); }
break;
case 64:
+#line 726 "./sparql_p.y"
+ { /* [Virt] SpongeOption ::= QNAME PrecodeExpn */
+ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (2)].box)); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 757 "./sparql_p.y"
- { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
+ case 65:
+#line 728 "./sparql_p.y"
+ {
+ (yyval.backstack) = (yyvsp[(1) - (4)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (4)].box)); t_set_push (&((yyval.backstack)), (yyvsp[(4) - (4)].tree)); }
break;
case 66:
-
-/* Line 1464 of yacc.c */
-#line 759 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+#line 733 "./sparql_p.y"
+ { sparp_arg->sparp_in_precode_expn = 1; }
break;
case 67:
-
-/* Line 1464 of yacc.c */
-#line 760 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(2) - (2)].tree); spar_change_sign (&((yyvsp[(2) - (2)].tree)->_.lit.val)); }
+#line 735 "./sparql_p.y"
+ { sparp_arg->sparp_in_precode_expn = 0; (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 68:
+#line 739 "./sparql_p.y"
+ {
+ sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
+ spar_gp_init (sparp_arg, WHERE_L); }
+ break;
-/* Line 1464 of yacc.c */
-#line 761 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_box_dv_uname_string ("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"); }
+ case 69:
+#line 742 "./sparql_p.y"
+ {;}
break;
- case 72:
+ case 70:
+#line 746 "./sparql_p.y"
+ {
+ sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
+ spar_gp_init (sparp_arg, WHERE_L); }
+ break;
+
+ case 71:
+#line 749 "./sparql_p.y"
+ {;}
+ break;
-/* Line 1464 of yacc.c */
-#line 769 "./sparql_p.y"
+ case 72:
+#line 750 "./sparql_p.y"
{
- SPART *curr = sparp_arg->sparp_current_macro;
- curr->_.defmacro.subtype = 0;
- spar_gp_init (sparp_arg, DEFMACRO_L); }
+ sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
+ spar_gp_init (sparp_arg, WHERE_L); }
break;
case 73:
+#line 753 "./sparql_p.y"
+ {;}
+ break;
-/* Line 1464 of yacc.c */
-#line 773 "./sparql_p.y"
- { (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
+ case 74:
+#line 757 "./sparql_p.y"
+ {;}
break;
case 75:
-
-/* Line 1464 of yacc.c */
-#line 775 "./sparql_p.y"
- { sparyyerror ("Graph group pattern or expression is expected as the body of the macro"); }
+#line 761 "./sparql_p.y"
+ { (yyval.tree) = NULL; }
break;
case 76:
-
-/* Line 1464 of yacc.c */
-#line 781 "./sparql_p.y"
- {
- sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
- t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL);
- sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
+#line 762 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 77:
-
-/* Line 1464 of yacc.c */
-#line 786 "./sparql_p.y"
+#line 766 "./sparql_p.y"
{
- SPART *where_gp = spar_gp_finalize (sparp_arg, NULL);
- SPART *wm = (yyvsp[(6) - (6)].tree);
- caddr_t retselid = spar_selid_pop (sparp_arg);
- wm->_.wm.where_gp = where_gp;
- (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, (yyvsp[(1) - (6)].token_type), (yyvsp[(3) - (6)].trees), retselid, wm );
- if (SPAR_REQ_TOP == (yyval.tree)->type)
- sparp_expand_top_retvals (sparp_arg, (yyval.tree), 0 /* never cloned, hence 0 == safely_copy_all_vars */); }
+ if (NULL != sparp_arg->sparp_env->spare_bindings_vars)
+ sparyyerror ("Only one BINDINGS clause per query is allowed");
+ spar_selid_push (sparp_arg); }
break;
case 78:
-
-/* Line 1464 of yacc.c */
-#line 797 "./sparql_p.y"
- { (yyval.token_type) = SELECT_L; }
+#line 770 "./sparql_p.y"
+ {
+ spar_selid_pop (sparp_arg);
+ sparp_arg->sparp_env->spare_bindings_vars = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
case 79:
-
-/* Line 1464 of yacc.c */
-#line 798 "./sparql_p.y"
- { (yyval.token_type) = SELECT_L; }
+#line 773 "./sparql_p.y"
+ {
+ sparp_arg->sparp_env->spare_bindings_rowset = (SPART ***)t_revlist_to_array ((yyvsp[(6) - (7)].backstack));
+ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_BINDINGS_INV, 0,
+ sparp_arg->sparp_env->spare_bindings_vars,
+ sparp_arg->sparp_env->spare_bindings_rowset );
+ spar_alloc_fake_equivs_for_bindings_inv (sparp_arg, (yyval.tree)); }
break;
case 80:
-
-/* Line 1464 of yacc.c */
-#line 799 "./sparql_p.y"
- { (yyval.token_type) = DISTINCT_L; }
+#line 782 "./sparql_p.y"
+ { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box))); }
break;
case 81:
-
-/* Line 1464 of yacc.c */
-#line 800 "./sparql_p.y"
- { (yyval.token_type) = COUNT_DISTINCT_L; }
+#line 783 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), spar_make_variable (sparp_arg, (yyvsp[(2) - (2)].box))); }
break;
case 82:
-
-/* Line 1464 of yacc.c */
-#line 804 "./sparql_p.y"
- { (yyval.token_type) = sparp_arg->sparp_rset_lexdepth_plus_1; sparp_arg->sparp_rset_lexdepth_plus_1 = sparp_arg->sparp_lexdepth + 1; }
+#line 787 "./sparql_p.y"
+ { ; }
break;
case 83:
-
-/* Line 1464 of yacc.c */
-#line 805 "./sparql_p.y"
- { sparp_arg->sparp_rset_lexdepth_plus_1 = (yyvsp[(1) - (2)].token_type); (yyval.trees) = (yyvsp[(2) - (2)].trees); }
+#line 788 "./sparql_p.y"
+ { ; }
break;
case 84:
-
-/* Line 1464 of yacc.c */
-#line 809 "./sparql_p.y"
- { (yyval.trees) = (SPART **) _STAR; }
+#line 789 "./sparql_p.y"
+ { sparyyerror ("Global variable can not be used in the header of BINDINGS"); }
break;
case 85:
-
-/* Line 1464 of yacc.c */
-#line 811 "./sparql_p.y"
- { (yyval.trees) = (SPART **) t_revlist_to_array ((yyvsp[(1) - (1)].backstack)); }
+#line 793 "./sparql_p.y"
+ { (yyval.backstack) = NULL; }
break;
case 86:
-
-/* Line 1464 of yacc.c */
-#line 812 "./sparql_p.y"
- {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_VIRTSPECIFIC, "comma-delimited list of result set expressions");
- (yyval.trees) = (SPART **) t_revlist_to_array ((yyvsp[(1) - (1)].backstack)); }
- break;
+#line 794 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
+ break;
case 87:
-
-/* Line 1464 of yacc.c */
-#line 818 "./sparql_p.y"
- {
- sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
- t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
- break;
-
- case 88:
-
-/* Line 1464 of yacc.c */
-#line 822 "./sparql_p.y"
- {
- const char *formatter, *agg_formatter, *agg_mdata;
- SPART *where_gp = spar_gp_finalize (sparp_arg, NULL);
- SPART *wm = (yyvsp[(6) - (7)].tree);
- caddr_t retselid = spar_selid_pop (sparp_arg);
- wm->_.wm.where_gp = where_gp;
- (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, CONSTRUCT_L, NULL,
- retselid, wm );
- ssg_find_formatter_by_name_and_subtype ((yyval.tree)->_.req_top.formatmode_name, CONSTRUCT_L, &formatter, &agg_formatter, &agg_mdata);
- spar_compose_retvals_of_construct (sparp_arg, (yyval.tree), (yyvsp[(3) - (7)].tree), formatter, agg_formatter, agg_mdata); }
- break;
-
- case 89:
-
-/* Line 1464 of yacc.c */
-#line 836 "./sparql_p.y"
- {
- sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
- t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
- break;
-
- case 90:
-
-/* Line 1464 of yacc.c */
-#line 840 "./sparql_p.y"
- {
- SPART * where_gp = spar_gp_finalize (sparp_arg, NULL);
- SPART *wm = (yyvsp[(6) - (7)].tree);
- caddr_t retselid = spar_selid_pop (sparp_arg);
- wm->_.wm.where_gp = where_gp;
- (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, DESCRIBE_L, (yyvsp[(3) - (7)].trees),
- retselid, wm );
- if (((SPART **)_STAR == (yyvsp[(3) - (7)].trees)) && (SPAR_REQ_TOP == (yyval.tree)->type))
- sparp_expand_top_retvals (sparp_arg, (yyval.tree), 0 /* never cloned, hence 0 == safely_copy_all_vars */); }
- break;
-
- case 91:
-
-/* Line 1464 of yacc.c */
-#line 852 "./sparql_p.y"
- { (yyval.trees) = (SPART **) _STAR; }
- break;
-
- case 92:
-
-/* Line 1464 of yacc.c */
-#line 853 "./sparql_p.y"
- { (yyval.trees) = (SPART **) t_list_to_array ((yyvsp[(1) - (1)].backstack)); }
- break;
-
- case 93:
-
-/* Line 1464 of yacc.c */
-#line 857 "./sparql_p.y"
- {
- sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
- t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
- break;
-
- case 94:
-
-/* Line 1464 of yacc.c */
-#line 861 "./sparql_p.y"
- {
- SPART * where_gp = spar_gp_finalize (sparp_arg, NULL);
- (yyval.tree) = spar_make_top (sparp_arg, ASK_L, (SPART **)t_list(0), spar_selid_pop (sparp_arg),
- where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0) ); }
- break;
-
- case 95:
-
-/* Line 1464 of yacc.c */
-#line 868 "./sparql_p.y"
- { }
- break;
-
- case 96:
-
-/* Line 1464 of yacc.c */
-#line 869 "./sparql_p.y"
- { }
- break;
-
- case 97:
-
-/* Line 1464 of yacc.c */
-#line 877 "./sparql_p.y"
- {
- sparp_make_and_push_new_graph_source (sparp_arg, (yyvsp[(1) - (3)].token_type), (yyvsp[(2) - (3)].tree), (yyvsp[(3) - (3)].trees)); }
- break;
-
- case 98:
-
-/* Line 1464 of yacc.c */
-#line 882 "./sparql_p.y"
- {
- if (NULL != sparp_arg->sparp_env->spare_src.ssrc_graph_set_by_with)
- sparyyerror ("FROM can not be used in combination with WITH, use either consistent SPARUL syntax or SPARQL 1.1 syntax, not a mix");
- (yyval.token_type) = (yyvsp[(1) - (1)].token_type); }
- break;
-
- case 99:
-
-/* Line 1464 of yacc.c */
-#line 886 "./sparql_p.y"
- {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "USING keyword");
- (yyval.token_type) = (yyvsp[(1) - (1)].token_type); }
- break;
-
- case 100:
-
-/* Line 1464 of yacc.c */
-#line 892 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_FROM; }
- break;
-
- case 101:
-
-/* Line 1464 of yacc.c */
-#line 893 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NAMED; }
- break;
-
- case 102:
-
-/* Line 1464 of yacc.c */
-#line 894 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NOT_FROM; }
- break;
-
- case 103:
-
-/* Line 1464 of yacc.c */
-#line 895 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NOT_NAMED; }
- break;
-
- case 104:
-
-/* Line 1464 of yacc.c */
-#line 899 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_FROM; }
- break;
-
- case 105:
-
-/* Line 1464 of yacc.c */
-#line 900 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NAMED; }
- break;
-
- case 106:
-
-/* Line 1464 of yacc.c */
-#line 901 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NOT_FROM; }
- break;
-
- case 107:
-
-/* Line 1464 of yacc.c */
-#line 902 "./sparql_p.y"
- { (yyval.token_type) = SPART_GRAPH_NOT_NAMED; }
- break;
-
- case 108:
-
-/* Line 1464 of yacc.c */
-#line 906 "./sparql_p.y"
- { (yyval.trees) = NULL; }
- break;
-
- case 109:
-
-/* Line 1464 of yacc.c */
-#line 907 "./sparql_p.y"
- { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_OPTION, "OPTION () sponge configuration"); }
- break;
-
- case 110:
-
-/* Line 1464 of yacc.c */
-#line 908 "./sparql_p.y"
- { (yyval.trees) = (yyvsp[(4) - (4)].trees); }
- break;
-
- case 111:
-
-/* Line 1464 of yacc.c */
-#line 912 "./sparql_p.y"
- { (yyval.trees) = (SPART **)t_list (0); }
- break;
-
- case 112:
-
-/* Line 1464 of yacc.c */
-#line 913 "./sparql_p.y"
- { (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(1) - (2)].backstack)); }
- break;
-
- case 113:
-
-/* Line 1464 of yacc.c */
-#line 917 "./sparql_p.y"
- { /* [Virt] SpongeOption ::= QNAME PrecodeExpn */
- (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (2)].box)); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
- break;
-
- case 114:
-
-/* Line 1464 of yacc.c */
-#line 919 "./sparql_p.y"
- {
- (yyval.backstack) = (yyvsp[(1) - (4)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (4)].box)); t_set_push (&((yyval.backstack)), (yyvsp[(4) - (4)].tree)); }
- break;
-
- case 115:
-
-/* Line 1464 of yacc.c */
-#line 924 "./sparql_p.y"
- { sparp_arg->sparp_in_precode_expn = 1; }
- break;
-
- case 116:
-
-/* Line 1464 of yacc.c */
-#line 926 "./sparql_p.y"
- { sparp_arg->sparp_in_precode_expn = 0; (yyval.tree) = (yyvsp[(2) - (2)].tree); }
- break;
-
- case 117:
-
-/* Line 1464 of yacc.c */
-#line 930 "./sparql_p.y"
- {
- sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
- spar_gp_init (sparp_arg, WHERE_L); }
- break;
-
- case 118:
-
-/* Line 1464 of yacc.c */
-#line 933 "./sparql_p.y"
- {;}
- break;
-
- case 119:
-
-/* Line 1464 of yacc.c */
-#line 937 "./sparql_p.y"
- {
- sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
- spar_gp_init (sparp_arg, WHERE_L); }
- break;
-
- case 120:
-
-/* Line 1464 of yacc.c */
-#line 940 "./sparql_p.y"
- {;}
- break;
-
- case 121:
-
-/* Line 1464 of yacc.c */
-#line 941 "./sparql_p.y"
- {
- sparp_arg->sparp_allow_aggregates_in_expn &= ~1;
- spar_gp_init (sparp_arg, WHERE_L); }
- break;
-
- case 122:
-
-/* Line 1464 of yacc.c */
-#line 944 "./sparql_p.y"
- {;}
- break;
-
- case 123:
-
-/* Line 1464 of yacc.c */
-#line 948 "./sparql_p.y"
- {;}
- break;
-
- case 124:
-
-/* Line 1464 of yacc.c */
-#line 952 "./sparql_p.y"
- { (yyval.tree) = NULL; }
- break;
-
- case 126:
-
-/* Line 1464 of yacc.c */
-#line 957 "./sparql_p.y"
- {
- if (NULL != sparp_arg->sparp_env->spare_bindings_vars)
- sparyyerror ("Only one BINDINGS clause per query is allowed");
- if (sparp_arg->sparp_macro_mode)
- sparyyerror ("BINDINGS can not be used inside macro");
- spar_selid_push (sparp_arg); }
- break;
-
- case 127:
-
-/* Line 1464 of yacc.c */
-#line 963 "./sparql_p.y"
- {
- spar_selid_pop (sparp_arg);
- sparp_arg->sparp_env->spare_bindings_vars = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
- break;
-
- case 128:
-
-/* Line 1464 of yacc.c */
-#line 966 "./sparql_p.y"
- {
- sparp_arg->sparp_env->spare_bindings_rowset = (SPART ***)t_revlist_to_array ((yyvsp[(6) - (7)].backstack));
- (yyval.tree) = spartlist (sparp_arg, 4, SPAR_BINDINGS_INV, 0,
- sparp_arg->sparp_env->spare_bindings_vars,
- sparp_arg->sparp_env->spare_bindings_rowset );
- spar_alloc_fake_equivs_for_bindings_inv (sparp_arg, (yyval.tree)); }
- break;
-
- case 129:
-
-/* Line 1464 of yacc.c */
-#line 975 "./sparql_p.y"
- { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box))); }
- break;
-
- case 130:
-
-/* Line 1464 of yacc.c */
-#line 976 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), spar_make_variable (sparp_arg, (yyvsp[(2) - (2)].box))); }
- break;
-
- case 131:
-
-/* Line 1464 of yacc.c */
-#line 980 "./sparql_p.y"
- { ; }
- break;
-
- case 132:
-
-/* Line 1464 of yacc.c */
-#line 981 "./sparql_p.y"
- { sparyyerror ("Global variable can not be used in the header of BINDINGS"); }
- break;
-
- case 133:
-
-/* Line 1464 of yacc.c */
-#line 985 "./sparql_p.y"
- { (yyval.backstack) = NULL; }
- break;
-
- case 135:
-
-/* Line 1464 of yacc.c */
-#line 990 "./sparql_p.y"
+#line 798 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)); }
break;
- case 136:
-
-/* Line 1464 of yacc.c */
-#line 991 "./sparql_p.y"
+ case 88:
+#line 799 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].trees)); }
break;
- case 137:
-
-/* Line 1464 of yacc.c */
-#line 995 "./sparql_p.y"
+ case 89:
+#line 803 "./sparql_p.y"
{
- (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(2) - (3)].backstack));
+ (yyval.trees) = t_revlist_to_array ((yyvsp[(2) - (3)].backstack));
if (BOX_ELEMENTS ((yyval.trees)) != BOX_ELEMENTS (sparp_arg->sparp_env->spare_bindings_vars))
sparyyerror ("Number of values in a binding does not match number of variables to bind"); }
break;
- case 138:
-
-/* Line 1464 of yacc.c */
-#line 1002 "./sparql_p.y"
+ case 90:
+#line 810 "./sparql_p.y"
{(yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 139:
-
-/* Line 1464 of yacc.c */
-#line 1003 "./sparql_p.y"
+ case 91:
+#line 811 "./sparql_p.y"
{(yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 145:
-
-/* Line 1464 of yacc.c */
-#line 1012 "./sparql_p.y"
+ case 97:
+#line 820 "./sparql_p.y"
{(yyval.tree) = NULL; }
break;
- case 146:
-
-/* Line 1464 of yacc.c */
-#line 1017 "./sparql_p.y"
+ case 98:
+#line 825 "./sparql_p.y"
{ (yyval.tree) = spar_make_wm (sparp_arg, NULL, (SPART **)t_revlist_to_array ((yyvsp[(1) - (3)].backstack)), (yyvsp[(2) - (3)].tree), (SPART **)t_revlist_to_array ((yyvsp[(3) - (3)].backstack)), (SPART *)t_box_num (SPARP_MAXLIMIT), (SPART *)t_box_num (0)); }
break;
- case 147:
-
-/* Line 1464 of yacc.c */
-#line 1018 "./sparql_p.y"
+ case 99:
+#line 826 "./sparql_p.y"
{ (yyval.tree) = spar_make_wm (sparp_arg, NULL, (SPART **)t_revlist_to_array ((yyvsp[(1) - (5)].backstack)), (yyvsp[(2) - (5)].tree), (SPART **)t_revlist_to_array ((yyvsp[(3) - (5)].backstack)), (yyvsp[(4) - (5)].tree), (yyvsp[(5) - (5)].tree)); }
break;
- case 148:
-
-/* Line 1464 of yacc.c */
-#line 1019 "./sparql_p.y"
+ case 100:
+#line 827 "./sparql_p.y"
{ (yyval.tree) = spar_make_wm (sparp_arg, NULL, (SPART **)t_revlist_to_array ((yyvsp[(1) - (5)].backstack)), (yyvsp[(2) - (5)].tree), (SPART **)t_revlist_to_array ((yyvsp[(3) - (5)].backstack)), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
- case 149:
-
-/* Line 1464 of yacc.c */
-#line 1023 "./sparql_p.y"
+ case 101:
+#line 831 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 150:
-
-/* Line 1464 of yacc.c */
-#line 1024 "./sparql_p.y"
+ case 102:
+#line 832 "./sparql_p.y"
{
spar_selid_push_reused (sparp_arg, sparp_arg->sparp_env->spare_top_retval_selid);
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
break;
- case 151:
-
-/* Line 1464 of yacc.c */
-#line 1027 "./sparql_p.y"
+ case 103:
+#line 835 "./sparql_p.y"
{
spar_selid_pop (sparp_arg); (yyval.backstack) = (yyvsp[(4) - (4)].backstack);
sparp_arg->sparp_allow_aggregates_in_expn &= ~1; }
break;
- case 152:
-
-/* Line 1464 of yacc.c */
-#line 1033 "./sparql_p.y"
+ case 104:
+#line 841 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 153:
-
-/* Line 1464 of yacc.c */
-#line 1034 "./sparql_p.y"
+ case 105:
+#line 842 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 154:
-
-/* Line 1464 of yacc.c */
-#line 1039 "./sparql_p.y"
+ case 106:
+#line 847 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
- case 155:
-
-/* Line 1464 of yacc.c */
-#line 1040 "./sparql_p.y"
+ case 107:
+#line 848 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
- case 159:
-
-/* Line 1464 of yacc.c */
-#line 1047 "./sparql_p.y"
+ case 111:
+#line 855 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 160:
-
-/* Line 1464 of yacc.c */
-#line 1048 "./sparql_p.y"
+ case 112:
+#line 856 "./sparql_p.y"
{
spar_selid_push_reused (sparp_arg, sparp_arg->sparp_env->spare_top_retval_selid);
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
break;
- case 161:
-
-/* Line 1464 of yacc.c */
-#line 1051 "./sparql_p.y"
+ case 113:
+#line 859 "./sparql_p.y"
{
spar_selid_pop (sparp_arg); (yyval.tree) = (yyvsp[(3) - (3)].tree);
sparp_arg->sparp_allow_aggregates_in_expn &= ~1; }
break;
- case 162:
-
-/* Line 1464 of yacc.c */
-#line 1057 "./sparql_p.y"
+ case 114:
+#line 865 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 163:
-
-/* Line 1464 of yacc.c */
-#line 1058 "./sparql_p.y"
+ case 115:
+#line 866 "./sparql_p.y"
{
spar_selid_push_reused (sparp_arg, sparp_arg->sparp_env->spare_top_retval_selid);
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
break;
- case 164:
-
-/* Line 1464 of yacc.c */
-#line 1061 "./sparql_p.y"
+ case 116:
+#line 869 "./sparql_p.y"
{
spar_selid_pop (sparp_arg); (yyval.backstack) = (yyvsp[(4) - (4)].backstack);
sparp_arg->sparp_allow_aggregates_in_expn &= ~1; }
break;
- case 165:
-
-/* Line 1464 of yacc.c */
-#line 1067 "./sparql_p.y"
+ case 117:
+#line 875 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 166:
-
-/* Line 1464 of yacc.c */
-#line 1068 "./sparql_p.y"
+ case 118:
+#line 876 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 167:
-
-/* Line 1464 of yacc.c */
-#line 1073 "./sparql_p.y"
+ case 119:
+#line 881 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)(yyvsp[(1) - (4)].token_type), (yyvsp[(3) - (4)].tree)); }
break;
- case 168:
-
-/* Line 1464 of yacc.c */
-#line 1074 "./sparql_p.y"
+ case 120:
+#line 882 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)(yyvsp[(1) - (4)].token_type), (yyvsp[(3) - (4)].tree)); }
break;
- case 169:
-
-/* Line 1464 of yacc.c */
-#line 1075 "./sparql_p.y"
+ case 121:
+#line 883 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)(yyvsp[(1) - (2)].token_type), (yyvsp[(2) - (2)].box)); }
break;
- case 170:
-
-/* Line 1464 of yacc.c */
-#line 1076 "./sparql_p.y"
+ case 122:
+#line 884 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)ASC_L, (yyvsp[(1) - (1)].tree)); }
break;
- case 171:
-
-/* Line 1464 of yacc.c */
-#line 1077 "./sparql_p.y"
+ case 123:
+#line 885 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)ASC_L, (yyvsp[(1) - (1)].tree)); }
break;
- case 172:
-
-/* Line 1464 of yacc.c */
-#line 1078 "./sparql_p.y"
+ case 124:
+#line 886 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 3, ORDER_L, (ptrlong)ASC_L, (yyvsp[(1) - (1)].tree)); }
break;
- case 173:
-
-/* Line 1464 of yacc.c */
-#line 1082 "./sparql_p.y"
+ case 125:
+#line 890 "./sparql_p.y"
{ (yyval.token_type) = ASC_L; }
break;
- case 174:
-
-/* Line 1464 of yacc.c */
-#line 1083 "./sparql_p.y"
+ case 126:
+#line 891 "./sparql_p.y"
{ (yyval.token_type) = ASC_L; }
break;
- case 175:
-
-/* Line 1464 of yacc.c */
-#line 1084 "./sparql_p.y"
+ case 127:
+#line 892 "./sparql_p.y"
{ (yyval.token_type) = DESC_L; }
break;
- case 176:
-
-/* Line 1464 of yacc.c */
-#line 1088 "./sparql_p.y"
+ case 128:
+#line 896 "./sparql_p.y"
{ (yyval.tree) = (SPART *)t_box_num (SPARP_MAXLIMIT); }
break;
- case 178:
-
-/* Line 1464 of yacc.c */
-#line 1093 "./sparql_p.y"
+ case 130:
+#line 901 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 179:
-
-/* Line 1464 of yacc.c */
-#line 1097 "./sparql_p.y"
+ case 131:
+#line 905 "./sparql_p.y"
{ (yyval.tree) = (SPART *)t_box_num (0); }
break;
- case 181:
-
-/* Line 1464 of yacc.c */
-#line 1102 "./sparql_p.y"
+ case 133:
+#line 910 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 182:
-
-/* Line 1464 of yacc.c */
-#line 1106 "./sparql_p.y"
+ case 134:
+#line 914 "./sparql_p.y"
{
(yyval.tree) = spar_gp_finalize (sparp_arg, (yyvsp[(3) - (3)].trees));
sparp_validate_options_of_tree (sparp_arg, (yyval.tree), (yyval.tree)->_.gp.options); }
break;
- case 183:
-
-/* Line 1464 of yacc.c */
-#line 1109 "./sparql_p.y"
+ case 135:
+#line 917 "./sparql_p.y"
{
(yyval.token_type) = (ptrlong)(sparp_env()->spare_context_gp_subtypes->data);
if (NULL == sparp_env()->spare_context_sinvs) { /* There's an exception related to codegen-time optimization SERVICE { SELECT {x}} like it is SERVICE {x}, so no error right here. */
@@ -4712,10 +4117,8 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
break;
- case 184:
-
-/* Line 1464 of yacc.c */
-#line 1122 "./sparql_p.y"
+ case 136:
+#line 930 "./sparql_p.y"
{
SPART *subselect_top;
SPART *where_gp;
@@ -4740,180 +4143,116 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
break;
- case 185:
-
-/* Line 1464 of yacc.c */
-#line 1147 "./sparql_p.y"
+ case 137:
+#line 955 "./sparql_p.y"
{ }
break;
- case 186:
-
-/* Line 1464 of yacc.c */
-#line 1148 "./sparql_p.y"
+ case 138:
+#line 956 "./sparql_p.y"
{ }
break;
- case 187:
-
-/* Line 1464 of yacc.c */
-#line 1149 "./sparql_p.y"
+ case 139:
+#line 957 "./sparql_p.y"
{ }
break;
- case 188:
-
-/* Line 1464 of yacc.c */
-#line 1150 "./sparql_p.y"
- {
- if (sparp_arg->sparp_macro_mode & SPARP_DEFBODY)
- {
- SPART *curmacro = sparp_arg->sparp_current_macro;
- SPART *mpu;
- int pos = sparp_namesake_macro_param (sparp_arg, curmacro, (yyvsp[(1) - (3)].box));
- if (0 > pos)
- spar_error (sparp_arg, "Pattern variable '%.100s' inside the body of a macro '%.100s' is not listed in list of macro parameters",
- (yyvsp[(1) - (3)].box), curmacro->_.defmacro.mname );
- mpu = spar_make_macropu (sparp_arg, (yyvsp[(1) - (3)].box), pos);
- spar_gp_add_member (sparp_arg, mpu);
- }
- else
- sparyyerror ("Ill formed triple pattern or macro pattern variable outside a macro body"); }
- break;
-
- case 189:
-
-/* Line 1464 of yacc.c */
-#line 1167 "./sparql_p.y"
+ case 140:
+#line 961 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 190:
-
-/* Line 1464 of yacc.c */
-#line 1168 "./sparql_p.y"
+ case 141:
+#line 962 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 191:
-
-/* Line 1464 of yacc.c */
-#line 1169 "./sparql_p.y"
+ case 142:
+#line 963 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 192:
-
-/* Line 1464 of yacc.c */
-#line 1170 "./sparql_p.y"
+ case 143:
+#line 964 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 193:
-
-/* Line 1464 of yacc.c */
-#line 1171 "./sparql_p.y"
+ case 144:
+#line 965 "./sparql_p.y"
{ spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 194:
-
-/* Line 1464 of yacc.c */
-#line 1172 "./sparql_p.y"
+ case 145:
+#line 966 "./sparql_p.y"
{ spar_gp_add_filter (sparp_arg, (yyvsp[(1) - (1)].tree)); }
break;
- case 195:
-
-/* Line 1464 of yacc.c */
-#line 1176 "./sparql_p.y"
+ case 146:
+#line 970 "./sparql_p.y"
{ spar_gp_init (sparp_arg, OPTIONAL_L); }
break;
- case 196:
-
-/* Line 1464 of yacc.c */
-#line 1176 "./sparql_p.y"
+ case 147:
+#line 970 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(4) - (4)].tree); }
break;
- case 197:
-
-/* Line 1464 of yacc.c */
-#line 1177 "./sparql_p.y"
+ case 148:
+#line 971 "./sparql_p.y"
{ sparyyerror ("Missing '{' after OPTIONAL keyword"); }
break;
- case 198:
-
-/* Line 1464 of yacc.c */
-#line 1181 "./sparql_p.y"
+ case 149:
+#line 975 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_QUAD_MAP, "QUAD MAP { ... } group pattern"); }
break;
- case 199:
-
-/* Line 1464 of yacc.c */
-#line 1182 "./sparql_p.y"
+ case 150:
+#line 976 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_qms), (yyvsp[(4) - (4)].tree)); }
break;
- case 200:
-
-/* Line 1464 of yacc.c */
-#line 1183 "./sparql_p.y"
+ case 151:
+#line 977 "./sparql_p.y"
{
spar_gp_init (sparp_arg, 0); }
break;
- case 201:
-
-/* Line 1464 of yacc.c */
-#line 1185 "./sparql_p.y"
+ case 152:
+#line 979 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_qms)); (yyval.tree) = (yyvsp[(8) - (8)].tree); }
break;
- case 202:
-
-/* Line 1464 of yacc.c */
-#line 1190 "./sparql_p.y"
+ case 153:
+#line 984 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_graphs), (yyvsp[(2) - (2)].tree)); }
break;
- case 203:
-
-/* Line 1464 of yacc.c */
-#line 1191 "./sparql_p.y"
+ case 154:
+#line 985 "./sparql_p.y"
{
spar_gp_init (sparp_arg, 0);
spar_gp_add_filters_for_named_graph (sparp_arg); }
break;
- case 204:
-
-/* Line 1464 of yacc.c */
-#line 1194 "./sparql_p.y"
+ case 155:
+#line 988 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_graphs)); (yyval.tree) = (yyvsp[(6) - (6)].tree); }
break;
- case 205:
-
-/* Line 1464 of yacc.c */
-#line 1198 "./sparql_p.y"
+ case 156:
+#line 992 "./sparql_p.y"
{ spar_gp_init (sparp_arg, 0); }
break;
- case 206:
-
-/* Line 1464 of yacc.c */
-#line 1198 "./sparql_p.y"
+ case 157:
+#line 992 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
- case 207:
-
-/* Line 1464 of yacc.c */
-#line 1199 "./sparql_p.y"
+ case 158:
+#line 993 "./sparql_p.y"
{
sparp_env()->spare_good_graph_varnames = sparp_env()->spare_good_graph_bmk;
spar_gp_init (sparp_arg, UNION_L);
@@ -4921,74 +4260,56 @@ yyreduce:
spar_gp_init (sparp_arg, 0); }
break;
- case 208:
-
-/* Line 1464 of yacc.c */
-#line 1204 "./sparql_p.y"
+ case 159:
+#line 998 "./sparql_p.y"
{
spar_gp_add_member (sparp_arg, (yyvsp[(5) - (5)].tree));
(yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
break;
- case 209:
-
-/* Line 1464 of yacc.c */
-#line 1210 "./sparql_p.y"
+ case 160:
+#line 1004 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(3) - (4)].tree); }
break;
- case 210:
-
-/* Line 1464 of yacc.c */
-#line 1211 "./sparql_p.y"
+ case 161:
+#line 1005 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 211:
-
-/* Line 1464 of yacc.c */
-#line 1212 "./sparql_p.y"
+ case 162:
+#line 1006 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 212:
-
-/* Line 1464 of yacc.c */
-#line 1213 "./sparql_p.y"
- { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
+ case 163:
+#line 1007 "./sparql_p.y"
+ { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
if ((yyvsp[(2) - (3)].token_type))
(yyval.tree) = (yyvsp[(3) - (3)].tree);
else
SPAR_BIN_OP ((yyval.tree), BOP_NOT, (yyvsp[(3) - (3)].tree), NULL); }
break;
- case 213:
-
-/* Line 1464 of yacc.c */
-#line 1218 "./sparql_p.y"
- { /*... | 'MINUS' DatasetClause* WhereClause */
+ case 164:
+#line 1012 "./sparql_p.y"
+ { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
/*!!! Dirty hack! Works wrong if MINUS is at the middle of the GP (before smth or not a 2-nd item) */
SPAR_BIN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree), NULL); }
break;
- case 214:
-
-/* Line 1464 of yacc.c */
-#line 1224 "./sparql_p.y"
+ case 165:
+#line 1018 "./sparql_p.y"
{ (yyval.token_type) = 1; }
break;
- case 215:
-
-/* Line 1464 of yacc.c */
-#line 1225 "./sparql_p.y"
+ case 166:
+#line 1019 "./sparql_p.y"
{ (yyval.token_type) = 0; }
break;
- case 216:
-
-/* Line 1464 of yacc.c */
-#line 1229 "./sparql_p.y"
+ case 167:
+#line 1023 "./sparql_p.y"
{
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "SPARQL 1.1 FILTER EXISTS / FILTER NOT EXISTS test");
spar_gp_init (sparp_arg, SELECT_L);
@@ -4998,10 +4319,8 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn <<= 1; }
break;
- case 217:
-
-/* Line 1464 of yacc.c */
-#line 1238 "./sparql_p.y"
+ case 168:
+#line 1032 "./sparql_p.y"
{
SPART *subselect_top;
SPART *where_gp;
@@ -5013,10 +4332,8 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
break;
- case 218:
-
-/* Line 1464 of yacc.c */
-#line 1250 "./sparql_p.y"
+ case 169:
+#line 1044 "./sparql_p.y"
{
sparp_arg->sparp_query_uses_sinvs++;
(yyval.token_type) = sparp_arg->sparp_permitted_syntax;
@@ -5024,37 +4341,30 @@ yyreduce:
}
break;
- case 219:
-
-/* Line 1464 of yacc.c */
-#line 1255 "./sparql_p.y"
+ case 170:
+#line 1049 "./sparql_p.y"
{
(yyval.box) = t_alloc (sizeof (sparp_sources_t));
memcpy ((yyval.box), &(sparp_arg->sparp_env->spare_src), sizeof (sparp_sources_t));
memset (&(sparp_arg->sparp_env->spare_src), 0, sizeof (sparp_sources_t)); }
break;
- case 220:
-
-/* Line 1464 of yacc.c */
-#line 1259 "./sparql_p.y"
+ case 171:
+#line 1053 "./sparql_p.y"
{
SPART **sources;
caddr_t sinv_storage_uri = uname_virtrdf_ns_uri_DefaultServiceStorage /*!!! TBD config */;
SPART *sinv;
- if ((NULL == sparp_arg->sparp_env->spare_src.ssrc_default_graphs) && (NULL == sparp_arg->sparp_env->spare_src.ssrc_named_graphs))
+ if ((NULL == sparp_arg->sparp_env->spare_default_graphs) && (NULL == sparp_arg->sparp_env->spare_named_graphs))
memcpy (&(sparp_arg->sparp_env->spare_src), (yyvsp[(5) - (7)].box), sizeof (sparp_sources_t));
- sources = spar_make_sources_like_top (sparp_arg, SELECT_L);
+ sources = spar_make_sources_like_top (sparp_arg);
sinv = spar_make_service_inv (sparp_arg, (yyvsp[(2) - (7)].box), (yyvsp[(4) - (7)].backstack), sparp_arg->sparp_permitted_syntax, sources, sinv_storage_uri);
- spar_add_service_inv_to_sg (sparp_arg, sinv);
t_set_push (&(sparp_env()->spare_context_sinvs), sinv);
spar_gp_init (sparp_arg, SERVICE_L); }
break;
- case 221:
-
-/* Line 1464 of yacc.c */
-#line 1270 "./sparql_p.y"
+ case 172:
+#line 1063 "./sparql_p.y"
{
sparp_arg->sparp_permitted_syntax = (yyvsp[(3) - (9)].token_type);
(yyvsp[(9) - (9)].tree)->_.gp.options = (SPART **)t_list_concat_tail (
@@ -5064,45 +4374,33 @@ yyreduce:
(yyval.tree) = (yyvsp[(9) - (9)].tree); }
break;
- case 222:
-
-/* Line 1464 of yacc.c */
-#line 1279 "./sparql_p.y"
+ case 173:
+#line 1072 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (SPART *)((ptrlong)IN_L)); t_set_push (&((yyval.backstack)), (SPART *)((ptrlong)_STAR)); }
break;
- case 223:
-
-/* Line 1464 of yacc.c */
-#line 1280 "./sparql_p.y"
+ case 174:
+#line 1073 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
- case 224:
-
-/* Line 1464 of yacc.c */
-#line 1284 "./sparql_p.y"
+ case 175:
+#line 1077 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)[0]); t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)[1]); }
break;
- case 225:
-
-/* Line 1464 of yacc.c */
-#line 1285 "./sparql_p.y"
+ case 176:
+#line 1078 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].trees)[0]); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].trees)[1]); }
break;
- case 226:
-
-/* Line 1464 of yacc.c */
-#line 1289 "./sparql_p.y"
+ case 177:
+#line 1082 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (yyvsp[(1) - (2)].box), (yyvsp[(2) - (2)].backstack)); }
break;
- case 227:
-
-/* Line 1464 of yacc.c */
-#line 1290 "./sparql_p.y"
+ case 178:
+#line 1083 "./sparql_p.y"
{
caddr_t defname = (yyvsp[(2) - (3)].box);
dk_set_t defvals = (yyvsp[(3) - (3)].backstack);
@@ -5115,367 +4413,217 @@ yyreduce:
(yyval.trees) = (SPART **)t_list (2, (SPART *)((ptrlong)DEFINE_L), t_list (2, defname, t_revlist_to_array(defvals))); }
break;
- case 228:
-
-/* Line 1464 of yacc.c */
-#line 1300 "./sparql_p.y"
+ case 179:
+#line 1093 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (SPART *)((ptrlong)IN_L), (yyvsp[(2) - (2)].backstack)); }
break;
- case 229:
-
-/* Line 1464 of yacc.c */
-#line 1301 "./sparql_p.y"
+ case 180:
+#line 1094 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (SPART *)((ptrlong)IN_L), (SPART *)((ptrlong)_STAR)); }
break;
- case 230:
-
-/* Line 1464 of yacc.c */
-#line 1305 "./sparql_p.y"
+ case 181:
+#line 1098 "./sparql_p.y"
{ spar_gp_init (sparp_arg, CONSTRUCT_L); }
break;
- case 231:
-
-/* Line 1464 of yacc.c */
-#line 1306 "./sparql_p.y"
- {
- int g_grp_count = sparp_env()->spare_ctor_g_grp_count;
- int g_may_vary = 0;
- (yyval.tree) = spar_gp_finalize (sparp_arg, NULL);
- if (1 < (g_grp_count + (sparp_env()->spare_ctor_dflt_g_tmpl_count ? 1 : 0)))
- g_may_vary = 1;
- if ((0 == g_may_vary) && (0 < BOX_ELEMENTS ((yyval.tree)->_.gp.members)))
- {
- SPART *g = (yyval.tree)->_.gp.members[0]->_.triple.tr_graph;
- if ((SPAR_QNAME != SPART_TYPE (g)) && !SPART_IS_DEFAULT_GRAPH_BLANK (g))
- g_may_vary = 1;
- }
- if (g_may_vary)
- (yyval.tree)->_.gp.options = (SPART **)t_list (2, (SPART *)((ptrlong)QUAD_L), t_box_num_nonull (g_grp_count));
- sparp_env()->spare_ctor_g_grp_count = 0;
- sparp_env()->spare_ctor_dflt_g_tmpl_count = 0; }
- break;
-
- case 232:
-
-/* Line 1464 of yacc.c */
-#line 1325 "./sparql_p.y"
- { }
- break;
-
- case 233:
-
-/* Line 1464 of yacc.c */
-#line 1326 "./sparql_p.y"
- { }
- break;
-
- case 234:
-
-/* Line 1464 of yacc.c */
-#line 1327 "./sparql_p.y"
- { }
- break;
-
- case 235:
-
-/* Line 1464 of yacc.c */
-#line 1328 "./sparql_p.y"
- { }
- break;
-
- case 236:
-
-/* Line 1464 of yacc.c */
-#line 1332 "./sparql_p.y"
- { }
+ case 182:
+#line 1099 "./sparql_p.y"
+ { (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
break;
- case 237:
-
-/* Line 1464 of yacc.c */
-#line 1333 "./sparql_p.y"
+ case 183:
+#line 1103 "./sparql_p.y"
{ }
break;
- case 238:
-
-/* Line 1464 of yacc.c */
-#line 1334 "./sparql_p.y"
+ case 184:
+#line 1104 "./sparql_p.y"
{ }
break;
- case 239:
-
-/* Line 1464 of yacc.c */
-#line 1338 "./sparql_p.y"
+ case 185:
+#line 1105 "./sparql_p.y"
{ }
break;
- case 240:
-
-/* Line 1464 of yacc.c */
-#line 1339 "./sparql_p.y"
+ case 186:
+#line 1109 "./sparql_p.y"
{ }
break;
- case 241:
-
-/* Line 1464 of yacc.c */
-#line 1340 "./sparql_p.y"
+ case 187:
+#line 1110 "./sparql_p.y"
{ }
break;
- case 242:
-
-/* Line 1464 of yacc.c */
-#line 1344 "./sparql_p.y"
+ case 188:
+#line 1114 "./sparql_p.y"
{ }
break;
- case 243:
-
-/* Line 1464 of yacc.c */
-#line 1345 "./sparql_p.y"
+ case 189:
+#line 1115 "./sparql_p.y"
{ }
break;
- case 244:
-
-/* Line 1464 of yacc.c */
-#line 1349 "./sparql_p.y"
+ case 190:
+#line 1119 "./sparql_p.y"
{ }
break;
- case 245:
-
-/* Line 1464 of yacc.c */
-#line 1350 "./sparql_p.y"
+ case 191:
+#line 1120 "./sparql_p.y"
{ }
break;
- case 246:
-
-/* Line 1464 of yacc.c */
-#line 1354 "./sparql_p.y"
- { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "SPARQL 1.1 quad constructor template"); }
- break;
-
- case 247:
-
-/* Line 1464 of yacc.c */
-#line 1355 "./sparql_p.y"
- {
- sparp_env()->spare_ctor_g_grp_count++;
- t_set_push (&(sparp_env()->spare_context_graphs), (yyvsp[(3) - (3)].tree)); }
- break;
-
- case 248:
-
-/* Line 1464 of yacc.c */
-#line 1358 "./sparql_p.y"
- { t_set_pop (&(sparp_env()->spare_context_graphs)); }
- break;
-
- case 249:
-
-/* Line 1464 of yacc.c */
-#line 1362 "./sparql_p.y"
+ case 192:
+#line 1124 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_subjects), (yyvsp[(1) - (1)].tree)); }
break;
- case 250:
-
-/* Line 1464 of yacc.c */
-#line 1363 "./sparql_p.y"
+ case 193:
+#line 1125 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_subjects)); (yyval.nothing) = (yyvsp[(3) - (3)].nothing); }
break;
- case 251:
-
-/* Line 1464 of yacc.c */
-#line 1364 "./sparql_p.y"
+ case 194:
+#line 1126 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_subjects), (yyvsp[(1) - (1)].tree)); }
break;
- case 252:
-
-/* Line 1464 of yacc.c */
-#line 1365 "./sparql_p.y"
+ case 195:
+#line 1127 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_subjects)); }
break;
- case 253:
-
-/* Line 1464 of yacc.c */
-#line 1366 "./sparql_p.y"
- { spar_gp_add_member (sparp_arg, (yyvsp[(1) - (1)].tree)); }
+ case 196:
+#line 1131 "./sparql_p.y"
+ { }
break;
- case 254:
-
-/* Line 1464 of yacc.c */
-#line 1370 "./sparql_p.y"
+ case 197:
+#line 1132 "./sparql_p.y"
{ }
break;
- case 255:
-
-/* Line 1464 of yacc.c */
-#line 1371 "./sparql_p.y"
+ case 198:
+#line 1133 "./sparql_p.y"
{ }
break;
- case 256:
+ case 199:
+#line 1134 "./sparql_p.y"
+ { sparyyerror ("Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1377 "./sparql_p.y"
+ case 200:
+#line 1138 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_predicates), (yyvsp[(1) - (1)].tree)); }
break;
- case 257:
-
-/* Line 1464 of yacc.c */
-#line 1378 "./sparql_p.y"
+ case 201:
+#line 1139 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_predicates)); }
break;
- case 258:
-
-/* Line 1464 of yacc.c */
-#line 1380 "./sparql_p.y"
+ case 202:
+#line 1141 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_context_predicates), (yyvsp[(3) - (3)].tree)); }
break;
- case 259:
-
-/* Line 1464 of yacc.c */
-#line 1381 "./sparql_p.y"
+ case 203:
+#line 1142 "./sparql_p.y"
{ t_set_pop (&(sparp_env()->spare_context_predicates)); }
break;
- case 260:
-
-/* Line 1464 of yacc.c */
-#line 1382 "./sparql_p.y"
+ case 204:
+#line 1143 "./sparql_p.y"
{ sparyyerror ("Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }
break;
- case 261:
-
-/* Line 1464 of yacc.c */
-#line 1383 "./sparql_p.y"
+ case 205:
+#line 1144 "./sparql_p.y"
{ sparyyerror ("Predicate expected after semicolon"); }
break;
- case 262:
-
-/* Line 1464 of yacc.c */
-#line 1384 "./sparql_p.y"
+ case 206:
+#line 1145 "./sparql_p.y"
{ sparyyerror ("Predicate expected"); }
break;
- case 263:
-
-/* Line 1464 of yacc.c */
-#line 1388 "./sparql_p.y"
+ case 207:
+#line 1149 "./sparql_p.y"
{ }
break;
- case 264:
-
-/* Line 1464 of yacc.c */
-#line 1389 "./sparql_p.y"
+ case 208:
+#line 1150 "./sparql_p.y"
{ }
break;
- case 265:
-
-/* Line 1464 of yacc.c */
-#line 1390 "./sparql_p.y"
+ case 209:
+#line 1151 "./sparql_p.y"
{ sparyyerror ("Semicolon immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
break;
- case 266:
-
-/* Line 1464 of yacc.c */
-#line 1391 "./sparql_p.y"
+ case 210:
+#line 1152 "./sparql_p.y"
{ sparyyerror ("Dot immediately after colon is permitted in pure SPARQL but not in SPARQL-BI"); }
break;
- case 267:
-
-/* Line 1464 of yacc.c */
-#line 1392 "./sparql_p.y"
+ case 211:
+#line 1153 "./sparql_p.y"
{ sparyyerror ("Object expected after comma"); }
break;
- case 268:
-
-/* Line 1464 of yacc.c */
-#line 1393 "./sparql_p.y"
+ case 212:
+#line 1154 "./sparql_p.y"
{ sparyyerror ("Object expected"); }
break;
- case 269:
-
-/* Line 1464 of yacc.c */
-#line 1397 "./sparql_p.y"
+ case 213:
+#line 1158 "./sparql_p.y"
{
- spar_gp_add_triplelike (sparp_arg, NULL, NULL, NULL, (yyvsp[(1) - (2)].tree), NULL, (yyvsp[(2) - (2)].trees), 0x0); }
+ spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL, NULL, (yyvsp[(1) - (2)].tree), NULL, (yyvsp[(2) - (2)].trees), 0x0); }
break;
- case 270:
-
-/* Line 1464 of yacc.c */
-#line 1402 "./sparql_p.y"
+ case 214:
+#line 1163 "./sparql_p.y"
{ (yyval.trees) = NULL; }
break;
- case 271:
-
-/* Line 1464 of yacc.c */
-#line 1403 "./sparql_p.y"
+ case 215:
+#line 1164 "./sparql_p.y"
{
if (CONSTRUCT_L == SPARP_ENV_CONTEXT_GP_SUBTYPE(sparp_arg))
- sparyyerror ("Triple options are not allowed in constructor template");
+ sparyyerror ("Triple options are not allowed in contructor template");
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_OPTION, "OPTION () triple matching configuration"); }
break;
- case 272:
-
-/* Line 1464 of yacc.c */
-#line 1407 "./sparql_p.y"
+ case 216:
+#line 1168 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(4) - (5)].backstack)); }
break;
- case 273:
-
-/* Line 1464 of yacc.c */
-#line 1411 "./sparql_p.y"
+ case 217:
+#line 1172 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), ((SPART **)((yyvsp[(1) - (1)].trees)))[0]); t_set_push (&((yyval.backstack)), ((SPART **)((yyvsp[(1) - (1)].trees)))[1]); }
break;
- case 274:
-
-/* Line 1464 of yacc.c */
-#line 1412 "./sparql_p.y"
+ case 218:
+#line 1173 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), ((SPART **)((yyvsp[(3) - (3)].trees)))[0]); t_set_push (&((yyval.backstack)), ((SPART **)((yyvsp[(3) - (3)].trees)))[1]); }
break;
- case 275:
-
-/* Line 1464 of yacc.c */
-#line 1416 "./sparql_p.y"
+ case 219:
+#line 1177 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)IFP_L, (ptrlong)1); }
break;
- case 276:
-
-/* Line 1464 of yacc.c */
-#line 1417 "./sparql_p.y"
+ case 220:
+#line 1178 "./sparql_p.y"
{
if (strcasecmp ((yyvsp[(2) - (2)].box), "none"))
(yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, (yyvsp[(2) - (2)].box));
@@ -5483,278 +4631,202 @@ yyreduce:
(yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, (ptrlong)1); }
break;
- case 277:
-
-/* Line 1464 of yacc.c */
-#line 1422 "./sparql_p.y"
+ case 221:
+#line 1183 "./sparql_p.y"
{
(yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, sparp_expand_qname_prefix (sparp_arg, (yyvsp[(2) - (2)].box))); }
break;
- case 278:
-
-/* Line 1464 of yacc.c */
-#line 1424 "./sparql_p.y"
+ case 222:
+#line 1185 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, sparp_expand_q_iri_ref (sparp_arg, (yyvsp[(2) - (2)].box))); }
break;
- case 279:
-
-/* Line 1464 of yacc.c */
-#line 1425 "./sparql_p.y"
+ case 223:
+#line 1186 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)INFERENCE_L, (yyvsp[(2) - (2)].box)); }
break;
- case 280:
-
-/* Line 1464 of yacc.c */
-#line 1426 "./sparql_p.y"
+ case 224:
+#line 1187 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)OFFBAND_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 281:
-
-/* Line 1464 of yacc.c */
-#line 1427 "./sparql_p.y"
+ case 225:
+#line 1188 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)SCORE_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 282:
-
-/* Line 1464 of yacc.c */
-#line 1428 "./sparql_p.y"
+ case 226:
+#line 1189 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)SCORE_LIMIT_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 283:
-
-/* Line 1464 of yacc.c */
-#line 1429 "./sparql_p.y"
+ case 227:
+#line 1190 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)TABLE_OPTION_L, (yyvsp[(2) - (2)].box)); }
break;
- case 284:
-
-/* Line 1464 of yacc.c */
-#line 1430 "./sparql_p.y"
+ case 228:
+#line 1191 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_CYCLES_ONLY_L, (ptrlong)1); }
break;
- case 285:
-
-/* Line 1464 of yacc.c */
-#line 1431 "./sparql_p.y"
+ case 229:
+#line 1192 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_DIRECTION_L, (yyvsp[(2) - (2)].box)); }
break;
- case 286:
-
-/* Line 1464 of yacc.c */
-#line 1432 "./sparql_p.y"
+ case 230:
+#line 1193 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_DISTINCT_L, (ptrlong)1); }
break;
- case 287:
-
-/* Line 1464 of yacc.c */
-#line 1433 "./sparql_p.y"
+ case 231:
+#line 1194 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_END_FLAG_L, (yyvsp[(2) - (2)].box)); }
break;
- case 288:
-
-/* Line 1464 of yacc.c */
-#line 1434 "./sparql_p.y"
+ case 232:
+#line 1195 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_EXISTS_L, (ptrlong)1); }
break;
- case 289:
-
-/* Line 1464 of yacc.c */
-#line 1435 "./sparql_p.y"
+ case 233:
+#line 1196 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_FINAL_AS_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 290:
-
-/* Line 1464 of yacc.c */
-#line 1436 "./sparql_p.y"
+ case 234:
+#line 1197 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_IN_L, spartlist (sparp_arg, 2, SPAR_LIST, t_revlist_to_array ((yyvsp[(3) - (4)].backstack)))); }
break;
- case 291:
-
-/* Line 1464 of yacc.c */
-#line 1437 "./sparql_p.y"
+ case 235:
+#line 1198 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_MIN_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 292:
-
-/* Line 1464 of yacc.c */
-#line 1438 "./sparql_p.y"
+ case 236:
+#line 1199 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_MAX_L, (yyvsp[(2) - (2)].tree)); }
break;
- case 293:
-
-/* Line 1464 of yacc.c */
-#line 1439 "./sparql_p.y"
+ case 237:
+#line 1200 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_NO_CYCLES_L, (ptrlong)1); }
break;
- case 294:
-
-/* Line 1464 of yacc.c */
-#line 1440 "./sparql_p.y"
+ case 238:
+#line 1201 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_NO_ORDER_L, (ptrlong)1); }
break;
- case 295:
-
-/* Line 1464 of yacc.c */
-#line 1441 "./sparql_p.y"
+ case 239:
+#line 1202 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_OUT_L, spartlist (sparp_arg, 2, SPAR_LIST, t_revlist_to_array ((yyvsp[(3) - (4)].backstack)))); }
break;
- case 296:
-
-/* Line 1464 of yacc.c */
-#line 1442 "./sparql_p.y"
+ case 240:
+#line 1203 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_SHORTEST_ONLY_L, (ptrlong)1); }
break;
- case 297:
-
-/* Line 1464 of yacc.c */
-#line 1443 "./sparql_p.y"
+ case 241:
+#line 1204 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_STEP_L, spartlist (sparp_arg, 4, SPAR_ALIAS, (yyvsp[(3) - (6)].tree), (yyvsp[(6) - (6)].tree)->_.var.vname, SSG_VALMODE_AUTO)); }
break;
- case 298:
-
-/* Line 1464 of yacc.c */
-#line 1444 "./sparql_p.y"
+ case 242:
+#line 1205 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)T_STEP_L, spartlist (sparp_arg, 4, SPAR_ALIAS, (yyvsp[(3) - (6)].box), (yyvsp[(6) - (6)].tree)->_.var.vname, SSG_VALMODE_AUTO)); }
break;
- case 299:
-
-/* Line 1464 of yacc.c */
-#line 1445 "./sparql_p.y"
+ case 243:
+#line 1206 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (ptrlong)TRANSITIVE_L, (ptrlong)1); }
break;
- case 300:
-
-/* Line 1464 of yacc.c */
-#line 1446 "./sparql_p.y"
+ case 244:
+#line 1207 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (yyvsp[(1) - (4)].token_type), spartlist (sparp_arg, 2, SPAR_LIST, t_revlist_to_array ((yyvsp[(3) - (4)].backstack)))); }
break;
- case 301:
-
-/* Line 1464 of yacc.c */
-#line 1447 "./sparql_p.y"
+ case 245:
+#line 1208 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, (yyvsp[(1) - (1)].token_type), (ptrlong)1); }
break;
- case 302:
-
-/* Line 1464 of yacc.c */
-#line 1451 "./sparql_p.y"
+ case 246:
+#line 1212 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 303:
-
-/* Line 1464 of yacc.c */
-#line 1452 "./sparql_p.y"
+ case 247:
+#line 1213 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 304:
-
-/* Line 1464 of yacc.c */
-#line 1456 "./sparql_p.y"
+ case 248:
+#line 1217 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_L; }
break;
- case 305:
-
-/* Line 1464 of yacc.c */
-#line 1457 "./sparql_p.y"
+ case 249:
+#line 1218 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_O_L; }
break;
- case 306:
-
-/* Line 1464 of yacc.c */
-#line 1458 "./sparql_p.y"
+ case 250:
+#line 1219 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_P_L; }
break;
- case 307:
-
-/* Line 1464 of yacc.c */
-#line 1459 "./sparql_p.y"
+ case 251:
+#line 1220 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_S_L; }
break;
- case 308:
-
-/* Line 1464 of yacc.c */
-#line 1460 "./sparql_p.y"
+ case 252:
+#line 1221 "./sparql_p.y"
{ (yyval.token_type) = SAME_AS_S_O_L; }
break;
- case 310:
-
-/* Line 1464 of yacc.c */
-#line 1465 "./sparql_p.y"
+ case 254:
+#line 1226 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_type); }
break;
- case 311:
-
-/* Line 1464 of yacc.c */
-#line 1466 "./sparql_p.y"
+ case 255:
+#line 1227 "./sparql_p.y"
{ sparyyerror ("Predicate expected (i.e., variable or IRI ref or a backquoted expn or 'a' keyword)"); }
break;
- case 312:
-
-/* Line 1464 of yacc.c */
-#line 1470 "./sparql_p.y"
+ case 256:
+#line 1231 "./sparql_p.y"
{ /* [35] BlankNodePropertyList ::= '[' PropertyListNotEmpty ']' */
SPART *bn = spar_make_blank_node (sparp_arg, spar_mkid (sparp_arg, "_:lsqbra"), 1);
t_set_push (&(sparp_env()->spare_context_subjects), bn); }
break;
- case 313:
-
-/* Line 1464 of yacc.c */
-#line 1473 "./sparql_p.y"
+ case 257:
+#line 1234 "./sparql_p.y"
{
(yyval.tree) = t_set_pop (&(sparp_env()->spare_context_subjects)); }
break;
- case 314:
-
-/* Line 1464 of yacc.c */
-#line 1475 "./sparql_p.y"
+ case 258:
+#line 1236 "./sparql_p.y"
{ /* [36] Collection ::= '(' GraphNode* ')' */
SPART *bn = spar_make_blank_node (sparp_arg, spar_mkid (sparp_arg, "_:topcons"), 1);
t_set_push (&(sparp_env()->spare_context_subjects), bn);
t_set_push (&(sparp_env()->spare_context_subjects), bn); }
break;
- case 315:
-
-/* Line 1464 of yacc.c */
-#line 1479 "./sparql_p.y"
+ case 259:
+#line 1240 "./sparql_p.y"
{
- spar_gp_add_triplelike (sparp_arg,
+ spar_gp_add_triple_or_special_filter (sparp_arg,
NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_rest),
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_nil),
@@ -5763,271 +4835,221 @@ yyreduce:
(yyval.tree) = t_set_pop (&(sparp_env()->spare_context_subjects)); }
break;
- case 316:
-
-/* Line 1464 of yacc.c */
-#line 1487 "./sparql_p.y"
+ case 260:
+#line 1248 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_nil); }
break;
- case 317:
-
-/* Line 1464 of yacc.c */
-#line 1491 "./sparql_p.y"
+ case 261:
+#line 1252 "./sparql_p.y"
{}
break;
- case 318:
-
-/* Line 1464 of yacc.c */
-#line 1492 "./sparql_p.y"
+ case 262:
+#line 1253 "./sparql_p.y"
{}
break;
- case 319:
-
-/* Line 1464 of yacc.c */
-#line 1496 "./sparql_p.y"
+ case 263:
+#line 1257 "./sparql_p.y"
{
- spar_gp_add_triplelike (sparp_arg, NULL, NULL,
+ spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_first),
(yyvsp[(1) - (1)].tree), NULL, NULL, 0x0 ); }
break;
- case 320:
-
-/* Line 1464 of yacc.c */
-#line 1500 "./sparql_p.y"
+ case 264:
+#line 1261 "./sparql_p.y"
{
SPART *bn = spar_make_blank_node (sparp_arg, spar_mkid (sparp_arg, "_:cons"), 1);
- spar_gp_add_triplelike (sparp_arg,
+ spar_gp_add_triple_or_special_filter (sparp_arg,
NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_rest),
bn, NULL, NULL, 0x0 );
sparp_env()->spare_context_subjects->data = bn;
- spar_gp_add_triplelike (sparp_arg, NULL, NULL,
+ spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_first),
(yyvsp[(2) - (2)].tree), NULL, NULL, 0x0 ); }
break;
- case 325:
-
-/* Line 1464 of yacc.c */
-#line 1523 "./sparql_p.y"
+ case 269:
+#line 1284 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 326:
-
-/* Line 1464 of yacc.c */
-#line 1524 "./sparql_p.y"
+ case 270:
+#line 1285 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 330:
-
-/* Line 1464 of yacc.c */
-#line 1531 "./sparql_p.y"
+ case 274:
+#line 1292 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
- case 338:
-
-/* Line 1464 of yacc.c */
-#line 1548 "./sparql_p.y"
+ case 282:
+#line 1309 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (3)].tree)); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 339:
-
-/* Line 1464 of yacc.c */
-#line 1549 "./sparql_p.y"
+ case 283:
+#line 1310 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 340:
-
-/* Line 1464 of yacc.c */
-#line 1553 "./sparql_p.y"
+ case 284:
+#line 1314 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 341:
-
-/* Line 1464 of yacc.c */
-#line 1554 "./sparql_p.y"
+ case 285:
+#line 1315 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 342:
-
-/* Line 1464 of yacc.c */
-#line 1558 "./sparql_p.y"
+ case 286:
+#line 1319 "./sparql_p.y"
{ (yyval.tree) = spar_make_funcall (sparp_arg, 1, (yyvsp[(1) - (3)].box), (SPART **)t_list (1, (yyvsp[(2) - (3)].tree))); }
break;
- case 343:
-
-/* Line 1464 of yacc.c */
-#line 1559 "./sparql_p.y"
+ case 287:
+#line 1320 "./sparql_p.y"
{ (yyval.tree) = spar_make_funcall (sparp_arg, 1, (yyvsp[(1) - (3)].box), (SPART **)t_list (1, (ptrlong)1)); }
break;
- case 344:
-
-/* Line 1464 of yacc.c */
-#line 1560 "./sparql_p.y"
+ case 288:
+#line 1321 "./sparql_p.y"
{ (yyval.tree) = spar_make_funcall (sparp_arg, DISTINCT_L, (yyvsp[(1) - (4)].box), (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 345:
-
-/* Line 1464 of yacc.c */
-#line 1564 "./sparql_p.y"
+ case 289:
+#line 1325 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "aggregate function call"); (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 346:
-
-/* Line 1464 of yacc.c */
-#line 1568 "./sparql_p.y"
+ case 290:
+#line 1329 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:COUNT"); }
break;
- case 347:
-
-/* Line 1464 of yacc.c */
-#line 1569 "./sparql_p.y"
+ case 291:
+#line 1330 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:AVG"); }
break;
- case 348:
-
-/* Line 1464 of yacc.c */
-#line 1570 "./sparql_p.y"
+ case 292:
+#line 1331 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:MIN"); }
break;
- case 349:
-
-/* Line 1464 of yacc.c */
-#line 1571 "./sparql_p.y"
+ case 293:
+#line 1332 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:MAX"); }
break;
- case 350:
-
-/* Line 1464 of yacc.c */
-#line 1572 "./sparql_p.y"
+ case 294:
+#line 1333 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("SPECIAL::bif:SUM"); }
break;
-
- case 351:
-
-/* Line 1464 of yacc.c */
-#line 1576 "./sparql_p.y"
- {
- if (sparp_arg->sparp_macro_mode & SPARP_DEFBODY)
- {
- SPART *curmacro = sparp_arg->sparp_current_macro;
- int pos = sparp_namesake_macro_param (sparp_arg, curmacro, (yyvsp[(1) - (1)].box));
- if (-1 > pos)
- {
- spar_error (sparp_arg, "Variable '%.100s' inside the body of a macro '%.100s' is not listed in list of macro arguments or list of local names",
- (yyvsp[(1) - (1)].box), curmacro->_.defmacro.mname );
- }
- if (0 <= pos)
- (yyval.tree) = spar_make_macropu (sparp_arg, (yyvsp[(1) - (1)].box), pos);
- else
- (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box));
- }
- else
- (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
- break;
-
- case 352:
-
-/* Line 1464 of yacc.c */
-#line 1593 "./sparql_p.y"
- {
- if (sparp_arg->sparp_macro_mode & SPARP_DEFBODY)
- spar_error (sparp_arg, "Global variables are not allowed inside the body of a macro '%.100s'",
- sparp_arg->sparp_current_macro->_.defmacro.mname );
- (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+
+ case 295:
+#line 1337 "./sparql_p.y"
+ { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
break;
- case 353:
+ case 296:
+#line 1338 "./sparql_p.y"
+ { (yyval.tree) = spar_make_param_or_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1598 "./sparql_p.y"
- {
- if (sparp_arg->sparp_macro_mode & SPARP_DEFBODY)
- spar_error (sparp_arg, "Property path variables are not allowed inside the body of a macro '%.100s'",
- sparp_arg->sparp_current_macro->_.defmacro.mname );
- (yyval.tree) = spar_add_propvariable (sparp_arg, (yyvsp[(1) - (2)].tree), (ptrlong)((yyvsp[(2) - (2)].trees)[0]), (yyvsp[(2) - (2)].trees)[1], (ptrlong)((yyvsp[(2) - (2)].trees)[2]), (caddr_t)((yyvsp[(2) - (2)].trees)[3]) ); }
+ case 297:
+#line 1339 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
- case 354:
+ case 298:
+#line 1340 "./sparql_p.y"
+ { (yyval.tree) = spar_add_propvariable (sparp_arg, (yyvsp[(1) - (2)].tree), (ptrlong)((yyvsp[(2) - (2)].trees)[0]), (yyvsp[(2) - (2)].trees)[1], (ptrlong)((yyvsp[(2) - (2)].trees)[2]), (caddr_t)((yyvsp[(2) - (2)].trees)[3]) ); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1606 "./sparql_p.y"
+ case 299:
+#line 1344 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_GLOBALS, "global variable"); (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
- case 355:
+ case 300:
+#line 1349 "./sparql_p.y"
+ { (yyval.tree) = spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1611 "./sparql_p.y"
+ case 301:
+#line 1350 "./sparql_p.y"
{ (yyval.tree) = spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
break;
- case 356:
+ case 302:
+#line 1351 "./sparql_p.y"
+ { (yyval.tree) = spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1612 "./sparql_p.y"
+ case 303:
+#line 1352 "./sparql_p.y"
{ (yyval.tree) = spar_make_variable (sparp_arg, (yyvsp[(1) - (1)].box)); }
break;
- case 360:
+ case 304:
+#line 1357 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1620 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+ case 305:
+#line 1358 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
- case 361:
+ case 306:
+#line 1359 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
+
+ case 307:
+#line 1360 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1621 "./sparql_p.y"
+ case 308:
+#line 1361 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); spar_change_sign (&((yyvsp[(2) - (2)].tree)->_.lit.val)); }
break;
- case 364:
+ case 309:
+#line 1362 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1624 "./sparql_p.y"
- { (yyval.tree) = (SPART *)t_box_dv_uname_string ("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"); }
+ case 310:
+#line 1363 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
- case 366:
+ case 311:
+#line 1364 "./sparql_p.y"
+ { (yyval.tree) = (SPART *)t_box_dv_uname_string ("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1629 "./sparql_p.y"
+ case 313:
+#line 1369 "./sparql_p.y"
{
- dk_set_t gp_st = sparp_env()->spare_context_gp_subtypes;
+ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "backquoted expression");
if (2 & sparp_arg->sparp_in_precode_expn)
- spar_error (sparp_arg, "Backquoted expressions are not allowed in constant clauses");
- (yyval.token_type) = ((NULL == gp_st) ? -1 : (ptrlong)(gp_st->data));
- if (CONSTRUCT_L == (yyval.token_type))
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "backquoted expression in CONSTRUCT"); }
+ spar_error (sparp_arg, "Backquoted expressions are not allowed in constant clauses"); }
break;
- case 367:
-
-/* Line 1464 of yacc.c */
-#line 1636 "./sparql_p.y"
+ case 314:
+#line 1373 "./sparql_p.y"
{
- if ((-1 == (yyvsp[(2) - (4)].token_type)) || (CONSTRUCT_L == (yyvsp[(2) - (4)].token_type)))
+ dk_set_t gp_st = sparp_env()->spare_context_gp_subtypes;
+ if ((NULL == gp_st) || (CONSTRUCT_L == (ptrlong)(gp_st->data)))
(yyval.tree) = (yyvsp[(3) - (4)].tree); /* redundant backquotes in retlist or backquotes to bypass syntax limitation in CONSTRUCT gp */
else
{
@@ -6040,73 +5062,60 @@ yyreduce:
}
break;
- case 368:
-
-/* Line 1464 of yacc.c */
-#line 1651 "./sparql_p.y"
+ case 315:
+#line 1389 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_ALIAS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].box), SSG_VALMODE_AUTO); }
break;
- case 369:
+ case 316:
+#line 1390 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 4, SPAR_ALIAS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].box), SSG_VALMODE_AUTO); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1652 "./sparql_p.y"
+ case 317:
+#line 1391 "./sparql_p.y"
{ /* [44] ConditionalOrExpn ::= ConditionalAndExpn ( '||' ConditionalAndExpn )* */
SPAR_BIN_OP ((yyval.tree), BOP_OR, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 370:
-
-/* Line 1464 of yacc.c */
-#line 1654 "./sparql_p.y"
+ case 318:
+#line 1393 "./sparql_p.y"
{ /* [45] ConditionalAndExpn ::= ValueLogical ( '&&' ValueLogical )* */
/* [46] ValueLogical ::= RelationalExpn */
SPAR_BIN_OP ((yyval.tree), BOP_AND, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 371:
-
-/* Line 1464 of yacc.c */
-#line 1657 "./sparql_p.y"
+ case 319:
+#line 1396 "./sparql_p.y"
{ /* [47]* RelationalExpn ::= NumericExpn */
/*... ( ( ('='|'!='|'<'|'>'|'<='|'>='|'LIKE') NumericExpn ) */
/*... | ( 'IN' '(' Expns ')' ) )? */
SPAR_BIN_OP ((yyval.tree), BOP_EQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 372:
-
-/* Line 1464 of yacc.c */
-#line 1661 "./sparql_p.y"
+ case 320:
+#line 1400 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_NEQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 373:
-
-/* Line 1464 of yacc.c */
-#line 1662 "./sparql_p.y"
+ case 321:
+#line 1401 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_LIKE, "LIKE operator"); }
break;
- case 374:
-
-/* Line 1464 of yacc.c */
-#line 1663 "./sparql_p.y"
+ case 322:
+#line 1402 "./sparql_p.y"
{ /* Virtuoso-specific extension of [47] */
- (yyval.tree) = sparp_make_builtin_call (sparp_arg, LIKE_L, (SPART **)t_list (2, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree))); }
+ (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)LIKE_L, t_list (2, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree))); }
break;
- case 375:
-
-/* Line 1464 of yacc.c */
-#line 1665 "./sparql_p.y"
+ case 323:
+#line 1404 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_IN, "IN operator"); }
break;
- case 376:
-
-/* Line 1464 of yacc.c */
-#line 1666 "./sparql_p.y"
+ case 324:
+#line 1405 "./sparql_p.y"
{ /* Virtuoso-specific extension of [47] */
dk_set_t args = (yyvsp[(5) - (6)].backstack);
if (1 == dk_set_length (args))
@@ -6116,104 +5125,80 @@ yyreduce:
else
{
t_set_push (&args, (yyvsp[(1) - (6)].tree));
- (yyval.tree) = sparp_make_builtin_call (sparp_arg, IN_L,
- (SPART **)t_list_to_array (args) /* NOT t_revlist_to_array (args), note special first element pushed */ );
+ (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (SPART *) t_box_num(IN_L),
+ t_list_to_array (args) /* NOT t_revlist_to_array (args), note special first element pushed */ );
}
}
break;
- case 377:
-
-/* Line 1464 of yacc.c */
-#line 1679 "./sparql_p.y"
+ case 325:
+#line 1418 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_LT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 378:
-
-/* Line 1464 of yacc.c */
-#line 1680 "./sparql_p.y"
+ case 326:
+#line 1419 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_LT, (yyvsp[(3) - (3)].tree), (yyvsp[(1) - (3)].tree)); }
break;
- case 379:
-
-/* Line 1464 of yacc.c */
-#line 1681 "./sparql_p.y"
+ case 327:
+#line 1420 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_LTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 380:
-
-/* Line 1464 of yacc.c */
-#line 1682 "./sparql_p.y"
+ case 328:
+#line 1421 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_LTE, (yyvsp[(3) - (3)].tree), (yyvsp[(1) - (3)].tree)); }
break;
- case 381:
-
-/* Line 1464 of yacc.c */
-#line 1683 "./sparql_p.y"
+ case 329:
+#line 1422 "./sparql_p.y"
{ /* [49] AdditiveExpn ::= MultiplicativeExpn ( ('+'|'-') MultiplicativeExpn )* */
if (sparp_arg->sparp_rset_lexdepth_plus_1 == (yyvsp[(2) - (3)].token_type) + 1)
sparyyerror ("Ambiguous (unary or binary) plus operator in result list, please add \"(\" and \")\"");
SPAR_BIN_OP ((yyval.tree), BOP_PLUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 382:
-
-/* Line 1464 of yacc.c */
-#line 1687 "./sparql_p.y"
+ case 330:
+#line 1426 "./sparql_p.y"
{
if (sparp_arg->sparp_rset_lexdepth_plus_1 == (yyvsp[(2) - (3)].token_type) + 1)
sparyyerror ("Ambiguous (unary or binary) minus operator in result list, please add \"(\" and \")\"");
SPAR_BIN_OP ((yyval.tree), BOP_MINUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 383:
-
-/* Line 1464 of yacc.c */
-#line 1691 "./sparql_p.y"
+ case 331:
+#line 1430 "./sparql_p.y"
{ /* [50] MultiplicativeExpn ::= UnaryExpn ( ('*'|'/') UnaryExpn )* */
SPAR_BIN_OP ((yyval.tree), BOP_TIMES, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 384:
-
-/* Line 1464 of yacc.c */
-#line 1693 "./sparql_p.y"
+ case 332:
+#line 1432 "./sparql_p.y"
{ SPAR_BIN_OP ((yyval.tree), BOP_DIV, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
- case 385:
-
-/* Line 1464 of yacc.c */
-#line 1694 "./sparql_p.y"
+ case 333:
+#line 1433 "./sparql_p.y"
{ /* [51]* UnaryExpn ::= ('!'|'NOT'|'+'|'-')? PrimaryExpn */
SPAR_BIN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree), NULL); }
break;
- case 386:
-
-/* Line 1464 of yacc.c */
-#line 1696 "./sparql_p.y"
+ case 334:
+#line 1435 "./sparql_p.y"
{
SPAR_BIN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree), NULL); }
break;
- case 387:
-
-/* Line 1464 of yacc.c */
-#line 1698 "./sparql_p.y"
+ case 335:
+#line 1437 "./sparql_p.y"
{
SPAR_BIN_OP ((yyval.tree), BOP_PLUS,
spartlist (sparp_arg, 4, SPAR_LIT, (SPART *) t_box_num_nonull(0), uname_xmlschema_ns_uri_hash_integer, NULL), (yyvsp[(2) - (2)].tree)); }
break;
- case 388:
-
-/* Line 1464 of yacc.c */
-#line 1701 "./sparql_p.y"
+ case 336:
+#line 1440 "./sparql_p.y"
{
caddr_t *val_ptr = NULL;
if (DV_ARRAY_OF_POINTER == DV_TYPE_OF ((yyvsp[(2) - (2)].tree))) {
@@ -6239,17 +5224,13 @@ yyreduce:
(yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 389:
-
-/* Line 1464 of yacc.c */
-#line 1724 "./sparql_p.y"
+ case 337:
+#line 1463 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
- case 390:
-
-/* Line 1464 of yacc.c */
-#line 1727 "./sparql_p.y"
+ case 338:
+#line 1466 "./sparql_p.y"
{
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "scalar ASK subquery");
spar_gp_init (sparp_arg, SELECT_L);
@@ -6259,10 +5240,8 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn <<= 1; }
break;
- case 391:
-
-/* Line 1464 of yacc.c */
-#line 1736 "./sparql_p.y"
+ case 339:
+#line 1475 "./sparql_p.y"
{
SPART *subselect_top;
SPART *where_gp;
@@ -6270,14 +5249,12 @@ yyreduce:
subselect_top = spar_make_top (sparp_arg, ASK_L, (SPART **)t_list(0), spar_selid_pop (sparp_arg),
where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0) );
spar_env_pop (sparp_arg);
- (yyval.tree) = spar_gp_finalize_with_subquery (sparp_arg, (yyvsp[(6) - (7)].trees), subselect_top);
+ (yyval.tree) = spar_gp_finalize_with_subquery (sparp_arg, (yyvsp[(7) - (7)].trees), subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
break;
- case 392:
-
-/* Line 1464 of yacc.c */
-#line 1745 "./sparql_p.y"
+ case 340:
+#line 1484 "./sparql_p.y"
{
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "scalar subquery");
spar_gp_init (sparp_arg, SELECT_L);
@@ -6288,10 +5265,8 @@ yyreduce:
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
break;
- case 393:
-
-/* Line 1464 of yacc.c */
-#line 1755 "./sparql_p.y"
+ case 341:
+#line 1494 "./sparql_p.y"
{
SPART *subselect_top;
SPART *where_gp;
@@ -6305,14 +5280,12 @@ yyreduce:
if (SPAR_REQ_TOP == subselect_top->type)
sparp_expand_top_retvals (sparp_arg, subselect_top, 1 /* safely_copy_all_vars */);
spar_env_pop (sparp_arg);
- (yyval.tree) = spar_gp_finalize_with_subquery (sparp_arg, (yyvsp[(8) - (9)].trees), subselect_top);
+ (yyval.tree) = spar_gp_finalize_with_subquery (sparp_arg, (yyvsp[(9) - (9)].trees), subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
break;
- case 394:
-
-/* Line 1464 of yacc.c */
-#line 1770 "./sparql_p.y"
+ case 342:
+#line 1509 "./sparql_p.y"
{
(yyval.tree) = (yyvsp[(1) - (1)].tree);
if (sparp_arg->sparp_in_precode_expn)
@@ -6321,518 +5294,340 @@ yyreduce:
sparyyerror ("Aggregates are allowed only in result sets"); }
break;
- case 396:
-
-/* Line 1464 of yacc.c */
-#line 1777 "./sparql_p.y"
- { /* [55*] IRIrefOrFunctionOrMacro ::= (( IRIref ArgList? ) | ( 'MACRO' IRIref ArgList )) */
- SPART *mdef;
- if (!sparp_arg->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp_arg);
- mdef = spar_find_defmacro_by_iri_or_fields (sparp_arg, (yyvsp[(1) - (1)].tree)->_.lit.val, NULL);
- (yyval.trees) = (SPART **)t_list (2, (ptrlong)(sparp_arg->sparp_macro_mode), mdef);
- if (NULL != mdef)
- {
- if ((SPARP_DEFBODY & sparp_arg->sparp_macro_mode) && (sparp_arg->sparp_current_macro == mdef))
- sparyyerror ("The macro is recursively used in its own definition");
- sparp_arg->sparp_macro_mode |= SPARP_CALLARG;
- } }
- break;
-
- case 397:
-
-/* Line 1464 of yacc.c */
-#line 1789 "./sparql_p.y"
- {
- if (NULL == (yyvsp[(3) - (3)].backstack))
- (yyval.tree) = (yyvsp[(1) - (3)].tree);
+ case 344:
+#line 1516 "./sparql_p.y"
+ { /* [55] IRIrefOrFunction ::= IRIref ArgList? */
+ if (NULL == (yyvsp[(2) - (2)].backstack))
+ (yyval.tree) = (yyvsp[(1) - (2)].tree);
else
{
- SPART **args = (SPART **)(((dk_set_t)NIL_L == (yyvsp[(3) - (3)].backstack)) ? NULL : t_revlist_to_array ((yyvsp[(3) - (3)].backstack)));
- caddr_t fname = (yyvsp[(1) - (3)].tree)->_.lit.val;
- SPART *mdef = ((yyvsp[(2) - (3)].trees))[1];
- if (NULL != mdef)
- {
- sparp_arg->sparp_macro_mode = (ptrlong)(((yyvsp[(2) - (3)].trees))[0]);
- (yyval.tree) = sparp_make_macro_call (sparp_arg, fname, 1, args);
- if (!(sparp_arg->sparp_macro_mode & SPARP_DEFBODY))
- sparp_arg->sparp_macro_call_count++;
- }
- else
- {
+ SPART **args = (SPART **)(((dk_set_t)NIL_L == (yyvsp[(2) - (2)].backstack)) ? NULL : t_revlist_to_array ((yyvsp[(2) - (2)].backstack)));
+ caddr_t fname = (yyvsp[(1) - (2)].tree)->_.lit.val;
spar_verify_funcall_security (sparp_arg, fname, args);
(yyval.tree) = spar_make_funcall (sparp_arg, 0, fname, args);
- } } }
+ } }
break;
- case 398:
-
-/* Line 1464 of yacc.c */
-#line 1809 "./sparql_p.y"
+ case 345:
+#line 1526 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((yyvsp[(1) - (1)].tree)); }
break;
- case 399:
-
-/* Line 1464 of yacc.c */
-#line 1810 "./sparql_p.y"
+ case 346:
+#line 1527 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((yyvsp[(1) - (1)].tree)); }
break;
- case 400:
-
-/* Line 1464 of yacc.c */
-#line 1811 "./sparql_p.y"
+ case 347:
+#line 1528 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((yyvsp[(1) - (1)].tree)); }
break;
- case 404:
-
-/* Line 1464 of yacc.c */
-#line 1818 "./sparql_p.y"
- {
- SPART **args = (SPART **)(((dk_set_t)NIL_L == (yyvsp[(2) - (2)].backstack)) ? NULL : t_revlist_to_array ((yyvsp[(2) - (2)].backstack)));
- if ((SPAR_BIF_REGEX == (yyvsp[(1) - (2)].token_type)) && (2 == BOX_ELEMENTS (args)))
- (yyval.tree) = spar_make_regex_or_like_or_eq (sparp_arg, args[0], args[1]);
- else
- (yyval.tree) = sparp_make_builtin_call (sparp_arg, (yyvsp[(1) - (2)].token_type), args); }
+ case 350:
+#line 1535 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)STR_L, t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 405:
-
-/* Line 1464 of yacc.c */
-#line 1836 "./sparql_p.y"
- { (yyval.tree) = sparp_make_builtin_call (sparp_arg, IRI_L, (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
+ case 351:
+#line 1537 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)LANG_L, t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 406:
-
-/* Line 1464 of yacc.c */
-#line 1838 "./sparql_p.y"
- { (yyval.tree) = sparp_make_builtin_call (sparp_arg, LANG_L, (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
+ case 352:
+#line 1539 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)LANGMATCHES_L, t_list (2, (yyvsp[(3) - (6)].tree), (yyvsp[(5) - (6)].tree))); }
break;
- case 407:
-
-/* Line 1464 of yacc.c */
-#line 1840 "./sparql_p.y"
- { (yyval.tree) = sparp_make_builtin_call (sparp_arg, DATATYPE_L, (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
+ case 353:
+#line 1541 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)DATATYPE_L, t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 408:
-
-/* Line 1464 of yacc.c */
-#line 1842 "./sparql_p.y"
- { (yyval.tree) = sparp_make_builtin_call (sparp_arg, BOUND_L, (SPART **)t_list (1, (yyvsp[(3) - (4)].tree))); }
+ case 354:
+#line 1543 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)BOUND_L, t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 409:
-
-/* Line 1464 of yacc.c */
-#line 1846 "./sparql_p.y"
- {
- SPART *mdef;
- if (!sparp_arg->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp_arg);
- mdef = spar_find_defmacro_by_iri_or_fields (sparp_arg, (yyvsp[(1) - (1)].tree)->_.lit.val, NULL);
- (yyval.token_type) = sparp_arg->sparp_macro_mode;
- if (NULL != mdef)
- {
- if ((SPARP_DEFBODY & sparp_arg->sparp_macro_mode) && (sparp_arg->sparp_current_macro == mdef))
- sparyyerror ("The macro is recursively used in its own definition");
- sparp_arg->sparp_macro_mode |= SPARP_CALLARG;
- } }
+ case 355:
+#line 1545 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)SAMETERM_L, t_list (2, (yyvsp[(3) - (6)].tree), (yyvsp[(5) - (6)].tree))); }
break;
- case 410:
-
-/* Line 1464 of yacc.c */
-#line 1858 "./sparql_p.y"
- {
- SPART **args = (SPART **)(((dk_set_t)NIL_L == (yyvsp[(3) - (3)].backstack)) ? NULL : t_revlist_to_array ((yyvsp[(3) - (3)].backstack)));
- caddr_t fname = (yyvsp[(1) - (3)].tree)->_.lit.val;
- if (sparp_arg->sparp_macro_mode & SPARP_CALLARG)
- {
- sparp_arg->sparp_macro_mode = (yyvsp[(2) - (3)].token_type);
- (yyval.tree) = sparp_make_macro_call (sparp_arg, fname, 1, args);
- if (!(sparp_arg->sparp_macro_mode & SPARP_DEFBODY))
- sparp_arg->sparp_macro_call_count++;
- }
- else
- {
- spar_verify_funcall_security (sparp_arg, fname, args);
- (yyval.tree) = spar_make_funcall (sparp_arg, 0, fname, args);
- } }
+ case 356:
+#line 1547 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isIRI_L, t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 411:
-
-/* Line 1464 of yacc.c */
-#line 1876 "./sparql_p.y"
- {
- SPART *mdef;
- if (!sparp_arg->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp_arg);
- mdef = spar_find_defmacro_by_iri_or_fields (sparp_arg, (yyvsp[(2) - (2)].tree)->_.qname.val, NULL);
- if (NULL == mdef)
- sparyyerror ("Undefined macro IRI");
- if ((SPARP_DEFBODY & sparp_arg->sparp_macro_mode) && (sparp_arg->sparp_current_macro == mdef))
- sparyyerror ("The macro is recursively used in its own definition");
- (yyval.token_type) = sparp_arg->sparp_macro_mode;
- sparp_arg->sparp_macro_mode |= SPARP_CALLARG; }
+ case 357:
+#line 1549 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isURI_L, t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 412:
-
-/* Line 1464 of yacc.c */
-#line 1887 "./sparql_p.y"
- {
- SPART **args = (SPART **)(((dk_set_t)NIL_L == (yyvsp[(4) - (4)].backstack)) ? NULL : t_revlist_to_array ((yyvsp[(4) - (4)].backstack)));
- sparp_arg->sparp_macro_mode = (yyvsp[(3) - (4)].token_type);
- (yyval.tree) = sparp_make_macro_call (sparp_arg, (yyvsp[(2) - (4)].tree)->_.qname.val, 1, args);
- if (!(sparp_arg->sparp_macro_mode & SPARP_DEFBODY))
- sparp_arg->sparp_macro_call_count++;
- }
+ case 358:
+#line 1551 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isBLANK_L, t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 413:
-
-/* Line 1464 of yacc.c */
-#line 1898 "./sparql_p.y"
- { (yyval.backstack) = NULL; }
+ case 359:
+#line 1553 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isLITERAL_L, t_list (1, (yyvsp[(3) - (4)].tree))); }
break;
- case 415:
-
-/* Line 1464 of yacc.c */
-#line 1903 "./sparql_p.y"
- { (yyval.backstack) = (dk_set_t)NIL_L; }
+ case 361:
+#line 1556 "./sparql_p.y"
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "IRI (built-in call)"); }
break;
- case 416:
-
-/* Line 1464 of yacc.c */
-#line 1904 "./sparql_p.y"
- { (yyval.backstack) = (dk_set_t)NIL_L; }
+ case 362:
+#line 1558 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)IRI_L, t_list (1, (yyvsp[(4) - (5)].tree))); }
break;
- case 417:
-
-/* Line 1464 of yacc.c */
-#line 1905 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
+ case 363:
+#line 1560 "./sparql_p.y"
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "isREF (built-in call)"); }
break;
- case 418:
-
-/* Line 1464 of yacc.c */
-#line 1909 "./sparql_p.y"
- { (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
+ case 364:
+#line 1562 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isREF_L, t_list (1, (yyvsp[(4) - (5)].tree))); }
break;
- case 419:
-
-/* Line 1464 of yacc.c */
-#line 1910 "./sparql_p.y"
- { (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
+ case 365:
+#line 1564 "./sparql_p.y"
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "IF (built-in call)");
+ (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)IF_L, t_list (3, (yyvsp[(3) - (8)].tree), (yyvsp[(5) - (8)].tree), (yyvsp[(7) - (8)].tree))); }
break;
- case 420:
-
-/* Line 1464 of yacc.c */
-#line 1911 "./sparql_p.y"
- { sparyyerror ("Argument expected after comma"); }
+ case 366:
+#line 1567 "./sparql_p.y"
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "COALESCE (built-in call)");
+ (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)COALESCE_L, t_revlist_to_array ((yyvsp[(3) - (4)].backstack))); }
break;
- case 421:
+ case 367:
+#line 1573 "./sparql_p.y"
+ { (yyval.tree) = spar_make_regex_or_like_or_eq (sparp_arg, (yyvsp[(3) - (6)].tree), (yyvsp[(5) - (6)].tree)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1912 "./sparql_p.y"
- { sparyyerror ("Comma or ')' expected after function argument"); }
+ case 368:
+#line 1575 "./sparql_p.y"
+ { (yyval.tree) = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)REGEX_L, t_list (3, (yyvsp[(3) - (8)].tree), (yyvsp[(5) - (8)].tree), (yyvsp[(7) - (8)].tree))); }
break;
- case 422:
+ case 369:
+#line 1579 "./sparql_p.y"
+ {
+ SPART **args = (SPART **)(((dk_set_t)NIL_L == (yyvsp[(2) - (2)].backstack)) ? NULL : t_revlist_to_array ((yyvsp[(2) - (2)].backstack)));
+ caddr_t fname = (yyvsp[(1) - (2)].tree)->_.lit.val;
+ spar_verify_funcall_security (sparp_arg, fname, args);
+ (yyval.tree) = spar_make_funcall (sparp_arg, 0, fname, args); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1916 "./sparql_p.y"
+ case 370:
+#line 1587 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 424:
-
-/* Line 1464 of yacc.c */
-#line 1921 "./sparql_p.y"
- { (yyval.backstack) = (dk_set_t)NIL_L; }
+ case 371:
+#line 1588 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
break;
- case 425:
-
-/* Line 1464 of yacc.c */
-#line 1922 "./sparql_p.y"
+ case 372:
+#line 1592 "./sparql_p.y"
{ (yyval.backstack) = (dk_set_t)NIL_L; }
break;
- case 426:
+ case 373:
+#line 1593 "./sparql_p.y"
+ { (yyval.backstack) = (dk_set_t)NIL_L; }
+ break;
-/* Line 1464 of yacc.c */
-#line 1923 "./sparql_p.y"
+ case 374:
+#line 1594 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
- case 427:
-
-/* Line 1464 of yacc.c */
-#line 1927 "./sparql_p.y"
+ case 375:
+#line 1598 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 428:
-
-/* Line 1464 of yacc.c */
-#line 1928 "./sparql_p.y"
+ case 376:
+#line 1599 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 429:
-
-/* Line 1464 of yacc.c */
-#line 1929 "./sparql_p.y"
- { sparyyerror ("Macro argument (an expression or a group pattern) expected after comma"); }
- break;
-
- case 430:
-
-/* Line 1464 of yacc.c */
-#line 1930 "./sparql_p.y"
- { sparyyerror ("Comma or ')' expected after macro argument"); }
- break;
-
- case 432:
-
-/* Line 1464 of yacc.c */
-#line 1935 "./sparql_p.y"
- {
- spar_gp_init (sparp_arg, SPAR_MACROPU); }
+ case 377:
+#line 1600 "./sparql_p.y"
+ { sparyyerror ("Argument expected after comma"); }
break;
- case 433:
-
-/* Line 1464 of yacc.c */
-#line 1937 "./sparql_p.y"
- { (yyval.tree) = spar_gp_finalize (sparp_arg, NULL); }
+ case 378:
+#line 1601 "./sparql_p.y"
+ { sparyyerror ("Comma or ')' expected after function argument"); }
break;
- case 434:
-
-/* Line 1464 of yacc.c */
-#line 1941 "./sparql_p.y"
+ case 379:
+#line 1605 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_integer, NULL); }
break;
- case 435:
-
-/* Line 1464 of yacc.c */
-#line 1942 "./sparql_p.y"
+ case 380:
+#line 1606 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_decimal, NULL); }
break;
- case 436:
-
-/* Line 1464 of yacc.c */
-#line 1943 "./sparql_p.y"
+ case 381:
+#line 1607 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_double, NULL); }
break;
- case 437:
-
-/* Line 1464 of yacc.c */
-#line 1947 "./sparql_p.y"
+ case 382:
+#line 1611 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (1)].box), NULL, NULL); }
break;
- case 438:
-
-/* Line 1464 of yacc.c */
-#line 1948 "./sparql_p.y"
+ case 383:
+#line 1612 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (yyvsp[(1) - (2)].box), NULL, (yyvsp[(2) - (2)].box)); }
break;
- case 439:
-
-/* Line 1464 of yacc.c */
-#line 1949 "./sparql_p.y"
+ case 384:
+#line 1613 "./sparql_p.y"
{ (yyval.tree) = spar_make_typed_literal (sparp_arg, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].tree)->_.lit.val, NULL); }
break;
- case 440:
-
-/* Line 1464 of yacc.c */
-#line 1953 "./sparql_p.y"
+ case 385:
+#line 1617 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (ptrlong)1, uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
- case 441:
-
-/* Line 1464 of yacc.c */
-#line 1954 "./sparql_p.y"
+ case 386:
+#line 1618 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 4, SPAR_LIT, (ptrlong)0, uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
- case 443:
+ case 387:
+#line 1622 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1959 "./sparql_p.y"
+ case 388:
+#line 1623 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((ptrlong)_STAR); }
break;
- case 444:
-
-/* Line 1464 of yacc.c */
-#line 1960 "./sparql_p.y"
+ case 389:
+#line 1624 "./sparql_p.y"
{ (yyval.tree) = (SPART *)((ptrlong)DEFAULT_L); }
break;
- case 445:
-
-/* Line 1464 of yacc.c */
-#line 1964 "./sparql_p.y"
+ case 390:
+#line 1628 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "\"variable+>property\""); (yyval.token_type) = _PLUS_GT; }
break;
- case 446:
-
-/* Line 1464 of yacc.c */
-#line 1965 "./sparql_p.y"
+ case 391:
+#line 1629 "./sparql_p.y"
{ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "\"variable*>property\""); (yyval.token_type) = _STAR_GT; }
break;
- case 447:
-
-/* Line 1464 of yacc.c */
-#line 1969 "./sparql_p.y"
+ case 392:
+#line 1633 "./sparql_p.y"
{
(yyval.trees) = (SPART **) t_list ( 4, (yyvsp[(1) - (2)].token_type),
spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_q_iri_ref (sparp_arg, (yyvsp[(2) - (2)].box))),
Q_IRI_REF, (yyvsp[(2) - (2)].box)); }
break;
- case 448:
-
-/* Line 1464 of yacc.c */
-#line 1973 "./sparql_p.y"
+ case 393:
+#line 1637 "./sparql_p.y"
{
(yyval.trees) = (SPART **) t_list ( 4, (yyvsp[(1) - (2)].token_type),
spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_qname_prefix (sparp_arg, (yyvsp[(2) - (2)].box))),
QNAME, (yyvsp[(2) - (2)].box)); }
break;
- case 449:
-
-/* Line 1464 of yacc.c */
-#line 1977 "./sparql_p.y"
+ case 394:
+#line 1641 "./sparql_p.y"
{
(yyval.trees) = (SPART **) t_list ( 4, (yyvsp[(1) - (2)].token_type),
spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_qname_prefix (sparp_arg, (yyvsp[(2) - (2)].box))),
QNAME_NS, (yyvsp[(2) - (2)].box)); }
break;
- case 450:
-
-/* Line 1464 of yacc.c */
-#line 1981 "./sparql_p.y"
+ case 395:
+#line 1645 "./sparql_p.y"
{ sparyyerror ("IRI reference expected after *> or +> operator"); }
break;
- case 451:
-
-/* Line 1464 of yacc.c */
-#line 1985 "./sparql_p.y"
+ case 396:
+#line 1649 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_q_iri_ref (sparp_arg, (yyvsp[(1) - (1)].box))); }
break;
- case 453:
+ case 397:
+#line 1650 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1990 "./sparql_p.y"
+ case 398:
+#line 1654 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_qname_prefix (sparp_arg, (yyvsp[(1) - (1)].box))); }
break;
- case 454:
-
-/* Line 1464 of yacc.c */
-#line 1991 "./sparql_p.y"
+ case 399:
+#line 1655 "./sparql_p.y"
{ (yyval.tree) = spartlist (sparp_arg, 2, SPAR_QNAME/*_NS*/, sparp_expand_qname_prefix (sparp_arg, (yyvsp[(1) - (1)].box))); }
break;
- case 455:
-
-/* Line 1464 of yacc.c */
-#line 1995 "./sparql_p.y"
+ case 400:
+#line 1659 "./sparql_p.y"
{ (yyval.tree) = spar_make_blank_node (sparp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
- case 456:
-
-/* Line 1464 of yacc.c */
-#line 1996 "./sparql_p.y"
+ case 401:
+#line 1660 "./sparql_p.y"
{ (yyval.tree) = spar_make_blank_node (sparp_arg, spar_mkid (sparp_arg, "_:anon"), 1); }
break;
- case 457:
-
-/* Line 1464 of yacc.c */
-#line 2002 "./sparql_p.y"
+ case 402:
+#line 1666 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 458:
-
-/* Line 1464 of yacc.c */
-#line 2003 "./sparql_p.y"
+ case 403:
+#line 1667 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
- case 469:
-
-/* Line 1464 of yacc.c */
-#line 2023 "./sparql_p.y"
- {
- (yyval.tree) = spar_make_drop_macro_lib (sparp_arg, (yyvsp[(5) - (5)].tree), (yyvsp[(2) - (5)].token_type) /* yes, $2 after $5 */); }
- break;
-
- case 470:
-
-/* Line 1464 of yacc.c */
-#line 2030 "./sparql_p.y"
+ case 413:
+#line 1688 "./sparql_p.y"
{
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
break;
- case 471:
-
-/* Line 1464 of yacc.c */
-#line 2033 "./sparql_p.y"
+ case 414:
+#line 1691 "./sparql_p.y"
{
(yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, INSERT_L, NULL,
spar_selid_pop (sparp_arg), (yyvsp[(5) - (5)].tree) );
spar_compose_retvals_of_insert_or_delete (sparp_arg, (yyval.tree), (yyvsp[(2) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
- case 472:
-
-/* Line 1464 of yacc.c */
-#line 2042 "./sparql_p.y"
+ case 415:
+#line 1700 "./sparql_p.y"
{
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL);
sparp_arg->sparp_in_precode_expn = 2; }
break;
- case 473:
-
-/* Line 1464 of yacc.c */
-#line 2046 "./sparql_p.y"
+ case 416:
+#line 1704 "./sparql_p.y"
{
SPART *fake = spar_make_fake_action_solution (sparp_arg);
sparp_arg->sparp_in_precode_expn = 0;
@@ -6841,39 +5636,31 @@ yyreduce:
spar_compose_retvals_of_insert_or_delete (sparp_arg, (yyval.tree), (yyvsp[(3) - (5)].tree), (yyvsp[(5) - (5)].tree)); }
break;
- case 474:
-
-/* Line 1464 of yacc.c */
-#line 2057 "./sparql_p.y"
+ case 417:
+#line 1715 "./sparql_p.y"
{
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
break;
- case 475:
-
-/* Line 1464 of yacc.c */
-#line 2060 "./sparql_p.y"
+ case 418:
+#line 1718 "./sparql_p.y"
{
(yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, DELETE_L, NULL,
spar_selid_pop (sparp_arg), (yyvsp[(5) - (5)].tree) );
spar_compose_retvals_of_insert_or_delete (sparp_arg, (yyval.tree), (yyvsp[(2) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
- case 476:
-
-/* Line 1464 of yacc.c */
-#line 2069 "./sparql_p.y"
+ case 419:
+#line 1727 "./sparql_p.y"
{
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL);
sparp_arg->sparp_in_precode_expn = 2; }
break;
- case 477:
-
-/* Line 1464 of yacc.c */
-#line 2073 "./sparql_p.y"
+ case 420:
+#line 1731 "./sparql_p.y"
{
SPART *fake = spar_make_fake_action_solution (sparp_arg);
sparp_arg->sparp_in_precode_expn = 0;
@@ -6882,307 +5669,126 @@ yyreduce:
spar_compose_retvals_of_insert_or_delete (sparp_arg, (yyval.tree), (yyvsp[(3) - (5)].tree), (yyvsp[(5) - (5)].tree)); }
break;
- case 478:
-
-/* Line 1464 of yacc.c */
-#line 2085 "./sparql_p.y"
+ case 421:
+#line 1743 "./sparql_p.y"
{
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
break;
- case 479:
-
-/* Line 1464 of yacc.c */
-#line 2089 "./sparql_p.y"
+ case 422:
+#line 1747 "./sparql_p.y"
{
(yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, MODIFY_L, NULL,
spar_selid_pop (sparp_arg), (yyvsp[(8) - (8)].tree) );
spar_compose_retvals_of_modify (sparp_arg, (yyval.tree), (yyvsp[(2) - (8)].tree), (yyvsp[(5) - (8)].tree), (yyvsp[(7) - (8)].tree)); }
break;
- case 480:
-
-/* Line 1464 of yacc.c */
-#line 2096 "./sparql_p.y"
- {
- (yyval.tree) = spar_make_sparul_clear (sparp_arg, (yyvsp[(3) - (3)].tree), (yyvsp[(2) - (3)].token_type) /* yes, $2 after $3 */); }
+ case 423:
+#line 1754 "./sparql_p.y"
+ { (yyval.tree) = spar_make_sparul_clear (sparp_arg, (yyvsp[(2) - (2)].tree)); }
break;
- case 481:
-
-/* Line 1464 of yacc.c */
-#line 2102 "./sparql_p.y"
+ case 424:
+#line 1759 "./sparql_p.y"
{
- (yyval.tree) = spar_make_sparul_load (sparp_arg, (yyvsp[(3) - (3)].tree), (yyvsp[(3) - (3)].tree), (yyvsp[(2) - (3)].token_type)); }
+ (yyval.tree) = spar_make_sparul_load (sparp_arg, (yyvsp[(2) - (2)].tree), (yyvsp[(2) - (2)].tree)); }
break;
- case 482:
-
-/* Line 1464 of yacc.c */
-#line 2104 "./sparql_p.y"
+ case 425:
+#line 1761 "./sparql_p.y"
{
- (yyval.tree) = spar_make_sparul_load (sparp_arg, (yyvsp[(6) - (6)].tree), (yyvsp[(3) - (6)].tree) /* yes, $3 after $6 */, (yyvsp[(2) - (6)].token_type)); }
+ (yyval.tree) = spar_make_sparul_load (sparp_arg, (yyvsp[(5) - (5)].tree), (yyvsp[(2) - (5)].tree) /* yes, $2 after $3 */); }
break;
- case 483:
-
-/* Line 1464 of yacc.c */
-#line 2109 "./sparql_p.y"
+ case 426:
+#line 1766 "./sparql_p.y"
{
(yyval.tree) = spar_make_sparul_create (sparp_arg, (yyvsp[(4) - (4)].tree), (yyvsp[(2) - (4)].token_type) /* yes, $2 after $4 */); }
break;
- case 484:
-
-/* Line 1464 of yacc.c */
-#line 2114 "./sparql_p.y"
+ case 427:
+#line 1771 "./sparql_p.y"
{
- (yyval.tree) = spar_make_sparul_drop (sparp_arg, (yyvsp[(3) - (3)].tree), (yyvsp[(2) - (3)].token_type) /* yes, $2 after $3 */); }
+ (yyval.tree) = spar_make_sparul_drop (sparp_arg, (yyvsp[(4) - (4)].tree), (yyvsp[(2) - (4)].token_type) /* yes, $2 after $4 */); }
break;
- case 485:
-
-/* Line 1464 of yacc.c */
-#line 2119 "./sparql_p.y"
+ case 428:
+#line 1776 "./sparql_p.y"
{ (yyval.tree) = spar_make_fake_action_solution (sparp_arg); }
break;
- case 486:
-
-/* Line 1464 of yacc.c */
-#line 2120 "./sparql_p.y"
- {
- SPART *where_gp = spar_gp_finalize (sparp_arg, NULL);
- (yyval.tree) = (yyvsp[(3) - (4)].tree);
- (yyvsp[(3) - (4)].tree)->_.wm.where_gp = where_gp; }
- break;
-
- case 487:
-
-/* Line 1464 of yacc.c */
-#line 2127 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(3) - (3)].tree); }
- break;
-
- case 488:
-
-/* Line 1464 of yacc.c */
-#line 2131 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(3) - (3)].tree); }
- break;
-
- case 489:
-
-/* Line 1464 of yacc.c */
-#line 2135 "./sparql_p.y"
- { (yyval.tree) = (SPART *)ALL_L; }
- break;
-
- case 490:
-
-/* Line 1464 of yacc.c */
-#line 2136 "./sparql_p.y"
- { (yyval.tree) = (SPART *)DEFAULT_L; }
- break;
-
- case 491:
-
-/* Line 1464 of yacc.c */
-#line 2137 "./sparql_p.y"
- { (yyval.tree) = (SPART *)NAMED_L; }
- break;
-
- case 492:
-
-/* Line 1464 of yacc.c */
-#line 2138 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
- break;
-
- case 493:
-
-/* Line 1464 of yacc.c */
-#line 2142 "./sparql_p.y"
- { (yyval.tree) = (SPART *)DEFAULT_L; }
- break;
-
- case 494:
-
-/* Line 1464 of yacc.c */
-#line 2143 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
- break;
-
- case 495:
-
-/* Line 1464 of yacc.c */
-#line 2147 "./sparql_p.y"
- { (yyval.tree) = spar_default_sparul_target (sparp_arg, "GRAPH IDENTIFIED BY clause", 0); }
- break;
-
- case 496:
-
-/* Line 1464 of yacc.c */
-#line 2148 "./sparql_p.y"
- { (yyval.tree) = (yyvsp[(2) - (2)].tree); }
- break;
-
- case 497:
-
-/* Line 1464 of yacc.c */
-#line 2152 "./sparql_p.y"
- {}
- break;
-
- case 498:
-
-/* Line 1464 of yacc.c */
-#line 2153 "./sparql_p.y"
- {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "WITH clause");
- sparp_arg->sparp_env->spare_src.ssrc_graph_set_by_with = (yyvsp[(3) - (4)].tree);
- sparp_make_and_push_new_graph_source (sparp_arg, SPART_GRAPH_FROM, (yyvsp[(3) - (4)].tree), (yyvsp[(4) - (4)].trees)); }
- break;
-
- case 499:
-
-/* Line 1464 of yacc.c */
-#line 2160 "./sparql_p.y"
- {}
- break;
-
- case 500:
-
-/* Line 1464 of yacc.c */
-#line 2161 "./sparql_p.y"
- {}
- break;
-
- case 501:
-
-/* Line 1464 of yacc.c */
-#line 2165 "./sparql_p.y"
- { (yyval.token_type) = 0; }
- break;
-
- case 502:
-
-/* Line 1464 of yacc.c */
-#line 2166 "./sparql_p.y"
- { (yyval.token_type) = 1; }
- break;
-
- case 506:
-
-/* Line 1464 of yacc.c */
-#line 2183 "./sparql_p.y"
- {
- (yyval.tree) = spar_default_sparul_target (sparp_arg, "SPARQL 1.1 DELETE clause", 1);
- sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
- t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
- break;
-
- case 507:
-
-/* Line 1464 of yacc.c */
-#line 2188 "./sparql_p.y"
- {
- if (NULL != (yyvsp[(4) - (5)].tree))
- {
- (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, MODIFY_L, NULL,
- spar_selid_pop (sparp_arg), (yyvsp[(5) - (5)].tree) );
- spar_compose_retvals_of_modify (sparp_arg, (yyval.tree), (yyvsp[(2) - (5)].tree), (yyvsp[(3) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
- else
- {
- (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, DELETE_L, NULL,
- spar_selid_pop (sparp_arg), (yyvsp[(5) - (5)].tree) );
- spar_compose_retvals_of_insert_or_delete (sparp_arg, (yyval.tree), (yyvsp[(2) - (5)].tree), (yyvsp[(3) - (5)].tree)); } }
- break;
-
- case 508:
-
-/* Line 1464 of yacc.c */
-#line 2205 "./sparql_p.y"
+ case 429:
+#line 1777 "./sparql_p.y"
{
- (yyval.tree) = spar_default_sparul_target (sparp_arg, "SPARQL 1.1 INSERT clause", 1);
- sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
- t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
+ SPART *where_gp = spar_gp_finalize (sparp_arg, NULL);
+ (yyval.tree) = (yyvsp[(3) - (4)].tree);
+ (yyvsp[(3) - (4)].tree)->_.wm.where_gp = where_gp; }
break;
- case 509:
+ case 430:
+#line 1784 "./sparql_p.y"
+ { (yyval.tree) = spar_default_sparul_target (sparp_arg, "INTO GRAPH IDENTIFIED BY clause"); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2210 "./sparql_p.y"
- {
- (yyval.tree) = spar_make_top_or_special_case_from_wm (sparp_arg, INSERT_L, NULL,
- spar_selid_pop (sparp_arg), (yyvsp[(4) - (4)].tree) );
- spar_compose_retvals_of_insert_or_delete (sparp_arg, (yyval.tree), (yyvsp[(2) - (4)].tree), (yyvsp[(3) - (4)].tree)); }
+ case 431:
+#line 1785 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
- case 510:
+ case 432:
+#line 1789 "./sparql_p.y"
+ { (yyval.tree) = spar_default_sparul_target (sparp_arg, "FROM GRAPH IDENTIFIED BY clause"); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2217 "./sparql_p.y"
- { (yyval.tree) = NULL; }
+ case 433:
+#line 1790 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
- case 511:
+ case 434:
+#line 1794 "./sparql_p.y"
+ { (yyval.tree) = spar_default_sparul_target (sparp_arg, "GRAPH IDENTIFIED BY clause"); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2218 "./sparql_p.y"
+ case 435:
+#line 1795 "./sparql_p.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 512:
-
-/* Line 1464 of yacc.c */
-#line 2222 "./sparql_p.y"
- {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "WITH clause");
- (yyval.tree) = spar_make_sparul_copymoveadd (sparp_arg, (yyvsp[(1) - (5)].token_type), (yyvsp[(3) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(2) - (5)].token_type) /* yes, $2 after $3 */); }
+ case 436:
+#line 1799 "./sparql_p.y"
+ {}
break;
- case 513:
-
-/* Line 1464 of yacc.c */
-#line 2228 "./sparql_p.y"
- { (yyval.token_type) = COPY_L; }
+ case 437:
+#line 1800 "./sparql_p.y"
+ {}
break;
- case 514:
-
-/* Line 1464 of yacc.c */
-#line 2229 "./sparql_p.y"
- { (yyval.token_type) = MOVE_L; }
+ case 438:
+#line 1804 "./sparql_p.y"
+ { (yyval.token_type) = 0; }
break;
- case 515:
-
-/* Line 1464 of yacc.c */
-#line 2230 "./sparql_p.y"
- { (yyval.token_type) = ADD_L; }
+ case 439:
+#line 1805 "./sparql_p.y"
+ { (yyval.token_type) = 1; }
break;
- case 517:
-
-/* Line 1464 of yacc.c */
-#line 2237 "./sparql_p.y"
+ case 441:
+#line 1812 "./sparql_p.y"
{
sparp_env()->spare_qm_default_table = NULL; }
break;
- case 519:
-
-/* Line 1464 of yacc.c */
-#line 2243 "./sparql_p.y"
+ case 443:
+#line 1818 "./sparql_p.y"
{ t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
break;
- case 527:
-
-/* Line 1464 of yacc.c */
-#line 2261 "./sparql_p.y"
+ case 451:
+#line 1836 "./sparql_p.y"
{
if (dk_set_get_keyword (sparp_arg->sparp_created_jsos, (yyvsp[(4) - (7)].box), NULL))
spar_error (sparp_arg, "The identifier of %s class %.100s is already used in the previous part of the statement",
@@ -7191,13 +5797,12 @@ yyreduce:
t_set_push (&(sparp_arg->sparp_created_jsos), (yyvsp[(4) - (7)].box));
(yyval.tree) = spar_make_qm_sql (sparp_arg,
((IRI_L == (yyvsp[(2) - (7)].token_type)) ? "DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FORMAT" : "DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FORMAT"),
- (SPART **)t_list (3, (yyvsp[(4) - (7)].box), (yyvsp[(5) - (7)].box), (yyvsp[(6) - (7)].tree)), (yyvsp[(7) - (7)].trees) ); }
+ (SPART **)t_list (3, (yyvsp[(4) - (7)].box), (yyvsp[(5) - (7)].box), (yyvsp[(6) - (7)].tree)), (yyvsp[(7) - (7)].trees) );
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 528:
-
-/* Line 1464 of yacc.c */
-#line 2270 "./sparql_p.y"
+ case 452:
+#line 1846 "./sparql_p.y"
{
if (dk_set_get_keyword (sparp_arg->sparp_created_jsos, (yyvsp[(4) - (7)].box), NULL))
spar_error (sparp_arg, "The identifier of %s class %.100s is already used in the previous part of the statement",
@@ -7206,148 +5811,118 @@ yyreduce:
t_set_push (&(sparp_arg->sparp_created_jsos), (yyvsp[(4) - (7)].box));
(yyval.tree) = spar_make_qm_sql (sparp_arg,
((IRI_L == (yyvsp[(2) - (7)].token_type)) ? "DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FUNCTIONS" : "DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FUNCTIONS"),
- (SPART **)t_list (2, (yyvsp[(4) - (7)].box), spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ((yyvsp[(6) - (7)].backstack)))), (yyvsp[(7) - (7)].trees) ); }
+ (SPART **)t_list (2, (yyvsp[(4) - (7)].box), spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ((yyvsp[(6) - (7)].backstack)))), (yyvsp[(7) - (7)].trees) );
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 529:
-
-/* Line 1464 of yacc.c */
-#line 2282 "./sparql_p.y"
+ case 453:
+#line 1859 "./sparql_p.y"
{
if (dk_set_get_keyword (sparp_arg->sparp_created_jsos, (yyvsp[(5) - (5)].box), NULL))
spar_error (sparp_arg, "The identifier of %s class %.100s is already used in the previous part of the statement",
((IRI_L == (yyvsp[(3) - (5)].token_type)) ? "IRI" : "literal"), (yyvsp[(5) - (5)].box));
(yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_CLASS",
(SPART **)t_list (2, (yyvsp[(5) - (5)].box), (yyvsp[(2) - (5)].token_type) /* yes, $2 after $5 */), NULL );
- sparp_jso_push_deleted (sparp_arg, uname_virtrdf_ns_uri_QuadMapFormat , (yyvsp[(5) - (5)].box)); }
+ sparp_jso_push_deleted (sparp_arg, uname_virtrdf_ns_uri_QuadMapFormat , (yyvsp[(5) - (5)].box));
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 530:
-
-/* Line 1464 of yacc.c */
-#line 2292 "./sparql_p.y"
+ case 454:
+#line 1870 "./sparql_p.y"
{
(yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DEFINE_SUBCLASS",
- (SPART **)t_list (2, (yyvsp[(4) - (7)].box), (yyvsp[(7) - (7)].box)), NULL ); }
+ (SPART **)t_list (2, (yyvsp[(4) - (7)].box), (yyvsp[(7) - (7)].box)), NULL );
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 531:
-
-/* Line 1464 of yacc.c */
-#line 2295 "./sparql_p.y"
+ case 455:
+#line 1874 "./sparql_p.y"
{
(yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DEFINE_SUBCLASS",
- (SPART **)t_list (2, (yyvsp[(2) - (5)].box), (yyvsp[(5) - (5)].box)), NULL ); }
+ (SPART **)t_list (2, (yyvsp[(2) - (5)].box), (yyvsp[(5) - (5)].box)), NULL );
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 532:
-
-/* Line 1464 of yacc.c */
-#line 2301 "./sparql_p.y"
+ case 456:
+#line 1881 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (0); }
break;
- case 533:
-
-/* Line 1464 of yacc.c */
-#line 2302 "./sparql_p.y"
+ case 457:
+#line 1882 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (0); }
break;
- case 534:
-
-/* Line 1464 of yacc.c */
-#line 2303 "./sparql_p.y"
+ case 458:
+#line 1883 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
- case 535:
-
-/* Line 1464 of yacc.c */
-#line 2307 "./sparql_p.y"
+ case 459:
+#line 1887 "./sparql_p.y"
{
(yyval.backstack) = NULL;
t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)[0]);
t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)[1]); }
break;
- case 536:
-
-/* Line 1464 of yacc.c */
-#line 2311 "./sparql_p.y"
+ case 460:
+#line 1891 "./sparql_p.y"
{
(yyval.backstack) = (yyvsp[(1) - (3)].backstack);
t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].trees)[0]);
t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].trees)[1]); }
break;
- case 537:
-
-/* Line 1464 of yacc.c */
-#line 2318 "./sparql_p.y"
+ case 461:
+#line 1898 "./sparql_p.y"
{ /*... ( 'DATATYPE' QmIRIrefConst ) */
- (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("DATATYPE"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
+ (yyval.trees) = t_list (2, t_box_dv_uname_string ("DATATYPE"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
break;
- case 538:
-
-/* Line 1464 of yacc.c */
-#line 2320 "./sparql_p.y"
+ case 462:
+#line 1900 "./sparql_p.y"
{ /*... | ( 'LANG' STRING ) */
- (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
+ (yyval.trees) = t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
break;
- case 539:
-
-/* Line 1464 of yacc.c */
-#line 2322 "./sparql_p.y"
+ case 463:
+#line 1902 "./sparql_p.y"
{ /*... | ( 'LANG' STRING ) */
- (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
+ (yyval.trees) = t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ((yyvsp[(2) - (2)].box))); }
break;
- case 540:
-
-/* Line 1464 of yacc.c */
-#line 2324 "./sparql_p.y"
+ case 464:
+#line 1904 "./sparql_p.y"
{ /*... | 'BIJECTION' */
- (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("BIJECTION"), (ptrlong)1); }
+ (yyval.trees) = t_list (2, t_box_dv_uname_string ("BIJECTION"), (ptrlong)1); }
break;
- case 541:
-
-/* Line 1464 of yacc.c */
-#line 2326 "./sparql_p.y"
+ case 465:
+#line 1906 "./sparql_p.y"
{ /*... | 'DEREF' */
- (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("DEREF"), (ptrlong)1); }
+ (yyval.trees) = t_list (2, t_box_dv_uname_string ("DEREF"), (ptrlong)1); }
break;
- case 542:
-
-/* Line 1464 of yacc.c */
-#line 2328 "./sparql_p.y"
+ case 466:
+#line 1908 "./sparql_p.y"
{ /*... | 'RETURNS' STRING ('UNION' STRING)* */
- (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("RETURNS"),
+ (yyval.trees) = t_list (2, t_box_dv_uname_string ("RETURNS"),
spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ((yyvsp[(2) - (2)].backstack))) ); }
break;
- case 543:
-
-/* Line 1464 of yacc.c */
-#line 2334 "./sparql_p.y"
+ case 467:
+#line 1914 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].box)); }
break;
- case 544:
-
-/* Line 1464 of yacc.c */
-#line 2335 "./sparql_p.y"
+ case 468:
+#line 1915 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].box)); }
break;
- case 545:
-
-/* Line 1464 of yacc.c */
-#line 2339 "./sparql_p.y"
+ case 469:
+#line 1919 "./sparql_p.y"
{
sparp_env()->spare_storage_name = (yyvsp[(4) - (4)].box);
if (dk_set_get_keyword (sparp_arg->sparp_created_jsos, (yyvsp[(4) - (4)].box), NULL))
@@ -7363,18 +5938,14 @@ yyreduce:
sparp_jso_push_affected (sparp_arg, (yyvsp[(4) - (4)].box)); }
break;
- case 546:
-
-/* Line 1464 of yacc.c */
-#line 2353 "./sparql_p.y"
+ case 470:
+#line 1933 "./sparql_p.y"
{
spar_qm_push_bookmark (sparp_arg); }
break;
- case 547:
-
-/* Line 1464 of yacc.c */
-#line 2355 "./sparql_p.y"
+ case 471:
+#line 1935 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_END_ALTER_QUAD_STORAGE",
@@ -7383,24 +5954,18 @@ yyreduce:
sparp_env()->spare_storage_name = NULL; }
break;
- case 548:
-
-/* Line 1464 of yacc.c */
-#line 2364 "./sparql_p.y"
+ case 472:
+#line 1944 "./sparql_p.y"
{ (yyval.token_type) = IRI_L; }
break;
- case 549:
-
-/* Line 1464 of yacc.c */
-#line 2365 "./sparql_p.y"
+ case 473:
+#line 1945 "./sparql_p.y"
{ (yyval.token_type) = LITERAL_L; }
break;
- case 550:
-
-/* Line 1464 of yacc.c */
-#line 2369 "./sparql_p.y"
+ case 474:
+#line 1949 "./sparql_p.y"
{
sparp_env()->spare_storage_name = (yyvsp[(4) - (4)].box);
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
@@ -7409,18 +5974,14 @@ yyreduce:
sparp_jso_push_affected (sparp_arg, (yyvsp[(4) - (4)].box)); }
break;
- case 551:
-
-/* Line 1464 of yacc.c */
-#line 2376 "./sparql_p.y"
+ case 475:
+#line 1956 "./sparql_p.y"
{
spar_qm_push_bookmark (sparp_arg); }
break;
- case 552:
-
-/* Line 1464 of yacc.c */
-#line 2378 "./sparql_p.y"
+ case 476:
+#line 1958 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_END_ALTER_QUAD_STORAGE",
@@ -7429,10 +5990,8 @@ yyreduce:
sparp_env()->spare_storage_name = NULL; }
break;
- case 553:
-
-/* Line 1464 of yacc.c */
-#line 2387 "./sparql_p.y"
+ case 477:
+#line 1967 "./sparql_p.y"
{
if (dk_set_get_keyword (sparp_arg->sparp_created_jsos, (yyvsp[(5) - (5)].box), NULL))
spar_error (sparp_arg, "The identifier of Quad Storage %.100s is already used in the previous part of the statement", (yyvsp[(5) - (5)].box));
@@ -7443,390 +6002,258 @@ yyreduce:
sparp_jso_push_affected (sparp_arg, (yyvsp[(5) - (5)].box)); }
break;
- case 554:
-
-/* Line 1464 of yacc.c */
-#line 2398 "./sparql_p.y"
+ case 478:
+#line 1978 "./sparql_p.y"
{
(yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_MAPPING",
(SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
(SPART **)t_list (4, t_box_dv_uname_string ("ID"), (yyvsp[(5) - (5)].box), t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ((yyvsp[(2) - (5)].token_type))) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ if (NULL == sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 555:
-
-/* Line 1464 of yacc.c */
-#line 2404 "./sparql_p.y"
+ case 479:
+#line 1984 "./sparql_p.y"
{
(yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_MAPPING",
(SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
(SPART **)t_list (4, t_box_dv_uname_string ("GRAPH"), (yyvsp[(6) - (6)].box), t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ((yyvsp[(2) - (6)].token_type))) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ if (NULL == sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 556:
-
-/* Line 1464 of yacc.c */
-#line 2413 "./sparql_p.y"
+ case 480:
+#line 1993 "./sparql_p.y"
{
(yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_MAPPING",
(SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
(SPART **)t_list (4, t_box_dv_uname_string ("ID"), (yyvsp[(3) - (3)].box), t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ((yyvsp[(2) - (3)].token_type))) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ if (NULL == sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 557:
-
-/* Line 1464 of yacc.c */
-#line 2419 "./sparql_p.y"
+ case 481:
+#line 1999 "./sparql_p.y"
{
(yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_MAPPING",
(SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
(SPART **)t_list (4, t_box_dv_uname_string ("GRAPH"), (yyvsp[(4) - (4)].box), t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ((yyvsp[(2) - (4)].token_type))) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ if (NULL == sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
break;
- case 558:
-
-/* Line 1464 of yacc.c */
-#line 2428 "./sparql_p.y"
+ case 482:
+#line 2008 "./sparql_p.y"
{}
break;
- case 559:
-
-/* Line 1464 of yacc.c */
-#line 2429 "./sparql_p.y"
+ case 483:
+#line 2009 "./sparql_p.y"
{ /*... ( 'FROM' QTABLE 'AS' PLAIN_ID QmTextLiteral* ) */
spar_qm_add_aliased_table_or_sqlquery (sparp_arg, (yyvsp[(3) - (5)].box), (yyvsp[(5) - (5)].box));
sparp_env()->spare_qm_current_table_alias = (yyvsp[(5) - (5)].box); }
break;
- case 560:
-
-/* Line 1464 of yacc.c */
-#line 2432 "./sparql_p.y"
+ case 484:
+#line 2012 "./sparql_p.y"
{
sparp_env()->spare_qm_current_table_alias = NULL; }
break;
- case 561:
-
-/* Line 1464 of yacc.c */
-#line 2434 "./sparql_p.y"
+ case 485:
+#line 2014 "./sparql_p.y"
{ /*... | ( 'FROM' PLAIN_ID 'AS' PLAIN_ID QmTextLiteral* ) */
spar_qm_add_aliased_alias (sparp_arg, (yyvsp[(3) - (5)].box), (yyvsp[(5) - (5)].box));
sparp_env()->spare_qm_current_table_alias = (yyvsp[(5) - (5)].box); }
break;
- case 562:
-
-/* Line 1464 of yacc.c */
-#line 2437 "./sparql_p.y"
+ case 486:
+#line 2017 "./sparql_p.y"
{ /*... | ( 'FROM' 'SQLQUERY' QmSqlQuery 'AS' PLAIN_ID QmTextLiteral* ) */
caddr_t qry = t_box_sprintf (100 + strlen((yyvsp[(4) - (6)].box)), "/*???*/ %s", (yyvsp[(4) - (6)].box));
spar_qm_add_aliased_table_or_sqlquery (sparp_arg, qry, (yyvsp[(6) - (6)].box));
sparp_env()->spare_qm_current_table_alias = (yyvsp[(6) - (6)].box); }
break;
- case 563:
-
-/* Line 1464 of yacc.c */
-#line 2441 "./sparql_p.y"
+ case 487:
+#line 2021 "./sparql_p.y"
{
sparp_env()->spare_qm_current_table_alias = NULL; }
break;
- case 564:
-
-/* Line 1464 of yacc.c */
-#line 2443 "./sparql_p.y"
+ case 488:
+#line 2023 "./sparql_p.y"
{ /*... | QmCondition */
spar_qm_add_table_filter (sparp_arg, (yyvsp[(2) - (2)].box)); }
break;
- case 565:
-
-/* Line 1464 of yacc.c */
-#line 2448 "./sparql_p.y"
+ case 489:
+#line 2028 "./sparql_p.y"
{}
break;
- case 567:
-
-/* Line 1464 of yacc.c */
-#line 2453 "./sparql_p.y"
+ case 491:
+#line 2033 "./sparql_p.y"
{
spar_qm_add_text_literal (sparp_arg,
sparp_env()->spare_qm_current_table_alias,
(yyvsp[(2) - (6)].box), (yyvsp[(4) - (6)].tree), (yyvsp[(5) - (6)].trees), (yyvsp[(6) - (6)].trees) ); }
break;
- case 568:
-
-/* Line 1464 of yacc.c */
-#line 2460 "./sparql_p.y"
+ case 492:
+#line 2040 "./sparql_p.y"
{ (yyval.box) = NULL; }
break;
- case 569:
-
-/* Line 1464 of yacc.c */
-#line 2461 "./sparql_p.y"
- { (yyval.box) = (caddr_t)((ptrlong)(XML_L)); }
+ case 493:
+#line 2041 "./sparql_p.y"
+ { (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 570:
-
-/* Line 1464 of yacc.c */
-#line 2465 "./sparql_p.y"
+ case 494:
+#line 2045 "./sparql_p.y"
{ (yyval.trees) = NULL; }
break;
- case 571:
-
-/* Line 1464 of yacc.c */
-#line 2466 "./sparql_p.y"
+ case 495:
+#line 2046 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
- case 572:
-
-/* Line 1464 of yacc.c */
-#line 2470 "./sparql_p.y"
+ case 496:
+#line 2050 "./sparql_p.y"
{ (yyval.trees) = NULL; }
break;
- case 573:
-
-/* Line 1464 of yacc.c */
-#line 2471 "./sparql_p.y"
+ case 497:
+#line 2051 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
- case 574:
-
-/* Line 1464 of yacc.c */
-#line 2475 "./sparql_p.y"
+ case 498:
+#line 2055 "./sparql_p.y"
{
(yyval.backstack) = NULL;
t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)[1]);
t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)[0]); }
break;
- case 575:
-
-/* Line 1464 of yacc.c */
-#line 2479 "./sparql_p.y"
+ case 499:
+#line 2059 "./sparql_p.y"
{
(yyval.backstack) = (yyvsp[(1) - (3)].backstack);
t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].trees)[1]);
t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].trees)[0]); }
break;
- case 576:
-
-/* Line 1464 of yacc.c */
-#line 2486 "./sparql_p.y"
+ case 500:
+#line 2066 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ((yyvsp[(1) - (1)].box)), NULL); }
break;
- case 577:
-
-/* Line 1464 of yacc.c */
-#line 2487 "./sparql_p.y"
+ case 501:
+#line 2067 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ((yyvsp[(1) - (2)].box)), (yyvsp[(2) - (2)].box)); }
break;
- case 578:
-
-/* Line 1464 of yacc.c */
-#line 2491 "./sparql_p.y"
- {}
- break;
-
- case 579:
-
-/* Line 1464 of yacc.c */
-#line 2492 "./sparql_p.y"
- {}
- break;
-
- case 580:
-
-/* Line 1464 of yacc.c */
-#line 2493 "./sparql_p.y"
- {}
- break;
-
- case 581:
-
-/* Line 1464 of yacc.c */
-#line 2497 "./sparql_p.y"
- {}
- break;
-
- case 582:
-
-/* Line 1464 of yacc.c */
-#line 2498 "./sparql_p.y"
- {
- spar_qm_clean_locals (sparp_arg);
- sparp_env()->spare_qm_default_table = NULL; }
- break;
-
- case 583:
-
-/* Line 1464 of yacc.c */
-#line 2501 "./sparql_p.y"
- {}
- break;
-
- case 585:
-
-/* Line 1464 of yacc.c */
-#line 2506 "./sparql_p.y"
- {
- t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
- break;
-
- case 586:
-
-/* Line 1464 of yacc.c */
-#line 2508 "./sparql_p.y"
- {
- t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
- break;
-
- case 587:
-
-/* Line 1464 of yacc.c */
-#line 2510 "./sparql_p.y"
- {
- t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
+ case 502:
+#line 2071 "./sparql_p.y"
+ {}
break;
- case 588:
+ case 503:
+#line 2072 "./sparql_p.y"
+ {}
+ break;
-/* Line 1464 of yacc.c */
-#line 2512 "./sparql_p.y"
- {
- t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
+ case 504:
+#line 2073 "./sparql_p.y"
+ {}
break;
- case 589:
+ case 505:
+#line 2077 "./sparql_p.y"
+ {}
+ break;
-/* Line 1464 of yacc.c */
-#line 2517 "./sparql_p.y"
+ case 506:
+#line 2078 "./sparql_p.y"
{
- (yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_ATTACH_MACRO_LIBRARY",
- (SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
- (SPART **)t_list (2, t_box_dv_uname_string ("ID"), (yyvsp[(4) - (4)].box)) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ spar_qm_clean_locals (sparp_arg);
+ sparp_env()->spare_qm_default_table = NULL; }
break;
- case 590:
+ case 507:
+#line 2081 "./sparql_p.y"
+ {}
+ break;
-/* Line 1464 of yacc.c */
-#line 2526 "./sparql_p.y"
+ case 509:
+#line 2086 "./sparql_p.y"
{
- (yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY",
- (SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
- (SPART **)t_list (4, t_box_dv_uname_string ("ID"), (yyvsp[(5) - (5)].box), t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ((yyvsp[(2) - (5)].token_type))) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
break;
- case 591:
-
-/* Line 1464 of yacc.c */
-#line 2532 "./sparql_p.y"
+ case 510:
+#line 2088 "./sparql_p.y"
{
- (yyval.tree) = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY",
- (SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
- (SPART **)t_list (2, t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ((yyvsp[(2) - (4)].token_type))) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ t_set_push (&(sparp_env()->spare_acc_qm_sqls), (yyvsp[(1) - (1)].tree)); }
break;
- case 592:
-
-/* Line 1464 of yacc.c */
-#line 2541 "./sparql_p.y"
+ case 511:
+#line 2093 "./sparql_p.y"
{}
break;
- case 593:
-
-/* Line 1464 of yacc.c */
-#line 2542 "./sparql_p.y"
+ case 512:
+#line 2094 "./sparql_p.y"
{}
break;
- case 594:
-
-/* Line 1464 of yacc.c */
-#line 2543 "./sparql_p.y"
+ case 513:
+#line 2095 "./sparql_p.y"
{}
break;
- case 596:
-
-/* Line 1464 of yacc.c */
-#line 2548 "./sparql_p.y"
+ case 515:
+#line 2100 "./sparql_p.y"
{
spar_qm_clean_locals (sparp_arg);
sparp_env()->spare_qm_default_table = NULL; }
break;
- case 598:
-
-/* Line 1464 of yacc.c */
-#line 2556 "./sparql_p.y"
+ case 517:
+#line 2108 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, CREATE_L, (SPART *)((yyvsp[(2) - (3)].box)), 1); }
break;
- case 599:
-
-/* Line 1464 of yacc.c */
-#line 2557 "./sparql_p.y"
+ case 518:
+#line 2109 "./sparql_p.y"
{;}
break;
- case 600:
-
-/* Line 1464 of yacc.c */
-#line 2559 "./sparql_p.y"
+ case 519:
+#line 2111 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, CREATE_L, (SPART *)((yyvsp[(2) - (6)].box)), 1);
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_ATTACH_MAPPING",
(SPART **)t_list (2, t_box_copy (sparp_env()->spare_storage_name), (yyvsp[(5) - (6)].box)),
- t_spartlist_concat ((yyvsp[(6) - (6)].trees), (SPART **)t_list (2, t_box_dv_uname_string ("ID"), (yyvsp[(2) - (6)].box))) ) ); }
+ (SPART **)t_list_concat ((caddr_t)(yyvsp[(6) - (6)].trees), (caddr_t)t_list (2, t_box_dv_uname_string ("ID"), (yyvsp[(2) - (6)].box))) ) ); }
break;
- case 601:
-
-/* Line 1464 of yacc.c */
-#line 2566 "./sparql_p.y"
+ case 520:
+#line 2118 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, GRAPH_L, (SPART *)((yyvsp[(3) - (7)].box)), 1);
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_ATTACH_MAPPING",
(SPART **)t_list (2, t_box_copy (sparp_env()->spare_storage_name), (yyvsp[(6) - (7)].box)),
- t_spartlist_concat ((yyvsp[(7) - (7)].trees), (SPART **)t_list (2, t_box_dv_uname_string ("GRAPH"), (yyvsp[(3) - (7)].box))) ) ); }
+ (SPART **)t_list_concat ((caddr_t)(yyvsp[(7) - (7)].trees), (caddr_t)t_list (2, t_box_dv_uname_string ("GRAPH"), (yyvsp[(3) - (7)].box))) ) ); }
break;
- case 602:
-
-/* Line 1464 of yacc.c */
-#line 2573 "./sparql_p.y"
+ case 521:
+#line 2125 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_qm_make_empty_mapping (sparp_arg, NULL, (yyvsp[(2) - (3)].trees)) );
@@ -7836,25 +6263,19 @@ yyreduce:
spar_qm_push_bookmark (sparp_arg); }
break;
- case 603:
-
-/* Line 1464 of yacc.c */
-#line 2580 "./sparql_p.y"
+ case 522:
+#line 2132 "./sparql_p.y"
{
spar_qm_pop_bookmark (sparp_arg); }
break;
- case 605:
-
-/* Line 1464 of yacc.c */
-#line 2586 "./sparql_p.y"
+ case 524:
+#line 2138 "./sparql_p.y"
{;}
break;
- case 606:
-
-/* Line 1464 of yacc.c */
-#line 2588 "./sparql_p.y"
+ case 525:
+#line 2140 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_qm_make_empty_mapping (sparp_arg,
@@ -7866,18 +6287,14 @@ yyreduce:
spar_qm_push_bookmark (sparp_arg); }
break;
- case 607:
-
-/* Line 1464 of yacc.c */
-#line 2597 "./sparql_p.y"
+ case 526:
+#line 2149 "./sparql_p.y"
{
spar_qm_pop_bookmark (sparp_arg); }
break;
- case 608:
-
-/* Line 1464 of yacc.c */
-#line 2602 "./sparql_p.y"
+ case 527:
+#line 2154 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, SUBJECT_L,
((NULL != (yyvsp[(1) - (3)].tree)) ? ((SPART *)((yyvsp[(1) - (3)].tree))) : spar_qm_get_local (sparp_arg, SUBJECT_L, 1)),
@@ -7891,607 +6308,484 @@ yyreduce:
(yyvsp[(3) - (3)].trees) ) ); }
break;
- case 609:
-
-/* Line 1464 of yacc.c */
-#line 2616 "./sparql_p.y"
+ case 528:
+#line 2168 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, SUBJECT_L, (yyvsp[(1) - (1)].tree), 0); }
break;
- case 610:
-
-/* Line 1464 of yacc.c */
-#line 2617 "./sparql_p.y"
+ case 529:
+#line 2169 "./sparql_p.y"
{}
break;
- case 613:
-
-/* Line 1464 of yacc.c */
-#line 2626 "./sparql_p.y"
+ case 532:
+#line 2178 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, GRAPH_L, (yyvsp[(2) - (2)].tree), 0); }
break;
- case 614:
-
-/* Line 1464 of yacc.c */
-#line 2627 "./sparql_p.y"
+ case 533:
+#line 2179 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, SUBJECT_L, (yyvsp[(2) - (2)].tree), 0); }
break;
- case 615:
-
-/* Line 1464 of yacc.c */
-#line 2628 "./sparql_p.y"
+ case 534:
+#line 2180 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, PREDICATE_L, (yyvsp[(2) - (2)].tree), 0); }
break;
- case 616:
-
-/* Line 1464 of yacc.c */
-#line 2629 "./sparql_p.y"
+ case 535:
+#line 2181 "./sparql_p.y"
{ spar_qm_push_local (sparp_arg, OBJECT_L, (yyvsp[(2) - (2)].tree), 0); }
break;
- case 617:
-
-/* Line 1464 of yacc.c */
-#line 2630 "./sparql_p.y"
+ case 536:
+#line 2182 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, DATATYPE_L, (SPART *)((yyvsp[(4) - (4)].tree)), 0); }
break;
- case 618:
-
-/* Line 1464 of yacc.c */
-#line 2632 "./sparql_p.y"
+ case 537:
+#line 2184 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, LANG_L, (SPART *)((yyvsp[(6) - (6)].tree)), 0); }
break;
- case 619:
-
-/* Line 1464 of yacc.c */
-#line 2638 "./sparql_p.y"
+ case 538:
+#line 2190 "./sparql_p.y"
{}
break;
- case 620:
-
-/* Line 1464 of yacc.c */
-#line 2639 "./sparql_p.y"
+ case 539:
+#line 2191 "./sparql_p.y"
{
spar_qm_pop_key (sparp_arg, PREDICATE_L); }
break;
- case 622:
-
-/* Line 1464 of yacc.c */
-#line 2645 "./sparql_p.y"
+ case 541:
+#line 2197 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, PREDICATE_L,
((NULL != (yyvsp[(1) - (1)].tree)) ? ((SPART *)((yyvsp[(1) - (1)].tree))) : spar_qm_get_local (sparp_arg, PREDICATE_L, 1)),
0 ); }
break;
- case 623:
-
-/* Line 1464 of yacc.c */
-#line 2649 "./sparql_p.y"
+ case 542:
+#line 2201 "./sparql_p.y"
{}
break;
- case 624:
-
-/* Line 1464 of yacc.c */
-#line 2650 "./sparql_p.y"
+ case 543:
+#line 2202 "./sparql_p.y"
{ sparyyerror ("Description of predicate field is expected here"); }
break;
- case 625:
-
-/* Line 1464 of yacc.c */
-#line 2654 "./sparql_p.y"
+ case 544:
+#line 2206 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_qm_make_real_mapping (sparp_arg, (yyvsp[(2) - (2)].box), (yyvsp[(1) - (2)].trees)) ); }
break;
- case 626:
-
-/* Line 1464 of yacc.c */
-#line 2657 "./sparql_p.y"
+ case 545:
+#line 2209 "./sparql_p.y"
{
spar_qm_pop_key (sparp_arg, OBJECT_L); }
break;
- case 627:
-
-/* Line 1464 of yacc.c */
-#line 2659 "./sparql_p.y"
+ case 546:
+#line 2211 "./sparql_p.y"
{
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_qm_make_real_mapping (sparp_arg, (yyvsp[(5) - (5)].box), (yyvsp[(4) - (5)].trees)) ); }
break;
- case 628:
-
-/* Line 1464 of yacc.c */
-#line 2665 "./sparql_p.y"
+ case 547:
+#line 2217 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, OBJECT_L,
((NULL != (yyvsp[(1) - (1)].tree)) ? ((SPART *)((yyvsp[(1) - (1)].tree))) : spar_qm_get_local (sparp_arg, OBJECT_L, 1)),
0 ); }
break;
- case 629:
-
-/* Line 1464 of yacc.c */
-#line 2669 "./sparql_p.y"
+ case 548:
+#line 2221 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, DATATYPE_L, (SPART *)((yyvsp[(3) - (3)].tree)), 0); }
break;
- case 630:
-
-/* Line 1464 of yacc.c */
-#line 2671 "./sparql_p.y"
+ case 549:
+#line 2223 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, LANG_L, (SPART *)((yyvsp[(5) - (5)].tree)), 0); }
break;
- case 631:
-
-/* Line 1464 of yacc.c */
-#line 2673 "./sparql_p.y"
+ case 550:
+#line 2225 "./sparql_p.y"
{
spar_qm_push_local (sparp_arg, WHERE_L, (SPART *)t_revlist_to_array ((yyvsp[(7) - (7)].backstack)), 0); }
break;
- case 632:
-
-/* Line 1464 of yacc.c */
-#line 2675 "./sparql_p.y"
+ case 551:
+#line 2227 "./sparql_p.y"
{ (yyval.trees) = (yyvsp[(9) - (9)].trees); }
break;
- case 633:
-
-/* Line 1464 of yacc.c */
-#line 2676 "./sparql_p.y"
+ case 552:
+#line 2228 "./sparql_p.y"
{ sparyyerror ("Description of object field is expected here"); }
break;
- case 634:
-
-/* Line 1464 of yacc.c */
-#line 2680 "./sparql_p.y"
+ case 553:
+#line 2232 "./sparql_p.y"
{ (yyval.box) = NULL; }
break;
- case 635:
-
-/* Line 1464 of yacc.c */
-#line 2681 "./sparql_p.y"
+ case 554:
+#line 2233 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 636:
-
-/* Line 1464 of yacc.c */
-#line 2685 "./sparql_p.y"
+ case 555:
+#line 2237 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 637:
-
-/* Line 1464 of yacc.c */
-#line 2686 "./sparql_p.y"
+ case 556:
+#line 2238 "./sparql_p.y"
{ (yyval.tree) = (SPART *)(yyvsp[(2) - (2)].tree)->_.lit.val; }
break;
- case 638:
-
-/* Line 1464 of yacc.c */
-#line 2687 "./sparql_p.y"
+ case 557:
+#line 2239 "./sparql_p.y"
{ sparyyerror ("Datatype of object field should be either constant IRI or table field, not template IRI (string)"); }
break;
- case 639:
-
-/* Line 1464 of yacc.c */
-#line 2688 "./sparql_p.y"
+ case 558:
+#line 2240 "./sparql_p.y"
{ (yyval.tree) = spar_make_qm_col_desc (sparp_arg, (yyvsp[(2) - (2)].tree)); }
break;
- case 640:
-
-/* Line 1464 of yacc.c */
-#line 2692 "./sparql_p.y"
+ case 559:
+#line 2244 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 641:
-
-/* Line 1464 of yacc.c */
-#line 2693 "./sparql_p.y"
+ case 560:
+#line 2245 "./sparql_p.y"
{ (yyval.tree) = (SPART *)(yyvsp[(2) - (2)].box); }
break;
- case 642:
-
-/* Line 1464 of yacc.c */
-#line 2694 "./sparql_p.y"
+ case 561:
+#line 2246 "./sparql_p.y"
{ (yyval.tree) = spar_make_qm_col_desc (sparp_arg, (yyvsp[(2) - (2)].tree)); }
break;
- case 644:
+ case 562:
+#line 2250 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2699 "./sparql_p.y"
+ case 563:
+#line 2251 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 645:
-
-/* Line 1464 of yacc.c */
-#line 2700 "./sparql_p.y"
+ case 564:
+#line 2252 "./sparql_p.y"
{ (yyval.tree) = (SPART *)uname_rdf_ns_uri_type; }
break;
- case 647:
+ case 565:
+#line 2256 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2705 "./sparql_p.y"
+ case 566:
+#line 2257 "./sparql_p.y"
{ (yyval.tree) = NULL; }
break;
- case 648:
-
-/* Line 1464 of yacc.c */
-#line 2709 "./sparql_p.y"
+ case 567:
+#line 2261 "./sparql_p.y"
{ (yyval.tree) = (SPART *)(yyvsp[(1) - (1)].box); }
break;
- case 651:
+ case 568:
+#line 2262 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
+
+ case 569:
+#line 2263 "./sparql_p.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2713 "./sparql_p.y"
+ case 570:
+#line 2265 "./sparql_p.y"
{
(yyval.tree) = spar_make_qm_value (sparp_arg, (yyvsp[(1) - (4)].box), (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack))); }
break;
- case 652:
-
-/* Line 1464 of yacc.c */
-#line 2715 "./sparql_p.y"
+ case 571:
+#line 2267 "./sparql_p.y"
{ /*... | QmSqlCol */
(yyval.tree) = spar_make_qm_value (sparp_arg, box_dv_uname_string ("literal"), (SPART **)t_list (1, (yyvsp[(1) - (1)].tree))); }
break;
- case 653:
-
-/* Line 1464 of yacc.c */
-#line 2720 "./sparql_p.y"
+ case 572:
+#line 2272 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 655:
+ case 573:
+#line 2273 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2725 "./sparql_p.y"
+ case 574:
+#line 2277 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].box)); }
break;
- case 656:
-
-/* Line 1464 of yacc.c */
-#line 2726 "./sparql_p.y"
+ case 575:
+#line 2278 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].box)); }
break;
- case 657:
-
-/* Line 1464 of yacc.c */
-#line 2730 "./sparql_p.y"
+ case 576:
+#line 2282 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(3) - (3)].box); }
break;
- case 658:
-
-/* Line 1464 of yacc.c */
-#line 2731 "./sparql_p.y"
+ case 577:
+#line 2283 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 659:
-
-/* Line 1464 of yacc.c */
-#line 2735 "./sparql_p.y"
+ case 578:
+#line 2287 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 660:
-
-/* Line 1464 of yacc.c */
-#line 2736 "./sparql_p.y"
+ case 579:
+#line 2288 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 661:
-
-/* Line 1464 of yacc.c */
-#line 2740 "./sparql_p.y"
+ case 580:
+#line 2292 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (0); }
break;
- case 662:
-
-/* Line 1464 of yacc.c */
-#line 2741 "./sparql_p.y"
+ case 581:
+#line 2293 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (0); }
break;
- case 663:
-
-/* Line 1464 of yacc.c */
-#line 2742 "./sparql_p.y"
+ case 582:
+#line 2294 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_revlist_to_array ((yyvsp[(3) - (4)].backstack)); }
break;
- case 664:
-
-/* Line 1464 of yacc.c */
-#line 2746 "./sparql_p.y"
+ case 583:
+#line 2298 "./sparql_p.y"
{
(yyval.backstack) = NULL;
t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)[0]);
t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)[1]); }
break;
- case 665:
-
-/* Line 1464 of yacc.c */
-#line 2750 "./sparql_p.y"
+ case 584:
+#line 2302 "./sparql_p.y"
{
(yyval.backstack) = (yyvsp[(1) - (3)].backstack);
t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].trees)[0]);
t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].trees)[1]); }
break;
- case 666:
-
-/* Line 1464 of yacc.c */
-#line 2757 "./sparql_p.y"
+ case 585:
+#line 2309 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("SOFT_EXCLUSIVE"), (ptrlong)1); }
break;
- case 667:
-
-/* Line 1464 of yacc.c */
-#line 2758 "./sparql_p.y"
+ case 586:
+#line 2310 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("EXCLUSIVE"), (ptrlong)1); }
break;
- case 668:
-
-/* Line 1464 of yacc.c */
-#line 2759 "./sparql_p.y"
+ case 587:
+#line 2311 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("ORDER"), (yyvsp[(2) - (2)].box)); }
break;
- case 669:
-
-/* Line 1464 of yacc.c */
-#line 2760 "./sparql_p.y"
+ case 588:
+#line 2312 "./sparql_p.y"
{ (yyval.trees) = (SPART **)t_list (2, t_box_dv_uname_string ("USING"), (yyvsp[(2) - (2)].box)); }
break;
- case 670:
-
-/* Line 1464 of yacc.c */
-#line 2764 "./sparql_p.y"
+ case 589:
+#line 2316 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 672:
+ case 590:
+#line 2317 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2769 "./sparql_p.y"
+ case 591:
+#line 2321 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 673:
-
-/* Line 1464 of yacc.c */
-#line 2770 "./sparql_p.y"
+ case 592:
+#line 2322 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 674:
-
-/* Line 1464 of yacc.c */
-#line 2774 "./sparql_p.y"
+ case 593:
+#line 2326 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 675:
-
-/* Line 1464 of yacc.c */
-#line 2775 "./sparql_p.y"
+ case 594:
+#line 2327 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 676:
-
-/* Line 1464 of yacc.c */
-#line 2779 "./sparql_p.y"
+ case 595:
+#line 2331 "./sparql_p.y"
{
(yyval.tree) = spar_make_vector_qm_sql (sparp_arg,
(SPART **)t_list (4, (yyvsp[(2) - (5)].box), (yyvsp[(3) - (5)].tree), (yyvsp[(5) - (5)].boxes)[0], (yyvsp[(5) - (5)].boxes)[1]) ); }
break;
- case 677:
-
-/* Line 1464 of yacc.c */
-#line 2785 "./sparql_p.y"
+ case 596:
+#line 2337 "./sparql_p.y"
{ (yyval.tree) = spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ((yyvsp[(2) - (3)].backstack))); }
break;
- case 678:
-
-/* Line 1464 of yacc.c */
-#line 2789 "./sparql_p.y"
+ case 597:
+#line 2341 "./sparql_p.y"
{ (yyval.backstack) = NULL; }
break;
- case 680:
+ case 598:
+#line 2342 "./sparql_p.y"
+ { (yyval.backstack) = (yyvsp[(1) - (1)].backstack); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2794 "./sparql_p.y"
+ case 599:
+#line 2346 "./sparql_p.y"
{ (yyval.backstack) = NULL; t_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
- case 681:
-
-/* Line 1464 of yacc.c */
-#line 2795 "./sparql_p.y"
+ case 600:
+#line 2347 "./sparql_p.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); t_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
- case 682:
-
-/* Line 1464 of yacc.c */
-#line 2799 "./sparql_p.y"
+ case 601:
+#line 2351 "./sparql_p.y"
{
(yyval.tree) = spar_make_vector_qm_sql (sparp_arg,
(SPART **)t_list (4, (yyvsp[(1) - (3)].box), (yyvsp[(2) - (3)].box), (yyvsp[(3) - (3)].boxes)[0], (yyvsp[(3) - (3)].boxes)[1]) ); }
break;
- case 683:
-
-/* Line 1464 of yacc.c */
-#line 2805 "./sparql_p.y"
+ case 602:
+#line 2357 "./sparql_p.y"
{ (yyval.boxes) = t_list (2, (yyvsp[(1) - (1)].box), (ptrlong)0); }
break;
- case 684:
-
-/* Line 1464 of yacc.c */
-#line 2806 "./sparql_p.y"
+ case 603:
+#line 2358 "./sparql_p.y"
{ (yyval.boxes) = t_list (2, (yyvsp[(1) - (3)].box), (ptrlong)1); }
break;
- case 685:
-
-/* Line 1464 of yacc.c */
-#line 2810 "./sparql_p.y"
+ case 604:
+#line 2362 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ("in"); }
break;
- case 686:
-
-/* Line 1464 of yacc.c */
-#line 2811 "./sparql_p.y"
+ case 605:
+#line 2363 "./sparql_p.y"
{ (yyval.box) = t_box_dv_uname_string ((yyvsp[(1) - (1)].box)); }
break;
- case 687:
-
-/* Line 1464 of yacc.c */
-#line 2815 "./sparql_p.y"
+ case 606:
+#line 2367 "./sparql_p.y"
{ (yyval.tree) = sparp_make_qm_sqlcol (sparp_arg, SPARQL_PLAIN_ID, (yyvsp[(1) - (1)].box)); }
break;
- case 688:
-
-/* Line 1464 of yacc.c */
-#line 2816 "./sparql_p.y"
+ case 607:
+#line 2368 "./sparql_p.y"
{ (yyval.tree) = sparp_make_qm_sqlcol (sparp_arg, SPARQL_SQL_ALIASCOLNAME, (yyvsp[(1) - (1)].box)); }
break;
- case 689:
-
-/* Line 1464 of yacc.c */
-#line 2817 "./sparql_p.y"
+ case 608:
+#line 2369 "./sparql_p.y"
{ (yyval.tree) = sparp_make_qm_sqlcol (sparp_arg, SPARQL_SQL_QTABLECOLNAME, (yyvsp[(1) - (1)].box)); }
break;
- case 691:
-
-/* Line 1464 of yacc.c */
-#line 2822 "./sparql_p.y"
- { (yyval.box) = t_box_dv_short_string ("TEXT"); }
+ case 609:
+#line 2373 "./sparql_p.y"
+ { (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 692:
-
-/* Line 1464 of yacc.c */
-#line 2823 "./sparql_p.y"
- { (yyval.box) = t_box_dv_short_string ("XML"); }
+ case 610:
+#line 2374 "./sparql_p.y"
+ { (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 693:
+ case 611:
+#line 2375 "./sparql_p.y"
+ { (yyval.box) = (yyvsp[(1) - (1)].box); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2828 "./sparql_p.y"
+ case 612:
+#line 2380 "./sparql_p.y"
{ (yyval.box) = (yyvsp[(1) - (1)].tree)->_.lit.val; }
break;
- case 694:
-
-/* Line 1464 of yacc.c */
-#line 2829 "./sparql_p.y"
+ case 613:
+#line 2381 "./sparql_p.y"
{
(yyval.box) = spar_make_iri_from_template (sparp_arg, (yyvsp[(3) - (4)].box)); }
break;
- case 695:
-
-/* Line 1464 of yacc.c */
-#line 2834 "./sparql_p.y"
+ case 614:
+#line 2386 "./sparql_p.y"
{}
break;
- case 696:
-
-/* Line 1464 of yacc.c */
-#line 2835 "./sparql_p.y"
+ case 615:
+#line 2387 "./sparql_p.y"
{}
break;
- case 697:
-
-/* Line 1464 of yacc.c */
-#line 2839 "./sparql_p.y"
+ case 616:
+#line 2391 "./sparql_p.y"
{}
break;
- case 698:
-
-/* Line 1464 of yacc.c */
-#line 2840 "./sparql_p.y"
+ case 617:
+#line 2392 "./sparql_p.y"
{}
break;
- case 699:
-
-/* Line 1464 of yacc.c */
-#line 2844 "./sparql_p.y"
+ case 618:
+#line 2396 "./sparql_p.y"
{}
break;
- case 700:
-
-/* Line 1464 of yacc.c */
-#line 2845 "./sparql_p.y"
+ case 619:
+#line 2397 "./sparql_p.y"
{}
break;
-
-/* Line 1464 of yacc.c */
-#line 8495 "sparql_p.c"
+/* Line 1267 of yacc.c. */
+#line 6789 "sparql_p.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -8502,6 +6796,7 @@ yyreduce:
*++yyvsp = yyval;
+
/* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -8566,7 +6861,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -8583,7 +6878,7 @@ yyerrlab:
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -8640,6 +6935,9 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -8664,7 +6962,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -8675,7 +6973,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
diff --git a/libsrc/Wi/sparql_p.h b/libsrc/Wi/sparql_p.h
index 692b19a..4c909ec 100644
--- a/libsrc/Wi/sparql_p.h
+++ b/libsrc/Wi/sparql_p.h
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,11 +29,10 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -66,92 +67,92 @@
_STAR = 283,
_STAR_GT = 284,
a_L = 285,
- ADD_L = 286,
- ALL_L = 287,
- ALTER_L = 288,
- AS_L = 289,
- ASC_L = 290,
- ASK_L = 291,
- ATTACH_L = 292,
- AVG_L = 293,
- BASE_L = 294,
- BIJECTION_L = 295,
- BINDINGS_L = 296,
- BOUND_L = 297,
- BY_L = 298,
- CLASS_L = 299,
- CLEAR_L = 300,
- CREATE_L = 301,
- CONSTRUCT_L = 302,
- COPY_L = 303,
- COUNT_L = 304,
- COUNT_LPAR = 305,
- COUNT_DISTINCT_L = 306,
- DATA_L = 307,
- DATATYPE_L = 308,
- DEFAULT_L = 309,
- DEFINE_L = 310,
- DEFMACRO_L = 311,
- DELETE_L = 312,
- DEREF_L = 313,
- DESC_L = 314,
- DESCRIBE_L = 315,
- DETACH_L = 316,
- DISTINCT_L = 317,
- DROP_L = 318,
- EXCLUSIVE_L = 319,
- EXISTS_L = 320,
- false_L = 321,
- FILTER_L = 322,
- FROM_L = 323,
- FUNCTION_L = 324,
- GRAPH_L = 325,
- GROUP_L = 326,
- HAVING_L = 327,
- IDENTIFIED_L = 328,
- IFP_L = 329,
- IN_L = 330,
- INDEX_L = 331,
- INFERENCE_L = 332,
- INSERT_L = 333,
- INTO_L = 334,
- IRI_L = 335,
+ ALTER_L = 286,
+ AS_L = 287,
+ ASC_L = 288,
+ ASK_L = 289,
+ AVG_L = 290,
+ BASE_L = 291,
+ BIJECTION_L = 292,
+ BINDINGS_L = 293,
+ BOUND_L = 294,
+ BY_L = 295,
+ CLASS_L = 296,
+ CLEAR_L = 297,
+ CREATE_L = 298,
+ COALESCE_L = 299,
+ CONSTRUCT_L = 300,
+ COUNT_LPAR = 301,
+ COUNT_DISTINCT_L = 302,
+ DATA_L = 303,
+ DATATYPE_L = 304,
+ DEFAULT_L = 305,
+ DEFINE_L = 306,
+ DELETE_L = 307,
+ DEREF_L = 308,
+ DESC_L = 309,
+ DESCRIBE_L = 310,
+ DISTINCT_L = 311,
+ DROP_L = 312,
+ EXCLUSIVE_L = 313,
+ EXISTS_L = 314,
+ false_L = 315,
+ FILTER_L = 316,
+ FROM_L = 317,
+ FUNCTION_L = 318,
+ GRAPH_L = 319,
+ GROUP_L = 320,
+ HAVING_L = 321,
+ IDENTIFIED_L = 322,
+ IF_L = 323,
+ IFP_L = 324,
+ IN_L = 325,
+ INDEX_L = 326,
+ INFERENCE_L = 327,
+ INSERT_L = 328,
+ INTO_L = 329,
+ IRI_L = 330,
+ isBLANK_L = 331,
+ isIRI_L = 332,
+ isLITERAL_L = 333,
+ isREF_L = 334,
+ isURI_L = 335,
LANG_L = 336,
- LIBRARY_L = 337,
+ LANGMATCHES_L = 337,
LIKE_L = 338,
LIMIT_L = 339,
LITERAL_L = 340,
- LOCAL_L = 341,
- LOAD_L = 342,
- MACRO_L = 343,
- MAKE_L = 344,
- MAP_L = 345,
- MAX_L = 346,
- MIN_L = 347,
- MINUS_L = 348,
- MODIFY_L = 349,
- MOVE_L = 350,
- NAMED_L = 351,
- NIL_L = 352,
- NOT_L = 353,
- NULL_L = 354,
- OBJECT_L = 355,
- OF_L = 356,
- OFFBAND_L = 357,
- OFFSET_L = 358,
- OPTIONAL_L = 359,
- OPTION_L = 360,
- ORDER_L = 361,
- PREDICATE_L = 362,
- PREFIX_L = 363,
- QUAD_L = 364,
- REDUCED_L = 365,
- RETURNS_L = 366,
- SAME_AS_L = 367,
- SAME_AS_O_L = 368,
- SAME_AS_P_L = 369,
- SAME_AS_S_L = 370,
- SAME_AS_S_O_L = 371,
+ LOAD_L = 341,
+ MAKE_L = 342,
+ MAP_L = 343,
+ MAX_L = 344,
+ MIN_L = 345,
+ MINUS_L = 346,
+ MODIFY_L = 347,
+ NAMED_L = 348,
+ NIL_L = 349,
+ NOT_L = 350,
+ NOT_FROM_L = 351,
+ NULL_L = 352,
+ OBJECT_L = 353,
+ OF_L = 354,
+ OFFBAND_L = 355,
+ OFFSET_L = 356,
+ OPTIONAL_L = 357,
+ OPTION_L = 358,
+ ORDER_L = 359,
+ PREDICATE_L = 360,
+ PREFIX_L = 361,
+ QUAD_L = 362,
+ REGEX_L = 363,
+ REDUCED_L = 364,
+ RETURNS_L = 365,
+ SAME_AS_L = 366,
+ SAME_AS_O_L = 367,
+ SAME_AS_P_L = 368,
+ SAME_AS_S_L = 369,
+ SAME_AS_S_O_L = 370,
+ SAMETERM_L = 371,
SCORE_L = 372,
SCORE_LIMIT_L = 373,
SELECT_L = 374,
@@ -160,11 +161,11 @@
SOFT_L = 377,
SQLQUERY_L = 378,
STORAGE_L = 379,
- SUBCLASS_L = 380,
- SUBJECT_L = 381,
- SUM_L = 382,
- TABLE_OPTION_L = 383,
- TEXT_L = 384,
+ STR_L = 380,
+ SUBCLASS_L = 381,
+ SUBJECT_L = 382,
+ SUM_L = 383,
+ TABLE_OPTION_L = 384,
T_CYCLES_ONLY_L = 385,
T_DIRECTION_L = 386,
T_DISTINCT_L = 387,
@@ -179,45 +180,46 @@
T_NO_ORDER_L = 396,
T_SHORTEST_ONLY_L = 397,
T_STEP_L = 398,
- TO_L = 399,
- TRANSITIVE_L = 400,
- true_L = 401,
- UNBOUND_L = 402,
- UNION_L = 403,
- USING_L = 404,
- WHERE_L = 405,
- WITH_L = 406,
- XML_L = 407,
- __SPAR_PUNCT_END = 408,
- START_OF_SPARQL_TEXT = 409,
- END_OF_SPARQL_TEXT = 410,
- SPARUL_RUN_SUBTYPE = 411,
- SPARUL_INSERT_DATA = 412,
- SPARUL_DELETE_DATA = 413,
- __SPAR_NONPUNCT_START = 414,
- SPARQL_BIF = 415,
- SPARQL_INTEGER = 416,
- SPARQL_DECIMAL = 417,
- SPARQL_DOUBLE = 418,
- SPARQL_STRING = 419,
- SPARQL_SQLTEXT = 420,
- LANGTAG = 421,
- QNAME = 422,
- QNAME_NS = 423,
- BLANK_NODE_LABEL = 424,
- Q_IRI_REF = 425,
- QD_VARNAME = 426,
- QD_COLON_PARAMNAME = 427,
- QD_COLON_PARAMNUM = 428,
- SPARQL_PLAIN_ID = 429,
- SPARQL_SQL_ALIASCOLNAME = 430,
- SPARQL_SQL_QTABLENAME = 431,
- SPARQL_SQL_QTABLECOLNAME = 432,
- __SPAR_NONPUNCT_END = 433,
- PRECODE_EXPN_PREC = 434,
- _COLON = 435,
- UMINUS = 436,
- UPLUS = 437
+ TRANSITIVE_L = 399,
+ true_L = 400,
+ UNBOUND_L = 401,
+ UNION_L = 402,
+ USING_L = 403,
+ WHERE_L = 404,
+ WITH_L = 405,
+ __SPAR_PUNCT_END = 406,
+ START_OF_SPARQL_TEXT = 407,
+ END_OF_SPARQL_TEXT = 408,
+ SPARUL_RUN_SUBTYPE = 409,
+ SPARUL_INSERT_DATA = 410,
+ SPARUL_DELETE_DATA = 411,
+ __SPAR_NONPUNCT_START = 412,
+ TEXT_BL = 413,
+ XML_BL = 414,
+ SPARQL_INTEGER = 415,
+ SPARQL_DECIMAL = 416,
+ SPARQL_DOUBLE = 417,
+ SPARQL_STRING = 418,
+ SPARQL_SQLTEXT = 419,
+ LANGTAG = 420,
+ QNAME = 421,
+ QNAME_NS = 422,
+ BLANK_NODE_LABEL = 423,
+ Q_IRI_REF = 424,
+ QUEST_VARNAME = 425,
+ DOLLAR_VARNAME = 426,
+ QUEST_COLON_PARAMNAME = 427,
+ DOLLAR_COLON_PARAMNAME = 428,
+ QUEST_COLON_PARAMNUM = 429,
+ DOLLAR_COLON_PARAMNUM = 430,
+ SPARQL_PLAIN_ID = 431,
+ SPARQL_SQL_ALIASCOLNAME = 432,
+ SPARQL_SQL_QTABLENAME = 433,
+ SPARQL_SQL_QTABLECOLNAME = 434,
+ __SPAR_NONPUNCT_END = 435,
+ _COLON = 436,
+ UMINUS = 437,
+ UPLUS = 438
};
#endif
/* Tokens. */
@@ -249,92 +251,92 @@
#define _STAR 283
#define _STAR_GT 284
#define a_L 285
-#define ADD_L 286
-#define ALL_L 287
-#define ALTER_L 288
-#define AS_L 289
-#define ASC_L 290
-#define ASK_L 291
-#define ATTACH_L 292
-#define AVG_L 293
-#define BASE_L 294
-#define BIJECTION_L 295
-#define BINDINGS_L 296
-#define BOUND_L 297
-#define BY_L 298
-#define CLASS_L 299
-#define CLEAR_L 300
-#define CREATE_L 301
-#define CONSTRUCT_L 302
-#define COPY_L 303
-#define COUNT_L 304
-#define COUNT_LPAR 305
-#define COUNT_DISTINCT_L 306
-#define DATA_L 307
-#define DATATYPE_L 308
-#define DEFAULT_L 309
-#define DEFINE_L 310
-#define DEFMACRO_L 311
-#define DELETE_L 312
-#define DEREF_L 313
-#define DESC_L 314
-#define DESCRIBE_L 315
-#define DETACH_L 316
-#define DISTINCT_L 317
-#define DROP_L 318
-#define EXCLUSIVE_L 319
-#define EXISTS_L 320
-#define false_L 321
-#define FILTER_L 322
-#define FROM_L 323
-#define FUNCTION_L 324
-#define GRAPH_L 325
-#define GROUP_L 326
-#define HAVING_L 327
-#define IDENTIFIED_L 328
-#define IFP_L 329
-#define IN_L 330
-#define INDEX_L 331
-#define INFERENCE_L 332
-#define INSERT_L 333
-#define INTO_L 334
-#define IRI_L 335
+#define ALTER_L 286
+#define AS_L 287
+#define ASC_L 288
+#define ASK_L 289
+#define AVG_L 290
+#define BASE_L 291
+#define BIJECTION_L 292
+#define BINDINGS_L 293
+#define BOUND_L 294
+#define BY_L 295
+#define CLASS_L 296
+#define CLEAR_L 297
+#define CREATE_L 298
+#define COALESCE_L 299
+#define CONSTRUCT_L 300
+#define COUNT_LPAR 301
+#define COUNT_DISTINCT_L 302
+#define DATA_L 303
+#define DATATYPE_L 304
+#define DEFAULT_L 305
+#define DEFINE_L 306
+#define DELETE_L 307
+#define DEREF_L 308
+#define DESC_L 309
+#define DESCRIBE_L 310
+#define DISTINCT_L 311
+#define DROP_L 312
+#define EXCLUSIVE_L 313
+#define EXISTS_L 314
+#define false_L 315
+#define FILTER_L 316
+#define FROM_L 317
+#define FUNCTION_L 318
+#define GRAPH_L 319
+#define GROUP_L 320
+#define HAVING_L 321
+#define IDENTIFIED_L 322
+#define IF_L 323
+#define IFP_L 324
+#define IN_L 325
+#define INDEX_L 326
+#define INFERENCE_L 327
+#define INSERT_L 328
+#define INTO_L 329
+#define IRI_L 330
+#define isBLANK_L 331
+#define isIRI_L 332
+#define isLITERAL_L 333
+#define isREF_L 334
+#define isURI_L 335
#define LANG_L 336
-#define LIBRARY_L 337
+#define LANGMATCHES_L 337
#define LIKE_L 338
#define LIMIT_L 339
#define LITERAL_L 340
-#define LOCAL_L 341
-#define LOAD_L 342
-#define MACRO_L 343
-#define MAKE_L 344
-#define MAP_L 345
-#define MAX_L 346
-#define MIN_L 347
-#define MINUS_L 348
-#define MODIFY_L 349
-#define MOVE_L 350
-#define NAMED_L 351
-#define NIL_L 352
-#define NOT_L 353
-#define NULL_L 354
-#define OBJECT_L 355
-#define OF_L 356
-#define OFFBAND_L 357
-#define OFFSET_L 358
-#define OPTIONAL_L 359
-#define OPTION_L 360
-#define ORDER_L 361
-#define PREDICATE_L 362
-#define PREFIX_L 363
-#define QUAD_L 364
-#define REDUCED_L 365
-#define RETURNS_L 366
-#define SAME_AS_L 367
-#define SAME_AS_O_L 368
-#define SAME_AS_P_L 369
-#define SAME_AS_S_L 370
-#define SAME_AS_S_O_L 371
+#define LOAD_L 341
+#define MAKE_L 342
+#define MAP_L 343
+#define MAX_L 344
+#define MIN_L 345
+#define MINUS_L 346
+#define MODIFY_L 347
+#define NAMED_L 348
+#define NIL_L 349
+#define NOT_L 350
+#define NOT_FROM_L 351
+#define NULL_L 352
+#define OBJECT_L 353
+#define OF_L 354
+#define OFFBAND_L 355
+#define OFFSET_L 356
+#define OPTIONAL_L 357
+#define OPTION_L 358
+#define ORDER_L 359
+#define PREDICATE_L 360
+#define PREFIX_L 361
+#define QUAD_L 362
+#define REGEX_L 363
+#define REDUCED_L 364
+#define RETURNS_L 365
+#define SAME_AS_L 366
+#define SAME_AS_O_L 367
+#define SAME_AS_P_L 368
+#define SAME_AS_S_L 369
+#define SAME_AS_S_O_L 370
+#define SAMETERM_L 371
#define SCORE_L 372
#define SCORE_LIMIT_L 373
#define SELECT_L 374
@@ -343,11 +345,11 @@
#define SOFT_L 377
#define SQLQUERY_L 378
#define STORAGE_L 379
-#define SUBCLASS_L 380
-#define SUBJECT_L 381
-#define SUM_L 382
-#define TABLE_OPTION_L 383
-#define TEXT_L 384
+#define STR_L 380
+#define SUBCLASS_L 381
+#define SUBJECT_L 382
+#define SUM_L 383
+#define TABLE_OPTION_L 384
#define T_CYCLES_ONLY_L 385
#define T_DIRECTION_L 386
#define T_DISTINCT_L 387
@@ -362,56 +364,54 @@
#define T_NO_ORDER_L 396
#define T_SHORTEST_ONLY_L 397
#define T_STEP_L 398
-#define TO_L 399
-#define TRANSITIVE_L 400
-#define true_L 401
-#define UNBOUND_L 402
-#define UNION_L 403
-#define USING_L 404
-#define WHERE_L 405
-#define WITH_L 406
-#define XML_L 407
-#define __SPAR_PUNCT_END 408
-#define START_OF_SPARQL_TEXT 409
-#define END_OF_SPARQL_TEXT 410
-#define SPARUL_RUN_SUBTYPE 411
-#define SPARUL_INSERT_DATA 412
-#define SPARUL_DELETE_DATA 413
-#define __SPAR_NONPUNCT_START 414
-#define SPARQL_BIF 415
-#define SPARQL_INTEGER 416
-#define SPARQL_DECIMAL 417
-#define SPARQL_DOUBLE 418
-#define SPARQL_STRING 419
-#define SPARQL_SQLTEXT 420
-#define LANGTAG 421
-#define QNAME 422
-#define QNAME_NS 423
-#define BLANK_NODE_LABEL 424
-#define Q_IRI_REF 425
-#define QD_VARNAME 426
-#define QD_COLON_PARAMNAME 427
-#define QD_COLON_PARAMNUM 428
-#define SPARQL_PLAIN_ID 429
-#define SPARQL_SQL_ALIASCOLNAME 430
-#define SPARQL_SQL_QTABLENAME 431
-#define SPARQL_SQL_QTABLECOLNAME 432
-#define __SPAR_NONPUNCT_END 433
-#define PRECODE_EXPN_PREC 434
-#define _COLON 435
-#define UMINUS 436
-#define UPLUS 437
+#define TRANSITIVE_L 399
+#define true_L 400
+#define UNBOUND_L 401
+#define UNION_L 402
+#define USING_L 403
+#define WHERE_L 404
+#define WITH_L 405
+#define __SPAR_PUNCT_END 406
+#define START_OF_SPARQL_TEXT 407
+#define END_OF_SPARQL_TEXT 408
+#define SPARUL_RUN_SUBTYPE 409
+#define SPARUL_INSERT_DATA 410
+#define SPARUL_DELETE_DATA 411
+#define __SPAR_NONPUNCT_START 412
+#define TEXT_BL 413
+#define XML_BL 414
+#define SPARQL_INTEGER 415
+#define SPARQL_DECIMAL 416
+#define SPARQL_DOUBLE 417
+#define SPARQL_STRING 418
+#define SPARQL_SQLTEXT 419
+#define LANGTAG 420
+#define QNAME 421
+#define QNAME_NS 422
+#define BLANK_NODE_LABEL 423
+#define Q_IRI_REF 424
+#define QUEST_VARNAME 425
+#define DOLLAR_VARNAME 426
+#define QUEST_COLON_PARAMNAME 427
+#define DOLLAR_COLON_PARAMNAME 428
+#define QUEST_COLON_PARAMNUM 429
+#define DOLLAR_COLON_PARAMNUM 430
+#define SPARQL_PLAIN_ID 431
+#define SPARQL_SQL_ALIASCOLNAME 432
+#define SPARQL_SQL_QTABLENAME 433
+#define SPARQL_SQL_QTABLECOLNAME 434
+#define __SPAR_NONPUNCT_END 435
+#define _COLON 436
+#define UMINUS 437
+#define UPLUS 438
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
+#line 97 "./sparql_p.y"
{
-
-/* Line 1685 of yacc.c */
-#line 98 "./sparql_p.y"
-
caddr_t box;
caddr_t *boxes;
ptrlong token_type;
@@ -421,17 +421,14 @@ typedef union YYSTYPE
dk_set_t backstack;
spar_lexbmk_t *bookmark;
void *nothing;
-
-
-
-/* Line 1685 of yacc.c */
-#line 429 "sparql_p.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1489 of yacc.c. */
+#line 427 "sparql_p.h"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
-
diff --git a/libsrc/Wi/sparql_p.y b/libsrc/Wi/sparql_p.y
index d97e1c9..ae3a34c 100644
--- a/libsrc/Wi/sparql_p.y
+++ b/libsrc/Wi/sparql_p.y
@@ -1,10 +1,10 @@
/*
- * $Id: sparql_p.y,v 1.66.2.38 2012/03/08 12:55:36 source Exp $
+ * $Id: sparql_p.y,v 1.66.2.29 2011/07/19 23:27:51 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -37,7 +37,6 @@ One tab before end of single-line BNF comment.
Whitespaces in all other places, including two whitespaces after "::=" in BNF comments */
%pure_parser
-%expect 9
%{
@@ -137,13 +136,10 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token _STAR_GT /*:: PUNCT_SPAR_LAST("*>") ::*/
%token a_L /*:: PUNCT_SPAR_LAST("a") ::*/
-%token ADD_L /*:: PUNCT_SPAR_LAST("ADD") ::*/
-%token ALL_L /*:: PUNCT_SPAR_LAST("ALL") ::*/
%token ALTER_L /*:: PUNCT_SPAR_LAST("ALTER") ::*/
%token AS_L /*:: PUNCT_SPAR_LAST("AS") ::*/
%token ASC_L /*:: PUNCT_SPAR_LAST("ASC") ::*/
%token ASK_L /*:: PUNCT_SPAR_LAST("ASK") ::*/
-%token ATTACH_L /*:: PUNCT_SPAR_LAST("ATTACH") ::*/
%token AVG_L /*:: PUNCT_SPAR_LAST("AVG") ::*/
%token BASE_L /*:: PUNCT_SPAR_LAST("BASE") ::*/
%token BIJECTION_L /*:: PUNCT_SPAR_LAST("BIJECTION") ::*/
@@ -153,21 +149,18 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token CLASS_L /*:: PUNCT_SPAR_LAST("CLASS") ::*/
%token CLEAR_L /*:: PUNCT_SPAR_LAST("CLEAR") ::*/
%token CREATE_L /*:: PUNCT_SPAR_LAST("CREATE") ::*/
+%token COALESCE_L /*:: PUNCT_SPAR_LAST("COALESCE") ::*/
%token CONSTRUCT_L /*:: PUNCT_SPAR_LAST("CONSTRUCT") ::*/
-%token COPY_L /*:: PUNCT_SPAR_LAST("COPY") ::*/
-%token COUNT_L /* Fake, used only in sparqlwords.gperf */
%token COUNT_LPAR /*:: PUNCT("COUNT ("), SPAR, LAST1("COUNT ()"), LAST1("COUNT\r\n()"), LAST1("COUNT #qq\r\n()"), ERR("COUNT"), ERR("COUNT bad") ::*/
%token COUNT_DISTINCT_L /*:: PUNCT("COUNT DISTINCT"), SPAR, LAST("COUNT DISTINCT"), LAST("COUNT\r\nDISTINCT"), LAST("COUNT #qq\r\nDISTINCT"), ERR("COUNT"), ERR("COUNT bad") ::*/
%token DATA_L /*:: PUNCT_SPAR_LAST("DATA") ::*/
%token DATATYPE_L /*:: PUNCT_SPAR_LAST("DATATYPE") ::*/
%token DEFAULT_L /*:: PUNCT_SPAR_LAST("DEFAULT") ::*/
%token DEFINE_L /*:: PUNCT_SPAR_LAST("DEFINE") ::*/
-%token DEFMACRO_L /*:: PUNCT_SPAR_LAST("DEFMACRO") ::*/
%token DELETE_L /*:: PUNCT_SPAR_LAST("DELETE") ::*/
%token DEREF_L /*:: PUNCT_SPAR_LAST("DEREF") ::*/
%token DESC_L /*:: PUNCT_SPAR_LAST("DESC") ::*/
%token DESCRIBE_L /*:: PUNCT_SPAR_LAST("DESCRIBE") ::*/
-%token DETACH_L /*:: PUNCT_SPAR_LAST("DETACH") ::*/
%token DISTINCT_L /*:: PUNCT_SPAR_LAST("DISTINCT") ::*/
%token DROP_L /*:: PUNCT_SPAR_LAST("DROP") ::*/
%token EXCLUSIVE_L /*:: PUNCT_SPAR_LAST("EXCLUSIVE") ::*/
@@ -180,6 +173,7 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token GROUP_L /*:: PUNCT_SPAR_LAST("GROUP") ::*/
%token HAVING_L /*:: PUNCT_SPAR_LAST("HAVING") ::*/
%token IDENTIFIED_L /*:: PUNCT("IDENTIFIED"), SPAR, LAST1("IDENTIFIED BY"), LAST1("IDENTIFIED\r\nBY"), LAST1("IDENTIFIED #qq\r\nBY"), ERR("IDENTIFIED"), ERR("IDENTIFIED bad") ::*/
+%token IF_L /*:: PUNCT_SPAR_LAST("IF") ::*/
%token IFP_L /*:: PUNCT_SPAR_LAST("IFP") ::*/
%token IN_L /*:: PUNCT_SPAR_LAST("IN") ::*/
%token INDEX_L /*:: PUNCT_SPAR_LAST("INDEX") ::*/
@@ -187,24 +181,27 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token INSERT_L /*:: PUNCT_SPAR_LAST("INSERT") ::*/
%token INTO_L /*:: PUNCT_SPAR_LAST("INTO") ::*/
%token IRI_L /*:: PUNCT_SPAR_LAST("IRI") ::*/
+%token isBLANK_L /*:: PUNCT_SPAR_LAST("isBLANK") ::*/
+%token isIRI_L /*:: PUNCT_SPAR_LAST("isIRI") ::*/
+%token isLITERAL_L /*:: PUNCT_SPAR_LAST("isLITERAL") ::*/
+%token isREF_L /*:: PUNCT_SPAR_LAST("isREF") ::*/
+%token isURI_L /*:: PUNCT_SPAR_LAST("isURI") ::*/
%token LANG_L /*:: PUNCT_SPAR_LAST("LANG") ::*/
-%token LIBRARY_L /*:: PUNCT_SPAR_LAST("LIBRARY") ::*/
+%token LANGMATCHES_L /*:: PUNCT_SPAR_LAST("LANGMATCHES") ::*/
%token LIKE_L /*:: PUNCT_SPAR_LAST("LIKE") ::*/
%token LIMIT_L /*:: PUNCT_SPAR_LAST("LIMIT") ::*/
%token LITERAL_L /*:: PUNCT_SPAR_LAST("LITERAL") ::*/
-%token LOCAL_L /*:: PUNCT_SPAR_LAST("LOCAL") ::*/
%token LOAD_L /*:: PUNCT_SPAR_LAST("LOAD") ::*/
-%token MACRO_L /*:: PUNCT_SPAR_LAST("MACRO") ::*/
%token MAKE_L /*:: PUNCT_SPAR_LAST("MAKE") ::*/
%token MAP_L /*:: PUNCT_SPAR_LAST("MAP") ::*/
%token MAX_L /*:: PUNCT_SPAR_LAST("MAX") ::*/
%token MIN_L /*:: PUNCT_SPAR_LAST("MIN") ::*/
%token MINUS_L /*:: PUNCT_SPAR_LAST("MINUS") ::*/
%token MODIFY_L /*:: PUNCT_SPAR_LAST("MODIFY") ::*/
-%token MOVE_L /*:: PUNCT_SPAR_LAST("MOVE") ::*/
%token NAMED_L /*:: PUNCT_SPAR_LAST("NAMED") ::*/
%token NIL_L /*:: PUNCT_SPAR_LAST("NIL") ::*/
%token NOT_L /*:: PUNCT_SPAR_LAST("NOT") ::*/
+%token NOT_FROM_L /*:: PUNCT_SPAR_LAST("NOT FROM") ::*/
%token NULL_L /*:: PUNCT_SPAR_LAST("NULL") ::*/
%token OBJECT_L /*:: PUNCT_SPAR_LAST("OBJECT") ::*/
%token OF_L /*:: PUNCT_SPAR_LAST("OF") ::*/
@@ -216,6 +213,7 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token PREDICATE_L /*:: PUNCT_SPAR_LAST("PREDICATE") ::*/
%token PREFIX_L /*:: PUNCT_SPAR_LAST("PREFIX") ::*/
%token QUAD_L /*:: PUNCT_SPAR_LAST("QUAD") ::*/
+%token REGEX_L /*:: PUNCT_SPAR_LAST("REGEX") ::*/
%token REDUCED_L /*:: PUNCT_SPAR_LAST("REDUCED") ::*/
%token RETURNS_L /*:: PUNCT_SPAR_LAST("RETURNS") ::*/
%token SAME_AS_L /*:: PUNCT_SPAR_LAST("SAME_AS") ::*/
@@ -223,6 +221,7 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token SAME_AS_P_L /*:: PUNCT_SPAR_LAST("SAME_AS_P") ::*/
%token SAME_AS_S_L /*:: PUNCT_SPAR_LAST("SAME_AS_S") ::*/
%token SAME_AS_S_O_L /*:: PUNCT_SPAR_LAST("SAME_AS_S_O") ::*/
+%token SAMETERM_L /*:: PUNCT_SPAR_LAST("SAMETERM") ::*/
%token SCORE_L /*:: PUNCT_SPAR_LAST("SCORE") ::*/
%token SCORE_LIMIT_L /*:: PUNCT_SPAR_LAST("SCORE_LIMIT") ::*/
%token SELECT_L /*:: PUNCT_SPAR_LAST("SELECT") ::*/
@@ -231,11 +230,11 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token SOFT_L /*:: PUNCT_SPAR_LAST("SOFT") ::*/
%token SQLQUERY_L /*:: PUNCT("SQLQUERY"), SPAR, LAST1("SQLQUERY {"), LAST1("SQLQUERY ("), LAST1("SQLQUERY #cmt\n{"), LAST1("SQLQUERY\r\n("), ERR("SQLQUERY"), ERR("SQLQUERY bad") ::*/
%token STORAGE_L /*:: PUNCT_SPAR_LAST("STORAGE") ::*/
+%token STR_L /*:: PUNCT_SPAR_LAST("STR") ::*/
%token SUBCLASS_L /*:: PUNCT_SPAR_LAST("SUBCLASS") ::*/
%token SUBJECT_L /*:: PUNCT_SPAR_LAST("SUBJECT") ::*/
%token SUM_L /*:: PUNCT_SPAR_LAST("SUM") ::*/
%token TABLE_OPTION_L /*:: PUNCT_SPAR_LAST("TABLE_OPTION") ::*/
-%token TEXT_L /*:: PUNCT_SPAR_LAST("TEXT") ::*/
%token T_CYCLES_ONLY_L /*:: PUNCT_SPAR_LAST("T_CYCLES_ONLY") ::*/
%token T_DIRECTION_L /*:: PUNCT_SPAR_LAST("T_DIRECTION") ::*/
%token T_DISTINCT_L /*:: PUNCT_SPAR_LAST("T_DISTINCT") ::*/
@@ -250,7 +249,6 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token T_NO_ORDER_L /*:: PUNCT_SPAR_LAST("T_NO_ORDER") ::*/
%token T_SHORTEST_ONLY_L /*:: PUNCT_SPAR_LAST("T_SHORTEST_ONLY") ::*/
%token T_STEP_L /*:: PUNCT_SPAR_LAST("T_STEP") ::*/
-%token TO_L /*:: PUNCT_SPAR_LAST("TO") ::*/
%token TRANSITIVE_L /*:: PUNCT_SPAR_LAST("TRANSITIVE") ::*/
%token true_L /*:: PUNCT_SPAR_LAST("true") ::*/
%token UNBOUND_L /*:: PUNCT_SPAR_LAST("UNBOUND") ::*/
@@ -258,7 +256,6 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token USING_L /*:: PUNCT_SPAR_LAST("USING") ::*/
%token WHERE_L /*:: PUNCT("WHERE"), SPAR, LAST1("WHERE {"), LAST1("WHERE ("), LAST1("WHERE #cmt\n{"), LAST1("WHERE\r\n("), ERR("WHERE"), ERR("WHERE bad") ::*/
%token WITH_L /*:: PUNCT_SPAR_LAST("WITH") ::*/
-%token XML_L /*:: PUNCT_SPAR_LAST("XML") ::*/
%token __SPAR_PUNCT_END /* Delimiting value for syntax highlighting */
%token START_OF_SPARQL_TEXT /*:: FAKE("the beginning of SPARQL text"), SPAR, NULL ::*/
@@ -269,9 +266,8 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token __SPAR_NONPUNCT_START /* Delimiting value for syntax highlighting */
-/* Do NOT try to wrap the following line! */
-%token<token_type> SPARQL_BIF /*:: LITERAL("%d"), SPAR, LAST("ABS"), LAST("BNODE"), LAST("CEIL"), LAST("COALESCE"), LAST("CONCAT"), LAST("CONTAINS"), LAST("DAY"), LAST("ENCODE_FOR_URI"), LAST("FLOOR"), LAST("HOURS"), LAST("IF"), LAST("ISBLANK"), LAST("ISIRI"), LAST("ISLITERAL"), LAST("ISNUMERIC"), LAST("ISREF"), LAST("ISURI"), LAST("LANGMATCHES"), LAST("LCASE"), LAST("MD5"), LAST("MINUTES"), LAST("MONTH"), LAST("NOW"), LAST("RAND"), LAST("REGEX"), LAST("ROUND"), LAST("SAMETERM"), LAST("SECONDS"), LAST("SHA1"), LAST("SHA224"), LAST("SHA256"), LAST("SHA384"), LAST("SHA512"), LAST("STR"), LAST("STRDT"), LAST("STRENDS"), LAST("STRLANG"), LAST("STRLEN"), LAST("STRSTARTS"), LAST("SUBSTR"), LAST("TIMEZONE"), LAST("TZ"), LAST("UCASE"), LAST("URI"), LAST("YEAR") ::*/
-
+%token <box> TEXT_BL /*:: PUNCT_SPAR_LAST("TEXT") ::*/
+%token <box> XML_BL /*:: PUNCT_SPAR_LAST("XML") ::*/
%token <box> SPARQL_INTEGER /*:: LITERAL("%d"), SPAR, LAST("1234") ::*/
%token <box> SPARQL_DECIMAL /*:: LITERAL("%d"), SPAR, LAST("1234.56") ::*/
@@ -286,9 +282,12 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%token <box> BLANK_NODE_LABEL /*:: LITERAL("%s"), SPAR, LAST("_:_f.Rag.2") ::*/
%token <box> Q_IRI_REF /*:: LITERAL("%s"), SPAR, LAST("<something>"), LAST("<http://www.example.com/sample#frag>") ::*/
-%token <box> QD_VARNAME /*:: LITERAL("?%s"), SPAR, LAST("?1var_Name1"), LAST("$2var_Name2") ::*/
-%token <box> QD_COLON_PARAMNAME /*:: LITERAL("?:%s"), SPAR, LAST("?:var_Name1"), LAST("$:var_Name2") ::*/
-%token <box> QD_COLON_PARAMNUM /*:: LITERAL("??"), SPAR, LAST("??"), LAST("$?") ::*/
+%token <box> QUEST_VARNAME /*:: LITERAL("?%s"), SPAR, LAST("?1var_Name1") ::*/
+%token <box> DOLLAR_VARNAME /*:: LITERAL("$%s"), SPAR, LAST("$2var_Name2") ::*/
+%token <box> QUEST_COLON_PARAMNAME /*:: LITERAL("?:%s"), SPAR, LAST("?:var_Name1") ::*/
+%token <box> DOLLAR_COLON_PARAMNAME /*:: LITERAL("$:%s"), SPAR, LAST("$:var_Name2") ::*/
+%token <box> QUEST_COLON_PARAMNUM /*:: LITERAL("??"), SPAR, LAST("??") ::*/
+%token <box> DOLLAR_COLON_PARAMNUM /*:: LITERAL("$?"), SPAR, LAST("$?") ::*/
%token <box> SPARQL_PLAIN_ID /*:: LITERAL("%s"), SPAR, LAST("q"), LAST("a1"), LAST("_ABYZabyz0189") ::*/
%token <box> SPARQL_SQL_ALIASCOLNAME /*:: LITERAL("%s"), SPAR, LAST("ALIAS.COL") ::*/
@@ -308,16 +307,6 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <nothing> spar_base_decl_opt
%type <nothing> spar_prefix_decls_opt
%type <nothing> spar_prefix_decl
-%type <nothing> spar_defmacro
-%type <tree> spar_dm_args_and_body
-%type <backstack> spar_dm_local_args_opt
-%type <backstack> spar_dm_arg_commalist
-%type <backstack> spar_dm_args_opt
-%type <backstack> spar_dm_args
-%type <tree> spar_dm_patitem_gs
-%type <tree> spar_dm_patitem_p
-%type <tree> spar_dm_patitem_o
-%type <tree> spar_dm_gp_or_expn
%type <tree> spar_select_query
%type <token_type> spar_select_query_mode
%type <trees> spar_select_rset
@@ -329,8 +318,6 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <nothing> spar_dataset_clauses_opt
%type <nothing> spar_dataset_clause
%type <token_type> spar_dataset_clause_subtype
-%type <token_type> spar_dataset_clause_subtype_from
-%type <token_type> spar_dataset_clause_subtype_using
%type <trees> spar_sponge_optionlist_opt
%type <trees> spar_sponge_option_commalist_opt_rpar
%type <backstack> spar_sponge_option_commalist
@@ -375,11 +362,9 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <backstack> spar_service_options
%type <trees> spar_service_option
%type <tree> spar_ctor_template
-%type <nothing> spar_ctor_triples_or_quads_opt
-%type <nothing> spar_ctor_triples_or_quads_triples
-%type <nothing> spar_ctor_triples_or_quads_quads
+%type <nothing> spar_ctor_triples
+%type <nothing> spar_triples_opt
%type <nothing> spar_triples
-%type <nothing> spar_quads1
%type <nothing> spar_triples1
%type <nothing> spar_props_opt
%type <nothing> spar_props
@@ -409,17 +394,13 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <tree> spar_global_var_int
%type <tree> spar_graph_term
%type <tree> spar_backquoted
-%type <backstack> spar_expn_or_ggps
%type <backstack> spar_expns
-%type <tree> spar_expn_or_ggp
%type <tree> spar_expn
%type <tree> spar_built_in_call
+%type <tree> spar_built_in_regex
%type <tree> spar_function_call
-%type <tree> spar_macro_call
%type <backstack> spar_arg_list_opt
%type <backstack> spar_arg_list
-%type <backstack> spar_macro_arg_list_opt
-%type <backstack> spar_macro_arg_list
%type <tree> spar_numeric_literal
%type <tree> spar_rdf_literal
%type <tree> spar_boolean_literal
@@ -430,8 +411,8 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <trees> spar_arrow_iriref
%type <tree> spar_blank_node
/* nonterminals from part 1a: */
-%type <backstack> spar_sparul_action_or_drop_macro_libs
-%type <tree> spar_sparul_action_or_drop_macro_lib
+%type <backstack> spar_sparul_actions
+%type <tree> spar_sparul_action
%type <tree> spar_sparul_insert
%type <tree> spar_sparul_insertdata
%type <tree> spar_sparul_delete
@@ -441,19 +422,9 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <tree> spar_sparul_load
%type <tree> spar_sparul_create
%type <tree> spar_sparul_drop
-%type <tree> spar_drop_macro_lib
-%type <tree> spar_sparul11_action
-%type <tree> spar_sparul11_deleteinsert
-%type <tree> spar_sparul11_insert
-%type <tree> spar_sparul11_insert_opt
-%type <tree> spar_sparul11_copymoveadd
-%type <token_type> spar_sparul11_copymoveadd_op
%type <tree> spar_action_solution
-%type <tree> spar_in_graph_precode
-%type <tree> spar_from_graph_precode
-%type <tree> spar_all_or_named_or_default_or_graph_precode
-%type <tree> spar_default_or_graph_precode
-%type <nothing> spar_with_graph_precode_opt
+%type <tree> spar_in_graph_precode_opt
+%type <tree> spar_from_graph_precode_opt
%type <tree> spar_graph_precode_opt
%type <nothing> spar_in_or_into
%type <token_type> spar_silent_opt
@@ -474,8 +445,6 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <tree> spar_qm_drop_quad_storage
%type <tree> spar_qm_drop_quad_map_mapping
%type <tree> spar_qm_drop_mapping
-%type <tree> spar_qm_attach_macro_lib
-%type <tree> spar_qm_detach_macro_lib
%type <nothing> spar_qm_from_where_list_opt
%type <nothing> spar_qm_map_top_group
%type <nothing> spar_qm_map_top_dotlist
@@ -530,7 +499,6 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%type <nothing> spar_opt_dot_and_end
%left _SEMI
-%nonassoc PRECODE_EXPN_PREC
%left _COLON
%nonassoc AS_L
%left _BAR_BAR
@@ -548,18 +516,16 @@ int sparyylex_from_sparp_bufs (caddr_t *yylval, sparp_t *sparp)
%%
/* TOP-LEVEL begin */
-sparql /* [1]* Query ::= Prolog ( */
- /*... ( CreateMacroLib? QueryBody ) */
- /*... | ( SparulAction | DropMacroLib ) */
- /*... | ( QmStmt ('.' QmStmt)* '.'? ) ) */
- : START_OF_SPARQL_TEXT spar_prolog spar_create_macro_lib_opt
- spar_query_body END_OF_SPARQL_TEXT { sparp_arg->sparp_expr = $$ = $4; }
- | START_OF_SPARQL_TEXT spar_prolog spar_sparul_action_or_drop_macro_libs END_OF_SPARQL_TEXT {
+sparql /* [1]* Query ::= Prolog ( QueryBody | SparulAction* | ( QmStmt ('.' QmStmt)* '.'? ) ) */
+ : START_OF_SPARQL_TEXT spar_prolog /* {
+ if (sparp_arg->sparp_env->spare_default_graphs_listed || sparp_arg->sparp_env->spare_named_graphs_listed) {
+ sparp_arg->sparp_env->spare_default_graphs_locked = 1;
+ sparp_arg->sparp_env->spare_named_graphs_locked = 1;
+ } } */
+ spar_query_body END_OF_SPARQL_TEXT { sparp_arg->sparp_expr = $$ = $3; }
+ | START_OF_SPARQL_TEXT spar_prolog spar_sparul_actions END_OF_SPARQL_TEXT {
sparp_arg->sparp_expr = $$ = spar_make_topmost_sparul_sql (sparp_arg,
(SPART **)t_revlist_to_array ($3) ); }
- | START_OF_SPARQL_TEXT spar_prolog spar_sparul11_action END_OF_SPARQL_TEXT {
- sparp_arg->sparp_expr = $$ = spar_make_topmost_sparul_sql (sparp_arg,
- (SPART **)t_list (1, $3) ); }
| START_OF_SPARQL_TEXT END_OF_SPARQL_TEXT {
sparp_arg->sparp_expr = $$ = spar_make_topmost_sparul_sql (sparp_arg,
(SPART **)t_list (0) ); }
@@ -578,9 +544,8 @@ spar_query_body /* [1] QueryBody ::= SelectQuery | ConstructQuery | DescribeQ
| spar_ask_query
;
-spar_prolog /* [2]* Prolog ::= Define* BaseDecl? PrefixDecl* Defmacro*
- /*... ( 'WITH' ( 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? PrecodeExpn )? */
- : spar_defines_opt spar_base_decl_opt spar_prefix_decls_opt spar_defmacros_opt spar_with_graph_precode_opt
+spar_prolog /* [2]* Prolog ::= Define* BaseDecl? PrefixDecl* */
+ : spar_defines_opt spar_base_decl_opt spar_prefix_decls_opt
;
spar_defines_opt /* ::= Define* */
@@ -604,11 +569,11 @@ spar_define_val_commalist
;
spar_define_val /* [Virt] DefValue := QNAME | Q_IRI_REF | String */
- : QNAME { $$ = (SPART *)t_list (2, (ptrlong)QNAME, $1); }
- | Q_IRI_REF { $$ = (SPART *)t_list (2, (ptrlong)Q_IRI_REF, $1); }
- | SPARQL_STRING { $$ = (SPART *)t_list (2, (ptrlong)SPARQL_STRING, $1); }
- | SPARQL_INTEGER { $$ = (SPART *)t_list (2, (ptrlong)SPARQL_INTEGER, $1); }
- | spar_global_var { $$ = (SPART *)t_list (2, (ptrlong)SPAR_VARIABLE, (caddr_t)$1); }
+ : QNAME { $$ = (SPART *)t_list (2, QNAME, $1); }
+ | Q_IRI_REF { $$ = (SPART *)t_list (2, Q_IRI_REF, $1); }
+ | SPARQL_STRING { $$ = (SPART *)t_list (2, SPARQL_STRING, $1); }
+ | SPARQL_INTEGER { $$ = (SPART *)t_list (2, SPARQL_INTEGER, $1); }
+ | spar_global_var { $$ = (SPART *)t_list (2, SPAR_VARIABLE, (caddr_t)$1); }
;
spar_base_decl_opt /* [3] BaseDecl ::= 'BASE' Q_IRI_REF */
@@ -635,147 +600,6 @@ spar_prefix_decl /* [4] PrefixDecl ::= 'PREFIX' QNAME_NS Q_IRI_REF */
| PREFIX_L error { sparyyerror ("Missing namespace prefix after PREFIX keyword"); }
;
-spar_create_macro_lib_opt /* [Virt] CreateMacroLib ::= 'CREATE' 'MACRO' 'LIBRARY' IRIref '{' Defmacro* '}' */
- : /* empty */
- | CREATE_L MACRO_L LIBRARY_L spar_iriref {
- if (sparp_arg->sparp_macro_def_count)
- sparyyerror ("Some macro are defined before CREATE MACRO LIBRARY");
- sparp_arg->sparp_macrolib_to_create = $4->_.qname.val;
- sparp_arg->sparp_disable_storage_macro_lib = 2; }
- _LBRA spar_defmacros_opt _RBRA
- ;
-
-spar_defmacros_opt
- : /* empty */ { ; }
- | spar_defmacros_opt spar_defmacro { ; }
- ;
-
-spar_defmacro /* [Virt] Defmacro ::= 'DEFMACRO' IRIref ( */
- /*... DefmacroArgs ( 'LOCAL' DefmacroArgs )? ( GroupGraphPattern | Expn ) | */
- /*... DefmacroPattern ( 'LOCAL' DefmacroArgs )? GroupGraphPattern ) */
- : DEFMACRO_L spar_iriref {
- SPART *new_macro;
- if (!sparp_arg->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp_arg);
- spar_selid_push_reused (sparp_arg, $2->_.qname.val );
- sparp_arg->sparp_macro_mode = SPARP_DEFARG;
- new_macro = sparp_arg->sparp_current_macro = sparp_defmacro_init (sparp_arg, $2->_.qname.val);
- sparp_defmacro_store (sparp_arg, new_macro); }
- spar_dm_args_and_body {
- sparp_defmacro_finalize (sparp_arg, $4);
- sparp_arg->sparp_macro_mode = 0;
- spar_selid_pop (sparp_arg);
- }
- ;
-
-spar_dm_args_and_body
- : _LPAR spar_dm_args_opt _RPAR {
- sparp_arg->sparp_current_macro->_.defmacro.paramnames = t_revlist_to_array ($2); }
- spar_dm_local_args_opt {
- SPART *curr = sparp_arg->sparp_current_macro;
- if (NULL != $5)
- curr->_.defmacro.localnames = t_revlist_to_array ($5);
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY; }
- spar_dm_gp_or_expn { $$ = $7; }
- | spar_dm_match_template {
- SPART *curr = sparp_arg->sparp_current_macro;
- sparp_make_defmacro_paramnames_from_template (sparp_arg, curr); }
- spar_dm_local_args_opt _LBRA {
- SPART *curr = sparp_arg->sparp_current_macro;
- if (NULL != $3)
- curr->_.defmacro.localnames = t_revlist_to_array ($3);
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY;
- spar_gp_init (sparp_arg, DEFMACRO_L); }
- spar_gp _RBRA { $$ = spar_gp_finalize (sparp_arg, NULL); }
- | error { sparyyerror ("List of arguments or template is expected after macro name"); }
- ;
-
-spar_dm_match_template /* [Virt] DefmacroPattern ::= (( 'GRAPH' PatternItemGorS ) | ( 'DEFAULT' 'GRAPH' ))? */
-/*... '{' PatternItemGorS PatternItemP PatternItemO '}' */
- : _LBRA spar_dm_patitem_gs spar_dm_patitem_p spar_dm_patitem_o _RBRA {
- SPART *curr = sparp_arg->sparp_current_macro;
- curr->_.defmacro.subtype = 0;
- curr->_.defmacro.quad_pattern = (SPART **)t_list (4, NULL, $2, $3, $4);
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY; }
- | GRAPH_L spar_dm_patitem_gs _LBRA spar_dm_patitem_gs spar_dm_patitem_p spar_dm_patitem_o _RBRA {
- SPART *curr = sparp_arg->sparp_current_macro;
- curr->_.defmacro.subtype = GRAPH_L;
- curr->_.defmacro.quad_pattern = (SPART **)t_list (4, $2, $4, $5, $6);
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY; }
- | DEFAULT_L GRAPH_L _LBRA spar_dm_patitem_gs spar_dm_patitem_p spar_dm_patitem_o _RBRA {
- SPART *curr = sparp_arg->sparp_current_macro;
- curr->_.defmacro.subtype = DEFAULT_L;
- curr->_.defmacro.quad_pattern = (SPART **)t_list (4, NULL, $4, $5, $6);
- sparp_arg->sparp_macro_mode = SPARP_DEFBODY; }
- ;
-
-spar_dm_local_args_opt
- : /* empty */ { $$ = NULL; }
- | LOCAL_L _LPAR spar_dm_args _RPAR { $$ = $3; }
- | LOCAL_L _LPAR spar_dm_arg_commalist _RPAR { $$ = $3; }
- ;
-
-spar_dm_args_opt /* [Virt] DefmacroArgs ::= '(' ((VAR1 | VAR2)* | ((VAR1 | VAR2) ( ',' (VAR1 | VAR2))+)) ')' */
- : /* empty */ { $$ = NULL; }
- | spar_dm_args
- | spar_dm_arg_commalist
- ;
-
-spar_dm_arg_commalist
- : QD_VARNAME _COMMA QD_VARNAME {
- $$ = NULL;
- t_set_push (&($$), $1);
- sparp_check_dm_arg_for_redecl (sparp_arg, $$, $3);
- t_set_push (&($$), $3); }
- | spar_dm_arg_commalist _COMMA QD_VARNAME {
- $$ = $1;
- sparp_check_dm_arg_for_redecl (sparp_arg, $$, $3);
- t_set_push (&($$), $3); }
- ;
-
-spar_dm_args
- : QD_VARNAME { $$ = NULL; t_set_push (&($$), $1); }
- | spar_dm_args QD_VARNAME {
- $$ = $1;
- sparp_check_dm_arg_for_redecl (sparp_arg, $$, $2);
- t_set_push (&($$), $2); }
- ;
-
-spar_dm_patitem_gs /* [Virt] PatternItemGorS ::= VAR1 | VAR2 | IRIref */
- : QD_VARNAME { $$ = spar_make_param_or_variable (sparp_arg, $1); }
- | spar_iriref
- ;
-
-spar_dm_patitem_p /* [Virt] PatternItemP ::= VAR1 | VAR2 | 'a' | IRIref */
- : QD_VARNAME { $$ = spar_make_param_or_variable (sparp_arg, $1); }
- | a_L { $$ = spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_type); }
- | spar_iriref
- ;
-
-spar_dm_patitem_o /* [Virt] PatternItemO ::= VAR1 | VAR2 | IRIref */
- /*... | RDFLiteral | ( '-' | '+' )? NumericLiteral | BooleanLiteral | NIL */
- : QD_VARNAME { $$ = spar_make_param_or_variable (sparp_arg, $1); }
- | spar_numeric_literal
- | _PLUS spar_numeric_literal { $$ = $2; }
- | _MINUS spar_numeric_literal { $$ = $2; spar_change_sign (&($2->_.lit.val)); }
- | NIL_L { $$ = (SPART *)t_box_dv_uname_string ("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"); }
- | spar_rdf_literal
- | spar_boolean_literal
- | spar_iriref
- ;
-
-
-spar_dm_gp_or_expn
- : _LBRA {
- SPART *curr = sparp_arg->sparp_current_macro;
- curr->_.defmacro.subtype = 0;
- spar_gp_init (sparp_arg, DEFMACRO_L); }
- spar_gp _RBRA { $$ = spar_gp_finalize (sparp_arg, NULL); }
- | spar_expn
- | error { sparyyerror ("Graph group pattern or expression is expected as the body of the macro"); }
- ;
-
-
spar_select_query /* [5]* SelectQuery ::= 'SELECT' ( 'DISTINCT' | 'REDUCED' )? ( ( Retcol ( ','? Retcol )* ) | '*' ) */
/*... DatasetClause* WhereClause SolutionModifier */
: spar_select_query_mode {
@@ -808,7 +632,7 @@ spar_select_rset /* ::= ( ( Retcol ( ','? Retcol )* ) | '*' | 'COUNT' ) */
spar_select_rset_1
: _STAR { $$ = (SPART **) _STAR; }
/*| COUNT_LPAR _STAR _RPAR { $$ = (SPART **) COUNT_LPAR; }*/
- | spar_retcols { $$ = (SPART **) t_revlist_to_array ($1); }
+ | spar_retcols { $$ = (SPART **) t_revlist_to_array ($1); }
| spar_retcol_commalist {
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_VIRTSPECIFIC, "comma-delimited list of result set expressions");
$$ = (SPART **) t_revlist_to_array ($1); }
@@ -870,8 +694,8 @@ spar_dataset_clauses_opt
;
spar_dataset_clause /* [9]* DatasetClause ::= | */
- /*... ( ( 'FROM' | 'USING' ) ( DefaultGraphClause | NamedGraphClause ) SpongeOptionList? ) */
- /*... | ( 'NOT' 'FROM' | 'USING' ) ( DefaultGraphClause | NamedGraphClause ) ) */
+ /*... ( 'FROM' ( DefaultGraphClause | NamedGraphClause ) SpongeOptionList? ) */
+ /*... | ( 'NOT' 'FROM' ( DefaultGraphClause | NamedGraphClause ) ) */
/* [10] DefaultGraphClause ::= SourceSelector */
/* [11] NamedGraphClause ::= 'NAMED' SourceSelector */
: spar_dataset_clause_subtype spar_iriref spar_sponge_optionlist_opt {
@@ -879,27 +703,12 @@ spar_dataset_clause /* [9]* DatasetClause ::= | */
;
spar_dataset_clause_subtype
- : spar_dataset_clause_subtype_from {
- if (NULL != sparp_arg->sparp_env->spare_src.ssrc_graph_set_by_with)
- sparyyerror ("FROM can not be used in combination with WITH, use either consistent SPARUL syntax or SPARQL 1.1 syntax, not a mix");
- $$ = $1; }
- | spar_dataset_clause_subtype_using {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "USING keyword");
- $$ = $1; }
- ;
-
-spar_dataset_clause_subtype_from
: FROM_L { $$ = SPART_GRAPH_FROM; }
| FROM_L NAMED_L { $$ = SPART_GRAPH_NAMED; }
| NOT_L FROM_L { $$ = SPART_GRAPH_NOT_FROM; }
| NOT_L FROM_L NAMED_L { $$ = SPART_GRAPH_NOT_NAMED; }
- ;
-
-spar_dataset_clause_subtype_using
- : USING_L { $$ = SPART_GRAPH_FROM; }
- | USING_L NAMED_L { $$ = SPART_GRAPH_NAMED; }
- | NOT_L USING_L { $$ = SPART_GRAPH_NOT_FROM; }
- | NOT_L USING_L NAMED_L { $$ = SPART_GRAPH_NOT_NAMED; }
+ | NOT_FROM_L { $$ = SPART_GRAPH_NOT_FROM; }
+ | NOT_FROM_L NAMED_L { $$ = SPART_GRAPH_NOT_NAMED; }
;
spar_sponge_optionlist_opt /* [Virt] SpongeOptionList ::= 'OPTION' '(' ( SpongeOption ( ',' SpongeOption )* )? ')' */
@@ -922,7 +731,7 @@ spar_sponge_option_commalist /* ::= SpongeOption ( ',' SpongeOption )* */
spar_precode_expn /* [Virt] PrecodeExpn ::= Expn (* Only global variables can occur in Expn, local can not *) */
: { sparp_arg->sparp_in_precode_expn = 1; }
- spar_expn %prec PRECODE_EXPN_PREC
+ spar_expn
{ sparp_arg->sparp_in_precode_expn = 0; $$ = $2; }
;
@@ -950,15 +759,13 @@ spar_wherebindings_clause /* [13*] WhereBindingsClause ::= 'WHERE'? GroupGraph
spar_bindings_clause_opt
: /* nothing */ { $$ = NULL; }
- | spar_bindings_clause
+ | spar_bindings_clause { $$ = $1; }
;
spar_bindings_clause /* [Sparql1.1*] BindingsClause ::= 'BINDINGS' BindingsVar+ '{' Binding* '}' */
: BINDINGS_L {
if (NULL != sparp_arg->sparp_env->spare_bindings_vars)
sparyyerror ("Only one BINDINGS clause per query is allowed");
- if (sparp_arg->sparp_macro_mode)
- sparyyerror ("BINDINGS can not be used inside macro");
spar_selid_push (sparp_arg); }
spar_bindings_vars _LBRA {
spar_selid_pop (sparp_arg);
@@ -977,13 +784,14 @@ spar_bindings_vars
;
spar_bindings_var /* [Sparql1.1*] BindingsVar ::= VAR1 | VAR2 | GlobalVar */
- : QD_VARNAME { ; }
+ : QUEST_VARNAME { ; }
+ | DOLLAR_VARNAME { ; }
| spar_global_var { sparyyerror ("Global variable can not be used in the header of BINDINGS"); }
;
spar_bindings_opt
: /* nothing */ { $$ = NULL; }
- | spar_bindings
+ | spar_bindings { $$ = $1; }
;
spar_bindings
@@ -993,7 +801,7 @@ spar_bindings
spar_binding /* [Sparql1.1] Binding ::= '(' ( IRIref | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | 'UNBOUND' )+ ')' */
: _LPAR spar_bindvals _RPAR {
- $$ = (SPART **)t_revlist_to_array ($2);
+ $$ = t_revlist_to_array ($2);
if (BOX_ELEMENTS ($$) != BOX_ELEMENTS (sparp_arg->sparp_env->spare_bindings_vars))
sparyyerror ("Number of values in a binding does not match number of variables to bind"); }
;
@@ -1147,20 +955,6 @@ spar_gp /* [20] GraphPattern ::= Triples? ( GraphPatternNotTriples '.'? Grap
: spar_triples_opt { }
| spar_triples_opt spar_gp_not_triples spar_gp { }
| spar_triples_opt spar_gp_not_triples _DOT spar_gp { }
- | QD_VARNAME _DOT spar_gp {
- if (sparp_arg->sparp_macro_mode & SPARP_DEFBODY)
- {
- SPART *curmacro = sparp_arg->sparp_current_macro;
- SPART *mpu;
- int pos = sparp_namesake_macro_param (sparp_arg, curmacro, $1);
- if (0 > pos)
- spar_error (sparp_arg, "Pattern variable '%.100s' inside the body of a macro '%.100s' is not listed in list of macro parameters",
- $1, curmacro->_.defmacro.mname );
- mpu = spar_make_macropu (sparp_arg, $1, pos);
- spar_gp_add_member (sparp_arg, mpu);
- }
- else
- sparyyerror ("Ill formed triple pattern or macro pattern variable outside a macro body"); }
;
spar_gp_not_triples /* [21]* GraphPatternNotTriples ::= */
@@ -1210,12 +1004,12 @@ spar_constraint /* [25]* Constraint ::= 'FILTER' ( ( '(' Expn ')' ) | BuiltIn
: FILTER_L _LPAR spar_expn _RPAR { $$ = $3; }
| FILTER_L spar_built_in_call { $$ = $2; }
| FILTER_L spar_function_call { $$ = $2; }
- | FILTER_L spar_exists_or_not_exists spar_constraint_exists_int { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
+ | FILTER_L spar_exists_or_not_exists spar_constraint_exists_int { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
if ($2)
$$ = $3;
else
SPAR_BIN_OP ($$, BOP_NOT, $3, NULL); }
- | MINUS_L spar_constraint_exists_int { /*... | 'MINUS' DatasetClause* WhereClause */
+ | MINUS_L spar_constraint_exists_int { /*... | 'NOT'? 'EXISTS' DatasetClause* WhereClause */
/*!!! Dirty hack! Works wrong if MINUS is at the middle of the GP (before smth or not a 2-nd item) */
SPAR_BIN_OP ($$, BOP_NOT, $2, NULL); }
;
@@ -1260,11 +1054,10 @@ spar_service_req /* [Virt] ServiceRequest ::= 'SERVICE' IRIref ServiceOptionLis
SPART **sources;
caddr_t sinv_storage_uri = uname_virtrdf_ns_uri_DefaultServiceStorage /*!!! TBD config */;
SPART *sinv;
- if ((NULL == sparp_arg->sparp_env->spare_src.ssrc_default_graphs) && (NULL == sparp_arg->sparp_env->spare_src.ssrc_named_graphs))
+ if ((NULL == sparp_arg->sparp_env->spare_default_graphs) && (NULL == sparp_arg->sparp_env->spare_named_graphs))
memcpy (&(sparp_arg->sparp_env->spare_src), $<box>5, sizeof (sparp_sources_t));
- sources = spar_make_sources_like_top (sparp_arg, SELECT_L);
+ sources = spar_make_sources_like_top (sparp_arg);
sinv = spar_make_service_inv (sparp_arg, $2, $4, sparp_arg->sparp_permitted_syntax, sources, sinv_storage_uri);
- spar_add_service_inv_to_sg (sparp_arg, sinv);
t_set_push (&(sparp_env()->spare_context_sinvs), sinv);
spar_gp_init (sparp_arg, SERVICE_L); }
spar_group_gp {
@@ -1301,43 +1094,20 @@ spar_service_option
| IN_L _STAR { $$ = (SPART **)t_list (2, (SPART *)((ptrlong)IN_L), (SPART *)((ptrlong)_STAR)); }
;
-spar_ctor_template /* [26]* ConstructTemplate ::= '{' ( ConstructQuads+ '.'? ) '}' */
+spar_ctor_template /* [26]* ConstructTemplate ::= '{' ConstructTriples '}' */
: _LBRA { spar_gp_init (sparp_arg, CONSTRUCT_L); }
- spar_ctor_triples_or_quads_opt _RBRA {
- int g_grp_count = sparp_env()->spare_ctor_g_grp_count;
- int g_may_vary = 0;
- $$ = spar_gp_finalize (sparp_arg, NULL);
- if (1 < (g_grp_count + (sparp_env()->spare_ctor_dflt_g_tmpl_count ? 1 : 0)))
- g_may_vary = 1;
- if ((0 == g_may_vary) && (0 < BOX_ELEMENTS ($$->_.gp.members)))
- {
- SPART *g = $$->_.gp.members[0]->_.triple.tr_graph;
- if ((SPAR_QNAME != SPART_TYPE (g)) && !SPART_IS_DEFAULT_GRAPH_BLANK (g))
- g_may_vary = 1;
- }
- if (g_may_vary)
- $$->_.gp.options = (SPART **)t_list (2, (SPART *)((ptrlong)QUAD_L), t_box_num_nonull (g_grp_count));
- sparp_env()->spare_ctor_g_grp_count = 0;
- sparp_env()->spare_ctor_dflt_g_tmpl_count = 0; }
+ spar_ctor_triples_opt _RBRA { $$ = spar_gp_finalize (sparp_arg, NULL); }
;
-spar_ctor_triples_or_quads_opt /* [27]* ConstructQuads ::= (Triples1 ( '.' ConstructQuads )? ) | Quads1 ( '.'? ConstructQuads )? */
+spar_ctor_triples_opt /* [27] ConstructTriples ::= ( Triples1 ( '.' ConstructTriples )? )? */
: /* empty */ { }
- | spar_ctor_triples_or_quads_quads { }
- | spar_ctor_triples_or_quads_triples { }
- | spar_ctor_triples_or_quads_triples _DOT { }
+ | spar_ctor_triples { }
+ | spar_ctor_triples _DOT { }
;
-spar_ctor_triples_or_quads_triples
+spar_ctor_triples /* ::= Triples1 ( '.' Triples1 )* */
: spar_triples1 { }
- | spar_ctor_triples_or_quads_triples _DOT spar_triples1 { }
- | spar_ctor_triples_or_quads_quads spar_triples1 { }
- ;
-
-spar_ctor_triples_or_quads_quads
- : spar_quads1 { }
- | spar_ctor_triples_or_quads_triples _DOT spar_quads1 { }
- | spar_ctor_triples_or_quads_quads spar_quads1 { }
+ | spar_ctor_triples _DOT spar_triples1 { }
;
spar_triples_opt /* ::= Triples? */
@@ -1350,27 +1120,18 @@ spar_triples /* [28] Triples ::= Triples1 ( '.' Triples? )? */
| spar_triples1 _DOT spar_triples_opt { }
;
-spar_quads1 /* [Virt] Quads1 ::= GRAPH VarOrTerm PropertyListNotEmpty | TriplesNode PropertyList | MacroCall */
- : GRAPH_L { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "SPARQL 1.1 quad constructor template"); }
- spar_var_or_blank_node_or_iriref_or_backquoted {
- sparp_env()->spare_ctor_g_grp_count++;
- t_set_push (&(sparp_env()->spare_context_graphs), $3); }
- _LBRA spar_triples _RBRA { t_set_pop (&(sparp_env()->spare_context_graphs)); }
- ;
-
-spar_triples1 /* [29*] Triples1 ::= VarOrTerm PropertyListNotEmpty | TriplesNode PropertyList | MacroCall */
+spar_triples1 /* [29] Triples1 ::= VarOrTerm PropertyListNotEmpty | TriplesNode PropertyList */
: spar_var_or_term { t_set_push (&(sparp_env()->spare_context_subjects), $1); }
spar_props { t_set_pop (&(sparp_env()->spare_context_subjects)); $$ = $3; }
| spar_triples_node { t_set_push (&(sparp_env()->spare_context_subjects), $1); }
spar_props_opt { t_set_pop (&(sparp_env()->spare_context_subjects)); }
- | spar_macro_call { spar_gp_add_member (sparp_arg, $1); }
;
spar_props_opt /* [30] PropertyList ::= PropertyListNotEmpty? */
: /* empty */ { }
| spar_props { }
- /*| spar_props _SEMI { }
- | spar_props _SEMI _DOT { sparyyerror ("Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }*/
+ | spar_props _SEMI { }
+ | spar_props _SEMI _DOT { sparyyerror ("Dot immediately after semicolon is permitted in pure SPARQL but not in SPARQL-BI"); }
;
spar_props /* [31] PropertyListNotEmpty ::= Verb ObjectList ( ';' PropertyList )? */
@@ -1395,14 +1156,14 @@ spar_objects /* [32]* ObjectList ::= ObjGraphNode ( ',' ObjectList )? */
spar_ograph_node /* [Virt] ObjGraphNode ::= GraphNode TripleOptions? */
: spar_graph_node spar_triple_optionlist_opt {
- spar_gp_add_triplelike (sparp_arg, NULL, NULL, NULL, $1, NULL, $2, 0x0); }
+ spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL, NULL, $1, NULL, $2, 0x0); }
;
spar_triple_optionlist_opt /* [Virt] TripleOptions ::= 'OPTION' '(' TripleOption ( ',' TripleOption )? ')' */
: /* empty */ { $$ = NULL; }
| OPTION_L _LPAR {
if (CONSTRUCT_L == SPARP_ENV_CONTEXT_GP_SUBTYPE(sparp_arg))
- sparyyerror ("Triple options are not allowed in constructor template");
+ sparyyerror ("Triple options are not allowed in contructor template");
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_OPTION, "OPTION () triple matching configuration"); }
spar_triple_option_commalist _RPAR { $$ = (SPART **)t_revlist_to_array ($4); }
;
@@ -1477,7 +1238,7 @@ spar_triples_node /* [34] TriplesNode ::= Collection | BlankNodePropertyList *
t_set_push (&(sparp_env()->spare_context_subjects), bn);
t_set_push (&(sparp_env()->spare_context_subjects), bn); }
spar_cons_collection _RPAR {
- spar_gp_add_triplelike (sparp_arg,
+ spar_gp_add_triple_or_special_filter (sparp_arg,
NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_rest),
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_nil),
@@ -1494,17 +1255,17 @@ spar_triples_opt_semi_rsqbra /* ::= ';'? ']' */
spar_cons_collection
: spar_graph_node {
- spar_gp_add_triplelike (sparp_arg, NULL, NULL,
+ spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_first),
$1, NULL, NULL, 0x0 ); }
| spar_cons_collection spar_graph_node {
SPART *bn = spar_make_blank_node (sparp_arg, spar_mkid (sparp_arg, "_:cons"), 1);
- spar_gp_add_triplelike (sparp_arg,
+ spar_gp_add_triple_or_special_filter (sparp_arg,
NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_rest),
bn, NULL, NULL, 0x0 );
sparp_env()->spare_context_subjects->data = bn;
- spar_gp_add_triplelike (sparp_arg, NULL, NULL,
+ spar_gp_add_triple_or_special_filter (sparp_arg, NULL, NULL,
spartlist (sparp_arg, 2, SPAR_QNAME, uname_rdf_ns_uri_first),
$2, NULL, NULL, 0x0 ); }
;
@@ -1550,8 +1311,8 @@ spar_retcol_commalist /* ::= ( Expn ( ',' Expn )+ ) */
;
spar_retcols /* ::= ( Expn+ ) */
- : spar_expn %prec _COMMA { $$ = NULL; t_set_push (&($$), $1); }
- | spar_retcols spar_expn %prec _COMMA { $$ = $1; t_set_push (&($$), $2); }
+ : spar_expn { $$ = NULL; t_set_push (&($$), $1); }
+ | spar_retcols spar_expn { $$ = $1; t_set_push (&($$), $2); }
;
spar_ret_agg_call /* [Virt] RetAggCall ::= AggName '(', ( '*' | ( 'DISTINCT'? Var ) ) ')' */
@@ -1573,33 +1334,10 @@ spar_agg_name_int
;
spar_var /* [41]* Var ::= VAR1 | VAR2 | GlobalVar | ( Var ( '+>' | '*>' ) IRIref ) */
- : QD_VARNAME {
- if (sparp_arg->sparp_macro_mode & SPARP_DEFBODY)
- {
- SPART *curmacro = sparp_arg->sparp_current_macro;
- int pos = sparp_namesake_macro_param (sparp_arg, curmacro, $1);
- if (-1 > pos)
- {
- spar_error (sparp_arg, "Variable '%.100s' inside the body of a macro '%.100s' is not listed in list of macro arguments or list of local names",
- $1, curmacro->_.defmacro.mname );
- }
- if (0 <= pos)
- $$ = spar_make_macropu (sparp_arg, $1, pos);
- else
- $$ = spar_make_param_or_variable (sparp_arg, $1);
- }
- else
- $$ = spar_make_param_or_variable (sparp_arg, $1); }
- | spar_global_var {
- if (sparp_arg->sparp_macro_mode & SPARP_DEFBODY)
- spar_error (sparp_arg, "Global variables are not allowed inside the body of a macro '%.100s'",
- sparp_arg->sparp_current_macro->_.defmacro.mname );
- $$ = $1; }
- | spar_var spar_arrow_iriref {
- if (sparp_arg->sparp_macro_mode & SPARP_DEFBODY)
- spar_error (sparp_arg, "Property path variables are not allowed inside the body of a macro '%.100s'",
- sparp_arg->sparp_current_macro->_.defmacro.mname );
- $$ = spar_add_propvariable (sparp_arg, $1, (ptrlong)($2[0]), $2[1], (ptrlong)($2[2]), (caddr_t)($2[3]) ); }
+ : QUEST_VARNAME { $$ = spar_make_param_or_variable (sparp_arg, $1); }
+ | DOLLAR_VARNAME { $$ = spar_make_param_or_variable (sparp_arg, $1); }
+ | spar_global_var { $$ = $1; }
+ | spar_var spar_arrow_iriref { $$ = spar_add_propvariable (sparp_arg, $1, (ptrlong)($2[0]), $2[1], (ptrlong)($2[2]), (caddr_t)($2[3]) ); }
;
spar_global_var /* [Virt] GlobalVar ::= QUEST_COLON_PARAMNAME | DOLLAR_COLON_PARAMNAME */
@@ -1608,33 +1346,33 @@ spar_global_var /* [Virt] GlobalVar ::= QUEST_COLON_PARAMNAME | DOLLAR_COLON_
spar_global_var_int
/*... | QUEST_COLON_PARAMNUM | DOLLAR_COLON_PARAMNUM */
- : QD_COLON_PARAMNAME { $$ = spar_make_variable (sparp_arg, $1); }
- | QD_COLON_PARAMNUM { $$ = spar_make_variable (sparp_arg, $1); }
+ : QUEST_COLON_PARAMNAME { $$ = spar_make_variable (sparp_arg, $1); }
+ | DOLLAR_COLON_PARAMNAME { $$ = spar_make_variable (sparp_arg, $1); }
+ | QUEST_COLON_PARAMNUM { $$ = spar_make_variable (sparp_arg, $1); }
+ | DOLLAR_COLON_PARAMNUM { $$ = spar_make_variable (sparp_arg, $1); }
;
spar_graph_term /* [42]* GraphTerm ::= IRIref | RDFLiteral | ( '-' | '+' )? NumericLiteral */
/*... | BooleanLiteral | BlankNode | NIL | Backquoted */
- : spar_iriref
- | spar_rdf_literal
- | spar_numeric_literal
+ : spar_iriref { $$ = $1; }
+ | spar_rdf_literal { $$ = $1; }
+ | spar_numeric_literal { $$ = $1; }
| _PLUS spar_numeric_literal { $$ = $2; }
| _MINUS spar_numeric_literal { $$ = $2; spar_change_sign (&($2->_.lit.val)); }
- | spar_boolean_literal
- | spar_blank_node
+ | spar_boolean_literal { $$ = $1; }
+ | spar_blank_node { $$ = $1; }
| NIL_L { $$ = (SPART *)t_box_dv_uname_string ("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"); }
| spar_backquoted
;
spar_backquoted /* [Virt] Backquoted ::= '`' Expn '`' */
: _BACKQUOTE {
- dk_set_t gp_st = sparp_env()->spare_context_gp_subtypes;
+ SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "backquoted expression");
if (2 & sparp_arg->sparp_in_precode_expn)
- spar_error (sparp_arg, "Backquoted expressions are not allowed in constant clauses");
- $<token_type>$ = ((NULL == gp_st) ? -1 : (ptrlong)(gp_st->data));
- if (CONSTRUCT_L == $<token_type>$)
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "backquoted expression in CONSTRUCT"); }
+ spar_error (sparp_arg, "Backquoted expressions are not allowed in constant clauses"); }
spar_expn _BACKQUOTE {
- if ((-1 == $<token_type>2) || (CONSTRUCT_L == $<token_type>2))
+ dk_set_t gp_st = sparp_env()->spare_context_gp_subtypes;
+ if ((NULL == gp_st) || (CONSTRUCT_L == (ptrlong)(gp_st->data)))
$$ = $3; /* redundant backquotes in retlist or backquotes to bypass syntax limitation in CONSTRUCT gp */
else
{
@@ -1648,7 +1386,8 @@ spar_backquoted /* [Virt] Backquoted ::= '`' Expn '`' */
;
spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
- : spar_expn AS_L QD_VARNAME { $$ = spartlist (sparp_arg, 4, SPAR_ALIAS, $1, $3, SSG_VALMODE_AUTO); }
+ : spar_expn AS_L QUEST_VARNAME { $$ = spartlist (sparp_arg, 4, SPAR_ALIAS, $1, $3, SSG_VALMODE_AUTO); }
+ | spar_expn AS_L DOLLAR_VARNAME { $$ = spartlist (sparp_arg, 4, SPAR_ALIAS, $1, $3, SSG_VALMODE_AUTO); }
| spar_expn _BAR_BAR spar_expn { /* [44] ConditionalOrExpn ::= ConditionalAndExpn ( '||' ConditionalAndExpn )* */
SPAR_BIN_OP ($$, BOP_OR, $1, $3); }
| spar_expn _AMP_AMP spar_expn { /* [45] ConditionalAndExpn ::= ValueLogical ( '&&' ValueLogical )* */
@@ -1661,7 +1400,7 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
| spar_expn _NOT_EQ spar_expn { SPAR_BIN_OP ($$, BOP_NEQ, $1, $3); }
| spar_expn LIKE_L { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_LIKE, "LIKE operator"); }
spar_expn { /* Virtuoso-specific extension of [47] */
- $$ = sparp_make_builtin_call (sparp_arg, LIKE_L, (SPART **)t_list (2, $1, $4)); }
+ $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)LIKE_L, t_list (2, $1, $4)); }
| spar_expn IN_L { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_IN, "IN operator"); }
_LPAR spar_expns _RPAR { /* Virtuoso-specific extension of [47] */
dk_set_t args = $5;
@@ -1672,8 +1411,8 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
else
{
t_set_push (&args, $1);
- $$ = sparp_make_builtin_call (sparp_arg, IN_L,
- (SPART **)t_list_to_array (args) /* NOT t_revlist_to_array (args), note special first element pushed */ );
+ $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (SPART *) t_box_num(IN_L),
+ t_list_to_array (args) /* NOT t_revlist_to_array (args), note special first element pushed */ );
}
}
| spar_expn _LT spar_expn { SPAR_BIN_OP ($$, BOP_LT, $1, $3); }
@@ -1722,7 +1461,7 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
else
$$ = $2; }
| _LPAR spar_expn _RPAR { $$ = $2; } /* [58] PrimaryExpn ::= */
- /*... BracketedExpn | BuiltInCall | IRIrefOrFunctionOrMacro */
+ /*... BracketedExpn | BuiltInCall | IRIrefOrFunction */
/*... | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | Var */
| _LPAR ASK_L {
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "scalar ASK subquery");
@@ -1733,14 +1472,14 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
sparp_arg->sparp_allow_aggregates_in_expn <<= 1; }
spar_dataset_clauses_opt
spar_wherebindings_clause
- spar_triple_optionlist_opt _RPAR {
+ _RPAR spar_triple_optionlist_opt {
SPART *subselect_top;
SPART *where_gp;
where_gp = spar_gp_finalize (sparp_arg, NULL);
subselect_top = spar_make_top (sparp_arg, ASK_L, (SPART **)t_list(0), spar_selid_pop (sparp_arg),
where_gp, NULL, NULL, NULL, (SPART *)t_box_num(1), (SPART *)t_box_num(0) );
spar_env_pop (sparp_arg);
- $$ = spar_gp_finalize_with_subquery (sparp_arg, $6, subselect_top);
+ $$ = spar_gp_finalize_with_subquery (sparp_arg, $7, subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
| _LPAR spar_select_query_mode {
SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "scalar subquery");
@@ -1752,7 +1491,7 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
sparp_arg->sparp_allow_aggregates_in_expn |= 1; }
spar_select_rset spar_dataset_clauses_opt
spar_where_clause spar_solution_modifier
- spar_triple_optionlist_opt _RPAR {
+ _RPAR spar_triple_optionlist_opt {
SPART *subselect_top;
SPART *where_gp;
SPART *wm = $7;
@@ -1765,7 +1504,7 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
if (SPAR_REQ_TOP == subselect_top->type)
sparp_expand_top_retvals (sparp_arg, subselect_top, 1 /* safely_copy_all_vars */);
spar_env_pop (sparp_arg);
- $$ = spar_gp_finalize_with_subquery (sparp_arg, $8, subselect_top);
+ $$ = spar_gp_finalize_with_subquery (sparp_arg, $9, subselect_top);
sparp_arg->sparp_allow_aggregates_in_expn >>= 1; }
| spar_ret_agg_call {
$$ = $1;
@@ -1774,132 +1513,82 @@ spar_expn /* [43] Expn ::= ConditionalOrExpn ( 'AS' ( VAR1 | VAR2 ) ) */
if (!(sparp_arg->sparp_allow_aggregates_in_expn & 1))
sparyyerror ("Aggregates are allowed only in result sets"); }
| spar_built_in_call
- | spar_iriref { /* [55*] IRIrefOrFunctionOrMacro ::= (( IRIref ArgList? ) | ( 'MACRO' IRIref ArgList )) */
- SPART *mdef;
- if (!sparp_arg->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp_arg);
- mdef = spar_find_defmacro_by_iri_or_fields (sparp_arg, $1->_.lit.val, NULL);
- $<trees>$ = (SPART **)t_list (2, (ptrlong)(sparp_arg->sparp_macro_mode), mdef);
- if (NULL != mdef)
- {
- if ((SPARP_DEFBODY & sparp_arg->sparp_macro_mode) && (sparp_arg->sparp_current_macro == mdef))
- sparyyerror ("The macro is recursively used in its own definition");
- sparp_arg->sparp_macro_mode |= SPARP_CALLARG;
- } }
- spar_arg_list_opt {
- if (NULL == $3)
+ | spar_iriref spar_arg_list_opt { /* [55] IRIrefOrFunction ::= IRIref ArgList? */
+ if (NULL == $2)
$$ = $1;
else
{
- SPART **args = (SPART **)(((dk_set_t)NIL_L == $3) ? NULL : t_revlist_to_array ($3));
+ SPART **args = (SPART **)(((dk_set_t)NIL_L == $2) ? NULL : t_revlist_to_array ($2));
caddr_t fname = $1->_.lit.val;
- SPART *mdef = ($<trees>2)[1];
- if (NULL != mdef)
- {
- sparp_arg->sparp_macro_mode = (ptrlong)(($<trees>2)[0]);
- $$ = sparp_make_macro_call (sparp_arg, fname, 1, args);
- if (!(sparp_arg->sparp_macro_mode & SPARP_DEFBODY))
- sparp_arg->sparp_macro_call_count++;
- }
- else
- {
spar_verify_funcall_security (sparp_arg, fname, args);
$$ = spar_make_funcall (sparp_arg, 0, fname, args);
- } } }
+ } }
| spar_rdf_literal { $$ = (SPART *)($1); }
| spar_numeric_literal { $$ = (SPART *)($1); }
| spar_boolean_literal { $$ = (SPART *)($1); }
| spar_blank_node
| spar_var
- | spar_macro_call
;
spar_built_in_call /* [52]* BuiltInCall ::= */
- : SPARQL_BIF spar_arg_list {
- SPART **args = (SPART **)(((dk_set_t)NIL_L == $2) ? NULL : t_revlist_to_array ($2));
- if ((SPAR_BIF_REGEX == $1) && (2 == BOX_ELEMENTS (args)))
- $$ = spar_make_regex_or_like_or_eq (sparp_arg, args[0], args[1]);
- else
- $$ = sparp_make_builtin_call (sparp_arg, $1, args); }
- /*... ( 'STR' '(' Expn ')' ) */
- /*... | ( 'sameTERM' '(' Expn ',' Expn ')' ) */
- /*... | ( 'isIRI' '(' Expn ')' ) */
- /*... | ( 'isURI' '(' Expn ')' ) */
- /*... | ( 'isBLANK' '(' Expn ')' ) */
- /*... | ( 'isLITERAL' '(' Expn ')' ) */
- /*... | ( 'REGEX' '(' Expn ',' Expn ( ',' Expn )? ')' ) */
- /*... | ( 'isREF' '(' Expn ')' ) */
- /*... | ( 'LANGMATCHES' '(' Expn ',' Expn ')' ) */
- /*... | ( 'IF' '(' Expn ',' Expn ',' Expn ')' ) */
- /*... | ( 'COALESCE' '(' Expn ( ',' Expn )* ')' ) */
- | IRI_L _LPAR spar_expn _RPAR /*... | ( 'IRI' '(' Expn ')' ) */
- { $$ = sparp_make_builtin_call (sparp_arg, IRI_L, (SPART **)t_list (1, $3)); }
+ : STR_L _LPAR spar_expn _RPAR /*... ( 'STR' '(' Expn ')' ) */
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)STR_L, t_list (1, $3)); }
| LANG_L _LPAR spar_expn _RPAR /*... | ( 'LANG' '(' Expn ')' ) */
- { $$ = sparp_make_builtin_call (sparp_arg, LANG_L, (SPART **)t_list (1, $3)); }
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)LANG_L, t_list (1, $3)); }
+ | LANGMATCHES_L _LPAR spar_expn _COMMA spar_expn _RPAR /*... | ( 'LANGMATCHES' '(' Expn ',' Expn ')' ) */
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)LANGMATCHES_L, t_list (2, $3, $5)); }
| DATATYPE_L _LPAR spar_expn _RPAR /*... | ( 'DATATYPE' '(' Expn ')' ) */
- { $$ = sparp_make_builtin_call (sparp_arg, DATATYPE_L, (SPART **)t_list (1, $3)); }
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)DATATYPE_L, t_list (1, $3)); }
| BOUND_L _LPAR spar_var _RPAR /*... | ( 'BOUND' '(' Var ')' ) */
- { $$ = sparp_make_builtin_call (sparp_arg, BOUND_L, (SPART **)t_list (1, $3)); }
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)BOUND_L, t_list (1, $3)); }
+ | SAMETERM_L _LPAR spar_expn _COMMA spar_expn _RPAR /*... | ( 'sameTERM' '(' Expn ',' Expn ')' ) */
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)SAMETERM_L, t_list (2, $3, $5)); }
+ | isIRI_L _LPAR spar_expn _RPAR /*... | ( 'isIRI' '(' Expn ')' ) */
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isIRI_L, t_list (1, $3)); }
+ | isURI_L _LPAR spar_expn _RPAR /*... | ( 'isURI' '(' Expn ')' ) */
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isURI_L, t_list (1, $3)); }
+ | isBLANK_L _LPAR spar_expn _RPAR /*... | ( 'isBLANK' '(' Expn ')' ) */
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isBLANK_L, t_list (1, $3)); }
+ | isLITERAL_L _LPAR spar_expn _RPAR /*... | ( 'isLITERAL' '(' Expn ')' ) */
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isLITERAL_L, t_list (1, $3)); }
+ | spar_built_in_regex /*... | RegexExpn */
+ | IRI_L /*... | ( 'IRI' '(' Expn ')' ) */
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "IRI (built-in call)"); }
+ _LPAR spar_expn _RPAR
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)IRI_L, t_list (1, $4)); }
+ | isREF_L /*... | ( 'isREF' '(' Expn ')' ) */
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_BI, "isREF (built-in call)"); }
+ _LPAR spar_expn _RPAR
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)isREF_L, t_list (1, $4)); }
+ | IF_L _LPAR spar_expn _COMMA spar_expn _COMMA spar_expn _RPAR /*... | ( 'IF' '(' Expn ',' Expn ',' Expn ')' ) */
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "IF (built-in call)");
+ $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)IF_L, t_list (3, $3, $5, $7)); }
+ | COALESCE_L _LPAR spar_expns _RPAR /*... | ( 'COALESCE' '(' Expn ( ',' Expn )* ')' ) */
+ { SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "COALESCE (built-in call)");
+ $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)COALESCE_L, t_revlist_to_array ($3)); }
+ ;
+
+spar_built_in_regex /* [53] RegexExpn ::= 'REGEX' '(' Expn ',' Expn ( ',' Expn )? ')' */
+ : REGEX_L _LPAR spar_expn _COMMA spar_expn _RPAR
+ { $$ = spar_make_regex_or_like_or_eq (sparp_arg, $3, $5); }
+ | REGEX_L _LPAR spar_expn _COMMA spar_expn _COMMA spar_expn _RPAR
+ { $$ = spartlist (sparp_arg, 3, SPAR_BUILT_IN_CALL, (ptrlong)REGEX_L, t_list (3, $3, $5, $7)); }
;
spar_function_call /* [54] FunctionCall ::= IRIref ArgList */
- : spar_iriref {
- SPART *mdef;
- if (!sparp_arg->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp_arg);
- mdef = spar_find_defmacro_by_iri_or_fields (sparp_arg, $1->_.lit.val, NULL);
- $<token_type>$ = sparp_arg->sparp_macro_mode;
- if (NULL != mdef)
- {
- if ((SPARP_DEFBODY & sparp_arg->sparp_macro_mode) && (sparp_arg->sparp_current_macro == mdef))
- sparyyerror ("The macro is recursively used in its own definition");
- sparp_arg->sparp_macro_mode |= SPARP_CALLARG;
- } }
- spar_arg_list {
- SPART **args = (SPART **)(((dk_set_t)NIL_L == $3) ? NULL : t_revlist_to_array ($3));
+ : spar_iriref spar_arg_list {
+ SPART **args = (SPART **)(((dk_set_t)NIL_L == $2) ? NULL : t_revlist_to_array ($2));
caddr_t fname = $1->_.lit.val;
- if (sparp_arg->sparp_macro_mode & SPARP_CALLARG)
- {
- sparp_arg->sparp_macro_mode = $<token_type>2;
- $$ = sparp_make_macro_call (sparp_arg, fname, 1, args);
- if (!(sparp_arg->sparp_macro_mode & SPARP_DEFBODY))
- sparp_arg->sparp_macro_call_count++;
- }
- else
- {
spar_verify_funcall_security (sparp_arg, fname, args);
- $$ = spar_make_funcall (sparp_arg, 0, fname, args);
- } }
+ $$ = spar_make_funcall (sparp_arg, 0, fname, args); }
;
-spar_macro_call /* [Virt] MacroCall ::= 'MACRO' IRIref MacroArgList? */
- : MACRO_L spar_iriref {
- SPART *mdef;
- if (!sparp_arg->sparp_storage_is_set)
- sparp_configure_storage_and_macro_libs (sparp_arg);
- mdef = spar_find_defmacro_by_iri_or_fields (sparp_arg, $2->_.qname.val, NULL);
- if (NULL == mdef)
- sparyyerror ("Undefined macro IRI");
- if ((SPARP_DEFBODY & sparp_arg->sparp_macro_mode) && (sparp_arg->sparp_current_macro == mdef))
- sparyyerror ("The macro is recursively used in its own definition");
- $<token_type>$ = sparp_arg->sparp_macro_mode;
- sparp_arg->sparp_macro_mode |= SPARP_CALLARG; }
- spar_macro_arg_list_opt {
- SPART **args = (SPART **)(((dk_set_t)NIL_L == $4) ? NULL : t_revlist_to_array ($4));
- sparp_arg->sparp_macro_mode = $<token_type>3;
- $$ = sparp_make_macro_call (sparp_arg, $2->_.qname.val, 1, args);
- if (!(sparp_arg->sparp_macro_mode & SPARP_DEFBODY))
- sparp_arg->sparp_macro_call_count++;
- }
- ;
-
-
spar_arg_list_opt /* ::= ArgList? */
: /* empty */ { $$ = NULL; }
- | spar_arg_list
+ | spar_arg_list { $$ = $1; }
;
-spar_arg_list /* [56]* ArgList ::= '(' Expns? ')' */
+spar_arg_list /* [56]* ArgList ::= ( NIL | '(' Expns ')' ) */
: NIL_L { $$ = (dk_set_t)NIL_L; }
| _LPAR _RPAR { $$ = (dk_set_t)NIL_L; }
| _LPAR spar_expns _RPAR { $$ = $2; }
@@ -1912,31 +1601,6 @@ spar_expns /* [Virt] Expns ::= Expn ( ',' Expn )* */
| spar_expns error { sparyyerror ("Comma or ')' expected after function argument"); }
;
-spar_macro_arg_list_opt /* ::= ArgList? */
- : /* empty */ { $$ = NULL; }
- | spar_macro_arg_list
- ;
-
-spar_macro_arg_list /* [Virt] MacroArgList ::= '(' ExpnOrGgps? ')' */
- : NIL_L { $$ = (dk_set_t)NIL_L; }
- | _LPAR _RPAR { $$ = (dk_set_t)NIL_L; }
- | _LPAR spar_expn_or_ggps _RPAR { $$ = $2; }
- ;
-
-spar_expn_or_ggps /* [Virt] ExpnOrGgps ::= ExpnOrGgp ( ',' ExpnOrGgp )* */
- : spar_expn_or_ggp { $$ = NULL; t_set_push (&($$), $1); }
- | spar_expn_or_ggps _COMMA spar_expn_or_ggp { $$ = $1; t_set_push (&($$), $3); }
- | spar_expn_or_ggps _COMMA error { sparyyerror ("Macro argument (an expression or a group pattern) expected after comma"); }
- | spar_expn_or_ggps error { sparyyerror ("Comma or ')' expected after macro argument"); }
- ;
-
-spar_expn_or_ggp /* [Virt] ExpnOrGgp ::= Expn | GroupGraphPattern */
- : spar_expn
- | _LBRA {
- spar_gp_init (sparp_arg, SPAR_MACROPU); }
- spar_gp _RBRA { $$ = spar_gp_finalize (sparp_arg, NULL); }
- ;
-
spar_numeric_literal /* [59] NumericLiteral ::= INTEGER | DECIMAL | DOUBLE */
: SPARQL_INTEGER { $$ = spartlist (sparp_arg, 4, SPAR_LIT, $1, uname_xmlschema_ns_uri_hash_integer, NULL); }
| SPARQL_DECIMAL { $$ = spartlist (sparp_arg, 4, SPAR_LIT, $1, uname_xmlschema_ns_uri_hash_decimal, NULL); }
@@ -1955,7 +1619,7 @@ spar_boolean_literal /* [61] BooleanLiteral ::= 'true' | 'false' */
;
spar_iriref_or_star_or_default
- : spar_iriref
+ : spar_iriref { $$ = $1; }
| _STAR { $$ = (SPART *)((ptrlong)_STAR); }
| DEFAULT_L { $$ = (SPART *)((ptrlong)DEFAULT_L); }
;
@@ -1983,7 +1647,7 @@ spar_arrow_iriref
spar_iriref /* [63] IRIref ::= Q_IRI_REF | QName */
: Q_IRI_REF { $$ = spartlist (sparp_arg, 2, SPAR_QNAME, sparp_expand_q_iri_ref (sparp_arg, $1)); }
- | spar_qname
+ | spar_qname { $$ = $1; }
;
spar_qname /* [64] QName ::= QNAME | QNAME_NS */
@@ -1998,12 +1662,12 @@ spar_blank_node /* [65]* BlankNode ::= BLANK_NODE_LABEL | ( '[' ']' ) */
/* PART 1a. SPARUL */
-spar_sparul_action_or_drop_macro_libs
- : spar_sparul_action_or_drop_macro_lib { $$ = NULL; t_set_push (&($$), $1); }
- | spar_sparul_action_or_drop_macro_libs spar_sparul_action_or_drop_macro_lib { $$ = $1; t_set_push (&($$), $2); }
+spar_sparul_actions
+ : spar_sparul_action { $$ = NULL; t_set_push (&($$), $1); }
+ | spar_sparul_actions spar_sparul_action { $$ = $1; t_set_push (&($$), $2); }
;
-spar_sparul_action_or_drop_macro_lib /* [DML] SparulAction ::= */
+spar_sparul_action /* [DML] SparulAction ::= */
/*... CreateAction | DropAction | LoadAction */
/*... | InsertAction | InsertDataAction | DeleteAction | DeleteDataAction */
/*... | ModifyAction | ClearAction */
@@ -2016,18 +1680,12 @@ spar_sparul_action_or_drop_macro_lib /* [DML] SparulAction ::= */
| spar_sparul_load
| spar_sparul_create
| spar_sparul_drop
- | spar_drop_macro_lib
- ;
-
-spar_drop_macro_lib /* [Virt] DropMacroLib ::= 'DROP' 'SILENT'? 'MACRO' 'LIBRARY' PrecodeExpn */
- : DROP_L spar_silent_opt MACRO_L LIBRARY_L spar_precode_expn {
- $$ = spar_make_drop_macro_lib (sparp_arg, $5, $2 /* yes, $2 after $5 */); }
;
spar_sparul_insert /* [DML]* InsertAction ::= */
/*... 'INSERT' ( ( 'IN' | 'INTO ) 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? PrecodeExpn */
/*... ConstructTemplate ( DatasetClause* WhereClause SolutionModifier )? */
- : INSERT_L spar_in_graph_precode {
+ : INSERT_L spar_in_graph_precode_opt {
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
spar_ctor_template spar_action_solution {
@@ -2037,9 +1695,9 @@ spar_sparul_insert /* [DML]* InsertAction ::= */
;
spar_sparul_insertdata /* [DML]* InsertDataAction ::= */
- /*... 'INSERT' 'DATA' ( ( ( 'IN' | 'INTO ) 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? PrecodeExpn )? */
- /*... ConstructTemplate */
- : INSERT_L DATA_L spar_in_graph_precode {
+ /*... 'INSERT' 'DATA' ( ( 'IN' | 'INTO ) 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? */
+ /*... PrecodeExpn ConstructTemplate */
+ : INSERT_L DATA_L spar_in_graph_precode_opt {
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL);
sparp_arg->sparp_in_precode_expn = 2; }
@@ -2054,7 +1712,7 @@ spar_sparul_insertdata /* [DML]* InsertDataAction ::= */
spar_sparul_delete /* [DML]* DeleteAction ::= */
/*... 'DELETE' ( 'FROM' 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? PrecodeExpn */
/*... ConstructTemplate ( DatasetClause* WhereClause SolutionModifier )? */
- : DELETE_L spar_from_graph_precode {
+ : DELETE_L spar_from_graph_precode_opt {
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
spar_ctor_template spar_action_solution {
@@ -2064,9 +1722,9 @@ spar_sparul_delete /* [DML]* DeleteAction ::= */
;
spar_sparul_deletedata /* [DML]* DeleteDataAction ::= */
- /*... 'DELETE' 'DATA' ( ( 'FROM' 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? PrecodeExpn */
- /*... ConstructTemplate */
- : DELETE_L DATA_L spar_from_graph_precode {
+ /*... 'DELETE' 'DATA' ( 'FROM' 'GRAPH' ( 'IDENTIFIED' 'BY' )? )? */
+ /*... PrecodeExpn ConstructTemplate */
+ : DELETE_L DATA_L spar_from_graph_precode_opt {
sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL);
sparp_arg->sparp_in_precode_expn = 2; }
@@ -2079,7 +1737,7 @@ spar_sparul_deletedata /* [DML]* DeleteDataAction ::= */
;
spar_sparul_modify /* [DML]* ModifyAction ::= */
- /*... 'MODIFY' (( 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn )? */
+ /*... 'MODIFY' ( 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn? */
/*... 'DELETE' ConstructTemplate 'INSERT' ConstructTemplate */
/*... ( DatasetClause* WhereClause SolutionModifier )? */
: MODIFY_L spar_graph_precode_opt {
@@ -2092,17 +1750,16 @@ spar_sparul_modify /* [DML]* ModifyAction ::= */
spar_compose_retvals_of_modify (sparp_arg, $$, $2, $5, $7); }
;
-spar_sparul_clear /* [DML]* ClearAction ::= 'CLEAR' 'SILENT'? DropTarget */
- : CLEAR_L spar_silent_opt spar_all_or_named_or_default_or_graph_precode {
- $$ = spar_make_sparul_clear (sparp_arg, $3, $2 /* yes, $2 after $3 */); }
+spar_sparul_clear /* [DML]* ClearAction ::= 'CLEAR' ( 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn )? */
+ : CLEAR_L spar_graph_precode_opt { $$ = spar_make_sparul_clear (sparp_arg, $2); }
;
-spar_sparul_load /* [DML]* LoadAction ::= 'LOAD' 'SILENT'? PrecodeExpn */
+spar_sparul_load /* [DML]* LoadAction ::= 'LOAD' PrecodeExpn */
/*... ( ( 'IN' | 'INTO' ) 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn )? */
- : LOAD_L spar_silent_opt spar_precode_expn {
- $$ = spar_make_sparul_load (sparp_arg, $3, $3, $2); }
- | LOAD_L spar_silent_opt spar_precode_expn spar_in_or_into spar_graph_identified_by_opt spar_precode_expn {
- $$ = spar_make_sparul_load (sparp_arg, $6, $3 /* yes, $3 after $6 */, $2); }
+ : LOAD_L spar_precode_expn {
+ $$ = spar_make_sparul_load (sparp_arg, $2, $2); }
+ | LOAD_L spar_precode_expn spar_in_or_into spar_graph_identified_by_opt spar_precode_expn {
+ $$ = spar_make_sparul_load (sparp_arg, $5, $2 /* yes, $2 after $3 */); }
;
spar_sparul_create /* [DML]* CreateAction ::= 'CREATE' 'SILENT'? 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn */
@@ -2110,9 +1767,9 @@ spar_sparul_create /* [DML]* CreateAction ::= 'CREATE' 'SILENT'? 'GRAPH' ( 'ID
$$ = spar_make_sparul_create (sparp_arg, $4, $2 /* yes, $2 after $4 */); }
;
-spar_sparul_drop /* [DML]* DropAction ::= 'DROP' 'SILENT'? DropTarget */
- : DROP_L spar_silent_opt spar_all_or_named_or_default_or_graph_precode {
- $$ = spar_make_sparul_drop (sparp_arg, $3, $2 /* yes, $2 after $3 */); }
+spar_sparul_drop /* [DML]* DropAction ::= 'DROP' 'SILENT'? 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn */
+ : DROP_L spar_silent_opt spar_graph_identified_by spar_precode_expn {
+ $$ = spar_make_sparul_drop (sparp_arg, $4, $2 /* yes, $2 after $4 */); }
;
spar_action_solution
@@ -2123,39 +1780,21 @@ spar_action_solution
$3->_.wm.where_gp = where_gp; }
;
-spar_in_graph_precode
- : spar_in_or_into spar_graph_identified_by_opt spar_precode_expn { $$ = $3; }
- ;
-
-spar_from_graph_precode
- : FROM_L spar_graph_identified_by_opt spar_precode_expn { $$ = $3; }
- ;
-
-spar_all_or_named_or_default_or_graph_precode /* [DML11] DropTarget ::= (( 'GRAPH' ( 'IDENTIFIED' 'BY' )? PrecodeExpn ) | 'DEFAULT' | 'NAMED' | 'ALL' ) */
- : ALL_L { $$ = (SPART *)ALL_L; }
- | DEFAULT_L { $$ = (SPART *)DEFAULT_L; }
- | NAMED_L { $$ = (SPART *)NAMED_L; }
- | spar_graph_identified_by spar_precode_expn { $$ = $2; }
+spar_in_graph_precode_opt
+ : /* empty */ { $$ = spar_default_sparul_target (sparp_arg, "INTO GRAPH IDENTIFIED BY clause"); }
+ | spar_in_or_into spar_graph_identified_by_opt spar_precode_expn { $$ = $3; }
;
-spar_default_or_graph_precode
- : DEFAULT_L { $$ = (SPART *)DEFAULT_L; }
- | spar_graph_identified_by_opt spar_precode_expn { $$ = $2; }
+spar_from_graph_precode_opt
+ : /* empty */ { $$ = spar_default_sparul_target (sparp_arg, "FROM GRAPH IDENTIFIED BY clause"); }
+ | FROM_L spar_graph_identified_by_opt spar_precode_expn { $$ = $3; }
;
spar_graph_precode_opt
- : /* empty */ { $$ = spar_default_sparul_target (sparp_arg, "GRAPH IDENTIFIED BY clause", 0); }
+ : /* empty */ { $$ = spar_default_sparul_target (sparp_arg, "GRAPH IDENTIFIED BY clause"); }
| spar_graph_identified_by_opt spar_precode_expn { $$ = $2; }
;
-spar_with_graph_precode_opt
- : /* empty */ {}
- | WITH_L spar_graph_identified_by_opt spar_precode_expn spar_sponge_optionlist_opt {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "WITH clause");
- sparp_arg->sparp_env->spare_src.ssrc_graph_set_by_with = $3;
- sparp_make_and_push_new_graph_source (sparp_arg, SPART_GRAPH_FROM, $3, $4); }
- ;
-
spar_in_or_into
: IN_L {}
| INTO_L {}
@@ -2166,70 +1805,6 @@ spar_silent_opt
| SILENT_L { $$ = 1; }
;
-/* Part 1b. SPARQL 1.1 Update */
-
-spar_sparul11_action /* [DML11] Sparul11Action ::= */
- /*... | DeleteInsert11Action | Delete11Action */
- /*... | Copy11Action | Move11Action | Add11Action */
- : spar_sparul11_deleteinsert
- | spar_sparul11_insert
- | spar_sparul11_copymoveadd
- ;
-
-spar_sparul11_deleteinsert /* [DML]* DeleteInsert11Action ::= */
- /*... WithGraph? */
- /*... 'DELETE' ConstructTemplate ( 'INSERT' ConstructTemplate )? */
- /*... ( DatasetClause* WhereClause SolutionModifier )? */
- : DELETE_L {
- $<tree>$ = spar_default_sparul_target (sparp_arg, "SPARQL 1.1 DELETE clause", 1);
- sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
- t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
- spar_ctor_template spar_sparul11_insert_opt
- spar_action_solution {
- if (NULL != $4)
- {
- $$ = spar_make_top_or_special_case_from_wm (sparp_arg, MODIFY_L, NULL,
- spar_selid_pop (sparp_arg), $5 );
- spar_compose_retvals_of_modify (sparp_arg, $$, $<tree>2, $3, $4); }
- else
- {
- $$ = spar_make_top_or_special_case_from_wm (sparp_arg, DELETE_L, NULL,
- spar_selid_pop (sparp_arg), $5 );
- spar_compose_retvals_of_insert_or_delete (sparp_arg, $$, $<tree>2, $3); } }
- ;
-
-spar_sparul11_insert /* [DML]* Insert11Action ::= */
- /*... WithGraph? */
- /*... 'INSERT' ConstructTemplate */
- /*... ( DatasetClause* WhereClause SolutionModifier )? */
- : INSERT_L {
- $<tree>$ = spar_default_sparul_target (sparp_arg, "SPARQL 1.1 INSERT clause", 1);
- sparp_arg->sparp_env->spare_top_retval_selid = spar_selid_push (sparp_arg);
- t_set_push (&(sparp_arg->sparp_env->spare_propvar_sets), NULL); }
- spar_ctor_template
- spar_action_solution {
- $$ = spar_make_top_or_special_case_from_wm (sparp_arg, INSERT_L, NULL,
- spar_selid_pop (sparp_arg), $4 );
- spar_compose_retvals_of_insert_or_delete (sparp_arg, $$, $<tree>2, $3); }
- ;
-
-spar_sparul11_insert_opt
- : /* empty */ { $$ = NULL; }
- | INSERT_L spar_ctor_template { $$ = $2; }
- ;
-
-spar_sparul11_copymoveadd
- : spar_sparul11_copymoveadd_op spar_silent_opt spar_default_or_graph_precode TO_L spar_default_or_graph_precode {
- SPAR_ERROR_IF_UNSUPPORTED_SYNTAX (SSG_SD_SPARQL11, "WITH clause");
- $$ = spar_make_sparul_copymoveadd (sparp_arg, $1, $3, $5, $2 /* yes, $2 after $3 */); }
- ;
-
-spar_sparul11_copymoveadd_op
- : COPY_L { $$ = COPY_L; }
- | MOVE_L { $$ = MOVE_L; }
- | ADD_L { $$ = ADD_L; }
- ;
-
/* PART 2. Quad Map definition statements */
spar_qm_stmts /* ::= QmStmt ('.' QmStmt)* */
@@ -2266,7 +1841,8 @@ spar_qm_create_iol_class /* [Virt] QmCreateIRIorLiteralClass ::= 'CREATE' ( 'I
t_set_push (&(sparp_arg->sparp_created_jsos), $4);
$$ = spar_make_qm_sql (sparp_arg,
((IRI_L == $2) ? "DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FORMAT" : "DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FORMAT"),
- (SPART **)t_list (3, $4, $5, $6), $7 ); }
+ (SPART **)t_list (3, $4, $5, $6), $7 );
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
| CREATE_L spar_iol CLASS_L spar_qm_iriref_const_expn USING_L spar_qm_sqlfunc_header_commalist spar_qm_iol_class_optionlist_opt {
if (dk_set_get_keyword (sparp_arg->sparp_created_jsos, $4, NULL))
spar_error (sparp_arg, "The identifier of %s class %.100s is already used in the previous part of the statement",
@@ -2275,7 +1851,8 @@ spar_qm_create_iol_class /* [Virt] QmCreateIRIorLiteralClass ::= 'CREATE' ( 'I
t_set_push (&(sparp_arg->sparp_created_jsos), $4);
$$ = spar_make_qm_sql (sparp_arg,
((IRI_L == $2) ? "DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FUNCTIONS" : "DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FUNCTIONS"),
- (SPART **)t_list (2, $4, spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ($6))), $7 ); }
+ (SPART **)t_list (2, $4, spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ($6))), $7 );
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
;
spar_qm_drop_iol_class /* [Virt] QmDropIRIorLiteralClass ::= 'DROP' 'SILENT'? ( 'IRI' | 'LITERAL' ) 'CLASS' QmIRIrefConst */
@@ -2285,16 +1862,19 @@ spar_qm_drop_iol_class /* [Virt] QmDropIRIorLiteralClass ::= 'DROP' 'SILENT'?
((IRI_L == $3) ? "IRI" : "literal"), $5);
$$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_CLASS",
(SPART **)t_list (2, $5, $2 /* yes, $2 after $5 */), NULL );
- sparp_jso_push_deleted (sparp_arg, uname_virtrdf_ns_uri_QuadMapFormat , $5); }
+ sparp_jso_push_deleted (sparp_arg, uname_virtrdf_ns_uri_QuadMapFormat , $5);
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
;
spar_qm_create_iri_subclass /* [Virt] QmCreateIRISubclass ::= 'IRI' 'CLASS' QmIRIrefConst 'SUBCLASS' 'OF' QmIRIrefConst */
: MAKE_L IRI_L CLASS_L spar_qm_iriref_const_expn SUBCLASS_L OF_L spar_qm_iriref_const_expn {
$$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DEFINE_SUBCLASS",
- (SPART **)t_list (2, $4, $7), NULL ); }
+ (SPART **)t_list (2, $4, $7), NULL );
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
| MAKE_L spar_qm_iriref_const_expn SUBCLASS_L OF_L spar_qm_iriref_const_expn {
$$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DEFINE_SUBCLASS",
- (SPART **)t_list (2, $2, $5), NULL ); }
+ (SPART **)t_list (2, $2, $5), NULL );
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
;
spar_qm_iol_class_optionlist_opt /* [Virt] QmIRIorLiteralClassOptions ::= 'OPTION' '(' QmIRIorLiteralClassOption (',' QmIRIorLiteralClassOption)* ')' */
@@ -2316,17 +1896,17 @@ spar_qm_iol_class_option_commalist
spar_qm_iol_class_option /* [Virt] QmIRIorLiteralClassOption ::= */
: DATATYPE_L spar_qm_iriref_const_expn { /*... ( 'DATATYPE' QmIRIrefConst ) */
- $$ = (SPART **)t_list (2, t_box_dv_uname_string ("DATATYPE"), t_box_dv_uname_string ($2)); }
+ $$ = t_list (2, t_box_dv_uname_string ("DATATYPE"), t_box_dv_uname_string ($2)); }
| LANG_L SPARQL_STRING { /*... | ( 'LANG' STRING ) */
- $$ = (SPART **)t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ($2)); }
+ $$ = t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ($2)); }
| LANG_L spar_qm_sql_id { /*... | ( 'LANG' STRING ) */
- $$ = (SPART **)t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ($2)); }
+ $$ = t_list (2, t_box_dv_uname_string ("LANG"), t_box_dv_uname_string ($2)); }
| BIJECTION_L { /*... | 'BIJECTION' */
- $$ = (SPART **)t_list (2, t_box_dv_uname_string ("BIJECTION"), (ptrlong)1); }
+ $$ = t_list (2, t_box_dv_uname_string ("BIJECTION"), (ptrlong)1); }
| DEREF_L { /*... | 'DEREF' */
- $$ = (SPART **)t_list (2, t_box_dv_uname_string ("DEREF"), (ptrlong)1); }
+ $$ = t_list (2, t_box_dv_uname_string ("DEREF"), (ptrlong)1); }
| RETURNS_L spar_qm_sprintff_list { /*... | 'RETURNS' STRING ('UNION' STRING)* */
- $$ = (SPART **)t_list (2, t_box_dv_uname_string ("RETURNS"),
+ $$ = t_list (2, t_box_dv_uname_string ("RETURNS"),
spar_make_vector_qm_sql (sparp_arg, (SPART **)t_revlist_to_array ($2)) ); }
;
@@ -2399,14 +1979,14 @@ spar_qm_drop_quad_map_mapping /* [Virt] QmDropQuadMap ::= 'DROP' 'SILENT'? 'Q
$$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_MAPPING",
(SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
(SPART **)t_list (4, t_box_dv_uname_string ("ID"), $5, t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ($2)) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ if (NULL == sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
| DROP_L spar_silent_opt QUAD_L MAP_L spar_graph_identified_by spar_qm_iriref_const_expn {
$$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_MAPPING",
(SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
(SPART **)t_list (4, t_box_dv_uname_string ("GRAPH"), $6, t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ($2)) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ if (NULL == sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
;
spar_qm_drop_mapping /* [Virt] QmDrop ::= 'DROP' 'SLIENT'? ('GRAPH' ('IDENTIFIED' 'BY')?)? QmIRIrefConst */
@@ -2414,14 +1994,14 @@ spar_qm_drop_mapping /* [Virt] QmDrop ::= 'DROP' 'SLIENT'? ('GRAPH' ('IDENTIF
$$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_MAPPING",
(SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
(SPART **)t_list (4, t_box_dv_uname_string ("ID"), $3, t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ($2)) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ if (NULL == sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
| DROP_L spar_silent_opt spar_graph_identified_by spar_qm_iriref_const_expn {
$$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DROP_MAPPING",
(SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
(SPART **)t_list (4, t_box_dv_uname_string ("GRAPH"), $4, t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ($2)) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
+ if (NULL == sparp_env()->spare_storage_name)
+ sparp_jso_push_affected (sparp_arg, uname_virtrdf_ns_uri_QuadStorage); }
;
spar_qm_from_where_list_opt /* [Virt] QmSourceDecl ::= */
@@ -2450,7 +2030,7 @@ spar_qm_text_literal_list_opt
;
spar_qm_text_literal_decl /* [Virt] QmTextLiteral ::= 'TEXT' 'XML'? 'LITERAL' QmSqlCol ( 'OF' QmSqlCol )? QmTextLiteralOptions? */
- : TEXT_L spar_xml_opt LITERAL_L spar_qm_sqlcol spar_of_sqlcol_opt spar_qm_text_literal_options_opt {
+ : TEXT_BL spar_xml_opt LITERAL_L spar_qm_sqlcol spar_of_sqlcol_opt spar_qm_text_literal_options_opt {
spar_qm_add_text_literal (sparp_arg,
sparp_env()->spare_qm_current_table_alias,
$2, $4, $5, $6 ); }
@@ -2458,7 +2038,7 @@ spar_qm_text_literal_decl /* [Virt] QmTextLiteral ::= 'TEXT' 'XML'? 'LITERAL'
spar_xml_opt
: /* empty */ { $$ = NULL; }
- | XML_L { $$ = (caddr_t)((ptrlong)(XML_L)); }
+ | XML_BL { $$ = $1; }
;
spar_of_sqlcol_opt
@@ -2501,40 +2081,12 @@ spar_qm_map_top_dotlist /* ::= QmMapTopOp ( '.' QmMapTopOp )* */
spar_qm_map_top_op {}
;
-spar_qm_map_top_op /* [Virt] QmMapTopOp ::= QmMapOp | QmDropQuadMap | QmDrop | QmAttachMacroLib | QmDetachMacroLib */
+spar_qm_map_top_op /* [Virt] QmMapTopOp ::= QmMapOp | QmDropQuadMap | QmDrop */
: spar_qm_map_op
| spar_qm_drop_mapping {
t_set_push (&(sparp_env()->spare_acc_qm_sqls), $1); }
| spar_qm_drop_quad_map_mapping {
t_set_push (&(sparp_env()->spare_acc_qm_sqls), $1); }
- | spar_qm_attach_macro_lib {
- t_set_push (&(sparp_env()->spare_acc_qm_sqls), $1); }
- | spar_qm_detach_macro_lib {
- t_set_push (&(sparp_env()->spare_acc_qm_sqls), $1); }
- ;
-
-spar_qm_attach_macro_lib /* [Virt] QmAttachMacroLib ::= 'ATTACH' 'MACRO' 'LIBRARY' QmIRIrefConst */
- : ATTACH_L MACRO_L LIBRARY_L spar_qm_iriref_const_expn {
- $$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_ATTACH_MACRO_LIBRARY",
- (SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
- (SPART **)t_list (2, t_box_dv_uname_string ("ID"), $4) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
- ;
-
-spar_qm_detach_macro_lib /* [Virt] QmDetachMacroLib ::= 'DETACH' 'SILENT'? 'MACRO' 'LIBRARY' QmIRIrefConst? */
- : DETACH_L spar_silent_opt MACRO_L LIBRARY_L spar_qm_iriref_const_expn {
- $$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY",
- (SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
- (SPART **)t_list (4, t_box_dv_uname_string ("ID"), $5, t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ($2)) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
- | DETACH_L spar_silent_opt MACRO_L LIBRARY_L {
- $$ = spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY",
- (SPART **)t_list (1, t_box_copy (sparp_env()->spare_storage_name)),
- (SPART **)t_list (2, t_box_dv_uname_string ("SILENT"), (SPART *)t_box_num_nonull ($2)) );
- if (NULL != sparp_env()->spare_storage_name)
- sparp_jso_push_affected (sparp_arg, sparp_env()->spare_storage_name); }
;
spar_qm_map_group /* [Virt] QmMapGroup ::= '{' QmMapOp ( '.' QmMapOp )* '.'? '}' */
@@ -2561,14 +2113,14 @@ spar_qm_map_op /* [Virt] QmMapOp ::= */
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_ATTACH_MAPPING",
(SPART **)t_list (2, t_box_copy (sparp_env()->spare_storage_name), $5),
- t_spartlist_concat ($6, (SPART **)t_list (2, t_box_dv_uname_string ("ID"), $2)) ) ); }
+ (SPART **)t_list_concat ((caddr_t)$6, (caddr_t)t_list (2, t_box_dv_uname_string ("ID"), $2)) ) ); }
| CREATE_L spar_graph_identified_by spar_qm_iriref_const_expn /* note optional 'GRAPH' in previous case */
USING_L STORAGE_L spar_qm_iriref_const_expn spar_qm_options_opt {
spar_qm_push_local (sparp_arg, GRAPH_L, (SPART *)($3), 1);
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
spar_make_qm_sql (sparp_arg, "DB.DBA.RDF_QM_ATTACH_MAPPING",
(SPART **)t_list (2, t_box_copy (sparp_env()->spare_storage_name), $6),
- t_spartlist_concat ($7, (SPART **)t_list (2, t_box_dv_uname_string ("GRAPH"), $3)) ) ); }
+ (SPART **)t_list_concat ((caddr_t)$7, (caddr_t)t_list (2, t_box_dv_uname_string ("GRAPH"), $3)) ) ); }
| spar_qm_named_fields spar_qm_options_opt /*... | ( QmNamedField+ QmOptions? QmMapGroup ) */
_LBRA {
t_set_push (&(sparp_env()->spare_acc_qm_sqls),
@@ -2695,20 +2247,20 @@ spar_qm_obj_language_opt
;
spar_qm_verb /* [Virt] QmVerb ::= QmField | ( '[' ']' ) | 'a' */
- : spar_qm_field
+ : spar_qm_field { $$ = $1; }
| _LSQBRA _RSQBRA { $$ = NULL; }
| a_L { $$ = (SPART *)uname_rdf_ns_uri_type; }
;
spar_qm_field_or_blank /* [Virt] QmFieldOrBlank ::= QmField | ( '[' ']' ) */
- : spar_qm_field
+ : spar_qm_field { $$ = $1; }
| _LSQBRA _RSQBRA { $$ = NULL; }
;
spar_qm_field /* [Virt] QmField ::= */
: spar_qm_iriref_const_expn { $$ = (SPART *)$1; } /* see case below */
- | spar_numeric_literal /*... NumericLiteral */
- | spar_rdf_literal /*... | RdfLiteral */
+ | spar_numeric_literal { $$ = $1; } /*... NumericLiteral */
+ | spar_rdf_literal { $$ = $1; } /*... | RdfLiteral */
| spar_qm_iriref_const_expn /*... | ( QmIRIrefConst ( '(' ( QmSqlCol ( ',' QmSqlCol )* )? ')' )? ) */
_LPAR spar_qm_sqlcol_commalist_opt _RPAR {
$$ = spar_make_qm_value (sparp_arg, $1, (SPART **)t_revlist_to_array ($3)); }
@@ -2718,7 +2270,7 @@ spar_qm_field /* [Virt] QmField ::= */
spar_qm_where_list_opt
: /* empty */ { $$ = NULL; }
- | spar_qm_where_list
+ | spar_qm_where_list { $$ = $1; }
;
spar_qm_where_list
@@ -2762,7 +2314,7 @@ spar_qm_option /* [Virt] QmOption ::= ( 'SOFT'? 'EXCLUSIVE' ) | ( 'ORDER' INT
spar_qm_sqlcol_commalist_opt /* ::= ( QmSqlCol ( ',' QmSqlCol )* )? */
: /* empty */ { $$ = NULL; }
- | spar_qm_sqlcol_commalist
+ | spar_qm_sqlcol_commalist { $$ = $1; }
;
spar_qm_sqlcol_commalist /* ::= QmSqlCol ( ',' QmSqlCol )* */
@@ -2787,7 +2339,7 @@ spar_qm_sqlfunc_arglist /* [Virt] QmSqlfuncArglist ::= '(' ( QmSqlfuncArg ( ',
spar_qm_sqlfunc_arg_commalist_opt /* ::= ( QmSqlfuncArg ( ',' QmSqlfuncArg )* )? */
: /* empty */ { $$ = NULL; }
- | spar_qm_sqlfunc_arg_commalist
+ | spar_qm_sqlfunc_arg_commalist { $$ = $1; }
;
spar_qm_sqlfunc_arg_commalist /* ::= QmSqlfuncArg ( ',' QmSqlfuncArg )* */
@@ -2818,10 +2370,10 @@ spar_qm_sqlcol /* [Virt] QmSqlCol ::= QmSqlId | spar_qm_sql_id */
;
spar_qm_sql_id /* [Virt] QmSqlId ::= PLAIN_ID | 'TEXT' | 'XML' */
- : SPARQL_PLAIN_ID
- | TEXT_L { $$ = t_box_dv_short_string ("TEXT"); }
- | XML_L { $$ = t_box_dv_short_string ("XML"); }
- /*| a_L { $$ = t_box_dv_short_string ("a"); }*/
+ : SPARQL_PLAIN_ID { $$ = $1; }
+ | TEXT_BL { $$ = $1; }
+ | XML_BL { $$ = $1; }
+ /*| a_L { $$ = t_box_dv_short_string ("a"); }*/
;
spar_qm_iriref_const_expn /* [Virt] QmIRIrefConst ::= IRIref | ( 'IRI' '(' String ')' ) */
diff --git a/libsrc/Wi/sparql_qm.c b/libsrc/Wi/sparql_qm.c
index 155ba55..efee178 100644
--- a/libsrc/Wi/sparql_qm.c
+++ b/libsrc/Wi/sparql_qm.c
@@ -1,14 +1,14 @@
/*
* sparql_qm.c
*
- * $Id: sparql_qm.c,v 1.13.2.4 2012/03/08 12:55:36 source Exp $
+ * $Id: sparql_qm.c,v 1.13.2.3 2011/06/11 16:41:47 source Exp $
*
* Quad map description language extension for SPARQL
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sparql_rdb2rdf.c b/libsrc/Wi/sparql_rdb2rdf.c
index ec4ad02..ca70c8f 100644
--- a/libsrc/Wi/sparql_rdb2rdf.c
+++ b/libsrc/Wi/sparql_rdb2rdf.c
@@ -1,12 +1,12 @@
/*
- * $Id: sparql_rdb2rdf.c,v 1.1.2.5 2012/03/08 12:55:36 source Exp $
+ * $Id: sparql_rdb2rdf.c,v 1.1.2.3 2011/06/07 18:53:07 source Exp $
*
* Code genration for triggers that update native RDF data on changes in relational sources
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -57,7 +57,7 @@ If quad map value is specified but not a constant then there's no need to rememb
typedef struct rdb2rdf_blocker_s {
struct rdb2rdf_blocker_s *rrb_next; /*!< Next item in list */
- ccaddr_t rrb_const_vals[SPART_TRIPLE_FIELDS_COUNT]; /*!< Field values. No graph translation here, otherwise xlat can merge merge an exclusive graph is merged with non-exclusive */
+ ccaddr_t rrb_const_vals[SPART_TRIPLE_FIELDS_COUNT]; /*!< Field values */
int rrb_total_eclipse; /*!< Nonzero if total eclipse so no further scan required. For debugging, bits 0x1-0x8 indicate positions of non-constant quad map values */
} rdb2rdf_blocker_t;
@@ -94,8 +94,6 @@ typedef struct rdb2rdf_ctx_s {
dk_set_t rrc_qm_revlist; /*!< Accumulator to build \c rrc_all_qms */
quad_map_t ** rrc_all_qms; /*!< List of all quad maps of the storage (first */
char ** rrc_conflicts_of_qms; /*!< Matrix of RDB2RDF_QMQM_xxx values, one row per quad map (same order as in \c rrc_all_qms), one item per qm-to-qm relation */
- caddr_t * rrc_graph_xlat; /*!< An get_keyword style array of strings; constant graph of RDF View as a key, replacement graph of the dump as a value. Can be NULL. */
- int rrc_graph_xlat_count; /*!< Count of strings (not count of pairs) in rrc_graph_xlat */
int rrc_rule_id_seed; /*!< Value for RULE_ID field of RDF_QUAD_DELETE_QUEUE */
int rrc_rule_count; /*!< Count of rules, if zero then "after delete" code is not needed. */
sparp_t rrc_sparp_stub; /*!< Stub for use its auto-initializable fields in sparp_rvr_intersect_sprintffs() and the like */
@@ -183,21 +181,6 @@ rdb2rdf_pop_rrvs_stack (rdb2rdf_ctx_t *rrc, int expects_empty_after)
}
}
-void
-rrc_tweak_const_with_graph_xlat (rdb2rdf_ctx_t *rrc, ccaddr_t *fld_const_ptr)
-{
- int idx;
- if (NULL == fld_const_ptr[0])
- return;
- if (DV_UNAME != DV_TYPE_OF (fld_const_ptr[0]))
- sqlr_new_error ("22023", "SR637", "A quad map has constant graph that is not an IRI");
- idx = ecm_find_name (fld_const_ptr[0], rrc->rrc_graph_xlat, rrc->rrc_graph_xlat_count/2, 2 * sizeof (caddr_t));
- if (0 <= idx)
- fld_const_ptr[0] = rrc->rrc_graph_xlat [2*idx + 1];
-}
-
-/*! Returns 1 if quad map \c qm does not use table \c table_name in any alias that is keyrefd by resulting quad.
-If 1 is returned then removal of a row in table does not automatically mean removal of some quad made from that row before */
int
rdb2rdf_qm_is_self_multi (quad_map_t *qm, ccaddr_t table_name)
{
@@ -405,26 +388,15 @@ rdb2rdf_calculate_qmqm (rdb2rdf_ctx_t *rrc, rdb2rdf_optree_t *main_optree, int o
/* Optimistic loop */
for (fld_ctr = 0; fld_ctr < SPART_TRIPLE_FIELDS_COUNT; fld_ctr++)
{
- ccaddr_t main_fld_const, other_fld_const;
- dtp_t fld_const_dtp;
- main_fld_const = SPARP_FIELD_CONST_OF_QM(main_qm,fld_ctr);
- if (NULL == main_fld_const)
- continue;
- other_fld_const = SPARP_FIELD_CONST_OF_QM(other_qm,fld_ctr);
- if (NULL == other_fld_const)
- continue;
- fld_const_dtp = DV_TYPE_OF (other_fld_const);
- if (DV_TYPE_OF (main_fld_const) != fld_const_dtp)
- goto disjoin; /* see below */
- if ((SPART_TRIPLE_GRAPH_IDX == fld_ctr) && rrc->rrc_graph_xlat_count)
+ ccaddr_t main_fld_const = SPARP_FIELD_CONST_OF_QM(main_qm,fld_ctr);
+ ccaddr_t other_fld_const = SPARP_FIELD_CONST_OF_QM(other_qm,fld_ctr);
+ if ((NULL != main_fld_const) && (NULL != other_fld_const))
{
- rrc_tweak_const_with_graph_xlat (rrc, &main_fld_const);
- rrc_tweak_const_with_graph_xlat (rrc, &other_fld_const);
- }
if ((DV_TYPE_OF (main_fld_const) != DV_TYPE_OF (other_fld_const)) ||
(DVC_MATCH != cmp_boxes (main_fld_const, other_fld_const, NULL, NULL)) )
goto disjoin; /* see below */
}
+ }
/* Pessimistic loop */
for (fld_ctr = 0; fld_ctr < SPART_TRIPLE_FIELDS_COUNT; fld_ctr++)
{
@@ -437,11 +409,6 @@ rdb2rdf_calculate_qmqm (rdb2rdf_ctx_t *rrc, rdb2rdf_optree_t *main_optree, int o
continue; /* consts are compared in the optimistic loop, so either disjoin is found or there's no need to compare equal values again */
main_fld_qmv = SPARP_FIELD_QMV_OF_QM(main_qm,fld_ctr);
other_fld_qmv = SPARP_FIELD_QMV_OF_QM(other_qm,fld_ctr);
- if ((SPART_TRIPLE_GRAPH_IDX == fld_ctr) && rrc->rrc_graph_xlat_count)
- {
- rrc_tweak_const_with_graph_xlat (rrc, &main_fld_const);
- rrc_tweak_const_with_graph_xlat (rrc, &other_fld_const);
- }
rdb2rdf_set_rvr_by_const_or_qmv (rrc, &main_rvr, main_fld_const, main_fld_qmv);
rdb2rdf_set_rvr_by_const_or_qmv (rrc, &other_rvr, other_fld_const, other_fld_qmv);
sparp_rvr_audit(&(rrc->rrc_sparp_stub), &main_rvr);
@@ -852,8 +819,6 @@ rdb2rdf_qm_codegen (rdb2rdf_ctx_t *rrc, rdb2rdf_optree_t *rro, caddr_t table_nam
continue;
if ((0 != alias_no) && (RDB2RDF_MAX_ALIASES_OF_MAIN_TABLE != alias_no))
continue;
- if ((SPART_TRIPLE_GRAPH_IDX == fld_ctr) && rrc->rrc_graph_xlat_count)
- rrc_tweak_const_with_graph_xlat (rrc, &fld_const);
if ((NULL != rvvs_jso_ptr[0]) && (DV_ARRAY_OF_POINTER != DV_TYPE_OF (rvvs_jso_ptr[0])) &&
(DVC_MATCH == cmp_boxes (rvvs_jso_ptr[0], fld_const, NULL, NULL)) )
continue;
@@ -1094,7 +1059,7 @@ rdb2rdf_optree_codegen (rdb2rdf_ctx_t *rrc, rdb2rdf_optree_t *rro, caddr_t table
{
case RDB2RDF_CODEGEN_INITIAL_SUB_SINGLE:
if (single_use_of_single_main)
- rdb2rdf_qm_codegen (rrc, rro, table_name, opcode, subopcode, prefix, (ccaddr_t)(rro->rro_aliases_of_main_table->data), 0, ssg);
+ rdb2rdf_qm_codegen (rrc, rro, table_name, opcode, subopcode, prefix, rro->rro_aliases_of_main_table->data, 0, ssg);
break;
case RDB2RDF_CODEGEN_INITIAL_SUB_MULTI:
if (!single_use_of_single_main)
@@ -1272,7 +1237,7 @@ next_qm: ;
}
caddr_t
-bif_sparql_rdb2rdf_impl (caddr_t * qst, caddr_t table_name, int opcode, caddr_t *graph_xlat, int rule_id_seed, int only_list_tables)
+bif_sparql_rdb2rdf_impl (caddr_t * qst, caddr_t table_name, int opcode, int rule_id_seed, int only_list_tables)
{
caddr_t storage_name = uname_virtrdf_ns_uri_SyncToQuads;
quad_storage_t *storage = sparp_find_storage_by_name (storage_name);
@@ -1291,41 +1256,6 @@ bif_sparql_rdb2rdf_impl (caddr_t * qst, caddr_t table_name, int opcode, caddr_t
rdb2rdf_optree_t *prev_top_rro = NULL;
memset (&rrc, 0, sizeof (rdb2rdf_ctx_t));
rrc.rrc_rule_id_seed = rule_id_seed;
- if (NULL != graph_xlat)
- {
- rrc.rrc_graph_xlat_count = BOX_ELEMENTS (graph_xlat);
- if (rrc.rrc_graph_xlat_count % 2)
- sqlr_new_error ("22023", "SR639", "Vector of graph IRIs to translate should be of even length, not of length %d", rrc.rrc_graph_xlat_count);
- if (rrc.rrc_graph_xlat_count)
- {
- int ctr, ctrL;
- rrc.rrc_graph_xlat = (caddr_t *)t_alloc_box (rrc.rrc_graph_xlat_count * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
- for (ctr = rrc.rrc_graph_xlat_count; ctr--; /* no step */)
- {
- caddr_t g = graph_xlat[ctr];
- dtp_t g_dtp = DV_TYPE_OF (g);
- if ((DV_STRING != g_dtp) && (DV_UNAME != g_dtp))
- sqlr_new_error ("22023", "SR639", "Graph IRI should be an UTF-8 string or an UNAME");
- rrc.rrc_graph_xlat[ctr] = t_box_dv_uname_string (g);
- }
- /* check + sort by keys */
- for (ctr = 0; ctr < rrc.rrc_graph_xlat_count; ctr += 2)
- {
- for (ctrL = ctr - 2; 0 <= ctrL; ctrL -= 2)
- {
- int cmp = strcmp (rrc.rrc_graph_xlat[ctrL], rrc.rrc_graph_xlat[ctrL+2]);
- if (!cmp)
- sqlr_new_error ("22023", "SR639", "Graph IRI '%.100s' is used twice as a key in array of graph translations", rrc.rrc_graph_xlat[ctr]);
- if (0 < cmp)
- {
- caddr_t swap;
- swap = rrc.rrc_graph_xlat[ctrL]; rrc.rrc_graph_xlat[ctrL] = rrc.rrc_graph_xlat[ctrL+2]; rrc.rrc_graph_xlat[ctrL+2] = swap;
- swap = rrc.rrc_graph_xlat[ctrL+1]; rrc.rrc_graph_xlat[ctrL+1] = rrc.rrc_graph_xlat[ctrL+3]; rrc.rrc_graph_xlat[ctrL+3] = swap;
- }
- }
- }
- }
- }
DO_BOX_FAST (quad_map_t *, qm, qm_ctr, storage->qsUserMaps)
{
rdb2rdf_optree_t *qm_rro = rdb2rdf_create_optree (&rrc, &(rrc.rrc_root_rro), prev_top_rro, qm, table_name);
@@ -1397,20 +1327,17 @@ bif_sparql_rdb2rdf_impl (caddr_t * qst, caddr_t table_name, int opcode, caddr_t
caddr_t
bif_sparql_rdb2rdf_codegen (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, const char *fname)
{
- int argcount = BOX_ELEMENTS (args);
caddr_t table_name = bif_string_arg (qst, args, 0, "sparql_rdb2rdf_codegen");
int opcode = bif_long_range_arg (qst, args, 1, "sparql_rdb2rdf_codegen", RDB2RDF_CODEGEN_EXPLAIN, COUNTOF__RDB2RDF_CODEGEN);
- caddr_t *graph_xlat = ((3 <= argcount) ?
- bif_array_of_pointer_arg (qst, args, 2, "sparql_rdb2rdf_codegen") : NULL );
- int rule_id_seed = (4 <= argcount) ?
- bif_long_arg (qst, args, 3, "sparql_rdb2rdf_codegen") :
+ int rule_id_seed = (3 <= BOX_ELEMENTS (args)) ?
+ bif_long_arg (qst, args, 2, "sparql_rdb2rdf_codegen") :
(adler32_of_buffer ((unsigned char *)table_name, box_length (table_name)-1) ^ opcode);
- return bif_sparql_rdb2rdf_impl (qst, table_name, opcode, graph_xlat, rule_id_seed, 0);
+ return bif_sparql_rdb2rdf_impl (qst, table_name, opcode, rule_id_seed, 0);
}
caddr_t
bif_sparql_rdb2rdf_list_tables (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, const char *fname)
{
int opcode = bif_long_range_arg (qst, args, 0, "sparql_rdb2rdf_list_tables", RDB2RDF_CODEGEN_EXPLAIN, COUNTOF__RDB2RDF_CODEGEN);
- return bif_sparql_rdb2rdf_impl (qst, NULL, opcode, NULL, 0 /*fake*/, 1);
+ return bif_sparql_rdb2rdf_impl (qst, NULL, opcode, 0 /*fake*/, 1);
}
diff --git a/libsrc/Wi/sparql_sff.c b/libsrc/Wi/sparql_sff.c
index 88cc186..fb03b9e 100644
--- a/libsrc/Wi/sparql_sff.c
+++ b/libsrc/Wi/sparql_sff.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparql_sff.c,v 1.19.2.7 2012/03/08 12:55:36 source Exp $
+ * $Id: sparql_sff.c,v 1.19.2.6 2011/07/19 23:34:42 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/sparql_tree.c b/libsrc/Wi/sparql_tree.c
index 765d472..3b97333 100644
--- a/libsrc/Wi/sparql_tree.c
+++ b/libsrc/Wi/sparql_tree.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparql_tree.c,v 1.21.2.29 2012/03/08 12:55:36 source Exp $
+ * $Id: sparql_tree.c,v 1.21.2.23 2011/05/23 13:44:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -52,51 +52,6 @@ extern "C" {
#define sparp_check_tree(t)
#endif
-#ifndef NDEBUG
-SPART **
-t_spartlist_concat (SPART **list1, SPART **list2)
-{
- return (SPART **)t_list_concat ((caddr_t)list1, (caddr_t)list2);
-}
-#endif
-
-caddr_t *
-t_modify_list (caddr_t *lst, int edit_idx, int delete_len, caddr_t *ins, int ins_len)
-{
- int lst_len = BOX_ELEMENTS_0 ((caddr_t)(lst));
- caddr_t *res;
- t_check_tree (lst);
- if ((0 > edit_idx) || (0 > delete_len) || (edit_idx + delete_len > lst_len))
- GPF_T1 ("t_modify_list(): bad range");
- if ((ins + ins_len > lst) && (ins < lst+lst_len))
- GPF_T1 ("t_modify_list(): overlapping arrays");
- if (delete_len == ins_len)
- {
- memcpy (lst + edit_idx, ins, ins_len * sizeof (caddr_t));
- t_check_tree (lst);
- return lst;
- }
- res = (caddr_t *)t_alloc_box ((lst_len - delete_len + ins_len) * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
- if (edit_idx)
- memcpy (res, lst, edit_idx * sizeof (caddr_t));
- if (ins_len)
- memcpy (res + edit_idx, ins, ins_len * sizeof (caddr_t));
- memcpy (res + edit_idx + ins_len, lst + edit_idx + delete_len, (lst_len - (edit_idx + delete_len)) * sizeof (caddr_t));
- t_check_tree (res);
- return res;
-}
-
-#ifndef NDEBUG
-#define t_modify_spartlist(lst,edit_idx,delete_len,ins,ins_len) ((SPART **)t_modify_list ((caddr_t *)lst, edit_idx, delete_len, (caddr_t *)ins, ins_len))
-#else
-SPART **
-t_modify_spartlist (SPART **lst, int edit_idx, int delete_len, SPART **ins, int ins_len)
-{
- return (SPART **)t_modify_list ((caddr_t *)lst, edit_idx, delete_len, (caddr_t *)ins, ins_len);
-}
-#endif
-
-
/* ROUTINES FOR SPART TREE TRAVERSAL */
int
@@ -158,7 +113,7 @@ scan_for_children:
{
tree_cat = 1;
sub_expns = tree->_.builtin.args;
- sub_expn_count = BOX_ELEMENTS_0 (sub_expns);
+ sub_expn_count = BOX_ELEMENTS (sub_expns);
break;
}
case SPAR_FUNCALL:
@@ -542,504 +497,6 @@ sparp_gp_localtrav_treelist (sparp_t *sparp, SPART **treelist,
END_DO_BOX_FAST;
}
-/* MACRO REWRITING */
-
-void
-spar_macro_xlate_selid (sparp_t *sparp, caddr_t *selid_ptr, spar_mproc_ctx_t *ctx)
-{
- if (NULL == ctx->smpc_defbody_topselid)
- {
- if ((NULL != selid_ptr[0]) && ('@' == selid_ptr[0][0]))
- spar_internal_error (sparp, "spar_" "macro_xlate_selid(): selid not from defm but has '@'");
- return;
- }
- if (NULL == ctx->smpc_context_selid)
- spar_internal_error (sparp, "spar_" "macro_xlate_selid(): no context");
- if ('@' == ctx->smpc_context_selid[0])
- spar_internal_error (sparp, "spar_" "macro_xlate_selid(): context selid has '@'");
- if (!strcmp (selid_ptr[0], ctx->smpc_context_selid))
- return;
- if (!strcmp (selid_ptr[0], ctx->smpc_defbody_topselid))
- {
- selid_ptr[0] = ctx->smpc_context_selid;
- return;
- }
- selid_ptr[0] = t_box_sprintf (100, "%.70s%.20s%.10s", ctx->smpc_mcall->_.macrocall.mname, ctx->smpc_defbody_currselid, selid_ptr[0]);
-}
-
-SPART **
-spar_macroprocess_define_list (sparp_t *sparp, SPART **trees, spar_mproc_ctx_t *ctx)
-{
- int ctr, len = BOX_ELEMENTS_0 (trees);
- for (ctr = 1; ctr < len; ctr += 2)
- {
- SPART ***vallist = (SPART ***)(trees[ctr]);
- int valctr, valcount;
- if (DV_ARRAY_OF_POINTER != DV_TYPE_OF (vallist))
- spar_internal_error (sparp, "spar_" "macroprocess_define_list(): invalid list of values");
- valcount = BOX_ELEMENTS (vallist);
- for (valctr = valcount; valctr--; /* no step */)
- {
- ptrlong valtype = ((ptrlong *)(vallist[valctr]))[0];
- if ((SPAR_VARIABLE == valtype) || (SPAR_MACROPU == valtype))
- {
- vallist[valctr][1] = spar_macroprocess_tree (sparp, vallist[valctr][1], ctx);
- }
- }
- }
- return trees;
-}
-
-SPART **
-spar_macroprocess_treelist (sparp_t *sparp, SPART **trees, int begin_with, spar_mproc_ctx_t *ctx)
-{
- int ctr, len = BOX_ELEMENTS_0 (trees);
- for (ctr = begin_with; ctr < len; ctr++)
- trees[ctr] = spar_macroprocess_tree (sparp, trees[ctr], ctx);
- return trees;
-}
-
-SPART *
-spar_macro_instantiate (sparp_t *sparp, SPART *tree, SPART *defm, SPART *mcall, spar_mproc_ctx_t *ctx)
-{
- SPART *cloned_body = sparp_tree_full_copy (sparp, defm->_.defmacro.body, NULL);
- SPART *res = NULL;
- spar_mproc_ctx_t local_ctx;
- memset (&local_ctx, 0, sizeof (spar_mproc_ctx_t));
- local_ctx.smpc_unictr = (sparp->sparp_unictr)++;
- local_ctx.smpc_context_gp = ctx->smpc_context_gp;
- local_ctx.smpc_context_selid = ctx->smpc_context_selid;
- local_ctx.smpc_defbody_topselid = local_ctx.smpc_defbody_currselid = defm->_.defmacro.selid;
- local_ctx.smpc_defm = defm;
- local_ctx.smpc_mcall = mcall;
- res = spar_macroprocess_tree (sparp, cloned_body, &local_ctx);
- if (SPAR_GP != SPART_TYPE (res))
- return res;
- if ((0 != res->_.gp.subtype) && (DEFMACRO_L != res->_.gp.subtype))
- return res;
- if (0 != BOX_ELEMENTS_0 (res->_.gp.members))
- {
- if (0 == BOX_ELEMENTS_0 (local_ctx.smpc_ins_membs))
- local_ctx.smpc_ins_membs = res->_.gp.members;
- else
- local_ctx.smpc_ins_membs = t_spartlist_concat (res->_.gp.members, local_ctx.smpc_ins_membs);
- }
- if (0 != BOX_ELEMENTS_0 (local_ctx.smpc_ins_membs))
- {
- if (0 == BOX_ELEMENTS_0 (ctx->smpc_ins_membs))
- ctx->smpc_ins_membs = local_ctx.smpc_ins_membs;
- else
- ctx->smpc_ins_membs = t_spartlist_concat (ctx->smpc_ins_membs, local_ctx.smpc_ins_membs);
- }
- if (0 != BOX_ELEMENTS_0 (res->_.gp.filters))
- {
- if (0 == BOX_ELEMENTS_0 (local_ctx.smpc_ins_filts))
- local_ctx.smpc_ins_filts = res->_.gp.filters;
- else
- local_ctx.smpc_ins_filts = t_spartlist_concat (res->_.gp.filters, local_ctx.smpc_ins_filts);
- }
- if (0 != BOX_ELEMENTS_0 (local_ctx.smpc_ins_filts))
- {
- if (0 == BOX_ELEMENTS_0 (ctx->smpc_ins_filts))
- ctx->smpc_ins_filts = local_ctx.smpc_ins_filts;
- else
- ctx->smpc_ins_filts = t_spartlist_concat (ctx->smpc_ins_filts, local_ctx.smpc_ins_filts);
- }
- return NULL;
-}
-
-caddr_t
-spar_macro_sign_inner_varname (sparp_t *sparp, caddr_t vname, spar_mproc_ctx_t *ctx)
-{
- char *tail;
- caddr_t res = t_box_sprintf (100, "%.50s_%.50s_%d", vname, ctx->smpc_mcall->_.macrocall.mname, ctx->smpc_unictr);
- for (tail = res; '\0' != tail[0]; tail++)
- {
- if ((':' == tail[0]) || ('/' == tail[0]) || ('-' == tail[0])) tail[0] = '_';
- }
- return res;
-}
-
-caddr_t
-spar_macroprocess_varname (sparp_t *sparp, SPART *varname_or_macropu, int allow_macro_arg_namesakes, spar_mproc_ctx_t *ctx)
-{
- int param_index;
- SPART *mcall, *argtree;
- if (NULL == varname_or_macropu)
- return NULL;
- mcall = ctx->smpc_mcall;
- if ((DV_STRING == DV_TYPE_OF (varname_or_macropu)) || (DV_UNAME == DV_TYPE_OF (varname_or_macropu)))
- {
- caddr_t varname = (caddr_t)varname_or_macropu;
- int local_ctr;
- if (NULL == mcall)
- return varname;
- DO_BOX_FAST_REV (caddr_t, nm, param_index, ctx->smpc_defm->_.defmacro.paramnames)
- {
- if (strcmp (nm, varname))
- continue;
- if (allow_macro_arg_namesakes)
- goto param_index_found; /* see below */
- else
- spar_internal_error (sparp, "spar_" "macroprocess_varname(): plain varname instead of expected macropu");
- }
- END_DO_BOX_FAST_REV;
- DO_BOX_FAST_REV (caddr_t, nm, local_ctr, ctx->smpc_defm->_.defmacro.localnames)
- {
- if (strcmp (nm, varname))
- continue;
- return spar_macro_sign_inner_varname (sparp, varname, ctx);
- }
- END_DO_BOX_FAST_REV;
- spar_error (sparp, "The variable name '%.100s' in macro '%.100s' is neither argument name nor local name",
- varname, ctx->smpc_defm->_.defmacro.mname );
- return varname; /* Never reached */
- }
- if (SPAR_MACROPU != SPART_TYPE (varname_or_macropu))
- spar_internal_error (sparp, "spar_" "macroprocess_varname(): bad arg");
- if (NULL == mcall)
- spar_internal_error (sparp, "spar_" "macroprocess_varname(): macroprocessing without macro call");
- param_index = varname_or_macropu->_.macropu.pindex;
- if (param_index >= BOX_ELEMENTS (mcall->_.macrocall.argtrees))
- spar_internal_error (sparp, "spar_" "macroprocess_varname(): more macro parameters than macro call args");
-param_index_found:
- argtree = mcall->_.macrocall.argtrees[param_index];
- if (SPAR_VARIABLE != SPART_TYPE (argtree))
- spar_error (sparp, "The argument #%d (?%.100s) of macro '%.100s' should be a plain variable, because it is used as an alias name",
- param_index+1, ctx->smpc_defm->_.defmacro.mname, ctx->smpc_defm->_.defmacro.paramnames[param_index] );
- return argtree->_.var.vname;
-}
-
-SPART *
-spar_macroprocess_tree (sparp_t *sparp, SPART *tree, spar_mproc_ctx_t *ctx)
-{
- int ctr;
- switch (SPART_TYPE (tree))
- {
- case SPAR_GP:
- {
- SPART *saved_gp = ctx->smpc_context_gp;
- caddr_t saved_selid = ctx->smpc_context_selid;
- caddr_t saved_defbody_curselid = ctx->smpc_defbody_currselid;
- if ('@' != tree->_.gp.selid[0]) /* We're outside a defbody (outside macro call at all or in group inside the argument */
- {
- if (NULL == ctx->smpc_defm) /* We're outside a macro call */
- {
- ctx->smpc_context_gp = tree;
- ctx->smpc_context_selid = tree->_.gp.selid;
- }
- }
- else
- ctx->smpc_defbody_currselid = tree->_.gp.selid;
- spar_macro_xlate_selid (sparp, &(tree->_.gp.selid), ctx);
- tree->_.gp.options = spar_macroprocess_treelist (sparp, tree->_.gp.options, 0, ctx);
- switch (tree->_.gp.subtype)
- {
- case SELECT_L:
- {
- SPART *subq = tree->_.gp.subquery;
- spar_macro_xlate_selid (sparp, &(subq->_.req_top.retselid), ctx);
- subq->_.req_top.orig_retvals = spar_macroprocess_treelist (sparp, subq->_.req_top.orig_retvals, 0, ctx);
- subq->_.req_top.retvals = spar_macroprocess_treelist (sparp, subq->_.req_top.retvals, 0, ctx);
- subq->_.req_top.pattern = spar_macroprocess_tree (sparp, subq->_.req_top.pattern, ctx);
- subq->_.req_top.groupings = spar_macroprocess_treelist (sparp, subq->_.req_top.groupings, 0, ctx);
- subq->_.req_top.having = spar_macroprocess_tree (sparp, subq->_.req_top.having, ctx);
- subq->_.req_top.order = spar_macroprocess_treelist (sparp, subq->_.req_top.order, 0, ctx);
- subq->_.req_top.limit = spar_macroprocess_tree (sparp, subq->_.req_top.limit, ctx);
- subq->_.req_top.offset = spar_macroprocess_tree (sparp, subq->_.req_top.offset, ctx);
- break;
- }
- case UNION_L:
- DO_BOX_FAST (SPART *, memb, ctr, tree->_.gp.members)
- {
- tree->_.gp.members[ctr] = spar_macroprocess_tree (sparp, memb, ctx);
- }
- END_DO_BOX_FAST;
- break;
- default:
- {
- SPART **membs = tree->_.gp.members;
- SPART **filts = tree->_.gp.filters;
- int memb_ctr, memb_count = BOX_ELEMENTS (membs);
- int filt_count = BOX_ELEMENTS_0 (filts);
- for (memb_ctr = 0; memb_ctr < memb_count; memb_ctr++)
- {
- SPART *memb = membs[memb_ctr];
- switch (SPART_TYPE (memb))
- {
- case SPAR_MACROCALL:
- {
- caddr_t mname = memb->_.macrocall.mname;
- SPART *defm = spar_find_defmacro_by_iri_or_fields (sparp, mname, NULL);
- int argctr;
- if (SPAR_GP != SPART_TYPE (defm->_.defmacro.body))
- spar_error (sparp, "Macro <%.200s> is expanded into expression but used as part of group pattern", mname);
- if (defm->_.defmacro.subtype)
- {
- int context_graph_type = DEFAULT_L;
- SPART *context_graph = memb->_.macrocall.context_graph;
- if ((NULL != context_graph) && !SPART_IS_DEFAULT_GRAPH_BLANK (context_graph))
- context_graph_type = GRAPH_L;
- if (defm->_.defmacro.subtype != context_graph_type)
- spar_error (sparp, "Macro <%.200s> should be used in context of %s graph but is placed into %s graph pattern", mname,
- ((DEFAULT_L == defm->_.defmacro.subtype) ? "default" : "named"),
- ((DEFAULT_L == context_graph_type) ? "default" : "named") );
- }
- DO_BOX_FAST (SPART *, mcarg, argctr, memb->_.macrocall.argtrees)
- {
- memb->_.macrocall.argtrees[argctr] = spar_macroprocess_tree (sparp, mcarg, ctx);
- }
- END_DO_BOX_FAST;
- spar_macro_instantiate (sparp, tree, defm, memb, ctx);
- tree->_.gp.members = membs = t_modify_spartlist (membs, memb_ctr, 1, ctx->smpc_ins_membs, BOX_ELEMENTS_0 (ctx->smpc_ins_membs));
- ctx->smpc_ins_membs = NULL;
- memb_count = BOX_ELEMENTS (membs);
- memb_ctr--;
- if (BOX_ELEMENTS_0 (ctx->smpc_ins_filts))
- {
- tree->_.gp.filters = filts = t_spartlist_concat (tree->_.gp.filters, ctx->smpc_ins_filts);
- ctx->smpc_ins_filts = NULL;
- }
- filt_count = BOX_ELEMENTS (filts);
- break;
- }
- case SPAR_MACROPU:
- {
- SPART *arg = ctx->smpc_mcall->_.macrocall.argtrees[tree->_.macropu.pindex];
- SPART *arg_copy;
- spar_mproc_ctx_t gparg_ctx;
- if (SPAR_GP != SPART_TYPE (arg))
- spar_error (sparp, "The argument #%d (?%.20s) of macro <%.200s> should be a group pattern",
- tree->_.macropu.pindex, tree->_.macropu.pname, ctx->smpc_mcall->_.macrocall.mname );
- arg_copy = sparp_tree_full_copy (sparp, arg, NULL);
- memset (&gparg_ctx, 0, sizeof (spar_mproc_ctx_t));
- gparg_ctx.smpc_unictr = (sparp->sparp_unictr)++;
- gparg_ctx.smpc_context_gp = tree;
- gparg_ctx.smpc_context_selid = tree->_.gp.selid;
- gparg_ctx.smpc_defbody_topselid = gparg_ctx.smpc_defbody_currselid = arg_copy->_.gp.selid;
- arg_copy = spar_macroprocess_tree (sparp, arg_copy, &gparg_ctx);
- tree->_.gp.members = membs = t_modify_spartlist (membs, memb_ctr, 1, arg_copy->_.gp.members, BOX_ELEMENTS_0 (arg_copy->_.gp.members));
- memb_count = BOX_ELEMENTS (membs);
- memb_ctr--;
- if (BOX_ELEMENTS_0 (arg_copy->_.gp.filters))
- {
- tree->_.gp.filters = filts = t_spartlist_concat (tree->_.gp.filters, arg_copy->_.gp.filters);
- filt_count = BOX_ELEMENTS (filts);
- }
- break;
- }
- default:
- tree->_.gp.members[memb_ctr] = spar_macroprocess_tree (sparp, memb, ctx);
- if (NULL != ctx->smpc_ins_filts)
- {
- if (BOX_ELEMENTS_0 (ctx->smpc_ins_filts))
- {
- tree->_.gp.filters = filts = t_spartlist_concat (tree->_.gp.filters, ctx->smpc_ins_filts);
- ctx->smpc_ins_filts = NULL;
- }
- filt_count = BOX_ELEMENTS (filts);
- }
- break;
- }
- }
- break;
- }
- }
- tree->_.gp.filters = spar_macroprocess_treelist (sparp, tree->_.gp.filters, 0, ctx);
- ctx->smpc_defbody_currselid = saved_defbody_curselid;
- ctx->smpc_context_gp = saved_gp;
- ctx->smpc_context_selid = saved_selid;
- return tree;
- }
- case SPAR_TRIPLE:
- {
- int ctr;
- spar_macro_xlate_selid (sparp, &(tree->_.triple.selid), ctx);
- if (NULL != tree->_.triple.tabid)
- spar_macro_xlate_selid (sparp, &(tree->_.triple.tabid), ctx);
- for (ctr = 0; ctr < SPART_TRIPLE_FIELDS_COUNT; ctr++)
- {
- SPART *fld = tree->_.triple.tr_fields[ctr];
- SPART *new_fld = spar_macroprocess_tree (sparp, fld, ctx);
- int new_fld_type = SPART_TYPE (new_fld);
- switch (new_fld_type)
- {
- case SPAR_VARIABLE: case SPAR_BLANK_NODE_LABEL:
- /* This fails if a variable is made from MACROPU so its selid is selid from smpc_context_gp
- if (strcmp (tree->_.triple.selid, new_fld->_.var.selid) ||
- (NULL != new_fld->_.var.tabid && strcmp (tree->_.triple.tabid, new_fld->_.var.tabid)) )
- spar_internal_error (sparp, "spar_" "macroprocess_tree(): strange macroprocessing of a triple field variable");
- */
- new_fld->_.var.selid = tree->_.triple.selid;
- new_fld->_.var.tabid = tree->_.triple.tabid;
- new_fld->_.var.tr_idx = ctr;
- new_fld->_.var.rvr.rvrRestrictions |= sparp_tr_usage_natural_restrictions[ctr];
- /* no break */
- case SPAR_LIT: case SPAR_QNAME:
- tree->_.triple.tr_fields[ctr] = new_fld;
- break;
- default:
- {
- SPART *local_bnode1, *local_bnode2, *eq_bop;
- spar_selid_push_reused (sparp, tree->_.triple.selid);
- local_bnode1 = spar_make_blank_node (sparp, spar_mkid (sparp, "_:mcall"), 1);
- spar_selid_pop (sparp);
- tree->_.triple.tr_fields[ctr] = local_bnode1;
- local_bnode1->_.var.tr_idx = ctr;
- local_bnode1->_.var.tabid = tree->_.triple.tabid;
- local_bnode2 = sparp_tree_full_copy (sparp, local_bnode1, NULL);
- local_bnode2->_.var.tr_idx = SPART_VAR_OUTSIDE_TRIPLE;
- local_bnode2->_.var.tabid = NULL;
- eq_bop = spartlist (sparp, 3, BOP_EQ, local_bnode2, new_fld);
- ctx->smpc_ins_filts = t_modify_spartlist (ctx->smpc_ins_filts, 0, 0, &eq_bop, 1);
- break;
- }
- }
- }
- for (ctr = 1; ctr < BOX_ELEMENTS_0 (tree->_.triple.options); ctr += 2)
- {
- tree->_.triple.options[ctr] = spar_macroprocess_tree (sparp, tree->_.triple.options[ctr], ctx);
- }
- return tree;
- }
- case SPAR_VARIABLE:
- case SPAR_BLANK_NODE_LABEL:
- spar_macro_xlate_selid (sparp, &(tree->_.var.selid), ctx);
- if (NULL != tree->_.var.tabid)
- spar_macro_xlate_selid (sparp, &(tree->_.var.tabid), ctx);
- if (NULL != ctx->smpc_defm)
- tree->_.var.vname = spar_macro_sign_inner_varname (sparp, tree->_.var.vname, ctx);
- return tree;
- case SPAR_MACROCALL:
- {
- caddr_t mname;
- SPART *defm;
- SPART **context_membs = NULL;
- SPART *res;
- int context_memb_count = 0;
- if (NULL != ctx->smpc_context_gp)
- {
- context_membs = ctx->smpc_context_gp->_.gp.members;
- context_memb_count = BOX_ELEMENTS (context_membs);
- }
- mname = tree->_.macrocall.mname;
- defm = spar_find_defmacro_by_iri_or_fields (sparp, mname, NULL);
- if ((SPAR_GP == SPART_TYPE (defm->_.defmacro.body)) && (SELECT_L != defm->_.defmacro.body->_.gp.subtype))
- spar_error (sparp, "Macro <%.200s> is expanded into group pattern but used as part of expression", mname);
- DO_BOX_FAST (SPART *, mcarg, ctr, tree->_.macrocall.argtrees)
- {
- tree->_.macrocall.argtrees[ctr] = spar_macroprocess_tree (sparp, mcarg, ctx);
- }
- END_DO_BOX_FAST;
- res = spar_macro_instantiate (sparp, tree, defm, tree, ctx);
- if (NULL != ctx->smpc_context_gp)
- {
- ctx->smpc_context_gp->_.gp.members = t_modify_spartlist (context_membs, context_memb_count, 0, ctx->smpc_ins_membs, BOX_ELEMENTS_0 (ctx->smpc_ins_membs));
- ctx->smpc_ins_membs = NULL;
- if (NULL != ctx->smpc_ins_filts)
- {
- ctx->smpc_context_gp->_.gp.filters = t_spartlist_concat (ctx->smpc_context_gp->_.gp.filters, ctx->smpc_ins_filts);
- ctx->smpc_ins_filts = NULL;
- }
- }
- else
- {
- if ((NULL != ctx->smpc_ins_membs) || (NULL != ctx->smpc_ins_filts))
- spar_error (sparp, "A call of macro <%.200s> forms parts oi graph pattern outside any graph pattern", mname);
- }
- return res;
- }
- case SPAR_LIT: case SPAR_QNAME: return tree;
- case ORDER_L:
- tree->_.oby.expn = spar_macroprocess_tree (sparp, tree->_.oby.expn, ctx);
- return tree;
- case SPAR_FUNCALL:
- DO_BOX_FAST (SPART *, arg, ctr, tree->_.funcall.argtrees)
- {
- tree->_.funcall.argtrees[ctr] = spar_macroprocess_tree (sparp, arg, ctx);
- }
- END_DO_BOX_FAST;
- return tree;
- case SPAR_BUILT_IN_CALL:
- DO_BOX_FAST (SPART *, arg, ctr, tree->_.builtin.args)
- {
- tree->_.builtin.args[ctr] = spar_macroprocess_tree (sparp, arg, ctx);
- }
- END_DO_BOX_FAST;
- return tree;
- case BOP_OR: case BOP_AND:
- case BOP_PLUS: case BOP_MINUS: case BOP_TIMES: case BOP_DIV: case BOP_MOD:
- case BOP_EQ: case BOP_NEQ: case BOP_LT: case BOP_LTE: case BOP_GT: case BOP_GTE:
- case BOP_LIKE:
- tree->_.bin_exp.right = spar_macroprocess_tree (sparp, tree->_.bin_exp.right, ctx);
- /* no break; */
- case BOP_NOT:
- tree->_.bin_exp.left = spar_macroprocess_tree (sparp, tree->_.bin_exp.left, ctx);
- return tree;
- case SPAR_ALIAS:
- tree->_.alias.arg = spar_macroprocess_tree (sparp, tree->_.alias.arg, ctx);
- tree->_.alias.aname = spar_macroprocess_varname (sparp, (SPART *)(tree->_.alias.aname), 0, ctx);
- return tree;
- case SPAR_MACROPU:
- {
- int idx = tree->_.macropu.pindex;
- SPART *mcall = ctx->smpc_mcall;
- SPART *argtree, *argcopy;
- if (NULL == mcall)
- spar_internal_error (sparp, "spar_" "macroprocess_tree(): macro parameter without macro call");
- if (idx >= BOX_ELEMENTS (mcall->_.macrocall.argtrees))
- spar_internal_error (sparp, "spar_" "macroprocess_tree(): more macro parameters than macro call args");
- argtree = mcall->_.macrocall.argtrees[idx];
- argcopy = sparp_tree_full_copy (sparp, argtree, ctx->smpc_context_gp);
- return argcopy;
- }
- case SPAR_SERVICE_INV:
- {
- int vctr;
- tree->_.sinv.iri_params = spar_macroprocess_treelist (sparp, tree->_.sinv.iri_params, 0, ctx);
- tree->_.sinv.defines = spar_macroprocess_define_list (sparp, tree->_.sinv.defines, ctx);
- tree->_.sinv.sources = spar_macroprocess_treelist (sparp, tree->_.sinv.sources, 0, ctx);
- if (DV_ARRAY_OF_POINTER == DV_TYPE_OF ((caddr_t)(tree->_.sinv.param_varnames)))
- {
- DO_BOX_FAST_REV (SPART * /* not caddr_t :) */, vname, vctr, tree->_.sinv.param_varnames)
- {
- tree->_.sinv.param_varnames[vctr] = spar_macroprocess_varname (sparp, vname, 1, ctx);
- }
- END_DO_BOX_FAST_REV;
- }
- DO_BOX_FAST_REV (SPART * /* not caddr_t :) */, vname, vctr, tree->_.sinv.rset_varnames)
- {
- tree->_.sinv.rset_varnames[vctr] = spar_macroprocess_varname (sparp, vname, 1, ctx);
- }
- END_DO_BOX_FAST_REV;
- sparp->sparp_query_uses_sinvs++;
- spar_add_service_inv_to_sg (sparp, tree);
- return tree;
- }
- default:
- {
- GPF_T;
-#if 0
- int ctr;
- DO_BOX_FAST (SPART *, sub, ctr, tree)
- {
- ptrlong sub_t;
- if (!(DV_ARRAY_OF_POINTER == DV_TYPE_OF (sub)))
- continue;
- sub_t = sub->type;
- if (!(((sub_t >= SPAR_MIN_TREE_TYPE) && (sub_t <= SPAR_MAX_TREE_TYPE)) || ((sub_t >= BOP_NOT) && (sub_t <= BOP_MOD))))
- continue;
- ((SPART **)tree)[ctr] = spar_macroprocess_tree (sparp, sub, ctx);
- }
- END_DO_BOX_FAST;
-#endif
- return tree;
- }
- }
-
-}
-
-
/* EQUIVALENCE CLASSES */
sparp_equiv_t *
@@ -1697,7 +1154,6 @@ sparp_equiv_merge (sparp_t *sparp, sparp_equiv_t *pri, sparp_equiv_t *sec)
sec->e_var_count = 0;
}
pri->e_replaces_filter |= sec->e_replaces_filter;
- sec->e_replaces_filter = 0;
sparp_rvr_tighten (sparp, &(pri->e_rvr), &(sec->e_rvr), ~0);
pri->e_gspo_uses += sec->e_gspo_uses;
sec->e_gspo_uses = 0;
@@ -2834,7 +2290,7 @@ sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
tgt->_.var.selid = sparp_clone_id (sparp, orig->_.var.selid);
if (NULL != orig->_.var.tabid)
tgt->_.var.tabid = sparp_clone_id (sparp, orig->_.var.tabid);
- /* tgt->_.var.vname = t_box_copy (orig->_.var.vname); */
+ tgt->_.var.vname = t_box_copy (orig->_.var.vname);
sparp_rvr_copy (sparp, &(tgt->_.var.rvr), &(orig->_.var.rvr));
return tgt;
case SPAR_GP:
@@ -2997,7 +2453,7 @@ sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
return tgt;
case SPAR_QM_SQL_FUNCALL:
tgt = (SPART *)t_box_copy ((caddr_t) orig);
- /*tgt->_.qm_sql_funcall.fname = t_box_copy (orig->_.qm_sql_funcall.fname);*/
+ tgt->_.qm_sql_funcall.fname = t_box_copy (orig->_.qm_sql_funcall.fname);
tgt->_.qm_sql_funcall.fixed = (SPART **)t_box_copy ((caddr_t) orig->_.qm_sql_funcall.fixed);
DO_BOX_FAST_REV (SPART *, arg, arg_ctr, orig->_.qm_sql_funcall.fixed)
{
@@ -3015,19 +2471,6 @@ sparp_tree_full_clone_int (sparp_t *sparp, SPART *orig, SPART *parent_gp)
tgt = (SPART *)t_box_copy ((caddr_t) orig);
tgt->_.list.items = sparp_treelist_full_clone_int (sparp, orig->_.list.items, parent_gp);
return tgt;
- case SPAR_DEFMACRO:
- spar_internal_error (sparp, "sparp_" "tree_full_clone_int(): attempt of copying a macro definition");
- return NULL;
- case SPAR_MACROCALL:
- tgt = (SPART *)t_box_copy ((caddr_t) orig);
- /*tgt->_.macrocall.mname = t_box_copy (orig->_.macrocall.mname);*/
- tgt->_.macrocall.argtrees = sparp_treelist_full_clone_int (sparp, orig->_.macrocall.argtrees, parent_gp);
- tgt->_.macrocall.context_graph = sparp_tree_full_clone_int (sparp, orig->_.macrocall.context_graph, parent_gp);
- return tgt;
- case SPAR_MACROPU:
- tgt = (SPART *)t_box_copy ((caddr_t) orig);
- /*tgt->_.macropu.pname = t_box_copy (orig->_.macropu.pname);*/
- return tgt;
/* Add more cases right above this line when introducing more SPAR_nnn constants */
default: break; /* No need to copy names and literals because we will never change them in-place. */
}
@@ -3082,13 +2525,13 @@ sparp_gp_full_clone (sparp_t *sparp, SPART *gp)
SPART *
sparp_tree_full_copy (sparp_t *sparp, const SPART *orig, const SPART *parent_gp)
{
- int defctr, defcount, fld_ctr, eq_idx;
+ int fld_ctr, eq_idx;
SPART *tgt;
switch (SPART_TYPE (orig))
{
case SPAR_ALIAS:
tgt = (SPART *)t_box_copy ((caddr_t) orig);
- tgt->_.alias.aname = (caddr_t)sparp_tree_full_copy (sparp, (SPART *)(orig->_.alias.aname), parent_gp); /* not t_box_copy, because it can be macropu */
+ tgt->_.alias.aname = t_box_copy (orig->_.alias.aname);
tgt->_.alias.arg = sparp_tree_full_copy (sparp, orig->_.alias.arg, parent_gp);
return tgt;
case SPAR_BLANK_NODE_LABEL: case SPAR_VARIABLE:
@@ -3105,9 +2548,7 @@ sparp_tree_full_copy (sparp_t *sparp, const SPART *orig, const SPART *parent_gp)
tgt = (SPART *)t_box_copy ((caddr_t) orig);
tgt->_.gp.members = sparp_treelist_full_copy (sparp, orig->_.gp.members, (SPART *) orig);
tgt->_.gp.filters = sparp_treelist_full_copy (sparp, orig->_.gp.filters, (SPART *) orig);
- tgt->_.gp.subquery = sparp_tree_full_copy (sparp, orig->_.gp.subquery, (SPART *) orig);
tgt->_.gp.equiv_indexes = (ptrlong *)t_box_copy ((caddr_t)(orig->_.gp.equiv_indexes));
- tgt->_.gp.options = sparp_treelist_full_copy (sparp, orig->_.gp.options, (SPART *) orig);
return tgt;
case SPAR_LIT: case SPAR_QNAME: /* case SPAR_QNAME_NS: */
return (SPART *)t_full_box_copy_tree ((caddr_t)orig);
@@ -3168,34 +2609,6 @@ sparp_tree_full_copy (sparp_t *sparp, const SPART *orig, const SPART *parent_gp)
tgt = (SPART *)t_box_copy ((caddr_t) orig);
tgt->_.list.items = sparp_treelist_full_copy (sparp, orig->_.list.items, parent_gp);
return tgt;
- case SPAR_SERVICE_INV:
- tgt = (SPART *)t_box_copy ((caddr_t) orig);
- tgt->_.sinv.iri_params = sparp_treelist_full_copy (sparp, orig->_.sinv.iri_params, parent_gp);
- tgt->_.sinv.param_varnames = (caddr_t *)t_box_copy ((caddr_t)(orig->_.sinv.param_varnames));
- tgt->_.sinv.rset_varnames = (caddr_t *)t_box_copy ((caddr_t)(orig->_.sinv.rset_varnames));
- tgt->_.sinv.defines = (SPART **)t_box_copy ((caddr_t)(orig->_.sinv.defines));
- defcount = BOX_ELEMENTS_0 (tgt->_.sinv.defines);
- for (defctr = 1; defctr < defcount; defctr += 2)
- {
- SPART ***vals = (SPART ***)(t_box_copy ((caddr_t)(orig->_.sinv.defines[defctr])));
- int valctr, valcount = BOX_ELEMENTS_0 (vals);
- tgt->_.sinv.defines[defctr] = (void *)vals;
- for (valctr = valcount; valctr--; /* no step */)
- vals[valctr] = sparp_treelist_full_copy (sparp, vals[valctr], parent_gp);
- }
- tgt->_.sinv.sources = sparp_treelist_full_copy (sparp, orig->_.sinv.sources, parent_gp);
- return tgt;
- case SPAR_DEFMACRO:
- spar_internal_error (sparp, "sparp_" "tree_full_copy(): should not copy macro defs");
- case SPAR_MACROCALL:
- tgt = (SPART *)t_box_copy ((caddr_t) orig);
- tgt->_.macrocall.mname = t_box_copy (orig->_.macrocall.mname);
- tgt->_.macrocall.argtrees = sparp_treelist_full_copy (sparp, orig->_.macrocall.argtrees, parent_gp);
- tgt->_.macrocall.context_graph = sparp_tree_full_copy (sparp, orig->_.macrocall.context_graph, parent_gp);
- return tgt;
- case SPAR_MACROPU:
- tgt = (SPART *)t_box_copy ((caddr_t) orig);
- return tgt;
/* Add more cases right above this line when introducing more SPAR_nnn constants */
default: break; /* No need to copy names and literals because we will never change them in-place. */
}
@@ -3906,6 +3319,7 @@ sparp_find_origin_of_external_var (sparp_t *sparp, SPART *var, int find_exact_sp
{
sparp_equiv_t *esub_eq = SPARP_EQUIV (sparp, subeq_idx);
SPART *esub_gp = esub_eq->e_gp;
+ SPART *rv;
if (SELECT_L != esub_gp->_.gp.subtype)
continue;
esub_res_eq = esub_eq;
@@ -3916,7 +3330,6 @@ sparp_find_origin_of_external_var (sparp_t *sparp, SPART *var, int find_exact_sp
spar_internal_error (sparp, "sparp_" "find_origin_of_external_var(): external source equiv is found, external source var is not");
make_rv:
rv = (SPART *)t_alloc_box (sizeof (SPART), DV_ARRAY_OF_POINTER);
- rv->type = SPAR_RETVAL;
rv->_.retval.equiv_idx = esub_res_eq->e_own_idx;
rv->_.retval.gp = esub_res_gp;
memcpy (&(rv->_.retval.rvr), &(esub_res_eq->e_rvr), sizeof (rdf_val_range_t));
@@ -4272,11 +3685,10 @@ spart_dump_opname (ptrlong opname, int is_op)
case ASC_L: return "ascending order";
case ASK_L: return "ASK result-mode";
case BOUND_L: return "BOUND builtin";
+ case COALESCE_L: return "COALESCE builtin";
case CONSTRUCT_L: return "CONSTRUCT result-mode";
case CREATE_L: return "quad mapping name";
case DATATYPE_L: return "DATATYPE builtin";
- case DEFAULT_L: return "default graph context";
- case DEFMACRO_L: return "DEFMACRO";
case DESC_L: return "descending";
case DESCRIBE_L: return "DESCRIBE result-mode";
case DISTINCT_L: return "SELECT DISTINCT result-mode";
@@ -4284,12 +3696,18 @@ spart_dump_opname (ptrlong opname, int is_op)
case FILTER_L: return "FILTER";
/* case FROM_L: return "FROM"; */
case GRAPH_L: return "GRAPH gp";
+ case IF_L: return "IF conditional builtin";
case IN_L: return "IN";
case IRI_L: return "IRI builtin";
+ case isBLANK_L: return "isBLANK builtin";
+ case isIRI_L: return "isIRI builtin";
+ case isLITERAL_L: return "isLITERAL builtin";
+ case isREF_L: return "isREF builtin";
+ case isURI_L: return "isURI builtin";
case LANG_L: return "LANG builtin";
+ case LANGMATCHES_L: return "LANGMATCHES builtin";
case LIKE_L: return "LIKE";
case LIMIT_L: return "LIMIT";
- case MACRO_L: return "macro invocation";
/* case NAMED_L: return "NAMED"; */
case NIL_L: return "NIL";
case OBJECT_L: return "OBJECT";
@@ -4299,9 +3717,12 @@ spart_dump_opname (ptrlong opname, int is_op)
case ORDER_L: return "ORDER";
case PREDICATE_L: return "PREDICATE";
case PREFIX_L: return "PREFIX";
+ case REGEX_L: return "REGEX builtin";
+ case SAMETERM_L: return "sameTerm builtin";
case SCORE_L: return "SCORE";
case SCORE_LIMIT_L: return "SCORE_LIMIT";
case SELECT_L: return "SELECT result-mode";
+ case STR_L: return "STR builtin";
case SUBJECT_L: return "SUBJECT";
case true_L: return "true boolean";
case UNION_L: return "UNION gp";
@@ -4586,10 +4007,7 @@ spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, in
{
sprintf (buf, "BUILT-IN CALL:");
SES_PRINT (ses, buf);
- if (tree->_.builtin.desc_ofs)
- SES_PRINT (ses, sparp_bif_descs[tree->_.builtin.desc_ofs].sbd_name);
- else
- spart_dump_long ((void *)(tree->_.builtin.btype), ses, -1);
+ spart_dump_long ((void *)(tree->_.builtin.btype), ses, -1);
spart_dump (tree->_.builtin.args, ses, indent+2, "ARGUMENT", -2);
break;
}
@@ -4772,8 +4190,7 @@ spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, in
default: GPF_T;
}
SES_PRINT (ses, buf);
- if (NULL != tree->_.graph.iri)
- spart_dump (tree->_.graph.iri, ses, indent+2, "IRI", 0);
+ spart_dump (tree->_.graph.iri, ses, indent+2, "IRI", 0);
if (NULL != tree->_.graph.expn)
spart_dump (tree->_.graph.expn, ses, indent+2, "EXPN", 0);
break;
@@ -4792,38 +4209,6 @@ spart_dump (void *tree_arg, dk_session_t *ses, int indent, const char *title, in
spart_dump (tree->_.list.items, ses, indent+2, "ITEMS", -2);
break;
}
- case SPAR_DEFMACRO:
- {
- int namectr, namecount;
- spart_dump (tree->_.defmacro.mname, ses, indent+2, "DEFINITION OF MACRO NAME", 0);
- spart_dump (tree->_.defmacro.quad_pattern, ses, indent+2, "QUAD PATTERN ITEMS", -2);
- namecount = BOX_ELEMENTS_0 (tree->_.defmacro.paramnames);
- for (namectr = 0; namectr < namecount; namectr++)
- spart_dump (tree->_.defmacro.paramnames[namectr], ses, indent+2, "PARAMETER", 0);
- namecount = BOX_ELEMENTS_0 (tree->_.defmacro.localnames);
- for (namectr = 0; namectr < namecount; namectr++)
- spart_dump (tree->_.defmacro.localnames[namectr], ses, indent+2, "LOCAL VAR", 0);
- spart_dump (tree->_.defmacro.body, ses, indent+2, "BODY", -1);
- if (tree->_.defmacro.aggregate_count)
- spart_dump ((void *)(tree->_.defmacro.aggregate_count), ses, indent+2, "AGGREGATE COUNT", 0);
- break;
- }
- case SPAR_MACROCALL:
- {
- int argctr, argcount = BOX_ELEMENTS (tree->_.macrocall.argtrees);
- sprintf (buf, "MACRO <%.50s> CALL, id %s", tree->_.macrocall.mname, tree->_.macrocall.mid);
- SES_PRINT (ses, buf);
- spart_dump (tree->_.macrocall.argtrees, ses, indent+2, "CONTEXT GRAPH", -1);
- for (argctr = 0; argctr < argcount; argctr++)
- spart_dump (tree->_.macrocall.argtrees[argctr], ses, indent+2, "ARGUMENT", -1);
- break;
- }
- case SPAR_MACROPU:
- {
- sprintf (buf, "MACRO PARAM %s (#%ld), type %ld\n", tree->_.macropu.pname, (long)(tree->_.macropu.pindex), (long)(tree->_.macropu.pumode));
- SES_PRINT (ses, buf);
- break;
- }
default:
{
sprintf (buf, "NODE OF TYPE %ld (", (ptrlong)(tree->type));
diff --git a/libsrc/Wi/sparqld.c b/libsrc/Wi/sparqld.c
index ea61944..059508b 100644
--- a/libsrc/Wi/sparqld.c
+++ b/libsrc/Wi/sparqld.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparqld.c,v 1.8.2.24 2012/03/08 12:55:36 source Exp $
+ * $Id: sparqld.c,v 1.8.2.21 2011/07/19 23:38:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -172,6 +172,7 @@ ssg_sd_opname (ptrlong opname, int is_op)
case ASC_L: return "ASC";
case ASK_L: return "ASK";
case BOUND_L: return "BOUND";
+ case COALESCE_L: return "COALESCE";
case CONSTRUCT_L: return "CONSTRUCT";
/*case CREATE_L: return "quad mapping name";*/
case DATATYPE_L: return "DATATYPE";
@@ -182,9 +183,15 @@ ssg_sd_opname (ptrlong opname, int is_op)
case FILTER_L: return "FILTER";
/* case FROM_L: return "FROM"; */
/* case GRAPH_L: return "GRAPH"; */
+ case IF_L: return "IF";
case IN_L: return "IN";
case IRI_L: return "IRI";
+ case isBLANK_L: return "isBLANK";
+ case isIRI_L: return "isIRI";
+ case isLITERAL_L: return "isLITERAL";
+ case isURI_L: return "isIRI"; /* no isURI in SPARQL */
case LANG_L: return "LANG";
+ case LANGMATCHES_L: return "LANGMATCHES";
case LIKE_L: return "LIKE";
case LIMIT_L: return "LIMIT";
/* case NAMED_L: return "FROM NAMED"; */
@@ -196,9 +203,12 @@ ssg_sd_opname (ptrlong opname, int is_op)
case ORDER_L: return "ORDER";
/* case PREDICATE_L: return "PREDICATE"; */
/* case PREFIX_L: return "PREFIX"; */
+ case REGEX_L: return "REGEX";
+ case SAMETERM_L: return "sameTerm";
case SCORE_L: return "SCORE";
case SCORE_LIMIT_L: return "SCORE_LIMIT";
case SELECT_L: return "SELECT";
+ case STR_L: return "STR";
/* case SUBJECT_L: return "SUBJECT"; */
case true_L: return "true";
case UNION_L: return "UNION";
@@ -281,7 +291,7 @@ ssg_sdprin_varname (spar_sqlgen_t *ssg, ccaddr_t vname)
if (!(SSG_SD_GLOBALS & ssg->ssg_sd_flags))
spar_error (ssg->ssg_sparp, "%.100s does not support SPARQL-BI extensions (like external parameters) so SPARQL query can not be composed", ssg->ssg_sd_service_name);
}
- else if ((/* strchr (vname, '_') || --- Bug 14613 */ strchr (vname, '"') || strchr (vname, ':')) && !(SSG_SD_BI & ssg->ssg_sd_flags))
+ else if ((strchr (vname, '_') || strchr (vname, '"') || strchr (vname, ':')) && !(SSG_SD_BI & ssg->ssg_sd_flags))
spar_error (ssg->ssg_sparp, "%.100s does not support SPARQL-BI extensions (say, SQL-like names of variables) so SPARQL query can not be composed", ssg->ssg_sd_service_name);
ssg_putchar ('?');
ssg_puts (vname);
@@ -509,10 +519,8 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
ssg->ssg_indent -= 2;
}
return;
- default:
- {
- const sparp_bif_desc_t *sbd = sparp_bif_descs + tree->_.builtin.desc_ofs;
- ssg_puts (sbd->sbd_name);
+ }
+ ssg_puts (ssg_sd_opname (tree->_.builtin.btype, 0));
ssg_putchar ('(');
ssg->ssg_indent++;
ssg_sdprint_tree_list (ssg, tree->_.builtin.args, ',');
@@ -520,8 +528,6 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
ssg->ssg_indent--;
return;
}
- }
- }
case SPAR_FUNCALL:
{
caddr_t fname = tree->_.funcall.qname;
@@ -1041,8 +1047,6 @@ void ssg_sdprint_tree (spar_sqlgen_t *ssg, SPART *tree)
}
case SPAR_GRAPH:
{
- if (NULL == tree->_.graph.iri)
- spar_error (ssg->ssg_sparp, "%.100s can be invoked only with constant graphs in FROM... clauses so SPARQL query can not be composed", ssg->ssg_sd_service_name);
switch (tree->_.graph.subtype)
{
case SPART_GRAPH_FROM:
diff --git a/libsrc/Wi/sparqlwords.gperf b/libsrc/Wi/sparqlwords.gperf
deleted file mode 100644
index f4858cf..0000000
--- a/libsrc/Wi/sparqlwords.gperf
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * $Id: sparqlwords.gperf,v 1.1.2.3 2012/03/02 23:57:50 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-struct sparql_keyword { char *kwd; int token; int subtype; };
-
-%%
-"ABS", SPARQL_BIF , SPAR_BIF_ABS
-"ADD", ADD_L , 0
-"ALL", ALL_L , 0
-"ALTER", ALTER_L , 0
-"AND", _AMP_AMP , 0
-"AS", AS_L , 0
-"ASC", ASC_L , 0
-"ASK", ASK_L , 0
-"ATTACH", ATTACH_L , 0
-"AVG", AVG_L , 0
-"BASE", BASE_L , 0
-"BINDINGS", BINDINGS_L , 0
-"BIJECTION", BIJECTION_L , 0
-"BNODE", SPARQL_BIF , SPAR_BIF_BNODE
-"BOUND", BOUND_L , 0
-"BY", BY_L , 0
-"CLASS", CLASS_L , 0
-"CLEAR", CLEAR_L , 0
-"CEIL", SPARQL_BIF , SPAR_BIF_CEIL
-"COALESCE", SPARQL_BIF , SPAR_BIF_COALESCE
-"CONCAT", SPARQL_BIF , SPAR_BIF_CONCAT
-"CONSTRUCT", CONSTRUCT_L , 0
-"CONTAINS", SPARQL_BIF , SPAR_BIF_CONTAINS
-"COPY", COPY_L , 0
-"COUNT", COUNT_L , 0
-"CREATE", CREATE_L , 0
-"DATA", DATA_L , 0
-"DATATYPE", DATATYPE_L , 0
-"DAY", SPARQL_BIF , SPAR_BIF_DAY
-"DEFAULT", DEFAULT_L , 0
-"DEFINE", DEFINE_L , 0
-"DEFMACRO", DEFMACRO_L , 0
-"DELETE", DELETE_L , 0
-"DEREF", DEREF_L , 0
-"DESC", DESC_L , 0
-"DESCRIBE", DESCRIBE_L , 0
-"DETACH", DETACH_L , 0
-"DISTINCT", DISTINCT_L , 0
-"DROP", DROP_L , 0
-"ENCODE_FOR_URI", SPARQL_BIF , SPAR_BIF_ENCODE_FOR_URI
-"EXCLUSIVE", EXCLUSIVE_L , 0
-"EXISTS", EXISTS_L , 0
-"FALSE", false_L , 0
-"FILTER", FILTER_L , 0
-"FLOOR", SPARQL_BIF , SPAR_BIF_FLOOR
-"FROM", FROM_L , 0
-"FUNCTION", FUNCTION_L , 0
-"HOURS", SPARQL_BIF , SPAR_BIF_HOURS
-"GRAPH", GRAPH_L , 0
-"GROUP", GROUP_L , 0
-"HAVING", HAVING_L , 0
-"IF", SPARQL_BIF , SPAR_BIF_IF
-"IFP", IFP_L , 0
-"IDENTIFIED", IDENTIFIED_L , 0
-"IN", IN_L , 0
-"INDEX", INDEX_L , 0
-"INFERENCE", INFERENCE_L , 0
-"INSERT", INSERT_L , 0
-"INTO", INTO_L , 0
-"IRI", IRI_L , 0
-"ISBLANK", SPARQL_BIF , SPAR_BIF_ISBLANK
-"ISIRI", SPARQL_BIF , SPAR_BIF_ISIRI
-"ISLITERAL", SPARQL_BIF , SPAR_BIF_ISLITERAL
-"ISNUMERIC", SPARQL_BIF , SPAR_BIF_ISNUMERIC
-"ISREF", SPARQL_BIF , SPAR_BIF_ISREF
-"ISURI", SPARQL_BIF , SPAR_BIF_ISURI
-"LANG", LANG_L , 0
-"LANGMATCHES", SPARQL_BIF , SPAR_BIF_LANGMATCHES
-"LCASE", SPARQL_BIF , SPAR_BIF_LCASE
-"LIBRARY", LIBRARY_L , 0
-"LIKE", LIKE_L , 0
-"LIMIT", LIMIT_L , 0
-"LITERAL", LITERAL_L , 0
-"LOCAL", LOCAL_L , 0
-"LOAD", LOAD_L , 0
-"MACRO", MACRO_L , 0
-"MAKE", MAKE_L , 0
-"MAP", MAP_L , 0
-"MAX", MAX_L , 0
-"MD5", SPARQL_BIF , SPAR_BIF_MD5
-"MIN", MIN_L , 0
-"MINUS", MINUS_L , 0
-"MINUTES", SPARQL_BIF , SPAR_BIF_MINUTES
-"MODIFY", MODIFY_L , 0
-"MONTH", SPARQL_BIF , SPAR_BIF_MONTH
-"MOVE", MOVE_L , 0
-"NAMED", NAMED_L , 0
-"NIL", NIL_L , 0
-"NOT", NOT_L , 0
-"NOW", SPARQL_BIF , SPAR_BIF_NOW
-"NULL", NULL_L , 0
-"OBJECT", OBJECT_L , 0
-"OF", OF_L , 0
-"OFFBAND", OFFBAND_L , 0
-"OFFSET", OFFSET_L , 0
-"OPTIONAL", OPTIONAL_L , 0
-"OPTION", OPTION_L , 0
-"OR", _BAR_BAR , 0
-"ORDER", ORDER_L , 0
-"PREDICATE", PREDICATE_L , 0
-"PREFIX", PREFIX_L , 0
-"QUAD", QUAD_L , 0
-"RAND", SPARQL_BIF , SPAR_BIF_RAND
-"REGEX", SPARQL_BIF , SPAR_BIF_REGEX
-"REDUCED", REDUCED_L , 0
-"REPLACE", SPARQL_BIF , SPAR_BIF_REPLACE
-"RETURNS", RETURNS_L , 0
-"ROUND", SPARQL_BIF , SPAR_BIF_ROUND
-"SCORE", SCORE_L , 0
-"SCORE_LIMIT", SCORE_LIMIT_L , 0
-"SAME_AS", SAME_AS_L , 0
-"SAME_AS_O", SAME_AS_O_L , 0
-"SAME_AS_P", SAME_AS_P_L , 0
-"SAME_AS_S", SAME_AS_S_L , 0
-"SAME_AS_S_O", SAME_AS_S_O_L , 0
-"SAMETERM", SPARQL_BIF , SPAR_BIF_SAMETERM
-"SECONDS", SPARQL_BIF , SPAR_BIF_SECONDS
-"SELECT", SELECT_L , 0
-"SERVICE", SERVICE_L , 0
-"SHA1", SPARQL_BIF , SPAR_BIF_SHA1
-"SHA224", SPARQL_BIF , SPAR_BIF_SHA224
-"SHA256", SPARQL_BIF , SPAR_BIF_SHA256
-"SHA384", SPARQL_BIF , SPAR_BIF_SHA384
-"SHA512", SPARQL_BIF , SPAR_BIF_SHA512
-"SILENT", SILENT_L , 0
-"SOFT", SOFT_L , 0
-"SOURCE", GRAPH_L , 0
-"SQLQUERY", SQLQUERY_L , 0
-"STORAGE", STORAGE_L , 0
-"STR", SPARQL_BIF , SPAR_BIF_STR
-"STRDT", SPARQL_BIF , SPAR_BIF_STRDT
-"STRENDS", SPARQL_BIF , SPAR_BIF_STRENDS
-"STRLANG", SPARQL_BIF , SPAR_BIF_STRLANG
-"STRLEN", SPARQL_BIF , SPAR_BIF_STRLEN
-"STRSTARTS", SPARQL_BIF , SPAR_BIF_STRSTARTS
-"SUBCLASS", SUBCLASS_L , 0
-"SUBJECT", SUBJECT_L , 0
-"SUBSTR", SPARQL_BIF , SPAR_BIF_SUBSTR
-"SUM", SUM_L , 0
-"TABLE_OPTION", TABLE_OPTION_L , 0
-"TEXT", TEXT_L , 0
-"TIMEZONE", SPARQL_BIF , SPAR_BIF_TIMEZONE
-"TO", TO_L , 0
-"TRANSITIVE", TRANSITIVE_L , 0
-"TRUE", true_L , 0
-"TZ", SPARQL_BIF , SPAR_BIF_TZ
-"T_CYCLES_ONLY", T_CYCLES_ONLY_L , 0
-"T_DIRECTION", T_DIRECTION_L , 0
-"T_DISTINCT", T_DISTINCT_L , 0
-"T_END_FLAG", T_END_FLAG_L , 0
-"T_EXISTS", T_EXISTS_L , 0
-"T_FINAL_AS", T_FINAL_AS_L , 0
-"T_IN", T_IN_L , 0
-"T_MAX", T_MAX_L , 0
-"T_MIN", T_MIN_L , 0
-"T_OUT", T_OUT_L , 0
-"T_NO_CYCLES", T_NO_CYCLES_L , 0
-"T_NO_ORDER", T_NO_ORDER_L , 0
-"T_SHORTEST_ONLY", T_SHORTEST_ONLY_L , 0
-"T_STEP", T_STEP_L , 0
-"UCASE", SPARQL_BIF , SPAR_BIF_UCASE
-"UNBOUND", UNBOUND_L , 0
-"UNION", UNION_L , 0
-"URI", SPARQL_BIF , SPAR_BIF_URI
-"USING", USING_L , 0
-"WHERE", WHERE_L , 0
-"WITH", WITH_L , 0
-"XML", XML_L , 0
-"YEAR", SPARQL_BIF , SPAR_BIF_YEAR
diff --git a/libsrc/Wi/sparqlwords.h b/libsrc/Wi/sparqlwords.h
deleted file mode 100644
index 8c90228..0000000
--- a/libsrc/Wi/sparqlwords.h
+++ /dev/null
@@ -1,623 +0,0 @@
-/* ANSI-C code produced by gperf version 3.0.4 */
-/* Command-line: /usr/bin/gperf -aCDGptr -Kkwd -L ANSI-C -k'1,2,3,5,7,$' --ignore-case -Nsparql_lex_hash_kw sparqlwords.gperf */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf at gnu.org>."
-#endif
-
-#line 24 "sparqlwords.gperf"
-struct sparql_keyword { char *kwd; int token; int subtype; };
-
-#define TOTAL_KEYWORDS 169
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 15
-#define MIN_HASH_VALUE 151
-#define MAX_HASH_VALUE 1038
-/* maximum key range = 888, duplicates = 0 */
-
-#ifndef GPERF_DOWNCASE
-#define GPERF_DOWNCASE 1
-static unsigned char gperf_downcase[256] =
- {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
- 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
- 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255
- };
-#endif
-
-#ifndef GPERF_CASE_STRCMP
-#define GPERF_CASE_STRCMP 1
-static int
-gperf_case_strcmp (register const char *s1, register const char *s2)
-{
- for (;;)
- {
- unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
- unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
- if (c1 != 0 && c1 == c2)
- continue;
- return (int)c1 - (int)c2;
- }
-}
-#endif
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (register const char *str, register unsigned int len)
-{
- static const unsigned short asso_values[] =
- {
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 241,
- 171, 1039, 33, 105, 138, 1039, 239, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 239, 5, 85, 56, 114,
- 66, 125, 145, 17, 248, 112, 202, 45, 99, 117,
- 165, 41, 164, 110, 190, 151, 149, 245, 113, 92,
- 64, 1039, 1039, 1039, 1039, 126, 1039, 239, 5, 85,
- 56, 114, 66, 125, 145, 17, 248, 112, 202, 45,
- 99, 117, 165, 41, 164, 110, 190, 151, 149, 245,
- 113, 92, 64, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
- 1039, 1039, 1039, 1039, 1039, 1039
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[6]];
- /*FALLTHROUGH*/
- case 6:
- case 5:
- hval += asso_values[(unsigned char)str[4]];
- /*FALLTHROUGH*/
- case 4:
- case 3:
- hval += asso_values[(unsigned char)str[2]];
- /*FALLTHROUGH*/
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- /*FALLTHROUGH*/
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-static const struct sparql_keyword wordlist[] =
- {
-#line 78 "sparqlwords.gperf"
- {"IF", SPARQL_BIF , SPAR_BIF_IF},
-#line 88 "sparqlwords.gperf"
- {"ISIRI", SPARQL_BIF , SPAR_BIF_ISIRI},
-#line 42 "sparqlwords.gperf"
- {"BY", BY_L , 0},
-#line 81 "sparqlwords.gperf"
- {"IN", IN_L , 0},
-#line 86 "sparqlwords.gperf"
- {"IRI", IRI_L , 0},
-#line 119 "sparqlwords.gperf"
- {"OF", OF_L , 0},
-#line 107 "sparqlwords.gperf"
- {"MIN", MIN_L , 0},
-#line 106 "sparqlwords.gperf"
- {"MD5", SPARQL_BIF , SPAR_BIF_MD5},
-#line 92 "sparqlwords.gperf"
- {"ISURI", SPARQL_BIF , SPAR_BIF_ISURI},
-#line 172 "sparqlwords.gperf"
- {"TZ", SPARQL_BIF , SPAR_BIF_TZ},
-#line 190 "sparqlwords.gperf"
- {"URI", SPARQL_BIF , SPAR_BIF_URI},
-#line 165 "sparqlwords.gperf"
- {"SUM", SUM_L , 0},
-#line 61 "sparqlwords.gperf"
- {"DESC", DESC_L , 0},
-#line 38 "sparqlwords.gperf"
- {"BINDINGS", BINDINGS_L , 0},
-#line 110 "sparqlwords.gperf"
- {"MODIFY", MODIFY_L , 0},
-#line 108 "sparqlwords.gperf"
- {"MINUS", MINUS_L , 0},
-#line 41 "sparqlwords.gperf"
- {"BOUND", BOUND_L , 0},
-#line 72 "sparqlwords.gperf"
- {"FROM", FROM_L , 0},
-#line 82 "sparqlwords.gperf"
- {"INDEX", INDEX_L , 0},
-#line 28 "sparqlwords.gperf"
- {"ADD", ADD_L , 0},
-#line 79 "sparqlwords.gperf"
- {"IFP", IFP_L , 0},
-#line 45 "sparqlwords.gperf"
- {"CEIL", SPARQL_BIF , SPAR_BIF_CEIL},
-#line 169 "sparqlwords.gperf"
- {"TO", TO_L , 0},
-#line 85 "sparqlwords.gperf"
- {"INTO", INTO_L , 0},
-#line 91 "sparqlwords.gperf"
- {"ISREF", SPARQL_BIF , SPAR_BIF_ISREF},
-#line 112 "sparqlwords.gperf"
- {"MOVE", MOVE_L , 0},
-#line 179 "sparqlwords.gperf"
- {"T_IN", T_IN_L , 0},
-#line 124 "sparqlwords.gperf"
- {"OR", _BAR_BAR , 0},
-#line 97 "sparqlwords.gperf"
- {"LIKE", LIKE_L , 0},
-#line 31 "sparqlwords.gperf"
- {"AND", _AMP_AMP , 0},
-#line 40 "sparqlwords.gperf"
- {"BNODE", SPARQL_BIF , SPAR_BIF_BNODE},
-#line 57 "sparqlwords.gperf"
- {"DEFINE", DEFINE_L , 0},
-#line 32 "sparqlwords.gperf"
- {"AS", AS_L , 0},
-#line 50 "sparqlwords.gperf"
- {"COPY", COPY_L , 0},
-#line 27 "sparqlwords.gperf"
- {"ABS", SPARQL_BIF , SPAR_BIF_ABS},
-#line 189 "sparqlwords.gperf"
- {"UNION", UNION_L , 0},
-#line 60 "sparqlwords.gperf"
- {"DEREF", DEREF_L , 0},
-#line 37 "sparqlwords.gperf"
- {"BASE", BASE_L , 0},
-#line 39 "sparqlwords.gperf"
- {"BIJECTION", BIJECTION_L , 0},
-#line 55 "sparqlwords.gperf"
- {"DAY", SPARQL_BIF , SPAR_BIF_DAY},
-#line 64 "sparqlwords.gperf"
- {"DISTINCT", DISTINCT_L , 0},
-#line 152 "sparqlwords.gperf"
- {"SOFT", SOFT_L , 0},
-#line 128 "sparqlwords.gperf"
- {"QUAD", QUAD_L , 0},
-#line 113 "sparqlwords.gperf"
- {"NAMED", NAMED_L , 0},
-#line 65 "sparqlwords.gperf"
- {"DROP", DROP_L , 0},
-#line 80 "sparqlwords.gperf"
- {"IDENTIFIED", IDENTIFIED_L , 0},
-#line 66 "sparqlwords.gperf"
- {"ENCODE_FOR_URI", SPARQL_BIF , SPAR_BIF_ENCODE_FOR_URI},
-#line 105 "sparqlwords.gperf"
- {"MAX", MAX_L , 0},
-#line 103 "sparqlwords.gperf"
- {"MAKE", MAKE_L , 0},
-#line 33 "sparqlwords.gperf"
- {"ASC", ASC_L , 0},
-#line 114 "sparqlwords.gperf"
- {"NIL", NIL_L , 0},
-#line 188 "sparqlwords.gperf"
- {"UNBOUND", UNBOUND_L , 0},
-#line 90 "sparqlwords.gperf"
- {"ISNUMERIC", SPARQL_BIF , SPAR_BIF_ISNUMERIC},
-#line 191 "sparqlwords.gperf"
- {"USING", USING_L , 0},
-#line 168 "sparqlwords.gperf"
- {"TIMEZONE", SPARQL_BIF , SPAR_BIF_TIMEZONE},
-#line 131 "sparqlwords.gperf"
- {"REDUCED", REDUCED_L , 0},
-#line 135 "sparqlwords.gperf"
- {"SCORE", SCORE_L , 0},
-#line 134 "sparqlwords.gperf"
- {"ROUND", SPARQL_BIF , SPAR_BIF_ROUND},
-#line 68 "sparqlwords.gperf"
- {"EXISTS", EXISTS_L , 0},
-#line 111 "sparqlwords.gperf"
- {"MONTH", SPARQL_BIF , SPAR_BIF_MONTH},
-#line 121 "sparqlwords.gperf"
- {"OFFSET", OFFSET_L , 0},
-#line 129 "sparqlwords.gperf"
- {"RAND", SPARQL_BIF , SPAR_BIF_RAND},
-#line 181 "sparqlwords.gperf"
- {"T_MIN", T_MIN_L , 0},
-#line 194 "sparqlwords.gperf"
- {"XML", XML_L , 0},
-#line 83 "sparqlwords.gperf"
- {"INFERENCE", INFERENCE_L , 0},
-#line 70 "sparqlwords.gperf"
- {"FILTER", FILTER_L , 0},
-#line 62 "sparqlwords.gperf"
- {"DESCRIBE", DESCRIBE_L , 0},
-#line 34 "sparqlwords.gperf"
- {"ASK", ASK_L , 0},
-#line 109 "sparqlwords.gperf"
- {"MINUTES", SPARQL_BIF , SPAR_BIF_MINUTES},
-#line 127 "sparqlwords.gperf"
- {"PREFIX", PREFIX_L , 0},
-#line 153 "sparqlwords.gperf"
- {"SOURCE", GRAPH_L , 0},
-#line 84 "sparqlwords.gperf"
- {"INSERT", INSERT_L , 0},
-#line 180 "sparqlwords.gperf"
- {"T_MAX", T_MAX_L , 0},
-#line 63 "sparqlwords.gperf"
- {"DETACH", DETACH_L , 0},
-#line 115 "sparqlwords.gperf"
- {"NOT", NOT_L , 0},
-#line 193 "sparqlwords.gperf"
- {"WITH", WITH_L , 0},
-#line 87 "sparqlwords.gperf"
- {"ISBLANK", SPARQL_BIF , SPAR_BIF_ISBLANK},
-#line 67 "sparqlwords.gperf"
- {"EXCLUSIVE", EXCLUSIVE_L , 0},
-#line 120 "sparqlwords.gperf"
- {"OFFBAND", OFFBAND_L , 0},
-#line 102 "sparqlwords.gperf"
- {"MACRO", MACRO_L , 0},
-#line 167 "sparqlwords.gperf"
- {"TEXT", TEXT_L , 0},
-#line 195 "sparqlwords.gperf"
- {"YEAR", SPARQL_BIF , SPAR_BIF_YEAR},
-#line 104 "sparqlwords.gperf"
- {"MAP", MAP_L , 0},
-#line 101 "sparqlwords.gperf"
- {"LOAD", LOAD_L , 0},
-#line 171 "sparqlwords.gperf"
- {"TRUE", true_L , 0},
-#line 151 "sparqlwords.gperf"
- {"SILENT", SILENT_L , 0},
-#line 164 "sparqlwords.gperf"
- {"SUBSTR", SPARQL_BIF , SPAR_BIF_SUBSTR},
-#line 156 "sparqlwords.gperf"
- {"STR", SPARQL_BIF , SPAR_BIF_STR},
-#line 130 "sparqlwords.gperf"
- {"REGEX", SPARQL_BIF , SPAR_BIF_REGEX},
-#line 143 "sparqlwords.gperf"
- {"SECONDS", SPARQL_BIF , SPAR_BIF_SECONDS},
-#line 74 "sparqlwords.gperf"
- {"HOURS", SPARQL_BIF , SPAR_BIF_HOURS},
-#line 145 "sparqlwords.gperf"
- {"SERVICE", SERVICE_L , 0},
-#line 36 "sparqlwords.gperf"
- {"AVG", AVG_L , 0},
-#line 98 "sparqlwords.gperf"
- {"LIMIT", LIMIT_L , 0},
-#line 118 "sparqlwords.gperf"
- {"OBJECT", OBJECT_L , 0},
-#line 96 "sparqlwords.gperf"
- {"LIBRARY", LIBRARY_L , 0},
-#line 117 "sparqlwords.gperf"
- {"NULL", NULL_L , 0},
-#line 93 "sparqlwords.gperf"
- {"LANG", LANG_L , 0},
-#line 125 "sparqlwords.gperf"
- {"ORDER", ORDER_L , 0},
-#line 52 "sparqlwords.gperf"
- {"CREATE", CREATE_L , 0},
-#line 59 "sparqlwords.gperf"
- {"DELETE", DELETE_L , 0},
-#line 160 "sparqlwords.gperf"
- {"STRLEN", SPARQL_BIF , SPAR_BIF_STRLEN},
-#line 176 "sparqlwords.gperf"
- {"T_END_FLAG", T_END_FLAG_L , 0},
-#line 123 "sparqlwords.gperf"
- {"OPTION", OPTION_L , 0},
-#line 162 "sparqlwords.gperf"
- {"SUBCLASS", SUBCLASS_L , 0},
-#line 175 "sparqlwords.gperf"
- {"T_DISTINCT", T_DISTINCT_L , 0},
-#line 147 "sparqlwords.gperf"
- {"SHA224", SPARQL_BIF , SPAR_BIF_SHA224},
-#line 173 "sparqlwords.gperf"
- {"T_CYCLES_ONLY", T_CYCLES_ONLY_L , 0},
-#line 144 "sparqlwords.gperf"
- {"SELECT", SELECT_L , 0},
-#line 187 "sparqlwords.gperf"
- {"UCASE", SPARQL_BIF , SPAR_BIF_UCASE},
-#line 116 "sparqlwords.gperf"
- {"NOW", SPARQL_BIF , SPAR_BIF_NOW},
-#line 186 "sparqlwords.gperf"
- {"T_STEP", T_STEP_L , 0},
-#line 71 "sparqlwords.gperf"
- {"FLOOR", SPARQL_BIF , SPAR_BIF_FLOOR},
-#line 53 "sparqlwords.gperf"
- {"DATA", DATA_L , 0},
-#line 73 "sparqlwords.gperf"
- {"FUNCTION", FUNCTION_L , 0},
-#line 174 "sparqlwords.gperf"
- {"T_DIRECTION", T_DIRECTION_L , 0},
-#line 44 "sparqlwords.gperf"
- {"CLEAR", CLEAR_L , 0},
-#line 47 "sparqlwords.gperf"
- {"CONCAT", SPARQL_BIF , SPAR_BIF_CONCAT},
-#line 192 "sparqlwords.gperf"
- {"WHERE", WHERE_L , 0},
-#line 51 "sparqlwords.gperf"
- {"COUNT", COUNT_L , 0},
-#line 146 "sparqlwords.gperf"
- {"SHA1", SPARQL_BIF , SPAR_BIF_SHA1},
-#line 69 "sparqlwords.gperf"
- {"FALSE", false_L , 0},
-#line 76 "sparqlwords.gperf"
- {"GROUP", GROUP_L , 0},
-#line 148 "sparqlwords.gperf"
- {"SHA256", SPARQL_BIF , SPAR_BIF_SHA256},
-#line 137 "sparqlwords.gperf"
- {"SAME_AS", SAME_AS_L , 0},
-#line 140 "sparqlwords.gperf"
- {"SAME_AS_S", SAME_AS_S_L , 0},
-#line 43 "sparqlwords.gperf"
- {"CLASS", CLASS_L , 0},
-#line 183 "sparqlwords.gperf"
- {"T_NO_CYCLES", T_NO_CYCLES_L , 0},
-#line 177 "sparqlwords.gperf"
- {"T_EXISTS", T_EXISTS_L , 0},
-#line 138 "sparqlwords.gperf"
- {"SAME_AS_O", SAME_AS_O_L , 0},
-#line 49 "sparqlwords.gperf"
- {"CONTAINS", SPARQL_BIF , SPAR_BIF_CONTAINS},
-#line 141 "sparqlwords.gperf"
- {"SAME_AS_S_O", SAME_AS_S_O_L , 0},
-#line 95 "sparqlwords.gperf"
- {"LCASE", SPARQL_BIF , SPAR_BIF_LCASE},
-#line 46 "sparqlwords.gperf"
- {"COALESCE", SPARQL_BIF , SPAR_BIF_COALESCE},
-#line 77 "sparqlwords.gperf"
- {"HAVING", HAVING_L , 0},
-#line 58 "sparqlwords.gperf"
- {"DEFMACRO", DEFMACRO_L , 0},
-#line 163 "sparqlwords.gperf"
- {"SUBJECT", SUBJECT_L , 0},
-#line 154 "sparqlwords.gperf"
- {"SQLQUERY", SQLQUERY_L , 0},
-#line 149 "sparqlwords.gperf"
- {"SHA384", SPARQL_BIF , SPAR_BIF_SHA384},
-#line 56 "sparqlwords.gperf"
- {"DEFAULT", DEFAULT_L , 0},
-#line 166 "sparqlwords.gperf"
- {"TABLE_OPTION", TABLE_OPTION_L , 0},
-#line 158 "sparqlwords.gperf"
- {"STRENDS", SPARQL_BIF , SPAR_BIF_STRENDS},
-#line 142 "sparqlwords.gperf"
- {"SAMETERM", SPARQL_BIF , SPAR_BIF_SAMETERM},
-#line 178 "sparqlwords.gperf"
- {"T_FINAL_AS", T_FINAL_AS_L , 0},
-#line 139 "sparqlwords.gperf"
- {"SAME_AS_P", SAME_AS_P_L , 0},
-#line 100 "sparqlwords.gperf"
- {"LOCAL", LOCAL_L , 0},
-#line 182 "sparqlwords.gperf"
- {"T_OUT", T_OUT_L , 0},
-#line 126 "sparqlwords.gperf"
- {"PREDICATE", PREDICATE_L , 0},
-#line 75 "sparqlwords.gperf"
- {"GRAPH", GRAPH_L , 0},
-#line 136 "sparqlwords.gperf"
- {"SCORE_LIMIT", SCORE_LIMIT_L , 0},
-#line 185 "sparqlwords.gperf"
- {"T_SHORTEST_ONLY", T_SHORTEST_ONLY_L , 0},
-#line 48 "sparqlwords.gperf"
- {"CONSTRUCT", CONSTRUCT_L , 0},
-#line 29 "sparqlwords.gperf"
- {"ALL", ALL_L , 0},
-#line 157 "sparqlwords.gperf"
- {"STRDT", SPARQL_BIF , SPAR_BIF_STRDT},
-#line 35 "sparqlwords.gperf"
- {"ATTACH", ATTACH_L , 0},
-#line 133 "sparqlwords.gperf"
- {"RETURNS", RETURNS_L , 0},
-#line 184 "sparqlwords.gperf"
- {"T_NO_ORDER", T_NO_ORDER_L , 0},
-#line 155 "sparqlwords.gperf"
- {"STORAGE", STORAGE_L , 0},
-#line 89 "sparqlwords.gperf"
- {"ISLITERAL", SPARQL_BIF , SPAR_BIF_ISLITERAL},
-#line 94 "sparqlwords.gperf"
- {"LANGMATCHES", SPARQL_BIF , SPAR_BIF_LANGMATCHES},
-#line 150 "sparqlwords.gperf"
- {"SHA512", SPARQL_BIF , SPAR_BIF_SHA512},
-#line 132 "sparqlwords.gperf"
- {"REPLACE", SPARQL_BIF , SPAR_BIF_REPLACE},
-#line 161 "sparqlwords.gperf"
- {"STRSTARTS", SPARQL_BIF , SPAR_BIF_STRSTARTS},
-#line 159 "sparqlwords.gperf"
- {"STRLANG", SPARQL_BIF , SPAR_BIF_STRLANG},
-#line 54 "sparqlwords.gperf"
- {"DATATYPE", DATATYPE_L , 0},
-#line 30 "sparqlwords.gperf"
- {"ALTER", ALTER_L , 0},
-#line 99 "sparqlwords.gperf"
- {"LITERAL", LITERAL_L , 0},
-#line 170 "sparqlwords.gperf"
- {"TRANSITIVE", TRANSITIVE_L , 0},
-#line 122 "sparqlwords.gperf"
- {"OPTIONAL", OPTIONAL_L , 0}
- };
-
-static const short lookup[] =
- {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 0, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 1, -1, -1, -1, -1, -1, -1,
- -1, 2, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 3, 4, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 5, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 6, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 7, -1, -1, 8, -1, -1,
- 9, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 10, -1, 11, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 12,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 13, 14, -1, -1, -1, 15, -1, -1, -1,
- 16, -1, -1, -1, -1, -1, 17, -1, -1, -1,
- -1, -1, -1, 18, -1, -1, -1, -1, -1, -1,
- 19, -1, -1, -1, -1, -1, 20, -1, -1, -1,
- -1, -1, 21, -1, -1, -1, 22, 23, 24, 25,
- -1, -1, -1, -1, -1, -1, 26, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 27, -1, 28,
- -1, -1, -1, 29, 30, 31, -1, -1, -1, -1,
- -1, 32, -1, 33, -1, -1, -1, 34, -1, -1,
- 35, 36, 37, -1, -1, -1, -1, -1, -1, -1,
- 38, -1, 39, 40, -1, -1, -1, 41, -1, -1,
- -1, 42, -1, -1, -1, -1, -1, -1, -1, -1,
- 43, -1, -1, -1, -1, -1, 44, -1, -1, 45,
- -1, 46, -1, 47, 48, -1, -1, -1, -1, -1,
- -1, -1, 49, 50, -1, 51, -1, -1, -1, 52,
- -1, -1, -1, 53, -1, -1, -1, 54, 55, -1,
- -1, -1, -1, -1, -1, 56, -1, -1, -1, 57,
- 58, -1, -1, -1, -1, -1, 59, -1, -1, 60,
- -1, -1, 61, -1, 62, 63, -1, -1, 64, 65,
- -1, 66, -1, -1, -1, -1, 67, -1, 68, 69,
- -1, -1, -1, 70, -1, -1, 71, -1, -1, -1,
- -1, -1, 72, -1, -1, -1, 73, -1, -1, 74,
- -1, 75, 76, 77, -1, -1, -1, 78, 79, -1,
- -1, 80, -1, 81, -1, -1, -1, 82, 83, -1,
- -1, -1, -1, 84, 85, -1, 86, -1, -1, -1,
- -1, 87, -1, -1, 88, 89, -1, -1, 90, -1,
- 91, 92, -1, -1, -1, -1, -1, -1, -1, 93,
- -1, 94, -1, -1, 95, -1, -1, -1, 96, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 97,
- 98, -1, -1, 99, -1, -1, -1, -1, -1, -1,
- -1, -1, 100, 101, -1, -1, -1, 102, -1, -1,
- -1, -1, -1, -1, 103, -1, 104, -1, -1, 105,
- -1, -1, -1, -1, 106, 107, -1, 108, 109, 110,
- -1, 111, -1, -1, -1, -1, -1, -1, 112, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 113, -1,
- 114, 115, -1, -1, 116, -1, 117, 118, 119, 120,
- 121, 122, -1, 123, -1, -1, -1, 124, -1, 125,
- -1, 126, -1, -1, 127, 128, 129, 130, 131, 132,
- -1, -1, 133, 134, 135, -1, -1, 136, 137, -1,
- -1, -1, 138, -1, 139, -1, 140, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 141, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 142, -1, 143, 144, -1, -1, -1, -1, -1,
- -1, -1, -1, 145, -1, -1, -1, -1, 146, -1,
- -1, -1, 147, 148, -1, -1, -1, -1, -1, 149,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 150, 151, -1, -1, -1, -1, -1, -1, 152, 153,
- -1, -1, -1, -1, -1, 154, -1, -1, -1, 155,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 156,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 157, -1, -1, 158, -1, 159, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 160, -1, -1, -1, -1, 161, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 162, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 163, -1, 164, -1, 165, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 166, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 167, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 168
- };
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct sparql_keyword *
-sparql_lex_hash_kw (register const char *str, register unsigned int len)
-{
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register int index = lookup[key];
-
- if (index >= 0)
- {
- register const char *s = wordlist[index].kwd;
-
- if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strcmp (str, s))
- return &wordlist[index];
- }
- }
- }
- return 0;
-}
diff --git a/libsrc/Wi/sparul2sql.c b/libsrc/Wi/sparul2sql.c
index 2d27624..887df78 100644
--- a/libsrc/Wi/sparul2sql.c
+++ b/libsrc/Wi/sparul2sql.c
@@ -1,10 +1,10 @@
/*
- * $Id: sparul2sql.c,v 1.20.2.21 2012/03/15 10:32:27 source Exp $
+ * $Id: sparul2sql.c,v 1.20.2.15 2011/09/12 21:05:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -53,13 +53,11 @@ extern "C" {
#define CTOR_DISJOIN_WHERE 1
#define CTOR_MAY_INTERSECTS_WHERE 0
-int ssg_is_odbc_cli ();
-
caddr_t
spar_compose_report_flag (sparp_t *sparp)
{
const char *fmtname = sparp->sparp_env->spare_output_format_name; /* Report is always a result-set, so no spare_output_XXX_format name */
- return t_box_num ((NULL == fmtname && ssg_is_odbc_cli ()) || ((NULL != fmtname) && (!strcmp (fmtname, "_JAVA_") || !strcmp (fmtname, "_UDBC_"))) ? 0 : 1);
+ return t_box_num (((NULL != fmtname) && !strcmp (fmtname, "_JAVA_")) ? 0 : 1);
}
extern int sparp_ctor_fields_are_disjoin_with_where_fields (sparp_t *sparp, SPART **ctor_fields, SPART **where_fields);
@@ -204,14 +202,12 @@ sparp_ctor_fields_are_disjoin_with_data_gathering (sparp_t *sparp, SPART **ctor_
typedef struct ctor_var_enumerator_s
{
- dk_set_t cve_dist_vars_acc; /*!< Accumulator of variables with distinct names used in triple patterns of constructors */
+ dk_set_t cve_dist_vars_acc; /*!< Accumulator of variables with distinct names used in triple patterns of constructors */
int cve_dist_vars_count; /*!< Length of \c cve_dist_vars_acc */
int cve_total_vars_count; /*!< Count of all occurrences of variables */
int cve_bnodes_are_prohibited; /*!< Bnodes are not allowed in DELETE ctor gp */
- SPART *cve_limofs_var; /*!< Variable that is passed from limit-offset subselect */
- caddr_t cve_limofs_var_alias; /*!< Alias used for cve_limofs_var */
- int cve_make_quads; /*!< Contructor should make quads */
- SPART *cve_default_graph; /*!< An expression for the dafult graph */
+ SPART *cve_limofs_var; /*!< Variable that is passed from limit-offset subselect */
+ caddr_t cve_limofs_var_alias; /*!< Alias used for cve_limofs_var */
}
ctor_var_enumerator_t;
@@ -281,26 +277,15 @@ spar_compose_retvals_of_ctor (sparp_t *sparp, SPART *ctor_gp, const char *funnam
for (triple_ctr = BOX_ELEMENTS_INT (ctor_gp->_.gp.members); triple_ctr--; /* no step */)
{
SPART *triple = ctor_gp->_.gp.members[triple_ctr];
- SPART *g = triple->_.triple.tr_fields[SPART_TRIPLE_GRAPH_IDX];
- int g_is_default = !cve->cve_make_quads || SPART_IS_DEFAULT_GRAPH_BLANK (g);
- caddr_t *args = (g_is_default ?
- (caddr_t *)list (6,
- (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL,
- (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL,
- (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL ) :
- (caddr_t *)list (8,
- (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL,
- (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL,
- (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL,
- (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL ) );
- for (fld_ctr = g_is_default ? 1 : 0; fld_ctr < SPART_TRIPLE_FIELDS_COUNT; fld_ctr++)
+ caddr_t *args = (caddr_t *)list (6,
+ (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL,
+ (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL,
+ (ptrlong)CTOR_OPCODE_CONST_OR_EXPN, NULL );
+ for (fld_ctr = 1; fld_ctr < SPART_TRIPLE_FIELDS_COUNT; fld_ctr++)
{
SPART *fld = triple->_.triple.tr_fields[fld_ctr];
ptrlong fld_type = SPART_TYPE(fld);
caddr_t val;
- int arg_ofs = ((fld_ctr + SPART_TRIPLE_FIELDS_COUNT - 1) % SPART_TRIPLE_FIELDS_COUNT) * 2;
- ptrlong *opcode_arg_ptr = (ptrlong *)(args + arg_ofs);
- caddr_t *val_arg_ptr = args + arg_ofs + 1;
switch (fld_type)
{
case SPAR_BLANK_NODE_LABEL:
@@ -317,21 +302,21 @@ spar_compose_retvals_of_ctor (sparp_t *sparp, SPART *ctor_gp, const char *funnam
t_set_push (&bnodes_acc, fld);
var_ctr = bnode_count++;
bnode_found_or_added_for_big_ssl:
- opcode_arg_ptr[0] = CTOR_OPCODE_BNODE;
- val_arg_ptr[0] = box_num (var_ctr);
+ args [(fld_ctr-1)*2] = (caddr_t)((ptrlong)CTOR_OPCODE_BNODE);
+ args [(fld_ctr-1)*2 + 1] = box_num (var_ctr);
break;
case SPAR_LIT:
if ((NULL != fld->_.lit.datatype) || (NULL != fld->_.lit.language))
val = list (3, box_copy (fld->_.lit.val), box_copy (fld->_.lit.datatype), box_copy (fld->_.lit.language));
else
val = box_copy (fld->_.qname.val);
- val_arg_ptr[0] = val;
+ args[(fld_ctr-1)*2 + 1] = val;
break;
case SPAR_QNAME:
val = box_copy (fld->_.qname.val);
+ args[(fld_ctr-1)*2 + 1] = val;
if (DV_STRING == DV_TYPE_OF (val))
box_flags (val) = BF_IRI;
- val_arg_ptr[0] = val;
break;
default: spar_internal_error (sparp, "Non-const in big ssl const mode constructor pattern");
}
@@ -355,26 +340,15 @@ bnode_found_or_added_for_big_ssl:
for (triple_ctr = BOX_ELEMENTS_INT (ctor_gp->_.gp.members); triple_ctr--; /* no step */)
{
SPART *triple = ctor_gp->_.gp.members[triple_ctr];
- SPART *g = triple->_.triple.tr_fields[SPART_TRIPLE_GRAPH_IDX];
- int g_is_default = !cve->cve_make_quads || SPART_IS_DEFAULT_GRAPH_BLANK (g);
SPART **tvector_args;
SPART *tvector_call;
int triple_is_const = 1;
- tvector_args = (g_is_default ?
- (SPART **)t_list (6, NULL, NULL, NULL, NULL, NULL, NULL) :
- (SPART **)t_list (8, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) );
-#if 0
+ tvector_args = (SPART **)t_list (6, NULL, NULL, NULL, NULL, NULL, NULL);
tvector_call = spar_make_funcall (sparp, 0, ((NULL == formatter) ? "LONG::bif:vector" : "bif:vector"), tvector_args);
-#else /* LONG::bif:vector is needed always, otherwise construct with constant "string"@lang may become plain "string" in a formatted output */
- tvector_call = spar_make_funcall (sparp, 0, "LONG::bif:vector", tvector_args);
-#endif
- for (fld_ctr = g_is_default ? 1 : 0; fld_ctr < SPART_TRIPLE_FIELDS_COUNT; fld_ctr++)
+ for (fld_ctr = 1; fld_ctr < SPART_TRIPLE_FIELDS_COUNT; fld_ctr++)
{
SPART *fld = triple->_.triple.tr_fields[fld_ctr];
ptrlong fld_type = SPART_TYPE(fld);
- int arg_ofs = ((fld_ctr + SPART_TRIPLE_FIELDS_COUNT - 1) % SPART_TRIPLE_FIELDS_COUNT) * 2;
- caddr_t *opcode_arg_ptr = (caddr_t *)(tvector_args + arg_ofs);
- SPART **val_arg_ptr = tvector_args + arg_ofs + 1;
switch (fld_type)
{
case SPAR_VARIABLE:
@@ -385,8 +359,8 @@ bnode_found_or_added_for_big_ssl:
break;
}
var_ctr = spar_cve_find_or_add_variable (sparp, cve, fld);
- opcode_arg_ptr[0] = t_box_num_nonull (CTOR_OPCODE_VARIABLE);
- val_arg_ptr[0] = (SPART *)t_box_num_nonull (var_ctr);
+ tvector_args [(fld_ctr-1)*2] = (SPART *)t_box_num_nonull (CTOR_OPCODE_VARIABLE);
+ tvector_args [(fld_ctr-1)*2 + 1] = (SPART *)t_box_num_nonull (var_ctr);
triple_is_const = 0;
break;
case SPAR_BLANK_NODE_LABEL:
@@ -403,19 +377,19 @@ bnode_found_or_added_for_big_ssl:
t_set_push (&bnodes_acc, fld);
var_ctr = bnode_count++;
bnode_found_or_added:
- opcode_arg_ptr[0] = t_box_num_nonull (CTOR_OPCODE_BNODE);
- val_arg_ptr[0] = (SPART *)t_box_num_nonull (var_ctr);
+ tvector_args [(fld_ctr-1)*2] = (SPART *)t_box_num_nonull (CTOR_OPCODE_BNODE);
+ tvector_args [(fld_ctr-1)*2 + 1] = (SPART *)t_box_num_nonull (var_ctr);
triple_is_const = 0;
break;
case SPAR_LIT: case SPAR_QNAME:
- opcode_arg_ptr[0] = t_box_num_nonull (CTOR_OPCODE_CONST_OR_EXPN);
- val_arg_ptr[0] = fld;
+ tvector_args [(fld_ctr-1)*2] = (SPART *)t_box_num_nonull (CTOR_OPCODE_CONST_OR_EXPN);
+ tvector_args [(fld_ctr-1)*2 + 1] = fld;
default:
{
int old_total_vars_count = cve->cve_total_vars_count;
sparp_gp_trav (sparp, fld, cve, NULL, NULL, sparp_gp_trav_ctor_var_to_limofs_aref, NULL, NULL, NULL);
- opcode_arg_ptr[0] = t_box_num_nonull (CTOR_OPCODE_CONST_OR_EXPN);
- val_arg_ptr[0] = fld;
+ tvector_args [(fld_ctr-1)*2] = (SPART *)t_box_num_nonull (CTOR_OPCODE_CONST_OR_EXPN);
+ tvector_args [(fld_ctr-1)*2 + 1] = fld;
if (cve->cve_total_vars_count != old_total_vars_count)
triple_is_const = 0;
}
@@ -468,16 +442,8 @@ spar_compose_retvals_of_construct (sparp_t *sparp, SPART *top, SPART *ctor_gp,
{
int use_limits = 0;
int need_limofs_trick = CTOR_NEEDS_LIMOFS_TRICK(top);
- SPART *multigraph = sparp_get_option (sparp, ctor_gp->_.gp.options, QUAD_L);
- int g_may_vary = (NULL != multigraph);
ctor_var_enumerator_t cve;
memset (&cve, 0, sizeof (ctor_var_enumerator_t));
- if (!g_may_vary && (0 < BOX_ELEMENTS (ctor_gp->_.gp.members)))
- {
- SPART *g = ctor_gp->_.gp.members[0]->_.triple.tr_graph;
- if (!SPART_IS_DEFAULT_GRAPH_BLANK (g))
- g_may_vary = 1;
- }
if (need_limofs_trick)
{
caddr_t limofs_name = t_box_dv_short_string (":\"limofs\".\"ctor-1\"");
@@ -487,8 +453,6 @@ spar_compose_retvals_of_construct (sparp_t *sparp, SPART *top, SPART *ctor_gp,
if ((NULL == sparp->sparp_env->spare_storage_name) ||
('\0' != sparp->sparp_env->spare_storage_name) )
use_limits = 1;
- cve.cve_make_quads = g_may_vary;
- cve.cve_default_graph = NULL;
spar_compose_retvals_of_ctor (sparp, ctor_gp, "sql:SPARQL_CONSTRUCT", NULL /* no big ssl const */, NULL, NULL,
&(top->_.req_top.retvals), &cve, formatter, agg_formatter, agg_mdata, use_limits );
@@ -497,17 +461,13 @@ spar_compose_retvals_of_construct (sparp_t *sparp, SPART *top, SPART *ctor_gp,
SPART *
spar_simplify_graph_to_patch (sparp_t *sparp, SPART *g)
{
- if (SPAR_GRAPH == SPART_TYPE (g))
- {
- if ((SPART_GRAPH_NOT_FROM == g->_.graph.subtype) || (SPART_GRAPH_NOT_NAMED == g->_.graph.subtype))
- spar_internal_error (sparp, "NOT FROM and NOT FROM NAMED are not fully supported by SPARUL operations, sorry");
- if (SPAR_QNAME == SPART_TYPE (g->_.graph.expn))
- return (SPART *)(g->_.graph.iri);
- return g->_.graph.expn;
- }
- if (SPAR_QNAME == SPART_TYPE (g))
- return (SPART *)(g->_.qname.val);
- return g;
+ if (SPAR_GRAPH != SPART_TYPE (g))
+ return g;
+ if ((SPART_GRAPH_NOT_FROM == g->_.graph.subtype) || (SPART_GRAPH_NOT_NAMED == g->_.graph.subtype))
+ spar_internal_error (sparp, "NOT FROM and NOT FROM NAMED are not fully supported by SPARUL operations, sorry");
+ if (SPAR_QNAME == SPART_TYPE (g->_.graph.expn))
+ return (SPART *)(g->_.graph.iri);
+ return g->_.graph.expn;
}
int
@@ -538,18 +498,11 @@ spar_compose_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top, SPART *gra
int top_subtype = top->_.req_top.subtype;
int top_subtype_is_insert = ((INSERT_L == top_subtype) || (SPARUL_INSERT_DATA == top_subtype));
int big_ssl_const_mode = ((SPARUL_INSERT_DATA == top_subtype) || (SPARUL_DELETE_DATA == top_subtype));
- SPART *multigraph = sparp_get_option (sparp, ctor_gp->_.gp.options, QUAD_L);
const char *top_fname;
caddr_t log_mode;
SPART **rv;
ctor_var_enumerator_t cve;
sql_comp_t *sc_for_big_ssl_const = NULL;
- if ((NULL == multigraph) && (0 != BOX_ELEMENTS_0 (ctor_gp->_.gp.members)))
- {
- SPART *first_tmpl = ctor_gp->_.gp.members[0];
- if (!SPART_IS_DEFAULT_GRAPH_BLANK (first_tmpl->_.triple.tr_graph))
- graph_to_patch = first_tmpl->_.triple.tr_graph;
- }
graph_to_patch = spar_simplify_graph_to_patch (sparp, graph_to_patch);
memset (&cve, 0, sizeof (ctor_var_enumerator_t));
log_mode = sparp->sparp_env->spare_sparul_log_mode;
@@ -565,8 +518,6 @@ spar_compose_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top, SPART *gra
big_ssl_const_mode = spar_find_sc_for_big_ssl_const (sparp, &sc_for_big_ssl_const);
if ((INSERT_L != top->_.req_top.subtype) && (SPARUL_INSERT_DATA != top->_.req_top.subtype))
cve.cve_bnodes_are_prohibited = 1;
- cve.cve_make_quads = ((NULL != multigraph) ? 1 : 0);
- cve.cve_default_graph = graph_to_patch;
spar_compose_retvals_of_ctor (sparp, ctor_gp, "sql:SPARQL_CONSTRUCT", sc_for_big_ssl_const, NULL, NULL,
&(top->_.req_top.retvals), &cve, NULL, NULL, NULL, 0 );
rv = top->_.req_top.retvals;
@@ -575,7 +526,7 @@ spar_compose_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top, SPART *gra
top_fname = t_box_sprintf (200, "sql:SPARQL_ROUTE_DICT_CONTENT_%.100s", sparp->sparp_env->spare_output_route_name);
rv[0] = spar_make_funcall (sparp, 0, top_fname,
(SPART **)t_list (11, graph_to_patch,
- t_box_dv_short_string ((NULL != multigraph) ? (top_subtype_is_insert ? "INSERT_QUAD" : "DELETE_QUAD") : (top_subtype_is_insert ? "INSERT" : "DELETE")),
+ t_box_dv_short_string (top_subtype_is_insert ? "INSERT" : "DELETE"),
((NULL == sparp->sparp_env->spare_storage_name) ? t_NEW_DB_NULL : sparp->sparp_env->spare_storage_name),
((NULL == sparp->sparp_env->spare_output_storage_name) ? t_NEW_DB_NULL : sparp->sparp_env->spare_output_storage_name),
((NULL == sparp->sparp_env->spare_output_format_name) ? t_NEW_DB_NULL : sparp->sparp_env->spare_output_format_name),
@@ -586,9 +537,7 @@ spar_compose_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top, SPART *gra
}
else
{
- top_fname = ((NULL != multigraph) ?
- (top_subtype_is_insert ? "sql:SPARQL_INSERT_QUAD_DICT_CONTENT" : "sql:SPARQL_DELETE_QUAD_DICT_CONTENT") :
- (top_subtype_is_insert ? "sql:SPARQL_INSERT_DICT_CONTENT" : "sql:SPARQL_DELETE_DICT_CONTENT") );
+ top_fname = top_subtype_is_insert ? "sql:SPARQL_INSERT_DICT_CONTENT" : "sql:SPARQL_DELETE_DICT_CONTENT";
rv[0] = spar_make_funcall (sparp, 0, top_fname,
(SPART **)t_list (5, graph_to_patch, rv[0],
spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp) ) );
@@ -599,36 +548,10 @@ void
spar_compose_retvals_of_modify (sparp_t *sparp, SPART *top, SPART *graph_to_patch, SPART *del_ctor_gp, SPART *ins_ctor_gp)
{
int need_limofs_trick;
- SPART *del_multigraph = sparp_get_option (sparp, del_ctor_gp->_.gp.options, QUAD_L);
- SPART *ins_multigraph = sparp_get_option (sparp, ins_ctor_gp->_.gp.options, QUAD_L);
- SPART *del_graph_to_patch = graph_to_patch;
- SPART *ins_graph_to_patch = graph_to_patch;
- int g_may_vary = ((NULL != del_multigraph) || (NULL != ins_multigraph));
caddr_t log_mode;
SPART **ins = NULL;
SPART **rv;
ctor_var_enumerator_t cve;
- if ((NULL == del_multigraph) && (0 != BOX_ELEMENTS_0 (del_ctor_gp->_.gp.members)))
- {
- SPART *first_tmpl = del_ctor_gp->_.gp.members[0];
- if (!SPART_IS_DEFAULT_GRAPH_BLANK (first_tmpl->_.triple.tr_graph))
- del_graph_to_patch = first_tmpl->_.triple.tr_graph;
- }
- del_graph_to_patch = spar_simplify_graph_to_patch (sparp, del_graph_to_patch);
- if ((NULL == ins_multigraph) && (0 != BOX_ELEMENTS_0 (ins_ctor_gp->_.gp.members)))
- {
- SPART *first_tmpl = ins_ctor_gp->_.gp.members[0];
- if (!SPART_IS_DEFAULT_GRAPH_BLANK (first_tmpl->_.triple.tr_graph))
- ins_graph_to_patch = first_tmpl->_.triple.tr_graph;
- }
- ins_graph_to_patch = spar_simplify_graph_to_patch (sparp, ins_graph_to_patch);
- if (DV_STRINGP (del_graph_to_patch) && DV_STRINGP (ins_graph_to_patch)
- && !strcmp ((caddr_t)del_graph_to_patch, (caddr_t)ins_graph_to_patch) )
- {
- graph_to_patch = del_graph_to_patch;
- }
- else
- g_may_vary = 1;
graph_to_patch = spar_simplify_graph_to_patch (sparp, graph_to_patch);
if (0 == BOX_ELEMENTS (del_ctor_gp->_.gp.members))
{
@@ -654,8 +577,6 @@ spar_compose_retvals_of_modify (sparp_t *sparp, SPART *top, SPART *graph_to_patc
cve.cve_limofs_var_alias = t_box_dv_short_string ("ctor-1");
}
cve.cve_bnodes_are_prohibited = 1;
- cve.cve_make_quads = g_may_vary;
- cve.cve_default_graph = graph_to_patch;
spar_compose_retvals_of_ctor (sparp, del_ctor_gp, "sql:SPARQL_CONSTRUCT", NULL /* no big ssl const */, NULL, NULL,
&(top->_.req_top.retvals), &cve, NULL, NULL, NULL, 0 );
cve.cve_limofs_var_alias = NULL;
@@ -668,7 +589,7 @@ spar_compose_retvals_of_modify (sparp_t *sparp, SPART *top, SPART *graph_to_patc
rv[0] = spar_make_funcall (sparp, 0,
t_box_sprintf (200, "sql:SPARQL_ROUTE_DICT_CONTENT_%.100s", sparp->sparp_env->spare_output_route_name),
(SPART **)t_list (11, graph_to_patch,
- t_box_dv_short_string (g_may_vary ? "MODIFY" : "MODIFY_QUAD"),
+ t_box_dv_short_string ("MODIFY"),
((NULL == sparp->sparp_env->spare_storage_name) ? t_NEW_DB_NULL : sparp->sparp_env->spare_storage_name),
((NULL == sparp->sparp_env->spare_output_storage_name) ? t_NEW_DB_NULL : sparp->sparp_env->spare_output_storage_name),
((NULL == sparp->sparp_env->spare_output_format_name) ? t_NEW_DB_NULL : sparp->sparp_env->spare_output_format_name),
@@ -676,7 +597,7 @@ spar_compose_retvals_of_modify (sparp_t *sparp, SPART *top, SPART *graph_to_patc
t_NEW_DB_NULL,
spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp) ) );
else
- rv[0] = spar_make_funcall (sparp, 0, (g_may_vary ? "sql:SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS" : "sql:SPARQL_MODIFY_BY_DICT_CONTENTS"),
+ rv[0] = spar_make_funcall (sparp, 0, "sql:SPARQL_MODIFY_BY_DICT_CONTENTS",
(SPART **)t_list (6, graph_to_patch, rv[0], ins[0],
spar_exec_uid_and_gs_cbk (sparp), log_mode, spar_compose_report_flag (sparp) ) );
}
@@ -693,7 +614,7 @@ spar_emulate_ctor_field (sparp_t *sparp, SPART *opcode, SPART *oparg, SPART **va
{
if (NULL == bnode_emulation)
#ifdef DEBUG
- bnode_emulation = (SPART *)box_copy_tree ((caddr_t)spartlist (sparp, 7 + (sizeof (rdf_val_range_t) / sizeof (caddr_t)), SPAR_BLANK_NODE_LABEL,
+ bnode_emulation = box_copy_tree (spartlist (sparp, 7 + (sizeof (rdf_val_range_t) / sizeof (caddr_t)), SPAR_BLANK_NODE_LABEL,
NULL, NULL, NULL, NULL, NULL, SPART_RVR_LIST_OF_NULLS, NULL ) );
#else
bnode_emulation = box_copy_tree (spartlist (sparp, 1, SPAR_BLANK_NODE_LABEL));
@@ -787,13 +708,11 @@ spar_optimize_delete_of_single_triple_pattern (sparp_t *sparp, SPART *top)
SPART *arg0, *graph_expn, *ctor, *uid_expn, *log_mode_expn, *good_ctor_call, *compose_report_expn;
if (NULL != sparp->sparp_env->spare_output_route_name)
return 0; /* If an output may go outside the default storage then there's no way of avoiding the complete filling of the result dictionary */
+ dbg_assert ((SPAR_FUNCALL == SPART_TYPE (retvals[0])) && (5 == BOX_ELEMENTS (retvals[0]->_.funcall.argtrees)));
triple = spar_find_single_physical_triple_pattern (sparp, top->_.req_top.pattern);
if (NULL == triple)
return 0; /* nontrivial pattern, can not be optimized this way */
arg0 = spar_dealias (sparp, retvals[0], SPAR_FUNCALL);
- dbg_assert ((SPAR_FUNCALL == SPART_TYPE (arg0)) && (5 == BOX_ELEMENTS (arg0->_.funcall.argtrees)));
- if (strcmp ("sql:SPARQL_DELETE_DICT_CONTENT", arg0->_.funcall.qname))
- return 0;
graph_expn = arg0->_.funcall.argtrees[0];
ctor = arg0->_.funcall.argtrees[1];
uid_expn = arg0->_.funcall.argtrees[2];
@@ -859,10 +778,8 @@ spar_optimize_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top)
SPART *arg0, *graph_expn, *ctor, *uid_expn, *log_mode_expn, *good_ctor_call, *compose_report_expn;
if (NULL != sparp->sparp_env->spare_output_route_name)
return; /* If an output may go outside the default storage then there's no way of avoiding the complete filling of the result dictionary */
+ dbg_assert ((SPAR_FUNCALL == SPART_TYPE (retvals[0])) && (5 == BOX_ELEMENTS (retvals[0]->_.funcall.argtrees)));
arg0 = spar_dealias (sparp, retvals[0], SPAR_FUNCALL);
- dbg_assert ((SPAR_FUNCALL == SPART_TYPE (arg0)) && (5 == BOX_ELEMENTS (arg0->_.funcall.argtrees)));
- if (strcmp ("sql:SPARQL_INSERT_DICT_CONTENT", arg0->_.funcall.qname) && strcmp ("sql:SPARQL_DELETE_DICT_CONTENT", arg0->_.funcall.qname))
- return;
graph_expn = arg0->_.funcall.argtrees[0];
ctor = arg0->_.funcall.argtrees[1];
uid_expn = arg0->_.funcall.argtrees[2];
@@ -870,7 +787,6 @@ spar_optimize_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top)
compose_report_expn = arg0->_.funcall.argtrees[4];
dbg_assert ((SPAR_FUNCALL == SPART_TYPE (ctor)) && (4 == BOX_ELEMENTS (ctor->_.funcall.argtrees)));
var_triples = ctor->_.funcall.argtrees[0]->_.funcall.argtrees;
- all_triple_count = bad_triple_count = BOX_ELEMENTS (var_triples);
if (1 < retvals_count)
{
SPART *known_vars_vector = spar_dealias (sparp, retvals [retvals_count-1], SPAR_FUNCALL);
@@ -878,6 +794,7 @@ spar_optimize_retvals_of_insert_or_delete (sparp_t *sparp, SPART *top)
}
else
known_vars = ctor->_.funcall.argtrees[1]->_.funcall.argtrees;
+ all_triple_count = bad_triple_count = BOX_ELEMENTS (var_triples);
for (tctr = all_triple_count; tctr--; /* no step */)
{
SPART **args = var_triples[tctr]->_.funcall.argtrees;
@@ -948,10 +865,8 @@ spar_optimize_retvals_of_modify (sparp_t *sparp, SPART *top)
SPART *arg0, *graph_expn, *del_ctor, *ins_ctor, *uid_expn, *log_mode_expn, *good_ctor_call, *compose_report_expn;
if (NULL != sparp->sparp_env->spare_output_route_name)
return; /* If an output may go outside the default storage then there's no way of avoiding the complete filling of the result dictionary */
+ dbg_assert ((SPAR_FUNCALL == SPART_TYPE (retvals[0])) && (6 == BOX_ELEMENTS (retvals[0]->_.funcall.argtrees)));
arg0 = spar_dealias (sparp, retvals[0], SPAR_FUNCALL);
- dbg_assert ((SPAR_FUNCALL == SPART_TYPE (arg0)) && (6 == BOX_ELEMENTS (arg0->_.funcall.argtrees)));
- if (strcmp ("sql:SPARQL_MODIFY_BY_DICT_CONTENT", arg0->_.funcall.qname))
- return;
graph_expn = arg0->_.funcall.argtrees[0];
del_ctor = arg0->_.funcall.argtrees[1];
ins_ctor = arg0->_.funcall.argtrees[2];
diff --git a/libsrc/Wi/sql3.c b/libsrc/Wi/sql3.c
index 6356701..985eed9 100644
--- a/libsrc/Wi/sql3.c
+++ b/libsrc/Wi/sql3.c
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,7 +29,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -45,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -53,80 +55,11 @@
/* Pure parsers. */
#define YYPURE 0
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
-/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
-#line 30 "./sql3.y"
-
-
-#include "libutil.h"
-#include "sqlnode.h"
-#include "sqlpar.h"
-#include "sqlpfn.h"
-#include "crsr.h"
-#include "sqltype.h"
-#include "sqlbif.h"
-#include "soap.h" /* a SOAP related constants */
-#include "subseq.h"
-#include "sqlcmps.h"
-#include "sqlcstate.h"
-
-/* We are a little bit lazy here. Instead of converting NAME tokens
- like d and ts to stringdate, and t to stringtime, and maybe the
- rest to "unimplemented_odbc_brace_escape_keyword:%s"
- we just let them be as they are, and define aliases d and ts
- for stringdate and t for stringtime in sqlbif.c.
- In effect, syntax like {any-name any-single-atom} in the place
- of atom will be converted to function call any-name(any-single-atom)
- Having funny one- or two-character bif-function names like d or ts
- does not make any of them reserved keywords, and they can be used
- to one's heart's contents as the names of tables, columns, etc.
- */
-#define obe_keyword_to_bif_fun_name(X) ((X))
-
-#ifdef DEBUG
-#define yyerror(strg) yyerror_1(yystate, yyssa, yyssp, strg)
-#define yyfatalerror(strg) yyfatalerror_1(yystate, yyssa, yyssp, strg)
-#endif
-
-#define assert_ms_compat(text)
-
-
-
-
-/* Line 189 of yacc.c */
-#line 110 "sql3.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -860,13 +793,67 @@
+/* Copy the first part of user declarations. */
+#line 57 "./sql3.y"
+
+
+#include "libutil.h"
+#include "sqlnode.h"
+#include "sqlpar.h"
+#include "sqlpfn.h"
+#include "crsr.h"
+#include "sqltype.h"
+#include "sqlbif.h"
+#include "soap.h" /* a SOAP related constants */
+#include "subseq.h"
+#include "sqlcmps.h"
+#include "sqlcstate.h"
+
+/* We are a little bit lazy here. Instead of converting NAME tokens
+ like d and ts to stringdate, and t to stringtime, and maybe the
+ rest to "unimplemented_odbc_brace_escape_keyword:%s"
+ we just let them be as they are, and define aliases d and ts
+ for stringdate and t for stringtime in sqlbif.c.
+ In effect, syntax like {any-name any-single-atom} in the place
+ of atom will be converted to function call any-name(any-single-atom)
+ Having funny one- or two-character bif-function names like d or ts
+ does not make any of them reserved keywords, and they can be used
+ to one's heart's contents as the names of tables, columns, etc.
+ */
+#define obe_keyword_to_bif_fun_name(X) ((X))
+
+#ifdef DEBUG
+#define yyerror(strg) yyerror_1(yystate, yyssa, yyssp, strg)
+#define yyfatalerror(strg) yyfatalerror_1(yystate, yyssa, yyssp, strg)
+#endif
+
+#define assert_ms_compat(text)
+
+
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
+#line 95 "./sql3.y"
{
-
-/* Line 214 of yacc.c */
-#line 68 "./sql3.y"
-
long intval;
char *strval;
sql_tree_t *tree;
@@ -874,23 +861,22 @@ typedef union YYSTYPE
dk_set_t list;
long subtok;
sqlp_join_t join;
-
-
-
-/* Line 214 of yacc.c */
-#line 882 "sql3.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 187 of yacc.c. */
+#line 867 "sql3.c"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
+
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 894 "sql3.c"
+/* Line 216 of yacc.c. */
+#line 880 "sql3.c"
#ifdef short
# undef short
@@ -940,7 +926,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -965,14 +951,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -1053,9 +1039,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -1089,12 +1075,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -1103,18 +1089,18 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 337
+#define YYFINAL 339
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 22097
+#define YYLAST 22182
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 374
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 402
+#define YYNNTS 401
/* YYNRULES -- Number of rules. */
#define YYNRULES 1270
/* YYNRULES -- Number of states. */
-#define YYNSTATES 2459
+#define YYNSTATES 2462
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -1217,35 +1203,35 @@ static const yytype_uint16 yyprhs[] =
475, 477, 480, 485, 487, 489, 492, 493, 495, 505,
518, 523, 524, 526, 530, 534, 535, 537, 539, 543,
545, 549, 556, 563, 570, 576, 578, 580, 582, 583,
- 585, 587, 591, 593, 599, 604, 609, 611, 616, 621,
- 622, 628, 641, 642, 646, 647, 651, 652, 656, 662,
- 670, 678, 685, 693, 699, 700, 704, 711, 718, 725,
- 732, 737, 738, 742, 745, 747, 749, 751, 755, 758,
- 760, 762, 765, 768, 770, 774, 776, 778, 783, 787,
- 791, 795, 800, 804, 809, 813, 819, 825, 831, 832,
- 838, 849, 850, 853, 854, 859, 860, 863, 864, 868,
- 870, 872, 874, 880, 887, 888, 892, 894, 898, 901,
- 904, 905, 907, 909, 915, 921, 927, 928, 930, 931,
- 934, 942, 949, 950, 953, 958, 959, 962, 967, 983,
- 984, 987, 988, 992, 999, 1006, 1007, 1009, 1010, 1014,
- 1015, 1021, 1022, 1025, 1026, 1029, 1030, 1033, 1035, 1037,
- 1039, 1041, 1043, 1045, 1047, 1049, 1051, 1055, 1057, 1059,
+ 585, 587, 591, 593, 599, 604, 609, 611, 613, 618,
+ 623, 624, 630, 643, 644, 648, 649, 653, 654, 658,
+ 664, 672, 680, 687, 695, 701, 702, 706, 713, 720,
+ 727, 734, 739, 740, 744, 747, 749, 751, 753, 757,
+ 760, 762, 764, 767, 770, 772, 776, 778, 780, 785,
+ 789, 793, 797, 802, 806, 811, 815, 821, 827, 833,
+ 834, 840, 851, 852, 855, 856, 861, 862, 865, 866,
+ 870, 872, 874, 876, 882, 889, 890, 894, 896, 900,
+ 903, 906, 907, 909, 911, 917, 923, 929, 930, 932,
+ 933, 936, 944, 951, 952, 955, 960, 961, 964, 969,
+ 985, 986, 989, 990, 994, 1001, 1008, 1009, 1011, 1012,
+ 1016, 1017, 1023, 1024, 1027, 1028, 1031, 1032, 1035, 1037,
+ 1039, 1041, 1043, 1045, 1047, 1049, 1051, 1053, 1055, 1059,
1061, 1063, 1065, 1067, 1069, 1071, 1073, 1075, 1077, 1079,
- 1081, 1083, 1085, 1087, 1089, 1092, 1095, 1098, 1107, 1113,
- 1118, 1124, 1131, 1133, 1135, 1137, 1138, 1141, 1149, 1154,
- 1156, 1158, 1162, 1164, 1166, 1169, 1171, 1173, 1175, 1177,
- 1179, 1181, 1184, 1189, 1192, 1196, 1200, 1202, 1205, 1208,
- 1211, 1214, 1216, 1220, 1221, 1226, 1227, 1233, 1235, 1238,
- 1240, 1244, 1245, 1249, 1253, 1256, 1257, 1260, 1268, 1270,
- 1274, 1276, 1280, 1285, 1290, 1292, 1294, 1296, 1298, 1300,
- 1302, 1305, 1308, 1311, 1314, 1317, 1319, 1322, 1323, 1327,
- 1328, 1330, 1332, 1333, 1336, 1338, 1343, 1350, 1357, 1366,
- 1368, 1376, 1386, 1387, 1389, 1393, 1397, 1404, 1406, 1410,
- 1412, 1414, 1416, 1417, 1419, 1420, 1422, 1424, 1430, 1437,
- 1442, 1448, 1453, 1459, 1461, 1463, 1465, 1468, 1470, 1476,
- 1483, 1488, 1494, 1499, 1505, 1507, 1510, 1512, 1517, 1520,
- 1526, 1528, 1530, 1531, 1537, 1542, 1547, 1552, 1556, 1562,
- 1564, 1567, 1569, 1572, 1577, 1578, 1580, 1588, 1591, 1593,
+ 1081, 1083, 1085, 1087, 1089, 1091, 1093, 1096, 1099, 1102,
+ 1111, 1117, 1122, 1128, 1135, 1137, 1139, 1141, 1142, 1145,
+ 1153, 1158, 1160, 1162, 1166, 1168, 1170, 1173, 1175, 1177,
+ 1179, 1181, 1183, 1185, 1188, 1193, 1196, 1200, 1204, 1206,
+ 1209, 1212, 1215, 1218, 1220, 1224, 1225, 1230, 1231, 1237,
+ 1239, 1242, 1244, 1248, 1249, 1253, 1257, 1260, 1261, 1264,
+ 1272, 1274, 1278, 1280, 1284, 1289, 1294, 1296, 1298, 1300,
+ 1302, 1304, 1306, 1309, 1312, 1315, 1318, 1321, 1323, 1326,
+ 1327, 1331, 1332, 1334, 1336, 1337, 1340, 1342, 1347, 1354,
+ 1361, 1370, 1372, 1380, 1390, 1391, 1393, 1397, 1401, 1408,
+ 1410, 1414, 1416, 1418, 1420, 1421, 1423, 1424, 1426, 1428,
+ 1434, 1441, 1446, 1452, 1457, 1463, 1465, 1467, 1469, 1472,
+ 1474, 1480, 1487, 1492, 1498, 1503, 1509, 1511, 1514, 1516,
+ 1521, 1524, 1530, 1532, 1534, 1535, 1541, 1546, 1551, 1555,
+ 1559, 1565, 1567, 1570, 1572, 1575, 1580, 1588, 1591, 1593,
1597, 1599, 1603, 1607, 1608, 1610, 1612, 1617, 1623, 1625,
1632, 1634, 1637, 1641, 1645, 1646, 1649, 1652, 1655, 1657,
1659, 1660, 1662, 1665, 1667, 1669, 1673, 1677, 1683, 1684,
@@ -1329,13 +1315,13 @@ static const yytype_uint16 yyprhs[] =
static const yytype_int16 yyrhs[] =
{
375, 0, -1, 376, 367, -1, 376, -1, 377, -1,
- 378, -1, 424, -1, 706, -1, 420, -1, 421, -1,
- 419, -1, 759, -1, 760, -1, 761, -1, 762, -1,
+ 378, -1, 424, -1, 705, -1, 420, -1, 421, -1,
+ 419, -1, 758, -1, 759, -1, 760, -1, 761, -1,
379, -1, 414, -1, 378, 379, -1, 378, 414, -1,
- 383, -1, 407, -1, 775, -1, 410, -1, 408, -1,
+ 383, -1, 407, -1, 774, -1, 410, -1, 408, -1,
415, -1, 429, -1, 431, -1, 439, -1, 440, -1,
- 438, -1, 441, -1, 442, -1, 443, -1, 712, -1,
- 714, -1, 755, -1, 771, -1, 3, -1, 24, -1,
+ 438, -1, 441, -1, 442, -1, 443, -1, 711, -1,
+ 713, -1, 754, -1, 770, -1, 3, -1, 24, -1,
25, -1, 26, -1, 27, -1, 28, -1, 29, -1,
30, -1, 31, -1, 32, -1, 33, -1, 34, -1,
35, -1, 36, -1, 37, -1, 38, -1, 39, -1,
@@ -1353,221 +1339,221 @@ static const yytype_int16 yyrhs[] =
332, -1, 333, -1, 334, -1, 335, -1, 336, -1,
337, -1, 338, -1, 93, -1, 94, -1, 95, -1,
-1, 201, 44, -1, 203, 44, -1, -1, 91, -1,
- 140, 91, -1, 131, 192, 603, 368, 384, 369, 382,
- -1, 131, 192, 603, 101, 519, 381, -1, 385, -1,
- 384, 370, 385, -1, 386, -1, 400, -1, 611, 610,
+ 140, 91, -1, 131, 192, 602, 368, 384, 369, 382,
+ -1, 131, 192, 602, 101, 519, 381, -1, 385, -1,
+ 384, 370, 385, -1, 386, -1, 400, -1, 610, 609,
394, -1, -1, 388, -1, 388, 388, -1, 172, 195,
391, -1, 389, -1, 172, 138, 391, -1, -1, 389,
-1, 124, -1, 187, 169, -1, 187, 137, -1, -1,
47, 48, -1, 47, 46, -1, 45, 48, -1, 45,
- 46, -1, 181, 600, 427, 387, 392, -1, -1, 394,
- 398, -1, 92, 201, 599, -1, 305, 123, 7, -1,
+ 46, -1, 181, 599, 427, 387, 392, -1, -1, 394,
+ 398, -1, 92, 201, 598, -1, 305, 123, 7, -1,
41, 306, -1, 306, 116, -1, 306, 60, -1, 395,
-1, 397, 370, 395, -1, 106, 169, -1, 169, -1,
281, -1, 281, 368, 397, 369, -1, 176, 165, -1,
- 396, -1, 137, 599, -1, 311, 600, -1, 393, -1,
- 318, 123, 611, -1, 126, 368, 553, 369, -1, 201,
+ 396, -1, 137, 598, -1, 311, 599, -1, 393, -1,
+ 318, 123, 610, -1, 126, 368, 552, 369, -1, 201,
185, 399, -1, 194, -1, 368, 4, 370, 4, 369,
-1, 368, 4, 370, 4, 370, 4, 369, -1, 208,
- 600, -1, 401, 176, 165, 368, 403, 369, 406, -1,
+ 599, -1, 401, 176, 165, 368, 403, 369, 406, -1,
401, 147, 165, 368, 402, 369, 393, -1, 401, 126,
- 368, 553, 369, -1, 401, 194, 368, 402, 369, -1,
+ 368, 552, 369, -1, 401, 194, 368, 402, 369, -1,
401, 153, 406, 368, 403, 369, -1, -1, 129, 380,
- -1, 611, -1, 402, 370, 611, -1, 611, 455, -1,
- 403, 370, 611, 455, -1, 210, -1, 194, -1, 206,
+ -1, 610, -1, 402, 370, 610, -1, 610, 455, -1,
+ 403, 370, 610, 455, -1, 210, -1, 194, -1, 206,
-1, 207, -1, 140, -1, 91, -1, 106, 169, -1,
41, 176, 165, 87, -1, 158, -1, 404, -1, 405,
- 404, -1, -1, 405, -1, 131, 406, 157, 612, 172,
- 600, 368, 403, 369, -1, 131, 406, 157, 612, 172,
- 600, 368, 403, 369, 307, 774, 773, -1, 142, 157,
- 380, 409, -1, -1, 600, -1, 142, 192, 600, -1,
- 142, 198, 600, -1, -1, 91, -1, 386, -1, 412,
- 370, 386, -1, 611, -1, 413, 370, 611, -1, 230,
- 192, 600, 231, 411, 412, -1, 230, 192, 600, 142,
- 411, 413, -1, 230, 192, 600, 234, 411, 386, -1,
- 230, 192, 600, 232, 603, -1, 231, -1, 142, -1,
+ 404, -1, -1, 405, -1, 131, 406, 157, 611, 172,
+ 599, 368, 403, 369, -1, 131, 406, 157, 611, 172,
+ 599, 368, 403, 369, 307, 773, 772, -1, 142, 157,
+ 380, 409, -1, -1, 599, -1, 142, 192, 599, -1,
+ 142, 198, 599, -1, -1, 91, -1, 386, -1, 412,
+ 370, 386, -1, 610, -1, 413, 370, 610, -1, 230,
+ 192, 599, 231, 411, 412, -1, 230, 192, 599, 142,
+ 411, 413, -1, 230, 192, 599, 234, 411, 386, -1,
+ 230, 192, 599, 232, 602, -1, 231, -1, 142, -1,
234, -1, -1, 124, -1, 182, -1, 129, 380, 417,
- -1, 400, -1, 230, 192, 600, 416, 418, -1, 131,
+ -1, 400, -1, 230, 192, 599, 416, 418, -1, 131,
301, 185, 4, -1, 142, 301, 185, 4, -1, 519,
- -1, 427, 101, 422, 426, -1, 427, 101, 224, 518,
- -1, -1, 131, 198, 603, 425, 423, -1, 131, 178,
- 198, 603, 101, 600, 368, 540, 369, 368, 538, 369,
- -1, -1, 201, 126, 174, -1, -1, 368, 402, 369,
- -1, -1, 368, 402, 369, -1, 152, 115, 177, 193,
- 437, -1, 152, 433, 172, 604, 193, 436, 432, -1,
- 152, 271, 172, 578, 193, 436, 432, -1, 152, 272,
- 172, 4, 193, 436, -1, 152, 208, 172, 710, 193,
- 436, 432, -1, 152, 436, 193, 436, 430, -1, -1,
- 201, 68, 174, -1, 263, 433, 172, 604, 149, 436,
- -1, 263, 271, 172, 578, 149, 436, -1, 263, 208,
- 172, 710, 149, 436, -1, 263, 272, 172, 4, 149,
- 436, -1, 263, 436, 149, 436, -1, -1, 201, 152,
- 174, -1, 115, 177, -1, 115, -1, 434, -1, 435,
- -1, 434, 370, 435, -1, 186, 428, -1, 161, -1,
- 138, -1, 195, 428, -1, 181, 428, -1, 437, -1,
- 436, 370, 437, -1, 179, -1, 615, -1, 187, 264,
- 380, 380, -1, 131, 196, 615, -1, 131, 69, 615,
- -1, 138, 196, 615, -1, 138, 196, 615, 124, -1,
- 142, 196, 615, -1, 142, 196, 615, 124, -1, 142,
- 69, 615, -1, 187, 196, 153, 615, 615, -1, 231,
- 196, 153, 615, 615, -1, 138, 196, 153, 615, 615,
- -1, -1, 176, 165, 368, 402, 369, -1, 117, 192,
- 601, 444, 446, 149, 598, 447, 448, 449, -1, -1,
- 101, 603, -1, -1, 196, 567, 264, 567, -1, -1,
- 106, 186, -1, -1, 63, 101, 567, -1, 88, -1,
- 90, -1, 64, -1, 136, 380, 134, 96, 519, -1,
- 136, 380, 450, 134, 96, 519, -1, -1, 97, 123,
- 453, -1, 454, -1, 453, 370, 454, -1, 567, 455,
- -1, 573, 455, -1, -1, 118, -1, 139, -1, 131,
- 317, 266, 96, 600, -1, 142, 317, 266, 96, 600,
- -1, 316, 317, 266, 96, 600, -1, -1, 4, -1,
- -1, 200, 4, -1, 131, 317, 600, 149, 600, 459,
- 460, -1, 131, 315, 317, 600, 101, 4, -1, -1,
- 201, 138, -1, 142, 317, 600, 462, -1, -1, 101,
- 315, -1, 195, 317, 600, 464, -1, 131, 60, 471,
- 157, 172, 600, 368, 611, 369, 472, 476, 473, 467,
- 474, 475, -1, -1, 289, 242, -1, -1, 368, 611,
- 369, -1, 131, 60, 238, 172, 600, 468, -1, 142,
- 60, 238, 172, 600, 468, -1, -1, 301, -1, -1,
- 201, 165, 611, -1, -1, 210, 201, 368, 402, 369,
- -1, -1, 166, 4, -1, -1, 167, 4, -1, -1,
- 106, 161, -1, 477, -1, 520, -1, 510, -1, 513,
- -1, 486, -1, 481, -1, 482, -1, 665, -1, 746,
- -1, 26, 253, 746, -1, 750, -1, 667, -1, 707,
- -1, 480, -1, 498, -1, 618, -1, 478, -1, 445,
- -1, 456, -1, 457, -1, 458, -1, 461, -1, 463,
- -1, 465, -1, 466, -1, 469, -1, 470, -1, 291,
- 380, -1, 127, 613, -1, 128, 202, -1, 138, 149,
- 604, 200, 133, 171, 613, 492, -1, 138, 149, 604,
- 516, 492, -1, 145, 613, 163, 514, -1, 145, 613,
- 3, 163, 514, -1, 145, 613, 3, 567, 163, 514,
- -1, 163, -1, 215, -1, 216, -1, -1, 157, 3,
- -1, 161, 484, 604, 485, 492, 428, 487, -1, 197,
- 368, 488, 369, -1, 529, -1, 489, -1, 488, 370,
- 489, -1, 567, -1, 97, -1, 116, 97, -1, 223,
- -1, 221, -1, 204, -1, 217, -1, 100, -1, 218,
- -1, 218, 144, -1, 255, 106, 218, 144, -1, 157,
- 380, -1, 157, 176, 165, -1, 157, 60, 165, -1,
- 159, -1, 201, 4, -1, 41, 209, -1, 163, 567,
- -1, 3, 7, -1, 490, -1, 491, 370, 490, -1,
- -1, 174, 368, 491, 369, -1, -1, 192, 174, 368,
- 491, 369, -1, 256, -1, 257, 7, -1, 494, -1,
- 495, 370, 494, -1, -1, 368, 495, 369, -1, 173,
- 613, 496, -1, 183, 202, -1, -1, 201, 496, -1,
- 186, 509, 532, 163, 514, 535, 499, -1, 7, -1,
- 501, 370, 7, -1, 7, -1, 368, 501, 369, -1,
- 340, 368, 567, 369, -1, 341, 368, 567, 369, -1,
- 345, -1, 346, -1, 348, -1, 349, -1, 347, -1,
- 344, -1, 342, 502, -1, 343, 502, -1, 350, 7,
- -1, 339, 3, -1, 351, 7, -1, 503, -1, 504,
- 503, -1, -1, 222, 506, 504, -1, -1, 115, -1,
- 140, -1, -1, 201, 300, -1, 507, -1, 507, 298,
- 7, 508, -1, 507, 298, 368, 567, 369, 508, -1,
- 507, 298, 7, 370, 7, 508, -1, 507, 298, 368,
- 567, 370, 567, 369, 508, -1, 505, -1, 507, 298,
- 7, 370, 111, 7, 508, -1, 195, 604, 187, 511,
- 200, 133, 171, 613, 492, -1, -1, 512, -1, 511,
- 370, 512, -1, 611, 107, 567, -1, 195, 604, 187,
- 511, 516, 492, -1, 515, -1, 514, 370, 515, -1,
- 605, -1, 751, -1, 576, -1, -1, 549, -1, -1,
- 297, -1, 523, -1, 521, 517, 99, 526, 525, -1,
- 521, 517, 99, 115, 526, 525, -1, 521, 100, 526,
- 525, -1, 521, 100, 115, 526, 525, -1, 521, 98,
- 526, 525, -1, 521, 98, 115, 526, 525, -1, 518,
- -1, 524, -1, 518, -1, 224, 518, -1, 522, -1,
- 521, 517, 99, 526, 522, -1, 521, 517, 99, 115,
- 526, 522, -1, 521, 100, 526, 522, -1, 521, 100,
- 115, 526, 522, -1, 521, 98, 526, 522, -1, 521,
- 98, 115, 526, 522, -1, 527, -1, 302, 4, -1,
- 528, -1, 368, 520, 369, 452, -1, 302, 4, -1,
- 368, 224, 518, 369, 452, -1, 523, -1, 524, -1,
- -1, 296, 123, 368, 402, 369, -1, 186, 509, 532,
- 533, -1, 186, 509, 532, 534, -1, 186, 509, 532,
- 535, -1, 368, 585, 369, -1, 368, 585, 200, 553,
- 369, -1, 530, -1, 531, 530, -1, 585, -1, 122,
- 531, -1, 536, 516, 550, 551, -1, -1, 535, -1,
- 536, 516, 550, 551, 452, 552, 492, -1, 149, 537,
- -1, 541, -1, 537, 370, 541, -1, 386, -1, 538,
- 370, 386, -1, 368, 538, 369, -1, -1, 402, -1,
- 604, -1, 368, 520, 369, 380, -1, 368, 520, 369,
- 101, 380, -1, 546, -1, 600, 368, 540, 369, 539,
- 380, -1, 604, -1, 566, 380, -1, 566, 101, 380,
- -1, 368, 546, 369, -1, -1, 282, 544, -1, 283,
- 544, -1, 284, 544, -1, 286, -1, 287, -1, -1,
- 285, -1, 288, 543, -1, 543, -1, 547, -1, 276,
- 547, 251, -1, 368, 547, 369, -1, 541, 545, 290,
- 542, 548, -1, -1, 172, 553, -1, 289, 368, 402,
- 369, -1, 200, 553, -1, -1, 153, 123, 453, -1,
+ -1, 529, -1, 427, 101, 422, 426, -1, 427, 101,
+ 224, 518, -1, -1, 131, 198, 602, 425, 423, -1,
+ 131, 178, 198, 602, 101, 599, 368, 539, 369, 368,
+ 537, 369, -1, -1, 201, 126, 174, -1, -1, 368,
+ 402, 369, -1, -1, 368, 402, 369, -1, 152, 115,
+ 177, 193, 437, -1, 152, 433, 172, 603, 193, 436,
+ 432, -1, 152, 271, 172, 577, 193, 436, 432, -1,
+ 152, 272, 172, 4, 193, 436, -1, 152, 208, 172,
+ 709, 193, 436, 432, -1, 152, 436, 193, 436, 430,
+ -1, -1, 201, 68, 174, -1, 263, 433, 172, 603,
+ 149, 436, -1, 263, 271, 172, 577, 149, 436, -1,
+ 263, 208, 172, 709, 149, 436, -1, 263, 272, 172,
+ 4, 149, 436, -1, 263, 436, 149, 436, -1, -1,
+ 201, 152, 174, -1, 115, 177, -1, 115, -1, 434,
+ -1, 435, -1, 434, 370, 435, -1, 186, 428, -1,
+ 161, -1, 138, -1, 195, 428, -1, 181, 428, -1,
+ 437, -1, 436, 370, 437, -1, 179, -1, 614, -1,
+ 187, 264, 380, 380, -1, 131, 196, 614, -1, 131,
+ 69, 614, -1, 138, 196, 614, -1, 138, 196, 614,
+ 124, -1, 142, 196, 614, -1, 142, 196, 614, 124,
+ -1, 142, 69, 614, -1, 187, 196, 153, 614, 614,
+ -1, 231, 196, 153, 614, 614, -1, 138, 196, 153,
+ 614, 614, -1, -1, 176, 165, 368, 402, 369, -1,
+ 117, 192, 600, 444, 446, 149, 597, 447, 448, 449,
+ -1, -1, 101, 602, -1, -1, 196, 566, 264, 566,
+ -1, -1, 106, 186, -1, -1, 63, 101, 566, -1,
+ 88, -1, 90, -1, 64, -1, 136, 380, 134, 96,
+ 519, -1, 136, 380, 450, 134, 96, 519, -1, -1,
+ 97, 123, 453, -1, 454, -1, 453, 370, 454, -1,
+ 566, 455, -1, 572, 455, -1, -1, 118, -1, 139,
+ -1, 131, 317, 266, 96, 599, -1, 142, 317, 266,
+ 96, 599, -1, 316, 317, 266, 96, 599, -1, -1,
+ 4, -1, -1, 200, 4, -1, 131, 317, 599, 149,
+ 599, 459, 460, -1, 131, 315, 317, 599, 101, 4,
+ -1, -1, 201, 138, -1, 142, 317, 599, 462, -1,
+ -1, 101, 315, -1, 195, 317, 599, 464, -1, 131,
+ 60, 471, 157, 172, 599, 368, 610, 369, 472, 476,
+ 473, 467, 474, 475, -1, -1, 289, 242, -1, -1,
+ 368, 610, 369, -1, 131, 60, 238, 172, 599, 468,
+ -1, 142, 60, 238, 172, 599, 468, -1, -1, 301,
+ -1, -1, 201, 165, 610, -1, -1, 210, 201, 368,
+ 402, 369, -1, -1, 166, 4, -1, -1, 167, 4,
+ -1, -1, 106, 161, -1, 477, -1, 520, -1, 529,
+ -1, 510, -1, 513, -1, 486, -1, 481, -1, 482,
+ -1, 664, -1, 745, -1, 26, 253, 745, -1, 749,
+ -1, 666, -1, 706, -1, 480, -1, 498, -1, 617,
+ -1, 478, -1, 445, -1, 456, -1, 457, -1, 458,
+ -1, 461, -1, 463, -1, 465, -1, 466, -1, 469,
+ -1, 470, -1, 291, 380, -1, 127, 612, -1, 128,
+ 202, -1, 138, 149, 603, 200, 133, 171, 612, 492,
+ -1, 138, 149, 603, 516, 492, -1, 145, 612, 163,
+ 514, -1, 145, 612, 3, 163, 514, -1, 145, 612,
+ 3, 566, 163, 514, -1, 163, -1, 215, -1, 216,
+ -1, -1, 157, 3, -1, 161, 484, 603, 485, 492,
+ 428, 487, -1, 197, 368, 488, 369, -1, 528, -1,
+ 489, -1, 488, 370, 489, -1, 566, -1, 97, -1,
+ 116, 97, -1, 223, -1, 221, -1, 204, -1, 217,
+ -1, 100, -1, 218, -1, 218, 144, -1, 255, 106,
+ 218, 144, -1, 157, 380, -1, 157, 176, 165, -1,
+ 157, 60, 165, -1, 159, -1, 201, 4, -1, 41,
+ 209, -1, 163, 566, -1, 3, 7, -1, 490, -1,
+ 491, 370, 490, -1, -1, 174, 368, 491, 369, -1,
+ -1, 192, 174, 368, 491, 369, -1, 256, -1, 257,
+ 7, -1, 494, -1, 495, 370, 494, -1, -1, 368,
+ 495, 369, -1, 173, 612, 496, -1, 183, 202, -1,
+ -1, 201, 496, -1, 186, 509, 532, 163, 514, 534,
+ 499, -1, 7, -1, 501, 370, 7, -1, 7, -1,
+ 368, 501, 369, -1, 340, 368, 566, 369, -1, 341,
+ 368, 566, 369, -1, 345, -1, 346, -1, 348, -1,
+ 349, -1, 347, -1, 344, -1, 342, 502, -1, 343,
+ 502, -1, 350, 7, -1, 339, 3, -1, 351, 7,
+ -1, 503, -1, 504, 503, -1, -1, 222, 506, 504,
+ -1, -1, 115, -1, 140, -1, -1, 201, 300, -1,
+ 507, -1, 507, 298, 7, 508, -1, 507, 298, 368,
+ 566, 369, 508, -1, 507, 298, 7, 370, 7, 508,
+ -1, 507, 298, 368, 566, 370, 566, 369, 508, -1,
+ 505, -1, 507, 298, 7, 370, 111, 7, 508, -1,
+ 195, 603, 187, 511, 200, 133, 171, 612, 492, -1,
+ -1, 512, -1, 511, 370, 512, -1, 610, 107, 566,
+ -1, 195, 603, 187, 511, 516, 492, -1, 515, -1,
+ 514, 370, 515, -1, 604, -1, 750, -1, 575, -1,
+ -1, 548, -1, -1, 297, -1, 523, -1, 521, 517,
+ 99, 526, 525, -1, 521, 517, 99, 115, 526, 525,
+ -1, 521, 100, 526, 525, -1, 521, 100, 115, 526,
+ 525, -1, 521, 98, 526, 525, -1, 521, 98, 115,
+ 526, 525, -1, 518, -1, 524, -1, 518, -1, 224,
+ 518, -1, 522, -1, 521, 517, 99, 526, 522, -1,
+ 521, 517, 99, 115, 526, 522, -1, 521, 100, 526,
+ 522, -1, 521, 100, 115, 526, 522, -1, 521, 98,
+ 526, 522, -1, 521, 98, 115, 526, 522, -1, 527,
+ -1, 302, 4, -1, 528, -1, 368, 520, 369, 452,
+ -1, 302, 4, -1, 368, 224, 518, 369, 452, -1,
+ 523, -1, 524, -1, -1, 296, 123, 368, 402, 369,
+ -1, 186, 509, 532, 533, -1, 186, 509, 532, 534,
+ -1, 186, 509, 532, -1, 368, 584, 369, -1, 368,
+ 584, 200, 552, 369, -1, 530, -1, 531, 530, -1,
+ 584, -1, 122, 531, -1, 535, 516, 549, 550, -1,
+ 535, 516, 549, 550, 452, 551, 492, -1, 149, 536,
+ -1, 540, -1, 536, 370, 540, -1, 386, -1, 537,
+ 370, 386, -1, 368, 537, 369, -1, -1, 402, -1,
+ 603, -1, 368, 520, 369, 380, -1, 368, 520, 369,
+ 101, 380, -1, 545, -1, 599, 368, 539, 369, 538,
+ 380, -1, 603, -1, 565, 380, -1, 565, 101, 380,
+ -1, 368, 545, 369, -1, -1, 282, 543, -1, 283,
+ 543, -1, 284, 543, -1, 286, -1, 287, -1, -1,
+ 285, -1, 288, 542, -1, 542, -1, 546, -1, 276,
+ 546, 251, -1, 368, 546, 369, -1, 540, 544, 290,
+ 541, 547, -1, -1, 172, 552, -1, 289, 368, 402,
+ 369, -1, 200, 552, -1, -1, 153, 123, 453, -1,
153, 123, 184, 368, 453, 369, -1, 153, 123, 132,
- 368, 453, 369, -1, -1, 155, 553, -1, -1, 96,
+ 368, 453, 369, -1, -1, 155, 552, -1, -1, 96,
195, -1, 96, 301, 3, -1, 96, 301, 3, 3,
- -1, 553, 104, 553, -1, 553, 105, 553, -1, 106,
- 553, -1, 368, 553, 369, -1, 554, -1, 556, -1,
- 557, -1, 558, -1, 560, -1, 561, -1, 562, -1,
- 564, -1, 555, -1, 567, -1, 567, 107, 567, -1,
- 567, 106, 120, 567, 105, 567, -1, 567, 120, 567,
- 105, 567, -1, 567, 106, 168, 567, 559, -1, 567,
- 168, 567, 559, -1, -1, 143, 587, -1, 250, 143,
- 587, 251, -1, 567, 164, 106, 169, -1, 567, 164,
- 169, -1, 567, 106, 156, 566, -1, 567, 156, 566,
- -1, 567, 106, 156, 368, 584, 369, -1, 567, 156,
- 368, 584, 369, -1, 567, 107, 563, 566, -1, 116,
- -1, 115, -1, 189, -1, 144, 566, -1, 566, -1,
- 368, 518, 369, -1, 368, 224, 518, 369, -1, 567,
- 111, 567, -1, 567, 110, 567, -1, 567, 112, 567,
- -1, 567, 113, 567, -1, 110, 567, -1, 111, 567,
- -1, 660, -1, 708, -1, 605, -1, 568, -1, 583,
- -1, 586, -1, 597, -1, 565, -1, 368, 567, 369,
- -1, 368, 567, 370, 584, 369, -1, 582, -1, 754,
- -1, 570, -1, 572, -1, 588, -1, 589, -1, 594,
- -1, 595, -1, 575, -1, 746, -1, 749, -1, 751,
- -1, 586, -1, 597, -1, 565, -1, 368, 567, 369,
- -1, 368, 567, 370, 584, 369, -1, 582, -1, 754,
- -1, 570, -1, 572, -1, 588, -1, 589, -1, 594,
- -1, 595, -1, 575, -1, 746, -1, 749, -1, 752,
- -1, 278, 368, 607, 370, 567, 369, -1, -1, 311,
- 600, -1, 293, 368, 567, 101, 607, 571, 369, -1,
+ -1, 552, 104, 552, -1, 552, 105, 552, -1, 106,
+ 552, -1, 368, 552, 369, -1, 553, -1, 555, -1,
+ 556, -1, 557, -1, 559, -1, 560, -1, 561, -1,
+ 563, -1, 554, -1, 566, -1, 566, 107, 566, -1,
+ 566, 106, 120, 566, 105, 566, -1, 566, 120, 566,
+ 105, 566, -1, 566, 106, 168, 566, 558, -1, 566,
+ 168, 566, 558, -1, -1, 143, 586, -1, 250, 143,
+ 586, 251, -1, 566, 164, 106, 169, -1, 566, 164,
+ 169, -1, 566, 106, 156, 565, -1, 566, 156, 565,
+ -1, 566, 106, 156, 368, 583, 369, -1, 566, 156,
+ 368, 583, 369, -1, 566, 107, 562, 565, -1, 116,
+ -1, 115, -1, 189, -1, 144, 565, -1, 565, -1,
+ 368, 518, 369, -1, 368, 224, 518, 369, -1, 566,
+ 111, 566, -1, 566, 110, 566, -1, 566, 112, 566,
+ -1, 566, 113, 566, -1, 110, 566, -1, 111, 566,
+ -1, 659, -1, 707, -1, 604, -1, 567, -1, 582,
+ -1, 585, -1, 596, -1, 564, -1, 368, 566, 369,
+ -1, 368, 566, 370, 583, 369, -1, 581, -1, 753,
+ -1, 569, -1, 571, -1, 587, -1, 588, -1, 593,
+ -1, 594, -1, 574, -1, 745, -1, 748, -1, 750,
+ -1, 585, -1, 596, -1, 564, -1, 368, 566, 369,
+ -1, 368, 566, 370, 583, 369, -1, 581, -1, 753,
+ -1, 569, -1, 571, -1, 587, -1, 588, -1, 593,
+ -1, 594, -1, 574, -1, 745, -1, 748, -1, 751,
+ -1, 278, 368, 606, 370, 566, 369, -1, -1, 311,
+ 599, -1, 293, 368, 566, 101, 606, 570, 369, -1,
20, 23, 22, -1, 20, 23, 21, -1, 20, 23,
- 19, 22, -1, 567, 101, 380, 607, -1, 567, 101,
- 380, -1, 567, 380, -1, 567, 101, 573, -1, 567,
- 101, 4, -1, 567, 4, -1, 568, 661, -1, 576,
- -1, 605, 661, -1, -1, 584, -1, 380, -1, 380,
- 371, 753, -1, 380, 371, 380, 371, 753, -1, 380,
- 371, 380, 371, 380, 371, 753, -1, 380, 371, 371,
- 753, -1, 380, 371, 371, 380, 371, 753, -1, 282,
- -1, 283, -1, 266, -1, 380, 320, 567, -1, 579,
- 370, 380, 320, 567, -1, 574, -1, 580, 370, 574,
- -1, 580, 370, 567, -1, -1, 579, -1, 584, -1,
- 584, 370, 579, -1, 584, 370, 580, -1, 580, -1,
- 578, 368, 581, 369, -1, 17, 368, 16, 370, 567,
- 370, 567, 369, -1, 319, 368, 3, 149, 567, 369,
- -1, 274, 380, 368, 577, 369, 251, -1, 274, 282,
- 368, 577, 369, 251, -1, 274, 283, 368, 577, 369,
- 251, -1, 274, 266, 368, 577, 369, 251, -1, 274,
- 380, 368, 567, 156, 567, 369, 251, -1, 275, 578,
- 368, 577, 369, 251, -1, 275, 578, 251, -1, 274,
- 196, 368, 577, 369, 251, -1, 274, 125, 368, 577,
- 369, 251, -1, 274, 17, 368, 16, 370, 567, 370,
- 567, 369, 251, -1, 274, 278, 368, 567, 370, 3,
- 369, 251, -1, 274, 319, 368, 3, 149, 567, 369,
- 251, -1, 253, 368, 567, 369, 368, 581, 369, -1,
- 322, -1, 323, -1, 323, 368, 567, 369, -1, 324,
- -1, 324, 368, 567, 369, -1, 154, 368, 605, 369,
- -1, 14, 600, 251, -1, 14, 600, 368, 577, 369,
- 251, -1, 250, 380, 587, 251, -1, 277, 4, 251,
- -1, 567, -1, 584, 370, 567, -1, 567, -1, 574,
- -1, 585, 370, 567, -1, 585, 370, 574, -1, 596,
- -1, 598, -1, 196, -1, 586, -1, 583, -1, 279,
- 567, 591, 251, -1, 279, 590, 251, -1, 593, -1,
- 590, 593, -1, 592, -1, 591, 592, -1, 280, 567,
- 246, 567, -1, 247, 567, -1, 280, 553, 246, 567,
- -1, 247, 567, -1, 292, 368, 584, 369, -1, 294,
- 368, 567, 370, 567, 369, -1, 614, -1, 614, 614,
- -1, 614, 160, 614, -1, 241, 578, 368, 581, 369,
- -1, 11, 368, 140, 567, 369, -1, 11, 368, 115,
- 567, 369, -1, 11, 368, 567, 369, -1, 4, -1,
+ 19, 22, -1, 566, 101, 380, 606, -1, 566, 101,
+ 380, -1, 566, 380, -1, 566, 101, 572, -1, 566,
+ 101, 4, -1, 566, 4, -1, 567, 660, -1, 575,
+ -1, 604, 660, -1, -1, 583, -1, 380, -1, 380,
+ 371, 752, -1, 380, 371, 380, 371, 752, -1, 380,
+ 371, 380, 371, 380, 371, 752, -1, 380, 371, 371,
+ 752, -1, 380, 371, 371, 380, 371, 752, -1, 282,
+ -1, 283, -1, 266, -1, 380, 320, 566, -1, 578,
+ 370, 380, 320, 566, -1, 573, -1, 579, 370, 573,
+ -1, 579, 370, 566, -1, -1, 578, -1, 583, -1,
+ 583, 370, 578, -1, 583, 370, 579, -1, 579, -1,
+ 577, 368, 580, 369, -1, 17, 368, 16, 370, 566,
+ 370, 566, 369, -1, 319, 368, 3, 149, 566, 369,
+ -1, 274, 380, 368, 576, 369, 251, -1, 274, 282,
+ 368, 576, 369, 251, -1, 274, 283, 368, 576, 369,
+ 251, -1, 274, 266, 368, 576, 369, 251, -1, 274,
+ 380, 368, 566, 156, 566, 369, 251, -1, 275, 577,
+ 368, 576, 369, 251, -1, 275, 577, 251, -1, 274,
+ 196, 368, 576, 369, 251, -1, 274, 125, 368, 576,
+ 369, 251, -1, 274, 17, 368, 16, 370, 566, 370,
+ 566, 369, 251, -1, 274, 278, 368, 566, 370, 3,
+ 369, 251, -1, 274, 319, 368, 3, 149, 566, 369,
+ 251, -1, 253, 368, 566, 369, 368, 580, 369, -1,
+ 322, -1, 323, -1, 323, 368, 566, 369, -1, 324,
+ -1, 324, 368, 566, 369, -1, 154, 368, 604, 369,
+ -1, 14, 599, 251, -1, 14, 599, 368, 576, 369,
+ 251, -1, 250, 380, 586, 251, -1, 277, 4, 251,
+ -1, 566, -1, 583, 370, 566, -1, 566, -1, 573,
+ -1, 584, 370, 566, -1, 584, 370, 573, -1, 595,
+ -1, 597, -1, 196, -1, 585, -1, 582, -1, 279,
+ 566, 590, 251, -1, 279, 589, 251, -1, 592, -1,
+ 589, 592, -1, 591, -1, 590, 591, -1, 280, 566,
+ 246, 566, -1, 247, 566, -1, 280, 552, 246, 566,
+ -1, 247, 566, -1, 292, 368, 583, 369, -1, 294,
+ 368, 566, 370, 566, 369, -1, 613, -1, 613, 613,
+ -1, 613, 160, 613, -1, 241, 577, 368, 580, 369,
+ -1, 11, 368, 140, 566, 369, -1, 11, 368, 115,
+ 566, 369, -1, 11, 368, 566, 369, -1, 4, -1,
5, -1, 6, -1, 7, -1, 9, -1, 18, -1,
- 8, -1, 169, -1, 93, 171, 607, -1, 93, 171,
+ 8, -1, 169, -1, 93, 171, 606, -1, 93, 171,
301, -1, 93, 171, 94, -1, 93, 171, 95, -1,
4, -1, 5, -1, 6, -1, 7, -1, 111, 7,
-1, 110, 7, -1, 9, -1, 111, 9, -1, 110,
@@ -1578,8 +1564,8 @@ static const yytype_int16 yyrhs[] =
380, -1, 380, 371, 380, -1, 380, 371, 380, 371,
380, -1, 380, 371, 371, 380, -1, 380, -1, 380,
371, 380, -1, 380, 371, 380, 371, 380, -1, 380,
- 371, 371, 380, -1, 600, 493, -1, 600, 101, 380,
- 493, -1, 600, 380, 493, -1, 380, -1, 380, 371,
+ 371, 371, 380, -1, 599, 493, -1, 599, 101, 380,
+ 493, -1, 599, 380, 493, -1, 380, -1, 380, 371,
380, -1, 380, 371, 380, 371, 380, -1, 380, 371,
380, 371, 380, 371, 380, -1, 380, 371, 371, 380,
371, 380, -1, 112, -1, 380, 371, 112, -1, 380,
@@ -1595,300 +1581,300 @@ static const yytype_int16 yyrhs[] =
268, -1, 312, -1, 312, 368, 7, 369, -1, 313,
-1, 313, 368, 7, 369, -1, 214, 313, -1, 116,
-1, 116, 368, 7, 369, -1, 219, 368, 7, 369,
- -1, 219, -1, 220, -1, 606, -1, 125, -1, 211,
+ -1, 219, -1, 220, -1, 605, -1, 125, -1, 211,
-1, 211, 368, 7, 369, -1, 125, 368, 7, 369,
- -1, 204, -1, 204, 372, 7, 373, -1, 609, 608,
- -1, 607, -1, 709, -1, 606, -1, 125, -1, 211,
+ -1, 204, -1, 204, 372, 7, 373, -1, 608, 607,
+ -1, 606, -1, 708, -1, 605, -1, 125, -1, 211,
-1, 211, 368, 7, 369, -1, 125, 368, 7, 369,
- -1, 709, -1, 214, 709, -1, 214, 116, -1, 214,
+ -1, 708, -1, 214, 708, -1, 214, 116, -1, 214,
301, -1, 380, -1, 380, 371, 380, 371, 380, 371,
380, -1, 380, -1, 380, -1, 12, -1, 13, -1,
380, -1, -1, 4, -1, -1, 370, 4, -1, 225,
- 616, -1, 226, 616, -1, 226, 4, 4, -1, 227,
- 4, -1, 126, -1, 229, 228, 616, 617, -1, 233,
- 228, 616, -1, 266, 172, -1, 266, 265, -1, 619,
- -1, 622, -1, 625, -1, 745, -1, 677, -1, 685,
- -1, 686, -1, 131, 241, 603, 628, 627, 149, 602,
- 370, 602, 370, 602, 620, 621, -1, -1, 370, 602,
- -1, -1, 97, -1, 131, 626, 603, 628, 627, 637,
- 642, -1, 117, 626, 601, 628, 627, 637, 446, 149,
- 598, -1, 131, 626, 603, 628, 627, 637, 166, 742,
- 310, 59, 4, 726, -1, 626, 380, 628, 627, 637,
- 642, -1, 623, 367, -1, 624, 623, 367, -1, 131,
- 273, 603, 250, 624, 251, -1, 242, -1, 178, -1,
- -1, 254, 609, -1, 368, 369, -1, 368, 629, 369,
- -1, 630, -1, 629, 370, 630, -1, 631, 605, 609,
- 637, -1, 631, 605, 609, 137, 599, 637, -1, 631,
- 605, 609, 108, 599, 637, -1, 156, -1, 243, -1,
- 62, -1, -1, 631, -1, -1, 81, 156, -1, 81,
+ 615, -1, 226, 615, -1, 226, 4, 4, -1, 227,
+ 4, -1, 126, -1, 229, 228, 615, 616, -1, 233,
+ 228, 615, -1, 266, 172, -1, 266, 265, -1, 618,
+ -1, 621, -1, 624, -1, 744, -1, 676, -1, 684,
+ -1, 685, -1, 131, 241, 602, 627, 626, 149, 601,
+ 370, 601, 370, 601, 619, 620, -1, -1, 370, 601,
+ -1, -1, 97, -1, 131, 625, 602, 627, 626, 636,
+ 641, -1, 117, 625, 600, 627, 626, 636, 446, 149,
+ 597, -1, 131, 625, 602, 627, 626, 636, 166, 741,
+ 310, 59, 4, 725, -1, 625, 380, 627, 626, 636,
+ 641, -1, 622, 367, -1, 623, 622, 367, -1, 131,
+ 273, 602, 250, 623, 251, -1, 242, -1, 178, -1,
+ -1, 254, 608, -1, 368, 369, -1, 368, 628, 369,
+ -1, 629, -1, 628, 370, 629, -1, 630, 604, 608,
+ 636, -1, 630, 604, 608, 137, 598, 636, -1, 630,
+ 604, 608, 108, 598, 636, -1, 156, -1, 243, -1,
+ 62, -1, -1, 630, -1, -1, 81, 156, -1, 81,
243, -1, 81, 62, -1, 82, 156, -1, 82, 243,
- -1, 82, 62, -1, 635, -1, 634, 370, 635, -1,
- 3, 108, 599, -1, 78, -1, 75, -1, 80, -1,
+ -1, 82, 62, -1, 634, -1, 633, 370, 634, -1,
+ 3, 108, 598, -1, 78, -1, 75, -1, 80, -1,
73, -1, 79, -1, 74, -1, 76, -1, -1, 83,
- 368, 636, 108, 4, 633, 370, 634, 369, -1, 636,
- 4, 633, -1, 7, -1, 9, -1, 638, -1, 639,
- 370, 638, -1, 366, 368, 639, 369, -1, 500, -1,
+ 368, 635, 108, 4, 632, 370, 633, 369, -1, 635,
+ 4, 632, -1, 7, -1, 9, -1, 637, -1, 638,
+ 370, 637, -1, 366, 368, 638, 369, -1, 500, -1,
510, -1, 513, -1, 486, -1, 481, -1, 482, -1,
479, -1, 483, -1, 497, -1, 498, -1, 480, -1,
- 640, -1, -1, -1, 250, 643, 644, 251, -1, 645,
- -1, 644, 645, -1, 651, 367, -1, 642, -1, -1,
- 646, 647, -1, 641, 367, -1, 659, -1, 380, 103,
- 645, -1, 15, -1, 107, 567, 15, -1, 113, 567,
- 15, -1, 224, 518, 367, -1, 642, -1, -1, 649,
- 641, 367, -1, -1, 650, 659, -1, 451, -1, 652,
- -1, 656, -1, 136, 653, 609, -1, 380, -1, 653,
+ 639, -1, -1, -1, 250, 642, 643, 251, -1, 644,
+ -1, 643, 644, -1, 650, 367, -1, 641, -1, -1,
+ 645, 646, -1, 640, 367, -1, 658, -1, 380, 103,
+ 644, -1, 15, -1, 107, 566, 15, -1, 113, 566,
+ 15, -1, 224, 518, 367, -1, 641, -1, -1, 648,
+ 640, 367, -1, -1, 649, 658, -1, 451, -1, 651,
+ -1, 655, -1, 136, 652, 608, -1, 380, -1, 652,
370, 380, -1, 106, 148, -1, 258, 4, -1, 258,
- 65, 4, -1, 260, -1, 259, -1, 642, -1, 641,
- -1, 665, -1, 749, -1, 746, -1, 667, -1, 262,
- -1, 262, 567, -1, 669, -1, 660, -1, 663, -1,
- 668, -1, 676, -1, 670, -1, 199, 654, 150, 380,
- -1, 199, 654, 151, 193, 380, -1, 199, 654, 137,
- -1, 136, 657, 244, 96, 658, 655, -1, 130, -1,
- 261, -1, 654, -1, 658, 370, 654, -1, 665, 367,
- -1, 749, 367, -1, 746, 367, -1, 667, 367, -1,
- 262, 367, -1, 262, 567, 367, -1, 669, 367, -1,
- 660, 367, -1, 663, -1, 668, 367, -1, 676, -1,
- 670, -1, 662, 108, 567, -1, 605, 661, 108, 567,
- -1, 372, 567, 373, -1, 661, 372, 567, 373, -1,
- 605, -1, 751, -1, 245, 368, 553, 369, 648, 664,
- -1, -1, 247, 648, -1, 253, 578, 368, 581, 369,
- -1, 224, 582, -1, 582, -1, 334, 336, -1, 334,
+ 65, 4, -1, 260, -1, 259, -1, 641, -1, 640,
+ -1, 664, -1, 748, -1, 745, -1, 666, -1, 262,
+ -1, 262, 566, -1, 668, -1, 659, -1, 662, -1,
+ 667, -1, 675, -1, 669, -1, 199, 653, 150, 380,
+ -1, 199, 653, 151, 193, 380, -1, 199, 653, 137,
+ -1, 136, 656, 244, 96, 657, 654, -1, 130, -1,
+ 261, -1, 653, -1, 657, 370, 653, -1, 664, 367,
+ -1, 748, 367, -1, 745, 367, -1, 666, 367, -1,
+ 262, 367, -1, 262, 566, 367, -1, 668, 367, -1,
+ 659, 367, -1, 662, -1, 667, 367, -1, 675, -1,
+ 669, -1, 661, 108, 566, -1, 604, 660, 108, 566,
+ -1, 372, 566, 373, -1, 660, 372, 566, 373, -1,
+ 604, -1, 750, -1, 245, 368, 552, 369, 647, 663,
+ -1, -1, 247, 647, -1, 253, 577, 368, 580, 369,
+ -1, 224, 581, -1, 581, -1, 334, 336, -1, 334,
335, -1, 337, 334, -1, 338, -1, 187, 380, 107,
- 567, -1, 187, 380, 172, -1, 187, 380, 265, -1,
- 187, 331, 332, 333, 666, -1, 150, 380, -1, 151,
- 193, 380, -1, 252, 567, -1, 252, -1, 249, 368,
- 553, 369, 648, -1, 660, -1, 652, -1, 665, -1,
- 746, -1, -1, 671, -1, 672, 370, 671, -1, 660,
- -1, 665, -1, 746, -1, -1, 673, -1, 674, 370,
- 673, -1, -1, 553, -1, 96, 519, 255, 648, -1,
- 96, 368, 672, 367, 675, 367, 674, 369, 648, -1,
- 84, 368, 609, 380, 156, 567, 369, 255, 648, -1,
- 131, 238, 380, 680, 681, 172, 600, 678, 682, 679,
- -1, -1, 97, 7, -1, 642, -1, 235, -1, 236,
+ 566, -1, 187, 380, 172, -1, 187, 380, 265, -1,
+ 187, 331, 332, 333, 665, -1, 150, 380, -1, 151,
+ 193, 380, -1, 252, 566, -1, 252, -1, 249, 368,
+ 552, 369, 647, -1, 659, -1, 651, -1, 664, -1,
+ 745, -1, -1, 670, -1, 671, 370, 670, -1, 659,
+ -1, 664, -1, 745, -1, -1, 672, -1, 673, 370,
+ 672, -1, -1, 552, -1, 96, 519, 255, 647, -1,
+ 96, 368, 671, 367, 674, 367, 673, 369, 647, -1,
+ 84, 368, 608, 380, 156, 566, 369, 255, 647, -1,
+ 131, 238, 380, 679, 680, 172, 599, 677, 681, 678,
+ -1, -1, 97, 7, -1, 641, -1, 235, -1, 236,
-1, 237, 171, -1, 161, -1, 195, 427, -1, 138,
- -1, -1, 239, 683, -1, 684, -1, 683, 370, 684,
+ -1, -1, 239, 682, -1, 683, -1, 682, 370, 683,
-1, 240, 101, 380, -1, 295, 101, 380, -1, 142,
- 238, 600, -1, 142, 241, 600, -1, 142, 626, 600,
- -1, 142, 273, 600, -1, -1, 101, 380, -1, 605,
- -1, 567, 101, 380, -1, 567, 156, 380, -1, 688,
- -1, 689, 370, 688, -1, 368, 689, 369, -1, -1,
- 176, 165, 368, 402, 369, -1, -1, 172, 368, 553,
- 369, -1, -1, 3, -1, 600, 380, 687, 690, 692,
- 691, 693, 695, -1, -1, 250, 697, 251, -1, 529,
- -1, 250, 697, 251, -1, 694, -1, 697, 370, 694,
+ 238, 599, -1, 142, 241, 599, -1, 142, 625, 599,
+ -1, 142, 273, 599, -1, -1, 101, 380, -1, 604,
+ -1, 566, 101, 380, -1, 566, 156, 380, -1, 687,
+ -1, 688, 370, 687, -1, 368, 688, 369, -1, -1,
+ 176, 165, 368, 402, 369, -1, -1, 172, 368, 552,
+ 369, -1, -1, 3, -1, 599, 380, 686, 689, 691,
+ 690, 692, 694, -1, -1, 250, 696, 251, -1, 528,
+ -1, 250, 696, 251, -1, 693, -1, 696, 370, 693,
-1, -1, 303, -1, -1, 304, 7, -1, -1, 308,
309, -1, 308, 310, -1, 308, 4, -1, 185, 310,
- -1, 185, 4, -1, -1, 179, 4, 380, 4, 698,
- 699, 700, -1, 3, -1, 4, -1, 3, 107, 702,
- -1, 703, -1, 704, 703, -1, -1, 372, 704, 373,
- -1, 131, 301, 198, 603, 101, 705, 696, 693, 701,
- -1, 142, 301, 198, 600, -1, 567, 109, 567, -1,
+ -1, 185, 4, -1, -1, 179, 4, 380, 4, 697,
+ 698, 699, -1, 3, -1, 4, -1, 3, 107, 701,
+ -1, 702, -1, 703, 702, -1, -1, 372, 703, 373,
+ -1, 131, 301, 198, 602, 101, 704, 695, 692, 700,
+ -1, 142, 301, 198, 599, -1, 566, 109, 566, -1,
380, -1, 380, 371, 380, -1, 380, 371, 380, 371,
380, -1, 380, 371, 371, 380, -1, 380, -1, 380,
371, 380, -1, 380, 371, 380, 371, 380, -1, 380,
371, 371, 380, -1, 380, -1, 380, 371, 380, -1,
380, 371, 380, 371, 380, -1, 380, 371, 371, 380,
- -1, -1, 131, 24, 711, 716, 715, 713, 717, 726,
- 729, -1, 142, 24, 710, 417, -1, -1, 166, 743,
- 310, 59, 4, -1, 310, 59, 4, 166, 743, -1,
- 166, 743, -1, -1, 208, 709, -1, -1, 101, 718,
- -1, 368, 719, 369, -1, 723, -1, 719, 370, 723,
+ -1, -1, 131, 24, 710, 715, 714, 712, 716, 725,
+ 728, -1, 142, 24, 709, 417, -1, -1, 166, 742,
+ 310, 59, 4, -1, 310, 59, 4, 166, 742, -1,
+ 166, 742, -1, -1, 208, 708, -1, -1, 101, 717,
+ -1, 368, 718, 369, -1, 722, -1, 718, 370, 722,
-1, -1, 310, 59, 4, -1, 310, 59, 4, 310,
24, 4, -1, 310, 24, 4, -1, -1, 77, 4,
-1, 78, 4, -1, 78, 4, 77, 4, -1, 77,
4, 78, 4, -1, -1, 310, 24, 4, -1, 380,
- 609, 724, 725, 571, 720, 721, -1, -1, 181, 86,
+ 608, 723, 724, 570, 719, 720, -1, -1, 181, 86,
27, 390, -1, 181, 86, 106, 27, -1, -1, 137,
- 599, -1, -1, 727, -1, 728, -1, 727, 728, -1,
- 25, -1, 106, 25, -1, 87, 289, 609, -1, 87,
+ 598, -1, -1, 726, -1, 727, -1, 726, 727, -1,
+ 25, -1, 106, 25, -1, 87, 289, 608, -1, 87,
149, 368, 402, 369, -1, 87, 164, 28, 29, -1,
293, 368, 30, 101, 87, 369, 201, 380, -1, 293,
368, 87, 101, 30, 369, 201, 380, -1, 35, 101,
87, -1, 70, -1, 330, -1, 78, 4, -1, -1,
- 730, -1, 736, -1, 730, 370, 736, -1, -1, 88,
- -1, 33, -1, 368, 369, -1, 368, 733, 369, -1,
- 734, -1, 733, 370, 734, -1, 632, 605, 609, 722,
- -1, 731, 26, 753, 732, 254, 609, 738, -1, 34,
- 26, 753, 732, 738, -1, 735, 737, 739, -1, 36,
- 735, -1, -1, 35, 101, 31, -1, 35, 101, 32,
+ 729, -1, 735, -1, 729, 370, 735, -1, -1, 88,
+ -1, 33, -1, 368, 369, -1, 368, 732, 369, -1,
+ 733, -1, 732, 370, 733, -1, 631, 604, 608, 721,
+ -1, 730, 26, 752, 731, 254, 608, 737, -1, 34,
+ 26, 752, 731, 737, -1, 734, 736, 738, -1, 36,
+ 734, -1, -1, 35, 101, 31, -1, 35, 101, 32,
-1, 35, 101, 31, 35, 101, 32, -1, -1, 89,
- 603, -1, -1, 740, -1, 741, -1, 740, 741, -1,
- 166, 743, -1, 66, 37, 38, -1, 66, 37, 39,
+ 602, -1, -1, 739, -1, 740, -1, 739, 740, -1,
+ 166, 742, -1, 66, 37, 38, -1, 66, 37, 39,
-1, 40, -1, 106, 40, -1, 41, 38, -1, 42,
38, -1, 43, 38, 44, -1, 49, 38, 44, -1,
254, 169, 172, 169, 50, -1, 51, 172, 169, 50,
-1, 310, 59, 4, -1, 310, 67, 59, 4, -1,
310, 24, 4, -1, 52, -1, 53, -1, 54, -1,
55, -1, 56, -1, 57, -1, 58, -1, 61, -1,
- 71, -1, 742, -1, 38, -1, -1, 254, 711, -1,
- 131, 731, 26, 753, 628, 627, 637, 96, 709, 642,
- -1, 131, 34, 26, 600, 628, 744, 96, 709, 642,
- -1, 709, 102, 753, 368, 581, 369, -1, 380, 371,
- 380, 371, 380, 371, 753, -1, 380, 371, 371, 380,
- 371, 753, -1, 380, 371, 747, -1, 380, 371, 380,
- 371, 380, 371, 380, 371, 753, -1, 380, 371, 371,
- 380, 371, 380, 371, 753, -1, 380, 371, 748, -1,
- 569, 371, 753, 368, 581, 369, -1, 748, 368, 581,
- 369, -1, 368, 568, 101, 709, 369, 371, 753, 368,
- 581, 369, -1, 368, 605, 101, 709, 369, 371, 753,
- 368, 581, 369, -1, 26, 253, 569, 371, 753, 368,
- 581, 369, -1, 26, 253, 748, 368, 581, 369, -1,
- 26, 253, 368, 568, 101, 709, 369, 371, 753, 368,
- 581, 369, -1, 26, 253, 368, 605, 101, 709, 369,
- 371, 753, 368, 581, 369, -1, 752, -1, 380, 371,
- 747, -1, 569, 371, 753, -1, 368, 568, 101, 709,
- 369, 371, 753, -1, 368, 605, 101, 709, 369, 371,
- 753, -1, 380, -1, 319, -1, 295, 709, 368, 581,
- 369, -1, 230, 24, 709, 756, -1, 231, 72, 723,
- -1, 142, 72, 380, 417, -1, 231, 736, -1, 142,
- 735, 417, -1, -1, 201, 325, 107, 329, -1, 201,
+ 71, -1, 741, -1, 38, -1, -1, 254, 710, -1,
+ 131, 730, 26, 752, 627, 626, 636, 96, 708, 641,
+ -1, 131, 34, 26, 599, 627, 743, 96, 708, 641,
+ -1, 708, 102, 752, 368, 580, 369, -1, 380, 371,
+ 380, 371, 380, 371, 752, -1, 380, 371, 371, 380,
+ 371, 752, -1, 380, 371, 746, -1, 380, 371, 380,
+ 371, 380, 371, 380, 371, 752, -1, 380, 371, 371,
+ 380, 371, 380, 371, 752, -1, 380, 371, 747, -1,
+ 568, 371, 752, 368, 580, 369, -1, 747, 368, 580,
+ 369, -1, 368, 567, 101, 708, 369, 371, 752, 368,
+ 580, 369, -1, 368, 604, 101, 708, 369, 371, 752,
+ 368, 580, 369, -1, 26, 253, 568, 371, 752, 368,
+ 580, 369, -1, 26, 253, 747, 368, 580, 369, -1,
+ 26, 253, 368, 567, 101, 708, 369, 371, 752, 368,
+ 580, 369, -1, 26, 253, 368, 604, 101, 708, 369,
+ 371, 752, 368, 580, 369, -1, 751, -1, 380, 371,
+ 746, -1, 568, 371, 752, -1, 368, 567, 101, 708,
+ 369, 371, 752, -1, 368, 604, 101, 708, 369, 371,
+ 752, -1, 380, -1, 319, -1, 295, 708, 368, 580,
+ 369, -1, 230, 24, 708, 755, -1, 231, 72, 722,
+ -1, 142, 72, 380, 417, -1, 231, 735, -1, 142,
+ 734, 417, -1, -1, 201, 325, 107, 329, -1, 201,
325, 107, 330, -1, -1, 201, 326, -1, 131, 327,
- 600, 101, 567, 757, 758, -1, 131, 328, 600, 149,
- 567, 757, 758, -1, 142, 327, 600, -1, 142, 328,
- 600, -1, 162, -1, 162, 368, 7, 369, -1, 121,
+ 599, 101, 566, 756, 757, -1, 131, 328, 599, 149,
+ 566, 756, 757, -1, 142, 327, 599, -1, 142, 328,
+ 599, -1, 162, -1, 162, 368, 7, 369, -1, 121,
-1, 121, 368, 7, 369, -1, 211, -1, 211, 368,
7, 370, 7, 369, -1, 211, 368, 111, 7, 370,
- 7, 369, -1, 3, -1, 764, -1, 765, 370, 764,
- -1, 368, 7, 370, 7, 369, -1, 766, -1, 767,
- 370, 766, -1, 153, 368, 765, 369, -1, 153, 368,
- 765, 369, 155, 767, -1, 768, -1, 769, 370, 768,
- -1, -1, 137, -1, 131, 209, 3, 770, 769, -1,
- 3, 763, -1, 773, 370, 3, 763, -1, -1, 368,
- 772, 369, -1, -1, 209, 3, -1, 230, 157, 3,
- 172, 600, 307, 774, 773, -1
+ 7, 369, -1, 3, -1, 763, -1, 764, 370, 763,
+ -1, 368, 7, 370, 7, 369, -1, 765, -1, 766,
+ 370, 765, -1, 153, 368, 764, 369, -1, 153, 368,
+ 764, 369, 155, 766, -1, 767, -1, 768, 370, 767,
+ -1, -1, 137, -1, 131, 209, 3, 769, 768, -1,
+ 3, 762, -1, 772, 370, 3, 762, -1, -1, 368,
+ 771, 369, -1, -1, 209, 3, -1, 230, 157, 3,
+ 172, 599, 307, 773, 772, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 651, 651, 652, 655, 662, 664, 665, 666, 667,
- 668, 669, 670, 671, 672, 688, 689, 690, 691, 695,
- 697, 698, 699, 700, 701, 703, 704, 705, 706, 707,
- 708, 709, 710, 711, 712, 713, 714, 718, 719, 720,
- 721, 722, 723, 724, 725, 726, 727, 728, 729, 730,
- 731, 732, 733, 734, 735, 736, 737, 738, 739, 740,
- 741, 742, 743, 744, 745, 746, 747, 748, 749, 750,
- 751, 752, 753, 754, 755, 756, 757, 758, 759, 760,
- 761, 762, 763, 764, 765, 766, 767, 768, 769, 770,
- 771, 772, 773, 774, 775, 776, 777, 778, 779, 780,
- 781, 782, 783, 784, 785, 786, 787, 788, 789, 790,
- 791, 792, 793, 794, 795, 796, 797, 798, 799, 803,
- 804, 805, 809, 810, 811, 816, 819, 824, 825, 830,
- 831, 835, 840, 841, 845, 856, 857, 861, 865, 866,
- 870, 871, 872, 876, 877, 878, 879, 880, 884, 892,
- 893, 897, 898, 910, 911, 912, 917, 918, 922, 923,
- 924, 925, 926, 927, 928, 929, 930, 931, 933, 934,
- 943, 948, 949, 954, 956, 959, 961, 963, 968, 972,
- 973, 977, 978, 982, 983, 987, 988, 989, 990, 991,
- 992, 993, 994, 995, 999, 1000, 1004, 1005, 1009, 1012,
- 1019, 1023, 1024, 1028, 1029, 1033, 1034, 1038, 1039, 1043,
- 1044, 1048, 1058, 1068, 1075, 1081, 1082, 1083, 1087, 1088,
- 1089, 1093, 1097, 1101, 1118, 1125, 1132, 1137, 1141, 1148,
- 1148, 1151, 1159, 1160, 1164, 1165, 1169, 1170, 1174, 1176,
- 1178, 1184, 1190, 1197, 1202, 1203, 1211, 1214, 1220, 1226,
- 1232, 1237, 1238, 1242, 1255, 1268, 1272, 1273, 1278, 1280,
- 1281, 1282, 1284, 1290, 1291, 1296, 1297, 1301, 1306, 1307,
- 1311, 1312, 1313, 1314, 1315, 1319, 1324, 1329, 1335, 1336,
- 1344, 1354, 1355, 1360, 1363, 1368, 1369, 1373, 1374, 1382,
- 1383, 1384, 1389, 1393, 1400, 1401, 1405, 1406, 1411, 1413,
- 1418, 1419, 1420, 1425, 1432, 1439, 1446, 1447, 1451, 1452,
- 1456, 1460, 1467, 1468, 1472, 1479, 1480, 1484, 1497, 1510,
- 1511, 1515, 1516, 1520, 1528, 1536, 1537, 1541, 1542, 1546,
- 1547, 1551, 1552, 1556, 1557, 1561, 1562, 1567, 1571, 1573,
- 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1582, 1583,
- 1584, 1585, 1586, 1587, 1588, 1589, 1590, 1591, 1592, 1593,
- 1594, 1595, 1596, 1597, 1601, 1608, 1613, 1618, 1623, 1630,
- 1632, 1637, 1645, 1646, 1647, 1652, 1653, 1658, 1663, 1665,
- 1669, 1670, 1675, 1681, 1682, 1683, 1684, 1685, 1686, 1687,
- 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697,
- 1698, 1709, 1710, 1714, 1715, 1719, 1720, 1724, 1725, 1729,
- 1730, 1735, 1736, 1740, 1746, 1751, 1752, 1756, 1785, 1786,
- 1790, 1791, 1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803,
- 1804, 1805, 1806, 1807, 1808, 1813, 1814, 1818, 1818, 1824,
- 1825, 1826, 1837, 1838, 1843, 1844, 1846, 1848, 1850, 1852,
- 1853, 1859, 1867, 1868, 1869, 1874, 1878, 1891, 1892, 1897,
- 1898, 1899, 1903, 1904, 1910, 1911, 1915, 1916, 1918, 1920,
- 1922, 1924, 1926, 1931, 1932, 1936, 1937, 1941, 1942, 1944,
- 1946, 1948, 1950, 1952, 1957, 1958, 1962, 1963, 1964, 1968,
- 1972, 1973, 1977, 1978, 1983, 1991, 2003, 2020, 2021, 2027,
- 2028, 2032, 2033, 2037, 2048, 2049, 2053, 2065, 2069, 2070,
- 2076, 2077, 2083, 2088, 2089, 2093, 2095, 2099, 2103, 2105,
- 2112, 2113, 2117, 2121, 2125, 2126, 2127, 2129, 2130, 2131,
- 2134, 2136, 2140, 2144, 2151, 2152, 2153, 2157, 2165, 2166,
- 2167, 2172, 2176, 2177, 2181, 2193, 2228, 2229, 2233, 2234,
- 2235, 2236, 2242, 2244, 2246, 2248, 2249, 2253, 2254, 2255,
- 2256, 2257, 2258, 2259, 2260, 2264, 2273, 2296, 2304, 2315,
- 2321, 2329, 2330, 2336, 2345, 2350, 2354, 2360, 2363, 2366,
- 2379, 2384, 2385, 2386, 2390, 2400, 2405, 2406, 2411, 2412,
- 2413, 2414, 2415, 2416, 2418, 2419, 2420, 2421, 2422, 2426,
- 2427, 2428, 2429, 2430, 2434, 2435, 2436, 2437, 2438, 2439,
- 2440, 2441, 2442, 2443, 2444, 2445, 2449, 2450, 2451, 2452,
- 2453, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465,
- 2466, 2467, 2468, 2472, 2481, 2482, 2486, 2499, 2501, 2503,
- 2508, 2510, 2512, 2514, 2516, 2518, 2523, 2526, 2530, 2536,
- 2537, 2544, 2545, 2546, 2547, 2548, 2549, 2550, 2551, 2552,
- 2557, 2558, 2563, 2564, 2565, 2569, 2570, 2571, 2572, 2574,
- 2575, 2579, 2591, 2597, 2603, 2605, 2607, 2609, 2611, 2618,
- 2620, 2622, 2625, 2628, 2634, 2643, 2649, 2652, 2656, 2660,
- 2664, 2668, 2672, 2682, 2684, 2704, 2709, 2715, 2716, 2720,
- 2721, 2722, 2723, 2727, 2728, 2729, 2734, 2735, 2739, 2745,
- 2750, 2751, 2755, 2756, 2760, 2762, 2767, 2769, 2774, 2779,
- 2786, 2787, 2789, 2794, 2800, 2801, 2802, 2806, 2807, 2808,
- 2809, 2810, 2811, 2812, 2813, 2814, 2815, 2816, 2817, 2821,
- 2822, 2823, 2824, 2825, 2826, 2827, 2828, 2842, 2843, 2844,
- 2850, 2851, 2852, 2853, 2857, 2858, 2859, 2860, 2864, 2865,
- 2866, 2867, 2871, 2872, 2873, 2874, 2878, 2880, 2884, 2892,
- 2895, 2898, 2901, 2904, 2907, 2910, 2913, 2916, 2919, 2926,
- 2929, 2932, 2935, 2938, 2941, 2944, 2947, 2950, 2953, 2956,
- 2959, 2962, 2965, 2968, 2971, 2974, 2977, 2980, 2983, 2986,
- 2989, 2992, 2995, 2998, 3001, 3004, 3007, 3009, 3014, 3017,
- 3020, 3026, 3027, 3030, 3033, 3036, 3042, 3043, 3047, 3051,
- 3052, 3056, 3057, 3060, 3063, 3066, 3069, 3079, 3089, 3093,
- 3100, 3108, 3116, 3120, 3124, 3125, 3129, 3133, 3134, 3138,
- 3139, 3143, 3145, 3147, 3149, 3151, 3153, 3155, 3157, 3159,
- 3180, 3181, 3182, 3183, 3184, 3185, 3186, 3190, 3200, 3201,
- 3205, 3206, 3210, 3214, 3218, 3226, 3232, 3234, 3239, 3246,
- 3247, 3251, 3252, 3256, 3257, 3261, 3263, 3268, 3270, 3272,
- 3277, 3278, 3279, 3283, 3284, 3288, 3289, 3290, 3291, 3292,
- 3293, 3294, 3298, 3299, 3303, 3307, 3308, 3309, 3310, 3311,
- 3312, 3313, 3317, 3318, 3320, 3324, 3325, 3336, 3337, 3341,
- 3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353, 3354, 3355,
- 3356, 3357, 3358, 3362, 3362, 3372, 3373, 3377, 3378, 3379,
- 3379, 3383, 3384, 3385, 3386, 3387, 3395, 3403, 3410, 3411,
- 3411, 3412, 3412, 3416, 3417, 3418, 3422, 3431, 3433, 3438,
- 3439, 3440, 3444, 3445, 3449, 3450, 3451, 3452, 3453, 3454,
- 3455, 3456, 3457, 3458, 3459, 3460, 3461, 3462, 3466, 3468,
- 3470, 3472, 3477, 3478, 3482, 3483, 3487, 3488, 3489, 3490,
- 3491, 3492, 3493, 3494, 3495, 3496, 3497, 3498, 3502, 3503,
- 3511, 3512, 3516, 3517, 3546, 3554, 3555, 3559, 3561, 3562,
- 3566, 3567, 3568, 3569, 3573, 3576, 3579, 3582, 3588, 3589,
- 3593, 3594, 3598, 3603, 3604, 3605, 3606, 3610, 3611, 3612,
- 3616, 3617, 3618, 3622, 3623, 3624, 3628, 3629, 3633, 3635,
- 3637, 3642, 3648, 3649, 3653, 3657, 3658, 3659, 3663, 3664,
- 3666, 3670, 3671, 3675, 3676, 3680, 3681, 3685, 3694, 3699,
- 3704, 3719, 3720, 3724, 3731, 3732, 3745, 3746, 3751, 3755,
- 3756, 3762, 3763, 3768, 3769, 3774, 3794, 3795, 3800, 3801,
- 3811, 3812, 3816, 3817, 3821, 3822, 3838, 3839, 3840, 3841,
- 3842, 3843, 3847, 3848, 3858, 3859, 3863, 3873, 3876, 3882,
- 3883, 3889, 3896, 3917, 3927, 3928, 3929, 3930, 3934, 3935,
- 3936, 3937, 3941, 3942, 3943, 3944, 3948, 3948, 3959, 3966,
- 3967, 3973, 3979, 3988, 3989, 3993, 3994, 3998, 4003, 4004,
- 4008, 4009, 4010, 4011, 4015, 4016, 4017, 4018, 4019, 4023,
- 4024, 4028, 4035, 4036, 4037, 4041, 4042, 4046, 4047, 4051,
- 4052, 4056, 4057, 4058, 4059, 4060, 4061, 4062, 4063, 4064,
- 4065, 4066, 4070, 4071, 4075, 4076, 4080, 4081, 4082, 4086,
- 4087, 4091, 4093, 4098, 4103, 4108, 4116, 4121, 4129, 4130,
- 4131, 4132, 4136, 4137, 4141, 4142, 4146, 4150, 4158, 4159,
- 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169,
- 4170, 4171, 4175, 4176, 4177, 4178, 4179, 4180, 4181, 4182,
- 4183, 4187, 4188, 4192, 4193, 4197, 4202, 4210, 4215, 4224,
- 4233, 4237, 4247, 4257, 4261, 4263, 4265, 4267, 4272, 4274,
- 4276, 4278, 4283, 4284, 4289, 4291, 4293, 4298, 4299, 4303,
- 4308, 4312, 4313, 4314, 4315, 4319, 4320, 4321, 4325, 4326,
- 4330, 4338, 4346, 4354, 4366, 4367, 4368, 4369, 4370, 4371,
- 4372, 4377, 4381, 4382, 4386, 4390, 4391, 4396, 4397, 4402,
- 4403, 4407, 4408, 4412, 4417, 4418, 4422, 4423, 4426, 4427,
- 4432
+ 0, 677, 677, 678, 681, 688, 690, 691, 692, 693,
+ 694, 695, 696, 697, 698, 714, 715, 716, 717, 721,
+ 723, 724, 725, 726, 727, 729, 730, 731, 732, 733,
+ 734, 735, 736, 737, 738, 739, 740, 744, 745, 746,
+ 747, 748, 749, 750, 751, 752, 753, 754, 755, 756,
+ 757, 758, 759, 760, 761, 762, 763, 764, 765, 766,
+ 767, 768, 769, 770, 771, 772, 773, 774, 775, 776,
+ 777, 778, 779, 780, 781, 782, 783, 784, 785, 786,
+ 787, 788, 789, 790, 791, 792, 793, 794, 795, 796,
+ 797, 798, 799, 800, 801, 802, 803, 804, 805, 806,
+ 807, 808, 809, 810, 811, 812, 813, 814, 815, 816,
+ 817, 818, 819, 820, 821, 822, 823, 824, 825, 829,
+ 830, 831, 835, 836, 837, 842, 845, 850, 851, 856,
+ 857, 861, 866, 867, 871, 882, 883, 887, 891, 892,
+ 896, 897, 898, 902, 903, 904, 905, 906, 910, 918,
+ 919, 923, 924, 936, 937, 938, 943, 944, 948, 949,
+ 950, 951, 952, 953, 954, 955, 956, 957, 959, 960,
+ 969, 974, 975, 980, 982, 985, 987, 989, 994, 998,
+ 999, 1003, 1004, 1008, 1009, 1013, 1014, 1015, 1016, 1017,
+ 1018, 1019, 1020, 1021, 1025, 1026, 1030, 1031, 1035, 1038,
+ 1045, 1049, 1050, 1054, 1055, 1059, 1060, 1064, 1065, 1069,
+ 1070, 1074, 1084, 1094, 1101, 1107, 1108, 1109, 1113, 1114,
+ 1115, 1119, 1123, 1127, 1144, 1151, 1158, 1159, 1163, 1167,
+ 1174, 1174, 1177, 1185, 1186, 1190, 1191, 1195, 1196, 1200,
+ 1202, 1204, 1210, 1216, 1223, 1228, 1229, 1237, 1240, 1246,
+ 1252, 1258, 1263, 1264, 1268, 1281, 1294, 1298, 1299, 1304,
+ 1306, 1307, 1308, 1310, 1316, 1317, 1322, 1323, 1327, 1332,
+ 1333, 1337, 1338, 1339, 1340, 1341, 1345, 1350, 1355, 1361,
+ 1362, 1370, 1380, 1381, 1386, 1389, 1394, 1395, 1399, 1400,
+ 1408, 1409, 1410, 1415, 1419, 1426, 1427, 1431, 1432, 1437,
+ 1439, 1444, 1445, 1446, 1451, 1458, 1465, 1472, 1473, 1477,
+ 1478, 1482, 1486, 1493, 1494, 1498, 1505, 1506, 1510, 1523,
+ 1536, 1537, 1541, 1542, 1546, 1554, 1562, 1563, 1567, 1568,
+ 1572, 1573, 1577, 1578, 1582, 1583, 1587, 1588, 1593, 1597,
+ 1598, 1599, 1600, 1601, 1602, 1603, 1604, 1605, 1606, 1607,
+ 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615, 1616, 1617,
+ 1618, 1619, 1620, 1621, 1622, 1623, 1627, 1634, 1639, 1644,
+ 1649, 1656, 1658, 1663, 1671, 1672, 1673, 1678, 1679, 1684,
+ 1689, 1691, 1695, 1696, 1701, 1707, 1708, 1709, 1710, 1711,
+ 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721,
+ 1722, 1723, 1724, 1735, 1736, 1740, 1741, 1745, 1746, 1750,
+ 1751, 1755, 1756, 1761, 1762, 1766, 1772, 1777, 1778, 1782,
+ 1811, 1812, 1816, 1817, 1822, 1823, 1824, 1825, 1826, 1827,
+ 1828, 1829, 1830, 1831, 1832, 1833, 1834, 1839, 1840, 1844,
+ 1844, 1850, 1851, 1852, 1863, 1864, 1869, 1870, 1872, 1874,
+ 1876, 1878, 1879, 1885, 1893, 1894, 1895, 1900, 1904, 1917,
+ 1918, 1923, 1924, 1925, 1929, 1930, 1936, 1937, 1941, 1942,
+ 1944, 1946, 1948, 1950, 1952, 1957, 1958, 1962, 1963, 1967,
+ 1968, 1970, 1972, 1974, 1976, 1978, 1983, 1984, 1988, 1989,
+ 1990, 1994, 1998, 1999, 2003, 2004, 2009, 2017, 2024, 2034,
+ 2035, 2041, 2042, 2046, 2047, 2051, 2062, 2074, 2078, 2079,
+ 2085, 2086, 2092, 2097, 2098, 2102, 2104, 2108, 2112, 2114,
+ 2121, 2122, 2126, 2130, 2134, 2135, 2136, 2138, 2139, 2140,
+ 2143, 2145, 2149, 2153, 2160, 2161, 2162, 2166, 2174, 2175,
+ 2176, 2181, 2185, 2186, 2190, 2202, 2237, 2238, 2242, 2243,
+ 2244, 2245, 2251, 2253, 2255, 2257, 2258, 2262, 2263, 2264,
+ 2265, 2266, 2267, 2268, 2269, 2273, 2282, 2305, 2313, 2324,
+ 2330, 2338, 2339, 2345, 2354, 2359, 2363, 2369, 2372, 2375,
+ 2388, 2393, 2394, 2395, 2399, 2409, 2420, 2421, 2426, 2427,
+ 2428, 2429, 2430, 2431, 2433, 2434, 2435, 2436, 2437, 2441,
+ 2442, 2443, 2458, 2459, 2463, 2464, 2465, 2466, 2467, 2468,
+ 2469, 2470, 2471, 2472, 2473, 2474, 2478, 2479, 2480, 2495,
+ 2496, 2500, 2501, 2502, 2503, 2504, 2505, 2506, 2507, 2508,
+ 2509, 2510, 2511, 2515, 2524, 2525, 2529, 2542, 2544, 2546,
+ 2551, 2553, 2555, 2557, 2559, 2561, 2566, 2569, 2573, 2579,
+ 2580, 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595,
+ 2600, 2601, 2606, 2607, 2608, 2612, 2613, 2614, 2615, 2617,
+ 2618, 2622, 2634, 2640, 2646, 2648, 2650, 2652, 2654, 2661,
+ 2663, 2665, 2668, 2671, 2677, 2686, 2692, 2695, 2699, 2703,
+ 2707, 2711, 2715, 2725, 2727, 2747, 2752, 2758, 2759, 2763,
+ 2764, 2765, 2766, 2770, 2771, 2772, 2777, 2778, 2782, 2788,
+ 2793, 2794, 2798, 2799, 2803, 2805, 2810, 2812, 2817, 2822,
+ 2829, 2830, 2832, 2837, 2843, 2844, 2845, 2849, 2850, 2851,
+ 2852, 2853, 2854, 2855, 2856, 2857, 2858, 2859, 2860, 2864,
+ 2865, 2866, 2867, 2868, 2869, 2870, 2871, 2885, 2886, 2887,
+ 2899, 2900, 2901, 2902, 2906, 2907, 2908, 2909, 2913, 2914,
+ 2915, 2916, 2920, 2921, 2922, 2923, 2927, 2929, 2933, 2941,
+ 2944, 2947, 2950, 2953, 2956, 2959, 2962, 2965, 2968, 2975,
+ 2978, 2981, 2984, 2987, 2990, 2993, 2996, 2999, 3002, 3005,
+ 3008, 3011, 3014, 3017, 3020, 3023, 3026, 3029, 3032, 3035,
+ 3038, 3041, 3044, 3047, 3050, 3053, 3056, 3058, 3063, 3066,
+ 3069, 3075, 3076, 3079, 3082, 3085, 3091, 3092, 3096, 3100,
+ 3101, 3105, 3106, 3109, 3112, 3115, 3118, 3128, 3138, 3142,
+ 3149, 3157, 3165, 3169, 3173, 3174, 3184, 3188, 3189, 3193,
+ 3194, 3198, 3200, 3202, 3204, 3206, 3208, 3210, 3212, 3214,
+ 3235, 3236, 3237, 3238, 3239, 3240, 3241, 3245, 3255, 3256,
+ 3260, 3261, 3265, 3269, 3273, 3281, 3287, 3289, 3294, 3301,
+ 3302, 3306, 3307, 3311, 3312, 3316, 3318, 3323, 3325, 3327,
+ 3332, 3333, 3334, 3338, 3339, 3343, 3344, 3345, 3346, 3347,
+ 3348, 3349, 3353, 3354, 3358, 3362, 3363, 3364, 3365, 3366,
+ 3367, 3368, 3372, 3373, 3375, 3379, 3380, 3391, 3392, 3396,
+ 3401, 3402, 3403, 3404, 3405, 3406, 3407, 3408, 3409, 3410,
+ 3411, 3412, 3413, 3417, 3417, 3427, 3428, 3432, 3433, 3434,
+ 3434, 3438, 3439, 3440, 3441, 3442, 3450, 3458, 3465, 3466,
+ 3466, 3467, 3467, 3471, 3472, 3473, 3477, 3486, 3488, 3493,
+ 3494, 3495, 3499, 3500, 3504, 3505, 3506, 3507, 3508, 3509,
+ 3510, 3511, 3512, 3513, 3514, 3515, 3516, 3517, 3521, 3523,
+ 3525, 3527, 3532, 3533, 3537, 3538, 3542, 3543, 3544, 3545,
+ 3546, 3547, 3548, 3549, 3550, 3551, 3552, 3553, 3557, 3558,
+ 3566, 3567, 3571, 3572, 3601, 3609, 3610, 3614, 3616, 3617,
+ 3621, 3622, 3623, 3624, 3628, 3631, 3634, 3637, 3643, 3644,
+ 3648, 3649, 3653, 3658, 3659, 3660, 3661, 3665, 3666, 3667,
+ 3671, 3672, 3673, 3677, 3678, 3679, 3683, 3684, 3688, 3690,
+ 3692, 3697, 3703, 3704, 3708, 3712, 3713, 3714, 3718, 3719,
+ 3721, 3725, 3726, 3730, 3731, 3735, 3736, 3740, 3749, 3754,
+ 3759, 3774, 3775, 3779, 3786, 3787, 3800, 3801, 3806, 3810,
+ 3811, 3817, 3818, 3823, 3824, 3829, 3849, 3850, 3855, 3856,
+ 3866, 3867, 3871, 3872, 3876, 3877, 3893, 3894, 3895, 3896,
+ 3897, 3898, 3902, 3903, 3913, 3914, 3918, 3928, 3931, 3937,
+ 3938, 3944, 3951, 3972, 3982, 3983, 3984, 3985, 3989, 3990,
+ 3991, 3992, 3996, 3997, 3998, 3999, 4003, 4003, 4014, 4021,
+ 4022, 4028, 4034, 4043, 4044, 4048, 4049, 4053, 4058, 4059,
+ 4063, 4064, 4065, 4066, 4070, 4071, 4072, 4073, 4074, 4078,
+ 4079, 4083, 4090, 4091, 4092, 4096, 4097, 4101, 4102, 4106,
+ 4107, 4111, 4112, 4113, 4114, 4115, 4116, 4117, 4118, 4119,
+ 4120, 4121, 4125, 4126, 4130, 4131, 4135, 4136, 4137, 4141,
+ 4142, 4146, 4148, 4153, 4158, 4163, 4171, 4176, 4184, 4185,
+ 4186, 4187, 4191, 4192, 4196, 4197, 4201, 4205, 4213, 4214,
+ 4215, 4216, 4217, 4218, 4219, 4220, 4221, 4222, 4223, 4224,
+ 4225, 4226, 4230, 4231, 4232, 4233, 4234, 4235, 4236, 4237,
+ 4238, 4242, 4243, 4247, 4248, 4252, 4257, 4265, 4270, 4279,
+ 4288, 4292, 4302, 4312, 4316, 4318, 4320, 4322, 4327, 4329,
+ 4331, 4333, 4338, 4339, 4344, 4346, 4348, 4353, 4354, 4358,
+ 4363, 4367, 4368, 4369, 4370, 4374, 4375, 4376, 4380, 4381,
+ 4385, 4393, 4401, 4409, 4421, 4422, 4423, 4424, 4425, 4426,
+ 4427, 4432, 4436, 4437, 4441, 4445, 4446, 4451, 4452, 4457,
+ 4458, 4462, 4463, 4467, 4472, 4473, 4477, 4478, 4481, 4482,
+ 4487
};
#endif
@@ -1974,7 +1960,7 @@ static const char *const yytname[] =
"add_col_column_list", "add_column", "table_rename", "constraint_op",
"opt_drop_behavior", "opt_table_constraint_def", "alter_constraint",
"create_xml_schema", "drop_xml_schema", "view_query_spec",
- "view_def_select_and_opt", "view_def", "$@1", "opt_with_check_option",
+ "view_def_select_and_opt", "view_def", "@1", "opt_with_check_option",
"opt_column_commalist", "priv_opt_column_commalist", "privilege_def",
"opt_with_admin_option", "privilege_revoke", "opt_with_grant_option",
"privileges", "operation_commalist", "operation", "grantee_commalist",
@@ -1999,19 +1985,19 @@ static const char *const yytname[] =
"cursor_options_commalist", "opt_cursor_options_list", "open_statement",
"rollback_statement", "with_opt_cursor_options_list",
"selectinto_statement", "colnum_commalist_2", "colnum_commalist",
- "trans_opt", "trans_list", "trans_decl", "$@2", "opt_all_distinct",
+ "trans_opt", "trans_list", "trans_decl", "@2", "opt_all_distinct",
"opt_ties", "opt_top", "update_statement_positioned",
"assignment_commalist", "assignment", "update_statement_searched",
"target_commalist", "target", "opt_where_clause", "opt_best",
"sqlonly_query_exp", "query_exp", "query_or_sparql_exp",
"non_final_union_exp", "non_final_query_term", "sqlonly_query_term",
"sparqlonly_query_term", "query_term", "opt_corresponding",
- "non_final_query_spec", "query_opt_from_spec", "query_spec",
+ "non_final_query_spec", "query_spec", "query_no_from_spec",
"breakup_term", "breakup_list", "selection", "non_final_table_exp",
- "table_exp_opt", "table_exp", "from_clause", "table_ref_commalist",
- "proc_col_list", "opt_proc_col_list", "column_commalist_or_empty",
- "table_ref", "table_ref_nj", "jtype", "opt_outer", "join",
- "joined_table", "joined_table_1", "join_condition", "where_clause",
+ "table_exp", "from_clause", "table_ref_commalist", "proc_col_list",
+ "opt_proc_col_list", "column_commalist_or_empty", "table_ref",
+ "table_ref_nj", "jtype", "opt_outer", "join", "joined_table",
+ "joined_table_1", "join_condition", "where_clause",
"opt_group_by_clause", "opt_having_clause", "opt_lock_mode",
"search_condition", "predicate", "scalar_exp_predicate",
"comparison_predicate", "between_predicate", "like_predicate",
@@ -2038,8 +2024,8 @@ static const char *const yytname[] =
"parameter_mode", "opt_parameter_mode", "opt_soap_enc_mode",
"soap_proc_opt_list", "soap_proc_opt", "soap_kwd", "rout_alt_type",
"cost_number", "cost_number_list", "cost_decl", "routine_statement",
- "compound_statement", "$@3", "statement_list", "statement_in_cs", "$@4",
- "statement_in_cs_oper", "statement", "$@5", "$@6", "local_declaration",
+ "compound_statement", "@3", "statement_list", "statement_in_cs", "@4",
+ "statement_in_cs_oper", "statement", "@5", "@6", "local_declaration",
"variable_declaration", "variable_list", "condition",
"handler_statement", "handler_declaration", "handler_type",
"cond_value_list", "control_statement", "assignment_statement",
@@ -2056,7 +2042,7 @@ static const char *const yytname[] =
"opt_publish", "xmlview_param_value", "xmlview_param", "xmlview_params",
"opt_xmlview_params", "xml_view", "drop_xml_view",
"string_concatenation_operator", "q_type_name", "q_old_type_name",
- "new_type_name", "user_defined_type", "$@7", "user_defined_type_drop",
+ "new_type_name", "user_defined_type", "@7", "user_defined_type_drop",
"opt_external_and_language_clause", "opt_subtype_clause",
"opt_as_type_representation", "type_representation", "type_member_list",
"opt_external_clause", "opt_soap_clause", "opt_external_type",
@@ -2153,112 +2139,112 @@ static const yytype_uint16 yyr1[] =
404, 404, 404, 404, 405, 405, 406, 406, 407, 407,
408, 409, 409, 410, 410, 411, 411, 412, 412, 413,
413, 414, 414, 414, 415, 416, 416, 416, 417, 417,
- 417, 418, 418, 419, 420, 421, 422, 423, 423, 425,
- 424, 424, 426, 426, 427, 427, 428, 428, 429, 429,
- 429, 429, 429, 429, 430, 430, 431, 431, 431, 431,
- 431, 432, 432, 433, 433, 433, 434, 434, 435, 435,
- 435, 435, 435, 436, 436, 437, 437, 438, 439, 439,
- 440, 440, 440, 440, 440, 441, 442, 443, 444, 444,
- 445, 446, 446, 447, 447, 448, 448, 449, 449, 450,
- 450, 450, 451, 451, 452, 452, 453, 453, 454, 454,
- 455, 455, 455, 456, 457, 458, 459, 459, 460, 460,
- 461, 461, 462, 462, 463, 464, 464, 465, 466, 467,
- 467, 468, 468, 469, 470, 471, 471, 472, 472, 473,
- 473, 474, 474, 475, 475, 476, 476, 377, 477, 477,
+ 417, 418, 418, 419, 420, 421, 422, 422, 423, 423,
+ 425, 424, 424, 426, 426, 427, 427, 428, 428, 429,
+ 429, 429, 429, 429, 429, 430, 430, 431, 431, 431,
+ 431, 431, 432, 432, 433, 433, 433, 434, 434, 435,
+ 435, 435, 435, 435, 436, 436, 437, 437, 438, 439,
+ 439, 440, 440, 440, 440, 440, 441, 442, 443, 444,
+ 444, 445, 446, 446, 447, 447, 448, 448, 449, 449,
+ 450, 450, 450, 451, 451, 452, 452, 453, 453, 454,
+ 454, 455, 455, 455, 456, 457, 458, 459, 459, 460,
+ 460, 461, 461, 462, 462, 463, 464, 464, 465, 466,
+ 467, 467, 468, 468, 469, 470, 471, 471, 472, 472,
+ 473, 473, 474, 474, 475, 475, 476, 476, 377, 477,
477, 477, 477, 477, 477, 477, 477, 477, 477, 477,
477, 477, 477, 477, 477, 477, 477, 477, 477, 477,
- 477, 477, 477, 477, 478, 479, 480, 481, 482, 483,
- 483, 483, 484, 484, 484, 485, 485, 486, 487, 487,
- 488, 488, 489, 490, 490, 490, 490, 490, 490, 490,
+ 477, 477, 477, 477, 477, 477, 478, 479, 480, 481,
+ 482, 483, 483, 483, 484, 484, 484, 485, 485, 486,
+ 487, 487, 488, 488, 489, 490, 490, 490, 490, 490,
490, 490, 490, 490, 490, 490, 490, 490, 490, 490,
- 490, 491, 491, 492, 492, 493, 493, 494, 494, 495,
- 495, 496, 496, 497, 498, 499, 499, 500, 501, 501,
- 502, 502, 503, 503, 503, 503, 503, 503, 503, 503,
- 503, 503, 503, 503, 503, 504, 504, 506, 505, 507,
- 507, 507, 508, 508, 509, 509, 509, 509, 509, 509,
- 509, 510, 511, 511, 511, 512, 513, 514, 514, 515,
- 515, 515, 516, 516, 517, 517, 518, 518, 518, 518,
- 518, 518, 518, 519, 519, 520, 520, 521, 521, 521,
- 521, 521, 521, 521, 522, 522, 523, 523, 523, 524,
- 525, 525, 526, 526, 527, 528, 529, 530, 530, 531,
- 531, 532, 532, 533, 534, 534, 535, 536, 537, 537,
- 538, 538, 539, 540, 540, 541, 541, 541, 541, 541,
- 542, 542, 542, 542, 543, 543, 543, 543, 543, 543,
- 544, 544, 545, 545, 546, 546, 546, 547, 548, 548,
- 548, 549, 550, 550, 550, 550, 551, 551, 552, 552,
- 552, 552, 553, 553, 553, 553, 553, 554, 554, 554,
- 554, 554, 554, 554, 554, 555, 556, 557, 557, 558,
- 558, 559, 559, 559, 560, 560, 561, 561, 561, 561,
- 562, 563, 563, 563, 564, 565, 566, 566, 567, 567,
- 567, 567, 567, 567, 567, 567, 567, 567, 567, 568,
+ 490, 490, 490, 491, 491, 492, 492, 493, 493, 494,
+ 494, 495, 495, 496, 496, 497, 498, 499, 499, 500,
+ 501, 501, 502, 502, 503, 503, 503, 503, 503, 503,
+ 503, 503, 503, 503, 503, 503, 503, 504, 504, 506,
+ 505, 507, 507, 507, 508, 508, 509, 509, 509, 509,
+ 509, 509, 509, 510, 511, 511, 511, 512, 513, 514,
+ 514, 515, 515, 515, 516, 516, 517, 517, 518, 518,
+ 518, 518, 518, 518, 518, 519, 519, 520, 520, 521,
+ 521, 521, 521, 521, 521, 521, 522, 522, 523, 523,
+ 523, 524, 525, 525, 526, 526, 527, 528, 529, 530,
+ 530, 531, 531, 532, 532, 533, 534, 535, 536, 536,
+ 537, 537, 538, 539, 539, 540, 540, 540, 540, 540,
+ 541, 541, 541, 541, 542, 542, 542, 542, 542, 542,
+ 543, 543, 544, 544, 545, 545, 545, 546, 547, 547,
+ 547, 548, 549, 549, 549, 549, 550, 550, 551, 551,
+ 551, 551, 552, 552, 552, 552, 552, 553, 553, 553,
+ 553, 553, 553, 553, 553, 554, 555, 556, 556, 557,
+ 557, 558, 558, 558, 559, 559, 560, 560, 560, 560,
+ 561, 562, 562, 562, 563, 564, 565, 565, 566, 566,
+ 566, 566, 566, 566, 566, 566, 566, 566, 566, 567,
+ 567, 567, 567, 567, 567, 567, 567, 567, 567, 567,
+ 567, 567, 567, 567, 567, 567, 568, 568, 568, 568,
568, 568, 568, 568, 568, 568, 568, 568, 568, 568,
- 568, 568, 568, 568, 568, 568, 569, 569, 569, 569,
- 569, 569, 569, 569, 569, 569, 569, 569, 569, 569,
- 569, 569, 569, 570, 571, 571, 572, 573, 573, 573,
- 574, 574, 574, 574, 574, 574, 575, 575, 576, 577,
- 577, 578, 578, 578, 578, 578, 578, 578, 578, 578,
- 579, 579, 580, 580, 580, 581, 581, 581, 581, 581,
- 581, 582, 582, 582, 582, 582, 582, 582, 582, 582,
- 582, 582, 582, 582, 582, 582, 582, 582, 582, 582,
- 582, 582, 582, 377, 377, 583, 583, 584, 584, 585,
- 585, 585, 585, 586, 586, 586, 587, 587, 588, 589,
- 590, 590, 591, 591, 592, 592, 593, 593, 594, 595,
- 596, 596, 596, 597, 597, 597, 597, 598, 598, 598,
- 598, 598, 598, 598, 598, 598, 598, 598, 598, 599,
- 599, 599, 599, 599, 599, 599, 599, 599, 599, 599,
- 600, 600, 600, 600, 601, 601, 601, 601, 602, 602,
- 602, 602, 603, 603, 603, 603, 604, 604, 604, 605,
- 605, 605, 605, 605, 605, 605, 605, 605, 605, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 607, 607, 607, 607, 607, 608, 608, 609, 609,
- 609, 610, 610, 610, 610, 610, 610, 610, 610, 610,
- 611, 611, 612, 613, 614, 614, 615, 616, 616, 617,
- 617, 618, 618, 618, 618, 618, 618, 618, 618, 618,
- 377, 377, 377, 377, 377, 377, 377, 619, 620, 620,
- 621, 621, 622, 622, 622, 623, 624, 624, 625, 626,
- 626, 627, 627, 628, 628, 629, 629, 630, 630, 630,
- 631, 631, 631, 632, 632, 633, 633, 633, 633, 633,
- 633, 633, 634, 634, 635, 636, 636, 636, 636, 636,
- 636, 636, 637, 637, 637, 638, 638, 639, 639, 640,
- 641, 641, 641, 641, 641, 641, 641, 641, 641, 641,
- 641, 641, 641, 643, 642, 644, 644, 645, 645, 646,
- 645, 647, 647, 647, 647, 647, 647, 647, 648, 649,
- 648, 650, 648, 651, 651, 651, 652, 653, 653, 654,
- 654, 654, 654, 654, 655, 655, 655, 655, 655, 655,
- 655, 655, 655, 655, 655, 655, 655, 655, 656, 656,
- 656, 656, 657, 657, 658, 658, 659, 659, 659, 659,
- 659, 659, 659, 659, 659, 659, 659, 659, 660, 660,
- 661, 661, 662, 662, 663, 664, 664, 665, 665, 665,
- 666, 666, 666, 666, 667, 667, 667, 667, 668, 668,
- 669, 669, 670, 671, 671, 671, 671, 672, 672, 672,
- 673, 673, 673, 674, 674, 674, 675, 675, 676, 676,
- 676, 677, 678, 678, 679, 680, 680, 680, 681, 681,
- 681, 682, 682, 683, 683, 684, 684, 685, 686, 686,
- 686, 687, 687, 688, 688, 688, 689, 689, 690, 691,
- 691, 692, 692, 693, 693, 694, 695, 695, 696, 696,
- 697, 697, 698, 698, 699, 699, 700, 700, 700, 700,
- 700, 700, 701, 701, 702, 702, 703, 704, 704, 705,
- 705, 706, 707, 708, 709, 709, 709, 709, 710, 710,
- 710, 710, 711, 711, 711, 711, 713, 712, 714, 715,
- 715, 715, 715, 716, 716, 717, 717, 718, 719, 719,
- 720, 720, 720, 720, 721, 721, 721, 721, 721, 722,
- 722, 723, 724, 724, 724, 725, 725, 726, 726, 727,
- 727, 728, 728, 728, 728, 728, 728, 728, 728, 728,
- 728, 728, 729, 729, 730, 730, 731, 731, 731, 732,
- 732, 733, 733, 734, 735, 735, 736, 736, 737, 737,
- 737, 737, 738, 738, 739, 739, 740, 740, 741, 741,
- 741, 741, 741, 741, 741, 741, 741, 741, 741, 741,
- 741, 741, 742, 742, 742, 742, 742, 742, 742, 742,
- 742, 743, 743, 744, 744, 745, 745, 746, 747, 747,
- 747, 748, 748, 748, 749, 749, 749, 749, 750, 750,
- 750, 750, 751, 751, 752, 752, 752, 753, 753, 754,
- 755, 756, 756, 756, 756, 757, 757, 757, 758, 758,
- 759, 760, 761, 762, 763, 763, 763, 763, 763, 763,
- 763, 764, 765, 765, 766, 767, 767, 768, 768, 769,
- 769, 770, 770, 771, 772, 772, 773, 773, 774, 774,
- 775
+ 568, 568, 568, 569, 570, 570, 571, 572, 572, 572,
+ 573, 573, 573, 573, 573, 573, 574, 574, 575, 576,
+ 576, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+ 578, 578, 579, 579, 579, 580, 580, 580, 580, 580,
+ 580, 581, 581, 581, 581, 581, 581, 581, 581, 581,
+ 581, 581, 581, 581, 581, 581, 581, 581, 581, 581,
+ 581, 581, 581, 377, 377, 582, 582, 583, 583, 584,
+ 584, 584, 584, 585, 585, 585, 586, 586, 587, 588,
+ 589, 589, 590, 590, 591, 591, 592, 592, 593, 594,
+ 595, 595, 595, 596, 596, 596, 596, 597, 597, 597,
+ 597, 597, 597, 597, 597, 597, 597, 597, 597, 598,
+ 598, 598, 598, 598, 598, 598, 598, 598, 598, 598,
+ 599, 599, 599, 599, 600, 600, 600, 600, 601, 601,
+ 601, 601, 602, 602, 602, 602, 603, 603, 603, 604,
+ 604, 604, 604, 604, 604, 604, 604, 604, 604, 605,
+ 605, 605, 605, 605, 605, 605, 605, 605, 605, 605,
+ 605, 605, 605, 605, 605, 605, 605, 605, 605, 605,
+ 605, 605, 605, 605, 605, 605, 605, 605, 605, 605,
+ 605, 606, 606, 606, 606, 606, 607, 607, 608, 608,
+ 608, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 610, 610, 611, 612, 613, 613, 614, 615, 615, 616,
+ 616, 617, 617, 617, 617, 617, 617, 617, 617, 617,
+ 377, 377, 377, 377, 377, 377, 377, 618, 619, 619,
+ 620, 620, 621, 621, 621, 622, 623, 623, 624, 625,
+ 625, 626, 626, 627, 627, 628, 628, 629, 629, 629,
+ 630, 630, 630, 631, 631, 632, 632, 632, 632, 632,
+ 632, 632, 633, 633, 634, 635, 635, 635, 635, 635,
+ 635, 635, 636, 636, 636, 637, 637, 638, 638, 639,
+ 640, 640, 640, 640, 640, 640, 640, 640, 640, 640,
+ 640, 640, 640, 642, 641, 643, 643, 644, 644, 645,
+ 644, 646, 646, 646, 646, 646, 646, 646, 647, 648,
+ 647, 649, 647, 650, 650, 650, 651, 652, 652, 653,
+ 653, 653, 653, 653, 654, 654, 654, 654, 654, 654,
+ 654, 654, 654, 654, 654, 654, 654, 654, 655, 655,
+ 655, 655, 656, 656, 657, 657, 658, 658, 658, 658,
+ 658, 658, 658, 658, 658, 658, 658, 658, 659, 659,
+ 660, 660, 661, 661, 662, 663, 663, 664, 664, 664,
+ 665, 665, 665, 665, 666, 666, 666, 666, 667, 667,
+ 668, 668, 669, 670, 670, 670, 670, 671, 671, 671,
+ 672, 672, 672, 673, 673, 673, 674, 674, 675, 675,
+ 675, 676, 677, 677, 678, 679, 679, 679, 680, 680,
+ 680, 681, 681, 682, 682, 683, 683, 684, 685, 685,
+ 685, 686, 686, 687, 687, 687, 688, 688, 689, 690,
+ 690, 691, 691, 692, 692, 693, 694, 694, 695, 695,
+ 696, 696, 697, 697, 698, 698, 699, 699, 699, 699,
+ 699, 699, 700, 700, 701, 701, 702, 703, 703, 704,
+ 704, 705, 706, 707, 708, 708, 708, 708, 709, 709,
+ 709, 709, 710, 710, 710, 710, 712, 711, 713, 714,
+ 714, 714, 714, 715, 715, 716, 716, 717, 718, 718,
+ 719, 719, 719, 719, 720, 720, 720, 720, 720, 721,
+ 721, 722, 723, 723, 723, 724, 724, 725, 725, 726,
+ 726, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+ 727, 727, 728, 728, 729, 729, 730, 730, 730, 731,
+ 731, 732, 732, 733, 734, 734, 735, 735, 736, 736,
+ 736, 736, 737, 737, 738, 738, 739, 739, 740, 740,
+ 740, 740, 740, 740, 740, 740, 740, 740, 740, 740,
+ 740, 740, 741, 741, 741, 741, 741, 741, 741, 741,
+ 741, 742, 742, 743, 743, 744, 744, 745, 746, 746,
+ 746, 747, 747, 747, 748, 748, 748, 748, 749, 749,
+ 749, 749, 750, 750, 751, 751, 751, 752, 752, 753,
+ 754, 755, 755, 755, 755, 756, 756, 756, 757, 757,
+ 758, 759, 760, 761, 762, 762, 762, 762, 762, 762,
+ 762, 763, 764, 764, 765, 766, 766, 767, 767, 768,
+ 768, 769, 769, 770, 771, 771, 772, 772, 773, 773,
+ 774
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -2286,35 +2272,35 @@ static const yytype_uint8 yyr2[] =
1, 2, 4, 1, 1, 2, 0, 1, 9, 12,
4, 0, 1, 3, 3, 0, 1, 1, 3, 1,
3, 6, 6, 6, 5, 1, 1, 1, 0, 1,
- 1, 3, 1, 5, 4, 4, 1, 4, 4, 0,
- 5, 12, 0, 3, 0, 3, 0, 3, 5, 7,
- 7, 6, 7, 5, 0, 3, 6, 6, 6, 6,
- 4, 0, 3, 2, 1, 1, 1, 3, 2, 1,
- 1, 2, 2, 1, 3, 1, 1, 4, 3, 3,
- 3, 4, 3, 4, 3, 5, 5, 5, 0, 5,
- 10, 0, 2, 0, 4, 0, 2, 0, 3, 1,
- 1, 1, 5, 6, 0, 3, 1, 3, 2, 2,
- 0, 1, 1, 5, 5, 5, 0, 1, 0, 2,
- 7, 6, 0, 2, 4, 0, 2, 4, 15, 0,
- 2, 0, 3, 6, 6, 0, 1, 0, 3, 0,
- 5, 0, 2, 0, 2, 0, 2, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 3, 1, 1, 1,
+ 1, 3, 1, 5, 4, 4, 1, 1, 4, 4,
+ 0, 5, 12, 0, 3, 0, 3, 0, 3, 5,
+ 7, 7, 6, 7, 5, 0, 3, 6, 6, 6,
+ 6, 4, 0, 3, 2, 1, 1, 1, 3, 2,
+ 1, 1, 2, 2, 1, 3, 1, 1, 4, 3,
+ 3, 3, 4, 3, 4, 3, 5, 5, 5, 0,
+ 5, 10, 0, 2, 0, 4, 0, 2, 0, 3,
+ 1, 1, 1, 5, 6, 0, 3, 1, 3, 2,
+ 2, 0, 1, 1, 5, 5, 5, 0, 1, 0,
+ 2, 7, 6, 0, 2, 4, 0, 2, 4, 15,
+ 0, 2, 0, 3, 6, 6, 0, 1, 0, 3,
+ 0, 5, 0, 2, 0, 2, 0, 2, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 3, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 2, 2, 2, 8, 5, 4,
- 5, 6, 1, 1, 1, 0, 2, 7, 4, 1,
- 1, 3, 1, 1, 2, 1, 1, 1, 1, 1,
- 1, 2, 4, 2, 3, 3, 1, 2, 2, 2,
- 2, 1, 3, 0, 4, 0, 5, 1, 2, 1,
- 3, 0, 3, 3, 2, 0, 2, 7, 1, 3,
- 1, 3, 4, 4, 1, 1, 1, 1, 1, 1,
- 2, 2, 2, 2, 2, 1, 2, 0, 3, 0,
- 1, 1, 0, 2, 1, 4, 6, 6, 8, 1,
- 7, 9, 0, 1, 3, 3, 6, 1, 3, 1,
- 1, 1, 0, 1, 0, 1, 1, 5, 6, 4,
- 5, 4, 5, 1, 1, 1, 2, 1, 5, 6,
- 4, 5, 4, 5, 1, 2, 1, 4, 2, 5,
- 1, 1, 0, 5, 4, 4, 4, 3, 5, 1,
- 2, 1, 2, 4, 0, 1, 7, 2, 1, 3,
+ 1, 1, 1, 1, 1, 1, 2, 2, 2, 8,
+ 5, 4, 5, 6, 1, 1, 1, 0, 2, 7,
+ 4, 1, 1, 3, 1, 1, 2, 1, 1, 1,
+ 1, 1, 1, 2, 4, 2, 3, 3, 1, 2,
+ 2, 2, 2, 1, 3, 0, 4, 0, 5, 1,
+ 2, 1, 3, 0, 3, 3, 2, 0, 2, 7,
+ 1, 3, 1, 3, 4, 4, 1, 1, 1, 1,
+ 1, 1, 2, 2, 2, 2, 2, 1, 2, 0,
+ 3, 0, 1, 1, 0, 2, 1, 4, 6, 6,
+ 8, 1, 7, 9, 0, 1, 3, 3, 6, 1,
+ 3, 1, 1, 1, 0, 1, 0, 1, 1, 5,
+ 6, 4, 5, 4, 5, 1, 1, 1, 2, 1,
+ 5, 6, 4, 5, 4, 5, 1, 2, 1, 4,
+ 2, 5, 1, 1, 0, 5, 4, 4, 3, 3,
+ 5, 1, 2, 1, 2, 4, 7, 2, 1, 3,
1, 3, 3, 0, 1, 1, 4, 5, 1, 6,
1, 2, 3, 3, 0, 2, 2, 2, 1, 1,
0, 1, 2, 1, 1, 3, 3, 5, 0, 2,
@@ -2406,590 +2392,592 @@ static const yytype_uint16 yydefact[] =
74, 75, 76, 77, 78, 79, 80, 81, 84, 83,
82, 97, 85, 86, 87, 88, 89, 90, 91, 92,
93, 94, 95, 106, 107, 96, 116, 117, 118, 0,
- 845, 0, 196, 0, 0, 0, 0, 0, 0, 439,
+ 845, 0, 196, 0, 0, 0, 0, 0, 0, 441,
0, 0, 0, 837, 837, 0, 0, 0, 0, 0,
0, 0, 659, 98, 0, 0, 657, 658, 0, 0,
105, 0, 0, 687, 688, 690, 99, 100, 101, 102,
103, 104, 108, 109, 110, 111, 112, 113, 114, 115,
0, 0, 3, 4, 5, 15, 651, 19, 20, 23,
22, 16, 24, 10, 8, 9, 6, 25, 26, 29,
- 27, 28, 30, 31, 32, 354, 355, 356, 357, 358,
- 359, 360, 361, 362, 363, 337, 353, 350, 342, 343,
- 341, 351, 339, 340, 475, 338, 464, 477, 466, 484,
- 486, 0, 999, 352, 850, 851, 852, 344, 348, 854,
- 855, 856, 7, 349, 0, 33, 34, 853, 345, 347,
- 35, 11, 12, 13, 14, 36, 21, 40, 750, 0,
- 0, 0, 870, 0, 869, 0, 366, 0, 1158, 0,
- 0, 325, 0, 1157, 190, 0, 189, 193, 870, 0,
- 186, 0, 0, 187, 188, 0, 185, 0, 0, 0,
- 0, 0, 0, 0, 0, 194, 197, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 254, 260, 259,
- 265, 236, 236, 236, 0, 0, 98, 836, 0, 255,
- 256, 0, 263, 266, 0, 372, 373, 374, 0, 414,
- 440, 441, 437, 449, 444, 0, 0, 0, 108, 0,
- 0, 405, 0, 0, 659, 651, 476, 998, 838, 841,
- 838, 842, 844, 837, 0, 0, 0, 0, 837, 0,
- 0, 254, 0, 0, 98, 0, 0, 848, 849, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 364,
- 488, 0, 0, 0, 0, 0, 0, 1, 2, 196,
- 0, 0, 0, 0, 17, 18, 0, 492, 492, 465,
- 0, 665, 0, 0, 693, 649, 0, 727, 728, 729,
- 730, 733, 731, 0, 834, 835, 732, 116, 774, 734,
- 705, 0, 0, 0, 0, 0, 0, 0, 0, 769,
- 601, 585, 0, 0, 606, 607, 612, 647, 604, 599,
- 608, 609, 610, 611, 703, 600, 704, 0, 720, 346,
- 0, 614, 615, 1222, 605, 754, 278, 0, 1102, 1113,
- 0, 0, 0, 326, 0, 269, 191, 0, 762, 0,
- 268, 229, 1261, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 195, 0, 0, 0, 462, 0, 270,
- 1098, 218, 0, 274, 201, 203, 272, 204, 1047, 1048,
- 1050, 0, 0, 0, 312, 1242, 1243, 1049, 253, 0,
- 262, 258, 261, 0, 0, 0, 0, 0, 0, 0,
- 769, 0, 375, 0, 0, 0, 0, 0, 0, 0,
- 0, 504, 699, 597, 0, 700, 598, 501, 596, 594,
- 0, 595, 613, 0, 615, 0, 0, 0, 0, 1005,
- 1006, 315, 0, 0, 405, 766, 452, 0, 843, 839,
- 1094, 0, 0, 0, 0, 847, 0, 665, 253, 0,
- 0, 0, 0, 0, 0, 649, 649, 649, 0, 649,
- 649, 0, 649, 680, 649, 0, 0, 0, 0, 294,
- 0, 1228, 0, 1095, 652, 492, 0, 0, 492, 0,
- 492, 769, 697, 662, 666, 670, 0, 667, 1227, 0,
- 0, 751, 697, 0, 650, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 710, 0, 0, 0, 0, 0,
- 0, 0, 0, 597, 596, 0, 0, 646, 0, 648,
- 0, 721, 665, 0, 0, 281, 0, 871, 0, 0,
- 1109, 0, 0, 0, 0, 0, 0, 0, 179, 234,
- 1262, 0, 1035, 1036, 0, 0, 871, 0, 224, 0,
- 0, 0, 0, 0, 0, 832, 0, 871, 0, 0,
- 403, 463, 0, 271, 0, 219, 220, 1108, 0, 200,
- 202, 273, 225, 1092, 0, 0, 314, 0, 830, 0,
- 181, 0, 0, 0, 0, 257, 244, 264, 0, 692,
- 0, 403, 0, 0, 0, 0, 0, 429, 424, 425,
- 428, 426, 427, 0, 0, 435, 438, 442, 0, 592,
- 593, 0, 499, 502, 0, 0, 597, 596, 0, 494,
- 495, 505, 462, 645, 0, 0, 0, 0, 0, 0,
- 642, 0, 0, 648, 0, 665, 0, 267, 0, 1004,
- 0, 317, 405, 0, 768, 462, 453, 0, 0, 1227,
- 0, 846, 0, 1156, 1156, 1230, 0, 205, 205, 0,
- 205, 179, 0, 0, 0, 0, 0, 0, 0, 250,
- 0, 0, 0, 0, 0, 0, 0, 0, 697, 0,
- 0, 0, 0, 689, 691, 0, 487, 0, 1097, 655,
- 0, 0, 0, 0, 482, 490, 491, 471, 0, 480,
- 469, 492, 0, 0, 0, 0, 671, 0, 665, 753,
- 0, 0, 0, 0, 0, 0, 0, 737, 738, 806,
- 787, 812, 782, 0, 788, 785, 779, 790, 786, 813,
- 794, 0, 0, 809, 810, 797, 800, 798, 799, 736,
- 801, 803, 811, 735, 665, 0, 717, 0, 0, 0,
- 0, 556, 564, 557, 558, 559, 560, 561, 562, 563,
- 565, 0, 0, 0, 712, 709, 711, 0, 0, 0,
- 665, 0, 0, 0, 586, 602, 0, 0, 0, 775,
- 0, 770, 1223, 1213, 0, 0, 1224, 722, 0, 0,
- 755, 0, 0, 0, 882, 880, 881, 873, 0, 875,
- 0, 0, 902, 0, 1103, 1114, 0, 0, 1106, 1203,
- 192, 321, 0, 0, 0, 763, 473, 119, 474, 0,
- 0, 0, 127, 129, 130, 0, 0, 0, 230, 0,
- 0, 1259, 1263, 1037, 1040, 1038, 234, 0, 0, 0,
- 0, 0, 1089, 0, 303, 306, 1235, 1235, 0, 902,
- 871, 0, 541, 0, 368, 277, 0, 1099, 321, 304,
- 313, 238, 0, 237, 0, 0, 0, 0, 0, 0,
- 243, 0, 770, 376, 236, 433, 0, 0, 420, 0,
- 430, 431, 432, 434, 436, 0, 0, 445, 0, 0,
- 500, 0, 707, 706, 0, 696, 0, 0, 0, 0,
- 507, 508, 518, 534, 405, 515, 0, 542, 644, 0,
- 641, 643, 1093, 589, 588, 590, 591, 1224, 701, 702,
- 0, 988, 0, 275, 0, 0, 1003, 1007, 316, 767,
- 0, 0, 0, 403, 0, 1227, 0, 840, 0, 1095,
- 0, 0, 0, 218, 1156, 0, 1168, 1233, 0, 206,
- 0, 0, 214, 0, 0, 222, 223, 276, 665, 997,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 305, 0, 0, 205, 205,
- 205, 0, 1096, 653, 483, 472, 0, 0, 481, 470,
- 0, 478, 467, 660, 0, 664, 663, 698, 668, 669,
- 0, 752, 694, 698, 0, 0, 0, 726, 0, 0,
- 0, 791, 0, 0, 0, 0, 0, 792, 793, 805,
- 0, 0, 0, 0, 0, 554, 0, 584, 0, 0,
- 565, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 715, 0, 708, 713, 718, 0, 0, 0, 587, 0,
- 0, 0, 0, 1097, 0, 990, 0, 665, 1215, 757,
- 0, 0, 282, 0, 874, 0, 0, 819, 872, 820,
- 898, 900, 896, 901, 895, 899, 897, 0, 0, 281,
- 1105, 0, 1202, 1192, 1193, 1194, 1195, 1196, 1197, 1198,
- 1199, 1200, 1201, 1112, 0, 1115, 0, 0, 0, 323,
- 0, 0, 765, 0, 0, 0, 126, 180, 173, 122,
- 179, 0, 0, 196, 0, 0, 822, 823, 0, 821,
- 149, 826, 0, 0, 0, 0, 1039, 0, 0, 866,
- 868, 0, 0, 0, 0, 311, 307, 308, 0, 1238,
- 1238, 0, 0, 902, 0, 0, 1101, 0, 324, 0,
- 182, 251, 251, 241, 251, 0, 0, 0, 0, 0,
- 0, 418, 0, 443, 442, 0, 442, 0, 0, 497,
- 695, 0, 0, 524, 534, 0, 0, 534, 0, 530,
- 530, 530, 528, 529, 524, 533, 0, 513, 0, 546,
- 0, 640, 665, 989, 1215, 1001, 1000, 1002, 0, 0,
- 383, 389, 0, 0, 396, 0, 0, 387, 388, 390,
- 386, 385, 0, 401, 0, 0, 454, 456, 455, 1227,
- 1097, 0, 0, 218, 0, 1234, 1167, 0, 1231, 0,
- 1174, 1268, 212, 209, 207, 211, 213, 180, 0, 248,
- 247, 249, 246, 0, 682, 681, 677, 0, 675, 676,
- 0, 0, 674, 679, 673, 295, 296, 300, 300, 656,
- 0, 0, 0, 479, 468, 0, 1207, 0, 725, 724,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 723, 0, 555, 552, 553, 716, 0, 0, 0,
- 582, 581, 583, 0, 566, 0, 0, 577, 0, 575,
- 571, 0, 634, 0, 1229, 603, 0, 0, 0, 776,
- 0, 771, 1210, 991, 0, 756, 0, 283, 876, 902,
- 816, 818, 0, 885, 0, 1104, 0, 0, 0, 1137,
- 1204, 0, 0, 0, 513, 764, 120, 121, 123, 0,
- 125, 128, 0, 0, 0, 0, 0, 0, 0, 828,
- 829, 827, 131, 235, 0, 232, 226, 1251, 1252, 0,
- 1260, 1032, 758, 0, 867, 871, 0, 1087, 0, 439,
- 0, 1068, 1063, 0, 310, 0, 0, 1240, 1241, 0,
- 0, 923, 862, 0, 833, 403, 0, 1100, 0, 0,
- 242, 240, 239, 245, 0, 771, 0, 377, 379, 422,
- 423, 421, 0, 447, 442, 446, 0, 0, 0, 0,
- 535, 0, 0, 536, 509, 531, 525, 526, 527, 532,
- 0, 514, 0, 0, 0, 294, 0, 638, 637, 0,
- 400, 398, 384, 74, 0, 393, 399, 397, 391, 0,
- 406, 0, 0, 1096, 0, 1232, 0, 1132, 0, 1181,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1166, 1175, 1176, 0, 1266, 0, 0, 221, 686, 0,
- 0, 0, 0, 0, 301, 302, 298, 299, 654, 493,
- 294, 661, 672, 807, 815, 783, 0, 789, 780, 0,
- 814, 795, 796, 808, 802, 804, 633, 0, 0, 576,
- 571, 580, 0, 0, 574, 0, 0, 570, 714, 0,
- 0, 719, 0, 0, 778, 773, 0, 0, 1214, 279,
- 0, 285, 0, 0, 877, 0, 0, 0, 0, 904,
- 0, 0, 0, 0, 1116, 1141, 0, 1149, 0, 0,
- 0, 0, 1150, 1152, 1138, 1139, 0, 322, 0, 0,
- 124, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 159, 0, 0, 170, 0, 160, 0, 0,
- 0, 166, 163, 150, 228, 0, 227, 1257, 0, 0,
- 1041, 0, 0, 902, 0, 1090, 1088, 0, 0, 1070,
- 0, 1064, 1082, 309, 0, 1239, 0, 300, 0, 929,
- 0, 367, 404, 0, 0, 773, 0, 0, 419, 450,
- 442, 498, 0, 0, 294, 0, 516, 0, 538, 0,
- 520, 0, 0, 0, 543, 547, 548, 639, 1214, 395,
- 394, 0, 402, 403, 883, 1172, 0, 0, 1135, 1169,
- 1170, 1183, 1184, 0, 0, 0, 0, 1182, 1178, 0,
- 0, 0, 0, 1177, 1269, 1266, 1270, 210, 208, 0,
- 684, 685, 678, 297, 489, 0, 0, 0, 0, 569,
- 568, 579, 572, 0, 635, 636, 1225, 1226, 0, 0,
- 777, 772, 0, 0, 287, 739, 740, 741, 742, 745,
- 748, 0, 0, 749, 902, 902, 0, 0, 888, 886,
- 887, 891, 889, 890, 863, 1110, 1111, 0, 1118, 0,
- 1151, 0, 0, 0, 1142, 0, 1107, 1153, 1154, 1140,
- 1206, 327, 0, 176, 0, 0, 0, 177, 825, 824,
- 153, 158, 0, 164, 162, 234, 0, 0, 155, 154,
- 165, 0, 0, 0, 1253, 1033, 0, 0, 0, 759,
- 0, 0, 1084, 1085, 1086, 0, 1051, 1069, 0, 0,
- 1091, 1236, 1237, 198, 0, 183, 0, 0, 0, 943,
- 928, 929, 925, 922, 0, 944, 945, 0, 0, 252,
- 772, 0, 380, 382, 448, 1225, 1226, 517, 518, 0,
- 0, 537, 0, 521, 0, 0, 0, 0, 0, 403,
- 392, 451, 1159, 884, 0, 0, 1161, 0, 1165, 0,
- 0, 0, 634, 0, 1185, 1186, 0, 1179, 1180, 0,
- 1191, 1189, 0, 0, 0, 0, 0, 784, 781, 567,
- 578, 0, 665, 665, 1212, 1227, 1209, 0, 0, 286,
- 0, 280, 744, 747, 743, 746, 879, 878, 817, 885,
- 1117, 0, 1148, 0, 0, 1143, 0, 0, 1156, 0,
- 335, 0, 0, 178, 196, 0, 132, 0, 169, 0,
- 0, 156, 0, 167, 233, 0, 1255, 1258, 0, 0,
- 1042, 1043, 1034, 1031, 761, 0, 0, 865, 496, 462,
- 0, 0, 1071, 0, 1268, 300, 0, 972, 973, 947,
- 0, 0, 0, 0, 953, 952, 0, 924, 926, 934,
- 106, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 439, 0, 0, 0, 0, 0, 1011, 0, 0, 769,
- 916, 920, 914, 915, 917, 913, 918, 919, 910, 911,
- 912, 999, 992, 921, 0, 930, 932, 0, 984, 0,
- 0, 0, 0, 987, 986, 613, 614, 927, 1205, 831,
- 378, 0, 665, 665, 523, 539, 0, 522, 510, 0,
- 519, 0, 0, 549, 0, 506, 0, 1160, 883, 1173,
- 1172, 138, 0, 1136, 1120, 0, 1188, 0, 1190, 1246,
- 1244, 1248, 1264, 1267, 0, 683, 573, 0, 0, 1227,
- 1208, 284, 0, 0, 1119, 0, 1145, 0, 0, 1155,
- 0, 0, 329, 0, 175, 174, 168, 0, 143, 133,
- 136, 0, 0, 0, 161, 0, 0, 0, 0, 0,
- 0, 760, 858, 542, 1052, 0, 1061, 0, 1266, 184,
- 1137, 291, 289, 290, 0, 0, 0, 946, 0, 949,
- 950, 0, 970, 0, 0, 0, 1017, 0, 0, 0,
- 365, 0, 1008, 0, 411, 0, 0, 0, 0, 1010,
- 980, 0, 0, 929, 931, 983, 976, 979, 985, 982,
- 978, 977, 381, 0, 0, 0, 512, 0, 545, 544,
- 550, 1129, 1162, 1164, 0, 139, 1133, 1134, 0, 1124,
- 1171, 1187, 0, 0, 0, 0, 1216, 1217, 288, 0,
- 1144, 0, 0, 328, 336, 0, 319, 231, 0, 0,
- 0, 0, 148, 134, 0, 151, 152, 157, 0, 1256,
- 1045, 1046, 1044, 0, 860, 546, 0, 596, 1056, 0,
- 0, 1059, 1072, 199, 864, 0, 0, 948, 0, 951,
- 968, 0, 0, 0, 0, 1014, 1013, 1015, 1018, 0,
- 1016, 941, 935, 936, 0, 0, 1009, 0, 413, 0,
- 937, 0, 0, 981, 905, 906, 907, 0, 933, 1216,
- 1217, 540, 511, 551, 0, 1163, 0, 0, 0, 0,
- 1131, 0, 0, 0, 0, 1265, 0, 0, 892, 0,
- 0, 0, 0, 331, 140, 0, 137, 135, 147, 146,
- 145, 144, 0, 0, 859, 861, 857, 294, 0, 0,
- 1058, 0, 0, 0, 1063, 1073, 1074, 292, 0, 974,
- 922, 969, 0, 947, 1026, 0, 938, 1028, 922, 0,
- 0, 0, 369, 457, 461, 459, 460, 407, 0, 409,
- 0, 0, 941, 941, 909, 0, 0, 1123, 1121, 1125,
- 1126, 1247, 1245, 0, 0, 0, 903, 0, 0, 0,
- 0, 320, 0, 333, 142, 141, 171, 0, 1254, 1054,
- 1055, 1057, 0, 0, 1066, 0, 1076, 293, 0, 960,
- 0, 955, 954, 971, 963, 964, 956, 959, 965, 962,
- 967, 966, 613, 614, 0, 1027, 0, 1019, 0, 942,
- 370, 0, 0, 408, 412, 0, 0, 995, 1012, 908,
- 1130, 0, 0, 0, 0, 0, 894, 893, 1146, 1147,
- 0, 332, 0, 318, 0, 1062, 0, 0, 1065, 1075,
- 0, 0, 1083, 961, 975, 0, 1023, 940, 371, 458,
- 410, 415, 941, 994, 0, 1128, 1127, 1249, 0, 330,
- 334, 172, 0, 0, 1081, 1080, 1079, 1077, 1078, 0,
- 1020, 1021, 1024, 0, 1022, 411, 417, 996, 1122, 1250,
- 1060, 1067, 941, 941, 0, 416, 1030, 1029, 1025
+ 27, 28, 30, 31, 32, 356, 357, 358, 359, 360,
+ 361, 362, 363, 364, 365, 338, 355, 352, 344, 345,
+ 343, 353, 341, 342, 477, 339, 466, 479, 468, 486,
+ 488, 340, 0, 999, 354, 850, 851, 852, 346, 350,
+ 854, 855, 856, 7, 351, 0, 33, 34, 853, 347,
+ 349, 35, 11, 12, 13, 14, 36, 21, 40, 750,
+ 0, 0, 0, 870, 0, 869, 0, 368, 0, 1158,
+ 0, 0, 326, 0, 1157, 190, 0, 189, 193, 870,
+ 0, 186, 0, 0, 187, 188, 0, 185, 0, 0,
+ 0, 0, 0, 0, 0, 0, 194, 197, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 255, 261,
+ 260, 266, 237, 237, 237, 0, 0, 98, 836, 0,
+ 256, 257, 0, 264, 267, 0, 374, 375, 376, 0,
+ 416, 442, 443, 439, 451, 446, 0, 0, 0, 108,
+ 0, 0, 407, 0, 441, 0, 659, 651, 478, 998,
+ 838, 841, 838, 842, 844, 837, 0, 0, 0, 0,
+ 837, 0, 0, 255, 0, 0, 98, 0, 0, 848,
+ 849, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 366, 490, 0, 0, 0, 0, 0, 0, 1,
+ 2, 196, 0, 0, 0, 0, 17, 18, 0, 494,
+ 494, 467, 0, 665, 0, 0, 693, 649, 0, 727,
+ 728, 729, 730, 733, 731, 0, 834, 835, 732, 116,
+ 774, 734, 705, 0, 0, 0, 0, 0, 0, 0,
+ 0, 769, 601, 585, 0, 0, 606, 607, 612, 647,
+ 604, 599, 608, 609, 610, 611, 703, 600, 704, 0,
+ 720, 348, 0, 614, 615, 1222, 605, 754, 279, 0,
+ 1102, 1113, 0, 0, 0, 327, 0, 270, 191, 0,
+ 762, 0, 269, 230, 1261, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 195, 0, 0, 0, 464,
+ 0, 271, 1098, 218, 0, 275, 201, 203, 273, 204,
+ 1047, 1048, 1050, 0, 0, 0, 313, 1242, 1243, 1049,
+ 254, 0, 263, 259, 262, 0, 0, 0, 0, 0,
+ 0, 0, 769, 0, 377, 0, 0, 0, 0, 0,
+ 0, 0, 0, 498, 699, 597, 0, 700, 598, 503,
+ 596, 594, 0, 595, 613, 0, 615, 0, 0, 0,
+ 0, 1005, 1006, 316, 0, 0, 407, 766, 454, 0,
+ 0, 843, 839, 1094, 0, 0, 0, 0, 847, 0,
+ 665, 254, 0, 0, 0, 0, 0, 0, 649, 649,
+ 649, 0, 649, 649, 0, 649, 680, 649, 0, 0,
+ 0, 0, 295, 0, 1228, 0, 1095, 652, 494, 0,
+ 0, 494, 0, 494, 769, 697, 662, 666, 670, 0,
+ 667, 1227, 0, 0, 751, 697, 0, 650, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 710, 0, 0,
+ 0, 0, 0, 0, 0, 0, 597, 596, 0, 0,
+ 646, 0, 648, 0, 721, 665, 0, 0, 282, 0,
+ 871, 0, 0, 1109, 0, 0, 0, 0, 0, 0,
+ 0, 179, 235, 1262, 0, 1035, 1036, 0, 0, 871,
+ 0, 224, 0, 0, 0, 0, 0, 0, 832, 0,
+ 871, 0, 0, 405, 465, 0, 272, 0, 219, 220,
+ 1108, 0, 200, 202, 274, 225, 1092, 0, 0, 315,
+ 0, 830, 0, 181, 0, 0, 0, 0, 258, 245,
+ 265, 0, 692, 0, 405, 0, 0, 0, 0, 0,
+ 431, 426, 427, 430, 428, 429, 0, 0, 437, 440,
+ 444, 0, 592, 593, 0, 501, 504, 0, 0, 597,
+ 596, 0, 496, 497, 464, 645, 0, 0, 0, 0,
+ 0, 0, 642, 0, 0, 648, 0, 665, 0, 268,
+ 0, 1004, 0, 318, 407, 0, 768, 464, 455, 0,
+ 0, 0, 1227, 0, 846, 0, 1156, 1156, 1230, 0,
+ 205, 205, 0, 205, 179, 0, 0, 0, 0, 0,
+ 0, 0, 251, 0, 0, 0, 0, 0, 0, 0,
+ 0, 697, 0, 0, 0, 0, 689, 691, 0, 489,
+ 0, 1097, 655, 0, 0, 0, 0, 484, 492, 493,
+ 473, 0, 482, 471, 494, 0, 0, 0, 0, 671,
+ 0, 665, 753, 0, 0, 0, 0, 0, 0, 0,
+ 737, 738, 806, 787, 812, 782, 0, 788, 785, 779,
+ 790, 786, 813, 794, 0, 0, 809, 810, 797, 800,
+ 798, 799, 736, 801, 803, 811, 735, 665, 0, 717,
+ 0, 0, 0, 0, 556, 564, 557, 558, 559, 560,
+ 561, 562, 563, 565, 0, 0, 0, 712, 709, 711,
+ 0, 0, 0, 665, 0, 0, 0, 586, 602, 0,
+ 0, 0, 775, 0, 770, 1223, 1213, 0, 0, 1224,
+ 722, 0, 0, 755, 0, 0, 0, 882, 880, 881,
+ 873, 0, 875, 0, 0, 902, 0, 1103, 1114, 0,
+ 0, 1106, 1203, 192, 322, 0, 0, 0, 763, 475,
+ 119, 476, 0, 0, 0, 127, 129, 130, 0, 0,
+ 0, 231, 0, 0, 1259, 1263, 1037, 1040, 1038, 235,
+ 0, 0, 0, 0, 0, 1089, 0, 304, 307, 1235,
+ 1235, 0, 902, 871, 0, 541, 0, 370, 278, 0,
+ 1099, 322, 305, 314, 239, 0, 238, 0, 0, 0,
+ 0, 0, 0, 244, 0, 770, 378, 237, 435, 0,
+ 0, 422, 0, 432, 433, 434, 436, 438, 0, 0,
+ 447, 0, 0, 502, 0, 707, 706, 0, 696, 0,
+ 0, 0, 0, 507, 508, 518, 534, 407, 515, 0,
+ 542, 644, 0, 641, 643, 1093, 589, 588, 590, 591,
+ 1224, 701, 702, 0, 988, 0, 276, 0, 0, 1003,
+ 1007, 317, 767, 0, 0, 0, 405, 0, 1227, 0,
+ 840, 0, 1095, 0, 0, 0, 218, 1156, 0, 1168,
+ 1233, 0, 206, 0, 0, 214, 0, 0, 222, 223,
+ 277, 665, 997, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 306, 0,
+ 0, 205, 205, 205, 0, 1096, 653, 485, 474, 0,
+ 0, 483, 472, 0, 480, 469, 660, 0, 664, 663,
+ 698, 668, 669, 0, 752, 694, 698, 0, 0, 0,
+ 726, 0, 0, 0, 791, 0, 0, 0, 0, 0,
+ 792, 793, 805, 0, 0, 0, 0, 0, 554, 0,
+ 584, 0, 0, 565, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 715, 0, 708, 713, 718, 0, 0,
+ 0, 587, 0, 0, 0, 0, 1097, 0, 990, 0,
+ 665, 1215, 757, 0, 0, 283, 0, 874, 0, 0,
+ 819, 872, 820, 898, 900, 896, 901, 895, 899, 897,
+ 0, 0, 282, 1105, 0, 1202, 1192, 1193, 1194, 1195,
+ 1196, 1197, 1198, 1199, 1200, 1201, 1112, 0, 1115, 0,
+ 0, 0, 324, 0, 0, 765, 0, 0, 0, 126,
+ 180, 173, 122, 179, 0, 0, 196, 0, 0, 822,
+ 823, 0, 821, 149, 826, 0, 0, 0, 0, 1039,
+ 0, 0, 866, 868, 0, 0, 0, 0, 312, 308,
+ 309, 0, 1238, 1238, 0, 0, 902, 0, 0, 1101,
+ 0, 325, 0, 182, 252, 252, 242, 252, 0, 0,
+ 0, 0, 0, 0, 420, 0, 445, 444, 0, 444,
+ 0, 0, 499, 695, 0, 0, 524, 534, 0, 0,
+ 534, 0, 530, 530, 530, 528, 529, 524, 533, 0,
+ 513, 0, 546, 0, 640, 665, 989, 1215, 1001, 1000,
+ 1002, 0, 0, 385, 391, 0, 0, 398, 0, 0,
+ 389, 390, 392, 388, 387, 0, 403, 0, 0, 456,
+ 458, 457, 1227, 1097, 0, 0, 218, 0, 1234, 1167,
+ 0, 1231, 0, 1174, 1268, 212, 209, 207, 211, 213,
+ 180, 0, 249, 248, 250, 247, 0, 682, 681, 677,
+ 0, 675, 676, 0, 0, 674, 679, 673, 296, 297,
+ 301, 301, 656, 0, 0, 0, 481, 470, 0, 1207,
+ 0, 725, 724, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 723, 0, 555, 552, 553, 716,
+ 0, 0, 0, 582, 581, 583, 0, 566, 0, 0,
+ 577, 0, 575, 571, 0, 634, 0, 1229, 603, 0,
+ 0, 0, 776, 0, 771, 1210, 991, 0, 756, 0,
+ 284, 876, 902, 816, 818, 0, 885, 0, 1104, 0,
+ 0, 0, 1137, 1204, 0, 0, 0, 513, 764, 120,
+ 121, 123, 0, 125, 128, 0, 0, 0, 0, 0,
+ 0, 0, 828, 829, 827, 131, 236, 0, 233, 226,
+ 227, 1251, 1252, 0, 1260, 1032, 758, 0, 867, 871,
+ 0, 1087, 0, 441, 0, 1068, 1063, 0, 311, 0,
+ 0, 1240, 1241, 0, 0, 923, 862, 0, 833, 405,
+ 0, 1100, 0, 0, 243, 241, 240, 246, 0, 771,
+ 0, 379, 381, 424, 425, 423, 0, 449, 444, 448,
+ 0, 0, 0, 0, 535, 0, 0, 536, 509, 531,
+ 525, 526, 527, 532, 0, 514, 0, 0, 0, 295,
+ 0, 638, 637, 0, 402, 400, 386, 74, 0, 395,
+ 401, 399, 393, 0, 408, 0, 0, 1096, 0, 1232,
+ 0, 1132, 0, 1181, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1166, 1175, 1176, 0, 1266, 0,
+ 0, 221, 686, 0, 0, 0, 0, 0, 302, 303,
+ 299, 300, 654, 495, 295, 661, 672, 807, 815, 783,
+ 0, 789, 780, 0, 814, 795, 796, 808, 802, 804,
+ 633, 0, 0, 576, 571, 580, 0, 0, 574, 0,
+ 0, 570, 714, 0, 0, 719, 0, 0, 778, 773,
+ 0, 0, 1214, 280, 0, 286, 0, 0, 877, 0,
+ 0, 0, 0, 904, 0, 0, 0, 0, 1116, 1141,
+ 0, 1149, 0, 0, 0, 0, 1150, 1152, 1138, 1139,
+ 0, 323, 0, 0, 124, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 159, 0, 0, 170,
+ 0, 160, 0, 0, 0, 166, 163, 150, 229, 0,
+ 228, 1257, 0, 0, 1041, 0, 0, 902, 0, 1090,
+ 1088, 0, 0, 1070, 0, 1064, 1082, 310, 0, 1239,
+ 0, 301, 0, 929, 0, 369, 406, 0, 0, 773,
+ 0, 0, 421, 452, 444, 500, 0, 0, 295, 0,
+ 516, 0, 538, 0, 520, 0, 0, 0, 543, 547,
+ 548, 639, 1214, 397, 396, 0, 404, 405, 883, 1172,
+ 0, 0, 1135, 1169, 1170, 1183, 1184, 0, 0, 0,
+ 0, 1182, 1178, 0, 0, 0, 0, 1177, 1269, 1266,
+ 1270, 210, 208, 0, 684, 685, 678, 298, 491, 0,
+ 0, 0, 0, 569, 568, 579, 572, 0, 635, 636,
+ 1225, 1226, 0, 0, 777, 772, 0, 0, 288, 739,
+ 740, 741, 742, 745, 748, 0, 0, 749, 902, 902,
+ 0, 0, 888, 886, 887, 891, 889, 890, 863, 1110,
+ 1111, 0, 1118, 0, 1151, 0, 0, 0, 1142, 0,
+ 1107, 1153, 1154, 1140, 1206, 328, 0, 176, 0, 0,
+ 0, 177, 825, 824, 153, 158, 0, 164, 162, 235,
+ 0, 0, 155, 154, 165, 0, 0, 0, 1253, 1033,
+ 0, 0, 0, 759, 0, 0, 1084, 1085, 1086, 0,
+ 1051, 1069, 0, 0, 1091, 1236, 1237, 198, 0, 183,
+ 0, 0, 0, 943, 928, 929, 925, 922, 0, 944,
+ 945, 0, 0, 253, 772, 0, 382, 384, 450, 1225,
+ 1226, 517, 518, 0, 0, 537, 0, 521, 0, 0,
+ 0, 0, 0, 405, 394, 453, 1159, 884, 0, 0,
+ 1161, 0, 1165, 0, 0, 0, 634, 0, 1185, 1186,
+ 0, 1179, 1180, 0, 1191, 1189, 0, 0, 0, 0,
+ 0, 784, 781, 567, 578, 0, 665, 665, 1212, 1227,
+ 1209, 0, 0, 287, 0, 281, 744, 747, 743, 746,
+ 879, 878, 817, 885, 1117, 0, 1148, 0, 0, 1143,
+ 0, 0, 1156, 0, 336, 0, 0, 178, 196, 0,
+ 132, 0, 169, 0, 0, 156, 0, 167, 234, 0,
+ 1255, 1258, 0, 0, 1042, 1043, 1034, 1031, 761, 0,
+ 0, 865, 464, 0, 0, 1071, 0, 1268, 301, 0,
+ 972, 973, 947, 0, 0, 0, 0, 953, 952, 0,
+ 924, 926, 934, 106, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 441, 0, 0, 0, 0, 0, 1011,
+ 0, 0, 769, 916, 920, 914, 915, 917, 913, 918,
+ 919, 910, 911, 912, 999, 992, 921, 0, 930, 932,
+ 0, 984, 0, 0, 0, 0, 987, 986, 613, 614,
+ 927, 1205, 831, 380, 0, 665, 665, 523, 539, 0,
+ 522, 510, 0, 519, 0, 0, 549, 0, 506, 0,
+ 1160, 883, 1173, 1172, 138, 0, 1136, 1120, 0, 1188,
+ 0, 1190, 1246, 1244, 1248, 1264, 1267, 0, 683, 573,
+ 0, 0, 1227, 1208, 285, 0, 0, 1119, 0, 1145,
+ 0, 0, 1155, 0, 0, 330, 0, 175, 174, 168,
+ 0, 143, 133, 136, 0, 0, 0, 161, 0, 0,
+ 0, 0, 0, 0, 760, 858, 542, 1052, 0, 1061,
+ 0, 1266, 184, 1137, 292, 290, 291, 0, 0, 0,
+ 946, 0, 949, 950, 0, 970, 0, 0, 0, 1017,
+ 0, 0, 0, 367, 0, 1008, 0, 413, 0, 0,
+ 0, 0, 1010, 980, 0, 0, 929, 931, 983, 976,
+ 979, 985, 982, 978, 977, 383, 0, 0, 0, 512,
+ 0, 545, 544, 550, 1129, 1162, 1164, 0, 139, 1133,
+ 1134, 0, 1124, 1171, 1187, 0, 0, 0, 0, 1216,
+ 1217, 289, 0, 1144, 0, 0, 329, 337, 0, 320,
+ 232, 0, 0, 0, 0, 148, 134, 0, 151, 152,
+ 157, 0, 1256, 1045, 1046, 1044, 0, 860, 546, 0,
+ 596, 1056, 0, 0, 1059, 1072, 199, 864, 0, 0,
+ 948, 0, 951, 968, 0, 0, 0, 0, 1014, 1013,
+ 1015, 1018, 0, 1016, 941, 935, 936, 0, 0, 1009,
+ 0, 415, 0, 937, 0, 0, 981, 905, 906, 907,
+ 0, 933, 1216, 1217, 540, 511, 551, 0, 1163, 0,
+ 0, 0, 0, 1131, 0, 0, 0, 0, 1265, 0,
+ 0, 892, 0, 0, 0, 0, 332, 140, 0, 137,
+ 135, 147, 146, 145, 144, 0, 0, 859, 861, 857,
+ 295, 0, 0, 1058, 0, 0, 0, 1063, 1073, 1074,
+ 293, 0, 974, 922, 969, 0, 947, 1026, 0, 938,
+ 1028, 922, 0, 0, 0, 371, 459, 463, 461, 462,
+ 409, 0, 411, 0, 0, 941, 941, 909, 0, 0,
+ 1123, 1121, 1125, 1126, 1247, 1245, 0, 0, 0, 903,
+ 0, 0, 0, 0, 321, 0, 334, 142, 141, 171,
+ 0, 1254, 1054, 1055, 1057, 0, 0, 1066, 0, 1076,
+ 294, 0, 960, 0, 955, 954, 971, 963, 964, 956,
+ 959, 965, 962, 967, 966, 613, 614, 0, 1027, 0,
+ 1019, 0, 942, 372, 0, 0, 410, 414, 0, 0,
+ 995, 1012, 908, 1130, 0, 0, 0, 0, 0, 894,
+ 893, 1146, 1147, 0, 333, 0, 319, 0, 1062, 0,
+ 0, 1065, 1075, 0, 0, 1083, 961, 975, 0, 1023,
+ 940, 373, 460, 412, 417, 941, 994, 0, 1128, 1127,
+ 1249, 0, 331, 335, 172, 0, 0, 1081, 1080, 1079,
+ 1077, 1078, 0, 1020, 1021, 1024, 0, 1022, 413, 419,
+ 996, 1122, 1250, 1060, 1067, 941, 941, 0, 418, 1030,
+ 1029, 1025
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 121, 122, 123, 124, 125, 379, 1176, 1410, 127,
- 891, 892, 893, 2088, 2089, 2090, 2166, 2276, 2192, 1641,
- 1422, 1941, 1642, 1942, 1643, 1938, 894, 895, 1491, 1666,
- 235, 236, 237, 128, 129, 639, 130, 1020, 1305, 1302,
- 131, 132, 731, 637, 1026, 133, 134, 135, 1425, 898,
- 136, 609, 1646, 899, 460, 137, 940, 138, 1460, 268,
- 269, 270, 271, 272, 139, 140, 141, 142, 143, 144,
- 595, 145, 863, 1591, 1754, 1911, 2115, 1839, 756, 1325,
- 1326, 1546, 146, 147, 148, 1207, 1444, 149, 646, 150,
- 711, 151, 152, 2273, 1169, 153, 154, 414, 1930, 2186,
- 2343, 2403, 2082, 155, 156, 2000, 2001, 2002, 2003, 2004,
- 278, 661, 2005, 1467, 1851, 1852, 1283, 1284, 924, 505,
- 2319, 2320, 2238, 2006, 2007, 2446, 2008, 1232, 950, 675,
- 676, 283, 473, 284, 957, 285, 2009, 715, 716, 2010,
- 2312, 2313, 630, 350, 581, 887, 336, 166, 167, 168,
- 766, 767, 547, 169, 170, 1441, 682, 683, 481, 689,
- 690, 691, 1959, 970, 2039, 1865, 1492, 1243, 1688, 1255,
- 1486, 1256, 972, 973, 1861, 631, 1259, 1495, 1869, 922,
- 821, 822, 823, 824, 825, 1577, 826, 827, 828, 1363,
- 829, 380, 381, 830, 483, 484, 384, 1580, 385, 1328,
- 553, 386, 387, 563, 171, 554, 555, 556, 388, 486,
- 557, 487, 389, 964, 390, 391, 573, 833, 834, 574,
- 392, 393, 394, 395, 396, 1764, 291, 406, 1433, 419,
- 975, 488, 812, 1137, 1391, 1138, 1190, 650, 626, 1455,
- 398, 273, 299, 721, 173, 174, 2204, 2286, 175, 909,
- 910, 176, 911, 872, 597, 868, 869, 870, 1874, 1599,
- 2267, 2268, 1148, 1149, 2246, 2247, 2013, 2014, 2306, 1669,
- 1841, 1842, 1843, 2015, 2307, 2308, 2309, 1844, 1845, 1970,
- 1976, 2363, 1846, 1971, 2300, 2016, 489, 703, 490, 2018,
- 2423, 2019, 997, 2020, 2021, 2022, 2023, 2228, 2229, 2442,
- 2443, 2376, 2024, 179, 1650, 1953, 615, 907, 1817, 1950,
- 1951, 180, 181, 1961, 2208, 2209, 2106, 2294, 2211, 1662,
- 1659, 2408, 1442, 1660, 2296, 2356, 2412, 1830, 1824, 1437,
- 1438, 1204, 182, 183, 491, 184, 441, 409, 185, 1165,
- 186, 878, 600, 1399, 1604, 1777, 2169, 2260, 2255, 1298,
- 1708, 1882, 1613, 1614, 1615, 1786, 1787, 1012, 1705, 1875,
- 1876, 1016, 1017, 1300, 1878, 1530, 1531, 1532, 1162, 1163,
- 1167, 187, 492, 1382, 493, 401, 189, 494, 403, 544,
- 404, 190, 725, 1209, 1447, 191, 192, 193, 194, 2062,
- 1428, 1429, 1946, 1947, 901, 902, 611, 195, 1894, 1726,
- 1534, 196
+ -1, 121, 122, 123, 124, 125, 381, 1179, 1413, 127,
+ 894, 895, 896, 2091, 2092, 2093, 2169, 2279, 2195, 1645,
+ 1425, 1945, 1646, 1946, 1647, 1942, 897, 898, 1495, 1670,
+ 236, 237, 238, 128, 129, 642, 130, 1023, 1308, 1305,
+ 131, 132, 734, 640, 1029, 133, 134, 135, 1428, 901,
+ 136, 612, 1650, 902, 462, 137, 943, 138, 1464, 269,
+ 270, 271, 272, 273, 139, 140, 141, 142, 143, 144,
+ 598, 145, 866, 1595, 1758, 1915, 2118, 1843, 759, 1328,
+ 1329, 1550, 146, 147, 148, 1210, 1448, 149, 649, 150,
+ 713, 151, 152, 2276, 1172, 153, 154, 416, 1934, 2189,
+ 2346, 2406, 2085, 155, 156, 2003, 2004, 2005, 2006, 2007,
+ 279, 664, 2008, 1471, 1855, 1856, 1286, 1287, 927, 507,
+ 2322, 2323, 2241, 2009, 2010, 2449, 2011, 1235, 953, 678,
+ 679, 284, 475, 285, 960, 286, 2012, 717, 718, 2013,
+ 2315, 2316, 633, 352, 584, 890, 338, 166, 167, 168,
+ 769, 770, 550, 169, 170, 171, 685, 686, 483, 692,
+ 693, 694, 973, 2042, 1869, 1496, 1246, 1692, 1258, 1490,
+ 1259, 975, 976, 1865, 634, 1262, 1499, 1873, 925, 824,
+ 825, 826, 827, 828, 1581, 829, 830, 831, 1366, 832,
+ 382, 383, 833, 485, 486, 386, 1584, 387, 1331, 556,
+ 388, 389, 566, 172, 557, 558, 559, 390, 488, 560,
+ 489, 391, 967, 392, 393, 576, 836, 837, 577, 394,
+ 395, 396, 397, 398, 1768, 292, 408, 1437, 421, 978,
+ 490, 815, 1140, 1394, 1141, 1193, 653, 629, 1459, 400,
+ 274, 301, 724, 174, 175, 2207, 2289, 176, 912, 913,
+ 177, 914, 875, 600, 871, 872, 873, 1878, 1603, 2270,
+ 2271, 1151, 1152, 2249, 2250, 2016, 2017, 2309, 1673, 1845,
+ 1846, 1847, 2018, 2310, 2311, 2312, 1848, 1849, 1973, 1979,
+ 2366, 1850, 1974, 2303, 2019, 491, 705, 492, 2021, 2426,
+ 2022, 1000, 2023, 2024, 2025, 2026, 2231, 2232, 2445, 2446,
+ 2379, 2027, 180, 1654, 1957, 618, 910, 1821, 1954, 1955,
+ 181, 182, 1964, 2211, 2212, 2109, 2297, 2214, 1666, 1663,
+ 2411, 1446, 1664, 2299, 2359, 2415, 1834, 1828, 1441, 1442,
+ 1207, 183, 184, 493, 185, 443, 411, 186, 1168, 187,
+ 881, 603, 1402, 1608, 1781, 2172, 2263, 2258, 1301, 1712,
+ 1886, 1617, 1618, 1619, 1790, 1791, 1015, 1709, 1879, 1880,
+ 1019, 1020, 1303, 1882, 1534, 1535, 1536, 1165, 1166, 1170,
+ 188, 494, 1385, 495, 403, 190, 496, 405, 547, 406,
+ 191, 728, 1212, 1451, 192, 193, 194, 195, 2065, 1432,
+ 1433, 1950, 1951, 904, 905, 614, 196, 1898, 1730, 1538,
+ 197
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -2149
+#define YYPACT_NINF -2133
static const yytype_int16 yypact[] =
{
- 11002, -2149, 21444, -178, -2149, -2149, -46, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, 635,
- -2149, 252, 1195, 36, 856, 17135, -140, 576, 262, 666,
- 17995, 19319, 14797, 496, 515, 557, 357, 292, 504, 489,
- 15310, 17320, -14, -2149, 17505, 17883, -2149, -2149, 21444, 762,
- -2149, 470, 434, -2149, 448, 458, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- 187, 844, 486, -2149, 1003, -2149, -8, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, 22, -2149, -2149, -2149,
- -2149, 516, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, 787, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, 590, 215,
- 981, 14107, -2149, 21444, -2149, 21444, -2149, 21444, -2149, 947,
- 833, 250, 21444, -2149, -2149, 843, -2149, -2149, 824, 21444,
- -2149, 21444, 21444, -2149, -2149, 1015, -2149, 21444, 21444, 21444,
- 33, 710, 19402, 21444, 21444, -2149, 1273, 880, 21444, 1018,
- 21444, 19485, 21444, 812, 21444, 21444, 21444, 21444, 21444, 21444,
- 21444, 21444, 310, 19800, 21444, 21444, 21444, 906, -2149, -2149,
- -2149, 737, 737, 737, 885, 953, 958, -2149, 971, 783,
- -2149, -52, -2149, -2149, 19883, -2149, -2149, -2149, 21444, -2149,
- -2149, -2149, -2149, -2149, 860, 11347, 1012, 21444, 848, 391,
- 21444, 18310, 1016, 839, -2149, 883, -2149, -2149, -2149, -2149,
- 1227, -2149, -2149, 496, 21444, 1217, 21444, 1098, 496, 12727,
- 889, 1105, 1091, 1132, 1141, 1162, -53, -2149, -2149, 986,
- 1022, 1024, 1026, 1035, 1042, 1046, 1048, 1064, 285, -2149,
- 370, 1092, 1381, 12727, 12727, -79, 1007, -2149, -2149, 1851,
- 1238, 869, 390, 395, -2149, -2149, 3790, 55, 57, -2149,
- 1356, 12727, 19976, 4697, -2149, 12727, 1108, -2149, -2149, -2149,
- -2149, -2149, -2149, 1114, -2149, -2149, -2149, 1288, -2149, -2149,
- -2149, 17883, 1127, 9967, 1131, 1134, 1138, 21444, 7897, 59,
- 1133, -2149, 1149, 1157, 1174, 1176, 1178, -2149, 1180, 1189,
- 1196, 1200, 1214, 1221, -2149, 1242, -2149, 1149, 558, 299,
- 1165, 1244, -2149, 1254, 1258, 1270, 1359, 1187, 1272, 1375,
- 21444, 1423, 1463, -2149, 1498, -2149, -2149, 21444, 1287, 26,
- -2149, -2149, 1536, 957, 1187, 1425, 1685, 21444, 21444, 1591,
- 1545, 1595, 1556, -2149, 21444, 1187, 19976, 1510, 21444, 1593,
- 1344, 438, 1552, -2149, 21444, -2149, 1614, -2149, -2149, -2149,
- -2149, 1736, 21444, 1655, 1571, -2149, -2149, -2149, 1576, 21444,
- -2149, -2149, -2149, 21444, 17883, 1769, 21444, 928, 20291, 20291,
- 1404, 1408, 1621, 1803, 54, 12727, 12727, 1413, 21444, 1779,
- 7897, 1637, 16951, 1149, 1416, -2149, -2149, 1418, -23, -2149,
- 1690, -2149, 1429, 1433, 1694, 21444, 21444, 1472, 12727, -2149,
- -2149, 1705, 21444, 1633, 1616, -2149, 21444, 4173, -2149, 1440,
- 1447, 34, 1652, 580, 21444, -2149, 820, 12727, -2149, 21444,
- 17883, 1823, 21444, 20291, 1809, 12727, 12727, 12727, 12727, 12727,
- 12727, 1827, 12727, -2149, 12727, 1737, 1686, 845, 875, 1740,
- 21444, -2149, 19976, 324, -2149, 1538, 1715, 297, 1538, 297,
- 111, 27, 16951, -2149, 1470, 1471, 1477, 1478, -2149, 1479,
- 21444, 1481, 1814, 1484, 1485, 12727, 10312, 1768, 1486, 1609,
- 12727, 10657, 753, -56, -2149, 12727, 12727, 12727, 1490, -79,
- 8242, 1491, 538, -4, 9, 2737, 12727, 1499, 19976, 1499,
- 734, -2149, 12727, 4780, 1684, 1773, 113, 1626, 4863, 21444,
- 216, 1187, 1794, 21444, 1711, 1785, 5211, 297, 18393, 1523,
- -2149, 1745, -2149, -2149, 1731, 483, 1626, 243, -2149, 1805,
- 1806, 21444, 21444, 12727, 12727, -2149, 1741, 1626, 1187, 8587,
- 1734, -2149, 21444, -2149, 5294, -2149, -2149, -2149, 21444, -2149,
- -2149, -2149, -2149, -2149, 21444, 1774, -2149, 20291, 1547, 530,
- -2149, 1723, 1726, 1735, 1739, -2149, -73, -2149, 4256, -2149,
- 1930, 1734, 1931, 1567, 1572, 73, 73, -2149, -2149, -2149,
- -2149, -2149, -2149, 1929, 1934, -2149, 1803, -69, 12727, -2149,
- -2149, 12727, -2149, 1413, 834, 1692, 20, 17, 15738, -2149,
- -2149, -2149, 1744, -2149, 18513, 12727, 12727, 12727, 12727, 12727,
- -2149, 19976, 12727, 18, 12727, 12727, 21444, -2149, -128, 1814,
- 1630, -2149, 1616, 1587, -2149, -41, -2149, 1852, 19976, 1590,
- 1954, -2149, 5377, 1043, 849, -2149, 21444, 1623, 1656, 21444,
- 1895, 52, 21444, 1594, 1597, 1816, 1818, 1820, 1824, 1600,
- 1602, 1605, 1606, 1607, 479, 1608, 1615, 1834, 1610, 1620,
- 1629, 21444, 12727, -2149, -2149, 1862, -2149, 678, 543, -2149,
- 19976, 297, 1622, 257, -2149, -2149, -2149, -2149, 297, -2149,
- -2149, 1538, 297, 12727, 21444, 12727, -2149, 12727, 12727, -2149,
- 21444, 1751, 12727, 641, 12727, 12727, 990, -2149, -2149, 1635,
- -2149, 1638, 1639, 1835, 1644, -2149, 1657, -2149, -2149, 1659,
- 1660, 1661, -29, 1662, -2149, -2149, -2149, -2149, -2149, -2149,
- 1663, 1665, -2149, -2149, 12727, 1650, 1814, 10657, 1666, 6862,
- 527, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- 1840, 12727, 12727, 570, -2149, -2149, -2149, 553, 1703, 685,
- 12727, 1677, -79, 1491, -2149, 1678, 12727, 21444, 21444, -2149,
- 19976, 82, -2149, -2149, 193, 12727, 1682, -2149, 1687, 21444,
- 1680, 1696, 21444, 1903, -2149, -2149, -2149, -2149, 743, -2149,
- 19883, 16169, 1821, 21444, 1691, -2149, 2021, 1994, -2149, 1801,
- -2149, 1697, 21444, 21444, 21444, 1695, -2149, 738, -2149, 21444,
- 21444, 857, -2149, -2149, -2149, 916, 16484, 21444, -2149, 1966,
- 1700, -2149, 1702, -2149, -2149, -2149, 1523, 1898, 1935, 1716,
- 532, 21444, 1713, 2082, -2149, 2083, 1452, 1452, 21444, 1821,
- 1626, 1919, 1156, 1725, -2149, -2149, 21444, 1720, 1697, -2149,
- -2149, -2149, 21444, -2149, 21444, 20291, 20291, 20291, 20291, 2026,
- -2149, 21444, 1724, -2149, 737, -2149, 12727, 12727, -2149, 2089,
- -2149, -2149, -2149, -2149, -2149, 1797, 156, -2149, 632, 143,
- -2149, 1288, -2149, -2149, 1847, -2149, 21444, 21444, 15738, 14882,
- 1729, 1135, -2149, -2149, 15655, -2149, 10657, 1947, -2149, 2078,
- 1609, -2149, 879, 1164, 1164, -2149, -2149, 1742, 16951, -2149,
- 12727, 1814, 1733, -2149, 943, 1770, -2149, -2149, -2149, -2149,
- 1453, 8932, 21444, 1734, 12727, 1738, 19976, -2149, 21444, 1746,
- 2079, 21444, 2085, 438, 929, 21444, 2073, -2149, 1808, -2149,
- 21444, 21444, -2149, 21444, 21444, -2149, -2149, -2149, 12727, -2149,
- 20291, 20291, 20291, 20291, 12727, 1861, 1865, 1867, 2110, 1868,
- 1869, 12727, 12727, 1870, 1871, -2149, 1008, 11692, 2032, 2032,
- 2032, 19976, 610, -2149, -2149, -2149, 21444, -79, -2149, -2149,
- 297, -2149, -2149, 1814, 1810, 16951, -2149, 16951, 1470, 1471,
- 1760, -2149, -2149, 1814, 12727, 1051, 1089, -2149, 2125, 2127,
- 2129, -2149, 2130, 2131, 2132, 2133, 2148, -2149, -2149, -2149,
- 2150, 2151, 2152, 1791, 12727, -2149, 270, -2149, 7207, 32,
- 651, 10657, 10657, 12727, 669, 9277, 12727, 1793, 521, 12727,
- 1814, 1334, -2149, -2149, -2149, 1609, 12727, 1795, -2149, 1677,
- 915, 1798, 1799, 700, 3258, -2149, 432, 12727, 64, -2149,
- 21444, 21444, -2149, 1568, -2149, 91, 16169, -2149, 1958, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, 1802, 2159, 1773,
- -2149, 21444, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, 1856, 2165, 2070, 21444, 2077, 21444, -2149,
- 1807, 1811, -2149, 21444, 2134, 2136, -2149, -2149, -2149, 596,
- 18393, 1813, 2009, 1273, 2011, 1815, 1819, 1825, 17680, -2149,
- -2149, -2149, 918, 436, 2174, 1745, -2149, 21444, 21444, -2149,
- -2149, 1817, 1187, 2179, 447, -2149, -2149, 1988, 1864, 1991,
- 1991, 1826, 326, 1821, 21444, 1453, -2149, 21444, -2149, 1828,
- -2149, 38, 38, 1600, 38, 2022, 1830, 20374, 638, 1128,
- 1136, -2149, 920, -2149, 1996, 2188, 1996, 12727, 10657, -2149,
- -2149, 1829, 1833, 985, 1952, 14882, 1837, 1838, 15738, 1923,
- 1923, 1923, -2149, -2149, 1113, -2149, 1914, 21444, 2090, 2057,
- 1085, -2149, 12727, 1814, -2149, -2149, -2149, -2149, 2208, 2007,
- -2149, -2149, 2120, 20472, -2149, 12727, 2214, -2149, -2149, 2075,
- -2149, -2149, 2114, -2149, 942, 2051, -2149, -2149, 1814, 1854,
- -2149, 21444, 19976, 438, 19976, -2149, -2149, 16169, -2149, 2122,
- 642, 2017, 1857, -2149, -2149, 1858, -2149, 84, 1866, 1600,
- 1600, 1600, 1600, 721, -2149, -2149, -2149, 1872, -2149, -2149,
- 1183, 1197, -2149, -2149, -2149, 1863, -2149, 1570, 86, -2149,
- 19976, 948, 1874, -2149, -2149, 12727, -2149, 1220, -2149, -2149,
- 1875, 1879, 950, 1880, 954, 1881, 1882, 1883, 1884, 1886,
- 1888, -2149, 1230, -2149, 2135, -2149, 1814, 12727, 1891, 12727,
- -2149, -2149, -2149, 1666, 1814, 1376, 7897, -2149, 2065, -2149,
- 1427, 12727, 1925, 1235, -2149, 1890, 1892, 1893, 18828, -2149,
- 21444, 87, -2149, -2149, 1896, -2149, 967, 2066, -2149, 1653,
- 1894, -2149, 1589, 1216, 2118, -2149, 2209, 2103, 1902, 110,
- -2149, 21444, 1904, 21444, 21444, -2149, -2149, -2149, -2149, 2180,
- -2149, -2149, 10657, 1906, 1907, 1908, 21444, 2265, 2270, -2149,
- -2149, -2149, 1010, -2149, -79, 2084, -2149, -2149, -2149, 980,
- -2149, 2182, 1909, 1916, -2149, 1626, 2177, -2149, 50, 666,
- 21444, -2149, 2284, 2285, -2149, 2181, 1964, -2149, -2149, 21444,
- 1961, -2149, -2149, 2195, -2149, 1734, 982, -2149, 21444, 2140,
- -2149, -2149, -2149, -2149, 20787, 1922, 1926, -2149, -2149, -2149,
- -2149, -2149, 2288, -2149, 1996, -2149, 1257, 35, 1927, 1928,
- -2149, 1939, 20880, -2149, 1135, -2149, -2149, -2149, -2149, -2149,
- 15824, 1941, 1943, 9622, 10657, 606, 2282, -2149, -2149, 1944,
- -2149, -2149, -2149, 2149, 2155, -2149, 1814, -2149, -2149, 2097,
- -2149, 1453, 21444, -2149, 1949, -2149, 1949, 15, 1295, -2149,
- 2283, 2286, 2287, 2289, 2154, 2292, 2290, 2021, 2153, 1023,
- -2149, 642, -2149, 2320, 1963, 21444, 21444, -2149, -2149, 12727,
- 2081, 2086, 2087, 11692, -2149, -2149, -2149, -2149, -2149, -2149,
- 1740, 1814, -2149, -2149, -2149, -2149, 2326, -2149, -2149, 2327,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, 1756, 7897, -2149,
- 1427, -2149, 12727, 987, -2149, 834, 2192, -2149, 1814, 21444,
- 1967, -2149, 19976, 19976, -2149, 756, 1968, 3620, 67, -2149,
- 12727, 2234, 1596, 1596, -2149, 2334, 2235, 485, 512, -2149,
- 1568, 2338, 2021, 21444, -2149, -2149, 2243, -2149, 2341, 5,
- 2324, 1982, -2149, 1052, 110, -2149, 2101, -2149, 1983, 1986,
- -2149, 43, 21444, 21444, 21444, 993, 1987, 1990, 2054, 2193,
- 1989, 1596, -2149, 2196, 21444, -2149, 2178, 1997, 656, 21444,
- 2241, -2149, -2149, -2149, -2149, 2242, -2149, 2212, 2174, 2362,
- 2137, 5725, 21444, 1821, 1368, -2149, -2149, 11347, 21444, -2149,
- -80, -2149, 2191, -2149, 1045, -2149, 1013, 86, 2061, 550,
- 21444, -2149, -2149, 2001, 2199, -2149, 20963, 12727, -2149, -2149,
- 1996, -2149, 19976, 19976, 18921, 21444, -2149, 15227, -21, 21278,
- -2149, 2006, 2010, 2014, 1863, 1156, 2279, -2149, -2149, -2149,
- -2149, 2233, -2149, 1734, 132, 2294, 2138, 2293, 2247, 2351,
- -2149, -2149, -2149, 2343, 2344, 2220, 1424, -2149, -2149, 2218,
- 2389, 2390, 2336, -2149, -2149, 56, -2149, -2149, -2149, 1317,
- -2149, -2149, -2149, -2149, -2149, 2027, 2028, 12727, 1037, -2149,
- 1814, -2149, -2149, 834, -2149, -2149, 2030, 2031, 19976, 19976,
- -2149, 801, 1039, 2215, 2337, -2149, -2149, -2149, -2149, -2149,
- -2149, 1086, 1168, -2149, 1821, 1821, 2029, 2400, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, 1095, -2149, 2318,
- -2149, 2038, 2379, 16169, -2149, 693, -2149, 2039, -2149, -2149,
- -2149, 2207, 2042, -2149, 1100, 1123, 1139, -2149, -2149, -2149,
- -2149, -2149, 10657, -2149, -2149, 1523, 2043, 65, -2149, -2149,
- -2149, 21444, 2238, 2045, -2149, -2149, -61, 2101, 21444, 2048,
- 2050, 2101, -2149, -2149, -2149, 1637, 2322, -2149, 21444, 2417,
- -2149, -2149, -2149, 2117, 21444, -2149, 2366, 19004, 417, -2149,
- -2149, 526, -2149, 6517, 2059, -2149, -2149, 2101, 21444, -2149,
- -2149, 1144, -2149, 1814, -2149, 2060, 2068, -2149, 2058, 10657,
- 2072, -2149, 21444, -2149, 21444, 21444, 11692, 11692, 344, 1734,
- -2149, -2149, -2149, -2149, 19883, 1146, -2149, 21444, -2149, 16169,
- 137, 1596, 1925, 2328, -2149, -2149, 2388, -2149, -2149, 2272,
- -2149, -2149, 2438, 567, 2074, 2076, 2194, -2149, -2149, 1814,
- -2149, 2197, 12727, 12727, -2149, 2080, -2149, 4349, 12727, -2149,
- 2346, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, 1216,
- -2149, 21444, -2149, 21444, 2415, 1958, 2348, 2349, 884, 2295,
- 2347, 21444, 2271, -2149, 1273, 51, 2291, 2453, -2149, 2257,
- 2339, -2149, 1155, -2149, -2149, 2452, -2149, 2091, 2363, 2364,
- 2096, -2149, -2149, -2149, -2149, 21444, 21444, -2149, -2149, 1744,
- 21444, 2099, -2149, 21444, 2017, 86, 2464, -2149, -2149, 781,
- 6170, 2225, 2325, 173, -2149, -2149, 829, -2149, -2149, -2149,
- 2104, 433, 12727, 12727, 21444, 2329, 21444, 21444, 2281, 21444,
- 666, 21759, 21444, 14797, 2108, 2109, 12727, 12037, 2111, 6,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, 1159, 1149, -2149, 2116, -2149, -2149, 2119, -2149, 2121,
- 2123, 2126, 2128, -2149, -2149, 682, 689, -2149, -2149, -2149,
- -2149, 12727, 12727, 12727, -2149, 1156, 21444, -2149, -2149, 1209,
- -2149, 1212, 1228, -2149, 2484, -2149, 16169, -2149, 91, -2149,
- 431, 2317, 2465, -2149, 2184, 2466, -2149, 2446, -2149, 2139,
- 2141, 2142, -2149, -2149, 2496, -2149, -2149, 2143, 2144, 2145,
- 2146, 1814, 12727, 2147, -2149, 1239, -2149, 2413, 2471, -2149,
- 21444, 2342, 2296, 1248, -2149, -2149, -2149, 595, 1140, 2291,
- -2149, 2156, 1596, 2495, -2149, 65, 2157, 2045, 21444, 21444,
- -61, -2149, 2160, 1947, -2149, 12727, 2332, 2501, 1963, -2149,
- 110, -2149, -2149, -2149, 2412, 2377, 21444, 1958, 2419, -2149,
- -2149, 2514, -2149, 21444, 2330, 16169, 13072, 2264, 1527, 1539,
- -2149, 130, -2149, 21444, 2163, 11347, 2158, 10657, 10657, 1814,
- -2149, 895, 1188, 550, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, 2164, 2166, 1251, -2149, 21444, -2149, -2149,
- 2517, 349, -2149, -2149, 2383, -2149, -2149, -2149, 162, 1480,
- -2149, -2149, 2515, 2525, 161, 567, 70, 72, 1814, 2521,
- -2149, 2167, 2168, -2149, -2149, 2333, 2249, -2149, 494, 494,
- 1170, 1184, -2149, -2149, 2535, -2149, -2149, -2149, 2533, -2149,
- -2149, -2149, -2149, 21444, 2444, 2057, 1683, 254, -2149, 1253,
- 2175, 2368, 2239, -2149, -2149, 297, 2449, -2149, 417, -2149,
- -2149, 21444, 21361, 21444, 14797, -2149, -2149, -2149, -2149, 581,
- 299, 1346, -2149, -2149, 12382, 14452, -2149, 1371, -2149, 2384,
- -2149, 88, 94, -2149, -2149, -2149, -2149, 1264, -2149, -2149,
- -2149, -2149, -2149, -2149, 2522, -2149, 2544, 2545, 2546, 2547,
- -2149, 2183, 2185, 2186, 2548, -2149, 2445, 1276, -2149, 2356,
- 2357, 2198, 2319, 2393, -2149, 338, -2149, -2149, -2149, -2149,
- -2149, -2149, 1330, 2200, -2149, -2149, -2149, 1740, 21444, 21444,
- -2149, 12727, 10657, 2395, 2284, -2149, 2258, -2149, 297, -2149,
- 5823, -2149, 2407, -2149, 10657, 13417, -2149, -2149, 1373, 7552,
- 14452, 1340, 2201, -2149, 1332, 1149, 2202, -2149, 2557, -2149,
- 1372, 14452, 1346, 1346, -2149, 1188, 2561, -2149, 2260, 2489,
- 2491, -2149, -2149, 2565, 2203, 1596, -2149, 2521, 21444, 21444,
- 21444, -2149, 2571, 2409, -2149, -2149, -2149, 2573, -2149, -2149,
- -2149, -2149, 96, 2210, 2331, 2572, -25, -2149, 16820, 12727,
- 417, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, 766, 775, 12727, 1156, 2213, -2149, 2217, -2149,
- 2201, 14452, 14452, -2149, -2149, 1371, -49, 2335, -2149, -2149,
- -2149, 2563, 2581, 2584, 2221, 2582, -2149, -2149, -2149, -2149,
- 1384, -2149, 2587, -2149, 2223, -2149, 21444, 21444, -2149, -2149,
- 74, 100, -2149, 1814, -2149, 1329, 13762, -2149, 2201, -2149,
- -2149, 2392, 1346, -2149, 2590, -2149, -2149, -2149, 2226, -2149,
- -2149, -2149, 1389, 211, -2149, -2149, -2149, -2149, -2149, 2350,
- -2149, -2149, -2149, 1393, 299, 2163, -2149, -2149, -2149, -2149,
- -2149, -2149, 1346, 1346, 13762, -2149, -2149, -2149, -2149
+ 11087, -2133, 21529, -101, -2133, -2133, 125, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, 634,
+ -2133, 164, 2511, 48, 732, 17220, 109, 943, 365, 556,
+ 18080, 19404, 14882, 672, 679, 721, 521, 351, 546, 569,
+ 15395, 17405, 401, -2133, 17590, 17968, -2133, -2133, 21529, 842,
+ -2133, 554, 509, -2133, 524, 531, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ 273, 904, 552, -2133, 1355, -2133, 36, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, 204, -2133, -2133, -2133,
+ -2133, -2133, 619, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, 812, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, 622,
+ -94, 934, 14192, -2133, 21529, -2133, 21529, -2133, 21529, -2133,
+ 977, 860, -97, 21529, -2133, -2133, 877, -2133, -2133, 858,
+ 21529, -2133, 21529, 21529, -2133, -2133, 1061, -2133, 21529, 21529,
+ 21529, 438, 758, 19487, 21529, 21529, -2133, 1164, 924, 21529,
+ 1076, 21529, 19570, 21529, 850, 21529, 21529, 21529, 21529, 21529,
+ 21529, 21529, 21529, 547, 19885, 21529, 21529, 21529, 931, -2133,
+ -2133, -2133, 762, 762, 762, 954, 964, 983, -2133, 989,
+ 806, -2133, -53, -2133, -2133, 19968, -2133, -2133, -2133, 21529,
+ -2133, -2133, -2133, -2133, -2133, 882, 11432, 1032, 21529, 856,
+ 29, 21529, 18395, 1019, 556, 915, -2133, 839, -2133, -2133,
+ -2133, -2133, 1220, -2133, -2133, 672, 21529, 1303, 21529, 1156,
+ 672, 12812, 955, 1155, 1185, 1197, 1207, 1218, -39, -2133,
+ -2133, 1005, 1018, 1030, 1033, 1043, 1052, 1064, 1083, 1088,
+ -78, -2133, 220, 1193, 1404, 12812, 12812, 280, 1098, -2133,
+ -2133, 1615, 1273, 356, 373, 428, -2133, -2133, 3876, 14,
+ 17, -2133, 1376, 12812, 20061, 4782, -2133, 12812, 1111, -2133,
+ -2133, -2133, -2133, -2133, -2133, 1119, -2133, -2133, -2133, 1324,
+ -2133, -2133, -2133, 17968, 1133, 10052, 1135, 1140, 1144, 21529,
+ 7982, 35, 1121, -2133, 1126, 1143, 1158, 1160, 1166, -2133,
+ 1192, 1194, 1236, 1245, 1256, 1269, -2133, 1274, -2133, 1126,
+ 497, 484, 1177, 1276, -2133, 1278, 1279, 1286, 1330, 1182,
+ 1287, 1347, 21529, 1407, 1428, -2133, 1502, -2133, -2133, 21529,
+ 1291, 26, -2133, -2133, 1534, 1025, 1182, 1423, 1670, 21529,
+ 21529, 1579, 1527, 1582, 1538, -2133, 21529, 1182, 20061, 1489,
+ 21529, 1566, 1322, 577, 1520, -2133, 21529, -2133, 1574, -2133,
+ -2133, -2133, -2133, 1698, 21529, 1607, 1504, -2133, -2133, -2133,
+ 1514, 21529, -2133, -2133, -2133, 21529, 17968, 1720, 21529, 1138,
+ 20376, 20376, 1364, 1357, 1581, 1688, 67, 12812, 12812, 1368,
+ 21529, 1735, 7982, 1591, 17036, 1126, 1372, -2133, -2133, 1374,
+ -8, -2133, 1638, -2133, 1377, 1381, 1642, 21529, 21529, 1418,
+ 12812, -2133, -2133, 1655, 21529, 1584, 1567, -2133, 21529, 11432,
+ 4258, -2133, 1393, 1400, 341, 1600, 707, 21529, -2133, 711,
+ 12812, -2133, 21529, 17968, 1770, 21529, 20376, 1759, 12812, 12812,
+ 12812, 12812, 12812, 12812, 1774, 12812, -2133, 12812, 1682, 1632,
+ 852, 897, 1690, 21529, -2133, 20061, 406, -2133, 1493, 1667,
+ 299, 1493, 299, 19, 33, 17036, -2133, 1422, 1424, 1427,
+ 1429, -2133, 1430, 21529, 1426, 1911, 1434, 1431, 12812, 10397,
+ 1441, 1438, 1738, 12812, 10742, 1141, 936, -2133, 12812, 12812,
+ 12812, 1440, 280, 8327, 1444, 551, -14, -4, 2822, 12812,
+ 1447, 20061, 1447, 1008, -2133, 12812, 4865, 1645, 1719, 5,
+ 1572, 4948, 21529, -18, 1182, 1740, 21529, 1659, 1727, 5296,
+ 299, 18478, 1464, -2133, 1680, -2133, -2133, 1663, 862, 1572,
+ 504, -2133, 1737, 1741, 21529, 21529, 12812, 12812, -2133, 1664,
+ 1572, 1182, 8672, 1665, -2133, 21529, -2133, 5379, -2133, -2133,
+ -2133, 21529, -2133, -2133, -2133, -2133, -2133, 21529, 1706, -2133,
+ 20376, 1472, 660, -2133, 1652, 1657, 1658, 1669, -2133, -23,
+ -2133, 4341, -2133, 1853, 1665, 1854, 1497, 1512, 88, 88,
+ -2133, -2133, -2133, -2133, -2133, -2133, 1874, 1875, -2133, 1688,
+ -21, 12812, -2133, -2133, 12812, -2133, 1368, 832, 1636, 13,
+ 7, 15823, -2133, -2133, 1683, -2133, 18598, 12812, 12812, 12812,
+ 12812, 12812, -2133, 20061, 12812, -7, 12812, 12812, 21529, -2133,
+ 844, 1911, 1573, -2133, 1567, 1522, -2133, -40, -2133, 1795,
+ 1591, 20061, 1528, 1899, -2133, 5462, 846, 1065, -2133, 21529,
+ 1362, 1420, 21529, 1594, 426, 21529, 1536, 1540, 1756, 1758,
+ 1761, 1764, 1546, 1547, 1558, 1559, 1560, 515, 1561, 1563,
+ 1785, 1705, 1576, 1578, 21529, 12812, -2133, -2133, 1813, -2133,
+ 764, 588, -2133, 20061, 299, 1580, 313, -2133, -2133, -2133,
+ -2133, 299, -2133, -2133, 1493, 299, 12812, 21529, 12812, -2133,
+ 12812, 12812, -2133, 21529, 1702, 12812, 611, 12812, 12812, 941,
+ -2133, -2133, 1587, -2133, 1588, 1597, 1784, 1598, -2133, 1602,
+ -2133, -2133, 1605, 1608, 1609, 59, 1617, -2133, -2133, -2133,
+ -2133, -2133, -2133, 1619, 1620, -2133, -2133, 12812, 1621, 1911,
+ 10742, 1624, 6947, 177, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, 1673, 12812, 12812, 939, -2133, -2133, -2133,
+ 776, 1811, 654, 12812, 1606, 280, 1444, -2133, 1618, 12812,
+ 21529, 21529, -2133, 20061, 93, -2133, -2133, 42, 12812, 1625,
+ -2133, 1630, 21529, 1641, 1633, 21529, 1860, -2133, -2133, -2133,
+ -2133, 848, -2133, 19968, 16254, 1639, 21529, 1671, -2133, 1840,
+ 1951, -2133, 1771, -2133, 1677, 21529, 21529, 21529, 1675, -2133,
+ -31, -2133, 21529, 21529, 888, -2133, -2133, -2133, 1302, 16569,
+ 21529, -2133, 1912, 1681, -2133, 1689, -2133, -2133, -2133, 1464,
+ 1869, 1909, 1693, 387, 21529, 1692, 2057, -2133, 2058, 1176,
+ 1176, 21529, 1639, 1572, 1910, 1167, 1709, -2133, -2133, 21529,
+ 1699, 1677, -2133, -2133, -2133, 21529, -2133, 21529, 20376, 20376,
+ 20376, 20376, 2014, -2133, 21529, 1712, -2133, 762, -2133, 12812,
+ 12812, -2133, 2077, -2133, -2133, -2133, -2133, -2133, 1787, 473,
+ -2133, 642, 176, -2133, 1324, -2133, -2133, 1834, -2133, 21529,
+ 21529, 15823, 14967, 1718, 1696, -2133, -2133, 15740, -2133, 10742,
+ 1936, -2133, 2067, 1738, -2133, 1124, 1179, 1179, -2133, -2133,
+ 1724, 17036, -2133, 12812, 1911, 1725, -2133, 979, 1762, -2133,
+ -2133, -2133, -2133, 1309, 9017, 21529, 1665, 12812, 1722, 20061,
+ -2133, 21529, 1726, 2069, 21529, 2072, 577, 879, 21529, 2064,
+ -2133, 1793, -2133, 21529, 21529, -2133, 21529, 21529, -2133, -2133,
+ -2133, 12812, -2133, 20376, 20376, 20376, 20376, 12812, 1850, 1852,
+ 1855, 2099, 1856, 1857, 12812, 12812, 1861, 1862, -2133, 961,
+ 11777, 2013, 2013, 2013, 20061, 604, -2133, -2133, -2133, 21529,
+ 280, -2133, -2133, 299, -2133, -2133, 1911, 1791, 17036, -2133,
+ 17036, 1422, 1424, 1736, -2133, -2133, 1911, 12812, 984, 1003,
+ -2133, 2107, 2109, 2110, -2133, 2111, 2112, 2113, 2114, 2115,
+ -2133, -2133, -2133, 2116, 2117, 2118, 1763, 12812, -2133, 340,
+ -2133, 7292, 21, 722, 10742, 10742, 12812, 627, 9362, 12812,
+ 1767, 600, 12812, 1911, 1333, -2133, -2133, -2133, 1738, 12812,
+ 1772, -2133, 1606, 957, 1773, 1776, 669, 3345, -2133, 214,
+ 12812, 64, -2133, 21529, 21529, -2133, 1432, -2133, 488, 16254,
+ -2133, 1935, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ 1775, 2136, 1719, -2133, 21529, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, 1836, 2143, 2047, 21529,
+ 2054, 21529, -2133, 1783, 1786, -2133, 21529, 2108, 2119, -2133,
+ -2133, -2133, 409, 18478, 1788, 1988, 1164, 1990, 1789, 1790,
+ 1794, 17765, -2133, -2133, -2133, 967, 432, 2157, 1680, -2133,
+ 21529, 21529, -2133, -2133, 1797, 1182, 2158, 508, -2133, -2133,
+ 1965, 1841, 1966, 1966, 1801, 11, 1639, 21529, 1309, -2133,
+ 21529, -2133, 1799, -2133, -15, -15, 1546, -15, 1997, 1802,
+ 20459, 677, 1009, 1039, -2133, 970, -2133, 1971, 2167, 1971,
+ 12812, 10742, -2133, -2133, 1806, 1807, 1792, 1926, 14967, 1809,
+ 1810, 15823, 1895, 1895, 1895, -2133, -2133, 1326, -2133, 1891,
+ 21529, 2059, 2028, 1201, -2133, 12812, 1911, -2133, -2133, -2133,
+ -2133, 2177, 1976, -2133, -2133, 2091, 20557, -2133, 12812, 2185,
+ -2133, -2133, 2046, -2133, -2133, 2085, -2133, 973, 2021, -2133,
+ -2133, 1911, 1822, -2133, 21529, 20061, 577, 20061, -2133, -2133,
+ 16254, -2133, 2093, 644, 1989, 1826, -2133, -2133, 1827, -2133,
+ 91, 1830, 1546, 1546, 1546, 1546, 695, -2133, -2133, -2133,
+ 1831, -2133, -2133, 1057, 1062, -2133, -2133, -2133, 1832, -2133,
+ 1851, 591, -2133, 20061, 975, 1835, -2133, -2133, 12812, -2133,
+ 1085, -2133, -2133, 1837, 1838, 982, 1839, 985, 1842, 1843,
+ 1844, 1846, 1847, 1848, -2133, 1091, -2133, 2096, -2133, 1911,
+ 12812, 1858, 12812, -2133, -2133, -2133, 1624, 1911, 1906, 7982,
+ -2133, 2034, -2133, 1254, 12812, 1894, 1102, -2133, 1849, 1859,
+ 1865, 18913, -2133, 21529, 97, -2133, -2133, 1868, -2133, 991,
+ 2022, -2133, 1654, 1866, -2133, 1993, 1267, 2070, -2133, 2162,
+ 2056, 1863, 96, -2133, 21529, 1870, 21529, 21529, -2133, -2133,
+ -2133, -2133, 2132, -2133, -2133, 10742, 1872, 1873, 1877, 21529,
+ 2217, 2218, -2133, -2133, -2133, 963, -2133, 280, 2027, -2133,
+ -2133, -2133, -2133, 1006, -2133, 2145, 1876, 1879, -2133, 1572,
+ 2122, -2133, 56, 556, 21529, -2133, 2240, 2242, -2133, 2146,
+ 1924, -2133, -2133, 21529, 1814, -2133, -2133, 2156, -2133, 1665,
+ 1012, -2133, 21529, 2102, -2133, -2133, -2133, -2133, 20872, 1884,
+ 1888, -2133, -2133, -2133, -2133, -2133, 2251, -2133, 1971, -2133,
+ 1120, 102, 1890, 1892, -2133, 1893, 20965, -2133, 1696, -2133,
+ -2133, -2133, -2133, -2133, 15909, 1889, 1897, 9707, 10742, 47,
+ 2245, -2133, -2133, 1902, -2133, -2133, -2133, 2103, 2120, -2133,
+ 1911, -2133, -2133, 2060, -2133, 1309, 21529, -2133, 1896, -2133,
+ 1896, -6, 1353, -2133, 2234, 2236, 2237, 2238, 2105, 2243,
+ 2239, 1840, 2121, 899, -2133, 644, -2133, 2280, 1916, 21529,
+ 21529, -2133, -2133, 12812, 2035, 2036, 2037, 11777, -2133, -2133,
+ -2133, -2133, -2133, -2133, 1690, 1911, -2133, -2133, -2133, -2133,
+ 2282, -2133, -2133, 2284, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, 1943, 7982, -2133, 1254, -2133, 12812, 1023, -2133, 832,
+ 2149, -2133, 1911, 21529, 1925, -2133, 20061, 20061, -2133, 739,
+ 1922, 3705, 69, -2133, 12812, 2189, 1289, 1289, -2133, 2289,
+ 2193, 514, 517, -2133, 1432, 2293, 1840, 21529, -2133, -2133,
+ 2201, -2133, 2303, 332, 2286, 1946, -2133, 950, 96, -2133,
+ 2065, -2133, 1947, 1948, -2133, 106, 21529, 21529, 21529, 1035,
+ 1949, 1950, 2015, 2151, 1956, 1289, -2133, 2160, 21529, -2133,
+ 2141, 1959, 478, 21529, 2205, -2133, -2133, -2133, -2133, 2203,
+ -2133, 2175, 2157, 2325, 2094, 5810, 21529, 1639, 1391, -2133,
+ -2133, 11432, 21529, -2133, 196, -2133, 2155, -2133, 1089, -2133,
+ 1060, 591, 2025, 336, 21529, -2133, -2133, 1967, 2163, -2133,
+ 21048, 12812, -2133, -2133, 1971, -2133, 20061, 20061, 19006, 21529,
+ -2133, 15312, 62, 21363, -2133, 1968, 1975, 1977, 1832, 1167,
+ 2250, -2133, -2133, -2133, -2133, 2195, -2133, 1665, 23, 2258,
+ 2098, 2262, 2216, 2319, -2133, -2133, -2133, 2311, 2312, 2188,
+ 1396, -2133, -2133, 2186, 2355, 2356, 2304, -2133, -2133, 60,
+ -2133, -2133, -2133, 1130, -2133, -2133, -2133, -2133, -2133, 1995,
+ 1996, 12812, 1078, -2133, 1911, -2133, -2133, 832, -2133, -2133,
+ 1998, 2000, 20061, 20061, -2133, 772, 579, 2184, 2308, -2133,
+ -2133, -2133, -2133, -2133, -2133, 926, 1007, -2133, 1639, 1639,
+ 1999, 2369, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, 1093, -2133, 2287, -2133, 2007, 2349, 16254, -2133, 159,
+ -2133, 2008, -2133, -2133, -2133, 2178, 2012, -2133, 1095, 1104,
+ 1110, -2133, -2133, -2133, -2133, -2133, 10742, -2133, -2133, 1464,
+ 2016, 24, -2133, -2133, -2133, 21529, 2207, 2017, -2133, -2133,
+ 495, 2065, 21529, 2011, 2018, 2065, -2133, -2133, -2133, 1591,
+ 2285, -2133, 21529, 2379, -2133, -2133, -2133, 2080, 21529, -2133,
+ 2330, 19089, 454, -2133, -2133, 718, -2133, 6602, 2023, -2133,
+ -2133, 2065, 21529, -2133, -2133, 1115, -2133, 1911, -2133, 2024,
+ 2026, -2133, 2029, 10742, 2031, -2133, 21529, -2133, 21529, 21529,
+ 11777, 11777, -56, 1665, -2133, -2133, -2133, -2133, 19968, 1147,
+ -2133, 21529, -2133, 16254, 116, 1289, 1894, 2290, -2133, -2133,
+ 2343, -2133, -2133, 2226, -2133, -2133, 2392, 582, 2032, 2030,
+ 2152, -2133, -2133, 1911, -2133, 2153, 12812, 12812, -2133, 2038,
+ -2133, 4434, 12812, -2133, 2296, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, 1267, -2133, 21529, -2133, 21529, 2373, 1935,
+ 2305, 2306, 869, 2246, 2299, 21529, 2227, -2133, 1164, 113,
+ 2241, 2406, -2133, 2211, 2292, -2133, 1151, -2133, -2133, 2409,
+ -2133, 2052, 2322, 2323, 2055, -2133, -2133, -2133, -2133, 21529,
+ 21529, -2133, 1683, 21529, 2061, -2133, 21529, 1989, 591, 2422,
+ -2133, -2133, 863, 6255, 2183, 2283, 676, -2133, -2133, 746,
+ -2133, -2133, -2133, 2062, 304, 12812, 12812, 21529, 2279, 21529,
+ 21529, 2244, 21529, 556, 21844, 21529, 14882, 2066, 2068, 12812,
+ 12122, 2071, 20, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, 1162, 1126, -2133, 2073, -2133, -2133,
+ 2074, -2133, 2075, 2076, 2078, 2079, -2133, -2133, -177, -171,
+ -2133, -2133, -2133, -2133, 12812, 12812, 12812, -2133, 1167, 21529,
+ -2133, -2133, 1153, -2133, 1171, 1174, -2133, 2429, -2133, 16254,
+ -2133, 488, -2133, 74, 2261, 2408, -2133, 2128, 2412, -2133,
+ 2397, -2133, 2081, 2082, 2083, -2133, -2133, 2445, -2133, -2133,
+ 2084, 2086, 2089, 2088, 1911, 12812, 2092, -2133, 1184, -2133,
+ 2365, 2424, -2133, 21529, 2300, 2253, 1189, -2133, -2133, -2133,
+ 512, 477, 2241, -2133, 2097, 1289, 2459, -2133, 24, 2100,
+ 2017, 21529, 21529, 495, -2133, 2101, 1936, -2133, 12812, 2301,
+ 2464, 1916, -2133, 96, -2133, -2133, -2133, 2376, 2340, 21529,
+ 1935, 2380, -2133, -2133, 2471, -2133, 21529, 2288, 16254, 13157,
+ 2222, 1513, 1556, -2133, 269, -2133, 21529, 2123, 11432, 2125,
+ 10742, 10742, 1911, -2133, 756, 1059, 336, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, 2124, 2126, 1191, -2133,
+ 21529, -2133, -2133, 2475, -42, -2133, -2133, 2341, -2133, -2133,
+ -2133, 803, 1491, -2133, -2133, 2473, 2476, 479, 582, 75,
+ 78, 1911, 2479, -2133, 2129, 2130, -2133, -2133, 2302, 2196,
+ -2133, 595, 595, 1219, 1229, -2133, -2133, 2480, -2133, -2133,
+ -2133, 2481, -2133, -2133, -2133, -2133, 21529, 2389, 2028, 1656,
+ 187, -2133, 1205, 2133, 2313, 2187, -2133, -2133, 299, 2398,
+ -2133, 454, -2133, -2133, 21529, 21446, 21529, 14882, -2133, -2133,
+ -2133, -2133, 793, 484, 1152, -2133, -2133, 12467, 14537, -2133,
+ 1321, -2133, 2334, -2133, 115, 120, -2133, -2133, -2133, -2133,
+ 1211, -2133, -2133, -2133, -2133, -2133, -2133, 2478, -2133, 2496,
+ 2500, 2501, 2502, -2133, 2139, 2140, 2142, 2503, -2133, 2403,
+ 1214, -2133, 2320, 2324, 2159, 2271, 2348, -2133, 358, -2133,
+ -2133, -2133, -2133, -2133, -2133, 1223, 2154, -2133, -2133, -2133,
+ 1690, 21529, 21529, -2133, 12812, 10742, 2361, 2240, -2133, 2224,
+ -2133, 299, -2133, 5908, -2133, 2374, -2133, 10742, 13502, -2133,
+ -2133, 1173, 7637, 14537, 1568, 2161, -2133, 1217, 1126, 2164,
+ -2133, 2522, -2133, 1235, 14537, 1152, 1152, -2133, 1059, 2528,
+ -2133, 2223, 2456, 2461, -2133, -2133, 2532, 2170, 1289, -2133,
+ 2479, 21529, 21529, 21529, -2133, 2537, 2375, -2133, -2133, -2133,
+ 2539, -2133, -2133, -2133, -2133, 122, 2179, 2298, 2542, 272,
+ -2133, 16905, 12812, 454, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, 448, 573, 12812, 1167, 2190,
+ -2133, 2191, -2133, 2161, 14537, 14537, -2133, -2133, 1321, -32,
+ 2307, -2133, -2133, -2133, 2526, 2547, 2549, 2192, 2552, -2133,
+ -2133, -2133, -2133, 1250, -2133, 2558, -2133, 2194, -2133, 21529,
+ 21529, -2133, -2133, 92, 90, -2133, 1911, -2133, 1136, 13847,
+ -2133, 2161, -2133, -2133, 2345, 1152, -2133, 2560, -2133, -2133,
+ -2133, 2199, -2133, -2133, -2133, 1261, 330, -2133, -2133, -2133,
+ -2133, -2133, 2314, -2133, -2133, -2133, 1263, 484, 2123, -2133,
+ -2133, -2133, -2133, -2133, -2133, 1152, 1152, 13847, -2133, -2133,
+ -2133, -2133
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -2149, -2149, -2149, -2149, -2149, 2472, 8, -2149, -2149, -2149,
- -2149, 1417, -1003, -2149, 509, 548, -2149, 419, -2149, 674,
- -2149, 518, -2149, -2149, -2149, -2149, 1885, -2149, -452, 122,
- 2375, -2149, -1155, -2149, -2149, -2149, -2149, -617, -2149, -2149,
- 2488, -2149, -2149, -936, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -881, -224, -2149, -2149, -2149, 28, 2523,
- -2149, 2161, -62, -325, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, 1466, -2149, -2149, -2149, -2149, -2149, -1464, -1438,
- 1074, -1291, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, 1693, -2149, -2149, -2149, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, 2618, 2619, 2620, -2149,
- -2149, -2149, 2622, -2149, -2149, 592, 1115, 1409, -645, -326,
- 240, -2149, 182, -2149, 2629, -2149, -2149, -2149, 1965, 1956,
- -2149, -2149, -2149, -2149, -1174, -1392, 2630, -2149, 1631, 2634,
- -2148, 253, -679, -2149, 30, -1172, 14, -2149, -491, -481,
- -596, -476, -274, -2149, -2149, 1410, 1953, -2149, -1603, -2149,
- -2149, -1783, 2162, -2149, 706, -2149, 1236, -643, -2149, 1385,
- 517, -2149, 955, -876, -2149, -2149, 541, 440, -2149, -544,
- -2149, -2149, -2149, -2149, -2149, 1071, -2149, -2149, -2149, -2149,
- -2149, -2149, -783, 1905, -63, 2447, -2149, 764, -2149, 1955,
- -276, -2149, -1139, 683, 29, 1873, 1876, -426, 0, -669,
- -188, 1970, -662, -1330, -2149, -2149, -2149, -2149, 1822, 2088,
- -2149, -2149, -2149, -2149, -1084, -1536, 77, 2442, -1608, -205,
- -75, -100, 1758, -521, -2149, -1110, -2149, -456, -2149, -1449,
- -283, -98, 47, -2149, -2149, -2149, -2149, -2149, -2149, 1748,
- -2149, -2149, 785, -584, -384, -2149, 1517, -1633, -2149, 740,
- -2149, 319, 1268, -878, 337, -2149, -2149, -1636, -1178, -2149,
- -2149, -1765, -2149, -2149, -1428, -2149, -2149, -2149, -1992, -2149,
- -1745, -2149, -2149, -2149, -2149, 354, -1727, -378, -2149, 364,
- -2149, 2, -2149, 3, 365, 366, 367, 363, -2149, 217,
- -2149, -2149, 369, -2149, -2149, -2149, -2149, -2149, -2149, -2149,
- 572, -2149, -2149, -2149, 379, -2149, -2149, -2149, -2149, 380,
- 847, -2149, -2149, 266, -2149, -2149, -2149, -2149, -2149, 1241,
- -2149, -2149, -2149, -2149, -2149, -235, 248, 1511, -2149, -2149,
- -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -2149, -1528,
- -2149, -2149, 566, -2149, 1067, -2149, -2149, 2612, 1169, -2149,
- 640, -642, -1526, -2149, 636, -2149, -2149, 1160, 1243, -1025,
- -2149, -2149, 1, 2107, -189, -1791, -2149, -196, -2149, -222,
- -2149, -2149, -2149, 1777, 1487, -2149, -2149, -2149, -2149, 520,
- 1050, -2149, 599, -2149, 1504, -2149, -2149, -2149, -2149, -1660,
- 736, -2149
+ -2133, -2133, -2133, -2133, -2133, 2449, 8, -2133, -2133, -2133,
+ -2133, 1392, -1004, -2133, 482, 523, -2133, 386, -2133, 643,
+ -2133, 483, -2133, -2133, -2133, -2133, 1864, -2133, -437, 10,
+ 2346, -2133, -1158, -2133, -2133, -2133, -2133, -603, -2133, -2133,
+ 2460, -2133, -2133, -939, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -894, -219, -2133, -2133, -2133, 104, 2494,
+ -2133, 2127, 51, -322, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, 1435, -2133, -2133, -2133, -2133, -2133, -1474, -1449,
+ 1041, -1289, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, 1660, -2133, -2133, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, 2586, 2589, 2590, -2133,
+ -2133, -2133, 2592, -2133, -2133, 559, 1079, 1379, -646, -373,
+ 207, -2133, 152, -2133, 2601, -2133, -2133, -2133, 1934, 1927,
+ -2133, -2133, -2133, -2133, -1177, -289, 2604, -2133, 1603, 2605,
+ -2132, 222, -680, -2133, 30, -1173, 16, -2133, -495, -432,
+ -601, -466, -245, -2133, -1038, 1413, 1929, -2133, -496, -2133,
+ 221, -1782, -2133, 681, -2133, 1204, -640, -2133, 1361, 390,
+ -2133, 921, -879, -2133, -2133, 513, 412, -2133, -543, -2133,
+ -2133, -2133, -2133, -2133, 1047, -2133, -2133, -2133, -2133, -2133,
+ -2133, -768, 1987, -175, 2420, -2133, 737, -2133, 1928, -274,
+ -2133, -1586, 1409, -25, 1845, 1867, -484, 0, -670, -244,
+ 1942, -668, -1395, -2133, -2133, -2133, -2133, 1796, 2051, -2133,
+ -2133, -2133, -2133, -1084, -1563, 162, 2423, -1606, -190, -70,
+ -43, 1729, -516, -2133, -1113, -2133, -435, -2133, -1448, -281,
+ -57, 40, -2133, -2133, -2133, -2133, -2133, -2133, 1717, -2133,
+ -2133, 1055, -587, -391, -2133, 1495, -1627, -2133, 708, -2133,
+ 294, 1240, -881, 308, -2133, -2133, -1509, -1186, -2133, -2133,
+ -1769, -2133, -2133, -1608, -2133, -2133, -2133, -1962, -2133, -1848,
+ -2133, -2133, -2133, -2133, 325, -1789, -378, -2133, 335, -2133,
+ 2, -2133, 3, 337, 338, 339, 331, -2133, 186, -2133,
+ -2133, 342, -2133, -2133, -2133, -2133, -2133, -2133, -2133, 541,
+ -2133, -2133, -2133, 352, -2133, -2133, -2133, -2133, 353, 816,
+ -2133, -2133, 239, -2133, -2133, -2133, -2133, -2133, 1210, -2133,
+ -2133, -2133, -2133, -2133, -197, 296, 1484, -2133, -2133, -2133,
+ -2133, -2133, -2133, -2133, -2133, -2133, -2133, -2133, -1541, -2133,
+ -2133, 542, -2133, 1036, -2133, -2133, 2584, 1137, -2133, 607,
+ -647, -1546, -2133, 606, -2133, -2133, 1125, 1208, -1373, -2133,
+ -2133, 1, 2087, -195, -1809, -2133, -198, -2133, -270, -2133,
+ -2133, -2133, 1743, 1448, -2133, -2133, -2133, -2133, 486, 1013,
+ -2133, 566, -2133, 1469, -2133, -2133, -2133, -2133, -1668, 703,
+ -2133
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -2999,626 +2987,590 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -1228
static const yytype_int16 yytable[] =
{
- 172, 188, 177, 178, 587, 402, 292, 649, 126, 485,
- 198, 888, 400, 977, 165, 962, 944, 421, 1304, 589,
- 1306, 1426, 963, 424, 425, 1196, 1389, 820, 1414, 316,
- 164, 1696, 908, 435, 1452, 1097, 1003, 1547, 461, 462,
- 616, 1212, 1958, 919, 1820, 971, 813, 1657, 815, 1387,
- 717, 627, 2026, 1436, 1825, 1694, 764, 1765, 769, 1893,
- 1473, 677, 1475, 1703, -1219, 1895, 765, -1218, 765, 511,
- -1220, 1873, -1221, 770, 549, 1778, 1978, 1295, 2434, 199,
- 948, 1013, 297, 267, -218, -992, 1734, 1788, 289, 198,
- 295, 734, 1244, 1247, -1094, 1803, 523, 847, 295, 267,
- 688, 397, 327, 295, 2436, 587, 329, 79, -1094, 2143,
- 848, 1021, 296, 1023, 415, 591, 2017, -992, 967, 310,
- 347, 966, 348, 420, 328, -992, 990, 607, 939, -1094,
- 559, 301, 955, 2234, 2225, 1605, 1101, 1102, 382, 1101,
- 1102, 468, 578, 439, 657, 1606, 443, 1101, 1102, 446,
- 164, 1859, 896, 864, 1781, 1101, 1102, 1939, 317, 1001,
- 2410, -1094, 2380, 1234, 2051, 437, 858, 564, 2263, 1782,
- 545, 1827, 548, 2386, 471, 864, 723, 2120, 714, 1948,
- 1607, 1024, 1087, 1088, -1095, 240, 2256, 1517, 1608, -1096,
- 200, 570, 1101, 1102, 864, 835, 1707, 1609, 1101, 1102,
- 1101, 1102, 399, 472, 1544, 587, 994, 201, 635, 995,
- 996, 405, 605, 405, 628, 408, 1610, 879, 426, 1390,
- 267, 2257, 619, 99, 571, 1545, 771, 418, 274, 267,
- 418, 427, 241, 2418, 1949, 423, 418, 418, 2121, 1459,
- 198, 198, 198, 2052, 920, 1742, 418, 865, 198, 267,
- 440, 318, 267, 444, 198, 267, 198, 198, 198, 198,
- 890, 198, 198, 198, 198, 724, 636, 1235, 1860, 865,
- 1054, 761, 2264, 1095, 768, 1099, 772, 1058, 584, 992,
- 765, 1061, 470, 2411, 1089, 1055, 198, 765, 865, 120,
- 1828, 765, 1059, 2235, 1783, 496, 1062, 469, 198, 504,
- 1679, 956, 695, 696, 697, 698, 699, 857, 587, 430,
- 431, 432, 510, 2225, 198, 583, 304, 469, 469, 349,
- 759, 2382, 931, 445, 1367, 447, 448, 449, 450, 1002,
- 454, 455, 456, 457, 866, 1453, 1213, 564, 564, 564,
- 632, 564, 564, 1238, 564, 2053, 564, 773, 2102, 586,
- 509, 546, 1070, 546, 543, 515, 866, 1515, 1287, 551,
- 558, 561, -992, 346, 875, 296, 856, 501, 586, 1247,
- 1940, 1537, 1296, 79, -651, 866, 1835, 585, 2248, 295,
- 687, 586, 876, 513, 2435, 510, 999, 837, 1093, 586,
- 855, 654, 586, 2074, 608, -651, 853, 706, 585, 2226,
- 568, 1353, 2079, 1611, 1681, 485, 656, 546, 469, 2437,
- 2438, 335, 1793, 1901, 1117, 1873, 732, 686, 198, 304,
- 2086, 202, 678, 1655, 1725, 418, 989, -651, 2041, 2042,
- 585, -1219, 1021, 1023, -1218, 418, 198, -1220, 1790, -1221,
- 1612, 949, 625, 79, 558, 1192, 267, 738, 2213, 305,
- -1227, -218, 198, 1124, 206, -1227, 79, 2322, 1587, 1261,
- 198, 739, 2451, 2323, 279, 2405, 354, 648, -485, -485,
- -485, 440, 295, 2299, 198, 2344, 267, 267, 1220, 987,
- 687, 1057, 867, 79, 306, 204, 684, 601, 412, 99,
- 700, 1840, 1450, 652, 579, 451, 759, 1060, 498, 1066,
- 298, 1872, 1718, 267, 707, 620, 1854, 2345, 452, 2373,
- 712, 1594, 1239, 702, 648, 719, 1774, 686, 2026, 300,
- 1877, 640, 267, 1972, 1022, 551, 877, 440, 295, 643,
- 198, 267, 2239, 1728, 925, 2130, 533, 2131, 1053, 2043,
- 2134, 695, 696, 697, 698, 699, 717, 1768, 198, 736,
- 758, 413, 305, 1390, 1099, 120, 2195, 1354, 1355, 99,
- 700, 302, 635, 499, 1303, 896, 1125, 896, 779, 1333,
- 364, 365, 99, 2364, 1771, 1569, 1451, 1776, 2226, 765,
- 1571, 1828, 2017, 355, 1334, 303, 286, 540, 695, 696,
- 697, 698, 699, 851, 1372, 2284, 558, 888, 2135, 99,
- 551, 860, 1308, 2421, 1331, 1484, 874, 510, 993, 841,
- 843, 198, 1121, 1122, 885, 2414, 648, 757, 2274, 79,
- 636, 904, 79, -1053, -1053, 120, 586, 1368, 759, 198,
- 198, 1101, 1102, 1439, 1027, 1390, 1139, 886, 120, 1952,
- 267, 1769, 927, 1957, 905, 2044, 198, 695, 696, 697,
- 698, 699, 198, 534, 287, 267, 500, 1132, 1120, 2254,
- 1424, 1191, 1837, 1840, 2361, 763, 942, -485, 1772, 2028,
- -630, -613, 2378, 1925, 2109, 1973, 1974, 1975, 906, 1386,
- 881, 2275, 1519, 1520, 1521, 1522, 1837, 1408, 2059, 2440,
- 1369, 1523, -1227, 1524, 1477, 760, 198, 1440, 914, 915,
- 307, 1384, 980, 755, -503, -503, -503, 1689, 1525, 558,
- 202, 651, 1402, 551, 267, 928, 1808, 308, 590, 687,
- 1228, 929, 727, 1926, 896, 1838, 1005, 2440, 1770, 2060,
- 1009, 1241, 1242, 2188, 198, 99, 1409, 418, 99, 275,
- 267, 695, 696, 697, 698, 699, 364, 365, 1526, 1838,
- 695, 696, 697, 698, 699, 1773, 686, 1104, 1105, 198,
- 695, 696, 697, 698, 699, 974, 330, 735, 1052, 2050,
- 1136, 1106, 1809, 1103, 204, 1821, 1451, 1977, 2061, 2085,
- 1927, 280, 1064, 1200, 1053, 551, 551, 331, 1071, 1357,
- 2189, 276, 277, 164, 695, 696, 697, 698, 699, 2396,
- 1451, 2126, 332, 1018, 763, 1383, 281, 1107, 1527, 2127,
- 1671, 728, 729, 202, 730, 1108, 333, 831, 1435, 1109,
- 1048, 1112, 551, 1696, 1439, 1358, 334, 203, 1045, 1329,
- 695, 696, 697, 698, 699, 1466, 1499, 1359, 357, 358,
- 359, 360, 361, 362, 337, 2111, 364, 365, 551, 1038,
- 832, 1653, 366, 338, 205, 510, 510, 238, 1123, 256,
- 2117, 2038, 695, 696, 697, 698, 699, 1129, 1621, 2112,
- 418, 2113, 1119, 1221, 1222, 1223, 1224, 204, 470, 510,
- 242, 1150, 208, 1010, 351, 1014, 1916, 1917, 282, 352,
- 198, 198, 1172, 242, 2387, 2388, 1528, 1177, 198, 933,
- 934, 1139, 1053, -503, 510, 648, 962, 845, 846, 1049,
- 729, -1227, 1050, 963, 1051, 2114, 243, 208, 1010, 1202,
- 1014, 1015, 1114, 782, 1936, 244, 198, 961, 2038, 695,
- 696, 697, 698, 699, 1216, 853, 2161, 213, 244, 1174,
- 1219, 1175, 648, 267, 267, 267, 267, 1618, 2304, 1226,
- 1695, 2305, 1529, 1421, 695, 696, 697, 698, 699, 1170,
- 1171, 353, 208, 1010, 1625, 1840, 2122, 1178, 1309, 1310,
- 1311, 1312, 213, 410, 510, 510, 198, 198, -1227, 2123,
- 2124, 1330, 504, 1246, 695, 696, 697, 698, 699, 696,
- 697, 698, 699, 1667, 2447, 1211, 700, 356, 687, 164,
- 831, 1236, 1237, 369, 695, 696, 697, 698, 699, 411,
- 648, 1074, 416, 245, 1289, 2222, 1290, 213, 422, 1293,
- 845, 846, 417, 1297, 2456, 2457, 245, 428, 648, 648,
- 370, 648, 1307, 832, 202, 686, 551, 434, 267, 267,
- 267, 267, 1181, 2297, 436, 974, 974, 1720, 246, 2150,
- 442, 1628, 247, -630, 248, 1116, 2151, 463, 1871, 558,
- -631, 246, 1139, 1182, 648, 247, 258, 248, -1227, 1183,
- 1514, 1378, 1516, 700, 962, 700, 208, 1010, -1156, 1727,
- 896, 963, 1721, 458, 478, 208, 1010, 1332, 1014, 259,
- 1722, 1539, 1184, 1912, 249, 1913, 2314, 250, 204, 695,
- 696, 697, 698, 699, 1496, 459, 1497, 1498, 1548, 261,
- 1185, 479, 1134, 1135, 262, 1011, 1629, 695, 696, 697,
- 698, 699, 2362, 263, -1227, 464, 2357, 1748, 843, 251,
- 465, 213, 1381, -958, 339, 551, 1630, -630, 1385, 648,
- 213, 340, -957, 466, 510, 341, -631, 1631, 695, 696,
- 697, 698, 699, 467, 2252, 75, 1329, 252, 474, 1395,
- 695, 696, 697, 698, 699, 495, 1616, 1667, 1667, -1227,
- 1794, 2314, 1907, 253, 408, 1914, 648, 1915, 1573, 1632,
- 497, 1405, 2314, 254, 255, 2190, 1633, 2191, 648, 733,
- 342, 1634, 612, 613, 614, 2244, 510, 2245, 695, 696,
- 697, 698, 699, 506, 1635, 198, 1432, 309, 741, 742,
- 743, 1636, 745, 746, 753, 749, 2278, 750, 2279, 207,
- 512, -1156, 1454, 886, 2045, 1457, 1179, 1180, 208, 209,
- 2280, 508, 2281, 343, 88, 1465, 210, 695, 696, 697,
- 698, 699, 2314, 2314, 754, 695, 696, 697, 698, 699,
- 1461, 514, 1462, 198, 507, 211, 198, 517, 1935, 1481,
- 1101, 1102, 2243, 519, 212, 648, 91, 1249, 1250, 1251,
- 551, 1252, 1253, 1254, 1431, 164, 698, 699, 1265, 1266,
- 2103, 1505, 518, 213, 1375, 782, 214, 1423, 934, 1471,
- 1472, 1637, 695, 696, 697, 698, 699, 1597, 1598, 1513,
- 558, 215, 558, 1908, 520, 510, 695, 696, 697, 698,
- 699, 1510, 1511, 521, 210, 2035, 1638, 1549, 934, 1555,
- 1556, 1639, 974, 1558, 1559, 974, 1709, 1710, 1640, 695,
- 696, 697, 698, 699, 522, 216, 1589, 934, 558, 695,
- 696, 697, 698, 699, 695, 696, 697, 698, 699, 1647,
- 1648, 1672, 1511, 217, 524, 1943, 1741, 782, 535, 1077,
- 1746, 1747, 1797, 934, 214, 1548, 695, 696, 697, 698,
- 699, 1822, 1823, 218, 1831, 1832, 539, 1324, 1965, 215,
- 1738, 485, 1833, 1834, 536, 888, 1585, 219, 1586, 220,
- 525, 221, 526, 222, 527, 1249, 1250, 1251, 853, 1252,
- 1253, 223, 224, 528, 225, 226, 1900, 782, 896, 510,
- 529, 648, 648, 216, 530, 1690, 531, 1249, 1250, 1251,
- 1338, 1252, 1253, 1254, 648, -524, 695, 696, 697, 698,
- 699, 217, 532, 227, 241, 1847, 228, 204, 695, 696,
- 697, 698, 699, 695, 696, 697, 698, 699, 198, 695,
- 696, 697, 698, 699, 1644, 550, 1268, 648, 1339, 567,
- 1855, 1856, 1887, 1888, 1920, 1921, 1673, 220, 229, 1932,
- 934, 2075, 1675, -939, -939, 896, 2067, 2068, 565, 223,
- 224, 1572, 566, 226, -939, 695, 696, 697, 698, 699,
- 1686, -939, 1933, 1834, 1269, 569, 230, 1469, 198, 575,
- 1984, 71, 576, 2381, -618, 1470, 577, -939, 1934, 1834,
- 231, 1985, 232, 2030, 2031, 2047, 2048, 1658, 1986, -939,
- 1454, 586, 233, 234, 2094, 2095, 1904, 1906, 588, -939,
- -621, -604, -939, 592, 77, 594, 695, 696, 697, 698,
- 699, -939, 2232, 648, 648, -623, 1989, -624, 1139, -629,
- 1270, -621, 1541, 1271, 2233, 596, 78, 2258, 2259, 1990,
- -616, 695, 696, 697, 698, 699, 1542, -625, 1992, 1272,
- 1575, -626, 357, 358, 359, 360, 361, 362, 2156, 2157,
- 1371, 2158, 1543, 599, 2155, -627, 366, 198, 602, 1552,
- 558, 558, -628, 2241, 2242, 1751, 1451, 2159, 1543, 1566,
- 1755, 1756, 1757, 1758, 1581, 1759, 2153, 2154, 2180, 934,
- 1273, 1297, 1274, -617, 1760, -631, 1275, 2187, 2157, 888,
- 2251, 934, 2290, 2291, 2183, -632, 1680, 2317, 2318, -622,
- 648, 648, 648, 2324, 2325, 603, 695, 696, 697, 698,
- 699, 593, 198, 598, 1139, 2336, 2337, 198, 695, 696,
- 697, 698, 699, 1208, 1276, 604, 1744, 1277, 606, 1819,
- 1432, 961, 1140, 1141, 1142, 1143, 1826, 1144, 1145, 1146,
- 1278, 1279, 2049, 610, 1280, 617, 1281, 1576, 510, 695,
- 696, 697, 698, 699, 1850, 2070, 1896, 621, 1544, 618,
- 558, 558, 1686, 1857, 622, 198, 623, 1863, 2439, 2346,
- 2347, 896, 888, -647, -647, 624, 1761, 1762, 1282, 1545,
- 629, 1805, -939, -939, 1019, 634, 1810, 633, 853, 695,
- 696, 697, 698, 699, 638, 789, 1140, 1141, 1142, 1143,
- 790, 1144, 1145, 1146, 791, 1139, 1147, 369, 641, 1998,
- 642, 2384, 2385, 2012, 792, 1795, 1796, 1019, 2352, -216,
- 793, 644, -216, 2429, 934, 794, 558, 1905, 2450, 934,
- 2375, 1592, 2453, 2454, 974, 1763, 1042, 1487, 1488, 647,
- -216, 795, 645, 653, 2046, 658, -216, 659, 660, 796,
- 382, 681, -215, 685, 2288, -215, 688, 701, 702, 797,
- 1593, 510, 695, 696, 697, 698, 699, 798, 704, -216,
- -630, 705, -993, -215, 1115, 708, 710, 713, 503, -215,
- 720, 1139, 695, 696, 697, 698, 699, -216, 722, 648,
- 799, 800, 801, 802, 726, 740, 1954, 737, 803, 804,
- 747, -216, -215, 751, 546, 752, 198, 755, 762, 2289,
- 774, 775, 648, 2011, 2025, 1969, 776, 778, 777, 861,
- -215, 1999, 780, 781, 814, 782, 2029, 1390, 840, 485,
- 844, 1737, 787, 788, -215, 695, 696, 697, 698, 699,
- 2037, 855, 648, 2040, 862, 207, 805, 806, 807, 808,
- 871, 880, 470, 882, 789, 418, 883, 510, 2400, 790,
- 1139, 897, 210, 791, 1140, 1141, 1142, 1143, 900, 1144,
- 1145, 1146, 903, 792, 1147, 1658, 912, 913, 923, 793,
- 551, 551, 930, 918, 794, 2069, 935, 292, 932, 936,
- 212, 810, 811, 695, 696, 697, 698, 699, 937, 1297,
- 795, 648, 938, 943, 945, 946, 952, 589, 796, 648,
- 947, 953, 214, 965, 976, 998, 1104, 1105, 797, 695,
- 696, 697, 698, 699, 2432, 1000, 798, 215, 1007, 1004,
- 1106, 1006, 1028, 2101, 1432, 1030, 1029, 1031, 2104, 1032,
- 469, 2107, 1034, 1033, 1035, 1036, 1037, 1039, 510, 799,
- 800, 801, 802, 1041, 1040, 1047, 1019, 803, 804, 1043,
- 1056, 216, 1454, 297, 1454, 2132, 1107, 1454, 1044, 289,
- 198, 295, 1072, 1078, 1108, 2207, 1079, 1080, 1109, 217,
- 1081, 886, 1082, 1153, 1154, 1155, 1156, 1157, 1158, 1159,
- 1094, -217, 1160, 2136, -217, 1083, 2012, 1084, 1085, 1086,
- 1090, 1091, 1161, 1092, 1096, 805, 806, 807, 808, 2316,
- 551, 551, -217, 219, 648, 220, 1118, 221, -217, -619,
- 1127, 1130, 1133, 1164, 510, 1166, 1128, 223, 224, 1152,
- 225, 226, 1151, 382, 1131, 1168, 1173, 1193, 1194, 809,
- 1197, -217, 1195, 1153, 1154, 1155, 1156, 1157, 1158, 1159,
- 810, 811, 1160, 1199, 1198, 1203, 1205, 1206, 648, -217,
- 1214, 1217, 1161, 1215, 1225, 1227, 1231, 1233, 1240, 1248,
- 1258, 1260, 1264, -217, 1267, 1292, 2200, 2201, 1299, 1051,
- 1262, 1294, 1314, 1317, 2316, 1301, 1315, 1291, 1316, 1318,
- 1319, 1322, 1323, 1019, 2217, 2316, 2011, 2230, 2227, 1336,
- 1335, 2220, 1340, 510, 1341, 2315, 1342, 1343, 1344, 1345,
- 1346, 2236, 662, 663, 664, 665, 666, 667, 668, 669,
- 670, 671, 672, 673, 674, 1347, 164, 1348, 1349, 1350,
- 1351, 1366, 1390, 1393, 1374, 648, 1396, 1376, 1377, 1397,
- 1392, 1398, 382, 1401, 1413, 1403, 1415, 1427, 1406, 1404,
- 1407, 1412, 1436, 1416, 1434, 2316, 2316, 1417, 1443, 1445,
- 482, 2207, 1446, 1418, 1449, 1474, 1463, 955, 1478, 1458,
- 2012, 1464, 1479, 1480, 1490, 2012, 1482, 1483, 1485, 2012,
- 2315, 1432, 1494, 1493, 516, 1500, 1501, 1502, 1507, 1508,
- 1509, 2315, 1512, 1518, 297, 1330, 1533, 1535, 1536, 2301,
- 2302, 2303, 295, 1543, 1574, 1538, 1579, 382, 537, 538,
- 1102, 1540, 382, 1550, 1553, 886, 382, 382, 1554, 1557,
- 1560, 1561, 1562, 1563, 1332, 1564, 552, 1565, 382, 1568,
- 562, -620, 1590, 1582, 1583, 1588, 1595, 1600, 1601, 1602,
- 1603, 1620, 1626, 1617, 1622, 1623, 1624, 1627, 572, 1649,
- 1651, 2315, 2315, 582, 1654, 1645, 1652, 1661, 1664, 1663,
- 1665, 1670, 1674, 1676, 1677, 1678, 2349, 2350, 1682, 1683,
- 2011, 2372, 2366, 2367, 1697, 2011, 2230, 2227, 1684, 2011,
- 2025, 934, 1691, 1698, 1699, 1701, 2012, 1704, 382, 382,
- 1700, 1711, 1719, 1724, 1712, 1713, 1715, 1714, 886, 1716,
- 1717, 1725, 1730, 1735, 1736, 1743, 1745, 1731, 1732, 1749,
- 1753, 1766, 1775, 1767, 1779, 1780, 2398, 2399, 648, 1784,
- 1785, 1451, 1791, 382, 2012, 1792, 1798, 1802, 297, 1799,
- 1800, 1804, 1801, 1806, 1811, 1807, 295, 1813, 1812, 1815,
- 1829, 1836, 1848, 1849, 1864, 1868, 1816, 1870, 1866, 1880,
- 679, 680, 1867, 1877, 1881, 582, 1883, 1884, 1885, 1886,
- 1889, 382, 1879, 1890, 1891, 1892, 1897, 1898, 1902, 1903,
- 1910, 1909, 1918, 709, 1919, 1922, 1923, 1924, 1929, 1928,
- 1931, 1937, 1944, 1945, 648, 198, 2011, 2444, 2441, 1955,
- 1956, 1963, 552, 1960, 1964, 1966, 2027, 2034, 2032, 2055,
- 562, 562, 562, 744, 562, 562, 2033, 748, 2056, 562,
- 2036, 2057, 2058, 2063, 2076, 2065, 2064, 2072, 2066, 2077,
- 2078, 1748, 1634, 2081, 2011, 2444, 2441, 2091, 2092, 2096,
- 2080, 2097, 2093, 2087, 2098, 2099, 2100, 2105, 2110, 2118,
- 783, 786, 2125, 2119, 2133, 816, 2137, 2138, 240, 2142,
- 562, 838, 839, 2144, 1658, 582, 2145, 2160, 2146, 2164,
- 2147, 854, 2167, 2148, 2168, 2149, 2171, 552, 2170, 2175,
- 2181, 2182, 2196, 2184, 2210, 2212, 2185, 2172, 2215, 2173,
- 2174, 2216, 2176, 2177, -1211, 2218, 1907, 2179, 2219, 2231,
- 2253, 2188, 2261, 2221, 2266, 2240, 2194, 2198, 916, 917,
- 2203, 2237, 2262, 2249, 2271, 2250, 2269, 2270, 2272, 2282,
- 2283, 2285, 2295, 2292, 2293, 2298, 2326, 2321, 2327, 2328,
- 2329, 2330, 2331, 2335, 2332, 2334, 2333, 2338, 2339, 2342,
- 2353, 2341, 2355, 2374, 2383, 2390, 2340, 2392, 2393, 2348,
- 2391, 2382, 2394, 2395, -615, 2401, 2402, 2404, 2406, 2409,
- 2416, 2407, 2422, 958, 2417, 2425, 482, 2424, 2426, 2428,
- 2427, 2430, 2431, 2445, 2448, 2449, 344, 1411, 2193, 2165,
- 982, 983, 984, 985, 986, 2452, 2084, 988, 2277, 991,
- 552, 433, 345, 2197, 315, 1394, 1025, 1733, 157, 158,
- 159, 1218, 160, 2152, 1456, 2420, 1702, 2455, 655, 161,
- 162, 951, 954, 1286, 163, 2419, 960, 2083, 1468, 1489,
- 1619, 1739, 1858, 692, 2205, 2287, 2054, 407, 383, 981,
- 1068, 959, 1388, 1069, 1189, 1113, 2397, 1046, 1201, 2073,
- 1596, 836, 2389, 2379, 2365, 2368, 2369, 2370, 2377, 2371,
- 2351, 2458, 2202, 2433, 2354, 1962, 2214, 1400, 1063, 1656,
- 1065, 1789, 1067, 552, 239, 1706, 2163, 1073, 2162, 1075,
- 1076, 1723, 852, 1668, 1210, 2265, 2199, 1448, 1814, 1430,
- 2108, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 552,
- 0, 0, 0, 0, 1100, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1110, 1111, 0, 0,
- 1, 0, 0, 0, 0, 552, 0, 0, 0, 0,
- 0, 562, 0, 0, 0, 0, 0, 0, 0, 0,
- 1126, 4, 5, 197, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 66, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 849,
- 0, 1229, 1230, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1263, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1288,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 552, 0, 0, 0, 0, 0, 1313,
- 0, 0, 0, 0, 0, 0, 1320, 1321, 0, 0,
- 0, 0, 1327, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1337,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1352,
- 0, 0, 0, 1100, 0, 0, 0, 0, 1356, 93,
- 1364, 1365, 0, 0, 1370, 0, 0, 0, 0, 0,
- 0, 1373, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 552, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 541, 0, 0, 0,
- 0, 0, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 850, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1476, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 552, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1506, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 173, 189, 178, 179, 404, 509, 590, 402, 126, 891,
+ 199, 293, 487, 720, 980, 1199, 165, 965, 947, 966,
+ 1307, 592, 1309, 1429, 652, 1700, 1392, 384, 1417, 1456,
+ 164, 823, 911, 423, 1769, 619, 737, 1006, 2029, 426,
+ 427, 1215, 1551, 922, 463, 464, 630, 1962, 1698, 437,
+ 1824, 974, 1390, 1100, 816, 767, 818, 772, 2020, 1440,
+ 1477, 1899, 1479, 1897, -1219, 312, 1782, 867, 1707, -1218,
+ 330, 1792, 1807, 719, 680, -1220, 1981, 1298, -1221, 1016,
+ 1738, 1877, 299, 268, 562, 867, 773, 850, 290, 199,
+ 297, -218, 1247, 1250, 2439, 951, 2437, 851, 297, 268,
+ -992, 993, 329, 297, -992, 552, 331, 590, 970, 514,
+ 526, 861, 298, 567, 969, -992, 1943, 691, 768, 594,
+ 768, 1609, -1094, 2146, 303, 1104, 1105, 610, 1024, 548,
+ 1026, 1610, 551, 716, 774, -1094, 500, -1094, -1094, 2046,
+ 470, 414, 318, 2054, 758, -505, -505, -505, 879, 660,
+ 164, 697, 698, 699, 700, 701, 417, 356, 1722, 399,
+ 1004, 868, 1393, 1881, 200, 422, 1611, 2228, 631, 1445,
+ 1177, 439, 1178, 536, 1612, 1711, 899, 1454, 942, 868,
+ 958, 2383, 581, 1613, 1746, 441, 1463, 1521, 445, 1930,
+ 2153, 448, 2389, 1472, -630, -1095, 2154, 241, 1393, -1096,
+ -631, 501, 1614, 401, 415, 586, 1104, 1105, 590, 474,
+ 1104, 1105, 407, 882, 407, 638, 410, 1104, 1105, 1104,
+ 1105, 268, 2055, 995, 1104, 1105, 1104, 1105, 420, 608,
+ 268, 420, 473, 1780, 1863, 487, 425, 420, 420, 622,
+ 923, 199, 199, 199, 242, 2047, 1931, 420, 869, 199,
+ 268, 442, 2421, 268, 446, 199, 268, 199, 199, 199,
+ 199, 1455, 199, 199, 199, 199, 869, 201, 2257, 1057,
+ 1090, 1091, 2237, 639, 357, 762, 1061, 1098, 1393, 1102,
+ 1064, 1104, 1105, 472, 567, 567, 567, 199, 567, 567,
+ 537, 567, 880, 567, 502, -992, 498, 1073, 1058, 199,
+ 506, 1683, 349, 764, 350, 1062, 771, 689, 775, 1065,
+ 549, 590, 860, 549, 513, 549, 199, 471, -487, -487,
+ -487, 859, 2056, 697, 698, 699, 700, 701, 934, 1944,
+ 1005, 471, 768, 1096, 840, 1457, 1216, 587, 2385, 768,
+ 2229, 1002, 1370, 768, -505, 512, 2228, 471, 571, 959,
+ 518, 1864, 1905, 776, 2105, 471, 546, 1519, 589, 1120,
+ 1290, 554, 561, 564, 589, 858, 207, 298, 589, 1250,
+ 1299, 1541, 1092, 2302, 870, 306, 1241, 2251, 202, 589,
+ 243, 297, 1839, 635, 2077, 589, 2082, 513, -651, 1615,
+ 1356, 588, 1876, 856, 611, 432, 433, 434, 657, 2440,
+ 2441, -651, 2438, -651, 588, 878, 588, 348, 689, 447,
+ 487, 449, 450, 451, 452, 1128, 456, 457, 458, 459,
+ 199, 2044, 2045, 1106, 1877, 245, 1616, 420, 1729, 1659,
+ 992, -1219, 2238, 990, 1794, 681, -1218, 420, 199, 690,
+ 708, 655, -1220, 2216, 628, -1221, 561, 1831, 268, 1024,
+ 1026, 762, 306, 503, 199, 741, 952, 2413, -218, 294,
+ 735, -1227, 199, 1195, 1127, -1227, 294, 1264, 1591, 651,
+ 516, 1685, 1841, 442, 297, 1797, 199, 275, 268, 268,
+ 1237, 1785, 2089, 726, 2325, 294, 2266, 1844, 687, 2326,
+ 294, 2408, 702, 1056, 2376, 2347, 1786, 337, 739, 294,
+ 1411, 351, 1223, 2029, 1069, 268, 709, 1858, 307, 366,
+ 367, 1598, 714, 246, 2367, 2417, 651, -487, 722, 2229,
+ 1778, 659, 2193, 2020, 2194, 268, 294, 2348, 554, 1063,
+ 442, 297, 2198, 199, 268, 1842, 1732, 1060, 1812, 2133,
+ 690, 2134, 1025, 308, 2137, 1242, 704, 1311, 247, 1412,
+ 867, 199, 248, 761, 249, 1027, -1053, -1053, 1102, 589,
+ 1975, 1357, 1358, 702, 582, 203, 1832, 280, 1336, 287,
+ 719, 782, 727, 319, 604, 99, 1772, 742, 928, 1775,
+ 2414, 2454, 99, 762, 1238, 307, 1455, 1386, 1306, 899,
+ 2267, 899, 623, 1573, 1813, 891, 854, 1337, 1575, 561,
+ 2287, 99, 1375, 554, 863, 1123, 99, 1962, 643, 877,
+ 513, 1488, 844, 846, 199, 99, 646, 888, 79, 651,
+ 543, 1787, 1334, 428, 697, 698, 699, 700, 701, 205,
+ 2443, 768, 199, 199, 893, 1956, 429, 288, 1203, 1961,
+ 889, 120, 99, 268, 868, 930, 1387, 689, 120, 199,
+ 2191, 996, 2317, 1124, 1125, 199, 1427, 593, 268, 1844,
+ 697, 698, 699, 700, 701, 2031, 320, 766, 2443, 945,
+ 1773, 281, 2129, 1776, 1929, 1135, 300, 1142, 1030, 2112,
+ 2123, 120, 203, 302, 1523, 1524, 1525, 1526, 697, 698,
+ 699, 700, 701, 1527, 1443, 1528, 282, 1389, 1481, 199,
+ 1832, 638, 1194, 2062, 983, 760, 1371, 2192, 120, 1548,
+ 1529, 561, 1976, 1977, 1978, 554, 268, 2390, 2391, 2277,
+ 697, 698, 699, 700, 701, 304, 1693, 2317, 1231, 1008,
+ 1549, 869, 453, 1012, 99, 1952, 1405, 199, 2317, 1056,
+ 420, 2124, 309, 268, 2063, 454, 205, 1360, 899, 305,
+ 1530, 697, 698, 699, 700, 701, 243, 1774, 1444, 639,
+ 1777, 654, 199, 697, 698, 699, 700, 701, 884, 1372,
+ 2053, 1055, 1244, 1245, -1227, 2399, 1825, 763, 283, 690,
+ 2088, 1503, 2278, 1361, 1332, 1067, 917, 918, 554, 554,
+ 1953, 1074, 244, 2064, 2364, 1362, 164, 310, 2317, 2317,
+ 766, 245, 2381, 931, 697, 698, 699, 700, 701, 932,
+ 1531, 2130, 203, 1675, 1439, -958, 1700, 2450, 738, -630,
+ 697, 698, 699, 700, 701, 554, 204, 2259, 1107, 1108,
+ 1139, 697, 698, 699, 700, 701, 359, 360, 361, 362,
+ 363, 364, 1109, 1912, 366, 367, 332, 2459, 2460, 730,
+ 368, 554, 1657, 977, 1841, -630, -613, 1056, 513, 513,
+ 2120, 1126, 2260, 1443, 2041, 697, 698, 699, 700, 701,
+ 1132, 333, 1625, 420, 1470, 1122, 205, 334, 1110, 209,
+ 1013, 472, 513, 2125, 1153, 1041, 1111, 1920, 1921, 246,
+ 1112, 1021, 335, 199, 199, 1175, 2126, 2127, 1532, 336,
+ 1180, 199, 209, 1013, 339, 1017, 1051, 513, 651, 965,
+ 203, 966, 209, 1013, 354, 1940, 1048, 1842, 1014, 340,
+ 848, 849, 1205, 1724, 247, 964, 689, 2114, 248, 199,
+ 249, 2041, 856, 1916, 214, 1917, 2164, 1219, 731, 732,
+ -957, 733, 1142, 1222, -631, 651, 268, 268, 268, 268,
+ 358, 2115, 1229, 2116, 1533, 1699, -1227, 214, 1725, 1054,
+ 1844, 697, 698, 699, 700, 701, 1726, 214, 1455, 1980,
+ 250, 1622, -1227, 251, 205, 1333, -1156, 513, 513, 199,
+ 199, 1077, 1629, 209, 1013, 506, 1017, 353, 1249, 1224,
+ 1225, 1226, 1227, 355, 1424, 1052, 732, 2117, 1053, 702,
+ 907, 371, 164, 412, 1632, 252, 697, 698, 699, 700,
+ 701, 1239, 1240, 651, 1918, 2225, 1919, 1292, 1671, 1293,
+ 366, 367, 1296, 908, 1119, 1518, 1300, 1520, 372, 936,
+ 937, 651, 651, 253, 651, 1310, 413, -1227, 214, 554,
+ 1381, 268, 268, 268, 268, 2300, 418, 1173, 1174, 254,
+ 697, 698, 699, 700, 701, 1181, 419, 909, 690, 255,
+ 256, 1875, 561, 1552, 424, 1543, 2247, 651, 2248, 1633,
+ 697, 698, 699, 700, 701, 430, 702, 965, 702, 966,
+ 736, 436, 480, 1214, 1312, 1313, 1314, 1315, 444, 1634,
+ 1335, 848, 849, 697, 698, 699, 700, 701, 209, 1013,
+ 1635, 1017, 438, 1142, 1731, 899, 276, -1227, 460, 481,
+ 1752, 1332, 697, 698, 699, 700, 701, 2365, 697, 698,
+ 699, 700, 701, 2246, 206, 1577, 465, 239, 2360, 257,
+ 461, 846, 1636, 977, 977, 1384, 466, 1018, 554, 1637,
+ -1227, 1388, 651, 1911, 1638, 1117, 785, 513, 697, 698,
+ 699, 700, 701, 214, 1661, 467, 2255, 1639, 277, 278,
+ 2307, 468, 1398, 2308, 1640, 1829, 697, 698, 699, 700,
+ 701, 697, 698, 699, 700, 701, 469, 410, 997, 651,
+ 476, 998, 999, 573, 1408, 497, 834, 838, 499, 1798,
+ 1115, 651, 1671, 1671, 697, 698, 699, 700, 701, 513,
+ 697, 698, 699, 700, 701, 211, 508, 1620, 199, 1436,
+ 510, 697, 698, 699, 700, 701, 574, 1137, 1138, 835,
+ 1500, 756, 1501, 1502, 511, 1458, 889, 2048, 1461, 697,
+ 698, 699, 700, 701, 698, 699, 700, 701, 1469, 697,
+ 698, 699, 700, 701, 1641, 697, 698, 699, 700, 701,
+ 697, 698, 699, 700, 701, 215, 199, 1182, 1183, 199,
+ 615, 616, 617, 1939, 1485, 2281, 757, 2282, 651, 1642,
+ 216, 1104, 1105, 554, 1643, 2283, 259, 2284, 164, -939,
+ -939, 1644, 2106, 311, 1509, 697, 698, 699, 700, 701,
+ -939, 700, 701, 1759, 1760, 1761, 1762, -939, 1763, 260,
+ 1987, 71, 1517, 561, 217, 561, 515, 1764, 513, 517,
+ 1080, 1988, 1271, -939, 1268, 1269, 1750, 1751, 1989, 262,
+ 2038, 1552, 218, 520, 263, -939, 1378, 785, 1742, 1465,
+ 1327, 1466, 521, 264, 77, -939, 1426, 937, -939, 1475,
+ 1476, 561, 1514, 1515, 1553, 937, 1992, -939, 1601, 1602,
+ 1272, 1559, 1560, 1341, 1562, 1563, 78, 522, 221, 1993,
+ 1593, 937, 1435, 697, 698, 699, 700, 701, 1995, 523,
+ 224, 225, 1342, 527, 227, 1651, 1652, 1211, 1473, 524,
+ 1947, 1676, 1515, 891, 1713, 1714, 528, 487, 834, 1589,
+ 525, 1590, 1745, 785, 1826, 1827, 856, 1579, 529, 1765,
+ 1766, 530, 1455, 1968, 1801, 937, 1273, 539, 1474, 1274,
+ 977, 531, 513, 977, 651, 651, 1859, 1860, 1835, 1836,
+ 532, 835, 2070, 2071, 1694, 1275, 1545, 651, 1184, 1837,
+ 1838, 1546, 533, 899, 1891, 1892, 359, 360, 361, 362,
+ 363, 364, 697, 698, 699, 700, 701, 1904, 785, 1185,
+ 368, 534, 199, 1022, 1556, 1186, 535, 1648, 1767, 538,
+ 1570, 651, 1924, 1925, 1936, 937, 1276, 542, 1277, 242,
+ 1677, 1585, 1278, 1937, 1838, 553, 1679, 1851, 1187, 1938,
+ 1838, 568, 1908, 1910, 2033, 2034, 341, 569, -216, 1684,
+ 2078, -216, -618, 342, 1690, 570, 1188, 343, 589, 1900,
+ 899, 572, 199, 578, 1580, 2442, 597, 75, 579, -216,
+ 1279, 1022, 580, 1280, 591, -216, 2050, 2051, -939, -939,
+ 2097, 2098, 2159, 2160, 1458, 964, 1281, 1282, 2235, -623,
+ 1283, -624, 1284, -621, -604, 790, 791, -629, -216, 2001,
+ 2161, 1547, 344, 2162, 1547, 595, -215, 651, 651, -215,
+ 599, 2156, 2157, 2183, 937, 602, -216, 792, 2190, 2160,
+ 2254, 937, 793, -621, 1285, -616, 794, -215, 2261, 2262,
+ -216, 2236, 605, -215, 2293, 2294, 795, 2320, 2321, 1374,
+ 2327, 2328, 796, 2339, 2340, 345, 88, 797, -647, -647,
+ 1142, 199, 2349, 2350, 561, 561, -215, 2244, 2245, 1755,
+ 606, 371, 2158, 798, 2387, 2388, 1662, -625, 1252, 1253,
+ 1254, 799, 1255, 1256, -215, 1300, -626, 891, 91, 2432,
+ 937, 800, 697, 698, 699, 700, 701, -627, -215, 801,
+ 2453, 937, 2456, 2457, 651, 651, 651, 1799, 1800, 208,
+ -628, 2073, 2242, 1491, 1492, -617, 199, -631, 2186, -632,
+ -622, 199, 802, 803, 804, 805, 211, 596, 601, 607,
+ 806, 807, 609, 1823, 1436, 697, 698, 699, 700, 701,
+ 1830, 613, 384, 620, 621, 624, 625, 697, 698, 699,
+ 700, 701, 513, 626, 213, 1022, 1142, 627, 1854, 632,
+ 636, 2052, 641, 637, 561, 561, 1690, 1861, 644, 199,
+ 891, 1867, 645, 647, 2138, 648, 215, 650, 808, 809,
+ 810, 811, 1143, 1144, 1145, 1146, 856, 1147, 1148, 1149,
+ -217, 216, 1150, -217, 656, 899, 662, 1143, 1144, 1145,
+ 1146, 2384, 1147, 1148, 1149, 661, 684, 1150, 663, 688,
+ 691, -217, 812, 703, 704, 1748, 706, -217, -630, 707,
+ -993, 710, 2355, 813, 814, 217, 712, 2291, 715, 505,
+ 561, 1909, 1596, 723, 2378, 697, 698, 699, 700, 701,
+ -217, 725, 729, 218, 740, 743, 1142, 750, 754, 1107,
+ 1108, 755, 697, 698, 699, 700, 701, 758, -217, 549,
+ 765, 1597, 777, 1109, 778, 513, 779, 783, 781, 780,
+ 1809, 785, -217, 784, 2015, 1814, 817, 220, 843, 221,
+ 864, 222, 2292, 847, 697, 698, 699, 700, 701, 858,
+ 865, 224, 225, 651, 226, 227, 874, 883, 886, 1110,
+ 1958, 885, 900, 903, 906, 2049, 921, 1111, 915, 926,
+ 199, 1112, 916, 935, 933, 938, 651, 2014, 2028, 1972,
+ 939, 940, 1142, 977, 792, 2002, 946, 948, 1393, 793,
+ 2032, 1045, 941, 794, 487, 949, 1156, 1157, 1158, 1159,
+ 1160, 1161, 1162, 795, 2040, 1163, 651, 2043, 1155, 796,
+ 950, 955, 956, 979, 797, 1164, 472, 968, 1001, 420,
+ 1003, 513, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1009,
+ 798, 1163, 1007, 1010, 1031, 1033, 2403, 1034, 799, 1032,
+ 1035, 1164, 1118, 1036, 554, 554, 471, 1037, 800, 2072,
+ 697, 698, 699, 700, 701, 293, 801, 1038, 1039, 1040,
+ 1042, 1142, 1043, 1300, 1044, 651, 1050, 744, 745, 746,
+ 592, 748, 749, 651, 752, 1046, 753, 1047, 1059, 802,
+ 803, 804, 805, 1075, 384, 1081, 1082, 806, 807, 1084,
+ 697, 698, 699, 700, 701, 1083, 1085, 2104, 1436, 1548,
+ 1086, 2107, 2435, 1087, 2110, 1121, 1088, 1089, 1252, 1253,
+ 1254, 513, 1255, 1256, 1257, 1093, -524, 1094, 1095, -619,
+ 1549, 1097, 1099, 1130, 1662, 1458, 299, 1458, 2135, 1131,
+ 1458, 1134, 290, 199, 297, 808, 809, 810, 811, 1136,
+ 1167, 1576, 1133, 1196, 889, 697, 698, 699, 700, 701,
+ 697, 698, 699, 700, 701, 1169, 2139, 665, 666, 667,
+ 668, 669, 670, 671, 672, 673, 674, 675, 676, 677,
+ 2319, 1200, 1154, 554, 554, 1171, 1176, 651, 1741, 1197,
+ 813, 814, 697, 698, 699, 700, 701, 513, 1201, 1198,
+ 1202, 1208, 1209, 384, 1206, 2210, 1143, 1144, 1145, 1146,
+ 1220, 1147, 1148, 1149, 1252, 1253, 1254, 1218, 1255, 1256,
+ 1257, 1217, 1228, 1230, 1234, 1243, 2015, 1236, 1251, 1261,
+ 1263, 651, 1265, 1054, 1267, 1295, 1270, 1294, 1297, 1302,
+ 1304, 1317, 1320, 1318, 1022, 1339, 1319, 1321, 1322, 2203,
+ 2204, 1338, 1325, 1326, 1343, 2319, 1344, 1345, 1346, 1347,
+ 1348, 1349, 1350, 1351, 1352, 1353, 2319, 2220, 384, 2014,
+ 2233, 2230, 1354, 384, 2223, 1369, 513, 384, 384, 1393,
+ 1396, 1377, 1379, 1395, 2239, 1380, 1399, 1400, 1401, 384,
+ 1404, 1406, 1409, 1416, 1407, 1418, 1415, 1419, 1420, 164,
+ 1431, 1440, 1421, 1410, 1438, 1447, 1449, 1450, 651, 1453,
+ 1462, 1467, 958, 1468, 1478, 1482, 1483, 1484, 1486, 1487,
+ 1489, 1494, 1497, 1498, 1504, 1505, 2319, 2319, 1506, 1511,
+ 1512, 1513, 1516, 1333, 1522, 2318, 1539, 1540, 1537, 1542,
+ 1544, 1105, 1547, 1578, 1554, 1583, 1557, 1558, 1561, 384,
+ 384, 1564, 1565, 1566, 1436, 1567, 1568, 1569, 1594, 1604,
+ -620, 1605, 1606, 1624, 1630, 1631, 1572, 299, 1649, 1658,
+ 1586, 1607, 2304, 2305, 2306, 297, 1587, 1592, 1599, 1621,
+ 1626, 1627, 1653, 1665, 384, 1628, 1667, 1655, 889, 1656,
+ 1669, 2210, 1674, 1668, 1678, 1680, 1681, 1335, 1682, 937,
+ 2015, 1686, 1688, 1687, 1708, 2015, 1695, 1701, 1703, 2015,
+ 2318, 1702, 1715, 484, 1716, 1717, 1718, 1719, 1705, 1721,
+ 1720, 2318, 384, 1728, 1729, 1704, 1734, 1735, 1736, 1739,
+ 1723, 1740, 1747, 1753, 1749, 1757, 1770, 1779, 519, 2352,
+ 2353, 1771, 1783, 2014, 2375, 2369, 2370, 1784, 2014, 2233,
+ 2230, 1788, 2014, 2028, 1789, 1455, 1795, 1796, 1802, 1803,
+ 1805, 1804, 540, 541, 1806, 1808, 1810, 1811, 1815, 1816,
+ 1817, 889, 1819, 1820, 1833, 1840, 1868, 1853, 1852, 1874,
+ 555, 2318, 2318, 1870, 565, 1871, 1872, 1881, 1884, 2401,
+ 2402, 651, 1883, 1885, 1887, 1888, 1889, 1890, 1893, 1894,
+ 1895, 299, 575, 1896, 1901, 1902, 1906, 585, 1907, 297,
+ 1913, 1914, 1922, 1923, 1926, 1927, 2015, 1928, 1932, 1933,
+ 1935, 1948, 1959, 1966, 1941, 1949, 1963, 1967, 1960, 1969,
+ 2030, 2058, 2035, 2059, 2036, 2060, 2061, 2075, 2037, 2039,
+ 2067, 2066, 2079, 2068, 2069, 2084, 2080, 2081, 1638, 1752,
+ 2094, 2083, 2095, 2090, 2015, 2096, 2099, 651, 199, 2014,
+ 2447, 2444, 2100, 2101, 2102, 2103, 2113, 2121, 241, 2108,
+ 2128, 2122, 2163, 2167, 2140, 2170, 2141, 2136, 2171, 2145,
+ 2147, 2148, 2149, 2150, 2173, 2151, 2152, 2174, 2178, 2175,
+ 2176, 2177, 2184, 2179, 2185, 2180, -1211, 2014, 2447, 2444,
+ 1911, 2187, 2182, 2188, 682, 683, 2199, 2197, 2215, 585,
+ 2201, 2206, 2218, 2213, 2219, 2222, 2221, 2234, 2256, 2191,
+ 2264, 2224, 2269, 2265, 2285, 2275, 2288, 711, 2286, 2296,
+ 2298, 2240, 2243, 2252, 2301, 2253, 484, 2324, 2272, 2273,
+ 2330, 2295, 2329, 2274, 2331, 2332, 2333, 555, 2334, 2335,
+ 2337, 2338, 2336, 2344, 2345, 565, 565, 565, 747, 565,
+ 565, 2341, 751, 2351, 565, 2342, 2356, 2343, 2358, 2386,
+ 2377, 2385, 2393, 2394, 2395, 208, -615, -1156, 2396, 2397,
+ 2398, 2404, 2405, 2407, 209, 210, 2448, 2409, 2410, 2412,
+ 2427, 2428, 211, 2429, 2425, 786, 789, 2419, 2420, 2431,
+ 819, 2430, 2433, 2434, 2451, 565, 841, 842, 2452, 2455,
+ 585, 212, 1662, 346, 2196, 1414, 857, 2168, 2280, 2087,
+ 213, 2200, 555, 435, 347, 317, 157, 1397, 1737, 158,
+ 159, 1221, 160, 2155, 1706, 2423, 658, 1460, 1028, 214,
+ 2458, 161, 215, 954, 162, 163, 957, 2422, 1289, 1430,
+ 2424, 1623, 1862, 919, 920, 963, 2086, 216, 1493, 2208,
+ 2290, 1743, 385, 2057, 984, 1071, 962, 839, 1192, 409,
+ 1204, 2076, 1116, 1391, 2400, 1600, 2392, 2382, 2368, 2380,
+ 2371, 2372, 2373, 2461, 2205, 2374, 2354, 1072, 1965, 2436,
+ 2357, 217, 1660, 1403, 1793, 2217, 240, 1710, 2165, 2166,
+ 1727, 1452, 1672, 1213, 2268, 1818, 2202, 1434, 961, 218,
+ 2111, 484, 0, 0, 0, 855, 0, 0, 0, 0,
+ 0, 0, 0, 0, 985, 986, 987, 988, 989, 219,
+ 0, 991, 0, 994, 555, 0, 0, 0, 0, 0,
+ 0, 0, 0, 220, 0, 221, 0, 222, 0, 223,
+ 0, 0, 0, 0, 0, 0, 0, 224, 225, 0,
+ 226, 227, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 1049, 0, 0, 0, 0, 0, 0, 228,
+ 0, 0, 229, 205, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1066, 0, 1068, 0, 1070, 555, 0,
+ 0, 0, 1076, 0, 1078, 1079, 0, 0, 0, 0,
+ 0, 0, 0, 0, 230, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 555, 0, 0, 0, 0, 1103,
+ 0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1113, 1114, 0, 0, 1, 232, 0, 233, 0,
+ 555, 0, 0, 0, 0, 0, 565, 0, 234, 235,
+ 0, 0, 0, 0, 0, 1129, 4, 5, 198, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
+ 0, 0, 0, 0, 65, 66, 67, 68, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 852, 0, 1232, 1233, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1551, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1266, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1291, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1567, 0, 1570, 0, 0, 0, 0, 0,
- 0, 562, 0, 0, 0, 0, 1578, 0, 0, 0,
- 0, 0, 4, 5, 197, 7, 8, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 0, 0, 0, 0, 0, 0,
- 65, 66, 67, 68, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 555, 0,
+ 0, 0, 0, 0, 1316, 0, 0, 0, 0, 0,
+ 0, 1323, 1324, 0, 0, 0, 0, 1330, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1379, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1327, 0,
+ 0, 0, 0, 0, 1340, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1355, 0, 0, 0, 1103, 0,
+ 0, 0, 0, 1359, 93, 1367, 1368, 0, 0, 1373,
+ 0, 0, 0, 0, 0, 0, 1376, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 555, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 544, 0, 0, 0, 0, 0, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1729, 0, 0, 0, 1327, 0,
+ 0, 0, 0, 853, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 562, 0, 0, 0, 1740, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1480, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1752, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 555, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1510, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 482, 100, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 541, 0, 0,
- 0, 0, 1853, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1555, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 1380,
+ 0, 0, 0, 0, 0, 0, 0, 1571, 1, 1574,
+ 0, 0, 0, 0, 0, 0, 565, 0, 0, 0,
+ 0, 1582, 0, 0, 0, 0, 0, 0, 0, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 0, 0, 0, 0, 0, 0, 65, 66, 67,
+ 68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1382, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1899, 0, 4, 5, 197, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 0, 0, 0, 0,
- 0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1750, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1330, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1327, 1327, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 552, 552, 0,
- 0, 0, 0, 2071, 4, 5, 197, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 0, 0, 0, 0,
- 0, 0, 65, 66, 67, 68, 0, 2128, 2129, 0,
- 0, 0, 93, 0, 0, 0, 0, 0, 0, 0,
- 0, 2139, 2141, 0, 0, 0, 0, 0, 0, 0,
+ 1733, 0, 0, 0, 1330, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1853, 552, 552, 541,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 565,
+ 0, 0, 0, 1744, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 2178, 0, 0,
+ 0, 1756, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1380, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 2206, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 93, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 482, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 484, 0,
+ 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 544, 0, 0, 0, 1857, 0,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 93, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+ 0, 0, 0, 0, 0, 0, 1383, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1903, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 0, 0, 0, 0, 0, 0, 65, 66, 67,
+ 68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1754, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 541,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2311,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1330, 1330, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 542, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2206, 4, 5, 197,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 0, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 1,
- 0, 0, 0, 0, 2413, 65, 66, 67, 68, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2415,
- 4, 5, 197, 7, 8, 9, 10, 11, 12, 13,
+ 0, 0, 0, 555, 555, 0, 0, 0, 0, 2074,
+ 4, 5, 198, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 0, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
63, 64, 0, 0, 0, 0, 0, 0, 65, 66,
- 67, 68, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 849, 0,
- 0, 0, 0, 4, 5, 197, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 0, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 0, 0, 0, 0, 0,
- 0, 65, 66, 67, 68, 93, 0, 0, 0, 0,
+ 67, 68, 2131, 2132, 0, 0, 0, 93, 0, 0,
+ 0, 0, 0, 0, 0, 0, 2142, 2144, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
+ 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1857, 555, 555, 544, 0, 0, 0, 0, 0,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 2181, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1383, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 2209, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 484, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 541, 0, 0, 0, 0, 0, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 93, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 718, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 100, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 100, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 544, 0, 0, 0, 0,
0, 106, 107, 108, 109, 110, 111, 112, 113, 114,
115, 116, 117, 118, 119, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 2314, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 545, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 93, 0, 0, 0, 0, 0, 941, 0, 0,
+ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 2209, 4, 5, 198, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 1, 0, 0, 0, 0, 2416,
+ 65, 66, 67, 68, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 2418, 4, 5, 198, 7, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 0, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 0, 0, 0,
+ 0, 0, 0, 65, 66, 67, 68, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 100, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 541, 0,
- 0, 0, 0, 0, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1380, 4, 5, 197, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 1, 0, 0, 0, 0, 0, 65,
- 66, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 4, 5, 197, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 1, 0, 0, 0,
- 0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 4, 5, 197,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 0, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 0,
- 0, 0, 0, 0, 0, 65, 66, 67, 68, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 93,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 93, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 560, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 93, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 859, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 873, 4, 5, 197, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 0, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 1, 0, 0,
- 0, 0, 0, 65, 66, 67, 68, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 4, 5,
- 197, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 0, 0, 0, 852, 0, 0, 0, 0, 4, 5,
+ 198, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
46, 47, 48, 0, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 1, 0, 0, 0, 0, 0, 65, 66, 67, 68,
+ 0, 0, 0, 0, 0, 0, 65, 66, 67, 68,
+ 93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 4, 5, 197, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 66, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 93, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 100, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 544, 0, 0,
+ 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 93, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 721,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 100, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 106, 107, 108, 109,
110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 93, 0, 0, 0,
+ 0, 0, 944, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 884, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 100,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 106,
+ 0, 0, 0, 544, 0, 0, 0, 0, 0, 106,
107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
117, 118, 119, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 93,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 926, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1008, 4,
- 5, 197, 7, 8, 9, 10, 11, 12, 13, 14,
+ 0, 0, 0, 0, 0, 1383, 4, 5, 198, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 1, 0,
+ 0, 0, 0, 0, 65, 66, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 0, 0, 0, 0, 0, 0, 65, 66, 67,
- 68, 0, 0, 0, 0, 0, 1, 357, 358, 359,
- 360, 361, 362, 0, 363, 364, 365, 0, 0, 0,
- 3, 366, 0, 0, 0, 0, 0, 4, 5, 197,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 0, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 1980, 64, 0,
- 0, 0, 0, 0, 0, 65, 367, 67, 68, 1981,
+ 64, 1, 0, 0, 0, 0, 0, 65, 66, 67,
+ 68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 4, 5, 198, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 0, 0, 0, 0, 0, 0,
+ 65, 66, 67, 68, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 93, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 368, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 93, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1984, 71, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1985, 0, 0, 0, 0, 0, 0, 1986, 0,
- 0, 0, 0, 1987, 1988, 0, 0, 76, 0, 0,
- 0, 0, 0, 0, 77, 0, 0, 0, 0, 0,
- 0, 0, 369, 0, 0, 0, 1989, 93, 0, 0,
- 0, 0, 0, 0, 0, 0, 78, 0, 0, 1990,
- 1991, 0, 0, 0, 0, 0, 0, 0, 1992, 370,
+ 0, 0, 0, 563, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 2358, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 371, 0, 0, 0, 1994, 0,
- 0, 0, 1995, 1451, 0, 1996, 90, 0, 0, 0,
- 0, 0, 0, 0, 0, 2359, 0, 0, 0, 294,
- 0, 0, 0, 0, 0, 93, 1818, 94, 95, 0,
- 0, 372, 373, 0, 0, 96, 97, 0, 0, 0,
- 0, 0, 0, 0, 0, 374, 375, 376, 377, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
+ 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 102, 0, 0, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 0, 0, 0, 0, 0, 0, 0, 0,
+ 93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 862, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 100, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 876,
+ 4, 5, 198, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 0, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 1, 0, 0, 0, 0, 0, 65, 66,
+ 67, 68, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 4, 5, 198, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 0, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 1, 0, 0, 0, 0,
+ 0, 65, 66, 67, 68, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 4, 5, 198, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
+ 0, 0, 0, 0, 65, 66, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 93, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 100, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 93, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 887, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 100, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 93, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 929, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1998,
- 0, 480, 0, 2360, 4, 5, 197, 7, 8, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1011, 4, 5, 198, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
@@ -3626,999 +3578,1009 @@ static const yytype_int16 yytable[] =
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
59, 60, 61, 62, 63, 64, 0, 0, 0, 0,
0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
+ 0, 1, 359, 360, 361, 362, 363, 364, 0, 365,
+ 366, 367, 0, 0, 0, 3, 368, 0, 0, 0,
+ 0, 0, 4, 5, 198, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 1983, 64, 0, 0, 0, 0, 0, 0,
+ 65, 369, 67, 68, 1984, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 370, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1987, 71, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1988, 0, 0, 0,
+ 0, 0, 0, 1989, 0, 0, 0, 0, 1990, 1991,
+ 0, 0, 76, 0, 0, 0, 0, 0, 0, 77,
+ 0, 0, 0, 0, 0, 0, 0, 371, 0, 0,
+ 0, 1992, 93, 0, 0, 0, 0, 0, 0, 0,
+ 0, 78, 0, 0, 1993, 1994, 0, 0, 0, 0,
+ 0, 0, 0, 1995, 372, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 789, 0, 0, 0,
- 0, 790, 0, 0, 0, 791, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 792, 0, 0, 0, 0,
- 0, 793, 0, 0, 0, 0, 794, 0, 0, 0,
+ 0, 0, 2361, 0, 0, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 373,
+ 0, 0, 0, 1997, 0, 0, 0, 1998, 1455, 0,
+ 1999, 90, 0, 0, 0, 0, 0, 0, 0, 0,
+ 2362, 0, 0, 0, 296, 0, 0, 0, 0, 0,
+ 93, 1822, 94, 95, 0, 0, 374, 375, 0, 0,
+ 96, 97, 0, 0, 0, 0, 0, 0, 0, 0,
+ 376, 377, 378, 379, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 100, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 102, 0, 0,
+ 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 795, 0, 0, 0, 0, 0, 0, 0,
- 796, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 797, 0, 0, 0, 0, 0, 0, 0, 798, 0,
+ 0, 0, 0, 0, 2001, 0, 482, 0, 2363, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 0, 0, 0, 0, 0, 0, 65, 66, 67,
+ 68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 792, 0, 0, 0, 0, 793, 0, 0, 0,
+ 794, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 795, 0, 0, 0, 0, 0, 796, 0, 0, 0,
+ 0, 797, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 798, 0, 0,
+ 0, 0, 0, 0, 0, 799, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 800, 0, 0, 0, 0,
+ 0, 0, 0, 801, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 799, 800, 801, 802, 0, 0, 0, 0, 803,
- 804, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 802, 803, 804, 805,
+ 0, 0, 0, 0, 806, 807, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 805, 806, 807,
- 808, 0, 93, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 808, 809, 810, 811, 0, 93, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 810, 811, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 1979, 0, 3, 366, 0, 0, 0, 0,
- 2116, 4, 5, 197, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 1980, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 1981, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1982, 0, 0, 0, 0, 368,
- 1983, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1984, 71, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1985, 0, 0, 0, 0,
- 0, 0, 1986, 0, 0, 0, 0, 1987, 1988, 0,
- 0, 76, 0, 0, 0, 0, 0, 0, 77, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
- 1989, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 78, 0, 0, 1990, 1991, 0, 0, 0, 0, 0,
- 0, 0, 1992, 370, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1993, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 1994, 0, 0, 0, 1995, 0, 0, 1996,
- 90, 0, 0, 0, 0, 0, 0, 0, 0, 1997,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 0, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 1998, 0, 480, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 100, 0, 0, 0, 0, 0, 0, 813, 814, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 1982, 0, 3,
+ 368, 0, 0, 0, 0, 2119, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 817, 0,
- 0, 0, 475, 476, 368, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 818, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 79, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 57, 58, 59, 60, 61, 62, 1983, 64, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 1984, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1985,
+ 0, 0, 0, 0, 370, 1986, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1987,
+ 71, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1988, 0, 0, 0, 0, 0, 0, 1989, 0, 0,
+ 0, 0, 1990, 1991, 0, 0, 76, 0, 0, 0,
+ 0, 0, 0, 77, 0, 0, 0, 0, 0, 0,
+ 0, 371, 0, 0, 0, 1992, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 78, 0, 0, 1993, 1994,
+ 0, 0, 0, 0, 0, 0, 0, 1995, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 579, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1996, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 293, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 479,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
- 0, 0, 0, 0, 99, 0, 0, 100, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 1997, 0, 0,
+ 0, 1998, 0, 0, 1999, 90, 0, 0, 0, 0,
+ 0, 0, 0, 0, 2000, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 0,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 1098, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 2001, 0,
+ 482, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 817, 0, 0, 0, 475, 476, 368,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 820, 0, 0, 0, 477, 478, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 818, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 821, 0, 0, 0, 0, 0, 0, 0, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 79, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 294, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 842, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 99,
+ 0, 582, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 480, 0, 0,
+ 295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 481, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 99,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 0, 0, 1098, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 1101, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 1980, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 1981, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 368, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 820, 0,
+ 0, 0, 477, 478, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1987, 1988, 0, 0, 76, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 821, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1991,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2358, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 845, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 1994, 0, 0,
- 0, 1995, 0, 0, 1996, 90, 0, 0, 0, 0,
- 0, 0, 0, 0, 1997, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 0,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
+ 0, 0, 0, 0, 99, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 480, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 0, 0,
+ 1101, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 475, 476, 368,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 62, 1983, 64, 0, 0, 0, 0, 0, 0, 65,
+ 369, 67, 68, 1984, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1990, 1991, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 79, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1994, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 579, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 99,
+ 0, 2361, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 1997, 0, 0, 0, 1998, 0, 0, 1999,
+ 90, 0, 0, 0, 0, 0, 0, 0, 0, 2000,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 0, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 0,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 0, 0, 580, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 475, 476, 368, 0, 0, 0, 0, 0,
+ 0, 0, 477, 478, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 79, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 842, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 582, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 293, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 479,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
0, 0, 0, 0, 99, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 580, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 0, 0,
+ 583, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 817, 0, 0, 0, 475, 476, 368,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 477, 478, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 921, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 818, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 294, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 0, 845, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 480, 0, 0,
+ 295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 481, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 99,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 0, 0, 819, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 583, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 817, 0,
- 0, 0, 475, 476, 368, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 820, 0,
+ 0, 0, 477, 478, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1285, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 818, 0, 0, 0,
+ 0, 0, 0, 0, 0, 924, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 821, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 293, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 479,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 819, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 0, 0,
+ 822, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 475, 476, 368,
- 0, 0, 1360, 1361, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 820, 0, 0, 0, 477, 478, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1288, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 821, 0, 0, 0, 0, 0, 0, 0, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1362, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 480, 0, 0,
+ 295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 481, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 0,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 979, 0, 0, 480, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 822, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 477, 478, 370, 0, 0, 1363, 1364, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 475, 476, 368, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1692, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1693, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1365, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 293, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 479,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 480, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 982, 0, 0,
+ 482, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 475, 476, 368,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 477, 478, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1696,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1697, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 570, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 571, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 480, 0, 0,
+ 295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 481, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 0,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 0, 0, 480, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 477, 478, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 475, 476, 368, 0, 0, 784, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 785, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 293, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 479,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 573,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 574, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 480, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 0, 0,
+ 482, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 817, 0, 0, 0, 475, 476, 368,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 477, 478, 370,
+ 0, 0, 787, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 788, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 818, 0, 0, 0, 0, 0, 0, 0, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 480, 0, 0,
+ 295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 481, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 0,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2, 0, 0, 3,
- 0, 0, 0, 0, 0, 819, 4, 5, 6, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 66, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 820, 0,
+ 0, 0, 477, 478, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 69,
- 0, 0, 0, 0, 0, 0, 0, 0, 70, 0,
- 71, 0, 0, 72, 0, 0, 0, 0, 0, 0,
- 73, 0, 0, 0, 74, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 75, 0, 76, 0, 0, 0,
- 0, 0, 0, 77, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 78, 0, 0, 79, 80,
- 0, 0, 0, 0, 0, 0, 0, 81, 0, 0,
+ 0, 0, 0, 0, 0, 0, 821, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 82, 83, 84, 85,
- 0, 86, 87, 88, 0, 89, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 90, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 91, 0, 0, 92, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 0,
- 0, 0, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 98, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 99, 0, 0, 100, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 101, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 120, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 2, 0, 0, 3, 0, 0, 0, 0, 0,
+ 822, 4, 5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 475, 476, 368,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 477,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 66, 67, 68, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 69, 0, 0, 0, 0, 0,
+ 0, 0, 0, 70, 0, 71, 0, 0, 72, 0,
+ 0, 0, 0, 0, 0, 73, 0, 0, 0, 74,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 75,
+ 0, 76, 0, 0, 0, 0, 0, 0, 77, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 78, 0, 0, 79, 80, 0, 0, 0, 0, 0,
+ 0, 0, 81, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 82, 83, 84, 85, 0, 86, 87, 88, 0,
+ 89, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 90, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 91, 0, 0, 92, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 0, 0, 0, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 98, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 99,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
+ 0, 0, 0, 101, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 979, 0, 0, 480, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 120, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 475, 476, 368, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 477, 478, 370, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 479, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 293, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 479,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 480, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 982, 0, 0,
+ 482, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 475, 476, 368,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 477, 478, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 480, 0, 0,
+ 295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 481, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 0,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 0, 2140, 480, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 475, 476, 368, 0, 0, 0, 0, 0,
+ 0, 0, 477, 478, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
- 0, 0, 0, 0, 0, 2310, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 293, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 479,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 480, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 0, 2143,
+ 482, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 475, 476, 368,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 477, 478, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
+ 2313, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 479, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 480, 0, 0,
+ 295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 481, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 0,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 0, 0, 480, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 477, 478, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 368, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 2223, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 79, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2224, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 90, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 93, 0, 94, 95, 0, 0,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
- 0, 0, 0, 0, 99, 0, 0, 100, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 480, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 0, 93, 0, 94, 95, 0, 481,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 580, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 0, 0,
+ 482, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 368,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 2223, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 2226, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 294, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 2358, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
+ 0, 2227, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
90, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 0, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 0, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 99,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 0, 0, 480, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 583, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 368, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 2226, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2358, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 2361, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 90, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
0, 0, 0, 0, 93, 0, 94, 95, 0, 0,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 357, 358, 359, 360, 361, 362, 0, 363, 364,
- 365, 0, 0, 0, 3, 366, 0, 0, 0, 0,
- 480, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 0, 0,
+ 482, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 367, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 368,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 369, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 370, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 2361, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 371, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 0, 93,
- 0, 94, 95, 0, 0, 372, 373, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 374,
- 375, 376, 377, 0, 0, 0, 0, 0, 0, 0,
+ 90, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 0, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 0,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 357, 358, 359, 360,
- 361, 362, 0, 363, 364, 365, 0, 0, 0, 3,
- 366, 0, 0, 0, 0, 378, 4, 5, 197, 7,
+ 0, 0, 0, 0, 0, 1, 359, 360, 361, 362,
+ 363, 364, 0, 365, 366, 367, 0, 0, 0, 3,
+ 368, 0, 0, 0, 0, 482, 4, 5, 198, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 367, 67, 68, 0, 0,
+ 0, 0, 0, 0, 65, 369, 67, 68, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 368, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 370, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 369, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 371, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 370, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 371, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 293, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
+ 0, 0, 0, 373, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
0, 0, 0, 0, 93, 0, 94, 95, 0, 0,
- 372, 373, 0, 0, 96, 97, 0, 0, 0, 0,
- 0, 0, 0, 0, 374, 375, 376, 377, 0, 0,
+ 374, 375, 0, 0, 96, 97, 0, 0, 0, 0,
+ 0, 0, 0, 0, 376, 377, 378, 379, 0, 0,
0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 3, 0, 0, 0, 0, 0,
- 480, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 1, 359, 360, 361, 362, 363, 364, 0, 365, 366,
+ 367, 0, 0, 0, 3, 368, 0, 0, 0, 0,
+ 380, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 0, 0, 1, 0, 0, 0, 65,
- 66, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 4, 5, 197, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 76, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 0, 65, 66, 67, 68, 0, 0,
- 0, 0, 0, 79, 0, 0, 0, 0, 0, 0,
+ 62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
+ 369, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 370,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 371, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 293, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 294, 0, 0, 0, 0, 79, 93,
- 0, 94, 95, 0, 0, 0, 0, 0, 0, 96,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 99,
- 0, 0, 100, 0, 0, 0, 335, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
+ 0, 0, 0, 372, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 93, 0, 0, 0, 968, 0,
- 0, 0, 0, 0, 0, 120, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 99, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 373, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 0, 93,
+ 0, 94, 95, 0, 0, 374, 375, 0, 0, 96,
+ 97, 0, 0, 0, 0, 0, 0, 0, 0, 376,
+ 377, 378, 379, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 102, 0, 0, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,
+ 0, 0, 0, 0, 0, 482, 4, 5, 198, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
+ 1, 0, 0, 0, 65, 66, 67, 68, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1245, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 0, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
+ 43, 44, 45, 46, 47, 48, 76, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 1, 0, 0, 0, 0, 0, 65,
- 66, 67, 68, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 4, 5, 197, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 0, 0, 0, 0,
- 0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
- 0, 0, 0, 79, 0, 0, 0, 0, 0, 0,
+ 62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
+ 66, 67, 68, 0, 0, 0, 0, 0, 294, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 579, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 93,
- 0, 0, 0, 968, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 295, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 296, 0,
+ 0, 0, 0, 294, 93, 0, 94, 95, 0, 0,
+ 0, 0, 0, 0, 96, 97, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 99, 0, 0, 100, 0, 0,
+ 0, 337, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 102, 0, 0, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 93,
+ 0, 0, 0, 971, 0, 0, 0, 0, 0, 0,
+ 120, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 99,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 294, 0, 0, 0,
- 0, 0, 93, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 96, 97, 0, 1245, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 309, 4,
- 5, 197, 7, 8, 9, 10, 11, 12, 13, 14,
+ 0, 0, 0, 0, 0, 1248, 4, 5, 198, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 1, 0,
+ 0, 0, 0, 0, 65, 66, 67, 68, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 1, 0, 0, 0, 0, 0, 65, 66, 67,
- 68, 0, 0, 0, 0, 0, 502, 0, 0, 0,
- 0, 0, 4, 5, 197, 7, 8, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 0, 0, 0, 1, 0, 0,
- 65, 66, 67, 68, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 503, 4, 5,
- 197, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 0, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 0, 0, 0, 0, 0, 0, 65, 66, 67, 68,
- 0, 0, 0, 0, 0, 0, 0, 93, 0, 0,
+ 64, 0, 0, 0, 0, 0, 0, 65, 66, 67,
+ 68, 0, 0, 0, 0, 0, 0, 0, 294, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 582, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 93, 0, 0, 0, 968, 0, 0, 0, 0, 0,
- 0, 0, 0, 1257, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 100, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
+ 0, 0, 0, 0, 93, 0, 0, 0, 971, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 93, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 969, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 100,
+ 0, 0, 0, 0, 99, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 296, 0, 0, 0, 0, 0, 93, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 96, 97, 0,
+ 1248, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 311, 4, 5, 198, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 1, 0, 0, 0,
+ 0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
+ 0, 504, 0, 0, 0, 0, 0, 4, 5, 198,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 0, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 0,
+ 0, 0, 1, 0, 0, 65, 66, 67, 68, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1687, 4, 5, 197, 7, 8, 9, 10,
+ 0, 0, 505, 4, 5, 198, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
@@ -4626,31 +4588,34 @@ static const yytype_int16 yytable[] =
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63, 64, 0, 0, 0, 0, 0,
0, 65, 66, 67, 68, 0, 0, 0, 0, 0,
+ 0, 0, 93, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 789, 0, 0, 0, 0,
- 790, 0, 0, 0, 791, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 792, 0, 0, 0, 0, 0,
- 793, 0, 0, 0, 0, 794, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 795, 0, 0, 0, 0, 0, 0, 0, 796,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 797,
- 0, 0, 0, 0, 0, 0, 0, 798, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 799, 800, 801, 802, 0, 0, 0, 0, 803, 804,
+ 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 93, 0, 0, 0, 971,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1260, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 805, 806, 807, 808,
0, 93, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 972, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 100, 0, 0, 0, 0, 0,
- 0, 810, 811, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 4, 5,
- 197, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 112, 113, 114, 115, 116, 117, 118, 119, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1691, 4, 5,
+ 198, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
@@ -4659,337 +4624,263 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 65, 66, 67, 68,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 789, 0, 0, 0, 0, 790, 0, 0, 0, 1186,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 792,
- 0, 0, 0, 0, 0, 793, 0, 0, 0, 0,
- 794, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 795, 0, 0, 0,
- 0, 0, 0, 0, 796, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 797, 0, 0, 0, 0, 0,
- 0, 0, 798, 0, 0, 0, 0, 0, 0, 0,
+ 792, 0, 0, 0, 0, 793, 0, 0, 0, 794,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 795,
+ 0, 0, 0, 0, 0, 796, 0, 0, 0, 0,
+ 797, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 798, 0, 0, 0,
+ 0, 0, 0, 0, 799, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 800, 0, 0, 0, 0, 0,
+ 0, 0, 801, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1187, 800, 801, 1188, 0,
- 0, 0, 0, 803, 804, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 802, 803, 804, 805, 0,
+ 0, 0, 0, 806, 807, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 805, 806, 807, 808, 0, 93, 0, 0, 0,
+ 0, 808, 809, 810, 811, 0, 93, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 100,
- 0, 0, 0, 0, 0, 0, 810, 811, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 106,
+ 0, 0, 0, 0, 0, 0, 813, 814, 0, 0,
+ 0, 0, 1, 0, 0, 0, 0, 0, 0, 106,
107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
- 0, 0, 0, 0, 4, 5, 197, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 0, 0, 0, 0,
- 0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
+ 117, 118, 119, 4, 5, 198, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 0, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 0, 0, 0, 0, 0,
+ 0, 65, 66, 67, 68, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 792, 0, 0, 0, 0,
+ 793, 0, 0, 0, 1189, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 795, 0, 0, 0, 0, 0,
+ 796, 0, 0, 0, 0, 797, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 798, 0, 0, 0, 0, 0, 0, 0, 799,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 800,
+ 0, 0, 0, 0, 0, 0, 0, 801, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 693, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 76, 4, 5, 197, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 0, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 0, 0, 0,
- 0, 0, 0, 65, 66, 67, 68, 0, 0, 0,
- 0, 0, 694, 0, 0, 0, 0, 0, 0, 0,
- 695, 696, 697, 698, 699, 0, 0, 0, 0, 0,
- 0, 0, 0, 293, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 294, 0, 0, 0,
- 0, 0, 93, 0, 94, 95, 0, 0, 0, 0,
- 0, 0, 96, 97, 0, 0, 0, 0, 0, 0,
+ 1190, 803, 804, 1191, 0, 0, 0, 0, 806, 807,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 102,
- 0, 0, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 4,
- 5, 197, 7, 8, 9, 10, 11, 12, 13, 14,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 808, 809, 810, 811,
+ 0, 93, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 100, 0, 0, 0, 0, 0,
+ 0, 813, 814, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 3, 0, 0, 0, 0, 0, 0, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 0, 0, 93, 0, 0, 0, 65, 66, 67,
+ 64, 0, 0, 0, 0, 0, 0, 65, 66, 67,
68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 257, 0, 0, 0, 0, 0, 100, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 258, 0, 0, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 0, 0, 0, 0, 0, 0, 259, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 695, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 76,
+ 4, 5, 198, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 0, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 0, 0, 0, 0, 0, 0, 65, 66,
+ 67, 68, 0, 0, 0, 0, 0, 696, 0, 0,
+ 0, 0, 0, 0, 0, 697, 698, 699, 700, 701,
+ 0, 0, 0, 0, 0, 0, 0, 0, 295, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 296, 0, 0, 0, 0, 0, 93, 0, 94,
+ 95, 0, 0, 0, 0, 0, 0, 96, 97, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 260, 0, 261, 0, 0, 0,
- 0, 262, 0, 1, 0, 0, 0, 0, 0, 0,
- 263, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 264, 4, 5, 197, 7, 8, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1, 102, 0, 0, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 4, 5, 198, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 265, 266, 0, 0,
+ 59, 60, 61, 62, 63, 64, 0, 0, 93, 0,
0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 311, 0, 0, 0, 0,
- 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 258, 0,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
- 0, 259, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 260,
- 0, 261, 0, 0, 0, 0, 262, 0, 1, 0,
- 0, 0, 0, 0, 0, 263, 0, 0, 0, 0,
- 0, 0, 319, 0, 0, 0, 0, 0, 312, 4,
- 5, 197, 7, 8, 9, 10, 11, 12, 13, 14,
+ 0, 0, 0, 0, 0, 258, 0, 0, 0, 0,
+ 0, 100, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 259, 0,
+ 0, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 0, 0, 0, 0, 0,
+ 0, 260, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 261,
+ 0, 262, 0, 0, 0, 0, 263, 0, 1, 0,
+ 0, 0, 0, 0, 0, 264, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 265, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 313, 314, 0, 0, 0, 0, 65, 66, 67,
+ 64, 266, 267, 0, 0, 0, 0, 65, 66, 67,
68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 320, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 313, 0, 0, 0, 0, 100, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 259, 0, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
+ 0, 0, 0, 0, 0, 0, 260, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 321, 0, 0, 4, 5, 197, 7, 8, 9,
+ 0, 0, 0, 0, 261, 0, 262, 0, 0, 0,
+ 0, 263, 0, 1, 0, 0, 0, 0, 0, 0,
+ 264, 0, 0, 0, 0, 0, 0, 321, 0, 0,
+ 0, 0, 0, 314, 4, 5, 198, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 0, 0, 0, 0,
- 0, 322, 65, 66, 67, 68, 0, 93, 0, 0,
- 0, 0, 0, 323, 0, 0, 0, 324, 325, 0,
- 0, 0, 0, 0, 0, 0, 1419, 0, 0, 0,
+ 59, 60, 61, 62, 63, 64, 315, 316, 0, 0,
+ 0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 100, 0, 0, 0, 0, 322, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 326, 0, 0, 0, 0, 0,
106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
- 0, 1087, 1088, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 4, 5, 197,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 93, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 0,
- 0, 0, 0, 0, 0, 65, 66, 67, 68, 0,
- 0, 1420, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 0, 1089, 0, 0, 0, 0, 1, 0,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 4,
- 5, 197, 7, 8, 9, 10, 11, 12, 13, 14,
+ 0, 0, 0, 0, 0, 0, 323, 0, 0, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 0, 0, 0, 0, 0, 0, 65, 66, 67,
- 68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 294,
- 0, 0, 0, 0, 0, 93, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 96, 97, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
- 0, 286, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 0, 0, 0, 0, 0, 0, 0, 0,
+ 64, 0, 0, 0, 0, 0, 324, 65, 66, 67,
+ 68, 0, 93, 0, 0, 0, 0, 0, 325, 0,
+ 0, 0, 326, 327, 0, 0, 0, 0, 0, 0,
+ 0, 1422, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
+ 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 287,
- 0, 0, 0, 0, 0, 0, 0, 93, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 0, 0, 0, 0, 1090, 1091, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 4, 5, 198, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 93, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 0, 0, 0, 0, 0, 0,
+ 65, 66, 67, 68, 0, 0, 1423, 0, 0, 0,
+ 100, 0, 0, 0, 0, 0, 0, 0, 1092, 0,
0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 106, 107, 108, 109, 110, 111, 288, 113, 114, 115,
- 116, 117, 118, 119, 4, 5, 197, 7, 8, 9,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 4, 5, 198, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 1, 0, 0, 0,
+ 59, 60, 61, 62, 63, 64, 0, 0, 0, 0,
0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
- 0, 502, 0, 0, 0, 0, 0, 4, 5, 197,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 0, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 0,
- 0, 0, 0, 0, 0, 65, 66, 67, 68, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 503, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 978, 0, 0,
- 0, 0, 889, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 979, 0, 0, 0, 4, 5, 197,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 93, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 0,
- 0, 890, 0, 0, 0, 65, 66, 67, 68, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 93, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 296, 0, 0, 0, 0, 0,
+ 93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 96, 97, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 100, 0, 0, 287, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 93, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 288, 0, 0, 0, 0, 0,
+ 0, 0, 93, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 0, 0, 0, 0, 0, 0, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 4, 5, 197, 7, 8, 9, 10, 11,
+ 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+ 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
+ 111, 289, 113, 114, 115, 116, 117, 118, 119, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 1, 0, 0, 0, 0, 0, 65, 66, 67,
+ 68, 0, 0, 0, 0, 0, 504, 0, 0, 0,
+ 0, 0, 4, 5, 198, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
61, 62, 63, 64, 0, 0, 0, 0, 0, 0,
- 65, 66, 67, 68, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1584, 0, 0, 0, 0, 4, 5, 197, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 0, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 1, 0, 0,
- 0, 0, 0, 65, 66, 67, 68, 0, 755, 0,
- 0, 0, 1685, 0, 0, 0, 0, 0, 4, 5,
- 197, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 0, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 0, 0, 0, 0, 0, 0, 65, 66, 67, 68,
- 93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 100, 1967, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 541, 0, 0,
- 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 93, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 65, 66, 67, 68, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 505, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 100, 0, 0, 0,
+ 0, 1, 981, 0, 0, 0, 0, 892, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 982, 0,
+ 0, 0, 4, 5, 198, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 93, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 0, 0, 893, 0, 0, 0,
+ 65, 66, 67, 68, 0, 0, 0, 0, 0, 0,
+ 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 0, 0, 0, 0, 0, 1968, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 93, 0, 0, 0,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 100,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1, 0, 0, 0, 0, 0, 0, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 4, 5, 197, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 0, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 1, 0, 0, 0, 0,
- 0, 65, 66, 67, 68, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 4, 5, 197, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 1, 0,
- 0, 0, 0, 0, 65, 66, 67, 68, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
- 5, 197, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 0, 0, 0, 0, 0, 0, 65, 66, 67,
- 68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 93, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 100, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 100, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 290, 0, 438, 0,
- 0, 0, 0, 0, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 429, 0,
- 0, 0, 0, 0, 93, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 93, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 4, 5, 197, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 1, 0, 0, 0,
- 0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 4, 5, 197,
+ 0, 0, 0, 100, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+ 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 4, 5, 198,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
@@ -4998,28 +4889,28 @@ static const yytype_int16 yytable[] =
56, 57, 58, 59, 60, 61, 62, 63, 64, 0,
0, 0, 0, 0, 0, 65, 66, 67, 68, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 368, 0, 0, 0, 0,
- 4, 5, 197, 7, 8, 9, 10, 11, 12, 13,
+ 0, 0, 0, 0, 0, 1588, 0, 0, 0, 0,
+ 4, 5, 198, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 0, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 0, 0, 0, 0, 453, 0, 65, 66,
- 67, 68, 93, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 93, 0, 0, 0, 0,
+ 63, 64, 1, 0, 0, 0, 0, 0, 65, 66,
+ 67, 68, 0, 758, 0, 0, 0, 1689, 0, 0,
+ 0, 0, 0, 4, 5, 198, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 0, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 0, 0, 0, 0, 0,
+ 0, 65, 66, 67, 68, 93, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 100, 1970,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 106, 107,
+ 0, 0, 544, 0, 0, 0, 0, 0, 106, 107,
108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
118, 119, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5028,766 +4919,925 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 100, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 541, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 4, 5, 197, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 0, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 1, 0, 0,
- 0, 0, 0, 65, 66, 67, 68, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 4, 5,
- 197, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 115, 116, 117, 118, 119, 0, 0, 0, 0, 0,
+ 1971, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 93, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 100, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 4, 5,
+ 198, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
46, 47, 48, 0, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 0, 0, 0, 0, 0, 0, 65, 66, 67, 68,
- 260, 0, 0, 0, 0, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1379, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 4, 5, 197, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 1503, 41, 42, 43, 44, 45, 46, 47,
- 48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 0, 93, 65, 66, 67, 68, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 100, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 93, 0, 1504, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 100,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 93, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
+ 1, 0, 0, 0, 0, 0, 65, 66, 67, 68,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 4, 5, 197, 7, 8, 9, 10, 11, 12,
+ 0, 4, 5, 198, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 0, 0, 0, 0, 0, 0, 65,
- 66, 67, 68, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1584,
- 0, 0, 0, 0, 4, 5, 197, 7, 8, 9,
+ 62, 63, 64, 1, 0, 0, 0, 0, 0, 65,
+ 66, 67, 68, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 4, 5, 198, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 0,
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 1, 0, 0, 0,
+ 59, 60, 61, 62, 63, 64, 0, 0, 0, 0,
0, 0, 65, 66, 67, 68, 0, 0, 0, 0,
- 0, 1685, 0, 0, 0, 0, 0, 4, 5, 197,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 0, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 0,
- 0, 0, 0, 0, 0, 65, 66, 67, 68, 93,
+ 0, 0, 0, 0, 0, 0, 93, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 100,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 291, 0, 440, 0, 0, 0, 0, 0, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 431, 0, 0, 0, 0, 0, 93,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1750, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 106, 107, 108, 109, 110, 111, 112, 113,
114, 115, 116, 117, 118, 119, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 93, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 100, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 93, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 0, 0, 0, 0, 0, 0, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 4, 5, 197, 7, 8, 9, 10, 11,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 1, 0, 0, 0, 0, 0, 65, 66, 67,
+ 68, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 4, 5, 198, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 1, 0, 0, 0, 0, 0,
- 65, 66, 67, 68, 0, 0, 0, 0, 0, 1862,
- 0, 0, 0, 0, 0, 4, 5, 197, 7, 8,
+ 61, 62, 63, 64, 0, 0, 0, 0, 0, 0,
+ 65, 66, 67, 68, 1, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 370, 0, 0, 0, 0, 4, 5, 198, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
0, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 1, 0, 0,
- 0, 0, 0, 65, 66, 67, 68, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 4, 5,
- 197, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 0, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 0, 0, 0, 0, 0, 0, 65, 66, 67, 68,
+ 58, 59, 60, 61, 62, 63, 64, 0, 0, 0,
+ 0, 455, 0, 65, 66, 67, 68, 93, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1390, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 100, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
113, 114, 115, 116, 117, 118, 119, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 93, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 100, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 106, 107, 108, 109,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 544, 0, 0, 0, 0, 0, 106, 107, 108, 109,
110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 93, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 100,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1, 0, 0, 0, 0, 0, 0, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 4, 5, 197, 7, 8, 9, 10,
+ 4, 5, 198, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 0, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 1, 0, 0, 0, 0, 0, 65, 66,
+ 67, 68, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 4, 5, 198, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 0, 49,
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63, 64, 0, 0, 0, 0, 0,
- 0, 65, 66, 67, 68, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 65, 66, 67, 68, 261, 0, 0, 0, 0,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1382, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 4, 5, 198, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 1507, 41, 42,
+ 43, 44, 45, 46, 47, 48, 0, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 0, 0, 0, 0, 0, 93, 65,
+ 66, 67, 68, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 100, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 93, 0, 1508, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 100, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 93,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 100, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
+ 0, 0, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 4, 5, 198, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 0, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
+ 0, 0, 0, 0, 65, 66, 67, 68, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1588, 0, 0, 0, 0, 4,
+ 5, 198, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 1, 0, 0, 0, 0, 0, 65, 66, 67,
+ 68, 0, 0, 0, 0, 0, 1689, 0, 0, 0,
+ 0, 0, 4, 5, 198, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 0, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 0, 0, 0, 0, 0, 0,
+ 65, 66, 67, 68, 93, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1754, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 100, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 93, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 100, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 93, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 100, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+ 0, 0, 0, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 4, 5, 198,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 0, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 1,
+ 0, 0, 0, 0, 0, 65, 66, 67, 68, 0,
+ 0, 0, 0, 0, 1866, 0, 0, 0, 0, 0,
+ 4, 5, 198, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 0, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 1, 0, 0, 0, 0, 0, 65, 66,
+ 67, 68, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 4, 5, 198, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 0, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 0, 0, 0, 0, 0,
+ 0, 65, 66, 67, 68, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 93, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 100, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 93, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 100, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 93, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 100, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 106, 107, 108, 109, 110, 111,
- 288, 113, 114, 115, 116, 117, 118, 119
+ 112, 113, 114, 115, 116, 117, 118, 119, 4, 5,
+ 198, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 0, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 0, 0, 0, 0, 0, 0, 65, 66, 67, 68,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 93, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 100,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 106,
+ 107, 108, 109, 110, 111, 289, 113, 114, 115, 116,
+ 117, 118, 119
};
static const yytype_int16 yycheck[] =
{
- 0, 0, 0, 0, 382, 201, 81, 459, 0, 285,
- 2, 607, 201, 692, 0, 684, 661, 222, 1021, 397,
- 1023, 1193, 684, 228, 229, 906, 1136, 571, 1183, 91,
- 0, 1495, 616, 238, 1212, 818, 715, 1328, 262, 263,
- 424, 919, 1825, 627, 1652, 688, 567, 1439, 569, 1133,
- 506, 435, 1843, 3, 1657, 1493, 547, 1593, 549, 3,
- 1234, 7, 1236, 1512, 0, 1725, 547, 0, 549, 304,
- 0, 1704, 0, 549, 348, 1603, 1841, 1013, 4, 2,
- 7, 723, 82, 75, 0, 108, 1550, 1613, 80, 81,
- 82, 517, 968, 969, 102, 1631, 149, 101, 90, 91,
- 149, 201, 94, 95, 4, 483, 98, 186, 102, 103,
- 101, 728, 82, 730, 212, 398, 1843, 108, 101, 90,
- 98, 101, 100, 221, 95, 108, 108, 101, 201, 102,
- 352, 84, 201, 3, 2126, 25, 104, 105, 201, 104,
- 105, 193, 377, 241, 469, 35, 244, 104, 105, 247,
- 120, 172, 608, 62, 149, 104, 105, 92, 172, 200,
- 185, 102, 2310, 7, 27, 240, 592, 355, 7, 164,
- 115, 251, 115, 2321, 274, 62, 142, 4, 504, 240,
- 70, 129, 211, 212, 102, 149, 24, 1297, 78, 102,
- 368, 247, 104, 105, 62, 251, 181, 87, 104, 105,
- 104, 105, 201, 278, 118, 583, 334, 253, 124, 337,
- 338, 203, 417, 205, 436, 207, 106, 601, 185, 204,
- 212, 59, 427, 302, 280, 139, 115, 219, 368, 221,
- 222, 198, 196, 2381, 295, 227, 228, 229, 65, 201,
- 232, 233, 234, 106, 628, 1575, 238, 156, 240, 241,
- 242, 265, 244, 245, 246, 247, 248, 249, 250, 251,
- 208, 253, 254, 255, 256, 231, 182, 111, 289, 156,
- 761, 545, 111, 817, 548, 819, 550, 768, 378, 705,
- 761, 772, 274, 308, 313, 761, 278, 768, 156, 368,
- 370, 772, 768, 163, 289, 287, 772, 370, 290, 291,
- 1474, 370, 109, 110, 111, 112, 113, 590, 686, 232,
- 233, 234, 304, 2305, 306, 378, 24, 370, 370, 297,
- 542, 370, 647, 246, 1107, 248, 249, 250, 251, 370,
- 253, 254, 255, 256, 243, 1213, 920, 525, 526, 527,
- 438, 529, 530, 200, 532, 1881, 534, 320, 1956, 372,
- 303, 296, 778, 296, 346, 308, 243, 1293, 1003, 351,
- 352, 353, 108, 371, 599, 335, 588, 290, 372, 1245,
- 305, 1307, 1014, 186, 368, 243, 1667, 371, 2143, 371,
- 480, 372, 166, 306, 310, 377, 712, 575, 814, 372,
- 372, 466, 372, 1921, 368, 368, 585, 495, 371, 2126,
- 371, 369, 1928, 293, 369, 681, 468, 296, 370, 309,
- 310, 224, 369, 1743, 840, 2048, 514, 480, 410, 24,
- 369, 178, 368, 373, 368, 417, 702, 368, 1866, 1867,
- 371, 367, 1049, 1050, 367, 427, 428, 367, 1616, 367,
- 330, 368, 434, 186, 436, 897, 438, 522, 2108, 157,
- 368, 367, 444, 371, 202, 368, 186, 369, 371, 980,
- 452, 523, 251, 369, 202, 369, 251, 459, 98, 99,
- 100, 463, 464, 2218, 466, 137, 468, 469, 934, 701,
- 580, 224, 369, 186, 192, 242, 478, 410, 238, 302,
- 482, 1669, 166, 464, 224, 185, 718, 771, 107, 775,
- 4, 369, 1527, 495, 496, 428, 1680, 169, 198, 2300,
- 502, 1389, 369, 370, 506, 507, 1600, 580, 2309, 4,
- 89, 444, 514, 106, 729, 517, 310, 519, 520, 452,
- 522, 523, 2135, 1536, 632, 1984, 251, 1986, 760, 195,
- 1989, 109, 110, 111, 112, 113, 1002, 62, 540, 520,
- 542, 301, 157, 204, 1098, 368, 2092, 1101, 1102, 302,
- 552, 4, 124, 172, 1020, 1021, 373, 1023, 560, 1060,
- 12, 13, 302, 2300, 62, 1358, 250, 1602, 2305, 1060,
- 1363, 370, 2309, 368, 1060, 228, 196, 192, 109, 110,
- 111, 112, 113, 585, 1115, 2203, 588, 1193, 1990, 302,
- 592, 593, 1028, 2386, 1056, 1248, 598, 599, 706, 579,
- 580, 603, 847, 848, 606, 2360, 608, 540, 124, 186,
- 182, 138, 186, 369, 370, 368, 372, 106, 850, 621,
- 622, 104, 105, 186, 732, 204, 871, 607, 368, 1817,
- 632, 156, 634, 1821, 161, 301, 638, 109, 110, 111,
- 112, 113, 644, 368, 264, 647, 265, 862, 846, 310,
- 224, 896, 136, 1841, 2300, 368, 658, 297, 156, 1847,
- 371, 372, 2308, 1783, 1965, 258, 259, 260, 195, 1131,
- 603, 187, 40, 41, 42, 43, 136, 91, 121, 2416,
- 169, 49, 368, 51, 1238, 371, 688, 250, 621, 622,
- 196, 1127, 694, 97, 98, 99, 100, 1490, 66, 701,
- 178, 463, 1168, 705, 706, 638, 60, 228, 160, 819,
- 944, 644, 142, 30, 1180, 199, 718, 2454, 243, 162,
- 722, 966, 967, 138, 726, 302, 140, 729, 302, 163,
- 732, 109, 110, 111, 112, 113, 12, 13, 106, 199,
- 109, 110, 111, 112, 113, 243, 819, 106, 107, 751,
- 109, 110, 111, 112, 113, 688, 4, 519, 760, 1879,
- 870, 120, 116, 246, 242, 1653, 250, 251, 211, 1934,
- 87, 115, 774, 251, 1006, 777, 778, 317, 780, 120,
- 195, 215, 216, 763, 109, 110, 111, 112, 113, 2335,
- 250, 368, 368, 726, 368, 373, 140, 156, 166, 1981,
- 1455, 231, 232, 178, 234, 164, 368, 247, 1202, 168,
- 142, 251, 814, 2287, 186, 156, 368, 192, 751, 1051,
- 109, 110, 111, 112, 113, 197, 1262, 168, 4, 5,
- 6, 7, 8, 9, 0, 64, 12, 13, 840, 370,
- 280, 1435, 18, 367, 69, 847, 848, 72, 850, 74,
- 1970, 1864, 109, 110, 111, 112, 113, 859, 1412, 88,
- 862, 90, 842, 935, 936, 937, 938, 242, 870, 871,
- 24, 873, 33, 34, 368, 36, 1764, 1765, 222, 102,
- 882, 883, 884, 24, 2322, 2323, 254, 889, 890, 369,
- 370, 1136, 1124, 297, 896, 897, 1575, 369, 370, 231,
- 232, 368, 234, 1575, 371, 134, 60, 33, 34, 911,
- 36, 72, 369, 370, 1805, 69, 918, 93, 1931, 109,
- 110, 111, 112, 113, 926, 1124, 2046, 88, 69, 201,
- 932, 203, 934, 935, 936, 937, 938, 1403, 367, 941,
- 1494, 370, 310, 1188, 109, 110, 111, 112, 113, 882,
- 883, 371, 33, 34, 1416, 2143, 137, 890, 1030, 1031,
- 1032, 1033, 88, 26, 966, 967, 968, 969, 368, 150,
- 151, 371, 974, 969, 109, 110, 111, 112, 113, 110,
- 111, 112, 113, 1449, 2422, 918, 988, 16, 1098, 969,
- 247, 369, 370, 169, 109, 110, 111, 112, 113, 176,
- 1002, 370, 169, 157, 1006, 2125, 1008, 88, 3, 1011,
- 369, 370, 198, 1015, 2452, 2453, 157, 317, 1020, 1021,
- 196, 1023, 1024, 280, 178, 1098, 1028, 157, 1030, 1031,
- 1032, 1033, 126, 2215, 26, 968, 969, 24, 192, 367,
- 238, 41, 196, 371, 198, 370, 367, 172, 1703, 1051,
- 371, 192, 1297, 147, 1056, 196, 138, 198, 368, 153,
- 1292, 371, 1294, 1065, 1743, 1067, 33, 34, 26, 1535,
- 1536, 1743, 59, 177, 250, 33, 34, 1057, 36, 161,
- 67, 370, 176, 7, 238, 9, 2235, 241, 242, 109,
- 110, 111, 112, 113, 19, 368, 21, 22, 1330, 181,
- 194, 277, 369, 370, 186, 72, 106, 109, 110, 111,
- 112, 113, 2300, 195, 368, 172, 2298, 371, 1098, 273,
- 172, 88, 1124, 367, 131, 1127, 126, 371, 1130, 1131,
- 88, 138, 367, 172, 1136, 142, 371, 137, 109, 110,
- 111, 112, 113, 370, 2157, 152, 1378, 301, 298, 1151,
- 109, 110, 111, 112, 113, 153, 1401, 1623, 1624, 368,
- 1622, 2310, 371, 317, 1166, 7, 1168, 9, 1366, 169,
- 332, 1173, 2321, 327, 328, 45, 176, 47, 1180, 369,
- 187, 181, 235, 236, 237, 7, 1188, 9, 109, 110,
- 111, 112, 113, 187, 194, 1197, 1198, 368, 525, 526,
- 527, 201, 529, 530, 369, 532, 46, 534, 48, 24,
- 3, 26, 1214, 1193, 1869, 1217, 369, 370, 33, 34,
- 46, 4, 48, 230, 231, 1227, 41, 109, 110, 111,
- 112, 113, 2381, 2382, 369, 109, 110, 111, 112, 113,
- 1222, 153, 1224, 1245, 371, 60, 1248, 368, 1802, 1245,
- 104, 105, 367, 172, 69, 1257, 263, 282, 283, 284,
- 1262, 286, 287, 288, 1197, 1245, 112, 113, 335, 336,
- 1959, 1273, 177, 88, 369, 370, 91, 369, 370, 369,
- 370, 281, 109, 110, 111, 112, 113, 81, 82, 1291,
- 1292, 106, 1294, 264, 172, 1297, 109, 110, 111, 112,
- 113, 369, 370, 172, 41, 1859, 306, 369, 370, 369,
- 370, 311, 1245, 369, 370, 1248, 31, 32, 318, 109,
- 110, 111, 112, 113, 172, 140, 369, 370, 1330, 109,
- 110, 111, 112, 113, 109, 110, 111, 112, 113, 369,
- 370, 369, 370, 158, 368, 1811, 369, 370, 266, 369,
- 1582, 1583, 369, 370, 91, 1587, 109, 110, 111, 112,
- 113, 3, 4, 178, 329, 330, 369, 369, 1834, 106,
- 1568, 1657, 369, 370, 3, 1981, 1378, 192, 1380, 194,
- 368, 196, 368, 198, 368, 282, 283, 284, 1587, 286,
- 287, 206, 207, 368, 209, 210, 369, 370, 1864, 1401,
- 368, 1403, 1404, 140, 368, 1490, 368, 282, 283, 284,
- 369, 286, 287, 288, 1416, 290, 109, 110, 111, 112,
- 113, 158, 368, 238, 196, 1670, 241, 242, 109, 110,
- 111, 112, 113, 109, 110, 111, 112, 113, 1440, 109,
- 110, 111, 112, 113, 1424, 99, 3, 1449, 369, 171,
- 1682, 1683, 38, 39, 369, 370, 1458, 194, 273, 369,
- 370, 1923, 1464, 127, 128, 1931, 1902, 1903, 370, 206,
- 207, 105, 368, 210, 138, 109, 110, 111, 112, 113,
- 1482, 145, 369, 370, 41, 368, 301, 369, 1490, 368,
- 127, 128, 368, 163, 371, 369, 368, 161, 369, 370,
- 315, 138, 317, 369, 370, 369, 370, 1440, 145, 173,
- 1512, 372, 327, 328, 369, 370, 1748, 1749, 371, 183,
- 371, 372, 186, 368, 161, 176, 109, 110, 111, 112,
- 113, 195, 15, 1535, 1536, 371, 173, 371, 1783, 371,
- 97, 371, 369, 100, 15, 368, 183, 77, 78, 186,
- 371, 109, 110, 111, 112, 113, 369, 371, 195, 116,
- 143, 371, 4, 5, 6, 7, 8, 9, 369, 370,
- 246, 369, 370, 208, 2036, 371, 18, 1579, 165, 369,
- 1582, 1583, 371, 2137, 2138, 1587, 250, 369, 370, 369,
- 4, 5, 6, 7, 369, 9, 2032, 2033, 369, 370,
- 157, 1603, 159, 371, 18, 371, 163, 369, 370, 2215,
- 369, 370, 369, 370, 2080, 371, 369, 256, 257, 371,
- 1622, 1623, 1624, 369, 370, 172, 109, 110, 111, 112,
- 113, 371, 1634, 371, 1879, 369, 370, 1639, 109, 110,
- 111, 112, 113, 201, 201, 157, 1579, 204, 371, 1651,
- 1652, 93, 73, 74, 75, 76, 1658, 78, 79, 80,
- 217, 218, 1877, 137, 221, 250, 223, 250, 1670, 109,
- 110, 111, 112, 113, 1676, 1907, 369, 96, 118, 4,
- 1682, 1683, 1684, 1685, 149, 1687, 101, 1689, 369, 369,
- 370, 2157, 2298, 371, 372, 149, 110, 111, 255, 139,
- 200, 1634, 366, 367, 91, 371, 1639, 124, 1907, 109,
- 110, 111, 112, 113, 172, 116, 73, 74, 75, 76,
- 121, 78, 79, 80, 125, 1970, 83, 169, 124, 366,
- 4, 369, 370, 1843, 135, 1623, 1624, 91, 2292, 126,
- 141, 96, 129, 369, 370, 146, 1748, 1749, 369, 370,
- 2304, 108, 369, 370, 1687, 169, 156, 1250, 1251, 193,
- 147, 162, 201, 4, 1874, 371, 153, 369, 157, 170,
- 1843, 368, 126, 4, 101, 129, 149, 371, 370, 180,
- 137, 1783, 109, 110, 111, 112, 113, 188, 108, 176,
- 371, 368, 108, 147, 101, 333, 101, 174, 192, 153,
- 370, 2046, 109, 110, 111, 112, 113, 194, 371, 1811,
- 211, 212, 213, 214, 172, 16, 1818, 4, 219, 220,
- 3, 208, 176, 96, 296, 149, 1828, 97, 123, 156,
- 370, 370, 1834, 1843, 1843, 1837, 369, 368, 370, 165,
- 194, 1843, 371, 369, 368, 370, 1848, 204, 368, 2135,
- 369, 105, 94, 95, 208, 109, 110, 111, 112, 113,
- 1862, 372, 1864, 1865, 101, 24, 267, 268, 269, 270,
- 254, 87, 1874, 172, 116, 1877, 101, 1879, 2340, 121,
- 2125, 368, 41, 125, 73, 74, 75, 76, 153, 78,
- 79, 80, 171, 135, 83, 1828, 101, 101, 174, 141,
- 1902, 1903, 138, 172, 146, 1907, 193, 1992, 371, 193,
- 69, 312, 313, 109, 110, 111, 112, 113, 193, 1921,
- 162, 1923, 193, 3, 3, 368, 7, 2315, 170, 1931,
- 368, 7, 91, 251, 200, 315, 106, 107, 180, 109,
- 110, 111, 112, 113, 2406, 368, 188, 106, 4, 107,
- 120, 371, 368, 1955, 1956, 149, 369, 149, 1960, 149,
- 370, 1963, 370, 149, 369, 369, 369, 369, 1970, 211,
- 212, 213, 214, 149, 369, 123, 91, 219, 220, 369,
- 368, 140, 1984, 1993, 1986, 1987, 156, 1989, 369, 1991,
- 1992, 1993, 251, 368, 164, 2105, 368, 368, 168, 158,
- 175, 1981, 368, 52, 53, 54, 55, 56, 57, 58,
- 370, 126, 61, 1993, 129, 368, 2126, 368, 368, 368,
- 368, 368, 71, 368, 368, 267, 268, 269, 270, 2235,
- 2032, 2033, 147, 192, 2036, 194, 369, 196, 153, 371,
- 368, 371, 149, 59, 2046, 254, 369, 206, 207, 38,
- 209, 210, 371, 2126, 368, 368, 371, 101, 368, 301,
- 172, 176, 370, 52, 53, 54, 55, 56, 57, 58,
- 312, 313, 61, 367, 149, 372, 4, 4, 2080, 194,
- 171, 371, 71, 368, 68, 371, 7, 300, 251, 370,
- 153, 23, 369, 208, 334, 26, 2098, 2099, 35, 371,
- 368, 26, 251, 3, 2310, 307, 251, 371, 251, 251,
- 251, 251, 251, 91, 2116, 2321, 2126, 2126, 2126, 369,
- 320, 2123, 7, 2125, 7, 2235, 7, 7, 7, 7,
- 7, 2133, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 7, 2126, 7, 7, 7,
- 369, 368, 204, 4, 369, 2157, 310, 369, 369, 4,
- 368, 101, 2235, 96, 165, 368, 165, 3, 44, 368,
- 44, 368, 3, 368, 367, 2381, 2382, 368, 200, 325,
- 285, 2291, 201, 368, 368, 7, 174, 201, 369, 371,
- 2300, 371, 369, 251, 290, 2305, 369, 369, 285, 2309,
- 2310, 2203, 155, 123, 309, 7, 209, 97, 4, 144,
- 106, 2321, 171, 101, 2224, 371, 209, 370, 370, 2221,
- 2222, 2223, 2224, 370, 169, 369, 311, 2300, 333, 334,
- 105, 369, 2305, 369, 369, 2215, 2309, 2310, 369, 369,
- 369, 369, 369, 369, 2224, 369, 351, 369, 2321, 368,
- 355, 371, 196, 371, 371, 369, 372, 149, 59, 166,
- 368, 91, 7, 369, 368, 368, 368, 7, 373, 97,
- 371, 2381, 2382, 378, 107, 201, 370, 3, 107, 4,
- 326, 96, 152, 371, 368, 7, 2288, 2289, 371, 371,
- 2300, 2300, 2300, 2300, 22, 2305, 2305, 2305, 369, 2309,
- 2309, 370, 369, 369, 165, 218, 2416, 368, 2381, 2382,
- 165, 38, 169, 3, 38, 38, 172, 38, 2298, 37,
- 40, 368, 251, 7, 7, 143, 369, 251, 251, 371,
- 106, 7, 4, 108, 101, 4, 2338, 2339, 2340, 25,
- 368, 250, 369, 2416, 2454, 369, 369, 368, 2358, 369,
- 306, 165, 169, 185, 123, 368, 2358, 155, 126, 7,
- 179, 310, 371, 174, 368, 96, 239, 144, 368, 86,
- 475, 476, 368, 89, 137, 480, 35, 44, 44, 169,
- 172, 2454, 254, 4, 4, 59, 369, 369, 368, 368,
- 63, 186, 373, 498, 4, 87, 368, 28, 201, 370,
- 368, 368, 174, 368, 2406, 2407, 2416, 2416, 2416, 371,
- 370, 4, 517, 101, 307, 59, 367, 369, 368, 101,
- 525, 526, 527, 528, 529, 530, 368, 532, 50, 534,
- 368, 169, 4, 369, 29, 251, 370, 101, 251, 101,
- 101, 371, 181, 106, 2454, 2454, 2454, 4, 201, 7,
- 165, 370, 123, 172, 101, 101, 370, 368, 4, 244,
- 565, 566, 368, 148, 193, 570, 368, 368, 149, 368,
- 575, 576, 577, 367, 2407, 580, 367, 3, 367, 172,
- 367, 586, 27, 367, 310, 367, 50, 592, 32, 3,
- 87, 30, 7, 161, 172, 4, 210, 368, 96, 368,
- 368, 134, 369, 369, 368, 96, 371, 370, 4, 255,
- 3, 138, 7, 193, 3, 367, 370, 370, 623, 624,
- 370, 368, 7, 369, 201, 369, 369, 369, 289, 4,
- 7, 97, 303, 368, 176, 96, 24, 163, 4, 4,
- 4, 4, 369, 108, 369, 7, 370, 201, 201, 166,
- 165, 242, 304, 156, 7, 4, 368, 78, 77, 369,
- 310, 370, 7, 370, 372, 4, 167, 4, 368, 7,
- 367, 250, 247, 678, 367, 4, 681, 24, 4, 7,
- 369, 4, 369, 201, 4, 369, 124, 1180, 2089, 2051,
- 695, 696, 697, 698, 699, 255, 1932, 702, 2189, 704,
- 705, 236, 124, 2095, 91, 1149, 731, 1543, 0, 0,
- 0, 928, 0, 2031, 1215, 2385, 1511, 2445, 467, 0,
- 0, 666, 676, 1002, 0, 2382, 683, 1931, 1228, 1254,
- 1404, 1570, 1687, 481, 2103, 2205, 1882, 205, 201, 694,
- 777, 681, 1135, 777, 896, 833, 2337, 752, 910, 1919,
- 1392, 573, 2325, 2309, 2300, 2300, 2300, 2300, 2305, 2300,
- 2291, 2454, 2100, 2407, 2294, 1828, 2110, 1166, 773, 1438,
- 775, 1614, 777, 778, 72, 1516, 2050, 782, 2048, 784,
- 785, 1531, 585, 1450, 917, 2175, 2097, 1210, 1648, 1195,
- 1964, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 814,
- -1, -1, -1, -1, 819, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 831, 832, -1, -1,
- 3, -1, -1, -1, -1, 840, -1, -1, -1, -1,
- -1, 846, -1, -1, -1, -1, -1, -1, -1, -1,
- 855, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
- 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 112,
- -1, 946, 947, -1, -1, -1, -1, -1, -1, -1,
+ 0, 0, 0, 0, 202, 294, 384, 202, 0, 610,
+ 2, 81, 286, 509, 694, 909, 0, 687, 664, 687,
+ 1024, 399, 1026, 1196, 461, 1499, 1139, 202, 1186, 1215,
+ 0, 574, 619, 223, 1597, 426, 520, 717, 1847, 229,
+ 230, 922, 1331, 630, 263, 264, 437, 1829, 1497, 239,
+ 1656, 691, 1136, 821, 570, 550, 572, 552, 1847, 3,
+ 1237, 1729, 1239, 3, 0, 90, 1607, 62, 1516, 0,
+ 95, 1617, 1635, 508, 7, 0, 1845, 1016, 0, 726,
+ 1554, 1708, 82, 75, 354, 62, 552, 101, 80, 81,
+ 82, 0, 971, 972, 4, 7, 4, 101, 90, 91,
+ 108, 108, 94, 95, 108, 350, 98, 485, 101, 306,
+ 149, 595, 82, 357, 101, 108, 92, 149, 550, 400,
+ 552, 25, 102, 103, 84, 104, 105, 101, 731, 115,
+ 733, 35, 115, 506, 115, 102, 107, 102, 102, 195,
+ 193, 238, 91, 27, 97, 98, 99, 100, 166, 471,
+ 120, 109, 110, 111, 112, 113, 213, 251, 1531, 202,
+ 200, 156, 204, 89, 2, 222, 70, 2129, 438, 1207,
+ 201, 241, 203, 251, 78, 181, 611, 166, 201, 156,
+ 201, 2313, 379, 87, 1579, 242, 201, 1300, 245, 30,
+ 367, 248, 2324, 1231, 371, 102, 367, 149, 204, 102,
+ 371, 172, 106, 202, 301, 380, 104, 105, 586, 279,
+ 104, 105, 204, 604, 206, 124, 208, 104, 105, 104,
+ 105, 213, 106, 707, 104, 105, 104, 105, 220, 419,
+ 222, 223, 275, 1606, 172, 509, 228, 229, 230, 429,
+ 631, 233, 234, 235, 196, 301, 87, 239, 243, 241,
+ 242, 243, 2384, 245, 246, 247, 248, 249, 250, 251,
+ 252, 250, 254, 255, 256, 257, 243, 368, 310, 764,
+ 211, 212, 3, 182, 368, 545, 771, 820, 204, 822,
+ 775, 104, 105, 275, 528, 529, 530, 279, 532, 533,
+ 368, 535, 310, 537, 265, 108, 288, 781, 764, 291,
+ 292, 1478, 98, 548, 100, 771, 551, 482, 553, 775,
+ 296, 689, 593, 296, 306, 296, 308, 370, 98, 99,
+ 100, 591, 1885, 109, 110, 111, 112, 113, 650, 305,
+ 370, 370, 764, 817, 578, 1216, 923, 380, 370, 771,
+ 2129, 714, 1110, 775, 297, 305, 2308, 370, 373, 370,
+ 310, 289, 1747, 320, 1960, 370, 348, 1296, 372, 843,
+ 1006, 353, 354, 355, 372, 372, 202, 337, 372, 1248,
+ 1017, 1310, 313, 2221, 369, 24, 200, 2146, 253, 372,
+ 24, 373, 1671, 440, 1925, 372, 1932, 379, 368, 293,
+ 369, 371, 369, 588, 368, 233, 234, 235, 468, 309,
+ 310, 368, 310, 368, 371, 602, 371, 371, 583, 247,
+ 684, 249, 250, 251, 252, 373, 254, 255, 256, 257,
+ 412, 1870, 1871, 246, 2051, 69, 330, 419, 368, 373,
+ 704, 367, 163, 703, 1620, 368, 367, 429, 430, 482,
+ 497, 466, 367, 2111, 436, 367, 438, 251, 440, 1052,
+ 1053, 721, 24, 291, 446, 525, 368, 185, 367, 186,
+ 517, 368, 454, 900, 371, 368, 186, 983, 371, 461,
+ 308, 369, 136, 465, 466, 369, 468, 368, 470, 471,
+ 7, 149, 369, 142, 369, 186, 7, 1673, 480, 369,
+ 186, 369, 484, 763, 2303, 137, 164, 224, 523, 186,
+ 91, 297, 937, 2312, 778, 497, 498, 1684, 157, 12,
+ 13, 1392, 504, 157, 2303, 2363, 508, 297, 510, 2308,
+ 1604, 470, 45, 2312, 47, 517, 186, 169, 520, 774,
+ 522, 523, 2095, 525, 526, 199, 1540, 224, 60, 1987,
+ 583, 1989, 732, 192, 1992, 369, 370, 1031, 192, 140,
+ 62, 543, 196, 545, 198, 129, 369, 370, 1101, 372,
+ 106, 1104, 1105, 555, 224, 178, 370, 202, 1063, 196,
+ 1005, 563, 231, 172, 412, 302, 62, 526, 635, 62,
+ 308, 251, 302, 853, 111, 157, 250, 373, 1023, 1024,
+ 111, 1026, 430, 1361, 116, 1196, 588, 1063, 1366, 591,
+ 2206, 302, 1118, 595, 596, 849, 302, 2389, 446, 601,
+ 602, 1251, 582, 583, 606, 302, 454, 609, 186, 611,
+ 192, 289, 1059, 185, 109, 110, 111, 112, 113, 242,
+ 2419, 1063, 624, 625, 208, 1821, 198, 264, 251, 1825,
+ 610, 368, 302, 635, 156, 637, 1130, 822, 368, 641,
+ 138, 708, 2238, 850, 851, 647, 224, 160, 650, 1845,
+ 109, 110, 111, 112, 113, 1851, 265, 368, 2457, 661,
+ 156, 115, 368, 156, 1787, 865, 4, 874, 735, 1968,
+ 4, 368, 178, 4, 40, 41, 42, 43, 109, 110,
+ 111, 112, 113, 49, 186, 51, 140, 1134, 1241, 691,
+ 370, 124, 899, 121, 696, 543, 106, 195, 368, 118,
+ 66, 703, 258, 259, 260, 707, 708, 2325, 2326, 124,
+ 109, 110, 111, 112, 113, 4, 1494, 2313, 947, 721,
+ 139, 243, 185, 725, 302, 240, 1171, 729, 2324, 1009,
+ 732, 65, 196, 735, 162, 198, 242, 120, 1183, 228,
+ 106, 109, 110, 111, 112, 113, 24, 243, 250, 182,
+ 243, 465, 754, 109, 110, 111, 112, 113, 606, 169,
+ 1883, 763, 969, 970, 368, 2338, 1657, 371, 222, 822,
+ 1938, 1265, 187, 156, 1054, 777, 624, 625, 780, 781,
+ 295, 783, 60, 211, 2303, 168, 766, 228, 2384, 2385,
+ 368, 69, 2311, 641, 109, 110, 111, 112, 113, 647,
+ 166, 1984, 178, 1459, 1205, 367, 2290, 2425, 522, 371,
+ 109, 110, 111, 112, 113, 817, 192, 24, 106, 107,
+ 873, 109, 110, 111, 112, 113, 4, 5, 6, 7,
+ 8, 9, 120, 264, 12, 13, 4, 2455, 2456, 142,
+ 18, 843, 1439, 691, 136, 371, 372, 1127, 850, 851,
+ 1973, 853, 59, 186, 1868, 109, 110, 111, 112, 113,
+ 862, 317, 1415, 865, 197, 845, 242, 368, 156, 33,
+ 34, 873, 874, 137, 876, 370, 164, 1768, 1769, 157,
+ 168, 729, 368, 885, 886, 887, 150, 151, 254, 368,
+ 892, 893, 33, 34, 0, 36, 142, 899, 900, 1579,
+ 178, 1579, 33, 34, 102, 1809, 754, 199, 72, 367,
+ 369, 370, 914, 24, 192, 93, 1101, 64, 196, 921,
+ 198, 1935, 1127, 7, 88, 9, 2049, 929, 231, 232,
+ 367, 234, 1139, 935, 371, 937, 938, 939, 940, 941,
+ 16, 88, 944, 90, 310, 1498, 368, 88, 59, 371,
+ 2146, 109, 110, 111, 112, 113, 67, 88, 250, 251,
+ 238, 1406, 368, 241, 242, 371, 26, 969, 970, 971,
+ 972, 370, 1419, 33, 34, 977, 36, 368, 972, 938,
+ 939, 940, 941, 371, 1191, 231, 232, 134, 234, 991,
+ 138, 169, 972, 26, 41, 273, 109, 110, 111, 112,
+ 113, 369, 370, 1005, 7, 2128, 9, 1009, 1453, 1011,
+ 12, 13, 1014, 161, 370, 1295, 1018, 1297, 196, 369,
+ 370, 1023, 1024, 301, 1026, 1027, 176, 368, 88, 1031,
+ 371, 1033, 1034, 1035, 1036, 2218, 169, 885, 886, 317,
+ 109, 110, 111, 112, 113, 893, 198, 195, 1101, 327,
+ 328, 1707, 1054, 1333, 3, 370, 7, 1059, 9, 106,
+ 109, 110, 111, 112, 113, 317, 1068, 1747, 1070, 1747,
+ 369, 157, 250, 921, 1033, 1034, 1035, 1036, 238, 126,
+ 1060, 369, 370, 109, 110, 111, 112, 113, 33, 34,
+ 137, 36, 26, 1300, 1539, 1540, 163, 368, 177, 277,
+ 371, 1381, 109, 110, 111, 112, 113, 2303, 109, 110,
+ 111, 112, 113, 367, 69, 1369, 172, 72, 2301, 74,
+ 368, 1101, 169, 971, 972, 1127, 172, 72, 1130, 176,
+ 368, 1133, 1134, 371, 181, 369, 370, 1139, 109, 110,
+ 111, 112, 113, 88, 1443, 172, 2160, 194, 215, 216,
+ 367, 172, 1154, 370, 201, 1661, 109, 110, 111, 112,
+ 113, 109, 110, 111, 112, 113, 370, 1169, 334, 1171,
+ 298, 337, 338, 247, 1176, 153, 247, 251, 332, 1626,
+ 251, 1183, 1627, 1628, 109, 110, 111, 112, 113, 1191,
+ 109, 110, 111, 112, 113, 41, 187, 1404, 1200, 1201,
+ 371, 109, 110, 111, 112, 113, 280, 369, 370, 280,
+ 19, 369, 21, 22, 4, 1217, 1196, 1873, 1220, 109,
+ 110, 111, 112, 113, 110, 111, 112, 113, 1230, 109,
+ 110, 111, 112, 113, 281, 109, 110, 111, 112, 113,
+ 109, 110, 111, 112, 113, 91, 1248, 369, 370, 1251,
+ 235, 236, 237, 1806, 1248, 46, 369, 48, 1260, 306,
+ 106, 104, 105, 1265, 311, 46, 138, 48, 1248, 127,
+ 128, 318, 1962, 368, 1276, 109, 110, 111, 112, 113,
+ 138, 112, 113, 4, 5, 6, 7, 145, 9, 161,
+ 127, 128, 1294, 1295, 140, 1297, 3, 18, 1300, 153,
+ 369, 138, 3, 161, 335, 336, 1586, 1587, 145, 181,
+ 1863, 1591, 158, 368, 186, 173, 369, 370, 1572, 1225,
+ 369, 1227, 177, 195, 161, 183, 369, 370, 186, 369,
+ 370, 1333, 369, 370, 369, 370, 173, 195, 81, 82,
+ 41, 369, 370, 369, 369, 370, 183, 172, 194, 186,
+ 369, 370, 1200, 109, 110, 111, 112, 113, 195, 172,
+ 206, 207, 369, 368, 210, 369, 370, 201, 369, 172,
+ 1815, 369, 370, 1984, 31, 32, 368, 1661, 247, 1381,
+ 172, 1383, 369, 370, 3, 4, 1591, 143, 368, 110,
+ 111, 368, 250, 1838, 369, 370, 97, 3, 369, 100,
+ 1248, 368, 1404, 1251, 1406, 1407, 1686, 1687, 329, 330,
+ 368, 280, 1906, 1907, 1494, 116, 369, 1419, 126, 369,
+ 370, 369, 368, 1868, 38, 39, 4, 5, 6, 7,
+ 8, 9, 109, 110, 111, 112, 113, 369, 370, 147,
+ 18, 368, 1444, 91, 369, 153, 368, 1427, 169, 266,
+ 369, 1453, 369, 370, 369, 370, 157, 369, 159, 196,
+ 1462, 369, 163, 369, 370, 99, 1468, 1674, 176, 369,
+ 370, 370, 1752, 1753, 369, 370, 131, 368, 126, 369,
+ 1927, 129, 371, 138, 1486, 171, 194, 142, 372, 369,
+ 1935, 368, 1494, 368, 250, 369, 176, 152, 368, 147,
+ 201, 91, 368, 204, 371, 153, 369, 370, 366, 367,
+ 369, 370, 369, 370, 1516, 93, 217, 218, 15, 371,
+ 221, 371, 223, 371, 372, 94, 95, 371, 176, 366,
+ 369, 370, 187, 369, 370, 368, 126, 1539, 1540, 129,
+ 368, 2035, 2036, 369, 370, 208, 194, 116, 369, 370,
+ 369, 370, 121, 371, 255, 371, 125, 147, 77, 78,
+ 208, 15, 165, 153, 369, 370, 135, 256, 257, 246,
+ 369, 370, 141, 369, 370, 230, 231, 146, 371, 372,
+ 1787, 1583, 369, 370, 1586, 1587, 176, 2140, 2141, 1591,
+ 172, 169, 2039, 162, 369, 370, 1444, 371, 282, 283,
+ 284, 170, 286, 287, 194, 1607, 371, 2218, 263, 369,
+ 370, 180, 109, 110, 111, 112, 113, 371, 208, 188,
+ 369, 370, 369, 370, 1626, 1627, 1628, 1627, 1628, 24,
+ 371, 1911, 2138, 1253, 1254, 371, 1638, 371, 2083, 371,
+ 371, 1643, 211, 212, 213, 214, 41, 371, 371, 157,
+ 219, 220, 371, 1655, 1656, 109, 110, 111, 112, 113,
+ 1662, 137, 1847, 250, 4, 96, 149, 109, 110, 111,
+ 112, 113, 1674, 101, 69, 91, 1883, 149, 1680, 200,
+ 124, 1881, 172, 371, 1686, 1687, 1688, 1689, 124, 1691,
+ 2301, 1693, 4, 96, 1993, 201, 91, 193, 267, 268,
+ 269, 270, 73, 74, 75, 76, 1911, 78, 79, 80,
+ 126, 106, 83, 129, 4, 2160, 369, 73, 74, 75,
+ 76, 163, 78, 79, 80, 371, 368, 83, 157, 4,
+ 149, 147, 301, 371, 370, 1583, 108, 153, 371, 368,
+ 108, 333, 2295, 312, 313, 140, 101, 101, 174, 192,
+ 1752, 1753, 108, 370, 2307, 109, 110, 111, 112, 113,
+ 176, 371, 172, 158, 4, 16, 1973, 3, 96, 106,
+ 107, 149, 109, 110, 111, 112, 113, 97, 194, 296,
+ 123, 137, 370, 120, 370, 1787, 369, 371, 368, 370,
+ 1638, 370, 208, 369, 1847, 1643, 368, 192, 368, 194,
+ 165, 196, 156, 369, 109, 110, 111, 112, 113, 372,
+ 101, 206, 207, 1815, 209, 210, 254, 87, 101, 156,
+ 1822, 172, 368, 153, 171, 1878, 172, 164, 101, 174,
+ 1832, 168, 101, 371, 138, 193, 1838, 1847, 1847, 1841,
+ 193, 193, 2049, 1691, 116, 1847, 3, 3, 204, 121,
+ 1852, 156, 193, 125, 2138, 368, 52, 53, 54, 55,
+ 56, 57, 58, 135, 1866, 61, 1868, 1869, 38, 141,
+ 368, 7, 7, 200, 146, 71, 1878, 251, 315, 1881,
+ 368, 1883, 52, 53, 54, 55, 56, 57, 58, 371,
+ 162, 61, 107, 4, 368, 149, 2343, 149, 170, 369,
+ 149, 71, 101, 149, 1906, 1907, 370, 370, 180, 1911,
+ 109, 110, 111, 112, 113, 1995, 188, 369, 369, 369,
+ 369, 2128, 369, 1925, 149, 1927, 123, 528, 529, 530,
+ 2318, 532, 533, 1935, 535, 369, 537, 369, 368, 211,
+ 212, 213, 214, 251, 2129, 368, 368, 219, 220, 175,
+ 109, 110, 111, 112, 113, 368, 368, 1959, 1960, 118,
+ 368, 1963, 2409, 368, 1966, 369, 368, 368, 282, 283,
+ 284, 1973, 286, 287, 288, 368, 290, 368, 368, 371,
+ 139, 370, 368, 368, 1832, 1987, 1996, 1989, 1990, 369,
+ 1992, 368, 1994, 1995, 1996, 267, 268, 269, 270, 149,
+ 59, 105, 371, 101, 1984, 109, 110, 111, 112, 113,
+ 109, 110, 111, 112, 113, 254, 1996, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+ 2238, 172, 371, 2035, 2036, 368, 371, 2039, 105, 368,
+ 312, 313, 109, 110, 111, 112, 113, 2049, 149, 370,
+ 367, 4, 4, 2238, 372, 2108, 73, 74, 75, 76,
+ 371, 78, 79, 80, 282, 283, 284, 368, 286, 287,
+ 288, 171, 68, 371, 7, 251, 2129, 300, 370, 153,
+ 23, 2083, 368, 371, 369, 26, 334, 371, 26, 35,
+ 307, 251, 3, 251, 91, 369, 251, 251, 251, 2101,
+ 2102, 320, 251, 251, 7, 2313, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 2324, 2119, 2303, 2129,
+ 2129, 2129, 369, 2308, 2126, 368, 2128, 2312, 2313, 204,
+ 4, 369, 369, 368, 2136, 369, 310, 4, 101, 2324,
+ 96, 368, 44, 165, 368, 165, 368, 368, 368, 2129,
+ 3, 3, 368, 44, 367, 200, 325, 201, 2160, 368,
+ 371, 174, 201, 371, 7, 369, 369, 251, 369, 369,
+ 285, 290, 123, 155, 7, 209, 2384, 2385, 97, 4,
+ 144, 106, 171, 371, 101, 2238, 370, 370, 209, 369,
+ 369, 105, 370, 169, 369, 311, 369, 369, 369, 2384,
+ 2385, 369, 369, 369, 2206, 369, 369, 369, 196, 149,
+ 371, 59, 166, 91, 7, 7, 368, 2227, 201, 107,
+ 371, 368, 2224, 2225, 2226, 2227, 371, 369, 372, 369,
+ 368, 368, 97, 3, 2419, 368, 4, 371, 2218, 370,
+ 326, 2294, 96, 107, 152, 371, 368, 2227, 7, 370,
+ 2303, 371, 369, 371, 368, 2308, 369, 22, 165, 2312,
+ 2313, 369, 38, 286, 38, 38, 38, 172, 218, 40,
+ 37, 2324, 2457, 3, 368, 165, 251, 251, 251, 7,
+ 169, 7, 143, 371, 369, 106, 7, 4, 311, 2291,
+ 2292, 108, 101, 2303, 2303, 2303, 2303, 4, 2308, 2308,
+ 2308, 25, 2312, 2312, 368, 250, 369, 369, 369, 369,
+ 169, 306, 335, 336, 368, 165, 185, 368, 123, 126,
+ 155, 2301, 7, 239, 179, 310, 368, 174, 371, 144,
+ 353, 2384, 2385, 368, 357, 368, 96, 89, 86, 2341,
+ 2342, 2343, 254, 137, 35, 44, 44, 169, 172, 4,
+ 4, 2361, 375, 59, 369, 369, 368, 380, 368, 2361,
+ 186, 63, 373, 4, 87, 368, 2419, 28, 370, 201,
+ 368, 174, 371, 4, 368, 368, 101, 307, 370, 59,
+ 367, 101, 368, 50, 368, 169, 4, 101, 369, 368,
+ 370, 369, 29, 251, 251, 106, 101, 101, 181, 371,
+ 4, 165, 201, 172, 2457, 123, 7, 2409, 2410, 2419,
+ 2419, 2419, 370, 101, 101, 370, 4, 244, 149, 368,
+ 368, 148, 3, 172, 368, 27, 368, 193, 310, 368,
+ 367, 367, 367, 367, 32, 367, 367, 50, 3, 368,
+ 368, 368, 87, 369, 30, 369, 368, 2457, 2457, 2457,
+ 371, 161, 370, 210, 477, 478, 7, 370, 4, 482,
+ 370, 370, 96, 172, 134, 4, 96, 255, 3, 138,
+ 7, 193, 3, 7, 4, 289, 97, 500, 7, 176,
+ 303, 368, 367, 369, 96, 369, 509, 163, 369, 369,
+ 4, 368, 24, 201, 4, 4, 4, 520, 369, 369,
+ 7, 108, 370, 242, 166, 528, 529, 530, 531, 532,
+ 533, 201, 535, 369, 537, 201, 165, 368, 304, 7,
+ 156, 370, 4, 310, 78, 24, 372, 26, 77, 7,
+ 370, 4, 167, 4, 33, 34, 201, 368, 250, 7,
+ 24, 4, 41, 4, 247, 568, 569, 367, 367, 7,
+ 573, 369, 4, 369, 4, 578, 579, 580, 369, 255,
+ 583, 60, 2410, 124, 2092, 1183, 589, 2054, 2192, 1936,
+ 69, 2098, 595, 237, 124, 91, 0, 1152, 1547, 0,
+ 0, 931, 0, 2034, 1515, 2388, 469, 1218, 734, 88,
+ 2448, 0, 91, 669, 0, 0, 679, 2385, 1005, 1196,
+ 2389, 1407, 1691, 626, 627, 686, 1935, 106, 1257, 2106,
+ 2208, 1574, 202, 1886, 696, 780, 684, 576, 899, 206,
+ 913, 1923, 836, 1138, 2340, 1395, 2328, 2312, 2303, 2308,
+ 2303, 2303, 2303, 2457, 2103, 2303, 2294, 780, 1832, 2410,
+ 2297, 140, 1442, 1169, 1618, 2113, 72, 1520, 2051, 2053,
+ 1535, 1213, 1454, 920, 2178, 1652, 2100, 1198, 681, 158,
+ 1967, 684, -1, -1, -1, 588, -1, -1, -1, -1,
+ -1, -1, -1, -1, 697, 698, 699, 700, 701, 178,
+ -1, 704, -1, 706, 707, -1, -1, -1, -1, -1,
+ -1, -1, -1, 192, -1, 194, -1, 196, -1, 198,
+ -1, -1, -1, -1, -1, -1, -1, 206, 207, -1,
+ 209, 210, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 755, -1, -1, -1, -1, -1, -1, 238,
+ -1, -1, 241, 242, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 776, -1, 778, -1, 780, 781, -1,
+ -1, -1, 785, -1, 787, 788, -1, -1, -1, -1,
+ -1, -1, -1, -1, 273, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 817, -1, -1, -1, -1, 822,
+ -1, -1, 301, -1, -1, -1, -1, -1, -1, -1,
+ -1, 834, 835, -1, -1, 3, 315, -1, 317, -1,
+ 843, -1, -1, -1, -1, -1, 849, -1, 327, 328,
+ -1, -1, -1, -1, -1, 858, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
+ -1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 112, -1, 949, 950, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 990, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 1004,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 1028, -1, -1, -1, -1, -1, 1034,
- -1, -1, -1, -1, -1, -1, 1041, 1042, -1, -1,
- -1, -1, 1047, -1, -1, -1, -1, -1, -1, -1,
+ 993, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 1007, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 1074,
+ -1, -1, -1, -1, -1, -1, -1, -1, 1031, -1,
+ -1, -1, -1, -1, 1037, -1, -1, -1, -1, -1,
+ -1, 1044, 1045, -1, -1, -1, -1, 1050, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 1094,
- -1, -1, -1, 1098, -1, -1, -1, -1, 1103, 272,
- 1105, 1106, -1, -1, 1109, -1, -1, -1, -1, -1,
- -1, 1116, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 1127, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 319, -1, -1, -1,
- -1, -1, 325, 326, 327, 328, 329, 330, 331, 332,
- 333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 1077, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 1097, -1, -1, -1, 1101, -1,
+ -1, -1, -1, 1106, 272, 1108, 1109, -1, -1, 1112,
+ -1, -1, -1, -1, -1, -1, 1119, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 1130, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 319, -1, -1, -1, -1, -1, 325, 326, 327,
+ 328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
+ 338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 371, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 371, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 1237, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 1240, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 1262, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1275, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 1265, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 1278, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1335, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 1338, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 3, 1357, -1, 1359, -1, -1, -1, -1, -1,
- -1, 1366, -1, -1, -1, -1, 1371, -1, -1, -1,
- -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, -1, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, -1, -1, -1, -1, -1, -1,
- 92, 93, 94, 95, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 1360, 3, 1362,
+ -1, -1, -1, -1, -1, -1, 1369, -1, -1, -1,
+ -1, 1374, -1, -1, -1, -1, -1, -1, -1, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 112, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 1497, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 112, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 1493, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1543, -1, -1, -1, 1547, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 1572,
+ -1, -1, -1, 1576, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 1539, -1, -1, -1, 1543, -1,
+ -1, 1594, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 1568, -1, -1, -1, 1572, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 272, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 1661, -1,
+ 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 319, -1, -1, -1, 1681, -1,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1590, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, -1,
+ -1, -1, -1, -1, -1, -1, 371, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 1741, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 112, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 1870, 1871, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 3,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 1906, 1907, -1, -1, -1, -1, 1912,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, -1, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, -1, -1, -1, -1, -1, -1, 92, 93,
+ 94, 95, 1985, 1986, -1, -1, -1, 272, -1, -1,
+ -1, -1, -1, -1, -1, -1, 1999, 2000, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 2034, 2035, 2036, 319, -1, -1, -1, -1, -1,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 2075, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 371, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 2108, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 2138, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 272, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 305, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 319, -1, -1, -1, -1,
+ -1, 325, 326, 327, 328, 329, 330, 331, 332, 333,
+ 334, 335, 336, 337, 338, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 2237, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 371, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 3, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 2294, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, -1, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 3, -1, -1, -1, -1, 2362,
+ 92, 93, 94, 95, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 2377, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ -1, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, -1, -1, -1,
+ -1, -1, -1, 92, 93, 94, 95, 3, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 112, -1, -1, -1, -1, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, -1, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ -1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 1657, 305, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 319, -1, -1,
- -1, -1, 1677, 325, 326, 327, 328, 329, 330, 331,
+ -1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
332, 333, 334, 335, 336, 337, 338, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 272, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 371,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3, -1, -1, -1, -1, -1, 371,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 1737, -1, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
- -1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 112, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 305, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 325, 326, 327, 328,
+ 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 1866, 1867, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
+ -1, -1, 371, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 1902, 1903, -1,
- -1, -1, -1, 1908, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
- -1, -1, 92, 93, 94, 95, -1, 1982, 1983, -1,
- -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
- -1, 1996, 1997, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 2031, 2032, 2033, 319,
- -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
+ -1, -1, -1, 319, -1, -1, -1, -1, -1, 325,
+ 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
+ 336, 337, 338, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 2072, -1, -1,
+ -1, -1, -1, -1, -1, 371, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 3, -1,
+ -1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, 3, -1, -1, -1, -1, -1, 92, 93, 94,
+ 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, -1, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, -1, -1, -1, -1, -1, -1,
+ 92, 93, 94, 95, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 272, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 371, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 2105, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 325, 326, 327,
+ 328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
+ 338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 272, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 2135, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 371, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
+ 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 319,
- -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 2234,
+ 272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 371, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 371, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 3, -1, -1, -1,
+ -1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
+ 332, 333, 334, 335, 336, 337, 338, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 3,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 2291, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, -1, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 3,
- -1, -1, -1, -1, 2359, 92, 93, 94, 95, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 2374,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 371,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
64, 65, 66, 67, 68, -1, 70, 71, 72, 73,
74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, 85, -1, -1, -1, -1, -1, -1, 92, 93,
- 94, 95, 3, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 112, -1,
+ 84, 85, 3, -1, -1, -1, -1, -1, 92, 93,
+ 94, 95, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 24, 25, 26, 27, 28, 29, 30,
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
61, 62, 63, 64, 65, 66, 67, 68, -1, 70,
71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, -1, -1, -1, -1, -1,
- -1, 92, 93, 94, 95, 272, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 319, -1, -1, -1, -1, -1, 325, 326,
- 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
- 337, 338, -1, -1, -1, -1, -1, -1, -1, -1,
+ 81, 82, 83, 84, 85, 3, -1, -1, -1, -1,
+ -1, 92, 93, 94, 95, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
+ -1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 272, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 371, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 305, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 325, 326, 327, 328, 329, 330, 331, 332, 333,
334, 335, 336, 337, 338, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 272, -1, -1, -1, -1, -1, 371, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 272, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 371, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 305, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 319, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 325, 326, 327, 328, 329, 330,
331, 332, 333, 334, 335, 336, 337, 338, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 272, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 371, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, 3, -1, -1, -1, -1, -1, 92,
- 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 24, 25, 26, 27, 28, 29,
+ 371, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 325, 326, 327,
+ 328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
+ 338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 371, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 3, -1, -1, -1,
+ 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
-1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, -1, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 272,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 325, 326, 327, 328, 329, 330, 331, 332,
- 333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 371, -1,
+ -1, 3, 4, 5, 6, 7, 8, 9, -1, 11,
+ 12, 13, -1, -1, -1, 17, 18, -1, -1, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, -1, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, -1, -1, -1, -1, -1, -1,
+ 92, 93, 94, 95, 96, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 112, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 127, 128, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 138, -1, -1, -1,
+ -1, -1, -1, 145, -1, -1, -1, -1, 150, 151,
+ -1, -1, 154, -1, -1, -1, -1, -1, -1, 161,
+ -1, -1, -1, -1, -1, -1, -1, 169, -1, -1,
+ -1, 173, 272, -1, -1, -1, -1, -1, -1, -1,
+ -1, 183, -1, -1, 186, 187, -1, -1, -1, -1,
+ -1, -1, -1, 195, 196, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 272, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 371, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 325, 326,
- 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
- 337, 338, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 3, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 371, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- -1, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 3, -1, -1,
- -1, -1, -1, 92, 93, 94, 95, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, -1, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 3, -1, -1, -1, -1, -1, 92, 93, 94, 95,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
- 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 272, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 305, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 325, 326, 327, 328,
- 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 371, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 325,
- 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
- 336, 337, 338, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 272,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 371, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 325, 326, 327, 328, 329, 330, 331, 332,
- 333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
+ -1, -1, 224, -1, -1, 325, 326, 327, 328, 329,
+ 330, 331, 332, 333, 334, 335, 336, 337, 338, 241,
+ -1, -1, -1, 245, -1, -1, -1, 249, 250, -1,
+ 252, 253, -1, -1, -1, -1, -1, -1, -1, -1,
+ 262, -1, -1, -1, 266, -1, -1, -1, -1, -1,
+ 272, 371, 274, 275, -1, -1, 278, 279, -1, -1,
+ 282, 283, -1, -1, -1, -1, -1, -1, -1, -1,
+ 292, 293, 294, 295, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 319, -1, -1,
+ 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+ 332, 333, 334, 335, 336, 337, 338, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 3, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 371, 24,
+ -1, -1, -1, -1, 366, -1, 368, -1, 370, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
@@ -5795,113 +5845,103 @@ static const yytype_int16 yycheck[] =
65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
85, -1, -1, -1, -1, -1, -1, 92, 93, 94,
- 95, -1, -1, -1, -1, -1, 3, 4, 5, 6,
- 7, 8, 9, -1, 11, 12, 13, -1, -1, -1,
- 17, 18, -1, -1, -1, -1, -1, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, -1, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, 96,
+ 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 112, -1, -1, -1, -1,
+ -1, 116, -1, -1, -1, -1, 121, -1, -1, -1,
+ 125, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 135, -1, -1, -1, -1, -1, 141, -1, -1, -1,
+ -1, 146, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 162, -1, -1,
+ -1, -1, -1, -1, -1, 170, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 180, -1, -1, -1, -1,
+ -1, -1, -1, 188, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 127, 128, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 138, -1, -1, -1, -1, -1, -1, 145, -1,
- -1, -1, -1, 150, 151, -1, -1, 154, -1, -1,
- -1, -1, -1, -1, 161, -1, -1, -1, -1, -1,
- -1, -1, 169, -1, -1, -1, 173, 272, -1, -1,
- -1, -1, -1, -1, -1, -1, 183, -1, -1, 186,
- 187, -1, -1, -1, -1, -1, -1, -1, 195, 196,
+ -1, -1, -1, -1, -1, -1, 211, 212, 213, 214,
+ -1, -1, -1, -1, 219, 220, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 224, -1, -1,
- 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- 335, 336, 337, 338, 241, -1, -1, -1, 245, -1,
- -1, -1, 249, 250, -1, 252, 253, -1, -1, -1,
- -1, -1, -1, -1, -1, 262, -1, -1, -1, 266,
- -1, -1, -1, -1, -1, 272, 371, 274, 275, -1,
- -1, 278, 279, -1, -1, 282, 283, -1, -1, -1,
- -1, -1, -1, -1, -1, 292, 293, 294, 295, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 319, -1, -1, 322, 323, 324, 325, 326,
- 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
- 337, 338, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 366,
- -1, 368, -1, 370, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
- -1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 116, -1, -1, -1,
- -1, 121, -1, -1, -1, 125, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 135, -1, -1, -1, -1,
- -1, 141, -1, -1, -1, -1, 146, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 162, -1, -1, -1, -1, -1, -1, -1,
- 170, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 180, -1, -1, -1, -1, -1, -1, -1, 188, -1,
+ -1, -1, 267, 268, 269, 270, -1, 272, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 211, 212, 213, 214, -1, -1, -1, -1, 219,
- 220, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 305, -1, -1, -1, -1, -1, -1, 312, 313, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
+ 8, 9, -1, 11, 12, 13, -1, 15, -1, 17,
+ 18, -1, -1, -1, -1, 370, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
+ -1, -1, -1, -1, 92, 93, 94, 95, 96, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 107,
+ -1, -1, -1, -1, 112, 113, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 127,
+ 128, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 138, -1, -1, -1, -1, -1, -1, 145, -1, -1,
+ -1, -1, 150, 151, -1, -1, 154, -1, -1, -1,
+ -1, -1, -1, 161, -1, -1, -1, -1, -1, -1,
+ -1, 169, -1, -1, -1, 173, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 183, -1, -1, 186, 187,
+ -1, -1, -1, -1, -1, -1, -1, 195, 196, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 267, 268, 269,
- 270, -1, 272, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 224, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
- -1, -1, 312, 313, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
+ -1, -1, -1, 241, -1, -1, -1, 245, -1, -1,
+ -1, 249, -1, -1, 252, 253, -1, -1, -1, -1,
+ -1, -1, -1, -1, 262, -1, -1, -1, 266, -1,
+ -1, -1, -1, -1, 272, -1, 274, 275, -1, -1,
+ 278, 279, -1, -1, 282, 283, -1, -1, -1, -1,
+ -1, -1, -1, -1, 292, 293, 294, 295, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 319, -1, -1, 322, 323, 324, 325, 326, 327,
+ 328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
+ 338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
3, 4, 5, 6, 7, 8, 9, -1, 11, 12,
- 13, -1, 15, -1, 17, 18, -1, -1, -1, -1,
- 370, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 13, -1, -1, -1, 17, 18, -1, -1, 366, -1,
+ 368, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
- 93, 94, 95, 96, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 107, -1, -1, -1, -1, 112,
- 113, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 127, 128, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 138, -1, -1, -1, -1,
- -1, -1, 145, -1, -1, -1, -1, 150, 151, -1,
- -1, 154, -1, -1, -1, -1, -1, -1, 161, -1,
+ 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 106, -1, -1, -1, 110, 111, 112,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 144, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 154, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 169, -1, -1, -1,
- 173, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 183, -1, -1, 186, 187, -1, -1, -1, -1, -1,
- -1, -1, 195, 196, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 186, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 196, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 224, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 241, -1,
- -1, -1, 245, -1, -1, -1, 249, -1, -1, 252,
- 253, -1, -1, -1, -1, -1, -1, -1, -1, 262,
+ -1, -1, -1, -1, -1, -1, -1, 250, -1, -1,
+ 253, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 266, -1, -1, -1, -1, -1, 272,
- -1, 274, 275, -1, -1, 278, 279, -1, -1, 282,
+ -1, 274, 275, -1, 277, 278, 279, -1, -1, 282,
283, -1, -1, -1, -1, -1, -1, -1, -1, 292,
- 293, 294, 295, -1, -1, -1, -1, -1, -1, -1,
+ 293, 294, 295, -1, -1, -1, -1, -1, -1, 302,
-1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 319, -1, -1, 322,
323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
8, 9, -1, 11, 12, 13, -1, -1, -1, 17,
- 18, -1, -1, 366, -1, 368, 24, 25, 26, 27,
+ 18, -1, -1, -1, -1, 368, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
@@ -5943,27 +5983,27 @@ static const yytype_int16 yycheck[] =
63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
- 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 106, -1, -1, -1, 110, 111, 112,
+ 93, 94, 95, 96, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 112,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 144, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 150, 151, -1,
-1, 154, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 169, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 186, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 187, -1, -1, -1, -1, -1,
-1, -1, -1, 196, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 224, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 241, -1,
- -1, -1, -1, -1, -1, -1, -1, 250, -1, -1,
- 253, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 245, -1, -1, -1, 249, -1, -1, 252,
+ 253, -1, -1, -1, -1, -1, -1, -1, -1, 262,
-1, -1, -1, 266, -1, -1, -1, -1, -1, 272,
- -1, 274, 275, -1, 277, 278, 279, -1, -1, 282,
+ -1, 274, 275, -1, -1, 278, 279, -1, -1, 282,
283, -1, -1, -1, -1, -1, -1, -1, -1, 292,
- 293, 294, 295, -1, -1, -1, -1, -1, -1, 302,
+ 293, 294, 295, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 319, -1, -1, 322,
323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
@@ -5977,28 +6017,28 @@ static const yytype_int16 yycheck[] =
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
- -1, -1, -1, -1, 92, 93, 94, 95, 96, -1,
+ -1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 112, -1, -1, -1, -1, -1,
+ -1, -1, 110, 111, 112, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 150, 151, -1, -1, 154, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 187,
+ -1, -1, -1, -1, -1, -1, -1, -1, 186, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 224, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 241, -1, -1, -1, 245, -1, -1,
- -1, 249, -1, -1, 252, 253, -1, -1, -1, -1,
- -1, -1, -1, -1, 262, -1, -1, -1, 266, -1,
- -1, -1, -1, -1, 272, -1, 274, 275, -1, -1,
+ -1, -1, -1, 241, -1, -1, -1, -1, -1, -1,
+ -1, -1, 250, -1, -1, 253, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 266, -1,
+ -1, -1, -1, -1, 272, -1, 274, 275, -1, 277,
278, 279, -1, -1, 282, 283, -1, -1, -1, -1,
-1, -1, -1, -1, 292, 293, 294, 295, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
+ -1, -1, -1, -1, 302, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 319, -1, -1, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
@@ -6047,19 +6087,19 @@ static const yytype_int16 yycheck[] =
68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
-1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 106, -1,
-1, -1, 110, 111, 112, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 133, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 144, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 186, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 224, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 241, -1, -1, -1, -1, -1, -1,
-1, -1, 250, -1, -1, 253, -1, -1, -1, -1,
@@ -6067,7 +6107,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, 272, -1, 274, 275, -1, 277,
278, 279, -1, -1, 282, 283, -1, -1, -1, -1,
-1, -1, -1, -1, 292, 293, 294, 295, -1, -1,
- -1, -1, -1, -1, 302, -1, -1, 305, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 319, -1, -1, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
@@ -6116,16 +6156,16 @@ static const yytype_int16 yycheck[] =
68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
-1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 106, -1,
- -1, -1, 110, 111, 112, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 133, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 144, -1, -1, -1,
+ -1, -1, 110, 111, 112, -1, -1, 115, 116, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
+ -1, 189, -1, -1, -1, -1, -1, -1, 196, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -6142,7 +6182,7 @@ static const yytype_int16 yycheck[] =
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
3, 4, 5, 6, 7, 8, 9, -1, 11, 12,
- 13, -1, -1, -1, 17, 18, -1, -1, -1, -1,
+ 13, -1, -1, -1, 17, 18, -1, 20, -1, -1,
368, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
@@ -6152,14 +6192,14 @@ static const yytype_int16 yycheck[] =
83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 110, 111, 112,
- -1, -1, 115, 116, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 132,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 154, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 169, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 189, -1, -1, -1,
+ -1, 184, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 196, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -6177,7 +6217,7 @@ static const yytype_int16 yycheck[] =
333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
8, 9, -1, 11, 12, 13, -1, -1, -1, 17,
- 18, -1, 20, -1, -1, 368, 24, 25, 26, 27,
+ 18, -1, -1, -1, -1, 368, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
@@ -6188,22 +6228,22 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 110, 111, 112, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 132, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 184, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 241, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 241, -1, -1, -1, -1, -1, 247,
-1, -1, 250, -1, -1, 253, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 266, -1,
-1, -1, -1, -1, 272, -1, 274, 275, -1, 277,
- 278, 279, -1, -1, 282, 283, -1, -1, -1, -1,
+ 278, 279, 280, -1, 282, 283, -1, -1, -1, -1,
-1, -1, -1, -1, 292, 293, 294, 295, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -6221,9 +6261,9 @@ static const yytype_int16 yycheck[] =
83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 110, 111, 112,
+ -1, -1, 115, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 140, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 154, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 169, -1, -1, -1,
@@ -6234,10 +6274,10 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 241, -1,
- -1, -1, -1, -1, 247, -1, -1, 250, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 250, -1, -1,
253, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 266, -1, -1, -1, -1, -1, 272,
- -1, 274, 275, -1, 277, 278, 279, 280, -1, 282,
+ -1, 274, 275, -1, 277, 278, 279, -1, -1, 282,
283, -1, -1, -1, -1, -1, -1, -1, -1, 292,
293, 294, 295, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
@@ -6254,11 +6294,11 @@ static const yytype_int16 yycheck[] =
68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
-1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 110, 111, 112, -1, -1, 115, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 106, -1,
+ -1, -1, 110, 111, 112, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 140, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 144, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -6279,8 +6319,8 @@ static const yytype_int16 yycheck[] =
-1, 319, -1, -1, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3, 4, 5, 6, 7, 8, 9, -1, 11, 12,
- 13, -1, -1, -1, 17, 18, -1, -1, -1, -1,
+ 3, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 14, -1, -1, 17, -1, -1, -1, -1, -1,
368, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
@@ -6289,33 +6329,33 @@ static const yytype_int16 yycheck[] =
73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 106, -1, -1, -1, 110, 111, 112,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 144, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 154, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 169, -1, -1, -1,
+ -1, -1, -1, -1, 117, -1, -1, -1, -1, -1,
+ -1, -1, -1, 126, -1, 128, -1, -1, 131, -1,
+ -1, -1, -1, -1, -1, 138, -1, -1, -1, 142,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 152,
+ -1, 154, -1, -1, -1, -1, -1, -1, 161, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 196, -1, -1, -1, -1, -1, -1,
+ 183, -1, -1, 186, 187, -1, -1, -1, -1, -1,
+ -1, -1, 195, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 224, 225, 226, 227, -1, 229, 230, 231, -1,
+ 233, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 241, -1,
- -1, -1, -1, -1, -1, -1, -1, 250, -1, -1,
253, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 266, -1, -1, -1, -1, -1, 272,
- -1, 274, 275, -1, 277, 278, 279, -1, -1, 282,
- 283, -1, -1, -1, -1, -1, -1, -1, -1, 292,
- 293, 294, 295, -1, -1, -1, -1, -1, -1, -1,
+ 263, -1, -1, 266, -1, -1, -1, -1, -1, 272,
+ -1, 274, 275, -1, -1, -1, -1, -1, -1, 282,
+ 283, -1, -1, -1, -1, -1, -1, -1, 291, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 302,
-1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 319, -1, -1, 322,
+ -1, -1, -1, 316, -1, -1, 319, -1, -1, 322,
323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 3, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 14, -1, -1, 17,
- -1, -1, -1, -1, -1, 368, 24, 25, 26, 27,
+ -1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
+ 8, 9, -1, 11, 12, 13, -1, -1, -1, 17,
+ 18, -1, -1, -1, -1, 368, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
@@ -6324,32 +6364,32 @@ static const yytype_int16 yycheck[] =
78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
-1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 117,
- -1, -1, -1, -1, -1, -1, -1, -1, 126, -1,
- 128, -1, -1, 131, -1, -1, -1, -1, -1, -1,
- 138, -1, -1, -1, 142, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 152, -1, 154, -1, -1, -1,
- -1, -1, -1, 161, -1, -1, -1, -1, -1, -1,
+ -1, -1, 110, 111, 112, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 122, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 183, -1, -1, 186, 187,
- -1, -1, -1, -1, -1, -1, -1, 195, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 224, 225, 226, 227,
- -1, 229, 230, 231, -1, 233, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 241, -1, -1, -1, -1, -1, -1,
+ -1, -1, 250, -1, -1, 253, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 266, -1,
+ -1, -1, -1, -1, 272, -1, 274, 275, -1, 277,
+ 278, 279, -1, -1, 282, 283, -1, -1, -1, -1,
+ -1, -1, -1, -1, 292, 293, 294, 295, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 253, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 263, -1, -1, 266, -1,
- -1, -1, -1, -1, 272, -1, 274, 275, -1, -1,
- -1, -1, -1, -1, 282, 283, -1, -1, -1, -1,
- -1, -1, -1, 291, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 302, -1, -1, 305, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 316, -1,
-1, 319, -1, -1, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
3, 4, 5, 6, 7, 8, 9, -1, 11, 12,
- 13, -1, -1, -1, 17, 18, -1, -1, -1, -1,
+ 13, -1, -1, -1, 17, 18, -1, 20, -1, -1,
368, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
@@ -6359,7 +6399,7 @@ static const yytype_int16 yycheck[] =
83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 110, 111, 112,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 122,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -6384,7 +6424,7 @@ static const yytype_int16 yycheck[] =
333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
8, 9, -1, 11, 12, 13, -1, -1, -1, 17,
- 18, -1, 20, -1, -1, 368, 24, 25, 26, 27,
+ 18, -1, -1, -1, -1, 368, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
@@ -6418,7 +6458,7 @@ static const yytype_int16 yycheck[] =
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
3, 4, 5, 6, 7, 8, 9, -1, 11, 12,
- 13, -1, -1, -1, 17, 18, -1, -1, -1, -1,
+ 13, -1, -1, -1, 17, 18, -1, -1, -1, 367,
368, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
@@ -6433,7 +6473,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 154, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 169, -1, -1, -1,
+ 163, -1, -1, -1, -1, -1, 169, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 196, -1, -1, -1, -1, -1, -1,
@@ -6453,7 +6493,7 @@ static const yytype_int16 yycheck[] =
333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
8, 9, -1, 11, 12, 13, -1, -1, -1, 17,
- 18, -1, -1, -1, 367, 368, 24, 25, 26, 27,
+ 18, -1, -1, -1, -1, 368, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
@@ -6467,7 +6507,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
- -1, -1, -1, -1, -1, 163, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
@@ -6496,26 +6536,26 @@ static const yytype_int16 yycheck[] =
73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 110, 111, 112,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 112,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 136, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 154, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 169, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 186, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 196, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 224, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 241, -1,
- -1, -1, -1, -1, -1, -1, -1, 250, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
253, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 266, -1, -1, -1, -1, -1, 272,
- -1, 274, 275, -1, 277, 278, 279, -1, -1, 282,
+ -1, 274, 275, -1, -1, 278, 279, -1, -1, 282,
283, -1, -1, -1, -1, -1, -1, -1, -1, 292,
- 293, 294, 295, -1, -1, -1, -1, -1, -1, -1,
+ 293, 294, 295, -1, -1, -1, -1, -1, -1, 302,
-1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 319, -1, -1, 322,
323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
@@ -6538,7 +6578,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 186, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -6550,7 +6590,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, 272, -1, 274, 275, -1, -1,
278, 279, -1, -1, 282, 283, -1, -1, -1, -1,
-1, -1, -1, -1, 292, 293, 294, 295, -1, -1,
- -1, -1, -1, -1, 302, -1, -1, 305, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 319, -1, -1, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
@@ -6568,7 +6608,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, 112,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 136, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 154, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 169, -1, -1, -1,
@@ -6611,7 +6651,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 224, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 241, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 253, -1, -1, -1, -1,
@@ -6658,146 +6698,146 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, 319, -1, -1, 322,
323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 3, 4, 5, 6, 7,
- 8, 9, -1, 11, 12, 13, -1, -1, -1, 17,
- 18, -1, -1, -1, -1, 368, 24, 25, 26, 27,
+ -1, -1, -1, -1, -1, 3, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 17,
+ -1, -1, -1, -1, -1, 368, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
- -1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 112, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 3, -1, -1, -1, 92, 93, 94, 95, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 154, -1, -1, -1,
+ -1, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 154, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
+ 93, 94, 95, -1, -1, -1, -1, -1, 186, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 169, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 196, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 241, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 253, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 266, -1,
- -1, -1, -1, -1, 272, -1, 274, 275, -1, -1,
- 278, 279, -1, -1, 282, 283, -1, -1, -1, -1,
- -1, -1, -1, -1, 292, 293, 294, 295, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
+ -1, -1, -1, 186, 272, -1, 274, 275, -1, -1,
+ -1, -1, -1, -1, 282, 283, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 302, -1, -1, 305, -1, -1,
+ -1, 224, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 319, -1, -1, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 17, -1, -1, -1, -1, -1,
- 368, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, -1, -1, 3, -1, -1, -1, 92,
- 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 24, 25, 26, 27,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 272,
+ -1, -1, -1, 276, -1, -1, -1, -1, -1, -1,
+ 368, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 302,
+ -1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 325, 326, 327, 328, 329, 330, 331, 332,
+ 333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 368, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 154, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
+ 68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 3, -1,
-1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
- -1, -1, -1, 186, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ 95, -1, -1, -1, -1, -1, -1, -1, 186, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 224, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 253, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 266, -1, -1, -1, -1, 186, 272,
- -1, 274, 275, -1, -1, -1, -1, -1, -1, 282,
- 283, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 302,
- -1, -1, 305, -1, -1, -1, 224, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 319, -1, -1, 322,
- 323, 324, 325, 326, 327, 328, 329, 330, 331, 332,
- 333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 272, -1, -1, -1, 276, -1,
- -1, -1, -1, -1, -1, 368, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 302, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 266, -1, -1, -1, -1, -1, 272, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 282, 283, -1,
+ 368, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 368, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, 3, -1, -1, -1, -1, -1, 92,
- 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 24, 25, 26, 27, 28, 29,
+ 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 368, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
+ 80, 81, 82, 83, 84, 85, 3, -1, -1, -1,
-1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
- -1, -1, -1, 186, -1, -1, -1, -1, -1, -1,
+ -1, 101, -1, -1, -1, -1, -1, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, -1, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, -1,
+ -1, -1, 3, -1, -1, 92, 93, 94, 95, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 192, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, -1, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, -1, -1, -1, -1, -1,
+ -1, 92, 93, 94, 95, -1, -1, -1, -1, -1,
+ -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 224, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
+ 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 272, -1, -1, -1, 276,
+ -1, -1, -1, -1, -1, -1, -1, -1, 368, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 272,
- -1, -1, -1, 276, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 302,
- -1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 325, 326,
+ 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
+ 337, 338, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 325, 326, 327, 328, 329, 330, 331, 332,
- 333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 266, -1, -1, -1,
- -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 282, 283, -1, 368, -1, -1, -1, -1,
+ -1, 272, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 368, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
+ -1, -1, -1, -1, 305, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 3, -1,
+ -1, -1, -1, -1, 325, 326, 327, 328, 329, 330,
+ 331, 332, 333, 334, 335, 336, 337, 338, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 3, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 368, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 3, -1, -1, -1, -1, -1, 92, 93, 94,
- 95, -1, -1, -1, -1, -1, 101, -1, -1, -1,
- -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, -1, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, -1, -1, -1, 3, -1, -1,
- 92, 93, 94, 95, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 192, 24, 25,
+ -1, -1, -1, -1, -1, -1, -1, 368, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
@@ -6805,34 +6845,31 @@ static const yytype_int16 yycheck[] =
66, 67, 68, -1, 70, 71, 72, 73, 74, 75,
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
-1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
- -1, -1, -1, -1, -1, -1, -1, 272, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 116, -1, -1, -1, -1, 121, -1, -1, -1, 125,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 135,
+ -1, -1, -1, -1, -1, 141, -1, -1, -1, -1,
+ 146, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 162, -1, -1, -1,
+ -1, -1, -1, -1, 170, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 180, -1, -1, -1, -1, -1,
+ -1, -1, 188, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 211, 212, 213, 214, -1,
+ -1, -1, -1, 219, 220, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 272, -1, -1, -1, 276, -1, -1, -1, -1, -1,
- -1, -1, -1, 368, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
- 332, 333, 334, 335, 336, 337, 338, -1, -1, -1,
+ -1, 267, 268, 269, 270, -1, 272, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 368, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 325,
+ -1, -1, -1, -1, -1, -1, 312, 313, -1, -1,
+ -1, -1, 3, -1, -1, -1, -1, -1, -1, 325,
326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
- 336, 337, 338, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 3, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 368, 24, 25, 26, 27, 28, 29, 30,
+ 336, 337, 338, 24, 25, 26, 27, 28, 29, 30,
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
@@ -6861,92 +6898,79 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 305, -1, -1, -1, -1, -1,
- -1, 312, 313, -1, -1, -1, -1, 3, -1, -1,
+ -1, 312, 313, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 325, 326, 327, 328, 329, 330,
- 331, 332, 333, 334, 335, 336, 337, 338, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, -1, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- -1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 116, -1, -1, -1, -1, 121, -1, -1, -1, 125,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 135,
- -1, -1, -1, -1, -1, 141, -1, -1, -1, -1,
- 146, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 162, -1, -1, -1,
- -1, -1, -1, -1, 170, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 180, -1, -1, -1, -1, -1,
- -1, -1, 188, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 211, 212, 213, 214, -1,
- -1, -1, -1, 219, 220, -1, -1, -1, -1, -1,
+ 331, 332, 333, 334, 335, 336, 337, 338, 3, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 17, -1, -1, -1, -1, -1, -1, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 3,
+ 4, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 154,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, -1, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, -1, -1, -1, -1, -1, -1, 92, 93,
+ 94, 95, -1, -1, -1, -1, -1, 101, -1, -1,
+ -1, -1, -1, -1, -1, 109, 110, 111, 112, 113,
+ -1, -1, -1, -1, -1, -1, -1, -1, 253, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 267, 268, 269, 270, -1, 272, -1, -1, -1,
+ -1, 266, -1, -1, -1, -1, -1, 272, -1, 274,
+ 275, -1, -1, -1, -1, -1, -1, 282, 283, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
- -1, -1, -1, -1, -1, -1, 312, 313, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 325,
- 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
- 336, 337, 338, 3, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 17, -1, -1,
- -1, -1, -1, -1, 24, 25, 26, 27, 28, 29,
+ 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3, 319, -1, -1, 322, 323, 324,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
+ 80, 81, 82, 83, 84, 85, -1, -1, 272, -1,
-1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 3, 4, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 154, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- -1, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, -1, -1, -1,
- -1, -1, -1, 92, 93, 94, 95, -1, -1, -1,
- -1, -1, 101, -1, -1, -1, -1, -1, -1, -1,
- 109, 110, 111, 112, 113, -1, -1, -1, -1, -1,
- -1, -1, -1, 253, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 266, -1, -1, -1,
- -1, -1, 272, -1, 274, 275, -1, -1, -1, -1,
- -1, -1, 282, 283, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 3, 319,
- -1, -1, 322, 323, 324, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, 24,
+ -1, -1, -1, -1, -1, 115, -1, -1, -1, -1,
+ -1, 305, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 138, -1,
+ -1, 325, 326, 327, 328, 329, 330, 331, 332, 333,
+ 334, 335, 336, 337, 338, -1, -1, -1, -1, -1,
+ -1, 161, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 179,
+ -1, 181, -1, -1, -1, -1, 186, -1, 3, -1,
+ -1, -1, -1, -1, -1, 195, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 208, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, -1, -1, 272, -1, -1, -1, 92, 93, 94,
+ 85, 271, 272, -1, -1, -1, -1, 92, 93, 94,
95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 115, -1, -1, -1, -1, -1, 305, -1, -1, -1,
+ 115, -1, -1, -1, -1, 305, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 138, -1, -1, 325, 326, 327, 328,
- 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
+ -1, -1, -1, 138, -1, 325, 326, 327, 328, 329,
+ 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
-1, -1, -1, -1, -1, -1, 161, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 179, -1, 181, -1, -1, -1,
-1, 186, -1, 3, -1, -1, -1, -1, -1, -1,
- 195, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 195, -1, -1, -1, -1, -1, -1, 17, -1, -1,
-1, -1, -1, 208, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
@@ -6956,63 +6980,76 @@ static const yytype_int16 yycheck[] =
80, 81, 82, 83, 84, 85, 271, 272, -1, -1,
-1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 115, -1, -1, -1, -1,
- 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 138, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 305, -1, -1, -1, -1, 125, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
- -1, 161, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 179,
- -1, 181, -1, -1, -1, -1, 186, -1, 3, -1,
- -1, -1, -1, -1, -1, 195, -1, -1, -1, -1,
- -1, -1, 17, -1, -1, -1, -1, -1, 208, 24,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 196, -1, -1, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 271, 272, -1, -1, -1, -1, 92, 93, 94,
- 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 85, -1, -1, -1, -1, -1, 266, 92, 93, 94,
+ 95, -1, 272, -1, -1, -1, -1, -1, 278, -1,
+ -1, -1, 282, 283, -1, -1, -1, -1, -1, -1,
+ -1, 116, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
- 125, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 319,
-1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 196, -1, -1, 24, 25, 26, 27, 28, 29,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 3, -1, -1, -1, -1, 211, 212, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 272, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, -1, -1, -1, -1, -1, -1,
+ 92, 93, 94, 95, -1, -1, 301, -1, -1, -1,
+ 305, -1, -1, -1, -1, -1, -1, -1, 313, -1,
+ -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
- -1, 266, 92, 93, 94, 95, -1, 272, -1, -1,
- -1, -1, -1, 278, -1, -1, -1, 282, 283, -1,
- -1, -1, -1, -1, -1, -1, 116, -1, -1, -1,
+ -1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 319, -1, -1, -1, -1, -1,
- 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 3, -1, -1, -1,
- -1, 211, 212, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 272, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, -1,
- -1, 301, -1, -1, -1, 305, -1, -1, -1, -1,
- -1, -1, -1, 313, -1, -1, -1, -1, 3, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 266, -1, -1, -1, -1, -1,
+ 272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 282, 283, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 305, -1, -1, 196, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
+ 332, 333, 334, 335, 336, 337, 338, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 264, -1, -1, -1, -1, -1,
+ -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, -1,
-1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
330, 331, 332, 333, 334, 335, 336, 337, 338, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
@@ -7021,84 +7058,158 @@ static const yytype_int16 yycheck[] =
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, -1, -1, -1, -1, -1, -1, 92, 93, 94,
- 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 85, 3, -1, -1, -1, -1, -1, 92, 93, 94,
+ 95, -1, -1, -1, -1, -1, 101, -1, -1, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, -1, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, -1, -1, -1, -1, -1, -1,
+ 92, 93, 94, 95, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 192, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 3, 4, -1, -1, -1, -1, 129, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 20, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 272, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, -1, -1, 208, -1, -1, -1,
+ 92, 93, 94, 95, -1, -1, -1, -1, -1, -1,
+ 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 266,
- -1, -1, -1, -1, -1, 272, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 282, 283, -1, -1, -1,
+ -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
- -1, 196, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 325, 326,
- 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
- 337, 338, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
+ 332, 333, 334, 335, 336, 337, 338, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 264,
- -1, -1, -1, -1, -1, -1, -1, 272, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
- 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- 335, 336, 337, 338, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 3, -1, -1, -1,
- -1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
- -1, 101, -1, -1, -1, -1, -1, 24, 25, 26,
+ 272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 3, -1, -1, -1,
+ -1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
+ 332, 333, 334, 335, 336, 337, 338, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
67, 68, -1, 70, 71, 72, 73, 74, 75, 76,
77, 78, 79, 80, 81, 82, 83, 84, 85, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, -1,
+ -1, -1, -1, -1, -1, 92, 93, 94, 95, 3,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 192, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 3, 4, -1, -1,
- -1, -1, 129, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 20, -1, -1, -1, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 272, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, -1,
- -1, 208, -1, -1, -1, 92, 93, 94, 95, -1,
- -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 112, -1, -1, -1, -1,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, -1, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 3, -1, -1, -1, -1, -1, 92, 93,
+ 94, 95, -1, 97, -1, -1, -1, 101, -1, -1,
+ -1, -1, -1, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, -1, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, -1, -1, -1, -1, -1,
+ -1, 92, 93, 94, 95, 272, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 272, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 305, 130,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 319, -1, -1, -1, -1, -1, 325, 326,
+ 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
+ 337, 338, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 272, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 305, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 325, 326, 327, 328, 329, 330, 331, 332, 333,
+ 334, 335, 336, 337, 338, -1, -1, -1, -1, -1,
+ 261, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 272, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 305, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 3, -1, -1,
+ -1, -1, -1, -1, 325, 326, 327, 328, 329, 330,
+ 331, 332, 333, 334, 335, 336, 337, 338, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, -1, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 3, -1, -1, -1, -1, -1, 92, 93, 94, 95,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 3, -1, -1, -1, -1, -1, 92,
+ 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
+ -1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 325, 326,
- 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
- 337, 338, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 317, -1, 153, -1, -1, -1, -1, -1, 325,
+ 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
+ 336, 337, 338, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 266, -1, -1, -1, -1, -1, 272,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 272, -1, -1, -1, -1,
+ -1, -1, 325, 326, 327, 328, 329, 330, 331, 332,
+ 333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 3, -1, -1, -1, -1, -1, -1, 325, 326,
- 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
- 337, 338, 24, 25, 26, 27, 28, 29, 30, 31,
+ -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, -1,
+ -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
+ 330, 331, 332, 333, 334, 335, 336, 337, 338, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, 3, -1, -1, -1, -1, -1, 92, 93, 94,
+ 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
@@ -7113,21 +7224,21 @@ static const yytype_int16 yycheck[] =
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
-1, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 3, -1, -1,
- -1, -1, -1, 92, 93, 94, 95, -1, 97, -1,
- -1, -1, 101, -1, -1, -1, -1, -1, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, -1, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- -1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
+ 79, 80, 81, 82, 83, 84, 85, -1, -1, -1,
+ -1, 266, -1, 92, 93, 94, 95, 272, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
+ 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 305, 130, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 319, -1, -1,
+ -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
332, 333, 334, 335, 336, 337, 338, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -7136,230 +7247,156 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 305, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 325, 326, 327, 328,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 3,
+ 319, -1, -1, -1, -1, -1, 325, 326, 327, 328,
329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
- -1, -1, -1, -1, -1, 261, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 3, -1, -1, -1, -1, -1, -1, 325,
- 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
- 336, 337, 338, 24, 25, 26, 27, 28, 29, 30,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, -1, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 3, -1, -1, -1, -1, -1, 92, 93,
+ 94, 95, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 24, 25, 26, 27, 28, 29, 30,
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
61, 62, 63, 64, 65, 66, 67, 68, -1, 70,
71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, 3, -1, -1, -1, -1,
- -1, 92, 93, 94, 95, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 24, 25, 26, 27,
+ 81, 82, 83, 84, 85, -1, -1, -1, -1, -1,
+ -1, 92, 93, 94, 95, 179, -1, -1, -1, -1,
+ 3, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 112, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, -1, -1, -1, -1, -1, 272, 92,
+ 93, 94, 95, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 305, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 325, 326, 327, 328, 329, 330, 331, 332, 333,
+ 334, 335, 336, 337, 338, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 272, -1, 176, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 305, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 325, 326, 327, 328, 329, 330,
+ 331, 332, 333, 334, 335, 336, 337, 338, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 272,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3, -1, -1, -1, -1,
+ -1, -1, 325, 326, 327, 328, 329, 330, 331, 332,
+ 333, 334, 335, 336, 337, 338, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, 3, -1,
- -1, -1, -1, -1, 92, 93, 94, 95, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ 78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
+ -1, -1, -1, -1, 92, 93, 94, 95, 3, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 112, -1, -1, -1, -1, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, -1, -1, -1, -1, -1, -1, 92, 93, 94,
- 95, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 272, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 305, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 317, -1, 153, -1,
- -1, -1, -1, -1, 325, 326, 327, 328, 329, 330,
- 331, 332, 333, 334, 335, 336, 337, 338, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 266, -1,
- -1, -1, -1, -1, 272, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 85, 3, -1, -1, -1, -1, -1, 92, 93, 94,
+ 95, -1, -1, -1, -1, -1, 101, -1, -1, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, -1, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, -1, -1, -1, -1, -1, -1,
+ 92, 93, 94, 95, 272, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 112, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
338, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 272, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- 335, 336, 337, 338, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 3, -1, -1, -1,
- -1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 24, 25, 26,
+ 335, 336, 337, 338, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 3, -1, -1, -1,
+ -1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
+ 332, 333, 334, 335, 336, 337, 338, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
67, 68, -1, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, 3,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 112, -1, -1, -1, -1,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 3,
+ -1, -1, -1, -1, -1, 92, 93, 94, 95, -1,
+ -1, -1, -1, -1, 101, -1, -1, -1, -1, -1,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
64, 65, 66, 67, 68, -1, 70, 71, 72, 73,
74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, 85, -1, -1, -1, -1, 266, -1, 92, 93,
- 94, 95, 272, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 84, 85, 3, -1, -1, -1, -1, -1, 92, 93,
+ 94, 95, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, -1, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, -1, -1, -1, -1, -1,
+ -1, 92, 93, 94, 95, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 272, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 204, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 325, 326,
327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
337, 338, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 272, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 305, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 3, 319, -1, -1, -1, -1,
- -1, 325, 326, 327, 328, 329, 330, 331, 332, 333,
- 334, 335, 336, 337, 338, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- -1, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 3, -1, -1,
- -1, -1, -1, 92, 93, 94, 95, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, -1, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- -1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
- 179, -1, -1, -1, -1, 3, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 112, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, -1, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, -1, -1,
- -1, -1, -1, 272, 92, 93, 94, 95, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 305, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 325, 326, 327, 328,
- 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 272, -1, 176, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 325,
- 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
- 336, 337, 338, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 272, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 305, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3, -1, -1, -1, -1, -1, -1, 325, 326, 327,
- 328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
- 338, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, -1, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, -1, -1, -1, -1, -1, -1, 92,
- 93, 94, 95, 3, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 112,
- -1, -1, -1, -1, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, -1,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 3, -1, -1, -1,
- -1, -1, 92, 93, 94, 95, -1, -1, -1, -1,
- -1, 101, -1, -1, -1, -1, -1, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, -1, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, 272,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 112, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 305, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 325, 326, 327, 328, 329, 330, 331, 332,
- 333, 334, 335, 336, 337, 338, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 305, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 325, 326, 327, 328, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 272, -1, -1, -1, -1,
+ -1, 325, 326, 327, 328, 329, 330, 331, 332, 333,
+ 334, 335, 336, 337, 338, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 272, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 3, -1, -1, -1, -1, -1, -1, 325, 326,
- 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
- 337, 338, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, -1, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 3, -1, -1, -1, -1, -1,
- 92, 93, 94, 95, -1, -1, -1, -1, -1, 101,
- -1, -1, -1, -1, -1, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- -1, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 3, -1, -1,
- -1, -1, -1, 92, 93, 94, 95, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 24, 25,
+ -1, -1, -1, -1, 305, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 3, -1, -1,
+ -1, -1, -1, -1, 325, 326, 327, 328, 329, 330,
+ 331, 332, 333, 334, 335, 336, 337, 338, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
@@ -7368,38 +7405,6 @@ static const yytype_int16 yycheck[] =
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
-1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 204, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 305, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 325, 326, 327, 328, 329, 330, 331,
- 332, 333, 334, 335, 336, 337, 338, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 272, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 305, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 325, 326, 327, 328,
- 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 3, -1, -1, -1, -1, -1, -1, 325,
- 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
- 336, 337, 338, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, -1, 70,
- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, -1, -1, -1, -1, -1,
- -1, 92, 93, 94, 95, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -7416,13 +7421,14 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 272, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 305, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 305,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 325, 326, 327, 328, 329, 330,
- 331, 332, 333, 334, 335, 336, 337, 338
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 325,
+ 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
+ 336, 337, 338
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -7446,235 +7452,236 @@ static const yytype_uint16 yystos[] =
439, 440, 441, 442, 443, 445, 456, 457, 458, 461,
463, 465, 466, 469, 470, 477, 478, 480, 481, 482,
486, 498, 510, 513, 518, 520, 521, 522, 523, 527,
- 528, 578, 582, 618, 619, 622, 625, 665, 667, 677,
- 685, 686, 706, 707, 709, 712, 714, 745, 746, 750,
- 755, 759, 760, 761, 762, 771, 775, 26, 380, 600,
- 368, 253, 178, 192, 242, 626, 202, 24, 33, 34,
- 41, 60, 69, 88, 91, 106, 140, 158, 178, 192,
- 194, 196, 198, 206, 207, 209, 210, 238, 241, 273,
- 301, 315, 317, 327, 328, 404, 405, 406, 626, 731,
- 149, 196, 24, 60, 69, 157, 192, 196, 198, 238,
- 241, 273, 301, 317, 327, 328, 626, 115, 138, 161,
- 179, 181, 186, 195, 208, 271, 272, 380, 433, 434,
- 435, 436, 437, 615, 368, 163, 215, 216, 484, 202,
- 115, 140, 222, 505, 507, 509, 196, 264, 331, 380,
- 317, 600, 604, 253, 266, 380, 518, 582, 4, 616,
- 4, 616, 4, 228, 24, 157, 192, 196, 228, 368,
- 578, 115, 208, 271, 272, 433, 436, 172, 265, 17,
- 125, 196, 266, 278, 282, 283, 319, 380, 578, 380,
- 4, 317, 368, 368, 368, 224, 520, 0, 367, 131,
- 138, 142, 187, 230, 379, 414, 371, 98, 100, 297,
- 517, 368, 102, 371, 251, 368, 16, 4, 5, 6,
- 7, 8, 9, 11, 12, 13, 18, 93, 112, 169,
- 196, 241, 278, 279, 292, 293, 294, 295, 368, 380,
- 565, 566, 568, 569, 570, 572, 575, 576, 582, 586,
- 588, 589, 594, 595, 596, 597, 598, 605, 614, 746,
- 748, 749, 751, 752, 754, 380, 601, 601, 380, 711,
- 26, 176, 238, 301, 471, 615, 169, 198, 380, 603,
- 615, 603, 3, 380, 603, 603, 185, 198, 317, 266,
- 600, 600, 600, 404, 157, 603, 26, 604, 153, 615,
- 380, 710, 238, 615, 380, 600, 615, 600, 600, 600,
- 600, 185, 198, 266, 600, 600, 600, 600, 177, 368,
- 428, 428, 428, 172, 172, 172, 172, 370, 193, 370,
- 380, 605, 604, 506, 298, 110, 111, 122, 250, 277,
- 368, 532, 567, 568, 569, 574, 583, 585, 605, 660,
- 662, 708, 746, 748, 751, 153, 380, 332, 107, 172,
- 265, 600, 101, 192, 380, 493, 187, 371, 4, 616,
- 380, 709, 3, 600, 153, 616, 567, 368, 177, 172,
- 172, 172, 172, 149, 368, 368, 368, 368, 368, 368,
- 368, 368, 368, 251, 368, 266, 3, 567, 567, 369,
- 192, 319, 371, 380, 753, 115, 296, 526, 115, 526,
- 99, 380, 567, 574, 579, 580, 581, 584, 380, 753,
- 371, 380, 567, 577, 584, 370, 368, 171, 578, 368,
- 247, 280, 567, 590, 593, 368, 368, 368, 709, 224,
- 368, 518, 567, 568, 605, 371, 372, 661, 371, 661,
- 160, 614, 368, 371, 176, 444, 368, 628, 371, 208,
- 716, 600, 165, 172, 157, 603, 371, 101, 368, 425,
- 137, 770, 235, 236, 237, 680, 628, 250, 4, 603,
- 600, 96, 149, 101, 149, 380, 612, 628, 753, 200,
- 516, 549, 615, 124, 371, 124, 182, 417, 172, 409,
- 600, 124, 4, 600, 96, 201, 462, 193, 380, 402,
- 611, 710, 578, 4, 604, 435, 436, 437, 371, 369,
- 157, 485, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 503, 504, 7, 368, 567,
- 567, 368, 530, 531, 380, 4, 568, 605, 149, 533,
- 534, 535, 536, 4, 101, 109, 110, 111, 112, 113,
- 380, 371, 370, 661, 108, 368, 615, 380, 333, 567,
- 101, 464, 380, 174, 493, 511, 512, 611, 371, 380,
- 370, 617, 371, 142, 231, 756, 172, 142, 231, 232,
- 234, 416, 615, 369, 581, 710, 578, 4, 604, 436,
- 16, 577, 577, 577, 567, 577, 577, 3, 567, 577,
- 577, 96, 149, 369, 369, 97, 452, 600, 380, 753,
- 371, 526, 123, 368, 522, 523, 524, 525, 526, 522,
- 525, 115, 526, 320, 370, 370, 369, 370, 368, 380,
- 371, 369, 370, 567, 115, 140, 567, 94, 95, 116,
- 121, 125, 135, 141, 146, 162, 170, 180, 188, 211,
- 212, 213, 214, 219, 220, 267, 268, 269, 270, 301,
- 312, 313, 606, 607, 368, 607, 567, 106, 144, 368,
- 553, 554, 555, 556, 557, 558, 560, 561, 562, 564,
- 567, 247, 280, 591, 592, 251, 593, 584, 567, 567,
- 368, 518, 224, 518, 369, 369, 370, 101, 101, 112,
- 371, 380, 747, 748, 567, 372, 753, 614, 581, 371,
- 380, 165, 101, 446, 62, 156, 243, 369, 629, 630,
- 631, 254, 627, 371, 380, 709, 166, 310, 715, 628,
- 87, 600, 172, 101, 371, 380, 518, 519, 524, 129,
- 208, 384, 385, 386, 400, 401, 611, 368, 423, 427,
- 153, 768, 769, 171, 138, 161, 195, 681, 627, 623,
- 624, 626, 101, 101, 600, 600, 567, 567, 172, 627,
- 628, 133, 553, 174, 492, 615, 371, 380, 600, 600,
- 138, 437, 371, 369, 370, 193, 193, 193, 193, 201,
- 430, 371, 380, 3, 492, 3, 368, 368, 7, 368,
- 502, 502, 7, 7, 503, 201, 370, 508, 567, 585,
- 530, 93, 583, 586, 587, 251, 101, 101, 276, 368,
- 537, 541, 546, 547, 600, 604, 200, 516, 4, 20,
- 380, 573, 567, 567, 567, 567, 567, 753, 567, 574,
- 108, 567, 581, 615, 334, 337, 338, 666, 315, 493,
- 368, 200, 370, 516, 107, 380, 371, 4, 371, 380,
- 34, 72, 731, 735, 36, 72, 735, 736, 600, 91,
- 411, 411, 603, 411, 129, 400, 418, 615, 368, 369,
- 149, 149, 149, 149, 370, 369, 369, 369, 370, 369,
- 369, 149, 156, 369, 369, 600, 567, 123, 142, 231,
- 234, 371, 380, 753, 522, 525, 368, 224, 522, 525,
- 526, 522, 525, 567, 380, 567, 574, 567, 579, 580,
- 581, 380, 251, 567, 370, 567, 567, 369, 368, 368,
- 368, 175, 368, 368, 368, 368, 368, 211, 212, 313,
- 368, 368, 368, 581, 370, 553, 368, 566, 368, 553,
- 567, 104, 105, 246, 106, 107, 120, 156, 164, 168,
- 567, 567, 251, 592, 369, 101, 370, 581, 369, 518,
- 584, 709, 709, 380, 371, 373, 567, 368, 369, 380,
- 371, 368, 603, 149, 369, 370, 605, 607, 609, 709,
- 73, 74, 75, 76, 78, 79, 80, 83, 636, 637,
- 380, 371, 38, 52, 53, 54, 55, 56, 57, 58,
- 61, 71, 742, 743, 59, 713, 254, 744, 368, 468,
- 600, 600, 380, 371, 201, 203, 381, 380, 600, 369,
- 370, 126, 147, 153, 176, 194, 125, 211, 214, 606,
- 610, 709, 402, 101, 368, 370, 427, 172, 149, 367,
- 251, 623, 380, 372, 705, 4, 4, 459, 201, 757,
- 757, 600, 637, 627, 171, 368, 380, 371, 468, 380,
- 611, 436, 436, 436, 436, 68, 380, 371, 428, 567,
- 567, 7, 501, 300, 7, 111, 369, 370, 200, 369,
- 251, 709, 709, 541, 547, 368, 520, 547, 370, 282,
- 283, 284, 286, 287, 288, 543, 545, 368, 153, 550,
- 23, 607, 368, 567, 369, 335, 336, 334, 3, 41,
- 97, 100, 116, 157, 159, 163, 201, 204, 217, 218,
- 221, 223, 255, 490, 491, 133, 512, 492, 567, 380,
- 380, 371, 26, 380, 26, 417, 735, 380, 723, 35,
- 737, 307, 413, 611, 386, 412, 386, 380, 581, 436,
- 436, 436, 436, 567, 251, 251, 251, 3, 251, 251,
- 567, 567, 251, 251, 369, 453, 454, 567, 573, 753,
- 371, 402, 518, 522, 525, 320, 369, 567, 369, 369,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 369, 567, 369, 553, 553, 567, 120, 156, 168,
- 115, 116, 189, 563, 567, 567, 368, 566, 106, 169,
- 567, 246, 607, 567, 369, 369, 369, 369, 371, 112,
- 371, 380, 747, 373, 581, 380, 402, 598, 630, 609,
- 204, 608, 368, 4, 446, 380, 310, 4, 101, 717,
- 711, 96, 611, 368, 368, 380, 44, 44, 91, 140,
- 382, 385, 368, 165, 406, 165, 368, 368, 368, 116,
- 301, 709, 394, 369, 224, 422, 519, 3, 764, 765,
- 768, 600, 380, 602, 367, 628, 3, 703, 704, 186,
- 250, 529, 696, 200, 460, 325, 201, 758, 758, 368,
- 166, 250, 642, 637, 380, 613, 491, 380, 371, 201,
- 432, 432, 432, 174, 371, 380, 197, 487, 529, 369,
- 369, 369, 370, 508, 7, 508, 567, 553, 369, 369,
- 251, 520, 369, 369, 541, 285, 544, 544, 544, 543,
- 290, 402, 540, 123, 155, 551, 19, 21, 22, 581,
- 7, 209, 97, 60, 176, 380, 567, 4, 144, 106,
- 369, 370, 171, 380, 753, 417, 753, 609, 101, 40,
- 41, 42, 43, 49, 51, 66, 106, 166, 254, 310,
- 739, 740, 741, 209, 774, 370, 370, 417, 369, 370,
- 369, 369, 369, 370, 118, 139, 455, 455, 753, 369,
- 369, 567, 369, 369, 369, 369, 370, 369, 369, 370,
- 369, 369, 369, 369, 369, 369, 369, 567, 368, 566,
- 567, 566, 105, 584, 169, 143, 250, 559, 567, 311,
- 571, 369, 371, 371, 112, 380, 380, 371, 369, 369,
- 196, 447, 108, 137, 637, 372, 636, 81, 82, 633,
- 149, 59, 166, 368, 718, 25, 35, 70, 78, 87,
- 106, 293, 330, 726, 727, 728, 709, 369, 611, 540,
- 91, 553, 368, 368, 368, 402, 7, 7, 41, 106,
- 126, 137, 169, 176, 181, 194, 201, 281, 306, 311,
- 318, 393, 396, 398, 518, 201, 426, 369, 370, 97,
- 678, 371, 370, 627, 107, 373, 703, 509, 600, 694,
- 697, 3, 693, 4, 107, 326, 403, 611, 742, 643,
- 96, 492, 369, 380, 152, 380, 371, 368, 7, 508,
- 369, 369, 371, 371, 369, 101, 380, 368, 542, 566,
- 604, 369, 132, 184, 453, 553, 452, 22, 369, 165,
- 165, 218, 490, 613, 368, 732, 732, 181, 724, 31,
- 32, 38, 38, 38, 38, 172, 37, 40, 743, 169,
- 24, 59, 67, 741, 3, 368, 773, 611, 386, 567,
- 251, 251, 251, 454, 452, 7, 7, 105, 584, 559,
- 567, 369, 587, 143, 600, 369, 753, 753, 371, 371,
- 112, 380, 567, 106, 448, 4, 5, 6, 7, 9,
- 18, 110, 111, 169, 599, 599, 7, 108, 62, 156,
- 243, 62, 156, 243, 598, 4, 743, 719, 723, 101,
- 4, 149, 164, 289, 25, 368, 729, 730, 736, 728,
- 642, 369, 369, 369, 402, 403, 403, 369, 369, 369,
- 306, 169, 368, 599, 165, 600, 185, 368, 60, 116,
- 600, 123, 126, 155, 764, 7, 239, 682, 371, 380,
- 602, 637, 3, 4, 702, 532, 380, 251, 370, 179,
- 701, 329, 330, 369, 370, 455, 310, 136, 199, 451,
- 642, 644, 645, 646, 651, 652, 656, 709, 371, 174,
- 380, 488, 489, 567, 508, 753, 753, 380, 546, 172,
- 289, 548, 101, 380, 368, 539, 368, 368, 96, 552,
- 144, 492, 369, 631, 632, 733, 734, 89, 738, 254,
- 86, 137, 725, 35, 44, 44, 169, 38, 39, 172,
- 4, 4, 59, 3, 772, 773, 369, 369, 369, 567,
- 369, 587, 368, 368, 753, 380, 753, 371, 264, 186,
- 63, 449, 7, 9, 7, 9, 637, 637, 373, 4,
- 369, 370, 87, 368, 28, 609, 30, 87, 370, 201,
- 472, 368, 369, 369, 369, 553, 427, 368, 399, 92,
- 305, 395, 397, 611, 174, 368, 766, 767, 240, 295,
- 683, 684, 642, 679, 380, 371, 370, 642, 535, 536,
- 101, 687, 694, 4, 307, 611, 59, 130, 261, 380,
- 653, 657, 106, 258, 259, 260, 654, 251, 645, 15,
- 84, 96, 107, 113, 127, 138, 145, 150, 151, 173,
- 186, 187, 195, 224, 245, 249, 252, 262, 366, 380,
- 479, 480, 481, 482, 483, 486, 497, 498, 500, 510,
- 513, 582, 605, 640, 641, 647, 659, 660, 663, 665,
- 667, 668, 669, 670, 676, 746, 749, 367, 642, 380,
- 369, 370, 368, 368, 369, 553, 368, 380, 386, 538,
- 380, 453, 453, 195, 301, 492, 605, 369, 370, 603,
- 609, 27, 106, 599, 571, 101, 50, 169, 4, 121,
- 162, 211, 763, 369, 370, 251, 251, 581, 581, 380,
- 753, 567, 101, 633, 723, 402, 29, 101, 101, 736,
- 165, 106, 476, 538, 393, 406, 369, 172, 387, 388,
- 389, 4, 201, 123, 369, 370, 7, 370, 101, 101,
- 370, 380, 602, 516, 380, 368, 690, 380, 774, 455,
- 4, 64, 88, 90, 134, 450, 370, 609, 244, 148,
- 4, 65, 137, 150, 151, 368, 368, 519, 567, 567,
- 613, 613, 380, 193, 613, 509, 518, 368, 368, 567,
- 367, 567, 368, 103, 367, 367, 367, 367, 367, 367,
- 367, 367, 489, 581, 581, 402, 369, 370, 369, 369,
- 3, 609, 734, 738, 172, 389, 390, 27, 310, 720,
- 32, 50, 368, 368, 368, 3, 369, 369, 567, 370,
- 369, 87, 30, 611, 161, 210, 473, 369, 138, 195,
- 45, 47, 392, 388, 370, 599, 7, 395, 370, 766,
- 380, 380, 684, 370, 620, 550, 567, 605, 688, 689,
- 172, 692, 4, 773, 726, 96, 134, 380, 96, 4,
- 380, 193, 609, 136, 224, 652, 660, 665, 671, 672,
- 746, 255, 15, 15, 3, 163, 380, 368, 496, 532,
- 367, 553, 553, 367, 7, 9, 638, 639, 645, 369,
- 369, 369, 386, 3, 310, 722, 24, 59, 77, 78,
- 721, 7, 7, 7, 111, 763, 3, 634, 635, 369,
- 369, 201, 289, 467, 124, 187, 391, 391, 46, 48,
- 46, 48, 4, 7, 602, 97, 621, 551, 101, 156,
- 369, 370, 368, 176, 691, 303, 698, 519, 96, 654,
- 658, 380, 380, 380, 367, 370, 642, 648, 649, 650,
- 163, 567, 514, 515, 576, 605, 751, 256, 257, 494,
- 495, 163, 369, 369, 369, 370, 24, 4, 4, 4,
- 4, 369, 369, 370, 7, 108, 369, 370, 201, 201,
- 368, 242, 166, 474, 137, 169, 369, 370, 369, 380,
- 380, 688, 553, 165, 693, 304, 699, 519, 224, 262,
- 370, 641, 642, 655, 660, 663, 665, 667, 668, 669,
- 670, 676, 746, 749, 156, 553, 675, 671, 641, 659,
- 514, 163, 370, 7, 369, 370, 514, 648, 648, 638,
- 4, 310, 78, 77, 7, 370, 599, 635, 380, 380,
- 402, 4, 167, 475, 4, 369, 368, 250, 695, 7,
- 185, 308, 700, 567, 654, 567, 367, 367, 514, 515,
- 494, 535, 247, 664, 24, 4, 4, 369, 7, 369,
- 4, 369, 402, 697, 4, 310, 4, 309, 310, 369,
- 660, 665, 673, 674, 746, 201, 499, 648, 4, 369,
- 369, 251, 255, 369, 370, 496, 648, 648, 673
+ 528, 529, 577, 581, 617, 618, 621, 624, 664, 666,
+ 676, 684, 685, 705, 706, 708, 711, 713, 744, 745,
+ 749, 754, 758, 759, 760, 761, 770, 774, 26, 380,
+ 599, 368, 253, 178, 192, 242, 625, 202, 24, 33,
+ 34, 41, 60, 69, 88, 91, 106, 140, 158, 178,
+ 192, 194, 196, 198, 206, 207, 209, 210, 238, 241,
+ 273, 301, 315, 317, 327, 328, 404, 405, 406, 625,
+ 730, 149, 196, 24, 60, 69, 157, 192, 196, 198,
+ 238, 241, 273, 301, 317, 327, 328, 625, 115, 138,
+ 161, 179, 181, 186, 195, 208, 271, 272, 380, 433,
+ 434, 435, 436, 437, 614, 368, 163, 215, 216, 484,
+ 202, 115, 140, 222, 505, 507, 509, 196, 264, 331,
+ 380, 317, 599, 603, 186, 253, 266, 380, 518, 581,
+ 4, 615, 4, 615, 4, 228, 24, 157, 192, 196,
+ 228, 368, 577, 115, 208, 271, 272, 433, 436, 172,
+ 265, 17, 125, 196, 266, 278, 282, 283, 319, 380,
+ 577, 380, 4, 317, 368, 368, 368, 224, 520, 0,
+ 367, 131, 138, 142, 187, 230, 379, 414, 371, 98,
+ 100, 297, 517, 368, 102, 371, 251, 368, 16, 4,
+ 5, 6, 7, 8, 9, 11, 12, 13, 18, 93,
+ 112, 169, 196, 241, 278, 279, 292, 293, 294, 295,
+ 368, 380, 564, 565, 567, 568, 569, 571, 574, 575,
+ 581, 585, 587, 588, 593, 594, 595, 596, 597, 604,
+ 613, 745, 747, 748, 750, 751, 753, 380, 600, 600,
+ 380, 710, 26, 176, 238, 301, 471, 614, 169, 198,
+ 380, 602, 614, 602, 3, 380, 602, 602, 185, 198,
+ 317, 266, 599, 599, 599, 404, 157, 602, 26, 603,
+ 153, 614, 380, 709, 238, 614, 380, 599, 614, 599,
+ 599, 599, 599, 185, 198, 266, 599, 599, 599, 599,
+ 177, 368, 428, 428, 428, 172, 172, 172, 172, 370,
+ 193, 370, 380, 604, 603, 506, 298, 110, 111, 122,
+ 250, 277, 368, 532, 566, 567, 568, 573, 582, 584,
+ 604, 659, 661, 707, 745, 747, 750, 153, 380, 332,
+ 107, 172, 265, 599, 101, 192, 380, 493, 187, 509,
+ 371, 4, 615, 380, 708, 3, 599, 153, 615, 566,
+ 368, 177, 172, 172, 172, 172, 149, 368, 368, 368,
+ 368, 368, 368, 368, 368, 368, 251, 368, 266, 3,
+ 566, 566, 369, 192, 319, 371, 380, 752, 115, 296,
+ 526, 115, 526, 99, 380, 566, 573, 578, 579, 580,
+ 583, 380, 752, 371, 380, 566, 576, 583, 370, 368,
+ 171, 577, 368, 247, 280, 566, 589, 592, 368, 368,
+ 368, 708, 224, 368, 518, 566, 567, 604, 371, 372,
+ 660, 371, 660, 160, 613, 368, 371, 176, 444, 368,
+ 627, 371, 208, 715, 599, 165, 172, 157, 602, 371,
+ 101, 368, 425, 137, 769, 235, 236, 237, 679, 627,
+ 250, 4, 602, 599, 96, 149, 101, 149, 380, 611,
+ 627, 752, 200, 516, 548, 614, 124, 371, 124, 182,
+ 417, 172, 409, 599, 124, 4, 599, 96, 201, 462,
+ 193, 380, 402, 610, 709, 577, 4, 603, 435, 436,
+ 437, 371, 369, 157, 485, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 349, 350, 351, 503, 504,
+ 7, 368, 566, 566, 368, 530, 531, 380, 4, 567,
+ 604, 149, 533, 534, 535, 4, 101, 109, 110, 111,
+ 112, 113, 380, 371, 370, 660, 108, 368, 614, 380,
+ 333, 566, 101, 464, 380, 174, 493, 511, 512, 610,
+ 532, 371, 380, 370, 616, 371, 142, 231, 755, 172,
+ 142, 231, 232, 234, 416, 614, 369, 580, 709, 577,
+ 4, 603, 436, 16, 576, 576, 576, 566, 576, 576,
+ 3, 566, 576, 576, 96, 149, 369, 369, 97, 452,
+ 599, 380, 752, 371, 526, 123, 368, 522, 523, 524,
+ 525, 526, 522, 525, 115, 526, 320, 370, 370, 369,
+ 370, 368, 380, 371, 369, 370, 566, 115, 140, 566,
+ 94, 95, 116, 121, 125, 135, 141, 146, 162, 170,
+ 180, 188, 211, 212, 213, 214, 219, 220, 267, 268,
+ 269, 270, 301, 312, 313, 605, 606, 368, 606, 566,
+ 106, 144, 368, 552, 553, 554, 555, 556, 557, 559,
+ 560, 561, 563, 566, 247, 280, 590, 591, 251, 592,
+ 583, 566, 566, 368, 518, 224, 518, 369, 369, 370,
+ 101, 101, 112, 371, 380, 746, 747, 566, 372, 752,
+ 613, 580, 371, 380, 165, 101, 446, 62, 156, 243,
+ 369, 628, 629, 630, 254, 626, 371, 380, 708, 166,
+ 310, 714, 627, 87, 599, 172, 101, 371, 380, 518,
+ 519, 524, 129, 208, 384, 385, 386, 400, 401, 610,
+ 368, 423, 427, 153, 767, 768, 171, 138, 161, 195,
+ 680, 626, 622, 623, 625, 101, 101, 599, 599, 566,
+ 566, 172, 626, 627, 133, 552, 174, 492, 614, 371,
+ 380, 599, 599, 138, 437, 371, 369, 370, 193, 193,
+ 193, 193, 201, 430, 371, 380, 3, 492, 3, 368,
+ 368, 7, 368, 502, 502, 7, 7, 503, 201, 370,
+ 508, 566, 584, 530, 93, 582, 585, 586, 251, 101,
+ 101, 276, 368, 536, 540, 545, 546, 599, 603, 200,
+ 516, 4, 20, 380, 572, 566, 566, 566, 566, 566,
+ 752, 566, 573, 108, 566, 580, 614, 334, 337, 338,
+ 665, 315, 493, 368, 200, 370, 516, 107, 380, 371,
+ 4, 371, 380, 34, 72, 730, 734, 36, 72, 734,
+ 735, 599, 91, 411, 411, 602, 411, 129, 400, 418,
+ 614, 368, 369, 149, 149, 149, 149, 370, 369, 369,
+ 369, 370, 369, 369, 149, 156, 369, 369, 599, 566,
+ 123, 142, 231, 234, 371, 380, 752, 522, 525, 368,
+ 224, 522, 525, 526, 522, 525, 566, 380, 566, 573,
+ 566, 578, 579, 580, 380, 251, 566, 370, 566, 566,
+ 369, 368, 368, 368, 175, 368, 368, 368, 368, 368,
+ 211, 212, 313, 368, 368, 368, 580, 370, 552, 368,
+ 565, 368, 552, 566, 104, 105, 246, 106, 107, 120,
+ 156, 164, 168, 566, 566, 251, 591, 369, 101, 370,
+ 580, 369, 518, 583, 708, 708, 380, 371, 373, 566,
+ 368, 369, 380, 371, 368, 602, 149, 369, 370, 604,
+ 606, 608, 708, 73, 74, 75, 76, 78, 79, 80,
+ 83, 635, 636, 380, 371, 38, 52, 53, 54, 55,
+ 56, 57, 58, 61, 71, 741, 742, 59, 712, 254,
+ 743, 368, 468, 599, 599, 380, 371, 201, 203, 381,
+ 380, 599, 369, 370, 126, 147, 153, 176, 194, 125,
+ 211, 214, 605, 609, 708, 402, 101, 368, 370, 427,
+ 172, 149, 367, 251, 622, 380, 372, 704, 4, 4,
+ 459, 201, 756, 756, 599, 636, 626, 171, 368, 380,
+ 371, 468, 380, 610, 436, 436, 436, 436, 68, 380,
+ 371, 428, 566, 566, 7, 501, 300, 7, 111, 369,
+ 370, 200, 369, 251, 708, 708, 540, 546, 368, 520,
+ 546, 370, 282, 283, 284, 286, 287, 288, 542, 544,
+ 368, 153, 549, 23, 606, 368, 566, 369, 335, 336,
+ 334, 3, 41, 97, 100, 116, 157, 159, 163, 201,
+ 204, 217, 218, 221, 223, 255, 490, 491, 133, 512,
+ 492, 566, 380, 380, 371, 26, 380, 26, 417, 734,
+ 380, 722, 35, 736, 307, 413, 610, 386, 412, 386,
+ 380, 580, 436, 436, 436, 436, 566, 251, 251, 251,
+ 3, 251, 251, 566, 566, 251, 251, 369, 453, 454,
+ 566, 572, 752, 371, 402, 518, 522, 525, 320, 369,
+ 566, 369, 369, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 369, 566, 369, 552, 552, 566,
+ 120, 156, 168, 115, 116, 189, 562, 566, 566, 368,
+ 565, 106, 169, 566, 246, 606, 566, 369, 369, 369,
+ 369, 371, 112, 371, 380, 746, 373, 580, 380, 402,
+ 597, 629, 608, 204, 607, 368, 4, 446, 380, 310,
+ 4, 101, 716, 710, 96, 610, 368, 368, 380, 44,
+ 44, 91, 140, 382, 385, 368, 165, 406, 165, 368,
+ 368, 368, 116, 301, 708, 394, 369, 224, 422, 519,
+ 529, 3, 763, 764, 767, 599, 380, 601, 367, 627,
+ 3, 702, 703, 186, 250, 528, 695, 200, 460, 325,
+ 201, 757, 757, 368, 166, 250, 641, 636, 380, 612,
+ 491, 380, 371, 201, 432, 432, 432, 174, 371, 380,
+ 197, 487, 528, 369, 369, 369, 370, 508, 7, 508,
+ 566, 552, 369, 369, 251, 520, 369, 369, 540, 285,
+ 543, 543, 543, 542, 290, 402, 539, 123, 155, 550,
+ 19, 21, 22, 580, 7, 209, 97, 60, 176, 380,
+ 566, 4, 144, 106, 369, 370, 171, 380, 752, 417,
+ 752, 608, 101, 40, 41, 42, 43, 49, 51, 66,
+ 106, 166, 254, 310, 738, 739, 740, 209, 773, 370,
+ 370, 417, 369, 370, 369, 369, 369, 370, 118, 139,
+ 455, 455, 752, 369, 369, 566, 369, 369, 369, 369,
+ 370, 369, 369, 370, 369, 369, 369, 369, 369, 369,
+ 369, 566, 368, 565, 566, 565, 105, 583, 169, 143,
+ 250, 558, 566, 311, 570, 369, 371, 371, 112, 380,
+ 380, 371, 369, 369, 196, 447, 108, 137, 636, 372,
+ 635, 81, 82, 632, 149, 59, 166, 368, 717, 25,
+ 35, 70, 78, 87, 106, 293, 330, 725, 726, 727,
+ 708, 369, 610, 539, 91, 552, 368, 368, 368, 402,
+ 7, 7, 41, 106, 126, 137, 169, 176, 181, 194,
+ 201, 281, 306, 311, 318, 393, 396, 398, 518, 201,
+ 426, 369, 370, 97, 677, 371, 370, 626, 107, 373,
+ 702, 509, 599, 693, 696, 3, 692, 4, 107, 326,
+ 403, 610, 741, 642, 96, 492, 369, 380, 152, 380,
+ 371, 368, 7, 508, 369, 369, 371, 371, 369, 101,
+ 380, 368, 541, 565, 603, 369, 132, 184, 453, 552,
+ 452, 22, 369, 165, 165, 218, 490, 612, 368, 731,
+ 731, 181, 723, 31, 32, 38, 38, 38, 38, 172,
+ 37, 40, 742, 169, 24, 59, 67, 740, 3, 368,
+ 772, 610, 386, 566, 251, 251, 251, 454, 452, 7,
+ 7, 105, 583, 558, 566, 369, 586, 143, 599, 369,
+ 752, 752, 371, 371, 112, 380, 566, 106, 448, 4,
+ 5, 6, 7, 9, 18, 110, 111, 169, 598, 598,
+ 7, 108, 62, 156, 243, 62, 156, 243, 597, 4,
+ 742, 718, 722, 101, 4, 149, 164, 289, 25, 368,
+ 728, 729, 735, 727, 641, 369, 369, 369, 402, 403,
+ 403, 369, 369, 369, 306, 169, 368, 598, 165, 599,
+ 185, 368, 60, 116, 599, 123, 126, 155, 763, 7,
+ 239, 681, 371, 380, 601, 636, 3, 4, 701, 532,
+ 380, 251, 370, 179, 700, 329, 330, 369, 370, 455,
+ 310, 136, 199, 451, 641, 643, 644, 645, 650, 651,
+ 655, 708, 371, 174, 380, 488, 489, 566, 508, 752,
+ 752, 380, 545, 172, 289, 547, 101, 380, 368, 538,
+ 368, 368, 96, 551, 144, 492, 369, 630, 631, 732,
+ 733, 89, 737, 254, 86, 137, 724, 35, 44, 44,
+ 169, 38, 39, 172, 4, 4, 59, 3, 771, 772,
+ 369, 369, 369, 566, 369, 586, 368, 368, 752, 380,
+ 752, 371, 264, 186, 63, 449, 7, 9, 7, 9,
+ 636, 636, 373, 4, 369, 370, 87, 368, 28, 608,
+ 30, 87, 370, 201, 472, 368, 369, 369, 369, 552,
+ 427, 368, 399, 92, 305, 395, 397, 610, 174, 368,
+ 765, 766, 240, 295, 682, 683, 641, 678, 380, 371,
+ 370, 641, 535, 101, 686, 693, 4, 307, 610, 59,
+ 130, 261, 380, 652, 656, 106, 258, 259, 260, 653,
+ 251, 644, 15, 84, 96, 107, 113, 127, 138, 145,
+ 150, 151, 173, 186, 187, 195, 224, 245, 249, 252,
+ 262, 366, 380, 479, 480, 481, 482, 483, 486, 497,
+ 498, 500, 510, 513, 581, 604, 639, 640, 646, 658,
+ 659, 662, 664, 666, 667, 668, 669, 675, 745, 748,
+ 367, 641, 380, 369, 370, 368, 368, 369, 552, 368,
+ 380, 386, 537, 380, 453, 453, 195, 301, 492, 604,
+ 369, 370, 602, 608, 27, 106, 598, 570, 101, 50,
+ 169, 4, 121, 162, 211, 762, 369, 370, 251, 251,
+ 580, 580, 380, 752, 566, 101, 632, 722, 402, 29,
+ 101, 101, 735, 165, 106, 476, 537, 393, 406, 369,
+ 172, 387, 388, 389, 4, 201, 123, 369, 370, 7,
+ 370, 101, 101, 370, 380, 601, 516, 380, 368, 689,
+ 380, 773, 455, 4, 64, 88, 90, 134, 450, 370,
+ 608, 244, 148, 4, 65, 137, 150, 151, 368, 368,
+ 519, 566, 566, 612, 612, 380, 193, 612, 509, 518,
+ 368, 368, 566, 367, 566, 368, 103, 367, 367, 367,
+ 367, 367, 367, 367, 367, 489, 580, 580, 402, 369,
+ 370, 369, 369, 3, 608, 733, 737, 172, 389, 390,
+ 27, 310, 719, 32, 50, 368, 368, 368, 3, 369,
+ 369, 566, 370, 369, 87, 30, 610, 161, 210, 473,
+ 369, 138, 195, 45, 47, 392, 388, 370, 598, 7,
+ 395, 370, 765, 380, 380, 683, 370, 619, 549, 566,
+ 604, 687, 688, 172, 691, 4, 772, 725, 96, 134,
+ 380, 96, 4, 380, 193, 608, 136, 224, 651, 659,
+ 664, 670, 671, 745, 255, 15, 15, 3, 163, 380,
+ 368, 496, 532, 367, 552, 552, 367, 7, 9, 637,
+ 638, 644, 369, 369, 369, 386, 3, 310, 721, 24,
+ 59, 77, 78, 720, 7, 7, 7, 111, 762, 3,
+ 633, 634, 369, 369, 201, 289, 467, 124, 187, 391,
+ 391, 46, 48, 46, 48, 4, 7, 601, 97, 620,
+ 550, 101, 156, 369, 370, 368, 176, 690, 303, 697,
+ 519, 96, 653, 657, 380, 380, 380, 367, 370, 641,
+ 647, 648, 649, 163, 566, 514, 515, 575, 604, 750,
+ 256, 257, 494, 495, 163, 369, 369, 369, 370, 24,
+ 4, 4, 4, 4, 369, 369, 370, 7, 108, 369,
+ 370, 201, 201, 368, 242, 166, 474, 137, 169, 369,
+ 370, 369, 380, 380, 687, 552, 165, 692, 304, 698,
+ 519, 224, 262, 370, 640, 641, 654, 659, 662, 664,
+ 666, 667, 668, 669, 675, 745, 748, 156, 552, 674,
+ 670, 640, 658, 514, 163, 370, 7, 369, 370, 514,
+ 647, 647, 637, 4, 310, 78, 77, 7, 370, 598,
+ 634, 380, 380, 402, 4, 167, 475, 4, 369, 368,
+ 250, 694, 7, 185, 308, 699, 566, 653, 566, 367,
+ 367, 514, 515, 494, 534, 247, 663, 24, 4, 4,
+ 369, 7, 369, 4, 369, 402, 696, 4, 310, 4,
+ 309, 310, 369, 659, 664, 672, 673, 745, 201, 499,
+ 647, 4, 369, 369, 251, 255, 369, 370, 496, 647,
+ 647, 672
};
#define yyerrok (yyerrstatus = 0)
@@ -7689,18 +7696,9 @@ static const yytype_uint16 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
+ Once GCC version 2 has supplanted version 1, this can go. */
#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -7757,7 +7755,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -7868,20 +7866,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -7915,11 +7910,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -8199,8 +8194,10 @@ yydestruct (yymsg, yytype, yyvaluep)
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -8216,10 +8213,11 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */
-/* The lookahead symbol. */
+
+/* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
/* Number of syntax errors so far. */
@@ -8227,9 +8225,9 @@ int yynerrs;
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -8253,68 +8251,66 @@ yyparse ()
#endif
#endif
{
+
+ int yystate;
+ int yyn;
+ int yyresult;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Look-ahead token as an internal (translated) token number. */
+ int yytoken = 0;
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char yymsgbuf[128];
+ char *yymsg = yymsgbuf;
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss = yyssa;
+ yytype_int16 *yyssp;
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
- YYSIZE_T yystacksize;
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+
+ YYSIZE_T yystacksize = YYINITDEPTH;
- int yyn;
- int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
+
yyssp = yyss;
yyvsp = yyvs;
@@ -8344,6 +8340,7 @@ yyparse ()
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
+
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -8351,6 +8348,7 @@ yyparse ()
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -8373,8 +8371,9 @@ yyparse ()
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -8385,6 +8384,7 @@ yyparse ()
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -8394,9 +8394,6 @@ yyparse ()
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
- if (yystate == YYFINAL)
- YYACCEPT;
-
goto yybackup;
/*-----------.
@@ -8405,16 +8402,16 @@ yyparse ()
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
+ look-ahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -8446,16 +8443,20 @@ yybackup:
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -8495,788 +8496,564 @@ yyreduce:
switch (yyn)
{
case 2:
-
-/* Line 1464 of yacc.c */
-#line 651 "./sql3.y"
+#line 677 "./sql3.y"
{ }
break;
case 3:
-
-/* Line 1464 of yacc.c */
-#line 652 "./sql3.y"
+#line 678 "./sql3.y"
{ }
break;
case 4:
-
-/* Line 1464 of yacc.c */
-#line 655 "./sql3.y"
+#line 681 "./sql3.y"
{ parse_tree = (yyvsp[(1) - (1)].tree); }
break;
case 5:
-
-/* Line 1464 of yacc.c */
-#line 662 "./sql3.y"
+#line 688 "./sql3.y"
{ (yyval.tree) = t_listst (2, SCHEMA_ELEMENT_LIST,
t_list_to_array ((yyvsp[(1) - (1)].list))); }
break;
case 6:
-
-/* Line 1464 of yacc.c */
-#line 664 "./sql3.y"
+#line 690 "./sql3.y"
{ (yyval.tree) = t_listst (2, SCHEMA_ELEMENT_LIST, t_list (1, (yyvsp[(1) - (1)].tree))); }
break;
case 7:
-
-/* Line 1464 of yacc.c */
-#line 665 "./sql3.y"
+#line 691 "./sql3.y"
{ (yyval.tree) = t_listst (2, SCHEMA_ELEMENT_LIST, t_list (1, (yyvsp[(1) - (1)].tree))); }
break;
case 8:
-
-/* Line 1464 of yacc.c */
-#line 666 "./sql3.y"
+#line 692 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 9:
-
-/* Line 1464 of yacc.c */
-#line 667 "./sql3.y"
+#line 693 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 10:
-
-/* Line 1464 of yacc.c */
-#line 668 "./sql3.y"
+#line 694 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 11:
-
-/* Line 1464 of yacc.c */
-#line 669 "./sql3.y"
+#line 695 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 12:
-
-/* Line 1464 of yacc.c */
-#line 670 "./sql3.y"
+#line 696 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 13:
-
-/* Line 1464 of yacc.c */
-#line 671 "./sql3.y"
+#line 697 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 14:
-
-/* Line 1464 of yacc.c */
-#line 672 "./sql3.y"
+#line 698 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 15:
-
-/* Line 1464 of yacc.c */
-#line 688 "./sql3.y"
+#line 714 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 16:
-
-/* Line 1464 of yacc.c */
-#line 689 "./sql3.y"
+#line 715 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 17:
-
-/* Line 1464 of yacc.c */
-#line 690 "./sql3.y"
+#line 716 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 18:
-
-/* Line 1464 of yacc.c */
-#line 691 "./sql3.y"
+#line 717 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 37:
-
-/* Line 1464 of yacc.c */
-#line 718 "./sql3.y"
+#line 744 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 38:
-
-/* Line 1464 of yacc.c */
-#line 719 "./sql3.y"
+#line 745 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 39:
-
-/* Line 1464 of yacc.c */
-#line 720 "./sql3.y"
+#line 746 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 40:
-
-/* Line 1464 of yacc.c */
-#line 721 "./sql3.y"
+#line 747 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 41:
-
-/* Line 1464 of yacc.c */
-#line 722 "./sql3.y"
+#line 748 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 42:
-
-/* Line 1464 of yacc.c */
-#line 723 "./sql3.y"
+#line 749 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 43:
-
-/* Line 1464 of yacc.c */
-#line 724 "./sql3.y"
+#line 750 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 44:
-
-/* Line 1464 of yacc.c */
-#line 725 "./sql3.y"
+#line 751 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 45:
-
-/* Line 1464 of yacc.c */
-#line 726 "./sql3.y"
+#line 752 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 46:
-
-/* Line 1464 of yacc.c */
-#line 727 "./sql3.y"
+#line 753 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 47:
-
-/* Line 1464 of yacc.c */
-#line 728 "./sql3.y"
+#line 754 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 48:
-
-/* Line 1464 of yacc.c */
-#line 729 "./sql3.y"
+#line 755 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 49:
-
-/* Line 1464 of yacc.c */
-#line 730 "./sql3.y"
+#line 756 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 50:
-
-/* Line 1464 of yacc.c */
-#line 731 "./sql3.y"
+#line 757 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 51:
-
-/* Line 1464 of yacc.c */
-#line 732 "./sql3.y"
+#line 758 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 52:
-
-/* Line 1464 of yacc.c */
-#line 733 "./sql3.y"
+#line 759 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 53:
-
-/* Line 1464 of yacc.c */
-#line 734 "./sql3.y"
+#line 760 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 54:
-
-/* Line 1464 of yacc.c */
-#line 735 "./sql3.y"
+#line 761 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 55:
-
-/* Line 1464 of yacc.c */
-#line 736 "./sql3.y"
+#line 762 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 56:
-
-/* Line 1464 of yacc.c */
-#line 737 "./sql3.y"
+#line 763 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 57:
-
-/* Line 1464 of yacc.c */
-#line 738 "./sql3.y"
+#line 764 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 58:
-
-/* Line 1464 of yacc.c */
-#line 739 "./sql3.y"
+#line 765 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 59:
-
-/* Line 1464 of yacc.c */
-#line 740 "./sql3.y"
+#line 766 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 60:
-
-/* Line 1464 of yacc.c */
-#line 741 "./sql3.y"
+#line 767 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 61:
-
-/* Line 1464 of yacc.c */
-#line 742 "./sql3.y"
+#line 768 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 62:
-
-/* Line 1464 of yacc.c */
-#line 743 "./sql3.y"
+#line 769 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 63:
-
-/* Line 1464 of yacc.c */
-#line 744 "./sql3.y"
+#line 770 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 64:
-
-/* Line 1464 of yacc.c */
-#line 745 "./sql3.y"
+#line 771 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 65:
-
-/* Line 1464 of yacc.c */
-#line 746 "./sql3.y"
+#line 772 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 66:
-
-/* Line 1464 of yacc.c */
-#line 747 "./sql3.y"
+#line 773 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 67:
-
-/* Line 1464 of yacc.c */
-#line 748 "./sql3.y"
+#line 774 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 68:
-
-/* Line 1464 of yacc.c */
-#line 749 "./sql3.y"
+#line 775 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 69:
-
-/* Line 1464 of yacc.c */
-#line 750 "./sql3.y"
+#line 776 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 70:
-
-/* Line 1464 of yacc.c */
-#line 751 "./sql3.y"
+#line 777 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 71:
-
-/* Line 1464 of yacc.c */
-#line 752 "./sql3.y"
+#line 778 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 72:
-
-/* Line 1464 of yacc.c */
-#line 753 "./sql3.y"
+#line 779 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 73:
-
-/* Line 1464 of yacc.c */
-#line 754 "./sql3.y"
+#line 780 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 74:
-
-/* Line 1464 of yacc.c */
-#line 755 "./sql3.y"
+#line 781 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 75:
-
-/* Line 1464 of yacc.c */
-#line 756 "./sql3.y"
+#line 782 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 76:
-
-/* Line 1464 of yacc.c */
-#line 757 "./sql3.y"
+#line 783 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 77:
-
-/* Line 1464 of yacc.c */
-#line 758 "./sql3.y"
+#line 784 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 78:
-
-/* Line 1464 of yacc.c */
-#line 759 "./sql3.y"
+#line 785 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 79:
-
-/* Line 1464 of yacc.c */
-#line 760 "./sql3.y"
+#line 786 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 80:
-
-/* Line 1464 of yacc.c */
-#line 761 "./sql3.y"
+#line 787 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 81:
-
-/* Line 1464 of yacc.c */
-#line 762 "./sql3.y"
+#line 788 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 82:
-
-/* Line 1464 of yacc.c */
-#line 763 "./sql3.y"
+#line 789 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 83:
-
-/* Line 1464 of yacc.c */
-#line 764 "./sql3.y"
+#line 790 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 84:
-
-/* Line 1464 of yacc.c */
-#line 765 "./sql3.y"
+#line 791 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 85:
-
-/* Line 1464 of yacc.c */
-#line 766 "./sql3.y"
+#line 792 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 86:
-
-/* Line 1464 of yacc.c */
-#line 767 "./sql3.y"
+#line 793 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 87:
-
-/* Line 1464 of yacc.c */
-#line 768 "./sql3.y"
+#line 794 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 88:
-
-/* Line 1464 of yacc.c */
-#line 769 "./sql3.y"
+#line 795 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 89:
-
-/* Line 1464 of yacc.c */
-#line 770 "./sql3.y"
+#line 796 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 90:
-
-/* Line 1464 of yacc.c */
-#line 771 "./sql3.y"
+#line 797 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 91:
-
-/* Line 1464 of yacc.c */
-#line 772 "./sql3.y"
+#line 798 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 92:
-
-/* Line 1464 of yacc.c */
-#line 773 "./sql3.y"
+#line 799 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 93:
-
-/* Line 1464 of yacc.c */
-#line 774 "./sql3.y"
+#line 800 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 94:
-
-/* Line 1464 of yacc.c */
-#line 775 "./sql3.y"
+#line 801 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 95:
-
-/* Line 1464 of yacc.c */
-#line 776 "./sql3.y"
+#line 802 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 96:
-
-/* Line 1464 of yacc.c */
-#line 777 "./sql3.y"
+#line 803 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 97:
-
-/* Line 1464 of yacc.c */
-#line 778 "./sql3.y"
+#line 804 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 98:
-
-/* Line 1464 of yacc.c */
-#line 779 "./sql3.y"
+#line 805 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 99:
-
-/* Line 1464 of yacc.c */
-#line 780 "./sql3.y"
+#line 806 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 100:
-
-/* Line 1464 of yacc.c */
-#line 781 "./sql3.y"
+#line 807 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 101:
-
-/* Line 1464 of yacc.c */
-#line 782 "./sql3.y"
+#line 808 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 102:
-
-/* Line 1464 of yacc.c */
-#line 783 "./sql3.y"
+#line 809 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 103:
-
-/* Line 1464 of yacc.c */
-#line 784 "./sql3.y"
+#line 810 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 104:
-
-/* Line 1464 of yacc.c */
-#line 785 "./sql3.y"
+#line 811 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 105:
-
-/* Line 1464 of yacc.c */
-#line 786 "./sql3.y"
+#line 812 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 106:
-
-/* Line 1464 of yacc.c */
-#line 787 "./sql3.y"
+#line 813 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 107:
-
-/* Line 1464 of yacc.c */
-#line 788 "./sql3.y"
+#line 814 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 108:
-
-/* Line 1464 of yacc.c */
-#line 789 "./sql3.y"
+#line 815 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 109:
-
-/* Line 1464 of yacc.c */
-#line 790 "./sql3.y"
+#line 816 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 110:
-
-/* Line 1464 of yacc.c */
-#line 791 "./sql3.y"
+#line 817 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 111:
-
-/* Line 1464 of yacc.c */
-#line 792 "./sql3.y"
+#line 818 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 112:
-
-/* Line 1464 of yacc.c */
-#line 793 "./sql3.y"
+#line 819 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 113:
-
-/* Line 1464 of yacc.c */
-#line 794 "./sql3.y"
+#line 820 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 114:
-
-/* Line 1464 of yacc.c */
-#line 795 "./sql3.y"
+#line 821 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 115:
-
-/* Line 1464 of yacc.c */
-#line 796 "./sql3.y"
+#line 822 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ((yyvsp[(1) - (1)].box)); }
break;
case 116:
-
-/* Line 1464 of yacc.c */
-#line 797 "./sql3.y"
+#line 823 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("__tag"); }
break;
case 117:
-
-/* Line 1464 of yacc.c */
-#line 798 "./sql3.y"
+#line 824 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 118:
-
-/* Line 1464 of yacc.c */
-#line 799 "./sql3.y"
+#line 825 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 119:
-
-/* Line 1464 of yacc.c */
-#line 803 "./sql3.y"
+#line 829 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 120:
-
-/* Line 1464 of yacc.c */
-#line 804 "./sql3.y"
+#line 830 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 121:
-
-/* Line 1464 of yacc.c */
-#line 805 "./sql3.y"
+#line 831 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 122:
-
-/* Line 1464 of yacc.c */
-#line 809 "./sql3.y"
+#line 835 "./sql3.y"
{ (yyval.intval) = T_ROW; }
break;
case 123:
-
-/* Line 1464 of yacc.c */
-#line 810 "./sql3.y"
+#line 836 "./sql3.y"
{ (yyval.intval) = T_COLUMN; }
break;
case 124:
-
-/* Line 1464 of yacc.c */
-#line 811 "./sql3.y"
+#line 837 "./sql3.y"
{ (yyval.intval) = T_DISTINCT_COLUMNS; }
break;
case 125:
-
-/* Line 1464 of yacc.c */
-#line 817 "./sql3.y"
+#line 843 "./sql3.y"
{ (yyval.tree) = t_listst (4, TABLE_DEF, (yyvsp[(3) - (7)].strval),
t_list_to_array (sqlc_ensure_primary_key (sqlp_process_col_options ((yyvsp[(3) - (7)].strval), (yyvsp[(5) - (7)].list)))), (yyvsp[(7) - (7)].intval)); }
break;
case 126:
-
-/* Line 1464 of yacc.c */
-#line 820 "./sql3.y"
+#line 846 "./sql3.y"
{ (yyval.tree) = t_listst (4, CREATE_TABLE_AS, (yyvsp[(3) - (6)].strval), (yyvsp[(5) - (6)].tree), t_box_num ((ptrlong) (yyvsp[(6) - (6)].intval))); }
break;
case 128:
-
-/* Line 1464 of yacc.c */
-#line 826 "./sql3.y"
+#line 852 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 130:
-
-/* Line 1464 of yacc.c */
-#line 831 "./sql3.y"
+#line 857 "./sql3.y"
{ (yyval.list) = t_CONS (NULL, t_CONS ((yyvsp[(1) - (1)].tree), NULL)); }
break;
case 131:
-
-/* Line 1464 of yacc.c */
-#line 836 "./sql3.y"
+#line 862 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (3)].strval), t_CONS (t_list (2, (yyvsp[(2) - (3)].tree), t_list_to_array ((yyvsp[(3) - (3)].list))), NULL)); }
break;
case 132:
-
-/* Line 1464 of yacc.c */
-#line 840 "./sql3.y"
+#line 866 "./sql3.y"
{ (yyval.tree) = t_listst (2, 0, 0); }
break;
case 133:
-
-/* Line 1464 of yacc.c */
-#line 841 "./sql3.y"
+#line 867 "./sql3.y"
{
caddr_t *l = (caddr_t *)(yyvsp[(1) - (1)].tree);
(yyval.tree) = (l[0] ? t_listst (2, 0, l[1]) : t_listst (2, l[1], 0));
@@ -9284,9 +9061,7 @@ yyreduce:
break;
case 134:
-
-/* Line 1464 of yacc.c */
-#line 846 "./sql3.y"
+#line 872 "./sql3.y"
{
caddr_t *l = (caddr_t *)(yyvsp[(1) - (2)].tree);
caddr_t *ll = (caddr_t *)(yyvsp[(2) - (2)].tree);
@@ -9297,100 +9072,72 @@ yyreduce:
break;
case 135:
-
-/* Line 1464 of yacc.c */
-#line 856 "./sql3.y"
+#line 882 "./sql3.y"
{ (yyval.tree) = t_listst (2, 0, (ptrlong) (yyvsp[(3) - (3)].intval)); }
break;
case 136:
-
-/* Line 1464 of yacc.c */
-#line 857 "./sql3.y"
+#line 883 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 137:
-
-/* Line 1464 of yacc.c */
-#line 861 "./sql3.y"
+#line 887 "./sql3.y"
{ (yyval.tree) = t_listst (2, (ptrlong) 1, (ptrlong) (yyvsp[(3) - (3)].intval)); }
break;
case 138:
-
-/* Line 1464 of yacc.c */
-#line 865 "./sql3.y"
+#line 891 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 139:
-
-/* Line 1464 of yacc.c */
-#line 866 "./sql3.y"
+#line 892 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 140:
-
-/* Line 1464 of yacc.c */
-#line 870 "./sql3.y"
+#line 896 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 141:
-
-/* Line 1464 of yacc.c */
-#line 871 "./sql3.y"
+#line 897 "./sql3.y"
{ (yyval.intval) = 2; }
break;
case 142:
-
-/* Line 1464 of yacc.c */
-#line 872 "./sql3.y"
+#line 898 "./sql3.y"
{ (yyval.intval) = 3; }
break;
case 143:
-
-/* Line 1464 of yacc.c */
-#line 876 "./sql3.y"
+#line 902 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 144:
-
-/* Line 1464 of yacc.c */
-#line 877 "./sql3.y"
+#line 903 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 145:
-
-/* Line 1464 of yacc.c */
-#line 878 "./sql3.y"
+#line 904 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 146:
-
-/* Line 1464 of yacc.c */
-#line 879 "./sql3.y"
+#line 905 "./sql3.y"
{ (yyval.intval) = 2; }
break;
case 147:
-
-/* Line 1464 of yacc.c */
-#line 880 "./sql3.y"
+#line 906 "./sql3.y"
{ (yyval.intval) = 3; }
break;
case 148:
-
-/* Line 1464 of yacc.c */
-#line 885 "./sql3.y"
+#line 911 "./sql3.y"
{
caddr_t *l = (caddr_t *) (yyvsp[(4) - (5)].tree);
(yyval.tree) = t_listst (9, FOREIGN_KEY, NULL, (yyvsp[(2) - (5)].strval), (yyvsp[(3) - (5)].tree), NULL, l[0], l[1], NULL, (ptrlong) (yyvsp[(5) - (5)].intval));
@@ -9398,149 +9145,107 @@ yyreduce:
break;
case 149:
-
-/* Line 1464 of yacc.c */
-#line 892 "./sql3.y"
+#line 918 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 150:
-
-/* Line 1464 of yacc.c */
-#line 893 "./sql3.y"
+#line 919 "./sql3.y"
{ (yyval.list) = (yyvsp[(2) - (2)].tree) ? t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)) : (yyvsp[(1) - (2)].list); }
break;
case 151:
-
-/* Line 1464 of yacc.c */
-#line 897 "./sql3.y"
+#line 923 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_ID_START, (yyvsp[(3) - (3)].box)); }
break;
case 152:
-
-/* Line 1464 of yacc.c */
-#line 898 "./sql3.y"
+#line 924 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_ID_INCREMENT_BY, (yyvsp[(3) - (3)].box)); }
break;
case 153:
-
-/* Line 1464 of yacc.c */
-#line 910 "./sql3.y"
+#line 936 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_COMPRESS, (ptrlong)CC_NONE); }
break;
case 154:
-
-/* Line 1464 of yacc.c */
-#line 911 "./sql3.y"
+#line 937 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_COMPRESS, (ptrlong)CC_OFFSET); }
break;
case 155:
-
-/* Line 1464 of yacc.c */
-#line 912 "./sql3.y"
+#line 938 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_COMPRESS, (ptrlong)CC_PREFIX); }
break;
case 156:
-
-/* Line 1464 of yacc.c */
-#line 917 "./sql3.y"
+#line 943 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 157:
-
-/* Line 1464 of yacc.c */
-#line 918 "./sql3.y"
+#line 944 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 158:
-
-/* Line 1464 of yacc.c */
-#line 922 "./sql3.y"
+#line 948 "./sql3.y"
{ (yyval.tree) = (ST *) COL_NOT_NULL; }
break;
case 159:
-
-/* Line 1464 of yacc.c */
-#line 923 "./sql3.y"
+#line 949 "./sql3.y"
{ (yyval.tree) = (ST *) NULL; }
break;
case 160:
-
-/* Line 1464 of yacc.c */
-#line 924 "./sql3.y"
+#line 950 "./sql3.y"
{ (yyval.tree) = (ST *) CO_IDENTITY; }
break;
case 161:
-
-/* Line 1464 of yacc.c */
-#line 925 "./sql3.y"
+#line 951 "./sql3.y"
{ (yyval.tree) = t_listst (2, CO_IDENTITY, t_list_to_array ((yyvsp[(3) - (4)].list))); }
break;
case 162:
-
-/* Line 1464 of yacc.c */
-#line 926 "./sql3.y"
+#line 952 "./sql3.y"
{ (yyval.tree) = t_listst (5, INDEX_DEF, NULL, NULL, NULL, (ST *) 0); }
break;
case 163:
-
-/* Line 1464 of yacc.c */
-#line 927 "./sql3.y"
+#line 953 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 164:
-
-/* Line 1464 of yacc.c */
-#line 928 "./sql3.y"
+#line 954 "./sql3.y"
{ (yyval.tree) = t_listst (2, COL_DEFAULT, (yyvsp[(2) - (2)].box)); }
break;
case 165:
-
-/* Line 1464 of yacc.c */
-#line 929 "./sql3.y"
+#line 955 "./sql3.y"
{ (yyval.tree) = t_listst (2, COL_COLLATE, (yyvsp[(2) - (2)].strval)); }
break;
case 166:
-
-/* Line 1464 of yacc.c */
-#line 930 "./sql3.y"
+#line 956 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 167:
-
-/* Line 1464 of yacc.c */
-#line 931 "./sql3.y"
+#line 957 "./sql3.y"
{ (yyval.tree) = t_listst (2, COL_XML_ID, (yyvsp[(3) - (3)].strval)); }
break;
case 168:
-
-/* Line 1464 of yacc.c */
-#line 933 "./sql3.y"
+#line 959 "./sql3.y"
{ (yyval.tree) = t_listst (3, CHECK_CONSTR, (yyvsp[(3) - (4)].tree), NULL); }
break;
case 169:
-
-/* Line 1464 of yacc.c */
-#line 935 "./sql3.y"
+#line 961 "./sql3.y"
{
ST * check;
BIN_OP (check, BOP_NULL,
@@ -9552,60 +9257,44 @@ yyreduce:
break;
case 170:
-
-/* Line 1464 of yacc.c */
-#line 943 "./sql3.y"
+#line 969 "./sql3.y"
{ (yyval.tree) = t_listst (5, UNIQUE_DEF, NULL, NULL, NULL,
(ST *) t_list (1, t_box_string ("unique"))); }
break;
case 171:
-
-/* Line 1464 of yacc.c */
-#line 948 "./sql3.y"
+#line 974 "./sql3.y"
{ (yyval.tree) = t_listst (6, NULL, NULL, NULL, (yyvsp[(2) - (5)].box), (yyvsp[(4) - (5)].box), (caddr_t) t_NULLCONST); }
break;
case 172:
-
-/* Line 1464 of yacc.c */
-#line 949 "./sql3.y"
+#line 975 "./sql3.y"
{ (yyval.tree) = t_listst (6, NULL, NULL, NULL, (yyvsp[(2) - (7)].box), (yyvsp[(4) - (7)].box), (yyvsp[(6) - (7)].box)); }
break;
case 173:
-
-/* Line 1464 of yacc.c */
-#line 955 "./sql3.y"
+#line 981 "./sql3.y"
{ (yyval.tree) = t_listst (2, TABLE_UNDER, t_list (1, (yyvsp[(2) - (2)].strval))); }
break;
case 174:
-
-/* Line 1464 of yacc.c */
-#line 957 "./sql3.y"
+#line 983 "./sql3.y"
{ (yyval.tree) = t_listst (5, INDEX_DEF, NULL, NULL,
sqlp_string_col_list ((caddr_t *) t_list_to_array ((yyvsp[(5) - (7)].list))), (yyvsp[(7) - (7)].tree)); }
break;
case 175:
-
-/* Line 1464 of yacc.c */
-#line 960 "./sql3.y"
+#line 986 "./sql3.y"
{ (yyval.tree) = (yyvsp[(7) - (7)].tree); (yyvsp[(7) - (7)].tree)->_.fkey.fk_cols = (caddr_t*) t_list_to_array ((yyvsp[(5) - (7)].list)); (yyvsp[(7) - (7)].tree)->_.fkey.fk_name = (yyvsp[(1) - (7)].box); }
break;
case 176:
-
-/* Line 1464 of yacc.c */
-#line 962 "./sql3.y"
+#line 988 "./sql3.y"
{ (yyval.tree) = t_listst (3, CHECK_CONSTR, (yyvsp[(4) - (5)].tree), (yyvsp[(1) - (5)].box)); }
break;
case 177:
-
-/* Line 1464 of yacc.c */
-#line 964 "./sql3.y"
+#line 990 "./sql3.y"
{ (yyval.tree) =
t_listst (5, UNIQUE_DEF, (yyvsp[(1) - (5)].box), NULL,
sqlp_string_col_list ((caddr_t *) t_list_to_array ((yyvsp[(4) - (5)].list))),
@@ -9613,241 +9302,173 @@ yyreduce:
break;
case 178:
-
-/* Line 1464 of yacc.c */
-#line 968 "./sql3.y"
+#line 994 "./sql3.y"
{ (yyval.tree) = t_listst (4, COLUMN_GROUP, (yyvsp[(1) - (6)].box), (yyvsp[(3) - (6)].tree), sqlp_string_col_list (t_list_to_array ((yyvsp[(5) - (6)].list)))); }
break;
case 179:
-
-/* Line 1464 of yacc.c */
-#line 972 "./sql3.y"
+#line 998 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 180:
-
-/* Line 1464 of yacc.c */
-#line 973 "./sql3.y"
+#line 999 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 181:
-
-/* Line 1464 of yacc.c */
-#line 977 "./sql3.y"
+#line 1003 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].strval), NULL); }
break;
case 182:
-
-/* Line 1464 of yacc.c */
-#line 978 "./sql3.y"
+#line 1004 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].strval), NULL)); }
break;
case 183:
-
-/* Line 1464 of yacc.c */
-#line 982 "./sql3.y"
+#line 1008 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (2)].strval), NULL); }
break;
case 184:
-
-/* Line 1464 of yacc.c */
-#line 983 "./sql3.y"
+#line 1009 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (4)].list), t_CONS ((yyvsp[(3) - (4)].strval), NULL)); }
break;
case 185:
-
-/* Line 1464 of yacc.c */
-#line 987 "./sql3.y"
+#line 1013 "./sql3.y"
{ (yyval.box) = t_box_string ("clustered"); }
break;
case 186:
-
-/* Line 1464 of yacc.c */
-#line 988 "./sql3.y"
+#line 1014 "./sql3.y"
{ (yyval.box) = t_box_string ("unique"); }
break;
case 187:
-
-/* Line 1464 of yacc.c */
-#line 989 "./sql3.y"
+#line 1015 "./sql3.y"
{ (yyval.box) = t_box_string ("object_id"); }
break;
case 188:
-
-/* Line 1464 of yacc.c */
-#line 990 "./sql3.y"
+#line 1016 "./sql3.y"
{ (yyval.box) = t_box_string ("bitmap"); }
break;
case 189:
-
-/* Line 1464 of yacc.c */
-#line 991 "./sql3.y"
+#line 1017 "./sql3.y"
{ (yyval.box) = t_box_string ("distinct"); }
break;
case 190:
-
-/* Line 1464 of yacc.c */
-#line 992 "./sql3.y"
+#line 1018 "./sql3.y"
{ (yyval.box) = t_box_string ("column"); }
break;
case 191:
-
-/* Line 1464 of yacc.c */
-#line 993 "./sql3.y"
+#line 1019 "./sql3.y"
{ (yyval.box) = t_box_string ("not_null"); }
break;
case 192:
-
-/* Line 1464 of yacc.c */
-#line 994 "./sql3.y"
+#line 1020 "./sql3.y"
{ (yyval.box) = t_box_string ("no_pk"); }
break;
case 193:
-
-/* Line 1464 of yacc.c */
-#line 995 "./sql3.y"
+#line 1021 "./sql3.y"
{ (yyval.box) = t_box_string ("no_fill"); }
break;
case 194:
-
-/* Line 1464 of yacc.c */
-#line 999 "./sql3.y"
+#line 1025 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 195:
-
-/* Line 1464 of yacc.c */
-#line 1000 "./sql3.y"
+#line 1026 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].box), NULL)); }
break;
case 196:
-
-/* Line 1464 of yacc.c */
-#line 1004 "./sql3.y"
+#line 1030 "./sql3.y"
{ (yyval.tree) = (ST *) 0; }
break;
case 197:
-
-/* Line 1464 of yacc.c */
-#line 1005 "./sql3.y"
+#line 1031 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 198:
-
-/* Line 1464 of yacc.c */
-#line 1011 "./sql3.y"
+#line 1037 "./sql3.y"
{ (yyval.tree) = t_listst (5, INDEX_DEF, (yyvsp[(4) - (9)].strval), (yyvsp[(6) - (9)].strval), t_list_to_array ((yyvsp[(8) - (9)].list)), (yyvsp[(2) - (9)].tree)); }
break;
case 199:
-
-/* Line 1464 of yacc.c */
-#line 1014 "./sql3.y"
+#line 1040 "./sql3.y"
{ ST * opts = (ST *) t_box_append_1 ((caddr_t) (yyvsp[(2) - (12)].tree), (caddr_t) t_listst (5, PARTITION_DEF, NULL, NULL, (yyvsp[(11) - (12)].box), t_list_to_array ((yyvsp[(12) - (12)].list))));
(yyval.tree) = t_listst (5, INDEX_DEF, (yyvsp[(4) - (12)].strval), (yyvsp[(6) - (12)].strval), t_list_to_array ((yyvsp[(8) - (12)].list)), opts); }
break;
case 200:
-
-/* Line 1464 of yacc.c */
-#line 1019 "./sql3.y"
+#line 1045 "./sql3.y"
{ (yyval.tree) = t_listst (3, INDEX_DROP, (yyvsp[(3) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
case 201:
-
-/* Line 1464 of yacc.c */
-#line 1023 "./sql3.y"
+#line 1049 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 202:
-
-/* Line 1464 of yacc.c */
-#line 1024 "./sql3.y"
+#line 1050 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].strval); }
break;
case 203:
-
-/* Line 1464 of yacc.c */
-#line 1028 "./sql3.y"
+#line 1054 "./sql3.y"
{ (yyval.tree) = t_listst (2, TABLE_DROP, (yyvsp[(3) - (3)].strval)); }
break;
case 204:
-
-/* Line 1464 of yacc.c */
-#line 1029 "./sql3.y"
+#line 1055 "./sql3.y"
{ (yyval.tree) = t_listst (2, TABLE_DROP, (yyvsp[(3) - (3)].strval)); }
break;
case 205:
-
-/* Line 1464 of yacc.c */
-#line 1033 "./sql3.y"
+#line 1059 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 206:
-
-/* Line 1464 of yacc.c */
-#line 1034 "./sql3.y"
+#line 1060 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 207:
-
-/* Line 1464 of yacc.c */
-#line 1038 "./sql3.y"
+#line 1064 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].list), NULL); }
break;
case 208:
-
-/* Line 1464 of yacc.c */
-#line 1039 "./sql3.y"
+#line 1065 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].list), NULL)); }
break;
case 209:
-
-/* Line 1464 of yacc.c */
-#line 1043 "./sql3.y"
+#line 1069 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].strval), NULL); }
break;
case 210:
-
-/* Line 1464 of yacc.c */
-#line 1044 "./sql3.y"
+#line 1070 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].strval), NULL)); }
break;
case 211:
-
-/* Line 1464 of yacc.c */
-#line 1049 "./sql3.y"
+#line 1075 "./sql3.y"
{
dk_set_t ret = NULL, col_defs_list = (yyvsp[(6) - (6)].list);
DO_SET (dk_set_t, col_def, &col_defs_list)
@@ -9860,9 +9481,7 @@ yyreduce:
break;
case 212:
-
-/* Line 1464 of yacc.c */
-#line 1059 "./sql3.y"
+#line 1085 "./sql3.y"
{
dk_set_t ret = NULL, col_ref_list = (yyvsp[(6) - (6)].list);
DO_SET (caddr_t, col_ref, &col_ref_list)
@@ -9875,83 +9494,61 @@ yyreduce:
break;
case 213:
-
-/* Line 1464 of yacc.c */
-#line 1069 "./sql3.y"
+#line 1095 "./sql3.y"
{
(yyval.list) = t_CONS (t_listst (3, MODIFY_COLUMN, (yyvsp[(3) - (6)].strval), t_list_to_array ((yyvsp[(6) - (6)].list))), NULL);
}
break;
case 214:
-
-/* Line 1464 of yacc.c */
-#line 1076 "./sql3.y"
+#line 1102 "./sql3.y"
{ (yyval.tree) = t_listst (3, TABLE_RENAME, (yyvsp[(3) - (5)].strval), (yyvsp[(5) - (5)].strval)); }
break;
case 215:
-
-/* Line 1464 of yacc.c */
-#line 1081 "./sql3.y"
+#line 1107 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
case 216:
-
-/* Line 1464 of yacc.c */
-#line 1082 "./sql3.y"
+#line 1108 "./sql3.y"
{ (yyval.subtok) = 2; }
break;
case 217:
-
-/* Line 1464 of yacc.c */
-#line 1083 "./sql3.y"
+#line 1109 "./sql3.y"
{ (yyval.subtok) = 3; }
break;
case 218:
-
-/* Line 1464 of yacc.c */
-#line 1087 "./sql3.y"
+#line 1113 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 219:
-
-/* Line 1464 of yacc.c */
-#line 1088 "./sql3.y"
+#line 1114 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 220:
-
-/* Line 1464 of yacc.c */
-#line 1089 "./sql3.y"
+#line 1115 "./sql3.y"
{ (yyval.intval) = 2; }
break;
case 221:
-
-/* Line 1464 of yacc.c */
-#line 1094 "./sql3.y"
+#line 1120 "./sql3.y"
{
(yyval.tree) = t_listst (9, FOREIGN_KEY, NULL, NULL, NULL, NULL, NULL, NULL, (ptrlong) (yyvsp[(2) - (3)].box), (ptrlong) 0);
}
break;
case 222:
-
-/* Line 1464 of yacc.c */
-#line 1097 "./sql3.y"
+#line 1123 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 223:
-
-/* Line 1464 of yacc.c */
-#line 1102 "./sql3.y"
+#line 1128 "./sql3.y"
{ ST * c = (yyvsp[(5) - (5)].tree);
if (INDEX_DEF == c->type)
c->type = 0;
@@ -9968,125 +9565,93 @@ yyreduce:
break;
case 224:
-
-/* Line 1464 of yacc.c */
-#line 1119 "./sql3.y"
+#line 1145 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.SYS_CREATE_XML_SCHEMA"),
t_list (1, (yyvsp[(4) - (4)].box))); }
break;
case 225:
-
-/* Line 1464 of yacc.c */
-#line 1126 "./sql3.y"
+#line 1152 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.SYS_DROP_XML_SCHEMA"),
t_list (1, (yyvsp[(4) - (4)].box))); }
break;
- case 227:
-
-/* Line 1464 of yacc.c */
-#line 1138 "./sql3.y"
+ case 228:
+#line 1164 "./sql3.y"
{ (yyval.tree) = t_listst (5, VIEW_DEF, NULL /* temp value, will set in view_def rule */,
sqlp_view_def ((ST **) (yyvsp[(1) - (4)].tree),
(yyvsp[(3) - (4)].tree), 0), NULL, (ptrlong) (yyvsp[(4) - (4)].subtok)); }
break;
- case 228:
-
-/* Line 1464 of yacc.c */
-#line 1142 "./sql3.y"
+ case 229:
+#line 1168 "./sql3.y"
{ (yyval.tree) = t_listst (5, VIEW_DEF, NULL /* temp value, will set in view_def rule */,
sqlp_view_def ((ST **) (yyvsp[(1) - (4)].tree),
(yyvsp[(4) - (4)].tree), 0), NULL, (ptrlong) 0); }
break;
- case 229:
-
-/* Line 1464 of yacc.c */
-#line 1148 "./sql3.y"
+ case 230:
+#line 1174 "./sql3.y"
{ sqlp_in_view ((yyvsp[(3) - (3)].strval)); }
break;
- case 230:
-
-/* Line 1464 of yacc.c */
-#line 1150 "./sql3.y"
+ case 231:
+#line 1176 "./sql3.y"
{ (yyval.tree) = (yyvsp[(5) - (5)].tree); (yyval.tree)->_.view_def.name = (yyvsp[(3) - (5)].strval); }
break;
- case 231:
-
-/* Line 1464 of yacc.c */
-#line 1152 "./sql3.y"
+ case 232:
+#line 1178 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (5, VIEW_DEF, (yyvsp[(4) - (12)].strval),
t_list (4, PROC_TABLE, (yyvsp[(6) - (12)].strval), (yyvsp[(8) - (12)].tree),
t_list_to_array (sqlc_ensure_primary_key (sqlp_process_col_options ((yyvsp[(4) - (12)].strval), (yyvsp[(11) - (12)].list))))),
NULL, NULL); }
break;
- case 232:
-
-/* Line 1464 of yacc.c */
-#line 1159 "./sql3.y"
- { (yyval.subtok) = 0; }
- break;
-
case 233:
-
-/* Line 1464 of yacc.c */
-#line 1160 "./sql3.y"
- { (yyval.subtok) = 1; }
+#line 1185 "./sql3.y"
+ { (yyval.subtok) = 0; }
break;
case 234:
-
-/* Line 1464 of yacc.c */
-#line 1164 "./sql3.y"
- { (yyval.tree) = t_listst (0); }
+#line 1186 "./sql3.y"
+ { (yyval.subtok) = 1; }
break;
case 235:
-
-/* Line 1464 of yacc.c */
-#line 1165 "./sql3.y"
- { (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (3)].list)); }
+#line 1190 "./sql3.y"
+ { (yyval.tree) = t_listst (0); }
break;
case 236:
-
-/* Line 1464 of yacc.c */
-#line 1169 "./sql3.y"
- { (yyval.tree) = (ST *) 0; }
+#line 1191 "./sql3.y"
+ { (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 237:
-
-/* Line 1464 of yacc.c */
-#line 1170 "./sql3.y"
- { (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (3)].list)); }
+#line 1195 "./sql3.y"
+ { (yyval.tree) = (ST *) 0; }
break;
case 238:
-
-/* Line 1464 of yacc.c */
-#line 1175 "./sql3.y"
- { (yyval.tree) = t_listst (3, SET_GROUP_STMT, (yyvsp[(5) - (5)].box), t_box_string ("dba")); }
+#line 1196 "./sql3.y"
+ { (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 239:
-
-/* Line 1464 of yacc.c */
-#line 1177 "./sql3.y"
- { (yyval.tree) = t_listst (4, GRANT_STMT, (yyvsp[(2) - (7)].box), (yyvsp[(4) - (7)].strval), t_list_to_array ((yyvsp[(6) - (7)].list))); }
+#line 1201 "./sql3.y"
+ { (yyval.tree) = t_listst (3, SET_GROUP_STMT, (yyvsp[(5) - (5)].box), t_box_string ("dba")); }
break;
case 240:
+#line 1203 "./sql3.y"
+ { (yyval.tree) = t_listst (4, GRANT_STMT, (yyvsp[(2) - (7)].box), (yyvsp[(4) - (7)].strval), t_list_to_array ((yyvsp[(6) - (7)].list))); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1179 "./sql3.y"
+ case 241:
+#line 1205 "./sql3.y"
{ (yyval.tree) = t_listst (4, GRANT_STMT,
t_list (1,
t_listst (3, NULL, GR_EXECUTE, NULL)),
@@ -10094,10 +9659,8 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (7)].list))); }
break;
- case 241:
-
-/* Line 1464 of yacc.c */
-#line 1185 "./sql3.y"
+ case 242:
+#line 1211 "./sql3.y"
{ (yyval.tree) = t_listst (4, GRANT_STMT,
t_list (1,
t_listst (3, NULL, GR_REXECUTE, NULL)),
@@ -10105,10 +9668,8 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 242:
-
-/* Line 1464 of yacc.c */
-#line 1191 "./sql3.y"
+ case 243:
+#line 1217 "./sql3.y"
{ (yyval.tree) = t_listst (4, GRANT_STMT,
t_list (1,
t_listst (3, NULL, GR_UDT_UNDER, NULL)),
@@ -10116,38 +9677,28 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (7)].list))); }
break;
- case 243:
-
-/* Line 1464 of yacc.c */
-#line 1198 "./sql3.y"
+ case 244:
+#line 1224 "./sql3.y"
{ (yyval.tree) = t_listst (4, GRANT_ROLE_STMT, t_list_to_array ((yyvsp[(2) - (5)].list)), t_list_to_array ((yyvsp[(4) - (5)].list)), (ptrlong) (yyvsp[(5) - (5)].subtok)); }
break;
- case 244:
-
-/* Line 1464 of yacc.c */
-#line 1202 "./sql3.y"
+ case 245:
+#line 1228 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 245:
-
-/* Line 1464 of yacc.c */
-#line 1203 "./sql3.y"
+ case 246:
+#line 1229 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 246:
-
-/* Line 1464 of yacc.c */
-#line 1212 "./sql3.y"
+ case 247:
+#line 1238 "./sql3.y"
{ (yyval.tree) = t_listst (4, REVOKE_STMT, (yyvsp[(2) - (6)].box), (yyvsp[(4) - (6)].strval), t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 247:
-
-/* Line 1464 of yacc.c */
-#line 1215 "./sql3.y"
+ case 248:
+#line 1241 "./sql3.y"
{ (yyval.tree) = t_listst (4, REVOKE_STMT,
t_list (1,
t_listst (3, NULL, GR_EXECUTE, NULL)),
@@ -10155,10 +9706,8 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 248:
-
-/* Line 1464 of yacc.c */
-#line 1221 "./sql3.y"
+ case 249:
+#line 1247 "./sql3.y"
{ (yyval.tree) = t_listst (4, REVOKE_STMT,
t_list (1,
t_listst (3, NULL, GR_UDT_UNDER, NULL)),
@@ -10166,10 +9715,8 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 249:
-
-/* Line 1464 of yacc.c */
-#line 1227 "./sql3.y"
+ case 250:
+#line 1253 "./sql3.y"
{ (yyval.tree) = t_listst (4, REVOKE_STMT,
t_list (1,
t_listst (3, NULL, GR_REXECUTE, NULL)),
@@ -10177,31 +9724,23 @@ yyreduce:
t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
- case 250:
-
-/* Line 1464 of yacc.c */
-#line 1233 "./sql3.y"
+ case 251:
+#line 1259 "./sql3.y"
{ (yyval.tree) = t_listst (4, REVOKE_ROLE_STMT, t_list_to_array ((yyvsp[(2) - (4)].list)), t_list_to_array ((yyvsp[(4) - (4)].list)), 0); }
break;
- case 251:
-
-/* Line 1464 of yacc.c */
-#line 1237 "./sql3.y"
+ case 252:
+#line 1263 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 252:
-
-/* Line 1464 of yacc.c */
-#line 1238 "./sql3.y"
+ case 253:
+#line 1264 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 253:
-
-/* Line 1464 of yacc.c */
-#line 1243 "./sql3.y"
+ case 254:
+#line 1269 "./sql3.y"
{
(yyval.box) = t_listbox (5,
t_list (3, NULL, GR_SELECT, NULL),
@@ -10216,10 +9755,8 @@ yyreduce:
}
break;
- case 254:
-
-/* Line 1464 of yacc.c */
-#line 1256 "./sql3.y"
+ case 255:
+#line 1282 "./sql3.y"
{
(yyval.box) = t_listbox (6,
t_list (3, NULL, GR_SELECT, NULL),
@@ -10234,181 +9771,131 @@ yyreduce:
}
break;
- case 255:
-
-/* Line 1464 of yacc.c */
-#line 1268 "./sql3.y"
+ case 256:
+#line 1294 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(1) - (1)].list)); }
break;
- case 256:
-
-/* Line 1464 of yacc.c */
-#line 1272 "./sql3.y"
+ case 257:
+#line 1298 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 257:
-
-/* Line 1464 of yacc.c */
-#line 1274 "./sql3.y"
+ case 258:
+#line 1300 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 258:
-
-/* Line 1464 of yacc.c */
-#line 1279 "./sql3.y"
+ case 259:
+#line 1305 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_SELECT, (yyvsp[(2) - (2)].tree)); }
break;
- case 259:
-
-/* Line 1464 of yacc.c */
-#line 1280 "./sql3.y"
+ case 260:
+#line 1306 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_INSERT, NULL); }
break;
- case 260:
-
-/* Line 1464 of yacc.c */
-#line 1281 "./sql3.y"
+ case 261:
+#line 1307 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_DELETE, NULL); }
break;
- case 261:
-
-/* Line 1464 of yacc.c */
-#line 1283 "./sql3.y"
+ case 262:
+#line 1309 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_UPDATE, (yyvsp[(2) - (2)].tree)); }
break;
- case 262:
-
-/* Line 1464 of yacc.c */
-#line 1285 "./sql3.y"
+ case 263:
+#line 1311 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, GR_REFERENCES, (yyvsp[(2) - (2)].tree)); }
break;
- case 263:
-
-/* Line 1464 of yacc.c */
-#line 1290 "./sql3.y"
+ case 264:
+#line 1316 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
- case 264:
-
-/* Line 1464 of yacc.c */
-#line 1292 "./sql3.y"
+ case 265:
+#line 1318 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
- case 265:
-
-/* Line 1464 of yacc.c */
-#line 1296 "./sql3.y"
+ case 266:
+#line 1322 "./sql3.y"
{ (yyval.box) = (caddr_t) U_ID_PUBLIC; }
break;
- case 267:
-
-/* Line 1464 of yacc.c */
-#line 1302 "./sql3.y"
+ case 268:
+#line 1328 "./sql3.y"
{ (yyval.tree) = t_listst (3, SET_PASS_STMT, (yyvsp[(3) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
- case 268:
-
-/* Line 1464 of yacc.c */
-#line 1306 "./sql3.y"
+ case 269:
+#line 1332 "./sql3.y"
{ (yyval.tree) = t_listst (2, CREATE_USER_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 269:
-
-/* Line 1464 of yacc.c */
-#line 1307 "./sql3.y"
+ case 270:
+#line 1333 "./sql3.y"
{ (yyval.tree) = t_listst (2, CREATE_ROLE_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 270:
-
-/* Line 1464 of yacc.c */
-#line 1311 "./sql3.y"
+ case 271:
+#line 1337 "./sql3.y"
{ (yyval.tree) = t_listst (2, DELETE_USER_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 271:
-
-/* Line 1464 of yacc.c */
-#line 1312 "./sql3.y"
+ case 272:
+#line 1338 "./sql3.y"
{ (yyval.tree) = t_listst (3, DELETE_USER_STMT, (yyvsp[(3) - (4)].box), t_box_num (1)); }
break;
- case 272:
-
-/* Line 1464 of yacc.c */
-#line 1313 "./sql3.y"
+ case 273:
+#line 1339 "./sql3.y"
{ (yyval.tree) = t_listst (2, DELETE_USER_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 273:
-
-/* Line 1464 of yacc.c */
-#line 1314 "./sql3.y"
+ case 274:
+#line 1340 "./sql3.y"
{ (yyval.tree) = t_listst (3, DELETE_USER_STMT, (yyvsp[(3) - (4)].box), t_box_num (1)); }
break;
- case 274:
-
-/* Line 1464 of yacc.c */
-#line 1315 "./sql3.y"
+ case 275:
+#line 1341 "./sql3.y"
{ (yyval.tree) = t_listst (2, DROP_ROLE_STMT, (yyvsp[(3) - (3)].box)); }
break;
- case 275:
-
-/* Line 1464 of yacc.c */
-#line 1320 "./sql3.y"
+ case 276:
+#line 1346 "./sql3.y"
{ (yyval.tree) = t_listst (3, SET_GROUP_STMT, (yyvsp[(4) - (5)].box), (yyvsp[(5) - (5)].box)); }
break;
- case 276:
-
-/* Line 1464 of yacc.c */
-#line 1325 "./sql3.y"
+ case 277:
+#line 1351 "./sql3.y"
{ (yyval.tree) = t_listst (3, ADD_GROUP_STMT, (yyvsp[(4) - (5)].box), (yyvsp[(5) - (5)].box)); }
break;
- case 277:
-
-/* Line 1464 of yacc.c */
-#line 1330 "./sql3.y"
+ case 278:
+#line 1356 "./sql3.y"
{ (yyval.tree) = t_listst (3, DELETE_GROUP_STMT, (yyvsp[(4) - (5)].box), (yyvsp[(5) - (5)].box)); }
break;
- case 278:
-
-/* Line 1464 of yacc.c */
-#line 1335 "./sql3.y"
+ case 279:
+#line 1361 "./sql3.y"
{ (yyval.tree) = (ST *) t_alloc_box (0, DV_DB_NULL); }
break;
- case 279:
-
-/* Line 1464 of yacc.c */
-#line 1337 "./sql3.y"
+ case 280:
+#line 1363 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("vector"),
sqlp_string_col_list (t_list_to_array ((yyvsp[(4) - (5)].list))));
}
break;
- case 280:
-
-/* Line 1464 of yacc.c */
-#line 1345 "./sql3.y"
+ case 281:
+#line 1371 "./sql3.y"
{
caddr_t *l = (caddr_t *) (yyvsp[(8) - (10)].tree);
(yyval.tree) = t_listst (3, CALL_STMT,
@@ -10417,283 +9904,209 @@ yyreduce:
}
break;
- case 281:
-
-/* Line 1464 of yacc.c */
-#line 1354 "./sql3.y"
+ case 282:
+#line 1380 "./sql3.y"
{ (yyval.box) = t_alloc_box (0, DV_DB_NULL); }
break;
- case 282:
-
-/* Line 1464 of yacc.c */
-#line 1355 "./sql3.y"
+ case 283:
+#line 1381 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].strval); }
break;
- case 283:
-
-/* Line 1464 of yacc.c */
-#line 1360 "./sql3.y"
+ case 284:
+#line 1386 "./sql3.y"
{ (yyval.tree) = t_listst (2, t_alloc_box (0, DV_DB_NULL),
t_alloc_box (0, DV_DB_NULL));
}
break;
- case 284:
-
-/* Line 1464 of yacc.c */
-#line 1364 "./sql3.y"
+ case 285:
+#line 1390 "./sql3.y"
{ (yyval.tree) = t_listst (2, (yyvsp[(2) - (4)].tree), (yyvsp[(4) - (4)].tree)); }
break;
- case 285:
-
-/* Line 1464 of yacc.c */
-#line 1368 "./sql3.y"
+ case 286:
+#line 1394 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("DB.DBA.vd_attach_view"); }
break;
- case 286:
-
-/* Line 1464 of yacc.c */
-#line 1369 "./sql3.y"
+ case 287:
+#line 1395 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("DB.DBA.vd_attach_view_no_select"); }
break;
- case 287:
-
-/* Line 1464 of yacc.c */
-#line 1373 "./sql3.y"
+ case 288:
+#line 1399 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 288:
-
-/* Line 1464 of yacc.c */
-#line 1375 "./sql3.y"
+ case 289:
+#line 1401 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("concat"),
t_list (2, t_box_string ("\1"), (yyvsp[(3) - (3)].tree)));
}
break;
- case 289:
-
-/* Line 1464 of yacc.c */
-#line 1382 "./sql3.y"
+ case 290:
+#line 1408 "./sql3.y"
{ (yyval.intval) = _SQL_CURSOR_STATIC; }
break;
- case 290:
-
-/* Line 1464 of yacc.c */
-#line 1383 "./sql3.y"
+ case 291:
+#line 1409 "./sql3.y"
{ (yyval.intval) = _SQL_CURSOR_DYNAMIC; }
break;
- case 291:
-
-/* Line 1464 of yacc.c */
-#line 1384 "./sql3.y"
+ case 292:
+#line 1410 "./sql3.y"
{ (yyval.intval) = _SQL_CURSOR_KEYSET_DRIVEN; }
break;
- case 292:
-
-/* Line 1464 of yacc.c */
-#line 1390 "./sql3.y"
+ case 293:
+#line 1416 "./sql3.y"
{
(yyval.tree) = t_listst (5, CURSOR_DEF, (yyvsp[(2) - (5)].box), (yyvsp[(5) - (5)].tree), _SQL_CURSOR_FORWARD_ONLY, NULL);
}
break;
- case 293:
-
-/* Line 1464 of yacc.c */
-#line 1394 "./sql3.y"
+ case 294:
+#line 1420 "./sql3.y"
{
(yyval.tree) = t_listst (5, CURSOR_DEF, (yyvsp[(2) - (6)].box), (yyvsp[(6) - (6)].tree), (ptrlong) (yyvsp[(3) - (6)].intval), NULL);
}
break;
- case 294:
-
-/* Line 1464 of yacc.c */
-#line 1400 "./sql3.y"
- { (yyval.box) = NULL; }
- break;
-
case 295:
-
-/* Line 1464 of yacc.c */
-#line 1401 "./sql3.y"
- { (yyval.box) = t_list_to_array_box ((yyvsp[(3) - (3)].list)); }
+#line 1426 "./sql3.y"
+ { (yyval.box) = NULL; }
break;
case 296:
-
-/* Line 1464 of yacc.c */
-#line 1405 "./sql3.y"
- { (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
+#line 1427 "./sql3.y"
+ { (yyval.box) = t_list_to_array_box ((yyvsp[(3) - (3)].list)); }
break;
case 297:
-
-/* Line 1464 of yacc.c */
-#line 1407 "./sql3.y"
- { (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
+#line 1431 "./sql3.y"
+ { (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 298:
-
-/* Line 1464 of yacc.c */
-#line 1412 "./sql3.y"
- { (yyval.tree) = t_listst (3, ORDER_BY, (caddr_t) (yyvsp[(1) - (2)].tree), (ptrlong) (yyvsp[(2) - (2)].subtok)); }
+#line 1433 "./sql3.y"
+ { (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 299:
-
-/* Line 1464 of yacc.c */
-#line 1414 "./sql3.y"
- { (yyval.tree) = (ST*) t_list (3, ORDER_BY, t_list (3, COL_DOTTED, NULL, sqlp_xml_col_name ((yyvsp[(1) - (2)].tree))), (ptrlong) (yyvsp[(2) - (2)].subtok)); }
+#line 1438 "./sql3.y"
+ { (yyval.tree) = t_listst (3, ORDER_BY, (caddr_t) (yyvsp[(1) - (2)].tree), (ptrlong) (yyvsp[(2) - (2)].subtok)); }
break;
case 300:
-
-/* Line 1464 of yacc.c */
-#line 1418 "./sql3.y"
- { (yyval.subtok) = ORDER_ASC; }
+#line 1440 "./sql3.y"
+ { (yyval.tree) = (ST*) t_list (3, ORDER_BY, t_list (3, COL_DOTTED, NULL, sqlp_xml_col_name ((yyvsp[(1) - (2)].tree))), (ptrlong) (yyvsp[(2) - (2)].subtok)); }
break;
case 301:
-
-/* Line 1464 of yacc.c */
-#line 1419 "./sql3.y"
+#line 1444 "./sql3.y"
{ (yyval.subtok) = ORDER_ASC; }
break;
case 302:
-
-/* Line 1464 of yacc.c */
-#line 1420 "./sql3.y"
- { (yyval.subtok) = ORDER_DESC; }
+#line 1445 "./sql3.y"
+ { (yyval.subtok) = ORDER_ASC; }
break;
case 303:
+#line 1446 "./sql3.y"
+ { (yyval.subtok) = ORDER_DESC; }
+ break;
-/* Line 1464 of yacc.c */
-#line 1426 "./sql3.y"
+ case 304:
+#line 1452 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.repl_create_snapshot_log"),
t_list (1, (yyvsp[(5) - (5)].strval))); }
break;
- case 304:
-
-/* Line 1464 of yacc.c */
-#line 1433 "./sql3.y"
+ case 305:
+#line 1459 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.repl_drop_snapshot_log"),
t_list (1, (yyvsp[(5) - (5)].strval))); }
break;
- case 305:
-
-/* Line 1464 of yacc.c */
-#line 1440 "./sql3.y"
+ case 306:
+#line 1466 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.repl_purge_snapshot_log"),
t_list (1, (yyvsp[(5) - (5)].strval))); }
break;
- case 306:
-
-/* Line 1464 of yacc.c */
-#line 1446 "./sql3.y"
- { (yyval.box) = (caddr_t) t_NULLCONST; }
- break;
-
case 307:
-
-/* Line 1464 of yacc.c */
-#line 1447 "./sql3.y"
- { (yyval.box) = (yyvsp[(1) - (1)].box); }
+#line 1472 "./sql3.y"
+ { (yyval.box) = (caddr_t) t_NULLCONST; }
break;
case 308:
-
-/* Line 1464 of yacc.c */
-#line 1451 "./sql3.y"
- { (yyval.box) = (caddr_t) t_NULLCONST; }
+#line 1473 "./sql3.y"
+ { (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 309:
-
-/* Line 1464 of yacc.c */
-#line 1452 "./sql3.y"
- { (yyval.box) = (yyvsp[(2) - (2)].box); }
+#line 1477 "./sql3.y"
+ { (yyval.box) = (caddr_t) t_NULLCONST; }
break;
case 310:
+#line 1478 "./sql3.y"
+ { (yyval.box) = (yyvsp[(2) - (2)].box); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1457 "./sql3.y"
+ case 311:
+#line 1483 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.repl_create_inc_snapshot"),
t_list (4, (yyvsp[(6) - (7)].box), (yyvsp[(5) - (7)].strval), (yyvsp[(7) - (7)].box), (yyvsp[(3) - (7)].strval))); }
break;
- case 311:
-
-/* Line 1464 of yacc.c */
-#line 1461 "./sql3.y"
+ case 312:
+#line 1487 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.repl_create_snapshot"),
t_list (2, (yyvsp[(6) - (6)].box), (yyvsp[(4) - (6)].strval))); }
break;
- case 312:
-
-/* Line 1464 of yacc.c */
-#line 1467 "./sql3.y"
+ case 313:
+#line 1493 "./sql3.y"
{ (yyval.box) = t_box_num (0); }
break;
- case 313:
-
-/* Line 1464 of yacc.c */
-#line 1468 "./sql3.y"
+ case 314:
+#line 1494 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
- case 314:
-
-/* Line 1464 of yacc.c */
-#line 1473 "./sql3.y"
+ case 315:
+#line 1499 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.repl_drop_snapshot"),
t_list (2, (yyvsp[(3) - (4)].strval), (yyvsp[(4) - (4)].box))); }
break;
- case 315:
-
-/* Line 1464 of yacc.c */
-#line 1479 "./sql3.y"
+ case 316:
+#line 1505 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 316:
-
-/* Line 1464 of yacc.c */
-#line 1480 "./sql3.y"
+ case 317:
+#line 1506 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 317:
-
-/* Line 1464 of yacc.c */
-#line 1485 "./sql3.y"
+ case 318:
+#line 1511 "./sql3.y"
{
if ((yyvsp[(4) - (4)].subtok))
(yyval.tree) = t_listst (3, CALL_STMT,
@@ -10705,10 +10118,8 @@ yyreduce:
t_list (1, (yyvsp[(3) - (4)].strval))); }
break;
- case 318:
-
-/* Line 1464 of yacc.c */
-#line 1498 "./sql3.y"
+ case 319:
+#line 1524 "./sql3.y"
{
/* if (!stricmp ($2, "TEXT"))
{*/
@@ -10720,397 +10131,289 @@ yyreduce:
}
break;
- case 319:
-
-/* Line 1464 of yacc.c */
-#line 1510 "./sql3.y"
+ case 320:
+#line 1536 "./sql3.y"
{ (yyval.box) = t_box_num(0); }
break;
- case 320:
-
-/* Line 1464 of yacc.c */
-#line 1511 "./sql3.y"
+ case 321:
+#line 1537 "./sql3.y"
{ (yyval.box) = t_box_num(1); }
break;
- case 321:
-
-/* Line 1464 of yacc.c */
-#line 1515 "./sql3.y"
+ case 322:
+#line 1541 "./sql3.y"
{ (yyval.box) = NULL; }
break;
- case 322:
-
-/* Line 1464 of yacc.c */
-#line 1516 "./sql3.y"
+ case 323:
+#line 1542 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(2) - (3)].strval)); }
break;
- case 323:
-
-/* Line 1464 of yacc.c */
-#line 1521 "./sql3.y"
+ case 324:
+#line 1547 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("DB.DBA.vt_create_ftt"),
t_list (4, (yyvsp[(5) - (6)].strval), NULL, (yyvsp[(6) - (6)].box), NULL));
}
break;
- case 324:
-
-/* Line 1464 of yacc.c */
-#line 1529 "./sql3.y"
+ case 325:
+#line 1555 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("DB.DBA.vt_drop_ftt"),
t_list (2, (yyvsp[(5) - (6)].strval), (yyvsp[(6) - (6)].box)));
}
break;
- case 325:
-
-/* Line 1464 of yacc.c */
-#line 1536 "./sql3.y"
+ case 326:
+#line 1562 "./sql3.y"
{ (yyval.box) = t_box_num (0); }
break;
- case 326:
-
-/* Line 1464 of yacc.c */
-#line 1537 "./sql3.y"
+ case 327:
+#line 1563 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
- case 327:
-
-/* Line 1464 of yacc.c */
-#line 1541 "./sql3.y"
+ case 328:
+#line 1567 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
- case 328:
-
-/* Line 1464 of yacc.c */
-#line 1542 "./sql3.y"
+ case 329:
+#line 1568 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(3) - (3)].strval)); }
break;
- case 329:
-
-/* Line 1464 of yacc.c */
-#line 1546 "./sql3.y"
+ case 330:
+#line 1572 "./sql3.y"
{ (yyval.tree) = (ST*) t_NULLCONST; }
break;
- case 330:
-
-/* Line 1464 of yacc.c */
-#line 1547 "./sql3.y"
+ case 331:
+#line 1573 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(4) - (5)].list)); }
break;
- case 331:
-
-/* Line 1464 of yacc.c */
-#line 1551 "./sql3.y"
+ case 332:
+#line 1577 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
- case 332:
-
-/* Line 1464 of yacc.c */
-#line 1552 "./sql3.y"
+ case 333:
+#line 1578 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 333:
-
-/* Line 1464 of yacc.c */
-#line 1556 "./sql3.y"
+ case 334:
+#line 1582 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
- case 334:
-
-/* Line 1464 of yacc.c */
-#line 1557 "./sql3.y"
+ case 335:
+#line 1583 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 335:
-
-/* Line 1464 of yacc.c */
-#line 1561 "./sql3.y"
+ case 336:
+#line 1587 "./sql3.y"
{ (yyval.box) = t_box_num (0); }
break;
- case 336:
-
-/* Line 1464 of yacc.c */
-#line 1562 "./sql3.y"
+ case 337:
+#line 1588 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
- case 346:
-
-/* Line 1464 of yacc.c */
-#line 1580 "./sql3.y"
+ case 348:
+#line 1606 "./sql3.y"
{ (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
- case 364:
-
-/* Line 1464 of yacc.c */
-#line 1602 "./sql3.y"
+ case 366:
+#line 1628 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("set_qualifier"),
t_list (1, sqlp_new_qualifier_name ((yyvsp[(2) - (2)].box), box_length ((yyvsp[(2) - (2)].box))))); }
break;
- case 365:
-
-/* Line 1464 of yacc.c */
-#line 1608 "./sql3.y"
+ case 367:
+#line 1634 "./sql3.y"
{ (yyval.tree) = t_listst (2, CLOSE_STMT, (yyvsp[(2) - (2)].box)); }
break;
- case 366:
-
-/* Line 1464 of yacc.c */
-#line 1613 "./sql3.y"
+ case 368:
+#line 1639 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("__commit"), t_list (0)); }
break;
- case 367:
-
-/* Line 1464 of yacc.c */
-#line 1619 "./sql3.y"
+ case 369:
+#line 1645 "./sql3.y"
{ (yyval.tree) = t_listst (4, DELETE_POS, (yyvsp[(7) - (8)].box), (yyvsp[(3) - (8)].strval), (yyvsp[(8) - (8)].tree)); }
break;
- case 368:
-
-/* Line 1464 of yacc.c */
-#line 1624 "./sql3.y"
+ case 370:
+#line 1650 "./sql3.y"
{ (yyval.tree) = t_listst (2, DELETE_SRC,
sqlp_infoschema_redirect (t_listst (9, TABLE_EXP, t_list (1, (yyvsp[(3) - (5)].strval)),
(yyvsp[(4) - (5)].tree), NULL, NULL, NULL, NULL, (yyvsp[(5) - (5)].tree), NULL))); }
break;
- case 369:
-
-/* Line 1464 of yacc.c */
-#line 1631 "./sql3.y"
+ case 371:
+#line 1657 "./sql3.y"
{ (yyval.tree) = t_listst (5, FETCH_STMT, (yyvsp[(2) - (4)].box), t_list_to_array ((yyvsp[(4) - (4)].list)), (ptrlong) _SQL_FETCH_NEXT, t_box_num (1)); }
break;
- case 370:
-
-/* Line 1464 of yacc.c */
-#line 1633 "./sql3.y"
+ case 372:
+#line 1659 "./sql3.y"
{
ptrlong fetch_type = sqlp_fetch_type_to_code ((yyvsp[(3) - (5)].box));
(yyval.tree) = t_listst (5, FETCH_STMT, (yyvsp[(2) - (5)].box), t_list_to_array ((yyvsp[(5) - (5)].list)), fetch_type, t_box_num (1));
}
break;
- case 371:
-
-/* Line 1464 of yacc.c */
-#line 1638 "./sql3.y"
+ case 373:
+#line 1664 "./sql3.y"
{
ptrlong fetch_type = sqlp_fetch_type_to_code ((yyvsp[(3) - (6)].box));
(yyval.tree) = t_listst (5, FETCH_STMT, (yyvsp[(2) - (6)].box), t_list_to_array ((yyvsp[(6) - (6)].list)), fetch_type, (yyvsp[(4) - (6)].tree));
}
break;
- case 372:
-
-/* Line 1464 of yacc.c */
-#line 1645 "./sql3.y"
+ case 374:
+#line 1671 "./sql3.y"
{ (yyval.subtok) = INS_NORMAL; }
break;
- case 373:
-
-/* Line 1464 of yacc.c */
-#line 1646 "./sql3.y"
+ case 375:
+#line 1672 "./sql3.y"
{ (yyval.subtok) = INS_REPLACING; }
break;
- case 374:
-
-/* Line 1464 of yacc.c */
-#line 1647 "./sql3.y"
+ case 376:
+#line 1673 "./sql3.y"
{ (yyval.subtok) = INS_SOFT; }
break;
- case 375:
-
-/* Line 1464 of yacc.c */
-#line 1652 "./sql3.y"
+ case 377:
+#line 1678 "./sql3.y"
{ (yyval.box) = NULL;}
break;
- case 376:
-
-/* Line 1464 of yacc.c */
-#line 1653 "./sql3.y"
+ case 378:
+#line 1679 "./sql3.y"
{(yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 377:
-
-/* Line 1464 of yacc.c */
-#line 1659 "./sql3.y"
+ case 379:
+#line 1685 "./sql3.y"
{ (yyval.tree) = t_listst (7, INSERT_STMT, (yyvsp[(3) - (7)].strval), (yyvsp[(6) - (7)].tree), (yyvsp[(7) - (7)].tree), (ptrlong) (yyvsp[(2) - (7)].subtok), (yyvsp[(4) - (7)].box), (yyvsp[(5) - (7)].tree)); }
break;
- case 378:
-
-/* Line 1464 of yacc.c */
-#line 1664 "./sql3.y"
+ case 380:
+#line 1690 "./sql3.y"
{ (yyval.tree) = t_listst (2, INSERT_VALUES, sqlp_wrapper_sqlxml((ST**)t_list_to_array ((yyvsp[(3) - (4)].list)))); }
break;
- case 380:
-
-/* Line 1464 of yacc.c */
-#line 1669 "./sql3.y"
+ case 382:
+#line 1695 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 381:
-
-/* Line 1464 of yacc.c */
-#line 1671 "./sql3.y"
+ case 383:
+#line 1697 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 383:
-
-/* Line 1464 of yacc.c */
-#line 1681 "./sql3.y"
+ case 385:
+#line 1707 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_ORDER, t_CONS (1, NULL)); }
break;
- case 384:
-
-/* Line 1464 of yacc.c */
-#line 1682 "./sql3.y"
+ case 386:
+#line 1708 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_ANY_ORDER, t_CONS (1, NULL)); }
break;
- case 385:
-
-/* Line 1464 of yacc.c */
-#line 1683 "./sql3.y"
+ case 387:
+#line 1709 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_SPARQL, t_CONS (1, NULL)); }
break;
- case 386:
-
-/* Line 1464 of yacc.c */
-#line 1684 "./sql3.y"
+ case 388:
+#line 1710 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_SAME_AS, t_CONS (1, NULL)); }
break;
- case 387:
-
-/* Line 1464 of yacc.c */
-#line 1685 "./sql3.y"
+ case 389:
+#line 1711 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_ARRAY, t_CONS (1, NULL)); }
break;
- case 388:
-
-/* Line 1464 of yacc.c */
-#line 1686 "./sql3.y"
+ case 390:
+#line 1712 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_JOIN, t_CONS (OPT_HASH, NULL)); }
break;
- case 389:
-
-/* Line 1464 of yacc.c */
-#line 1687 "./sql3.y"
+ case 391:
+#line 1713 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_JOIN, t_CONS (OPT_INTERSECT, NULL)); }
break;
- case 390:
-
-/* Line 1464 of yacc.c */
-#line 1688 "./sql3.y"
+ case 392:
+#line 1714 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_JOIN, t_CONS (OPT_LOOP, NULL)); }
break;
- case 391:
-
-/* Line 1464 of yacc.c */
-#line 1689 "./sql3.y"
+ case 393:
+#line 1715 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_SUBQ_LOOP, t_CONS (SUBQ_LOOP, NULL)); }
break;
- case 392:
-
-/* Line 1464 of yacc.c */
-#line 1690 "./sql3.y"
+ case 394:
+#line 1716 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_SUBQ_LOOP, t_CONS (SUBQ_NO_LOOP, NULL)); }
break;
- case 393:
-
-/* Line 1464 of yacc.c */
-#line 1691 "./sql3.y"
+ case 395:
+#line 1717 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INDEX, t_CONS ((yyvsp[(2) - (2)].box), NULL)); }
break;
- case 394:
-
-/* Line 1464 of yacc.c */
-#line 1692 "./sql3.y"
+ case 396:
+#line 1718 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INDEX, t_CONS (t_box_string ("PRIMARY KEY"), NULL)); }
break;
- case 395:
-
-/* Line 1464 of yacc.c */
-#line 1693 "./sql3.y"
+ case 397:
+#line 1719 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INDEX, t_CONS (t_box_string ("TEXT KEY"), NULL)); }
break;
- case 396:
-
-/* Line 1464 of yacc.c */
-#line 1694 "./sql3.y"
+ case 398:
+#line 1720 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INDEX_ONLY, t_CONS (t_box_num (1), NULL)); }
break;
- case 397:
-
-/* Line 1464 of yacc.c */
-#line 1695 "./sql3.y"
+ case 399:
+#line 1721 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_RDF_INFERENCE, t_CONS ((yyvsp[(2) - (2)].box), NULL)); }
break;
- case 398:
-
-/* Line 1464 of yacc.c */
-#line 1696 "./sql3.y"
+ case 400:
+#line 1722 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_NO_CLUSTER, t_CONS (1, NULL)); }
break;
- case 399:
-
-/* Line 1464 of yacc.c */
-#line 1697 "./sql3.y"
+ case 401:
+#line 1723 "./sql3.y"
{ (yyval.list) = t_CONS (OPT_INTO, t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
- case 400:
-
-/* Line 1464 of yacc.c */
-#line 1698 "./sql3.y"
+ case 402:
+#line 1724 "./sql3.y"
{
if (!stricmp ((yyvsp[(1) - (2)].box), "vacuum"))
(yyval.list) = t_CONS (OPT_VACUUM, t_CONS ((yyvsp[(2) - (2)].box), NULL));
@@ -11121,122 +10424,88 @@ yyreduce:
}
break;
- case 401:
-
-/* Line 1464 of yacc.c */
-#line 1709 "./sql3.y"
+ case 403:
+#line 1735 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
- case 402:
-
-/* Line 1464 of yacc.c */
-#line 1710 "./sql3.y"
+ case 404:
+#line 1736 "./sql3.y"
{ (yyval.list) = NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
- case 403:
-
-/* Line 1464 of yacc.c */
-#line 1714 "./sql3.y"
+ case 405:
+#line 1740 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 404:
-
-/* Line 1464 of yacc.c */
-#line 1715 "./sql3.y"
+ case 406:
+#line 1741 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(3) - (4)].list)); }
break;
- case 405:
-
-/* Line 1464 of yacc.c */
-#line 1719 "./sql3.y"
+ case 407:
+#line 1745 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 406:
-
-/* Line 1464 of yacc.c */
-#line 1720 "./sql3.y"
+ case 408:
+#line 1746 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(4) - (5)].list)); }
break;
- case 407:
-
-/* Line 1464 of yacc.c */
-#line 1724 "./sql3.y"
+ case 409:
+#line 1750 "./sql3.y"
{ (yyval.tree) = (ST *) EXCLUSIVE_OPT; }
break;
- case 408:
-
-/* Line 1464 of yacc.c */
-#line 1725 "./sql3.y"
+ case 410:
+#line 1751 "./sql3.y"
{ (yyval.tree) = t_listst (2, PREFETCH_OPT, (yyvsp[(2) - (2)].box)); }
break;
- case 409:
-
-/* Line 1464 of yacc.c */
-#line 1729 "./sql3.y"
+ case 411:
+#line 1755 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 410:
-
-/* Line 1464 of yacc.c */
-#line 1731 "./sql3.y"
+ case 412:
+#line 1757 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 411:
-
-/* Line 1464 of yacc.c */
-#line 1735 "./sql3.y"
+ case 413:
+#line 1761 "./sql3.y"
{ (yyval.box) = NULL; }
break;
- case 412:
-
-/* Line 1464 of yacc.c */
-#line 1736 "./sql3.y"
+ case 414:
+#line 1762 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(2) - (3)].list)); }
break;
- case 413:
-
-/* Line 1464 of yacc.c */
-#line 1741 "./sql3.y"
+ case 415:
+#line 1767 "./sql3.y"
{ (yyval.tree) = t_listst (4, OPEN_STMT, (yyvsp[(2) - (3)].box), (yyvsp[(3) - (3)].box), NULL); }
break;
- case 414:
-
-/* Line 1464 of yacc.c */
-#line 1746 "./sql3.y"
+ case 416:
+#line 1772 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("__rollback"), t_list (0)); }
break;
- case 415:
-
-/* Line 1464 of yacc.c */
-#line 1751 "./sql3.y"
+ case 417:
+#line 1777 "./sql3.y"
{ (yyval.box) = NULL; }
break;
- case 416:
-
-/* Line 1464 of yacc.c */
-#line 1752 "./sql3.y"
+ case 418:
+#line 1778 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 417:
-
-/* Line 1464 of yacc.c */
-#line 1758 "./sql3.y"
+ case 419:
+#line 1784 "./sql3.y"
{ char *tmp_cr = "temp_cr";
ST *qspec = t_listst (5,
SELECT_STMT,
@@ -11260,265 +10529,191 @@ yyreduce:
}
break;
- case 418:
-
-/* Line 1464 of yacc.c */
-#line 1785 "./sql3.y"
+ case 420:
+#line 1811 "./sql3.y"
{ (yyval.list) = t_CONS (sqlp_col_num ((yyvsp[(1) - (1)].box)), NULL); }
break;
- case 419:
-
-/* Line 1464 of yacc.c */
-#line 1786 "./sql3.y"
+ case 421:
+#line 1812 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS (sqlp_col_num ((yyvsp[(3) - (3)].box)), NULL)); }
break;
- case 420:
-
-/* Line 1464 of yacc.c */
-#line 1790 "./sql3.y"
+ case 422:
+#line 1816 "./sql3.y"
{ (yyval.box) = t_listbox (1, sqlp_col_num ((yyvsp[(1) - (1)].box))); }
break;
- case 421:
-
-/* Line 1464 of yacc.c */
-#line 1791 "./sql3.y"
+ case 423:
+#line 1817 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(2) - (3)].list)); }
break;
- case 422:
-
-/* Line 1464 of yacc.c */
-#line 1796 "./sql3.y"
+ case 424:
+#line 1822 "./sql3.y"
{ global_trans->_.trans.min = (yyvsp[(3) - (4)].tree); }
break;
- case 423:
-
-/* Line 1464 of yacc.c */
-#line 1797 "./sql3.y"
+ case 425:
+#line 1823 "./sql3.y"
{ global_trans->_.trans.max = (yyvsp[(3) - (4)].tree); }
break;
- case 424:
-
-/* Line 1464 of yacc.c */
-#line 1798 "./sql3.y"
+ case 426:
+#line 1824 "./sql3.y"
{ global_trans->_.trans.distinct = 1; }
break;
- case 425:
-
-/* Line 1464 of yacc.c */
-#line 1799 "./sql3.y"
+ case 427:
+#line 1825 "./sql3.y"
{ global_trans->_.trans.exists = 1; }
break;
- case 426:
-
-/* Line 1464 of yacc.c */
-#line 1800 "./sql3.y"
+ case 428:
+#line 1826 "./sql3.y"
{ global_trans->_.trans.no_cycles = 1; }
break;
- case 427:
-
-/* Line 1464 of yacc.c */
-#line 1801 "./sql3.y"
+ case 429:
+#line 1827 "./sql3.y"
{ global_trans->_.trans.cycles_only = 1; }
break;
- case 428:
-
-/* Line 1464 of yacc.c */
-#line 1802 "./sql3.y"
+ case 430:
+#line 1828 "./sql3.y"
{ global_trans->_.trans.no_order = 1; }
break;
- case 429:
-
-/* Line 1464 of yacc.c */
-#line 1803 "./sql3.y"
+ case 431:
+#line 1829 "./sql3.y"
{ global_trans->_.trans.shortest_only = 1; }
break;
- case 430:
-
-/* Line 1464 of yacc.c */
-#line 1804 "./sql3.y"
+ case 432:
+#line 1830 "./sql3.y"
{ global_trans->_.trans.in = (ptrlong*) (yyvsp[(2) - (2)].box); }
break;
- case 431:
-
-/* Line 1464 of yacc.c */
-#line 1805 "./sql3.y"
+ case 433:
+#line 1831 "./sql3.y"
{ global_trans->_.trans.out = (ptrlong*) (yyvsp[(2) - (2)].box); }
break;
- case 432:
-
-/* Line 1464 of yacc.c */
-#line 1806 "./sql3.y"
+ case 434:
+#line 1832 "./sql3.y"
{ global_trans->_.trans.end_flag = (ptrlong)sqlp_col_num ((yyvsp[(2) - (2)].box)); }
break;
- case 433:
-
-/* Line 1464 of yacc.c */
-#line 1807 "./sql3.y"
+ case 435:
+#line 1833 "./sql3.y"
{ global_trans->_.trans.final_as = (yyvsp[(2) - (2)].box); }
break;
- case 434:
-
-/* Line 1464 of yacc.c */
-#line 1808 "./sql3.y"
+ case 436:
+#line 1834 "./sql3.y"
{ global_trans->_.trans.direction = unbox ((yyvsp[(2) - (2)].box)); }
break;
- case 437:
-
-/* Line 1464 of yacc.c */
-#line 1818 "./sql3.y"
+ case 439:
+#line 1844 "./sql3.y"
{ global_trans = (ST *) t_alloc_box (sizeof (sql_tree_t), DV_ARRAY_OF_POINTER); memset (global_trans, 0, box_length ((caddr_t)global_trans));}
break;
- case 438:
-
-/* Line 1464 of yacc.c */
-#line 1819 "./sql3.y"
+ case 440:
+#line 1845 "./sql3.y"
{ (yyval.tree) = global_trans; global_trans = NULL; }
break;
- case 439:
-
-/* Line 1464 of yacc.c */
-#line 1824 "./sql3.y"
+ case 441:
+#line 1850 "./sql3.y"
{ (yyval.intval) = 0; }
break;
- case 440:
-
-/* Line 1464 of yacc.c */
-#line 1825 "./sql3.y"
+ case 442:
+#line 1851 "./sql3.y"
{ (yyval.intval) = 0; }
break;
- case 441:
-
-/* Line 1464 of yacc.c */
-#line 1826 "./sql3.y"
+ case 443:
+#line 1852 "./sql3.y"
{ (yyval.intval) = 1; }
break;
- case 442:
-
-/* Line 1464 of yacc.c */
-#line 1837 "./sql3.y"
+ case 444:
+#line 1863 "./sql3.y"
{ (yyval.intval) = 0; }
break;
- case 443:
-
-/* Line 1464 of yacc.c */
-#line 1838 "./sql3.y"
+ case 445:
+#line 1864 "./sql3.y"
{ (yyval.intval) = 1; }
break;
- case 444:
-
-/* Line 1464 of yacc.c */
-#line 1843 "./sql3.y"
+ case 446:
+#line 1869 "./sql3.y"
{ (yyval.tree) = (ST*) (ptrlong) (yyvsp[(1) - (1)].intval); }
break;
- case 445:
-
-/* Line 1464 of yacc.c */
-#line 1845 "./sql3.y"
+ case 447:
+#line 1871 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (7, SELECT_TOP, (ptrlong) (yyvsp[(1) - (4)].intval), (yyvsp[(3) - (4)].box), t_box_num (0), /*$4, $5*/ 0, (ptrlong) (yyvsp[(4) - (4)].intval), NULL); }
break;
- case 446:
-
-/* Line 1464 of yacc.c */
-#line 1847 "./sql3.y"
+ case 448:
+#line 1873 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (7, SELECT_TOP, (ptrlong) (yyvsp[(1) - (6)].intval), (yyvsp[(4) - (6)].tree), t_box_num (0), /*$6, $7*/ 0, (ptrlong) (yyvsp[(6) - (6)].intval), NULL); }
break;
- case 447:
-
-/* Line 1464 of yacc.c */
-#line 1849 "./sql3.y"
+ case 449:
+#line 1875 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (7, SELECT_TOP, (ptrlong) (yyvsp[(1) - (6)].intval), (yyvsp[(5) - (6)].box), (yyvsp[(3) - (6)].box), /*$6, $7*/ 0, (ptrlong) (yyvsp[(6) - (6)].intval), NULL); }
break;
- case 448:
-
-/* Line 1464 of yacc.c */
-#line 1851 "./sql3.y"
+ case 450:
+#line 1877 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (7, SELECT_TOP, (ptrlong) (yyvsp[(1) - (8)].intval), (yyvsp[(6) - (8)].tree), (yyvsp[(4) - (8)].tree), /*$8, $9*/ 0, (ptrlong) (yyvsp[(8) - (8)].intval), NULL); }
break;
- case 449:
-
-/* Line 1464 of yacc.c */
-#line 1852 "./sql3.y"
+ case 451:
+#line 1878 "./sql3.y"
{ (yyval.tree) = t_listst (7, SELECT_TOP, NULL, NULL, NULL, NULL, NULL, (yyvsp[(1) - (1)].tree));}
break;
- case 450:
-
-/* Line 1464 of yacc.c */
-#line 1854 "./sql3.y"
+ case 452:
+#line 1880 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (7, SELECT_TOP, (ptrlong) (yyvsp[(1) - (7)].intval), t_box_num_and_zero (-1 * unbox((yyvsp[(6) - (7)].box))), (yyvsp[(3) - (7)].box), /*$6, $7*/ 0, (ptrlong) (yyvsp[(7) - (7)].intval), NULL); }
break;
- case 451:
-
-/* Line 1464 of yacc.c */
-#line 1860 "./sql3.y"
+ case 453:
+#line 1886 "./sql3.y"
{ ST ** asg = (ST **) t_list_to_array ((yyvsp[(4) - (9)].list));
ST ** cols = asg_col_list (asg);
ST ** vals = asg_val_list (asg);
(yyval.tree) = t_listst (6, UPDATE_POS, (yyvsp[(2) - (9)].strval), cols, vals, (yyvsp[(8) - (9)].box), (yyvsp[(9) - (9)].tree)); }
break;
- case 452:
-
-/* Line 1464 of yacc.c */
-#line 1867 "./sql3.y"
+ case 454:
+#line 1893 "./sql3.y"
{ (yyval.list) = NULL; }
break;
- case 453:
-
-/* Line 1464 of yacc.c */
-#line 1868 "./sql3.y"
+ case 455:
+#line 1894 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
- case 454:
-
-/* Line 1464 of yacc.c */
-#line 1870 "./sql3.y"
+ case 456:
+#line 1896 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
- case 455:
-
-/* Line 1464 of yacc.c */
-#line 1874 "./sql3.y"
+ case 457:
+#line 1900 "./sql3.y"
{ (yyval.box) = t_listbox (2, (yyvsp[(1) - (3)].strval), sqlp_wrapper_sqlxml_assign((ST*)(yyvsp[(3) - (3)].tree))); }
break;
- case 456:
-
-/* Line 1464 of yacc.c */
-#line 1879 "./sql3.y"
+ case 458:
+#line 1905 "./sql3.y"
{
ST **asg = (ST **) t_list_to_array ((yyvsp[(4) - (6)].list));
ST **cols = asg_col_list (asg);
@@ -11530,268 +10725,192 @@ yyreduce:
}
break;
- case 457:
-
-/* Line 1464 of yacc.c */
-#line 1891 "./sql3.y"
+ case 459:
+#line 1917 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
- case 458:
-
-/* Line 1464 of yacc.c */
-#line 1892 "./sql3.y"
+ case 460:
+#line 1918 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
- case 462:
-
-/* Line 1464 of yacc.c */
-#line 1903 "./sql3.y"
+ case 464:
+#line 1929 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
- case 464:
-
-/* Line 1464 of yacc.c */
-#line 1910 "./sql3.y"
+ case 466:
+#line 1936 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
- case 465:
-
-/* Line 1464 of yacc.c */
-#line 1911 "./sql3.y"
+ case 467:
+#line 1937 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
- case 467:
-
-/* Line 1464 of yacc.c */
-#line 1917 "./sql3.y"
+ case 469:
+#line 1943 "./sql3.y"
{ (yyval.tree) = t_listst (5, UNION_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree), sqlp_bunion_flag ((yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(2) - (5)].subtok))); }
break;
- case 468:
-
-/* Line 1464 of yacc.c */
-#line 1919 "./sql3.y"
+ case 470:
+#line 1945 "./sql3.y"
{ (yyval.tree) = t_listst (5, UNION_ALL_ST, (yyvsp[(1) - (6)].tree), (yyvsp[(6) - (6)].tree), (yyvsp[(5) - (6)].tree), sqlp_bunion_flag ((yyvsp[(1) - (6)].tree), (yyvsp[(6) - (6)].tree), (yyvsp[(2) - (6)].subtok))); }
break;
- case 469:
-
-/* Line 1464 of yacc.c */
-#line 1921 "./sql3.y"
+ case 471:
+#line 1947 "./sql3.y"
{ (yyval.tree) = t_listst (4, INTERSECT_ST, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree), (yyvsp[(3) - (4)].tree)); }
break;
- case 470:
-
-/* Line 1464 of yacc.c */
-#line 1923 "./sql3.y"
+ case 472:
+#line 1949 "./sql3.y"
{ (yyval.tree) = t_listst (4, INTERSECT_ALL_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
- case 471:
-
-/* Line 1464 of yacc.c */
-#line 1925 "./sql3.y"
+ case 473:
+#line 1951 "./sql3.y"
{ (yyval.tree) = t_listst (4, EXCEPT_ST, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree), (yyvsp[(3) - (4)].tree)); }
break;
- case 472:
-
-/* Line 1464 of yacc.c */
-#line 1927 "./sql3.y"
+ case 474:
+#line 1953 "./sql3.y"
{ (yyval.tree) = t_listst (4, EXCEPT_ALL_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
- case 476:
-
-/* Line 1464 of yacc.c */
-#line 1937 "./sql3.y"
+ case 478:
+#line 1963 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
- case 478:
-
-/* Line 1464 of yacc.c */
-#line 1943 "./sql3.y"
+ case 480:
+#line 1969 "./sql3.y"
{ (yyval.tree) = t_listst (5, UNION_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree), sqlp_bunion_flag ((yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(2) - (5)].subtok))); }
break;
- case 479:
-
-/* Line 1464 of yacc.c */
-#line 1945 "./sql3.y"
+ case 481:
+#line 1971 "./sql3.y"
{ (yyval.tree) = t_listst (5, UNION_ALL_ST, (yyvsp[(1) - (6)].tree), (yyvsp[(6) - (6)].tree), (yyvsp[(5) - (6)].tree), sqlp_bunion_flag ((yyvsp[(1) - (6)].tree), (yyvsp[(6) - (6)].tree), (yyvsp[(2) - (6)].subtok))); }
break;
- case 480:
-
-/* Line 1464 of yacc.c */
-#line 1947 "./sql3.y"
+ case 482:
+#line 1973 "./sql3.y"
{ (yyval.tree) = t_listst (4, INTERSECT_ST, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree), (yyvsp[(3) - (4)].tree)); }
break;
- case 481:
-
-/* Line 1464 of yacc.c */
-#line 1949 "./sql3.y"
+ case 483:
+#line 1975 "./sql3.y"
{ (yyval.tree) = t_listst (4, INTERSECT_ALL_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
- case 482:
-
-/* Line 1464 of yacc.c */
-#line 1951 "./sql3.y"
+ case 484:
+#line 1977 "./sql3.y"
{ (yyval.tree) = t_listst (4, EXCEPT_ST, (yyvsp[(1) - (4)].tree), (yyvsp[(4) - (4)].tree), (yyvsp[(3) - (4)].tree)); }
break;
- case 483:
-
-/* Line 1464 of yacc.c */
-#line 1953 "./sql3.y"
- { (yyval.tree) = t_listst (4, EXCEPT_ALL_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
- break;
-
case 485:
-
-/* Line 1464 of yacc.c */
-#line 1958 "./sql3.y"
- { (yyval.tree) = sqlp_embedded_xpath ((yyvsp[(2) - (2)].box)); }
+#line 1979 "./sql3.y"
+ { (yyval.tree) = t_listst (4, EXCEPT_ALL_ST, (yyvsp[(1) - (5)].tree), (yyvsp[(5) - (5)].tree), (yyvsp[(4) - (5)].tree)); }
break;
case 487:
-
-/* Line 1464 of yacc.c */
-#line 1963 "./sql3.y"
- { (yyval.tree) = sqlp_inline_order_by ((yyvsp[(2) - (4)].tree), (ST **) (yyvsp[(4) - (4)].box)); }
- break;
-
- case 488:
-
-/* Line 1464 of yacc.c */
-#line 1964 "./sql3.y"
+#line 1984 "./sql3.y"
{ (yyval.tree) = sqlp_embedded_xpath ((yyvsp[(2) - (2)].box)); }
break;
case 489:
-
-/* Line 1464 of yacc.c */
-#line 1968 "./sql3.y"
- { (yyval.tree) = sqlp_inline_order_by ((yyvsp[(3) - (5)].tree), (ST **) (yyvsp[(5) - (5)].box)); }
+#line 1989 "./sql3.y"
+ { (yyval.tree) = sqlp_inline_order_by ((yyvsp[(2) - (4)].tree), (ST **) (yyvsp[(4) - (4)].box)); }
break;
case 490:
-
-/* Line 1464 of yacc.c */
-#line 1972 "./sql3.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+#line 1990 "./sql3.y"
+ { (yyval.tree) = sqlp_embedded_xpath ((yyvsp[(2) - (2)].box)); }
break;
case 491:
-
-/* Line 1464 of yacc.c */
-#line 1973 "./sql3.y"
- { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
+#line 1994 "./sql3.y"
+ { (yyval.tree) = sqlp_inline_order_by ((yyvsp[(3) - (5)].tree), (ST **) (yyvsp[(5) - (5)].box)); }
break;
case 492:
-
-/* Line 1464 of yacc.c */
-#line 1977 "./sql3.y"
- { (yyval.tree) = NULL; }
+#line 1998 "./sql3.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 493:
-
-/* Line 1464 of yacc.c */
-#line 1979 "./sql3.y"
- { (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(4) - (5)].list)); }
+#line 1999 "./sql3.y"
+ { (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 494:
-
-/* Line 1464 of yacc.c */
-#line 1984 "./sql3.y"
- { (yyval.tree) = t_listst (5, SELECT_STMT, (yyvsp[(2) - (4)].tree),
- sqlp_stars (sqlp_wrapper_sqlxml ((ST **) (yyvsp[(3) - (4)].tree)), (yyvsp[(4) - (4)].tree)->_.table_exp.from) , NULL, (yyvsp[(4) - (4)].tree));
- sqlp_breakup ((yyval.tree)); }
+#line 2003 "./sql3.y"
+ { (yyval.tree) = NULL; }
break;
case 495:
+#line 2005 "./sql3.y"
+ { (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(4) - (5)].list)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 1991 "./sql3.y"
- {
- if (NULL == (yyvsp[(4) - (4)].tree))
- (yyval.tree) = t_listst (5, SELECT_STMT, NULL,
- sqlp_stars (sqlp_wrapper_sqlxml ((ST **) (yyvsp[(3) - (4)].tree)), NULL) , NULL, NULL);
- else
- (yyval.tree) = t_listst (5, SELECT_STMT, (yyvsp[(2) - (4)].tree),
+ case 496:
+#line 2010 "./sql3.y"
+ { (yyval.tree) = t_listst (5, SELECT_STMT, (yyvsp[(2) - (4)].tree),
sqlp_stars (sqlp_wrapper_sqlxml ((ST **) (yyvsp[(3) - (4)].tree)), (yyvsp[(4) - (4)].tree)->_.table_exp.from) , NULL, (yyvsp[(4) - (4)].tree));
sqlp_breakup ((yyval.tree)); }
break;
- case 496:
-
-/* Line 1464 of yacc.c */
-#line 2004 "./sql3.y"
+ case 497:
+#line 2018 "./sql3.y"
{ (yyval.tree) = t_listst (5, SELECT_STMT, (yyvsp[(2) - (4)].tree),
sqlp_stars (sqlp_wrapper_sqlxml ((ST **) (yyvsp[(3) - (4)].tree)), (yyvsp[(4) - (4)].tree)->_.table_exp.from) , NULL, (yyvsp[(4) - (4)].tree));
sqlp_breakup ((yyval.tree)); }
break;
- case 497:
+ case 498:
+#line 2025 "./sql3.y"
+ {
+ (yyval.tree) = t_listst (5, SELECT_STMT, NULL,
+ sqlp_stars (sqlp_wrapper_sqlxml ((ST **) (yyvsp[(3) - (3)].tree)), NULL) , NULL, NULL);
+ sqlp_breakup ((yyval.tree)); }
+ break;
-/* Line 1464 of yacc.c */
-#line 2020 "./sql3.y"
+ case 499:
+#line 2034 "./sql3.y"
{ (yyval.list) = dk_set_conc ((yyvsp[(2) - (3)].list), t_CONS (t_list (5, BOP_AS, (ptrlong) 1, NULL, t_box_string ("__brkup_cond"), NULL), NULL)); }
break;
- case 498:
-
-/* Line 1464 of yacc.c */
-#line 2021 "./sql3.y"
+ case 500:
+#line 2035 "./sql3.y"
{
ST * cond = (ST*) t_list (5, BOP_AS, t_list (2, SEARCHED_CASE, t_list (4, (yyvsp[(4) - (5)].tree), (caddr_t)1, t_list (2, QUOTE, NULL), 0)), NULL, t_box_string ("__brkup_cond"), NULL);
(yyval.list) = dk_set_conc ((yyvsp[(2) - (5)].list), t_CONS (cond, NULL)); }
break;
- case 499:
-
-/* Line 1464 of yacc.c */
-#line 2027 "./sql3.y"
+ case 501:
+#line 2041 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].list), NULL);}
break;
- case 500:
-
-/* Line 1464 of yacc.c */
-#line 2028 "./sql3.y"
+ case 502:
+#line 2042 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].list), NULL)); }
break;
- case 501:
-
-/* Line 1464 of yacc.c */
-#line 2032 "./sql3.y"
+ case 503:
+#line 2046 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
- case 502:
-
-/* Line 1464 of yacc.c */
-#line 2033 "./sql3.y"
+ case 504:
+#line 2047 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array (t_CONS (t_list (1, SELECT_BREAKUP), (yyvsp[(2) - (2)].list))); }
break;
- case 503:
-
-/* Line 1464 of yacc.c */
-#line 2038 "./sql3.y"
+ case 505:
+#line 2052 "./sql3.y"
{
ST ** group_by = 0;
if ((yyvsp[(3) - (4)].tree))
@@ -11801,17 +10920,8 @@ yyreduce:
}
break;
- case 504:
-
-/* Line 1464 of yacc.c */
-#line 2048 "./sql3.y"
- { (yyval.tree) = NULL; }
- break;
-
case 506:
-
-/* Line 1464 of yacc.c */
-#line 2055 "./sql3.y"
+#line 2064 "./sql3.y"
{
ST ** group_by = 0;
if ((yyvsp[(3) - (7)].tree))
@@ -11822,219 +10932,161 @@ yyreduce:
break;
case 507:
-
-/* Line 1464 of yacc.c */
-#line 2065 "./sql3.y"
+#line 2074 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (2)].list)); }
break;
case 508:
-
-/* Line 1464 of yacc.c */
-#line 2069 "./sql3.y"
+#line 2078 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 509:
-
-/* Line 1464 of yacc.c */
-#line 2071 "./sql3.y"
+#line 2080 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 510:
-
-/* Line 1464 of yacc.c */
-#line 2076 "./sql3.y"
+#line 2085 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 511:
-
-/* Line 1464 of yacc.c */
-#line 2077 "./sql3.y"
+#line 2086 "./sql3.y"
{ (yyval.list) =t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 512:
-
-/* Line 1464 of yacc.c */
-#line 2083 "./sql3.y"
+#line 2092 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 513:
-
-/* Line 1464 of yacc.c */
-#line 2088 "./sql3.y"
+#line 2097 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (0); }
break;
case 514:
-
-/* Line 1464 of yacc.c */
-#line 2089 "./sql3.y"
+#line 2098 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 515:
-
-/* Line 1464 of yacc.c */
-#line 2094 "./sql3.y"
+#line 2103 "./sql3.y"
{ (yyval.box) = t_listbox (3, TABLE_REF,(yyvsp[(1) - (1)].strval), (caddr_t) NULL); }
break;
case 516:
-
-/* Line 1464 of yacc.c */
-#line 2096 "./sql3.y"
+#line 2105 "./sql3.y"
{
(yyval.box) = t_listbox (3, DERIVED_TABLE, sqlp_view_def (NULL, (yyvsp[(2) - (4)].tree), 0), (yyvsp[(4) - (4)].box));
}
break;
case 517:
-
-/* Line 1464 of yacc.c */
-#line 2100 "./sql3.y"
+#line 2109 "./sql3.y"
{
(yyval.box) = t_listbox (3, DERIVED_TABLE, sqlp_view_def (NULL, (yyvsp[(2) - (5)].tree), 0), (yyvsp[(5) - (5)].box));
}
break;
case 518:
-
-/* Line 1464 of yacc.c */
-#line 2104 "./sql3.y"
+#line 2113 "./sql3.y"
{ (yyval.box) = t_listbox (3, TABLE_REF,(yyvsp[(1) - (1)].tree), (caddr_t) NULL); }
break;
case 519:
-
-/* Line 1464 of yacc.c */
-#line 2106 "./sql3.y"
+#line 2115 "./sql3.y"
{
(yyval.box) = t_listbox (3, DERIVED_TABLE, t_list (4, PROC_TABLE, (yyvsp[(1) - (6)].strval), (yyvsp[(3) - (6)].tree), (yyvsp[(5) - (6)].tree)), (yyvsp[(6) - (6)].box));
}
break;
case 520:
-
-/* Line 1464 of yacc.c */
-#line 2112 "./sql3.y"
+#line 2121 "./sql3.y"
{ (yyval.box) = t_listbox (3, TABLE_REF,(yyvsp[(1) - (1)].strval), (caddr_t) NULL); }
break;
case 521:
-
-/* Line 1464 of yacc.c */
-#line 2114 "./sql3.y"
+#line 2123 "./sql3.y"
{
(yyval.box) = t_listbox (3, DERIVED_TABLE, sqlp_view_def (NULL, (yyvsp[(1) - (2)].tree), 0), (caddr_t) (yyvsp[(2) - (2)].box));
}
break;
case 522:
-
-/* Line 1464 of yacc.c */
-#line 2118 "./sql3.y"
+#line 2127 "./sql3.y"
{
(yyval.box) = t_listbox (3, DERIVED_TABLE, sqlp_view_def (NULL, (yyvsp[(1) - (3)].tree), 0), (caddr_t) (yyvsp[(3) - (3)].box));
}
break;
case 523:
-
-/* Line 1464 of yacc.c */
-#line 2121 "./sql3.y"
+#line 2130 "./sql3.y"
{ (yyval.box) = (caddr_t) (yyvsp[(2) - (3)].tree); }
break;
case 524:
-
-/* Line 1464 of yacc.c */
-#line 2125 "./sql3.y"
+#line 2134 "./sql3.y"
{ (yyval.subtok) = J_INNER; }
break;
case 525:
-
-/* Line 1464 of yacc.c */
-#line 2126 "./sql3.y"
+#line 2135 "./sql3.y"
{ (yyval.subtok) = OJ_LEFT; }
break;
case 526:
-
-/* Line 1464 of yacc.c */
-#line 2127 "./sql3.y"
+#line 2136 "./sql3.y"
{ (yyval.subtok) = OJ_RIGHT; }
break;
case 527:
-
-/* Line 1464 of yacc.c */
-#line 2129 "./sql3.y"
+#line 2138 "./sql3.y"
{ (yyval.subtok) = OJ_FULL; }
break;
case 528:
-
-/* Line 1464 of yacc.c */
-#line 2130 "./sql3.y"
+#line 2139 "./sql3.y"
{ (yyval.subtok) = J_INNER; }
break;
case 529:
-
-/* Line 1464 of yacc.c */
-#line 2131 "./sql3.y"
+#line 2140 "./sql3.y"
{ (yyval.subtok) = J_CROSS; }
break;
case 532:
-
-/* Line 1464 of yacc.c */
-#line 2141 "./sql3.y"
+#line 2150 "./sql3.y"
{ (yyval.join).type = (yyvsp[(2) - (2)].subtok);
(yyval.join).natural = 1;
}
break;
case 533:
-
-/* Line 1464 of yacc.c */
-#line 2145 "./sql3.y"
+#line 2154 "./sql3.y"
{ (yyval.join).type = (yyvsp[(1) - (1)].subtok);
(yyval.join).natural = 0;
}
break;
case 534:
-
-/* Line 1464 of yacc.c */
-#line 2151 "./sql3.y"
+#line 2160 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 535:
-
-/* Line 1464 of yacc.c */
-#line 2152 "./sql3.y"
+#line 2161 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 536:
-
-/* Line 1464 of yacc.c */
-#line 2153 "./sql3.y"
+#line 2162 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 537:
-
-/* Line 1464 of yacc.c */
-#line 2158 "./sql3.y"
+#line 2167 "./sql3.y"
{
(yyval.tree) = t_listst (6, JOINED_TABLE, (yyvsp[(2) - (5)].join).natural, (yyvsp[(2) - (5)].join).type,
(yyvsp[(1) - (5)].box), (yyvsp[(4) - (5)].box), (yyvsp[(5) - (5)].tree));
@@ -12042,53 +11094,39 @@ yyreduce:
break;
case 538:
-
-/* Line 1464 of yacc.c */
-#line 2165 "./sql3.y"
+#line 2174 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 539:
-
-/* Line 1464 of yacc.c */
-#line 2166 "./sql3.y"
+#line 2175 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 540:
-
-/* Line 1464 of yacc.c */
-#line 2168 "./sql3.y"
+#line 2177 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, JC_USING, t_list_to_array ((yyvsp[(3) - (4)].list))); }
break;
case 541:
-
-/* Line 1464 of yacc.c */
-#line 2172 "./sql3.y"
+#line 2181 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 542:
-
-/* Line 1464 of yacc.c */
-#line 2176 "./sql3.y"
+#line 2185 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 543:
-
-/* Line 1464 of yacc.c */
-#line 2178 "./sql3.y"
+#line 2187 "./sql3.y"
{
(yyval.tree) = (ST*) t_list_to_array(t_CONS (t_list_to_array ((yyvsp[(3) - (3)].list)), NULL));
}
break;
case 544:
-
-/* Line 1464 of yacc.c */
-#line 2182 "./sql3.y"
+#line 2191 "./sql3.y"
{
dk_set_t group_by_full = 0;
dk_set_t first_group_by_key = (dk_set_t)(yyvsp[(5) - (6)].list);
@@ -12103,9 +11141,7 @@ yyreduce:
break;
case 545:
-
-/* Line 1464 of yacc.c */
-#line 2194 "./sql3.y"
+#line 2203 "./sql3.y"
{
ST ** etalon = (ST**) t_list_to_array ((yyvsp[(5) - (6)].list));
dk_set_t group_by_full = 0;
@@ -12132,79 +11168,57 @@ yyreduce:
break;
case 546:
-
-/* Line 1464 of yacc.c */
-#line 2228 "./sql3.y"
+#line 2237 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 547:
-
-/* Line 1464 of yacc.c */
-#line 2229 "./sql3.y"
+#line 2238 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 548:
-
-/* Line 1464 of yacc.c */
-#line 2233 "./sql3.y"
+#line 2242 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
case 549:
-
-/* Line 1464 of yacc.c */
-#line 2234 "./sql3.y"
+#line 2243 "./sql3.y"
{ (yyval.subtok) = PL_EXCLUSIVE; }
break;
case 550:
-
-/* Line 1464 of yacc.c */
-#line 2235 "./sql3.y"
+#line 2244 "./sql3.y"
{ (yyval.subtok) = sqlp_xml_select_flags ((yyvsp[(3) - (3)].box), NULL); }
break;
case 551:
-
-/* Line 1464 of yacc.c */
-#line 2236 "./sql3.y"
+#line 2245 "./sql3.y"
{ (yyval.subtok) = sqlp_xml_select_flags ((yyvsp[(3) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
case 552:
-
-/* Line 1464 of yacc.c */
-#line 2243 "./sql3.y"
+#line 2252 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_OR, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 553:
-
-/* Line 1464 of yacc.c */
-#line 2245 "./sql3.y"
+#line 2254 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_AND, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 554:
-
-/* Line 1464 of yacc.c */
-#line 2247 "./sql3.y"
+#line 2256 "./sql3.y"
{ UN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree)) }
break;
case 555:
-
-/* Line 1464 of yacc.c */
-#line 2248 "./sql3.y"
+#line 2257 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 565:
-
-/* Line 1464 of yacc.c */
-#line 2265 "./sql3.y"
+#line 2274 "./sql3.y"
{
ST *eq_op;
BIN_OP (eq_op, BOP_EQ, (ST *) t_box_num_and_zero (0), (yyvsp[(1) - (1)].tree));
@@ -12213,9 +11227,7 @@ yyreduce:
break;
case 566:
-
-/* Line 1464 of yacc.c */
-#line 2274 "./sql3.y"
+#line 2283 "./sql3.y"
{ BIN_OP ((yyval.tree), (yyvsp[(2) - (3)].subtok), (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree));
/*IvAn*/ if ((yyval.tree)->type == BOP_NEQ)
{
@@ -12227,9 +11239,7 @@ yyreduce:
break;
case 567:
-
-/* Line 1464 of yacc.c */
-#line 2297 "./sql3.y"
+#line 2306 "./sql3.y"
{ ST *copy = (ST *) t_box_copy_tree ((caddr_t) (yyvsp[(1) - (6)].tree));
ST *low_test;
ST *high_test;
@@ -12240,9 +11250,7 @@ yyreduce:
break;
case 568:
-
-/* Line 1464 of yacc.c */
-#line 2305 "./sql3.y"
+#line 2314 "./sql3.y"
{ ST *copy = (ST *) t_box_copy_tree ((caddr_t) (yyvsp[(1) - (5)].tree));
ST *low_test;
ST *high_test;
@@ -12253,9 +11261,7 @@ yyreduce:
break;
case 569:
-
-/* Line 1464 of yacc.c */
-#line 2316 "./sql3.y"
+#line 2325 "./sql3.y"
{ ST* tmp;
BIN_OP (tmp, BOP_LIKE, (yyvsp[(1) - (5)].tree), (ST *) (yyvsp[(4) - (5)].tree));
tmp->_.bin_exp.more = (yyvsp[(5) - (5)].box);
@@ -12264,9 +11270,7 @@ yyreduce:
break;
case 570:
-
-/* Line 1464 of yacc.c */
-#line 2322 "./sql3.y"
+#line 2331 "./sql3.y"
{
BIN_OP ((yyval.tree), BOP_LIKE, (yyvsp[(1) - (4)].tree), (ST *) (yyvsp[(3) - (4)].tree));
(yyval.tree)->_.bin_exp.more = (yyvsp[(4) - (4)].box);
@@ -12274,16 +11278,12 @@ yyreduce:
break;
case 571:
-
-/* Line 1464 of yacc.c */
-#line 2329 "./sql3.y"
+#line 2338 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 572:
-
-/* Line 1464 of yacc.c */
-#line 2331 "./sql3.y"
+#line 2340 "./sql3.y"
{
if (!DV_STRINGP ((yyvsp[(2) - (2)].box)) || box_length ((yyvsp[(2) - (2)].box)) != 2)
yy_new_error ("Invalid escape character in LIKE", "37000", "SQ136");
@@ -12292,9 +11292,7 @@ yyreduce:
break;
case 573:
-
-/* Line 1464 of yacc.c */
-#line 2337 "./sql3.y"
+#line 2346 "./sql3.y"
{
if (!DV_STRINGP ((yyvsp[(3) - (4)].box)) || box_length ((yyvsp[(3) - (4)].box)) != 2)
yy_new_error ("Invalid escape character in LIKE", "37000", "SQ136");
@@ -12303,9 +11301,7 @@ yyreduce:
break;
case 574:
-
-/* Line 1464 of yacc.c */
-#line 2346 "./sql3.y"
+#line 2355 "./sql3.y"
{ ST *tmp;
BIN_OP (tmp, BOP_NULL, (yyvsp[(1) - (4)].tree), NULL);
NEGATE ((yyval.tree), tmp);
@@ -12313,16 +11309,12 @@ yyreduce:
break;
case 575:
-
-/* Line 1464 of yacc.c */
-#line 2350 "./sql3.y"
+#line 2359 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_NULL, (yyvsp[(1) - (3)].tree), NULL); }
break;
case 576:
-
-/* Line 1464 of yacc.c */
-#line 2355 "./sql3.y"
+#line 2364 "./sql3.y"
{
ST *in = NULL;
in = SUBQ_PRED (SOME_PRED, (yyvsp[(1) - (4)].tree), sqlp_wpar_nonselect ((yyvsp[(4) - (4)].tree)), BOP_EQ, NULL);
@@ -12331,61 +11323,45 @@ yyreduce:
break;
case 577:
-
-/* Line 1464 of yacc.c */
-#line 2361 "./sql3.y"
+#line 2370 "./sql3.y"
{
(yyval.tree) = SUBQ_PRED (SOME_PRED, (yyvsp[(1) - (3)].tree), sqlp_wpar_nonselect ((yyvsp[(3) - (3)].tree)), BOP_EQ, NULL); }
break;
case 578:
-
-/* Line 1464 of yacc.c */
-#line 2364 "./sql3.y"
+#line 2373 "./sql3.y"
{ (yyval.tree) = sqlp_in_exp ((yyvsp[(1) - (6)].tree), (yyvsp[(5) - (6)].list), 1);
}
break;
case 579:
-
-/* Line 1464 of yacc.c */
-#line 2367 "./sql3.y"
+#line 2376 "./sql3.y"
{ (yyval.tree) = sqlp_in_exp ((yyvsp[(1) - (5)].tree), (yyvsp[(4) - (5)].list), 0);
}
break;
case 580:
-
-/* Line 1464 of yacc.c */
-#line 2380 "./sql3.y"
+#line 2389 "./sql3.y"
{ (yyval.tree) = SUBQ_PRED ((yyvsp[(3) - (4)].intval), (yyvsp[(1) - (4)].tree), sqlp_wpar_nonselect ((yyvsp[(4) - (4)].tree)), (yyvsp[(2) - (4)].subtok), NULL); }
break;
case 581:
-
-/* Line 1464 of yacc.c */
-#line 2384 "./sql3.y"
+#line 2393 "./sql3.y"
{ (yyval.intval) = SOME_PRED; }
break;
case 582:
-
-/* Line 1464 of yacc.c */
-#line 2385 "./sql3.y"
+#line 2394 "./sql3.y"
{ (yyval.intval) = ALL_PRED; }
break;
case 583:
-
-/* Line 1464 of yacc.c */
-#line 2386 "./sql3.y"
+#line 2395 "./sql3.y"
{ (yyval.intval) = SOME_PRED; }
break;
case 584:
-
-/* Line 1464 of yacc.c */
-#line 2391 "./sql3.y"
+#line 2400 "./sql3.y"
{
/* exists (select * ..) becomes exists (select 1 ...) */
ST * ext_subq = (yyvsp[(2) - (2)].tree);
@@ -12395,126 +11371,92 @@ yyreduce:
break;
case 585:
-
-/* Line 1464 of yacc.c */
-#line 2400 "./sql3.y"
+#line 2409 "./sql3.y"
{ (yyval.tree) = (ST *) t_list (2, SCALAR_SUBQ, sqlp_add_top_1 ((yyvsp[(1) - (1)].tree))); }
break;
case 586:
-
-/* Line 1464 of yacc.c */
-#line 2405 "./sql3.y"
+#line 2420 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 587:
-
-/* Line 1464 of yacc.c */
-#line 2406 "./sql3.y"
+#line 2421 "./sql3.y"
{ (yyval.tree) = (yyvsp[(3) - (4)].tree); }
break;
case 588:
-
-/* Line 1464 of yacc.c */
-#line 2411 "./sql3.y"
+#line 2426 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_MINUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 589:
-
-/* Line 1464 of yacc.c */
-#line 2412 "./sql3.y"
+#line 2427 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_PLUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 590:
-
-/* Line 1464 of yacc.c */
-#line 2413 "./sql3.y"
+#line 2428 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_TIMES, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 591:
-
-/* Line 1464 of yacc.c */
-#line 2414 "./sql3.y"
+#line 2429 "./sql3.y"
{ BIN_OP ((yyval.tree), BOP_DIV, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)) }
break;
case 592:
-
-/* Line 1464 of yacc.c */
-#line 2415 "./sql3.y"
+#line 2430 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 593:
-
-/* Line 1464 of yacc.c */
-#line 2416 "./sql3.y"
+#line 2431 "./sql3.y"
{ if (sqlp_is_num_lit ((caddr_t)((yyvsp[(2) - (2)].tree)))) (yyval.tree) = sqlp_minus ((caddr_t)((yyvsp[(2) - (2)].tree)));
else BIN_OP ((yyval.tree), BOP_MINUS, (ST*) t_box_num (0), (yyvsp[(2) - (2)].tree)) }
break;
case 596:
-
-/* Line 1464 of yacc.c */
-#line 2420 "./sql3.y"
+#line 2435 "./sql3.y"
{ (yyval.tree) = (sql_tree_t *) (yyvsp[(1) - (1)].tree); }
break;
case 599:
-
-/* Line 1464 of yacc.c */
-#line 2426 "./sql3.y"
+#line 2441 "./sql3.y"
{ (yyval.tree) = (sql_tree_t *) (yyvsp[(1) - (1)].box); }
break;
case 602:
-
-/* Line 1464 of yacc.c */
-#line 2429 "./sql3.y"
+#line 2458 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 603:
-
-/* Line 1464 of yacc.c */
-#line 2431 "./sql3.y"
+#line 2460 "./sql3.y"
{ dk_set_t exps = t_CONS ((yyvsp[(2) - (5)].tree), (yyvsp[(4) - (5)].list));
(yyval.tree) = t_listst (2, COMMA_EXP, t_list_to_array (exps));
}
break;
case 616:
-
-/* Line 1464 of yacc.c */
-#line 2449 "./sql3.y"
+#line 2478 "./sql3.y"
{ (yyval.tree) = (sql_tree_t *) (yyvsp[(1) - (1)].box); }
break;
case 619:
-
-/* Line 1464 of yacc.c */
-#line 2452 "./sql3.y"
+#line 2495 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 620:
-
-/* Line 1464 of yacc.c */
-#line 2454 "./sql3.y"
+#line 2497 "./sql3.y"
{ dk_set_t exps = t_CONS ((yyvsp[(2) - (5)].tree), (yyvsp[(4) - (5)].list));
(yyval.tree) = t_listst (2, COMMA_EXP, t_list_to_array (exps));
}
break;
case 633:
-
-/* Line 1464 of yacc.c */
-#line 2473 "./sql3.y"
+#line 2516 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("_cvt"),
t_list (2,
t_list (2, QUOTE, (yyvsp[(3) - (6)].tree)),
@@ -12523,23 +11465,17 @@ yyreduce:
break;
case 634:
-
-/* Line 1464 of yacc.c */
-#line 2481 "./sql3.y"
+#line 2524 "./sql3.y"
{ (yyval.strval) = NULL; }
break;
case 635:
-
-/* Line 1464 of yacc.c */
-#line 2482 "./sql3.y"
+#line 2525 "./sql3.y"
{ (yyval.strval) = (yyvsp[(2) - (2)].strval); }
break;
case 636:
-
-/* Line 1464 of yacc.c */
-#line 2487 "./sql3.y"
+#line 2530 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("_cvt"),
t_list ((yyvsp[(6) - (7)].strval) == NULL ? 2 : 3, t_list (2, QUOTE, (yyvsp[(5) - (7)].tree)),
sqlp_wrapper_sqlxml_assign ((yyvsp[(3) - (7)].tree)), (yyvsp[(6) - (7)].strval) ) );
@@ -12547,235 +11483,169 @@ yyreduce:
break;
case 637:
-
-/* Line 1464 of yacc.c */
-#line 2500 "./sql3.y"
+#line 2543 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (5, XML_COL, (yyvsp[(1) - (3)].box), (yyvsp[(2) - (3)].box), (yyvsp[(3) - (3)].box), XML_COL_ATTR); }
break;
case 638:
-
-/* Line 1464 of yacc.c */
-#line 2502 "./sql3.y"
+#line 2545 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (5, XML_COL, (yyvsp[(1) - (3)].box), (yyvsp[(2) - (3)].box), t_sym_string(""), sqlp_xml_col_directive ((yyvsp[(3) - (3)].box))); }
break;
case 639:
-
-/* Line 1464 of yacc.c */
-#line 2504 "./sql3.y"
+#line 2547 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (5, XML_COL, (yyvsp[(1) - (4)].box), (yyvsp[(2) - (4)].box), (yyvsp[(3) - (4)].box), sqlp_xml_col_directive ((yyvsp[(4) - (4)].box))); }
break;
case 640:
-
-/* Line 1464 of yacc.c */
-#line 2509 "./sql3.y"
+#line 2552 "./sql3.y"
{ (yyval.tree) = t_listst (5, BOP_AS, (yyvsp[(1) - (4)].tree), NULL, (yyvsp[(3) - (4)].box), (yyvsp[(4) - (4)].tree)); }
break;
case 641:
-
-/* Line 1464 of yacc.c */
-#line 2511 "./sql3.y"
+#line 2554 "./sql3.y"
{ (yyval.tree) = t_listst (5, BOP_AS, (yyvsp[(1) - (3)].tree), NULL, (yyvsp[(3) - (3)].box), NULL); }
break;
case 642:
-
-/* Line 1464 of yacc.c */
-#line 2513 "./sql3.y"
+#line 2556 "./sql3.y"
{ (yyval.tree) = t_listst (5, BOP_AS, (yyvsp[(1) - (2)].tree), NULL, (yyvsp[(2) - (2)].box), NULL); }
break;
case 643:
-
-/* Line 1464 of yacc.c */
-#line 2515 "./sql3.y"
+#line 2558 "./sql3.y"
{ (yyval.tree) = t_listst (6, BOP_AS, (yyvsp[(1) - (3)].tree), NULL, sqlp_xml_col_name ((yyvsp[(3) - (3)].tree)), NULL, (yyvsp[(3) - (3)].tree)); }
break;
case 644:
-
-/* Line 1464 of yacc.c */
-#line 2517 "./sql3.y"
+#line 2560 "./sql3.y"
{ (yyval.tree) = t_listst (5, BOP_AS, (yyvsp[(1) - (3)].tree), NULL, t_sym_string ((yyvsp[(3) - (3)].box)), NULL); }
break;
case 645:
-
-/* Line 1464 of yacc.c */
-#line 2519 "./sql3.y"
+#line 2562 "./sql3.y"
{ (yyval.tree) = t_listst (5, BOP_AS, (yyvsp[(1) - (2)].tree), NULL, t_sym_string ((yyvsp[(2) - (2)].box)), NULL); }
break;
case 646:
-
-/* Line 1464 of yacc.c */
-#line 2524 "./sql3.y"
+#line 2567 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("aref"),
t_list_to_array (t_CONS ((yyvsp[(1) - (2)].tree), (yyvsp[(2) - (2)].list))) ); }
break;
case 648:
-
-/* Line 1464 of yacc.c */
-#line 2531 "./sql3.y"
+#line 2574 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("aref"),
t_list_to_array (t_CONS ((yyvsp[(1) - (2)].tree), (yyvsp[(2) - (2)].list))) ); }
break;
case 649:
-
-/* Line 1464 of yacc.c */
-#line 2536 "./sql3.y"
+#line 2579 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 651:
-
-/* Line 1464 of yacc.c */
-#line 2544 "./sql3.y"
+#line 2587 "./sql3.y"
{ (yyval.box) = sqlp_proc_name (NULL, 0, NULL, 0, NULL, (yyvsp[(1) - (1)].box)); }
break;
case 652:
-
-/* Line 1464 of yacc.c */
-#line 2545 "./sql3.y"
+#line 2588 "./sql3.y"
{ (yyval.box) = sqlp_proc_name (NULL, 0, (yyvsp[(1) - (3)].box), box_length ((yyvsp[(1) - (3)].box)), NULL, (yyvsp[(3) - (3)].box)); }
break;
case 653:
-
-/* Line 1464 of yacc.c */
-#line 2546 "./sql3.y"
+#line 2589 "./sql3.y"
{ (yyval.box) = sqlp_proc_name ((yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box), box_length ((yyvsp[(3) - (5)].box)), NULL, (yyvsp[(5) - (5)].box)); }
break;
case 654:
-
-/* Line 1464 of yacc.c */
-#line 2547 "./sql3.y"
+#line 2590 "./sql3.y"
{ (yyval.box) = sqlp_proc_name ((yyvsp[(1) - (7)].box), box_length ((yyvsp[(1) - (7)].box)), (yyvsp[(3) - (7)].box), box_length ((yyvsp[(3) - (7)].box)), (yyvsp[(5) - (7)].box), (yyvsp[(7) - (7)].box)); }
break;
case 655:
-
-/* Line 1464 of yacc.c */
-#line 2548 "./sql3.y"
+#line 2591 "./sql3.y"
{ (yyval.box) = sqlp_proc_name ((yyvsp[(1) - (4)].box), box_length ((yyvsp[(1) - (4)].box)), NULL, 0, NULL, (yyvsp[(4) - (4)].box)); }
break;
case 656:
-
-/* Line 1464 of yacc.c */
-#line 2549 "./sql3.y"
+#line 2592 "./sql3.y"
{ (yyval.box) = sqlp_proc_name ((yyvsp[(1) - (6)].box), box_length ((yyvsp[(1) - (6)].box)), NULL, 0, (yyvsp[(4) - (6)].box), (yyvsp[(6) - (6)].box)); }
break;
case 657:
-
-/* Line 1464 of yacc.c */
-#line 2550 "./sql3.y"
+#line 2593 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("left"); }
break;
case 658:
-
-/* Line 1464 of yacc.c */
-#line 2551 "./sql3.y"
+#line 2594 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("right"); }
break;
case 659:
-
-/* Line 1464 of yacc.c */
-#line 2552 "./sql3.y"
+#line 2595 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase ("log"); }
break;
case 660:
-
-/* Line 1464 of yacc.c */
-#line 2557 "./sql3.y"
+#line 2600 "./sql3.y"
{ (yyval.list) = t_CONS (t_list (3, KWD_PARAM, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].tree)), NULL);}
break;
case 661:
-
-/* Line 1464 of yacc.c */
-#line 2558 "./sql3.y"
+#line 2601 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (5)].list), t_CONS (t_list (3, KWD_PARAM, (yyvsp[(3) - (5)].box), (yyvsp[(5) - (5)].tree)), NULL)); }
break;
case 662:
-
-/* Line 1464 of yacc.c */
-#line 2563 "./sql3.y"
+#line 2606 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 663:
-
-/* Line 1464 of yacc.c */
-#line 2564 "./sql3.y"
+#line 2607 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 664:
-
-/* Line 1464 of yacc.c */
-#line 2565 "./sql3.y"
+#line 2608 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL));}
break;
case 665:
-
-/* Line 1464 of yacc.c */
-#line 2569 "./sql3.y"
+#line 2612 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 666:
-
-/* Line 1464 of yacc.c */
-#line 2570 "./sql3.y"
+#line 2613 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 667:
-
-/* Line 1464 of yacc.c */
-#line 2571 "./sql3.y"
+#line 2614 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 668:
-
-/* Line 1464 of yacc.c */
-#line 2572 "./sql3.y"
+#line 2615 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 669:
-
-/* Line 1464 of yacc.c */
-#line 2574 "./sql3.y"
+#line 2617 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 670:
-
-/* Line 1464 of yacc.c */
-#line 2575 "./sql3.y"
+#line 2618 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 671:
-
-/* Line 1464 of yacc.c */
-#line 2580 "./sql3.y"
+#line 2623 "./sql3.y"
{
ST **arglist = (ST **)t_list_to_array ((yyvsp[(3) - (4)].list));
ST *fun_ref = sqlp_make_user_aggregate_fun_ref ((yyvsp[(1) - (4)].box), arglist, 0);
@@ -12790,9 +11660,7 @@ yyreduce:
break;
case 672:
-
-/* Line 1464 of yacc.c */
-#line 2592 "./sql3.y"
+#line 2635 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ((yyvsp[(1) - (8)].subtok) == SQL_FN_TIMESTAMPADD ? "timestampadd" : "timestampdiff"),
@@ -12801,9 +11669,7 @@ yyreduce:
break;
case 673:
-
-/* Line 1464 of yacc.c */
-#line 2598 "./sql3.y"
+#line 2641 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("__extract"),
@@ -12812,37 +11678,27 @@ yyreduce:
break;
case 674:
-
-/* Line 1464 of yacc.c */
-#line 2604 "./sql3.y"
+#line 2647 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, (yyvsp[(2) - (6)].box), t_list_to_array ((yyvsp[(4) - (6)].list))); }
break;
case 675:
-
-/* Line 1464 of yacc.c */
-#line 2606 "./sql3.y"
+#line 2649 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("left"), t_list_to_array ((yyvsp[(4) - (6)].list))); }
break;
case 676:
-
-/* Line 1464 of yacc.c */
-#line 2608 "./sql3.y"
+#line 2651 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("right"), t_list_to_array ((yyvsp[(4) - (6)].list))); }
break;
case 677:
-
-/* Line 1464 of yacc.c */
-#line 2610 "./sql3.y"
+#line 2653 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("log"), t_list_to_array ((yyvsp[(4) - (6)].list))); }
break;
case 678:
-
-/* Line 1464 of yacc.c */
-#line 2612 "./sql3.y"
+#line 2655 "./sql3.y"
{
if (stricmp ((yyvsp[(2) - (8)].box), "POSITION"))
yyerror ("syntax error");
@@ -12852,39 +11708,29 @@ yyreduce:
break;
case 679:
-
-/* Line 1464 of yacc.c */
-#line 2619 "./sql3.y"
+#line 2662 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, (yyvsp[(2) - (6)].box), t_list_to_array ((yyvsp[(4) - (6)].list))); }
break;
case 680:
-
-/* Line 1464 of yacc.c */
-#line 2621 "./sql3.y"
+#line 2664 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, (yyvsp[(2) - (3)].box), t_list_to_array (NULL)); }
break;
case 681:
-
-/* Line 1464 of yacc.c */
-#line 2623 "./sql3.y"
+#line 2666 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("get_user"), t_list_to_array ((yyvsp[(4) - (6)].list))); }
break;
case 682:
-
-/* Line 1464 of yacc.c */
-#line 2626 "./sql3.y"
+#line 2669 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("chr"), t_list_to_array ((yyvsp[(4) - (6)].list))); }
break;
case 683:
-
-/* Line 1464 of yacc.c */
-#line 2629 "./sql3.y"
+#line 2672 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ((yyvsp[(2) - (10)].subtok) == SQL_FN_TIMESTAMPADD ? "timestampadd" : "timestampdiff"),
@@ -12893,9 +11739,7 @@ yyreduce:
break;
case 684:
-
-/* Line 1464 of yacc.c */
-#line 2635 "./sql3.y"
+#line 2678 "./sql3.y"
{
caddr_t data_type = sqlc_convert_odbc_to_sql_type ((yyvsp[(6) - (8)].box));
if (!data_type)
@@ -12907,9 +11751,7 @@ yyreduce:
break;
case 685:
-
-/* Line 1464 of yacc.c */
-#line 2644 "./sql3.y"
+#line 2687 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("__extract"),
@@ -12918,62 +11760,48 @@ yyreduce:
break;
case 686:
-
-/* Line 1464 of yacc.c */
-#line 2650 "./sql3.y"
+#line 2693 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_list (1, (yyvsp[(3) - (7)].tree)),
t_list_to_array ((yyvsp[(6) - (7)].list))); }
break;
case 687:
-
-/* Line 1464 of yacc.c */
-#line 2653 "./sql3.y"
+#line 2696 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curdate"), t_list (0));
}
break;
case 688:
-
-/* Line 1464 of yacc.c */
-#line 2657 "./sql3.y"
+#line 2700 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curtime"), t_list (0));
}
break;
case 689:
-
-/* Line 1464 of yacc.c */
-#line 2661 "./sql3.y"
+#line 2704 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curtime"), t_list (1, (yyvsp[(3) - (4)].tree)));
}
break;
case 690:
-
-/* Line 1464 of yacc.c */
-#line 2665 "./sql3.y"
+#line 2708 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curdatetime"), t_list (0));
}
break;
case 691:
-
-/* Line 1464 of yacc.c */
-#line 2669 "./sql3.y"
+#line 2712 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curdatetime"), t_list (1, (yyvsp[(3) - (4)].tree)));
}
break;
case 692:
-
-/* Line 1464 of yacc.c */
-#line 2673 "./sql3.y"
+#line 2716 "./sql3.y"
{
caddr_t bit = t_box_num (0);
caddr_t bit_index = t_box_num (0);
@@ -12982,23 +11810,17 @@ yyreduce:
break;
case 693:
-
-/* Line 1464 of yacc.c */
-#line 2683 "./sql3.y"
+#line 2726 "./sql3.y"
{ (yyval.tree) = t_listst (4, CALL_STMT, (yyvsp[(2) - (3)].strval), t_list_to_array (NULL), (yyvsp[(1) - (3)].box)); }
break;
case 694:
-
-/* Line 1464 of yacc.c */
-#line 2685 "./sql3.y"
+#line 2728 "./sql3.y"
{ (yyval.tree) = t_listst (4, CALL_STMT, (yyvsp[(2) - (6)].strval), t_list_to_array ((yyvsp[(4) - (6)].list)), (yyvsp[(1) - (6)].box)); }
break;
case 695:
-
-/* Line 1464 of yacc.c */
-#line 2705 "./sql3.y"
+#line 2748 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase (obe_keyword_to_bif_fun_name ((yyvsp[(2) - (4)].box))),
t_list (1, (yyvsp[(3) - (4)].box)));
@@ -13006,175 +11828,127 @@ yyreduce:
break;
case 696:
-
-/* Line 1464 of yacc.c */
-#line 2710 "./sql3.y"
+#line 2753 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("get_keyword"),
t_list (2, (yyvsp[(2) - (3)].box), t_list (3, COL_DOTTED, NULL, t_sqlp_box_id_upcase ("params")))); }
break;
case 697:
-
-/* Line 1464 of yacc.c */
-#line 2715 "./sql3.y"
+#line 2758 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 698:
-
-/* Line 1464 of yacc.c */
-#line 2716 "./sql3.y"
+#line 2759 "./sql3.y"
{ t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 699:
-
-/* Line 1464 of yacc.c */
-#line 2720 "./sql3.y"
+#line 2763 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 700:
-
-/* Line 1464 of yacc.c */
-#line 2721 "./sql3.y"
+#line 2764 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 701:
-
-/* Line 1464 of yacc.c */
-#line 2722 "./sql3.y"
+#line 2765 "./sql3.y"
{ t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 702:
-
-/* Line 1464 of yacc.c */
-#line 2723 "./sql3.y"
+#line 2766 "./sql3.y"
{ t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 705:
-
-/* Line 1464 of yacc.c */
-#line 2729 "./sql3.y"
+#line 2772 "./sql3.y"
{ (yyval.box) = t_listbox (3, CALL_STMT,
t_sqlp_box_id_upcase ("get_user"), t_list (0)); }
break;
case 707:
-
-/* Line 1464 of yacc.c */
-#line 2735 "./sql3.y"
+#line 2778 "./sql3.y"
{ (yyval.box) = (caddr_t) (yyvsp[(1) - (1)].tree); }
break;
case 708:
-
-/* Line 1464 of yacc.c */
-#line 2740 "./sql3.y"
+#line 2783 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, SIMPLE_CASE,
t_list_to_array (t_CONS ((yyvsp[(2) - (4)].tree), (yyvsp[(3) - (4)].list)))); }
break;
case 709:
-
-/* Line 1464 of yacc.c */
-#line 2746 "./sql3.y"
+#line 2789 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, SEARCHED_CASE, t_list_to_array ((yyvsp[(2) - (3)].list))); }
break;
case 710:
-
-/* Line 1464 of yacc.c */
-#line 2750 "./sql3.y"
+#line 2793 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 711:
-
-/* Line 1464 of yacc.c */
-#line 2751 "./sql3.y"
+#line 2794 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 712:
-
-/* Line 1464 of yacc.c */
-#line 2755 "./sql3.y"
+#line 2798 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 713:
-
-/* Line 1464 of yacc.c */
-#line 2756 "./sql3.y"
+#line 2799 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 714:
-
-/* Line 1464 of yacc.c */
-#line 2761 "./sql3.y"
+#line 2804 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(2) - (4)].tree), t_CONS ((yyvsp[(4) - (4)].tree), NULL)); }
break;
case 715:
-
-/* Line 1464 of yacc.c */
-#line 2763 "./sql3.y"
+#line 2806 "./sql3.y"
{ (yyval.list) = t_CONS ( t_list (2, QUOTE, NULL), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 716:
-
-/* Line 1464 of yacc.c */
-#line 2768 "./sql3.y"
+#line 2811 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(2) - (4)].tree), t_CONS ((yyvsp[(4) - (4)].tree), NULL)); }
break;
case 717:
-
-/* Line 1464 of yacc.c */
-#line 2770 "./sql3.y"
+#line 2813 "./sql3.y"
{ (yyval.list) = t_CONS ( t_list (2, QUOTE, NULL), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 718:
-
-/* Line 1464 of yacc.c */
-#line 2775 "./sql3.y"
+#line 2818 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, COALESCE_EXP, t_list_to_array ((yyvsp[(3) - (4)].list))); }
break;
case 719:
-
-/* Line 1464 of yacc.c */
-#line 2780 "./sql3.y"
+#line 2823 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, SIMPLE_CASE,
t_list (5, (yyvsp[(3) - (6)].tree), (yyvsp[(5) - (6)].tree), t_alloc_box (0, DV_DB_NULL),
t_list (2, QUOTE, NULL), t_box_copy_tree ((caddr_t) (yyvsp[(3) - (6)].tree)))); }
break;
case 721:
-
-/* Line 1464 of yacc.c */
-#line 2788 "./sql3.y"
+#line 2831 "./sql3.y"
{ (yyval.box) = t_listbox (3, PARAM_WITH_IND, (yyvsp[(1) - (2)].box), (yyvsp[(2) - (2)].box)); }
break;
case 722:
-
-/* Line 1464 of yacc.c */
-#line 2790 "./sql3.y"
+#line 2833 "./sql3.y"
{ (yyval.box) = t_listbox (3, PARAM_WITH_IND, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].box)); }
break;
case 723:
-
-/* Line 1464 of yacc.c */
-#line 2795 "./sql3.y"
+#line 2838 "./sql3.y"
{
ST **arglist = (ST **)(t_list_to_array ((yyvsp[(4) - (5)].list)));
(yyval.tree) = sqlp_make_user_aggregate_fun_ref ((yyvsp[(2) - (5)].box), arglist, 1);
@@ -13182,79 +11956,57 @@ yyreduce:
break;
case 724:
-
-/* Line 1464 of yacc.c */
-#line 2800 "./sql3.y"
+#line 2843 "./sql3.y"
{ FN_REF ((yyval.tree), (yyvsp[(1) - (5)].subtok), 1, (yyvsp[(4) - (5)].tree)) }
break;
case 725:
-
-/* Line 1464 of yacc.c */
-#line 2801 "./sql3.y"
+#line 2844 "./sql3.y"
{ FN_REF ((yyval.tree), (yyvsp[(1) - (5)].subtok), 0, (yyvsp[(4) - (5)].tree)) }
break;
case 726:
-
-/* Line 1464 of yacc.c */
-#line 2802 "./sql3.y"
+#line 2845 "./sql3.y"
{ FN_REF ((yyval.tree), (yyvsp[(1) - (4)].subtok), 0, (yyvsp[(3) - (4)].tree)) }
break;
case 734:
-
-/* Line 1464 of yacc.c */
-#line 2813 "./sql3.y"
+#line 2856 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
case 735:
-
-/* Line 1464 of yacc.c */
-#line 2814 "./sql3.y"
+#line 2857 "./sql3.y"
{ (yyval.box) = ((caddr_t *)(yyvsp[(3) - (3)].tree))[0]; }
break;
case 736:
-
-/* Line 1464 of yacc.c */
-#line 2815 "./sql3.y"
+#line 2858 "./sql3.y"
{ (yyval.box) = (caddr_t) DV_XML_ENTITY; }
break;
case 737:
-
-/* Line 1464 of yacc.c */
-#line 2816 "./sql3.y"
+#line 2859 "./sql3.y"
{ (yyval.box) = (caddr_t) DV_RDF; }
break;
case 738:
-
-/* Line 1464 of yacc.c */
-#line 2817 "./sql3.y"
+#line 2860 "./sql3.y"
{ (yyval.box) = (caddr_t) DV_ARRAY_OF_POINTER; }
break;
case 743:
-
-/* Line 1464 of yacc.c */
-#line 2825 "./sql3.y"
+#line 2868 "./sql3.y"
{ (yyval.box) = t_box_num_and_zero (-1 * unbox ((yyvsp[(2) - (2)].box))); }
break;
case 744:
-
-/* Line 1464 of yacc.c */
-#line 2826 "./sql3.y"
+#line 2869 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 746:
-
-/* Line 1464 of yacc.c */
-#line 2829 "./sql3.y"
+#line 2872 "./sql3.y"
{
switch (DV_TYPE_OF ((yyvsp[(2) - (2)].box)))
{
@@ -13271,463 +12023,343 @@ yyreduce:
break;
case 747:
-
-/* Line 1464 of yacc.c */
-#line 2842 "./sql3.y"
+#line 2885 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 749:
-
-/* Line 1464 of yacc.c */
-#line 2844 "./sql3.y"
+#line 2887 "./sql3.y"
{ (yyval.box) = (caddr_t) t_NULLCONST; }
break;
case 750:
-
-/* Line 1464 of yacc.c */
-#line 2850 "./sql3.y"
+#line 2899 "./sql3.y"
{ (yyval.strval) = sqlp_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box), 1); }
break;
case 751:
-
-/* Line 1464 of yacc.c */
-#line 2851 "./sql3.y"
+#line 2900 "./sql3.y"
{ (yyval.strval) = sqlp_table_name (NULL, 0, (yyvsp[(1) - (3)].box), box_length ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].box), 1); }
break;
case 752:
-
-/* Line 1464 of yacc.c */
-#line 2852 "./sql3.y"
+#line 2901 "./sql3.y"
{ (yyval.strval) = sqlp_table_name ((yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box), box_length ((yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box), 1); }
break;
case 753:
-
-/* Line 1464 of yacc.c */
-#line 2853 "./sql3.y"
+#line 2902 "./sql3.y"
{ (yyval.strval) = sqlp_table_name ((yyvsp[(1) - (4)].box), box_length ((yyvsp[(1) - (4)].box)), NULL, 0, (yyvsp[(4) - (4)].box), 1); }
break;
case 754:
-
-/* Line 1464 of yacc.c */
-#line 2857 "./sql3.y"
+#line 2906 "./sql3.y"
{ (yyval.strval) = sqlp_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box), 0); }
break;
case 755:
-
-/* Line 1464 of yacc.c */
-#line 2858 "./sql3.y"
+#line 2907 "./sql3.y"
{ (yyval.strval) = sqlp_table_name (NULL, 0, (yyvsp[(1) - (3)].box), box_length ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].box), 0); }
break;
case 756:
-
-/* Line 1464 of yacc.c */
-#line 2859 "./sql3.y"
+#line 2908 "./sql3.y"
{ (yyval.strval) = sqlp_table_name ((yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box), box_length ((yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box), 0); }
break;
case 757:
-
-/* Line 1464 of yacc.c */
-#line 2860 "./sql3.y"
+#line 2909 "./sql3.y"
{ (yyval.strval) = sqlp_table_name ((yyvsp[(1) - (4)].box), box_length ((yyvsp[(1) - (4)].box)), NULL, 0, (yyvsp[(4) - (4)].box), 0); }
break;
case 758:
-
-/* Line 1464 of yacc.c */
-#line 2864 "./sql3.y"
+#line 2913 "./sql3.y"
{ (yyval.strval) = (bif_find((yyvsp[(1) - (1)].box)) ? (yyvsp[(1) - (1)].box) : sqlp_new_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box))); }
break;
case 759:
-
-/* Line 1464 of yacc.c */
-#line 2865 "./sql3.y"
+#line 2914 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name (NULL, 0, (yyvsp[(1) - (3)].box), box_length ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].box)); }
break;
case 760:
-
-/* Line 1464 of yacc.c */
-#line 2866 "./sql3.y"
+#line 2915 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name ((yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box), box_length ((yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box)); }
break;
case 761:
-
-/* Line 1464 of yacc.c */
-#line 2867 "./sql3.y"
+#line 2916 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name ((yyvsp[(1) - (4)].box), box_length ((yyvsp[(1) - (4)].box)), NULL, 0, (yyvsp[(4) - (4)].box)); }
break;
case 762:
-
-/* Line 1464 of yacc.c */
-#line 2871 "./sql3.y"
+#line 2920 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box)); }
break;
case 763:
-
-/* Line 1464 of yacc.c */
-#line 2872 "./sql3.y"
+#line 2921 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name (NULL, 0, (yyvsp[(1) - (3)].box), box_length ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].box)); }
break;
case 764:
-
-/* Line 1464 of yacc.c */
-#line 2873 "./sql3.y"
+#line 2922 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name ((yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box), box_length ((yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box)); }
break;
case 765:
-
-/* Line 1464 of yacc.c */
-#line 2874 "./sql3.y"
+#line 2923 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name ((yyvsp[(1) - (4)].box), box_length ((yyvsp[(1) - (4)].box)), NULL, 0, (yyvsp[(4) - (4)].box)); }
break;
case 766:
-
-/* Line 1464 of yacc.c */
-#line 2879 "./sql3.y"
+#line 2928 "./sql3.y"
{ (yyval.strval) = t_listbox (6, TABLE_DOTTED, (yyvsp[(1) - (2)].strval), NULL, sqlp_view_u_id (), sqlp_view_g_id (), (yyvsp[(2) - (2)].tree)); }
break;
case 767:
-
-/* Line 1464 of yacc.c */
-#line 2881 "./sql3.y"
+#line 2930 "./sql3.y"
{
(yyval.strval) = t_listbox (6, TABLE_DOTTED, (yyvsp[(1) - (4)].strval), (yyvsp[(3) - (4)].box), sqlp_view_u_id (), sqlp_view_g_id (), (yyvsp[(4) - (4)].tree));
}
break;
case 768:
-
-/* Line 1464 of yacc.c */
-#line 2885 "./sql3.y"
+#line 2934 "./sql3.y"
{
(yyval.strval) = t_listbox (6, TABLE_DOTTED, (yyvsp[(1) - (3)].strval), (yyvsp[(2) - (3)].box), sqlp_view_u_id (), sqlp_view_g_id (), (yyvsp[(3) - (3)].tree));
}
break;
case 769:
-
-/* Line 1464 of yacc.c */
-#line 2893 "./sql3.y"
+#line 2942 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, NULL, (yyvsp[(1) - (1)].box));
}
break;
case 770:
-
-/* Line 1464 of yacc.c */
-#line 2896 "./sql3.y"
+#line 2945 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref (NULL, 0, NULL, 0, (yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].box));
}
break;
case 771:
-
-/* Line 1464 of yacc.c */
-#line 2899 "./sql3.y"
+#line 2948 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref (NULL, 0, (yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box));
}
break;
case 772:
-
-/* Line 1464 of yacc.c */
-#line 2902 "./sql3.y"
+#line 2951 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref ((yyvsp[(1) - (7)].box), box_length ((yyvsp[(1) - (7)].box)), (yyvsp[(3) - (7)].box), box_length ((yyvsp[(3) - (7)].box)), (yyvsp[(5) - (7)].box)), (yyvsp[(7) - (7)].box));
}
break;
case 773:
-
-/* Line 1464 of yacc.c */
-#line 2905 "./sql3.y"
+#line 2954 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref ((yyvsp[(1) - (6)].box), box_length ((yyvsp[(1) - (6)].box)), NULL, 0, (yyvsp[(4) - (6)].box)), (yyvsp[(6) - (6)].box));
}
break;
case 774:
-
-/* Line 1464 of yacc.c */
-#line 2908 "./sql3.y"
+#line 2957 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, (long) 0, STAR);
}
break;
case 775:
-
-/* Line 1464 of yacc.c */
-#line 2911 "./sql3.y"
+#line 2960 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref (NULL, 0, NULL, 0, (yyvsp[(1) - (3)].box)), STAR);
}
break;
case 776:
-
-/* Line 1464 of yacc.c */
-#line 2914 "./sql3.y"
+#line 2963 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref (NULL, 0, (yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box)), STAR);
}
break;
case 777:
-
-/* Line 1464 of yacc.c */
-#line 2917 "./sql3.y"
+#line 2966 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref ((yyvsp[(1) - (7)].box), box_length ((yyvsp[(1) - (7)].box)), (yyvsp[(3) - (7)].box), box_length ((yyvsp[(3) - (7)].box)), (yyvsp[(5) - (7)].box)), STAR);
}
break;
case 778:
-
-/* Line 1464 of yacc.c */
-#line 2920 "./sql3.y"
+#line 2969 "./sql3.y"
{ (yyval.tree) = t_listst (3, COL_DOTTED, c_pref ((yyvsp[(1) - (6)].box), box_length ((yyvsp[(1) - (6)].box)), NULL, 0, (yyvsp[(4) - (6)].box)), STAR);
}
break;
case 779:
-
-/* Line 1464 of yacc.c */
-#line 2927 "./sql3.y"
+#line 2976 "./sql3.y"
{ (yyval.tree) = sqlp_numeric (0, 0);
}
break;
case 780:
-
-/* Line 1464 of yacc.c */
-#line 2930 "./sql3.y"
+#line 2979 "./sql3.y"
{ (yyval.tree) = sqlp_numeric ((yyvsp[(3) - (4)].box), 0);
}
break;
case 781:
-
-/* Line 1464 of yacc.c */
-#line 2933 "./sql3.y"
+#line 2982 "./sql3.y"
{ (yyval.tree) = sqlp_numeric ((yyvsp[(3) - (6)].box), (yyvsp[(5) - (6)].box));
}
break;
case 782:
-
-/* Line 1464 of yacc.c */
-#line 2936 "./sql3.y"
+#line 2985 "./sql3.y"
{ (yyval.tree) = sqlp_numeric (0, 0);
}
break;
case 783:
-
-/* Line 1464 of yacc.c */
-#line 2939 "./sql3.y"
+#line 2988 "./sql3.y"
{ (yyval.tree) = sqlp_numeric ((yyvsp[(3) - (4)].box), 0);
}
break;
case 784:
-
-/* Line 1464 of yacc.c */
-#line 2942 "./sql3.y"
+#line 2991 "./sql3.y"
{ (yyval.tree) = sqlp_numeric ((yyvsp[(3) - (6)].box), (yyvsp[(5) - (6)].box));
}
break;
case 785:
-
-/* Line 1464 of yacc.c */
-#line 2945 "./sql3.y"
+#line 2994 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_INT, (long) 0);
}
break;
case 786:
-
-/* Line 1464 of yacc.c */
-#line 2948 "./sql3.y"
+#line 2997 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_SHORT_INT, (long) 0);
}
break;
case 787:
-
-/* Line 1464 of yacc.c */
-#line 2951 "./sql3.y"
+#line 3000 "./sql3.y"
{ (yyval.tree) = t_listst (3, (ptrlong) DV_INT64, t_box_num (19), t_box_num (0));
}
break;
case 788:
-
-/* Line 1464 of yacc.c */
-#line 2954 "./sql3.y"
+#line 3003 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DOUBLE_FLOAT, (long) 0);
}
break;
case 789:
-
-/* Line 1464 of yacc.c */
-#line 2957 "./sql3.y"
+#line 3006 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DOUBLE_FLOAT, (long) 0);
}
break;
case 790:
-
-/* Line 1464 of yacc.c */
-#line 2960 "./sql3.y"
+#line 3009 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_SINGLE_FLOAT, (long) 0);
}
break;
case 791:
-
-/* Line 1464 of yacc.c */
-#line 2963 "./sql3.y"
+#line 3012 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DOUBLE_FLOAT, (long) 0);
}
break;
case 792:
-
-/* Line 1464 of yacc.c */
-#line 2966 "./sql3.y"
+#line 3015 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BLOB, t_box_num (0x7fffffff));
}
break;
case 793:
-
-/* Line 1464 of yacc.c */
-#line 2969 "./sql3.y"
+#line 3018 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BLOB_BIN, t_box_num (0x7fffffff));
}
break;
case 794:
-
-/* Line 1464 of yacc.c */
-#line 2972 "./sql3.y"
+#line 3021 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BIN, (long) 0);
}
break;
case 795:
-
-/* Line 1464 of yacc.c */
-#line 2975 "./sql3.y"
+#line 3024 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BIN, (yyvsp[(3) - (4)].box));
}
break;
case 796:
-
-/* Line 1464 of yacc.c */
-#line 2978 "./sql3.y"
+#line 3027 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BIN, (yyvsp[(3) - (4)].box));
}
break;
case 797:
-
-/* Line 1464 of yacc.c */
-#line 2981 "./sql3.y"
+#line 3030 "./sql3.y"
{ (yyval.tree) = t_listst (3, (long) DV_TIMESTAMP, (long) 10, (long) 6);
}
break;
case 798:
-
-/* Line 1464 of yacc.c */
-#line 2984 "./sql3.y"
+#line 3033 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DATETIME, (long) 19);
}
break;
case 799:
-
-/* Line 1464 of yacc.c */
-#line 2987 "./sql3.y"
+#line 3036 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_TIME, (long) 8);
}
break;
case 800:
-
-/* Line 1464 of yacc.c */
-#line 2990 "./sql3.y"
+#line 3039 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_DATE, (long) 10);
}
break;
case 801:
-
-/* Line 1464 of yacc.c */
-#line 2993 "./sql3.y"
+#line 3042 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_WIDE, (long) 1);
}
break;
case 802:
-
-/* Line 1464 of yacc.c */
-#line 2996 "./sql3.y"
+#line 3045 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_WIDE, (yyvsp[(3) - (4)].box));
}
break;
case 803:
-
-/* Line 1464 of yacc.c */
-#line 2999 "./sql3.y"
+#line 3048 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_WIDE, (long) 0);
}
break;
case 804:
-
-/* Line 1464 of yacc.c */
-#line 3002 "./sql3.y"
+#line 3051 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_WIDE, (yyvsp[(3) - (4)].box));
}
break;
case 805:
-
-/* Line 1464 of yacc.c */
-#line 3005 "./sql3.y"
+#line 3054 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_BLOB_WIDE, t_box_num (0x7fffffff));
}
break;
case 806:
-
-/* Line 1464 of yacc.c */
-#line 3008 "./sql3.y"
+#line 3057 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_ANY, (long) 0); }
break;
case 807:
-
-/* Line 1464 of yacc.c */
-#line 3010 "./sql3.y"
+#line 3059 "./sql3.y"
{
assert_ms_compat("Columns of type ANY (length) may be created only in MS-compatibility mode");
(yyval.tree) = t_listst (2, (long) DV_ANY, (long) 0);
@@ -13735,134 +12367,100 @@ yyreduce:
break;
case 808:
-
-/* Line 1464 of yacc.c */
-#line 3015 "./sql3.y"
+#line 3064 "./sql3.y"
{ (yyval.tree) = t_listst (2, (ptrlong) DV_IRI_ID, (yyvsp[(3) - (4)].box));
}
break;
case 809:
-
-/* Line 1464 of yacc.c */
-#line 3018 "./sql3.y"
+#line 3067 "./sql3.y"
{ (yyval.tree) = t_listst (2, (ptrlong) DV_IRI_ID, (ptrlong)12); /* #i+10digits */
}
break;
case 810:
-
-/* Line 1464 of yacc.c */
-#line 3021 "./sql3.y"
+#line 3070 "./sql3.y"
{ (yyval.tree) = t_listst (2, (ptrlong) DV_IRI_ID_8, (ptrlong)22); /* #i+20digits */
}
break;
case 812:
-
-/* Line 1464 of yacc.c */
-#line 3028 "./sql3.y"
+#line 3077 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (long) 1);
}
break;
case 813:
-
-/* Line 1464 of yacc.c */
-#line 3031 "./sql3.y"
+#line 3080 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (long) 0);
}
break;
case 814:
-
-/* Line 1464 of yacc.c */
-#line 3034 "./sql3.y"
+#line 3083 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (yyvsp[(3) - (4)].box));
}
break;
case 815:
-
-/* Line 1464 of yacc.c */
-#line 3037 "./sql3.y"
+#line 3086 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (yyvsp[(3) - (4)].box));
}
break;
case 816:
-
-/* Line 1464 of yacc.c */
-#line 3042 "./sql3.y"
+#line 3091 "./sql3.y"
{ (yyval.box) = t_box_num (0x7fffffff); }
break;
case 817:
-
-/* Line 1464 of yacc.c */
-#line 3043 "./sql3.y"
+#line 3092 "./sql3.y"
{ (yyval.box) = (yyvsp[(3) - (4)].box); }
break;
case 818:
-
-/* Line 1464 of yacc.c */
-#line 3048 "./sql3.y"
+#line 3097 "./sql3.y"
{
(yyval.tree) = t_listst (5, (long) DV_ARRAY_OF_POINTER, (yyvsp[(2) - (2)].box), 0, 0, (yyvsp[(1) - (2)].tree));
}
break;
case 819:
-
-/* Line 1464 of yacc.c */
-#line 3051 "./sql3.y"
+#line 3100 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 820:
-
-/* Line 1464 of yacc.c */
-#line 3052 "./sql3.y"
+#line 3101 "./sql3.y"
{ (yyval.tree) = t_listst (4, (long) DV_OBJECT, 0, 0, (yyvsp[(1) - (1)].strval)); }
break;
case 822:
-
-/* Line 1464 of yacc.c */
-#line 3058 "./sql3.y"
+#line 3107 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (long) 1);
}
break;
case 823:
-
-/* Line 1464 of yacc.c */
-#line 3061 "./sql3.y"
+#line 3110 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (long) 0);
}
break;
case 824:
-
-/* Line 1464 of yacc.c */
-#line 3064 "./sql3.y"
+#line 3113 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (yyvsp[(3) - (4)].box));
}
break;
case 825:
-
-/* Line 1464 of yacc.c */
-#line 3067 "./sql3.y"
+#line 3116 "./sql3.y"
{ (yyval.tree) = t_listst (2, (long) DV_LONG_STRING, (yyvsp[(3) - (4)].box));
}
break;
case 826:
-
-/* Line 1464 of yacc.c */
-#line 3070 "./sql3.y"
+#line 3119 "./sql3.y"
{
if (!CASEMODESTRCMP ((yyvsp[(1) - (1)].strval), xmltype_class_name))
{
@@ -13875,9 +12473,7 @@ yyreduce:
break;
case 827:
-
-/* Line 1464 of yacc.c */
-#line 3080 "./sql3.y"
+#line 3129 "./sql3.y"
{
if (!CASEMODESTRCMP ((yyvsp[(2) - (2)].strval), xmltype_class_name))
{
@@ -13890,27 +12486,21 @@ yyreduce:
break;
case 828:
-
-/* Line 1464 of yacc.c */
-#line 3090 "./sql3.y"
+#line 3139 "./sql3.y"
{
(yyval.tree) = t_listst (4, (long) DV_BLOB, t_box_num (0x7fffffff), NULL, t_box_string ("DB.DBA.__ANY"));
}
break;
case 829:
-
-/* Line 1464 of yacc.c */
-#line 3094 "./sql3.y"
+#line 3143 "./sql3.y"
{ (yyval.tree) = t_listst (5, (long) DV_BLOB, t_box_num (0x7fffffff), NULL, NULL,
t_list (2, t_box_string ("xml_col"), t_box_string ("1")));
}
break;
case 830:
-
-/* Line 1464 of yacc.c */
-#line 3101 "./sql3.y"
+#line 3150 "./sql3.y"
{
if (strchr ((yyvsp[(1) - (1)].box), '.'))
yy_new_error ("Dots not allowed inside column names", "37000", "SQ137");
@@ -13920,9 +12510,7 @@ yyreduce:
break;
case 831:
-
-/* Line 1464 of yacc.c */
-#line 3109 "./sql3.y"
+#line 3158 "./sql3.y"
{
assert_ms_compat("Qualified column names are allowed only in MS-compatibility mode.");
(yyval.strval) = (yyvsp[(7) - (7)].box);
@@ -13930,135 +12518,97 @@ yyreduce:
break;
case 832:
-
-/* Line 1464 of yacc.c */
-#line 3116 "./sql3.y"
+#line 3165 "./sql3.y"
{ (yyval.strval) = (yyvsp[(1) - (1)].box); }
break;
case 833:
-
-/* Line 1464 of yacc.c */
-#line 3120 "./sql3.y"
+#line 3169 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 834:
-
-/* Line 1464 of yacc.c */
-#line 3124 "./sql3.y"
+#line 3173 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 835:
-
-/* Line 1464 of yacc.c */
-#line 3125 "./sql3.y"
+#line 3174 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 836:
-
-/* Line 1464 of yacc.c */
-#line 3129 "./sql3.y"
+#line 3184 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 837:
-
-/* Line 1464 of yacc.c */
-#line 3133 "./sql3.y"
+#line 3188 "./sql3.y"
{ (yyval.tree) = (ST *) 0; }
break;
case 838:
-
-/* Line 1464 of yacc.c */
-#line 3134 "./sql3.y"
+#line 3189 "./sql3.y"
{ (yyval.tree) = (ST *) (yyvsp[(1) - (1)].box); }
break;
case 839:
-
-/* Line 1464 of yacc.c */
-#line 3138 "./sql3.y"
+#line 3193 "./sql3.y"
{ (yyval.tree) = (ST *) 0; }
break;
case 840:
-
-/* Line 1464 of yacc.c */
-#line 3139 "./sql3.y"
+#line 3194 "./sql3.y"
{ (yyval.tree) = (ST *) (yyvsp[(2) - (2)].box); }
break;
case 841:
-
-/* Line 1464 of yacc.c */
-#line 3144 "./sql3.y"
+#line 3199 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_SHUTDOWN, (yyvsp[(2) - (2)].tree), NULL, NULL); }
break;
case 842:
-
-/* Line 1464 of yacc.c */
-#line 3146 "./sql3.y"
+#line 3201 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_CHECKPOINT, (yyvsp[(2) - (2)].tree), NULL, NULL); }
break;
case 843:
-
-/* Line 1464 of yacc.c */
-#line 3148 "./sql3.y"
+#line 3203 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_CHECKPOINT, (yyvsp[(2) - (3)].box), (yyvsp[(3) - (3)].box), NULL); }
break;
case 844:
-
-/* Line 1464 of yacc.c */
-#line 3150 "./sql3.y"
+#line 3205 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_BACKUP, (yyvsp[(2) - (2)].box), NULL, NULL); }
break;
case 845:
-
-/* Line 1464 of yacc.c */
-#line 3152 "./sql3.y"
+#line 3207 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_CHECK, NULL, NULL, NULL); }
break;
case 846:
-
-/* Line 1464 of yacc.c */
-#line 3154 "./sql3.y"
+#line 3209 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_SYNC_REPL, (yyvsp[(3) - (4)].tree), (yyvsp[(4) - (4)].tree), NULL); }
break;
case 847:
-
-/* Line 1464 of yacc.c */
-#line 3156 "./sql3.y"
+#line 3211 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_DISC_REPL, (yyvsp[(3) - (3)].tree), NULL, NULL); }
break;
case 848:
-
-/* Line 1464 of yacc.c */
-#line 3158 "./sql3.y"
+#line 3213 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_LOG_ON, NULL, NULL, NULL); }
break;
case 849:
-
-/* Line 1464 of yacc.c */
-#line 3160 "./sql3.y"
+#line 3215 "./sql3.y"
{ (yyval.tree) = t_listst (4, OP_LOG_OFF, NULL, NULL, NULL); }
break;
case 857:
-
-/* Line 1464 of yacc.c */
-#line 3193 "./sql3.y"
+#line 3248 "./sql3.y"
{
(yyval.tree) = t_listst (9, USER_AGGREGATE_DECL, (yyvsp[(3) - (13)].strval), (yyvsp[(4) - (13)].box), (yyvsp[(5) - (13)].tree),
(yyvsp[(7) - (13)].strval), (yyvsp[(9) - (13)].strval), (yyvsp[(11) - (13)].strval), (yyvsp[(12) - (13)].box), (yyvsp[(13) - (13)].box) );
@@ -14066,343 +12616,247 @@ yyreduce:
break;
case 858:
-
-/* Line 1464 of yacc.c */
-#line 3200 "./sql3.y"
+#line 3255 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 859:
-
-/* Line 1464 of yacc.c */
-#line 3201 "./sql3.y"
+#line 3256 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].strval); }
break;
case 860:
-
-/* Line 1464 of yacc.c */
-#line 3205 "./sql3.y"
+#line 3260 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 861:
-
-/* Line 1464 of yacc.c */
-#line 3206 "./sql3.y"
+#line 3261 "./sql3.y"
{ (yyval.box) = (caddr_t)1; }
break;
case 862:
-
-/* Line 1464 of yacc.c */
-#line 3212 "./sql3.y"
+#line 3267 "./sql3.y"
{ (yyval.tree) = t_listst (7, ROUTINE_DECL, (ptrlong) (yyvsp[(2) - (7)].subtok), (yyvsp[(3) - (7)].strval), (yyvsp[(4) - (7)].box), (yyvsp[(5) - (7)].tree), (yyvsp[(7) - (7)].tree), (yyvsp[(6) - (7)].box)); }
break;
case 863:
-
-/* Line 1464 of yacc.c */
-#line 3215 "./sql3.y"
+#line 3270 "./sql3.y"
{
(yyval.tree) = t_listst (8, REMOTE_ROUTINE_DECL, (ptrlong) (yyvsp[(2) - (9)].subtok), (yyvsp[(3) - (9)].strval), (yyvsp[(4) - (9)].box), (yyvsp[(5) - (9)].tree), (yyvsp[(7) - (9)].box), (yyvsp[(9) - (9)].box), (yyvsp[(6) - (9)].box));
}
break;
case 864:
-
-/* Line 1464 of yacc.c */
-#line 3220 "./sql3.y"
+#line 3275 "./sql3.y"
{ (yyval.tree) = sqlp_udt_create_external_proc ((ptrlong) (yyvsp[(2) - (12)].subtok), (yyvsp[(3) - (12)].strval),
(yyvsp[(4) - (12)].box), (yyvsp[(5) - (12)].tree), (yyvsp[(6) - (12)].box), (ptrlong) (yyvsp[(8) - (12)].intval), (yyvsp[(11) - (12)].box), (ST **) (yyvsp[(12) - (12)].tree)); }
break;
case 865:
-
-/* Line 1464 of yacc.c */
-#line 3228 "./sql3.y"
+#line 3283 "./sql3.y"
{ (yyval.tree) = t_listst (7, ROUTINE_DECL, (ptrlong) (yyvsp[(1) - (6)].subtok), (yyvsp[(2) - (6)].box), (yyvsp[(3) - (6)].box), (yyvsp[(4) - (6)].tree), (yyvsp[(6) - (6)].tree), (yyvsp[(5) - (6)].box)); }
break;
case 866:
-
-/* Line 1464 of yacc.c */
-#line 3233 "./sql3.y"
+#line 3288 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (2)].tree), NULL); }
break;
case 867:
-
-/* Line 1464 of yacc.c */
-#line 3235 "./sql3.y"
+#line 3290 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(2) - (3)].tree), NULL)); }
break;
case 868:
-
-/* Line 1464 of yacc.c */
-#line 3240 "./sql3.y"
+#line 3295 "./sql3.y"
{
(yyval.tree) = t_listst (3, MODULE_DECL, (yyvsp[(3) - (6)].strval), t_list_to_array ((yyvsp[(5) - (6)].list)));
}
break;
case 869:
-
-/* Line 1464 of yacc.c */
-#line 3246 "./sql3.y"
+#line 3301 "./sql3.y"
{ (yyval.subtok) = FUNCTION; }
break;
case 870:
-
-/* Line 1464 of yacc.c */
-#line 3247 "./sql3.y"
+#line 3302 "./sql3.y"
{ (yyval.subtok) = PROCEDURE; }
break;
case 871:
-
-/* Line 1464 of yacc.c */
-#line 3251 "./sql3.y"
+#line 3306 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 872:
-
-/* Line 1464 of yacc.c */
-#line 3252 "./sql3.y"
+#line 3307 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 873:
-
-/* Line 1464 of yacc.c */
-#line 3256 "./sql3.y"
+#line 3311 "./sql3.y"
{ (yyval.box) = (caddr_t) t_list (0); }
break;
case 874:
-
-/* Line 1464 of yacc.c */
-#line 3257 "./sql3.y"
+#line 3312 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(2) - (3)].list)); }
break;
case 875:
-
-/* Line 1464 of yacc.c */
-#line 3262 "./sql3.y"
+#line 3317 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 876:
-
-/* Line 1464 of yacc.c */
-#line 3264 "./sql3.y"
+#line 3319 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 877:
-
-/* Line 1464 of yacc.c */
-#line 3269 "./sql3.y"
+#line 3324 "./sql3.y"
{ (yyval.tree) = t_listst (6, LOCAL_VAR, (ptrlong) (yyvsp[(1) - (4)].subtok), (yyvsp[(2) - (4)].tree), (yyvsp[(3) - (4)].tree), NULL, (yyvsp[(4) - (4)].box)); }
break;
case 878:
-
-/* Line 1464 of yacc.c */
-#line 3271 "./sql3.y"
+#line 3326 "./sql3.y"
{ (yyval.tree) = t_listst (6, LOCAL_VAR, (ptrlong) (yyvsp[(1) - (6)].subtok), (yyvsp[(2) - (6)].tree), (yyvsp[(3) - (6)].tree), (yyvsp[(5) - (6)].box), (yyvsp[(6) - (6)].box)); }
break;
case 879:
-
-/* Line 1464 of yacc.c */
-#line 3273 "./sql3.y"
+#line 3328 "./sql3.y"
{ (yyval.tree) = t_listst (6, LOCAL_VAR, (ptrlong) (yyvsp[(1) - (6)].subtok), (yyvsp[(2) - (6)].tree), (yyvsp[(3) - (6)].tree), (yyvsp[(5) - (6)].box), (yyvsp[(6) - (6)].box)); }
break;
case 880:
-
-/* Line 1464 of yacc.c */
-#line 3277 "./sql3.y"
+#line 3332 "./sql3.y"
{ (yyval.subtok) = IN_MODE; }
break;
case 881:
-
-/* Line 1464 of yacc.c */
-#line 3278 "./sql3.y"
+#line 3333 "./sql3.y"
{ (yyval.subtok) = OUT_MODE; }
break;
case 882:
-
-/* Line 1464 of yacc.c */
-#line 3279 "./sql3.y"
+#line 3334 "./sql3.y"
{ (yyval.subtok) = INOUT_MODE; }
break;
case 883:
-
-/* Line 1464 of yacc.c */
-#line 3283 "./sql3.y"
+#line 3338 "./sql3.y"
{ (yyval.subtok) = IN_MODE; }
break;
case 885:
-
-/* Line 1464 of yacc.c */
-#line 3288 "./sql3.y"
+#line 3343 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
case 886:
-
-/* Line 1464 of yacc.c */
-#line 3289 "./sql3.y"
+#line 3344 "./sql3.y"
{ (yyval.subtok) = SOAP_MSG_IN; }
break;
- case 887:
-
-/* Line 1464 of yacc.c */
-#line 3290 "./sql3.y"
+ case 887:
+#line 3345 "./sql3.y"
{ (yyval.subtok) = SOAP_MSG_OUT; }
break;
case 888:
-
-/* Line 1464 of yacc.c */
-#line 3291 "./sql3.y"
+#line 3346 "./sql3.y"
{ (yyval.subtok) = SOAP_MSG_INOUT; }
break;
case 889:
-
-/* Line 1464 of yacc.c */
-#line 3292 "./sql3.y"
+#line 3347 "./sql3.y"
{ (yyval.subtok) = SOAP_MMSG_IN; }
break;
case 890:
-
-/* Line 1464 of yacc.c */
-#line 3293 "./sql3.y"
+#line 3348 "./sql3.y"
{ (yyval.subtok) = SOAP_MMSG_OUT; }
break;
case 891:
-
-/* Line 1464 of yacc.c */
-#line 3294 "./sql3.y"
+#line 3349 "./sql3.y"
{ (yyval.subtok) = SOAP_MMSG_INOUT; }
break;
case 892:
-
-/* Line 1464 of yacc.c */
-#line 3298 "./sql3.y"
+#line 3353 "./sql3.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 893:
-
-/* Line 1464 of yacc.c */
-#line 3299 "./sql3.y"
+#line 3354 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); }
break;
case 894:
-
-/* Line 1464 of yacc.c */
-#line 3303 "./sql3.y"
+#line 3358 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (3)].box), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 895:
-
-/* Line 1464 of yacc.c */
-#line 3307 "./sql3.y"
+#line 3362 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 896:
-
-/* Line 1464 of yacc.c */
-#line 3308 "./sql3.y"
+#line 3363 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_HEADER; }
break;
case 897:
-
-/* Line 1464 of yacc.c */
-#line 3309 "./sql3.y"
+#line 3364 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_FAULT; }
break;
case 898:
-
-/* Line 1464 of yacc.c */
-#line 3310 "./sql3.y"
+#line 3365 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_LITERAL; }
break;
case 899:
-
-/* Line 1464 of yacc.c */
-#line 3311 "./sql3.y"
+#line 3366 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_XML; }
break;
case 900:
-
-/* Line 1464 of yacc.c */
-#line 3312 "./sql3.y"
+#line 3367 "./sql3.y"
{ (yyval.intval) = (SOAP_MSG_LITERALW|SOAP_MSG_LITERAL); }
break;
case 901:
-
-/* Line 1464 of yacc.c */
-#line 3313 "./sql3.y"
+#line 3368 "./sql3.y"
{ (yyval.intval) = SOAP_MSG_HTTP; }
break;
case 902:
-
-/* Line 1464 of yacc.c */
-#line 3317 "./sql3.y"
+#line 3372 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 903:
-
-/* Line 1464 of yacc.c */
-#line 3319 "./sql3.y"
+#line 3374 "./sql3.y"
{ (yyval.box) = t_listbox (3, (yyvsp[(5) - (9)].box), (ptrlong) ((yyvsp[(3) - (9)].intval)|(yyvsp[(6) - (9)].subtok)), t_list_to_array_box ((yyvsp[(8) - (9)].list))); }
break;
case 904:
-
-/* Line 1464 of yacc.c */
-#line 3320 "./sql3.y"
+#line 3375 "./sql3.y"
{ (yyval.box) = t_listbox (3, (yyvsp[(2) - (3)].box), (ptrlong) ((yyvsp[(1) - (3)].intval)|(yyvsp[(3) - (3)].subtok)), NULL); }
break;
case 905:
-
-/* Line 1464 of yacc.c */
-#line 3324 "./sql3.y"
+#line 3379 "./sql3.y"
{ (yyval.box) = t_box_float ((float) unbox ((yyvsp[(1) - (1)].box))); }
break;
case 906:
-
-/* Line 1464 of yacc.c */
-#line 3325 "./sql3.y"
+#line 3380 "./sql3.y"
{ double d;
switch (DV_TYPE_OF ((yyvsp[(1) - (1)].box)))
{
@@ -14414,44 +12868,32 @@ yyreduce:
break;
case 907:
-
-/* Line 1464 of yacc.c */
-#line 3336 "./sql3.y"
+#line 3391 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 908:
-
-/* Line 1464 of yacc.c */
-#line 3337 "./sql3.y"
+#line 3392 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 909:
-
-/* Line 1464 of yacc.c */
-#line 3341 "./sql3.y"
+#line 3396 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, PROC_COST, t_list_to_array ((yyvsp[(3) - (4)].list))); }
break;
case 922:
-
-/* Line 1464 of yacc.c */
-#line 3358 "./sql3.y"
+#line 3413 "./sql3.y"
{ (yyval.tree) = t_listst (1, NULL_STMT); }
break;
case 923:
-
-/* Line 1464 of yacc.c */
-#line 3362 "./sql3.y"
+#line 3417 "./sql3.y"
{ BR_PUSH }
break;
case 924:
-
-/* Line 1464 of yacc.c */
-#line 3363 "./sql3.y"
+#line 3418 "./sql3.y"
{ (yyval.tree) = t_listst (5, COMPOUND_STMT,
t_list_to_array ((yyvsp[(3) - (4)].list)),
t_box_num (BR_GET),
@@ -14461,51 +12903,37 @@ yyreduce:
break;
case 925:
-
-/* Line 1464 of yacc.c */
-#line 3372 "./sql3.y"
+#line 3427 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 926:
-
-/* Line 1464 of yacc.c */
-#line 3373 "./sql3.y"
+#line 3428 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 929:
-
-/* Line 1464 of yacc.c */
-#line 3379 "./sql3.y"
+#line 3434 "./sql3.y"
{ BR_PUSH }
break;
case 930:
-
-/* Line 1464 of yacc.c */
-#line 3379 "./sql3.y"
+#line 3434 "./sql3.y"
{ (yyval.tree) = BR_CSTM ((yyvsp[(2) - (2)].tree)); BR_POP }
break;
case 933:
-
-/* Line 1464 of yacc.c */
-#line 3385 "./sql3.y"
+#line 3440 "./sql3.y"
{ (yyval.tree) = t_listst (3, LABELED_STMT, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].tree)); }
break;
case 934:
-
-/* Line 1464 of yacc.c */
-#line 3386 "./sql3.y"
+#line 3441 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("http"), t_list (1, (yyvsp[(1) - (1)].box))); }
break;
case 935:
-
-/* Line 1464 of yacc.c */
-#line 3387 "./sql3.y"
+#line 3442 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (5, COMPOUND_STMT,
t_list (2,
t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("http_value"), t_list (1, (yyvsp[(2) - (3)].tree))),
@@ -14517,9 +12945,7 @@ yyreduce:
break;
case 936:
-
-/* Line 1464 of yacc.c */
-#line 3395 "./sql3.y"
+#line 3450 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (5, COMPOUND_STMT,
t_list (2,
t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("http_url"), t_list (1, (yyvsp[(2) - (3)].tree))),
@@ -14531,9 +12957,7 @@ yyreduce:
break;
case 937:
-
-/* Line 1464 of yacc.c */
-#line 3403 "./sql3.y"
+#line 3458 "./sql3.y"
{
ST *qry = (yyvsp[(2) - (3)].tree);
ST *scalar_qry = (yyval.tree) = (ST *) t_list (2, SCALAR_SUBQ, sqlp_add_top_1 (qry));
@@ -14541,37 +12965,27 @@ yyreduce:
break;
case 939:
-
-/* Line 1464 of yacc.c */
-#line 3411 "./sql3.y"
+#line 3466 "./sql3.y"
{ BR_PUSH }
break;
case 940:
-
-/* Line 1464 of yacc.c */
-#line 3411 "./sql3.y"
+#line 3466 "./sql3.y"
{ (yyval.tree) = BR_CSTM ((yyvsp[(2) - (3)].tree)); BR_POP }
break;
case 941:
-
-/* Line 1464 of yacc.c */
-#line 3412 "./sql3.y"
+#line 3467 "./sql3.y"
{ BR_PUSH }
break;
case 942:
-
-/* Line 1464 of yacc.c */
-#line 3412 "./sql3.y"
+#line 3467 "./sql3.y"
{ (yyval.tree) = BR_CSTM ((yyvsp[(2) - (2)].tree)); BR_POP }
break;
case 946:
-
-/* Line 1464 of yacc.c */
-#line 3423 "./sql3.y"
+#line 3478 "./sql3.y"
{
ST **temp = (ST **) t_list_to_array ((yyvsp[(2) - (3)].list));
(yyval.tree) = t_listst (2, VARIABLE_DECL,
@@ -14580,174 +12994,126 @@ yyreduce:
break;
case 947:
-
-/* Line 1464 of yacc.c */
-#line 3432 "./sql3.y"
+#line 3487 "./sql3.y"
{ (yyval.list) = t_CONS (t_list (3, COL_DOTTED, NULL, (yyvsp[(1) - (1)].box)), NULL); }
break;
case 948:
-
-/* Line 1464 of yacc.c */
-#line 3434 "./sql3.y"
+#line 3489 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS (t_list (3, COL_DOTTED, NULL, (yyvsp[(3) - (3)].box)), NULL)); }
break;
case 949:
-
-/* Line 1464 of yacc.c */
-#line 3438 "./sql3.y"
+#line 3493 "./sql3.y"
{ (yyval.box) = (caddr_t) SQL_NO_DATA_FOUND; }
break;
case 950:
-
-/* Line 1464 of yacc.c */
-#line 3439 "./sql3.y"
+#line 3494 "./sql3.y"
{ (yyval.box) = (caddr_t) t_list (2, (yyvsp[(2) - (2)].box), sqlp_handler_star_pos ((yyvsp[(2) - (2)].box))); }
break;
case 951:
-
-/* Line 1464 of yacc.c */
-#line 3441 "./sql3.y"
+#line 3496 "./sql3.y"
{
(yyval.box) = t_listbox (2, (yyvsp[(3) - (3)].box), sqlp_handler_star_pos ((yyvsp[(3) - (3)].box)));
}
break;
case 952:
-
-/* Line 1464 of yacc.c */
-#line 3444 "./sql3.y"
+#line 3499 "./sql3.y"
{ (yyval.box) = (caddr_t) SQL_SQLEXCEPTION; }
break;
case 953:
-
-/* Line 1464 of yacc.c */
-#line 3445 "./sql3.y"
+#line 3500 "./sql3.y"
{ (yyval.box) = t_listbox (2, t_box_string ("01*"), 2); }
break;
case 960:
-
-/* Line 1464 of yacc.c */
-#line 3455 "./sql3.y"
+#line 3510 "./sql3.y"
{ (yyval.tree) = sqlp_resignal (NULL); }
break;
case 961:
-
-/* Line 1464 of yacc.c */
-#line 3456 "./sql3.y"
+#line 3511 "./sql3.y"
{ (yyval.tree) = sqlp_resignal ((yyvsp[(2) - (2)].tree)); }
break;
case 968:
-
-/* Line 1464 of yacc.c */
-#line 3467 "./sql3.y"
+#line 3522 "./sql3.y"
{ (yyval.tree) = t_listst (4, HANDLER_DECL, HANDT_CONTINUE, t_list (1, (yyvsp[(2) - (4)].box)), t_list (2, GOTO_STMT, (yyvsp[(4) - (4)].box))); }
break;
case 969:
-
-/* Line 1464 of yacc.c */
-#line 3469 "./sql3.y"
+#line 3524 "./sql3.y"
{ (yyval.tree) = t_listst (4, HANDLER_DECL, HANDT_CONTINUE, t_list (1, (yyvsp[(2) - (5)].box)), t_list (2, GOTO_STMT, (yyvsp[(5) - (5)].box))); }
break;
case 970:
-
-/* Line 1464 of yacc.c */
-#line 3471 "./sql3.y"
+#line 3526 "./sql3.y"
{ (yyval.tree) = t_listst (4, HANDLER_DECL, HANDT_CONTINUE, t_list (1, (yyvsp[(2) - (3)].box)), sqlp_resignal (NULL)); }
break;
case 971:
-
-/* Line 1464 of yacc.c */
-#line 3473 "./sql3.y"
+#line 3528 "./sql3.y"
{ (yyval.tree) = t_listst (4, HANDLER_DECL, (ptrlong) (yyvsp[(2) - (6)].intval), t_list_to_array ((yyvsp[(5) - (6)].list)), (yyvsp[(6) - (6)].tree)); }
break;
case 972:
-
-/* Line 1464 of yacc.c */
-#line 3477 "./sql3.y"
+#line 3532 "./sql3.y"
{ (yyval.intval) = HANDT_CONTINUE; }
break;
case 973:
-
-/* Line 1464 of yacc.c */
-#line 3478 "./sql3.y"
+#line 3533 "./sql3.y"
{ (yyval.intval) = HANDT_EXIT; }
break;
case 974:
-
-/* Line 1464 of yacc.c */
-#line 3482 "./sql3.y"
+#line 3537 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 975:
-
-/* Line 1464 of yacc.c */
-#line 3483 "./sql3.y"
+#line 3538 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 980:
-
-/* Line 1464 of yacc.c */
-#line 3491 "./sql3.y"
+#line 3546 "./sql3.y"
{ (yyval.tree) = sqlp_resignal (NULL); }
break;
case 981:
-
-/* Line 1464 of yacc.c */
-#line 3492 "./sql3.y"
+#line 3547 "./sql3.y"
{ (yyval.tree) = sqlp_resignal ((yyvsp[(2) - (3)].tree)); }
break;
case 988:
-
-/* Line 1464 of yacc.c */
-#line 3502 "./sql3.y"
+#line 3557 "./sql3.y"
{ (yyval.tree) = t_listst (3, ASG_STMT, (yyvsp[(1) - (3)].tree), sqlp_wrapper_sqlxml_assign((ST*)(yyvsp[(3) - (3)].tree))); }
break;
case 989:
-
-/* Line 1464 of yacc.c */
-#line 3504 "./sql3.y"
+#line 3559 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("aset"),
t_list_to_array (t_CONS ((yyvsp[(1) - (4)].tree), t_NCONC ((yyvsp[(2) - (4)].list), t_CONS ((yyvsp[(4) - (4)].tree), NULL)))) ); }
break;
case 990:
-
-/* Line 1464 of yacc.c */
-#line 3511 "./sql3.y"
+#line 3566 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(2) - (3)].tree), NULL); }
break;
case 991:
-
-/* Line 1464 of yacc.c */
-#line 3512 "./sql3.y"
+#line 3567 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (4)].list), t_CONS ((yyvsp[(3) - (4)].tree), NULL)); }
break;
case 994:
-
-/* Line 1464 of yacc.c */
-#line 3547 "./sql3.y"
+#line 3602 "./sql3.y"
{ ST *first = t_listst (3, COND_CLAUSE, (yyvsp[(3) - (6)].tree), (yyvsp[(5) - (6)].tree));
ST *cond_list = t_listst (1, first);
(yyval.tree) = t_listst (3, IF_STMT, cond_list, (yyvsp[(6) - (6)].tree));
@@ -14755,321 +13121,231 @@ yyreduce:
break;
case 995:
-
-/* Line 1464 of yacc.c */
-#line 3554 "./sql3.y"
+#line 3609 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 996:
-
-/* Line 1464 of yacc.c */
-#line 3555 "./sql3.y"
+#line 3610 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 997:
-
-/* Line 1464 of yacc.c */
-#line 3560 "./sql3.y"
+#line 3615 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, (yyvsp[(2) - (5)].box), t_list_to_array ((yyvsp[(4) - (5)].list))); }
break;
case 998:
-
-/* Line 1464 of yacc.c */
-#line 3561 "./sql3.y"
+#line 3616 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 999:
-
-/* Line 1464 of yacc.c */
-#line 3562 "./sql3.y"
+#line 3617 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 1000:
-
-/* Line 1464 of yacc.c */
-#line 3566 "./sql3.y"
+#line 3621 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(2) - (2)].box)); }
break;
case 1001:
-
-/* Line 1464 of yacc.c */
-#line 3567 "./sql3.y"
+#line 3622 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(2) - (2)].box)); }
break;
case 1002:
-
-/* Line 1464 of yacc.c */
-#line 3568 "./sql3.y"
+#line 3623 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(1) - (2)].box)); }
break;
case 1003:
-
-/* Line 1464 of yacc.c */
-#line 3569 "./sql3.y"
+#line 3624 "./sql3.y"
{ (yyval.box) = t_box_string ((yyvsp[(1) - (1)].box)); }
break;
case 1004:
-
-/* Line 1464 of yacc.c */
-#line 3574 "./sql3.y"
+#line 3629 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("__set"),
t_list (2, t_sqlp_box_upcase ((yyvsp[(2) - (4)].box)), (yyvsp[(4) - (4)].tree))); }
break;
case 1005:
-
-/* Line 1464 of yacc.c */
-#line 3577 "./sql3.y"
+#line 3632 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("__set"),
t_list (2, t_sqlp_box_upcase ((yyvsp[(2) - (3)].box)), t_box_num (1))); }
break;
case 1006:
-
-/* Line 1464 of yacc.c */
-#line 3580 "./sql3.y"
+#line 3635 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("__set"),
t_list (2, t_sqlp_box_upcase ((yyvsp[(2) - (3)].box)), t_box_num (0))); }
break;
case 1007:
-
-/* Line 1464 of yacc.c */
-#line 3583 "./sql3.y"
+#line 3638 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("__set"),
t_list (2, t_sqlp_box_upcase ((yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box))); }
break;
case 1008:
-
-/* Line 1464 of yacc.c */
-#line 3588 "./sql3.y"
+#line 3643 "./sql3.y"
{ (yyval.tree) = t_listst (2, GOTO_STMT, (yyvsp[(2) - (2)].box)); }
break;
case 1009:
-
-/* Line 1464 of yacc.c */
-#line 3589 "./sql3.y"
+#line 3644 "./sql3.y"
{ (yyval.tree) = t_listst (2, GOTO_STMT, (yyvsp[(3) - (3)].box)); }
break;
case 1010:
-
-/* Line 1464 of yacc.c */
-#line 3593 "./sql3.y"
+#line 3648 "./sql3.y"
{ (yyval.tree) = t_listst (2, RETURN_STMT, sqlp_wrapper_sqlxml_assign((ST*)(yyvsp[(2) - (2)].tree))); }
break;
case 1011:
-
-/* Line 1464 of yacc.c */
-#line 3594 "./sql3.y"
+#line 3649 "./sql3.y"
{ (yyval.tree) = t_listst (2, RETURN_STMT, NULL); }
break;
case 1012:
-
-/* Line 1464 of yacc.c */
-#line 3599 "./sql3.y"
+#line 3654 "./sql3.y"
{ (yyval.tree) = t_listst (3, WHILE_STMT, (yyvsp[(3) - (5)].tree), (yyvsp[(5) - (5)].tree)); }
break;
case 1017:
-
-/* Line 1464 of yacc.c */
-#line 3610 "./sql3.y"
+#line 3665 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 1018:
-
-/* Line 1464 of yacc.c */
-#line 3611 "./sql3.y"
+#line 3666 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1019:
-
-/* Line 1464 of yacc.c */
-#line 3612 "./sql3.y"
+#line 3667 "./sql3.y"
{ (yyval.list) = (yyvsp[(3) - (3)].tree) ? t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)) : (yyvsp[(1) - (3)].list); }
break;
case 1023:
-
-/* Line 1464 of yacc.c */
-#line 3622 "./sql3.y"
+#line 3677 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 1024:
-
-/* Line 1464 of yacc.c */
-#line 3623 "./sql3.y"
+#line 3678 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1025:
-
-/* Line 1464 of yacc.c */
-#line 3624 "./sql3.y"
+#line 3679 "./sql3.y"
{ (yyval.list) = (yyvsp[(3) - (3)].tree) ? t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)) : (yyvsp[(1) - (3)].list); }
break;
case 1026:
-
-/* Line 1464 of yacc.c */
-#line 3628 "./sql3.y"
+#line 3683 "./sql3.y"
{ NEGATE ((yyval.tree), t_listst (3, BOP_EQ, t_box_num_and_zero (0), t_box_num (1))); }
break;
case 1027:
-
-/* Line 1464 of yacc.c */
-#line 3629 "./sql3.y"
+#line 3684 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 1028:
-
-/* Line 1464 of yacc.c */
-#line 3634 "./sql3.y"
+#line 3689 "./sql3.y"
{ (yyval.tree) = sqlp_for_statement ((yyvsp[(2) - (4)].tree), (yyvsp[(4) - (4)].tree)); }
break;
case 1029:
-
-/* Line 1464 of yacc.c */
-#line 3636 "./sql3.y"
+#line 3691 "./sql3.y"
{ (yyval.tree) = sqlp_c_for_statement ((ST **) t_list_to_array ((yyvsp[(3) - (9)].list)), (yyvsp[(5) - (9)].tree), (ST **) t_list_to_array ((yyvsp[(7) - (9)].list)), (yyvsp[(9) - (9)].tree)); }
break;
case 1030:
-
-/* Line 1464 of yacc.c */
-#line 3638 "./sql3.y"
+#line 3693 "./sql3.y"
{ (yyval.tree) = sqlp_foreach_statement ((yyvsp[(3) - (9)].tree), (yyvsp[(4) - (9)].box), (yyvsp[(6) - (9)].tree), (yyvsp[(9) - (9)].tree)); }
break;
case 1031:
-
-/* Line 1464 of yacc.c */
-#line 3644 "./sql3.y"
+#line 3699 "./sql3.y"
{ (yyval.tree) = t_listst (8, TRIGGER_DEF, (yyvsp[(3) - (10)].box), (ptrlong) (yyvsp[(4) - (10)].subtok), (yyvsp[(5) - (10)].box), (yyvsp[(7) - (10)].strval), (yyvsp[(8) - (10)].box), (yyvsp[(9) - (10)].box), (yyvsp[(10) - (10)].tree)); }
break;
case 1032:
-
-/* Line 1464 of yacc.c */
-#line 3648 "./sql3.y"
+#line 3703 "./sql3.y"
{ (yyval.box) = 0; }
break;
case 1033:
-
-/* Line 1464 of yacc.c */
-#line 3649 "./sql3.y"
+#line 3704 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1035:
-
-/* Line 1464 of yacc.c */
-#line 3657 "./sql3.y"
+#line 3712 "./sql3.y"
{ (yyval.subtok) = TRIG_BEFORE; }
break;
case 1036:
-
-/* Line 1464 of yacc.c */
-#line 3658 "./sql3.y"
+#line 3713 "./sql3.y"
{ (yyval.subtok) = TRIG_AFTER; }
break;
case 1037:
-
-/* Line 1464 of yacc.c */
-#line 3659 "./sql3.y"
+#line 3714 "./sql3.y"
{ (yyval.subtok) = TRIG_INSTEAD; }
break;
case 1038:
-
-/* Line 1464 of yacc.c */
-#line 3663 "./sql3.y"
+#line 3718 "./sql3.y"
{ (yyval.box) = (caddr_t) TRIG_INSERT; }
break;
case 1039:
-
-/* Line 1464 of yacc.c */
-#line 3664 "./sql3.y"
+#line 3719 "./sql3.y"
{ (yyval.box) = (caddr_t) (yyvsp[(2) - (2)].tree); }
break;
case 1040:
-
-/* Line 1464 of yacc.c */
-#line 3666 "./sql3.y"
+#line 3721 "./sql3.y"
{ (yyval.box) = (caddr_t) TRIG_DELETE; }
break;
case 1041:
-
-/* Line 1464 of yacc.c */
-#line 3670 "./sql3.y"
+#line 3725 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1042:
-
-/* Line 1464 of yacc.c */
-#line 3671 "./sql3.y"
+#line 3726 "./sql3.y"
{ (yyval.box) = (caddr_t) t_list_to_array ((yyvsp[(2) - (2)].list)); }
break;
case 1043:
-
-/* Line 1464 of yacc.c */
-#line 3675 "./sql3.y"
+#line 3730 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1044:
-
-/* Line 1464 of yacc.c */
-#line 3676 "./sql3.y"
+#line 3731 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1045:
-
-/* Line 1464 of yacc.c */
-#line 3680 "./sql3.y"
+#line 3735 "./sql3.y"
{ (yyval.tree) = t_listst (2, OLD_ALIAS, (yyvsp[(3) - (3)].box)); }
break;
case 1046:
-
-/* Line 1464 of yacc.c */
-#line 3681 "./sql3.y"
+#line 3736 "./sql3.y"
{ (yyval.tree) = t_listst (2, NEW_ALIAS, (yyvsp[(3) - (3)].box)); }
break;
case 1047:
-
-/* Line 1464 of yacc.c */
-#line 3686 "./sql3.y"
+#line 3741 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.ddl_drop_trigger"),
t_list (1, t_box_string ((yyvsp[(3) - (3)].strval))));
@@ -15077,9 +13353,7 @@ yyreduce:
break;
case 1048:
-
-/* Line 1464 of yacc.c */
-#line 3695 "./sql3.y"
+#line 3750 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.ddl_drop_proc"),
t_list (2, t_box_string ((yyvsp[(3) - (3)].strval)), 4));
@@ -15087,9 +13361,7 @@ yyreduce:
break;
case 1049:
-
-/* Line 1464 of yacc.c */
-#line 3700 "./sql3.y"
+#line 3755 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.ddl_drop_proc"),
t_list (1, t_box_string ((yyvsp[(3) - (3)].strval))));
@@ -15097,9 +13369,7 @@ yyreduce:
break;
case 1050:
-
-/* Line 1464 of yacc.c */
-#line 3705 "./sql3.y"
+#line 3760 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("DB.DBA.ddl_drop_proc"),
t_list (2, t_box_string ((yyvsp[(3) - (3)].strval)), 0));
@@ -15107,23 +13377,17 @@ yyreduce:
break;
case 1051:
-
-/* Line 1464 of yacc.c */
-#line 3719 "./sql3.y"
+#line 3774 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1052:
-
-/* Line 1464 of yacc.c */
-#line 3720 "./sql3.y"
+#line 3775 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1053:
-
-/* Line 1464 of yacc.c */
-#line 3724 "./sql3.y"
+#line 3779 "./sql3.y"
{
if ((yyvsp[(1) - (1)].tree)->_.col_ref.name == STAR)
yyerror ("No stars allowed inside XML view definition");
@@ -15134,86 +13398,62 @@ yyreduce:
break;
case 1054:
-
-/* Line 1464 of yacc.c */
-#line 3731 "./sql3.y"
+#line 3786 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (5, (yyvsp[(1) - (3)].tree), box_dv_uname_string ((yyvsp[(3) - (3)].box)), XV_XC_ATTRIBUTE, NULL, NULL); }
break;
case 1055:
-
-/* Line 1464 of yacc.c */
-#line 3732 "./sql3.y"
+#line 3787 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (5, (yyvsp[(1) - (3)].tree), box_dv_uname_string ((yyvsp[(3) - (3)].box)), XV_XC_SUBELEMENT, NULL, NULL); }
break;
case 1056:
-
-/* Line 1464 of yacc.c */
-#line 3745 "./sql3.y"
+#line 3800 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1057:
-
-/* Line 1464 of yacc.c */
-#line 3746 "./sql3.y"
+#line 3801 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1058:
-
-/* Line 1464 of yacc.c */
-#line 3751 "./sql3.y"
+#line 3806 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 1059:
-
-/* Line 1464 of yacc.c */
-#line 3755 "./sql3.y"
+#line 3810 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1060:
-
-/* Line 1464 of yacc.c */
-#line 3756 "./sql3.y"
+#line 3811 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(4) - (5)].list)); }
break;
case 1061:
-
-/* Line 1464 of yacc.c */
-#line 3762 "./sql3.y"
+#line 3817 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1062:
-
-/* Line 1464 of yacc.c */
-#line 3763 "./sql3.y"
+#line 3818 "./sql3.y"
{ (yyval.tree) = (yyvsp[(3) - (4)].tree); }
break;
case 1063:
-
-/* Line 1464 of yacc.c */
-#line 3768 "./sql3.y"
+#line 3823 "./sql3.y"
{ (yyval.subtok) = 0; }
break;
case 1064:
-
-/* Line 1464 of yacc.c */
-#line 3769 "./sql3.y"
+#line 3824 "./sql3.y"
{ (yyval.subtok) = 1; }
break;
case 1065:
-
-/* Line 1464 of yacc.c */
-#line 3775 "./sql3.y"
+#line 3830 "./sql3.y"
{
/*mapping schema*/
(yyval.tree) = (ST*) t_list (12,
@@ -15233,130 +13473,94 @@ yyreduce:
break;
case 1066:
-
-/* Line 1464 of yacc.c */
-#line 3794 "./sql3.y"
+#line 3849 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1067:
-
-/* Line 1464 of yacc.c */
-#line 3795 "./sql3.y"
+#line 3850 "./sql3.y"
{ (yyval.tree) = (ST*) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 1068:
-
-/* Line 1464 of yacc.c */
-#line 3800 "./sql3.y"
+#line 3855 "./sql3.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 1069:
-
-/* Line 1464 of yacc.c */
-#line 3801 "./sql3.y"
+#line 3856 "./sql3.y"
{ ST * tmp = (ST*) t_list_to_array ((yyvsp[(2) - (3)].list));
/*mapping schema*/
(yyval.tree) = (ST *) t_list (12, NULL, NULL, NULL, NULL, NULL, (ptrlong) 1, NULL, tmp, NULL, NULL, NULL, NULL); }
break;
case 1070:
-
-/* Line 1464 of yacc.c */
-#line 3811 "./sql3.y"
+#line 3866 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1071:
-
-/* Line 1464 of yacc.c */
-#line 3812 "./sql3.y"
+#line 3867 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1072:
-
-/* Line 1464 of yacc.c */
-#line 3816 "./sql3.y"
+#line 3871 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1073:
-
-/* Line 1464 of yacc.c */
-#line 3817 "./sql3.y"
+#line 3872 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
case 1074:
-
-/* Line 1464 of yacc.c */
-#line 3821 "./sql3.y"
+#line 3876 "./sql3.y"
{ (yyval.box) = t_box_num (0); }
break;
case 1075:
-
-/* Line 1464 of yacc.c */
-#line 3822 "./sql3.y"
+#line 3877 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1076:
-
-/* Line 1464 of yacc.c */
-#line 3838 "./sql3.y"
+#line 3893 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(0), t_box_string("")); }
break;
case 1077:
-
-/* Line 1464 of yacc.c */
-#line 3839 "./sql3.y"
+#line 3894 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(1), t_box_string("")); }
break;
case 1078:
-
-/* Line 1464 of yacc.c */
-#line 3840 "./sql3.y"
+#line 3895 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(2), t_box_string("")); }
break;
case 1079:
-
-/* Line 1464 of yacc.c */
-#line 3841 "./sql3.y"
+#line 3896 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(3), (yyvsp[(2) - (2)].box)); }
break;
case 1080:
-
-/* Line 1464 of yacc.c */
-#line 3842 "./sql3.y"
+#line 3897 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(5), t_box_string("")); }
break;
case 1081:
-
-/* Line 1464 of yacc.c */
-#line 3843 "./sql3.y"
+#line 3898 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (2, t_box_num(6), (yyvsp[(2) - (2)].box)); }
break;
case 1082:
-
-/* Line 1464 of yacc.c */
-#line 3847 "./sql3.y"
+#line 3902 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1083:
-
-/* Line 1464 of yacc.c */
-#line 3849 "./sql3.y"
+#line 3904 "./sql3.y"
{
if (stricmp ((yyvsp[(3) - (7)].box), "OWNER") && stricmp ((yyvsp[(3) - (7)].box), "NAME"))
yyerror ("syntax error at WebDAV OWNER keyword");
@@ -15365,9 +13569,7 @@ yyreduce:
break;
case 1086:
-
-/* Line 1464 of yacc.c */
-#line 3864 "./sql3.y"
+#line 3919 "./sql3.y"
{
if ((yyvsp[(2) - (3)].subtok) != BOP_EQ)
yyerror ("'=' expected");
@@ -15376,52 +13578,38 @@ yyreduce:
break;
case 1087:
-
-/* Line 1464 of yacc.c */
-#line 3875 "./sql3.y"
+#line 3930 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1088:
-
-/* Line 1464 of yacc.c */
-#line 3877 "./sql3.y"
+#line 3932 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 1089:
-
-/* Line 1464 of yacc.c */
-#line 3882 "./sql3.y"
+#line 3937 "./sql3.y"
{ (yyval.list) = NULL; }
break;
case 1090:
-
-/* Line 1464 of yacc.c */
-#line 3884 "./sql3.y"
+#line 3939 "./sql3.y"
{ (yyval.list) = (yyvsp[(2) - (3)].list); }
break;
case 1091:
-
-/* Line 1464 of yacc.c */
-#line 3890 "./sql3.y"
+#line 3945 "./sql3.y"
{ (yyval.tree) = (ST*) t_list (12, XML_VIEW, (yyvsp[(4) - (9)].strval), NULL, NULL, 0,
(yyvsp[(7) - (9)].tree), (ptrlong) (yyvsp[(8) - (9)].subtok), (yyvsp[(9) - (9)].tree), t_list_to_array ((yyvsp[(6) - (9)].list)), NULL, NULL, NULL); }
break;
case 1092:
-
-/* Line 1464 of yacc.c */
-#line 3897 "./sql3.y"
+#line 3952 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("DB.DBA.xml_view_drop"), t_list (1, (yyvsp[(4) - (4)].strval))); }
break;
case 1093:
-
-/* Line 1464 of yacc.c */
-#line 3918 "./sql3.y"
+#line 3973 "./sql3.y"
{
(yyval.tree) = t_listst (3, CALL_STMT,
t_sqlp_box_id_upcase ("concat"),
@@ -15430,100 +13618,72 @@ yyreduce:
break;
case 1094:
-
-/* Line 1464 of yacc.c */
-#line 3927 "./sql3.y"
+#line 3982 "./sql3.y"
{ (yyval.strval) = sqlp_type_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box), 1); }
break;
case 1095:
-
-/* Line 1464 of yacc.c */
-#line 3928 "./sql3.y"
+#line 3983 "./sql3.y"
{ (yyval.strval) = sqlp_type_name (NULL, 0, (yyvsp[(1) - (3)].box), box_length ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].box), 1); }
break;
case 1096:
-
-/* Line 1464 of yacc.c */
-#line 3929 "./sql3.y"
+#line 3984 "./sql3.y"
{ (yyval.strval) = sqlp_type_name ((yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box), box_length ((yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box), 1); }
break;
case 1097:
-
-/* Line 1464 of yacc.c */
-#line 3930 "./sql3.y"
+#line 3985 "./sql3.y"
{ (yyval.strval) = sqlp_type_name ((yyvsp[(1) - (4)].box), box_length ((yyvsp[(1) - (4)].box)), NULL, 0, (yyvsp[(4) - (4)].box), 1); }
break;
case 1098:
-
-/* Line 1464 of yacc.c */
-#line 3934 "./sql3.y"
+#line 3989 "./sql3.y"
{ (yyval.strval) = sqlp_type_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box), 0); }
break;
case 1099:
-
-/* Line 1464 of yacc.c */
-#line 3935 "./sql3.y"
+#line 3990 "./sql3.y"
{ (yyval.strval) = sqlp_type_name (NULL, 0, (yyvsp[(1) - (3)].box), box_length ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].box), 0); }
break;
case 1100:
-
-/* Line 1464 of yacc.c */
-#line 3936 "./sql3.y"
+#line 3991 "./sql3.y"
{ (yyval.strval) = sqlp_type_name ((yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box), box_length ((yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box), 0); }
break;
case 1101:
-
-/* Line 1464 of yacc.c */
-#line 3937 "./sql3.y"
+#line 3992 "./sql3.y"
{ (yyval.strval) = sqlp_type_name ((yyvsp[(1) - (4)].box), box_length ((yyvsp[(1) - (4)].box)), NULL, 0, (yyvsp[(4) - (4)].box), 0); }
break;
case 1102:
-
-/* Line 1464 of yacc.c */
-#line 3941 "./sql3.y"
+#line 3996 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name (NULL, 0, NULL, 0, (yyvsp[(1) - (1)].box)); }
break;
case 1103:
-
-/* Line 1464 of yacc.c */
-#line 3942 "./sql3.y"
+#line 3997 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name (NULL, 0, (yyvsp[(1) - (3)].box), box_length ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].box)); }
break;
case 1104:
-
-/* Line 1464 of yacc.c */
-#line 3943 "./sql3.y"
+#line 3998 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name ((yyvsp[(1) - (5)].box), box_length ((yyvsp[(1) - (5)].box)), (yyvsp[(3) - (5)].box), box_length ((yyvsp[(3) - (5)].box)), (yyvsp[(5) - (5)].box)); }
break;
case 1105:
-
-/* Line 1464 of yacc.c */
-#line 3944 "./sql3.y"
+#line 3999 "./sql3.y"
{ (yyval.strval) = sqlp_new_table_name ((yyvsp[(1) - (4)].box), box_length ((yyvsp[(1) - (4)].box)), NULL, 0, (yyvsp[(4) - (4)].box)); }
break;
case 1106:
-
-/* Line 1464 of yacc.c */
-#line 3948 "./sql3.y"
+#line 4003 "./sql3.y"
{ sqlp_udt_current_type = (yyvsp[(3) - (5)].strval); }
break;
case 1107:
-
-/* Line 1464 of yacc.c */
-#line 3950 "./sql3.y"
+#line 4005 "./sql3.y"
{
(yyval.tree) = t_listst (7, UDT_DEF,
(yyvsp[(3) - (9)].strval), (yyvsp[(4) - (9)].strval), (yyvsp[(5) - (9)].tree), (yyvsp[(7) - (9)].tree), (yyvsp[(8) - (9)].tree), (yyvsp[(9) - (9)].tree));
@@ -15533,25 +13693,19 @@ yyreduce:
break;
case 1108:
-
-/* Line 1464 of yacc.c */
-#line 3960 "./sql3.y"
+#line 4015 "./sql3.y"
{
(yyval.tree) = t_listst (3, UDT_DROP, (yyvsp[(3) - (4)].strval), (ptrlong) (yyvsp[(4) - (4)].intval));
}
break;
case 1109:
-
-/* Line 1464 of yacc.c */
-#line 3966 "./sql3.y"
+#line 4021 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1110:
-
-/* Line 1464 of yacc.c */
-#line 3968 "./sql3.y"
+#line 4023 "./sql3.y"
{
(yyval.tree) = t_listst (3, UDT_EXT,
(ptrlong) (yyvsp[(2) - (5)].intval), (yyvsp[(5) - (5)].box));
@@ -15560,9 +13714,7 @@ yyreduce:
break;
case 1111:
-
-/* Line 1464 of yacc.c */
-#line 3974 "./sql3.y"
+#line 4029 "./sql3.y"
{
(yyval.tree) = t_listst (3, UDT_EXT,
(ptrlong) (yyvsp[(5) - (5)].intval), (yyvsp[(3) - (5)].box));
@@ -15571,9 +13723,7 @@ yyreduce:
break;
case 1112:
-
-/* Line 1464 of yacc.c */
-#line 3980 "./sql3.y"
+#line 4035 "./sql3.y"
{
(yyval.tree) = t_listst (3, UDT_EXT,
(ptrlong) (yyvsp[(2) - (2)].intval), NULL);
@@ -15582,368 +13732,264 @@ yyreduce:
break;
case 1113:
-
-/* Line 1464 of yacc.c */
-#line 3988 "./sql3.y"
+#line 4043 "./sql3.y"
{ (yyval.strval) = NULL; }
break;
case 1114:
-
-/* Line 1464 of yacc.c */
-#line 3989 "./sql3.y"
+#line 4044 "./sql3.y"
{ (yyval.strval) = (yyvsp[(2) - (2)].strval); }
break;
case 1115:
-
-/* Line 1464 of yacc.c */
-#line 3993 "./sql3.y"
+#line 4048 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1116:
-
-/* Line 1464 of yacc.c */
-#line 3994 "./sql3.y"
+#line 4049 "./sql3.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 1117:
-
-/* Line 1464 of yacc.c */
-#line 3998 "./sql3.y"
+#line 4053 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(2) - (3)].list)); }
break;
case 1118:
-
-/* Line 1464 of yacc.c */
-#line 4003 "./sql3.y"
+#line 4058 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1119:
-
-/* Line 1464 of yacc.c */
-#line 4004 "./sql3.y"
+#line 4059 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1120:
-
-/* Line 1464 of yacc.c */
-#line 4008 "./sql3.y"
+#line 4063 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1121:
-
-/* Line 1464 of yacc.c */
-#line 4009 "./sql3.y"
+#line 4064 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, (yyvsp[(3) - (3)].box), NULL); }
break;
case 1122:
-
-/* Line 1464 of yacc.c */
-#line 4010 "./sql3.y"
+#line 4065 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, (yyvsp[(3) - (6)].box), (yyvsp[(6) - (6)].box)); }
break;
case 1123:
-
-/* Line 1464 of yacc.c */
-#line 4011 "./sql3.y"
+#line 4066 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, NULL, (yyvsp[(3) - (3)].box)); }
break;
case 1124:
-
-/* Line 1464 of yacc.c */
-#line 4015 "./sql3.y"
+#line 4070 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1125:
-
-/* Line 1464 of yacc.c */
-#line 4016 "./sql3.y"
+#line 4071 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_SOAP, NULL, (yyvsp[(2) - (2)].box)); }
break;
case 1126:
-
-/* Line 1464 of yacc.c */
-#line 4017 "./sql3.y"
+#line 4072 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_SOAP, (yyvsp[(2) - (2)].box), NULL); }
break;
case 1127:
-
-/* Line 1464 of yacc.c */
-#line 4018 "./sql3.y"
+#line 4073 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_SOAP, (yyvsp[(2) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
case 1128:
-
-/* Line 1464 of yacc.c */
-#line 4019 "./sql3.y"
+#line 4074 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_SOAP, (yyvsp[(4) - (4)].box), (yyvsp[(2) - (4)].box)); }
break;
case 1129:
-
-/* Line 1464 of yacc.c */
-#line 4023 "./sql3.y"
+#line 4078 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1130:
-
-/* Line 1464 of yacc.c */
-#line 4024 "./sql3.y"
+#line 4079 "./sql3.y"
{ (yyval.tree) = (ST *) (yyvsp[(3) - (3)].box); }
break;
case 1131:
-
-/* Line 1464 of yacc.c */
-#line 4029 "./sql3.y"
+#line 4084 "./sql3.y"
{
(yyval.tree) = t_listst (8, UDT_MEMBER, (yyvsp[(1) - (7)].box), (yyvsp[(2) - (7)].tree), (yyvsp[(3) - (7)].tree), (yyvsp[(4) - (7)].box), (yyvsp[(5) - (7)].strval), (yyvsp[(6) - (7)].tree), (yyvsp[(7) - (7)].tree));
}
break;
case 1132:
-
-/* Line 1464 of yacc.c */
-#line 4035 "./sql3.y"
+#line 4090 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1133:
-
-/* Line 1464 of yacc.c */
-#line 4036 "./sql3.y"
+#line 4091 "./sql3.y"
{ (yyval.tree) = (yyvsp[(4) - (4)].tree); }
break;
case 1134:
-
-/* Line 1464 of yacc.c */
-#line 4037 "./sql3.y"
+#line 4092 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1135:
-
-/* Line 1464 of yacc.c */
-#line 4041 "./sql3.y"
+#line 4096 "./sql3.y"
{ (yyval.box) = t_alloc_box (0, DV_DB_NULL); }
break;
case 1136:
-
-/* Line 1464 of yacc.c */
-#line 4042 "./sql3.y"
+#line 4097 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1137:
-
-/* Line 1464 of yacc.c */
-#line 4046 "./sql3.y"
+#line 4101 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1138:
-
-/* Line 1464 of yacc.c */
-#line 4047 "./sql3.y"
+#line 4102 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 1139:
-
-/* Line 1464 of yacc.c */
-#line 4051 "./sql3.y"
+#line 4106 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1140:
-
-/* Line 1464 of yacc.c */
-#line 4052 "./sql3.y"
+#line 4107 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 1141:
-
-/* Line 1464 of yacc.c */
-#line 4056 "./sql3.y"
+#line 4111 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_FINAL, 1); }
break;
case 1142:
-
-/* Line 1464 of yacc.c */
-#line 4057 "./sql3.y"
+#line 4112 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_FINAL, 0); }
break;
case 1143:
-
-/* Line 1464 of yacc.c */
-#line 4058 "./sql3.y"
+#line 4113 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_REF, (yyvsp[(3) - (3)].tree)); }
break;
case 1144:
-
-/* Line 1464 of yacc.c */
-#line 4059 "./sql3.y"
+#line 4114 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_REF, (yyvsp[(4) - (5)].list)); }
break;
case 1145:
-
-/* Line 1464 of yacc.c */
-#line 4060 "./sql3.y"
+#line 4115 "./sql3.y"
{ (yyval.tree) = t_listst (1, UDT_REF); }
break;
case 1146:
-
-/* Line 1464 of yacc.c */
-#line 4061 "./sql3.y"
+#line 4116 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_REFCAST, 0, (yyvsp[(8) - (8)].box)); }
break;
case 1147:
-
-/* Line 1464 of yacc.c */
-#line 4062 "./sql3.y"
+#line 4117 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_REFCAST, 1, (yyvsp[(8) - (8)].box)); }
break;
case 1148:
-
-/* Line 1464 of yacc.c */
-#line 4063 "./sql3.y"
+#line 4118 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_REFCAST, 0); }
break;
case 1149:
-
-/* Line 1464 of yacc.c */
-#line 4064 "./sql3.y"
+#line 4119 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_REFCAST, 1); }
break;
case 1150:
-
-/* Line 1464 of yacc.c */
-#line 4065 "./sql3.y"
+#line 4120 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_UNRESTRICTED, 1); }
break;
case 1151:
-
-/* Line 1464 of yacc.c */
-#line 4066 "./sql3.y"
+#line 4121 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_SOAP, (yyvsp[(2) - (2)].box)); }
break;
case 1152:
-
-/* Line 1464 of yacc.c */
-#line 4070 "./sql3.y"
+#line 4125 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1153:
-
-/* Line 1464 of yacc.c */
-#line 4071 "./sql3.y"
+#line 4126 "./sql3.y"
{ (yyval.tree) = (ST *) t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 1154:
-
-/* Line 1464 of yacc.c */
-#line 4075 "./sql3.y"
+#line 4130 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1155:
-
-/* Line 1464 of yacc.c */
-#line 4076 "./sql3.y"
+#line 4131 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1156:
-
-/* Line 1464 of yacc.c */
-#line 4080 "./sql3.y"
+#line 4135 "./sql3.y"
{ (yyval.intval) = UDT_METHOD_INSTANCE; }
break;
case 1157:
-
-/* Line 1464 of yacc.c */
-#line 4081 "./sql3.y"
+#line 4136 "./sql3.y"
{ (yyval.intval) = UDT_METHOD_STATIC; }
break;
case 1158:
-
-/* Line 1464 of yacc.c */
-#line 4082 "./sql3.y"
+#line 4137 "./sql3.y"
{ (yyval.intval) = UDT_METHOD_INSTANCE; }
break;
case 1159:
-
-/* Line 1464 of yacc.c */
-#line 4086 "./sql3.y"
+#line 4141 "./sql3.y"
{ (yyval.box) = (caddr_t) t_list (0); }
break;
case 1160:
-
-/* Line 1464 of yacc.c */
-#line 4087 "./sql3.y"
+#line 4142 "./sql3.y"
{ (yyval.box) = t_list_to_array_box ((yyvsp[(2) - (3)].list)); }
break;
case 1161:
-
-/* Line 1464 of yacc.c */
-#line 4092 "./sql3.y"
+#line 4147 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1162:
-
-/* Line 1464 of yacc.c */
-#line 4094 "./sql3.y"
+#line 4149 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1163:
-
-/* Line 1464 of yacc.c */
-#line 4099 "./sql3.y"
+#line 4154 "./sql3.y"
{ (yyval.tree) = t_listst (6, LOCAL_VAR, IN_L, (yyvsp[(2) - (4)].tree), (yyvsp[(3) - (4)].tree), NULL, (yyvsp[(4) - (4)].tree)); }
break;
case 1164:
-
-/* Line 1464 of yacc.c */
-#line 4104 "./sql3.y"
+#line 4159 "./sql3.y"
{
(yyval.tree) = t_listst (6, UDT_METHOD,
(ptrlong) (yyvsp[(1) - (7)].intval), (yyvsp[(3) - (7)].box), (yyvsp[(4) - (7)].box), (yyvsp[(6) - (7)].tree), (yyvsp[(7) - (7)].strval));
@@ -15951,9 +13997,7 @@ yyreduce:
break;
case 1165:
-
-/* Line 1464 of yacc.c */
-#line 4109 "./sql3.y"
+#line 4164 "./sql3.y"
{
(yyval.tree) = t_listst (6, UDT_METHOD,
UDT_METHOD_CONSTRUCTOR, (yyvsp[(3) - (5)].box), (yyvsp[(4) - (5)].box), NULL, (yyvsp[(5) - (5)].strval));
@@ -15961,9 +14005,7 @@ yyreduce:
break;
case 1166:
-
-/* Line 1464 of yacc.c */
-#line 4117 "./sql3.y"
+#line 4172 "./sql3.y"
{
(yyval.tree) = t_listst (5, UDT_METHOD_DEF,
0, (yyvsp[(1) - (3)].tree), (ptrlong) (yyvsp[(2) - (3)].intval), (yyvsp[(3) - (3)].tree));
@@ -15971,9 +14013,7 @@ yyreduce:
break;
case 1167:
-
-/* Line 1464 of yacc.c */
-#line 4122 "./sql3.y"
+#line 4177 "./sql3.y"
{
(yyval.tree) = t_listst (5, UDT_METHOD_DEF,
1, (yyvsp[(2) - (2)].tree), NULL, NULL);
@@ -15981,74 +14021,54 @@ yyreduce:
break;
case 1168:
-
-/* Line 1464 of yacc.c */
-#line 4129 "./sql3.y"
+#line 4184 "./sql3.y"
{ (yyval.intval) = 0; }
break;
case 1169:
-
-/* Line 1464 of yacc.c */
-#line 4130 "./sql3.y"
+#line 4185 "./sql3.y"
{ (yyval.intval) = 1; }
break;
case 1170:
-
-/* Line 1464 of yacc.c */
-#line 4131 "./sql3.y"
+#line 4186 "./sql3.y"
{ (yyval.intval) = 2; }
break;
case 1171:
-
-/* Line 1464 of yacc.c */
-#line 4132 "./sql3.y"
+#line 4187 "./sql3.y"
{ (yyval.intval) = 3; }
break;
case 1172:
-
-/* Line 1464 of yacc.c */
-#line 4136 "./sql3.y"
+#line 4191 "./sql3.y"
{ (yyval.strval) = NULL; }
break;
case 1173:
-
-/* Line 1464 of yacc.c */
-#line 4137 "./sql3.y"
+#line 4192 "./sql3.y"
{ (yyval.strval) = (yyvsp[(2) - (2)].strval); }
break;
case 1174:
-
-/* Line 1464 of yacc.c */
-#line 4141 "./sql3.y"
+#line 4196 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1175:
-
-/* Line 1464 of yacc.c */
-#line 4142 "./sql3.y"
+#line 4197 "./sql3.y"
{ (yyval.tree) = (ST *)t_list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 1176:
-
-/* Line 1464 of yacc.c */
-#line 4147 "./sql3.y"
+#line 4202 "./sql3.y"
{
(yyval.list) = ((yyvsp[(1) - (1)].tree) != NULL ? t_CONS ((yyvsp[(1) - (1)].tree), NULL) : NULL);
}
break;
case 1177:
-
-/* Line 1464 of yacc.c */
-#line 4151 "./sql3.y"
+#line 4206 "./sql3.y"
{
if ((yyvsp[(2) - (2)].tree) != NULL)
(yyval.list) = t_NCONC ((yyvsp[(1) - (2)].list), t_CONS ((yyvsp[(2) - (2)].tree), NULL));
@@ -16056,216 +14076,156 @@ yyreduce:
break;
case 1178:
-
-/* Line 1464 of yacc.c */
-#line 4158 "./sql3.y"
+#line 4213 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, (ptrlong) (yyvsp[(2) - (2)].intval), NULL, NULL); }
break;
case 1179:
-
-/* Line 1464 of yacc.c */
-#line 4159 "./sql3.y"
+#line 4214 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1180:
-
-/* Line 1464 of yacc.c */
-#line 4160 "./sql3.y"
+#line 4215 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1181:
-
-/* Line 1464 of yacc.c */
-#line 4161 "./sql3.y"
+#line 4216 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1182:
-
-/* Line 1464 of yacc.c */
-#line 4162 "./sql3.y"
+#line 4217 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1183:
-
-/* Line 1464 of yacc.c */
-#line 4163 "./sql3.y"
+#line 4218 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1184:
-
-/* Line 1464 of yacc.c */
-#line 4164 "./sql3.y"
+#line 4219 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1185:
-
-/* Line 1464 of yacc.c */
-#line 4165 "./sql3.y"
+#line 4220 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1186:
-
-/* Line 1464 of yacc.c */
-#line 4166 "./sql3.y"
+#line 4221 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1187:
-
-/* Line 1464 of yacc.c */
-#line 4167 "./sql3.y"
+#line 4222 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1188:
-
-/* Line 1464 of yacc.c */
-#line 4168 "./sql3.y"
+#line 4223 "./sql3.y"
{ (yyval.tree) = NULL; /* no action for now */ }
break;
case 1189:
-
-/* Line 1464 of yacc.c */
-#line 4169 "./sql3.y"
+#line 4224 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, (yyvsp[(3) - (3)].box), NULL); }
break;
case 1190:
-
-/* Line 1464 of yacc.c */
-#line 4170 "./sql3.y"
+#line 4225 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_VAR_EXT, UDT_LANG_NONE, (yyvsp[(4) - (4)].box), NULL); }
break;
case 1191:
-
-/* Line 1464 of yacc.c */
-#line 4171 "./sql3.y"
+#line 4226 "./sql3.y"
{ (yyval.tree) = t_listst (4, UDT_EXT, UDT_LANG_NONE, NULL, (yyvsp[(3) - (3)].box)); }
break;
case 1192:
-
-/* Line 1464 of yacc.c */
-#line 4175 "./sql3.y"
+#line 4230 "./sql3.y"
{ yyerror ("Language ADA not supported"); }
break;
case 1193:
-
-/* Line 1464 of yacc.c */
-#line 4176 "./sql3.y"
+#line 4231 "./sql3.y"
{ (yyval.intval) = UDT_LANG_C; }
break;
case 1194:
-
-/* Line 1464 of yacc.c */
-#line 4177 "./sql3.y"
+#line 4232 "./sql3.y"
{ yyerror ("Language COBOL not supported"); }
break;
case 1195:
-
-/* Line 1464 of yacc.c */
-#line 4178 "./sql3.y"
+#line 4233 "./sql3.y"
{ yyerror ("Language FORTRAN not supported"); }
break;
case 1196:
-
-/* Line 1464 of yacc.c */
-#line 4179 "./sql3.y"
+#line 4234 "./sql3.y"
{ yyerror ("Language MUMPS not supported"); }
break;
case 1197:
-
-/* Line 1464 of yacc.c */
-#line 4180 "./sql3.y"
+#line 4235 "./sql3.y"
{ yyerror ("Language PASCAL not supported"); }
break;
case 1198:
-
-/* Line 1464 of yacc.c */
-#line 4181 "./sql3.y"
+#line 4236 "./sql3.y"
{ yyerror ("Language PLI not supported"); }
break;
case 1199:
-
-/* Line 1464 of yacc.c */
-#line 4182 "./sql3.y"
+#line 4237 "./sql3.y"
{ (yyval.intval) = UDT_LANG_JAVA; }
break;
case 1200:
-
-/* Line 1464 of yacc.c */
-#line 4183 "./sql3.y"
+#line 4238 "./sql3.y"
{ (yyval.intval) = UDT_LANG_CLR; }
break;
case 1202:
-
-/* Line 1464 of yacc.c */
-#line 4188 "./sql3.y"
+#line 4243 "./sql3.y"
{ (yyval.intval) = UDT_LANG_SQL; }
break;
case 1203:
-
-/* Line 1464 of yacc.c */
-#line 4192 "./sql3.y"
+#line 4247 "./sql3.y"
{ (yyval.tree) = NULL; }
break;
case 1204:
-
-/* Line 1464 of yacc.c */
-#line 4193 "./sql3.y"
+#line 4248 "./sql3.y"
{ (yyval.tree) = (ST *) (yyvsp[(2) - (2)].strval); }
break;
case 1205:
-
-/* Line 1464 of yacc.c */
-#line 4199 "./sql3.y"
+#line 4254 "./sql3.y"
{
(yyval.tree) = (ST *) sqlp_udt_method_decl (0, (yyvsp[(2) - (10)].intval), (yyvsp[(4) - (10)].box), (yyvsp[(5) - (10)].box), (caddr_t) (yyvsp[(6) - (10)].tree), (yyvsp[(9) - (10)].strval), (caddr_t) (yyvsp[(10) - (10)].tree), (caddr_t) (yyvsp[(7) - (10)].box));
}
break;
case 1206:
-
-/* Line 1464 of yacc.c */
-#line 4204 "./sql3.y"
+#line 4259 "./sql3.y"
{
(yyval.tree) = (ST *) sqlp_udt_method_decl (0, UDT_METHOD_CONSTRUCTOR, (yyvsp[(4) - (9)].strval), (yyvsp[(5) - (9)].box), (caddr_t) (yyvsp[(6) - (9)].tree), (yyvsp[(8) - (9)].strval), (caddr_t) (yyvsp[(9) - (9)].tree), NULL);
}
break;
case 1207:
-
-/* Line 1464 of yacc.c */
-#line 4211 "./sql3.y"
+#line 4266 "./sql3.y"
{ (yyval.tree) = t_listst (5, CALL_STMT, (yyvsp[(3) - (6)].box), t_list_to_array ((yyvsp[(5) - (6)].list)), NULL, (yyvsp[(1) - (6)].strval)); }
break;
case 1208:
-
-/* Line 1464 of yacc.c */
-#line 4216 "./sql3.y"
+#line 4271 "./sql3.y"
{
dk_set_t set = NULL;
t_set_push (&set, (yyvsp[(1) - (7)].box));
@@ -16277,9 +14237,7 @@ yyreduce:
break;
case 1209:
-
-/* Line 1464 of yacc.c */
-#line 4225 "./sql3.y"
+#line 4280 "./sql3.y"
{
dk_set_t set = NULL;
t_set_push (&set, (yyvsp[(1) - (6)].box));
@@ -16291,16 +14249,12 @@ yyreduce:
break;
case 1210:
-
-/* Line 1464 of yacc.c */
-#line 4233 "./sql3.y"
+#line 4288 "./sql3.y"
{ (yyval.list) = t_NCONC (t_CONS ((yyvsp[(1) - (3)].box), NULL), (yyvsp[(3) - (3)].list)); }
break;
case 1211:
-
-/* Line 1464 of yacc.c */
-#line 4238 "./sql3.y"
+#line 4293 "./sql3.y"
{
dk_set_t set = NULL;
t_set_push (&set, (yyvsp[(1) - (9)].box));
@@ -16313,9 +14267,7 @@ yyreduce:
break;
case 1212:
-
-/* Line 1464 of yacc.c */
-#line 4248 "./sql3.y"
+#line 4303 "./sql3.y"
{
dk_set_t set = NULL;
t_set_push (&set, (yyvsp[(1) - (8)].box));
@@ -16328,191 +14280,137 @@ yyreduce:
break;
case 1213:
-
-/* Line 1464 of yacc.c */
-#line 4257 "./sql3.y"
+#line 4312 "./sql3.y"
{ (yyval.list) = t_NCONC (t_CONS ((yyvsp[(1) - (3)].box), NULL), (yyvsp[(3) - (3)].list)); }
break;
case 1214:
-
-/* Line 1464 of yacc.c */
-#line 4262 "./sql3.y"
+#line 4317 "./sql3.y"
{ (yyval.tree) = t_listst (5, CALL_STMT, (yyvsp[(3) - (6)].box), t_list_to_array (t_CONS ((yyvsp[(1) - (6)].tree), (yyvsp[(5) - (6)].list))), NULL, (ptrlong) 1); }
break;
case 1215:
-
-/* Line 1464 of yacc.c */
-#line 4264 "./sql3.y"
+#line 4319 "./sql3.y"
{ (yyval.tree) = (ST *) sqlp_udt_identifier_chain_to_member_handler ((yyvsp[(1) - (4)].list), (caddr_t) (yyvsp[(3) - (4)].list), 0); }
break;
case 1216:
-
-/* Line 1464 of yacc.c */
-#line 4266 "./sql3.y"
+#line 4321 "./sql3.y"
{ (yyval.tree) = t_listst (5, CALL_STMT, (yyvsp[(7) - (10)].box), t_list_to_array (t_CONS ((yyvsp[(2) - (10)].tree), (yyvsp[(9) - (10)].list))), NULL, t_list (1, (yyvsp[(4) - (10)].strval))); }
break;
case 1217:
-
-/* Line 1464 of yacc.c */
-#line 4268 "./sql3.y"
+#line 4323 "./sql3.y"
{ (yyval.tree) = t_listst (5, CALL_STMT, (yyvsp[(7) - (10)].box), t_list_to_array (t_CONS ((yyvsp[(2) - (10)].tree), (yyvsp[(9) - (10)].list))), NULL, t_list (1, (yyvsp[(4) - (10)].strval))); }
break;
case 1218:
-
-/* Line 1464 of yacc.c */
-#line 4273 "./sql3.y"
+#line 4328 "./sql3.y"
{ (yyval.tree) = t_listst (5, CALL_STMT, (yyvsp[(5) - (8)].box), t_list_to_array (t_CONS ((yyvsp[(3) - (8)].tree), (yyvsp[(7) - (8)].list))), NULL, (ptrlong) 1); }
break;
case 1219:
-
-/* Line 1464 of yacc.c */
-#line 4275 "./sql3.y"
+#line 4330 "./sql3.y"
{ (yyval.tree) = (ST *) sqlp_udt_identifier_chain_to_member_handler ((yyvsp[(3) - (6)].list), (caddr_t) (yyvsp[(5) - (6)].list), 0); }
break;
case 1220:
-
-/* Line 1464 of yacc.c */
-#line 4277 "./sql3.y"
+#line 4332 "./sql3.y"
{ (yyval.tree) = t_listst (5, CALL_STMT, (yyvsp[(9) - (12)].box), t_list_to_array (t_CONS ((yyvsp[(4) - (12)].tree), (yyvsp[(11) - (12)].list))), NULL, t_list (1, (yyvsp[(6) - (12)].strval))); }
break;
case 1221:
-
-/* Line 1464 of yacc.c */
-#line 4279 "./sql3.y"
+#line 4334 "./sql3.y"
{ (yyval.tree) = t_listst (5, CALL_STMT, (yyvsp[(9) - (12)].box), t_list_to_array (t_CONS ((yyvsp[(4) - (12)].tree), (yyvsp[(11) - (12)].list))), NULL, t_list (1, (yyvsp[(6) - (12)].strval))); }
break;
case 1223:
-
-/* Line 1464 of yacc.c */
-#line 4285 "./sql3.y"
+#line 4340 "./sql3.y"
{ (yyval.tree) = (ST *) sqlp_udt_identifier_chain_to_member_handler (t_NCONC (t_CONS ((yyvsp[(1) - (3)].box), NULL), (yyvsp[(3) - (3)].list)), NULL, 1); }
break;
case 1224:
-
-/* Line 1464 of yacc.c */
-#line 4290 "./sql3.y"
+#line 4345 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, (yyvsp[(3) - (3)].box), t_list (1, (yyvsp[(1) - (3)].tree))); }
break;
case 1225:
-
-/* Line 1464 of yacc.c */
-#line 4292 "./sql3.y"
+#line 4347 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_list (2, (yyvsp[(7) - (7)].box), (yyvsp[(4) - (7)].strval)), t_list (1, (yyvsp[(2) - (7)].tree))); }
break;
case 1226:
-
-/* Line 1464 of yacc.c */
-#line 4294 "./sql3.y"
+#line 4349 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, t_list (2, (yyvsp[(7) - (7)].box), (yyvsp[(4) - (7)].strval)), t_list (1, (yyvsp[(2) - (7)].tree))); }
break;
case 1227:
-
-/* Line 1464 of yacc.c */
-#line 4298 "./sql3.y"
+#line 4353 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
case 1228:
-
-/* Line 1464 of yacc.c */
-#line 4299 "./sql3.y"
+#line 4354 "./sql3.y"
{ (yyval.box) = t_sqlp_box_id_upcase (yytext); }
break;
case 1229:
-
-/* Line 1464 of yacc.c */
-#line 4304 "./sql3.y"
+#line 4359 "./sql3.y"
{ (yyval.tree) = t_listst (3, CALL_STMT, (yyvsp[(2) - (5)].strval), t_list_to_array ((yyvsp[(4) - (5)].list))); }
break;
case 1230:
-
-/* Line 1464 of yacc.c */
-#line 4308 "./sql3.y"
+#line 4363 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_ALTER, (yyvsp[(3) - (4)].strval), (yyvsp[(4) - (4)].tree)); }
break;
case 1231:
-
-/* Line 1464 of yacc.c */
-#line 4312 "./sql3.y"
+#line 4367 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_MEMBER_ADD, (yyvsp[(3) - (3)].tree)); }
break;
case 1232:
-
-/* Line 1464 of yacc.c */
-#line 4313 "./sql3.y"
+#line 4368 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_MEMBER_DROP, (yyvsp[(3) - (4)].box), (ptrlong) (yyvsp[(4) - (4)].intval)); }
break;
case 1233:
-
-/* Line 1464 of yacc.c */
-#line 4314 "./sql3.y"
+#line 4369 "./sql3.y"
{ (yyval.tree) = t_listst (2, UDT_METHOD_ADD, (yyvsp[(2) - (2)].tree)); }
break;
case 1234:
-
-/* Line 1464 of yacc.c */
-#line 4315 "./sql3.y"
+#line 4370 "./sql3.y"
{ (yyval.tree) = t_listst (3, UDT_METHOD_DROP, (yyvsp[(2) - (3)].tree), (ptrlong) (yyvsp[(3) - (3)].intval)); }
break;
case 1235:
-
-/* Line 1464 of yacc.c */
-#line 4319 "./sql3.y"
+#line 4374 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1236:
-
-/* Line 1464 of yacc.c */
-#line 4320 "./sql3.y"
+#line 4375 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
case 1237:
-
-/* Line 1464 of yacc.c */
-#line 4321 "./sql3.y"
+#line 4376 "./sql3.y"
{ (yyval.box) = t_box_num (2); }
break;
case 1238:
-
-/* Line 1464 of yacc.c */
-#line 4325 "./sql3.y"
+#line 4380 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1239:
-
-/* Line 1464 of yacc.c */
-#line 4326 "./sql3.y"
+#line 4381 "./sql3.y"
{ (yyval.box) = t_box_num (1); }
break;
case 1240:
-
-/* Line 1464 of yacc.c */
-#line 4331 "./sql3.y"
+#line 4386 "./sql3.y"
{
(yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("DB.DBA.CLR_CREATE_LIBRARY"),
t_list (4, (yyvsp[(5) - (7)].tree), (yyvsp[(3) - (7)].strval), (yyvsp[(7) - (7)].box), (yyvsp[(6) - (7)].box)));
@@ -16520,9 +14418,7 @@ yyreduce:
break;
case 1241:
-
-/* Line 1464 of yacc.c */
-#line 4339 "./sql3.y"
+#line 4394 "./sql3.y"
{
(yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("DB.DBA.CLR_CREATE_ASSEMBLY"),
t_list (4, (yyvsp[(5) - (7)].tree), (yyvsp[(3) - (7)].strval), (yyvsp[(7) - (7)].box), (yyvsp[(6) - (7)].box)));
@@ -16530,9 +14426,7 @@ yyreduce:
break;
case 1242:
-
-/* Line 1464 of yacc.c */
-#line 4347 "./sql3.y"
+#line 4402 "./sql3.y"
{
(yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("DB.DBA.CLR_DROP_LIBRARY"),
t_list (1, (yyvsp[(3) - (3)].strval)));
@@ -16540,9 +14434,7 @@ yyreduce:
break;
case 1243:
-
-/* Line 1464 of yacc.c */
-#line 4355 "./sql3.y"
+#line 4410 "./sql3.y"
{
(yyval.tree) = (ST*) t_list (3, CALL_STMT, t_sqlp_box_id_upcase ("DB.DBA.CLR_DROP_LIBRARY"),
t_list (1, (yyvsp[(3) - (3)].strval)));
@@ -16550,198 +14442,143 @@ yyreduce:
break;
case 1244:
-
-/* Line 1464 of yacc.c */
-#line 4366 "./sql3.y"
+#line 4421 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_INT, t_box_num (0xffff), NULL); }
break;
case 1245:
-
-/* Line 1464 of yacc.c */
-#line 4367 "./sql3.y"
+#line 4422 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_INT, (yyvsp[(3) - (4)].box), NULL); }
break;
case 1246:
-
-/* Line 1464 of yacc.c */
-#line 4368 "./sql3.y"
+#line 4423 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_INT, t_box_num (0xffff), NULL); }
break;
case 1247:
-
-/* Line 1464 of yacc.c */
-#line 4369 "./sql3.y"
+#line 4424 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_INT, (yyvsp[(3) - (4)].box), NULL); }
break;
case 1248:
-
-/* Line 1464 of yacc.c */
-#line 4370 "./sql3.y"
+#line 4425 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_WORD, NULL, t_box_num (0xffff)); }
break;
case 1249:
-
-/* Line 1464 of yacc.c */
-#line 4371 "./sql3.y"
+#line 4426 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_WORD, (yyvsp[(3) - (6)].box), (yyvsp[(5) - (6)].box)); }
break;
case 1250:
-
-/* Line 1464 of yacc.c */
-#line 4372 "./sql3.y"
+#line 4427 "./sql3.y"
{ (yyval.tree) = t_listst (5, NULL, NULL, (ptrlong)CP_WORD, t_box_num (- unbox ((yyvsp[(4) - (7)].box))), (yyvsp[(6) - (7)].box)); }
break;
case 1251:
-
-/* Line 1464 of yacc.c */
-#line 4377 "./sql3.y"
+#line 4432 "./sql3.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); if (!cl_name_to_host ((yyvsp[(1) - (1)].box))) yyerror ("undefined host name in cluster def"); }
break;
case 1252:
-
-/* Line 1464 of yacc.c */
-#line 4381 "./sql3.y"
+#line 4436 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 1253:
-
-/* Line 1464 of yacc.c */
-#line 4382 "./sql3.y"
+#line 4437 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 1254:
-
-/* Line 1464 of yacc.c */
-#line 4386 "./sql3.y"
+#line 4441 "./sql3.y"
{ (yyval.box) = t_listbox (2, (yyvsp[(2) - (5)].box), (yyvsp[(4) - (5)].box)); }
break;
case 1255:
-
-/* Line 1464 of yacc.c */
-#line 4390 "./sql3.y"
+#line 4445 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].box), NULL); }
break;
case 1256:
-
-/* Line 1464 of yacc.c */
-#line 4391 "./sql3.y"
+#line 4446 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].box), NULL)); }
break;
case 1257:
-
-/* Line 1464 of yacc.c */
-#line 4396 "./sql3.y"
+#line 4451 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, t_list_to_array ((yyvsp[(3) - (4)].list)), NULL); }
break;
case 1258:
-
-/* Line 1464 of yacc.c */
-#line 4397 "./sql3.y"
+#line 4452 "./sql3.y"
{ (yyval.tree) = t_listst (3, NULL, t_list_to_array ((yyvsp[(3) - (6)].list)), t_list_to_array ((yyvsp[(6) - (6)].list))); }
break;
case 1259:
-
-/* Line 1464 of yacc.c */
-#line 4402 "./sql3.y"
+#line 4457 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 1260:
-
-/* Line 1464 of yacc.c */
-#line 4403 "./sql3.y"
+#line 4458 "./sql3.y"
{ (yyval.list) = t_NCONC ((yyvsp[(1) - (3)].list), t_CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 1261:
-
-/* Line 1464 of yacc.c */
-#line 4407 "./sql3.y"
+#line 4462 "./sql3.y"
{ (yyval.box) = NULL; }
break;
case 1262:
-
-/* Line 1464 of yacc.c */
-#line 4408 "./sql3.y"
+#line 4463 "./sql3.y"
{ (yyval.box) = (caddr_t) 1;}
break;
case 1263:
-
-/* Line 1464 of yacc.c */
-#line 4413 "./sql3.y"
+#line 4468 "./sql3.y"
{ (yyval.tree) = t_listst (4, CLUSTER_DEF, t_box_string ((yyvsp[(3) - (5)].box)), (yyvsp[(4) - (5)].box), t_list_to_array ((yyvsp[(5) - (5)].list))); }
break;
case 1264:
-
-/* Line 1464 of yacc.c */
-#line 4417 "./sql3.y"
+#line 4472 "./sql3.y"
{ (yyval.list) = t_CONS ((yyvsp[(2) - (2)].tree), NULL); (yyvsp[(2) - (2)].tree)->_.col_part.col = (yyvsp[(1) - (2)].box); }
break;
case 1265:
-
-/* Line 1464 of yacc.c */
-#line 4418 "./sql3.y"
+#line 4473 "./sql3.y"
{ (yyvsp[(4) - (4)].tree)->_.col_part.col = (yyvsp[(3) - (4)].box); (yyval.list) = t_NCONC ((yyvsp[(1) - (4)].list), (yyvsp[(4) - (4)].tree));}
break;
case 1266:
-
-/* Line 1464 of yacc.c */
-#line 4422 "./sql3.y"
+#line 4477 "./sql3.y"
{ (yyval.list) = NULL;}
break;
case 1267:
-
-/* Line 1464 of yacc.c */
-#line 4423 "./sql3.y"
+#line 4478 "./sql3.y"
{ (yyval.list) = (yyvsp[(2) - (3)].list); }
break;
case 1268:
-
-/* Line 1464 of yacc.c */
-#line 4426 "./sql3.y"
+#line 4481 "./sql3.y"
{ (yyval.box) = t_sym_string ("__ALL"); }
break;
case 1269:
-
-/* Line 1464 of yacc.c */
-#line 4427 "./sql3.y"
+#line 4482 "./sql3.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 1270:
-
-/* Line 1464 of yacc.c */
-#line 4433 "./sql3.y"
+#line 4488 "./sql3.y"
{ (yyval.tree) = t_listst (5, PARTITION_DEF, (yyvsp[(5) - (8)].strval), (yyvsp[(3) - (8)].box), (yyvsp[(7) - (8)].box), t_list_to_array ((yyvsp[(8) - (8)].list))); }
break;
-
-/* Line 1464 of yacc.c */
-#line 16745 "sql3.c"
+/* Line 1267 of yacc.c. */
+#line 14582 "sql3.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -16752,6 +14589,7 @@ yyreduce:
*++yyvsp = yyval;
+
/* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -16816,7 +14654,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -16833,7 +14671,7 @@ yyerrlab:
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -16890,6 +14728,9 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -16914,7 +14755,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -16925,7 +14766,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
diff --git a/libsrc/Wi/sql3.h b/libsrc/Wi/sql3.h
index 880dc0a..053f5fb 100644
--- a/libsrc/Wi/sql3.h
+++ b/libsrc/Wi/sql3.h
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,11 +29,10 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -767,11 +768,8 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
+#line 95 "./sql3.y"
{
-
-/* Line 1685 of yacc.c */
-#line 68 "./sql3.y"
-
long intval;
char *strval;
sql_tree_t *tree;
@@ -779,17 +777,14 @@ typedef union YYSTYPE
dk_set_t list;
long subtok;
sqlp_join_t join;
-
-
-
-/* Line 1685 of yacc.c */
-#line 787 "sql3.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1489 of yacc.c. */
+#line 783 "sql3.h"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
extern YYSTYPE yylval;
-
diff --git a/libsrc/Wi/sql3.y b/libsrc/Wi/sql3.y
index ce6c3bd..ecb63a3 100644
--- a/libsrc/Wi/sql3.y
+++ b/libsrc/Wi/sql3.y
@@ -1,14 +1,14 @@
/*
* sql3.y
*
- * $Id: sql3.y,v 1.29.2.14 2012/03/08 12:55:36 source Exp $
+ * $Id: sql3.y,v 1.29.2.11 2011/06/09 17:26:41 source Exp $
*
* SQL Parser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -25,7 +25,34 @@
*
*/
-%expect 18
+/*
+ CHANGES SINCE 22-MAR-1997
+
+ 22-MAR-1997 AK Added rule obe_literal (included in atom)
+ to handle ODBC standard brace escaped literals like
+ {d 'yyyy-mm-dd'}, {ts 'etc....'} and {t 'hh:mm:ss'} for
+ date and time(stamp) values. See comment about
+ the macro obe_keyword_to_bif_fun_name below.
+
+ Added also three more cases to function_call rule for ODBC
+ brace-escaped function calls like {fn concat('Bar','bar')}
+ We should actually run in that case NAME through some kind
+ of filter, e.g. CHAR -> chr, user -> get_user,
+ CONCAT -> concat, etc.
+ That is, to catch standard function names like char and
+ insert and user that cannot be normally used because
+ they are reserved words elsewhere,
+ as well as (maybe) to convert uppercase names to
+ lowercase, because currently bif-functions are recognized
+ only in the case they have been defined in.
+ But, what about if client defines uppercase or mixed case
+ function names with create procedure and wants
+ to call them with this {fn NAME} syntax???
+
+ Added a clause to rule opt_escape to handle ODBC-standard
+ like escape-syntax: {escape 'escape-character'}
+ although the escape-checking syntax is not functional yet.
+ */
%{
@@ -111,9 +138,8 @@
%type <strval> new_table_name
%type <tree> selectinto_statement
-%type <tree> query_opt_from_spec
%type <tree> query_spec
-/*%type <tree> query_no_from_spec*/
+%type <tree> query_no_from_spec
%type <tree> query_exp
%type <tree> sqlonly_query_exp
%type <tree> query_or_sparql_exp
@@ -125,7 +151,6 @@
%type <tree> sqlonly_query_term
%type <tree> sparqlonly_query_term
%type <tree> query_term
-%type <tree> table_exp_opt
%type <tree> table_exp
%type <box> assignment
@@ -445,6 +470,7 @@
%type <tree> opt_proc_col_list
%type <tree> column_commalist_or_empty
%type <subtok> opt_best
+/*%type <tree> opt_table_exp*/
%type <box> opt_constraint_name
%type <box> opt_column
%type <intval> opt_drop_behavior
@@ -1130,7 +1156,7 @@ drop_xml_schema
view_query_spec
: query_exp
- /*| query_no_from_spec*/
+ | query_no_from_spec
;
view_def_select_and_opt
@@ -1569,7 +1595,7 @@ sql
manipulative_statement
: query_or_sparql_exp
- /*| query_no_from_spec*/
+ | query_no_from_spec
| update_statement_positioned
| update_statement_searched
| insert_statement
@@ -1662,7 +1688,7 @@ insert_statement
values_or_query_spec
: VALUES '(' insert_atom_commalist ')'
{ $$ = t_listst (2, INSERT_VALUES, sqlp_wrapper_sqlxml((ST**)t_list_to_array ($3))); }
- | query_spec /* FROM is mandatory here */
+ | query_spec
;
insert_atom_commalist
@@ -1959,7 +1985,7 @@ non_final_query_term
;
sqlonly_query_term
- : query_opt_from_spec
+ : query_spec
| '(' query_or_sparql_exp ')' opt_order_by_clause { $$ = sqlp_inline_order_by ($2, (ST **) $4); }
| XPATH STRING { $$ = sqlp_embedded_xpath ($2); }
;
@@ -1987,18 +2013,6 @@ non_final_query_spec
;
-query_opt_from_spec
- : SELECT opt_top selection table_exp_opt {
- if (NULL == $4)
- $$ = t_listst (5, SELECT_STMT, NULL,
- sqlp_stars (sqlp_wrapper_sqlxml ((ST **) $3), NULL) , NULL, NULL);
- else
- $$ = t_listst (5, SELECT_STMT, $2,
- sqlp_stars (sqlp_wrapper_sqlxml ((ST **) $3), $4->_.table_exp.from) , NULL, $4);
- sqlp_breakup ($$); }
- ;
-
-
query_spec
: SELECT opt_top selection table_exp
{ $$ = t_listst (5, SELECT_STMT, $2,
@@ -2006,14 +2020,14 @@ query_spec
sqlp_breakup ($$); }
;
-/*query_no_from_spec
+query_no_from_spec
: SELECT opt_top selection
{
$$ = t_listst (5, SELECT_STMT, NULL,
sqlp_stars (sqlp_wrapper_sqlxml ((ST **) $3), NULL) , NULL, NULL);
sqlp_breakup ($$); }
;
-*/
+
breakup_term
@@ -2044,11 +2058,6 @@ non_final_table_exp
}
;
-table_exp_opt
- : /* empty */ { $$ = NULL; }
- | table_exp
- ;
-
table_exp
: from_clause opt_where_clause opt_group_by_clause opt_having_clause
opt_order_by_clause opt_lock_mode opt_sql_opt
@@ -2402,6 +2411,12 @@ scalar_subquery
subquery
+/* : query_exp */
+/* : '(' SELECT opt_top selection table_exp ')'
+ { $$ = t_listst (5, SELECT_STMT, $3,
+ sqlp_stars (sqlp_wrapper_sqlxml ((ST **) $4), $5->_.table_exp.from), NULL, $5);
+ sqlp_breakup ((ST*) $$);
+ } */
: '(' sqlonly_query_exp ')' { $$ = $2; }
| '(' SPARQL_L sqlonly_query_exp ')' { $$ = $3; }
;
@@ -2426,6 +2441,20 @@ scalar_exp_no_col_ref
: atom_no_obe { $$ = (sql_tree_t *) $1; }
| aggregate_ref
| scalar_subquery
+/********** pmn
+ | '(' scalar_exp_commalist ')'
+ { dk_set_t exps = $2;
+ if (exps -> next)
+ {
+ $$ = t_listst (2, COMMA_EXP, t_list_to_array (exps));
+ }
+ else
+ {
+ $$ = (ST *) exps -> data; dk_set_free (exps);
+ }
+ }
+ FIXED reduce/reduce conflict: (pmn)
+*************/
| '(' scalar_exp ')' { $$ = $2; }
| '(' scalar_exp ',' scalar_exp_commalist ')'
{ dk_set_t exps = t_CONS ($2, $4);
@@ -2449,6 +2478,20 @@ scalar_exp_no_col_ref_no_mem_obs_chain
: atom_no_obe { $$ = (sql_tree_t *) $1; }
| aggregate_ref
| scalar_subquery
+/********** pmn
+ | '(' scalar_exp_commalist ')'
+ { dk_set_t exps = $2;
+ if (exps -> next)
+ {
+ $$ = t_listst (2, COMMA_EXP, t_list_to_array (exps));
+ }
+ else
+ {
+ $$ = (ST *) exps -> data; dk_set_free (exps);
+ }
+ }
+ FIXED reduce/reduce conflict: (pmn)
+*************/
| '(' scalar_exp ')' { $$ = $2; }
| '(' scalar_exp ',' scalar_exp_commalist ')'
{ dk_set_t exps = t_CONS ($2, $4);
@@ -2845,6 +2888,12 @@ signed_literal
;
/* miscellaneous */
+/*** pmn
+opt_prefix
+ : identifier { $$ = $1; }
+/ * | { $$ = NULL; } * /
+ ;
+*/
q_table_name
: identifier { $$ = sqlp_table_name (NULL, 0, NULL, 0, $1, 1); }
@@ -3125,6 +3174,12 @@ parameter
| NAMED_PARAMETER { $$ = $1; }
;
+/*** pmn
+range_variable
+ : identifier
+ ;
+*/
+
user
: identifier { $$ = $1; }
;
diff --git a/libsrc/Wi/sql3_vc.c b/libsrc/Wi/sql3_vc.c
index eefbb46..ba81b97 100644
--- a/libsrc/Wi/sql3_vc.c
+++ b/libsrc/Wi/sql3_vc.c
@@ -1,10 +1,10 @@
/*
- * $Id: sql3_vc.c,v 1.2.2.2 2012/03/08 12:55:36 source Exp $
+ * $Id: sql3_vc.c,v 1.2.2.1 2009/04/18 21:55:15 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/sql_code.c b/libsrc/Wi/sql_code.c
index 34f1c1f..4ab1af0 100644
--- a/libsrc/Wi/sql_code.c
+++ b/libsrc/Wi/sql_code.c
@@ -7361,9 +7361,972 @@ static const char *proc168 =
"}\n"
"--src odbccat.sql:693\n";
-/* vt_text.sql */
+/* useraggr.sql */
static const char *proc169 =
+"#line 24 \"[executable]/useraggr.sql\"\n"
+" create procedure STD_COUNT (in _env varchar)\n"
+"{\n"
+"return aref (deserialize(_env), 0);\n"
+"}\n"
+"--src useraggr.sql:22\n";
+
+static const char *proc170 =
+"#line 31 \"[executable]/useraggr.sql\"\n"
+" create procedure STD11_INIT (inout _env varchar)\n"
+"{\n"
+"_env := serialize (vector (0, 0.0));\n"
+"}\n"
+"--src useraggr.sql:29\n";
+
+static const char *proc171 =
+"#line 38 \"[executable]/useraggr.sql\"\n"
+" create procedure STD12_INIT (inout _env varchar)\n"
+"{\n"
+"_env := serialize (vector (0, 0.0,0.0));\n"
+"}\n"
+"--src useraggr.sql:36\n";
+
+static const char *proc172 =
+"#line 45 \"[executable]/useraggr.sql\"\n"
+" create procedure STD13_INIT (inout _env varchar)\n"
+"{\n"
+"_env := serialize (vector (0, 0.0,0.0, 0.0));\n"
+"}\n"
+"--src useraggr.sql:43\n";
+
+static const char *proc173 =
+"#line 52 \"[executable]/useraggr.sql\"\n"
+" create procedure VAR_ACC (inout _env varchar, in val numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"if (val is null)\n"
+"return;\n"
+"declare ctx any;\n"
+"ctx := deserialize (_env);\n"
+"\n"
+"aset( ctx, 1, aref (ctx, 1) + val);\n"
+"aset( ctx, 2, aref (ctx, 2) + val*val);\n"
+"aset( ctx, 0, aref (ctx, 0) + 1);\n"
+"_env := serialize (ctx);\n"
+"}\n"
+"--src useraggr.sql:50\n";
+
+static const char *proc174 =
+"#line 69 \"[executable]/useraggr.sql\"\n"
+" create procedure VAR_POP_FIN (inout _ctx varchar)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"declare _env any;\n"
+"_env := deserialize (_ctx);\n"
+"declare c integer;\n"
+"c := aref (_env, 0);\n"
+"if (c = 0)\n"
+"return null;\n"
+"return (aref (_env, 2) - aref (_env, 1) * aref (_env, 1) / c) / c;\n"
+"}\n"
+"--src useraggr.sql:67\n";
+
+static const char *proc175 =
+"#line 84 \"[executable]/useraggr.sql\"\n"
+" create procedure VAR_SAMP_FIN (inout _ctx varchar)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"declare _env any;\n"
+"_env := deserialize (_ctx);\n"
+"declare c integer;\n"
+"c := aref (_env, 0);\n"
+"if (c = 0)\n"
+"return null;\n"
+"if (c = 1)\n"
+"return 0.0;\n"
+"return (aref (_env, 2) - aref (_env, 1) * aref (_env, 1) / c) / (c - 1);\n"
+"}\n"
+"--src useraggr.sql:82\n";
+
+static const char *proc176 =
+"#line 101 \"[executable]/useraggr.sql\"\n"
+" create procedure VAR_FIN (inout _ctx varchar)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"if (STD_COUNT (_ctx) = 1)\n"
+"return null;\n"
+"return VAR_SAMP_FIN (_ctx);\n"
+"}\n"
+"--src useraggr.sql:99\n";
+
+static const char *proc177 =
+"#line 112 \"[executable]/useraggr.sql\"\n"
+" create procedure STDDEV_POP_FIN (inout _ctx varchar)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"declare c integer;\n"
+"declare _env any;\n"
+"_env := deserialize (_ctx);\n"
+"c := aref (_env, 0);\n"
+"if (c = 0)\n"
+"return null;\n"
+"\n"
+"return sqrt ((aref (_env, 2) - aref (_env, 1) * aref (_env, 1) / c) / c) ;\n"
+"}\n"
+"--src useraggr.sql:110\n";
+
+static const char *proc178 =
+"#line 128 \"[executable]/useraggr.sql\"\n"
+" create procedure STDDEV_SAMP_FIN (inout _ctx varchar)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"declare c integer;\n"
+"declare _env any;\n"
+"_env := deserialize (_ctx);\n"
+"c := aref (_env, 0);\n"
+"if (c = 0)\n"
+"return null;\n"
+"if (c = 1)\n"
+"return 0.0;\n"
+"return sqrt ((aref (_env, 2) - aref (_env, 1) * aref (_env, 1) / c) / ( c - 1));\n"
+"}\n"
+"--src useraggr.sql:126\n";
+
+static const char *proc179 =
+"#line 145 \"[executable]/useraggr.sql\"\n"
+" create procedure STDDEV_FIN (inout _ctx varchar)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"if (STD_COUNT (_ctx) = 1)\n"
+"return null;\n"
+"return STDDEV_SAMP_FIN (_ctx);\n"
+"}\n"
+"--src useraggr.sql:143\n";
+
+static const char *proc180 =
+"#line 156 \"[executable]/useraggr.sql\"\n"
+" create procedure COVAR_ACC (inout _ctx any,\n"
+"in expr1 numeric,\n"
+"in expr2 numeric)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return;\n"
+"if (expr1 is null or expr2 is null)\n"
+"return;\n"
+"\n"
+"declare _env any;\n"
+"\n"
+"_env := deserialize (_ctx);\n"
+"\n"
+"aset (_env, 1, aref (_env,1)+expr1);\n"
+"aset (_env, 2, aref (_env,2)+expr2);\n"
+"aset (_env, 3, aref (_env,3)+expr2*expr1);\n"
+"aset (_env, 0, aref (_env,0)+1);\n"
+"\n"
+"_ctx := serialize (_env);\n"
+"}\n"
+"--src useraggr.sql:154\n";
+
+static const char *proc181 =
+"#line 179 \"[executable]/useraggr.sql\"\n"
+" create procedure COVAR_SAMP_FIN (inout _ctx any)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"declare _env any;\n"
+"_env := deserialize (_ctx);\n"
+"if (aref (_env, 0) = 0)\n"
+"return null;\n"
+"if (aref (_env, 0) = 1)\n"
+"return 0.0;\n"
+"\n"
+"return (aref (_env, 3) - aref(_env,2) * aref (_env,1) / aref (_env, 0)) / ( aref (_env, 0) - 1);\n"
+"}\n"
+"--src useraggr.sql:177\n";
+
+static const char *proc182 =
+"#line 195 \"[executable]/useraggr.sql\"\n"
+" create procedure COVAR_POP_FIN (inout _ctx any)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"declare _env any;\n"
+"_env := deserialize (_ctx);\n"
+"if (aref (_env, 0) = 0)\n"
+"return null;\n"
+"if (aref (_env, 0) = 1)\n"
+"return 0.0;\n"
+"\n"
+"return (aref (_env, 3) - aref(_env,2) * aref (_env,1) / aref (_env, 0))/ aref (_env,0);\n"
+"}\n"
+"--src useraggr.sql:193\n";
+
+static const char *proc183 =
+"#line 211 \"[executable]/useraggr.sql\"\n"
+" create procedure COVAR_FIN (inout _ctx varchar)\n"
+"{\n"
+"if (_ctx is null)\n"
+"return null;\n"
+"if (STD_COUNT (_ctx) = 1)\n"
+"return null;\n"
+"return COVAR_SAMP_FIN (_ctx);\n"
+"}\n"
+"--src useraggr.sql:209\n";
+
+static const char *other133 =
+"create aggregate DB.DBA.VAR_POP (in val numeric) returns numeric from\n"
+"STD12_INIT, VAR_ACC, VAR_POP_FIN\n";
+
+static const char *other134 =
+"create aggregate DB.DBA.VAR_SAMP (in val numeric) returns numeric from\n"
+"STD12_INIT, VAR_ACC, VAR_SAMP_FIN\n";
+
+static const char *other135 =
+"create aggregate DB.DBA.VAR (in val numeric) returns numeric from\n"
+"STD12_INIT, VAR_ACC, VAR_FIN\n";
+
+static const char *other136 =
+"create aggregate DB.DBA.STDDEV_POP (in val numeric) returns numeric from\n"
+"STD12_INIT, VAR_ACC, STDDEV_POP_FIN\n";
+
+static const char *other137 =
+"create aggregate DB.DBA.STDDEV_SAMP (in val numeric) returns numeric from\n"
+"STD12_INIT, VAR_ACC, STDDEV_SAMP_FIN\n";
+
+static const char *other138 =
+"create aggregate DB.DBA.STDDEV (in val numeric) returns numeric from\n"
+"STD12_INIT, VAR_ACC, STDDEV_FIN\n";
+
+static const char *other139 =
+"create aggregate DB.DBA.COVAR_SAMP (in expr1 numeric, in expr2 numeric) returns numeric from\n"
+"STD13_INIT, COVAR_ACC, COVAR_SAMP_FIN\n";
+
+static const char *other140 =
+"create aggregate DB.DBA.COVAR_POP (in expr1 numeric, in expr2 numeric) returns numeric from\n"
+"STD13_INIT, COVAR_ACC, COVAR_POP_FIN\n";
+
+static const char *other141 =
+"create aggregate DB.DBA.COVAR (in expr1 numeric, in expr2 numeric) returns numeric from\n"
+"STD13_INIT, COVAR_ACC, COVAR_FIN\n";
+
+static const char *proc184 =
+"#line 250 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_SLOPE_INIT (inout _env varchar)\n"
+"{\n"
+"declare _ctx1 varchar;\n"
+"declare _ctx2 varchar;\n"
+"\n"
+"STD13_INIT (_ctx1);\n"
+"STD12_INIT (_ctx2);\n"
+"\n"
+"_env := serialize (vector (0, _ctx1, _ctx2));\n"
+"}\n"
+"--src useraggr.sql:248\n";
+
+static const char *proc185 =
+"#line 263 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_SLOPE_ACC (inout _env varchar, in expr1 numeric, in expr2 numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"if ( (expr1 is null) or (expr2 is null))\n"
+"return;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"declare _ctx1 varchar;\n"
+"declare _ctx2 varchar;\n"
+"\n"
+"_ctx1 := aref (_ctx, 1);\n"
+"_ctx2 := aref (_ctx, 2);\n"
+"\n"
+"aset (_ctx, 0, aref (_ctx,0) + 1);\n"
+"COVAR_ACC (_ctx1, expr1, expr2);\n"
+"VAR_ACC (_ctx2, expr2);\n"
+"\n"
+"aset (_ctx, 1, _ctx1);\n"
+"aset (_ctx, 2, _ctx2);\n"
+"\n"
+"_env := serialize (_ctx);\n"
+"}\n"
+"--src useraggr.sql:261\n";
+
+static const char *proc186 =
+"#line 290 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_SLOPE_FIN (inout _env varchar)\n"
+"{\n"
+"if (_env is null)\n"
+"return null;\n"
+"declare _ctx any;\n"
+"declare c integer;\n"
+"\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"c := aref (_ctx, 0);\n"
+"if (c = 0)\n"
+"return 0;\n"
+"if (c = 1)\n"
+"return null;\n"
+"\n"
+"declare _ctx1 varchar;\n"
+"declare _ctx2 varchar;\n"
+"declare covar_pop_val numeric;\n"
+"declare var_pop_val numeric;\n"
+"\n"
+"_ctx1 := aref (_ctx, 1);\n"
+"_ctx2 := aref (_ctx, 2);\n"
+"\n"
+"\n"
+"covar_pop_val := COVAR_POP_FIN (_ctx1);\n"
+"var_pop_val := VAR_POP_FIN (_ctx2);\n"
+"\n"
+"if (var_pop_val = 0)\n"
+"return null;\n"
+"return covar_pop_val / var_pop_val;\n"
+"}\n"
+"--src useraggr.sql:288\n";
+
+static const char *other142 =
+"create aggregate DB.DBA.REGR_SLOPE (in expr1 numeric, in expr2 numeric) returns numeric from REGR_SLOPE_INIT, REGR_SLOPE_ACC, REGR_SLOPE_FIN\n";
+
+static const char *proc187 =
+"#line 327 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_INTERCEPT_INIT (inout _env varchar)\n"
+"{\n"
+"declare _ctx_regr_slope varchar;\n"
+"\n"
+"REGR_SLOPE_INIT (_ctx_regr_slope);\n"
+"_env := serialize (vector (0, 0.0, 0.0, _ctx_regr_slope));\n"
+"}\n"
+"--src useraggr.sql:325\n";
+
+static const char *proc188 =
+"#line 337 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_INTERCEPT_ACC (inout _env varchar, in expr1 numeric, in expr2 numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"if ((expr1 is null) or (expr2 is null))\n"
+"return;\n"
+"\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"aset (_ctx, 0, aref (_ctx, 0) + 1);\n"
+"aset (_ctx, 1, aref (_ctx, 1) + expr1);\n"
+"aset (_ctx, 2, aref (_ctx, 2) + expr2);\n"
+"\n"
+"declare _ctx_r varchar;\n"
+"_ctx_r := aref (_ctx, 3);\n"
+"REGR_SLOPE_ACC (_ctx_r, expr1, expr2);\n"
+"aset (_ctx, 3, _ctx_r);\n"
+"\n"
+"_env := serialize (_ctx);\n"
+"}\n"
+"--src useraggr.sql:335\n";
+
+static const char *proc189 =
+"#line 361 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_INTERCEPT_FIN (inout _env varchar)\n"
+"{\n"
+"if (_env is null)\n"
+"return null;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"declare c integer;\n"
+"c := aref (_ctx, 0);\n"
+"if ((c = 0) or (c = 1))\n"
+"return null;\n"
+"\n"
+"return aref (_ctx, 1) / c - REGR_SLOPE_FIN (aref (_ctx, 3)) * aref (_ctx, 2) / c;\n"
+"}\n"
+"--src useraggr.sql:359\n";
+
+static const char *other143 =
+"create aggregate DB.DBA.REGR_INTERCEPT (in expr1 numeric, in expr2 numeric) returns numeric from REGR_INTERCEPT_INIT, REGR_INTERCEPT_ACC, REGR_INTERCEPT_FIN\n";
+
+static const char *proc190 =
+"#line 380 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_COUNT_INIT (inout _env integer)\n"
+"{\n"
+"_env := 0;\n"
+"}\n"
+"--src useraggr.sql:378\n";
+
+static const char *proc191 =
+"#line 387 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_COUNT_ACC (inout _env integer, in expr numeric, in expr2 numeric)\n"
+"{\n"
+"if ((_env is null) or (expr is null) or (expr2 is null))\n"
+"return;\n"
+"_env := _env + 1;\n"
+"}\n"
+"--src useraggr.sql:385\n";
+
+static const char *proc192 =
+"#line 396 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_COUNT_FIN (inout _env integer)\n"
+"{\n"
+"return _env;\n"
+"}\n"
+"--src useraggr.sql:394\n";
+
+static const char *proc193 =
+"#line 403 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_COUNT_MERGE (inout _e1 integer, inout _e2 integer)\n"
+"{\n"
+"_e1 := _e1 + _e2;\n"
+"}\n"
+"--src useraggr.sql:401\n";
+
+static const char *other144 =
+"create aggregate DB.DBA.REGR_COUNT (in expr1 numeric, in expr2 numeric) returns numeric from REGR_COUNT_INIT, REGR_COUNT_ACC, REGR_COUNT_FIN, REGR_COUNT_MERGE\n";
+
+static const char *proc194 =
+"#line 413 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_AVG_ACC (inout _env varchar, in expr1 numeric, in expr2 numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"\n"
+"if ( (expr1 is null) or (expr2 is null))\n"
+"return;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"aset (_ctx, 0, aref (_ctx, 0) + 1);\n"
+"aset (_ctx, 1, aref (_ctx, 1) + expr1);\n"
+"aset (_ctx, 2, aref (_ctx, 2) + expr2);\n"
+"\n"
+"_env := serialize (_ctx);\n"
+"}\n"
+"--src useraggr.sql:411\n";
+
+static const char *proc195 =
+"#line 432 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_AVGX_FIN (inout _env varchar)\n"
+"{\n"
+"if (_env is null)\n"
+"return null;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"if (aref (_ctx, 0) = 0)\n"
+"return null;\n"
+"return aref (_ctx, 1) / aref (_ctx,0);\n"
+"}\n"
+"--src useraggr.sql:430\n";
+
+static const char *proc196 =
+"#line 445 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_AVGY_FIN (inout _env varchar)\n"
+"{\n"
+"if (_env is null)\n"
+"return null;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"if (aref (_ctx, 0) = 0)\n"
+"return null;\n"
+"return aref (_ctx, 2) / aref (_ctx,0);\n"
+"}\n"
+"--src useraggr.sql:443\n";
+
+static const char *other145 =
+"create aggregate DB.DBA.REGR_AVGX (in x numeric, in y numeric) returns numeric from\n"
+"STD12_INIT, REGR_AVG_ACC, REGR_AVGX_FIN\n";
+
+static const char *other146 =
+"create aggregate DB.DBA.REGR_AVGY (in x numeric, in y numeric) returns numeric from\n"
+"STD12_INIT, REGR_AVG_ACC, REGR_AVGY_FIN\n";
+
+static const char *proc197 =
+"#line 466 \"[executable]/useraggr.sql\"\n"
+" create procedure CORR_INIT (inout _env varchar)\n"
+"{\n"
+"declare _ctx_cov varchar;\n"
+"declare _ctx_stdev1 varchar;\n"
+"declare _ctx_stdev2 varchar;\n"
+"\n"
+"STD13_INIT (_ctx_cov);\n"
+"STD12_INIT (_ctx_stdev1);\n"
+"STD12_INIT (_ctx_stdev2);\n"
+"\n"
+"_env := serialize (vector (0, _ctx_cov, _ctx_stdev1, _ctx_stdev2));\n"
+"}\n"
+"--src useraggr.sql:464\n";
+
+static const char *proc198 =
+"#line 481 \"[executable]/useraggr.sql\"\n"
+" create procedure CORR_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"if ((e1 is null) or (e2 is null))\n"
+"return;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"declare _ctx_cov varchar;\n"
+"declare _ctx_stdev1 varchar;\n"
+"declare _ctx_stdev2 varchar;\n"
+"\n"
+"_ctx_cov := aref (_ctx, 1);\n"
+"_ctx_stdev1 := aref (_ctx, 2);\n"
+"_ctx_stdev2 := aref (_ctx, 3);\n"
+"\n"
+"COVAR_ACC (_ctx_cov, e1, e2);\n"
+"VAR_ACC (_ctx_stdev1, e1);\n"
+"VAR_ACC (_ctx_stdev2, e2);\n"
+"\n"
+"aset (_ctx, 0, aref (_ctx, 0) + 1);\n"
+"aset (_ctx, 1, _ctx_cov);\n"
+"aset (_ctx, 2, _ctx_stdev1);\n"
+"aset (_ctx, 3, _ctx_stdev2);\n"
+"\n"
+"_env := serialize (_ctx);\n"
+"}\n"
+"--src useraggr.sql:479\n";
+
+static const char *proc199 =
+"#line 512 \"[executable]/useraggr.sql\"\n"
+" create procedure CORR_FIN (inout _env varchar)\n"
+"{\n"
+"if (_env is null)\n"
+"return null;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"declare _ctx_cov_val numeric;\n"
+"declare _ctx_stdev1_val numeric;\n"
+"declare _ctx_stdev2_val numeric;\n"
+"\n"
+"_ctx_cov_val := COVAR_POP_FIN (aref (_ctx, 1));\n"
+"_ctx_stdev1_val := STDDEV_POP_FIN (aref (_ctx, 2));\n"
+"_ctx_stdev2_val := STDDEV_POP_FIN (aref (_ctx, 3));\n"
+"\n"
+"if (_ctx_cov_val is null)\n"
+"return null;\n"
+"if (_ctx_stdev1_val is null or _ctx_stdev1_val = 0)\n"
+"return null;\n"
+"if (_ctx_stdev2_val is null or _ctx_stdev2_val = 0)\n"
+"return null;\n"
+"\n"
+"return _ctx_cov_val / _ctx_stdev1_val / _ctx_stdev2_val;\n"
+"}\n"
+"--src useraggr.sql:510\n";
+
+static const char *other147 =
+"create aggregate DB.DBA.CORR (in x numeric, in y numeric) returns numeric from\n"
+"CORR_INIT, CORR_ACC, CORR_FIN\n";
+
+static const char *proc200 =
+"#line 543 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_R2_INIT (inout _env varchar)\n"
+"{\n"
+"declare _ctx_vp1 varchar;\n"
+"declare _ctx_vp2 varchar;\n"
+"declare _ctx_corr varchar;\n"
+"\n"
+"STD12_INIT (_ctx_vp1);\n"
+"STD12_INIT (_ctx_vp2);\n"
+"CORR_INIT (_ctx_corr);\n"
+"\n"
+"_env := serialize (vector (_ctx_vp1, _ctx_vp2, _ctx_corr));\n"
+"}\n"
+"--src useraggr.sql:541\n";
+
+static const char *proc201 =
+"#line 558 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_R2_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"if (e1 is null or e2 is null)\n"
+"return;\n"
+"declare _ctx any;\n"
+"\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"declare _ctx_vp1 varchar;\n"
+"declare _ctx_vp2 varchar;\n"
+"declare _ctx_corr varchar;\n"
+"\n"
+"_ctx_vp1 := aref (_ctx, 0);\n"
+"_ctx_vp2 := aref (_ctx, 1);\n"
+"_ctx_corr := aref (_ctx, 2);\n"
+"\n"
+"VAR_ACC (_ctx_vp1, e1);\n"
+"VAR_ACC (_ctx_vp2, e2);\n"
+"CORR_ACC (_ctx_corr, e1, e2);\n"
+"\n"
+"aset (_ctx, 0, _ctx_vp1);\n"
+"aset (_ctx, 1, _ctx_vp2);\n"
+"aset (_ctx, 2, _ctx_corr);\n"
+"\n"
+"_env := serialize (_ctx);\n"
+"}\n"
+"--src useraggr.sql:556\n";
+
+static const char *proc202 =
+"#line 589 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_R2_FIN (inout _env varchar)\n"
+"{\n"
+"if (_env is null)\n"
+"return null;\n"
+"declare _ctx any;\n"
+"\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"declare _vp1 numeric;\n"
+"declare _vp2 numeric;\n"
+"declare _corr numeric;\n"
+"\n"
+"_vp2 := VAR_POP_FIN (aref(_ctx, 1));\n"
+"if (_vp2 is null or _vp2 = 0)\n"
+"return null;\n"
+"_vp1 := VAR_POP_FIN (aref(_ctx, 0));\n"
+"if (_vp1 is null or _vp1 = 0)\n"
+"return 1;\n"
+"_corr := CORR_FIN (aref (_ctx, 2));\n"
+"return _corr * _corr;\n"
+"}\n"
+"--src useraggr.sql:587\n";
+
+static const char *other148 =
+"create aggregate DB.DBA.REGR_R2 (in e1 numeric, in e2 numeric) returns numeric from\n"
+"REGR_R2_INIT, REGR_R2_ACC, REGR_R2_FIN\n";
+
+static const char *proc203 =
+"#line 617 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_SXX_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"if (e1 is null or e2 is null)\n"
+"return;\n"
+"\n"
+"VAR_ACC (_env, e2);\n"
+"}\n"
+"--src useraggr.sql:615\n";
+
+static const char *proc204 =
+"#line 629 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_SYY_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"if (e1 is null or e2 is null)\n"
+"return;\n"
+"\n"
+"VAR_ACC (_env, e1);\n"
+"}\n"
+"--src useraggr.sql:627\n";
+
+static const char *proc205 =
+"#line 641 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_SXY_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
+"{\n"
+"if (_env is null)\n"
+"return;\n"
+"if (e1 is null or e2 is null)\n"
+"return;\n"
+"\n"
+"COVAR_ACC (_env, e1, e2);\n"
+"}\n"
+"--src useraggr.sql:639\n";
+
+static const char *proc206 =
+"#line 653 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_S___FIN (inout _env varchar)\n"
+"{\n"
+"if (_env is null)\n"
+"return null;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"declare _var numeric;\n"
+"\n"
+"_var := VAR_POP_FIN (_env);\n"
+"if (_var is null)\n"
+"return null;\n"
+"return aref (_ctx,0) * _var;\n"
+"}\n"
+"--src useraggr.sql:651\n";
+
+static const char *proc207 =
+"#line 670 \"[executable]/useraggr.sql\"\n"
+" create procedure REGR_SXY_FIN (inout _env varchar)\n"
+"{\n"
+"if (_env is null)\n"
+"return null;\n"
+"declare _ctx any;\n"
+"_ctx := deserialize (_env);\n"
+"\n"
+"declare _var numeric;\n"
+"\n"
+"_var := COVAR_POP_FIN (_env);\n"
+"if (_var is null)\n"
+"return null;\n"
+"return aref (_ctx,0) * _var;\n"
+"}\n"
+"--src useraggr.sql:668\n";
+
+static const char *other149 =
+"create aggregate DB.DBA.REGR_SXX (in e1 numeric, in e2 numeric) returns numeric from\n"
+"STD12_INIT, REGR_SXX_ACC, REGR_S___FIN\n";
+
+static const char *other150 =
+"create aggregate DB.DBA.REGR_SYY (in e1 numeric, in e2 numeric) returns numeric from\n"
+"STD12_INIT, REGR_SYY_ACC, REGR_S___FIN\n";
+
+static const char *other151 =
+"create aggregate DB.DBA.REGR_SXY (in e1 numeric, in e2 numeric) returns numeric from\n"
+"STD13_INIT, REGR_SXY_ACC, REGR_SXY_FIN\n";
+
+static const char *proc208 =
+"#line 699 \"[executable]/useraggr.sql\"\n"
+" create procedure xte_nodebld_final_root (in acc any) returns any\n"
+"{\n"
+"return xte_nodebld_xmlagg_final (acc, xte_head (UNAME\' root\'));\n"
+"}\n"
+"--src useraggr.sql:697\n";
+
+static const char *other152 =
+"create aggregate DB.DBA.XMLAGG (in _child any) returns any\n"
+"from xte_nodebld_init, xte_nodebld_xmlagg_acc, xte_nodebld_final_root\n";
+
+static const char *other153 =
+"create aggregate DB.DBA.VECTOR_AGG (in _child any) returns any\n"
+"from vectorbld_init, vectorbld_agg_acc, vectorbld_agg_final\n"
+"order\n";
+
+static const char *other154 =
+"create aggregate DB.DBA.VECTOR_OF_NONNULLS_AGG (in _child any) returns any\n"
+"from vectorbld_init, vector_of_nonnulls_bld_agg_acc, vectorbld_agg_final\n"
+"order\n";
+
+static const char *other155 =
+"create aggregate DB.DBA.VECTOR_OR_NULL_AGG (in _child any) returns any\n"
+"from vectorbld_init, vectorbld_agg_acc, vector_or_null_bld_agg_final\n"
+"order\n";
+
+static const char *other156 =
+"create aggregate DB.DBA.VECTOR_OF_NONNULLS_OR_NULL_AGG (in _child any) returns any\n"
+"from vectorbld_init, vector_of_nonnulls_bld_agg_acc, vector_or_null_bld_agg_final\n"
+"order\n";
+
+static const char *other157 =
+"create aggregate DB.DBA.VECTOR_CONCAT_AGG (in _child any) returns any\n"
+"from vectorbld_init, vectorbld_concat_agg_acc, vectorbld_agg_final\n"
+"order\n";
+
+static const char *other158 =
+"create aggregate DB.DBA.XQ_SEQUENCE_AGG (in _child any) returns any\n"
+"from xq_sequencebld_init, xq_sequencebld_agg_acc, xq_sequencebld_agg_final\n"
+"order\n";
+
+static const char *other159 =
+"create aggregate DB.DBA.BAG_AGG (in _child any) returns any\n"
+"from vectorbld_init, vectorbld_agg_acc, vectorbld_agg_final\n";
+
+static const char *other160 =
+"create aggregate DB.DBA.BAG_OF_NONNULLS_AGG (in _child any) returns any\n"
+"from vectorbld_init, vector_of_nonnulls_bld_agg_acc, vectorbld_agg_final\n";
+
+static const char *other161 =
+"create aggregate DB.DBA.BAG_OR_NULL_AGG (in _child any) returns any\n"
+"from vectorbld_init, vectorbld_agg_acc, vector_or_null_bld_agg_final\n";
+
+static const char *other162 =
+"create aggregate DB.DBA.BAG_OF_NONNULLS_OR_NULL_AGG (in _child any) returns any\n"
+"from vectorbld_init, vector_of_nonnulls_bld_agg_acc, vector_or_null_bld_agg_final\n";
+
+static const char *other163 =
+"create aggregate DB.DBA.BAG_CONCAT_AGG (in _child any) returns any\n"
+"from vectorbld_init, vectorbld_concat_agg_acc, vectorbld_agg_final\n";
+
+static const char *proc209 =
+"#line 762 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.GROUP_CONCAT_INIT (inout _env any)\n"
+"{\n"
+"_env := 0;\n"
+"}\n"
+"--src useraggr.sql:760\n";
+
+static const char *proc210 =
+"#line 769 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.GROUP_CONCAT_ACC (inout _env any, in token varchar, in delim varchar)\n"
+"{\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"if (__tag of varchar <> __tag (_env))\n"
+"_env := cast (token as varchar);\n"
+"else if (delim is not null)\n"
+"_env := concat (_env, cast (delim as varchar), cast (token as varchar));\n"
+"else\n"
+"_env := concat (_env, cast (token as varchar));\n"
+"}\n"
+"--src useraggr.sql:767\n";
+
+static const char *proc211 =
+"#line 786 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.GROUP_CONCAT_FIN (inout _env any)\n"
+"{\n"
+"\n"
+"\n"
+"\n"
+"if (__tag of varchar <> __tag (_env))\n"
+"return \'\';\n"
+"return _env;\n"
+"}\n"
+"--src useraggr.sql:784\n";
+
+static const char *other164 =
+"create aggregate DB.DBA.GROUP_CONCAT (in token varchar, in delim varchar) returns varchar\n"
+"from DB.DBA.GROUP_CONCAT_INIT, DB.DBA.GROUP_CONCAT_ACC, DB.DBA.GROUP_CONCAT_FIN\n"
+"order\n";
+
+static const char *proc212 =
+"#line 804 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.GROUP_DIGEST_INIT (inout _env any)\n"
+"{\n"
+"_env := 0;\n"
+"}\n"
+"--src useraggr.sql:802\n";
+
+static const char *proc213 =
+"#line 811 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.GROUP_DIGEST_ACC (inout _env any, in token varchar, in delim varchar, in maxlen integer, in mode integer)\n"
+"{\n"
+"declare curlen integer;\n"
+"declare env_vec, items any;\n"
+"if (__tag of varchar <> __tag (token))\n"
+"{\n"
+"token := cast (token as varchar);\n"
+"if (token is null)\n"
+"return;\n"
+"}\n"
+"if (__tag of varchar <> __tag (_env))\n"
+"{\n"
+"if (length (token) > maxlen)\n"
+"token := subseq (token, 0, maxlen+1);\n"
+"_env := serialize (vector_zap_args (vector_zap_args (token), cast (delim as varchar), maxlen));\n"
+"return;\n"
+"}\n"
+"curlen := length (_env);\n"
+"if (curlen >= maxlen)\n"
+"return;\n"
+"env_vec := deserialize (_env);\n"
+"items := aref_set_0 (env_vec, 0);\n"
+"if (bit_and (mode, 1))\n"
+"{\n"
+"if (0 < position (token, items))\n"
+"return;\n"
+"}\n"
+"if (length (token) > (env_vec[2] - curlen))\n"
+"token := subseq (token, 0, (env_vec[2] - curlen)+1);\n"
+"items := vector_concat (items, vector_zap_args (token));\n"
+"aset_zap_arg (env_vec, 0, items);\n"
+"_env := serialize (env_vec);\n"
+"}\n"
+"--src useraggr.sql:809\n";
+
+static const char *proc214 =
+"#line 847 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.GROUP_DIGEST_FIN (inout _env any)\n"
+"{\n"
+"declare envlen, curlen, maxlen, itemctr, itemcount, delim_len, rest_len integer;\n"
+"declare env_vec, items, ses any;\n"
+"declare delim varchar;\n"
+"if (__tag of varchar <> __tag (_env))\n"
+"return \'\';\n"
+"envlen := length (_env);\n"
+"env_vec := deserialize (_env);\n"
+"items := aref_set_0 (env_vec, 0);\n"
+"delim := aref_set_0 (env_vec, 1);\n"
+"rest_len := maxlen := aref_set_0 (env_vec, 2);\n"
+"ses := string_output ();\n"
+"itemctr := 0;\n"
+"itemcount := length (items);\n"
+"delim_len := length (delim);\n"
+"for (itemctr := 0; itemctr < itemcount; itemctr := itemctr + 1)\n"
+"{\n"
+"declare itm varchar;\n"
+"declare itm_len integer;\n"
+"if (delim_len > (rest_len-5))\n"
+"goto items_done;\n"
+"if (itemctr)\n"
+"{\n"
+"http (delim, ses);\n"
+"rest_len := rest_len - delim_len;\n"
+"}\n"
+"itm := items [itemctr];\n"
+"itm_len := length (itm);\n"
+"if ((itm_len > rest_len) or ((envlen > maxlen) and (itemctr = itemcount-1)))\n"
+"{\n"
+"itm := subseq (itm, 0, rest_len);\n"
+"itm_len := coalesce (__max_notnull (strrchr (itm, 32), strrchr (itm, 10), strrchr (itm, 13)), 0);\n"
+"while ((itm_len > 0) and (itm [itm_len-1] in (32, 10, 13)))\n"
+"itm_len := itm_len - 1;\n"
+"if (0 = itm_len)\n"
+"http (subseq (itm, 0, rest_len-3), ses);\n"
+"else\n"
+"http (subseq (itm, 0, itm_len), ses);\n"
+"http (\'...\', ses);\n"
+"goto items_done;\n"
+"}\n"
+"http (itm, ses);\n"
+"rest_len := rest_len - itm_len;\n"
+"}\n"
+"items_done:\n"
+"return string_output_string (ses);\n"
+"}\n"
+"--src useraggr.sql:845\n";
+
+static const char *other165 =
+"create aggregate DB.DBA.GROUP_DIGEST (in token varchar, in delim varchar, in maxlen integer, in mode integer) returns varchar\n"
+"from DB.DBA.GROUP_DIGEST_INIT, DB.DBA.GROUP_DIGEST_ACC, DB.DBA.GROUP_DIGEST_FIN\n"
+"order\n";
+
+static const char *proc215 =
+"#line 904 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.SAMPLE_INIT (inout _env any)\n"
+"{\n"
+"_env := null;\n"
+"}\n"
+"--src useraggr.sql:902\n";
+
+static const char *proc216 =
+"#line 911 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.SAMPLE_ACC (inout _env any, in sample any)\n"
+"{\n"
+"if (_env is not null)\n"
+"return;\n"
+"_env := sample;\n"
+"}\n"
+"--src useraggr.sql:909\n";
+
+static const char *proc217 =
+"#line 920 \"[executable]/useraggr.sql\"\n"
+" create procedure DB.DBA.SAMPLE_FIN (inout _env any)\n"
+"{\n"
+"return _env;\n"
+"}\n"
+"--src useraggr.sql:918\n";
+
+static const char *other166 =
+"create aggregate DB.DBA.SAMPLE (in sample any) returns any\n"
+"from DB.DBA.SAMPLE_INIT, DB.DBA.SAMPLE_ACC, DB.DBA.SAMPLE_FIN\n"
+"order\n";
+
+/* vt_text.sql */
+
+static const char *proc218 =
"#line 28 \"[executable]/vt_text.sql\"\n"
"create procedure DB.DBA.execstmt (in stmt varchar, out stat varchar, out msg varchar)\n"
"{\n"
@@ -7377,7 +8340,7 @@ static const char *proc169 =
"}\n"
"--src vt_text.sql:26\n";
-static const char *proc170 =
+static const char *proc219 =
"#line 40 \"[executable]/vt_text.sql\"\n"
"create procedure DB.DBA.vt_create_ftt (in tb varchar, in id varchar, in dbcol varchar, in is_intr integer)\n"
"{\n"
@@ -7766,7 +8729,7 @@ static const char *proc170 =
"}\n"
"--src vt_text.sql:38\n";
-static const char *proc171 =
+static const char *proc220 =
"#line 428 \"[executable]/vt_text.sql\"\n"
"create procedure DB.DBA.vt_drop_ftt (in tb varchar, in dbcol varchar)\n"
"{\n"
@@ -7817,11 +8780,11 @@ static const char *proc171 =
"}\n"
"--src vt_text.sql:426\n";
-static const char *other133 =
+static const char *other167 =
"grant execute on DB.DBA.vt_create_text_index to public\n";
/* phrasematch.sql */
-static const char *proc172 =
+static const char *proc221 =
"#line 24 \"[executable]/phrasematch.sql\"\n"
"create procedure AP_EXEC_NO_ERROR (in expr varchar)\n"
"{\n"
@@ -7958,7 +8921,7 @@ static const char *trig5 =
"}\n"
"--src phrasematch.sql:179\n";
-static const char *proc173 =
+static const char *proc222 =
"#line 187 \"[executable]/phrasematch.sql\"\n"
"create procedure DB.DBA.ANN_BOOT()\n"
"{\n"
@@ -7974,7 +8937,7 @@ static const char *proc173 =
"}\n"
"--src phrasematch.sql:185\n";
-static const char *proc174 =
+static const char *proc223 =
"#line 201 \"[executable]/phrasematch.sql\"\n"
"create function ANN_AUTHENTICATE (in id any, in what char (1), in access char, in auth_uname any, in auth_pwd varchar, inout auth_uid integer := null) returns integer\n"
"{\n"
@@ -8054,7 +9017,7 @@ static const char *proc174 =
"}\n"
"--src phrasematch.sql:199\n";
-static const char *proc175 =
+static const char *proc224 =
"#line 279 \"[executable]/phrasematch.sql\"\n"
"create function ANN_GETID (in what varchar )\n"
"{\n"
@@ -8090,7 +9053,7 @@ static const char *proc175 =
"}\n"
"--src phrasematch.sql:277\n";
-static const char *proc176 =
+static const char *proc225 =
"#line 314 \"[executable]/phrasematch.sql\"\n"
" create function ANN_PHRASE_CLASS_ADD (in _name varchar, in _owner_uid integer, in _reader_gid integer, in _callback varchar, in _app_env any, in mode varchar, in auth_uname varchar, in auth_pwd varchar) returns integer\n"
"{\n"
@@ -8113,7 +9076,7 @@ static const char *proc176 =
"}\n"
"--src phrasematch.sql:312\n";
-static const char *proc177 =
+static const char *proc226 =
"#line 335 \"[executable]/phrasematch.sql\"\n"
"create function ANN_PHRASE_CLASS_ADD_INT (in _id integer, in _name varchar, in _owner_uid integer, in _reader_gid integer, in _callback varchar, in _app_env any)\n"
"{\n"
@@ -8123,7 +9086,7 @@ static const char *proc177 =
"}\n"
"--src phrasematch.sql:333\n";
-static const char *proc178 =
+static const char *proc227 =
"#line 344 \"[executable]/phrasematch.sql\"\n"
" create function ANN_PHRASE_CLASS_DEL (in _name varchar, in auth_uname varchar, in auth_pwd varchar) returns integer\n"
"{\n"
@@ -8146,7 +9109,7 @@ static const char *proc178 =
"}\n"
"--src phrasematch.sql:342\n";
-static const char *proc179 =
+static const char *proc228 =
"#line 366 \"[executable]/phrasematch.sql\"\n"
" create function ANN_PHRASE_SET_ADD (in _name varchar, in _owner_uid integer, in _reader_gid integer, in _apc_name varchar, in _lang_name varchar, in _app_env any, in _size integer, in _load_at_boot integer, in mode varchar, in auth_uname varchar, in auth_pwd varchar) returns integer\n"
"{\n"
@@ -8176,7 +9139,7 @@ static const char *proc179 =
"}\n"
"--src phrasematch.sql:364\n";
-static const char *proc180 =
+static const char *proc229 =
"#line 394 \"[executable]/phrasematch.sql\"\n"
"create function ANN_PHRASE_SET_ADD_INT (in _id integer, in _name varchar, in _owner_uid integer, in _reader_gid integer, in _apc_id integer, in _lang_name varchar, in _app_env any, in _size integer, in _load_at_boot integer)\n"
"{\n"
@@ -8186,7 +9149,7 @@ static const char *proc180 =
"}\n"
"--src phrasematch.sql:392\n";
-static const char *proc181 =
+static const char *proc230 =
"#line 403 \"[executable]/phrasematch.sql\"\n"
" create function ANN_PHRASE_SET_DEL (in _name varchar, in auth_uname varchar, in auth_pwd varchar) returns integer\n"
"{\n"
@@ -8210,7 +9173,7 @@ static const char *proc181 =
"}\n"
"--src phrasematch.sql:401\n";
-static const char *proc182 =
+static const char *proc231 =
"#line 426 \"[executable]/phrasematch.sql\"\n"
" create function ANN_LINK_ADD (in _owner_uid integer, in _uri varchar, in _text varchar, in _note varchar, in _tags any, in _callback varchar, in _app_env any) returns integer\n"
"{\n"
@@ -8222,7 +9185,7 @@ static const char *proc182 =
"}\n"
"--src phrasematch.sql:424\n";
-static const char *proc183 =
+static const char *proc232 =
"#line 437 \"[executable]/phrasematch.sql\"\n"
" create function ANN_LINK_MODIFY (in _id integer, in _owner_uid integer, in _uri varchar, in _text varchar, in _note varchar, in _tags any, in _callback varchar, in _app_env any, in auth_uname varchar, in auth_pwd varchar) returns integer\n"
"{\n"
@@ -8238,7 +9201,7 @@ static const char *proc183 =
"}\n"
"--src phrasematch.sql:435\n";
-static const char *proc184 =
+static const char *proc233 =
"#line 452 \"[executable]/phrasematch.sql\"\n"
" create function ANN_LINK_DEL (in _id integer, in auth_uname varchar, in auth_pwd varchar) returns integer\n"
"{\n"
@@ -8262,7 +9225,7 @@ static const char *proc184 =
"}\n"
"--src phrasematch.sql:450\n";
-static const char *proc185 =
+static const char *proc234 =
"#line 475 \"[executable]/phrasematch.sql\"\n"
" create function ANN_AD_RULE_ADD (in aaa_name varchar, in aps_name varchar, in _text varchar, in _al_id integer, in _app_env any, in _lang_name varchar, in auth_uname varchar, in auth_pwd varchar) returns integer\n"
"{\n"
@@ -8312,7 +9275,7 @@ static const char *proc185 =
"}\n"
"--src phrasematch.sql:473\n";
-static const char *proc186 =
+static const char *proc235 =
"#line 524 \"[executable]/phrasematch.sql\"\n"
" create function ANN_AD_RULE_DEL (in aaa_name varchar, in aps_name varchar, in _text varchar, in _al_id integer, in _lang_name varchar, in auth_uname varchar, in auth_pwd varchar) returns integer\n"
"{\n"
@@ -8395,7 +9358,7 @@ static const char *proc186 =
"}\n"
"--src phrasematch.sql:522\n";
-static const char *proc187 =
+static const char *proc236 =
"#line 605 \"[executable]/phrasematch.sql\"\n"
"create procedure DB.DBA.ANN_ZAP ()\n"
"{\n"
@@ -8424,11 +9387,11 @@ static const char *proc187 =
"}\n"
"--src phrasematch.sql:603\n";
-static const char *other134 =
+static const char *other168 =
"AP_EXEC_NO_ERROR (\'DB.DBA.ANN_BOOT()\')\n";
/* hosting.sql */
-static const char *proc188 =
+static const char *proc237 =
"#line 23 \"[executable]/hosting.sql\"\n"
"create procedure WS.WS.GET_CGI_VARS_VECTOR (inout lines any) returns ANY\n"
"{\n"
@@ -8870,16 +9833,102 @@ sqls_define (void)
DEFINE_PROC ("sql_tables_pre_excel_drv", proc167);
DEFINE_PROC ("sql_normalize_qon_viaserv_opl", proc168);
+ /* useraggr.sql */
+
+ DEFINE_PUBLIC_PROC ("STD_COUNT", proc169);
+ DEFINE_PUBLIC_PROC ("STD11_INIT", proc170);
+ DEFINE_PUBLIC_PROC ("STD12_INIT", proc171);
+ DEFINE_PUBLIC_PROC ("STD13_INIT", proc172);
+ DEFINE_PUBLIC_PROC ("VAR_ACC", proc173);
+ DEFINE_PUBLIC_PROC ("VAR_POP_FIN", proc174);
+ DEFINE_PUBLIC_PROC ("VAR_SAMP_FIN", proc175);
+ DEFINE_PUBLIC_PROC ("VAR_FIN", proc176);
+ DEFINE_PUBLIC_PROC ("STDDEV_POP_FIN", proc177);
+ DEFINE_PUBLIC_PROC ("STDDEV_SAMP_FIN", proc178);
+ DEFINE_PUBLIC_PROC ("STDDEV_FIN", proc179);
+ DEFINE_PUBLIC_PROC ("COVAR_ACC", proc180);
+ DEFINE_PUBLIC_PROC ("COVAR_SAMP_FIN", proc181);
+ DEFINE_PUBLIC_PROC ("COVAR_POP_FIN", proc182);
+ DEFINE_PUBLIC_PROC ("COVAR_FIN", proc183);
+ ddl_ensure_table ("do this always", other133);
+ ddl_ensure_table ("do this always", other134);
+ ddl_ensure_table ("do this always", other135);
+ ddl_ensure_table ("do this always", other136);
+ ddl_ensure_table ("do this always", other137);
+ ddl_ensure_table ("do this always", other138);
+ ddl_ensure_table ("do this always", other139);
+ ddl_ensure_table ("do this always", other140);
+ ddl_ensure_table ("do this always", other141);
+ DEFINE_PUBLIC_PROC ("REGR_SLOPE_INIT", proc184);
+ DEFINE_PUBLIC_PROC ("REGR_SLOPE_ACC", proc185);
+ DEFINE_PUBLIC_PROC ("REGR_SLOPE_FIN", proc186);
+ ddl_ensure_table ("do this always", other142);
+ DEFINE_PUBLIC_PROC ("REGR_INTERCEPT_INIT", proc187);
+ DEFINE_PUBLIC_PROC ("REGR_INTERCEPT_ACC", proc188);
+ DEFINE_PUBLIC_PROC ("REGR_INTERCEPT_FIN", proc189);
+ ddl_ensure_table ("do this always", other143);
+ DEFINE_PUBLIC_PROC ("REGR_COUNT_INIT", proc190);
+ DEFINE_PUBLIC_PROC ("REGR_COUNT_ACC", proc191);
+ DEFINE_PUBLIC_PROC ("REGR_COUNT_FIN", proc192);
+ DEFINE_PUBLIC_PROC ("REGR_COUNT_MERGE", proc193);
+ ddl_ensure_table ("do this always", other144);
+ DEFINE_PUBLIC_PROC ("REGR_AVG_ACC", proc194);
+ DEFINE_PUBLIC_PROC ("REGR_AVGX_FIN", proc195);
+ DEFINE_PUBLIC_PROC ("REGR_AVGY_FIN", proc196);
+ ddl_ensure_table ("do this always", other145);
+ ddl_ensure_table ("do this always", other146);
+ DEFINE_PUBLIC_PROC ("CORR_INIT", proc197);
+ DEFINE_PUBLIC_PROC ("CORR_ACC", proc198);
+ DEFINE_PUBLIC_PROC ("CORR_FIN", proc199);
+ ddl_ensure_table ("do this always", other147);
+ DEFINE_PUBLIC_PROC ("REGR_R2_INIT", proc200);
+ DEFINE_PUBLIC_PROC ("REGR_R2_ACC", proc201);
+ DEFINE_PUBLIC_PROC ("REGR_R2_FIN", proc202);
+ ddl_ensure_table ("do this always", other148);
+ DEFINE_PUBLIC_PROC ("REGR_SXX_ACC", proc203);
+ DEFINE_PUBLIC_PROC ("REGR_SYY_ACC", proc204);
+ DEFINE_PUBLIC_PROC ("REGR_SXY_ACC", proc205);
+ DEFINE_PUBLIC_PROC ("REGR_S___FIN", proc206);
+ DEFINE_PUBLIC_PROC ("REGR_SXY_FIN", proc207);
+ ddl_ensure_table ("do this always", other149);
+ ddl_ensure_table ("do this always", other150);
+ ddl_ensure_table ("do this always", other151);
+ DEFINE_PUBLIC_PROC ("xte_nodebld_final_root", proc208);
+ ddl_ensure_table ("do this always", other152);
+ ddl_ensure_table ("do this always", other153);
+ ddl_ensure_table ("do this always", other154);
+ ddl_ensure_table ("do this always", other155);
+ ddl_ensure_table ("do this always", other156);
+ ddl_ensure_table ("do this always", other157);
+ ddl_ensure_table ("do this always", other158);
+ ddl_ensure_table ("do this always", other159);
+ ddl_ensure_table ("do this always", other160);
+ ddl_ensure_table ("do this always", other161);
+ ddl_ensure_table ("do this always", other162);
+ ddl_ensure_table ("do this always", other163);
+ DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_CONCAT_INIT", proc209);
+ DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_CONCAT_ACC", proc210);
+ DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_CONCAT_FIN", proc211);
+ ddl_ensure_table ("do this always", other164);
+ DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_DIGEST_INIT", proc212);
+ DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_DIGEST_ACC", proc213);
+ DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_DIGEST_FIN", proc214);
+ ddl_ensure_table ("do this always", other165);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SAMPLE_INIT", proc215);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SAMPLE_ACC", proc216);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SAMPLE_FIN", proc217);
+ ddl_ensure_table ("do this always", other166);
+
/* vt_text.sql */
- DEFINE_PROC ("DB.DBA.execstmt", proc169);
- DEFINE_PROC ("DB.DBA.vt_create_ftt", proc170);
- DEFINE_PROC ("DB.DBA.vt_drop_ftt", proc171);
- ddl_ensure_table ("do this always", other133);
+ DEFINE_PROC ("DB.DBA.execstmt", proc218);
+ DEFINE_PROC ("DB.DBA.vt_create_ftt", proc219);
+ DEFINE_PROC ("DB.DBA.vt_drop_ftt", proc220);
+ ddl_ensure_table ("do this always", other167);
/* phrasematch.sql */
- DEFINE_PROC ("AP_EXEC_NO_ERROR", proc172);
+ DEFINE_PROC ("AP_EXEC_NO_ERROR", proc221);
ddl_ensure_table ("DB.DBA.SYS_ANN_PHRASE_CLASS", tbl7);
ddl_ensure_table ("DB.DBA.SYS_ANN_PHRASE_SET", tbl8);
ddl_ensure_table ("DB.DBA.SYS_ANN_PHRASE", tbl9);
@@ -8892,26 +9941,26 @@ sqls_define (void)
ddl_std_proc (trig3, 0x0);
ddl_std_proc (trig4, 0x0);
ddl_std_proc (trig5, 0x0);
- DEFINE_PROC ("DB.DBA.ANN_BOOT", proc173);
- DEFINE_PROC ("ANN_AUTHENTICATE", proc174);
- DEFINE_PROC ("ANN_GETID", proc175);
- DEFINE_PUBLIC_PROC ("ANN_PHRASE_CLASS_ADD", proc176);
- DEFINE_PROC ("ANN_PHRASE_CLASS_ADD_INT", proc177);
- DEFINE_PUBLIC_PROC ("ANN_PHRASE_CLASS_DEL", proc178);
- DEFINE_PUBLIC_PROC ("ANN_PHRASE_SET_ADD", proc179);
- DEFINE_PROC ("ANN_PHRASE_SET_ADD_INT", proc180);
- DEFINE_PUBLIC_PROC ("ANN_PHRASE_SET_DEL", proc181);
- DEFINE_PUBLIC_PROC ("ANN_LINK_ADD", proc182);
- DEFINE_PUBLIC_PROC ("ANN_LINK_MODIFY", proc183);
- DEFINE_PUBLIC_PROC ("ANN_LINK_DEL", proc184);
- DEFINE_PUBLIC_PROC ("ANN_AD_RULE_ADD", proc185);
- DEFINE_PUBLIC_PROC ("ANN_AD_RULE_DEL", proc186);
- DEFINE_PROC ("DB.DBA.ANN_ZAP", proc187);
- ddl_ensure_table ("do this always", other134);
+ DEFINE_PROC ("DB.DBA.ANN_BOOT", proc222);
+ DEFINE_PROC ("ANN_AUTHENTICATE", proc223);
+ DEFINE_PROC ("ANN_GETID", proc224);
+ DEFINE_PUBLIC_PROC ("ANN_PHRASE_CLASS_ADD", proc225);
+ DEFINE_PROC ("ANN_PHRASE_CLASS_ADD_INT", proc226);
+ DEFINE_PUBLIC_PROC ("ANN_PHRASE_CLASS_DEL", proc227);
+ DEFINE_PUBLIC_PROC ("ANN_PHRASE_SET_ADD", proc228);
+ DEFINE_PROC ("ANN_PHRASE_SET_ADD_INT", proc229);
+ DEFINE_PUBLIC_PROC ("ANN_PHRASE_SET_DEL", proc230);
+ DEFINE_PUBLIC_PROC ("ANN_LINK_ADD", proc231);
+ DEFINE_PUBLIC_PROC ("ANN_LINK_MODIFY", proc232);
+ DEFINE_PUBLIC_PROC ("ANN_LINK_DEL", proc233);
+ DEFINE_PUBLIC_PROC ("ANN_AD_RULE_ADD", proc234);
+ DEFINE_PUBLIC_PROC ("ANN_AD_RULE_DEL", proc235);
+ DEFINE_PROC ("DB.DBA.ANN_ZAP", proc236);
+ ddl_ensure_table ("do this always", other168);
/* hosting.sql */
- DEFINE_PROC ("WS.WS.GET_CGI_VARS_VECTOR", proc188);
+ DEFINE_PROC ("WS.WS.GET_CGI_VARS_VECTOR", proc237);
}
diff --git a/libsrc/Wi/sql_code_adm.c b/libsrc/Wi/sql_code_adm.c
index 76bc373..025cf0f 100644
--- a/libsrc/Wi/sql_code_adm.c
+++ b/libsrc/Wi/sql_code_adm.c
@@ -4237,7 +4237,7 @@ static const char *proc105 =
"http(\'<TR><TD CLASS=\"CopyrightBorder\" COLSPAN=\"2\"><IMG SRC=\"/admin/images/1x1.gif\" WIDTH=\"1\" HEIGHT=\"2\" ALT=\"\"></TD></TR>\');\n"
"http(\'<TR><TD ALIGN=\"right\" COLSPAN=\"2\"><P CLASS=\"Copyright\">Virtuoso Universal Server \');\n"
"http(sys_stat(\'st_dbms_ver\'));\n"
-"http(\' - Copyright© 1998-2012 OpenLink Software.</P></TD></TR>\');\n"
+"http(\' - Copyright© 1998-2011 OpenLink Software.</P></TD></TR>\');\n"
"http(\'</TABLE>\\n</BODY>\');\n"
"}\n"
"--src admin.sql:4275\n";
diff --git a/libsrc/Wi/sql_code_blog.c b/libsrc/Wi/sql_code_blog.c
index 3eaf7ea..45c0677 100644
--- a/libsrc/Wi/sql_code_blog.c
+++ b/libsrc/Wi/sql_code_blog.c
@@ -1,10 +1,10 @@
/*
- * $Id: sql_code_blog.c,v 1.1.1.1.2.2 2012/03/08 12:55:36 source Exp $
+ * $Id: sql_code_blog.c,v 1.1.1.1.2.1 2009/04/18 21:55:15 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sql_code_cache_impl.c b/libsrc/Wi/sql_code_cache_impl.c
index 173b0ff..5f271a8 100644
--- a/libsrc/Wi/sql_code_cache_impl.c
+++ b/libsrc/Wi/sql_code_cache_impl.c
@@ -1,10 +1,10 @@
/*
- * $Id: sql_code_cache_impl.c,v 1.3.2.2 2012/03/08 12:55:36 source Exp $
+ * $Id: sql_code_cache_impl.c,v 1.3.2.1 2009/04/18 21:55:15 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/sql_code_dav.c b/libsrc/Wi/sql_code_dav.c
index f3a5597..5608fe5 100644
--- a/libsrc/Wi/sql_code_dav.c
+++ b/libsrc/Wi/sql_code_dav.c
@@ -10,59 +10,6 @@ static const char *proc0 =
"#line 26 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.\"OPTIONS\" (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"declare full_path varchar;\n"
-"declare path_id any;\n"
-"full_path := \'/\' || DAV_CONCAT_PATH (path, \'/\');\n"
-"path_id := DAV_SEARCH_ID (full_path, \'C\');\n"
-"if (isarray(path_id) = 1)\n"
-"{\n"
-"if (path_id[0] = UNAME\'CalDAV\')\n"
-"{\n"
-"http_header (concat (\n"
-"\'Content-Type: text/xml\\r\\n\',\n"
-"\'Allow: OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE\\r\\n\',\n"
-"\'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\\r\\n\',\n"
-"\'DAV: 1, 2, access-control, calendar-access\\r\\n\',\n"
-"\'MS-Author-Via: DAV\\r\\n\'));\n"
-"return;\n"
-"}\n"
-"if (path_id[0] = UNAME\'CardDAV\')\n"
-"{\n"
-"http_header (concat (\n"
-"\'Content-Type: text/xml\\r\\n\',\n"
-"\'Allow: OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE\\r\\n\',\n"
-"\'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\\r\\n\',\n"
-"\'DAV: 1, 2, 3, access-control, addressbook\\r\\n\',\n"
-"\'MS-Author-Via: DAV\\r\\n\'));\n"
-"return;\n"
-"}\n"
-"}\n"
-"else\n"
-"{\n"
-"declare is_det int;\n"
-"is_det := (select COL_ID from WS.WS.SYS_DAV_COL where COL_ID = path_id and COL_DET = \'CalDAV\');\n"
-"if (is_det > 0)\n"
-"{\n"
-"http_header (concat (\n"
-"\'Content-Type: text/xml\\r\\n\',\n"
-"\'Allow: OPTIONS, GET, HEAD, POST, TRACE\\r\\n\',\n"
-"\'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\\r\\n\',\n"
-"\'DAV: 1, 2, access-control, calendar-access\\r\\n\',\n"
-"\'MS-Author-Via: DAV\\r\\n\'));\n"
-"return;\n"
-"}\n"
-"is_det := (select COL_ID from WS.WS.SYS_DAV_COL where COL_ID = path_id and COL_DET = \'CardDAV\');\n"
-"if (is_det > 0)\n"
-"{\n"
-"http_header (concat (\n"
-"\'Content-Type: text/xml\\r\\n\',\n"
-"\'Allow: OPTIONS, GET, HEAD, POST, TRACE\\r\\n\',\n"
-"\'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\\r\\n\',\n"
-"\'DAV: 1, 2, 3, access-control, addressbook\\r\\n\',\n"
-"\'MS-Author-Via: DAV\\r\\n\'));\n"
-"return;\n"
-"}\n"
-"}\n"
"declare headers, ctype, msauthor any;\n"
"http_methods_set (\'OPTIONS\', \'GET\', \'HEAD\', \'POST\', \'PUT\', \'DELETE\', \'TRACE\', \'PROPFIND\', \'PROPPATCH\', \'COPY\', \'MOVE\', \'LOCK\', \'UNLOCK\');\n"
"WS.WS.GET (path, params, lines);\n"
@@ -78,7 +25,7 @@ static const char *proc0 =
"--src dav.sql:24\n";
static const char *proc1 =
-"#line 95 \"[executable]/dav.sql\"\n"
+"#line 42 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PROPFIND (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"declare _mod_time datetime;\n"
@@ -91,13 +38,16 @@ static const char *proc1 =
"declare id any;\n"
"declare _u_id, _g_id, rc integer;\n"
"\n"
-"\n"
"_ses := aref_set_0 (params, 1);\n"
"_body := string_output_string (_ses);\n"
+"\n"
"_lpath := http_path ();\n"
"_ppath := http_physical_path ();\n"
"if (_lpath = \'\')\n"
"_lpath := \'/\';\n"
+"\n"
+"\n"
+"\n"
"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
"if (id is not null)\n"
"st := \'C\';\n"
@@ -122,6 +72,7 @@ static const char *proc1 =
"{\n"
"rc := DAV_AUTHENTICATE_HTTP (DAV_GET_PARENT (id, st, _ppath), \'C\', \'1__\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
"}\n"
+"\n"
"if (rc < 0)\n"
"{\n"
"if ((rc = -12) or (rc = -13))\n"
@@ -167,17 +118,6 @@ static const char *proc1 =
"\n"
"\n"
"http_request_status (\'HTTP/1.1 207 Multi-Status\');\n"
-"declare full_path varchar;\n"
-"declare path_id any;\n"
-"full_path := \'/\' || DAV_CONCAT_PATH (path, \'/\');\n"
-"path_id := DAV_SEARCH_ID (full_path, \'C\');\n"
-"if (isarray(path_id) = 1)\n"
-"{\n"
-"if (path_id[0] = UNAME\'CalDAV\')\n"
-"http_header (\'DAV: 1, calendar-access, calendar-schedule, calendar-proxy\\r\\nContent-type: application/xml; charset=\"utf-8\"\\r\\n\');\n"
-"if (path_id[0] = UNAME\'CardDAV\')\n"
-"http_header (\'DAV: 1, addressbook\\r\\nContent-type: application/xml; charset=\"utf-8\"\\r\\n\');\n"
-"}\n"
"http_header (\'Content-type: text/xml; charset=\"utf-8\"\\r\\n\');\n"
"http (\'<?xml version=\"1.0\" encoding=\"utf-8\"?>\\n\');\n"
"http (\'<D:multistatus xmlns:D=\"DAV:\" xmlns:M=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\\n\');\n"
@@ -192,10 +132,10 @@ static const char *proc1 =
"}\n"
"http (\'</D:multistatus>\\n\');\n"
"}\n"
-"--src dav.sql:93\n";
+"--src dav.sql:40\n";
static const char *proc2 =
-"#line 213 \"[executable]/dav.sql\"\n"
+"#line 153 \"[executable]/dav.sql\"\n"
"create function WS.WS.PROPFIND_RESPONSE (in lpath varchar,\n"
"in ppath varchar,\n"
"in depth integer,\n"
@@ -304,10 +244,10 @@ static const char *proc2 =
"}\n"
"return 0;\n"
"}\n"
-"--src dav.sql:211\n";
+"--src dav.sql:151\n";
static const char *proc3 =
-"#line 324 \"[executable]/dav.sql\"\n"
+"#line 264 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PROPFIND_RESPONSE_FORMAT (in lpath varchar,\n"
"in dirlist any,\n"
"in append_name_to_href integer,\n"
@@ -371,10 +311,11 @@ static const char *proc3 =
"crt := now ();\n"
"if (__tag (modt) <> 211)\n"
"modt := now ();\n"
+"\n"
"href := case append_name_to_href when 0 then lpath else DAV_CONCAT_PATH (lpath, name) end;\n"
-"if (st = \'C\' and href not like \'%/\' and href not like \'%.ics\' and href not like \'%.vcf\')\n"
+"if (st = \'C\' and href not like \'%/\')\n"
"href := href || \'/\';\n"
-"http (\'<D:response xmlns:D=\"DAV:\" xmlns:lp0=\"DAV:\" xmlns:i0=\"DAV:\" xmlns:V=\"http://www.openlinksw.com/virtuoso/webdav/1.0/\">\\n\');\n"
+"http (\'<D:response xmlns:lp0=\"DAV:\" xmlns:i0=\"DAV:\" xmlns:V=\"http://www.openlinksw.com/virtuoso/webdav/1.0/\">\\n\');\n"
"http (\'<D:href>\');\n"
"http_dav_url (\n"
"charset_recode (\n"
@@ -411,7 +352,7 @@ static const char *proc3 =
"}\n"
"else if (prop = \':getcontenttype\')\n"
"{\n"
-"http (concat(\'<lp0:getcontenttype>\', mime_type, \'</lp0:getcontenttype>\\n\'));\n"
+"http (concat(\'<D:getcontenttype>\', mime_type, \'</D:getcontenttype>\\n\'));\n"
"found_sprop := 1;\n"
"}\n"
"else if (prop = \':getcontentlength\' and st = \'R\')\n"
@@ -419,131 +360,10 @@ static const char *proc3 =
"http (concat (\'<lp0:getcontentlength>\', cast (res_len as varchar), \'</lp0:getcontentlength>\\n\'));\n"
"found_sprop := 1;\n"
"}\n"
-"else if (prop = \'urn:ietf:params:xml:ns:caldav:supported-calendar-component-set\')\n"
-"{\n"
-"http (\'<C:supported-calendar-component-set xmlns:C=\"urn:ietf:params:xml:ns:caldav\"><C:comp name=\"VEVENT\"/><C:comp name=\"VTODO\"/></C:supported-calendar-component-set>\\r\\n\');\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \'urn:ietf:params:xml:ns:carddav:supported-address-data\')\n"
-"{\n"
-"http (\'<A:supported-address-data xmlns:A=\"urn:ietf:params:xml:ns:carddav\"><C:address-data-type content-type=\"text/vcard\" version=\"3.0\"/></A:supported-address-data>\\r\\n\');\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \':getetag\' and st = \'C\')\n"
-"{\n"
-"http (concat(\'<lp0:getetag>\"\', WS.WS.ETAG (name, parent_col), \'\"</lp0:getetag>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \'http://calendarserver.org/ns/:getctag\')\n"
-"{\n"
-"http (concat(\'<CS:getctag xmlns:CS=\"http://calendarserver.org/ns/\">\', WS.WS.ETAG (name, parent_col), \'</CS:getctag>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \'urn:ietf:params:xml:ns:caldav:calendar-data\')\n"
-"{\n"
-"declare content, type_ any;\n"
-"DB.DBA.DAV_RES_CONTENT_INT (DAV_SEARCH_ID (lpath, \'R\'), content, type_, 0, 0);\n"
-"http (concat(\'<C:calendar-data xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\', content, \'</C:calendar-data>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \'urn:ietf:params:xml:ns:carddav:address-data\')\n"
-"{\n"
-"declare content, type_ any;\n"
-"DB.DBA.DAV_RES_CONTENT_INT (DAV_SEARCH_ID (lpath, \'R\'), content, type_, 0, 0);\n"
-"http (concat(\'<A:address-data xmlns:A=\"urn:ietf:params:xml:ns:carddav\">\', content, \'</A:address-data>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \'urn:ietf:params:xml:ns:caldav:calendar-home-set\')\n"
-"{\n"
-"http (concat(\'<C:calendar-home-set xmlns:C=\"urn:ietf:params:xml:ns:caldav\"><D:href>\', lpath, \'</D:href></C:calendar-home-set>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \'urn:ietf:params:xml:ns:carddav:addressbook-home-set\')\n"
-"{\n"
-"http (concat(\'<C:addressbook-home-set xmlns:C=\"urn:ietf:params:xml:ns:carddav\"><D:href>\', lpath, \'</D:href></C:addressbook-home-set>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \':principal-URL\')\n"
-"{\n"
-"http (concat(\'<D:principal-URL><D:href>\', lpath, \'</D:href></D:principal-URL>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (prop = \':current-user-privilege-set\')\n"
-"{\n"
-"if (mime_type = \'text/vcard\' or mime_type = \'text/calendar\')\n"
-"{\n"
-"http (\'<D:current-user-privilege-set><D:privilege><D:all/></D:privilege></D:current-user-privilege-set>\');\n"
-"found_sprop := 1;\n"
-"}\n"
-"}\n"
-"else if (prop = \':supported-report-set\')\n"
-"{\n"
-"if (mime_type = \'text/vcard\')\n"
-"{\n"
-"http (concat(\'<D:supported-report-set>\', \'<D:supported-report>\n"
-"<D:report>\n"
-"<C:addressbook-query xmlns:C=\"urn:ietf:params:xml:ns:carddav\"/>\n"
-"</D:report>\n"
-"</D:supported-report>\n"
-"<D:supported-report>\n"
-"<D:report>\n"
-"<C:addressbook-multiget xmlns:C=\"urn:ietf:params:xml:ns:carddav\"/>\n"
-"</D:report>\n"
-"</D:supported-report>\n"
-"<D:supported-report>\n"
-"<D:report>\n"
-"<D:expand-property />\n"
-"</D:report>\n"
-"</D:supported-report>\n"
-"<D:supported-report>\n"
-"<D:report>\n"
-"<D:principal-property-search />\n"
-"</D:report>\n"
-"</D:supported-report>\n"
-"<D:supported-report>\n"
-"<D:report>\n"
-"<D:principal-search-property-set />\n"
-"</D:report>\n"
-"</D:supported-report>\', \'</D:supported-report-set>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"else if (mime_type = \'text/calendar\')\n"
-"{\n"
-"http (concat(\'<D:supported-report-set>\', \'<D:supported-report>\n"
-"<D:report>\n"
-"<C:calendar-multiget xmlns:C=\"urn:ietf:params:xml:ns:caldav\"/>\n"
-"</D:report>\n"
-"</D:supported-report>\n"
-"<D:supported-report>\n"
-"<D:report>\n"
-"<C:calendar-query xmlns:C=\"urn:ietf:params:xml:ns:caldav\"/>\n"
-"</D:report>\n"
-"</D:supported-report>\n"
-"<D:supported-report>\n"
-"<D:report>\n"
-"<D:principal-match/>\n"
-"</D:report>\n"
-"</D:supported-report>\n"
-"<D:supported-report>\n"
-"<D:report>\n"
-"<C:free-busy-query xmlns:C=\"urn:ietf:params:xml:ns:caldav\"/>\n"
-"</D:report>\n"
-"</D:supported-report>\', \'</D:supported-report-set>\\n\'));\n"
-"found_sprop := 1;\n"
-"}\n"
-"found_sprop := 1;\n"
-"}\n"
"else if (prop = \':resourcetype\')\n"
"{\n"
"if (st = \'C\')\n"
-"{\n"
-"if (mime_type = \'text/vcard\')\n"
-"http (\'<D:resourcetype><D:collection/><C:addressbook xmlns:C=\"urn:ietf:params:xml:ns:carddav\" /></D:resourcetype>\\n\');\n"
-"else if (mime_type = \'text/calendar\')\n"
-"http (\'<D:resourcetype><D:collection/><C:calendar xmlns:C=\"urn:ietf:params:xml:ns:caldav\" /></D:resourcetype>\\n\');\n"
-"else\n"
"http (\'<D:resourcetype><D:collection/></D:resourcetype>\\n\');\n"
-"}\n"
"else\n"
"http (\'<D:resourcetype/>\\n\');\n"
"found_sprop := 1;\n"
@@ -731,10 +551,10 @@ static const char *proc3 =
"goto next_response;\n"
"\n"
"}\n"
-"--src dav.sql:322\n";
+"--src dav.sql:262\n";
static const char *proc4 =
-"#line 749 \"[executable]/dav.sql\"\n"
+"#line 569 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PROPNAMES (in _body varchar)\n"
"{\n"
"declare prop, propname, allprop, tree, tmp, ret any;\n"
@@ -782,316 +602,10 @@ static const char *proc4 =
"\n"
"return ret;\n"
"}\n"
-"--src dav.sql:747\n";
+"--src dav.sql:567\n";
static const char *proc5 =
-"#line 798 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.CALENDAR_NAMES (in _body varchar)\n"
-"{\n"
-"declare prop, propname, allprop, tree, tmp, ret any;\n"
-"declare ix, len, sc integer;\n"
-"declare name varchar;\n"
-"if (not isstring(_body) or _body = \'\')\n"
-"return null;\n"
-"prop := string_output ();\n"
-"propname := string_output ();\n"
-"allprop := string_output ();\n"
-"tree := xml_tree_doc (xml_expand_refs (xml_tree (_body)));\n"
-"http_value (xpath_eval (\'//calendar-multiget/prop\', tree , 1), null, prop);\n"
-"http_value (xpath_eval (\'//calendar-multiget/propname\', tree , 1), null, propname);\n"
-"http_value (xpath_eval (\'//calendar-multiget/allprop\', tree , 1), null, allprop);\n"
-"prop := string_output_string (prop);\n"
-"propname := string_output_string (propname);\n"
-"allprop := string_output_string (allprop);\n"
-"ret := null;\n"
-"if (allprop <> \'\')\n"
-"return vector (\'allprop\');\n"
-"else if (propname <> \'\')\n"
-"return vector (\'propname\');\n"
-"else if (prop <> \'\')\n"
-"{\n"
-"declare xp any;\n"
-"tree := xtree_doc (prop);\n"
-"xp := xpath_eval(\'/prop/*\', tree, 0);\n"
-"foreach (any elm in xp) do\n"
-"{\n"
-"name := cast (xpath_eval (\'name()\', elm) as varchar);\n"
-"sc := strrchr (name, \':\');\n"
-"if (sc is not null and (name like \'DAV::%\'\n"
-"or name like \'http://www.openlinksw.com/virtuoso/webdav/1.0/:%\'))\n"
-"name := subseq (name, sc, length (name));\n"
-"if (ret is null)\n"
-"ret := vector (name);\n"
-"else\n"
-"ret := vector_concat (ret, vector (name));\n"
-"}\n"
-"}\n"
-"return ret;\n"
-"}\n"
-"--src dav.sql:796\n";
-
-static const char *proc6 =
-"#line 842 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.ADDRESSBOOK_NAMES (in _body varchar)\n"
-"{\n"
-"declare prop, propname, allprop, tree, tmp, ret any;\n"
-"declare ix, len, sc integer;\n"
-"declare name varchar;\n"
-"if (not isstring(_body) or _body = \'\')\n"
-"return null;\n"
-"prop := string_output ();\n"
-"propname := string_output ();\n"
-"allprop := string_output ();\n"
-"tree := xml_tree_doc (xml_expand_refs (xml_tree (_body)));\n"
-"http_value (xpath_eval (\'//addressbook-multiget/prop\', tree , 1), null, prop);\n"
-"http_value (xpath_eval (\'//addressbook-multiget/propname\', tree , 1), null, propname);\n"
-"http_value (xpath_eval (\'//addressbook-multiget/allprop\', tree , 1), null, allprop);\n"
-"prop := string_output_string (prop);\n"
-"propname := string_output_string (propname);\n"
-"allprop := string_output_string (allprop);\n"
-"ret := null;\n"
-"if (allprop <> \'\')\n"
-"return vector (\'allprop\');\n"
-"else if (propname <> \'\')\n"
-"return vector (\'propname\');\n"
-"else if (prop <> \'\')\n"
-"{\n"
-"declare xp any;\n"
-"tree := xtree_doc (prop);\n"
-"xp := xpath_eval(\'/prop/*\', tree, 0);\n"
-"foreach (any elm in xp) do\n"
-"{\n"
-"name := cast (xpath_eval (\'name()\', elm) as varchar);\n"
-"sc := strrchr (name, \':\');\n"
-"if (sc is not null and (name like \'DAV::%\'\n"
-"or name like \'http://www.openlinksw.com/virtuoso/webdav/1.0/:%\'))\n"
-"name := subseq (name, sc, length (name));\n"
-"if (ret is null)\n"
-"ret := vector (name);\n"
-"else\n"
-"ret := vector_concat (ret, vector (name));\n"
-"}\n"
-"}\n"
-"return ret;\n"
-"}\n"
-"--src dav.sql:840\n";
-
-static const char *proc7 =
-"#line 887 \"[executable]/dav.sql\"\n"
-"create procedure WS.WS.REPORT (in path varchar, inout params varchar, in lines varchar)\n"
-"{\n"
-"declare _mod_time datetime;\n"
-"declare _cr_time datetime;\n"
-"declare _depth integer;\n"
-"declare st, _temp varchar;\n"
-"declare _ms_date integer;\n"
-"declare _lpath, _body, _ses, _props, _ppath, _perms varchar;\n"
-"declare uname, upwd varchar;\n"
-"declare id any;\n"
-"declare _u_id, _g_id, rc, is_calendar, is_addressbook integer;\n"
-"_ses := aref_set_0 (params, 1);\n"
-"_body := string_output_string (_ses);\n"
-"_lpath := http_path ();\n"
-"_ppath := http_physical_path ();\n"
-"is_calendar := 0;\n"
-"is_addressbook := 0;\n"
-"if (_lpath = \'\')\n"
-"_lpath := \'/\';\n"
-"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
-"if (id is not null)\n"
-"{\n"
-"if (isarray(id) = 1)\n"
-"{\n"
-"if (id[0] = UNAME\'CalDAV\')\n"
-"is_calendar := 1;\n"
-"if (id[0] = UNAME\'CardDAV\')\n"
-"is_addressbook := 1;\n"
-"}\n"
-"st := \'C\';\n"
-"}\n"
-"else\n"
-"{\n"
-"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'R\'));\n"
-"if (id is not null)\n"
-"st := \'R\';\n"
-"else\n"
-"{\n"
-"http_request_status (\'HTTP/1.1 404 Not Found\');\n"
-"return;\n"
-"}\n"
-"}\n"
-"_u_id := null;\n"
-"_g_id := null;\n"
-"if (st = \'C\')\n"
-"rc := DAV_AUTHENTICATE_HTTP (id, st, \'1__\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
-"else\n"
-"rc := DAV_AUTHENTICATE_HTTP (DAV_GET_PARENT (id, st, _ppath), \'C\', \'1__\', 1, lines, uname, upwd, _u_id, _g_id, _perms);\n"
-"if (rc < 0)\n"
-"{\n"
-"if ((rc = -12) or (rc = -13))\n"
-"{\n"
-"http_request_status (\'HTTP/1.1 403 Forbidden\');\n"
-"return;\n"
-"}\n"
-"return;\n"
-"}\n"
-"if (strstr (WS.WS.FINDPARAM (lines, \'User-Agent:\'), \'Microsoft\') is not null)\n"
-"_ms_date := 1;\n"
-"else\n"
-"_ms_date := 0;\n"
-"_temp := WS.WS.FINDPARAM (lines, \'Depth:\');\n"
-"if (_temp <> \'\' and _temp <> \'infinity\')\n"
-"_depth := atoi (_temp);\n"
-"else\n"
-"_depth := -1;\n"
-"{\n"
-"declare test_tree any;\n"
-"declare exit handler for sqlstate \'*\'\n"
-"{\n"
-"http_request_status (\'HTTP/1.1 400 Bad Request\');\n"
-"return;\n"
-"};\n"
-"if (length (_body) > 0)\n"
-"test_tree := xml_tree (_body);\n"
-"}\n"
-"if (st = \'C\' and aref (_lpath, length (_lpath) - 1) <> ascii (\'/\'))\n"
-"_lpath := concat (_lpath, \'/\');\n"
-"\n"
-"if (is_calendar = 1)\n"
-"_props := WS.WS.CALENDAR_NAMES (_body);\n"
-"else if (is_addressbook = 1)\n"
-"_props := WS.WS.ADDRESSBOOK_NAMES (_body);\n"
-"else\n"
-"_props := WS.WS.PROPNAMES (_body);\n"
-"if (isarray (_props) and length (_props) = 1 and (aref (_props, 0) = \'propname\'))\n"
-"{\n"
-"WS.WS.CUSTOM_PROP (_lpath, _props, _depth, st);\n"
-"return;\n"
-"}\n"
-"http_request_status (\'HTTP/1.1 207 Multi-Status\');\n"
-"if (is_calendar = 1)\n"
-"{\n"
-"declare urls any; \n"
-"urls := xpath_eval (\'[xmlns:D=\"DAV:\" xmlns=\"urn:ietf:params:xml:ns:caldav:\"] //calendar-multiget/D:href/text()\', xml_tree_doc (xml_expand_refs (xml_tree (_body))), 0);\n"
-"http_header (\'DAV: 1, calendar-access, calendar-schedule, calendar-proxy\\r\\nContent-type: application/xml; charset=\"utf-8\"\\r\\n\');\n"
-"http (\'<?xml version=\"1.0\" encoding=\"utf-8\"?>\\n\');\n"
-"http (\'<D:multistatus xmlns:D=\"DAV:\" xmlns:M=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\\n\');\n"
-"foreach (any prop in urls) do\n"
-"{\n"
-"if (-13 = WS.WS.REPORT_RESPONSE (cast(prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id))\n"
-"{\n"
-"_u_id := null;\n"
-"_g_id := null;\n"
-"\n"
-"http_rewrite ();\n"
-"WS.WS.GET_DAV_AUTH (lines, 0, 1, uname, upwd, _u_id, _g_id, _perms);\n"
-"return;\n"
-"}\n"
-"}\n"
-"http (\'</D:multistatus>\\n\');\n"
-"}\n"
-"else if (is_addressbook = 1)\n"
-"{\n"
-"declare urls any; \n"
-"urls := xpath_eval (\'[xmlns:D=\"DAV:\" xmlns=\"urn:ietf:params:xml:ns:carddav:\"] //addressbook-multiget/D:href/text()\', xml_tree_doc (xml_expand_refs (xml_tree (_body))), 0);\n"
-"http_header (\'DAV: 1, addressbook\\r\\nContent-type: application/xml; charset=\"utf-8\"\\r\\n\');\n"
-"http (\'<?xml version=\"1.0\" encoding=\"utf-8\"?>\\n\');\n"
-"http (\'<D:multistatus xmlns:D=\"DAV:\" xmlns:M=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\\n\');\n"
-"foreach (any prop in urls) do\n"
-"{\n"
-"if (-13 = WS.WS.REPORT_RESPONSE (cast(prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id))\n"
-"{\n"
-"_u_id := null;\n"
-"_g_id := null;\n"
-"\n"
-"http_rewrite ();\n"
-"WS.WS.GET_DAV_AUTH (lines, 0, 1, uname, upwd, _u_id, _g_id, _perms);\n"
-"return;\n"
-"}\n"
-"}\n"
-"http (\'</D:multistatus>\\n\');\n"
-"}\n"
-"else\n"
-"{\n"
-"http_header (\'Content-type: text/xml; charset=\"utf-8\"\\r\\n\');\n"
-"http (\'<?xml version=\"1.0\" encoding=\"utf-8\"?>\\n\');\n"
-"http (\'<D:multistatus xmlns:D=\"DAV:\" xmlns:M=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\\n\');\n"
-"if (-13 = WS.WS.PROPFIND_RESPONSE (_lpath, _ppath, _depth, st, _ms_date, _props, _u_id))\n"
-"{\n"
-"_u_id := null;\n"
-"_g_id := null;\n"
-"\n"
-"http_rewrite ();\n"
-"WS.WS.GET_DAV_AUTH (lines, 0, 1, uname, upwd, _u_id, _g_id, _perms);\n"
-"return;\n"
-"}\n"
-"http (\'</D:multistatus>\\n\');\n"
-"}\n"
-"}\n"
-"--src dav.sql:885\n";
-
-static const char *proc8 =
-"#line 1042 \"[executable]/dav.sql\"\n"
-"create function WS.WS.REPORT_RESPONSE (\n"
-"in lpath varchar,\n"
-"in ppath varchar,\n"
-"in depth integer,\n"
-"in st char (1),\n"
-"in ms_date integer,\n"
-"in propnames any,\n"
-"in u_id integer) returns integer\n"
-"{\n"
-"declare all_prop, ppath_len integer;\n"
-"declare dirlist any;\n"
-"declare add_not_found, _this_col integer;\n"
-"all_prop := 0;\n"
-"add_not_found := 1;\n"
-"if (not isstring (lpath) or not isstring (ppath))\n"
-"return -28;\n"
-"if (st = \'C\' and aref (ppath, length (ppath) - 1) <> ascii (\'/\'))\n"
-"ppath := concat (ppath, \'/\');\n"
-"ppath_len := length (ppath);\n"
-"if (not isarray (propnames))\n"
-"{\n"
-"if (ms_date)\n"
-"{\n"
-"propnames := vector (\':getlastmodified\', \':creationdate\',\n"
-"\':lastaccessed\', \':getcontentlength\', \':resourcetype\', \':supportedlock\');\n"
-"add_not_found := 0;\n"
-"}\n"
-"else\n"
-"propnames := vector (\':getlastmodified\', \':getcontentlength\', \':resourcetype\');\n"
-"}\n"
-"else if (aref (propnames, 0) = \'allprop\')\n"
-"{\n"
-"propnames := vector (\':getlastmodified\', \':creationdate\', \':getetag\', \':getcontenttype\',\n"
-"\':getcontentlength\', \':resourcetype\', \':lockdiscovery\', \':supportedlock\');\n"
-"all_prop := 1;\n"
-"}\n"
-"dirlist := DAV_DIR_LIST_INT (ppath, -1, \'%\', null, null, u_id);\n"
-"if (isinteger (dirlist))\n"
-"{\n"
-"if (dirlist = -13)\n"
-"{\n"
-"if (u_id > 0)\n"
-"dirlist := vector ();\n"
-"else\n"
-"return dirlist;\n"
-"}\n"
-"else\n"
-"dirlist := vector ();\n"
-"}\n"
-"if (length (dirlist) = 0)\n"
-"{\n"
-"return -1;\n"
-"}\n"
-"WS.WS.PROPFIND_RESPONSE_FORMAT (lpath, dirlist, 0, ms_date, propnames, all_prop, add_not_found, 0, u_id);\n"
-"return 0;\n"
-"}\n"
-"--src dav.sql:1040\n";
-
-static const char *proc9 =
-"#line 1100 \"[executable]/dav.sql\"\n"
+"#line 618 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.CUSTOM_PROP (in lpath any, in prop any, in depth integer, in st char (1))\n"
"{\n"
"declare _name, _lmask, _prop, _ltype, _lscope, _lown, _ltoken, _tp, _pname varchar;\n"
@@ -1163,31 +677,21 @@ static const char *proc9 =
"http (\'</D:response>\\n\');\n"
"http (\'</D:multistatus>\\n\');\n"
"}\n"
-"--src dav.sql:1098\n";
+"--src dav.sql:616\n";
-static const char *proc10 =
-"#line 1173 \"[executable]/dav.sql\"\n"
+static const char *proc6 =
+"#line 691 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PROPPATCH (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
-"declare _u_id, _g_id, _slen, _len, _ix, id, _pid, _ix1, is_calendar, is_addressbook integer;\n"
+"declare _u_id, _g_id, _slen, _len, _ix, id, _pid, _ix1 integer;\n"
"declare uname, upwd, st, _perms, _body, _name varchar;\n"
"declare _ses, _set, _del, _tmp, _val any;\n"
"declare rc, acc, _proprc, xtree any;\n"
"\n"
-"is_addressbook := 0;\n"
-"is_calendar := 0;\n"
+"\n"
"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path, vector(\'\')), \'C\'));\n"
"if (id is not null)\n"
-"{\n"
-"if (isarray(id) = 1)\n"
-"{\n"
-"if (id[0] = UNAME\'CalDAV\')\n"
-"is_calendar := 1;\n"
-"if (id[0] = UNAME\'CardDAV\')\n"
-"is_addressbook := 1;\n"
-"}\n"
"st := \'C\';\n"
-"}\n"
"else\n"
"{\n"
"id := DAV_HIDE_ERROR (DAV_SEARCH_ID (vector_concat (vector(\'\'), path), \'R\'));\n"
@@ -1260,12 +764,8 @@ static const char *proc10 =
"pn := concat (pns, \':\', pn);\n"
"\n"
"xte_nodebld_acc (acc, xte_node (xte_head (pn)));\n"
-"if (is_calendar or is_addressbook)\n"
-"{\n"
"\n"
-" ;\n"
-"}\n"
-"else if (pns = \'http://www.openlinksw.com/virtuoso/webdav/1.0/\'\n"
+"if (pns = \'http://www.openlinksw.com/virtuoso/webdav/1.0/\'\n"
"and _prop_name in (\'virtpermissions\', \'virtowneruid\', \'virtownergid\'))\n"
"{\n"
"declare tmp, tmp_id any;\n"
@@ -1304,7 +804,8 @@ static const char *proc10 =
"update WS.WS.SYS_DAV_COL set COL_GROUP = tmp_id where COL_ID = id;\n"
"}\n"
"}\n"
-"else if (not exists (select 1 from WS.WS.SYS_DAV_PROP where PROP_NAME = pn and PROP_TYPE = st and PROP_PARENT_ID = id))\n"
+"else if (not exists (select 1 from WS.WS.SYS_DAV_PROP\n"
+"where PROP_NAME = pn and PROP_TYPE = st and PROP_PARENT_ID = id))\n"
"{\n"
"_pid := WS.WS.GETID (\'P\');\n"
"insert into WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE)\n"
@@ -1354,10 +855,10 @@ static const char *proc10 =
"http_header (\'Content-Type: text/xml\\r\\n\');\n"
"http (string_output_string (rc));\n"
"}\n"
-"--src dav.sql:1171\n";
+"--src dav.sql:689\n";
-static const char *proc11 =
-"#line 1362 \"[executable]/dav.sql\"\n"
+static const char *proc7 =
+"#line 867 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.FINDPARAM (inout params varchar, in pkey varchar)\n"
"{\n"
"declare ret any;\n"
@@ -1375,10 +876,10 @@ static const char *proc11 =
"}\n"
"return \'\';\n"
"}\n"
-"--src dav.sql:1360\n";
+"--src dav.sql:865\n";
-static const char *proc12 =
-"#line 1381 \"[executable]/dav.sql\"\n"
+static const char *proc8 =
+"#line 886 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.MKCOL (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"declare _parent_name varchar;\n"
@@ -1438,10 +939,10 @@ static const char *proc12 =
"}\n"
"http_request_status (\'HTTP/1.1 405 Method Not Allowed\');\n"
"}\n"
-"--src dav.sql:1379\n";
+"--src dav.sql:884\n";
-static const char *proc13 =
-"#line 1443 \"[executable]/dav.sql\"\n"
+static const char *proc9 =
+"#line 948 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.FINDCOL (in path any, out col integer)\n"
"{\n"
"declare inx integer;\n"
@@ -1463,10 +964,10 @@ static const char *proc13 =
"not_found:\n"
"return inx;\n"
"}\n"
-"--src dav.sql:1441\n";
+"--src dav.sql:946\n";
-static const char *proc14 =
-"#line 1467 \"[executable]/dav.sql\"\n"
+static const char *proc10 =
+"#line 972 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.FINDRES (in path varchar,out _col integer, out _name varchar)\n"
"{\n"
"declare depth integer;\n"
@@ -1502,10 +1003,10 @@ static const char *proc14 =
"not_found:\n"
"return rc;\n"
"}\n"
-"--src dav.sql:1465\n";
+"--src dav.sql:970\n";
-static const char *proc15 =
-"#line 1505 \"[executable]/dav.sql\"\n"
+static const char *proc11 =
+"#line 1010 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.DELCHILDREN (in id integer, in lines varchar)\n"
"{\n"
"declare col, res, r_id, n_locks, rc integer;\n"
@@ -1585,10 +1086,10 @@ static const char *proc15 =
"}\n"
"return 0;\n"
"}\n"
-"--src dav.sql:1503\n";
+"--src dav.sql:1008\n";
-static const char *proc16 =
-"#line 1587 \"[executable]/dav.sql\"\n"
+static const char *proc12 =
+"#line 1092 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.\"DELETE\" (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"declare depth,len integer;\n"
@@ -1651,10 +1152,10 @@ static const char *proc16 =
"http_request_status (\'HTTP/1.1 500 Internal Server Error\');\n"
"return;\n"
"}\n"
-"--src dav.sql:1585\n";
+"--src dav.sql:1090\n";
-static const char *proc17 =
-"#line 1653 \"[executable]/dav.sql\"\n"
+static const char *proc13 =
+"#line 1158 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.ISCOL (in path varchar)\n"
"{\n"
"declare depth, len, col integer;\n"
@@ -1665,10 +1166,10 @@ static const char *proc17 =
"else\n"
"return 0;\n"
"}\n"
-"--src dav.sql:1651\n";
+"--src dav.sql:1156\n";
-static const char *proc18 =
-"#line 1667 \"[executable]/dav.sql\"\n"
+static const char *proc14 =
+"#line 1172 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.ISRES (in path varchar)\n"
"{\n"
"declare col, rc integer;\n"
@@ -1678,10 +1179,10 @@ static const char *proc18 =
"rc := 0;\n"
"return (rc);\n"
"}\n"
-"--src dav.sql:1665\n";
+"--src dav.sql:1170\n";
-static const char *proc19 =
-"#line 1679 \"[executable]/dav.sql\"\n"
+static const char *proc15 =
+"#line 1184 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.ETAG (in name varchar, in col integer)\n"
"{\n"
"declare etag, full_path varchar;\n"
@@ -1697,20 +1198,20 @@ static const char *proc19 =
"etag := md5 (etag);\n"
"return etag;\n"
"}\n"
-"--src dav.sql:1677\n";
+"--src dav.sql:1182\n";
-static const char *proc20 =
-"#line 1697 \"[executable]/dav.sql\"\n"
+static const char *proc16 =
+"#line 1202 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.HEAD (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"\n"
"WS.WS.GET (path, params, lines);\n"
"return;\n"
"}\n"
-"--src dav.sql:1695\n";
+"--src dav.sql:1200\n";
-static const char *proc21 =
-"#line 1706 \"[executable]/dav.sql\"\n"
+static const char *proc17 =
+"#line 1211 \"[executable]/dav.sql\"\n"
"create procedure DAV_SET_HTTP_REQUEST_STATUS (in rc integer)\n"
"{\n"
"if (rc = -1) { http_request_status (\'HTTP/1.1 409 Invalid path\'); return; }\n"
@@ -1728,10 +1229,10 @@ static const char *proc21 =
"http_request_status (\'HTTP/1.1 405 Method Not Allowed\');\n"
"return;\n"
"}\n"
-"--src dav.sql:1704\n";
+"--src dav.sql:1209\n";
-static const char *proc22 =
-"#line 1728 \"[executable]/dav.sql\"\n"
+static const char *proc18 =
+"#line 1233 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PUT (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"declare _col_parent_id integer;\n"
@@ -1834,10 +1335,10 @@ static const char *proc22 =
"http_body_read ();\n"
"DAV_SET_HTTP_REQUEST_STATUS (rc);\n"
"}\n"
-"--src dav.sql:1726\n";
+"--src dav.sql:1231\n";
-static const char *proc23 =
-"#line 1832 \"[executable]/dav.sql\"\n"
+static const char *proc19 =
+"#line 1337 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.HEX_TO_DEC (in c char)\n"
"{\n"
"if (c >= \'0\' and c <= \'9\')\n"
@@ -1848,10 +1349,10 @@ static const char *proc23 =
"return (10 + ascii(c) - ascii(\'A\'));\n"
"return 0;\n"
"}\n"
-"--src dav.sql:1830\n";
+"--src dav.sql:1335\n";
-static const char *proc24 =
-"#line 1844 \"[executable]/dav.sql\"\n"
+static const char *proc20 =
+"#line 1349 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.STR_TO_URI (in str varchar)\n"
"{\n"
"declare tmp varchar;\n"
@@ -1883,10 +1384,10 @@ static const char *proc24 =
"}\n"
"return trim(tmp);\n"
"}\n"
-"--src dav.sql:1842\n";
+"--src dav.sql:1347\n";
-static const char *proc25 =
-"#line 1877 \"[executable]/dav.sql\"\n"
+static const char *proc21 =
+"#line 1382 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PATHREF (in path varchar, in elem integer, in host varchar, out name_len integer)\n"
"{\n"
"declare inx, len, pos, inx1 integer;\n"
@@ -1956,10 +1457,10 @@ static const char *proc25 =
"}\n"
"return name;\n"
"}\n"
-"--src dav.sql:1875\n";
+"--src dav.sql:1380\n";
-static const char *proc26 =
-"#line 1948 \"[executable]/dav.sql\"\n"
+static const char *proc22 =
+"#line 1453 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.IS_ACTIVE_CONTENT (in f varchar)\n"
"{\n"
"declare dot integer;\n"
@@ -1975,10 +1476,10 @@ static const char *proc26 =
"return 1;\n"
"return 0;\n"
"}\n"
-"--src dav.sql:1946\n";
+"--src dav.sql:1451\n";
-static const char *proc27 =
-"#line 1965 \"[executable]/dav.sql\"\n"
+static const char *proc23 =
+"#line 1470 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.GET_DAV_DEFAULT_PAGE (inout path any)\n"
"{\n"
"declare _list, path1 any;\n"
@@ -2025,10 +1526,10 @@ static const char *proc27 =
"\n"
"return \'\';\n"
"}\n"
-"--src dav.sql:1963\n";
+"--src dav.sql:1468\n";
-static const char *proc28 =
-"#line 2014 \"[executable]/dav.sql\"\n"
+static const char *proc24 =
+"#line 1519 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.GET_DAV_CHUNKED_QUOTA () returns integer\n"
"{\n"
"declare dav_chunked_quota integer;\n"
@@ -2041,10 +1542,10 @@ static const char *proc28 =
"dav_chunked_quota := 1000000;\n"
"return dav_chunked_quota;\n"
"}\n"
-"--src dav.sql:2012\n";
+"--src dav.sql:1517\n";
-static const char *proc29 =
-"#line 2030 \"[executable]/dav.sql\"\n"
+static const char *proc25 =
+"#line 1535 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.GET (in path any, inout params any, in lines any)\n"
"{\n"
"declare col_depth, path_len integer;\n"
@@ -2058,7 +1559,7 @@ static const char *proc29 =
"declare full_path varchar;\n"
"declare parent_path varchar;\n"
"declare cont_type varchar;\n"
-"declare server_etag, client_etag, rdf_graph varchar;\n"
+"declare server_etag, client_etag varchar;\n"
"declare uid, maxres integer;\n"
"declare p_comm, stat, msg, xpr, sxtag, rxtag, resource_content, str varchar;\n"
"declare resource_owner, exec_safety_level integer;\n"
@@ -2366,7 +1867,6 @@ static const char *proc29 =
"if (stat <> \'00000\')\n"
"{\n"
"exec_err:\n"
-"http_status_set (500);\n"
"http (\'<html><body>\');\n"
"http (concat (\'<H3>Execution of \"\', sprintf (\'%V\', http_path()), \'\" failed.</H3>\'));\n"
"http (concat (\'<p><b>SQL Error: \', stat, \' \'));\n"
@@ -2487,14 +1987,6 @@ static const char *proc29 =
"case when is_https_ctx () then \'https\' else \'http\' end,\n"
"http_request_header (lines, \'Host\', NULL, NULL), http_path ()); \n"
"}\n"
-"rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where \n"
-"PROP_PARENT_ID = _col and PROP_TYPE = \'C\' and PROP_NAME = \'virt:rdf_graph\');\n"
-"if (rdf_graph is not null)\n"
-"{\n"
-"declare rdf_uri varchar;\n"
-"rdf_uri := rfc1808_expand_uri (DB.DBA.HTTP_REQUESTED_URL (), DAV_RDF_RES_NAME (rdf_graph));\n"
-"hdr_str := hdr_str || sprintf (\'Link: <%s>; rel=\"alternate\"\\r\\n\', rdf_uri);\n"
-"} \n"
"http_header (hdr_str);\n"
"}\n"
"else\n"
@@ -2704,10 +2196,10 @@ static const char *proc29 =
"err_end:\n"
"return;\n"
"}\n"
-"--src dav.sql:2028\n";
+"--src dav.sql:1533\n";
-static const char *proc30 =
-"#line 2692 \"[executable]/dav.sql\"\n"
+static const char *proc26 =
+"#line 2188 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.POST (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"declare _content_type any;\n"
@@ -2729,10 +2221,10 @@ static const char *proc30 =
"WS.WS.GET (path, params, lines);\n"
"}\n"
"}\n"
-"--src dav.sql:2690\n";
+"--src dav.sql:2186\n";
-static const char *proc31 =
-"#line 2715 \"[executable]/dav.sql\"\n"
+static const char *proc27 =
+"#line 2211 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.SPARQL_QUERY_POST (in path varchar, inout ses varchar, in uname varchar)\n"
"{\n"
"declare def_gr, full_qr, qr, cname any;\n"
@@ -2772,20 +2264,20 @@ static const char *proc31 =
"}\n"
"ses := sprintf (\'CONSTRUCT { ?s ?p ?o } FROM <%s> WHERE { ?s ?p ?o }\', def_gr);\n"
"}\n"
-"--src dav.sql:2713\n";
+"--src dav.sql:2209\n";
-static const char *proc32 =
-"#line 2756 \"[executable]/dav.sql\"\n"
+static const char *proc28 =
+"#line 2252 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.SPARQL_QUERY_GET (in content any, in path any, inout lines any)\n"
"{\n"
"declare pars any;\n"
"pars := vector (\'query\', string_output_string (content));\n"
"WS.WS.\"/!sparql/\" (path, pars, lines);\n"
"}\n"
-"--src dav.sql:2754\n";
+"--src dav.sql:2250\n";
-static const char *proc33 =
-"#line 2767 \"[executable]/dav.sql\"\n"
+static const char *proc29 =
+"#line 2263 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.\"LOCK\" (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"declare len, tleft, tright integer;\n"
@@ -2903,10 +2395,10 @@ static const char *proc33 =
"\'</D:lockdiscovery>\',\n"
"\'</D:prop>\'));\n"
"}\n"
-"--src dav.sql:2765\n";
+"--src dav.sql:2261\n";
-static const char *proc34 =
-"#line 2886 \"[executable]/dav.sql\"\n"
+static const char *proc30 =
+"#line 2382 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.\"UNLOCK\" (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"declare uname, upwd, _perms, token, name, cur_token, location varchar;\n"
@@ -2956,10 +2448,10 @@ static const char *proc34 =
"http_request_status (\'HTTP/1.1 204 No Content\');\n"
"return;\n"
"}\n"
-"--src dav.sql:2884\n";
+"--src dav.sql:2380\n";
-static const char *proc35 =
-"#line 2939 \"[executable]/dav.sql\"\n"
+static const char *proc31 =
+"#line 2435 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.OPLOCKTOKEN ()\n"
"{\n"
"\n"
@@ -2970,10 +2462,10 @@ static const char *proc35 =
"\n"
"\n"
"}\n"
-"--src dav.sql:2937\n";
+"--src dav.sql:2433\n";
-static const char *proc36 =
-"#line 2951 \"[executable]/dav.sql\"\n"
+static const char *proc32 =
+"#line 2447 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PARENT_PATH (in path varchar)\n"
"{\n"
"declare tmp any;\n"
@@ -2992,10 +2484,10 @@ static const char *proc36 =
"}\n"
"return tmp;\n"
"}\n"
-"--src dav.sql:2949\n";
+"--src dav.sql:2445\n";
-static const char *proc37 =
-"#line 2971 \"[executable]/dav.sql\"\n"
+static const char *proc33 =
+"#line 2467 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.HREF_TO_ARRAY (in path varchar,in host varchar)\n"
"{\n"
"declare arr, res any;\n"
@@ -3014,10 +2506,10 @@ static const char *proc37 =
"}\n"
"return res;\n"
"}\n"
-"--src dav.sql:2969\n";
+"--src dav.sql:2465\n";
-static const char *proc38 =
-"#line 2991 \"[executable]/dav.sql\"\n"
+static const char *proc34 =
+"#line 2487 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.HREF_TO_PATH_ARRAY (in path varchar)\n"
"{\n"
"declare arr, res any;\n"
@@ -3041,10 +2533,10 @@ static const char *proc38 =
"}\n"
"return res;\n"
"}\n"
-"--src dav.sql:2989\n";
+"--src dav.sql:2485\n";
-static const char *proc39 =
-"#line 3017 \"[executable]/dav.sql\"\n"
+static const char *proc35 =
+"#line 2513 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.DSTIS (in path varchar, in host varchar, out rcol integer, out rname varchar)\n"
"{\n"
"declare inx, col, res, id, name_len, depth, cols integer;\n"
@@ -3104,26 +2596,26 @@ static const char *proc39 =
"\n"
"return rc;\n"
"}\n"
-"--src dav.sql:3015\n";
+"--src dav.sql:2511\n";
-static const char *proc40 =
-"#line 3079 \"[executable]/dav.sql\"\n"
+static const char *proc36 =
+"#line 2575 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.MOVE (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"WS.WS.COPY_OR_MOVE (path, params, lines, 0);\n"
"}\n"
-"--src dav.sql:3077\n";
+"--src dav.sql:2573\n";
-static const char *proc41 =
-"#line 3085 \"[executable]/dav.sql\"\n"
+static const char *proc37 =
+"#line 2581 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.COPY (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"WS.WS.COPY_OR_MOVE (path, params, lines, 1);\n"
"}\n"
-"--src dav.sql:3083\n";
+"--src dav.sql:2579\n";
-static const char *proc42 =
-"#line 3091 \"[executable]/dav.sql\"\n"
+static const char *proc38 =
+"#line 2587 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.COPY_OR_MOVE (in path varchar, inout params varchar, in lines varchar, in is_copy integer)\n"
"{\n"
"declare _src_name, st, _dst_name varchar;\n"
@@ -3269,10 +2761,10 @@ static const char *proc42 =
"if (rc = -3) { http_request_status (\'HTTP/1.1 412 Precondition Failed\'); return; }\n"
"DAV_SET_HTTP_REQUEST_STATUS (rc);\n"
"}\n"
-"--src dav.sql:3089\n";
+"--src dav.sql:2585\n";
-static const char *proc43 =
-"#line 3240 \"[executable]/dav.sql\"\n"
+static const char *proc39 =
+"#line 2736 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.ISLOCKED (in path any, in lines varchar, in _u_id integer)\n"
"{\n"
"declare name, token, if_token varchar;\n"
@@ -3325,10 +2817,10 @@ static const char *proc43 =
"close l_cur;\n"
"return rc;\n"
"}\n"
-"--src dav.sql:3238\n";
+"--src dav.sql:2734\n";
-static const char *proc44 =
-"#line 3294 \"[executable]/dav.sql\"\n"
+static const char *proc40 =
+"#line 2790 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.CHECK_AUTH (in lines any)\n"
"{\n"
"declare _u_group, _u_id integer;\n"
@@ -3336,10 +2828,10 @@ static const char *proc44 =
"_u_id := WS.WS.GET_AUTH (lines, _u_group, _perms);\n"
"return _u_id;\n"
"}\n"
-"--src dav.sql:3292\n";
+"--src dav.sql:2788\n";
-static const char *proc45 =
-"#line 3304 \"[executable]/dav.sql\"\n"
+static const char *proc41 =
+"#line 2800 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.GET_IF_AUTH (in lines any, out _u_group integer, out _perms varchar)\n"
"{\n"
"declare _u_id integer;\n"
@@ -3358,10 +2850,10 @@ static const char *proc45 =
"}\n"
"return _u_id;\n"
"}\n"
-"--src dav.sql:3302\n";
+"--src dav.sql:2798\n";
-static const char *proc46 =
-"#line 3324 \"[executable]/dav.sql\"\n"
+static const char *proc42 =
+"#line 2820 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.GET_DAV_AUTH (in lines any, in allow_anon integer, in can_write_http integer,\n"
"out _u_name varchar, out _u_password varchar, out _uid integer, out _gid integer, out _perms varchar) returns integer\n"
"{\n"
@@ -3474,10 +2966,10 @@ static const char *proc46 =
"\'Access to page is forbidden.</BODY></HTML>\'));\n"
"return -24;\n"
"}\n"
-"--src dav.sql:3322\n";
+"--src dav.sql:2818\n";
-static const char *proc47 =
-"#line 3438 \"[executable]/dav.sql\"\n"
+static const char *proc43 =
+"#line 2934 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.PERM_COMP (in perm varchar, in mask varchar)\n"
"{\n"
"declare inx integer;\n"
@@ -3495,10 +2987,10 @@ static const char *proc47 =
"}\n"
"return 1;\n"
"}\n"
-"--src dav.sql:3436\n";
+"--src dav.sql:2932\n";
-static const char *proc48 =
-"#line 3458 \"[executable]/dav.sql\"\n"
+static const char *proc44 =
+"#line 2954 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.CHECKPERM ( in path varchar, in _u_id integer, in action varchar)\n"
"{\n"
"declare g_id, _user, _group integer;\n"
@@ -3576,10 +3068,10 @@ static const char *proc48 =
"}\n"
"return rc;\n"
"}\n"
-"--src dav.sql:3456\n";
+"--src dav.sql:2952\n";
-static const char *proc49 =
-"#line 3537 \"[executable]/dav.sql\"\n"
+static const char *proc45 =
+"#line 3033 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.ISPUBLIC (in path varchar, in ask varchar)\n"
"{\n"
"declare perms, name, given varchar;\n"
@@ -3604,10 +3096,10 @@ static const char *proc49 =
"nf:\n"
"return 0;\n"
"}\n"
-"--src dav.sql:3535\n";
+"--src dav.sql:3031\n";
-static const char *proc50 =
-"#line 3563 \"[executable]/dav.sql\"\n"
+static const char *proc46 =
+"#line 3059 \"[executable]/dav.sql\"\n"
"create procedure\n"
"WS.WS.DAV_VSP_DEF_REMOVE (in path varchar)\n"
"{\n"
@@ -3622,10 +3114,10 @@ static const char *proc50 =
"}\n"
"}\n"
"}\n"
-"--src dav.sql:3561\n";
+"--src dav.sql:3057\n";
-static const char *proc51 =
-"#line 3579 \"[executable]/dav.sql\"\n"
+static const char *proc47 =
+"#line 3075 \"[executable]/dav.sql\"\n"
"create function DAV_PERMS_SET_CHAR (in perms varchar, in ch any, in pos integer) returns varchar\n"
"{\n"
"declare l integer;\n"
@@ -3638,10 +3130,10 @@ static const char *proc51 =
"perms[pos] := ch[0];\n"
"return perms;\n"
"}\n"
-"--src dav.sql:3577\n";
+"--src dav.sql:3073\n";
-static const char *proc52 =
-"#line 3593 \"[executable]/dav.sql\"\n"
+static const char *proc48 =
+"#line 3089 \"[executable]/dav.sql\"\n"
"create procedure DAV_PERMS_FIX (inout perms varchar, in full_perms varchar)\n"
"{\n"
"declare l integer;\n"
@@ -3653,10 +3145,10 @@ static const char *proc52 =
"if (ascii(\'-\') = perms [10])\n"
"perms[10] := full_perms[10];\n"
"}\n"
-"--src dav.sql:3591\n";
+"--src dav.sql:3087\n";
-static const char *proc53 =
-"#line 3606 \"[executable]/dav.sql\"\n"
+static const char *proc49 =
+"#line 3102 \"[executable]/dav.sql\"\n"
"create procedure DAV_PERMS_INHERIT (inout perms varchar, in parent_perms varchar, in force_parent integer := 0)\n"
"{\n"
"declare l integer;\n"
@@ -3668,10 +3160,10 @@ static const char *proc53 =
"if ((ascii(\'-\') = perms [10]) or (force_parent and (ascii(\'M\') <> parent_perms [10])))\n"
"perms[10] := parent_perms[10];\n"
"}\n"
-"--src dav.sql:3604\n";
+"--src dav.sql:3100\n";
static const char *trig0 =
-"#line 3620 \"[executable]/dav.sql\"\n"
+"#line 3116 \"[executable]/dav.sql\"\n"
"create trigger SYS_DAV_RES_FULL_PATH_I after insert on WS.WS.SYS_DAV_RES order 0 referencing new as N\n"
"{\n"
"declare full_path, name, _pflags, _rflags, _inh varchar;\n"
@@ -3736,10 +3228,10 @@ static const char *trig0 =
"xslt_stale (concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', N.RES_FULL_PATH));\n"
"\n"
"}\n"
-"--src dav.sql:3618\n";
+"--src dav.sql:3114\n";
static const char *trig1 =
-"#line 3686 \"[executable]/dav.sql\"\n"
+"#line 3182 \"[executable]/dav.sql\"\n"
"create trigger SYS_DAV_RES_FULL_PATH_BU before update on WS.WS.SYS_DAV_RES referencing old as O, new as N\n"
"{\n"
"declare _pflags, _rflags, _inh varchar;\n"
@@ -3764,10 +3256,10 @@ static const char *trig1 =
"}\n"
"\n"
"}\n"
-"--src dav.sql:3684\n";
+"--src dav.sql:3180\n";
static const char *trig2 =
-"#line 3712 \"[executable]/dav.sql\"\n"
+"#line 3208 \"[executable]/dav.sql\"\n"
"create trigger SYS_DAV_RES_FULL_PATH_U after update on WS.WS.SYS_DAV_RES referencing old as O, new as N\n"
"{\n"
"declare full_path, name varchar;\n"
@@ -3837,10 +3329,10 @@ static const char *trig2 =
"xslt_stale (concat (\'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:\', N.RES_FULL_PATH));\n"
"\n"
"}\n"
-"--src dav.sql:3710\n";
+"--src dav.sql:3206\n";
static const char *trig3 =
-"#line 3783 \"[executable]/dav.sql\"\n"
+"#line 3279 \"[executable]/dav.sql\"\n"
"create trigger SYS_DAV_COL_U after update on WS.WS.SYS_DAV_COL referencing old as O, new as N\n"
"{\n"
"declare full_path, name, _pflags, _cflags varchar;\n"
@@ -3977,10 +3469,10 @@ static const char *trig3 =
"where RES_COL = res and (case (lt (length (RES_PERMS), 11)) when 1 then 0 else RES_PERMS[10] end) <> _pflags[10];\n"
"\n"
"}\n"
-"--src dav.sql:3781\n";
+"--src dav.sql:3277\n";
-static const char *proc54 =
-"#line 3921 \"[executable]/dav.sql\"\n"
+static const char *proc50 =
+"#line 3417 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.UPDCHILD (in col integer, in root_path varchar, in _pflags varchar, in repl varchar)\n"
"{\n"
"declare name, new_path, str varchar;\n"
@@ -4062,10 +3554,10 @@ static const char *proc54 =
"not_col:\n"
"close c_cur;\n"
"}\n"
-"--src dav.sql:3919\n";
+"--src dav.sql:3415\n";
static const char *trig4 =
-"#line 4004 \"[executable]/dav.sql\"\n"
+"#line 3500 \"[executable]/dav.sql\"\n"
"create trigger SYS_DAV_COL_I after insert on WS.WS.SYS_DAV_COL referencing new as N\n"
"{\n"
"declare _pflags, _cflags, col_path, _inh varchar;\n"
@@ -4116,10 +3608,10 @@ static const char *trig4 =
"\n"
"\n"
"}\n"
-"--src dav.sql:4002\n";
+"--src dav.sql:3498\n";
-static const char *proc55 =
-"#line 4056 \"[executable]/dav.sql\"\n"
+static const char *proc51 =
+"#line 3552 \"[executable]/dav.sql\"\n"
"create procedure\n"
"WS.WS.DAV_VSP_INCLUDES_CHANGED (in full_path varchar, in own varchar)\n"
"{\n"
@@ -4145,10 +3637,10 @@ static const char *proc55 =
"}\n"
"return 0;\n"
"}\n"
-"--src dav.sql:4054\n";
+"--src dav.sql:3550\n";
-static const char *proc56 =
-"#line 4084 \"[executable]/dav.sql\"\n"
+static const char *proc52 =
+"#line 3580 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.EXPAND_INCLUDES (in path varchar, inout stream varchar, in level integer,\n"
"in ct integer, in content varchar, inout st any := null)\n"
"{\n"
@@ -4232,10 +3724,10 @@ static const char *proc56 =
"if (length (curr_file) > 0)\n"
"http (curr_file, stream);\n"
"}\n"
-"--src dav.sql:4082\n";
+"--src dav.sql:3578\n";
static const char *trig5 =
-"#line 4169 \"[executable]/dav.sql\"\n"
+"#line 3665 \"[executable]/dav.sql\"\n"
"create trigger SYS_DAV_RES_FULL_PATH_D after delete on WS.WS.SYS_DAV_RES\n"
"{\n"
"set triggers off;\n"
@@ -4265,10 +3757,10 @@ static const char *trig5 =
"delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = RES_ID;\n"
"\n"
"}\n"
-"--src dav.sql:4167\n";
+"--src dav.sql:3663\n";
static const char *trig6 =
-"#line 4200 \"[executable]/dav.sql\"\n"
+"#line 3696 \"[executable]/dav.sql\"\n"
"create trigger SYS_DAV_COL_D before delete on WS.WS.SYS_DAV_COL order 100\n"
"{\n"
"declare pub, col_path varchar;\n"
@@ -4287,10 +3779,10 @@ static const char *trig6 =
"delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = \'C\' and LOCK_PARENT_ID = COL_ID;\n"
"\n"
"}\n"
-"--src dav.sql:4198\n";
+"--src dav.sql:3694\n";
-static const char *proc57 =
-"#line 4222 \"[executable]/dav.sql\"\n"
+static const char *proc53 =
+"#line 3718 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.XML_VIEW_HEADER\n"
"(\n"
"in view_name varchar,\n"
@@ -4351,10 +3843,10 @@ static const char *proc57 =
"}\n"
"signal (\'22023\', \'Unsupported type of metadata\', \'DA006\');\n"
"}\n"
-"--src dav.sql:4220\n";
+"--src dav.sql:3716\n";
-static const char *proc58 =
-"#line 4285 \"[executable]/dav.sql\"\n"
+static const char *proc54 =
+"#line 3781 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.XML_VIEW_EXTERNAL_META\n"
"(\n"
"in view_name varchar,\n"
@@ -4384,10 +3876,10 @@ static const char *proc58 =
"meta_path_suffix := \'\';\n"
"mime_type := \'\';\n"
"}\n"
-"--src dav.sql:4283\n";
+"--src dav.sql:3779\n";
-static const char *proc59 =
-"#line 4316 \"[executable]/dav.sql\"\n"
+static const char *proc55 =
+"#line 3812 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.XML_VIEW_UPDATE (in _view varchar, in _res_id integer, in path varchar, in meta_mode integer, in meta_data varchar)\n"
"{\n"
"declare _body any;\n"
@@ -4402,10 +3894,10 @@ static const char *proc59 =
"_body := string_output_string (_body);\n"
"update WS.WS.SYS_DAV_RES set RES_CONTENT = _body, RES_MOD_TIME = now () where RES_ID = _res_id;\n"
"}\n"
-"--src dav.sql:4314\n";
+"--src dav.sql:3810\n";
-static const char *proc60 =
-"#line 4332 \"[executable]/dav.sql\"\n"
+static const char *proc56 =
+"#line 3828 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.FIXPATH (in path any)\n"
"{\n"
"declare inx, len, cp, sl integer;\n"
@@ -4484,10 +3976,10 @@ static const char *proc60 =
"ret := \'\';\n"
"return ret;\n"
"}\n"
-"--src dav.sql:4330\n";
+"--src dav.sql:3826\n";
-static const char *proc61 =
-"#line 4413 \"[executable]/dav.sql\"\n"
+static const char *proc57 =
+"#line 3909 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.ISPUBL (in __path varchar)\n"
"{\n"
"declare _srv, _path varchar;\n"
@@ -4529,10 +4021,10 @@ static const char *proc61 =
"}\n"
"return NULL;\n"
"}\n"
-"--src dav.sql:4411\n";
+"--src dav.sql:3907\n";
-static const char *proc62 =
-"#line 4456 \"[executable]/dav.sql\"\n"
+static const char *proc58 =
+"#line 3952 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.BODY_ARR (inout __ses any, in __pcs integer)\n"
"{\n"
"declare _res, _ses any;\n"
@@ -4582,10 +4074,10 @@ static const char *proc62 =
"\n"
"return _res;\n"
"}\n"
-"--src dav.sql:4454\n";
+"--src dav.sql:3950\n";
-static const char *proc63 =
-"#line 4511 \"[executable]/dav.sql\"\n"
+static const char *proc59 =
+"#line 4007 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.XML_AUTO_SCHED (in _path varchar)\n"
"{\n"
"declare _stmt, ses, _root, _sch, _dtd, _dtd_body, _comments varchar;\n"
@@ -4615,10 +4107,10 @@ static const char *proc63 =
"WS.WS.XMLSQL_TO_STRSES (_stmt, _root, _sch, _dtd, _comments, ses);\n"
"update WS.WS.SYS_DAV_RES set RES_CONTENT = ses, RES_MOD_TIME = now () where RES_ID = _res_id;\n"
"}\n"
-"--src dav.sql:4509\n";
+"--src dav.sql:4005\n";
-static const char *proc64 =
-"#line 4543 \"[executable]/dav.sql\"\n"
+static const char *proc60 =
+"#line 4039 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.DAV_LOGIN (in path any,\n"
"in lines any,\n"
"in __access varchar,\n"
@@ -4664,10 +4156,10 @@ static const char *proc64 =
"\n"
"return (1);\n"
"}\n"
-"--src dav.sql:4541\n";
+"--src dav.sql:4037\n";
-static const char *proc65 =
-"#line 4590 \"[executable]/dav.sql\"\n"
+static const char *proc61 =
+"#line 4086 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.HTTP_RESP (in hdr any, out descr varchar)\n"
"{\n"
"declare line, code varchar;\n"
@@ -4693,10 +4185,10 @@ static const char *proc65 =
"code := substring (code, 1, 3);\n"
"return atoi (code);\n"
"}\n"
-"--src dav.sql:4588\n";
+"--src dav.sql:4084\n";
-static const char *proc66 =
-"#line 4618 \"[executable]/dav.sql\"\n"
+static const char *proc62 =
+"#line 4114 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.COPY_TO_OTHER (in path varchar,\n"
"inout params varchar,\n"
"in lines varchar,\n"
@@ -4812,10 +4304,10 @@ static const char *proc66 =
"}\n"
"return 1;\n"
"}\n"
-"--src dav.sql:4616\n";
+"--src dav.sql:4112\n";
-static const char *proc67 =
-"#line 4735 \"[executable]/dav.sql\"\n"
+static const char *proc63 =
+"#line 4231 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.CHECK_READ_ACCESS (in _u_id integer, in doc_id integer)\n"
"{\n"
"declare _perms varchar;\n"
@@ -4837,10 +4329,10 @@ static const char *proc67 =
"exit_p:;\n"
"return rc;\n"
"}\n"
-"--src dav.sql:4733\n";
+"--src dav.sql:4229\n";
-static const char *proc68 =
-"#line 4758 \"[executable]/dav.sql\"\n"
+static const char *proc64 =
+"#line 4254 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.IS_REDIRECT_REF (inout path any, in lines any, inout location varchar)\n"
"{\n"
"declare fpath, fpath1, _ref, lpath, ppath varchar;\n"
@@ -4868,10 +4360,10 @@ static const char *proc68 =
"set isolation=\'repeatable\';\n"
"return rc;\n"
"}\n"
-"--src dav.sql:4756\n";
+"--src dav.sql:4252\n";
-static const char *proc69 =
-"#line 4788 \"[executable]/dav.sql\"\n"
+static const char *proc65 =
+"#line 4284 \"[executable]/dav.sql\"\n"
"create function WS.WS.DAV_DIR_LIST (in full_path varchar, in logical_root_path varchar, in col integer, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer) returns integer\n"
"{\n"
"declare _dir, _xml, _modify, fsize, _html, _b_opt, _xml_sheet any;\n"
@@ -4976,10 +4468,10 @@ static const char *proc69 =
"\n"
"return 0;\n"
"}\n"
-"--src dav.sql:4786\n";
+"--src dav.sql:4282\n";
-static const char *proc70 =
-"#line 4914 \"[executable]/dav.sql\"\n"
+static const char *proc66 =
+"#line 4410 \"[executable]/dav.sql\"\n"
"create function\n"
"WS.WS.DAV_CHECK_ASMX (in path any, out patched_path any) returns integer\n"
"{\n"
@@ -5006,10 +4498,10 @@ static const char *proc70 =
"patched_path := path;\n"
"return 0;\n"
"}\n"
-"--src dav.sql:4912\n";
+"--src dav.sql:4408\n";
-static const char *proc71 =
-"#line 4943 \"[executable]/dav.sql\"\n"
+static const char *proc67 =
+"#line 4439 \"[executable]/dav.sql\"\n"
"create procedure\n"
"WS.WS.DAV_REMOVE_ASMX (in path any)\n"
"{\n"
@@ -5022,10 +4514,10 @@ static const char *proc71 =
"else\n"
"return path;\n"
"}\n"
-"--src dav.sql:4941\n";
+"--src dav.sql:4437\n";
-static const char *proc72 =
-"#line 4958 \"[executable]/dav.sql\"\n"
+static const char *proc68 =
+"#line 4454 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.XMLSQL_TO_STRSES (\n"
"in _q varchar,\n"
"in _root varchar,\n"
@@ -5071,10 +4563,10 @@ static const char *proc72 =
"\n"
"return;\n"
"}\n"
-"--src dav.sql:4956\n";
+"--src dav.sql:4452\n";
-static const char *proc73 =
-"#line 5005 \"[executable]/dav.sql\"\n"
+static const char *proc69 =
+"#line 4501 \"[executable]/dav.sql\"\n"
"create procedure WS.WS.\"TRACE\" (in path varchar, inout params varchar, in lines varchar)\n"
"{\n"
"http_header (\'Content-Type: message/http\\r\\n\');\n"
@@ -5084,11 +4576,11 @@ static const char *proc73 =
"http (l);\n"
"}\n"
"}\n"
-"--src dav.sql:5003\n";
+"--src dav.sql:4499\n";
/* dav_api.sql */
-static const char *proc74 =
+static const char *proc70 =
"#line 51 \"[executable]/dav_api.sql\"\n"
"create function DAV_PERROR (in x any)\n"
"{\n"
@@ -5148,7 +4640,7 @@ static const char *proc74 =
"}\n"
"--src dav_api.sql:49\n";
-static const char *proc75 =
+static const char *proc71 =
"#line 110 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_ADD_USER_INT (in uid varchar,\n"
@@ -5198,7 +4690,7 @@ static const char *proc75 =
"}\n"
"--src dav_api.sql:108\n";
-static const char *proc76 =
+static const char *proc72 =
"#line 159 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_ADD_USER (in uid varchar, in pwd varchar, in gid varchar,\n"
@@ -5237,7 +4729,7 @@ static const char *proc76 =
"}\n"
"--src dav_api.sql:157\n";
-static const char *proc77 =
+static const char *proc73 =
"#line 197 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_DELETE_USER (in uid varchar, in auth_uname varchar := NULL, in auth_pwd varchar := NULL)\n"
@@ -5255,21 +4747,21 @@ static const char *proc77 =
"}\n"
"--src dav_api.sql:195\n";
-static const char *proc78 =
+static const char *proc74 =
"#line 214 \"[executable]/dav_api.sql\"\n"
" create function DAV_REGEXP_PATTERN_FOR_PERM () returns varchar {\n"
"return \'^[01][01][01][01][01][01][01][01][01]([NTR-]([NMR-])?)?\\044\';\n"
"}\n"
"--src dav_api.sql:212\n";
-static const char *proc79 =
+static const char *proc75 =
"#line 219 \"[executable]/dav_api.sql\"\n"
"create function DAV_REGEXP_PATTERN_FOR_UNIX_PERM () returns varchar {\n"
"return \'^[r\\\\-][w\\\\-][x\\\\-][r\\\\-][w\\\\-][x\\\\-][r\\\\-][w\\\\-][x\\\\-]([NTR-]([NMR-])?)?\\044\';\n"
"}\n"
"--src dav_api.sql:217\n";
-static const char *proc80 =
+static const char *proc76 =
"#line 225 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_PERM_D2U (in perms varchar)\n"
@@ -5290,7 +4782,7 @@ static const char *proc80 =
"}\n"
"--src dav_api.sql:223\n";
-static const char *proc81 =
+static const char *proc77 =
"#line 245 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_PERM_U2D (in perms varchar)\n"
@@ -5314,7 +4806,7 @@ static const char *proc81 =
"}\n"
"--src dav_api.sql:243\n";
-static const char *proc82 =
+static const char *proc78 =
"#line 267 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_CHECK_AUTH (in auth_uname varchar := NULL, in auth_pwd varchar := NULL, in adm integer := 0) returns integer\n"
@@ -5349,7 +4841,7 @@ static const char *proc82 =
"}\n"
"--src dav_api.sql:265\n";
-static const char *proc83 =
+static const char *proc79 =
"#line 301 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_HOME_DIR (in uid varchar) returns any\n"
@@ -5363,7 +4855,7 @@ static const char *proc83 =
"}\n"
"--src dav_api.sql:299\n";
-static const char *proc84 =
+static const char *proc80 =
"#line 313 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_HOME_DIR_CREATE (in uid varchar) returns any\n"
@@ -5393,7 +4885,7 @@ static const char *proc84 =
"if (server_http_port () <> \'80\')\n"
"host := host ||\':\'|| server_http_port ();\n"
"}\n"
-"rc := DAV_PROP_SET_INT (path, \'virt:rdf_graph\', rtrim (\'http://\' || host || path, \'/\') || \'#this\', null, null, 0, 0);\n"
+"rc := DAV_PROP_SET_INT (path, \'virt:rdf_graph\', \'http://\' || host || path, null, null, 0, 0);\n"
"if (isnull (DAV_HIDE_ERROR (rc)))\n"
"goto _end;\n"
"rc := DAV_PROP_SET_INT (path, \'virt:rdf_sponger\', \'on\', null, null, 0, 0);\n"
@@ -5405,7 +4897,7 @@ static const char *proc84 =
"}\n"
"--src dav_api.sql:311\n";
-static const char *proc85 =
+static const char *proc81 =
"#line 353 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_ADD_GROUP_INT (in gid varchar)\n"
@@ -5420,7 +4912,7 @@ static const char *proc85 =
"}\n"
"--src dav_api.sql:351\n";
-static const char *proc86 =
+static const char *proc82 =
"#line 367 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_ADD_GROUP (in gid varchar, in auth_uname varchar := NULL, in auth_pwd varchar := NULL)\n"
@@ -5431,7 +4923,7 @@ static const char *proc86 =
"}\n"
"--src dav_api.sql:365\n";
-static const char *proc87 =
+static const char *proc83 =
"#line 377 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_DELETE_GROUP (in gid varchar, in auth_uname varchar := NULL, in auth_pwd varchar := NULL)\n"
@@ -5447,7 +4939,7 @@ static const char *proc87 =
"}\n"
"--src dav_api.sql:375\n";
-static const char *proc88 =
+static const char *proc84 =
"#line 393 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_DIR_LIST (in path varchar := \'/DAV/\', in recursive integer, in auth_uname varchar, in auth_pwd varchar) returns any\n"
@@ -5461,7 +4953,7 @@ static const char *proc88 =
"}\n"
"--src dav_api.sql:391\n";
-static const char *proc89 =
+static const char *proc85 =
"#line 406 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_DIR_FILTER (in path varchar := \'/DAV/\', in recursive integer := 0, inout filter any, in auth_uname varchar, in auth_pwd varchar) returns any\n"
@@ -5478,7 +4970,7 @@ static const char *proc89 =
"}\n"
"--src dav_api.sql:404\n";
-static const char *proc90 =
+static const char *proc86 =
"#line 422 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_GET_PARENT (in id any, in st char(1), in path varchar) returns any\n"
@@ -5496,7 +4988,7 @@ static const char *proc90 =
"}\n"
"--src dav_api.sql:420\n";
-static const char *proc91 =
+static const char *proc87 =
"#line 439 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_DIR_SINGLE_INT (in did any, in st char (0), in path varchar, in auth_uname varchar := null, in auth_pwd varchar := null, in auth_uid integer := null) returns any\n"
@@ -5542,7 +5034,7 @@ static const char *proc91 =
"}\n"
"--src dav_api.sql:437\n";
-static const char *proc92 =
+static const char *proc88 =
"#line 484 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_DIR_LIST_INT (in path varchar := \'/DAV/\', in rec_depth integer := 0, in name_mask varchar, in auth_uname varchar := null, in auth_pwd varchar := null, inout auth_uid integer := null) returns any\n"
@@ -5665,7 +5157,7 @@ static const char *proc92 =
"}\n"
"--src dav_api.sql:482\n";
-static const char *proc93 =
+static const char *proc89 =
"#line 606 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_DIR_FILTER_INT (in path varchar := \'/DAV/\', in rec_depth integer := 0, in compilation any, in auth_uname varchar := null, in auth_pwd varchar := null, in auth_uid integer := null) returns any\n"
@@ -5817,7 +5309,7 @@ static const char *proc93 =
"}\n"
"--src dav_api.sql:604\n";
-static const char *proc94 =
+static const char *proc90 =
"#line 758 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_SEARCH_PATH (in id any, in what char (1)) returns any\n"
@@ -5852,7 +5344,7 @@ static const char *proc94 =
"}\n"
"--src dav_api.sql:756\n";
-static const char *proc95 =
+static const char *proc91 =
"#line 793 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_SEARCH_ID (in path any, in what char (1)) returns any\n"
@@ -5941,7 +5433,7 @@ static const char *proc95 =
"}\n"
"--src dav_api.sql:791\n";
-static const char *proc96 =
+static const char *proc92 =
"#line 881 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_SEARCH_SOME_ID (in path any, out what char (1)) returns any\n"
@@ -5983,7 +5475,7 @@ static const char *proc96 =
"}\n"
"--src dav_api.sql:879\n";
-static const char *proc97 =
+static const char *proc93 =
"#line 922 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_HIDE_ERROR (in res any, in dflt any := null) returns any\n"
@@ -5996,7 +5488,7 @@ static const char *proc97 =
"}\n"
"--src dav_api.sql:920\n";
-static const char *proc98 =
+static const char *proc94 =
"#line 935 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_HIDE_ERROR_OR_DET (in res any, in dflt_err any := null, in dflt_det any := -33) returns any\n"
@@ -6009,7 +5501,7 @@ static const char *proc98 =
"}\n"
"--src dav_api.sql:933\n";
-static const char *proc99 =
+static const char *proc95 =
"#line 948 \"[executable]/dav_api.sql\"\n"
" create function DAV_CONCAT_PATH (in parts1 any, in parts2 any)\n"
"{\n"
@@ -6072,7 +5564,7 @@ static const char *proc99 =
"}\n"
"--src dav_api.sql:946\n";
-static const char *proc100 =
+static const char *proc96 =
"#line 1010 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_SEARCH_SOME_ID_OR_DET (inout path any, out what char (1), out det_ret varchar, out detcol_id integer, out detcol_path_parts any, out unreached_path_parts any) returns integer\n"
@@ -6099,7 +5591,7 @@ static const char *proc100 =
"}\n"
"--src dav_api.sql:1008\n";
-static const char *proc101 =
+static const char *proc97 =
"#line 1035 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_SEARCH_ID_OR_DET (in path any, in what char (1), out det_ret varchar, out detcol_id integer, out detcol_path_parts any, out unreached_path_parts any) returns integer\n"
@@ -6225,7 +5717,7 @@ static const char *proc101 =
"}\n"
"--src dav_api.sql:1033\n";
-static const char *proc102 =
+static const char *proc98 =
"#line 1160 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_OWNER_ID (in uid any, in gid any, out _uid integer, out _gid integer)\n"
@@ -6255,7 +5747,7 @@ static const char *proc102 =
"}\n"
"--src dav_api.sql:1158\n";
-static const char *proc103 =
+static const char *proc99 =
"#line 1189 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_IS_LOCKED_INT (inout id any, inout type char, in owned_tokens varchar := \'\')\n"
"{\n"
@@ -6322,7 +5814,7 @@ static const char *proc103 =
"}\n"
"--src dav_api.sql:1187\n";
-static const char *proc104 =
+static const char *proc100 =
"#line 1256 \"[executable]/dav_api.sql\"\n"
" create function DAV_IS_LOCKED (in id any, in type char, in owned_tokens any := 1) returns integer\n"
"{\n"
@@ -6337,7 +5829,7 @@ static const char *proc104 =
"}\n"
"--src dav_api.sql:1254\n";
-static const char *proc105 =
+static const char *proc101 =
"#line 1270 \"[executable]/dav_api.sql\"\n"
" create function DAV_LIST_LOCKS (in id any, in type char) returns any\n"
"{\n"
@@ -6345,7 +5837,7 @@ static const char *proc105 =
"}\n"
"--src dav_api.sql:1268\n";
-static const char *proc106 =
+static const char *proc102 =
"#line 1276 \"[executable]/dav_api.sql\"\n"
"create function DAV_LIST_LOCKS_INT (in id any, in type char) returns any\n"
"{\n"
@@ -6369,7 +5861,7 @@ static const char *proc106 =
"}\n"
"--src dav_api.sql:1274\n";
-static const char *proc107 =
+static const char *proc103 =
"#line 1298 \"[executable]/dav_api.sql\"\n"
"create function DAV_LOCK (in path any, in locktype varchar, in scope varchar, in token varchar, in owner_name varchar, in owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid varchar, in auth_pwd varchar) returns any\n"
"{\n"
@@ -6382,7 +5874,7 @@ static const char *proc107 =
"}\n"
"--src dav_api.sql:1296\n";
-static const char *proc108 =
+static const char *proc104 =
"#line 1309 \"[executable]/dav_api.sql\"\n"
"create function DAV_LOCK_INT (in path any, inout id any, inout st char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer) returns any\n"
"{\n"
@@ -6540,7 +6032,7 @@ static const char *proc108 =
"}\n"
"--src dav_api.sql:1307\n";
-static const char *proc109 =
+static const char *proc105 =
"#line 1465 \"[executable]/dav_api.sql\"\n"
"create function DAV_UNLOCK (in path varchar, in token varchar, in auth_uname varchar, in auth_pwd varchar) returns any\n"
"{\n"
@@ -6553,7 +6045,7 @@ static const char *proc109 =
"}\n"
"--src dav_api.sql:1463\n";
-static const char *proc110 =
+static const char *proc106 =
"#line 1477 \"[executable]/dav_api.sql\"\n"
"create function DAV_UNLOCK_INT (in id any, in st char(1), in token varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer) returns any\n"
"{\n"
@@ -6593,7 +6085,7 @@ static const char *proc110 =
"}\n"
"--src dav_api.sql:1475\n";
-static const char *proc111 =
+static const char *proc107 =
"#line 1516 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_REQ_CHARS_TO_BITMASK (in req varchar) returns integer\n"
@@ -6602,12 +6094,12 @@ static const char *proc111 =
"}\n"
"--src dav_api.sql:1514\n";
-static const char *proc112 =
+static const char *proc108 =
"#line 1525 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_AUTHENTICATE (in id any, in what char(1), in req varchar, in a_uname varchar, in a_pwd varchar, in a_uid integer := null) returns integer\n"
"{\n"
-"declare rc, oid, ogid, puid, pgid integer;\n"
+"declare oid, ogid, puid, pgid integer;\n"
"declare opwd, pperms varchar;\n"
"declare pacl varbinary;\n"
"what := upper (what);\n"
@@ -6648,11 +6140,18 @@ static const char *proc112 =
"}\n"
"if (isarray (id))\n"
"{\n"
-"rc := call (cast (id[0] as varchar) || \'_DAV_AUTHENTICATE\') (id, what, req, a_uname, a_pwd, a_uid);\n"
-"if (rc = -20)\n"
-"rc := DAV_AUTHENTICATE (id[1], \'C\', req, a_uname, a_pwd, a_uid);\n"
+"declare detcol_id integer;\n"
"\n"
-"return rc;\n"
+"detcol_id := id[1];\n"
+"select COL_OWNER, COL_GROUP, COL_PERMS, COL_ACL into puid, pgid, pperms, pacl from WS.WS.SYS_DAV_COL where COL_ID = detcol_id;\n"
+"if (not DAV_CHECK_PERM (pperms, req, oid, ogid, pgid, puid))\n"
+"{\n"
+"if (not WS.WS.ACL_IS_GRANTED (pacl, oid, 4))\n"
+"{\n"
+"return -13;\n"
+"}\n"
+"}\n"
+"return call (cast (id[0] as varchar) || \'_DAV_AUTHENTICATE\') (id, what, req, a_uname, a_pwd, a_uid);\n"
"}\n"
"whenever not found goto nf_col_or_res;\n"
"if (what = \'R\')\n"
@@ -6702,8 +6201,8 @@ static const char *proc112 =
"}\n"
"--src dav_api.sql:1523\n";
-static const char *proc113 =
-"#line 1623 \"[executable]/dav_api.sql\"\n"
+static const char *proc109 =
+"#line 1630 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_AUTHENTICATE_HTTP (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -6724,8 +6223,8 @@ static const char *proc113 =
"declare d__perms varchar;\n"
"\n"
"rc := call (cast (id[0] as varchar) || \'_DAV_AUTHENTICATE_HTTP\') (id, what, req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);\n"
-"if (rc = -20)\n"
-"rc := DAV_AUTHENTICATE_HTTP (id[1], \'C\', req, can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, _perms);\n"
+"if (rc >= 0)\n"
+"rc := DAV_AUTHENTICATE_HTTP (id[1], \'C\', \'1__\', can_write_http, a_lines, a_uname, a_pwd, a_uid, a_gid, d__perms);\n"
"\n"
"return rc;\n"
"}\n"
@@ -6815,10 +6314,10 @@ static const char *proc113 =
"\n"
"return -1;\n"
"}\n"
-"--src dav_api.sql:1621\n";
+"--src dav_api.sql:1628\n";
-static const char *proc114 =
-"#line 1736 \"[executable]/dav_api.sql\"\n"
+static const char *proc110 =
+"#line 1743 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_AUTHENTICATE_SSL_ITEM (\n"
"inout id any,\n"
@@ -6839,10 +6338,10 @@ static const char *proc114 =
"id := DAV_SEARCH_ID (path, what);\n"
"}\n"
"}\n"
-"--src dav_api.sql:1734\n";
+"--src dav_api.sql:1741\n";
-static const char *proc115 =
-"#line 1758 \"[executable]/dav_api.sql\"\n"
+static const char *proc111 =
+"#line 1765 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_AUTHENTICATE_SSL_CONDITION () returns integer\n"
"{\n"
@@ -6851,51 +6350,100 @@ static const char *proc115 =
"\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:1756\n";
-
-static const char *proc116 =
-"#line 1770 \"[executable]/dav_api.sql\"\n"
-"create function DAV_WEBID_QR (in gr varchar, in uri varchar)\n"
-"{\n"
-"return sprintf (\'sparql \n"
-"define input:storage \"\" \n"
-"define input:same-as \"yes\"\n"
-"prefix cert: <http://www.w3.org/ns/auth/cert#> \n"
-"prefix rsa: <http://www.w3.org/ns/auth/rsa#> \n"
-"select (str (?exp)) (str (?mod)) \n"
-"from <%S> \n"
-"where \n"
-"{ \n"
-"{ ?id cert:identity <%S> ; rsa:public_exponent ?exp ; rsa:modulus ?mod . } \n"
-"union \n"
-"{ ?id cert:identity <%S> ; rsa:public_exponent ?exp1 ; rsa:modulus ?mod1 . ?exp1 cert:decimal ?exp . ?mod1 cert:hex ?mod . } \n"
-"union \n"
-"{ <%S> cert:key ?key . ?key cert:exponent ?exp . ?key cert:modulus ?mod . } \n"
-"}\', gr, uri, uri, uri);\n"
-"}\n"
-"--src dav_api.sql:1768\n";
+"--src dav_api.sql:1763\n";
-static const char *proc117 =
-"#line 1791 \"[executable]/dav_api.sql\"\n"
+static const char *proc112 =
+"#line 1775 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_AUTHENTICATE_SSL_WEBID ()\n"
"{\n"
-"declare webid varchar;\n"
-"declare cert, dummy, vtype any;\n"
+"declare retIRI varchar;\n"
+"declare graph, baseGraph, foafIRI, foafGraph, loadIRI, localIRI any;\n"
+"declare S, V, info, st, msg, data, meta any;\n"
+"\n"
+"retIRI := null;\n"
"\n"
-"webid := null;\n"
-"if (__proc_exists (\'DB.DBA.WEBID_AUTH_GEN_2\') is not null)\n"
+"set_user_id (\'dba\');\n"
+"foafIRI := trim (get_certificate_info (7, null, null, null, \'2.5.29.17\'));\n"
+"V := regexp_replace (foafIRI, \',[ ]*\', \',\', 1, null);\n"
+"V := split_and_decode (V, 0, \'\\0\\0,:\');\n"
+"if (V is null)\n"
+"V := vector ();\n"
+"foafIRI := get_keyword (\'URI\', V);\n"
+"if (isnull (foafIRI))\n"
+"{\n"
+"if (__proc_exists (\'DB.DBA.FOAF_SSL_WEBFINGER\') is not null)\n"
+"{\n"
+"retIRI := DB.DBA.FOAF_SSL_WEBFINGER ();\n"
+"if (not isnull (retIRI))\n"
+"goto _exit;\n"
+"}\n"
+"if (__proc_exists (\'ODS.DBA.FINGERPOINT_WEBID_GET\') is not null)\n"
+"{\n"
+"retIRI := ODS.DBA.FINGERPOINT_WEBID_GET ();\n"
+"if (not isnull (retIRI))\n"
+"goto _exit;\n"
+"}\n"
+"} else {\n"
+"foafGraph := \'http://local.virt/FOAF/\' || cast (rnd (1000) as varchar);\n"
+"localIRI := foafIRI;\n"
+"V := rfc1808_parse_uri (localIRI);\n"
+"if (is_https_ctx () and\n"
+"virtuoso_ini_item_value (\'URIQA\', \'DynamicLocal\') = \'1\' and\n"
+"V[1] = registry_get (\'URIQADefaultHost\'))\n"
+"{\n"
+"V [0] := \'local\';\n"
+"V [1] := \'\';\n"
+"localIRI := db.dba.vspx_uri_compose (V);\n"
+"}\n"
+"V := rfc1808_parse_uri (foafIRI);\n"
+"V[5] := \'\';\n"
+"loadIRI := DB.DBA.vspx_uri_compose (V);\n"
+"S := sprintf (\'sparql load <%s> into graph <%s>\', loadIRI, foafGraph);\n"
+"st := \'00000\';\n"
+"exec (S, st, msg, vector (), 0);\n"
+"if (st = \'00000\')\n"
+"{\n"
+"S := sprintf (\' sparql define input:storage \"\" \' ||\n"
+"\' prefix cert: <http://www.w3.org/ns/auth/cert#> \' ||\n"
+"\' prefix rsa: <http://www.w3.org/ns/auth/rsa#> \' ||\n"
+"\' select (str (bif:coalesce (?exp_val, ?exp))) \' ||\n"
+"\' (str (bif:coalesce (?mod_val, ?mod))) \' ||\n"
+"\' from <%s> \' ||\n"
+"\' where { \' ||\n"
+"\' ?id cert:identity <%s> ; \' ||\n"
+"\' rsa:public_exponent ?exp ; \' ||\n"
+"\' rsa:modulus ?mod . \' ||\n"
+"\' optional { ?exp cert:decimal ?exp_val . \' ||\n"
+"\' ?mod cert:hex ?mod_val . } \' ||\n"
+"\' }\',\n"
+"foafGraph,\n"
+"localIRI);\n"
+"exec (S, st, msg, vector (), 0, meta, data);\n"
+"if (st = \'00000\')\n"
+"{\n"
+"info := get_certificate_info (9);\n"
+"foreach (any _row in data) do\n"
"{\n"
-"cert := client_attr (\'client_certificate\');\n"
-"dummy := null;\n"
-"DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 0, webid, dummy, 0, vtype);\n"
+"if (_row[0] = cast (info[1] as varchar) and\n"
+"lower (regexp_replace (_row[1], \'[^A-Z0-9a-f]\', \'\', 1, null)) = bin2hex (info[2]))\n"
+"{\n"
+"retIRI := foafIRI;\n"
+"goto _break;\n"
+"}\n"
+"}\n"
+"}\n"
"}\n"
-"return webid;\n"
+"_break:;\n"
+"SPARQL clear graph ?:foafGraph;\n"
"}\n"
-"--src dav_api.sql:1789\n";
+"_exit:\n"
+"return retIRI;\n"
+"}\n"
+"--src dav_api.sql:1773\n";
-static const char *proc118 =
-"#line 1808 \"[executable]/dav_api.sql\"\n"
+static const char *proc113 =
+"#line 1863 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_AUTHENTICATE_SSL (\n"
"in id any,\n"
@@ -6942,11 +6490,9 @@ static const char *proc118 =
"{\n"
"tmp := null;\n"
"if (isnull (foafIRI))\n"
-"{\n"
-"foafIRI := DB.DBA.DAV_AUTHENTICATE_SSL_WEBID ();\n"
+"foafIRI := DAV_AUTHENTICATE_SSL_WEBID ();\n"
"if (isnull (foafIRI))\n"
"goto _exit;\n"
-"}\n"
"graph := WS.WS.DAV_IRI (V[N]);\n"
"for (\n"
"sparql\n"
@@ -7041,10 +6587,10 @@ static const char *proc118 =
"\n"
"return rc;\n"
"}\n"
-"--src dav_api.sql:1806\n";
+"--src dav_api.sql:1861\n";
-static const char *proc119 =
-"#line 1957 \"[executable]/dav_api.sql\"\n"
+static const char *proc114 =
+"#line 2010 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_COL_CREATE (\n"
"in path varchar,\n"
@@ -7057,10 +6603,10 @@ static const char *proc119 =
"return DAV_COL_CREATE_INT (\n"
"path, permissions, uid, gid, auth_uid, auth_pwd, 1, 1, 1, null, null);\n"
"}\n"
-"--src dav_api.sql:1955\n";
+"--src dav_api.sql:2008\n";
-static const char *proc120 =
-"#line 1972 \"[executable]/dav_api.sql\"\n"
+static const char *proc115 =
+"#line 2025 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_COL_CREATE_INT (\n"
"in path varchar,\n"
@@ -7148,10 +6694,10 @@ static const char *proc120 =
"}\n"
"return rc;\n"
"}\n"
-"--src dav_api.sql:1970\n";
+"--src dav_api.sql:2023\n";
-static const char *proc121 =
-"#line 2062 \"[executable]/dav_api.sql\"\n"
+static const char *proc116 =
+"#line 2115 \"[executable]/dav_api.sql\"\n"
"create procedure DB.DBA.IS_REDIRECT_REF (inout path any)\n"
"{\n"
"for (select blob_to_string (PROP_VALUE) redirectRef\n"
@@ -7168,10 +6714,10 @@ static const char *proc121 =
"\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:2060\n";
+"--src dav_api.sql:2113\n";
-static const char *proc122 =
-"#line 2082 \"[executable]/dav_api.sql\"\n"
+static const char *proc117 =
+"#line 2135 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_RES_UPLOAD (\n"
"in path varchar,\n"
@@ -7186,10 +6732,10 @@ static const char *proc122 =
"check_locks := 1;\n"
"return (DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, uid, gid, auth_uid, auth_pwd, 1, null, null, null, null, null, check_locks));\n"
"}\n"
-"--src dav_api.sql:2080\n";
+"--src dav_api.sql:2133\n";
-static const char *proc123 =
-"#line 2099 \"[executable]/dav_api.sql\"\n"
+static const char *proc118 =
+"#line 2152 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_RES_UPLOAD_STRSES (\n"
"in path varchar,\n"
@@ -7204,10 +6750,10 @@ static const char *proc123 =
"check_locks := 1;\n"
"return (DAV_RES_UPLOAD_STRSES_INT (path, content, type, permissions, uid, gid, auth_uid, auth_pwd, 1, null, null, null, null, null, check_locks));\n"
"}\n"
-"--src dav_api.sql:2097\n";
+"--src dav_api.sql:2150\n";
-static const char *proc124 =
-"#line 2116 \"[executable]/dav_api.sql\"\n"
+static const char *proc119 =
+"#line 2169 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_RES_UPLOAD_STRSES_INT (\n"
"in path varchar,\n"
@@ -7236,14 +6782,14 @@ static const char *proc124 =
"log_enable (bit_or (old_log_mode, 4), 1);\n"
"return rc;\n"
"}\n"
-"--src dav_api.sql:2114\n";
+"--src dav_api.sql:2167\n";
static const char *tbl0 =
"create table RDF_SINK_QUEUE (RSQ_PATH varchar, RSQ_ID int, RSQ_C_ID int, RSQ_GRAPH varchar, RSQ_STATE int, RSQ_TS timestamp, RSQ_TYPE varchar, RSQ_UID int, RSQ_GID int, primary key (RSQ_ID))\n"
"create index RDF_SINK_QUEUE_STAT on RDF_SINK_QUEUE (RSQ_STATE, RSQ_TS) \n";
-static const char *proc125 =
-"#line 2151 \"[executable]/dav_api.sql\"\n"
+static const char *proc120 =
+"#line 2204 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_RES_UPLOAD_STRSES_INT_INNER (\n"
"in path varchar,\n"
@@ -7561,10 +7107,10 @@ static const char *proc125 =
"return -43;\n"
"return -29;\n"
"}\n"
-"--src dav_api.sql:2149\n";
+"--src dav_api.sql:2202\n";
-static const char *proc126 =
-"#line 2470 \"[executable]/dav_api.sql\"\n"
+static const char *proc121 =
+"#line 2523 \"[executable]/dav_api.sql\"\n"
"create procedure RDF_SINK_AQ_GET ()\n"
"{\n"
"declare arr any;\n"
@@ -7578,10 +7124,10 @@ static const char *proc126 =
"commit work;\n"
"return arr;\n"
"}\n"
-"--src dav_api.sql:2468\n";
+"--src dav_api.sql:2521\n";
-static const char *proc127 =
-"#line 2485 \"[executable]/dav_api.sql\"\n"
+static const char *proc122 =
+"#line 2538 \"[executable]/dav_api.sql\"\n"
"create procedure DB.DBA.RDF_SINK_AQ_RUN ()\n"
"{\n"
"declare aq, arr any;\n"
@@ -7602,18 +7148,10 @@ static const char *proc127 =
"commit work;\n"
"}\n"
"}\n"
-"--src dav_api.sql:2483\n";
-
-static const char *proc128 =
-"#line 2507 \"[executable]/dav_api.sql\"\n"
-"create procedure DAV_RDF_RES_NAME (in rdf_graph varchar)\n"
-"{\n"
-"return replace ( replace ( replace ( replace ( replace ( replace ( replace (rdf_graph, \'/\', \'_\'), \'\\\\\', \'_\'), \':\', \'_\'), \'+\', \'_\'), \'\\\"\', \'_\'), \'[\', \'_\'), \']\', \'_\') || \'.RDF\';\n"
-"}\n"
-"--src dav_api.sql:2505\n";
+"--src dav_api.sql:2536\n";
-static const char *proc129 =
-"#line 2513 \"[executable]/dav_api.sql\"\n"
+static const char *proc123 =
+"#line 2560 \"[executable]/dav_api.sql\"\n"
"create procedure RDF_SINK_FUNC (in path varchar, in rc int, in c_id int, in rdf_graph any, in type any, in ouid int, in ogid int)\n"
"{\n"
"declare rdf_sponger, rdf_cartridges, rdf_metaCartridges any;\n"
@@ -7631,7 +7169,7 @@ static const char *proc129 =
"\n"
"if (RDF_SINK_UPLOAD (path, content, type, rdf_graph, rdf_sponger, rdf_cartridges, rdf_metaCartridges))\n"
"{\n"
-"rdf_graph_resource_name := DAV_RDF_RES_NAME (rdf_graph);\n"
+"rdf_graph_resource_name := replace ( replace ( replace ( replace ( replace ( replace ( replace (rdf_graph, \'/\', \'_\'), \'\\\\\', \'_\'), \':\', \'_\'), \'+\', \'_\'), \'\\\"\', \'_\'), \'[\', \'_\'), \']\', \'_\') || \'.RDF\';\n"
"rdf_graph_resource_name := replace (rdf_graph_resource_name, \' \', \'_\');\n"
"rdf_graph_resource_path := WS.WS.COL_PATH (c_id) || rdf_graph_resource_name;\n"
"if (isnull (DAV_HIDE_ERROR (DAV_SEARCH_ID (rdf_graph_resource_path, \'R\'))))\n"
@@ -7655,10 +7193,10 @@ static const char *proc129 =
"update RDF_SINK_QUEUE set RSQ_STATE = 2 where RSQ_ID = rc;\n"
"commit work;\n"
"}\n"
-"--src dav_api.sql:2511\n";
+"--src dav_api.sql:2558\n";
-static const char *proc130 =
-"#line 2556 \"[executable]/dav_api.sql\"\n"
+static const char *proc124 =
+"#line 2603 \"[executable]/dav_api.sql\"\n"
"create procedure RDF_SINK_UPLOAD (\n"
"in path varchar, \n"
"inout _content any,\n"
@@ -7746,7 +7284,6 @@ static const char *proc130 =
"goto _exit;\n"
"}\n"
"if (\n"
-"strstr (type, \'text/n3\') is not null or\n"
"strstr (type, \'text/rdf+n3\') is not null or\n"
"strstr (type, \'text/rdf+ttl\') is not null or\n"
"strstr (type, \'application/rdf+n3\') is not null or\n"
@@ -7789,10 +7326,10 @@ static const char *proc130 =
"SPARQL insert in graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };\n"
"return 1;\n"
"}\n"
-"--src dav_api.sql:2554\n";
+"--src dav_api.sql:2601\n";
-static const char *proc131 =
-"#line 2688 \"[executable]/dav_api.sql\"\n"
+static const char *proc125 =
+"#line 2734 \"[executable]/dav_api.sql\"\n"
"create procedure RDF_SINK_UPLOAD_CARTRIDGES (\n"
"inout content any,\n"
"inout type varchar,\n"
@@ -7813,15 +7350,19 @@ static const char *proc131 =
"return 0;\n"
"\n"
"cartridges := split_and_decode (rdf_cartridges, 0, \'\\0\\0,\');\n"
+"hasSelection := length (cartridges);\n"
"ps := null;\n"
"aq := null;\n"
"foreach (any row in rows) do\n"
"{\n"
"cname := cast (row[0] as varchar);\n"
+"if (hasSelection)\n"
+"{\n"
"if (position (cname, cartridges))\n"
"goto _try;\n"
"\n"
"goto _try_next;\n"
+"}\n"
"\n"
"_try:\n"
"val_match := case when (row[2] = \'MIME\') then type else rdf_graph end;\n"
@@ -7846,10 +7387,10 @@ static const char *proc131 =
"}\n"
"return 1;\n"
"}\n"
-"--src dav_api.sql:2686\n";
+"--src dav_api.sql:2732\n";
-static const char *proc132 =
-"#line 2743 \"[executable]/dav_api.sql\"\n"
+static const char *proc126 =
+"#line 2793 \"[executable]/dav_api.sql\"\n"
"create procedure RDF_SINK_DELETE (\n"
"in path any)\n"
"{\n"
@@ -7885,10 +7426,10 @@ static const char *proc132 =
"SPARQL delete from graph ?:rdf_graph { ?s ?p ?o } where { graph `iri(?:rdf_graph2)` { ?s ?p ?o } };\n"
"SPARQL clear graph ?:rdf_graph2;\n"
"}\n"
-"--src dav_api.sql:2741\n";
+"--src dav_api.sql:2791\n";
-static const char *proc133 =
-"#line 2781 \"[executable]/dav_api.sql\"\n"
+static const char *proc127 =
+"#line 2831 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_DELETE (\n"
"in path varchar,\n"
@@ -7899,10 +7440,10 @@ static const char *proc133 =
"{\n"
"return DAV_DELETE_INT (path, silent, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:2779\n";
+"--src dav_api.sql:2829\n";
-static const char *proc134 =
-"#line 2793 \"[executable]/dav_api.sql\"\n"
+static const char *proc128 =
+"#line 2843 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_DELETE_INT (\n"
"in path varchar,\n"
@@ -7986,10 +7527,10 @@ static const char *proc134 =
"disabled_home:\n"
"return -43;\n"
"}\n"
-"--src dav_api.sql:2791\n";
+"--src dav_api.sql:2841\n";
-static const char *proc135 =
-"#line 2879 \"[executable]/dav_api.sql\"\n"
+static const char *proc129 =
+"#line 2929 \"[executable]/dav_api.sql\"\n"
"create function DAV_TAG_LIST (in id any, in st char (1), in uid_list any) returns any\n"
"{\n"
"if (isarray (id))\n"
@@ -8006,10 +7547,10 @@ static const char *proc135 =
"else\n"
"return (select VECTOR_AGG (vector (DT_U_ID, DT_TAGS)) from Ws.WS.SYS_DAV_TAG where DT_RES_ID = id and position (DT_U_ID, uid_list));\n"
"}\n"
-"--src dav_api.sql:2877\n";
+"--src dav_api.sql:2927\n";
-static const char *proc136 =
-"#line 2897 \"[executable]/dav_api.sql\"\n"
+static const char *proc130 =
+"#line 2947 \"[executable]/dav_api.sql\"\n"
"create function DAV_TAG_SET (in id any, in st char (1), in uid integer, in tags varchar) returns integer\n"
"{\n"
"if (not exists (select 1 from WS.WS.SYS_DAV_USER where U_ID = uid))\n"
@@ -8027,10 +7568,10 @@ static const char *proc136 =
"}\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:2895\n";
+"--src dav_api.sql:2945\n";
-static const char *proc137 =
-"#line 2918 \"[executable]/dav_api.sql\"\n"
+static const char *proc131 =
+"#line 2968 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_COPY (in path varchar,\n"
"in destination varchar,\n"
@@ -8043,10 +7584,10 @@ static const char *proc137 =
"{\n"
"return DAV_COPY_INT (path, destination, overwrite, permissions, uid, gid, auth_uname, auth_pwd, 1);\n"
"}\n"
-"--src dav_api.sql:2916\n";
+"--src dav_api.sql:2966\n";
-static const char *proc138 =
-"#line 2933 \"[executable]/dav_api.sql\"\n"
+static const char *proc132 =
+"#line 2983 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_COPY_INT (in path varchar,\n"
"in destination varchar,\n"
@@ -8309,10 +7850,10 @@ static const char *proc138 =
"disabled_home:\n"
"return -43;\n"
"}\n"
-"--src dav_api.sql:2931\n";
+"--src dav_api.sql:2981\n";
-static const char *proc139 =
-"#line 3199 \"[executable]/dav_api.sql\"\n"
+static const char *proc133 =
+"#line 3249 \"[executable]/dav_api.sql\"\n"
"create function DAV_COPY_SUBTREE (in src any, in dst any, in sar any,\n"
"in dar any, in overwrite integer,\n"
"in ouid integer := null, in ogid integer := null,\n"
@@ -8372,10 +7913,10 @@ static const char *proc139 =
"vectorbld_final (ret);\n"
"return ret;\n"
"}\n"
-"--src dav_api.sql:3197\n";
+"--src dav_api.sql:3247\n";
-static const char *proc140 =
-"#line 3262 \"[executable]/dav_api.sql\"\n"
+static const char *proc134 =
+"#line 3312 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_MOVE (in path varchar,\n"
"in destination varchar,\n"
@@ -8385,10 +7926,10 @@ static const char *proc140 =
"{\n"
"return DAV_MOVE_INT (path, destination, overwrite, auth_uname, auth_pwd, 1);\n"
"}\n"
-"--src dav_api.sql:3260\n";
+"--src dav_api.sql:3310\n";
-static const char *proc141 =
-"#line 3274 \"[executable]/dav_api.sql\"\n"
+static const char *proc135 =
+"#line 3324 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_MOVE_INT (in path varchar,\n"
"in destination varchar,\n"
@@ -8633,10 +8174,10 @@ static const char *proc141 =
"disabled_home:\n"
"return -43;\n"
"}\n"
-"--src dav_api.sql:3272\n";
+"--src dav_api.sql:3322\n";
-static const char *proc142 =
-"#line 3521 \"[executable]/dav_api.sql\"\n"
+static const char *proc136 =
+"#line 3571 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_GET_OWNER (in id any, in st char(1)) returns integer\n"
"{\n"
@@ -8654,10 +8195,10 @@ static const char *proc142 =
"return coalesce ((select RES_OWNER from WS.WS.SYS_DAV_RES where RES_ID = id), -1);\n"
"return -14;\n"
"}\n"
-"--src dav_api.sql:3519\n";
+"--src dav_api.sql:3569\n";
-static const char *proc143 =
-"#line 3541 \"[executable]/dav_api.sql\"\n"
+static const char *proc137 =
+"#line 3591 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_PREPARE_PROP_WRITE (\n"
"in path varchar,\n"
@@ -8736,10 +8277,10 @@ static const char *proc143 =
"}\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:3539\n";
+"--src dav_api.sql:3589\n";
-static const char *proc144 =
-"#line 3623 \"[executable]/dav_api.sql\"\n"
+static const char *proc138 =
+"#line 3673 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_PROP_SET (\n"
"in path varchar,\n"
@@ -8751,10 +8292,10 @@ static const char *proc144 =
"{\n"
"return DAV_PROP_SET_INT (path, propname, propvalue, auth_uname, auth_pwd, 1, 1, overwrite);\n"
"}\n"
-"--src dav_api.sql:3621\n";
+"--src dav_api.sql:3671\n";
-static const char *proc145 =
-"#line 3636 \"[executable]/dav_api.sql\"\n"
+static const char *proc139 =
+"#line 3686 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_PROP_SET_INT (\n"
"in path varchar,\n"
@@ -8784,10 +8325,10 @@ static const char *proc145 =
"}\n"
"return DAV_PROP_SET_RAW (id, st, propname, propvalue, overwrite, auth_uid, locked, auto_version);\n"
"}\n"
-"--src dav_api.sql:3634\n";
+"--src dav_api.sql:3684\n";
-static const char *proc146 =
-"#line 3668 \"[executable]/dav_api.sql\"\n"
+static const char *proc140 =
+"#line 3718 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_PROP_SET_RAW (\n"
"inout id integer,\n"
@@ -8809,10 +8350,10 @@ static const char *proc146 =
"log_enable (bit_or (old_log_mode, 4), 1);\n"
"return rc;\n"
"}\n"
-"--src dav_api.sql:3666\n";
+"--src dav_api.sql:3716\n";
-static const char *proc147 =
-"#line 3691 \"[executable]/dav_api.sql\"\n"
+static const char *proc141 =
+"#line 3741 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_PROP_SET_RAW_INNER (\n"
"inout id integer,\n"
@@ -9018,10 +8559,10 @@ static const char *proc147 =
"}\n"
"return pid;\n"
"}\n"
-"--src dav_api.sql:3689\n";
+"--src dav_api.sql:3739\n";
-static const char *proc148 =
-"#line 3900 \"[executable]/dav_api.sql\"\n"
+static const char *proc142 =
+"#line 3950 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_PROP_REMOVE (\n"
"in path varchar,\n"
@@ -9031,10 +8572,10 @@ static const char *proc148 =
"{\n"
"return DAV_PROP_REMOVE_INT (path, propname, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:3898\n";
+"--src dav_api.sql:3948\n";
-static const char *proc149 =
-"#line 3912 \"[executable]/dav_api.sql\"\n"
+static const char *proc143 =
+"#line 3962 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_PROP_REMOVE_INT (\n"
"in path varchar,\n"
@@ -9063,10 +8604,10 @@ static const char *proc149 =
"}\n"
"return DAV_PROP_REMOVE_RAW (id, st, propname, ignore_if_missing, auth_uid, locked, auto_version);\n"
"}\n"
-"--src dav_api.sql:3910\n";
+"--src dav_api.sql:3960\n";
-static const char *proc150 =
-"#line 3943 \"[executable]/dav_api.sql\"\n"
+static const char *proc144 =
+"#line 3993 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_PROP_REMOVE_RAW (\n"
"inout id integer,\n"
@@ -9154,10 +8695,10 @@ static const char *proc150 =
"else\n"
"return -11;\n"
"}\n"
-"--src dav_api.sql:3941\n";
+"--src dav_api.sql:3991\n";
-static const char *proc151 =
-"#line 4034 \"[executable]/dav_api.sql\"\n"
+static const char *proc145 =
+"#line 4084 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_PROP_GET (\n"
"in path varchar,\n"
@@ -9172,10 +8713,10 @@ static const char *proc151 =
"st := \'R\';\n"
"return DAV_PROP_GET_INT (DAV_SEARCH_ID (path, st), st, propname, 1, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:4032\n";
+"--src dav_api.sql:4082\n";
-static const char *proc152 =
-"#line 4051 \"[executable]/dav_api.sql\"\n"
+static const char *proc146 =
+"#line 4101 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_PROP_GET_INT (\n"
"in id any,\n"
@@ -9378,10 +8919,10 @@ static const char *proc152 =
"no_prop:\n"
"return -11;\n"
"}\n"
-"--src dav_api.sql:4049\n";
+"--src dav_api.sql:4099\n";
-static const char *proc153 =
-"#line 4257 \"[executable]/dav_api.sql\"\n"
+static const char *proc147 =
+"#line 4307 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_PROP_LIST (\n"
"in path varchar,\n"
@@ -9396,10 +8937,10 @@ static const char *proc153 =
"st := \'R\';\n"
"return DAV_PROP_LIST_INT (DAV_SEARCH_ID (path, st), st, propmask, 1, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:4255\n";
+"--src dav_api.sql:4305\n";
-static const char *proc154 =
-"#line 4273 \"[executable]/dav_api.sql\"\n"
+static const char *proc148 =
+"#line 4323 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_PROP_LIST_INT (\n"
"in id any,\n"
@@ -9436,10 +8977,10 @@ static const char *proc154 =
"}\n"
"return ret;\n"
"}\n"
-"--src dav_api.sql:4271\n";
+"--src dav_api.sql:4321\n";
-static const char *proc155 =
-"#line 4312 \"[executable]/dav_api.sql\"\n"
+static const char *proc149 =
+"#line 4362 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_MAKE_DIR (in path any, in own integer, in grp integer, in perms varchar)\n"
"{\n"
@@ -9476,10 +9017,10 @@ static const char *proc155 =
"}\n"
"return col;\n"
"}\n"
-"--src dav_api.sql:4310\n";
+"--src dav_api.sql:4360\n";
-static const char *proc156 =
-"#line 4350 \"[executable]/dav_api.sql\"\n"
+static const char *proc150 =
+"#line 4400 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_CHECK_PERM (in perm varchar, in req varchar, in oid integer,\n"
"in ogid integer, in pgid integer, in puid integer)\n"
"{\n"
@@ -9497,10 +9038,10 @@ static const char *proc156 =
"\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:4348\n";
+"--src dav_api.sql:4398\n";
-static const char *proc157 =
-"#line 4371 \"[executable]/dav_api.sql\"\n"
+static const char *proc151 =
+"#line 4421 \"[executable]/dav_api.sql\"\n"
" create procedure DAV_CHECK_USER (in uname varchar, in pwd any := null)\n"
"{\n"
"declare rc int;\n"
@@ -9520,10 +9061,10 @@ static const char *proc157 =
"}\n"
"return rc;\n"
"}\n"
-"--src dav_api.sql:4369\n";
+"--src dav_api.sql:4419\n";
-static const char *proc158 =
-"#line 4394 \"[executable]/dav_api.sql\"\n"
+static const char *proc152 =
+"#line 4444 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_RES_CONTENT (\n"
"in path varchar,\n"
@@ -9533,10 +9074,10 @@ static const char *proc158 =
"{\n"
"return DAV_RES_CONTENT_INT (DAV_SEARCH_ID (path, \'R\'), content, type, 0, 1, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:4392\n";
+"--src dav_api.sql:4442\n";
-static const char *proc159 =
-"#line 4407 \"[executable]/dav_api.sql\"\n"
+static const char *proc153 =
+"#line 4457 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_RES_CONTENT_STRSES (\n"
"in path varchar,\n"
@@ -9546,10 +9087,10 @@ static const char *proc159 =
"{\n"
"return DAV_RES_CONTENT_INT (DAV_SEARCH_ID (path, \'R\'), content, type, 1, 1, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:4405\n";
+"--src dav_api.sql:4455\n";
-static const char *proc160 =
-"#line 4418 \"[executable]/dav_api.sql\"\n"
+static const char *proc154 =
+"#line 4468 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_RES_CONTENT_INT (\n"
"in id any,\n"
@@ -9599,10 +9140,10 @@ static const char *proc160 =
"}\n"
"return rc;\n"
"}\n"
-"--src dav_api.sql:4416\n";
+"--src dav_api.sql:4466\n";
-static const char *proc161 =
-"#line 4469 \"[executable]/dav_api.sql\"\n"
+static const char *proc155 =
+"#line 4519 \"[executable]/dav_api.sql\"\n"
"create function DAV_COL_IS_ANCESTOR_OF (in a_id integer, in d_id integer) returns integer\n"
"{\n"
"declare p_id integer;\n"
@@ -9618,10 +9159,10 @@ static const char *proc161 =
"d_id := p_id;\n"
"goto again;\n"
"}\n"
-"--src dav_api.sql:4467\n";
+"--src dav_api.sql:4517\n";
-static const char *proc162 =
-"#line 4486 \"[executable]/dav_api.sql\"\n"
+static const char *proc156 =
+"#line 4536 \"[executable]/dav_api.sql\"\n"
"create function DAV_COL_PATH_BOUNDARY (in path varchar) returns varchar\n"
"{\n"
"declare res varchar;\n"
@@ -9633,10 +9174,10 @@ static const char *proc162 =
"res := res || \'\\377\\377\\377\\377\';\n"
"return res;\n"
"}\n"
-"--src dav_api.sql:4484\n";
+"--src dav_api.sql:4534\n";
static const char *trig7 =
-"#line 4501 \"[executable]/dav_api.sql\"\n"
+"#line 4551 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_COL_WAC_U after update on WS.WS.SYS_DAV_COL order 100 referencing new as N, old as O\n"
"{\n"
"declare aciContent, oldPath, newPath, update_acl any;\n"
@@ -9658,10 +9199,10 @@ static const char *trig7 =
"WS.WS.WAC_DELETE (oldPath, update_acl);\n"
"WS.WS.WAC_INSERT (newPath, aciContent, N.COL_OWNER, N.COL_GROUP, update_acl);\n"
"}\n"
-"--src dav_api.sql:4499\n";
+"--src dav_api.sql:4549\n";
static const char *trig8 =
-"#line 4524 \"[executable]/dav_api.sql\"\n"
+"#line 4574 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_COL_WAC_D after delete on WS.WS.SYS_DAV_COL order 100 referencing old as O\n"
"{\n"
"declare update_acl integer;\n"
@@ -9675,10 +9216,10 @@ static const char *trig8 =
"\n"
"WS.WS.WAC_DELETE (path, update_acl);\n"
"}\n"
-"--src dav_api.sql:4522\n";
+"--src dav_api.sql:4572\n";
static const char *trig9 =
-"#line 4539 \"[executable]/dav_api.sql\"\n"
+"#line 4589 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_RES_WAC_U after update on WS.WS.SYS_DAV_RES order 100 referencing new as N, old as O\n"
"{\n"
"declare aciContent, oldPath, newPath, update_acl any;\n"
@@ -9713,10 +9254,10 @@ static const char *trig9 =
"WS.WS.WAC_DELETE (oldPath, update_acl);\n"
"WS.WS.WAC_INSERT (newPath, aciContent, N.RES_OWNER, N.RES_GROUP, update_acl);\n"
"}\n"
-"--src dav_api.sql:4537\n";
+"--src dav_api.sql:4587\n";
static const char *trig10 =
-"#line 4575 \"[executable]/dav_api.sql\"\n"
+"#line 4625 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_RES_WAC_D after delete on WS.WS.SYS_DAV_RES order 100 referencing old as O\n"
"{\n"
"declare update_acl int;\n"
@@ -9735,10 +9276,10 @@ static const char *trig10 =
"}\n"
"WS.WS.WAC_DELETE (path, update_acl);\n"
"}\n"
-"--src dav_api.sql:4573\n";
+"--src dav_api.sql:4623\n";
static const char *trig11 =
-"#line 4595 \"[executable]/dav_api.sql\"\n"
+"#line 4645 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_PROP_WAC_I after insert on WS.WS.SYS_DAV_PROP order 100 referencing new as N\n"
"{\n"
"if (N.PROP_NAME <> \'virt:aci_meta_n3\')\n"
@@ -9761,10 +9302,10 @@ static const char *trig11 =
"}\n"
"WS.WS.WAC_INSERT (_path, N.PROP_VALUE, _owner, _group, 1);\n"
"}\n"
-"--src dav_api.sql:4593\n";
+"--src dav_api.sql:4643\n";
static const char *trig12 =
-"#line 4619 \"[executable]/dav_api.sql\"\n"
+"#line 4669 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_PROP_WAC_U after update (PROP_NAME, PROP_VALUE) on WS.WS.SYS_DAV_PROP order 100 referencing new as N, old as O\n"
"{\n"
"if (N.PROP_NAME <> \'virt:aci_meta_n3\')\n"
@@ -9788,10 +9329,10 @@ static const char *trig12 =
"WS.WS.WAC_DELETE (_path, 1);\n"
"WS.WS.WAC_INSERT (_path, N.PROP_VALUE, _owner, _group, 1);\n"
"}\n"
-"--src dav_api.sql:4617\n";
+"--src dav_api.sql:4667\n";
static const char *trig13 =
-"#line 4644 \"[executable]/dav_api.sql\"\n"
+"#line 4694 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_PROP_WAC_D after delete on WS.WS.SYS_DAV_PROP order 100 referencing old as O\n"
"{\n"
"if (O.PROP_NAME <> \'virt:aci_meta_n3\')\n"
@@ -9814,10 +9355,10 @@ static const char *trig13 =
"}\n"
"WS.WS.WAC_DELETE (_path, 1);\n"
"}\n"
-"--src dav_api.sql:4642\n";
+"--src dav_api.sql:4692\n";
-static const char *proc163 =
-"#line 4668 \"[executable]/dav_api.sql\"\n"
+static const char *proc157 =
+"#line 4718 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.WAC_INSERT (\n"
"in path varchar,\n"
"in aciContent any,\n"
@@ -9838,10 +9379,10 @@ static const char *proc163 =
"}\n"
"DB.DBA.TTLP (aciContent, graph, graph);\n"
"}\n"
-"--src dav_api.sql:4666\n";
+"--src dav_api.sql:4716\n";
-static const char *proc164 =
-"#line 4690 \"[executable]/dav_api.sql\"\n"
+static const char *proc158 =
+"#line 4740 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.WAC_DELETE (\n"
"in path varchar,\n"
"in update_acl integer)\n"
@@ -9856,13 +9397,12 @@ static const char *proc164 =
"DAV_DELETE_INT (rtrim (path, \'/\') || \',acl\', 1, null, null, 0, 0);\n"
"connection_set (\'dav_acl_sync\', null);\n"
"}\n"
-"set_user_id (\'dba\');\n"
"SPARQL clear graph ?:graph;\n"
"}\n"
-"--src dav_api.sql:4688\n";
+"--src dav_api.sql:4738\n";
-static const char *proc165 =
-"#line 4709 \"[executable]/dav_api.sql\"\n"
+static const char *proc159 =
+"#line 4758 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.DAV_IRI (\n"
"in path varchar)\n"
"{\n"
@@ -9882,10 +9422,10 @@ static const char *proc165 =
"\n"
"return sprintf (\'http://%s%s\', host, S);\n"
"}\n"
-"--src dav_api.sql:4707\n";
+"--src dav_api.sql:4756\n";
static const char *trig14 =
-"#line 4731 \"[executable]/dav_api.sql\"\n"
+"#line 4780 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_COL_ACL_I after insert on WS.WS.SYS_DAV_COL order 9 referencing new as NC\n"
"{\n"
"declare N, colID, parentID integer;\n"
@@ -9910,10 +9450,10 @@ static const char *trig14 =
"where COL_ID = NC.COL_ID;\n"
"\n"
"}\n"
-"--src dav_api.sql:4729\n";
+"--src dav_api.sql:4778\n";
-static const char *proc166 =
-"#line 4757 \"[executable]/dav_api.sql\"\n"
+static const char *proc160 =
+"#line 4806 \"[executable]/dav_api.sql\"\n"
"create function WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG (inout aAcl any, in grantee integer, in flag char(1)) returns integer\n"
"{\n"
"foreach (any acl in aAcl) do\n"
@@ -9923,10 +9463,10 @@ static const char *proc166 =
"}\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:4755\n";
+"--src dav_api.sql:4804\n";
static const char *trig15 =
-"#line 4768 \"[executable]/dav_api.sql\"\n"
+"#line 4817 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_COL_ACL_U after update (COL_ACL) on WS.WS.SYS_DAV_COL order 9 referencing new as N, old as O\n"
"{\n"
"declare aAcl, aLog any;\n"
@@ -9959,10 +9499,10 @@ static const char *trig15 =
"log_enable (aLog, 1);\n"
"log_text (\'WS.WS.ACL_UPDATE (?, ?)\', N.COL_ID, WS.WS.ACL_PARSE (N.COL_ACL, \'123\', 0));\n"
"}\n"
-"--src dav_api.sql:4766\n";
+"--src dav_api.sql:4815\n";
static const char *trig16 =
-"#line 4802 \"[executable]/dav_api.sql\"\n"
+"#line 4851 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_COL_ACL_D after delete on WS.WS.SYS_DAV_COL order 9 referencing old as O\n"
"{\n"
"\n"
@@ -9972,10 +9512,10 @@ static const char *trig16 =
"and AI_PARENT_ID = O.COL_ID;\n"
"\n"
"}\n"
-"--src dav_api.sql:4800\n";
+"--src dav_api.sql:4849\n";
static const char *trig17 =
-"#line 4815 \"[executable]/dav_api.sql\"\n"
+"#line 4864 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_RES_ACL_I after insert on WS.WS.SYS_DAV_RES order 9 referencing new as N\n"
"{\n"
"declare aAcl any;\n"
@@ -9999,10 +9539,10 @@ static const char *trig17 =
"}\n"
"\n"
"}\n"
-"--src dav_api.sql:4813\n";
+"--src dav_api.sql:4862\n";
static const char *trig18 =
-"#line 4840 \"[executable]/dav_api.sql\"\n"
+"#line 4889 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_RES_ACL_U after update (RES_ACL) on WS.WS.SYS_DAV_RES order 9 referencing new as N, old as O\n"
"{\n"
"declare aAcl any;\n"
@@ -10023,10 +9563,10 @@ static const char *trig18 =
"}\n"
"\n"
"}\n"
-"--src dav_api.sql:4838\n";
+"--src dav_api.sql:4887\n";
static const char *trig19 =
-"#line 4862 \"[executable]/dav_api.sql\"\n"
+"#line 4911 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_RES_ACL_D after delete on WS.WS.SYS_DAV_RES order 9 referencing old as O\n"
"{\n"
"\n"
@@ -10036,10 +9576,10 @@ static const char *trig19 =
"and AI_PARENT_ID = O.RES_ID;\n"
"\n"
"}\n"
-"--src dav_api.sql:4860\n";
+"--src dav_api.sql:4909\n";
-static const char *proc167 =
-"#line 4873 \"[executable]/dav_api.sql\"\n"
+static const char *proc161 =
+"#line 4922 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_UPDATE (in id integer, in parentAcl any)\n"
"{\n"
"declare nAcl any;\n"
@@ -10068,10 +9608,10 @@ static const char *proc167 =
"}\n"
"}\n"
"}\n"
-"--src dav_api.sql:4871\n";
+"--src dav_api.sql:4920\n";
-static const char *proc168 =
-"#line 4903 \"[executable]/dav_api.sql\"\n"
+static const char *proc162 =
+"#line 4952 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_MAKE_INHERITED (\n"
"inout aAcl any)\n"
"{\n"
@@ -10086,10 +9626,10 @@ static const char *proc168 =
"}\n"
"return aAcl;\n"
"}\n"
-"--src dav_api.sql:4901\n";
+"--src dav_api.sql:4950\n";
-static const char *proc169 =
-"#line 4920 \"[executable]/dav_api.sql\"\n"
+static const char *proc163 =
+"#line 4969 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_DBG (\n"
"in vb varbinary) returns varchar\n"
"{\n"
@@ -10104,10 +9644,10 @@ static const char *proc169 =
"}\n"
"return aResult;\n"
"}\n"
-"--src dav_api.sql:4918\n";
+"--src dav_api.sql:4967\n";
-static const char *proc170 =
-"#line 4938 \"[executable]/dav_api.sql\"\n"
+static const char *proc164 =
+"#line 4987 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_SERIALIZE_INT(in I integer) returns varbinary\n"
"{\n"
"declare N integer;\n"
@@ -10133,10 +9673,10 @@ static const char *proc170 =
"\n"
"return cast(aResult as varbinary);\n"
"}\n"
-"--src dav_api.sql:4936\n";
+"--src dav_api.sql:4985\n";
-static const char *proc171 =
-"#line 4967 \"[executable]/dav_api.sql\"\n"
+static const char *proc165 =
+"#line 5016 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_DESERIALIZE_INT(in vb varbinary) returns integer\n"
"{\n"
"declare vc varchar;\n"
@@ -10144,35 +9684,35 @@ static const char *proc171 =
"vc := cast(vb as varchar);\n"
"return bit_or(bit_or(bit_or(bit_shift(aref(vc, 0), 24), bit_shift(aref(vc, 1), 16)), bit_shift(aref(vc, 2), 8)), aref(vc, 3));\n"
"}\n"
-"--src dav_api.sql:4965\n";
+"--src dav_api.sql:5014\n";
-static const char *proc172 =
-"#line 4978 \"[executable]/dav_api.sql\"\n"
+static const char *proc166 =
+"#line 5027 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_GET_ACLLENGTH(in acl varbinary) returns integer\n"
"{\n"
"return WS.WS.ACL_DESERIALIZE_INT(cast(substring(cast(acl as varchar), 1, 4) as varbinary));\n"
"}\n"
-"--src dav_api.sql:4976\n";
+"--src dav_api.sql:5025\n";
-static const char *proc173 =
-"#line 4986 \"[executable]/dav_api.sql\"\n"
+static const char *proc167 =
+"#line 5035 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_GET_ACESIZE(in acl varbinary) returns integer\n"
"{\n"
"return WS.WS.ACL_DESERIALIZE_INT(cast(substring(cast(acl as varchar), 5, 4) as varbinary));\n"
"}\n"
-"--src dav_api.sql:4984\n";
+"--src dav_api.sql:5033\n";
-static const char *proc174 =
-"#line 4997 \"[executable]/dav_api.sql\"\n"
+static const char *proc168 =
+"#line 5046 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_CREATE() returns varbinary\n"
"{\n"
"return cast(concat(cast(WS.WS.ACL_SERIALIZE_INT(8) as varchar),\n"
"cast(WS.WS.ACL_SERIALIZE_INT(0) as varchar)) as varbinary);\n"
"}\n"
-"--src dav_api.sql:4995\n";
+"--src dav_api.sql:5044\n";
-static const char *proc175 =
-"#line 5009 \"[executable]/dav_api.sql\"\n"
+static const char *proc169 =
+"#line 5058 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_IS_VALID (in acl varbinary) returns integer\n"
"{\n"
"declare iAclLength, iAceSize integer;\n"
@@ -10200,10 +9740,10 @@ static const char *proc175 =
"\n"
"return 1;\n"
"}\n"
-"--src dav_api.sql:5007\n";
+"--src dav_api.sql:5056\n";
-static const char *proc176 =
-"#line 5044 \"[executable]/dav_api.sql\"\n"
+static const char *proc170 =
+"#line 5093 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_ADD_ENTRY(inout acl varbinary, in uid integer, in bitmask integer, in is_grant integer, in inheritance integer := 0) returns varbinary\n"
"{\n"
"declare N, bFound integer;\n"
@@ -10235,10 +9775,10 @@ static const char *proc176 =
"\n"
"return acl;\n"
"}\n"
-"--src dav_api.sql:5042\n";
+"--src dav_api.sql:5091\n";
-static const char *proc177 =
-"#line 5084 \"[executable]/dav_api.sql\"\n"
+static const char *proc171 =
+"#line 5133 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_REMOVE_ENTRY(inout acl varbinary, in uid integer, in bitmask integer, in inheritance integer := 0) returns varbinary\n"
"{\n"
"declare N integer;\n"
@@ -10263,10 +9803,10 @@ static const char *proc177 =
"\n"
"return acl;\n"
"}\n"
-"--src dav_api.sql:5082\n";
+"--src dav_api.sql:5131\n";
-static const char *proc178 =
-"#line 5115 \"[executable]/dav_api.sql\"\n"
+static const char *proc172 =
+"#line 5164 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_IS_GRANTED(in acl varbinary, in uid integer, in bitmask integer) returns integer\n"
"{\n"
"declare N, lenAcl integer;\n"
@@ -10306,26 +9846,26 @@ static const char *proc178 =
"return or_acc;\n"
"return 0;\n"
"}\n"
-"--src dav_api.sql:5113\n";
+"--src dav_api.sql:5162\n";
-static const char *proc179 =
-"#line 5161 \"[executable]/dav_api.sql\"\n"
+static const char *proc173 =
+"#line 5210 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_SET_OWNER(inout acl varbinary, in uid integer)\n"
"{\n"
"return;\n"
"}\n"
-"--src dav_api.sql:5159\n";
+"--src dav_api.sql:5208\n";
-static const char *proc180 =
-"#line 5172 \"[executable]/dav_api.sql\"\n"
+static const char *proc174 =
+"#line 5221 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_OWNER(in acl varbinary) returns integer\n"
"{\n"
"return;\n"
"}\n"
-"--src dav_api.sql:5170\n";
+"--src dav_api.sql:5219\n";
-static const char *proc181 =
-"#line 5183 \"[executable]/dav_api.sql\"\n"
+static const char *proc175 =
+"#line 5232 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_PARSE (\n"
"in acl varbinary,\n"
"in inheritance varchar := \'0123\',\n"
@@ -10366,10 +9906,10 @@ static const char *proc181 =
"vectorbld_final (aAcl);\n"
"return aAcl;\n"
"}\n"
-"--src dav_api.sql:5181\n";
+"--src dav_api.sql:5230\n";
-static const char *proc182 =
-"#line 5230 \"[executable]/dav_api.sql\"\n"
+static const char *proc176 =
+"#line 5279 \"[executable]/dav_api.sql\"\n"
"create procedure WS.WS.ACL_COMPOSE (\n"
"in aAcl vector) returns varbinary\n"
"{\n"
@@ -10398,10 +9938,10 @@ static const char *proc182 =
"\n"
"return bAcl;\n"
"}\n"
-"--src dav_api.sql:5228\n";
+"--src dav_api.sql:5277\n";
-static const char *proc183 =
-"#line 5264 \"[executable]/dav_api.sql\"\n"
+static const char *proc177 =
+"#line 5313 \"[executable]/dav_api.sql\"\n"
"create function DAV_CAST_STRING_TO_INTEGER (in val varchar) returns integer\n"
"{\n"
"if (val is null) return null;\n"
@@ -10410,10 +9950,10 @@ static const char *proc183 =
"ret_null:\n"
"return null;\n"
"}\n"
-"--src dav_api.sql:5262\n";
+"--src dav_api.sql:5311\n";
-static const char *proc184 =
-"#line 5274 \"[executable]/dav_api.sql\"\n"
+static const char *proc178 =
+"#line 5323 \"[executable]/dav_api.sql\"\n"
"create function DAV_CAST_STRING_TO_DATETIME (in val varchar) returns datetime\n"
"{\n"
"if (val is null) return null;\n"
@@ -10422,10 +9962,10 @@ static const char *proc184 =
"ret_null:\n"
"return null;\n"
"}\n"
-"--src dav_api.sql:5272\n";
+"--src dav_api.sql:5321\n";
-static const char *proc185 =
-"#line 5284 \"[executable]/dav_api.sql\"\n"
+static const char *proc179 =
+"#line 5333 \"[executable]/dav_api.sql\"\n"
"create function DAV_CAST_TEXT_TO_VARCHAR (in val varchar) returns varchar\n"
"{\n"
"if (val is null) return null;\n"
@@ -10434,10 +9974,10 @@ static const char *proc185 =
"ret_null:\n"
"return null;\n"
"}\n"
-"--src dav_api.sql:5282\n";
+"--src dav_api.sql:5331\n";
-static const char *proc186 =
-"#line 5294 \"[executable]/dav_api.sql\"\n"
+static const char *proc180 =
+"#line 5343 \"[executable]/dav_api.sql\"\n"
"create function DAV_CAST_TEXT_TO_INTEGER (in val varchar) returns integer\n"
"{\n"
"if (val is null) return null;\n"
@@ -10446,10 +9986,10 @@ static const char *proc186 =
"ret_null:\n"
"return null;\n"
"}\n"
-"--src dav_api.sql:5292\n";
+"--src dav_api.sql:5341\n";
-static const char *proc187 =
-"#line 5304 \"[executable]/dav_api.sql\"\n"
+static const char *proc181 =
+"#line 5353 \"[executable]/dav_api.sql\"\n"
"create function DAV_CAST_TEXT_TO_DATETIME (in val varchar) returns datetime\n"
"{\n"
"if (val is null) return null;\n"
@@ -10458,10 +9998,10 @@ static const char *proc187 =
"ret_null:\n"
"return null;\n"
"}\n"
-"--src dav_api.sql:5302\n";
+"--src dav_api.sql:5351\n";
-static const char *proc188 =
-"#line 5314 \"[executable]/dav_api.sql\"\n"
+static const char *proc182 =
+"#line 5363 \"[executable]/dav_api.sql\"\n"
"create function DAV_FC_CONST_AS_SQL (inout val any)\n"
"{\n"
"if (193 = __tag (val))\n"
@@ -10480,10 +10020,10 @@ static const char *proc188 =
"return sprintf (\'cast (\'\'%s\'\' as datetime)\', cast (val as varchar));\n"
"signal (\'.....\', \'Internal error in DAV_DIR_FILTER: DAV_FC_CONST_AS_SQL has got bad value\');\n"
"}\n"
-"--src dav_api.sql:5312\n";
+"--src dav_api.sql:5361\n";
-static const char *proc189 =
-"#line 5340 \"[executable]/dav_api.sql\"\n"
+static const char *proc183 =
+"#line 5389 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_FC_PRED_METAS (inout pred_metas any)\n"
"{\n"
"pred_metas := vector (\n"
@@ -10513,10 +10053,10 @@ static const char *proc189 =
"\'RDF_OBJ_VALUE\', vector (\'SYS_DAV_PROP\' , 3, \'XML\' , NULL )\n"
");\n"
"}\n"
-"--src dav_api.sql:5338\n";
+"--src dav_api.sql:5387\n";
-static const char *proc190 =
-"#line 5378 \"[executable]/dav_api.sql\"\n"
+static const char *proc184 =
+"#line 5427 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_FC_CMP_METAS (inout cmp_metas any)\n"
"{\n"
"cmp_metas := vector (\n"
@@ -10549,10 +10089,10 @@ static const char *proc190 =
"\'xcontains\', vector (\'scalar\', \'XML\' , NULL, NULL, \'[^{pattern}^]\' )\n"
");\n"
"}\n"
-"--src dav_api.sql:5376\n";
+"--src dav_api.sql:5425\n";
-static const char *proc191 =
-"#line 5412 \"[executable]/dav_api.sql\"\n"
+static const char *proc185 =
+"#line 5461 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_FC_TABLE_METAS (inout table_metas any)\n"
"{\n"
"table_metas := vector (\n"
@@ -10582,10 +10122,10 @@ static const char *proc191 =
"\'DT_TAGS\' , \'DT_TAGS\' , NULL )\n"
");\n"
"}\n"
-"--src dav_api.sql:5410\n";
+"--src dav_api.sql:5459\n";
-static const char *proc192 =
-"#line 5444 \"[executable]/dav_api.sql\"\n"
+static const char *proc186 =
+"#line 5493 \"[executable]/dav_api.sql\"\n"
"create function DAV_FC_PRINT_COMPARISON (inout pred any, inout pred_metas any, inout cmp_metas any, in varname varchar, in nonsql integer) returns varchar\n"
"{\n"
"declare pred_meta any;\n"
@@ -10718,10 +10258,10 @@ static const char *proc192 =
"type_mismatch:\n"
"signal (\'.....\', sprintf (\'Can not compile comparison \'\'%s %s %s\'\' due to type mismatch in predicate \'\'%s\'\' in filter of DAV_DIR_FILTER, \', pred_meta[2], pred[1], pattern_type, pred[0]));\n"
"}\n"
-"--src dav_api.sql:5442\n";
+"--src dav_api.sql:5491\n";
-static const char *proc193 =
-"#line 5579 \"[executable]/dav_api.sql\"\n"
+static const char *proc187 =
+"#line 5628 \"[executable]/dav_api.sql\"\n"
"create function DAV_FC_PRINT_WHERE (inout filter any, in param_uid integer) returns varchar\n"
"{\n"
"declare pred_metas, cmp_metas, table_metas any;\n"
@@ -10733,10 +10273,10 @@ static const char *proc193 =
"used_tables := vector (\'SYS_DAV_RES\', vector (\'SYS_DAV_RES\', \'_top\', null, vector (), vector (), vector ()));\n"
"return DAV_FC_PRINT_WHERE_INT (filter, pred_metas, cmp_metas, table_metas, used_tables, param_uid);\n"
"}\n"
-"--src dav_api.sql:5577\n";
+"--src dav_api.sql:5626\n";
-static const char *proc194 =
-"#line 5592 \"[executable]/dav_api.sql\"\n"
+static const char *proc188 =
+"#line 5641 \"[executable]/dav_api.sql\"\n"
"create function DAV_FC_PRINT_WHERE_INT (in filter any, inout pred_metas any, inout cmp_metas any, inout table_metas any, inout used_tables any, in param_uid integer) returns varchar\n"
"{\n"
"\n"
@@ -11075,10 +10615,10 @@ static const char *proc194 =
"res_strg := replace (res_strg, \'^{nobodyuid}^\', cast (http_nobody_uid() as varchar));\n"
"return res_strg;\n"
"}\n"
-"--src dav_api.sql:5590\n";
+"--src dav_api.sql:5639\n";
-static const char *proc195 =
-"#line 5936 \"[executable]/dav_api.sql\"\n"
+static const char *proc189 =
+"#line 5985 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_REGISTER_RDF_SCHEMA (in schema_uri varchar, in location varchar, in local_addon varchar, in mode varchar)\n"
"{\n"
@@ -11098,10 +10638,10 @@ static const char *proc195 =
"values (schema_uri, location, local_addon, 0);\n"
"DAV_GET_RDF_SCHEMA_N3 (schema_uri);\n"
"}\n"
-"--src dav_api.sql:5934\n";
+"--src dav_api.sql:5983\n";
-static const char *proc196 =
-"#line 5959 \"[executable]/dav_api.sql\"\n"
+static const char *proc190 =
+"#line 6008 \"[executable]/dav_api.sql\"\n"
" create function DAV_RDF_SCHEMA_N3_LIST_PROPERTIES (inout schema_n3 any, in classname varchar)\n"
"{\n"
"if (classname is null)\n"
@@ -11135,10 +10675,10 @@ static const char *proc196 =
"/@N3S )\',\n"
"schema_n3, 1, vector (\'classname\', classname) );\n"
"}\n"
-"--src dav_api.sql:5957\n";
+"--src dav_api.sql:6006\n";
-static const char *proc197 =
-"#line 5995 \"[executable]/dav_api.sql\"\n"
+static const char *proc191 =
+"#line 6044 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_CROP_URI_TO_CATNAME (in uri varchar)\n"
"{\n"
@@ -11161,10 +10701,10 @@ static const char *proc197 =
"return subseq (uri, slash + 1);\n"
"return uri;\n"
"}\n"
-"--src dav_api.sql:5993\n";
+"--src dav_api.sql:6042\n";
-static const char *proc198 =
-"#line 6021 \"[executable]/dav_api.sql\"\n"
+static const char *proc192 =
+"#line 6070 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_GET_RDF_SCHEMA_N3 (in schema_uri varchar)\n"
"{\n"
@@ -11262,10 +10802,10 @@ static const char *proc198 =
"\n"
"return xtree_doc (\'<stub/>\');\n"
"}\n"
-"--src dav_api.sql:6019\n";
+"--src dav_api.sql:6068\n";
-static const char *proc199 =
-"#line 6121 \"[executable]/dav_api.sql\"\n"
+static const char *proc193 =
+"#line 6170 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_DEPRECATE_RDF_SCHEMA (in schema_uri varchar)\n"
"{\n"
@@ -11278,10 +10818,10 @@ static const char *proc199 =
"\n"
"delete from WS.WS.SYS_RDF_SCHEMAS where RS_URI = schema_uri and RS_LOCAL_ADDONS is null;\n"
"}\n"
-"--src dav_api.sql:6119\n";
+"--src dav_api.sql:6168\n";
-static const char *proc200 =
-"#line 6135 \"[executable]/dav_api.sql\"\n"
+static const char *proc194 =
+"#line 6184 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_REGISTER_MIME_TYPE (in m_ident varchar, in descr varchar, in dflt_ext varchar, in badmagic varchar, in mode varchar)\n"
"{\n"
@@ -11303,29 +10843,29 @@ static const char *proc200 =
"values (m_ident, descr, dflt_ext, badmagic);\n"
"insert soft WS.WS.SYS_DAV_RES_TYPES (T_TYPE,T_EXT) values (m_ident, dflt_ext);\n"
"}\n"
-"--src dav_api.sql:6133\n";
+"--src dav_api.sql:6182\n";
-static const char *proc201 =
-"#line 6158 \"[executable]/dav_api.sql\"\n"
+static const char *proc195 =
+"#line 6207 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_REGISTER_MIME_RDF (in m_ident varchar, in schema_uri varchar)\n"
"{\n"
"insert replacing WS.WS.SYS_MIME_RDFS (MR_MIME_IDENT, MR_RDF_URI, MR_DEPRECATED)\n"
"values (m_ident, schema_uri, 0);\n"
"}\n"
-"--src dav_api.sql:6156\n";
+"--src dav_api.sql:6205\n";
-static const char *proc202 =
-"#line 6166 \"[executable]/dav_api.sql\"\n"
+static const char *proc196 =
+"#line 6215 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_DEPRECATE_MIME_RDF (in m_ident varchar, in schema_uri varchar)\n"
"{\n"
"update WS.WS.SYS_MIME_RDFS set MR_DEPRECATED = 1 where MR_MIME_IDENT = m_ident and MR_RDF_URI = schema_uri;\n"
"}\n"
-"--src dav_api.sql:6164\n";
+"--src dav_api.sql:6213\n";
-static const char *proc203 =
-"#line 6174 \"[executable]/dav_api.sql\"\n"
+static const char *proc197 =
+"#line 6223 \"[executable]/dav_api.sql\"\n"
" create function\n"
"DAV_RDF_PROP_SET (\n"
"in path varchar,\n"
@@ -11336,10 +10876,10 @@ static const char *proc203 =
"{\n"
"return DAV_RDF_PROP_SET_INT (path, single_schema, rdf, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:6172\n";
+"--src dav_api.sql:6221\n";
-static const char *proc204 =
-"#line 6188 \"[executable]/dav_api.sql\"\n"
+static const char *proc198 =
+"#line 6237 \"[executable]/dav_api.sql\"\n"
" create procedure\n"
"DAV_RDF_PROP_GET (\n"
"in path varchar,\n"
@@ -11354,10 +10894,10 @@ static const char *proc204 =
"st := \'R\';\n"
"return DAV_RDF_PROP_GET_INT (DAV_SEARCH_ID (path, st), st, single_schema, 1, auth_uname, auth_pwd);\n"
"}\n"
-"--src dav_api.sql:6186\n";
+"--src dav_api.sql:6235\n";
-static const char *proc205 =
-"#line 6205 \"[executable]/dav_api.sql\"\n"
+static const char *proc199 =
+"#line 6254 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_RDF_PREPROCESS_RDFXML_SUB (inout n3_subj_dict any, in main_res nvarchar, in mode integer, inout firsttime_subj_list any) returns any\n"
"{\n"
@@ -11424,10 +10964,10 @@ static const char *proc205 =
"xte_nodebld_final (top_acc, top_head);\n"
"return top_acc;\n"
"}\n"
-"--src dav_api.sql:6203\n";
+"--src dav_api.sql:6252\n";
-static const char *proc206 =
-"#line 6274 \"[executable]/dav_api.sql\"\n"
+static const char *proc200 =
+"#line 6323 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_RDF_PREPROCESS_RDFXML (in rdfxml any, in main_res nvarchar, in already_n3 integer := 0)\n"
"{\n"
@@ -11473,10 +11013,10 @@ static const char *proc206 =
"xte_nodebld_final (rdf_acc, xte_head (UNAME\'virt:rdf\'));\n"
"return rdf_acc;\n"
"}\n"
-"--src dav_api.sql:6272\n";
+"--src dav_api.sql:6321\n";
-static const char *proc207 =
-"#line 6322 \"[executable]/dav_api.sql\"\n"
+static const char *proc201 =
+"#line 6371 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_RDF_PROP_SET_INT (\n"
"in path varchar,\n"
@@ -11503,10 +11043,10 @@ static const char *proc207 =
"davtree := DAV_RDF_PREPROCESS_RDFXML (n3xml, top_subj, 1);\n"
"return DAV_PROP_SET_INT (path, single_schema, davtree, auth_uname, auth_pwd, extern, check_locks, overwrite, auth_uid);\n"
"}\n"
-"--src dav_api.sql:6320\n";
+"--src dav_api.sql:6369\n";
-static const char *proc208 =
-"#line 6351 \"[executable]/dav_api.sql\"\n"
+static const char *proc202 =
+"#line 6400 \"[executable]/dav_api.sql\"\n"
"create procedure\n"
"DAV_RDF_PROP_GET_INT (\n"
"in id any,\n"
@@ -11526,10 +11066,10 @@ static const char *proc208 =
"davtree := xml_tree_doc (deserialize (davtree));\n"
"return davtree;\n"
"}\n"
-"--src dav_api.sql:6349\n";
+"--src dav_api.sql:6398\n";
-static const char *proc209 =
-"#line 6373 \"[executable]/dav_api.sql\"\n"
+static const char *proc203 =
+"#line 6422 \"[executable]/dav_api.sql\"\n"
"create function DAV_RDF_MERGE (\n"
"in old_n3 any,\n"
"in patch_n3 any,\n"
@@ -11615,10 +11155,10 @@ static const char *proc209 =
"xte_nodebld_final (merge_acc, xte_head (UNAME\' root\'));\n"
"return xml_tree_doc (merge_acc);\n"
"}\n"
-"--src dav_api.sql:6371\n";
+"--src dav_api.sql:6420\n";
-static const char *proc210 =
-"#line 6461 \"[executable]/dav_api.sql\"\n"
+static const char *proc204 =
+"#line 6510 \"[executable]/dav_api.sql\"\n"
"create function DAV_RDF_SUBTRACT (\n"
"in old_n3 any,\n"
"in sub_n3 any\n"
@@ -11665,10 +11205,10 @@ static const char *proc210 =
"xte_nodebld_final (res_acc, xte_head (UNAME\' root\'));\n"
"return xml_tree_doc (res_acc);\n"
"}\n"
-"--src dav_api.sql:6459\n";
+"--src dav_api.sql:6508\n";
static const char *trig20 =
-"#line 6510 \"[executable]/dav_api.sql\"\n"
+"#line 6559 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_RES_CONTENT_EXTRACT_RDF_I after insert on WS.WS.SYS_DAV_RES order 20 referencing new as NEWR\n"
"{\n"
"whenever sqlstate \'*\' goto no_op;\n"
@@ -11682,10 +11222,10 @@ static const char *trig20 =
"\n"
" ;\n"
"}\n"
-"--src dav_api.sql:6508\n";
+"--src dav_api.sql:6557\n";
static const char *trig21 =
-"#line 6525 \"[executable]/dav_api.sql\"\n"
+"#line 6574 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_RES_CONTENT_EXTRACT_RDF_U1 after update (RES_ID, RES_NAME, RES_TYPE, RES_PERMS) on WS.WS.SYS_DAV_RES order 20 referencing new as NEWR, old as OLDR\n"
"{\n"
"\n"
@@ -11706,10 +11246,10 @@ static const char *trig21 =
"\n"
" ;\n"
"}\n"
-"--src dav_api.sql:6523\n";
+"--src dav_api.sql:6572\n";
static const char *trig22 =
-"#line 6547 \"[executable]/dav_api.sql\"\n"
+"#line 6596 \"[executable]/dav_api.sql\"\n"
"create trigger SYS_DAV_RES_CONTENT_EXTRACT_RDF_U2 after update (RES_ID, RES_NAME, RES_TYPE, RES_CONTENT) on WS.WS.SYS_DAV_RES order 21 referencing new as NEWR, old as OLDR\n"
"{\n"
"\n"
@@ -11729,10 +11269,10 @@ static const char *trig22 =
"\n"
" ;\n"
"}\n"
-"--src dav_api.sql:6545\n";
+"--src dav_api.sql:6594\n";
-static const char *proc211 =
-"#line 6568 \"[executable]/dav_api.sql\"\n"
+static const char *proc205 =
+"#line 6617 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_EXTRACT_AND_SAVE_RDF (in resid integer)\n"
"{\n"
"declare resname, restype varchar;\n"
@@ -11742,10 +11282,10 @@ static const char *proc211 =
"DAV_EXTRACT_AND_SAVE_RDF_INT (resid, resname, restype, rescontent);\n"
"\n"
"}\n"
-"--src dav_api.sql:6566\n";
+"--src dav_api.sql:6615\n";
-static const char *proc212 =
-"#line 6579 \"[executable]/dav_api.sql\"\n"
+static const char *proc206 =
+"#line 6628 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_GET_RES_TYPE_URI_BY_MIME_TYPE(in mime_type varchar) returns varchar\n"
"{\n"
"if (mime_type = \'application/bpel+xml\')\n"
@@ -11809,10 +11349,10 @@ static const char *proc212 =
"if (mime_type = \'text/wiki\')\n"
"return \'http://www.openlinksw.com/schemas/Wiki#\';\n"
"}\n"
-"--src dav_api.sql:6577\n";
+"--src dav_api.sql:6626\n";
-static const char *proc213 =
-"#line 6645 \"[executable]/dav_api.sql\"\n"
+static const char *proc207 =
+"#line 6694 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_EXTRACT_AND_SAVE_RDF_INT (inout resid integer, inout resname varchar, in restype varchar, inout _rescontent any)\n"
"{\n"
"declare rescontent any;\n"
@@ -11830,10 +11370,10 @@ static const char *proc213 =
"aq_request (aq, \'DB.DBA.DAV_EXTRACT_AND_SAVE_RDF_INT2\', vector (resid, resname, restype, rescontent));\n"
"}\n"
"}\n"
-"--src dav_api.sql:6643\n";
+"--src dav_api.sql:6692\n";
-static const char *proc214 =
-"#line 6665 \"[executable]/dav_api.sql\"\n"
+static const char *proc208 =
+"#line 6714 \"[executable]/dav_api.sql\"\n"
"create procedure DAV_EXTRACT_AND_SAVE_RDF_INT2 (in resid integer, in resname varchar, in restype varchar, in rescontent any)\n"
"{\n"
"declare resttype, res_type_uri, full_name varchar;\n"
@@ -11912,10 +11452,10 @@ static const char *proc214 =
"\n"
" ;\n"
"}\n"
-"--src dav_api.sql:6663\n";
+"--src dav_api.sql:6712\n";
-static const char *proc215 =
-"#line 6745 \"[executable]/dav_api.sql\"\n"
+static const char *proc209 =
+"#line 6794 \"[executable]/dav_api.sql\"\n"
"create function\n"
"DAV_HOME_DIR_UPDATE ()\n"
"{\n"
@@ -11925,14 +11465,14 @@ static const char *proc215 =
"DAV_HOME_DIR_CREATE (U_NAME);\n"
"registry_set (\'DAV_HOME_DIR_UPDATE\', \'done\');\n"
"}\n"
-"--src dav_api.sql:6743\n";
+"--src dav_api.sql:6792\n";
static const char *other0 =
" DAV_HOME_DIR_UPDATE ()\n";
/* dav_meta.sql */
-static const char *proc216 =
+static const char *proc210 =
"#line 23 \"[executable]/dav_meta.sql\"\n"
"create function DAV_GUESS_MIME_TYPE_BY_NAME (in orig_res_name varchar) returns varchar\n"
"{\n"
@@ -12045,7 +11585,7 @@ static const char *proc216 =
"}\n"
"--src dav_meta.sql:21\n";
-static const char *proc217 =
+static const char *proc211 =
"#line 134 \"[executable]/dav_meta.sql\"\n"
"create function DAV_GUESS_MIME_TYPE (in orig_res_name varchar, inout content any, inout html_start any) returns varchar\n"
"{\n"
@@ -12176,7 +11716,7 @@ static const char *proc217 =
"}\n"
"--src dav_meta.sql:132\n";
-static const char *proc218 =
+static const char *proc212 =
"#line 263 \"[executable]/dav_meta.sql\"\n"
"create procedure file_space_fmt (in d integer) returns varchar\n"
"{\n"
@@ -12198,7 +11738,7 @@ static const char *proc218 =
"}\n"
"--src dav_meta.sql:261\n";
-static const char *proc219 =
+static const char *proc213 =
"#line 283 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/x-openlink-license\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12225,7 +11765,7 @@ static const char *proc219 =
"}\n"
"--src dav_meta.sql:281\n";
-static const char *proc220 =
+static const char *proc214 =
"#line 308 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_opendocument\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12265,7 +11805,7 @@ static const char *proc220 =
"}\n"
"--src dav_meta.sql:306\n";
-static const char *proc221 =
+static const char *proc215 =
"#line 346 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.text\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12273,7 +11813,7 @@ static const char *proc221 =
"}\n"
"--src dav_meta.sql:344\n";
-static const char *proc222 =
+static const char *proc216 =
"#line 352 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.database\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12281,7 +11821,7 @@ static const char *proc222 =
"}\n"
"--src dav_meta.sql:350\n";
-static const char *proc223 =
+static const char *proc217 =
"#line 358 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.graphics\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12289,7 +11829,7 @@ static const char *proc223 =
"}\n"
"--src dav_meta.sql:356\n";
-static const char *proc224 =
+static const char *proc218 =
"#line 364 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.presentation\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12297,7 +11837,7 @@ static const char *proc224 =
"}\n"
"--src dav_meta.sql:362\n";
-static const char *proc225 =
+static const char *proc219 =
"#line 369 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.spreadsheet\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12305,7 +11845,7 @@ static const char *proc225 =
"}\n"
"--src dav_meta.sql:367\n";
-static const char *proc226 =
+static const char *proc220 =
"#line 374 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.chart\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12313,7 +11853,7 @@ static const char *proc226 =
"}\n"
"--src dav_meta.sql:372\n";
-static const char *proc227 =
+static const char *proc221 =
"#line 379 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.formula\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12321,7 +11861,7 @@ static const char *proc227 =
"}\n"
"--src dav_meta.sql:377\n";
-static const char *proc228 =
+static const char *proc222 =
"#line 384 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.image\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12329,7 +11869,7 @@ static const char *proc228 =
"}\n"
"--src dav_meta.sql:382\n";
-static const char *proc229 =
+static const char *proc223 =
"#line 390 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/x-openlink-image\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12368,7 +11908,7 @@ static const char *proc229 =
"}\n"
"--src dav_meta.sql:388\n";
-static const char *proc230 =
+static const char *proc224 =
"#line 427 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/x-openlink-photo\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12406,7 +11946,7 @@ static const char *proc230 =
"}\n"
"--src dav_meta.sql:425\n";
-static const char *proc231 =
+static const char *proc225 =
"#line 463 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/audio\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12416,7 +11956,7 @@ static const char *proc231 =
"}\n"
"--src dav_meta.sql:461\n";
-static const char *proc232 =
+static const char *proc226 =
"#line 471 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_audio/mpeg\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12424,7 +11964,7 @@ static const char *proc232 =
"}\n"
"--src dav_meta.sql:469\n";
-static const char *proc233 =
+static const char *proc227 =
"#line 477 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_audio/x-flac\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12432,7 +11972,7 @@ static const char *proc233 =
"}\n"
"--src dav_meta.sql:475\n";
-static const char *proc234 =
+static const char *proc228 =
"#line 483 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_audio/x-mp3\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12440,7 +11980,7 @@ static const char *proc234 =
"}\n"
"--src dav_meta.sql:481\n";
-static const char *proc235 =
+static const char *proc229 =
"#line 489 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_audio/x-m4a\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12448,7 +11988,7 @@ static const char *proc235 =
"}\n"
"--src dav_meta.sql:487\n";
-static const char *proc236 =
+static const char *proc230 =
"#line 495 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_audio/x-m4p\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12456,7 +11996,7 @@ static const char *proc236 =
"}\n"
"--src dav_meta.sql:493\n";
-static const char *proc237 =
+static const char *proc231 =
"#line 501 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/ogg\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12464,7 +12004,7 @@ static const char *proc237 =
"}\n"
"--src dav_meta.sql:499\n";
-static const char *proc238 =
+static const char *proc232 =
"#line 507 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msoffice+xml\" (in type_descr varchar, in orig_res_name varchar, inout content any, inout html_start any, inout docprops any)\n"
"{\n"
@@ -12495,7 +12035,7 @@ static const char *proc238 =
"}\n"
"--src dav_meta.sql:505\n";
-static const char *proc239 =
+static const char *proc233 =
"#line 537 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msexcel\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12508,7 +12048,7 @@ static const char *proc239 =
"}\n"
"--src dav_meta.sql:535\n";
-static const char *proc240 =
+static const char *proc234 =
"#line 548 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msaccess\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12521,7 +12061,7 @@ static const char *proc240 =
"}\n"
"--src dav_meta.sql:546\n";
-static const char *proc241 =
+static const char *proc235 =
"#line 559 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msproject\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12534,7 +12074,7 @@ static const char *proc241 =
"}\n"
"--src dav_meta.sql:557\n";
-static const char *proc242 =
+static const char *proc236 =
"#line 571 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/mspowerpoint\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12547,7 +12087,7 @@ static const char *proc242 =
"}\n"
"--src dav_meta.sql:569\n";
-static const char *proc243 =
+static const char *proc237 =
"#line 583 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msword\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12560,7 +12100,7 @@ static const char *proc243 =
"}\n"
"--src dav_meta.sql:581\n";
-static const char *proc244 =
+static const char *proc238 =
"#line 595 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/pdf\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12573,7 +12113,7 @@ static const char *proc244 =
"}\n"
"--src dav_meta.sql:593\n";
-static const char *proc245 =
+static const char *proc239 =
"#line 607 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/xbrl+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12592,7 +12132,7 @@ static const char *proc245 =
"}\n"
"--src dav_meta.sql:605\n";
-static const char *proc246 =
+static const char *proc240 =
"#line 624 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/doap+rdf\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12612,7 +12152,7 @@ static const char *proc246 =
"}\n"
"--src dav_meta.sql:622\n";
-static const char *proc247 =
+static const char *proc241 =
"#line 642 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/xddl+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12636,7 +12176,7 @@ static const char *proc247 =
"}\n"
"--src dav_meta.sql:640\n";
-static const char *proc248 =
+static const char *proc242 =
"#line 664 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/archive\" (in type_descr varchar, in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12652,7 +12192,7 @@ static const char *proc248 =
"}\n"
"--src dav_meta.sql:662\n";
-static const char *proc249 =
+static const char *proc243 =
"#line 678 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/tar\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12660,7 +12200,7 @@ static const char *proc249 =
"}\n"
"--src dav_meta.sql:676\n";
-static const char *proc250 =
+static const char *proc244 =
"#line 684 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/taz\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12668,7 +12208,7 @@ static const char *proc250 =
"}\n"
"--src dav_meta.sql:682\n";
-static const char *proc251 =
+static const char *proc245 =
"#line 690 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/gz\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12676,7 +12216,7 @@ static const char *proc251 =
"}\n"
"--src dav_meta.sql:688\n";
-static const char *proc252 =
+static const char *proc246 =
"#line 696 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msi\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12684,7 +12224,7 @@ static const char *proc252 =
"}\n"
"--src dav_meta.sql:694\n";
-static const char *proc253 =
+static const char *proc247 =
"#line 702 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/dmg\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12692,7 +12232,7 @@ static const char *proc253 =
"}\n"
"--src dav_meta.sql:700\n";
-static const char *proc254 =
+static const char *proc248 =
"#line 708 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/arj\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12700,7 +12240,7 @@ static const char *proc254 =
"}\n"
"--src dav_meta.sql:706\n";
-static const char *proc255 =
+static const char *proc249 =
"#line 714 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/bz\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12708,7 +12248,7 @@ static const char *proc255 =
"}\n"
"--src dav_meta.sql:712\n";
-static const char *proc256 =
+static const char *proc250 =
"#line 720 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/bz2\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12716,7 +12256,7 @@ static const char *proc256 =
"}\n"
"--src dav_meta.sql:718\n";
-static const char *proc257 =
+static const char *proc251 =
"#line 726 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/tgz\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12724,7 +12264,7 @@ static const char *proc257 =
"}\n"
"--src dav_meta.sql:724\n";
-static const char *proc258 =
+static const char *proc252 =
"#line 732 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/rar\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12732,7 +12272,7 @@ static const char *proc258 =
"}\n"
"--src dav_meta.sql:730\n";
-static const char *proc259 =
+static const char *proc253 =
"#line 738 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/zip\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12740,7 +12280,7 @@ static const char *proc259 =
"}\n"
"--src dav_meta.sql:736\n";
-static const char *proc260 =
+static const char *proc254 =
"#line 744 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/cab\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12748,7 +12288,7 @@ static const char *proc260 =
"}\n"
"--src dav_meta.sql:742\n";
-static const char *proc261 =
+static const char *proc255 =
"#line 750 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/lzh\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12756,7 +12296,7 @@ static const char *proc261 =
"}\n"
"--src dav_meta.sql:748\n";
-static const char *proc262 =
+static const char *proc256 =
"#line 756 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/ace\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12764,7 +12304,7 @@ static const char *proc262 =
"}\n"
"--src dav_meta.sql:754\n";
-static const char *proc263 =
+static const char *proc257 =
"#line 762 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/iso\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12772,7 +12312,7 @@ static const char *proc263 =
"}\n"
"--src dav_meta.sql:760\n";
-static const char *proc264 =
+static const char *proc258 =
"#line 768 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msword+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12782,7 +12322,7 @@ static const char *proc264 =
"}\n"
"--src dav_meta.sql:766\n";
-static const char *proc265 =
+static const char *proc259 =
"#line 776 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msexcel+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12792,7 +12332,7 @@ static const char *proc265 =
"}\n"
"--src dav_meta.sql:774\n";
-static const char *proc266 =
+static const char *proc260 =
"#line 784 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msproject+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12802,7 +12342,7 @@ static const char *proc266 =
"}\n"
"--src dav_meta.sql:782\n";
-static const char *proc267 =
+static const char *proc261 =
"#line 792 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/msvisio+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12812,7 +12352,7 @@ static const char *proc267 =
"}\n"
"--src dav_meta.sql:790\n";
-static const char *proc268 =
+static const char *proc262 =
"#line 801 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/rss+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12865,7 +12405,7 @@ static const char *proc268 =
"}\n"
"--src dav_meta.sql:799\n";
-static const char *proc269 =
+static const char *proc263 =
"#line 853 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/atom+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12906,7 +12446,7 @@ static const char *proc269 =
"}\n"
"--src dav_meta.sql:851\n";
-static const char *proc270 =
+static const char *proc264 =
"#line 892 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_text/eml\" (in orig_res_name varchar, inout content1 any, inout html_start any)\n"
"{\n"
@@ -12945,7 +12485,7 @@ static const char *proc270 =
"}\n"
"--src dav_meta.sql:890\n";
-static const char *proc271 =
+static const char *proc265 =
"#line 929 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/xbel+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12972,7 +12512,7 @@ static const char *proc271 =
"}\n"
"--src dav_meta.sql:927\n";
-static const char *proc272 =
+static const char *proc266 =
"#line 954 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/rdf+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -12991,7 +12531,7 @@ static const char *proc272 =
"}\n"
"--src dav_meta.sql:952\n";
-static const char *proc273 =
+static const char *proc267 =
"#line 971 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_text/rdf+ttl\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13005,7 +12545,7 @@ static const char *proc273 =
"}\n"
"--src dav_meta.sql:969\n";
-static const char *proc274 =
+static const char *proc268 =
"#line 983 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_text/rdf+n3\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13019,7 +12559,7 @@ static const char *proc274 =
"}\n"
"--src dav_meta.sql:981\n";
-static const char *proc275 =
+static const char *proc269 =
"#line 995 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/foaf+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13083,7 +12623,7 @@ static const char *proc275 =
"}\n"
"--src dav_meta.sql:993\n";
-static const char *proc276 =
+static const char *proc270 =
"#line 1058 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/mods+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13115,7 +12655,7 @@ static const char *proc276 =
"}\n"
"--src dav_meta.sql:1056\n";
-static const char *proc277 =
+static const char *proc271 =
"#line 1089 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/opml+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13169,7 +12709,7 @@ static const char *proc277 =
"}\n"
"--src dav_meta.sql:1087\n";
-static const char *proc278 =
+static const char *proc272 =
"#line 1141 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/ocs+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13192,7 +12732,7 @@ static const char *proc278 =
"}\n"
"--src dav_meta.sql:1139\n";
-static const char *proc279 =
+static const char *proc273 =
"#line 1162 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_text/html\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13220,7 +12760,7 @@ static const char *proc279 =
"}\n"
"--src dav_meta.sql:1160\n";
-static const char *proc280 =
+static const char *proc274 =
"#line 1189 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/x-openlinksw-vsp\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13247,7 +12787,7 @@ static const char *proc280 =
"}\n"
"--src dav_meta.sql:1187\n";
-static const char *proc281 =
+static const char *proc275 =
"#line 1215 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/x-openlinksw-vspx+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13271,7 +12811,7 @@ static const char *proc281 =
"}\n"
"--src dav_meta.sql:1213\n";
-static const char *proc282 =
+static const char *proc276 =
"#line 1237 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/bpel+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13292,7 +12832,7 @@ static const char *proc282 =
"}\n"
"--src dav_meta.sql:1235\n";
-static const char *proc283 =
+static const char *proc277 =
"#line 1256 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/annotea+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13311,7 +12851,7 @@ static const char *proc283 =
"}\n"
"--src dav_meta.sql:1254\n";
-static const char *proc284 =
+static const char *proc278 =
"#line 1273 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/google-kinds+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13332,7 +12872,7 @@ static const char *proc284 =
"}\n"
"--src dav_meta.sql:1271\n";
-static const char *proc285 =
+static const char *proc279 =
"#line 1292 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/wsdl+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13353,7 +12893,7 @@ static const char *proc285 =
"}\n"
"--src dav_meta.sql:1290\n";
-static const char *proc286 =
+static const char *proc280 =
"#line 1311 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/google-base+xml\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13527,7 +13067,7 @@ static const char *proc286 =
"}\n"
"--src dav_meta.sql:1309\n";
-static const char *proc287 =
+static const char *proc281 =
"#line 1483 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_application/x-openlinksw-vad\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13569,7 +13109,7 @@ static const char *proc287 =
"}\n"
"--src dav_meta.sql:1481\n";
-static const char *proc288 =
+static const char *proc282 =
"#line 1523 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_text/wiki\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13637,7 +13177,7 @@ static const char *proc288 =
"}\n"
"--src dav_meta.sql:1521\n";
-static const char *proc289 =
+static const char *proc283 =
"#line 1591 \"[executable]/dav_meta.sql\"\n"
"create function IMC_TO_XML (in _src varchar)\n"
"{\n"
@@ -13818,7 +13358,7 @@ static const char *proc289 =
"}\n"
"--src dav_meta.sql:1589\n";
-static const char *proc290 =
+static const char *proc284 =
"#line 1771 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_text/directory\" (in orig_res_name varchar, inout content any, inout html_start any)\n"
"{\n"
@@ -13945,7 +13485,7 @@ static const char *proc290 =
"}\n"
"--src dav_meta.sql:1769\n";
-static const char *proc291 =
+static const char *proc285 =
"#line 1897 \"[executable]/dav_meta.sql\"\n"
"create function \"DAV_EXTRACT_RDF_BY_METAS\" (inout doc any, inout metas any, inout extras any)\n"
"{\n"
@@ -13992,7 +13532,7 @@ static const char *proc291 =
"}\n"
"--src dav_meta.sql:1895\n";
-static const char *proc292 =
+static const char *proc286 =
"#line 1948 \"[executable]/dav_meta.sql\"\n"
"create function DB.DBA.UNIX_DATETIME_PARSER (in strg varchar, in trap_error integer := 0, in output_mode integer := 0)\n"
"{\n"
@@ -14096,7 +13636,7 @@ static const char *other1 =
"grant execute on DB.DBA.UNIX_DATETIME_PARSER to public\n";
static const char *other2 =
"xpf_extension (\'http://www.openlinksw.com/virtuoso/bpel:unix-datetime-parser\', fix_identifier_case (\'DB.DBA.UNIX_DATETIME_PARSER\'), 0)\n";
-static const char *proc293 =
+static const char *proc287 =
"#line 2057 \"[executable]/dav_meta.sql\"\n"
"create function DB.DBA.UNIX_DATE_PARSER (in strg varchar, in trap_error integer := 0, in output_mode integer := 0)\n"
"{\n"
@@ -14190,7 +13730,7 @@ static const char *other3 =
"grant execute on DB.DBA.UNIX_DATE_PARSER to public\n";
static const char *other4 =
"xpf_extension (\'http://www.openlinksw.com/virtuoso/bpel:unix-date-parser\', fix_identifier_case (\'DB.DBA.UNIX_DATE_PARSER\'), 0)\n";
-static const char *proc294 =
+static const char *proc288 =
"#line 2157 \"[executable]/dav_meta.sql\"\n"
"create function DB.DBA.BPEL_SPLIT_LIST (in strg varchar)\n"
"{\n"
@@ -14221,7 +13761,7 @@ static const char *other5 =
"grant execute on DB.DBA.BPEL_SPLIT_LIST to public\n";
static const char *other6 =
"xpf_extension (\'http://www.openlinksw.com/virtuoso/bpel:split-list\', fix_identifier_case (\'DB.DBA.BPEL_SPLIT_LIST\'), 0)\n";
-static const char *proc295 =
+static const char *proc289 =
"#line 2189 \"[executable]/dav_meta.sql\"\n"
"create function DAV_EXTRACT_SPOTLIGHT (in resname varchar, inout rescontent any) returns any\n"
"{\n"
@@ -14261,7 +13801,7 @@ static const char *proc295 =
"}\n"
"--src dav_meta.sql:2187\n";
-static const char *proc296 =
+static const char *proc290 =
"#line 2228 \"[executable]/dav_meta.sql\"\n"
"create function DAV_CONVERT_SPOTLIGHT_TO_VIRTUOSO (in sp_data any) returns any\n"
"{\n"
@@ -14307,7 +13847,7 @@ static const char *proc296 =
"}\n"
"--src dav_meta.sql:2226\n";
-static const char *proc297 =
+static const char *proc291 =
"#line 2273 \"[executable]/dav_meta.sql\"\n"
"create procedure DAV_SPOTLIGHT_ADD (inout res any, in name varchar, inout val any)\n"
"{\n"
@@ -14319,7 +13859,7 @@ static const char *proc297 =
"}\n"
"--src dav_meta.sql:2271\n";
-static const char *proc298 =
+static const char *proc292 =
"#line 2284 \"[executable]/dav_meta.sql\"\n"
" create procedure DB.DBA.XML_UNIX_DATE_TO_ISO (in unixdt integer)\n"
"{\n"
@@ -14337,7 +13877,7 @@ static const char *other7 =
"VALUES (\'http://www.openlinksw.com/xsltext/:unixTime2ISO\', \'DB.DBA.XML_UNIX_DATE_TO_ISO\')\n";
static const char *other8 =
"xpf_extension (\'http://www.openlinksw.com/xsltext/:unixTime2ISO\', \'DB.DBA.XML_UNIX_DATE_TO_ISO\', 0)\n";
-static const char *proc299 =
+static const char *proc293 =
"#line 2302 \"[executable]/dav_meta.sql\"\n"
"create procedure DAV_EXTRACT_META_AS_RDF_XML (in resname varchar, in rescontent any := null)\n"
"{\n"
@@ -14391,7 +13931,7 @@ static const char *proc299 =
/* dav_acct.sql */
-static const char *proc300 =
+static const char *proc294 =
"#line 23 \"[executable]/dav_acct.sql\"\n"
"create function DAV_SPACE_QUOTA_PARENT (in res_path varchar, out _u_id integer, out _above_hy datetime, out _dav_use numeric, out _total_use numeric, out _quota numeric) returns varchar\n"
"{\n"
@@ -14431,7 +13971,7 @@ static const char *proc300 =
"}\n"
"--src dav_acct.sql:21\n";
-static const char *proc301 =
+static const char *proc295 =
"#line 61 \"[executable]/dav_acct.sql\"\n"
"create function DAV_ADD_SPACE_QUOTA (in _home_path varchar, in _u_id integer, in _quota numeric) returns integer\n"
"{\n"
@@ -14522,7 +14062,7 @@ static const char *proc301 =
"}\n"
"--src dav_acct.sql:59\n";
-static const char *proc302 =
+static const char *proc296 =
"#line 150 \"[executable]/dav_acct.sql\"\n"
"create function DAV_DEL_SPACE_QUOTA (in _home_path varchar) returns integer\n"
"{\n"
@@ -14541,7 +14081,7 @@ static const char *proc302 =
"}\n"
"--src dav_acct.sql:148\n";
-static const char *proc303 =
+static const char *proc297 =
"#line 167 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_SPACE_QUOTA_YELLOW_TRACK (in _home_path varchar, in _u_id integer, in old_above_hy datetime, in total_use numeric, in _quota numeric)\n"
"{\n"
@@ -14576,7 +14116,7 @@ static const char *proc303 =
"}\n"
"--src dav_acct.sql:165\n";
-static const char *proc304 =
+static const char *proc298 =
"#line 200 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_SPACE_QUOTA_SIGNAL (in res_path varchar, in home_path varchar, in _u_id integer, in _total_use numeric, in _quota numeric)\n"
"{\n"
@@ -14604,7 +14144,7 @@ static const char *proc304 =
"}\n"
"--src dav_acct.sql:198\n";
-static const char *proc305 =
+static const char *proc299 =
"#line 226 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_OWNER_DISABLED_SIGNAL (in res_path varchar, in _u_id integer)\n"
"{\n"
@@ -14623,7 +14163,7 @@ static const char *proc305 =
"}\n"
"--src dav_acct.sql:224\n";
-static const char *proc306 =
+static const char *proc300 =
"#line 243 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_HOME_DISABLED_SIGNAL (in res_path varchar, in home_path varchar, in _u_id integer)\n"
"{\n"
@@ -14640,7 +14180,7 @@ static const char *proc306 =
"}\n"
"--src dav_acct.sql:241\n";
-static const char *proc307 =
+static const char *proc301 =
"#line 258 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_SPACE_QUOTA_RES_INSERT (in newr_path varchar, in newr_len integer)\n"
"{\n"
@@ -14677,7 +14217,7 @@ static const char *proc307 =
"}\n"
"--src dav_acct.sql:256\n";
-static const char *proc308 =
+static const char *proc302 =
"#line 293 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_SPACE_QUOTA_RES_DELETE (in oldr_path varchar, in oldr_len integer)\n"
"{\n"
@@ -14720,7 +14260,7 @@ static const char *proc308 =
"}\n"
"--src dav_acct.sql:291\n";
-static const char *proc309 =
+static const char *proc303 =
"#line 334 \"[executable]/dav_acct.sql\"\n"
"create procedure DAV_SPACE_QUOTA_RES_UPDATE (in oldr_path varchar, in oldr_len integer, in newr_path varchar, in newr_len integer)\n"
"{\n"
@@ -14818,7 +14358,7 @@ static const char *proc309 =
/* dav_rdf_quad.sql */
-static const char *proc310 =
+static const char *proc304 =
"#line 23 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.RDF_DELETE_ENTIRE_GRAPH (in new_dav_graph varchar, in param integer)\n"
"{\n"
@@ -14826,7 +14366,7 @@ static const char *proc310 =
"}\n"
"--src dav_rdf_quad.sql:21\n";
-static const char *proc311 =
+static const char *proc305 =
"#line 29 \"[executable]/dav_rdf_quad.sql\"\n"
"create function DB.DBA.DAV_FULL_PATH_TO_IRI (in dav_iri varchar, in _str varchar) returns varchar\n"
"{\n"
@@ -14838,7 +14378,7 @@ static const char *proc311 =
"}\n"
"--src dav_rdf_quad.sql:27\n";
-static const char *proc312 =
+static const char *proc306 =
"#line 39 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_AUTO_REPLICATE_TO_RDF_QUAD ()\n"
"{\n"
@@ -14852,7 +14392,7 @@ static const char *proc312 =
"}\n"
"--src dav_rdf_quad.sql:37\n";
-static const char *proc313 =
+static const char *proc307 =
"#line 51 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_REPLICATE_ALL_TO_RDF_QUAD (in enable integer)\n"
"{\n"
@@ -14919,7 +14459,7 @@ static const char *proc313 =
"}\n"
"--src dav_rdf_quad.sql:49\n";
-static const char *proc314 =
+static const char *proc308 =
"#line 116 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.RDF_CBD_DELETE (inout triple_list any, in graph_id any, in local_dav_uri any)\n"
"{\n"
@@ -14995,7 +14535,7 @@ static const char *proc314 =
"}\n"
"--src dav_rdf_quad.sql:114\n";
-static const char *proc315 =
+static const char *proc309 =
"#line 190 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_RDF_URI_RESOLVE (in dav_rdf_graph_uri varchar, in iri any, in fullpath varchar, in res_type varchar) returns varchar\n"
"{\n"
@@ -15023,7 +14563,7 @@ static const char *proc315 =
"}\n"
"--src dav_rdf_quad.sql:188\n";
-static const char *proc316 =
+static const char *proc310 =
"#line 216 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_RDF_REPLICATE_INT (in res_id integer, in restype varchar, in fullpath varchar)\n"
"{\n"
@@ -15065,7 +14605,7 @@ static const char *proc316 =
"}\n"
"--src dav_rdf_quad.sql:214\n";
-static const char *proc317 =
+static const char *proc311 =
"#line 256 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_RDF_CBD_DELETE_PROP (in n3v any, in fullpath varchar, in restype varchar, in dav_rdf_graph_iid IRI_ID, in dav_rdf_graph_uri varchar)\n"
"{\n"
@@ -15107,7 +14647,7 @@ static const char *proc317 =
"}\n"
"--src dav_rdf_quad.sql:254\n";
-static const char *proc318 =
+static const char *proc312 =
"#line 296 \"[executable]/dav_rdf_quad.sql\"\n"
"create function DB.DBA.DAV_MAKE_USER_IRI (in userid integer)\n"
"{\n"
@@ -15130,7 +14670,7 @@ static const char *proc318 =
"}\n"
"--src dav_rdf_quad.sql:294\n";
-static const char *proc319 =
+static const char *proc313 =
"#line 317 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_REPLICATE_RES_TO_RDF_QUAD (in res_id2 integer, in fullpath varchar)\n"
"{\n"
@@ -15164,7 +14704,7 @@ static const char *proc319 =
"}\n"
"--src dav_rdf_quad.sql:315\n";
-static const char *proc320 =
+static const char *proc314 =
"#line 349 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_REPLICATE_COL_TO_RDF_QUAD (in col_id2 integer)\n"
"{\n"
@@ -15465,7 +15005,7 @@ static const char *trig32 =
"}\n"
"--src dav_rdf_quad.sql:625\n";
-static const char *proc321 =
+static const char *proc315 =
"#line 635 \"[executable]/dav_rdf_quad.sql\"\n"
"create procedure DB.DBA.DAV_RDF_PROPAGATE_COL_PATH_CHANGE (\n"
"in dav_rdf_graph_uri varchar, in dav_rdf_graph_iid IRI_ID,\n"
@@ -15621,7 +15161,7 @@ static const char *trig34 =
/* vfs.sql */
-static const char *proc322 =
+static const char *proc316 =
"#line 31 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.COPY_PAGE (in _host varchar, in _urls any, in _root varchar, in _upd integer, in _dbg integer)\n"
"{\n"
@@ -15651,7 +15191,7 @@ static const char *proc322 =
"}\n"
"--src vfs.sql:29\n";
-static const char *proc323 =
+static const char *proc317 =
"#line 59 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_HTTP_RESP_CODE (inout _resp any)\n"
"{\n"
@@ -15663,7 +15203,7 @@ static const char *proc323 =
"}\n"
"--src vfs.sql:57\n";
-static const char *proc324 =
+static const char *proc318 =
"#line 69 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_ENSURE_NEW_SITE (in _host varchar, in _root varchar, in _new_host varchar, in _new_url varchar)\n"
"{\n"
@@ -15676,7 +15216,7 @@ static const char *proc324 =
"}\n"
"--src vfs.sql:67\n";
-static const char *proc325 =
+static const char *proc319 =
"#line 80 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_GUESS_CONTENT_TYPE (in origin_uri varchar, in ret_content_type varchar, inout ret_body any)\n"
"{\n"
@@ -15691,7 +15231,7 @@ static const char *proc325 =
"}\n"
"--src vfs.sql:78\n";
-static const char *proc326 =
+static const char *proc320 =
"#line 93 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.COPY_PAGE_1 (in _host varchar, in _urls any, in _root varchar,\n"
"in _upd integer, in _dbg integer)\n"
@@ -15925,7 +15465,7 @@ static const char *proc326 =
"}\n"
"--src vfs.sql:91\n";
-static const char *proc327 =
+static const char *proc321 =
"#line 326 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DELETE_LOCAL_COPY (in _host varchar, in _url varchar, in _root varchar)\n"
"{\n"
@@ -15934,7 +15474,7 @@ static const char *proc327 =
"}\n"
"--src vfs.sql:324\n";
-static const char *proc328 =
+static const char *proc322 =
"#line 333 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_RUN (in url varchar, in threads int := null, in batch_size int := 1, in fn varchar := null, in dta any := null)\n"
"{\n"
@@ -15947,7 +15487,7 @@ static const char *proc328 =
"}\n"
"--src vfs.sql:331\n";
-static const char *proc329 =
+static const char *proc323 =
"#line 344 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_STATUS_GET (in _tgt varchar, in _root varchar)\n"
"{\n"
@@ -15959,7 +15499,7 @@ static const char *proc329 =
"}\n"
"--src vfs.sql:342\n";
-static const char *proc330 =
+static const char *proc324 =
"#line 354 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_STATUS_SET (in _tgt varchar, in _root varchar, in _stat varchar)\n"
"{\n"
@@ -15967,7 +15507,7 @@ static const char *proc330 =
"}\n"
"--src vfs.sql:352\n";
-static const char *proc331 =
+static const char *proc325 =
"#line 361 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SERV_QUEUE_TOP (in _tgt varchar, in _root varchar, in _upd integer,\n"
"in _dbg integer, in _fn varchar, in _clnt_data any, in threads int := null, in batch_size int := 1)\n"
@@ -15999,7 +15539,7 @@ static const char *proc331 =
"}\n"
"--src vfs.sql:359\n";
-static const char *proc332 =
+static const char *proc326 =
"#line 396 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SERV_QUEUE (in _tgt varchar, in _root varchar, in _upd integer,\n"
"in _dbg integer, in _fn varchar, in _clnt_data any, in nthreads int := null, in batch_size int := 1)\n"
@@ -16148,7 +15688,7 @@ static const char *proc332 =
"}\n"
"--src vfs.sql:394\n";
-static const char *proc333 =
+static const char *proc327 =
"#line 543 \"[executable]/vfs.sql\"\n"
"create procedure ERR_MAIL_SEND (in _tgt varchar, in _urls varchar, in _root varchar, in _stat varchar, in _msg varchar)\n"
"{\n"
@@ -16170,7 +15710,7 @@ static const char *proc333 =
"}\n"
"--src vfs.sql:541\n";
-static const char *proc334 =
+static const char *proc328 =
"#line 563 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.LOCAL_STORE (in _host varchar, in _url varchar, in _root varchar,\n"
"inout _content varchar, in _s_etag varchar, in _c_type varchar,\n"
@@ -16284,7 +15824,7 @@ static const char *proc334 =
"}\n"
"--src vfs.sql:561\n";
-static const char *proc335 =
+static const char *proc329 =
"#line 676 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.GET_URLS (in _host varchar, in _url varchar, in _root varchar, inout _content varchar, in lev int, in ctype varchar)\n"
"{\n"
@@ -16365,7 +15905,7 @@ static const char *proc335 =
"}\n"
"--src vfs.sql:674\n";
-static const char *proc336 =
+static const char *proc330 =
"#line 756 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SITEMAP_PROCESS (in _host varchar, in _url varchar, in _root varchar, inout _content varchar, in _c_type varchar, in lev int)\n"
"{\n"
@@ -16430,7 +15970,7 @@ static const char *proc336 =
"}\n"
"--src vfs.sql:754\n";
-static const char *proc337 =
+static const char *proc331 =
"#line 819 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.MAKE_URL (in _host varchar, in _url varchar)\n"
"{\n"
@@ -16445,7 +15985,7 @@ static const char *proc337 =
"}\n"
"--src vfs.sql:817\n";
-static const char *proc338 =
+static const char *proc332 =
"#line 833 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SPLIT_URL (in _host varchar, in _url varchar, in _parent_url varchar,\n"
"out _o_host varchar, out _o_url varchar)\n"
@@ -16501,7 +16041,7 @@ static const char *proc338 =
"}\n"
"--src vfs.sql:831\n";
-static const char *proc339 =
+static const char *proc333 =
"#line 888 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.EXPAND_URL_OLD (in _url varchar, in _c_url varchar)\n"
"{\n"
@@ -16563,7 +16103,7 @@ static const char *proc339 =
"}\n"
"--src vfs.sql:886\n";
-static const char *proc340 =
+static const char *proc334 =
"#line 949 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.MKPATH (in _path any, in _own integer, in _grp integer, in _perms varchar)\n"
"{\n"
@@ -16598,7 +16138,7 @@ static const char *proc340 =
"}\n"
"--src vfs.sql:947\n";
-static const char *proc341 =
+static const char *proc335 =
"#line 983 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.FOLLOW (in _host varchar, in _root varchar, in _t_url varchar, in _flw_s varchar, in _nflw_s varchar, in _url varchar, in _img varchar)\n"
"{\n"
@@ -16665,7 +16205,7 @@ static const char *proc341 =
"}\n"
"--src vfs.sql:981\n";
-static const char *proc342 =
+static const char *proc336 =
"#line 1049 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.REPLACE_HREF (in _host varchar, in _url varchar, in _root varchar,\n"
"in _content varchar, in _c_type varchar, in conv_html int := 1)\n"
@@ -16698,7 +16238,7 @@ static const char *proc342 =
"}\n"
"--src vfs.sql:1047\n";
-static const char *proc343 =
+static const char *proc337 =
"#line 1081 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.FIND_URI (in _content varchar, in _d_imgs varchar,\n"
"in _host varchar, in _url varchar, in xp_exp varchar, out frames any, in ctype varchar)\n"
@@ -16797,7 +16337,7 @@ static const char *proc343 =
"}\n"
"--src vfs.sql:1079\n";
-static const char *proc344 =
+static const char *proc338 =
"#line 1179 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.LFS_EXP (in _host varchar, in _url varchar, in _root varchar, in _i_dst varchar)\n"
"{\n"
@@ -16873,7 +16413,7 @@ static const char *proc344 =
"}\n"
"--src vfs.sql:1177\n";
-static const char *proc345 =
+static const char *proc339 =
"#line 1255 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.FIND_KEYWORD (inout params varchar, in _pkey varchar)\n"
"{\n"
@@ -16913,7 +16453,7 @@ static const char *proc345 =
"}\n"
"--src vfs.sql:1253\n";
-static const char *proc346 =
+static const char *proc340 =
"#line 1295 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.GET_HREF_IN_ARRAY (in _content varchar, in _d_imgs varchar)\n"
"{\n"
@@ -17009,7 +16549,7 @@ static const char *proc346 =
"}\n"
"--src vfs.sql:1293\n";
-static const char *proc347 =
+static const char *proc341 =
"#line 1390 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_EXP (in _host varchar, in _url varchar, in _root varchar, in _i_dst varchar)\n"
"{\n"
@@ -17118,7 +16658,7 @@ static const char *proc347 =
"}\n"
"--src vfs.sql:1388\n";
-static const char *proc348 =
+static const char *proc342 =
"#line 1498 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_HEAD (inout _url varchar)\n"
"{\n"
@@ -17138,7 +16678,7 @@ static const char *proc348 =
"}\n"
"--src vfs.sql:1496\n";
-static const char *proc349 =
+static const char *proc343 =
"#line 1517 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_MKCOL (inout _url varchar)\n"
"{\n"
@@ -17158,7 +16698,7 @@ static const char *proc349 =
"}\n"
"--src vfs.sql:1515\n";
-static const char *proc350 =
+static const char *proc344 =
"#line 1536 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_PUT (inout _url varchar,in _content varchar)\n"
"{\n"
@@ -17176,7 +16716,7 @@ static const char *proc350 =
"}\n"
"--src vfs.sql:1534\n";
-static const char *proc351 =
+static const char *proc345 =
"#line 1553 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.DAV_PROP (inout _url varchar, in _d_imgs varchar, in _auth varchar)\n"
"{\n"
@@ -17200,7 +16740,7 @@ static const char *proc351 =
"}\n"
"--src vfs.sql:1551\n";
-static const char *proc352 =
+static const char *proc346 =
"#line 1577 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.GET_HREF_FROM_XML (in _content varchar, in _d_imgs varchar)\n"
"{\n"
@@ -17306,7 +16846,7 @@ static const char *proc352 =
"}\n"
"--src vfs.sql:1575\n";
-static const char *proc353 =
+static const char *proc347 =
"#line 1682 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.ISEMPTY (in x any)\n"
"{\n"
@@ -17321,7 +16861,7 @@ static const char *proc353 =
"}\n"
"--src vfs.sql:1680\n";
-static const char *proc354 =
+static const char *proc348 =
"#line 1704 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.URL_BY_DATE (in host varchar, in coll varchar, out url varchar, in _clnt_data any)\n"
"{\n"
@@ -17342,7 +16882,7 @@ static const char *proc354 =
"}\n"
"--src vfs.sql:1702\n";
-static const char *proc355 =
+static const char *proc349 =
"#line 1723 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_RECOVER_QUEUE_STAT (in host varchar, in coll varchar)\n"
"{\n"
@@ -17366,7 +16906,7 @@ static const char *proc355 =
"}\n"
"--src vfs.sql:1721\n";
-static const char *proc356 =
+static const char *proc350 =
"#line 1750 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_MAKE_ENTRY (\n"
"in url varchar,\n"
@@ -17391,7 +16931,7 @@ static const char *proc356 =
"}\n"
"--src vfs.sql:1748\n";
-static const char *proc357 =
+static const char *proc351 =
"#line 1773 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_GO (in url varchar)\n"
"{\n"
@@ -17401,7 +16941,7 @@ static const char *proc357 =
"}\n"
"--src vfs.sql:1771\n";
-static const char *proc358 =
+static const char *proc352 =
"#line 1782 \"[executable]/vfs.sql\"\n"
"create procedure\n"
"WS.WS.VFS_URI_COMPOSE (in res any)\n"
@@ -17440,7 +16980,7 @@ static const char *proc358 =
"}\n"
"--src vfs.sql:1780\n";
-static const char *proc359 =
+static const char *proc353 =
"#line 1820 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.VFS_EXTRACT_RDF (in _host varchar, in _root varchar, in _start_path varchar, in opts any, in url varchar, inout content any, in ctype varchar, inout outhdr any, inout inhdr any)\n"
"{\n"
@@ -17554,7 +17094,7 @@ static const char *proc359 =
"}\n"
"--src vfs.sql:1818\n";
-static const char *proc360 =
+static const char *proc354 =
"#line 1934 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SITEMAP_ENSURE_NEW_SITE (in _host varchar, in _root varchar, in _new_host varchar, in _new_url varchar)\n"
"{\n"
@@ -17569,7 +17109,7 @@ static const char *proc360 =
"}\n"
"--src vfs.sql:1932\n";
-static const char *proc361 =
+static const char *proc355 =
"#line 1948 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SITEMAP_URLS_REGISTER (in _host varchar, in _root varchar, in src_url varchar, inout xp any, in lev int := 0, in sm int := 0, in delta int := 1)\n"
"{\n"
@@ -17626,7 +17166,7 @@ static const char *proc361 =
"}\n"
"--src vfs.sql:1946\n";
-static const char *proc362 =
+static const char *proc356 =
"#line 2003 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SITEMAP_GET_LOC (inout xt any, in qr varchar, in loc varchar, in ts varchar)\n"
"{\n"
@@ -17650,7 +17190,7 @@ static const char *proc362 =
"}\n"
"--src vfs.sql:2001\n";
-static const char *proc363 =
+static const char *proc357 =
"#line 2025 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SITEMAP_XML_PARSE (in _host varchar, in _url varchar, in _root varchar, inout _content varchar, \n"
"in _c_type varchar := null, in lev int := 0)\n"
@@ -17722,7 +17262,7 @@ static const char *proc363 =
"}\n"
"--src vfs.sql:2023\n";
-static const char *proc364 =
+static const char *proc358 =
"#line 2095 \"[executable]/vfs.sql\"\n"
"create procedure WS.WS.SITEMAP_RDF_STORE (in _host varchar, in _url varchar, in _root varchar,\n"
"inout _content varchar, in _s_etag varchar, in _c_type varchar,\n"
@@ -17801,7 +17341,7 @@ static const char *proc364 =
"}\n"
"--src vfs.sql:2093\n";
-static const char *proc365 =
+static const char *proc359 =
"#line 2172 \"[executable]/vfs.sql\"\n"
"create procedure VFS_ROBOTS_PARSE (in txt varchar, in ua varchar, out delay_sec float)\n"
"{\n"
@@ -17858,7 +17398,7 @@ static const char *proc365 =
"}\n"
"--src vfs.sql:2170\n";
-static const char *proc366 =
+static const char *proc360 =
"#line 2227 \"[executable]/vfs.sql\"\n"
"create procedure VFS_ROBOTS_GET (in _host varchar, in _root varchar, inout site_delay_sec float)\n"
"{\n"
@@ -17890,12 +17430,12 @@ static const char *xsl7[]= {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
" -\n"
-" - $Id: davxml2rdfxml.xsl,v 1.1.2.1 2012/03/08 12:54:59 source Exp $\n"
+" - $Id: davxml2rdfxml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -18011,12 +17551,12 @@ static const char *xsl8[]= {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
" -\n"
-" - $Id: davxml2n3xml.xsl,v 1.1.2.1 2012/03/08 12:54:59 source Exp $\n"
+" - $Id: davxml2n3xml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -18108,12 +17648,12 @@ static const char *xsl9[]= {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
" -\n"
-" - $Id: rdfxml2n3xml.xsl,v 1.1.2.1 2012/03/08 12:54:59 source Exp $\n"
+" - $Id: rdfxml2n3xml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -18358,12 +17898,12 @@ static const char *xsl10[]= {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
" -\n"
-" - $Id: n3xml2uriqahtml.xsl,v 1.1.2.1 2012/03/08 12:54:59 source Exp $\n"
+" - $Id: n3xml2uriqahtml.xsl,v 1.1 2007/03/26 14:47:01 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -18457,7 +17997,7 @@ static const char *tbl1 =
")\n"
"create index URIQA_HANDLER_ORDER_NAME on WS.WS.URIQA_HANDLER (UH_ORDER, UH_NAME)\n";
-static const char *proc367 =
+static const char *proc361 =
"#line 44 \"[executable]/uriqa.sql\"\n"
"create function WS.WS.URIQA_CFG_ITEM_VALUE (in param_name varchar, in is_list integer, in dflt_value varchar)\n"
"{\n"
@@ -18499,7 +18039,7 @@ static const char *proc367 =
"}\n"
"--src uriqa.sql:42\n";
-static const char *proc368 =
+static const char *proc362 =
"#line 84 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.URIQA_LOAD_FROM_INI ()\n"
"{\n"
@@ -18552,7 +18092,7 @@ static const char *proc368 =
static const char *other9 =
"WS.WS.URIQA_LOAD_FROM_INI ()\n";
-static const char *proc369 =
+static const char *proc363 =
"#line 136 \"[executable]/uriqa.sql\"\n"
"create function WS.WS.URIQA_FULL_URI (inout path varchar, inout params varchar, inout lines varchar, in parse_params integer, in trim_prefix integer) returns varchar\n"
"{\n"
@@ -18592,7 +18132,7 @@ static const char *proc369 =
"}\n"
"--src uriqa.sql:134\n";
-static const char *proc370 =
+static const char *proc364 =
"#line 174 \"[executable]/uriqa.sql\"\n"
"create function WS.WS.URIQA_APPLY_TRIGGERS (in op varchar, inout uri varchar, inout body any, inout params varchar, inout lines varchar) returns any\n"
"{\n"
@@ -18652,7 +18192,7 @@ static const char *proc370 =
"}\n"
"--src uriqa.sql:172\n";
-static const char *proc371 =
+static const char *proc365 =
"#line 232 \"[executable]/uriqa.sql\"\n"
"create function WS.WS.URIQA_N3_DIR_LIST (inout split any, in a_uid integer)\n"
"{\n"
@@ -18691,7 +18231,7 @@ static const char *proc371 =
"}\n"
"--src uriqa.sql:230\n";
-static const char *proc372 =
+static const char *proc366 =
"#line 269 \"[executable]/uriqa.sql\"\n"
"create function DB.DBA.\"DAV_EXTRACT_DYN_RDF_application/xbel+xml\" (in id any, inout split any, inout old_prop any, in a_uid integer) returns any\n"
"{\n"
@@ -18783,7 +18323,7 @@ static const char *proc372 =
"}\n"
"--src uriqa.sql:267\n";
-static const char *proc373 =
+static const char *proc367 =
"#line 359 \"[executable]/uriqa.sql\"\n"
"create function WS.WS.URIQA_HANDLER_LOCALDAV (inout op varchar, inout uri varchar, inout split any, inout body any, inout params varchar, inout lines varchar, inout app_env any, inout is_final integer) returns any\n"
"{\n"
@@ -18995,7 +18535,7 @@ static const char *proc373 =
"}\n"
"--src uriqa.sql:357\n";
-static const char *proc374 =
+static const char *proc368 =
"#line 569 \"[executable]/uriqa.sql\"\n"
"create function WS.WS.URIQA_HANDLER_NATIVE_HTTP (inout op varchar, inout uri varchar, inout split any, inout body any, inout params varchar, inout lines varchar, inout app_env any, inout is_final integer) returns any\n"
"{\n"
@@ -19065,7 +18605,7 @@ static const char *proc374 =
"}\n"
"--src uriqa.sql:567\n";
-static const char *proc375 =
+static const char *proc369 =
"#line 637 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.URIQA_STATUS (in err_ret any, in signal_errors integer)\n"
"{\n"
@@ -19092,7 +18632,7 @@ static const char *proc375 =
"}\n"
"--src uriqa.sql:635\n";
-static const char *proc376 =
+static const char *proc370 =
"#line 665 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.\"MPUT\" (inout path varchar, inout params varchar, inout lines varchar)\n"
"{\n"
@@ -19110,7 +18650,7 @@ static const char *proc376 =
"}\n"
"--src uriqa.sql:663\n";
-static const char *proc377 =
+static const char *proc371 =
"#line 681 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.\"MGET\" (inout path varchar, inout params any, inout lines any)\n"
"{\n"
@@ -19130,7 +18670,7 @@ static const char *proc377 =
"}\n"
"--src uriqa.sql:679\n";
-static const char *proc378 =
+static const char *proc372 =
"#line 699 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.\"MDELETE\" (inout path varchar, inout params any, inout lines any)\n"
"{\n"
@@ -19148,7 +18688,7 @@ static const char *proc378 =
"}\n"
"--src uriqa.sql:697\n";
-static const char *proc379 =
+static const char *proc373 =
"#line 715 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.\"/!URIQA/\" (inout path varchar, inout params any, inout lines any)\n"
"{\n"
@@ -19193,7 +18733,7 @@ static const char *proc379 =
"}\n"
"--src uriqa.sql:713\n";
-static const char *proc380 =
+static const char *proc374 =
"#line 758 \"[executable]/uriqa.sql\"\n"
"create procedure WS.WS.URIQA_VHOST_RESET()\n"
"{\n"
@@ -19209,7 +18749,7 @@ static const char *proc380 =
/* DET_CatFilter.sql */
-static const char *proc381 =
+static const char *proc375 =
"#line 32 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_AUTHENTICATE\" (in id any, in what char(1), in req varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer)\n"
"{\n"
@@ -19255,7 +18795,7 @@ static const char *proc381 =
"}\n"
"--src DET_CatFilter.sql:30\n";
-static const char *proc382 =
+static const char *proc376 =
"#line 77 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_GET_CONDITION\" (in detcol_id integer, out cfc_id integer, out rfc_spath varchar, out rfc_list_cond any, out rfc_del_action any)\n"
"{\n"
@@ -19273,7 +18813,7 @@ static const char *proc382 =
"}\n"
"--src DET_CatFilter.sql:75\n";
-static const char *proc383 =
+static const char *proc377 =
"#line 94 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_ENCODE_CATVALUE\" (in val varchar) returns varchar\n"
"{\n"
@@ -19311,7 +18851,7 @@ static const char *proc383 =
"}\n"
"--src DET_CatFilter.sql:92\n";
-static const char *proc384 =
+static const char *proc378 =
"#line 131 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DECODE_CATVALUE\" (in catval varchar, out crop integer)\n"
"{\n"
@@ -19348,7 +18888,7 @@ static const char *proc384 =
"}\n"
"--src DET_CatFilter.sql:129\n";
-static const char *proc385 =
+static const char *proc379 =
"#line 167 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_PATH_PARTS_TO_FILTER\" (inout path_parts any, out schema_uri varchar, out filter_data any) returns integer\n"
"{\n"
@@ -19403,7 +18943,7 @@ static const char *proc385 =
"}\n"
"--src DET_CatFilter.sql:165\n";
-static const char *proc386 =
+static const char *proc380 =
"#line 221 \"[executable]/DET_CatFilter.sql\"\n"
"create procedure \"CatFilter_ACC_FILTER_DATA\" (inout filter any, inout filter_data any)\n"
"{\n"
@@ -19427,7 +18967,7 @@ static const char *proc386 =
"}\n"
"--src DET_CatFilter.sql:219\n";
-static const char *proc387 =
+static const char *proc381 =
"#line 244 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_SEARCH_ID_IMPL\" (in detcol_id any, in path_parts any, in what char(1), inout cfc_id integer, inout rfc_spath varchar, inout rfc_list_cond any, inout rfc_del_action any, inout filter_data any) returns any\n"
"{\n"
@@ -19520,7 +19060,7 @@ static const char *proc387 =
"}\n"
"--src DET_CatFilter.sql:242\n";
-static const char *proc388 =
+static const char *proc382 =
"#line 336 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_AUTHENTICATE_HTTP\" (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -19573,7 +19113,7 @@ static const char *proc388 =
"}\n"
"--src DET_CatFilter.sql:334\n";
-static const char *proc389 =
+static const char *proc383 =
"#line 388 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_GET_PARENT\" (in id any, in st char(1), in path varchar) returns any\n"
"{\n"
@@ -19596,7 +19136,7 @@ static const char *proc389 =
"}\n"
"--src DET_CatFilter.sql:386\n";
-static const char *proc390 =
+static const char *proc384 =
"#line 410 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_COL_CREATE\" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -19605,7 +19145,7 @@ static const char *proc390 =
"}\n"
"--src DET_CatFilter.sql:408\n";
-static const char *proc391 =
+static const char *proc385 =
"#line 418 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_COL_MOUNT\" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -19614,7 +19154,7 @@ static const char *proc391 =
"}\n"
"--src DET_CatFilter.sql:416\n";
-static const char *proc392 =
+static const char *proc386 =
"#line 426 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_COL_MOUNT_HERE\" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -19623,7 +19163,7 @@ static const char *proc392 =
"}\n"
"--src DET_CatFilter.sql:424\n";
-static const char *proc393 =
+static const char *proc387 =
"#line 434 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_DELETE\" (in detcol_id any, in path_parts any, in what char(1), in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -19675,7 +19215,7 @@ static const char *proc393 =
"}\n"
"--src DET_CatFilter.sql:432\n";
-static const char *proc394 =
+static const char *proc388 =
"#line 485 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_FILTER_TO_CONDITION\" (inout schema_uri varchar, inout filter_data any, inout cond any) returns integer\n"
"{\n"
@@ -19704,7 +19244,7 @@ static const char *proc394 =
"}\n"
"--src DET_CatFilter.sql:483\n";
-static const char *proc395 =
+static const char *proc389 =
"#line 512 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_RES_UPLOAD\" (in detcol_id any, in path_parts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -19756,7 +19296,7 @@ static const char *proc395 =
"}\n"
"--src DET_CatFilter.sql:510\n";
-static const char *proc396 =
+static const char *proc390 =
"#line 562 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_PROP_REMOVE\" (in id any, in st char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -19770,7 +19310,7 @@ static const char *proc396 =
"}\n"
"--src DET_CatFilter.sql:560\n";
-static const char *proc397 =
+static const char *proc391 =
"#line 575 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_PROP_SET\" (in id any, in st char(0), in propname varchar, in propvalue any, in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -19786,7 +19326,7 @@ static const char *proc397 =
"}\n"
"--src DET_CatFilter.sql:573\n";
-static const char *proc398 =
+static const char *proc392 =
"#line 590 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_PROP_GET\" (in id any, in what char(0), in propname varchar, in auth_uid integer)\n"
"{\n"
@@ -19806,7 +19346,7 @@ static const char *proc398 =
"}\n"
"--src DET_CatFilter.sql:588\n";
-static const char *proc399 =
+static const char *proc393 =
"#line 609 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_PROP_LIST\" (in id any, in what char(0), in propmask varchar, in auth_uid integer)\n"
"{\n"
@@ -19824,7 +19364,7 @@ static const char *proc399 =
"}\n"
"--src DET_CatFilter.sql:607\n";
-static const char *proc400 =
+static const char *proc394 =
"#line 626 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_DIR_SINGLE\" (in id any, in what char(0), in path any, in auth_uid integer) returns any\n"
"{\n"
@@ -19921,7 +19461,7 @@ static const char *proc400 =
"}\n"
"--src DET_CatFilter.sql:624\n";
-static const char *proc401 =
+static const char *proc395 =
"#line 722 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_LIST_SCHEMAS\" (in rfc_spath varchar, inout rfc_list_cond any, in auth_uid integer) returns any\n"
"{\n"
@@ -19929,7 +19469,7 @@ static const char *proc401 =
"}\n"
"--src DET_CatFilter.sql:720\n";
-static const char *proc402 =
+static const char *proc396 =
"#line 728 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_LIST_SCHEMA_PROPS\" (in rfc_spath varchar, inout rfc_list_cond any, inout schema_uri varchar, inout filter_data any, in auth_uid integer) returns any\n"
"{\n"
@@ -19960,7 +19500,7 @@ static const char *proc402 =
"}\n"
"--src DET_CatFilter.sql:726\n";
-static const char *proc403 =
+static const char *proc397 =
"#line 758 \"[executable]/DET_CatFilter.sql\"\n"
"create procedure \"CatFilter_GET_RDF_INVERSE_HITS_DISTVALS\" (in cfc_id integer, inout filter_data any, inout distval_dict any, in auth_uid integer)\n"
"{\n"
@@ -20176,7 +19716,7 @@ static const char *proc403 =
"}\n"
"--src DET_CatFilter.sql:756\n";
-static const char *proc404 =
+static const char *proc398 =
"#line 973 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_GET_RDF_INVERSE_HITS_RES_IDS\" (in cfc_id integer, inout filter_data any, in auth_uid integer) returns any\n"
"{\n"
@@ -20345,7 +19885,7 @@ static const char *proc404 =
"}\n"
"--src DET_CatFilter.sql:971\n";
-static const char *proc405 =
+static const char *proc399 =
"#line 1141 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_LIST_PROP_DISTVALS_AUX\" (inout dict any, inout rfp varchar, inout vals any)\n"
"{\n"
@@ -20359,7 +19899,7 @@ static const char *proc405 =
"}\n"
"--src DET_CatFilter.sql:1139\n";
-static const char *proc406 =
+static const char *proc400 =
"#line 1153 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_LIST_PROP_DISTVALS\" (in detcol_id integer, in cfc_id integer, in rfc_spath varchar, inout rfc_list_cond any, inout schema_uri varchar, inout filter_data any, in auth_uid integer) returns any\n"
"{\n"
@@ -20432,7 +19972,7 @@ static const char *proc406 =
"}\n"
"--src DET_CatFilter.sql:1151\n";
-static const char *proc407 =
+static const char *proc401 =
"#line 1224 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_DIR_LIST\" (in detcol_id any, in path_parts any, in detcol_path varchar, in name_mask varchar, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -20678,7 +20218,7 @@ static const char *proc407 =
"}\n"
"--src DET_CatFilter.sql:1222\n";
-static const char *proc408 =
+static const char *proc402 =
"#line 1469 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_DIR_FILTER\" (in detcol_id any, in path_parts any, in detcol_path varchar, inout compilation any, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -20734,7 +20274,7 @@ static const char *proc408 =
"}\n"
"--src DET_CatFilter.sql:1467\n";
-static const char *proc409 =
+static const char *proc403 =
"#line 1524 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_SEARCH_ID\" (in detcol_id any, in path_parts any, in what char(1)) returns any\n"
"{\n"
@@ -20749,7 +20289,7 @@ static const char *proc409 =
"}\n"
"--src DET_CatFilter.sql:1522\n";
-static const char *proc410 =
+static const char *proc404 =
"#line 1538 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
@@ -20777,7 +20317,7 @@ static const char *proc410 =
"}\n"
"--src DET_CatFilter.sql:1536\n";
-static const char *proc411 =
+static const char *proc405 =
"#line 1565 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_RES_UPLOAD_COPY\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -20834,7 +20374,7 @@ static const char *proc411 =
"}\n"
"--src DET_CatFilter.sql:1563\n";
-static const char *proc412 =
+static const char *proc406 =
"#line 1621 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_RES_UPLOAD_MOVE\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -20888,7 +20428,7 @@ static const char *proc412 =
"}\n"
"--src DET_CatFilter.sql:1619\n";
-static const char *proc413 =
+static const char *proc407 =
"#line 1674 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_RES_CONTENT\" (in id any, inout content any, out type varchar, in content_mode integer) returns integer\n"
"{\n"
@@ -20904,7 +20444,7 @@ static const char *proc413 =
"}\n"
"--src DET_CatFilter.sql:1672\n";
-static const char *proc414 =
+static const char *proc408 =
"#line 1689 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_SYMLINK\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -20913,7 +20453,7 @@ static const char *proc414 =
"}\n"
"--src DET_CatFilter.sql:1687\n";
-static const char *proc415 =
+static const char *proc409 =
"#line 1697 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_LOCK\" (in path any, inout id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any\n"
"{\n"
@@ -20929,7 +20469,7 @@ static const char *proc415 =
"}\n"
"--src DET_CatFilter.sql:1695\n";
-static const char *proc416 =
+static const char *proc410 =
"#line 1712 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_UNLOCK\" (in id any, in type char(1), in token varchar, in auth_uid integer)\n"
"{\n"
@@ -20940,7 +20480,7 @@ static const char *proc416 =
"}\n"
"--src DET_CatFilter.sql:1710\n";
-static const char *proc417 =
+static const char *proc411 =
"#line 1722 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_IS_LOCKED\" (inout id any, inout type char(1), in owned_tokens varchar) returns integer\n"
"{\n"
@@ -20965,7 +20505,7 @@ static const char *proc417 =
"}\n"
"--src DET_CatFilter.sql:1720\n";
-static const char *proc418 =
+static const char *proc412 =
"#line 1746 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_DAV_LIST_LOCKS\" (in id any, in type char(1), in recursive integer) returns any\n"
"{\n"
@@ -20983,7 +20523,7 @@ static const char *proc418 =
"}\n"
"--src DET_CatFilter.sql:1744\n";
-static const char *proc419 =
+static const char *proc413 =
"#line 1763 \"[executable]/DET_CatFilter.sql\"\n"
"create function \"CatFilter_CONFIGURE\" (in col any, in search_path varchar, in filter any, in auth_uname varchar := \'dav\', in auth_upwd varchar := \'dav\', in auth_uid integer := null) returns integer\n"
"{\n"
@@ -21057,7 +20597,7 @@ static const char *proc419 =
"}\n"
"--src DET_CatFilter.sql:1761\n";
-static const char *proc420 =
+static const char *proc414 =
"#line 1836 \"[executable]/DET_CatFilter.sql\"\n"
"create procedure \"CatFilter_FEED_DAV_RDF_INVERSE\" (inout propval any, inout propparent integer, in is_del integer := 0, in cfid integer := null)\n"
"{\n"
@@ -21187,7 +20727,7 @@ static const char *trig37 =
"}\n"
"--src DET_CatFilter.sql:1940\n";
-static const char *proc421 =
+static const char *proc415 =
"#line 1962 \"[executable]/DET_CatFilter.sql\"\n"
"create procedure \"CatFilter_INIT_SYS_DAV_RDF_INVERSE\" (in run_if_once integer)\n"
"{\n"
@@ -21290,7 +20830,7 @@ static const char *tbl6 =
"primary key (HRI_TOPCOL_ID, HRI_PROP_CATID, HRI_CATVALUE, HRI_RES_ID)\n"
")\n";
-static const char *proc422 =
+static const char *proc416 =
"#line 98 \"[executable]/DET_HostFs.sql\"\n"
"create procedure WS.WS.HOSTFS_FEED_RDF_INVERSE (inout propval any, in r_id integer, in is_del integer, in topcol_id integer)\n"
"{\n"
@@ -21359,7 +20899,7 @@ static const char *other10 =
"DB.DBA.vt_create_text_index (fix_identifier_case (\'WS.WS.HOSTFS_RES_META\'), fix_identifier_case (\'RESM_DATA\'), fix_identifier_case (\'RESM_ID\'), 2, 0, NULL, 0, \'*ini*\', \'*ini*\')\n";
static const char *other11 =
"DB.DBA.vt_batch_update (fix_identifier_case (\'WS.WS.HOSTFS_RES_META\'), \'ON\', 1)\n";
-static const char *proc423 =
+static const char *proc417 =
"#line 171 \"[executable]/DET_HostFs.sql\"\n"
"create function WS.WS.HOSTFS_RES_TOPCOL_ID (in r_id integer) returns integer\n"
"{\n"
@@ -21377,7 +20917,7 @@ static const char *proc423 =
"}\n"
"--src DET_HostFs.sql:169\n";
-static const char *proc424 =
+static const char *proc418 =
"#line 187 \"[executable]/DET_HostFs.sql\"\n"
"create procedure WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF (in resid integer, in resname varchar, in restype varchar, inout rescontent any, in topcol_id integer)\n"
"{\n"
@@ -21407,7 +20947,7 @@ static const char *proc424 =
"}\n"
"--src DET_HostFs.sql:185\n";
-static const char *proc425 =
+static const char *proc419 =
"#line 215 \"[executable]/DET_HostFs.sql\"\n"
"create procedure WS.WS.HOSTFS_TEST_RDF (in d_id integer)\n"
"{\n"
@@ -21443,7 +20983,7 @@ static const char *proc425 =
"}\n"
"--src DET_HostFs.sql:213\n";
-static const char *proc426 =
+static const char *proc420 =
"#line 249 \"[executable]/DET_HostFs.sql\"\n"
"create function\n"
"WS.WS.HOSTFS_RES_CACHE_RESC_DATA_INDEX_HOOK (inout vtb any, inout d_id integer) returns integer\n"
@@ -21486,7 +21026,7 @@ static const char *proc426 =
"}\n"
"--src DET_HostFs.sql:247\n";
-static const char *proc427 =
+static const char *proc421 =
"#line 290 \"[executable]/DET_HostFs.sql\"\n"
"create function\n"
"WS.WS.HOSTFS_RES_CACHE_RESC_DATA_UNINDEX_HOOK (inout vtb any, inout d_id integer) returns integer\n"
@@ -21515,7 +21055,7 @@ static const char *other12 =
"DB.DBA.vt_create_text_index (fix_identifier_case (\'WS.WS.HOSTFS_RES_CACHE\'), fix_identifier_case (\'RESC_DATA\'), fix_identifier_case (\'RESC_ID\'), 2, 0, NULL, 1, \'*ini*\', \'*ini*\')\n";
static const char *other13 =
"DB.DBA.vt_batch_update (fix_identifier_case (\'WS.WS.HOSTFS_RES_CACHE\'), \'ON\', 5)\n";
-static const char *proc428 =
+static const char *proc422 =
"#line 325 \"[executable]/DET_HostFs.sql\"\n"
"create function\n"
"WS.WS.HOSTFS_FIND_COL (in full_path varchar) returns integer\n"
@@ -21555,7 +21095,7 @@ static const char *proc428 =
"}\n"
"--src DET_HostFs.sql:323\n";
-static const char *proc429 =
+static const char *proc423 =
"#line 363 \"[executable]/DET_HostFs.sql\"\n"
"create procedure\n"
"WS.WS.HOSTFS_COL_DISAPPEARS (in full_path varchar)\n"
@@ -21577,7 +21117,7 @@ static const char *proc429 =
"}\n"
"--src DET_HostFs.sql:361\n";
-static const char *proc430 =
+static const char *proc424 =
"#line 383 \"[executable]/DET_HostFs.sql\"\n"
"create procedure\n"
"WS.WS.HOSTFS_HANDLE_RES_SCAN (in full_path varchar, in c_id integer, in flen integer, in cr_time datetime, in mod_time datetime, in mimetype varchar, in ft_mode varchar)\n"
@@ -21627,7 +21167,7 @@ static const char *proc430 =
"}\n"
"--src DET_HostFs.sql:381\n";
-static const char *proc431 =
+static const char *proc425 =
"#line 431 \"[executable]/DET_HostFs.sql\"\n"
"create procedure\n"
"WS.WS.HOSTFS_RES_DISAPPEARS (in full_path varchar)\n"
@@ -21650,7 +21190,7 @@ static const char *proc431 =
"}\n"
"--src DET_HostFs.sql:429\n";
-static const char *proc432 =
+static const char *proc426 =
"#line 452 \"[executable]/DET_HostFs.sql\"\n"
"create function\n"
"WS.WS.HOSTFS_TOUCH_RES (in ospath varchar) returns integer\n"
@@ -21671,7 +21211,7 @@ static const char *proc432 =
"}\n"
"--src DET_HostFs.sql:450\n";
-static const char *proc433 =
+static const char *proc427 =
"#line 471 \"[executable]/DET_HostFs.sql\"\n"
"create procedure\n"
"WS.WS.HOSTFS_GLOBAL_RESET ()\n"
@@ -21686,7 +21226,7 @@ static const char *proc433 =
"}\n"
"--src DET_HostFs.sql:469\n";
-static const char *proc434 =
+static const char *proc428 =
"#line 484 \"[executable]/DET_HostFs.sql\"\n"
"create function\n"
"WS.WS.HOSTFS_PATH_STAT (in full_path varchar, out flen integer, out cr_time datetime, out mod_time datetime) returns integer\n"
@@ -21701,7 +21241,7 @@ static const char *proc434 =
"}\n"
"--src DET_HostFs.sql:482\n";
-static const char *proc435 =
+static const char *proc429 =
"#line 497 \"[executable]/DET_HostFs.sql\"\n"
"create procedure\n"
"WS.WS.HOSTFS_READ_TYPEINFO (in full_path varchar, out mimetype varchar, out ft_mode varchar)\n"
@@ -21724,7 +21264,7 @@ static const char *proc435 =
"}\n"
"--src DET_HostFs.sql:495\n";
-static const char *proc436 =
+static const char *proc430 =
"#line 519 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_AUTHENTICATE\" (in id any, in what char(1), in req varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer)\n"
"{\n"
@@ -21747,7 +21287,7 @@ static const char *proc436 =
"}\n"
"--src DET_HostFs.sql:517\n";
-static const char *proc437 =
+static const char *proc431 =
"#line 540 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_AUTHENTICATE_HTTP\" (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -21794,7 +21334,7 @@ static const char *proc437 =
"}\n"
"--src DET_HostFs.sql:538\n";
-static const char *proc438 =
+static const char *proc432 =
"#line 585 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_GET_PARENT\" (in id any, in st char(1), in path varchar) returns any\n"
"{\n"
@@ -21803,7 +21343,7 @@ static const char *proc438 =
"}\n"
"--src DET_HostFs.sql:583\n";
-static const char *proc439 =
+static const char *proc433 =
"#line 592 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_COL_CREATE\" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -21817,7 +21357,7 @@ static const char *proc439 =
"}\n"
"--src DET_HostFs.sql:590\n";
-static const char *proc440 =
+static const char *proc434 =
"#line 604 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_COL_MOUNT\" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -21826,7 +21366,7 @@ static const char *proc440 =
"}\n"
"--src DET_HostFs.sql:602\n";
-static const char *proc441 =
+static const char *proc435 =
"#line 611 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_COL_MOUNT_HERE\" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -21835,7 +21375,7 @@ static const char *proc441 =
"}\n"
"--src DET_HostFs.sql:609\n";
-static const char *proc442 =
+static const char *proc436 =
"#line 618 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_DELETE\" (in detcol_id any, in path_parts any, in what char(1), in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -21851,7 +21391,7 @@ static const char *proc442 =
static const char *tbl7 =
"create table \"HostFs_DAV_RES_UPLOAD\" (ID varchar primary key, DT datetime, CNT long varchar)\n";
-static const char *proc443 =
+static const char *proc437 =
"#line 632 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_RES_UPLOAD\" (in detcol_id any, in path_parts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -21876,7 +21416,7 @@ static const char *proc443 =
"}\n"
"--src DET_HostFs.sql:630\n";
-static const char *proc444 =
+static const char *proc438 =
"#line 655 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_PROP_REMOVE\" (in id any, in what char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -21885,7 +21425,7 @@ static const char *proc444 =
"}\n"
"--src DET_HostFs.sql:653\n";
-static const char *proc445 =
+static const char *proc439 =
"#line 662 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_PROP_SET\" (in id any, in what char(0), in propname varchar, in propvalue any, in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -21898,7 +21438,7 @@ static const char *proc445 =
"}\n"
"--src DET_HostFs.sql:660\n";
-static const char *proc446 =
+static const char *proc440 =
"#line 673 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_PROP_GET\" (in id any, in what char(0), in propname varchar, in auth_uid integer)\n"
"{\n"
@@ -21915,7 +21455,7 @@ static const char *proc446 =
"}\n"
"--src DET_HostFs.sql:671\n";
-static const char *proc447 =
+static const char *proc441 =
"#line 688 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_PROP_LIST\" (in id any, in what char(0), in propmask varchar, in auth_uid integer)\n"
"{\n"
@@ -21932,7 +21472,7 @@ static const char *proc447 =
"}\n"
"--src DET_HostFs.sql:686\n";
-static const char *proc448 =
+static const char *proc442 =
"#line 703 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_ID_TO_OSPATH\" (in col any)\n"
"{\n"
@@ -21944,7 +21484,7 @@ static const char *proc448 =
"}\n"
"--src DET_HostFs.sql:701\n";
-static const char *proc449 =
+static const char *proc443 =
"#line 713 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_DIR_SINGLE\" (in id any, in what char(0), in path any, in auth_uid integer) returns any\n"
"{\n"
@@ -21984,7 +21524,7 @@ static const char *proc449 =
"}\n"
"--src DET_HostFs.sql:711\n";
-static const char *proc450 =
+static const char *proc444 =
"#line 751 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_DIR_LIST\" (in detcol_id any, in path_parts any, in detcol_path varchar, in name_mask varchar, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -22102,7 +21642,7 @@ static const char *proc450 =
"}\n"
"--src DET_HostFs.sql:749\n";
-static const char *proc451 =
+static const char *proc445 =
"#line 868 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_DIR_FILTER\" (in detcol_id any, in path_parts any, in detcol_path varchar, in compilation varchar, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -22111,7 +21651,7 @@ static const char *proc451 =
"}\n"
"--src DET_HostFs.sql:866\n";
-static const char *proc452 =
+static const char *proc446 =
"#line 876 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_SEARCH_ID\" (in detcol_id any, in path_parts any, in what char(1)) returns any\n"
"{\n"
@@ -22149,7 +21689,7 @@ static const char *proc452 =
"}\n"
"--src DET_HostFs.sql:874\n";
-static const char *proc453 =
+static const char *proc447 =
"#line 912 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
@@ -22171,7 +21711,7 @@ static const char *proc453 =
"}\n"
"--src DET_HostFs.sql:910\n";
-static const char *proc454 =
+static const char *proc448 =
"#line 932 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_RES_UPLOAD_COPY\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -22199,7 +21739,7 @@ static const char *proc454 =
"}\n"
"--src DET_HostFs.sql:930\n";
-static const char *proc455 =
+static const char *proc449 =
"#line 958 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_RES_UPLOAD_MOVE\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -22230,7 +21770,7 @@ static const char *proc455 =
"}\n"
"--src DET_HostFs.sql:956\n";
-static const char *proc456 =
+static const char *proc450 =
"#line 987 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_RES_CONTENT\" (in id any, inout content any, out type varchar, in content_mode integer) returns integer\n"
"{\n"
@@ -22253,7 +21793,7 @@ static const char *proc456 =
"}\n"
"--src DET_HostFs.sql:985\n";
-static const char *proc457 =
+static const char *proc451 =
"#line 1008 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_SYMLINK\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -22262,7 +21802,7 @@ static const char *proc457 =
"}\n"
"--src DET_HostFs.sql:1006\n";
-static const char *proc458 =
+static const char *proc452 =
"#line 1015 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_LOCK\" (in path any, in id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any\n"
"{\n"
@@ -22271,7 +21811,7 @@ static const char *proc458 =
"}\n"
"--src DET_HostFs.sql:1013\n";
-static const char *proc459 =
+static const char *proc453 =
"#line 1022 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_UNLOCK\" (in id any, in type char(1), in token varchar, in auth_uid integer)\n"
"{\n"
@@ -22280,7 +21820,7 @@ static const char *proc459 =
"}\n"
"--src DET_HostFs.sql:1020\n";
-static const char *proc460 =
+static const char *proc454 =
"#line 1029 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_IS_LOCKED\" (inout id any, inout type char(1), in owned_tokens varchar) returns integer\n"
"{\n"
@@ -22301,7 +21841,7 @@ static const char *proc460 =
"}\n"
"--src DET_HostFs.sql:1027\n";
-static const char *proc461 =
+static const char *proc455 =
"#line 1048 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_DAV_LIST_LOCKS\" (in id any, in type char(1), in recursive integer) returns any\n"
"{\n"
@@ -22310,7 +21850,7 @@ static const char *proc461 =
"}\n"
"--src DET_HostFs.sql:1046\n";
-static const char *proc462 =
+static const char *proc456 =
"#line 1055 \"[executable]/DET_HostFs.sql\"\n"
"create procedure \"HostFs_CF_LIST_PROP_DISTVALS\" (in detcol_id integer, in cfc_id integer, in rfc_spath varchar, inout rfc_list_cond any, in schema_uri varchar, inout filter_data any, inout distval_dict any, in auth_uid integer)\n"
"{\n"
@@ -22540,7 +22080,7 @@ static const char *proc462 =
"}\n"
"--src DET_HostFs.sql:1053\n";
-static const char *proc463 =
+static const char *proc457 =
"#line 1284 \"[executable]/DET_HostFs.sql\"\n"
"create function \"HostFs_CF_GET_RDF_HITS\" (in detcol_id integer, in cfc_id integer, in rfc_spath varchar, inout rfc_list_cond any, in schema_uri varchar, inout filter_data any, in detcol_path varchar, in make_diritems integer, in auth_uid integer) returns any\n"
"{\n"
@@ -22759,7 +22299,7 @@ static const char *proc463 =
"}\n"
"--src DET_HostFs.sql:1282\n";
-static const char *proc464 =
+static const char *proc458 =
"#line 1502 \"[executable]/DET_HostFs.sql\"\n"
"create procedure \"HostFs_RF_ID2SUFFIX\" (in id any, in what char(1))\n"
"{\n"
@@ -22795,7 +22335,7 @@ static const char *proc464 =
"}\n"
"--src DET_HostFs.sql:1500\n";
-static const char *proc465 =
+static const char *proc459 =
"#line 1536 \"[executable]/DET_HostFs.sql\"\n"
"create procedure \"HostFile_RF_SUFFIX2ID\" (in suffix varchar, in what char(1))\n"
"{\n"
@@ -22821,7 +22361,7 @@ static const char *proc465 =
"}\n"
"--src DET_HostFs.sql:1534\n";
-static const char *proc466 =
+static const char *proc460 =
"#line 1560 \"[executable]/DET_HostFs.sql\"\n"
"create procedure \"HostDir_RF_SUFFIX2ID\" (in suffix varchar, in what char(1))\n"
"{\n"
@@ -22848,7 +22388,7 @@ static const char *proc466 =
/* DET_ResFilter.sql */
-static const char *proc467 =
+static const char *proc461 =
"#line 26 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_AUTHENTICATE\" (in id any, in what char(1), in req varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer)\n"
"{\n"
@@ -22874,7 +22414,7 @@ static const char *proc467 =
"}\n"
"--src DET_ResFilter.sql:24\n";
-static const char *proc468 =
+static const char *proc462 =
"#line 51 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_NORM\" (in value any) returns varchar\n"
"{\n"
@@ -22888,7 +22428,7 @@ static const char *proc468 =
"}\n"
"--src DET_ResFilter.sql:49\n";
-static const char *proc469 =
+static const char *proc463 =
"#line 64 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_ENCODE_FILTER\" (in filt any) returns varchar\n"
"{\n"
@@ -22900,7 +22440,7 @@ static const char *proc469 =
"}\n"
"--src DET_ResFilter.sql:62\n";
-static const char *proc470 =
+static const char *proc464 =
"#line 75 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DECODE_FILTER\" (in value any) returns any\n"
"{\n"
@@ -22912,7 +22452,7 @@ static const char *proc470 =
"}\n"
"--src DET_ResFilter.sql:73\n";
-static const char *proc471 =
+static const char *proc465 =
"#line 86 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_GET_CONDITION\" (in detcol_id integer, out rfc_spath varchar, out rfc_list_cond any, out rfc_del_action any)\n"
"{\n"
@@ -22929,7 +22469,7 @@ static const char *proc471 =
"}\n"
"--src DET_ResFilter.sql:84\n";
-static const char *proc472 =
+static const char *proc466 =
"#line 102 \"[executable]/DET_ResFilter.sql\"\n"
"create procedure \"ResFilter_FIT_INTO_CONDITION\" (in id any, in what char (1), inout rfc_list_cond any, in auth_uid integer)\n"
"{\n"
@@ -23084,7 +22624,7 @@ static const char *proc472 =
"}\n"
"--src DET_ResFilter.sql:100\n";
-static const char *proc473 =
+static const char *proc467 =
"#line 256 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_MAKE_DEL_ACTION_FROM_CONDITION\" (inout rfc_list_cond any) returns any\n"
"{\n"
@@ -23120,7 +22660,7 @@ static const char *proc473 =
"}\n"
"--src DET_ResFilter.sql:254\n";
-static const char *proc474 =
+static const char *proc468 =
"#line 291 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_LEAVE_CONDITION\" (in id integer, in what char (1), in rfc_del_action any, in auth_uid integer) returns integer\n"
"{\n"
@@ -23129,7 +22669,7 @@ static const char *proc474 =
"}\n"
"--src DET_ResFilter.sql:289\n";
-static const char *proc475 =
+static const char *proc469 =
"#line 299 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_FNMERGE\" (in path any, in id any) returns varchar\n"
"{\n"
@@ -23150,7 +22690,7 @@ static const char *proc475 =
"}\n"
"--src DET_ResFilter.sql:297\n";
-static const char *proc476 =
+static const char *proc470 =
"#line 319 \"[executable]/DET_ResFilter.sql\"\n"
"create procedure \"ResFilter_FNSPLIT\" (in path any, out colpath varchar, out orig_fnameext varchar, out id any)\n"
"{\n"
@@ -23188,7 +22728,7 @@ static const char *proc476 =
"}\n"
"--src DET_ResFilter.sql:317\n";
-static const char *proc477 =
+static const char *proc471 =
"#line 356 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_SEARCH_ID_IMPL\" (in detcol_id any, in path_parts any, in what char(1), inout rfc_spath varchar, inout rfc_list_cond any, inout rfc_del_action any) returns any\n"
"{\n"
@@ -23235,7 +22775,7 @@ static const char *proc477 =
"}\n"
"--src DET_ResFilter.sql:354\n";
-static const char *proc478 =
+static const char *proc472 =
"#line 402 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_AUTHENTICATE_HTTP\" (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -23289,7 +22829,7 @@ static const char *proc478 =
"}\n"
"--src DET_ResFilter.sql:400\n";
-static const char *proc479 =
+static const char *proc473 =
"#line 455 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_GET_PARENT\" (in id any, in st char(1), in path varchar) returns any\n"
"{\n"
@@ -23300,7 +22840,7 @@ static const char *proc479 =
"}\n"
"--src DET_ResFilter.sql:453\n";
-static const char *proc480 =
+static const char *proc474 =
"#line 465 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_COL_CREATE\" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23309,7 +22849,7 @@ static const char *proc480 =
"}\n"
"--src DET_ResFilter.sql:463\n";
-static const char *proc481 =
+static const char *proc475 =
"#line 473 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_COL_MOUNT\" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23318,7 +22858,7 @@ static const char *proc481 =
"}\n"
"--src DET_ResFilter.sql:471\n";
-static const char *proc482 =
+static const char *proc476 =
"#line 481 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_COL_MOUNT_HERE\" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23327,7 +22867,7 @@ static const char *proc482 =
"}\n"
"--src DET_ResFilter.sql:479\n";
-static const char *proc483 =
+static const char *proc477 =
"#line 489 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_DELETE\" (in detcol_id any, in path_parts any, in what char(1), in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -23345,7 +22885,7 @@ static const char *proc483 =
"}\n"
"--src DET_ResFilter.sql:487\n";
-static const char *proc484 =
+static const char *proc478 =
"#line 505 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_RES_UPLOAD\" (in detcol_id any, in path_parts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23354,7 +22894,7 @@ static const char *proc484 =
"}\n"
"--src DET_ResFilter.sql:503\n";
-static const char *proc485 =
+static const char *proc479 =
"#line 513 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_PROP_REMOVE\" (in id any, in st char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -23368,7 +22908,7 @@ static const char *proc485 =
"}\n"
"--src DET_ResFilter.sql:511\n";
-static const char *proc486 =
+static const char *proc480 =
"#line 526 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_PROP_SET\" (in id any, in st char(0), in propname varchar, in propvalue any, in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23384,7 +22924,7 @@ static const char *proc486 =
"}\n"
"--src DET_ResFilter.sql:524\n";
-static const char *proc487 =
+static const char *proc481 =
"#line 541 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_PROP_GET\" (in id any, in what char(0), in propname varchar, in auth_uid integer)\n"
"{\n"
@@ -23404,7 +22944,7 @@ static const char *proc487 =
"}\n"
"--src DET_ResFilter.sql:539\n";
-static const char *proc488 =
+static const char *proc482 =
"#line 560 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_PROP_LIST\" (in id any, in what char(0), in propmask varchar, in auth_uid integer)\n"
"{\n"
@@ -23420,7 +22960,7 @@ static const char *proc488 =
"}\n"
"--src DET_ResFilter.sql:558\n";
-static const char *proc489 =
+static const char *proc483 =
"#line 575 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_DIR_SINGLE\" (in id any, in what char(0), in path any, in auth_uid integer) returns any\n"
"{\n"
@@ -23472,7 +23012,7 @@ static const char *proc489 =
"}\n"
"--src DET_ResFilter.sql:573\n";
-static const char *proc490 =
+static const char *proc484 =
"#line 626 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_DIR_LIST\" (in detcol_id any, in path_parts any, in detcol_path varchar, in name_mask varchar, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23532,7 +23072,7 @@ static const char *proc490 =
"}\n"
"--src DET_ResFilter.sql:624\n";
-static const char *proc491 =
+static const char *proc485 =
"#line 685 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_DIR_FILTER\" (in detcol_id any, in path_parts any, in detcol_path varchar, inout compilation any, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23592,7 +23132,7 @@ static const char *proc491 =
"}\n"
"--src DET_ResFilter.sql:683\n";
-static const char *proc492 =
+static const char *proc486 =
"#line 744 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_SEARCH_ID\" (in detcol_id any, in path_parts any, in what char(1)) returns any\n"
"{\n"
@@ -23608,7 +23148,7 @@ static const char *proc492 =
"}\n"
"--src DET_ResFilter.sql:742\n";
-static const char *proc493 =
+static const char *proc487 =
"#line 759 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
@@ -23617,7 +23157,7 @@ static const char *proc493 =
"}\n"
"--src DET_ResFilter.sql:757\n";
-static const char *proc494 =
+static const char *proc488 =
"#line 767 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_RES_UPLOAD_COPY\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23663,7 +23203,7 @@ static const char *proc494 =
"}\n"
"--src DET_ResFilter.sql:765\n";
-static const char *proc495 =
+static const char *proc489 =
"#line 812 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_RES_UPLOAD_MOVE\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23706,7 +23246,7 @@ static const char *proc495 =
"}\n"
"--src DET_ResFilter.sql:810\n";
-static const char *proc496 =
+static const char *proc490 =
"#line 854 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_RES_CONTENT\" (in id any, inout content any, out type varchar, in content_mode integer) returns integer\n"
"{\n"
@@ -23722,7 +23262,7 @@ static const char *proc496 =
"}\n"
"--src DET_ResFilter.sql:852\n";
-static const char *proc497 =
+static const char *proc491 =
"#line 869 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_SYMLINK\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23731,7 +23271,7 @@ static const char *proc497 =
"}\n"
"--src DET_ResFilter.sql:867\n";
-static const char *proc498 =
+static const char *proc492 =
"#line 877 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_LOCK\" (in path any, in id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any\n"
"{\n"
@@ -23747,7 +23287,7 @@ static const char *proc498 =
"}\n"
"--src DET_ResFilter.sql:875\n";
-static const char *proc499 =
+static const char *proc493 =
"#line 892 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_UNLOCK\" (in id any, in type char(1), in token varchar, in auth_uid integer)\n"
"{\n"
@@ -23758,7 +23298,7 @@ static const char *proc499 =
"}\n"
"--src DET_ResFilter.sql:890\n";
-static const char *proc500 =
+static const char *proc494 =
"#line 902 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_IS_LOCKED\" (inout id any, inout type char(1), in owned_tokens varchar) returns integer\n"
"{\n"
@@ -23783,7 +23323,7 @@ static const char *proc500 =
"}\n"
"--src DET_ResFilter.sql:900\n";
-static const char *proc501 =
+static const char *proc495 =
"#line 926 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_DAV_LIST_LOCKS\" (in id any, in type char(1), in recursive integer) returns any\n"
"{\n"
@@ -23801,7 +23341,7 @@ static const char *proc501 =
"}\n"
"--src DET_ResFilter.sql:924\n";
-static const char *proc502 =
+static const char *proc496 =
"#line 943 \"[executable]/DET_ResFilter.sql\"\n"
"create function \"ResFilter_CONFIGURE\" (in col any, in search_path varchar, in filter any) returns integer\n"
"{\n"
@@ -23842,7 +23382,7 @@ static const char *proc502 =
/* DET_PropFilter.sql */
-static const char *proc503 =
+static const char *proc497 =
"#line 26 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_AUTHENTICATE\" (in id any, in what char(1), in req varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer)\n"
"{\n"
@@ -23853,7 +23393,7 @@ static const char *proc503 =
"}\n"
"--src DET_PropFilter.sql:24\n";
-static const char *proc504 =
+static const char *proc498 =
"#line 36 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_NORM\" (in value any) returns varchar\n"
"{\n"
@@ -23867,7 +23407,7 @@ static const char *proc504 =
"}\n"
"--src DET_PropFilter.sql:34\n";
-static const char *proc505 =
+static const char *proc499 =
"#line 49 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_GET_CONDITION\" (in detcol_id integer, out pfc_spath varchar, out pfc_name varchar, out pfc_value varchar)\n"
"{\n"
@@ -23884,7 +23424,7 @@ static const char *proc505 =
"}\n"
"--src DET_PropFilter.sql:47\n";
-static const char *proc506 =
+static const char *proc500 =
"#line 65 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_FIT_INTO_CONDITION\" (in id integer, in what char (1), in pfc_name varchar, in pfc_value varchar)\n"
"{\n"
@@ -23908,7 +23448,7 @@ static const char *proc506 =
"}\n"
"--src DET_PropFilter.sql:63\n";
-static const char *proc507 =
+static const char *proc501 =
"#line 88 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_LEAVE_CONDITION\" (in id integer, in what char (1), in pfc_name varchar, in pfc_value varchar) returns integer\n"
"{\n"
@@ -23917,7 +23457,7 @@ static const char *proc507 =
"}\n"
"--src DET_PropFilter.sql:86\n";
-static const char *proc508 =
+static const char *proc502 =
"#line 96 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_FNMERGE\" (in path any, in id integer) returns varchar\n"
"{\n"
@@ -23929,7 +23469,7 @@ static const char *proc508 =
"}\n"
"--src DET_PropFilter.sql:94\n";
-static const char *proc509 =
+static const char *proc503 =
"#line 107 \"[executable]/DET_PropFilter.sql\"\n"
"create procedure \"PropFilter_FNSPLIT\" (in path any, out colpath varchar, out orig_fnameext varchar, out id integer)\n"
"{\n"
@@ -23956,7 +23496,7 @@ static const char *proc509 =
"}\n"
"--src DET_PropFilter.sql:105\n";
-static const char *proc510 =
+static const char *proc504 =
"#line 133 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_SEARCH_ID_IMPL\" (in detcol_id any, in path_parts any, in what char(1), inout pfc_spath varchar, inout pfc_name varchar, inout pfc_value varchar) returns any\n"
"{\n"
@@ -24011,7 +23551,7 @@ static const char *proc510 =
"}\n"
"--src DET_PropFilter.sql:131\n";
-static const char *proc511 =
+static const char *proc505 =
"#line 187 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_AUTHENTICATE_HTTP\" (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -24065,7 +23605,7 @@ static const char *proc511 =
"}\n"
"--src DET_PropFilter.sql:185\n";
-static const char *proc512 =
+static const char *proc506 =
"#line 240 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_GET_PARENT\" (in id any, in st char(1), in path varchar) returns any\n"
"{\n"
@@ -24076,7 +23616,7 @@ static const char *proc512 =
"}\n"
"--src DET_PropFilter.sql:238\n";
-static const char *proc513 =
+static const char *proc507 =
"#line 250 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_COL_CREATE\" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24085,7 +23625,7 @@ static const char *proc513 =
"}\n"
"--src DET_PropFilter.sql:248\n";
-static const char *proc514 =
+static const char *proc508 =
"#line 258 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_COL_MOUNT\" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24094,7 +23634,7 @@ static const char *proc514 =
"}\n"
"--src DET_PropFilter.sql:256\n";
-static const char *proc515 =
+static const char *proc509 =
"#line 266 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_COL_MOUNT_HERE\" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24103,7 +23643,7 @@ static const char *proc515 =
"}\n"
"--src DET_PropFilter.sql:264\n";
-static const char *proc516 =
+static const char *proc510 =
"#line 274 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_DELETE\" (in detcol_id any, in path_parts any, in what char(1), in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -24118,7 +23658,7 @@ static const char *proc516 =
"}\n"
"--src DET_PropFilter.sql:272\n";
-static const char *proc517 =
+static const char *proc511 =
"#line 288 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_RES_UPLOAD\" (in detcol_id any, in path_parts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24127,7 +23667,7 @@ static const char *proc517 =
"}\n"
"--src DET_PropFilter.sql:286\n";
-static const char *proc518 =
+static const char *proc512 =
"#line 296 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_PROP_REMOVE\" (in id any, in st char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -24141,7 +23681,7 @@ static const char *proc518 =
"}\n"
"--src DET_PropFilter.sql:294\n";
-static const char *proc519 =
+static const char *proc513 =
"#line 309 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_PROP_SET\" (in id any, in st char(0), in propname varchar, in propvalue any, in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24157,7 +23697,7 @@ static const char *proc519 =
"}\n"
"--src DET_PropFilter.sql:307\n";
-static const char *proc520 =
+static const char *proc514 =
"#line 324 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_PROP_GET\" (in id any, in what char(0), in propname varchar, in auth_uid integer)\n"
"{\n"
@@ -24177,7 +23717,7 @@ static const char *proc520 =
"}\n"
"--src DET_PropFilter.sql:322\n";
-static const char *proc521 =
+static const char *proc515 =
"#line 343 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_PROP_LIST\" (in id any, in what char(0), in propmask varchar, in auth_uid integer)\n"
"{\n"
@@ -24192,7 +23732,7 @@ static const char *proc521 =
"}\n"
"--src DET_PropFilter.sql:341\n";
-static const char *proc522 =
+static const char *proc516 =
"#line 357 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_DIR_SINGLE\" (in id any, in what char(0), in path any, in auth_uid integer) returns any\n"
"{\n"
@@ -24240,7 +23780,7 @@ static const char *proc522 =
"}\n"
"--src DET_PropFilter.sql:355\n";
-static const char *proc523 =
+static const char *proc517 =
"#line 404 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_DIR_LIST\" (in detcol_id any, in path_parts any, in detcol_path varchar, in name_mask varchar, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24311,7 +23851,7 @@ static const char *proc523 =
"}\n"
"--src DET_PropFilter.sql:402\n";
-static const char *proc524 =
+static const char *proc518 =
"#line 474 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_DIR_FILTER\" (in detcol_id any, in path_parts any, in detcol_path varchar, inout compilation any, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24394,7 +23934,7 @@ static const char *proc524 =
"}\n"
"--src DET_PropFilter.sql:472\n";
-static const char *proc525 =
+static const char *proc519 =
"#line 556 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_SEARCH_ID\" (in detcol_id any, in path_parts any, in what char(1)) returns any\n"
"{\n"
@@ -24409,7 +23949,7 @@ static const char *proc525 =
"}\n"
"--src DET_PropFilter.sql:554\n";
-static const char *proc526 =
+static const char *proc520 =
"#line 570 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
@@ -24418,7 +23958,7 @@ static const char *proc526 =
"}\n"
"--src DET_PropFilter.sql:568\n";
-static const char *proc527 =
+static const char *proc521 =
"#line 578 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_RES_UPLOAD_COPY\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24461,7 +24001,7 @@ static const char *proc527 =
"}\n"
"--src DET_PropFilter.sql:576\n";
-static const char *proc528 =
+static const char *proc522 =
"#line 620 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_RES_UPLOAD_MOVE\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24501,7 +24041,7 @@ static const char *proc528 =
"}\n"
"--src DET_PropFilter.sql:618\n";
-static const char *proc529 =
+static const char *proc523 =
"#line 659 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_RES_CONTENT\" (in id any, inout content any, out type varchar, in content_mode integer) returns integer\n"
"{\n"
@@ -24517,7 +24057,7 @@ static const char *proc529 =
"}\n"
"--src DET_PropFilter.sql:657\n";
-static const char *proc530 =
+static const char *proc524 =
"#line 674 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_SYMLINK\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24526,7 +24066,7 @@ static const char *proc530 =
"}\n"
"--src DET_PropFilter.sql:672\n";
-static const char *proc531 =
+static const char *proc525 =
"#line 682 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_LOCK\" (in path any, inout id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24542,7 +24082,7 @@ static const char *proc531 =
"}\n"
"--src DET_PropFilter.sql:680\n";
-static const char *proc532 =
+static const char *proc526 =
"#line 697 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_UNLOCK\" (in id any, in type char(1), in token varchar, in auth_uid integer)\n"
"{\n"
@@ -24553,7 +24093,7 @@ static const char *proc532 =
"}\n"
"--src DET_PropFilter.sql:695\n";
-static const char *proc533 =
+static const char *proc527 =
"#line 707 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_IS_LOCKED\" (inout id any, inout type char(1), in owned_tokens varchar) returns integer\n"
"{\n"
@@ -24578,7 +24118,7 @@ static const char *proc533 =
"}\n"
"--src DET_PropFilter.sql:705\n";
-static const char *proc534 =
+static const char *proc528 =
"#line 731 \"[executable]/DET_PropFilter.sql\"\n"
"create function \"PropFilter_DAV_LIST_LOCKS\" (in id any, in type char(1), in recursive integer) returns any\n"
"{\n"
@@ -24598,7 +24138,7 @@ static const char *proc534 =
/* DET_RDFData.sql */
-static const char *proc535 =
+static const char *proc529 =
"#line 26 \"[executable]/DET_RDFData.sql\"\n"
"create procedure DB.DBA.RDFData_log_message (in x varchar)\n"
"{\n"
@@ -24607,7 +24147,7 @@ static const char *proc535 =
"}\n"
"--src DET_RDFData.sql:24\n";
-static const char *proc536 =
+static const char *proc530 =
"#line 33 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_AUTHENTICATE\" (in id any, in what char(1), in req varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer)\n"
"{\n"
@@ -24632,7 +24172,7 @@ static const char *proc536 =
"}\n"
"--src DET_RDFData.sql:31\n";
-static const char *proc537 =
+static const char *proc531 =
"#line 56 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_AUTHENTICATE_HTTP\" (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -24681,7 +24221,7 @@ static const char *proc537 =
"}\n"
"--src DET_RDFData.sql:54\n";
-static const char *proc538 =
+static const char *proc532 =
"#line 104 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_GET_PARENT\" (in id any, in st char(1), in path varchar) returns any\n"
"{\n"
@@ -24690,7 +24230,7 @@ static const char *proc538 =
"}\n"
"--src DET_RDFData.sql:102\n";
-static const char *proc539 =
+static const char *proc533 =
"#line 111 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_COL_CREATE\" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24699,7 +24239,7 @@ static const char *proc539 =
"}\n"
"--src DET_RDFData.sql:109\n";
-static const char *proc540 =
+static const char *proc534 =
"#line 118 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_COL_MOUNT\" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24708,7 +24248,7 @@ static const char *proc540 =
"}\n"
"--src DET_RDFData.sql:116\n";
-static const char *proc541 =
+static const char *proc535 =
"#line 125 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_COL_MOUNT_HERE\" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24717,7 +24257,7 @@ static const char *proc541 =
"}\n"
"--src DET_RDFData.sql:123\n";
-static const char *proc542 =
+static const char *proc536 =
"#line 133 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_DELETE\" (in detcol_id any, in path_parts any, in what char(1), in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -24726,7 +24266,7 @@ static const char *proc542 =
"}\n"
"--src DET_RDFData.sql:131\n";
-static const char *proc543 =
+static const char *proc537 =
"#line 140 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_RES_UPLOAD\" (in detcol_id any, in path_parts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24735,7 +24275,7 @@ static const char *proc543 =
"}\n"
"--src DET_RDFData.sql:138\n";
-static const char *proc544 =
+static const char *proc538 =
"#line 148 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_PROP_REMOVE\" (in id any, in what char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -24744,7 +24284,7 @@ static const char *proc544 =
"}\n"
"--src DET_RDFData.sql:146\n";
-static const char *proc545 =
+static const char *proc539 =
"#line 155 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_PROP_SET\" (in id any, in what char(0), in propname varchar, in propvalue any, in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -24757,7 +24297,7 @@ static const char *proc545 =
"}\n"
"--src DET_RDFData.sql:153\n";
-static const char *proc546 =
+static const char *proc540 =
"#line 166 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_PROP_GET\" (in id any, in what char(0), in propname varchar, in auth_uid integer)\n"
"{\n"
@@ -24766,7 +24306,7 @@ static const char *proc546 =
"}\n"
"--src DET_RDFData.sql:164\n";
-static const char *proc547 =
+static const char *proc541 =
"#line 174 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_PROP_LIST\" (in id any, in what char(0), in propmask varchar, in auth_uid integer)\n"
"{\n"
@@ -24775,7 +24315,7 @@ static const char *proc547 =
"}\n"
"--src DET_RDFData.sql:172\n";
-static const char *proc548 =
+static const char *proc542 =
"#line 181 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_ACCESS_PARAMS\" (in detcol_id any, out access varchar, out gid integer, out uid integer)\n"
"{\n"
@@ -24795,7 +24335,7 @@ static const char *proc548 =
"}\n"
"--src DET_RDFData.sql:179\n";
-static const char *proc549 =
+static const char *proc543 =
"#line 199 \"[executable]/DET_RDFData.sql\"\n"
"create procedure DB.DBA.RDFData_cast_dt_silent (in d any)\n"
"{\n"
@@ -24812,7 +24352,7 @@ static const char *proc549 =
"}\n"
"--src DET_RDFData.sql:197\n";
-static const char *proc550 =
+static const char *proc544 =
"#line 214 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_DIR_SINGLE\" (in id any, in what char(0), in path any, in auth_uid integer) returns any\n"
"{\n"
@@ -24843,7 +24383,7 @@ static const char *proc550 =
"}\n"
"--src DET_RDFData.sql:212\n";
-static const char *proc551 =
+static const char *proc545 =
"#line 244 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_DIR_LIST\" (in detcol_id any, in path_parts any, in detcol_path varchar, in name_mask varchar, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -25065,7 +24605,7 @@ static const char *proc551 =
"}\n"
"--src DET_RDFData.sql:242\n";
-static const char *proc552 =
+static const char *proc546 =
"#line 465 \"[executable]/DET_RDFData.sql\"\n"
"create function RDFData_std_pref (in iri varchar, in rev int := 0)\n"
"{\n"
@@ -25109,7 +24649,7 @@ static const char *proc552 =
"}\n"
"--src DET_RDFData.sql:463\n";
-static const char *proc553 =
+static const char *proc547 =
"#line 507 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_DIR_FILTER\" (in detcol_id any, in path_parts any, in detcol_path varchar, inout compilation any, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -25119,7 +24659,7 @@ static const char *proc553 =
"}\n"
"--src DET_RDFData.sql:505\n";
-static const char *proc554 =
+static const char *proc548 =
"#line 515 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_SEARCH_ID\" (in detcol_id any, in path_parts any, in what char(1)) returns any\n"
"{\n"
@@ -25172,7 +24712,7 @@ static const char *proc554 =
"}\n"
"--src DET_RDFData.sql:513\n";
-static const char *proc555 =
+static const char *proc549 =
"#line 566 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
@@ -25187,7 +24727,7 @@ static const char *proc555 =
"}\n"
"--src DET_RDFData.sql:564\n";
-static const char *proc556 =
+static const char *proc550 =
"#line 579 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_RES_UPLOAD_COPY\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -25196,7 +24736,7 @@ static const char *proc556 =
"}\n"
"--src DET_RDFData.sql:577\n";
-static const char *proc557 =
+static const char *proc551 =
"#line 586 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_RES_UPLOAD_MOVE\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in auth_uid integer) returns any\n"
"{\n"
@@ -25205,7 +24745,7 @@ static const char *proc557 =
"}\n"
"--src DET_RDFData.sql:584\n";
-static const char *proc558 =
+static const char *proc552 =
"#line 593 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_RES_CONTENT\" (in id any, inout content any, out type varchar, in content_mode integer) returns integer\n"
"{\n"
@@ -25309,7 +24849,7 @@ static const char *proc558 =
"}\n"
"--src DET_RDFData.sql:591\n";
-static const char *proc559 =
+static const char *proc553 =
"#line 695 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_SYMLINK\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -25318,7 +24858,7 @@ static const char *proc559 =
"}\n"
"--src DET_RDFData.sql:693\n";
-static const char *proc560 =
+static const char *proc554 =
"#line 702 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_DEREFERENCE_LIST\" (in detcol_id any, inout report_array any) returns any\n"
"{\n"
@@ -25327,7 +24867,7 @@ static const char *proc560 =
"}\n"
"--src DET_RDFData.sql:700\n";
-static const char *proc561 =
+static const char *proc555 =
"#line 709 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_RESOLVE_PATH\" (in detcol_id any, inout reference_item any, inout old_base varchar, inout new_base varchar) returns any\n"
"{\n"
@@ -25335,7 +24875,7 @@ static const char *proc561 =
"}\n"
"--src DET_RDFData.sql:707\n";
-static const char *proc562 =
+static const char *proc556 =
"#line 715 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_LOCK\" (in path any, in id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any\n"
"{\n"
@@ -25344,7 +24884,7 @@ static const char *proc562 =
"}\n"
"--src DET_RDFData.sql:713\n";
-static const char *proc563 =
+static const char *proc557 =
"#line 723 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_UNLOCK\" (in id any, in type char(1), in token varchar, in auth_uid integer)\n"
"{\n"
@@ -25353,7 +24893,7 @@ static const char *proc563 =
"}\n"
"--src DET_RDFData.sql:721\n";
-static const char *proc564 =
+static const char *proc558 =
"#line 730 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_IS_LOCKED\" (inout id any, inout type char(1), in owned_tokens varchar) returns integer\n"
"{\n"
@@ -25362,7 +24902,7 @@ static const char *proc564 =
"}\n"
"--src DET_RDFData.sql:728\n";
-static const char *proc565 =
+static const char *proc559 =
"#line 738 \"[executable]/DET_RDFData.sql\"\n"
"create function DB.DBA.\"RDFData_DAV_LIST_LOCKS\" (in id any, in type char(1), in recursive integer) returns any\n"
"{\n"
@@ -25371,7 +24911,7 @@ static const char *proc565 =
"}\n"
"--src DET_RDFData.sql:736\n";
-static const char *proc566 =
+static const char *proc560 =
"#line 745 \"[executable]/DET_RDFData.sql\"\n"
"create procedure DB.DBA.\"RDFData_MAKE_DET_COL\" (in path varchar, in gr varchar := null, in lg varchar := null)\n"
"{\n"
@@ -25389,7 +24929,7 @@ static const char *proc566 =
/* DET_S3.sql */
-static const char *proc567 =
+static const char *proc561 =
"#line 25 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__encode (\n"
"in S varchar)\n"
@@ -25401,7 +24941,7 @@ static const char *proc567 =
"}\n"
"--src DET_S3.sql:23\n";
-static const char *proc568 =
+static const char *proc562 =
"#line 37 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__params (\n"
"in colID integer,\n"
@@ -25415,7 +24955,7 @@ static const char *proc568 =
"}\n"
"--src DET_S3.sql:35\n";
-static const char *proc569 =
+static const char *proc563 =
"#line 51 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__parts2path (\n"
"in bucket varchar,\n"
@@ -25436,7 +24976,7 @@ static const char *proc569 =
"}\n"
"--src DET_S3.sql:49\n";
-static const char *proc570 =
+static const char *proc564 =
"#line 72 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__item2entry (\n"
"in detcolID integer,\n"
@@ -25486,7 +25026,7 @@ static const char *proc570 =
"}\n"
"--src DET_S3.sql:70\n";
-static const char *proc571 =
+static const char *proc565 =
"#line 121 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__headers2item (\n"
"in headers varchat,\n"
@@ -25507,7 +25047,7 @@ static const char *proc571 =
"}\n"
"--src DET_S3.sql:119\n";
-static const char *proc572 =
+static const char *proc566 =
"#line 143 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__makeHostUrl (\n"
"in path varchar,\n"
@@ -25541,7 +25081,7 @@ static const char *proc572 =
"}\n"
"--src DET_S3.sql:141\n";
-static const char *proc573 =
+static const char *proc567 =
"#line 177 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__getBucketFromUrl (\n"
"in url varchar)\n"
@@ -25555,7 +25095,7 @@ static const char *proc573 =
"}\n"
"--src DET_S3.sql:175\n";
-static const char *proc574 =
+static const char *proc568 =
"#line 191 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__getNameFromUrl (\n"
"in url varchar)\n"
@@ -25569,7 +25109,7 @@ static const char *proc574 =
"}\n"
"--src DET_S3.sql:189\n";
-static const char *proc575 =
+static const char *proc569 =
"#line 205 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__getPathFromUrl (\n"
"in url varchar)\n"
@@ -25583,7 +25123,7 @@ static const char *proc575 =
"}\n"
"--src DET_S3.sql:203\n";
-static const char *proc576 =
+static const char *proc570 =
"#line 219 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__makeAWSHeader (\n"
"in accessCode varchar,\n"
@@ -25604,7 +25144,7 @@ static const char *proc576 =
"}\n"
"--src DET_S3.sql:217\n";
-static const char *proc577 =
+static const char *proc571 =
"#line 240 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__getBuckets (\n"
"in accessCode varchar,\n"
@@ -25658,7 +25198,7 @@ static const char *proc577 =
"}\n"
"--src DET_S3.sql:238\n";
-static const char *proc578 =
+static const char *proc572 =
"#line 296 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__getBucket (\n"
"in accessCode varchar,\n"
@@ -25723,7 +25263,7 @@ static const char *proc578 =
"}\n"
"--src DET_S3.sql:294\n";
-static const char *proc579 =
+static const char *proc573 =
"#line 361 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__putObject (\n"
"in accessCode varchar,\n"
@@ -25764,7 +25304,7 @@ static const char *proc579 =
"}\n"
"--src DET_S3.sql:359\n";
-static const char *proc580 =
+static const char *proc574 =
"#line 402 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__headObject (\n"
"in accessCode varchar,\n"
@@ -25816,7 +25356,7 @@ static const char *proc580 =
"}\n"
"--src DET_S3.sql:400\n";
-static const char *proc581 =
+static const char *proc575 =
"#line 454 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__getObject (\n"
"in accessCode varchar,\n"
@@ -25851,7 +25391,7 @@ static const char *proc581 =
"}\n"
"--src DET_S3.sql:452\n";
-static const char *proc582 =
+static const char *proc576 =
"#line 489 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.S3__deleteObject (\n"
"in accessCode varchar,\n"
@@ -25895,7 +25435,7 @@ static const char *proc582 =
"}\n"
"--src DET_S3.sql:487\n";
-static const char *proc583 =
+static const char *proc577 =
"#line 533 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_AUTHENTICATE\" (in id any, in what char(1), in req varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer)\n"
"{\n"
@@ -25906,7 +25446,7 @@ static const char *proc583 =
"}\n"
"--src DET_S3.sql:531\n";
-static const char *proc584 =
+static const char *proc578 =
"#line 547 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_AUTHENTICATE_HTTP\" (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -25961,7 +25501,7 @@ static const char *proc584 =
"}\n"
"--src DET_S3.sql:545\n";
-static const char *proc585 =
+static const char *proc579 =
"#line 603 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_GET_PARENT\" (in id any, in st char(1), in path varchar) returns any\n"
"{\n"
@@ -25970,7 +25510,7 @@ static const char *proc585 =
"}\n"
"--src DET_S3.sql:601\n";
-static const char *proc586 =
+static const char *proc580 =
"#line 612 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_COL_CREATE\" (in detcolID any, in pathParts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -25987,7 +25527,7 @@ static const char *proc586 =
"}\n"
"--src DET_S3.sql:610\n";
-static const char *proc587 =
+static const char *proc581 =
"#line 628 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_DELETE\" (\n"
"in detcolID any,\n"
@@ -26005,17 +25545,26 @@ static const char *proc587 =
"}\n"
"--src DET_S3.sql:626\n";
-static const char *proc588 =
-"#line 659 \"[executable]/DET_S3.sql\"\n"
+static const char *proc582 =
+"#line 648 \"[executable]/DET_S3.sql\"\n"
+"create function DB.DBA.\"S3_DAV_RES_UPLOAD\" (in detcolID any, in pathParts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
+"{\n"
+"\n"
+"return -20;\n"
+"}\n"
+"--src DET_S3.sql:646\n";
+
+static const char *proc583 =
+"#line 658 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_PROP_REMOVE\" (in id any, in what char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer\n"
"{\n"
"\n"
"return -20;\n"
"}\n"
-"--src DET_S3.sql:657\n";
+"--src DET_S3.sql:656\n";
-static const char *proc589 =
-"#line 668 \"[executable]/DET_S3.sql\"\n"
+static const char *proc584 =
+"#line 667 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_PROP_SET\" (in id any, in what char(0), in propname varchar, in propvalue any, in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
"\n"
@@ -26024,28 +25573,28 @@ static const char *proc589 =
"\n"
"return -20;\n"
"}\n"
-"--src DET_S3.sql:666\n";
+"--src DET_S3.sql:665\n";
-static const char *proc590 =
-"#line 679 \"[executable]/DET_S3.sql\"\n"
+static const char *proc585 =
+"#line 678 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_PROP_GET\" (in id any, in what char(0), in propname varchar, in auth_uid integer)\n"
"{\n"
"\n"
"return -11;\n"
"}\n"
-"--src DET_S3.sql:677\n";
+"--src DET_S3.sql:676\n";
-static const char *proc591 =
-"#line 688 \"[executable]/DET_S3.sql\"\n"
+static const char *proc586 =
+"#line 687 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_PROP_LIST\" (in id any, in what char(0), in propmask varchar, in auth_uid integer)\n"
"{\n"
"\n"
"return vector ();\n"
"}\n"
-"--src DET_S3.sql:686\n";
+"--src DET_S3.sql:685\n";
-static const char *proc592 =
-"#line 696 \"[executable]/DET_S3.sql\"\n"
+static const char *proc587 =
+"#line 695 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_DIR_SINGLE\" (\n"
"in id any,\n"
"in what char(0),\n"
@@ -26066,10 +25615,10 @@ static const char *proc592 =
"detcolPath := DB.DBA.DAV_SEARCH_PATH (detcolID, \'C\');\n"
"return DB.DBA.S3__item2entry (detcolID, detcolPath, bucket, s3Object);\n"
"}\n"
-"--src DET_S3.sql:694\n";
+"--src DET_S3.sql:693\n";
-static const char *proc593 =
-"#line 719 \"[executable]/DET_S3.sql\"\n"
+static const char *proc588 =
+"#line 718 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_DIR_LIST\" (\n"
"in detcolID any,\n"
"in pathParts any,\n"
@@ -26103,19 +25652,19 @@ static const char *proc593 =
"}\n"
"return res;\n"
"}\n"
-"--src DET_S3.sql:717\n";
+"--src DET_S3.sql:716\n";
-static const char *proc594 =
-"#line 755 \"[executable]/DET_S3.sql\"\n"
+static const char *proc589 =
+"#line 754 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_DIR_FILTER\" (in detcolID any, in pathParts any, in detcol_path varchar, inout compilation any, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
"\n"
"return vector();\n"
"}\n"
-"--src DET_S3.sql:753\n";
+"--src DET_S3.sql:752\n";
-static const char *proc595 =
-"#line 763 \"[executable]/DET_S3.sql\"\n"
+static const char *proc590 =
+"#line 762 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_SEARCH_ID\" (\n"
"in detcolID any,\n"
"in pathParts any,\n"
@@ -26132,10 +25681,10 @@ static const char *proc595 =
"return -1;\n"
"return vector (UNAME\'S3\', detcolID, s3Path);\n"
"}\n"
-"--src DET_S3.sql:761\n";
+"--src DET_S3.sql:760\n";
-static const char *proc596 =
-"#line 782 \"[executable]/DET_S3.sql\"\n"
+static const char *proc591 =
+"#line 781 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_SEARCH_PATH\" (\n"
"in id any,\n"
"in what char(1)) returns any\n"
@@ -26156,10 +25705,10 @@ static const char *proc596 =
"return -23;\n"
"return rtrim (detcolPath, \'/\') || get_keyword (\'path\', s3Object);\n"
"}\n"
-"--src DET_S3.sql:780\n";
+"--src DET_S3.sql:779\n";
-static const char *proc597 =
-"#line 804 \"[executable]/DET_S3.sql\"\n"
+static const char *proc592 =
+"#line 803 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_RES_UPLOAD\" (\n"
"in detcolID any,\n"
"in pathParts any,\n"
@@ -26179,10 +25728,10 @@ static const char *proc597 =
"return -1;\n"
"return vector (UNAME\'S3\', detcolID, s3Path);\n"
"}\n"
-"--src DET_S3.sql:802\n";
+"--src DET_S3.sql:801\n";
-static const char *proc598 =
-"#line 826 \"[executable]/DET_S3.sql\"\n"
+static const char *proc593 =
+"#line 825 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_RES_UPLOAD_COPY\" (in detcolID any, in pathParts any, in sourceID any, in what char(1), in overwrite_flags integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
"\n"
@@ -26208,10 +25757,10 @@ static const char *proc598 =
"}\n"
"return -20;\n"
"}\n"
-"--src DET_S3.sql:824\n";
+"--src DET_S3.sql:823\n";
-static const char *proc599 =
-"#line 854 \"[executable]/DET_S3.sql\"\n"
+static const char *proc594 =
+"#line 853 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_RES_UPLOAD_MOVE\" (in detcolID any, in pathParts any, in sourceID any, in what char(1), in overwrite_flags integer, in auth_uid integer) returns any\n"
"{\n"
"\n"
@@ -26240,10 +25789,10 @@ static const char *proc599 =
"}\n"
"return -20;\n"
"}\n"
-"--src DET_S3.sql:852\n";
+"--src DET_S3.sql:851\n";
-static const char *proc600 =
-"#line 886 \"[executable]/DET_S3.sql\"\n"
+static const char *proc595 =
+"#line 885 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_RES_CONTENT\" (\n"
"in id any,\n"
"inout content any,\n"
@@ -26274,55 +25823,55 @@ static const char *proc600 =
"\n"
"return 0;\n"
"}\n"
-"--src DET_S3.sql:884\n";
+"--src DET_S3.sql:883\n";
-static const char *proc601 =
-"#line 919 \"[executable]/DET_S3.sql\"\n"
+static const char *proc596 =
+"#line 918 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_SYMLINK\" (in detcolID any, in pathParts any, in sourceID any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
"\n"
"return -20;\n"
"}\n"
-"--src DET_S3.sql:917\n";
+"--src DET_S3.sql:916\n";
-static const char *proc602 =
-"#line 927 \"[executable]/DET_S3.sql\"\n"
+static const char *proc597 =
+"#line 926 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_DEREFERENCE_LIST\" (in detcolID any, inout report_array any) returns any\n"
"{\n"
"\n"
"return -20;\n"
"}\n"
-"--src DET_S3.sql:925\n";
+"--src DET_S3.sql:924\n";
-static const char *proc603 =
-"#line 935 \"[executable]/DET_S3.sql\"\n"
+static const char *proc598 =
+"#line 934 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_RESOLVE_PATH\" (in detcolID any, inout reference_item any, inout old_base varchar, inout new_base varchar) returns any\n"
"{\n"
"\n"
"return -20;\n"
"}\n"
-"--src DET_S3.sql:933\n";
+"--src DET_S3.sql:932\n";
-static const char *proc604 =
-"#line 943 \"[executable]/DET_S3.sql\"\n"
+static const char *proc599 =
+"#line 942 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_LOCK\" (in path any, in id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any\n"
"{\n"
"\n"
"return -20;\n"
"}\n"
-"--src DET_S3.sql:941\n";
+"--src DET_S3.sql:940\n";
-static const char *proc605 =
-"#line 951 \"[executable]/DET_S3.sql\"\n"
+static const char *proc600 =
+"#line 950 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_UNLOCK\" (in id any, in type char(1), in token varchar, in auth_uid integer)\n"
"{\n"
"\n"
"return -27;\n"
"}\n"
-"--src DET_S3.sql:949\n";
+"--src DET_S3.sql:948\n";
-static const char *proc606 =
-"#line 960 \"[executable]/DET_S3.sql\"\n"
+static const char *proc601 =
+"#line 959 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_IS_LOCKED\" (inout id any, inout Type char(1), in owned_tokens varchar) returns integer\n"
"{\n"
"\n"
@@ -26345,16 +25894,16 @@ static const char *proc606 =
"return rc;\n"
"return 0;\n"
"}\n"
-"--src DET_S3.sql:958\n";
+"--src DET_S3.sql:957\n";
-static const char *proc607 =
-"#line 986 \"[executable]/DET_S3.sql\"\n"
+static const char *proc602 =
+"#line 985 \"[executable]/DET_S3.sql\"\n"
"create function DB.DBA.\"S3_DAV_LIST_LOCKS\" (in id any, in type char(1), in recursive integer) returns any\n"
"{\n"
"\n"
"return vector ();\n"
"}\n"
-"--src DET_S3.sql:984\n";
+"--src DET_S3.sql:983\n";
/* DET_DynaRes.sql */
@@ -26381,7 +25930,7 @@ static const char *tbl8 =
"create index DYNA_RES_REFRESH_DT on WS.WS.DYNA_RES (DR_REFRESH_DT)\n"
"create index DYNA_RES_DELETE_DT on WS.WS.DYNA_RES (DR_DELETE_DT)\n";
-static const char *proc608 =
+static const char *proc603 =
"#line 51 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_ACCESS_PARAMS\" (in detcol_id any, out access varchar, out gid integer, out uid integer)\n"
"{\n"
@@ -26402,7 +25951,7 @@ static const char *proc608 =
"}\n"
"--src DET_DynaRes.sql:49\n";
-static const char *proc609 =
+static const char *proc604 =
"#line 72 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_AUTHENTICATE\" (in id any, in what char(1), in req varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer)\n"
"{\n"
@@ -26426,7 +25975,7 @@ static const char *proc609 =
"}\n"
"--src DET_DynaRes.sql:70\n";
-static const char *proc610 =
+static const char *proc605 =
"#line 99 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_AUTHENTICATE_HTTP\" (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -26478,7 +26027,7 @@ static const char *proc610 =
"}\n"
"--src DET_DynaRes.sql:97\n";
-static const char *proc611 =
+static const char *proc606 =
"#line 151 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_GET_PARENT\" (in id any, in st char(1), in path varchar) returns any\n"
"{\n"
@@ -26489,7 +26038,7 @@ static const char *proc611 =
"}\n"
"--src DET_DynaRes.sql:149\n";
-static const char *proc612 =
+static const char *proc607 =
"#line 162 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_COL_CREATE\" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26498,7 +26047,7 @@ static const char *proc612 =
"}\n"
"--src DET_DynaRes.sql:160\n";
-static const char *proc613 =
+static const char *proc608 =
"#line 170 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_COL_MOUNT\" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26507,7 +26056,7 @@ static const char *proc613 =
"}\n"
"--src DET_DynaRes.sql:168\n";
-static const char *proc614 =
+static const char *proc609 =
"#line 178 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_COL_MOUNT_HERE\" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26516,7 +26065,7 @@ static const char *proc614 =
"}\n"
"--src DET_DynaRes.sql:176\n";
-static const char *proc615 =
+static const char *proc610 =
"#line 187 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_DELETE\" (in detcol_id any, in path_parts any, in what char(1), in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -26532,7 +26081,7 @@ static const char *proc615 =
"}\n"
"--src DET_DynaRes.sql:185\n";
-static const char *proc616 =
+static const char *proc611 =
"#line 205 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_RES_UPLOAD\" (in detcol_id any, in path_parts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26542,7 +26091,7 @@ static const char *proc616 =
"}\n"
"--src DET_DynaRes.sql:203\n";
-static const char *proc617 =
+static const char *proc612 =
"#line 216 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_PROP_REMOVE\" (in id any, in what char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -26551,7 +26100,7 @@ static const char *proc617 =
"}\n"
"--src DET_DynaRes.sql:214\n";
-static const char *proc618 =
+static const char *proc613 =
"#line 225 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_PROP_SET\" (in id any, in what char(0), in propname varchar, in propvalue any, in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26564,7 +26113,7 @@ static const char *proc618 =
"}\n"
"--src DET_DynaRes.sql:223\n";
-static const char *proc619 =
+static const char *proc614 =
"#line 237 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_PROP_GET\" (in id any, in what char(0), in propname varchar, in auth_uid integer)\n"
"{\n"
@@ -26573,7 +26122,7 @@ static const char *proc619 =
"}\n"
"--src DET_DynaRes.sql:235\n";
-static const char *proc620 =
+static const char *proc615 =
"#line 246 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_PROP_LIST\" (in id any, in what char(0), in propmask varchar, in auth_uid integer)\n"
"{\n"
@@ -26582,7 +26131,7 @@ static const char *proc620 =
"}\n"
"--src DET_DynaRes.sql:244\n";
-static const char *proc621 =
+static const char *proc616 =
"#line 254 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_DIR_SINGLE\" (in id any, in what char(0), in path any, in auth_uid integer) returns any\n"
"{\n"
@@ -26616,7 +26165,7 @@ static const char *proc621 =
"}\n"
"--src DET_DynaRes.sql:252\n";
-static const char *proc622 =
+static const char *proc617 =
"#line 287 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_DIR_LIST\" (in detcol_id any, in path_parts any, in detcol_path varchar, in name_mask varchar, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26662,7 +26211,7 @@ static const char *proc622 =
"}\n"
"--src DET_DynaRes.sql:285\n";
-static const char *proc623 =
+static const char *proc618 =
"#line 332 \"[executable]/DET_DynaRes.sql\"\n"
"create procedure \"DynaRes_DAV_FC_PRED_METAS\" (inout pred_metas any)\n"
"{\n"
@@ -26695,7 +26244,7 @@ static const char *proc623 =
"}\n"
"--src DET_DynaRes.sql:330\n";
-static const char *proc624 =
+static const char *proc619 =
"#line 363 \"[executable]/DET_DynaRes.sql\"\n"
"create procedure \"DynaRes_DAV_FC_TABLE_METAS\" (inout table_metas any)\n"
"{\n"
@@ -26727,7 +26276,7 @@ static const char *proc624 =
"}\n"
"--src DET_DynaRes.sql:361\n";
-static const char *proc625 =
+static const char *proc620 =
"#line 395 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_FC_PRINT_WHERE\" (inout filter any, in param_uid integer) returns varchar\n"
"{\n"
@@ -26744,7 +26293,7 @@ static const char *proc625 =
"}\n"
"--src DET_DynaRes.sql:393\n";
-static const char *proc626 =
+static const char *proc621 =
"#line 411 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_DIR_FILTER\" (in detcol_id any, in path_parts any, in detcol_path any, inout compilation any, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26783,7 +26332,7 @@ static const char *proc626 =
"}\n"
"--src DET_DynaRes.sql:409\n";
-static const char *proc627 =
+static const char *proc622 =
"#line 449 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_SEARCH_ID\" (in detcol_id any, in path_parts any, in what char(1)) returns any\n"
"{\n"
@@ -26829,7 +26378,7 @@ static const char *proc627 =
"}\n"
"--src DET_DynaRes.sql:447\n";
-static const char *proc628 =
+static const char *proc623 =
"#line 494 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
@@ -26844,7 +26393,7 @@ static const char *proc628 =
"}\n"
"--src DET_DynaRes.sql:492\n";
-static const char *proc629 =
+static const char *proc624 =
"#line 508 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_RES_UPLOAD_COPY\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26853,7 +26402,7 @@ static const char *proc629 =
"}\n"
"--src DET_DynaRes.sql:506\n";
-static const char *proc630 =
+static const char *proc625 =
"#line 516 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_RES_UPLOAD_MOVE\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26862,7 +26411,7 @@ static const char *proc630 =
"}\n"
"--src DET_DynaRes.sql:514\n";
-static const char *proc631 =
+static const char *proc626 =
"#line 525 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_RES_CONTENT\" (in id any, inout content any, out type varchar, in content_mode integer) returns integer\n"
"{\n"
@@ -26950,7 +26499,7 @@ static const char *proc631 =
"}\n"
"--src DET_DynaRes.sql:523\n";
-static const char *proc632 =
+static const char *proc627 =
"#line 612 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_SYMLINK\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26959,7 +26508,7 @@ static const char *proc632 =
"}\n"
"--src DET_DynaRes.sql:610\n";
-static const char *proc633 =
+static const char *proc628 =
"#line 620 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_DEREFERENCE_LIST\" (in detcol_id any, inout report_array any) returns any\n"
"{\n"
@@ -26968,7 +26517,7 @@ static const char *proc633 =
"}\n"
"--src DET_DynaRes.sql:618\n";
-static const char *proc634 =
+static const char *proc629 =
"#line 628 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_RESOLVE_PATH\" (in detcol_id any, inout reference_item any, inout old_base varchar, inout new_base varchar) returns any\n"
"{\n"
@@ -26977,7 +26526,7 @@ static const char *proc634 =
"}\n"
"--src DET_DynaRes.sql:626\n";
-static const char *proc635 =
+static const char *proc630 =
"#line 636 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_LOCK\" (in path any, in id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any\n"
"{\n"
@@ -26986,7 +26535,7 @@ static const char *proc635 =
"}\n"
"--src DET_DynaRes.sql:634\n";
-static const char *proc636 =
+static const char *proc631 =
"#line 645 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_UNLOCK\" (in id any, in type char(1), in token varchar, in auth_uid integer)\n"
"{\n"
@@ -26995,7 +26544,7 @@ static const char *proc636 =
"}\n"
"--src DET_DynaRes.sql:643\n";
-static const char *proc637 =
+static const char *proc632 =
"#line 654 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_IS_LOCKED\" (inout id any, inout type char(1), in owned_tokens varchar) returns integer\n"
"{\n"
@@ -27004,7 +26553,7 @@ static const char *proc637 =
"}\n"
"--src DET_DynaRes.sql:652\n";
-static const char *proc638 =
+static const char *proc633 =
"#line 664 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_DAV_LIST_LOCKS\" (in id any, in type char(1), in recursive integer) returns any\n"
"{\n"
@@ -27013,7 +26562,7 @@ static const char *proc638 =
"}\n"
"--src DET_DynaRes.sql:662\n";
-static const char *proc639 =
+static const char *proc634 =
"#line 672 \"[executable]/DET_DynaRes.sql\"\n"
"create procedure \"DynaRes_CF_PROPNAME_TO_COLNAME\" (in prop varchar)\n"
"{\n"
@@ -27027,7 +26576,7 @@ static const char *proc639 =
"}\n"
"--src DET_DynaRes.sql:670\n";
-static const char *proc640 =
+static const char *proc635 =
"#line 684 \"[executable]/DET_DynaRes.sql\"\n"
"create procedure \"DynaRes_CF_FEED_FROM_AND_WHERE\" (in detcol_id integer, in cfc_id integer, inout rfc_list_cond any, inout filter_data any, in distexpn varchar, in auth_uid integer)\n"
"{\n"
@@ -27078,7 +26627,7 @@ static const char *proc640 =
"}\n"
"--src DET_DynaRes.sql:682\n";
-static const char *proc641 =
+static const char *proc636 =
"#line 734 \"[executable]/DET_DynaRes.sql\"\n"
"create procedure \"DynaRes_CF_LIST_PROP_DISTVALS\" (in detcol_id integer, in cfc_id integer, in rfc_spath varchar, inout rfc_list_cond any, in schema_uri varchar, inout filter_data any, inout distval_dict any, in auth_uid integer)\n"
"{\n"
@@ -27115,7 +26664,7 @@ static const char *proc641 =
"}\n"
"--src DET_DynaRes.sql:732\n";
-static const char *proc642 =
+static const char *proc637 =
"#line 769 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_CF_GET_RDF_HITS\" (in detcol_id integer, in cfc_id integer, in rfc_spath varchar, inout rfc_list_cond any, in schema_uri varchar, inout filter_data any, in detcol_path varchar, in make_diritems integer, in auth_uid integer) returns any\n"
"{\n"
@@ -27184,7 +26733,7 @@ static const char *proc642 =
"}\n"
"--src DET_DynaRes.sql:767\n";
-static const char *proc643 =
+static const char *proc638 =
"#line 836 \"[executable]/DET_DynaRes.sql\"\n"
"create function \"DynaRes_INSERT_RESOURCE\" (in detcol_id integer, inout content any, in fname varchar := null,\n"
"in perms varchar := null, in owner_uid integer := null, in owner_gid integer := null,\n"
@@ -27387,7 +26936,7 @@ static const char *trig43 =
"}\n"
"--src DET_Versioning.sql:165\n";
-static const char *proc644 =
+static const char *proc639 =
"#line 182 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_ADD_NEW_DIFF\" (in _res_id int,\n"
"in version_id int,\n"
@@ -27582,7 +27131,7 @@ static const char *trig45 =
"}\n"
"--src DET_Versioning.sql:295\n";
-static const char *proc645 =
+static const char *proc640 =
"#line 371 \"[executable]/DET_Versioning.sql\"\n"
"create function DAV_GET_VERSION_CONTENT (in res_id integer, in ver integer, inout content any, out type varchar, inout mode any)\n"
"{\n"
@@ -27657,7 +27206,7 @@ static const char *proc645 =
"}\n"
"--src DET_Versioning.sql:369\n";
-static const char *proc646 =
+static const char *proc641 =
"#line 445 \"[executable]/DET_Versioning.sql\"\n"
"create function DAV_RES_RESTORE (in VVCfolder varchar, in file varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -27699,7 +27248,7 @@ static const char *proc646 =
"}\n"
"--src DET_Versioning.sql:443\n";
-static const char *proc647 =
+static const char *proc642 =
"#line 489 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_AUTHENTICATE\" (in id any, in what char(1), in req varchar, in auth_uname varchar, in auth_pwd varchar, in auth_uid integer)\n"
"{\n"
@@ -27710,7 +27259,7 @@ static const char *proc647 =
"}\n"
"--src DET_Versioning.sql:487\n";
-static const char *proc648 =
+static const char *proc643 =
"#line 503 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_AUTHENTICATE_HTTP\" (in id any, in what char(1), in req varchar, in can_write_http integer, inout a_lines any, inout a_uname varchar, inout a_pwd varchar, inout a_uid integer, inout a_gid integer, inout _perms varchar) returns integer\n"
"{\n"
@@ -27759,7 +27308,7 @@ static const char *proc648 =
"}\n"
"--src DET_Versioning.sql:501\n";
-static const char *proc649 =
+static const char *proc644 =
"#line 552 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_GET_PARENT\" (in id any, in st char(1), in path varchar) returns any\n"
"{\n"
@@ -27770,7 +27319,7 @@ static const char *proc649 =
"}\n"
"--src DET_Versioning.sql:550\n";
-static const char *proc650 =
+static const char *proc645 =
"#line 563 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_COL_CREATE\" (in detcol_id any, in path_parts any, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -27779,7 +27328,7 @@ static const char *proc650 =
"}\n"
"--src DET_Versioning.sql:561\n";
-static const char *proc651 =
+static const char *proc646 =
"#line 571 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_COL_MOUNT\" (in detcol_id any, in path_parts any, in full_mount_path varchar, in mount_det varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -27788,7 +27337,7 @@ static const char *proc651 =
"}\n"
"--src DET_Versioning.sql:569\n";
-static const char *proc652 =
+static const char *proc647 =
"#line 579 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_COL_MOUNT_HERE\" (in parent_id any, in full_mount_path varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -27797,7 +27346,7 @@ static const char *proc652 =
"}\n"
"--src DET_Versioning.sql:577\n";
-static const char *proc653 =
+static const char *proc648 =
"#line 588 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_DELETE\" (in detcol_id any, in path_parts any, in what char(1), in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -27866,7 +27415,7 @@ static const char *proc653 =
"}\n"
"--src DET_Versioning.sql:586\n";
-static const char *proc654 =
+static const char *proc649 =
"#line 659 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_RES_UPLOAD\" (in detcol_id any, in path_parts any, inout content any, in type varchar, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -27875,7 +27424,7 @@ static const char *proc654 =
"}\n"
"--src DET_Versioning.sql:657\n";
-static const char *proc655 =
+static const char *proc650 =
"#line 669 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_PROP_REMOVE\" (in id any, in what char(0), in propname varchar, in silent integer, in auth_uid integer) returns integer\n"
"{\n"
@@ -27884,7 +27433,7 @@ static const char *proc655 =
"}\n"
"--src DET_Versioning.sql:667\n";
-static const char *proc656 =
+static const char *proc651 =
"#line 678 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_PROP_SET\" (in id any, in what char(0), in propname varchar, in propvalue any, in overwrite integer, in auth_uid integer) returns any\n"
"{\n"
@@ -27896,7 +27445,7 @@ static const char *proc656 =
"}\n"
"--src DET_Versioning.sql:676\n";
-static const char *proc657 =
+static const char *proc652 =
"#line 689 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_PROP_GET\" (in id any, in what char(0), in propname varchar, in auth_uid integer)\n"
"{\n"
@@ -27952,7 +27501,7 @@ static const char *proc657 =
"}\n"
"--src DET_Versioning.sql:687\n";
-static const char *proc658 =
+static const char *proc653 =
"#line 743 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_root_version\" (in _res_id int, in _hist_col varchar)\n"
"{\n"
@@ -27967,7 +27516,7 @@ static const char *proc658 =
"}\n"
"--src DET_Versioning.sql:741\n";
-static const char *proc659 =
+static const char *proc654 =
"#line 756 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_version_set\" (in _res_id int, in _hist_col varchar)\n"
"{\n"
@@ -27987,7 +27536,7 @@ static const char *proc659 =
"}\n"
"--src DET_Versioning.sql:754\n";
-static const char *proc660 =
+static const char *proc655 =
"#line 776 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_PROP_LIST\" (in id any, in what char(0), in propmask varchar, in auth_uid integer)\n"
"{\n"
@@ -28003,7 +27552,7 @@ static const char *proc660 =
"}\n"
"--src DET_Versioning.sql:774\n";
-static const char *proc661 =
+static const char *proc656 =
"#line 791 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_DIR_SINGLE\" (in id any, in what char(0), in path any, in auth_uid integer) returns any\n"
"{\n"
@@ -28104,7 +27653,7 @@ static const char *proc661 =
"}\n"
"--src DET_Versioning.sql:789\n";
-static const char *proc662 =
+static const char *proc657 =
"#line 890 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_GET_BASE_PATH\" (in detcol_id int)\n"
"{\n"
@@ -28112,7 +27661,7 @@ static const char *proc662 =
"}\n"
"--src DET_Versioning.sql:888\n";
-static const char *proc663 =
+static const char *proc658 =
"#line 896 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_GET_ATTIC_PATH\" (in detcol_id int)\n"
"{\n"
@@ -28120,7 +27669,7 @@ static const char *proc663 =
"}\n"
"--src DET_Versioning.sql:894\n";
-static const char *proc664 =
+static const char *proc659 =
"#line 904 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_SET_LIST\" (in detcol_id int, in _res_id int, in virt_base_path varchar, inout res any)\n"
"{\n"
@@ -28158,7 +27707,7 @@ static const char *proc664 =
"}\n"
"--src DET_Versioning.sql:902\n";
-static const char *proc665 =
+static const char *proc660 =
"#line 943 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_DIR_LIST\" (in detcol_id any, in path_parts any, in detcol_path varchar, in name_mask varchar, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -28243,7 +27792,7 @@ static const char *proc665 =
"}\n"
"--src DET_Versioning.sql:941\n";
-static const char *proc666 =
+static const char *proc661 =
"#line 1027 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_DIR_FILTER\" (in detcol_id any, in path_parts any, in detcol_path varchar, inout compilation any, in recursive integer, in auth_uid integer) returns any\n"
"{\n"
@@ -28252,7 +27801,7 @@ static const char *proc666 =
"}\n"
"--src DET_Versioning.sql:1025\n";
-static const char *proc667 =
+static const char *proc662 =
"#line 1035 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_SEARCH_ID\" (in detcol_id any, in path_parts any, in what char(1)) returns any\n"
"{\n"
@@ -28312,7 +27861,7 @@ static const char *proc667 =
"}\n"
"--src DET_Versioning.sql:1033\n";
-static const char *proc668 =
+static const char *proc663 =
"#line 1094 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_SEARCH_PATH\" (in id any, in what char(1)) returns any\n"
"{\n"
@@ -28328,7 +27877,7 @@ static const char *proc668 =
"}\n"
"--src DET_Versioning.sql:1092\n";
-static const char *proc669 =
+static const char *proc664 =
"#line 1109 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_RES_UPLOAD_COPY\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in permissions varchar, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -28337,7 +27886,7 @@ static const char *proc669 =
"}\n"
"--src DET_Versioning.sql:1107\n";
-static const char *proc670 =
+static const char *proc665 =
"#line 1117 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_RES_UPLOAD_MOVE\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite_flags integer, in auth_uid integer) returns any\n"
"{\n"
@@ -28405,7 +27954,7 @@ static const char *proc670 =
"}\n"
"--src DET_Versioning.sql:1115\n";
-static const char *proc671 =
+static const char *proc666 =
"#line 1185 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_RES_CONTENT\" (in id any, inout content any, out type varchar, in content_mode integer) returns integer\n"
"{\n"
@@ -28454,7 +28003,7 @@ static const char *proc671 =
"}\n"
"--src DET_Versioning.sql:1183\n";
-static const char *proc672 =
+static const char *proc667 =
"#line 1233 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_SYMLINK\" (in detcol_id any, in path_parts any, in source_id any, in what char(1), in overwrite integer, in uid integer, in gid integer, in auth_uid integer) returns any\n"
"{\n"
@@ -28463,7 +28012,7 @@ static const char *proc672 =
"}\n"
"--src DET_Versioning.sql:1231\n";
-static const char *proc673 =
+static const char *proc668 =
"#line 1241 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_DEREFERENCE_LIST\" (in detcol_id any, inout report_array any) returns any\n"
"{\n"
@@ -28472,7 +28021,7 @@ static const char *proc673 =
"}\n"
"--src DET_Versioning.sql:1239\n";
-static const char *proc674 =
+static const char *proc669 =
"#line 1249 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_RESOLVE_PATH\" (in detcol_id any, inout reference_item any, inout old_base varchar, inout new_base varchar) returns any\n"
"{\n"
@@ -28481,7 +28030,7 @@ static const char *proc674 =
"}\n"
"--src DET_Versioning.sql:1247\n";
-static const char *proc675 =
+static const char *proc670 =
"#line 1257 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_LOCK\" (in path any, in id any, in type char(1), inout locktype varchar, inout scope varchar, in token varchar, inout owner_name varchar, inout owned_tokens varchar, in depth varchar, in timeout_sec integer, in auth_uid integer) returns any\n"
"{\n"
@@ -28490,7 +28039,7 @@ static const char *proc675 =
"}\n"
"--src DET_Versioning.sql:1255\n";
-static const char *proc676 =
+static const char *proc671 =
"#line 1266 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_UNLOCK\" (in id any, in type char(1), in token varchar, in auth_uid integer)\n"
"{\n"
@@ -28499,7 +28048,7 @@ static const char *proc676 =
"}\n"
"--src DET_Versioning.sql:1264\n";
-static const char *proc677 =
+static const char *proc672 =
"#line 1275 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_IS_LOCKED\" (inout id any, inout type char(1), in owned_tokens varchar) returns integer\n"
"{\n"
@@ -28508,7 +28057,7 @@ static const char *proc677 =
"}\n"
"--src DET_Versioning.sql:1273\n";
-static const char *proc678 =
+static const char *proc673 =
"#line 1285 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_DAV_LIST_LOCKS\" (in id any, in type char(1), in recursive integer) returns any\n"
"{\n"
@@ -28517,7 +28066,7 @@ static const char *proc678 =
"}\n"
"--src DET_Versioning.sql:1283\n";
-static const char *proc679 =
+static const char *proc674 =
"#line 1292 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_AUTO_VERSION_PROP\" (in _auto_version varchar)\n"
"{\n"
@@ -28535,7 +28084,7 @@ static const char *proc679 =
"}\n"
"--src DET_Versioning.sql:1290\n";
-static const char *proc680 =
+static const char *proc675 =
"#line 1310 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_SET_VERSIONING_PROPERTIES (in path varchar, in props any)\n"
"{\n"
@@ -28553,7 +28102,7 @@ static const char *proc680 =
"}\n"
"--src DET_Versioning.sql:1308\n";
-static const char *proc681 =
+static const char *proc676 =
"#line 1326 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_REMOVE_V_PROPERTIES\" (in _path varchar)\n"
"{\n"
@@ -28566,7 +28115,7 @@ static const char *proc681 =
"}\n"
"--src DET_Versioning.sql:1324\n";
-static const char *proc682 =
+static const char *proc677 =
"#line 1338 \"[executable]/DET_Versioning.sql\"\n"
"create function DAV_REMOVE_VERSIONING_CONTROL_INT (in _main varchar, in _auth varchar, in _pwd varchar) returns integer\n"
"{\n"
@@ -28591,7 +28140,7 @@ static const char *proc682 =
"}\n"
"--src DET_Versioning.sql:1336\n";
-static const char *proc683 =
+static const char *proc678 =
"#line 1361 \"[executable]/DET_Versioning.sql\"\n"
"create function \"Versioning_SETPROP\" (in _resource varchar, in _propname varchar, in _value varchar,\n"
"in _auth varchar,\n"
@@ -28607,7 +28156,7 @@ static const char *proc683 =
"}\n"
"--src DET_Versioning.sql:1359\n";
-static const char *proc684 =
+static const char *proc679 =
"#line 1376 \"[executable]/DET_Versioning.sql\"\n"
"create function DAV_SET_VERSIONING_CONTROL (in _main varchar, in _vvc varchar, in _auto_version varchar, in _auth varchar, in _pwd varchar)\n"
"{\n"
@@ -28670,7 +28219,7 @@ static const char *proc684 =
"}\n"
"--src DET_Versioning.sql:1374\n";
-static const char *proc685 =
+static const char *proc680 =
"#line 1439 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_MKWORKSPACE (in path varchar)\n"
"{\n"
@@ -28716,7 +28265,7 @@ static const char *proc685 =
"}\n"
"--src DET_Versioning.sql:1437\n";
-static const char *proc686 =
+static const char *proc681 =
"#line 1483 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_CHECKOUT (in path varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -28724,7 +28273,7 @@ static const char *proc686 =
"}\n"
"--src DET_Versioning.sql:1481\n";
-static const char *proc687 =
+static const char *proc682 =
"#line 1489 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_CHECKOUT_INT (in path_or_id any, in auth varchar, in pwd varchar, in extern int := 0)\n"
"{\n"
@@ -28774,7 +28323,7 @@ static const char *proc687 =
"}\n"
"--src DET_Versioning.sql:1487\n";
-static const char *proc688 =
+static const char *proc683 =
"#line 1537 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_CHECKIN (in path varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -28782,7 +28331,7 @@ static const char *proc688 =
"}\n"
"--src DET_Versioning.sql:1535\n";
-static const char *proc689 =
+static const char *proc684 =
"#line 1543 \"[executable]/DET_Versioning.sql\"\n"
"create procedure DAV_CHECKIN_INT (in path varchar, in auth varchar, in pwd varchar, in extern int:=1)\n"
"{\n"
@@ -28879,7 +28428,7 @@ static const char *proc689 =
"}\n"
"--src DET_Versioning.sql:1541\n";
-static const char *proc690 =
+static const char *proc685 =
"#line 1638 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_CHECKOUT_INT\" (\n"
"in _id int,\n"
@@ -28928,7 +28477,7 @@ static const char *trig46 =
"}\n"
"--src DET_Versioning.sql:1660\n";
-static const char *proc691 =
+static const char *proc686 =
"#line 1685 \"[executable]/DET_Versioning.sql\"\n"
"create function DAV_VERSION_CONTROL (in path varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -29024,7 +28573,7 @@ static const char *proc691 =
"}\n"
"--src DET_Versioning.sql:1683\n";
-static const char *proc692 =
+static const char *proc687 =
"#line 1780 \"[executable]/DET_Versioning.sql\"\n"
"create function DAV_UNCHECKOUT (in path varchar, in auth varchar, in pwd varchar)\n"
"{\n"
@@ -29099,7 +28648,7 @@ static const char *proc692 =
"}\n"
"--src DET_Versioning.sql:1778\n";
-static const char *proc693 =
+static const char *proc688 =
"#line 1854 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_Attic\" (in _resource varchar)\n"
"{\n"
@@ -29118,7 +28667,7 @@ static const char *proc693 =
"}\n"
"--src DET_Versioning.sql:1852\n";
-static const char *proc694 =
+static const char *proc689 =
"#line 1871 \"[executable]/DET_Versioning.sql\"\n"
"create procedure \"Versioning_OTHER_FILES_IN_VVC\" (in _res varchar)\n"
"{\n"
@@ -29127,7 +28676,7 @@ static const char *proc694 =
"}\n"
"--src DET_Versioning.sql:1869\n";
-static const char *proc695 =
+static const char *proc690 =
"#line 1879 \"[executable]/DET_Versioning.sql\"\n"
" create procedure DAV_REMOVE_VERSION_CONTROL (in _resource varchar, in auth varchar, in pwd varchar, in tokens any := 1)\n"
"{\n"
@@ -29183,7 +28732,7 @@ static const char *proc695 =
"}\n"
"--src DET_Versioning.sql:1877\n";
-static const char *proc696 =
+static const char *proc691 =
"#line 1935 \"[executable]/DET_Versioning.sql\"\n"
" create procedure DAV_VERSION_FOLD_INT (in path varchar, in target_version int, in auth varchar)\n"
"{\n"
@@ -29280,7 +28829,7 @@ static const char *trig47 =
/* xml_view.sql */
-static const char *proc697 =
+static const char *proc692 =
"#line 32 \"[executable]/xml_view.sql\"\n"
"create procedure XML_VIEW_PUBLISH\n"
"(\n"
@@ -29503,7 +29052,7 @@ static const char *proc697 =
"}\n"
"--src xml_view.sql:30\n";
-static const char *proc698 =
+static const char *proc693 =
"#line 253 \"[executable]/xml_view.sql\"\n"
"create procedure XML_VIEW_DROP (in view_name varchar)\n"
"{\n"
@@ -29618,175 +29167,169 @@ sqls_define_dav (void)
DEFINE_PROC ("WS.WS.PROPFIND_RESPONSE", proc2);
DEFINE_PROC ("WS.WS.PROPFIND_RESPONSE_FORMAT", proc3);
DEFINE_PROC ("WS.WS.PROPNAMES", proc4);
- DEFINE_PROC ("WS.WS.CALENDAR_NAMES", proc5);
- DEFINE_PROC ("WS.WS.ADDRESSBOOK_NAMES", proc6);
- DEFINE_PROC ("WS.WS.REPORT", proc7);
- DEFINE_PROC ("WS.WS.REPORT_RESPONSE", proc8);
- DEFINE_PROC ("WS.WS.CUSTOM_PROP", proc9);
- DEFINE_PROC ("WS.WS.PROPPATCH", proc10);
- DEFINE_PROC ("WS.WS.FINDPARAM", proc11);
- DEFINE_PROC ("WS.WS.MKCOL", proc12);
- DEFINE_PROC ("WS.WS.FINDCOL", proc13);
- DEFINE_PROC ("WS.WS.FINDRES", proc14);
- DEFINE_PROC ("WS.WS.DELCHILDREN", proc15);
- DEFINE_PROC ("WS.WS.DELETE", proc16);
- DEFINE_PROC ("WS.WS.ISCOL", proc17);
- DEFINE_PROC ("WS.WS.ISRES", proc18);
- DEFINE_PROC ("WS.WS.ETAG", proc19);
- DEFINE_PROC ("WS.WS.HEAD", proc20);
- DEFINE_PROC ("DAV_SET_HTTP_REQUEST_STATUS", proc21);
- DEFINE_PROC ("WS.WS.PUT", proc22);
- DEFINE_PROC ("WS.WS.HEX_TO_DEC", proc23);
- DEFINE_PROC ("WS.WS.STR_TO_URI", proc24);
- DEFINE_PROC ("WS.WS.PATHREF", proc25);
- DEFINE_PROC ("WS.WS.IS_ACTIVE_CONTENT", proc26);
- DEFINE_PROC ("WS.WS.GET_DAV_DEFAULT_PAGE", proc27);
- DEFINE_PROC ("WS.WS.GET_DAV_CHUNKED_QUOTA", proc28);
- DEFINE_PROC ("WS.WS.GET", proc29);
- DEFINE_PROC ("WS.WS.POST", proc30);
- DEFINE_PROC ("WS.WS.SPARQL_QUERY_POST", proc31);
- DEFINE_PROC ("WS.WS.SPARQL_QUERY_GET", proc32);
- DEFINE_PROC ("WS.WS.LOCK", proc33);
- DEFINE_PROC ("WS.WS.UNLOCK", proc34);
- DEFINE_PROC ("WS.WS.OPLOCKTOKEN", proc35);
- DEFINE_PROC ("WS.WS.PARENT_PATH", proc36);
- DEFINE_PROC ("WS.WS.HREF_TO_ARRAY", proc37);
- DEFINE_PROC ("WS.WS.HREF_TO_PATH_ARRAY", proc38);
- DEFINE_PROC ("WS.WS.DSTIS", proc39);
- DEFINE_PROC ("WS.WS.MOVE", proc40);
- DEFINE_PROC ("WS.WS.COPY", proc41);
- DEFINE_PROC ("WS.WS.COPY_OR_MOVE", proc42);
- DEFINE_PROC ("WS.WS.ISLOCKED", proc43);
- DEFINE_PROC ("WS.WS.CHECK_AUTH", proc44);
- DEFINE_PROC ("WS.WS.GET_IF_AUTH", proc45);
- DEFINE_PROC ("WS.WS.GET_DAV_AUTH", proc46);
- DEFINE_PROC ("WS.WS.PERM_COMP", proc47);
- DEFINE_PROC ("WS.WS.CHECKPERM", proc48);
- DEFINE_PROC ("WS.WS.ISPUBLIC", proc49);
- DEFINE_PROC ("WS.WS.DAV_VSP_DEF_REMOVE", proc50);
- DEFINE_PROC ("DAV_PERMS_SET_CHAR", proc51);
- DEFINE_PROC ("DAV_PERMS_FIX", proc52);
- DEFINE_PROC ("DAV_PERMS_INHERIT", proc53);
+ DEFINE_PROC ("WS.WS.CUSTOM_PROP", proc5);
+ DEFINE_PROC ("WS.WS.PROPPATCH", proc6);
+ DEFINE_PROC ("WS.WS.FINDPARAM", proc7);
+ DEFINE_PROC ("WS.WS.MKCOL", proc8);
+ DEFINE_PROC ("WS.WS.FINDCOL", proc9);
+ DEFINE_PROC ("WS.WS.FINDRES", proc10);
+ DEFINE_PROC ("WS.WS.DELCHILDREN", proc11);
+ DEFINE_PROC ("WS.WS.DELETE", proc12);
+ DEFINE_PROC ("WS.WS.ISCOL", proc13);
+ DEFINE_PROC ("WS.WS.ISRES", proc14);
+ DEFINE_PROC ("WS.WS.ETAG", proc15);
+ DEFINE_PROC ("WS.WS.HEAD", proc16);
+ DEFINE_PROC ("DAV_SET_HTTP_REQUEST_STATUS", proc17);
+ DEFINE_PROC ("WS.WS.PUT", proc18);
+ DEFINE_PROC ("WS.WS.HEX_TO_DEC", proc19);
+ DEFINE_PROC ("WS.WS.STR_TO_URI", proc20);
+ DEFINE_PROC ("WS.WS.PATHREF", proc21);
+ DEFINE_PROC ("WS.WS.IS_ACTIVE_CONTENT", proc22);
+ DEFINE_PROC ("WS.WS.GET_DAV_DEFAULT_PAGE", proc23);
+ DEFINE_PROC ("WS.WS.GET_DAV_CHUNKED_QUOTA", proc24);
+ DEFINE_PROC ("WS.WS.GET", proc25);
+ DEFINE_PROC ("WS.WS.POST", proc26);
+ DEFINE_PROC ("WS.WS.SPARQL_QUERY_POST", proc27);
+ DEFINE_PROC ("WS.WS.SPARQL_QUERY_GET", proc28);
+ DEFINE_PROC ("WS.WS.LOCK", proc29);
+ DEFINE_PROC ("WS.WS.UNLOCK", proc30);
+ DEFINE_PROC ("WS.WS.OPLOCKTOKEN", proc31);
+ DEFINE_PROC ("WS.WS.PARENT_PATH", proc32);
+ DEFINE_PROC ("WS.WS.HREF_TO_ARRAY", proc33);
+ DEFINE_PROC ("WS.WS.HREF_TO_PATH_ARRAY", proc34);
+ DEFINE_PROC ("WS.WS.DSTIS", proc35);
+ DEFINE_PROC ("WS.WS.MOVE", proc36);
+ DEFINE_PROC ("WS.WS.COPY", proc37);
+ DEFINE_PROC ("WS.WS.COPY_OR_MOVE", proc38);
+ DEFINE_PROC ("WS.WS.ISLOCKED", proc39);
+ DEFINE_PROC ("WS.WS.CHECK_AUTH", proc40);
+ DEFINE_PROC ("WS.WS.GET_IF_AUTH", proc41);
+ DEFINE_PROC ("WS.WS.GET_DAV_AUTH", proc42);
+ DEFINE_PROC ("WS.WS.PERM_COMP", proc43);
+ DEFINE_PROC ("WS.WS.CHECKPERM", proc44);
+ DEFINE_PROC ("WS.WS.ISPUBLIC", proc45);
+ DEFINE_PROC ("WS.WS.DAV_VSP_DEF_REMOVE", proc46);
+ DEFINE_PROC ("DAV_PERMS_SET_CHAR", proc47);
+ DEFINE_PROC ("DAV_PERMS_FIX", proc48);
+ DEFINE_PROC ("DAV_PERMS_INHERIT", proc49);
ddl_std_proc (trig0, 0x0);
ddl_std_proc (trig1, 0x0);
ddl_std_proc (trig2, 0x0);
ddl_std_proc (trig3, 0x0);
- DEFINE_PROC ("WS.WS.UPDCHILD", proc54);
+ DEFINE_PROC ("WS.WS.UPDCHILD", proc50);
ddl_std_proc (trig4, 0x0);
- DEFINE_PROC ("WS.WS.DAV_VSP_INCLUDES_CHANGED", proc55);
- DEFINE_PROC ("WS.WS.EXPAND_INCLUDES", proc56);
+ DEFINE_PROC ("WS.WS.DAV_VSP_INCLUDES_CHANGED", proc51);
+ DEFINE_PROC ("WS.WS.EXPAND_INCLUDES", proc52);
ddl_std_proc (trig5, 0x0);
ddl_std_proc (trig6, 0x0);
- DEFINE_PROC ("WS.WS.XML_VIEW_HEADER", proc57);
- DEFINE_PROC ("WS.WS.XML_VIEW_EXTERNAL_META", proc58);
- DEFINE_PROC ("WS.WS.XML_VIEW_UPDATE", proc59);
- DEFINE_PROC ("WS.WS.FIXPATH", proc60);
- DEFINE_PROC ("WS.WS.ISPUBL", proc61);
- DEFINE_PROC ("WS.WS.BODY_ARR", proc62);
- DEFINE_PROC ("WS.WS.XML_AUTO_SCHED", proc63);
- DEFINE_PROC ("WS.WS.DAV_LOGIN", proc64);
- DEFINE_PROC ("WS.WS.HTTP_RESP", proc65);
- DEFINE_PROC ("WS.WS.COPY_TO_OTHER", proc66);
- DEFINE_PROC ("WS.WS.CHECK_READ_ACCESS", proc67);
- DEFINE_PROC ("WS.WS.IS_REDIRECT_REF", proc68);
- DEFINE_PROC ("WS.WS.DAV_DIR_LIST", proc69);
- DEFINE_PROC ("WS.WS.DAV_CHECK_ASMX", proc70);
- DEFINE_PROC ("WS.WS.DAV_REMOVE_ASMX", proc71);
- DEFINE_PROC ("WS.WS.XMLSQL_TO_STRSES", proc72);
- DEFINE_PROC ("WS.WS.TRACE", proc73);
+ DEFINE_PROC ("WS.WS.XML_VIEW_HEADER", proc53);
+ DEFINE_PROC ("WS.WS.XML_VIEW_EXTERNAL_META", proc54);
+ DEFINE_PROC ("WS.WS.XML_VIEW_UPDATE", proc55);
+ DEFINE_PROC ("WS.WS.FIXPATH", proc56);
+ DEFINE_PROC ("WS.WS.ISPUBL", proc57);
+ DEFINE_PROC ("WS.WS.BODY_ARR", proc58);
+ DEFINE_PROC ("WS.WS.XML_AUTO_SCHED", proc59);
+ DEFINE_PROC ("WS.WS.DAV_LOGIN", proc60);
+ DEFINE_PROC ("WS.WS.HTTP_RESP", proc61);
+ DEFINE_PROC ("WS.WS.COPY_TO_OTHER", proc62);
+ DEFINE_PROC ("WS.WS.CHECK_READ_ACCESS", proc63);
+ DEFINE_PROC ("WS.WS.IS_REDIRECT_REF", proc64);
+ DEFINE_PROC ("WS.WS.DAV_DIR_LIST", proc65);
+ DEFINE_PROC ("WS.WS.DAV_CHECK_ASMX", proc66);
+ DEFINE_PROC ("WS.WS.DAV_REMOVE_ASMX", proc67);
+ DEFINE_PROC ("WS.WS.XMLSQL_TO_STRSES", proc68);
+ DEFINE_PROC ("WS.WS.TRACE", proc69);
/* dav_api.sql */
- DEFINE_PROC ("DAV_PERROR", proc74);
- DEFINE_PROC ("DAV_ADD_USER_INT", proc75);
- DEFINE_PUBLIC_PROC ("DAV_ADD_USER", proc76);
- DEFINE_PUBLIC_PROC ("DAV_DELETE_USER", proc77);
- DEFINE_PUBLIC_PROC ("DAV_REGEXP_PATTERN_FOR_PERM", proc78);
- DEFINE_PROC ("DAV_REGEXP_PATTERN_FOR_UNIX_PERM", proc79);
- DEFINE_PUBLIC_PROC ("DAV_PERM_D2U", proc80);
- DEFINE_PUBLIC_PROC ("DAV_PERM_U2D", proc81);
- DEFINE_PROC ("DAV_CHECK_AUTH", proc82);
- DEFINE_PUBLIC_PROC ("DAV_HOME_DIR", proc83);
- DEFINE_PROC ("DAV_HOME_DIR_CREATE", proc84);
- DEFINE_PROC ("DAV_ADD_GROUP_INT", proc85);
- DEFINE_PUBLIC_PROC ("DAV_ADD_GROUP", proc86);
- DEFINE_PUBLIC_PROC ("DAV_DELETE_GROUP", proc87);
- DEFINE_PUBLIC_PROC ("DAV_DIR_LIST", proc88);
- DEFINE_PUBLIC_PROC ("DAV_DIR_FILTER", proc89);
- DEFINE_PROC ("DAV_GET_PARENT", proc90);
- DEFINE_PROC ("DAV_DIR_SINGLE_INT", proc91);
- DEFINE_PROC ("DAV_DIR_LIST_INT", proc92);
- DEFINE_PROC ("DAV_DIR_FILTER_INT", proc93);
- DEFINE_PUBLIC_PROC ("DAV_SEARCH_PATH", proc94);
- DEFINE_PUBLIC_PROC ("DAV_SEARCH_ID", proc95);
- DEFINE_PUBLIC_PROC ("DAV_SEARCH_SOME_ID", proc96);
- DEFINE_PUBLIC_PROC ("DAV_HIDE_ERROR", proc97);
- DEFINE_PUBLIC_PROC ("DAV_HIDE_ERROR_OR_DET", proc98);
- DEFINE_PUBLIC_PROC ("DAV_CONCAT_PATH", proc99);
- DEFINE_PROC ("DAV_SEARCH_SOME_ID_OR_DET", proc100);
- DEFINE_PROC ("DAV_SEARCH_ID_OR_DET", proc101);
- DEFINE_PROC ("DAV_OWNER_ID", proc102);
- DEFINE_PROC ("DAV_IS_LOCKED_INT", proc103);
- DEFINE_PUBLIC_PROC ("DAV_IS_LOCKED", proc104);
- DEFINE_PUBLIC_PROC ("DAV_LIST_LOCKS", proc105);
- DEFINE_PROC ("DAV_LIST_LOCKS_INT", proc106);
- DEFINE_PROC ("DAV_LOCK", proc107);
- DEFINE_PROC ("DAV_LOCK_INT", proc108);
- DEFINE_PROC ("DAV_UNLOCK", proc109);
- DEFINE_PROC ("DAV_UNLOCK_INT", proc110);
- DEFINE_PUBLIC_PROC ("DAV_REQ_CHARS_TO_BITMASK", proc111);
- DEFINE_PUBLIC_PROC ("DAV_AUTHENTICATE", proc112);
- DEFINE_PROC ("DAV_AUTHENTICATE_HTTP", proc113);
- DEFINE_PROC ("DAV_AUTHENTICATE_SSL_ITEM", proc114);
- DEFINE_PROC ("DAV_AUTHENTICATE_SSL_CONDITION", proc115);
- DEFINE_PROC ("DAV_WEBID_QR", proc116);
- DEFINE_PROC ("DAV_AUTHENTICATE_SSL_WEBID", proc117);
- DEFINE_PROC ("DAV_AUTHENTICATE_SSL", proc118);
- DEFINE_PUBLIC_PROC ("DAV_COL_CREATE", proc119);
- DEFINE_PROC ("DAV_COL_CREATE_INT", proc120);
- DEFINE_PROC ("DB.DBA.IS_REDIRECT_REF", proc121);
- DEFINE_PUBLIC_PROC ("DAV_RES_UPLOAD", proc122);
- DEFINE_PUBLIC_PROC ("DAV_RES_UPLOAD_STRSES", proc123);
- DEFINE_PROC ("DAV_RES_UPLOAD_STRSES_INT", proc124);
+ DEFINE_PROC ("DAV_PERROR", proc70);
+ DEFINE_PROC ("DAV_ADD_USER_INT", proc71);
+ DEFINE_PUBLIC_PROC ("DAV_ADD_USER", proc72);
+ DEFINE_PUBLIC_PROC ("DAV_DELETE_USER", proc73);
+ DEFINE_PUBLIC_PROC ("DAV_REGEXP_PATTERN_FOR_PERM", proc74);
+ DEFINE_PROC ("DAV_REGEXP_PATTERN_FOR_UNIX_PERM", proc75);
+ DEFINE_PUBLIC_PROC ("DAV_PERM_D2U", proc76);
+ DEFINE_PUBLIC_PROC ("DAV_PERM_U2D", proc77);
+ DEFINE_PROC ("DAV_CHECK_AUTH", proc78);
+ DEFINE_PUBLIC_PROC ("DAV_HOME_DIR", proc79);
+ DEFINE_PROC ("DAV_HOME_DIR_CREATE", proc80);
+ DEFINE_PROC ("DAV_ADD_GROUP_INT", proc81);
+ DEFINE_PUBLIC_PROC ("DAV_ADD_GROUP", proc82);
+ DEFINE_PUBLIC_PROC ("DAV_DELETE_GROUP", proc83);
+ DEFINE_PUBLIC_PROC ("DAV_DIR_LIST", proc84);
+ DEFINE_PUBLIC_PROC ("DAV_DIR_FILTER", proc85);
+ DEFINE_PROC ("DAV_GET_PARENT", proc86);
+ DEFINE_PROC ("DAV_DIR_SINGLE_INT", proc87);
+ DEFINE_PROC ("DAV_DIR_LIST_INT", proc88);
+ DEFINE_PROC ("DAV_DIR_FILTER_INT", proc89);
+ DEFINE_PUBLIC_PROC ("DAV_SEARCH_PATH", proc90);
+ DEFINE_PUBLIC_PROC ("DAV_SEARCH_ID", proc91);
+ DEFINE_PUBLIC_PROC ("DAV_SEARCH_SOME_ID", proc92);
+ DEFINE_PUBLIC_PROC ("DAV_HIDE_ERROR", proc93);
+ DEFINE_PUBLIC_PROC ("DAV_HIDE_ERROR_OR_DET", proc94);
+ DEFINE_PUBLIC_PROC ("DAV_CONCAT_PATH", proc95);
+ DEFINE_PROC ("DAV_SEARCH_SOME_ID_OR_DET", proc96);
+ DEFINE_PROC ("DAV_SEARCH_ID_OR_DET", proc97);
+ DEFINE_PROC ("DAV_OWNER_ID", proc98);
+ DEFINE_PROC ("DAV_IS_LOCKED_INT", proc99);
+ DEFINE_PUBLIC_PROC ("DAV_IS_LOCKED", proc100);
+ DEFINE_PUBLIC_PROC ("DAV_LIST_LOCKS", proc101);
+ DEFINE_PROC ("DAV_LIST_LOCKS_INT", proc102);
+ DEFINE_PROC ("DAV_LOCK", proc103);
+ DEFINE_PROC ("DAV_LOCK_INT", proc104);
+ DEFINE_PROC ("DAV_UNLOCK", proc105);
+ DEFINE_PROC ("DAV_UNLOCK_INT", proc106);
+ DEFINE_PUBLIC_PROC ("DAV_REQ_CHARS_TO_BITMASK", proc107);
+ DEFINE_PUBLIC_PROC ("DAV_AUTHENTICATE", proc108);
+ DEFINE_PROC ("DAV_AUTHENTICATE_HTTP", proc109);
+ DEFINE_PROC ("DAV_AUTHENTICATE_SSL_ITEM", proc110);
+ DEFINE_PROC ("DAV_AUTHENTICATE_SSL_CONDITION", proc111);
+ DEFINE_PROC ("DAV_AUTHENTICATE_SSL_WEBID", proc112);
+ DEFINE_PROC ("DAV_AUTHENTICATE_SSL", proc113);
+ DEFINE_PUBLIC_PROC ("DAV_COL_CREATE", proc114);
+ DEFINE_PROC ("DAV_COL_CREATE_INT", proc115);
+ DEFINE_PROC ("DB.DBA.IS_REDIRECT_REF", proc116);
+ DEFINE_PUBLIC_PROC ("DAV_RES_UPLOAD", proc117);
+ DEFINE_PUBLIC_PROC ("DAV_RES_UPLOAD_STRSES", proc118);
+ DEFINE_PROC ("DAV_RES_UPLOAD_STRSES_INT", proc119);
ddl_ensure_table ("DB.DBA.RDF_SINK_QUEUE", tbl0);
- DEFINE_PROC ("DAV_RES_UPLOAD_STRSES_INT_INNER", proc125);
- DEFINE_PROC ("RDF_SINK_AQ_GET", proc126);
- DEFINE_PROC ("DB.DBA.RDF_SINK_AQ_RUN", proc127);
- DEFINE_PROC ("DAV_RDF_RES_NAME", proc128);
- DEFINE_PROC ("RDF_SINK_FUNC", proc129);
- DEFINE_PROC ("RDF_SINK_UPLOAD", proc130);
- DEFINE_PROC ("RDF_SINK_UPLOAD_CARTRIDGES", proc131);
- DEFINE_PROC ("RDF_SINK_DELETE", proc132);
- DEFINE_PUBLIC_PROC ("DAV_DELETE", proc133);
- DEFINE_PROC ("DAV_DELETE_INT", proc134);
- DEFINE_PROC ("DAV_TAG_LIST", proc135);
- DEFINE_PROC ("DAV_TAG_SET", proc136);
- DEFINE_PUBLIC_PROC ("DAV_COPY", proc137);
- DEFINE_PROC ("DAV_COPY_INT", proc138);
- DEFINE_PROC ("DAV_COPY_SUBTREE", proc139);
- DEFINE_PUBLIC_PROC ("DAV_MOVE", proc140);
- DEFINE_PROC ("DAV_MOVE_INT", proc141);
- DEFINE_PROC ("DAV_GET_OWNER", proc142);
- DEFINE_PROC ("DAV_PREPARE_PROP_WRITE", proc143);
- DEFINE_PUBLIC_PROC ("DAV_PROP_SET", proc144);
- DEFINE_PROC ("DAV_PROP_SET_INT", proc145);
- DEFINE_PROC ("DAV_PROP_SET_RAW", proc146);
- DEFINE_PROC ("DAV_PROP_SET_RAW_INNER", proc147);
- DEFINE_PUBLIC_PROC ("DAV_PROP_REMOVE", proc148);
- DEFINE_PROC ("DAV_PROP_REMOVE_INT", proc149);
- DEFINE_PROC ("DAV_PROP_REMOVE_RAW", proc150);
- DEFINE_PUBLIC_PROC ("DAV_PROP_GET", proc151);
- DEFINE_PROC ("DAV_PROP_GET_INT", proc152);
- DEFINE_PUBLIC_PROC ("DAV_PROP_LIST", proc153);
- DEFINE_PROC ("DAV_PROP_LIST_INT", proc154);
- DEFINE_PROC ("DAV_MAKE_DIR", proc155);
- DEFINE_PROC ("DAV_CHECK_PERM", proc156);
- DEFINE_PUBLIC_PROC ("DAV_CHECK_USER", proc157);
- DEFINE_PUBLIC_PROC ("DAV_RES_CONTENT", proc158);
- DEFINE_PUBLIC_PROC ("DAV_RES_CONTENT_STRSES", proc159);
- DEFINE_PROC ("DAV_RES_CONTENT_INT", proc160);
- DEFINE_PROC ("DAV_COL_IS_ANCESTOR_OF", proc161);
- DEFINE_PROC ("DAV_COL_PATH_BOUNDARY", proc162);
+ DEFINE_PROC ("DAV_RES_UPLOAD_STRSES_INT_INNER", proc120);
+ DEFINE_PROC ("RDF_SINK_AQ_GET", proc121);
+ DEFINE_PROC ("DB.DBA.RDF_SINK_AQ_RUN", proc122);
+ DEFINE_PROC ("RDF_SINK_FUNC", proc123);
+ DEFINE_PROC ("RDF_SINK_UPLOAD", proc124);
+ DEFINE_PROC ("RDF_SINK_UPLOAD_CARTRIDGES", proc125);
+ DEFINE_PROC ("RDF_SINK_DELETE", proc126);
+ DEFINE_PUBLIC_PROC ("DAV_DELETE", proc127);
+ DEFINE_PROC ("DAV_DELETE_INT", proc128);
+ DEFINE_PROC ("DAV_TAG_LIST", proc129);
+ DEFINE_PROC ("DAV_TAG_SET", proc130);
+ DEFINE_PUBLIC_PROC ("DAV_COPY", proc131);
+ DEFINE_PROC ("DAV_COPY_INT", proc132);
+ DEFINE_PROC ("DAV_COPY_SUBTREE", proc133);
+ DEFINE_PUBLIC_PROC ("DAV_MOVE", proc134);
+ DEFINE_PROC ("DAV_MOVE_INT", proc135);
+ DEFINE_PROC ("DAV_GET_OWNER", proc136);
+ DEFINE_PROC ("DAV_PREPARE_PROP_WRITE", proc137);
+ DEFINE_PUBLIC_PROC ("DAV_PROP_SET", proc138);
+ DEFINE_PROC ("DAV_PROP_SET_INT", proc139);
+ DEFINE_PROC ("DAV_PROP_SET_RAW", proc140);
+ DEFINE_PROC ("DAV_PROP_SET_RAW_INNER", proc141);
+ DEFINE_PUBLIC_PROC ("DAV_PROP_REMOVE", proc142);
+ DEFINE_PROC ("DAV_PROP_REMOVE_INT", proc143);
+ DEFINE_PROC ("DAV_PROP_REMOVE_RAW", proc144);
+ DEFINE_PUBLIC_PROC ("DAV_PROP_GET", proc145);
+ DEFINE_PROC ("DAV_PROP_GET_INT", proc146);
+ DEFINE_PUBLIC_PROC ("DAV_PROP_LIST", proc147);
+ DEFINE_PROC ("DAV_PROP_LIST_INT", proc148);
+ DEFINE_PROC ("DAV_MAKE_DIR", proc149);
+ DEFINE_PROC ("DAV_CHECK_PERM", proc150);
+ DEFINE_PUBLIC_PROC ("DAV_CHECK_USER", proc151);
+ DEFINE_PUBLIC_PROC ("DAV_RES_CONTENT", proc152);
+ DEFINE_PUBLIC_PROC ("DAV_RES_CONTENT_STRSES", proc153);
+ DEFINE_PROC ("DAV_RES_CONTENT_INT", proc154);
+ DEFINE_PROC ("DAV_COL_IS_ANCESTOR_OF", proc155);
+ DEFINE_PROC ("DAV_COL_PATH_BOUNDARY", proc156);
ddl_std_proc (trig7, 0x0);
ddl_std_proc (trig8, 0x0);
ddl_std_proc (trig9, 0x0);
@@ -29794,190 +29337,190 @@ sqls_define_dav (void)
ddl_std_proc (trig11, 0x0);
ddl_std_proc (trig12, 0x0);
ddl_std_proc (trig13, 0x0);
- DEFINE_PROC ("WS.WS.WAC_INSERT", proc163);
- DEFINE_PROC ("WS.WS.WAC_DELETE", proc164);
- DEFINE_PROC ("WS.WS.DAV_IRI", proc165);
+ DEFINE_PROC ("WS.WS.WAC_INSERT", proc157);
+ DEFINE_PROC ("WS.WS.WAC_DELETE", proc158);
+ DEFINE_PROC ("WS.WS.DAV_IRI", proc159);
ddl_std_proc (trig14, 0x0);
- DEFINE_PROC ("WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG", proc166);
+ DEFINE_PROC ("WS.WS.ACL_CONTAINS_GRANTEE_AND_FLAG", proc160);
ddl_std_proc (trig15, 0x0);
ddl_std_proc (trig16, 0x0);
ddl_std_proc (trig17, 0x0);
ddl_std_proc (trig18, 0x0);
ddl_std_proc (trig19, 0x0);
- DEFINE_PROC ("WS.WS.ACL_UPDATE", proc167);
- DEFINE_PROC ("WS.WS.ACL_MAKE_INHERITED", proc168);
- DEFINE_PROC ("WS.WS.ACL_DBG", proc169);
- DEFINE_PROC ("WS.WS.ACL_SERIALIZE_INT", proc170);
- DEFINE_PROC ("WS.WS.ACL_DESERIALIZE_INT", proc171);
- DEFINE_PROC ("WS.WS.ACL_GET_ACLLENGTH", proc172);
- DEFINE_PROC ("WS.WS.ACL_GET_ACESIZE", proc173);
- DEFINE_PROC ("WS.WS.ACL_CREATE", proc174);
- DEFINE_PROC ("WS.WS.ACL_IS_VALID", proc175);
- DEFINE_PROC ("WS.WS.ACL_ADD_ENTRY", proc176);
- DEFINE_PROC ("WS.WS.ACL_REMOVE_ENTRY", proc177);
- DEFINE_PROC ("WS.WS.ACL_IS_GRANTED", proc178);
- DEFINE_PROC ("WS.WS.ACL_SET_OWNER", proc179);
- DEFINE_PROC ("WS.WS.ACL_OWNER", proc180);
- DEFINE_PROC ("WS.WS.ACL_PARSE", proc181);
- DEFINE_PROC ("WS.WS.ACL_COMPOSE", proc182);
- DEFINE_PROC ("DAV_CAST_STRING_TO_INTEGER", proc183);
- DEFINE_PROC ("DAV_CAST_STRING_TO_DATETIME", proc184);
- DEFINE_PROC ("DAV_CAST_TEXT_TO_VARCHAR", proc185);
- DEFINE_PROC ("DAV_CAST_TEXT_TO_INTEGER", proc186);
- DEFINE_PROC ("DAV_CAST_TEXT_TO_DATETIME", proc187);
- DEFINE_PROC ("DAV_FC_CONST_AS_SQL", proc188);
- DEFINE_PROC ("DAV_FC_PRED_METAS", proc189);
- DEFINE_PROC ("DAV_FC_CMP_METAS", proc190);
- DEFINE_PROC ("DAV_FC_TABLE_METAS", proc191);
- DEFINE_PROC ("DAV_FC_PRINT_COMPARISON", proc192);
- DEFINE_PROC ("DAV_FC_PRINT_WHERE", proc193);
- DEFINE_PROC ("DAV_FC_PRINT_WHERE_INT", proc194);
- DEFINE_PROC ("DAV_REGISTER_RDF_SCHEMA", proc195);
- DEFINE_PUBLIC_PROC ("DAV_RDF_SCHEMA_N3_LIST_PROPERTIES", proc196);
- DEFINE_PROC ("DAV_CROP_URI_TO_CATNAME", proc197);
- DEFINE_PUBLIC_PROC ("DAV_GET_RDF_SCHEMA_N3", proc198);
- DEFINE_PROC ("DAV_DEPRECATE_RDF_SCHEMA", proc199);
- DEFINE_PROC ("DAV_REGISTER_MIME_TYPE", proc200);
- DEFINE_PROC ("DAV_REGISTER_MIME_RDF", proc201);
- DEFINE_PROC ("DAV_DEPRECATE_MIME_RDF", proc202);
- DEFINE_PUBLIC_PROC ("DAV_RDF_PROP_SET", proc203);
- DEFINE_PUBLIC_PROC ("DAV_RDF_PROP_GET", proc204);
- DEFINE_PROC ("DAV_RDF_PREPROCESS_RDFXML_SUB", proc205);
- DEFINE_PROC ("DAV_RDF_PREPROCESS_RDFXML", proc206);
- DEFINE_PROC ("DAV_RDF_PROP_SET_INT", proc207);
- DEFINE_PROC ("DAV_RDF_PROP_GET_INT", proc208);
- DEFINE_PROC ("DAV_RDF_MERGE", proc209);
- DEFINE_PROC ("DAV_RDF_SUBTRACT", proc210);
+ DEFINE_PROC ("WS.WS.ACL_UPDATE", proc161);
+ DEFINE_PROC ("WS.WS.ACL_MAKE_INHERITED", proc162);
+ DEFINE_PROC ("WS.WS.ACL_DBG", proc163);
+ DEFINE_PROC ("WS.WS.ACL_SERIALIZE_INT", proc164);
+ DEFINE_PROC ("WS.WS.ACL_DESERIALIZE_INT", proc165);
+ DEFINE_PROC ("WS.WS.ACL_GET_ACLLENGTH", proc166);
+ DEFINE_PROC ("WS.WS.ACL_GET_ACESIZE", proc167);
+ DEFINE_PROC ("WS.WS.ACL_CREATE", proc168);
+ DEFINE_PROC ("WS.WS.ACL_IS_VALID", proc169);
+ DEFINE_PROC ("WS.WS.ACL_ADD_ENTRY", proc170);
+ DEFINE_PROC ("WS.WS.ACL_REMOVE_ENTRY", proc171);
+ DEFINE_PROC ("WS.WS.ACL_IS_GRANTED", proc172);
+ DEFINE_PROC ("WS.WS.ACL_SET_OWNER", proc173);
+ DEFINE_PROC ("WS.WS.ACL_OWNER", proc174);
+ DEFINE_PROC ("WS.WS.ACL_PARSE", proc175);
+ DEFINE_PROC ("WS.WS.ACL_COMPOSE", proc176);
+ DEFINE_PROC ("DAV_CAST_STRING_TO_INTEGER", proc177);
+ DEFINE_PROC ("DAV_CAST_STRING_TO_DATETIME", proc178);
+ DEFINE_PROC ("DAV_CAST_TEXT_TO_VARCHAR", proc179);
+ DEFINE_PROC ("DAV_CAST_TEXT_TO_INTEGER", proc180);
+ DEFINE_PROC ("DAV_CAST_TEXT_TO_DATETIME", proc181);
+ DEFINE_PROC ("DAV_FC_CONST_AS_SQL", proc182);
+ DEFINE_PROC ("DAV_FC_PRED_METAS", proc183);
+ DEFINE_PROC ("DAV_FC_CMP_METAS", proc184);
+ DEFINE_PROC ("DAV_FC_TABLE_METAS", proc185);
+ DEFINE_PROC ("DAV_FC_PRINT_COMPARISON", proc186);
+ DEFINE_PROC ("DAV_FC_PRINT_WHERE", proc187);
+ DEFINE_PROC ("DAV_FC_PRINT_WHERE_INT", proc188);
+ DEFINE_PROC ("DAV_REGISTER_RDF_SCHEMA", proc189);
+ DEFINE_PUBLIC_PROC ("DAV_RDF_SCHEMA_N3_LIST_PROPERTIES", proc190);
+ DEFINE_PROC ("DAV_CROP_URI_TO_CATNAME", proc191);
+ DEFINE_PUBLIC_PROC ("DAV_GET_RDF_SCHEMA_N3", proc192);
+ DEFINE_PROC ("DAV_DEPRECATE_RDF_SCHEMA", proc193);
+ DEFINE_PROC ("DAV_REGISTER_MIME_TYPE", proc194);
+ DEFINE_PROC ("DAV_REGISTER_MIME_RDF", proc195);
+ DEFINE_PROC ("DAV_DEPRECATE_MIME_RDF", proc196);
+ DEFINE_PUBLIC_PROC ("DAV_RDF_PROP_SET", proc197);
+ DEFINE_PUBLIC_PROC ("DAV_RDF_PROP_GET", proc198);
+ DEFINE_PROC ("DAV_RDF_PREPROCESS_RDFXML_SUB", proc199);
+ DEFINE_PROC ("DAV_RDF_PREPROCESS_RDFXML", proc200);
+ DEFINE_PROC ("DAV_RDF_PROP_SET_INT", proc201);
+ DEFINE_PROC ("DAV_RDF_PROP_GET_INT", proc202);
+ DEFINE_PROC ("DAV_RDF_MERGE", proc203);
+ DEFINE_PROC ("DAV_RDF_SUBTRACT", proc204);
ddl_std_proc (trig20, 0x0);
ddl_std_proc (trig21, 0x0);
ddl_std_proc (trig22, 0x0);
- DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF", proc211);
- DEFINE_PROC ("DAV_GET_RES_TYPE_URI_BY_MIME_TYPE", proc212);
- DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF_INT", proc213);
- DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF_INT2", proc214);
- DEFINE_PROC ("DAV_HOME_DIR_UPDATE", proc215);
+ DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF", proc205);
+ DEFINE_PROC ("DAV_GET_RES_TYPE_URI_BY_MIME_TYPE", proc206);
+ DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF_INT", proc207);
+ DEFINE_PROC ("DAV_EXTRACT_AND_SAVE_RDF_INT2", proc208);
+ DEFINE_PROC ("DAV_HOME_DIR_UPDATE", proc209);
/* dav_meta.sql */
- DEFINE_PROC ("DAV_GUESS_MIME_TYPE_BY_NAME", proc216);
- DEFINE_PROC ("DAV_GUESS_MIME_TYPE", proc217);
- DEFINE_PROC ("file_space_fmt", proc218);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-license", proc219);
- DEFINE_PROC ("DAV_EXTRACT_RDF_opendocument", proc220);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.text", proc221);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.database", proc222);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.graphics", proc223);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.presentation", proc224);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.spreadsheet", proc225);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.chart", proc226);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.formula", proc227);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.image", proc228);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-image", proc229);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-photo", proc230);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/audio", proc231);
- DEFINE_PROC ("DAV_EXTRACT_RDF_audio/mpeg", proc232);
- DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-flac", proc233);
- DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-mp3", proc234);
- DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-m4a", proc235);
- DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-m4p", proc236);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/ogg", proc237);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msoffice+xml", proc238);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msexcel", proc239);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msaccess", proc240);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msproject", proc241);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/mspowerpoint", proc242);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msword", proc243);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/pdf", proc244);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/xbrl+xml", proc245);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/doap+rdf", proc246);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/xddl+xml", proc247);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/archive", proc248);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/tar", proc249);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/taz", proc250);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/gz", proc251);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msi", proc252);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/dmg", proc253);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/arj", proc254);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/bz", proc255);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/bz2", proc256);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/tgz", proc257);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/rar", proc258);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/zip", proc259);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/cab", proc260);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/lzh", proc261);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/ace", proc262);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/iso", proc263);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msword+xml", proc264);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msexcel+xml", proc265);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msproject+xml", proc266);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/msvisio+xml", proc267);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/rss+xml", proc268);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/atom+xml", proc269);
- DEFINE_PROC ("DAV_EXTRACT_RDF_text/eml", proc270);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/xbel+xml", proc271);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/rdf+xml", proc272);
- DEFINE_PROC ("DAV_EXTRACT_RDF_text/rdf+ttl", proc273);
- DEFINE_PROC ("DAV_EXTRACT_RDF_text/rdf+n3", proc274);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/foaf+xml", proc275);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/mods+xml", proc276);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/opml+xml", proc277);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/ocs+xml", proc278);
- DEFINE_PROC ("DAV_EXTRACT_RDF_text/html", proc279);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vsp", proc280);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vspx+xml", proc281);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/bpel+xml", proc282);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/annotea+xml", proc283);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/google-kinds+xml", proc284);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/wsdl+xml", proc285);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/google-base+xml", proc286);
- DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vad", proc287);
- DEFINE_PROC ("DAV_EXTRACT_RDF_text/wiki", proc288);
- DEFINE_PROC ("IMC_TO_XML", proc289);
- DEFINE_PROC ("DAV_EXTRACT_RDF_text/directory", proc290);
- DEFINE_PROC ("DAV_EXTRACT_RDF_BY_METAS", proc291);
- DEFINE_PROC ("DB.DBA.UNIX_DATETIME_PARSER", proc292);
+ DEFINE_PROC ("DAV_GUESS_MIME_TYPE_BY_NAME", proc210);
+ DEFINE_PROC ("DAV_GUESS_MIME_TYPE", proc211);
+ DEFINE_PROC ("file_space_fmt", proc212);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-license", proc213);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_opendocument", proc214);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.text", proc215);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.database", proc216);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.graphics", proc217);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.presentation", proc218);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.spreadsheet", proc219);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.chart", proc220);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.formula", proc221);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/vnd.oasis.opendocument.image", proc222);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-image", proc223);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlink-photo", proc224);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/audio", proc225);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/mpeg", proc226);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-flac", proc227);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-mp3", proc228);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-m4a", proc229);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_audio/x-m4p", proc230);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/ogg", proc231);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msoffice+xml", proc232);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msexcel", proc233);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msaccess", proc234);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msproject", proc235);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/mspowerpoint", proc236);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msword", proc237);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/pdf", proc238);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/xbrl+xml", proc239);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/doap+rdf", proc240);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/xddl+xml", proc241);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/archive", proc242);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/tar", proc243);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/taz", proc244);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/gz", proc245);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msi", proc246);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/dmg", proc247);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/arj", proc248);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/bz", proc249);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/bz2", proc250);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/tgz", proc251);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/rar", proc252);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/zip", proc253);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/cab", proc254);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/lzh", proc255);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/ace", proc256);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/iso", proc257);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msword+xml", proc258);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msexcel+xml", proc259);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msproject+xml", proc260);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/msvisio+xml", proc261);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/rss+xml", proc262);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/atom+xml", proc263);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/eml", proc264);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/xbel+xml", proc265);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/rdf+xml", proc266);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/rdf+ttl", proc267);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/rdf+n3", proc268);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/foaf+xml", proc269);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/mods+xml", proc270);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/opml+xml", proc271);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/ocs+xml", proc272);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/html", proc273);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vsp", proc274);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vspx+xml", proc275);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/bpel+xml", proc276);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/annotea+xml", proc277);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/google-kinds+xml", proc278);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/wsdl+xml", proc279);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/google-base+xml", proc280);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_application/x-openlinksw-vad", proc281);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/wiki", proc282);
+ DEFINE_PROC ("IMC_TO_XML", proc283);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_text/directory", proc284);
+ DEFINE_PROC ("DAV_EXTRACT_RDF_BY_METAS", proc285);
+ DEFINE_PROC ("DB.DBA.UNIX_DATETIME_PARSER", proc286);
ddl_ensure_table ("do this always", other1);
ddl_ensure_table ("do this always", other2);
- DEFINE_PROC ("DB.DBA.UNIX_DATE_PARSER", proc293);
+ DEFINE_PROC ("DB.DBA.UNIX_DATE_PARSER", proc287);
ddl_ensure_table ("do this always", other3);
ddl_ensure_table ("do this always", other4);
- DEFINE_PROC ("DB.DBA.BPEL_SPLIT_LIST", proc294);
+ DEFINE_PROC ("DB.DBA.BPEL_SPLIT_LIST", proc288);
ddl_ensure_table ("do this always", other5);
ddl_ensure_table ("do this always", other6);
- DEFINE_PROC ("DAV_EXTRACT_SPOTLIGHT", proc295);
- DEFINE_PROC ("DAV_CONVERT_SPOTLIGHT_TO_VIRTUOSO", proc296);
- DEFINE_PROC ("DAV_SPOTLIGHT_ADD", proc297);
- DEFINE_PUBLIC_PROC ("DB.DBA.XML_UNIX_DATE_TO_ISO", proc298);
+ DEFINE_PROC ("DAV_EXTRACT_SPOTLIGHT", proc289);
+ DEFINE_PROC ("DAV_CONVERT_SPOTLIGHT_TO_VIRTUOSO", proc290);
+ DEFINE_PROC ("DAV_SPOTLIGHT_ADD", proc291);
+ DEFINE_PUBLIC_PROC ("DB.DBA.XML_UNIX_DATE_TO_ISO", proc292);
ddl_ensure_table ("do this always", other7);
ddl_ensure_table ("do this always", other8);
- DEFINE_PROC ("DAV_EXTRACT_META_AS_RDF_XML", proc299);
+ DEFINE_PROC ("DAV_EXTRACT_META_AS_RDF_XML", proc293);
/* dav_acct.sql */
- DEFINE_PROC ("DAV_SPACE_QUOTA_PARENT", proc300);
- DEFINE_PROC ("DAV_ADD_SPACE_QUOTA", proc301);
- DEFINE_PROC ("DAV_DEL_SPACE_QUOTA", proc302);
- DEFINE_PROC ("DAV_SPACE_QUOTA_YELLOW_TRACK", proc303);
- DEFINE_PROC ("DAV_SPACE_QUOTA_SIGNAL", proc304);
- DEFINE_PROC ("DAV_OWNER_DISABLED_SIGNAL", proc305);
- DEFINE_PROC ("DAV_HOME_DISABLED_SIGNAL", proc306);
- DEFINE_PROC ("DAV_SPACE_QUOTA_RES_INSERT", proc307);
- DEFINE_PROC ("DAV_SPACE_QUOTA_RES_DELETE", proc308);
- DEFINE_PROC ("DAV_SPACE_QUOTA_RES_UPDATE", proc309);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_PARENT", proc294);
+ DEFINE_PROC ("DAV_ADD_SPACE_QUOTA", proc295);
+ DEFINE_PROC ("DAV_DEL_SPACE_QUOTA", proc296);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_YELLOW_TRACK", proc297);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_SIGNAL", proc298);
+ DEFINE_PROC ("DAV_OWNER_DISABLED_SIGNAL", proc299);
+ DEFINE_PROC ("DAV_HOME_DISABLED_SIGNAL", proc300);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_RES_INSERT", proc301);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_RES_DELETE", proc302);
+ DEFINE_PROC ("DAV_SPACE_QUOTA_RES_UPDATE", proc303);
/* dav_rdf_quad.sql */
- DEFINE_PROC ("DB.DBA.RDF_DELETE_ENTIRE_GRAPH", proc310);
- DEFINE_PROC ("DB.DBA.DAV_FULL_PATH_TO_IRI", proc311);
- DEFINE_PROC ("DB.DBA.DAV_AUTO_REPLICATE_TO_RDF_QUAD", proc312);
- DEFINE_PROC ("DB.DBA.DAV_REPLICATE_ALL_TO_RDF_QUAD", proc313);
- DEFINE_PROC ("DB.DBA.RDF_CBD_DELETE", proc314);
- DEFINE_PROC ("DB.DBA.DAV_RDF_URI_RESOLVE", proc315);
- DEFINE_PROC ("DB.DBA.DAV_RDF_REPLICATE_INT", proc316);
- DEFINE_PROC ("DB.DBA.DAV_RDF_CBD_DELETE_PROP", proc317);
- DEFINE_PROC ("DB.DBA.DAV_MAKE_USER_IRI", proc318);
- DEFINE_PROC ("DB.DBA.DAV_REPLICATE_RES_TO_RDF_QUAD", proc319);
- DEFINE_PROC ("DB.DBA.DAV_REPLICATE_COL_TO_RDF_QUAD", proc320);
+ DEFINE_PROC ("DB.DBA.RDF_DELETE_ENTIRE_GRAPH", proc304);
+ DEFINE_PROC ("DB.DBA.DAV_FULL_PATH_TO_IRI", proc305);
+ DEFINE_PROC ("DB.DBA.DAV_AUTO_REPLICATE_TO_RDF_QUAD", proc306);
+ DEFINE_PROC ("DB.DBA.DAV_REPLICATE_ALL_TO_RDF_QUAD", proc307);
+ DEFINE_PROC ("DB.DBA.RDF_CBD_DELETE", proc308);
+ DEFINE_PROC ("DB.DBA.DAV_RDF_URI_RESOLVE", proc309);
+ DEFINE_PROC ("DB.DBA.DAV_RDF_REPLICATE_INT", proc310);
+ DEFINE_PROC ("DB.DBA.DAV_RDF_CBD_DELETE_PROP", proc311);
+ DEFINE_PROC ("DB.DBA.DAV_MAKE_USER_IRI", proc312);
+ DEFINE_PROC ("DB.DBA.DAV_REPLICATE_RES_TO_RDF_QUAD", proc313);
+ DEFINE_PROC ("DB.DBA.DAV_REPLICATE_COL_TO_RDF_QUAD", proc314);
ddl_std_proc (trig23, 0x0);
ddl_std_proc (trig24, 0x0);
ddl_std_proc (trig25, 0x0);
@@ -29988,58 +29531,58 @@ sqls_define_dav (void)
ddl_std_proc (trig30, 0x0);
ddl_std_proc (trig31, 0x0);
ddl_std_proc (trig32, 0x0);
- DEFINE_PROC ("DB.DBA.DAV_RDF_PROPAGATE_COL_PATH_CHANGE", proc321);
+ DEFINE_PROC ("DB.DBA.DAV_RDF_PROPAGATE_COL_PATH_CHANGE", proc315);
ddl_std_proc (trig33, 0x0);
ddl_std_proc (trig34, 0x0);
/* vfs.sql */
bootstrap_cli->cli_qualifier = box_string ("WS");
- DEFINE_PROC ("WS.WS.COPY_PAGE", proc322);
- DEFINE_PROC ("WS.WS.VFS_HTTP_RESP_CODE", proc323);
- DEFINE_PROC ("WS.WS.VFS_ENSURE_NEW_SITE", proc324);
- DEFINE_PROC ("WS.WS.VFS_GUESS_CONTENT_TYPE", proc325);
- DEFINE_PROC ("WS.WS.COPY_PAGE_1", proc326);
- DEFINE_PROC ("WS.WS.DELETE_LOCAL_COPY", proc327);
- DEFINE_PROC ("WS.WS.VFS_RUN", proc328);
- DEFINE_PROC ("WS.WS.VFS_STATUS_GET", proc329);
- DEFINE_PROC ("WS.WS.VFS_STATUS_SET", proc330);
- DEFINE_PROC ("WS.WS.SERV_QUEUE_TOP", proc331);
- DEFINE_PROC ("WS.WS.SERV_QUEUE", proc332);
- DEFINE_PROC ("ERR_MAIL_SEND", proc333);
- DEFINE_PROC ("WS.WS.LOCAL_STORE", proc334);
- DEFINE_PROC ("WS.WS.GET_URLS", proc335);
- DEFINE_PROC ("WS.WS.SITEMAP_PROCESS", proc336);
- DEFINE_PROC ("WS.WS.MAKE_URL", proc337);
- DEFINE_PROC ("WS.WS.SPLIT_URL", proc338);
- DEFINE_PROC ("WS.WS.EXPAND_URL_OLD", proc339);
- DEFINE_PROC ("WS.WS.MKPATH", proc340);
- DEFINE_PROC ("WS.WS.FOLLOW", proc341);
- DEFINE_PROC ("WS.WS.REPLACE_HREF", proc342);
- DEFINE_PROC ("WS.WS.FIND_URI", proc343);
- DEFINE_PROC ("WS.WS.LFS_EXP", proc344);
- DEFINE_PROC ("WS.WS.FIND_KEYWORD", proc345);
- DEFINE_PROC ("WS.WS.GET_HREF_IN_ARRAY", proc346);
- DEFINE_PROC ("WS.WS.DAV_EXP", proc347);
- DEFINE_PROC ("WS.WS.DAV_HEAD", proc348);
- DEFINE_PROC ("WS.WS.DAV_MKCOL", proc349);
- DEFINE_PROC ("WS.WS.DAV_PUT", proc350);
- DEFINE_PROC ("WS.WS.DAV_PROP", proc351);
- DEFINE_PROC ("WS.WS.GET_HREF_FROM_XML", proc352);
- DEFINE_PROC ("WS.WS.ISEMPTY", proc353);
- DEFINE_PROC ("WS.WS.URL_BY_DATE", proc354);
- DEFINE_PROC ("WS.WS.VFS_RECOVER_QUEUE_STAT", proc355);
- DEFINE_PROC ("WS.WS.VFS_MAKE_ENTRY", proc356);
- DEFINE_PROC ("WS.WS.VFS_GO", proc357);
- DEFINE_PROC ("WS.WS.VFS_URI_COMPOSE", proc358);
- DEFINE_PROC ("WS.WS.VFS_EXTRACT_RDF", proc359);
- DEFINE_PROC ("WS.WS.SITEMAP_ENSURE_NEW_SITE", proc360);
- DEFINE_PROC ("WS.WS.SITEMAP_URLS_REGISTER", proc361);
- DEFINE_PROC ("WS.WS.SITEMAP_GET_LOC", proc362);
- DEFINE_PROC ("WS.WS.SITEMAP_XML_PARSE", proc363);
- DEFINE_PROC ("WS.WS.SITEMAP_RDF_STORE", proc364);
- DEFINE_PROC ("VFS_ROBOTS_PARSE", proc365);
- DEFINE_PROC ("VFS_ROBOTS_GET", proc366);
+ DEFINE_PROC ("WS.WS.COPY_PAGE", proc316);
+ DEFINE_PROC ("WS.WS.VFS_HTTP_RESP_CODE", proc317);
+ DEFINE_PROC ("WS.WS.VFS_ENSURE_NEW_SITE", proc318);
+ DEFINE_PROC ("WS.WS.VFS_GUESS_CONTENT_TYPE", proc319);
+ DEFINE_PROC ("WS.WS.COPY_PAGE_1", proc320);
+ DEFINE_PROC ("WS.WS.DELETE_LOCAL_COPY", proc321);
+ DEFINE_PROC ("WS.WS.VFS_RUN", proc322);
+ DEFINE_PROC ("WS.WS.VFS_STATUS_GET", proc323);
+ DEFINE_PROC ("WS.WS.VFS_STATUS_SET", proc324);
+ DEFINE_PROC ("WS.WS.SERV_QUEUE_TOP", proc325);
+ DEFINE_PROC ("WS.WS.SERV_QUEUE", proc326);
+ DEFINE_PROC ("ERR_MAIL_SEND", proc327);
+ DEFINE_PROC ("WS.WS.LOCAL_STORE", proc328);
+ DEFINE_PROC ("WS.WS.GET_URLS", proc329);
+ DEFINE_PROC ("WS.WS.SITEMAP_PROCESS", proc330);
+ DEFINE_PROC ("WS.WS.MAKE_URL", proc331);
+ DEFINE_PROC ("WS.WS.SPLIT_URL", proc332);
+ DEFINE_PROC ("WS.WS.EXPAND_URL_OLD", proc333);
+ DEFINE_PROC ("WS.WS.MKPATH", proc334);
+ DEFINE_PROC ("WS.WS.FOLLOW", proc335);
+ DEFINE_PROC ("WS.WS.REPLACE_HREF", proc336);
+ DEFINE_PROC ("WS.WS.FIND_URI", proc337);
+ DEFINE_PROC ("WS.WS.LFS_EXP", proc338);
+ DEFINE_PROC ("WS.WS.FIND_KEYWORD", proc339);
+ DEFINE_PROC ("WS.WS.GET_HREF_IN_ARRAY", proc340);
+ DEFINE_PROC ("WS.WS.DAV_EXP", proc341);
+ DEFINE_PROC ("WS.WS.DAV_HEAD", proc342);
+ DEFINE_PROC ("WS.WS.DAV_MKCOL", proc343);
+ DEFINE_PROC ("WS.WS.DAV_PUT", proc344);
+ DEFINE_PROC ("WS.WS.DAV_PROP", proc345);
+ DEFINE_PROC ("WS.WS.GET_HREF_FROM_XML", proc346);
+ DEFINE_PROC ("WS.WS.ISEMPTY", proc347);
+ DEFINE_PROC ("WS.WS.URL_BY_DATE", proc348);
+ DEFINE_PROC ("WS.WS.VFS_RECOVER_QUEUE_STAT", proc349);
+ DEFINE_PROC ("WS.WS.VFS_MAKE_ENTRY", proc350);
+ DEFINE_PROC ("WS.WS.VFS_GO", proc351);
+ DEFINE_PROC ("WS.WS.VFS_URI_COMPOSE", proc352);
+ DEFINE_PROC ("WS.WS.VFS_EXTRACT_RDF", proc353);
+ DEFINE_PROC ("WS.WS.SITEMAP_ENSURE_NEW_SITE", proc354);
+ DEFINE_PROC ("WS.WS.SITEMAP_URLS_REGISTER", proc355);
+ DEFINE_PROC ("WS.WS.SITEMAP_GET_LOC", proc356);
+ DEFINE_PROC ("WS.WS.SITEMAP_XML_PARSE", proc357);
+ DEFINE_PROC ("WS.WS.SITEMAP_RDF_STORE", proc358);
+ DEFINE_PROC ("VFS_ROBOTS_PARSE", proc359);
+ DEFINE_PROC ("VFS_ROBOTS_GET", proc360);
dk_free_box (bootstrap_cli->cli_qualifier);
bootstrap_cli->cli_qualifier = saved_qualifier;
@@ -30063,68 +29606,68 @@ sqls_define_dav (void)
/* uriqa.sql */
ddl_ensure_table ("WS.WS.URIQA_HANDLER", tbl1);
- DEFINE_PROC ("WS.WS.URIQA_CFG_ITEM_VALUE", proc367);
- DEFINE_PROC ("WS.WS.URIQA_LOAD_FROM_INI", proc368);
+ DEFINE_PROC ("WS.WS.URIQA_CFG_ITEM_VALUE", proc361);
+ DEFINE_PROC ("WS.WS.URIQA_LOAD_FROM_INI", proc362);
ddl_ensure_table ("do this always", other9);
- DEFINE_PROC ("WS.WS.URIQA_FULL_URI", proc369);
- DEFINE_PROC ("WS.WS.URIQA_APPLY_TRIGGERS", proc370);
- DEFINE_PROC ("WS.WS.URIQA_N3_DIR_LIST", proc371);
- DEFINE_PROC ("DB.DBA.DAV_EXTRACT_DYN_RDF_application/xbel+xml", proc372);
- DEFINE_PROC ("WS.WS.URIQA_HANDLER_LOCALDAV", proc373);
- DEFINE_PROC ("WS.WS.URIQA_HANDLER_NATIVE_HTTP", proc374);
- DEFINE_PROC ("WS.WS.URIQA_STATUS", proc375);
- DEFINE_PROC ("WS.WS.MPUT", proc376);
- DEFINE_PROC ("WS.WS.MGET", proc377);
- DEFINE_PROC ("WS.WS.MDELETE", proc378);
- DEFINE_PROC ("WS.WS./!URIQA/", proc379);
- DEFINE_PROC ("WS.WS.URIQA_VHOST_RESET", proc380);
+ DEFINE_PROC ("WS.WS.URIQA_FULL_URI", proc363);
+ DEFINE_PROC ("WS.WS.URIQA_APPLY_TRIGGERS", proc364);
+ DEFINE_PROC ("WS.WS.URIQA_N3_DIR_LIST", proc365);
+ DEFINE_PROC ("DB.DBA.DAV_EXTRACT_DYN_RDF_application/xbel+xml", proc366);
+ DEFINE_PROC ("WS.WS.URIQA_HANDLER_LOCALDAV", proc367);
+ DEFINE_PROC ("WS.WS.URIQA_HANDLER_NATIVE_HTTP", proc368);
+ DEFINE_PROC ("WS.WS.URIQA_STATUS", proc369);
+ DEFINE_PROC ("WS.WS.MPUT", proc370);
+ DEFINE_PROC ("WS.WS.MGET", proc371);
+ DEFINE_PROC ("WS.WS.MDELETE", proc372);
+ DEFINE_PROC ("WS.WS./!URIQA/", proc373);
+ DEFINE_PROC ("WS.WS.URIQA_VHOST_RESET", proc374);
/* DET_CatFilter.sql */
- DEFINE_PROC ("CatFilter_DAV_AUTHENTICATE", proc381);
- DEFINE_PROC ("CatFilter_GET_CONDITION", proc382);
- DEFINE_PROC ("CatFilter_ENCODE_CATVALUE", proc383);
- DEFINE_PROC ("CatFilter_DECODE_CATVALUE", proc384);
- DEFINE_PROC ("CatFilter_PATH_PARTS_TO_FILTER", proc385);
- DEFINE_PROC ("CatFilter_ACC_FILTER_DATA", proc386);
- DEFINE_PROC ("CatFilter_DAV_SEARCH_ID_IMPL", proc387);
- DEFINE_PROC ("CatFilter_DAV_AUTHENTICATE_HTTP", proc388);
- DEFINE_PROC ("CatFilter_DAV_GET_PARENT", proc389);
- DEFINE_PROC ("CatFilter_DAV_COL_CREATE", proc390);
- DEFINE_PROC ("CatFilter_DAV_COL_MOUNT", proc391);
- DEFINE_PROC ("CatFilter_DAV_COL_MOUNT_HERE", proc392);
- DEFINE_PROC ("CatFilter_DAV_DELETE", proc393);
- DEFINE_PROC ("CatFilter_FILTER_TO_CONDITION", proc394);
- DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD", proc395);
- DEFINE_PROC ("CatFilter_DAV_PROP_REMOVE", proc396);
- DEFINE_PROC ("CatFilter_DAV_PROP_SET", proc397);
- DEFINE_PROC ("CatFilter_DAV_PROP_GET", proc398);
- DEFINE_PROC ("CatFilter_DAV_PROP_LIST", proc399);
- DEFINE_PROC ("CatFilter_DAV_DIR_SINGLE", proc400);
- DEFINE_PROC ("CatFilter_LIST_SCHEMAS", proc401);
- DEFINE_PROC ("CatFilter_LIST_SCHEMA_PROPS", proc402);
- DEFINE_PROC ("CatFilter_GET_RDF_INVERSE_HITS_DISTVALS", proc403);
- DEFINE_PROC ("CatFilter_GET_RDF_INVERSE_HITS_RES_IDS", proc404);
- DEFINE_PROC ("CatFilter_LIST_PROP_DISTVALS_AUX", proc405);
- DEFINE_PROC ("CatFilter_LIST_PROP_DISTVALS", proc406);
- DEFINE_PROC ("CatFilter_DAV_DIR_LIST", proc407);
- DEFINE_PROC ("CatFilter_DAV_DIR_FILTER", proc408);
- DEFINE_PROC ("CatFilter_DAV_SEARCH_ID", proc409);
- DEFINE_PROC ("CatFilter_DAV_SEARCH_PATH", proc410);
- DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD_COPY", proc411);
- DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD_MOVE", proc412);
- DEFINE_PROC ("CatFilter_DAV_RES_CONTENT", proc413);
- DEFINE_PROC ("CatFilter_DAV_SYMLINK", proc414);
- DEFINE_PROC ("CatFilter_DAV_LOCK", proc415);
- DEFINE_PROC ("CatFilter_DAV_UNLOCK", proc416);
- DEFINE_PROC ("CatFilter_DAV_IS_LOCKED", proc417);
- DEFINE_PROC ("CatFilter_DAV_LIST_LOCKS", proc418);
- DEFINE_PROC ("CatFilter_CONFIGURE", proc419);
- DEFINE_PROC ("CatFilter_FEED_DAV_RDF_INVERSE", proc420);
+ DEFINE_PROC ("CatFilter_DAV_AUTHENTICATE", proc375);
+ DEFINE_PROC ("CatFilter_GET_CONDITION", proc376);
+ DEFINE_PROC ("CatFilter_ENCODE_CATVALUE", proc377);
+ DEFINE_PROC ("CatFilter_DECODE_CATVALUE", proc378);
+ DEFINE_PROC ("CatFilter_PATH_PARTS_TO_FILTER", proc379);
+ DEFINE_PROC ("CatFilter_ACC_FILTER_DATA", proc380);
+ DEFINE_PROC ("CatFilter_DAV_SEARCH_ID_IMPL", proc381);
+ DEFINE_PROC ("CatFilter_DAV_AUTHENTICATE_HTTP", proc382);
+ DEFINE_PROC ("CatFilter_DAV_GET_PARENT", proc383);
+ DEFINE_PROC ("CatFilter_DAV_COL_CREATE", proc384);
+ DEFINE_PROC ("CatFilter_DAV_COL_MOUNT", proc385);
+ DEFINE_PROC ("CatFilter_DAV_COL_MOUNT_HERE", proc386);
+ DEFINE_PROC ("CatFilter_DAV_DELETE", proc387);
+ DEFINE_PROC ("CatFilter_FILTER_TO_CONDITION", proc388);
+ DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD", proc389);
+ DEFINE_PROC ("CatFilter_DAV_PROP_REMOVE", proc390);
+ DEFINE_PROC ("CatFilter_DAV_PROP_SET", proc391);
+ DEFINE_PROC ("CatFilter_DAV_PROP_GET", proc392);
+ DEFINE_PROC ("CatFilter_DAV_PROP_LIST", proc393);
+ DEFINE_PROC ("CatFilter_DAV_DIR_SINGLE", proc394);
+ DEFINE_PROC ("CatFilter_LIST_SCHEMAS", proc395);
+ DEFINE_PROC ("CatFilter_LIST_SCHEMA_PROPS", proc396);
+ DEFINE_PROC ("CatFilter_GET_RDF_INVERSE_HITS_DISTVALS", proc397);
+ DEFINE_PROC ("CatFilter_GET_RDF_INVERSE_HITS_RES_IDS", proc398);
+ DEFINE_PROC ("CatFilter_LIST_PROP_DISTVALS_AUX", proc399);
+ DEFINE_PROC ("CatFilter_LIST_PROP_DISTVALS", proc400);
+ DEFINE_PROC ("CatFilter_DAV_DIR_LIST", proc401);
+ DEFINE_PROC ("CatFilter_DAV_DIR_FILTER", proc402);
+ DEFINE_PROC ("CatFilter_DAV_SEARCH_ID", proc403);
+ DEFINE_PROC ("CatFilter_DAV_SEARCH_PATH", proc404);
+ DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD_COPY", proc405);
+ DEFINE_PROC ("CatFilter_DAV_RES_UPLOAD_MOVE", proc406);
+ DEFINE_PROC ("CatFilter_DAV_RES_CONTENT", proc407);
+ DEFINE_PROC ("CatFilter_DAV_SYMLINK", proc408);
+ DEFINE_PROC ("CatFilter_DAV_LOCK", proc409);
+ DEFINE_PROC ("CatFilter_DAV_UNLOCK", proc410);
+ DEFINE_PROC ("CatFilter_DAV_IS_LOCKED", proc411);
+ DEFINE_PROC ("CatFilter_DAV_LIST_LOCKS", proc412);
+ DEFINE_PROC ("CatFilter_CONFIGURE", proc413);
+ DEFINE_PROC ("CatFilter_FEED_DAV_RDF_INVERSE", proc414);
ddl_std_proc (trig35, 0x0);
ddl_std_proc (trig36, 0x0);
ddl_std_proc (trig37, 0x0);
- DEFINE_PROC ("CatFilter_INIT_SYS_DAV_RDF_INVERSE", proc421);
+ DEFINE_PROC ("CatFilter_INIT_SYS_DAV_RDF_INVERSE", proc415);
/* DET_HostFs.sql */
@@ -30136,252 +29679,253 @@ sqls_define_dav (void)
ddl_ensure_table ("WS.WS.HOSTFS_RES_META", tbl5);
ddl_ensure_column ("WS.WS.HOSTFS_RES_META", "RESM_TOPCOL_ID", alter2, 0);
ddl_ensure_table ("WS.WS.HOSTFS_RDF_INVERSE", tbl6);
- DEFINE_PROC ("WS.WS.HOSTFS_FEED_RDF_INVERSE", proc422);
+ DEFINE_PROC ("WS.WS.HOSTFS_FEED_RDF_INVERSE", proc416);
ddl_std_proc (trig38, 0x0);
ddl_std_proc (trig39, 0x0);
ddl_std_proc (trig40, 0x0);
ddl_ensure_table ("do this always", other10);
ddl_ensure_table ("do this always", other11);
- DEFINE_PROC ("WS.WS.HOSTFS_RES_TOPCOL_ID", proc423);
- DEFINE_PROC ("WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF", proc424);
- DEFINE_PROC ("WS.WS.HOSTFS_TEST_RDF", proc425);
- DEFINE_PROC ("WS.WS.HOSTFS_RES_CACHE_RESC_DATA_INDEX_HOOK", proc426);
- DEFINE_PROC ("WS.WS.HOSTFS_RES_CACHE_RESC_DATA_UNINDEX_HOOK", proc427);
+ DEFINE_PROC ("WS.WS.HOSTFS_RES_TOPCOL_ID", proc417);
+ DEFINE_PROC ("WS.WS.HOSTFS_EXTRACT_AND_SAVE_RDF", proc418);
+ DEFINE_PROC ("WS.WS.HOSTFS_TEST_RDF", proc419);
+ DEFINE_PROC ("WS.WS.HOSTFS_RES_CACHE_RESC_DATA_INDEX_HOOK", proc420);
+ DEFINE_PROC ("WS.WS.HOSTFS_RES_CACHE_RESC_DATA_UNINDEX_HOOK", proc421);
ddl_ensure_table ("do this always", other12);
ddl_ensure_table ("do this always", other13);
- DEFINE_PROC ("WS.WS.HOSTFS_FIND_COL", proc428);
- DEFINE_PROC ("WS.WS.HOSTFS_COL_DISAPPEARS", proc429);
- DEFINE_PROC ("WS.WS.HOSTFS_HANDLE_RES_SCAN", proc430);
- DEFINE_PROC ("WS.WS.HOSTFS_RES_DISAPPEARS", proc431);
- DEFINE_PROC ("WS.WS.HOSTFS_TOUCH_RES", proc432);
- DEFINE_PROC ("WS.WS.HOSTFS_GLOBAL_RESET", proc433);
- DEFINE_PROC ("WS.WS.HOSTFS_PATH_STAT", proc434);
- DEFINE_PROC ("WS.WS.HOSTFS_READ_TYPEINFO", proc435);
- DEFINE_PROC ("HostFs_DAV_AUTHENTICATE", proc436);
- DEFINE_PROC ("HostFs_DAV_AUTHENTICATE_HTTP", proc437);
- DEFINE_PROC ("HostFs_DAV_GET_PARENT", proc438);
- DEFINE_PROC ("HostFs_DAV_COL_CREATE", proc439);
- DEFINE_PROC ("HostFs_DAV_COL_MOUNT", proc440);
- DEFINE_PROC ("HostFs_DAV_COL_MOUNT_HERE", proc441);
- DEFINE_PROC ("HostFs_DAV_DELETE", proc442);
+ DEFINE_PROC ("WS.WS.HOSTFS_FIND_COL", proc422);
+ DEFINE_PROC ("WS.WS.HOSTFS_COL_DISAPPEARS", proc423);
+ DEFINE_PROC ("WS.WS.HOSTFS_HANDLE_RES_SCAN", proc424);
+ DEFINE_PROC ("WS.WS.HOSTFS_RES_DISAPPEARS", proc425);
+ DEFINE_PROC ("WS.WS.HOSTFS_TOUCH_RES", proc426);
+ DEFINE_PROC ("WS.WS.HOSTFS_GLOBAL_RESET", proc427);
+ DEFINE_PROC ("WS.WS.HOSTFS_PATH_STAT", proc428);
+ DEFINE_PROC ("WS.WS.HOSTFS_READ_TYPEINFO", proc429);
+ DEFINE_PROC ("HostFs_DAV_AUTHENTICATE", proc430);
+ DEFINE_PROC ("HostFs_DAV_AUTHENTICATE_HTTP", proc431);
+ DEFINE_PROC ("HostFs_DAV_GET_PARENT", proc432);
+ DEFINE_PROC ("HostFs_DAV_COL_CREATE", proc433);
+ DEFINE_PROC ("HostFs_DAV_COL_MOUNT", proc434);
+ DEFINE_PROC ("HostFs_DAV_COL_MOUNT_HERE", proc435);
+ DEFINE_PROC ("HostFs_DAV_DELETE", proc436);
ddl_ensure_table ("DB.DBA.HostFs_DAV_RES_UPLOAD", tbl7);
- DEFINE_PROC ("HostFs_DAV_RES_UPLOAD", proc443);
- DEFINE_PROC ("HostFs_DAV_PROP_REMOVE", proc444);
- DEFINE_PROC ("HostFs_DAV_PROP_SET", proc445);
- DEFINE_PROC ("HostFs_DAV_PROP_GET", proc446);
- DEFINE_PROC ("HostFs_DAV_PROP_LIST", proc447);
- DEFINE_PROC ("HostFs_ID_TO_OSPATH", proc448);
- DEFINE_PROC ("HostFs_DAV_DIR_SINGLE", proc449);
- DEFINE_PROC ("HostFs_DAV_DIR_LIST", proc450);
- DEFINE_PROC ("HostFs_DAV_DIR_FILTER", proc451);
- DEFINE_PROC ("HostFs_DAV_SEARCH_ID", proc452);
- DEFINE_PROC ("HostFs_DAV_SEARCH_PATH", proc453);
- DEFINE_PROC ("HostFs_DAV_RES_UPLOAD_COPY", proc454);
- DEFINE_PROC ("HostFs_DAV_RES_UPLOAD_MOVE", proc455);
- DEFINE_PROC ("HostFs_DAV_RES_CONTENT", proc456);
- DEFINE_PROC ("HostFs_DAV_SYMLINK", proc457);
- DEFINE_PROC ("HostFs_DAV_LOCK", proc458);
- DEFINE_PROC ("HostFs_DAV_UNLOCK", proc459);
- DEFINE_PROC ("HostFs_DAV_IS_LOCKED", proc460);
- DEFINE_PROC ("HostFs_DAV_LIST_LOCKS", proc461);
- DEFINE_PROC ("HostFs_CF_LIST_PROP_DISTVALS", proc462);
- DEFINE_PROC ("HostFs_CF_GET_RDF_HITS", proc463);
- DEFINE_PROC ("HostFs_RF_ID2SUFFIX", proc464);
- DEFINE_PROC ("HostFile_RF_SUFFIX2ID", proc465);
- DEFINE_PROC ("HostDir_RF_SUFFIX2ID", proc466);
+ DEFINE_PROC ("HostFs_DAV_RES_UPLOAD", proc437);
+ DEFINE_PROC ("HostFs_DAV_PROP_REMOVE", proc438);
+ DEFINE_PROC ("HostFs_DAV_PROP_SET", proc439);
+ DEFINE_PROC ("HostFs_DAV_PROP_GET", proc440);
+ DEFINE_PROC ("HostFs_DAV_PROP_LIST", proc441);
+ DEFINE_PROC ("HostFs_ID_TO_OSPATH", proc442);
+ DEFINE_PROC ("HostFs_DAV_DIR_SINGLE", proc443);
+ DEFINE_PROC ("HostFs_DAV_DIR_LIST", proc444);
+ DEFINE_PROC ("HostFs_DAV_DIR_FILTER", proc445);
+ DEFINE_PROC ("HostFs_DAV_SEARCH_ID", proc446);
+ DEFINE_PROC ("HostFs_DAV_SEARCH_PATH", proc447);
+ DEFINE_PROC ("HostFs_DAV_RES_UPLOAD_COPY", proc448);
+ DEFINE_PROC ("HostFs_DAV_RES_UPLOAD_MOVE", proc449);
+ DEFINE_PROC ("HostFs_DAV_RES_CONTENT", proc450);
+ DEFINE_PROC ("HostFs_DAV_SYMLINK", proc451);
+ DEFINE_PROC ("HostFs_DAV_LOCK", proc452);
+ DEFINE_PROC ("HostFs_DAV_UNLOCK", proc453);
+ DEFINE_PROC ("HostFs_DAV_IS_LOCKED", proc454);
+ DEFINE_PROC ("HostFs_DAV_LIST_LOCKS", proc455);
+ DEFINE_PROC ("HostFs_CF_LIST_PROP_DISTVALS", proc456);
+ DEFINE_PROC ("HostFs_CF_GET_RDF_HITS", proc457);
+ DEFINE_PROC ("HostFs_RF_ID2SUFFIX", proc458);
+ DEFINE_PROC ("HostFile_RF_SUFFIX2ID", proc459);
+ DEFINE_PROC ("HostDir_RF_SUFFIX2ID", proc460);
/* DET_ResFilter.sql */
- DEFINE_PROC ("ResFilter_DAV_AUTHENTICATE", proc467);
- DEFINE_PROC ("ResFilter_NORM", proc468);
- DEFINE_PROC ("ResFilter_ENCODE_FILTER", proc469);
- DEFINE_PROC ("ResFilter_DECODE_FILTER", proc470);
- DEFINE_PROC ("ResFilter_GET_CONDITION", proc471);
- DEFINE_PROC ("ResFilter_FIT_INTO_CONDITION", proc472);
- DEFINE_PROC ("ResFilter_MAKE_DEL_ACTION_FROM_CONDITION", proc473);
- DEFINE_PROC ("ResFilter_LEAVE_CONDITION", proc474);
- DEFINE_PROC ("ResFilter_FNMERGE", proc475);
- DEFINE_PROC ("ResFilter_FNSPLIT", proc476);
- DEFINE_PROC ("ResFilter_DAV_SEARCH_ID_IMPL", proc477);
- DEFINE_PROC ("ResFilter_DAV_AUTHENTICATE_HTTP", proc478);
- DEFINE_PROC ("ResFilter_DAV_GET_PARENT", proc479);
- DEFINE_PROC ("ResFilter_DAV_COL_CREATE", proc480);
- DEFINE_PROC ("ResFilter_DAV_COL_MOUNT", proc481);
- DEFINE_PROC ("ResFilter_DAV_COL_MOUNT_HERE", proc482);
- DEFINE_PROC ("ResFilter_DAV_DELETE", proc483);
- DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD", proc484);
- DEFINE_PROC ("ResFilter_DAV_PROP_REMOVE", proc485);
- DEFINE_PROC ("ResFilter_DAV_PROP_SET", proc486);
- DEFINE_PROC ("ResFilter_DAV_PROP_GET", proc487);
- DEFINE_PROC ("ResFilter_DAV_PROP_LIST", proc488);
- DEFINE_PROC ("ResFilter_DAV_DIR_SINGLE", proc489);
- DEFINE_PROC ("ResFilter_DAV_DIR_LIST", proc490);
- DEFINE_PROC ("ResFilter_DAV_DIR_FILTER", proc491);
- DEFINE_PROC ("ResFilter_DAV_SEARCH_ID", proc492);
- DEFINE_PROC ("ResFilter_DAV_SEARCH_PATH", proc493);
- DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD_COPY", proc494);
- DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD_MOVE", proc495);
- DEFINE_PROC ("ResFilter_DAV_RES_CONTENT", proc496);
- DEFINE_PROC ("ResFilter_DAV_SYMLINK", proc497);
- DEFINE_PROC ("ResFilter_DAV_LOCK", proc498);
- DEFINE_PROC ("ResFilter_DAV_UNLOCK", proc499);
- DEFINE_PROC ("ResFilter_DAV_IS_LOCKED", proc500);
- DEFINE_PROC ("ResFilter_DAV_LIST_LOCKS", proc501);
- DEFINE_PROC ("ResFilter_CONFIGURE", proc502);
+ DEFINE_PROC ("ResFilter_DAV_AUTHENTICATE", proc461);
+ DEFINE_PROC ("ResFilter_NORM", proc462);
+ DEFINE_PROC ("ResFilter_ENCODE_FILTER", proc463);
+ DEFINE_PROC ("ResFilter_DECODE_FILTER", proc464);
+ DEFINE_PROC ("ResFilter_GET_CONDITION", proc465);
+ DEFINE_PROC ("ResFilter_FIT_INTO_CONDITION", proc466);
+ DEFINE_PROC ("ResFilter_MAKE_DEL_ACTION_FROM_CONDITION", proc467);
+ DEFINE_PROC ("ResFilter_LEAVE_CONDITION", proc468);
+ DEFINE_PROC ("ResFilter_FNMERGE", proc469);
+ DEFINE_PROC ("ResFilter_FNSPLIT", proc470);
+ DEFINE_PROC ("ResFilter_DAV_SEARCH_ID_IMPL", proc471);
+ DEFINE_PROC ("ResFilter_DAV_AUTHENTICATE_HTTP", proc472);
+ DEFINE_PROC ("ResFilter_DAV_GET_PARENT", proc473);
+ DEFINE_PROC ("ResFilter_DAV_COL_CREATE", proc474);
+ DEFINE_PROC ("ResFilter_DAV_COL_MOUNT", proc475);
+ DEFINE_PROC ("ResFilter_DAV_COL_MOUNT_HERE", proc476);
+ DEFINE_PROC ("ResFilter_DAV_DELETE", proc477);
+ DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD", proc478);
+ DEFINE_PROC ("ResFilter_DAV_PROP_REMOVE", proc479);
+ DEFINE_PROC ("ResFilter_DAV_PROP_SET", proc480);
+ DEFINE_PROC ("ResFilter_DAV_PROP_GET", proc481);
+ DEFINE_PROC ("ResFilter_DAV_PROP_LIST", proc482);
+ DEFINE_PROC ("ResFilter_DAV_DIR_SINGLE", proc483);
+ DEFINE_PROC ("ResFilter_DAV_DIR_LIST", proc484);
+ DEFINE_PROC ("ResFilter_DAV_DIR_FILTER", proc485);
+ DEFINE_PROC ("ResFilter_DAV_SEARCH_ID", proc486);
+ DEFINE_PROC ("ResFilter_DAV_SEARCH_PATH", proc487);
+ DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD_COPY", proc488);
+ DEFINE_PROC ("ResFilter_DAV_RES_UPLOAD_MOVE", proc489);
+ DEFINE_PROC ("ResFilter_DAV_RES_CONTENT", proc490);
+ DEFINE_PROC ("ResFilter_DAV_SYMLINK", proc491);
+ DEFINE_PROC ("ResFilter_DAV_LOCK", proc492);
+ DEFINE_PROC ("ResFilter_DAV_UNLOCK", proc493);
+ DEFINE_PROC ("ResFilter_DAV_IS_LOCKED", proc494);
+ DEFINE_PROC ("ResFilter_DAV_LIST_LOCKS", proc495);
+ DEFINE_PROC ("ResFilter_CONFIGURE", proc496);
/* DET_PropFilter.sql */
- DEFINE_PROC ("PropFilter_DAV_AUTHENTICATE", proc503);
- DEFINE_PROC ("PropFilter_NORM", proc504);
- DEFINE_PROC ("PropFilter_GET_CONDITION", proc505);
- DEFINE_PROC ("PropFilter_FIT_INTO_CONDITION", proc506);
- DEFINE_PROC ("PropFilter_LEAVE_CONDITION", proc507);
- DEFINE_PROC ("PropFilter_FNMERGE", proc508);
- DEFINE_PROC ("PropFilter_FNSPLIT", proc509);
- DEFINE_PROC ("PropFilter_DAV_SEARCH_ID_IMPL", proc510);
- DEFINE_PROC ("PropFilter_DAV_AUTHENTICATE_HTTP", proc511);
- DEFINE_PROC ("PropFilter_DAV_GET_PARENT", proc512);
- DEFINE_PROC ("PropFilter_DAV_COL_CREATE", proc513);
- DEFINE_PROC ("PropFilter_DAV_COL_MOUNT", proc514);
- DEFINE_PROC ("PropFilter_DAV_COL_MOUNT_HERE", proc515);
- DEFINE_PROC ("PropFilter_DAV_DELETE", proc516);
- DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD", proc517);
- DEFINE_PROC ("PropFilter_DAV_PROP_REMOVE", proc518);
- DEFINE_PROC ("PropFilter_DAV_PROP_SET", proc519);
- DEFINE_PROC ("PropFilter_DAV_PROP_GET", proc520);
- DEFINE_PROC ("PropFilter_DAV_PROP_LIST", proc521);
- DEFINE_PROC ("PropFilter_DAV_DIR_SINGLE", proc522);
- DEFINE_PROC ("PropFilter_DAV_DIR_LIST", proc523);
- DEFINE_PROC ("PropFilter_DAV_DIR_FILTER", proc524);
- DEFINE_PROC ("PropFilter_DAV_SEARCH_ID", proc525);
- DEFINE_PROC ("PropFilter_DAV_SEARCH_PATH", proc526);
- DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD_COPY", proc527);
- DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD_MOVE", proc528);
- DEFINE_PROC ("PropFilter_DAV_RES_CONTENT", proc529);
- DEFINE_PROC ("PropFilter_DAV_SYMLINK", proc530);
- DEFINE_PROC ("PropFilter_DAV_LOCK", proc531);
- DEFINE_PROC ("PropFilter_DAV_UNLOCK", proc532);
- DEFINE_PROC ("PropFilter_DAV_IS_LOCKED", proc533);
- DEFINE_PROC ("PropFilter_DAV_LIST_LOCKS", proc534);
+ DEFINE_PROC ("PropFilter_DAV_AUTHENTICATE", proc497);
+ DEFINE_PROC ("PropFilter_NORM", proc498);
+ DEFINE_PROC ("PropFilter_GET_CONDITION", proc499);
+ DEFINE_PROC ("PropFilter_FIT_INTO_CONDITION", proc500);
+ DEFINE_PROC ("PropFilter_LEAVE_CONDITION", proc501);
+ DEFINE_PROC ("PropFilter_FNMERGE", proc502);
+ DEFINE_PROC ("PropFilter_FNSPLIT", proc503);
+ DEFINE_PROC ("PropFilter_DAV_SEARCH_ID_IMPL", proc504);
+ DEFINE_PROC ("PropFilter_DAV_AUTHENTICATE_HTTP", proc505);
+ DEFINE_PROC ("PropFilter_DAV_GET_PARENT", proc506);
+ DEFINE_PROC ("PropFilter_DAV_COL_CREATE", proc507);
+ DEFINE_PROC ("PropFilter_DAV_COL_MOUNT", proc508);
+ DEFINE_PROC ("PropFilter_DAV_COL_MOUNT_HERE", proc509);
+ DEFINE_PROC ("PropFilter_DAV_DELETE", proc510);
+ DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD", proc511);
+ DEFINE_PROC ("PropFilter_DAV_PROP_REMOVE", proc512);
+ DEFINE_PROC ("PropFilter_DAV_PROP_SET", proc513);
+ DEFINE_PROC ("PropFilter_DAV_PROP_GET", proc514);
+ DEFINE_PROC ("PropFilter_DAV_PROP_LIST", proc515);
+ DEFINE_PROC ("PropFilter_DAV_DIR_SINGLE", proc516);
+ DEFINE_PROC ("PropFilter_DAV_DIR_LIST", proc517);
+ DEFINE_PROC ("PropFilter_DAV_DIR_FILTER", proc518);
+ DEFINE_PROC ("PropFilter_DAV_SEARCH_ID", proc519);
+ DEFINE_PROC ("PropFilter_DAV_SEARCH_PATH", proc520);
+ DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD_COPY", proc521);
+ DEFINE_PROC ("PropFilter_DAV_RES_UPLOAD_MOVE", proc522);
+ DEFINE_PROC ("PropFilter_DAV_RES_CONTENT", proc523);
+ DEFINE_PROC ("PropFilter_DAV_SYMLINK", proc524);
+ DEFINE_PROC ("PropFilter_DAV_LOCK", proc525);
+ DEFINE_PROC ("PropFilter_DAV_UNLOCK", proc526);
+ DEFINE_PROC ("PropFilter_DAV_IS_LOCKED", proc527);
+ DEFINE_PROC ("PropFilter_DAV_LIST_LOCKS", proc528);
/* DET_RDFData.sql */
- DEFINE_PROC ("DB.DBA.RDFData_log_message", proc535);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_AUTHENTICATE", proc536);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_AUTHENTICATE_HTTP", proc537);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_GET_PARENT", proc538);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_CREATE", proc539);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_MOUNT", proc540);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_MOUNT_HERE", proc541);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_DELETE", proc542);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD", proc543);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_REMOVE", proc544);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_SET", proc545);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_GET", proc546);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_LIST", proc547);
- DEFINE_PROC ("DB.DBA.RDFData_ACCESS_PARAMS", proc548);
- DEFINE_PROC ("DB.DBA.RDFData_cast_dt_silent", proc549);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_SINGLE", proc550);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_LIST", proc551);
- DEFINE_PROC ("RDFData_std_pref", proc552);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_FILTER", proc553);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_SEARCH_ID", proc554);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_SEARCH_PATH", proc555);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD_COPY", proc556);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD_MOVE", proc557);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_CONTENT", proc558);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_SYMLINK", proc559);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_DEREFERENCE_LIST", proc560);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_RESOLVE_PATH", proc561);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_LOCK", proc562);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_UNLOCK", proc563);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_IS_LOCKED", proc564);
- DEFINE_PROC ("DB.DBA.RDFData_DAV_LIST_LOCKS", proc565);
- DEFINE_PROC ("DB.DBA.RDFData_MAKE_DET_COL", proc566);
+ DEFINE_PROC ("DB.DBA.RDFData_log_message", proc529);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_AUTHENTICATE", proc530);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_AUTHENTICATE_HTTP", proc531);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_GET_PARENT", proc532);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_CREATE", proc533);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_MOUNT", proc534);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_COL_MOUNT_HERE", proc535);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DELETE", proc536);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD", proc537);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_REMOVE", proc538);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_SET", proc539);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_GET", proc540);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_PROP_LIST", proc541);
+ DEFINE_PROC ("DB.DBA.RDFData_ACCESS_PARAMS", proc542);
+ DEFINE_PROC ("DB.DBA.RDFData_cast_dt_silent", proc543);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_SINGLE", proc544);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_LIST", proc545);
+ DEFINE_PROC ("RDFData_std_pref", proc546);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DIR_FILTER", proc547);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_SEARCH_ID", proc548);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_SEARCH_PATH", proc549);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD_COPY", proc550);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_UPLOAD_MOVE", proc551);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RES_CONTENT", proc552);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_SYMLINK", proc553);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_DEREFERENCE_LIST", proc554);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_RESOLVE_PATH", proc555);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_LOCK", proc556);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_UNLOCK", proc557);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_IS_LOCKED", proc558);
+ DEFINE_PROC ("DB.DBA.RDFData_DAV_LIST_LOCKS", proc559);
+ DEFINE_PROC ("DB.DBA.RDFData_MAKE_DET_COL", proc560);
/* DET_S3.sql */
- DEFINE_PROC ("DB.DBA.S3__encode", proc567);
- DEFINE_PROC ("DB.DBA.S3__params", proc568);
- DEFINE_PROC ("DB.DBA.S3__parts2path", proc569);
- DEFINE_PROC ("DB.DBA.S3__item2entry", proc570);
- DEFINE_PROC ("DB.DBA.S3__headers2item", proc571);
- DEFINE_PROC ("DB.DBA.S3__makeHostUrl", proc572);
- DEFINE_PROC ("DB.DBA.S3__getBucketFromUrl", proc573);
- DEFINE_PROC ("DB.DBA.S3__getNameFromUrl", proc574);
- DEFINE_PROC ("DB.DBA.S3__getPathFromUrl", proc575);
- DEFINE_PROC ("DB.DBA.S3__makeAWSHeader", proc576);
- DEFINE_PROC ("DB.DBA.S3__getBuckets", proc577);
- DEFINE_PROC ("DB.DBA.S3__getBucket", proc578);
- DEFINE_PROC ("DB.DBA.S3__putObject", proc579);
- DEFINE_PROC ("DB.DBA.S3__headObject", proc580);
- DEFINE_PROC ("DB.DBA.S3__getObject", proc581);
- DEFINE_PROC ("DB.DBA.S3__deleteObject", proc582);
- DEFINE_PROC ("DB.DBA.S3_DAV_AUTHENTICATE", proc583);
- DEFINE_PROC ("DB.DBA.S3_DAV_AUTHENTICATE_HTTP", proc584);
- DEFINE_PROC ("DB.DBA.S3_DAV_GET_PARENT", proc585);
- DEFINE_PROC ("DB.DBA.S3_DAV_COL_CREATE", proc586);
- DEFINE_PROC ("DB.DBA.S3_DAV_DELETE", proc587);
- DEFINE_PROC ("DB.DBA.S3_DAV_PROP_REMOVE", proc588);
- DEFINE_PROC ("DB.DBA.S3_DAV_PROP_SET", proc589);
- DEFINE_PROC ("DB.DBA.S3_DAV_PROP_GET", proc590);
- DEFINE_PROC ("DB.DBA.S3_DAV_PROP_LIST", proc591);
- DEFINE_PROC ("DB.DBA.S3_DAV_DIR_SINGLE", proc592);
- DEFINE_PROC ("DB.DBA.S3_DAV_DIR_LIST", proc593);
- DEFINE_PROC ("DB.DBA.S3_DAV_DIR_FILTER", proc594);
- DEFINE_PROC ("DB.DBA.S3_DAV_SEARCH_ID", proc595);
- DEFINE_PROC ("DB.DBA.S3_DAV_SEARCH_PATH", proc596);
- DEFINE_PROC ("DB.DBA.S3_DAV_RES_UPLOAD", proc597);
- DEFINE_PROC ("DB.DBA.S3_DAV_RES_UPLOAD_COPY", proc598);
- DEFINE_PROC ("DB.DBA.S3_DAV_RES_UPLOAD_MOVE", proc599);
- DEFINE_PROC ("DB.DBA.S3_DAV_RES_CONTENT", proc600);
- DEFINE_PROC ("DB.DBA.S3_DAV_SYMLINK", proc601);
- DEFINE_PROC ("DB.DBA.S3_DAV_DEREFERENCE_LIST", proc602);
- DEFINE_PROC ("DB.DBA.S3_DAV_RESOLVE_PATH", proc603);
- DEFINE_PROC ("DB.DBA.S3_DAV_LOCK", proc604);
- DEFINE_PROC ("DB.DBA.S3_DAV_UNLOCK", proc605);
- DEFINE_PROC ("DB.DBA.S3_DAV_IS_LOCKED", proc606);
- DEFINE_PROC ("DB.DBA.S3_DAV_LIST_LOCKS", proc607);
+ DEFINE_PROC ("DB.DBA.S3__encode", proc561);
+ DEFINE_PROC ("DB.DBA.S3__params", proc562);
+ DEFINE_PROC ("DB.DBA.S3__parts2path", proc563);
+ DEFINE_PROC ("DB.DBA.S3__item2entry", proc564);
+ DEFINE_PROC ("DB.DBA.S3__headers2item", proc565);
+ DEFINE_PROC ("DB.DBA.S3__makeHostUrl", proc566);
+ DEFINE_PROC ("DB.DBA.S3__getBucketFromUrl", proc567);
+ DEFINE_PROC ("DB.DBA.S3__getNameFromUrl", proc568);
+ DEFINE_PROC ("DB.DBA.S3__getPathFromUrl", proc569);
+ DEFINE_PROC ("DB.DBA.S3__makeAWSHeader", proc570);
+ DEFINE_PROC ("DB.DBA.S3__getBuckets", proc571);
+ DEFINE_PROC ("DB.DBA.S3__getBucket", proc572);
+ DEFINE_PROC ("DB.DBA.S3__putObject", proc573);
+ DEFINE_PROC ("DB.DBA.S3__headObject", proc574);
+ DEFINE_PROC ("DB.DBA.S3__getObject", proc575);
+ DEFINE_PROC ("DB.DBA.S3__deleteObject", proc576);
+ DEFINE_PROC ("DB.DBA.S3_DAV_AUTHENTICATE", proc577);
+ DEFINE_PROC ("DB.DBA.S3_DAV_AUTHENTICATE_HTTP", proc578);
+ DEFINE_PROC ("DB.DBA.S3_DAV_GET_PARENT", proc579);
+ DEFINE_PROC ("DB.DBA.S3_DAV_COL_CREATE", proc580);
+ DEFINE_PROC ("DB.DBA.S3_DAV_DELETE", proc581);
+ DEFINE_PROC ("DB.DBA.S3_DAV_RES_UPLOAD", proc582);
+ DEFINE_PROC ("DB.DBA.S3_DAV_PROP_REMOVE", proc583);
+ DEFINE_PROC ("DB.DBA.S3_DAV_PROP_SET", proc584);
+ DEFINE_PROC ("DB.DBA.S3_DAV_PROP_GET", proc585);
+ DEFINE_PROC ("DB.DBA.S3_DAV_PROP_LIST", proc586);
+ DEFINE_PROC ("DB.DBA.S3_DAV_DIR_SINGLE", proc587);
+ DEFINE_PROC ("DB.DBA.S3_DAV_DIR_LIST", proc588);
+ DEFINE_PROC ("DB.DBA.S3_DAV_DIR_FILTER", proc589);
+ DEFINE_PROC ("DB.DBA.S3_DAV_SEARCH_ID", proc590);
+ DEFINE_PROC ("DB.DBA.S3_DAV_SEARCH_PATH", proc591);
+ DEFINE_PROC ("DB.DBA.S3_DAV_RES_UPLOAD", proc592);
+ DEFINE_PROC ("DB.DBA.S3_DAV_RES_UPLOAD_COPY", proc593);
+ DEFINE_PROC ("DB.DBA.S3_DAV_RES_UPLOAD_MOVE", proc594);
+ DEFINE_PROC ("DB.DBA.S3_DAV_RES_CONTENT", proc595);
+ DEFINE_PROC ("DB.DBA.S3_DAV_SYMLINK", proc596);
+ DEFINE_PROC ("DB.DBA.S3_DAV_DEREFERENCE_LIST", proc597);
+ DEFINE_PROC ("DB.DBA.S3_DAV_RESOLVE_PATH", proc598);
+ DEFINE_PROC ("DB.DBA.S3_DAV_LOCK", proc599);
+ DEFINE_PROC ("DB.DBA.S3_DAV_UNLOCK", proc600);
+ DEFINE_PROC ("DB.DBA.S3_DAV_IS_LOCKED", proc601);
+ DEFINE_PROC ("DB.DBA.S3_DAV_LIST_LOCKS", proc602);
/* DET_DynaRes.sql */
ddl_ensure_table ("WS.WS.DYNA_RES", tbl8);
- DEFINE_PROC ("DynaRes_ACCESS_PARAMS", proc608);
- DEFINE_PROC ("DynaRes_DAV_AUTHENTICATE", proc609);
- DEFINE_PROC ("DynaRes_DAV_AUTHENTICATE_HTTP", proc610);
- DEFINE_PROC ("DynaRes_DAV_GET_PARENT", proc611);
- DEFINE_PROC ("DynaRes_DAV_COL_CREATE", proc612);
- DEFINE_PROC ("DynaRes_DAV_COL_MOUNT", proc613);
- DEFINE_PROC ("DynaRes_DAV_COL_MOUNT_HERE", proc614);
- DEFINE_PROC ("DynaRes_DAV_DELETE", proc615);
- DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD", proc616);
- DEFINE_PROC ("DynaRes_DAV_PROP_REMOVE", proc617);
- DEFINE_PROC ("DynaRes_DAV_PROP_SET", proc618);
- DEFINE_PROC ("DynaRes_DAV_PROP_GET", proc619);
- DEFINE_PROC ("DynaRes_DAV_PROP_LIST", proc620);
- DEFINE_PROC ("DynaRes_DAV_DIR_SINGLE", proc621);
- DEFINE_PROC ("DynaRes_DAV_DIR_LIST", proc622);
- DEFINE_PROC ("DynaRes_DAV_FC_PRED_METAS", proc623);
- DEFINE_PROC ("DynaRes_DAV_FC_TABLE_METAS", proc624);
- DEFINE_PROC ("DynaRes_DAV_FC_PRINT_WHERE", proc625);
- DEFINE_PROC ("DynaRes_DAV_DIR_FILTER", proc626);
- DEFINE_PROC ("DynaRes_DAV_SEARCH_ID", proc627);
- DEFINE_PROC ("DynaRes_DAV_SEARCH_PATH", proc628);
- DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD_COPY", proc629);
- DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD_MOVE", proc630);
- DEFINE_PROC ("DynaRes_DAV_RES_CONTENT", proc631);
- DEFINE_PROC ("DynaRes_DAV_SYMLINK", proc632);
- DEFINE_PROC ("DynaRes_DAV_DEREFERENCE_LIST", proc633);
- DEFINE_PROC ("DynaRes_DAV_RESOLVE_PATH", proc634);
- DEFINE_PROC ("DynaRes_DAV_LOCK", proc635);
- DEFINE_PROC ("DynaRes_DAV_UNLOCK", proc636);
- DEFINE_PROC ("DynaRes_DAV_IS_LOCKED", proc637);
- DEFINE_PROC ("DynaRes_DAV_LIST_LOCKS", proc638);
- DEFINE_PROC ("DynaRes_CF_PROPNAME_TO_COLNAME", proc639);
- DEFINE_PROC ("DynaRes_CF_FEED_FROM_AND_WHERE", proc640);
- DEFINE_PROC ("DynaRes_CF_LIST_PROP_DISTVALS", proc641);
- DEFINE_PROC ("DynaRes_CF_GET_RDF_HITS", proc642);
- DEFINE_PROC ("DynaRes_INSERT_RESOURCE", proc643);
+ DEFINE_PROC ("DynaRes_ACCESS_PARAMS", proc603);
+ DEFINE_PROC ("DynaRes_DAV_AUTHENTICATE", proc604);
+ DEFINE_PROC ("DynaRes_DAV_AUTHENTICATE_HTTP", proc605);
+ DEFINE_PROC ("DynaRes_DAV_GET_PARENT", proc606);
+ DEFINE_PROC ("DynaRes_DAV_COL_CREATE", proc607);
+ DEFINE_PROC ("DynaRes_DAV_COL_MOUNT", proc608);
+ DEFINE_PROC ("DynaRes_DAV_COL_MOUNT_HERE", proc609);
+ DEFINE_PROC ("DynaRes_DAV_DELETE", proc610);
+ DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD", proc611);
+ DEFINE_PROC ("DynaRes_DAV_PROP_REMOVE", proc612);
+ DEFINE_PROC ("DynaRes_DAV_PROP_SET", proc613);
+ DEFINE_PROC ("DynaRes_DAV_PROP_GET", proc614);
+ DEFINE_PROC ("DynaRes_DAV_PROP_LIST", proc615);
+ DEFINE_PROC ("DynaRes_DAV_DIR_SINGLE", proc616);
+ DEFINE_PROC ("DynaRes_DAV_DIR_LIST", proc617);
+ DEFINE_PROC ("DynaRes_DAV_FC_PRED_METAS", proc618);
+ DEFINE_PROC ("DynaRes_DAV_FC_TABLE_METAS", proc619);
+ DEFINE_PROC ("DynaRes_DAV_FC_PRINT_WHERE", proc620);
+ DEFINE_PROC ("DynaRes_DAV_DIR_FILTER", proc621);
+ DEFINE_PROC ("DynaRes_DAV_SEARCH_ID", proc622);
+ DEFINE_PROC ("DynaRes_DAV_SEARCH_PATH", proc623);
+ DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD_COPY", proc624);
+ DEFINE_PROC ("DynaRes_DAV_RES_UPLOAD_MOVE", proc625);
+ DEFINE_PROC ("DynaRes_DAV_RES_CONTENT", proc626);
+ DEFINE_PROC ("DynaRes_DAV_SYMLINK", proc627);
+ DEFINE_PROC ("DynaRes_DAV_DEREFERENCE_LIST", proc628);
+ DEFINE_PROC ("DynaRes_DAV_RESOLVE_PATH", proc629);
+ DEFINE_PROC ("DynaRes_DAV_LOCK", proc630);
+ DEFINE_PROC ("DynaRes_DAV_UNLOCK", proc631);
+ DEFINE_PROC ("DynaRes_DAV_IS_LOCKED", proc632);
+ DEFINE_PROC ("DynaRes_DAV_LIST_LOCKS", proc633);
+ DEFINE_PROC ("DynaRes_CF_PROPNAME_TO_COLNAME", proc634);
+ DEFINE_PROC ("DynaRes_CF_FEED_FROM_AND_WHERE", proc635);
+ DEFINE_PROC ("DynaRes_CF_LIST_PROP_DISTVALS", proc636);
+ DEFINE_PROC ("DynaRes_CF_GET_RDF_HITS", proc637);
+ DEFINE_PROC ("DynaRes_INSERT_RESOURCE", proc638);
/* DET_Versioning.sql */
@@ -30396,68 +29940,68 @@ sqls_define_dav (void)
ddl_std_proc (trig41, 0x0);
ddl_std_proc (trig42, 0x0);
ddl_std_proc (trig43, 0x0);
- DEFINE_PROC ("Versioning_ADD_NEW_DIFF", proc644);
+ DEFINE_PROC ("Versioning_ADD_NEW_DIFF", proc639);
ddl_std_proc (trig44, 0x0);
ddl_std_proc (trig45, 0x0);
- DEFINE_PROC ("DAV_GET_VERSION_CONTENT", proc645);
- DEFINE_PROC ("DAV_RES_RESTORE", proc646);
- DEFINE_PROC ("Versioning_DAV_AUTHENTICATE", proc647);
- DEFINE_PROC ("Versioning_DAV_AUTHENTICATE_HTTP", proc648);
- DEFINE_PROC ("Versioning_DAV_GET_PARENT", proc649);
- DEFINE_PROC ("Versioning_DAV_COL_CREATE", proc650);
- DEFINE_PROC ("Versioning_DAV_COL_MOUNT", proc651);
- DEFINE_PROC ("Versioning_DAV_COL_MOUNT_HERE", proc652);
- DEFINE_PROC ("Versioning_DAV_DELETE", proc653);
- DEFINE_PROC ("Versioning_DAV_RES_UPLOAD", proc654);
- DEFINE_PROC ("Versioning_DAV_PROP_REMOVE", proc655);
- DEFINE_PROC ("Versioning_DAV_PROP_SET", proc656);
- DEFINE_PROC ("Versioning_DAV_PROP_GET", proc657);
- DEFINE_PROC ("Versioning_root_version", proc658);
- DEFINE_PROC ("Versioning_version_set", proc659);
- DEFINE_PROC ("Versioning_DAV_PROP_LIST", proc660);
- DEFINE_PROC ("Versioning_DAV_DIR_SINGLE", proc661);
- DEFINE_PROC ("Versioning_GET_BASE_PATH", proc662);
- DEFINE_PROC ("Versioning_GET_ATTIC_PATH", proc663);
- DEFINE_PROC ("Versioning_SET_LIST", proc664);
- DEFINE_PROC ("Versioning_DAV_DIR_LIST", proc665);
- DEFINE_PROC ("Versioning_DAV_DIR_FILTER", proc666);
- DEFINE_PROC ("Versioning_DAV_SEARCH_ID", proc667);
- DEFINE_PROC ("Versioning_DAV_SEARCH_PATH", proc668);
- DEFINE_PROC ("Versioning_DAV_RES_UPLOAD_COPY", proc669);
- DEFINE_PROC ("Versioning_DAV_RES_UPLOAD_MOVE", proc670);
- DEFINE_PROC ("Versioning_DAV_RES_CONTENT", proc671);
- DEFINE_PROC ("Versioning_DAV_SYMLINK", proc672);
- DEFINE_PROC ("Versioning_DAV_DEREFERENCE_LIST", proc673);
- DEFINE_PROC ("Versioning_DAV_RESOLVE_PATH", proc674);
- DEFINE_PROC ("Versioning_DAV_LOCK", proc675);
- DEFINE_PROC ("Versioning_DAV_UNLOCK", proc676);
- DEFINE_PROC ("Versioning_DAV_IS_LOCKED", proc677);
- DEFINE_PROC ("Versioning_DAV_LIST_LOCKS", proc678);
- DEFINE_PROC ("Versioning_AUTO_VERSION_PROP", proc679);
- DEFINE_PROC ("DAV_SET_VERSIONING_PROPERTIES", proc680);
- DEFINE_PROC ("Versioning_REMOVE_V_PROPERTIES", proc681);
- DEFINE_PROC ("DAV_REMOVE_VERSIONING_CONTROL_INT", proc682);
- DEFINE_PROC ("Versioning_SETPROP", proc683);
- DEFINE_PROC ("DAV_SET_VERSIONING_CONTROL", proc684);
- DEFINE_PROC ("DAV_MKWORKSPACE", proc685);
- DEFINE_PROC ("DAV_CHECKOUT", proc686);
- DEFINE_PROC ("DAV_CHECKOUT_INT", proc687);
- DEFINE_PROC ("DAV_CHECKIN", proc688);
- DEFINE_PROC ("DAV_CHECKIN_INT", proc689);
- DEFINE_PROC ("Versioning_CHECKOUT_INT", proc690);
+ DEFINE_PROC ("DAV_GET_VERSION_CONTENT", proc640);
+ DEFINE_PROC ("DAV_RES_RESTORE", proc641);
+ DEFINE_PROC ("Versioning_DAV_AUTHENTICATE", proc642);
+ DEFINE_PROC ("Versioning_DAV_AUTHENTICATE_HTTP", proc643);
+ DEFINE_PROC ("Versioning_DAV_GET_PARENT", proc644);
+ DEFINE_PROC ("Versioning_DAV_COL_CREATE", proc645);
+ DEFINE_PROC ("Versioning_DAV_COL_MOUNT", proc646);
+ DEFINE_PROC ("Versioning_DAV_COL_MOUNT_HERE", proc647);
+ DEFINE_PROC ("Versioning_DAV_DELETE", proc648);
+ DEFINE_PROC ("Versioning_DAV_RES_UPLOAD", proc649);
+ DEFINE_PROC ("Versioning_DAV_PROP_REMOVE", proc650);
+ DEFINE_PROC ("Versioning_DAV_PROP_SET", proc651);
+ DEFINE_PROC ("Versioning_DAV_PROP_GET", proc652);
+ DEFINE_PROC ("Versioning_root_version", proc653);
+ DEFINE_PROC ("Versioning_version_set", proc654);
+ DEFINE_PROC ("Versioning_DAV_PROP_LIST", proc655);
+ DEFINE_PROC ("Versioning_DAV_DIR_SINGLE", proc656);
+ DEFINE_PROC ("Versioning_GET_BASE_PATH", proc657);
+ DEFINE_PROC ("Versioning_GET_ATTIC_PATH", proc658);
+ DEFINE_PROC ("Versioning_SET_LIST", proc659);
+ DEFINE_PROC ("Versioning_DAV_DIR_LIST", proc660);
+ DEFINE_PROC ("Versioning_DAV_DIR_FILTER", proc661);
+ DEFINE_PROC ("Versioning_DAV_SEARCH_ID", proc662);
+ DEFINE_PROC ("Versioning_DAV_SEARCH_PATH", proc663);
+ DEFINE_PROC ("Versioning_DAV_RES_UPLOAD_COPY", proc664);
+ DEFINE_PROC ("Versioning_DAV_RES_UPLOAD_MOVE", proc665);
+ DEFINE_PROC ("Versioning_DAV_RES_CONTENT", proc666);
+ DEFINE_PROC ("Versioning_DAV_SYMLINK", proc667);
+ DEFINE_PROC ("Versioning_DAV_DEREFERENCE_LIST", proc668);
+ DEFINE_PROC ("Versioning_DAV_RESOLVE_PATH", proc669);
+ DEFINE_PROC ("Versioning_DAV_LOCK", proc670);
+ DEFINE_PROC ("Versioning_DAV_UNLOCK", proc671);
+ DEFINE_PROC ("Versioning_DAV_IS_LOCKED", proc672);
+ DEFINE_PROC ("Versioning_DAV_LIST_LOCKS", proc673);
+ DEFINE_PROC ("Versioning_AUTO_VERSION_PROP", proc674);
+ DEFINE_PROC ("DAV_SET_VERSIONING_PROPERTIES", proc675);
+ DEFINE_PROC ("Versioning_REMOVE_V_PROPERTIES", proc676);
+ DEFINE_PROC ("DAV_REMOVE_VERSIONING_CONTROL_INT", proc677);
+ DEFINE_PROC ("Versioning_SETPROP", proc678);
+ DEFINE_PROC ("DAV_SET_VERSIONING_CONTROL", proc679);
+ DEFINE_PROC ("DAV_MKWORKSPACE", proc680);
+ DEFINE_PROC ("DAV_CHECKOUT", proc681);
+ DEFINE_PROC ("DAV_CHECKOUT_INT", proc682);
+ DEFINE_PROC ("DAV_CHECKIN", proc683);
+ DEFINE_PROC ("DAV_CHECKIN_INT", proc684);
+ DEFINE_PROC ("Versioning_CHECKOUT_INT", proc685);
ddl_std_proc (trig46, 0x0);
- DEFINE_PROC ("DAV_VERSION_CONTROL", proc691);
- DEFINE_PROC ("DAV_UNCHECKOUT", proc692);
- DEFINE_PROC ("Versioning_Attic", proc693);
- DEFINE_PROC ("Versioning_OTHER_FILES_IN_VVC", proc694);
- DEFINE_PUBLIC_PROC ("DAV_REMOVE_VERSION_CONTROL", proc695);
- DEFINE_PUBLIC_PROC ("DAV_VERSION_FOLD_INT", proc696);
+ DEFINE_PROC ("DAV_VERSION_CONTROL", proc686);
+ DEFINE_PROC ("DAV_UNCHECKOUT", proc687);
+ DEFINE_PROC ("Versioning_Attic", proc688);
+ DEFINE_PROC ("Versioning_OTHER_FILES_IN_VVC", proc689);
+ DEFINE_PUBLIC_PROC ("DAV_REMOVE_VERSION_CONTROL", proc690);
+ DEFINE_PUBLIC_PROC ("DAV_VERSION_FOLD_INT", proc691);
ddl_std_proc (trig47, 0x0);
/* xml_view.sql */
- DEFINE_PROC ("XML_VIEW_PUBLISH", proc697);
- DEFINE_PROC ("XML_VIEW_DROP", proc698);
+ DEFINE_PROC ("XML_VIEW_PUBLISH", proc692);
+ DEFINE_PROC ("XML_VIEW_DROP", proc693);
}
diff --git a/libsrc/Wi/sql_code_dbp.c b/libsrc/Wi/sql_code_dbp.c
index 1798f47..1b8918b 100644
--- a/libsrc/Wi/sql_code_dbp.c
+++ b/libsrc/Wi/sql_code_dbp.c
@@ -1092,7 +1092,7 @@ static const char *proc28 =
"http (\'<TR><TD CLASS=\"CopyrightBorder\" COLSPAN=\"2\"><IMG SRC=\"/admin/images/1x1.gif\" WIDTH=\"1\" HEIGHT=\"2\" ALT=\"\"></TD></TR>\');\n"
"http (\'<TR><TD ALIGN=\"right\" COLSPAN=\"2\"><P CLASS=\"Copyright\">Virtuoso Server \');\n"
"http (sys_stat(\'st_dbms_ver\'));\n"
-"http (\' DBPUMP Interface - Copyright© 1998-2012 OpenLink Software.</P></TD></TR>\');\n"
+"http (\' DBPUMP Interface - Copyright© 1998-2011 OpenLink Software.</P></TD></TR>\');\n"
"http (\'</TABLE>\\n</BODY>\');\n"
"}\n"
"--src comp_html.sql:199\n";
diff --git a/libsrc/Wi/sql_code_ddk.c b/libsrc/Wi/sql_code_ddk.c
index 77ce75c..3b775dc 100644
--- a/libsrc/Wi/sql_code_ddk.c
+++ b/libsrc/Wi/sql_code_ddk.c
@@ -4646,7 +4646,7 @@ static const char *proc41 =
"in header varchar := null,\n"
"in force varchar := null,\n"
"in \"output-format\" varchar := null,\n"
-"in get varchar := \'add\',\n"
+"in get varchar := \'soft\',\n"
"in login varchar := \'\') __SOAP_HTTP \'text/html\'\n"
"{\n"
"declare hdr, content, req_hdr any;\n"
@@ -4743,16 +4743,14 @@ static const char *proc41 =
"accept := \"output-format\";\n"
"}\n"
"stat := \'00000\';\n"
-"if (get not in (\'soft\', \'replacing\', \'add\'))\n"
-"get := \'add\';\n"
+"if (get not in (\'soft\', \'replacing\'))\n"
+"get := \'soft\';\n"
"if (length (login))\n"
"login := concat (\'define get:login \"\', login, \'\" \');\n"
"else\n"
"login := \'\';\n"
"host := http_request_header(http_request_header(), \'Host\', null, null);\n"
"ids := vector (\'rdf\', \'id/entity\', \'id\');\n"
-"if (not exists (select 1 from RDF_QUAD where G = iri_to_id (url, 0)))\n"
-"{\n"
"foreach (varchar idn in ids) do\n"
"{\n"
"pref := \'http://\' || host || http_map_get (\'domain\') || \'/\' || idn || \'/\';\n"
@@ -4767,7 +4765,6 @@ static const char *proc41 =
"url := \'nodeID:/\' || subseq (url, 6);\n"
"}\n"
"}\n"
-"}\n"
"\n"
"url := replace (url, \'\'\'\', \'%27\');\n"
"url := replace (url, \'<\', \'%3C\');\n"
@@ -4872,7 +4869,7 @@ static const char *proc41 =
"--src virtual_dir.sql:990\n";
static const char *proc42 =
-"#line 1223 \"[executable]/virtual_dir.sql\"\n"
+"#line 1220 \"[executable]/virtual_dir.sql\"\n"
"create procedure\n"
"DB.DBA.VHOST_DUMP_SQL (in lpath varchar, in vhost varchar := \'*ini*\', in lhost varchar := \'*ini*\')\n"
"{\n"
@@ -4936,10 +4933,10 @@ static const char *proc42 =
"}\n"
"return string_output_string (ses);\n"
"}\n"
-"--src virtual_dir.sql:1221\n";
+"--src virtual_dir.sql:1218\n";
static const char *proc43 =
-"#line 1289 \"[executable]/virtual_dir.sql\"\n"
+"#line 1286 \"[executable]/virtual_dir.sql\"\n"
"create procedure DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q (in accept varchar)\n"
"{\n"
"declare format, itm varchar;\n"
@@ -4974,10 +4971,10 @@ static const char *proc43 =
"}\n"
"return format;\n"
"}\n"
-"--src virtual_dir.sql:1287\n";
+"--src virtual_dir.sql:1284\n";
static const char *proc44 =
-"#line 1325 \"[executable]/virtual_dir.sql\"\n"
+"#line 1322 \"[executable]/virtual_dir.sql\"\n"
"create procedure DB.DBA.HTTP_RDF_ACCEPT (in path varchar, in virtual_dir varchar, in lines any, in graph_mode int)\n"
"{\n"
"declare host, stat, msg, qry, data, meta, accept, format, graph, url, ssl varchar;\n"
@@ -5024,10 +5021,10 @@ static const char *proc44 =
"signal (stat, msg);\n"
"return 0;\n"
"}\n"
-"--src virtual_dir.sql:1323\n";
+"--src virtual_dir.sql:1320\n";
static const char *proc45 =
-"#line 1373 \"[executable]/virtual_dir.sql\"\n"
+"#line 1370 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.DIR_INDEX_MAKE_XML (inout _sheet varchar, in curdir varchar := null, in start_from varchar := null)\n"
"{\n"
"declare dirarr, filearr, fsize, xte_path, xte_list, xte_entry any;\n"
@@ -5098,7 +5095,7 @@ static const char *proc45 =
"xte_nodebld_final (xte_path, xte_head (\'PATH\'));\n"
"return xml_tree_doc (xte_path);\n"
"}\n"
-"--src virtual_dir.sql:1371\n";
+"--src virtual_dir.sql:1368\n";
static const char *other868 =
"xslt_sheet (\'http://local.virt/dir_output\', xml_tree_doc (\'\n"
@@ -5151,7 +5148,7 @@ static const char *other868 =
"\n"
"</xsl:stylesheet>\'))\n";
static const char *proc46 =
-"#line 1498 \"[executable]/virtual_dir.sql\"\n"
+"#line 1495 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.DIR_INDEX_XML (in path any, in params any, in lines any)\n"
"{\n"
"declare _html, _xml, _sheet varchar;\n"
@@ -5189,10 +5186,10 @@ static const char *proc46 =
"set http_charset=\'UTF-8\';\n"
"return http_value (xslt (ssheet_name, _xml));\n"
"}\n"
-"--src virtual_dir.sql:1496\n";
+"--src virtual_dir.sql:1493\n";
static const char *proc47 =
-"#line 1537 \"[executable]/virtual_dir.sql\"\n"
+"#line 1534 \"[executable]/virtual_dir.sql\"\n"
"create procedure DB.DBA.SERVICES_WSIL (in path any, in params any, in lines any)\n"
"{\n"
"declare host, intf, requrl, proto, rhost varchar;\n"
@@ -5226,7 +5223,7 @@ static const char *proc47 =
"}\n"
"http(\'</inspection>\');\n"
"}\n"
-"--src virtual_dir.sql:1535\n";
+"--src virtual_dir.sql:1532\n";
static const char *tbl32 =
"create table WS.WS.HTTP_HOST_META (\n"
@@ -5235,7 +5232,7 @@ static const char *tbl32 =
")\n";
static const char *proc48 =
-"#line 1580 \"[executable]/virtual_dir.sql\"\n"
+"#line 1577 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.host_meta_add (in app varchar, in meta varchar)\n"
"{\n"
"\n"
@@ -5243,18 +5240,18 @@ static const char *proc48 =
"insert replacing WS.WS.HTTP_HOST_META (HM_APP, HM_META)\n"
"values (app, meta);\n"
"}\n"
-"--src virtual_dir.sql:1578\n";
+"--src virtual_dir.sql:1575\n";
static const char *proc49 =
-"#line 1589 \"[executable]/virtual_dir.sql\"\n"
+"#line 1586 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.host_meta_del (in app varchar)\n"
"{\n"
"delete from WS.WS.HTTP_HOST_META where HM_APP = app;\n"
"}\n"
-"--src virtual_dir.sql:1587\n";
+"--src virtual_dir.sql:1584\n";
static const char *proc50 =
-"#line 1596 \"[executable]/virtual_dir.sql\"\n"
+"#line 1593 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.\"host-meta\" (in format varchar := \'xml\') __SOAP_HTTP \'application/xrd+xml\'\n"
"{\n"
"declare ses, lines any;\n"
@@ -5285,10 +5282,10 @@ static const char *proc50 =
"}\n"
"return ret;\n"
"}\n"
-"--src virtual_dir.sql:1594\n";
+"--src virtual_dir.sql:1591\n";
static const char *proc51 =
-"#line 1628 \"[executable]/virtual_dir.sql\"\n"
+"#line 1625 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.host_meta_init ()\n"
"{\n"
"if (not exists (select 1 from \"DB\".\"DBA\".\"SYS_USERS\" where U_NAME = \'WebMeta\'))\n"
@@ -5300,12 +5297,12 @@ static const char *proc51 =
"DB.DBA.VHOST_REMOVE (lpath=>\'/.well-known\');\n"
"DB.DBA.VHOST_DEFINE (lpath=>\'/.well-known\', ppath=>\'/SOAP/Http\', soap_user=>\'WebMeta\');\n"
"}\n"
-"--src virtual_dir.sql:1626\n";
+"--src virtual_dir.sql:1623\n";
static const char *other869 =
"WS.WS.host_meta_init ()\n";
static const char *proc52 =
-"#line 1644 \"[executable]/virtual_dir.sql\"\n"
+"#line 1641 \"[executable]/virtual_dir.sql\"\n"
"create procedure WS.WS.host_meta_dss ()\n"
"{\n"
"declare ses any;\n"
@@ -5337,7 +5334,7 @@ static const char *proc52 =
"http (\'</Signature>\\n\', ses);\n"
"return string_output_string (ses);\n"
"}\n"
-"--src virtual_dir.sql:1642\n";
+"--src virtual_dir.sql:1639\n";
/* url_rewrite.sql */
diff --git a/libsrc/Wi/sql_code_pldbg.c b/libsrc/Wi/sql_code_pldbg.c
index 513a143..2a10aa2 100644
--- a/libsrc/Wi/sql_code_pldbg.c
+++ b/libsrc/Wi/sql_code_pldbg.c
@@ -10,12 +10,12 @@ static const char *xsl1[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: cov_report.xsl,v 1.3.2.2 2012/03/08 12:55:33 source Exp $\n"
+" - $Id: cov_report.xsl,v 1.3.2.1 2009/04/16 09:48:07 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2009 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -97,12 +97,12 @@ static const char *xsl2[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: cov_time.xsl,v 1.5.2.1 2012/03/08 12:55:33 source Exp $\n"
+" - $Id: cov_time.xsl,v 1.5 2009/04/09 13:22:12 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
diff --git a/libsrc/Wi/sql_code_sparql.c b/libsrc/Wi/sql_code_sparql.c
index 8a51b17..37ebc71 100644
--- a/libsrc/Wi/sql_code_sparql.c
+++ b/libsrc/Wi/sql_code_sparql.c
@@ -153,19 +153,19 @@ static const char *tbl13 =
")\n";
static const char *tbl14 =
-"create table DB.DBA.SYS_IDONLY_EMPTY\n"
+"create table DB.DBA.SYS_FAKE_0\n"
"(\n"
"ID integer not null primary key\n"
")\n";
static const char *tbl15 =
-"create table DB.DBA.SYS_IDONLY_ONE\n"
+"create table DB.DBA.SYS_FAKE_1\n"
"(\n"
"ID integer not null primary key\n"
")\n";
static const char *other3 =
-"insert soft DB.DBA.SYS_IDONLY_ONE (ID) values (0)\n";
+"insert soft DB.DBA.SYS_FAKE_1 (ID) values (0)\n";
static const char *other4 =
"sequence_set (\'RDF_URL_IID_NAMED\', 1000000, 1)\n";
static const char *other5 =
@@ -1310,7 +1310,6 @@ static const char *proc39 =
"create function DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL_FT (in v any, in g_iid IRI_ID, in p_iid IRI_ID, in ro_id_dict any := null) returns any\n"
"{\n"
"declare t int;\n"
-"\n"
"t := __tag (v);\n"
"if (not (t in (126, __tag of varchar, 217, __tag of nvarchar, __tag of XML, __tag of rdf_box)))\n"
"return v;\n"
@@ -1336,11 +1335,10 @@ static const char *proc39 =
"--src sparql.sql:1300\n";
static const char *proc40 =
-"#line 1330 \"[executable]/sparql.sql\"\n"
+"#line 1329 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL (in v any, in dt_iid IRI_ID, in lang varchar) returns any\n"
"{\n"
"declare t, dt_twobyte, lang_twobyte int;\n"
-"\n"
"retry_unrdf:\n"
"t := __tag (v);\n"
"if (not (t in (126, __tag of varchar, 217, __tag of nvarchar, __tag of XML)))\n"
@@ -1365,13 +1363,12 @@ static const char *proc40 =
"lang_twobyte := DB.DBA.RDF_TWOBYTE_OF_LANGUAGE (lang);\n"
"else\n"
"lang_twobyte := 257;\n"
-"\n"
"return DB.DBA.RDF_OBJ_ADD (dt_twobyte, v, lang_twobyte);\n"
"}\n"
-"--src sparql.sql:1328\n";
+"--src sparql.sql:1327\n";
static const char *proc41 =
-"#line 1363 \"[executable]/sparql.sql\"\n"
+"#line 1360 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL_FT (in v any, in dt_iid IRI_ID, in lang varchar, in g_iid IRI_ID, in p_iid IRI_ID, in ro_id_dict any := null) returns any\n"
"{\n"
"declare t, dt_twobyte, lang_twobyte int;\n"
@@ -1415,14 +1412,13 @@ static const char *proc41 =
"}\n"
"return DB.DBA.RDF_OBJ_ADD (dt_twobyte, v, lang_twobyte, ro_id_dict);\n"
"}\n"
-"--src sparql.sql:1361\n";
+"--src sparql.sql:1358\n";
static const char *proc42 =
-"#line 1408 \"[executable]/sparql.sql\"\n"
+"#line 1405 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL_STRINGS (\n"
"in o_val any, in o_type varchar, in o_lang varchar ) returns any\n"
"{\n"
-"\n"
"if (__tag (o_type) in (__tag of varchar, 217))\n"
"{\n"
"declare parsed any;\n"
@@ -1457,18 +1453,18 @@ static const char *proc42 =
"}\n"
"return DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL (o_val);\n"
"}\n"
-"--src sparql.sql:1406\n";
+"--src sparql.sql:1403\n";
static const char *proc43 =
-"#line 1448 \"[executable]/sparql.sql\"\n"
+"#line 1444 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_LONG_OF_OBJ (in shortobj any) returns any\n"
"{\n"
"return __rdf_long_of_obj (shortobj);\n"
"}\n"
-"--src sparql.sql:1446\n";
+"--src sparql.sql:1442\n";
static const char *proc44 =
-"#line 1454 \"[executable]/sparql.sql\"\n"
+"#line 1450 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_DATATYPE_OF_OBJ (in shortobj any, in dflt varchar := \'http://www.w3.org/2001/XMLSchema#string\') returns any\n"
"{\n"
"declare twobyte integer;\n"
@@ -1479,11 +1475,9 @@ static const char *proc44 =
"return null;\n"
"if (isstring (shortobj) and bit_and (__box_flags (shortobj), 1))\n"
"return null;\n"
-"\n"
"return iri_to_id (__xsd_type (shortobj, dflt));\n"
"}\n"
"twobyte := rdf_box_type (shortobj);\n"
-"\n"
"if (257 = twobyte)\n"
"return case (rdf_box_lang (shortobj)) when 257 then iri_to_id (dflt) else null end;\n"
"whenever not found goto badtype;\n"
@@ -1494,10 +1488,10 @@ static const char *proc44 =
"signal (\'RDFXX\', sprintf (\'Unknown datatype in DB.DBA.RQ_DATATYPE_OF_OBJ, bad type id %d, string value \"%s\"\',\n"
"twobyte, cast (rdf_box_data (shortobj) as varchar) ) );\n"
"}\n"
-"--src sparql.sql:1452\n";
+"--src sparql.sql:1448\n";
static const char *proc45 =
-"#line 1481 \"[executable]/sparql.sql\"\n"
+"#line 1475 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_LANGUAGE_OF_OBJ (in shortobj any, in dflt varchar := \'\') returns any\n"
"{\n"
"declare twobyte integer;\n"
@@ -1508,11 +1502,9 @@ static const char *proc45 =
"return null;\n"
"if (isstring (shortobj) and bit_and (__box_flags (shortobj), 1))\n"
"return null;\n"
-"\n"
"return dflt;\n"
"}\n"
"twobyte := rdf_box_lang (shortobj);\n"
-"\n"
"if (257 = twobyte)\n"
"return dflt;\n"
"whenever not found goto badtype;\n"
@@ -1522,18 +1514,18 @@ static const char *proc45 =
"badtype:\n"
"signal (\'RDFXX\', sprintf (\'Unknown language in DB.DBA.RDF_LANGUAGE_OF_OBJ, bad string \"%s\"\', shortobj));\n"
"}\n"
-"--src sparql.sql:1479\n";
+"--src sparql.sql:1473\n";
static const char *proc46 =
-"#line 1507 \"[executable]/sparql.sql\"\n"
+"#line 1499 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_SQLVAL_OF_OBJ (in shortobj any) returns any\n"
"{\n"
"return __rdf_sqlval_of_obj (shortobj);\n"
"}\n"
-"--src sparql.sql:1505\n";
+"--src sparql.sql:1497\n";
static const char *proc47 =
-"#line 1513 \"[executable]/sparql.sql\"\n"
+"#line 1505 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_BOOL_OF_OBJ (in shortobj any) returns any\n"
"{\n"
"if (isiri_id (shortobj))\n"
@@ -1567,40 +1559,35 @@ static const char *proc47 =
"signal (\'RDFXX\', sprintf (\'Unknown datatype in DB.DBA.RDF_BOOL_OF_OBJ, bad type id %d, string value \"%s\"\',\n"
"twobyte, cast (rdf_box_data (shortobj) as varchar) ) );\n"
"}\n"
-"--src sparql.sql:1511\n";
+"--src sparql.sql:1503\n";
static const char *proc48 =
-"#line 1548 \"[executable]/sparql.sql\"\n"
+"#line 1540 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QNAME_OF_OBJ (in shortobj any) returns varchar\n"
"{\n"
"return id_to_iri_nosignal (shortobj);\n"
"}\n"
-"--src sparql.sql:1546\n";
+"--src sparql.sql:1538\n";
static const char *proc49 =
-"#line 1554 \"[executable]/sparql.sql\"\n"
+"#line 1546 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_STRSQLVAL_OF_OBJ (in shortobj any)\n"
"{\n"
"return __rdf_strsqlval (shortobj, 0);\n"
"}\n"
-"--src sparql.sql:1552\n";
+"--src sparql.sql:1544\n";
static const char *proc50 =
-"#line 1560 \"[executable]/sparql.sql\"\n"
+"#line 1552 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_OBJ_OF_LONG (in longobj any) returns any\n"
"{\n"
"declare t int;\n"
"t := __tag (longobj);\n"
"if (__tag of rdf_box <> t)\n"
"{\n"
-"if (not (t in (__tag of varchar, 126, 217, __tag of nvarchar, 133, 226)))\n"
+"if (not (t in (__tag of varchar, 126, 217, __tag of nvarchar)))\n"
"return longobj;\n"
-"if (t = 133)\n"
-"{\n"
-"longobj := cast (longobj as nvarchar);\n"
-"t := __tag (longobj);\n"
-"}\n"
-"if (__tag of nvarchar = t or t = 226)\n"
+"if (__tag of nvarchar = t)\n"
"longobj := charset_recode (longobj, \'_WIDE_\', \'UTF-8\');\n"
"else if (t in (126, 217))\n"
"longobj := cast (longobj as varchar);\n"
@@ -1612,10 +1599,10 @@ static const char *proc50 =
"return longobj;\n"
"return DB.DBA.RDF_OBJ_ADD (257, longobj, 257);\n"
"}\n"
-"--src sparql.sql:1558\n";
+"--src sparql.sql:1550\n";
static const char *proc51 =
-"#line 1610 \"[executable]/sparql.sql\"\n"
+"#line 1597 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_OBJ_OF_SQLVAL (in v any) returns any\n"
"{\n"
"declare t int;\n"
@@ -1634,10 +1621,10 @@ static const char *proc51 =
"return iri_to_id (v);\n"
"return DB.DBA.RDF_OBJ_ADD (257, v, 257);\n"
"}\n"
-"--src sparql.sql:1608\n";
+"--src sparql.sql:1595\n";
static const char *proc52 =
-"#line 1633 \"[executable]/sparql.sql\"\n"
+"#line 1620 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (in v any) returns any\n"
"{\n"
"declare t int;\n"
@@ -1654,10 +1641,10 @@ static const char *proc52 =
"res := rdf_box (v, 257, 257, 0, 1);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:1631\n";
+"--src sparql.sql:1618\n";
static const char *proc53 =
-"#line 1652 \"[executable]/sparql.sql\"\n"
+"#line 1639 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (in v any, in dt_iid IRI_ID, in lang varchar) returns any\n"
"{\n"
"declare t, dt_twobyte, lang_twobyte int;\n"
@@ -1692,10 +1679,10 @@ static const char *proc53 =
"res := rdf_box (v, dt_twobyte, lang_twobyte, 0, 1);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:1650\n";
+"--src sparql.sql:1637\n";
static const char *proc54 =
-"#line 1688 \"[executable]/sparql.sql\"\n"
+"#line 1675 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (\n"
"in o_val any, in o_type varchar, in o_lang varchar ) returns any\n"
"{\n"
@@ -1719,26 +1706,26 @@ static const char *proc54 =
"return DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (o_val, NULL, o_lang);\n"
"return DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (o_val);\n"
"}\n"
-"--src sparql.sql:1686\n";
+"--src sparql.sql:1673\n";
static const char *proc55 =
-"#line 1713 \"[executable]/sparql.sql\"\n"
+"#line 1700 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QNAME_OF_LONG_SAFE (in longobj any) returns varchar\n"
"{\n"
"return id_to_iri_nosignal (longobj);\n"
"}\n"
-"--src sparql.sql:1711\n";
+"--src sparql.sql:1698\n";
static const char *proc56 =
-"#line 1719 \"[executable]/sparql.sql\"\n"
+"#line 1706 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_SQLVAL_OF_LONG (in longobj any) returns any\n"
"{\n"
"return __rdf_sqlval_of_obj (longobj);\n"
"}\n"
-"--src sparql.sql:1717\n";
+"--src sparql.sql:1704\n";
static const char *proc57 =
-"#line 1725 \"[executable]/sparql.sql\"\n"
+"#line 1712 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_BOOL_OF_LONG (in longobj any) returns any\n"
"{\n"
"if (isiri_id (longobj))\n"
@@ -1769,10 +1756,10 @@ static const char *proc57 =
"badtype:\n"
"signal (\'RDFXX\', sprintf (\'Unknown datatype in DB.DBA.RDF_BOOL_OF_LONG (code %d)\', rdf_box_type(longobj)));\n"
"}\n"
-"--src sparql.sql:1723\n";
+"--src sparql.sql:1710\n";
static const char *proc58 =
-"#line 1757 \"[executable]/sparql.sql\"\n"
+"#line 1744 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_DATATYPE_OF_LONG (in longobj any, in dflt any := UNAME\'http://www.w3.org/2001/XMLSchema#string\') returns any\n"
"{\n"
"if (__tag of rdf_box = __tag (longobj))\n"
@@ -1793,10 +1780,10 @@ static const char *proc58 =
"return NULL;\n"
"return iri_to_id (__xsd_type (longobj, dflt));\n"
"}\n"
-"--src sparql.sql:1755\n";
+"--src sparql.sql:1742\n";
static const char *proc59 =
-"#line 1779 \"[executable]/sparql.sql\"\n"
+"#line 1766 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_DATATYPE_IRI_OF_LONG (in longobj any, in dflt any := UNAME\'http://www.w3.org/2001/XMLSchema#string\') returns any\n"
"{\n"
"if (__tag of rdf_box = __tag (longobj))\n"
@@ -1817,18 +1804,40 @@ static const char *proc59 =
"return NULL;\n"
"return __xsd_type (longobj, dflt);\n"
"}\n"
-"--src sparql.sql:1777\n";
+"--src sparql.sql:1764\n";
static const char *proc60 =
-"#line 1801 \"[executable]/sparql.sql\"\n"
+"#line 1788 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.RDF_LANGUAGE_OF_LONG (in longobj any, in dflt varchar := \'\') returns any\n"
+"{\n"
+"if (__tag of rdf_box = __tag (longobj))\n"
+"{\n"
+"declare twobyte integer;\n"
+"declare res varchar;\n"
+"twobyte := rdf_box_lang (longobj);\n"
+"if (257 = twobyte)\n"
+"return dflt;\n"
+"whenever not found goto badlang;\n"
+"select lower (RL_ID) into res from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = twobyte;\n"
+"return res;\n"
+"\n"
+"badlang:\n"
+"signal (\'RDFXX\', sprintf (\'Unknown language in DB.DBA.RDF_LANGUAGE_OF_LONG, bad id %d\', twobyte));\n"
+"}\n"
+"return case (isiri_id (longobj)) when 0 then dflt else null end;\n"
+"}\n"
+"--src sparql.sql:1786\n";
+
+static const char *proc61 =
+"#line 1808 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_STRSQLVAL_OF_LONG (in longobj any)\n"
"{\n"
"return __rdf_strsqlval (longobj, 0);\n"
"}\n"
-"--src sparql.sql:1799\n";
+"--src sparql.sql:1806\n";
-static const char *proc61 =
-"#line 1807 \"[executable]/sparql.sql\"\n"
+static const char *proc62 =
+"#line 1814 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_WIDESTRSQLVAL_OF_LONG (in longobj any)\n"
"{\n"
"declare t, len integer;\n"
@@ -1889,10 +1898,10 @@ static const char *proc61 =
"}\n"
"return cast (longobj as nvarchar);\n"
"}\n"
-"--src sparql.sql:1805\n";
+"--src sparql.sql:1812\n";
-static const char *proc62 =
-"#line 1870 \"[executable]/sparql.sql\"\n"
+static const char *proc63 =
+"#line 1877 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_DATATYPE_OF_SQLVAL (in v any,\n"
"in strg_datatype any := UNAME\'http://www.w3.org/2001/XMLSchema#string\',\n"
"in default_res any := NULL) returns any\n"
@@ -1913,10 +1922,10 @@ static const char *proc62 =
"}\n"
"return iri_to_id (__xsd_type (v, strg_datatype, default_res));\n"
"}\n"
-"--src sparql.sql:1868\n";
+"--src sparql.sql:1875\n";
-static const char *proc63 =
-"#line 1893 \"[executable]/sparql.sql\"\n"
+static const char *proc64 =
+"#line 1900 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_LONG_OF_SQLVAL (in v varchar) returns any\n"
"{\n"
"declare t int;\n"
@@ -1936,10 +1945,10 @@ static const char *proc63 =
"\n"
"return rdf_box (v, 257, 257, 0, 1);\n"
"}\n"
-"--src sparql.sql:1891\n";
+"--src sparql.sql:1898\n";
-static const char *proc64 =
-"#line 1918 \"[executable]/sparql.sql\"\n"
+static const char *proc65 =
+"#line 1925 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_STRSQLVAL_OF_SQLVAL (in sqlval any)\n"
"{\n"
"declare t, len integer;\n"
@@ -1965,10 +1974,10 @@ static const char *proc64 =
"return charset_recode (sqlval, \'_WIDE_\', \'UTF-8\');\n"
"return cast (sqlval as varchar);\n"
"}\n"
-"--src sparql.sql:1916\n";
+"--src sparql.sql:1923\n";
-static const char *proc65 =
-"#line 1946 \"[executable]/sparql.sql\"\n"
+static const char *proc66 =
+"#line 1953 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_LANGUAGE_OF_SQLVAL (in v any, in dflt varchar := \'\') returns any\n"
"{\n"
"declare t int;\n"
@@ -1990,10 +1999,10 @@ static const char *proc65 =
"\n"
"\n"
"}\n"
-"--src sparql.sql:1944\n";
+"--src sparql.sql:1951\n";
-static const char *proc66 =
-"#line 1970 \"[executable]/sparql.sql\"\n"
+static const char *proc67 =
+"#line 1977 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_IS_BLANK_REF (in v any) returns any\n"
"{\n"
"if ((__tag (v) = 217) or ((__tag (v) = __tag of varchar) and bit_and (1, __box_flags (v))))\n"
@@ -2010,10 +2019,10 @@ static const char *proc66 =
"}\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:1968\n";
+"--src sparql.sql:1975\n";
-static const char *proc67 =
-"#line 1989 \"[executable]/sparql.sql\"\n"
+static const char *proc68 =
+"#line 1996 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_IS_URI_REF (in v any) returns any\n"
"{\n"
"if ((__tag (v) = 217) or ((__tag (v) = __tag of varchar) and bit_and (1, __box_flags (v))))\n"
@@ -2030,10 +2039,10 @@ static const char *proc67 =
"}\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:1987\n";
+"--src sparql.sql:1994\n";
-static const char *proc68 =
-"#line 2008 \"[executable]/sparql.sql\"\n"
+static const char *proc69 =
+"#line 2015 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_IS_REF (in v any) returns any\n"
"{\n"
"if (__tag (v) in (217, 243))\n"
@@ -2042,10 +2051,10 @@ static const char *proc68 =
"return 1;\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:2006\n";
+"--src sparql.sql:2013\n";
-static const char *proc69 =
-"#line 2019 \"[executable]/sparql.sql\"\n"
+static const char *proc70 =
+"#line 2026 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_IS_LITERAL (in v any) returns any\n"
"{\n"
"if (__tag (v) in (217, 243))\n"
@@ -2054,10 +2063,10 @@ static const char *proc69 =
"return 0;\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:2017\n";
+"--src sparql.sql:2024\n";
-static const char *proc70 =
-"#line 2033 \"[executable]/sparql.sql\"\n"
+static const char *proc71 =
+"#line 2040 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#boolean\" (in strg any) returns integer\n"
"{\n"
"if (isstring (strg))\n"
@@ -2071,10 +2080,10 @@ static const char *proc70 =
"return case (strg) when 0 then 0 else 1 end;\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2031\n";
+"--src sparql.sql:2038\n";
-static const char *proc71 =
-"#line 2049 \"[executable]/sparql.sql\"\n"
+static const char *proc72 =
+"#line 2056 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#date\" (in strg any) returns date\n"
"{\n"
"if (__tag of datetime = __tag (strg))\n"
@@ -2086,10 +2095,10 @@ static const char *proc71 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2047\n";
+"--src sparql.sql:2054\n";
-static const char *proc72 =
-"#line 2063 \"[executable]/sparql.sql\"\n"
+static const char *proc73 =
+"#line 2070 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#dateTime\" (in strg any) returns datetime\n"
"{\n"
"if (__tag of datetime = __tag (strg))\n"
@@ -2101,10 +2110,10 @@ static const char *proc72 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2061\n";
+"--src sparql.sql:2068\n";
-static const char *proc73 =
-"#line 2077 \"[executable]/sparql.sql\"\n"
+static const char *proc74 =
+"#line 2084 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#double\" (in strg varchar) returns double precision\n"
"{\n"
"whenever sqlstate \'*\' goto ret_null;\n"
@@ -2112,10 +2121,10 @@ static const char *proc73 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2075\n";
+"--src sparql.sql:2082\n";
-static const char *proc74 =
-"#line 2087 \"[executable]/sparql.sql\"\n"
+static const char *proc75 =
+"#line 2094 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#float\" (in strg varchar) returns float\n"
"{\n"
"whenever sqlstate \'*\' goto ret_null;\n"
@@ -2123,10 +2132,10 @@ static const char *proc74 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2085\n";
+"--src sparql.sql:2092\n";
-static const char *proc75 =
-"#line 2097 \"[executable]/sparql.sql\"\n"
+static const char *proc76 =
+"#line 2104 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#integer\" (in strg varchar) returns integer\n"
"{\n"
"whenever sqlstate \'*\' goto ret_null;\n"
@@ -2134,10 +2143,10 @@ static const char *proc75 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2095\n";
+"--src sparql.sql:2102\n";
-static const char *proc76 =
-"#line 2107 \"[executable]/sparql.sql\"\n"
+static const char *proc77 =
+"#line 2114 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#int\" (in strg varchar) returns integer\n"
"{\n"
"whenever sqlstate \'*\' goto ret_null;\n"
@@ -2145,10 +2154,10 @@ static const char *proc76 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2105\n";
+"--src sparql.sql:2112\n";
-static const char *proc77 =
-"#line 2117 \"[executable]/sparql.sql\"\n"
+static const char *proc78 =
+"#line 2124 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#time\" (in strg any) returns time\n"
"{\n"
"if (__tag of datetime = __tag (strg))\n"
@@ -2160,10 +2169,10 @@ static const char *proc77 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2115\n";
+"--src sparql.sql:2122\n";
-static const char *proc78 =
-"#line 2131 \"[executable]/sparql.sql\"\n"
+static const char *proc79 =
+"#line 2138 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.\"http://www.w3.org/2001/XMLSchema#string\" (in strg any) returns any\n"
"{\n"
"whenever sqlstate \'*\' goto ret_null;\n"
@@ -2180,227 +2189,40 @@ static const char *proc78 =
"ret_null:\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:2129\n";
+"--src sparql.sql:2136\n";
-static const char *proc79 =
-"#line 2153 \"[executable]/sparql.sql\"\n"
+static const char *proc80 =
+"#line 2160 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.__and (in e1 any, in e2 any) returns integer\n"
"{\n"
"if (e1 and e2)\n"
"return 1;\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:2151\n";
+"--src sparql.sql:2158\n";
-static const char *proc80 =
-"#line 2162 \"[executable]/sparql.sql\"\n"
+static const char *proc81 =
+"#line 2169 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.__or (in e1 any, in e2 any) returns integer\n"
"{\n"
"if (e1 or e2)\n"
"return 1;\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:2160\n";
+"--src sparql.sql:2167\n";
-static const char *proc81 =
-"#line 2171 \"[executable]/sparql.sql\"\n"
+static const char *proc82 =
+"#line 2178 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.__not (in e1 any) returns integer\n"
"{\n"
"if (e1)\n"
"return 0;\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:2169\n";
-
-static const char *proc82 =
-"#line 2182 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.rdf_strdt_impl (in str varchar, in dt_iri any)\n"
-"{\n"
-"declare dt_iid IRI_ID;\n"
-"declare parsed any;\n"
-"dt_iid := __i2id (dt_iri);\n"
-"if (dt_iid is null)\n"
-"signal (\'22007\', \'Function rdf_strdt_impl needs a valid datatype IRI as its second argument\');\n"
-"if (__tag of IRI_ID = __tag (dt_iri))\n"
-"dt_iri := __id2i (dt_iri);\n"
-"parsed := __xqf_str_parse_to_rdf_box (str, dt_iri, isstring (str));\n"
-"if (parsed is not null)\n"
-"{\n"
-"if (__tag of rdf_box = __tag (parsed))\n"
-"rdf_box_set_type (parsed,\n"
-"DB.DBA.RDF_TWOBYTE_OF_DATATYPE (dt_iid));\n"
-"return parsed;\n"
-"}\n"
-"return DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (str, dt_iid, null);\n"
-"}\n"
-"--src sparql.sql:2180\n";
+"--src sparql.sql:2176\n";
static const char *proc83 =
-"#line 2203 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.rdf_strlang_impl (in str varchar, in lang any)\n"
-"{\n"
-"\n"
-"lang := cast (lang as varchar);\n"
-"if ((lang is null) or (regexp_match (\'^(([a-z][a-z](-[A-Z][A-Z])?)|(x-[A-Za-z0-9]+))\\044\', lang) is null))\n"
-"signal (\'22007\', \'Function rdf_strlang_impl needs a valid language ID as its second argument\');\n"
-"return DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (str, null, cast (lang as varchar));\n"
-"}\n"
-"--src sparql.sql:2201\n";
-
-static const char *proc84 =
-"#line 2214 \"[executable]/sparql.sql\"\n"
-" create function DB.DBA.rdf_replace_impl (in src varchar, in needle varchar, in rpl varchar, in opts varchar := \'\')\n"
-"{\n"
-"declare src_tag, needle_tag, rpl_tag integer;\n"
-"declare res varchar;\n"
-"src_tag := __tag (src);\n"
-"needle_tag := __tag (needle);\n"
-"rpl_tag := __tag (rpl);\n"
-"if (__tag of rdf_box = src_tag)\n"
-"{\n"
-"src := rdf_box_data (src);\n"
-"src_tag := __tag (src);\n"
-"}\n"
-"if (__tag of rdf_box = needle_tag)\n"
-"{\n"
-"needle := rdf_box_data (needle);\n"
-"needle_tag := __tag (needle);\n"
-"}\n"
-"if (__tag of rdf_box = rpl_tag)\n"
-"{\n"
-"rpl := rdf_box_data (rpl);\n"
-"rpl_tag := __tag (rpl);\n"
-"}\n"
-"if (__tag of nvarchar = src_tag)\n"
-"src := charset_recode (src, \'_WIDE_\', \'_UTF8_\');\n"
-"else if (__tag of varchar <> src_tag)\n"
-"src := cast (src as varchar);\n"
-"if (__tag of nvarchar = needle_tag)\n"
-"needle := charset_recode (needle, \'_WIDE_\', \'_UTF8_\');\n"
-"else if (__tag of varchar <> needle_tag)\n"
-"needle := cast (needle as varchar);\n"
-"if (__tag of nvarchar = rpl_tag)\n"
-"rpl := charset_recode (rpl, \'_WIDE_\', \'_UTF8_\');\n"
-"else if (__tag of varchar <> rpl_tag)\n"
-"rpl := cast (rpl as varchar);\n"
-"if (__tag of varchar <> __tag (opts))\n"
-"opts := cast (opts as varchar);\n"
-"if (opts is null)\n"
-"opts := \'\';\n"
-"if (src is null or needle is null or rpl is null)\n"
-"return null;\n"
-"if (\'\' = needle)\n"
-"return src;\n"
-"if (regexp_match (\'^[^()|+?.:^\\044\\\\\\\\\\\\[\\\\]-]+\\044\', needle, 0, \'u\') is not null and strchr (rpl, \'\\044\') is null and strchr (rpl, 92) is null)\n"
-"{\n"
-"if (\'\' = opts)\n"
-"{\n"
-"res := replace (src, needle, rpl);\n"
-"__box_flags_set (res, 2);\n"
-"return res;\n"
-"}\n"
-"if (opts in (\'i\', \'I\'))\n"
-"{\n"
-"declare src_lc varchar;\n"
-"declare hit, needle_len integer;\n"
-"declare ses any;\n"
-"src_lc := lcase (src);\n"
-"needle := lcase (needle);\n"
-"hit := strstr (src_lc, needle);\n"
-"if (hit is null)\n"
-"{\n"
-"res := src;\n"
-"__box_flags_set (res, 2);\n"
-"return res;\n"
-"}\n"
-"ses := string_output();\n"
-"needle_len := length (needle);\n"
-"while (hit is not null)\n"
-"{\n"
-"http (subseq (src, 0, hit), ses);\n"
-"http (rpl, ses);\n"
-"src := subseq (src, hit + needle_len);\n"
-"src_lc := subseq (src_lc, hit + needle_len);\n"
-"hit := strstr (src_lc, needle);\n"
-"}\n"
-"http (src, ses);\n"
-"res := string_output_string (ses);\n"
-"__box_flags_set (res, 2);\n"
-"return res;\n"
-"}\n"
-"}\n"
-"if (strchr (opts, \'u\') is null and strchr (opts, \'U\') is null)\n"
-"opts := opts || \'u\';\n"
-"res := regexp_xfn_replace (src, needle, rpl, 0, null, opts);\n"
-"__box_flags_set (res, 2);\n"
-"return res;\n"
-"}\n"
-"--src sparql.sql:2212\n";
-
-static const char *proc85 =
-"#line 2303 \"[executable]/sparql.sql\"\n"
-" create function DB.DBA.regexp_xfn_replace (in src varchar, in needle varchar, in tmpl varchar, in search_begin_pos integer, in hit_max_count integer, in opts varchar)\n"
-"{\n"
-"declare hit_list any;\n"
-"if (0 = length (src))\n"
-"return \'\';\n"
-"if (regexp_parse (needle, \'\', 0, opts) is not null)\n"
-"signal (\'22023\', \'The regex-based XPATH/XQuery/SPARQL replace() function can not search for a pattern that can be found even in an empty string\');\n"
-"hit_list := regexp_parse_list (needle, src, search_begin_pos, opts, coalesce (hit_max_count, 2097152));\n"
-"return regexp_replace_hits_with_template (src, tmpl, hit_list, 1);\n"
-"}\n"
-"--src sparql.sql:2301\n";
-
-static const char *proc86 =
-"#line 2317 \"[executable]/sparql.sql\"\n"
-" create function DB.DBA.rdf_timezone_impl (in dt datetime)\n"
-"{\n"
-"declare minutes integer;\n"
-"declare sign, str varchar;\n"
-"minutes := timezone (dt);\n"
-"if (minutes is null)\n"
-"signal (\'22007\', \'Function rdf_timezone_impl needs a datetime with some timezone set as its argument\');\n"
-"if (minutes < 0)\n"
-"{\n"
-"sign := \'-\';\n"
-"minutes := -minutes;\n"
-"}\n"
-"else\n"
-"sign := \'\';\n"
-"if (mod (minutes, 60))\n"
-"str := sprintf (\'%sPT%dH%dM\', sign, minutes / 60, mod (minutes, 60));\n"
-"else if (minutes = 0)\n"
-"str := \'PT0S\';\n"
-"else\n"
-"str := sprintf (\'%sPT%dH\', sign, minutes / 60);\n"
-"return DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL (str, __i2id (UNAME\'http://www.w3.org/2001/XMLSchema#dayTimeDuration\'), null);\n"
-"}\n"
-"--src sparql.sql:2315\n";
-
-static const char *proc87 =
-"#line 2342 \"[executable]/sparql.sql\"\n"
-" create function DB.DBA.rdf_tz_impl (in dt datetime)\n"
-"{\n"
-"declare minutes integer;\n"
-"declare sign varchar;\n"
-"minutes := timezone (dt);\n"
-"if (minutes is null)\n"
-"return \'\';\n"
-"if (minutes = 0)\n"
-"return \'Z\';\n"
-"if (minutes < 0)\n"
-"{\n"
-"sign := \'-\';\n"
-"minutes := -minutes;\n"
-"}\n"
-"else\n"
-"sign := \'\';\n"
-"return sprintf (\'%s%02d:%02d\', sign, minutes / 60, mod (minutes, 60));\n"
-"}\n"
-"--src sparql.sql:2340\n";
-
-static const char *proc88 =
-"#line 2366 \"[executable]/sparql.sql\"\n"
+"#line 2190 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_URI (in g_uri varchar, in s_uri varchar, in p_uri varchar, in o_uri varchar)\n"
"{\n"
"declare g_iid IRI_ID;\n"
@@ -2414,10 +2236,10 @@ static const char *proc88 =
"iri_to_id (p_uri),\n"
"iri_to_id (o_uri) );\n"
"}\n"
-"--src sparql.sql:2364\n";
+"--src sparql.sql:2188\n";
-static const char *proc89 =
-"#line 2381 \"[executable]/sparql.sql\"\n"
+static const char *proc84 =
+"#line 2205 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_URI_L (in g_uri varchar, in s_uri varchar, in p_uri varchar, in o_lit any, in ro_id_dict any := null)\n"
"{\n"
"declare g_iid, s_iid, p_iid IRI_ID;\n"
@@ -2445,10 +2267,10 @@ static const char *proc89 =
"}\n"
"insert soft DB.DBA.RDF_QUAD (G,S,P,O) values (g_iid, s_iid, p_iid, o_obj);\n"
"}\n"
-"--src sparql.sql:2379\n";
+"--src sparql.sql:2203\n";
-static const char *proc90 =
-"#line 2410 \"[executable]/sparql.sql\"\n"
+static const char *proc85 =
+"#line 2234 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_URI_L_TYPED (in g_uri varchar, in s_uri varchar, in p_uri varchar, in o_lit any, in dt any, in lang varchar, in ro_id_dict any := null)\n"
"{\n"
"declare g_iid, s_iid, p_iid IRI_ID;\n"
@@ -2477,10 +2299,10 @@ static const char *proc90 =
"}\n"
"insert soft DB.DBA.RDF_QUAD (G,S,P,O) values (g_iid, s_iid, p_iid, o_obj);\n"
"}\n"
-"--src sparql.sql:2408\n";
+"--src sparql.sql:2232\n";
-static const char *proc91 =
-"#line 2440 \"[executable]/sparql.sql\"\n"
+static const char *proc86 =
+"#line 2264 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_L_RDB2RDF (in g_iid varchar, in s_iid varchar, in p_iid varchar, inout o_val any, inout old_g_iid any, inout ro_id_dict any)\n"
"{\n"
"declare t int;\n"
@@ -2493,16 +2315,11 @@ static const char *proc91 =
"t := __tag (o_val);\n"
"if (__tag of rdf_box <> t)\n"
"{\n"
-"if (not (t in (__tag of varchar, 126, 133, 217, __tag of nvarchar, 226)))\n"
+"if (not (t in (__tag of varchar, 126, 217, __tag of nvarchar)))\n"
"{\n"
"goto o_val_done;\n"
"}\n"
-"if (t = 133)\n"
-"{\n"
-"o_val := cast (o_val as nvarchar);\n"
-"t := __tag (o_val);\n"
-"}\n"
-"if (__tag of nvarchar = t or t = 226)\n"
+"if (__tag of nvarchar = t)\n"
"o_val := charset_recode (o_val, \'_WIDE_\', \'UTF-8\');\n"
"else if (t in (126, 217))\n"
"o_val := cast (o_val as varchar);\n"
@@ -2530,10 +2347,10 @@ static const char *proc91 =
"o_val_done:\n"
"insert soft DB.DBA.RDF_QUAD (G,S,P,O) values (g_iid, s_iid, p_iid, o_val);\n"
"}\n"
-"--src sparql.sql:2438\n";
+"--src sparql.sql:2262\n";
-static const char *proc92 =
-"#line 2491 \"[executable]/sparql.sql\"\n"
+static const char *proc87 =
+"#line 2310 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_NEW_GRAPH (inout g varchar, inout g_iid IRI_ID, inout app_env any) {\n"
"\n"
"if (__rdf_obj_ft_rule_count_in_graph (g_iid))\n"
@@ -2545,27 +2362,27 @@ static const char *proc92 =
"else\n"
"app_env[3] := null;\n"
"}\n"
-"--src sparql.sql:2489\n";
+"--src sparql.sql:2308\n";
-static const char *proc93 =
-"#line 2504 \"[executable]/sparql.sql\"\n"
+static const char *proc88 =
+"#line 2323 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_NEW_BLANK (inout g_iid IRI_ID, inout app_env any, inout res IRI_ID) {\n"
"res := iri_id_from_num (sequence_next (\'RDF_URL_IID_BLANK\'));\n"
"\n"
"}\n"
-"--src sparql.sql:2502\n";
+"--src sparql.sql:2321\n";
-static const char *proc94 =
-"#line 2510 \"[executable]/sparql.sql\"\n"
+static const char *proc89 =
+"#line 2329 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_GET_IID (inout uri varchar, inout g_iid IRI_ID, inout app_env any, inout res IRI_ID) {\n"
"\n"
"res := iri_to_id (uri);\n"
"\n"
"}\n"
-"--src sparql.sql:2508\n";
+"--src sparql.sql:2327\n";
-static const char *proc95 =
-"#line 2517 \"[executable]/sparql.sql\"\n"
+static const char *proc90 =
+"#line 2336 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_uri varchar,\n"
@@ -2576,10 +2393,10 @@ static const char *proc95 =
"__rdf_repl_quad (84, app_env[3], iri_canonicalize (s_uri), iri_canonicalize (p_uri), iri_canonicalize (o_uri));\n"
"insert soft DB.DBA.RDF_QUAD (G,S,P,O) values (g_iid, iri_to_id (s_uri), iri_to_id (p_uri), iri_to_id (o_uri));\n"
"}\n"
-"--src sparql.sql:2515\n";
+"--src sparql.sql:2334\n";
-static const char *proc96 =
-"#line 2529 \"[executable]/sparql.sql\"\n"
+static const char *proc91 =
+"#line 2348 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_L (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
@@ -2657,10 +2474,10 @@ static const char *proc96 =
"o_val );\n"
"}\n"
"}\n"
-"--src sparql.sql:2527\n";
+"--src sparql.sql:2346\n";
-static const char *proc97 =
-"#line 2608 \"[executable]/sparql.sql\"\n"
+static const char *proc92 =
+"#line 2427 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_COMMIT (inout g varchar, inout app_env any) {\n"
"\n"
"declare log_mode integer;\n"
@@ -2670,10 +2487,10 @@ static const char *proc97 =
"if (ro_id_dict is not null)\n"
"DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH (iri_to_id (g), ro_id_dict);\n"
"}\n"
-"--src sparql.sql:2606\n";
+"--src sparql.sql:2425\n";
-static const char *proc98 =
-"#line 2619 \"[executable]/sparql.sql\"\n"
+static const char *proc93 =
+"#line 2438 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_REPORT_DEFAULT (\n"
"inout msg_no integer, inout msg_type varchar,\n"
"inout src varchar, inout base varchar, inout graph varchar,\n"
@@ -2684,10 +2501,10 @@ static const char *proc98 =
"\n"
" ;\n"
"}\n"
-"--src sparql.sql:2617\n";
+"--src sparql.sql:2436\n";
-static const char *proc99 =
-"#line 2631 \"[executable]/sparql.sql\"\n"
+static const char *proc94 =
+"#line 2450 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_XLAT (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_uri varchar,\n"
@@ -2702,10 +2519,10 @@ static const char *proc99 =
"o_xlat := call(xlat_cbk)(o_uri, xlat_env);\n"
"DB.DBA.TTLP_EV_TRIPLE (g_iid, s_xlat, p_uri, o_xlat, app_env);\n"
"}\n"
-"--src sparql.sql:2629\n";
+"--src sparql.sql:2448\n";
-static const char *proc100 =
-"#line 2647 \"[executable]/sparql.sql\"\n"
+static const char *proc95 =
+"#line 2466 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_L_XLAT (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
@@ -2719,10 +2536,10 @@ static const char *proc100 =
"s_xlat := call(xlat_cbk)(s_uri, xlat_env);\n"
"DB.DBA.TTLP_EV_TRIPLE_L (g_iid, s_xlat, p_uri, o_val, o_type, o_lang, app_env);\n"
"}\n"
-"--src sparql.sql:2645\n";
+"--src sparql.sql:2464\n";
-static const char *proc101 =
-"#line 2663 \"[executable]/sparql.sql\"\n"
+static const char *proc96 =
+"#line 2482 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.TTLP_XLAT_CONCAT (\n"
"inout iri varchar, inout env any )\n"
"{\n"
@@ -2732,10 +2549,10 @@ static const char *proc101 =
"return concat (env, subseq (iri, 7));\n"
"return iri;\n"
"}\n"
-"--src sparql.sql:2661\n";
+"--src sparql.sql:2480\n";
-static const char *proc102 =
-"#line 2674 \"[executable]/sparql.sql\"\n"
+static const char *proc97 =
+"#line 2493 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP (in strg varchar, in base varchar, in graph varchar := null, in flags integer := 0,\n"
"in log_enable int := null, in transactional int := 0)\n"
"{\n"
@@ -2782,10 +2599,10 @@ static const char *proc102 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return ret;\n"
"}\n"
-"--src sparql.sql:2672\n";
+"--src sparql.sql:2491\n";
-static const char *proc103 =
-"#line 2722 \"[executable]/sparql.sql\"\n"
+static const char *proc98 =
+"#line 2541 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_WITH_IRI_TRANSLATION (in strg varchar, in base varchar, in graph varchar, in flags integer,\n"
"in log_enable integer, in transactional integer,\n"
"in iri_xlate_cbk varchar, in iri_xlate_env any )\n"
@@ -2829,10 +2646,10 @@ static const char *proc103 =
"\'DB.DBA.TTLP_EV_REPORT_DEFAULT\' ),\n"
"app_env);\n"
"}\n"
-"--src sparql.sql:2720\n";
+"--src sparql.sql:2539\n";
-static const char *proc104 =
-"#line 2767 \"[executable]/sparql.sql\"\n"
+static const char *proc99 =
+"#line 2586 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_VALIDATE (in strg varchar, in base varchar, in graph varchar := null, in flags integer := 0, in report_cbk varchar := \'\')\n"
"{\n"
"declare app_env any;\n"
@@ -2843,10 +2660,10 @@ static const char *proc104 =
"vector (\'\', \'\', \'\', \'\', \'\', \'\', report_cbk),\n"
"app_env);\n"
"}\n"
-"--src sparql.sql:2765\n";
+"--src sparql.sql:2584\n";
-static const char *proc105 =
-"#line 2779 \"[executable]/sparql.sql\"\n"
+static const char *proc100 =
+"#line 2598 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_VALIDATE_LOCAL_FILE (in strg varchar, in base varchar, in graph varchar := null, in flags integer := 0, in report_cbk varchar := \'\')\n"
"{\n"
"declare app_env any;\n"
@@ -2857,54 +2674,54 @@ static const char *proc105 =
"vector (\'\', \'\', \'\', \'\', \'\', \'\', report_cbk),\n"
"app_env);\n"
"}\n"
-"--src sparql.sql:2777\n";
+"--src sparql.sql:2596\n";
-static const char *proc106 =
-"#line 2791 \"[executable]/sparql.sql\"\n"
+static const char *proc101 =
+"#line 2610 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_VALIDATE_RDFXML (in strg varchar, in base varchar, in graph varchar)\n"
"{\n"
"declare app_env any;\n"
"declare old_log_mode int;\n"
"if (graph = \'\')\n"
-"signal (\'22023\', \'Empty string is not a valid graph IRI in DB.DBA.RDF_VALIDATE_RDFXML()\');\n"
+"signal (\'22023\', \'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFXML()\');\n"
"else if (graph is null)\n"
"{\n"
"graph := base;\n"
"if ((graph is null) or (graph = \'\'))\n"
-"signal (\'22023\', \'DB.DBA.RDF_VALIDATE_RDFXML() requires a valid IRI as a base argument if graph is not specified\');\n"
+"signal (\'22023\', \'DB.DBA.RDF_LOAD_RDFXML() requires a valid IRI as a base argument if graph is not specified\');\n"
"}\n"
"rdf_load_rdfxml (strg, 0, graph, vector ( \'\', \'\', \'\', \'\', \'\', \'\', \'\' ), app_env, base );\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:2789\n";
+"--src sparql.sql:2608\n";
-static const char *proc107 =
-"#line 2808 \"[executable]/sparql.sql\"\n"
+static const char *proc102 =
+"#line 2627 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH (inout g varchar, inout g_iid IRI_ID, inout app_env any) {\n"
"\n"
" ;\n"
"}\n"
-"--src sparql.sql:2806\n";
+"--src sparql.sql:2625\n";
-static const char *proc108 =
-"#line 2814 \"[executable]/sparql.sql\"\n"
+static const char *proc103 =
+"#line 2633 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK (inout g_iid IRI_ID, inout app_env any, inout res IRI_ID) {\n"
"res := iri_id_from_num (sequence_next (\'RDF_URL_IID_BLANK\'));\n"
"\n"
"}\n"
-"--src sparql.sql:2812\n";
+"--src sparql.sql:2631\n";
-static const char *proc109 =
-"#line 2820 \"[executable]/sparql.sql\"\n"
+static const char *proc104 =
+"#line 2639 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TTL2HASH_EXEC_GET_IID (inout uri varchar, inout g_iid IRI_ID, inout app_env any, inout res IRI_ID) {\n"
"\n"
"res := iri_to_id (uri);\n"
"\n"
"}\n"
-"--src sparql.sql:2818\n";
+"--src sparql.sql:2637\n";
-static const char *proc110 =
-"#line 2827 \"[executable]/sparql.sql\"\n"
+static const char *proc105 =
+"#line 2646 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_uri varchar,\n"
@@ -2914,85 +2731,32 @@ static const char *proc110 =
"vector (iri_to_id (s_uri), iri_to_id (p_uri), iri_to_id (o_uri)),\n"
"0 );\n"
"}\n"
-"--src sparql.sql:2825\n";
+"--src sparql.sql:2644\n";
-static const char *proc111 =
-"#line 2838 \"[executable]/sparql.sql\"\n"
+static const char *proc106 =
+"#line 2657 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
"inout app_env any )\n"
"{\n"
+"if (not isstring (o_type))\n"
+"o_type := null;\n"
+"if (not isstring (o_lang))\n"
+"o_lang := null;\n"
"dict_put (app_env,\n"
"vector (\n"
"iri_to_id (s_uri),\n"
"iri_to_id (p_uri),\n"
"DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (o_val,\n"
-"case when (isstring (o_type) or __tag (o_type) = 217) then o_type else null end,\n"
-"case when (isstring (o_lang) or __tag (o_lang) = 217) then o_lang else null end) ),\n"
+"case (isstring (o_type)) when 0 then null else o_type end,\n"
+"case (isstring (o_lang)) when 0 then null else o_lang end) ),\n"
"0 );\n"
"}\n"
-"--src sparql.sql:2836\n";
+"--src sparql.sql:2655\n";
-static const char *proc112 =
-"#line 2854 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_XLAT (\n"
-"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
-"inout o_uri varchar,\n"
-"inout app_env any )\n"
-"{\n"
-"\n"
-"declare xlat_cbk, s_xlat, o_xlat varchar;\n"
-"declare xlat_env, dict any;\n"
-"\n"
-"dict := app_env[0];\n"
-"xlat_cbk := app_env[1];\n"
-"xlat_env := app_env[2];\n"
-"if (__proc_params_num (xlat_cbk) = 2)\n"
-"{\n"
-"s_xlat := call(xlat_cbk)(s_uri, xlat_env);\n"
-"o_xlat := call(xlat_cbk)(o_uri, xlat_env);\n"
-"}\n"
-"else\n"
-"{\n"
-"s_xlat := call(xlat_cbk)(s_uri, p_uri, \'s\', xlat_env);\n"
-"o_xlat := call(xlat_cbk)(o_uri, p_uri, \'o\', xlat_env);\n"
-"}\n"
-"\n"
-"dict_put (dict, vector (iri_to_id (s_xlat), iri_to_id (p_uri), iri_to_id (o_xlat)), 0);\n"
-"}\n"
-"--src sparql.sql:2852\n";
-
-static const char *proc113 =
-"#line 2881 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L_XLAT (\n"
-"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
-"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
-"inout app_env any )\n"
-"{\n"
-"declare xlat_cbk, s_xlat, o_xlat varchar;\n"
-"declare xlat_env, dict any;\n"
-"\n"
-"dict := app_env[0];\n"
-"xlat_cbk := app_env[1];\n"
-"xlat_env := app_env[2];\n"
-"if (__proc_params_num (xlat_cbk) = 2)\n"
-"s_xlat := call(xlat_cbk)(s_uri, xlat_env);\n"
-"else\n"
-"s_xlat := call(xlat_cbk)(s_uri, p_uri, \'s\', xlat_env);\n"
-"dict_put (dict,\n"
-"vector (\n"
-"iri_to_id (s_xlat),\n"
-"iri_to_id (p_uri),\n"
-"DB.DBA.RDF_MAKE_LONG_OF_TYPEDSQLVAL_STRINGS (o_val,\n"
-"case when (isstring (o_type) or __tag (o_type) = 217) then o_type else null end,\n"
-"case when (isstring (o_lang) or __tag (o_lang) = 217) then o_lang else null end) ),\n"
-"0);\n"
-"}\n"
-"--src sparql.sql:2879\n";
-
-static const char *proc114 =
-"#line 2907 \"[executable]/sparql.sql\"\n"
+static const char *proc107 =
+"#line 2677 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_TTL2HASH (in strg varchar, in base varchar, in graph varchar := null, in flags integer := 0) returns any\n"
"{\n"
"declare res any;\n"
@@ -3012,41 +2776,19 @@ static const char *proc114 =
"res);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:2905\n";
-
-static const char *proc115 =
-"#line 2928 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_TTL_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, in dict any, in flags integer := 0) returns any\n"
-"{\n"
-"if (__tag (dict) <> 214)\n"
-"signal (\'22023\', \'RDFXX\', \'The dict argument must be of type dictionary\');\n"
-"if (126 = __tag (strg))\n"
-"strg := cast (strg as varchar);\n"
-"rdf_load_turtle (strg, base, graph, flags,\n"
-"vector (\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_GET_IID\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L\',\n"
-"\'\',\n"
-"\'DB.DBA.TTLP_EV_REPORT_DEFAULT\' ),\n"
-"dict);\n"
-"return;\n"
-"}\n"
-"--src sparql.sql:2926\n";
+"--src sparql.sql:2675\n";
-static const char *proc116 =
-"#line 2948 \"[executable]/sparql.sql\"\n"
+static const char *proc108 =
+"#line 2698 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TTL2SQLHASH_EXEC_GET_IID (inout uri varchar, inout g_iid IRI_ID, inout app_env any, inout res IRI_ID) {\n"
"\n"
"res := __bft (uri, 1);\n"
"\n"
"}\n"
-"--src sparql.sql:2946\n";
+"--src sparql.sql:2696\n";
-static const char *proc117 =
-"#line 2955 \"[executable]/sparql.sql\"\n"
+static const char *proc109 =
+"#line 2705 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TTL2SQLHASH_EXEC_TRIPLE (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_uri varchar,\n"
@@ -3059,10 +2801,10 @@ static const char *proc117 =
"__bft (o_uri, 1) ),\n"
"0 );\n"
"}\n"
-"--src sparql.sql:2953\n";
+"--src sparql.sql:2703\n";
-static const char *proc118 =
-"#line 2969 \"[executable]/sparql.sql\"\n"
+static const char *proc110 =
+"#line 2719 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TTL2SQLHASH_EXEC_TRIPLE_L (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
@@ -3081,10 +2823,10 @@ static const char *proc118 =
"case (isstring (o_lang)) when 0 then null else o_lang end) ),\n"
"0 );\n"
"}\n"
-"--src sparql.sql:2967\n";
+"--src sparql.sql:2717\n";
-static const char *proc119 =
-"#line 2989 \"[executable]/sparql.sql\"\n"
+static const char *proc111 =
+"#line 2739 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_TTL2SQLHASH (in strg varchar, in base varchar, in graph varchar := null, in flags integer := 0) returns any\n"
"{\n"
"declare res any;\n"
@@ -3104,22 +2846,22 @@ static const char *proc119 =
"res);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:2987\n";
+"--src sparql.sql:2737\n";
-static const char *proc120 =
-"#line 3010 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_LOAD_RDFXML_IMPL (inout strg varchar, in base varchar, in graph varchar,\n"
-"in parse_mode integer, in log_enable int := null, in transactional int := 0)\n"
+static const char *proc112 =
+"#line 2760 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_LOAD_RDFXML (in strg varchar, in base varchar, in graph varchar,\n"
+"in log_enable int := null, in transactional int := 0)\n"
"{\n"
"declare app_env any;\n"
"declare old_log_mode int;\n"
"if (graph = \'\')\n"
-"signal (\'22023\', \'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFXML() and the like\');\n"
+"signal (\'22023\', \'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFXML()\');\n"
"else if (graph is null)\n"
"{\n"
"graph := base;\n"
"if ((graph is null) or (graph = \'\'))\n"
-"signal (\'22023\', \'DB.DBA.RDF_LOAD_RDFXML() and similar functions require a valid IRI as a base argument if graph is not specified\');\n"
+"signal (\'22023\', \'DB.DBA.RDF_LOAD_RDFXML() requires a valid IRI as a base argument if graph is not specified\');\n"
"}\n"
"old_log_mode := null;\n"
"if (transactional = 0)\n"
@@ -3132,13 +2874,13 @@ static const char *proc120 =
"old_log_mode := log_enable (log_enable, 1);\n"
"}\n"
"if (1 <> sys_stat (\'cl_run_local_only\'))\n"
-"return DB.DBA.RDF_LOAD_RDFXML_CL (strg, base, graph, parse_mode);\n"
+"return rdf_load_rdfxml_cl (strg, base, graph);\n"
"app_env := vector (\n"
"null,\n"
"null,\n"
"__max (length (strg) / 100, 100000),\n"
"null );\n"
-"rdf_load_rdfxml (strg, parse_mode,\n"
+"rdf_load_rdfxml (strg, 0,\n"
"graph,\n"
"vector (\n"
"\'DB.DBA.TTLP_EV_NEW_GRAPH\',\n"
@@ -3154,19 +2896,10 @@ static const char *proc120 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:3008\n";
+"--src sparql.sql:2758\n";
-static const char *proc121 =
-"#line 3058 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_LOAD_RDFXML (in strg varchar, in base varchar, in graph varchar := null,\n"
-"in xml_parse_mode integer := 0, in log_enable int := null, in transactional int := 0 )\n"
-"{\n"
-"return DB.DBA.RDF_LOAD_RDFXML_IMPL (strg, base, graph, bit_shift (xml_parse_mode, 8), log_enable, transactional);\n"
-"}\n"
-"--src sparql.sql:3056\n";
-
-static const char *proc122 =
-"#line 3066 \"[executable]/sparql.sql\"\n"
+static const char *proc113 =
+"#line 2808 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_RDFXML_TO_DICT (in strg varchar, in base varchar, in graph varchar := null)\n"
"{\n"
"declare res any;\n"
@@ -3185,55 +2918,10 @@ static const char *proc122 =
"base );\n"
"return res;\n"
"}\n"
-"--src sparql.sql:3064\n";
-
-static const char *proc123 =
-"#line 3086 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_RDFXML_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, inout dict any, in flag int := 0, in xml_parse_mode int := 0)\n"
-"{\n"
-"if (__tag (dict) <> 214)\n"
-"signal (\'22023\', \'RDFXX\', \'The dict argument must be of type dictionary\');\n"
-"if (flag = 0)\n"
-"xml_parse_mode := 0;\n"
-"rdf_load_rdfxml (strg, bit_or (flag, bit_shift (xml_parse_mode, 8)),\n"
-"graph,\n"
-"vector (\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_GET_IID\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L\',\n"
-"\'\',\n"
-"\'DB.DBA.TTLP_EV_REPORT_DEFAULT\' ),\n"
-"dict,\n"
-"base );\n"
-"}\n"
-"--src sparql.sql:3084\n";
-
-static const char *proc124 =
-"#line 3107 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDFA_LOAD_DICT_XLAT (in strg varchar, in base varchar, in graph varchar, inout dict any, in xml_parse_mode int := 0, in iri_xlate_cbk varchar, in iri_xlate_env any)\n"
-"{\n"
-"declare app_env any;\n"
-"if (__tag (dict) <> 214)\n"
-"signal (\'22023\', \'RDFXX\', \'The dict argument must be of type dictionary\');\n"
-"rdf_load_rdfxml (strg, bit_or (2, bit_shift (xml_parse_mode, 8)),\n"
-"graph,\n"
-"vector (\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_GET_IID\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_XLAT\',\n"
-"\'DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L_XLAT\',\n"
-"\'\',\n"
-"\'DB.DBA.TTLP_EV_REPORT_DEFAULT\' ),\n"
-"vector (dict, iri_xlate_cbk, iri_xlate_env),\n"
-"base );\n"
-"}\n"
-"--src sparql.sql:3105\n";
+"--src sparql.sql:2806\n";
-static const char *proc125 =
-"#line 3129 \"[executable]/sparql.sql\"\n"
+static const char *proc114 =
+"#line 2829 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_RDFA11_FETCH_PROFILES (in profile_iris any, inout prefixes any, inout terms any, inout vocab any)\n"
"{\n"
"declare agg any;\n"
@@ -3297,21 +2985,50 @@ static const char *proc125 =
"vocab_is_set: ;\n"
"\n"
"}\n"
-"--src sparql.sql:3127\n";
+"--src sparql.sql:2827\n";
-static const char *proc126 =
-"#line 3195 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_LOAD_RDFA (in strg varchar, in base varchar, in graph varchar := null,\n"
-"in xml_parse_mode integer := 0, in log_enable int := null, in transactional int := 0 )\n"
+static const char *proc115 =
+"#line 2895 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_LOAD_RDFA (in strg varchar, in base varchar, in graph varchar := null, in xml_parse_mode integer := 0)\n"
"{\n"
-"return DB.DBA.RDF_LOAD_RDFXML_IMPL (strg, base, graph, bit_or (2, bit_shift (xml_parse_mode, 8)), log_enable, transactional);\n"
+"declare app_env any;\n"
+"if (graph = \'\')\n"
+"signal (\'22023\', \'Empty string is not a valid graph IRI in DB.DBA.RDF_LOAD_RDFA()\');\n"
+"else if (graph is null)\n"
+"{\n"
+"graph := base;\n"
+"if ((graph is null) or (graph = \'\'))\n"
+"signal (\'22023\', \'DB.DBA.RDF_LOAD_RDFA() requires a valid IRI as a base argument if graph is not specified\');\n"
+"}\n"
+"if (1 <> sys_stat (\'cl_run_local_only\'))\n"
+"return DB.DBA.RDF_LOAD_RDFA_CL (strg, base, graph, xml_parse_mode);\n"
+"app_env := vector (\n"
+"null,\n"
+"null,\n"
+"__max (length (strg) / 100, 100000),\n"
+"null );\n"
+"rdf_load_rdfxml (strg, bit_or (2, bit_shift (xml_parse_mode, 8)),\n"
+"graph,\n"
+"vector (\n"
+"\'DB.DBA.TTLP_EV_NEW_GRAPH\',\n"
+"\'DB.DBA.TTLP_EV_NEW_BLANK\',\n"
+"\'DB.DBA.TTLP_EV_GET_IID\',\n"
+"\'DB.DBA.TTLP_EV_TRIPLE\',\n"
+"\'DB.DBA.TTLP_EV_TRIPLE_L\',\n"
+"\'DB.DBA.TTLP_EV_COMMIT\',\n"
+"\'DB.DBA.TTLP_EV_REPORT_DEFAULT\' ),\n"
+"app_env,\n"
+"base );\n"
+"if (__rdf_graph_is_in_enabled_repl (iri_to_id (graph)))\n"
+"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
+"return graph;\n"
"}\n"
-"--src sparql.sql:3193\n";
+"--src sparql.sql:2893\n";
-static const char *proc127 =
-"#line 3202 \"[executable]/sparql.sql\"\n"
+static const char *proc116 =
+"#line 2931 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION (in strg varchar, in base varchar, in graph varchar, in xml_parse_mode integer,\n"
-"in iri_xlate_cbk varchar, in iri_xlate_env any)\n"
+"in iri_xlate_cbk varchar, in iri_xlate_env any )\n"
"{\n"
"declare app_env any;\n"
"if (graph = \'\')\n"
@@ -3347,10 +3064,10 @@ static const char *proc127 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:3200\n";
+"--src sparql.sql:2929\n";
-static const char *proc128 =
-"#line 3241 \"[executable]/sparql.sql\"\n"
+static const char *proc117 =
+"#line 2970 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_RDFA_TO_DICT (in strg varchar, in base varchar, in graph varchar := null)\n"
"{\n"
"declare res any;\n"
@@ -3369,19 +3086,10 @@ static const char *proc128 =
"base );\n"
"return res;\n"
"}\n"
-"--src sparql.sql:3239\n";
-
-static const char *proc129 =
-"#line 3261 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_LOAD_XHTML_MICRODATA (in strg varchar, in base varchar, in graph varchar := null,\n"
-"in xml_parse_mode integer := 1, in log_enable int := null, in transactional int := 0 )\n"
-"{\n"
-"return DB.DBA.RDF_LOAD_RDFXML_IMPL (strg, base, graph, bit_or (4, bit_shift (xml_parse_mode, 8)), log_enable, transactional);\n"
-"}\n"
-"--src sparql.sql:3259\n";
+"--src sparql.sql:2968\n";
-static const char *proc130 =
-"#line 3272 \"[executable]/sparql.sql\"\n"
+static const char *proc118 =
+"#line 2994 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_XML_IRI_TO_TTL (inout obj any, inout ses any)\n"
"{\n"
"declare res varchar;\n"
@@ -3425,10 +3133,10 @@ static const char *proc130 =
"http (\'> \', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:3270\n";
+"--src sparql.sql:2992\n";
-static const char *proc131 =
-"#line 3318 \"[executable]/sparql.sql\"\n"
+static const char *proc119 =
+"#line 3040 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_XML_OBJ_TO_TTL (\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
"inout ses any)\n"
@@ -3472,18 +3180,18 @@ static const char *proc131 =
"else\n"
"http (\'\" \', ses);\n"
"}\n"
-"--src sparql.sql:3316\n";
+"--src sparql.sql:3038\n";
-static const char *proc132 =
-"#line 3364 \"[executable]/sparql.sql\"\n"
+static const char *proc120 =
+"#line 3086 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_NEW_BLANK (inout g_iid IRI_ID, inout app_env any, inout res IRI_ID)\n"
"{\n"
" ;\n"
"}\n"
-"--src sparql.sql:3362\n";
+"--src sparql.sql:3084\n";
-static const char *proc133 =
-"#line 3371 \"[executable]/sparql.sql\"\n"
+static const char *proc121 =
+"#line 3093 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_TRIPLE (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_uri varchar,\n"
@@ -3494,10 +3202,10 @@ static const char *proc133 =
"DB.DBA.RDF_XML_IRI_TO_TTL (o_uri, app_env);\n"
"http (\'.\\n\', app_env);\n"
"}\n"
-"--src sparql.sql:3369\n";
+"--src sparql.sql:3091\n";
-static const char *proc134 =
-"#line 3384 \"[executable]/sparql.sql\"\n"
+static const char *proc122 =
+"#line 3106 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_TRIPLE_L (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
@@ -3508,10 +3216,10 @@ static const char *proc134 =
"DB.DBA.RDF_XML_OBJ_TO_TTL (o_val, o_type, o_lang, app_env);\n"
"http (\'.\\n\', app_env);\n"
"}\n"
-"--src sparql.sql:3382\n";
+"--src sparql.sql:3104\n";
-static const char *proc135 =
-"#line 3397 \"[executable]/sparql.sql\"\n"
+static const char *proc123 =
+"#line 3119 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_CONVERT_RDFXML_TO_TTL (in strg varchar, in base varchar, inout ttl_ses any)\n"
"{\n"
"rdf_load_rdfxml (strg, 0,\n"
@@ -3527,10 +3235,10 @@ static const char *proc135 =
"ttl_ses,\n"
"base );\n"
"}\n"
-"--src sparql.sql:3395\n";
+"--src sparql.sql:3117\n";
-static const char *proc136 =
-"#line 3415 \"[executable]/sparql.sql\"\n"
+static const char *proc124 =
+"#line 3137 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_CONVERT_RDFXML_FILE_TO_TTL_FILE (in rdfxml_source_filename varchar, in base varchar, in ttl_target_filename varchar)\n"
"{\n"
"declare in_ses, out_ses any;\n"
@@ -3539,10 +3247,10 @@ static const char *proc136 =
"DB.DBA.RDF_CONVERT_RDFXML_TO_TTL (in_ses, base, out_ses);\n"
"string_to_file (ttl_target_filename, out_ses, -2);\n"
"}\n"
-"--src sparql.sql:3413\n";
+"--src sparql.sql:3135\n";
-static const char *proc137 =
-"#line 3428 \"[executable]/sparql.sql\"\n"
+static const char *proc125 =
+"#line 3150 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_LONG_TO_TTL (inout obj any, inout ses any)\n"
"{\n"
"declare res varchar;\n"
@@ -3644,18 +3352,10 @@ static const char *proc137 =
"http (\'> \', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:3426\n";
-
-static const char *proc138 =
-"#line 3534 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (inout triples any)\n"
-"{\n"
-"return;\n"
-"}\n"
-"--src sparql.sql:3532\n";
+"--src sparql.sql:3148\n";
-static const char *proc139 =
-"#line 3541 \"[executable]/sparql.sql\"\n"
+static const char *proc126 =
+"#line 3254 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_VERBOSE_TTL (inout triples any, inout ses any)\n"
"{\n"
"declare tcount, tctr integer;\n"
@@ -3705,7 +3405,6 @@ static const char *proc139 =
"rowvector_digit_sort (triples, 1, 1);\n"
"if (not string_subjs_found)\n"
"rowvector_digit_sort (triples, 0, 1);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"prev_s := null;\n"
"prev_p := null;\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
@@ -3786,10 +3485,10 @@ static const char *proc139 =
"}\n"
"http (\'.\\n\', ses);\n"
"}\n"
-"--src sparql.sql:3539\n";
+"--src sparql.sql:3252\n";
-static const char *proc140 =
-"#line 3673 \"[executable]/sparql.sql\"\n"
+static const char *proc127 =
+"#line 3385 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_TTL (inout triples any, inout ses any)\n"
"{\n"
"declare env any;\n"
@@ -3810,86 +3509,16 @@ static const char *proc140 =
"rowvector_subj_sort (triples, 0, 1);\n"
"end_subj_sort: ;\n"
"}\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
"{\n"
"http_ttl_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);\n"
"}\n"
"http (\' .\', ses);\n"
"}\n"
-"--src sparql.sql:3671\n";
-
-static const char *proc141 =
-"#line 3702 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TRIPLES_TO_TRIG (inout triples any, inout ses any)\n"
-"{\n"
-"declare env any;\n"
-"declare tcount, tctr, first_dflt_g_idx integer;\n"
-"declare prev_g_iri varchar;\n"
-"declare first_g_idx integer;\n"
-"tcount := length (triples);\n"
-"if (0 = tcount)\n"
-"{\n"
-"http (\'# Empty TriG\\n\', ses);\n"
-"return;\n"
-"}\n"
-"env := vector (dict_new (__min (tcount, 16000)), 0, \'\', \'\', \'\', 0, 0, 0, 0);\n"
-"{ whenever sqlstate \'*\' goto end_pred_sort;\n"
-"rowvector_subj_sort (triples, 1, 1);\n"
-"end_pred_sort: ;\n"
-"}\n"
-"{ whenever sqlstate \'*\' goto end_subj_sort;\n"
-"rowvector_subj_sort (triples, 0, 1);\n"
-"end_subj_sort: ;\n"
-"}\n"
-"rowvector_graph_sort (triples, 3, 1);\n"
-"\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
-"for (tctr := 0; (tctr < tcount) and aref_or_default (triples, tctr, 3, null) is null; tctr := tctr + 1)\n"
-"{\n"
-"http_ttl_prefixes (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);\n"
-"}\n"
-"first_g_idx := tctr;\n"
-"for (tctr := first_g_idx; tctr < tcount; tctr := tctr + 1)\n"
-"{\n"
-"http_ttl_prefixes (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);\n"
-"}\n"
-"if (0 < first_g_idx)\n"
-"{\n"
-"http (\'{\\n\', ses);\n"
-"for (tctr := 0; tctr < first_g_idx; tctr := tctr + 1)\n"
-"{\n"
-"http_ttl_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);\n"
-"}\n"
-"http (\' .\\n}\\n\', ses);\n"
-"}\n"
-"prev_g_iri := \'\';\n"
-"for (tctr := first_g_idx; tctr < tcount; tctr := tctr + 1)\n"
-"{\n"
-"declare g_iri varchar;\n"
-"g_iri := id_to_iri_nosignal (triples[tctr][3]);\n"
-"if (g_iri is not null)\n"
-"{\n"
-"if (g_iri <> prev_g_iri)\n"
-"{\n"
-"if (prev_g_iri <> \'\')\n"
-"http (\' .\\n}\\n\', ses);\n"
-"env[1] := 0;\n"
-"http (\'<\', ses);\n"
-"http_escape (g_iri, 12, ses, 1, 1);\n"
-"http (\'> = {\\n\', ses);\n"
-"prev_g_iri := g_iri;\n"
-"}\n"
-"http_ttl_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);\n"
-"}\n"
-"}\n"
-"if (prev_g_iri <> \'\')\n"
-"http (\' .\\n}\\n\', ses);\n"
-"}\n"
-"--src sparql.sql:3700\n";
+"--src sparql.sql:3383\n";
-static const char *proc142 =
-"#line 3769 \"[executable]/sparql.sql\"\n"
+static const char *proc128 =
+"#line 3413 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_NT (inout triples any, inout ses any)\n"
"{\n"
"declare env any;\n"
@@ -3902,16 +3531,15 @@ static const char *proc142 =
"return;\n"
"}\n"
"env := vector (0, 0, 0);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
"{\n"
"http_nt_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:3767\n";
+"--src sparql.sql:3411\n";
-static const char *proc143 =
-"#line 3789 \"[executable]/sparql.sql\"\n"
+static const char *proc129 =
+"#line 3432 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_TO_TTL (in graph_iri varchar, inout ses any)\n"
"{\n"
"declare tcount integer;\n"
@@ -3971,122 +3599,300 @@ static const char *proc143 =
"else\n"
"http (\'.\\n\', ses);\n"
"}\n"
-"--src sparql.sql:3787\n";
+"--src sparql.sql:3430\n";
-static const char *proc144 =
-"#line 3863 \"[executable]/sparql.sql\"\n"
+static const char *proc130 =
+"#line 3506 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT (inout triples any, in print_top_level integer, inout ses any)\n"
"{\n"
-"declare ns_dict, env any;\n"
"declare tcount, tctr integer;\n"
"tcount := length (triples);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
-"{ whenever sqlstate \'*\' goto end_pred_sort;\n"
-"rowvector_subj_sort (triples, 1, 1);\n"
-"end_pred_sort: ;\n"
-"}\n"
-"ns_dict := dict_new (case (print_top_level) when 0 then 10 else __min (tcount, 16000) end);\n"
-"dict_put (ns_dict, \'http://www.w3.org/1999/02/22-rdf-syntax-ns#\', \'rdf\');\n"
-"dict_put (ns_dict, \'http://www.w3.org/2000/01/rdf-schema#\', \'rdfs\');\n"
-"env := vector (ns_dict, 0, 0, \'\', \'\', 0, 0, 0, 0);\n"
"if (print_top_level)\n"
"{\n"
-"http (\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\\n<rdf:RDF\\n\\txmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\\n\\txmlns:rdfs=\"http://www.w3.org/2000/01/rdf-schema#\"\', ses);\n"
-"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
-"{\n"
-"http_rdfxml_p_ns (env, triples[tctr][1], ses);\n"
-"}\n"
-"http (\' >\', ses);\n"
-"}\n"
-"{ whenever sqlstate \'*\' goto end_subj_sort;\n"
-"rowvector_subj_sort (triples, 0, 1);\n"
-"end_subj_sort: ;\n"
+"http (\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\\n<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" \'||\n"
+"\'xmlns:rdfs=\"http://www.w3.org/2000/01/rdf-schema#\">\', ses);\n"
"}\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
"{\n"
-"http_rdfxml_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses);\n"
+"declare subj, pred, obj any;\n"
+"declare pred_tagname varchar;\n"
+"declare res varchar;\n"
+"subj := triples[tctr][0];\n"
+"pred := triples[tctr][1];\n"
+"obj := triples[tctr][2];\n"
+"\n"
+"\n"
+"\n"
+"http (\'\\n<rdf:Description\', ses);\n"
+"if (not isiri_id (subj))\n"
+"{\n"
+"if (isstring (subj) and (1 = __box_flags (subj)))\n"
+"{\n"
+"if (subj like \'nodeID://%\')\n"
+"{\n"
+"http (\' rdf:nodeID=\"b\', ses); http_value (subseq (subj, 9), 0, ses); http (\'\">\', ses);\n"
"}\n"
-"if (isstring (env[2]))\n"
-"http (\'\\n </rdf:Description>\', ses);\n"
-"if (print_top_level)\n"
+"else\n"
"{\n"
-"http (\'\\n</rdf:RDF>\', ses);\n"
+"subj := charset_recode (subj, \'UTF-8\', \'_WIDE_\');\n"
+"http (\' rdf:about=\"\', ses); http_value (subj, 0, ses); http (\'\">\', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:3861\n";
-
-static const char *proc145 =
-"#line 3916 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TRIPLES_TO_TALIS_JSON (inout triples any, inout ses any)\n"
+"else if (subj is null)\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): subject is NULL\');\n"
+"else\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): subject is literal\');\n"
+"}\n"
+"else if (subj >= min_bnode_iri_id ())\n"
+"http (sprintf (\' rdf:nodeID=\"b%d\">\', iri_id_num (subj)), ses);\n"
+"else\n"
"{\n"
-"declare env any;\n"
-"declare tcount, tctr, status integer;\n"
-"tcount := length (triples);\n"
+"res := id_to_iri (subj);\n"
"\n"
-"if (0 = tcount)\n"
-"{\n"
-"http (\'{ }\\n\', ses);\n"
-"return;\n"
+"res := charset_recode (res, \'UTF-8\', \'_WIDE_\');\n"
+"http (\' rdf:about=\"\', ses); http_value (res, 0, ses); http (\'\">\', ses);\n"
"}\n"
-"env := vector (0, 0, 0, null);\n"
-"\n"
-"rowvector_subj_sort (triples, 1, 1);\n"
-"rowvector_subj_sort (triples, 0, 1);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
-"http (\'{\\n \', ses);\n"
-"status := 0;\n"
-"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
+"if (not isiri_id (pred))\n"
"{\n"
-"if (http_talis_json_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses))\n"
-"status := 1;\n"
+"if (isstring (pred) and (1 = __box_flags (pred)))\n"
+"{\n"
+"if (pred like \'nodeID://%\')\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): blank node as predicate\');\n"
+"res := pred;\n"
+"goto res_for_pred;\n"
"}\n"
-"if (status)\n"
-"http (\' ] }\\n\', ses);\n"
-"http (\'}\\n\', ses);\n"
+"else if (pred is null)\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): predicate is NULL\');\n"
+"else\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): predicate is literal\');\n"
"}\n"
-"--src sparql.sql:3914\n";
-
-static const char *proc146 =
-"#line 3945 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TRIPLES_TO_JSON_LD (inout triples any, inout ses any)\n"
+"if (pred >= min_bnode_iri_id ())\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): blank node as predicate\');\n"
+"res := id_to_iri (pred);\n"
+"res_for_pred:\n"
+"declare delim, delim1, delim2, delim3, delim4 integer;\n"
+"delim1 := coalesce (strrchr (res, \'/\'), -1);\n"
+"delim2 := coalesce (strrchr (res, \'#\'), -1);\n"
+"delim3 := coalesce (strrchr (res, \':\'), -1);\n"
+"delim4 := coalesce (strrchr (res, \'%\'), -1);\n"
+"if (delim4 > 0 and delim4 < (length (res) - 2))\n"
+"delim4 := delim4 + 2;\n"
+"delim := __max (delim1, delim2, delim3, delim4);\n"
+"if (delim < 0)\n"
+"delim := null;\n"
+"if (delim is null)\n"
"{\n"
-"declare env any;\n"
-"declare tcount, tctr, status integer;\n"
-"tcount := length (triples);\n"
-"\n"
-"if (0 = tcount)\n"
+"pred_tagname := res;\n"
+"http (\'<\', ses); http (pred_tagname, ses);\n"
+"}\n"
+"else\n"
"{\n"
-"http (\'{ }\\n\', ses);\n"
-"return;\n"
+"declare p_ns_uri, p_ns_pref varchar;\n"
+"p_ns_uri := subseq (res, 0, delim+1);\n"
+"if (p_ns_uri = \'http://www.w3.org/1999/02/22-rdf-syntax-ns#\')\n"
+"{\n"
+"pred_tagname := \'rdf:\' || subseq (res, delim+1);\n"
+"http (\'<\', ses); http (pred_tagname, ses);\n"
"}\n"
-"env := vector (0, 0, 0, null);\n"
-"\n"
-"rowvector_subj_sort (triples, 1, 1);\n"
-"rowvector_subj_sort (triples, 0, 1);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
-"http (\'{ \"@id\": [\\n \', ses);\n"
-"status := 0;\n"
-"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
+"else if (p_ns_uri = \'http://www.w3.org/2000/01/rdf-schema#\')\n"
"{\n"
-"if (http_ld_json_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses))\n"
-"status := 1;\n"
+"pred_tagname := \'rdfs:\' || subseq (res, delim+1);\n"
+"http (\'<\', ses); http (pred_tagname, ses);\n"
"}\n"
-"if (status)\n"
-"http (\' ] }\\n\', ses);\n"
-"http (\'] }\\n\', ses);\n"
+"else\n"
+"{\n"
+"p_ns_pref := coalesce (__xml_get_ns_prefix (p_ns_uri, 3), \'n0pred\');\n"
+"pred_tagname := p_ns_pref || \':\' || subseq (res, delim+1);\n"
+"http (\'<\', ses); http (pred_tagname, ses);\n"
+"http (\' xmlns:\' || p_ns_pref || \'=\"\', ses); http_value (p_ns_uri, 0, ses); http (\'\"\', ses);\n"
"}\n"
-"--src sparql.sql:3943\n";
-
-static const char *proc147 =
-"#line 3974 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TRIPLES_TO_JSON (inout triples any, inout ses any)\n"
+"}\n"
+"if (obj is null)\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_RDF_XML_TEXT(): object is NULL\');\n"
+"if (isiri_id (obj))\n"
+"{\n"
+"if (obj >= min_bnode_iri_id ())\n"
+"http (sprintf (\' rdf:nodeID=\"b%d\"/>\', iri_id_num (obj)), ses);\n"
+"else\n"
+"{\n"
+"res := coalesce (id_to_iri(obj), sprintf (\'_:bad_iid_%d\', iri_id_num (obj)));\n"
+"\n"
+"res := charset_recode (res, \'UTF-8\', \'_WIDE_\');\n"
+"http (\' rdf:resource=\"\', ses); http_value (res, 0, ses); http (\'\"/>\', ses);\n"
+"}\n"
+"}\n"
+"else if (__tag of rdf_box = __tag (obj))\n"
+"{\n"
+"declare dat any;\n"
+"if (257 <> rdf_box_type (obj))\n"
+"{\n"
+"res := coalesce ((select RDT_QNAME from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = rdf_box_type (obj)));\n"
+"http (\' rdf:datatype=\"\', ses); http_value (res, 0, ses); http (\'\"\', ses);\n"
+"}\n"
+"else if (257 <> rdf_box_lang (obj))\n"
+"{\n"
+"res := coalesce ((select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = rdf_box_lang (obj)));\n"
+"http (\' xml:lang=\"\', ses); http_value (res, 0, ses); http (\'\"\', ses);\n"
+"}\n"
+"dat := __rdf_sqlval_of_obj (obj, 1);\n"
+"if (__tag of XML = __tag (dat))\n"
+"{\n"
+"http (\' rdf:parseType=\"Literal\">\', ses);\n"
+"http_value (dat, 0, ses);\n"
+"http (\'</\', ses); http (pred_tagname, ses); http (\'>\', ses);\n"
+"}\n"
+"else if (__tag of datetime = rdf_box_data_tag (obj))\n"
+"{\n"
+"if (257 = rdf_box_type (obj))\n"
+"{\n"
+"http (\' rdf:datatype=\"\', ses);\n"
+"http_escape (cast (__xsd_type (dat) as varchar), 12, ses, 1, 1);\n"
+"http (\'\">\', ses);\n"
+"}\n"
+"else\n"
+"http (\'>\', ses);\n"
+"__rdf_long_to_ttl (dat, ses);\n"
+"http (\'</\', ses); http (pred_tagname, ses); http (\'>\', ses);\n"
+"}\n"
+"else\n"
+"{\n"
+"declare tmp any;\n"
+"http (\'>\', ses);\n"
+"tmp := __rdf_strsqlval (obj);\n"
+"if (__tag of varchar = __tag (tmp))\n"
+"tmp := charset_recode (tmp, \'UTF-8\', \'_WIDE_\');\n"
+"http_value (tmp, 0, ses);\n"
+"http (\'</\', ses); http (pred_tagname, ses); http (\'>\', ses);\n"
+"}\n"
+"}\n"
+"else if (__tag of varchar = __tag (obj))\n"
+"{\n"
+"if (1 = __box_flags (obj))\n"
+"{\n"
+"if (obj like \'nodeID://%\')\n"
+"{\n"
+"http (\' rdf:nodeID=\"b\', ses); http_value (subseq (obj, 9), 0, ses); http (\'\"/>\', ses);\n"
+"}\n"
+"else\n"
+"{\n"
+"obj := charset_recode (obj, \'UTF-8\', \'_WIDE_\');\n"
+"http (\' rdf:resource=\"\', ses); http_value (obj, 0, ses); http (\'\"/>\', ses);\n"
+"}\n"
+"}\n"
+"else\n"
+"{\n"
+"http (\'>\', ses);\n"
+"obj := charset_recode (obj, \'UTF-8\', \'_WIDE_\');\n"
+"http_value (obj, 0, ses);\n"
+"http (\'</\', ses); http (pred_tagname, ses); http (\'>\', ses);\n"
+"}\n"
+"}\n"
+"else if (__tag of varbinary = __tag (obj))\n"
+"{\n"
+"http (\'>\', ses);\n"
+"http_value (obj, 0, ses);\n"
+"http (\'</\', ses); http (pred_tagname, ses); http (\'>\', ses);\n"
+"}\n"
+"else if (__tag of XML = __tag (obj))\n"
+"{\n"
+"http (\' rdf:parseType=\"Literal\">\', ses);\n"
+"http_value (obj, 0, ses);\n"
+"http (\'</\', ses); http (pred_tagname, ses); http (\'>\', ses);\n"
+"}\n"
+"else if (__tag of datetime = rdf_box_data_tag (obj))\n"
+"{\n"
+"http (\' rdf:datatype=\"\', ses);\n"
+"http_escape (cast (__xsd_type (obj) as varchar), 12, ses, 1, 1);\n"
+"http (\'\">\', ses);\n"
+"__rdf_long_to_ttl (obj, ses);\n"
+"http (\'</\', ses); http (pred_tagname, ses); http (\'>\', ses);\n"
+"}\n"
+"else\n"
+"{\n"
+"http (\' rdf:datatype=\"\', ses);\n"
+"http_value (__xsd_type (obj), 0, ses);\n"
+"http (\'\">\', ses);\n"
+"http_value (__rdf_strsqlval (obj), 0, ses);\n"
+"http (\'</\', ses); http (pred_tagname, ses); http (\'>\', ses);\n"
+"}\n"
+"http (\'</rdf:Description>\', ses);\n"
+"}\n"
+"if (print_top_level)\n"
+"{\n"
+"http (\'\\n</rdf:RDF>\', ses);\n"
+"}\n"
+"}\n"
+"--src sparql.sql:3504\n";
+
+static const char *proc131 =
+"#line 3740 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_TRIPLES_TO_TALIS_JSON (inout triples any, inout ses any)\n"
+"{\n"
+"declare env any;\n"
+"declare tcount, tctr, status integer;\n"
+"tcount := length (triples);\n"
+"\n"
+"if (0 = tcount)\n"
+"{\n"
+"http (\'{ }\\n\', ses);\n"
+"return;\n"
+"}\n"
+"env := vector (0, 0, 0, null);\n"
+"\n"
+"rowvector_subj_sort (triples, 1, 1);\n"
+"rowvector_subj_sort (triples, 0, 1);\n"
+"http (\'{\\n \', ses);\n"
+"status := 0;\n"
+"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
+"{\n"
+"if (http_talis_json_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses))\n"
+"status := 1;\n"
+"}\n"
+"if (status)\n"
+"http (\' ] }\\n\', ses);\n"
+"http (\'}\\n\', ses);\n"
+"}\n"
+"--src sparql.sql:3738\n";
+
+static const char *proc132 =
+"#line 3768 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_TRIPLES_TO_JSON_LD (inout triples any, inout ses any)\n"
+"{\n"
+"declare env any;\n"
+"declare tcount, tctr, status integer;\n"
+"tcount := length (triples);\n"
+"\n"
+"if (0 = tcount)\n"
+"{\n"
+"http (\'{ }\\n\', ses);\n"
+"return;\n"
+"}\n"
+"env := vector (0, 0, 0, null);\n"
+"\n"
+"rowvector_subj_sort (triples, 1, 1);\n"
+"rowvector_subj_sort (triples, 0, 1);\n"
+"http (\'{ \"@\": [\\n \', ses);\n"
+"status := 0;\n"
+"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
+"{\n"
+"if (http_ld_json_triple (env, triples[tctr][0], triples[tctr][1], triples[tctr][2], ses))\n"
+"status := 1;\n"
+"}\n"
+"if (status)\n"
+"http (\' ] }\\n\', ses);\n"
+"http (\'] }\\n\', ses);\n"
+"}\n"
+"--src sparql.sql:3766\n";
+
+static const char *proc133 =
+"#line 3796 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_TRIPLES_TO_JSON (inout triples any, inout ses any)\n"
"{\n"
"declare tcount, tctr, env integer;\n"
"tcount := length (triples);\n"
"http (\'\\n{ \"head\": { \"link\": [], \"vars\": [ \"s\", \"p\", \"o\" ] },\\n \"results\": { \"distinct\": false, \"ordered\": true, \"bindings\": [\', ses);\n"
"tcount := length (triples);\n"
"env := vector (0, 0, vector (\'s\', \'p\', \'o\'), null);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
"{\n"
"declare triple any;\n"
@@ -4098,10 +3904,10 @@ static const char *proc147 =
"}\n"
"http (\' ] } }\', ses);\n"
"}\n"
-"--src sparql.sql:3972\n";
+"--src sparql.sql:3794\n";
-static const char *proc148 =
-"#line 3995 \"[executable]/sparql.sql\"\n"
+static const char *proc134 =
+"#line 3816 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_CSV (inout triples any, inout ses any)\n"
"{\n"
"declare env any;\n"
@@ -4111,7 +3917,6 @@ static const char *proc148 =
"\n"
"{ whenever sqlstate \'*\' goto p_done; rowvector_subj_sort (triples, 1, 1); p_done: ; }\n"
"{ whenever sqlstate \'*\' goto s_done; rowvector_subj_sort (triples, 0, 1); s_done: ; }\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
"{\n"
"DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (ses, triples[tctr][0]);\n"
@@ -4122,10 +3927,10 @@ static const char *proc148 =
"http (\'\\n\', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:3993\n";
+"--src sparql.sql:3814\n";
-static const char *proc149 =
-"#line 4017 \"[executable]/sparql.sql\"\n"
+static const char *proc135 =
+"#line 3837 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML (inout triples any, inout ses any)\n"
"{\n"
"declare env, prev_subj, nsdict, nslist any;\n"
@@ -4145,7 +3950,6 @@ static const char *proc149 =
"nsdict := dict_new (10 + cast (sqrt(tcount) as integer));\n"
"dict_put (nsdict, \'http://www.w3.org/1999/02/22-rdf-syntax-ns#\', \'rdf\');\n"
"dict_put (nsdict, \'http://www.w3.org/2001/XMLSchema#\', \'xsdh\');\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"for (tctr := 0; (tctr < tcount) and (1000 > dict_size (nsdict)); tctr := tctr + 1)\n"
"{\n"
"sparql_iri_split_rdfa_qname (triples[tctr][0], nsdict, 1);\n"
@@ -4166,7 +3970,7 @@ static const char *proc149 =
"tcount), ses);\n"
"http (\'<p>A generic web browser may not display them but the document can be saved on disk and used by some appropriate program or sent to a third party.\n"
"Use \"Save As\" or \"Send To\" menu item of the browser; choose \"HTML\" file type, not \"text file\" or \"web archive\".\n"
-"</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>\\n<ul>\', ses);\n"
+"</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>\', ses);\n"
"env := vector (0, 0, 0, null);\n"
"rowvector_subj_sort (triples, 0, 1);\n"
"prev_subj := null;\n"
@@ -4184,31 +3988,31 @@ static const char *proc149 =
"if (prev_subj is null or (subj <> prev_subj))\n"
"{\n"
"if (prev_subj is not null)\n"
-"http (\'\\n</ul></li>\', ses);\n"
-"http (\'\\n<li about=\"[\', ses);\n"
+"http (\'\\n</div>\', ses);\n"
+"http (\'\\n<div about=\"[\', ses);\n"
"split := sparql_iri_split_rdfa_qname (subj, nsdict, 2);\n"
"\n"
"if (\'\' = split[1])\n"
"{\n"
"http_escape (split[2], 3, ses, 1, 1);\n"
-"http (\']\">\\n<ul>\', ses);\n"
+"http (\']\">\', ses);\n"
"}\n"
"else if (isstring (split[0]))\n"
"{\n"
"http_escape (concat (split[0], \':\', split[2]), 3, ses, 1, 1);\n"
-"http (\']\">\\n<ul>\', ses);\n"
+"http (\']\">\', ses);\n"
"}\n"
"else\n"
"{\n"
"http_escape (concat (\'s:\', split[2]), 3, ses, 1, 1);\n"
"http (\']\" xmlns:s=\"\', ses);\n"
"http_escape (split[1], 3, ses, 1, 1);\n"
-"http (\'\">\\n<ul>\', ses);\n"
+"http (\'\">\', ses);\n"
"}\n"
"prev_subj := subj;\n"
"}\n"
"obj_iri_split := sparql_iri_split_rdfa_qname (obj, nsdict, 2);\n"
-"http (case (isvector (obj_iri_split)) when 0 then \'\\n<li property=\"\' else \'\\n<li rel=\"\' end, ses);\n"
+"http (case (isvector (obj_iri_split)) when 0 then \'\\n<div property=\"\' else \'\\n<div rel=\"\' end, ses);\n"
"split := sparql_iri_split_rdfa_qname (pred, nsdict, 2);\n"
"if (\'\' = split[1])\n"
"{\n"
@@ -4311,67 +4115,56 @@ static const char *proc149 =
"sqlval := charset_recode (sqlval, \'UTF-8\', \'_WIDE_\');\n"
"http_value (sqlval, 0, ses);\n"
"}\n"
-"http (\'</li>\', ses);\n"
+"http (\'</div>\', ses);\n"
"}\n"
"}\n"
"if (prev_subj is not null)\n"
-"http (\'\\n</ul></li></ul>\', ses);\n"
+"http (\'\\n</div>\', ses);\n"
"http (\'\\n</body></html>\\n\', ses);\n"
"}\n"
-"--src sparql.sql:4015\n";
-
-static const char *proc150 =
-"#line 4211 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT (in ul_or_tr varchar)\n"
-"{\n"
-"declare lpath varchar;\n"
-"lpath := virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\');\n"
-"if (lpath is null)\n"
-"lpath := \'/sparql\';\n"
-"else\n"
-"lpath := \'http://\' || lpath || \'/sparql\';\n"
-"whenever sqlstate \'HT013\' goto no_http_context;\n"
-"lpath := http_path ();\n"
-"no_http_context:\n"
-"return \' <a href=\" \' || lpath || \'?query=describe+%%3C%U%%3E&format=text%%2Fx-html%%2B\' || ul_or_tr || \'\">describe</a> \';\n"
-"}\n"
-"--src sparql.sql:4209\n";
-
-static const char *proc151 =
-"#line 4226 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_PIVOT_DESCRIBE_LINK (in iri varchar)\n"
-"{\n"
-"return sprintf (\'; <a href=\"/describe/?url=%U&sid=1&urilookup=1\">facets</a> \', iri);\n"
-"}\n"
-"--src sparql.sql:4224\n";
+"--src sparql.sql:3835\n";
-static const char *proc152 =
-"#line 4232 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TRIPLES_TO_HTML_UL (inout triples any, inout ses any)\n"
+static const char *proc136 =
+"#line 4030 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (inout triples any, inout ses any)\n"
"{\n"
-"declare env, prev_subj, prev_pred any;\n"
-"declare can_pivot, ctr, len, tcount, tctr, status, obj_needs_br integer;\n"
-"declare endpoint_fmt, subj_iri, pred_iri varchar;\n"
+"declare env, prev_subj, prev_pred, nsdict, nslist any;\n"
+"declare ctr, len, tcount, tctr, status, obj_needs_br integer;\n"
"tcount := length (triples);\n"
"\n"
-"http (\'<?xml version=\"1.0\" encoding=\"UTF-8\"?>\\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML+RDFa 1.0//EN\" \"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd\">\\n\', ses);\n"
+"\n"
"if (0 = tcount)\n"
"{\n"
"http (\'<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
-"<head><title>Empty HTML RDFa and Microdata document</title>\n"
-"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\n"
-"</head><body>\n"
+"<head><title>Empty HTML Microdata document</title></head><body>\n"
"<p>This document is empty and basically useless. It is generated by a web service that can make some statements in HTML Microdata format.\n"
"This time the service made zero such statements, sorry.</p></body></html>\', ses);\n"
"return;\n"
"}\n"
-"endpoint_fmt := DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT (\'ul\');\n"
-"can_pivot := case (isnull (DB.DBA.VAD_CHECK_VERSION (\'PivotViewer\'))) when 0 then 1 else 0 end;\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
+"nsdict := dict_new (10 + cast (sqrt(tcount) as integer));\n"
+"dict_put (nsdict, \'http://www.w3.org/1999/02/22-rdf-syntax-ns#\', \'rdf\');\n"
+"dict_put (nsdict, \'http://www.w3.org/2001/XMLSchema#\', \'xsdh\');\n"
+"for (tctr := 0; (tctr < tcount) and (1000 > dict_size (nsdict)); tctr := tctr + 1)\n"
+"{\n"
+"sparql_iri_split_rdfa_qname (triples[tctr][0], nsdict, 1);\n"
+"sparql_iri_split_rdfa_qname (triples[tctr][1], nsdict, 1);\n"
+"sparql_iri_split_rdfa_qname (triples[tctr][2], nsdict, 1);\n"
+"}\n"
"http (\'<html xmlns=\"http://www.w3.org/1999/xhtml\"\', ses);\n"
-"http (\'>\\n<head><title>HTML RDFa and Microdata document</title>\n"
-"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\n"
-"</head>\\n<body>\\n<ul>\\n\', ses);\n"
+"http (\'>\\n<head><title>HTML Microdata document</title></head><body>\\n\', ses);\n"
+"http (sprintf (\'<p>This document contains %d facts in HTML Microdata format.</p>\',\n"
+"tcount), ses);\n"
+"http (\'<p>A generic web browser may not display them properly but the document can be saved on disk and used by some appropriate program or sent to a third party.\n"
+"Use \"Save As\" or \"Send To\" menu item of the browser; choose \"HTML\" file type, not \"text file\" or \"web archive\".\n"
+"</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>\', ses);\n"
+"http (\'\\n<table><tr><th>Prefix</th><th>Namespace IRI</th></tr>\', ses);\n"
+"nslist := dict_to_vector (nsdict, 0);\n"
+"len := length (nslist);\n"
+"for (ctr := len - 2; ctr >= 0; ctr := ctr-2)\n"
+"{\n"
+"http (sprintf (\'\\n<tr><td>%V</td><td>%V</td></tr>\', nslist[ctr+1], nslist[ctr]), ses);\n"
+"}\n"
+"http (\'</table>\', ses);\n"
"env := vector (0, 0, 0, null);\n"
"rowvector_subj_sort (triples, 1, 1);\n"
"rowvector_subj_sort (triples, 0, 1);\n"
@@ -4391,425 +4184,74 @@ static const char *proc152 =
"if (prev_subj is null or (subj <> prev_subj))\n"
"{\n"
"if (prev_subj is not null)\n"
-"http (\'\\n </ul></li>\\n </ul></li>\', ses);\n"
-"subj_iri := id_to_iri (subj);\n"
-"http (\'\\n <li about=\"\', ses);\n"
-"http_escape (subj_iri, 3, ses, 1, 1);\n"
-"http (\'\" itemscope=\"\" itemid=\"\', ses);\n"
-"http_escape (subj_iri, 3, ses, 1, 1);\n"
-"http (\'\"><a href=\"\', ses);\n"
-"http_escape (subj_iri, 3, ses, 1, 1);\n"
-"http (\'\">\', ses);\n"
-"http_escape (subj_iri, 1, ses, 1, 1);\n"
-"http (\'</a> (\', ses);\n"
-"http (sprintf (endpoint_fmt, subj_iri), ses);\n"
-"if (can_pivot)\n"
-"http (DB.DBA.RDF_PIVOT_DESCRIBE_LINK (subj_iri), ses);\n"
-"http (\')\\n <ul>\', ses);\n"
+"http (\'\\n</dd></dl>\', ses);\n"
+"http (sprintf (\'\\n<dl itemscope itemid=\"%s\">\', replace (id_to_iri (subj), \'\"\', \'%22\')), ses);\n"
+"split := sparql_iri_split_rdfa_qname (subj, nsdict, 2);\n"
+"\n"
+"if (\'\' = split[1])\n"
+"http (sprintf (\'\\n<dt>Subject Item</dt><dd>%V</dd>\', split[2]), ses);\n"
+"else if (isstring (split[0]))\n"
+"http (sprintf (\'\\n<dt>Subject Item</dt><dd>%V:%V</dd>\', split[0], split[2]), ses);\n"
+"else\n"
+"http (sprintf (\'\\n<dt>Subject Item</dt><dd>%V%V</dd>\', split[1], split[2]), ses);\n"
"prev_subj := subj;\n"
"prev_pred := null;\n"
"}\n"
"if (prev_pred is null or (pred <> prev_pred))\n"
"{\n"
"if (prev_pred is not null)\n"
-"http (\'\\n </ul></li>\', ses);\n"
-"pred_iri := id_to_iri (pred);\n"
-"http (\'\\n <li><a href=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
-"http (\'\">\', ses);\n"
-"http_escape (pred_iri, 1, ses, 1, 1);\n"
-"http (\'</a> (\', ses);\n"
-"http (sprintf (endpoint_fmt, pred_iri), ses);\n"
-"if (can_pivot)\n"
-"http (DB.DBA.RDF_PIVOT_DESCRIBE_LINK (pred_iri), ses);\n"
-"http (\')\\n <ul>\', ses);\n"
+"http (\'\\n</dd>\', ses);\n"
+"split := sparql_iri_split_rdfa_qname (pred, nsdict, 2);\n"
+"\n"
+"if (\'\' = split[1])\n"
+"http (sprintf (\'\\n<dt>%V</dt><dd>\', split[2]), ses);\n"
+"else if (isstring (split[0]))\n"
+"http (sprintf (\'\\n<dt>%V:%V</dt><dd>\', split[0], split[2]), ses);\n"
+"else\n"
+"http (sprintf (\'\\n<dt>%V%V</dt><dd>\', split[1], split[2]), ses);\n"
"prev_pred := pred;\n"
"obj_needs_br := 0;\n"
"}\n"
"if (obj is null)\n"
-"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_HTML_UL: object is NULL\');\n"
+"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_HTML_MICRODATA: object is NULL\');\n"
"if (obj_needs_br)\n"
"http (\'\\n\', ses);\n"
"else\n"
"obj_needs_br := 1;\n"
-"if (isiri_id (obj))\n"
+"obj_iri_split := sparql_iri_split_rdfa_qname (obj, nsdict, 2);\n"
+"if (isvector (obj_iri_split))\n"
"{\n"
-"declare obj_iri varchar;\n"
-"obj_iri := id_to_iri (obj);\n"
-"http (\'\\n <li><a rel=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
-"http (\'\" resource=\"\', ses);\n"
-"http_escape (obj_iri, 3, ses, 1, 1);\n"
-"http (\'\" itemprop=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
-"http (\'\" href=\"\', ses);\n"
-"http_escape (obj_iri, 3, ses, 1, 1);\n"
-"http (\'\">\', ses);\n"
-"http_escape (obj_iri, 1, ses, 1, 1);\n"
-"http (\'</a> (\', ses);\n"
-"http (sprintf (endpoint_fmt, obj_iri), ses);\n"
-"if (can_pivot)\n"
-"http (DB.DBA.RDF_PIVOT_DESCRIBE_LINK (obj_iri), ses);\n"
-"http (\')</li>\', ses);\n"
+"http (sprintf (\'\\n<a itemprop=\"%s\" href=\"%s\">\', replace (id_to_iri (pred), \'\"\', \'%22\'), replace (id_to_iri (obj), \'\"\', \'%22\')), ses);\n"
+"if (\'\' = obj_iri_split[1])\n"
+"http (sprintf (\'%V</a>\', obj_iri_split[2]), ses);\n"
+"else if (isstring (obj_iri_split[0]))\n"
+"http (sprintf (\'%V:%V</a>\', obj_iri_split[0], obj_iri_split[2]), ses);\n"
+"else\n"
+"http (sprintf (\'%V%V</a>\', obj_iri_split[1], obj_iri_split[2]), ses);\n"
"}\n"
"else\n"
"{\n"
"declare sqlval any;\n"
"declare dt, lang, strval any;\n"
-"http (\'\\n <li property=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
-"http (\'\" itemprop=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
+"http (sprintf (\'\\n<span itemprop=\"%s\"\', replace (id_to_iri (pred), \'\"\', \'%22\')), ses);\n"
"dt := 0; lang := 0;\n"
"if (__tag of rdf_box = __tag (obj))\n"
"{\n"
"if (257 <> rdf_box_lang (obj))\n"
"lang := coalesce ((select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = rdf_box_lang (obj)));\n"
-"else if (257 <> rdf_box_type (obj))\n"
-"dt := coalesce ((select __bft (RDT_QNAME, 1) from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = rdf_box_type (obj)));\n"
+"\n"
+"\n"
"sqlval := __rdf_sqlval_of_obj (obj, 1);\n"
-"if (__tag of datetime = __tag (sqlval))\n"
-"{\n"
-"if (257 = rdf_box_type (obj))\n"
-"dt := __xsd_type (sqlval);\n"
-"}\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
"}\n"
"else if (__tag (obj) not in (__tag of varchar, __tag of varbinary))\n"
"{\n"
"sqlval := obj;\n"
-"dt := __xsd_type (sqlval);\n"
-"}\n"
-"else\n"
-"sqlval := obj;\n"
-"if (not (isinteger (dt)))\n"
-"{\n"
-"http (\'\" datatype=\"\', ses);\n"
-"http_escape (dt, 3, ses, 1, 1);\n"
-"}\n"
-"if (isstring (lang))\n"
-"{\n"
-"http (\'\" xml:lang=\"\', ses);\n"
-"http_escape (lang, 3, ses, 1, 1);\n"
-"}\n"
-"http (\'\">\', ses);\n"
-"if (__tag of datetime = __tag(sqlval))\n"
-"__rdf_long_to_ttl (sqlval, ses);\n"
-"else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))\n"
-"http_value (sqlval, 0, ses);\n"
-"else if (__tag of varchar = __tag (sqlval))\n"
-"http_value (charset_recode (sqlval, \'UTF-8\', \'_WIDE_\'), 0, ses);\n"
-"else\n"
-"{\n"
-"sqlval := __rdf_strsqlval (obj);\n"
-"if (__tag of varchar = __tag (sqlval))\n"
-"sqlval := charset_recode (sqlval, \'UTF-8\', \'_WIDE_\');\n"
-"http_value (sqlval, 0, ses);\n"
-"}\n"
-"http (\'</li>\', ses);\n"
-"}\n"
-"}\n"
-"if (prev_subj is not null)\n"
-"http (\'\\n </ul></li></ul></li></ul>\', ses);\n"
-"http (\'\\n</body></html>\\n\', ses);\n"
-"}\n"
-"--src sparql.sql:4230\n";
-
-static const char *proc153 =
-"#line 4400 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TRIPLES_TO_HTML_TR (inout triples any, inout ses any)\n"
-"{\n"
-"declare env, prev_subj, prev_pred any;\n"
-"declare can_pivot, ctr, len, tcount, tctr, status integer;\n"
-"declare endpoint_fmt, subj_iri, pred_iri, subj_recod, pred_recod, subj_trtd, pred_tdtd varchar;\n"
-"tcount := length (triples);\n"
-"\n"
-"\n"
-"if (0 = tcount)\n"
-"{\n"
-"http (\'<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
-"<head><title>Empty HTML RDFa and Microdata document</title></head><body>\n"
-"<p>This document is empty and basically useless. It is generated by a web service that can make some statements in HTML Microdata format.\n"
-"This time the service made zero such statements, sorry.</p></body></html>\', ses);\n"
-"return;\n"
-"}\n"
-"endpoint_fmt := DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT (\'tr\');\n"
-"can_pivot := case (isnull (DB.DBA.VAD_CHECK_VERSION (\'PivotViewer\'))) when 0 then 1 else 0 end;\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
-"http (\'<html xmlns=\"http://www.w3.org/1999/xhtml\"\', ses);\n"
-"http (\'>\\n<head><title>HTML RDFa and Microdata document</title>\n"
-"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\n"
-"</head>\\n<body>\\n<table>\\n\', ses);\n"
-"env := vector (0, 0, 0, null);\n"
-"rowvector_subj_sort (triples, 1, 1);\n"
-"rowvector_subj_sort (triples, 0, 1);\n"
-"prev_subj := prev_pred := null;\n"
-"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
-"{\n"
-"declare subj, pred, obj, split, obj_iri_split any;\n"
-"declare pred_tagname varchar;\n"
-"declare res varchar;\n"
-"subj := triples[tctr][0];\n"
-"pred := triples[tctr][1];\n"
-"obj := triples[tctr][2];\n"
-"\n"
-"\n"
-"\n"
-"if (prev_subj is null or (subj <> prev_subj))\n"
-"{\n"
-"declare trtd_ses any;\n"
-"subj_iri := id_to_iri (subj);\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"trtd_ses := string_output ();\n"
-"http (\'\\n<tr itemscope=\"itemscope\" about=\"\', trtd_ses);\n"
-"http_escape (subj_iri, 3, trtd_ses, 1, 1);\n"
-"http (\'\" itemid=\"\', trtd_ses);\n"
-"http_escape (subj_iri, 3, trtd_ses, 1, 1);\n"
-"http (\'\">\\n <td><a href=\"\', trtd_ses);\n"
-"http_escape (subj_iri, 3, trtd_ses, 1, 1);\n"
-"http (sprintf (\'\">%V</a> (\' || endpoint_fmt || \'%s)</td>\', subj_iri, subj_iri,\n"
-"case when (can_pivot) then DB.DBA.RDF_PIVOT_DESCRIBE_LINK (id_to_iri (subj)) else \'\' end ),\n"
-"trtd_ses );\n"
-"subj_trtd := string_output_string (trtd_ses);\n"
-"prev_subj := subj;\n"
-"}\n"
-"if (prev_pred is null or (pred <> prev_pred))\n"
-"{\n"
-"declare tdtd_ses any;\n"
-"pred_iri := id_to_iri (pred);\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"tdtd_ses := string_output ();\n"
-"http (\'\\n <td><a href=\"\', tdtd_ses);\n"
-"http_escape (pred_iri, 3, tdtd_ses, 1, 1);\n"
-"http (\'\">\', tdtd_ses);\n"
-"http_escape (pred_iri, 1, tdtd_ses, 1, 1);\n"
-"http (sprintf (\'</a> (\' || endpoint_fmt || \'%s)\\n </td><td\', pred_iri,\n"
-"case when (can_pivot) then DB.DBA.RDF_PIVOT_DESCRIBE_LINK (id_to_iri (pred)) else \'\' end ),\n"
-"tdtd_ses );\n"
-"pred_tdtd := string_output_string (tdtd_ses);\n"
-"prev_pred := pred;\n"
-"}\n"
-"if (obj is null)\n"
-"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_HTML_TR: object is NULL\');\n"
-"http (subj_trtd, ses);\n"
-"http (pred_tdtd, ses);\n"
-"if (isiri_id (obj))\n"
-"{\n"
-"declare obj_iri varchar;\n"
-"obj_iri := id_to_iri (obj);\n"
-"http (\'><a rel=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
-"http (\'\" resource=\"\', ses);\n"
-"http_escape (obj_iri, 3, ses, 1, 1);\n"
-"http (\'\" itemprop=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
-"http (\'\" href=\"\', ses);\n"
-"http_escape (obj_iri, 3, ses, 1, 1);\n"
-"http (sprintf (\'\">%V</a> (\' || endpoint_fmt, obj_iri, obj_iri), ses);\n"
-"if (can_pivot)\n"
-"http (DB.DBA.RDF_PIVOT_DESCRIBE_LINK (obj_iri), ses);\n"
-"http (\')</td></tr>\', ses);\n"
-"}\n"
-"else\n"
-"{\n"
-"declare sqlval any;\n"
-"declare dt, lang, strval any;\n"
-"http (\' property=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
-"http (\'\" itemprop=\"\', ses);\n"
-"http_escape (pred_iri, 3, ses, 1, 1);\n"
-"dt := 0; lang := 0;\n"
-"if (__tag of rdf_box = __tag (obj))\n"
-"{\n"
-"if (257 <> rdf_box_lang (obj))\n"
-"lang := coalesce ((select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = rdf_box_lang (obj)));\n"
-"else if (257 <> rdf_box_type (obj))\n"
-"dt := coalesce ((select __bft (RDT_QNAME, 1) from DB.DBA.RDF_DATATYPE where RDT_TWOBYTE = rdf_box_type (obj)));\n"
-"sqlval := __rdf_sqlval_of_obj (obj, 1);\n"
-"if (__tag of datetime = __tag (sqlval))\n"
-"{\n"
-"if (257 = rdf_box_type (obj))\n"
-"dt := __xsd_type (sqlval);\n"
-"}\n"
-"}\n"
-"else if (__tag (obj) not in (__tag of varchar, __tag of varbinary))\n"
-"{\n"
-"sqlval := obj;\n"
-"dt := __xsd_type (sqlval);\n"
-"}\n"
-"else\n"
-"sqlval := obj;\n"
-"if (not (isinteger (dt)))\n"
-"{\n"
-"http (\'\" datatype=\"\', ses);\n"
-"http_escape (dt, 3, ses, 1, 1);\n"
-"}\n"
-"if (isstring (lang))\n"
-"{\n"
-"http (\'\" xml:lang=\"\', ses);\n"
-"http_escape (lang, 3, ses, 1, 1);\n"
-"}\n"
-"http (\'\">\', ses);\n"
-"if (__tag of datetime = __tag(sqlval))\n"
-"__rdf_long_to_ttl (sqlval, ses);\n"
-"else if (__tag (sqlval) in (__tag of varbinary, __tag of XML))\n"
-"http_value (sqlval, 0, ses);\n"
-"else if (__tag of varchar = __tag (sqlval))\n"
-"http_value (charset_recode (sqlval, \'UTF-8\', \'_WIDE_\'), 0, ses);\n"
-"else\n"
-"{\n"
-"sqlval := __rdf_strsqlval (obj);\n"
-"if (__tag of varchar = __tag (sqlval))\n"
-"sqlval := charset_recode (sqlval, \'UTF-8\', \'_WIDE_\');\n"
-"http_value (sqlval, 0, ses);\n"
-"}\n"
-"http (\'</td></tr>\', ses);\n"
-"}\n"
-"}\n"
-"http (\'\\n</table></body></html>\\n\', ses);\n"
-"}\n"
-"--src sparql.sql:4398\n";
-
-static const char *proc154 =
-"#line 4560 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (inout triples any, inout ses any)\n"
-"{\n"
-"declare env, prev_subj, prev_pred, nsdict, nslist any;\n"
-"declare ctr, len, tcount, tctr, status, obj_needs_br integer;\n"
-"tcount := length (triples);\n"
-"\n"
-"\n"
-"if (0 = tcount)\n"
-"{\n"
-"http (\'<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
-"<head><title>Empty HTML Microdata document</title></head><body>\n"
-"<p>This document is empty and basically useless. It is generated by a web service that can make some statements in HTML Microdata format.\n"
-"This time the service made zero such statements, sorry.</p></body></html>\', ses);\n"
-"return;\n"
-"}\n"
-"nsdict := dict_new (10 + cast (sqrt(tcount) as integer));\n"
-"dict_put (nsdict, \'http://www.w3.org/1999/02/22-rdf-syntax-ns#\', \'rdf\');\n"
-"dict_put (nsdict, \'http://www.w3.org/2001/XMLSchema#\', \'xsdh\');\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
-"for (tctr := 0; (tctr < tcount) and (1000 > dict_size (nsdict)); tctr := tctr + 1)\n"
-"{\n"
-"sparql_iri_split_rdfa_qname (triples[tctr][0], nsdict, 1);\n"
-"sparql_iri_split_rdfa_qname (triples[tctr][1], nsdict, 1);\n"
-"sparql_iri_split_rdfa_qname (triples[tctr][2], nsdict, 1);\n"
-"}\n"
-"http (\'<html xmlns=\"http://www.w3.org/1999/xhtml\"\', ses);\n"
-"http (\'>\\n<head><title>HTML Microdata document</title></head><body>\\n\', ses);\n"
-"http (sprintf (\'<p>This document contains %d facts in HTML Microdata format.</p>\',\n"
-"tcount), ses);\n"
-"http (\'<p>A generic web browser may not display them properly but the document can be saved on disk and used by some appropriate program or sent to a third party.\n"
-"Use \"Save As\" or \"Send To\" menu item of the browser; choose \"HTML\" file type, not \"text file\" or \"web archive\".\n"
-"</p><p>The rest of the document may look like garbage for humans or not displayed by the browser.</p>\', ses);\n"
-"http (\'\\n<table><tr><th>Prefix</th><th>Namespace IRI</th></tr>\', ses);\n"
-"nslist := dict_to_vector (nsdict, 0);\n"
-"len := length (nslist);\n"
-"for (ctr := len - 2; ctr >= 0; ctr := ctr-2)\n"
-"{\n"
-"http (sprintf (\'\\n<tr><td>%V</td><td>%V</td></tr>\', nslist[ctr+1], nslist[ctr]), ses);\n"
-"}\n"
-"http (\'</table>\', ses);\n"
-"env := vector (0, 0, 0, null);\n"
-"rowvector_subj_sort (triples, 1, 1);\n"
-"rowvector_subj_sort (triples, 0, 1);\n"
-"prev_subj := prev_pred := null;\n"
-"obj_needs_br := 0;\n"
-"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
-"{\n"
-"declare subj, pred, obj, split, obj_iri_split any;\n"
-"declare pred_tagname varchar;\n"
-"declare res varchar;\n"
-"subj := triples[tctr][0];\n"
-"pred := triples[tctr][1];\n"
-"obj := triples[tctr][2];\n"
-"if (isstring (subj))\n"
-"subj := iri_to_id (subj);\n"
-"if (isstring (pred))\n"
-"pred := iri_to_id (pred);\n"
-"if (isstring (obj) and __box_flags (obj) = 1)\n"
-"obj := iri_to_id (obj);\n"
-"\n"
-"\n"
-"\n"
-"if (prev_subj is null or (subj <> prev_subj))\n"
-"{\n"
-"if (prev_subj is not null)\n"
-"http (\'\\n</dd></dl>\', ses);\n"
-"http (sprintf (\'\\n<dl itemscope itemid=\"%s\">\', replace (id_to_iri (subj), \'\"\', \'%22\')), ses);\n"
-"split := sparql_iri_split_rdfa_qname (subj, nsdict, 2);\n"
-"\n"
-"if (\'\' = split[1])\n"
-"http (sprintf (\'\\n<dt>Subject Item</dt><dd>%V</dd>\', split[2]), ses);\n"
-"else if (isstring (split[0]))\n"
-"http (sprintf (\'\\n<dt>Subject Item</dt><dd>%V:%V</dd>\', split[0], split[2]), ses);\n"
-"else\n"
-"http (sprintf (\'\\n<dt>Subject Item</dt><dd>%V%V</dd>\', split[1], split[2]), ses);\n"
-"prev_subj := subj;\n"
-"prev_pred := null;\n"
-"}\n"
-"if (prev_pred is null or (pred <> prev_pred))\n"
-"{\n"
-"if (prev_pred is not null)\n"
-"http (\'\\n</dd>\', ses);\n"
-"split := sparql_iri_split_rdfa_qname (pred, nsdict, 2);\n"
-"\n"
-"if (\'\' = split[1])\n"
-"http (sprintf (\'\\n<dt>%V</dt><dd>\', split[2]), ses);\n"
-"else if (isstring (split[0]))\n"
-"http (sprintf (\'\\n<dt>%V:%V</dt><dd>\', split[0], split[2]), ses);\n"
-"else\n"
-"http (sprintf (\'\\n<dt>%V%V</dt><dd>\', split[1], split[2]), ses);\n"
-"prev_pred := pred;\n"
-"obj_needs_br := 0;\n"
-"}\n"
-"if (obj is null)\n"
-"signal (\'RDFXX\', \'DB.DBA.TRIPLES_TO_HTML_MICRODATA: object is NULL\');\n"
-"if (obj_needs_br)\n"
-"http (\'\\n\', ses);\n"
-"else\n"
-"obj_needs_br := 1;\n"
-"obj_iri_split := sparql_iri_split_rdfa_qname (obj, nsdict, 2);\n"
-"if (isvector (obj_iri_split))\n"
-"{\n"
-"http (sprintf (\'\\n<a itemprop=\"%s\" href=\"%s\">\', replace (id_to_iri (pred), \'\"\', \'%22\'), replace (id_to_iri (obj), \'\"\', \'%22\')), ses);\n"
-"if (\'\' = obj_iri_split[1])\n"
-"http (sprintf (\'%V</a>\', obj_iri_split[2]), ses);\n"
-"else if (isstring (obj_iri_split[0]))\n"
-"http (sprintf (\'%V:%V</a>\', obj_iri_split[0], obj_iri_split[2]), ses);\n"
-"else\n"
-"http (sprintf (\'%V%V</a>\', obj_iri_split[1], obj_iri_split[2]), ses);\n"
-"}\n"
-"else\n"
-"{\n"
-"declare sqlval any;\n"
-"declare dt, lang, strval any;\n"
-"http (sprintf (\'\\n<span itemprop=\"%s\"\', replace (id_to_iri (pred), \'\"\', \'%22\')), ses);\n"
-"dt := 0; lang := 0;\n"
-"if (__tag of rdf_box = __tag (obj))\n"
-"{\n"
-"if (257 <> rdf_box_lang (obj))\n"
-"lang := coalesce ((select lower (RL_ID) from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = rdf_box_lang (obj)));\n"
-"\n"
-"\n"
-"sqlval := __rdf_sqlval_of_obj (obj, 1);\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"}\n"
-"else if (__tag (obj) not in (__tag of varchar, __tag of varbinary))\n"
-"{\n"
-"sqlval := obj;\n"
-"\n"
+"\n"
"}\n"
"else\n"
"sqlval := obj;\n"
@@ -4862,10 +4304,10 @@ static const char *proc154 =
"http (\'\\n</dd></dl>\', ses);\n"
"http (\'\\n</body></html>\\n\', ses);\n"
"}\n"
-"--src sparql.sql:4558\n";
+"--src sparql.sql:4028\n";
-static const char *proc155 =
-"#line 4747 \"[executable]/sparql.sql\"\n"
+static const char *proc137 =
+"#line 4210 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (inout triples any, inout ses any)\n"
"{\n"
"declare env, prev_subj, prev_pred any;\n"
@@ -4876,7 +4318,6 @@ static const char *proc155 =
"env := vector (0, 0, 0, null);\n"
"rowvector_subj_sort (triples, 1, 1);\n"
"rowvector_subj_sort (triples, 0, 1);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"prev_subj := prev_pred := null;\n"
"obj_needs_comma := 0;\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
@@ -5002,10 +4443,10 @@ static const char *proc155 =
"http (\'] } }\', ses);\n"
"http (\' }\\n\', ses);\n"
"}\n"
-"--src sparql.sql:4745\n";
+"--src sparql.sql:4208\n";
-static const char *proc156 =
-"#line 4886 \"[executable]/sparql.sql\"\n"
+static const char *proc138 =
+"#line 4348 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ATOM_XML (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5019,10 +4460,10 @@ static const char *proc156 =
"DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT (triples, 1, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:4884\n";
+"--src sparql.sql:4346\n";
-static const char *proc157 =
-"#line 4901 \"[executable]/sparql.sql\"\n"
+static const char *proc139 =
+"#line 4363 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.ODATA_EDM_TYPE (in obj any)\n"
"{\n"
"if (__tag of int = __tag (obj))\n"
@@ -5047,10 +4488,10 @@ static const char *proc157 =
"return \'Binary\';\n"
"return null;\n"
"}\n"
-"--src sparql.sql:4899\n";
+"--src sparql.sql:4361\n";
-static const char *proc158 =
-"#line 4927 \"[executable]/sparql.sql\"\n"
+static const char *proc140 =
+"#line 4389 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ODATA_JSON (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5064,10 +4505,10 @@ static const char *proc158 =
"DB.DBA.RDF_TRIPLES_TO_ODATA_JSON (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:4925\n";
+"--src sparql.sql:4387\n";
-static const char *proc159 =
-"#line 4942 \"[executable]/sparql.sql\"\n"
+static const char *proc141 =
+"#line 4404 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_ODATA_JSON (inout triples any, inout ses any)\n"
"{\n"
"declare tcount, tctr, ns_ctr integer;\n"
@@ -5081,7 +4522,6 @@ static const char *proc159 =
"ns_dict := dict_new ();\n"
"ns_ctr := 0;\n"
"tcount := length (triples);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"http (\'{ \"d\" : { \\n \"results\": [ \\n\', ses);\n"
"for (tctr := 0; tctr < tcount; tctr := tctr + 1)\n"
"{\n"
@@ -5151,10 +4591,10 @@ static const char *proc159 =
"}\n"
"http (sprintf (\'\\n ], \"__count\": \"%d\"\\n } }\', tcount), ses);\n"
"}\n"
-"--src sparql.sql:4940\n";
+"--src sparql.sql:4402\n";
-static const char *proc160 =
-"#line 5027 \"[executable]/sparql.sql\"\n"
+static const char *proc142 =
+"#line 4488 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT (inout triples any, in print_top_level integer, inout ses any)\n"
"{\n"
"declare tcount, tctr, ns_ctr integer;\n"
@@ -5170,7 +4610,6 @@ static const char *proc160 =
"ns_dict := dict_new ();\n"
"ns_ctr := 0; pct := 0;\n"
"tcount := length (triples);\n"
-"DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples);\n"
"if (print_top_level)\n"
"{\n"
"http (\'<?xml version=\"1.0\" encoding=\"utf-8\" ?>\\n<feed \\n\\t xmlns=\"http://www.w3.org/2005/Atom\" \\n\'||\n"
@@ -5362,10 +4801,10 @@ static const char *proc160 =
"http (\'</feed>\', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:5025\n";
+"--src sparql.sql:4486\n";
-static const char *proc161 =
-"#line 5241 \"[executable]/sparql.sql\"\n"
+static const char *proc143 =
+"#line 4701 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_INIT (inout _env any)\n"
"{\n"
"_env := string_output();\n"
@@ -5374,10 +4813,10 @@ static const char *proc161 =
"@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .\n"
"[ rdf:type rs:results ;\', _env);\n"
"}\n"
-"--src sparql.sql:5239\n";
+"--src sparql.sql:4699\n";
-static const char *proc162 =
-"#line 5251 \"[executable]/sparql.sql\"\n"
+static const char *proc144 =
+"#line 4711 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_ACC (inout _env any, inout colvalues any, inout colnames any)\n"
"{\n"
"declare col_ctr, col_count integer;\n"
@@ -5423,10 +4862,10 @@ static const char *proc162 =
"}\n"
"http (\'\\n ] ;\', _env);\n"
"}\n"
-"--src sparql.sql:5249\n";
+"--src sparql.sql:4709\n";
-static const char *proc163 =
-"#line 5298 \"[executable]/sparql.sql\"\n"
+static const char *proc145 =
+"#line 4758 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_FIN (inout _env any) returns long varchar\n"
"{\n"
"if (185 <> __tag(_env))\n"
@@ -5435,15 +4874,15 @@ static const char *proc163 =
"http (\'\\n ] .\', _env);\n"
"return string_output_string (_env);\n"
"}\n"
-"--src sparql.sql:5296\n";
+"--src sparql.sql:4756\n";
static const char *other16 =
"create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL (in colvalues any, in colnames any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_FIN\n"
"order\n";
-static const char *proc164 =
-"#line 5314 \"[executable]/sparql.sql\"\n"
+static const char *proc146 =
+"#line 4774 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_INIT (inout _env any)\n"
"{\n"
"_env := vector (0, 0, string_output());\n"
@@ -5452,10 +4891,10 @@ static const char *proc164 =
"@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .\n"
"_:_ <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2005/sparql-results#results> .\\n\', _env[2]);\n"
"}\n"
-"--src sparql.sql:5312\n";
+"--src sparql.sql:4772\n";
-static const char *proc165 =
-"#line 5324 \"[executable]/sparql.sql\"\n"
+static const char *proc147 =
+"#line 4784 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_ACC (inout _env any, inout colvalues any, inout colnames any)\n"
"{\n"
"declare col_ctr, col_count integer;\n"
@@ -5476,25 +4915,25 @@ static const char *proc165 =
"}\n"
"sparql_rset_nt_write_row (0, _env, colvalues);\n"
"}\n"
-"--src sparql.sql:5322\n";
+"--src sparql.sql:4782\n";
-static const char *proc166 =
-"#line 5346 \"[executable]/sparql.sql\"\n"
+static const char *proc148 =
+"#line 4806 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_FIN (inout _env any) returns long varchar\n"
"{\n"
"if (__tag of vector <> __tag(_env))\n"
"DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_INIT (_env);\n"
"return string_output_string (_env[2]);\n"
"}\n"
-"--src sparql.sql:5344\n";
+"--src sparql.sql:4804\n";
static const char *other17 =
"create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT (in colvalues any, in colnames any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_FIN\n"
"order\n";
-static const char *proc167 =
-"#line 5359 \"[executable]/sparql.sql\"\n"
+static const char *proc149 =
+"#line 4819 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_INIT (inout _env any)\n"
"{\n"
"_env := string_output();\n"
@@ -5504,10 +4943,10 @@ static const char *proc167 =
"xmlns:xsd=\"http://www.w3.org/2001/XMLSchema#\" >\n"
"<rs:results rdf:nodeID=\"rset\">\', _env);\n"
"}\n"
-"--src sparql.sql:5357\n";
+"--src sparql.sql:4817\n";
-static const char *proc168 =
-"#line 5370 \"[executable]/sparql.sql\"\n"
+static const char *proc150 =
+"#line 4830 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_ACC (inout _env any, inout colvalues any, inout colnames any)\n"
"{\n"
"declare sol_id varchar;\n"
@@ -5575,10 +5014,10 @@ static const char *proc168 =
"}\n"
"http (\'\\n </rs:result>\', _env);\n"
"}\n"
-"--src sparql.sql:5368\n";
+"--src sparql.sql:4828\n";
-static const char *proc169 =
-"#line 5439 \"[executable]/sparql.sql\"\n"
+static const char *proc151 =
+"#line 4899 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_FIN (inout _env any) returns long varchar\n"
"{\n"
"if (185 <> __tag(_env))\n"
@@ -5587,23 +5026,23 @@ static const char *proc169 =
"http (\'\\n </rs:results>\\n</rdf:RDF>\', _env);\n"
"return string_output_string (_env);\n"
"}\n"
-"--src sparql.sql:5437\n";
+"--src sparql.sql:4897\n";
static const char *other18 =
"create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML (in colvalues any, in colnames any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_FIN\n"
"order\n";
-static const char *proc170 =
-"#line 5454 \"[executable]/sparql.sql\"\n"
+static const char *proc152 =
+"#line 4914 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:5452\n";
+"--src sparql.sql:4912\n";
-static const char *proc171 =
-"#line 5460 \"[executable]/sparql.sql\"\n"
+static const char *proc153 =
+"#line 4920 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_ACC (inout _env any, inout colvalues any, inout colnames any)\n"
"{\n"
"declare sol_id varchar;\n"
@@ -5643,10 +5082,10 @@ static const char *proc171 =
"}\n"
"http(\'}\', _env);\n"
"}\n"
-"--src sparql.sql:5458\n";
+"--src sparql.sql:4918\n";
-static const char *proc172 =
-"#line 5501 \"[executable]/sparql.sql\"\n"
+static const char *proc154 =
+"#line 4961 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_FIN (inout _env any) returns long varchar\n"
"{\n"
"if (185 <> __tag(_env))\n"
@@ -5657,23 +5096,23 @@ static const char *proc172 =
"http (\' ] } }\', _env);\n"
"return string_output_string (_env);\n"
"}\n"
-"--src sparql.sql:5499\n";
+"--src sparql.sql:4959\n";
static const char *other19 =
"create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON (in colvalues any, in colnames any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_FIN\n"
"order\n";
-static const char *proc173 =
-"#line 5520 \"[executable]/sparql.sql\"\n"
+static const char *proc155 =
+"#line 4980 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:5518\n";
+"--src sparql.sql:4978\n";
-static const char *proc174 =
-"#line 5526 \"[executable]/sparql.sql\"\n"
+static const char *proc156 =
+"#line 4986 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE (inout _env any, in val any)\n"
"{\n"
"declare t integer;\n"
@@ -5694,10 +5133,10 @@ static const char *proc174 =
"http (replace (cast (val as varchar), \'\"\', \'\"\"\"\'), _env);\n"
"http (\'\"\', _env);\n"
"}\n"
-"--src sparql.sql:5524\n";
+"--src sparql.sql:4984\n";
-static const char *proc175 =
-"#line 5548 \"[executable]/sparql.sql\"\n"
+static const char *proc157 =
+"#line 5008 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC (inout _env any, inout colvalues any, inout colnames any)\n"
"{\n"
"declare sol_id varchar;\n"
@@ -5726,33 +5165,33 @@ static const char *proc175 =
"}\n"
"http(\'\\n\', _env);\n"
"}\n"
-"--src sparql.sql:5546\n";
+"--src sparql.sql:5006\n";
-static const char *proc176 =
-"#line 5578 \"[executable]/sparql.sql\"\n"
+static const char *proc158 =
+"#line 5038 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN (inout _env any) returns long varchar\n"
"{\n"
"if (185 <> __tag(_env))\n"
"return \'\';\n"
"return string_output_string (_env);\n"
"}\n"
-"--src sparql.sql:5576\n";
+"--src sparql.sql:5036\n";
static const char *other20 =
"create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV (in colvalues any, in colnames any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN\n"
"order\n";
-static const char *proc177 =
-"#line 5591 \"[executable]/sparql.sql\"\n"
+static const char *proc159 =
+"#line 5051 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:5589\n";
+"--src sparql.sql:5049\n";
-static const char *proc178 =
-"#line 5597 \"[executable]/sparql.sql\"\n"
+static const char *proc160 =
+"#line 5057 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_ACC (inout _env any, inout colvalues any, inout colnames any)\n"
"{\n"
"declare agg, colvalues_copy any;\n"
@@ -5769,10 +5208,10 @@ static const char *proc178 =
"vectorbld_acc (agg, colvalues_copy);\n"
"aset_zap_arg (_env, 0, agg);\n"
"}\n"
-"--src sparql.sql:5595\n";
+"--src sparql.sql:5055\n";
-static const char *proc179 =
-"#line 5615 \"[executable]/sparql.sql\"\n"
+static const char *proc161 =
+"#line 5075 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_FIN (inout _env any) returns long varchar\n"
"{\n"
"declare ses, metas, rset any;\n"
@@ -5799,15 +5238,15 @@ static const char *proc179 =
"}\n"
"return string_output_string (ses);\n"
"}\n"
-"--src sparql.sql:5613\n";
+"--src sparql.sql:5073\n";
static const char *other21 =
"create aggregate DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML (in colvalues any, in colnames any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT, DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_ACC, DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_FIN\n"
"order\n";
-static const char *proc180 =
-"#line 5648 \"[executable]/sparql.sql\"\n"
+static const char *proc162 =
+"#line 5108 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TTL (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5821,27 +5260,10 @@ static const char *proc180 =
"DB.DBA.RDF_TRIPLES_TO_TTL (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5646\n";
-
-static const char *proc181 =
-"#line 5663 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TRIG (inout triples_dict any) returns long varchar\n"
-"{\n"
-"declare triples, ses any;\n"
-"ses := string_output ();\n"
-"if (214 <> __tag (triples_dict))\n"
-"{\n"
-"triples := vector ();\n"
-"}\n"
-"else\n"
-"triples := dict_list_keys (triples_dict, 1);\n"
-"DB.DBA.RDF_TRIPLES_TO_TRIG (triples, ses);\n"
-"return ses;\n"
-"}\n"
-"--src sparql.sql:5661\n";
+"--src sparql.sql:5106\n";
-static const char *proc182 =
-"#line 5678 \"[executable]/sparql.sql\"\n"
+static const char *proc163 =
+"#line 5123 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_NT (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5855,10 +5277,10 @@ static const char *proc182 =
"DB.DBA.RDF_TRIPLES_TO_NT (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5676\n";
+"--src sparql.sql:5121\n";
-static const char *proc183 =
-"#line 5693 \"[executable]/sparql.sql\"\n"
+static const char *proc164 =
+"#line 5138 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDF_XML (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5872,10 +5294,10 @@ static const char *proc183 =
"DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT (triples, 1, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5691\n";
+"--src sparql.sql:5136\n";
-static const char *proc184 =
-"#line 5708 \"[executable]/sparql.sql\"\n"
+static const char *proc165 =
+"#line 5153 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TALIS_JSON (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5889,10 +5311,10 @@ static const char *proc184 =
"DB.DBA.RDF_TRIPLES_TO_TALIS_JSON (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5706\n";
+"--src sparql.sql:5151\n";
-static const char *proc185 =
-"#line 5723 \"[executable]/sparql.sql\"\n"
+static const char *proc166 =
+"#line 5168 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_LD (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5906,44 +5328,10 @@ static const char *proc185 =
"DB.DBA.RDF_TRIPLES_TO_JSON_LD (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5721\n";
-
-static const char *proc186 =
-"#line 5738 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_UL (inout triples_dict any) returns long varchar\n"
-"{\n"
-"declare triples, ses any;\n"
-"ses := string_output ();\n"
-"if (214 <> __tag (triples_dict))\n"
-"{\n"
-"triples := vector ();\n"
-"}\n"
-"else\n"
-"triples := dict_list_keys (triples_dict, 1);\n"
-"DB.DBA.RDF_TRIPLES_TO_HTML_UL (triples, ses);\n"
-"return ses;\n"
-"}\n"
-"--src sparql.sql:5736\n";
-
-static const char *proc187 =
-"#line 5753 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_TR (inout triples_dict any) returns long varchar\n"
-"{\n"
-"declare triples, ses any;\n"
-"ses := string_output ();\n"
-"if (214 <> __tag (triples_dict))\n"
-"{\n"
-"triples := vector ();\n"
-"}\n"
-"else\n"
-"triples := dict_list_keys (triples_dict, 1);\n"
-"DB.DBA.RDF_TRIPLES_TO_HTML_TR (triples, ses);\n"
-"return ses;\n"
-"}\n"
-"--src sparql.sql:5751\n";
+"--src sparql.sql:5166\n";
-static const char *proc188 =
-"#line 5768 \"[executable]/sparql.sql\"\n"
+static const char *proc167 =
+"#line 5183 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_MICRODATA (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5957,10 +5345,10 @@ static const char *proc188 =
"DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5766\n";
+"--src sparql.sql:5181\n";
-static const char *proc189 =
-"#line 5783 \"[executable]/sparql.sql\"\n"
+static const char *proc168 =
+"#line 5198 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_MICRODATA (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5974,10 +5362,10 @@ static const char *proc189 =
"DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5781\n";
+"--src sparql.sql:5196\n";
-static const char *proc190 =
-"#line 5798 \"[executable]/sparql.sql\"\n"
+static const char *proc169 =
+"#line 5213 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CSV (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -5991,10 +5379,10 @@ static const char *proc190 =
"DB.DBA.RDF_TRIPLES_TO_CSV (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5796\n";
+"--src sparql.sql:5211\n";
-static const char *proc191 =
-"#line 5813 \"[executable]/sparql.sql\"\n"
+static const char *proc170 =
+"#line 5228 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDFA_XHTML (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -6008,10 +5396,10 @@ static const char *proc191 =
"DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML (triples, ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5811\n";
+"--src sparql.sql:5226\n";
-static const char *proc192 =
-"#line 5828 \"[executable]/sparql.sql\"\n"
+static const char *proc171 =
+"#line 5243 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -6028,10 +5416,10 @@ static const char *proc192 =
"DB.DBA.RDF_TRIPLES_TO_CXML (triples, ses, accept, add_http_headers, 0);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5826\n";
+"--src sparql.sql:5241\n";
-static const char *proc193 =
-"#line 5846 \"[executable]/sparql.sql\"\n"
+static const char *proc172 =
+"#line 5261 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML_QRCODE (inout triples_dict any) returns long varchar\n"
"{\n"
"declare triples, ses any;\n"
@@ -6048,26 +5436,26 @@ static const char *proc193 =
"DB.DBA.RDF_TRIPLES_TO_CXML (triples, ses, accept, add_http_headers, 1);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5844\n";
+"--src sparql.sql:5259\n";
-static const char *proc194 =
-"#line 5865 \"[executable]/sparql.sql\"\n"
+static const char *proc173 =
+"#line 5280 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:5863\n";
+"--src sparql.sql:5278\n";
-static const char *proc195 =
-"#line 5872 \"[executable]/sparql.sql\"\n"
+static const char *proc174 =
+"#line 5287 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_ACC (inout _env any, inout one any)\n"
"{\n"
"_env := 1;\n"
"}\n"
-"--src sparql.sql:5870\n";
+"--src sparql.sql:5285\n";
-static const char *proc196 =
-"#line 5879 \"[executable]/sparql.sql\"\n"
+static const char *proc175 =
+"#line 5294 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_FIN (inout _env any) returns long varchar\n"
"{\n"
"declare ses any;\n"
@@ -6083,30 +5471,30 @@ static const char *proc196 =
"</sparql>\', ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5877\n";
+"--src sparql.sql:5292\n";
static const char *other22 =
"create aggregate DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML (inout one any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_INIT, DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_ACC, DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_FIN\n";
-static const char *proc197 =
-"#line 5901 \"[executable]/sparql.sql\"\n"
+static const char *proc176 =
+"#line 5316 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:5899\n";
+"--src sparql.sql:5314\n";
-static const char *proc198 =
-"#line 5908 \"[executable]/sparql.sql\"\n"
+static const char *proc177 =
+"#line 5323 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_ACC (inout _env any, inout one any)\n"
"{\n"
"_env := 1;\n"
"}\n"
-"--src sparql.sql:5906\n";
+"--src sparql.sql:5321\n";
-static const char *proc199 =
-"#line 5915 \"[executable]/sparql.sql\"\n"
+static const char *proc178 =
+"#line 5330 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_FIN (inout _env any) returns long varchar\n"
"{\n"
"declare ses any;\n"
@@ -6124,30 +5512,30 @@ static const char *proc199 =
"<rs:boolean rdf:datatype=\"http://www.w3.org/2001/XMLSchema#boolean\">\' || ans || \'</rs:boolean></rs:results></rdf:RDF>\', ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5913\n";
+"--src sparql.sql:5328\n";
static const char *other23 =
"create aggregate DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML (inout one any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_INIT, DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_ACC, DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_FIN\n";
-static const char *proc200 =
-"#line 5939 \"[executable]/sparql.sql\"\n"
+static const char *proc179 =
+"#line 5354 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:5937\n";
+"--src sparql.sql:5352\n";
-static const char *proc201 =
-"#line 5946 \"[executable]/sparql.sql\"\n"
+static const char *proc180 =
+"#line 5361 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC (inout _env any, inout one any)\n"
"{\n"
"_env := 1;\n"
"}\n"
-"--src sparql.sql:5944\n";
+"--src sparql.sql:5359\n";
-static const char *proc202 =
-"#line 5953 \"[executable]/sparql.sql\"\n"
+static const char *proc181 =
+"#line 5368 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_FIN (inout _env any) returns long varchar\n"
"{\n"
"declare ses any;\n"
@@ -6162,14 +5550,14 @@ static const char *proc202 =
"http (sprintf (\'[] rdf:type rs:results ; rs:boolean %s .\', ans), ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5951\n";
+"--src sparql.sql:5366\n";
static const char *other24 =
"create aggregate DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL (inout one any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_INIT, DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC, DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_FIN\n";
-static const char *proc203 =
-"#line 5974 \"[executable]/sparql.sql\"\n"
+static const char *proc182 =
+"#line 5389 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_NT_FIN (inout _env any) returns long varchar\n"
"{\n"
"declare ses any;\n"
@@ -6182,7 +5570,7 @@ static const char *proc203 =
"http (sprintf (\'_:_ <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2005/sparql-results#results> .\\n_:_ <http://www.w3.org/2005/sparql-results#boolean> \"%s\"^^<http://www.w3.org/2001/XMLSchema#boolean> .\\n\', ans), ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:5972\n";
+"--src sparql.sql:5387\n";
static const char *other25 =
"create aggregate DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_NT (inout one any) returns long varchar\n"
@@ -6194,8 +5582,8 @@ static const char *other26 =
"create aggregate DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL (inout one any) returns long varchar\n"
"from DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_INIT, DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC, DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_FIN\n";
-static const char *proc204 =
-"#line 6000 \"[executable]/sparql.sql\"\n"
+static const char *proc183 =
+"#line 5415 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV_FIN (inout _env any) returns long varchar\n"
"{\n"
"declare ans varchar;\n"
@@ -6204,7 +5592,7 @@ static const char *proc204 =
"else\n"
"return \'\"bool\"\\n0\\n\';\n"
"}\n"
-"--src sparql.sql:5998\n";
+"--src sparql.sql:5413\n";
static const char *other27 =
"create aggregate DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV (inout one any) returns long varchar\n"
@@ -6212,8 +5600,8 @@ static const char *other27 =
"DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC,\n"
"DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV_FIN\n";
-static const char *proc205 =
-"#line 6019 \"[executable]/sparql.sql\"\n"
+static const char *proc184 =
+"#line 5434 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_INSERT_TRIPLES_CL (inout graph_iri any, inout triples any, in log_mode integer := null)\n"
"{\n"
"declare is_text, ctr, old_log_enable, l integer;\n"
@@ -6280,10 +5668,10 @@ static const char *proc205 =
"if (ro_id_dict is not null)\n"
"DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH (graph_iri, ro_id_dict);\n"
"}\n"
-"--src sparql.sql:6017\n";
+"--src sparql.sql:5432\n";
-static const char *proc206 =
-"#line 6087 \"[executable]/sparql.sql\"\n"
+static const char *proc185 =
+"#line 5502 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_INSERT_TRIPLES (in graph_iri any, inout triples any, in log_mode integer := null)\n"
"{\n"
"declare ctr, old_log_enable integer;\n"
@@ -6336,10 +5724,10 @@ static const char *proc206 =
"DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH (graph_iri, ro_id_dict);\n"
"log_enable (old_log_enable, 1);\n"
"}\n"
-"--src sparql.sql:6085\n";
+"--src sparql.sql:5500\n";
-static const char *proc207 =
-"#line 6141 \"[executable]/sparql.sql\"\n"
+static const char *proc186 =
+"#line 5556 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_DELETE_TRIPLES (in graph_iri any, in triples any, in log_mode integer := null)\n"
"{\n"
"declare ctr, old_log_enable integer;\n"
@@ -6369,10 +5757,10 @@ static const char *proc207 =
"}\n"
"log_enable (old_log_enable, 1);\n"
"}\n"
-"--src sparql.sql:6139\n";
+"--src sparql.sql:5554\n";
-static const char *proc208 =
-"#line 6173 \"[executable]/sparql.sql\"\n"
+static const char *proc187 =
+"#line 5588 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_DELETE_TRIPLES_AGG (in graph_iid any, inout triples any, in log_mode integer := null)\n"
"{\n"
"declare ctr, old_log_enable, l integer;\n"
@@ -6435,27 +5823,27 @@ static const char *proc208 =
"log_enable (old_log_enable, 1);\n"
"}\n"
"}\n"
-"--src sparql.sql:6171\n";
+"--src sparql.sql:5586\n";
-static const char *proc209 =
-"#line 6237 \"[executable]/sparql.sql\"\n"
+static const char *proc188 =
+"#line 5652 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_MODIFY_TRIPLES (in graph_iri any, in del_triples any, in ins_triples any, in log_mode integer := null)\n"
"{\n"
"DB.DBA.RDF_DELETE_TRIPLES (graph_iri, del_triples, log_mode);\n"
"DB.DBA.RDF_INSERT_TRIPLES (graph_iri, ins_triples, log_mode);\n"
"}\n"
-"--src sparql.sql:6235\n";
+"--src sparql.sql:5650\n";
-static const char *proc210 =
-"#line 6245 \"[executable]/sparql.sql\"\n"
+static const char *proc189 =
+"#line 5660 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:6243\n";
+"--src sparql.sql:5658\n";
-static const char *proc211 =
-"#line 6252 \"[executable]/sparql.sql\"\n"
+static const char *proc190 =
+"#line 5667 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL (inout _env any, in graph_iri any, in opcodes any, in vars any, in log_mode integer, in ctor_op integer)\n"
"{\n"
"declare triple_ctr integer;\n"
@@ -6544,10 +5932,10 @@ static const char *proc211 =
"_env[ctor_op] := _env[ctor_op] + action_ctr;\n"
"log_enable (old_log_enable, 1);\n"
"}\n"
-"--src sparql.sql:6250\n";
+"--src sparql.sql:5665\n";
-static const char *proc212 =
-"#line 6343 \"[executable]/sparql.sql\"\n"
+static const char *proc191 =
+"#line 5758 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.SPARQL_DELETE_CTOR_ACC (inout _env any, in graph_iri any, in opcodes any, in vars any, in uid integer, in log_mode integer)\n"
"{\n"
"if (not (isarray (_env)))\n"
@@ -6556,10 +5944,10 @@ static const char *proc212 =
"__rgs_assert_cbk (graph_iri, uid, 2, \'SPARUL DELETE\');\n"
"DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL (_env, graph_iri, opcodes, vars, log_mode, 1);\n"
"}\n"
-"--src sparql.sql:6341\n";
+"--src sparql.sql:5756\n";
-static const char *proc213 =
-"#line 6354 \"[executable]/sparql.sql\"\n"
+static const char *proc192 =
+"#line 5769 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_INSERT_CTOR_ACC (inout _env any, in graph_iri any, in opcodes any, in vars any, in uid integer, in log_mode integer)\n"
"{\n"
"\n"
@@ -6569,10 +5957,10 @@ static const char *proc213 =
"__rgs_assert_cbk (graph_iri, uid, 2, \'SPARUL INSERT\');\n"
"DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL (_env, graph_iri, opcodes, vars, log_mode, 2);\n"
"}\n"
-"--src sparql.sql:6352\n";
+"--src sparql.sql:5767\n";
-static const char *proc214 =
-"#line 6366 \"[executable]/sparql.sql\"\n"
+static const char *proc193 =
+"#line 5781 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_MODIFY_CTOR_ACC (inout _env any, in graph_iri any, in del_opcodes any, in ins_opcodes any, in vars any, in uid integer, in log_mode integer)\n"
"{\n"
"if (not (isarray (_env)))\n"
@@ -6582,10 +5970,10 @@ static const char *proc214 =
"DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL (_env, graph_iri, del_opcodes, vars, log_mode, 1);\n"
"DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL (_env, graph_iri, ins_opcodes, vars, log_mode, 2);\n"
"}\n"
-"--src sparql.sql:6364\n";
+"--src sparql.sql:5779\n";
-static const char *proc215 =
-"#line 6378 \"[executable]/sparql.sql\"\n"
+static const char *proc194 =
+"#line 5793 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_FIN (inout _env any)\n"
"{\n"
"if (isarray (_env))\n"
@@ -6606,7 +5994,7 @@ static const char *proc215 =
"}\n"
"return _env;\n"
"}\n"
-"--src sparql.sql:6376\n";
+"--src sparql.sql:5791\n";
static const char *other28 =
" create aggregate DB.DBA.SPARQL_DELETE_CTOR (in graph_iri any, in opcodes any, in vars any, in uid integer, in log_mode integer) returns any\n"
@@ -6620,8 +6008,8 @@ static const char *other30 =
" create aggregate DB.DBA.SPARQL_MODIFY_CTOR (in graph_iri any, in del_opcodes any, in ins_opcodes any, in vars any, in uid integer, in log_mode integer) returns any\n"
"from DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_INIT, DB.DBA.SPARQL_MODIFY_CTOR_ACC, DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_FIN\n";
-static const char *proc216 =
-"#line 6415 \"[executable]/sparql.sql\"\n"
+static const char *proc195 =
+"#line 5830 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.SPARQL_INSERT_DICT_CONTENT (in graph_iri any, in triples_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any\n"
"{\n"
"declare triples any;\n"
@@ -6653,10 +6041,10 @@ static const char *proc216 =
"else\n"
"return ins_count;\n"
"}\n"
-"--src sparql.sql:6413\n";
+"--src sparql.sql:5828\n";
-static const char *proc217 =
-"#line 6448 \"[executable]/sparql.sql\"\n"
+static const char *proc196 =
+"#line 5863 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.SPARQL_DELETE_DICT_CONTENT (in graph_iri any, in triples_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any\n"
"{\n"
"declare triples any;\n"
@@ -6688,10 +6076,10 @@ static const char *proc217 =
"else\n"
"return del_count;\n"
"}\n"
-"--src sparql.sql:6446\n";
+"--src sparql.sql:5861\n";
-static const char *proc218 =
-"#line 6481 \"[executable]/sparql.sql\"\n"
+static const char *proc197 =
+"#line 5896 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.SPARQL_MODIFY_BY_DICT_CONTENTS (in graph_iri any, in del_triples_dict any, in ins_triples_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any\n"
"{\n"
"declare del_count, ins_count integer;\n"
@@ -6723,10 +6111,10 @@ static const char *proc218 =
"else\n"
"return del_count + ins_count;\n"
"}\n"
-"--src sparql.sql:6479\n";
+"--src sparql.sql:5894\n";
-static const char *proc219 =
-"#line 6515 \"[executable]/sparql.sql\"\n"
+static const char *proc198 =
+"#line 5930 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_REPL_DEL (inout rquads any)\n"
"{\n"
"declare rquads_ctr, rquads_count, opcode integer;\n"
@@ -6795,66 +6183,50 @@ static const char *proc219 =
"connection_set (\'g_dict\', null);\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:6513\n";
+"--src sparql.sql:5928\n";
-static const char *proc220 =
-"#line 6588 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARUL_CLEAR (in graph_iris any, in inside_sponge integer, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any\n"
+static const char *proc199 =
+"#line 6003 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.SPARUL_CLEAR (in graph_iri any, in inside_sponge integer, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0) returns any\n"
"{\n"
+"declare g any;\n"
"declare g_iid IRI_ID;\n"
"declare old_log_enable integer;\n"
-"declare txtreport varchar;\n"
-"txtreport := \'\';\n"
-"if (__tag of vector <> __tag (graph_iris))\n"
-"graph_iris := vector (graph_iris);\n"
-"foreach (any g_iri in graph_iris) do\n"
-"{\n"
-"if (isiri_id (g_iri))\n"
-"g_iri := id_to_iri (g_iri);\n"
-"g_iid := iri_to_id (g_iri);\n"
-"__rgs_assert_cbk (g_iri, uid, 2, \'SPARUL CLEAR GRAPH\');\n"
-"}\n"
-"foreach (any g_iri in graph_iris) do\n"
-"{\n"
-"if (isiri_id (g_iri))\n"
-"g_iri := id_to_iri (g_iri);\n"
-"g_iid := iri_to_id (g_iri);\n"
+"g := graph_iri;\n"
+"if (isiri_id (g))\n"
+"g := id_to_iri (g);\n"
+"g_iid := iri_to_id (g);\n"
+"__rgs_assert_cbk (graph_iri, uid, 2, \'SPARUL CLEAR GRAPH\');\n"
"if (__rdf_graph_is_in_enabled_repl (g_iid))\n"
"{\n"
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue()\');\n"
-"repl_text (\'__rdf_repl\', \'sparql define input:storage \"\" clear graph iri ( ?? )\', g_iri);\n"
+"repl_text (\'__rdf_repl\', \'sparql define input:storage \"\" clear graph iri ( ?? )\', g);\n"
"}\n"
"old_log_enable := log_enable (log_mode, 1);\n"
"declare exit handler for sqlstate \'*\' { log_enable (old_log_enable, 1); resignal; };\n"
"exec (sprintf (\'\n"
"delete from DB.DBA.RDF_QUAD\n"
-"where G = __i2id (\'\'%S\'\') \', g_iri));\n"
+"where G = __i2id (\'\'%S\'\') \', g));\n"
"cl_exec (\'delete from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS, index_only, no cluster) where G = ? option (index RDF_QUAD_GS)\', vector (g_iid));\n"
"delete from DB.DBA.RDF_OBJ_RO_FLAGS_WORDS\n"
"where VT_WORD = rdf_graph_keyword (g_iid);\n"
"if (not inside_sponge)\n"
"{\n"
-"delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI = g_iri;\n"
-"delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI like concat (\'destMD5=\', md5 (g_iri), \'&graphMD5=%\');\n"
-"}\n"
-"if (compose_report)\n"
-"{\n"
-"if (txtreport <> \'\')\n"
-"txtreport := txtreport || \'\\n\';\n"
-"txtreport := txtreport || sprintf (\'Clear graph <%s> -- done\', g_iri);\n"
-"}\n"
+"delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI = g;\n"
+"delete from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI like concat (\'destMD5=\', md5 (g), \'&graphMD5=%\');\n"
"}\n"
"/*091202 commit work; */\n"
"log_enable (old_log_enable, 1);\n"
"if (compose_report)\n"
-"return txtreport;\n"
+"return sprintf (\'Clear <%s> -- done\', g);\n"
+"else\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:6586\n";
+"--src sparql.sql:6001\n";
-static const char *proc221 =
-"#line 6641 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARUL_LOAD (in graph_iri any, in resource varchar, in uid integer, in log_mode integer, in compose_report integer, in options any := null, in silent integer := 0) returns any\n"
+static const char *proc200 =
+"#line 6040 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.SPARUL_LOAD (in graph_iri any, in resource varchar, in uid integer, in log_mode integer, in compose_report integer) returns any\n"
"{\n"
"declare old_log_enable integer;\n"
"declare grab_params any;\n"
@@ -6862,21 +6234,18 @@ static const char *proc221 =
"declare res integer;\n"
"__rgs_assert_cbk (graph_iri, uid, 2, \'SPARUL LOAD\');\n"
"old_log_enable := log_enable (log_mode, 1);\n"
-"declare exit handler for sqlstate \'*\' { log_enable (old_log_enable, 1); if (silent) goto fail; resignal; };\n"
+"declare exit handler for sqlstate \'*\' { log_enable (old_log_enable, 1); resignal; };\n"
"grabbed := dict_new();\n"
"if (isiri_id (graph_iri))\n"
"graph_iri := id_to_iri (graph_iri);\n"
-"grab_params := vector_concat (vector (\n"
-"\'base_iri\', resource,\n"
-"\'get:destination\', graph_iri,\n"
+"grab_params := vector (\'base_iri\', resource, \'get:destination\', graph_iri,\n"
"\'resolver\', \'DB.DBA.RDF_GRAB_RESOLVER_DEFAULT\', \'loader\', \'DB.DBA.RDF_SPONGE_UP\',\n"
-"\'get:soft\', get_keyword (\'get:soft\', options, \'replacing\'),\n"
-"\'get:refresh\', get_keyword (\'get:refresh\', options, -1),\n"
-"\'get:error-recovery\', get_keyword (\'get:error-recovery\', options, \'signal\'),\n"
+"\'get:soft\', \'replacing\',\n"
+"\'get:refresh\', -1,\n"
+"\'get:error-recovery\', \'signal\',\n"
"\n"
-"\'get:strategy\', get_keyword (\'get:strategy\', options, \'rdfa-only\'),\n"
-"\'grabbed\', grabbed ),\n"
-"options );\n"
+"\'get:strategy\', \'rdfa-only\',\n"
+"\'grabbed\', grabbed );\n"
"commit work;\n"
"res := DB.DBA.RDF_GRAB_SINGLE (resource, grabbed, grab_params);\n"
"commit work;\n"
@@ -6895,17 +6264,12 @@ static const char *proc221 =
"else\n"
"return 0;\n"
"}\n"
-"fail:\n"
-"if (compose_report)\n"
-"return sprintf (\'Load silent <%s> into graph <%s> -- failed: %s: %s\', resource, graph_iri, __SQL_STATE, __SQL_MESSAGE);\n"
-"else\n"
-"return 0;\n"
"}\n"
-"--src sparql.sql:6639\n";
+"--src sparql.sql:6038\n";
-static const char *proc222 =
-"#line 6690 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARUL_CREATE (in graph_iri any, in silent1 integer, in uid integer, in log_mode integer, in compose_report integer, in options any := null, in silent integer := 0) returns any\n"
+static const char *proc201 =
+"#line 6081 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.SPARUL_CREATE (in graph_iri any, in silent integer, in uid integer, in log_mode integer, in compose_report integer) returns any\n"
"{\n"
"declare g_iid IRI_ID;\n"
"declare old_log_enable integer;\n"
@@ -6913,8 +6277,6 @@ static const char *proc222 =
"g_iid := iri_to_id (graph_iri);\n"
"if (__rdf_graph_is_in_enabled_repl (g_iid))\n"
"repl_text (\'__rdf_repl\', \'sparql define input:storage \"\" create graph iri ( ?? )\', graph_iri);\n"
-"if ((silent1 is not null) and silent1)\n"
-"silent := 1;\n"
"if (exists (select top 1 1 from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid))\n"
"{\n"
"if (silent)\n"
@@ -6955,94 +6317,72 @@ static const char *proc222 =
"else\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:6688\n";
+"--src sparql.sql:6079\n";
-static const char *proc223 =
-"#line 6742 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARUL_DROP (in graph_iris any, in silent1 integer, in uid integer, in log_mode integer, in compose_report integer, in options any := null, in silent integer := 0) returns any\n"
+static const char *proc202 =
+"#line 6131 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.SPARUL_DROP (in graph_iri any, in silent integer, in uid integer, in log_mode integer, in compose_report integer) returns any\n"
"{\n"
"declare g_iid IRI_ID;\n"
"declare old_log_enable integer;\n"
-"declare txtreport varchar;\n"
-"txtreport := \'\';\n"
-"if ((silent1 is not null) and silent1)\n"
-"silent := 1;\n"
-"if (__tag of vector <> __tag (graph_iris))\n"
-"graph_iris := vector (graph_iris);\n"
-"foreach (any g_iri in graph_iris) do\n"
-"{\n"
-"if (isiri_id (g_iri))\n"
-"g_iri := id_to_iri (g_iri);\n"
-"g_iid := iri_to_id (g_iri);\n"
-"__rgs_assert_cbk (g_iri, uid, 2, \'SPARUL DROP GRAPH\');\n"
-"}\n"
-"foreach (any g_iri in graph_iris) do\n"
-"{\n"
-"if (isiri_id (g_iri))\n"
-"g_iri := id_to_iri (g_iri);\n"
-"g_iid := iri_to_id (g_iri);\n"
+"__rgs_assert_cbk (graph_iri, uid, 2, \'SPARUL DROP GRAPH\');\n"
+"g_iid := iri_to_id (graph_iri);\n"
"if (__rdf_graph_is_in_enabled_repl (g_iid))\n"
"{\n"
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue()\');\n"
-"repl_text (\'__rdf_repl\', \'sparql define input:storage \"\" drop graph iri ( ?? )\', g_iri);\n"
+"repl_text (\'__rdf_repl\', \'sparql define input:storage \"\" drop graph iri ( ?? )\', graph_iri);\n"
"}\n"
"old_log_enable := log_enable (log_mode, 1);\n"
"declare exit handler for sqlstate \'*\' { log_enable (old_log_enable, 1); resignal; };\n"
-"if (not exists (select top 1 1 from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid))\n"
+"if (not exists (select top 1 1 from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = iri_to_id (graph_iri)))\n"
"{\n"
"if (silent)\n"
"{\n"
-"if (exists (select top 1 1 from DB.DBA.RDF_QUAD where G = g_iid))\n"
+"if (exists (select top 1 1 from DB.DBA.RDF_QUAD where G = iri_to_id (graph_iri)))\n"
"{\n"
-"DB.DBA.SPARUL_CLEAR (g_iri, 0, uid);\n"
+"DB.DBA.SPARUL_CLEAR (graph_iri, 0, uid);\n"
"log_enable (old_log_enable, 1);\n"
"if (compose_report)\n"
-"return sprintf (\'Drop silent graph <%s> -- graph has not been explicitly created before, triples were removed\', g_iri);\n"
+"return sprintf (\'Drop silent graph <%s> -- graph has not been explicitly created before, triples were removed\', graph_iri);\n"
"else\n"
"return 2;\n"
"}\n"
"if (compose_report)\n"
-"return sprintf (\'Drop silent graph <%s> -- nothing to do\', g_iri);\n"
+"return sprintf (\'Drop silent graph <%s> -- nothing to do\', graph_iri);\n"
"else\n"
"return 0;\n"
"}\n"
"else\n"
-"signal (\'22023\', \'SPARUL_DROP() failed: graph <\' || g_iri || \'> has not been explicitly created before\');\n"
+"signal (\'22023\', \'SPARUL_DROP() failed: graph <\' || graph_iri || \'> has not been explicitly created before\');\n"
"}\n"
"if (silent)\n"
"{\n"
-"DB.DBA.SPARUL_CLEAR (g_iri, 0, uid);\n"
-"delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid;\n"
+"DB.DBA.SPARUL_CLEAR (graph_iri, 0, uid);\n"
+"delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = iri_to_id (graph_iri);\n"
"/*091202 commit work; */\n"
"log_enable (old_log_enable, 1);\n"
"if (compose_report)\n"
-"return sprintf (\'Drop silent graph <%s> -- done\', g_iri);\n"
+"return sprintf (\'Drop silent graph <%s> -- done\', graph_iri);\n"
"else\n"
"return 1;\n"
"}\n"
"if (exists (sparql define input:storage \"\"\n"
"ask from <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"where { ?qmv virtrdf:qmGraphRange-rvrFixedValue `iri(?:g_iri)` } ) )\n"
-"signal (\'22023\', \'SPARUL_DROP() failed: graph <\' || g_iri || \'> is used for mapping relational data to RDF\');\n"
-"DB.DBA.SPARUL_CLEAR (g_iri, 0, uid);\n"
-"delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = g_iid;\n"
-"if (compose_report)\n"
-"{\n"
-"if (txtreport <> \'\')\n"
-"txtreport := txtreport || \'\\n\';\n"
-"txtreport := txtreport || sprintf (\'Drop graph <%s> -- done\', g_iri);\n"
-"}\n"
-"}\n"
+"where { ?qmv virtrdf:qmGraphRange-rvrFixedValue `iri(?:graph_iri)` } ) )\n"
+"signal (\'22023\', \'SPARUL_CREATE() failed: graph <\' || graph_iri || \'> is used for mapping relational data to RDF\');\n"
+"DB.DBA.SPARUL_CLEAR (graph_iri, 0, uid);\n"
+"delete from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH where REC_GRAPH_IID = iri_to_id (graph_iri);\n"
"log_enable (old_log_enable, 1);\n"
"/*091202 commit work; */\n"
"if (compose_report)\n"
-"return txtreport;\n"
+"return sprintf (\'Drop graph <%s> -- done\', graph_iri);\n"
+"else\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:6740\n";
+"--src sparql.sql:6129\n";
-static const char *proc224 =
-"#line 6824 \"[executable]/sparql.sql\"\n"
+static const char *proc203 =
+"#line 6191 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.SPARUL_RUN (in results any, in compose_report integer := 0) returns any\n"
"{\n"
"\n"
@@ -7068,281 +6408,53 @@ static const char *proc224 =
"return res;\n"
"}\n"
"}\n"
-"--src sparql.sql:6822\n";
+"--src sparql.sql:6189\n";
-static const char *proc225 =
-"#line 6853 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARQL_INSERT_QUAD_DICT_CONTENT (in dflt_graph_iri any, in quads_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any\n"
-"{\n"
-"declare ins_count, ins_grp_count integer;\n"
-"declare res_ses any;\n"
-"ins_count := 0;\n"
-"ins_grp_count := 0;\n"
-"if (__tag of vector = __tag (dflt_graph_iri))\n"
-"{\n"
-"ins_count := dflt_graph_iri[2];\n"
-"dflt_graph_iri := dflt_graph_iri[0];\n"
-"}\n"
-"while (dict_size (quads_dict) > 0)\n"
-"{\n"
-"declare quads, groups any;\n"
-"declare group_ctr, group_count, g_ins_count integer;\n"
-"quads := dict_destructive_list_rnd_keys (quads_dict, 80000);\n"
-"rowvector_graph_sort (quads, 3, 1);\n"
-"groups := rowvector_graph_partition (quads, 3);\n"
-"group_count := length (groups);\n"
-"for (group_ctr := 0; group_ctr < group_count; group_ctr := group_ctr+1)\n"
-"{\n"
-"declare g_group, g any;\n"
-"g_group := aref_set_0 (groups, group_ctr);\n"
-"g := aref_or_default (g_group, 0, 3, dflt_graph_iri);\n"
-"__rgs_assert_cbk (g, uid, 2, \'SPARQL 1.1 INSERT\');\n"
-"DB.DBA.RDF_INSERT_TRIPLES (g, g_group, log_mode);\n"
-"g_ins_count := length (g_group);\n"
-"ins_count := ins_count + g_ins_count;\n"
-"ins_grp_count := ins_grp_count + 1;\n"
-"if (isiri_id (g))\n"
-"g := id_to_iri (g);\n"
-"if (g is not null and __rdf_graph_is_in_enabled_repl (iri_to_id (g)))\n"
-"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
-"if (compose_report and ins_grp_count < 1000)\n"
+static const char *proc204 =
+"#line 6218 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS (in return_iris integer := 1, in lim integer := 2000000000)\n"
"{\n"
-"if (group_ctr)\n"
-"http (\'\\n\', res_ses);\n"
+"declare specials, specials_vec any;\n"
+"declare last_iri_id, cur_iri_id IRI_ID;\n"
+"declare cr cursor for select G from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where G > last_iri_id and not (dict_get (specials, G, 0));\n"
+"declare cr_cl cursor for select G from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where G > last_iri_id and 0 >= position (G, specials_vec);\n"
+"declare GRAPH_IRI varchar;\n"
+"declare GRAPH_IID IRI_ID;\n"
+"declare ctr, len integer;\n"
+"if (return_iris)\n"
+"result_names (GRAPH_IRI);\n"
"else\n"
-"res_ses := string_output();\n"
-"http (sprintf (\'Insert into <%s>, %d (or less) quads -- done\', g, g_ins_count), res_ses);\n"
-"}\n"
-"}\n"
-"}\n"
-"if (compose_report)\n"
+"result_names (GRAPH_IID);\n"
+"specials := dict_new (50);\n"
+"set isolation = \'repeatable\';\n"
+"for (sparql define input:storage \"\"\n"
+"select distinct ?graph_rvr_fixed\n"
+"from <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"where { ?qmv virtrdf:qmGraphRange-rvrFixedValue ?graph_rvr_fixed } ) do\n"
"{\n"
-"if (ins_grp_count >= 1000)\n"
-"return sprintf (\'Insert into %d (or more) graphs, total %d (or less) quads -- done\', ins_grp_count, ins_count);\n"
-"if (ins_count)\n"
-"return string_output_string (res_ses);\n"
-"else\n"
-"return sprintf (\'Insert into <%s>, 0 quads -- nothing to do\', dflt_graph_iri);\n"
-"}\n"
-"else\n"
-"return ins_count;\n"
+"dict_put (specials, iri_to_id (\"graph_rvr_fixed\"), 1);\n"
"}\n"
-"--src sparql.sql:6851\n";
-
-static const char *proc226 =
-"#line 6911 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARQL_DELETE_QUAD_DICT_CONTENT (in dflt_graph_iri any, in quads_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any\n"
-"{\n"
-"declare del_count, del_grp_count integer;\n"
-"declare res_ses any;\n"
-"del_count := 0;\n"
-"del_grp_count := 0;\n"
-"if (__tag of vector = __tag (dflt_graph_iri))\n"
-"{\n"
-"del_count := dflt_graph_iri[2];\n"
-"dflt_graph_iri := dflt_graph_iri[0];\n"
-"}\n"
-"while (dict_size (quads_dict) > 0)\n"
-"{\n"
-"declare quads, groups any;\n"
-"declare group_ctr, group_count, g_del_count integer;\n"
-"quads := dict_destructive_list_rnd_keys (quads_dict, 80000);\n"
-"rowvector_graph_sort (quads, 3, 1);\n"
-"groups := rowvector_graph_partition (quads, 3);\n"
-"group_count := length (groups);\n"
-"for (group_ctr := 0; group_ctr < group_count; group_ctr := group_ctr+1)\n"
-"{\n"
-"declare g_group, g any;\n"
-"g_group := aref_set_0 (groups, group_ctr);\n"
-"g := aref_or_default (g_group, 0, 3, dflt_graph_iri);\n"
-"__rgs_assert_cbk (g, uid, 2, \'SPARQL 1.1L DELETE\');\n"
-"DB.DBA.RDF_DELETE_TRIPLES (g, g_group, log_mode);\n"
-"g_del_count := length (g_group);\n"
-"del_count := del_count + g_del_count;\n"
-"del_grp_count := del_grp_count + 1;\n"
-"if (isiri_id (g))\n"
-"g := id_to_iri (g);\n"
-"if (g is not null and __rdf_graph_is_in_enabled_repl (iri_to_id (g)))\n"
-"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
-"if (compose_report and del_grp_count < 1000)\n"
+"if (dict_size (specials) >= lim)\n"
+"goto done_all;\n"
+"for (select REC_GRAPH_IID from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH) do\n"
"{\n"
-"if (group_ctr)\n"
-"http (\'\\n\', res_ses);\n"
-"else\n"
-"res_ses := string_output();\n"
-"http (sprintf (\'Delete from <%s>, %d (or less) quads -- done\', g, g_del_count), res_ses);\n"
-"}\n"
-"}\n"
+"dict_put (specials, REC_GRAPH_IID, 2);\n"
"}\n"
-"if (compose_report)\n"
-"{\n"
-"if (del_grp_count >= 1000)\n"
-"return sprintf (\'Delete from %d (or more) graphs, total %d (or less) quads -- done\', del_grp_count, del_count);\n"
-"if (del_count)\n"
-"return string_output_string (res_ses);\n"
-"else\n"
-"return sprintf (\'Delete from <%s>, 0 quads -- nothing to do\', dflt_graph_iri);\n"
-"}\n"
-"else\n"
-"return del_count;\n"
-"}\n"
-"--src sparql.sql:6909\n";
-
-static const char *proc227 =
-"#line 6968 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS (in dflt_graph_iri any, in del_quads_dict any, in ins_quads_dict any, in uid integer, in log_mode integer := null, in compose_report integer := 0) returns any\n"
-"{\n"
-"declare del_count, ins_count integer;\n"
-"declare del_rep, ins_rep any;\n"
-"del_count := 0;\n"
-"ins_count := 0;\n"
-"if (__tag of vector = __tag (dflt_graph_iri))\n"
-"{\n"
-"del_count := dflt_graph_iri[1];\n"
-"ins_count := dflt_graph_iri[2];\n"
-"dflt_graph_iri := dflt_graph_iri[0];\n"
-"}\n"
-"if (del_quads_dict is not null)\n"
-"{\n"
-"del_count := del_count + dict_size (del_quads_dict);\n"
-"del_rep := DB.DBA.SPARQL_DELETE_QUAD_DICT_CONTENT (dflt_graph_iri, del_quads_dict, uid, log_mode, compose_report);\n"
-"}\n"
-"else if (compose_report)\n"
-"del_rep := \'\';\n"
-"else\n"
-"del_rep := 0;\n"
-"if (ins_quads_dict is not null)\n"
-"{\n"
-"ins_count := ins_count + dict_size (ins_quads_dict);\n"
-"ins_rep := DB.DBA.SPARQL_INSERT_QUAD_DICT_CONTENT (dflt_graph_iri, ins_quads_dict, uid, log_mode, compose_report);\n"
-"}\n"
-"else if (compose_report)\n"
-"ins_rep := \'\';\n"
-"else\n"
-"ins_rep := 0;\n"
-"if (compose_report)\n"
-"return concat (del_rep, case when ins_rep <> \'\' and del_rep <> \'\' then \'\\n\' else \'\' end, ins_rep);\n"
-"else\n"
-"return del_count + ins_count;\n"
-"}\n"
-"--src sparql.sql:6966\n";
-
-static const char *proc228 =
-"#line 7005 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARUL_COPYMOVEADD_IMPL (in opname varchar, in src_g_iri any, in tgt_g_iri any, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any\n"
-"{\n"
-"declare src_g_iid IRI_ID;\n"
-"declare tgt_g_iid IRI_ID;\n"
-"declare old_log_enable, src_repl, tgt_repl integer;\n"
-"declare qry, stat, msg varchar;\n"
-"if (isiri_id (src_g_iri))\n"
-"src_g_iri := id_to_iri (src_g_iri);\n"
-"src_g_iid := iri_to_id (src_g_iri);\n"
-"if (isiri_id (tgt_g_iri))\n"
-"tgt_g_iri := id_to_iri (tgt_g_iri);\n"
-"tgt_g_iid := iri_to_id (tgt_g_iri);\n"
-"__rgs_assert_cbk (tgt_g_iri, uid, 2, \'SPARQL 1.1 \' || opname);\n"
-"__rgs_assert_cbk (src_g_iri, uid, case (opname) when \'MOVE\' then 2 else 1 end, \'SPARQL 1.1 \' || opname);\n"
-"src_repl := __rdf_graph_is_in_enabled_repl (src_g_iid);\n"
-"tgt_repl := __rdf_graph_is_in_enabled_repl (tgt_g_iid);\n"
-"if (src_repl and not tgt_repl)\n"
-"signal (\'22023\', sprintf (\'SPARQL 1.1 can not %s replicated graph <%s> to non-replicated graph <%s>, both should be in same replication status\', src_g_iri, tgt_g_iri));\n"
-"if (tgt_repl and not src_repl)\n"
-"signal (\'22023\', sprintf (\'SPARQL 1.1 can not %s non-replicated graph <%s> to replicated graph <%s>, both should be in same replication status\', src_g_iri, tgt_g_iri));\n"
-"if (\'ADD\' <> opname)\n"
-"DB.DBA.SPARUL_CLEAR (tgt_g_iri, 0, uid, log_mode, 0, options, silent);\n"
-"if (src_repl and tgt_repl)\n"
-"{\n"
-"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue()\');\n"
-"repl_text (\'__rdf_repl\', \'sparql define input:storage \"\" add iri( ?? ) to iri( ?? )\', src_g_iri, tgt_g_iri);\n"
-"}\n"
-"old_log_enable := log_enable (log_mode, 1);\n"
-"declare exit handler for sqlstate \'*\' { log_enable (old_log_enable, 1); resignal; };\n"
-"stat := \'00000\';\n"
-"qry := sprintf (\'insert soft DB.DBA.RDF_QUAD (G,S,P,O) select __i2id (\'\'%S\'\'), t.S, t.P, t.O from DB.DBA.RDF_QUAD t where t.G = __i2id (\'\'%S\'\') \',\n"
-"tgt_g_iri, src_g_iri );\n"
-"exec (qry, stat, msg);\n"
-"if (stat <> \'00000\')\n"
-"signal (stat, msg);\n"
-"if (\'MOVE\' = opname)\n"
-"DB.DBA.SPARUL_CLEAR (src_g_iri, 0, uid, log_mode, 0, options, silent);\n"
-"/*091202 commit work; */\n"
-"log_enable (old_log_enable, 1);\n"
-"if (compose_report)\n"
-"return sprintf (\'%s <%s> to <%s> -- done\', opname, src_g_iri, tgt_g_iri);\n"
-"return 1;\n"
-"}\n"
-"--src sparql.sql:7003\n";
-
-static const char *proc229 =
-"#line 7050 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARUL_COPY (in src_g_iri any, in tgt_g_iri any, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any\n"
-"{\n"
-"return DB.DBA.SPARUL_COPYMOVEADD_IMPL (\'COPY\', src_g_iri, tgt_g_iri, uid, log_mode, compose_report, options, silent);\n"
-"}\n"
-"--src sparql.sql:7048\n";
-
-static const char *proc230 =
-"#line 7056 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARUL_MOVE (in src_g_iri any, in tgt_g_iri any, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any\n"
-"{\n"
-"return DB.DBA.SPARUL_COPYMOVEADD_IMPL (\'MOVE\', src_g_iri, tgt_g_iri, uid, log_mode, compose_report, options, silent);\n"
-"}\n"
-"--src sparql.sql:7054\n";
-
-static const char *proc231 =
-"#line 7062 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.SPARUL_ADD (in src_g_iri any, in tgt_g_iri any, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any\n"
-"{\n"
-"return DB.DBA.SPARUL_COPYMOVEADD_IMPL (\'ADD\', src_g_iri, tgt_g_iri, uid, log_mode, compose_report, options, silent);\n"
-"}\n"
-"--src sparql.sql:7060\n";
-
-static const char *proc232 =
-"#line 7068 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS (in return_iris integer := 1, in lim integer := 2000000000)\n"
-"{\n"
-"declare specials, specials_vec any;\n"
-"declare last_iri_id, cur_iri_id IRI_ID;\n"
-"declare cr cursor for select G from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where G > last_iri_id and not (dict_get (specials, G, 0));\n"
-"declare cr_cl cursor for select G from DB.DBA.RDF_QUAD table option (index RDF_QUAD_GS) where G > last_iri_id and 0 >= position (G, specials_vec);\n"
-"declare GRAPH_IRI varchar;\n"
-"declare GRAPH_IID IRI_ID;\n"
-"declare ctr, len integer;\n"
-"if (return_iris)\n"
-"result_names (GRAPH_IRI);\n"
-"else\n"
-"result_names (GRAPH_IID);\n"
-"specials := dict_new (50);\n"
-"set isolation = \'repeatable\';\n"
-"for (sparql define input:storage \"\"\n"
-"select distinct ?graph_rvr_fixed\n"
-"from <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"where { ?qmv virtrdf:qmGraphRange-rvrFixedValue ?graph_rvr_fixed } ) do\n"
-"{\n"
-"dict_put (specials, iri_to_id (\"graph_rvr_fixed\"), 1);\n"
-"}\n"
-"if (dict_size (specials) >= lim)\n"
-"goto done_all;\n"
-"for (select REC_GRAPH_IID from DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH) do\n"
-"{\n"
-"dict_put (specials, REC_GRAPH_IID, 2);\n"
-"}\n"
-"len := dict_size (specials);\n"
-"if (len >= lim)\n"
-"goto done_all;\n"
-"last_iri_id := #i0;\n"
-"\n"
-"\n"
-"\n"
-"specials_vec := dict_list_keys (specials, 0);\n"
-"whenever not found goto done_rdf_quad_cl;\n"
-"open cr_cl (prefetch 1);\n"
-"\n"
-"next_fetch_cr_cl:\n"
-"fetch cr_cl into cur_iri_id;\n"
-"if (return_iris)\n"
-"result (id_to_iri (cur_iri_id));\n"
+"len := dict_size (specials);\n"
+"if (len >= lim)\n"
+"goto done_all;\n"
+"last_iri_id := #i0;\n"
+"\n"
+"\n"
+"\n"
+"specials_vec := dict_list_keys (specials, 0);\n"
+"whenever not found goto done_rdf_quad_cl;\n"
+"open cr_cl (prefetch 1);\n"
+"\n"
+"next_fetch_cr_cl:\n"
+"fetch cr_cl into cur_iri_id;\n"
+"if (return_iris)\n"
+"result (id_to_iri (cur_iri_id));\n"
"else\n"
"result (cur_iri_id);\n"
"lim := lim - 1;\n"
@@ -7386,10 +6498,10 @@ static const char *proc232 =
"else\n"
"result (specials[ctr]);\n"
"}\n"
-"--src sparql.sql:7066\n";
+"--src sparql.sql:6216\n";
-static const char *proc233 =
-"#line 7160 \"[executable]/sparql.sql\"\n"
+static const char *proc205 =
+"#line 6310 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_REGEX (in s varchar, in p varchar, in coll varchar := null)\n"
"{\n"
"if (not iswidestring (s) and not isstring (s))\n"
@@ -7398,10 +6510,10 @@ static const char *proc233 =
"return 1;\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:7158\n";
+"--src sparql.sql:6308\n";
-static const char *proc234 =
-"#line 7171 \"[executable]/sparql.sql\"\n"
+static const char *proc206 =
+"#line 6321 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_LANGMATCHES (in r varchar, in t varchar)\n"
"{\n"
"if ((t is null) or (r is null))\n"
@@ -7420,18 +6532,18 @@ static const char *proc234 =
"return 1;\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:7169\n";
+"--src sparql.sql:6319\n";
-static const char *proc235 =
-"#line 7192 \"[executable]/sparql.sql\"\n"
+static const char *proc207 =
+"#line 6342 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.BEST_LANGMATCH_INIT (inout env any)\n"
"{\n"
"env := vector (0, -2);\n"
"}\n"
-"--src sparql.sql:7190\n";
+"--src sparql.sql:6340\n";
-static const char *proc236 =
-"#line 7199 \"[executable]/sparql.sql\"\n"
+static const char *proc208 =
+"#line 6349 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.BEST_LANGMATCH_ACC (inout env any, inout obj any, in range varchar, in dflt_lang varchar)\n"
"{\n"
"declare lang varchar;\n"
@@ -7468,17 +6580,17 @@ static const char *proc236 =
"if (env[1] < pct)\n"
"env := vector (obj, pct);\n"
"}\n"
-"--src sparql.sql:7197\n";
+"--src sparql.sql:6347\n";
-static const char *proc237 =
-"#line 7238 \"[executable]/sparql.sql\"\n"
+static const char *proc209 =
+"#line 6388 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.BEST_LANGMATCH_FINAL (inout env any) returns any\n"
"{\n"
"if (__tag (env) <> __tag of vector)\n"
"return null;\n"
"return env[0];\n"
"}\n"
-"--src sparql.sql:7236\n";
+"--src sparql.sql:6386\n";
static const char *other31 =
" create aggregate DB.DBA.BEST_LANGMATCH (inout obj any, in range varchar, in dflt_lang varchar) from\n"
@@ -7486,16 +6598,16 @@ static const char *other31 =
"DB.DBA.BEST_LANGMATCH_ACC,\n"
"DB.DBA.BEST_LANGMATCH_FINAL\n";
-static const char *proc238 =
-"#line 7254 \"[executable]/sparql.sql\"\n"
+static const char *proc210 =
+"#line 6404 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_CONSTRUCT_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:7252\n";
+"--src sparql.sql:6402\n";
-static const char *proc239 =
-"#line 7261 \"[executable]/sparql.sql\"\n"
+static const char *proc211 =
+"#line 6411 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_CONSTRUCT_ACC (inout _env any, in opcodes any, in vars any, in stats any, in use_dict_limit integer)\n"
"{\n"
"declare triple_ctr integer;\n"
@@ -7512,22 +6624,11 @@ static const char *proc239 =
"blank_ids := 0;\n"
"for (triple_ctr := length (opcodes) - 1; triple_ctr >= 0; triple_ctr := triple_ctr-1)\n"
"{\n"
-"declare fld_ctr, fld_count integer;\n"
+"declare fld_ctr integer;\n"
"declare triple_vec any;\n"
-"declare g_opcode integer;\n"
-"g_opcode := aref_or_default (opcodes, triple_ctr, 6, null);\n"
-"if (g_opcode is null)\n"
-"{\n"
-"fld_count := 3;\n"
"triple_vec := vector (0,0,0);\n"
-"}\n"
-"else\n"
-"{\n"
-"fld_count := 4;\n"
-"triple_vec := vector (0,0,0,0);\n"
-"}\n"
"\n"
-"for (fld_ctr := fld_count - 1; fld_ctr >= 0; fld_ctr := fld_ctr - 1)\n"
+"for (fld_ctr := 2; fld_ctr >= 0; fld_ctr := fld_ctr - 1)\n"
"{\n"
"declare op integer;\n"
"declare arg any;\n"
@@ -7541,16 +6642,16 @@ static const char *proc239 =
"goto end_of_adding_triple;\n"
"if (isiri_id (i))\n"
"{\n"
-"if (fld_ctr in (1,3) and is_bnode_iri_id (i))\n"
-"signal (\'RDF01\', \'Bad variable value in CONSTRUCT: blank node can not be used as predicate or graph\');\n"
+"if ((1 = fld_ctr) and is_bnode_iri_id (i))\n"
+"signal (\'RDF01\', \'Bad variable value in CONSTRUCT: blank node can not be used as predicate\');\n"
"}\n"
"else if ((isstring (i) and (1 = __box_flags (i))) or (217 = __tag(i)))\n"
"{\n"
-"if (fld_ctr in (1,3) and (i like \'bnode://%\'))\n"
-"signal (\'RDF01\', \'Bad variable value in CONSTRUCT: blank node can not be used as predicate or graph\');\n"
+"if ((1 = fld_ctr) and (i like \'bnode://%\'))\n"
+"signal (\'RDF01\', \'Bad variable value in CONSTRUCT: blank node can not be used as predicate\');\n"
"i := iri_to_id (i);\n"
"}\n"
-"else if (2 <> fld_ctr)\n"
+"else if (2 > fld_ctr)\n"
"signal (\'RDF01\',\n"
"sprintf (\'Bad variable value in CONSTRUCT: \"%.100s\" (tag %d box flags %d) is not a valid %s, only object of a triple can be a literal\',\n"
"__tag (i), __box_flags (i),\n"
@@ -7564,8 +6665,8 @@ static const char *proc239 =
"blank_ids := vector (iri_id_from_num (sequence_next (\'RDF_URL_IID_BLANK\')));\n"
"while (arg >= length (blank_ids))\n"
"blank_ids := vector_concat (blank_ids, vector (iri_id_from_num (sequence_next (\'RDF_URL_IID_BLANK\'))));\n"
-"if (fld_ctr in (1,3))\n"
-"signal (\'RDF01\', \'Bad triple for CONSTRUCT: blank node can not be used as predicate or graph\');\n"
+"if (1 = fld_ctr)\n"
+"signal (\'RDF01\', \'Bad triple for CONSTRUCT: blank node can not be used as predicate\');\n"
"triple_vec[fld_ctr] := blank_ids[arg];\n"
"}\n"
"else if (3 = op)\n"
@@ -7575,16 +6676,16 @@ static const char *proc239 =
"\n"
"if (isiri_id (arg))\n"
"{\n"
-"if (fld_ctr in (1,3) and is_bnode_iri_id (arg))\n"
-"signal (\'RDF01\', \'Bad const value in CONSTRUCT: blank node can not be used as predicate or graph\');\n"
+"if ((1 = fld_ctr) and is_bnode_iri_id (arg))\n"
+"signal (\'RDF01\', \'Bad const value in CONSTRUCT: blank node can not be used as predicate\');\n"
"}\n"
"else if ((isstring (arg) and (1 = __box_flags (arg))) or (217 = __tag(arg)))\n"
"{\n"
-"if (fld_ctr in (1,3) and (arg like \'bnode://%\'))\n"
-"signal (\'RDF01\', \'Bad const value in CONSTRUCT: blank node can not be used as predicate or graph\');\n"
+"if ((1 = fld_ctr) and (arg like \'bnode://%\'))\n"
+"signal (\'RDF01\', \'Bad const value in CONSTRUCT: blank node can not be used as predicate\');\n"
"arg := iri_to_id (arg);\n"
"}\n"
-"else if (2 <> fld_ctr)\n"
+"else if (2 > fld_ctr)\n"
"signal (\'RDF01\',\n"
"sprintf (\'Bad const value in CONSTRUCT: \"%.100s\" (tag %d box flags %d) is not a valid %s, only object of a triple can be a literal\',\n"
"__tag (arg), __box_flags (arg),\n"
@@ -7601,32 +6702,32 @@ static const char *proc239 =
"end_of_adding_triple: ;\n"
"}\n"
"}\n"
-"--src sparql.sql:7259\n";
+"--src sparql.sql:6409\n";
-static const char *proc240 =
-"#line 7369 \"[executable]/sparql.sql\"\n"
+static const char *proc212 =
+"#line 6508 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.SPARQL_CONSTRUCT_FIN (inout _env any)\n"
"{\n"
"if (214 <> __tag(_env))\n"
"_env := dict_new ();\n"
"return _env;\n"
"}\n"
-"--src sparql.sql:7367\n";
+"--src sparql.sql:6506\n";
static const char *other32 =
" create aggregate DB.DBA.SPARQL_CONSTRUCT (in opcodes any, in vars any, in stats any, in use_dict_limit integer) returns any\n"
"from DB.DBA.SPARQL_CONSTRUCT_INIT, DB.DBA.SPARQL_CONSTRUCT_ACC, DB.DBA.SPARQL_CONSTRUCT_FIN\n";
-static const char *proc241 =
-"#line 7382 \"[executable]/sparql.sql\"\n"
+static const char *proc213 =
+"#line 6521 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.SPARQL_DESC_AGG_INIT (inout _env any)\n"
"{\n"
"_env := 0;\n"
"}\n"
-"--src sparql.sql:7380\n";
+"--src sparql.sql:6519\n";
-static const char *proc242 =
-"#line 7388 \"[executable]/sparql.sql\"\n"
+static const char *proc214 =
+"#line 6527 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.SPARQL_DESC_AGG_ACC (inout _env any, in vars any)\n"
"{\n"
"declare var_ctr integer;\n"
@@ -7643,10 +6744,10 @@ static const char *proc242 =
"dict_put (_env, i, 0);\n"
"}\n"
"}\n"
-"--src sparql.sql:7386\n";
+"--src sparql.sql:6525\n";
-static const char *proc243 =
-"#line 7406 \"[executable]/sparql.sql\"\n"
+static const char *proc215 =
+"#line 6545 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.SPARQL_DESC_AGG_FIN (inout _env any)\n"
"{\n"
"declare subjects, options, res any;\n"
@@ -7655,14 +6756,14 @@ static const char *proc243 =
"return dict_new ();\n"
"return _env;\n"
"}\n"
-"--src sparql.sql:7404\n";
+"--src sparql.sql:6543\n";
static const char *other33 =
"create aggregate DB.DBA.SPARQL_DESC_AGG (in vars any) returns any\n"
"from DB.DBA.SPARQL_DESC_AGG_INIT, DB.DBA.SPARQL_DESC_AGG_ACC, DB.DBA.SPARQL_DESC_AGG_FIN\n";
-static const char *proc244 =
-"#line 7420 \"[executable]/sparql.sql\"\n"
+static const char *proc216 =
+"#line 6559 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.SPARQL_DESC_DICT (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
"{\n"
"declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, g_dict, res any;\n"
@@ -7973,10 +7074,10 @@ static const char *proc244 =
"\n"
"return res;\n"
"}\n"
-"--src sparql.sql:7418\n";
+"--src sparql.sql:6557\n";
-static const char *proc245 =
-"#line 7732 \"[executable]/sparql.sql\"\n"
+static const char *proc217 =
+"#line 6871 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.SPARQL_DESC_DICT_SPO (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
"{\n"
"declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, res any;\n"
@@ -8002,391 +7103,7 @@ static const char *proc245 =
"all_s_count := length (all_subj_descs);\n"
"if (0 = all_s_count)\n"
"return res;\n"
-"gvector_sort (all_subj_descs, 1, 0, 0);\n"
-"if (__tag of integer = __tag (good_graphs))\n"
-"graphs_listed := 0;\n"
-"else\n"
-"{\n"
-"vectorbld_init (sorted_good_graphs);\n"
-"foreach (any g in good_graphs) do\n"
-"{\n"
-"if (isiri_id (g) and g < min_bnode_iri_id () and\n"
-"__rgs_ack_cbk (g, uid, 1) and\n"
-"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (g, gs_app_uid))) )\n"
-"vectorbld_acc (sorted_good_graphs, g);\n"
-"}\n"
-"vectorbld_final (sorted_good_graphs);\n"
-"good_g_count := length (sorted_good_graphs);\n"
-"if (0 = good_g_count)\n"
-"return res;\n"
-"graphs_listed := 1;\n"
-"}\n"
-"vectorbld_init (sorted_bad_graphs);\n"
-"foreach (any g in bad_graphs) do\n"
-"{\n"
-"if (isiri_id (g) and g < min_bnode_iri_id ())\n"
-"vectorbld_acc (sorted_bad_graphs, g);\n"
-"}\n"
-"vectorbld_final (sorted_bad_graphs);\n"
-"bad_g_count := length (sorted_bad_graphs);\n"
-"vectorbld_init (phys_subjects);\n"
-"if (storage_name is null)\n"
-"storage_name := \'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage\';\n"
-"else if ((\'\' = storage_name) and (inf_ruleset is null) and (sameas is null))\n"
-"{\n"
-"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
-"{\n"
-"declare s, phys_s any;\n"
-"s := all_subj_descs [s_ctr];\n"
-"if (isiri_id (s))\n"
-"vectorbld_acc (phys_subjects, s);\n"
-"else\n"
-"{\n"
-"phys_s := iri_to_id (s, 0, 0);\n"
-"if (not isinteger (phys_s))\n"
-"vectorbld_acc (phys_subjects, phys_s);\n"
-"}\n"
-"}\n"
-"vectorbld_final (phys_subjects);\n"
-"goto describe_physical_subjects;\n"
-"}\n"
-"\n"
-"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
-"{\n"
-"declare s, phys_s, maps any;\n"
-"declare maps_len integer;\n"
-"s := all_subj_descs [s_ctr];\n"
-"maps := sparql_quad_maps_for_quad (NULL, s, NULL, NULL, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);\n"
-"\n"
-"maps_len := length (maps);\n"
-"if ((maps_len > 0) and (inf_ruleset is null) and (sameas is null) and (maps[maps_len-1][0] = UNAME\'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap\'))\n"
-"{\n"
-"if (isiri_id (s))\n"
-"{\n"
-"phys_s := s;\n"
-"vectorbld_acc (phys_subjects, phys_s);\n"
-"}\n"
-"else\n"
-"{\n"
-"phys_s := iri_to_id (s, 0, 0);\n"
-"if (not isinteger (phys_s))\n"
-"vectorbld_acc (phys_subjects, phys_s);\n"
-"}\n"
-"maps := subseq (maps, 0, maps_len-1);\n"
-"maps_len := maps_len - 1;\n"
-"}\n"
-"if (maps_len > 0)\n"
-"all_subj_descs [s_ctr] := vector (s, maps);\n"
-"else\n"
-"all_subj_descs [s_ctr] := 0;\n"
-"\n"
-"\n"
-"}\n"
-"vectorbld_final (phys_subjects);\n"
-"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
-"{\n"
-"declare s_desc, s, maps any;\n"
-"declare map_ctr, maps_len integer;\n"
-"declare fname varchar;\n"
-"s_desc := all_subj_descs [s_ctr];\n"
-"if (isinteger (s_desc))\n"
-"goto end_of_s;\n"
-"s := s_desc[0];\n"
-"maps := s_desc[1];\n"
-"maps_len := length (maps);\n"
-"fname := sprintf (\'SPARQL_DESC_DICT_QMV1_%U\', md5 (storage_name || \' \' || inf_ruleset || \' \' || sameas || \' \' || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));\n"
-"if (not exists (select top 1 1 from Db.DBA.SYS_PROCEDURES where P_NAME = \'DB.DBA.\' || fname))\n"
-"{\n"
-"declare ses, txt, saved_user any;\n"
-"ses := string_output ();\n"
-"http (\'create procedure DB.DBA.\"\' || fname || \'\" (in subj any, in res any\', ses);\n"
-"if (graphs_listed)\n"
-"http (\', inout sorted_good_graphs any\', ses);\n"
-"http (\')\\n\', ses);\n"
-"http (\'{\\n\', ses);\n"
-"http (\' declare subj_iri varchar;\\n\', ses);\n"
-"http (\' subj_iri := id_to_iri_nosignal (subj);\\n\', ses);\n"
-"http (\' for (sparql define output:valmode \"LONG\" define input:storage <\' || storage_name || \'> \', ses);\n"
-"foreach (any g in sorted_bad_graphs) do\n"
-"{\n"
-"http (\' define input:named-graph-exclude <\' || id_to_iri_nosignal (g) || \'>\\n\', ses);\n"
-"}\n"
-"if (inf_ruleset is not null)\n"
-"http (\' define input:inference <\' || inf_ruleset || \'>\\n\', ses);\n"
-"if (sameas is not null)\n"
-"http (\' define input:same-as <\' || sameas || \'>\\n\', ses);\n"
-"http (\'select ?g1 ?p1 ?o1\\n\', ses);\n"
-"http (\' where { graph ?g1 {\\n\', ses);\n"
-"for (map_ctr := 0; map_ctr < maps_len; map_ctr := map_ctr + 1)\n"
-"{\n"
-"if (map_ctr > 0) http (\' union\\n\', ses);\n"
-"http (\' { quad map <\' || maps[map_ctr][0] || \'> { ?:subj_iri ?p1 ?o1 } }\\n\', ses);\n"
-"}\n"
-"http (\' } } ) do {\\n\', ses);\n"
-"if (graphs_listed)\n"
-"http (\' if (position (__i2idn (\"g1\"), sorted_good_graphs))\\n\', ses);\n"
-"http (\' dict_bitor_or_put (res, vector (subj, \"p1\", \"o1\"), 1); } }\\n\', ses);\n"
-"txt := string_output_string (ses);\n"
-"\n"
-"saved_user := user;\n"
-"set_user_id (\'dba\', 1);\n"
-"exec (txt);\n"
-"set_user_id (saved_user);\n"
-"}\n"
-"if (graphs_listed)\n"
-"{\n"
-"\n"
-"call (\'DB.DBA.\' || fname)(s, res, sorted_good_graphs);\n"
-"}\n"
-"else\n"
-"{\n"
-"\n"
-"call (\'DB.DBA.\' || fname)(s, res);\n"
-"}\n"
-"end_of_s: ;\n"
-"}\n"
-"\n"
-"describe_physical_subjects:\n"
-"gvector_sort (phys_subjects, 1, 0, 0);\n"
-"phys_s_count := length (phys_subjects);\n"
-"\n"
-"if (0 = phys_s_count)\n"
-"return res;\n"
-"\n"
-"if (graphs_listed)\n"
-"{\n"
-"gvector_sort (sorted_good_graphs, 1, 0, 0);\n"
-"\n"
-"for (g_ctr := good_g_count - 1; g_ctr >= 0; g_ctr := g_ctr - 1)\n"
-"{\n"
-"declare graph any;\n"
-"graph := sorted_good_graphs [g_ctr];\n"
-"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
-"{\n"
-"declare subj any;\n"
-"subj := phys_subjects [s_ctr];\n"
-"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do\n"
-"{\n"
-"\n"
-"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
-"}\n"
-"}\n"
-"}\n"
-"return res;\n"
-"}\n"
-"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
-"{\n"
-"declare subj any;\n"
-"subj := phys_subjects [s_ctr];\n"
-"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where\n"
-"0 = position (G, sorted_bad_graphs) and\n"
-"S = subj and\n"
-"__rgs_ack_cbk (G, uid, 1) and\n"
-"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do\n"
-"{\n"
-"\n"
-"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
-"}\n"
-"}\n"
-"return res;\n"
-"}\n"
-"--src sparql.sql:7730\n";
-
-static const char *proc246 =
-"#line 7947 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
-"{\n"
-"declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, g_dict, res any;\n"
-"declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;\n"
-"declare gs_app_callback, gs_app_uid varchar;\n"
-"declare rdf_type_iid IRI_ID;\n"
-"uid := get_keyword (\'uid\', options, http_nobody_uid());\n"
-"gs_app_callback := get_keyword (\'gs-app-callback\', options);\n"
-"if (gs_app_callback is not null)\n"
-"gs_app_uid := get_keyword (\'gs-app-uid\', options);\n"
-"rdf_type_iid := iri_to_id (UNAME\'http://www.w3.org/1999/02/22-rdf-syntax-ns#type\');\n"
-"res := dict_new ();\n"
-"if (isinteger (consts))\n"
-"return res;\n"
-"foreach (any c in consts) do\n"
-"{\n"
-"if (isiri_id (c))\n"
-"dict_put (subj_dict, c, 0);\n"
-"}\n"
-"all_subj_descs := dict_list_keys (subj_dict, 1);\n"
-"all_s_count := length (all_subj_descs);\n"
-"if (0 = all_s_count)\n"
-"return res;\n"
-"gvector_sort (all_subj_descs, 1, 0, 0);\n"
-"if (__tag of integer = __tag (good_graphs))\n"
-"graphs_listed := 0;\n"
-"else\n"
-"{\n"
-"vectorbld_init (sorted_good_graphs);\n"
-"foreach (any g in good_graphs) do\n"
-"{\n"
-"if (isiri_id (g) and g < min_bnode_iri_id () and\n"
-"__rgs_ack_cbk (g, uid, 1) and\n"
-"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (g, gs_app_uid))) )\n"
-"vectorbld_acc (sorted_good_graphs, g);\n"
-"}\n"
-"vectorbld_final (sorted_good_graphs);\n"
-"good_g_count := length (sorted_good_graphs);\n"
-"if (0 = good_g_count)\n"
-"return res;\n"
-"graphs_listed := 1;\n"
-"}\n"
-"vectorbld_init (sorted_bad_graphs);\n"
-"foreach (any g in bad_graphs) do\n"
-"{\n"
-"if (isiri_id (g) and g < min_bnode_iri_id ())\n"
-"vectorbld_acc (sorted_bad_graphs, g);\n"
-"}\n"
-"vectorbld_final (sorted_bad_graphs);\n"
-"bad_g_count := length (sorted_bad_graphs);\n"
-"vectorbld_init (phys_subjects);\n"
-"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
-"{\n"
-"declare s, phys_s any;\n"
-"s := all_subj_descs [s_ctr];\n"
-"if (isiri_id (s))\n"
-"vectorbld_acc (phys_subjects, s);\n"
-"else\n"
-"{\n"
-"phys_s := iri_to_id (s, 0, 0);\n"
-"if (not isinteger (phys_s))\n"
-"vectorbld_acc (phys_subjects, phys_s);\n"
-"}\n"
-"}\n"
-"vectorbld_final (phys_subjects);\n"
-"gvector_sort (phys_subjects, 1, 0, 0);\n"
-"phys_s_count := length (phys_subjects);\n"
-"\n"
-"if (0 = phys_s_count)\n"
-"return res;\n"
-"\n"
-"if (graphs_listed)\n"
-"{\n"
-"gvector_sort (sorted_good_graphs, 1, 0, 0);\n"
-"\n"
-"for (g_ctr := good_g_count - 1; g_ctr >= 0; g_ctr := g_ctr - 1)\n"
-"{\n"
-"declare graph any;\n"
-"graph := sorted_good_graphs [g_ctr];\n"
-"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
-"{\n"
-"declare subj any;\n"
-"subj := phys_subjects [s_ctr];\n"
-"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do\n"
-"{\n"
-"\n"
-"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
-"}\n"
-"}\n"
-"}\n"
-"return res;\n"
-"}\n"
-"g_dict := dict_new ();\n"
-"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
-"{\n"
-"declare subj, graph any;\n"
-"subj := phys_subjects [s_ctr];\n"
-"graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where O = subj and\n"
-"0 = position (G, sorted_bad_graphs) and\n"
-"__rgs_ack_cbk (G, uid, 1) and\n"
-"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );\n"
-"if (graph is not null)\n"
-"dict_put (g_dict, graph, 0);\n"
-"}\n"
-"sorted_good_graphs := dict_list_keys (g_dict, 1);\n"
-"if (0 = length (sorted_good_graphs))\n"
-"{\n"
-"g_dict := dict_new ();\n"
-"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
-"{\n"
-"declare subj, graph any;\n"
-"subj := phys_subjects [s_ctr];\n"
-"graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where S = subj and P = rdf_type_iid and\n"
-"0 = position (G, sorted_bad_graphs) and\n"
-"__rgs_ack_cbk (G, uid, 1) and\n"
-"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );\n"
-"if (graph is not null)\n"
-"dict_put (g_dict, graph, 0);\n"
-"}\n"
-"sorted_good_graphs := dict_list_keys (g_dict, 1);\n"
-"}\n"
-"\n"
-"gvector_sort (sorted_good_graphs, 1, 0, 0);\n"
-"good_g_count := length (sorted_good_graphs);\n"
-"\n"
-"for (g_ctr := good_g_count - 1; g_ctr >= 0; g_ctr := g_ctr - 1)\n"
-"{\n"
-"declare graph any;\n"
-"graph := sorted_good_graphs [g_ctr];\n"
-"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
-"{\n"
-"declare subj any;\n"
-"subj := phys_subjects [s_ctr];\n"
-"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do\n"
-"{\n"
-"\n"
-"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"}\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"}\n"
-"}\n"
-"\n"
-"return res;\n"
-"}\n"
-"--src sparql.sql:7945\n";
-
-static const char *proc247 =
-"#line 8108 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_DESC_DICT_CBD (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
-"{\n"
-"declare all_subjs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, next_iter_subjs, res any;\n"
-"declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;\n"
-"declare gs_app_callback, gs_app_uid, inf_ruleset varchar;\n"
-"declare rdf_type_iid IRI_ID;\n"
-"uid := get_keyword (\'uid\', options, http_nobody_uid());\n"
-"gs_app_callback := get_keyword (\'gs-app-callback\', options);\n"
-"if (gs_app_callback is not null)\n"
-"gs_app_uid := get_keyword (\'gs-app-uid\', options);\n"
-"inf_ruleset := get_keyword (\'inference\', options);\n"
-"rdf_type_iid := iri_to_id (UNAME\'http://www.w3.org/1999/02/22-rdf-syntax-ns#type\');\n"
-"res := dict_new ();\n"
-"if (isinteger (consts))\n"
-"return res;\n"
-"foreach (any c in consts) do\n"
-"{\n"
-"if (isiri_id (c))\n"
-"dict_put (subj_dict, c, 0);\n"
-"}\n"
-"all_subjs := dict_list_keys (subj_dict, 0);\n"
-"next_iter_subjs := dict_new ();\n"
-"all_s_count := length (all_subjs);\n"
-"if (0 = all_s_count)\n"
-"return res;\n"
-"\n"
-"next_iteration:\n"
-"all_s_count := length (all_subjs);\n"
-"gvector_sort (all_subjs, 1, 0, 0);\n"
-"\n"
+"gvector_sort (all_subj_descs, 1, 0, 0);\n"
"if (__tag of integer = __tag (good_graphs))\n"
"graphs_listed := 0;\n"
"else\n"
@@ -8416,12 +7133,12 @@ static const char *proc247 =
"vectorbld_init (phys_subjects);\n"
"if (storage_name is null)\n"
"storage_name := \'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage\';\n"
-"else if ((\'\' = storage_name) and (inf_ruleset is null))\n"
+"else if ((\'\' = storage_name) and (inf_ruleset is null) and (sameas is null))\n"
"{\n"
"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
"{\n"
"declare s, phys_s any;\n"
-"s := all_subjs [s_ctr];\n"
+"s := all_subj_descs [s_ctr];\n"
"if (isiri_id (s))\n"
"vectorbld_acc (phys_subjects, s);\n"
"else\n"
@@ -8439,11 +7156,11 @@ static const char *proc247 =
"{\n"
"declare s, phys_s, maps any;\n"
"declare maps_len integer;\n"
-"s := all_subjs [s_ctr];\n"
+"s := all_subj_descs [s_ctr];\n"
"maps := sparql_quad_maps_for_quad (NULL, s, NULL, NULL, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);\n"
"\n"
"maps_len := length (maps);\n"
-"if ((maps_len > 0) and (inf_ruleset is null) and (maps[maps_len-1][0] = UNAME\'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap\'))\n"
+"if ((maps_len > 0) and (inf_ruleset is null) and (sameas is null) and (maps[maps_len-1][0] = UNAME\'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap\'))\n"
"{\n"
"if (isiri_id (s))\n"
"{\n"
@@ -8460,9 +7177,9 @@ static const char *proc247 =
"maps_len := maps_len - 1;\n"
"}\n"
"if (maps_len > 0)\n"
-"all_subjs [s_ctr] := vector (s, maps);\n"
+"all_subj_descs [s_ctr] := vector (s, maps);\n"
"else\n"
-"all_subjs [s_ctr] := 0;\n"
+"all_subj_descs [s_ctr] := 0;\n"
"\n"
"\n"
"}\n"
@@ -8472,18 +7189,18 @@ static const char *proc247 =
"declare s_desc, s, maps any;\n"
"declare map_ctr, maps_len integer;\n"
"declare fname varchar;\n"
-"s_desc := all_subjs [s_ctr];\n"
+"s_desc := all_subj_descs [s_ctr];\n"
"if (isinteger (s_desc))\n"
"goto end_of_s;\n"
"s := s_desc[0];\n"
"maps := s_desc[1];\n"
"maps_len := length (maps);\n"
-"fname := sprintf (\'SPARQL_DESC_DICT_CBD_QMV1_%U\', md5 (storage_name || inf_ruleset || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));\n"
+"fname := sprintf (\'SPARQL_DESC_DICT_QMV1_%U\', md5 (storage_name || \' \' || inf_ruleset || \' \' || sameas || \' \' || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));\n"
"if (not exists (select top 1 1 from Db.DBA.SYS_PROCEDURES where P_NAME = \'DB.DBA.\' || fname))\n"
"{\n"
"declare ses, txt, saved_user any;\n"
"ses := string_output ();\n"
-"http (\'create procedure DB.DBA.\"\' || fname || \'\" (in subj any, in subj_dict any, in next_iter_subjs any, in res any\', ses);\n"
+"http (\'create procedure DB.DBA.\"\' || fname || \'\" (in subj any, in res any\', ses);\n"
"if (graphs_listed)\n"
"http (\', inout sorted_good_graphs any\', ses);\n"
"http (\')\\n\', ses);\n"
@@ -8497,29 +7214,19 @@ static const char *proc247 =
"}\n"
"if (inf_ruleset is not null)\n"
"http (\' define input:inference <\' || inf_ruleset || \'>\\n\', ses);\n"
-"http (\'select ?g1 ?p1 ?o1 ?g2 ?st2\\n\', ses);\n"
+"if (sameas is not null)\n"
+"http (\' define input:same-as <\' || sameas || \'>\\n\', ses);\n"
+"http (\'select ?g1 ?p1 ?o1\\n\', ses);\n"
"http (\' where { graph ?g1 {\\n\', ses);\n"
"for (map_ctr := 0; map_ctr < maps_len; map_ctr := map_ctr + 1)\n"
"{\n"
"if (map_ctr > 0) http (\' union\\n\', ses);\n"
"http (\' { quad map <\' || maps[map_ctr][0] || \'> { ?:subj_iri ?p1 ?o1 } }\\n\', ses);\n"
"}\n"
-"http (\' }\\n\', ses);\n"
-"http (\' optional { graph ?g2 {\\n\', ses);\n"
-"http (\' ?st2 a rdf:Statement ; rdf:subject ?:subj_iri ; rdf:predicate ?p1 ; rdf:object ?o1 } }\\n\', ses);\n"
-"http (\' } ) do {\\n\', ses);\n"
-"if (graphs_listed)\n"
-"http (\' if (position (__i2idn (\"g1\"), sorted_good_graphs)) {\\n\', ses);\n"
-"http (\' dict_bitor_or_put (res, vector (subj, \"p1\", \"o1\"), 1);\\n\', ses);\n"
-"http (\' if (isiri_id (\"o1\") and \"o1\" > min_bnode_iri_id() and dict_get (subj_dict, \"o1\") is null)\\n\', ses);\n"
-"http (\' dict_put (next_iter_subjs, \"o1\", 1);\\n\', ses);\n"
-"if (graphs_listed)\n"
-"http (\' if (position (__i2idn (\"g2\"), sorted_good_graphs)) {\\n\', ses);\n"
-"http (\' if (\"st2\" is not null and dict_get (subj_dict, \"st2\") is null)\\n\', ses);\n"
-"http (\' dict_put (next_iter_subjs, \"o1\", 1);\\n\', ses);\n"
+"http (\' } } ) do {\\n\', ses);\n"
"if (graphs_listed)\n"
-"http (\' } }\\n\', ses);\n"
-"http (\' } }\\n\', ses);\n"
+"http (\' if (position (__i2idn (\"g1\"), sorted_good_graphs))\\n\', ses);\n"
+"http (\' dict_bitor_or_put (res, vector (subj, \"p1\", \"o1\"), 1); } }\\n\', ses);\n"
"txt := string_output_string (ses);\n"
"\n"
"saved_user := user;\n"
@@ -8530,12 +7237,12 @@ static const char *proc247 =
"if (graphs_listed)\n"
"{\n"
"\n"
-"call (\'DB.DBA.\' || fname)(s, subj_dict, next_iter_subjs, res, sorted_good_graphs);\n"
+"call (\'DB.DBA.\' || fname)(s, res, sorted_good_graphs);\n"
"}\n"
"else\n"
"{\n"
"\n"
-"call (\'DB.DBA.\' || fname)(s, subj_dict, next_iter_subjs, res);\n"
+"call (\'DB.DBA.\' || fname)(s, res);\n"
"}\n"
"end_of_s: ;\n"
"}\n"
@@ -8563,22 +7270,11 @@ static const char *proc247 =
"{\n"
"\n"
"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
-"if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)\n"
-"dict_put (next_iter_subjs, obj1, 1);\n"
-"for (sparql define output:valmode \"LONG\"\n"
-"select ?g2 ?st2 where {\n"
-"graph ?g2 {\n"
-"?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do\n"
-"{\n"
-"if (position (\"g2\", sorted_good_graphs) and dict_get (subj_dict, \"st2\") is null)\n"
-"dict_put (next_iter_subjs, \"st2\", 1);\n"
-"}\n"
"}\n"
"}\n"
"}\n"
+"return res;\n"
"}\n"
-"else\n"
-"{\n"
"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
"declare subj any;\n"
@@ -8591,40 +7287,18 @@ static const char *proc247 =
"{\n"
"\n"
"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
-"if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)\n"
-"dict_put (next_iter_subjs, obj1, 1);\n"
-"for (sparql define output:valmode \"LONG\"\n"
-"select ?g2 ?st2 where {\n"
-"graph ?g2 {\n"
-"?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do\n"
-"{\n"
-"if (0 = position (\"g2\", sorted_bad_graphs) and\n"
-"dict_get (subj_dict, \"st2\") is null and\n"
-"__rgs_ack_cbk (\"g2\", uid, 1) and\n"
-"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (\"g2\", gs_app_uid))) )\n"
-"dict_put (next_iter_subjs, \"st2\", 1);\n"
-"}\n"
-"}\n"
"}\n"
"}\n"
-"ret_or_next_iter:\n"
-"if (0 = dict_size (next_iter_subjs))\n"
-"{\n"
-"\n"
"return res;\n"
"}\n"
-"all_subjs := dict_list_keys (next_iter_subjs, 1);\n"
-"foreach (IRI_ID s in all_subjs) do dict_put (subj_dict, s, 1);\n"
-"goto next_iteration;\n"
-"}\n"
-"--src sparql.sql:8106\n";
+"--src sparql.sql:6869\n";
-static const char *proc248 =
-"#line 8370 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
+static const char *proc218 =
+"#line 7086 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
"{\n"
-"declare all_subjs, sorted_good_graphs, sorted_bad_graphs, next_iter_subjs, res any;\n"
-"declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count integer;\n"
+"declare all_subj_descs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, g_dict, res any;\n"
+"declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;\n"
"declare gs_app_callback, gs_app_uid varchar;\n"
"declare rdf_type_iid IRI_ID;\n"
"uid := get_keyword (\'uid\', options, http_nobody_uid());\n"
@@ -8640,16 +7314,11 @@ static const char *proc248 =
"if (isiri_id (c))\n"
"dict_put (subj_dict, c, 0);\n"
"}\n"
-"all_subjs := dict_list_keys (subj_dict, 0);\n"
-"next_iter_subjs := dict_new ();\n"
-"all_s_count := length (all_subjs);\n"
+"all_subj_descs := dict_list_keys (subj_dict, 1);\n"
+"all_s_count := length (all_subj_descs);\n"
"if (0 = all_s_count)\n"
"return res;\n"
-"\n"
-"next_iteration:\n"
-"all_s_count := length (all_subjs);\n"
-"gvector_sort (all_subjs, 1, 0, 0);\n"
-"\n"
+"gvector_sort (all_subj_descs, 1, 0, 0);\n"
"if (__tag of integer = __tag (good_graphs))\n"
"graphs_listed := 0;\n"
"else\n"
@@ -8676,8 +7345,25 @@ static const char *proc248 =
"}\n"
"vectorbld_final (sorted_bad_graphs);\n"
"bad_g_count := length (sorted_bad_graphs);\n"
+"vectorbld_init (phys_subjects);\n"
+"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
+"{\n"
+"declare s, phys_s any;\n"
+"s := all_subj_descs [s_ctr];\n"
+"if (isiri_id (s))\n"
+"vectorbld_acc (phys_subjects, s);\n"
+"else\n"
+"{\n"
+"phys_s := iri_to_id (s, 0, 0);\n"
+"if (not isinteger (phys_s))\n"
+"vectorbld_acc (phys_subjects, phys_s);\n"
+"}\n"
+"}\n"
+"vectorbld_final (phys_subjects);\n"
+"gvector_sort (phys_subjects, 1, 0, 0);\n"
+"phys_s_count := length (phys_subjects);\n"
"\n"
-"if (0 = all_s_count)\n"
+"if (0 = phys_s_count)\n"
"return res;\n"
"\n"
"if (graphs_listed)\n"
@@ -8688,77 +7374,94 @@ static const char *proc248 =
"{\n"
"declare graph any;\n"
"graph := sorted_good_graphs [g_ctr];\n"
-"for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
+"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
"declare subj any;\n"
-"subj := all_subjs [s_ctr];\n"
+"subj := phys_subjects [s_ctr];\n"
"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do\n"
"{\n"
"\n"
"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
-"if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)\n"
-"dict_put (next_iter_subjs, obj1, 1);\n"
-"for (sparql define output:valmode \"LONG\"\n"
-"select ?g2 ?st2 where {\n"
-"graph ?g2 {\n"
-"?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do\n"
-"{\n"
-"if (position (\"g2\", sorted_good_graphs) and dict_get (subj_dict, \"st2\") is null)\n"
-"dict_put (next_iter_subjs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
+"return res;\n"
"}\n"
+"g_dict := dict_new ();\n"
+"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
+"{\n"
+"declare subj, graph any;\n"
+"subj := phys_subjects [s_ctr];\n"
+"graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where O = subj and\n"
+"0 = position (G, sorted_bad_graphs) and\n"
+"__rgs_ack_cbk (G, uid, 1) and\n"
+"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );\n"
+"if (graph is not null)\n"
+"dict_put (g_dict, graph, 0);\n"
"}\n"
-"else\n"
+"sorted_good_graphs := dict_list_keys (g_dict, 1);\n"
+"if (0 = length (sorted_good_graphs))\n"
"{\n"
-"for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
+"g_dict := dict_new ();\n"
+"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
-"declare subj any;\n"
-"subj := all_subjs [s_ctr];\n"
-"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where\n"
+"declare subj, graph any;\n"
+"subj := phys_subjects [s_ctr];\n"
+"graph := coalesce ((select top 1 G as g1 from DB.DBA.RDF_QUAD where S = subj and P = rdf_type_iid and\n"
"0 = position (G, sorted_bad_graphs) and\n"
-"S = subj and\n"
"__rgs_ack_cbk (G, uid, 1) and\n"
-"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do\n"
+"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) );\n"
+"if (graph is not null)\n"
+"dict_put (g_dict, graph, 0);\n"
+"}\n"
+"sorted_good_graphs := dict_list_keys (g_dict, 1);\n"
+"}\n"
+"\n"
+"gvector_sort (sorted_good_graphs, 1, 0, 0);\n"
+"good_g_count := length (sorted_good_graphs);\n"
+"\n"
+"for (g_ctr := good_g_count - 1; g_ctr >= 0; g_ctr := g_ctr - 1)\n"
+"{\n"
+"declare graph any;\n"
+"graph := sorted_good_graphs [g_ctr];\n"
+"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
+"{\n"
+"declare subj any;\n"
+"subj := phys_subjects [s_ctr];\n"
+"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do\n"
"{\n"
"\n"
"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
-"if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)\n"
-"dict_put (next_iter_subjs, obj1, 1);\n"
-"for (sparql define output:valmode \"LONG\"\n"
-"select ?g2 ?st2 where {\n"
-"graph ?g2 {\n"
-"?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do\n"
-"{\n"
-"if (0 = position (\"g2\", sorted_bad_graphs) and\n"
-"dict_get (subj_dict, \"st2\") is null and\n"
-"__rgs_ack_cbk (\"g2\", uid, 1) and\n"
-"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (\"g2\", gs_app_uid))) )\n"
-"dict_put (next_iter_subjs, \"st2\", 1);\n"
-"}\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
"}\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
"}\n"
"}\n"
"\n"
-"ret_or_next_iter:\n"
-"if (0 = dict_size (next_iter_subjs))\n"
-"{\n"
-"\n"
"return res;\n"
"}\n"
-"all_subjs := dict_list_keys (next_iter_subjs, 1);\n"
-"foreach (IRI_ID s in all_subjs) do dict_put (subj_dict, s, 1);\n"
-"goto next_iteration;\n"
-"}\n"
-"--src sparql.sql:8368\n";
+"--src sparql.sql:7084\n";
-static const char *proc249 =
-"#line 8502 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_DESC_DICT_OBJCBD (in obj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
+static const char *proc219 =
+"#line 7247 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.SPARQL_DESC_DICT_CBD (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
"{\n"
-"declare all_objs, phys_objects, sorted_good_graphs, sorted_bad_graphs, next_iter_objs, res any;\n"
-"declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, obj_ctr, all_obj_count, phys_obj_count integer;\n"
+"declare all_subjs, phys_subjects, sorted_good_graphs, sorted_bad_graphs, next_iter_subjs, res any;\n"
+"declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count, phys_s_count integer;\n"
"declare gs_app_callback, gs_app_uid, inf_ruleset varchar;\n"
"declare rdf_type_iid IRI_ID;\n"
"uid := get_keyword (\'uid\', options, http_nobody_uid());\n"
@@ -8772,18 +7475,18 @@ static const char *proc249 =
"return res;\n"
"foreach (any c in consts) do\n"
"{\n"
-"if (not isnumeric (c))\n"
-"dict_put (obj_dict, c, 0);\n"
+"if (isiri_id (c))\n"
+"dict_put (subj_dict, c, 0);\n"
"}\n"
-"all_objs := dict_list_keys (obj_dict, 0);\n"
-"next_iter_objs := dict_new ();\n"
-"all_obj_count := length (all_objs);\n"
-"if (0 = all_obj_count)\n"
+"all_subjs := dict_list_keys (subj_dict, 0);\n"
+"next_iter_subjs := dict_new ();\n"
+"all_s_count := length (all_subjs);\n"
+"if (0 = all_s_count)\n"
"return res;\n"
"\n"
"next_iteration:\n"
-"all_obj_count := length (all_objs);\n"
-"gvector_sort (all_objs, 1, 0, 0);\n"
+"all_s_count := length (all_subjs);\n"
+"gvector_sort (all_subjs, 1, 0, 0);\n"
"\n"
"if (__tag of integer = __tag (good_graphs))\n"
"graphs_listed := 0;\n"
@@ -8792,7 +7495,7 @@ static const char *proc249 =
"vectorbld_init (sorted_good_graphs);\n"
"foreach (any g in good_graphs) do\n"
"{\n"
-"if (is_named_iri_id (g) and\n"
+"if (isiri_id (g) and g < min_bnode_iri_id () and\n"
"__rgs_ack_cbk (g, uid, 1) and\n"
"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (g, gs_app_uid))) )\n"
"vectorbld_acc (sorted_good_graphs, g);\n"
@@ -8806,94 +7509,88 @@ static const char *proc249 =
"vectorbld_init (sorted_bad_graphs);\n"
"foreach (any g in bad_graphs) do\n"
"{\n"
-"if (is_named_iri_id (g))\n"
+"if (isiri_id (g) and g < min_bnode_iri_id ())\n"
"vectorbld_acc (sorted_bad_graphs, g);\n"
"}\n"
"vectorbld_final (sorted_bad_graphs);\n"
"bad_g_count := length (sorted_bad_graphs);\n"
-"vectorbld_init (phys_objects);\n"
+"vectorbld_init (phys_subjects);\n"
"if (storage_name is null)\n"
"storage_name := \'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadStorage\';\n"
"else if ((\'\' = storage_name) and (inf_ruleset is null))\n"
"{\n"
-"for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)\n"
-"{\n"
-"declare obj, phys_obj any;\n"
-"obj := all_objs [obj_ctr];\n"
-"if (not isnumeric (obj))\n"
+"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
"{\n"
-"if (isiri_id (obj))\n"
-"vectorbld_acc (phys_objects, obj);\n"
+"declare s, phys_s any;\n"
+"s := all_subjs [s_ctr];\n"
+"if (isiri_id (s))\n"
+"vectorbld_acc (phys_subjects, s);\n"
"else\n"
"{\n"
-"phys_obj := iri_to_id (obj, 0, 0);\n"
-"if (not isinteger (phys_obj))\n"
-"vectorbld_acc (phys_objects, phys_obj);\n"
-"}\n"
+"phys_s := iri_to_id (s, 0, 0);\n"
+"if (not isinteger (phys_s))\n"
+"vectorbld_acc (phys_subjects, phys_s);\n"
"}\n"
"}\n"
-"vectorbld_final (phys_objects);\n"
-"goto describe_physical_objects;\n"
+"vectorbld_final (phys_subjects);\n"
+"goto describe_physical_subjects;\n"
"}\n"
"\n"
-"for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)\n"
+"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
"{\n"
-"declare obj, phys_obj, maps any;\n"
+"declare s, phys_s, maps any;\n"
"declare maps_len integer;\n"
-"obj := all_objs [obj_ctr];\n"
-"maps := sparql_quad_maps_for_quad (NULL, NULL, NULL, obj, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);\n"
+"s := all_subjs [s_ctr];\n"
+"maps := sparql_quad_maps_for_quad (NULL, s, NULL, NULL, storage_name, case (graphs_listed) when 0 then vector() else sorted_good_graphs end, sorted_bad_graphs);\n"
"\n"
"maps_len := length (maps);\n"
"if ((maps_len > 0) and (inf_ruleset is null) and (maps[maps_len-1][0] = UNAME\'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap\'))\n"
"{\n"
-"if (not isnumeric (obj))\n"
-"{\n"
-"if (isiri_id (obj))\n"
+"if (isiri_id (s))\n"
"{\n"
-"phys_obj := obj;\n"
-"vectorbld_acc (phys_objects, phys_obj);\n"
+"phys_s := s;\n"
+"vectorbld_acc (phys_subjects, phys_s);\n"
"}\n"
"else\n"
"{\n"
-"phys_obj := iri_to_id (obj, 0, 0);\n"
-"if (not isinteger (phys_obj))\n"
-"vectorbld_acc (phys_objects, phys_obj);\n"
-"}\n"
+"phys_s := iri_to_id (s, 0, 0);\n"
+"if (not isinteger (phys_s))\n"
+"vectorbld_acc (phys_subjects, phys_s);\n"
"}\n"
"maps := subseq (maps, 0, maps_len-1);\n"
"maps_len := maps_len - 1;\n"
"}\n"
"if (maps_len > 0)\n"
-"all_objs [obj_ctr] := vector (obj, maps);\n"
+"all_subjs [s_ctr] := vector (s, maps);\n"
"else\n"
-"all_objs [obj_ctr] := 0;\n"
+"all_subjs [s_ctr] := 0;\n"
"\n"
"\n"
"}\n"
-"vectorbld_final (phys_objects);\n"
-"for (obj_ctr := 0; obj_ctr < all_obj_count; obj_ctr := obj_ctr + 1)\n"
+"vectorbld_final (phys_subjects);\n"
+"for (s_ctr := 0; s_ctr < all_s_count; s_ctr := s_ctr + 1)\n"
"{\n"
-"declare s_desc, obj, maps any;\n"
+"declare s_desc, s, maps any;\n"
"declare map_ctr, maps_len integer;\n"
"declare fname varchar;\n"
-"s_desc := all_objs [obj_ctr];\n"
+"s_desc := all_subjs [s_ctr];\n"
"if (isinteger (s_desc))\n"
"goto end_of_s;\n"
-"obj := s_desc[0];\n"
+"s := s_desc[0];\n"
"maps := s_desc[1];\n"
"maps_len := length (maps);\n"
-"fname := sprintf (\'SPARQL_DESC_DICT_OBJCBD_QMV1_%U\', md5 (storage_name || inf_ruleset || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));\n"
+"fname := sprintf (\'SPARQL_DESC_DICT_CBD_QMV1_%U\', md5 (storage_name || inf_ruleset || cast (graphs_listed as varchar) || md5_box (maps) || md5_box (sorted_bad_graphs)));\n"
"if (not exists (select top 1 1 from Db.DBA.SYS_PROCEDURES where P_NAME = \'DB.DBA.\' || fname))\n"
"{\n"
"declare ses, txt, saved_user any;\n"
"ses := string_output ();\n"
-"http (\'create procedure DB.DBA.\"\' || fname || \'\" (in obj any, in obj_dict any, in next_iter_objs any, in res any\', ses);\n"
+"http (\'create procedure DB.DBA.\"\' || fname || \'\" (in subj any, in subj_dict any, in next_iter_subjs any, in res any\', ses);\n"
"if (graphs_listed)\n"
"http (\', inout sorted_good_graphs any\', ses);\n"
"http (\')\\n\', ses);\n"
"http (\'{\\n\', ses);\n"
-"http (\' declare obj_iri varchar;\\n\', ses);\n"
-"http (\' obj_iri := id_to_iri_nosignal (obj);\\n\', ses);\n"
+"http (\' declare subj_iri varchar;\\n\', ses);\n"
+"http (\' subj_iri := id_to_iri_nosignal (subj);\\n\', ses);\n"
"http (\' for (sparql define output:valmode \"LONG\" define input:storage <\' || storage_name || \'> \', ses);\n"
"foreach (any g in sorted_bad_graphs) do\n"
"{\n"
@@ -8901,26 +7598,26 @@ static const char *proc249 =
"}\n"
"if (inf_ruleset is not null)\n"
"http (\' define input:inference <\' || inf_ruleset || \'>\\n\', ses);\n"
-"http (\'select ?g1 ?p1 ?s1 ?g2 ?st2\\n\', ses);\n"
+"http (\'select ?g1 ?p1 ?o1 ?g2 ?st2\\n\', ses);\n"
"http (\' where { graph ?g1 {\\n\', ses);\n"
"for (map_ctr := 0; map_ctr < maps_len; map_ctr := map_ctr + 1)\n"
"{\n"
"if (map_ctr > 0) http (\' union\\n\', ses);\n"
-"http (\' { quad map <\' || maps[map_ctr][0] || \'> { ?s1 ?p1 ?:obj_iri } }\\n\', ses);\n"
+"http (\' { quad map <\' || maps[map_ctr][0] || \'> { ?:subj_iri ?p1 ?o1 } }\\n\', ses);\n"
"}\n"
"http (\' }\\n\', ses);\n"
"http (\' optional { graph ?g2 {\\n\', ses);\n"
-"http (\' ?st2 a rdf:Statement ; rdf:object ?:obj_iri ; rdf:predicate ?p1 ; rdf:subject ?s1 } }\\n\', ses);\n"
+"http (\' ?st2 a rdf:Statement ; rdf:subject ?:subj_iri ; rdf:predicate ?p1 ; rdf:object ?o1 } }\\n\', ses);\n"
"http (\' } ) do {\\n\', ses);\n"
"if (graphs_listed)\n"
"http (\' if (position (__i2idn (\"g1\"), sorted_good_graphs)) {\\n\', ses);\n"
-"http (\' dict_bitor_or_put (res, vector (\"s1\", \"p1\", obj), 1);\\n\', ses);\n"
-"http (\' if (is_bnode_iri_id (\"s1\") and dict_get (obj_dict, \"s1\") is null)\\n\', ses);\n"
-"http (\' dict_put (next_iter_objs, \"s1\", 1);\\n\', ses);\n"
+"http (\' dict_bitor_or_put (res, vector (subj, \"p1\", \"o1\"), 1);\\n\', ses);\n"
+"http (\' if (isiri_id (\"o1\") and \"o1\" > min_bnode_iri_id() and dict_get (subj_dict, \"o1\") is null)\\n\', ses);\n"
+"http (\' dict_put (next_iter_subjs, \"o1\", 1);\\n\', ses);\n"
"if (graphs_listed)\n"
"http (\' if (position (__i2idn (\"g2\"), sorted_good_graphs)) {\\n\', ses);\n"
-"http (\' if (\"st2\" is not null and dict_get (obj_dict, \"st2\") is null)\\n\', ses);\n"
-"http (\' dict_put (next_iter_objs, \"s1\", 1);\\n\', ses);\n"
+"http (\' if (\"st2\" is not null and dict_get (subj_dict, \"st2\") is null)\\n\', ses);\n"
+"http (\' dict_put (next_iter_subjs, \"o1\", 1);\\n\', ses);\n"
"if (graphs_listed)\n"
"http (\' } }\\n\', ses);\n"
"http (\' } }\\n\', ses);\n"
@@ -8934,21 +7631,21 @@ static const char *proc249 =
"if (graphs_listed)\n"
"{\n"
"\n"
-"call (\'DB.DBA.\' || fname)(obj, obj_dict, next_iter_objs, res, sorted_good_graphs);\n"
+"call (\'DB.DBA.\' || fname)(s, subj_dict, next_iter_subjs, res, sorted_good_graphs);\n"
"}\n"
"else\n"
"{\n"
"\n"
-"call (\'DB.DBA.\' || fname)(obj, obj_dict, next_iter_objs, res);\n"
+"call (\'DB.DBA.\' || fname)(s, subj_dict, next_iter_subjs, res);\n"
"}\n"
"end_of_s: ;\n"
"}\n"
"\n"
-"describe_physical_objects:\n"
-"gvector_sort (phys_objects, 1, 0, 0);\n"
-"phys_obj_count := length (phys_objects);\n"
+"describe_physical_subjects:\n"
+"gvector_sort (phys_subjects, 1, 0, 0);\n"
+"phys_s_count := length (phys_subjects);\n"
"\n"
-"if (0 = phys_obj_count)\n"
+"if (0 = phys_s_count)\n"
"return res;\n"
"\n"
"if (graphs_listed)\n"
@@ -8959,23 +7656,23 @@ static const char *proc249 =
"{\n"
"declare graph any;\n"
"graph := sorted_good_graphs [g_ctr];\n"
-"for (obj_ctr := phys_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)\n"
+"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
-"declare obj any;\n"
-"obj := phys_objects [obj_ctr];\n"
-"for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where G = graph and O = obj) do\n"
+"declare subj any;\n"
+"subj := phys_subjects [s_ctr];\n"
+"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do\n"
"{\n"
"\n"
-"dict_bitor_or_put (res, vector (subj1, p1, __rdf_long_of_obj (obj)), 1);\n"
-"if (is_bnode_iri_id (subj1) and dict_get (obj_dict, subj1) is null)\n"
-"dict_put (next_iter_objs, subj1, 1);\n"
+"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
+"if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)\n"
+"dict_put (next_iter_subjs, obj1, 1);\n"
"for (sparql define output:valmode \"LONG\"\n"
"select ?g2 ?st2 where {\n"
"graph ?g2 {\n"
-"?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do\n"
+"?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do\n"
"{\n"
-"if (position (\"g2\", sorted_good_graphs) and dict_get (obj_dict, \"st2\") is null)\n"
-"dict_put (next_iter_objs, \"st2\", 1);\n"
+"if (position (\"g2\", sorted_good_graphs) and dict_get (subj_dict, \"st2\") is null)\n"
+"dict_put (next_iter_subjs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
@@ -8983,52 +7680,52 @@ static const char *proc249 =
"}\n"
"else\n"
"{\n"
-"for (obj_ctr := phys_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)\n"
+"for (s_ctr := phys_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
-"declare obj any;\n"
-"obj := phys_objects [obj_ctr];\n"
-"for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where\n"
+"declare subj any;\n"
+"subj := phys_subjects [s_ctr];\n"
+"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where\n"
"0 = position (G, sorted_bad_graphs) and\n"
-"O = obj and\n"
+"S = subj and\n"
"__rgs_ack_cbk (G, uid, 1) and\n"
"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do\n"
"{\n"
"\n"
-"dict_bitor_or_put (res, vector (subj1, p1, __rdf_long_of_obj (obj)), 1);\n"
-"if (is_bnode_iri_id (subj1) and dict_get (obj_dict, subj1) is null)\n"
-"dict_put (next_iter_objs, subj1, 1);\n"
+"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
+"if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)\n"
+"dict_put (next_iter_subjs, obj1, 1);\n"
"for (sparql define output:valmode \"LONG\"\n"
"select ?g2 ?st2 where {\n"
"graph ?g2 {\n"
-"?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do\n"
+"?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do\n"
"{\n"
"if (0 = position (\"g2\", sorted_bad_graphs) and\n"
-"dict_get (obj_dict, \"st2\") is null and\n"
+"dict_get (subj_dict, \"st2\") is null and\n"
"__rgs_ack_cbk (\"g2\", uid, 1) and\n"
"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (\"g2\", gs_app_uid))) )\n"
-"dict_put (next_iter_objs, \"st2\", 1);\n"
+"dict_put (next_iter_subjs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
"}\n"
"ret_or_next_iter:\n"
-"if (0 = dict_size (next_iter_objs))\n"
+"if (0 = dict_size (next_iter_subjs))\n"
"{\n"
"\n"
"return res;\n"
"}\n"
-"all_objs := dict_list_keys (next_iter_objs, 1);\n"
-"foreach (IRI_ID obj in all_objs) do dict_put (obj_dict, obj, 1);\n"
+"all_subjs := dict_list_keys (next_iter_subjs, 1);\n"
+"foreach (IRI_ID s in all_subjs) do dict_put (subj_dict, s, 1);\n"
"goto next_iteration;\n"
"}\n"
-"--src sparql.sql:8500\n";
+"--src sparql.sql:7245\n";
-static const char *proc250 =
-"#line 8770 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL (in obj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
+static const char *proc220 =
+"#line 7509 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL (in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
"{\n"
-"declare all_objs, sorted_good_graphs, sorted_bad_graphs, next_iter_objs, res any;\n"
-"declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, obj_ctr, all_obj_count integer;\n"
+"declare all_subjs, sorted_good_graphs, sorted_bad_graphs, next_iter_subjs, res any;\n"
+"declare uid, graphs_listed, g_ctr, good_g_count, bad_g_count, s_ctr, all_s_count integer;\n"
"declare gs_app_callback, gs_app_uid varchar;\n"
"declare rdf_type_iid IRI_ID;\n"
"uid := get_keyword (\'uid\', options, http_nobody_uid());\n"
@@ -9041,18 +7738,18 @@ static const char *proc250 =
"return res;\n"
"foreach (any c in consts) do\n"
"{\n"
-"if (not isnumeric (c))\n"
-"dict_put (obj_dict, c, 0);\n"
+"if (isiri_id (c))\n"
+"dict_put (subj_dict, c, 0);\n"
"}\n"
-"all_objs := dict_list_keys (obj_dict, 0);\n"
-"next_iter_objs := dict_new ();\n"
-"all_obj_count := length (all_objs);\n"
-"if (0 = all_obj_count)\n"
+"all_subjs := dict_list_keys (subj_dict, 0);\n"
+"next_iter_subjs := dict_new ();\n"
+"all_s_count := length (all_subjs);\n"
+"if (0 = all_s_count)\n"
"return res;\n"
"\n"
"next_iteration:\n"
-"all_obj_count := length (all_objs);\n"
-"gvector_sort (all_objs, 1, 0, 0);\n"
+"all_s_count := length (all_subjs);\n"
+"gvector_sort (all_subjs, 1, 0, 0);\n"
"\n"
"if (__tag of integer = __tag (good_graphs))\n"
"graphs_listed := 0;\n"
@@ -9061,7 +7758,7 @@ static const char *proc250 =
"vectorbld_init (sorted_good_graphs);\n"
"foreach (any g in good_graphs) do\n"
"{\n"
-"if (is_named_iri_id (g) and\n"
+"if (isiri_id (g) and g < min_bnode_iri_id () and\n"
"__rgs_ack_cbk (g, uid, 1) and\n"
"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (g, gs_app_uid))) )\n"
"vectorbld_acc (sorted_good_graphs, g);\n"
@@ -9075,13 +7772,13 @@ static const char *proc250 =
"vectorbld_init (sorted_bad_graphs);\n"
"foreach (any g in bad_graphs) do\n"
"{\n"
-"if (isnamed_iri_id (g))\n"
+"if (isiri_id (g) and g < min_bnode_iri_id ())\n"
"vectorbld_acc (sorted_bad_graphs, g);\n"
"}\n"
"vectorbld_final (sorted_bad_graphs);\n"
"bad_g_count := length (sorted_bad_graphs);\n"
"\n"
-"if (0 = all_obj_count)\n"
+"if (0 = all_s_count)\n"
"return res;\n"
"\n"
"if (graphs_listed)\n"
@@ -9092,23 +7789,23 @@ static const char *proc250 =
"{\n"
"declare graph any;\n"
"graph := sorted_good_graphs [g_ctr];\n"
-"for (obj_ctr := all_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)\n"
+"for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
-"declare obj any;\n"
-"obj := all_objs [obj_ctr];\n"
-"for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where G = graph and O = obj) do\n"
+"declare subj any;\n"
+"subj := all_subjs [s_ctr];\n"
+"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where G = graph and S = subj) do\n"
"{\n"
"\n"
-"dict_bitor_or_put (res, vector (subj1, p1, __rdf_long_of_obj (obj)), 1);\n"
-"if (is_bnode_iri_id (subj1) and dict_get (obj_dict, subj1) is null)\n"
-"dict_put (next_iter_objs, subj1, 1);\n"
+"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
+"if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)\n"
+"dict_put (next_iter_subjs, obj1, 1);\n"
"for (sparql define output:valmode \"LONG\"\n"
"select ?g2 ?st2 where {\n"
"graph ?g2 {\n"
-"?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do\n"
+"?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do\n"
"{\n"
-"if (position (\"g2\", sorted_good_graphs) and dict_get (obj_dict, \"st2\") is null)\n"
-"dict_put (next_iter_objs, \"st2\", 1);\n"
+"if (position (\"g2\", sorted_good_graphs) and dict_get (subj_dict, \"st2\") is null)\n"
+"dict_put (next_iter_subjs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
@@ -9116,81 +7813,49 @@ static const char *proc250 =
"}\n"
"else\n"
"{\n"
-"for (obj_ctr := all_obj_count - 1; obj_ctr >= 0; obj_ctr := obj_ctr - 1)\n"
+"for (s_ctr := all_s_count - 1; s_ctr >= 0; s_ctr := s_ctr - 1)\n"
"{\n"
-"declare obj any;\n"
-"obj := all_objs [obj_ctr];\n"
-"for (select P as p1, S as subj1 from DB.DBA.RDF_QUAD where\n"
+"declare subj any;\n"
+"subj := all_subjs [s_ctr];\n"
+"for (select P as p1, O as obj1 from DB.DBA.RDF_QUAD where\n"
"0 = position (G, sorted_bad_graphs) and\n"
-"O = obj and\n"
+"S = subj and\n"
"__rgs_ack_cbk (G, uid, 1) and\n"
"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (G, gs_app_uid))) ) do\n"
"{\n"
"\n"
-"dict_bitor_or_put (res, vector (subj1, p1, __rdf_long_of_obj (obj)), 1);\n"
-"if (is_bnode_iri_id (subj1) and dict_get (obj_dict, subj1) is null)\n"
-"dict_put (next_iter_objs, subj1, 1);\n"
+"dict_bitor_or_put (res, vector (subj, p1, __rdf_long_of_obj (obj1)), 1);\n"
+"if (isiri_id (obj1) and obj1 > min_bnode_iri_id() and dict_get (subj_dict, obj1) is null)\n"
+"dict_put (next_iter_subjs, obj1, 1);\n"
"for (sparql define output:valmode \"LONG\"\n"
"select ?g2 ?st2 where {\n"
"graph ?g2 {\n"
-"?st2 a rdf:Statement ; rdf:object ?:obj ; rdf:predicate ?:p1 ; rdf:subject ?:subj1 } } ) do\n"
+"?st2 a rdf:Statement ; rdf:subject ?:subj ; rdf:predicate ?:p1 ; rdf:object ?:obj1 } } ) do\n"
"{\n"
"if (0 = position (\"g2\", sorted_bad_graphs) and\n"
-"dict_get (obj_dict, \"st2\") is null and\n"
+"dict_get (subj_dict, \"st2\") is null and\n"
"__rgs_ack_cbk (\"g2\", uid, 1) and\n"
"(gs_app_callback is null or bit_and (1, call (gs_app_callback) (\"g2\", gs_app_uid))) )\n"
-"dict_put (next_iter_objs, \"st2\", 1);\n"
+"dict_put (next_iter_subjs, \"st2\", 1);\n"
"}\n"
"}\n"
"}\n"
"}\n"
"\n"
"ret_or_next_iter:\n"
-"if (0 = dict_size (next_iter_objs))\n"
+"if (0 = dict_size (next_iter_subjs))\n"
"{\n"
"\n"
"return res;\n"
"}\n"
-"all_objs := dict_list_keys (next_iter_objs, 1);\n"
-"foreach (IRI_ID obj in all_objs) do dict_put (obj_dict, obj, 1);\n"
+"all_subjs := dict_list_keys (next_iter_subjs, 1);\n"
+"foreach (IRI_ID s in all_subjs) do dict_put (subj_dict, s, 1);\n"
"goto next_iteration;\n"
"}\n"
-"--src sparql.sql:8768\n";
-
-static const char *proc251 =
-"#line 8902 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_DESC_DICT_SCBD (in node_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
-"{\n"
-"declare cbd_res, objcbd_res, triples any;\n"
-"cbd_res := DB.DBA.SPARQL_DESC_DICT_CBD (node_dict, consts, good_graphs, bad_graphs, storage_name, options);\n"
-"objcbd_res := DB.DBA.SPARQL_DESC_DICT_OBJCBD (node_dict, consts, good_graphs, bad_graphs, storage_name, options);\n"
-"again:\n"
-"triples := dict_destructive_list_rnd_keys (objcbd_res, 80000);\n"
-"if (0 = length (triples))\n"
-"return cbd_res;\n"
-"foreach (any triple in triples) do { dict_put (cbd_res, triple, 1); }\n"
-"goto again;\n"
-"}\n"
-"--src sparql.sql:8900\n";
-
-static const char *proc252 =
-"#line 8916 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.SPARQL_DESC_DICT_SCBD_PHYSICAL (in node_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any)\n"
-"{\n"
-"declare cbd_res, objcbd_res, triples any;\n"
-"cbd_res := DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL (node_dict, consts, good_graphs, bad_graphs, storage_name, options);\n"
-"objcbd_res := DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL (node_dict, consts, good_graphs, bad_graphs, storage_name, options);\n"
-"again:\n"
-"triples := dict_destructive_list_rnd_keys (objcbd_res, 80000);\n"
-"if (0 = length (triples))\n"
-"return cbd_res;\n"
-"foreach (any triple in triples) do { dict_put (cbd_res, triple, 1); }\n"
-"goto again;\n"
-"}\n"
-"--src sparql.sql:8914\n";
+"--src sparql.sql:7507\n";
-static const char *proc253 =
-"#line 8931 \"[executable]/sparql.sql\"\n"
+static const char *proc221 =
+"#line 7642 \"[executable]/sparql.sql\"\n"
" create procedure DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS (in dict any, in destructive integer := 0)\n"
"{\n"
"declare ctr, len integer;\n"
@@ -9198,7 +7863,8 @@ static const char *proc253 =
"declare S, P, O_DT, O_LANG varchar;\n"
"declare O_IS_IRI, dt_twobyte, lang_twobyte integer;\n"
"dict := dict_list_keys (dict, destructive);\n"
-"exec_result_names (vector (vector (\'S\', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector (\'P\', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector (\'O\', 125, 0, 2147483647, 1, 0, 0, 0, 0, 0, 0, 0)));\n"
+"result_names (S, P, O\n"
+");\n"
"len := length (dict);\n"
"for (ctr := 0; ctr < len; ctr := ctr+1)\n"
"{\n"
@@ -9220,15 +7886,15 @@ static const char *proc253 =
"\n"
"\n"
"\n"
-"else if (S is not null and P is not null and O is not null)\n"
+"else\n"
"result (S, P, O\n"
");\n"
"}\n"
"}\n"
-"--src sparql.sql:8929\n";
+"--src sparql.sql:7640\n";
-static const char *proc254 =
-"#line 8971 \"[executable]/sparql.sql\"\n"
+static const char *proc222 =
+"#line 7683 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_TYPEMIN_OF_OBJ (in obj any) returns any\n"
"{\n"
"declare tag integer;\n"
@@ -9245,10 +7911,10 @@ static const char *proc254 =
"return \'\';\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:8969\n";
+"--src sparql.sql:7681\n";
-static const char *proc255 =
-"#line 8989 \"[executable]/sparql.sql\"\n"
+static const char *proc223 =
+"#line 7701 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_TYPEMAX_OF_OBJ (in obj any) returns any\n"
"{\n"
"declare tag integer;\n"
@@ -9265,18 +7931,18 @@ static const char *proc255 =
"return \'\\377\\377\\377\\377\\377\\377\';\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:8987\n";
+"--src sparql.sql:7699\n";
-static const char *proc256 =
-"#line 9007 \"[executable]/sparql.sql\"\n"
+static const char *proc224 =
+"#line 7719 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_IID_CMP (in obj1 any, in obj2 any) returns integer\n"
"{\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:9005\n";
+"--src sparql.sql:7717\n";
-static const char *proc257 =
-"#line 9013 \"[executable]/sparql.sql\"\n"
+static const char *proc225 =
+"#line 7725 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_OBJ_CMP (in obj1 any, in obj2 any) returns integer\n"
"{\n"
"declare tag1, tag2 integer;\n"
@@ -9350,10 +8016,10 @@ static const char *proc257 =
"}\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:9011\n";
+"--src sparql.sql:7723\n";
-static const char *proc258 =
-"#line 9088 \"[executable]/sparql.sql\"\n"
+static const char *proc226 =
+"#line 7800 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_LONG_CMP (in long1 any, in long2 any) returns integer\n"
"{\n"
"declare tag1, tag2 integer;\n"
@@ -9397,10 +8063,10 @@ static const char *proc258 =
"}\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:9086\n";
+"--src sparql.sql:7798\n";
-static const char *proc259 =
-"#line 9135 \"[executable]/sparql.sql\"\n"
+static const char *proc227 =
+"#line 7847 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_DIST_SER_LONG (in val any) returns any\n"
"{\n"
"if (not (isstring (val)))\n"
@@ -9419,10 +8085,10 @@ static const char *proc259 =
"return val;\n"
"return serialize (val);\n"
"}\n"
-"--src sparql.sql:9133\n";
+"--src sparql.sql:7845\n";
-static const char *proc260 =
-"#line 9156 \"[executable]/sparql.sql\"\n"
+static const char *proc228 =
+"#line 7868 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_DIST_DESER_LONG (in strg any) returns any\n"
"{\n"
"if (not (isstring (strg)))\n"
@@ -9437,10 +8103,328 @@ static const char *proc260 =
"return res;\n"
"return rdf_box (res[0], res[1], res[2], 0, res[3]);\n"
"}\n"
-"--src sparql.sql:9154\n";
+"--src sparql.sql:7866\n";
-static const char *proc261 =
-"#line 9175 \"[executable]/sparql.sql\"\n"
+static const char *proc229 =
+"#line 7887 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.JSO_MAKE_INHERITANCE (in jgraph varchar, in class varchar, in rootinst varchar, in destinst varchar, in dest_iid iri_id, inout noinherits any, inout inh_stack any)\n"
+"{\n"
+"declare base_iid iri_id;\n"
+"declare baseinst varchar;\n"
+"\n"
+"inh_stack := vector_concat (inh_stack, vector (destinst));\n"
+"baseinst := null;\n"
+"if (not exists (sparql\n"
+"define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"ask where {\n"
+"graph ?:jgraph { ?:dest_iid rdf:type `iri(?:class)`\n"
+"} } ) )\n"
+"signal (\'22023\', \'JSO_MAKE_INHERITANCE has not found object <\' || destinst || \'> of type <\' || class || \'>\');\n"
+"/* This fails. !!!TBD: fix sparql2sql.c to preserve data about equalities, fixed values and globals when triples are moved from gp to gp\n"
+"for (sparql\n"
+"define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"select ?srcinst\n"
+"where {\n"
+"graph ?:jgraph {\n"
+"{ {\n"
+"?destnode rdf:type `iri(?:class)` .\n"
+"filter (?destnode = iri(?:destinst)) }\n"
+"union\n"
+"{\n"
+"?destnode rdf:type `iri(?:class)` .\n"
+"?destnode rdf:name `iri(?:destinst)` } } .\n"
+"?destnode virtrdf:inheritFrom ?srcinst .\n"
+"?srcinst rdf:type `iri(?:class)` .\n"
+"} } ) do\n"
+"*/\n"
+"for (sparql\n"
+"define input:storage \"\"\n"
+"define output:valmode \"LONG\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"select ?src_iid\n"
+"where {\n"
+"graph ?:jgraph { ?:dest_iid virtrdf:inheritFrom ?src_iid } } ) do\n"
+"{\n"
+"declare srcinst varchar;\n"
+"srcinst := id_to_iri_nosignal (\"src_iid\");\n"
+"if (baseinst is null)\n"
+"{\n"
+"if (not exists (sparql\n"
+"define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"ask where { graph ?:jgraph { ?:\"src_iid\" rdf:type `iri(?:class)` } } ) )\n"
+"signal (\'22023\', \'JSO_MAKE_INHERITANCE has found that the object <\' || destinst || \'> has wrong virtrdf:inheritFrom <\' || srcinst || \'> that is not an instance of type <\' || class || \'>\');\n"
+"base_iid := \"src_iid\";\n"
+"baseinst := srcinst;\n"
+"}\n"
+"else if (baseinst <> srcinst)\n"
+"signal (\'22023\', \'JSO_MAKE_INHERITANCE has found that the object <\' || destinst || \'> has multiple virtrdf:inheritFrom declarations: <\' || baseinst || \'> and <\' || srcinst || \'>\');\n"
+"}\n"
+"if (position (baseinst, inh_stack))\n"
+"signal (\'22023\', \'JSO_MAKE_INHERITANCE has found that the object <\' || baseinst || \'> is recursively inherited from itself\');\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"for (sparql\n"
+"define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"select ?pred\n"
+"where {\n"
+"graph ?:jgraph {\n"
+"?:dest_iid virtrdf:noInherit ?pred\n"
+"} } ) do\n"
+"{\n"
+"if (baseinst is null)\n"
+"signal (\'22023\', \'JSO_MAKE_INHERITANCE has found that the object <\' || destinst || \'> has set virtrdf:noInherit but has no virtrdf:inheritFrom\');\n"
+"dict_put (noinherits, \"pred\", destinst);\n"
+"}\n"
+"if (baseinst is null)\n"
+"return;\n"
+"for (select \"pred_id\", \"predval\"\n"
+"from (sparql\n"
+"define input:storage \"\"\n"
+"define output:valmode \"LONG\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"select ?pred_id, ?predval\n"
+"where {\n"
+"graph ?:jgraph {\n"
+"?:base_iid ?pred_id ?predval\n"
+"} } ) as \"t00\"\n"
+"where not exists (sparql\n"
+"define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"ask where { graph ?:jgraph { ?:\"t00\".\"pred_id\" virtrdf:loadAs virtrdf:jsoTriple } } )\n"
+") do\n"
+"{\n"
+"declare \"pred\" any;\n"
+"\"pred\" := id_to_iri (\"pred_id\");\n"
+"if (DB.DBA.RDF_LANGUAGE_OF_LONG (\"predval\", null) is not null)\n"
+"signal (\'22023\', \'JSO_MAKE_INHERITANCE does not support language marks on objects\');\n"
+"if (\'http://www.w3.org/1999/02/22-rdf-syntax-ns#type\' = \"pred\")\n"
+" ;\n"
+"else if (\'http://www.w3.org/1999/02/22-rdf-syntax-ns#name\' = \"pred\")\n"
+" ;\n"
+"else if (\'http://www.openlinksw.com/schemas/virtrdf#inheritFrom\' = \"pred\")\n"
+" ;\n"
+"else if (\'http://www.openlinksw.com/schemas/virtrdf#noInherit\' = \"pred\")\n"
+" ;\n"
+"else if (dict_get (noinherits, \"pred\", baseinst) = baseinst)\n"
+"{\n"
+"jso_set (class, rootinst, \"pred\", __rdf_sqlval_of_obj (\"predval\"), isiri_id (\"predval\"));\n"
+"dict_put (noinherits, \"pred\", baseinst);\n"
+"}\n"
+"}\n"
+"DB.DBA.JSO_MAKE_INHERITANCE (jgraph, class, rootinst, baseinst, base_iid, noinherits, inh_stack);\n"
+"}\n"
+"--src sparql.sql:7885\n";
+
+static const char *proc230 =
+"#line 8013 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.JSO_LOAD_INSTANCE (in jgraph varchar, in jinst varchar, in delete_first integer, in make_new integer, in jsubj_iid iri_id := 0)\n"
+"{\n"
+"declare jinst_iid, jgraph_iid IRI_ID;\n"
+"declare jclass varchar;\n"
+"declare noinherits, inh_stack, \"p\" any;\n"
+"\n"
+"noinherits := dict_new ();\n"
+"jinst_iid := iri_ensure (jinst);\n"
+"jgraph_iid := iri_ensure (jgraph);\n"
+"if (jsubj_iid is null)\n"
+"{\n"
+"jsubj_iid := (sparql\n"
+"define input:storage \"\"\n"
+"define output:valmode \"LONG\"\n"
+"select ?s\n"
+"where { graph ?:jgraph { ?s rdf:name ?:jinst } } );\n"
+"if (jsubj_iid is null)\n"
+"jsubj_iid := jinst_iid;\n"
+"}\n"
+"jclass := (sparql\n"
+"define input:storage \"\"\n"
+"select ?t\n"
+"where {\n"
+"graph ?:jgraph { ?:jsubj_iid rdf:type ?t } } );\n"
+"if (jclass is null)\n"
+"{\n"
+"if (exists (sparql\n"
+"define input:storage \"\"\n"
+"select ?x\n"
+"where { graph ?:jgraph {\n"
+"{ ?:jinst ?x ?o }\n"
+"union\n"
+"{ ?x rdf:name ?ji .\n"
+"filter (str (?ji) = ?:jinst)\n"
+"} } } ) )\n"
+"signal (\'22023\', \'JSO_LOAD_INSTANCE can not detect the type of <\' || jinst || \'>\');\n"
+"else\n"
+"signal (\'22023\', \'JSO_LOAD_INSTANCE can not find an object <\' || jinst || \'>\');\n"
+"}\n"
+"if (delete_first)\n"
+"jso_delete (jclass, jinst, 1);\n"
+"if (make_new)\n"
+"jso_new (jclass, jinst);\n"
+"for (select \"p_id\", coalesce (\"o2\", \"o1\") as \"o\"\n"
+"from (sparql\n"
+"define input:storage \"\"\n"
+"define output:valmode \"LONG\"\n"
+"select ?p_id ?o1 ?o2\n"
+"where {\n"
+"graph ?:jgraph {\n"
+"{ ?:jsubj_iid ?p_id ?o1 } optional { ?o1 rdf:name ?o2 }\n"
+"} }\n"
+") as \"t00\"\n"
+"where not exists (sparql\n"
+"define input:storage \"\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"ask where { graph ?:jgraph_iid { ?:\"t00\".\"p_id\" virtrdf:loadAs virtrdf:jsoTriple } } ) option (quietcast)\n"
+") do\n"
+"{\n"
+"\"p\" := id_to_iri (\"p_id\");\n"
+"if (DB.DBA.RDF_LANGUAGE_OF_LONG (\"o\", null) is not null)\n"
+"signal (\'22023\', \'JSO_LOAD_INSTANCE does not support language marks on objects\');\n"
+"if (\'http://www.w3.org/1999/02/22-rdf-syntax-ns#type\' = \"p\")\n"
+"{\n"
+"if (__rdf_sqlval_of_obj (\"o\") <> jclass)\n"
+"signal (\'22023\', \'JSO_LOAD_INSTANCE has found that the object <\' || jinst || \'> has multiple type declarations\');\n"
+"}\n"
+"else if (\'http://www.w3.org/1999/02/22-rdf-syntax-ns#name\' = \"p\")\n"
+" ;\n"
+"else if (\'http://www.openlinksw.com/schemas/virtrdf#inheritFrom\' = \"p\")\n"
+" ;\n"
+"else if (\'http://www.openlinksw.com/schemas/virtrdf#noInherit\' = \"p\")\n"
+" ;\n"
+"else\n"
+"{\n"
+"jso_set (jclass, jinst, \"p\", __rdf_sqlval_of_obj (\"o\"), isiri_id (\"o\"));\n"
+"dict_put (noinherits, \"p\", jinst);\n"
+"}\n"
+"}\n"
+"inh_stack := vector ();\n"
+"DB.DBA.JSO_MAKE_INHERITANCE (jgraph, jclass, jinst, jinst, jsubj_iid, noinherits, inh_stack);\n"
+"}\n"
+"--src sparql.sql:8011\n";
+
+static const char *proc231 =
+"#line 8097 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (in jgraph varchar, out instances any)\n"
+"{\n"
+"declare md, res, st, msg any;\n"
+"st:= \'00000\';\n"
+"exec (\n"
+"\'select DB.DBA.VECTOR_AGG (\n"
+"vector (\n"
+"id_to_iri (\"jclass\"),\n"
+"id_to_iri (\"jinst\"),\n"
+"coalesce (\"s\", \"jinst\") ) )\n"
+"from ( sparql\n"
+"define output:valmode \"LONG\"\n"
+"define input:storage \"\"\n"
+"select ?jclass ?jinst ?s\n"
+"where {\n"
+"graph ?? {\n"
+"{ ?jinst rdf:type ?jclass .\n"
+"filter (!isBLANK (?jinst)) }\n"
+"union\n"
+"{ ?s rdf:type ?jclass .\n"
+"?s rdf:name ?jinst .\n"
+"filter (isBLANK (?s))\n"
+"} } }\n"
+") as inst\',\n"
+"st, msg, vector (jgraph), 1, md, res);\n"
+"if (st <> \'00000\') signal (st, msg);\n"
+"instances := res[0][0];\n"
+"}\n"
+"--src sparql.sql:8095\n";
+
+static const char *proc232 =
+"#line 8127 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.JSO_LOAD_GRAPH (in jgraph varchar, in pin_now integer := 1)\n"
+"{\n"
+"declare jgraph_iid IRI_ID;\n"
+"declare instances, chk any;\n"
+"\n"
+"jgraph_iid := iri_ensure (jgraph);\n"
+"DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (jgraph, instances);\n"
+"/* Pass 1. Deleting all obsolete instances. */\n"
+"foreach (any j in instances) do\n"
+"jso_delete (j[0], j[1], 1);\n"
+"/* Pass 2. Creating all instances. */\n"
+"foreach (any j in instances) do\n"
+"jso_new (j[0], j[1]);\n"
+"/* Pass 3. Loading all instances, including loading inherited values. */\n"
+"foreach (any j in instances) do\n"
+"DB.DBA.JSO_LOAD_INSTANCE (jgraph, j[1], 0, 0, j[2]);\n"
+"/* Pass 4. Validation all instances. */\n"
+"foreach (any j in instances) do\n"
+"jso_validate (j[0], j[1], 1);\n"
+"/* Pass 5. Pin all instances. */\n"
+"if (pin_now)\n"
+"{\n"
+"foreach (any j in instances) do\n"
+"jso_pin (j[0], j[1]);\n"
+"}\n"
+"/* Pass 6. Load all separate triples */\n"
+"exec (\'sparql\n"
+"define input:storage \"\"\n"
+"define sql:table-option \"LOOP\"\n"
+"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
+"select (bif:jso_triple_add (?s, ?p, ?o))\n"
+"where { graph <\' || id_to_iri (jgraph_iid) || \'> { ?p virtrdf:loadAs virtrdf:jsoTriple . ?s ?p ?o } }\');\n"
+"chk := jso_triple_get_objs (\n"
+"UNAME\'http://www.openlinksw.com/schemas/virtrdf#loadAs\',\n"
+"UNAME\'http://www.openlinksw.com/schemas/virtrdf#loadAs\' );\n"
+"if ((1 <> length (chk)) or (cast (chk[0] as varchar) <> \'http://www.openlinksw.com/schemas/virtrdf#jsoTriple\'))\n"
+"signal (\'22023\', \'JSO_LOAD_GRAPH has not found expected metadata in the graph\');\n"
+"}\n"
+"--src sparql.sql:8125\n";
+
+static const char *proc233 =
+"#line 8167 \"[executable]/sparql.sql\"\n"
+"create function DB.DBA.JSO_PIN_GRAPH (in jgraph varchar)\n"
+"{\n"
+"declare instances any;\n"
+"DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (jgraph, instances);\n"
+"foreach (any j in instances) do\n"
+"jso_pin (j[0], j[1]);\n"
+"}\n"
+"--src sparql.sql:8165\n";
+
+static const char *proc234 =
+"#line 8177 \"[executable]/sparql.sql\"\n"
+" create function DB.DBA.JSO_SYS_GRAPH () returns varchar\n"
+"{\n"
+"return \'http://www.openlinksw.com/schemas/virtrdf#\';\n"
+"}\n"
+"--src sparql.sql:8175\n";
+
+static const char *proc235 =
+"#line 8184 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO (in graphiri varchar := null)\n"
+"{\n"
+"if (graphiri is null)\n"
+"graphiri := DB.DBA.JSO_SYS_GRAPH();\n"
+"DB.DBA.JSO_LOAD_GRAPH (graphiri, 0);\n"
+"DB.DBA.JSO_PIN_GRAPH (graphiri);\n"
+"}\n"
+"--src sparql.sql:8182\n";
+
+static const char *proc236 =
+"#line 8193 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH (in graphiri varchar := null)\n"
"{\n"
"if (graphiri is null)\n"
@@ -9450,23 +8434,18 @@ static const char *proc261 =
"DB.DBA.JSO_PIN_GRAPH (graphiri);\n"
"for (select P_NAME from SYS_PROCEDURES\n"
"where (\n"
-"(P_NAME > \'DB.DBA.SPARQL_DESC_DICT\') and\n"
-"(P_NAME < \'DB.DBA.SPARQL_DESC_DICU\') and\n"
-"(\n"
"(P_NAME like \'DB.DBA.SPARQL_DESC_DICT_QMV1_%\') or\n"
-"(P_NAME like \'DB.DBA.SPARQL_DESC_DICT_CBD_QMV1_%\') or\n"
-"(P_NAME like \'DB.DBA.SPARQL_DESC_DICT_OBJCBD_QMV1_%\') or\n"
-"(P_NAME like \'DB.DBA.SPARQL_DESC_DICT_SCBD_QMV1_%\') ) )\n"
+"(P_NAME like \'DB.DBA.SPARQL_DESC_DICT_CBD_QMV1_%\') )\n"
"for update) do\n"
"{\n"
"exec (\'drop procedure DB.DBA.\"\' || subseq (P_NAME, 7) || \'\"\');\n"
"}\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:9173\n";
+"--src sparql.sql:8191\n";
-static const char *proc262 =
-"#line 9199 \"[executable]/sparql.sql\"\n"
+static const char *proc237 =
+"#line 8212 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.JSO_DUMP_IRI (in v varchar, inout ses any)\n"
"{\n"
"\n"
@@ -9497,10 +8476,10 @@ static const char *proc262 =
"http_escape (v, 12, ses, 1, 1);\n"
"http (\'>\', ses);\n"
"}\n"
-"--src sparql.sql:9197\n";
+"--src sparql.sql:8210\n";
-static const char *proc263 =
-"#line 9231 \"[executable]/sparql.sql\"\n"
+static const char *proc238 =
+"#line 8244 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.JSO_DUMP_FLD (in v any, inout ses any)\n"
"{\n"
"declare v_tag integer;\n"
@@ -9530,10 +8509,10 @@ static const char *proc263 =
"http (\'>\', ses);\n"
"}\n"
"}\n"
-"--src sparql.sql:9229\n";
+"--src sparql.sql:8242\n";
-static const char *proc264 =
-"#line 9262 \"[executable]/sparql.sql\"\n"
+static const char *proc239 =
+"#line 8275 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.JSO_VECTOR_TO_TTL (inout proplist any) returns any\n"
"{\n"
"declare prev_obj, ses any;\n"
@@ -9576,10 +8555,10 @@ static const char *proc264 =
"http (\'.\\n\', ses);\n"
"return ses;\n"
"}\n"
-"--src sparql.sql:9260\n";
+"--src sparql.sql:8273\n";
-static const char *proc265 =
-"#line 9306 \"[executable]/sparql.sql\"\n"
+static const char *proc240 =
+"#line 8319 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.JSO_FILTERED_PROPLIST (in only_custom integer := 0, in loading_status integer := 1, in long_valmode integer := 1) returns any\n"
"{\n"
"declare proplist, res any;\n"
@@ -9656,20 +8635,20 @@ static const char *proc265 =
"vectorbld_final (res);\n"
"return res;\n"
"}\n"
-"--src sparql.sql:9304\n";
+"--src sparql.sql:8317\n";
-static const char *proc266 =
-"#line 9384 \"[executable]/sparql.sql\"\n"
+static const char *proc241 =
+"#line 8397 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.JSO_DUMP_ALL (in only_custom integer := 0, in loading_status integer := 1) returns any\n"
"{\n"
"declare proplist any;\n"
"proplist := DB.DBA.JSO_FILTERED_PROPLIST (only_custom, loading_status, 0);\n"
"return DB.DBA.JSO_VECTOR_TO_TTL (proplist);\n"
"}\n"
-"--src sparql.sql:9382\n";
+"--src sparql.sql:8395\n";
-static const char *proc267 =
-"#line 9395 \"[executable]/sparql.sql\"\n"
+static const char *proc242 =
+"#line 8408 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_BACKUP_METADATA (in save_to_file integer := 0, in backup_name varchar := null) returns varchar\n"
"{\n"
"declare proplist any;\n"
@@ -9702,10 +8681,10 @@ static const char *proc267 =
"}\n"
"return backup_name;\n"
"}\n"
-"--src sparql.sql:9393\n";
+"--src sparql.sql:8406\n";
-static const char *proc268 =
-"#line 9429 \"[executable]/sparql.sql\"\n"
+static const char *proc243 =
+"#line 8442 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_RESTORE_METADATA (in read_from_file integer, in backup_name varchar) returns any\n"
"{\n"
"declare graphiri_id IRI_ID;\n"
@@ -9746,10 +8725,10 @@ static const char *proc268 =
"commit work;\n"
"return backup_name;\n"
"}\n"
-"--src sparql.sql:9427\n";
+"--src sparql.sql:8440\n";
-static const char *proc269 =
-"#line 9471 \"[executable]/sparql.sql\"\n"
+static const char *proc244 =
+"#line 8484 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_AUDIT_METADATA (in fix_bugs integer := 0, in unlocker varchar := null, in graphiri varchar := null, in call_result_names integer := 1)\n"
"{\n"
"declare chksum varchar;\n"
@@ -9984,10 +8963,10 @@ static const char *proc269 =
"result (\'42000\', \'The previous error can not be fixed automatically. Sorry.\');\n"
"return;\n"
"}\n"
-"--src sparql.sql:9469\n";
+"--src sparql.sql:8482\n";
-static const char *proc270 =
-"#line 9710 \"[executable]/sparql.sql\"\n"
+static const char *proc245 =
+"#line 8723 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_CHANGE (in warninglist any)\n"
"{\n"
"declare STATE, MESSAGE varchar;\n"
@@ -9999,10 +8978,10 @@ static const char *proc270 =
"}\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:9708\n";
+"--src sparql.sql:8721\n";
-static const char *proc271 =
-"#line 9723 \"[executable]/sparql.sql\"\n"
+static const char *proc246 =
+"#line 8736 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_CHANGE_OPT (in cmdlist any)\n"
"{\n"
"declare cmdctr, cmdcount integer;\n"
@@ -10033,10 +9012,7 @@ static const char *proc271 =
"}\n"
"http (\')\', exectext);\n"
"STATE := \'00000\';\n"
-"warnings := exec (string_output_string (exectext), STATE, MESSAGE, arglist, 10000, md, rs);\n"
-"\n"
-"if (__tag of vector <> __tag (warnings) and __tag of vector = __tag (rs))\n"
-"warnings := case (length (rs)) when 0 then null else rs[0][0] end;\n"
+"warnings := exec (string_output_string (exectext), STATE, MESSAGE, arglist, md, rs);\n"
"\n"
"if (__tag of vector = __tag (warnings))\n"
"{\n"
@@ -10059,10 +9035,10 @@ static const char *proc271 =
"}\n"
"result (\'00000\', sprintf (\'%d RDF metadata manipulation operations done\', cmdcount));\n"
"}\n"
-"--src sparql.sql:9721\n";
+"--src sparql.sql:8734\n";
-static const char *proc272 =
-"#line 9781 \"[executable]/sparql.sql\"\n"
+static const char *proc247 =
+"#line 8791 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_APPLY_CHANGES (in deleted any, in affected any) returns any\n"
"{\n"
"declare ctr, len integer;\n"
@@ -10070,22 +9046,16 @@ static const char *proc272 =
"DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH ();\n"
"len := length (deleted);\n"
"for (ctr := 0; ctr < len; ctr := ctr + 2)\n"
-"{\n"
"jso_delete (deleted [ctr], deleted [ctr+1], 1);\n"
-"log_text (\'jso_delete (?,?,1)\', deleted [ctr], deleted [ctr+1]);\n"
-"}\n"
"len := length (affected);\n"
"for (ctr := 0; ctr < len; ctr := ctr + 1)\n"
-"{\n"
"jso_mark_affected (affected [ctr]);\n"
-"log_text (\'jso_mark_affected (?)\', affected [ctr]);\n"
-"}\n"
"return vector (vector (\'00000\', \'Transaction committed, SPARQL compiler re-configured\'));\n"
"}\n"
-"--src sparql.sql:9779\n";
+"--src sparql.sql:8789\n";
-static const char *proc273 =
-"#line 9802 \"[executable]/sparql.sql\"\n"
+static const char *proc248 =
+"#line 8806 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_ASSERT_JSO_TYPE (in inst varchar, in expected varchar, in allow_missing integer := 0) returns integer\n"
"{\n"
"declare actual varchar;\n"
@@ -10122,10 +9092,10 @@ static const char *proc273 =
"}\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:9800\n";
+"--src sparql.sql:8804\n";
-static const char *proc274 =
-"#line 9840 \"[executable]/sparql.sql\"\n"
+static const char *proc249 =
+"#line 8844 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_ASSERT_STORAGE_FLAG (in storage varchar, in req_flag integer)\n"
"{\n"
"declare graphiri varchar;\n"
@@ -10146,10 +9116,10 @@ static const char *proc274 =
"return;\n"
"signal (\'22023\', \'The quad storage \"\' || storage || \'\" is not flagged as being edited, cannot change it\' );\n"
"}\n"
-"--src sparql.sql:9838\n";
+"--src sparql.sql:8842\n";
-static const char *proc275 =
-"#line 9862 \"[executable]/sparql.sql\"\n"
+static const char *proc250 =
+"#line 8866 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_ASSERT_STORAGE_CONTAINS_MAPPING (in storage varchar, in qmid varchar, in must_contain integer)\n"
"{\n"
"declare graphiri varchar;\n"
@@ -10171,10 +9141,19 @@ static const char *proc275 =
"return;\n"
"signal (\'22023\', \'The quad storage \"\' || storage || \'\" does not contains quad map \' || qmid );\n"
"}\n"
-"--src sparql.sql:9860\n";
+"--src sparql.sql:8864\n";
-static const char *proc276 =
-"#line 9885 \"[executable]/sparql.sql\"\n"
+static const char *proc251 =
+"#line 8889 \"[executable]/sparql.sql\"\n"
+"create procedure DB.DBA.RDF_QM_ASSERT_STORAGE_IS_FLAGGED (in storage varchar)\n"
+"{\n"
+"if (not DB.DBA.RDF_QM_GET_STORAGE_FLAG (storage))\n"
+"signal (\'22023\', \'The quad storage \"\' || storage || \'\" is not flagged as being edited\' );\n"
+"}\n"
+"--src sparql.sql:8887\n";
+
+static const char *proc252 =
+"#line 8896 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_GC_SUBTREE (in seed any, in gc_flags integer := 0) returns integer\n"
"{\n"
"declare graphiri varchar;\n"
@@ -10320,10 +9299,10 @@ static const char *proc276 =
"\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:9883\n";
+"--src sparql.sql:8894\n";
-static const char *proc277 =
-"#line 10032 \"[executable]/sparql.sql\"\n"
+static const char *proc253 =
+"#line 9043 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_GC_MAPPING_SUBTREE (in mapname any, in gc_flags integer) returns any\n"
"{\n"
"declare gc_res, submaps any;\n"
@@ -10343,10 +9322,10 @@ static const char *proc277 =
"}\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:10030\n";
+"--src sparql.sql:9041\n";
-static const char *proc278 =
-"#line 10053 \"[executable]/sparql.sql\"\n"
+static const char *proc254 =
+"#line 9064 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DROP_MAPPING (in storage varchar, in mapname any) returns any\n"
"{\n"
"declare graphiri varchar;\n"
@@ -10381,8 +9360,6 @@ static const char *proc278 =
"DB.DBA.RDF_QM_ASSERT_JSO_TYPE (qmid, \'http://www.openlinksw.com/schemas/virtrdf#QuadMap\');\n"
"if (storage is null)\n"
"{\n"
-"declare report, storages any;\n"
-"vectorbld_init (storages);\n"
"for (sparql\n"
"define input:storage \"\"\n"
"select ?st where {\n"
@@ -10393,23 +9370,11 @@ static const char *proc278 =
"{ ?st virtrdf:qsDefaultMap `iri(?:qmid)` }\n"
"} } ) do\n"
"{\n"
-"DB.DBA.RDF_QM_ASSERT_STORAGE_FLAG (\"st\", 0);\n"
-"vectorbld_acc (storages, cast (\"st\" as varchar));\n"
-"}\n"
-"vectorbld_final (storages);\n"
-"vectorbld_init (report);\n"
-"foreach (varchar alt_st in storages) do\n"
-"{\n"
"\n"
-"DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (alt_st, NULL, qmid);\n"
-"vectorbld_acc (report, vector (\'00000\', \'Quad map <\' || qmid || \'> is no longer used in storage <\' || alt_st || \'>\'));\n"
+"DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (\"st\", NULL, qmid);\n"
"}\n"
"DB.DBA.RDF_QM_GC_MAPPING_SUBTREE (qmid, 0);\n"
-"vectorbld_acc (report, vector (\'00000\', \'Quad map <\' || qmid || \'> is deleted\'));\n"
-"vectorbld_final (report);\n"
-"if (length (storages))\n"
-"DB.DBA.RDF_QM_APPLY_CHANGES (null, storages);\n"
-"return report;\n"
+"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> is deleted\'));\n"
"}\n"
"else\n"
"{\n"
@@ -10418,10 +9383,10 @@ static const char *proc278 =
"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> is no longer used in storage <\' || storage || \'>\'));\n"
"}\n"
"}\n"
-"--src sparql.sql:10051\n";
+"--src sparql.sql:9062\n";
-static const char *proc279 =
-"#line 10126 \"[executable]/sparql.sql\"\n"
+static const char *proc255 =
+"#line 9123 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_MACROEXPAND_TEMPLATE (in iritmpl varchar) returns varchar\n"
"{\n"
"declare pos integer;\n"
@@ -10460,10 +9425,10 @@ static const char *proc279 =
"}\n"
"return iritmpl;\n"
"}\n"
-"--src sparql.sql:10124\n";
+"--src sparql.sql:9121\n";
-static const char *proc280 =
-"#line 10166 \"[executable]/sparql.sql\"\n"
+static const char *proc256 =
+"#line 9163 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_CBD_OF_IRI_CLASS (in classiri varchar) returns any\n"
"{\n"
"declare descr any;\n"
@@ -10491,10 +9456,10 @@ static const char *proc280 =
"rowvector_digit_sort (descr, 1, 1);\n"
"return descr;\n"
"}\n"
-"--src sparql.sql:10164\n";
+"--src sparql.sql:9161\n";
-static const char *proc281 =
-"#line 10195 \"[executable]/sparql.sql\"\n"
+static const char *proc257 =
+"#line 9192 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FORMAT (in classiri varchar, in iritmpl varchar, in arglist any, in options any, in origclassiri varchar := null) returns any\n"
"{\n"
"declare graphiri varchar;\n"
@@ -10699,10 +9664,10 @@ static const char *proc281 =
"commit work;\n"
"return vector_concat (res, vector_concat (res, vector (vector (\'00000\', \'IRI class <\' || classiri || \'> has been defined (inherited from rdfdf:\' || basetype || \')\'))));\n"
"}\n"
-"--src sparql.sql:10193\n";
+"--src sparql.sql:9190\n";
-static const char *proc282 =
-"#line 10401 \"[executable]/sparql.sql\"\n"
+static const char *proc258 =
+"#line 9398 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FUNCTIONS (in classiri varchar, in fheaders any, in options any, in origclassiri varchar := null) returns any\n"
"{\n"
"/*\n"
@@ -10866,10 +9831,10 @@ static const char *proc282 =
"commit work;\n"
"return vector_concat (res, vector (vector (\'00000\', \'IRI class <\' || classiri || \'> has been defined (inherited from rdfdf:\' || basetype || \') using \' || uriprintname)));\n"
"}\n"
-"--src sparql.sql:10399\n";
+"--src sparql.sql:9396\n";
-static const char *proc283 =
-"#line 10566 \"[executable]/sparql.sql\"\n"
+static const char *proc259 =
+"#line 9563 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FORMAT (in classiri varchar, in iritmpl varchar, in arglist any, in options any, in origclassiri varchar := null) returns any\n"
"{\n"
"declare graphiri varchar;\n"
@@ -11074,10 +10039,10 @@ static const char *proc283 =
"commit work;\n"
"return vector_concat (res, vector_concat (res, vector (vector (\'00000\', \'Literal class <\' || classiri || \'> has been defined (inherited from rdfdf:\' || basetype || \')\'))));\n"
"}\n"
-"--src sparql.sql:10564\n";
+"--src sparql.sql:9561\n";
-static const char *proc284 =
-"#line 10772 \"[executable]/sparql.sql\"\n"
+static const char *proc260 =
+"#line 9769 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FUNCTIONS (in classiri varchar, in fheaders any, in options any, in origclassiri varchar := null) returns any\n"
"{\n"
"/*\n"
@@ -11195,18 +10160,18 @@ static const char *proc284 =
"commit work;\n"
"return vector_concat (res, vector (vector (\'00000\', \'LITERAL class <\' || classiri || \'> has been defined (inherited from rdfdf:\' || basetype || \') using \' || uriprintname)));\n"
"}\n"
-"--src sparql.sql:10770\n";
+"--src sparql.sql:9767\n";
-static const char *proc285 =
-"#line 10892 \"[executable]/sparql.sql\"\n"
+static const char *proc261 =
+"#line 9889 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_BAD_CLASS_INV_FUNCTION (inout val any) returns any\n"
"{\n"
"return NULL;\n"
"}\n"
-"--src sparql.sql:10890\n";
+"--src sparql.sql:9887\n";
-static const char *proc286 =
-"#line 10899 \"[executable]/sparql.sql\"\n"
+static const char *proc262 =
+"#line 9896 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.SQLNAME_NOTATION_TO_NAME (in str varchar) returns varchar\n"
"{\n"
"if (\'\' = str)\n"
@@ -11215,10 +10180,10 @@ static const char *proc286 =
"return subseq (str, 1, length (str) - 1);\n"
"return fix_identifier_case (str);\n"
"}\n"
-"--src sparql.sql:10897\n";
+"--src sparql.sql:9894\n";
-static const char *proc287 =
-"#line 10910 \"[executable]/sparql.sql\"\n"
+static const char *proc263 =
+"#line 9907 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.SQLQNAME_NOTATION_TO_QNAME (in str varchar, in expected_part_count integer) returns varchar\n"
"{\n"
"declare part_ctr, dot_pos integer;\n"
@@ -11254,10 +10219,10 @@ static const char *proc287 =
"return NULL;\n"
"return res || name;\n"
"}\n"
-"--src sparql.sql:10908\n";
+"--src sparql.sql:9905\n";
-static const char *proc288 =
-"#line 10947 \"[executable]/sparql.sql\"\n"
+static const char *proc264 =
+"#line 9944 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_CHECK_CLASS_FUNCTION_HEADERS (inout fheaders any, in is_iri_decl integer, in only_one_arg integer, in pdesc varchar, in invdesc varchar, in bij integer, in deref integer)\n"
"{\n"
"declare uriprint any;\n"
@@ -11342,10 +10307,10 @@ static const char *proc288 =
"signal (\'22023\', invdesc || \' function \' || uriparse[0] || \' should have nullable argument\');\n"
"}\n"
"}\n"
-"--src sparql.sql:10945\n";
+"--src sparql.sql:9942\n";
-static const char *proc289 =
-"#line 11033 \"[executable]/sparql.sql\"\n"
+static const char *proc265 =
+"#line 10030 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DEFINE_SUBCLASS (in subclassiri varchar, in superclassiri varchar) returns any\n"
"{\n"
"DB.DBA.RDF_QM_ASSERT_JSO_TYPE (subclassiri, \'http://www.openlinksw.com/schemas/virtrdf#QuadMapFormat\');\n"
@@ -11357,10 +10322,10 @@ static const char *proc289 =
"commit work;\n"
"return vector (vector (\'00000\', \'IRI class <\' || subclassiri || \'> is now known as a subclass of <\' || superclassiri || \'>\'));\n"
"}\n"
-"--src sparql.sql:11031\n";
+"--src sparql.sql:10028\n";
-static const char *proc290 =
-"#line 11046 \"[executable]/sparql.sql\"\n"
+static const char *proc266 =
+"#line 10043 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DROP_CLASS (in classiri varchar, in silent integer := 0) returns any\n"
"{\n"
"declare graphiri varchar;\n"
@@ -11381,10 +10346,10 @@ static const char *proc290 =
"commit work;\n"
"return vector (vector (\'00000\', \'Previous definition of class <\' || classiri || \'> has been dropped\'));\n"
"}\n"
-"--src sparql.sql:11044\n";
+"--src sparql.sql:10041\n";
-static const char *proc291 =
-"#line 11068 \"[executable]/sparql.sql\"\n"
+static const char *proc267 =
+"#line 10065 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DROP_QUAD_STORAGE (in storage varchar, in silent integer := 0) returns any\n"
"{\n"
"declare graphiri varchar;\n"
@@ -11406,10 +10371,10 @@ static const char *proc291 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad storage <\' || storage || \'> is removed from the quad mapping schema\'));\n"
"}\n"
-"--src sparql.sql:11066\n";
+"--src sparql.sql:10063\n";
-static const char *proc292 =
-"#line 11091 \"[executable]/sparql.sql\"\n"
+static const char *proc268 =
+"#line 10088 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DEFINE_QUAD_STORAGE (in storage varchar) returns any\n"
"{\n"
"declare graphiri, qsusermaps varchar;\n"
@@ -11437,10 +10402,10 @@ static const char *proc292 =
"commit work;\n"
"return vector (vector (\'00000\', \'A new empty quad storage <\' || storage || \'> is added to the quad mapping schema\'));\n"
"}\n"
-"--src sparql.sql:11089\n";
+"--src sparql.sql:10086\n";
-static const char *proc293 =
-"#line 11120 \"[executable]/sparql.sql\"\n"
+static const char *proc269 =
+"#line 10117 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_BEGIN_ALTER_QUAD_STORAGE (in storage varchar) returns any\n"
"{\n"
"declare graphiri varchar;\n"
@@ -11453,10 +10418,10 @@ static const char *proc293 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad storage <\' || storage || \'> is flagged as being edited\'));\n"
"}\n"
-"--src sparql.sql:11118\n";
+"--src sparql.sql:10115\n";
-static const char *proc294 =
-"#line 11134 \"[executable]/sparql.sql\"\n"
+static const char *proc270 =
+"#line 10131 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_END_ALTER_QUAD_STORAGE (in storage varchar) returns any\n"
"{\n"
"declare graphiri varchar;\n"
@@ -11471,10 +10436,10 @@ static const char *proc294 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad storage <\' || storage || \'> is unflagged and can be edited by other transactions\'));\n"
"}\n"
-"--src sparql.sql:11132\n";
+"--src sparql.sql:10129\n";
-static const char *proc295 =
-"#line 11150 \"[executable]/sparql.sql\"\n"
+static const char *proc271 =
+"#line 10147 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_STORE_ATABLES (in qmvid varchar, in atablesid varchar, inout atables any)\n"
"{\n"
"declare atablectr, atablecount integer;\n"
@@ -11503,10 +10468,10 @@ static const char *proc295 =
"virtrdf:qmvaTableName ?:qtable };\n"
"}\n"
"}\n"
-"--src sparql.sql:11148\n";
+"--src sparql.sql:10145\n";
-static const char *proc296 =
-"#line 11180 \"[executable]/sparql.sql\"\n"
+static const char *proc272 =
+"#line 10177 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_FT_USAGE (in ft_type varchar, in ft_alias varchar, in ft_aliased_col any, in sqlcols any, in conds any, in options any := null)\n"
"{\n"
"declare ft_tbl, ft_col, ftid, ftcondsid varchar;\n"
@@ -11570,10 +10535,10 @@ static const char *proc296 =
"}\n"
"return ftid;\n"
"}\n"
-"--src sparql.sql:11178\n";
+"--src sparql.sql:10175\n";
-static const char *proc297 =
-"#line 11245 \"[executable]/sparql.sql\"\n"
+static const char *proc273 =
+"#line 10242 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_CHECK_COLUMNS_FORM_KEY (in sqlcols any) returns integer\n"
"{\n"
"declare alias, tbl varchar;\n"
@@ -11611,10 +10576,10 @@ static const char *proc297 =
"}\n"
"return 0;\n"
"}\n"
-"--src sparql.sql:11243\n";
+"--src sparql.sql:10240\n";
-static const char *proc298 =
-"#line 11284 \"[executable]/sparql.sql\"\n"
+static const char *proc274 =
+"#line 10281 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DEFINE_MAP_VALUE (in qmv any, in fldname varchar, inout tablename varchar, in o_dt any := null, in o_lang any := null) returns varchar\n"
"{\n"
"/* iqi qmv: vector ( UNAME\'http://www.openlinksw.com/schemas/oplsioc#user_iri\' ,\n"
@@ -11890,10 +10855,10 @@ static const char *proc298 =
"}\n"
"return qmvid;\n"
"}\n"
-"--src sparql.sql:11282\n";
+"--src sparql.sql:10279\n";
-static const char *proc299 =
-"#line 11561 \"[executable]/sparql.sql\"\n"
+static const char *proc275 =
+"#line 10558 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_NORMALIZE_QMV (\n"
"inout qmv any, inout qmvfix any, inout qmvid any,\n"
"in can_be_literal integer, in fldname varchar, inout tablename varchar, in o_dt any := null, in o_lang any := null )\n"
@@ -11914,10 +10879,10 @@ static const char *proc299 =
"qmvfix := qmv;\n"
"\n"
"}\n"
-"--src sparql.sql:11559\n";
+"--src sparql.sql:10556\n";
-static const char *proc300 =
-"#line 11583 \"[executable]/sparql.sql\"\n"
+static const char *proc276 =
+"#line 10580 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_DEFINE_MAPPING (in storage varchar,\n"
"in qmrawid varchar, in qmid varchar, in qmparentid varchar,\n"
"in qmv_g any, in qmv_s any, in qmv_p any, in qmv_o any, in o_dt any, in o_lang any,\n"
@@ -11982,7 +10947,7 @@ static const char *proc300 =
"qm_empty := NULL;\n"
"if (tablename is null)\n"
"{\n"
-"tablename := \'DB.DBA.SYS_IDONLY_ONE\';\n"
+"tablename := \'DB.DBA.SYS_FAKE_1\';\n"
"if (0 < length (conds))\n"
"signal (\'22023\', \'Quad Mapping <\' || qmid || \'> has four constants and no one quad map value; it does not access tables so it can not have WHERE conditions\');\n"
"}\n"
@@ -12097,10 +11062,10 @@ static const char *proc300 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> has been created and added to the <\' || storage || \'>\'));\n"
"}\n"
-"--src sparql.sql:11581\n";
+"--src sparql.sql:10578\n";
-static const char *proc301 =
-"#line 11764 \"[executable]/sparql.sql\"\n"
+static const char *proc277 =
+"#line 10761 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_QM_ATTACH_MAPPING (in storage varchar, in source varchar, in opts any) returns any\n"
"{\n"
"declare graphiri varchar;\n"
@@ -12143,10 +11108,10 @@ static const char *proc301 =
"commit work;\n"
"return vector (vector (\'00000\', \'Quad map <\' || qmid || \'> is added to the storage <\' || storage || \'>\'));\n"
"}\n"
-"--src sparql.sql:11762\n";
+"--src sparql.sql:10759\n";
-static const char *proc302 =
-"#line 11808 \"[executable]/sparql.sql\"\n"
+static const char *proc278 =
+"#line 10805 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_ADD_MAPPING_TO_STORAGE (in storage varchar, in qmparent varchar, in qmid varchar, in qmorder integer)\n"
"{\n"
"declare graphiri, lstiri varchar;\n"
@@ -12236,10 +11201,10 @@ static const char *proc302 =
"ctr := ctr + 1;\n"
"}\n"
"}\n"
-"--src sparql.sql:11806\n";
+"--src sparql.sql:10803\n";
-static const char *proc303 =
-"#line 11899 \"[executable]/sparql.sql\"\n"
+static const char *proc279 =
+"#line 10896 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE (in storage varchar, in qmparent varchar, in qmid varchar)\n"
"{\n"
"declare graphiri, lstiri varchar;\n"
@@ -12314,10 +11279,10 @@ static const char *proc303 =
"}\n"
"}\n"
"}\n"
-"--src sparql.sql:11897\n";
+"--src sparql.sql:10894\n";
-static const char *proc304 =
-"#line 11975 \"[executable]/sparql.sql\"\n"
+static const char *proc280 =
+"#line 10972 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QM_SET_DEFAULT_MAPPING (in storage varchar, in qmid varchar)\n"
"{\n"
"declare graphiri, old_qmid varchar;\n"
@@ -12336,198 +11301,10 @@ static const char *proc304 =
"insert in graph <http://www.openlinksw.com/schemas/virtrdf#> { `iri(?:storage)` virtrdf:qsDefaultMap `iri(?:qmid)` . };\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:11973\n";
-
-static const char *proc305 =
-"#line 11995 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_SML_DROP (in smliri varchar, in silent integer, in compose_report integer := 1) returns any\n"
-"{\n"
-"declare report, affected any;\n"
-"report := \'\';\n"
-"vectorbld_init (affected);\n"
-"for (sparql define input:storage \"\"\n"
-"select ?storageiri\n"
-"from virtrdf:\n"
-"where { ?storageiri virtrdf:qsMacroLibrary `iri(?:smliri)` } ) do\n"
-"{\n"
-"report := report || \'SPARQL macro library <\' || smliri || \'> has been detached from quad storage <\' || \"storageiri\" || \'>\\n\';\n"
-"vectorbld_acc (affected, \"storageiri\");\n"
-"}\n"
-"vectorbld_final (affected);\n"
-"sparql define input:storage \"\"\n"
-"delete from virtrdf:\n"
-"{ ?storageiri virtrdf:qsMacroLibrary `iri(?:smliri)` }\n"
-"from virtrdf:\n"
-"where { ?storageiri virtrdf:qsMacroLibrary `iri(?:smliri)` };\n"
-"commit work;\n"
-"if (not exists (\n"
-"sparql define input:storage \"\"\n"
-"select 1 from virtrdf: where { `iri(?:smliri)` ?p ?o } ) )\n"
-"{\n"
-"DB.DBA.RDF_QM_APPLY_CHANGES (null, affected);\n"
-"if (silent)\n"
-"{\n"
-"if (compose_report)\n"
-"return report || \'SPARQL macro library <\' || smliri || \'> does not exists, nothing to delete\';\n"
-"else\n"
-"return 0;\n"
-"}\n"
-"else\n"
-"signal (\'22023\', \'SPARQL macro library <\' || smliri || \'> does not exists, nothing to delete\');\n"
-"}\n"
-"DB.DBA.RDF_QM_ASSERT_JSO_TYPE (smliri, \'http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary\');\n"
-"sparql define input:storage \"\"\n"
-"delete from graph virtrdf: {\n"
-"`iri(?:smliri)` ?p ?o }\n"
-"from virtrdf:\n"
-"where { `iri(?:smliri)` ?p ?o };\n"
-"DB.DBA.RDF_QM_APPLY_CHANGES (vector (\'http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary\', smliri), affected);\n"
-"if (compose_report)\n"
-"return report || \'SPARQL macro library <\' || smliri || \'> has been deleted\';\n"
-"else\n"
-"return 1;\n"
-"}\n"
-"--src sparql.sql:11993\n";
-
-static const char *proc306 =
-"#line 12044 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_SML_CREATE (in smliri varchar, in txt varchar) returns any\n"
-"{\n"
-"declare stat, msg, smliri_copy varchar;\n"
-"declare mdata, rset, affected any;\n"
-"DB.DBA.RDF_QM_ASSERT_JSO_TYPE (smliri, \'http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary\', 1);\n"
-"stat := \'00000\';\n"
-"if (__tag (txt) = __tag of nvarchar)\n"
-"txt := charset_recode (txt, \'_WIDE_\', \'UTF-8\');\n"
-"exec (\'sparql define input:macro-lib-ignore-create \"yes\" define input:disable-storage-macro-lib \"yes\" \' || txt, stat, msg, null, 1, mdata, rset);\n"
-"if (stat <> \'00000\')\n"
-"signal (stat, msg);\n"
-"if (length (rset))\n"
-"signal (\'SPAR0\', \'Assertion failed: the validation query of macro library should return nothing\');\n"
-"vectorbld_init (affected);\n"
-"for (sparql define input:storage \"\"\n"
-"select ?storageiri\n"
-"from virtrdf:\n"
-"where { ?storageiri virtrdf:qsMacroLibrary `iri(?:smliri)` } ) do\n"
-"{\n"
-"vectorbld_acc (affected, \"storageiri\");\n"
-"}\n"
-"smliri_copy := smliri;\n"
-"vectorbld_acc (affected, smliri_copy);\n"
-"vectorbld_final (affected);\n"
-"sparql define input:storage \"\"\n"
-"delete from graph <http://www.openlinksw.com/schemas/virtrdf#> {\n"
-"`iri(?:smliri)` ?p ?o }\n"
-"from <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"where { `iri(?:smliri)` ?p ?o };\n"
-"commit work;\n"
-"sparql define input:storage \"\"\n"
-"insert in graph <http://www.openlinksw.com/schemas/virtrdf#> {\n"
-"`iri(?:smliri)` a virtrdf:SparqlMacroLibrary ; virtrdf:smlSourceText ?:txt };\n"
-"DB.DBA.RDF_QM_APPLY_CHANGES (null, affected);\n"
-"return \'SPARQL macro library <\' || smliri || \'> has been (re)created\';\n"
-"}\n"
-"--src sparql.sql:12042\n";
-
-static const char *proc307 =
-"#line 12082 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY (in storageiri varchar, in args any) returns any\n"
-"{\n"
-"declare expected_smliri varchar;\n"
-"declare old_ctr, expected_found integer;\n"
-"declare silent, report any;\n"
-"expected_smliri := get_keyword_ucase (\'ID\', args, NULL);\n"
-"silent := get_keyword_ucase (\'SILENT\', args, 0);\n"
-"expected_found := 0;\n"
-"old_ctr := 0;\n"
-"vectorbld_init (report);\n"
-"for (sparql define input:storage \"\"\n"
-"select ?oldsmliri\n"
-"from virtrdf:\n"
-"where { ?storageiri virtrdf:qsMacroLibrary ?oldsmliri } ) do\n"
-"{\n"
-"if (expected_smliri is not null and cast (expected_smliri as nvarchar) <> cast (\"oldsmliri\" as nvarchar))\n"
-"{\n"
-"if (silent)\n"
-"vectorbld_acc (report, vector (\'00100\', \'The SPARQL macro library to detach from <\' || storageiri || \'> is <\' || expected_smliri || \'> but actually attached one is <\' || \"oldsmliri\" || \'>, nothing to do\'));\n"
-"else\n"
-"signal (\'22023\', \'The SPARQL macro library to detach from <\' || storageiri || \'> is <\' || expected_smliri || \'> but actually attached one is <\' || \"oldsmliri\" || \'>\');\n"
-"}\n"
-"else\n"
-"{\n"
-"if (expected_smliri is not null)\n"
-"expected_found := 1;\n"
-"vectorbld_acc (report, vector (\'00000\', \'SPARQL macro library <\' || \"oldsmliri\" || \'> has been detached from quad storage <\' || storageiri || \'>\'));\n"
-"}\n"
-"old_ctr := old_ctr + 1;\n"
-"}\n"
-"if (expected_smliri is not null)\n"
-"{\n"
-"sparql define input:storage \"\"\n"
-"delete from virtrdf:\n"
-"{ ?storageiri virtrdf:qsMacroLibrary ?smliri }\n"
-"from virtrdf:\n"
-"where { ?storageiri virtrdf:qsMacroLibrary ?smliri };\n"
-"}\n"
-"else\n"
-"{\n"
-"sparql define input:storage \"\"\n"
-"delete from virtrdf:\n"
-"{ ?storageiri virtrdf:qsMacroLibrary ?smliri }\n"
-"from virtrdf:\n"
-"where { ?storageiri virtrdf:qsMacroLibrary ?smliri };\n"
-"}\n"
-"commit work;\n"
-"if (old_ctr > 1)\n"
-"vectorbld_acc (report, vector (\'00100\', \'Note that there was a configuration error: more than one macro library was attached to the quad storage <\' || storageiri || \'>\'));\n"
-"else if (old_ctr = 0)\n"
-"{\n"
-"if (silent)\n"
-"vectorbld_acc (report, vector (\'00100\', \'No one SPARQL macro library is attached to the quad storage <\' || storageiri || \'>, nothing to detach\'));\n"
-"else\n"
-"signal (\'22023\', \'No one SPARQL macro library is attached to the quad storage <\' || storageiri || \'>, nothing to detach\');\n"
-"}\n"
-"vectorbld_final (report);\n"
-"\n"
-"return report;\n"
-"}\n"
-"--src sparql.sql:12080\n";
-
-static const char *proc308 =
-"#line 12144 \"[executable]/sparql.sql\"\n"
-"create function DB.DBA.RDF_QM_ATTACH_MACRO_LIBRARY (in storageiri varchar, in args any) returns any\n"
-"{\n"
-"declare smliri varchar;\n"
-"smliri := get_keyword_ucase (\'ID\', args, NULL);\n"
-"DB.DBA.RDF_QM_ASSERT_JSO_TYPE (storageiri, \'http://www.openlinksw.com/schemas/virtrdf#QuadStorage\');\n"
-"DB.DBA.RDF_QM_ASSERT_JSO_TYPE (smliri, \'http://www.openlinksw.com/schemas/virtrdf#SparqlMacroLibrary\');\n"
-"declare report any;\n"
-"vectorbld_init (report);\n"
-"for (sparql define input:storage \"\"\n"
-"select ?oldsmliri\n"
-"from virtrdf:\n"
-"where { ?storageiri virtrdf:qsMacroLibrary ?oldsmliri } ) do\n"
-"{\n"
-"vectorbld_acc (report, vector (\'00000\', \'SPARQL macro library <\' || \"oldsmliri\" || \'> has been detached from quad storage <\' || storageiri || \'>\'));\n"
-"}\n"
-"sparql define input:storage \"\"\n"
-"delete from virtrdf:\n"
-"{ ?storageiri virtrdf:qsMacroLibrary ?oldsmliri }\n"
-"from virtrdf:\n"
-"where { ?storageiri virtrdf:qsMacroLibrary ?oldsmliri };\n"
-"commit work;\n"
-"sparql define input:storage \"\"\n"
-"prefix rdfdf: <http://www.openlinksw.com/virtrdf-data-formats#>\n"
-"insert in graph virtrdf: {\n"
-"`iri(?:storageiri)` virtrdf:qsMacroLibrary `iri(?:smliri)` };\n"
-"vectorbld_acc (report, vector (\'00000\', \'SPARQL macro library <\' || smliri || \'> has been attached to quad storage <\' || storageiri || \'>\'));\n"
-"vectorbld_final (report);\n"
-"return report;\n"
-"}\n"
-"--src sparql.sql:12142\n";
+"--src sparql.sql:10970\n";
-static const char *proc309 =
-"#line 12175 \"[executable]/sparql.sql\"\n"
+static const char *proc281 =
+"#line 10992 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_ADD_qmAliasesKeyrefdByQuad (in qm_iri varchar)\n"
"{\n"
"declare kr_iri varchar;\n"
@@ -12581,10 +11358,10 @@ static const char *proc309 =
"}\n"
"\n"
"}\n"
-"--src sparql.sql:12173\n";
+"--src sparql.sql:10990\n";
-static const char *proc310 =
-"#line 12230 \"[executable]/sparql.sql\"\n"
+static const char *proc282 =
+"#line 11047 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_UPGRADE_QUAD_MAP (in qm_iri varchar)\n"
"{\n"
"declare keyrefd any;\n"
@@ -12593,10 +11370,10 @@ static const char *proc310 =
"if (not exists (sparql define input:storage \"\" select (1) from virtrdf: where { `iri(?:qm_iri)` virtrdf:qmAliasesKeyrefdByQuad ?keyrefs }))\n"
"DB.DBA.RDF_ADD_qmAliasesKeyrefdByQuad (qm_iri);\n"
"}\n"
-"--src sparql.sql:12228\n";
+"--src sparql.sql:11045\n";
-static const char *proc311 =
-"#line 12240 \"[executable]/sparql.sql\"\n"
+static const char *proc283 =
+"#line 11057 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_UPGRADE_METADATA ()\n"
"{\n"
"for (sparql define input:storage \"\" select ?qm_iri from virtrdf: where { ?qm_iri a virtrdf:QuadMap }) do\n"
@@ -12605,10 +11382,10 @@ static const char *proc311 =
"}\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:12238\n";
+"--src sparql.sql:11055\n";
-static const char *proc312 =
-"#line 12254 \"[executable]/sparql.sql\"\n"
+static const char *proc284 =
+"#line 11071 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_W (\n"
"in g_iid IRI_ID, in s_uri varchar, in p_uri varchar,\n"
"in o_uri varchar, in env any )\n"
@@ -12671,10 +11448,10 @@ static const char *proc312 =
"rollback work;\n"
"goto again_2;\n"
"}\n"
-"--src sparql.sql:12252\n";
+"--src sparql.sql:11069\n";
-static const char *proc313 =
-"#line 12319 \"[executable]/sparql.sql\"\n"
+static const char *proc285 =
+"#line 11136 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_L_W (\n"
"in g_iid IRI_ID, in s_uri varchar, in p_uri varchar,\n"
"in o_val any, in o_type any, in o_lang any, in env any )\n"
@@ -12746,10 +11523,10 @@ static const char *proc313 =
"rollback work;\n"
"goto again;\n"
"}\n"
-"--src sparql.sql:12317\n";
+"--src sparql.sql:11134\n";
-static const char *proc314 =
-"#line 12392 \"[executable]/sparql.sql\"\n"
+static const char *proc286 =
+"#line 11209 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_NEW_GRAPH_A (inout g varchar, inout g_iid IRI_ID, inout app_env any) {\n"
"\n"
"if (__rdf_obj_ft_rule_count_in_graph (g_iid))\n"
@@ -12761,10 +11538,10 @@ static const char *proc314 =
"else\n"
"app_env[4] := null;\n"
"}\n"
-"--src sparql.sql:12390\n";
+"--src sparql.sql:11207\n";
-static const char *proc315 =
-"#line 12405 \"[executable]/sparql.sql\"\n"
+static const char *proc287 =
+"#line 11222 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_A (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_uri varchar,\n"
@@ -12786,10 +11563,10 @@ static const char *proc315 =
"aq_wait_all (app_env[0]);\n"
"}\n"
"}\n"
-"--src sparql.sql:12403\n";
+"--src sparql.sql:11220\n";
-static const char *proc316 =
-"#line 12428 \"[executable]/sparql.sql\"\n"
+static const char *proc288 =
+"#line 11245 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_L_A (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
@@ -12823,10 +11600,10 @@ static const char *proc316 =
"aq_wait_all (app_env[0]);\n"
"}\n"
"}\n"
-"--src sparql.sql:12426\n";
+"--src sparql.sql:11243\n";
-static const char *proc317 =
-"#line 12463 \"[executable]/sparql.sql\"\n"
+static const char *proc289 =
+"#line 11280 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_COMMIT_A (\n"
"inout graph_iri varchar, inout app_env any )\n"
"{\n"
@@ -12837,10 +11614,10 @@ static const char *proc317 =
"DB.DBA.TTLP_EV_COMMIT (graph_iri, app_env[2]);\n"
"commit work;\n"
"}\n"
-"--src sparql.sql:12461\n";
+"--src sparql.sql:11278\n";
-static const char *proc318 =
-"#line 12476 \"[executable]/sparql.sql\"\n"
+static const char *proc290 =
+"#line 11293 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_R (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_uri varchar,\n"
@@ -12860,10 +11637,10 @@ static const char *proc318 =
"DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH (g_iid, ro_id_dict);\n"
"}\n"
"}\n"
-"--src sparql.sql:12474\n";
+"--src sparql.sql:11291\n";
-static const char *proc319 =
-"#line 12497 \"[executable]/sparql.sql\"\n"
+static const char *proc291 =
+"#line 11314 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_TRIPLE_L_R (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
@@ -12895,20 +11672,20 @@ static const char *proc319 =
"DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH (g_iid, ro_id_dict);\n"
"}\n"
"}\n"
-"--src sparql.sql:12495\n";
+"--src sparql.sql:11312\n";
-static const char *proc320 =
-"#line 12530 \"[executable]/sparql.sql\"\n"
+static const char *proc292 =
+"#line 11347 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.TTLP_EV_COMMIT_R (\n"
"inout graph_iri varchar, inout app_env any )\n"
"{\n"
"\n"
"DB.DBA.TTLP_EV_COMMIT (graph_iri, app_env[2]);\n"
"}\n"
-"--src sparql.sql:12528\n";
+"--src sparql.sql:11345\n";
-static const char *proc321 =
-"#line 12538 \"[executable]/sparql.sql\"\n"
+static const char *proc293 =
+"#line 11355 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.TTLP_MT (in strg varchar, in base varchar, in graph varchar := null, in flags integer := 0,\n"
"in log_mode integer := 2, in threads integer := 3, in transactional int := 0)\n"
"{\n"
@@ -12952,10 +11729,10 @@ static const char *proc321 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:12536\n";
+"--src sparql.sql:11353\n";
-static const char *proc322 =
-"#line 12583 \"[executable]/sparql.sql\"\n"
+static const char *proc294 =
+"#line 11400 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.TTLP_MT_LOCAL_FILE (in filename varchar, in base varchar, in graph varchar := null, in flags integer := 0,\n"
"in log_mode integer := 2, in threads integer := 3, in transactional int := 0)\n"
"{\n"
@@ -12998,10 +11775,10 @@ static const char *proc322 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:12581\n";
+"--src sparql.sql:11398\n";
-static const char *proc323 =
-"#line 12627 \"[executable]/sparql.sql\"\n"
+static const char *proc295 =
+"#line 11444 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_LOAD_RDFXML_MT (in strg varchar, in base varchar, in graph varchar,\n"
"in log_mode integer := 2, in threads integer := 3, in transactional int := 0)\n"
"{\n"
@@ -13020,7 +11797,7 @@ static const char *proc323 =
"log_mode := log_mode + 2;\n"
"}\n"
"if (1 <> sys_stat (\'cl_run_local_only\'))\n"
-"return DB.DBA.RDF_LOAD_RDFXML_CL (strg, base, graph, 0);\n"
+"return rdf_load_rdfxml_cl (strg, base, graph);\n"
"if (__rdf_obj_ft_rule_count_in_graph (iri_to_id (graph)))\n"
"ro_id_dict := dict_new ();\n"
"else\n"
@@ -13047,10 +11824,10 @@ static const char *proc323 =
"repl_text (\'__rdf_repl\', \'__rdf_repl_flush_queue ()\');\n"
"return graph;\n"
"}\n"
-"--src sparql.sql:12625\n";
+"--src sparql.sql:11442\n";
-static const char *proc324 =
-"#line 12678 \"[executable]/sparql.sql\"\n"
+static const char *proc296 =
+"#line 11495 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.VT_DECODE_KEYWORD_ITM (inout vtdata varchar, inout ofs integer)\n"
"{\n"
"declare res integer;\n"
@@ -13060,10 +11837,10 @@ static const char *proc324 =
"ofs := ofs + 6;\n"
"return res;\n"
"}\n"
-"--src sparql.sql:12676\n";
+"--src sparql.sql:11493\n";
-static const char *proc325 =
-"#line 12689 \"[executable]/sparql.sql\"\n"
+static const char *proc297 =
+"#line 11506 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.VT_ENCODE_KEYWORD_ITM (in id integer, inout ses any)\n"
"{\n"
"declare strg varchar;\n"
@@ -13076,10 +11853,10 @@ static const char *proc325 =
"strg[0] := 5;\n"
"http (strg, ses);\n"
"}\n"
-"--src sparql.sql:12687\n";
+"--src sparql.sql:11504\n";
-static const char *proc326 =
-"#line 12703 \"[executable]/sparql.sql\"\n"
+static const char *proc298 =
+"#line 11520 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.VT_COMPOSE_KEYWORD_INDEX_LINES (\n"
"inout carry_d_id integer,\n"
"inout carry_d_id_2 integer,\n"
@@ -13184,10 +11961,10 @@ static const char *proc326 =
"\n"
"return res_acc;\n"
"}\n"
-"--src sparql.sql:12701\n";
+"--src sparql.sql:11518\n";
-static const char *proc327 =
-"#line 12810 \"[executable]/sparql.sql\"\n"
+static const char *proc299 =
+"#line 11627 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_OBJ_PATCH_CONTAINS_BY_GRAPH (in phrase varchar, in graph_iri varchar)\n"
"{\n"
"declare graph_keyword any;\n"
@@ -13200,10 +11977,10 @@ static const char *proc327 =
"err:\n"
"return \'^\"#nosuch\"\';\n"
"}\n"
-"--src sparql.sql:12808\n";
+"--src sparql.sql:11625\n";
-static const char *proc328 =
-"#line 12825 \"[executable]/sparql.sql\"\n"
+static const char *proc300 =
+"#line 11642 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_OBJ_PATCH_CONTAINS_BY_MANY_GRAPHS (in phrase varchar, in graph_iris any)\n"
"{\n"
"declare isfirst, gctr, gcount integer;\n"
@@ -13232,10 +12009,10 @@ static const char *proc328 =
"err:\n"
"return \'^\"#nosuch\"\';\n"
"}\n"
-"--src sparql.sql:12823\n";
+"--src sparql.sql:11640\n";
-static const char *proc329 =
-"#line 12855 \"[executable]/sparql.sql\"\n"
+static const char *proc301 =
+"#line 11672 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH (in graph_iid IRI_ID, inout ro_id_dict any, in daq any := 0)\n"
"{\n"
"declare ro_id_offset, ro_ids_count integer;\n"
@@ -13289,10 +12066,10 @@ static const char *proc329 =
"rollback work;\n"
"goto again;\n"
"}\n"
-"--src sparql.sql:12853\n";
+"--src sparql.sql:11670\n";
-static const char *proc330 =
-"#line 12910 \"[executable]/sparql.sql\"\n"
+static const char *proc302 =
+"#line 11727 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH_OLD (in graph_iid IRI_ID, inout ro_id_dict any)\n"
"{\n"
"declare start_vt_d_id, aligned_start_vt_d_id, uncommited_ro_id_offset, ro_id_offset, ro_ids_count integer;\n"
@@ -13418,10 +12195,10 @@ static const char *proc330 =
"rollback work;\n"
"goto again;\n"
"}\n"
-"--src sparql.sql:12908\n";
+"--src sparql.sql:11725\n";
-static const char *proc331 =
-"#line 13037 \"[executable]/sparql.sql\"\n"
+static const char *proc303 =
+"#line 11854 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_OBJ_FT_RULE_ADD (in rule_g varchar, in rule_p varchar, in reason varchar) returns integer\n"
"{\n"
"declare rule_g_iid, rule_p_iid IRI_ID;\n"
@@ -13559,10 +12336,10 @@ static const char *proc331 =
"__rdf_obj_ft_rule_add (rule_g_iid, rule_p_iid, reason);\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:13035\n";
+"--src sparql.sql:11852\n";
-static const char *proc332 =
-"#line 13176 \"[executable]/sparql.sql\"\n"
+static const char *proc304 =
+"#line 11993 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_OBJ_FT_RULE_DEL (in rule_g varchar, in rule_p varchar, in reason varchar) returns integer\n"
"{\n"
"declare rule_g_iid, rule_p_iid IRI_ID;\n"
@@ -13583,10 +12360,10 @@ static const char *proc332 =
"__rdf_obj_ft_rule_del (rule_g_iid, rule_p_iid, reason);\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:13174\n";
+"--src sparql.sql:11991\n";
-static const char *proc333 =
-"#line 13198 \"[executable]/sparql.sql\"\n"
+static const char *proc305 =
+"#line 12015 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_OBJ_FT_RECOVER ()\n"
"{\n"
"declare stat, msg, STRG varchar;\n"
@@ -13617,7 +12394,7 @@ static const char *proc333 =
"VT_INC_INDEX_DB_DBA_RDF_OBJ();\n"
"result (\'... done\');\n"
"}\n"
-"--src sparql.sql:13196\n";
+"--src sparql.sql:12013\n";
static const char *tbl16 =
"create table DB.DBA.RDF_GRAPH_GROUP (\n"
@@ -13646,8 +12423,8 @@ static const char *tbl18 =
")\n"
"alter index RDF_GRAPH_USER on DB.DBA.RDF_GRAPH_USER partition cluster replicated\n";
-static const char *proc334 =
-"#line 13260 \"[executable]/sparql.sql\"\n"
+static const char *proc306 =
+"#line 12077 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_GROUP_CREATE_MEMONLY (in group_iri varchar, in group_iid IRI_ID)\n"
"{\n"
"group_iri := cast (group_iri as varchar);\n"
@@ -13657,10 +12434,10 @@ static const char *proc334 =
"jso_mark_affected (group_iri);\n"
"__rdf_cli_mark_qr_to_recompile ();\n"
"}\n"
-"--src sparql.sql:13258\n";
+"--src sparql.sql:12075\n";
-static const char *proc335 =
-"#line 13271 \"[executable]/sparql.sql\"\n"
+static const char *proc307 =
+"#line 12088 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_GROUP_CREATE (in group_iri varchar, in quiet integer, in member_pattern varchar := null, in comment varchar := null)\n"
"{\n"
"declare group_iid IRI_ID;\n"
@@ -13681,10 +12458,10 @@ static const char *proc335 =
"commit work;\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'DB.DBA.RDF_GRAPH_GROUP_CREATE_MEMONLY (?, ?)\', vector (group_iri, group_iid));\n"
"}\n"
-"--src sparql.sql:13269\n";
+"--src sparql.sql:12086\n";
-static const char *proc336 =
-"#line 13293 \"[executable]/sparql.sql\"\n"
+static const char *proc308 =
+"#line 12110 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_GROUP_DROP_MEMONLY (in group_iri varchar, in group_iid IRI_ID)\n"
"{\n"
"group_iri := cast (group_iri as varchar);\n"
@@ -13702,10 +12479,10 @@ static const char *proc336 =
"}\n"
"__rdf_cli_mark_qr_to_recompile ();\n"
"}\n"
-"--src sparql.sql:13291\n";
+"--src sparql.sql:12108\n";
-static const char *proc337 =
-"#line 13312 \"[executable]/sparql.sql\"\n"
+static const char *proc309 =
+"#line 12129 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_GROUP_DROP (in group_iri varchar, in quiet integer)\n"
"{\n"
"declare group_iid IRI_ID;\n"
@@ -13727,10 +12504,10 @@ static const char *proc337 =
"commit work;\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'DB.DBA.RDF_GRAPH_GROUP_DROP_MEMONLY (?, ?)\', vector (group_iri, group_iid));\n"
"}\n"
-"--src sparql.sql:13310\n";
+"--src sparql.sql:12127\n";
-static const char *proc338 =
-"#line 13335 \"[executable]/sparql.sql\"\n"
+static const char *proc310 =
+"#line 12152 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_CHECK_VISIBILITY_CHANGE (in memb_iri varchar, in special_iid IRI_ID)\n"
"{\n"
"declare memb_iid IRI_ID;\n"
@@ -13757,10 +12534,10 @@ static const char *proc338 =
"case (equ (special_iid, #i8192)) when 0 then \'removed from the \"private area\"\' else \'added to the \"private area\"\' end ) );\n"
"}\n"
"}\n"
-"--src sparql.sql:13333\n";
+"--src sparql.sql:12150\n";
-static const char *proc339 =
-"#line 13363 \"[executable]/sparql.sql\"\n"
+static const char *proc311 =
+"#line 12180 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_GROUP_INS_MEMONLY (in group_iri varchar, in group_iid IRI_ID, in memb_iri varchar, in memb_iid IRI_ID)\n"
"{\n"
"group_iri := cast (group_iri as varchar);\n"
@@ -13780,10 +12557,10 @@ static const char *proc339 =
"jso_mark_affected (memb_iri);\n"
"}\n"
"}\n"
-"--src sparql.sql:13361\n";
+"--src sparql.sql:12178\n";
-static const char *proc340 =
-"#line 13384 \"[executable]/sparql.sql\"\n"
+static const char *proc312 =
+"#line 12201 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_GROUP_INS (in group_iri varchar, in memb_iri varchar)\n"
"{\n"
"declare group_iid, memb_iid IRI_ID;\n"
@@ -13802,10 +12579,10 @@ static const char *proc340 =
"commit work;\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'DB.DBA.RDF_GRAPH_GROUP_INS_MEMONLY (?, ?, ?, ?)\', vector (group_iri, group_iid, memb_iri, memb_iid));\n"
"}\n"
-"--src sparql.sql:13382\n";
+"--src sparql.sql:12199\n";
-static const char *proc341 =
-"#line 13404 \"[executable]/sparql.sql\"\n"
+static const char *proc313 =
+"#line 12221 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_GROUP_DEL_MEMONLY (in group_iri varchar, in group_iid IRI_ID, in memb_iri varchar, in memb_iid IRI_ID)\n"
"{\n"
"group_iri := cast (group_iri as varchar);\n"
@@ -13825,10 +12602,10 @@ static const char *proc341 =
"jso_mark_affected (memb_iri);\n"
"}\n"
"}\n"
-"--src sparql.sql:13402\n";
+"--src sparql.sql:12219\n";
-static const char *proc342 =
-"#line 13425 \"[executable]/sparql.sql\"\n"
+static const char *proc314 =
+"#line 12242 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_GROUP_DEL (in group_iri varchar, in memb_iri varchar)\n"
"{\n"
"declare group_iid, memb_iid IRI_ID;\n"
@@ -13847,10 +12624,10 @@ static const char *proc342 =
"commit work;\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'DB.DBA.RDF_GRAPH_GROUP_DEL_MEMONLY (?, ?, ?, ?)\', vector (group_iri, group_iid, memb_iri, memb_iid));\n"
"}\n"
-"--src sparql.sql:13423\n";
+"--src sparql.sql:12240\n";
-static const char *proc343 =
-"#line 13445 \"[executable]/sparql.sql\"\n"
+static const char *proc315 =
+"#line 12262 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_GRAPH_USER_PERMS_GET (in graph_iri varchar, in uid any) returns integer\n"
"{\n"
"declare graph_iid IRI_ID;\n"
@@ -13867,10 +12644,10 @@ static const char *proc343 =
"__rdf_graph_approx_perms (graph_iid, uid) );\n"
"return res;\n"
"}\n"
-"--src sparql.sql:13443\n";
+"--src sparql.sql:12260\n";
-static const char *proc344 =
-"#line 13463 \"[executable]/sparql.sql\"\n"
+static const char *proc316 =
+"#line 12280 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_GRAPH_USER_PERMS_ACK (in graph_iri any, in uid any, in req_perms integer) returns integer\n"
"{\n"
"declare app_cbk, app_uid varchar;\n"
@@ -13908,10 +12685,10 @@ static const char *proc344 =
"}\n"
"return 1;\n"
"}\n"
-"--src sparql.sql:13461\n";
+"--src sparql.sql:12278\n";
-static const char *proc345 =
-"#line 13503 \"[executable]/sparql.sql\"\n"
+static const char *proc317 =
+"#line 12320 \"[executable]/sparql.sql\"\n"
" create function DB.DBA.RDF_GRAPH_USER_PERM_TITLE (in perms integer) returns varchar\n"
"{\n"
"if (bit_and (perms, 1))\n"
@@ -13924,10 +12701,10 @@ static const char *proc345 =
"return \'get-group-list\';\n"
"return sprintf (\'\"%d\"\', perms);\n"
"}\n"
-"--src sparql.sql:13501\n";
+"--src sparql.sql:12318\n";
-static const char *proc346 =
-"#line 13517 \"[executable]/sparql.sql\"\n"
+static const char *proc318 =
+"#line 12334 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_GRAPH_USER_PERMS_ASSERT (in graph_iri varchar, in uid any, in req_perms integer, in opname varchar) returns varchar\n"
"{\n"
"declare app_cbk, app_uid varchar;\n"
@@ -13973,10 +12750,10 @@ static const char *proc346 =
"}\n"
"return graph_iri;\n"
"}\n"
-"--src sparql.sql:13515\n";
+"--src sparql.sql:12332\n";
-static const char *proc347 =
-"#line 13564 \"[executable]/sparql.sql\"\n"
+static const char *proc319 =
+"#line 12381 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_DEFAULT_USER_PERMS_SET_MEMONLY (in uname varchar, in uid integer, in perms integer, in special_iid IRI_ID, in set_private integer, in affected_jso any)\n"
"{\n"
"dict_put (__rdf_graph_default_perms_of_user_dict (set_private), uid, perms);\n"
@@ -13985,10 +12762,10 @@ static const char *proc347 =
"foreach (varchar jso_key in affected_jso) do\n"
"jso_mark_affected (jso_key);\n"
"}\n"
-"--src sparql.sql:13562\n";
+"--src sparql.sql:12379\n";
-static const char *proc348 =
-"#line 13574 \"[executable]/sparql.sql\"\n"
+static const char *proc320 =
+"#line 12391 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_DEFAULT_USER_PERMS_SET (in uname varchar, in perms integer, in set_private integer := 0)\n"
"{\n"
"declare uid integer;\n"
@@ -14062,10 +12839,10 @@ static const char *proc348 =
"commit work;\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'DB.DBA.RDF_DEFAULT_USER_PERMS_SET_MEMONLY (?,?,?,?,?,?)\', vector (uname, uid, perms, special_iid, set_private, affected_jso));\n"
"}\n"
-"--src sparql.sql:13572\n";
+"--src sparql.sql:12389\n";
-static const char *proc349 =
-"#line 13649 \"[executable]/sparql.sql\"\n"
+static const char *proc321 =
+"#line 12466 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_USER_PERMS_SET_MEMONLY (in graph_iri varchar, in graph_iid IRI_ID, in uid integer, in perms integer)\n"
"{\n"
"graph_iri := cast (graph_iri as varchar);\n"
@@ -14077,10 +12854,10 @@ static const char *proc349 =
"__rdf_graph_specific_perms_of_user (graph_iid, uid, perms);\n"
"jso_mark_affected (graph_iri);\n"
"}\n"
-"--src sparql.sql:13647\n";
+"--src sparql.sql:12464\n";
-static const char *proc350 =
-"#line 13662 \"[executable]/sparql.sql\"\n"
+static const char *proc322 =
+"#line 12479 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_GRAPH_USER_PERMS_SET (in graph_iri varchar, in uname varchar, in perms integer)\n"
"{\n"
"declare graph_iid IRI_ID;\n"
@@ -14133,46 +12910,10 @@ static const char *proc350 =
"commit work;\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'DB.DBA.RDF_GRAPH_USER_PERMS_SET_MEMONLY (?,?,?,?)\', vector (graph_iri, graph_iid, uid, perms));\n"
"}\n"
-"--src sparql.sql:13660\n";
-
-static const char *proc351 =
-"#line 13716 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_GRAPH_USER_PERMS_DEL_MEMONLY (in graph_iri varchar, in graph_iid IRI_ID, in uid integer)\n"
-"{\n"
-"graph_iri := cast (graph_iri as varchar);\n"
-"dict_put (__rdf_graph_iri2id_dict(), __uname(graph_iri), graph_iid);\n"
-"dict_put (__rdf_graph_id2iri_dict(), graph_iid, __uname(graph_iri));\n"
-"if (uid = http_nobody_uid())\n"
-"dict_remove (__rdf_graph_public_perms_dict(), graph_iid);\n"
-"else\n"
-"__rdf_graph_specific_perms_of_user (graph_iid, uid, -1);\n"
-"jso_mark_affected (graph_iri);\n"
-"}\n"
-"--src sparql.sql:13714\n";
-
-static const char *proc352 =
-"#line 13729 \"[executable]/sparql.sql\"\n"
-"create procedure DB.DBA.RDF_GRAPH_USER_PERMS_DEL (in graph_iri varchar, in uname varchar)\n"
-"{\n"
-"declare graph_iid IRI_ID;\n"
-"declare uid integer;\n"
-"declare special_iid IRI_ID;\n"
-"\n"
-"graph_iid := iri_to_id (graph_iri);\n"
-"uid := ((select U_ID from DB.DBA.SYS_USERS where U_NAME = uname and (U_NAME=\'nobody\' or (U_SQL_ENABLE and not U_ACCOUNT_DISABLED))));\n"
-"set isolation = \'serializable\';\n"
-"commit work;\n"
-"if (uid is null)\n"
-"signal (\'RDF99\', sprintf (\'No active SQL user \"%s\" found, can not change its permissions on graph <%s>\', uname, graph_iri));\n"
-"delete from DB.DBA.RDF_GRAPH_USER where RGU_GRAPH_IID = graph_iid and RGU_USER_ID = uid;\n"
-"\n"
-"commit work;\n"
-"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'DB.DBA.RDF_GRAPH_USER_PERMS_DEL_MEMONLY (?,?,?)\', vector (graph_iri, graph_iid, uid));\n"
-"}\n"
-"--src sparql.sql:13727\n";
+"--src sparql.sql:12477\n";
-static const char *proc353 =
-"#line 13748 \"[executable]/sparql.sql\"\n"
+static const char *proc323 =
+"#line 12533 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_GRAPH_GROUP_LIST_GET (in group_iri any, in extra_graphs any, in uid any, in gs_app_cbk varchar, in gs_app_uid varchar, in req_perms integer) returns any\n"
"{\n"
"declare group_iid IRI_ID;\n"
@@ -14245,6 +12986,7 @@ static const char *proc353 =
"else\n"
"full_list := vector ();\n"
"}\n"
+"\n"
"if (bit_and (common_perms, req_perms) = req_perms)\n"
"{\n"
"declare ctr integer;\n"
@@ -14290,15 +13032,15 @@ static const char *proc353 =
"vectorbld_final (filtered_list);\n"
"return filtered_list;\n"
"}\n"
-"--src sparql.sql:13746\n";
+"--src sparql.sql:12531\n";
-static const char *proc354 =
-"#line 13870 \"[executable]/sparql.sql\"\n"
+static const char *proc324 =
+"#line 12656 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.SPARQL_RELOAD_QM_GRAPH ()\n"
"{\n"
"declare ver varchar;\n"
"declare inx int;\n"
-"ver := \'2012-01-26 0002v6g\';\n"
+"ver := \'2011-09-01 0001v6g\';\n"
"if (USER <> \'dba\')\n"
"signal (\'RDFXX\', \'Only DBA can reload quad map metadata\');\n"
"if (not exists (sparql define input:storage \"\" ask where {\n"
@@ -14383,10 +13125,10 @@ static const char *proc354 =
"sequence_set (\'RDF_PREF_SEQ\', 101, 1);\n"
"sequence_set (\'RDF_RO_ID\', 1001, 1);\n"
"}\n"
-"--src sparql.sql:13868\n";
+"--src sparql.sql:12654\n";
-static const char *proc355 =
-"#line 13961 \"[executable]/sparql.sql\"\n"
+static const char *proc325 =
+"#line 12747 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_CREATE_SPARQL_ROLES ()\n"
"{\n"
"declare state, msg varchar;\n"
@@ -14416,8 +13158,8 @@ static const char *proc355 =
"\'grant all on DB.DBA.SYS_SPARQL_HOST to SPARQL_UPDATE\',\n"
"\'grant select on DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH to SPARQL_SELECT\',\n"
"\'grant all on DB.DBA.RDF_EXPLICITLY_CREATED_GRAPH to SPARQL_UPDATE\',\n"
-"\'grant select on DB.DBA.SYS_IDONLY_EMPTY to SPARQL_SELECT\',\n"
-"\'grant select on DB.DBA.SYS_IDONLY_ONE to SPARQL_SELECT\',\n"
+"\'grant select on DB.DBA.SYS_FAKE_0 to SPARQL_SELECT\',\n"
+"\'grant select on DB.DBA.SYS_FAKE_1 to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_GLOBAL_RESET to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_MAKE_IID_OF_QNAME to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_MAKE_IID_OF_QNAME_SAFE to SPARQL_SELECT\',\n"
@@ -14459,8 +13201,6 @@ static const char *proc355 =
"\'grant execute on DB.DBA.RDF_STRSQLVAL_OF_LONG to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_WIDESTRSQLVAL_OF_LONG to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_LONG_OF_SQLVAL to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.rdf_strdt_impl to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.rdf_strlang_impl to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_QUAD_URI to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_QUAD_URI_L to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_QUAD_URI_L_TYPED to SPARQL_UPDATE\',\n"
@@ -14483,11 +13223,9 @@ static const char *proc355 =
"\'grant execute on DB.DBA.RDF_RDFA11_FETCH_PROFILES to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_LOAD_RDFA to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION to SPARQL_UPDATE\',\n"
-"\'grant execute on DB.DBA.RDF_LOAD_XHTML_MICRODATA to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_RDFXML_TO_DICT to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_LONG_TO_TTL to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_TTL to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.RDF_TRIPLES_TO_TRIG to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_NT to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_GRAPH_TO_TTL to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT to SPARQL_SELECT\',\n"
@@ -14495,8 +13233,6 @@ static const char *proc355 =
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_JSON_LD to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_CSV to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.RDF_TRIPLES_TO_HTML_UL to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.RDF_TRIPLES_TO_HTML_TR to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT to SPARQL_SELECT\',\n"
@@ -14537,18 +13273,12 @@ static const char *proc355 =
"\'grant execute on DB.DBA.RDF_DELETE_TRIPLES_AGG to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_MODIFY_TRIPLES to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.SPARQL_INSERT_DICT_CONTENT to SPARQL_UPDATE\',\n"
-"\'grant execute on DB.DBA.SPARQL_INSERT_QUAD_DICT_CONTENT to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.SPARQL_DELETE_DICT_CONTENT to SPARQL_UPDATE\',\n"
-"\'grant execute on DB.DBA.SPARQL_DELETE_QUAD_DICT_CONTENT to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.SPARQL_MODIFY_BY_DICT_CONTENTS to SPARQL_UPDATE\',\n"
-"\'grant execute on DB.DBA.SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS to SPARQL_UPDATE\',\n"
-"\'grant execute on DB.DBA.SPARUL_ADD to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.SPARUL_CLEAR to SPARQL_UPDATE\',\n"
-"\'grant execute on DB.DBA.SPARUL_COPY to SPARQL_UPDATE\',\n"
+"\'grant execute on DB.DBA.SPARUL_LOAD to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.SPARUL_CREATE to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.SPARUL_DROP to SPARQL_UPDATE\',\n"
-"\'grant execute on DB.DBA.SPARUL_LOAD to SPARQL_UPDATE\',\n"
-"\'grant execute on DB.DBA.SPARUL_MOVE to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.SPARUL_RUN to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.SPARQL_DESC_AGG_INIT to SPARQL_SELECT\',\n"
@@ -14559,10 +13289,6 @@ static const char *proc355 =
"\'grant execute on DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.SPARQL_DESC_DICT_CBD to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.SPARQL_DESC_DICT_OBJCBD to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.SPARQL_DESC_DICT_SCBD to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.SPARQL_DESC_DICT_SCBD_PHYSICAL to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.SPARQL_CONSTRUCT_INIT to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.SPARQL_CONSTRUCT_ACC to SPARQL_SELECT\',\n"
"\'grant execute on DB.DBA.SPARQL_CONSTRUCT_FIN to SPARQL_SELECT\',\n"
@@ -14584,18 +13310,18 @@ static const char *proc355 =
"\'grant execute on DB.DBA.RDF_FORGET_HTTP_RESPONSE to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.TTLP_EV_COMMIT to SPARQL_UPDATE\',\n"
"\'grant execute on DB.DBA.RDF_PROC_COLS to \"SPARQL\"\',\n"
-"\'grant execute on DB.DBA.RDF_GRAPH_USER_PERMS_ACK to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.RDF_GRAPH_USER_PERMS_ASSERT to SPARQL_SELECT\',\n"
-"\'grant execute on DB.DBA.RDF_GRAPH_GROUP_LIST_GET to SPARQL_SELECT\' );\n"
+"\'grant execute on DB.DBA.RDF_GRAPH_USER_PERMS_ACK to \"SPARQL_SELECT\"\',\n"
+"\'grant execute on DB.DBA.RDF_GRAPH_USER_PERMS_ASSERT to \"SPARQL_SELECT\"\',\n"
+"\'grant execute on DB.DBA.RDF_GRAPH_GROUP_LIST_GET to \"SPARQL_SELECT\"\' );\n"
"foreach (varchar cmd in cmds) do\n"
"{\n"
"exec (cmd, state, msg);\n"
"}\n"
"}\n"
-"--src sparql.sql:13959\n";
+"--src sparql.sql:12745\n";
-static const char *proc356 =
-"#line 14168 \"[executable]/sparql.sql\"\n"
+static const char *proc326 =
+"#line 12938 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_AUDIT ()\n"
"{\n"
"declare stat, msg varchar;\n"
@@ -14666,10 +13392,10 @@ static const char *proc356 =
"if (not isstring (registry_get (\'DB.DBA.RDF_QUAD_FT_UPGRADE\')))\n"
"result (\'ERRft\', \'new layout but not isstring (registry_get (\'\'DB.DBA.RDF_QUAD_FT_UPGRADE\'\'))\');\n"
"}\n"
-"--src sparql.sql:14166\n";
+"--src sparql.sql:12936\n";
-static const char *proc357 =
-"#line 14240 \"[executable]/sparql.sql\"\n"
+static const char *proc327 =
+"#line 13010 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_OUTLINE_ALL (in force integer := 0)\n"
"{\n"
"declare c_main, c_pogs, c_op integer;\n"
@@ -14680,7 +13406,7 @@ static const char *proc357 =
"\n"
"if ((registry_get (\'__rb_id_only_for_plain_ro_obj\') = \'1\') and not force)\n"
"return;\n"
-"if (not exists (select top 1 1 from DB.DBA.RDF_QUAD))\n"
+"if (not exists (select top 1 1 from RDF_QUAD))\n"
"{\n"
"registry_set (\'__rb_id_only_for_plain_ro_obj\', \'1\');\n"
"return;\n"
@@ -14690,7 +13416,7 @@ static const char *proc357 =
"log_message (\'such data is found.\');\n"
"log_message (\'This check will take some time but is made only once.\');\n"
"\n"
-"if (not exists (select top 1 1 from DB.DBA.RDF_QUAD table option (index RDF_QUAD_OP, index_only) where rdf_box_migrate_after_06_02_3129 (O)))\n"
+"if (not exists (select top 1 1 from RDF_QUAD table option (index RDF_QUAD_OP, index_only) where rdf_box_migrate_after_06_02_3129 (O)))\n"
"{\n"
"log_message (\'No need to update DB.DBA.RDF_QUAD.\');\n"
"registry_set (\'__rb_id_only_for_plain_ro_obj\', \'1\');\n"
@@ -14700,6 +13426,7 @@ static const char *proc357 =
"\n"
"log_message (\'\');\n"
"log_message (\'An update is required.\');\n"
+"\n"
"c_check := coalesce (virtuoso_ini_item_value (\'Parameters\', \'AnalyzeFixQuadStore\'), \'0\');\n"
"if (coalesce (virtuoso_ini_item_value (\'Parameters\', \'LiteMode\'), \'0\') <> \'0\') c_check := \'1\';\n"
"if (c_check <> \'1\')\n"
@@ -14750,18 +13477,18 @@ static const char *proc357 =
"}\n"
"\n"
"old_mode := log_enable (2, 1);\n"
-"log_message (\'Phase 1 of 9: Gathering statistics ...\');\n"
-"c_main := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD) option (no cluster));\n"
-"c_pogs := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD_POGS) option (no cluster));\n"
+"log_message (\'Phase 1 of 9: Gathering statistics...\');\n"
+"c_main := (select count (1) from RDF_QUAD table option (index RDF_QUAD) option (no cluster));\n"
+"c_pogs := (select count (1) from RDF_QUAD table option (index RDF_QUAD_POGS) option (no cluster));\n"
"if (c_main <> c_pogs)\n"
"log_message (\'* Existing indexes are damaged, will try to recover...\');\n"
-"c_op := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));\n"
+"c_op := (select count (1) from RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));\n"
"log_message (sprintf (\' * Index sizes before the processing: %09d RDF_QUAD, %09d POGS, %09d OP\', c_main, c_pogs, c_op));\n"
"delete from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP, no cluster) option (index RDF_QUAD_RECOV_TMP, no cluster);\n"
"delete from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_POGS, no cluster) option (index RDF_QUAD_RECOV_TMP_POGS, no cluster);\n"
"delete from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only, no cluster) option (index RDF_QUAD_RECOV_TMP_OP, no cluster);\n"
"\n"
-"log_message (\'Phase 2 of 9: Copying all quads to a temporary table ...\');\n"
+"log_message (\'Phase 2 of 9: Copying all quads to a temporary table...\');\n"
"insert soft DB.DBA.RDF_QUAD_RECOV_TMP index RDF_QUAD_RECOV_TMP option (no cluster) (G1,S1,P1,O1) select G,S,P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD, no cluster);\n"
"insert soft DB.DBA.RDF_QUAD_RECOV_TMP index RDF_QUAD_RECOV_TMP_POGS option (no cluster) (G1,S1,P1,O1) select G,S,P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD_POGS, no cluster);\n"
"insert soft DB.DBA.RDF_QUAD_RECOV_TMP index RDF_QUAD_RECOV_TMP_OP option (index_only, no cluster) (P1,O1) select P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD_OP, index_only, no cluster);\n"
@@ -14773,7 +13500,7 @@ static const char *proc357 =
"if (c_pogs < c_main)\n"
"insert soft DB.DBA.RDF_QUAD_RECOV_TMP option (no cluster) (G1,S1,P1,O1) select G,S,P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD) option (no cluster);\n"
"}\n"
-"c_op_tmp := (select count (1) from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only) option (no cluster));\n"
+"c_op_tmp := (select count (1) from RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only) option (no cluster));\n"
"log_message (sprintf (\'* Index sizes of temporary table: %09d OP\', c_op_tmp));\n"
"if (c_op_tmp < c_op)\n"
"log_message (\'** Some data are lost or the corruption was strong before the processing.\');\n"
@@ -14794,9 +13521,9 @@ static const char *proc357 =
"delete from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_OP, index_only, no cluster) option (index RDF_QUAD_RECOV_TMP_OP, no cluster);\n"
"\n"
"log_message (\'Phase 6 of 9: Gathering statistics again ...\');\n"
-"c_main_fixed := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD) option (no cluster));\n"
-"c_pogs_fixed := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD_POGS) option (no cluster));\n"
-"c_op_fixed := (select count (1) from DB.DBA.RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));\n"
+"c_main_fixed := (select count (1) from RDF_QUAD table option (index RDF_QUAD) option (no cluster));\n"
+"c_pogs_fixed := (select count (1) from RDF_QUAD table option (index RDF_QUAD_POGS) option (no cluster));\n"
+"c_op_fixed := (select count (1) from RDF_QUAD table option (index RDF_QUAD_OP, index_only) option (no cluster));\n"
"log_message (sprintf (\'* Index sizes after the processing: %09d RDF_QUAD, %09d POGS, %09d OP\', c_main_fixed, c_pogs_fixed, c_op_fixed));\n"
"if ((__min (c_main_fixed, c_pogs_fixed) < __max (c_main, c_pogs)) or (c_op_fixed < c_op))\n"
"log_message (\'** Some data are lost or the corruption was strong before the processing.\');\n"
@@ -14809,11 +13536,11 @@ static const char *proc357 =
"\n"
"\n"
"\n"
-"log_message (\'Phase 7 of 9: integrity check (completeness of index RDF_QUAD_POGS of DB.DBA.RDF_QUAD) ...\');\n"
+"log_message (\'Phase 7 of 9: integrity check (completeness of index RDF_QUAD_POGS of DB.DBA.RDF_QUAD)...\');\n"
"if (exists (select top 1 1 from DB.DBA.RDF_QUAD a table option (index RDF_QUAD) where not exists (select 1 from DB.DBA.RDF_QUAD b table option (loop, index RDF_QUAD_POGS) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s)))\n"
"log_message (\'** IMPORTANT WARNING: not all rows of DB.DBA.RDF_QUAD are found in RDF_QUAD_POGS, data reloading is strictly recommended.\');\n"
"\n"
-"log_message (\'Phase 8 of 9: integrity check (completeness of primary key of DB.DBA.RDF_QUAD) ...\');\n"
+"log_message (\'Phase 8 of 9: integrity check (completeness of primary key of DB.DBA.RDF_QUAD)...\');\n"
"if (exists (select top 1 1 from DB.DBA.RDF_QUAD a table option (index RDF_QUAD_POGS) where not exists (select 1 from DB.DBA.RDF_QUAD b table option (loop, index primary key) where a.g = b.g and a.p = b.p and a.o = b.o and a.s = b.s)))\n"
"log_message (\'** IMPORTANT WARNING: not all rows of DB.DBA.RDF_QUAD are found in RDF_QUAD_POGS, data reloading is strictly recommended.\');\n"
"\n"
@@ -14823,13 +13550,13 @@ static const char *proc357 =
"log_enable (old_mode, 1);\n"
"log_message (\'Update complete.\');\n"
"}\n"
-"--src sparql.sql:14238\n";
+"--src sparql.sql:13008\n";
static const char *other34 =
" DB.DBA.RDF_QUAD_OUTLINE_ALL ()\n";
-static const char *proc358 =
-"#line 14400 \"[executable]/sparql.sql\"\n"
+static const char *proc328 =
+"#line 13171 \"[executable]/sparql.sql\"\n"
"create procedure DB.DBA.RDF_QUAD_FT_UPGRADE ()\n"
"{\n"
"declare stat, msg varchar;\n"
@@ -14864,9 +13591,6 @@ static const char *proc358 =
"from DB.DBA.RDF_GRAPH_USER where RGU_GRAPH_IID = #i8192 );\n"
"fake := (select count (dict_put (__rdf_graph_public_perms_dict(), RGU_GRAPH_IID, RGU_PERMISSIONS))\n"
"from DB.DBA.RDF_GRAPH_USER where RGU_USER_ID = http_nobody_uid () );\n"
-"delete from DB.DBA.RDF_GRAPH_USER where not exists (select 1 from DB.DBA.SYS_USERS where RGU_USER_ID = U_ID);\n"
-"if (row_count ())\n"
-"log_message (\'Non-existing users are removed from graph security list\');\n"
"fake := (select count (__rdf_graph_specific_perms_of_user (RGU_GRAPH_IID, RGU_USER_ID, RGU_PERMISSIONS))\n"
"from DB.DBA.RDF_GRAPH_USER where RGU_USER_ID <> http_nobody_uid () and not (RGU_GRAPH_IID in (#i0, #i8192)) );\n"
"if (coalesce (virtuoso_ini_item_value (\'SPARQL\', \'RecoveryMode\'), \'0\') > \'0\')\n"
@@ -14902,29 +13626,29 @@ static const char *proc358 =
"\n"
"final_qm_reload:\n"
"DB.DBA.SPARQL_RELOAD_QM_GRAPH ();\n"
-"\n"
-"\n"
+"insert soft rdf_datatype (rdt_iid, rdt_twobyte, rdt_qname) values\n"
+"(iri_to_id (\'http://www.openlinksw.com/schemas/virtrdf#Geometry\'), 256, \'http://www.openlinksw.com/schemas/virtrdf#Geometry\');\n"
"\n"
"return;\n"
"}\n"
-"--src sparql.sql:14398\n";
+"--src sparql.sql:13169\n";
static const char *other35 =
" DB.DBA.RDF_QUAD_FT_UPGRADE ()\n";
static const char *other36 =
"DB.DBA.RDF_CREATE_SPARQL_ROLES ()\n";
-static const char *proc359 =
-"#line 14492 \"[executable]/sparql.sql\"\n"
+static const char *proc329 =
+"#line 13260 \"[executable]/sparql.sql\"\n"
"create procedure rdfs_pn (in is_class int)\n"
"{\n"
"return case when is_class = 1 then iri_to_id (\'http://www.w3.org/2000/01/rdf-schema#subClassOf\')\n"
"else iri_to_id (\'http://www.w3.org/2000/01/rdf-schema#subPropertyOf\') end;\n"
"}\n"
-"--src sparql.sql:14490\n";
+"--src sparql.sql:13258\n";
-static const char *proc360 =
-"#line 14500 \"[executable]/sparql.sql\"\n"
+static const char *proc330 =
+"#line 13268 \"[executable]/sparql.sql\"\n"
"create procedure rdf_owl_sas_p (in gr iri_id, in name varchar, in super_c iri_id, in c iri_id, in visited any, inout supers any, in pos int)\n"
"{\n"
"declare txt varchar;\n"
@@ -14946,15 +13670,15 @@ static const char *proc360 =
"}\n"
"exec_close (cc);\n"
"}\n"
-"--src sparql.sql:14498\n";
+"--src sparql.sql:13266\n";
static const char *tbl19 =
"create table DB.DBA.SYS_RDF_SCHEMA (RS_NAME VARCHAR , RS_URI VARCHAR, RS_G IRI_ID,\n"
"PRIMARY KEY (RS_NAME, RS_URI))\n"
"alter index SYS_RDF_SCHEMA on DB.DBA.SYS_RDF_SCHEMA partition cluster replicated\n";
-static const char *proc361 =
-"#line 14529 \"[executable]/sparql.sql\"\n"
+static const char *proc331 =
+"#line 13297 \"[executable]/sparql.sql\"\n"
"create function rdfs_load_schema (in ri_name varchar, in gn varchar := null) returns integer\n"
"{\n"
"declare gr iri_id;\n"
@@ -15113,22 +13837,22 @@ static const char *proc361 =
"rdf_inf_dir (ri_name, null, null, 0);\n"
"return rules_count + 1;\n"
"}\n"
-"--src sparql.sql:14527\n";
+"--src sparql.sql:13295\n";
-static const char *proc362 =
-"#line 14689 \"[executable]/sparql.sql\"\n"
+static const char *proc332 =
+"#line 13458 \"[executable]/sparql.sql\"\n"
"create procedure rdf_schema_ld ()\n"
"{\n"
"if (1 <> sys_stat (\'cl_run_local_only\'))\n"
"return 0;\n"
"return (select count (*) from (select distinct s.RS_NAME from DB.DBA.SYS_RDF_SCHEMA s) sub where 0 = rdfs_load_schema (sub.RS_NAME));\n"
"}\n"
-"--src sparql.sql:14687\n";
+"--src sparql.sql:13456\n";
static const char *other37 =
"rdf_schema_ld ()\n";
-static const char *proc363 =
-"#line 14701 \"[executable]/sparql.sql\"\n"
+static const char *proc333 =
+"#line 13470 \"[executable]/sparql.sql\"\n"
"create function CL_RDF_INF_CHANGED_SRV (in name varchar) returns integer\n"
"{\n"
"declare res integer;\n"
@@ -15137,10 +13861,10 @@ static const char *proc363 =
"return case (rdfs_load_schema (name)) when 0 then 1 else 0 end;\n"
"return res;\n"
"}\n"
-"--src sparql.sql:14699\n";
+"--src sparql.sql:13468\n";
-static const char *proc364 =
-"#line 14711 \"[executable]/sparql.sql\"\n"
+static const char *proc334 =
+"#line 13480 \"[executable]/sparql.sql\"\n"
"create procedure CL_RDF_INF_CHANGED (in name varchar)\n"
"{\n"
"declare aq any;\n"
@@ -15150,10 +13874,10 @@ static const char *proc364 =
"aq_request (aq, \'DB.DBA.CL_RDF_INF_CHANGED_SRV\', vector (name));\n"
"aq_wait_all (aq);\n"
"}\n"
-"--src sparql.sql:14709\n";
+"--src sparql.sql:13478\n";
-static const char *proc365 =
-"#line 14722 \"[executable]/sparql.sql\"\n"
+static const char *proc335 =
+"#line 13491 \"[executable]/sparql.sql\"\n"
"create function rdfs_rule_set (in name varchar, in gn varchar, in remove int := 0) returns integer\n"
"{\n"
"delete from DB.DBA.SYS_RDF_SCHEMA where RS_NAME = name and RS_URI = gn;\n"
@@ -15176,10 +13900,10 @@ static const char *proc365 =
"return res;\n"
"}\n"
"}\n"
-"--src sparql.sql:14720\n";
+"--src sparql.sql:13489\n";
-static const char *proc366 =
-"#line 14746 \"[executable]/sparql.sql\"\n"
+static const char *proc336 =
+"#line 13515 \"[executable]/sparql.sql\"\n"
"create function DB.DBA.RDF_IID_OF_QNAME (in qname varchar) returns IRI_ID\n"
"{\n"
"whenever sqlstate \'*\' goto retnull;\n"
@@ -15187,10 +13911,10 @@ static const char *proc366 =
"retnull:\n"
"return null;\n"
"}\n"
-"--src sparql.sql:14744\n";
+"--src sparql.sql:13513\n";
-static const char *proc367 =
-"#line 14755 \"[executable]/sparql.sql\"\n"
+static const char *proc337 =
+"#line 13524 \"[executable]/sparql.sql\"\n"
"create procedure SPARQL_INI_PARAMS (inout metas any, inout dta any)\n"
"{\n"
"declare item_cnt int;\n"
@@ -15214,10 +13938,10 @@ static const char *proc367 =
"metas := vector (vector (vector (\'res_dict\', 242, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0)), 1);\n"
"dta := vector (vector (res_dict));\n"
"}\n"
-"--src sparql.sql:14753\n";
+"--src sparql.sql:13522\n";
-static const char *proc368 =
-"#line 14780 \"[executable]/sparql.sql\"\n"
+static const char *proc338 =
+"#line 13549 \"[executable]/sparql.sql\"\n"
"create procedure cl_tmp_inx_recov_fill ()\n"
"{\n"
"if (registry_get (\'__rb_id_only_for_plain_ro_obj\') = \'1\')\n"
@@ -15236,10 +13960,10 @@ static const char *proc368 =
"insert soft DB.DBA.RDF_QUAD_RECOV_TMP index RDF_QUAD_RECOV_TMP option (no cluster) (G1,S1,P1,O1) select G,S,P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD, no cluster);\n"
"insert soft DB.DBA.RDF_QUAD_RECOV_TMP index RDF_QUAD_RECOV_TMP_POGS option (no cluster) (G1,S1,P1,O1) select G,S,P,O from DB.DBA.RDF_QUAD table option (index RDF_QUAD_POGS, no cluster);\n"
"}\n"
-"--src sparql.sql:14778\n";
+"--src sparql.sql:13547\n";
-static const char *proc369 =
-"#line 14800 \"[executable]/sparql.sql\"\n"
+static const char *proc339 =
+"#line 13569 \"[executable]/sparql.sql\"\n"
"create procedure cl_inx_recov_clean ()\n"
"{\n"
"if (registry_get (\'__rb_id_only_for_plain_ro_obj\') = \'1\')\n"
@@ -15254,10 +13978,10 @@ static const char *proc369 =
"goto again;\n"
"\n"
"}\n"
-"--src sparql.sql:14798\n";
+"--src sparql.sql:13567\n";
-static const char *proc370 =
-"#line 14816 \"[executable]/sparql.sql\"\n"
+static const char *proc340 =
+"#line 13585 \"[executable]/sparql.sql\"\n"
"create procedure cl_inx_recov_fill_1 ()\n"
"{\n"
"if (registry_get (\'__rb_id_only_for_plain_ro_obj\') = \'1\')\n"
@@ -15271,10 +13995,10 @@ static const char *proc370 =
"insert soft DB.DBA.RDF_QUAD index RDF_QUAD_OP option (index_only, no cluster) (P,O) select P1,O1 from DB.DBA.RDF_QUAD_RECOV_TMP table option (index RDF_QUAD_RECOV_TMP_POGS, no cluster);\n"
"log_message (\'Done.\');\n"
"}\n"
-"--src sparql.sql:14814\n";
+"--src sparql.sql:13583\n";
-static const char *proc371 =
-"#line 14842 \"[executable]/sparql.sql\"\n"
+static const char *proc341 =
+"#line 13611 \"[executable]/sparql.sql\"\n"
"create procedure exec_from_daq (in cmd varchar)\n"
"{\n"
"declare aq any;\n"
@@ -15282,10 +14006,10 @@ static const char *proc371 =
"aq_request (aq, \'DB.DBA.AQ_EXEC_SRV\', vector (cmd));\n"
"aq_wait_all (aq);\n"
"}\n"
-"--src sparql.sql:14840\n";
+"--src sparql.sql:13609\n";
-static const char *proc372 =
-"#line 14851 \"[executable]/sparql.sql\"\n"
+static const char *proc342 =
+"#line 13620 \"[executable]/sparql.sql\"\n"
"create procedure cl_inx_recov (in force int := 0)\n"
"{\n"
"declare old_mode, tries int;\n"
@@ -15336,11 +14060,11 @@ static const char *proc372 =
"if (force)\n"
"log_message (\'Must do checkpoint to persist the db state.\');\n"
"}\n"
-"--src sparql.sql:14849\n";
+"--src sparql.sql:13618\n";
/* sparql_io.sql */
-static const char *proc373 =
+static const char *proc343 =
"#line 25 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_XML_WRITE_NS (inout ses any)\n"
"{\n"
@@ -15349,7 +14073,7 @@ static const char *proc373 =
"}\n"
"--src sparql_io.sql:23\n";
-static const char *proc374 =
+static const char *proc344 =
"#line 34 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_XML_WRITE_HEAD (inout ses any, in colnames any)\n"
"{\n"
@@ -15365,7 +14089,7 @@ static const char *proc374 =
"}\n"
"--src sparql_io.sql:32\n";
-static const char *proc375 =
+static const char *proc345 =
"#line 49 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_XML_HTTP_PRE (in colnames any, in accept varchar)\n"
"{\n"
@@ -15383,7 +14107,7 @@ static const char *proc375 =
"}\n"
"--src sparql_io.sql:47\n";
-static const char *proc376 =
+static const char *proc346 =
"#line 66 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_XML_HTTP_INIT (inout env any)\n"
"{\n"
@@ -15391,7 +14115,7 @@ static const char *proc376 =
"}\n"
"--src sparql_io.sql:64\n";
-static const char *proc377 =
+static const char *proc347 =
"#line 73 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_XML_HTTP_FINAL (inout env any)\n"
"{\n"
@@ -15407,7 +14131,7 @@ static const char *other38 =
"DB.DBA.SPARQL_RSET_XML_HTTP_FINAL\n"
"order\n";
-static const char *proc378 =
+static const char *proc348 =
"#line 90 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_DICT_XML_HTTP_PRE (in colnames any, in accept varchar)\n"
"{\n"
@@ -15429,7 +14153,7 @@ static const char *other39 =
"sparql_dict_xml_write_row,\n"
"DB.DBA.SPARQL_RSET_XML_HTTP_FINAL\n";
-static const char *proc379 =
+static const char *proc349 =
"#line 113 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_TTL_WRITE_NS (inout ses any)\n"
"{\n"
@@ -15439,7 +14163,7 @@ static const char *proc379 =
"}\n"
"--src sparql_io.sql:111\n";
-static const char *proc380 =
+static const char *proc350 =
"#line 122 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_TTL_WRITE_HEAD (inout ses any, in colnames any)\n"
"{\n"
@@ -15458,7 +14182,7 @@ static const char *proc380 =
"}\n"
"--src sparql_io.sql:120\n";
-static const char *proc381 =
+static const char *proc351 =
"#line 140 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_TTL_HTTP_PRE (in colnames any, in accept varchar)\n"
"{\n"
@@ -15480,7 +14204,7 @@ static const char *proc381 =
"}\n"
"--src sparql_io.sql:138\n";
-static const char *proc382 =
+static const char *proc352 =
"#line 161 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_TTL_HTTP_INIT (inout env any)\n"
"{\n"
@@ -15488,7 +14212,7 @@ static const char *proc382 =
"}\n"
"--src sparql_io.sql:159\n";
-static const char *proc383 =
+static const char *proc353 =
"#line 168 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL (inout env any)\n"
"{\n"
@@ -15503,7 +14227,7 @@ static const char *other40 =
"DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL\n"
"order\n";
-static const char *proc384 =
+static const char *proc354 =
"#line 183 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_NT_WRITE_NS (inout ses any)\n"
"{\n"
@@ -15511,7 +14235,7 @@ static const char *proc384 =
"}\n"
"--src sparql_io.sql:181\n";
-static const char *proc385 =
+static const char *proc355 =
"#line 190 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_RSET_NT_WRITE_HEAD (inout ses any, in colnames any)\n"
"{\n"
@@ -15526,7 +14250,7 @@ static const char *proc385 =
"}\n"
"--src sparql_io.sql:188\n";
-static const char *proc386 =
+static const char *proc356 =
"#line 204 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_RSET_NT_HTTP_PRE (in colnames any, in accept varchar)\n"
"{\n"
@@ -15555,7 +14279,7 @@ static const char *other41 =
"DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL\n"
"order\n";
-static const char *proc387 =
+static const char *proc357 =
"#line 235 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_REXEC_INT (\n"
"in res_mode integer,\n"
@@ -15850,7 +14574,7 @@ static const char *proc387 =
"}\n"
"--src sparql_io.sql:233\n";
-static const char *proc388 =
+static const char *proc358 =
"#line 528 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_REXEC (\n"
"in service varchar,\n"
@@ -15867,7 +14591,7 @@ static const char *proc388 =
"}\n"
"--src sparql_io.sql:526\n";
-static const char *proc389 =
+static const char *proc359 =
"#line 543 \"[executable]/sparql_io.sql\"\n"
"create function DB.DBA.SPARQL_REXEC_TO_ARRAY (\n"
"in service varchar,\n"
@@ -15885,7 +14609,7 @@ static const char *proc389 =
"}\n"
"--src sparql_io.sql:541\n";
-static const char *proc390 =
+static const char *proc360 =
"#line 559 \"[executable]/sparql_io.sql\"\n"
"create function DB.DBA.SPARQL_REXEC_TO_ARRAY_OF_OBJ (\n"
"in service varchar,\n"
@@ -15903,7 +14627,7 @@ static const char *proc390 =
"}\n"
"--src sparql_io.sql:557\n";
-static const char *proc391 =
+static const char *proc361 =
"#line 575 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_REXEC_WITH_META (\n"
"in service varchar,\n"
@@ -15922,7 +14646,7 @@ static const char *proc391 =
"}\n"
"--src sparql_io.sql:573\n";
-static const char *proc392 =
+static const char *proc362 =
"#line 593 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_SINV_IMP (in ws_endpoint varchar, in ws_params any, in qtext_template varchar, in qtext_posmap nvarchar, in param_row any, in expected_vars any)\n"
"{\n"
@@ -15967,7 +14691,7 @@ static const char *proc392 =
static const char *view0 =
"create procedure view DB.DBA.SPARQL_SINV_2 as DB.DBA.SPARQL_SINV_IMP (ws_endpoint, ws_params, qtext_template, qtext_posmap, param_row, expected_vars)(RSET any)\n";
-static const char *proc393 =
+static const char *proc363 =
"#line 639 \"[executable]/sparql_io.sql\"\n"
"create procedure \"querySoap\" (in \"Command\" varchar\n"
", in \"Properties\" any\n"
@@ -16002,7 +14726,7 @@ static const char *proc393 =
"}\n"
"--src sparql_io.sql:637\n";
-static const char *proc394 =
+static const char *proc364 =
"#line 673 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_WRITE_EXEC_STATUS (inout ses any, in line_format varchar, inout status any)\n"
"{\n"
@@ -16022,7 +14746,7 @@ static const char *proc394 =
"}\n"
"--src sparql_io.sql:671\n";
-static const char *proc395 =
+static const char *proc365 =
"#line 692 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_XML_WRITE_HEAD (inout ses any, in mdta any)\n"
"{\n"
@@ -16050,7 +14774,7 @@ static const char *proc395 =
"}\n"
"--src sparql_io.sql:690\n";
-static const char *proc396 =
+static const char *proc366 =
"#line 718 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_XML_WRITE_RES (inout ses any, in mdta any, inout dta any)\n"
"{\n"
@@ -16063,7 +14787,7 @@ static const char *proc396 =
"}\n"
"--src sparql_io.sql:716\n";
-static const char *proc397 =
+static const char *proc367 =
"#line 729 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_XML_WRITE_ROW (inout ses any, in mdta any, inout dta any)\n"
"{\n"
@@ -16163,7 +14887,7 @@ static const char *proc397 =
"}\n"
"--src sparql_io.sql:727\n";
-static const char *proc398 =
+static const char *proc368 =
"#line 827 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_NS (inout ses any)\n"
"{\n"
@@ -16173,7 +14897,7 @@ static const char *proc398 =
"}\n"
"--src sparql_io.sql:825\n";
-static const char *proc399 =
+static const char *proc369 =
"#line 835 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_HEAD (inout ses any, in mdta any)\n"
"{\n"
@@ -16196,7 +14920,7 @@ static const char *proc399 =
"}\n"
"--src sparql_io.sql:833\n";
-static const char *proc400 =
+static const char *proc370 =
"#line 856 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_RES (inout ses any, in mdta any, inout dta any)\n"
"{\n"
@@ -16209,7 +14933,7 @@ static const char *proc400 =
"}\n"
"--src sparql_io.sql:854\n";
-static const char *proc401 =
+static const char *proc371 =
"#line 867 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_ROW (inout ses any, in mdta any, inout dta any, in rowno integer)\n"
"{\n"
@@ -16297,7 +15021,7 @@ static const char *proc401 =
"}\n"
"--src sparql_io.sql:865\n";
-static const char *proc402 =
+static const char *proc372 =
"#line 953 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_TTL_WRITE_NS (inout ses any)\n"
"{\n"
@@ -16307,7 +15031,7 @@ static const char *proc402 =
"}\n"
"--src sparql_io.sql:951\n";
-static const char *proc403 =
+static const char *proc373 =
"#line 961 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_TTL_WRITE_HEAD (inout ses any, in mdta any)\n"
"{\n"
@@ -16336,7 +15060,7 @@ static const char *proc403 =
"}\n"
"--src sparql_io.sql:959\n";
-static const char *proc404 =
+static const char *proc374 =
"#line 988 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_TTL_WRITE_RES (inout ses any, in mdta any, inout dta any)\n"
"{\n"
@@ -16363,7 +15087,7 @@ static const char *proc404 =
"}\n"
"--src sparql_io.sql:986\n";
-static const char *proc405 =
+static const char *proc375 =
"#line 1013 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_NT_WRITE_NS (inout ses any)\n"
"{\n"
@@ -16371,7 +15095,7 @@ static const char *proc405 =
"}\n"
"--src sparql_io.sql:1011\n";
-static const char *proc406 =
+static const char *proc376 =
"#line 1019 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_NT_WRITE_HEAD (inout ses any, in mdta any)\n"
"{\n"
@@ -16396,7 +15120,7 @@ static const char *proc406 =
"}\n"
"--src sparql_io.sql:1017\n";
-static const char *proc407 =
+static const char *proc377 =
"#line 1042 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_NT_WRITE_RES (inout ses any, in mdta any, inout dta any)\n"
"{\n"
@@ -16423,7 +15147,7 @@ static const char *proc407 =
"}\n"
"--src sparql_io.sql:1040\n";
-static const char *proc408 =
+static const char *proc378 =
"#line 1067 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_JAVASCRIPT_HTML_WRITE (inout ses any, inout metas any, inout rset any, in is_js integer := 0, in esc_mode integer := 1, in pure_html integer := 0)\n"
"{\n"
@@ -16510,7 +15234,7 @@ static const char *proc408 =
"}\n"
"--src sparql_io.sql:1065\n";
-static const char *proc409 =
+static const char *proc379 =
"#line 1152 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_JSON_WRITE_BINDING (inout ses any, in colname varchar, inout val any)\n"
"{\n"
@@ -16606,7 +15330,7 @@ static const char *proc409 =
"}\n"
"--src sparql_io.sql:1150\n";
-static const char *proc410 =
+static const char *proc380 =
"#line 1246 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_JSON_WRITE (inout ses any, inout metas any, inout rset any)\n"
"{\n"
@@ -16651,7 +15375,7 @@ static const char *proc410 =
"}\n"
"--src sparql_io.sql:1244\n";
-static const char *proc411 =
+static const char *proc381 =
"#line 1289 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_RESULTS_CSV_WRITE (inout ses any, inout metas any, inout rset any)\n"
"{\n"
@@ -16681,7 +15405,7 @@ static const char *proc411 =
"}\n"
"--src sparql_io.sql:1287\n";
-static const char *proc412 =
+static const char *proc382 =
"#line 1318 \"[executable]/sparql_io.sql\"\n"
"create function DB.DBA.SPARQL_RESULTS_WRITE (inout ses any, inout metas any, inout rset any, in accept varchar, in add_http_headers integer, in status any := null) returns varchar\n"
"{\n"
@@ -16752,8 +15476,6 @@ static const char *proc412 =
"if (status is not null)\n"
"SPARQL_WRITE_EXEC_STATUS (ses, \'#%015s: %s\\n\', status);\n"
"}\n"
-"else if (ret_format = \'TRIG\')\n"
-"DB.DBA.RDF_TRIPLES_TO_TRIG (triples, ses);\n"
"else if (ret_format = \'NT\')\n"
"DB.DBA.RDF_TRIPLES_TO_NT (triples, ses);\n"
"else if (ret_format in (\'JSON\', \'JSON;TALIS\'))\n"
@@ -16764,16 +15486,6 @@ static const char *proc412 =
"DB.DBA.RDF_TRIPLES_TO_JSON (triples, ses);\n"
"else if (ret_format = \'RDFA;XHTML\')\n"
"DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML (triples, ses);\n"
-"else if (ret_format = \'HTML;UL\')\n"
-"{\n"
-"DB.DBA.RDF_TRIPLES_TO_HTML_UL (triples, ses);\n"
-"ret_mime := \'text/html\';\n"
-"}\n"
-"else if (ret_format = \'HTML;TR\')\n"
-"{\n"
-"DB.DBA.RDF_TRIPLES_TO_HTML_TR (triples, ses);\n"
-"ret_mime := \'text/html\';\n"
-"}\n"
"else if (ret_format = \'HTML;MICRODATA\')\n"
"{\n"
"DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA (triples, ses);\n"
@@ -16945,8 +15657,8 @@ static const char *proc412 =
"}\n"
"--src sparql_io.sql:1316\n";
-static const char *proc413 =
-"#line 1584 \"[executable]/sparql_io.sql\"\n"
+static const char *proc383 =
+"#line 1572 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_VHOST_RESET ()\n"
"{\n"
"if (not exists (select 1 from \"DB\".\"DBA\".\"SYS_USERS\" where U_NAME = \'SPARQL\'))\n"
@@ -16986,10 +15698,10 @@ static const char *proc413 =
"\n"
"registry_set (\'__SPARQL_VHOST_RESET\', \'20110703\');\n"
"}\n"
-"--src sparql_io.sql:1582\n";
+"--src sparql_io.sql:1570\n";
-static const char *proc414 =
-"#line 1628 \"[executable]/sparql_io.sql\"\n"
+static const char *proc384 =
+"#line 1616 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_PROTOCOL_ERROR_REPORT (\n"
"inout path varchar, inout params any, inout lines any,\n"
"in httpcode varchar, in httpstatus varchar,\n"
@@ -17036,10 +15748,10 @@ static const char *proc414 =
"http (query);\n"
"}\n"
"}\n"
-"--src sparql_io.sql:1626\n";
+"--src sparql_io.sql:1614\n";
-static const char *proc415 =
-"#line 1676 \"[executable]/sparql_io.sql\"\n"
+static const char *proc385 =
+"#line 1664 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_WSDL11 (in lines any)\n"
"{\n"
"declare host any;\n"
@@ -17057,10 +15769,10 @@ static const char *proc415 =
"</service>\n"
"</definitions>\', host));\n"
"}\n"
-"--src sparql_io.sql:1674\n";
+"--src sparql_io.sql:1662\n";
-static const char *proc416 =
-"#line 1695 \"[executable]/sparql_io.sql\"\n"
+static const char *proc386 =
+"#line 1683 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_WSDL (in lines any)\n"
"{\n"
"declare host any;\n"
@@ -17075,10 +15787,10 @@ static const char *proc416 =
"</service>\n"
"</description>\', host));\n"
"}\n"
-"--src sparql_io.sql:1693\n";
+"--src sparql_io.sql:1681\n";
-static const char *proc417 =
-"#line 1711 \"[executable]/sparql_io.sql\"\n"
+static const char *proc387 =
+"#line 1699 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_SOAP_NS (in ver int)\n"
"{\n"
"if (ver = 11)\n"
@@ -17088,18 +15800,18 @@ static const char *proc417 =
"else\n"
"signal (\'42000\', \'Un-supported SOAP version\');\n"
"}\n"
-"--src sparql_io.sql:1709\n";
+"--src sparql_io.sql:1697\n";
-static const char *proc418 =
-"#line 1722 \"[executable]/sparql_io.sql\"\n"
+static const char *proc388 =
+"#line 1710 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_PT_NS ()\n"
"{\n"
"return \'http://www.w3.org/2005/09/sparql-protocol-types/#\';\n"
"}\n"
-"--src sparql_io.sql:1720\n";
+"--src sparql_io.sql:1708\n";
-static const char *proc419 =
-"#line 1729 \"[executable]/sparql_io.sql\"\n"
+static const char *proc389 =
+"#line 1717 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.PARSE_SPARQL_WS_PARAMS (in lst any) returns any\n"
"{\n"
"declare pval, parse, res any;\n"
@@ -17147,20 +15859,20 @@ static const char *proc419 =
"vectorbld_final (res);\n"
"return res;\n"
"}\n"
-"--src sparql_io.sql:1727\n";
+"--src sparql_io.sql:1715\n";
-static const char *proc420 =
-"#line 1778 \"[executable]/sparql_io.sql\"\n"
+static const char *proc390 =
+"#line 1766 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.rdf_find_str (in x any)\n"
"{\n"
"return cast (x as varchar);\n"
"}\n"
-"--src sparql_io.sql:1776\n";
+"--src sparql_io.sql:1764\n";
static const char *other42 =
"grant execute on DB.DBA.rdf_find_str to public\n";
-static const char *proc421 =
-"#line 1788 \"[executable]/sparql_io.sql\"\n"
+static const char *proc391 =
+"#line 1776 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_HTML_DOCTYPE()\n"
"{\n"
"http(\'<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\\n\');\n"
@@ -17170,10 +15882,10 @@ static const char *proc421 =
"http(\' xml:lang=\"en\"\\n\');\n"
"http(\'>\\n\');\n"
"}\n"
-"--src sparql_io.sql:1786\n";
+"--src sparql_io.sql:1774\n";
-static const char *proc422 =
-"#line 1800 \"[executable]/sparql_io.sql\"\n"
+static const char *proc392 =
+"#line 1788 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_HTML_HEAD(in title varchar)\n"
"{\n"
"http(\' <title>\' || title || \'</title>\\n\');\n"
@@ -17181,10 +15893,10 @@ static const char *proc422 =
"http(\' <meta name=\"Keywords\" content=\"OpenLink Virtuoso Sparql\" />\\n\');\n"
"http(\' <meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\\n\');\n"
"}\n"
-"--src sparql_io.sql:1798\n";
+"--src sparql_io.sql:1786\n";
-static const char *proc423 =
-"#line 1810 \"[executable]/sparql_io.sql\"\n"
+static const char *proc393 =
+"#line 1798 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_STYLE ()\n"
"{\n"
"http(\'\\n\');\n"
@@ -17298,10 +16010,10 @@ static const char *proc423 =
"</style>\n"
"\');\n"
"}\n"
-"--src sparql_io.sql:1808\n";
+"--src sparql_io.sql:1796\n";
-static const char *proc424 =
-"#line 1926 \"[executable]/sparql_io.sql\"\n"
+static const char *proc394 =
+"#line 1914 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_JAVASCRIPT (in can_cxml integer, in can_qrcode integer)\n"
"{\n"
"http(\'\\n\');\n"
@@ -17324,17 +16036,14 @@ static const char *proc424 =
"http(\' format.options[6] = new Option(\\\'ATOM+XML\\\',\\\'application/atom+xml\\\');\\n\');\n"
"http(\' format.options[7] = new Option(\\\'ODATA/JSON\\\',\\\'application/odata+json\\\');\\n\');\n"
"http(\' format.options[8] = new Option(\\\'JSON-LD\\\',\\\'application/x-json+ld\\\');\\n\');\n"
-"http(\' format.options[9] = new Option(\\\'HTML (list)\\\',\\\'text/x-html+ul\\\');\\n\');\n"
-"http(\' format.options[10] = new Option(\\\'HTML (table)\\\',\\\'text/x-html+tr\\\');\\n\');\n"
-"http(\' format.options[11] = new Option(\\\'HTML+Microdata\\\',\\\'text/html\\\');\\n\');\n"
-"http(\' format.options[12] = new Option(\\\'Microdata/JSON\\\',\\\'application/microdata+json\\\');\\n\');\n"
-"http(\' format.options[13] = new Option(\\\'CSV\\\',\\\'text/csv\\\');\\n\');\n"
-"http(\' format.options[14] = new Option(\\\'TriG\\\',\\\'application/x-trig\\\');\\n\');\n"
+"http(\' format.options[9] = new Option(\\\'HTML+Microdata\\\',\\\'text/html\\\');\\n\');\n"
+"http(\' format.options[10] = new Option(\\\'Microdata/JSON\\\',\\\'application/microdata+json\\\');\\n\');\n"
+"http(\' format.options[11] = new Option(\\\'CSV\\\',\\\'text/csv\\\');\\n\');\n"
"if (can_cxml)\n"
"{\n"
-"http(\' format.options[15] = new Option(\\\'CXML (Pivot Collection)\\\',\\\'text/cxml\\\');\\n\');\n"
+"http(\' format.options[12] = new Option(\\\'CXML (Pivot Collection)\\\',\\\'text/cxml\\\');\\n\');\n"
"if (can_qrcode)\n"
-"http(\' format.options[16] = new Option(\\\'CXML (Pivot Collection with QRcodes)\\\',\\\'text/cxml+qrcode\\\');\\n\');\n"
+"http(\' format.options[13] = new Option(\\\'CXML (Pivot Collection with QRcodes)\\\',\\\'text/cxml+qrcode\\\');\\n\');\n"
"}\n"
"http(\' format.selectedIndex = 1;\\n\');\n"
"http(\' last_format = 2;\\n\');\n"
@@ -17395,10 +16104,10 @@ static const char *proc424 =
"http(\' /*]]>*/\\n\');\n"
"http(\' </script>\\n\');\n"
"}\n"
-"--src sparql_io.sql:1924\n";
+"--src sparql_io.sql:1912\n";
-static const char *proc425 =
-"#line 2022 \"[executable]/sparql_io.sql\"\n"
+static const char *proc395 =
+"#line 2007 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_FOOTER()\n"
"{\n"
"http(\' <div id=\"footer\">\\n\');\n"
@@ -17410,10 +16119,10 @@ static const char *proc425 =
"http(sprintf(\'Cluster Edition (%d server processes)\\n\', sys_stat(\'cl_n_hosts\')));\n"
"http(\' </div>\\n\');\n"
"}\n"
-"--src sparql_io.sql:2020\n";
+"--src sparql_io.sql:2005\n";
-static const char *proc426 =
-"#line 2036 \"[executable]/sparql_io.sql\"\n"
+static const char *proc396 =
+"#line 2021 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_FORMAT_OPTS (in can_cxml integer, in can_qrcode integer, in params varchar, in qr varchar)\n"
"{\n"
"declare opts any;\n"
@@ -17424,16 +16133,16 @@ static const char *proc426 =
"{\n"
"format := (\n"
"case lower(format)\n"
-"when \'json\' then \'application/sparql-results+json\'\n"
-"when \'js\' then \'application/javascript\'\n"
-"when \'html\' then \'text/html\'\n"
-"when \'sparql\' then \'application/sparql-results+xml\'\n"
-"when \'xml\' then \'application/sparql-results+xml\'\n"
-"when \'rdf\' then \'application/rdf+xml\'\n"
-"when \'n3\' then \'text/rdf+n3\'\n"
-"when \'cxml\' then \'text/cxml\'\n"
-"when \'cxml+qrcode\' then \'text/cxml+qrcode\'\n"
-"when \'csv\' then \'text/csv\'\n"
+"when \'json\' then \'application/sparql-results+json\'\n"
+"when \'js\' then \'application/javascript\'\n"
+"when \'html\' then \'text/html\'\n"
+"when \'sparql\' then \'application/sparql-results+xml\'\n"
+"when \'xml\' then \'application/sparql-results+xml\'\n"
+"when \'rdf\' then \'application/rdf+xml\'\n"
+"when \'n3\' then \'text/rdf+n3\'\n"
+"when \'cxml\' then \'text/cxml\'\n"
+"when \'cxml+qrcode\' then \'text/cxml+qrcode\'\n"
+"when \'csv\' then \'text/csv\'\n"
"when \'json-ld\' then \'application/ld+json\'\n"
"else format\n"
"end);\n"
@@ -17445,51 +16154,49 @@ static const char *proc426 =
")\n"
"{\n"
"opts := vector (\n"
-"vector (\'text/rdf+n3\' , \'N3/Turtle\' ),\n"
-"vector (\'application/rdf+json\' , \'RDF/JSON\' ),\n"
-"vector (\'application/rdf+xml\' , \'RDF/XML\' ),\n"
-"vector (\'text/plain\' , \'N-Triples\' ),\n"
-"vector (\'application/xhtml+xml\' , \'XHTML+RDFa\' ),\n"
-"vector (\'application/atom+xml\' , \'ATOM+XML\' ),\n"
-"vector (\'application/odata+json\' , \'ODATA/JSON\' ),\n"
-"vector (\'application/x-json+ld\' , \'JSON-LD\' ),\n"
-"vector (\'text/x-html+ul\' , \'HTML (list)\' ),\n"
-"vector (\'text/x-html+tr\' , \'HTML (table)\' ),\n"
-"vector (\'text/html\' , \'HTML+Microdata\' ),\n"
-"vector (\'application/microdata+json\' , \'Microdata/JSON\' ),\n"
-"vector (\'text/csv\' , \'CSV\' ),\n"
-"vector (\'application/x-trig\' , \'TriG\' ) );\n"
+"vector (\'text/rdf+n3\', \'N3/Turtle\'),\n"
+"vector (\'application/rdf+json\', \'RDF/JSON\'),\n"
+"vector (\'application/rdf+xml\', \'RDF/XML\'),\n"
+"vector (\'text/plain\', \'NTriples\'),\n"
+"vector (\'application/xhtml+xml\', \'XHTML+RDFa\'),\n"
+"vector (\'application/atom+xml\', \'ATOM+XML\'),\n"
+"vector (\'application/odata+json\', \'ODATA/JSON\'),\n"
+"vector (\'application/ld+json\', \'JSON-LD\'),\n"
+"vector (\'text/html\', \'HTML+Microdata\'),\n"
+"vector (\'application/microdata+json\', \'Microdata/JSON\')\n"
+");\n"
"}\n"
"else\n"
"{\n"
"if (not length (format)) format := \'text/html\';\n"
"opts := vector (\n"
-"vector (\'auto\' , \'Auto\' ),\n"
-"vector (\'text/html\' , \'HTML\' ),\n"
-"vector (\'application/vnd.ms-excel\' , \'Spreadsheet\' ),\n"
-"vector (\'application/sparql-results+xml\' , \'XML\' ),\n"
-"vector (\'application/sparql-results+json\' , \'JSON\' ),\n"
-"vector (\'application/javascript\' , \'Javascript\' ),\n"
-"vector (\'text/plain\' , \'NTriples\' ),\n"
-"vector (\'application/rdf+xml\' , \'RDF/XML\' ) );\n"
+"vector (\'auto\', \'Auto\'),\n"
+"vector (\'text/html\', \'HTML\'),\n"
+"vector (\'application/vnd.ms-excel\', \'Spreadsheet\'),\n"
+"vector (\'application/sparql-results+xml\', \'XML\'),\n"
+"vector (\'application/sparql-results+json\', \'JSON\'),\n"
+"vector (\'application/javascript\', \'Javascript\'),\n"
+"vector (\'text/plain\', \'NTriples\'),\n"
+"vector (\'application/rdf+xml\', \'RDF/XML\')\n"
+");\n"
"}\n"
"foreach (any x in opts) do\n"
"{\n"
-"http(sprintf (\' <option value=\"%V\" %s>%V</option>\\n\',\n"
+"http(sprintf (\'<option value=\"%V\" %s>%V</option>\\n\',\n"
"x[0], case when format = x[0] then \'selected=\"selected\"\' else \'\' end , x[1]));\n"
"}\n"
-"http(\' <option value=\"text/csv\">CSV</option>\\n\');\n"
+"http(\' <option value=\"text/csv\">CSV</option>\\n\');\n"
"if (can_cxml)\n"
"{\n"
-"http(\' <option value=\"text/cxml\">CXML (Pivot Collection)</option>\\n\');\n"
+"http(\' <option value=\"text/cxml\">CXML (Pivot Collection)</option>\\n\');\n"
"if (can_qrcode)\n"
-"http(\' <option value=\"text/cxml+qrcode\">CXML (Pivot Collection with QRcode)</option>\\n\');\n"
+"http(\' <option value=\"text/cxml+qrcode\">CXML (Pivot Collection with QRcode)</option>\\n\');\n"
"}\n"
"}\n"
-"--src sparql_io.sql:2034\n";
+"--src sparql_io.sql:2019\n";
-static const char *proc427 =
-"#line 2110 \"[executable]/sparql_io.sql\"\n"
+static const char *proc397 =
+"#line 2093 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_SPONGE_OPTS (in params varchar)\n"
"{\n"
"declare s_param varchar;\n"
@@ -17510,10 +16217,10 @@ static const char *proc427 =
"x[0], case when s_param = x[0] then \'selected=\"selected\"\' else \'\' end , x[1]));\n"
"}\n"
"}\n"
-"--src sparql_io.sql:2108\n";
+"--src sparql_io.sql:2091\n";
-static const char *proc428 =
-"#line 2133 \"[executable]/sparql_io.sql\"\n"
+static const char *proc398 =
+"#line 2116 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_CXML_OPTION (in can_pivot integer, in params varchar, in lbl varchar)\n"
"{\n"
"declare val varchar;\n"
@@ -17557,10 +16264,10 @@ static const char *proc428 =
"\n"
"http (\' </select><br />\\n\');\n"
"}\n"
-"--src sparql_io.sql:2131\n";
+"--src sparql_io.sql:2114\n";
-static const char *proc429 =
-"#line 2179 \"[executable]/sparql_io.sql\"\n"
+static const char *proc399 =
+"#line 2162 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.sparql_predefined_nsdecl ()\n"
"{\n"
"declare label varchar;\n"
@@ -17593,13 +16300,13 @@ static const char *proc429 =
"http(\'</p>\\n\');\n"
"\n"
"WS.WS.SPARQL_ENDPOINT_FOOTER();\n"
-"http(\'</body>\\n\');\n"
+"http(\' </body>\\n\');\n"
"http(\'</html>\\n\');\n"
"}\n"
-"--src sparql_io.sql:2177\n";
+"--src sparql_io.sql:2160\n";
-static const char *proc430 =
-"#line 2217 \"[executable]/sparql_io.sql\"\n"
+static const char *proc400 =
+"#line 2200 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.sparql_predefined_rdfinf ()\n"
"{\n"
"declare label varchar;\n"
@@ -17632,13 +16339,13 @@ static const char *proc430 =
"http(\'</p>\\n\');\n"
"\n"
"WS.WS.SPARQL_ENDPOINT_FOOTER();\n"
-"http(\'</body>\\n\');\n"
+"http(\' </body>\\n\');\n"
"http(\'</html>\\n\');\n"
"}\n"
-"--src sparql_io.sql:2215\n";
+"--src sparql_io.sql:2198\n";
-static const char *proc431 =
-"#line 2254 \"[executable]/sparql_io.sql\"\n"
+static const char *proc401 =
+"#line 2237 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.SPARQL_ENDPOINT_GENERATE_FORM(\n"
"in params any,\n"
"in ini_dflt_graph varchar,\n"
@@ -17804,10 +16511,10 @@ static const char *proc431 =
"\n"
"return;\n"
"}\n"
-"--src sparql_io.sql:2252\n";
+"--src sparql_io.sql:2235\n";
-static const char *proc432 =
-"#line 2424 \"[executable]/sparql_io.sql\"\n"
+static const char *proc402 =
+"#line 2406 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.\"/!sparql/\" (inout path varchar, inout params any, inout lines any)\n"
"{\n"
"declare query, full_query, format, should_sponge, debug, def_qry varchar;\n"
@@ -17869,7 +16576,6 @@ static const char *proc432 =
"hard_timeout := atoi (coalesce (virtuoso_ini_item_value (\'SPARQL\', \'MaxQueryExecutionTime\'), \'0\')) * 1000;\n"
"timeout := atoi (coalesce (virtuoso_ini_item_value (\'SPARQL\', \'ExecutionTimeout\'), \'0\')) * 1000;\n"
"client_supports_partial_res := 0;\n"
-"\n"
"user_id := connection_get (\'SPARQLUserId\', \'SPARQL\');\n"
"help_topic := get_keyword (\'help\', params, null);\n"
"if (help_topic is not null)\n"
@@ -18403,7 +17109,6 @@ static const char *proc432 =
"full_query, state, msg, format);\n"
"return;\n"
"}\n"
-"\n"
"write_results:\n"
"if (save_mode is not null)\n"
"{\n"
@@ -18618,20 +17323,20 @@ static const char *proc432 =
"http(\'</body>\\n\');\n"
"http(\'</html>\\n\');\n"
"}\n"
-"--src sparql_io.sql:2422\n";
+"--src sparql_io.sql:2404\n";
static const char *other43 =
"registry_set (\'/!sparql/\', \'no_vsp_recompile\')\n";
-static const char *proc433 =
-"#line 3240 \"[executable]/sparql_io.sql\"\n"
+static const char *proc403 =
+"#line 3220 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_CRUD_BASE_EV_NEW_BLANK (inout g_iid IRI_ID, inout app_env any, inout res IRI_ID)\n"
"{\n"
"res := min_bnode_iri_id ();\n"
"}\n"
-"--src sparql_io.sql:3238\n";
+"--src sparql_io.sql:3218\n";
-static const char *proc434 =
-"#line 3247 \"[executable]/sparql_io.sql\"\n"
+static const char *proc404 =
+"#line 3227 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_CRUD_BASE_EV_TRIPLE (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_uri varchar,\n"
@@ -18639,10 +17344,10 @@ static const char *proc434 =
"{\n"
"signal (\'22023\', \'The graph URI is relative and can not be resolved using the submitted resource (base should be declared before data for the first triple)\');\n"
"}\n"
-"--src sparql_io.sql:3245\n";
+"--src sparql_io.sql:3225\n";
-static const char *proc435 =
-"#line 3257 \"[executable]/sparql_io.sql\"\n"
+static const char *proc405 =
+"#line 3237 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_CRUD_BASE_EV_TRIPLE_L (\n"
"inout g_iid IRI_ID, inout s_uri varchar, inout p_uri varchar,\n"
"inout o_val any, inout o_type varchar, inout o_lang varchar,\n"
@@ -18650,10 +17355,10 @@ static const char *proc435 =
"{\n"
"signal (\'22023\', \'The graph URI is relative and can not be resolved using the submitted resource (base should be declared before data for the first triple)\');\n"
"}\n"
-"--src sparql_io.sql:3255\n";
+"--src sparql_io.sql:3235\n";
-static const char *proc436 =
-"#line 3267 \"[executable]/sparql_io.sql\"\n"
+static const char *proc406 =
+"#line 3247 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_CRUD_BASE_EV_NEW_BASE (\n"
"inout base_uri varchar,\n"
"inout graph_uri varchar,\n"
@@ -18662,10 +17367,10 @@ static const char *proc436 =
"app_env[0] := DB.DBA.XML_URI_RESOLVE_LIKE_GET (base_uri, graph_uri);\n"
"signal (\'ok001\', \'\');\n"
"}\n"
-"--src sparql_io.sql:3265\n";
+"--src sparql_io.sql:3245\n";
-static const char *proc437 =
-"#line 3278 \"[executable]/sparql_io.sql\"\n"
+static const char *proc407 =
+"#line 3258 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_CRUD_BASE_TTL (inout strg any, in graph_uri varchar, in flags integer := 255)\n"
"{\n"
"declare app_env any;\n"
@@ -18687,10 +17392,10 @@ static const char *proc437 =
"done:\n"
"return app_env[0];\n"
"}\n"
-"--src sparql_io.sql:3276\n";
+"--src sparql_io.sql:3256\n";
-static const char *proc438 =
-"#line 3302 \"[executable]/sparql_io.sql\"\n"
+static const char *proc408 =
+"#line 3282 \"[executable]/sparql_io.sql\"\n"
" create procedure DB.DBA.SPARQL_CRUD_BASE_RDFXML (in strg any, in graph_uri varchar)\n"
"{\n"
"declare app_env any;\n"
@@ -18711,10 +17416,10 @@ static const char *proc438 =
"done:\n"
"return app_env[0];\n"
"}\n"
-"--src sparql_io.sql:3300\n";
+"--src sparql_io.sql:3280\n";
-static const char *proc439 =
-"#line 3324 \"[executable]/sparql_io.sql\"\n"
+static const char *proc409 =
+"#line 3304 \"[executable]/sparql_io.sql\"\n"
"create procedure WS.WS.\"/!sparql-graph-crud/\" (inout path varchar, inout params any, inout lines any)\n"
"{\n"
"declare user_id varchar;\n"
@@ -18763,36 +17468,36 @@ static const char *proc439 =
"\n"
"WS.WS.SPARQL_ENDPOINT_HTML_DOCTYPE();\n"
"\n"
-"http(\'<head>\\n\');\n"
+"http(\' <head>\\n\');\n"
"WS.WS.SPARQL_ENDPOINT_HTML_HEAD(\'Virtuoso SPARQL 1.1 Uniform RDF Graph Query Form\');\n"
"WS.WS.SPARQL_ENDPOINT_STYLE ();\n"
-"http(\'</head>\\n\');\n"
+"http(\' </head>\\n\');\n"
"\n"
-"http(\'<body>\\n\');\n"
-"http(\' <div id=\"header\">\\n\');\n"
-"http(\' <h1>Virtuoso SPARQL 1.1 Uniform RDF Graph Query Form</h1>\\n\');\n"
+"http(\' <body>\\n\');\n"
+"http(\' <div id=\"header\">\\n\');\n"
+"http(\' <h1>Virtuoso SPARQL 1.1 Uniform RDF Graph Query Form</h1>\\n\');\n"
"http(\' </div>\\n\\n\');\n"
"http(\' <div id=\"intro\">\\n\');\n"
-"http(\' <p>This page is designed to help you test support for <a href=\"http://www.w3.org/TR/sparql11-http-rdf-update\">SPARQL 1.1 Graph Store HTTP Protocol</a> in OpenLink Virtuoso.</p>\\n\');\n"
+"http(\' <p>This page is designed to help you test support for <a href=\"http://www.w3.org/TR/sparql11-http-rdf-update\">SPARQL 1.1 Graph Store HTTP Protocol</a> in OpenLink Virtuoso.</p>\\n\');\n"
"http(\' </div>\\n\\n\');\n"
"http(\' <div id=\"main\">\\n\');\n"
"http(\' <form action=\"\" method=\"post\" enctype=\"multipart/form-data\">\\n\');\n"
-"http(\' <fieldset>\\n\');\n"
-"http(\' <label for=\"graph-uri\">Graph URI</label>\\n\');\n"
-"http(\' <br />\\n\');\n"
-"http(\' <input type=\"text\" name=\"graph-uri\" id=\"graph-uri\" \');\n"
+"http(\' <fieldset>\\n\');\n"
+"http(\' <label for=\"graph-uri\">Graph URI</label>\\n\');\n"
+"http(\' <br />\\n\');\n"
+"http(\' <input type=\"text\" name=\"graph-uri\" id=\"graph-uri\" \');\n"
"http(sprintf (\'value=\"%s\" size=\"80\"/>\\n\', coalesce (\'\')));\n"
-"http(\' <br /><br />\\n\');\n"
-"http(\' <label for=\"res-file\">File to upload</label>\\n\');\n"
-"http(\' <br />\\n\');\n"
-"http(\' <input type=\"file\" name=\"res-file\" id=\"res-file\"/>\\n\');\n"
-"http(\' <br /><br />\\n\');\n"
-"http(\' <input type=\"submit\" value=\"Upload the resource\"/>\');\n"
-"http(\' </fieldset>\\n\');\n"
-"http(\' </form>\\n\');\n"
+"http(\' <br /><br />\\n\');\n"
+"http(\' <label for=\"res-file\">File to upload</label>\\n\');\n"
+"http(\' <br />\\n\');\n"
+"http(\' <input type=\"file\" name=\"res-file\" id=\"res-file\"/>\\n\');\n"
+"http(\' <br /><br />\\n\');\n"
+"http(\'<input type=\"submit\" value=\"Upload the resource\"/>\');\n"
+"http(\' </fieldset>\\n\');\n"
+"http(\' </form>\\n\');\n"
"http(\' </div>\\n\\n\');\n"
"WS.WS.SPARQL_ENDPOINT_FOOTER();\n"
-"http(\'</body>\\n\');\n"
+"http(\' </body>\\n\');\n"
"http(\'</html>\\n\');\n"
"return;\n"
"graph_processing:\n"
@@ -18896,12 +17601,12 @@ static const char *proc439 =
"return;\n"
"}\n"
"}\n"
-"--src sparql_io.sql:3322\n";
+"--src sparql_io.sql:3302\n";
static const char *other44 =
"registry_set (\'/!sparql-graph-crud/\', \'no_vsp_recompile\')\n";
-static const char *proc440 =
-"#line 3511 \"[executable]/sparql_io.sql\"\n"
+static const char *proc410 =
+"#line 3491 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_REFRESH_DYNARES_RESULTS (in full_query varchar, in qry_params any, in maxrows integer, in accept varchar, in user_id varchar, in hard_timeout integer, in jsonp_callback any)\n"
"{\n"
"\n"
@@ -18928,10 +17633,10 @@ static const char *proc440 =
"http (\')\', ses);\n"
"result (ses);\n"
"}\n"
-"--src sparql_io.sql:3509\n";
+"--src sparql_io.sql:3489\n";
-static const char *proc441 =
-"#line 3542 \"[executable]/sparql_io.sql\"\n"
+static const char *proc411 =
+"#line 3522 \"[executable]/sparql_io.sql\"\n"
" create function DB.DBA.SPARQL_ROUTE_IF_DAV (in graph_iri varchar, in output_format_name varchar)\n"
"{\n"
"\n"
@@ -18940,10 +17645,10 @@ static const char *proc441 =
"return subseq (graph_iri, 17);\n"
"return NULL;\n"
"}\n"
-"--src sparql_io.sql:3540\n";
+"--src sparql_io.sql:3520\n";
-static const char *proc442 =
-"#line 3552 \"[executable]/sparql_io.sql\"\n"
+static const char *proc412 =
+"#line 3532 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV (\n"
"in graph_iri varchar,\n"
"in opname varchar,\n"
@@ -19017,8 +17722,6 @@ static const char *proc442 =
"DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT (triples, 1, out_ses);\n"
"else if ((\'text/rdf+n3\' = mime) or (\'text/rdf+ttl\' = mime) or (\'text/rdf+turtle\' = mime) or (\'text/turtle\' = mime) or (\'text/n3\' = mime))\n"
"DB.DBA.RDF_TRIPLES_TO_TTL (triples, out_ses);\n"
-"else if (\'application/x-trig\' = mime)\n"
-"DB.DBA.RDF_TRIPLES_TO_TRIG (triples, out_ses);\n"
"else if (\'text/plain\' = mime)\n"
"DB.DBA.RDF_TRIPLES_TO_NT (triples, out_ses);\n"
"else if ((\'application/json\' = mime) or (\'application/rdf+json\' = mime) or (\'application/x-rdf+json\' = mime))\n"
@@ -19040,28 +17743,28 @@ static const char *proc442 =
"if (not isinteger (final_res))\n"
"return final_res;\n"
"}\n"
-"--src sparql_io.sql:3550\n";
+"--src sparql_io.sql:3530\n";
-static const char *proc443 =
-"#line 3651 \"[executable]/sparql_io.sql\"\n"
+static const char *proc413 =
+"#line 3629 \"[executable]/sparql_io.sql\"\n"
"create procedure\n"
"WS.WS.__http_handler_rq (in content any, in params any, in lines any, inout ipath_ostat any)\n"
"{\n"
"return DB.DBA.http_rq_file_handler(content, params, lines, ipath_ostat);\n"
"}\n"
-"--src sparql_io.sql:3649\n";
+"--src sparql_io.sql:3627\n";
-static const char *proc444 =
-"#line 3658 \"[executable]/sparql_io.sql\"\n"
+static const char *proc414 =
+"#line 3636 \"[executable]/sparql_io.sql\"\n"
"create procedure\n"
"WS.WS.__http_handler_head_rq (in content any, in params any, in lines any, inout ipath_ostat any)\n"
"{\n"
"return DB.DBA.http_rq_file_handler(content, params, lines, ipath_ostat);\n"
"}\n"
-"--src sparql_io.sql:3656\n";
+"--src sparql_io.sql:3634\n";
-static const char *proc445 =
-"#line 3665 \"[executable]/sparql_io.sql\"\n"
+static const char *proc415 =
+"#line 3643 \"[executable]/sparql_io.sql\"\n"
"create procedure\n"
"DB.DBA.http_rq_file_handler (in content any, in params any, in lines any, inout ipath_ostat any)\n"
"{\n"
@@ -19098,7 +17801,6 @@ static const char *proc445 =
"strcasestr (accept, \'text/rdf+ttl\') is not null or\n"
"strcasestr (accept, \'text/rdf+turtle\') is not null or\n"
"strcasestr (accept, \'text/turtle\') is not null or\n"
-"strcasestr (accept, \'application/x-trig\') is not null or\n"
"strcasestr (accept, \'application/rdf+xml\') is not null or\n"
"strcasestr (accept, \'application/javascript\') is not null or\n"
"strcasestr (accept, \'application/soap+xml\') is not null or\n"
@@ -19119,10 +17821,10 @@ static const char *proc445 =
"http (content);\n"
"return \'\';\n"
"}\n"
-"--src sparql_io.sql:3663\n";
+"--src sparql_io.sql:3641\n";
-static const char *proc446 =
-"#line 3724 \"[executable]/sparql_io.sql\"\n"
+static const char *proc416 =
+"#line 3701 \"[executable]/sparql_io.sql\"\n"
"create procedure DB.DBA.RDF_GRANT_SPARQL_IO ()\n"
"{\n"
"declare state, msg varchar;\n"
@@ -19142,15 +17844,15 @@ static const char *proc446 =
"exec (cmd, state, msg);\n"
"}\n"
"}\n"
-"--src sparql_io.sql:3722\n";
+"--src sparql_io.sql:3699\n";
static const char *other45 =
" DB.DBA.RDF_GRANT_SPARQL_IO ()\n";
/* rdf_sponge.sql */
-static const char *proc447 =
-"#line 50 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc417 =
+"#line 28 \"[executable]/rdf_sponge.sql\"\n"
" create procedure DB.DBA.RDF_FT_INDEX_GRABBED (inout grabbed any, inout options any)\n"
"{\n"
"declare grabbed_list any;\n"
@@ -19183,10 +17885,10 @@ static const char *proc447 =
"}\n"
"\n"
"}\n"
-"--src rdf_sponge.sql:48\n";
+"--src rdf_sponge.sql:26\n";
-static const char *proc448 =
-"#line 84 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc418 =
+"#line 62 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.RDF_GRAB_SINGLE (in val any, inout grabbed any, inout env any) returns integer\n"
"{\n"
"declare url, get_method, recov varchar;\n"
@@ -19254,20 +17956,20 @@ static const char *proc448 =
"}\n"
"return 0;\n"
"}\n"
-"--src rdf_sponge.sql:82\n";
+"--src rdf_sponge.sql:60\n";
-static const char *proc449 =
-"#line 153 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc419 =
+"#line 131 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_GRAB_SINGLE_ASYNC (in val any, in grabbed any, in env any, in counter_limit integer := 1)\n"
"{\n"
"\n"
"if (dict_size (grabbed) < counter_limit)\n"
"DB.DBA.RDF_GRAB_SINGLE (val, grabbed, vector_concat (vector (\'refresh_free_text\', 0), env));\n"
"}\n"
-"--src rdf_sponge.sql:151\n";
+"--src rdf_sponge.sql:129\n";
-static const char *proc450 =
-"#line 161 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc420 =
+"#line 139 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.RDF_GRAB_SEEALSO (in subj varchar, in opt_g varchar, inout env any) returns integer\n"
"{\n"
"declare grabbed, aq any;\n"
@@ -19359,10 +18061,10 @@ static const char *proc450 =
"return 4;\n"
"return 2;\n"
"}\n"
-"--src rdf_sponge.sql:159\n";
+"--src rdf_sponge.sql:137\n";
-static const char *proc451 =
-"#line 254 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc421 =
+"#line 232 \"[executable]/rdf_sponge.sql\"\n"
"create procedure\n"
"DB.DBA.RDF_GRAB (\n"
"in app_params any, in seed varchar, in iter varchar, in final varchar, in ret_limit integer,\n"
@@ -19472,10 +18174,10 @@ static const char *proc451 =
"for (rctr := 0; rctr < rcount; rctr := rctr + 1)\n"
"result (rset[rctr]);\n"
"}\n"
-"--src rdf_sponge.sql:252\n";
+"--src rdf_sponge.sql:230\n";
-static const char *proc452 =
-"#line 365 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc422 =
+"#line 343 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.RDF_GRAB_RESOLVER_DEFAULT (in base varchar, in rel_uri varchar, out abs_uri varchar, out dest_uri varchar, out get_method varchar)\n"
"{\n"
"declare rel_lattice_pos, base_lattice_pos integer;\n"
@@ -19514,10 +18216,10 @@ static const char *proc452 =
"get_method := \'GET\';\n"
"\n"
"}\n"
-"--src rdf_sponge.sql:363\n";
+"--src rdf_sponge.sql:341\n";
-static const char *proc453 =
-"#line 410 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc423 =
+"#line 388 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.SPARQL_EVAL_TO_ARRAY (in query varchar, in dflt_graph varchar, in maxrows integer)\n"
"{\n"
"declare state, msg varchar;\n"
@@ -19535,10 +18237,10 @@ static const char *proc453 =
"signal (state, msg);\n"
"return rset;\n"
"}\n"
-"--src rdf_sponge.sql:408\n";
+"--src rdf_sponge.sql:386\n";
-static const char *proc454 =
-"#line 429 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc424 =
+"#line 407 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.SPARQL_EVAL (in query varchar, in dflt_graph varchar, in maxrows integer)\n"
"{\n"
"declare sqltext, state, msg varchar;\n"
@@ -19560,7 +18262,7 @@ static const char *proc454 =
"exec_result (row);\n"
"}\n"
"}\n"
-"--src rdf_sponge.sql:427\n";
+"--src rdf_sponge.sql:405\n";
static const char *tbl20 =
"create table DB.DBA.SYS_HTTP_SPONGE (\n"
@@ -19587,8 +18289,8 @@ static const char *tbl20 =
"create index SYS_HTTP_SPONGE_EXPIRATION on DB.DBA.SYS_HTTP_SPONGE (HS_EXPIRATION desc) partition (HS_LOCAL_IRI varchar)\n"
"create index SYS_HTTP_SPONGE_FROM_IRI on DB.DBA.SYS_HTTP_SPONGE (HS_FROM_IRI, HS_PARSER) partition (HS_FROM_IRI varchar)\n";
-static const char *proc455 =
-"#line 487 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc425 =
+"#line 465 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.SYS_HTTP_SPONGE_GET_CACHE_PARAMS\n"
"(\n"
"in explicit_refresh any,\n"
@@ -19622,11 +18324,9 @@ static const char *proc455 =
"ret_dt_expires := http_string_date (ret_expires, NULL, now());\n"
"ret_dt_last_modified := http_string_date (ret_last_modif, NULL, now());\n"
"\n"
-"if (http_request_header (ret_hdr, \'Pragma\', null, null) = \'no-cache\' or http_request_header (ret_hdr, \'Cache-Control\', null, null) like \'no-cache%\' )\n"
-"{\n"
+"if (http_request_header (ret_hdr, \'Pragma\', null, null) = \'no-cache\' or\n"
+"http_request_header (ret_hdr, \'Cache-Control\', null, null) like \'no-cache%\' )\n"
"ret_dt_expires := now ();\n"
-"ret_etag := null;\n"
-"}\n"
"\n"
"if (ret_304_not_modified and ret_dt_last_modified is null)\n"
"ret_dt_last_modified := old_last_modified;\n"
@@ -19669,10 +18369,10 @@ static const char *proc455 =
"new_expiration := __min (new_expiration, dateadd (\'second\', explicit_refresh, now()));\n"
"}\n"
"}\n"
-"--src rdf_sponge.sql:485\n";
+"--src rdf_sponge.sql:463\n";
-static const char *proc456 =
-"#line 572 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc426 =
+"#line 548 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.SYS_HTTP_SPONGE_DEP_URL_NOT_CHANGED (in local_iri varchar, in parser varchar, in explicit_refresh int)\n"
"{\n"
"\n"
@@ -19717,10 +18417,10 @@ static const char *proc456 =
"}\n"
"return 1;\n"
"}\n"
-"--src rdf_sponge.sql:570\n";
+"--src rdf_sponge.sql:546\n";
-static const char *proc457 =
-"#line 618 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc427 =
+"#line 594 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_HTTP_MAKE_HTTP_REQ (in url varchar, in meth varchar, in req varchar)\n"
"{\n"
"declare hf any;\n"
@@ -19733,10 +18433,10 @@ static const char *proc457 =
"str := replace (str, \'\\n\\n\', \'\\n\');\n"
"return split_and_decode (str, 0, \'\\0\\0\\n\');\n"
"}\n"
-"--src rdf_sponge.sql:616\n";
+"--src rdf_sponge.sql:592\n";
-static const char *proc458 =
-"#line 632 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc428 =
+"#line 608 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.SYS_HTTP_SPONGE_UP (in local_iri varchar, in get_uri varchar, in parser varchar, in eraser varchar, in options any)\n"
"{\n"
"declare new_origin_uri, new_origin_login, new_last_etag varchar;\n"
@@ -19747,7 +18447,6 @@ static const char *proc458 =
"old_download_size, old_download_msec_time, old_read_count,\n"
"new_download_size, explicit_refresh, max_sz integer;\n"
"declare get_method varchar;\n"
-"declare get_soft varchar;\n"
"declare ret_hdr, immg, req_hdr_arr any;\n"
"declare req_hdr varchar;\n"
"declare ret_body, ret_content_type, ret_etag, ret_last_modified, ret_date, ret_last_modif, ret_expires varchar;\n"
@@ -19761,7 +18460,6 @@ static const char *proc458 =
"new_origin_uri := cast (get_keyword_ucase (\'get:uri\', options, get_uri) as varchar);\n"
"new_origin_login := cast (get_keyword_ucase (\'get:login\', options) as varchar);\n"
"explicit_refresh := get_keyword_ucase (\'get:refresh\', options);\n"
-"get_soft := get_keyword_ucase (\'get:soft\', options, \'\');\n"
"if (explicit_refresh is null)\n"
"{\n"
"max_refresh := virtuoso_ini_item_value (\'SPARQL\', \'MaxCacheExpiration\');\n"
@@ -19861,12 +18559,8 @@ static const char *proc458 =
"\n"
"if (get_method in (\'POST\', \'GET\', \'GET+MGET\'))\n"
"{\n"
-"declare acc_hdr varchar; \n"
"req_hdr := NULL;\n"
"get_proxy := get_keyword_ucase (\'get:proxy\', options);\n"
-"acc_hdr := trim (get_keyword_ucase (\'get:accept\', options));\n"
-"if (not length (acc_hdr))\n"
-"acc_hdr := \'application/rdf+xml; q=1.0, text/rdf+n3; q=0.9, application/rdf+turtle; q=0.5, application/x-turtle; q=0.6, application/turtle; q=0.5, text/turtle; q=0.7, application/xml; q=0.2, */*; q=0.1\';\n"
"connection_set (\'sparql-get:proxy\', get_proxy);\n"
"\n"
"\n"
@@ -19880,7 +18574,7 @@ static const char *proc458 =
"\n"
"req_hdr := req_hdr || case when length (req_hdr) > 0 then \'\\r\\n\' else \'\' end\n"
"|| \'User-Agent: OpenLink Virtuoso RDF crawler\\r\\n\'\n"
-"|| \'Accept: \' || acc_hdr;\n"
+"|| \'Accept: application/rdf+xml; q=1.0, text/rdf+n3; q=0.9, application/rdf+turtle; q=0.7, application/x-turtle; q=0.6, application/turtle; q=0.5, text/turtle; q=0.5, application/xml; q=0.2, */*; q=0.1\';\n"
"\n"
"\n"
"{\n"
@@ -19935,7 +18629,7 @@ static const char *proc458 =
"}\n"
"goto resp_received;\n"
"}\n"
-"if (eraser is not null and (get_soft <> \'add\'))\n"
+"if (eraser is not null)\n"
"call (eraser) (local_iri, new_origin_uri, options);\n"
"signal (\'RDFZZ\', sprintf (\n"
"\'Unable to get data from \"%.1000s\": This version of Virtuoso does not support OPTION (get:method \"%.100s\")\',\n"
@@ -20002,7 +18696,7 @@ static const char *proc458 =
"whenever sqlstate \'*\' goto error_during_load;\n"
"parser_rc := 0;\n"
"req_hdr_arr := DB.DBA.RDF_HTTP_MAKE_HTTP_REQ (new_origin_uri, get_method, req_hdr);\n"
-"if (eraser is not null and (get_soft <> \'add\'))\n"
+"if (eraser is not null)\n"
"call (eraser) (local_iri, new_origin_uri, options);\n"
"parser_rc := call (parser) (local_iri, new_origin_uri, ret_content_type, ret_hdr, ret_body, options, req_hdr_arr);\n"
"\n"
@@ -20070,38 +18764,33 @@ static const char *proc458 =
"signal (stat, msg);\n"
"return local_iri;\n"
"}\n"
-"--src rdf_sponge.sql:630\n";
+"--src rdf_sponge.sql:606\n";
-static const char *proc459 =
-"#line 969 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc429 =
+"#line 939 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.SYS_FILE_SPONGE_UP (in local_iri varchar, in get_uri varchar, in parser varchar, in eraser varchar, in options any)\n"
"{\n"
"declare new_origin_uri, str, base_uri, mime_type, dummy, tmp any;\n"
"declare inx int;\n"
-"declare get_soft varchar;\n"
"new_origin_uri := cast (get_keyword_ucase (\'get:uri\', options, get_uri) as varchar);\n"
-"get_soft := get_keyword_ucase (\'get:soft\', options, \'\');\n"
"inx := 5;\n"
"base_uri := new_origin_uri;\n"
"base_uri := charset_recode (base_uri, \'UTF-8\', NULL);\n"
"while (length (base_uri) > inx + 1 and aref (base_uri, inx) = ascii (\'/\'))\n"
"inx := inx + 1;\n"
-"if (inx = 8)\n"
-"str := file_to_string (subseq (base_uri, inx-1));\n"
-"else\n"
"str := file_to_string (concat (http_root(), \'/\' , subseq (base_uri, inx)));\n"
"dummy := vector ();\n"
"tmp := vector (\'OK\');\n"
"mime_type := null;\n"
-"if (eraser is not null and (get_soft <> \'add\'))\n"
+"if (eraser is not null)\n"
"call (eraser) (local_iri, new_origin_uri, options);\n"
"DB.DBA.RDF_LOAD_HTTP_RESPONSE (local_iri, new_origin_uri, mime_type, tmp, str, options, dummy);\n"
"return local_iri;\n"
"}\n"
-"--src rdf_sponge.sql:967\n";
+"--src rdf_sponge.sql:937\n";
-static const char *proc460 =
-"#line 996 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc430 =
+"#line 961 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE (in origin_uri varchar, in ret_content_type varchar, inout ret_body any) returns varchar\n"
"{\n"
"\n"
@@ -20120,8 +18809,6 @@ static const char *proc460 =
"strstr (ret_content_type, \'application/x-turtle\') is not null or\n"
"strstr (ret_content_type, \'application/turtle\') is not null )\n"
"return \'text/rdf+n3\';\n"
-"if (strstr (ret_content_type, \'application/x-trig\') is not null)\n"
-"return \'application/x-trig\';\n"
"}\n"
"declare ret_begin, ret_html any;\n"
"ret_begin := subseq (ret_body, 0, 4096);\n"
@@ -20167,7 +18854,7 @@ static const char *proc460 =
"}\n"
"return ret_content_type;\n"
"}\n"
-"--src rdf_sponge.sql:994\n";
+"--src rdf_sponge.sql:959\n";
static const char *tbl21 =
"create table DB.DBA.SYS_RDF_MAPPERS (\n"
@@ -20185,8 +18872,8 @@ static const char *tbl21 =
"create index SYS_RDF_MAPPERS_I1 on DB.DBA.SYS_RDF_MAPPERS (RM_ID) partition cluster replicated\n"
"create index SYS_RDF_MAPPERS_I2 on DB.DBA.SYS_RDF_MAPPERS (RM_PID) partition cluster replicated\n";
-static const char *proc461 =
-"#line 1114 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc431 =
+"#line 1077 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_HTTP_URL_GET (inout url any, in base any, inout hdr any,\n"
"in meth any := \'GET\', in req_hdr varchar := null, in cnt any := null, in proxy any := null, in sig int := 1)\n"
"{\n"
@@ -20235,10 +18922,10 @@ static const char *proc461 =
"\n"
"return content;\n"
"}\n"
-"--src rdf_sponge.sql:1112\n";
+"--src rdf_sponge.sql:1075\n";
-static const char *proc462 =
-"#line 1165 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc432 =
+"#line 1128 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_SW_PING (in endp varchar, in url varchar)\n"
"{\n"
"declare rc any;\n"
@@ -20278,26 +18965,26 @@ static const char *proc462 =
"commit work;\n"
"return;\n"
"}\n"
-"--src rdf_sponge.sql:1163\n";
+"--src rdf_sponge.sql:1126\n";
-static const char *proc463 =
-"#line 1206 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc433 =
+"#line 1169 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_PROC_COLS (in pname varchar)\n"
"{\n"
"set_user_id (\'dba\', 1);\n"
"return procedure_cols (pname);\n"
"}\n"
-"--src rdf_sponge.sql:1204\n";
+"--src rdf_sponge.sql:1167\n";
-static const char *proc464 =
-"#line 1214 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc434 =
+"#line 1177 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_LOAD_HTTP_RESPONSE (in graph_iri varchar, in new_origin_uri varchar, inout ret_content_type varchar, inout ret_hdr any, inout ret_body any, inout options any, inout req_hdr_arr any)\n"
"{\n"
-"declare dest, groupdest, get_soft, cset, base, first_stat, first_msg varchar;\n"
+"declare dest, groupdest, cset, base, first_stat, first_msg varchar;\n"
"declare rc any;\n"
"declare aq, ps any;\n"
"declare xd, xt any;\n"
-"declare saved_log_mode, only_rdfa, retr_count integer;\n"
+"declare saved_log_mode, only_rdfa integer;\n"
"aq := null;\n"
"ps := virtuoso_ini_item_value (\'SPARQL\', \'PingService\');\n"
"if (length (ps))\n"
@@ -20311,7 +18998,6 @@ static const char *proc464 =
"dest := get_keyword_ucase (\'get:destination\', options);\n"
"groupdest := get_keyword_ucase (\'get:group-destination\', options);\n"
"base := get_keyword (\'http-redirect-to\', options, new_origin_uri);\n"
-"get_soft := get_keyword_ucase (\'get:soft\', options);\n"
"if (get_keyword_ucase (\'get:strategy\', options, \'default\') = \'rdfa-only\')\n"
"only_rdfa := 1;\n"
"else\n"
@@ -20320,7 +19006,6 @@ static const char *proc464 =
"signal (\'RDFXX\', sprintf (\'Unable to load RDF graph <%.500s> from <%.500s>: the sparql-results XML answer does not contain triples\', graph_iri, new_origin_uri));\n"
"if (get_keyword (\'http-headers\', options) is null)\n"
"options := vector_concat (options, vector (\'http-headers\', vector (req_hdr_arr, ret_hdr)));\n"
-"retry_after_deadlock:\n"
"if (strstr (ret_content_type, \'application/rdf+xml\') is not null)\n"
"{\n"
"\n"
@@ -20390,20 +19075,6 @@ static const char *proc464 =
"\n"
"\n"
"load_grddl:;\n"
-"if ((\'40001\' = __SQL_STATE) and (retr_count < 10))\n"
-"{\n"
-"rollback work;\n"
-"retr_count := retr_count + 1;\n"
-"goto retry_after_deadlock;\n"
-"}\n"
-"if (__proc_exists (\'DB.DBA.RDF_RUN_CARTRIDGES\') is not null)\n"
-"{\n"
-"rc := DB.DBA.RDF_RUN_CARTRIDGES (graph_iri, new_origin_uri, dest, ret_body, ret_content_type, options, ret_hdr, ps, aq, req_hdr_arr);\n"
-"if (rc)\n"
-"return rc;\n"
-"}\n"
-"else\n"
-"{\n"
"cset := http_request_header (ret_hdr, \'Content-Type\', \'charset\', null);\n"
"for select RM_PATTERN, RM_TYPE, RM_HOOK, RM_KEY, RM_OPTIONS, RM_DESCRIPTION from DB.DBA.SYS_RDF_MAPPERS where RM_ENABLED = 1 order by RM_ID do\n"
"{\n"
@@ -20464,7 +19135,7 @@ static const char *proc464 =
"}\n"
"if (__tag(rc) = 193 or rc < 0 or rc > 0)\n"
"{\n"
-"if (rc > 0 and __proc_exists (\'DB.DBA.RDF_LOAD_POST_PROCESS\'))\n"
+"if (__proc_exists (\'DB.DBA.RDF_LOAD_POST_PROCESS\'))\n"
"call (\'DB.DBA.RDF_LOAD_POST_PROCESS\') (graph_iri, new_origin_uri, dest, ret_body, ret_content_type, options);\n"
"if (__tag(rc) = 193)\n"
"return rc;\n"
@@ -20473,7 +19144,6 @@ static const char *proc464 =
"}\n"
"try_next_mapper:;\n"
"}\n"
-"}\n"
"\n"
"\n"
"\n"
@@ -20485,7 +19155,7 @@ static const char *proc464 =
"\n"
"\n"
"\n"
-"if ((dest is null) and (get_soft is null or (get_soft <> \'add\')))\n"
+"if (dest is null)\n"
"{\n"
"DB.DBA.SPARUL_CLEAR (graph_iri, 1, 0);\n"
"commit work;\n"
@@ -20525,18 +19195,12 @@ static const char *proc464 =
"load_grddl_after_error:\n"
"first_stat := __SQL_STATE;\n"
"first_msg := __SQL_MESSAGE;\n"
-"if ((\'40001\' = first_stat) and (retr_count < 10))\n"
-"{\n"
-"rollback work;\n"
-"retr_count := retr_count + 1;\n"
-"goto retry_after_deadlock;\n"
-"}\n"
"goto load_grddl;\n"
"}\n"
-"--src rdf_sponge.sql:1212\n";
+"--src rdf_sponge.sql:1175\n";
-static const char *proc465 =
-"#line 1458 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc435 =
+"#line 1398 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_FORGET_HTTP_RESPONSE (in graph_iri varchar, in new_origin_uri varchar, inout options any)\n"
"{\n"
"declare dest varchar;\n"
@@ -20558,10 +19222,10 @@ static const char *proc465 =
"if (dest is null)\n"
"DB.DBA.SPARUL_CLEAR (graph_iri, 1, 0);\n"
"}\n"
-"--src rdf_sponge.sql:1456\n";
+"--src rdf_sponge.sql:1396\n";
-static const char *proc466 =
-"#line 1481 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc436 =
+"#line 1421 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.RDF_SPONGE_UP (in graph_iri varchar, in options any, in uid integer := -1)\n"
"{\n"
"declare aq, cookie varchar;\n"
@@ -20594,10 +19258,10 @@ static const char *proc466 =
"local_iri := graph_iri;\n"
"return local_iri;\n"
"}\n"
-"--src rdf_sponge.sql:1479\n";
+"--src rdf_sponge.sql:1419\n";
-static const char *proc467 =
-"#line 1515 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc437 =
+"#line 1455 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.RDF_SPONGE_UP_1 (in graph_iri varchar, in options any, in uid integer := -1)\n"
"{\n"
"declare dest, get_soft, local_iri, immg, res_graph_iri, cookie varchar;\n"
@@ -20642,14 +19306,14 @@ static const char *proc467 =
"\n"
"}\n"
"else\n"
-"if ((\'replacing\' = get_soft) or (\'replace\' = get_soft) or (\'add\' = get_soft))\n"
+"if ((\'replacing\' = get_soft) or (\'replace\' = get_soft))\n"
"{\n"
"\n"
" ;\n"
"}\n"
"else\n"
"signal (\'RDFZZ\', sprintf (\n"
-"\'This version of Virtuoso supports only \"soft\", \"replacing\" and \"add\" values of \"define get:soft ...\", not \"%.500s\"\',\n"
+"\'This version of Virtuoso supports only \"soft\" and \"replacing\" values of \"define get:soft ...\", not \"%.500s\"\',\n"
"get_soft ) );\n"
"if (not bit_and (perms, 4))\n"
"{\n"
@@ -20721,10 +19385,10 @@ static const char *proc467 =
"VT_INC_INDEX_DB_DBA_RDF_OBJ();\n"
"return res_graph_iri;\n"
"}\n"
-"--src rdf_sponge.sql:1513\n";
+"--src rdf_sponge.sql:1453\n";
-static const char *proc468 =
-"#line 1640 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc438 =
+"#line 1580 \"[executable]/rdf_sponge.sql\"\n"
"create function DB.DBA.RDF_SPONGE_UP_LIST (in sources any)\n"
"{\n"
"declare need_reindex integer;\n"
@@ -20743,10 +19407,10 @@ static const char *proc468 =
"VT_INC_INDEX_DB_DBA_RDF_OBJ();\n"
"return 1;\n"
"}\n"
-"--src rdf_sponge.sql:1638\n";
+"--src rdf_sponge.sql:1578\n";
-static const char *proc469 =
-"#line 1661 \"[executable]/rdf_sponge.sql\"\n"
+static const char *proc439 =
+"#line 1601 \"[executable]/rdf_sponge.sql\"\n"
"create procedure DB.DBA.RDF_GRANT_SPONGE ()\n"
"{\n"
"declare state, msg varchar;\n"
@@ -20769,14 +19433,14 @@ static const char *proc469 =
"exec (cmd, state, msg);\n"
"}\n"
"}\n"
-"--src rdf_sponge.sql:1659\n";
+"--src rdf_sponge.sql:1599\n";
static const char *other46 =
" DB.DBA.RDF_GRANT_SPONGE ()\n";
/* rdf_schema_objects.sql */
-static const char *proc470 =
+static const char *proc440 =
"#line 31 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_tbl_opts (in tbls any, in cols any)\n"
"{\n"
@@ -20815,7 +19479,7 @@ static const char *proc470 =
"}\n"
"--src rdf_schema_objects.sql:29\n";
-static const char *proc471 =
+static const char *proc441 =
"#line 68 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_tbl_pk_cols (inout tbls any, out pkcols any)\n"
"{\n"
@@ -20880,7 +19544,7 @@ static const char *proc471 =
"}\n"
"--src rdf_schema_objects.sql:66\n";
-static const char *proc472 =
+static const char *proc442 =
"#line 131 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_ns_get (in cols any, in f int)\n"
"{\n"
@@ -20905,7 +19569,7 @@ static const char *proc472 =
"}\n"
"--src rdf_schema_objects.sql:129\n";
-static const char *proc473 =
+static const char *proc443 =
"#line 154 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_ns_get_1 (in cols any, inout dict any)\n"
"{\n"
@@ -20930,14 +19594,16 @@ static const char *proc473 =
"}\n"
"--src rdf_schema_objects.sql:152\n";
-static const char *proc474 =
+static const char *proc444 =
"#line 177 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
-"RDF_VIEW_DROP_STMT_BY_GRAPH (in gr varchar)\n"
+"RDF_VIEW_DROP_STMT (in qualifier varchar)\n"
"{\n"
"declare drop_map any;\n"
+"declare gr varchar;\n"
"\n"
"drop_map := \'\';\n"
+"gr := sprintf (\'http://%s/%s#\', virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\'), qualifier);\n"
"for select \"s\" from (sparql define input:storage \"\"\n"
"select ?s from virtrdf:\n"
"{\n"
@@ -20950,22 +19616,8 @@ static const char *proc474 =
"}\n"
"--src rdf_schema_objects.sql:175\n";
-static const char *proc475 =
-"#line 195 \"[executable]/rdf_schema_objects.sql\"\n"
-"create procedure\n"
-"RDF_VIEW_DROP_STMT (in qualifier varchar)\n"
-"{\n"
-"declare drop_map any;\n"
-"declare gr varchar;\n"
-"\n"
-"drop_map := \'\';\n"
-"gr := sprintf (\'http://%s/%s#\', virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\'), qualifier);\n"
-"return RDF_VIEW_DROP_STMT_BY_GRAPH (gr);\n"
-"}\n"
-"--src rdf_schema_objects.sql:193\n";
-
-static const char *proc476 =
-"#line 207 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc445 =
+"#line 197 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"RDF_VIEW_FROM_TBL (in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any := null)\n"
"{\n"
@@ -21059,19 +19711,19 @@ static const char *proc476 =
"\n"
"return create_class_stmt || \'\\n\\n\' || create_count_count || create_view_stmt;\n"
"}\n"
-"--src rdf_schema_objects.sql:205\n";
+"--src rdf_schema_objects.sql:195\n";
-static const char *proc477 =
-"#line 302 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc446 =
+"#line 292 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_sp (in i int)\n"
"{\n"
"return repeat (\' \', i);\n"
"}\n"
-"--src rdf_schema_objects.sql:300\n";
+"--src rdf_schema_objects.sql:290\n";
-static const char *proc478 =
-"#line 309 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc447 =
+"#line 299 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_sql_tb (in tb varchar)\n"
"{\n"
"declare q, o, n varchar;\n"
@@ -21080,10 +19732,10 @@ static const char *proc478 =
"n := name_part (tb, 2);\n"
"return sprintf (\'\"%I\".\"%I\".\"%I\"\', q, o, n);\n"
"}\n"
-"--src rdf_schema_objects.sql:307\n";
+"--src rdf_schema_objects.sql:297\n";
-static const char *proc479 =
-"#line 319 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc448 =
+"#line 309 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_tb (in tb varchar)\n"
"{\n"
"declare r varchar;\n"
@@ -21091,18 +19743,18 @@ static const char *proc479 =
"r := lower (r);\n"
"return r;\n"
"}\n"
-"--src rdf_schema_objects.sql:317\n";
+"--src rdf_schema_objects.sql:307\n";
-static const char *proc480 =
-"#line 328 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc449 =
+"#line 318 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_sql_col (in col varchar)\n"
"{\n"
"return sprintf (\'\"%I\"\', col);\n"
"}\n"
-"--src rdf_schema_objects.sql:326\n";
+"--src rdf_schema_objects.sql:316\n";
-static const char *proc481 =
-"#line 334 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc450 =
+"#line 324 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_col (in col varchar)\n"
"{\n"
"declare r varchar;\n"
@@ -21110,19 +19762,19 @@ static const char *proc481 =
"r := lower (r);\n"
"return r;\n"
"}\n"
-"--src rdf_schema_objects.sql:332\n";
+"--src rdf_schema_objects.sql:322\n";
-static const char *proc482 =
-"#line 343 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc451 =
+"#line 333 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_cls_name (in nam varchar)\n"
"{\n"
"\n"
"return SYS_ALFANUM_NAME (nam);\n"
"}\n"
-"--src rdf_schema_objects.sql:341\n";
+"--src rdf_schema_objects.sql:331\n";
-static const char *proc483 =
-"#line 350 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc452 =
+"#line 340 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_get_ns (in uri varchar, out uriSearch varchar)\n"
"{\n"
"declare delim integer;\n"
@@ -21164,10 +19816,10 @@ static const char *proc483 =
"}\n"
"return nsPrefix;\n"
"}\n"
-"--src rdf_schema_objects.sql:348\n";
+"--src rdf_schema_objects.sql:338\n";
-static const char *proc484 =
-"#line 393 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc453 =
+"#line 383 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_uri_curie (in uri varchar)\n"
"{\n"
"declare delim integer;\n"
@@ -21196,10 +19848,10 @@ static const char *proc484 =
"}\n"
"return uri;\n"
"}\n"
-"--src rdf_schema_objects.sql:391\n";
+"--src rdf_schema_objects.sql:381\n";
-static const char *proc485 =
-"#line 423 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc454 =
+"#line 413 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure rdf_view_col_type (in qual varchar, in col varchar, in opts any)\n"
"{\n"
"if (not length (opts))\n"
@@ -21207,10 +19859,10 @@ static const char *proc485 =
"else\n"
"return rdf_view_uri_curie (opts);\n"
"}\n"
-"--src rdf_schema_objects.sql:421\n";
+"--src rdf_schema_objects.sql:411\n";
-static const char *proc486 =
-"#line 432 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc455 =
+"#line 422 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_create_view (in nth int, in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any, in pkcols any)\n"
"{\n"
@@ -21299,10 +19951,10 @@ static const char *proc486 =
"ret := ret || \' }\\n }\\n\';\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:430\n";
+"--src rdf_schema_objects.sql:420\n";
-static const char *proc487 =
-"#line 522 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc456 =
+"#line 512 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_create_void_view (in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any, in pkcols any)\n"
"{\n"
@@ -21359,10 +20011,10 @@ static const char *proc487 =
"ret := ret || \' }\\n }\';\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:520\n";
+"--src rdf_schema_objects.sql:510\n";
-static const char *proc488 =
-"#line 580 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc457 =
+"#line 570 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_get_pk_rel (in pref varchar, in suffix varchar, inout tbl varchar, in set_tb int, in pkcols any)\n"
"{\n"
@@ -21383,10 +20035,10 @@ static const char *proc488 =
"tbl := tbl_name_l;\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:578\n";
+"--src rdf_schema_objects.sql:568\n";
-static const char *proc489 =
-"#line 602 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc458 =
+"#line 592 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_get_bin_rel (in pref varchar, in suffix varchar, in tbl varchar, in col_name varchar, in pkcols any)\n"
"{\n"
@@ -21405,10 +20057,10 @@ static const char *proc489 =
"ret := sprintf (\'%s:%s_%s (%s) \', pref, rdf_view_tb (tbl_name_l), col_name, pk_text);\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:600\n";
+"--src rdf_schema_objects.sql:590\n";
-static const char *proc490 =
-"#line 622 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc459 =
+"#line 612 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_get_fk_pk_rel (in pref varchar, in suffix varchar, in tbl varchar, in tbls any, in pkcols any)\n"
"{\n"
@@ -21429,10 +20081,10 @@ static const char *proc490 =
"}\n"
"return string_output_string (ret);\n"
"}\n"
-"--src rdf_schema_objects.sql:620\n";
+"--src rdf_schema_objects.sql:610\n";
-static const char *proc491 =
-"#line 644 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc460 =
+"#line 634 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_get_pk_fk_rel (in pref varchar, in suffix varchar, in tbl varchar, in tbls any, in pkcols any)\n"
"{\n"
@@ -21453,10 +20105,10 @@ static const char *proc491 =
"}\n"
"return string_output_string (ret);\n"
"}\n"
-"--src rdf_schema_objects.sql:642\n";
+"--src rdf_schema_objects.sql:632\n";
-static const char *proc492 =
-"#line 666 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc461 =
+"#line 656 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_dv_to_printf_str_type (in _dv varchar, in sc int)\n"
"{\n"
@@ -21472,10 +20124,10 @@ static const char *proc492 =
"else if (__tag of datetime = _dv or __tag of timestamp = _dv) return \'%1D\';\n"
"signal (\'42000\', sprintf (\'The current implementation do no supports data type %s (%i) for IRI classes\', dv_type_title (_dv), _dv));\n"
"}\n"
-"--src rdf_schema_objects.sql:664\n";
+"--src rdf_schema_objects.sql:654\n";
-static const char *proc493 =
-"#line 683 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc462 =
+"#line 673 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_dv_to_sql_str_type (in _dv varchar)\n"
"{\n"
@@ -21491,10 +20143,10 @@ static const char *proc493 =
"else if (__tag of nvarchar = _dv) return \'nvarchar\';\n"
"signal (\'42000\', sprintf (\'The current implementation do no supports data type %s (%i) for IRI classes\', dv_type_title (_dv), _dv));\n"
"}\n"
-"--src rdf_schema_objects.sql:681\n";
+"--src rdf_schema_objects.sql:671\n";
-static const char *proc494 =
-"#line 700 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc463 =
+"#line 690 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_dv_to_xsd_str_type (in _dv varchar)\n"
"{\n"
@@ -21510,10 +20162,10 @@ static const char *proc494 =
"else if (__tag of nvarchar = _dv) return \'string\';\n"
"signal (\'42000\', sprintf (\'The current implementation do no supports data type %s (%i) for IRI classes\', dv_type_title (_dv), _dv));\n"
"}\n"
-"--src rdf_schema_objects.sql:698\n";
+"--src rdf_schema_objects.sql:688\n";
-static const char *proc495 =
-"#line 717 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc464 =
+"#line 707 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_create_class (in decl varchar, in _tbl varchar, in _host varchar, in qualifier varchar, in cols any, in pkcols any)\n"
"{\n"
@@ -21559,19 +20211,19 @@ static const char *proc495 =
"}\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:715\n";
+"--src rdf_schema_objects.sql:705\n";
-static const char *proc496 =
-"#line 764 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc465 =
+"#line 754 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_get_primary_key (in _tbl varchar)\n"
"{\n"
"return DB.DBA.REPL_PK_COLS (_tbl);\n"
"}\n"
-"--src rdf_schema_objects.sql:762\n";
+"--src rdf_schema_objects.sql:752\n";
-static const char *proc497 =
-"#line 771 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc466 =
+"#line 761 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"rdf_view_get_relations (in _tbl varchar, in _tbls varchar, in _suff varchar)\n"
"{\n"
@@ -21612,10 +20264,10 @@ static const char *proc497 =
"}\n"
"return ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:769\n";
+"--src rdf_schema_objects.sql:759\n";
-static const char *proc498 =
-"#line 813 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc467 =
+"#line 803 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"RDF_OWL_FROM_TBL (in qual varchar, in _tbls any, in cols any := null)\n"
"{\n"
@@ -21708,10 +20360,10 @@ static const char *proc498 =
"}\n"
"return string_output_string (ses);\n"
"}\n"
-"--src rdf_schema_objects.sql:811\n";
+"--src rdf_schema_objects.sql:801\n";
-static const char *proc499 =
-"#line 907 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc468 =
+"#line 897 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure RDF_VIEW_GEN_VD (in qual varchar)\n"
"{\n"
"declare ses, pref any;\n"
@@ -21857,10 +20509,10 @@ static const char *proc499 =
"ses := replace (ses, \'<qual>\', qual);\n"
"return ses;\n"
"}\n"
-"--src rdf_schema_objects.sql:905\n";
+"--src rdf_schema_objects.sql:895\n";
-static const char *proc500 =
-"#line 1054 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc469 =
+"#line 1044 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure RDF_OWL_GEN_VD (in qual varchar)\n"
"{\n"
"declare fct_installed int;\n"
@@ -21930,10 +20582,10 @@ static const char *proc500 =
"ses := replace (ses, \'<qual>\', qual);\n"
"return ses;\n"
"}\n"
-"--src rdf_schema_objects.sql:1052\n";
+"--src rdf_schema_objects.sql:1042\n";
-static const char *proc501 =
-"#line 1125 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc470 =
+"#line 1115 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
"RDF_VIEW_CHECK_SYNC_TB (in tb varchar)\n"
"{\n"
@@ -21945,50 +20597,26 @@ static const char *proc501 =
"return 0;\n"
"return 1;\n"
"}\n"
-"--src rdf_schema_objects.sql:1123\n";
+"--src rdf_schema_objects.sql:1113\n";
-static const char *proc502 =
-"#line 1138 \"[executable]/rdf_schema_objects.sql\"\n"
-"create procedure\n"
-"RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0, in pgraph varchar := null)\n"
-"{\n"
-"declare gr varchar;\n"
-"gr := sprintf (\'http://%s/%s#\', virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\'), qualifier);\n"
-"return RDF_VIEW_SYNC_TO_PHYSICAL (gr, load_data, pgraph);\n"
-"}\n"
-"--src rdf_schema_objects.sql:1136\n";
-
-static const char *proc503 =
-"#line 1147 \"[executable]/rdf_schema_objects.sql\"\n"
+static const char *proc471 =
+"#line 1128 \"[executable]/rdf_schema_objects.sql\"\n"
"create procedure\n"
-"RDF_VIEW_SYNC_TO_PHYSICAL (in vgraph varchar, in load_data int := 0, in pgraph varchar := null, in log_mode int := 1, in load_atomic int := 1)\n"
+"RDF_VIEW_DO_SYNC (in qualifier varchar, in load_data int := 0)\n"
"{\n"
"declare mask varchar;\n"
-"declare txt, tbls, err_ret, opt any;\n"
-"declare stat, msg, gr varchar;\n"
-"declare old_mode int;\n"
-"\n"
-"old_mode := log_enable (log_mode, 1);\n"
-"declare exit handler for sqlstate \'*\' {\n"
-"log_enable (old_mode, 1);\n"
-"if (load_atomic)\n"
-"__atomic (0);\n"
-"};\n"
+"declare txt, tbls, err_ret any;\n"
+"declare stat, msg varchar;\n"
"\n"
-"if (load_atomic)\n"
-"__atomic (1);\n"
"tbls := vector ();\n"
"err_ret := vector ();\n"
-"opt := vector ();\n"
-"gr := vgraph;\n"
-"if (length (pgraph))\n"
-"opt := vector (gr, pgraph);\n"
+"mask := sprintf (\'http://%s/schemas/%s/qm-%%\', virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\'), qualifier);\n"
"for select \"o\" from\n"
"(sparql define input:storage \"\" select ?o from virtrdf:\n"
"{\n"
"virtrdf:DefaultQuadStorage-UserMaps ?p ?o .\n"
"?o a virtrdf:QuadMap .\n"
-"?o virtrdf:qmGraphRange-rvrFixedValue `iri(?:gr)` .\n"
+"filter (?o like ?:mask)\n"
"}\n"
"order by asc (bif:sprintf_inverse (bif:concat (str(rdf:_), \"%d\"), str (?p), 1))) x do\n"
"{\n"
@@ -22021,7 +20649,7 @@ static const char *proc503 =
"{\n"
"for (declare ctr int, ctr := 1; ctr <= 4; ctr := ctr + 1)\n"
"{\n"
-"txt := sparql_rdb2rdf_codegen (tb, ctr, opt);\n"
+"txt := sparql_rdb2rdf_codegen (tb, ctr);\n"
"stat := \'00000\';\n"
"if (isvector (txt))\n"
"{\n"
@@ -22051,133 +20679,9 @@ static const char *proc503 =
"if (stat <> \'00000\') err_ret := vector_concat (err_ret, vector (sprintf (\'%s: %s\', stat, msg)));\n"
"}\n"
"}\n"
-"log_enable (old_mode, 1);\n"
-"if (load_atomic)\n"
-"{\n"
-"__atomic (0);\n"
-"exec (\'checkpoint\');\n"
-"}\n"
"return err_ret;\n"
"}\n"
-"--src rdf_schema_objects.sql:1145\n";
-
-static const char *proc504 =
-"#line 1251 \"[executable]/rdf_schema_objects.sql\"\n"
-"create procedure\n"
-"R2RML_FROM_TBL (in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any := null)\n"
-"{\n"
-"declare create_view_stmt, ns, sns any;\n"
-"declare total_select, total_tb, total, qual, pkcols any;\n"
-"declare vname, mask, graph, uriqa_str varchar;\n"
-"\n"
-"rdf_view_tbl_pk_cols (_tbls, pkcols);\n"
-"cols := rdf_view_tbl_opts (_tbls, cols);\n"
-"sns := ns := sprintf (\'@prefix rr: <http://www.w3.org/ns/r2rml#> .\\n at prefix %s: <http://%s/schemas/%s/> .\\n\', qualifier, virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\'), qualifier);\n"
-"\n"
-"if (gen_stat)\n"
-"{\n"
-"ns := ns || sprintf (\'@prefix %s-stat: <http://%s/%s/stat#> .\\n\', lcase (qualifier), virtuoso_ini_item_value (\'URIQA\',\'DefaultHost\'),\n"
-"qualifier);\n"
-"ns := ns || \'@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\\n\';\n"
-"ns := ns || \'@prefix void: <http://rdfs.org/ns/void#> .\\n\';\n"
-"ns := ns || \'@prefix scovo: <http://purl.org/NET/scovo#> .\\n\';\n"
-"}\n"
-"ns := ns || \'@prefix aowl: <http://bblfish.net/work/atom-owl/2006-06-06/> .\\n\';\n"
-"ns := ns || rdf_view_ns_get (cols, 1);\n"
-"ns := ns || \'\\n\';\n"
-"\n"
-"uriqa_str := registry_get (\'URIQADefaultHost\');\n"
-"graph := \'http://\' || uriqa_str || \'/\' || qualifier || \'#\';\n"
-"create_view_stmt := ns;\n"
-"for (declare inx int, inx := 0; inx < length (_tbls) ; inx := inx + 1)\n"
-"create_view_stmt := create_view_stmt || \'\\n\' || r2rml_create_dataset (inx, qualifier, _tbls, gen_stat, cols, pkcols, graph) || \'\';\n"
-"\n"
-"return create_view_stmt;\n"
-"}\n"
-"--src rdf_schema_objects.sql:1249\n";
-
-static const char *proc505 =
-"#line 1284 \"[executable]/rdf_schema_objects.sql\"\n"
-"create procedure\n"
-"r2rml_create_dataset (in nth int, in qualifier varchar, in _tbls any, in gen_stat int := 0, in cols any, in pkcols any, in graph varchar := null)\n"
-"{\n"
-"declare ret, qual, qual_l, tbl_name, tbl_name_l, pks, pk_text, uriqa_str, graph_def any;\n"
-"declare suffix, tname, tbl, own, pref_l any;\n"
-"declare cols_arr, inx, col_name, owner, owner_l any;\n"
-"\n"
-"ret := \'\';\n"
-"suffix := \'_s\';\n"
-"uriqa_str := registry_get (\'URIQADefaultHost\');\n"
-"qual := name_part (_tbls[nth], 0);\n"
-"own := name_part (_tbls[nth], 1);\n"
-"qual_l := lcase (qual);\n"
-"pref_l := lcase (qualifier);\n"
-"tbl := _tbls[nth];\n"
-"cols_arr := get_keyword (tbl, cols);\n"
-"tbl_name := name_part (tbl, 2);\n"
-"owner := name_part (tbl, 1);\n"
-"tbl_name_l := rdf_view_tb (tbl_name);\n"
-"owner_l := rdf_view_tb (owner);\n"
-"tname := tbl_name_l || suffix;\n"
-"pks := get_keyword (tbl, pkcols); \n"
-"\n"
-"pk_text := \'\';\n"
-"for (declare i any, i := 0; i < length (pks) ; i := i + 1)\n"
-"pk_text := pk_text || sprintf (\'/{%s}\', pks[i][0]);\n"
-"\n"
-"if (graph is not null) \n"
-"graph_def := sprintf (\'rr:graph <%s> \', graph); \n"
-"else \n"
-"graph_def := \'\'; \n"
-"ret := ret || sprintf (\'<#TriplesMap%s> a rr:TriplesMap; rr:logicalTable [ rr:tableSchema \"%s\" ; rr:tableOwner \"%s\" ; rr:tableName \"%s\" ]; \\n\', tbl_name, qual, own, tbl_name);\n"
-"ret := ret || sprintf (\'rr:subjectMap [ rr:termtype \"IRI\" ; rr:template \"http://%s/%s/%s%s\"; rr:class %s:%s; %s];\\n\', uriqa_str, qual, tbl_name_l, pk_text, qualifier, rdf_view_cls_name (tbl_name), graph_def);\n"
-"\n"
-"inx := 0;\n"
-"for select \"COLUMN\", COL_DTP from TABLE_COLS where \"TABLE\" = tbl order by COL_ID do\n"
-"{\n"
-"col_name := \"COLUMN\";\n"
-"if (not exists (select 1 from SYS_FOREIGN_KEYS where FK_TABLE = tbl and FKCOLUMN_NAME = col_name))\n"
-"ret := ret || sprintf (\'rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s:%s ] ; rr:objectMap [ rr:column \"%s\" ]; ] ;\\n\', \n"
-"qualifier, lower (col_name), col_name);\n"
-"inx := inx + 1;\n"
-"}\n"
-"for select distinct PK_TABLE as pkt from SYS_FOREIGN_KEYS where FK_TABLE = tbl and PK_TABLE <> tbl do\n"
-"{\n"
-"pk_text := \'\';\n"
-"for select FKCOLUMN_NAME from SYS_FOREIGN_KEYS where FK_TABLE = tbl and PK_TABLE = pkt order by KEY_SEQ do\n"
-"{\n"
-"pk_text := pk_text || sprintf (\'/{%s}\', FKCOLUMN_NAME);\n"
-"}\n"
-"ret := ret || sprintf (\'rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s:%s_has_%s ] ; rr:objectMap [ rr:termtype \"IRI\" ; rr:template \"http://%s/%s/%s%s\" ]; ] ;\\n\',\n"
-"qualifier, tbl_name_l, lower (name_part (pkt, 3)), uriqa_str, qual, lower (name_part (pkt, 3)), pk_text);\n"
-"}\n"
-"\n"
-"for select distinct FK_TABLE as fkt from SYS_FOREIGN_KEYS where PK_TABLE = tbl and position (FK_TABLE, _tbls) do\n"
-"{\n"
-"declare jc varchar;\n"
-"jc := \'\';\n"
-"pk_text := \'\';\n"
-"for select FKCOLUMN_NAME, PKCOLUMN_NAME from SYS_FOREIGN_KEYS where FK_TABLE = fkt and PK_TABLE = tbl order by KEY_SEQ do\n"
-"{\n"
-"jc := jc || sprintf (\' rr:joinCondition [ rr:child \"%s\" ; rr:parent \"%s\" ] ;\', FKCOLUMN_NAME, PKCOLUMN_NAME); \n"
-"pk_text := pk_text || sprintf (\'/{%s}\', FKCOLUMN_NAME);\n"
-"}\n"
-"if (tbl <> fkt)\n"
-"{ \n"
-"ret := ret || sprintf (\'rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s:%s_of_%s ] ; rr:objectMap [ rr:parentTriplesMap <#TriplesMap%s>; %s ]; ] ;\\n\',\n"
-"qualifier, tbl_name_l, lower (name_part (fkt, 3)), name_part (fkt, 3), jc);\n"
-"}\n"
-"else\n"
-"{\n"
-"ret := ret || sprintf (\'rr:predicateObjectMap [ rr:predicateMap [ rr:constant %s:%s_has_%s ] ; rr:objectMap [ rr:termtype \"IRI\" ; rr:template \"http://%s/%s/%s%s\" ]; ] ;\\n\',\n"
-"qualifier, tbl_name_l, lower (name_part (fkt, 3)), uriqa_str, qual, lower (name_part (fkt, 3)), pk_text);\n"
-"}\n"
-"}\n"
-"\n"
-"ret := rtrim (ret, \';\\n\') || \'.\\n\'; \n"
-"return ret;\n"
-"}\n"
-"--src rdf_schema_objects.sql:1282\n";
+"--src rdf_schema_objects.sql:1126\n";
/* rdf_void.sql */
@@ -22198,7 +20702,7 @@ static const char *tbl23 =
")\n"
"alter index RDF_VOID_GRAPH_MEMBER on DB.DBA.RDF_VOID_GRAPH_MEMBER partition cluster replicated\n";
-static const char *proc506 =
+static const char *proc472 =
"#line 43 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_INIT ()\n"
"{\n"
@@ -22211,7 +20715,7 @@ static const char *proc506 =
static const char *other47 =
"RDF_VOID_INIT ()\n";
-static const char *proc507 =
+static const char *proc473 =
"#line 55 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_SPLIT_IRI (in rel varchar, out pref varchar, out name varchar)\n"
"{\n"
@@ -22226,7 +20730,7 @@ static const char *proc507 =
"}\n"
"--src rdf_void.sql:53\n";
-static const char *proc508 =
+static const char *proc474 =
"#line 68 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_STORE (in graph varchar, in to_graph_name varchar := null, in src varchar := null)\n"
"{\n"
@@ -22249,7 +20753,7 @@ static const char *proc508 =
"}\n"
"--src rdf_void.sql:66\n";
-static const char *proc509 =
+static const char *proc475 =
"#line 89 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_ALL_GEN (in target_graph varchar, in details int := 0)\n"
"{\n"
@@ -22314,7 +20818,7 @@ static const char *proc509 =
"}\n"
"--src rdf_void.sql:87\n";
-static const char *proc510 =
+static const char *proc476 =
"#line 152 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_NS (inout ses any)\n"
"{\n"
@@ -22327,7 +20831,7 @@ static const char *proc510 =
"}\n"
"--src rdf_void.sql:150\n";
-static const char *proc511 =
+static const char *proc477 =
"#line 163 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_GEN (in graph varchar, in gr_name varchar := null)\n"
"{\n"
@@ -22342,7 +20846,7 @@ static const char *proc511 =
"}\n"
"--src rdf_void.sql:161\n";
-static const char *proc512 =
+static const char *proc478 =
"#line 176 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_DIST_O_SRV (in graph any)\n"
"{\n"
@@ -22352,7 +20856,7 @@ static const char *proc512 =
"}\n"
"--src rdf_void.sql:174\n";
-static const char *proc513 =
+static const char *proc479 =
"#line 184 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_DIST_O (in graph varchar)\n"
"{\n"
@@ -22375,7 +20879,7 @@ static const char *proc513 =
"}\n"
"--src rdf_void.sql:182\n";
-static const char *proc514 =
+static const char *proc480 =
"#line 205 \"[executable]/rdf_void.sql\"\n"
"create procedure RDF_VOID_GEN_1 (in graph varchar, in gr_name varchar := null,\n"
"in ns_pref varchar := \'this\', in this_ns varchar := \'\',\n"
@@ -22534,7 +21038,7 @@ static const char *tbl25 =
static const char *other48 =
"insert soft DB.DBA.LDLOCK values (0)\n";
-static const char *proc515 =
+static const char *proc481 =
"#line 47 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"ld_dir (in path varchar, in mask varchar, in graph varchar)\n"
@@ -22573,7 +21077,7 @@ static const char *proc515 =
"}\n"
"--src rdflddir2.sql:45\n";
-static const char *proc516 =
+static const char *proc482 =
"#line 85 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"rdf_read_dir (in path varchar, in mask varchar, in graph varchar)\n"
@@ -22582,7 +21086,7 @@ static const char *proc516 =
"}\n"
"--src rdflddir2.sql:83\n";
-static const char *proc517 =
+static const char *proc483 =
"#line 93 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"ld_dir_all (in path varchar, in mask varchar, in graph varchar)\n"
@@ -22607,7 +21111,7 @@ static const char *proc517 =
"}\n"
"--src rdflddir2.sql:91\n";
-static const char *proc518 =
+static const char *proc484 =
"#line 116 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"ld_add (in _fname varchar, in _graph varchar)\n"
@@ -22624,7 +21128,7 @@ static const char *proc518 =
"}\n"
"--src rdflddir2.sql:114\n";
-static const char *proc519 =
+static const char *proc485 =
"#line 131 \"[executable]/rdflddir2.sql\"\n"
"create procedure ld_ttlp_flags (in fname varchar, in opt varchar)\n"
"{\n"
@@ -22640,7 +21144,7 @@ static const char *proc519 =
"}\n"
"--src rdflddir2.sql:129\n";
-static const char *proc520 =
+static const char *proc486 =
"#line 145 \"[executable]/rdflddir2.sql\"\n"
"create procedure ld_is_rdfxml (in f any)\n"
"{\n"
@@ -22650,7 +21154,7 @@ static const char *proc520 =
"}\n"
"--src rdflddir2.sql:143\n";
-static const char *proc521 =
+static const char *proc487 =
"#line 153 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"ld_file (in f varchar, in graph varchar)\n"
@@ -22699,7 +21203,7 @@ static const char *proc521 =
"}\n"
"--src rdflddir2.sql:151\n";
-static const char *proc522 =
+static const char *proc488 =
"#line 200 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"rdf_load_dir (in path varchar,\n"
@@ -22716,7 +21220,7 @@ static const char *proc522 =
"}\n"
"--src rdflddir2.sql:198\n";
-static const char *proc523 =
+static const char *proc489 =
"#line 216 \"[executable]/rdflddir2.sql\"\n"
"create procedure ld_array ()\n"
"{\n"
@@ -22764,7 +21268,7 @@ static const char *proc523 =
"}\n"
"--src rdflddir2.sql:214\n";
-static const char *proc524 =
+static const char *proc490 =
"#line 262 \"[executable]/rdflddir2.sql\"\n"
"create procedure\n"
"rdf_loader_run (in max_files integer := null, in log_enable int := 2)\n"
@@ -22853,7 +21357,7 @@ static const char *proc524 =
"}\n"
"--src rdflddir2.sql:260\n";
-static const char *proc525 =
+static const char *proc491 =
"#line 349 \"[executable]/rdflddir2.sql\"\n"
"create procedure rdf_load_stop (in force int := 0)\n"
"{\n"
@@ -22864,7 +21368,7 @@ static const char *proc525 =
"}\n"
"--src rdflddir2.sql:347\n";
-static const char *proc526 =
+static const char *proc492 =
"#line 359 \"[executable]/rdflddir2.sql\"\n"
"create procedure RDF_LOADER_RUN_1 (in x int, in y int)\n"
"{\n"
@@ -22872,7 +21376,7 @@ static const char *proc526 =
"}\n"
"--src rdflddir2.sql:357\n";
-static const char *proc527 =
+static const char *proc493 =
"#line 365 \"[executable]/rdflddir2.sql\"\n"
"create procedure rdf_ld_srv (in log_enable int := 2)\n"
"{\n"
@@ -22883,7 +21387,7 @@ static const char *proc527 =
"}\n"
"--src rdflddir2.sql:363\n";
-static const char *proc528 =
+static const char *proc494 =
"#line 375 \"[executable]/rdflddir2.sql\"\n"
"create procedure load_grdf (in f varchar)\n"
"{\n"
@@ -22962,8 +21466,8 @@ sqls_define_sparql (void)
ddl_ensure_table ("DB.DBA.RDF_GEO", tbl11);
ddl_ensure_table ("DB.DBA.RDF_LABEL", tbl12);
ddl_ensure_table ("DB.DBA.RDF_QUAD_DELETE_QUEUE", tbl13);
- ddl_ensure_table ("DB.DBA.SYS_IDONLY_EMPTY", tbl14);
- ddl_ensure_table ("DB.DBA.SYS_IDONLY_ONE", tbl15);
+ ddl_ensure_table ("DB.DBA.SYS_FAKE_0", tbl14);
+ ddl_ensure_table ("DB.DBA.SYS_FAKE_1", tbl15);
ddl_ensure_table ("do this always", other3);
ddl_ensure_table ("do this always", other4);
ddl_ensure_table ("do this always", other5);
@@ -23033,530 +21537,496 @@ sqls_define_sparql (void)
DEFINE_PROC ("DB.DBA.RDF_BOOL_OF_LONG", proc57);
DEFINE_PROC ("DB.DBA.RDF_DATATYPE_OF_LONG", proc58);
DEFINE_PROC ("DB.DBA.RDF_DATATYPE_IRI_OF_LONG", proc59);
- DEFINE_PROC ("DB.DBA.RDF_STRSQLVAL_OF_LONG", proc60);
- DEFINE_PROC ("DB.DBA.RDF_WIDESTRSQLVAL_OF_LONG", proc61);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DATATYPE_OF_SQLVAL", proc62);
- DEFINE_PROC ("DB.DBA.RDF_LONG_OF_SQLVAL", proc63);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_STRSQLVAL_OF_SQLVAL", proc64);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_LANGUAGE_OF_SQLVAL", proc65);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_IS_BLANK_REF", proc66);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_IS_URI_REF", proc67);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_IS_REF", proc68);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_IS_LITERAL", proc69);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#boolean", proc70);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#date", proc71);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#dateTime", proc72);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#double", proc73);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#float", proc74);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#integer", proc75);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#int", proc76);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#time", proc77);
- DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#string", proc78);
- DEFINE_PUBLIC_PROC ("DB.DBA.__and", proc79);
- DEFINE_PUBLIC_PROC ("DB.DBA.__or", proc80);
- DEFINE_PUBLIC_PROC ("DB.DBA.__not", proc81);
- DEFINE_PROC ("DB.DBA.rdf_strdt_impl", proc82);
- DEFINE_PROC ("DB.DBA.rdf_strlang_impl", proc83);
- DEFINE_PUBLIC_PROC ("DB.DBA.rdf_replace_impl", proc84);
- DEFINE_PUBLIC_PROC ("DB.DBA.regexp_xfn_replace", proc85);
- DEFINE_PUBLIC_PROC ("DB.DBA.rdf_timezone_impl", proc86);
- DEFINE_PUBLIC_PROC ("DB.DBA.rdf_tz_impl", proc87);
- DEFINE_PROC ("DB.DBA.RDF_QUAD_URI", proc88);
- DEFINE_PROC ("DB.DBA.RDF_QUAD_URI_L", proc89);
- DEFINE_PROC ("DB.DBA.RDF_QUAD_URI_L_TYPED", proc90);
- DEFINE_PROC ("DB.DBA.RDF_QUAD_L_RDB2RDF", proc91);
- DEFINE_PROC ("DB.DBA.TTLP_EV_NEW_GRAPH", proc92);
- DEFINE_PROC ("DB.DBA.TTLP_EV_NEW_BLANK", proc93);
- DEFINE_PROC ("DB.DBA.TTLP_EV_GET_IID", proc94);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE", proc95);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L", proc96);
- DEFINE_PROC ("DB.DBA.TTLP_EV_COMMIT", proc97);
- DEFINE_PROC ("DB.DBA.TTLP_EV_REPORT_DEFAULT", proc98);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_XLAT", proc99);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_XLAT", proc100);
- DEFINE_PUBLIC_PROC ("DB.DBA.TTLP_XLAT_CONCAT", proc101);
- DEFINE_PROC ("DB.DBA.TTLP", proc102);
- DEFINE_PROC ("DB.DBA.TTLP_WITH_IRI_TRANSLATION", proc103);
- DEFINE_PROC ("DB.DBA.TTLP_VALIDATE", proc104);
- DEFINE_PROC ("DB.DBA.TTLP_VALIDATE_LOCAL_FILE", proc105);
- DEFINE_PROC ("DB.DBA.RDF_VALIDATE_RDFXML", proc106);
- DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH", proc107);
- DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK", proc108);
- DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_GET_IID", proc109);
- DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE", proc110);
- DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L", proc111);
- DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_XLAT", proc112);
- DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L_XLAT", proc113);
- DEFINE_PROC ("DB.DBA.RDF_TTL2HASH", proc114);
- DEFINE_PROC ("DB.DBA.RDF_TTL_LOAD_DICT", proc115);
- DEFINE_PROC ("DB.DBA.RDF_TTL2SQLHASH_EXEC_GET_IID", proc116);
- DEFINE_PROC ("DB.DBA.RDF_TTL2SQLHASH_EXEC_TRIPLE", proc117);
- DEFINE_PROC ("DB.DBA.RDF_TTL2SQLHASH_EXEC_TRIPLE_L", proc118);
- DEFINE_PROC ("DB.DBA.RDF_TTL2SQLHASH", proc119);
- DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFXML_IMPL", proc120);
- DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFXML", proc121);
- DEFINE_PROC ("DB.DBA.RDF_RDFXML_TO_DICT", proc122);
- DEFINE_PROC ("DB.DBA.RDF_RDFXML_LOAD_DICT", proc123);
- DEFINE_PROC ("DB.DBA.RDFA_LOAD_DICT_XLAT", proc124);
- DEFINE_PROC ("DB.DBA.RDF_RDFA11_FETCH_PROFILES", proc125);
- DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFA", proc126);
- DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION", proc127);
- DEFINE_PROC ("DB.DBA.RDF_RDFA_TO_DICT", proc128);
- DEFINE_PROC ("DB.DBA.RDF_LOAD_XHTML_MICRODATA", proc129);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_XML_IRI_TO_TTL", proc130);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_XML_OBJ_TO_TTL", proc131);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_NEW_BLANK", proc132);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_TRIPLE", proc133);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_TRIPLE_L", proc134);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL", proc135);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_FILE_TO_TTL_FILE", proc136);
- DEFINE_PROC ("DB.DBA.RDF_LONG_TO_TTL", proc137);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_BATCH_COMPLETE", proc138);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_VERBOSE_TTL", proc139);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TTL", proc140);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TRIG", proc141);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_NT", proc142);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_TO_TTL", proc143);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT", proc144);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TALIS_JSON", proc145);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON_LD", proc146);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON", proc147);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_CSV", proc148);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML", proc149);
- DEFINE_PROC ("DB.DBA.RDF_ENDPOINT_DESCRIBE_LINK_FMT", proc150);
- DEFINE_PROC ("DB.DBA.RDF_PIVOT_DESCRIBE_LINK", proc151);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_HTML_UL", proc152);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_HTML_TR", proc153);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA", proc154);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA", proc155);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ATOM_XML", proc156);
- DEFINE_PROC ("DB.DBA.ODATA_EDM_TYPE", proc157);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ODATA_JSON", proc158);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_ODATA_JSON", proc159);
- DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT", proc160);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_INIT", proc161);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_ACC", proc162);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_FIN", proc163);
+ DEFINE_PROC ("DB.DBA.RDF_LANGUAGE_OF_LONG", proc60);
+ DEFINE_PROC ("DB.DBA.RDF_STRSQLVAL_OF_LONG", proc61);
+ DEFINE_PROC ("DB.DBA.RDF_WIDESTRSQLVAL_OF_LONG", proc62);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DATATYPE_OF_SQLVAL", proc63);
+ DEFINE_PROC ("DB.DBA.RDF_LONG_OF_SQLVAL", proc64);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_STRSQLVAL_OF_SQLVAL", proc65);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_LANGUAGE_OF_SQLVAL", proc66);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_IS_BLANK_REF", proc67);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_IS_URI_REF", proc68);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_IS_REF", proc69);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_IS_LITERAL", proc70);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#boolean", proc71);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#date", proc72);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#dateTime", proc73);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#double", proc74);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#float", proc75);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#integer", proc76);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#int", proc77);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#time", proc78);
+ DEFINE_PUBLIC_PROC ("DB.DBA.http://www.w3.org/2001/XMLSchema#string", proc79);
+ DEFINE_PUBLIC_PROC ("DB.DBA.__and", proc80);
+ DEFINE_PUBLIC_PROC ("DB.DBA.__or", proc81);
+ DEFINE_PUBLIC_PROC ("DB.DBA.__not", proc82);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_URI", proc83);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_URI_L", proc84);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_URI_L_TYPED", proc85);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_L_RDB2RDF", proc86);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_NEW_GRAPH", proc87);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_NEW_BLANK", proc88);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_GET_IID", proc89);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE", proc90);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L", proc91);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_COMMIT", proc92);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_REPORT_DEFAULT", proc93);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_XLAT", proc94);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_XLAT", proc95);
+ DEFINE_PUBLIC_PROC ("DB.DBA.TTLP_XLAT_CONCAT", proc96);
+ DEFINE_PROC ("DB.DBA.TTLP", proc97);
+ DEFINE_PROC ("DB.DBA.TTLP_WITH_IRI_TRANSLATION", proc98);
+ DEFINE_PROC ("DB.DBA.TTLP_VALIDATE", proc99);
+ DEFINE_PROC ("DB.DBA.TTLP_VALIDATE_LOCAL_FILE", proc100);
+ DEFINE_PROC ("DB.DBA.RDF_VALIDATE_RDFXML", proc101);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_NEW_GRAPH", proc102);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_NEW_BLANK", proc103);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_GET_IID", proc104);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE", proc105);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2HASH_EXEC_TRIPLE_L", proc106);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2HASH", proc107);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2SQLHASH_EXEC_GET_IID", proc108);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2SQLHASH_EXEC_TRIPLE", proc109);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2SQLHASH_EXEC_TRIPLE_L", proc110);
+ DEFINE_PROC ("DB.DBA.RDF_TTL2SQLHASH", proc111);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFXML", proc112);
+ DEFINE_PROC ("DB.DBA.RDF_RDFXML_TO_DICT", proc113);
+ DEFINE_PROC ("DB.DBA.RDF_RDFA11_FETCH_PROFILES", proc114);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFA", proc115);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFA_WITH_IRI_TRANSLATION", proc116);
+ DEFINE_PROC ("DB.DBA.RDF_RDFA_TO_DICT", proc117);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_XML_IRI_TO_TTL", proc118);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_XML_OBJ_TO_TTL", proc119);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_NEW_BLANK", proc120);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_TRIPLE", proc121);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL_EV_TRIPLE_L", proc122);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_TO_TTL", proc123);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_CONVERT_RDFXML_FILE_TO_TTL_FILE", proc124);
+ DEFINE_PROC ("DB.DBA.RDF_LONG_TO_TTL", proc125);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_VERBOSE_TTL", proc126);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TTL", proc127);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_NT", proc128);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_TO_TTL", proc129);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_RDF_XML_TEXT", proc130);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_TALIS_JSON", proc131);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON_LD", proc132);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON", proc133);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_CSV", proc134);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_RDFA_XHTML", proc135);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_HTML_MICRODATA", proc136);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_JSON_MICRODATA", proc137);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ATOM_XML", proc138);
+ DEFINE_PROC ("DB.DBA.ODATA_EDM_TYPE", proc139);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ODATA_JSON", proc140);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_ODATA_JSON", proc141);
+ DEFINE_PROC ("DB.DBA.RDF_TRIPLES_TO_ATOM_XML_TEXT", proc142);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_INIT", proc143);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_ACC", proc144);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_FIN", proc145);
ddl_ensure_table ("do this always", other16);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_INIT", proc164);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_ACC", proc165);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_FIN", proc166);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_INIT", proc146);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_ACC", proc147);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_FIN", proc148);
ddl_ensure_table ("do this always", other17);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_INIT", proc167);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_ACC", proc168);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_FIN", proc169);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_INIT", proc149);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_ACC", proc150);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_FIN", proc151);
ddl_ensure_table ("do this always", other18);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_INIT", proc170);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_ACC", proc171);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_FIN", proc172);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_INIT", proc152);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_ACC", proc153);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_FIN", proc154);
ddl_ensure_table ("do this always", other19);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT", proc173);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE", proc174);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC", proc175);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN", proc176);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_INIT", proc155);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_CSV_WRITE_VALUE", proc156);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC", proc157);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN", proc158);
ddl_ensure_table ("do this always", other20);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT", proc177);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_ACC", proc178);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_FIN", proc179);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_INIT", proc159);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_ACC", proc160);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_RESULT_SET_AS_CXML_FIN", proc161);
ddl_ensure_table ("do this always", other21);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TTL", proc180);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TRIG", proc181);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_NT", proc182);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDF_XML", proc183);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TALIS_JSON", proc184);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_LD", proc185);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_UL", proc186);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_TR", proc187);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_MICRODATA", proc188);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_MICRODATA", proc189);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CSV", proc190);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDFA_XHTML", proc191);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML", proc192);
- DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML_QRCODE", proc193);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_INIT", proc194);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_ACC", proc195);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_FIN", proc196);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TTL", proc162);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_NT", proc163);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDF_XML", proc164);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TALIS_JSON", proc165);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_LD", proc166);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_MICRODATA", proc167);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_MICRODATA", proc168);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CSV", proc169);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDFA_XHTML", proc170);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML", proc171);
+ DEFINE_PROC ("DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML_QRCODE", proc172);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_INIT", proc173);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_ACC", proc174);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_XML_FIN", proc175);
ddl_ensure_table ("do this always", other22);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_INIT", proc197);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_ACC", proc198);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_FIN", proc199);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_INIT", proc176);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_ACC", proc177);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_RDF_XML_FIN", proc178);
ddl_ensure_table ("do this always", other23);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_INIT", proc200);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC", proc201);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_FIN", proc202);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_INIT", proc179);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_ACC", proc180);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_TTL_FIN", proc181);
ddl_ensure_table ("do this always", other24);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_NT_FIN", proc203);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_NT_FIN", proc182);
ddl_ensure_table ("do this always", other25);
ddl_ensure_table ("do this always", other26);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV_FIN", proc204);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FORMAT_BOOL_RESULT_AS_CSV_FIN", proc183);
ddl_ensure_table ("do this always", other27);
- DEFINE_PROC ("DB.DBA.RDF_INSERT_TRIPLES_CL", proc205);
- DEFINE_PROC ("DB.DBA.RDF_INSERT_TRIPLES", proc206);
- DEFINE_PROC ("DB.DBA.RDF_DELETE_TRIPLES", proc207);
- DEFINE_PROC ("DB.DBA.RDF_DELETE_TRIPLES_AGG", proc208);
- DEFINE_PROC ("DB.DBA.RDF_MODIFY_TRIPLES", proc209);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_INIT", proc210);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL", proc211);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_DELETE_CTOR_ACC", proc212);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INSERT_CTOR_ACC", proc213);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_MODIFY_CTOR_ACC", proc214);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_FIN", proc215);
+ DEFINE_PROC ("DB.DBA.RDF_INSERT_TRIPLES_CL", proc184);
+ DEFINE_PROC ("DB.DBA.RDF_INSERT_TRIPLES", proc185);
+ DEFINE_PROC ("DB.DBA.RDF_DELETE_TRIPLES", proc186);
+ DEFINE_PROC ("DB.DBA.RDF_DELETE_TRIPLES_AGG", proc187);
+ DEFINE_PROC ("DB.DBA.RDF_MODIFY_TRIPLES", proc188);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_INIT", proc189);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_CTOR_IMPL", proc190);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_DELETE_CTOR_ACC", proc191);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INSERT_CTOR_ACC", proc192);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_MODIFY_CTOR_ACC", proc193);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_INS_OR_DEL_OR_MODIFY_CTOR_FIN", proc194);
ddl_ensure_table ("do this always", other28);
ddl_ensure_table ("do this always", other29);
ddl_ensure_table ("do this always", other30);
- DEFINE_PROC ("DB.DBA.SPARQL_INSERT_DICT_CONTENT", proc216);
- DEFINE_PROC ("DB.DBA.SPARQL_DELETE_DICT_CONTENT", proc217);
- DEFINE_PROC ("DB.DBA.SPARQL_MODIFY_BY_DICT_CONTENTS", proc218);
- DEFINE_PROC ("DB.DBA.RDF_REPL_DEL", proc219);
- DEFINE_PROC ("DB.DBA.SPARUL_CLEAR", proc220);
- DEFINE_PROC ("DB.DBA.SPARUL_LOAD", proc221);
- DEFINE_PROC ("DB.DBA.SPARUL_CREATE", proc222);
- DEFINE_PROC ("DB.DBA.SPARUL_DROP", proc223);
- DEFINE_PROC ("DB.DBA.SPARUL_RUN", proc224);
- DEFINE_PROC ("DB.DBA.SPARQL_INSERT_QUAD_DICT_CONTENT", proc225);
- DEFINE_PROC ("DB.DBA.SPARQL_DELETE_QUAD_DICT_CONTENT", proc226);
- DEFINE_PROC ("DB.DBA.SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS", proc227);
- DEFINE_PROC ("DB.DBA.SPARUL_COPYMOVEADD_IMPL", proc228);
- DEFINE_PROC ("DB.DBA.SPARUL_COPY", proc229);
- DEFINE_PROC ("DB.DBA.SPARUL_MOVE", proc230);
- DEFINE_PROC ("DB.DBA.SPARUL_ADD", proc231);
- DEFINE_PROC ("DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS", proc232);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_REGEX", proc233);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_LANGMATCHES", proc234);
- DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_INIT", proc235);
- DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_ACC", proc236);
- DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_FINAL", proc237);
+ DEFINE_PROC ("DB.DBA.SPARQL_INSERT_DICT_CONTENT", proc195);
+ DEFINE_PROC ("DB.DBA.SPARQL_DELETE_DICT_CONTENT", proc196);
+ DEFINE_PROC ("DB.DBA.SPARQL_MODIFY_BY_DICT_CONTENTS", proc197);
+ DEFINE_PROC ("DB.DBA.RDF_REPL_DEL", proc198);
+ DEFINE_PROC ("DB.DBA.SPARUL_CLEAR", proc199);
+ DEFINE_PROC ("DB.DBA.SPARUL_LOAD", proc200);
+ DEFINE_PROC ("DB.DBA.SPARUL_CREATE", proc201);
+ DEFINE_PROC ("DB.DBA.SPARUL_DROP", proc202);
+ DEFINE_PROC ("DB.DBA.SPARUL_RUN", proc203);
+ DEFINE_PROC ("DB.DBA.SPARQL_SELECT_KNOWN_GRAPHS", proc204);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_REGEX", proc205);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_LANGMATCHES", proc206);
+ DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_INIT", proc207);
+ DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_ACC", proc208);
+ DEFINE_PUBLIC_PROC ("DB.DBA.BEST_LANGMATCH_FINAL", proc209);
ddl_ensure_table ("do this always", other31);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_INIT", proc238);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_ACC", proc239);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_FIN", proc240);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_INIT", proc210);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_ACC", proc211);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CONSTRUCT_FIN", proc212);
ddl_ensure_table ("do this always", other32);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_INIT", proc241);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_ACC", proc242);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_FIN", proc243);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_INIT", proc213);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_ACC", proc214);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_AGG_FIN", proc215);
ddl_ensure_table ("do this always", other33);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT", proc244);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SPO", proc245);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL", proc246);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_CBD", proc247);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL", proc248);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_OBJCBD", proc249);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_OBJCBD_PHYSICAL", proc250);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SCBD", proc251);
- DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SCBD_PHYSICAL", proc252);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS", proc253);
- DEFINE_PROC ("DB.DBA.RDF_TYPEMIN_OF_OBJ", proc254);
- DEFINE_PROC ("DB.DBA.RDF_TYPEMAX_OF_OBJ", proc255);
- DEFINE_PROC ("DB.DBA.RDF_IID_CMP", proc256);
- DEFINE_PROC ("DB.DBA.RDF_OBJ_CMP", proc257);
- DEFINE_PROC ("DB.DBA.RDF_LONG_CMP", proc258);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DIST_SER_LONG", proc259);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DIST_DESER_LONG", proc260);
- DEFINE_PROC ("DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH", proc261);
- DEFINE_PROC ("DB.DBA.JSO_DUMP_IRI", proc262);
- DEFINE_PROC ("DB.DBA.JSO_DUMP_FLD", proc263);
- DEFINE_PROC ("DB.DBA.JSO_VECTOR_TO_TTL", proc264);
- DEFINE_PROC ("DB.DBA.JSO_FILTERED_PROPLIST", proc265);
- DEFINE_PROC ("DB.DBA.JSO_DUMP_ALL", proc266);
- DEFINE_PROC ("DB.DBA.RDF_BACKUP_METADATA", proc267);
- DEFINE_PROC ("DB.DBA.RDF_RESTORE_METADATA", proc268);
- DEFINE_PROC ("DB.DBA.RDF_AUDIT_METADATA", proc269);
- DEFINE_PROC ("DB.DBA.RDF_QM_CHANGE", proc270);
- DEFINE_PROC ("DB.DBA.RDF_QM_CHANGE_OPT", proc271);
- DEFINE_PROC ("DB.DBA.RDF_QM_APPLY_CHANGES", proc272);
- DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_JSO_TYPE", proc273);
- DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_STORAGE_FLAG", proc274);
- DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_STORAGE_CONTAINS_MAPPING", proc275);
- DEFINE_PROC ("DB.DBA.RDF_QM_GC_SUBTREE", proc276);
- DEFINE_PROC ("DB.DBA.RDF_QM_GC_MAPPING_SUBTREE", proc277);
- DEFINE_PROC ("DB.DBA.RDF_QM_DROP_MAPPING", proc278);
- DEFINE_PROC ("DB.DBA.RDF_QM_MACROEXPAND_TEMPLATE", proc279);
- DEFINE_PROC ("DB.DBA.RDF_QM_CBD_OF_IRI_CLASS", proc280);
- DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FORMAT", proc281);
- DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FUNCTIONS", proc282);
- DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FORMAT", proc283);
- DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FUNCTIONS", proc284);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_BAD_CLASS_INV_FUNCTION", proc285);
- DEFINE_PUBLIC_PROC ("DB.DBA.SQLNAME_NOTATION_TO_NAME", proc286);
- DEFINE_PUBLIC_PROC ("DB.DBA.SQLQNAME_NOTATION_TO_QNAME", proc287);
- DEFINE_PROC ("DB.DBA.RDF_QM_CHECK_CLASS_FUNCTION_HEADERS", proc288);
- DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_SUBCLASS", proc289);
- DEFINE_PROC ("DB.DBA.RDF_QM_DROP_CLASS", proc290);
- DEFINE_PROC ("DB.DBA.RDF_QM_DROP_QUAD_STORAGE", proc291);
- DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_QUAD_STORAGE", proc292);
- DEFINE_PROC ("DB.DBA.RDF_QM_BEGIN_ALTER_QUAD_STORAGE", proc293);
- DEFINE_PROC ("DB.DBA.RDF_QM_END_ALTER_QUAD_STORAGE", proc294);
- DEFINE_PROC ("DB.DBA.RDF_QM_STORE_ATABLES", proc295);
- DEFINE_PROC ("DB.DBA.RDF_QM_FT_USAGE", proc296);
- DEFINE_PROC ("DB.DBA.RDF_QM_CHECK_COLUMNS_FORM_KEY", proc297);
- DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_MAP_VALUE", proc298);
- DEFINE_PROC ("DB.DBA.RDF_QM_NORMALIZE_QMV", proc299);
- DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_MAPPING", proc300);
- DEFINE_PROC ("DB.DBA.RDF_QM_ATTACH_MAPPING", proc301);
- DEFINE_PROC ("DB.DBA.RDF_QM_ADD_MAPPING_TO_STORAGE", proc302);
- DEFINE_PROC ("DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE", proc303);
- DEFINE_PROC ("DB.DBA.RDF_QM_SET_DEFAULT_MAPPING", proc304);
- DEFINE_PROC ("DB.DBA.RDF_SML_DROP", proc305);
- DEFINE_PROC ("DB.DBA.RDF_SML_CREATE", proc306);
- DEFINE_PROC ("DB.DBA.RDF_QM_DETACH_MACRO_LIBRARY", proc307);
- DEFINE_PROC ("DB.DBA.RDF_QM_ATTACH_MACRO_LIBRARY", proc308);
- DEFINE_PROC ("DB.DBA.RDF_ADD_qmAliasesKeyrefdByQuad", proc309);
- DEFINE_PROC ("DB.DBA.RDF_UPGRADE_QUAD_MAP", proc310);
- DEFINE_PROC ("DB.DBA.RDF_UPGRADE_METADATA", proc311);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_W", proc312);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_W", proc313);
- DEFINE_PROC ("DB.DBA.TTLP_EV_NEW_GRAPH_A", proc314);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_A", proc315);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_A", proc316);
- DEFINE_PROC ("DB.DBA.TTLP_EV_COMMIT_A", proc317);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_R", proc318);
- DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_R", proc319);
- DEFINE_PROC ("DB.DBA.TTLP_EV_COMMIT_R", proc320);
- DEFINE_PROC ("DB.DBA.TTLP_MT", proc321);
- DEFINE_PROC ("DB.DBA.TTLP_MT_LOCAL_FILE", proc322);
- DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFXML_MT", proc323);
- DEFINE_PROC ("DB.DBA.VT_DECODE_KEYWORD_ITM", proc324);
- DEFINE_PROC ("DB.DBA.VT_ENCODE_KEYWORD_ITM", proc325);
- DEFINE_PROC ("DB.DBA.VT_COMPOSE_KEYWORD_INDEX_LINES", proc326);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_OBJ_PATCH_CONTAINS_BY_GRAPH", proc327);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_OBJ_PATCH_CONTAINS_BY_MANY_GRAPHS", proc328);
- DEFINE_PROC ("DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH", proc329);
- DEFINE_PROC ("DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH_OLD", proc330);
- DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RULE_ADD", proc331);
- DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RULE_DEL", proc332);
- DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RECOVER", proc333);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT", proc216);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SPO", proc217);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_SPO_PHYSICAL", proc218);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_CBD", proc219);
+ DEFINE_PROC ("DB.DBA.SPARQL_DESC_DICT_CBD_PHYSICAL", proc220);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DICT_OF_TRIPLES_TO_THREE_COLS", proc221);
+ DEFINE_PROC ("DB.DBA.RDF_TYPEMIN_OF_OBJ", proc222);
+ DEFINE_PROC ("DB.DBA.RDF_TYPEMAX_OF_OBJ", proc223);
+ DEFINE_PROC ("DB.DBA.RDF_IID_CMP", proc224);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_CMP", proc225);
+ DEFINE_PROC ("DB.DBA.RDF_LONG_CMP", proc226);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DIST_SER_LONG", proc227);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_DIST_DESER_LONG", proc228);
+ DEFINE_PROC ("DB.DBA.JSO_MAKE_INHERITANCE", proc229);
+ DEFINE_PROC ("DB.DBA.JSO_LOAD_INSTANCE", proc230);
+ DEFINE_PROC ("DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH", proc231);
+ DEFINE_PROC ("DB.DBA.JSO_LOAD_GRAPH", proc232);
+ DEFINE_PROC ("DB.DBA.JSO_PIN_GRAPH", proc233);
+ DEFINE_PUBLIC_PROC ("DB.DBA.JSO_SYS_GRAPH", proc234);
+ DEFINE_PROC ("DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO", proc235);
+ DEFINE_PROC ("DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH", proc236);
+ DEFINE_PROC ("DB.DBA.JSO_DUMP_IRI", proc237);
+ DEFINE_PROC ("DB.DBA.JSO_DUMP_FLD", proc238);
+ DEFINE_PROC ("DB.DBA.JSO_VECTOR_TO_TTL", proc239);
+ DEFINE_PROC ("DB.DBA.JSO_FILTERED_PROPLIST", proc240);
+ DEFINE_PROC ("DB.DBA.JSO_DUMP_ALL", proc241);
+ DEFINE_PROC ("DB.DBA.RDF_BACKUP_METADATA", proc242);
+ DEFINE_PROC ("DB.DBA.RDF_RESTORE_METADATA", proc243);
+ DEFINE_PROC ("DB.DBA.RDF_AUDIT_METADATA", proc244);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CHANGE", proc245);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CHANGE_OPT", proc246);
+ DEFINE_PROC ("DB.DBA.RDF_QM_APPLY_CHANGES", proc247);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_JSO_TYPE", proc248);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_STORAGE_FLAG", proc249);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_STORAGE_CONTAINS_MAPPING", proc250);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ASSERT_STORAGE_IS_FLAGGED", proc251);
+ DEFINE_PROC ("DB.DBA.RDF_QM_GC_SUBTREE", proc252);
+ DEFINE_PROC ("DB.DBA.RDF_QM_GC_MAPPING_SUBTREE", proc253);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DROP_MAPPING", proc254);
+ DEFINE_PROC ("DB.DBA.RDF_QM_MACROEXPAND_TEMPLATE", proc255);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CBD_OF_IRI_CLASS", proc256);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FORMAT", proc257);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_IRI_CLASS_FUNCTIONS", proc258);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FORMAT", proc259);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_LITERAL_CLASS_FUNCTIONS", proc260);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_BAD_CLASS_INV_FUNCTION", proc261);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SQLNAME_NOTATION_TO_NAME", proc262);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SQLQNAME_NOTATION_TO_QNAME", proc263);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CHECK_CLASS_FUNCTION_HEADERS", proc264);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_SUBCLASS", proc265);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DROP_CLASS", proc266);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DROP_QUAD_STORAGE", proc267);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_QUAD_STORAGE", proc268);
+ DEFINE_PROC ("DB.DBA.RDF_QM_BEGIN_ALTER_QUAD_STORAGE", proc269);
+ DEFINE_PROC ("DB.DBA.RDF_QM_END_ALTER_QUAD_STORAGE", proc270);
+ DEFINE_PROC ("DB.DBA.RDF_QM_STORE_ATABLES", proc271);
+ DEFINE_PROC ("DB.DBA.RDF_QM_FT_USAGE", proc272);
+ DEFINE_PROC ("DB.DBA.RDF_QM_CHECK_COLUMNS_FORM_KEY", proc273);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_MAP_VALUE", proc274);
+ DEFINE_PROC ("DB.DBA.RDF_QM_NORMALIZE_QMV", proc275);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DEFINE_MAPPING", proc276);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ATTACH_MAPPING", proc277);
+ DEFINE_PROC ("DB.DBA.RDF_QM_ADD_MAPPING_TO_STORAGE", proc278);
+ DEFINE_PROC ("DB.DBA.RDF_QM_DELETE_MAPPING_FROM_STORAGE", proc279);
+ DEFINE_PROC ("DB.DBA.RDF_QM_SET_DEFAULT_MAPPING", proc280);
+ DEFINE_PROC ("DB.DBA.RDF_ADD_qmAliasesKeyrefdByQuad", proc281);
+ DEFINE_PROC ("DB.DBA.RDF_UPGRADE_QUAD_MAP", proc282);
+ DEFINE_PROC ("DB.DBA.RDF_UPGRADE_METADATA", proc283);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_W", proc284);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_W", proc285);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_NEW_GRAPH_A", proc286);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_A", proc287);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_A", proc288);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_COMMIT_A", proc289);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_R", proc290);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_TRIPLE_L_R", proc291);
+ DEFINE_PROC ("DB.DBA.TTLP_EV_COMMIT_R", proc292);
+ DEFINE_PROC ("DB.DBA.TTLP_MT", proc293);
+ DEFINE_PROC ("DB.DBA.TTLP_MT_LOCAL_FILE", proc294);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_RDFXML_MT", proc295);
+ DEFINE_PROC ("DB.DBA.VT_DECODE_KEYWORD_ITM", proc296);
+ DEFINE_PROC ("DB.DBA.VT_ENCODE_KEYWORD_ITM", proc297);
+ DEFINE_PROC ("DB.DBA.VT_COMPOSE_KEYWORD_INDEX_LINES", proc298);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_OBJ_PATCH_CONTAINS_BY_GRAPH", proc299);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_OBJ_PATCH_CONTAINS_BY_MANY_GRAPHS", proc300);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH", proc301);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_ADD_KEYWORD_FOR_GRAPH_OLD", proc302);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RULE_ADD", proc303);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RULE_DEL", proc304);
+ DEFINE_PROC ("DB.DBA.RDF_OBJ_FT_RECOVER", proc305);
ddl_ensure_table ("DB.DBA.RDF_GRAPH_GROUP", tbl16);
ddl_ensure_table ("DB.DBA.RDF_GRAPH_GROUP_MEMBER", tbl17);
ddl_ensure_table ("DB.DBA.RDF_GRAPH_USER", tbl18);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_CREATE_MEMONLY", proc334);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_CREATE", proc335);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DROP_MEMONLY", proc336);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DROP", proc337);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_CHECK_VISIBILITY_CHANGE", proc338);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_INS_MEMONLY", proc339);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_INS", proc340);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DEL_MEMONLY", proc341);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DEL", proc342);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_GET", proc343);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_ACK", proc344);
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_GRAPH_USER_PERM_TITLE", proc345);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_ASSERT", proc346);
- DEFINE_PROC ("DB.DBA.RDF_DEFAULT_USER_PERMS_SET_MEMONLY", proc347);
- DEFINE_PROC ("DB.DBA.RDF_DEFAULT_USER_PERMS_SET", proc348);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_SET_MEMONLY", proc349);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_SET", proc350);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_DEL_MEMONLY", proc351);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_DEL", proc352);
- DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_LIST_GET", proc353);
- DEFINE_PROC ("DB.DBA.SPARQL_RELOAD_QM_GRAPH", proc354);
- DEFINE_PROC ("DB.DBA.RDF_CREATE_SPARQL_ROLES", proc355);
- DEFINE_PROC ("DB.DBA.RDF_QUAD_AUDIT", proc356);
- DEFINE_PROC ("DB.DBA.RDF_QUAD_OUTLINE_ALL", proc357);
- DEFINE_PROC ("DB.DBA.RDF_QUAD_FT_UPGRADE", proc358);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_CREATE_MEMONLY", proc306);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_CREATE", proc307);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DROP_MEMONLY", proc308);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DROP", proc309);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_CHECK_VISIBILITY_CHANGE", proc310);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_INS_MEMONLY", proc311);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_INS", proc312);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DEL_MEMONLY", proc313);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_DEL", proc314);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_GET", proc315);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_ACK", proc316);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_GRAPH_USER_PERM_TITLE", proc317);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_ASSERT", proc318);
+ DEFINE_PROC ("DB.DBA.RDF_DEFAULT_USER_PERMS_SET_MEMONLY", proc319);
+ DEFINE_PROC ("DB.DBA.RDF_DEFAULT_USER_PERMS_SET", proc320);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_SET_MEMONLY", proc321);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_USER_PERMS_SET", proc322);
+ DEFINE_PROC ("DB.DBA.RDF_GRAPH_GROUP_LIST_GET", proc323);
+ DEFINE_PROC ("DB.DBA.SPARQL_RELOAD_QM_GRAPH", proc324);
+ DEFINE_PROC ("DB.DBA.RDF_CREATE_SPARQL_ROLES", proc325);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_AUDIT", proc326);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_OUTLINE_ALL", proc327);
+ DEFINE_PROC ("DB.DBA.RDF_QUAD_FT_UPGRADE", proc328);
ddl_ensure_table ("do this always", other36);
- DEFINE_PROC ("rdfs_pn", proc359);
- DEFINE_PROC ("rdf_owl_sas_p", proc360);
+ DEFINE_PROC ("rdfs_pn", proc329);
+ DEFINE_PROC ("rdf_owl_sas_p", proc330);
ddl_ensure_table ("DB.DBA.SYS_RDF_SCHEMA", tbl19);
- DEFINE_PROC ("rdfs_load_schema", proc361);
- DEFINE_PROC ("rdf_schema_ld", proc362);
+ DEFINE_PROC ("rdfs_load_schema", proc331);
+ DEFINE_PROC ("rdf_schema_ld", proc332);
ddl_ensure_table ("do this always", other37);
- DEFINE_PROC ("CL_RDF_INF_CHANGED_SRV", proc363);
- DEFINE_PROC ("CL_RDF_INF_CHANGED", proc364);
- DEFINE_PROC ("rdfs_rule_set", proc365);
- DEFINE_PROC ("DB.DBA.RDF_IID_OF_QNAME", proc366);
- DEFINE_PROC ("SPARQL_INI_PARAMS", proc367);
- DEFINE_PROC ("cl_tmp_inx_recov_fill", proc368);
- DEFINE_PROC ("cl_inx_recov_clean", proc369);
- DEFINE_PROC ("cl_inx_recov_fill_1", proc370);
- DEFINE_PROC ("exec_from_daq", proc371);
- DEFINE_PROC ("cl_inx_recov", proc372);
+ DEFINE_PROC ("CL_RDF_INF_CHANGED_SRV", proc333);
+ DEFINE_PROC ("CL_RDF_INF_CHANGED", proc334);
+ DEFINE_PROC ("rdfs_rule_set", proc335);
+ DEFINE_PROC ("DB.DBA.RDF_IID_OF_QNAME", proc336);
+ DEFINE_PROC ("SPARQL_INI_PARAMS", proc337);
+ DEFINE_PROC ("cl_tmp_inx_recov_fill", proc338);
+ DEFINE_PROC ("cl_inx_recov_clean", proc339);
+ DEFINE_PROC ("cl_inx_recov_fill_1", proc340);
+ DEFINE_PROC ("exec_from_daq", proc341);
+ DEFINE_PROC ("cl_inx_recov", proc342);
/* sparql_io.sql */
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_WRITE_NS", proc373);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_WRITE_HEAD", proc374);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_PRE", proc375);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_INIT", proc376);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_FINAL", proc377);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_WRITE_NS", proc343);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_WRITE_HEAD", proc344);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_PRE", proc345);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_INIT", proc346);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_XML_HTTP_FINAL", proc347);
ddl_ensure_table ("do this always", other38);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_DICT_XML_HTTP_PRE", proc378);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_DICT_XML_HTTP_PRE", proc348);
ddl_ensure_table ("do this always", other39);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_WRITE_NS", proc379);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_WRITE_HEAD", proc380);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_PRE", proc381);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_INIT", proc382);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL", proc383);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_WRITE_NS", proc349);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_WRITE_HEAD", proc350);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_PRE", proc351);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_INIT", proc352);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_TTL_HTTP_FINAL", proc353);
ddl_ensure_table ("do this always", other40);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_WRITE_NS", proc384);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_WRITE_HEAD", proc385);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_HTTP_PRE", proc386);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_WRITE_NS", proc354);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_WRITE_HEAD", proc355);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_RSET_NT_HTTP_PRE", proc356);
ddl_ensure_table ("do this always", other41);
- DEFINE_PROC ("DB.DBA.SPARQL_REXEC_INT", proc387);
- DEFINE_PROC ("DB.DBA.SPARQL_REXEC", proc388);
- DEFINE_PROC ("DB.DBA.SPARQL_REXEC_TO_ARRAY", proc389);
- DEFINE_PROC ("DB.DBA.SPARQL_REXEC_TO_ARRAY_OF_OBJ", proc390);
- DEFINE_PROC ("DB.DBA.SPARQL_REXEC_WITH_META", proc391);
- DEFINE_PROC ("DB.DBA.SPARQL_SINV_IMP", proc392);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC_INT", proc357);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC", proc358);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC_TO_ARRAY", proc359);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC_TO_ARRAY_OF_OBJ", proc360);
+ DEFINE_PROC ("DB.DBA.SPARQL_REXEC_WITH_META", proc361);
+ DEFINE_PROC ("DB.DBA.SPARQL_SINV_IMP", proc362);
ddl_ensure_table ("DB.DBA.SPARQL_SINV_2", view0);
- DEFINE_PROC ("querySoap", proc393);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_WRITE_EXEC_STATUS", proc394);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_HEAD", proc395);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_RES", proc396);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_ROW", proc397);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_NS", proc398);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_HEAD", proc399);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_RES", proc400);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_ROW", proc401);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_NS", proc402);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_HEAD", proc403);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_RES", proc404);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_NS", proc405);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_HEAD", proc406);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_RES", proc407);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JAVASCRIPT_HTML_WRITE", proc408);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JSON_WRITE_BINDING", proc409);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JSON_WRITE", proc410);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_CSV_WRITE", proc411);
- DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_WRITE", proc412);
- DEFINE_PROC ("WS.WS.SPARQL_VHOST_RESET", proc413);
- DEFINE_PROC ("DB.DBA.SPARQL_PROTOCOL_ERROR_REPORT", proc414);
- DEFINE_PROC ("DB.DBA.SPARQL_WSDL11", proc415);
- DEFINE_PROC ("DB.DBA.SPARQL_WSDL", proc416);
- DEFINE_PROC ("DB.DBA.SPARQL_SOAP_NS", proc417);
- DEFINE_PROC ("DB.DBA.SPARQL_PT_NS", proc418);
- DEFINE_PUBLIC_PROC ("DB.DBA.PARSE_SPARQL_WS_PARAMS", proc419);
- DEFINE_PROC ("DB.DBA.rdf_find_str", proc420);
+ DEFINE_PROC ("querySoap", proc363);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_WRITE_EXEC_STATUS", proc364);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_HEAD", proc365);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_RES", proc366);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_XML_WRITE_ROW", proc367);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_NS", proc368);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_HEAD", proc369);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_RES", proc370);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_ROW", proc371);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_NS", proc372);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_HEAD", proc373);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_TTL_WRITE_RES", proc374);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_NS", proc375);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_HEAD", proc376);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_NT_WRITE_RES", proc377);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JAVASCRIPT_HTML_WRITE", proc378);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JSON_WRITE_BINDING", proc379);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_JSON_WRITE", proc380);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_CSV_WRITE", proc381);
+ DEFINE_PROC ("DB.DBA.SPARQL_RESULTS_WRITE", proc382);
+ DEFINE_PROC ("WS.WS.SPARQL_VHOST_RESET", proc383);
+ DEFINE_PROC ("DB.DBA.SPARQL_PROTOCOL_ERROR_REPORT", proc384);
+ DEFINE_PROC ("DB.DBA.SPARQL_WSDL11", proc385);
+ DEFINE_PROC ("DB.DBA.SPARQL_WSDL", proc386);
+ DEFINE_PROC ("DB.DBA.SPARQL_SOAP_NS", proc387);
+ DEFINE_PROC ("DB.DBA.SPARQL_PT_NS", proc388);
+ DEFINE_PUBLIC_PROC ("DB.DBA.PARSE_SPARQL_WS_PARAMS", proc389);
+ DEFINE_PROC ("DB.DBA.rdf_find_str", proc390);
ddl_ensure_table ("do this always", other42);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_HTML_DOCTYPE", proc421);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_HTML_HEAD", proc422);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_STYLE", proc423);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_JAVASCRIPT", proc424);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_FOOTER", proc425);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_FORMAT_OPTS", proc426);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_SPONGE_OPTS", proc427);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_CXML_OPTION", proc428);
- DEFINE_PROC ("WS.WS.sparql_predefined_nsdecl", proc429);
- DEFINE_PROC ("WS.WS.sparql_predefined_rdfinf", proc430);
- DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_GENERATE_FORM", proc431);
- DEFINE_PROC ("WS.WS./!sparql/", proc432);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_HTML_DOCTYPE", proc391);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_HTML_HEAD", proc392);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_STYLE", proc393);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_JAVASCRIPT", proc394);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_FOOTER", proc395);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_FORMAT_OPTS", proc396);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_SPONGE_OPTS", proc397);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_CXML_OPTION", proc398);
+ DEFINE_PROC ("WS.WS.sparql_predefined_nsdecl", proc399);
+ DEFINE_PROC ("WS.WS.sparql_predefined_rdfinf", proc400);
+ DEFINE_PROC ("WS.WS.SPARQL_ENDPOINT_GENERATE_FORM", proc401);
+ DEFINE_PROC ("WS.WS./!sparql/", proc402);
ddl_ensure_table ("do this always", other43);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_NEW_BLANK", proc433);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_TRIPLE", proc434);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_TRIPLE_L", proc435);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_NEW_BASE", proc436);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_TTL", proc437);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_RDFXML", proc438);
- DEFINE_PROC ("WS.WS./!sparql-graph-crud/", proc439);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_NEW_BLANK", proc403);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_TRIPLE", proc404);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_TRIPLE_L", proc405);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_EV_NEW_BASE", proc406);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_TTL", proc407);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_CRUD_BASE_RDFXML", proc408);
+ DEFINE_PROC ("WS.WS./!sparql-graph-crud/", proc409);
ddl_ensure_table ("do this always", other44);
- DEFINE_PROC ("DB.DBA.SPARQL_REFRESH_DYNARES_RESULTS", proc440);
- DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_ROUTE_IF_DAV", proc441);
- DEFINE_PROC ("DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV", proc442);
- DEFINE_PROC ("WS.WS.__http_handler_rq", proc443);
- DEFINE_PROC ("WS.WS.__http_handler_head_rq", proc444);
- DEFINE_PROC ("DB.DBA.http_rq_file_handler", proc445);
- DEFINE_PROC ("DB.DBA.RDF_GRANT_SPARQL_IO", proc446);
+ DEFINE_PROC ("DB.DBA.SPARQL_REFRESH_DYNARES_RESULTS", proc410);
+ DEFINE_PUBLIC_PROC ("DB.DBA.SPARQL_ROUTE_IF_DAV", proc411);
+ DEFINE_PROC ("DB.DBA.SPARQL_ROUTE_DICT_CONTENT_DAV", proc412);
+ DEFINE_PROC ("WS.WS.__http_handler_rq", proc413);
+ DEFINE_PROC ("WS.WS.__http_handler_head_rq", proc414);
+ DEFINE_PROC ("DB.DBA.http_rq_file_handler", proc415);
+ DEFINE_PROC ("DB.DBA.RDF_GRANT_SPARQL_IO", proc416);
/* rdf_sponge.sql */
- DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FT_INDEX_GRABBED", proc447);
- DEFINE_PROC ("DB.DBA.RDF_GRAB_SINGLE", proc448);
- DEFINE_PROC ("DB.DBA.RDF_GRAB_SINGLE_ASYNC", proc449);
- DEFINE_PROC ("DB.DBA.RDF_GRAB_SEEALSO", proc450);
- DEFINE_PROC ("DB.DBA.RDF_GRAB", proc451);
- DEFINE_PROC ("DB.DBA.RDF_GRAB_RESOLVER_DEFAULT", proc452);
- DEFINE_PROC ("DB.DBA.SPARQL_EVAL_TO_ARRAY", proc453);
- DEFINE_PROC ("DB.DBA.SPARQL_EVAL", proc454);
+ DEFINE_PUBLIC_PROC ("DB.DBA.RDF_FT_INDEX_GRABBED", proc417);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB_SINGLE", proc418);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB_SINGLE_ASYNC", proc419);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB_SEEALSO", proc420);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB", proc421);
+ DEFINE_PROC ("DB.DBA.RDF_GRAB_RESOLVER_DEFAULT", proc422);
+ DEFINE_PROC ("DB.DBA.SPARQL_EVAL_TO_ARRAY", proc423);
+ DEFINE_PROC ("DB.DBA.SPARQL_EVAL", proc424);
ddl_ensure_table ("DB.DBA.SYS_HTTP_SPONGE", tbl20);
- DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_GET_CACHE_PARAMS", proc455);
- DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_DEP_URL_NOT_CHANGED", proc456);
- DEFINE_PROC ("DB.DBA.RDF_HTTP_MAKE_HTTP_REQ", proc457);
- DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_UP", proc458);
- DEFINE_PROC ("DB.DBA.SYS_FILE_SPONGE_UP", proc459);
- DEFINE_PROC ("DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE", proc460);
+ DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_GET_CACHE_PARAMS", proc425);
+ DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_DEP_URL_NOT_CHANGED", proc426);
+ DEFINE_PROC ("DB.DBA.RDF_HTTP_MAKE_HTTP_REQ", proc427);
+ DEFINE_PROC ("DB.DBA.SYS_HTTP_SPONGE_UP", proc428);
+ DEFINE_PROC ("DB.DBA.SYS_FILE_SPONGE_UP", proc429);
+ DEFINE_PROC ("DB.DBA.RDF_SPONGE_GUESS_CONTENT_TYPE", proc430);
ddl_ensure_table ("DB.DBA.SYS_RDF_MAPPERS", tbl21);
- DEFINE_PROC ("DB.DBA.RDF_HTTP_URL_GET", proc461);
- DEFINE_PROC ("DB.DBA.RDF_SW_PING", proc462);
- DEFINE_PROC ("DB.DBA.RDF_PROC_COLS", proc463);
- DEFINE_PROC ("DB.DBA.RDF_LOAD_HTTP_RESPONSE", proc464);
- DEFINE_PROC ("DB.DBA.RDF_FORGET_HTTP_RESPONSE", proc465);
- DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP", proc466);
- DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP_1", proc467);
- DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP_LIST", proc468);
- DEFINE_PROC ("DB.DBA.RDF_GRANT_SPONGE", proc469);
+ DEFINE_PROC ("DB.DBA.RDF_HTTP_URL_GET", proc431);
+ DEFINE_PROC ("DB.DBA.RDF_SW_PING", proc432);
+ DEFINE_PROC ("DB.DBA.RDF_PROC_COLS", proc433);
+ DEFINE_PROC ("DB.DBA.RDF_LOAD_HTTP_RESPONSE", proc434);
+ DEFINE_PROC ("DB.DBA.RDF_FORGET_HTTP_RESPONSE", proc435);
+ DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP", proc436);
+ DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP_1", proc437);
+ DEFINE_PROC ("DB.DBA.RDF_SPONGE_UP_LIST", proc438);
+ DEFINE_PROC ("DB.DBA.RDF_GRANT_SPONGE", proc439);
/* rdf_schema_objects.sql */
- DEFINE_PROC ("rdf_view_tbl_opts", proc470);
- DEFINE_PROC ("rdf_view_tbl_pk_cols", proc471);
- DEFINE_PROC ("rdf_view_ns_get", proc472);
- DEFINE_PROC ("rdf_view_ns_get_1", proc473);
- DEFINE_PROC ("RDF_VIEW_DROP_STMT_BY_GRAPH", proc474);
- DEFINE_PROC ("RDF_VIEW_DROP_STMT", proc475);
- DEFINE_PROC ("RDF_VIEW_FROM_TBL", proc476);
- DEFINE_PROC ("rdf_view_sp", proc477);
- DEFINE_PROC ("rdf_view_sql_tb", proc478);
- DEFINE_PROC ("rdf_view_tb", proc479);
- DEFINE_PROC ("rdf_view_sql_col", proc480);
- DEFINE_PROC ("rdf_view_col", proc481);
- DEFINE_PROC ("rdf_view_cls_name", proc482);
- DEFINE_PROC ("rdf_view_get_ns", proc483);
- DEFINE_PROC ("rdf_view_uri_curie", proc484);
- DEFINE_PROC ("rdf_view_col_type", proc485);
- DEFINE_PROC ("rdf_view_create_view", proc486);
- DEFINE_PROC ("rdf_view_create_void_view", proc487);
- DEFINE_PROC ("rdf_view_get_pk_rel", proc488);
- DEFINE_PROC ("rdf_view_get_bin_rel", proc489);
- DEFINE_PROC ("rdf_view_get_fk_pk_rel", proc490);
- DEFINE_PROC ("rdf_view_get_pk_fk_rel", proc491);
- DEFINE_PROC ("rdf_view_dv_to_printf_str_type", proc492);
- DEFINE_PROC ("rdf_view_dv_to_sql_str_type", proc493);
- DEFINE_PROC ("rdf_view_dv_to_xsd_str_type", proc494);
- DEFINE_PROC ("rdf_view_create_class", proc495);
- DEFINE_PROC ("rdf_view_get_primary_key", proc496);
- DEFINE_PROC ("rdf_view_get_relations", proc497);
- DEFINE_PROC ("RDF_OWL_FROM_TBL", proc498);
- DEFINE_PROC ("RDF_VIEW_GEN_VD", proc499);
- DEFINE_PROC ("RDF_OWL_GEN_VD", proc500);
- DEFINE_PROC ("RDF_VIEW_CHECK_SYNC_TB", proc501);
- DEFINE_PROC ("RDF_VIEW_DO_SYNC", proc502);
- DEFINE_PROC ("RDF_VIEW_SYNC_TO_PHYSICAL", proc503);
- DEFINE_PROC ("R2RML_FROM_TBL", proc504);
- DEFINE_PROC ("r2rml_create_dataset", proc505);
+ DEFINE_PROC ("rdf_view_tbl_opts", proc440);
+ DEFINE_PROC ("rdf_view_tbl_pk_cols", proc441);
+ DEFINE_PROC ("rdf_view_ns_get", proc442);
+ DEFINE_PROC ("rdf_view_ns_get_1", proc443);
+ DEFINE_PROC ("RDF_VIEW_DROP_STMT", proc444);
+ DEFINE_PROC ("RDF_VIEW_FROM_TBL", proc445);
+ DEFINE_PROC ("rdf_view_sp", proc446);
+ DEFINE_PROC ("rdf_view_sql_tb", proc447);
+ DEFINE_PROC ("rdf_view_tb", proc448);
+ DEFINE_PROC ("rdf_view_sql_col", proc449);
+ DEFINE_PROC ("rdf_view_col", proc450);
+ DEFINE_PROC ("rdf_view_cls_name", proc451);
+ DEFINE_PROC ("rdf_view_get_ns", proc452);
+ DEFINE_PROC ("rdf_view_uri_curie", proc453);
+ DEFINE_PROC ("rdf_view_col_type", proc454);
+ DEFINE_PROC ("rdf_view_create_view", proc455);
+ DEFINE_PROC ("rdf_view_create_void_view", proc456);
+ DEFINE_PROC ("rdf_view_get_pk_rel", proc457);
+ DEFINE_PROC ("rdf_view_get_bin_rel", proc458);
+ DEFINE_PROC ("rdf_view_get_fk_pk_rel", proc459);
+ DEFINE_PROC ("rdf_view_get_pk_fk_rel", proc460);
+ DEFINE_PROC ("rdf_view_dv_to_printf_str_type", proc461);
+ DEFINE_PROC ("rdf_view_dv_to_sql_str_type", proc462);
+ DEFINE_PROC ("rdf_view_dv_to_xsd_str_type", proc463);
+ DEFINE_PROC ("rdf_view_create_class", proc464);
+ DEFINE_PROC ("rdf_view_get_primary_key", proc465);
+ DEFINE_PROC ("rdf_view_get_relations", proc466);
+ DEFINE_PROC ("RDF_OWL_FROM_TBL", proc467);
+ DEFINE_PROC ("RDF_VIEW_GEN_VD", proc468);
+ DEFINE_PROC ("RDF_OWL_GEN_VD", proc469);
+ DEFINE_PROC ("RDF_VIEW_CHECK_SYNC_TB", proc470);
+ DEFINE_PROC ("RDF_VIEW_DO_SYNC", proc471);
/* rdf_void.sql */
ddl_ensure_table ("DB.DBA.RDF_VOID_GRAPH", tbl22);
ddl_ensure_table ("DB.DBA.RDF_VOID_GRAPH_MEMBER", tbl23);
- DEFINE_PROC ("RDF_VOID_INIT", proc506);
+ DEFINE_PROC ("RDF_VOID_INIT", proc472);
ddl_ensure_table ("do this always", other47);
- DEFINE_PROC ("RDF_VOID_SPLIT_IRI", proc507);
- DEFINE_PROC ("RDF_VOID_STORE", proc508);
- DEFINE_PROC ("RDF_VOID_ALL_GEN", proc509);
- DEFINE_PROC ("RDF_VOID_NS", proc510);
- DEFINE_PROC ("RDF_VOID_GEN", proc511);
- DEFINE_PROC ("RDF_VOID_DIST_O_SRV", proc512);
- DEFINE_PROC ("RDF_VOID_DIST_O", proc513);
- DEFINE_PROC ("RDF_VOID_GEN_1", proc514);
+ DEFINE_PROC ("RDF_VOID_SPLIT_IRI", proc473);
+ DEFINE_PROC ("RDF_VOID_STORE", proc474);
+ DEFINE_PROC ("RDF_VOID_ALL_GEN", proc475);
+ DEFINE_PROC ("RDF_VOID_NS", proc476);
+ DEFINE_PROC ("RDF_VOID_GEN", proc477);
+ DEFINE_PROC ("RDF_VOID_DIST_O_SRV", proc478);
+ DEFINE_PROC ("RDF_VOID_DIST_O", proc479);
+ DEFINE_PROC ("RDF_VOID_GEN_1", proc480);
/* rdflddir2.sql */
ddl_ensure_table ("DB.DBA.LOAD_LIST", tbl24);
ddl_ensure_table ("DB.DBA.LDLOCK", tbl25);
ddl_ensure_table ("do this always", other48);
- DEFINE_PROC ("ld_dir", proc515);
- DEFINE_PROC ("rdf_read_dir", proc516);
- DEFINE_PROC ("ld_dir_all", proc517);
- DEFINE_PROC ("ld_add", proc518);
- DEFINE_PROC ("ld_ttlp_flags", proc519);
- DEFINE_PROC ("ld_is_rdfxml", proc520);
- DEFINE_PROC ("ld_file", proc521);
- DEFINE_PROC ("rdf_load_dir", proc522);
- DEFINE_PROC ("ld_array", proc523);
- DEFINE_PROC ("rdf_loader_run", proc524);
- DEFINE_PROC ("rdf_load_stop", proc525);
- DEFINE_PROC ("RDF_LOADER_RUN_1", proc526);
- DEFINE_PROC ("rdf_ld_srv", proc527);
- DEFINE_PROC ("load_grdf", proc528);
+ DEFINE_PROC ("ld_dir", proc481);
+ DEFINE_PROC ("rdf_read_dir", proc482);
+ DEFINE_PROC ("ld_dir_all", proc483);
+ DEFINE_PROC ("ld_add", proc484);
+ DEFINE_PROC ("ld_ttlp_flags", proc485);
+ DEFINE_PROC ("ld_is_rdfxml", proc486);
+ DEFINE_PROC ("ld_file", proc487);
+ DEFINE_PROC ("rdf_load_dir", proc488);
+ DEFINE_PROC ("ld_array", proc489);
+ DEFINE_PROC ("rdf_loader_run", proc490);
+ DEFINE_PROC ("rdf_load_stop", proc491);
+ DEFINE_PROC ("RDF_LOADER_RUN_1", proc492);
+ DEFINE_PROC ("rdf_ld_srv", proc493);
+ DEFINE_PROC ("load_grdf", proc494);
}
diff --git a/libsrc/Wi/sql_code_sparql_init.c b/libsrc/Wi/sql_code_sparql_init.c
deleted file mode 100644
index f5352ea..0000000
--- a/libsrc/Wi/sql_code_sparql_init.c
+++ /dev/null
@@ -1,1451 +0,0 @@
-/* This file is automatically generated by sql_to_c.awk */
-
-#include "sqlnode.h"
-#include "sqlfn.h"
-#include "sqltype.h"
-
-/* useraggr.sql */
-
-static const char *proc0 =
-"#line 24 \"[executable]/useraggr.sql\"\n"
-" create procedure STD_COUNT (in _env varchar)\n"
-"{\n"
-"return aref (deserialize(_env), 0);\n"
-"}\n"
-"--src useraggr.sql:22\n";
-
-static const char *proc1 =
-"#line 31 \"[executable]/useraggr.sql\"\n"
-" create procedure STD11_INIT (inout _env varchar)\n"
-"{\n"
-"_env := serialize (vector (0, 0.0));\n"
-"}\n"
-"--src useraggr.sql:29\n";
-
-static const char *proc2 =
-"#line 38 \"[executable]/useraggr.sql\"\n"
-" create procedure STD12_INIT (inout _env varchar)\n"
-"{\n"
-"_env := serialize (vector (0, 0.0,0.0));\n"
-"}\n"
-"--src useraggr.sql:36\n";
-
-static const char *proc3 =
-"#line 45 \"[executable]/useraggr.sql\"\n"
-" create procedure STD13_INIT (inout _env varchar)\n"
-"{\n"
-"_env := serialize (vector (0, 0.0,0.0, 0.0));\n"
-"}\n"
-"--src useraggr.sql:43\n";
-
-static const char *proc4 =
-"#line 52 \"[executable]/useraggr.sql\"\n"
-" create procedure VAR_ACC (inout _env varchar, in val numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"if (val is null)\n"
-"return;\n"
-"declare ctx any;\n"
-"ctx := deserialize (_env);\n"
-"\n"
-"aset( ctx, 1, aref (ctx, 1) + val);\n"
-"aset( ctx, 2, aref (ctx, 2) + val*val);\n"
-"aset( ctx, 0, aref (ctx, 0) + 1);\n"
-"_env := serialize (ctx);\n"
-"}\n"
-"--src useraggr.sql:50\n";
-
-static const char *proc5 =
-"#line 69 \"[executable]/useraggr.sql\"\n"
-" create procedure VAR_POP_FIN (inout _ctx varchar)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"declare _env any;\n"
-"_env := deserialize (_ctx);\n"
-"declare c integer;\n"
-"c := aref (_env, 0);\n"
-"if (c = 0)\n"
-"return null;\n"
-"return (aref (_env, 2) - aref (_env, 1) * aref (_env, 1) / c) / c;\n"
-"}\n"
-"--src useraggr.sql:67\n";
-
-static const char *proc6 =
-"#line 84 \"[executable]/useraggr.sql\"\n"
-" create procedure VAR_SAMP_FIN (inout _ctx varchar)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"declare _env any;\n"
-"_env := deserialize (_ctx);\n"
-"declare c integer;\n"
-"c := aref (_env, 0);\n"
-"if (c = 0)\n"
-"return null;\n"
-"if (c = 1)\n"
-"return 0.0;\n"
-"return (aref (_env, 2) - aref (_env, 1) * aref (_env, 1) / c) / (c - 1);\n"
-"}\n"
-"--src useraggr.sql:82\n";
-
-static const char *proc7 =
-"#line 101 \"[executable]/useraggr.sql\"\n"
-" create procedure VAR_FIN (inout _ctx varchar)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"if (STD_COUNT (_ctx) = 1)\n"
-"return null;\n"
-"return VAR_SAMP_FIN (_ctx);\n"
-"}\n"
-"--src useraggr.sql:99\n";
-
-static const char *proc8 =
-"#line 112 \"[executable]/useraggr.sql\"\n"
-" create procedure STDDEV_POP_FIN (inout _ctx varchar)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"declare c integer;\n"
-"declare _env any;\n"
-"_env := deserialize (_ctx);\n"
-"c := aref (_env, 0);\n"
-"if (c = 0)\n"
-"return null;\n"
-"\n"
-"return sqrt ((aref (_env, 2) - aref (_env, 1) * aref (_env, 1) / c) / c) ;\n"
-"}\n"
-"--src useraggr.sql:110\n";
-
-static const char *proc9 =
-"#line 128 \"[executable]/useraggr.sql\"\n"
-" create procedure STDDEV_SAMP_FIN (inout _ctx varchar)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"declare c integer;\n"
-"declare _env any;\n"
-"_env := deserialize (_ctx);\n"
-"c := aref (_env, 0);\n"
-"if (c = 0)\n"
-"return null;\n"
-"if (c = 1)\n"
-"return 0.0;\n"
-"return sqrt ((aref (_env, 2) - aref (_env, 1) * aref (_env, 1) / c) / ( c - 1));\n"
-"}\n"
-"--src useraggr.sql:126\n";
-
-static const char *proc10 =
-"#line 145 \"[executable]/useraggr.sql\"\n"
-" create procedure STDDEV_FIN (inout _ctx varchar)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"if (STD_COUNT (_ctx) = 1)\n"
-"return null;\n"
-"return STDDEV_SAMP_FIN (_ctx);\n"
-"}\n"
-"--src useraggr.sql:143\n";
-
-static const char *proc11 =
-"#line 156 \"[executable]/useraggr.sql\"\n"
-" create procedure COVAR_ACC (inout _ctx any,\n"
-"in expr1 numeric,\n"
-"in expr2 numeric)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return;\n"
-"if (expr1 is null or expr2 is null)\n"
-"return;\n"
-"\n"
-"declare _env any;\n"
-"\n"
-"_env := deserialize (_ctx);\n"
-"\n"
-"aset (_env, 1, aref (_env,1)+expr1);\n"
-"aset (_env, 2, aref (_env,2)+expr2);\n"
-"aset (_env, 3, aref (_env,3)+expr2*expr1);\n"
-"aset (_env, 0, aref (_env,0)+1);\n"
-"\n"
-"_ctx := serialize (_env);\n"
-"}\n"
-"--src useraggr.sql:154\n";
-
-static const char *proc12 =
-"#line 179 \"[executable]/useraggr.sql\"\n"
-" create procedure COVAR_SAMP_FIN (inout _ctx any)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"declare _env any;\n"
-"_env := deserialize (_ctx);\n"
-"if (aref (_env, 0) = 0)\n"
-"return null;\n"
-"if (aref (_env, 0) = 1)\n"
-"return 0.0;\n"
-"\n"
-"return (aref (_env, 3) - aref(_env,2) * aref (_env,1) / aref (_env, 0)) / ( aref (_env, 0) - 1);\n"
-"}\n"
-"--src useraggr.sql:177\n";
-
-static const char *proc13 =
-"#line 195 \"[executable]/useraggr.sql\"\n"
-" create procedure COVAR_POP_FIN (inout _ctx any)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"declare _env any;\n"
-"_env := deserialize (_ctx);\n"
-"if (aref (_env, 0) = 0)\n"
-"return null;\n"
-"if (aref (_env, 0) = 1)\n"
-"return 0.0;\n"
-"\n"
-"return (aref (_env, 3) - aref(_env,2) * aref (_env,1) / aref (_env, 0))/ aref (_env,0);\n"
-"}\n"
-"--src useraggr.sql:193\n";
-
-static const char *proc14 =
-"#line 211 \"[executable]/useraggr.sql\"\n"
-" create procedure COVAR_FIN (inout _ctx varchar)\n"
-"{\n"
-"if (_ctx is null)\n"
-"return null;\n"
-"if (STD_COUNT (_ctx) = 1)\n"
-"return null;\n"
-"return COVAR_SAMP_FIN (_ctx);\n"
-"}\n"
-"--src useraggr.sql:209\n";
-
-static const char *other0 =
-"create aggregate DB.DBA.VAR_POP (in val numeric) returns numeric from\n"
-"STD12_INIT, VAR_ACC, VAR_POP_FIN\n";
-
-static const char *other1 =
-"create aggregate DB.DBA.VAR_SAMP (in val numeric) returns numeric from\n"
-"STD12_INIT, VAR_ACC, VAR_SAMP_FIN\n";
-
-static const char *other2 =
-"create aggregate DB.DBA.VAR (in val numeric) returns numeric from\n"
-"STD12_INIT, VAR_ACC, VAR_FIN\n";
-
-static const char *other3 =
-"create aggregate DB.DBA.STDDEV_POP (in val numeric) returns numeric from\n"
-"STD12_INIT, VAR_ACC, STDDEV_POP_FIN\n";
-
-static const char *other4 =
-"create aggregate DB.DBA.STDDEV_SAMP (in val numeric) returns numeric from\n"
-"STD12_INIT, VAR_ACC, STDDEV_SAMP_FIN\n";
-
-static const char *other5 =
-"create aggregate DB.DBA.STDDEV (in val numeric) returns numeric from\n"
-"STD12_INIT, VAR_ACC, STDDEV_FIN\n";
-
-static const char *other6 =
-"create aggregate DB.DBA.COVAR_SAMP (in expr1 numeric, in expr2 numeric) returns numeric from\n"
-"STD13_INIT, COVAR_ACC, COVAR_SAMP_FIN\n";
-
-static const char *other7 =
-"create aggregate DB.DBA.COVAR_POP (in expr1 numeric, in expr2 numeric) returns numeric from\n"
-"STD13_INIT, COVAR_ACC, COVAR_POP_FIN\n";
-
-static const char *other8 =
-"create aggregate DB.DBA.COVAR (in expr1 numeric, in expr2 numeric) returns numeric from\n"
-"STD13_INIT, COVAR_ACC, COVAR_FIN\n";
-
-static const char *proc15 =
-"#line 250 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_SLOPE_INIT (inout _env varchar)\n"
-"{\n"
-"declare _ctx1 varchar;\n"
-"declare _ctx2 varchar;\n"
-"\n"
-"STD13_INIT (_ctx1);\n"
-"STD12_INIT (_ctx2);\n"
-"\n"
-"_env := serialize (vector (0, _ctx1, _ctx2));\n"
-"}\n"
-"--src useraggr.sql:248\n";
-
-static const char *proc16 =
-"#line 263 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_SLOPE_ACC (inout _env varchar, in expr1 numeric, in expr2 numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"if ( (expr1 is null) or (expr2 is null))\n"
-"return;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"declare _ctx1 varchar;\n"
-"declare _ctx2 varchar;\n"
-"\n"
-"_ctx1 := aref (_ctx, 1);\n"
-"_ctx2 := aref (_ctx, 2);\n"
-"\n"
-"aset (_ctx, 0, aref (_ctx,0) + 1);\n"
-"COVAR_ACC (_ctx1, expr1, expr2);\n"
-"VAR_ACC (_ctx2, expr2);\n"
-"\n"
-"aset (_ctx, 1, _ctx1);\n"
-"aset (_ctx, 2, _ctx2);\n"
-"\n"
-"_env := serialize (_ctx);\n"
-"}\n"
-"--src useraggr.sql:261\n";
-
-static const char *proc17 =
-"#line 290 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_SLOPE_FIN (inout _env varchar)\n"
-"{\n"
-"if (_env is null)\n"
-"return null;\n"
-"declare _ctx any;\n"
-"declare c integer;\n"
-"\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"c := aref (_ctx, 0);\n"
-"if (c = 0)\n"
-"return 0;\n"
-"if (c = 1)\n"
-"return null;\n"
-"\n"
-"declare _ctx1 varchar;\n"
-"declare _ctx2 varchar;\n"
-"declare covar_pop_val numeric;\n"
-"declare var_pop_val numeric;\n"
-"\n"
-"_ctx1 := aref (_ctx, 1);\n"
-"_ctx2 := aref (_ctx, 2);\n"
-"\n"
-"\n"
-"covar_pop_val := COVAR_POP_FIN (_ctx1);\n"
-"var_pop_val := VAR_POP_FIN (_ctx2);\n"
-"\n"
-"if (var_pop_val = 0)\n"
-"return null;\n"
-"return covar_pop_val / var_pop_val;\n"
-"}\n"
-"--src useraggr.sql:288\n";
-
-static const char *other9 =
-"create aggregate DB.DBA.REGR_SLOPE (in expr1 numeric, in expr2 numeric) returns numeric from REGR_SLOPE_INIT, REGR_SLOPE_ACC, REGR_SLOPE_FIN\n";
-
-static const char *proc18 =
-"#line 327 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_INTERCEPT_INIT (inout _env varchar)\n"
-"{\n"
-"declare _ctx_regr_slope varchar;\n"
-"\n"
-"REGR_SLOPE_INIT (_ctx_regr_slope);\n"
-"_env := serialize (vector (0, 0.0, 0.0, _ctx_regr_slope));\n"
-"}\n"
-"--src useraggr.sql:325\n";
-
-static const char *proc19 =
-"#line 337 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_INTERCEPT_ACC (inout _env varchar, in expr1 numeric, in expr2 numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"if ((expr1 is null) or (expr2 is null))\n"
-"return;\n"
-"\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"aset (_ctx, 0, aref (_ctx, 0) + 1);\n"
-"aset (_ctx, 1, aref (_ctx, 1) + expr1);\n"
-"aset (_ctx, 2, aref (_ctx, 2) + expr2);\n"
-"\n"
-"declare _ctx_r varchar;\n"
-"_ctx_r := aref (_ctx, 3);\n"
-"REGR_SLOPE_ACC (_ctx_r, expr1, expr2);\n"
-"aset (_ctx, 3, _ctx_r);\n"
-"\n"
-"_env := serialize (_ctx);\n"
-"}\n"
-"--src useraggr.sql:335\n";
-
-static const char *proc20 =
-"#line 361 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_INTERCEPT_FIN (inout _env varchar)\n"
-"{\n"
-"if (_env is null)\n"
-"return null;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"declare c integer;\n"
-"c := aref (_ctx, 0);\n"
-"if ((c = 0) or (c = 1))\n"
-"return null;\n"
-"\n"
-"return aref (_ctx, 1) / c - REGR_SLOPE_FIN (aref (_ctx, 3)) * aref (_ctx, 2) / c;\n"
-"}\n"
-"--src useraggr.sql:359\n";
-
-static const char *other10 =
-"create aggregate DB.DBA.REGR_INTERCEPT (in expr1 numeric, in expr2 numeric) returns numeric from REGR_INTERCEPT_INIT, REGR_INTERCEPT_ACC, REGR_INTERCEPT_FIN\n";
-
-static const char *proc21 =
-"#line 380 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_COUNT_INIT (inout _env integer)\n"
-"{\n"
-"_env := 0;\n"
-"}\n"
-"--src useraggr.sql:378\n";
-
-static const char *proc22 =
-"#line 387 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_COUNT_ACC (inout _env integer, in expr numeric, in expr2 numeric)\n"
-"{\n"
-"if ((_env is null) or (expr is null) or (expr2 is null))\n"
-"return;\n"
-"_env := _env + 1;\n"
-"}\n"
-"--src useraggr.sql:385\n";
-
-static const char *proc23 =
-"#line 396 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_COUNT_FIN (inout _env integer)\n"
-"{\n"
-"return _env;\n"
-"}\n"
-"--src useraggr.sql:394\n";
-
-static const char *proc24 =
-"#line 403 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_COUNT_MERGE (inout _e1 integer, inout _e2 integer)\n"
-"{\n"
-"_e1 := _e1 + _e2;\n"
-"}\n"
-"--src useraggr.sql:401\n";
-
-static const char *other11 =
-"create aggregate DB.DBA.REGR_COUNT (in expr1 numeric, in expr2 numeric) returns numeric from REGR_COUNT_INIT, REGR_COUNT_ACC, REGR_COUNT_FIN, REGR_COUNT_MERGE\n";
-
-static const char *proc25 =
-"#line 413 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_AVG_ACC (inout _env varchar, in expr1 numeric, in expr2 numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"\n"
-"if ( (expr1 is null) or (expr2 is null))\n"
-"return;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"aset (_ctx, 0, aref (_ctx, 0) + 1);\n"
-"aset (_ctx, 1, aref (_ctx, 1) + expr1);\n"
-"aset (_ctx, 2, aref (_ctx, 2) + expr2);\n"
-"\n"
-"_env := serialize (_ctx);\n"
-"}\n"
-"--src useraggr.sql:411\n";
-
-static const char *proc26 =
-"#line 432 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_AVGX_FIN (inout _env varchar)\n"
-"{\n"
-"if (_env is null)\n"
-"return null;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"if (aref (_ctx, 0) = 0)\n"
-"return null;\n"
-"return aref (_ctx, 1) / aref (_ctx,0);\n"
-"}\n"
-"--src useraggr.sql:430\n";
-
-static const char *proc27 =
-"#line 445 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_AVGY_FIN (inout _env varchar)\n"
-"{\n"
-"if (_env is null)\n"
-"return null;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"if (aref (_ctx, 0) = 0)\n"
-"return null;\n"
-"return aref (_ctx, 2) / aref (_ctx,0);\n"
-"}\n"
-"--src useraggr.sql:443\n";
-
-static const char *other12 =
-"create aggregate DB.DBA.REGR_AVGX (in x numeric, in y numeric) returns numeric from\n"
-"STD12_INIT, REGR_AVG_ACC, REGR_AVGX_FIN\n";
-
-static const char *other13 =
-"create aggregate DB.DBA.REGR_AVGY (in x numeric, in y numeric) returns numeric from\n"
-"STD12_INIT, REGR_AVG_ACC, REGR_AVGY_FIN\n";
-
-static const char *proc28 =
-"#line 466 \"[executable]/useraggr.sql\"\n"
-" create procedure CORR_INIT (inout _env varchar)\n"
-"{\n"
-"declare _ctx_cov varchar;\n"
-"declare _ctx_stdev1 varchar;\n"
-"declare _ctx_stdev2 varchar;\n"
-"\n"
-"STD13_INIT (_ctx_cov);\n"
-"STD12_INIT (_ctx_stdev1);\n"
-"STD12_INIT (_ctx_stdev2);\n"
-"\n"
-"_env := serialize (vector (0, _ctx_cov, _ctx_stdev1, _ctx_stdev2));\n"
-"}\n"
-"--src useraggr.sql:464\n";
-
-static const char *proc29 =
-"#line 481 \"[executable]/useraggr.sql\"\n"
-" create procedure CORR_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"if ((e1 is null) or (e2 is null))\n"
-"return;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"declare _ctx_cov varchar;\n"
-"declare _ctx_stdev1 varchar;\n"
-"declare _ctx_stdev2 varchar;\n"
-"\n"
-"_ctx_cov := aref (_ctx, 1);\n"
-"_ctx_stdev1 := aref (_ctx, 2);\n"
-"_ctx_stdev2 := aref (_ctx, 3);\n"
-"\n"
-"COVAR_ACC (_ctx_cov, e1, e2);\n"
-"VAR_ACC (_ctx_stdev1, e1);\n"
-"VAR_ACC (_ctx_stdev2, e2);\n"
-"\n"
-"aset (_ctx, 0, aref (_ctx, 0) + 1);\n"
-"aset (_ctx, 1, _ctx_cov);\n"
-"aset (_ctx, 2, _ctx_stdev1);\n"
-"aset (_ctx, 3, _ctx_stdev2);\n"
-"\n"
-"_env := serialize (_ctx);\n"
-"}\n"
-"--src useraggr.sql:479\n";
-
-static const char *proc30 =
-"#line 512 \"[executable]/useraggr.sql\"\n"
-" create procedure CORR_FIN (inout _env varchar)\n"
-"{\n"
-"if (_env is null)\n"
-"return null;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"declare _ctx_cov_val numeric;\n"
-"declare _ctx_stdev1_val numeric;\n"
-"declare _ctx_stdev2_val numeric;\n"
-"\n"
-"_ctx_cov_val := COVAR_POP_FIN (aref (_ctx, 1));\n"
-"_ctx_stdev1_val := STDDEV_POP_FIN (aref (_ctx, 2));\n"
-"_ctx_stdev2_val := STDDEV_POP_FIN (aref (_ctx, 3));\n"
-"\n"
-"if (_ctx_cov_val is null)\n"
-"return null;\n"
-"if (_ctx_stdev1_val is null or _ctx_stdev1_val = 0)\n"
-"return null;\n"
-"if (_ctx_stdev2_val is null or _ctx_stdev2_val = 0)\n"
-"return null;\n"
-"\n"
-"return _ctx_cov_val / _ctx_stdev1_val / _ctx_stdev2_val;\n"
-"}\n"
-"--src useraggr.sql:510\n";
-
-static const char *other14 =
-"create aggregate DB.DBA.CORR (in x numeric, in y numeric) returns numeric from\n"
-"CORR_INIT, CORR_ACC, CORR_FIN\n";
-
-static const char *proc31 =
-"#line 543 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_R2_INIT (inout _env varchar)\n"
-"{\n"
-"declare _ctx_vp1 varchar;\n"
-"declare _ctx_vp2 varchar;\n"
-"declare _ctx_corr varchar;\n"
-"\n"
-"STD12_INIT (_ctx_vp1);\n"
-"STD12_INIT (_ctx_vp2);\n"
-"CORR_INIT (_ctx_corr);\n"
-"\n"
-"_env := serialize (vector (_ctx_vp1, _ctx_vp2, _ctx_corr));\n"
-"}\n"
-"--src useraggr.sql:541\n";
-
-static const char *proc32 =
-"#line 558 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_R2_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"if (e1 is null or e2 is null)\n"
-"return;\n"
-"declare _ctx any;\n"
-"\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"declare _ctx_vp1 varchar;\n"
-"declare _ctx_vp2 varchar;\n"
-"declare _ctx_corr varchar;\n"
-"\n"
-"_ctx_vp1 := aref (_ctx, 0);\n"
-"_ctx_vp2 := aref (_ctx, 1);\n"
-"_ctx_corr := aref (_ctx, 2);\n"
-"\n"
-"VAR_ACC (_ctx_vp1, e1);\n"
-"VAR_ACC (_ctx_vp2, e2);\n"
-"CORR_ACC (_ctx_corr, e1, e2);\n"
-"\n"
-"aset (_ctx, 0, _ctx_vp1);\n"
-"aset (_ctx, 1, _ctx_vp2);\n"
-"aset (_ctx, 2, _ctx_corr);\n"
-"\n"
-"_env := serialize (_ctx);\n"
-"}\n"
-"--src useraggr.sql:556\n";
-
-static const char *proc33 =
-"#line 589 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_R2_FIN (inout _env varchar)\n"
-"{\n"
-"if (_env is null)\n"
-"return null;\n"
-"declare _ctx any;\n"
-"\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"declare _vp1 numeric;\n"
-"declare _vp2 numeric;\n"
-"declare _corr numeric;\n"
-"\n"
-"_vp2 := VAR_POP_FIN (aref(_ctx, 1));\n"
-"if (_vp2 is null or _vp2 = 0)\n"
-"return null;\n"
-"_vp1 := VAR_POP_FIN (aref(_ctx, 0));\n"
-"if (_vp1 is null or _vp1 = 0)\n"
-"return 1;\n"
-"_corr := CORR_FIN (aref (_ctx, 2));\n"
-"return _corr * _corr;\n"
-"}\n"
-"--src useraggr.sql:587\n";
-
-static const char *other15 =
-"create aggregate DB.DBA.REGR_R2 (in e1 numeric, in e2 numeric) returns numeric from\n"
-"REGR_R2_INIT, REGR_R2_ACC, REGR_R2_FIN\n";
-
-static const char *proc34 =
-"#line 617 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_SXX_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"if (e1 is null or e2 is null)\n"
-"return;\n"
-"\n"
-"VAR_ACC (_env, e2);\n"
-"}\n"
-"--src useraggr.sql:615\n";
-
-static const char *proc35 =
-"#line 629 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_SYY_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"if (e1 is null or e2 is null)\n"
-"return;\n"
-"\n"
-"VAR_ACC (_env, e1);\n"
-"}\n"
-"--src useraggr.sql:627\n";
-
-static const char *proc36 =
-"#line 641 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_SXY_ACC (inout _env varchar, in e1 numeric, in e2 numeric)\n"
-"{\n"
-"if (_env is null)\n"
-"return;\n"
-"if (e1 is null or e2 is null)\n"
-"return;\n"
-"\n"
-"COVAR_ACC (_env, e1, e2);\n"
-"}\n"
-"--src useraggr.sql:639\n";
-
-static const char *proc37 =
-"#line 653 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_S___FIN (inout _env varchar)\n"
-"{\n"
-"if (_env is null)\n"
-"return null;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"declare _var numeric;\n"
-"\n"
-"_var := VAR_POP_FIN (_env);\n"
-"if (_var is null)\n"
-"return null;\n"
-"return aref (_ctx,0) * _var;\n"
-"}\n"
-"--src useraggr.sql:651\n";
-
-static const char *proc38 =
-"#line 670 \"[executable]/useraggr.sql\"\n"
-" create procedure REGR_SXY_FIN (inout _env varchar)\n"
-"{\n"
-"if (_env is null)\n"
-"return null;\n"
-"declare _ctx any;\n"
-"_ctx := deserialize (_env);\n"
-"\n"
-"declare _var numeric;\n"
-"\n"
-"_var := COVAR_POP_FIN (_env);\n"
-"if (_var is null)\n"
-"return null;\n"
-"return aref (_ctx,0) * _var;\n"
-"}\n"
-"--src useraggr.sql:668\n";
-
-static const char *other16 =
-"create aggregate DB.DBA.REGR_SXX (in e1 numeric, in e2 numeric) returns numeric from\n"
-"STD12_INIT, REGR_SXX_ACC, REGR_S___FIN\n";
-
-static const char *other17 =
-"create aggregate DB.DBA.REGR_SYY (in e1 numeric, in e2 numeric) returns numeric from\n"
-"STD12_INIT, REGR_SYY_ACC, REGR_S___FIN\n";
-
-static const char *other18 =
-"create aggregate DB.DBA.REGR_SXY (in e1 numeric, in e2 numeric) returns numeric from\n"
-"STD13_INIT, REGR_SXY_ACC, REGR_SXY_FIN\n";
-
-static const char *proc39 =
-"#line 699 \"[executable]/useraggr.sql\"\n"
-" create procedure xte_nodebld_final_root (in acc any) returns any\n"
-"{\n"
-"return xte_nodebld_xmlagg_final (acc, xte_head (UNAME\' root\'));\n"
-"}\n"
-"--src useraggr.sql:697\n";
-
-static const char *other19 =
-"create aggregate DB.DBA.XMLAGG (in _child any) returns any\n"
-"from xte_nodebld_init, xte_nodebld_xmlagg_acc, xte_nodebld_final_root\n";
-
-static const char *other20 =
-"create aggregate DB.DBA.VECTOR_AGG (in _child any) returns any\n"
-"from vectorbld_init, vectorbld_agg_acc, vectorbld_agg_final\n"
-"order\n";
-
-static const char *other21 =
-"create aggregate DB.DBA.VECTOR_OF_NONNULLS_AGG (in _child any) returns any\n"
-"from vectorbld_init, vector_of_nonnulls_bld_agg_acc, vectorbld_agg_final\n"
-"order\n";
-
-static const char *other22 =
-"create aggregate DB.DBA.VECTOR_OR_NULL_AGG (in _child any) returns any\n"
-"from vectorbld_init, vectorbld_agg_acc, vector_or_null_bld_agg_final\n"
-"order\n";
-
-static const char *other23 =
-"create aggregate DB.DBA.VECTOR_OF_NONNULLS_OR_NULL_AGG (in _child any) returns any\n"
-"from vectorbld_init, vector_of_nonnulls_bld_agg_acc, vector_or_null_bld_agg_final\n"
-"order\n";
-
-static const char *other24 =
-"create aggregate DB.DBA.VECTOR_CONCAT_AGG (in _child any) returns any\n"
-"from vectorbld_init, vectorbld_concat_agg_acc, vectorbld_agg_final\n"
-"order\n";
-
-static const char *other25 =
-"create aggregate DB.DBA.XQ_SEQUENCE_AGG (in _child any) returns any\n"
-"from xq_sequencebld_init, xq_sequencebld_agg_acc, xq_sequencebld_agg_final\n"
-"order\n";
-
-static const char *other26 =
-"create aggregate DB.DBA.BAG_AGG (in _child any) returns any\n"
-"from vectorbld_init, vectorbld_agg_acc, vectorbld_agg_final\n";
-
-static const char *other27 =
-"create aggregate DB.DBA.BAG_OF_NONNULLS_AGG (in _child any) returns any\n"
-"from vectorbld_init, vector_of_nonnulls_bld_agg_acc, vectorbld_agg_final\n";
-
-static const char *other28 =
-"create aggregate DB.DBA.BAG_OR_NULL_AGG (in _child any) returns any\n"
-"from vectorbld_init, vectorbld_agg_acc, vector_or_null_bld_agg_final\n";
-
-static const char *other29 =
-"create aggregate DB.DBA.BAG_OF_NONNULLS_OR_NULL_AGG (in _child any) returns any\n"
-"from vectorbld_init, vector_of_nonnulls_bld_agg_acc, vector_or_null_bld_agg_final\n";
-
-static const char *other30 =
-"create aggregate DB.DBA.BAG_CONCAT_AGG (in _child any) returns any\n"
-"from vectorbld_init, vectorbld_concat_agg_acc, vectorbld_agg_final\n";
-
-static const char *proc40 =
-"#line 762 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.GROUP_CONCAT_INIT (inout _env any)\n"
-"{\n"
-"_env := 0;\n"
-"}\n"
-"--src useraggr.sql:760\n";
-
-static const char *proc41 =
-"#line 769 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.GROUP_CONCAT_ACC (inout _env any, in token varchar, in delim varchar)\n"
-"{\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"if (__tag of varchar <> __tag (_env))\n"
-"_env := cast (token as varchar);\n"
-"else if (delim is not null)\n"
-"_env := concat (_env, cast (delim as varchar), cast (token as varchar));\n"
-"else\n"
-"_env := concat (_env, cast (token as varchar));\n"
-"}\n"
-"--src useraggr.sql:767\n";
-
-static const char *proc42 =
-"#line 786 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.GROUP_CONCAT_FIN (inout _env any)\n"
-"{\n"
-"\n"
-"\n"
-"\n"
-"if (__tag of varchar <> __tag (_env))\n"
-"return \'\';\n"
-"return _env;\n"
-"}\n"
-"--src useraggr.sql:784\n";
-
-static const char *other31 =
-"create aggregate DB.DBA.GROUP_CONCAT (in token varchar, in delim varchar) returns varchar\n"
-"from DB.DBA.GROUP_CONCAT_INIT, DB.DBA.GROUP_CONCAT_ACC, DB.DBA.GROUP_CONCAT_FIN\n"
-"order\n";
-
-static const char *proc43 =
-"#line 804 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.GROUP_DIGEST_INIT (inout _env any)\n"
-"{\n"
-"_env := 0;\n"
-"}\n"
-"--src useraggr.sql:802\n";
-
-static const char *proc44 =
-"#line 811 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.GROUP_DIGEST_ACC (inout _env any, in token varchar, in delim varchar, in maxlen integer, in mode integer)\n"
-"{\n"
-"declare curlen integer;\n"
-"declare env_vec, items any;\n"
-"if (__tag of varchar <> __tag (token))\n"
-"{\n"
-"token := cast (token as varchar);\n"
-"if (token is null)\n"
-"return;\n"
-"}\n"
-"if (__tag of varchar <> __tag (_env))\n"
-"{\n"
-"if (length (token) > maxlen)\n"
-"token := subseq (token, 0, maxlen+1);\n"
-"_env := serialize (vector_zap_args (vector_zap_args (token), cast (delim as varchar), maxlen));\n"
-"return;\n"
-"}\n"
-"curlen := length (_env);\n"
-"if (curlen >= maxlen)\n"
-"return;\n"
-"env_vec := deserialize (_env);\n"
-"items := aref_set_0 (env_vec, 0);\n"
-"if (bit_and (mode, 1))\n"
-"{\n"
-"if (0 < position (token, items))\n"
-"return;\n"
-"}\n"
-"if (length (token) > (env_vec[2] - curlen))\n"
-"token := subseq (token, 0, (env_vec[2] - curlen)+1);\n"
-"items := vector_concat (items, vector_zap_args (token));\n"
-"aset_zap_arg (env_vec, 0, items);\n"
-"_env := serialize (env_vec);\n"
-"}\n"
-"--src useraggr.sql:809\n";
-
-static const char *proc45 =
-"#line 847 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.GROUP_DIGEST_FIN (inout _env any)\n"
-"{\n"
-"declare envlen, curlen, maxlen, itemctr, itemcount, delim_len, rest_len integer;\n"
-"declare env_vec, items, ses any;\n"
-"declare delim varchar;\n"
-"if (__tag of varchar <> __tag (_env))\n"
-"return \'\';\n"
-"envlen := length (_env);\n"
-"env_vec := deserialize (_env);\n"
-"items := aref_set_0 (env_vec, 0);\n"
-"delim := aref_set_0 (env_vec, 1);\n"
-"rest_len := maxlen := aref_set_0 (env_vec, 2);\n"
-"ses := string_output ();\n"
-"itemctr := 0;\n"
-"itemcount := length (items);\n"
-"delim_len := length (delim);\n"
-"for (itemctr := 0; itemctr < itemcount; itemctr := itemctr + 1)\n"
-"{\n"
-"declare itm varchar;\n"
-"declare itm_len integer;\n"
-"if (delim_len > (rest_len-5))\n"
-"goto items_done;\n"
-"if (itemctr)\n"
-"{\n"
-"http (delim, ses);\n"
-"rest_len := rest_len - delim_len;\n"
-"}\n"
-"itm := items [itemctr];\n"
-"itm_len := length (itm);\n"
-"if ((itm_len > rest_len) or ((envlen > maxlen) and (itemctr = itemcount-1)))\n"
-"{\n"
-"itm := subseq (itm, 0, rest_len);\n"
-"itm_len := coalesce (__max_notnull (strrchr (itm, 32), strrchr (itm, 10), strrchr (itm, 13)), 0);\n"
-"while ((itm_len > 0) and (itm [itm_len-1] in (32, 10, 13)))\n"
-"itm_len := itm_len - 1;\n"
-"if (0 = itm_len)\n"
-"http (subseq (itm, 0, rest_len-3), ses);\n"
-"else\n"
-"http (subseq (itm, 0, itm_len), ses);\n"
-"http (\'...\', ses);\n"
-"goto items_done;\n"
-"}\n"
-"http (itm, ses);\n"
-"rest_len := rest_len - itm_len;\n"
-"}\n"
-"items_done:\n"
-"return string_output_string (ses);\n"
-"}\n"
-"--src useraggr.sql:845\n";
-
-static const char *other32 =
-"create aggregate DB.DBA.GROUP_DIGEST (in token varchar, in delim varchar, in maxlen integer, in mode integer) returns varchar\n"
-"from DB.DBA.GROUP_DIGEST_INIT, DB.DBA.GROUP_DIGEST_ACC, DB.DBA.GROUP_DIGEST_FIN\n"
-"order\n";
-
-static const char *proc46 =
-"#line 904 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.SAMPLE_INIT (inout _env any)\n"
-"{\n"
-"_env := null;\n"
-"}\n"
-"--src useraggr.sql:902\n";
-
-static const char *proc47 =
-"#line 911 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.SAMPLE_ACC (inout _env any, in sample any)\n"
-"{\n"
-"if (_env is not null)\n"
-"return;\n"
-"_env := sample;\n"
-"}\n"
-"--src useraggr.sql:909\n";
-
-static const char *proc48 =
-"#line 920 \"[executable]/useraggr.sql\"\n"
-" create procedure DB.DBA.SAMPLE_FIN (inout _env any)\n"
-"{\n"
-"return _env;\n"
-"}\n"
-"--src useraggr.sql:918\n";
-
-static const char *other33 =
-"create aggregate DB.DBA.SAMPLE (in sample any) returns any\n"
-"from DB.DBA.SAMPLE_INIT, DB.DBA.SAMPLE_ACC, DB.DBA.SAMPLE_FIN\n"
-"order\n";
-
-/* sparql_init.sql */
-
-static const char *proc49 =
-"#line 24 \"[executable]/sparql_init.sql\"\n"
-"create function DB.DBA.RDF_LANGUAGE_OF_LONG (in longobj any, in dflt varchar := \'\') returns any\n"
-"{\n"
-"if (__tag of rdf_box = __tag (longobj))\n"
-"{\n"
-"declare twobyte integer;\n"
-"declare res varchar;\n"
-"twobyte := rdf_box_lang (longobj);\n"
-"if (257 = twobyte)\n"
-"return dflt;\n"
-"whenever not found goto badlang;\n"
-"select lower (RL_ID) into res from DB.DBA.RDF_LANGUAGE where RL_TWOBYTE = twobyte;\n"
-"return res;\n"
-"\n"
-"badlang:\n"
-"signal (\'RDFXX\', sprintf (\'Unknown language in DB.DBA.RDF_LANGUAGE_OF_LONG, bad id %d\', twobyte));\n"
-"}\n"
-"return case (isiri_id (longobj)) when 0 then dflt else null end;\n"
-"}\n"
-"--src sparql_init.sql:22\n";
-
-static const char *proc50 =
-"#line 47 \"[executable]/sparql_init.sql\"\n"
-"create function DB.DBA.JSO_MAKE_INHERITANCE (in jgraph varchar, in class varchar, in rootinst varchar, in destinst varchar, in dest_iid iri_id, inout noinherits any, inout inh_stack any)\n"
-"{\n"
-"declare base_iid iri_id;\n"
-"declare baseinst varchar;\n"
-"\n"
-"inh_stack := vector_concat (inh_stack, vector (destinst));\n"
-"baseinst := null;\n"
-"if (not exists (sparql\n"
-"define input:storage \"\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"ask where {\n"
-"graph ?:jgraph { ?:dest_iid rdf:type `iri(?:class)`\n"
-"} } ) )\n"
-"signal (\'22023\', \'JSO_MAKE_INHERITANCE has not found object <\' || destinst || \'> of type <\' || class || \'>\');\n"
-"/* This fails. !!!TBD: fix sparql2sql.c to preserve data about equalities, fixed values and globals when triples are moved from gp to gp\n"
-"for (sparql\n"
-"define input:storage \"\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"select ?srcinst\n"
-"where {\n"
-"graph ?:jgraph {\n"
-"{ {\n"
-"?destnode rdf:type `iri(?:class)` .\n"
-"filter (?destnode = iri(?:destinst)) }\n"
-"union\n"
-"{\n"
-"?destnode rdf:type `iri(?:class)` .\n"
-"?destnode rdf:name `iri(?:destinst)` } } .\n"
-"?destnode virtrdf:inheritFrom ?srcinst .\n"
-"?srcinst rdf:type `iri(?:class)` .\n"
-"} } ) do\n"
-"*/\n"
-"for (sparql\n"
-"define input:storage \"\"\n"
-"define output:valmode \"LONG\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"select ?src_iid\n"
-"where {\n"
-"graph ?:jgraph { ?:dest_iid virtrdf:inheritFrom ?src_iid } } ) do\n"
-"{\n"
-"declare srcinst varchar;\n"
-"srcinst := id_to_iri_nosignal (\"src_iid\");\n"
-"if (baseinst is null)\n"
-"{\n"
-"if (not exists (sparql\n"
-"define input:storage \"\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"ask where { graph ?:jgraph { ?:\"src_iid\" rdf:type `iri(?:class)` } } ) )\n"
-"signal (\'22023\', \'JSO_MAKE_INHERITANCE has found that the object <\' || destinst || \'> has wrong virtrdf:inheritFrom <\' || srcinst || \'> that is not an instance of type <\' || class || \'>\');\n"
-"base_iid := \"src_iid\";\n"
-"baseinst := srcinst;\n"
-"}\n"
-"else if (baseinst <> srcinst)\n"
-"signal (\'22023\', \'JSO_MAKE_INHERITANCE has found that the object <\' || destinst || \'> has multiple virtrdf:inheritFrom declarations: <\' || baseinst || \'> and <\' || srcinst || \'>\');\n"
-"}\n"
-"if (position (baseinst, inh_stack))\n"
-"signal (\'22023\', \'JSO_MAKE_INHERITANCE has found that the object <\' || baseinst || \'> is recursively inherited from itself\');\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"for (sparql\n"
-"define input:storage \"\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"select ?pred\n"
-"where {\n"
-"graph ?:jgraph {\n"
-"?:dest_iid virtrdf:noInherit ?pred\n"
-"} } ) do\n"
-"{\n"
-"if (baseinst is null)\n"
-"signal (\'22023\', \'JSO_MAKE_INHERITANCE has found that the object <\' || destinst || \'> has set virtrdf:noInherit but has no virtrdf:inheritFrom\');\n"
-"dict_put (noinherits, \"pred\", destinst);\n"
-"}\n"
-"if (baseinst is null)\n"
-"return;\n"
-"for (select \"pred_id\", \"predval\"\n"
-"from (sparql\n"
-"define input:storage \"\"\n"
-"define output:valmode \"LONG\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"select ?pred_id, ?predval\n"
-"where {\n"
-"graph ?:jgraph {\n"
-"?:base_iid ?pred_id ?predval\n"
-"} } ) as \"t00\"\n"
-"where not exists (sparql\n"
-"define input:storage \"\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"ask where { graph ?:jgraph { ?:\"t00\".\"pred_id\" virtrdf:loadAs virtrdf:jsoTriple } } )\n"
-") do\n"
-"{\n"
-"declare \"pred\" any;\n"
-"\"pred\" := id_to_iri (\"pred_id\");\n"
-"if (DB.DBA.RDF_LANGUAGE_OF_LONG (\"predval\", null) is not null)\n"
-"signal (\'22023\', \'JSO_MAKE_INHERITANCE does not support language marks on objects\');\n"
-"if (\'http://www.w3.org/1999/02/22-rdf-syntax-ns#type\' = \"pred\")\n"
-" ;\n"
-"else if (\'http://www.w3.org/1999/02/22-rdf-syntax-ns#name\' = \"pred\")\n"
-" ;\n"
-"else if (\'http://www.openlinksw.com/schemas/virtrdf#inheritFrom\' = \"pred\")\n"
-" ;\n"
-"else if (\'http://www.openlinksw.com/schemas/virtrdf#noInherit\' = \"pred\")\n"
-" ;\n"
-"else if (dict_get (noinherits, \"pred\", baseinst) = baseinst)\n"
-"{\n"
-"jso_set (class, rootinst, \"pred\", __rdf_sqlval_of_obj (\"predval\"), isiri_id (\"predval\"));\n"
-"dict_put (noinherits, \"pred\", baseinst);\n"
-"}\n"
-"}\n"
-"DB.DBA.JSO_MAKE_INHERITANCE (jgraph, class, rootinst, baseinst, base_iid, noinherits, inh_stack);\n"
-"}\n"
-"--src sparql_init.sql:45\n";
-
-static const char *proc51 =
-"#line 173 \"[executable]/sparql_init.sql\"\n"
-"create function DB.DBA.JSO_LOAD_INSTANCE (in jgraph varchar, in jinst varchar, in delete_first integer, in make_new integer, in jsubj_iid iri_id := 0)\n"
-"{\n"
-"declare jinst_iid, jgraph_iid IRI_ID;\n"
-"declare jclass varchar;\n"
-"declare noinherits, inh_stack, \"p\" any;\n"
-"\n"
-"noinherits := dict_new ();\n"
-"jinst_iid := iri_ensure (jinst);\n"
-"jgraph_iid := iri_ensure (jgraph);\n"
-"if (jsubj_iid is null)\n"
-"{\n"
-"jsubj_iid := (sparql\n"
-"define input:storage \"\"\n"
-"define output:valmode \"LONG\"\n"
-"select ?s\n"
-"where { graph ?:jgraph { ?s rdf:name ?:jinst } } );\n"
-"if (jsubj_iid is null)\n"
-"jsubj_iid := jinst_iid;\n"
-"}\n"
-"jclass := (sparql\n"
-"define input:storage \"\"\n"
-"select ?t\n"
-"where {\n"
-"graph ?:jgraph { ?:jsubj_iid rdf:type ?t } } );\n"
-"if (jclass is null)\n"
-"{\n"
-"if (exists (sparql\n"
-"define input:storage \"\"\n"
-"select ?x\n"
-"where { graph ?:jgraph {\n"
-"{ ?:jinst ?x ?o }\n"
-"union\n"
-"{ ?x rdf:name ?ji .\n"
-"filter (str (?ji) = ?:jinst)\n"
-"} } } ) )\n"
-"signal (\'22023\', \'JSO_LOAD_INSTANCE can not detect the type of <\' || jinst || \'>\');\n"
-"else\n"
-"signal (\'22023\', \'JSO_LOAD_INSTANCE can not find an object <\' || jinst || \'>\');\n"
-"}\n"
-"if (delete_first)\n"
-"jso_delete (jclass, jinst, 1);\n"
-"if (make_new)\n"
-"jso_new (jclass, jinst);\n"
-"for (select \"p_id\", coalesce (\"o2\", \"o1\") as \"o\"\n"
-"from (sparql\n"
-"define input:storage \"\"\n"
-"define output:valmode \"LONG\"\n"
-"select ?p_id ?o1 ?o2\n"
-"where {\n"
-"graph ?:jgraph {\n"
-"{ ?:jsubj_iid ?p_id ?o1 } optional { ?o1 rdf:name ?o2 }\n"
-"} }\n"
-") as \"t00\"\n"
-"where not exists (sparql\n"
-"define input:storage \"\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"ask where { graph ?:jgraph_iid { ?:\"t00\".\"p_id\" virtrdf:loadAs virtrdf:jsoTriple } } ) option (quietcast)\n"
-") do\n"
-"{\n"
-"\"p\" := id_to_iri (\"p_id\");\n"
-"if (DB.DBA.RDF_LANGUAGE_OF_LONG (\"o\", null) is not null)\n"
-"signal (\'22023\', \'JSO_LOAD_INSTANCE does not support language marks on objects\');\n"
-"if (\'http://www.w3.org/1999/02/22-rdf-syntax-ns#type\' = \"p\")\n"
-"{\n"
-"if (__rdf_sqlval_of_obj (\"o\") <> jclass)\n"
-"signal (\'22023\', \'JSO_LOAD_INSTANCE has found that the object <\' || jinst || \'> has multiple type declarations\');\n"
-"}\n"
-"else if (\'http://www.w3.org/1999/02/22-rdf-syntax-ns#name\' = \"p\")\n"
-" ;\n"
-"else if (\'http://www.openlinksw.com/schemas/virtrdf#inheritFrom\' = \"p\")\n"
-" ;\n"
-"else if (\'http://www.openlinksw.com/schemas/virtrdf#noInherit\' = \"p\")\n"
-" ;\n"
-"else\n"
-"{\n"
-"jso_set (jclass, jinst, \"p\", __rdf_sqlval_of_obj (\"o\"), isiri_id (\"o\"));\n"
-"dict_put (noinherits, \"p\", jinst);\n"
-"}\n"
-"}\n"
-"inh_stack := vector ();\n"
-"DB.DBA.JSO_MAKE_INHERITANCE (jgraph, jclass, jinst, jinst, jsubj_iid, noinherits, inh_stack);\n"
-"}\n"
-"--src sparql_init.sql:171\n";
-
-static const char *proc52 =
-"#line 257 \"[executable]/sparql_init.sql\"\n"
-"create procedure DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (in jgraph varchar, out instances any)\n"
-"{\n"
-"declare md, res, st, msg any;\n"
-"st:= \'00000\';\n"
-"exec (\n"
-"\'select DB.DBA.VECTOR_AGG (\n"
-"vector (\n"
-"id_to_iri (\"jclass\"),\n"
-"id_to_iri (\"jinst\"),\n"
-"coalesce (\"s\", \"jinst\") ) )\n"
-"from ( sparql\n"
-"define output:valmode \"LONG\"\n"
-"define input:storage \"\"\n"
-"select ?jclass ?jinst ?s\n"
-"where {\n"
-"graph ?? {\n"
-"{ ?jinst rdf:type ?jclass .\n"
-"filter (!isBLANK (?jinst)) }\n"
-"union\n"
-"{ ?s rdf:type ?jclass .\n"
-"?s rdf:name ?jinst .\n"
-"filter (isBLANK (?s))\n"
-"} } }\n"
-") as inst\',\n"
-"st, msg, vector (jgraph), 1, md, res);\n"
-"if (st <> \'00000\') signal (st, msg);\n"
-"instances := res[0][0];\n"
-"}\n"
-"--src sparql_init.sql:255\n";
-
-static const char *proc53 =
-"#line 287 \"[executable]/sparql_init.sql\"\n"
-"create function DB.DBA.JSO_LOAD_GRAPH (in jgraph varchar, in pin_now integer := 1)\n"
-"{\n"
-"declare jgraph_iid IRI_ID;\n"
-"declare instances, chk any;\n"
-"\n"
-"log_text (\'DB.DBA.JSO_LOAD_GRAPH (?,?)\', jgraph, pin_now);\n"
-"jgraph_iid := iri_ensure (jgraph);\n"
-"DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (jgraph, instances);\n"
-"/* Pass 1. Deleting all obsolete instances. */\n"
-"foreach (any j in instances) do\n"
-"jso_delete (j[0], j[1], 1);\n"
-"/* Pass 2. Creating all instances. */\n"
-"foreach (any j in instances) do\n"
-"jso_new (j[0], j[1]);\n"
-"/* Pass 3. Loading all instances, including loading inherited values. */\n"
-"foreach (any j in instances) do\n"
-"DB.DBA.JSO_LOAD_INSTANCE (jgraph, j[1], 0, 0, j[2]);\n"
-"/* Pass 4. Validation all instances. */\n"
-"foreach (any j in instances) do\n"
-"jso_validate (j[0], j[1], 1);\n"
-"/* Pass 5. Pin all instances. */\n"
-"if (pin_now)\n"
-"{\n"
-"foreach (any j in instances) do\n"
-"jso_pin (j[0], j[1]);\n"
-"}\n"
-"/* Pass 6. Load all separate triples */\n"
-"exec (\'sparql\n"
-"define input:storage \"\"\n"
-"define sql:table-option \"LOOP\"\n"
-"prefix virtrdf: <http://www.openlinksw.com/schemas/virtrdf#>\n"
-"select (bif:jso_triple_add (?s, ?p, ?o))\n"
-"where { graph <\' || id_to_iri (jgraph_iid) || \'> { ?p virtrdf:loadAs virtrdf:jsoTriple . ?s ?p ?o } }\');\n"
-"chk := jso_triple_get_objs (\n"
-"UNAME\'http://www.openlinksw.com/schemas/virtrdf#loadAs\',\n"
-"UNAME\'http://www.openlinksw.com/schemas/virtrdf#loadAs\' );\n"
-"if ((1 <> length (chk)) or (cast (chk[0] as varchar) <> \'http://www.openlinksw.com/schemas/virtrdf#jsoTriple\'))\n"
-"signal (\'22023\', \'JSO_LOAD_GRAPH has not found expected metadata in the graph\');\n"
-"}\n"
-"--src sparql_init.sql:285\n";
-
-static const char *proc54 =
-"#line 328 \"[executable]/sparql_init.sql\"\n"
-"create function DB.DBA.JSO_PIN_GRAPH (in jgraph varchar)\n"
-"{\n"
-"declare instances any;\n"
-"log_text (\'DB.DBA.JSO_PIN_GRAPH (?)\', jgraph);\n"
-"DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH (jgraph, instances);\n"
-"foreach (any j in instances) do\n"
-"jso_pin (j[0], j[1]);\n"
-"}\n"
-"--src sparql_init.sql:326\n";
-
-static const char *proc55 =
-"#line 339 \"[executable]/sparql_init.sql\"\n"
-" create function DB.DBA.JSO_SYS_GRAPH () returns varchar\n"
-"{\n"
-"return \'http://www.openlinksw.com/schemas/virtrdf#\';\n"
-"}\n"
-"--src sparql_init.sql:337\n";
-
-static const char *proc56 =
-"#line 346 \"[executable]/sparql_init.sql\"\n"
-"create procedure DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO (in graphiri varchar := null)\n"
-"{\n"
-"if (graphiri is null)\n"
-"graphiri := DB.DBA.JSO_SYS_GRAPH();\n"
-"if (not exists (select 1 from SYS_KEYS where KEY_TABLE = \'DB.DBA.RDF_QUAD\'))\n"
-"return;\n"
-"DB.DBA.JSO_LOAD_GRAPH (graphiri, 0);\n"
-"DB.DBA.JSO_PIN_GRAPH (graphiri);\n"
-"}\n"
-"--src sparql_init.sql:344\n";
-
-static const char *other34 =
-"DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO ()\n";
-static int
-sch_proc_def_exists (client_connection_t *cli, const char *proc_name, const int report)
-{
- query_t *proc = NULL;
- char *full_name = sch_full_proc_name (isp_schema(NULL), proc_name,
- cli->cli_qualifier, CLI_OWNER (cli));
- if (full_name)
- proc = sch_proc_def (isp_schema(NULL), full_name);
- if (report && proc != NULL)
- log_debug ("built-in procedure \"%s\" overruled by the RDBMS", proc_name);
- return (proc != NULL);
-}
-
-#define DEFINE_PROC(name, proc) \
- if (!sch_proc_def_exists (bootstrap_cli, (name), log_proc_overwrite)) \
- ddl_std_proc_1 (proc, 0x0, 1)
-
-
-#define DEFINE_PUBLIC_PROC(name, proc) \
- if (!sch_proc_def_exists (bootstrap_cli, (name), log_proc_overwrite)) \
- ddl_std_proc_1 (proc, 0x1, 1)
-
-
-#define DEFINE_OVERWRITE_PROC(name, proc) \
- ddl_std_proc_1 (proc, 0x1, 1)
-
-
-void
-sqls_define_sparql_init (void)
-{
- /* useraggr.sql */
-
- DEFINE_PUBLIC_PROC ("STD_COUNT", proc0);
- DEFINE_PUBLIC_PROC ("STD11_INIT", proc1);
- DEFINE_PUBLIC_PROC ("STD12_INIT", proc2);
- DEFINE_PUBLIC_PROC ("STD13_INIT", proc3);
- DEFINE_PUBLIC_PROC ("VAR_ACC", proc4);
- DEFINE_PUBLIC_PROC ("VAR_POP_FIN", proc5);
- DEFINE_PUBLIC_PROC ("VAR_SAMP_FIN", proc6);
- DEFINE_PUBLIC_PROC ("VAR_FIN", proc7);
- DEFINE_PUBLIC_PROC ("STDDEV_POP_FIN", proc8);
- DEFINE_PUBLIC_PROC ("STDDEV_SAMP_FIN", proc9);
- DEFINE_PUBLIC_PROC ("STDDEV_FIN", proc10);
- DEFINE_PUBLIC_PROC ("COVAR_ACC", proc11);
- DEFINE_PUBLIC_PROC ("COVAR_SAMP_FIN", proc12);
- DEFINE_PUBLIC_PROC ("COVAR_POP_FIN", proc13);
- DEFINE_PUBLIC_PROC ("COVAR_FIN", proc14);
- ddl_ensure_table ("do this always", other0);
- ddl_ensure_table ("do this always", other1);
- ddl_ensure_table ("do this always", other2);
- ddl_ensure_table ("do this always", other3);
- ddl_ensure_table ("do this always", other4);
- ddl_ensure_table ("do this always", other5);
- ddl_ensure_table ("do this always", other6);
- ddl_ensure_table ("do this always", other7);
- ddl_ensure_table ("do this always", other8);
- DEFINE_PUBLIC_PROC ("REGR_SLOPE_INIT", proc15);
- DEFINE_PUBLIC_PROC ("REGR_SLOPE_ACC", proc16);
- DEFINE_PUBLIC_PROC ("REGR_SLOPE_FIN", proc17);
- ddl_ensure_table ("do this always", other9);
- DEFINE_PUBLIC_PROC ("REGR_INTERCEPT_INIT", proc18);
- DEFINE_PUBLIC_PROC ("REGR_INTERCEPT_ACC", proc19);
- DEFINE_PUBLIC_PROC ("REGR_INTERCEPT_FIN", proc20);
- ddl_ensure_table ("do this always", other10);
- DEFINE_PUBLIC_PROC ("REGR_COUNT_INIT", proc21);
- DEFINE_PUBLIC_PROC ("REGR_COUNT_ACC", proc22);
- DEFINE_PUBLIC_PROC ("REGR_COUNT_FIN", proc23);
- DEFINE_PUBLIC_PROC ("REGR_COUNT_MERGE", proc24);
- ddl_ensure_table ("do this always", other11);
- DEFINE_PUBLIC_PROC ("REGR_AVG_ACC", proc25);
- DEFINE_PUBLIC_PROC ("REGR_AVGX_FIN", proc26);
- DEFINE_PUBLIC_PROC ("REGR_AVGY_FIN", proc27);
- ddl_ensure_table ("do this always", other12);
- ddl_ensure_table ("do this always", other13);
- DEFINE_PUBLIC_PROC ("CORR_INIT", proc28);
- DEFINE_PUBLIC_PROC ("CORR_ACC", proc29);
- DEFINE_PUBLIC_PROC ("CORR_FIN", proc30);
- ddl_ensure_table ("do this always", other14);
- DEFINE_PUBLIC_PROC ("REGR_R2_INIT", proc31);
- DEFINE_PUBLIC_PROC ("REGR_R2_ACC", proc32);
- DEFINE_PUBLIC_PROC ("REGR_R2_FIN", proc33);
- ddl_ensure_table ("do this always", other15);
- DEFINE_PUBLIC_PROC ("REGR_SXX_ACC", proc34);
- DEFINE_PUBLIC_PROC ("REGR_SYY_ACC", proc35);
- DEFINE_PUBLIC_PROC ("REGR_SXY_ACC", proc36);
- DEFINE_PUBLIC_PROC ("REGR_S___FIN", proc37);
- DEFINE_PUBLIC_PROC ("REGR_SXY_FIN", proc38);
- ddl_ensure_table ("do this always", other16);
- ddl_ensure_table ("do this always", other17);
- ddl_ensure_table ("do this always", other18);
- DEFINE_PUBLIC_PROC ("xte_nodebld_final_root", proc39);
- ddl_ensure_table ("do this always", other19);
- ddl_ensure_table ("do this always", other20);
- ddl_ensure_table ("do this always", other21);
- ddl_ensure_table ("do this always", other22);
- ddl_ensure_table ("do this always", other23);
- ddl_ensure_table ("do this always", other24);
- ddl_ensure_table ("do this always", other25);
- ddl_ensure_table ("do this always", other26);
- ddl_ensure_table ("do this always", other27);
- ddl_ensure_table ("do this always", other28);
- ddl_ensure_table ("do this always", other29);
- ddl_ensure_table ("do this always", other30);
- DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_CONCAT_INIT", proc40);
- DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_CONCAT_ACC", proc41);
- DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_CONCAT_FIN", proc42);
- ddl_ensure_table ("do this always", other31);
- DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_DIGEST_INIT", proc43);
- DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_DIGEST_ACC", proc44);
- DEFINE_PUBLIC_PROC ("DB.DBA.GROUP_DIGEST_FIN", proc45);
- ddl_ensure_table ("do this always", other32);
- DEFINE_PUBLIC_PROC ("DB.DBA.SAMPLE_INIT", proc46);
- DEFINE_PUBLIC_PROC ("DB.DBA.SAMPLE_ACC", proc47);
- DEFINE_PUBLIC_PROC ("DB.DBA.SAMPLE_FIN", proc48);
- ddl_ensure_table ("do this always", other33);
-
- /* sparql_init.sql */
-
- DEFINE_PROC ("DB.DBA.RDF_LANGUAGE_OF_LONG", proc49);
- DEFINE_PROC ("DB.DBA.JSO_MAKE_INHERITANCE", proc50);
- DEFINE_PROC ("DB.DBA.JSO_LOAD_INSTANCE", proc51);
- DEFINE_PROC ("DB.DBA.JSO_LIST_INSTANCES_OF_GRAPH", proc52);
- DEFINE_PROC ("DB.DBA.JSO_LOAD_GRAPH", proc53);
- DEFINE_PROC ("DB.DBA.JSO_PIN_GRAPH", proc54);
- DEFINE_PUBLIC_PROC ("DB.DBA.JSO_SYS_GRAPH", proc55);
- DEFINE_PROC ("DB.DBA.JSO_LOAD_AND_PIN_SYS_GRAPH_RO", proc56);
- ddl_ensure_table ("do this always", other34);
-}
-
-
-void
-sqls_arfw_define_sparql_init (void)
-{
-}
diff --git a/libsrc/Wi/sql_code_sys.c b/libsrc/Wi/sql_code_sys.c
index bcf881b..3a14ceb 100644
--- a/libsrc/Wi/sql_code_sys.c
+++ b/libsrc/Wi/sql_code_sys.c
@@ -145,7 +145,8 @@ static const char *proc1 =
static const char *proc2 =
"#line 199 \"[executable]/users.sql\"\n"
-"create procedure DB.DBA.USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)\n"
+"create procedure\n"
+"USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)\n"
"{\n"
"declare _pwd, _pwd_mode, _pwd_mode_data, _login_qual varchar;\n"
"declare _dav_enable, _sql_enable integer;\n"
@@ -176,7 +177,7 @@ static const char *proc2 =
"_login_qual := get_keyword_ucase (\'LOGIN_QUALIFIER\', options, \'DB\');\n"
"_prim_group := get_keyword_ucase (\'PRIMARY_GROUP\', options, NULL);\n"
"\n"
-"_u_e_mail := coalesce (get_keyword_ucase (\'E-MAIL\', options), get_keyword_ucase (\'E_MAIL\', options, \'\'));\n"
+"_u_e_mail := get_keyword_ucase (\'E-MAIL\', options, \'\');\n"
"_u_full_name := get_keyword_ucase (\'FULL_NAME\', options, NULL);\n"
"_u_home := get_keyword_ucase (\'HOME\', options, NULL);\n"
"_u_perms := get_keyword_ucase (\'PERMISSIONS\', options, \'110100000R\');\n"
@@ -189,7 +190,7 @@ static const char *proc2 =
"new_opts := vector ();\n"
"while (i < l)\n"
"{\n"
-"if (upper(options[i]) not in (\'PASSWORD_MODE\', \'PASSWORD_MODE_DATA\', \'GET_PASSWORD\', \'SQL_ENABLE\', \'DAV_ENABLE\', \'LOGIN_QUALIFIER\', \'PRIMARY_GROUP\', \'E-MAIL\', \'E_MAIL\', \'FULL_NAME\', \'HOME\', \'PERMISSIONS\', \'DISABLED\'))\n"
+"if (upper(options[i]) not in (\'PASSWORD_MODE\', \'PASSWORD_MODE_DATA\', \'GET_PASSWORD\', \'SQL_ENABLE\', \'DAV_ENABLE\', \'LOGIN_QUALIFIER\', \'PRIMARY_GROUP\', \'E-MAIL\', \'FULL_NAME\', \'HOME\', \'PERMISSIONS\', \'DISABLED\'))\n"
"{\n"
"new_opts := vector_concat (new_opts, vector (options[i], options[i+1]));\n"
"}\n"
@@ -199,9 +200,6 @@ static const char *proc2 =
"if (_login_qual = \'\')\n"
"signal (\'22023\', \'Qualifier cannot be empty string\');\n"
"\n"
-"if (__tag of NVARCHAR = __tag (passwd))\n"
-"passwd := charset_recode (passwd, \'_WIDE_\', \'UTF-8\');\n"
-"\n"
"_pwd := pwd_magic_calc (_name, passwd, 0);\n"
"_u_sys_name := pwd_magic_calc (_name, _u_sec_sys_name, 0);\n"
"_u_sys_pass := pwd_magic_calc (_name, _u_sec_sys_pass, 0);\n"
@@ -244,7 +242,7 @@ static const char *proc2 =
"--src users.sql:197\n";
static const char *proc3 =
-"#line 298 \"[executable]/users.sql\"\n"
+"#line 296 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_ROLE_CREATE (in _name varchar, in is_dav integer := 0)\n"
"{\n"
@@ -264,10 +262,10 @@ static const char *proc3 =
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'sec_set_user_struct (?,?,?,?,?,?)\', vector (_name, \'\', _g_id, _g_id, NULL, 1) );\n"
"return _g_id;\n"
"}\n"
-"--src users.sql:296\n";
+"--src users.sql:294\n";
static const char *proc4 =
-"#line 319 \"[executable]/users.sql\"\n"
+"#line 317 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_ROLE_DROP (in _name varchar)\n"
"{\n"
@@ -283,17 +281,13 @@ static const char *proc4 =
"if (_u_is_sql)\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'sec_remove_user_struct(?)\', vector (_name));\n"
"}\n"
-"--src users.sql:317\n";
+"--src users.sql:315\n";
static const char *proc5 =
-"#line 336 \"[executable]/users.sql\"\n"
+"#line 334 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_CHANGE_PASSWORD (in _name varchar, in old_pwd varchar, in new_pwd varchar)\n"
"{\n"
-"if (__tag of NVARCHAR = __tag (old_pwd))\n"
-"old_pwd := charset_recode (old_pwd, \'_WIDE_\', \'UTF-8\');\n"
-"if (__tag of NVARCHAR = __tag (new_pwd))\n"
-"new_pwd := charset_recode (new_pwd, \'_WIDE_\', \'UTF-8\');\n"
"if (exists (select 1 from SYS_USERS where U_NAME = _name and U_IS_ROLE = 0 and pwd_magic_calc (U_NAME, U_PASSWORD, 1) = old_pwd))\n"
"{\n"
"if (exists (select 1 from SYS_USERS where U_NAME = _name and U_SQL_ENABLE = 1))\n"
@@ -308,16 +302,14 @@ static const char *proc5 =
"else\n"
"signal (\'37000\', concat (\'The user \'\'\', _name, \'\'\' does not exist\'), \'U0009\');\n"
"}\n"
-"--src users.sql:334\n";
+"--src users.sql:332\n";
static const char *proc6 =
-"#line 359 \"[executable]/users.sql\"\n"
+"#line 353 \"[executable]/users.sql\"\n"
"create procedure USER_PASSWORD_SET (in name varchar, in passwd varchar)\n"
"{\n"
"declare _u_id, _u_group integer;\n"
"declare _u_data varchar;\n"
-"if (__tag of NVARCHAR = __tag (passwd))\n"
-"passwd := charset_recode (passwd, \'_WIDE_\', \'UTF-8\');\n"
"if (exists (select 1 from SYS_USERS where U_NAME = name and U_SQL_ENABLE = 1))\n"
"{\n"
"user_set_password (name, passwd);\n"
@@ -333,10 +325,10 @@ static const char *proc6 =
"update DB.DBA.SYS_USERS set U_PASSWORD = pwd_magic_calc (name, passwd) where U_NAME = name;\n"
"return 0;\n"
"}\n"
-"--src users.sql:357\n";
+"--src users.sql:351\n";
static const char *proc7 =
-"#line 382 \"[executable]/users.sql\"\n"
+"#line 374 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_SET_QUALIFIER (in _name varchar, in qual varchar)\n"
"{\n"
@@ -352,19 +344,19 @@ static const char *proc7 =
"signal (\'37000\', concat (\'The user \'\'\', _name, \'\'\' does not exist\'), \'U0010\');\n"
"}\n"
"}\n"
-"--src users.sql:380\n";
+"--src users.sql:372\n";
static const char *proc8 =
-"#line 400 \"[executable]/users.sql\"\n"
+"#line 392 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_SET_ROLE (in _name varchar, in new_role varchar)\n"
"{\n"
"signal (\'42000\', \'Not implemented.\');\n"
"}\n"
-"--src users.sql:398\n";
+"--src users.sql:390\n";
static const char *proc9 =
-"#line 407 \"[executable]/users.sql\"\n"
+"#line 399 \"[executable]/users.sql\"\n"
"create procedure\n"
"GET_INHERITED_GRANTS (in g_id integer, in prim integer, inout inh any)\n"
"{\n"
@@ -384,10 +376,10 @@ static const char *proc9 =
"}\n"
"}\n"
"}\n"
-"--src users.sql:405\n";
+"--src users.sql:397\n";
static const char *proc10 =
-"#line 429 \"[executable]/users.sql\"\n"
+"#line 421 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_GRANT_ROLE (in _name varchar, in _role varchar, in grant_opt integer := 0)\n"
"{\n"
@@ -448,10 +440,10 @@ static const char *proc10 =
"}\n"
"}\n"
"}\n"
-"--src users.sql:427\n";
+"--src users.sql:419\n";
static const char *proc11 =
-"#line 491 \"[executable]/users.sql\"\n"
+"#line 483 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_REVOKE_ROLE (in _name varchar, in _role varchar)\n"
"{\n"
@@ -486,10 +478,10 @@ static const char *proc11 =
"\n"
"\n"
"}\n"
-"--src users.sql:489\n";
+"--src users.sql:481\n";
static const char *proc12 =
-"#line 528 \"[executable]/users.sql\"\n"
+"#line 520 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_DROP (in _name varchar, in _cascade integer := 0)\n"
"{\n"
@@ -540,14 +532,13 @@ static const char *proc12 =
"signal (\'37000\', concat (\'The user \'\'\', _name, \'\'\' does not exist\'), \'U0015\');\n"
"delete from SYS_USER_GROUP where UG_UID = _u_id;\n"
"delete from SYS_GRANTS where G_USER = _u_id;\n"
-"delete from DB.DBA.RDF_GRAPH_USER where RGU_USER_ID = _u_id;\n"
"if (_u_is_sql)\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'sec_remove_user_struct(?)\', vector (_name));\n"
"}\n"
-"--src users.sql:526\n";
+"--src users.sql:518\n";
static const char *proc13 =
-"#line 584 \"[executable]/users.sql\"\n"
+"#line 575 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_SET_OPTION (in _name varchar, in opt varchar, in value any)\n"
"{\n"
@@ -631,10 +622,10 @@ static const char *proc13 =
"case when length (_login_qual) then concat (\'Q \', _login_qual) else NULL end));\n"
"DB.DBA.SECURITY_CL_EXEC_AND_LOG (\'sec_user_enable (?, ?)\', vector (_name, case when _disabled = 0 then 1 else 0 end));\n"
"}\n"
-"--src users.sql:582\n";
+"--src users.sql:573\n";
static const char *proc14 =
-"#line 670 \"[executable]/users.sql\"\n"
+"#line 661 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_GET_OPTION (in _name varchar, in opt varchar)\n"
"{\n"
@@ -643,28 +634,28 @@ static const char *proc14 =
"GET_SEC_OBJECT_ID (_name, _u_id, _u_is_sql, opts);\n"
"return get_keyword_ucase (upper (opt), opts, NULL);\n"
"}\n"
-"--src users.sql:668\n";
+"--src users.sql:659\n";
static const char *proc15 =
-"#line 681 \"[executable]/users.sql\"\n"
+"#line 672 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_MGR_SET_OPTION (in opt varchar, in val varchar)\n"
"{\n"
"signal (\'42000\', \'Not implemented.\');\n"
"}\n"
-"--src users.sql:679\n";
+"--src users.sql:670\n";
static const char *proc16 =
-"#line 689 \"[executable]/users.sql\"\n"
+"#line 680 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_MGR_GET_OPTION (in opt varchar) returns varchar\n"
"{\n"
"signal (\'42000\', \'Not implemented.\');\n"
"}\n"
-"--src users.sql:687\n";
+"--src users.sql:678\n";
static const char *proc17 =
-"#line 707 \"[executable]/users.sql\"\n"
+"#line 698 \"[executable]/users.sql\"\n"
"create procedure\n"
"LIST_USER_ROLE_GRANTS ()\n"
"{\n"
@@ -692,10 +683,10 @@ static const char *proc17 =
"i := i + 2;\n"
"}\n"
"}\n"
-"--src users.sql:705\n";
+"--src users.sql:696\n";
static const char *proc18 =
-"#line 736 \"[executable]/users.sql\"\n"
+"#line 727 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_KEY_IS_FILE (in f varchar, out path varchar)\n"
"{\n"
@@ -711,10 +702,10 @@ static const char *proc18 =
"else\n"
"return 0;\n"
"}\n"
-"--src users.sql:734\n";
+"--src users.sql:725\n";
static const char *proc19 =
-"#line 754 \"[executable]/users.sql\"\n"
+"#line 745 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_KEY_STORE (in username varchar, in key_name varchar, in key_type varchar, in key_format varchar, in key_passwd varchar, in key_value varchar := NULL)\n"
"{\n"
@@ -740,10 +731,10 @@ static const char *proc19 =
"keys := vector_concat (keys, vector (key_name, vector (key_type, key_format, key_value, key_passwd)));\n"
"USER_SET_OPTION (username, \'KEYS\', keys);\n"
"}\n"
-"--src users.sql:752\n";
+"--src users.sql:743\n";
static const char *proc20 =
-"#line 782 \"[executable]/users.sql\"\n"
+"#line 773 \"[executable]/users.sql\"\n"
" create procedure\n"
"USER_KEY_DELETE (in username varchar, in key_name varchar)\n"
"{\n"
@@ -761,10 +752,10 @@ static const char *proc20 =
"USER_SET_OPTION (username, \'KEYS\', keys);\n"
"}\n"
"}\n"
-"--src users.sql:780\n";
+"--src users.sql:771\n";
static const char *proc21 =
-"#line 802 \"[executable]/users.sql\"\n"
+"#line 793 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_KEYS_INIT (in username varchar, in opts any)\n"
"{\n"
@@ -847,10 +838,10 @@ static const char *proc21 =
"}\n"
"return 0;\n"
"}\n"
-"--src users.sql:800\n";
+"--src users.sql:791\n";
static const char *proc22 =
-"#line 886 \"[executable]/users.sql\"\n"
+"#line 877 \"[executable]/users.sql\"\n"
"create procedure\n"
"__USER_LOAD_KEY_BY_TYPE (inout key_name varchar, inout key_value any, inout key_type any, inout fmt int, inout key_pkey any, inout key_passwd any)\n"
"{\n"
@@ -882,10 +873,10 @@ static const char *proc22 =
"signal (\'22023\', \'Unknown key type\');\n"
"}\n"
"}\n"
-"--src users.sql:884\n";
+"--src users.sql:875\n";
static const char *proc23 =
-"#line 920 \"[executable]/users.sql\"\n"
+"#line 911 \"[executable]/users.sql\"\n"
" create procedure\n"
"USER_KEY_LOAD (\n"
"in key_name varchar,\n"
@@ -915,10 +906,10 @@ static const char *proc23 =
"__USER_LOAD_KEY_BY_TYPE (key_name, key_value, key_type, fmt, key_pkey, key_passwd);\n"
"USER_KEY_STORE (user, key_name, key_type, fmt, case store_pwd when 1 then key_passwd else NULL end, cert);\n"
"}\n"
-"--src users.sql:918\n";
+"--src users.sql:909\n";
static const char *proc24 =
-"#line 951 \"[executable]/users.sql\"\n"
+"#line 942 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_CERT_REGISTER (in username varchar, in cert varchar, in pwd varchar := \'\', in coding varchar := \'PKCS12\')\n"
"{\n"
@@ -951,10 +942,10 @@ static const char *proc24 =
"USER_SET_OPTION (username, \'LOGIN_CERTIFICATES\', certs);\n"
"sec_set_user_cert (username, cfp);\n"
"}\n"
-"--src users.sql:949\n";
+"--src users.sql:940\n";
static const char *proc25 =
-"#line 985 \"[executable]/users.sql\"\n"
+"#line 976 \"[executable]/users.sql\"\n"
"create procedure\n"
"USER_CERT_UNREGISTER (in username varchar, in cert varchar, in pwd varchar := \'\', in coding varchar := \'PKCS12\')\n"
"{\n"
@@ -997,10 +988,10 @@ static const char *proc25 =
"USER_SET_OPTION (username, \'LOGIN_CERTIFICATES\', new_certs);\n"
"sec_remove_user_cert (username, cfp);\n"
"}\n"
-"--src users.sql:983\n";
+"--src users.sql:974\n";
static const char *proc26 =
-"#line 1030 \"[executable]/users.sql\"\n"
+"#line 1021 \"[executable]/users.sql\"\n"
"create procedure\n"
"\"DB\".\"DBA\".\"USER_CERT_LOGIN\" (\n"
"inout user_name varchar,\n"
@@ -1061,10 +1052,10 @@ static const char *proc26 =
"}\n"
"return rc;\n"
"}\n"
-"--src users.sql:1028\n";
+"--src users.sql:1019\n";
static const char *proc27 =
-"#line 1092 \"[executable]/users.sql\"\n"
+"#line 1083 \"[executable]/users.sql\"\n"
"create procedure\n"
"SET_USER_OS_ACOUNT (in username varchar, in os_u_name varchar,\n"
"in os_u_pass varchar, in only_check_sys_user integer := 0)\n"
@@ -1081,12 +1072,12 @@ static const char *proc27 =
"concat (\'Can\'\'t login system user \', os_u_name, \'. Logon failure: unknown user name or bad password.\'),\n"
"\'SR359\');\n"
"}\n"
-"--src users.sql:1090\n";
+"--src users.sql:1081\n";
static const char *other0 =
"grant execute on \"DB.DBA.SET_USER_OS_ACOUNT\" to public\n";
static const char *proc28 =
-"#line 1113 \"[executable]/users.sql\"\n"
+"#line 1104 \"[executable]/users.sql\"\n"
"create procedure DB.DBA.__DDL_TABLE_FIND_DEPS (in tb varchar, inout deps any)\n"
"{\n"
"declare tb_key_id integer;\n"
@@ -1145,10 +1136,10 @@ static const char *proc28 =
"if (get_keyword (tb, deps, 0) = 0)\n"
"deps := vector_concat (deps, vector (tb, 1));\n"
"}\n"
-"--src users.sql:1111\n";
+"--src users.sql:1102\n";
static const char *proc29 =
-"#line 1174 \"[executable]/users.sql\"\n"
+"#line 1165 \"[executable]/users.sql\"\n"
"create procedure DB.DBA.__DDL_GET_DROP_USER_TABLES (in owner varchar)\n"
"{\n"
"declare deps any;\n"
@@ -1162,10 +1153,10 @@ static const char *proc29 =
"\n"
"return deps;\n"
"}\n"
-"--src users.sql:1172\n";
+"--src users.sql:1163\n";
static const char *proc30 =
-"#line 1190 \"[executable]/users.sql\"\n"
+"#line 1181 \"[executable]/users.sql\"\n"
"create procedure DB.DBA.__UPDATE_SOAP_USERS_ACCESS ()\n"
"{\n"
"\n"
@@ -1194,7 +1185,7 @@ static const char *proc30 =
"log_message (\'The user petshop is deleted.\');\n"
"}\n"
"}\n"
-"--src users.sql:1188\n";
+"--src users.sql:1179\n";
static const char *other1 =
"DB.DBA.__UPDATE_SOAP_USERS_ACCESS ()\n";
@@ -1213,7 +1204,7 @@ static const char *tbl0 =
")\n";
static const char *proc31 =
-"#line 1240 \"[executable]/users.sql\"\n"
+"#line 1231 \"[executable]/users.sql\"\n"
"create procedure\n"
"DB.DBA.LDAP_LOGIN (inout user_name varchar, in digest varchar, in session_random varchar)\n"
"{\n"
@@ -1291,7 +1282,7 @@ static const char *proc31 =
"LDAP_VALIDATION_FAILURE:\n"
"return 0;\n"
"}\n"
-"--src users.sql:1238\n";
+"--src users.sql:1229\n";
static const char *tbl1 =
"create table SYS_USER_WEBID (UW_U_NAME varchar, UW_WEBID varchar, primary key (UW_WEBID))\n"
@@ -1299,29 +1290,7 @@ static const char *tbl1 =
"create index SYS_USER_WEBID_NAME on SYS_USER_WEBID (UW_U_NAME) partition cluster replicated\n";
static const char *proc32 =
-"#line 1325 \"[executable]/users.sql\"\n"
-"create procedure FOAF_SSL_QRY (in gr varchar, in uri varchar)\n"
-"{\n"
-"return sprintf (\'sparql\n"
-"define input:storage \"\"\n"
-"define input:same-as \"yes\"\n"
-"prefix cert: <http://www.w3.org/ns/auth/cert#>\n"
-"prefix rsa: <http://www.w3.org/ns/auth/rsa#>\n"
-"select (str (?exp)) (str (?mod))\n"
-"from <%S>\n"
-"where\n"
-"{\n"
-"{ ?id cert:identity <%S> ; rsa:public_exponent ?exp ; rsa:modulus ?mod . }\n"
-"union\n"
-"{ ?id cert:identity <%S> ; rsa:public_exponent ?exp1 ; rsa:modulus ?mod1 . ?exp1 cert:decimal ?exp . ?mod1 cert:hex ?mod . }\n"
-"union\n"
-"{ <%S> cert:key ?key . ?key cert:exponent ?exp . ?key cert:modulus ?mod . }\n"
-"}\', gr, uri, uri, uri);\n"
-"}\n"
-"--src users.sql:1323\n";
-
-static const char *proc33 =
-"#line 1345 \"[executable]/users.sql\"\n"
+"#line 1316 \"[executable]/users.sql\"\n"
"create procedure\n"
"DB.DBA.FOAF_SSL_LOGIN (inout user_name varchar, in digest varchar, in session_random varchar)\n"
"{\n"
@@ -1362,7 +1331,17 @@ static const char *proc33 =
"stat := \'00000\';\n"
"exec (qr, stat, msg);\n"
"commit work;\n"
-"qr := FOAF_SSL_QRY (gr, agent);\n"
+"qr := sprintf (\n"
+"\'sparql define input:storage \"\" \'||\n"
+"\' prefix cert: <http://www.w3.org/ns/auth/cert#> \'||\n"
+"\' prefix rsa: <http://www.w3.org/ns/auth/rsa#> \' ||\n"
+"\' select (str (bif:coalesce (?exp_val, ?exp))) (str (bif:coalesce (?mod_val, ?mod))) \'||\n"
+"\' from <%S> \'||\n"
+"\' where { \'||\n"
+"\' ?id cert:identity <%S> ; rsa:public_exponent ?exp ; rsa:modulus ?mod . \' ||\n"
+"\' optional { ?exp cert:decimal ?exp_val . ?mod cert:hex ?mod_val . } \'||\n"
+"\' } \',\n"
+"gr, agent);\n"
"stat := \'00000\';\n"
"exec (qr, stat, msg, vector (), 0, meta, data);\n"
"if (stat = \'00000\' and length (data))\n"
@@ -1388,10 +1367,10 @@ static const char *proc33 =
"commit work;\n"
"return rc;\n"
"}\n"
-"--src users.sql:1343\n";
+"--src users.sql:1314\n";
-static const char *proc34 =
-"#line 1413 \"[executable]/users.sql\"\n"
+static const char *proc33 =
+"#line 1394 \"[executable]/users.sql\"\n"
"create procedure\n"
"USERS_GET_DEF_QUAL (in dta varchar)\n"
"{\n"
@@ -1402,7 +1381,7 @@ static const char *proc34 =
"dta := split_and_decode (dta, 0, \' \');\n"
"return (get_keyword (\'Q\', dta, \'\'));\n"
"}\n"
-"--src users.sql:1411\n";
+"--src users.sql:1392\n";
static int
sch_proc_def_exists (client_connection_t *cli, const char *proc_name, const int report)
@@ -1442,7 +1421,7 @@ sqls_define_sys (void)
ddl_std_proc (trig2, 0x0);
DEFINE_PROC ("GET_SEC_OBJECT_ID", proc0);
DEFINE_PROC ("DB.DBA.SECURITY_CL_EXEC_AND_LOG", proc1);
- DEFINE_PROC ("DB.DBA.USER_CREATE", proc2);
+ DEFINE_PROC ("USER_CREATE", proc2);
DEFINE_PROC ("USER_ROLE_CREATE", proc3);
DEFINE_PROC ("USER_ROLE_DROP", proc4);
DEFINE_PROC ("USER_CHANGE_PASSWORD", proc5);
@@ -1476,9 +1455,8 @@ sqls_define_sys (void)
ddl_ensure_table ("DB.DBA.SYS_LDAP_SERVERS", tbl0);
DEFINE_PROC ("DB.DBA.LDAP_LOGIN", proc31);
ddl_ensure_table ("DB.DBA.SYS_USER_WEBID", tbl1);
- DEFINE_PROC ("FOAF_SSL_QRY", proc32);
- DEFINE_PROC ("DB.DBA.FOAF_SSL_LOGIN", proc33);
- DEFINE_PROC ("USERS_GET_DEF_QUAL", proc34);
+ DEFINE_PROC ("DB.DBA.FOAF_SSL_LOGIN", proc32);
+ DEFINE_PROC ("USERS_GET_DEF_QUAL", proc33);
}
diff --git a/libsrc/Wi/sql_code_vad.c b/libsrc/Wi/sql_code_vad.c
index 0cfe227..b0230cd 100644
--- a/libsrc/Wi/sql_code_vad.c
+++ b/libsrc/Wi/sql_code_vad.c
@@ -859,7 +859,7 @@ static const char *proc31 =
"http (\'<TR CLASS=\"CopyrightBorder\"><TD COLSPAN=\"2\"><IMG SRC=\"/admin/images/1x1.gif\" WIDTH=\"1\" HEIGHT=\"2\" ALT=\"\"></TD></TR>\');\n"
"http (\'<TR><TD ALIGN=\"right\" COLSPAN=\"2\"><P CLASS=\"Copyright\">Virtuoso Server \');\n"
"http (sys_stat(\'st_dbms_ver\'));\n"
-"http (sprintf (\' VAD Interface (%s) - Copyright© 1998-2012 OpenLink Software.</P></TD></TR>\',\"VAD\".\"DBA\".\"VAD_VERSION\" ()));\n"
+"http (sprintf (\' VAD Interface (%s) - Copyright© 1998-2011 OpenLink Software.</P></TD></TR>\',\"VAD\".\"DBA\".\"VAD_VERSION\" ()));\n"
"http (\'</TABLE>\\n</BODY>\');\n"
"}\n"
"--src vad_misc.sql:72\n";
diff --git a/libsrc/Wi/sql_code_ws.c b/libsrc/Wi/sql_code_ws.c
index a4685ef..8bcbd90 100644
--- a/libsrc/Wi/sql_code_ws.c
+++ b/libsrc/Wi/sql_code_ws.c
@@ -3224,7 +3224,7 @@ static const char *proc63 =
"?>\n"
"</TD></TR></TABLE>\n"
"</DIV>\n"
-"<DIV class=\"foot\"><SPAN class=\"foot\">Virtuoso Universal Server <?=sys_stat(\'st_dbms_ver\')?> - Copyright© 1998-2012 OpenLink Software.</SPAN></DIV>\n"
+"<DIV class=\"foot\"><SPAN class=\"foot\">Virtuoso Universal Server <?=sys_stat(\'st_dbms_ver\')?> - Copyright© 1998-2011 OpenLink Software.</SPAN></DIV>\n"
"</BODY>\n"
"</HTML>\n"
"<?vsp\n"
@@ -3651,12 +3651,12 @@ static const char *xsl3[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: wsrp_ultim.xsl,v 1.3.2.1 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: wsrp_ultim.xsl,v 1.3 2007/03/16 09:56:12 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2007 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -3704,12 +3704,12 @@ static const char *xsl4[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: wsrp_resp.xsl,v 1.4.2.1 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: wsrp_resp.xsl,v 1.4 2009/04/09 13:22:15 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -3831,12 +3831,12 @@ static const char *xsl5[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: wsrp_interm.xsl,v 1.4.2.1 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: wsrp_interm.xsl,v 1.4 2009/04/09 13:22:15 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -3934,12 +3934,12 @@ static const char *xsl6[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: wsrp_error.xsl,v 1.4.2.1 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: wsrp_error.xsl,v 1.4 2009/04/09 13:22:15 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -4048,12 +4048,12 @@ static const char *xsl7[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: soap_sch.xsl,v 1.4.2.2 2012/03/08 12:55:35 source Exp $\n"
+" - $Id: soap_sch.xsl,v 1.4.2.1 2010/11/05 10:56:48 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -4501,12 +4501,12 @@ static const char *xsl8[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: soap_import_sch.xsl,v 1.4.2.1 2012/03/08 12:55:35 source Exp $\n"
+" - $Id: soap_import_sch.xsl,v 1.4 2009/04/09 13:22:13 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -4573,12 +4573,12 @@ static const char *xsl9[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" -\n"
-" - $Id: wsdl_expand.xsl,v 1.4.2.2 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: wsdl_expand.xsl,v 1.4.2.1 2010/11/05 10:56:48 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -4729,12 +4729,12 @@ static const char *xsl10[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" -\n"
-" - $Id: wsdl_parts.xsl,v 1.4.2.1 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: wsdl_parts.xsl,v 1.4 2009/04/09 13:22:15 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -4908,12 +4908,12 @@ static const char *xsl11[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" -\n"
-" - $Id: wsdl_import.xsl,v 1.5.2.2 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: wsdl_import.xsl,v 1.5.2.1 2010/11/05 10:56:49 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -5237,12 +5237,12 @@ static const char *xsl12[]= {
"<?xml version=\"1.0\" ?>\n"
"<!--\n"
" -\n"
-" - $Id: wsdl2rdf.xsl,v 1.1.2.2 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: wsdl2rdf.xsl,v 1.1.2.1 2009/04/16 09:48:07 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2009 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -5516,12 +5516,12 @@ static const char *xsl13[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" -\n"
-" - $Id: xmlrpc_soap.xsl,v 1.5.2.1 2012/03/08 12:55:38 source Exp $\n"
+" - $Id: xmlrpc_soap.xsl,v 1.5 2009/04/09 13:22:15 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -5678,12 +5678,12 @@ static const char *xsl14[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" -\n"
-" - $Id: soap_xmlrpc.xsl,v 1.4.2.1 2012/03/08 12:55:35 source Exp $\n"
+" - $Id: soap_xmlrpc.xsl,v 1.4 2009/04/09 13:22:13 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -5851,12 +5851,12 @@ static const char *xsl15[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" -\n"
-" - $Id: soap12_router.xsl,v 1.4.2.1 2012/03/08 12:55:35 source Exp $\n"
+" - $Id: soap12_router.xsl,v 1.4 2009/04/09 13:22:13 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" -\n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" -\n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -9166,12 +9166,12 @@ static const char *xsl23[]= {
"<?xml version=\"1.0\"?>\n"
"<!--\n"
" - \n"
-" - $Id: wsrmcall.xsl,v 1.2.2.1 2012/03/08 12:55:23 source Exp $\n"
+" - $Id: wsrmcall.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" - \n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -10410,7 +10410,7 @@ static const char *proc138 =
"stmt := sprintf (\'SELECT CAST (%s as VARCHAR)\', stmt);\n"
"tree := sql_parse (stmt);\n"
"}\n"
-"if (tree [0] <> 100 and tree[0] <> 113)\n"
+"if (tree [0] <> 100)\n"
"{\n"
"if (registry_get (\'XMLA-DML\') = \'1\')\n"
"{\n"
@@ -10423,22 +10423,6 @@ static const char *proc138 =
"res := exec (stmt, state, msg, vector (), 0, mdta, dta);\n"
"if (isinteger (dta))\n"
"dta := vector (vector (dta));\n"
-"if ((1 = length (dta)) and (1 = length (dta[0])) and (214 = __tag (dta[0][0])))\n"
-"{\n"
-"declare triples, inx any;\n"
-"triples := dict_list_keys (dta[0][0], 1);\n"
-"for (inx := 0; inx < length (triples); inx := inx + 1)\n"
-"{\n"
-"declare trip any;\n"
-"trip := triples [inx];\n"
-"trip [0] := __ro2sq (trip[0]);\n"
-"trip [1] := __ro2sq (trip[1]);\n"
-"trip [2] := __ro2sq (trip[2]);\n"
-"triples [inx] := trip;\n"
-"}\n"
-"dta := triples;\n"
-"exec_metadata (\'select \\\'\\\' as S, \\\'\\\' as P, \\\'\\\' as O any\', state, msg, mdta);\n"
-"}\n"
"\n"
"\n"
"blob_limit := atoi (xmla_get_property (\"Properties\", \'BLOBLimit\', \'0\'));\n"
@@ -10469,7 +10453,7 @@ static const char *proc138 =
"--src xmla.sql:263\n";
static const char *proc139 =
-"#line 404 \"[executable]/xmla.sql\"\n"
+"#line 388 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_not_local_dsn (in dsn varchar)\n"
"{\n"
@@ -10481,10 +10465,10 @@ static const char *proc139 =
"return 0;\n"
"return 1;\n"
"}\n"
-"--src xmla.sql:402\n";
+"--src xmla.sql:386\n";
static const char *proc140 =
-"#line 417 \"[executable]/xmla.sql\"\n"
+"#line 401 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_meta (in dta any)\n"
"{\n"
@@ -10510,7 +10494,7 @@ static const char *proc140 =
"}\n"
"return res;\n"
"}\n"
-"--src xmla.sql:415\n";
+"--src xmla.sql:399\n";
static const char *other64 =
"create method\n"
@@ -10740,8 +10724,6 @@ static const char *other70 =
"dsn := self.xmla_get_property (\'DataSourceInfo\', xmla_service_name ());\n"
"dsn := xmla_get_dsn_name (dsn);\n"
"cat := self.xmla_get_restriction (\'CATALOG_NAME\', \'%\');\n"
-"if (cat is null)\n"
-"cat := \'%\';\n"
"\n"
"if (not xmla_not_local_dsn (dsn))\n"
"{\n"
@@ -10788,7 +10770,7 @@ static const char *other70 =
"}\n";
static const char *proc141 =
-"#line 724 \"[executable]/xmla.sql\"\n"
+"#line 706 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_xsd (inout mdta any)\n"
"{\n"
@@ -10843,10 +10825,10 @@ static const char *proc141 =
"mdta := xml_tree_doc (xsd);\n"
"return;\n"
"}\n"
-"--src xmla.sql:722\n";
+"--src xmla.sql:704\n";
static const char *proc142 =
-"#line 780 \"[executable]/xmla.sql\"\n"
+"#line 762 \"[executable]/xmla.sql\"\n"
"create procedure xmla_make_struct (inout mdta any, inout dta any)\n"
"{\n"
"declare res any;\n"
@@ -10862,10 +10844,10 @@ static const char *proc142 =
"dta := res;\n"
"xmla_make_xsd (mdta);\n"
"}\n"
-"--src xmla.sql:778\n";
+"--src xmla.sql:760\n";
static const char *proc143 =
-"#line 797 \"[executable]/xmla.sql\"\n"
+"#line 779 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_element (in mdta any, in dta any)\n"
"{\n"
@@ -10880,8 +10862,6 @@ static const char *proc143 =
"aset (res, i1, mdta[i][0]);\n"
"if (mdta[i][1] = 131 and not isblob(dta[i]))\n"
"aset (res, i2, cast (dta[i] as varbinary));\n"
-"else if (mdta[i][1] = 219 and 219 <> __tag (dta[i]))\n"
-"aset (res, i2, cast (dta[i] as decimal));\n"
"else\n"
"aset (res, i2, dta[i]);\n"
"i := i + 1;\n"
@@ -10890,7 +10870,7 @@ static const char *proc143 =
"}\n"
"return res;\n"
"}\n"
-"--src xmla.sql:795\n";
+"--src xmla.sql:777\n";
static const char *other71 =
"create method xmla_dbschema_columns () for xmla_discover\n"
@@ -10904,15 +10884,6 @@ static const char *other71 =
"sch := self.xmla_get_restriction (\'TABLE_SCHEMA\', \'%\');\n"
"tb := self.xmla_get_restriction (\'TABLE_NAME\', \'%\');\n"
"col := self.xmla_get_restriction (\'COLUMN_NAME\', \'%\');\n"
-"if (cat is null)\n"
-"cat := \'%\';\n"
-"if (sch is null)\n"
-"sch := \'%\';\n"
-"if (tb is null)\n"
-"tb := \'%\';\n"
-"if (col is null)\n"
-"col := \'%\';\n"
-"\n"
"if (not xmla_not_local_dsn (dsn))\n"
"{\n"
"declare uname, passwd varchar;\n"
@@ -10921,36 +10892,36 @@ static const char *other71 =
"if (uname is null or passwd is null)\n"
"signal (\'00002\', \'Unable to process the request, because the UserName property is not set or incorrect\');\n"
"set_user_id (uname, 1, passwd);\n"
-"exec(\'select\n"
+"exec (\'select\n"
"name_part(KEY_TABLE, 0) as TABLE_CATALOG,\n"
"name_part(KEY_TABLE, 1) as TABLE_SCHEMA,\n"
"name_part(KEY_TABLE, 2) as TABLE_NAME,\n"
-"\"COLUMN\" as COLUMN_NAME,\n"
-"NULL as COLUMN_GUID,\n"
-"NULL as COLUMN_PROPID INTEGER,\n"
-"(select count(*) from DB.DBA.SYS_COLS where \"TABLE\" = KEY_TABLE and COL_ID <= c.COL_ID and \"COLUMN\" <> \'\'_IDN\'\') as ORDINAL_POSITION INTEGER,\n"
-"case when deserialize(COL_DEFAULT) is null then 0 else -1 end as COLUMN_HASDEFAULT SMALLINT,\n"
-"cast (deserialize(COL_DEFAULT) as NVARCHAR) as COLUMN_DEFAULT NVARCHAR(254),\n"
-"cast (DB.DBA.oledb_dbflags(COL_DTP, COL_NULLABLE) as integer) as COLUMN_FLAGS INTEGER,\n"
-"case COL_NULLABLE when 1 then -1 else 0 end as IS_NULLABLE SMALLINT,\n"
-"cast (DB.DBA.oledb_dbtype(COL_DTP) as integer) as DATA_TYPE SMALLINT,\n"
-"NULL as TYPE_GUID,\n"
-"cast (DB.DBA.oledb_char_max_len(COL_DTP, COL_PREC) as integer) as CHARACTER_MAXIMUM_LENGTH INTEGER,\n"
-"cast (DB.DBA.oledb_char_oct_len(COL_DTP, COL_PREC) as integer) as CHARACTER_OCTET_LENGTH INTEGER,\n"
-"cast (DB.DBA.oledb_num_prec(COL_DTP, COL_PREC) as smallint) as NUMERIC_PRECISION SMALLINT,\n"
-"cast (DB.DBA.oledb_num_scale(COL_DTP, COL_SCALE) as smallint) as NUMERIC_SCALE SMALLINT,\n"
-"cast (DB.DBA.oledb_datetime_prec(COL_DTP, COL_PREC) as integer) as DATETIME_PRECISION INTEGER,\n"
-"NULL as CHARACTER_SET_CATALOG NVARCHAR(1),\n"
-"NULL as CHARACTER_SET_SCHEMA NVARCHAR(1),\n"
-"NULL as CHARACTER_SET_NAME NVARCHAR(1),\n"
-"NULL as COLLATION_CATALOG NVARCHAR(1),\n"
-"NULL as COLLATION_SCHEMA NVARCHAR(1),\n"
-"NULL as COLLATION_NAME NVARCHAR(1),\n"
-"NULL as DOMAIN_CATALOG NVARCHAR(1),\n"
-"NULL as DOMAIN_SCHEMA NVARCHAR(1),\n"
-"NULL as DOMAIN_NAME NVARCHAR(1),\n"
-"NULL as DESCRIPTION NVARCHAR(1)\n"
-"from DB.DBA.SYS_KEYS, DB.DBA.SYS_KEY_PARTS, DB.DBA.SYS_COLS c\n"
+"\"COLUMN\" as COLUMN_NAME,\'\n"
+"|| \' NULL as COLUMN_GUID,\'\n"
+"|| \' NULL as COLUMN_PROPID INTEGER,\'\n"
+"|| \' (select count(*) from DB.DBA.SYS_COLS where \"TABLE\" = KEY_TABLE and COL_ID <= c.COL_ID and \"COLUMN\" <> \'\'_IDN\'\') as ORDINAL_POSITION INTEGER,\'\n"
+"|| \' case when deserialize(COL_DEFAULT) is null then 0 else -1 end as COLUMN_HASDEFAULT SMALLINT,\'\n"
+"|| \' cast (deserialize(COL_DEFAULT) as NVARCHAR) as COLUMN_DEFAULT NVARCHAR(254),\'\n"
+"|| \' cast (DB.DBA.oledb_dbflags(COL_DTP, COL_NULLABLE) as integer) as COLUMN_FLAGS INTEGER,\'\n"
+"|| \' case COL_NULLABLE when 1 then -1 else 0 end as IS_NULLABLE SMALLINT,\'\n"
+"|| \' cast (DB.DBA.oledb_dbtype(COL_DTP) as integer) as DATA_TYPE SMALLINT,\'\n"
+"|| \' NULL as TYPE_GUID,\'\n"
+"|| \' cast (DB.DBA.oledb_char_max_len(COL_DTP, COL_PREC) as integer) as CHARACTER_MAXIMUM_LENGTH INTEGER,\'\n"
+"|| \' cast (DB.DBA.oledb_char_oct_len(COL_DTP, COL_PREC) as integer) as CHARACTER_OCTET_LENGTH INTEGER,\'\n"
+"|| \' cast (DB.DBA.oledb_num_prec(COL_DTP, COL_PREC) as smallint) as NUMERIC_PRECISION SMALLINT,\'\n"
+"|| \' cast (DB.DBA.oledb_num_scale(COL_DTP, COL_SCALE) as smallint) as NUMERIC_SCALE SMALLINT,\'\n"
+"|| \' cast (DB.DBA.oledb_datetime_prec(COL_DTP, COL_PREC) as integer) as DATETIME_PRECISION INTEGER,\'\n"
+"|| \' NULL as CHARACTER_SET_CATALOG NVARCHAR(1),\'\n"
+"|| \' NULL as CHARACTER_SET_SCHEMA NVARCHAR(1),\'\n"
+"|| \' NULL as CHARACTER_SET_NAME NVARCHAR(1),\'\n"
+"|| \' NULL as COLLATION_CATALOG NVARCHAR(1),\'\n"
+"|| \' NULL as COLLATION_SCHEMA NVARCHAR(1),\'\n"
+"|| \' NULL as COLLATION_NAME NVARCHAR(1),\'\n"
+"|| \' NULL as DOMAIN_CATALOG NVARCHAR(1),\'\n"
+"|| \' NULL as DOMAIN_SCHEMA NVARCHAR(1),\'\n"
+"|| \' NULL as DOMAIN_NAME NVARCHAR(1),\'\n"
+"|| \' NULL as DESCRIPTION NVARCHAR(1) \' ||\n"
+"\'from DB.DBA.SYS_KEYS, DB.DBA.SYS_KEY_PARTS, DB.DBA.SYS_COLS c\n"
"where\n"
"__any_grants(KEY_TABLE) and\n"
"name_part(KEY_TABLE, 0) = ? and\n"
@@ -10988,102 +10959,53 @@ static const char *other72 =
"create method xmla_dbschema_foreign_keys () for xmla_discover\n"
"{\n"
"declare dta, mdta, stmt, state, msg any;\n"
-"declare dsn any;\n"
-"declare p_cat, p_tbl, p_sch any;\n"
-"declare f_cat, f_tbl, f_sch any;\n"
-"declare _ptbl, _ftbl varchar;\n"
+"declare dsn, cat, tb, col, sch any;\n"
+"declare uname, passwd, _tbl varchar;\n"
"\n"
"dsn := self.xmla_get_property (\'DataSourceInfo\', xmla_service_name ());\n"
"dsn := xmla_get_dsn_name (dsn);\n"
-"\n"
-"p_cat := self.xmla_get_restriction (\'PK_TABLE_CATALOG\', \'%\');\n"
-"p_sch := self.xmla_get_restriction (\'PK_TABLE_SCHEMA\', \'%\');\n"
-"p_tbl := self.xmla_get_restriction (\'PK_TABLE_NAME\', \'%\');\n"
-"f_cat := self.xmla_get_restriction (\'FK_TABLE_CATALOG\', \'%\');\n"
-"f_sch := self.xmla_get_restriction (\'FK_TABLE_SCHEMA\', \'%\');\n"
-"f_tbl := self.xmla_get_restriction (\'FK_TABLE_NAME\', \'%\');\n"
-"\n"
-"if (p_cat is null) \n"
-"{\n"
-"if (f_cat is not null)\n"
-"p_cat := f_cat;\n"
-"else\n"
-"p_cat := \'%\';\n"
-"}\n"
-"\n"
-"if (f_cat is null)\n"
-"{ \n"
-"if (p_cat is not null)\n"
-"f_cat := p_cat;\n"
-"else\n"
-"f_cat := \'%\';\n"
-"}\n"
-"\n"
-"if (p_sch is null)\n"
-"p_sch := \'%\';\n"
-"if (p_tbl is null)\n"
-"p_tbl := \'%\';\n"
-"if (f_sch is null)\n"
-"f_sch := \'%\';\n"
-"if (f_tbl is null)\n"
-"f_tbl := \'%\';\n"
-"\n"
-"p_cat := trim (p_cat, \'\"\');\n"
-"p_sch := trim (p_sch, \'\"\');\n"
-"p_tbl := trim (p_tbl, \'\"\');\n"
-"f_cat := trim (f_cat, \'\"\');\n"
-"f_sch := trim (f_sch, \'\"\');\n"
-"f_tbl := trim (f_tbl, \'\"\');\n"
-"_ptbl := p_cat || \'.\' || p_sch || \'.\' || p_tbl;\n"
-"_ftbl := f_cat || \'.\' || f_sch || \'.\' || f_tbl;\n"
-"\n"
-"if (not xmla_not_local_dsn (dsn))\n"
-"{\n"
-"declare uname, passwd varchar;\n"
+"cat := self.xmla_get_restriction (\'PK_TABLE_CATALOG\', \'%\');\n"
+"sch := self.xmla_get_restriction (\'TABLE_SCHEMA\', \'%\');\n"
+"tb := self.xmla_get_restriction (\'TABLE_NAME\', \'%\');\n"
+"cat := trim (cat, \'\"\');\n"
+"sch := trim (sch, \'\"\');\n"
+"tb := trim (tb, \'\"\');\n"
"uname := self.xmla_get_property (\'UserName\', null);\n"
"passwd := self.xmla_get_property (\'Password\', null);\n"
+"_tbl := cat || \'.\' || sch || \'.\' || tb;\n"
+"\n"
"if (uname is null or passwd is null)\n"
"signal (\'00002\', \'Unable to process the request, because the UserName property is not set or incorrect\');\n"
+"\n"
+"if (not xmla_not_local_dsn (dsn))\n"
+"{\n"
"set_user_id (uname, 1, passwd);\n"
-"exec(\'select\n"
-"name_part (PK_TABLE, 0) as PK_TABLE_CATALOG varchar (128),\n"
-"name_part (PK_TABLE, 1) as PK_TABLE_SCHEMA varchar (128),\n"
-"name_part (PK_TABLE, 2) as PK_TABLE_NAME varchar (128),\n"
-"PKCOLUMN_NAME as PK_COLUMN_NAME,\n"
-"NULL as PK_COLUMN_GUID,\n"
-"NULL as PK_COLUMN_PROPID INTEGER,\n"
-"name_part (FK_TABLE, 0) as FK_TABLE_CATALOG varchar (128),\n"
-"name_part (FK_TABLE, 1) as FK_TABLE_SCHEMA varchar (128),\n"
-"name_part (FK_TABLE, 2) as FK_TABLE_NAME varchar (128),\n"
-"FKCOLUMN_NAME as FK_COLUMN_NAME,\n"
-"NULL as FK_COLUMN_GUID,\n"
-"NULL as FK_COLUMN_PROPID INTEGER,\n"
-"(KEY_SEQ + 1) as ORDINAL INTEGER,\n"
-"(case UPDATE_RULE when 0 then \'\'NO ACTION\'\' when 1 then \'\'CASCADE\'\' when 2 then \'\'SET NULL\'\' when 3 then \'\'SET DEFAULT\'\' else NULL end) as UPDATE_RULE varchar(20),\n"
-"(case DELETE_RULE when 0 then \'\'NO ACTION\'\' when 1 then \'\'CASCADE\'\' when 2 then \'\'SET NULL\'\' when 3 then \'\'SET DEFAULT\'\' else NULL end) as DELETE_RULE varchar(20),\n"
-"PK_NAME, \n"
-"FK_NAME,\n"
-"3 as DEFERRABILITY SMALLINT\n"
-"from DB.DBA.SYS_FOREIGN_KEYS SYS_FOREIGN_KEYS\n"
-"where name_part (PK_TABLE, 0) like ?\n"
-"and name_part (PK_TABLE, 1) like ?\n"
-"and name_part (PK_TABLE, 2) like ?\n"
-"and name_part (FK_TABLE, 0) like ?\n"
-"and name_part (FK_TABLE, 1) like ?\n"
-"and name_part (FK_TABLE, 2) like ?\n"
-"order by 1, 2, 3, 7, 8, 9, 13 \'\n"
-", null, null,\n"
-"vector(p_cat, p_sch, p_tbl, f_cat, f_sch, f_tbl), 0, mdta, dta);\n"
+"if (exists (select 1 from DB.DBA.SYS_REMOTE_TABLE where RT_NAME like _tbl))\n"
+"{\n"
+"declare _dsn, r_name, _rt_name any;\n"
+"select RT_DSN, RT_REMOTE_NAME, RT_NAME into _dsn, r_name, _rt_name\n"
+"from DB.DBA.SYS_REMOTE_TABLE where RT_NAME like _tbl;\n"
+"r_name := \'%.\' || r_name;\n"
+"stmt := \'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = \'\'\' || r_name ||\n"
+"\'\'\' AND FK_TABLE = \'\'\' || _rt_name\n"
+"|| \'\'\' AND DSN = \'\'\' || xmla_get_dsn_name (_dsn) || \'\'\'\';\n"
+"}\n"
+"else\n"
+"stmt := \'SELECT name_part (PK_TABLE, 1) as PK_TABLE_SCHEMA,\n"
+"name_part (PK_TABLE, 2) as PK_TABLE_NAME, PKCOLUMN_NAME as PK_COLUMN_NAME,\n"
+"name_part (FK_TABLE, 1) as FK_TABLE_SCHEMA,\n"
+"name_part (FK_TABLE, 2) as FK_TABLE_NAME, FKCOLUMN_NAME AS FK_COLUMN_NAME,\n"
+"KEY_SEQ, UPDATE_RULE, DELETE_RULE, FK_NAME\n"
+"FROM DB.DBA.SYS_FOREIGN_KEYS WHERE PK_TABLE like \'\'\' || _tbl || \'\'\' OR FK_TABLE like \'\'\' || _tbl || \'\'\'\';\n"
"}\n"
"else\n"
"{\n"
"dsn := xmla_get_dsn_name (dsn);\n"
-"stmt := \'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = \'\'\' \n"
-"|| _ptbl || \'\'\' AND FK_TABLE = \'\'\' || _ftbl\n"
+"stmt := \'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = \'\'\' || _tbl || \'\'\' AND FK_TABLE = \'\'\' || _tbl\n"
"|| \'\'\' AND DSN = \'\'\' || dsn || \'\'\'\';\n"
-"exec (stmt, state, msg, vector (), 0, mdta, dta);\n"
"}\n"
"\n"
+"exec (stmt, state, msg, vector (), 0, mdta, dta);\n"
"xmla_make_struct (mdta, dta);\n"
"self.metadata := mdta;\n"
"return dta;\n"
@@ -11094,66 +11016,35 @@ static const char *other73 =
"{\n"
"declare state, msg, dta, mdta, stmt any;\n"
"declare dsn, cat, tb, col, sch any;\n"
-"declare _tbl varchar;\n"
+"declare uname, passwd, _tbl varchar;\n"
"\n"
"dsn := self.xmla_get_property (\'DataSourceInfo\', xmla_service_name ());\n"
"dsn := xmla_get_dsn_name (dsn);\n"
"cat := self.xmla_get_restriction (\'TABLE_CATALOG\', \'%\');\n"
"sch := self.xmla_get_restriction (\'TABLE_SCHEMA\', \'%\');\n"
"tb := self.xmla_get_restriction (\'TABLE_NAME\', \'%\');\n"
-"\n"
-"if (cat is null)\n"
-"cat := \'%\';\n"
-"if (sch is null)\n"
-"sch := \'%\';\n"
-"if (tb is null)\n"
-"tb := \'%\';\n"
-"\n"
+"uname := self.xmla_get_property (\'UserName\', null);\n"
+"passwd := self.xmla_get_property (\'Password\', null);\n"
"cat := trim (cat, \'\"\');\n"
"sch := trim (sch, \'\"\');\n"
"tb := trim (tb, \'\"\');\n"
"_tbl := cat || \'.\' || sch || \'.\' || tb;\n"
"\n"
-"if (not xmla_not_local_dsn (dsn))\n"
-"{\n"
-"declare uname, passwd varchar;\n"
-"uname := self.xmla_get_property (\'UserName\', null);\n"
-"passwd := self.xmla_get_property (\'Password\', null);\n"
"if (uname is null or passwd is null)\n"
"signal (\'00002\', \'Unable to process the request, because the UserName property is not set or incorrect\');\n"
+"\n"
+"if (not xmla_not_local_dsn (dsn))\n"
+"{\n"
"set_user_id (uname, 1, passwd);\n"
-"exec(\'select\n"
-"name_part(KEY_TABLE, 0) AS TABLE_CATALOG NVARCHAR(128),\n"
-"name_part(KEY_TABLE, 1) AS TABLE_SCHEMA NVARCHAR(128),\n"
-"name_part(KEY_TABLE, 2) AS TABLE_NAME NVARCHAR(128),\n"
-"\"COLUMN\" as COLUMN_NAME NVARCHAR(128),\n"
-"NULL as COLUMN_GUID,\n"
-"NULL as COLUMN_POPID INTEGER,\n"
-"(KP_NTH + 1) as ORDINAL,\n"
-"name_part(KEY_NAME, 2) as PK_NAME\n"
-"from DB.DBA.SYS_KEYS, DB.DBA.SYS_KEY_PARTS, DB.DBA.SYS_COLS\n"
-"where\n"
-"__any_grants(KEY_TABLE) and\n"
-"name_part(KEY_TABLE, 0) LIKE ? and\n"
-"name_part(KEY_TABLE, 1) LIKE ? and\n"
-"name_part(KEY_TABLE, 2) LIKE ? and\n"
-"KEY_IS_MAIN = 1 and\n"
-"KEY_MIGRATE_TO is null and\n"
-"KP_KEY_ID = KEY_ID and\n"
-"KP_NTH < KEY_DECL_PARTS and\n"
-"COL_ID = KP_COL and\n"
-"\"COLUMN\" <> \'\'_IDN\'\'\n"
-"order by KEY_TABLE\'\n"
-", null, null,\n"
-"vector(cat, sch, tb), 0, mdta, dta);\n"
+"stmt := sprintf (\'SELECT COLUMN_NAME FROM %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS LEFT JOIN %s.INFORMATION_SCHEMA.KEY_COLUMN_USAGE ON %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS.CONSTRAINT_NAME = %s.INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME WHERE CONSTRAINT_TYPE = \'\'PRIMARY KEY\'\' AND %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS.TABLE_NAME=\'\'%s\'\' AND %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS.TABLE_SCHEMA=\'\'%s\'\' AND %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA=\'\'%s\'\' AND %s.INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA=\'\'%s\'\' AND %s.INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA=\'\'%s\'\'\', cat, cat, cat, cat, cat, tb, cat, sch, cat, sch, cat, sch, cat, sch);\n"
"}\n"
"else\n"
"{\n"
"dsn := xmla_get_dsn_name (dsn);\n"
"stmt := \'SELECT * FROM DB.DBA.SYS_PRIMARY_KEYS_VIEW WHERE PK_TABLE = \'\'\' || _tbl || \'\'\' AND DSN = \'\'\' || dsn || \'\'\'\';\n"
-"exec (stmt, state, msg, vector (), 0, mdta, dta);\n"
"}\n"
"\n"
+"exec (stmt, state, msg, vector (), 0, mdta, dta);\n"
"xmla_make_struct (mdta, dta);\n"
"self.metadata := mdta;\n"
"return dta;\n"
@@ -11243,21 +11134,13 @@ static const char *other75 =
"create method xmla_dbschema_tables () for xmla_discover\n"
"{\n"
"declare dta, mdta any;\n"
-"declare dsn, cat, sch, tb any;\n"
+"declare dsn, cat, tb any;\n"
"\n"
"dsn := self.xmla_get_property (\'DataSourceInfo\', xmla_service_name ());\n"
"dsn := xmla_get_dsn_name (dsn);\n"
-"cat := self.xmla_get_restriction (\'TABLE_CATALOG\', \'DB\');\n"
-"sch := self.xmla_get_restriction (\'TABLE_SCHEMA\', \'%\');\n"
-"tb := self.xmla_get_restriction (\'TABLE_NAME\', \'%\');\n"
-"\n"
-"if (cat is null)\n"
-"cat := \'DB\';\n"
-"if (sch is null)\n"
-"sch := \'%\';\n"
-"if (tb is null)\n"
-"tb := \'%\';\n"
"\n"
+"tb := self.xmla_get_restriction (\'TABLE_NAME\', \'%\');\n"
+"cat := self.xmla_get_restriction (\'TABLE_CATALOG\', \'DB\');\n"
"if (not xmla_not_local_dsn (dsn))\n"
"{\n"
"declare uname, passwd varchar;\n"
@@ -11277,12 +11160,9 @@ static const char *other75 =
"NULL as DATE_MODIFIED DATE\n"
"from DB.DBA.SYS_KEYS where\n"
"__any_grants(KEY_TABLE) and\n"
-"name_part(KEY_TABLE, 0) like ? and \n"
-"name_part(KEY_TABLE, 1) like ? and\n"
-"name_part(KEY_TABLE, 2) like ?\n"
-"and KEY_IS_MAIN = 1 and \n"
-"KEY_MIGRATE_TO is null\', null, null,\n"
-"vector (cat, sch, tb), 0, mdta, dta);\n"
+"name_part(KEY_TABLE, 0) = ? and name_part(KEY_TABLE, 2) like ?\n"
+"and KEY_IS_MAIN = 1 and KEY_MIGRATE_TO is null\', null, null,\n"
+"vector (cat, tb), 0, mdta, dta);\n"
"}\n"
"else\n"
"{\n"
@@ -11305,7 +11185,7 @@ static const char *other76 =
"}\n";
static const char *proc144 =
-"#line 1240 \"[executable]/xmla.sql\"\n"
+"#line 1120 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_schs ()\n"
"{\n"
@@ -11321,11 +11201,12 @@ static const char *proc144 =
"soap_box_structure (\'TABLE_CATALOG\', \'\', \'TABLE_SCHEMA\', \'\', \'TABLE_NAME\', \'\', \'TABLE_TYPE\', \'\', \'COLUMN_NAME\', \'\')\n"
",\'\'),\n"
"vector (\'DBSCHEMA_PRIMARY_KEYS\',\n"
-"soap_box_structure (\'TABLE_CATALOG\', \'\', \'TABLE_SCHEMA\', \'\', \'TABLE_NAME\', \'\')\n"
+"soap_box_structure (\'TABLE_CATALOG\', \'\', \'TABLE_SCHEMA\', \'\', \'TABLE_NAME\', \'\', \'TABLE_TYPE\', \'\', \'COLUMN_NAME\', \'\')\n"
",\'\'),\n"
"vector (\'DBSCHEMA_FOREIGN_KEYS\',\n"
-"soap_box_structure (\'PK_TABLE_CATALOG\', \'\', \'PK_TABLE_SCHEMA\', \'\', \'PK_TABLE_NAME\', \'\',\n"
-"\'FK_TABLE_CATALOG\', \'\', \'FK_TABLE_SCHEMA\', \'\', \'FK_TABLE_NAME\', \'\')\n"
+"soap_box_structure (\'PK_TABLE_SCHEMA\', \'\', \'PK_TABLE_NAME\', \'\', \'PK_COLUMN_NAME\', \'\',\n"
+"\'FK_TABLE_SCHEMA\', \'\', \'FK_TABLE_NAME\', \'\', \'FK_COLUMN_NAME\', \'\',\n"
+"\'KEY_SEQ\', \'\', \'UPDATE_RULE\', \'\', \'DELETE_RULE\', \'\', \'FK_NAME\', \'\')\n"
",\'\'),\n"
"vector (\'DBSCHEMA_PROVIDER_TYPES\',\n"
"soap_box_structure (\'DATA_TYPE\', \'\', \'BEST_MATCH\', \'\')\n"
@@ -11350,10 +11231,10 @@ static const char *proc144 =
",\'\')\n"
");\n"
"}\n"
-"--src xmla.sql:1238\n";
+"--src xmla.sql:1118\n";
static const char *proc145 =
-"#line 1287 \"[executable]/xmla.sql\"\n"
+"#line 1168 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_props (in _dsn varchar := NULL)\n"
"{\n"
@@ -11394,20 +11275,20 @@ static const char *proc145 =
"vector (\'UserName\' , \'\', \'string\', \'R/W\', 0, \'\')\n"
");\n"
"}\n"
-"--src xmla.sql:1285\n";
+"--src xmla.sql:1166\n";
static const char *proc146 =
-"#line 1329 \"[executable]/xmla.sql\"\n"
+"#line 1210 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_dsn_name (in _dsn varchar)\n"
"{\n"
"return replace (_dsn, \'DSN=\', \'\');\n"
"return _dsn;\n"
"}\n"
-"--src xmla.sql:1327\n";
+"--src xmla.sql:1208\n";
static const char *proc147 =
-"#line 1337 \"[executable]/xmla.sql\"\n"
+"#line 1218 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_is_local_service (in _dsn varchar)\n"
"{\n"
@@ -11415,10 +11296,10 @@ static const char *proc147 =
"return 0;\n"
"return 1;\n"
"}\n"
-"--src xmla.sql:1335\n";
+"--src xmla.sql:1216\n";
static const char *proc148 =
-"#line 1346 \"[executable]/xmla.sql\"\n"
+"#line 1227 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_set_props (in properties any)\n"
"{\n"
@@ -11440,10 +11321,10 @@ static const char *proc148 =
"}\n"
"return def_prop;\n"
"}\n"
-"--src xmla.sql:1344\n";
+"--src xmla.sql:1225\n";
static const char *proc149 =
-"#line 1369 \"[executable]/xmla.sql\"\n"
+"#line 1250 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_enums ()\n"
"{\n"
@@ -11475,10 +11356,10 @@ static const char *proc149 =
"vector(\'MDXSupportLevel\',\'\',\'string\',\'None\',\'\',25)\n"
");\n"
"}\n"
-"--src xmla.sql:1367\n";
+"--src xmla.sql:1248\n";
static const char *proc150 =
-"#line 1402 \"[executable]/xmla.sql\"\n"
+"#line 1283 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_literals ()\n"
"{\n"
@@ -11502,19 +11383,19 @@ static const char *proc150 =
"vector (\'DBLITERAL_QUOTE_SUFFIX\', \'\"\', \'\', \'\', 0)\n"
");\n"
"}\n"
-"--src xmla.sql:1400\n";
+"--src xmla.sql:1281\n";
static const char *proc151 =
-"#line 1428 \"[executable]/xmla.sql\"\n"
+"#line 1309 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_service_name ()\n"
"{\n"
"return \'Local_Instance\';\n"
"}\n"
-"--src xmla.sql:1426\n";
+"--src xmla.sql:1307\n";
static const char *proc152 =
-"#line 1436 \"[executable]/xmla.sql\"\n"
+"#line 1317 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_kwds ()\n"
"{\n"
@@ -11551,10 +11432,10 @@ static const char *proc152 =
"\'VARBINARY\', \'VARCHAR\', \'VARIABLE\', \'VIEW\', \'WHEN\', \'WHENEVER\', \'WHERE\', \'WHILE\', \'WITH\', \'WORK\', \'XML\', \'XPATH\'\n"
");\n"
"}\n"
-"--src xmla.sql:1434\n";
+"--src xmla.sql:1315\n";
static const char *proc153 =
-"#line 1475 \"[executable]/xmla.sql\"\n"
+"#line 1356 \"[executable]/xmla.sql\"\n"
"create procedure DB.DBA.xmla_vdd_dbschema_tables_rpoc (in tb varchar, in cat varchar, in dsn varchar)\n"
"{\n"
"declare _all, temp any;\n"
@@ -11580,10 +11461,10 @@ static const char *proc153 =
"}\n"
"\n"
"}\n"
-"--src xmla.sql:1473\n";
+"--src xmla.sql:1354\n";
static const char *proc154 =
-"#line 1502 \"[executable]/xmla.sql\"\n"
+"#line 1383 \"[executable]/xmla.sql\"\n"
"create procedure DB.DBA.xmla_vdd_dbschema_columns_rpoc (in tb varchar, in cat varchar, in col varchar, in dsn varchar)\n"
"{\n"
"declare _all any;\n"
@@ -11618,7 +11499,7 @@ static const char *proc154 =
"cast (_line[11] as nvarchar));\n"
"}\n"
"}\n"
-"--src xmla.sql:1500\n";
+"--src xmla.sql:1381\n";
static const char *view0 =
"create procedure view XMLA_VDD_DBSCHEMA_COLUMNS as DB.DBA.xmla_vdd_dbschema_columns_rpoc (cat, tb, col, dsn)\n"
@@ -11643,7 +11524,7 @@ static const char *view2 =
"GUID varchar, TYPELIB varchar, VERSION varchar, IS_LONG int, BEST_MATCH int, IS_FIXEDLENGTH int)\n";
static const char *proc155 =
-"#line 1566 \"[executable]/xmla.sql\"\n"
+"#line 1447 \"[executable]/xmla.sql\"\n"
"create procedure xmla_vdd_dbschema_provider_types_rpoc (in tb int, in cat int, in dsn varchar)\n"
"{\n"
"declare _all any;\n"
@@ -11672,10 +11553,10 @@ static const char *proc155 =
"NULL, NULL, NULL, NULL, NULL);\n"
"}\n"
"}\n"
-"--src xmla.sql:1564\n";
+"--src xmla.sql:1445\n";
static const char *proc156 =
-"#line 1597 \"[executable]/xmla.sql\"\n"
+"#line 1478 \"[executable]/xmla.sql\"\n"
"create procedure mxla_fk_pk_check (in dsn varchar, inout stmt varchar, inout mdta any, inout dta any)\n"
"{\n"
"declare state, msg any;\n"
@@ -11696,10 +11577,10 @@ static const char *proc156 =
"\n"
"exec (stmt, state, msg, vector (), 0, mdta, dta);\n"
"}\n"
-"--src xmla.sql:1595\n";
+"--src xmla.sql:1476\n";
static const char *proc157 =
-"#line 1620 \"[executable]/xmla.sql\"\n"
+"#line 1501 \"[executable]/xmla.sql\"\n"
"create procedure mxla_fk_pk_check_local (inout stmt varchar, inout mdta any, inout dta any)\n"
"{\n"
"declare _new, l_name, _schema, _catalog, _name, idx, _line any;\n"
@@ -11756,7 +11637,7 @@ static const char *proc157 =
"\n"
"}\n"
"}\n"
-"--src xmla.sql:1618\n";
+"--src xmla.sql:1499\n";
static const char *view3 =
"create procedure view DB.DBA.SYS_FOREIGN_KEYS_VIEW as DB.DBA.\"XMLA_GET_FK\" (PK_TABLE, FK_TABLE, DSN)\n"
@@ -11776,7 +11657,7 @@ static const char *view4 =
"(COLUMN_NAME VARCHAR)\n";
static const char *proc158 =
-"#line 1701 \"[executable]/xmla.sql\"\n"
+"#line 1582 \"[executable]/xmla.sql\"\n"
"create procedure DB.DBA.\"XMLA_GET_PK\" (in _pk_table varchar, in dsn varchar)\n"
"{\n"
"declare COLUMN_NAME VARCHAR;\n"
@@ -11800,10 +11681,10 @@ static const char *proc158 =
"result (_pk_tables[3]);\n"
"}\n"
"}\n"
-"--src xmla.sql:1699\n";
+"--src xmla.sql:1580\n";
static const char *proc159 =
-"#line 1726 \"[executable]/xmla.sql\"\n"
+"#line 1607 \"[executable]/xmla.sql\"\n"
"create procedure DB.DBA.\"XMLA_GET_FK\" (in _pk_table varchar, in _fk_table varchar, in dsn varchar)\n"
"{\n"
"declare PK_TABLE_SCHEMA VARCHAR;\n"
@@ -11867,17 +11748,17 @@ static const char *proc159 =
"_fk_tables[8], _fk_tables[9], _fk_tables[10], _fk_tables[11]);\n"
"}\n"
"}\n"
-"--src xmla.sql:1724\n";
+"--src xmla.sql:1605\n";
static const char *proc160 =
-"#line 1791 \"[executable]/xmla.sql\"\n"
+"#line 1672 \"[executable]/xmla.sql\"\n"
"create procedure XMLA_USER_INIT ()\n"
"{\n"
"if (exists (select 1 from \"DB\".\"DBA\".\"SYS_USERS\" where U_NAME = \'XMLA\'))\n"
"return;\n"
"DB.DBA.USER_CREATE (\'XMLA\', uuid(), vector (\'DISABLED\', 1, \'LOGIN_QUALIFIER\', \'XMLA\'));\n"
"}\n"
-"--src xmla.sql:1789\n";
+"--src xmla.sql:1670\n";
static const char *other77 =
"XMLA_USER_INIT ()\n";
@@ -11915,7 +11796,7 @@ static const char *other92 =
static const char *other93 =
"grant all privileges on DB.DBA.\"SYS_PRIMARY_KEYS_VIEW\" to \"XMLA\"\n";
static const char *proc161 =
-"#line 1852 \"[executable]/xmla.sql\"\n"
+"#line 1733 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_cursor_stmt_change (in _props any, inout _stmt varchar)\n"
"{\n"
@@ -11966,10 +11847,10 @@ static const char *proc161 =
"_stmt := replace (_stmt, _left_str, new_stmpt, 1);\n"
"\n"
"}\n"
-"--src xmla.sql:1850\n";
+"--src xmla.sql:1731\n";
static const char *proc162 =
-"#line 1904 \"[executable]/xmla.sql\"\n"
+"#line 1785 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_cursors_state (in _props any, inout _dta any, in stmt any)\n"
"{\n"
@@ -12052,10 +11933,10 @@ static const char *proc162 =
"_dta := _new_dta;\n"
"}\n"
"}\n"
-"--src xmla.sql:1902\n";
+"--src xmla.sql:1783\n";
static const char *proc163 =
-"#line 1989 \"[executable]/xmla.sql\"\n"
+"#line 1870 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_make_skip (in _skip any, in _add int, in _dir int)\n"
"{\n"
@@ -12082,19 +11963,19 @@ static const char *proc163 =
"\n"
"return ret;\n"
"}\n"
-"--src xmla.sql:1987\n";
+"--src xmla.sql:1868\n";
static const char *proc164 =
-"#line 2017 \"[executable]/xmla.sql\"\n"
+"#line 1898 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_version ()\n"
"{\n"
"return \'1.01\';\n"
"}\n"
-"--src xmla.sql:2015\n";
+"--src xmla.sql:1896\n";
static const char *proc165 =
-"#line 2025 \"[executable]/xmla.sql\"\n"
+"#line 1906 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_format_mdta (inout mdta any)\n"
"{\n"
@@ -12113,10 +11994,10 @@ static const char *proc165 =
"\n"
"aset (mdta, 0, temp);\n"
"}\n"
-"--src xmla.sql:2023\n";
+"--src xmla.sql:1904\n";
static const char *proc166 =
-"#line 2046 \"[executable]/xmla.sql\"\n"
+"#line 1927 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_get_rows_from_stmt (in stmt any)\n"
"{\n"
@@ -12141,10 +12022,10 @@ static const char *proc166 =
"\n"
"return dta[0][0];\n"
"}\n"
-"--src xmla.sql:2044\n";
+"--src xmla.sql:1925\n";
static const char *proc167 =
-"#line 2073 \"[executable]/xmla.sql\"\n"
+"#line 1954 \"[executable]/xmla.sql\"\n"
"create procedure\n"
"xmla_sparql_result (inout mdta any, inout dta any, in stmt any)\n"
"{\n"
@@ -12174,7 +12055,7 @@ static const char *proc167 =
"}\n"
"}\n"
"}\n"
-"--src xmla.sql:2071\n";
+"--src xmla.sql:1952\n";
/* openxml.sql */
@@ -18896,12 +18777,12 @@ static const char *xsl31[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_add_locations.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $\n"
+" - $Id: vspx_add_locations.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" - \n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -18958,12 +18839,12 @@ static const char *xsl32[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_expand.xsl,v 1.3.2.1 2012/03/08 12:55:22 source Exp $\n"
+" - $Id: vspx_expand.xsl,v 1.3 2006/08/15 22:09:21 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" - \n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -19464,12 +19345,12 @@ static const char *xsl33[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_pre_xsd.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $\n"
+" - $Id: vspx_pre_xsd.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" - \n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -19570,12 +19451,12 @@ static const char *xsl34[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_pre_sql.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $\n"
+" - $Id: vspx_pre_sql.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" - \n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -19786,12 +19667,12 @@ static const char *xsl35[]= {
"<?xml version='1.0'?>\n"
"<!--\n"
" - \n"
-" - $Id: vspx_log_format.xsl,v 1.2.2.1 2012/03/08 12:55:22 source Exp $\n"
+" - $Id: vspx_log_format.xsl,v 1.2 2006/08/15 22:09:21 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" - \n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -19900,7 +19781,7 @@ static const char *xsd36[]= {
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" - \n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -23104,12 +22985,12 @@ static const char *xsl37[]= {
"]>\n"
"<!--\n"
" - \n"
-" - $Id: vspx.xsl,v 1.7.2.2 2012/03/08 12:55:22 source Exp $\n"
+" - $Id: vspx.xsl,v 1.7 2008/03/13 13:52:04 source Exp $\n"
" -\n"
" - This file is part of the OpenLink Software Virtuoso Open-Source (VOS)\n"
" - project.\n"
" - \n"
-" - Copyright (C) 1998-2012 OpenLink Software\n"
+" - Copyright (C) 1998-2006 OpenLink Software\n"
" - \n"
" - This project is free software; you can redistribute it and/or modify it\n"
" - under the terms of the GNU General Public License as published by the\n"
@@ -26251,7 +26132,7 @@ static const char *xsl37[]= {
" while (inx < len) {\n"
" declare ctrl vspx_control;\n"
" ctrl := node.vc_children[inx];\n"
-" if (ctrl is not null and udt_instance_of (ctrl, fix_identifier_case ('vspx_button'))) {\n"
+" if (ctrl and udt_instance_of (ctrl, fix_identifier_case ('vspx_button'))) {\n"
" declare btn vspx_button;\n"
" btn := node.vc_children[inx];\n"
" btn.bt_open_img := sel_img;\n"
diff --git a/libsrc/Wi/sql_to_c.awk b/libsrc/Wi/sql_to_c.awk
index 3f20456..d524703 100644
--- a/libsrc/Wi/sql_to_c.awk
+++ b/libsrc/Wi/sql_to_c.awk
@@ -1,14 +1,14 @@
#
# sql_to_c.awk
#
-# $Id: sql_to_c.awk,v 1.6.2.9 2012/03/08 13:52:41 source Exp $
+# $Id: sql_to_c.awk,v 1.6.2.7 2011/09/12 20:08:51 source Exp $
#
# Embeds SQL code into a C file
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -343,7 +343,13 @@ BEGIN {
# does escape the symbols
fun = $0
- gsub ("\\\\", "&&", fun)
+ q = "\\\\"
+ if (PROCINFO["version"] ~ /^4/)
+ gsub ( q, q q, fun)
+ else
+ gsub ( q, q, fun)
+
+ #WAS: gsub ( /\\/, "\\\\", fun)
# remove whitespace except when there is just a semicolon
if ((in_xsl_mode == 0) && (in_xsd_mode == 0))
diff --git a/libsrc/Wi/sqlbif.c b/libsrc/Wi/sqlbif.c
index b6f2b4f..3258681 100644
--- a/libsrc/Wi/sqlbif.c
+++ b/libsrc/Wi/sqlbif.c
@@ -1,14 +1,14 @@
/*
* sqlbif.c
*
- * $Id: sqlbif.c,v 1.122.2.79 2012/03/14 00:42:48 source Exp $
+ * $Id: sqlbif.c,v 1.122.2.70 2011/10/25 19:36:36 source Exp $
*
* SQL Built In Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -79,8 +79,6 @@ extern "C" {
#include "virtpwd.h"
#include "rdf_core.h"
#include "shcompo.h"
-#include "http_client.h" /* for MD5Init and the like */
-#include "sparql.h"
#define box_bool(n) ((caddr_t)((ptrlong)((n) ? 1 : 0)))
@@ -115,6 +113,7 @@ extern void bif_udt_init(void);
extern void bif_xmlenc_init(void);
extern void tp_bif_init(void);
extern void bif_json_init (void);
+extern void col_init ();
extern void geo_init ();
#ifdef _KERBEROS
extern void bif_kerberos_init (void);
@@ -760,7 +759,7 @@ bif_array_of_pointer_arg (caddr_t * qst, state_slot_t ** args, int nth, const ch
dtp_t dtp = DV_TYPE_OF (arg);
if (dtp != DV_ARRAY_OF_POINTER)
sqlr_new_error ("22023", "SR014",
- "Function %s needs a generic array as argument %d, not an arg of type %s (%d)",
+ "Function %s needs a generic array as argument %d, not an arg of type %s (%d)",
func, nth + 1, dv_type_title (dtp), dtp);
return (caddr_t *)arg;
}
@@ -918,12 +917,12 @@ bif_dbg_obj_princ (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t val = qst_get (qst, arg);
if (DV_IRI_ID == DV_TYPE_OF (val))
{
- iri_id_t iid = unbox_iri_id (val);
- if ((0L != iid) && ((min_bnode_iri_id () > iid) || (min_named_bnode_iri_id () < iid)))
- {
- caddr_t iri = key_id_to_iri ((query_instance_t *) qst, iid);
- dk_set_push (&iri_labels, iri);
- }
+ iri_id_t iid = unbox_iri_id (val);
+ if ((0L != iid) && ((min_bnode_iri_id () > iid) || (min_named_bnode_iri_id () < iid)))
+ {
+ caddr_t iri = key_id_to_iri ((query_instance_t *) qst, iid);
+ dk_set_push (&iri_labels, iri);
+ }
}
}
END_DO_BOX_FAST_REV;
@@ -945,28 +944,28 @@ bif_dbg_obj_princ (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
printf ("%s", val);
else
{
- dbg_print_box (val, stdout);
- if (DV_IRI_ID == DV_TYPE_OF (val))
- {
- iri_id_t iid = unbox_iri_id (val);
- if (0L == iid)
- goto done_iid; /* see below */
- if ((min_bnode_iri_id () <= iid) && (min_named_bnode_iri_id () > iid))
- {
- caddr_t iri = BNODE_IID_TO_LABEL (iid);
- printf ("=%s", iri);
- dk_free_box (iri);
- }
- else
- {
- caddr_t iri = dk_set_pop (&iri_labels);
- if (!iri)
- goto done_iid; /* see below */
- printf ("=<%s>", iri);
- dk_free_box (iri);
- }
-done_iid: ;
- }
+ dbg_print_box (val, stdout);
+ if (DV_IRI_ID == DV_TYPE_OF (val))
+ {
+ iri_id_t iid = unbox_iri_id (val);
+ if (0L == iid)
+ goto done_iid; /* see below */
+ if ((min_bnode_iri_id () <= iid) && (min_named_bnode_iri_id () > iid))
+ {
+ caddr_t iri = BNODE_IID_TO_LABEL (iid);
+ printf ("=%s", iri);
+ dk_free_box (iri);
+ }
+ else
+ {
+ caddr_t iri = dk_set_pop (&iri_labels);
+ if (!iri)
+ goto done_iid; /* see below */
+ printf ("=<%s>", iri);
+ dk_free_box (iri);
+ }
+ done_iid:;
+ }
}
prev_is_strg_const = this_is_strg_const;
}
@@ -1547,7 +1546,7 @@ bif_type_set (bif_type_t *bt, state_slot_t *ret, state_slot_t **params)
return;
if (bt->bt_func)
{
- long dt = 0, sc_ret = 0, sc_prec = 0;
+ long dt, sc_ret, sc_prec;
bt->bt_func (params, &dt, &sc_prec, &sc_ret, (caddr_t *) &ret->ssl_sqt.sqt_collation);
ret->ssl_prec = (uint32) sc_prec;
ret->ssl_scale = (char) sc_ret;
@@ -1811,45 +1810,6 @@ again:
caddr_t
-bif_aref_or_default (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t arr = bif_array_or_strses_arg (qst, args, 0, "aref_or_default");
- int inx, n_elems;
- dtp_t dtp;
- int argcount = BOX_ELEMENTS (args);
- int idxcount = argcount - 2;
- int idxctr = 1;
- if (idxcount <= 0)
- sqlr_new_error ("22003", "SR020", "aref_or_default() requires 3 or more arguments, but only %d passed.", argcount);
- dtp = DV_TYPE_OF (arr);
-
-again:
- inx = (long) bif_long_arg (qst, args, idxctr, "aref_or_default");
- n_elems = (box_length (arr) / get_itemsize_of_vector (dtp));
- if ((inx >= n_elems && DV_STRING_SESSION != box_tag(arr)) || (inx < 0)) /* Catch negative indexes also! */
- goto use_default; /* see below */
- if (idxctr == idxcount)
- return (gen_aref (arr, inx, dtp, "aref_or_default"));
- if (IS_NONLEAF_DTP (dtp))
- {
- arr = ((caddr_t *)arr)[inx];
- dtp = DV_TYPE_OF (arr);
- if (dtp == DV_SHORT_STRING || dtp == DV_LONG_STRING || dtp == DV_UNAME
- || IS_NONLEAF_DTP(dtp)
- || dtp == DV_ARRAY_OF_LONG || dtp == DV_ARRAY_OF_FLOAT
- || dtp == DV_ARRAY_OF_DOUBLE || IS_WIDE_STRING_DTP (dtp)
- || dtp == DV_STRING_SESSION)
- {
- idxctr ++;
- goto again; /* see above */
- }
- }
-use_default:
- return box_copy_tree (bif_arg (qst, args, argcount-1, "aref_or_default"));
-}
-
-
-caddr_t
bif_aref_set_0 (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t *arr = (caddr_t *) bif_array_arg (qst, args, 0, "aref_set_0");
@@ -2099,7 +2059,7 @@ bif_make_array (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return an empty string.
*/
-dk_session_t *
+static dk_session_t *
strses_subseq (dk_session_t *ses, long from, long to)
{
dk_session_t *out = strses_allocate ();
@@ -2290,7 +2250,7 @@ bif_substr (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
if (from > to)
sqlr_new_error ("22011", "SR026",
"substr: Bad string subrange: from=%ld, to=%ld, len=%ld.",
- (long)from+1, (long)to+1, (long)len);
+ (long)from, (long)to, (long)len);
res = dk_alloc_box (((to - from) + 1) * sizeof_char, (dtp_t)(IS_WIDE_STRING_DTP (dtp1) ? DV_WIDE : DV_LONG_STRING));
if (dtp1 == DV_STRING_SESSION)
@@ -2649,7 +2609,7 @@ bif_trim (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t to_free = NULL;
if (NULL == str)
- return (NEW_DB_NULL);
+ return (NEW_DB_NULL);
if (n_args > 1)
skip_str_orig = bif_string_or_wide_or_null_arg (qst, args, 1, "trim");
@@ -2658,16 +2618,16 @@ bif_trim (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
else if (IS_WIDE_STRING_DTP (dtp1) && !DV_WIDESTRINGP (skip_str_orig))
{
to_free = (caddr_t) box_narrow_string_as_wide ((unsigned char *) skip_str_orig, NULL, 0, QST_CHARSET (qst), err_ret, 1);
- if (!to_free)
- return NULL;
- skip_str = to_free;
- }
+ if (!to_free)
+ return NULL;
+ skip_str = to_free;
+ }
else if (!IS_WIDE_STRING_DTP (dtp1) && DV_WIDESTRINGP (skip_str_orig))
- {
+ {
to_free = box_wide_string_as_narrow (skip_str_orig, NULL, 0, QST_CHARSET (qst));
- skip_str = to_free;
- }
- else
+ skip_str = to_free;
+ }
+ else
skip_str = skip_str_orig;
len = (box_length (str) / sizeof_char - 1); /* box_length returns a length + 1 */
@@ -2769,7 +2729,7 @@ bif_concatenate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
memcpy (res + fill * sizeof_char, a, alen * sizeof_char);
}
fill += alen;
- }
+ }
#ifdef DEBUG
if (fill != len)
GPF_T;
@@ -4212,7 +4172,7 @@ retry_unrdf:
if (1 != sctr)
goto POP_format_mismatch_mid_field;
dk_set_push (&res, box_float (f));
- break;
+ break;
}
case DV_DOUBLE_FLOAT:
default:
@@ -6172,9 +6132,9 @@ bif_max_notnull (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
coll = args[0]->ssl_sqt.sqt_collation;
best = a;
- notnull_found = 1;
}
- else if (DVC_GREATER == cmp_boxes (a, best, coll, coll))
+ notnull_found = 1;
+ if (DVC_GREATER == cmp_boxes (a, best, coll, coll))
best = a;
}
if (notnull_found)
@@ -6199,9 +6159,9 @@ bif_min_notnull (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
coll = args[0]->ssl_sqt.sqt_collation;
best = a;
- notnull_found = 1;
}
- else if (DVC_LESS == cmp_boxes (a, best, coll, coll))
+ notnull_found = 1;
+ if (DVC_LESS == cmp_boxes (a, best, coll, coll))
best = a;
}
if (notnull_found)
@@ -6606,7 +6566,7 @@ bif_sign (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t
bif_abs (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
- caddr_t arg = bif_arg_unrdf (qst, args, 0, "abs");
+ caddr_t arg = bif_arg (qst, args, 0, "abs");
dtp_t dtp = DV_TYPE_OF (arg);
switch (dtp)
{
@@ -6778,13 +6738,6 @@ sqlbif_rnd (int32* seed)
return seed[0];
}
-double
-sqlbif_rnd_double (int32* seed, double upper_limit)
-{
- int32 tmpres = sqlbif_rnd (&rnd_seed);
- return (tmpres * upper_limit) / (double)(RNG_M);
-}
-
caddr_t
bif_randomize (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
@@ -7721,12 +7674,12 @@ bif_split_and_decode (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return (NEW_DB_NULL);
} /* NULL for NULL, ashes to ashes. */
- end_ptr = (unsigned char *)(inputs + inputs_len);
+ end_ptr = (inputs + inputs_len);
/* First count the number of occurrences of ampersands in inputs */
{
occurrences = 1; /* Always at least one element. */
- ptr = (unsigned char *)inputs;
+ ptr = inputs;
while ((ptr < end_ptr)) /* (ptr = strchr(ptr,sep1)) */
{
if (sep1 == *ptr++)
@@ -7755,7 +7708,7 @@ bif_split_and_decode (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
/* Start scanning the inputs string again. */
{
- ptr = (unsigned char *)inputs;
+ ptr = inputs;
reading_value = 0;
counting_only = 1;
vec_inx = 0;
@@ -8773,7 +8726,7 @@ bif_mem_all_in_use (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
FILE *fd = dp ? fopen (dp, "at") : NULL;
dbg_malstats (fd ? fd : stderr, DBG_MALSTATS_ALL);
if (fd)
- fclose (fd);
+ fclose (fd);
return NULL;
}
@@ -8785,7 +8738,7 @@ bif_mem_new_in_use (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
FILE *fd = dp ? fopen (dp, "at") : NULL;
dbg_malstats (fd ? fd : stderr, DBG_MALSTATS_NEW);
if (fd)
- fclose (fd);
+ fclose (fd);
return NULL;
}
@@ -8797,7 +8750,7 @@ bif_mem_leaks (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
FILE *fd = dp ? fopen (dp, "at") : NULL;
dbg_malstats (fd ? fd : stderr, DBG_MALSTATS_LEAKS);
if (fd)
- fclose (fd);
+ fclose (fd);
return NULL;
}
@@ -9167,7 +9120,7 @@ do_long_int:
xe_sqlnarrow_string_value ((xml_entity_t *)(data), &tmp_res, DV_LONG_STRING);
val = safe_atoi (tmp_res, &err);
dk_free_box (tmp_res);
- break;
+ break;
}
#endif
case DV_NUMERIC:
@@ -9183,7 +9136,7 @@ do_long_int:
char narrow [512];
box_wide_string_as_narrow (data, narrow, 512, qst ? QST_CHARSET (qst) : NULL);
val = safe_atoi (narrow, &err);
- break;
+ break;
}
default:
goto cvt_error;
@@ -9221,16 +9174,16 @@ do_single_float:
}
case DV_WIDE:
case DV_LONG_WIDE:
- {
- char narrow [512];
+ {
+ char narrow [512];
double d;
err = NULL;
- box_wide_string_as_narrow (data, narrow, 512, qst ? QST_CHARSET (qst) : NULL);
+ box_wide_string_as_narrow (data, narrow, 512, qst ? QST_CHARSET (qst) : NULL);
d = safe_atof (narrow, &err);
if (err)
goto inner_error;
return (box_float ((float)d));
- }
+ }
default:
goto cvt_error;
}
@@ -9254,7 +9207,7 @@ do_double_float:
if (NULL == start)
goto cvt_error;
if (1 == sscanf (start, "%lf", &d))
- return (box_double (d));
+ return (box_double (d));
goto cvt_error;
}
case DV_NUMERIC:
@@ -9300,43 +9253,43 @@ do_datetime:
caddr_t res;
switch (arg_dtp)
{
- case DV_STRING:
- res = string_to_dt_box (data);
+ case DV_STRING:
+ res = string_to_dt_box (data);
break;
- case DV_DATETIME:
- case DV_DATE:
- case DV_TIME:
- res = box_copy_tree (data);
+ case DV_DATETIME:
+ case DV_DATE:
+ case DV_TIME:
+ res = box_copy_tree (data);
break;
- case DV_BIN:
- if (dt_validate (data))
- sqlr_new_error ("22003", "SR351",
- "Invalid data supplied in VARBINARY -> DATETIME conversion");
- res = box_copy (data);
- box_tag_modify (res, DV_DATETIME);
+ case DV_BIN:
+ if (dt_validate (data))
+ sqlr_new_error ("22003", "SR351",
+ "Invalid data supplied in VARBINARY -> DATETIME conversion");
+ res = box_copy (data);
+ box_tag_modify (res, DV_DATETIME);
break;
case DV_WIDE:
- case DV_LONG_WIDE:
- {
- caddr_t narrow = box_wide_string_as_narrow (data, NULL, 0, qst ? QST_CHARSET (qst) : NULL);
- res = string_to_dt_box (narrow);
- dk_free_box (narrow);
+ case DV_LONG_WIDE:
+ {
+ caddr_t narrow = box_wide_string_as_narrow (data, NULL, 0, qst ? QST_CHARSET (qst) : NULL);
+ res = string_to_dt_box (narrow);
+ dk_free_box (narrow);
break;
}
default:
goto cvt_error;
}
- if (ST_P (dtp, DV_DATE))
- {
- dt_date_round (res);
- }
- else if (ST_P (dtp, DV_DATE) || ST_P (dtp, DV_TIME))
- {
- DT_SET_FRACTION (res, 0);
- }
- SET_DT_TYPE_BY_DTP (res, dtp->type);
- return res;
- }
+ if (ST_P (dtp, DV_DATE))
+ {
+ dt_date_round (res);
+ }
+ else if (ST_P (dtp, DV_DATE) || ST_P (dtp, DV_TIME))
+ {
+ DT_SET_FRACTION (res, 0);
+ }
+ SET_DT_TYPE_BY_DTP (res, dtp->type);
+ return res;
+ }
do_time:
{
@@ -9442,11 +9395,11 @@ do_wide:
err = NULL;
switch (arg_dtp)
{
- case DV_STRING:
- ret = box_narrow_string_as_wide ((unsigned char *) data, NULL, 0, qst ? QST_CHARSET (qst) : NULL, &err, 1);
- if (err)
+ case DV_STRING:
+ ret = box_narrow_string_as_wide ((unsigned char *) data, NULL, 0, qst ? QST_CHARSET (qst) : NULL, &err, 1);
+ if (err)
goto inner_error;
- return ret;
+ return ret;
case DV_UNAME:
{
unsigned char *utf8 = (unsigned char *) data;
@@ -9522,7 +9475,7 @@ do_wide:
caddr_t wide_ret = box_narrow_string_as_wide ((unsigned char *) ret,
NULL, 0, qst ? QST_CHARSET (qst) : NULL, &err, 1);
dk_free_box (ret);
- if (err)
+ if (err)
goto inner_error;
return wide_ret;
}
@@ -9548,6 +9501,7 @@ inner_error:
cvt_error:
if (IS_BOX_POINTER (qst) && (((query_instance_t *)qst)->qi_no_cast_error))
return NEW_DB_NULL;
+signal_error:
#ifdef DEBUG
sqlr_new_error ("22023", (IS_BOX_POINTER (qst) && (((query_instance_t *)qst)->qi_no_cast_error)) ? "sR066" : "SR066", "Unsupported case in CONVERT (%s -> %s)", dv_type_title(arg_dtp), dv_type_title((int) (dtp->type)));
#else
@@ -10559,7 +10513,7 @@ bif_key_replay_insert (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
rd.rd_make_ins_rbe = 1;
ITC_FAIL (it)
{
- key_bm_insert (it, &rd);
+ key_bm_insert (it, &rd);
}
ITC_FAILED
{
@@ -10731,8 +10685,7 @@ static caddr_t
bif_user_set_password (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t u_name = bif_string_arg (qst, args, 0, "user_set_password");
- caddr_t u_pwd = bif_string_or_wide_or_uname_arg (qst, args, 1, "user_set_password");
- caddr_t u_pwd_to_delete = NULL;
+ caddr_t u_pwd = bif_string_arg (qst, args, 1, "user_set_password");
query_instance_t *qi = (query_instance_t *) (qst);
user_t *usr = sec_name_to_user (u_name);
@@ -10744,21 +10697,8 @@ bif_user_set_password (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
if (!usr)
sqlr_new_error ("42000", "SR286", "The user %.50s does not exist", u_name);
- if ((DV_WIDE == DV_TYPE_OF (u_pwd)) ? (0 == ((wchar_t *)u_pwd)[0]) : ('\0' == u_pwd[0]))
+ if (strlen (u_pwd) == 0)
sqlr_new_error ("42000", "SR287", "The new password for %.50s cannot be empty", usr->usr_name);
- switch (DV_TYPE_OF (u_pwd))
- {
- case DV_WIDE:
- u_pwd_to_delete = u_pwd = box_wide_as_utf8_char (u_pwd, box_length (u_pwd) / sizeof (wchar_t) - 1, DV_SHORT_STRING);
- break;
- case DV_UNAME:
- u_pwd_to_delete = u_pwd = box_dv_short_string (u_pwd);
- break;
- default:
- if (strlen (u_pwd) != (box_length (u_pwd) - 1))
- sqlr_new_error ("42000", "SR287", "The new password for %.50s cannot contain zero bytes", usr->usr_name);
- break;
- }
qi->qi_client = bootstrap_cli;
/*qi->qi_trx->lt_replicate = REPL_NO_LOG; */
QR_RESET_CTX_T (qi->qi_thread)
@@ -10767,7 +10707,6 @@ bif_user_set_password (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
}
QR_RESET_CODE
{
- dk_free_box (u_pwd_to_delete);
POP_QR_RESET;
/*qi->qi_trx->lt_replicate = old_log; */
qi->qi_client = cli;
@@ -10786,7 +10725,6 @@ bif_user_set_password (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
log_array[5] = usr->usr_data ? box_string (usr->usr_data) : dk_alloc_box (0, DV_DB_NULL);
log_text_array (qi->qi_trx, (caddr_t) log_array);
dk_free_tree ((box_t) log_array);
- dk_free_box (u_pwd_to_delete);
return NULL;
}
@@ -11431,8 +11369,6 @@ bif_txn_killall (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
int lte = n >= 1 ? bif_long_arg (qst, args, 0, "txn_killall") : LTE_TIMEOUT;
query_instance_t *qi = (query_instance_t *) qst;
sec_check_dba (qi, "txn_killall");
- if (wi_inst.wi_is_checkpoint_pending)
- sqlr_new_error ("37000", ".....", "Can not kill during pending checkpoint");
IO_SECT (qi)
{
IN_TXN;
@@ -12069,20 +12005,20 @@ bif_exec_error (caddr_t * qst, state_slot_t ** args, caddr_t err, dk_set_t warni
qr_free (qr);
sqlr_resignal (err);
}
- if (IS_POINTER(err))
+ if (IS_POINTER (err))
{
qst_set (qst, args[1], ERR_STATE (err));
if (ssl_is_settable (args[2]))
qst_set (qst, args[2], ERR_MESSAGE (err));
- dk_free_box(err);
+ dk_free_box (err);
}
else
{
- qst_set (qst, args[1], IS_POINTER(err) ? ERR_STATE (err) : box_dv_short_string("01W01"));
+ qst_set (qst, args[1], IS_POINTER (err) ? ERR_STATE (err) : box_dv_short_string ("01W01"));
if (ssl_is_settable (args[2]))
{
- snprintf (buf, sizeof (buf), "No WHENEVER statement provided for SQLCODE %d", (int)(ptrlong)(err));
- qst_set (qst, args[2], box_dv_short_string(buf));
+ snprintf (buf, sizeof (buf), "No WHENEVER statement provided for SQLCODE %d", (int) (ptrlong) (err));
+ qst_set (qst, args[2], box_dv_short_string (buf));
}
}
return (box_num (-1));
@@ -12623,11 +12559,11 @@ bif_exec_next (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t err = NULL;
if (n_args < 4)
- return bif_exec_error (qst, args,
+ return bif_exec_error (qst, args,
srv_make_new_error ("22023", "SR079", "Too few arguments to exec_next(cursor, state, message, row)"), NULL, NULL, NULL);
if (DV_TYPE_OF (handle) != DV_EXEC_CURSOR || BOX_ELEMENTS(handle) != 3)
- return bif_exec_error (qst, args,
+ return bif_exec_error (qst, args,
srv_make_new_error ("22023", "SR080", "Parameter 4 is not a valid local exec handle"), NULL, NULL, NULL);
qr = (query_t *) handle[0];
@@ -12635,29 +12571,29 @@ bif_exec_next (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
n_cols = (int) (ptrlong) handle[2];
if (!lc_next (lc))
- {
- err = lc->lc_error;
- lc->lc_error = NULL;
- if (err)
- {
+ {
+ err = lc->lc_error;
+ lc->lc_error = NULL;
+ if (err)
+ {
return (bif_exec_error (qst, args, err, NULL, NULL, NULL));
- }
- else
- return (box_num(SQL_NO_DATA_FOUND));
- }
+ }
+ else
+ return (box_num(SQL_NO_DATA_FOUND));
+ }
else
- {
- int inx;
- caddr_t *row = (caddr_t *)
- dk_alloc_box (n_cols * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
- for (inx = 0; inx < n_cols; inx++)
- row[inx] = box_copy_tree (lc_nth_col (lc, inx));
- if (ssl_is_settable (args[3]))
- qst_set (qst, args[3], (caddr_t) row);
- else
- dk_free_tree ((caddr_t) row);
- return box_num (0);
- }
+ {
+ int inx;
+ caddr_t *row = (caddr_t *)
+ dk_alloc_box (n_cols * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
+ for (inx = 0; inx < n_cols; inx++)
+ row[inx] = box_copy_tree (lc_nth_col (lc, inx));
+ if (ssl_is_settable (args[3]))
+ qst_set (qst, args[3], (caddr_t) row);
+ else
+ dk_free_tree ((caddr_t) row);
+ return box_num (0);
+ }
NO_CADDR_T;
}
@@ -12670,7 +12606,7 @@ bif_exec_close (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
query_t *qr;
if (DV_TYPE_OF (handle) != DV_EXEC_CURSOR || BOX_ELEMENTS(handle) != 3)
- return bif_exec_error (qst, args,
+ return bif_exec_error (qst, args,
srv_make_new_error ("22023", "SR081", "Parameter 1 is not a valid local exec handle"), NULL, NULL, NULL);
qr = (query_t *) handle[0];
@@ -13368,33 +13304,6 @@ bif_server_id_check (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return NEW_DB_NULL;
}
-caddr_t
-bif_proc_params_num (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- query_t * proc = NULL;
- query_instance_t *qi = (query_instance_t *) qst;
- char *proc_name = bif_string_arg (qst, args, 0, "procedure_params_num");
- char * full_name;
-
- proc = sch_proc_def (isp_schema (qi->qi_space), proc_name);
- if (!proc)
- {
- full_name = sch_full_proc_name (isp_schema (qi->qi_space), proc_name,
- cli_qual (qi->qi_client), CLI_OWNER (qi->qi_client));
- if (full_name)
- proc = sch_proc_def (isp_schema (qi->qi_space), full_name);
- }
- if (NULL == proc)
- return (dk_alloc_box (0, DV_DB_NULL));
- if (proc->qr_to_recompile)
- {
- proc = qr_recompile (proc, err_ret);
- if (*err_ret)
- return NULL;
- }
- return (box_num (dk_set_length (proc->qr_parms)));
-}
-
void
fcache_init ()
{
@@ -13799,728 +13708,6 @@ bif_dpipe_define (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return NULL;
}
-caddr_t
-bif_rdf_rand_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- double upper_limit = 1.0;
- if (BOX_ELEMENTS (args) > 0)
- upper_limit = bif_double_arg (qst, args, 0, "rdf_rand_impl");
- if (upper_limit <= DBL_EPSILON)
- sqlr_new_error ("22023", "SL001", "The range limit of SPARQL rand() function is too small");
-
- return (box_double (sqlbif_rnd_double (&rnd_seed, upper_limit)));
-}
-
-caddr_t
-bif_rdf_floor_ceil_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, int is_floor)
-{
- caddr_t arg = bif_arg_unrdf (qst, args, 0, is_floor ? "rdf_floor_impl" : "rdf_ceil_impl");
- switch (DV_TYPE_OF (arg))
- {
- case DV_LONG_INT: return box_copy (arg);
- case DV_DOUBLE_FLOAT: { double x = unbox_double (arg); return box_double (is_floor ? floor(x) : ceil (x)); }
- case DV_SINGLE_FLOAT: { float x = unbox_float (arg); return box_float (is_floor ? floor(x) : ceil (x)); }
- case DV_NUMERIC:
- {
- numeric_t res;
- numeric_t x = (numeric_t)arg;
- if (0 == x->n_scale)
- return box_copy (arg);
- if (is_floor ? x->n_neg : !x->n_neg)
- {
- numeric_t temp;
- numeric_t shifted;
- /* construct +-0.5 */
- NUMERIC_VAR (temp_buf);
- NUMERIC_INIT (temp_buf);
- temp = (numeric_t)temp_buf;
- temp->n_value[0] = 1;
- temp->n_len = 1;
- temp->n_scale = 0;
- temp->n_neg = is_floor;
- shifted = numeric_allocate ();
- num_add (shifted, x, temp, 0);
- res = numeric_allocate ();
- numeric_rescale_noround (res, shifted, shifted->n_len+1, 0);
- numeric_free (shifted);
- return (caddr_t)res;
- }
- res = numeric_allocate ();
- numeric_rescale_noround (res, x, x->n_len+1, 0);
- return (caddr_t)res;
- }
- case DV_DB_NULL: return NEW_DB_NULL;
- default:
- sqlr_new_error ("22023", "SL002", "The SPARQL 1.1 function %.10s() needs a numeric value as an argument", is_floor ? "floor" : "ceil");
- return NULL;
- }
-}
-
-caddr_t
-bif_rdf_floor_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_floor_ceil_impl (qst, err_ret, args, 1);
-}
-
-caddr_t
-bif_rdf_ceil_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_floor_ceil_impl (qst, err_ret, args, 0);
-}
-
-caddr_t
-bif_rdf_round_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t arg = bif_arg_unrdf (qst, args, 0, "rdf_round_impl");
- switch (DV_TYPE_OF (arg))
- {
- case DV_LONG_INT: return box_copy (arg);
- case DV_DOUBLE_FLOAT: { double x = unbox_double (arg); return box_double (((x-floor(x)) >= 0.5 ? ceil(x) : floor(x))); }
- case DV_SINGLE_FLOAT: { float x = unbox_float (arg); return box_float (((x-floor(x)) >= 0.5 ? ceil(x) : floor(x))); }
- case DV_NUMERIC:
- {
- numeric_t res;
- numeric_t x = (numeric_t)arg;
- int tenths;
- if (0 == x->n_scale)
- return box_copy (arg);
- tenths = x->n_value[(int)(x->n_len)];
- if (x->n_neg ?
- ((tenths > 5) || ((5 == tenths) && (1 < x->n_scale))) :
- (tenths >= 5) )
- {
- numeric_t temp;
- numeric_t shifted;
- /* construct +-0.5 */
- NUMERIC_VAR (temp_buf);
- NUMERIC_INIT (temp_buf);
- temp = (numeric_t)temp_buf;
- temp->n_value[0] = 5;
- temp->n_scale = 1;
- temp->n_neg = x->n_neg;
- shifted = numeric_allocate ();
- num_add (shifted, x, temp, 0);
- res = numeric_allocate ();
- numeric_rescale_noround (res, shifted, shifted->n_len+1, 0);
- numeric_free (shifted);
- return (caddr_t)res;
- }
- res = numeric_allocate ();
- numeric_rescale_noround (res, x, x->n_len+1, 0);
- return (caddr_t)res;
- }
- case DV_DB_NULL: return NEW_DB_NULL;
- default:
- sqlr_new_error ("22023", "SL001", "The SPARQL 1.1 function round() needs a numeric value as an argument");
- return NULL;
- }
-}
-
-/**
- * 17.4.3.2 STRLEN
- * xsd:integer STRLEN(string literal str)
- * The strlen function corresponds to the XPath fn:string-length function and returns an xsd:integer equal to the length in characters of the lexical form of the literal.
- *
- */
-caddr_t
-bif_rdf_strlen_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t arg = bif_arg_unrdf (qst, args, 0, "rdf_strlen_impl");
- dtp_t dtp = DV_TYPE_OF (arg);
- switch (dtp)
- {
- case DV_STRING:
- case DV_UNAME:
- return (caddr_t)box_num ( wide_char_length_of_utf8_string (arg, box_length(arg)) );
- case DV_WIDE:
- return (caddr_t)box_num( virt_wcslen (arg) );
- case DV_DB_NULL:
- return NEW_DB_NULL;
- default:
- sqlr_new_error ("22023", "SL001", "The SPARQL 1.1 function strlen() needs a string value as an argument");
- return NULL;
- }
-}
-
-/* this function take a string, not a box as 'source' argument */
-caddr_t
-t_box_utf8_string (ccaddr_t utf8src, size_t max_chars)
-{
- const unsigned char *src = (const unsigned char *) utf8src;
-
- virt_mbstate_t state;
- size_t inx, max_bytes = 0;
- caddr_t box;
- memset (&state, 0, sizeof(virt_mbstate_t));
- for (inx=0; inx<max_chars && src[max_bytes]; ++inx)
- {
- max_bytes += virt_mbrlen (src + max_bytes, VIRT_MB_CUR_MAX, &state);
- }
-
- box = dk_alloc_box (max_bytes + 1, DV_STRING);
-
- strncpy (box,src,max_bytes);
- box[max_bytes] = 0;
- return box;
-}
-
-/*
-17.4.3.3 SUBSTR
-string literal SUBSTR(string literal source, xsd:integer startingLoc)
-string literal SUBSTR(string literal source, xsd:integer startingLoc, xsd:integer length)
-The substr function corresponds to the XPath fn:substring function and returns a literal of
-the same kind (simple literal, literal with language tag, xsd:string typed literal) as
-the source input parameter but with a lexical form formed from the substring of
-the lexcial form of the source.
-The arguments startingLoc and length may be derived types of xsd:integer.
-The index of the first character in a strings is 1.
-*/
-caddr_t
-bif_rdf_substr_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- char b[128] = "";
- caddr_t src = bif_arg_unrdf (qst, args, 0, "rdf_substr_impl");
- rdf_box_t *src_rdf_box = (rdf_box_t *)bif_arg_nochecks (qst, args, 0);
- char src_is_rdf_box = DV_TYPE_OF (src_rdf_box) == DV_RDF;
- boxint startl = bif_long_arg(qst, args, 1, "rdf_substr_impl");
- unsigned start = (unsigned) startl - 1;
- boxint lenl;
- unsigned len = UINT_MAX;
- size_t str_n_chars;
- box_t r;
- if (BOX_ELEMENTS (args) >= 3)
- {
- lenl = bif_long_arg (qst, args, 2, "rdf_substr_impl");
- len = (unsigned) lenl;
- }
-
- switch (DV_TYPE_OF (src))
- {
- case DV_STRING: /* utf-8 */
- case DV_UNAME:
- {
- virt_mbstate_t mbstate;
- const char *pstart = src;
- size_t i;
- memset (&mbstate, 0, sizeof(virt_mbstate_t));
- for (i=0; i<start && *pstart; ++i)
- {
- pstart += virt_mbrlen (pstart, VIRT_MB_CUR_MAX, &mbstate);
- }
- str_n_chars = wide_char_length_of_utf8_string (pstart, strlen(pstart));
-
- if (startl < 1 || !str_n_chars ||
- (BOX_ELEMENTS (args) >= 3 && (lenl < 1 || lenl > str_n_chars)) )
- goto bad_subrange;
-
- if (len > str_n_chars)
- len = str_n_chars;
- r = t_box_utf8_string (pstart, len);
- }
- break;
- case DV_WIDE:
- case DV_LONG_WIDE:
- {
- const wchar_t *pstart;
- size_t strlength;
- str_n_chars = virt_wcslen (src);
-
- if (startl < 1 || startl > str_n_chars ||
- (BOX_ELEMENTS (args) >= 3 && (lenl < 1 || lenl > str_n_chars - start + 1)) )
- goto bad_subrange;
-
- pstart = (const wchar_t *)src + start;
- strlength = virt_wcslen(pstart);
- if (len > strlength)
- len = strlength;
- r = box_wide_as_utf8_char ((ccaddr_t)pstart, len, DV_STRING);
- }
- break;
- case DV_DB_NULL:
- return NEW_DB_NULL;
- default:
- sqlr_new_error ("22023", "SL001", "The SPARQL 1.1 function substr() needs a string value as 1st argument");
- return NULL;
- }
- box_flags(r) |= BF_UTF8;
- if (src_is_rdf_box)
- {
- rdf_box_t *r_rdf_box = rb_allocate();
- r_rdf_box->rb_is_complete = 1;
- r_rdf_box->rb_type = src_rdf_box->rb_type;
- r_rdf_box->rb_lang = src_rdf_box->rb_lang;
- r_rdf_box->rb_box = r;
- return (caddr_t)r_rdf_box;
- }
- else
- return (caddr_t)r;
-
-bad_subrange:
- if (BOX_ELEMENTS (args) >= 3)
- snprintf (b, 128, ", len=%ld", (long)lenl);
- sqlr_new_error ("22011", "SR026",
- "SPARQL substr: Bad string subrange: from=%ld%s.", (long)startl, b);
- return NEW_DB_NULL;
-}
-
-/*
-17.4.3.4 UCASE
-string literal UCASE(string literal str)
-The UCASE function corresponds to the XPath fn:upper-case function. It returns a string literal whose lexical form is the upper case of the lexcial form of the argument.
-17.4.3.5 LCASE
-string literal LCASE(string literal str)
-The LCASE function corresponds to the XPath fn:lower-case function. It returns a string literal whose lexical form is the lower case of the lexcial form of the argument.
-*/
-caddr_t
-bif_rdf_ucase_lcase_impl(caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, char upcase /* == 1 - upcase, ==0 - lcase */)
-{
- caddr_t str = bif_arg_unrdf (qst, args, 0, upcase ? "rdf_ucase_impl" : "rdf_lcase_impl");
- rdf_box_t *str_rdf_box = (rdf_box_t *)bif_arg_nochecks (qst, args, 0);
- char src_is_rdf_box = DV_TYPE_OF (str_rdf_box) == DV_RDF;
- size_t i, str_n_chars;
- wchar_t *wide_box = NULL;
-
- box_t r;
- unichar (*unicode3_get_x_case) (unichar);
- switch (DV_TYPE_OF (str))
- {
- case DV_STRING: /* utf-8 */
- case DV_UNAME:
- {
- wide_box = (wchar_t*) box_utf8_as_wide_char (str, NULL, strlen(str), 0, DV_WIDE);
- str_n_chars= virt_wcslen (wide_box);
- }
- break;
- case DV_WIDE:
- case DV_LONG_WIDE:
- {
- wide_box = (wchar_t*)box_wide_string ((const wchar_t*)str);
- str_n_chars = virt_wcslen ( (const wchar_t*)str);
- }
- break;
- case DV_DB_NULL:
- return NEW_DB_NULL;
- default:
- sqlr_new_error ("22023", "SL001", "The SPARQL 1.1 function %scase() needs a string value as 1st argument",
- upcase ? "u" : "l" );
- return NULL;
- }
-
- unicode3_get_x_case = upcase ? unicode3_getucase : unicode3_getlcase;
- for (i=0; i<str_n_chars; ++i)
- {
- wide_box[i] = unicode3_get_x_case (wide_box[i]);
- }
- r = box_wide_as_utf8_char ((ccaddr_t)wide_box, str_n_chars, DV_STRING);
- dk_free_box (wide_box);
-
- box_flags(r) |= BF_UTF8;
- if (src_is_rdf_box)
- {
- rdf_box_t *r_rdf_box = rb_allocate();
- r_rdf_box->rb_is_complete = 1;
- r_rdf_box->rb_type = str_rdf_box->rb_type;
- r_rdf_box->rb_lang = str_rdf_box->rb_lang;
- r_rdf_box->rb_box = r;
- return (caddr_t)r_rdf_box;
- }
- else
- return (caddr_t)r;
-}
-
-caddr_t
-bif_rdf_ucase_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_ucase_lcase_impl (qst, err_ret, args, 1);
-}
-
-caddr_t
-bif_rdf_lcase_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_ucase_lcase_impl (qst, err_ret, args, 0);
-}
-
-/*
-17.4.3.6 STRSTARTS
-
-xsd:boolean STRSTARTS(string literal arg1, string literal arg2)
-
-The STRSTARTS function corresponds to the XPath fn:starts-with function. The arguments must be argument compatible otherwise an error is raised.
-For such input pairs, the function returns true if the lexical form of arg1 starts with the lexical form of arg2, otherwise it returns false.
-
-17.4.3.7 STRENDS
-
-xsd:boolean STRENDS(string literal arg1, string literal arg2)
-
-The STRENDS function corresponds to the XPath fn:starts-with function. The arguments must be argument compatible otherwise an error is raised.
-For such input pairs, the function returns true if the lexical form of arg1 ends with the lexical form of arg2, otherwise it returns false.
-
-17.4.3.8 CONTAINS
-
-xsd:boolean CONTAINS(string literal arg1, string literal arg2)
-
-The CONTAINS function corresponds to the XPath fn:contains. The arguments must be argument compatible otherwise an error is raised.
-*/
-
-#define STRCONTAINS_AT_START ((char)0)
-#define STRCONTAINS_INSIDE ((char)1)
-#define STRCONTAINS_AT_END ((char)2)
-
-caddr_t
-bif_rdf_strcontains_x_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, const char *fnname, const char *sparql_fnname, char substring_place)
-{
- ccaddr_t str = bif_arg_unrdf (qst, args, 0, fnname);
- ccaddr_t pattern = bif_arg_unrdf (qst, args, 1, fnname);
- ccaddr_t str_end, pattern_position;
- size_t str_n_chars, str_len, pattern_n_chars, pattern_len;
- char r = 0; /* false by default */
- ccaddr_t ok_position;
-
- switch (DV_TYPE_OF (str))
- {
- case DV_STRING: /* utf-8 */
- case DV_UNAME:
- {
- virt_mbstate_t mbstate;
- memset (&mbstate, 0, sizeof(virt_mbstate_t));
- str_n_chars = wide_char_length_of_utf8_string ( (const unsigned char*)str, strlen(str));
- memset (&mbstate, 0, sizeof(virt_mbstate_t));
- pattern_n_chars = wide_char_length_of_utf8_string ( (const unsigned char*)pattern, strlen(pattern));
- str_len = strlen ((const char*)str);
- pattern_len = strlen ((const char*)pattern);
-
- if (pattern_n_chars && pattern_n_chars <= str_n_chars)
- {
- if (substring_place == STRCONTAINS_AT_START)
- r = strncmp ((const char*)str, (const char*)pattern, pattern_len) == 0;
- else if (substring_place == STRCONTAINS_INSIDE)
- r = strstr((const char*)str,(const char*)pattern) != NULL;
- else
- r = strncmp ((const char*)str + str_len - pattern_len, (const char*)pattern, pattern_len) == 0;
- }
- }
- break;
- case DV_WIDE: /* utf-32 */
- case DV_LONG_WIDE:
- {
- str_n_chars = virt_wcslen ((const wchar_t*)str);
- pattern_n_chars = virt_wcslen ((const wchar_t*)pattern);
- str_end = (ccaddr_t)(((const wchar_t*)str) + str_n_chars - pattern_n_chars);
- ok_position = substring_place == STRCONTAINS_AT_START ? str : str_end;
-
- if (pattern_n_chars && pattern_n_chars <= str_n_chars)
- {
- pattern_position = substring_place != STRCONTAINS_AT_END ?
- (ccaddr_t) virt_wcsstr ((const wchar_t*)str, (const wchar_t*)pattern)
- : (ccaddr_t) virt_wcsrstr ((const wchar_t*)str, (const wchar_t*)pattern);
-
- if (pattern_n_chars < str_n_chars)
- r = pattern_position == ok_position || (substring_place == STRCONTAINS_INSIDE && pattern_position);
- else if (str_n_chars == pattern_n_chars)
- r = pattern_position == str;
- }
- }
- break;
- case DV_DB_NULL:
- return NEW_DB_NULL;
- default:
- sqlr_new_error ("22023", "SL001", "The SPARQL 1.1 function %s() needs a string value as 1st argument", sparql_fnname);
- return NULL;
- }
-
- return (caddr_t)box_bool(r);
-}
-
-caddr_t
-bif_rdf_strstarts_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_strcontains_x_impl (qst, err_ret, args, "rdf_strstarts_impl", "STRSTARTS", STRCONTAINS_AT_START);
-}
-
-caddr_t
-bif_rdf_strends_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_strcontains_x_impl (qst, err_ret, args, "rdf_strends_impl", "STRENDS", STRCONTAINS_AT_END);
-}
-
-caddr_t
-bif_rdf_contains_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return bif_rdf_strcontains_x_impl (qst, err_ret, args, "rdf_contains_impl", "CONTAINS", STRCONTAINS_INSIDE);
-}
-
-/*
-17.4.3.11 ENCODE_FOR_IRI
-
-A clone of XPath fn:encode-for-uri.
-*/
-caddr_t
-bif_rdf_encode_for_uri_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- dk_session_t *ses;
- caddr_t str = bif_string_or_uname_or_wide_or_null_arg (qst, args, 0, "rdf_encode_for_uri");
- if (NULL == str)
- return NEW_DB_NULL;
- switch (DV_TYPE_OF (str))
- {
- case DV_STRING: /* utf-8 */
- case DV_UNAME:
- {
- ses = strses_allocate ();
- dks_esc_write (ses, str, box_length (str) - 1, CHARSET_UTF8, CHARSET_UTF8, DKS_ESC_URI);
- }
- break;
- case DV_WIDE:
- case DV_LONG_WIDE:
- {
- ses = strses_allocate ();
- dks_esc_write (ses, str, box_length (str) - 1, CHARSET_UTF8, CHARSET_WIDE, DKS_ESC_URI);
- }
- break;
- default:
-#ifndef NDEBUG
- GPF_T;
-#endif
- return NULL;
- }
- if (STRSES_CAN_BE_STRING ((dk_session_t *) ses))
- {
- caddr_t res_strg = strses_string (ses);
- dk_free_box ((caddr_t)ses);
- box_flags(res_strg) |= BF_UTF8;
- return res_strg;
- }
- strses_free (ses);
- sqlr_resignal (STRSES_LENGTH_ERROR ("rdf_encode_for_uri"));
- return NULL;
-}
-
-/*
-17.4.3.11 CONCAT
-
-A clone of XPath fn:encode-for-uri.
-*/
-caddr_t
-bif_rdf_concat_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t res_strg = bif_concatenate (qst, err_ret, args);
- query_instance_t *qi = (query_instance_t *)qst;
- int n_args = BOX_ELEMENTS (args), inx;
- unsigned short common_type_twobytes = 0;
- unsigned short common_lang_twobytes = 0;
- for (inx = 0; inx < n_args; inx++)
- {
- rdf_box_t *arg = (rdf_box_t *)bif_arg_nochecks (qst, args, inx);
- if (DV_RDF != DV_TYPE_OF (arg))
- {
- common_lang_twobytes = RDF_BOX_ILL_LANG;
- common_type_twobytes = RDF_BOX_ILL_LANG;
- continue;
- }
- if (RDF_BOX_DEFAULT_LANG != arg->rb_lang)
- {
- if (0 == common_lang_twobytes)
- common_lang_twobytes = arg->rb_lang;
- else if (common_lang_twobytes != arg->rb_lang)
- common_lang_twobytes = RDF_BOX_ILL_LANG;
- }
- else if (RDF_BOX_DEFAULT_TYPE != arg->rb_type)
- {
- if (0 == common_type_twobytes)
- common_type_twobytes = arg->rb_type;
- else if (common_type_twobytes != arg->rb_type)
- common_type_twobytes = RDF_BOX_ILL_TYPE;
- }
- }
- if ((0 != common_type_twobytes) && (RDF_BOX_ILL_TYPE != common_type_twobytes))
- {
-static unsigned short xsd_string_twobytes = 0;
- if (0 == xsd_string_twobytes)
- xsd_string_twobytes = nic_name_id (rdf_type_cache, uname_xmlschema_ns_uri_hash_string);
- if (common_type_twobytes == xsd_string_twobytes)
- {
- rdf_box_t *rb_res = rb_allocate ();
- rb_res->rb_box = res_strg;
- rb_res->rb_is_complete = 1;
- rb_res->rb_type = xsd_string_twobytes;
- rb_res->rb_lang = RDF_BOX_DEFAULT_LANG;
- return (caddr_t)rb_res;
- }
- }
- if ((0 != common_lang_twobytes) && (RDF_BOX_ILL_LANG != common_lang_twobytes))
- {
- rdf_box_t *rb_res = rb_allocate ();
- rb_res->rb_box = res_strg;
- rb_res->rb_is_complete = 1;
- rb_res->rb_type = RDF_BOX_DEFAULT_TYPE;
- rb_res->rb_lang = common_lang_twobytes;
- return (caddr_t)rb_res;
- }
- return res_strg;
-}
-
-caddr_t
-bif_rdf_seconds_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t dt = bif_date_arg (qst, args, 0, "rdf_seconds_impl");
- TIMESTAMP_STRUCT ts;
- dt_to_timestamp_struct (dt, &ts);
- return box_double (ts.second + ts.fraction / 1000000000.0);
-}
-
-caddr_t
-bif_rdf_checksum_int (caddr_t * qst, state_slot_t ** args, int op, const char *fname)
-{
- caddr_t arg = bif_arg_unrdf (qst, args, 0, fname);
- caddr_t arg_strg = NULL;
- caddr_t res = NULL;
- int ctr, res_len;
- dtp_t arg_dtp = DV_TYPE_OF (arg);
- if ((DV_STRING != arg_dtp) || (DV_UNAME != arg_dtp))
- arg_strg = box_cast_to_UTF8 (qst, arg);
- else
- arg_strg = arg;
- switch (op)
- {
- case SPAR_BIF_MD5:
- {
- MD5_CTX ctx;
- memset (&ctx, 0, sizeof (MD5_CTX));
- MD5Init (&ctx);
- MD5Update (&ctx, arg_strg, box_length (arg_strg)-1);
- res_len = MD5_SIZE;
- res = dk_alloc_box (res_len*2 + 1, DV_SHORT_STRING);
- MD5Final ((unsigned char *) res, &ctx);
- break;
- }
-#if !defined(OPENSSL_NO_SHA1) && defined (SHA_DIGEST_LENGTH)
- case SPAR_BIF_SHA1:
- {
- SHA_CTX ctx;
- memset (&ctx, 0, sizeof (SHA_CTX));
- SHA1_Init (&ctx);
- SHA1_Update (&ctx, arg_strg, box_length (arg_strg)-1);
- res_len = SHA_DIGEST_LENGTH;
- res = dk_alloc_box (res_len*2 + 1, DV_SHORT_STRING);
- SHA1_Final ((unsigned char *) res, &ctx);
- break;
- }
-#endif
-#if !defined( OPENSSL_NO_SHA256) && defined (SHA256_DIGEST_LENGTH)
- case SPAR_BIF_SHA224:
- {
- SHA256_CTX ctx;
- memset (&ctx, 0, sizeof (SHA256_CTX));
- SHA224_Init (&ctx);
- SHA224_Update (&ctx, arg_strg, box_length (arg_strg)-1);
- res_len = SHA224_DIGEST_LENGTH;
- res = dk_alloc_box (res_len*2 + 1, DV_SHORT_STRING);
- SHA224_Final ((unsigned char *) res, &ctx);
- break;
- }
- case SPAR_BIF_SHA256:
- {
- SHA256_CTX ctx;
- memset (&ctx, 0, sizeof (SHA256_CTX));
- SHA256_Init (&ctx);
- SHA256_Update (&ctx, arg_strg, box_length (arg_strg)-1);
- res_len = SHA256_DIGEST_LENGTH;
- res = dk_alloc_box (res_len*2 + 1, DV_SHORT_STRING);
- SHA256_Final ((unsigned char *) res, &ctx);
- break;
- }
-#endif
-#if !defined(OPENSSL_NO_SHA512) && defined (SHA512_DIGEST_LENGTH)
- case SPAR_BIF_SHA384:
- {
- SHA512_CTX ctx;
- memset (&ctx, 0, sizeof (SHA512_CTX));
- SHA384_Init (&ctx);
- SHA384_Update (&ctx, arg_strg, box_length (arg_strg)-1);
- res_len = SHA384_DIGEST_LENGTH;
- res = dk_alloc_box (res_len*2 + 1, DV_SHORT_STRING);
- SHA384_Final ((unsigned char *) res, &ctx);
- break;
- }
- case SPAR_BIF_SHA512:
- {
- SHA512_CTX ctx;
- memset (&ctx, 0, sizeof (SHA512_CTX));
- SHA512_Init (&ctx);
- SHA512_Update (&ctx, arg_strg, box_length (arg_strg)-1);
- res_len = SHA512_DIGEST_LENGTH;
- res = dk_alloc_box (res_len*2 + 1, DV_SHORT_STRING);
- SHA512_Final ((unsigned char *) res, &ctx);
- break;
- }
-#endif
- default:
- sqlr_new_error ("42001", "SR646", "The function %.100s() is not supported in the OpenSSL library used in this Virtuoso build", fname);
- }
- res[res_len * 2] = '\0';
- for (ctr = res_len; ctr--; /* no step */)
- {
- unsigned char c = res[ctr];
- res[ctr * 2 + 1] = "0123456789abcdef"[c & 0xf];
- res[ctr * 2] = "0123456789abcdef"[c >> 4];
- }
- if (arg_strg != arg)
- dk_free_box (arg_strg);
- return res;
-}
-
-caddr_t
-bif_rdf_MD5_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{ return bif_rdf_checksum_int (qst, args, SPAR_BIF_MD5, "rdf_md5_impl"); }
-
-caddr_t
-bif_rdf_SHA1_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{ return bif_rdf_checksum_int (qst, args, SPAR_BIF_SHA1, "rdf_sha1_impl"); }
-
-caddr_t
-bif_rdf_SHA224_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{ return bif_rdf_checksum_int (qst, args, SPAR_BIF_SHA224, "rdf_sha224_impl"); }
-
-caddr_t
-bif_rdf_SHA256_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{ return bif_rdf_checksum_int (qst, args, SPAR_BIF_SHA256, "rdf_sha256_impl"); }
-
-caddr_t
-bif_rdf_SHA384_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{ return bif_rdf_checksum_int (qst, args, SPAR_BIF_SHA384, "rdf_sha384_impl"); }
-
-caddr_t
-bif_rdf_SHA512_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{ return bif_rdf_checksum_int (qst, args, SPAR_BIF_SHA512, "rdf_sha512_impl"); }
-
-void
-bif_sparql_init (void)
-{
- bif_define ("rdf_abs_impl", bif_abs);
- bif_define ("rdf_ceil_impl", bif_rdf_ceil_impl);
- bif_define ("rdf_floor_impl", bif_rdf_floor_impl);
- bif_define_typed ("rdf_rand_impl", bif_rdf_rand_impl, &bt_double);
- bif_define ("rdf_round_impl", bif_rdf_round_impl);
- bif_define_typed ("rdf_strlen_impl", bif_rdf_strlen_impl, &bt_integer);
- bif_define_typed ("rdf_substr_impl", bif_rdf_substr_impl, &bt_string);
- bif_define_typed ("rdf_ucase_impl", bif_rdf_ucase_impl, &bt_string);
- bif_define_typed ("rdf_lcase_impl", bif_rdf_lcase_impl, &bt_string);
- bif_define_typed ("rdf_strstarts_impl", bif_rdf_strstarts_impl, &bt_integer);
- bif_define_typed ("rdf_strends_impl", bif_rdf_strends_impl, &bt_integer);
- bif_define_typed ("rdf_contains_impl", bif_rdf_contains_impl, &bt_integer);
- bif_define_typed ("rdf_encode_for_uri_impl", bif_rdf_encode_for_uri_impl, &bt_varchar);
- bif_define_typed ("rdf_concat_impl", bif_rdf_concat_impl, &bt_varchar);
- /* Functions rdf_now_impl() and rdf_year_impl() to rdf_minutes_impl() are in bif_date.c */
- bif_define_typed ("rdf_seconds_impl", bif_rdf_seconds_impl, &bt_double);
- bif_define_typed ("rdf_md5_impl", bif_rdf_MD5_impl, &bt_string);
- bif_define_typed ("rdf_sha1_impl", bif_rdf_SHA1_impl, &bt_string);
- bif_define_typed ("rdf_sha224_impl", bif_rdf_SHA224_impl, &bt_string);
- bif_define_typed ("rdf_sha256_impl", bif_rdf_SHA256_impl, &bt_string);
- bif_define_typed ("rdf_sha384_impl", bif_rdf_SHA384_impl, &bt_string);
- bif_define_typed ("rdf_sha512_impl", bif_rdf_SHA512_impl, &bt_string);
-}
-
-
extern caddr_t bif_search_excerpt (caddr_t *qst, caddr_t * err_ret, state_slot_t ** args);
void
@@ -14574,7 +13761,6 @@ sql_bif_init (void)
bif_define_typed ("octet_length", bif_length, &bt_integer);
bif_define_typed ("aref", bif_aref, &bt_any);
- bif_define_typed ("aref_or_default", bif_aref_or_default, &bt_any);
bif_define_typed ("aref_set_0", bif_aref_set_0, &bt_any);
bif_define_typed ("aset", bif_aset, &bt_integer);
bif_define_typed ("aset_zap_arg", bif_aset_zap_arg, &bt_integer);
@@ -14864,7 +14050,6 @@ sql_bif_init (void)
bif_define ("__drop_trigger", bif_drop_trigger);
bif_define ("__drop_proc", bif_drop_proc);
bif_define ("__proc_exists", bif_proc_exists);
- bif_define ("__proc_params_num", bif_proc_params_num);
bif_define_typed ("__copy", bif_copy, &bt_copy);
bif_define_typed ("exec", bif_exec, &bt_integer);
bif_define_typed ("exec_metadata", bif_exec_metadata, &bt_integer);
@@ -14960,8 +14145,6 @@ sql_bif_init (void)
bif_define ("__spfinv", bif_sprintf_inverse);
sqlbif2_init ();
- bif_sparql_init ();
-
#ifdef BIF_PURIFY
bif_purify_init ();
#endif
diff --git a/libsrc/Wi/sqlbif.h b/libsrc/Wi/sqlbif.h
index 828df78..f824e2e 100644
--- a/libsrc/Wi/sqlbif.h
+++ b/libsrc/Wi/sqlbif.h
@@ -1,14 +1,14 @@
/*
* sqlbif.h
*
- * $Id: sqlbif.h,v 1.29.2.15 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlbif.h,v 1.29.2.12 2011/10/25 19:36:36 source Exp $
*
* SQL Built In Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -149,7 +149,7 @@ extern sql_tree_tmp * st_varchar;
extern sql_tree_tmp * st_nvarchar;
int is_allowed (char * path);
-EXE_EXPORT (void, file_path_assert, (caddr_t fname_cvt, caddr_t *err_ret, int free_fname_cvt));
+extern void file_path_assert (caddr_t fname_cvt, caddr_t *err_ret, int free_fname_cvt);
int mime_get_attr (char *szMessage, long Offset, char szDelim, int *rfc822mode,
int *override_to_mime, char *_szName, int max_name, char *_szValue, int max_value);
void dime_compose (dk_session_t * ses, caddr_t *input, caddr_t * err);
@@ -198,10 +198,8 @@ caddr_t box_hmac (caddr_t box, caddr_t key, int alg);
#define HMAC_ALG_RIPMD160 1
#endif
-extern int32 sqlbif_rnd (int32* seed);
-extern double sqlbif_rnd_double (int32* seed, double upper_limit);
-extern int32 rnd_seed; /*!< 32 bit seed */
-extern int32 rnd_seed_b; /*!< another 32 bit seed used in blobs */
+int32 sqlbif_rnd (int32* seed);
+extern int32 rnd_seed_b;
int virtuoso_sleep (long secs, long tms);
void sqls_define_2pc (void);
@@ -230,7 +228,6 @@ caddr_t os_get_uname_by_uid (long uid);
caddr_t os_get_gname_by_gid (long gid);
extern caddr_t file_native_name (caddr_t server_encoded_fname);
-extern caddr_t file_native_name_from_iri_path_nchars (const char *iri_path, size_t iri_path_len);
caddr_t get_ssl_error_text (char *buf, int len);
caddr_t regexp_match_01 (const char *pattern, const char *str, int c_opts);
diff --git a/libsrc/Wi/sqlbif2.c b/libsrc/Wi/sqlbif2.c
index f174d83..e258058 100644
--- a/libsrc/Wi/sqlbif2.c
+++ b/libsrc/Wi/sqlbif2.c
@@ -1,14 +1,14 @@
/*
* sqlbif2.c
*
- * $Id: sqlbif2.c,v 1.31.2.19 2012/03/15 11:08:26 source Exp $
+ * $Id: sqlbif2.c,v 1.31.2.15 2011/07/13 19:09:43 source Exp $
*
* SQL Built In Functions. Part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1139,12 +1139,12 @@ rfc1808_expand_uri (/*query_instance_t *qi,*/ ccaddr_t base_uri, ccaddr_t rel_ur
}
if ((base_cs != buffer_cs_upcase) && !((NULL != base_cs) && (NULL != buffer_cs_upcase) && !strcmp (base_cs, buffer_cs_upcase)))
{
- base_uri = charset_recode_from_named_to_named ((query_instance_t *)NULL, (caddr_t)base_uri, base_cs, buffer_cs_upcase, &base_uri_is_temp, err_ret);
+ base_uri = charset_recode_from_named_to_named ((caddr_t)base_uri, base_cs, buffer_cs_upcase, &base_uri_is_temp, err_ret);
if (err_ret[0]) goto res_complete; /* see below */
}
if ((rel_cs != buffer_cs_upcase) && !((NULL != rel_cs) && (NULL != buffer_cs_upcase) && !strcmp (rel_cs, buffer_cs_upcase)))
{
- rel_uri = charset_recode_from_named_to_named ((query_instance_t *)NULL, (caddr_t)rel_uri, rel_cs, buffer_cs_upcase, &rel_uri_is_temp, err_ret);
+ rel_uri = charset_recode_from_named_to_named ((caddr_t)rel_uri, rel_cs, buffer_cs_upcase, &rel_uri_is_temp, err_ret);
if (err_ret[0]) goto res_complete; /* see below */
}
if ((NULL == base_uri) || ('\0' == base_uri[0]))
@@ -1350,7 +1350,7 @@ buffer_ready:
((NULL == buffer_cs_upcase) || (NULL == output_cs_upcase) || strcmp(buffer_cs_upcase, output_cs_upcase)) )
{
caddr_t boxed_buffer = box_dv_short_nchars (buffer, buf_tail - buffer);
- res = charset_recode_from_named_to_named ((query_instance_t *)NULL, boxed_buffer, buffer_cs_upcase, output_cs_upcase, &res_is_new, err_ret);
+ res = charset_recode_from_named_to_named (boxed_buffer, buffer_cs_upcase, output_cs_upcase, &res_is_new, err_ret);
if (res_is_new)
dk_free_box (boxed_buffer);
else
@@ -1374,8 +1374,6 @@ buffer_ready:
}
res_complete:
- if (!res_is_new)
- res = box_copy (res);
dk_free_box (output_cs_upcase);
if (base_uri_is_temp)
dk_free_box ((caddr_t) base_uri);
@@ -1606,11 +1604,7 @@ bif_this_server (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
return NEW_DB_NULL;
}
-static caddr_t
-bif_is_geometry (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- return box_num (0);
-}
+
void
sqlbif2_init (void)
@@ -1642,7 +1636,6 @@ sqlbif2_init (void)
bif_define_typed ("format_number", bif_format_number, &bt_varchar);
bif_define ("__stop_cpt", bif_stop_cpt);
bif_define ("repl_this_server", bif_this_server);
- bif_define ("isgeometry", bif_is_geometry);
/*sqls_bif_init ();*/
sqls_bif_init ();
sqlo_inv_bif_int ();
diff --git a/libsrc/Wi/sqlcmps.h b/libsrc/Wi/sqlcmps.h
index 5880bb5..7f14c1e 100644
--- a/libsrc/Wi/sqlcmps.h
+++ b/libsrc/Wi/sqlcmps.h
@@ -1,14 +1,14 @@
/*
* sqlcmps.h
*
- * $Id: sqlcmps.h,v 1.14.2.12 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlcmps.h,v 1.14.2.11 2010/11/15 16:51:56 source Exp $
*
* SQL Compiler Data Structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlcomp.c b/libsrc/Wi/sqlcomp.c
index c4909a7..4ccfee5 100644
--- a/libsrc/Wi/sqlcomp.c
+++ b/libsrc/Wi/sqlcomp.c
@@ -1,14 +1,14 @@
/*
* sqlcomp.c
*
- * $Id: sqlcomp.c,v 1.7.2.8 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlcomp.c,v 1.7.2.7 2010/02/18 10:57:16 source Exp $
*
* Dynamic SQL Compiler
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlcomp.h b/libsrc/Wi/sqlcomp.h
index 2f3885a..f263faa 100644
--- a/libsrc/Wi/sqlcomp.h
+++ b/libsrc/Wi/sqlcomp.h
@@ -1,14 +1,14 @@
/*
* sqlcomp.h
*
- * $Id: sqlcomp.h,v 1.4.2.2 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlcomp.h,v 1.4.2.1 2009/04/18 21:55:15 source Exp $
*
* SQL Query Description
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlcomp2.c b/libsrc/Wi/sqlcomp2.c
index e88e1cb..26caacd 100644
--- a/libsrc/Wi/sqlcomp2.c
+++ b/libsrc/Wi/sqlcomp2.c
@@ -1,14 +1,14 @@
/*
* sqlcomp2.c
*
- * $Id: sqlcomp2.c,v 1.21.2.12 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlcomp2.c,v 1.21.2.10 2011/09/13 14:50:10 source Exp $
*
* Dynamic SQL Compiler, part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1465,11 +1465,8 @@ DBG_NAME(sql_compile_1) (DBG_PARAMS const char *string2, client_connection_t * c
is_ddl = sql_is_ddl (tree);
if (!is_ddl)
{
- if (inside_sem)
- {
- semaphore_leave (parse_sem);
- inside_sem = 0;
- }
+ semaphore_leave (parse_sem);
+ inside_sem = 0;
}
else
sqlc_inside_sem = 1;
@@ -1718,18 +1715,7 @@ dbg_sql_compile_static (const char *file, int line, const char *string2, client_
caddr_t * err, volatile int cr_type)
{
caddr_t my_err = NULL;
- query_t *qr = NULL;
- sql_tree_t *tree = NULL;
- if (SQLC_STATIC_PRESERVES_TREE == cr_type)
- {
- int cr_tree_type = ((NULL != parse_sem) && parse_sem->sem_entry_count) ? SQLC_PARSE_ONLY_REC : SQLC_PARSE_ONLY;
- tree = (sql_tree_t *)DBG_NAME(sql_compile_1) (DBG_ARGS string2, cli, err, cr_tree_type, NULL, NULL);
- if (NULL != err[0])
- return NULL;
- cr_type = SQLC_DEFAULT;
- }
- qr = DBG_NAME(sql_compile_1) (DBG_ARGS string2, cli, err, cr_type, tree, NULL);
- dk_free_tree ((caddr_t *)tree);
+ query_t *qr = DBG_NAME(sql_compile_1) (DBG_ARGS string2, cli, &my_err, cr_type, NULL, NULL);
if (NULL != err)
err[0] = my_err;
if (NULL == qr)
@@ -1819,18 +1805,7 @@ query_t *
sql_compile_static (const char *string2, client_connection_t * cli,
caddr_t * err, volatile int cr_type)
{
- query_t *qr = NULL;
- sql_tree_t *tree = NULL;
- if (SQLC_STATIC_PRESERVES_TREE == cr_type)
- {
- int cr_tree_type = ((NULL != parse_sem) && parse_sem->sem_entry_count) ? SQLC_PARSE_ONLY_REC : SQLC_PARSE_ONLY;
- tree = (sql_tree_t *)DBG_NAME(sql_compile_1) (DBG_ARGS string2, cli, err, cr_tree_type, NULL, NULL);
- if (NULL != err[0])
- return NULL;
- cr_type = SQLC_DEFAULT;
- }
- qr = DBG_NAME(sql_compile_1) (DBG_ARGS string2, cli, err, cr_type, tree, NULL);
- dk_free_tree ((caddr_t *)tree);
+ query_t *qr = DBG_NAME(sql_compile_1) (DBG_ARGS string2, cli, err, cr_type, NULL, NULL);
return qr;
}
#endif
diff --git a/libsrc/Wi/sqlcost.c b/libsrc/Wi/sqlcost.c
index 25358a5..11ad87c 100644
--- a/libsrc/Wi/sqlcost.c
+++ b/libsrc/Wi/sqlcost.c
@@ -1,14 +1,14 @@
/*
* sqlcost.c
*
- * $Id: sqlcost.c,v 1.30.2.39 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlcost.c,v 1.30.2.37 2011/10/13 11:03:08 source Exp $
*
* sql cost functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -362,12 +362,6 @@ sqlo_pred_unit (df_elt_t * lower, df_elt_t * upper, float * u1, float * a1)
}
END_DO_BOX;
}
- else if (lower->_.bin.right->dfe_type == DFE_CALL &&
- lower->_.bin.right->_.call.func_name &&
- 0 == stricmp (lower->_.bin.right->_.call.func_name, "min_bnode_iri_id"))
- {
- *a1 = 1;
- }
}
else if (lower->_.bin.op == BOP_LIKE)
{
diff --git a/libsrc/Wi/sqlcr.c b/libsrc/Wi/sqlcr.c
index 9ca9d39..75d1e30 100644
--- a/libsrc/Wi/sqlcr.c
+++ b/libsrc/Wi/sqlcr.c
@@ -1,14 +1,14 @@
/*
* sqlstmts.c
*
- * $Id: sqlcr.c,v 1.7.2.5 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlcr.c,v 1.7.2.4 2010/11/15 16:51:56 source Exp $
*
* Dynamic SQL Statement Compilations
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlcstate.h b/libsrc/Wi/sqlcstate.h
index 0de8365..a8b43c0 100644
--- a/libsrc/Wi/sqlcstate.h
+++ b/libsrc/Wi/sqlcstate.h
@@ -1,12 +1,12 @@
/*
* sqlcstate.h
*
- * $Id: sqlcstate.h,v 1.4.2.3 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlcstate.h,v 1.4.2.2 2009/04/18 21:55:15 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqldf.c b/libsrc/Wi/sqldf.c
index cc772be..4f62b59 100644
--- a/libsrc/Wi/sqldf.c
+++ b/libsrc/Wi/sqldf.c
@@ -1,14 +1,14 @@
/*
* sqldf.c
*
- * $Id: sqldf.c,v 1.60.2.35 2012/03/13 11:46:13 source Exp $
+ * $Id: sqldf.c,v 1.60.2.30 2011/06/22 13:29:31 source Exp $
*
* sql expression dependencies and code layout
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1089,7 +1089,7 @@ sqlo_dt_nth_col (sqlo_t * so, df_elt_t * super, df_elt_t * dt_dfe, int inx, df_e
{
if (!col_dfe->_.col.card)
sqlo_dt_col_card (so, col_dfe, exp);
- sqt_max_desc (&col_dfe->dfe_sqt, &exp->dfe_sqt);
+ sqt_max_desc (&col_dfe->dfe_sqt, &exp->dfe_sqt);
}
col_dfe->dfe_locus = dt_dfe->dfe_locus;
col_alias = ((ST**)(dt_dfe->_.sub.ot->ot_left_sel->_.select_stmt.selection))[inx]->_.as_exp.name;
@@ -1113,7 +1113,7 @@ sqlo_dt_nth_col (sqlo_t * so, df_elt_t * super, df_elt_t * dt_dfe, int inx, df_e
if (exp)
{
sqlo_dt_col_card (so, col_dfe, exp);
- sqt_max_desc (&col_dfe->dfe_sqt, &exp->dfe_sqt);
+ sqt_max_desc (&col_dfe->dfe_sqt, &exp->dfe_sqt);
}
if (so->so_place_code_forr_cond)
sqlo_post_oby_ref (so, dt_dfe, exp, inx);
@@ -1148,7 +1148,7 @@ void
dfe_loc_result (locus_t * loc_from, df_elt_t * requiring, df_elt_t * required)
{
if (!IS_BOX_POINTER (loc_from)
- || (requiring->dfe_locus == required->dfe_locus && required->dfe_type != DFE_CALL) /* can happen it's a standard function in same scope but result required */
+ || requiring->dfe_locus == required->dfe_locus
|| required->dfe_type == DFE_CONST)
return;
{
@@ -1667,32 +1667,6 @@ sqlo_place_control_cols (sqlo_t * so, df_elt_t * super, ST * tree)
}
}
-int
-sqlo_is_const_call (ST * tree)
-{
- if (!ARRAYP (tree))
- return 1;
- switch (tree->type)
- {
- case CALL_STMT:
- {
- caddr_t * pars = (caddr_t *) tree->_.call.params;
- int inx;
- DO_BOX (ST *, exp, inx, pars)
- {
- if (!stricmp (tree->_.call.name, "_cvt") && !inx)
- continue;
- if (!sqlo_is_const_call (exp))
- return 0;
- }
- END_DO_BOX;
- return 1;
- }
- default:
- return 0;
- }
- return 1;
-}
int
sqlo_is_dt_state_func (char * name)
@@ -1902,8 +1876,6 @@ sqlo_place_exp (sqlo_t * so, df_elt_t * super, df_elt_t * dfe)
{ /* if this is a remote virtuoso do not pass through scalar functions on proc vars */
pref_loc = LOC_LOCAL;
}
- if (sqlo_is_const_call (dfe->dfe_tree)) /* call with constant, do it locally and pass as parameter */
- pref_loc = LOC_LOCAL;
if (sqlo_is_dt_state_func (dfe->dfe_tree->_.call.name))
{
@@ -3303,7 +3275,7 @@ is_call_only_dep_on (df_elt_t * dfe, op_table_t * ot, int skip_first_n)
if (!ST_COLUMN (args[argctr], COL_DOTTED))
return 0;
}
- return 1;
+ return 1;
}
void
@@ -3443,12 +3415,12 @@ sqlo_col_inverse (sqlo_t *so, df_elt_t * tb_dfe, df_elt_t * pred, dk_set_t * co
if (ST_P (pred->_.bin.left->dfe_tree, CALL_STMT))
{
if (sqlo_col_inverse_eq_1 (so, tb_dfe, pred->_.bin.left, pred->_.bin.right, col_preds, after_preds))
- return 1;
+ return 1;
}
if (ST_P (pred->_.bin.right->dfe_tree, CALL_STMT))
{
if (sqlo_col_inverse_eq_1 (so, tb_dfe, pred->_.bin.right, pred->_.bin.left, col_preds, after_preds))
- return 1;
+ return 1;
}
return 0;
}
@@ -5325,8 +5297,8 @@ df_elt_t *
sqlo_next_joined (sqlo_t * so, df_elt_t * dt_dfe)
{
/* if there is an outer that must come at this point, return it */
- op_table_t * ot = dt_dfe->_.sub.ot;
- df_elt_t * last = NULL, * placed;
+ op_table_t *ot = dt_dfe->_.sub.ot;
+ df_elt_t *last = NULL, *placed;
dk_set_t from;
for (placed = dt_dfe->_.sub.first; placed; placed = placed->dfe_next)
{
@@ -5337,12 +5309,13 @@ sqlo_next_joined (sqlo_t * so, df_elt_t * dt_dfe)
{
if ((df_elt_t *) from->data == last)
{
- df_elt_t * next_from = (df_elt_t *) from->next->data;
+ df_elt_t *next_from = (df_elt_t *) from->next->data;
int next_outer = dfe_is_join (next_from);
- remote_table_t * rt = DFE_TABLE == next_from->dfe_type ? find_remote_table (next_from->_.table.ot->ot_table->tb_name, 0) : NULL ;
+ remote_table_t *rt =
+ DFE_TABLE == next_from->dfe_type ? find_remote_table (next_from->_.table.ot->ot_table->tb_name, 0) : NULL;
if (!next_from->dfe_is_placed && next_outer && rt)
{
- df_elt_t * preds = sqlo_df_elt (so, next_from->_.table.ot->ot_join_cond);
+ df_elt_t *preds = sqlo_df_elt (so, next_from->_.table.ot->ot_join_cond);
char old = next_from->dfe_is_placed;
next_from->dfe_is_placed = DFE_PLACED;
if (preds && dfe_reqd_placed (preds))
@@ -6007,15 +5980,12 @@ sqlo_layout_1 (sqlo_t * so, op_table_t * ot, int is_top)
}
}
/* GK: all the predicates should be placed by now */
- if (so->so_this_dt->ot_from_dfes)
+ DO_SET (df_elt_t *, pred, &so->so_this_dt->ot_preds)
{
- DO_SET (df_elt_t *, pred, &so->so_this_dt->ot_preds)
- {
- if (!pred->dfe_is_placed)
- SQL_GPF_T1 (so->so_sc->sc_cc, "Unplaced predicate in select layout");
- }
- END_DO_SET ();
+ if (!pred->dfe_is_placed)
+ SQL_GPF_T1 (so->so_sc->sc_cc, "Unplaced predicate in select layout");
}
+ END_DO_SET ();
sqlo_n_full_layouts++;
this_score = sqlo_score (ot->ot_work_dfe, ot->ot_work_dfe->_.sub.in_arity);
diff --git a/libsrc/Wi/sqlexp.c b/libsrc/Wi/sqlexp.c
index b9894cb..68d8452 100644
--- a/libsrc/Wi/sqlexp.c
+++ b/libsrc/Wi/sqlexp.c
@@ -1,14 +1,14 @@
/*
* sqlexp.c
*
- * $Id: sqlexp.c,v 1.16.2.27 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlexp.c,v 1.16.2.24 2011/07/19 23:38:34 source Exp $
*
* Dynamic SQL Expression Generator
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -239,10 +239,8 @@ sqlc_call_exp (sql_comp_t * sc, dk_set_t * code, state_slot_t * ret, ST * tree)
return; /* 0123456789 */
if ((func_len > 9) && !stricmp (func + (func_len - 9), "__w_cache") && (n_params >= 1))
{
- ST ** new_pars = (ST **) t_full_box_copy_tree ((caddr_t)act_params); /* we do a copy in order to keep dfe_tree as is, otherwise we may not find it in a next step as hash on tree changes */
state_slot_t *aux_ssl = ssl_new_inst_variable (sc->sc_cc, "cache", DV_ARRAY_OF_POINTER);
- ((ptrlong *)(new_pars[n_params - 1]))[0] = aux_ssl->ssl_index;
- act_params = new_pars;
+ ((ptrlong *)(act_params[n_params - 1]))[0] = aux_ssl->ssl_index;
}
if (ret_param)
params = (state_slot_t **) t_alloc_box ((n_params + 1) * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
@@ -1384,12 +1382,9 @@ pred_gen_1 (sql_comp_t * sc, ST * tree, dk_set_t * code, int succ, int fail, int
if (ST_P (tree, BOP_AND))
{
jmp_label_t temp_succ = sqlc_new_label (sc);
- jmp_label_t temp_unkn = sqlc_new_label (sc);
- pred_gen_1 (sc, tree->_.bin_exp.left, code, temp_succ, fail, temp_unkn);
+ pred_gen_1 (sc, tree->_.bin_exp.left, code, temp_succ, fail, unkn);
cv_label (code, temp_succ);
pred_gen_1 (sc, tree->_.bin_exp.right, code, succ, fail, unkn);
- cv_label (code, temp_unkn);
- pred_gen_1 (sc, tree->_.bin_exp.right, code, unkn, fail, unkn);
return;
}
if (BIN_EXP_P (tree))
diff --git a/libsrc/Wi/sqlfn.h b/libsrc/Wi/sqlfn.h
index 9c270cc..ca406e5 100644
--- a/libsrc/Wi/sqlfn.h
+++ b/libsrc/Wi/sqlfn.h
@@ -1,12 +1,12 @@
/*
* sqlfn.h
*
- * $Id: sqlfn.h,v 1.46.2.17 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlfn.h,v 1.46.2.15 2011/09/12 20:08:52 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -210,7 +210,10 @@ caddr_t qi_bunion_reset (query_instance_t * qi, query_t * qr, int is_subq);
-EXE_EXPORT (caddr_t, qr_exec, (client_connection_t * cli, query_t * qr, query_instance_t * caller, caddr_t cr_name, srv_stmt_t * stmt, local_cursor_t ** ret, caddr_t * parms, stmt_options_t * opts, int named_params));
+caddr_t qr_exec (client_connection_t * cli, query_t * qr,
+ query_instance_t * caller, caddr_t cr_name, srv_stmt_t * stmt,
+ local_cursor_t ** ret, caddr_t * parms, stmt_options_t * opts,
+ int named_params);
caddr_t qr_dml_array_exec (client_connection_t * cli, query_t * qr,
query_instance_t * caller, caddr_t cr_name, srv_stmt_t * stmt,
diff --git a/libsrc/Wi/sqlgen.c b/libsrc/Wi/sqlgen.c
index ec38f83..0889111 100644
--- a/libsrc/Wi/sqlgen.c
+++ b/libsrc/Wi/sqlgen.c
@@ -1,14 +1,14 @@
/*
* sqlgen.c
*
- * $Id: sqlgen.c,v 1.39.2.31 2012/03/13 11:48:57 source Exp $
+ * $Id: sqlgen.c,v 1.39.2.29 2011/09/21 15:22:37 source Exp $
*
* sql executable graph generation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -121,13 +121,6 @@ sqlg_dfe_ssl (sqlo_t * so, df_elt_t * dfe)
memset (args, 0, box_length (args));
memset (&dummy_arg, 0, sizeof (state_slot_t));
- if (!strcmp (dfe->dfe_tree->_.call.name, "_cvt") && ARRAYP (dfe->dfe_tree->_.call.params) &&
- BOX_ELEMENTS (dfe->dfe_tree->_.call.params) > 0 && ARRAYP (dfe->dfe_tree->_.call.params[0]) &&
- BOX_ELEMENTS (dfe->dfe_tree->_.call.params[0]) > 1)
- {
- ST *dtp = (ST *) (((caddr_t *) (dfe->dfe_tree->_.call.params[0]))[1]);
- dummy_arg.ssl_sqt.sqt_dtp = dtp->type;
- }
DO_BOX (df_elt_t *, dfe_arg, inx, dfe->_.call.args)
{
args[inx] = dfe_arg->dfe_ssl ? dfe_arg->dfe_ssl : &dummy_arg;
@@ -135,7 +128,6 @@ sqlg_dfe_ssl (sqlo_t * so, df_elt_t * dfe)
END_DO_BOX;
bif_type_set (bt, dfe->dfe_ssl, args);
}
- goto done;
}
if (ST_COLUMN (tree, COL_DOTTED))
{
diff --git a/libsrc/Wi/sqlhash.c b/libsrc/Wi/sqlhash.c
index 414f733..6d828f9 100644
--- a/libsrc/Wi/sqlhash.c
+++ b/libsrc/Wi/sqlhash.c
@@ -1,14 +1,14 @@
/*
* sqlhash.c
*
- * $Id: sqlhash.c,v 1.5.2.11 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlhash.c,v 1.5.2.9 2010/10/29 14:11:04 source Exp $
*
* Dynamic SQL Compiler, part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -223,6 +223,8 @@ setp_distinct_hash (sql_comp_t * sc, setp_node_t * setp, long n_rows)
case AMMSC_COUNTSUM:
case AMMSC_SUM:
case AMMSC_AVG:
+ ha->ha_memcache_only = 0;
+ break;
case AMMSC_MIN:
case AMMSC_MAX:
{
diff --git a/libsrc/Wi/sqlintrp.c b/libsrc/Wi/sqlintrp.c
index 58df184..bdf9b26 100644
--- a/libsrc/Wi/sqlintrp.c
+++ b/libsrc/Wi/sqlintrp.c
@@ -1,14 +1,14 @@
/*
* sqlintrp.c
*
- * $Id: sqlintrp.c,v 1.21.2.15 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlintrp.c,v 1.21.2.13 2010/11/15 16:51:56 source Exp $
*
* SQL interpreter
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -877,7 +877,6 @@ ins_subq (instruction_t * ins, caddr_t * qst)
cli->cli_anytime_started = at_start;
if (err == (caddr_t) SQL_NO_DATA_FOUND
&& ins->_.subq.query->qr_select_node
- && ins->_.subq.query->qr_select_node->sel_out_slots
&& BOX_ELEMENTS (ins->_.subq.query->qr_select_node->sel_out_slots) > 0
&& ins->_.subq.query->qr_select_node->sel_out_slots[0])
qst_set_bin_string (qst, ins->_.subq.query->qr_select_node->sel_out_slots[0], (db_buf_t) "", 0, DV_DB_NULL);
diff --git a/libsrc/Wi/sqlintrp.h b/libsrc/Wi/sqlintrp.h
index 31a8449..bfefe06 100644
--- a/libsrc/Wi/sqlintrp.h
+++ b/libsrc/Wi/sqlintrp.h
@@ -1,14 +1,14 @@
/*
* sqlintrp.h
*
- * $Id: sqlintrp.h,v 1.6.2.4 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlintrp.h,v 1.6.2.3 2011/05/17 21:14:47 source Exp $
*
* SQL Interpreter Run Time Data
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlinx.c b/libsrc/Wi/sqlinx.c
index 543b0e4..2993aa0 100644
--- a/libsrc/Wi/sqlinx.c
+++ b/libsrc/Wi/sqlinx.c
@@ -1,12 +1,12 @@
/*
- * $Id: sqlinx.c,v 1.1.2.8 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlinx.c,v 1.1.2.7 2010/03/24 01:02:12 source Exp $
*
* Index selection
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/sqlnode.h b/libsrc/Wi/sqlnode.h
index e1d2bdd..b8b9912 100644
--- a/libsrc/Wi/sqlnode.h
+++ b/libsrc/Wi/sqlnode.h
@@ -1,14 +1,14 @@
/*
* sqlnode.h
*
- * $Id: sqlnode.h,v 1.30.2.17 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlnode.h,v 1.30.2.16 2010/10/29 14:12:27 source Exp $
*
* SQL query nodes
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlo.c b/libsrc/Wi/sqlo.c
index c11dafb..8833b6f 100644
--- a/libsrc/Wi/sqlo.c
+++ b/libsrc/Wi/sqlo.c
@@ -1,14 +1,14 @@
/*
* sqlo.c
*
- * $Id: sqlo.c,v 1.15.2.19 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlo.c,v 1.15.2.17 2011/03/17 13:55:20 source Exp $
*
* sql scope inference
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -2992,8 +2992,6 @@ sqlo_scalar_subq_scope (sqlo_t * so, ST ** ptree)
dk_set_t s;
sql_scope_t * sco = so->so_scope;
ST * org, * res;
- if (!sco)
- SQL_GPF_T1 (so->so_sc->sc_cc, "no scope");
for (s = sco->sco_scalar_subqs; s; s = s->next->next)
{
org = (ST*)s->data;
diff --git a/libsrc/Wi/sqlo.h b/libsrc/Wi/sqlo.h
index 355ebf3..47fcb9d 100644
--- a/libsrc/Wi/sqlo.h
+++ b/libsrc/Wi/sqlo.h
@@ -1,14 +1,14 @@
/*
* sqlo.h
*
- * $Id: sqlo.h,v 1.22.2.15 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlo.h,v 1.22.2.14 2011/10/13 11:05:09 source Exp $
*
* sql opt graph
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqloby.c b/libsrc/Wi/sqloby.c
index b0eb07b..22c27ec 100644
--- a/libsrc/Wi/sqloby.c
+++ b/libsrc/Wi/sqloby.c
@@ -1,14 +1,14 @@
/*
* sqloby.c
*
- * $Id: sqloby.c,v 1.7.2.8 2012/03/08 12:55:36 source Exp $
+ * $Id: sqloby.c,v 1.7.2.6 2010/03/08 12:04:13 source Exp $
*
* sql order and group compilation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -841,7 +841,6 @@ sqlo_post_oby_ref (sqlo_t * so, df_elt_t * dt_dfe, df_elt_t * sel_dfe, int inx)
/* if exps laid out after oby, add the cols refd therein to oby deps */
dk_set_t deps = NULL;
df_elt_t * oby_dfe = dt_dfe->_.sub.last;
- int __i;
while (oby_dfe)
{
if (DFE_ORDER == oby_dfe->dfe_type)
@@ -850,13 +849,6 @@ sqlo_post_oby_ref (sqlo_t * so, df_elt_t * dt_dfe, df_elt_t * sel_dfe, int inx)
}
if (!oby_dfe)
return;
- DO_BOX (ST *, spec, __i, oby_dfe->_.setp.specs)
- {
- df_elt_t * spec_dfe = sqlo_df (so, spec->_.o_spec.col);
- if (spec_dfe == sel_dfe)
- return;
- }
- END_DO_BOX;
sqlo_exp_cols_from_dt (so, sel_dfe->dfe_tree, dt_dfe, &deps);
if (!oby_dfe->_.setp.oby_dep_cols)
{
diff --git a/libsrc/Wi/sqlocr.c b/libsrc/Wi/sqlocr.c
index 653ecb3..efb97cb 100644
--- a/libsrc/Wi/sqlocr.c
+++ b/libsrc/Wi/sqlocr.c
@@ -1,14 +1,14 @@
/*
* sqlocr.c
*
- * $Id: sqlocr.c,v 1.4.2.4 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlocr.c,v 1.4.2.3 2010/02/18 10:57:17 source Exp $
*
* sql opt cursors inference
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlocr.h b/libsrc/Wi/sqlocr.h
index c4e97ba..0b66764 100644
--- a/libsrc/Wi/sqlocr.h
+++ b/libsrc/Wi/sqlocr.h
@@ -1,12 +1,12 @@
/*
* sqlocr.h
*
- * $Id: sqlocr.h,v 1.4.2.2 2012/03/08 12:55:36 source Exp $
+ * $Id: sqlocr.h,v 1.4.2.1 2009/04/18 21:55:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlofn.h b/libsrc/Wi/sqlofn.h
index d2f973f..c14f2a8 100644
--- a/libsrc/Wi/sqlofn.h
+++ b/libsrc/Wi/sqlofn.h
@@ -1,14 +1,14 @@
/*
* sqlofn.h
*
- * $Id: sqlofn.h,v 1.3.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlofn.h,v 1.3.2.1 2009/04/18 21:55:16 source Exp $
*
* sql opt export functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqloinv.c b/libsrc/Wi/sqloinv.c
index a4765f5..38d1558 100644
--- a/libsrc/Wi/sqloinv.c
+++ b/libsrc/Wi/sqloinv.c
@@ -1,14 +1,14 @@
/*
* sqloinv.c
*
- * $Id: sqloinv.c,v 1.6.2.5 2012/03/08 12:55:37 source Exp $
+ * $Id: sqloinv.c,v 1.6.2.4 2010/02/18 10:57:17 source Exp $
*
* sql inverse functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqloinv.h b/libsrc/Wi/sqloinv.h
index c1b734d..7733d53 100644
--- a/libsrc/Wi/sqloinv.h
+++ b/libsrc/Wi/sqloinv.h
@@ -1,12 +1,12 @@
/*
* sqloinv.h
*
- * $Id: sqloinv.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqloinv.h,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqloinx.c b/libsrc/Wi/sqloinx.c
index 57419e4..8010c40 100644
--- a/libsrc/Wi/sqloinx.c
+++ b/libsrc/Wi/sqloinx.c
@@ -1,14 +1,14 @@
/*
* sqloinx.c
*
- * $Id: sqloinx.c,v 1.17.2.6 2012/03/08 12:55:37 source Exp $
+ * $Id: sqloinx.c,v 1.17.2.5 2010/02/15 19:46:03 source Exp $
*
* sql expression dependencies and code layout
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlopcod.h b/libsrc/Wi/sqlopcod.h
index f5f0d13..ab45319 100644
--- a/libsrc/Wi/sqlopcod.h
+++ b/libsrc/Wi/sqlopcod.h
@@ -1,12 +1,12 @@
/*
* sqlopcod.h
*
- * $Id: sqlopcod.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlopcod.h,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqloprt.c b/libsrc/Wi/sqloprt.c
index 2dc973e..351b986 100644
--- a/libsrc/Wi/sqloprt.c
+++ b/libsrc/Wi/sqloprt.c
@@ -1,14 +1,14 @@
/*
* sqloprt.c
*
- * $Id: sqloprt.c,v 1.6.2.6 2012/03/12 10:17:23 source Exp $
+ * $Id: sqloprt.c,v 1.6.2.4 2011/06/22 13:30:38 source Exp $
*
* sql opt intermediate diag
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -332,12 +332,11 @@ sqlo_dfe_print (df_elt_t * dfe, int offset)
}
if (DFE_DT == dfe->dfe_type && dfe->_.sub.trans)
sqlo_print ((" dt transitive\n"));
- if (dfe->_.sub.first)
- for (elt = dfe->_.sub.first->dfe_next; elt; elt = elt->dfe_next)
- {
- sqlo_dfe_print (elt, offset + OFS_INCR);
- sqlo_print (("\n"));
- }
+ for (elt = dfe->_.sub.first->dfe_next; elt; elt = elt->dfe_next)
+ {
+ sqlo_dfe_print (elt, offset + OFS_INCR);
+ sqlo_print (("\n"));
+ }
sqlo_print (("%*.*s", offset, offset, " "));
sqlo_print (("}\n"));
diff --git a/libsrc/Wi/sqlorder.c b/libsrc/Wi/sqlorder.c
index 0c34c74..1b629ee 100644
--- a/libsrc/Wi/sqlorder.c
+++ b/libsrc/Wi/sqlorder.c
@@ -1,14 +1,14 @@
/*
* sqlorder.c
*
- * $Id: sqlorder.c,v 1.5.2.5 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlorder.c,v 1.5.2.4 2009/09/27 22:03:57 source Exp $
*
* SQL ORDER BY
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlovdb.c b/libsrc/Wi/sqlovdb.c
index 1ee21e6..3b02914 100644
--- a/libsrc/Wi/sqlovdb.c
+++ b/libsrc/Wi/sqlovdb.c
@@ -1,14 +1,14 @@
/*
* sqlovdb.c
*
- * $Id: sqlovdb.c,v 1.5.2.6 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlovdb.c,v 1.5.2.4 2010/09/17 16:50:59 source Exp $
*
* SQL remote table layout and emote SQL generation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -63,11 +63,6 @@ sqlo_depends_on_locus (df_elt_t * dfe, locus_t * loc)
subqueries & function calls.
*/
-int
-sqlo_rds_support_params_in_select (df_elt_t *dfe, locus_t *loc)
-{
- return 1;
-}
int
sqlo_is_local (sql_comp_t * sc, remote_ds_t * rds, ST * tree, int only_eq_comps)
diff --git a/libsrc/Wi/sqlpar.h b/libsrc/Wi/sqlpar.h
index 3ae48b6..1308e7f 100644
--- a/libsrc/Wi/sqlpar.h
+++ b/libsrc/Wi/sqlpar.h
@@ -1,14 +1,14 @@
/*
* sqlpar.h
*
- * $Id: sqlpar.h,v 1.3.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlpar.h,v 1.3.2.1 2009/04/18 21:55:16 source Exp $
*
* SQL Parse Tree
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlparext.h b/libsrc/Wi/sqlparext.h
index 026163a..47c6da5 100644
--- a/libsrc/Wi/sqlparext.h
+++ b/libsrc/Wi/sqlparext.h
@@ -1,14 +1,14 @@
/*
* sqlparext.h
*
- * $Id: sqlparext.h,v 1.12.2.8 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlparext.h,v 1.12.2.7 2010/02/18 10:57:17 source Exp $
*
* SQL Parse Tree defines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlpfn.c b/libsrc/Wi/sqlpfn.c
index dadd6ef..7eda756 100644
--- a/libsrc/Wi/sqlpfn.c
+++ b/libsrc/Wi/sqlpfn.c
@@ -1,14 +1,14 @@
/*
* sqlpfn.c
*
- * $Id: sqlpfn.c,v 1.20.2.9 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlpfn.c,v 1.20.2.8 2011/08/26 17:57:06 source Exp $
*
* Parser Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlpfn.h b/libsrc/Wi/sqlpfn.h
index 88b22de..7f07b7a 100644
--- a/libsrc/Wi/sqlpfn.h
+++ b/libsrc/Wi/sqlpfn.h
@@ -1,14 +1,14 @@
/*
* sqlpfn.h
*
- * $Id: sqlpfn.h,v 1.8.2.8 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlpfn.h,v 1.8.2.7 2011/08/26 17:57:06 source Exp $
*
* SQL Parser Utility Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlprocc.c b/libsrc/Wi/sqlprocc.c
index 0bf594d..1184079 100644
--- a/libsrc/Wi/sqlprocc.c
+++ b/libsrc/Wi/sqlprocc.c
@@ -1,14 +1,14 @@
/*
* sqlprocc.c
*
- * $Id: sqlprocc.c,v 1.7.2.6 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlprocc.c,v 1.7.2.5 2010/10/29 14:12:27 source Exp $
*
* SQL Procedure Compiler
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlprt.c b/libsrc/Wi/sqlprt.c
index a075853..6b1327c 100644
--- a/libsrc/Wi/sqlprt.c
+++ b/libsrc/Wi/sqlprt.c
@@ -1,14 +1,14 @@
/*
* sqlprt.c
*
- * $Id: sqlprt.c,v 1.6.2.4 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlprt.c,v 1.6.2.3 2009/08/19 07:29:55 source Exp $
*
* SQL Statement Printer
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlrbuf.c b/libsrc/Wi/sqlrbuf.c
index 5fd4005..c67d2d4 100644
--- a/libsrc/Wi/sqlrbuf.c
+++ b/libsrc/Wi/sqlrbuf.c
@@ -1,14 +1,14 @@
/*
* sqlrbuf.c
*
- * $Id: sqlrbuf.c,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlrbuf.c,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
*
* VDB SQL Remote query execution.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlrcomp.c b/libsrc/Wi/sqlrcomp.c
index 6872222..359a7bc 100644
--- a/libsrc/Wi/sqlrcomp.c
+++ b/libsrc/Wi/sqlrcomp.c
@@ -1,14 +1,14 @@
/*
* sqlrcomp.c
*
- * $Id: sqlrcomp.c,v 1.7.2.8 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlrcomp.c,v 1.7.2.7 2011/01/11 22:41:31 source Exp $
*
* SQL Compiler, VDB remote database access
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlrcomp.h b/libsrc/Wi/sqlrcomp.h
index 6945fc7..8c65600 100644
--- a/libsrc/Wi/sqlrcomp.h
+++ b/libsrc/Wi/sqlrcomp.h
@@ -1,12 +1,12 @@
/*
* sqlrcomp.h
*
- * $Id: sqlrcomp.h,v 1.6.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlrcomp.h,v 1.6.2.1 2009/04/18 21:55:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlrrun.c b/libsrc/Wi/sqlrrun.c
index 96566c2..d684f63 100644
--- a/libsrc/Wi/sqlrrun.c
+++ b/libsrc/Wi/sqlrrun.c
@@ -1,14 +1,14 @@
/*
* sqlrrun.c
*
- * $Id: sqlrrun.c,v 1.8.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlrrun.c,v 1.8.2.1 2009/04/18 21:55:16 source Exp $
*
* VDB SQL Remote query execution.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlrun.c b/libsrc/Wi/sqlrun.c
index c22b224..9a92539 100644
--- a/libsrc/Wi/sqlrun.c
+++ b/libsrc/Wi/sqlrun.c
@@ -1,14 +1,14 @@
/*
* sqlrun.c
*
- * $Id: sqlrun.c,v 1.24.2.24 2012/03/13 11:51:15 source Exp $
+ * $Id: sqlrun.c,v 1.24.2.21 2011/03/11 18:26:43 source Exp $
*
* SQL query execution
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -656,7 +656,7 @@ cli_terminate_in_itc_fail (client_connection_t * cli, it_cursor_t * itc, buffer_
lt->lt_status = LT_BLOWN_OFF;
if (itc)
itc_bust_this_trx (itc, buf, ITC_BUST_THROW);
- sqlr_new_error ("S1T00", "CLI..", "Client cancelled or disconnected");
+ sqlr_new_error ("S1T00", "{CLI..", "Client cancelled or disconnected");
}
}
@@ -3422,12 +3422,9 @@ qr_dml_array_exec (client_connection_t * cli, query_t * qr,
return err;
}
dk_free_box (detail);
- if (CALLER_LOCAL != caller)
- {
- for (inx = 0; inx < param_inx - 1; inx++)
- cli_send_row_count (cli, 0, NULL, self_thread);
- cli_send_row_count (cli, n_affected, NULL, self_thread);
- }
+ for (inx = 0; inx < param_inx - 1; inx++)
+ cli_send_row_count (cli, 0, NULL, self_thread);
+ cli_send_row_count (cli, n_affected, NULL, self_thread);
#ifdef WIRE_DEBUG
list_wired_buffers (__FILE__, __LINE__, "qr_exec finish");
#endif
diff --git a/libsrc/Wi/sqlsrv.c b/libsrc/Wi/sqlsrv.c
index f8fe873..8f9714a 100644
--- a/libsrc/Wi/sqlsrv.c
+++ b/libsrc/Wi/sqlsrv.c
@@ -1,14 +1,14 @@
/*
* sqlsrv.c
*
- * $Id: sqlsrv.c,v 1.36.2.37 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlsrv.c,v 1.36.2.33 2011/08/26 17:59:53 source Exp $
*
* SQL server functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -2353,12 +2353,6 @@ sf_sql_free_stmt (caddr_t stmt_id, int op)
dk_session_t *client = IMMEDIATE_CLIENT;
client_connection_t *cli = DKS_DB_DATA (client);
srv_stmt_t *stmt = cli_get_stmt_access (cli, stmt_id, GET_ANY, NULL);
- if (!stmt)
- {
- LEAVE_CLIENT (cli);
- DKST_RPC_DONE (IMMEDIATE_CLIENT);
- return 1;
- }
dbg_printf (("sf_sql_free_stmt %s %d\n", stmt->sst_id, op));
if (stmt->sst_cursor_state)
stmt_scroll_close (stmt);
@@ -2871,10 +2865,6 @@ sf_sql_get_data_trx_error (int code, caddr_t err_detail)
}
-#define BLOB_CHAR 0
-#define BLOB_WIDE 1
-#define BLOB_BIN 2
-
void
sf_sql_get_data (caddr_t stmt_id, long current_of, long nth_col,
long how_much, long starting_at)
@@ -2884,7 +2874,7 @@ sf_sql_get_data (caddr_t stmt_id, long current_of, long nth_col,
client_connection_t *cli = DKS_DB_DATA (client);
lock_trx_t *lt;
srv_stmt_t *stmt = cli_get_stmt_access (cli, stmt_id, GET_ANY, NULL);
- if (stmt && stmt->sst_inst)
+ if (stmt->sst_inst)
{
query_instance_t *qi = stmt->sst_inst;
caddr_t val;
@@ -2902,7 +2892,7 @@ sf_sql_get_data (caddr_t stmt_id, long current_of, long nth_col,
LEAVE_CLIENT (cli);
if (IS_BLOB_HANDLE (val))
{
- blob_send_bytes (qi->qi_trx, val, how_much, 0, BLOB_CHAR);
+ blob_send_bytes (qi->qi_trx, val, how_much, 0);
}
else
{
@@ -3002,14 +2992,15 @@ lt_enter_anyway (lock_trx_t * lt)
return rc;
}
+
void
-sf_sql_get_data_ac (long dp_from, long how_much, long starting_at, long bh_key_id, long bh_frag_no, long page_dir, caddr_t page_array, long blob_type, long timestamp)
+sf_sql_get_data_ac (long dp_from, long how_much, long starting_at, long bh_key_id, long bh_frag_no, long page_dir, caddr_t page_array, long is_wide, long timestamp)
{
int is_timeout;
dk_session_t *client = IMMEDIATE_CLIENT_OR_NULL;
client_connection_t *cli = DKS_DB_DATA (client);
lock_trx_t *trx;
- dtp_t bh_tag = blob_type == BLOB_WIDE ? DV_BLOB_WIDE_HANDLE : DV_BLOB_HANDLE;
+ dtp_t bh_tag = is_wide ? DV_BLOB_WIDE_HANDLE : DV_BLOB_HANDLE;
blob_handle_t * bh = bh_alloc (bh_tag);
dbe_key_t *key;
@@ -3055,7 +3046,7 @@ sf_sql_get_data_ac (long dp_from, long how_much, long starting_at, long bh_key_i
return;
}
trx = cli->cli_trx;
- blob_send_bytes (trx, (caddr_t) bh, how_much, 1, blob_type);
+ blob_send_bytes (trx, (caddr_t) bh, how_much, 1);
IN_TXN;
is_timeout = lt_leave (trx);
@@ -3070,9 +3061,8 @@ sf_sql_get_data_ac (long dp_from, long how_much, long starting_at, long bh_key_i
#ifdef SERIAL_CLI
CLI_WRAPPER (sf_sql_get_data_ac,
- (long dp_from, long how_much, long starting_at, long bh_key_id, long bh_frag_no, long page_dir, caddr_t page_array, long blob_type,
- long timestamp),
- (dp_from, how_much, starting_at, bh_key_id, bh_frag_no, page_dir, page_array, blob_type, timestamp))
+ (long dp_from, long how_much, long starting_at, long bh_key_id, long bh_frag_no, long page_dir, caddr_t page_array, long is_wide, long timestamp),
+ (dp_from, how_much, starting_at, bh_key_id, bh_frag_no, page_dir, page_array, is_wide, timestamp))
#define sf_sql_get_data_ac sf_sql_get_data_ac_w
#endif
@@ -3926,14 +3916,11 @@ srv_global_init (char *mode)
sec_read_grants (NULL, NULL, NULL, 0);
sec_read_tb_rls (NULL, NULL, NULL);
sinv_read_sql_inverses (NULL, bootstrap_cli);
- sqls_define_sparql_init ();
read_proc_and_trigger_tables (1);
read_proc_and_trigger_tables (0);
sec_read_grants (NULL, NULL, NULL, 1); /* call second time to do read of execute grants */
ddl_standard_procs ();
}
- else if (!in_crash_dump)
- sqls_define_sparql_init ();
ddl_obackup_init ();
ddl_ensure_stat_tables ();
diff --git a/libsrc/Wi/sqlstmts.c b/libsrc/Wi/sqlstmts.c
index 89d655f..f66629a 100644
--- a/libsrc/Wi/sqlstmts.c
+++ b/libsrc/Wi/sqlstmts.c
@@ -1,14 +1,14 @@
/*
* sqlstmts.c
*
- * $Id: sqlstmts.c,v 1.12.2.7 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlstmts.c,v 1.12.2.6 2011/07/19 23:30:14 source Exp $
*
* Dynamic SQL Statement Compilations
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqltrig.c b/libsrc/Wi/sqltrig.c
index 1b199db..4d5161b 100644
--- a/libsrc/Wi/sqltrig.c
+++ b/libsrc/Wi/sqltrig.c
@@ -1,14 +1,14 @@
/*
* sqltrig.c
*
- * $Id: sqltrig.c,v 1.5.2.3 2012/03/08 12:55:37 source Exp $
+ * $Id: sqltrig.c,v 1.5.2.2 2009/04/18 21:55:16 source Exp $
*
* Triggers
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqltype.c b/libsrc/Wi/sqltype.c
index cbcbe69..a22f1ba 100644
--- a/libsrc/Wi/sqltype.c
+++ b/libsrc/Wi/sqltype.c
@@ -1,14 +1,14 @@
/*
* sqltype.c
*
- * $Id: sqltype.c,v 1.16.2.9 2012/03/08 12:55:37 source Exp $
+ * $Id: sqltype.c,v 1.16.2.8 2010/11/15 16:51:57 source Exp $
*
* User defined types routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqltype.h b/libsrc/Wi/sqltype.h
index b2609c1..6ba3b9a 100644
--- a/libsrc/Wi/sqltype.h
+++ b/libsrc/Wi/sqltype.h
@@ -1,10 +1,10 @@
/*
- * $Id: sqltype.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqltype.h,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/sqltype_c.h b/libsrc/Wi/sqltype_c.h
index a1018a4..caa3407 100644
--- a/libsrc/Wi/sqltype_c.h
+++ b/libsrc/Wi/sqltype_c.h
@@ -1,10 +1,10 @@
/*
- * $Id: sqltype_c.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqltype_c.h,v 1.2.2.1 2009/04/18 21:55:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/sqlver.c b/libsrc/Wi/sqlver.c
index 4467a9b..9b75dc0 100644
--- a/libsrc/Wi/sqlver.c
+++ b/libsrc/Wi/sqlver.c
@@ -1,14 +1,14 @@
/*
* sqlver.c
*
- * $Id: sqlver.c,v 1.5.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlver.c,v 1.5.2.1 2009/04/18 21:55:16 source Exp $
*
* Build information
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlver.h b/libsrc/Wi/sqlver.h
index e78aa5a..11036c2 100644
--- a/libsrc/Wi/sqlver.h
+++ b/libsrc/Wi/sqlver.h
@@ -1,14 +1,14 @@
/*
* sqlver.h
*
- * $Id: sqlver.h,v 1.49.2.16 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlver.h,v 1.49.2.15 2011/02/03 09:25:01 source Exp $
*
* Build & Version information, license control
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
@@ -25,7 +25,7 @@
*
*/
-#define PRODUCT_COPYRIGHT "Copyright (C) 1998-2012 OpenLink Software"
+#define PRODUCT_COPYRIGHT "Copyright (C) 1998-2011 OpenLink Software"
#define PRODUCT_NAME "OpenLink Virtuoso"
/* DBMS Server */
diff --git a/libsrc/Wi/sqlview.c b/libsrc/Wi/sqlview.c
index 6ee3179..ee884fa 100644
--- a/libsrc/Wi/sqlview.c
+++ b/libsrc/Wi/sqlview.c
@@ -1,14 +1,14 @@
/*
* sqlview.c
*
- * $Id: sqlview.c,v 1.7.2.5 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlview.c,v 1.7.2.4 2010/11/15 16:51:57 source Exp $
*
* SQL Compiler, view, derived table, union
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/sqlwords.gperf b/libsrc/Wi/sqlwords.gperf
index 5036be4..3540a86 100644
--- a/libsrc/Wi/sqlwords.gperf
+++ b/libsrc/Wi/sqlwords.gperf
@@ -1,10 +1,10 @@
/*
- * $Id: sqlwords.gperf,v 1.11.2.4 2012/03/08 12:55:37 source Exp $
+ * $Id: sqlwords.gperf,v 1.11.2.3 2010/02/01 12:53:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/sqlwords.h b/libsrc/Wi/sqlwords.h
index 981f0c7..81b0a51 100644
--- a/libsrc/Wi/sqlwords.h
+++ b/libsrc/Wi/sqlwords.h
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.0.2 */
/* Command-line: /usr/bin/gperf -aCDGptr -Kkeiiyword -L ANSI-C -k'1,2,3,6,9,$' -Nlex_hash_kw ./sqlwords.gperf */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -34,9 +34,9 @@ struct keyword { char *keiiyword; int token; };
#define TOTAL_KEYWORDS 312
#define MIN_WORD_LENGTH 1
#define MAX_WORD_LENGTH 17
-#define MIN_HASH_VALUE 199
-#define MAX_HASH_VALUE 2366
-/* maximum key range = 2168, duplicates = 0 */
+#define MIN_HASH_VALUE 87
+#define MAX_HASH_VALUE 2329
+/* maximum key range = 2243, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -50,32 +50,32 @@ hash (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 236, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 85, 403, 99, 360, 190,
- 301, 345, 258, 307, 265, 292, 457, 352, 17, 202,
- 317, 320, 420, 500, 366, 117, 94, 112, 164, 160,
- 22, 2367, 2367, 2367, 2367, 426, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367, 2367,
- 2367, 2367, 2367, 2367, 2367, 2367, 2367
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 253, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 33, 497, 43, 161, 22,
+ 300, 413, 376, 492, 40, 207, 241, 254, 42, 424,
+ 103, 333, 58, 365, 479, 199, 352, 389, 134, 86,
+ 241, 2330, 2330, 2330, 2330, 73, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330, 2330,
+ 2330, 2330, 2330, 2330, 2330, 2330, 2330
};
register int hval = len;
@@ -108,628 +108,628 @@ static const struct keyword wordlist[] =
{
#line 67 "./sqlwords.gperf"
{"C", C},
-#line 214 "./sqlwords.gperf"
- {"ON", ON},
-#line 47 "./sqlwords.gperf"
- {"ANY", ANY},
#line 198 "./sqlwords.gperf"
{"NAME", NAME_L},
-#line 157 "./sqlwords.gperf"
- {"IN", IN_L},
-#line 315 "./sqlwords.gperf"
- {"UNION", UNION},
-#line 204 "./sqlwords.gperf"
- {"NO", NO_L},
+#line 245 "./sqlwords.gperf"
+ {"REMOTE", REMOTE},
+#line 124 "./sqlwords.gperf"
+ {"END", ENDX},
+#line 46 "./sqlwords.gperf"
+ {"AND", AND},
#line 41 "./sqlwords.gperf"
{"ADMIN", ADMIN_L},
-#line 201 "./sqlwords.gperf"
- {"NEW", NEW},
#line 97 "./sqlwords.gperf"
{"CUBE", CUBE},
-#line 180 "./sqlwords.gperf"
- {"JAVA", JAVA},
-#line 208 "./sqlwords.gperf"
- {"NUMERIC", NUMERIC},
-#line 175 "./sqlwords.gperf"
- {"INTO", INTO},
+#line 314 "./sqlwords.gperf"
+ {"UNDER", UNDER},
+#line 315 "./sqlwords.gperf"
+ {"UNION", UNION},
+#line 316 "./sqlwords.gperf"
+ {"UNIQUE", UNIQUE},
+#line 232 "./sqlwords.gperf"
+ {"PRIMARY", PRIMARY},
+#line 253 "./sqlwords.gperf"
+ {"RETURN", RETURN},
+#line 317 "./sqlwords.gperf"
+ {"UPDATE", UPDATE},
+#line 40 "./sqlwords.gperf"
+ {"ADD", ADD},
+#line 256 "./sqlwords.gperf"
+ {"REXECUTE", REXECUTE},
+#line 47 "./sqlwords.gperf"
+ {"ANY", ANY},
+#line 78 "./sqlwords.gperf"
+ {"CLOSE", CLOSE},
+#line 48 "./sqlwords.gperf"
+ {"ARE", ARE},
+#line 104 "./sqlwords.gperf"
+ {"DATE", DATE_L},
+#line 117 "./sqlwords.gperf"
+ {"DROP", DROP},
#line 103 "./sqlwords.gperf"
{"DATA", DATA},
-#line 46 "./sqlwords.gperf"
- {"AND", AND},
-#line 182 "./sqlwords.gperf"
- {"KEY", KEY},
-#line 216 "./sqlwords.gperf"
- {"OPTION", OPTION},
-#line 160 "./sqlwords.gperf"
- {"INDEX", INDEX},
-#line 329 "./sqlwords.gperf"
- {"WHEN", WHEN},
-#line 85 "./sqlwords.gperf"
- {"COLUMN", COLUMN},
-#line 203 "./sqlwords.gperf"
- {"NOT", NOT},
-#line 92 "./sqlwords.gperf"
- {"CONTINUE", CONTINUE},
-#line 66 "./sqlwords.gperf"
- {"BY", BY},
-#line 322 "./sqlwords.gperf"
- {"VALUE", VALUE},
+#line 107 "./sqlwords.gperf"
+ {"DECLARE", DECLARE},
#line 235 "./sqlwords.gperf"
{"PUBLIC", PUBLIC},
-#line 71 "./sqlwords.gperf"
- {"CASE", CASE},
-#line 301 "./sqlwords.gperf"
- {"TABLE", TABLE},
-#line 314 "./sqlwords.gperf"
- {"UNDER", UNDER},
-#line 146 "./sqlwords.gperf"
- {"GO", GO},
+#line 95 "./sqlwords.gperf"
+ {"CREATE", CREATE},
+#line 234 "./sqlwords.gperf"
+ {"PROCEDURE", PROCEDURE},
+#line 109 "./sqlwords.gperf"
+ {"DELETE", DELETE_L},
+#line 180 "./sqlwords.gperf"
+ {"JAVA", JAVA},
+#line 214 "./sqlwords.gperf"
+ {"ON", ON},
+#line 255 "./sqlwords.gperf"
+ {"REVOKE", REVOKE},
+#line 45 "./sqlwords.gperf"
+ {"ALTER", ALTER},
+#line 217 "./sqlwords.gperf"
+ {"OR", OR},
+#line 49 "./sqlwords.gperf"
+ {"ARRAY", ARRAY},
#line 181 "./sqlwords.gperf"
{"JOIN", JOIN},
-#line 104 "./sqlwords.gperf"
- {"DATE", DATE_L},
-#line 124 "./sqlwords.gperf"
- {"END", ENDX},
-#line 115 "./sqlwords.gperf"
- {"DO", DO},
-#line 253 "./sqlwords.gperf"
- {"RETURN", RETURN},
+#line 246 "./sqlwords.gperf"
+ {"RENAME", RENAME},
#line 199 "./sqlwords.gperf"
{"NATURAL", NATURAL},
-#line 308 "./sqlwords.gperf"
- {"TO", TO},
-#line 316 "./sqlwords.gperf"
- {"UNIQUE", UNIQUE},
-#line 333 "./sqlwords.gperf"
- {"WITH", WITH},
-#line 219 "./sqlwords.gperf"
- {"OUT", OUT_L},
-#line 211 "./sqlwords.gperf"
- {"OF", OF},
-#line 170 "./sqlwords.gperf"
- {"INT", INTEGER},
-#line 321 "./sqlwords.gperf"
- {"VALIDATE", VALIDATE_L},
-#line 328 "./sqlwords.gperf"
- {"VIEW", VIEW},
-#line 332 "./sqlwords.gperf"
- {"WHILE", WHILE},
-#line 296 "./sqlwords.gperf"
- {"T_MIN", T_MIN},
-#line 215 "./sqlwords.gperf"
- {"OPEN", OPEN},
-#line 200 "./sqlwords.gperf"
- {"NCHAR", NCHAR},
+#line 182 "./sqlwords.gperf"
+ {"KEY", KEY},
+#line 218 "./sqlwords.gperf"
+ {"ORDER", ORDER},
+#line 96 "./sqlwords.gperf"
+ {"CROSS", CROSS},
+#line 68 "./sqlwords.gperf"
+ {"CALL", CALL},
#line 55 "./sqlwords.gperf"
{"AUTHORIZATION", AUTHORIZATION},
-#line 220 "./sqlwords.gperf"
- {"OUTER", OUTER},
-#line 83 "./sqlwords.gperf"
- {"COBOL", COBOL},
-#line 331 "./sqlwords.gperf"
- {"WHERE", WHERE},
-#line 147 "./sqlwords.gperf"
- {"GOTO", GOTO},
-#line 133 "./sqlwords.gperf"
- {"FETCH", FETCH},
-#line 59 "./sqlwords.gperf"
- {"BEGIN", BEGINX},
-#line 306 "./sqlwords.gperf"
- {"TIME", TIME},
-#line 168 "./sqlwords.gperf"
- {"INSTANCE", INSTANCE_L},
-#line 156 "./sqlwords.gperf"
- {"IF", IF},
-#line 274 "./sqlwords.gperf"
- {"SOME", SOME},
-#line 72 "./sqlwords.gperf"
- {"CAST", CAST},
-#line 173 "./sqlwords.gperf"
- {"INTERNAL", INTERNAL},
-#line 61 "./sqlwords.gperf"
- {"BETWEEN", BETWEEN},
+#line 157 "./sqlwords.gperf"
+ {"IN", IN_L},
+#line 71 "./sqlwords.gperf"
+ {"CASE", CASE},
+#line 301 "./sqlwords.gperf"
+ {"TABLE", TABLE},
+#line 201 "./sqlwords.gperf"
+ {"NEW", NEW},
#line 42 "./sqlwords.gperf"
{"AFTER", AFTER},
-#line 39 "./sqlwords.gperf"
- {"ADA", ADA},
-#line 131 "./sqlwords.gperf"
- {"EXTRACT", EXTRACT},
-#line 304 "./sqlwords.gperf"
- {"THEN", THEN},
-#line 206 "./sqlwords.gperf"
- {"NULL", NULLX},
-#line 164 "./sqlwords.gperf"
- {"INNER", INNER},
-#line 143 "./sqlwords.gperf"
- {"FUNCTION", FUNCTION},
+#line 125 "./sqlwords.gperf"
+ {"ESCAPE", ESCAPE},
+#line 51 "./sqlwords.gperf"
+ {"ASC", ASC},
+#line 122 "./sqlwords.gperf"
+ {"ENABLE", ENABLE_L},
+#line 106 "./sqlwords.gperf"
+ {"DECIMAL", DECIMAL_L},
+#line 294 "./sqlwords.gperf"
+ {"T_IN", T_IN},
+#line 200 "./sqlwords.gperf"
+ {"NCHAR", NCHAR},
+#line 296 "./sqlwords.gperf"
+ {"T_MIN", T_MIN},
#line 130 "./sqlwords.gperf"
{"EXTERNAL", EXTERNAL},
-#line 75 "./sqlwords.gperf"
- {"CHECK", CHECK},
-#line 140 "./sqlwords.gperf"
- {"FOUND", FOUND},
-#line 286 "./sqlwords.gperf"
- {"SYNC", SYNC},
-#line 153 "./sqlwords.gperf"
- {"HASH", HASH},
-#line 295 "./sqlwords.gperf"
- {"T_MAX", T_MAX},
+#line 327 "./sqlwords.gperf"
+ {"VECTOR", VECTOR_L},
+#line 69 "./sqlwords.gperf"
+ {"CALLED", CALLED},
+#line 313 "./sqlwords.gperf"
+ {"TRIGGER", TRIGGER},
+#line 322 "./sqlwords.gperf"
+ {"VALUE", VALUE},
+#line 66 "./sqlwords.gperf"
+ {"BY", BY},
#line 132 "./sqlwords.gperf"
{"EXIT", EXIT},
-#line 197 "./sqlwords.gperf"
- {"MUMPS", MUMPS},
-#line 122 "./sqlwords.gperf"
- {"ENABLE", ENABLE_L},
-#line 68 "./sqlwords.gperf"
- {"CALL", CALL},
-#line 40 "./sqlwords.gperf"
- {"ADD", ADD},
-#line 48 "./sqlwords.gperf"
- {"ARE", ARE},
-#line 174 "./sqlwords.gperf"
- {"INTERVAL", INTERVAL},
-#line 317 "./sqlwords.gperf"
- {"UPDATE", UPDATE},
-#line 165 "./sqlwords.gperf"
- {"INOUT", INOUT_L},
-#line 245 "./sqlwords.gperf"
- {"REMOTE", REMOTE},
-#line 166 "./sqlwords.gperf"
- {"INPUT", INPUT},
-#line 88 "./sqlwords.gperf"
- {"COMPRESS", COMPRESS},
+#line 149 "./sqlwords.gperf"
+ {"GROUP", GROUP},
+#line 254 "./sqlwords.gperf"
+ {"RETURNS", RETURNS},
+#line 236 "./sqlwords.gperf"
+ {"PURGE", PURGE},
+#line 160 "./sqlwords.gperf"
+ {"INDEX", INDEX},
+#line 321 "./sqlwords.gperf"
+ {"VALIDATE", VALIDATE_L},
#line 110 "./sqlwords.gperf"
{"DESC", DESC},
-#line 324 "./sqlwords.gperf"
- {"VARBINARY", VARBINARY},
-#line 334 "./sqlwords.gperf"
- {"WITHOUT", WITHOUT_L},
-#line 184 "./sqlwords.gperf"
- {"LANGUAGE", LANGUAGE},
-#line 310 "./sqlwords.gperf"
- {"TYPE", TYPE},
-#line 116 "./sqlwords.gperf"
- {"DOUBLE", DOUBLE_L},
-#line 217 "./sqlwords.gperf"
- {"OR", OR},
-#line 51 "./sqlwords.gperf"
- {"ASC", ASC},
-#line 86 "./sqlwords.gperf"
- {"COMMIT", COMMIT},
-#line 171 "./sqlwords.gperf"
- {"INTEGER", INTEGER},
-#line 105 "./sqlwords.gperf"
- {"DATETIME", DATETIME},
-#line 78 "./sqlwords.gperf"
- {"CLOSE", CLOSE},
-#line 194 "./sqlwords.gperf"
- {"MODIFY", MODIFY},
-#line 294 "./sqlwords.gperf"
- {"T_IN", T_IN},
-#line 270 "./sqlwords.gperf"
- {"SHUTDOWN", SHUTDOWN},
-#line 265 "./sqlwords.gperf"
- {"SCHEMA", SCHEMA},
-#line 285 "./sqlwords.gperf"
- {"STYLE", STYLE},
-#line 45 "./sqlwords.gperf"
- {"ALTER", ALTER},
-#line 256 "./sqlwords.gperf"
- {"REXECUTE", REXECUTE},
-#line 303 "./sqlwords.gperf"
- {"TEXT", TEXT_L},
-#line 50 "./sqlwords.gperf"
- {"AS", AS},
-#line 53 "./sqlwords.gperf"
- {"ATTACH", ATTACH},
-#line 207 "./sqlwords.gperf"
- {"NULLIF", NULLIF},
-#line 98 "./sqlwords.gperf"
- {"CURRENT", CURRENT},
+#line 81 "./sqlwords.gperf"
+ {"CLR", CLR},
+#line 163 "./sqlwords.gperf"
+ {"INDICATOR", INDICATOR},
+#line 141 "./sqlwords.gperf"
+ {"FROM", FROM},
+#line 79 "./sqlwords.gperf"
+ {"CLUSTER", CLUSTER},
+#line 39 "./sqlwords.gperf"
+ {"ADA", ADA},
+#line 102 "./sqlwords.gperf"
+ {"CURSOR", CURSOR},
+#line 295 "./sqlwords.gperf"
+ {"T_MAX", T_MAX},
+#line 127 "./sqlwords.gperf"
+ {"EXCLUSIVE", EXCLUSIVE},
+#line 206 "./sqlwords.gperf"
+ {"NULL", NULLX},
+#line 239 "./sqlwords.gperf"
+ {"READ", READ_L},
#line 70 "./sqlwords.gperf"
{"CASCADE", CASCADE},
-#line 255 "./sqlwords.gperf"
- {"REVOKE", REVOKE},
-#line 335 "./sqlwords.gperf"
- {"WORK", WORK},
-#line 318 "./sqlwords.gperf"
- {"USE", USE},
-#line 139 "./sqlwords.gperf"
- {"FORTRAN", FORTRAN},
-#line 261 "./sqlwords.gperf"
- {"SAFE", SAFE_L},
-#line 236 "./sqlwords.gperf"
- {"PURGE", PURGE},
#line 196 "./sqlwords.gperf"
{"MODULE", MODULE},
-#line 119 "./sqlwords.gperf"
- {"DYNAMIC", DYNAMIC},
-#line 169 "./sqlwords.gperf"
- {"INSTEAD", INSTEAD},
-#line 337 "./sqlwords.gperf"
- {"XPATH", XPATH},
-#line 152 "./sqlwords.gperf"
- {"HAVING", HAVING},
-#line 212 "./sqlwords.gperf"
- {"OFF", OFF},
-#line 151 "./sqlwords.gperf"
- {"HANDLER", HANDLER},
+#line 83 "./sqlwords.gperf"
+ {"COBOL", COBOL},
+#line 184 "./sqlwords.gperf"
+ {"LANGUAGE", LANGUAGE},
#line 260 "./sqlwords.gperf"
{"ROLE", ROLE_L},
-#line 49 "./sqlwords.gperf"
- {"ARRAY", ARRAY},
-#line 269 "./sqlwords.gperf"
- {"SET", SET},
-#line 275 "./sqlwords.gperf"
- {"SOURCE", SOURCE},
-#line 73 "./sqlwords.gperf"
- {"CHAR", CHARACTER},
-#line 325 "./sqlwords.gperf"
- {"VARCHAR", VARCHAR},
-#line 330 "./sqlwords.gperf"
- {"WHENEVER", WHENEVER},
-#line 262 "./sqlwords.gperf"
- {"SAME_AS", SAME_AS},
-#line 246 "./sqlwords.gperf"
- {"RENAME", RENAME},
-#line 209 "./sqlwords.gperf"
- {"NVARCHAR", NVARCHAR},
-#line 205 "./sqlwords.gperf"
- {"NOVALIDATE", NOVALIDATE_L},
-#line 95 "./sqlwords.gperf"
- {"CREATE", CREATE},
+#line 27 "./sqlwords.gperf"
+ {"__TAG", __TAG_L},
+#line 50 "./sqlwords.gperf"
+ {"AS", AS},
#line 120 "./sqlwords.gperf"
{"ELSE", ELSE},
-#line 309 "./sqlwords.gperf"
- {"TOP", TOP},
-#line 191 "./sqlwords.gperf"
- {"LONG", LONG_L},
-#line 213 "./sqlwords.gperf"
- {"OLD", OLD},
-#line 76 "./sqlwords.gperf"
- {"CHECKED", CHECKED},
-#line 84 "./sqlwords.gperf"
- {"COLLATE", COLLATE},
-#line 229 "./sqlwords.gperf"
- {"POSITION", POSITION_L},
-#line 128 "./sqlwords.gperf"
- {"EXECUTE", EXECUTE},
-#line 186 "./sqlwords.gperf"
- {"LEVEL", LEVEL_L},
-#line 123 "./sqlwords.gperf"
- {"ENCODING", ENCODING},
-#line 142 "./sqlwords.gperf"
- {"FULL", FULL},
-#line 320 "./sqlwords.gperf"
- {"USING", USING},
-#line 218 "./sqlwords.gperf"
- {"ORDER", ORDER},
-#line 63 "./sqlwords.gperf"
- {"BINARY", BINARY},
-#line 183 "./sqlwords.gperf"
- {"KEYSET", KEYSET},
-#line 254 "./sqlwords.gperf"
- {"RETURNS", RETURNS},
+#line 44 "./sqlwords.gperf"
+ {"ALL", ALL},
+#line 302 "./sqlwords.gperf"
+ {"TEMPORARY", TEMPORARY},
+#line 61 "./sqlwords.gperf"
+ {"BETWEEN", BETWEEN},
+#line 32 "./sqlwords.gperf"
+ {"__SOAP_NAME", __SOAP_NAME},
#line 242 "./sqlwords.gperf"
{"REF", REF},
-#line 69 "./sqlwords.gperf"
- {"CALLED", CALLED},
-#line 190 "./sqlwords.gperf"
- {"LOG", LOGX},
-#line 79 "./sqlwords.gperf"
- {"CLUSTER", CLUSTER},
-#line 134 "./sqlwords.gperf"
- {"FINAL", FINAL_L},
-#line 221 "./sqlwords.gperf"
- {"OVERRIDING", OVERRIDING},
+#line 193 "./sqlwords.gperf"
+ {"METHOD", METHOD},
+#line 37 "./sqlwords.gperf"
+ {"__SOAP_ENC_MIME", __SOAP_ENC_MIME},
+#line 85 "./sqlwords.gperf"
+ {"COLUMN", COLUMN},
+#line 216 "./sqlwords.gperf"
+ {"OPTION", OPTION},
+#line 171 "./sqlwords.gperf"
+ {"INTEGER", INTEGER},
+#line 30 "./sqlwords.gperf"
+ {"__SOAP_HEADER", __SOAP_HEADER},
+#line 241 "./sqlwords.gperf"
+ {"REAL", REAL},
+#line 208 "./sqlwords.gperf"
+ {"NUMERIC", NUMERIC},
#line 118 "./sqlwords.gperf"
{"DTD", DTD},
-#line 326 "./sqlwords.gperf"
- {"VARIABLE", VARIABLE},
-#line 144 "./sqlwords.gperf"
- {"GENERAL", GENERAL},
-#line 109 "./sqlwords.gperf"
- {"DELETE", DELETE_L},
+#line 332 "./sqlwords.gperf"
+ {"WHILE", WHILE},
+#line 261 "./sqlwords.gperf"
+ {"SAFE", SAFE_L},
+#line 233 "./sqlwords.gperf"
+ {"PRIVILEGES", PRIVILEGES},
#line 99 "./sqlwords.gperf"
{"CURRENT_DATE", CURRENT_DATE},
-#line 93 "./sqlwords.gperf"
- {"CONVERT", CONVERT},
+#line 262 "./sqlwords.gperf"
+ {"SAME_AS", SAME_AS},
+#line 33 "./sqlwords.gperf"
+ {"__SOAP_TYPE", __SOAP_TYPE},
+#line 325 "./sqlwords.gperf"
+ {"VARCHAR", VARCHAR},
+#line 250 "./sqlwords.gperf"
+ {"RESIGNAL", RESIGNAL},
+#line 213 "./sqlwords.gperf"
+ {"OLD", OLD},
+#line 274 "./sqlwords.gperf"
+ {"SOME", SOME},
+#line 197 "./sqlwords.gperf"
+ {"MUMPS", MUMPS},
+#line 215 "./sqlwords.gperf"
+ {"OPEN", OPEN},
#line 192 "./sqlwords.gperf"
{"LOOP", LOOP},
-#line 100 "./sqlwords.gperf"
- {"CURRENT_TIME", CURRENT_TIME},
-#line 176 "./sqlwords.gperf"
- {"IS", IS},
-#line 222 "./sqlwords.gperf"
- {"PARTITION", PARTITION},
-#line 89 "./sqlwords.gperf"
- {"CONSTRAINT", CONSTRAINT},
-#line 91 "./sqlwords.gperf"
- {"CONTAINS", CONTAINS},
-#line 27 "./sqlwords.gperf"
- {"__TAG", __TAG_L},
-#line 302 "./sqlwords.gperf"
- {"TEMPORARY", TEMPORARY},
-#line 58 "./sqlwords.gperf"
- {"BEFORE", BEFORE},
-#line 336 "./sqlwords.gperf"
- {"XML", XML},
-#line 60 "./sqlwords.gperf"
- {"BEST", BEST},
-#line 224 "./sqlwords.gperf"
- {"PASSWORD", PASSWORD},
-#line 96 "./sqlwords.gperf"
- {"CROSS", CROSS},
-#line 319 "./sqlwords.gperf"
- {"USER", USER},
-#line 202 "./sqlwords.gperf"
- {"NONINCREMENTAL", NONINCREMENTAL},
-#line 267 "./sqlwords.gperf"
- {"SELF", SELF_L},
+#line 194 "./sqlwords.gperf"
+ {"MODIFY", MODIFY},
#line 228 "./sqlwords.gperf"
{"PLI", PLI},
-#line 44 "./sqlwords.gperf"
- {"ALL", ALL},
-#line 257 "./sqlwords.gperf"
- {"RIGHT", RIGHT},
-#line 258 "./sqlwords.gperf"
- {"ROLLBACK", ROLLBACK},
-#line 54 "./sqlwords.gperf"
- {"ATTRIBUTE", ATTRIBUTE},
-#line 185 "./sqlwords.gperf"
- {"LEFT", LEFT},
-#line 249 "./sqlwords.gperf"
- {"REPLICATION", REPLICATION},
-#line 137 "./sqlwords.gperf"
- {"FOREACH", FOREACH},
-#line 77 "./sqlwords.gperf"
- {"CHECKPOINT", CHECKPOINT},
-#line 138 "./sqlwords.gperf"
- {"FOREIGN", FOREIGN},
-#line 239 "./sqlwords.gperf"
- {"READ", READ_L},
-#line 193 "./sqlwords.gperf"
- {"METHOD", METHOD},
-#line 141 "./sqlwords.gperf"
- {"FROM", FROM},
-#line 225 "./sqlwords.gperf"
- {"PERCENT", PERCENT},
-#line 82 "./sqlwords.gperf"
- {"COALESCE", COALESCE},
-#line 149 "./sqlwords.gperf"
- {"GROUP", GROUP},
-#line 87 "./sqlwords.gperf"
- {"COMMITTED", COMMITTED_L},
-#line 188 "./sqlwords.gperf"
- {"LIKE", LIKE},
-#line 273 "./sqlwords.gperf"
- {"SOFT", SOFT},
-#line 117 "./sqlwords.gperf"
- {"DROP", DROP},
-#line 43 "./sqlwords.gperf"
- {"AGGREGATE", AGGREGATE},
-#line 114 "./sqlwords.gperf"
- {"DISTINCT", DISTINCT},
-#line 136 "./sqlwords.gperf"
- {"FOR", FOR},
-#line 167 "./sqlwords.gperf"
- {"INSERT", INSERT},
-#line 101 "./sqlwords.gperf"
- {"CURRENT_TIMESTAMP", CURRENT_TIMESTAMP},
-#line 125 "./sqlwords.gperf"
- {"ESCAPE", ESCAPE},
-#line 111 "./sqlwords.gperf"
- {"DETERMINISTIC", DETERMINISTIC},
+#line 131 "./sqlwords.gperf"
+ {"EXTRACT", EXTRACT},
+#line 220 "./sqlwords.gperf"
+ {"OUTER", OUTER},
+#line 336 "./sqlwords.gperf"
+ {"XML", XML},
#line 56 "./sqlwords.gperf"
{"AUTOREGISTER", AUTOREGISTER_L},
-#line 154 "./sqlwords.gperf"
- {"IDENTITY", IDENTITY},
-#line 135 "./sqlwords.gperf"
- {"FLOAT", FLOAT_L},
-#line 163 "./sqlwords.gperf"
- {"INDICATOR", INDICATOR},
-#line 187 "./sqlwords.gperf"
- {"LIBRARY", LIBRARY_L},
-#line 126 "./sqlwords.gperf"
- {"EXCEPT", EXCEPT},
-#line 281 "./sqlwords.gperf"
- {"SQLSTATE", SQLSTATE_L},
-#line 250 "./sqlwords.gperf"
- {"RESIGNAL", RESIGNAL},
-#line 106 "./sqlwords.gperf"
- {"DECIMAL", DECIMAL_L},
-#line 64 "./sqlwords.gperf"
- {"BITMAP", BITMAPPED},
-#line 264 "./sqlwords.gperf"
- {"UNRESTRICTED", UNRESTRICTED_L},
-#line 283 "./sqlwords.gperf"
- {"STATIC", STATIC_L},
-#line 241 "./sqlwords.gperf"
- {"REAL", REAL},
-#line 305 "./sqlwords.gperf"
- {"TIES", TIES},
-#line 81 "./sqlwords.gperf"
- {"CLR", CLR},
-#line 299 "./sqlwords.gperf"
- {"T_OUT", T_OUT},
+#line 318 "./sqlwords.gperf"
+ {"USE", USE},
+#line 204 "./sqlwords.gperf"
+ {"NO", NO_L},
+#line 186 "./sqlwords.gperf"
+ {"LEVEL", LEVEL_L},
+#line 133 "./sqlwords.gperf"
+ {"FETCH", FETCH},
#line 57 "./sqlwords.gperf"
{"BACKUP", BACKUP},
-#line 327 "./sqlwords.gperf"
- {"VECTOR", VECTOR_L},
-#line 238 "./sqlwords.gperf"
- {"RDF_BOX", RDF_BOX_L},
-#line 289 "./sqlwords.gperf"
- {"T_DIRECTION", T_DIRECTION},
+#line 88 "./sqlwords.gperf"
+ {"COMPRESS", COMPRESS},
+#line 76 "./sqlwords.gperf"
+ {"CHECKED", CHECKED},
+#line 243 "./sqlwords.gperf"
+ {"REFERENCES", REFERENCES},
+#line 105 "./sqlwords.gperf"
+ {"DATETIME", DATETIME},
+#line 178 "./sqlwords.gperf"
+ {"IRI_ID", IRI_ID},
+#line 230 "./sqlwords.gperf"
+ {"PRECISION", PRECISION},
+#line 151 "./sqlwords.gperf"
+ {"HANDLER", HANDLER},
+#line 286 "./sqlwords.gperf"
+ {"SYNC", SYNC},
+#line 310 "./sqlwords.gperf"
+ {"TYPE", TYPE},
+#line 319 "./sqlwords.gperf"
+ {"USER", USER},
+#line 187 "./sqlwords.gperf"
+ {"LIBRARY", LIBRARY_L},
+#line 75 "./sqlwords.gperf"
+ {"CHECK", CHECK},
+#line 129 "./sqlwords.gperf"
+ {"EXISTS", EXISTS},
+#line 59 "./sqlwords.gperf"
+ {"BEGIN", BEGINX},
+#line 267 "./sqlwords.gperf"
+ {"SELF", SELF_L},
#line 240 "./sqlwords.gperf"
{"READS", READS},
-#line 52 "./sqlwords.gperf"
- {"ASSEMBLY", ASSEMBLY_L},
-#line 113 "./sqlwords.gperf"
- {"DISCONNECT", DISCONNECT},
-#line 277 "./sqlwords.gperf"
- {"SPECIFIC", SPECIFIC},
-#line 107 "./sqlwords.gperf"
- {"DECLARE", DECLARE},
-#line 177 "./sqlwords.gperf"
- {"ISOLATION", ISOLATION_L},
-#line 323 "./sqlwords.gperf"
- {"VALUES", VALUES},
-#line 148 "./sqlwords.gperf"
- {"GRANT", GRANT},
-#line 237 "./sqlwords.gperf"
- {"QUIETCAST", QUIETCAST_L},
-#line 145 "./sqlwords.gperf"
- {"GENERATED", GENERATED},
-#line 272 "./sqlwords.gperf"
- {"SNAPSHOT", SNAPSHOT},
-#line 195 "./sqlwords.gperf"
- {"MODIFIES", MODIFIES},
-#line 102 "./sqlwords.gperf"
- {"CURSOR", CURSOR},
-#line 65 "./sqlwords.gperf"
- {"BREAKUP", BREAKUP},
+#line 259 "./sqlwords.gperf"
+ {"ROLLUP", ROLLUP},
+#line 161 "./sqlwords.gperf"
+ {"INDEX_NO_FILL", INDEX_NO_FILL},
+#line 92 "./sqlwords.gperf"
+ {"CONTINUE", CONTINUE},
+#line 128 "./sqlwords.gperf"
+ {"EXECUTE", EXECUTE},
#line 162 "./sqlwords.gperf"
{"INDEX_ONLY", INDEX_ONLY},
+#line 265 "./sqlwords.gperf"
+ {"SCHEMA", SCHEMA},
+#line 324 "./sqlwords.gperf"
+ {"VARBINARY", VARBINARY},
+#line 73 "./sqlwords.gperf"
+ {"CHAR", CHARACTER},
+#line 58 "./sqlwords.gperf"
+ {"BEFORE", BEFORE},
+#line 258 "./sqlwords.gperf"
+ {"ROLLBACK", ROLLBACK},
+#line 116 "./sqlwords.gperf"
+ {"DOUBLE", DOUBLE_L},
#line 80 "./sqlwords.gperf"
{"CLUSTERED", CLUSTERED},
-#line 230 "./sqlwords.gperf"
- {"PRECISION", PRECISION},
-#line 263 "./sqlwords.gperf"
- {"UNCOMMITTED", UNCOMMITTED_L},
-#line 232 "./sqlwords.gperf"
- {"PRIMARY", PRIMARY},
+#line 142 "./sqlwords.gperf"
+ {"FULL", FULL},
+#line 188 "./sqlwords.gperf"
+ {"LIKE", LIKE},
+#line 249 "./sqlwords.gperf"
+ {"REPLICATION", REPLICATION},
+#line 115 "./sqlwords.gperf"
+ {"DO", DO},
#line 179 "./sqlwords.gperf"
{"IRI_ID_8", IRI_ID_8},
-#line 127 "./sqlwords.gperf"
- {"EXCLUSIVE", EXCLUSIVE},
-#line 311 "./sqlwords.gperf"
- {"TRANSACTION", TRANSACTION_L},
-#line 259 "./sqlwords.gperf"
- {"ROLLUP", ROLLUP},
-#line 121 "./sqlwords.gperf"
- {"ELSEIF", ELSEIF},
-#line 129 "./sqlwords.gperf"
- {"EXISTS", EXISTS},
+#line 281 "./sqlwords.gperf"
+ {"SQLSTATE", SQLSTATE_L},
+#line 225 "./sqlwords.gperf"
+ {"PERCENT", PERCENT},
+#line 34 "./sqlwords.gperf"
+ {"__SOAP_XML_TYPE", __SOAP_XML_TYPE},
+#line 164 "./sqlwords.gperf"
+ {"INNER", INNER},
+#line 320 "./sqlwords.gperf"
+ {"USING", USING},
+#line 173 "./sqlwords.gperf"
+ {"INTERNAL", INTERNAL},
+#line 211 "./sqlwords.gperf"
+ {"OF", OF},
+#line 72 "./sqlwords.gperf"
+ {"CAST", CAST},
+#line 306 "./sqlwords.gperf"
+ {"TIME", TIME},
+#line 268 "./sqlwords.gperf"
+ {"SERIALIZABLE", SERIALIZABLE_L},
+#line 269 "./sqlwords.gperf"
+ {"SET", SET},
+#line 303 "./sqlwords.gperf"
+ {"TEXT", TEXT_L},
+#line 222 "./sqlwords.gperf"
+ {"PARTITION", PARTITION},
+#line 74 "./sqlwords.gperf"
+ {"CHARACTER", CHARACTER},
+#line 168 "./sqlwords.gperf"
+ {"INSTANCE", INSTANCE_L},
+#line 331 "./sqlwords.gperf"
+ {"WHERE", WHERE},
+#line 156 "./sqlwords.gperf"
+ {"IF", IF},
+#line 207 "./sqlwords.gperf"
+ {"NULLIF", NULLIF},
+#line 223 "./sqlwords.gperf"
+ {"PASCAL", PASCAL_L},
+#line 329 "./sqlwords.gperf"
+ {"WHEN", WHEN},
+#line 285 "./sqlwords.gperf"
+ {"STYLE", STYLE},
+#line 337 "./sqlwords.gperf"
+ {"XPATH", XPATH},
+#line 277 "./sqlwords.gperf"
+ {"SPECIFIC", SPECIFIC},
+#line 165 "./sqlwords.gperf"
+ {"INOUT", INOUT_L},
+#line 288 "./sqlwords.gperf"
+ {"T_CYCLES_ONLY", T_CYCLES_ONLY},
+#line 135 "./sqlwords.gperf"
+ {"FLOAT", FLOAT_L},
+#line 98 "./sqlwords.gperf"
+ {"CURRENT", CURRENT},
+#line 123 "./sqlwords.gperf"
+ {"ENCODING", ENCODING},
+#line 299 "./sqlwords.gperf"
+ {"T_OUT", T_OUT},
+#line 144 "./sqlwords.gperf"
+ {"GENERAL", GENERAL},
+#line 289 "./sqlwords.gperf"
+ {"T_DIRECTION", T_DIRECTION},
+#line 279 "./sqlwords.gperf"
+ {"SQLCODE", SQLCODE},
+#line 203 "./sqlwords.gperf"
+ {"NOT", NOT},
+#line 136 "./sqlwords.gperf"
+ {"FOR", FOR},
+#line 185 "./sqlwords.gperf"
+ {"LEFT", LEFT},
+#line 175 "./sqlwords.gperf"
+ {"INTO", INTO},
+#line 100 "./sqlwords.gperf"
+ {"CURRENT_TIME", CURRENT_TIME},
+#line 65 "./sqlwords.gperf"
+ {"BREAKUP", BREAKUP},
+#line 247 "./sqlwords.gperf"
+ {"REPEATABLE", REPEATABLE_L},
+#line 139 "./sqlwords.gperf"
+ {"FORTRAN", FORTRAN},
+#line 111 "./sqlwords.gperf"
+ {"DETERMINISTIC", DETERMINISTIC},
+#line 275 "./sqlwords.gperf"
+ {"SOURCE", SOURCE},
#line 278 "./sqlwords.gperf"
{"SQL", SQL_L},
-#line 284 "./sqlwords.gperf"
- {"START", START_L},
+#line 238 "./sqlwords.gperf"
+ {"RDF_BOX", RDF_BOX_L},
+#line 304 "./sqlwords.gperf"
+ {"THEN", THEN},
+#line 28 "./sqlwords.gperf"
+ {"__SOAP_DOC", __SOAP_DOC},
+#line 224 "./sqlwords.gperf"
+ {"PASSWORD", PASSWORD},
+#line 38 "./sqlwords.gperf"
+ {"__SOAP_OPTIONS", __SOAP_OPTIONS},
+#line 119 "./sqlwords.gperf"
+ {"DYNAMIC", DYNAMIC},
+#line 169 "./sqlwords.gperf"
+ {"INSTEAD", INSTEAD},
+#line 170 "./sqlwords.gperf"
+ {"INT", INTEGER},
+#line 145 "./sqlwords.gperf"
+ {"GENERATED", GENERATED},
+#line 176 "./sqlwords.gperf"
+ {"IS", IS},
+#line 84 "./sqlwords.gperf"
+ {"COLLATE", COLLATE},
+#line 140 "./sqlwords.gperf"
+ {"FOUND", FOUND},
+#line 101 "./sqlwords.gperf"
+ {"CURRENT_TIMESTAMP", CURRENT_TIMESTAMP},
+#line 35 "./sqlwords.gperf"
+ {"__SOAP_FAULT", __SOAP_FAULT},
+#line 54 "./sqlwords.gperf"
+ {"ATTRIBUTE", ATTRIBUTE},
+#line 146 "./sqlwords.gperf"
+ {"GO", GO},
+#line 153 "./sqlwords.gperf"
+ {"HASH", HASH},
+#line 26 "./sqlwords.gperf"
+ {"__COST", __COST},
+#line 326 "./sqlwords.gperf"
+ {"VARIABLE", VARIABLE},
+#line 36 "./sqlwords.gperf"
+ {"__SOAP_DIME_ENC", __SOAP_DIME_ENC},
+#line 126 "./sqlwords.gperf"
+ {"EXCEPT", EXCEPT},
+#line 43 "./sqlwords.gperf"
+ {"AGGREGATE", AGGREGATE},
+#line 248 "./sqlwords.gperf"
+ {"REPLACING", REPLACING},
+#line 264 "./sqlwords.gperf"
+ {"UNRESTRICTED", UNRESTRICTED_L},
+#line 219 "./sqlwords.gperf"
+ {"OUT", OUT_L},
+#line 263 "./sqlwords.gperf"
+ {"UNCOMMITTED", UNCOMMITTED_L},
#line 189 "./sqlwords.gperf"
{"LOCATOR", LOCATOR},
-#line 251 "./sqlwords.gperf"
- {"RESTRICT", RESTRICT},
-#line 280 "./sqlwords.gperf"
- {"SQLEXCEPTION", SQLEXCEPTION},
-#line 313 "./sqlwords.gperf"
- {"TRIGGER", TRIGGER},
+#line 87 "./sqlwords.gperf"
+ {"COMMITTED", COMMITTED_L},
+#line 31 "./sqlwords.gperf"
+ {"__SOAP_HTTP", __SOAP_HTTP},
+#line 108 "./sqlwords.gperf"
+ {"DEFAULT", DEFAULT},
#line 231 "./sqlwords.gperf"
{"PREFETCH", PREFETCH},
-#line 94 "./sqlwords.gperf"
- {"CORRESPONDING", CORRESPONDING},
-#line 172 "./sqlwords.gperf"
- {"INTERSECT", INTERSECT},
+#line 308 "./sqlwords.gperf"
+ {"TO", TO},
+#line 209 "./sqlwords.gperf"
+ {"NVARCHAR", NVARCHAR},
+#line 174 "./sqlwords.gperf"
+ {"INTERVAL", INTERVAL},
+#line 309 "./sqlwords.gperf"
+ {"TOP", TOP},
+#line 121 "./sqlwords.gperf"
+ {"ELSEIF", ELSEIF},
+#line 166 "./sqlwords.gperf"
+ {"INPUT", INPUT},
+#line 77 "./sqlwords.gperf"
+ {"CHECKPOINT", CHECKPOINT},
+#line 82 "./sqlwords.gperf"
+ {"COALESCE", COALESCE},
+#line 323 "./sqlwords.gperf"
+ {"VALUES", VALUES},
+#line 291 "./sqlwords.gperf"
+ {"T_END_FLAG", T_END_FLAG},
+#line 227 "./sqlwords.gperf"
+ {"PERSISTENT", PERSISTENT},
+#line 335 "./sqlwords.gperf"
+ {"WORK", WORK},
+#line 64 "./sqlwords.gperf"
+ {"BITMAP", BITMAPPED},
#line 112 "./sqlwords.gperf"
{"DISABLE", DISABLE_L},
-#line 223 "./sqlwords.gperf"
- {"PASCAL", PASCAL_L},
-#line 307 "./sqlwords.gperf"
- {"TIMESTAMP", TIMESTAMP},
-#line 62 "./sqlwords.gperf"
- {"BIGINT", BIGINT},
-#line 74 "./sqlwords.gperf"
- {"CHARACTER", CHARACTER},
-#line 252 "./sqlwords.gperf"
- {"RESULT", RESULT},
-#line 178 "./sqlwords.gperf"
- {"IRI_ID", IRI_ID},
-#line 90 "./sqlwords.gperf"
- {"CONSTRUCTOR", CONSTRUCTOR},
-#line 108 "./sqlwords.gperf"
- {"DEFAULT", DEFAULT},
-#line 248 "./sqlwords.gperf"
- {"REPLACING", REPLACING},
-#line 279 "./sqlwords.gperf"
- {"SQLCODE", SQLCODE},
+#line 293 "./sqlwords.gperf"
+ {"T_FINAL_AS", T_FINAL_AS},
+#line 257 "./sqlwords.gperf"
+ {"RIGHT", RIGHT},
+#line 244 "./sqlwords.gperf"
+ {"REFERENCING", REFERENCING},
+#line 283 "./sqlwords.gperf"
+ {"STATIC", STATIC_L},
+#line 183 "./sqlwords.gperf"
+ {"KEYSET", KEYSET},
+#line 93 "./sqlwords.gperf"
+ {"CONVERT", CONVERT},
+#line 212 "./sqlwords.gperf"
+ {"OFF", OFF},
+#line 202 "./sqlwords.gperf"
+ {"NONINCREMENTAL", NONINCREMENTAL},
#line 287 "./sqlwords.gperf"
{"SYSTEM", SYSTEM},
+#line 148 "./sqlwords.gperf"
+ {"GRANT", GRANT},
+#line 276 "./sqlwords.gperf"
+ {"SPARQL", SPARQL_L},
+#line 190 "./sqlwords.gperf"
+ {"LOG", LOGX},
+#line 333 "./sqlwords.gperf"
+ {"WITH", WITH},
+#line 134 "./sqlwords.gperf"
+ {"FINAL", FINAL_L},
+#line 147 "./sqlwords.gperf"
+ {"GOTO", GOTO},
+#line 143 "./sqlwords.gperf"
+ {"FUNCTION", FUNCTION},
+#line 52 "./sqlwords.gperf"
+ {"ASSEMBLY", ASSEMBLY_L},
+#line 53 "./sqlwords.gperf"
+ {"ATTACH", ATTACH},
+#line 86 "./sqlwords.gperf"
+ {"COMMIT", COMMIT},
+#line 282 "./sqlwords.gperf"
+ {"SQLWARNING", SQLWARNING},
+#line 89 "./sqlwords.gperf"
+ {"CONSTRAINT", CONSTRAINT},
+#line 60 "./sqlwords.gperf"
+ {"BEST", BEST},
+#line 330 "./sqlwords.gperf"
+ {"WHENEVER", WHENEVER},
#line 150 "./sqlwords.gperf"
{"GROUPING", GROUPING},
-#line 37 "./sqlwords.gperf"
- {"__SOAP_ENC_MIME", __SOAP_ENC_MIME},
-#line 159 "./sqlwords.gperf"
- {"INCREMENT", INCREMENT_L},
-#line 266 "./sqlwords.gperf"
- {"SELECT", SELECT},
-#line 312 "./sqlwords.gperf"
- {"TRANSITIVE", TRANSITIVE},
-#line 234 "./sqlwords.gperf"
- {"PROCEDURE", PROCEDURE},
-#line 244 "./sqlwords.gperf"
- {"REFERENCING", REFERENCING},
#line 298 "./sqlwords.gperf"
{"T_NO_ORDER", T_NO_ORDER},
-#line 293 "./sqlwords.gperf"
- {"T_FINAL_AS", T_FINAL_AS},
-#line 32 "./sqlwords.gperf"
- {"__SOAP_NAME", __SOAP_NAME},
+#line 90 "./sqlwords.gperf"
+ {"CONSTRUCTOR", CONSTRUCTOR},
+#line 191 "./sqlwords.gperf"
+ {"LONG", LONG_L},
+#line 137 "./sqlwords.gperf"
+ {"FOREACH", FOREACH},
+#line 252 "./sqlwords.gperf"
+ {"RESULT", RESULT},
+#line 280 "./sqlwords.gperf"
+ {"SQLEXCEPTION", SQLEXCEPTION},
+#line 177 "./sqlwords.gperf"
+ {"ISOLATION", ISOLATION_L},
+#line 328 "./sqlwords.gperf"
+ {"VIEW", VIEW},
+#line 251 "./sqlwords.gperf"
+ {"RESTRICT", RESTRICT},
+#line 154 "./sqlwords.gperf"
+ {"IDENTITY", IDENTITY},
+#line 229 "./sqlwords.gperf"
+ {"POSITION", POSITION_L},
+#line 138 "./sqlwords.gperf"
+ {"FOREIGN", FOREIGN},
+#line 29 "./sqlwords.gperf"
+ {"__SOAP_DOCW", __SOAP_DOCW},
+#line 300 "./sqlwords.gperf"
+ {"T_SHORTEST_ONLY", T_SHORTEST_ONLY},
+#line 195 "./sqlwords.gperf"
+ {"MODIFIES", MODIFIES},
+#line 270 "./sqlwords.gperf"
+ {"SHUTDOWN", SHUTDOWN},
+#line 237 "./sqlwords.gperf"
+ {"QUIETCAST", QUIETCAST_L},
#line 290 "./sqlwords.gperf"
{"T_DISTINCT", T_DISTINCT},
+#line 292 "./sqlwords.gperf"
+ {"T_EXISTS", T_EXISTS},
+#line 63 "./sqlwords.gperf"
+ {"BINARY", BINARY},
+#line 266 "./sqlwords.gperf"
+ {"SELECT", SELECT},
+#line 311 "./sqlwords.gperf"
+ {"TRANSACTION", TRANSACTION_L},
+#line 152 "./sqlwords.gperf"
+ {"HAVING", HAVING},
+#line 297 "./sqlwords.gperf"
+ {"T_NO_CYCLES", T_NO_CYCLES},
#line 155 "./sqlwords.gperf"
{"IDENTIFIED", IDENTIFIED},
-#line 161 "./sqlwords.gperf"
- {"INDEX_NO_FILL", INDEX_NO_FILL},
-#line 243 "./sqlwords.gperf"
- {"REFERENCES", REFERENCES},
-#line 28 "./sqlwords.gperf"
- {"__SOAP_DOC", __SOAP_DOC},
-#line 29 "./sqlwords.gperf"
- {"__SOAP_DOCW", __SOAP_DOCW},
+#line 305 "./sqlwords.gperf"
+ {"TIES", TIES},
+#line 114 "./sqlwords.gperf"
+ {"DISTINCT", DISTINCT},
+#line 94 "./sqlwords.gperf"
+ {"CORRESPONDING", CORRESPONDING},
#line 158 "./sqlwords.gperf"
{"INCREMENTAL", INCREMENTAL},
-#line 33 "./sqlwords.gperf"
- {"__SOAP_TYPE", __SOAP_TYPE},
-#line 227 "./sqlwords.gperf"
- {"PERSISTENT", PERSISTENT},
-#line 268 "./sqlwords.gperf"
- {"SERIALIZABLE", SERIALIZABLE_L},
-#line 271 "./sqlwords.gperf"
- {"SMALLINT", SMALLINT},
-#line 26 "./sqlwords.gperf"
- {"__COST", __COST},
-#line 247 "./sqlwords.gperf"
- {"REPEATABLE", REPEATABLE_L},
-#line 36 "./sqlwords.gperf"
- {"__SOAP_DIME_ENC", __SOAP_DIME_ENC},
-#line 291 "./sqlwords.gperf"
- {"T_END_FLAG", T_END_FLAG},
-#line 282 "./sqlwords.gperf"
- {"SQLWARNING", SQLWARNING},
-#line 210 "./sqlwords.gperf"
- {"OBJECT_ID", OBJECT_ID},
-#line 35 "./sqlwords.gperf"
- {"__SOAP_FAULT", __SOAP_FAULT},
-#line 297 "./sqlwords.gperf"
- {"T_NO_CYCLES", T_NO_CYCLES},
+#line 273 "./sqlwords.gperf"
+ {"SOFT", SOFT},
+#line 113 "./sqlwords.gperf"
+ {"DISCONNECT", DISCONNECT},
+#line 307 "./sqlwords.gperf"
+ {"TIMESTAMP", TIMESTAMP},
+#line 91 "./sqlwords.gperf"
+ {"CONTAINS", CONTAINS},
+#line 334 "./sqlwords.gperf"
+ {"WITHOUT", WITHOUT_L},
+#line 272 "./sqlwords.gperf"
+ {"SNAPSHOT", SNAPSHOT},
#line 226 "./sqlwords.gperf"
{"PERMISSION_SET", PERMISSION_SET},
-#line 34 "./sqlwords.gperf"
- {"__SOAP_XML_TYPE", __SOAP_XML_TYPE},
-#line 292 "./sqlwords.gperf"
- {"T_EXISTS", T_EXISTS},
-#line 276 "./sqlwords.gperf"
- {"SPARQL", SPARQL_L},
-#line 30 "./sqlwords.gperf"
- {"__SOAP_HEADER", __SOAP_HEADER},
-#line 233 "./sqlwords.gperf"
- {"PRIVILEGES", PRIVILEGES},
-#line 288 "./sqlwords.gperf"
- {"T_CYCLES_ONLY", T_CYCLES_ONLY},
-#line 31 "./sqlwords.gperf"
- {"__SOAP_HTTP", __SOAP_HTTP},
-#line 300 "./sqlwords.gperf"
- {"T_SHORTEST_ONLY", T_SHORTEST_ONLY},
-#line 38 "./sqlwords.gperf"
- {"__SOAP_OPTIONS", __SOAP_OPTIONS}
+#line 284 "./sqlwords.gperf"
+ {"START", START_L},
+#line 205 "./sqlwords.gperf"
+ {"NOVALIDATE", NOVALIDATE_L},
+#line 312 "./sqlwords.gperf"
+ {"TRANSITIVE", TRANSITIVE},
+#line 159 "./sqlwords.gperf"
+ {"INCREMENT", INCREMENT_L},
+#line 210 "./sqlwords.gperf"
+ {"OBJECT_ID", OBJECT_ID},
+#line 167 "./sqlwords.gperf"
+ {"INSERT", INSERT},
+#line 221 "./sqlwords.gperf"
+ {"OVERRIDING", OVERRIDING},
+#line 172 "./sqlwords.gperf"
+ {"INTERSECT", INTERSECT},
+#line 271 "./sqlwords.gperf"
+ {"SMALLINT", SMALLINT},
+#line 62 "./sqlwords.gperf"
+ {"BIGINT", BIGINT}
};
static const short lookup[] =
@@ -742,224 +742,220 @@ static const short lookup[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 0, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 2, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 0,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 3, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 4, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 2, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 4, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 5, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 6, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 7, -1, 8, -1,
+ -1, 9, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 10, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 11,
+ -1, -1, -1, -1, 12, -1, -1, -1, -1, -1,
+ 13, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 14, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 15, -1, -1, -1, -1,
+ -1, -1, -1, -1, 16, -1, 17, -1, -1, 18,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 19,
+ 20, 21, -1, -1, -1, -1, -1, 22, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 23, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 24, -1,
+ -1, -1, -1, -1, -1, -1, -1, 25, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 26,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 27, -1, -1, -1, -1, -1, -1, -1, -1, 28,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 29, -1, -1, -1,
+ -1, -1, 30, -1, -1, -1, -1, 31, -1, -1,
+ 32, -1, -1, -1, 33, 34, -1, -1, -1, 35,
+ -1, -1, -1, -1, -1, -1, -1, 36, -1, -1,
+ -1, -1, -1, -1, 37, 38, -1, 39, 40, -1,
+ -1, 41, 42, -1, -1, -1, -1, -1, -1, -1,
+ 43, -1, -1, -1, -1, 44, -1, -1, 45, -1,
+ -1, -1, -1, -1, -1, 46, -1, -1, -1, -1,
+ -1, 47, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 48, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 49, -1,
+ 50, 51, -1, -1, -1, -1, 52, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 53, 54, -1,
+ -1, -1, -1, -1, 55, -1, 56, -1, -1, -1,
+ -1, 57, -1, -1, -1, -1, -1, -1, -1, 58,
+ -1, -1, 59, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 60, 61, 62, -1, -1, -1, -1,
+ -1, -1, 63, -1, -1, -1, -1, -1, -1, 64,
+ 65, -1, -1, -1, 66, -1, -1, -1, -1, 67,
+ -1, -1, -1, 68, -1, -1, -1, 69, -1, 70,
+ -1, -1, -1, 71, -1, 72, -1, -1, -1, -1,
+ 73, -1, 74, -1, -1, 75, -1, -1, -1, -1,
+ 76, -1, -1, -1, -1, -1, 77, -1, -1, -1,
+ -1, 78, 79, 80, -1, 81, -1, -1, 82, -1,
+ -1, -1, 83, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 84, -1, -1, -1, -1, -1, -1, 85,
+ -1, -1, -1, -1, 86, -1, 87, -1, -1, -1,
+ -1, -1, -1, 88, -1, -1, -1, 89, -1, -1,
+ -1, 90, -1, -1, -1, -1, 91, -1, -1, -1,
+ 92, 93, 94, -1, -1, 95, 96, -1, -1, -1,
+ -1, -1, 97, -1, -1, -1, -1, 98, -1, 99,
+ -1, -1, -1, -1, 100, 101, -1, 102, 103, -1,
+ 104, 105, -1, -1, -1, -1, -1, 106, -1, -1,
+ -1, -1, -1, -1, -1, 107, -1, -1, -1, -1,
+ -1, -1, -1, 108, -1, 109, -1, -1, 110, 111,
+ -1, -1, -1, -1, 112, 113, 114, -1, 115, 116,
+ -1, -1, 117, -1, -1, -1, -1, -1, 118, -1,
+ -1, -1, 119, 120, 121, -1, -1, -1, -1, 122,
+ -1, -1, 123, -1, -1, 124, -1, -1, 125, 126,
+ 127, -1, 128, -1, 129, -1, 130, 131, -1, -1,
+ -1, 132, 133, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 134, -1, -1, 135, -1, 136, 137, -1,
+ -1, -1, -1, -1, -1, -1, 138, -1, -1, -1,
+ -1, -1, -1, 139, 140, -1, 141, -1, -1, -1,
+ -1, -1, 142, 143, -1, -1, -1, -1, 144, -1,
+ -1, -1, 145, -1, 146, -1, -1, 147, -1, 148,
+ -1, -1, -1, -1, -1, -1, -1, -1, 149, -1,
+ 150, 151, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 152, 153, -1, -1, 154, -1, -1, 155, 156,
+ -1, 157, 158, -1, 159, -1, 160, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 161, 162,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 163, -1, -1, -1, -1, -1, -1, -1, 164, -1,
+ 165, -1, -1, 166, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 167, 168, -1, -1, -1, -1,
+ -1, -1, 169, -1, 170, -1, -1, -1, -1, -1,
+ -1, 171, -1, 172, -1, -1, -1, -1, -1, -1,
+ -1, 173, 174, -1, -1, 175, -1, -1, -1, 176,
+ -1, 177, -1, -1, -1, -1, 178, -1, 179, -1,
+ -1, -1, -1, -1, -1, 180, -1, -1, 181, 182,
+ 183, 184, 185, -1, -1, -1, -1, 186, -1, -1,
+ 187, -1, -1, -1, -1, -1, -1, -1, -1, 188,
+ -1, 189, 190, -1, 191, 192, -1, -1, -1, -1,
+ -1, 193, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, -1, -1,
+ -1, 195, -1, -1, -1, -1, 196, 197, -1, -1,
+ -1, 198, -1, -1, -1, 199, -1, -1, 200, -1,
+ 201, -1, -1, 202, 203, 204, -1, -1, -1, -1,
+ -1, -1, -1, 205, 206, -1, -1, -1, -1, 207,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 208, -1, -1, -1, -1, -1, 209, -1,
+ -1, -1, 210, -1, -1, -1, -1, -1, -1, -1,
+ -1, 211, -1, 212, -1, -1, -1, -1, 213, -1,
+ -1, 214, -1, -1, -1, -1, -1, 215, 216, -1,
+ -1, 217, -1, -1, -1, -1, -1, -1, 218, -1,
+ -1, 219, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 220, -1, -1, 221, -1, -1, 222, -1, -1,
+ -1, -1, -1, -1, -1, 223, -1, -1, -1, 224,
+ -1, 225, -1, 226, 227, -1, -1, -1, -1, 228,
+ -1, -1, -1, 229, 230, -1, -1, -1, -1, -1,
+ -1, -1, 231, -1, -1, -1, -1, -1, 232, -1,
+ -1, 233, -1, 234, -1, -1, -1, -1, -1, 235,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 236, -1, -1, -1, -1,
+ -1, 237, -1, -1, -1, -1, 238, -1, -1, 239,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 240, -1, 241, -1, -1, -1, 242, -1, -1, -1,
+ 243, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 244, -1, 245, 246, 247, -1, -1, -1, -1,
+ 248, -1, 249, -1, 250, -1, -1, -1, -1, -1,
+ -1, -1, 251, 252, -1, -1, -1, 253, -1, -1,
+ 254, -1, 255, -1, 256, 257, -1, -1, 258, 259,
+ -1, -1, -1, 260, -1, 261, -1, -1, -1, -1,
+ 262, 263, -1, 264, -1, -1, -1, 265, -1, -1,
+ 266, -1, -1, -1, -1, -1, -1, 267, -1, -1,
+ -1, -1, -1, -1, -1, -1, 268, -1, -1, -1,
+ -1, -1, -1, -1, -1, 269, -1, -1, -1, -1,
+ -1, -1, -1, 270, -1, -1, -1, -1, 271, -1,
+ -1, -1, 272, -1, -1, -1, -1, 273, 274, 275,
+ -1, -1, -1, -1, -1, -1, -1, -1, 276, -1,
+ -1, 277, 278, -1, -1, 279, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 280, -1, 281, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 282, -1, -1, 283, -1, -1, -1, -1,
+ 284, 285, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 286, -1, -1, -1, -1,
+ -1, -1, 287, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 288, -1, -1, -1, -1, -1, 289, -1, 290, -1,
+ 291, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 5, -1, 6, -1, -1, -1, -1, -1, -1,
+ -1, 292, -1, -1, -1, 293, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 294, -1, -1, -1, -1, 295, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 296, 297, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 7, -1, 8, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 9,
+ -1, -1, -1, -1, -1, -1, 298, -1, -1, -1,
+ -1, -1, -1, -1, -1, 299, -1, 300, -1, -1,
+ -1, -1, 301, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 10, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 11, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 302, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 303, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 12, -1, -1,
- -1, 13, -1, -1, -1, 14, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 15, -1, -1,
- -1, -1, -1, -1, -1, -1, 16, -1, -1, -1,
- -1, -1, -1, 17, -1, -1, -1, -1, -1, -1,
- -1, -1, 18, 19, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 20, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 21, -1,
- -1, -1, -1, -1, -1, 22, 23, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 24, -1, -1,
- -1, -1, -1, -1, 25, 26, -1, -1, -1, 27,
- -1, 28, -1, 29, -1, -1, 30, -1, -1, -1,
- 31, -1, -1, -1, -1, -1, 32, 33, 34, -1,
- -1, -1, 35, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 36, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 37, -1,
- -1, -1, -1, -1, -1, 38, 39, -1, -1, -1,
- 40, -1, -1, -1, 41, -1, -1, -1, 42, -1,
+ 304, -1, -1, -1, -1, -1, 305, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 43, 44, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 45, -1, -1, -1, -1, -1, -1, 46, -1,
- -1, -1, -1, -1, 47, -1, -1, -1, -1, -1,
- -1, 48, 49, -1, -1, -1, 50, -1, -1, -1,
- 51, 52, -1, 53, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 54, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 306, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 55, -1, -1, -1, -1,
- -1, 56, -1, 57, -1, -1, -1, -1, -1, -1,
- 58, -1, -1, 59, 60, -1, -1, -1, 61, -1,
- -1, -1, -1, -1, -1, -1, 62, -1, -1, -1,
- -1, -1, -1, 63, -1, -1, 64, 65, -1, -1,
- -1, 66, 67, 68, -1, 69, -1, -1, -1, -1,
- -1, -1, 70, -1, -1, 71, -1, -1, -1, -1,
- -1, 72, -1, -1, -1, -1, -1, -1, 73, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 74,
- -1, 75, -1, -1, -1, -1, 76, 77, 78, 79,
- 80, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 81, -1, 82, 83, -1, 84, 85, -1, -1, 86,
- -1, -1, -1, -1, -1, 87, 88, 89, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 90, -1, 91, -1, 92, -1, -1, 93, -1, -1,
- -1, -1, -1, -1, -1, -1, 94, -1, 95, -1,
- -1, -1, -1, -1, -1, -1, -1, 96, 97, -1,
- 98, -1, -1, -1, -1, -1, -1, -1, 99, 100,
- -1, -1, 101, 102, 103, 104, 105, 106, -1, -1,
- 107, -1, -1, -1, 108, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 109, 110, 111, -1,
- 112, 113, 114, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 115, -1, -1, -1, -1, 116,
- 117, -1, -1, -1, -1, 118, -1, -1, -1, -1,
- -1, -1, 119, -1, -1, -1, -1, 120, -1, -1,
- -1, 121, 122, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 123, -1, -1, -1, -1, -1, 124, -1,
- 125, -1, -1, -1, -1, -1, 126, -1, -1, -1,
- -1, -1, 127, -1, 128, -1, -1, -1, -1, -1,
- -1, 129, -1, 130, 131, -1, -1, -1, 132, -1,
- 133, -1, -1, -1, 134, -1, 135, 136, 137, -1,
- 138, -1, 139, -1, -1, 140, 141, 142, 143, -1,
- -1, 144, -1, -1, -1, -1, -1, 145, -1, -1,
- -1, 146, 147, -1, -1, -1, -1, 148, 149, -1,
- -1, -1, 150, -1, -1, -1, -1, -1, -1, -1,
- -1, 151, -1, -1, -1, -1, -1, -1, -1, 152,
- -1, -1, 153, -1, -1, 154, -1, 155, -1, -1,
- -1, -1, 156, -1, -1, -1, 157, -1, -1, 158,
- 159, -1, -1, -1, -1, -1, 160, -1, 161, -1,
- -1, -1, -1, -1, -1, 162, 163, 164, -1, -1,
- -1, 165, -1, -1, -1, -1, -1, -1, -1, 166,
- -1, 167, -1, -1, -1, -1, 168, -1, 169, 170,
- -1, -1, 171, -1, 172, -1, -1, -1, 173, 174,
- -1, -1, -1, -1, -1, -1, -1, -1, 175, -1,
- -1, 176, 177, 178, -1, -1, -1, 179, -1, 180,
- -1, -1, -1, -1, 181, -1, 182, -1, -1, 183,
- 184, -1, 185, -1, 186, -1, -1, 187, 188, -1,
- -1, -1, 189, -1, -1, -1, -1, 190, -1, -1,
- -1, -1, -1, -1, -1, 191, -1, -1, -1, -1,
- -1, -1, -1, -1, 192, -1, -1, 193, -1, -1,
- -1, -1, 194, -1, 195, -1, -1, -1, -1, -1,
- -1, -1, -1, 196, -1, 197, -1, 198, 199, -1,
- -1, -1, 200, -1, 201, -1, 202, -1, 203, -1,
- -1, -1, -1, 204, -1, -1, 205, -1, 206, -1,
- -1, 207, -1, 208, -1, -1, 209, -1, 210, -1,
- 211, -1, 212, -1, -1, 213, -1, -1, 214, 215,
- -1, -1, -1, -1, -1, -1, -1, 216, -1, -1,
- -1, 217, -1, 218, 219, -1, -1, -1, 220, 221,
- 222, -1, -1, -1, -1, -1, -1, -1, 223, -1,
- 224, -1, -1, -1, -1, -1, -1, -1, 225, -1,
- -1, -1, -1, -1, -1, -1, -1, 226, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 227, -1,
- -1, -1, 228, -1, -1, 229, 230, 231, -1, -1,
- -1, -1, -1, 232, -1, -1, -1, 233, -1, 234,
- -1, -1, 235, -1, -1, -1, -1, -1, -1, -1,
- -1, 236, 237, -1, -1, -1, -1, -1, -1, 238,
- -1, -1, 239, -1, -1, 240, -1, 241, -1, 242,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 243, -1, 244, -1, -1, -1, -1, -1, 245,
- -1, -1, -1, -1, -1, -1, 246, -1, -1, -1,
- -1, -1, -1, 247, -1, -1, -1, -1, -1, 248,
- -1, -1, -1, -1, 249, -1, -1, -1, -1, -1,
- -1, 250, -1, -1, -1, 251, -1, -1, -1, -1,
- -1, -1, 252, -1, -1, -1, -1, -1, -1, -1,
- 253, -1, -1, -1, -1, -1, -1, -1, 254, -1,
- -1, -1, -1, -1, -1, -1, -1, 255, -1, -1,
- -1, -1, -1, -1, -1, -1, 256, -1, 257, -1,
- 258, -1, -1, -1, -1, -1, 259, -1, -1, -1,
- -1, -1, 260, -1, -1, -1, -1, 261, 262, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 263,
- -1, -1, -1, -1, -1, -1, 264, -1, 265, -1,
- -1, -1, -1, -1, 266, -1, -1, -1, 267, -1,
- 268, -1, -1, -1, -1, 269, -1, -1, 270, 271,
- -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
- -1, -1, 273, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 274, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 275, -1, -1,
- 276, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 277, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 278, -1, -1, -1, -1, 279, -1,
- -1, -1, -1, -1, -1, -1, 280, 281, -1, -1,
- -1, 282, -1, 283, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 284, 285, -1, -1, -1,
- -1, -1, -1, -1, -1, 286, 287, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 288, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 289, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 290, -1, -1, -1,
- 291, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 307, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 292, -1, 293, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 294, -1, -1, 295, -1, -1, 296, -1, -1, 297,
- -1, -1, -1, -1, 298, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 299, -1, -1, -1, -1, -1, 300, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 308, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 309, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 310, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 301, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 302,
- -1, -1, 303, -1, -1, -1, -1, -1, -1, -1,
- -1, 304, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 305, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 306, 307,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 308, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 309,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 310, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -970,14 +966,11 @@ static const short lookup[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 311
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 311
};
#ifdef __GNUC__
__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
#endif
const struct keyword *
lex_hash_kw (register const char *str, register unsigned int len)
diff --git a/libsrc/Wi/srvcr.c b/libsrc/Wi/srvcr.c
index 63d9d6c..5d31e29 100644
--- a/libsrc/Wi/srvcr.c
+++ b/libsrc/Wi/srvcr.c
@@ -1,14 +1,14 @@
/*
* sqlrun.c
*
- * $Id: srvcr.c,v 1.8.2.4 2012/03/08 12:55:37 source Exp $
+ * $Id: srvcr.c,v 1.8.2.3 2010/01/29 02:02:18 source Exp $
*
* SQL query execution
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/srvmultibyte.c b/libsrc/Wi/srvmultibyte.c
index d0dec2f..d90924c 100644
--- a/libsrc/Wi/srvmultibyte.c
+++ b/libsrc/Wi/srvmultibyte.c
@@ -1,12 +1,12 @@
/*
* srvmultibyte.c
*
- * $Id: srvmultibyte.c,v 1.12.2.6 2012/03/08 12:55:37 source Exp $
+ * $Id: srvmultibyte.c,v 1.12.2.3 2010/12/13 11:17:56 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -360,7 +360,8 @@ bh_string_output_w (/* this was before 3.0: index_space_t * isp, */ lock_trx_t *
dk_set_t
-bh_string_list_w (/* this was before 3.0: index_space_t * isp,*/ lock_trx_t * lt, blob_handle_t * bh, long get_chars, int omit, long blob_type)
+bh_string_list_w (/* this was before 3.0: index_space_t * isp,*/ lock_trx_t * lt, blob_handle_t * bh,
+ long get_chars, int omit)
{
/* take current page at current place and make string of
n bytes from the place and write to client */
@@ -533,9 +534,11 @@ row_print_wide (caddr_t thing, dk_session_t * ses, dbe_column_t * col,
}
int
-compare_wide_to_utf8_with_collation (wchar_t *wide_data, long wide_wcharcount, utf8char *utf8_data, long utf8_bytes,
- collation_t *collation)
+compare_wide_to_utf8 (caddr_t _utf8_data, long utf8_len,
+ caddr_t _wide_data, long wide_len, collation_t *collation)
{
+ unsigned char *utf8_data = (unsigned char *) _utf8_data;
+ wchar_t *wide_data = (wchar_t *) _wide_data;
long winx, ninx;
wchar_t wtmp;
@@ -543,22 +546,23 @@ compare_wide_to_utf8_with_collation (wchar_t *wide_data, long wide_wcharcount, u
int rc;
memset (&state, 0, sizeof (virt_mbstate_t));
+ wide_len = wide_len / sizeof (wchar_t);
ninx = winx = 0;
if (collation)
while(1)
{
- if (ninx == utf8_bytes)
+ if (ninx == utf8_len)
{
- if (winx == wide_wcharcount)
+ if (winx == wide_len)
return DVC_MATCH;
else
return DVC_LESS;
}
- if (winx == wide_wcharcount)
+ if (winx == wide_len)
return DVC_GREATER;
- rc = (int) virt_mbrtowc (&wtmp, utf8_data + ninx, utf8_bytes - ninx, &state);
+ rc = (int) virt_mbrtowc (&wtmp, utf8_data + ninx, utf8_len - ninx, &state);
if (rc <= 0)
GPF_T1 ("inconsistent wide char data");
if (((wchar_t *)collation->co_table)[wtmp] <
@@ -573,17 +577,17 @@ compare_wide_to_utf8_with_collation (wchar_t *wide_data, long wide_wcharcount, u
else
while(1)
{
- if (ninx == utf8_bytes)
+ if (ninx == utf8_len)
{
- if (winx == wide_wcharcount)
+ if (winx == wide_len)
return DVC_MATCH;
else
return DVC_LESS;
}
- if (winx == wide_wcharcount)
+ if (winx == wide_len)
return DVC_GREATER;
- rc = (int) virt_mbrtowc (&wtmp, utf8_data + ninx, utf8_bytes - ninx, &state);
+ rc = (int) virt_mbrtowc (&wtmp, utf8_data + ninx, utf8_len - ninx, &state);
if (rc <= 0)
GPF_T1 ("inconsistent wide char data");
if (wtmp < wide_data[winx])
@@ -828,10 +832,11 @@ complete_charset_name (caddr_t _qi, char *cs_name)
int
-compare_wide_to_latin1 (wchar_t *wbox1, long n1, unsigned char *box2, long n2)
+compare_wide_to_narrow (wchar_t *wbox1, long n1, unsigned char *box2, long n2)
{
wchar_t temp;
long inx = 0;
+
while (1)
{
if (inx == n1) /* box1 in end? */
@@ -841,15 +846,20 @@ compare_wide_to_latin1 (wchar_t *wbox1, long n1, unsigned char *box2, long n2)
else
return DVC_LESS; /* otherwise box1 is shorter than box2 */
}
+
if (inx == n2)
return DVC_GREATER; /* box2 in end (but not box1) */
+
temp = CHAR_TO_WCHAR (box2[inx], NULL);
if (wbox1[inx] < temp)
return DVC_LESS;
+
if (wbox1[inx] > temp)
return DVC_GREATER;
+
inx++;
}
+
/*NOTREACHED*/
return DVC_LESS;
}
diff --git a/libsrc/Wi/srvmultibyte.h b/libsrc/Wi/srvmultibyte.h
index 7e9624c..ecb84fe 100644
--- a/libsrc/Wi/srvmultibyte.h
+++ b/libsrc/Wi/srvmultibyte.h
@@ -1,12 +1,12 @@
/*
* srvmultibyte.h
*
- * $Id: srvmultibyte.h,v 1.9.2.5 2012/03/08 12:55:37 source Exp $
+ * $Id: srvmultibyte.h,v 1.9.2.2 2009/08/17 23:42:59 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -31,8 +31,9 @@
void row_print_wide (caddr_t thing, dk_session_t * ses, dbe_column_t * col,
caddr_t * err_ret, dtp_t dtp, wcharset_t *wcharset);
dk_set_t bh_string_list_w (/* this was before 3.0: index_space_t * isp, */ lock_trx_t * lt, blob_handle_t * bh,
- long get_chars, int omit, long blob_type); /* if omit!=0, it just run through blob part */
+ long get_chars, int omit); /* if omit!=0, it just run through blob part */
dk_session_t *bh_string_output_w (/* this was before 3.0: index_space_t * isp, */ lock_trx_t * lt, blob_handle_t * bh, int omit); /* if omit!=0, it just run through blob part */
+int compare_wide_to_utf8 (caddr_t utf8_data, long utf8_len, caddr_t wide_data, long wide_len, collation_t *collation);
int compare_utf8_with_collation (caddr_t dv1, long n1, caddr_t dv2, long n2, collation_t *collation);
caddr_t box_wide_char_string (caddr_t data, size_t len, dtp_t dtp);
@@ -53,8 +54,7 @@ extern caddr_t default_charset_name;
caddr_t complete_charset_name (caddr_t qi, char *cs_name);
-int compare_wide_to_latin1 (wchar_t *wbox1, long wbox1_wcharcount, unsigned char *box2, long box2_bytes);
-int compare_wide_to_utf8_with_collation (wchar_t *wbox1, long wbox1_wcharcount, utf8char *box2, long box2_bytes, collation_t *collation);
+int compare_wide_to_narrow (wchar_t *wbox1, long n1, unsigned char *box2, long n2);
extern wcharset_t *sch_name_to_charset (const char *name);
extern wcharset_t * wcharset_by_name_or_dflt (ccaddr_t cs_name, query_instance_t *qi);
@@ -64,8 +64,7 @@ caddr_t strstr_utf8_with_collation (caddr_t dv1, long n1,
caddr_t dv2, long n2, caddr_t *next, collation_t *collation);
struct encoding_handler_s;
-/*! Translates a \c narrow string from charset or encding named \c cs1_uppercase to charset named \c cs2_upperase. \c qi is optional and used for _WS_ name */
-extern caddr_t charset_recode_from_named_to_named (query_instance_t *qi, caddr_t narrow, const char *cs1_uppercase, const char *cs2_uppercase, int *res_is_new_ret, caddr_t *err_ret);
+extern caddr_t charset_recode_from_named_to_named (caddr_t narrow, const char *cs1_uppercase, const char *cs2_uppercase, int *res_is_new_ret, caddr_t *err_ret);
extern caddr_t charset_recode_from_cs_or_eh_to_cs (caddr_t narrow, int bom_skip_offset, struct encoding_handler_s *eh_cs1, wcharset_t *cs1, wcharset_t *cs2, int *res_is_new_ret, caddr_t *err_ret);
#endif /* _SRVMULTIBYTE_H */
diff --git a/libsrc/Wi/srvstat.c b/libsrc/Wi/srvstat.c
index 9b86471..40b352e 100644
--- a/libsrc/Wi/srvstat.c
+++ b/libsrc/Wi/srvstat.c
@@ -1,14 +1,14 @@
/*
* srvstat.c
*
- * $Id: srvstat.c,v 1.29.2.36 2012/03/08 12:55:37 source Exp $
+ * $Id: srvstat.c,v 1.29.2.34 2011/07/19 23:29:12 source Exp $
*
* Server Status Report
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1439,7 +1439,6 @@ stat_desc_t stat_descs [] =
{"cl_req_batch_size", &cl_req_batch_size, SD_INT32},
{"db_exists", &db_exists, SD_INT32},
{"st_lite_mode", &my_lite_mode, NULL},
- {"st_aq_max_threads", &aq_max_threads, SD_INT32},
/* backup vars */
{"backup_prefix_name", NULL, &my_bp_prefix},
diff --git a/libsrc/Wi/srvstat.h b/libsrc/Wi/srvstat.h
index 5663841..81b76ed 100644
--- a/libsrc/Wi/srvstat.h
+++ b/libsrc/Wi/srvstat.h
@@ -1,14 +1,14 @@
/*
* srvstat.h
*
- * $Id: srvstat.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: srvstat.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
*
* stats collection
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/ssl.c b/libsrc/Wi/ssl.c
index 20de715..15ded3e 100644
--- a/libsrc/Wi/ssl.c
+++ b/libsrc/Wi/ssl.c
@@ -1,10 +1,10 @@
/*
- * $Id: ssl.c,v 1.5.2.3 2012/03/08 12:55:37 source Exp $
+ * $Id: ssl.c,v 1.5.2.2 2009/05/14 13:52:33 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/statuslog.h b/libsrc/Wi/statuslog.h
index 7f650d0..60fe1f7 100644
--- a/libsrc/Wi/statuslog.h
+++ b/libsrc/Wi/statuslog.h
@@ -1,12 +1,12 @@
/*
* statuslog.h
*
- * $Id: statuslog.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: statuslog.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/string.c b/libsrc/Wi/string.c
index 1682184..0184c13 100644
--- a/libsrc/Wi/string.c
+++ b/libsrc/Wi/string.c
@@ -1,14 +1,14 @@
/*
* string.c
*
- * $Id: string.c,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: string.c,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
*
* Wildcard and fuzzy matching functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/string_tmpl.c b/libsrc/Wi/string_tmpl.c
index 20ee926..8e82a97 100644
--- a/libsrc/Wi/string_tmpl.c
+++ b/libsrc/Wi/string_tmpl.c
@@ -1,14 +1,14 @@
/*
* string_tmpl.c
*
- * $Id: string_tmpl.c,v 1.3.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: string_tmpl.c,v 1.3.2.1 2009/04/18 21:55:17 source Exp $
*
* Wildcard and fuzzy matching functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/strlike.h b/libsrc/Wi/strlike.h
index d797559..ab7dc44 100644
--- a/libsrc/Wi/strlike.h
+++ b/libsrc/Wi/strlike.h
@@ -1,12 +1,12 @@
/*
* strlike.h
*
- * $Id: strlike.h,v 1.2.2.4 2012/03/08 12:55:37 source Exp $
+ * $Id: strlike.h,v 1.2.2.3 2011/10/25 19:36:36 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/subseq.c b/libsrc/Wi/subseq.c
index 6d3b681..c4e52f5 100644
--- a/libsrc/Wi/subseq.c
+++ b/libsrc/Wi/subseq.c
@@ -1,10 +1,10 @@
/*
- * $Id: subseq.c,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: subseq.c,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/subseq.h b/libsrc/Wi/subseq.h
index dcb81e6..379d65c 100644
--- a/libsrc/Wi/subseq.h
+++ b/libsrc/Wi/subseq.h
@@ -1,10 +1,10 @@
/*
- * $Id: subseq.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: subseq.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/system.sql b/libsrc/Wi/system.sql
index 14c2214..b1c9426 100644
--- a/libsrc/Wi/system.sql
+++ b/libsrc/Wi/system.sql
@@ -1,10 +1,10 @@
--
--- $Id: system.sql,v 1.41.2.25 2012/03/08 12:55:37 source Exp $
+-- $Id: system.sql,v 1.41.2.24 2011/09/28 17:01:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/system2.sql b/libsrc/Wi/system2.sql
index 4f12bf5..2826df9 100644
--- a/libsrc/Wi/system2.sql
+++ b/libsrc/Wi/system2.sql
@@ -1,10 +1,10 @@
--
--- $Id: system2.sql,v 1.5.2.6 2012/03/08 12:55:37 source Exp $
+-- $Id: system2.sql,v 1.5.2.5 2010/08/02 07:40:54 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/text.c b/libsrc/Wi/text.c
index 74000f9..46b02fb 100644
--- a/libsrc/Wi/text.c
+++ b/libsrc/Wi/text.c
@@ -1,14 +1,14 @@
/*
* text.c
*
- * $Id: text.c,v 1.16.2.8 2012/03/08 12:55:37 source Exp $
+ * $Id: text.c,v 1.16.2.7 2010/02/01 12:53:46 source Exp $
*
* Text search
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/text.h b/libsrc/Wi/text.h
index d470be3..e972d3d 100644
--- a/libsrc/Wi/text.h
+++ b/libsrc/Wi/text.h
@@ -1,12 +1,12 @@
/*
* text.h
*
- * $Id: text.h,v 1.7.2.3 2012/03/08 12:55:37 source Exp $
+ * $Id: text.h,v 1.7.2.2 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/trans.c b/libsrc/Wi/trans.c
index f1b575d..fbcc747 100644
--- a/libsrc/Wi/trans.c
+++ b/libsrc/Wi/trans.c
@@ -1,14 +1,14 @@
/*
* trans.c
*
- * $Id: trans.c,v 1.1.2.11 2012/03/08 12:55:37 source Exp $
+ * $Id: trans.c,v 1.1.2.10 2011/06/17 15:20:35 source Exp $
*
* Transitive Node
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/turtle_l.c b/libsrc/Wi/turtle_l.c
index b3a46e5..833e9c6 100644
--- a/libsrc/Wi/turtle_l.c
+++ b/libsrc/Wi/turtle_l.c
@@ -359,31 +359,30 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[394] =
+static yyconst flex_int16_t yy_accept[384] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
106, 101, 100, 98, 98, 15, 74, 99, 73, 33,
34, 101, 5, 9, 95, 10, 11, 44, 12, 101,
101, 48, 35, 37, 3, 48, 28, 48, 48, 48,
- 48, 48, 38, 39, 105, 83, 79, 79, 75, 85,
- 84, 80, 80, 76, 86, 91, 87, 89, 89, 93,
- 91, 92, 88, 90, 90, 94, 92, 71, 67, 65,
- 65, 71, 69, 72, 68, 66, 66, 72, 70, 56,
- 55, 53, 53, 104, 104, 100, 98, 0, 57, 99,
-
- 98, 98, 0, 57, 0, 95, 8, 6, 7, 7,
- 96, 96, 0, 46, 46, 0, 45, 44, 44, 0,
- 14, 40, 44, 13, 51, 52, 16, 52, 52, 52,
- 52, 52, 52, 52, 52, 48, 0, 47, 36, 1,
- 2, 2, 4, 48, 0, 0, 48, 48, 30, 31,
- 48, 48, 83, 0, 79, 77, 81, 81, 83, 0,
- 0, 84, 0, 80, 78, 82, 82, 84, 0, 0,
- 87, 0, 89, 0, 87, 0, 0, 88, 0, 90,
- 0, 88, 0, 0, 67, 0, 0, 65, 65, 65,
- 0, 67, 0, 0, 68, 0, 0, 66, 66, 66,
-
- 0, 68, 0, 0, 55, 55, 53, 0, 53, 102,
+ 48, 48, 38, 39, 83, 79, 79, 75, 85, 84,
+ 80, 80, 76, 86, 87, 89, 89, 93, 91, 88,
+ 90, 90, 94, 92, 67, 65, 65, 71, 69, 68,
+ 66, 66, 72, 70, 56, 105, 55, 53, 53, 104,
+ 104, 100, 98, 0, 57, 99, 98, 98, 0, 57,
+
+ 0, 95, 8, 6, 7, 7, 96, 96, 0, 46,
+ 46, 0, 45, 44, 44, 0, 14, 40, 44, 13,
+ 51, 52, 16, 52, 52, 52, 52, 52, 52, 52,
+ 52, 48, 0, 47, 36, 1, 2, 2, 4, 48,
+ 0, 0, 48, 48, 30, 31, 48, 48, 83, 0,
+ 79, 77, 81, 81, 0, 0, 84, 0, 80, 78,
+ 82, 82, 0, 0, 87, 0, 89, 0, 0, 0,
+ 88, 0, 90, 0, 0, 0, 67, 0, 0, 65,
+ 65, 65, 0, 0, 0, 68, 0, 0, 66, 66,
+ 66, 0, 0, 0, 55, 55, 53, 0, 53, 102,
+
103, 103, 57, 60, 58, 98, 59, 7, 96, 0,
97, 46, 46, 46, 45, 0, 0, 0, 42, 40,
0, 44, 44, 44, 51, 0, 0, 52, 52, 52,
@@ -393,8 +392,8 @@ static yyconst flex_int16_t yy_accept[394] =
0, 0, 53, 54, 103, 45, 46, 0, 0, 43,
0, 0, 0, 41, 44, 44, 52, 52, 52, 18,
52, 52, 52, 49, 0, 48, 32, 27, 0, 0,
-
0, 0, 0, 0, 0, 0, 0, 0, 61, 63,
+
0, 0, 62, 64, 0, 0, 41, 0, 0, 44,
44, 17, 52, 52, 52, 52, 21, 49, 26, 0,
0, 0, 0, 93, 0, 0, 94, 0, 0, 0,
@@ -404,7 +403,6 @@ static yyconst flex_int16_t yy_accept[394] =
0, 44, 25, 52, 0, 0, 0, 0, 0, 0,
0, 44, 22, 0, 0, 0, 0, 0, 0, 0,
44, 0, 0
-
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -439,7 +437,7 @@ static yyconst flex_int32_t yy_ec[256] =
62, 62, 62, 62, 9
} ;
-static yyconst flex_int32_t yy_meta[64] =
+static yyconst flex_int32_t yy_meta[63] =
{ 0,
1, 2, 3, 4, 2, 5, 6, 7, 5, 7,
8, 5, 5, 9, 10, 11, 12, 9, 13, 14,
@@ -447,140 +445,138 @@ static yyconst flex_int32_t yy_meta[64] =
17, 18, 10, 19, 10, 5, 20, 21, 21, 16,
16, 16, 21, 17, 17, 17, 17, 17, 17, 18,
17, 17, 18, 17, 18, 18, 17, 17, 17, 10,
- 10, 22, 23
+ 10, 22
} ;
-static yyconst flex_int16_t yy_base[560] =
+static yyconst flex_int16_t yy_base[546] =
{ 0,
- 0, 0, 63, 67, 72, 79, 84, 88, 104, 116,
- 99, 142, 124, 156, 219, 0, 81, 87, 0, 0,
- 860, 2424, 67, 855, 855, 2424, 850, 90, 845, 2424,
- 2424, 95, 2424, 166, 135, 275, 2424, 170, 831, 0,
- 163, 104, 812, 2424, 300, 112, 117, 161, 169, 119,
- 267, 279, 2424, 2424, 2424, 810, 839, 832, 808, 303,
- 799, 828, 828, 804, 305, 2424, 788, 815, 815, 784,
- 84, 2424, 775, 804, 804, 780, 109, 2424, 150, 801,
- 794, 308, 124, 2424, 148, 790, 790, 310, 142, 2424,
- 0, 172, 335, 2424, 318, 195, 2424, 778, 70, 145,
-
- 780, 192, 772, 304, 763, 299, 2424, 2424, 777, 777,
- 310, 314, 197, 360, 374, 388, 402, 322, 427, 314,
- 431, 2424, 463, 2424, 755, 753, 752, 128, 318, 311,
- 339, 315, 344, 337, 167, 330, 356, 512, 2424, 2424,
- 756, 756, 2424, 384, 398, 429, 421, 404, 406, 423,
- 427, 440, 724, 339, 2424, 2424, 753, 753, 721, 0,
- 0, 720, 347, 2424, 2424, 749, 743, 711, 0, 0,
- 705, 424, 2424, 0, 701, 0, 0, 700, 427, 2424,
- 0, 685, 0, 0, 347, 451, 432, 2424, 714, 714,
- 473, 452, 0, 0, 464, 465, 436, 2424, 712, 712,
-
- 475, 474, 0, 0, 0, 698, 474, 0, 517, 2424,
- 700, 700, 672, 2424, 2424, 690, 2424, 2424, 475, 671,
- 670, 542, 556, 0, 570, 584, 385, 537, 2424, 2424,
- 459, 609, 641, 682, 661, 660, 0, 473, 459, 489,
- 660, 281, 659, 509, 329, 2424, 0, 598, 504, 483,
- 566, 555, 2424, 0, 0, 2424, 0, 0, 657, 0,
- 0, 569, 0, 0, 529, 531, 0, 0, 505, 527,
- 0, 0, 507, 0, 2424, 632, 0, 565, 567, 2424,
- 383, 0, 0, 2424, 723, 748, 495, 561, 601, 494,
- 498, 583, 584, 631, 433, 605, 599, 607, 0, 0,
-
- 0, 0, 0, 0, 0, 0, 0, 0, 435, 2424,
- 0, 0, 435, 2424, 0, 0, 2424, 0, 0, 773,
- 798, 274, 589, 602, 613, 620, 272, 269, 642, 0,
- 0, 0, 0, 201, 0, 0, 187, 0, 0, 0,
- 0, 0, 0, 0, 0, 823, 848, 619, 614, 618,
- 635, 0, 0, 0, 0, 0, 0, 0, 0, 873,
- 99, 645, 656, 93, 0, 0, 0, 0, 0, 0,
- 0, 898, 65, 658, 0, 0, 0, 0, 0, 0,
- 0, 923, 49, 0, 0, 0, 0, 0, 0, 0,
- 948, 0, 2424, 991, 1014, 1037, 1060, 1083, 1106, 1129,
-
- 1152, 1175, 1198, 1221, 1244, 1261, 1282, 1290, 1297, 1308,
- 1320, 1341, 1361, 1381, 1401, 1421, 1438, 1458, 1475, 1495,
- 1512, 1532, 1549, 1560, 1571, 1582, 1597, 1613, 1629, 1650,
- 1669, 1682, 1698, 1714, 1735, 1752, 675, 679, 1772, 1789,
- 686, 692, 1809, 1826, 1832, 715, 716, 1852, 1869, 1875,
- 717, 727, 1895, 1912, 728, 757, 1932, 1949, 758, 782,
- 1960, 1971, 1982, 1991, 2002, 2017, 2033, 2049, 2070, 2088,
- 2108, 2130, 2143, 2153, 2164, 2179, 2195, 2207, 783, 807,
- 808, 832, 2219, 833, 857, 2230, 858, 882, 2250, 883,
- 907, 2271, 908, 932, 2283, 2292, 2309, 933, 957, 2322,
-
- 958, 1355, 1357, 1395, 2332, 1397, 1408, 2341, 1432, 1434,
- 1469, 1471, 1506, 1508, 1543, 1545, 1559, 1570, 1746, 1748,
- 1783, 1785, 1796, 1820, 1822, 1863, 1865, 1906, 1908, 1943,
- 1945, 1959, 1970, 1981, 2082, 2084, 2163, 2218, 2229, 2282,
- 2339, 2348, 2350, 2352, 2354, 2361, 2363, 2365, 2367, 2374,
- 2376, 2378, 2380, 2387, 2389, 2391, 2393, 2400, 2402
+ 0, 0, 60, 62, 65, 71, 73, 76, 78, 85,
+ 87, 97, 99, 110, 144, 0, 80, 92, 0, 0,
+ 835, 2335, 65, 823, 821, 2335, 816, 112, 804, 2335,
+ 2335, 101, 2335, 120, 190, 225, 2335, 206, 790, 0,
+ 214, 109, 778, 2335, 210, 110, 115, 200, 217, 204,
+ 206, 247, 2335, 2335, 778, 807, 807, 776, 259, 765,
+ 794, 787, 763, 267, 754, 783, 783, 759, 72, 743,
+ 770, 770, 739, 222, 100, 760, 760, 269, 242, 249,
+ 758, 758, 272, 245, 2335, 2335, 0, 121, 289, 2335,
+ 282, 136, 2335, 753, 281, 139, 748, 278, 738, 199,
+
+ 729, 285, 2335, 2335, 736, 736, 293, 305, 314, 328,
+ 342, 356, 370, 286, 395, 305, 399, 2335, 431, 2335,
+ 721, 721, 720, 293, 281, 325, 295, 252, 297, 339,
+ 202, 276, 341, 480, 2335, 2335, 731, 724, 2335, 352,
+ 366, 397, 389, 374, 391, 395, 407, 419, 690, 422,
+ 2335, 2335, 719, 712, 0, 0, 680, 400, 2335, 2335,
+ 709, 709, 0, 0, 677, 408, 2335, 0, 0, 0,
+ 676, 411, 2335, 0, 0, 0, 407, 434, 415, 2335,
+ 698, 696, 446, 0, 0, 337, 424, 416, 2335, 694,
+ 687, 488, 0, 0, 0, 673, 443, 0, 488, 2335,
+
+ 684, 684, 660, 2335, 2335, 681, 2335, 2335, 447, 665,
+ 664, 513, 527, 0, 541, 555, 212, 505, 2335, 2335,
+ 429, 580, 612, 653, 659, 658, 0, 321, 361, 428,
+ 653, 77, 649, 435, 279, 2335, 0, 569, 494, 493,
+ 537, 526, 2335, 0, 0, 2335, 0, 0, 648, 0,
+ 0, 647, 0, 0, 626, 545, 0, 0, 614, 453,
+ 0, 0, 631, 0, 2335, 603, 0, 406, 469, 2335,
+ 478, 0, 0, 2335, 678, 703, 630, 518, 572, 629,
+ 467, 485, 516, 602, 627, 576, 570, 578, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 632, 2335,
+
+ 0, 0, 628, 2335, 0, 0, 2335, 0, 0, 728,
+ 753, 526, 341, 546, 558, 560, 524, 509, 588, 0,
+ 0, 0, 0, 436, 0, 0, 430, 0, 0, 0,
+ 0, 0, 0, 0, 0, 778, 803, 584, 573, 585,
+ 327, 0, 0, 0, 0, 0, 0, 0, 0, 828,
+ 215, 591, 608, 211, 0, 0, 0, 0, 0, 0,
+ 0, 853, 206, 614, 0, 0, 0, 0, 0, 0,
+ 0, 878, 70, 0, 0, 0, 0, 0, 0, 0,
+ 903, 0, 2335, 946, 968, 990, 1012, 1034, 1056, 1078,
+ 1100, 1122, 1144, 1166, 1188, 1204, 1225, 1232, 1239, 1250,
+
+ 1262, 1284, 1304, 1325, 1345, 1366, 1383, 1404, 1421, 1442,
+ 1459, 1480, 1497, 1508, 1519, 1530, 1545, 1561, 1577, 1598,
+ 1616, 1628, 1644, 621, 645, 1666, 1683, 646, 657, 1704,
+ 1721, 1727, 658, 687, 1748, 1765, 1771, 688, 712, 1792,
+ 1809, 713, 737, 1830, 1847, 738, 762, 1858, 1869, 1880,
+ 1889, 1900, 1915, 1931, 1947, 1968, 1985, 2005, 2026, 2038,
+ 2048, 2059, 2074, 2090, 2102, 763, 787, 788, 812, 2114,
+ 813, 837, 2125, 838, 862, 2146, 863, 887, 2168, 888,
+ 912, 2180, 2189, 2206, 913, 1298, 2218, 1300, 1339, 1341,
+ 1377, 2228, 1379, 1415, 2237, 1417, 1453, 1455, 1491, 1493,
+
+ 1507, 1518, 1677, 1679, 1715, 1717, 1759, 1761, 1803, 1805,
+ 1841, 1843, 1857, 1868, 1879, 1979, 1981, 2058, 2113, 2124,
+ 2179, 2235, 2244, 2246, 2248, 2250, 2257, 2259, 2261, 2263,
+ 2270, 2272, 2274, 2276, 2283, 2285, 2287, 2289, 2296, 2298,
+ 2300, 2302, 2309, 2311, 2313
} ;
-static yyconst flex_int16_t yy_def[560] =
+static yyconst flex_int16_t yy_def[546] =
{ 0,
- 393, 1, 394, 394, 395, 395, 396, 396, 397, 397,
- 398, 398, 399, 399, 393, 15, 400, 400, 401, 401,
- 393, 393, 393, 393, 393, 393, 402, 403, 404, 393,
- 393, 393, 393, 405, 393, 406, 393, 407, 393, 408,
- 409, 410, 393, 393, 393, 411, 410, 410, 410, 410,
- 410, 410, 393, 393, 393, 412, 393, 393, 393, 413,
- 414, 393, 393, 393, 415, 393, 416, 393, 393, 393,
- 417, 393, 418, 393, 393, 393, 419, 393, 420, 393,
- 393, 420, 421, 393, 422, 393, 393, 422, 423, 393,
- 424, 425, 426, 393, 393, 393, 393, 402, 393, 403,
-
- 393, 403, 404, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 427, 428, 427, 429, 430, 407, 431,
- 407, 393, 430, 393, 432, 409, 409, 409, 409, 409,
- 409, 409, 409, 409, 409, 410, 410, 433, 393, 393,
- 393, 393, 393, 411, 411, 434, 410, 410, 410, 410,
- 410, 410, 435, 436, 393, 393, 393, 393, 435, 437,
- 438, 439, 440, 393, 393, 393, 393, 439, 441, 442,
- 443, 444, 393, 445, 443, 446, 447, 448, 449, 393,
- 450, 448, 451, 452, 453, 453, 454, 393, 393, 393,
- 453, 453, 455, 456, 457, 457, 458, 393, 393, 393,
-
- 457, 457, 459, 460, 461, 462, 463, 464, 465, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 466, 466, 223, 467, 468, 469, 469, 393, 393,
- 470, 471, 472, 472, 473, 473, 474, 475, 475, 475,
- 475, 475, 475, 475, 475, 393, 476, 477, 478, 478,
- 478, 478, 393, 479, 480, 393, 481, 482, 483, 484,
- 485, 486, 487, 488, 489, 393, 490, 491, 492, 393,
- 493, 494, 495, 496, 393, 468, 276, 469, 469, 393,
- 497, 498, 499, 393, 472, 285, 474, 475, 475, 475,
- 475, 475, 475, 477, 500, 478, 478, 478, 501, 502,
-
- 503, 504, 505, 506, 507, 508, 509, 510, 393, 393,
- 511, 512, 393, 393, 513, 514, 393, 515, 516, 285,
- 285, 475, 475, 475, 475, 475, 475, 500, 478, 517,
- 518, 519, 520, 505, 521, 522, 508, 523, 524, 525,
- 526, 527, 528, 529, 530, 285, 285, 475, 475, 475,
- 475, 531, 532, 533, 534, 535, 536, 537, 538, 285,
- 475, 475, 475, 475, 539, 540, 541, 542, 543, 544,
- 545, 285, 475, 475, 546, 547, 548, 549, 550, 551,
- 552, 285, 475, 553, 554, 555, 556, 557, 558, 559,
- 285, 538, 0, 393, 393, 393, 393, 393, 393, 393,
-
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
-
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393
+ 383, 1, 384, 384, 385, 385, 386, 386, 387, 387,
+ 388, 388, 389, 389, 383, 15, 390, 390, 391, 391,
+ 383, 383, 383, 383, 383, 383, 392, 393, 394, 383,
+ 383, 383, 383, 395, 383, 396, 383, 397, 383, 398,
+ 399, 400, 383, 383, 383, 401, 400, 400, 400, 400,
+ 400, 400, 383, 383, 402, 383, 383, 383, 403, 404,
+ 383, 383, 383, 405, 406, 383, 383, 383, 407, 408,
+ 383, 383, 383, 409, 410, 383, 383, 410, 411, 412,
+ 383, 383, 412, 413, 383, 383, 414, 415, 416, 383,
+ 383, 383, 383, 392, 383, 393, 383, 393, 394, 383,
+
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 417,
+ 418, 417, 419, 420, 397, 421, 397, 383, 420, 383,
+ 422, 399, 399, 399, 399, 399, 399, 399, 399, 399,
+ 399, 400, 400, 396, 383, 383, 383, 383, 383, 401,
+ 401, 423, 400, 400, 400, 400, 400, 400, 402, 403,
+ 383, 383, 383, 383, 424, 425, 426, 427, 383, 383,
+ 383, 383, 428, 429, 430, 431, 383, 432, 433, 434,
+ 435, 436, 383, 437, 438, 439, 440, 440, 441, 383,
+ 383, 383, 440, 442, 443, 444, 444, 445, 383, 383,
+ 383, 444, 446, 447, 448, 449, 450, 451, 452, 383,
+
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 453, 453, 213, 454, 455, 456, 456, 383, 383,
+ 457, 458, 459, 459, 460, 460, 461, 462, 462, 462,
+ 462, 462, 462, 462, 462, 383, 463, 464, 465, 465,
+ 465, 465, 383, 466, 467, 383, 468, 469, 470, 471,
+ 472, 473, 474, 475, 476, 383, 477, 478, 479, 383,
+ 480, 481, 482, 483, 383, 455, 266, 456, 456, 383,
+ 484, 485, 486, 383, 224, 224, 461, 462, 462, 462,
+ 462, 462, 462, 464, 487, 465, 465, 465, 488, 489,
+ 490, 491, 492, 493, 494, 495, 496, 497, 383, 383,
+
+ 498, 499, 383, 383, 500, 501, 383, 502, 503, 224,
+ 224, 462, 462, 462, 462, 462, 462, 487, 465, 504,
+ 505, 506, 507, 492, 508, 509, 495, 510, 511, 512,
+ 513, 514, 515, 516, 517, 224, 224, 462, 462, 462,
+ 462, 518, 519, 520, 521, 522, 523, 524, 525, 224,
+ 462, 462, 462, 462, 526, 527, 528, 529, 530, 531,
+ 532, 224, 462, 462, 533, 534, 535, 536, 537, 538,
+ 539, 224, 462, 540, 541, 542, 543, 544, 515, 545,
+ 224, 525, 0, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383
} ;
-static yyconst flex_int16_t yy_nxt[2488] =
+static yyconst flex_int16_t yy_nxt[2398] =
{ 0,
22, 23, 24, 25, 23, 26, 27, 28, 22, 22,
29, 30, 31, 32, 33, 32, 34, 22, 35, 36,
@@ -588,276 +584,267 @@ static yyconst flex_int16_t yy_nxt[2488] =
42, 42, 43, 22, 44, 45, 46, 47, 42, 42,
42, 42, 48, 42, 49, 50, 42, 42, 42, 42,
51, 42, 42, 42, 52, 42, 42, 42, 42, 53,
- 54, 42, 22, 55, 237, 57, 58, 55, 96, 57,
- 58, 96, 55, 59, 62, 63, 214, 59, 64, 55,
- 237, 62, 63, 55, 66, 64, 68, 69, 66, 55,
- 68, 69, 101, 102, 70, 215, 60, 95, 70, 78,
-
- 60, 80, 81, 95, 72, 65, 74, 75, 237, 82,
- 76, 105, 65, 106, 237, 176, 72, 71, 74, 75,
- 137, 71, 76, 138, 84, 55, 86, 87, 145, 55,
- 88, 146, 83, 137, 55, 137, 138, 77, 138, 177,
- 183, 55, 78, 237, 80, 81, 66, 101, 102, 77,
- 66, 112, 82, 106, 196, 193, 84, 89, 86, 87,
- 186, 78, 88, 113, 184, 238, 72, 108, 109, 110,
- 108, 118, 149, 203, 118, 83, 113, 137, 72, 194,
- 138, 197, 237, 187, 111, 137, 84, 206, 138, 89,
- 205, 120, 121, 122, 216, 102, 96, 204, 147, 96,
-
- 127, 128, 306, 123, 78, 129, 148, 130, 131, 132,
- 220, 245, 220, 133, 134, 221, 303, 135, 84, 90,
- 90, 55, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 91, 90, 90, 91, 90, 90,
- 90, 90, 90, 90, 90, 92, 92, 92, 92, 92,
- 92, 90, 90, 90, 90, 90, 93, 93, 93, 93,
- 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
- 93, 93, 93, 93, 93, 93, 93, 93, 90, 90,
- 90, 90, 114, 137, 114, 295, 138, 237, 114, 237,
- 115, 116, 114, 115, 114, 137, 237, 114, 138, 114,
-
- 114, 140, 141, 142, 140, 157, 158, 166, 167, 150,
- 189, 190, 199, 200, 217, 112, 201, 106, 191, 210,
- 211, 212, 210, 151, 227, 228, 237, 113, 111, 215,
- 237, 152, 219, 237, 160, 143, 169, 230, 113, 291,
- 113, 187, 113, 197, 237, 229, 137, 231, 240, 138,
- 206, 113, 237, 205, 237, 113, 242, 186, 161, 237,
- 170, 207, 207, 207, 207, 207, 207, 222, 239, 222,
- 160, 208, 137, 222, 293, 393, 224, 222, 169, 222,
- 187, 114, 222, 114, 222, 222, 243, 114, 279, 244,
- 116, 114, 241, 114, 161, 222, 114, 222, 114, 114,
-
- 145, 222, 170, 393, 224, 222, 317, 222, 280, 114,
- 222, 114, 222, 222, 145, 114, 231, 393, 226, 114,
- 137, 114, 137, 138, 114, 138, 114, 114, 118, 227,
- 228, 118, 118, 227, 228, 118, 247, 137, 247, 137,
- 138, 313, 138, 137, 247, 309, 138, 247, 120, 295,
- 122, 247, 120, 247, 122, 176, 137, 250, 183, 138,
- 123, 265, 186, 193, 123, 227, 228, 203, 249, 232,
- 196, 269, 251, 232, 237, 189, 190, 199, 200, 177,
- 196, 270, 184, 266, 187, 187, 229, 194, 237, 206,
- 282, 204, 205, 219, 233, 252, 232, 197, 197, 137,
-
- 232, 232, 138, 113, 237, 232, 187, 197, 197, 237,
- 237, 289, 232, 237, 283, 232, 113, 232, 234, 114,
- 137, 114, 206, 138, 237, 114, 288, 115, 116, 114,
- 115, 114, 206, 313, 114, 205, 114, 114, 197, 279,
- 393, 309, 290, 207, 207, 207, 207, 207, 207, 222,
- 292, 222, 314, 208, 325, 222, 310, 296, 224, 222,
- 280, 222, 187, 222, 222, 222, 222, 222, 393, 222,
- 393, 137, 224, 222, 138, 222, 237, 114, 222, 114,
- 222, 222, 137, 114, 306, 138, 226, 114, 280, 114,
- 280, 222, 114, 222, 114, 114, 298, 222, 237, 237,
-
- 277, 222, 322, 222, 237, 247, 222, 247, 222, 222,
- 118, 227, 228, 118, 295, 137, 237, 237, 138, 297,
- 247, 137, 247, 137, 138, 326, 138, 323, 237, 237,
- 281, 324, 284, 237, 237, 237, 348, 327, 247, 222,
- 247, 222, 123, 227, 228, 222, 329, 295, 277, 222,
- 237, 222, 349, 247, 222, 247, 222, 222, 137, 285,
- 237, 138, 362, 350, 229, 351, 361, 285, 285, 285,
- 363, 237, 303, 237, 237, 237, 236, 236, 285, 285,
- 285, 285, 285, 285, 227, 228, 373, 254, 221, 221,
- 254, 255, 364, 97, 255, 254, 374, 215, 257, 255,
-
- 286, 257, 275, 275, 258, 229, 257, 258, 286, 286,
- 286, 383, 258, 205, 198, 198, 188, 188, 179, 286,
- 286, 286, 286, 286, 286, 227, 228, 260, 261, 263,
- 260, 261, 263, 179, 172, 260, 261, 263, 172, 264,
- 267, 320, 264, 267, 163, 256, 229, 264, 267, 320,
- 320, 320, 256, 163, 154, 253, 253, 154, 246, 246,
- 320, 320, 320, 320, 320, 320, 321, 237, 237, 268,
- 271, 236, 268, 271, 321, 321, 321, 268, 271, 218,
- 218, 111, 213, 97, 213, 321, 321, 321, 321, 321,
- 321, 346, 198, 198, 272, 299, 188, 272, 299, 346,
-
- 346, 346, 272, 299, 188, 181, 180, 180, 179, 174,
- 346, 346, 346, 346, 346, 346, 347, 173, 173, 300,
- 301, 172, 300, 301, 347, 347, 347, 300, 301, 165,
- 164, 164, 163, 156, 155, 347, 347, 347, 347, 347,
- 347, 360, 155, 154, 302, 304, 139, 302, 304, 360,
- 360, 360, 302, 304, 124, 104, 99, 97, 97, 393,
- 360, 360, 360, 360, 360, 360, 232, 393, 393, 305,
- 307, 393, 305, 307, 232, 232, 232, 305, 307, 393,
- 393, 393, 393, 393, 393, 232, 232, 232, 232, 232,
- 232, 372, 393, 393, 308, 311, 393, 308, 311, 372,
-
- 372, 372, 308, 311, 393, 393, 393, 393, 393, 393,
- 372, 372, 372, 372, 372, 372, 382, 393, 393, 312,
- 315, 393, 312, 315, 382, 382, 382, 312, 315, 393,
- 393, 393, 393, 393, 393, 382, 382, 382, 382, 382,
- 382, 391, 393, 393, 316, 318, 393, 316, 318, 391,
- 391, 391, 316, 318, 393, 393, 393, 393, 393, 393,
- 391, 391, 391, 391, 391, 391, 232, 393, 393, 319,
- 330, 393, 319, 330, 232, 232, 232, 319, 330, 393,
- 393, 393, 393, 393, 393, 232, 232, 232, 232, 232,
- 232, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 61, 61, 61, 61, 61, 61,
- 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
- 61, 61, 61, 61, 61, 61, 61, 67, 67, 67,
- 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
- 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 79, 79, 79, 79, 79, 79, 79,
- 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-
- 79, 79, 79, 79, 79, 79, 85, 85, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 85, 85, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 55, 55, 55, 55, 55, 55, 55, 55,
+ 54, 42, 56, 57, 56, 57, 92, 61, 62, 92,
+ 58, 63, 58, 61, 62, 66, 67, 63, 66, 67,
+ 71, 72, 86, 68, 73, 227, 68, 71, 72, 76,
+ 77, 73, 227, 59, 86, 59, 91, 78, 64, 76,
+
+ 77, 81, 82, 169, 64, 83, 69, 78, 91, 69,
+ 178, 74, 81, 82, 97, 98, 83, 101, 74, 102,
+ 79, 104, 105, 106, 104, 133, 141, 170, 134, 142,
+ 79, 133, 84, 179, 134, 281, 196, 92, 107, 195,
+ 92, 97, 98, 84, 85, 85, 86, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 87,
+ 85, 85, 87, 85, 85, 85, 85, 85, 85, 85,
+ 88, 88, 88, 88, 88, 88, 85, 85, 85, 85,
+ 85, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+
+ 89, 89, 89, 85, 85, 85, 108, 114, 102, 207,
+ 114, 136, 137, 138, 136, 269, 133, 227, 109, 134,
+ 133, 227, 133, 134, 205, 134, 227, 116, 117, 118,
+ 227, 109, 110, 133, 110, 270, 134, 143, 110, 119,
+ 111, 112, 110, 111, 110, 139, 235, 110, 146, 110,
+ 110, 123, 124, 175, 144, 187, 125, 145, 126, 127,
+ 128, 153, 154, 133, 129, 130, 134, 227, 131, 161,
+ 162, 181, 182, 184, 190, 191, 193, 176, 192, 183,
+ 206, 98, 188, 200, 201, 202, 200, 204, 217, 218,
+ 155, 147, 133, 232, 227, 134, 227, 185, 163, 148,
+
+ 194, 108, 179, 102, 196, 188, 205, 195, 227, 219,
+ 227, 107, 227, 109, 156, 197, 197, 197, 197, 197,
+ 197, 109, 164, 209, 283, 198, 109, 210, 220, 210,
+ 228, 229, 211, 109, 109, 212, 227, 212, 221, 233,
+ 227, 212, 227, 187, 214, 212, 109, 212, 231, 110,
+ 212, 110, 212, 212, 227, 110, 227, 133, 112, 110,
+ 383, 110, 230, 212, 110, 212, 110, 110, 141, 212,
+ 188, 383, 214, 212, 278, 212, 227, 110, 212, 110,
+ 212, 212, 141, 110, 354, 383, 216, 110, 338, 110,
+ 133, 234, 110, 134, 110, 110, 114, 217, 218, 114,
+
+ 114, 217, 218, 114, 237, 133, 237, 133, 134, 383,
+ 134, 133, 237, 279, 134, 237, 116, 178, 118, 237,
+ 116, 237, 118, 133, 383, 383, 134, 240, 119, 270,
+ 259, 163, 119, 217, 218, 133, 239, 222, 134, 169,
+ 179, 222, 175, 227, 255, 296, 184, 193, 181, 182,
+ 227, 293, 241, 155, 219, 164, 256, 188, 196, 303,
+ 272, 195, 223, 170, 222, 209, 176, 179, 222, 222,
+ 185, 194, 383, 222, 242, 109, 282, 156, 304, 179,
+ 222, 280, 227, 222, 273, 222, 224, 110, 109, 110,
+ 190, 191, 270, 110, 260, 111, 112, 110, 111, 110,
+
+ 227, 307, 110, 196, 110, 110, 195, 269, 383, 133,
+ 133, 221, 134, 134, 197, 197, 197, 197, 197, 197,
+ 212, 188, 212, 315, 198, 285, 212, 316, 270, 214,
+ 212, 227, 212, 227, 212, 212, 212, 212, 212, 227,
+ 212, 227, 133, 214, 212, 134, 212, 286, 110, 212,
+ 110, 212, 212, 133, 110, 299, 134, 216, 110, 312,
+ 110, 227, 212, 110, 212, 110, 110, 288, 212, 317,
+ 300, 267, 212, 227, 212, 227, 237, 212, 237, 212,
+ 212, 114, 217, 218, 114, 285, 133, 227, 227, 134,
+ 287, 237, 133, 237, 133, 134, 339, 134, 313, 227,
+
+ 227, 271, 314, 274, 133, 341, 227, 134, 340, 237,
+ 212, 237, 212, 119, 217, 218, 212, 319, 285, 267,
+ 212, 352, 212, 227, 237, 212, 237, 212, 212, 227,
+ 275, 351, 363, 244, 303, 219, 244, 353, 275, 275,
+ 275, 244, 299, 285, 227, 227, 196, 188, 364, 275,
+ 275, 275, 275, 275, 275, 217, 218, 245, 247, 179,
+ 245, 247, 296, 293, 227, 245, 247, 373, 227, 248,
+ 250, 276, 248, 250, 226, 226, 219, 248, 250, 276,
+ 276, 276, 211, 211, 93, 205, 265, 265, 195, 189,
+ 276, 276, 276, 276, 276, 276, 310, 189, 180, 251,
+
+ 253, 180, 251, 253, 310, 310, 310, 251, 253, 172,
+ 166, 246, 246, 158, 243, 310, 310, 310, 310, 310,
+ 310, 311, 243, 150, 254, 257, 236, 254, 257, 311,
+ 311, 311, 254, 257, 236, 227, 227, 226, 208, 208,
+ 311, 311, 311, 311, 311, 311, 336, 107, 203, 258,
+ 261, 93, 258, 261, 336, 336, 336, 258, 261, 203,
+ 189, 189, 180, 180, 174, 336, 336, 336, 336, 336,
+ 336, 337, 173, 173, 262, 289, 172, 262, 289, 337,
+ 337, 337, 262, 289, 168, 167, 167, 166, 160, 159,
+ 337, 337, 337, 337, 337, 337, 350, 159, 158, 290,
+
+ 291, 152, 290, 291, 350, 350, 350, 290, 291, 151,
+ 151, 150, 135, 120, 100, 350, 350, 350, 350, 350,
+ 350, 222, 95, 93, 292, 294, 93, 292, 294, 222,
+ 222, 222, 292, 294, 383, 383, 383, 383, 383, 383,
+ 222, 222, 222, 222, 222, 222, 362, 383, 383, 295,
+ 297, 383, 295, 297, 362, 362, 362, 295, 297, 383,
+ 383, 383, 383, 383, 383, 362, 362, 362, 362, 362,
+ 362, 372, 383, 383, 298, 301, 383, 298, 301, 372,
+ 372, 372, 298, 301, 383, 383, 383, 383, 383, 383,
+ 372, 372, 372, 372, 372, 372, 381, 383, 383, 302,
+
+ 305, 383, 302, 305, 381, 381, 381, 302, 305, 383,
+ 383, 383, 383, 383, 383, 381, 381, 381, 381, 381,
+ 381, 222, 383, 383, 306, 308, 383, 306, 308, 222,
+ 222, 222, 306, 308, 383, 383, 383, 383, 383, 383,
+ 222, 222, 222, 222, 222, 222, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
- 55, 55, 55, 55, 55, 98, 98, 393, 98, 98,
- 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
- 98, 98, 98, 393, 98, 98, 98, 98, 100, 100,
-
- 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
- 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
- 100, 103, 103, 393, 103, 103, 103, 103, 103, 103,
- 103, 103, 103, 103, 103, 103, 103, 103, 103, 393,
- 103, 103, 103, 103, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 117, 393, 117,
- 393, 117, 117, 117, 117, 393, 117, 117, 117, 393,
- 117, 117, 117, 119, 393, 393, 119, 119, 119, 119,
- 119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
-
- 119, 119, 119, 119, 119, 125, 125, 125, 393, 125,
- 125, 125, 126, 126, 126, 393, 393, 126, 136, 136,
- 136, 136, 393, 136, 136, 136, 393, 136, 136, 136,
- 144, 144, 144, 144, 393, 144, 144, 144, 393, 144,
- 144, 144, 153, 393, 393, 153, 153, 153, 393, 153,
- 153, 153, 153, 153, 153, 153, 153, 153, 153, 153,
- 153, 153, 153, 159, 159, 393, 159, 331, 159, 332,
- 331, 393, 332, 393, 393, 331, 393, 332, 159, 159,
- 393, 159, 162, 393, 393, 162, 393, 162, 162, 162,
- 162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
-
- 162, 162, 162, 168, 168, 393, 168, 333, 168, 335,
- 333, 393, 335, 393, 393, 333, 393, 335, 168, 168,
- 336, 168, 171, 336, 393, 171, 171, 171, 336, 171,
+ 55, 55, 55, 55, 55, 55, 55, 55, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 70, 70, 70, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 80, 80, 80, 80,
+ 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
+ 80, 80, 80, 80, 80, 80, 80, 80, 90, 90,
+ 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+ 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+
+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 94, 94, 383, 94, 94, 94, 94, 94,
+ 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 383, 94, 94, 94, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 96, 96, 96, 99, 99, 383, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 383, 99, 99, 99, 103, 103,
+ 103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
+
+ 103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
+ 113, 383, 113, 383, 113, 113, 113, 113, 383, 113,
+ 113, 113, 383, 113, 113, 113, 115, 383, 383, 115,
+ 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
+ 115, 115, 115, 115, 115, 115, 115, 121, 121, 121,
+ 383, 121, 121, 121, 122, 122, 122, 383, 383, 122,
+ 132, 132, 132, 132, 383, 132, 132, 132, 383, 132,
+ 132, 132, 140, 140, 140, 140, 383, 140, 140, 140,
+ 383, 140, 140, 140, 149, 149, 383, 383, 149, 149,
+ 149, 383, 149, 149, 149, 149, 149, 149, 149, 149,
+
+ 149, 149, 149, 149, 149, 149, 149, 149, 383, 149,
+ 309, 149, 320, 309, 383, 320, 383, 383, 309, 383,
+ 320, 149, 149, 383, 149, 157, 157, 383, 383, 157,
+ 383, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+ 157, 157, 157, 157, 157, 157, 157, 157, 157, 383,
+ 157, 321, 157, 322, 321, 383, 322, 383, 383, 321,
+ 383, 322, 157, 157, 383, 157, 165, 165, 383, 383,
+ 165, 165, 165, 383, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 165, 165, 165, 165, 165, 165, 323,
+ 165, 325, 323, 383, 325, 383, 383, 323, 383, 325,
+
+ 165, 165, 383, 165, 171, 171, 383, 383, 171, 383,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
- 171, 171, 171, 175, 338, 175, 339, 338, 393, 339,
- 393, 393, 338, 393, 339, 175, 175, 393, 175, 178,
- 393, 393, 178, 393, 178, 178, 178, 178, 178, 178,
- 178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
- 182, 340, 182, 341, 340, 393, 341, 393, 393, 340,
- 393, 341, 182, 182, 393, 182, 185, 393, 393, 185,
-
- 185, 185, 185, 185, 185, 185, 185, 185, 185, 185,
- 185, 185, 185, 185, 185, 185, 185, 192, 342, 192,
- 343, 342, 393, 343, 393, 393, 342, 393, 343, 192,
- 192, 393, 192, 195, 393, 393, 195, 195, 195, 195,
- 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
- 195, 195, 195, 195, 202, 344, 202, 345, 344, 393,
- 345, 393, 393, 344, 393, 345, 202, 202, 393, 202,
- 205, 352, 205, 393, 352, 205, 205, 205, 393, 352,
- 205, 207, 159, 207, 393, 159, 207, 207, 207, 393,
- 159, 207, 209, 393, 209, 393, 393, 209, 209, 209,
-
- 393, 209, 209, 223, 393, 223, 393, 223, 223, 223,
- 223, 393, 223, 223, 223, 393, 223, 223, 223, 115,
- 393, 115, 393, 115, 115, 115, 115, 393, 115, 115,
- 115, 393, 115, 115, 115, 225, 393, 225, 393, 225,
- 225, 225, 225, 393, 225, 225, 225, 393, 225, 225,
- 225, 118, 118, 118, 118, 118, 118, 118, 118, 118,
- 118, 118, 118, 118, 393, 118, 118, 118, 118, 118,
- 118, 118, 118, 120, 120, 120, 120, 120, 120, 120,
- 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
- 120, 120, 235, 235, 235, 393, 393, 235, 235, 235,
-
- 393, 235, 235, 235, 117, 393, 117, 393, 117, 117,
- 117, 117, 393, 117, 117, 117, 393, 117, 117, 117,
- 248, 393, 393, 393, 248, 393, 248, 393, 393, 248,
- 248, 248, 393, 248, 248, 248, 153, 393, 393, 153,
- 153, 153, 393, 153, 153, 153, 153, 153, 153, 153,
- 153, 153, 153, 153, 153, 153, 153, 159, 353, 159,
- 168, 353, 393, 168, 393, 393, 353, 393, 168, 159,
- 159, 393, 159, 162, 393, 393, 162, 393, 162, 162,
- 162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
- 162, 162, 162, 162, 168, 354, 168, 175, 354, 393,
-
- 175, 393, 393, 354, 393, 175, 168, 168, 355, 168,
- 171, 355, 393, 171, 171, 171, 355, 171, 171, 171,
+ 171, 171, 171, 171, 171, 171, 171, 326, 171, 328,
+ 326, 383, 328, 383, 383, 326, 383, 328, 171, 171,
+ 383, 171, 177, 177, 383, 383, 177, 177, 177, 177,
+ 177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
+ 177, 177, 177, 177, 177, 329, 177, 330, 329, 383,
+ 330, 383, 383, 329, 383, 330, 177, 177, 383, 177,
+ 186, 186, 383, 383, 186, 186, 186, 186, 186, 186,
+ 186, 186, 186, 186, 186, 186, 186, 186, 186, 186,
+
+ 186, 186, 186, 331, 186, 332, 331, 383, 332, 383,
+ 383, 331, 383, 332, 186, 186, 383, 186, 195, 333,
+ 195, 383, 333, 195, 195, 195, 383, 333, 195, 197,
+ 334, 197, 383, 334, 197, 197, 197, 383, 334, 197,
+ 199, 383, 199, 383, 383, 199, 199, 199, 383, 199,
+ 199, 213, 383, 213, 383, 213, 213, 213, 213, 383,
+ 213, 213, 213, 383, 213, 213, 213, 111, 383, 111,
+ 383, 111, 111, 111, 111, 383, 111, 111, 111, 383,
+ 111, 111, 111, 215, 383, 215, 383, 215, 215, 215,
+ 215, 383, 215, 215, 215, 383, 215, 215, 215, 114,
+
+ 114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
+ 114, 114, 383, 114, 114, 114, 114, 114, 114, 114,
+ 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
+ 116, 116, 116, 116, 116, 116, 116, 116, 225, 225,
+ 225, 383, 383, 225, 225, 225, 383, 225, 225, 225,
+ 238, 383, 383, 383, 238, 383, 238, 383, 383, 238,
+ 238, 238, 383, 238, 238, 238, 157, 157, 383, 383,
+ 157, 383, 157, 157, 157, 157, 157, 157, 157, 157,
+ 157, 157, 157, 157, 157, 157, 157, 157, 157, 335,
+ 157, 342, 335, 383, 342, 383, 383, 335, 383, 342,
+
+ 157, 157, 383, 157, 165, 165, 383, 383, 165, 165,
+ 165, 383, 165, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 165, 165, 165, 165, 149, 165, 343,
+ 149, 383, 343, 383, 383, 149, 383, 343, 165, 165,
+ 383, 165, 249, 249, 249, 383, 383, 249, 171, 171,
+ 383, 383, 171, 383, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
- 171, 175, 182, 175, 356, 182, 393, 356, 393, 393,
- 182, 393, 356, 175, 175, 393, 175, 259, 259, 259,
- 393, 393, 259, 178, 393, 393, 178, 393, 178, 178,
- 178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
- 178, 178, 178, 178, 182, 192, 182, 357, 192, 393,
- 357, 393, 393, 192, 393, 357, 182, 182, 393, 182,
- 262, 262, 262, 393, 393, 262, 185, 393, 393, 185,
-
- 185, 185, 185, 185, 185, 185, 185, 185, 185, 185,
- 185, 185, 185, 185, 185, 185, 185, 192, 202, 192,
- 358, 202, 393, 358, 393, 393, 202, 393, 358, 192,
- 192, 393, 192, 195, 393, 393, 195, 195, 195, 195,
- 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
- 195, 195, 195, 195, 202, 359, 202, 365, 359, 393,
- 365, 393, 393, 359, 393, 365, 202, 202, 393, 202,
- 205, 366, 205, 393, 366, 205, 205, 205, 393, 366,
- 205, 273, 367, 273, 393, 367, 273, 273, 273, 393,
- 367, 273, 207, 368, 207, 393, 368, 207, 207, 207,
-
- 393, 368, 207, 274, 393, 393, 274, 274, 274, 393,
- 393, 274, 209, 393, 209, 393, 393, 209, 209, 209,
- 393, 209, 209, 223, 393, 223, 393, 223, 223, 223,
- 223, 393, 223, 223, 223, 393, 223, 223, 223, 225,
- 393, 225, 393, 225, 225, 225, 225, 393, 225, 225,
- 225, 393, 225, 225, 225, 276, 393, 276, 393, 276,
- 276, 276, 276, 393, 276, 276, 276, 393, 276, 276,
- 276, 278, 393, 278, 278, 393, 278, 393, 278, 393,
- 278, 393, 278, 278, 393, 278, 278, 278, 393, 278,
- 278, 278, 278, 281, 369, 281, 370, 369, 393, 370,
-
- 393, 393, 369, 393, 370, 281, 281, 393, 281, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 118, 118, 118, 118, 118, 118, 118, 118, 118,
- 118, 118, 118, 118, 393, 118, 118, 118, 118, 118,
- 118, 118, 118, 235, 235, 235, 393, 393, 235, 235,
- 235, 393, 235, 235, 235, 287, 393, 393, 287, 287,
- 287, 393, 393, 287, 126, 371, 393, 393, 371, 126,
- 126, 126, 393, 371, 126, 247, 393, 393, 393, 247,
- 393, 247, 393, 393, 247, 247, 247, 393, 247, 247,
-
- 247, 294, 393, 393, 393, 294, 294, 294, 393, 393,
- 294, 294, 294, 393, 294, 294, 294, 136, 136, 136,
- 136, 393, 136, 136, 136, 393, 136, 136, 136, 259,
- 281, 393, 393, 281, 259, 259, 259, 393, 281, 259,
- 262, 375, 393, 393, 375, 262, 262, 262, 393, 375,
- 262, 185, 393, 393, 185, 185, 185, 393, 185, 185,
- 185, 185, 185, 185, 185, 185, 185, 185, 185, 185,
- 185, 185, 195, 393, 393, 195, 393, 195, 195, 195,
- 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
- 195, 195, 195, 273, 376, 273, 393, 376, 273, 273,
-
- 273, 393, 376, 273, 274, 393, 393, 274, 274, 274,
- 393, 393, 274, 281, 281, 281, 281, 281, 281, 281,
- 281, 281, 281, 281, 281, 281, 281, 281, 281, 281,
- 281, 281, 328, 328, 328, 393, 393, 328, 328, 328,
- 393, 328, 328, 328, 334, 393, 393, 334, 334, 334,
- 393, 377, 334, 337, 377, 393, 337, 337, 337, 377,
- 378, 337, 379, 378, 380, 379, 381, 380, 378, 381,
- 379, 393, 380, 384, 381, 385, 384, 386, 385, 387,
- 386, 384, 387, 385, 393, 386, 388, 387, 389, 388,
- 390, 389, 159, 390, 388, 159, 389, 393, 390, 168,
-
- 159, 175, 168, 182, 175, 192, 182, 168, 192, 175,
- 393, 182, 202, 192, 392, 202, 393, 392, 393, 393,
- 202, 393, 392, 21, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393
+ 171, 157, 171, 344, 157, 383, 344, 383, 383, 157,
+ 383, 344, 171, 171, 383, 171, 252, 252, 252, 383,
+ 383, 252, 177, 177, 383, 383, 177, 177, 177, 177,
+
+ 177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
+ 177, 177, 177, 177, 177, 165, 177, 345, 165, 383,
+ 345, 383, 383, 165, 383, 345, 177, 177, 383, 177,
+ 186, 186, 383, 383, 186, 186, 186, 186, 186, 186,
+ 186, 186, 186, 186, 186, 186, 186, 186, 186, 186,
+ 186, 186, 186, 171, 186, 346, 171, 383, 346, 383,
+ 383, 171, 383, 346, 186, 186, 383, 186, 195, 177,
+ 195, 383, 177, 195, 195, 195, 383, 177, 195, 263,
+ 347, 263, 383, 347, 263, 263, 263, 383, 347, 263,
+ 197, 186, 197, 383, 186, 197, 197, 197, 383, 186,
+
+ 197, 264, 383, 383, 264, 264, 264, 383, 383, 264,
+ 199, 383, 199, 383, 383, 199, 199, 199, 383, 199,
+ 199, 213, 383, 213, 383, 213, 213, 213, 213, 383,
+ 213, 213, 213, 383, 213, 213, 213, 215, 383, 215,
+ 383, 215, 215, 215, 215, 383, 215, 215, 215, 383,
+ 215, 215, 215, 266, 383, 266, 383, 266, 266, 266,
+ 266, 383, 266, 266, 266, 383, 266, 266, 266, 268,
+ 383, 268, 268, 383, 268, 383, 268, 383, 268, 383,
+ 268, 268, 383, 268, 268, 268, 383, 268, 268, 268,
+ 271, 348, 271, 349, 348, 383, 349, 383, 383, 348,
+
+ 383, 349, 271, 271, 383, 271, 222, 222, 222, 222,
+ 222, 222, 222, 222, 222, 222, 222, 222, 222, 222,
+ 222, 222, 222, 222, 222, 222, 222, 114, 114, 114,
+ 114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
+ 383, 114, 114, 114, 114, 114, 114, 114, 225, 225,
+ 225, 383, 383, 225, 225, 225, 383, 225, 225, 225,
+ 277, 383, 383, 277, 277, 277, 383, 383, 277, 122,
+ 355, 383, 383, 355, 122, 122, 122, 383, 355, 122,
+ 237, 383, 383, 383, 237, 383, 237, 383, 383, 237,
+ 237, 237, 383, 237, 237, 237, 284, 383, 383, 383,
+
+ 284, 284, 284, 383, 383, 284, 284, 284, 383, 284,
+ 284, 284, 132, 132, 132, 132, 383, 132, 132, 132,
+ 383, 132, 132, 132, 249, 356, 383, 383, 356, 249,
+ 249, 249, 383, 356, 249, 252, 357, 383, 383, 357,
+ 252, 252, 252, 383, 357, 252, 177, 177, 383, 383,
+ 177, 177, 177, 383, 177, 177, 177, 177, 177, 177,
+ 177, 177, 177, 177, 177, 177, 177, 177, 186, 186,
+ 383, 383, 186, 383, 186, 186, 186, 186, 186, 186,
+ 186, 186, 186, 186, 186, 186, 186, 186, 186, 186,
+ 263, 358, 263, 383, 358, 263, 263, 263, 383, 358,
+
+ 263, 264, 383, 383, 264, 264, 264, 383, 383, 264,
+ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271,
+ 271, 271, 271, 271, 271, 271, 271, 271, 318, 318,
+ 318, 383, 383, 318, 318, 318, 383, 318, 318, 318,
+ 324, 383, 383, 324, 324, 324, 383, 359, 324, 327,
+ 359, 383, 327, 327, 327, 359, 360, 327, 361, 360,
+ 271, 361, 365, 271, 360, 365, 361, 383, 271, 366,
+ 365, 367, 366, 368, 367, 369, 368, 366, 369, 367,
+ 383, 368, 370, 369, 371, 370, 374, 371, 375, 374,
+ 370, 375, 371, 383, 374, 376, 375, 377, 376, 378,
+
+ 377, 379, 378, 376, 379, 377, 383, 378, 380, 379,
+ 149, 380, 157, 149, 165, 157, 380, 165, 149, 383,
+ 157, 171, 165, 177, 171, 382, 177, 383, 382, 171,
+ 383, 177, 383, 382, 21, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383
+
} ;
-static yyconst flex_int16_t yy_chk[2488] =
+static yyconst flex_int16_t yy_chk[2398] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -865,273 +852,264 @@ static yyconst flex_int16_t yy_chk[2488] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 3, 383, 3, 3, 4, 23, 4,
- 4, 23, 5, 3, 5, 5, 99, 4, 5, 6,
- 373, 6, 6, 17, 7, 6, 7, 7, 8, 18,
- 8, 8, 28, 28, 7, 99, 3, 17, 8, 11,
-
- 4, 11, 11, 18, 9, 5, 9, 9, 364, 11,
- 9, 32, 6, 32, 361, 71, 10, 7, 10, 10,
- 42, 8, 10, 42, 13, 3, 13, 13, 46, 4,
- 13, 46, 11, 47, 5, 50, 47, 9, 50, 71,
- 77, 6, 12, 128, 12, 12, 7, 100, 100, 10,
- 8, 35, 12, 35, 85, 83, 14, 13, 14, 14,
- 79, 11, 14, 35, 77, 128, 9, 34, 34, 34,
- 34, 38, 50, 89, 38, 12, 35, 48, 10, 83,
- 48, 85, 135, 79, 34, 49, 13, 92, 49, 14,
- 92, 38, 38, 38, 102, 102, 96, 89, 48, 96,
-
- 41, 41, 337, 38, 12, 41, 49, 41, 41, 41,
- 113, 135, 113, 41, 41, 113, 334, 41, 14, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+ 1, 1, 3, 3, 4, 4, 23, 5, 5, 23,
+ 3, 5, 4, 6, 6, 7, 7, 6, 8, 8,
+ 9, 9, 17, 7, 9, 373, 8, 10, 10, 11,
+ 11, 10, 232, 3, 18, 4, 17, 11, 5, 12,
+
+ 12, 13, 13, 69, 6, 13, 7, 12, 18, 8,
+ 75, 9, 14, 14, 28, 28, 14, 32, 10, 32,
+ 11, 34, 34, 34, 34, 42, 46, 69, 42, 46,
+ 12, 47, 13, 75, 47, 232, 88, 92, 34, 88,
+ 92, 96, 96, 14, 15, 15, 15, 15, 15, 15,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 36, 51, 36, 328, 51, 327, 36, 322,
- 36, 36, 36, 36, 36, 52, 242, 36, 52, 36,
-
- 36, 45, 45, 45, 45, 60, 60, 65, 65, 51,
- 82, 82, 88, 88, 104, 106, 88, 106, 82, 95,
- 95, 95, 95, 52, 118, 118, 130, 106, 111, 104,
- 132, 52, 112, 129, 60, 45, 65, 120, 111, 242,
- 106, 82, 112, 88, 245, 118, 136, 120, 130, 136,
- 93, 111, 134, 93, 131, 112, 132, 185, 60, 133,
- 65, 93, 93, 93, 93, 93, 93, 114, 129, 114,
- 154, 93, 137, 114, 245, 137, 114, 114, 163, 114,
- 185, 115, 114, 115, 114, 114, 133, 115, 227, 134,
- 115, 115, 131, 115, 154, 116, 115, 116, 115, 115,
-
- 144, 116, 163, 144, 116, 116, 281, 116, 227, 117,
- 116, 117, 116, 116, 145, 117, 281, 145, 117, 117,
- 148, 117, 149, 148, 117, 149, 117, 117, 119, 119,
- 119, 119, 121, 121, 121, 121, 146, 147, 146, 150,
- 147, 313, 150, 151, 146, 309, 151, 146, 119, 295,
- 119, 146, 121, 146, 121, 172, 152, 148, 179, 152,
- 119, 186, 192, 187, 121, 123, 123, 197, 147, 123,
- 195, 196, 151, 123, 239, 191, 191, 201, 201, 172,
- 202, 201, 179, 191, 186, 192, 123, 187, 238, 207,
- 231, 197, 207, 219, 123, 152, 123, 195, 196, 250,
-
- 123, 123, 250, 219, 240, 123, 191, 202, 201, 290,
- 287, 239, 123, 291, 231, 123, 219, 123, 123, 138,
- 249, 138, 273, 249, 244, 138, 238, 138, 138, 138,
- 138, 138, 209, 270, 138, 209, 138, 138, 269, 228,
- 228, 266, 240, 209, 209, 209, 209, 209, 209, 222,
- 244, 222, 270, 209, 291, 222, 266, 249, 222, 222,
- 228, 222, 265, 223, 222, 223, 222, 222, 278, 223,
- 279, 252, 223, 223, 252, 223, 288, 225, 223, 225,
- 223, 223, 251, 225, 262, 251, 225, 225, 278, 225,
- 279, 226, 225, 226, 225, 225, 252, 226, 292, 293,
-
- 226, 226, 288, 226, 323, 248, 226, 248, 226, 226,
- 232, 232, 232, 232, 248, 297, 289, 324, 297, 251,
- 248, 296, 248, 298, 296, 292, 298, 289, 325, 349,
- 232, 289, 232, 350, 348, 326, 323, 293, 294, 276,
- 294, 276, 232, 233, 233, 276, 296, 294, 276, 276,
- 351, 276, 324, 294, 276, 294, 276, 276, 329, 233,
- 362, 329, 349, 325, 233, 326, 348, 233, 233, 233,
- 350, 363, 259, 374, 243, 241, 236, 235, 233, 233,
- 233, 233, 233, 233, 234, 234, 362, 437, 221, 220,
- 437, 438, 351, 216, 438, 437, 363, 213, 441, 438,
-
- 234, 441, 212, 211, 442, 234, 441, 442, 234, 234,
- 234, 374, 442, 206, 200, 199, 190, 189, 182, 234,
- 234, 234, 234, 234, 234, 285, 285, 446, 447, 451,
- 446, 447, 451, 178, 175, 446, 447, 451, 171, 452,
- 455, 285, 452, 455, 168, 167, 285, 452, 455, 285,
- 285, 285, 166, 162, 159, 158, 157, 153, 142, 141,
- 285, 285, 285, 285, 285, 285, 286, 127, 126, 456,
- 459, 125, 456, 459, 286, 286, 286, 456, 459, 110,
- 109, 105, 103, 101, 98, 286, 286, 286, 286, 286,
- 286, 320, 87, 86, 460, 479, 81, 460, 479, 320,
-
- 320, 320, 460, 479, 80, 76, 75, 74, 73, 70,
- 320, 320, 320, 320, 320, 320, 321, 69, 68, 480,
- 481, 67, 480, 481, 321, 321, 321, 480, 481, 64,
- 63, 62, 61, 59, 58, 321, 321, 321, 321, 321,
- 321, 346, 57, 56, 482, 484, 43, 482, 484, 346,
- 346, 346, 482, 484, 39, 29, 27, 25, 24, 21,
- 346, 346, 346, 346, 346, 346, 347, 0, 0, 485,
- 487, 0, 485, 487, 347, 347, 347, 485, 487, 0,
- 0, 0, 0, 0, 0, 347, 347, 347, 347, 347,
- 347, 360, 0, 0, 488, 490, 0, 488, 490, 360,
-
- 360, 360, 488, 490, 0, 0, 0, 0, 0, 0,
- 360, 360, 360, 360, 360, 360, 372, 0, 0, 491,
- 493, 0, 491, 493, 372, 372, 372, 491, 493, 0,
- 0, 0, 0, 0, 0, 372, 372, 372, 372, 372,
- 372, 382, 0, 0, 494, 498, 0, 494, 498, 382,
- 382, 382, 494, 498, 0, 0, 0, 0, 0, 0,
- 382, 382, 382, 382, 382, 382, 391, 0, 0, 499,
- 501, 0, 499, 501, 391, 391, 391, 499, 501, 0,
- 0, 0, 0, 0, 0, 391, 391, 391, 391, 391,
- 391, 394, 394, 394, 394, 394, 394, 394, 394, 394,
+ 15, 15, 15, 15, 15, 15, 35, 38, 35, 100,
+ 38, 45, 45, 45, 45, 217, 48, 131, 35, 48,
+ 50, 363, 51, 50, 100, 51, 354, 38, 38, 38,
+ 351, 35, 36, 49, 36, 217, 49, 48, 36, 38,
+ 36, 36, 36, 36, 36, 45, 131, 36, 51, 36,
+ 36, 41, 41, 74, 49, 80, 41, 50, 41, 41,
+ 41, 59, 59, 52, 41, 41, 52, 128, 41, 64,
+ 64, 78, 78, 79, 83, 83, 84, 74, 83, 78,
+ 98, 98, 80, 91, 91, 91, 91, 95, 114, 114,
+ 59, 52, 132, 128, 235, 132, 125, 79, 64, 52,
+
+ 84, 102, 78, 102, 89, 83, 95, 89, 124, 114,
+ 127, 107, 129, 102, 59, 89, 89, 89, 89, 89,
+ 89, 107, 64, 108, 235, 89, 102, 109, 116, 109,
+ 124, 125, 109, 108, 107, 110, 228, 110, 116, 129,
+ 126, 110, 341, 186, 110, 110, 108, 110, 127, 111,
+ 110, 111, 110, 110, 130, 111, 313, 133, 111, 111,
+ 133, 111, 126, 112, 111, 112, 111, 111, 140, 112,
+ 186, 140, 112, 112, 228, 112, 229, 113, 112, 113,
+ 112, 112, 141, 113, 341, 141, 113, 113, 313, 113,
+ 144, 130, 113, 144, 113, 113, 115, 115, 115, 115,
+
+ 117, 117, 117, 117, 142, 143, 142, 145, 143, 268,
+ 145, 146, 142, 229, 146, 142, 115, 177, 115, 142,
+ 117, 142, 117, 147, 150, 150, 147, 144, 115, 268,
+ 187, 158, 117, 119, 119, 148, 143, 119, 148, 166,
+ 177, 119, 172, 230, 178, 327, 179, 188, 183, 183,
+ 234, 324, 147, 150, 119, 158, 183, 187, 197, 260,
+ 221, 197, 119, 166, 119, 209, 172, 178, 119, 119,
+ 179, 188, 269, 119, 148, 209, 234, 150, 260, 183,
+ 119, 230, 281, 119, 221, 119, 119, 134, 209, 134,
+ 192, 192, 269, 134, 192, 134, 134, 134, 134, 134,
+
+ 282, 271, 134, 199, 134, 134, 199, 218, 218, 240,
+ 239, 271, 240, 239, 199, 199, 199, 199, 199, 199,
+ 212, 192, 212, 281, 199, 318, 212, 282, 218, 212,
+ 212, 283, 212, 278, 213, 212, 213, 212, 212, 317,
+ 213, 312, 242, 213, 213, 242, 213, 239, 215, 213,
+ 215, 213, 213, 241, 215, 256, 241, 215, 215, 278,
+ 215, 314, 216, 215, 216, 215, 215, 242, 216, 283,
+ 256, 216, 216, 315, 216, 316, 238, 216, 238, 216,
+ 216, 222, 222, 222, 222, 238, 287, 279, 339, 287,
+ 241, 238, 286, 238, 288, 286, 314, 288, 279, 338,
+
+ 340, 222, 279, 222, 319, 316, 352, 319, 315, 284,
+ 266, 284, 266, 222, 223, 223, 266, 286, 284, 266,
+ 266, 339, 266, 353, 284, 266, 284, 266, 266, 364,
+ 223, 338, 352, 424, 303, 223, 424, 340, 223, 223,
+ 223, 424, 299, 285, 280, 277, 263, 259, 353, 223,
+ 223, 223, 223, 223, 223, 224, 224, 425, 428, 255,
+ 425, 428, 252, 249, 233, 425, 428, 364, 231, 429,
+ 433, 224, 429, 433, 226, 225, 224, 429, 433, 224,
+ 224, 224, 211, 210, 206, 203, 202, 201, 196, 191,
+ 224, 224, 224, 224, 224, 224, 275, 190, 182, 434,
+
+ 438, 181, 434, 438, 275, 275, 275, 434, 438, 171,
+ 165, 162, 161, 157, 154, 275, 275, 275, 275, 275,
+ 275, 276, 153, 149, 439, 442, 138, 439, 442, 276,
+ 276, 276, 439, 442, 137, 123, 122, 121, 106, 105,
+ 276, 276, 276, 276, 276, 276, 310, 101, 99, 443,
+ 446, 97, 443, 446, 310, 310, 310, 443, 446, 94,
+ 82, 81, 77, 76, 73, 310, 310, 310, 310, 310,
+ 310, 311, 72, 71, 447, 466, 70, 447, 466, 311,
+ 311, 311, 447, 466, 68, 67, 66, 65, 63, 62,
+ 311, 311, 311, 311, 311, 311, 336, 61, 60, 467,
+
+ 468, 58, 467, 468, 336, 336, 336, 467, 468, 57,
+ 56, 55, 43, 39, 29, 336, 336, 336, 336, 336,
+ 336, 337, 27, 25, 469, 471, 24, 469, 471, 337,
+ 337, 337, 469, 471, 21, 0, 0, 0, 0, 0,
+ 337, 337, 337, 337, 337, 337, 350, 0, 0, 472,
+ 474, 0, 472, 474, 350, 350, 350, 472, 474, 0,
+ 0, 0, 0, 0, 0, 350, 350, 350, 350, 350,
+ 350, 362, 0, 0, 475, 477, 0, 475, 477, 362,
+ 362, 362, 475, 477, 0, 0, 0, 0, 0, 0,
+ 362, 362, 362, 362, 362, 362, 372, 0, 0, 478,
+
+ 480, 0, 478, 480, 372, 372, 372, 478, 480, 0,
+ 0, 0, 0, 0, 0, 372, 372, 372, 372, 372,
+ 372, 381, 0, 0, 481, 485, 0, 481, 485, 381,
+ 381, 381, 481, 485, 0, 0, 0, 0, 0, 0,
+ 381, 381, 381, 381, 381, 381, 384, 384, 384, 384,
+ 384, 384, 384, 384, 384, 384, 384, 384, 384, 384,
+ 384, 384, 384, 384, 384, 384, 384, 384, 385, 385,
+ 385, 385, 385, 385, 385, 385, 385, 385, 385, 385,
+ 385, 385, 385, 385, 385, 385, 385, 385, 385, 385,
+ 386, 386, 386, 386, 386, 386, 386, 386, 386, 386,
+
+ 386, 386, 386, 386, 386, 386, 386, 386, 386, 386,
+ 386, 386, 387, 387, 387, 387, 387, 387, 387, 387,
+ 387, 387, 387, 387, 387, 387, 387, 387, 387, 387,
+ 387, 387, 387, 387, 388, 388, 388, 388, 388, 388,
+ 388, 388, 388, 388, 388, 388, 388, 388, 388, 388,
+ 388, 388, 388, 388, 388, 388, 389, 389, 389, 389,
+ 389, 389, 389, 389, 389, 389, 389, 389, 389, 389,
+ 389, 389, 389, 389, 389, 389, 389, 389, 390, 390,
+ 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
+ 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
+
+ 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+ 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+ 391, 391, 392, 392, 0, 392, 392, 392, 392, 392,
+ 392, 392, 392, 392, 392, 392, 392, 392, 392, 392,
+ 0, 392, 392, 392, 393, 393, 393, 393, 393, 393,
+ 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
+ 393, 393, 393, 393, 393, 393, 394, 394, 0, 394,
394, 394, 394, 394, 394, 394, 394, 394, 394, 394,
- 394, 394, 394, 394, 395, 395, 395, 395, 395, 395,
+ 394, 394, 394, 394, 0, 394, 394, 394, 395, 395,
395, 395, 395, 395, 395, 395, 395, 395, 395, 395,
- 395, 395, 395, 395, 395, 395, 395, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 396, 396, 396, 396, 396, 396, 396, 396, 396, 396,
- 397, 397, 397, 397, 397, 397, 397, 397, 397, 397,
+
+ 395, 395, 395, 395, 395, 395, 395, 395, 395, 395,
+ 396, 0, 396, 0, 396, 396, 396, 396, 0, 396,
+ 396, 396, 0, 396, 396, 396, 397, 0, 0, 397,
397, 397, 397, 397, 397, 397, 397, 397, 397, 397,
- 397, 397, 397, 398, 398, 398, 398, 398, 398, 398,
- 398, 398, 398, 398, 398, 398, 398, 398, 398, 398,
-
- 398, 398, 398, 398, 398, 398, 399, 399, 399, 399,
- 399, 399, 399, 399, 399, 399, 399, 399, 399, 399,
- 399, 399, 399, 399, 399, 399, 399, 399, 399, 400,
- 400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
- 400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
- 400, 400, 401, 401, 401, 401, 401, 401, 401, 401,
- 401, 401, 401, 401, 401, 401, 401, 401, 401, 401,
- 401, 401, 401, 401, 401, 402, 402, 0, 402, 402,
- 402, 402, 402, 402, 402, 402, 402, 402, 402, 402,
- 402, 402, 402, 0, 402, 402, 402, 402, 403, 403,
-
- 403, 403, 403, 403, 403, 403, 403, 403, 403, 403,
- 403, 403, 403, 403, 403, 403, 403, 403, 403, 403,
- 403, 404, 404, 0, 404, 404, 404, 404, 404, 404,
- 404, 404, 404, 404, 404, 404, 404, 404, 404, 0,
- 404, 404, 404, 404, 405, 405, 405, 405, 405, 405,
- 405, 405, 405, 405, 405, 405, 405, 405, 405, 405,
- 405, 405, 405, 405, 405, 405, 405, 406, 0, 406,
- 0, 406, 406, 406, 406, 0, 406, 406, 406, 0,
- 406, 406, 406, 407, 0, 0, 407, 407, 407, 407,
- 407, 407, 407, 407, 407, 407, 407, 407, 407, 407,
-
- 407, 407, 407, 407, 407, 408, 408, 408, 0, 408,
- 408, 408, 409, 409, 409, 0, 0, 409, 410, 410,
- 410, 410, 0, 410, 410, 410, 0, 410, 410, 410,
- 411, 411, 411, 411, 0, 411, 411, 411, 0, 411,
- 411, 411, 412, 0, 0, 412, 412, 412, 0, 412,
+ 397, 397, 397, 397, 397, 397, 397, 398, 398, 398,
+ 0, 398, 398, 398, 399, 399, 399, 0, 0, 399,
+ 400, 400, 400, 400, 0, 400, 400, 400, 0, 400,
+ 400, 400, 401, 401, 401, 401, 0, 401, 401, 401,
+ 0, 401, 401, 401, 402, 402, 0, 0, 402, 402,
+ 402, 0, 402, 402, 402, 402, 402, 402, 402, 402,
+
+ 402, 402, 402, 402, 402, 402, 403, 403, 0, 403,
+ 486, 403, 488, 486, 0, 488, 0, 0, 486, 0,
+ 488, 403, 403, 0, 403, 404, 404, 0, 0, 404,
+ 0, 404, 404, 404, 404, 404, 404, 404, 404, 404,
+ 404, 404, 404, 404, 404, 404, 404, 405, 405, 0,
+ 405, 489, 405, 490, 489, 0, 490, 0, 0, 489,
+ 0, 490, 405, 405, 0, 405, 406, 406, 0, 0,
+ 406, 406, 406, 0, 406, 406, 406, 406, 406, 406,
+ 406, 406, 406, 406, 406, 406, 406, 406, 407, 491,
+ 407, 493, 491, 0, 493, 0, 0, 491, 0, 493,
+
+ 407, 407, 0, 407, 408, 408, 0, 0, 408, 0,
+ 408, 408, 408, 408, 408, 408, 408, 408, 408, 408,
+ 408, 408, 408, 408, 408, 408, 409, 494, 409, 496,
+ 494, 0, 496, 0, 0, 494, 0, 496, 409, 409,
+ 0, 409, 410, 410, 0, 0, 410, 410, 410, 410,
+ 410, 410, 410, 410, 410, 410, 410, 410, 410, 410,
+ 410, 410, 410, 410, 411, 497, 411, 498, 497, 0,
+ 498, 0, 0, 497, 0, 498, 411, 411, 0, 411,
+ 412, 412, 0, 0, 412, 412, 412, 412, 412, 412,
412, 412, 412, 412, 412, 412, 412, 412, 412, 412,
- 412, 412, 412, 413, 413, 0, 413, 502, 413, 503,
- 502, 0, 503, 0, 0, 502, 0, 503, 413, 413,
- 0, 413, 414, 0, 0, 414, 0, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
-
- 414, 414, 414, 415, 415, 0, 415, 504, 415, 506,
- 504, 0, 506, 0, 0, 504, 0, 506, 415, 415,
- 507, 415, 416, 507, 0, 416, 416, 416, 507, 416,
- 416, 416, 416, 416, 416, 416, 416, 416, 416, 416,
- 416, 416, 416, 417, 509, 417, 510, 509, 0, 510,
- 0, 0, 509, 0, 510, 417, 417, 0, 417, 418,
- 0, 0, 418, 0, 418, 418, 418, 418, 418, 418,
- 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
- 419, 511, 419, 512, 511, 0, 512, 0, 0, 511,
- 0, 512, 419, 419, 0, 419, 420, 0, 0, 420,
+
+ 412, 412, 413, 499, 413, 500, 499, 0, 500, 0,
+ 0, 499, 0, 500, 413, 413, 0, 413, 414, 501,
+ 414, 0, 501, 414, 414, 414, 0, 501, 414, 415,
+ 502, 415, 0, 502, 415, 415, 415, 0, 502, 415,
+ 416, 0, 416, 0, 0, 416, 416, 416, 0, 416,
+ 416, 417, 0, 417, 0, 417, 417, 417, 417, 0,
+ 417, 417, 417, 0, 417, 417, 417, 418, 0, 418,
+ 0, 418, 418, 418, 418, 0, 418, 418, 418, 0,
+ 418, 418, 418, 419, 0, 419, 0, 419, 419, 419,
+ 419, 0, 419, 419, 419, 0, 419, 419, 419, 420,
420, 420, 420, 420, 420, 420, 420, 420, 420, 420,
- 420, 420, 420, 420, 420, 420, 420, 421, 513, 421,
- 514, 513, 0, 514, 0, 0, 513, 0, 514, 421,
- 421, 0, 421, 422, 0, 0, 422, 422, 422, 422,
- 422, 422, 422, 422, 422, 422, 422, 422, 422, 422,
- 422, 422, 422, 422, 423, 515, 423, 516, 515, 0,
- 516, 0, 0, 515, 0, 516, 423, 423, 0, 423,
- 424, 517, 424, 0, 517, 424, 424, 424, 0, 517,
- 424, 425, 518, 425, 0, 518, 425, 425, 425, 0,
- 518, 425, 426, 0, 426, 0, 0, 426, 426, 426,
-
- 0, 426, 426, 427, 0, 427, 0, 427, 427, 427,
- 427, 0, 427, 427, 427, 0, 427, 427, 427, 428,
- 0, 428, 0, 428, 428, 428, 428, 0, 428, 428,
- 428, 0, 428, 428, 428, 429, 0, 429, 0, 429,
- 429, 429, 429, 0, 429, 429, 429, 0, 429, 429,
- 429, 430, 430, 430, 430, 430, 430, 430, 430, 430,
- 430, 430, 430, 430, 0, 430, 430, 430, 430, 430,
- 430, 430, 430, 431, 431, 431, 431, 431, 431, 431,
- 431, 431, 431, 431, 431, 431, 431, 431, 431, 431,
- 431, 431, 432, 432, 432, 0, 0, 432, 432, 432,
-
- 0, 432, 432, 432, 433, 0, 433, 0, 433, 433,
- 433, 433, 0, 433, 433, 433, 0, 433, 433, 433,
- 434, 0, 0, 0, 434, 0, 434, 0, 0, 434,
- 434, 434, 0, 434, 434, 434, 435, 0, 0, 435,
- 435, 435, 0, 435, 435, 435, 435, 435, 435, 435,
- 435, 435, 435, 435, 435, 435, 435, 436, 519, 436,
- 520, 519, 0, 520, 0, 0, 519, 0, 520, 436,
- 436, 0, 436, 439, 0, 0, 439, 0, 439, 439,
- 439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
- 439, 439, 439, 439, 440, 521, 440, 522, 521, 0,
-
- 522, 0, 0, 521, 0, 522, 440, 440, 523, 440,
- 443, 523, 0, 443, 443, 443, 523, 443, 443, 443,
- 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
- 443, 444, 524, 444, 525, 524, 0, 525, 0, 0,
- 524, 0, 525, 444, 444, 0, 444, 445, 445, 445,
- 0, 0, 445, 448, 0, 0, 448, 0, 448, 448,
- 448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
- 448, 448, 448, 448, 449, 526, 449, 527, 526, 0,
- 527, 0, 0, 526, 0, 527, 449, 449, 0, 449,
- 450, 450, 450, 0, 0, 450, 453, 0, 0, 453,
-
- 453, 453, 453, 453, 453, 453, 453, 453, 453, 453,
- 453, 453, 453, 453, 453, 453, 453, 454, 528, 454,
- 529, 528, 0, 529, 0, 0, 528, 0, 529, 454,
- 454, 0, 454, 457, 0, 0, 457, 457, 457, 457,
- 457, 457, 457, 457, 457, 457, 457, 457, 457, 457,
- 457, 457, 457, 457, 458, 530, 458, 531, 530, 0,
- 531, 0, 0, 530, 0, 531, 458, 458, 0, 458,
- 461, 532, 461, 0, 532, 461, 461, 461, 0, 532,
- 461, 462, 533, 462, 0, 533, 462, 462, 462, 0,
- 533, 462, 463, 534, 463, 0, 534, 463, 463, 463,
-
- 0, 534, 463, 464, 0, 0, 464, 464, 464, 0,
- 0, 464, 465, 0, 465, 0, 0, 465, 465, 465,
- 0, 465, 465, 466, 0, 466, 0, 466, 466, 466,
- 466, 0, 466, 466, 466, 0, 466, 466, 466, 467,
- 0, 467, 0, 467, 467, 467, 467, 0, 467, 467,
- 467, 0, 467, 467, 467, 468, 0, 468, 0, 468,
- 468, 468, 468, 0, 468, 468, 468, 0, 468, 468,
- 468, 469, 0, 469, 469, 0, 469, 0, 469, 0,
- 469, 0, 469, 469, 0, 469, 469, 469, 0, 469,
- 469, 469, 469, 470, 535, 470, 536, 535, 0, 536,
-
- 0, 0, 535, 0, 536, 470, 470, 0, 470, 471,
- 471, 471, 471, 471, 471, 471, 471, 471, 471, 471,
- 471, 471, 471, 471, 471, 471, 471, 471, 471, 471,
- 471, 472, 472, 472, 472, 472, 472, 472, 472, 472,
- 472, 472, 472, 472, 0, 472, 472, 472, 472, 472,
- 472, 472, 472, 473, 473, 473, 0, 0, 473, 473,
- 473, 0, 473, 473, 473, 474, 0, 0, 474, 474,
- 474, 0, 0, 474, 475, 537, 0, 0, 537, 475,
- 475, 475, 0, 537, 475, 476, 0, 0, 0, 476,
- 0, 476, 0, 0, 476, 476, 476, 0, 476, 476,
-
- 476, 477, 0, 0, 0, 477, 477, 477, 0, 0,
- 477, 477, 477, 0, 477, 477, 477, 478, 478, 478,
- 478, 0, 478, 478, 478, 0, 478, 478, 478, 483,
- 538, 0, 0, 538, 483, 483, 483, 0, 538, 483,
- 486, 539, 0, 0, 539, 486, 486, 486, 0, 539,
- 486, 489, 0, 0, 489, 489, 489, 0, 489, 489,
- 489, 489, 489, 489, 489, 489, 489, 489, 489, 489,
- 489, 489, 492, 0, 0, 492, 0, 492, 492, 492,
- 492, 492, 492, 492, 492, 492, 492, 492, 492, 492,
- 492, 492, 492, 495, 540, 495, 0, 540, 495, 495,
-
- 495, 0, 540, 495, 496, 0, 0, 496, 496, 496,
- 0, 0, 496, 497, 497, 497, 497, 497, 497, 497,
- 497, 497, 497, 497, 497, 497, 497, 497, 497, 497,
- 497, 497, 500, 500, 500, 0, 0, 500, 500, 500,
- 0, 500, 500, 500, 505, 0, 0, 505, 505, 505,
- 0, 541, 505, 508, 541, 0, 508, 508, 508, 541,
- 542, 508, 543, 542, 544, 543, 545, 544, 542, 545,
- 543, 0, 544, 546, 545, 547, 546, 548, 547, 549,
- 548, 546, 549, 547, 0, 548, 550, 549, 551, 550,
- 552, 551, 553, 552, 550, 553, 551, 0, 552, 554,
-
- 553, 555, 554, 556, 555, 557, 556, 554, 557, 555,
- 0, 556, 558, 557, 559, 558, 0, 559, 0, 0,
- 558, 0, 559, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393, 393, 393, 393,
- 393, 393, 393, 393, 393, 393, 393
+ 420, 420, 0, 420, 420, 420, 420, 420, 420, 420,
+ 421, 421, 421, 421, 421, 421, 421, 421, 421, 421,
+ 421, 421, 421, 421, 421, 421, 421, 421, 422, 422,
+ 422, 0, 0, 422, 422, 422, 0, 422, 422, 422,
+ 423, 0, 0, 0, 423, 0, 423, 0, 0, 423,
+ 423, 423, 0, 423, 423, 423, 426, 426, 0, 0,
+ 426, 0, 426, 426, 426, 426, 426, 426, 426, 426,
+ 426, 426, 426, 426, 426, 426, 426, 426, 427, 503,
+ 427, 504, 503, 0, 504, 0, 0, 503, 0, 504,
+
+ 427, 427, 0, 427, 430, 430, 0, 0, 430, 430,
+ 430, 0, 430, 430, 430, 430, 430, 430, 430, 430,
+ 430, 430, 430, 430, 430, 430, 431, 505, 431, 506,
+ 505, 0, 506, 0, 0, 505, 0, 506, 431, 431,
+ 0, 431, 432, 432, 432, 0, 0, 432, 435, 435,
+ 0, 0, 435, 0, 435, 435, 435, 435, 435, 435,
+ 435, 435, 435, 435, 435, 435, 435, 435, 435, 435,
+ 436, 507, 436, 508, 507, 0, 508, 0, 0, 507,
+ 0, 508, 436, 436, 0, 436, 437, 437, 437, 0,
+ 0, 437, 440, 440, 0, 0, 440, 440, 440, 440,
+
+ 440, 440, 440, 440, 440, 440, 440, 440, 440, 440,
+ 440, 440, 440, 440, 441, 509, 441, 510, 509, 0,
+ 510, 0, 0, 509, 0, 510, 441, 441, 0, 441,
+ 444, 444, 0, 0, 444, 444, 444, 444, 444, 444,
+ 444, 444, 444, 444, 444, 444, 444, 444, 444, 444,
+ 444, 444, 445, 511, 445, 512, 511, 0, 512, 0,
+ 0, 511, 0, 512, 445, 445, 0, 445, 448, 513,
+ 448, 0, 513, 448, 448, 448, 0, 513, 448, 449,
+ 514, 449, 0, 514, 449, 449, 449, 0, 514, 449,
+ 450, 515, 450, 0, 515, 450, 450, 450, 0, 515,
+
+ 450, 451, 0, 0, 451, 451, 451, 0, 0, 451,
+ 452, 0, 452, 0, 0, 452, 452, 452, 0, 452,
+ 452, 453, 0, 453, 0, 453, 453, 453, 453, 0,
+ 453, 453, 453, 0, 453, 453, 453, 454, 0, 454,
+ 0, 454, 454, 454, 454, 0, 454, 454, 454, 0,
+ 454, 454, 454, 455, 0, 455, 0, 455, 455, 455,
+ 455, 0, 455, 455, 455, 0, 455, 455, 455, 456,
+ 0, 456, 456, 0, 456, 0, 456, 0, 456, 0,
+ 456, 456, 0, 456, 456, 456, 0, 456, 456, 456,
+ 457, 516, 457, 517, 516, 0, 517, 0, 0, 516,
+
+ 0, 517, 457, 457, 0, 457, 458, 458, 458, 458,
+ 458, 458, 458, 458, 458, 458, 458, 458, 458, 458,
+ 458, 458, 458, 458, 458, 458, 458, 459, 459, 459,
+ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459,
+ 0, 459, 459, 459, 459, 459, 459, 459, 460, 460,
+ 460, 0, 0, 460, 460, 460, 0, 460, 460, 460,
+ 461, 0, 0, 461, 461, 461, 0, 0, 461, 462,
+ 518, 0, 0, 518, 462, 462, 462, 0, 518, 462,
+ 463, 0, 0, 0, 463, 0, 463, 0, 0, 463,
+ 463, 463, 0, 463, 463, 463, 464, 0, 0, 0,
+
+ 464, 464, 464, 0, 0, 464, 464, 464, 0, 464,
+ 464, 464, 465, 465, 465, 465, 0, 465, 465, 465,
+ 0, 465, 465, 465, 470, 519, 0, 0, 519, 470,
+ 470, 470, 0, 519, 470, 473, 520, 0, 0, 520,
+ 473, 473, 473, 0, 520, 473, 476, 476, 0, 0,
+ 476, 476, 476, 0, 476, 476, 476, 476, 476, 476,
+ 476, 476, 476, 476, 476, 476, 476, 476, 479, 479,
+ 0, 0, 479, 0, 479, 479, 479, 479, 479, 479,
+ 479, 479, 479, 479, 479, 479, 479, 479, 479, 479,
+ 482, 521, 482, 0, 521, 482, 482, 482, 0, 521,
+
+ 482, 483, 0, 0, 483, 483, 483, 0, 0, 483,
+ 484, 484, 484, 484, 484, 484, 484, 484, 484, 484,
+ 484, 484, 484, 484, 484, 484, 484, 484, 487, 487,
+ 487, 0, 0, 487, 487, 487, 0, 487, 487, 487,
+ 492, 0, 0, 492, 492, 492, 0, 522, 492, 495,
+ 522, 0, 495, 495, 495, 522, 523, 495, 524, 523,
+ 525, 524, 526, 525, 523, 526, 524, 0, 525, 527,
+ 526, 528, 527, 529, 528, 530, 529, 527, 530, 528,
+ 0, 529, 531, 530, 532, 531, 533, 532, 534, 533,
+ 531, 534, 532, 0, 533, 535, 534, 536, 535, 537,
+
+ 536, 538, 537, 535, 538, 536, 0, 537, 539, 538,
+ 540, 539, 541, 540, 542, 541, 539, 542, 540, 0,
+ 541, 543, 542, 544, 543, 545, 544, 0, 545, 543,
+ 0, 544, 0, 545, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383, 383, 383, 383,
+ 383, 383, 383, 383, 383, 383, 383
+
} ;
/* The intent behind this definition is that it'll catch
@@ -1143,12 +1121,12 @@ static yyconst flex_int16_t yy_chk[2488] =
#define YY_RESTORE_YY_MORE_OFFSET
#line 1 "./turtle_l.l"
/*
- * $Id: turtle_l.l,v 1.21.2.20 2012/03/08 12:55:37 source Exp $
+ * $Id: turtle_l.l,v 1.21.2.17 2011/05/16 09:04:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -1173,7 +1151,6 @@ static yyconst flex_int16_t yy_chk[2488] =
#include "turtle_p.h"
#include "nquad_p.h"
#include "security.h"
-#include "sqlbif.h"
#if (__NQUAD_NONPUNCT_END != __TTL_NONPUNCT_END)
Sources of parsers are out of sync: mismatch between token declarations in nquad_p.y and turtle_p.y
#endif
@@ -1279,7 +1256,7 @@ extern int ttlyydebug;
/* Special unreacheable state to fill the first item of ttlp_arg[0].ttlp_lexstates */
-#line 1283 "turtle_l.c"
+#line 1260 "turtle_l.c"
#define INITIAL 0
#define TURTLE_SQ 1
@@ -1379,10 +1356,6 @@ int ttlyyget_lineno (yyscan_t yyscanner );
void ttlyyset_lineno (int line_number ,yyscan_t yyscanner );
-int ttlyyget_column (yyscan_t yyscanner );
-
-void ttlyyset_column (int column_no ,yyscan_t yyscanner );
-
YYSTYPE * ttlyyget_lval (yyscan_t yyscanner );
void ttlyyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@ -1435,7 +1408,7 @@ static int input (yyscan_t yyscanner );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -1446,7 +1419,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1531,10 +1504,10 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 180 "./turtle_l.l"
+#line 179 "./turtle_l.l"
-#line 1538 "turtle_l.c"
+#line 1511 "turtle_l.c"
yylval = yylval_param;
@@ -1595,13 +1568,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 394 )
+ if ( yy_current_state >= 384 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_current_state != 393 );
+ while ( yy_current_state != 383 );
yy_cp = yyg->yy_last_accepting_cpos;
yy_current_state = yyg->yy_last_accepting_state;
@@ -1623,195 +1596,195 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 182 "./turtle_l.l"
+#line 181 "./turtle_l.l"
{ return _CARET_WS ; }
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 183 "./turtle_l.l"
+#line 182 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; return _CARET_WS ; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 184 "./turtle_l.l"
+#line 183 "./turtle_l.l"
{ return _CARET_NOWS ; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 185 "./turtle_l.l"
+#line 184 "./turtle_l.l"
{ return _CARET_CARET ; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 186 "./turtle_l.l"
+#line 185 "./turtle_l.l"
{ return _COMMA; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 187 "./turtle_l.l"
+#line 186 "./turtle_l.l"
{ return _DOT_WS; }
YY_BREAK
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 188 "./turtle_l.l"
+#line 187 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; return _DOT_WS; }
YY_BREAK
case 8:
/* rule 8 can match eol */
YY_RULE_SETUP
-#line 189 "./turtle_l.l"
+#line 188 "./turtle_l.l"
{ TTLYYERROR_OR_RECOVER ("Whitespace is required after dot if dot is not inside decimal number, string or IRI"); }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 190 "./turtle_l.l"
+#line 189 "./turtle_l.l"
{ return _DOT_WS; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 191 "./turtle_l.l"
+#line 190 "./turtle_l.l"
{ return _COLON; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 192 "./turtle_l.l"
+#line 191 "./turtle_l.l"
{ return _SEMI; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 193 "./turtle_l.l"
+#line 192 "./turtle_l.l"
{ return (((0 == ttlp_arg[0].ttlp_lexdepth) && (ttlp_arg[0].ttlp_flags & TTLP_ALLOW_TRIG)) ? _EQ_TOP_TRIG : _EQ); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 194 "./turtle_l.l"
+#line 193 "./turtle_l.l"
{ return _EQ_GT; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 195 "./turtle_l.l"
+#line 194 "./turtle_l.l"
{ return _LT_EQ; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 196 "./turtle_l.l"
+#line 195 "./turtle_l.l"
{ return _BANG; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 198 "./turtle_l.l"
+#line 197 "./turtle_l.l"
{ return _AT_a_L; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 199 "./turtle_l.l"
+#line 198 "./turtle_l.l"
{ return _AT_base_L; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 200 "./turtle_l.l"
+#line 199 "./turtle_l.l"
{ return _AT_has_L; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 201 "./turtle_l.l"
+#line 200 "./turtle_l.l"
{ return _AT_is_L; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 202 "./turtle_l.l"
+#line 201 "./turtle_l.l"
{ return _AT_of_L; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 203 "./turtle_l.l"
+#line 202 "./turtle_l.l"
{ return _AT_this_L; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 204 "./turtle_l.l"
+#line 203 "./turtle_l.l"
{ return _AT_keywords_L; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 205 "./turtle_l.l"
+#line 204 "./turtle_l.l"
{ return _AT_prefix_L; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 206 "./turtle_l.l"
+#line 205 "./turtle_l.l"
{ ttlyyerror ("Current version of Virtuoso does not support @forAll keyword"); }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 207 "./turtle_l.l"
+#line 206 "./turtle_l.l"
{ ttlyyerror ("Current version of Virtuoso does not support @forSome keyword"); }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 208 "./turtle_l.l"
+#line 207 "./turtle_l.l"
{ return false_L; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 209 "./turtle_l.l"
+#line 208 "./turtle_l.l"
{ return true_L; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 211 "./turtle_l.l"
+#line 210 "./turtle_l.l"
{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_A, _AT_a_L) }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 212 "./turtle_l.l"
+#line 211 "./turtle_l.l"
{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_HAS, _AT_has_L) }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 213 "./turtle_l.l"
+#line 212 "./turtle_l.l"
{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_IS, _AT_is_L) }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 214 "./turtle_l.l"
+#line 213 "./turtle_l.l"
{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_OF, _AT_of_L) }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 215 "./turtle_l.l"
+#line 214 "./turtle_l.l"
{ TTL_SPECIAL_QNAME (TTLP_ALLOW_QNAME_THIS, _AT_this_L) }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 218 "./turtle_l.l"
+#line 217 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth++; return _LPAR; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 219 "./turtle_l.l"
+#line 218 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth--; return _RPAR; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 220 "./turtle_l.l"
+#line 219 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth++; return _LSQBRA; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 221 "./turtle_l.l"
+#line 220 "./turtle_l.l"
{ return _LSQBRA_RSQBRA; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 222 "./turtle_l.l"
+#line 221 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth--; return _RSQBRA; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 223 "./turtle_l.l"
+#line 222 "./turtle_l.l"
{
int depth = ttlp_arg[0].ttlp_lexdepth++;
return (((0 == depth) && (ttlp_arg[0].ttlp_flags & TTLP_ALLOW_TRIG)) ? _LBRA_TOP_TRIG : _LBRA);
@@ -1819,12 +1792,12 @@ YY_RULE_SETUP
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 227 "./turtle_l.l"
+#line 226 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexdepth--; return _RBRA; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 229 "./turtle_l.l"
+#line 228 "./turtle_l.l"
{
ttlyylval.box = box_dv_short_nchars (yytext + 1, yyleng - 2);
return Q_IRI_REF;
@@ -1832,7 +1805,7 @@ YY_RULE_SETUP
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 234 "./turtle_l.l"
+#line 233 "./turtle_l.l"
{
ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_LTGT, '>');
return Q_IRI_REF;
@@ -1840,7 +1813,7 @@ YY_RULE_SETUP
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 239 "./turtle_l.l"
+#line 238 "./turtle_l.l"
{
if (!(ttlp_arg[0].ttlp_flags & TTLP_ACCEPT_DIRTY_NAMES))
TTLYYERROR_OR_RECOVER ("Invalid characters in angle-bracketed name; this error can be suppressed by parser flags");
@@ -1852,7 +1825,7 @@ YY_RULE_SETUP
case 43:
/* rule 43 can match eol */
YY_RULE_SETUP
-#line 247 "./turtle_l.l"
+#line 246 "./turtle_l.l"
{
if (!(ttlp_arg[0].ttlp_flags & TTLP_ACCEPT_DIRTY_NAMES))
TTLYYERROR_OR_RECOVER ("Line break in angle-bracketed name; this error can be suppressed by parser flags");
@@ -1864,19 +1837,19 @@ YY_RULE_SETUP
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 256 "./turtle_l.l"
+#line 255 "./turtle_l.l"
{
TTLYYERROR_OR_REPORT ("Invalid characters in angle-bracketed name");
BEGIN (TURTLE_SKIP_TO_DOT_WS); yymore (); }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 260 "./turtle_l.l"
+#line 259 "./turtle_l.l"
{ TTL_TOKBOX_Q(0,QNAME,"qualified URI"); }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 261 "./turtle_l.l"
+#line 260 "./turtle_l.l"
{
if (!(ttlp_arg[0].ttlp_flags & TTLP_NAME_MAY_CONTAIN_PATH))
TTLYYERROR_OR_RECOVER ("Invalid characters in local part of QName; this error can be suppressed by parser flags");
@@ -1885,22 +1858,22 @@ YY_RULE_SETUP
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 267 "./turtle_l.l"
+#line 266 "./turtle_l.l"
{ TTL_TOKBOX_Q(0,QNAME_NS,"namespace"); }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 268 "./turtle_l.l"
+#line 267 "./turtle_l.l"
{ TTL_TOKBOX_Q(0,QNAME,"name without prefix"); }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 269 "./turtle_l.l"
+#line 268 "./turtle_l.l"
{ TTL_TOKBOX_BNODE(0,BLANK_NODE_LABEL,"blank node label"); }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 271 "./turtle_l.l"
+#line 270 "./turtle_l.l"
{
if (!(ttlp_arg[0].ttlp_flags & TTLP_ACCEPT_DIRTY_NAMES))
TTLYYERROR_OR_RECOVER ("Ill formed blank node label; this error can be suppressed by parser flags");
@@ -1909,7 +1882,7 @@ YY_RULE_SETUP
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 277 "./turtle_l.l"
+#line 276 "./turtle_l.l"
{
if (!(ttlp_arg[0].ttlp_flags & TTLP_ACCEPT_VARIABLES))
TTLYYERROR_OR_RECOVER ("Full N3 syntax allow variables, TURTLE does not; this error can be suppressed by parser flags");
@@ -1918,7 +1891,7 @@ YY_RULE_SETUP
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 283 "./turtle_l.l"
+#line 282 "./turtle_l.l"
{
ttlyylval.box = box_dv_short_nchars (yytext + 1, yyleng - 1);
return KEYWORD;
@@ -1926,7 +1899,7 @@ YY_RULE_SETUP
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 288 "./turtle_l.l"
+#line 287 "./turtle_l.l"
{
BEGIN INITIAL;
ttlyylval.box = box_dv_short_nchars (yytext, yyleng);
@@ -1935,7 +1908,7 @@ YY_RULE_SETUP
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 294 "./turtle_l.l"
+#line 293 "./turtle_l.l"
{
char *tail;
BEGIN INITIAL;
@@ -1951,21 +1924,21 @@ YY_RULE_SETUP
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 307 "./turtle_l.l"
+#line 306 "./turtle_l.l"
{ TTLYYERROR_OR_RECOVER ("The identifier after '@' at the end of quoted literal is not a valid language id"); }
YY_BREAK
case YY_STATE_EOF(TURTLE_AT_AFTER_QUOTED):
-#line 308 "./turtle_l.l"
+#line 307 "./turtle_l.l"
{ TTLYYERROR_OR_RECOVER ("Missing language id after '@' at the end of quoted literal"); }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 309 "./turtle_l.l"
+#line 308 "./turtle_l.l"
{ TTLYYERROR_OR_RECOVER ("Bad character instead of language id after '@' at the end of quoted literal"); }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 312 "./turtle_l.l"
+#line 311 "./turtle_l.l"
{
ttlyylval.box = box_dv_short_nchars (yytext+1, yyleng - 2);
return TURTLE_STRING;
@@ -1973,7 +1946,7 @@ YY_RULE_SETUP
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 317 "./turtle_l.l"
+#line 316 "./turtle_l.l"
{
ttlyylval.box = box_dv_short_nchars (yytext+1, yyleng - 3);
BEGIN TURTLE_AT_AFTER_QUOTED;
@@ -1982,118 +1955,118 @@ YY_RULE_SETUP
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 323 "./turtle_l.l"
+#line 322 "./turtle_l.l"
{ yymore(); BEGIN TURTLE_SSSQ; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 324 "./turtle_l.l"
+#line 323 "./turtle_l.l"
{ yymore(); BEGIN TURTLE_DDDQ; }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 325 "./turtle_l.l"
+#line 324 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_3QUOT, '\''); BEGIN INITIAL; return TURTLE_STRING; }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 326 "./turtle_l.l"
+#line 325 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_3QUOT, '\"'); BEGIN INITIAL; return TURTLE_STRING; }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 327 "./turtle_l.l"
+#line 326 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_3QUOT_AT, '\''); BEGIN TURTLE_AT_AFTER_QUOTED; return TURTLE_STRING; }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 328 "./turtle_l.l"
+#line 327 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_3QUOT_AT, '\"'); BEGIN TURTLE_AT_AFTER_QUOTED; return TURTLE_STRING; }
YY_BREAK
case 65:
/* rule 65 can match eol */
YY_RULE_SETUP
-#line 329 "./turtle_l.l"
+#line 328 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
case 66:
/* rule 66 can match eol */
YY_RULE_SETUP
-#line 330 "./turtle_l.l"
+#line 329 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 331 "./turtle_l.l"
+#line 330 "./turtle_l.l"
{ yymore(); }
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 332 "./turtle_l.l"
+#line 331 "./turtle_l.l"
{ yymore(); }
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 333 "./turtle_l.l"
+#line 332 "./turtle_l.l"
{ ttlyyerror ("Bad escape sequence in a long single-quoted string"); }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 334 "./turtle_l.l"
+#line 333 "./turtle_l.l"
{ ttlyyerror ("Bad escape sequence in a long double-quoted string"); }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 335 "./turtle_l.l"
+#line 334 "./turtle_l.l"
{ ttlyyerror ("Bad character in a long single-quoted string"); }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 336 "./turtle_l.l"
+#line 335 "./turtle_l.l"
{ ttlyyerror ("Bad character in a long double-quoted string"); }
YY_BREAK
case YY_STATE_EOF(TURTLE_SSSQ):
-#line 337 "./turtle_l.l"
+#line 336 "./turtle_l.l"
{ ttlyyerror ("Unterminated long single-quoted string"); }
YY_BREAK
case YY_STATE_EOF(TURTLE_DDDQ):
-#line 338 "./turtle_l.l"
+#line 337 "./turtle_l.l"
{ ttlyyerror ("Unterminated long double-quoted string"); }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 341 "./turtle_l.l"
+#line 340 "./turtle_l.l"
{ yymore(); BEGIN TURTLE_SQ; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 342 "./turtle_l.l"
+#line 341 "./turtle_l.l"
{ yymore(); BEGIN TURTLE_DQ; }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 343 "./turtle_l.l"
+#line 342 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_QUOT, '\''); BEGIN INITIAL; return TURTLE_STRING; }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 344 "./turtle_l.l"
+#line 343 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_QUOT, '\"'); BEGIN INITIAL; return TURTLE_STRING; }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 345 "./turtle_l.l"
+#line 344 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_QUOT_AT, '\''); BEGIN TURTLE_AT_AFTER_QUOTED; return TURTLE_STRING; }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 346 "./turtle_l.l"
+#line 345 "./turtle_l.l"
{ ttlyylval.box = ttlp_strliteral (ttlp_arg, yytext, TTLP_STRLITERAL_QUOT_AT, '\"'); BEGIN TURTLE_AT_AFTER_QUOTED; return TURTLE_STRING; }
YY_BREAK
case 79:
/* rule 79 can match eol */
YY_RULE_SETUP
-#line 347 "./turtle_l.l"
+#line 346 "./turtle_l.l"
{
if (!(TTLP_STRING_MAY_CONTAIN_CRLF & ttlp_arg[0].ttlp_flags))
{
@@ -2107,7 +2080,7 @@ YY_RULE_SETUP
case 80:
/* rule 80 can match eol */
YY_RULE_SETUP
-#line 356 "./turtle_l.l"
+#line 355 "./turtle_l.l"
{
if (!(TTLP_STRING_MAY_CONTAIN_CRLF & ttlp_arg[0].ttlp_flags))
{
@@ -2121,7 +2094,7 @@ YY_RULE_SETUP
case 81:
/* rule 81 can match eol */
YY_RULE_SETUP
-#line 365 "./turtle_l.l"
+#line 364 "./turtle_l.l"
{
if (!(TTLP_STRING_MAY_CONTAIN_CRLF & ttlp_arg[0].ttlp_flags))
{
@@ -2133,7 +2106,7 @@ YY_RULE_SETUP
case 82:
/* rule 82 can match eol */
YY_RULE_SETUP
-#line 372 "./turtle_l.l"
+#line 371 "./turtle_l.l"
{
if (!(TTLP_STRING_MAY_CONTAIN_CRLF & ttlp_arg[0].ttlp_flags))
{
@@ -2144,116 +2117,116 @@ YY_RULE_SETUP
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 379 "./turtle_l.l"
+#line 378 "./turtle_l.l"
{ yymore(); }
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 380 "./turtle_l.l"
+#line 379 "./turtle_l.l"
{ yymore(); }
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 381 "./turtle_l.l"
+#line 380 "./turtle_l.l"
{
TTLYYERROR_OR_REPORT ("Bad escape sequence in a short single-quoted string");
BEGIN (TURTLE_BAD_SQ); yymore(); }
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 384 "./turtle_l.l"
+#line 383 "./turtle_l.l"
{
TTLYYERROR_OR_REPORT ("Bad escape sequence in a short double-quoted string");
BEGIN (TURTLE_BAD_DQ); yymore(); }
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 387 "./turtle_l.l"
+#line 386 "./turtle_l.l"
{}
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 388 "./turtle_l.l"
+#line 387 "./turtle_l.l"
{}
YY_BREAK
case 89:
/* rule 89 can match eol */
YY_RULE_SETUP
-#line 389 "./turtle_l.l"
+#line 388 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
case 90:
/* rule 90 can match eol */
YY_RULE_SETUP
-#line 390 "./turtle_l.l"
+#line 389 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; yymore(); }
YY_BREAK
case 91:
/* rule 91 can match eol */
YY_RULE_SETUP
-#line 391 "./turtle_l.l"
+#line 390 "./turtle_l.l"
{}
YY_BREAK
case 92:
/* rule 92 can match eol */
YY_RULE_SETUP
-#line 392 "./turtle_l.l"
+#line 391 "./turtle_l.l"
{}
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 393 "./turtle_l.l"
+#line 392 "./turtle_l.l"
{ BEGIN INITIAL; return TTL_RECOVERABLE_ERROR; }
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 394 "./turtle_l.l"
+#line 393 "./turtle_l.l"
{ BEGIN INITIAL; return TTL_RECOVERABLE_ERROR; }
YY_BREAK
case YY_STATE_EOF(TURTLE_SQ):
case YY_STATE_EOF(TURTLE_BAD_SQ):
-#line 396 "./turtle_l.l"
+#line 395 "./turtle_l.l"
{ ttlyyerror ("Unterminated short single-quoted string"); }
YY_BREAK
case YY_STATE_EOF(TURTLE_DQ):
case YY_STATE_EOF(TURTLE_BAD_DQ):
-#line 397 "./turtle_l.l"
+#line 396 "./turtle_l.l"
{ ttlyyerror ("Unterminated short double-quoted string"); }
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 399 "./turtle_l.l"
+#line 398 "./turtle_l.l"
{ return ttlp_NUMBER_int (yylval, ttlp_arg, yyg); }
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 400 "./turtle_l.l"
+#line 399 "./turtle_l.l"
{ return ttlp_NUMBER_decimal (yylval, ttlp_arg, yyg); }
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 401 "./turtle_l.l"
+#line 400 "./turtle_l.l"
{ return ttlp_NUMBER_double (yylval, ttlp_arg, yyg); }
YY_BREAK
case 98:
/* rule 98 can match eol */
YY_RULE_SETUP
-#line 403 "./turtle_l.l"
+#line 402 "./turtle_l.l"
{ ttlp_arg[0].ttlp_lexlineno++; }
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 404 "./turtle_l.l"
+#line 403 "./turtle_l.l"
{ }
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 405 "./turtle_l.l"
+#line 404 "./turtle_l.l"
{ }
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 406 "./turtle_l.l"
+#line 405 "./turtle_l.l"
{
char buf[100]; sprintf (buf, "Unexpected character '%c'", yytext[yyleng-1]);
TTLYYERROR_OR_REPORT (buf);
@@ -2261,18 +2234,18 @@ YY_RULE_SETUP
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 410 "./turtle_l.l"
+#line 409 "./turtle_l.l"
{ BEGIN INITIAL; yyless (yyleng-2); return _GARBAGE_BEFORE_DOT_WS; }
YY_BREAK
case 103:
/* rule 103 can match eol */
YY_RULE_SETUP
-#line 411 "./turtle_l.l"
+#line 410 "./turtle_l.l"
{ BEGIN INITIAL; yyless (('.' == yytext[yyleng-2]) ? yyleng-2 : yyleng-3); ttlp_arg[0].ttlp_lexlineno++; return _GARBAGE_BEFORE_DOT_WS; }
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 412 "./turtle_l.l"
+#line 411 "./turtle_l.l"
{
if (yyleng > 8000)
{ char buf[100]; sprintf (buf, "Failed to recover syntax error at \"%.50s...\"", yytext); ttlyyerror (buf); }
@@ -2280,10 +2253,10 @@ YY_RULE_SETUP
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 417 "./turtle_l.l"
+#line 416 "./turtle_l.l"
ECHO;
YY_BREAK
-#line 2287 "turtle_l.c"
+#line 2260 "turtle_l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(TURTLE_SKIP_TO_DOT_WS):
case YY_STATE_EOF(UNREACHEABLE):
@@ -2571,7 +2544,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
{
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 63);
+ register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 9);
if ( yy_accept[yy_current_state] )
{
yyg->yy_last_accepting_state = yy_current_state;
@@ -2580,7 +2553,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 394 )
+ if ( yy_current_state >= 384 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2600,7 +2573,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
register char *yy_cp = yyg->yy_c_buf_p;
- register YY_CHAR yy_c = 63;
+ register YY_CHAR yy_c = 9;
if ( yy_accept[yy_current_state] )
{
yyg->yy_last_accepting_state = yy_current_state;
@@ -2609,11 +2582,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 394 )
+ if ( yy_current_state >= 384 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 393);
+ yy_is_jam = (yy_current_state == 383);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -3489,7 +3462,7 @@ void ttlyyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 417 "./turtle_l.l"
+#line 416 "./turtle_l.l"
@@ -3683,15 +3656,33 @@ rdf_load_turtle (
if (arg1_is_filename)
{
+#ifdef WIN32
+ char fname[_MAX_PATH], *fname_ptr;
+ strncpy (fname, text_or_filename, _MAX_PATH);
+ fname[_MAX_PATH - 1] = '\0';
+ for (fname_ptr = fname; fname_ptr[0]; fname_ptr++)
+ {
+ switch (fname_ptr[0])
+ {
+ case '|':
+ fname_ptr[0] = ':';
+ break;
+ case '/':
+ fname_ptr[0] = '\\';
+ break;
+ }
+ }
+#else
+ char *fname = ((char *) text_or_filename);
+#endif
sec_check_dba (qi, "<read XML from URL of type file://...>");
- tf->tf_boxed_input_name = file_native_name_from_iri_path_nchars (text_or_filename, strlen (text_or_filename));
- file_path_assert (tf->tf_boxed_input_name, NULL, 1);
- srcfile = fopen (tf->tf_boxed_input_name, "rb");
+ srcfile = fopen (fname, "rb");
if (NULL == srcfile)
{
ttlp_free (ttlp);
- sqlr_new_error ("42000", "SR598", "TURTLE parser has failed to open file '%s' for reading", tf->tf_boxed_input_name);
+ sqlr_new_error ("42000", "SR598", "TURTLE parser has failed to open file '%s' for reading", fname);
}
+ tf->tf_input_name = fname;
ttlp->ttlp_iter = file_read;
ttlp->ttlp_iter_data = srcfile;
goto iter_is_set;
diff --git a/libsrc/Wi/turtle_l.l b/libsrc/Wi/turtle_l.l
index f09e933..50fe6fb 100644
--- a/libsrc/Wi/turtle_l.l
+++ b/libsrc/Wi/turtle_l.l
@@ -1,10 +1,10 @@
/*
- * $Id: turtle_l.l,v 1.21.2.20 2012/03/08 12:55:37 source Exp $
+ * $Id: turtle_l.l,v 1.21.2.17 2011/05/16 09:04:22 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -38,7 +38,6 @@
#include "turtle_p.h"
#include "nquad_p.h"
#include "security.h"
-#include "sqlbif.h"
#if (__NQUAD_NONPUNCT_END != __TTL_NONPUNCT_END)
Sources of parsers are out of sync: mismatch between token declarations in nquad_p.y and turtle_p.y
#endif
@@ -160,8 +159,8 @@ INTEGER_LITERAL ([0-9]+)
DECIMAL_LITERAL (([0-9]+"."[0-9]*)|("."[0-9]+))
DOUBLE_LITERAL (({INTEGER_LITERAL}|{DECIMAL_LITERAL})[eE][+-]?[0-9]+)
-SPAR_SQ_PLAIN ([^\x00-\x1f\\''\r\n]|[\t])
-SPAR_DQ_PLAIN ([^\x00-\x1f\\""\r\n]|[\t])
+SPAR_SQ_PLAIN ([^\\''\r\n])
+SPAR_DQ_PLAIN ([^\\""\r\n])
SPAR_ECHAR ([\\]([atbvnrf\\""'']|("u"{HEX}{HEX}{HEX}{HEX})|("U"{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX})))
SPAR_LANGTAG ([a-zA-Z]+)(("-"([a-zA-Z0-9]+))*)
SPAR_OLD_LANGTAG ([a-z]+)"_"([a-zA-Z0-9]+)
@@ -606,15 +605,33 @@ rdf_load_turtle (
if (arg1_is_filename)
{
+#ifdef WIN32
+ char fname[_MAX_PATH], *fname_ptr;
+ strncpy (fname, text_or_filename, _MAX_PATH);
+ fname[_MAX_PATH - 1] = '\0';
+ for (fname_ptr = fname; fname_ptr[0]; fname_ptr++)
+ {
+ switch (fname_ptr[0])
+ {
+ case '|':
+ fname_ptr[0] = ':';
+ break;
+ case '/':
+ fname_ptr[0] = '\\';
+ break;
+ }
+ }
+#else
+ char *fname = ((char *) text_or_filename);
+#endif
sec_check_dba (qi, "<read XML from URL of type file://...>");
- tf->tf_boxed_input_name = file_native_name_from_iri_path_nchars (text_or_filename, strlen (text_or_filename));
- file_path_assert (tf->tf_boxed_input_name, NULL, 1);
- srcfile = fopen (tf->tf_boxed_input_name, "rb");
+ srcfile = fopen (fname, "rb");
if (NULL == srcfile)
{
ttlp_free (ttlp);
- sqlr_new_error ("42000", "SR598", "TURTLE parser has failed to open file '%s' for reading", tf->tf_boxed_input_name);
+ sqlr_new_error ("42000", "SR598", "TURTLE parser has failed to open file '%s' for reading", fname);
}
+ tf->tf_input_name = fname;
ttlp->ttlp_iter = file_read;
ttlp->ttlp_iter_data = srcfile;
goto iter_is_set;
diff --git a/libsrc/Wi/turtle_p.c b/libsrc/Wi/turtle_p.c
index 2349b03..1839562 100644
--- a/libsrc/Wi/turtle_p.c
+++ b/libsrc/Wi/turtle_p.c
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,7 +29,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -45,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -53,89 +55,17 @@
/* Pure parsers. */
#define YYPURE 1
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
-#define yyparse ttlyyparse
-#define yylex ttlyylex
-#define yyerror ttlyyerror
-#define yylval ttlyylval
-#define yychar ttlyychar
-#define yydebug ttlyydebug
-#define yynerrs ttlyynerrs
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
-#line 31 "./turtle_p.y"
-
-
-#include "libutil.h"
-#include "sqlnode.h"
-#include "sqlparext.h"
-#include "rdf_core.h"
-#include "xmltree.h"
-/*#include "langfunc.h"*/
-
-#ifdef DEBUG
-#define ttlyyerror(ttlp_arg,yyscan,strg) ttlyyerror_impl_1(ttlp_arg, NULL, yystate, yyssa, yyssp, (strg))
-#define ttlyyerror_action(strg) ttlyyerror_impl_1(ttlp_arg, NULL, yystate, yyssa, yyssp, (strg))
-#else
-#define ttlyyerror(ttlp_arg,yyscan,strg) ttlyyerror_impl(ttlp_arg, NULL, (strg))
-#define ttlyyerror_action(strg) ttlyyerror_impl(ttlp_arg, NULL, (strg))
-#endif
-
-#define TTLYYERROR_ACTION_COND(flag,strg) do { \
- if (!((flag) & ttlp_arg->ttlp_flags)) \
- ttlyyerror_action(strg); \
- else \
- tf_report (ttlp_arg->ttlp_tf, 'W', NULL, NULL, (strg)); \
- } while (0)
-
-
-extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
-
-
-#ifdef TTLDEBUG
-#define YYDEBUG 1
-#endif
-
-#define TTLP_URI_RESOLVE_IF_NEEDED(rel) \
- do { \
- if ((NULL != ttlp_arg->ttlp_tf->tf_base_uri) && strncmp ((rel), "http://", 7)) \
- (rel) = ttlp_uri_resolve (ttlp_arg, (rel)); \
- } while (0)
-
-
-
-/* Line 189 of yacc.c */
-#line 121 "turtle_p.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
+#define yyparse ttlyyparse
+#define yylex ttlyylex
+#define yyerror ttlyyerror
+#define yylval ttlyylval
+#define yychar ttlyychar
+#define yydebug ttlyydebug
+#define yynerrs ttlyynerrs
/* Tokens. */
@@ -245,34 +175,90 @@ extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
+/* Copy the first part of user declarations. */
+#line 31 "./turtle_p.y"
+
+
+#include "libutil.h"
+#include "sqlnode.h"
+#include "sqlparext.h"
+#include "rdf_core.h"
+#include "xmltree.h"
+/*#include "langfunc.h"*/
+
+#ifdef DEBUG
+#define ttlyyerror(ttlp_arg,yyscan,strg) ttlyyerror_impl_1(ttlp_arg, NULL, yystate, yyssa, yyssp, (strg))
+#define ttlyyerror_action(strg) ttlyyerror_impl_1(ttlp_arg, NULL, yystate, yyssa, yyssp, (strg))
+#else
+#define ttlyyerror(ttlp_arg,yyscan,strg) ttlyyerror_impl(ttlp_arg, NULL, (strg))
+#define ttlyyerror_action(strg) ttlyyerror_impl(ttlp_arg, NULL, (strg))
+#endif
+
+#define TTLYYERROR_ACTION_COND(flag,strg) do { \
+ if (!((flag) & ttlp_arg->ttlp_flags)) \
+ ttlyyerror_action(strg); \
+ else \
+ tf_report (ttlp_arg->ttlp_tf, 'W', NULL, NULL, (strg)); \
+ } while (0)
+
+
+extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
+
+
+#ifdef TTLDEBUG
+#define YYDEBUG 1
+#endif
+
+#define TTLP_URI_RESOLVE_IF_NEEDED(rel) \
+ do { \
+ if ((NULL != ttlp_arg->ttlp_tf->tf_base_uri) && strncmp ((rel), "http://", 7)) \
+ (rel) = ttlp_uri_resolve (ttlp_arg, (rel)); \
+ } while (0)
+
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c */
#line 72 "./turtle_p.y"
-
+{
caddr_t box;
ptrlong token_type;
void *nothing;
ptrlong lexlineno;
-
-
-
-/* Line 214 of yacc.c */
-#line 264 "turtle_p.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 187 of yacc.c. */
+#line 249 "turtle_p.c"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
+
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 276 "turtle_p.c"
+/* Line 216 of yacc.c. */
+#line 262 "turtle_p.c"
#ifdef short
# undef short
@@ -322,7 +308,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -347,14 +333,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -435,9 +421,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -471,12 +457,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -487,16 +473,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 522
+#define YYLAST 514
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 50
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 65
+#define YYNNTS 61
/* YYNRULES -- Number of rules. */
-#define YYNRULES 163
+#define YYNRULES 156
/* YYNRULES -- Number of states. */
-#define YYNSTATES 223
+#define YYNSTATES 217
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -546,91 +532,88 @@ static const yytype_uint8 yytranslate[] =
YYRHS. */
static const yytype_uint16 yyprhs[] =
{
- 0, 0, 3, 4, 7, 8, 13, 16, 19, 20,
- 24, 26, 27, 33, 35, 38, 42, 46, 47, 49,
- 52, 54, 57, 58, 64, 66, 69, 72, 74, 78,
- 80, 82, 84, 86, 90, 91, 96, 98, 99, 103,
- 104, 108, 109, 113, 114, 118, 120, 121, 126, 127,
- 131, 132, 137, 138, 143, 146, 148, 152, 154, 156,
- 158, 160, 162, 164, 165, 167, 169, 170, 174, 178,
- 183, 185, 188, 191, 195, 197, 199, 203, 205, 207,
- 209, 211, 215, 217, 219, 221, 223, 225, 228, 230,
- 231, 235, 236, 240, 241, 245, 247, 249, 251, 255,
- 257, 259, 261, 263, 265, 267, 269, 271, 273, 275,
- 277, 278, 282, 283, 287, 291, 295, 297, 299, 301,
- 303, 305, 307, 309, 312, 313, 318, 320, 322, 324,
- 326, 328, 330, 332, 334, 336, 338, 340, 343, 347,
- 349, 353, 357, 361, 363, 365, 366, 370, 371, 375,
- 376, 380, 381, 384, 388, 390, 391, 395, 396, 399,
- 400, 404, 406, 408
+ 0, 0, 3, 4, 7, 8, 13, 17, 22, 27,
+ 28, 32, 34, 35, 41, 43, 44, 46, 49, 51,
+ 54, 55, 61, 63, 66, 69, 71, 75, 76, 81,
+ 83, 84, 88, 89, 93, 94, 98, 99, 103, 105,
+ 106, 111, 112, 116, 117, 122, 123, 128, 131, 133,
+ 137, 139, 141, 143, 145, 147, 149, 150, 152, 154,
+ 155, 159, 163, 168, 170, 173, 176, 180, 182, 184,
+ 188, 190, 192, 194, 196, 200, 202, 204, 206, 208,
+ 210, 213, 215, 216, 220, 221, 225, 226, 230, 232,
+ 234, 236, 240, 242, 244, 246, 248, 250, 252, 254,
+ 256, 258, 260, 262, 263, 267, 268, 272, 276, 280,
+ 282, 284, 286, 288, 290, 292, 294, 297, 298, 303,
+ 305, 307, 309, 311, 313, 315, 317, 319, 321, 323,
+ 325, 328, 332, 334, 338, 342, 346, 348, 350, 351,
+ 355, 356, 360, 361, 365, 366, 369, 373, 375, 376,
+ 380, 381, 384, 385, 389, 391, 393
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
51, 0, -1, -1, 51, 52, -1, -1, 28, 53,
- 78, 58, -1, 56, 58, -1, 57, 58, -1, -1,
- 114, 54, 60, -1, 73, -1, -1, 11, 55, 63,
- 59, 58, -1, 1, -1, 25, 46, -1, 30, 43,
- 46, -1, 30, 7, 46, -1, -1, 9, -1, 9,
- 15, -1, 15, -1, 84, 9, -1, -1, 62, 61,
- 63, 59, 58, -1, 11, -1, 20, 11, -1, 20,
- 1, -1, 64, -1, 63, 9, 64, -1, 56, -1,
- 57, -1, 66, -1, 66, -1, 65, 9, 66, -1,
- -1, 114, 67, 81, 80, -1, 68, -1, -1, 44,
- 69, 84, -1, -1, 102, 70, 84, -1, -1, 98,
- 71, 84, -1, -1, 48, 72, 84, -1, 47, -1,
- -1, 44, 74, 84, 9, -1, -1, 102, 75, 83,
- -1, -1, 98, 76, 84, 9, -1, -1, 48, 77,
- 84, 9, -1, 47, 9, -1, 79, -1, 78, 8,
- 79, -1, 42, -1, 24, -1, 26, -1, 27, -1,
- 29, -1, 31, -1, -1, 18, -1, 86, -1, -1,
- 10, 82, 112, -1, 85, 80, 9, -1, 85, 80,
- 47, 9, -1, 9, -1, 47, 9, -1, 86, 80,
- -1, 86, 80, 47, -1, 47, -1, 88, -1, 85,
- 18, 87, -1, 8, -1, 18, -1, 1, -1, 88,
- -1, 86, 18, 87, -1, 8, -1, 18, -1, 9,
- -1, 1, -1, 88, -1, 88, 47, -1, 47, -1,
- -1, 94, 89, 92, -1, -1, 97, 90, 92, -1,
- -1, 48, 91, 92, -1, 93, -1, 47, -1, 101,
- -1, 93, 8, 100, -1, 8, -1, 18, -1, 9,
- -1, 1, -1, 114, -1, 44, -1, 24, -1, 19,
- -1, 21, -1, 14, -1, 45, -1, -1, 13, 95,
- 106, -1, -1, 12, 96, 109, -1, 27, 114, 29,
- -1, 27, 44, 29, -1, 22, -1, 33, -1, 32,
- -1, 36, -1, 37, -1, 38, -1, 39, -1, 39,
- 41, -1, -1, 39, 99, 6, 114, -1, 101, -1,
- 47, -1, 114, -1, 44, -1, 102, -1, 33, -1,
- 32, -1, 36, -1, 37, -1, 38, -1, 39, -1,
- 39, 41, -1, 39, 6, 114, -1, 48, -1, 39,
- 6, 48, -1, 48, 6, 114, -1, 48, 6, 48,
- -1, 45, -1, 14, -1, -1, 13, 103, 106, -1,
- -1, 12, 104, 109, -1, -1, 10, 105, 112, -1,
- -1, 107, 108, -1, 86, 80, 17, -1, 17, -1,
- -1, 110, 111, 16, -1, -1, 111, 101, -1, -1,
- 113, 65, 15, -1, 46, -1, 42, -1, 43, -1
+ 74, 56, -1, 25, 46, 56, -1, 30, 43, 46,
+ 56, -1, 30, 7, 46, 56, -1, -1, 110, 54,
+ 58, -1, 69, -1, -1, 11, 55, 61, 57, 56,
+ -1, 1, -1, -1, 9, -1, 9, 15, -1, 15,
+ -1, 80, 9, -1, -1, 60, 59, 61, 57, 56,
+ -1, 11, -1, 20, 11, -1, 20, 1, -1, 62,
+ -1, 61, 9, 62, -1, -1, 110, 63, 77, 76,
+ -1, 64, -1, -1, 44, 65, 80, -1, -1, 98,
+ 66, 80, -1, -1, 94, 67, 80, -1, -1, 48,
+ 68, 80, -1, 47, -1, -1, 44, 70, 80, 9,
+ -1, -1, 98, 71, 79, -1, -1, 94, 72, 80,
+ 9, -1, -1, 48, 73, 80, 9, -1, 47, 9,
+ -1, 75, -1, 74, 8, 75, -1, 42, -1, 24,
+ -1, 26, -1, 27, -1, 29, -1, 31, -1, -1,
+ 18, -1, 82, -1, -1, 10, 78, 108, -1, 81,
+ 76, 9, -1, 81, 76, 47, 9, -1, 9, -1,
+ 47, 9, -1, 82, 76, -1, 82, 76, 47, -1,
+ 47, -1, 84, -1, 81, 18, 83, -1, 8, -1,
+ 18, -1, 1, -1, 84, -1, 82, 18, 83, -1,
+ 8, -1, 18, -1, 9, -1, 1, -1, 84, -1,
+ 84, 47, -1, 47, -1, -1, 90, 85, 88, -1,
+ -1, 93, 86, 88, -1, -1, 48, 87, 88, -1,
+ 89, -1, 47, -1, 97, -1, 89, 8, 96, -1,
+ 8, -1, 18, -1, 9, -1, 1, -1, 110, -1,
+ 44, -1, 24, -1, 19, -1, 21, -1, 14, -1,
+ 45, -1, -1, 13, 91, 102, -1, -1, 12, 92,
+ 105, -1, 27, 110, 29, -1, 27, 44, 29, -1,
+ 22, -1, 33, -1, 32, -1, 36, -1, 37, -1,
+ 38, -1, 39, -1, 39, 41, -1, -1, 39, 95,
+ 6, 110, -1, 97, -1, 47, -1, 110, -1, 44,
+ -1, 98, -1, 33, -1, 32, -1, 36, -1, 37,
+ -1, 38, -1, 39, -1, 39, 41, -1, 39, 6,
+ 110, -1, 48, -1, 39, 6, 48, -1, 48, 6,
+ 110, -1, 48, 6, 48, -1, 45, -1, 14, -1,
+ -1, 13, 99, 102, -1, -1, 12, 100, 105, -1,
+ -1, 10, 101, 108, -1, -1, 103, 104, -1, 82,
+ 76, 17, -1, 17, -1, -1, 106, 107, 16, -1,
+ -1, 107, 97, -1, -1, 109, 61, 15, -1, 46,
+ -1, 42, -1, 43, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 151, 151, 153, 157, 157, 158, 159, 160, 160,
- 164, 165, 165, 171, 175, 183, 205, 212, 214, 218,
- 219, 223, 224, 224, 236, 237, 238, 242, 243, 247,
- 248, 249, 253, 254, 258, 258, 262, 266, 266, 269,
- 269, 272, 272, 276, 276, 279, 283, 283, 286, 286,
- 289, 289, 293, 293, 296, 300, 301, 305, 306, 307,
- 308, 309, 310, 313, 315, 319, 321, 320, 327, 328,
- 329, 330, 334, 335, 336, 340, 341, 342, 343, 344,
- 348, 349, 350, 351, 352, 353, 357, 358, 359, 364,
- 363, 367, 366, 370, 370, 377, 378, 382, 383, 384,
- 385, 386, 387, 391, 392, 393, 394, 395, 396, 403,
- 414, 413, 426, 425, 440, 441, 442, 446, 447, 448,
- 449, 450, 451, 452, 453, 453, 459, 460, 464, 469,
- 473, 477, 479, 481, 485, 489, 493, 497, 503, 510,
- 511, 514, 517, 521, 530, 537, 536, 548, 547, 559,
- 558, 573, 573, 583, 589, 598, 598, 632, 633, 652,
- 652, 672, 679, 687
+ 0, 151, 151, 153, 157, 157, 158, 159, 178, 181,
+ 181, 185, 186, 186, 192, 195, 197, 201, 202, 206,
+ 207, 207, 217, 218, 219, 223, 224, 228, 228, 232,
+ 236, 236, 239, 239, 242, 242, 246, 246, 249, 253,
+ 253, 256, 256, 259, 259, 263, 263, 266, 270, 271,
+ 275, 276, 277, 278, 279, 280, 283, 285, 289, 291,
+ 290, 297, 298, 299, 300, 304, 305, 306, 310, 311,
+ 312, 313, 314, 318, 319, 320, 321, 322, 323, 327,
+ 328, 329, 334, 333, 337, 336, 340, 340, 347, 348,
+ 352, 353, 354, 355, 356, 357, 361, 362, 363, 364,
+ 365, 366, 373, 384, 383, 396, 395, 410, 411, 412,
+ 416, 417, 418, 419, 420, 421, 422, 423, 423, 429,
+ 430, 434, 439, 443, 447, 449, 451, 455, 459, 463,
+ 467, 473, 480, 481, 484, 487, 491, 500, 507, 506,
+ 518, 517, 529, 528, 543, 543, 553, 559, 568, 568,
+ 602, 603, 622, 622, 642, 649, 657
};
#endif
@@ -649,23 +632,21 @@ static const char *const yytname[] =
"TURTLE_DECIMAL", "TURTLE_DOUBLE", "TURTLE_STRING", "KEYWORD", "LANGTAG",
"QNAME", "QNAME_NS", "VARIABLE", "BLANK_NODE_LABEL", "Q_IRI_REF",
"_GARBAGE_BEFORE_DOT_WS", "TTL_RECOVERABLE_ERROR", "__TTL_NONPUNCT_END",
- "$accept", "turtledoc", "clause", "$@1", "$@2", "$@3", "base_clause",
- "prefix_clause", "dot_opt", "trig_group_end",
- "trig_block_or_predicate_object_list", "$@4", "opt_eq_lbra",
- "base_or_prefix_or_inner_triple_clauses",
- "base_or_prefix_or_inner_triple_clause", "inner_triple_clauses",
- "inner_triple_clause", "$@5", "triple_clause_with_nonq_subj", "$@6",
- "$@7", "$@8", "$@9", "top_triple_clause_with_nonq_subj", "$@10", "$@11",
- "$@12", "$@13", "keyword_list", "keyword", "semicolon_opt",
- "inner_predicate_object_list", "$@14",
+ "$accept", "turtledoc", "clause", "@1", "@2", "@3", "dot_opt",
+ "trig_group_end", "trig_block_or_predicate_object_list", "@4",
+ "opt_eq_lbra", "inner_triple_clauses", "inner_triple_clause", "@5",
+ "triple_clause_with_nonq_subj", "@6", "@7", "@8", "@9",
+ "top_triple_clause_with_nonq_subj", "@10", "@11", "@12", "@13",
+ "keyword_list", "keyword", "semicolon_opt",
+ "inner_predicate_object_list", "@14",
"top_blank_predicate_object_list_or_garbage_with_dot",
"predicate_object_list_or_garbage", "top_blank_predicate_object_list",
"predicate_object_list", "verb_and_object_list_or_garbage",
- "verb_and_object_list", "$@15", "$@16", "$@17", "object_list_or_garbage",
+ "verb_and_object_list", "@15", "@16", "@17", "object_list_or_garbage",
"object_list", "verb", "@18", "@19", "rev_verb", "literal_subject",
- "$@20", "object_or_garbage", "object", "blank", "@21", "@22", "@23",
- "blank_block_subj", "$@24", "blank_block_subj_tail", "blank_block_seq",
- "$@25", "items", "blank_block_formula", "$@26", "q_complete", 0
+ "@20", "object_or_garbage", "object", "blank", "@21", "@22", "@23",
+ "blank_block_subj", "@24", "blank_block_subj_tail", "blank_block_seq",
+ "@25", "items", "blank_block_formula", "@26", "q_complete", 0
};
#endif
@@ -685,45 +666,43 @@ static const yytype_uint16 yytoknum[] =
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 50, 51, 51, 53, 52, 52, 52, 54, 52,
- 52, 55, 52, 52, 56, 57, 57, 58, 58, 59,
- 59, 60, 61, 60, 62, 62, 62, 63, 63, 64,
- 64, 64, 65, 65, 67, 66, 66, 69, 68, 70,
- 68, 71, 68, 72, 68, 68, 74, 73, 75, 73,
- 76, 73, 77, 73, 73, 78, 78, 79, 79, 79,
- 79, 79, 79, 80, 80, 81, 82, 81, 83, 83,
- 83, 83, 84, 84, 84, 85, 85, 85, 85, 85,
- 86, 86, 86, 86, 86, 86, 87, 87, 87, 89,
- 88, 90, 88, 91, 88, 92, 92, 93, 93, 93,
- 93, 93, 93, 94, 94, 94, 94, 94, 94, 94,
- 95, 94, 96, 94, 97, 97, 97, 98, 98, 98,
- 98, 98, 98, 98, 99, 98, 100, 100, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 102, 102, 103, 102, 104, 102, 105,
- 102, 107, 106, 108, 108, 110, 109, 111, 111, 113,
- 112, 114, 114, 114
+ 0, 50, 51, 51, 53, 52, 52, 52, 52, 54,
+ 52, 52, 55, 52, 52, 56, 56, 57, 57, 58,
+ 59, 58, 60, 60, 60, 61, 61, 63, 62, 62,
+ 65, 64, 66, 64, 67, 64, 68, 64, 64, 70,
+ 69, 71, 69, 72, 69, 73, 69, 69, 74, 74,
+ 75, 75, 75, 75, 75, 75, 76, 76, 77, 78,
+ 77, 79, 79, 79, 79, 80, 80, 80, 81, 81,
+ 81, 81, 81, 82, 82, 82, 82, 82, 82, 83,
+ 83, 83, 85, 84, 86, 84, 87, 84, 88, 88,
+ 89, 89, 89, 89, 89, 89, 90, 90, 90, 90,
+ 90, 90, 90, 91, 90, 92, 90, 93, 93, 93,
+ 94, 94, 94, 94, 94, 94, 94, 95, 94, 96,
+ 96, 97, 97, 97, 97, 97, 97, 97, 97, 97,
+ 97, 97, 97, 97, 97, 97, 98, 98, 99, 98,
+ 100, 98, 101, 98, 103, 102, 104, 104, 106, 105,
+ 107, 107, 109, 108, 110, 110, 110
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
- 0, 2, 0, 2, 0, 4, 2, 2, 0, 3,
- 1, 0, 5, 1, 2, 3, 3, 0, 1, 2,
- 1, 2, 0, 5, 1, 2, 2, 1, 3, 1,
- 1, 1, 1, 3, 0, 4, 1, 0, 3, 0,
- 3, 0, 3, 0, 3, 1, 0, 4, 0, 3,
- 0, 4, 0, 4, 2, 1, 3, 1, 1, 1,
- 1, 1, 1, 0, 1, 1, 0, 3, 3, 4,
- 1, 2, 2, 3, 1, 1, 3, 1, 1, 1,
- 1, 3, 1, 1, 1, 1, 1, 2, 1, 0,
- 3, 0, 3, 0, 3, 1, 1, 1, 3, 1,
+ 0, 2, 0, 2, 0, 4, 3, 4, 4, 0,
+ 3, 1, 0, 5, 1, 0, 1, 2, 1, 2,
+ 0, 5, 1, 2, 2, 1, 3, 0, 4, 1,
+ 0, 3, 0, 3, 0, 3, 0, 3, 1, 0,
+ 4, 0, 3, 0, 4, 0, 4, 2, 1, 3,
+ 1, 1, 1, 1, 1, 1, 0, 1, 1, 0,
+ 3, 3, 4, 1, 2, 2, 3, 1, 1, 3,
+ 1, 1, 1, 1, 3, 1, 1, 1, 1, 1,
+ 2, 1, 0, 3, 0, 3, 0, 3, 1, 1,
+ 1, 3, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 0, 3, 0, 3, 3, 3, 1,
+ 1, 1, 1, 1, 1, 1, 2, 0, 4, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 3, 0, 3, 3, 3, 1, 1, 1, 1,
- 1, 1, 1, 2, 0, 4, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 2, 3, 1,
- 3, 3, 3, 1, 1, 0, 3, 0, 3, 0,
- 3, 0, 2, 3, 1, 0, 3, 0, 2, 0,
- 3, 1, 1, 1
+ 2, 3, 1, 3, 3, 3, 1, 1, 0, 3,
+ 0, 3, 0, 3, 0, 2, 3, 1, 0, 3,
+ 0, 2, 0, 3, 1, 1, 1
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -731,202 +710,198 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 2, 0, 1, 13, 149, 11, 147, 145, 144, 0,
- 4, 0, 118, 117, 119, 120, 121, 122, 162, 163,
- 46, 143, 161, 0, 52, 3, 17, 17, 10, 50,
- 48, 8, 159, 0, 155, 151, 14, 0, 0, 0,
- 123, 0, 0, 54, 0, 18, 6, 7, 0, 0,
- 0, 150, 0, 37, 45, 43, 29, 30, 0, 27,
- 31, 36, 41, 39, 34, 148, 157, 146, 0, 58,
- 59, 60, 61, 62, 57, 17, 55, 16, 15, 0,
- 85, 82, 84, 112, 110, 108, 83, 106, 107, 116,
- 105, 0, 104, 109, 74, 93, 0, 63, 80, 89,
- 91, 103, 0, 0, 79, 77, 70, 78, 0, 49,
- 63, 75, 24, 0, 9, 22, 0, 0, 32, 0,
- 0, 0, 20, 17, 0, 0, 0, 0, 154, 63,
- 152, 0, 5, 125, 155, 151, 0, 0, 0, 47,
- 64, 72, 0, 0, 53, 51, 71, 64, 0, 26,
- 25, 0, 21, 0, 160, 38, 44, 19, 28, 12,
- 42, 40, 66, 63, 65, 156, 132, 131, 133, 134,
- 135, 136, 129, 139, 158, 130, 128, 0, 56, 113,
- 111, 115, 114, 102, 99, 101, 100, 96, 94, 95,
- 97, 88, 81, 86, 73, 90, 92, 76, 68, 0,
- 0, 33, 159, 64, 35, 0, 0, 137, 0, 153,
- 0, 87, 69, 17, 67, 140, 138, 142, 141, 127,
- 98, 126, 23
+ 2, 0, 1, 14, 142, 12, 140, 138, 137, 0,
+ 4, 0, 111, 110, 112, 113, 114, 115, 155, 156,
+ 39, 136, 154, 0, 45, 3, 11, 43, 41, 9,
+ 152, 0, 148, 144, 15, 0, 0, 0, 116, 0,
+ 0, 47, 0, 0, 0, 0, 143, 0, 30, 38,
+ 36, 0, 25, 29, 34, 32, 27, 141, 150, 139,
+ 0, 16, 6, 51, 52, 53, 54, 55, 50, 15,
+ 48, 15, 15, 0, 78, 75, 77, 105, 103, 101,
+ 76, 99, 100, 109, 98, 0, 97, 102, 67, 86,
+ 0, 56, 73, 82, 84, 96, 0, 0, 72, 70,
+ 63, 71, 0, 42, 56, 68, 22, 0, 10, 20,
+ 0, 0, 0, 0, 0, 18, 15, 0, 0, 0,
+ 0, 147, 56, 145, 0, 5, 8, 7, 118, 148,
+ 144, 0, 0, 0, 40, 57, 65, 0, 0, 46,
+ 44, 64, 57, 0, 24, 23, 0, 19, 0, 153,
+ 31, 37, 17, 26, 13, 35, 33, 59, 56, 58,
+ 149, 125, 124, 126, 127, 128, 129, 122, 132, 151,
+ 123, 121, 0, 49, 106, 104, 108, 107, 95, 92,
+ 94, 93, 89, 87, 88, 90, 81, 74, 79, 66,
+ 83, 85, 69, 61, 0, 0, 152, 57, 28, 0,
+ 0, 130, 0, 146, 0, 80, 62, 15, 60, 133,
+ 131, 135, 134, 120, 91, 119, 21
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 1, 25, 37, 50, 33, 56, 57, 46, 123,
- 114, 151, 115, 58, 59, 117, 60, 126, 61, 119,
- 125, 124, 120, 28, 42, 49, 48, 44, 75, 76,
- 141, 163, 202, 109, 96, 110, 97, 192, 98, 142,
- 143, 138, 188, 189, 99, 135, 134, 100, 62, 41,
- 220, 190, 63, 35, 34, 32, 67, 68, 130, 65,
- 66, 127, 51, 52, 101
+ -1, 1, 25, 35, 45, 31, 62, 116, 108, 146,
+ 109, 51, 52, 119, 53, 112, 118, 117, 113, 26,
+ 40, 44, 43, 42, 69, 70, 136, 158, 196, 103,
+ 90, 104, 91, 187, 92, 137, 138, 133, 183, 184,
+ 93, 130, 129, 94, 54, 39, 214, 185, 55, 33,
+ 32, 30, 59, 60, 123, 57, 58, 120, 46, 47,
+ 95
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -123
+#define YYPACT_NINF -117
static const yytype_int16 yypact[] =
{
- -123, 135, -123, -123, -123, -123, -123, -123, -123, -35,
- -123, 10, -123, -123, -123, -123, -123, 9, -123, -123,
- -123, -123, -123, 19, -123, -123, 26, 26, -123, -123,
- -123, -123, -123, 430, -123, -123, -123, 69, -28, -6,
- -123, 36, 12, -123, 12, -123, -123, -123, 12, 275,
- 205, -123, 268, -123, -123, -123, -123, -123, 7, -123,
- -123, -123, -123, -123, -123, -123, -123, -123, 323, -123,
- -123, -123, -123, -123, -123, 29, -123, -123, -123, 81,
- -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
- -123, 75, -123, -123, -123, -123, 37, 44, -123, -123,
- -123, -123, 57, 71, -123, -123, -123, -123, 76, -123,
- 66, -123, -123, 8, -123, -123, 80, 14, -123, 12,
- 12, 391, -123, 26, 12, 12, 369, 31, -123, 44,
- -123, 69, -123, -123, -123, -123, 62, 63, 227, -123,
- 474, 52, 227, 227, -123, -123, -123, 474, 5, -123,
- -123, 430, -123, 268, -123, -123, -123, -123, -123, -123,
- -123, -123, -123, 86, 89, -123, -123, -123, -123, -123,
- -123, 42, -123, 106, -123, -123, -123, 97, -123, -123,
- -123, -123, -123, -123, -123, -123, -123, -123, -123, 108,
- -123, -123, -123, 78, -123, -123, -123, -123, -123, 113,
- 7, -123, -123, -123, -123, 437, 60, -123, 67, -123,
- 316, -123, -123, 26, -123, -123, -123, -123, -123, -123,
- -123, -123, -123
+ -117, 148, -117, -117, -117, -117, -117, -117, -117, -23,
+ -117, 8, -117, -117, -117, -117, -117, 6, -117, -117,
+ -117, -117, -117, 16, -117, -117, -117, -117, -117, -117,
+ -117, 262, -117, -117, 28, 2, -7, -5, -117, 37,
+ 269, -117, 269, 269, 317, 199, -117, 262, -117, -117,
+ -117, 9, -117, -117, -117, -117, -117, -117, -117, -117,
+ 52, -117, -117, -117, -117, -117, -117, -117, -117, 40,
+ -117, 28, 28, -26, -117, -117, -117, -117, -117, -117,
+ -117, -117, -117, -117, -117, 47, -117, -117, -117, -117,
+ 36, 41, -117, -117, -117, -117, 49, 53, -117, -117,
+ -117, -117, 66, -117, 50, -117, -117, 21, -117, -117,
+ 68, 27, 269, 269, 383, -117, 28, 269, 269, 365,
+ 422, -117, 41, -117, 2, -117, -117, -117, -117, -117,
+ -117, 54, 58, 221, -117, 466, 31, 221, 221, -117,
+ -117, -117, 466, 5, -117, -117, 262, -117, 262, -117,
+ -117, -117, -117, -117, -117, -117, -117, -117, 64, 85,
+ -117, -117, -117, -117, -117, -117, 13, -117, 98, -117,
+ -117, -117, 91, -117, -117, -117, -117, -117, -117, -117,
+ -117, -117, -117, -117, 101, -117, -117, -117, 63, -117,
+ -117, -117, -117, -117, 102, 9, -117, -117, -117, 429,
+ -8, -117, 59, -117, 310, -117, -117, 28, -117, -117,
+ -117, -117, -117, -117, -117, -117, -117
};
/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int16 yypgoto[] =
+static const yytype_int8 yypgoto[] =
{
- -123, -123, -123, -123, -123, -123, 128, 129, -26, -69,
- -123, -123, -123, -19, 13, -123, -48, -123, -123, -123,
- -123, -123, -123, -123, -123, -123, -123, -123, -123, 2,
- -102, -123, -123, -123, -38, -123, -61, -9, -46, -123,
- -123, -123, -71, -123, -123, -123, -123, -123, 139, -123,
- -123, -122, 1, -123, -123, -123, 16, -123, -123, 20,
- -123, -123, -49, -123, -1
+ -117, -117, -117, -117, -117, -117, -66, -83, -117, -117,
+ -117, -40, -93, -117, -117, -117, -117, -117, -117, -117,
+ -117, -117, -117, -117, -117, -10, -95, -117, -117, -117,
+ -32, -117, -52, -27, -43, -117, -117, -117, -81, -117,
+ -117, -117, -117, -117, 115, -117, -117, -116, 1, -117,
+ -117, -117, -13, -117, -117, -11, -117, -117, -76, -117,
+ -1
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -125
+#define YYTABLE_NINF -118
static const yytype_int16 yytable[] =
{
- 31, 47, 30, 111, 118, 174, 102, 129, 148, 149,
- 103, 36, 116, 80, 198, -124, 121, 38, 77, 150,
- 81, 82, 122, 153, 83, 84, 85, 177, 43, 154,
- 86, 87, 64, 88, 89, 45, 90, 131, 45, 91,
- 78, 4, 79, 6, 7, 8, 139, 165, 206, 132,
- 40, 64, 199, 39, 18, 19, 92, 93, 22, 94,
- 95, 204, 140, 166, 167, 164, 144, 168, 169, 170,
- 171, 195, 196, 18, 19, 172, 21, 22, 133, 173,
- 145, 155, 156, 207, 147, 146, 160, 161, 221, 152,
- 137, 181, 182, 69, 193, 70, 71, 159, 72, 194,
- 73, 193, 18, 19, 203, 201, 22, 205, 215, 18,
- 19, 74, 208, 22, 209, 217, 210, 18, 19, 136,
- 64, 22, 212, 18, 19, 211, 176, 22, 175, 26,
- 27, 213, 200, 178, 158, 2, 3, 176, 197, 175,
- 29, 176, 176, 175, 175, 4, 5, 6, 7, 8,
- 64, 180, 64, 214, 179, 0, 0, 0, 0, 193,
- 9, 0, 0, 10, 0, 11, 0, 12, 13, 0,
- 0, 14, 15, 16, 17, 0, 0, 18, 19, 20,
- 21, 22, 23, 24, 0, 0, 0, 222, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 216, 80, 218, 0, 176,
- 0, 175, 0, 81, 82, 0, 112, 83, 84, 85,
- 0, 0, 0, 86, 87, 113, 88, 89, 183, 90,
- 0, 0, 91, 0, 0, 184, 185, 4, 0, 6,
- 7, 8, 0, 0, 0, 186, 0, 18, 19, 92,
- 93, 22, 94, 95, 0, 0, 0, 0, 0, 166,
- 167, 0, 0, 168, 169, 170, 171, 0, 0, 18,
- 19, 172, 21, 22, 187, 173, 104, 0, 4, 0,
- 6, 7, 8, 105, 106, 0, 0, 83, 84, 85,
- 0, 0, 0, 107, 87, 0, 88, 89, 0, 90,
- 12, 13, 91, 0, 14, 15, 16, 17, 0, 0,
- 18, 19, 53, 21, 22, 54, 55, 18, 19, 92,
- 93, 22, 108, 95, 80, 0, 4, 0, 6, 7,
- 8, 81, 82, 0, 0, 83, 84, 85, 0, 0,
- 128, 86, 87, 0, 88, 89, 0, 90, 166, 167,
- 91, 0, 168, 169, 170, 171, 0, 0, 18, 19,
- 172, 21, 22, 219, 173, 18, 19, 92, 93, 22,
- 80, 95, 0, 0, 0, 0, 0, 81, 82, 162,
- 0, 83, 84, 85, 0, 0, 0, 86, 87, 0,
- 88, 89, 0, 90, 0, 0, 91, 0, 0, 0,
- 0, 4, 0, 6, 7, 8, 157, 0, 0, 0,
- 0, 18, 19, 92, 93, 22, 9, 95, 0, 0,
- 0, 11, 0, 12, 13, 0, 0, 14, 15, 16,
- 17, 0, 0, 18, 19, 53, 21, 22, 54, 55,
- 4, 0, 6, 7, 8, 0, 0, 0, 0, 83,
- 84, 85, 0, 0, 0, 9, 87, 0, 88, 89,
- 11, 90, 12, 13, 91, 0, 14, 15, 16, 17,
- 0, 0, 18, 19, 53, 21, 22, 54, 55, 18,
- 19, 92, 93, 22, 191, 95, 83, 84, 85, 0,
- 0, 0, 0, 87, 0, 88, 89, 0, 90, 0,
- 0, 91, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 18, 19, 92, 93,
- 22, 0, 95
+ 29, 105, 28, 125, 169, 126, 127, 111, 122, 143,
+ 96, 97, -117, 110, 193, 36, 18, 19, 114, 200,
+ 22, 153, 144, 34, 115, 41, 63, 172, 64, 65,
+ 56, 66, 145, 67, 18, 19, 148, 61, 22, 71,
+ 209, 72, 149, 73, 68, 134, 56, 38, 124, 61,
+ 154, 37, 194, 74, 201, 153, 190, 191, 139, 135,
+ 75, 76, 140, 198, 77, 78, 79, 159, 142, 121,
+ 80, 81, 128, 82, 83, 141, 84, 147, 189, 85,
+ 150, 151, 197, 176, 132, 155, 156, 177, 215, 18,
+ 19, 131, 188, 22, 18, 19, 86, 87, 22, 188,
+ 89, 18, 19, 199, 202, 22, 195, 211, 203, 204,
+ 205, 206, 207, 56, 173, 192, 27, 175, 174, 171,
+ 208, 170, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 171, 0, 170, 0, 171, 171, 170, 170,
+ 0, 216, 0, 0, 0, 56, 0, 56, 2, 3,
+ 0, 0, 0, 0, 0, 0, 188, 0, 4, 5,
+ 6, 7, 8, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 9, 0, 0, 10, 0, 11, 0,
+ 12, 13, 0, 0, 14, 15, 16, 17, 0, 0,
+ 18, 19, 20, 21, 22, 23, 24, 0, 0, 210,
+ 74, 212, 0, 171, 0, 170, 0, 75, 76, 0,
+ 106, 77, 78, 79, 0, 0, 0, 80, 81, 107,
+ 82, 83, 178, 84, 0, 0, 85, 0, 0, 179,
+ 180, 4, 0, 6, 7, 8, 0, 0, 0, 181,
+ 0, 18, 19, 86, 87, 22, 88, 89, 0, 0,
+ 0, 0, 0, 161, 162, 0, 0, 163, 164, 165,
+ 166, 0, 0, 18, 19, 167, 21, 22, 182, 168,
+ 74, 0, 4, 0, 6, 7, 8, 75, 76, 0,
+ 0, 77, 78, 79, 0, 0, 0, 80, 81, 0,
+ 82, 83, 0, 84, 12, 13, 85, 0, 14, 15,
+ 16, 17, 0, 0, 18, 19, 48, 21, 22, 49,
+ 50, 18, 19, 86, 87, 22, 88, 89, 98, 0,
+ 4, 0, 6, 7, 8, 99, 100, 0, 0, 77,
+ 78, 79, 0, 0, 0, 101, 81, 0, 82, 83,
+ 0, 84, 161, 162, 85, 0, 163, 164, 165, 166,
+ 0, 0, 18, 19, 167, 21, 22, 213, 168, 18,
+ 19, 86, 87, 22, 102, 89, 74, 0, 0, 0,
+ 0, 0, 0, 75, 76, 157, 0, 77, 78, 79,
+ 0, 0, 0, 80, 81, 0, 82, 83, 0, 84,
+ 0, 0, 85, 4, 0, 6, 7, 8, 152, 0,
+ 0, 0, 0, 0, 0, 0, 0, 18, 19, 86,
+ 87, 22, 0, 89, 0, 12, 13, 0, 0, 14,
+ 15, 16, 17, 0, 0, 18, 19, 48, 21, 22,
+ 49, 50, 4, 0, 6, 7, 8, 0, 160, 0,
+ 0, 77, 78, 79, 0, 0, 0, 0, 81, 0,
+ 82, 83, 0, 84, 161, 162, 85, 0, 163, 164,
+ 165, 166, 0, 0, 18, 19, 167, 21, 22, 0,
+ 168, 18, 19, 86, 87, 22, 186, 89, 77, 78,
+ 79, 0, 0, 0, 0, 81, 0, 82, 83, 0,
+ 84, 0, 0, 85, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 18, 19,
+ 86, 87, 22, 0, 89
};
static const yytype_int16 yycheck[] =
{
- 1, 27, 1, 49, 52, 127, 44, 68, 110, 1,
- 48, 46, 50, 1, 9, 6, 9, 7, 46, 11,
- 8, 9, 15, 9, 12, 13, 14, 129, 9, 15,
- 18, 19, 33, 21, 22, 9, 24, 8, 9, 27,
- 46, 10, 6, 12, 13, 14, 9, 16, 6, 75,
- 41, 52, 47, 43, 42, 43, 44, 45, 46, 47,
- 48, 163, 18, 32, 33, 126, 9, 36, 37, 38,
- 39, 142, 143, 42, 43, 44, 45, 46, 79, 48,
- 9, 119, 120, 41, 18, 9, 124, 125, 210, 9,
- 91, 29, 29, 24, 140, 26, 27, 123, 29, 47,
- 31, 147, 42, 43, 18, 153, 46, 18, 48, 42,
- 43, 42, 6, 46, 17, 48, 8, 42, 43, 44,
- 121, 46, 9, 42, 43, 47, 127, 46, 127, 1,
- 1, 200, 151, 131, 121, 0, 1, 138, 147, 138,
- 1, 142, 143, 142, 143, 10, 11, 12, 13, 14,
- 151, 135, 153, 202, 134, -1, -1, -1, -1, 205,
- 25, -1, -1, 28, -1, 30, -1, 32, 33, -1,
- -1, 36, 37, 38, 39, -1, -1, 42, 43, 44,
- 45, 46, 47, 48, -1, -1, -1, 213, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 206, 1, 208, -1, 210,
- -1, 210, -1, 8, 9, -1, 11, 12, 13, 14,
- -1, -1, -1, 18, 19, 20, 21, 22, 1, 24,
- -1, -1, 27, -1, -1, 8, 9, 10, -1, 12,
- 13, 14, -1, -1, -1, 18, -1, 42, 43, 44,
- 45, 46, 47, 48, -1, -1, -1, -1, -1, 32,
- 33, -1, -1, 36, 37, 38, 39, -1, -1, 42,
- 43, 44, 45, 46, 47, 48, 1, -1, 10, -1,
- 12, 13, 14, 8, 9, -1, -1, 12, 13, 14,
- -1, -1, -1, 18, 19, -1, 21, 22, -1, 24,
- 32, 33, 27, -1, 36, 37, 38, 39, -1, -1,
- 42, 43, 44, 45, 46, 47, 48, 42, 43, 44,
- 45, 46, 47, 48, 1, -1, 10, -1, 12, 13,
- 14, 8, 9, -1, -1, 12, 13, 14, -1, -1,
- 17, 18, 19, -1, 21, 22, -1, 24, 32, 33,
- 27, -1, 36, 37, 38, 39, -1, -1, 42, 43,
- 44, 45, 46, 47, 48, 42, 43, 44, 45, 46,
- 1, 48, -1, -1, -1, -1, -1, 8, 9, 10,
- -1, 12, 13, 14, -1, -1, -1, 18, 19, -1,
- 21, 22, -1, 24, -1, -1, 27, -1, -1, -1,
- -1, 10, -1, 12, 13, 14, 15, -1, -1, -1,
- -1, 42, 43, 44, 45, 46, 25, 48, -1, -1,
- -1, 30, -1, 32, 33, -1, -1, 36, 37, 38,
+ 1, 44, 1, 69, 120, 71, 72, 47, 60, 104,
+ 42, 43, 6, 45, 9, 7, 42, 43, 9, 6,
+ 46, 114, 1, 46, 15, 9, 24, 122, 26, 27,
+ 31, 29, 11, 31, 42, 43, 9, 9, 46, 46,
+ 48, 46, 15, 6, 42, 9, 47, 41, 8, 9,
+ 116, 43, 47, 1, 41, 148, 137, 138, 9, 18,
+ 8, 9, 9, 158, 12, 13, 14, 119, 18, 17,
+ 18, 19, 73, 21, 22, 9, 24, 9, 47, 27,
+ 112, 113, 18, 29, 85, 117, 118, 29, 204, 42,
+ 43, 44, 135, 46, 42, 43, 44, 45, 46, 142,
+ 48, 42, 43, 18, 6, 46, 146, 48, 17, 8,
+ 47, 9, 195, 114, 124, 142, 1, 130, 129, 120,
+ 196, 120, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 133, -1, 133, -1, 137, 138, 137, 138,
+ -1, 207, -1, -1, -1, 146, -1, 148, 0, 1,
+ -1, -1, -1, -1, -1, -1, 199, -1, 10, 11,
+ 12, 13, 14, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 25, -1, -1, 28, -1, 30, -1,
+ 32, 33, -1, -1, 36, 37, 38, 39, -1, -1,
+ 42, 43, 44, 45, 46, 47, 48, -1, -1, 200,
+ 1, 202, -1, 204, -1, 204, -1, 8, 9, -1,
+ 11, 12, 13, 14, -1, -1, -1, 18, 19, 20,
+ 21, 22, 1, 24, -1, -1, 27, -1, -1, 8,
+ 9, 10, -1, 12, 13, 14, -1, -1, -1, 18,
+ -1, 42, 43, 44, 45, 46, 47, 48, -1, -1,
+ -1, -1, -1, 32, 33, -1, -1, 36, 37, 38,
39, -1, -1, 42, 43, 44, 45, 46, 47, 48,
- 10, -1, 12, 13, 14, -1, -1, -1, -1, 12,
- 13, 14, -1, -1, -1, 25, 19, -1, 21, 22,
- 30, 24, 32, 33, 27, -1, 36, 37, 38, 39,
+ 1, -1, 10, -1, 12, 13, 14, 8, 9, -1,
+ -1, 12, 13, 14, -1, -1, -1, 18, 19, -1,
+ 21, 22, -1, 24, 32, 33, 27, -1, 36, 37,
+ 38, 39, -1, -1, 42, 43, 44, 45, 46, 47,
+ 48, 42, 43, 44, 45, 46, 47, 48, 1, -1,
+ 10, -1, 12, 13, 14, 8, 9, -1, -1, 12,
+ 13, 14, -1, -1, -1, 18, 19, -1, 21, 22,
+ -1, 24, 32, 33, 27, -1, 36, 37, 38, 39,
-1, -1, 42, 43, 44, 45, 46, 47, 48, 42,
- 43, 44, 45, 46, 47, 48, 12, 13, 14, -1,
- -1, -1, -1, 19, -1, 21, 22, -1, 24, -1,
- -1, 27, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 42, 43, 44, 45,
- 46, -1, 48
+ 43, 44, 45, 46, 47, 48, 1, -1, -1, -1,
+ -1, -1, -1, 8, 9, 10, -1, 12, 13, 14,
+ -1, -1, -1, 18, 19, -1, 21, 22, -1, 24,
+ -1, -1, 27, 10, -1, 12, 13, 14, 15, -1,
+ -1, -1, -1, -1, -1, -1, -1, 42, 43, 44,
+ 45, 46, -1, 48, -1, 32, 33, -1, -1, 36,
+ 37, 38, 39, -1, -1, 42, 43, 44, 45, 46,
+ 47, 48, 10, -1, 12, 13, 14, -1, 16, -1,
+ -1, 12, 13, 14, -1, -1, -1, -1, 19, -1,
+ 21, 22, -1, 24, 32, 33, 27, -1, 36, 37,
+ 38, 39, -1, -1, 42, 43, 44, 45, 46, -1,
+ 48, 42, 43, 44, 45, 46, 47, 48, 12, 13,
+ 14, -1, -1, -1, -1, 19, -1, 21, 22, -1,
+ 24, -1, -1, 27, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 42, 43,
+ 44, 45, 46, -1, 48
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -935,27 +910,26 @@ static const yytype_uint8 yystos[] =
{
0, 51, 0, 1, 10, 11, 12, 13, 14, 25,
28, 30, 32, 33, 36, 37, 38, 39, 42, 43,
- 44, 45, 46, 47, 48, 52, 56, 57, 73, 98,
- 102, 114, 105, 55, 104, 103, 46, 53, 7, 43,
- 41, 99, 74, 9, 77, 9, 58, 58, 76, 75,
- 54, 112, 113, 44, 47, 48, 56, 57, 63, 64,
- 66, 68, 98, 102, 114, 109, 110, 106, 107, 24,
- 26, 27, 29, 31, 42, 78, 79, 46, 46, 6,
- 1, 8, 9, 12, 13, 14, 18, 19, 21, 22,
- 24, 27, 44, 45, 47, 48, 84, 86, 88, 94,
- 97, 114, 84, 84, 1, 8, 9, 18, 47, 83,
- 85, 88, 11, 20, 60, 62, 84, 65, 66, 69,
- 72, 9, 15, 59, 71, 70, 67, 111, 17, 86,
- 108, 8, 58, 114, 96, 95, 44, 114, 91, 9,
- 18, 80, 89, 90, 9, 9, 9, 18, 80, 1,
- 11, 61, 9, 9, 15, 84, 84, 15, 64, 58,
- 84, 84, 10, 81, 86, 16, 32, 33, 36, 37,
- 38, 39, 44, 48, 101, 102, 114, 80, 79, 109,
- 106, 29, 29, 1, 8, 9, 18, 47, 92, 93,
- 101, 47, 87, 88, 47, 92, 92, 87, 9, 47,
- 63, 66, 82, 18, 80, 18, 6, 41, 6, 17,
- 8, 47, 9, 59, 112, 48, 114, 48, 114, 47,
- 100, 101, 58
+ 44, 45, 46, 47, 48, 52, 69, 94, 98, 110,
+ 101, 55, 100, 99, 46, 53, 7, 43, 41, 95,
+ 70, 9, 73, 72, 71, 54, 108, 109, 44, 47,
+ 48, 61, 62, 64, 94, 98, 110, 105, 106, 102,
+ 103, 9, 56, 24, 26, 27, 29, 31, 42, 74,
+ 75, 46, 46, 6, 1, 8, 9, 12, 13, 14,
+ 18, 19, 21, 22, 24, 27, 44, 45, 47, 48,
+ 80, 82, 84, 90, 93, 110, 80, 80, 1, 8,
+ 9, 18, 47, 79, 81, 84, 11, 20, 58, 60,
+ 80, 61, 65, 68, 9, 15, 57, 67, 66, 63,
+ 107, 17, 82, 104, 8, 56, 56, 56, 110, 92,
+ 91, 44, 110, 87, 9, 18, 76, 85, 86, 9,
+ 9, 9, 18, 76, 1, 11, 59, 9, 9, 15,
+ 80, 80, 15, 62, 56, 80, 80, 10, 77, 82,
+ 16, 32, 33, 36, 37, 38, 39, 44, 48, 97,
+ 98, 110, 76, 75, 105, 102, 29, 29, 1, 8,
+ 9, 18, 47, 88, 89, 97, 47, 83, 84, 47,
+ 88, 88, 83, 9, 47, 61, 78, 18, 76, 18,
+ 6, 41, 6, 17, 8, 47, 9, 57, 108, 48,
+ 110, 48, 110, 47, 96, 97, 56
};
#define yyerrok (yyerrstatus = 0)
@@ -970,18 +944,9 @@ static const yytype_uint8 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
+ Once GCC version 2 has supplanted version 1, this can go. */
#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -1038,7 +1003,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -1155,20 +1120,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, ttlp_arg, yyscanner)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -1204,11 +1166,11 @@ yy_reduce_print (yyvsp, yyrule, ttlp_arg, yyscanner)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
, ttlp_arg, yyscanner);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -1492,8 +1454,10 @@ yydestruct (yymsg, yytype, yyvaluep, ttlp_arg, yyscanner)
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1512,9 +1476,10 @@ int yyparse ();
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1539,46 +1504,22 @@ yyparse (ttlp_arg, yyscanner)
#endif
#endif
{
-/* The lookahead symbol. */
+ /* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
- /* Number of syntax errors so far. */
- int yynerrs;
-
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
+/* Number of syntax errors so far. */
+int yynerrs;
+ int yystate;
int yyn;
int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Look-ahead token as an internal (translated) token number. */
+ int yytoken = 0;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
@@ -1586,28 +1527,51 @@ YYSTYPE yylval;
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss = yyssa;
+ yytype_int16 *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
+
+
+
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ YYSIZE_T yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
+
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
+
yyssp = yyss;
yyvsp = yyvs;
@@ -1637,6 +1601,7 @@ YYSTYPE yylval;
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
+
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -1644,6 +1609,7 @@ YYSTYPE yylval;
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -1666,8 +1632,9 @@ YYSTYPE yylval;
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1678,6 +1645,7 @@ YYSTYPE yylval;
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1687,9 +1655,6 @@ YYSTYPE yylval;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
- if (yystate == YYFINAL)
- YYACCEPT;
-
goto yybackup;
/*-----------.
@@ -1698,16 +1663,16 @@ YYSTYPE yylval;
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
+ look-ahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1739,16 +1704,20 @@ yybackup:
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1788,430 +1757,313 @@ yyreduce:
switch (yyn)
{
case 4:
-
-/* Line 1464 of yacc.c */
#line 157 "./turtle_p.y"
{ ttlp_arg->ttlp_special_qnames = ~0; }
break;
- case 8:
-
-/* Line 1464 of yacc.c */
-#line 160 "./turtle_p.y"
- { dk_free_tree (ttlp_arg->ttlp_subj_uri);
- ttlp_arg->ttlp_subj_uri = ttlp_arg->ttlp_last_complete_uri;
- ttlp_arg->ttlp_last_complete_uri = NULL; }
- break;
-
- case 11:
-
-/* Line 1464 of yacc.c */
-#line 165 "./turtle_p.y"
- {
- triple_feed_t *tf = ttlp_arg->ttlp_tf;
- ttlp_enter_trig_group (ttlp_arg);
- TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
+ case 6:
+#line 158 "./turtle_p.y"
+ { TF_CHANGE_BASE_AND_DEFAULT_GRAPH(ttlp_arg->ttlp_tf,(yyvsp[(2) - (3)].box)); }
break;
- case 12:
-
-/* Line 1464 of yacc.c */
-#line 169 "./turtle_p.y"
+ case 7:
+#line 159 "./turtle_p.y"
{
- ttlp_leave_trig_group (ttlp_arg); }
- break;
-
- case 13:
-
-/* Line 1464 of yacc.c */
-#line 171 "./turtle_p.y"
- { ttlyyerror_action ("Only a triple or a special clause (like prefix declaration) is allowed here"); }
- break;
-
- case 14:
-
-/* Line 1464 of yacc.c */
-#line 175 "./turtle_p.y"
- {
- if (ttlp_arg->ttlp_base_uri != ttlp_arg->ttlp_base_uri_saved)
- dk_free_box (ttlp_arg->ttlp_base_uri);
- ttlp_arg->ttlp_base_uri = (yyvsp[(2) - (2)].box);
- TF_CHANGE_BASE_AND_DEFAULT_GRAPH(ttlp_arg->ttlp_tf, box_copy ((yyvsp[(2) - (2)].box))); }
- break;
-
- case 15:
-
-/* Line 1464 of yacc.c */
-#line 183 "./turtle_p.y"
- {
- id_hash_t **local_hash_ptr = (ttlp_arg->ttlp_in_trig_graph ?
- &(ttlp_arg->ttlp_inner_namespaces_prefix2iri) :
- &(ttlp_arg->ttlp_namespaces_prefix2iri) );
caddr_t *old_uri_ptr;
- if (NULL != local_hash_ptr[0])
- old_uri_ptr = (caddr_t *)id_hash_get (local_hash_ptr[0], (caddr_t)(&((yyvsp[(2) - (3)].box))));
+ if (NULL != ttlp_arg->ttlp_namespaces_prefix2iri)
+ old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, &((yyvsp[(2) - (4)].box)));
else
{
- local_hash_ptr[0] = (id_hash_t *)box_dv_dict_hashtable (31);
+ ttlp_arg->ttlp_namespaces_prefix2iri = (id_hash_t *)box_dv_dict_hashtable (31);
old_uri_ptr = NULL;
}
if (NULL != old_uri_ptr)
{
- int err = strcmp (old_uri_ptr[0], (yyvsp[(3) - (3)].box));
- dk_free_box ((yyvsp[(2) - (3)].box));
- dk_free_box ((yyvsp[(3) - (3)].box));
+ int err = strcmp (old_uri_ptr[0], (yyvsp[(3) - (4)].box));
+ dk_free_box ((yyvsp[(2) - (4)].box));
+ dk_free_box ((yyvsp[(3) - (4)].box));
if (err)
ttlyyerror_action ("Namespace prefix is re-used for a different namespace IRI");
}
else
- id_hash_set (local_hash_ptr[0], (caddr_t)(&((yyvsp[(2) - (3)].box))), (caddr_t)(&((yyvsp[(3) - (3)].box)))); }
+ id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, &((yyvsp[(2) - (4)].box)), &((yyvsp[(3) - (4)].box))); }
+ break;
+
+ case 8:
+#line 178 "./turtle_p.y"
+ {
+ dk_free_box (ttlp_arg->ttlp_default_ns_uri);
+ ttlp_arg->ttlp_default_ns_uri = (yyvsp[(3) - (4)].box); }
+ break;
+
+ case 9:
+#line 181 "./turtle_p.y"
+ { dk_free_tree (ttlp_arg->ttlp_subj_uri);
+ ttlp_arg->ttlp_subj_uri = ttlp_arg->ttlp_last_complete_uri;
+ ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 16:
+ case 12:
+#line 186 "./turtle_p.y"
+ {
+ triple_feed_t *tf = ttlp_arg->ttlp_tf;
+ TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
+ break;
-/* Line 1464 of yacc.c */
-#line 205 "./turtle_p.y"
+ case 13:
+#line 189 "./turtle_p.y"
{
- if (ttlp_arg->ttlp_default_ns_uri != ttlp_arg->ttlp_default_ns_uri_saved)
- dk_free_box (ttlp_arg->ttlp_default_ns_uri);
- ttlp_arg->ttlp_default_ns_uri = (yyvsp[(3) - (3)].box); }
+ triple_feed_t *tf = ttlp_arg->ttlp_tf; }
break;
- case 22:
+ case 14:
+#line 192 "./turtle_p.y"
+ { ttlyyerror_action ("Only a triple or a special clause (like prefix declaration) is allowed here"); }
+ break;
-/* Line 1464 of yacc.c */
-#line 224 "./turtle_p.y"
+ case 20:
+#line 207 "./turtle_p.y"
{
triple_feed_t *tf = ttlp_arg->ttlp_tf;
TTLYYERROR_ACTION_COND (TTLP_ALLOW_TRIG, "Left curly brace can appear here only if the source text is TriG");
- ttlp_enter_trig_group (ttlp_arg);
- TF_CHANGE_GRAPH (tf, ttlp_arg->ttlp_subj_uri); }
+ TF_CHANGE_GRAPH (tf, ttlp_arg->ttlp_subj_uri); }
break;
- case 23:
-
-/* Line 1464 of yacc.c */
-#line 229 "./turtle_p.y"
+ case 21:
+#line 211 "./turtle_p.y"
{
triple_feed_t *tf = ttlp_arg->ttlp_tf;
- ttlp_leave_trig_group (ttlp_arg);
TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
break;
- case 26:
-
-/* Line 1464 of yacc.c */
-#line 238 "./turtle_p.y"
+ case 24:
+#line 219 "./turtle_p.y"
{ ttlyyerror_action ("No '{' after an equality sign in TriG"); }
break;
- case 34:
-
-/* Line 1464 of yacc.c */
-#line 258 "./turtle_p.y"
+ case 27:
+#line 228 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = ttlp_arg->ttlp_last_complete_uri;
ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 37:
-
-/* Line 1464 of yacc.c */
-#line 266 "./turtle_p.y"
+ case 30:
+#line 236 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
- case 39:
-
-/* Line 1464 of yacc.c */
-#line 269 "./turtle_p.y"
+ case 32:
+#line 239 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
- case 41:
-
-/* Line 1464 of yacc.c */
-#line 272 "./turtle_p.y"
+ case 34:
+#line 242 "./turtle_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_SKIP_LITERAL_SUBJECTS, "Virtuoso does not support literal subjects");
dk_free_tree (ttlp_arg->ttlp_subj_uri); ttlp_arg->ttlp_subj_uri = NULL; }
break;
- case 43:
-
-/* Line 1464 of yacc.c */
-#line 276 "./turtle_p.y"
+ case 36:
+#line 246 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = NULL; }
break;
- case 46:
-
-/* Line 1464 of yacc.c */
-#line 283 "./turtle_p.y"
+ case 39:
+#line 253 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
- case 48:
-
-/* Line 1464 of yacc.c */
-#line 286 "./turtle_p.y"
+ case 41:
+#line 256 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = (yyvsp[(1) - (1)].box); }
break;
- case 50:
-
-/* Line 1464 of yacc.c */
-#line 289 "./turtle_p.y"
+ case 43:
+#line 259 "./turtle_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_SKIP_LITERAL_SUBJECTS, "Virtuoso does not support literal subjects");
dk_free_tree (ttlp_arg->ttlp_subj_uri); ttlp_arg->ttlp_subj_uri = NULL; }
break;
- case 52:
-
-/* Line 1464 of yacc.c */
-#line 293 "./turtle_p.y"
+ case 45:
+#line 263 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = NULL; }
break;
- case 55:
-
-/* Line 1464 of yacc.c */
-#line 300 "./turtle_p.y"
+ case 48:
+#line 270 "./turtle_p.y"
{ ttlp_arg->ttlp_special_qnames &= ~((yyvsp[(1) - (1)].token_type)); }
break;
- case 56:
-
-/* Line 1464 of yacc.c */
-#line 301 "./turtle_p.y"
+ case 49:
+#line 271 "./turtle_p.y"
{ ttlp_arg->ttlp_special_qnames &= ~((yyvsp[(3) - (3)].token_type)); }
break;
- case 57:
-
-/* Line 1464 of yacc.c */
-#line 305 "./turtle_p.y"
+ case 50:
+#line 275 "./turtle_p.y"
{ (yyval.token_type) = ttlp_bit_of_special_qname ((yyvsp[(1) - (1)].box)); }
break;
- case 58:
-
-/* Line 1464 of yacc.c */
-#line 306 "./turtle_p.y"
+ case 51:
+#line 276 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_A; }
break;
- case 59:
-
-/* Line 1464 of yacc.c */
-#line 307 "./turtle_p.y"
+ case 52:
+#line 277 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_HAS; }
break;
- case 60:
-
-/* Line 1464 of yacc.c */
-#line 308 "./turtle_p.y"
+ case 53:
+#line 278 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_IS; }
break;
- case 61:
-
-/* Line 1464 of yacc.c */
-#line 309 "./turtle_p.y"
+ case 54:
+#line 279 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_OF; }
break;
- case 62:
-
-/* Line 1464 of yacc.c */
-#line 310 "./turtle_p.y"
+ case 55:
+#line 280 "./turtle_p.y"
{ (yyval.token_type) = TTLP_ALLOW_QNAME_THIS; }
break;
- case 66:
-
-/* Line 1464 of yacc.c */
-#line 321 "./turtle_p.y"
+ case 59:
+#line 291 "./turtle_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Sequence blank node (written as '{...}' formula) can not be used as a predicate"); }
break;
- case 70:
-
-/* Line 1464 of yacc.c */
-#line 329 "./turtle_p.y"
+ case 63:
+#line 299 "./turtle_p.y"
{ TTLYYERROR_ACTION_COND (TTLP_ACCEPT_DIRTY_SYNTAX, "Missing predicate and object between top-level blank node subject and a dot"); }
break;
- case 77:
-
-/* Line 1464 of yacc.c */
-#line 342 "./turtle_p.y"
+ case 70:
+#line 312 "./turtle_p.y"
{ ttlyyerror_action ("Missing object between top-level blank node and a comma"); }
break;
- case 78:
-
-/* Line 1464 of yacc.c */
-#line 343 "./turtle_p.y"
+ case 71:
+#line 313 "./turtle_p.y"
{ ttlyyerror_action ("Missing predicate and object between top-level blank node and a semicolon"); }
break;
- case 79:
-
-/* Line 1464 of yacc.c */
-#line 344 "./turtle_p.y"
+ case 72:
+#line 314 "./turtle_p.y"
{ ttlyyerror_action ("Predicate expected after top-level blank node"); }
break;
- case 82:
-
-/* Line 1464 of yacc.c */
-#line 350 "./turtle_p.y"
+ case 75:
+#line 320 "./turtle_p.y"
{ ttlyyerror_action ("Missing object before comma"); }
break;
- case 83:
-
-/* Line 1464 of yacc.c */
-#line 351 "./turtle_p.y"
+ case 76:
+#line 321 "./turtle_p.y"
{ ttlyyerror_action ("Missing predicate and object before semicolon"); }
break;
- case 84:
-
-/* Line 1464 of yacc.c */
-#line 352 "./turtle_p.y"
+ case 77:
+#line 322 "./turtle_p.y"
{ ttlyyerror_action ("Missing predicate and object before dot"); }
break;
- case 85:
-
-/* Line 1464 of yacc.c */
-#line 353 "./turtle_p.y"
+ case 78:
+#line 323 "./turtle_p.y"
{ ttlyyerror_action ("Predicate expected"); }
break;
- case 89:
-
-/* Line 1464 of yacc.c */
-#line 364 "./turtle_p.y"
+ case 82:
+#line 334 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = (yyvsp[(1) - (1)].box); }
break;
- case 91:
-
-/* Line 1464 of yacc.c */
-#line 367 "./turtle_p.y"
+ case 84:
+#line 337 "./turtle_p.y"
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = (yyvsp[(1) - (1)].box);
ttlp_arg->ttlp_pred_is_reverse = 1; }
break;
- case 92:
-
-/* Line 1464 of yacc.c */
-#line 369 "./turtle_p.y"
+ case 85:
+#line 339 "./turtle_p.y"
{ ttlp_arg->ttlp_pred_is_reverse = 0; }
break;
- case 93:
-
-/* Line 1464 of yacc.c */
-#line 370 "./turtle_p.y"
+ case 86:
+#line 340 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_uri = NULL; }
break;
- case 97:
-
-/* Line 1464 of yacc.c */
-#line 382 "./turtle_p.y"
+ case 90:
+#line 352 "./turtle_p.y"
{; /* triple is made by object */ }
break;
- case 98:
-
-/* Line 1464 of yacc.c */
-#line 383 "./turtle_p.y"
+ case 91:
+#line 353 "./turtle_p.y"
{; /* triple is made by object */ }
break;
- case 99:
-
-/* Line 1464 of yacc.c */
-#line 384 "./turtle_p.y"
+ case 92:
+#line 354 "./turtle_p.y"
{ ttlyyerror_action ("Missing object before comma"); }
break;
- case 100:
-
-/* Line 1464 of yacc.c */
-#line 385 "./turtle_p.y"
+ case 93:
+#line 355 "./turtle_p.y"
{ ttlyyerror_action ("Missing object before semicolon"); }
break;
- case 101:
-
-/* Line 1464 of yacc.c */
-#line 386 "./turtle_p.y"
+ case 94:
+#line 356 "./turtle_p.y"
{ ttlyyerror_action ("Missing object before dot"); }
break;
- case 102:
-
-/* Line 1464 of yacc.c */
-#line 387 "./turtle_p.y"
+ case 95:
+#line 357 "./turtle_p.y"
{ ttlyyerror_action ("Object expected"); }
break;
- case 103:
-
-/* Line 1464 of yacc.c */
-#line 391 "./turtle_p.y"
+ case 96:
+#line 361 "./turtle_p.y"
{ (yyval.box) = ttlp_arg->ttlp_last_complete_uri; ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 104:
-
-/* Line 1464 of yacc.c */
-#line 392 "./turtle_p.y"
+ case 97:
+#line 362 "./turtle_p.y"
{ (yyval.box) = (yyvsp[(1) - (1)].box); }
break;
- case 105:
-
-/* Line 1464 of yacc.c */
-#line 393 "./turtle_p.y"
+ case 98:
+#line 363 "./turtle_p.y"
{ (yyval.box) = uname_rdf_ns_uri_type; }
break;
- case 106:
-
-/* Line 1464 of yacc.c */
-#line 394 "./turtle_p.y"
+ case 99:
+#line 364 "./turtle_p.y"
{ (yyval.box) = box_dv_uname_string ("http://www.w3.org/2002/07/owl#sameAs"); }
break;
- case 107:
-
-/* Line 1464 of yacc.c */
-#line 395 "./turtle_p.y"
+ case 100:
+#line 365 "./turtle_p.y"
{ (yyval.box) = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); }
break;
- case 108:
-
-/* Line 1464 of yacc.c */
-#line 397 "./turtle_p.y"
+ case 101:
+#line 367 "./turtle_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '[]') can not be used as a predicate");
(yyval.box) = tf_bnode_iid (ttlp_arg->ttlp_tf, NULL);
@@ -2220,25 +2072,21 @@ yyreduce:
}
break;
- case 109:
-
-/* Line 1464 of yacc.c */
-#line 404 "./turtle_p.y"
+ case 102:
+#line 374 "./turtle_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '_:...' label) can not be used as a predicate");
- if (ttlp_arg->ttlp_formula_iid)
+ if (ttlp_arg->ttlp_formula_iid)
(yyval.box) = tf_formula_bnode_iid (ttlp_arg, (yyvsp[(1) - (1)].box));
- else
+ else
(yyval.box) = tf_bnode_iid (ttlp_arg->ttlp_tf, (yyvsp[(1) - (1)].box));
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
ttlp_triples_for_bnodes_debug (ttlp_arg, (yyval.box), ttlp_arg->ttlp_lexlineno, (yyvsp[(1) - (1)].box));
}
break;
- case 110:
-
-/* Line 1464 of yacc.c */
-#line 414 "./turtle_p.y"
+ case 103:
+#line 384 "./turtle_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '[...]' block) can not be used as a predicate");
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2246,10 +2094,8 @@ yyreduce:
}
break;
- case 111:
-
-/* Line 1464 of yacc.c */
-#line 420 "./turtle_p.y"
+ case 104:
+#line 390 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2257,10 +2103,8 @@ yyreduce:
}
break;
- case 112:
-
-/* Line 1464 of yacc.c */
-#line 426 "./turtle_p.y"
+ case 105:
+#line 396 "./turtle_p.y"
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Sequence blank node (written as list in parenthesis) can not be used as a predicate");
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2268,10 +2112,8 @@ yyreduce:
}
break;
- case 113:
-
-/* Line 1464 of yacc.c */
-#line 432 "./turtle_p.y"
+ case 106:
+#line 402 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2279,82 +2121,60 @@ yyreduce:
}
break;
- case 114:
-
-/* Line 1464 of yacc.c */
-#line 440 "./turtle_p.y"
+ case 107:
+#line 410 "./turtle_p.y"
{ (yyval.box) = ttlp_arg->ttlp_last_complete_uri; ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 115:
-
-/* Line 1464 of yacc.c */
-#line 441 "./turtle_p.y"
+ case 108:
+#line 411 "./turtle_p.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
- case 116:
-
-/* Line 1464 of yacc.c */
-#line 442 "./turtle_p.y"
+ case 109:
+#line 412 "./turtle_p.y"
{ (yyval.box) = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); /* Note this 'double reversed' meaning :) */ }
break;
- case 119:
-
-/* Line 1464 of yacc.c */
-#line 448 "./turtle_p.y"
+ case 112:
+#line 418 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 120:
-
-/* Line 1464 of yacc.c */
-#line 449 "./turtle_p.y"
+ case 113:
+#line 419 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 121:
-
-/* Line 1464 of yacc.c */
-#line 450 "./turtle_p.y"
+ case 114:
+#line 420 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 122:
-
-/* Line 1464 of yacc.c */
-#line 451 "./turtle_p.y"
+ case 115:
+#line 421 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 123:
-
-/* Line 1464 of yacc.c */
-#line 452 "./turtle_p.y"
+ case 116:
+#line 422 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (2)].box)); dk_free_tree ((yyvsp[(2) - (2)].box)); }
break;
- case 124:
-
-/* Line 1464 of yacc.c */
-#line 453 "./turtle_p.y"
+ case 117:
+#line 423 "./turtle_p.y"
{ dk_free_tree ((yyvsp[(1) - (1)].box)); }
break;
- case 125:
-
-/* Line 1464 of yacc.c */
-#line 453 "./turtle_p.y"
+ case 118:
+#line 423 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 128:
-
-/* Line 1464 of yacc.c */
-#line 464 "./turtle_p.y"
+ case 121:
+#line 434 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = ttlp_arg->ttlp_last_complete_uri;
@@ -2362,86 +2182,68 @@ yyreduce:
ttlp_triple_and_inf (ttlp_arg, ttlp_arg->ttlp_obj); }
break;
- case 129:
-
-/* Line 1464 of yacc.c */
-#line 469 "./turtle_p.y"
+ case 122:
+#line 439 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (1)].box);
ttlp_triple_and_inf (ttlp_arg, (yyvsp[(1) - (1)].box)); }
break;
- case 130:
-
-/* Line 1464 of yacc.c */
-#line 473 "./turtle_p.y"
+ case 123:
+#line 443 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (1)].box);
ttlp_triple_and_inf (ttlp_arg, (yyvsp[(1) - (1)].box)); }
break;
- case 131:
-
-/* Line 1464 of yacc.c */
-#line 477 "./turtle_p.y"
+ case 124:
+#line 447 "./turtle_p.y"
{
ttlp_triple_l_and_inf (ttlp_arg, (caddr_t)((ptrlong)1), uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
- case 132:
-
-/* Line 1464 of yacc.c */
-#line 479 "./turtle_p.y"
+ case 125:
+#line 449 "./turtle_p.y"
{
ttlp_triple_l_and_inf (ttlp_arg, (caddr_t)((ptrlong)0), uname_xmlschema_ns_uri_hash_boolean, NULL); }
break;
- case 133:
-
-/* Line 1464 of yacc.c */
-#line 481 "./turtle_p.y"
+ case 126:
+#line 451 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (1)].box);
ttlp_triple_l_and_inf (ttlp_arg, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_integer, NULL); }
break;
- case 134:
-
-/* Line 1464 of yacc.c */
-#line 485 "./turtle_p.y"
+ case 127:
+#line 455 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (1)].box);
ttlp_triple_l_and_inf (ttlp_arg, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_decimal, NULL); }
break;
- case 135:
-
-/* Line 1464 of yacc.c */
-#line 489 "./turtle_p.y"
+ case 128:
+#line 459 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (1)].box);
ttlp_triple_l_and_inf (ttlp_arg, (yyvsp[(1) - (1)].box), uname_xmlschema_ns_uri_hash_double, NULL); }
break;
- case 136:
-
-/* Line 1464 of yacc.c */
-#line 493 "./turtle_p.y"
+ case 129:
+#line 463 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (1)].box);
ttlp_triple_l_and_inf (ttlp_arg, (yyvsp[(1) - (1)].box), NULL, NULL); }
break;
- case 137:
-
-/* Line 1464 of yacc.c */
-#line 497 "./turtle_p.y"
+ case 130:
+#line 467 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (2)].box);
@@ -2450,10 +2252,8 @@ yyreduce:
ttlp_triple_l_and_inf (ttlp_arg, (yyvsp[(1) - (2)].box), NULL, (yyvsp[(2) - (2)].box)); }
break;
- case 138:
-
-/* Line 1464 of yacc.c */
-#line 503 "./turtle_p.y"
+ case 131:
+#line 473 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (3)].box);
@@ -2463,56 +2263,44 @@ yyreduce:
ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, ttlp_arg->ttlp_obj_type, NULL); }
break;
- case 139:
-
-/* Line 1464 of yacc.c */
-#line 510 "./turtle_p.y"
+ case 132:
+#line 480 "./turtle_p.y"
{ }
break;
- case 140:
-
-/* Line 1464 of yacc.c */
-#line 511 "./turtle_p.y"
+ case 133:
+#line 481 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = (yyvsp[(1) - (3)].box); }
break;
- case 141:
-
-/* Line 1464 of yacc.c */
-#line 514 "./turtle_p.y"
+ case 134:
+#line 484 "./turtle_p.y"
{
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
ttlp_arg->ttlp_last_complete_uri = NULL; }
break;
- case 142:
-
-/* Line 1464 of yacc.c */
-#line 517 "./turtle_p.y"
+ case 135:
+#line 487 "./turtle_p.y"
{ }
break;
- case 143:
-
-/* Line 1464 of yacc.c */
-#line 522 "./turtle_p.y"
+ case 136:
+#line 492 "./turtle_p.y"
{
- if (ttlp_arg->ttlp_formula_iid)
+ if (ttlp_arg->ttlp_formula_iid)
(yyval.box) = tf_formula_bnode_iid (ttlp_arg, (yyvsp[(1) - (1)].box));
- else
+ else
(yyval.box) = tf_bnode_iid (ttlp_arg->ttlp_tf, (yyvsp[(1) - (1)].box));
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
ttlp_triples_for_bnodes_debug (ttlp_arg, (yyval.box), ttlp_arg->ttlp_lexlineno, (yyvsp[(1) - (1)].box));
}
break;
- case 144:
-
-/* Line 1464 of yacc.c */
-#line 531 "./turtle_p.y"
+ case 137:
+#line 501 "./turtle_p.y"
{
(yyval.box) = tf_bnode_iid (ttlp_arg->ttlp_tf, NULL);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2520,20 +2308,16 @@ yyreduce:
}
break;
- case 145:
-
-/* Line 1464 of yacc.c */
-#line 537 "./turtle_p.y"
+ case 138:
+#line 507 "./turtle_p.y"
{
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
(yyval.lexlineno) = ttlp_arg->ttlp_lexlineno;
}
break;
- case 146:
-
-/* Line 1464 of yacc.c */
-#line 542 "./turtle_p.y"
+ case 139:
+#line 512 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2541,20 +2325,16 @@ yyreduce:
}
break;
- case 147:
-
-/* Line 1464 of yacc.c */
-#line 548 "./turtle_p.y"
+ case 140:
+#line 518 "./turtle_p.y"
{
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
(yyval.lexlineno) = ttlp_arg->ttlp_lexlineno;
}
break;
- case 148:
-
-/* Line 1464 of yacc.c */
-#line 553 "./turtle_p.y"
+ case 141:
+#line 523 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2562,20 +2342,16 @@ yyreduce:
}
break;
- case 149:
-
-/* Line 1464 of yacc.c */
-#line 559 "./turtle_p.y"
+ case 142:
+#line 529 "./turtle_p.y"
{
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
(yyval.lexlineno) = ttlp_arg->ttlp_lexlineno;
}
break;
- case 150:
-
-/* Line 1464 of yacc.c */
-#line 564 "./turtle_p.y"
+ case 143:
+#line 534 "./turtle_p.y"
{
(yyval.box) = (yyvsp[(3) - (3)].box);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -2583,51 +2359,41 @@ yyreduce:
}
break;
- case 151:
-
-/* Line 1464 of yacc.c */
-#line 573 "./turtle_p.y"
+ case 144:
+#line 543 "./turtle_p.y"
{ dk_set_push (&(ttlp_arg->ttlp_saved_uris), (void *)(ptrlong)ttlp_arg->ttlp_pred_is_reverse);
- dk_set_push (&(ttlp_arg->ttlp_saved_uris), ttlp_arg->ttlp_subj_uri);
+ dk_set_push (&(ttlp_arg->ttlp_saved_uris), ttlp_arg->ttlp_subj_uri);
dk_set_push (&(ttlp_arg->ttlp_saved_uris), ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_is_reverse = 0;
ttlp_arg->ttlp_subj_uri = tf_bnode_iid (ttlp_arg->ttlp_tf, NULL);
ttlp_arg->ttlp_pred_uri = NULL; }
break;
- case 152:
-
-/* Line 1464 of yacc.c */
-#line 579 "./turtle_p.y"
+ case 145:
+#line 549 "./turtle_p.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
- case 153:
-
-/* Line 1464 of yacc.c */
-#line 584 "./turtle_p.y"
+ case 146:
+#line 554 "./turtle_p.y"
{ (yyval.box) = ttlp_arg->ttlp_subj_uri;
dk_free_tree (ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
ttlp_arg->ttlp_subj_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
- ttlp_arg->ttlp_pred_is_reverse = (ptrlong)dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
+ ttlp_arg->ttlp_pred_is_reverse = (ptrlong)dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
break;
- case 154:
-
-/* Line 1464 of yacc.c */
-#line 590 "./turtle_p.y"
+ case 147:
+#line 560 "./turtle_p.y"
{ (yyval.box) = ttlp_arg->ttlp_subj_uri;
dk_free_tree (ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
ttlp_arg->ttlp_subj_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
- ttlp_arg->ttlp_pred_is_reverse = (ptrlong)dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
+ ttlp_arg->ttlp_pred_is_reverse = (ptrlong)dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
break;
- case 155:
-
-/* Line 1464 of yacc.c */
-#line 598 "./turtle_p.y"
+ case 148:
+#line 568 "./turtle_p.y"
{
dk_set_push (&(ttlp_arg->ttlp_saved_uris), (void *)(ptrlong)(ttlp_arg->ttlp_pred_is_reverse));
dk_set_push (&(ttlp_arg->ttlp_saved_uris), ttlp_arg->ttlp_subj_uri);
@@ -2642,10 +2408,8 @@ yyreduce:
ttlp_arg->ttlp_pred_uri = uname_rdf_ns_uri_first; }
break;
- case 156:
-
-/* Line 1464 of yacc.c */
-#line 610 "./turtle_p.y"
+ case 149:
+#line 580 "./turtle_p.y"
{
caddr_t first_node;
dk_set_push (&(ttlp_arg->ttlp_unused_seq_bnodes), ttlp_arg->ttlp_subj_uri);
@@ -2667,17 +2431,13 @@ yyreduce:
(yyval.box) = first_node; }
break;
- case 157:
-
-/* Line 1464 of yacc.c */
-#line 632 "./turtle_p.y"
+ case 150:
+#line 602 "./turtle_p.y"
{}
break;
- case 158:
-
-/* Line 1464 of yacc.c */
-#line 633 "./turtle_p.y"
+ case 151:
+#line 603 "./turtle_p.y"
{
caddr_t last_node = ttlp_arg->ttlp_subj_uri;
ttlp_arg->ttlp_subj_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
@@ -2695,10 +2455,8 @@ yyreduce:
ttlp_arg->ttlp_pred_uri = uname_rdf_ns_uri_first; }
break;
- case 159:
-
-/* Line 1464 of yacc.c */
-#line 652 "./turtle_p.y"
+ case 152:
+#line 622 "./turtle_p.y"
{
dk_set_push (&(ttlp_arg->ttlp_saved_uris), ttlp_arg->ttlp_formula_iid);
dk_set_push (&(ttlp_arg->ttlp_saved_uris), (void *)(ptrlong)ttlp_arg->ttlp_pred_is_reverse);
@@ -2710,10 +2468,8 @@ yyreduce:
ttlp_arg->ttlp_pred_uri = NULL; }
break;
- case 160:
-
-/* Line 1464 of yacc.c */
-#line 662 "./turtle_p.y"
+ case 153:
+#line 632 "./turtle_p.y"
{ (yyval.box) = ttlp_arg->ttlp_formula_iid;
dk_free_tree (ttlp_arg->ttlp_subj_uri);
dk_free_tree (ttlp_arg->ttlp_pred_uri);
@@ -2723,24 +2479,20 @@ yyreduce:
ttlp_arg->ttlp_formula_iid = dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
break;
- case 161:
-
-/* Line 1464 of yacc.c */
-#line 673 "./turtle_p.y"
+ case 154:
+#line 643 "./turtle_p.y"
{
- if (NULL != ttlp_arg->ttlp_last_complete_uri)
+ if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
ttlp_arg->ttlp_last_complete_uri = (yyvsp[(1) - (1)].box);
TTLP_URI_RESOLVE_IF_NEEDED(ttlp_arg->ttlp_last_complete_uri);
}
break;
- case 162:
-
-/* Line 1464 of yacc.c */
-#line 680 "./turtle_p.y"
+ case 155:
+#line 650 "./turtle_p.y"
{
- if (NULL != ttlp_arg->ttlp_last_complete_uri)
+ if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
ttlp_arg->ttlp_last_complete_uri = (yyvsp[(1) - (1)].box);
ttlp_arg->ttlp_last_complete_uri = ttlp_expand_qname_prefix (ttlp_arg, ttlp_arg->ttlp_last_complete_uri);
@@ -2748,12 +2500,10 @@ yyreduce:
}
break;
- case 163:
-
-/* Line 1464 of yacc.c */
-#line 688 "./turtle_p.y"
+ case 156:
+#line 658 "./turtle_p.y"
{
- if (NULL != ttlp_arg->ttlp_last_complete_uri)
+ if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
ttlp_arg->ttlp_last_complete_uri = (yyvsp[(1) - (1)].box);
ttlp_arg->ttlp_last_complete_uri = ttlp_expand_qname_prefix (ttlp_arg, ttlp_arg->ttlp_last_complete_uri);
@@ -2762,9 +2512,8 @@ yyreduce:
break;
-
-/* Line 1464 of yacc.c */
-#line 2768 "turtle_p.c"
+/* Line 1267 of yacc.c. */
+#line 2517 "turtle_p.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2775,6 +2524,7 @@ yyreduce:
*++yyvsp = yyval;
+
/* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -2839,7 +2589,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -2856,7 +2606,7 @@ yyerrlab:
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -2913,6 +2663,9 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -2937,7 +2690,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2948,7 +2701,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval, ttlp_arg, yyscanner);
/* Do not reclaim the symbols of the rule which action triggered
diff --git a/libsrc/Wi/turtle_p.h b/libsrc/Wi/turtle_p.h
index fb0252a..5bacf36 100644
--- a/libsrc/Wi/turtle_p.h
+++ b/libsrc/Wi/turtle_p.h
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,11 +29,10 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -141,26 +142,20 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
-
-/* Line 1685 of yacc.c */
#line 72 "./turtle_p.y"
-
+{
caddr_t box;
ptrlong token_type;
void *nothing;
ptrlong lexlineno;
-
-
-
-/* Line 1685 of yacc.c */
-#line 158 "turtle_p.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1489 of yacc.c. */
+#line 154 "turtle_p.h"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
-
diff --git a/libsrc/Wi/turtle_p.y b/libsrc/Wi/turtle_p.y
index 9a329d7..6cde88e 100644
--- a/libsrc/Wi/turtle_p.y
+++ b/libsrc/Wi/turtle_p.y
@@ -1,10 +1,10 @@
/*
- * $Id: turtle_p.y,v 1.17.2.15 2012/03/08 12:55:37 source Exp $
+ * $Id: turtle_p.y,v 1.17.2.11 2011/10/13 12:14:27 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
@@ -149,47 +149,20 @@ extern int ttlyylex (void *yylval_param, ttlp_t *ttlp_arg, yyscan_t yyscanner);
%%
turtledoc
- : /* empty */
+ : /* empty */
| turtledoc clause
;
clause
- : _AT_keywords_L { ttlp_arg->ttlp_special_qnames = ~0; } keyword_list dot_opt
- | base_clause dot_opt
- | prefix_clause dot_opt
- | q_complete { dk_free_tree (ttlp_arg->ttlp_subj_uri);
- ttlp_arg->ttlp_subj_uri = ttlp_arg->ttlp_last_complete_uri;
- ttlp_arg->ttlp_last_complete_uri = NULL; }
- trig_block_or_predicate_object_list
- | top_triple_clause_with_nonq_subj
- | _LBRA_TOP_TRIG {
- triple_feed_t *tf = ttlp_arg->ttlp_tf;
- ttlp_enter_trig_group (ttlp_arg);
- TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
- base_or_prefix_or_inner_triple_clauses trig_group_end dot_opt {
- ttlp_leave_trig_group (ttlp_arg); }
- | error { ttlyyerror_action ("Only a triple or a special clause (like prefix declaration) is allowed here"); }
- ;
-
-base_clause
- : _AT_base_L Q_IRI_REF {
- if (ttlp_arg->ttlp_base_uri != ttlp_arg->ttlp_base_uri_saved)
- dk_free_box (ttlp_arg->ttlp_base_uri);
- ttlp_arg->ttlp_base_uri = $2;
- TF_CHANGE_BASE_AND_DEFAULT_GRAPH(ttlp_arg->ttlp_tf, box_copy ($2)); }
- ;
-
-prefix_clause
- : _AT_prefix_L QNAME_NS Q_IRI_REF {
- id_hash_t **local_hash_ptr = (ttlp_arg->ttlp_in_trig_graph ?
- &(ttlp_arg->ttlp_inner_namespaces_prefix2iri) :
- &(ttlp_arg->ttlp_namespaces_prefix2iri) );
+ : _AT_keywords_L { ttlp_arg->ttlp_special_qnames = ~0; } keyword_list dot_opt
+ | _AT_base_L Q_IRI_REF dot_opt { TF_CHANGE_BASE_AND_DEFAULT_GRAPH(ttlp_arg->ttlp_tf,$2); }
+ | _AT_prefix_L QNAME_NS Q_IRI_REF dot_opt {
caddr_t *old_uri_ptr;
- if (NULL != local_hash_ptr[0])
- old_uri_ptr = (caddr_t *)id_hash_get (local_hash_ptr[0], (caddr_t)(&($2)));
+ if (NULL != ttlp_arg->ttlp_namespaces_prefix2iri)
+ old_uri_ptr = (caddr_t *)id_hash_get (ttlp_arg->ttlp_namespaces_prefix2iri, &($2));
else
{
- local_hash_ptr[0] = (id_hash_t *)box_dv_dict_hashtable (31);
+ ttlp_arg->ttlp_namespaces_prefix2iri = (id_hash_t *)box_dv_dict_hashtable (31);
old_uri_ptr = NULL;
}
if (NULL != old_uri_ptr)
@@ -201,13 +174,23 @@ prefix_clause
ttlyyerror_action ("Namespace prefix is re-used for a different namespace IRI");
}
else
- id_hash_set (local_hash_ptr[0], (caddr_t)(&($2)), (caddr_t)(&($3))); }
- | _AT_prefix_L _COLON Q_IRI_REF {
- if (ttlp_arg->ttlp_default_ns_uri != ttlp_arg->ttlp_default_ns_uri_saved)
- dk_free_box (ttlp_arg->ttlp_default_ns_uri);
+ id_hash_set (ttlp_arg->ttlp_namespaces_prefix2iri, &($2), &($3)); }
+ | _AT_prefix_L _COLON Q_IRI_REF dot_opt {
+ dk_free_box (ttlp_arg->ttlp_default_ns_uri);
ttlp_arg->ttlp_default_ns_uri = $3; }
- ;
+ | q_complete { dk_free_tree (ttlp_arg->ttlp_subj_uri);
+ ttlp_arg->ttlp_subj_uri = ttlp_arg->ttlp_last_complete_uri;
+ ttlp_arg->ttlp_last_complete_uri = NULL; }
+ trig_block_or_predicate_object_list
+ | top_triple_clause_with_nonq_subj
+ | _LBRA_TOP_TRIG {
+ triple_feed_t *tf = ttlp_arg->ttlp_tf;
+ TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
+ inner_triple_clauses trig_group_end dot_opt {
+ triple_feed_t *tf = ttlp_arg->ttlp_tf; }
+ | error { ttlyyerror_action ("Only a triple or a special clause (like prefix declaration) is allowed here"); }
+ ;
dot_opt
: /* empty */
@@ -224,11 +207,9 @@ trig_block_or_predicate_object_list
| opt_eq_lbra {
triple_feed_t *tf = ttlp_arg->ttlp_tf;
TTLYYERROR_ACTION_COND (TTLP_ALLOW_TRIG, "Left curly brace can appear here only if the source text is TriG");
- ttlp_enter_trig_group (ttlp_arg);
- TF_CHANGE_GRAPH (tf, ttlp_arg->ttlp_subj_uri); }
- base_or_prefix_or_inner_triple_clauses trig_group_end dot_opt {
+ TF_CHANGE_GRAPH (tf, ttlp_arg->ttlp_subj_uri); }
+ inner_triple_clauses trig_group_end dot_opt {
triple_feed_t *tf = ttlp_arg->ttlp_tf;
- ttlp_leave_trig_group (ttlp_arg);
TF_CHANGE_GRAPH_TO_DEFAULT (tf); }
;
@@ -238,17 +219,6 @@ opt_eq_lbra
| _EQ_TOP_TRIG error { ttlyyerror_action ("No '{' after an equality sign in TriG"); }
;
-base_or_prefix_or_inner_triple_clauses
- : base_or_prefix_or_inner_triple_clause
- | base_or_prefix_or_inner_triple_clauses _DOT_WS base_or_prefix_or_inner_triple_clause
- ;
-
-base_or_prefix_or_inner_triple_clause
- : base_clause
- | prefix_clause
- | inner_triple_clause
- ;
-
inner_triple_clauses
: inner_triple_clause
| inner_triple_clauses _DOT_WS inner_triple_clause
@@ -273,7 +243,7 @@ triple_clause_with_nonq_subj
TTLYYERROR_ACTION_COND (TTLP_SKIP_LITERAL_SUBJECTS, "Virtuoso does not support literal subjects");
dk_free_tree (ttlp_arg->ttlp_subj_uri); ttlp_arg->ttlp_subj_uri = NULL; }
predicate_object_list_or_garbage
- | TTL_RECOVERABLE_ERROR { dk_free_tree (ttlp_arg->ttlp_subj_uri);
+ | TTL_RECOVERABLE_ERROR { dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = NULL; }
predicate_object_list_or_garbage
| _GARBAGE_BEFORE_DOT_WS
@@ -290,7 +260,7 @@ top_triple_clause_with_nonq_subj
TTLYYERROR_ACTION_COND (TTLP_SKIP_LITERAL_SUBJECTS, "Virtuoso does not support literal subjects");
dk_free_tree (ttlp_arg->ttlp_subj_uri); ttlp_arg->ttlp_subj_uri = NULL; }
predicate_object_list_or_garbage _DOT_WS
- | TTL_RECOVERABLE_ERROR { dk_free_tree (ttlp_arg->ttlp_subj_uri);
+ | TTL_RECOVERABLE_ERROR { dk_free_tree (ttlp_arg->ttlp_subj_uri);
ttlp_arg->ttlp_subj_uri = NULL; }
predicate_object_list_or_garbage _DOT_WS
| _GARBAGE_BEFORE_DOT_WS _DOT_WS
@@ -313,11 +283,11 @@ keyword
semicolon_opt
: /*empty*/
| _SEMI
- ;
+ ;
inner_predicate_object_list
: predicate_object_list
- | _LBRA
+ | _LBRA
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Sequence blank node (written as '{...}' formula) can not be used as a predicate"); }
blank_block_formula
@@ -339,18 +309,18 @@ predicate_object_list_or_garbage
top_blank_predicate_object_list
: verb_and_object_list
| top_blank_predicate_object_list _SEMI verb_and_object_list_or_garbage
- | _COMMA { ttlyyerror_action ("Missing object between top-level blank node and a comma"); }
- | _SEMI { ttlyyerror_action ("Missing predicate and object between top-level blank node and a semicolon"); }
- | error { ttlyyerror_action ("Predicate expected after top-level blank node"); }
+ | _COMMA { ttlyyerror_action ("Missing object between top-level blank node and a comma"); }
+ | _SEMI { ttlyyerror_action ("Missing predicate and object between top-level blank node and a semicolon"); }
+ | error { ttlyyerror_action ("Predicate expected after top-level blank node"); }
;
predicate_object_list
: verb_and_object_list
| predicate_object_list _SEMI verb_and_object_list_or_garbage
- | _COMMA { ttlyyerror_action ("Missing object before comma"); }
- | _SEMI { ttlyyerror_action ("Missing predicate and object before semicolon"); }
- | _DOT_WS { ttlyyerror_action ("Missing predicate and object before dot"); }
- | error { ttlyyerror_action ("Predicate expected"); }
+ | _COMMA { ttlyyerror_action ("Missing object before comma"); }
+ | _SEMI { ttlyyerror_action ("Missing predicate and object before semicolon"); }
+ | _DOT_WS { ttlyyerror_action ("Missing predicate and object before dot"); }
+ | error { ttlyyerror_action ("Predicate expected"); }
;
verb_and_object_list_or_garbage
@@ -367,7 +337,7 @@ verb_and_object_list
{ dk_free_tree (ttlp_arg->ttlp_pred_uri); ttlp_arg->ttlp_pred_uri = $1;
ttlp_arg->ttlp_pred_is_reverse = 1; }
object_list_or_garbage { ttlp_arg->ttlp_pred_is_reverse = 0; }
- | TTL_RECOVERABLE_ERROR {
+ | TTL_RECOVERABLE_ERROR {
dk_free_tree (ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_uri = NULL; }
object_list_or_garbage
@@ -381,10 +351,10 @@ object_list_or_garbage
object_list
: object {; /* triple is made by object */ }
| object_list _COMMA object_or_garbage {; /* triple is made by object */ }
- | _COMMA { ttlyyerror_action ("Missing object before comma"); }
- | _SEMI { ttlyyerror_action ("Missing object before semicolon"); }
- | _DOT_WS { ttlyyerror_action ("Missing object before dot"); }
- | error { ttlyyerror_action ("Object expected"); }
+ | _COMMA { ttlyyerror_action ("Missing object before comma"); }
+ | _SEMI { ttlyyerror_action ("Missing object before semicolon"); }
+ | _DOT_WS { ttlyyerror_action ("Missing object before dot"); }
+ | error { ttlyyerror_action ("Object expected"); }
;
verb
@@ -392,7 +362,7 @@ verb
| VARIABLE { $$ = $1; }
| _AT_a_L { $$ = uname_rdf_ns_uri_type; }
| _EQ { $$ = box_dv_uname_string ("http://www.w3.org/2002/07/owl#sameAs"); }
- | _EQ_GT { $$ = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); }
+ | _EQ_GT { $$ = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); }
| _LSQBRA_RSQBRA
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '[]') can not be used as a predicate");
@@ -403,14 +373,14 @@ verb
| BLANK_NODE_LABEL
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '_:...' label) can not be used as a predicate");
- if (ttlp_arg->ttlp_formula_iid)
+ if (ttlp_arg->ttlp_formula_iid)
$$ = tf_formula_bnode_iid (ttlp_arg, $1);
- else
+ else
$$ = tf_bnode_iid (ttlp_arg->ttlp_tf, $1);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
ttlp_triples_for_bnodes_debug (ttlp_arg, $$, ttlp_arg->ttlp_lexlineno, $1);
}
- | _LSQBRA
+ | _LSQBRA
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Blank node (written as '[...]' block) can not be used as a predicate");
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -422,7 +392,7 @@ verb
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
ttlp_triples_for_bnodes_debug (ttlp_arg, $$, $<lexlineno>2, NULL);
}
- | _LPAR
+ | _LPAR
{
TTLYYERROR_ACTION_COND (TTLP_VERB_MAY_BE_BLANK, "Sequence blank node (written as list in parenthesis) can not be used as a predicate");
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
@@ -439,7 +409,7 @@ verb
rev_verb
: _AT_is_L q_complete _AT_of_L { $$ = ttlp_arg->ttlp_last_complete_uri; ttlp_arg->ttlp_last_complete_uri = NULL; }
| _AT_is_L VARIABLE _AT_of_L { $$ = $2; }
- | _LT_EQ { $$ = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); /* Note this 'double reversed' meaning :) */ }
+ | _LT_EQ { $$ = box_dv_uname_string ("http://www.w3.org/2000/10/swap/log#implies"); /* Note this 'double reversed' meaning :) */ }
;
literal_subject
@@ -507,22 +477,22 @@ object
ttlp_arg->ttlp_obj_type = ttlp_arg->ttlp_last_complete_uri;
ttlp_arg->ttlp_last_complete_uri = NULL;
ttlp_triple_l_and_inf (ttlp_arg, ttlp_arg->ttlp_obj, ttlp_arg->ttlp_obj_type, NULL); }
- | TTL_RECOVERABLE_ERROR { }
+ | TTL_RECOVERABLE_ERROR { }
| TURTLE_STRING _CARET_CARET TTL_RECOVERABLE_ERROR {
dk_free_tree (ttlp_arg->ttlp_obj);
ttlp_arg->ttlp_obj = $1; }
- | TTL_RECOVERABLE_ERROR _CARET_CARET q_complete {
+ | TTL_RECOVERABLE_ERROR _CARET_CARET q_complete {
dk_free_tree (ttlp_arg->ttlp_last_complete_uri);
ttlp_arg->ttlp_last_complete_uri = NULL; }
- | TTL_RECOVERABLE_ERROR _CARET_CARET TTL_RECOVERABLE_ERROR { }
+ | TTL_RECOVERABLE_ERROR _CARET_CARET TTL_RECOVERABLE_ERROR { }
;
blank
: BLANK_NODE_LABEL
{
- if (ttlp_arg->ttlp_formula_iid)
+ if (ttlp_arg->ttlp_formula_iid)
$$ = tf_formula_bnode_iid (ttlp_arg, $1);
- else
+ else
$$ = tf_bnode_iid (ttlp_arg->ttlp_tf, $1);
if (TTLP_DEBUG_BNODES & ttlp_arg->ttlp_flags)
ttlp_triples_for_bnodes_debug (ttlp_arg, $$, ttlp_arg->ttlp_lexlineno, $1);
@@ -569,9 +539,9 @@ blank
;
blank_block_subj
- :
+ :
{ dk_set_push (&(ttlp_arg->ttlp_saved_uris), (void *)(ptrlong)ttlp_arg->ttlp_pred_is_reverse);
- dk_set_push (&(ttlp_arg->ttlp_saved_uris), ttlp_arg->ttlp_subj_uri);
+ dk_set_push (&(ttlp_arg->ttlp_saved_uris), ttlp_arg->ttlp_subj_uri);
dk_set_push (&(ttlp_arg->ttlp_saved_uris), ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_is_reverse = 0;
ttlp_arg->ttlp_subj_uri = tf_bnode_iid (ttlp_arg->ttlp_tf, NULL);
@@ -580,18 +550,18 @@ blank_block_subj
;
blank_block_subj_tail
- : predicate_object_list semicolon_opt _RSQBRA
+ : predicate_object_list semicolon_opt _RSQBRA
{ $$ = ttlp_arg->ttlp_subj_uri;
dk_free_tree (ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
ttlp_arg->ttlp_subj_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
- ttlp_arg->ttlp_pred_is_reverse = (ptrlong)dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
+ ttlp_arg->ttlp_pred_is_reverse = (ptrlong)dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
| _RSQBRA
{ $$ = ttlp_arg->ttlp_subj_uri;
dk_free_tree (ttlp_arg->ttlp_pred_uri);
ttlp_arg->ttlp_pred_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
ttlp_arg->ttlp_subj_uri = dk_set_pop (&(ttlp_arg->ttlp_saved_uris));
- ttlp_arg->ttlp_pred_is_reverse = (ptrlong)dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
+ ttlp_arg->ttlp_pred_is_reverse = (ptrlong)dk_set_pop (&(ttlp_arg->ttlp_saved_uris)); }
;
blank_block_seq
@@ -671,14 +641,14 @@ blank_block_formula
q_complete
: Q_IRI_REF
{
- if (NULL != ttlp_arg->ttlp_last_complete_uri)
+ if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
ttlp_arg->ttlp_last_complete_uri = $1;
TTLP_URI_RESOLVE_IF_NEEDED(ttlp_arg->ttlp_last_complete_uri);
}
| QNAME
{
- if (NULL != ttlp_arg->ttlp_last_complete_uri)
+ if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
ttlp_arg->ttlp_last_complete_uri = $1;
ttlp_arg->ttlp_last_complete_uri = ttlp_expand_qname_prefix (ttlp_arg, ttlp_arg->ttlp_last_complete_uri);
@@ -686,7 +656,7 @@ q_complete
}
| QNAME_NS
{
- if (NULL != ttlp_arg->ttlp_last_complete_uri)
+ if (NULL != ttlp_arg->ttlp_last_complete_uri)
ttlyyerror_action ("Internal error: proven memory leak");
ttlp_arg->ttlp_last_complete_uri = $1;
ttlp_arg->ttlp_last_complete_uri = ttlp_expand_qname_prefix (ttlp_arg, ttlp_arg->ttlp_last_complete_uri);
diff --git a/libsrc/Wi/uddi.sql b/libsrc/Wi/uddi.sql
index 30115b5..65b9cff 100644
--- a/libsrc/Wi/uddi.sql
+++ b/libsrc/Wi/uddi.sql
@@ -1,14 +1,14 @@
--
-- uddi.sql
--
--- $Id: uddi.sql,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+-- $Id: uddi.sql,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
--
-- UDDI support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/uname_const_decl.c b/libsrc/Wi/uname_const_decl.c
index 676427a..aaa87bf 100644
--- a/libsrc/Wi/uname_const_decl.c
+++ b/libsrc/Wi/uname_const_decl.c
@@ -1,12 +1,12 @@
/*
- * $Id: uname_const_decl.c,v 1.1.2.6 2012/03/08 12:55:37 source Exp $
+ * $Id: uname_const_decl.c,v 1.1.2.5 2011/10/13 12:14:27 source Exp $
*
* Constant declarations of commonly used UNAMEs.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/Wi/uname_const_decl.h b/libsrc/Wi/uname_const_decl.h
index 08f326c..4a16a01 100644
--- a/libsrc/Wi/uname_const_decl.h
+++ b/libsrc/Wi/uname_const_decl.h
@@ -1,12 +1,12 @@
/*
- * $Id: uname_const_decl.h,v 1.1.2.5 2012/03/08 12:55:37 source Exp $
+ * $Id: uname_const_decl.h,v 1.1.2.4 2011/10/13 12:14:27 source Exp $
*
* Constant declarations of commonly used UNAMEs.
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/Wi/update.c b/libsrc/Wi/update.c
index b2daf41..eb9398d 100644
--- a/libsrc/Wi/update.c
+++ b/libsrc/Wi/update.c
@@ -1,14 +1,14 @@
/*
* update.c
*
- * $Id: update.c,v 1.11.2.14 2012/03/08 12:55:37 source Exp $
+ * $Id: update.c,v 1.11.2.13 2011/10/19 15:18:21 source Exp $
*
* UPDATE statements
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/url_rewrite.sql b/libsrc/Wi/url_rewrite.sql
index 4d65c5d..b55ef4a 100644
--- a/libsrc/Wi/url_rewrite.sql
+++ b/libsrc/Wi/url_rewrite.sql
@@ -1,10 +1,10 @@
--
--- $Id: url_rewrite.sql,v 1.26.2.18 2012/03/08 12:55:37 source Exp $
+-- $Id: url_rewrite.sql,v 1.26.2.17 2011/09/28 17:01:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/useraggr.sql b/libsrc/Wi/useraggr.sql
index afbf5cf..664a4e3 100644
--- a/libsrc/Wi/useraggr.sql
+++ b/libsrc/Wi/useraggr.sql
@@ -1,10 +1,10 @@
--
--- $Id: useraggr.sql,v 1.3.2.7 2012/03/08 12:55:37 source Exp $
+-- $Id: useraggr.sql,v 1.3.2.6 2011/07/19 23:40:07 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/users.sql b/libsrc/Wi/users.sql
index 4a07ee5..1eb29b7 100644
--- a/libsrc/Wi/users.sql
+++ b/libsrc/Wi/users.sql
@@ -1,14 +1,14 @@
--
-- users.sql
--
--- $Id: users.sql,v 1.12.2.17 2012/03/08 12:55:37 source Exp $
+-- $Id: users.sql,v 1.12.2.12 2011/10/18 12:41:34 source Exp $
--
-- Unified user model
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -196,7 +196,8 @@ create procedure DB.DBA.SECURITY_CL_EXEC_AND_LOG (in txt varchar, in args any)
}
;
-create procedure DB.DBA.USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)
+create procedure
+USER_CREATE (in _name varchar, in passwd varchar, in options any := NULL)
{
declare _pwd, _pwd_mode, _pwd_mode_data, _login_qual varchar;
declare _dav_enable, _sql_enable integer;
@@ -227,7 +228,7 @@ create procedure DB.DBA.USER_CREATE (in _name varchar, in passwd varchar, in opt
_login_qual := get_keyword_ucase ('LOGIN_QUALIFIER', options, 'DB');
_prim_group := get_keyword_ucase ('PRIMARY_GROUP', options, NULL);
- _u_e_mail := coalesce (get_keyword_ucase ('E-MAIL', options), get_keyword_ucase ('E_MAIL', options, ''));
+ _u_e_mail := get_keyword_ucase ('E-MAIL', options, '');
_u_full_name := get_keyword_ucase ('FULL_NAME', options, NULL);
_u_home := get_keyword_ucase ('HOME', options, NULL);
_u_perms := get_keyword_ucase ('PERMISSIONS', options, '110100000R');
@@ -240,7 +241,7 @@ create procedure DB.DBA.USER_CREATE (in _name varchar, in passwd varchar, in opt
new_opts := vector ();
while (i < l)
{
- if (upper(options[i]) not in ('PASSWORD_MODE', 'PASSWORD_MODE_DATA', 'GET_PASSWORD', 'SQL_ENABLE', 'DAV_ENABLE', 'LOGIN_QUALIFIER', 'PRIMARY_GROUP', 'E-MAIL', 'E_MAIL', 'FULL_NAME', 'HOME', 'PERMISSIONS', 'DISABLED'))
+ if (upper(options[i]) not in ('PASSWORD_MODE', 'PASSWORD_MODE_DATA', 'GET_PASSWORD', 'SQL_ENABLE', 'DAV_ENABLE', 'LOGIN_QUALIFIER', 'PRIMARY_GROUP', 'E-MAIL', 'FULL_NAME', 'HOME', 'PERMISSIONS', 'DISABLED'))
{
new_opts := vector_concat (new_opts, vector (options[i], options[i+1]));
}
@@ -250,9 +251,6 @@ create procedure DB.DBA.USER_CREATE (in _name varchar, in passwd varchar, in opt
if (_login_qual = '')
signal ('22023', 'Qualifier cannot be empty string');
- if (__tag of NVARCHAR = __tag (passwd))
- passwd := charset_recode (passwd, '_WIDE_', 'UTF-8');
-
_pwd := pwd_magic_calc (_name, passwd, 0);
_u_sys_name := pwd_magic_calc (_name, _u_sec_sys_name, 0);
_u_sys_pass := pwd_magic_calc (_name, _u_sec_sys_pass, 0);
@@ -336,10 +334,6 @@ USER_ROLE_DROP (in _name varchar)
create procedure
USER_CHANGE_PASSWORD (in _name varchar, in old_pwd varchar, in new_pwd varchar)
{
- if (__tag of NVARCHAR = __tag (old_pwd))
- old_pwd := charset_recode (old_pwd, '_WIDE_', 'UTF-8');
- if (__tag of NVARCHAR = __tag (new_pwd))
- new_pwd := charset_recode (new_pwd, '_WIDE_', 'UTF-8');
if (exists (select 1 from SYS_USERS where U_NAME = _name and U_IS_ROLE = 0 and pwd_magic_calc (U_NAME, U_PASSWORD, 1) = old_pwd))
{
if (exists (select 1 from SYS_USERS where U_NAME = _name and U_SQL_ENABLE = 1))
@@ -360,8 +354,6 @@ create procedure USER_PASSWORD_SET (in name varchar, in passwd varchar)
{
declare _u_id, _u_group integer;
declare _u_data varchar;
- if (__tag of NVARCHAR = __tag (passwd))
- passwd := charset_recode (passwd, '_WIDE_', 'UTF-8');
if (exists (select 1 from SYS_USERS where U_NAME = name and U_SQL_ENABLE = 1))
{
user_set_password (name, passwd);
@@ -575,7 +567,6 @@ USER_DROP (in _name varchar, in _cascade integer := 0)
signal ('37000', concat ('The user ''', _name, ''' does not exist'), 'U0015');
delete from SYS_USER_GROUP where UG_UID = _u_id;
delete from SYS_GRANTS where G_USER = _u_id;
- delete from DB.DBA.RDF_GRAPH_USER where RGU_USER_ID = _u_id;
if (_u_is_sql)
DB.DBA.SECURITY_CL_EXEC_AND_LOG ('sec_remove_user_struct(?)', vector (_name));
}
@@ -1322,26 +1313,6 @@ alter index SYS_USER_WEBID on SYS_USER_WEBID partition cluster replicated
create index SYS_USER_WEBID_NAME on SYS_USER_WEBID (UW_U_NAME) partition cluster replicated
;
-create procedure FOAF_SSL_QRY (in gr varchar, in uri varchar)
-{
- return sprintf ('sparql
- define input:storage ""
- define input:same-as "yes"
- prefix cert: <http://www.w3.org/ns/auth/cert#>
- prefix rsa: <http://www.w3.org/ns/auth/rsa#>
- select (str (?exp)) (str (?mod))
- from <%S>
- where
- {
- { ?id cert:identity <%S> ; rsa:public_exponent ?exp ; rsa:modulus ?mod . }
- union
- { ?id cert:identity <%S> ; rsa:public_exponent ?exp1 ; rsa:modulus ?mod1 . ?exp1 cert:decimal ?exp . ?mod1 cert:hex ?mod . }
- union
- { <%S> cert:key ?key . ?key cert:exponent ?exp . ?key cert:modulus ?mod . }
- }', gr, uri, uri, uri);
-}
-;
-
create procedure
DB.DBA.FOAF_SSL_LOGIN (inout user_name varchar, in digest varchar, in session_random varchar)
{
@@ -1382,7 +1353,17 @@ DB.DBA.FOAF_SSL_LOGIN (inout user_name varchar, in digest varchar, in session_ra
stat := '00000';
exec (qr, stat, msg);
commit work;
- qr := FOAF_SSL_QRY (gr, agent);
+ qr := sprintf (
+ 'sparql define input:storage "" '||
+ ' prefix cert: <http://www.w3.org/ns/auth/cert#> '||
+ ' prefix rsa: <http://www.w3.org/ns/auth/rsa#> ' ||
+ ' select (str (bif:coalesce (?exp_val, ?exp))) (str (bif:coalesce (?mod_val, ?mod))) '||
+ ' from <%S> '||
+ ' where { '||
+ ' ?id cert:identity <%S> ; rsa:public_exponent ?exp ; rsa:modulus ?mod . ' ||
+ ' optional { ?exp cert:decimal ?exp_val . ?mod cert:hex ?mod_val . } '||
+ ' } ',
+ gr, agent);
stat := '00000';
exec (qr, stat, msg, vector (), 0, meta, data);
if (stat = '00000' and length (data))
diff --git a/libsrc/Wi/uuencode.c b/libsrc/Wi/uuencode.c
index 229560b..16fd29b 100644
--- a/libsrc/Wi/uuencode.c
+++ b/libsrc/Wi/uuencode.c
@@ -1,10 +1,10 @@
/*
- * $Id: uuencode.c,v 1.6.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: uuencode.c,v 1.6.2.1 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/uuencode_impl.h b/libsrc/Wi/uuencode_impl.h
index de975dc..ff3c3d8 100644
--- a/libsrc/Wi/uuencode_impl.h
+++ b/libsrc/Wi/uuencode_impl.h
@@ -1,10 +1,10 @@
/*
- * $Id: uuencode_impl.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: uuencode_impl.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/vdb.sql b/libsrc/Wi/vdb.sql
index 19932e7..ad7494f 100644
--- a/libsrc/Wi/vdb.sql
+++ b/libsrc/Wi/vdb.sql
@@ -1,10 +1,10 @@
--
--- $Id: vdb.sql,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+-- $Id: vdb.sql,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/virtext.h b/libsrc/Wi/virtext.h
index 0206e9c..9b1ff45 100644
--- a/libsrc/Wi/virtext.h
+++ b/libsrc/Wi/virtext.h
@@ -1,14 +1,14 @@
/*
* virtext.h
*
- * $Id: virtext.h,v 1.3.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: virtext.h,v 1.3.2.1 2009/04/18 21:55:17 source Exp $
*
* Virtuoso UDBC Client Extensions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/virtpwd.h b/libsrc/Wi/virtpwd.h
index 87f48c9..9cefa7f 100644
--- a/libsrc/Wi/virtpwd.h
+++ b/libsrc/Wi/virtpwd.h
@@ -1,14 +1,14 @@
/*
* virtpwd.h
*
- * $Id: virtpwd.h,v 1.2.2.2 2012/03/08 12:55:37 source Exp $
+ * $Id: virtpwd.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
*
* password encryption
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/virtual_dir.sql b/libsrc/Wi/virtual_dir.sql
index e6d3951..eb5dd11 100644
--- a/libsrc/Wi/virtual_dir.sql
+++ b/libsrc/Wi/virtual_dir.sql
@@ -1,14 +1,14 @@
--
-- virtual_dir.sql
--
--- $Id: virtual_dir.sql,v 1.39.2.30 2012/03/08 12:55:37 source Exp $
+-- $Id: virtual_dir.sql,v 1.39.2.28 2011/09/28 17:01:17 source Exp $
--
-- Virtual Web directories support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -995,7 +995,7 @@ ext_http_proxy (in url varchar := null,
in header varchar := null,
in force varchar := null,
in "output-format" varchar := null,
- in get varchar := 'add',
+ in get varchar := 'soft',
in login varchar := '') __SOAP_HTTP 'text/html'
{
declare hdr, content, req_hdr any;
@@ -1092,16 +1092,14 @@ end_loop:;
accept := "output-format";
}
stat := '00000';
- if (get not in ('soft', 'replacing', 'add'))
- get := 'add';
+ if (get not in ('soft', 'replacing'))
+ get := 'soft';
if (length (login))
login := concat ('define get:login "', login, '" ');
else
login := '';
host := http_request_header(http_request_header(), 'Host', null, null);
ids := vector ('rdf', 'id/entity', 'id');
- if (not exists (select 1 from RDF_QUAD where G = iri_to_id (url, 0)))
- {
foreach (varchar idn in ids) do
{
pref := 'http://' || host || http_map_get ('domain') || '/' || idn || '/';
@@ -1116,7 +1114,6 @@ end_loop:;
url := 'nodeID:/' || subseq (url, 6);
}
}
- }
-- escape chars which are not allowed
url := replace (url, '''', '%27');
url := replace (url, '<', '%3C');
diff --git a/libsrc/Wi/vt_text.sql b/libsrc/Wi/vt_text.sql
index d6b3cb8..eada27b 100644
--- a/libsrc/Wi/vt_text.sql
+++ b/libsrc/Wi/vt_text.sql
@@ -1,14 +1,14 @@
--
-- vt_text.sql
--
--- $Id: vt_text.sql,v 1.2.2.3 2012/03/08 12:55:37 source Exp $
+-- $Id: vt_text.sql,v 1.2.2.2 2009/04/18 21:55:17 source Exp $
--
-- Text triggers support.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wi.h b/libsrc/Wi/wi.h
index d83adae..2fab348 100644
--- a/libsrc/Wi/wi.h
+++ b/libsrc/Wi/wi.h
@@ -1,14 +1,14 @@
/*
* wi.h
*
- * $Id: wi.h,v 1.23.2.24 2012/03/08 12:55:37 source Exp $
+ * $Id: wi.h,v 1.23.2.22 2011/10/13 11:09:41 source Exp $
*
* Data structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -1573,7 +1573,7 @@ extern int64 bdf_is_avail_mask; /* all bits on except read aside flag which does
if ((__lt && __lt->lt_status != LT_PENDING) \
|| (wi_inst.wi_is_checkpoint_pending && cpt_is_global_lock ())) \
{ \
- if (__lt && !wi_inst.wi_checkpoint_atomic) \
+ if (!wi_inst.wi_checkpoint_atomic) \
itc_bust_this_trx (it, buf, may_ret); \
}\
} \
diff --git a/libsrc/Wi/wi_xid.c b/libsrc/Wi/wi_xid.c
index 35f19da..9325a92 100644
--- a/libsrc/Wi/wi_xid.c
+++ b/libsrc/Wi/wi_xid.c
@@ -1,14 +1,14 @@
/*
* wi_xid.c
*
- * $Id: wi_xid.c,v 1.5.2.5 2012/03/08 12:55:38 source Exp $
+ * $Id: wi_xid.c,v 1.5.2.4 2009/07/21 19:24:58 source Exp $
*
* Functions to deal with XID structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wi_xid.h b/libsrc/Wi/wi_xid.h
index 2de1603..5374dc4 100644
--- a/libsrc/Wi/wi_xid.h
+++ b/libsrc/Wi/wi_xid.h
@@ -1,14 +1,14 @@
/*
* wi_xid.h
*
- * $Id: wi_xid.h,v 1.4.2.3 2012/03/08 12:55:38 source Exp $
+ * $Id: wi_xid.h,v 1.4.2.2 2009/06/19 10:23:39 source Exp $
*
* Functions to deal with XID structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/widd.h b/libsrc/Wi/widd.h
index 31491bd..e39f9fd 100644
--- a/libsrc/Wi/widd.h
+++ b/libsrc/Wi/widd.h
@@ -1,14 +1,14 @@
/*
* widd.h
*
- * $Id: widd.h,v 1.6.2.8 2012/03/08 12:55:38 source Exp $
+ * $Id: widd.h,v 1.6.2.7 2011/02/14 11:48:50 source Exp $
*
* Data Dictionary
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/widisk.h b/libsrc/Wi/widisk.h
index 6b63963..8591d3a 100644
--- a/libsrc/Wi/widisk.h
+++ b/libsrc/Wi/widisk.h
@@ -1,14 +1,14 @@
/*
* widisk.h
*
- * $Id: widisk.h,v 1.12.2.11 2012/03/15 13:57:11 source Exp $
+ * $Id: widisk.h,v 1.12.2.9 2011/10/13 11:09:41 source Exp $
*
* Disk Based Data Structures
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -48,8 +48,8 @@ typedef uint32 dp_addr_t; /* must be exactly 32 bits wide */
typedef unsigned char * db_buf_t;
+
#define PAGE_SZ 8192
-#define KILOS_PER_PAGE (PAGE_SZ/1024)
#define PAGE_DATA_SZ (PAGE_SZ - DP_DATA)
#define ROW_ALIGN(s) ALIGN_2(s)
diff --git a/libsrc/Wi/widv.h b/libsrc/Wi/widv.h
index a97c1c6..2d2e457 100644
--- a/libsrc/Wi/widv.h
+++ b/libsrc/Wi/widv.h
@@ -1,12 +1,12 @@
/*
* widv.h
*
- * $Id: widv.h,v 1.16.2.5 2012/03/08 12:55:38 source Exp $
+ * $Id: widv.h,v 1.16.2.4 2010/05/07 09:14:32 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wifn.h b/libsrc/Wi/wifn.h
index 9055e4c..a161caf 100644
--- a/libsrc/Wi/wifn.h
+++ b/libsrc/Wi/wifn.h
@@ -1,14 +1,14 @@
/*
* wifn.h
*
- * $Id: wifn.h,v 1.40.2.30 2012/03/08 12:55:38 source Exp $
+ * $Id: wifn.h,v 1.40.2.26 2011/08/26 17:57:06 source Exp $
*
* Internal Functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -42,7 +42,6 @@ extern numeric_t num_int64_min;
void db_buf_length (unsigned char * buf, long * head_ret, long * len_ret);
int box_serial_length (caddr_t box, dtp_t dtp);
extern short db_buf_const_length [256];
-extern dtp_t dtp_canonical[256];
int dv_composite_cmp (db_buf_t dv1, db_buf_t dv2, collation_t * coll);
int dv_compare (db_buf_t dv1, db_buf_t dv2, collation_t *collation, unsigned short offset);
@@ -839,7 +838,7 @@ int itc_print_blob_col_non_txn (it_cursor_t * row_itc, dk_session_t * row, caddr
int bh_fill_buffer_from_blob (index_tree_t * it, lock_trx_t * lt, blob_handle_t * bh,
caddr_t outbuf, long get_bytes);
void blob_chain_delete (it_cursor_t * it, blob_layout_t *bl);
-void blob_send_bytes (lock_trx_t * lt, caddr_t bh, long n_bytes, int send_position, long blob_type);
+void blob_send_bytes (lock_trx_t * lt, caddr_t bh, long n_bytes, int send_position);
void lt_write_blob_log (lock_trx_t * lt, dk_session_t * log_ses);
dk_session_t * blob_to_string_output_isp (lock_trx_t * lt, caddr_t bhp);
typedef struct blob_log_s
@@ -1070,10 +1069,7 @@ extern name_id_cache_t * iri_prefix_cache;
extern name_id_cache_t * rdf_lang_cache;
extern name_id_cache_t * rdf_type_cache;
boxint nic_name_id (name_id_cache_t * nic, char * name);
-caddr_t DBG_NAME(nic_id_name) (DBG_PARAMS name_id_cache_t * nic, boxint id);
-#ifdef MALLOC_DEBUG
-#define nic_id_name(nic,id) DBG_NAME(nic_id_name) (__FILE__, __LINE__, (nic), (id))
-#endif
+caddr_t nic_id_name (name_id_cache_t * nic, boxint id);
void nic_set (name_id_cache_t * nic, caddr_t name, boxint id);
boxint lt_nic_name_id (lock_trx_t * lt, name_id_cache_t * nic, caddr_t name);
caddr_t lt_nic_id_name (lock_trx_t * lt, name_id_cache_t * nic, boxint id);
diff --git a/libsrc/Wi/wirpc.c b/libsrc/Wi/wirpc.c
index 702a65e..12f4841 100644
--- a/libsrc/Wi/wirpc.c
+++ b/libsrc/Wi/wirpc.c
@@ -1,14 +1,14 @@
/*
* wirpc.c
*
- * $Id: wirpc.c,v 1.2.2.4 2012/03/08 12:55:38 source Exp $
+ * $Id: wirpc.c,v 1.2.2.2 2011/01/05 12:51:53 source Exp $
*
* Global RPC call hooks
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -82,7 +82,7 @@ SERVICE_9 (s_get_data_ac , _sgbt2, "GETDA", DA_FUTURE_REQUEST,
DV_LONG_INT, 1,/* frag_no */
DV_LONG_INT, 1,/* page dir 1st page */
DV_LONG_STRING, 1,/* the array of page nos */
- DV_LONG_INT, 1,/* is_wide or is_bin ? */
+ DV_LONG_INT, 1,/* is_wide? */
DV_LONG_INT, 1);/* blob timestamp */
diff --git a/libsrc/Wi/wirpce.h b/libsrc/Wi/wirpce.h
index 039d6f7..163d1df 100644
--- a/libsrc/Wi/wirpce.h
+++ b/libsrc/Wi/wirpce.h
@@ -1,12 +1,12 @@
/*
* wirpce.h
*
- * $Id: wirpce.h,v 1.2.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: wirpce.h,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wiservic.c b/libsrc/Wi/wiservic.c
index f9631b9..d70d32c 100644
--- a/libsrc/Wi/wiservic.c
+++ b/libsrc/Wi/wiservic.c
@@ -1,14 +1,14 @@
/*
* wiservic.c
*
- * $Id: wiservic.c,v 1.3.2.3 2012/03/08 12:55:38 source Exp $
+ * $Id: wiservic.c,v 1.3.2.2 2010/05/21 12:40:48 source Exp $
*
* Windows NT services
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wiservic.h b/libsrc/Wi/wiservic.h
index 6ee0367..111700d 100644
--- a/libsrc/Wi/wiservic.h
+++ b/libsrc/Wi/wiservic.h
@@ -1,12 +1,12 @@
/*
* wiservic.h
*
- * $Id: wiservic.h,v 1.3.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: wiservic.h,v 1.3.2.1 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wsdl2rdf.xsl b/libsrc/Wi/wsdl2rdf.xsl
index 478fba4..78552f0 100644
--- a/libsrc/Wi/wsdl2rdf.xsl
+++ b/libsrc/Wi/wsdl2rdf.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
<!--
-
- - $Id: wsdl2rdf.xsl,v 1.1.2.2 2012/03/08 12:55:38 source Exp $
+ - $Id: wsdl2rdf.xsl,v 1.1.2.1 2009/04/16 09:48:07 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/wsdl_expand.xsl b/libsrc/Wi/wsdl_expand.xsl
index dcad164..8d9375b 100644
--- a/libsrc/Wi/wsdl_expand.xsl
+++ b/libsrc/Wi/wsdl_expand.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: wsdl_expand.xsl,v 1.4.2.2 2012/03/08 12:55:38 source Exp $
+ - $Id: wsdl_expand.xsl,v 1.4.2.1 2010/11/05 10:56:48 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wsdl_import.xsl b/libsrc/Wi/wsdl_import.xsl
index ff5c4a5..64938fc 100644
--- a/libsrc/Wi/wsdl_import.xsl
+++ b/libsrc/Wi/wsdl_import.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: wsdl_import.xsl,v 1.5.2.2 2012/03/08 12:55:38 source Exp $
+ - $Id: wsdl_import.xsl,v 1.5.2.1 2010/11/05 10:56:49 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wsdl_parts.xsl b/libsrc/Wi/wsdl_parts.xsl
index 8fc3817..337c9bd 100644
--- a/libsrc/Wi/wsdl_parts.xsl
+++ b/libsrc/Wi/wsdl_parts.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: wsdl_parts.xsl,v 1.4.2.1 2012/03/08 12:55:38 source Exp $
+ - $Id: wsdl_parts.xsl,v 1.4 2009/04/09 13:22:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wsrp_error.xsl b/libsrc/Wi/wsrp_error.xsl
index 7465a31..78ecbb7 100644
--- a/libsrc/Wi/wsrp_error.xsl
+++ b/libsrc/Wi/wsrp_error.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wsrp_error.xsl,v 1.4.2.1 2012/03/08 12:55:38 source Exp $
+ - $Id: wsrp_error.xsl,v 1.4 2009/04/09 13:22:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wsrp_interm.xsl b/libsrc/Wi/wsrp_interm.xsl
index 7134ba9..35b3c6e 100644
--- a/libsrc/Wi/wsrp_interm.xsl
+++ b/libsrc/Wi/wsrp_interm.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wsrp_interm.xsl,v 1.4.2.1 2012/03/08 12:55:38 source Exp $
+ - $Id: wsrp_interm.xsl,v 1.4 2009/04/09 13:22:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wsrp_resp.xsl b/libsrc/Wi/wsrp_resp.xsl
index 289f14b..49b0f6e 100644
--- a/libsrc/Wi/wsrp_resp.xsl
+++ b/libsrc/Wi/wsrp_resp.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wsrp_resp.xsl,v 1.4.2.1 2012/03/08 12:55:38 source Exp $
+ - $Id: wsrp_resp.xsl,v 1.4 2009/04/09 13:22:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/wsrp_ultim.xsl b/libsrc/Wi/wsrp_ultim.xsl
index 8374286..cd23dfe 100644
--- a/libsrc/Wi/wsrp_ultim.xsl
+++ b/libsrc/Wi/wsrp_ultim.xsl
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!--
-
- - $Id: wsrp_ultim.xsl,v 1.3.2.1 2012/03/08 12:55:38 source Exp $
+ - $Id: wsrp_ultim.xsl,v 1.3 2007/03/16 09:56:12 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2007 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
diff --git a/libsrc/Wi/xml.h b/libsrc/Wi/xml.h
index aebee6f..7f859f3 100644
--- a/libsrc/Wi/xml.h
+++ b/libsrc/Wi/xml.h
@@ -1,12 +1,12 @@
/*
* xml.h
*
- * $Id: xml.h,v 1.4.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: xml.h,v 1.4.2.1 2009/04/18 21:55:17 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xml_a.sql b/libsrc/Wi/xml_a.sql
index 69c814f..65dbb16 100644
--- a/libsrc/Wi/xml_a.sql
+++ b/libsrc/Wi/xml_a.sql
@@ -1,10 +1,10 @@
--
--- $Id: xml_a.sql,v 1.2.2.2 2012/03/08 12:55:38 source Exp $
+-- $Id: xml_a.sql,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xml_view.sql b/libsrc/Wi/xml_view.sql
index aa7c687..c9101e6 100644
--- a/libsrc/Wi/xml_view.sql
+++ b/libsrc/Wi/xml_view.sql
@@ -1,14 +1,14 @@
--
-- xml_view.sql
--
--- $Id: xml_view.sql,v 1.2.2.2 2012/03/08 12:55:38 source Exp $
+-- $Id: xml_view.sql,v 1.2.2.1 2009/04/18 21:55:17 source Exp $
--
-- Publishing xml views as WebDAV resources.
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmla.sql b/libsrc/Wi/xmla.sql
index 5a2be62..4397d0f 100644
--- a/libsrc/Wi/xmla.sql
+++ b/libsrc/Wi/xmla.sql
@@ -1,10 +1,10 @@
--
--- $Id: xmla.sql,v 1.14.2.10 2012/03/15 13:41:27 source Exp $
+-- $Id: xmla.sql,v 1.14.2.2 2010/08/31 12:12:00 source Exp $
--
-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-- project.
--
--- Copyright (C) 1998-2012 OpenLink Software
+-- Copyright (C) 1998-2006 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
@@ -342,7 +342,7 @@ create procedure
stmt := sprintf ('SELECT CAST (%s as VARCHAR)', stmt);
tree := sql_parse (stmt);
}
- if (tree [0] <> 100 and tree[0] <> 113)
+ if (tree [0] <> 100)
{
if (registry_get ('XMLA-DML') = '1')
{
@@ -350,27 +350,11 @@ create procedure
stmt_is_ddl := 1;
}
else
- signal ('00004', 'Only select statements are supported via XML for Analysis provider');
+ signal ('00004', 'Only select statements are supported via XML for Analysis provider');
}
- res := exec (stmt, state, msg, vector (), 0, mdta, dta);
+ res := exec (stmt, state, msg, vector (), 0, mdta, dta);
if (isinteger (dta))
dta := vector (vector (dta));
- if ((1 = length (dta)) and (1 = length (dta[0])) and (214 = __tag (dta[0][0])))
- {
- declare triples, inx any;
- triples := dict_list_keys (dta[0][0], 1);
- for (inx := 0; inx < length (triples); inx := inx + 1)
- {
- declare trip any;
- trip := triples [inx];
- trip [0] := __ro2sq (trip[0]);
- trip [1] := __ro2sq (trip[1]);
- trip [2] := __ro2sq (trip[2]);
- triples [inx] := trip;
- }
- dta := triples;
- exec_metadata ('select \'\' as S, \'\' as P, \'\' as O any', state, msg, mdta);
- }
-- if (strstr (stmt, 'FROM DB.DBA.SYS_FOREIGN_KEYS'))
-- xmla_add_quot_to_table (dta);
blob_limit := atoi (xmla_get_property ("Properties", 'BLOBLimit', '0'));
@@ -673,8 +657,6 @@ xmla_dbschema_catalogs () for xmla_discover
dsn := self.xmla_get_property ('DataSourceInfo', xmla_service_name ());
dsn := xmla_get_dsn_name (dsn);
cat := self.xmla_get_restriction ('CATALOG_NAME', '%');
- if (cat is null)
- cat := '%';
if (not xmla_not_local_dsn (dsn))
{
@@ -808,8 +790,6 @@ xmla_make_element (in mdta any, in dta any)
aset (res, i1, mdta[i][0]);
if (mdta[i][1] = 131 and not isblob(dta[i]))
aset (res, i2, cast (dta[i] as varbinary));
- else if (mdta[i][1] = 219 and 219 <> __tag (dta[i]))
- aset (res, i2, cast (dta[i] as decimal));
else
aset (res, i2, dta[i]);
i := i + 1;
@@ -832,15 +812,6 @@ create method xmla_dbschema_columns () for xmla_discover
sch := self.xmla_get_restriction ('TABLE_SCHEMA', '%');
tb := self.xmla_get_restriction ('TABLE_NAME', '%');
col := self.xmla_get_restriction ('COLUMN_NAME', '%');
- if (cat is null)
- cat := '%';
- if (sch is null)
- sch := '%';
- if (tb is null)
- tb := '%';
- if (col is null)
- col := '%';
-
if (not xmla_not_local_dsn (dsn))
{
declare uname, passwd varchar;
@@ -849,49 +820,49 @@ create method xmla_dbschema_columns () for xmla_discover
if (uname is null or passwd is null)
signal ('00002', 'Unable to process the request, because the UserName property is not set or incorrect');
set_user_id (uname, 1, passwd);
- exec('select
- name_part(KEY_TABLE, 0) as TABLE_CATALOG,
- name_part(KEY_TABLE, 1) as TABLE_SCHEMA,
- name_part(KEY_TABLE, 2) as TABLE_NAME,
- "COLUMN" as COLUMN_NAME,
- NULL as COLUMN_GUID,
- NULL as COLUMN_PROPID INTEGER,
- (select count(*) from DB.DBA.SYS_COLS where "TABLE" = KEY_TABLE and COL_ID <= c.COL_ID and "COLUMN" <> ''_IDN'') as ORDINAL_POSITION INTEGER,
- case when deserialize(COL_DEFAULT) is null then 0 else -1 end as COLUMN_HASDEFAULT SMALLINT,
- cast (deserialize(COL_DEFAULT) as NVARCHAR) as COLUMN_DEFAULT NVARCHAR(254),
- cast (DB.DBA.oledb_dbflags(COL_DTP, COL_NULLABLE) as integer) as COLUMN_FLAGS INTEGER,
- case COL_NULLABLE when 1 then -1 else 0 end as IS_NULLABLE SMALLINT,
- cast (DB.DBA.oledb_dbtype(COL_DTP) as integer) as DATA_TYPE SMALLINT,
- NULL as TYPE_GUID,
- cast (DB.DBA.oledb_char_max_len(COL_DTP, COL_PREC) as integer) as CHARACTER_MAXIMUM_LENGTH INTEGER,
- cast (DB.DBA.oledb_char_oct_len(COL_DTP, COL_PREC) as integer) as CHARACTER_OCTET_LENGTH INTEGER,
- cast (DB.DBA.oledb_num_prec(COL_DTP, COL_PREC) as smallint) as NUMERIC_PRECISION SMALLINT,
- cast (DB.DBA.oledb_num_scale(COL_DTP, COL_SCALE) as smallint) as NUMERIC_SCALE SMALLINT,
- cast (DB.DBA.oledb_datetime_prec(COL_DTP, COL_PREC) as integer) as DATETIME_PRECISION INTEGER,
- NULL as CHARACTER_SET_CATALOG NVARCHAR(1),
- NULL as CHARACTER_SET_SCHEMA NVARCHAR(1),
- NULL as CHARACTER_SET_NAME NVARCHAR(1),
- NULL as COLLATION_CATALOG NVARCHAR(1),
- NULL as COLLATION_SCHEMA NVARCHAR(1),
- NULL as COLLATION_NAME NVARCHAR(1),
- NULL as DOMAIN_CATALOG NVARCHAR(1),
- NULL as DOMAIN_SCHEMA NVARCHAR(1),
- NULL as DOMAIN_NAME NVARCHAR(1),
- NULL as DESCRIPTION NVARCHAR(1)
- from DB.DBA.SYS_KEYS, DB.DBA.SYS_KEY_PARTS, DB.DBA.SYS_COLS c
- where
- __any_grants(KEY_TABLE) and
- name_part(KEY_TABLE, 0) = ? and
- name_part(KEY_TABLE, 1) like ? and
- name_part(KEY_TABLE, 2) like ? and
- "COLUMN" like ? and
- "COLUMN" <> ''_IDN'' and
- KEY_IS_MAIN = 1 and
- KEY_MIGRATE_TO is null and
- KP_KEY_ID = KEY_ID and
- COL_ID = KP_COL order by KEY_TABLE, 7'
- , null, null,
- vector (cat, sch, tb, col), 0, mdta, dta);
+ exec ('select
+ name_part(KEY_TABLE, 0) as TABLE_CATALOG,
+ name_part(KEY_TABLE, 1) as TABLE_SCHEMA,
+ name_part(KEY_TABLE, 2) as TABLE_NAME,
+ "COLUMN" as COLUMN_NAME,'
+ || ' NULL as COLUMN_GUID,'
+ || ' NULL as COLUMN_PROPID INTEGER,'
+ || ' (select count(*) from DB.DBA.SYS_COLS where "TABLE" = KEY_TABLE and COL_ID <= c.COL_ID and "COLUMN" <> ''_IDN'') as ORDINAL_POSITION INTEGER,'
+ || ' case when deserialize(COL_DEFAULT) is null then 0 else -1 end as COLUMN_HASDEFAULT SMALLINT,'
+ || ' cast (deserialize(COL_DEFAULT) as NVARCHAR) as COLUMN_DEFAULT NVARCHAR(254),'
+ || ' cast (DB.DBA.oledb_dbflags(COL_DTP, COL_NULLABLE) as integer) as COLUMN_FLAGS INTEGER,'
+ || ' case COL_NULLABLE when 1 then -1 else 0 end as IS_NULLABLE SMALLINT,'
+ || ' cast (DB.DBA.oledb_dbtype(COL_DTP) as integer) as DATA_TYPE SMALLINT,'
+ || ' NULL as TYPE_GUID,'
+ || ' cast (DB.DBA.oledb_char_max_len(COL_DTP, COL_PREC) as integer) as CHARACTER_MAXIMUM_LENGTH INTEGER,'
+ || ' cast (DB.DBA.oledb_char_oct_len(COL_DTP, COL_PREC) as integer) as CHARACTER_OCTET_LENGTH INTEGER,'
+ || ' cast (DB.DBA.oledb_num_prec(COL_DTP, COL_PREC) as smallint) as NUMERIC_PRECISION SMALLINT,'
+ || ' cast (DB.DBA.oledb_num_scale(COL_DTP, COL_SCALE) as smallint) as NUMERIC_SCALE SMALLINT,'
+ || ' cast (DB.DBA.oledb_datetime_prec(COL_DTP, COL_PREC) as integer) as DATETIME_PRECISION INTEGER,'
+ || ' NULL as CHARACTER_SET_CATALOG NVARCHAR(1),'
+ || ' NULL as CHARACTER_SET_SCHEMA NVARCHAR(1),'
+ || ' NULL as CHARACTER_SET_NAME NVARCHAR(1),'
+ || ' NULL as COLLATION_CATALOG NVARCHAR(1),'
+ || ' NULL as COLLATION_SCHEMA NVARCHAR(1),'
+ || ' NULL as COLLATION_NAME NVARCHAR(1),'
+ || ' NULL as DOMAIN_CATALOG NVARCHAR(1),'
+ || ' NULL as DOMAIN_SCHEMA NVARCHAR(1),'
+ || ' NULL as DOMAIN_NAME NVARCHAR(1),'
+ || ' NULL as DESCRIPTION NVARCHAR(1) ' ||
+ 'from DB.DBA.SYS_KEYS, DB.DBA.SYS_KEY_PARTS, DB.DBA.SYS_COLS c
+ where
+ __any_grants(KEY_TABLE) and
+ name_part(KEY_TABLE, 0) = ? and
+ name_part(KEY_TABLE, 1) like ? and
+ name_part(KEY_TABLE, 2) like ? and
+ "COLUMN" like ? and
+ "COLUMN" <> ''_IDN'' and
+ KEY_IS_MAIN = 1 and
+ KEY_MIGRATE_TO is null and
+ KP_KEY_ID = KEY_ID and
+ COL_ID = KP_COL order by KEY_TABLE, 7'
+ , null, null,
+ vector (cat, sch, tb, col), 0, mdta, dta);
}
else
{
@@ -917,102 +888,53 @@ create method xmla_dbschema_columns () for xmla_discover
create method xmla_dbschema_foreign_keys () for xmla_discover
{
declare dta, mdta, stmt, state, msg any;
- declare dsn any;
- declare p_cat, p_tbl, p_sch any;
- declare f_cat, f_tbl, f_sch any;
- declare _ptbl, _ftbl varchar;
+ declare dsn, cat, tb, col, sch any;
+ declare uname, passwd, _tbl varchar;
dsn := self.xmla_get_property ('DataSourceInfo', xmla_service_name ());
dsn := xmla_get_dsn_name (dsn);
+ cat := self.xmla_get_restriction ('PK_TABLE_CATALOG', '%');
+ sch := self.xmla_get_restriction ('TABLE_SCHEMA', '%');
+ tb := self.xmla_get_restriction ('TABLE_NAME', '%');
+ cat := trim (cat, '"');
+ sch := trim (sch, '"');
+ tb := trim (tb, '"');
+ uname := self.xmla_get_property ('UserName', null);
+ passwd := self.xmla_get_property ('Password', null);
+ _tbl := cat || '.' || sch || '.' || tb;
- p_cat := self.xmla_get_restriction ('PK_TABLE_CATALOG', '%');
- p_sch := self.xmla_get_restriction ('PK_TABLE_SCHEMA', '%');
- p_tbl := self.xmla_get_restriction ('PK_TABLE_NAME', '%');
- f_cat := self.xmla_get_restriction ('FK_TABLE_CATALOG', '%');
- f_sch := self.xmla_get_restriction ('FK_TABLE_SCHEMA', '%');
- f_tbl := self.xmla_get_restriction ('FK_TABLE_NAME', '%');
-
- if (p_cat is null)
- {
- if (f_cat is not null)
- p_cat := f_cat;
- else
- p_cat := '%';
- }
-
- if (f_cat is null)
- {
- if (p_cat is not null)
- f_cat := p_cat;
- else
- f_cat := '%';
- }
-
- if (p_sch is null)
- p_sch := '%';
- if (p_tbl is null)
- p_tbl := '%';
- if (f_sch is null)
- f_sch := '%';
- if (f_tbl is null)
- f_tbl := '%';
-
- p_cat := trim (p_cat, '"');
- p_sch := trim (p_sch, '"');
- p_tbl := trim (p_tbl, '"');
- f_cat := trim (f_cat, '"');
- f_sch := trim (f_sch, '"');
- f_tbl := trim (f_tbl, '"');
- _ptbl := p_cat || '.' || p_sch || '.' || p_tbl;
- _ftbl := f_cat || '.' || f_sch || '.' || f_tbl;
+ if (uname is null or passwd is null)
+ signal ('00002', 'Unable to process the request, because the UserName property is not set or incorrect');
if (not xmla_not_local_dsn (dsn))
{
- declare uname, passwd varchar;
- uname := self.xmla_get_property ('UserName', null);
- passwd := self.xmla_get_property ('Password', null);
- if (uname is null or passwd is null)
- signal ('00002', 'Unable to process the request, because the UserName property is not set or incorrect');
set_user_id (uname, 1, passwd);
- exec('select
- name_part (PK_TABLE, 0) as PK_TABLE_CATALOG varchar (128),
- name_part (PK_TABLE, 1) as PK_TABLE_SCHEMA varchar (128),
- name_part (PK_TABLE, 2) as PK_TABLE_NAME varchar (128),
- PKCOLUMN_NAME as PK_COLUMN_NAME,
- NULL as PK_COLUMN_GUID,
- NULL as PK_COLUMN_PROPID INTEGER,
- name_part (FK_TABLE, 0) as FK_TABLE_CATALOG varchar (128),
- name_part (FK_TABLE, 1) as FK_TABLE_SCHEMA varchar (128),
- name_part (FK_TABLE, 2) as FK_TABLE_NAME varchar (128),
- FKCOLUMN_NAME as FK_COLUMN_NAME,
- NULL as FK_COLUMN_GUID,
- NULL as FK_COLUMN_PROPID INTEGER,
- (KEY_SEQ + 1) as ORDINAL INTEGER,
- (case UPDATE_RULE when 0 then ''NO ACTION'' when 1 then ''CASCADE'' when 2 then ''SET NULL'' when 3 then ''SET DEFAULT'' else NULL end) as UPDATE_RULE varchar(20),
- (case DELETE_RULE when 0 then ''NO ACTION'' when 1 then ''CASCADE'' when 2 then ''SET NULL'' when 3 then ''SET DEFAULT'' else NULL end) as DELETE_RULE varchar(20),
- PK_NAME,
- FK_NAME,
- 3 as DEFERRABILITY SMALLINT
- from DB.DBA.SYS_FOREIGN_KEYS SYS_FOREIGN_KEYS
- where name_part (PK_TABLE, 0) like ?
- and name_part (PK_TABLE, 1) like ?
- and name_part (PK_TABLE, 2) like ?
- and name_part (FK_TABLE, 0) like ?
- and name_part (FK_TABLE, 1) like ?
- and name_part (FK_TABLE, 2) like ?
- order by 1, 2, 3, 7, 8, 9, 13 '
- , null, null,
- vector(p_cat, p_sch, p_tbl, f_cat, f_sch, f_tbl), 0, mdta, dta);
+ if (exists (select 1 from DB.DBA.SYS_REMOTE_TABLE where RT_NAME like _tbl))
+ {
+ declare _dsn, r_name, _rt_name any;
+ select RT_DSN, RT_REMOTE_NAME, RT_NAME into _dsn, r_name, _rt_name
+ from DB.DBA.SYS_REMOTE_TABLE where RT_NAME like _tbl;
+ r_name := '%.' || r_name;
+ stmt := 'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = ''' || r_name ||
+ ''' AND FK_TABLE = ''' || _rt_name
+ || ''' AND DSN = ''' || xmla_get_dsn_name (_dsn) || '''';
+ }
+ else
+ stmt := 'SELECT name_part (PK_TABLE, 1) as PK_TABLE_SCHEMA,
+ name_part (PK_TABLE, 2) as PK_TABLE_NAME, PKCOLUMN_NAME as PK_COLUMN_NAME,
+ name_part (FK_TABLE, 1) as FK_TABLE_SCHEMA,
+ name_part (FK_TABLE, 2) as FK_TABLE_NAME, FKCOLUMN_NAME AS FK_COLUMN_NAME,
+ KEY_SEQ, UPDATE_RULE, DELETE_RULE, FK_NAME
+ FROM DB.DBA.SYS_FOREIGN_KEYS WHERE PK_TABLE like ''' || _tbl || ''' OR FK_TABLE like ''' || _tbl || '''';
}
else
{
dsn := xmla_get_dsn_name (dsn);
- stmt := 'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = '''
- || _ptbl || ''' AND FK_TABLE = ''' || _ftbl
- || ''' AND DSN = ''' || dsn || '''';
- exec (stmt, state, msg, vector (), 0, mdta, dta);
+ stmt := 'SELECT * FROM DB.DBA.SYS_FOREIGN_KEYS_VIEW WHERE PK_TABLE = ''' || _tbl || ''' AND FK_TABLE = ''' || _tbl
+ || ''' AND DSN = ''' || dsn || '''';
}
+ exec (stmt, state, msg, vector (), 0, mdta, dta);
xmla_make_struct (mdta, dta);
self.metadata := mdta;
return dta;
@@ -1024,66 +946,35 @@ create method xmla_dbschema_primary_keys () for xmla_discover
{
declare state, msg, dta, mdta, stmt any;
declare dsn, cat, tb, col, sch any;
- declare _tbl varchar;
+ declare uname, passwd, _tbl varchar;
dsn := self.xmla_get_property ('DataSourceInfo', xmla_service_name ());
dsn := xmla_get_dsn_name (dsn);
cat := self.xmla_get_restriction ('TABLE_CATALOG', '%');
sch := self.xmla_get_restriction ('TABLE_SCHEMA', '%');
tb := self.xmla_get_restriction ('TABLE_NAME', '%');
-
- if (cat is null)
- cat := '%';
- if (sch is null)
- sch := '%';
- if (tb is null)
- tb := '%';
-
+ uname := self.xmla_get_property ('UserName', null);
+ passwd := self.xmla_get_property ('Password', null);
cat := trim (cat, '"');
sch := trim (sch, '"');
tb := trim (tb, '"');
_tbl := cat || '.' || sch || '.' || tb;
+ if (uname is null or passwd is null)
+ signal ('00002', 'Unable to process the request, because the UserName property is not set or incorrect');
+
if (not xmla_not_local_dsn (dsn))
{
- declare uname, passwd varchar;
- uname := self.xmla_get_property ('UserName', null);
- passwd := self.xmla_get_property ('Password', null);
- if (uname is null or passwd is null)
- signal ('00002', 'Unable to process the request, because the UserName property is not set or incorrect');
set_user_id (uname, 1, passwd);
- exec('select
- name_part(KEY_TABLE, 0) AS TABLE_CATALOG NVARCHAR(128),
- name_part(KEY_TABLE, 1) AS TABLE_SCHEMA NVARCHAR(128),
- name_part(KEY_TABLE, 2) AS TABLE_NAME NVARCHAR(128),
- "COLUMN" as COLUMN_NAME NVARCHAR(128),
- NULL as COLUMN_GUID,
- NULL as COLUMN_POPID INTEGER,
- (KP_NTH + 1) as ORDINAL,
- name_part(KEY_NAME, 2) as PK_NAME
- from DB.DBA.SYS_KEYS, DB.DBA.SYS_KEY_PARTS, DB.DBA.SYS_COLS
- where
- __any_grants(KEY_TABLE) and
- name_part(KEY_TABLE, 0) LIKE ? and
- name_part(KEY_TABLE, 1) LIKE ? and
- name_part(KEY_TABLE, 2) LIKE ? and
- KEY_IS_MAIN = 1 and
- KEY_MIGRATE_TO is null and
- KP_KEY_ID = KEY_ID and
- KP_NTH < KEY_DECL_PARTS and
- COL_ID = KP_COL and
- "COLUMN" <> ''_IDN''
- order by KEY_TABLE'
- , null, null,
- vector(cat, sch, tb), 0, mdta, dta);
+ stmt := sprintf ('SELECT COLUMN_NAME FROM %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS LEFT JOIN %s.INFORMATION_SCHEMA.KEY_COLUMN_USAGE ON %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS.CONSTRAINT_NAME = %s.INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME WHERE CONSTRAINT_TYPE = ''PRIMARY KEY'' AND %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS.TABLE_NAME=''%s'' AND %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS.TABLE_SCHEMA=''%s'' AND %s.INFORMATION_SCHEMA.TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA=''%s'' AND %s.INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA=''%s'' AND %s.INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA=''%s''', cat, cat, cat, cat, cat, tb, cat, sch, cat, sch, cat, sch, cat, sch);
}
else
{
dsn := xmla_get_dsn_name (dsn);
stmt := 'SELECT * FROM DB.DBA.SYS_PRIMARY_KEYS_VIEW WHERE PK_TABLE = ''' || _tbl || ''' AND DSN = ''' || dsn || '''';
- exec (stmt, state, msg, vector (), 0, mdta, dta);
}
+ exec (stmt, state, msg, vector (), 0, mdta, dta);
xmla_make_struct (mdta, dta);
self.metadata := mdta;
return dta;
@@ -1175,21 +1066,13 @@ create method xmla_dbschema_provider_types () for xmla_discover
create method xmla_dbschema_tables () for xmla_discover
{
declare dta, mdta any;
- declare dsn, cat, sch, tb any;
+ declare dsn, cat, tb any;
dsn := self.xmla_get_property ('DataSourceInfo', xmla_service_name ());
dsn := xmla_get_dsn_name (dsn);
- cat := self.xmla_get_restriction ('TABLE_CATALOG', 'DB');
- sch := self.xmla_get_restriction ('TABLE_SCHEMA', '%');
+ --cat := self.xmla_get_property ('Catalog', 'DB');
tb := self.xmla_get_restriction ('TABLE_NAME', '%');
-
- if (cat is null)
- cat := 'DB';
- if (sch is null)
- sch := '%';
- if (tb is null)
- tb := '%';
-
+ cat := self.xmla_get_restriction ('TABLE_CATALOG', 'DB');
if (not xmla_not_local_dsn (dsn))
{
declare uname, passwd varchar;
@@ -1209,12 +1092,9 @@ create method xmla_dbschema_tables () for xmla_discover
NULL as DATE_MODIFIED DATE
from DB.DBA.SYS_KEYS where
__any_grants(KEY_TABLE) and
- name_part(KEY_TABLE, 0) like ? and
- name_part(KEY_TABLE, 1) like ? and
- name_part(KEY_TABLE, 2) like ?
- and KEY_IS_MAIN = 1 and
- KEY_MIGRATE_TO is null', null, null,
- vector (cat, sch, tb), 0, mdta, dta);
+ name_part(KEY_TABLE, 0) = ? and name_part(KEY_TABLE, 2) like ?
+ and KEY_IS_MAIN = 1 and KEY_MIGRATE_TO is null', null, null,
+ vector (cat, tb), 0, mdta, dta);
}
else
{
@@ -1252,11 +1132,12 @@ xmla_get_schs ()
soap_box_structure ('TABLE_CATALOG', '', 'TABLE_SCHEMA', '', 'TABLE_NAME', '', 'TABLE_TYPE', '', 'COLUMN_NAME', '')
,''),
vector ('DBSCHEMA_PRIMARY_KEYS',
- soap_box_structure ('TABLE_CATALOG', '', 'TABLE_SCHEMA', '', 'TABLE_NAME', '')
+ soap_box_structure ('TABLE_CATALOG', '', 'TABLE_SCHEMA', '', 'TABLE_NAME', '', 'TABLE_TYPE', '', 'COLUMN_NAME', '')
,''),
vector ('DBSCHEMA_FOREIGN_KEYS',
- soap_box_structure ('PK_TABLE_CATALOG', '', 'PK_TABLE_SCHEMA', '', 'PK_TABLE_NAME', '',
- 'FK_TABLE_CATALOG', '', 'FK_TABLE_SCHEMA', '', 'FK_TABLE_NAME', '')
+ soap_box_structure ('PK_TABLE_SCHEMA', '', 'PK_TABLE_NAME', '', 'PK_COLUMN_NAME', '',
+ 'FK_TABLE_SCHEMA', '', 'FK_TABLE_NAME', '', 'FK_COLUMN_NAME', '',
+ 'KEY_SEQ', '', 'UPDATE_RULE', '', 'DELETE_RULE', '', 'FK_NAME', '')
,''),
vector ('DBSCHEMA_PROVIDER_TYPES',
soap_box_structure ('DATA_TYPE', '', 'BEST_MATCH', '')
diff --git a/libsrc/Wi/xmlenc-dec.c b/libsrc/Wi/xmlenc-dec.c
index bcd8c26..1088799 100644
--- a/libsrc/Wi/xmlenc-dec.c
+++ b/libsrc/Wi/xmlenc-dec.c
@@ -3,12 +3,12 @@
*
* XML Encryption spec part 2 - decryption
*
- * $Id: xmlenc-dec.c,v 1.5.2.5 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlenc-dec.c,v 1.5.2.4 2010/10/07 23:31:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlenc.c b/libsrc/Wi/xmlenc.c
index 6e9f087..1ededfc 100644
--- a/libsrc/Wi/xmlenc.c
+++ b/libsrc/Wi/xmlenc.c
@@ -1,12 +1,12 @@
/*
* xmlenc.c
*
- * $Id: xmlenc.c,v 1.16.2.21 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlenc.c,v 1.16.2.17 2011/10/13 11:04:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -4587,8 +4587,8 @@ void xenc_generate_key_taglist (query_instance_t * qi, xenc_key_inst_t * xki, dk
caddr_t *
xenc_generate_security_tags (query_instance_t* qi, xpath_keyinst_t ** arr,
- dsig_signature_t * dsig, int generate_ref_list, caddr_t * err_ret,
- wsse_ser_ctx_t * sctx)
+ dsig_signature_t * dsig, int generate_ref_list, caddr_t * err_ret,
+ wsse_ser_ctx_t * sctx)
{
int inx;
dk_set_t l = 0;
@@ -6284,7 +6284,6 @@ bif_xenc_x509_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
caddr_t * subj = (caddr_t *) bif_strict_array_or_null_arg (qst, args, 4, "xenc_x509_generate");
caddr_t * exts = (caddr_t *) bif_strict_array_or_null_arg (qst, args, 5, "xenc_x509_generate");
float hours = BOX_ELEMENTS (args) > 6 ? (float) bif_float_arg (qst, args, 6, "xenc_x509_generate") : 0;
- caddr_t digest_name = BOX_ELEMENTS (args) > 7 ? bif_string_arg (qst, args, 7, "xenc_x509_generate") : "sha1";
xenc_key_t * ca_key = xenc_get_key_by_name (key_name, 1);
xenc_key_t * cli_key = xenc_get_key_by_name (cli_pub_key, 1);
X509 *x = NULL;
@@ -6293,10 +6292,6 @@ bif_xenc_x509_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
DSA *dsa = NULL;
X509_NAME *name = NULL;
int i;
- const EVP_MD *digest = EVP_get_digestbyname (digest_name);
-
- if (!digest)
- sqlr_new_error ("42000", "XECXX", "Cannot find digest %s", digest_name);
/* check ca cert */
if (!ca_key || !ca_key->xek_evp_private_key || !ca_key->xek_x509)
@@ -6402,7 +6397,7 @@ bif_xenc_x509_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
x509_add_ext (x, nid, exts[i+1]);
}
- if (!X509_sign (x, pk, digest))
+ if (!X509_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1()) ))
{
pk = NULL; /* keep one in the xenc_key */
*err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
@@ -6428,8 +6423,6 @@ bif_xenc_x509_ss_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** arg
long days = bif_long_arg (qst, args, 2, "xenc_x509_ss_generate");
caddr_t * subj = (caddr_t *) bif_strict_array_or_null_arg (qst, args, 3, "xenc_x509_ss_generate");
caddr_t * exts = (caddr_t *) bif_strict_array_or_null_arg (qst, args, 4, "xenc_x509_ss_generate");
- float hours = BOX_ELEMENTS (args) > 5 ? (float) bif_float_arg (qst, args, 5, "xenc_x509_ss_generate") : 0;
- caddr_t digest_name = BOX_ELEMENTS (args) > 6 ? bif_string_arg (qst, args, 6, "xenc_x509_ss_generate") : "sha1";
xenc_key_t * key = xenc_get_key_by_name (key_name, 1);
X509 *x = NULL;
EVP_PKEY *pk = NULL;
@@ -6438,10 +6431,6 @@ bif_xenc_x509_ss_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** arg
X509_NAME *name = NULL;
char buf [512];
int i;
- const EVP_MD *digest = EVP_get_digestbyname (digest_name);
-
- if (!digest)
- sqlr_new_error ("42000", "XECXX", "Cannot find digest %s", digest_name);
if (!key)
{
@@ -6549,7 +6538,7 @@ bif_xenc_x509_ss_generate (caddr_t * qst, caddr_t * err_ret, state_slot_t ** arg
x509_add_ext (x, nid, exts[i+1]);
}
- if (!X509_sign (x, pk, digest))
+ if (!X509_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
{
pk = NULL; /* keep one in the xenc_key */
*err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
@@ -6929,8 +6918,8 @@ bif_xenc_pem_export (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
b = BIO_new (BIO_s_mem());
if (key->xek_x509)
{
- PEM_write_bio_X509 (b, key->xek_x509);
- if (pkey && key->xek_evp_private_key)
+ PEM_write_bio_X509 (b, key->xek_x509);
+ if (pkey && key->xek_evp_private_key)
PEM_write_bio_PrivateKey (b, key->xek_evp_private_key, enc, NULL, 0, NULL, pass);
}
else if (key->xek_type == DSIG_KEY_RSA)
@@ -6973,22 +6962,22 @@ bif_xenc_pubkey_pem_export (caddr_t * qst, caddr_t * err_ret, state_slot_t ** ar
b = BIO_new (BIO_s_mem());
if (key->xek_x509)
{
- k = X509_get_pubkey (key->xek_x509);
+ k = X509_get_pubkey (key->xek_x509);
#ifdef EVP_PKEY_RSA
- if (k->type == EVP_PKEY_RSA)
- {
- RSA * x = k->pkey.rsa;
+ if (k->type == EVP_PKEY_RSA)
+ {
+ RSA * x = k->pkey.rsa;
PEM_write_bio_RSA_PUBKEY (b, x);
- }
+ }
#endif
#ifdef EVP_PKEY_DSA
- if (k->type == EVP_PKEY_DSA)
- {
- DSA * x = k->pkey.dsa;
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
+ if (k->type == EVP_PKEY_DSA)
+ {
+ DSA * x = k->pkey.dsa;
+ PEM_write_bio_DSA_PUBKEY (b, x);
+ }
#endif
- EVP_PKEY_free (k);
+ EVP_PKEY_free (k);
}
else if (key->xek_type == DSIG_KEY_RSA)
PEM_write_bio_RSA_PUBKEY (b, key->xek_rsa);
@@ -7013,61 +7002,6 @@ err:
}
static caddr_t
-bif_xenc_pubkey_der_export (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t key_name = bif_string_arg (qst, args, 0, "xenc_pubkey_DER_export");
- xenc_key_t * key = xenc_get_key_by_name (key_name, 1);
- BIO * b;
- char *data_ptr;
- int len;
- caddr_t ret = NULL;
- EVP_PKEY * k;
-
- if (!key)
- goto err;
-
- b = BIO_new (BIO_s_mem());
- if (key->xek_x509)
- {
- k = X509_get_pubkey (key->xek_x509);
-#ifdef EVP_PKEY_RSA
- if (k->type == EVP_PKEY_RSA)
- {
- RSA * x = k->pkey.rsa;
- i2d_RSA_PUBKEY_bio (b, x);
- }
-#endif
-#ifdef EVP_PKEY_DSA
- if (k->type == EVP_PKEY_DSA)
- {
- DSA * x = k->pkey.dsa;
- i2d_DSA_PUBKEY_bio (b, x);
- }
-#endif
- EVP_PKEY_free (k);
- }
- else if (key->xek_type == DSIG_KEY_RSA)
- i2d_RSA_PUBKEY_bio (b, key->xek_rsa);
- else if (key->xek_type == DSIG_KEY_DSA)
- i2d_DSA_PUBKEY_bio (b, key->xek_dsa);
- else
- {
- BIO_free (b);
- goto err;
- }
- len = BIO_get_mem_data (b, &data_ptr);
- if (len > 0 && data_ptr)
- {
- ret = dk_alloc_box (len, DV_BIN);
- memcpy (ret, data_ptr, len);
- }
- BIO_free (b);
- return ret;
-err:
- return NEW_DB_NULL;
-}
-
-static caddr_t
BN2binbox (BIGNUM * x)
{
size_t buf_len, n;
@@ -7148,83 +7082,6 @@ bif_xenc_pubkey_magic_export (caddr_t * qst, caddr_t * err_ret, state_slot_t **
return ret;
}
-static int
-xenc_ssh_encode (caddr_t dest, caddr_t src)
-{
- int32 new_len, len, pos;
- new_len = len = box_length (src);
- if (*src & 0x80)
- {
- new_len++;
- dest[4] = 0;
- pos = 5;
- }
- else
- {
- pos = 4;
- }
- LONG_SET_NA (dest, new_len);
- memcpy(&dest[pos], src, len);
- return pos + len;
-}
-
-static caddr_t
-xenc_rsa_pub_ssh_export (RSA * x)
-{
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
- caddr_t ret;
- int len, pos;
- caddr_t n = BN2binbox (x->n); /* modulus */
- caddr_t e = BN2binbox (x->e); /* public exponent */
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
- if (e[0] & 0x80)
- len ++;
- ret = dk_alloc_box (len, DV_BIN);
- memcpy (ret, ssh_header, 11);
- pos = xenc_ssh_encode (&ret[11], e);
- pos = xenc_ssh_encode (&ret[11 + pos], n);
- dk_free_box (n);
- dk_free_box (e);
- ret = xenc_encode_base64_binbox (ret, 1);
- return ret;
-}
-
-static caddr_t
-bif_xenc_pubkey_ssh_export (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- caddr_t key_name = bif_string_arg (qst, args, 0, "xenc_pubkey_ssh_export");
- xenc_key_t * key = xenc_get_key_by_name (key_name, 1);
- caddr_t ret = NULL;
- EVP_PKEY * k;
-
- if (!key)
- SQLR_NEW_KEY_ERROR (key_name);
-
- if (key->xek_x509)
- {
- k = X509_get_pubkey (key->xek_x509);
-#ifdef EVP_PKEY_RSA
- if (k->type == EVP_PKEY_RSA)
- {
- RSA * x = k->pkey.rsa;
- ret = xenc_rsa_pub_ssh_export (x);
- }
-#endif
- EVP_PKEY_free (k);
- }
- else if (key->xek_type == DSIG_KEY_RSA)
- {
- RSA * x = key->xek_rsa;
- ret = xenc_rsa_pub_ssh_export (x);
- }
- else
- sqlr_new_error ("42000", "XENC..", "The key type is not supported for export.");
-
- return ret;
-}
-
static caddr_t
bif_xenc_SPKI_read (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
@@ -7381,9 +7238,7 @@ void bif_xmlenc_init ()
bif_define ("xenc_pkcs12_export", bif_xenc_pkcs12_export);
bif_define ("xenc_pem_export", bif_xenc_pem_export);
bif_define ("xenc_pubkey_pem_export", bif_xenc_pubkey_pem_export);
- bif_define ("xenc_pubkey_DER_export", bif_xenc_pubkey_der_export);
bif_define ("xenc_pubkey_magic_export", bif_xenc_pubkey_magic_export);
- bif_define ("xenc_pubkey_ssh_export", bif_xenc_pubkey_ssh_export);
bif_define ("xenc_SPKI_read", bif_xenc_SPKI_read);
#ifdef _KERBEROS
diff --git a/libsrc/Wi/xmlenc.h b/libsrc/Wi/xmlenc.h
index d12120c..d44384f 100644
--- a/libsrc/Wi/xmlenc.h
+++ b/libsrc/Wi/xmlenc.h
@@ -1,12 +1,12 @@
/*
* xmlenc.h
*
- * $Id: xmlenc.h,v 1.6.2.5 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlenc.h,v 1.6.2.4 2010/10/13 12:12:21 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlenc_algos.c b/libsrc/Wi/xmlenc_algos.c
index 8c2e7f8..3092b21 100644
--- a/libsrc/Wi/xmlenc_algos.c
+++ b/libsrc/Wi/xmlenc_algos.c
@@ -1,12 +1,12 @@
/*
* xmlenc_algos.c
*
- * $Id: xmlenc_algos.c,v 1.8.2.4 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlenc_algos.c,v 1.8.2.3 2010/10/13 12:12:21 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlenc_algos.h b/libsrc/Wi/xmlenc_algos.h
index b5125a7..8b0e6bc 100644
--- a/libsrc/Wi/xmlenc_algos.h
+++ b/libsrc/Wi/xmlenc_algos.h
@@ -1,12 +1,12 @@
/*
* xmlenc_algos.h
*
- * $Id: xmlenc_algos.h,v 1.6.2.3 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlenc_algos.h,v 1.6.2.2 2010/10/13 12:12:21 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlenc_test.h b/libsrc/Wi/xmlenc_test.h
index e52290f..3c97305 100644
--- a/libsrc/Wi/xmlenc_test.h
+++ b/libsrc/Wi/xmlenc_test.h
@@ -1,12 +1,12 @@
/*
* xmlenc_test.h
*
- * $Id: xmlenc_test.h,v 1.3.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlenc_test.h,v 1.3.2.1 2009/04/18 21:55:18 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlgen.h b/libsrc/Wi/xmlgen.h
index c4b3ebf..67ebe47 100644
--- a/libsrc/Wi/xmlgen.h
+++ b/libsrc/Wi/xmlgen.h
@@ -1,12 +1,12 @@
/*
* xmlgen.h
*
- * $Id: xmlgen.h,v 1.2.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlgen.h,v 1.2.2.1 2009/04/18 21:55:18 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmllazy.c b/libsrc/Wi/xmllazy.c
index 697f70a..a624c67 100644
--- a/libsrc/Wi/xmllazy.c
+++ b/libsrc/Wi/xmllazy.c
@@ -1,14 +1,14 @@
/*
* xmllazy.c
*
- * $Id: xmllazy.c,v 1.3.2.3 2012/03/08 12:55:38 source Exp $
+ * $Id: xmllazy.c,v 1.3.2.2 2010/10/06 09:35:04 source Exp $
*
* A stub XML entity that is a container for data of lazy loader of XML trees
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlnode.h b/libsrc/Wi/xmlnode.h
index 8999476..ad88d21 100644
--- a/libsrc/Wi/xmlnode.h
+++ b/libsrc/Wi/xmlnode.h
@@ -1,12 +1,12 @@
/*
* xmlnode.h
*
- * $Id: xmlnode.h,v 1.4.2.5 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlnode.h,v 1.4.2.4 2010/02/01 12:53:46 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlres.h b/libsrc/Wi/xmlres.h
index 66d5626..17bb5f5 100644
--- a/libsrc/Wi/xmlres.h
+++ b/libsrc/Wi/xmlres.h
@@ -1,12 +1,12 @@
/*
* xmlres.h
*
- * $Id: xmlres.h,v 1.2.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlres.h,v 1.2.2.1 2009/04/18 21:55:18 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/xmlrpc_soap.xsl b/libsrc/Wi/xmlrpc_soap.xsl
index d116c1b..ffbfbf9 100644
--- a/libsrc/Wi/xmlrpc_soap.xsl
+++ b/libsrc/Wi/xmlrpc_soap.xsl
@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<!--
-
- - $Id: xmlrpc_soap.xsl,v 1.5.2.1 2012/03/08 12:55:38 source Exp $
+ - $Id: xmlrpc_soap.xsl,v 1.5 2009/04/09 13:22:15 source Exp $
-
- This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- project.
-
- - Copyright (C) 1998-2012 OpenLink Software
+ - Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlschema.c b/libsrc/Wi/xmlschema.c
index f284a65..177ba02 100644
--- a/libsrc/Wi/xmlschema.c
+++ b/libsrc/Wi/xmlschema.c
@@ -1,14 +1,14 @@
/*
* xmlschema.c
*
- * $Id: xmlschema.c,v 1.6.2.5 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlschema.c,v 1.6.2.4 2010/02/01 12:53:46 source Exp $
*
* Dynamic SQL Compiler, part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlsearch.c b/libsrc/Wi/xmlsearch.c
index 36d60f3..114f039 100644
--- a/libsrc/Wi/xmlsearch.c
+++ b/libsrc/Wi/xmlsearch.c
@@ -1,14 +1,14 @@
/*
* xmlsearch.c
*
- * $Id: xmlsearch.c,v 1.3.2.3 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlsearch.c,v 1.3.2.2 2009/04/18 21:55:18 source Exp $
*
* Search
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmlsql.c b/libsrc/Wi/xmlsql.c
index 5d5ad37..e3b4024 100644
--- a/libsrc/Wi/xmlsql.c
+++ b/libsrc/Wi/xmlsql.c
@@ -1,14 +1,14 @@
/*
* xmlsql.c
*
- * $Id: xmlsql.c,v 1.18.2.5 2012/03/08 12:55:38 source Exp $
+ * $Id: xmlsql.c,v 1.18.2.4 2011/08/26 17:59:53 source Exp $
*
* Dynamic SQL Compiler, part 2
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xmltree.c b/libsrc/Wi/xmltree.c
index 6f78385..54f2a35 100644
--- a/libsrc/Wi/xmltree.c
+++ b/libsrc/Wi/xmltree.c
@@ -1,14 +1,14 @@
/*
* xmltree.c
*
- * $Id: xmltree.c,v 1.43.2.27 2012/03/08 12:55:38 source Exp $
+ * $Id: xmltree.c,v 1.43.2.24 2011/08/15 15:30:15 source Exp $
*
* XPATH interpreter
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -4490,8 +4490,6 @@ xpath_funcall_or_apply (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args,
int param_count = ('f' == predicate_type) ? argcount - 2 : BOX_ELEMENTS (params);
/*caddr_t err = NULL;*/
xp_instance_t * xqi;
- XT *funcall;
- xp_func_t fn;
bif_xquery_arg (qst, args, 0, cache_ssl_idx, param_count, funname, "function name", &str, &str_is_temp, &xqr_text_ent, &xqr);
if (NULL == xqr)
{
@@ -4529,14 +4527,11 @@ xpath_funcall_or_apply (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args,
xqi = xqr_instance (xqr, qi);
QR_RESET_CTX
{
- int inx, param_ofs, param_step;
- funcall = xqr->xqr_tree;
- fn = (void *)unbox (funcall->_.xp_func.executable);
- param_ofs = ((xpf_cartesian_product_loop == fn) ? 1 : 0);
- param_step = ((xpf_cartesian_product_loop == fn) ? 2 : 1);
+ int inx;
for (inx = 0; inx < param_count; inx ++)
{
- XT *fake_var = funcall->_.xp_func.argtrees[inx * param_step + param_ofs];
+ XT *funcall = xqr->xqr_tree;
+ XT *fake_var = funcall->_.xp_func.argtrees[inx];
caddr_t param_val = (('f' == predicate_type) ? bif_arg (qst, args, 2+inx, funname) : params[inx]);
XQI_SET (xqi, fake_var->_.var.res, NULL);
#ifdef XPATH_DEBUG
@@ -4550,7 +4545,6 @@ xpath_funcall_or_apply (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args,
#endif
if ((DV_DB_NULL == DV_TYPE_OF (param_val)) || (DV_ARRAY_OF_XQVAL == DV_TYPE_OF (param_val) && 0 == BOX_ELEMENTS (param_val)))
{
- XQI_SET (xqi, fake_var->_.var.init, dk_alloc_box (0, DV_ARRAY_OF_XQVAL));
XQI_SET_INT (xqi, fake_var->_.var.state, XI_AT_END);
}
else
@@ -4621,18 +4615,6 @@ xpath_funcall_or_apply (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args,
if (xqi_set_odometer >= xqi_set_debug_start)
dk_check_tree (val);
#endif
- if ((xpf_cartesian_product_loop == fn) && (DV_ARRAY_OF_XQVAL == DV_TYPE_OF (val)))
- {
- caddr_t val0;
- if (0 == BOX_ELEMENTS (val))
- {
- dk_free_tree (val); return NEW_DB_NULL;
- }
- val0 = ((caddr_t *)val)[0];
- ((caddr_t *)val)[0] = NULL;
- dk_free_tree (val);
- return val0;
- }
return val;
}
@@ -10039,8 +10021,8 @@ caddr_t bif_xtree_sum64 (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
return xte_sum64 (src->xte_current);
}
-/*! \returns NULL for string, (caddr_t)((ptrlong)1) for unsupported, 2 for NULL, UNAME for others */
-caddr_t
+/*! \returns NULL for string, (ccaddr_t)((ptrlong)1) for unsupported, 2 for NULL, UNAME for others */
+ccaddr_t
xsd_type_of_box (caddr_t arg)
{
dtp_t dtp = DV_TYPE_OF (arg);
@@ -10061,17 +10043,17 @@ again:
case DV_DOUBLE_FLOAT: return uname_xmlschema_ns_uri_hash_double;
case DV_SINGLE_FLOAT: return uname_xmlschema_ns_uri_hash_float;
case DV_DB_NULL:
- return (caddr_t)((ptrlong)2);
+ return (ccaddr_t)((ptrlong)2);
case DV_RDF:
{
rdf_box_t *rb = (rdf_box_t *)arg;
if (RDF_BOX_DEFAULT_TYPE != rb->rb_type)
{
- caddr_t res = rdf_type_twobyte_to_iri (rb->rb_type);
+ ccaddr_t res = rdf_type_twobyte_to_iri (rb->rb_type);
if (NULL == res)
- return (caddr_t)((ptrlong)2);
+ return (ccaddr_t)((ptrlong)2);
box_flags (res) |= BF_IRI;
- return res;
+ return box_copy (res);
}
dtp = ((rb->rb_is_outlined) ? ((rdf_bigbox_t *)rb)->rbb_box_dtp : DV_TYPE_OF (rb->rb_box));
goto again; /* see above */
@@ -10079,7 +10061,7 @@ again:
case DV_XML_ENTITY:
return uname_rdf_ns_uri_XMLLiteral;
default:
- return (caddr_t)((ptrlong)1);
+ return (ccaddr_t)((ptrlong)1);
}
}
@@ -10088,7 +10070,7 @@ caddr_t
bif_xsd_type (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
caddr_t arg = bif_arg (qst, args, 0, "__xsd_type");
- caddr_t res = xsd_type_of_box (arg);
+ caddr_t res = (caddr_t) xsd_type_of_box (arg);
if (IS_BOX_POINTER (res))
return res;
switch ((ptrlong)(res))
@@ -10180,7 +10162,7 @@ xml_ent_hash (caddr_t box)
xml_entity_t *xe = (xml_entity_t *)box;
int32 chld_hash = 0;
if (XE_IS_TREE (xe))
- chld_hash = (int32)(ptrlong)(((xml_tree_ent_t *)(xe))->xte_stack_top->xteb_current);
+ chld_hash = (int32)(((xml_tree_ent_t *)(xe))->xte_stack_top->xteb_current);
else if (XE_IS_PERSISTENT (xe))
chld_hash = (int32)(((xper_entity_t *)(xe))->xper_pos);
/* No need in "if (XE_IS_LAZY (xe))", because there's no position in not-yet-loaded doc */
diff --git a/libsrc/Wi/xmltree.h b/libsrc/Wi/xmltree.h
index cb0fb77..816334f 100644
--- a/libsrc/Wi/xmltree.h
+++ b/libsrc/Wi/xmltree.h
@@ -1,12 +1,12 @@
/*
* xmltree.h
*
- * $Id: xmltree.h,v 1.27.2.18 2012/03/08 12:55:38 source Exp $
+ * $Id: xmltree.h,v 1.27.2.15 2011/07/19 23:38:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -632,6 +632,119 @@ typedef struct xp_node_s
struct xparse_ctx_s * xn_xp;
} xp_node_t;
+/*!< RDF/XML parser mode, i.e. what does the parser expect to read */
+#define XRL_PARSETYPE_TOP_LEVEL 0x01 /*!< Top-level element (rdf:RDF) */
+#define XRL_PARSETYPE_RESOURCE 0x02 /*!< Resource description */
+#define XRL_PARSETYPE_LITERAL 0x04 /*!< Literal value */
+#define XRL_PARSETYPE_RES_OR_LIT 0x06 /*!< Either resource description or a literal */
+#define XRL_PARSETYPE_PROPLIST 0x08 /*!< Sequence of properties of a resource */
+#define XRL_PARSETYPE_EMPTYPROP 0x10 /*!< Nothing but ending tag of property */
+#define XRL_PARSETYPE_COLLECTION 0x22 /*!< First resource inside collection, other resources are recognized by */
+
+/*! Stack part of RDF/XML-specific context of XML parser.
+These are fields of quad to be created.
+"Inheritable" fields are propagated from the parent. Pointers are copied, strings are not copied. */
+typedef struct xp_rdfxml_locals_s
+{
+ struct xp_rdfxml_locals_s *xrl_parent; /*!< Pointer to parent context */
+ xp_node_t * xrl_xn; /*!< Node whose not-yet-closed element corresponds to the given context */
+ caddr_t xrl_subject; /*!< Subject (IRI of named node or blank node IRI_ID); subject is used for nested predicates */
+ caddr_t xrl_predicate; /*!< Predicate (IRI of named node or blank node IRI_ID) */
+ caddr_t xrl_base; /*!< Base to resolve relative URIs, inheritable */
+ caddr_t xrl_language; /*!< Language tag as string or NULL, inheritable */
+ caddr_t xrl_datatype; /*!< Object data type (named node IRI_ID), not inheritable */
+ caddr_t xrl_reification_id; /*!< ID used to reify a statement as four quads for S,P,O and rdf:type rdfs:Statement. */
+ int xrl_li_count; /*!< Counter of used LI, not inheritable */
+ dk_set_t xrl_seq_items; /*!< Backstack of "Sequence" parseType subjects */
+ int xrl_parsetype:8; /*!< Parse type (one of XRL_DATATYPE_NNN), not inheritable */
+ char xrl_base_set:8;
+ char xrl_language_set:8;
+} xp_rdfxml_locals_t;
+
+#define RDFA_ICT_PRED_REL_OR_TYPEOF 200 /*!< Forward with ref object */
+#define RDFA_ICT_PRED_REV 201 /*!< Reverse predicate */
+#define RDFA_ICT_PRED_PROPERTY 202 /*!< Forward predicate with literal object */
+
+/*! [I]n[C]omplete [T]riple.
+We should keep subject instead of use of innermost xrdfal_subj.
+This is for incomplete triples inside HEAD, they may wait for BASE definition and contain different "about" attributes. */
+typedef struct rdfa_ict_s
+{
+ ptrlong ict_pred_type; /*!< Predicate type, one of RDFA_ICT_PRED_xxx values */
+ caddr_t ict_left; /*!< Subject by default and object if \c ict_pred_type == RDFA_ICT_PRED_REV */
+ caddr_t ict_pred; /*!< Predicate */
+ caddr_t ict_right; /*!< Object by default and subject if \c ict_pred_type == RDFA_ICT_PRED_REV */
+ caddr_t ict_datatype; /*!< Datatype of a literal object */
+ caddr_t ict_language; /*!< Language of a literal object */
+ ptrlong ict_used_as_template; /*!< The ICT itself was used as a template for cases like <X rel="p"><Y typeof="t" /></X> (even if was not completed) */
+} rdfa_ict_t;
+
+#define RDFA_IN_HTML 0x01 /*!< The current tag is XHTML top (or nested), respect <HEAD> and <BODY> if found inside */
+#define RDFA_IN_HEAD 0x02 /*!< The current tag is HEAD in XHTML (or nested), the doc is now default subject, do not feed triples immediately to handle <BASE> */
+#define RDFA_IN_BASE 0x04 /*!< The current tag is BASE in HEAD in XHTML (or nested), the content will go to all \c xrdfal_base throughout the stack. */
+#define RDFA_IN_BODY 0x08 /*!< The current tag is BODY in XHTML (or nested), the doc is now default subject, do feed triples as soon as they're complete */
+#define RDFA_IN_LITERAL 0x10 /*!< The parser runs inside an XML literal or a string literal or an unused subtree, because there was a "property" attribute */
+#define RDFA_IN_UNUSED 0x20 /*!< The parser runs inside an element with "content" attribute. The attribute is used as a string literal already so there's nothing to do in a subtree. Similarly, it is used for internals of <base href="...">...</base> */
+#define RDFA_IN_STRLITERAL 0x40 /*!< The parser runs inside an element with explicit datatype other than rdf:XMLLiteral, so all non-text items should be ignored, only texts are important. */
+#define RDFA_IN_XMLLITERAL 0x80 /*!< The parser runs inside an element with explicit rdf:XMLLiteral datatype or datatype is not present but non-text nodes were found. */
+
+/*! Stack part of RDFa-specific context of XML parser.
+Unlike RDF/XML, not every opened tag gets its own stack item, because many of them lacks RDFa-specific data at all.
+RDFa locals are popped only when an XML element to close corresponds to xrdfal_xn of the innermost local context */
+
+typedef struct xp_rdfa_locals_s
+{
+ struct xp_rdfa_locals_s *xrdfal_parent; /*!< Pointer to parent context */
+ xp_node_t * xrdfal_xn; /*!< Node whose not-yet-closed element corresponds to the given context */
+ int xrdfal_place_bits; /*!< A combination of RDFA_IN_... bits */
+ caddr_t xrdfal_subj; /*!< A [new subject] as set at the end of parsing the opening tag. It can be NULL, look up */
+ caddr_t xrdfal_obj_res; /*!< A [current object resource] as set at the end of parsing the opening tag or created as bnode after that */
+ caddr_t xrdfal_datatype; /*!< Datatype IRI */
+ caddr_t xrdfal_base; /*!< Base to resolve relative links as set by <BASE> now in XSLT+RDFa and may be set by xml:base in other XML docs. Automatically inherited from parent */
+ caddr_t xrdfal_language; /*!< Language label. Automatically inherited from parent */
+ caddr_t xrdfal_vocab; /*!< Vocabulary URI. Automatically inherited from parent */
+ caddr_t * xrdfal_profile_terms; /*!< Definitions of terms from an external RDFa profile resource, get-keyword style, sorted by terms for \c ecm_find_name(). Automatically inherited from parent */
+ rdfa_ict_t * xrdfal_ict_buffer; /*!< Storage for incomplete triples, may contain NULLs at the end */
+ int xrdfal_ict_count; /*!< Count of stored incomplete triples */
+ int xrdfal_boring_opened_elts; /*!< Number of opened but not yet closed elements inside RDFA_IN_STRLITERAL or RDFA_IN_UNUSED or "uninteresting" elements between \c xrdfal_xn and next nested \c xp_rdfa_locals_t in chain */
+} xp_rdfa_locals_t;
+
+#define RDFA_ATTR_ABOUT 0
+#define RDFA_ATTR_CONTENT 1
+#define RDFA_ATTR_DATATYPE 2
+#define RDFA_ATTR_HREF 3
+#define RDFA_ATTR_PREFIX 4
+#define RDFA_ATTR_PROFILE 5
+#define RDFA_ATTR_PROPERTY 6
+#define RDFA_ATTR_REL 7
+#define RDFA_ATTR_RESOURCE 8
+#define RDFA_ATTR_REV 9
+#define RDFA_ATTR_SRC 10
+#define RDFA_ATTR_TYPEOF 11
+#define RDFA_ATTR_VOCAB 12
+#define RDFA_ATTR_XML_BASE 13
+#define RDFA_ATTR_XML_LANG 14
+#define COUNTOF__RDFA_ATTR 15
+
+/*! This structure is kept in RDFa parser as a DV_ARRAY_OF_POINTER and freed in case of error, to avoid memleaks.
+It is allocated once and only partially cleaned by callback calls. */
+typedef struct xp_tmp_s
+{
+/* RDFa part: */
+ caddr_t xpt_base; /*!< Readed but not saved xml:base */
+ caddr_t xpt_lang; /*!< Readed but not saved xml:lang */
+ caddr_t xpt_dt; /*!< Readed, not expanded and not saved datatype */
+ caddr_t xpt_src; /*!< Readed, not expanded and not saved subj (obj for reverse preds) */
+ caddr_t xpt_href; /*!< Readed, not expanded and not saved obj (subj for reverse preds or triple from element w/o "rel" or "rev") */
+ caddr_t *xpt_rel_preds; /*!< Readed, not expanded and not saved "rel" predicates */
+ caddr_t *xpt_rev_preds; /*!< Readed, not expanded and not saved "rev" predicates */
+ caddr_t *xpt_prop_preds; /*!< Readed, not expanded and not saved "property" predicates */
+ caddr_t *xpt_typeofs; /*!< Readed, not expanded and not saved "typeof" types */
+ caddr_t xpt_obj_res; /*!< Readed, not expanded and not saved object resource OR composed and not saved bnode object */
+ caddr_t xpt_obj_content; /*!< Readed but not saved content of literal object */
+} xp_tmp_t;
+
+
typedef struct xslt_template_uses_s
{
long xstu_byname_calls;
@@ -717,7 +830,7 @@ typedef struct xslt_sheet_s
extern xslt_number_format_t *xsnf_default;
-/*! Context of an XML parsers (XML, XSLT, RDF/XML, RDFa, Microdata) */
+/*! Context of an XML parsers (XML, XSLT, RDF/XML, RDFa) */
typedef struct xparse_ctx_s
{
struct xparse_ctx_s * xp_parent; /*!< Context of parent parser (not-NULL when a parser reads GE (generic entity) nested in other document) */
@@ -757,16 +870,16 @@ typedef struct xparse_ctx_s
int xp_namespaces_are_valid;
caddr_t xp_top_excl_res_prefx; /*!< The value of exclude-result-prefixes XSLT attribute */
struct triple_feed_s *xp_tf; /*!< Triple feeder (for both RDF/XML and RDFa) */
- struct xp_rdfxml_locals_s * xp_rdfxml_locals;
- struct xp_rdfxml_locals_s * xp_rdfxml_free_list;
- struct xp_rdfa_locals_s * xp_rdfa_locals;
- struct xp_rdfa_locals_s * xp_rdfa_free_list;
- struct xp_mdata_locals_s * xp_mdata_locals;
- struct xp_mdata_locals_s * xp_mdata_free_list;
- struct xp_tmp_s * xp_tmp;
+ xp_rdfxml_locals_t * xp_rdfxml_locals;
+ xp_rdfxml_locals_t * xp_rdfxml_free_list;
+ xp_rdfa_locals_t * xp_rdfa_locals;
+ xp_rdfa_locals_t * xp_rdfa_free_list;
+ xp_tmp_t * xp_tmp;
} xparse_ctx_t;
-extern void xp_free_rdf_parser_fields (xparse_ctx_t * xp);
+extern void xp_pop_rdf_locals (xparse_ctx_t *xp);
+extern void xp_pop_rdfa_locals (xparse_ctx_t *xp);
+extern xp_rdfxml_locals_t *xp_push_rdf_locals (xparse_ctx_t *xp);
extern void xp_element (void *userdata, char * name, vxml_parser_attrdata_t *attrdata);
extern void xp_element_end (void *userdata, const char * name);
diff --git a/libsrc/Wi/xpath.c b/libsrc/Wi/xpath.c
index 57968c3..a78c309 100644
--- a/libsrc/Wi/xpath.c
+++ b/libsrc/Wi/xpath.c
@@ -1,14 +1,14 @@
/*
* xpath.c
*
- * $Id: xpath.c,v 1.15.2.16 2012/03/08 12:55:38 source Exp $
+ * $Id: xpath.c,v 1.15.2.14 2011/07/19 23:38:35 source Exp $
*
* XPATH to SQL
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -4867,15 +4867,14 @@ shuric_t *xqr_shuric_retrieve (query_instance_t *qi, caddr_t uri, caddr_t *err_r
xp_query_t *
xqr_stub_for_funcall (xpf_metadata_t *metas, int argcount)
{
- int argctr, allctr, iterctr, itercount;
+ int argctr;
xp_env_t l_xe;
xpp_t l_xpp;
xp_query_t *xqr = (xp_query_t *) dk_alloc_box_zero (sizeof (xp_query_t), DV_XPATH_QUERY);
int n_slots, fill = 0;
ptrlong *map;
- XT **arg_array = (XT **)dk_alloc_box (argcount * sizeof (XT *), DV_ARRAY_OF_POINTER);
+ XT **arg_array = dk_alloc_box (argcount * sizeof (XT *), DV_ARRAY_OF_POINTER);
XT *var = NULL;
- XT *call;
memset (&l_xe, 0, sizeof (xp_env_t));
memset (&l_xpp, 0, sizeof (xpp_t));
l_xpp.xpp_xp_env = &l_xe;
@@ -4890,63 +4889,15 @@ xqr_stub_for_funcall (xpf_metadata_t *metas, int argcount)
arg_array[argctr] = xp_make_variable_ref (&l_xpp, buf);
arg_array[argctr]->type = XP_FAKE_VAR;
}
- call = xtlist_with_tail (&l_xpp, 8, (caddr_t)arg_array, CALL_STMT,
+ xqr->xqr_tree = xtlist_with_tail (&l_xpp, 8, (caddr_t)arg_array, CALL_STMT,
box_dv_uname_string (metas->xpfm_name),
box_num((ptrlong)(metas->xpfm_executable)),
(ptrlong)(metas->xpfm_res_dtp),
xe_new_xqst (&l_xpp, XQST_REF),
xe_new_xqst (&l_xpp, XQST_REF),
var );
- for (itercount = allctr = 0; allctr < argcount; allctr++)
- {
- int descr_idx = allctr;
- xpfm_arg_descr_t *descr;
- if (descr_idx > metas->xpfm_main_arg_no)
- descr_idx = (int) (metas->xpfm_main_arg_no + ((descr_idx-metas->xpfm_main_arg_no) % metas->xpfm_tail_arg_no));
- descr = metas->xpfm_args+descr_idx;
- if (descr->xpfma_is_iter)
- itercount++;
- }
- if (itercount != 0)
- {
- XT **iter_vars = (XT **) dk_alloc_box_zero ((itercount * 2 + 1) * sizeof (XT *), DV_ARRAY_OF_POINTER);
- XT *cart_var = NULL;
- XT *cart;
- if (NULL != var)
- {
- cart_var = xp_make_variable_ref (&l_xpp, "Cartesian product");
- }
- cart = xtlist_with_tail (&l_xpp, 8, (caddr_t)iter_vars, CALL_STMT,
- box_dv_uname_string ("(internal) Cartesian product loop"),
- box_num((ptrlong)(xpf_cartesian_product_loop)),
- DV_ARRAY_OF_XQVAL,
- xe_new_xqst (&l_xpp, XQST_REF),
- xe_new_xqst (&l_xpp, XQST_REF),
- cart_var );
- for (iterctr = allctr = 0; allctr < argcount; allctr++)
- {
- int descr_idx = allctr;
- xpfm_arg_descr_t *descr;
- if (descr_idx > metas->xpfm_main_arg_no)
- descr_idx = (int) (metas->xpfm_main_arg_no + ((descr_idx-metas->xpfm_main_arg_no) % metas->xpfm_tail_arg_no));
- descr = metas->xpfm_args+descr_idx;
- if (descr->xpfma_is_iter)
- {
- char buf[30];
- sprintf (buf, " %d", l_xe.xe_xqst_ctr);
- cart->_.xp_func.argtrees[iterctr*2] =
- xtlist (&l_xpp, 4, XP_LITERAL, NULL, box_dv_uname_string(buf), xe_new_xqst (&l_xpp, XQST_REF));
- cart->_.xp_func.argtrees[iterctr*2+1] =
- call->_.xp_func.argtrees[allctr];
- call->_.xp_func.argtrees[allctr] = xp_make_variable_ref(&l_xpp, buf);
- iterctr++;
- }
- }
- cart->_.xp_func.argtrees[itercount*2] = call;
- call = cart;
- }
- xqr->xqr_tree = call;
xqr->xqr_instance_length = sizeof (caddr_t) * l_xe.xe_xqst_ctr;
+
n_slots = dk_set_length (xqr->xqr_state_map);
map = (ptrlong *) dk_alloc_box (sizeof (ptrlong) * n_slots, DV_SHORT_STRING);
DO_SET (ptrlong, pos, &xqr->xqr_state_map)
diff --git a/libsrc/Wi/xpath.h b/libsrc/Wi/xpath.h
index fad7702..0a7e3ba 100644
--- a/libsrc/Wi/xpath.h
+++ b/libsrc/Wi/xpath.h
@@ -1,12 +1,12 @@
/*
* xpath.h
*
- * $Id: xpath.h,v 1.5.2.6 2012/03/08 12:55:38 source Exp $
+ * $Id: xpath.h,v 1.5.2.5 2011/01/28 13:28:03 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xpathp.c b/libsrc/Wi/xpathp.c
index 0bd5fd9..071152c 100644
--- a/libsrc/Wi/xpathp.c
+++ b/libsrc/Wi/xpathp.c
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,7 +29,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -45,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -53,117 +55,17 @@
/* Pure parsers. */
#define YYPURE 1
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
-#define yyparse xpyyparse
-#define yylex xpyylex
-#define yyerror xpyyerror
-#define yylval xpyylval
-#define yychar xpyychar
-#define yydebug xpyydebug
-#define yynerrs xpyynerrs
-
-
-/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
-#line 30 "./xpathp.y"
-
-
-#define YYPARSE_PARAM xpp_as_void
-#define YYLEX_PARAM YYPARSE_PARAM
-#include "libutil.h"
-#include "sqlnode.h"
-#include "xpathp_impl.h"
-#include "sqlpar.h"
-#include "sqlpfn.h"
-/*#include "langfunc.h"*/
-
-#define xpp_arg ((xpp_t *)(xpp_as_void))
-
-#ifdef DEBUG
-#define xpyyerror(strg) xpyyerror_impl_1(xpp_arg, NULL, yystate, yyssa, yyssp, (strg))
-#else
-#define xpyyerror(strg) xpyyerror_impl(xpp_arg, NULL, (strg))
-#endif
-
-#ifdef XPYYDEBUG
-#define YYDEBUG 1
-#endif
-
-#define xpyylex(lval_ptr, param) xpyylex_from_xpp_bufs ((caddr_t *)(lval_ptr), ((xpp_t *)(param)))
-
-#define bmk_offset xpp_curr_lexem_bmk.xplb_offset
-#define bmk_bufs_tail xpp_curr_lexem_bmk.xplb_lexem_bufs_tail
-int xpyylex_from_xpp_bufs (caddr_t *yylval, xpp_t *xpp)
-{
- xp_lexem_t *xpl;
- while (xpp->bmk_offset >= xpp->xpp_lexem_buf_len)
- {
- xpp->bmk_bufs_tail = xpp->bmk_bufs_tail->next;
- if (NULL == xpp->bmk_bufs_tail)
- {
- /*xpp->xpp_curr_lexem = NULL; -- commented out to have at least 'some' current lexem */
- return 0;
- }
- xpp->xpp_lexem_buf_len = box_length (xpp->bmk_bufs_tail->data) / sizeof (xp_lexem_t);
- xpp->bmk_offset = 0;
- }
- xpl = ((xp_lexem_t *)(xpp->bmk_bufs_tail->data)) + xpp->bmk_offset;
- yylval[0] = xpl->xpl_sem_value;
- /* Destructive read is no longer usable because re-compilation of xmlview(smth)/... should read twice.
- xpl->xpl_sem_value = NULL; */
- xpp->xpp_curr_lexem = xpl;
- xpp->bmk_offset += 1;
- return (int) xpl->xpl_lex_value;
-}
-
-#define PUSH_STRING_ARG_OF_CONCAT(arglist, strliteral) \
- do \
- { \
- if (1 != box_length((strliteral))) \
- dk_set_push (&(arglist), xp_make_literal_tree (xpp_arg, (strliteral), 1)); \
- } while (0)
-
-#define XBIN_OP(target,opq,l,r) target = xtlist(xpp_arg, 4, (ptrlong)opq, l, r, xe_new_xqst (xpp_arg, XQST_REF))
-
-#define XPP_PROLOG_SET(field,name,val) \
- do { \
- if (xpp_arg->xpp_xp_env->field) \
- yyerror ("The prolog contains more than one declaration of " name); \
- xpp_arg->xpp_xp_env->field = val; \
- } while (0)
-
-
-
-/* Line 189 of yacc.c */
-#line 149 "xpathp.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
+#define yyparse xpyyparse
+#define yylex xpyylex
+#define yyerror xpyyerror
+#define yylval xpyylval
+#define yychar xpyychar
+#define yydebug xpyydebug
+#define yynerrs xpyynerrs
/* Tokens. */
@@ -641,13 +543,98 @@ int xpyylex_from_xpp_bufs (caddr_t *yylval, xpp_t *xpp)
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+/* Copy the first part of user declarations. */
+#line 30 "./xpathp.y"
+
+
+#define YYPARSE_PARAM xpp_as_void
+#define YYLEX_PARAM YYPARSE_PARAM
+#include "libutil.h"
+#include "sqlnode.h"
+#include "xpathp_impl.h"
+#include "sqlpar.h"
+#include "sqlpfn.h"
+/*#include "langfunc.h"*/
+
+#define xpp_arg ((xpp_t *)(xpp_as_void))
+
+#ifdef DEBUG
+#define xpyyerror(strg) xpyyerror_impl_1(xpp_arg, NULL, yystate, yyssa, yyssp, (strg))
+#else
+#define xpyyerror(strg) xpyyerror_impl(xpp_arg, NULL, (strg))
+#endif
+
+#ifdef XPYYDEBUG
+#define YYDEBUG 1
+#endif
+
+#define xpyylex(lval_ptr, param) xpyylex_from_xpp_bufs ((caddr_t *)(lval_ptr), ((xpp_t *)(param)))
+
+#define bmk_offset xpp_curr_lexem_bmk.xplb_offset
+#define bmk_bufs_tail xpp_curr_lexem_bmk.xplb_lexem_bufs_tail
+int xpyylex_from_xpp_bufs (caddr_t *yylval, xpp_t *xpp)
{
+ xp_lexem_t *xpl;
+ while (xpp->bmk_offset >= xpp->xpp_lexem_buf_len)
+ {
+ xpp->bmk_bufs_tail = xpp->bmk_bufs_tail->next;
+ if (NULL == xpp->bmk_bufs_tail)
+ {
+ /*xpp->xpp_curr_lexem = NULL; -- commented out to have at least 'some' current lexem */
+ return 0;
+ }
+ xpp->xpp_lexem_buf_len = box_length (xpp->bmk_bufs_tail->data) / sizeof (xp_lexem_t);
+ xpp->bmk_offset = 0;
+ }
+ xpl = ((xp_lexem_t *)(xpp->bmk_bufs_tail->data)) + xpp->bmk_offset;
+ yylval[0] = xpl->xpl_sem_value;
+ /* Destructive read is no longer usable because re-compilation of xmlview(smth)/... should read twice.
+ xpl->xpl_sem_value = NULL; */
+ xpp->xpp_curr_lexem = xpl;
+ xpp->bmk_offset += 1;
+ return (int) xpl->xpl_lex_value;
+}
-/* Line 214 of yacc.c */
-#line 99 "./xpathp.y"
+#define PUSH_STRING_ARG_OF_CONCAT(arglist, strliteral) \
+ do \
+ { \
+ if (1 != box_length((strliteral))) \
+ dk_set_push (&(arglist), xp_make_literal_tree (xpp_arg, (strliteral), 1)); \
+ } while (0)
+
+#define XBIN_OP(target,opq,l,r) target = xtlist(xpp_arg, 4, (ptrlong)opq, l, r, xe_new_xqst (xpp_arg, XQST_REF))
+
+#define XPP_PROLOG_SET(field,name,val) \
+ do { \
+ if (xpp_arg->xpp_xp_env->field) \
+ yyerror ("The prolog contains more than one declaration of " name); \
+ xpp_arg->xpp_xp_env->field = val; \
+ } while (0)
+
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 99 "./xpathp.y"
+{
caddr_t box;
ptrlong token_type;
XT *tree;
@@ -657,23 +644,22 @@ typedef union YYSTYPE
dk_set_t backstack;
xp_lexbmk_t *bookmark;
void *nothing;
-
-
-
-/* Line 214 of yacc.c */
-#line 665 "xpathp.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 187 of yacc.c. */
+#line 650 "xpathp.c"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
+
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 677 "xpathp.c"
+/* Line 216 of yacc.c. */
+#line 663 "xpathp.c"
#ifdef short
# undef short
@@ -723,7 +709,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -748,14 +734,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -836,9 +822,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -872,12 +858,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -1294,8 +1280,8 @@ static const char *const yytname[] =
"XQVARIABLE_NAME", "__NONPUNCT_END", "NOT_AS_NAME", "';'", "','",
"STANDALONE_SLASH", "UMINUS", "UPLUS", "'|'", "SLASH_AS_MAP",
"REL_PATH_TO_PATH", "STEPS_IN_REL_PATH", "LEFT_SLASH", "'['", "']'",
- "'('", "')'", "'?'", "'}'", "'{'", "'^'", "$accept", "sql", "$@1", "$@2",
- "$@3", "top_xq", "$@4", "top_xp", "opt_semi_END_OF_XPSCN_TEXT", "top_ft",
+ "'('", "')'", "'?'", "'}'", "'{'", "'^'", "$accept", "sql", "@1", "@2",
+ "@3", "top_xq", "@4", "top_xp", "opt_semi_END_OF_XPSCN_TEXT", "top_ft",
"xq_version_decl_opt", "xq_prolog", "xq_prolog_setters_opt",
"xq_prolog_decls_opt", "xq_prolog_setter", "xq_prolog_decl",
"xq_schema_import", "xq_schema_prefix_opt", "xq_import_at_opt",
@@ -1316,7 +1302,7 @@ static const char *const yytname[] =
"xq_expr_validation_block", "xq_path", "xq_path_calc",
"xq_path_rel_from_axn", "xq_path_step", "xq_path_step_axis",
"xq_path_step_nodetest", "xq_path_step_qualifs_opt",
- "xq_path_step_qualif", "$@7", "xq_path_axis", "xq_expr_primary_calc",
+ "xq_path_step_qualif", "@7", "xq_path_axis", "xq_expr_primary_calc",
"@8", "xq_expr_ordering_block", "xq_expr_node_test", "xq_expr_name_test",
"xq_expr_wildcard", "xq_expr_funcall", "xq_expr_syscall",
"xq_expr_variable", "xq_literal", "xq_strg", "xq_comp_ctor",
@@ -1330,7 +1316,7 @@ static const char *const yytname[] =
"xq_exprs", "xq_qname", "xp_options_seq_opt", "xp_options_seq",
"xp_options", "xp_option", "xpath_expr", "path", "relative_path",
"absolute_path", "step", "axis_spec", "node_test", "axis_name",
- "opt_predicates", "predicate", "$@11", "pred_list", "variable_ref",
+ "opt_predicates", "predicate", "@11", "pred_list", "variable_ref",
"primary_expr", "xpath_function", "xpath_arg_list", "path_expr",
"filter_expr", "literal", "literal_strg", "view_name", "text_exp", 0
};
@@ -3009,18 +2995,9 @@ static const yytype_uint16 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
+ Once GCC version 2 has supplanted version 1, this can go. */
#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -3077,7 +3054,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -3188,20 +3165,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -3235,11 +3209,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -3519,8 +3493,10 @@ yydestruct (yymsg, yytype, yyvaluep)
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -3539,9 +3515,10 @@ int yyparse ();
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -3565,46 +3542,22 @@ yyparse ()
#endif
#endif
{
-/* The lookahead symbol. */
+ /* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
- /* Number of syntax errors so far. */
- int yynerrs;
-
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
+/* Number of syntax errors so far. */
+int yynerrs;
+ int yystate;
int yyn;
int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Look-ahead token as an internal (translated) token number. */
+ int yytoken = 0;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
@@ -3612,28 +3565,51 @@ YYSTYPE yylval;
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss = yyssa;
+ yytype_int16 *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
+
+
+
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ YYSIZE_T yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
+
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
+
yyssp = yyss;
yyvsp = yyvs;
@@ -3663,6 +3639,7 @@ YYSTYPE yylval;
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
+
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -3670,6 +3647,7 @@ YYSTYPE yylval;
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -3692,8 +3670,9 @@ YYSTYPE yylval;
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -3704,6 +3683,7 @@ YYSTYPE yylval;
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -3713,9 +3693,6 @@ YYSTYPE yylval;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
- if (yystate == YYFINAL)
- YYACCEPT;
-
goto yybackup;
/*-----------.
@@ -3724,16 +3701,16 @@ YYSTYPE yylval;
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
+ look-ahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -3765,16 +3742,20 @@ yybackup:
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -3814,8 +3795,6 @@ yyreduce:
switch (yyn)
{
case 2:
-
-/* Line 1464 of yacc.c */
#line 517 "./xpathp.y"
{
xpp_arg->xpp_allowed_options = XP_XQUERY_OPTS | XP_XPATH_OPTS | XP_FREETEXT_OPTS;
@@ -3824,15 +3803,11 @@ yyreduce:
break;
case 3:
-
-/* Line 1464 of yacc.c */
#line 521 "./xpathp.y"
{ xpp_arg->xpp_expr = (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
case 4:
-
-/* Line 1464 of yacc.c */
#line 523 "./xpathp.y"
{
xpp_arg->xpp_allowed_options = XP_XPATH_OPTS | XP_FREETEXT_OPTS;
@@ -3841,50 +3816,36 @@ yyreduce:
break;
case 5:
-
-/* Line 1464 of yacc.c */
#line 527 "./xpathp.y"
{ xpp_arg->xpp_expr = (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
case 6:
-
-/* Line 1464 of yacc.c */
#line 528 "./xpathp.y"
{ xpp_arg->xpp_allowed_options = XP_FREETEXT_OPTS; }
break;
case 7:
-
-/* Line 1464 of yacc.c */
#line 528 "./xpathp.y"
{ xpp_arg->xpp_expr = (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
case 8:
-
-/* Line 1464 of yacc.c */
#line 529 "./xpathp.y"
{ (yyval.tree) = NULL; /* This never happens and it's here solely to remove warnings */ }
break;
case 9:
-
-/* Line 1464 of yacc.c */
#line 530 "./xpathp.y"
{ yyerror ("(internal SQL processing error) XQuery, XPath or Free-Text mark expected"); }
break;
case 10:
-
-/* Line 1464 of yacc.c */
#line 534 "./xpathp.y"
{ yyerror ("The XQuery expression is totally empty"); }
break;
case 11:
-
-/* Line 1464 of yacc.c */
#line 536 "./xpathp.y"
{
(yyval.tree) = xp_make_module (xpp_arg, NULL, NULL, (yyvsp[(3) - (4)].tree));
@@ -3892,8 +3853,6 @@ yyreduce:
break;
case 12:
-
-/* Line 1464 of yacc.c */
#line 540 "./xpathp.y"
{
xp_register_namespace_prefix (xpp_arg, (yyvsp[(3) - (6)].box), (yyvsp[(5) - (6)].box));
@@ -3901,8 +3860,6 @@ yyreduce:
break;
case 13:
-
-/* Line 1464 of yacc.c */
#line 544 "./xpathp.y"
{
(yyval.tree) = xp_make_module (xpp_arg, box_copy ((yyvsp[(3) - (9)].box)), box_copy ((yyvsp[(5) - (9)].box)), NULL);
@@ -3910,141 +3867,101 @@ yyreduce:
break;
case 14:
-
-/* Line 1464 of yacc.c */
#line 550 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 17:
-
-/* Line 1464 of yacc.c */
#line 559 "./xpathp.y"
{ (yyval.tree) = (XT*)((yyvsp[(2) - (3)].fts)); }
break;
case 19:
-
-/* Line 1464 of yacc.c */
#line 568 "./xpathp.y"
{ ; }
break;
case 20:
-
-/* Line 1464 of yacc.c */
#line 569 "./xpathp.y"
{ ; }
break;
case 24:
-
-/* Line 1464 of yacc.c */
#line 579 "./xpathp.y"
{ yyerror ("Missing semicolon after prolog (setter) declaration"); }
break;
case 27:
-
-/* Line 1464 of yacc.c */
#line 585 "./xpathp.y"
{ yyerror ("Prolog setter declaration can not appear after a non-setter declaration"); }
break;
case 28:
-
-/* Line 1464 of yacc.c */
#line 589 "./xpathp.y"
{ XPP_PROLOG_SET (xe_xmlspace_mode, "xmlspace mode", XPP_XMLSPACE_PRESERVE); }
break;
case 29:
-
-/* Line 1464 of yacc.c */
#line 590 "./xpathp.y"
{ XPP_PROLOG_SET (xe_xmlspace_mode, "xmlspace mode", XPP_XMLSPACE_STRIP); }
break;
case 30:
-
-/* Line 1464 of yacc.c */
#line 591 "./xpathp.y"
{ XPP_PROLOG_SET (xe_dflt_collation, "default collation", box_copy ((yyvsp[(2) - (2)].box))); }
break;
case 31:
-
-/* Line 1464 of yacc.c */
#line 592 "./xpathp.y"
{ XPP_PROLOG_SET (xe_base_uri, "base-uri", box_copy ((yyvsp[(2) - (2)].box))); }
break;
case 32:
-
-/* Line 1464 of yacc.c */
#line 593 "./xpathp.y"
{ XPP_PROLOG_SET (xe_construction_mode, "construction mode", XPP_TYPE_PRESERVE); }
break;
case 33:
-
-/* Line 1464 of yacc.c */
#line 594 "./xpathp.y"
{ XPP_PROLOG_SET (xe_construction_mode, "construction mode", XPP_TYPE_STRIP); }
break;
case 34:
-
-/* Line 1464 of yacc.c */
#line 595 "./xpathp.y"
{ XPP_PROLOG_SET (xe_dflt_elt_namespace, "default element namespace", box_copy ((yyvsp[(3) - (3)].box))); }
break;
case 35:
-
-/* Line 1464 of yacc.c */
#line 596 "./xpathp.y"
{ XPP_PROLOG_SET (xe_dflt_fn_namespace, "default function namespace", box_copy ((yyvsp[(3) - (3)].box))); }
break;
case 36:
-
-/* Line 1464 of yacc.c */
#line 597 "./xpathp.y"
{ XPP_PROLOG_SET (xe_ordering_mode, "ordering mode", XPP_ORDERING_ORDERED); }
break;
case 37:
-
-/* Line 1464 of yacc.c */
#line 598 "./xpathp.y"
{ XPP_PROLOG_SET (xe_ordering_mode, "ordering mode", XPP_ORDERING_UNORDERED); }
break;
case 38:
-
-/* Line 1464 of yacc.c */
#line 599 "./xpathp.y"
{ XPP_PROLOG_SET (xe_validation_mode, "validation mode", XPP_VALIDATION_LAX); }
break;
case 39:
-
-/* Line 1464 of yacc.c */
#line 600 "./xpathp.y"
{ XPP_PROLOG_SET (xe_validation_mode, "validation mode", XPP_VALIDATION_SKIP); }
break;
case 40:
-
-/* Line 1464 of yacc.c */
#line 601 "./xpathp.y"
{ XPP_PROLOG_SET (xe_validation_mode, "validation mode", XPP_VALIDATION_STRICT); }
break;
case 43:
-
-/* Line 1464 of yacc.c */
#line 607 "./xpathp.y"
{
xp_register_namespace_prefix (xpp_arg, (yyvsp[(2) - (5)].box), (yyvsp[(4) - (5)].box));
@@ -4052,8 +3969,6 @@ yyreduce:
break;
case 44:
-
-/* Line 1464 of yacc.c */
#line 610 "./xpathp.y"
{
xp_register_namespace_prefix (xpp_arg, (yyvsp[(2) - (5)].box), (yyvsp[(4) - (5)].box));
@@ -4061,22 +3976,16 @@ yyreduce:
break;
case 46:
-
-/* Line 1464 of yacc.c */
#line 614 "./xpathp.y"
{ /* dk_set_push (&(xpp_arg->xpp_preamble_decls), $1) */ ; }
break;
case 47:
-
-/* Line 1464 of yacc.c */
#line 615 "./xpathp.y"
{ /* dk_set_push (&(xpp_arg->xpp_preamble_decls), $1) */ ; }
break;
case 48:
-
-/* Line 1464 of yacc.c */
#line 620 "./xpathp.y"
{
if ((yyvsp[(2) - (4)].box))
@@ -4091,64 +4000,46 @@ yyreduce:
break;
case 49:
-
-/* Line 1464 of yacc.c */
#line 633 "./xpathp.y"
{ (yyval.box) = NULL; }
break;
case 50:
-
-/* Line 1464 of yacc.c */
#line 634 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
case 51:
-
-/* Line 1464 of yacc.c */
#line 635 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
case 52:
-
-/* Line 1464 of yacc.c */
#line 636 "./xpathp.y"
{ (yyval.box) = (void *)1; }
break;
case 53:
-
-/* Line 1464 of yacc.c */
#line 640 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 54:
-
-/* Line 1464 of yacc.c */
#line 641 "./xpathp.y"
{ dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (3)].box)); (yyval.backstack) = dk_set_conc ((yyval.backstack), (yyvsp[(3) - (3)].backstack)); }
break;
case 55:
-
-/* Line 1464 of yacc.c */
#line 645 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 56:
-
-/* Line 1464 of yacc.c */
#line 646 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].box)); }
break;
case 57:
-
-/* Line 1464 of yacc.c */
#line 651 "./xpathp.y"
{
if ((yyvsp[(2) - (4)].box))
@@ -4158,29 +4049,21 @@ yyreduce:
break;
case 58:
-
-/* Line 1464 of yacc.c */
#line 659 "./xpathp.y"
{ (yyval.box) = NULL; }
break;
case 59:
-
-/* Line 1464 of yacc.c */
#line 660 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
case 60:
-
-/* Line 1464 of yacc.c */
#line 661 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (3)].box); }
break;
case 61:
-
-/* Line 1464 of yacc.c */
#line 666 "./xpathp.y"
{
xp_var_decl (xpp_arg, box_copy ((yyvsp[(2) - (4)].box)), (yyvsp[(3) - (4)].tree), (yyvsp[(4) - (4)].tree));
@@ -4188,386 +4071,276 @@ yyreduce:
break;
case 62:
-
-/* Line 1464 of yacc.c */
#line 672 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 63:
-
-/* Line 1464 of yacc.c */
#line 673 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 64:
-
-/* Line 1464 of yacc.c */
#line 679 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 65:
-
-/* Line 1464 of yacc.c */
#line 680 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 67:
-
-/* Line 1464 of yacc.c */
#line 685 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, XQCNAME, NULL, (XT *)(yyvsp[(1) - (1)].box), 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 68:
-
-/* Line 1464 of yacc.c */
#line 686 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, XQCNAME, NULL, (XT *)(yyvsp[(1) - (1)].box), 0, XQ_SEQTYPE_OPT_MANY); }
break;
case 69:
-
-/* Line 1464 of yacc.c */
#line 687 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, XQCNAME, NULL, (XT *)(yyvsp[(1) - (1)].box), 0, XQ_SEQTYPE_REQ_MANY); }
break;
case 70:
-
-/* Line 1464 of yacc.c */
#line 688 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, XQCNAME, NULL, (XT *)(yyvsp[(1) - (1)].box), 0, XQ_SEQTYPE_OPT_ONE); }
break;
case 71:
-
-/* Line 1464 of yacc.c */
#line 689 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, DOCUMENT_NODE_LPAR_L, NULL, (yyvsp[(2) - (3)].tree), 0, (yyvsp[(3) - (3)].token_type)); }
break;
case 73:
-
-/* Line 1464 of yacc.c */
#line 691 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ATTRIBUTE_LPAR_L, (yyvsp[(2) - (3)].box), NULL, 0, (yyvsp[(3) - (3)].token_type)); }
break;
case 74:
-
-/* Line 1464 of yacc.c */
#line 692 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ATTRIBUTE_LPAR_L, (yyvsp[(2) - (5)].box), (XT *)(yyvsp[(4) - (5)].box), 0, (yyvsp[(5) - (5)].token_type)); }
break;
case 76:
-
-/* Line 1464 of yacc.c */
#line 694 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, SCHEMA_ATTRIBUTE_LPAR_L, (yyvsp[(2) - (3)].box), NULL, 0, (yyvsp[(3) - (3)].token_type)); }
break;
case 77:
-
-/* Line 1464 of yacc.c */
#line 695 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, PI_LPAR_L, NULL, (yyvsp[(2) - (3)].tree), 0, (yyvsp[(3) - (3)].token_type)); }
break;
case 78:
-
-/* Line 1464 of yacc.c */
#line 696 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, COMMENT_LPAR_L, NULL, NULL, 0, (yyvsp[(2) - (2)].token_type)); }
break;
case 79:
-
-/* Line 1464 of yacc.c */
#line 697 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, TEXT_LPAR_L, NULL, NULL, 0, (yyvsp[(2) - (2)].token_type)); }
break;
case 80:
-
-/* Line 1464 of yacc.c */
#line 698 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, NODE_LPAR_L, NULL, NULL, 0, (yyvsp[(2) - (2)].token_type)); }
break;
case 81:
-
-/* Line 1464 of yacc.c */
#line 699 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ITEM_LPAR_RPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 82:
-
-/* Line 1464 of yacc.c */
#line 700 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ITEM_LPAR_RPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_MANY); }
break;
case 83:
-
-/* Line 1464 of yacc.c */
#line 701 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ITEM_LPAR_RPAR_L, NULL, NULL, 0, XQ_SEQTYPE_OPT_ONE); }
break;
case 84:
-
-/* Line 1464 of yacc.c */
#line 702 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 85:
-
-/* Line 1464 of yacc.c */
#line 703 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, EMPTY_LPAR_RPAR_L, NULL, NULL, 0, XQ_SEQTYPE_OPT_ONE); }
break;
case 86:
-
-/* Line 1464 of yacc.c */
#line 707 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, DOCUMENT_NODE_LPAR_L, NULL, (yyvsp[(2) - (3)].tree), 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 88:
-
-/* Line 1464 of yacc.c */
#line 709 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ATTRIBUTE_LPAR_L, (yyvsp[(2) - (3)].box), NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 89:
-
-/* Line 1464 of yacc.c */
#line 710 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ATTRIBUTE_LPAR_L, (yyvsp[(2) - (5)].box), (XT *)(yyvsp[(4) - (5)].box), 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 91:
-
-/* Line 1464 of yacc.c */
#line 712 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, SCHEMA_ATTRIBUTE_LPAR_L, (yyvsp[(2) - (3)].box), NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 92:
-
-/* Line 1464 of yacc.c */
#line 713 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, PI_LPAR_L, NULL, (yyvsp[(2) - (3)].tree), 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 93:
-
-/* Line 1464 of yacc.c */
#line 714 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, COMMENT_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 94:
-
-/* Line 1464 of yacc.c */
#line 715 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, TEXT_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 95:
-
-/* Line 1464 of yacc.c */
#line 716 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, NODE_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 96:
-
-/* Line 1464 of yacc.c */
#line 720 "./xpathp.y"
{ (yyval.token_type) = XQ_SEQTYPE_REQ_MANY; }
break;
case 97:
-
-/* Line 1464 of yacc.c */
#line 721 "./xpathp.y"
{ (yyval.token_type) = XQ_SEQTYPE_OPT_ONE; }
break;
case 98:
-
-/* Line 1464 of yacc.c */
#line 722 "./xpathp.y"
{ (yyval.token_type) = XQ_SEQTYPE_OPT_MANY; }
break;
case 99:
-
-/* Line 1464 of yacc.c */
#line 726 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, NULL, NULL, 0, (yyvsp[(2) - (2)].token_type)); }
break;
case 100:
-
-/* Line 1464 of yacc.c */
#line 727 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, (yyvsp[(2) - (3)].box), NULL, 0, (yyvsp[(3) - (3)].token_type)); }
break;
case 101:
-
-/* Line 1464 of yacc.c */
#line 728 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, (yyvsp[(2) - (5)].box), (XT *)(yyvsp[(4) - (5)].box), 0, (yyvsp[(5) - (5)].token_type)); }
break;
case 102:
-
-/* Line 1464 of yacc.c */
#line 729 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, (yyvsp[(2) - (6)].box), (XT *)(yyvsp[(4) - (6)].box), 1, (yyvsp[(6) - (6)].token_type)); }
break;
case 103:
-
-/* Line 1464 of yacc.c */
#line 730 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, (yyvsp[(2) - (5)].box), (XT *)(yyvsp[(4) - (5)].box), 1, (yyvsp[(5) - (5)].token_type)); }
break;
case 104:
-
-/* Line 1464 of yacc.c */
#line 734 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, NULL, NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 105:
-
-/* Line 1464 of yacc.c */
#line 735 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, (yyvsp[(2) - (3)].box), NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 106:
-
-/* Line 1464 of yacc.c */
#line 736 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, (yyvsp[(2) - (5)].box), (XT *)(yyvsp[(4) - (5)].box), 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 107:
-
-/* Line 1464 of yacc.c */
#line 737 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, (yyvsp[(2) - (6)].box), (XT *)(yyvsp[(4) - (6)].box), 1, XQ_SEQTYPE_REQ_ONE); }
break;
case 108:
-
-/* Line 1464 of yacc.c */
#line 738 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, ELEMENT_LPAR_L, (yyvsp[(2) - (5)].box), (XT *)(yyvsp[(4) - (5)].box), 1, XQ_SEQTYPE_REQ_ONE); }
break;
case 109:
-
-/* Line 1464 of yacc.c */
#line 742 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, SCHEMA_ELEMENT_LPAR_L, (yyvsp[(2) - (3)].box), NULL, 0, (yyvsp[(3) - (3)].token_type)); }
break;
case 110:
-
-/* Line 1464 of yacc.c */
#line 746 "./xpathp.y"
{ (yyval.tree) = xp_make_seq_type (xpp_arg, SCHEMA_ELEMENT_LPAR_L, (yyvsp[(2) - (3)].box), NULL, 0, XQ_SEQTYPE_REQ_ONE); }
break;
case 111:
-
-/* Line 1464 of yacc.c */
#line 750 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 112:
-
-/* Line 1464 of yacc.c */
#line 751 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 113:
-
-/* Line 1464 of yacc.c */
#line 752 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 114:
-
-/* Line 1464 of yacc.c */
#line 753 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 115:
-
-/* Line 1464 of yacc.c */
#line 754 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(1) - (1)].tree); }
break;
case 117:
-
-/* Line 1464 of yacc.c */
#line 759 "./xpathp.y"
{ (yyval.box) = box_dv_uname_string ("not"); }
break;
case 118:
-
-/* Line 1464 of yacc.c */
#line 760 "./xpathp.y"
{ (yyval.box) = NULL; }
break;
case 119:
-
-/* Line 1464 of yacc.c */
#line 764 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 120:
-
-/* Line 1464 of yacc.c */
#line 765 "./xpathp.y"
{ (yyval.tree) = (XT *)(yyvsp[(1) - (1)].box); }
break;
case 121:
-
-/* Line 1464 of yacc.c */
#line 766 "./xpathp.y"
{ (yyval.tree) = (XT *)(yyvsp[(1) - (1)].box); }
break;
case 122:
-
-/* Line 1464 of yacc.c */
#line 771 "./xpathp.y"
{
caddr_t fname = xp_make_extfunction_name (xpp_arg, NULL, (yyvsp[(2) - (4)].box));
@@ -4577,8 +4350,6 @@ yyreduce:
break;
case 123:
-
-/* Line 1464 of yacc.c */
#line 777 "./xpathp.y"
{
#ifdef MALLOC_DEBUG
@@ -4611,57 +4382,41 @@ yyreduce:
break;
case 124:
-
-/* Line 1464 of yacc.c */
#line 808 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 125:
-
-/* Line 1464 of yacc.c */
#line 809 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(3) - (3)].tree); }
break;
case 126:
-
-/* Line 1464 of yacc.c */
#line 810 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 127:
-
-/* Line 1464 of yacc.c */
#line 814 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 129:
-
-/* Line 1464 of yacc.c */
#line 819 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 130:
-
-/* Line 1464 of yacc.c */
#line 820 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
case 131:
-
-/* Line 1464 of yacc.c */
#line 824 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 5, XQ_DEFPARAM, (yyvsp[(3) - (3)].tree), box_copy ((yyvsp[(2) - (3)].box)), (ptrlong)0, (ptrlong)0); }
break;
case 132:
-
-/* Line 1464 of yacc.c */
#line 849 "./xpathp.y"
{
if (dk_set_length((yyvsp[(1) - (1)].backstack)) > 1)
@@ -4672,15 +4427,11 @@ yyreduce:
break;
case 133:
-
-/* Line 1464 of yacc.c */
#line 858 "./xpathp.y"
{ (yyval.tree) = xp_make_sortby (xpp_arg, (yyvsp[(1) - (2)].tree), (yyvsp[(2) - (2)].backstack)); }
break;
case 134:
-
-/* Line 1464 of yacc.c */
#line 860 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "or", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4688,15 +4439,11 @@ yyreduce:
break;
case 135:
-
-/* Line 1464 of yacc.c */
#line 863 "./xpathp.y"
{ yyerror ("operand expected after 'OR'"); }
break;
case 136:
-
-/* Line 1464 of yacc.c */
#line 865 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "and", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4704,15 +4451,11 @@ yyreduce:
break;
case 137:
-
-/* Line 1464 of yacc.c */
#line 868 "./xpathp.y"
{ yyerror ("operand expected after 'AND'"); }
break;
case 138:
-
-/* Line 1464 of yacc.c */
#line 870 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "not", list (1, (yyvsp[(2) - (2)].tree)));
@@ -4720,15 +4463,11 @@ yyreduce:
break;
case 139:
-
-/* Line 1464 of yacc.c */
#line 873 "./xpathp.y"
{ yyerror ("operand expected after 'NOT'"); }
break;
case 140:
-
-/* Line 1464 of yacc.c */
#line 875 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "EQ operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4736,15 +4475,11 @@ yyreduce:
break;
case 141:
-
-/* Line 1464 of yacc.c */
#line 878 "./xpathp.y"
{ yyerror ("operand expected after 'eq'"); }
break;
case 142:
-
-/* Line 1464 of yacc.c */
#line 880 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, box_dv_uname_string("GE operator"), list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4752,15 +4487,11 @@ yyreduce:
break;
case 143:
-
-/* Line 1464 of yacc.c */
#line 883 "./xpathp.y"
{ yyerror ("operand expected after 'ge'"); }
break;
case 144:
-
-/* Line 1464 of yacc.c */
#line 885 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "GT operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4768,15 +4499,11 @@ yyreduce:
break;
case 145:
-
-/* Line 1464 of yacc.c */
#line 888 "./xpathp.y"
{ yyerror ("operand expected after 'gt'"); }
break;
case 146:
-
-/* Line 1464 of yacc.c */
#line 890 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "LE operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4784,15 +4511,11 @@ yyreduce:
break;
case 147:
-
-/* Line 1464 of yacc.c */
#line 893 "./xpathp.y"
{ yyerror ("operand expected after 'le'"); }
break;
case 148:
-
-/* Line 1464 of yacc.c */
#line 895 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "LT operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4800,15 +4523,11 @@ yyreduce:
break;
case 149:
-
-/* Line 1464 of yacc.c */
#line 898 "./xpathp.y"
{ yyerror ("operand expected after 'lt'"); }
break;
case 150:
-
-/* Line 1464 of yacc.c */
#line 900 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "NE operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4816,15 +4535,11 @@ yyreduce:
break;
case 151:
-
-/* Line 1464 of yacc.c */
#line 903 "./xpathp.y"
{ yyerror ("operand expected after 'ne'"); }
break;
case 152:
-
-/* Line 1464 of yacc.c */
#line 905 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "BEFORE operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4832,15 +4547,11 @@ yyreduce:
break;
case 153:
-
-/* Line 1464 of yacc.c */
#line 908 "./xpathp.y"
{ yyerror ("operand expected after '<<'"); }
break;
case 154:
-
-/* Line 1464 of yacc.c */
#line 910 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "BEFORE operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4848,15 +4559,11 @@ yyreduce:
break;
case 155:
-
-/* Line 1464 of yacc.c */
#line 913 "./xpathp.y"
{ yyerror ("operand expected after 'before'"); }
break;
case 156:
-
-/* Line 1464 of yacc.c */
#line 915 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "AFTER operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4864,15 +4571,11 @@ yyreduce:
break;
case 157:
-
-/* Line 1464 of yacc.c */
#line 918 "./xpathp.y"
{ yyerror ("operand expected after '>>'"); }
break;
case 158:
-
-/* Line 1464 of yacc.c */
#line 920 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "AFTER operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -4880,22 +4583,16 @@ yyreduce:
break;
case 159:
-
-/* Line 1464 of yacc.c */
#line 923 "./xpathp.y"
{ yyerror ("operand expected after 'after'"); }
break;
case 160:
-
-/* Line 1464 of yacc.c */
#line 925 "./xpathp.y"
{ (yyval.tree) = xp_make_flwr (xpp_arg, (yyvsp[(1) - (5)].backstack), (yyvsp[(2) - (5)].tree), (yyvsp[(3) - (5)].backstack), (yyvsp[(5) - (5)].tree)); }
break;
case 161:
-
-/* Line 1464 of yacc.c */
#line 927 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "if", list (3, (yyvsp[(2) - (7)].tree), (yyvsp[(5) - (7)].tree), (yyvsp[(7) - (7)].tree)));
@@ -4903,8 +4600,6 @@ yyreduce:
break;
case 162:
-
-/* Line 1464 of yacc.c */
#line 931 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "some", list (3, xp_make_literal_tree (xpp_arg, (yyvsp[(2) - (6)].box), 1), (yyvsp[(4) - (6)].tree), (yyvsp[(6) - (6)].tree)));
@@ -4912,8 +4607,6 @@ yyreduce:
break;
case 163:
-
-/* Line 1464 of yacc.c */
#line 935 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "every", list (3, xp_make_literal_tree (xpp_arg, (yyvsp[(2) - (6)].box), 1), (yyvsp[(4) - (6)].tree), (yyvsp[(6) - (6)].tree)));
@@ -4921,106 +4614,76 @@ yyreduce:
break;
case 164:
-
-/* Line 1464 of yacc.c */
#line 938 "./xpathp.y"
{ (yyval.tree) = xp_make_call (xpp_arg, "INSTANCE OF predicate", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree))); }
break;
case 165:
-
-/* Line 1464 of yacc.c */
#line 939 "./xpathp.y"
{ (yyval.tree) = xp_make_cast (xpp_arg, XQ_CAST_AS_CNAME, NULL, (yyvsp[(1) - (2)].tree)); }
break;
case 166:
-
-/* Line 1464 of yacc.c */
#line 940 "./xpathp.y"
{ (yyval.tree) = xp_make_cast (xpp_arg, XQ_CASTABLE_AS_CNAME, NULL, (yyvsp[(1) - (2)].tree)); }
break;
case 167:
-
-/* Line 1464 of yacc.c */
#line 941 "./xpathp.y"
{ (yyval.tree) = xp_make_cast (xpp_arg, TREAT_AS_L, NULL, (yyvsp[(1) - (2)].tree)); }
break;
case 168:
-
-/* Line 1464 of yacc.c */
#line 942 "./xpathp.y"
{ (yyval.tree) = xp_make_typeswitch (xpp_arg, (yyvsp[(2) - (5)].tree), (yyvsp[(4) - (5)].backstack), (yyvsp[(5) - (5)].trees)); }
break;
case 169:
-
-/* Line 1464 of yacc.c */
#line 943 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_EQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 170:
-
-/* Line 1464 of yacc.c */
#line 944 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_NEQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 171:
-
-/* Line 1464 of yacc.c */
#line 945 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_SAME, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 172:
-
-/* Line 1464 of yacc.c */
#line 946 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_NSAME, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 173:
-
-/* Line 1464 of yacc.c */
#line 947 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LIKE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 174:
-
-/* Line 1464 of yacc.c */
#line 948 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 175:
-
-/* Line 1464 of yacc.c */
#line 949 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 176:
-
-/* Line 1464 of yacc.c */
#line 950 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_GT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 177:
-
-/* Line 1464 of yacc.c */
#line 951 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_GTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 178:
-
-/* Line 1464 of yacc.c */
#line 957 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "TO operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -5028,29 +4691,21 @@ yyreduce:
break;
case 179:
-
-/* Line 1464 of yacc.c */
#line 960 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_PLUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 180:
-
-/* Line 1464 of yacc.c */
#line 961 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MINUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 181:
-
-/* Line 1464 of yacc.c */
#line 962 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_TIMES, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 182:
-
-/* Line 1464 of yacc.c */
#line 964 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "IDIV operator", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -5058,50 +4713,36 @@ yyreduce:
break;
case 183:
-
-/* Line 1464 of yacc.c */
#line 967 "./xpathp.y"
{ yyerror ("operand expected after 'idiv'"); }
break;
case 184:
-
-/* Line 1464 of yacc.c */
#line 968 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_DIV, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 185:
-
-/* Line 1464 of yacc.c */
#line 969 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MOD, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 186:
-
-/* Line 1464 of yacc.c */
#line 970 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 187:
-
-/* Line 1464 of yacc.c */
#line 971 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MINUS, box_num_nonull (0), (yyvsp[(2) - (2)].tree)); }
break;
case 188:
-
-/* Line 1464 of yacc.c */
#line 973 "./xpathp.y"
{ (yyval.tree) = xp_make_call (xpp_arg, "union", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree))); }
break;
case 189:
-
-/* Line 1464 of yacc.c */
#line 975 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 7, XP_UNION,
(yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), xe_new_xqst (xpp_arg, XQST_REF),
@@ -5110,8 +4751,6 @@ yyreduce:
break;
case 190:
-
-/* Line 1464 of yacc.c */
#line 980 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "intersect", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -5119,8 +4758,6 @@ yyreduce:
break;
case 191:
-
-/* Line 1464 of yacc.c */
#line 984 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "except", list (2, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)));
@@ -5128,43 +4765,31 @@ yyreduce:
break;
case 192:
-
-/* Line 1464 of yacc.c */
#line 987 "./xpathp.y"
{ (yyval.tree) = xp_make_call (xpp_arg, "VALIDATE operator", list (2, (yyvsp[(2) - (3)].tree), (yyvsp[(1) - (3)].token_type))); }
break;
case 194:
-
-/* Line 1464 of yacc.c */
#line 992 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
case 195:
-
-/* Line 1464 of yacc.c */
#line 993 "./xpathp.y"
{ yyerror ("')' or ',' expected"); }
break;
case 196:
-
-/* Line 1464 of yacc.c */
#line 997 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 197:
-
-/* Line 1464 of yacc.c */
#line 998 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
case 198:
-
-/* Line 1464 of yacc.c */
#line 1003 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 7, (yyvsp[(2) - (5)].token_type),
NULL, /* xs_query */
@@ -5177,113 +4802,81 @@ yyreduce:
break;
case 199:
-
-/* Line 1464 of yacc.c */
#line 1014 "./xpathp.y"
{ (yyval.token_type) = XQ_ASCENDING; }
break;
case 200:
-
-/* Line 1464 of yacc.c */
#line 1015 "./xpathp.y"
{ (yyval.token_type) = XQ_ASCENDING; }
break;
case 201:
-
-/* Line 1464 of yacc.c */
#line 1016 "./xpathp.y"
{ (yyval.token_type) = XQ_DESCENDING; }
break;
case 202:
-
-/* Line 1464 of yacc.c */
#line 1020 "./xpathp.y"
{ (yyval.token_type) = XQ_EMPTY_SQL_ORDER; }
break;
case 203:
-
-/* Line 1464 of yacc.c */
#line 1021 "./xpathp.y"
{ (yyval.token_type) = XQ_EMPTY_GREATEST; }
break;
case 204:
-
-/* Line 1464 of yacc.c */
#line 1022 "./xpathp.y"
{ (yyval.token_type) = XQ_EMPTY_LEAST; }
break;
case 205:
-
-/* Line 1464 of yacc.c */
#line 1026 "./xpathp.y"
{ (yyval.box) = NULL; }
break;
case 206:
-
-/* Line 1464 of yacc.c */
#line 1027 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 207:
-
-/* Line 1464 of yacc.c */
#line 1031 "./xpathp.y"
{ (yyval.box) = DV_UNKNOWN; }
break;
case 208:
-
-/* Line 1464 of yacc.c */
#line 1032 "./xpathp.y"
{ (yyval.box) = (yyvsp[(2) - (2)].box); }
break;
case 209:
-
-/* Line 1464 of yacc.c */
#line 1036 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].backstack)); }
break;
case 210:
-
-/* Line 1464 of yacc.c */
#line 1037 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].backstack)); }
break;
case 213:
-
-/* Line 1464 of yacc.c */
#line 1046 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (2)].backstack); dk_set_push (&((yyval.backstack)), (void *)(XQ_FOR)); }
break;
case 214:
-
-/* Line 1464 of yacc.c */
#line 1050 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 215:
-
-/* Line 1464 of yacc.c */
#line 1051 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (4)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(4) - (4)].tree)); }
break;
case 216:
-
-/* Line 1464 of yacc.c */
#line 1056 "./xpathp.y"
{
(yyval.bookmark) = dk_alloc_box (sizeof (xp_lexbmk_t), DV_ARRAY_OF_LONG);
@@ -5292,8 +4885,6 @@ yyreduce:
break;
case 217:
-
-/* Line 1464 of yacc.c */
#line 1061 "./xpathp.y"
{
(yyval.tree) = xtlist (xpp_arg, 3, XQ_IN, box_copy ((yyvsp[(1) - (4)].box)), xp_embedded_xmlview (xpp_arg, (yyvsp[(3) - (4)].bookmark), (yyvsp[(4) - (4)].tree)));
@@ -5302,183 +4893,131 @@ yyreduce:
break;
case 218:
-
-/* Line 1464 of yacc.c */
#line 1068 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (2)].backstack); dk_set_push (&((yyval.backstack)), (void *)(XQ_LET)); }
break;
case 219:
-
-/* Line 1464 of yacc.c */
#line 1072 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 220:
-
-/* Line 1464 of yacc.c */
#line 1073 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (4)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(4) - (4)].tree)); }
break;
case 221:
-
-/* Line 1464 of yacc.c */
#line 1077 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 3, XQ_ASSIGN, box_copy ((yyvsp[(1) - (3)].box)), (yyvsp[(3) - (3)].tree)); }
break;
case 222:
-
-/* Line 1464 of yacc.c */
#line 1081 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 223:
-
-/* Line 1464 of yacc.c */
#line 1082 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (2)].tree); }
break;
case 224:
-
-/* Line 1464 of yacc.c */
#line 1086 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 225:
-
-/* Line 1464 of yacc.c */
#line 1087 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (2)].backstack); dk_set_push (&((yyval.backstack)), (void *)((ptrlong)ORDER_BY_L)); }
break;
case 226:
-
-/* Line 1464 of yacc.c */
#line 1088 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (2)].backstack); dk_set_push (&((yyval.backstack)), (void *)((ptrlong)STABLE_ORDER_BY_L)); }
break;
case 227:
-
-/* Line 1464 of yacc.c */
#line 1092 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].trees)); }
break;
case 228:
-
-/* Line 1464 of yacc.c */
#line 1093 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].trees)); }
break;
case 229:
-
-/* Line 1464 of yacc.c */
#line 1097 "./xpathp.y"
{ (yyval.trees) = (XT **) list (3, (yyvsp[(5) - (7)].tree), (yyvsp[(3) - (7)].box), (yyvsp[(7) - (7)].tree)); }
break;
case 230:
-
-/* Line 1464 of yacc.c */
#line 1098 "./xpathp.y"
{ (yyval.trees) = (XT **) list (3, (yyvsp[(2) - (4)].tree), NULL, (yyvsp[(4) - (4)].tree)); }
break;
case 231:
-
-/* Line 1464 of yacc.c */
#line 1102 "./xpathp.y"
{ (yyval.trees) = (XT **) list (3, NULL, (yyvsp[(3) - (5)].box), (yyvsp[(5) - (5)].tree)); }
break;
case 232:
-
-/* Line 1464 of yacc.c */
#line 1103 "./xpathp.y"
{ (yyval.trees) = (XT **) list (3, NULL, NULL, (yyvsp[(3) - (3)].tree)); }
break;
case 233:
-
-/* Line 1464 of yacc.c */
#line 1107 "./xpathp.y"
{ (yyval.token_type) = xpp_arg->xpp_xp_env->xe_validation_mode; }
break;
case 234:
-
-/* Line 1464 of yacc.c */
#line 1108 "./xpathp.y"
{ (yyval.token_type) = XPP_VALIDATION_LAX; }
break;
case 235:
-
-/* Line 1464 of yacc.c */
#line 1109 "./xpathp.y"
{ (yyval.token_type) = XPP_VALIDATION_STRICT; }
break;
case 236:
-
-/* Line 1464 of yacc.c */
#line 1110 "./xpathp.y"
{ (yyval.token_type) = XPP_VALIDATION_SKIP; }
break;
case 239:
-
-/* Line 1464 of yacc.c */
#line 1120 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), 0); }
break;
case 240:
-
-/* Line 1464 of yacc.c */
#line 1121 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_SLASH_SLASH); }
break;
case 241:
-
-/* Line 1464 of yacc.c */
#line 1122 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_DEREF); }
break;
case 242:
-
-/* Line 1464 of yacc.c */
#line 1123 "./xpathp.y"
{ (yyval.tree) = xp_absolute (xpp_arg, (yyvsp[(2) - (2)].tree), XP_ABS_CHILD); }
break;
case 243:
-
-/* Line 1464 of yacc.c */
#line 1124 "./xpathp.y"
{ (yyval.tree) = xp_absolute (xpp_arg, (yyvsp[(2) - (2)].tree), XP_ABS_SLASH_SLASH); }
break;
case 244:
-
-/* Line 1464 of yacc.c */
#line 1125 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_ROOT, (XT*) XP_NODE, NULL); }
break;
case 245:
-
-/* Line 1464 of yacc.c */
#line 1127 "./xpathp.y"
{
XT *src = (yyvsp[(1) - (3)].tree);
@@ -5487,8 +5026,6 @@ yyreduce:
break;
case 246:
-
-/* Line 1464 of yacc.c */
#line 1132 "./xpathp.y"
{
XT *left = (yyvsp[(1) - (3)].tree);
@@ -5500,8 +5037,6 @@ yyreduce:
break;
case 247:
-
-/* Line 1464 of yacc.c */
#line 1143 "./xpathp.y"
{
(yyval.tree) = xp_make_filters (xpp_arg, (yyvsp[(1) - (2)].tree), dk_set_nreverse ((yyvsp[(2) - (2)].backstack)));
@@ -5509,43 +5044,31 @@ yyreduce:
break;
case 248:
-
-/* Line 1464 of yacc.c */
#line 1150 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, NULL, (yyvsp[(1) - (1)].tree), XP_BY_MAIN_STEP); }
break;
case 249:
-
-/* Line 1464 of yacc.c */
#line 1151 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, NULL, (yyvsp[(1) - (1)].tree), XP_BY_MAIN_STEP); }
break;
case 250:
-
-/* Line 1464 of yacc.c */
#line 1152 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_BY_MAIN_STEP); }
break;
case 251:
-
-/* Line 1464 of yacc.c */
#line 1153 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_SLASH_SLASH); }
break;
case 252:
-
-/* Line 1464 of yacc.c */
#line 1154 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_DEREF); }
break;
case 255:
-
-/* Line 1464 of yacc.c */
#line 1164 "./xpathp.y"
{
(yyval.tree) = xp_make_step (xpp_arg, (yyvsp[(1) - (3)].token_type), (yyvsp[(2) - (3)].tree),
@@ -5554,15 +5077,11 @@ yyreduce:
break;
case 256:
-
-/* Line 1464 of yacc.c */
#line 1169 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_PARENT, (XT *)XP_NODE, NULL); }
break;
case 257:
-
-/* Line 1464 of yacc.c */
#line 1174 "./xpathp.y"
{
(yyval.tree) = xp_make_step (xpp_arg, XP_CHILD, (yyvsp[(1) - (2)].tree), (XT **) list_to_array (dk_set_nreverse ((yyvsp[(2) - (2)].backstack))));
@@ -5571,71 +5090,51 @@ yyreduce:
break;
case 258:
-
-/* Line 1464 of yacc.c */
#line 1182 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 259:
-
-/* Line 1464 of yacc.c */
#line 1183 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
case 260:
-
-/* Line 1464 of yacc.c */
#line 1187 "./xpathp.y"
{ xp_pred_start (xpp_arg); }
break;
case 261:
-
-/* Line 1464 of yacc.c */
#line 1187 "./xpathp.y"
{ (yyval.tree) = xp_make_pred (xpp_arg, (yyvsp[(3) - (4)].tree)); }
break;
case 263:
-
-/* Line 1464 of yacc.c */
#line 1192 "./xpathp.y"
{ yyerror ("Unknown axis name"); }
break;
case 264:
-
-/* Line 1464 of yacc.c */
#line 1200 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 266:
-
-/* Line 1464 of yacc.c */
#line 1202 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 267:
-
-/* Line 1464 of yacc.c */
#line 1203 "./xpathp.y"
{ (yyval.tree) = xp_make_call (xpp_arg, "append", list(0)); }
break;
case 268:
-
-/* Line 1464 of yacc.c */
#line 1204 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_SELF, (XT *) XP_NODE, NULL); }
break;
case 273:
-
-/* Line 1464 of yacc.c */
#line 1210 "./xpathp.y"
{
(yyval.token_type) = xpp_arg->xpp_xp_env->xe_ordering_mode; xpp_arg->xpp_xp_env->xe_ordering_mode = (yyvsp[(1) - (1)].token_type);
@@ -5643,71 +5142,51 @@ yyreduce:
break;
case 274:
-
-/* Line 1464 of yacc.c */
#line 1213 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(3) - (4)].tree); xpp_arg->xpp_xp_env->xe_ordering_mode = (yyvsp[(2) - (4)].token_type); }
break;
case 275:
-
-/* Line 1464 of yacc.c */
#line 1217 "./xpathp.y"
{ (yyval.token_type) = XPP_ORDERING_ORDERED; }
break;
case 276:
-
-/* Line 1464 of yacc.c */
#line 1218 "./xpathp.y"
{ (yyval.token_type) = XPP_ORDERING_UNORDERED; }
break;
case 280:
-
-/* Line 1464 of yacc.c */
#line 1229 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 281:
-
-/* Line 1464 of yacc.c */
#line 1230 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 282:
-
-/* Line 1464 of yacc.c */
#line 1231 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 283:
-
-/* Line 1464 of yacc.c */
#line 1235 "./xpathp.y"
{ (yyval.tree) = (XT *) XP_ELT; }
break;
case 284:
-
-/* Line 1464 of yacc.c */
#line 1236 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 4, XP_NAME_NSURI, xp_namespace_pref (xpp_arg, (yyvsp[(1) - (1)].box)), XP_STAR, NULL); }
break;
case 285:
-
-/* Line 1464 of yacc.c */
#line 1237 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 4, XP_NAME_LOCAL, XP_STAR, box_copy ((yyvsp[(1) - (1)].box)), NULL); }
break;
case 286:
-
-/* Line 1464 of yacc.c */
#line 1242 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (3)].box), list_to_array (dk_set_nreverse ((yyvsp[(2) - (3)].backstack))));
@@ -5715,8 +5194,6 @@ yyreduce:
break;
case 287:
-
-/* Line 1464 of yacc.c */
#line 1246 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (2)].box), list(0));
@@ -5724,8 +5201,6 @@ yyreduce:
break;
case 288:
-
-/* Line 1464 of yacc.c */
#line 1250 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (3)].box), list_to_array (dk_set_nreverse ((yyvsp[(2) - (3)].backstack))));
@@ -5734,8 +5209,6 @@ yyreduce:
break;
case 289:
-
-/* Line 1464 of yacc.c */
#line 1255 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (2)].box), list(0));
@@ -5744,50 +5217,36 @@ yyreduce:
break;
case 290:
-
-/* Line 1464 of yacc.c */
#line 1262 "./xpathp.y"
{ (yyval.tree) = xp_make_sqlcolumn_ref (xpp_arg, (yyvsp[(3) - (4)].box)); }
break;
case 291:
-
-/* Line 1464 of yacc.c */
#line 1263 "./xpathp.y"
{ yyerror ("')' expected after column name"); }
break;
case 292:
-
-/* Line 1464 of yacc.c */
#line 1264 "./xpathp.y"
{ yyerror ("Column name in sql:column must be a string constant"); }
break;
case 293:
-
-/* Line 1464 of yacc.c */
#line 1265 "./xpathp.y"
{ yyerror ("'(' expected after sql:column"); }
break;
case 294:
-
-/* Line 1464 of yacc.c */
#line 1269 "./xpathp.y"
{ (yyval.tree) = xp_make_variable_ref (xpp_arg, (yyvsp[(2) - (2)].box)); }
break;
case 295:
-
-/* Line 1464 of yacc.c */
#line 1270 "./xpathp.y"
{ (yyval.tree) = xp_make_variable_ref (xpp_arg, (yyvsp[(1) - (1)].box)); }
break;
case 300:
-
-/* Line 1464 of yacc.c */
#line 1287 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "DOCUMENT computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
@@ -5795,8 +5254,6 @@ yyreduce:
break;
case 301:
-
-/* Line 1464 of yacc.c */
#line 1291 "./xpathp.y"
{
dk_set_push (&((yyvsp[(2) - (3)].backstack)), xp_make_literal_tree (xpp_arg, xp_make_expanded_name (xpp_arg, (yyvsp[(1) - (3)].box), 0), 0));
@@ -5805,8 +5262,6 @@ yyreduce:
break;
case 302:
-
-/* Line 1464 of yacc.c */
#line 1296 "./xpathp.y"
{
dk_set_push (&((yyvsp[(5) - (6)].backstack)), (yyvsp[(2) - (6)].tree));
@@ -5815,8 +5270,6 @@ yyreduce:
break;
case 303:
-
-/* Line 1464 of yacc.c */
#line 1301 "./xpathp.y"
{
dk_set_push (&((yyvsp[(2) - (3)].backstack)), xp_make_literal_tree (xpp_arg, xp_make_expanded_name (xpp_arg, (yyvsp[(1) - (3)].box), 1), 0));
@@ -5825,8 +5278,6 @@ yyreduce:
break;
case 304:
-
-/* Line 1464 of yacc.c */
#line 1306 "./xpathp.y"
{
dk_set_push (&((yyvsp[(5) - (6)].backstack)), (yyvsp[(2) - (6)].tree));
@@ -5835,8 +5286,6 @@ yyreduce:
break;
case 305:
-
-/* Line 1464 of yacc.c */
#line 1311 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "TEXT computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
@@ -5844,8 +5293,6 @@ yyreduce:
break;
case 306:
-
-/* Line 1464 of yacc.c */
#line 1315 "./xpathp.y"
{
(yyval.tree) = xp_make_call (xpp_arg, "COMMENT computed constructor", revlist_to_array ((yyvsp[(2) - (3)].backstack)));
@@ -5853,8 +5300,6 @@ yyreduce:
break;
case 307:
-
-/* Line 1464 of yacc.c */
#line 1319 "./xpathp.y"
{
dk_set_push (&((yyvsp[(2) - (3)].backstack)), xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (3)].box), 1));
@@ -5863,8 +5308,6 @@ yyreduce:
break;
case 308:
-
-/* Line 1464 of yacc.c */
#line 1324 "./xpathp.y"
{
dk_set_push (&((yyvsp[(5) - (6)].backstack)), (yyvsp[(2) - (6)].tree));
@@ -5873,64 +5316,46 @@ yyreduce:
break;
case 309:
-
-/* Line 1464 of yacc.c */
#line 1331 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 311:
-
-/* Line 1464 of yacc.c */
#line 1336 "./xpathp.y"
{ (yyval.backstack) = NULL; if ((yyvsp[(1) - (1)].tree)) dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 312:
-
-/* Line 1464 of yacc.c */
#line 1337 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); if ((yyvsp[(3) - (3)].tree)) dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
case 314:
-
-/* Line 1464 of yacc.c */
#line 1342 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 315:
-
-/* Line 1464 of yacc.c */
#line 1343 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 316:
-
-/* Line 1464 of yacc.c */
#line 1344 "./xpathp.y"
{ (yyval.tree) = NULL; }
break;
case 318:
-
-/* Line 1464 of yacc.c */
#line 1351 "./xpathp.y"
{ (yyval.tree) = xp_make_direct_comment_ctor (xpp_arg, xp_make_literal_tree (xpp_arg, (yyvsp[(2) - (2)].box), 1)); }
break;
case 319:
-
-/* Line 1464 of yacc.c */
#line 1352 "./xpathp.y"
{ (yyval.tree) = xp_make_direct_pi_ctor (xpp_arg, xp_make_literal_tree (xpp_arg, (yyvsp[(2) - (3)].box), 1), xp_make_literal_tree (xpp_arg, (yyvsp[(3) - (3)].box), 1)); }
break;
case 320:
-
-/* Line 1464 of yacc.c */
#line 1357 "./xpathp.y"
{
(yyval.list) = xp_bookmark_namespaces (xpp_arg);
@@ -5938,8 +5363,6 @@ yyreduce:
break;
case 321:
-
-/* Line 1464 of yacc.c */
#line 1360 "./xpathp.y"
{
(yyval.box) = xpp_arg->xpp_xp_env->xe_dflt_elt_namespace;
@@ -5947,8 +5370,6 @@ yyreduce:
break;
case 322:
-
-/* Line 1464 of yacc.c */
#line 1364 "./xpathp.y"
{
(yyval.tree) = xp_make_direct_el_ctor (xpp_arg, (yyvsp[(4) - (6)].tree), dk_set_nreverse((yyvsp[(5) - (6)].backstack)), dk_set_nreverse((yyvsp[(6) - (6)].backstack)));
@@ -5958,148 +5379,106 @@ yyreduce:
break;
case 323:
-
-/* Line 1464 of yacc.c */
#line 1372 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 324:
-
-/* Line 1464 of yacc.c */
#line 1373 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(2) - (3)].backstack); }
break;
case 325:
-
-/* Line 1464 of yacc.c */
#line 1377 "./xpathp.y"
{ /* no default action */; }
break;
case 326:
-
-/* Line 1464 of yacc.c */
#line 1378 "./xpathp.y"
{ /*dk_free_box ($2)*/; }
break;
case 327:
-
-/* Line 1464 of yacc.c */
#line 1382 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, xp_make_expanded_name (xpp_arg, (yyvsp[(1) - (1)].box), 0), 0); }
break;
case 328:
-
-/* Line 1464 of yacc.c */
#line 1383 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, xp_make_expanded_name (xpp_arg, (yyvsp[(1) - (1)].box), 0), 0); }
break;
case 329:
-
-/* Line 1464 of yacc.c */
#line 1384 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 330:
-
-/* Line 1464 of yacc.c */
#line 1388 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 331:
-
-/* Line 1464 of yacc.c */
#line 1389 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (4)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (4)].tree)); dk_set_push (&((yyval.backstack)), dk_set_nreverse((yyvsp[(4) - (4)].list))); }
break;
case 332:
-
-/* Line 1464 of yacc.c */
#line 1390 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (4)].backstack); xpp_arg->xpp_xp_env->xe_dflt_elt_namespace = box_dv_short_string ((yyvsp[(4) - (4)].box)); }
break;
case 333:
-
-/* Line 1464 of yacc.c */
#line 1391 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (4)].backstack); xp_register_namespace_prefix_by_xmlns (xpp_arg, (yyvsp[(2) - (4)].box), (yyvsp[(4) - (4)].box)); }
break;
case 334:
-
-/* Line 1464 of yacc.c */
#line 1395 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, xp_make_expanded_name (xpp_arg, (yyvsp[(1) - (1)].box), 1), 0); }
break;
case 335:
-
-/* Line 1464 of yacc.c */
#line 1396 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, xp_make_expanded_name (xpp_arg, (yyvsp[(1) - (1)].box), 1), 0); }
break;
case 336:
-
-/* Line 1464 of yacc.c */
#line 1397 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 340:
-
-/* Line 1464 of yacc.c */
#line 1408 "./xpathp.y"
{ (yyval.list) = NULL; dk_set_push (&((yyval.list)), (yyvsp[(1) - (1)].tree)); }
break;
case 341:
-
-/* Line 1464 of yacc.c */
#line 1409 "./xpathp.y"
{ (yyval.list) = NULL; dk_set_push (&((yyval.list)), xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1)); }
break;
case 342:
-
-/* Line 1464 of yacc.c */
#line 1410 "./xpathp.y"
{ (yyval.list) = NULL; dk_set_push (&((yyval.list)), xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1)); }
break;
case 343:
-
-/* Line 1464 of yacc.c */
#line 1411 "./xpathp.y"
{ (yyval.list) = NULL; dk_set_push (&((yyval.list)), xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1)); }
break;
case 344:
-
-/* Line 1464 of yacc.c */
#line 1412 "./xpathp.y"
{ (yyval.list) = NULL; PUSH_STRING_ARG_OF_CONCAT((yyval.list), (yyvsp[(1) - (2)].box)); (yyval.list) = dk_set_conc ((yyvsp[(2) - (2)].backstack), (yyval.list)); }
break;
case 345:
-
-/* Line 1464 of yacc.c */
#line 1413 "./xpathp.y"
{ (yyval.list) = NULL; PUSH_STRING_ARG_OF_CONCAT((yyval.list), (yyvsp[(1) - (2)].box)); (yyval.list) = dk_set_conc ((yyvsp[(2) - (2)].backstack), (yyval.list)); }
break;
case 346:
-
-/* Line 1464 of yacc.c */
#line 1419 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack);
PUSH_STRING_ARG_OF_CONCAT((yyval.backstack), (yyvsp[(2) - (2)].box));
@@ -6107,8 +5486,6 @@ yyreduce:
break;
case 347:
-
-/* Line 1464 of yacc.c */
#line 1423 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack);
PUSH_STRING_ARG_OF_CONCAT((yyval.backstack), (yyvsp[(2) - (3)].box));
@@ -6117,8 +5494,6 @@ yyreduce:
break;
case 348:
-
-/* Line 1464 of yacc.c */
#line 1431 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack);
PUSH_STRING_ARG_OF_CONCAT((yyval.backstack), (yyvsp[(2) - (2)].box));
@@ -6126,8 +5501,6 @@ yyreduce:
break;
case 349:
-
-/* Line 1464 of yacc.c */
#line 1435 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack);
PUSH_STRING_ARG_OF_CONCAT((yyval.backstack), (yyvsp[(2) - (3)].box));
@@ -6136,57 +5509,41 @@ yyreduce:
break;
case 350:
-
-/* Line 1464 of yacc.c */
#line 1442 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 351:
-
-/* Line 1464 of yacc.c */
#line 1443 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (2)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(2) - (2)].tree)); }
break;
case 354:
-
-/* Line 1464 of yacc.c */
#line 1449 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 355:
-
-/* Line 1464 of yacc.c */
#line 1450 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 356:
-
-/* Line 1464 of yacc.c */
#line 1451 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 357:
-
-/* Line 1464 of yacc.c */
#line 1452 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(2) - (2)].box), 1); }
break;
case 358:
-
-/* Line 1464 of yacc.c */
#line 1514 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 359:
-
-/* Line 1464 of yacc.c */
#line 1520 "./xpathp.y"
{
/* if (1 == dk_set_length($1))
@@ -6197,134 +5554,96 @@ yyreduce:
break;
case 360:
-
-/* Line 1464 of yacc.c */
#line 1529 "./xpathp.y"
{ (yyval.backstack) = NULL; }
break;
case 362:
-
-/* Line 1464 of yacc.c */
#line 1534 "./xpathp.y"
{ (yyval.backstack) = NULL; dk_set_push (&((yyval.backstack)), (yyvsp[(1) - (1)].tree)); }
break;
case 363:
-
-/* Line 1464 of yacc.c */
#line 1535 "./xpathp.y"
{ (yyval.backstack) = (yyvsp[(1) - (3)].backstack); dk_set_push (&((yyval.backstack)), (yyvsp[(3) - (3)].tree)); }
break;
case 367:
-
-/* Line 1464 of yacc.c */
#line 1551 "./xpathp.y"
{ ; }
break;
case 368:
-
-/* Line 1464 of yacc.c */
#line 1552 "./xpathp.y"
{ ; }
break;
case 369:
-
-/* Line 1464 of yacc.c */
#line 1556 "./xpathp.y"
{ ; }
break;
case 370:
-
-/* Line 1464 of yacc.c */
#line 1557 "./xpathp.y"
{ yyerror ("']' or option expected"); }
break;
case 371:
-
-/* Line 1464 of yacc.c */
#line 1561 "./xpathp.y"
{ ; }
break;
case 372:
-
-/* Line 1464 of yacc.c */
#line 1562 "./xpathp.y"
{ ; }
break;
case 373:
-
-/* Line 1464 of yacc.c */
#line 1563 "./xpathp.y"
{ ; }
break;
case 374:
-
-/* Line 1464 of yacc.c */
#line 1567 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_xp_env->xe_is_http = 1; }
break;
case 375:
-
-/* Line 1464 of yacc.c */
#line 1568 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_xp_env->xe_is_for_key = 1; }
break;
case 376:
-
-/* Line 1464 of yacc.c */
#line 1569 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_xp_env->xe_is_for_attrs = 1; }
break;
case 377:
-
-/* Line 1464 of yacc.c */
#line 1570 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_xp_env->xe_is_sax = 1; }
break;
case 378:
-
-/* Line 1464 of yacc.c */
#line 1571 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_xp_env->xe_is_shallow = 1; }
break;
case 379:
-
-/* Line 1464 of yacc.c */
#line 1572 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_is_quiet = 1; }
break;
case 380:
-
-/* Line 1464 of yacc.c */
#line 1573 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_is_davprop = 1; }
break;
case 381:
-
-/* Line 1464 of yacc.c */
#line 1574 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_xp_env->xe_base_uri = box_copy_tree ((yyvsp[(2) - (2)].box)); }
break;
case 382:
-
-/* Line 1464 of yacc.c */
#line 1575 "./xpathp.y"
{
#ifdef OLD_VXML_TABLES
@@ -6336,8 +5655,6 @@ yyreduce:
break;
case 383:
-
-/* Line 1464 of yacc.c */
#line 1582 "./xpathp.y"
{
xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS);
@@ -6350,15 +5667,11 @@ yyreduce:
break;
case 384:
-
-/* Line 1464 of yacc.c */
#line 1590 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS); xpp_arg->xpp_xp_env->xe_result_tag = box_copy ((yyvsp[(2) - (2)].box)); }
break;
case 385:
-
-/* Line 1464 of yacc.c */
#line 1591 "./xpathp.y"
{
xp_reject_option_if_not_allowed (xpp_arg, XP_XPATH_OPTS);
@@ -6370,29 +5683,21 @@ yyreduce:
break;
case 386:
-
-/* Line 1464 of yacc.c */
#line 1598 "./xpathp.y"
{ XPP_PROLOG_SET (xe_dflt_elt_namespace, "default element namespace", (yyvsp[(3) - (3)].box)); }
break;
case 387:
-
-/* Line 1464 of yacc.c */
#line 1599 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_FREETEXT_OPTS); xpp_arg->xpp_lang = lh_get_handler ((yyvsp[(2) - (2)].box)); }
break;
case 388:
-
-/* Line 1464 of yacc.c */
#line 1600 "./xpathp.y"
{ xp_reject_option_if_not_allowed (xpp_arg, XP_FREETEXT_OPTS); xp_set_encoding_option (xpp_arg, (yyvsp[(2) - (2)].box)); }
break;
case 389:
-
-/* Line 1464 of yacc.c */
#line 1601 "./xpathp.y"
{
dk_set_push (&(xpp_arg->xpp_dtd_config_tmp_set), box_dv_short_string ((yyvsp[(1) - (3)].box)));
@@ -6401,113 +5706,81 @@ yyreduce:
break;
case 391:
-
-/* Line 1464 of yacc.c */
#line 1610 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_OR, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 392:
-
-/* Line 1464 of yacc.c */
#line 1611 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_AND, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 393:
-
-/* Line 1464 of yacc.c */
#line 1612 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_NOT, (yyvsp[(2) - (2)].tree), NULL); }
break;
case 394:
-
-/* Line 1464 of yacc.c */
#line 1613 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_EQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 395:
-
-/* Line 1464 of yacc.c */
#line 1614 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_NEQ, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 396:
-
-/* Line 1464 of yacc.c */
#line 1615 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 397:
-
-/* Line 1464 of yacc.c */
#line 1616 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 398:
-
-/* Line 1464 of yacc.c */
#line 1617 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_GT, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 399:
-
-/* Line 1464 of yacc.c */
#line 1618 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_GTE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 400:
-
-/* Line 1464 of yacc.c */
#line 1619 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_LIKE, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 401:
-
-/* Line 1464 of yacc.c */
#line 1620 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MINUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 402:
-
-/* Line 1464 of yacc.c */
#line 1621 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_PLUS, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 403:
-
-/* Line 1464 of yacc.c */
#line 1622 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_TIMES, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 404:
-
-/* Line 1464 of yacc.c */
#line 1623 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_DIV, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 405:
-
-/* Line 1464 of yacc.c */
#line 1624 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MOD, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree)); }
break;
case 406:
-
-/* Line 1464 of yacc.c */
#line 1626 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 7, XP_UNION,
(yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), xe_new_xqst (xpp_arg, XQST_REF),
@@ -6516,344 +5789,246 @@ yyreduce:
break;
case 407:
-
-/* Line 1464 of yacc.c */
#line 1630 "./xpathp.y"
{ XBIN_OP ((yyval.tree), BOP_MINUS, box_num_nonull (0), (yyvsp[(2) - (2)].tree)); }
break;
case 410:
-
-/* Line 1464 of yacc.c */
#line 1638 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_ROOT, (XT*) XP_NODE, NULL); }
break;
case 411:
-
-/* Line 1464 of yacc.c */
#line 1643 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, NULL, (yyvsp[(1) - (1)].tree), XP_BY_MAIN_STEP); }
break;
case 412:
-
-/* Line 1464 of yacc.c */
#line 1644 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_BY_MAIN_STEP); }
break;
case 413:
-
-/* Line 1464 of yacc.c */
#line 1645 "./xpathp.y"
{ (yyval.tree) = xp_step (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_SLASH_SLASH); }
break;
case 414:
-
-/* Line 1464 of yacc.c */
#line 1650 "./xpathp.y"
{ (yyval.tree) = xp_absolute (xpp_arg, (yyvsp[(2) - (2)].tree), XP_ABS_CHILD); }
break;
case 415:
-
-/* Line 1464 of yacc.c */
#line 1651 "./xpathp.y"
{ (yyval.tree) = xp_absolute (xpp_arg, (yyvsp[(2) - (2)].tree), XP_ABS_SLASH_SLASH); }
break;
case 416:
-
-/* Line 1464 of yacc.c */
#line 1656 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, (yyvsp[(1) - (3)].token_type), (yyvsp[(2) - (3)].tree), (yyvsp[(3) - (3)].trees)); }
break;
case 417:
-
-/* Line 1464 of yacc.c */
#line 1657 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_CHILD, (yyvsp[(1) - (2)].tree), (yyvsp[(2) - (2)].trees)); }
break;
case 418:
-
-/* Line 1464 of yacc.c */
#line 1658 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_SELF, (XT*) XP_NODE, (yyvsp[(2) - (2)].trees)); }
break;
case 419:
-
-/* Line 1464 of yacc.c */
#line 1659 "./xpathp.y"
{ (yyval.tree) = xp_make_step (xpp_arg, XP_PARENT, (XT*) XP_NODE, (yyvsp[(2) - (2)].trees)); }
break;
case 421:
-
-/* Line 1464 of yacc.c */
#line 1665 "./xpathp.y"
{ (yyval.token_type) = XP_ATTRIBUTE; }
break;
case 422:
-
-/* Line 1464 of yacc.c */
#line 1670 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 423:
-
-/* Line 1464 of yacc.c */
#line 1671 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, box_dv_uname_string ("not"), 0); }
break;
case 424:
-
-/* Line 1464 of yacc.c */
#line 1672 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 425:
-
-/* Line 1464 of yacc.c */
#line 1673 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 4, XP_NAME_NSURI, xp_namespace_pref (xpp_arg, (yyvsp[(1) - (1)].box)), XP_STAR, NULL); }
break;
case 426:
-
-/* Line 1464 of yacc.c */
#line 1674 "./xpathp.y"
{ (yyval.tree) = xtlist (xpp_arg, 4, XP_NAME_LOCAL, XP_STAR, box_copy ((yyvsp[(1) - (1)].box)), NULL); }
break;
case 427:
-
-/* Line 1464 of yacc.c */
#line 1675 "./xpathp.y"
{ (yyval.tree) = (XT *) XP_ELT; }
break;
case 428:
-
-/* Line 1464 of yacc.c */
#line 1676 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(2) - (3)].box), 0); (yyval.tree)->type = XP_PI; }
break;
case 429:
-
-/* Line 1464 of yacc.c */
#line 1677 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(2) - (3)].box), 0); (yyval.tree)->type = XP_PI; }
break;
case 430:
-
-/* Line 1464 of yacc.c */
#line 1678 "./xpathp.y"
{ (yyval.tree) = (XT*) XP_PI; }
break;
case 431:
-
-/* Line 1464 of yacc.c */
#line 1679 "./xpathp.y"
{ (yyval.tree) = (XT*) XP_COMMENT; }
break;
case 432:
-
-/* Line 1464 of yacc.c */
#line 1680 "./xpathp.y"
{ (yyval.tree) = (XT*) XP_TEXT; }
break;
case 433:
-
-/* Line 1464 of yacc.c */
#line 1681 "./xpathp.y"
{ (yyval.tree) = (XT*) XP_NODE; }
break;
case 434:
-
-/* Line 1464 of yacc.c */
#line 1682 "./xpathp.y"
{ (yyval.tree) = xp_make_name_test_from_qname (xpp_arg, (yyvsp[(1) - (1)].box), 0); }
break;
case 435:
-
-/* Line 1464 of yacc.c */
#line 1687 "./xpathp.y"
{ (yyval.token_type) = XP_ANCESTOR; }
break;
case 436:
-
-/* Line 1464 of yacc.c */
#line 1688 "./xpathp.y"
{ (yyval.token_type) = XP_ANCESTOR_OR_SELF; }
break;
case 437:
-
-/* Line 1464 of yacc.c */
#line 1689 "./xpathp.y"
{ (yyval.token_type) = XP_ATTRIBUTE; }
break;
case 438:
-
-/* Line 1464 of yacc.c */
#line 1690 "./xpathp.y"
{ (yyval.token_type) = XP_CHILD; }
break;
case 439:
-
-/* Line 1464 of yacc.c */
#line 1691 "./xpathp.y"
{ (yyval.token_type) = XP_DESCENDANT; }
break;
case 440:
-
-/* Line 1464 of yacc.c */
#line 1692 "./xpathp.y"
{ (yyval.token_type) = XP_DESCENDANT_OR_SELF; }
break;
case 441:
-
-/* Line 1464 of yacc.c */
#line 1693 "./xpathp.y"
{ (yyval.token_type) = XP_FOLLOWING; }
break;
case 442:
-
-/* Line 1464 of yacc.c */
#line 1694 "./xpathp.y"
{ (yyval.token_type) = XP_FOLLOWING_SIBLING; }
break;
case 443:
-
-/* Line 1464 of yacc.c */
#line 1695 "./xpathp.y"
{ (yyval.token_type) = XP_NAMESPACE; yyerror ("namespace axis not allowed"); }
break;
case 444:
-
-/* Line 1464 of yacc.c */
#line 1696 "./xpathp.y"
{ (yyval.token_type) = XP_PARENT; }
break;
case 445:
-
-/* Line 1464 of yacc.c */
#line 1697 "./xpathp.y"
{ (yyval.token_type) = XP_PRECEDING; }
break;
case 446:
-
-/* Line 1464 of yacc.c */
#line 1698 "./xpathp.y"
{ (yyval.token_type) = XP_PRECEDING_SIBLING; }
break;
case 447:
-
-/* Line 1464 of yacc.c */
#line 1699 "./xpathp.y"
{ (yyval.token_type) = XP_SELF; }
break;
case 448:
-
-/* Line 1464 of yacc.c */
#line 1703 "./xpathp.y"
{ (yyval.trees) = NULL; }
break;
case 449:
-
-/* Line 1464 of yacc.c */
#line 1704 "./xpathp.y"
{ (yyval.trees) = (XT **) list_to_array ((yyvsp[(1) - (1)].list)); }
break;
case 450:
-
-/* Line 1464 of yacc.c */
#line 1708 "./xpathp.y"
{ xp_pred_start (xpp_arg); }
break;
case 451:
-
-/* Line 1464 of yacc.c */
#line 1708 "./xpathp.y"
{ (yyval.tree) = xp_make_pred (xpp_arg, (yyvsp[(3) - (4)].tree)); }
break;
case 452:
-
-/* Line 1464 of yacc.c */
#line 1712 "./xpathp.y"
{ (yyval.list) = CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 453:
-
-/* Line 1464 of yacc.c */
#line 1713 "./xpathp.y"
{ (yyval.list) = NCONC ((yyvsp[(1) - (2)].list), CONS ((yyvsp[(2) - (2)].tree), NULL)); }
break;
case 454:
-
-/* Line 1464 of yacc.c */
#line 1718 "./xpathp.y"
{ (yyval.tree) = xp_make_variable_ref(xpp_arg, (yyvsp[(2) - (2)].box)); }
break;
case 455:
-
-/* Line 1464 of yacc.c */
#line 1719 "./xpathp.y"
{ (yyval.tree) = xp_make_variable_ref(xpp_arg, (yyvsp[(1) - (1)].box)); }
break;
case 457:
-
-/* Line 1464 of yacc.c */
#line 1725 "./xpathp.y"
{ (yyval.tree) = (yyvsp[(2) - (3)].tree); }
break;
case 459:
-
-/* Line 1464 of yacc.c */
#line 1727 "./xpathp.y"
{ (yyval.tree) = xp_make_literal_tree (xpp_arg, (yyvsp[(1) - (1)].box), 1); }
break;
case 460:
-
-/* Line 1464 of yacc.c */
#line 1733 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (3)].box), list_to_array ((yyvsp[(2) - (3)].list)));
@@ -6861,8 +6036,6 @@ yyreduce:
break;
case 461:
-
-/* Line 1464 of yacc.c */
#line 1737 "./xpathp.y"
{
(yyval.tree) = xp_make_call_or_funcall (xpp_arg, (yyvsp[(1) - (3)].box), list_to_array ((yyvsp[(2) - (3)].list)));
@@ -6871,150 +6044,109 @@ yyreduce:
break;
case 462:
-
-/* Line 1464 of yacc.c */
#line 1744 "./xpathp.y"
{ (yyval.list) = NULL; }
break;
case 463:
-
-/* Line 1464 of yacc.c */
#line 1745 "./xpathp.y"
{ (yyval.list) = CONS ((yyvsp[(1) - (1)].tree), NULL); }
break;
case 464:
-
-/* Line 1464 of yacc.c */
#line 1746 "./xpathp.y"
{ (yyval.list) = NCONC ((yyvsp[(1) - (3)].list), CONS ((yyvsp[(3) - (3)].tree), NULL)); }
break;
case 467:
-
-/* Line 1464 of yacc.c */
#line 1754 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), 0); }
break;
case 468:
-
-/* Line 1464 of yacc.c */
#line 1755 "./xpathp.y"
{ (yyval.tree) = xp_path (xpp_arg, (yyvsp[(1) - (3)].tree), (yyvsp[(3) - (3)].tree), XP_SLASH_SLASH); }
break;
case 470:
-
-/* Line 1464 of yacc.c */
#line 1761 "./xpathp.y"
{ (yyval.tree) = xp_make_filter (xpp_arg, (yyvsp[(1) - (2)].tree), (yyvsp[(2) - (2)].tree)); }
break;
case 476:
-
-/* Line 1464 of yacc.c */
#line 1780 "./xpathp.y"
{ (yyval.box) = xp_xml_view_name (xpp_arg, NULL, NULL, (yyvsp[(1) - (1)].box)); }
break;
case 477:
-
-/* Line 1464 of yacc.c */
#line 1782 "./xpathp.y"
{ (yyval.box) = xp_xml_view_name (xpp_arg, NULL, (yyvsp[(1) - (3)].box), (yyvsp[(3) - (3)].box)); }
break;
case 478:
-
-/* Line 1464 of yacc.c */
#line 1784 "./xpathp.y"
{ (yyval.box) = xp_xml_view_name (xpp_arg, (yyvsp[(1) - (5)].box), (yyvsp[(3) - (5)].box), (yyvsp[(5) - (5)].box)); }
break;
case 479:
-
-/* Line 1464 of yacc.c */
#line 1786 "./xpathp.y"
{ /* Note one _DOT_DOT here, not two _DOTs */
(yyval.box) = xp_xml_view_name (xpp_arg, (yyvsp[(1) - (3)].box), NULL, (yyvsp[(3) - (3)].box)); }
break;
case 480:
-
-/* Line 1464 of yacc.c */
#line 1791 "./xpathp.y"
{ (yyval.fts) = xp_word_or_phrase_from_string (xpp_arg, (yyvsp[(1) - (1)].box), xpp_arg->xpp_enc, xpp_arg->xpp_lang, 1); }
break;
case 481:
-
-/* Line 1464 of yacc.c */
#line 1792 "./xpathp.y"
{ (yyval.fts) = xp_word_or_phrase_from_string (xpp_arg, (yyvsp[(1) - (1)].box), xpp_arg->xpp_enc, xpp_arg->xpp_lang, 1); }
break;
case 482:
-
-/* Line 1464 of yacc.c */
#line 1793 "./xpathp.y"
{ (yyval.fts) = xp_word_from_exact_string (xpp_arg, (yyvsp[(2) - (2)].box), xpp_arg->xpp_enc, 1); }
break;
case 483:
-
-/* Line 1464 of yacc.c */
#line 1794 "./xpathp.y"
{TBIN_OP ((yyval.fts), BOP_AND, (yyvsp[(1) - (3)].fts), (yyvsp[(3) - (3)].fts)); }
break;
case 484:
-
-/* Line 1464 of yacc.c */
#line 1795 "./xpathp.y"
{ TBIN_OP ((yyval.fts), XP_AND_NOT, (yyvsp[(1) - (4)].fts), (yyvsp[(4) - (4)].fts)); }
break;
case 485:
-
-/* Line 1464 of yacc.c */
#line 1796 "./xpathp.y"
{ TBIN_OP ((yyval.fts), BOP_OR, (yyvsp[(1) - (3)].fts), (yyvsp[(3) - (3)].fts)); }
break;
case 486:
-
-/* Line 1464 of yacc.c */
#line 1797 "./xpathp.y"
{ TBIN_OP ((yyval.fts), XP_NEAR, (yyvsp[(1) - (3)].fts), (yyvsp[(3) - (3)].fts)); }
break;
case 487:
-
-/* Line 1464 of yacc.c */
#line 1798 "./xpathp.y"
{ (yyval.fts) = (yyvsp[(2) - (3)].fts); }
break;
case 488:
-
-/* Line 1464 of yacc.c */
#line 1799 "./xpathp.y"
{ (yyval.fts) = (yyvsp[(4) - (5)].fts); }
break;
case 489:
-
-/* Line 1464 of yacc.c */
#line 1800 "./xpathp.y"
{ yyerror ("']' or option expected"); }
break;
-
-/* Line 1464 of yacc.c */
-#line 7018 "xpathp.c"
+/* Line 1267 of yacc.c. */
+#line 6150 "xpathp.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -7025,6 +6157,7 @@ yyreduce:
*++yyvsp = yyval;
+
/* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -7089,7 +6222,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -7106,7 +6239,7 @@ yyerrlab:
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -7163,6 +6296,9 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -7187,7 +6323,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -7198,7 +6334,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
diff --git a/libsrc/Wi/xpathp.h b/libsrc/Wi/xpathp.h
index d591976..aca5c15 100644
--- a/libsrc/Wi/xpathp.h
+++ b/libsrc/Wi/xpathp.h
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -27,11 +29,10 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -509,11 +510,8 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
-
-/* Line 1685 of yacc.c */
#line 99 "./xpathp.y"
-
+{
caddr_t box;
ptrlong token_type;
XT *tree;
@@ -523,17 +521,14 @@ typedef union YYSTYPE
dk_set_t backstack;
xp_lexbmk_t *bookmark;
void *nothing;
-
-
-
-/* Line 1685 of yacc.c */
-#line 531 "xpathp.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1489 of yacc.c. */
+#line 527 "xpathp.h"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
-
diff --git a/libsrc/Wi/xpathp.y b/libsrc/Wi/xpathp.y
index e55c496..bba18cc 100644
--- a/libsrc/Wi/xpathp.y
+++ b/libsrc/Wi/xpathp.y
@@ -1,14 +1,14 @@
/*
* xpathp.y
*
- * $Id: xpathp.y,v 1.9.2.3 2012/03/08 12:55:38 source Exp $
+ * $Id: xpathp.y,v 1.9.2.2 2009/04/24 16:02:09 source Exp $
*
* SQL Parser
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xpathp_impl.h b/libsrc/Wi/xpathp_impl.h
index 2183e8f..71784bc 100644
--- a/libsrc/Wi/xpathp_impl.h
+++ b/libsrc/Wi/xpathp_impl.h
@@ -1,10 +1,10 @@
/*
- * $Id: xpathp_impl.h,v 1.5.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: xpathp_impl.h,v 1.5.2.1 2009/04/18 21:55:18 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/xpf.c b/libsrc/Wi/xpf.c
index c3b8077..42df108 100644
--- a/libsrc/Wi/xpf.c
+++ b/libsrc/Wi/xpf.c
@@ -1,12 +1,12 @@
/*
* xpf.c
*
- * $Id: xpf.c,v 1.11.2.6 2012/03/08 12:55:38 source Exp $
+ * $Id: xpf.c,v 1.11.2.5 2011/07/29 10:04:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xpf.h b/libsrc/Wi/xpf.h
index 707c1fd..8f3b6d6 100644
--- a/libsrc/Wi/xpf.h
+++ b/libsrc/Wi/xpf.h
@@ -1,12 +1,12 @@
/*
* xpf.h
*
- * $Id: xpf.h,v 1.2.2.3 2012/03/08 12:55:38 source Exp $
+ * $Id: xpf.h,v 1.2.2.2 2011/07/19 23:38:35 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xpscn.c b/libsrc/Wi/xpscn.c
index 21575bf..2f012f0 100644
--- a/libsrc/Wi/xpscn.c
+++ b/libsrc/Wi/xpscn.c
@@ -3085,14 +3085,14 @@ char *xpyytext;
/*
* xpscn.l
*
- * $Id: xpscn.l,v 1.8.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: xpscn.l,v 1.8.2.1 2009/04/18 21:55:18 source Exp $
*
* XQuery scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -3623,7 +3623,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( xpyytext, xpyyleng, 1, xpyyout )) {} } while (0)
+#define ECHO fwrite( xpyytext, xpyyleng, 1, xpyyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -3634,7 +3634,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( xpyyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
diff --git a/libsrc/Wi/xpscn.l b/libsrc/Wi/xpscn.l
index 8d261e5..2c70488 100644
--- a/libsrc/Wi/xpscn.l
+++ b/libsrc/Wi/xpscn.l
@@ -1,14 +1,14 @@
/*
* xpscn.l
*
- * $Id: xpscn.l,v 1.8.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: xpscn.l,v 1.8.2.1 2009/04/18 21:55:18 source Exp $
*
* XQuery scanner
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xqf.c b/libsrc/Wi/xqf.c
index fba85a6..c484a67 100644
--- a/libsrc/Wi/xqf.c
+++ b/libsrc/Wi/xqf.c
@@ -1,12 +1,12 @@
/*
* xqf.c
*
- * $Id: xqf.c,v 1.21.2.15 2012/03/08 12:55:38 source Exp $
+ * $Id: xqf.c,v 1.21.2.13 2011/09/21 13:27:32 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -3528,11 +3528,7 @@ bif_xqf_str_parse_to_rdf_box (caddr_t * qst, caddr_t * err_ret, state_slot_t **
dtd_t *dtd = NULL;
id_hash_t *id_cache = NULL;
xml_tree_ent_t *xte;
- caddr_t tree;
-
- if (arg_dtp == DV_XML_ENTITY)
- return box_copy_tree (arg);
- tree = xml_make_mod_tree ((query_instance_t *)qst, arg, &err, FINE_XML | GE_XML, NULL /* no uri! */, "UTF-8", NULL, NULL, &dtd, &id_cache, &ns_2dict);
+ caddr_t tree = xml_make_mod_tree ((query_instance_t *)qst, arg, &err, FINE_XML | GE_XML, NULL /* no uri! */, "UTF-8", NULL, NULL, &dtd, &id_cache, &ns_2dict);
if (NULL == tree)
sqlr_resignal (err);
xte = xte_from_tree (tree, (query_instance_t*) qst);
diff --git a/libsrc/Wi/xqf.h b/libsrc/Wi/xqf.h
index 803cc2c..cb80aad 100644
--- a/libsrc/Wi/xqf.h
+++ b/libsrc/Wi/xqf.h
@@ -1,12 +1,12 @@
/*
* xqf.h
*
- * $Id: xqf.h,v 1.4.2.4 2012/03/08 12:55:38 source Exp $
+ * $Id: xqf.h,v 1.4.2.3 2011/03/03 11:56:45 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xslt.c b/libsrc/Wi/xslt.c
index f57a2cb..84ee3a6 100644
--- a/libsrc/Wi/xslt.c
+++ b/libsrc/Wi/xslt.c
@@ -1,14 +1,14 @@
/*
* xslt.c
*
- * $Id: xslt.c,v 1.32.2.29 2012/03/08 12:55:38 source Exp $
+ * $Id: xslt.c,v 1.32.2.27 2011/10/13 12:54:56 source Exp $
*
* XSLT
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -4508,8 +4508,8 @@ bif_rowvector_sort_imp (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args,
for (itm_ctr = group_count; itm_ctr--; /* no step */)
{
caddr_t *row = (caddr_t *)(vect[itm_ctr*block_elts + key_ofs]);
- caddr_t key;
- dtp_t key_dtp;
+ caddr_t key = NULL;
+ dtp_t key_dtp = 0;
if (DV_ARRAY_OF_POINTER != DV_TYPE_OF(row))
{
dk_free ((void *)src, group_count * sizeof (dsort_itm_t));
@@ -4524,17 +4524,7 @@ bif_rowvector_sort_imp (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args,
"found a key type %s (%d) instead; index of bad item in array is %d = %d * %d + %d (block index * no of items per block + key offset)",
funname, dv_type_title (key_dtp), key_dtp, itm_ctr*block_elts + key_ofs, itm_ctr, block_elts, key_ofs );
}
- if (BOX_ELEMENTS(row) > key_item_inx)
- {
- key = row[key_item_inx];
- key_dtp = DV_TYPE_OF (key);
- }
- else if ('G' == algo)
- {
- key = NULL;
- key_dtp = DV_LONG_INT;
- }
- else
+ if (BOX_ELEMENTS(row) <= key_item_inx)
{
dk_free ((void *)src, group_count * sizeof (dsort_itm_t));
if (1 == block_elts)
@@ -4547,8 +4537,9 @@ bif_rowvector_sort_imp (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args,
"Function %s needs vector of blocks with vectors in key positions, each key vector should be at least %d values long "
"found an item of length %ld; index of bad item in array is %d = %d * %d + %d (block index * no of items per block + key offset)",
funname, key_item_inx+1, (long)(BOX_ELEMENTS(row)), itm_ctr*block_elts + key_ofs, itm_ctr, block_elts, key_ofs );
- key = NULL; key_dtp = 0; /* to keep compiler happy */
}
+ key = row[key_item_inx];
+ key_dtp = DV_TYPE_OF (key);
if (DV_LONG_INT == key_dtp)
key_val = unbox (key);
else if (DV_IRI_ID == key_dtp)
@@ -4676,13 +4667,6 @@ bif_rowvector_digit_sort (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
}
caddr_t
-bif_rowvector_graph_sort (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- int sort_asc = bif_long_range_arg (qst, args, 2, "rowvector_graph_sort", 0, 1);
- return bif_rowvector_sort_imp (qst, err_ret, args, "rowvector_graph_sort", 'G', 1, 0, sort_asc);
-}
-
-caddr_t
bif_rowvector_subj_sort (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
{
int sort_asc = bif_long_range_arg (qst, args, 2, "rowvector_subj_sort", 0, 1);
@@ -4698,135 +4682,6 @@ bif_rowgvector_subj_sort (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args
return bif_rowvector_sort_imp (qst, err_ret, args, "rowgvector_subj_sort", 'S', block_elts, key_ofs, sort_asc);
}
-caddr_t
-bif_rowvector_graph_partition (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
-{
- const char *funname = "rowvector_graph_partition";
- const int block_elts = 1;
- const int key_ofs = 0;
- caddr_t **vect = (caddr_t **)bif_array_arg (qst, args, 0, funname);
- int vect_elems = BOX_ELEMENTS (vect);
- int key_item_inx = bif_long_range_arg (qst, args, 1, funname, 0, 1024);
- int group_count, itm_ctr;
- int partition_ctr = 0, partition_count = 0;
- int prev_g_dtp = 1;
- int start_itm_ctr = 0;
- caddr_t prev_g = NULL;
- caddr_t **res;
- vector_sort_t specs;
-#if 0
- if (block_elts <= 0)
- sqlr_new_error ("22023", "SR488", "Number of elements in block should be positive integer in call of %s()", funname);
- if (block_elts > MAX_VECTOR_BSORT_BLOCK)
- sqlr_new_error ("22023", "SR488", "Number of elements in block is greater than maximum block length %d supported by %s()", MAX_VECTOR_BSORT_BLOCK, funname);
- if (vect_elems % block_elts != 0)
- sqlr_new_error ("22023", "SR489", "In call of %s(), length of vector in argument #1 is not a whole multiple of number of elements in block", funname);
- if ((0 > key_ofs) || (key_ofs >= block_elts))
- sqlr_new_error ("22023", "SR490", "In call of %s(), offset of key in block should be nonnegative integer that is less than number of elements in block", funname);
-#endif
- group_count = vect_elems / block_elts;
- if (0 >= group_count)
- return dk_alloc_box (0, DV_ARRAY_OF_POINTER);
- for (itm_ctr = 0; itm_ctr < group_count; itm_ctr++)
- {
- caddr_t *row = vect[itm_ctr * block_elts + key_ofs];
- caddr_t key;
- dtp_t key_dtp;
- if (DV_ARRAY_OF_POINTER != DV_TYPE_OF(row))
- {
- if (1 == block_elts)
- sqlr_new_error ("22023", "SR572",
- "Function %s needs vector of vectors, "
- "found a value type %s (%d); index of bad item in array is %d",
- funname, dv_type_title (key_dtp), key_dtp, itm_ctr );
- else
- sqlr_new_error ("22023", "SR572",
- "Function %s needs vector of blocks with vectors in key positions, "
- "found a key type %s (%d) instead; index of bad item in array is %d = %d * %d + %d (block index * no of items per block + key offset)",
- funname, dv_type_title (key_dtp), key_dtp, itm_ctr*block_elts + key_ofs, itm_ctr, block_elts, key_ofs );
- }
- if (BOX_ELEMENTS(row) > key_item_inx)
- {
- key = row[key_item_inx];
- key_dtp = DV_TYPE_OF (key);
- }
- else
- {
- key = NULL;
- key_dtp = 0;
- }
- if (key_dtp == prev_g_dtp)
- {
- switch (key_dtp)
- {
- case 0: continue;
- case DV_LONG_INT: if (unbox (key) == unbox (prev_g)) continue; break;
- case DV_IRI_ID: if (unbox_iri_id (key) == unbox_iri_id (prev_g)) continue; break;
- case DV_STRING: case DV_UNAME: if ((box_length (key) == box_length (prev_g)) && !memcmp (key, prev_g, box_length (key)-1)) continue; break;
- default:
- sqlr_new_error ("22023", "SR572",
- "Function %s needs IRI_IDs or integers or strings as key elements of array, "
- "not a value type %s (%d); position of bad key in array is %d",
- funname, dv_type_title (key_dtp), key_dtp, itm_ctr * block_elts + key_ofs );
- }
- }
- partition_count++;
- prev_g = key;
- prev_g_dtp = key_dtp;
- }
- prev_g_dtp = 1;
- res = (caddr_t **)dk_alloc_box_zero (partition_count * sizeof (caddr_t), DV_ARRAY_OF_POINTER);
- for (itm_ctr = 0; itm_ctr < group_count; itm_ctr++)
- {
- caddr_t *row = vect[itm_ctr * block_elts + key_ofs];
- caddr_t key;
- dtp_t key_dtp;
- if (BOX_ELEMENTS(row) > key_item_inx)
- {
- key = row[key_item_inx];
- key_dtp = DV_TYPE_OF (key);
- }
- else
- {
- key = NULL;
- key_dtp = 0;
- }
- if (key_dtp == prev_g_dtp)
- {
- switch (key_dtp)
- {
- case 0: continue;
- case DV_LONG_INT: if (unbox (key) == unbox (prev_g)) continue; break;
- case DV_IRI_ID: if (unbox_iri_id (key) == unbox_iri_id (prev_g)) continue; break;
- case DV_STRING: case DV_UNAME: if ((box_length (key) == box_length (prev_g)) && !memcmp (key, prev_g, box_length (key)-1)) continue; break;
- default: break;
- }
- }
- if (itm_ctr)
- {
- size_t cut_size = (itm_ctr - start_itm_ctr) * block_elts * sizeof (caddr_t);
- caddr_t **src_start = vect + (start_itm_ctr * block_elts);
- caddr_t *cut = (caddr_t *)dk_alloc_box (cut_size, DV_ARRAY_OF_POINTER);
- memcpy (cut, src_start, cut_size);
- memset (src_start, 0, cut_size);
- res[partition_ctr++] = cut;
- }
- start_itm_ctr = itm_ctr;
- prev_g = key;
- prev_g_dtp = key_dtp;
- }
- if (start_itm_ctr < group_count)
- {
- size_t cut_size = (itm_ctr - start_itm_ctr) * block_elts * sizeof (caddr_t);
- caddr_t **src_start = vect + (start_itm_ctr * block_elts);
- caddr_t *cut = (caddr_t *)dk_alloc_box (cut_size, DV_ARRAY_OF_POINTER);
- memcpy (cut, src_start, cut_size);
- memset (src_start, 0, cut_size);
- res[partition_ctr++] = cut;
- }
- return (caddr_t)res;
-}
-
void
box_dict_iterator_serialize (xml_entity_t * xe, dk_session_t * ses)
{
@@ -5084,8 +4939,6 @@ xslt_init (void)
bif_define ("gvector_digit_sort", bif_gvector_digit_sort);
bif_define ("rowvector_digit_sort", bif_rowvector_digit_sort);
bif_define ("rowvector_subj_sort", bif_rowvector_subj_sort);
- bif_define ("rowvector_graph_sort", bif_rowvector_graph_sort);
bif_define ("rowgvector_subj_sort", bif_rowgvector_subj_sort);
- bif_define ("rowvector_graph_partition", bif_rowvector_graph_partition);
}
diff --git a/libsrc/Wi/xslt_fmt.c b/libsrc/Wi/xslt_fmt.c
index 66bfbb7..8c344b4 100644
--- a/libsrc/Wi/xslt_fmt.c
+++ b/libsrc/Wi/xslt_fmt.c
@@ -1,14 +1,14 @@
/*
* xslt_fmt.c
*
- * $Id: xslt_fmt.c,v 1.2.2.3 2012/03/08 12:55:38 source Exp $
+ * $Id: xslt_fmt.c,v 1.2.2.2 2010/09/17 11:18:20 source Exp $
*
* XSLT formatting routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Wi/xslt_impl.h b/libsrc/Wi/xslt_impl.h
index 55da9b1..6f5c8f5 100644
--- a/libsrc/Wi/xslt_impl.h
+++ b/libsrc/Wi/xslt_impl.h
@@ -1,10 +1,10 @@
/*
- * $Id: xslt_impl.h,v 1.3.2.6 2012/03/08 12:55:38 source Exp $
+ * $Id: xslt_impl.h,v 1.3.2.5 2010/09/17 22:49:26 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2009 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
diff --git a/libsrc/Wi/xslt_opt.c b/libsrc/Wi/xslt_opt.c
index 8a0f88a..7b94fea 100644
--- a/libsrc/Wi/xslt_opt.c
+++ b/libsrc/Wi/xslt_opt.c
@@ -1,14 +1,14 @@
/*
* xslt.c
*
- * $Id: xslt_opt.c,v 1.9.2.7 2012/03/08 12:55:38 source Exp $
+ * $Id: xslt_opt.c,v 1.9.2.6 2011/01/18 10:32:06 source Exp $
*
* XSLT translator
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/Makefile.am b/libsrc/Xml.new/Makefile.am
index 90b60ee..2100742 100644
--- a/libsrc/Xml.new/Makefile.am
+++ b/libsrc/Xml.new/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/Makefile.in b/libsrc/Xml.new/Makefile.in
index ffa7cb4..7895735 100644
--- a/libsrc/Xml.new/Makefile.in
+++ b/libsrc/Xml.new/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -129,7 +129,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -178,7 +177,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -230,7 +228,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -277,6 +274,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/Xml.new/charclasses.c b/libsrc/Xml.new/charclasses.c
index 0ce766c..ff6b4b8 100644
--- a/libsrc/Xml.new/charclasses.c
+++ b/libsrc/Xml.new/charclasses.c
@@ -1,12 +1,12 @@
/*
* charclasses.c
*
- * $Id: charclasses.c,v 1.2.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: charclasses.c,v 1.2 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/charclasses.h b/libsrc/Xml.new/charclasses.h
index 4a35407..890215c 100644
--- a/libsrc/Xml.new/charclasses.h
+++ b/libsrc/Xml.new/charclasses.h
@@ -1,12 +1,12 @@
/*
* charclasses.h
*
- * $Id: charclasses.h,v 1.2.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: charclasses.h,v 1.2 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/datatypes.c b/libsrc/Xml.new/datatypes.c
index 7d72928..40a5297 100644
--- a/libsrc/Xml.new/datatypes.c
+++ b/libsrc/Xml.new/datatypes.c
@@ -1,12 +1,12 @@
/*
* datatypes.c
*
- * $Id: datatypes.c,v 1.3.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: datatypes.c,v 1.3 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/dtd.c b/libsrc/Xml.new/dtd.c
index 6ffc04a..d624e51 100644
--- a/libsrc/Xml.new/dtd.c
+++ b/libsrc/Xml.new/dtd.c
@@ -1,12 +1,12 @@
/*
* dtd.c
*
- * $Id: dtd.c,v 1.3.2.4 2012/03/08 12:55:38 source Exp $
+ * $Id: dtd.c,v 1.3.2.3 2011/04/11 21:44:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/html_mode.c b/libsrc/Xml.new/html_mode.c
index 226a330..25fec6a 100644
--- a/libsrc/Xml.new/html_mode.c
+++ b/libsrc/Xml.new/html_mode.c
@@ -1,12 +1,12 @@
/*
* html_mode.c
*
- * $Id: html_mode.c,v 1.3.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: html_mode.c,v 1.3 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/html_mode.h b/libsrc/Xml.new/html_mode.h
index 83babc4..f1e8d89 100644
--- a/libsrc/Xml.new/html_mode.h
+++ b/libsrc/Xml.new/html_mode.h
@@ -3,12 +3,12 @@
*
* HTML 4.01 processing
*
- * $Id: html_mode.h,v 1.2.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: html_mode.h,v 1.2 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/schema.c b/libsrc/Xml.new/schema.c
index 38cb201..55bd6a0 100644
--- a/libsrc/Xml.new/schema.c
+++ b/libsrc/Xml.new/schema.c
@@ -1,12 +1,12 @@
/*
* schema.c
*
- * $Id: schema.c,v 1.4.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: schema.c,v 1.4 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/schema.h b/libsrc/Xml.new/schema.h
index 0d40f70..8372606 100644
--- a/libsrc/Xml.new/schema.h
+++ b/libsrc/Xml.new/schema.h
@@ -1,12 +1,12 @@
/*
* schema.h
*
- * $Id: schema.h,v 1.3.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: schema.h,v 1.3 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/schema_ecm.h b/libsrc/Xml.new/schema_ecm.h
index 19b80b6..34004c4 100644
--- a/libsrc/Xml.new/schema_ecm.h
+++ b/libsrc/Xml.new/schema_ecm.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/schema_fsm.c b/libsrc/Xml.new/schema_fsm.c
index d7799cd..1f7643e 100644
--- a/libsrc/Xml.new/schema_fsm.c
+++ b/libsrc/Xml.new/schema_fsm.c
@@ -1,12 +1,12 @@
/*
* schema_fsm.c
*
- * $Id: schema_fsm.c,v 1.4.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: schema_fsm.c,v 1.4 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/test.c b/libsrc/Xml.new/test.c
index a3efaed..2091f1f 100644
--- a/libsrc/Xml.new/test.c
+++ b/libsrc/Xml.new/test.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/tst.c b/libsrc/Xml.new/tst.c
index 2375dae..3a357ca 100644
--- a/libsrc/Xml.new/tst.c
+++ b/libsrc/Xml.new/tst.c
@@ -1,12 +1,12 @@
/*
* tst.c
*
- * $Id: tst.c,v 1.2.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: tst.c,v 1.2 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/xhtml_ent.h b/libsrc/Xml.new/xhtml_ent.h
index 8606f58..e20370d 100644
--- a/libsrc/Xml.new/xhtml_ent.h
+++ b/libsrc/Xml.new/xhtml_ent.h
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
+/* ANSI-C code produced by gperf version 3.0.2 */
/* Command-line: /usr/bin/gperf -aCDGptr -Kentity -L ANSI-C -k'1,2,3,4,5,$' -Nxhtml_ent_gperf ./xhtml_ent.gperf */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -34,9 +34,9 @@ struct xhtml_ent_s { const char *entity; int encoded_symbol; const char *descr;}
#define TOTAL_KEYWORDS 253
#define MIN_WORD_LENGTH 2
#define MAX_WORD_LENGTH 8
-#define MIN_HASH_VALUE 145
-#define MAX_HASH_VALUE 1268
-/* maximum key range = 1124, duplicates = 0 */
+#define MIN_HASH_VALUE 183
+#define MAX_HASH_VALUE 1206
+/* maximum key range = 1024, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -50,32 +50,32 @@ hash (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 194,
- 166, 16, 194, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 183, 133, 159, 167, 58,
- 196, 110, 75, 175, 1269, 45, 118, 125, 230, 219,
- 124, 1269, 20, 139, 72, 90, 1269, 1269, 97, 7,
- 159, 1269, 1269, 1269, 1269, 1269, 1269, 111, 140, 74,
- 234, 255, 76, 242, 18, 158, 225, 164, 85, 247,
- 199, 33, 90, 104, 2, 134, 209, 108, 49, 186,
- 137, 2, 78, 25, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269, 1269,
- 1269, 1269, 1269, 1269, 1269, 1269, 1269
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 151,
+ 198, 98, 247, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 145, 74, 75, 115, 220,
+ 56, 110, 66, 108, 1207, 173, 3, 145, 118, 63,
+ 170, 1207, 34, 117, 29, 196, 1207, 1207, 22, 29,
+ 165, 1207, 1207, 1207, 1207, 1207, 1207, 207, 90, 124,
+ 175, 231, 122, 150, 160, 184, 237, 24, 155, 170,
+ 21, 8, 113, 139, 196, 56, 23, 95, 175, 182,
+ 38, 177, 54, 176, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1207,
+ 1207, 1207, 1207, 1207, 1207, 1207, 1207
};
register int hval = len;
@@ -102,512 +102,512 @@ hash (register const char *str, register unsigned int len)
static const struct xhtml_ent_s wordlist[] =
{
-#line 204 "./xhtml_ent.gperf"
- {"rArr", 8658 , DESCR("rightwards double arrow; UNICODE(21D2) TABLE(ISOtech)")},
-#line 198 "./xhtml_ent.gperf"
- {"rarr", 8594 , DESCR("rightwards arrow; UNICODE(2192) TABLE(ISOnum)")},
-#line 206 "./xhtml_ent.gperf"
- {"hArr", 8660 , DESCR("left right double arrow; UNICODE(21D4) TABLE(ISOamsa)")},
-#line 200 "./xhtml_ent.gperf"
- {"harr", 8596 , DESCR("left right arrow; UNICODE(2194) TABLE(ISOamsa)")},
-#line 224 "./xhtml_ent.gperf"
- {"or", 8744 , DESCR("logical or = vee; UNICODE(2228) TABLE(ISOtech)")},
-#line 202 "./xhtml_ent.gperf"
- {"lArr", 8656 , DESCR("leftwards double arrow; UNICODE(21D0) TABLE(ISOtech)")},
-#line 173 "./xhtml_ent.gperf"
- {"rho", 961 , DESCR("greek small letter rho; UNICODE(03C1) ISOgrk3")},
-#line 196 "./xhtml_ent.gperf"
- {"larr", 8592 , DESCR("leftwards arrow; UNICODE(2190) TABLE(ISOnum)")},
+#line 15 "./xhtml_ent.gperf"
+ {"not", 172 , DESCR("not sign = discretionary hyphen; UNICODE(00AC) TABLE(ISOnum)")},
#line 149 "./xhtml_ent.gperf"
{"Rho", 929 , DESCR("greek capital letter rho; UNICODE(03A1)")},
-#line 203 "./xhtml_ent.gperf"
- {"uArr", 8657 , DESCR("upwards double arrow; UNICODE(21D1) TABLE(ISOamsa)")},
-#line 197 "./xhtml_ent.gperf"
- {"uarr", 8593 , DESCR("upwards arrow; UNICODE(2191) TABLE(ISOnum)")},
-#line 12 "./xhtml_ent.gperf"
- {"copy", 169 , DESCR("copyright sign; UNICODE(00A9) TABLE(ISOnum)")},
-#line 144 "./xhtml_ent.gperf"
- {"Mu", 924 , DESCR("greek capital letter mu; UNICODE(039C)")},
-#line 132 "./xhtml_ent.gperf"
- {"fnof", 402 , DESCR("latin small f with hook = function = florin; UNICODE(0192) TABLE(ISOtech)")},
-#line 16 "./xhtml_ent.gperf"
- {"shy", 173 , DESCR("soft hyphen = discretionary hyphen; UNICODE(00AD) TABLE(ISOnum)")},
-#line 51 "./xhtml_ent.gperf"
- {"ETH", 208 , DESCR("latin capital letter ETH; UNICODE(00D0) TABLE(ISOlat1)")},
-#line 226 "./xhtml_ent.gperf"
- {"cup", 8746 , DESCR("union = cup; UNICODE(222A) TABLE(ISOtech)")},
-#line 22 "./xhtml_ent.gperf"
- {"sup3", 179 , DESCR("superscript three = superscript digit three = cubed; UNICODE(00B3) TABLE(ISOnum)")},
-#line 201 "./xhtml_ent.gperf"
- {"crarr", 8629 , DESCR("downwards arrow with corner leftwards = carriage return; UNICODE(21B5) NEW")},
-#line 251 "./xhtml_ent.gperf"
- {"loz", 9674 , DESCR("lozenge; UNICODE(25CA) TABLE(ISOpub)")},
-#line 243 "./xhtml_ent.gperf"
- {"perp", 8869 , DESCR("up tack = orthogonal to = perpendicular; UNICODE(22A5) TABLE(ISOtech)")},
-#line 169 "./xhtml_ent.gperf"
- {"nu", 957 , DESCR("greek small letter nu; UNICODE(03BD) ISOgrk3")},
-#line 193 "./xhtml_ent.gperf"
- {"real", 8476 , DESCR("blackletter capital R = real part symbol; UNICODE(211C) TABLE(ISOamso)")},
-#line 237 "./xhtml_ent.gperf"
- {"sup", 8835 , DESCR("superset of; UNICODE(2283) TABLE(ISOtech)")},
-#line 131 "./xhtml_ent.gperf"
- {"euro", 8364 , DESCR(" euro sign; UNICODE(20AC) NEW")},
-#line 205 "./xhtml_ent.gperf"
- {"dArr", 8659 , DESCR("downwards double arrow; UNICODE(21D3) TABLE(ISOamsa)")},
-#line 199 "./xhtml_ent.gperf"
- {"darr", 8595 , DESCR("downwards arrow; UNICODE(2193) TABLE(ISOnum)")},
-#line 145 "./xhtml_ent.gperf"
- {"Nu", 925 , DESCR("greek capital letter nu; UNICODE(039D)")},
-#line 139 "./xhtml_ent.gperf"
- {"Eta", 919 , DESCR("greek capital letter eta; UNICODE(0397)")},
-#line 225 "./xhtml_ent.gperf"
- {"cap", 8745 , DESCR("intersection = cap; UNICODE(2229) TABLE(ISOtech)")},
-#line 83 "./xhtml_ent.gperf"
- {"eth", 240 , DESCR("latin small letter eth; UNICODE(00F0) TABLE(ISOlat1)")},
-#line 248 "./xhtml_ent.gperf"
- {"rfloor", 8971 , DESCR("right floor; UNICODE(230B) TABLE(ISOamsc)")},
+#line 227 "./xhtml_ent.gperf"
+ {"int", 8747 , DESCR("integral; UNICODE(222B) TABLE(ISOtech)")},
+#line 224 "./xhtml_ent.gperf"
+ {"or", 8744 , DESCR("logical or = vee; UNICODE(2228) TABLE(ISOtech)")},
+#line 102 "./xhtml_ent.gperf"
+ {"gt", 62 , DESCR(" greater-than sign; UNICODE(003E) TABLE(ISOnum)")},
#line 101 "./xhtml_ent.gperf"
{"lt", 60 , DESCR(" less-than sign; UNICODE(003C) TABLE(ISOnum)")},
-#line 168 "./xhtml_ent.gperf"
- {"mu", 956 , DESCR("greek small letter mu; UNICODE(03BC) ISOgrk3")},
-#line 184 "./xhtml_ent.gperf"
- {"piv", 982 , DESCR("greek pi symbol; UNICODE(03D6) ISOgrk3")},
-#line 234 "./xhtml_ent.gperf"
- {"le", 8804 , DESCR("less-than or equal to; UNICODE(2264) TABLE(ISOtech)")},
-#line 30 "./xhtml_ent.gperf"
- {"raquo", 187 , DESCR("right-pointing double angle quotation mark = right pointing guillemet; UNICODE(00BB) TABLE(ISOnum)")},
+#line 169 "./xhtml_ent.gperf"
+ {"nu", 957 , DESCR("greek small letter nu; UNICODE(03BD) ISOgrk3")},
+#line 176 "./xhtml_ent.gperf"
+ {"tau", 964 , DESCR("greek small letter tau; UNICODE(03C4) ISOgrk3")},
#line 151 "./xhtml_ent.gperf"
{"Tau", 932 , DESCR("greek capital letter tau; UNICODE(03A4)")},
+#line 5 "./xhtml_ent.gperf"
+ {"cent", 162 , DESCR("cent sign; UNICODE(00A2) TABLE(ISOnum)")},
+#line 238 "./xhtml_ent.gperf"
+ {"nsub", 8836 , DESCR("not a subset of; UNICODE(2284) ISOamsn")},
+#line 8 "./xhtml_ent.gperf"
+ {"yen", 165 , DESCR("yen sign = yuan sign; UNICODE(00A5) TABLE(ISOnum)")},
+#line 244 "./xhtml_ent.gperf"
+ {"sdot", 8901 , DESCR("dot operator; UNICODE(22C5) TABLE(ISOamsb)")},
+#line 10 "./xhtml_ent.gperf"
+ {"sect", 167 , DESCR("section sign; UNICODE(00A7) TABLE(ISOnum)")},
+#line 99 "./xhtml_ent.gperf"
+ {"quot", 34 , DESCR(" quotation mark = APL quote; UNICODE(0022) TABLE(ISOnum)")},
+#line 232 "./xhtml_ent.gperf"
+ {"ne", 8800 , DESCR("not equal to; UNICODE(2260) TABLE(ISOtech)")},
+#line 251 "./xhtml_ent.gperf"
+ {"loz", 9674 , DESCR("lozenge; UNICODE(25CA) TABLE(ISOpub)")},
+#line 132 "./xhtml_ent.gperf"
+ {"fnof", 402 , DESCR("latin small f with hook = function = florin; UNICODE(0192) TABLE(ISOtech)")},
+#line 213 "./xhtml_ent.gperf"
+ {"notin", 8713 , DESCR("not an element of; UNICODE(2209) TABLE(ISOtech)")},
+#line 145 "./xhtml_ent.gperf"
+ {"Nu", 925 , DESCR("greek capital letter nu; UNICODE(039D)")},
+#line 173 "./xhtml_ent.gperf"
+ {"rho", 961 , DESCR("greek small letter rho; UNICODE(03C1) ISOgrk3")},
#line 220 "./xhtml_ent.gperf"
{"prop", 8733 , DESCR("proportional to; UNICODE(221D) TABLE(ISOtech)")},
-#line 185 "./xhtml_ent.gperf"
- {"bull", 8226 , DESCR("bullet = black small circle; UNICODE(2022) TABLE(ISOpub)")},
-#line 109 "./xhtml_ent.gperf"
- {"circ", 710 , DESCR(" modifier letter circumflex accent; UNICODE(02C6) TABLE(ISOpub)")},
-#line 207 "./xhtml_ent.gperf"
- {"forall", 8704 , DESCR("for all; UNICODE(2200) TABLE(ISOtech)")},
-#line 25 "./xhtml_ent.gperf"
- {"para", 182 , DESCR("pilcrow sign = paragraph sign; UNICODE(00B6) TABLE(ISOnum)")},
#line 236 "./xhtml_ent.gperf"
{"sub", 8834 , DESCR("subset of; UNICODE(2282) TABLE(ISOtech)")},
-#line 18 "./xhtml_ent.gperf"
- {"macr", 175 , DESCR("macron = spacing macron = overline = APL overbar; UNICODE(00AF) TABLE(ISOdia)")},
-#line 98 "./xhtml_ent.gperf"
- {"yuml", 255 , DESCR("latin small letter y with diaeresis; UNICODE(00FF) TABLE(ISOlat1)")},
-#line 85 "./xhtml_ent.gperf"
- {"ograve", 242 , DESCR("latin small letter o with grave; UNICODE(00F2) TABLE(ISOlat1)")},
-#line 172 "./xhtml_ent.gperf"
- {"pi", 960 , DESCR("greek small letter pi; UNICODE(03C0) ISOgrk3")},
-#line 108 "./xhtml_ent.gperf"
- {"Yuml", 376 , DESCR(" latin capital letter Y with diaeresis; UNICODE(0178) TABLE(ISOlat2)")},
-#line 8 "./xhtml_ent.gperf"
- {"yen", 165 , DESCR("yen sign = yuan sign; UNICODE(00A5) TABLE(ISOnum)")},
+#line 144 "./xhtml_ent.gperf"
+ {"Mu", 924 , DESCR("greek capital letter mu; UNICODE(039C)")},
#line 11 "./xhtml_ent.gperf"
{"uml", 168 , DESCR("diaeresis = spacing diaeresis; UNICODE(00A8) TABLE(ISOdia)")},
-#line 146 "./xhtml_ent.gperf"
- {"Xi", 926 , DESCR("greek capital letter xi; UNICODE(039E) ISOgrk3")},
-#line 247 "./xhtml_ent.gperf"
- {"lfloor", 8970 , DESCR("left floor = apl downstile; UNICODE(230A) TABLE(ISOamsc)")},
+#line 3 "./xhtml_ent.gperf"
+ {"nbsp", 160 , DESCR("no-break space = non-breaking space; UNICODE(00A0) TABLE(ISOnum)")},
+#line 120 "./xhtml_ent.gperf"
+ {"lsquo", 8216 , DESCR("left single quotation mark; UNICODE(2018) TABLE(ISOnum)")},
#line 122 "./xhtml_ent.gperf"
{"sbquo", 8218 , DESCR("single low-9 quotation mark; UNICODE(201A) NEW")},
+#line 212 "./xhtml_ent.gperf"
+ {"isin", 8712 , DESCR("element of; UNICODE(2208) TABLE(ISOtech)")},
+#line 168 "./xhtml_ent.gperf"
+ {"mu", 956 , DESCR("greek small letter mu; UNICODE(03BC) ISOgrk3")},
+#line 225 "./xhtml_ent.gperf"
+ {"cap", 8745 , DESCR("intersection = cap; UNICODE(2229) TABLE(ISOtech)")},
+#line 214 "./xhtml_ent.gperf"
+ {"ni", 8715 , DESCR("contains as member; UNICODE(220B) TABLE(ISOtech)")},
+#line 146 "./xhtml_ent.gperf"
+ {"Xi", 926 , DESCR("greek capital letter xi; UNICODE(039E) ISOgrk3")},
+#line 208 "./xhtml_ent.gperf"
+ {"part", 8706 , DESCR("partial differential; UNICODE(2202) TABLE(ISOtech)")},
#line 100 "./xhtml_ent.gperf"
{"amp", 38 , DESCR(" ampersand; UNICODE(0026) TABLE(ISOnum)")},
-#line 121 "./xhtml_ent.gperf"
- {"rsquo", 8217 , DESCR("right single quotation mark; UNICODE(2019) TABLE(ISOnum)")},
-#line 43 "./xhtml_ent.gperf"
- {"Egrave", 200 , DESCR("latin capital letter E with grave; UNICODE(00C8) TABLE(ISOlat1)")},
-#line 89 "./xhtml_ent.gperf"
- {"ouml", 246 , DESCR("latin small letter o with diaeresis; UNICODE(00F6) TABLE(ISOlat1)")},
-#line 14 "./xhtml_ent.gperf"
- {"laquo", 171 , DESCR("left-pointing double angle quotation mark = left pointing guillemet; UNICODE(00AB) TABLE(ISOnum)")},
-#line 148 "./xhtml_ent.gperf"
- {"Pi", 928 , DESCR("greek capital letter pi; UNICODE(03A0) ISOgrk3")},
-#line 186 "./xhtml_ent.gperf"
- {"hellip", 8230 , DESCR("horizontal ellipsis = three dot leader; UNICODE(2026) TABLE(ISOpub)")},
-#line 103 "./xhtml_ent.gperf"
- {"apos", 39 , DESCR(" apostrophe mark; UNICODE(0027) TABLE(ISOnum)")},
+#line 97 "./xhtml_ent.gperf"
+ {"thorn", 254 , DESCR("latin small letter thorn with; UNICODE(00FE) TABLE(ISOlat1)")},
+#line 237 "./xhtml_ent.gperf"
+ {"sup", 8835 , DESCR("superset of; UNICODE(2283) TABLE(ISOtech)")},
#line 170 "./xhtml_ent.gperf"
{"xi", 958 , DESCR("greek small letter xi; UNICODE(03BE) ISOgrk3")},
-#line 46 "./xhtml_ent.gperf"
- {"Euml", 203 , DESCR("latin capital letter E with diaeresis; UNICODE(00CB) TABLE(ISOlat1)")},
-#line 60 "./xhtml_ent.gperf"
- {"Ugrave", 217 , DESCR("latin capital letter U with grave; UNICODE(00D9) TABLE(ISOlat1)")},
-#line 232 "./xhtml_ent.gperf"
- {"ne", 8800 , DESCR("not equal to; UNICODE(2260) TABLE(ISOtech)")},
-#line 124 "./xhtml_ent.gperf"
- {"rdquo", 8221 , DESCR("right double quotation mark; UNICODE(201D) TABLE(ISOnum)")},
-#line 183 "./xhtml_ent.gperf"
- {"upsih", 978 , DESCR("greek upsilon with hook symbol; UNICODE(03D2) NEW")},
-#line 92 "./xhtml_ent.gperf"
- {"ugrave", 249 , DESCR("latin small letter u with grave; UNICODE(00F9) TABLE(ISOlat1)")},
-#line 179 "./xhtml_ent.gperf"
- {"chi", 967 , DESCR("greek small letter chi; UNICODE(03C7) ISOgrk3")},
-#line 67 "./xhtml_ent.gperf"
- {"agrave", 224 , DESCR("latin small letter a with grave = latin small letter a grave; UNICODE(00E0) TABLE(ISOlat1)")},
-#line 254 "./xhtml_ent.gperf"
- {"hearts", 9829 , DESCR("black heart suit = valentine; UNICODE(2665) TABLE(ISOpub)")},
+#line 103 "./xhtml_ent.gperf"
+ {"apos", 39 , DESCR(" apostrophe mark; UNICODE(0027) TABLE(ISOnum)")},
+#line 121 "./xhtml_ent.gperf"
+ {"rsquo", 8217 , DESCR("right single quotation mark; UNICODE(2019) TABLE(ISOnum)")},
+#line 65 "./xhtml_ent.gperf"
+ {"THORN", 222 , DESCR("latin capital letter THORN; UNICODE(00DE) TABLE(ISOlat1)")},
#line 13 "./xhtml_ent.gperf"
{"ordf", 170 , DESCR("feminine ordinal indicator; UNICODE(00AA) TABLE(ISOnum)")},
-#line 63 "./xhtml_ent.gperf"
- {"Uuml", 220 , DESCR("latin capital letter U with diaeresis; UNICODE(00DC) TABLE(ISOlat1)")},
-#line 102 "./xhtml_ent.gperf"
- {"gt", 62 , DESCR(" greater-than sign; UNICODE(003E) TABLE(ISOnum)")},
-#line 17 "./xhtml_ent.gperf"
- {"reg", 174 , DESCR("registered sign = registered trade mark sign; UNICODE(00AE) TABLE(ISOnum)")},
-#line 178 "./xhtml_ent.gperf"
- {"phi", 966 , DESCR("greek small letter phi; UNICODE(03C6) ISOgrk3")},
-#line 176 "./xhtml_ent.gperf"
- {"tau", 964 , DESCR("greek small letter tau; UNICODE(03C4) ISOgrk3")},
-#line 130 "./xhtml_ent.gperf"
- {"rsaquo", 8250 , DESCR("single right-pointing angle quotation mark; UNICODE(203A) ISO proposed")},
+#line 14 "./xhtml_ent.gperf"
+ {"laquo", 171 , DESCR("left-pointing double angle quotation mark = left pointing guillemet; UNICODE(00AB) TABLE(ISOnum)")},
#line 235 "./xhtml_ent.gperf"
{"ge", 8805 , DESCR("greater-than or equal to; UNICODE(2265) TABLE(ISOtech)")},
-#line 120 "./xhtml_ent.gperf"
- {"lsquo", 8216 , DESCR("left single quotation mark; UNICODE(2018) TABLE(ISOnum)")},
-#line 95 "./xhtml_ent.gperf"
- {"uuml", 252 , DESCR("latin small letter u with diaeresis; UNICODE(00FC) TABLE(ISOlat1)")},
-#line 87 "./xhtml_ent.gperf"
- {"ocirc", 244 , DESCR("latin small letter o with circumflex; UNICODE(00F4) TABLE(ISOlat1)")},
-#line 71 "./xhtml_ent.gperf"
- {"auml", 228 , DESCR("latin small letter a with diaeresis; UNICODE(00E4) TABLE(ISOlat1)")},
-#line 9 "./xhtml_ent.gperf"
- {"brvbar", 166 , DESCR("broken bar = broken vertical bar; UNICODE(00A6) TABLE(ISOnum)")},
-#line 214 "./xhtml_ent.gperf"
- {"ni", 8715 , DESCR("contains as member; UNICODE(220B) TABLE(ISOtech)")},
-#line 7 "./xhtml_ent.gperf"
- {"curren", 164 , DESCR("currency sign; UNICODE(00A4) TABLE(ISOnum)")},
-#line 163 "./xhtml_ent.gperf"
- {"eta", 951 , DESCR("greek small letter eta; UNICODE(03B7) ISOgrk3")},
-#line 162 "./xhtml_ent.gperf"
- {"zeta", 950 , DESCR("greek small letter zeta; UNICODE(03B6) ISOgrk3")},
-#line 3 "./xhtml_ent.gperf"
- {"nbsp", 160 , DESCR("no-break space = non-breaking space; UNICODE(00A0) TABLE(ISOnum)")},
-#line 142 "./xhtml_ent.gperf"
- {"Kappa", 922 , DESCR("greek capital letter kappa; UNICODE(039A)")},
-#line 91 "./xhtml_ent.gperf"
- {"oslash", 248 , DESCR("latin small letter o with stroke; = latin small letter o slash; UNICODE(00F8) TABLE(ISOlat1)")},
-#line 79 "./xhtml_ent.gperf"
- {"igrave", 236 , DESCR("latin small letter i with grave; UNICODE(00EC) TABLE(ISOlat1)")},
-#line 153 "./xhtml_ent.gperf"
- {"Phi", 934 , DESCR("greek capital letter phi; UNICODE(03A6) ISOgrk3")},
+#line 180 "./xhtml_ent.gperf"
+ {"psi", 968 , DESCR("greek small letter psi; UNICODE(03C8) ISOgrk3")},
+#line 234 "./xhtml_ent.gperf"
+ {"le", 8804 , DESCR("less-than or equal to; UNICODE(2264) TABLE(ISOtech)")},
#line 241 "./xhtml_ent.gperf"
{"oplus", 8853 , DESCR("circled plus = direct sum; UNICODE(2295) TABLE(ISOamsb)")},
-#line 45 "./xhtml_ent.gperf"
- {"Ecirc", 202 , DESCR("latin capital letter E with circumflex; UNICODE(00CA) TABLE(ISOlat1)")},
+#line 222 "./xhtml_ent.gperf"
+ {"ang", 8736 , DESCR("angle; UNICODE(2220) TABLE(ISOamso)")},
#line 111 "./xhtml_ent.gperf"
{"ensp", 8194 , DESCR("en space; UNICODE(2002) TABLE(ISOpub)")},
-#line 99 "./xhtml_ent.gperf"
- {"quot", 34 , DESCR(" quotation mark = APL quote; UNICODE(0022) TABLE(ISOnum)")},
-#line 21 "./xhtml_ent.gperf"
- {"sup2", 178 , DESCR("superscript two = superscript digit two = squared; UNICODE(00B2) TABLE(ISOnum)")},
-#line 33 "./xhtml_ent.gperf"
- {"frac34", 190 , DESCR("vulgar fraction three quarters = fraction three quarters; UNICODE(00BE) TABLE(ISOnum)")},
-#line 227 "./xhtml_ent.gperf"
- {"int", 8747 , DESCR("integral; UNICODE(222B) TABLE(ISOtech)")},
-#line 223 "./xhtml_ent.gperf"
- {"and", 8743 , DESCR("logical and = wedge; UNICODE(2227) TABLE(ISOtech)")},
-#line 47 "./xhtml_ent.gperf"
- {"Igrave", 204 , DESCR("latin capital letter I with grave; UNICODE(00CC) TABLE(ISOlat1)")},
-#line 180 "./xhtml_ent.gperf"
- {"psi", 968 , DESCR("greek small letter psi; UNICODE(03C8) ISOgrk3")},
-#line 24 "./xhtml_ent.gperf"
- {"micro", 181 , DESCR("micro sign; UNICODE(00B5) TABLE(ISOnum)")},
-#line 4 "./xhtml_ent.gperf"
- {"iexcl", 161 , DESCR("inverted exclamation mark; UNICODE(00A1) TABLE(ISOnum)")},
-#line 123 "./xhtml_ent.gperf"
- {"ldquo", 8220 , DESCR("left double quotation mark; UNICODE(201C) TABLE(ISOnum)")},
-#line 35 "./xhtml_ent.gperf"
- {"Agrave", 192 , DESCR("latin capital letter A with grave = latin capital letter A grave; UNICODE(00C0) TABLE(ISOlat1)")},
-#line 233 "./xhtml_ent.gperf"
- {"equiv", 8801 , DESCR("identical to; UNICODE(2261) TABLE(ISOtech)")},
-#line 82 "./xhtml_ent.gperf"
- {"iuml", 239 , DESCR("latin small letter i with diaeresis; UNICODE(00EF) TABLE(ISOlat1)")},
-#line 190 "./xhtml_ent.gperf"
- {"frasl", 8260 , DESCR("fraction slash; UNICODE(2044) NEW")},
-#line 222 "./xhtml_ent.gperf"
- {"ang", 8736 , DESCR("angle; UNICODE(2220) TABLE(ISOamso)")},
-#line 154 "./xhtml_ent.gperf"
- {"Chi", 935 , DESCR("greek capital letter chi; UNICODE(03A7)")},
-#line 62 "./xhtml_ent.gperf"
- {"Ucirc", 219 , DESCR("latin capital letter U with circumflex; UNICODE(00DB) TABLE(ISOlat1)")},
-#line 134 "./xhtml_ent.gperf"
- {"Beta", 914 , DESCR("greek capital letter beta; UNICODE(0392)")},
-#line 50 "./xhtml_ent.gperf"
- {"Iuml", 207 , DESCR("latin capital letter I with diaeresis; UNICODE(00CF) TABLE(ISOlat1)")},
-#line 158 "./xhtml_ent.gperf"
- {"beta", 946 , DESCR("greek small letter beta; UNICODE(03B2) ISOgrk3")},
+#line 226 "./xhtml_ent.gperf"
+ {"cup", 8746 , DESCR("union = cup; UNICODE(222A) TABLE(ISOtech)")},
+#line 215 "./xhtml_ent.gperf"
+ {"prod", 8719 , DESCR("n-ary product = product sign; UNICODE(220F) TABLE(ISOamsb)")},
+#line 172 "./xhtml_ent.gperf"
+ {"pi", 960 , DESCR("greek small letter pi; UNICODE(03C0) ISOgrk3")},
+#line 112 "./xhtml_ent.gperf"
+ {"emsp", 8195 , DESCR("em space; UNICODE(2003) TABLE(ISOpub)")},
+#line 30 "./xhtml_ent.gperf"
+ {"raquo", 187 , DESCR("right-pointing double angle quotation mark = right pointing guillemet; UNICODE(00BB) TABLE(ISOnum)")},
+#line 22 "./xhtml_ent.gperf"
+ {"sup3", 179 , DESCR("superscript three = superscript digit three = cubed; UNICODE(00B3) TABLE(ISOnum)")},
+#line 221 "./xhtml_ent.gperf"
+ {"infin", 8734 , DESCR("infinity; UNICODE(221E) TABLE(ISOtech)")},
+#line 51 "./xhtml_ent.gperf"
+ {"ETH", 208 , DESCR("latin capital letter ETH; UNICODE(00D0) TABLE(ISOlat1)")},
+#line 116 "./xhtml_ent.gperf"
+ {"lrm", 8206 , DESCR("left-to-right mark; UNICODE(200E) NEW TABLE(RFC2070)")},
+#line 171 "./xhtml_ent.gperf"
+ {"omicron", 959 , DESCR("greek small letter omicron; UNICODE(03BF) NEW")},
+#line 230 "./xhtml_ent.gperf"
+ {"cong", 8773 , DESCR("approximately equal to; UNICODE(2245) TABLE(ISOtech)")},
#line 155 "./xhtml_ent.gperf"
{"Psi", 936 , DESCR("greek capital letter psi; UNICODE(03A8) ISOgrk3")},
-#line 39 "./xhtml_ent.gperf"
- {"Auml", 196 , DESCR("latin capital letter A with diaeresis; UNICODE(00C4) TABLE(ISOlat1)")},
-#line 208 "./xhtml_ent.gperf"
- {"part", 8706 , DESCR("partial differential; UNICODE(2202) TABLE(ISOtech)")},
-#line 94 "./xhtml_ent.gperf"
- {"ucirc", 251 , DESCR("latin small letter u with circumflex; UNICODE(00FB) TABLE(ISOlat1)")},
-#line 129 "./xhtml_ent.gperf"
- {"lsaquo", 8249 , DESCR("single left-pointing angle quotation mark; UNICODE(2039) ISO proposed")},
-#line 69 "./xhtml_ent.gperf"
- {"acirc", 226 , DESCR("latin small letter a with circumflex; UNICODE(00E2) TABLE(ISOlat1)")},
-#line 53 "./xhtml_ent.gperf"
- {"Ograve", 210 , DESCR("latin capital letter O with grave; UNICODE(00D2) TABLE(ISOlat1)")},
-#line 128 "./xhtml_ent.gperf"
- {"permil", 8240 , DESCR("per mille sign; UNICODE(2030) TABLE(ISOtech)")},
-#line 28 "./xhtml_ent.gperf"
- {"sup1", 185 , DESCR("superscript one = superscript digit one; UNICODE(00B9) TABLE(ISOnum)")},
+#line 223 "./xhtml_ent.gperf"
+ {"and", 8743 , DESCR("logical and = wedge; UNICODE(2227) TABLE(ISOtech)")},
#line 115 "./xhtml_ent.gperf"
{"zwj", 8205 , DESCR("zero width joiner; UNICODE(200D) NEW TABLE(RFC2070)")},
-#line 138 "./xhtml_ent.gperf"
- {"Zeta", 918 , DESCR("greek capital letter zeta; UNICODE(0396)")},
-#line 171 "./xhtml_ent.gperf"
- {"omicron", 959 , DESCR("greek small letter omicron; UNICODE(03BF) NEW")},
-#line 125 "./xhtml_ent.gperf"
- {"bdquo", 8222 , DESCR("double low-9 quotation mark; UNICODE(201E) NEW")},
+#line 249 "./xhtml_ent.gperf"
+ {"lang", 9001 , DESCR("left-pointing angle bracket = bra; UNICODE(2329) TABLE(ISOtech)")},
#line 216 "./xhtml_ent.gperf"
{"sum", 8721 , DESCR("n-ary sumation; UNICODE(2211) TABLE(ISOamsb)")},
-#line 165 "./xhtml_ent.gperf"
- {"iota", 953 , DESCR("greek small letter iota; UNICODE(03B9) ISOgrk3")},
-#line 219 "./xhtml_ent.gperf"
- {"radic", 8730 , DESCR("square root = radical sign; UNICODE(221A) TABLE(ISOtech)")},
-#line 57 "./xhtml_ent.gperf"
- {"Ouml", 214 , DESCR("latin capital letter O with diaeresis; UNICODE(00D6) TABLE(ISOlat1)")},
-#line 157 "./xhtml_ent.gperf"
- {"alpha", 945 , DESCR("greek small letter alpha; UNICODE(03B1) ISOgrk3")},
-#line 75 "./xhtml_ent.gperf"
- {"egrave", 232 , DESCR("latin small letter e with grave; UNICODE(00E8) TABLE(ISOlat1)")},
+#line 125 "./xhtml_ent.gperf"
+ {"bdquo", 8222 , DESCR("double low-9 quotation mark; UNICODE(201E) NEW")},
+#line 86 "./xhtml_ent.gperf"
+ {"oacute", 243 , DESCR("latin small letter o with acute; UNICODE(00F3) TABLE(ISOlat1)")},
+#line 29 "./xhtml_ent.gperf"
+ {"ordm", 186 , DESCR("masculine ordinal indicator; UNICODE(00BA) TABLE(ISOnum)")},
+#line 113 "./xhtml_ent.gperf"
+ {"thinsp", 8201 , DESCR("thin space; UNICODE(2009) TABLE(ISOpub)")},
+#line 114 "./xhtml_ent.gperf"
+ {"zwnj", 8204 , DESCR("zero width non-joiner; UNICODE(200C) NEW TABLE(RFC2070)")},
+#line 148 "./xhtml_ent.gperf"
+ {"Pi", 928 , DESCR("greek capital letter pi; UNICODE(03A0) ISOgrk3")},
+#line 253 "./xhtml_ent.gperf"
+ {"clubs", 9827 , DESCR("black club suit = shamrock; UNICODE(2663) TABLE(ISOpub)")},
+#line 16 "./xhtml_ent.gperf"
+ {"shy", 173 , DESCR("soft hyphen = discretionary hyphen; UNICODE(00AD) TABLE(ISOnum)")},
+#line 64 "./xhtml_ent.gperf"
+ {"Yacute", 221 , DESCR("latin capital letter Y with acute; UNICODE(00DD) TABLE(ISOlat1)")},
+#line 19 "./xhtml_ent.gperf"
+ {"deg", 176 , DESCR("degree sign; UNICODE(00B0) TABLE(ISOnum)")},
+#line 250 "./xhtml_ent.gperf"
+ {"rang", 9002 , DESCR("right-pointing angle bracket = ket; UNICODE(232A) TABLE(ISOtech)")},
+#line 91 "./xhtml_ent.gperf"
+ {"oslash", 248 , DESCR("latin small letter o with stroke; = latin small letter o slash; UNICODE(00F8) TABLE(ISOlat1)")},
+#line 147 "./xhtml_ent.gperf"
+ {"Omicron", 927 , DESCR("greek capital letter omicron; UNICODE(039F)")},
+#line 162 "./xhtml_ent.gperf"
+ {"zeta", 950 , DESCR("greek small letter zeta; UNICODE(03B6) ISOgrk3")},
+#line 17 "./xhtml_ent.gperf"
+ {"reg", 174 , DESCR("registered sign = registered trade mark sign; UNICODE(00AE) TABLE(ISOnum)")},
+#line 131 "./xhtml_ent.gperf"
+ {"euro", 8364 , DESCR(" euro sign; UNICODE(20AC) NEW")},
+#line 154 "./xhtml_ent.gperf"
+ {"Chi", 935 , DESCR("greek capital letter chi; UNICODE(03A7)")},
+#line 20 "./xhtml_ent.gperf"
+ {"plusmn", 177 , DESCR("plus-minus sign = plus-or-minus sign; UNICODE(00B1) TABLE(ISOnum)")},
+#line 54 "./xhtml_ent.gperf"
+ {"Oacute", 211 , DESCR("latin capital letter O with acute; UNICODE(00D3) TABLE(ISOlat1)")},
+#line 129 "./xhtml_ent.gperf"
+ {"lsaquo", 8249 , DESCR("single left-pointing angle quotation mark; UNICODE(2039) ISO proposed")},
+#line 229 "./xhtml_ent.gperf"
+ {"sim", 8764 , DESCR("tilde operator = varies with = similar to; UNICODE(223C) TABLE(ISOtech)")},
+#line 134 "./xhtml_ent.gperf"
+ {"Beta", 914 , DESCR("greek capital letter beta; UNICODE(0392)")},
+#line 217 "./xhtml_ent.gperf"
+ {"minus", 8722 , DESCR("minus sign; UNICODE(2212) TABLE(ISOtech)")},
+#line 123 "./xhtml_ent.gperf"
+ {"ldquo", 8220 , DESCR("left double quotation mark; UNICODE(201C) TABLE(ISOnum)")},
+#line 83 "./xhtml_ent.gperf"
+ {"eth", 240 , DESCR("latin small letter eth; UNICODE(00F0) TABLE(ISOlat1)")},
+#line 28 "./xhtml_ent.gperf"
+ {"sup1", 185 , DESCR("superscript one = superscript digit one; UNICODE(00B9) TABLE(ISOnum)")},
+#line 158 "./xhtml_ent.gperf"
+ {"beta", 946 , DESCR("greek small letter beta; UNICODE(03B2) ISOgrk3")},
+#line 177 "./xhtml_ent.gperf"
+ {"upsilon", 965 , DESCR("greek small letter upsilon; UNICODE(03C5) ISOgrk3")},
+#line 243 "./xhtml_ent.gperf"
+ {"perp", 8869 , DESCR("up tack = orthogonal to = perpendicular; UNICODE(22A5) TABLE(ISOtech)")},
#line 141 "./xhtml_ent.gperf"
{"Iota", 921 , DESCR("greek capital letter iota; UNICODE(0399)")},
-#line 81 "./xhtml_ent.gperf"
- {"icirc", 238 , DESCR("latin small letter i with circumflex; UNICODE(00EE) TABLE(ISOlat1)")},
-#line 10 "./xhtml_ent.gperf"
- {"sect", 167 , DESCR("section sign; UNICODE(00A7) TABLE(ISOnum)")},
-#line 15 "./xhtml_ent.gperf"
- {"not", 172 , DESCR("not sign = discretionary hyphen; UNICODE(00AC) TABLE(ISOnum)")},
-#line 166 "./xhtml_ent.gperf"
- {"kappa", 954 , DESCR("greek small letter kappa; UNICODE(03BA) ISOgrk3")},
-#line 116 "./xhtml_ent.gperf"
- {"lrm", 8206 , DESCR("left-to-right mark; UNICODE(200E) NEW TABLE(RFC2070)")},
-#line 27 "./xhtml_ent.gperf"
- {"cedil", 184 , DESCR("cedilla = spacing cedilla; UNICODE(00B8) TABLE(ISOdia)")},
+#line 93 "./xhtml_ent.gperf"
+ {"uacute", 250 , DESCR("latin small letter u with acute; UNICODE(00FA) TABLE(ISOlat1)")},
+#line 89 "./xhtml_ent.gperf"
+ {"ouml", 246 , DESCR("latin small letter o with diaeresis; UNICODE(00F6) TABLE(ISOlat1)")},
+#line 178 "./xhtml_ent.gperf"
+ {"phi", 966 , DESCR("greek small letter phi; UNICODE(03C6) ISOgrk3")},
#line 107 "./xhtml_ent.gperf"
{"scaron", 353 , DESCR(" latin small letter s with caron; UNICODE(0161) TABLE(ISOlat2)")},
-#line 49 "./xhtml_ent.gperf"
- {"Icirc", 206 , DESCR("latin capital letter I with circumflex; UNICODE(00CE) TABLE(ISOlat1)")},
-#line 106 "./xhtml_ent.gperf"
- {"Scaron", 352 , DESCR(" latin capital letter S with caron; UNICODE(0160) TABLE(ISOlat2)")},
-#line 78 "./xhtml_ent.gperf"
- {"euml", 235 , DESCR("latin small letter e with diaeresis; UNICODE(00EB) TABLE(ISOlat1)")},
-#line 215 "./xhtml_ent.gperf"
- {"prod", 8719 , DESCR("n-ary product = product sign; UNICODE(220F) TABLE(ISOamsb)")},
-#line 37 "./xhtml_ent.gperf"
- {"Acirc", 194 , DESCR("latin capital letter A with circumflex; UNICODE(00C2) TABLE(ISOlat1)")},
-#line 118 "./xhtml_ent.gperf"
- {"ndash", 8211 , DESCR("en dash; UNICODE(2013) TABLE(ISOpub)")},
-#line 137 "./xhtml_ent.gperf"
- {"Epsilon", 917 , DESCR("greek capital letter epsilon; UNICODE(0395)")},
+#line 59 "./xhtml_ent.gperf"
+ {"Oslash", 216 , DESCR("latin capital letter O with stroke = latin capital letter O slash; UNICODE(00D8) TABLE(ISOlat1)")},
+#line 130 "./xhtml_ent.gperf"
+ {"rsaquo", 8250 , DESCR("single right-pointing angle quotation mark; UNICODE(203A) ISO proposed")},
+#line 48 "./xhtml_ent.gperf"
+ {"Iacute", 205 , DESCR("latin capital letter I with acute; UNICODE(00CD) TABLE(ISOlat1)")},
+#line 247 "./xhtml_ent.gperf"
+ {"lfloor", 8970 , DESCR("left floor = apl downstile; UNICODE(230A) TABLE(ISOamsc)")},
+#line 179 "./xhtml_ent.gperf"
+ {"chi", 967 , DESCR("greek small letter chi; UNICODE(03C7) ISOgrk3")},
+#line 124 "./xhtml_ent.gperf"
+ {"rdquo", 8221 , DESCR("right double quotation mark; UNICODE(201D) TABLE(ISOnum)")},
+#line 108 "./xhtml_ent.gperf"
+ {"Yuml", 376 , DESCR(" latin capital letter Y with diaeresis; UNICODE(0178) TABLE(ISOlat2)")},
+#line 6 "./xhtml_ent.gperf"
+ {"pound", 163 , DESCR("pound sign; UNICODE(00A3) TABLE(ISOnum)")},
+#line 209 "./xhtml_ent.gperf"
+ {"exist", 8707 , DESCR("there exists; UNICODE(2203) TABLE(ISOtech)")},
+#line 184 "./xhtml_ent.gperf"
+ {"piv", 982 , DESCR("greek pi symbol; UNICODE(03D6) ISOgrk3")},
+#line 12 "./xhtml_ent.gperf"
+ {"copy", 169 , DESCR("copyright sign; UNICODE(00A9) TABLE(ISOnum)")},
#line 117 "./xhtml_ent.gperf"
{"rlm", 8207 , DESCR("right-to-left mark; UNICODE(200F) NEW TABLE(RFC2070)")},
-#line 231 "./xhtml_ent.gperf"
- {"asymp", 8776 , DESCR("almost equal to = asymptotic to; UNICODE(2248) ISOamsr")},
-#line 32 "./xhtml_ent.gperf"
- {"frac12", 189 , DESCR("vulgar fraction one half = fraction one half; UNICODE(00BD) TABLE(ISOnum)")},
+#line 40 "./xhtml_ent.gperf"
+ {"Aring", 197 , DESCR("latin capital letter A with ring above = latin capital letter A ring; UNICODE(00C5) TABLE(ISOlat1)")},
+#line 36 "./xhtml_ent.gperf"
+ {"Aacute", 193 , DESCR("latin capital letter A with acute; UNICODE(00C1) TABLE(ISOlat1)")},
+#line 248 "./xhtml_ent.gperf"
+ {"rfloor", 8971 , DESCR("right floor; UNICODE(230B) TABLE(ISOamsc)")},
+#line 57 "./xhtml_ent.gperf"
+ {"Ouml", 214 , DESCR("latin capital letter O with diaeresis; UNICODE(00D6) TABLE(ISOlat1)")},
+#line 153 "./xhtml_ent.gperf"
+ {"Phi", 934 , DESCR("greek capital letter phi; UNICODE(03A6) ISOgrk3")},
+#line 138 "./xhtml_ent.gperf"
+ {"Zeta", 918 , DESCR("greek capital letter zeta; UNICODE(0396)")},
+#line 106 "./xhtml_ent.gperf"
+ {"Scaron", 352 , DESCR(" latin capital letter S with caron; UNICODE(0160) TABLE(ISOlat2)")},
+#line 139 "./xhtml_ent.gperf"
+ {"Eta", 919 , DESCR("greek capital letter eta; UNICODE(0397)")},
+#line 185 "./xhtml_ent.gperf"
+ {"bull", 8226 , DESCR("bullet = black small circle; UNICODE(2022) TABLE(ISOpub)")},
+#line 165 "./xhtml_ent.gperf"
+ {"iota", 953 , DESCR("greek small letter iota; UNICODE(03B9) ISOgrk3")},
+#line 143 "./xhtml_ent.gperf"
+ {"Lambda", 923 , DESCR("greek capital letter lambda; UNICODE(039B) ISOgrk3")},
+#line 218 "./xhtml_ent.gperf"
+ {"lowast", 8727 , DESCR("asterisk operator; UNICODE(2217) TABLE(ISOtech)")},
+#line 163 "./xhtml_ent.gperf"
+ {"eta", 951 , DESCR("greek small letter eta; UNICODE(03B7) ISOgrk3")},
+#line 21 "./xhtml_ent.gperf"
+ {"sup2", 178 , DESCR("superscript two = superscript digit two = squared; UNICODE(00B2) TABLE(ISOnum)")},
+#line 96 "./xhtml_ent.gperf"
+ {"yacute", 253 , DESCR("latin small letter y with acute; UNICODE(00FD) TABLE(ISOlat1)")},
#line 210 "./xhtml_ent.gperf"
{"empty", 8709 , DESCR("empty set = null set = diameter; UNICODE(2205) TABLE(ISOamso)")},
-#line 136 "./xhtml_ent.gperf"
- {"Delta", 916 , DESCR("greek capital letter delta; UNICODE(0394) ISOgrk3")},
-#line 133 "./xhtml_ent.gperf"
- {"Alpha", 913 , DESCR("greek capital letter alpha; UNICODE(0391)")},
-#line 55 "./xhtml_ent.gperf"
- {"Ocirc", 212 , DESCR("latin capital letter O with circumflex; UNICODE(00D4) TABLE(ISOlat1)")},
-#line 5 "./xhtml_ent.gperf"
- {"cent", 162 , DESCR("cent sign; UNICODE(00A2) TABLE(ISOnum)")},
-#line 112 "./xhtml_ent.gperf"
- {"emsp", 8195 , DESCR("em space; UNICODE(2003) TABLE(ISOpub)")},
-#line 191 "./xhtml_ent.gperf"
- {"weierp", 8472 , DESCR("script capital P = power set = Weierstrass p; UNICODE(2118) TABLE(ISOamso)")},
+#line 24 "./xhtml_ent.gperf"
+ {"micro", 181 , DESCR("micro sign; UNICODE(00B5) TABLE(ISOnum)")},
+#line 242 "./xhtml_ent.gperf"
+ {"otimes", 8855 , DESCR("circled times = vector product; UNICODE(2297) TABLE(ISOamsb)")},
+#line 80 "./xhtml_ent.gperf"
+ {"iacute", 237 , DESCR("latin small letter i with acute; UNICODE(00ED) TABLE(ISOlat1)")},
+#line 95 "./xhtml_ent.gperf"
+ {"uuml", 252 , DESCR("latin small letter u with diaeresis; UNICODE(00FC) TABLE(ISOlat1)")},
+#line 190 "./xhtml_ent.gperf"
+ {"frasl", 8260 , DESCR("fraction slash; UNICODE(2044) NEW")},
#line 152 "./xhtml_ent.gperf"
{"Upsilon", 933 , DESCR("greek capital letter upsilon; UNICODE(03A5) ISOgrk3")},
-#line 59 "./xhtml_ent.gperf"
- {"Oslash", 216 , DESCR("latin capital letter O with stroke = latin capital letter O slash; UNICODE(00D8) TABLE(ISOlat1)")},
-#line 240 "./xhtml_ent.gperf"
- {"supe", 8839 , DESCR("superset of or equal to; UNICODE(2287) TABLE(ISOtech)")},
-#line 119 "./xhtml_ent.gperf"
- {"mdash", 8212 , DESCR("em dash; UNICODE(2014) TABLE(ISOpub)")},
-#line 31 "./xhtml_ent.gperf"
- {"frac14", 188 , DESCR("vulgar fraction one quarter = fraction one quarter; UNICODE(00BC) TABLE(ISOnum)")},
+#line 166 "./xhtml_ent.gperf"
+ {"kappa", 954 , DESCR("greek small letter kappa; UNICODE(03BA) ISOgrk3")},
+#line 203 "./xhtml_ent.gperf"
+ {"uArr", 8657 , DESCR("upwards double arrow; UNICODE(21D1) TABLE(ISOamsa)")},
+#line 104 "./xhtml_ent.gperf"
+ {"OElig", 338 , DESCR(" latin capital ligature OE; UNICODE(0152) TABLE(ISOlat2)")},
+#line 61 "./xhtml_ent.gperf"
+ {"Uacute", 218 , DESCR("latin capital letter U with acute; UNICODE(00DA) TABLE(ISOlat1)")},
+#line 50 "./xhtml_ent.gperf"
+ {"Iuml", 207 , DESCR("latin capital letter I with diaeresis; UNICODE(00CF) TABLE(ISOlat1)")},
+#line 254 "./xhtml_ent.gperf"
+ {"hearts", 9829 , DESCR("black heart suit = valentine; UNICODE(2665) TABLE(ISOpub)")},
+#line 72 "./xhtml_ent.gperf"
+ {"aring", 229 , DESCR("latin small letter a with ring above = latin small letter a ring; UNICODE(00E5) TABLE(ISOlat1)")},
+#line 105 "./xhtml_ent.gperf"
+ {"oelig", 339 , DESCR(" latin small ligature oe; UNICODE(0153) TABLE(ISOlat2)")},
#line 211 "./xhtml_ent.gperf"
{"nabla", 8711 , DESCR("nabla = backward difference; UNICODE(2207) TABLE(ISOtech)")},
-#line 96 "./xhtml_ent.gperf"
- {"yacute", 253 , DESCR("latin small letter y with acute; UNICODE(00FD) TABLE(ISOlat1)")},
-#line 177 "./xhtml_ent.gperf"
- {"upsilon", 965 , DESCR("greek small letter upsilon; UNICODE(03C5) ISOgrk3")},
-#line 19 "./xhtml_ent.gperf"
- {"deg", 176 , DESCR("degree sign; UNICODE(00B0) TABLE(ISOnum)")},
-#line 64 "./xhtml_ent.gperf"
- {"Yacute", 221 , DESCR("latin capital letter Y with acute; UNICODE(00DD) TABLE(ISOlat1)")},
-#line 238 "./xhtml_ent.gperf"
- {"nsub", 8836 , DESCR("not a subset of; UNICODE(2284) ISOamsn")},
-#line 77 "./xhtml_ent.gperf"
- {"ecirc", 234 , DESCR("latin small letter e with circumflex; UNICODE(00EA) TABLE(ISOlat1)")},
-#line 97 "./xhtml_ent.gperf"
- {"thorn", 254 , DESCR("latin small letter thorn with; UNICODE(00FE) TABLE(ISOlat1)")},
-#line 218 "./xhtml_ent.gperf"
- {"lowast", 8727 , DESCR("asterisk operator; UNICODE(2217) TABLE(ISOtech)")},
-#line 246 "./xhtml_ent.gperf"
- {"rceil", 8969 , DESCR("right ceiling; UNICODE(2309) TABLE(ISOamsc)")},
-#line 86 "./xhtml_ent.gperf"
- {"oacute", 243 , DESCR("latin small letter o with acute; UNICODE(00F3) TABLE(ISOlat1)")},
-#line 221 "./xhtml_ent.gperf"
- {"infin", 8734 , DESCR("infinity; UNICODE(221E) TABLE(ISOtech)")},
-#line 250 "./xhtml_ent.gperf"
- {"rang", 9002 , DESCR("right-pointing angle bracket = ket; UNICODE(232A) TABLE(ISOtech)")},
-#line 160 "./xhtml_ent.gperf"
- {"delta", 948 , DESCR("greek small letter delta; UNICODE(03B4) ISOgrk3")},
+#line 68 "./xhtml_ent.gperf"
+ {"aacute", 225 , DESCR("latin small letter a with acute; UNICODE(00E1) TABLE(ISOlat1)")},
+#line 197 "./xhtml_ent.gperf"
+ {"uarr", 8593 , DESCR("upwards arrow; UNICODE(2191) TABLE(ISOnum)")},
+#line 58 "./xhtml_ent.gperf"
+ {"times", 215 , DESCR("multiplication sign; UNICODE(00D7) TABLE(ISOnum)")},
+#line 18 "./xhtml_ent.gperf"
+ {"macr", 175 , DESCR("macron = spacing macron = overline = APL overbar; UNICODE(00AF) TABLE(ISOdia)")},
+#line 137 "./xhtml_ent.gperf"
+ {"Epsilon", 917 , DESCR("greek capital letter epsilon; UNICODE(0395)")},
+#line 4 "./xhtml_ent.gperf"
+ {"iexcl", 161 , DESCR("inverted exclamation mark; UNICODE(00A1) TABLE(ISOnum)")},
#line 239 "./xhtml_ent.gperf"
{"sube", 8838 , DESCR("subset of or equal to; UNICODE(2286) TABLE(ISOtech)")},
-#line 105 "./xhtml_ent.gperf"
- {"oelig", 339 , DESCR(" latin small ligature oe; UNICODE(0153) TABLE(ISOlat2)")},
-#line 253 "./xhtml_ent.gperf"
- {"clubs", 9827 , DESCR("black club suit = shamrock; UNICODE(2663) TABLE(ISOpub)")},
-#line 244 "./xhtml_ent.gperf"
- {"sdot", 8901 , DESCR("dot operator; UNICODE(22C5) TABLE(ISOamsb)")},
#line 44 "./xhtml_ent.gperf"
{"Eacute", 201 , DESCR("latin capital letter E with acute; UNICODE(00C9) TABLE(ISOlat1)")},
-#line 230 "./xhtml_ent.gperf"
- {"cong", 8773 , DESCR("approximately equal to; UNICODE(2245) TABLE(ISOtech)")},
-#line 229 "./xhtml_ent.gperf"
- {"sim", 8764 , DESCR("tilde operator = varies with = similar to; UNICODE(223C) TABLE(ISOtech)")},
-#line 147 "./xhtml_ent.gperf"
- {"Omicron", 927 , DESCR("greek capital letter omicron; UNICODE(039F)")},
-#line 114 "./xhtml_ent.gperf"
- {"zwnj", 8204 , DESCR("zero width non-joiner; UNICODE(200C) NEW TABLE(RFC2070)")},
#line 34 "./xhtml_ent.gperf"
{"iquest", 191 , DESCR("inverted question mark = turned question mark; UNICODE(00BF) TABLE(ISOnum)")},
+#line 161 "./xhtml_ent.gperf"
+ {"epsilon", 949 , DESCR("greek small letter epsilon; UNICODE(03B5) ISOgrk3")},
+#line 26 "./xhtml_ent.gperf"
+ {"middot", 183 , DESCR("middle dot = Georgian comma = Greek middle dot; UNICODE(00B7) TABLE(ISOnum)")},
+#line 183 "./xhtml_ent.gperf"
+ {"upsih", 978 , DESCR("greek upsilon with hook symbol; UNICODE(03D2) NEW")},
+#line 76 "./xhtml_ent.gperf"
+ {"eacute", 233 , DESCR("latin small letter e with acute; UNICODE(00E9) TABLE(ISOlat1)")},
+#line 39 "./xhtml_ent.gperf"
+ {"Auml", 196 , DESCR("latin capital letter A with diaeresis; UNICODE(00C4) TABLE(ISOlat1)")},
+#line 231 "./xhtml_ent.gperf"
+ {"asymp", 8776 , DESCR("almost equal to = asymptotic to; UNICODE(2248) ISOamsr")},
+#line 109 "./xhtml_ent.gperf"
+ {"circ", 710 , DESCR(" modifier letter circumflex accent; UNICODE(02C6) TABLE(ISOpub)")},
+#line 240 "./xhtml_ent.gperf"
+ {"supe", 8839 , DESCR("superset of or equal to; UNICODE(2287) TABLE(ISOtech)")},
+#line 87 "./xhtml_ent.gperf"
+ {"ocirc", 244 , DESCR("latin small letter o with circumflex; UNICODE(00F4) TABLE(ISOlat1)")},
+#line 25 "./xhtml_ent.gperf"
+ {"para", 182 , DESCR("pilcrow sign = paragraph sign; UNICODE(00B6) TABLE(ISOnum)")},
+#line 9 "./xhtml_ent.gperf"
+ {"brvbar", 166 , DESCR("broken bar = broken vertical bar; UNICODE(00A6) TABLE(ISOnum)")},
+#line 202 "./xhtml_ent.gperf"
+ {"lArr", 8656 , DESCR("leftwards double arrow; UNICODE(21D0) TABLE(ISOtech)")},
+#line 206 "./xhtml_ent.gperf"
+ {"hArr", 8660 , DESCR("left right double arrow; UNICODE(21D4) TABLE(ISOamsa)")},
+#line 181 "./xhtml_ent.gperf"
+ {"omega", 969 , DESCR("greek small letter omega; UNICODE(03C9) ISOgrk3")},
+#line 136 "./xhtml_ent.gperf"
+ {"Delta", 916 , DESCR("greek capital letter delta; UNICODE(0394) ISOgrk3")},
+#line 98 "./xhtml_ent.gperf"
+ {"yuml", 255 , DESCR("latin small letter y with diaeresis; UNICODE(00FF) TABLE(ISOlat1)")},
+#line 196 "./xhtml_ent.gperf"
+ {"larr", 8592 , DESCR("leftwards arrow; UNICODE(2190) TABLE(ISOnum)")},
+#line 193 "./xhtml_ent.gperf"
+ {"real", 8476 , DESCR("blackletter capital R = real part symbol; UNICODE(211C) TABLE(ISOamso)")},
+#line 118 "./xhtml_ent.gperf"
+ {"ndash", 8211 , DESCR("en dash; UNICODE(2013) TABLE(ISOpub)")},
+#line 205 "./xhtml_ent.gperf"
+ {"dArr", 8659 , DESCR("downwards double arrow; UNICODE(21D3) TABLE(ISOamsa)")},
+#line 200 "./xhtml_ent.gperf"
+ {"harr", 8596 , DESCR("left right arrow; UNICODE(2194) TABLE(ISOamsa)")},
+#line 82 "./xhtml_ent.gperf"
+ {"iuml", 239 , DESCR("latin small letter i with diaeresis; UNICODE(00EF) TABLE(ISOlat1)")},
+#line 41 "./xhtml_ent.gperf"
+ {"AElig", 198 , DESCR("latin capital letter AE = latin capital ligature AE; UNICODE(00C6) TABLE(ISOlat1)")},
+#line 182 "./xhtml_ent.gperf"
+ {"thetasym", 977 , DESCR("greek small letter theta symbol; UNICODE(03D1) NEW")},
+#line 189 "./xhtml_ent.gperf"
+ {"oline", 8254 , DESCR("overline = spacing overscore; UNICODE(203E) NEW")},
#line 88 "./xhtml_ent.gperf"
{"otilde", 245 , DESCR("latin small letter o with tilde; UNICODE(00F5) TABLE(ISOlat1)")},
-#line 61 "./xhtml_ent.gperf"
- {"Uacute", 218 , DESCR("latin capital letter U with acute; UNICODE(00DA) TABLE(ISOlat1)")},
+#line 63 "./xhtml_ent.gperf"
+ {"Uuml", 220 , DESCR("latin capital letter U with diaeresis; UNICODE(00DC) TABLE(ISOlat1)")},
+#line 199 "./xhtml_ent.gperf"
+ {"darr", 8595 , DESCR("downwards arrow; UNICODE(2193) TABLE(ISOnum)")},
+#line 33 "./xhtml_ent.gperf"
+ {"frac34", 190 , DESCR("vulgar fraction three quarters = fraction three quarters; UNICODE(00BE) TABLE(ISOnum)")},
+#line 204 "./xhtml_ent.gperf"
+ {"rArr", 8658 , DESCR("rightwards double arrow; UNICODE(21D2) TABLE(ISOtech)")},
+#line 32 "./xhtml_ent.gperf"
+ {"frac12", 189 , DESCR("vulgar fraction one half = fraction one half; UNICODE(00BD) TABLE(ISOnum)")},
+#line 71 "./xhtml_ent.gperf"
+ {"auml", 228 , DESCR("latin small letter a with diaeresis; UNICODE(00E4) TABLE(ISOlat1)")},
+#line 84 "./xhtml_ent.gperf"
+ {"ntilde", 241 , DESCR("latin small letter n with tilde; UNICODE(00F1) TABLE(ISOlat1)")},
+#line 252 "./xhtml_ent.gperf"
+ {"spades", 9824 , DESCR("black spade suit; UNICODE(2660) TABLE(ISOpub)")},
+#line 55 "./xhtml_ent.gperf"
+ {"Ocirc", 212 , DESCR("latin capital letter O with circumflex; UNICODE(00D4) TABLE(ISOlat1)")},
#line 66 "./xhtml_ent.gperf"
{"szlig", 223 , DESCR("latin small letter sharp s = ess-zed; UNICODE(00DF) TABLE(ISOlat1)")},
-#line 29 "./xhtml_ent.gperf"
- {"ordm", 186 , DESCR("masculine ordinal indicator; UNICODE(00BA) TABLE(ISOnum)")},
-#line 93 "./xhtml_ent.gperf"
- {"uacute", 250 , DESCR("latin small letter u with acute; UNICODE(00FA) TABLE(ISOlat1)")},
-#line 68 "./xhtml_ent.gperf"
- {"aacute", 225 , DESCR("latin small letter a with acute; UNICODE(00E1) TABLE(ISOlat1)")},
-#line 245 "./xhtml_ent.gperf"
- {"lceil", 8968 , DESCR("left ceiling = apl upstile; UNICODE(2308) TABLE(ISOamsc)")},
-#line 249 "./xhtml_ent.gperf"
- {"lang", 9001 , DESCR("left-pointing angle bracket = bra; UNICODE(2329) TABLE(ISOtech)")},
-#line 73 "./xhtml_ent.gperf"
- {"aelig", 230 , DESCR("latin small letter ae = latin small ligature ae; UNICODE(00E6) TABLE(ISOlat1)")},
+#line 198 "./xhtml_ent.gperf"
+ {"rarr", 8594 , DESCR("rightwards arrow; UNICODE(2192) TABLE(ISOnum)")},
+#line 46 "./xhtml_ent.gperf"
+ {"Euml", 203 , DESCR("latin capital letter E with diaeresis; UNICODE(00CB) TABLE(ISOlat1)")},
+#line 164 "./xhtml_ent.gperf"
+ {"theta", 952 , DESCR("greek small letter theta; UNICODE(03B8) ISOgrk3")},
+#line 156 "./xhtml_ent.gperf"
+ {"Omega", 937 , DESCR("greek capital letter omega; UNICODE(03A9) ISOgrk3")},
#line 140 "./xhtml_ent.gperf"
{"Theta", 920 , DESCR("greek capital letter theta; UNICODE(0398) ISOgrk3")},
-#line 212 "./xhtml_ent.gperf"
- {"isin", 8712 , DESCR("element of; UNICODE(2208) TABLE(ISOtech)")},
-#line 242 "./xhtml_ent.gperf"
- {"otimes", 8855 , DESCR("circled times = vector product; UNICODE(2297) TABLE(ISOamsb)")},
-#line 161 "./xhtml_ent.gperf"
- {"epsilon", 949 , DESCR("greek small letter epsilon; UNICODE(03B5) ISOgrk3")},
-#line 80 "./xhtml_ent.gperf"
- {"iacute", 237 , DESCR("latin small letter i with acute; UNICODE(00ED) TABLE(ISOlat1)")},
-#line 65 "./xhtml_ent.gperf"
- {"THORN", 222 , DESCR("latin capital letter THORN; UNICODE(00DE) TABLE(ISOlat1)")},
-#line 113 "./xhtml_ent.gperf"
- {"thinsp", 8201 , DESCR("thin space; UNICODE(2009) TABLE(ISOpub)")},
-#line 181 "./xhtml_ent.gperf"
- {"omega", 969 , DESCR("greek small letter omega; UNICODE(03C9) ISOgrk3")},
-#line 70 "./xhtml_ent.gperf"
- {"atilde", 227 , DESCR("latin small letter a with tilde; UNICODE(00E3) TABLE(ISOlat1)")},
-#line 6 "./xhtml_ent.gperf"
- {"pound", 163 , DESCR("pound sign; UNICODE(00A3) TABLE(ISOnum)")},
+#line 78 "./xhtml_ent.gperf"
+ {"euml", 235 , DESCR("latin small letter e with diaeresis; UNICODE(00EB) TABLE(ISOlat1)")},
#line 167 "./xhtml_ent.gperf"
{"lambda", 955 , DESCR("greek small letter lambda; UNICODE(03BB) ISOgrk3")},
-#line 48 "./xhtml_ent.gperf"
- {"Iacute", 205 , DESCR("latin capital letter I with acute; UNICODE(00CD) TABLE(ISOlat1)")},
-#line 135 "./xhtml_ent.gperf"
- {"Gamma", 915 , DESCR("greek capital letter gamma; UNICODE(0393) ISOgrk3")},
-#line 209 "./xhtml_ent.gperf"
- {"exist", 8707 , DESCR("there exists; UNICODE(2203) TABLE(ISOtech)")},
-#line 36 "./xhtml_ent.gperf"
- {"Aacute", 193 , DESCR("latin capital letter A with acute; UNICODE(00C1) TABLE(ISOlat1)")},
-#line 252 "./xhtml_ent.gperf"
- {"spades", 9824 , DESCR("black spade suit; UNICODE(2660) TABLE(ISOpub)")},
-#line 143 "./xhtml_ent.gperf"
- {"Lambda", 923 , DESCR("greek capital letter lambda; UNICODE(039B) ISOgrk3")},
-#line 54 "./xhtml_ent.gperf"
- {"Oacute", 211 , DESCR("latin capital letter O with acute; UNICODE(00D3) TABLE(ISOlat1)")},
-#line 38 "./xhtml_ent.gperf"
- {"Atilde", 195 , DESCR("latin capital letter A with tilde; UNICODE(00C3) TABLE(ISOlat1)")},
-#line 20 "./xhtml_ent.gperf"
- {"plusmn", 177 , DESCR("plus-minus sign = plus-or-minus sign; UNICODE(00B1) TABLE(ISOnum)")},
-#line 174 "./xhtml_ent.gperf"
- {"sigmaf", 962 , DESCR("greek small letter final sigma; UNICODE(03C2) ISOgrk3")},
-#line 84 "./xhtml_ent.gperf"
- {"ntilde", 241 , DESCR("latin small letter n with tilde; UNICODE(00F1) TABLE(ISOlat1)")},
-#line 74 "./xhtml_ent.gperf"
- {"ccedil", 231 , DESCR("latin small letter c with cedilla; UNICODE(00E7) TABLE(ISOlat1)")},
-#line 76 "./xhtml_ent.gperf"
- {"eacute", 233 , DESCR("latin small letter e with acute; UNICODE(00E9) TABLE(ISOlat1)")},
-#line 217 "./xhtml_ent.gperf"
- {"minus", 8722 , DESCR("minus sign; UNICODE(2212) TABLE(ISOtech)")},
-#line 127 "./xhtml_ent.gperf"
- {"Dagger", 8225 , DESCR("double dagger; UNICODE(2021) TABLE(ISOpub)")},
-#line 164 "./xhtml_ent.gperf"
- {"theta", 952 , DESCR("greek small letter theta; UNICODE(03B8) ISOgrk3")},
-#line 213 "./xhtml_ent.gperf"
- {"notin", 8713 , DESCR("not an element of; UNICODE(2209) TABLE(ISOtech)")},
+#line 160 "./xhtml_ent.gperf"
+ {"delta", 948 , DESCR("greek small letter delta; UNICODE(03B4) ISOgrk3")},
+#line 186 "./xhtml_ent.gperf"
+ {"hellip", 8230 , DESCR("horizontal ellipsis = three dot leader; UNICODE(2026) TABLE(ISOpub)")},
+#line 219 "./xhtml_ent.gperf"
+ {"radic", 8730 , DESCR("square root = radical sign; UNICODE(221A) TABLE(ISOtech)")},
+#line 94 "./xhtml_ent.gperf"
+ {"ucirc", 251 , DESCR("latin small letter u with circumflex; UNICODE(00FB) TABLE(ISOlat1)")},
+#line 255 "./xhtml_ent.gperf"
+ {"diams", 9830 , DESCR("black diamond suit; UNICODE(2666) TABLE(ISOpub)")},
+#line 142 "./xhtml_ent.gperf"
+ {"Kappa", 922 , DESCR("greek capital letter kappa; UNICODE(039A)")},
#line 56 "./xhtml_ent.gperf"
{"Otilde", 213 , DESCR("latin capital letter O with tilde; UNICODE(00D5) TABLE(ISOlat1)")},
-#line 175 "./xhtml_ent.gperf"
- {"sigma", 963 , DESCR("greek small letter sigma; UNICODE(03C3) ISOgrk3")},
-#line 52 "./xhtml_ent.gperf"
- {"Ntilde", 209 , DESCR("latin capital letter N with tilde; UNICODE(00D1) TABLE(ISOlat1)")},
+#line 31 "./xhtml_ent.gperf"
+ {"frac14", 188 , DESCR("vulgar fraction one quarter = fraction one quarter; UNICODE(00BC) TABLE(ISOnum)")},
+#line 49 "./xhtml_ent.gperf"
+ {"Icirc", 206 , DESCR("latin capital letter I with circumflex; UNICODE(00CE) TABLE(ISOlat1)")},
+#line 27 "./xhtml_ent.gperf"
+ {"cedil", 184 , DESCR("cedilla = spacing cedilla; UNICODE(00B8) TABLE(ISOdia)")},
+#line 194 "./xhtml_ent.gperf"
+ {"trade", 8482 , DESCR("trade mark sign; UNICODE(2122) TABLE(ISOnum)")},
+#line 127 "./xhtml_ent.gperf"
+ {"Dagger", 8225 , DESCR("double dagger; UNICODE(2021) TABLE(ISOpub)")},
+#line 128 "./xhtml_ent.gperf"
+ {"permil", 8240 , DESCR("per mille sign; UNICODE(2030) TABLE(ISOtech)")},
+#line 174 "./xhtml_ent.gperf"
+ {"sigmaf", 962 , DESCR("greek small letter final sigma; UNICODE(03C2) ISOgrk3")},
+#line 7 "./xhtml_ent.gperf"
+ {"curren", 164 , DESCR("currency sign; UNICODE(00A4) TABLE(ISOnum)")},
+#line 37 "./xhtml_ent.gperf"
+ {"Acirc", 194 , DESCR("latin capital letter A with circumflex; UNICODE(00C2) TABLE(ISOlat1)")},
+#line 207 "./xhtml_ent.gperf"
+ {"forall", 8704 , DESCR("for all; UNICODE(2200) TABLE(ISOtech)")},
+#line 135 "./xhtml_ent.gperf"
+ {"Gamma", 915 , DESCR("greek capital letter gamma; UNICODE(0393) ISOgrk3")},
#line 195 "./xhtml_ent.gperf"
{"alefsym", 8501 , DESCR("alef symbol = first transfinite cardinal; UNICODE(2135) NEW")},
-#line 228 "./xhtml_ent.gperf"
- {"there4", 8756 , DESCR("therefore; UNICODE(2234) TABLE(ISOtech)")},
-#line 150 "./xhtml_ent.gperf"
- {"Sigma", 931 , DESCR("greek capital letter sigma; UNICODE(03A3) ISOgrk3")},
-#line 255 "./xhtml_ent.gperf"
- {"diams", 9830 , DESCR("black diamond suit; UNICODE(2666) TABLE(ISOpub)")},
-#line 72 "./xhtml_ent.gperf"
- {"aring", 229 , DESCR("latin small letter a with ring above = latin small letter a ring; UNICODE(00E5) TABLE(ISOlat1)")},
-#line 159 "./xhtml_ent.gperf"
- {"gamma", 947 , DESCR("greek small letter gamma; UNICODE(03B3) ISOgrk3")},
-#line 41 "./xhtml_ent.gperf"
- {"AElig", 198 , DESCR("latin capital letter AE = latin capital ligature AE; UNICODE(00C6) TABLE(ISOlat1)")},
+#line 52 "./xhtml_ent.gperf"
+ {"Ntilde", 209 , DESCR("latin capital letter N with tilde; UNICODE(00D1) TABLE(ISOlat1)")},
+#line 23 "./xhtml_ent.gperf"
+ {"acute", 180 , DESCR("acute accent = spacing acute; UNICODE(00B4) TABLE(ISOdia)")},
+#line 73 "./xhtml_ent.gperf"
+ {"aelig", 230 , DESCR("latin small letter ae = latin small ligature ae; UNICODE(00E6) TABLE(ISOlat1)")},
+#line 201 "./xhtml_ent.gperf"
+ {"crarr", 8629 , DESCR("downwards arrow with corner leftwards = carriage return; UNICODE(21B5) NEW")},
+#line 85 "./xhtml_ent.gperf"
+ {"ograve", 242 , DESCR("latin small letter o with grave; UNICODE(00F2) TABLE(ISOlat1)")},
+#line 119 "./xhtml_ent.gperf"
+ {"mdash", 8212 , DESCR("em dash; UNICODE(2014) TABLE(ISOpub)")},
+#line 187 "./xhtml_ent.gperf"
+ {"prime", 8242 , DESCR("prime = minutes = feet; UNICODE(2032) TABLE(ISOtech)")},
+#line 38 "./xhtml_ent.gperf"
+ {"Atilde", 195 , DESCR("latin capital letter A with tilde; UNICODE(00C3) TABLE(ISOlat1)")},
+#line 81 "./xhtml_ent.gperf"
+ {"icirc", 238 , DESCR("latin small letter i with circumflex; UNICODE(00EE) TABLE(ISOlat1)")},
#line 126 "./xhtml_ent.gperf"
{"dagger", 8224 , DESCR("dagger; UNICODE(2020) TABLE(ISOpub)")},
+#line 159 "./xhtml_ent.gperf"
+ {"gamma", 947 , DESCR("greek small letter gamma; UNICODE(03B3) ISOgrk3")},
#line 42 "./xhtml_ent.gperf"
{"Ccedil", 199 , DESCR("latin capital letter C with cedilla; UNICODE(00C7) TABLE(ISOlat1)")},
-#line 156 "./xhtml_ent.gperf"
- {"Omega", 937 , DESCR("greek capital letter omega; UNICODE(03A9) ISOgrk3")},
-#line 187 "./xhtml_ent.gperf"
- {"prime", 8242 , DESCR("prime = minutes = feet; UNICODE(2032) TABLE(ISOtech)")},
-#line 104 "./xhtml_ent.gperf"
- {"OElig", 338 , DESCR(" latin capital ligature OE; UNICODE(0152) TABLE(ISOlat2)")},
-#line 189 "./xhtml_ent.gperf"
- {"oline", 8254 , DESCR("overline = spacing overscore; UNICODE(203E) NEW")},
-#line 90 "./xhtml_ent.gperf"
- {"divide", 247 , DESCR("division sign; UNICODE(00F7) TABLE(ISOnum)")},
-#line 40 "./xhtml_ent.gperf"
- {"Aring", 197 , DESCR("latin capital letter A with ring above = latin capital letter A ring; UNICODE(00C5) TABLE(ISOlat1)")},
-#line 23 "./xhtml_ent.gperf"
- {"acute", 180 , DESCR("acute accent = spacing acute; UNICODE(00B4) TABLE(ISOdia)")},
-#line 188 "./xhtml_ent.gperf"
- {"Prime", 8243 , DESCR("double prime = seconds = inches; UNICODE(2033) TABLE(ISOtech)")},
-#line 26 "./xhtml_ent.gperf"
- {"middot", 183 , DESCR("middle dot = Georgian comma = Greek middle dot; UNICODE(00B7) TABLE(ISOnum)")},
-#line 182 "./xhtml_ent.gperf"
- {"thetasym", 977 , DESCR("greek small letter theta symbol; UNICODE(03D1) NEW")},
-#line 194 "./xhtml_ent.gperf"
- {"trade", 8482 , DESCR("trade mark sign; UNICODE(2122) TABLE(ISOnum)")},
-#line 58 "./xhtml_ent.gperf"
- {"times", 215 , DESCR("multiplication sign; UNICODE(00D7) TABLE(ISOnum)")},
+#line 62 "./xhtml_ent.gperf"
+ {"Ucirc", 219 , DESCR("latin capital letter U with circumflex; UNICODE(00DB) TABLE(ISOlat1)")},
+#line 133 "./xhtml_ent.gperf"
+ {"Alpha", 913 , DESCR("greek capital letter alpha; UNICODE(0391)")},
+#line 69 "./xhtml_ent.gperf"
+ {"acirc", 226 , DESCR("latin small letter a with circumflex; UNICODE(00E2) TABLE(ISOlat1)")},
+#line 45 "./xhtml_ent.gperf"
+ {"Ecirc", 202 , DESCR("latin capital letter E with circumflex; UNICODE(00CA) TABLE(ISOlat1)")},
#line 192 "./xhtml_ent.gperf"
{"image", 8465 , DESCR("blackletter capital I = imaginary part; UNICODE(2111) TABLE(ISOamso)")},
+#line 175 "./xhtml_ent.gperf"
+ {"sigma", 963 , DESCR("greek small letter sigma; UNICODE(03C3) ISOgrk3")},
+#line 191 "./xhtml_ent.gperf"
+ {"weierp", 8472 , DESCR("script capital P = power set = Weierstrass p; UNICODE(2118) TABLE(ISOamso)")},
+#line 53 "./xhtml_ent.gperf"
+ {"Ograve", 210 , DESCR("latin capital letter O with grave; UNICODE(00D2) TABLE(ISOlat1)")},
+#line 77 "./xhtml_ent.gperf"
+ {"ecirc", 234 , DESCR("latin small letter e with circumflex; UNICODE(00EA) TABLE(ISOlat1)")},
+#line 188 "./xhtml_ent.gperf"
+ {"Prime", 8243 , DESCR("double prime = seconds = inches; UNICODE(2033) TABLE(ISOtech)")},
+#line 74 "./xhtml_ent.gperf"
+ {"ccedil", 231 , DESCR("latin small letter c with cedilla; UNICODE(00E7) TABLE(ISOlat1)")},
+#line 70 "./xhtml_ent.gperf"
+ {"atilde", 227 , DESCR("latin small letter a with tilde; UNICODE(00E3) TABLE(ISOlat1)")},
#line 110 "./xhtml_ent.gperf"
- {"tilde", 732 , DESCR(" small tilde; UNICODE(02DC) TABLE(ISOdia)")}
+ {"tilde", 732 , DESCR(" small tilde; UNICODE(02DC) TABLE(ISOdia)")},
+#line 245 "./xhtml_ent.gperf"
+ {"lceil", 8968 , DESCR("left ceiling = apl upstile; UNICODE(2308) TABLE(ISOamsc)")},
+#line 233 "./xhtml_ent.gperf"
+ {"equiv", 8801 , DESCR("identical to; UNICODE(2261) TABLE(ISOtech)")},
+#line 157 "./xhtml_ent.gperf"
+ {"alpha", 945 , DESCR("greek small letter alpha; UNICODE(03B1) ISOgrk3")},
+#line 92 "./xhtml_ent.gperf"
+ {"ugrave", 249 , DESCR("latin small letter u with grave; UNICODE(00F9) TABLE(ISOlat1)")},
+#line 47 "./xhtml_ent.gperf"
+ {"Igrave", 204 , DESCR("latin capital letter I with grave; UNICODE(00CC) TABLE(ISOlat1)")},
+#line 150 "./xhtml_ent.gperf"
+ {"Sigma", 931 , DESCR("greek capital letter sigma; UNICODE(03A3) ISOgrk3")},
+#line 246 "./xhtml_ent.gperf"
+ {"rceil", 8969 , DESCR("right ceiling; UNICODE(2309) TABLE(ISOamsc)")},
+#line 228 "./xhtml_ent.gperf"
+ {"there4", 8756 , DESCR("therefore; UNICODE(2234) TABLE(ISOtech)")},
+#line 35 "./xhtml_ent.gperf"
+ {"Agrave", 192 , DESCR("latin capital letter A with grave = latin capital letter A grave; UNICODE(00C0) TABLE(ISOlat1)")},
+#line 79 "./xhtml_ent.gperf"
+ {"igrave", 236 , DESCR("latin small letter i with grave; UNICODE(00EC) TABLE(ISOlat1)")},
+#line 60 "./xhtml_ent.gperf"
+ {"Ugrave", 217 , DESCR("latin capital letter U with grave; UNICODE(00D9) TABLE(ISOlat1)")},
+#line 67 "./xhtml_ent.gperf"
+ {"agrave", 224 , DESCR("latin small letter a with grave = latin small letter a grave; UNICODE(00E0) TABLE(ISOlat1)")},
+#line 90 "./xhtml_ent.gperf"
+ {"divide", 247 , DESCR("division sign; UNICODE(00F7) TABLE(ISOnum)")},
+#line 43 "./xhtml_ent.gperf"
+ {"Egrave", 200 , DESCR("latin capital letter E with grave; UNICODE(00C8) TABLE(ISOlat1)")},
+#line 75 "./xhtml_ent.gperf"
+ {"egrave", 232 , DESCR("latin small letter e with grave; UNICODE(00E8) TABLE(ISOlat1)")}
};
static const short lookup[] =
@@ -626,126 +626,117 @@ static const short lookup[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 0, -1, -1, -1, -1,
- -1, -1, 1, -1, -1, -1, -1, -1, -1, -1,
- -1, 2, -1, -1, -1, -1, -1, -1, 3, -1,
- -1, 4, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 5, 6,
- -1, -1, -1, -1, -1, 7, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 8, -1, -1,
- -1, 9, -1, -1, -1, -1, -1, -1, 10, -1,
- -1, -1, 11, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 0, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 12, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 13, 14,
- -1, 15, -1, -1, -1, -1, 16, -1, -1, 17,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 18, -1, -1, -1, 19, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 20, -1, -1, -1, -1, -1, 21, -1,
- -1, -1, -1, 22, -1, -1, 23, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 24, 25, -1, -1,
- -1, -1, -1, -1, 26, -1, -1, -1, -1, 27,
- -1, 28, -1, -1, -1, -1, -1, 29, -1, -1,
- -1, -1, 30, 31, 32, -1, 33, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 34, -1, 35, -1,
- -1, -1, -1, -1, -1, 36, -1, -1, -1, -1,
- -1, 37, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 38, -1, -1, -1, -1, -1, -1, 39, -1,
- -1, -1, -1, 40, -1, 41, -1, -1, 42, -1,
- -1, -1, -1, -1, -1, -1, 43, -1, -1, 44,
- -1, -1, 45, -1, 46, 47, -1, 48, -1, 49,
- 50, -1, 51, -1, -1, -1, 52, -1, -1, -1,
- -1, 53, -1, 54, 55, -1, -1, -1, -1, 56,
- -1, -1, -1, 57, -1, -1, -1, -1, 58, 59,
- -1, -1, -1, -1, -1, -1, -1, -1, 60, -1,
- 61, -1, 62, -1, -1, -1, -1, -1, 63, -1,
- -1, 64, 65, -1, -1, -1, -1, -1, -1, -1,
- 66, -1, -1, -1, -1, 67, -1, -1, -1, 68,
- -1, 69, 70, -1, -1, -1, 71, 72, -1, -1,
- 73, 74, -1, -1, -1, 75, -1, 76, 77, -1,
- -1, -1, -1, 78, -1, 79, -1, 80, 81, -1,
- 82, 83, 84, -1, 85, -1, -1, 86, 87, 88,
- -1, 89, 90, -1, -1, -1, 91, -1, -1, 92,
- -1, 93, -1, 94, -1, 95, 96, -1, 97, 98,
- -1, 99, 100, -1, -1, 101, 102, -1, 103, 104,
- 105, -1, -1, 106, 107, -1, 108, -1, 109, -1,
- 110, 111, -1, -1, -1, -1, 112, 113, -1, -1,
- -1, -1, -1, -1, 114, 115, -1, -1, -1, -1,
- -1, 116, 117, 118, 119, 120, 121, -1, 122, -1,
- 123, -1, -1, -1, 124, 125, -1, -1, 126, -1,
- 127, -1, 128, -1, -1, -1, -1, -1, 129, -1,
- 130, -1, -1, 131, -1, -1, -1, 132, -1, 133,
- -1, -1, -1, 134, -1, -1, 135, -1, -1, -1,
- 136, -1, -1, -1, -1, 137, 138, -1, -1, -1,
- 139, 140, -1, -1, -1, -1, 141, 142, -1, 143,
- -1, -1, 144, -1, 145, 146, -1, -1, -1, 147,
- 148, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, 150, 151, -1, -1, -1,
- -1, -1, -1, -1, 152, -1, -1, -1, -1, -1,
- -1, 153, 154, -1, 155, 156, 157, -1, -1, -1,
- -1, 158, 159, 160, -1, -1, -1, 161, -1, -1,
- -1, -1, 162, -1, -1, -1, -1, 163, 164, 165,
- -1, 166, -1, -1, 167, 168, -1, 169, -1, 170,
- 171, -1, 172, -1, -1, 173, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 1, -1, -1,
+ -1, 2, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 174, -1, -1, 175, 176, -1, -1, 177, 178,
- -1, 179, -1, -1, -1, -1, -1, 180, -1, -1,
- -1, 181, 182, -1, 183, -1, -1, -1, -1, -1,
- 184, 185, -1, -1, -1, -1, 186, -1, 187, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 188, -1,
- -1, -1, 189, -1, -1, -1, -1, -1, -1, 190,
- -1, -1, 191, -1, -1, -1, -1, -1, -1, -1,
- -1, 192, -1, -1, -1, -1, -1, -1, -1, 193,
- 194, -1, -1, 195, -1, -1, -1, 196, -1, -1,
- -1, -1, 197, -1, -1, -1, -1, -1, -1, 198,
- -1, 199, -1, -1, -1, -1, -1, 200, -1, -1,
+ -1, -1, 3, -1, -1, -1, -1, -1, -1, -1,
+ 4, -1, -1, -1, -1, 5, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 201, 202, -1, -1, -1, -1, -1, -1, -1,
- 203, 204, -1, -1, 205, -1, 206, 207, -1, -1,
- 208, -1, -1, 209, -1, -1, -1, 210, -1, -1,
- -1, 211, 212, -1, -1, 213, -1, -1, 214, -1,
+ -1, -1, -1, 6, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 7, -1, -1, -1,
+ -1, -1, 8, -1, -1, -1, -1, 9, -1, -1,
+ -1, -1, -1, 10, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 215, -1, -1, -1,
+ -1, -1, -1, -1, 11, 12, -1, -1, -1, -1,
+ -1, -1, 13, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 216, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 217,
- -1, 218, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 219, -1, -1, -1, 220, 221, 222, -1, -1,
- -1, -1, 223, -1, 224, -1, -1, -1, 225, 226,
- -1, -1, -1, -1, -1, 227, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 228, 229, 230, -1, 231,
- 232, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 233, 234, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 235, -1, -1, -1, -1, -1, -1,
- -1, 236, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 237, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 238, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 239, -1, 240, -1, -1, 241, -1, -1,
- -1, -1, 242, -1, -1, -1, -1, -1, -1, -1,
- -1, 243, -1, 244, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 245, 246, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 247, -1,
- -1, -1, -1, -1, -1, -1, -1, 248, -1, -1,
- -1, -1, -1, 249, -1, -1, -1, -1, -1, 250,
+ -1, -1, 14, -1, -1, -1, 15, -1, -1, 16,
+ -1, -1, -1, -1, -1, -1, 17, -1, 18, -1,
+ 19, -1, -1, -1, -1, -1, -1, -1, -1, 20,
+ -1, -1, -1, -1, -1, -1, -1, 21, -1, -1,
+ -1, -1, -1, -1, 22, -1, -1, 23, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ -1, 25, -1, 26, -1, 27, -1, 28, -1, -1,
+ -1, -1, 29, 30, 31, 32, -1, -1, -1, 33,
+ -1, -1, -1, -1, -1, -1, -1, 34, 35, -1,
+ 36, 37, -1, -1, -1, -1, -1, -1, -1, -1,
+ 38, -1, -1, -1, 39, 40, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 41, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 251, -1, -1, -1, -1,
+ 42, -1, -1, -1, -1, 43, -1, 44, -1, -1,
+ 45, -1, -1, -1, 46, -1, -1, -1, 47, -1,
+ -1, -1, -1, -1, -1, 48, -1, -1, 49, -1,
+ -1, 50, -1, -1, -1, -1, 51, -1, 52, -1,
+ -1, 53, -1, -1, 54, 55, -1, -1, -1, -1,
+ -1, 56, -1, -1, 57, -1, -1, -1, -1, -1,
+ -1, 58, 59, -1, 60, -1, -1, -1, 61, 62,
+ 63, -1, -1, -1, 64, -1, 65, 66, -1, -1,
+ -1, -1, -1, 67, -1, -1, -1, 68, -1, -1,
+ -1, 69, -1, 70, -1, -1, 71, 72, 73, -1,
+ 74, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 75, -1, -1, -1, 76, 77, 78, -1, -1,
+ -1, 79, 80, -1, -1, -1, -1, -1, -1, -1,
+ 81, 82, 83, 84, -1, -1, 85, 86, -1, -1,
+ 87, 88, -1, -1, -1, -1, -1, -1, -1, 89,
+ 90, -1, -1, 91, -1, -1, -1, 92, -1, -1,
+ -1, 93, 94, -1, 95, -1, -1, 96, 97, 98,
+ 99, -1, -1, -1, 100, -1, -1, 101, 102, 103,
+ -1, -1, 104, -1, -1, -1, -1, -1, 105, -1,
+ -1, -1, -1, -1, -1, -1, -1, 106, -1, 107,
+ -1, -1, -1, 108, -1, -1, -1, -1, 109, 110,
+ -1, 111, -1, -1, 112, -1, -1, -1, -1, 113,
+ -1, -1, 114, -1, -1, 115, -1, -1, 116, -1,
+ 117, -1, 118, -1, 119, -1, -1, -1, 120, -1,
+ -1, 121, 122, 123, 124, -1, 125, 126, 127, -1,
+ 128, -1, -1, 129, 130, -1, 131, -1, 132, 133,
+ -1, 134, -1, 135, -1, 136, -1, 137, -1, -1,
+ 138, -1, -1, 139, 140, 141, 142, 143, 144, -1,
+ 145, -1, 146, 147, -1, -1, -1, 148, -1, 149,
+ -1, 150, -1, 151, 152, -1, -1, -1, -1, 153,
+ 154, -1, -1, -1, 155, -1, -1, -1, 156, 157,
+ 158, -1, -1, -1, -1, -1, 159, 160, -1, -1,
+ 161, 162, -1, -1, -1, -1, 163, -1, -1, 164,
+ -1, -1, -1, -1, 165, -1, 166, 167, -1, 168,
+ 169, 170, 171, 172, -1, 173, 174, -1, -1, -1,
+ 175, -1, -1, -1, 176, 177, -1, 178, -1, -1,
+ 179, -1, 180, -1, 181, -1, 182, 183, -1, -1,
+ 184, 185, -1, -1, -1, -1, 186, -1, 187, 188,
+ 189, -1, -1, -1, 190, -1, 191, -1, -1, -1,
+ 192, -1, -1, 193, 194, 195, -1, -1, 196, -1,
+ -1, -1, -1, 197, -1, -1, 198, -1, 199, 200,
+ -1, -1, -1, 201, -1, -1, 202, -1, -1, -1,
+ 203, -1, -1, -1, -1, -1, -1, -1, 204, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 205, -1,
+ -1, -1, -1, -1, -1, -1, 206, -1, 207, 208,
+ -1, -1, -1, 209, 210, -1, -1, -1, -1, 211,
+ -1, -1, -1, 212, 213, -1, -1, 214, -1, -1,
+ -1, -1, -1, 215, -1, -1, -1, -1, -1, -1,
+ 216, -1, -1, 217, -1, -1, -1, -1, -1, 218,
+ 219, 220, 221, -1, -1, -1, -1, -1, 222, 223,
+ -1, 224, -1, -1, 225, -1, -1, 226, -1, -1,
+ -1, -1, -1, -1, -1, 227, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 228, 229,
+ -1, -1, 230, -1, 231, -1, -1, -1, 232, 233,
+ -1, -1, -1, -1, -1, -1, -1, 234, -1, -1,
+ 235, -1, -1, 236, -1, -1, -1, 237, -1, -1,
+ 238, 239, -1, -1, -1, -1, -1, -1, -1, 240,
+ 241, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 242, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 243, -1, -1, -1, -1, -1, -1,
+ -1, 244, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 245, -1,
+ 246, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 247,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 252
+ -1, 248, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 249, 250, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 251, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 252
};
#ifdef __GNUC__
__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
#endif
const struct xhtml_ent_s *
xhtml_ent_gperf (register const char *str, register unsigned int len)
diff --git a/libsrc/Xml.new/xml_ecm.c b/libsrc/Xml.new/xml_ecm.c
index 20e316c..32978be 100644
--- a/libsrc/Xml.new/xml_ecm.c
+++ b/libsrc/Xml.new/xml_ecm.c
@@ -1,12 +1,12 @@
/*
* xml_ecm.c
*
- * $Id: xml_ecm.c,v 1.7.2.2 2012/03/08 12:55:38 source Exp $
+ * $Id: xml_ecm.c,v 1.7.2.1 2010/01/28 00:38:14 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/xml_ecm.h b/libsrc/Xml.new/xml_ecm.h
index 5804a8e..344cc64 100644
--- a/libsrc/Xml.new/xml_ecm.h
+++ b/libsrc/Xml.new/xml_ecm.h
@@ -1,12 +1,12 @@
/*
* xml_ecm.h
*
- * $Id: xml_ecm.h,v 1.6.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: xml_ecm.h,v 1.6 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/xml_ecm_test.c b/libsrc/Xml.new/xml_ecm_test.c
index 00c8999..d473ef8 100644
--- a/libsrc/Xml.new/xml_ecm_test.c
+++ b/libsrc/Xml.new/xml_ecm_test.c
@@ -1,12 +1,12 @@
/*
* xml_ecm_test.c
*
- * $Id: xml_ecm_test.c,v 1.2.2.1 2012/03/08 12:55:38 source Exp $
+ * $Id: xml_ecm_test.c,v 1.2 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/xmlgram.c b/libsrc/Xml.new/xmlgram.c
index 15ca6f5..897e51b 100644
--- a/libsrc/Xml.new/xmlgram.c
+++ b/libsrc/Xml.new/xmlgram.c
@@ -1,12 +1,12 @@
/*
* xmlgram.c
*
- * $Id: xmlgram.c,v 1.3.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: xmlgram.c,v 1.3 2009/04/09 19:09:34 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/xmlparser.c b/libsrc/Xml.new/xmlparser.c
index 42b953b..b08576a 100644
--- a/libsrc/Xml.new/xmlparser.c
+++ b/libsrc/Xml.new/xmlparser.c
@@ -1,12 +1,12 @@
/*
* xmlparser.c
*
- * $Id: xmlparser.c,v 1.5.2.4 2012/03/08 12:55:39 source Exp $
+ * $Id: xmlparser.c,v 1.5.2.3 2011/03/08 11:52:56 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/xmlparser.h b/libsrc/Xml.new/xmlparser.h
index ed7994e..23622e2 100644
--- a/libsrc/Xml.new/xmlparser.h
+++ b/libsrc/Xml.new/xmlparser.h
@@ -1,12 +1,12 @@
/*
* xmlparser.h
*
- * $Id: xmlparser.h,v 1.9.2.4 2012/03/08 12:55:39 source Exp $
+ * $Id: xmlparser.h,v 1.9.2.3 2011/10/28 21:46:53 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/xmlparser_impl.h b/libsrc/Xml.new/xmlparser_impl.h
index 905e7ae..5e10b91 100644
--- a/libsrc/Xml.new/xmlparser_impl.h
+++ b/libsrc/Xml.new/xmlparser_impl.h
@@ -1,12 +1,12 @@
/*
* xmlparser_impl.h
*
- * $Id: xmlparser_impl.h,v 1.8.2.3 2012/03/08 12:55:39 source Exp $
+ * $Id: xmlparser_impl.h,v 1.8.2.2 2011/03/08 11:52:56 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/Xml.new/xmlread.c b/libsrc/Xml.new/xmlread.c
index 1c8dbbd..51316b0 100644
--- a/libsrc/Xml.new/xmlread.c
+++ b/libsrc/Xml.new/xmlread.c
@@ -1,12 +1,12 @@
/*
* xmlread.c
*
- * $Id: xmlread.c,v 1.13.2.5 2012/03/08 12:55:39 source Exp $
+ * $Id: xmlread.c,v 1.13.2.4 2011/03/08 11:52:57 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/Makefile.am b/libsrc/langfunc/Makefile.am
index a18260d..9be36d6 100644
--- a/libsrc/langfunc/Makefile.am
+++ b/libsrc/langfunc/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/Makefile.in b/libsrc/langfunc/Makefile.in
index bb99796..c2a9986 100644
--- a/libsrc/langfunc/Makefile.in
+++ b/libsrc/langfunc/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -133,7 +133,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -182,7 +181,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -234,7 +232,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -281,6 +278,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/langfunc/encoding_basic.c b/libsrc/langfunc/encoding_basic.c
index d1d1973..6c507f7 100644
--- a/libsrc/langfunc/encoding_basic.c
+++ b/libsrc/langfunc/encoding_basic.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/encoding_charsets.c b/libsrc/langfunc/encoding_charsets.c
index e18ccf6..aa079b9 100644
--- a/libsrc/langfunc/encoding_charsets.c
+++ b/libsrc/langfunc/encoding_charsets.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/encoding_ucm.c b/libsrc/langfunc/encoding_ucm.c
index bd9e740..9312bcf 100644
--- a/libsrc/langfunc/encoding_ucm.c
+++ b/libsrc/langfunc/encoding_ucm.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/encoding_wide.c b/libsrc/langfunc/encoding_wide.c
index e76d066..ea5d919 100644
--- a/libsrc/langfunc/encoding_wide.c
+++ b/libsrc/langfunc/encoding_wide.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/lang25.c b/libsrc/langfunc/lang25.c
index 476d748..acf1177 100644
--- a/libsrc/langfunc/lang25.c
+++ b/libsrc/langfunc/lang25.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/langfunc.c b/libsrc/langfunc/langfunc.c
index 96d114b..f83142d 100644
--- a/libsrc/langfunc/langfunc.c
+++ b/libsrc/langfunc/langfunc.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/langfunc.h b/libsrc/langfunc/langfunc.h
index 36722c0..c9b7dde 100644
--- a/libsrc/langfunc/langfunc.h
+++ b/libsrc/langfunc/langfunc.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -112,16 +112,12 @@ struct encoding_handler_s; /* see below */
struct lang_handler_s; /* see below */
struct encodedlang_handler_s; /* see below */
-#ifndef UTF8CHAR_DEFINED
-#define UTF8CHAR_DEFINED
-typedef unsigned char utf8char; /*!< 8-bit chars of UTF-8 strings */
-#endif
-
#ifndef UNICHAR_DEFINED
#define UNICHAR_DEFINED
typedef int unichar; /*!< 31-bit unicode values, negative ones are invalid */
#endif
+typedef unsigned char utf8char; /*!< 8-bit chars of UTF-8 strings */
#define UNICHAR_EOD ((unichar)(-2)) /*!< End of source buffer reached, no data to convert */
#define UNICHAR_NO_DATA ((unichar)(-3)) /*!< Source buffer is too short, but nonempty (contains part of a char) */
#define UNICHAR_NO_ROOM ((unichar)(-4)) /*!< Target buffer is too short */
diff --git a/libsrc/langfunc/langfunc_templ.c b/libsrc/langfunc/langfunc_templ.c
index 05be81d..141d39b 100644
--- a/libsrc/langfunc/langfunc_templ.c
+++ b/libsrc/langfunc/langfunc_templ.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/langman.c b/libsrc/langfunc/langman.c
index a881483..95b990f 100644
--- a/libsrc/langfunc/langman.c
+++ b/libsrc/langfunc/langman.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/language__en_UK.c b/libsrc/langfunc/language__en_UK.c
index ca766cb..8ced98c 100644
--- a/libsrc/langfunc/language__en_UK.c
+++ b/libsrc/langfunc/language__en_UK.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/language__en_US.c b/libsrc/langfunc/language__en_US.c
index ca84b4e..990674e 100644
--- a/libsrc/langfunc/language__en_US.c
+++ b/libsrc/langfunc/language__en_US.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/language__ru_RU.c b/libsrc/langfunc/language__ru_RU.c
index 196d117..8c93be3 100644
--- a/libsrc/langfunc/language__ru_RU.c
+++ b/libsrc/langfunc/language__ru_RU.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/language__x_ViAny.c b/libsrc/langfunc/language__x_ViAny.c
index 63c0fca..4468736 100644
--- a/libsrc/langfunc/language__x_ViAny.c
+++ b/libsrc/langfunc/language__x_ViAny.c
@@ -1,10 +1,10 @@
/*
- * $Id: language__x_ViAny.c,v 1.1.2.2 2012/03/08 12:55:39 source Exp $
+ * $Id: language__x_ViAny.c,v 1.1.2.1 2009/08/09 00:09:06 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2008 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
diff --git a/libsrc/langfunc/language__x_ViDoc.c b/libsrc/langfunc/language__x_ViDoc.c
index b03dc3b..74a9a13 100644
--- a/libsrc/langfunc/language__x_ViDoc.c
+++ b/libsrc/langfunc/language__x_ViDoc.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/ucm.h b/libsrc/langfunc/ucm.h
index aff3e12..14853ca 100644
--- a/libsrc/langfunc/ucm.h
+++ b/libsrc/langfunc/ucm.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/ucm2enc.c b/libsrc/langfunc/ucm2enc.c
index 783dbaa..d51cda3 100644
--- a/libsrc/langfunc/ucm2enc.c
+++ b/libsrc/langfunc/ucm2enc.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/unicode3.c b/libsrc/langfunc/unicode3.c
index e6f2ddb..b9105da 100644
--- a/libsrc/langfunc/unicode3.c
+++ b/libsrc/langfunc/unicode3.c
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/unicode3_all_chars.h b/libsrc/langfunc/unicode3_all_chars.h
index 628e9b5..4ec8214 100644
--- a/libsrc/langfunc/unicode3_all_chars.h
+++ b/libsrc/langfunc/unicode3_all_chars.h
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/unicode3_basechars.h b/libsrc/langfunc/unicode3_basechars.h
index f5150fa..2639a98 100644
--- a/libsrc/langfunc/unicode3_basechars.h
+++ b/libsrc/langfunc/unicode3_basechars.h
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/unicode3_lowers.h b/libsrc/langfunc/unicode3_lowers.h
index 4fb38fc..73a46ad 100644
--- a/libsrc/langfunc/unicode3_lowers.h
+++ b/libsrc/langfunc/unicode3_lowers.h
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/unicode3_spaces.h b/libsrc/langfunc/unicode3_spaces.h
index 23dd91e..6be1ff9 100644
--- a/libsrc/langfunc/unicode3_spaces.h
+++ b/libsrc/langfunc/unicode3_spaces.h
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/unicode3_uppers.h b/libsrc/langfunc/unicode3_uppers.h
index 74ae9b4..0ace8da 100644
--- a/libsrc/langfunc/unicode3_uppers.h
+++ b/libsrc/langfunc/unicode3_uppers.h
@@ -4,7 +4,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/langfunc/unicodetab2h.sh b/libsrc/langfunc/unicodetab2h.sh
index 95e1227..8ac453a 100755
--- a/libsrc/langfunc/unicodetab2h.sh
+++ b/libsrc/langfunc/unicodetab2h.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: unicodetab2h.sh,v 1.3.2.2 2012/03/08 12:55:39 source Exp $
+# $Id: unicodetab2h.sh,v 1.3.2.1 2011/01/18 14:36:37 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
@@ -71,7 +71,7 @@ cat > $2 <<-EOF
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/libutil.h b/libsrc/libutil.h
index ce2e5ab..ba29432 100644
--- a/libsrc/libutil.h
+++ b/libsrc/libutil.h
@@ -1,12 +1,12 @@
/*
* libutil.h
*
- * $Id: libutil.h,v 1.4.2.1 2012/03/08 12:55:30 source Exp $
+ * $Id: libutil.h,v 1.4 2007/07/18 12:33:29 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/odbcsdk/Makefile.am b/libsrc/odbcsdk/Makefile.am
index af68e21..51dd68a 100644
--- a/libsrc/odbcsdk/Makefile.am
+++ b/libsrc/odbcsdk/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/odbcsdk/Makefile.in b/libsrc/odbcsdk/Makefile.in
index edf54ca..cd159cc 100644
--- a/libsrc/odbcsdk/Makefile.in
+++ b/libsrc/odbcsdk/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -148,7 +147,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -200,7 +198,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -247,6 +244,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/odbcsdk/include/iodbcext.h b/libsrc/odbcsdk/include/iodbcext.h
index ee9a484..6d4e93e 100644
--- a/libsrc/odbcsdk/include/iodbcext.h
+++ b/libsrc/odbcsdk/include/iodbcext.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -23,7 +23,7 @@
/*
* iodbcext.h
*
- * $Id: iodbcext.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: iodbcext.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* iODBC extensions and changes to the SAG specifications
* for third party drivers
diff --git a/libsrc/odbcsdk/include/iodbcinst.h b/libsrc/odbcsdk/include/iodbcinst.h
index 2d06e56..bcef411 100644
--- a/libsrc/odbcsdk/include/iodbcinst.h
+++ b/libsrc/odbcsdk/include/iodbcinst.h
@@ -1,14 +1,14 @@
/*
* iodbcinst.h
*
- * $Id: iodbcinst.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: iodbcinst.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* iODBC Installer defines
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2005 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/iodbcunix.h b/libsrc/odbcsdk/include/iodbcunix.h
index 8add6c9..957007d 100644
--- a/libsrc/odbcsdk/include/iodbcunix.h
+++ b/libsrc/odbcsdk/include/iodbcunix.h
@@ -1,14 +1,14 @@
/*
* iodbcunix.h
*
- * $Id: iodbcunix.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: iodbcunix.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* ODBC defines for Unix
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2004 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/isql.h b/libsrc/odbcsdk/include/isql.h
index 9423708..0d3ee39 100644
--- a/libsrc/odbcsdk/include/isql.h
+++ b/libsrc/odbcsdk/include/isql.h
@@ -1,14 +1,14 @@
/*
* isql.h
*
- * $Id: isql.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: isql.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* iODBC defines
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/isqlext.h b/libsrc/odbcsdk/include/isqlext.h
index 0f758ac..2249dbc 100644
--- a/libsrc/odbcsdk/include/isqlext.h
+++ b/libsrc/odbcsdk/include/isqlext.h
@@ -1,14 +1,14 @@
/*
* isqlext.h
*
- * $Id: isqlext.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: isqlext.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* iODBC defines (ext)
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/isqltypes.h b/libsrc/odbcsdk/include/isqltypes.h
index c0e1b5e..4858ee0 100644
--- a/libsrc/odbcsdk/include/isqltypes.h
+++ b/libsrc/odbcsdk/include/isqltypes.h
@@ -1,14 +1,14 @@
/*
* isqltypes.h
*
- * $Id: isqltypes.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: isqltypes.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* iODBC typedefs
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/odbcinst.h b/libsrc/odbcsdk/include/odbcinst.h
index 13adf23..4bae7bc 100644
--- a/libsrc/odbcsdk/include/odbcinst.h
+++ b/libsrc/odbcsdk/include/odbcinst.h
@@ -1,13 +1,13 @@
/*
* odbcinst.h
*
- * $Id: odbcinst.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: odbcinst.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* iODBC Installer defines
*
* The iODBC driver manager.
*
- * Copyright (C) 1999-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1999-2005 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/sql.h b/libsrc/odbcsdk/include/sql.h
index 63cccf0..7900013 100644
--- a/libsrc/odbcsdk/include/sql.h
+++ b/libsrc/odbcsdk/include/sql.h
@@ -1,14 +1,14 @@
/*
* sql.h
*
- * $Id: sql.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: sql.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* ODBC defines
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/sqlext.h b/libsrc/odbcsdk/include/sqlext.h
index 99e7114..658f969 100644
--- a/libsrc/odbcsdk/include/sqlext.h
+++ b/libsrc/odbcsdk/include/sqlext.h
@@ -1,14 +1,14 @@
/*
* sqlext.h
*
- * $Id: sqlext.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: sqlext.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* ODBC defines (ext)
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2002 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/sqltypes.h b/libsrc/odbcsdk/include/sqltypes.h
index 192d212..5c50630 100644
--- a/libsrc/odbcsdk/include/sqltypes.h
+++ b/libsrc/odbcsdk/include/sqltypes.h
@@ -1,14 +1,14 @@
/*
* sqltypes.h
*
- * $Id: sqltypes.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: sqltypes.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* ODBC typedefs
*
* The iODBC driver manager.
*
* Copyright (C) 1995 by Ke Jin <kejin at empress.com>
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2003 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/odbcsdk/include/sqlucode.h b/libsrc/odbcsdk/include/sqlucode.h
index c722140..50179ab 100644
--- a/libsrc/odbcsdk/include/sqlucode.h
+++ b/libsrc/odbcsdk/include/sqlucode.h
@@ -1,13 +1,13 @@
/*
* sqlucode.h
*
- * $Id: sqlucode.h,v 1.1.1.1.2.1 2012/03/08 13:13:48 source Exp $
+ * $Id: sqlucode.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* ODBC Unicode defines
*
* The iODBC driver manager.
*
- * Copyright (C) 1996-2012 OpenLink Software <iodbc at openlinksw.com>
+ * Copyright (C) 1996-2003 by OpenLink Software <iodbc at openlinksw.com>
* All Rights Reserved.
*
* This software is released under the terms of either of the following
diff --git a/libsrc/plugin/Makefile.am b/libsrc/plugin/Makefile.am
index 39a431b..839623b 100644
--- a/libsrc/plugin/Makefile.am
+++ b/libsrc/plugin/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/Makefile.in b/libsrc/plugin/Makefile.in
index 6a2f5f2..9390652 100644
--- a/libsrc/plugin/Makefile.in
+++ b/libsrc/plugin/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -144,7 +144,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -193,7 +192,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -245,7 +243,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -292,6 +289,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libsrc/plugin/dlf.c b/libsrc/plugin/dlf.c
index 7528dd2..03bb575 100644
--- a/libsrc/plugin/dlf.c
+++ b/libsrc/plugin/dlf.c
@@ -1,14 +1,14 @@
/*
* dlf.c
*
- * $Id: dlf.c,v 1.4.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: dlf.c,v 1.4 2009/04/09 17:53:08 source Exp $
*
* dynamic load functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/dlf.h b/libsrc/plugin/dlf.h
index 019113d..21c5337 100644
--- a/libsrc/plugin/dlf.h
+++ b/libsrc/plugin/dlf.h
@@ -1,14 +1,14 @@
/*
* dlf.h
*
- * $Id: dlf.h,v 1.4.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: dlf.h,v 1.4 2008/09/16 14:52:23 source Exp $
*
* dynamic load functions
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/exe_export.h b/libsrc/plugin/exe_export.h
index 431e0df..a84c727 100644
--- a/libsrc/plugin/exe_export.h
+++ b/libsrc/plugin/exe_export.h
@@ -1,12 +1,12 @@
/*
* exe_export.h
*
- * $Id: exe_export.h,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: exe_export.h,v 1.2 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/export_gate_virtuoso.c b/libsrc/plugin/export_gate_virtuoso.c
index 4a7fea0..b4913eb 100644
--- a/libsrc/plugin/export_gate_virtuoso.c
+++ b/libsrc/plugin/export_gate_virtuoso.c
@@ -140,11 +140,9 @@ _gate_export_item_t _gate_export_data[] = {
{ &box_dv_uname_nchars, "box_dv_uname_nchars" },
{ &box_dv_uname_string, "box_dv_uname_string" },
{ &box_dv_uname_substr, "box_dv_uname_substr" },
- { &box_dv_wide_nchars, "box_dv_wide_nchars" },
{ &box_equal, "box_equal" },
{ &box_find_mt_unsafe_subtree, "box_find_mt_unsafe_subtree" },
{ &box_float, "box_float" },
- { &box_iri_id, "box_iri_id" },
{ &box_make_tree_mt_safe, "box_make_tree_mt_safe" },
{ &box_num, "box_num" },
{ &box_num_nonull, "box_num_nonull" },
@@ -238,7 +236,6 @@ _gate_export_item_t _gate_export_data[] = {
{ &eh_wide_from_narrow, "eh_wide_from_narrow" },
{ &elh_get_handler, "elh_get_handler" },
{ &elh_load_handler, "elh_load_handler" },
- { &file_path_assert, "file_path_assert" },
{ &id_hash_add_new, "id_hash_add_new" },
{ &id_hash_allocate, "id_hash_allocate" },
{ &id_hash_get, "id_hash_get" },
@@ -257,7 +254,6 @@ _gate_export_item_t _gate_export_data[] = {
{ &mutex_enter, "mutex_enter" },
{ &mutex_free, "mutex_free" },
{ &mutex_leave, "mutex_leave" },
- { &qr_exec, "qr_exec" },
{ ®istry_get, "registry_get" },
{ ®istry_get_all, "registry_get_all" },
{ &revlist_to_array, "revlist_to_array" },
@@ -294,7 +290,6 @@ _gate_export_item_t _gate_export_data[] = {
{ &strses_free, "strses_free" },
{ &strses_length, "strses_length" },
{ &strses_string, "strses_string" },
- { &strses_wide_string, "strses_wide_string" },
{ &strses_write_out, "strses_write_out" },
{ &tcpses_get_fd, "tcpses_get_fd" },
{ &tcpses_get_last_r_errno, "tcpses_get_last_r_errno" },
diff --git a/libsrc/plugin/gate_virtuoso.h b/libsrc/plugin/gate_virtuoso.h
index 6aec113..5affa44 100644
--- a/libsrc/plugin/gate_virtuoso.h
+++ b/libsrc/plugin/gate_virtuoso.h
@@ -1,12 +1,12 @@
/*
* gate_virtuoso.h
*
- * $Id: gate_virtuoso.h,v 1.3.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: gate_virtuoso.h,v 1.3 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/gate_virtuoso_stubs.c b/libsrc/plugin/gate_virtuoso_stubs.c
index a6ba323..6ee7392 100644
--- a/libsrc/plugin/gate_virtuoso_stubs.c
+++ b/libsrc/plugin/gate_virtuoso_stubs.c
@@ -1,12 +1,12 @@
/*
* gate_virtuoso_stubs.c
*
- * $Id: gate_virtuoso_stubs.c,v 1.3.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: gate_virtuoso_stubs.c,v 1.3 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/gate_virtuoso_stubs.h b/libsrc/plugin/gate_virtuoso_stubs.h
index cf1cf09..c8981f9 100644
--- a/libsrc/plugin/gate_virtuoso_stubs.h
+++ b/libsrc/plugin/gate_virtuoso_stubs.h
@@ -1,12 +1,12 @@
/*
* gate_virtuoso_stubs.h
*
- * $Id: gate_virtuoso_stubs.h,v 1.3.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: gate_virtuoso_stubs.h,v 1.3 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/gen_all_gates.sh b/libsrc/plugin/gen_all_gates.sh
index 86f6a8c..46aef12 100755
--- a/libsrc/plugin/gen_all_gates.sh
+++ b/libsrc/plugin/gen_all_gates.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: gen_all_gates.sh,v 1.5.2.1 2012/03/08 12:55:39 source Exp $
+# $Id: gen_all_gates.sh,v 1.5 2009/04/14 12:16:50 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/libsrc/plugin/gen_gate.sh b/libsrc/plugin/gen_gate.sh
index f31531f..de233c8 100755
--- a/libsrc/plugin/gen_gate.sh
+++ b/libsrc/plugin/gen_gate.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: gen_gate.sh,v 1.6.2.2 2012/03/08 12:55:39 source Exp $
+# $Id: gen_gate.sh,v 1.6.2.1 2010/02/03 19:14:35 source Exp $
#
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2009 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
diff --git a/libsrc/plugin/hosting_sample.c b/libsrc/plugin/hosting_sample.c
index fab13e3..76ca80f 100644
--- a/libsrc/plugin/hosting_sample.c
+++ b/libsrc/plugin/hosting_sample.c
@@ -1,10 +1,10 @@
/*
- * $Id: hosting_sample.c,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: hosting_sample.c,v 1.2 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/import_gate_virtuoso.c b/libsrc/plugin/import_gate_virtuoso.c
index 549de0e..d884f2b 100644
--- a/libsrc/plugin/import_gate_virtuoso.c
+++ b/libsrc/plugin/import_gate_virtuoso.c
@@ -60,11 +60,9 @@ struct _gate_s _gate = {
{ NULL, "box_dv_uname_nchars" },
{ NULL, "box_dv_uname_string" },
{ NULL, "box_dv_uname_substr" },
- { NULL, "box_dv_wide_nchars" },
{ NULL, "box_equal" },
{ NULL, "box_find_mt_unsafe_subtree" },
{ NULL, "box_float" },
- { NULL, "box_iri_id" },
{ NULL, "box_make_tree_mt_safe" },
{ NULL, "box_num" },
{ NULL, "box_num_nonull" },
@@ -158,7 +156,6 @@ struct _gate_s _gate = {
{ NULL, "eh_wide_from_narrow" },
{ NULL, "elh_get_handler" },
{ NULL, "elh_load_handler" },
- { NULL, "file_path_assert" },
{ NULL, "id_hash_add_new" },
{ NULL, "id_hash_allocate" },
{ NULL, "id_hash_get" },
@@ -177,7 +174,6 @@ struct _gate_s _gate = {
{ NULL, "mutex_enter" },
{ NULL, "mutex_free" },
{ NULL, "mutex_leave" },
- { NULL, "qr_exec" },
{ NULL, "registry_get" },
{ NULL, "registry_get_all" },
{ NULL, "revlist_to_array" },
@@ -214,7 +210,6 @@ struct _gate_s _gate = {
{ NULL, "strses_free" },
{ NULL, "strses_length" },
{ NULL, "strses_string" },
- { NULL, "strses_wide_string" },
{ NULL, "strses_write_out" },
{ NULL, "tcpses_get_fd" },
{ NULL, "tcpses_get_last_r_errno" },
diff --git a/libsrc/plugin/import_gate_virtuoso.h b/libsrc/plugin/import_gate_virtuoso.h
index 73397be..931beed 100644
--- a/libsrc/plugin/import_gate_virtuoso.h
+++ b/libsrc/plugin/import_gate_virtuoso.h
@@ -112,11 +112,9 @@ struct _gate_s {
struct { typeof__box_dv_uname_nchars *_ptr; const char *_name; } _box_dv_uname_nchars;
struct { typeof__box_dv_uname_string *_ptr; const char *_name; } _box_dv_uname_string;
struct { typeof__box_dv_uname_substr *_ptr; const char *_name; } _box_dv_uname_substr;
- struct { typeof__box_dv_wide_nchars *_ptr; const char *_name; } _box_dv_wide_nchars;
struct { typeof__box_equal *_ptr; const char *_name; } _box_equal;
struct { typeof__box_find_mt_unsafe_subtree *_ptr; const char *_name; } _box_find_mt_unsafe_subtree;
struct { typeof__box_float *_ptr; const char *_name; } _box_float;
- struct { typeof__box_iri_id *_ptr; const char *_name; } _box_iri_id;
struct { typeof__box_make_tree_mt_safe *_ptr; const char *_name; } _box_make_tree_mt_safe;
struct { typeof__box_num *_ptr; const char *_name; } _box_num;
struct { typeof__box_num_nonull *_ptr; const char *_name; } _box_num_nonull;
@@ -210,7 +208,6 @@ struct _gate_s {
struct { typeof__eh_wide_from_narrow *_ptr; const char *_name; } _eh_wide_from_narrow;
struct { typeof__elh_get_handler *_ptr; const char *_name; } _elh_get_handler;
struct { typeof__elh_load_handler *_ptr; const char *_name; } _elh_load_handler;
- struct { typeof__file_path_assert *_ptr; const char *_name; } _file_path_assert;
struct { typeof__id_hash_add_new *_ptr; const char *_name; } _id_hash_add_new;
struct { typeof__id_hash_allocate *_ptr; const char *_name; } _id_hash_allocate;
struct { typeof__id_hash_get *_ptr; const char *_name; } _id_hash_get;
@@ -229,7 +226,6 @@ struct _gate_s {
struct { typeof__mutex_enter *_ptr; const char *_name; } _mutex_enter;
struct { typeof__mutex_free *_ptr; const char *_name; } _mutex_free;
struct { typeof__mutex_leave *_ptr; const char *_name; } _mutex_leave;
- struct { typeof__qr_exec *_ptr; const char *_name; } _qr_exec;
struct { typeof__registry_get *_ptr; const char *_name; } _registry_get;
struct { typeof__registry_get_all *_ptr; const char *_name; } _registry_get_all;
struct { typeof__revlist_to_array *_ptr; const char *_name; } _revlist_to_array;
@@ -266,7 +262,6 @@ struct _gate_s {
struct { typeof__strses_free *_ptr; const char *_name; } _strses_free;
struct { typeof__strses_length *_ptr; const char *_name; } _strses_length;
struct { typeof__strses_string *_ptr; const char *_name; } _strses_string;
- struct { typeof__strses_wide_string *_ptr; const char *_name; } _strses_wide_string;
struct { typeof__strses_write_out *_ptr; const char *_name; } _strses_write_out;
struct { typeof__tcpses_get_fd *_ptr; const char *_name; } _tcpses_get_fd;
struct { typeof__tcpses_get_last_r_errno *_ptr; const char *_name; } _tcpses_get_last_r_errno;
@@ -353,11 +348,9 @@ extern struct _gate_s _gate;
#define box_dv_uname_nchars (_gate._box_dv_uname_nchars._ptr)
#define box_dv_uname_string (_gate._box_dv_uname_string._ptr)
#define box_dv_uname_substr (_gate._box_dv_uname_substr._ptr)
-#define box_dv_wide_nchars (_gate._box_dv_wide_nchars._ptr)
#define box_equal (_gate._box_equal._ptr)
#define box_find_mt_unsafe_subtree (_gate._box_find_mt_unsafe_subtree._ptr)
#define box_float (_gate._box_float._ptr)
-#define box_iri_id (_gate._box_iri_id._ptr)
#define box_make_tree_mt_safe (_gate._box_make_tree_mt_safe._ptr)
#define box_num (_gate._box_num._ptr)
#define box_num_nonull (_gate._box_num_nonull._ptr)
@@ -451,7 +444,6 @@ extern struct _gate_s _gate;
#define eh_wide_from_narrow (_gate._eh_wide_from_narrow._ptr)
#define elh_get_handler (_gate._elh_get_handler._ptr)
#define elh_load_handler (_gate._elh_load_handler._ptr)
-#define file_path_assert (_gate._file_path_assert._ptr)
#define id_hash_add_new (_gate._id_hash_add_new._ptr)
#define id_hash_allocate (_gate._id_hash_allocate._ptr)
#define id_hash_get (_gate._id_hash_get._ptr)
@@ -470,7 +462,6 @@ extern struct _gate_s _gate;
#define mutex_enter (_gate._mutex_enter._ptr)
#define mutex_free (_gate._mutex_free._ptr)
#define mutex_leave (_gate._mutex_leave._ptr)
-#define qr_exec (_gate._qr_exec._ptr)
#define registry_get (_gate._registry_get._ptr)
#define registry_get_all (_gate._registry_get_all._ptr)
#define revlist_to_array (_gate._revlist_to_array._ptr)
@@ -507,7 +498,6 @@ extern struct _gate_s _gate;
#define strses_free (_gate._strses_free._ptr)
#define strses_length (_gate._strses_length._ptr)
#define strses_string (_gate._strses_string._ptr)
-#define strses_wide_string (_gate._strses_wide_string._ptr)
#define strses_write_out (_gate._strses_write_out._ptr)
#define tcpses_get_fd (_gate._tcpses_get_fd._ptr)
#define tcpses_get_last_r_errno (_gate._tcpses_get_last_r_errno._ptr)
diff --git a/libsrc/plugin/msdtc_plugin.c b/libsrc/plugin/msdtc_plugin.c
index 3ab4618..55da0ea 100644
--- a/libsrc/plugin/msdtc_plugin.c
+++ b/libsrc/plugin/msdtc_plugin.c
@@ -1,10 +1,10 @@
/*
- * $Id: msdtc_plugin.c,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: msdtc_plugin.c,v 1.2 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/plugin.c b/libsrc/plugin/plugin.c
index af880b0..1fc1f0e 100644
--- a/libsrc/plugin/plugin.c
+++ b/libsrc/plugin/plugin.c
@@ -1,12 +1,12 @@
/*
* plugin.c
*
- * $Id: plugin.c,v 1.3.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: plugin.c,v 1.3 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/plugin.h b/libsrc/plugin/plugin.h
index c984194..d4b261a 100644
--- a/libsrc/plugin/plugin.h
+++ b/libsrc/plugin/plugin.h
@@ -1,12 +1,12 @@
/*
* plugin.h
*
- * $Id: plugin.h,v 1.4.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: plugin.h,v 1.4 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/plugin_lang25.h b/libsrc/plugin/plugin_lang25.h
index 4455b02..f72954c 100644
--- a/libsrc/plugin/plugin_lang25.h
+++ b/libsrc/plugin/plugin_lang25.h
@@ -1,12 +1,12 @@
/*
* plugin_lang25.h
*
- * $Id: plugin_lang25.h,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: plugin_lang25.h,v 1.2 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/plugin_msdtc.h b/libsrc/plugin/plugin_msdtc.h
index 1f72e3d..cbc9fbe 100644
--- a/libsrc/plugin/plugin_msdtc.h
+++ b/libsrc/plugin/plugin_msdtc.h
@@ -1,12 +1,12 @@
/*
* msdtc_plugin.h
*
- * $Id: plugin_msdtc.h,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: plugin_msdtc.h,v 1.2 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/plugin_sample.c b/libsrc/plugin/plugin_sample.c
index c1dbf70..e28cd43 100644
--- a/libsrc/plugin/plugin_sample.c
+++ b/libsrc/plugin/plugin_sample.c
@@ -1,10 +1,10 @@
/*
- * $Id: plugin_sample.c,v 1.3.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: plugin_sample.c,v 1.3 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/plugin_unix.c b/libsrc/plugin/plugin_unix.c
index 9f236e5..8c23cc0 100644
--- a/libsrc/plugin/plugin_unix.c
+++ b/libsrc/plugin/plugin_unix.c
@@ -1,12 +1,12 @@
/*
* plugin_unix.c
*
- * $Id: plugin_unix.c,v 1.7.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: plugin_unix.c,v 1.7 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/plugin/plugin_win32.c b/libsrc/plugin/plugin_win32.c
index 1b8230c..fc353fe 100644
--- a/libsrc/plugin/plugin_win32.c
+++ b/libsrc/plugin/plugin_win32.c
@@ -1,12 +1,12 @@
/*
* plugin_win32.c
*
- * $Id: plugin_win32.c,v 1.3.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: plugin_win32.c,v 1.3 2009/04/09 17:53:08 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/Makefile.am b/libsrc/util/Makefile.am
index 0b93a5a..9525c04 100644
--- a/libsrc/util/Makefile.am
+++ b/libsrc/util/Makefile.am
@@ -2,7 +2,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -24,7 +24,7 @@ noinst_LTLIBRARIES = libutil.la
noinst_HEADERS = \
dbgmal.h dyntab.h fnmatch.h getdate.h getopt.h itypes.h listmac.h \
logmsg.h md5.h mpl.h ncfg.h oplthr.h regexp.h regmagic.h setext.h \
- startup.h strfuns.h utalloc.h utf8funs.h uuid.h uuidP.h sslengine.h
+ startup.h strfuns.h utalloc.h utf8funs.h uuid.h uuidP.h
libutil_la_CFLAGS = @VIRT_AM_CFLAGS@
libutil_la_CFLAGS += -D_GNU_SOURCE -DIN_LIBUTIL -DGLOBALREF=extern
@@ -64,7 +64,6 @@ libutil_la_SOURCES = \
regsub.c \
rtrim.c \
setext.c \
- sslengine.c \
startup.c \
stpcpy.c \
strcpyin.c \
@@ -82,7 +81,6 @@ libutil_la_SOURCES = \
usage.c \
uuid.c \
wcslen.c \
- virt_mbrlen.c \
virt_mbrtowc.c \
virt_mbsnrtowcs.c \
virt_wcrtomb.c \
diff --git a/libsrc/util/Makefile.in b/libsrc/util/Makefile.in
index f8376b0..eb93fd1 100644
--- a/libsrc/util/Makefile.in
+++ b/libsrc/util/Makefile.in
@@ -19,7 +19,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
-# Copyright (C) 1998-2012 OpenLink Software
+# Copyright (C) 1998-2006 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
@@ -87,16 +87,15 @@ am_libutil_la_OBJECTS = libutil_la-buildarg.lo libutil_la-cfg2.lo \
libutil_la-ltrim.lo libutil_la-make_env.lo libutil_la-mpl.lo \
libutil_la-ncfg.lo libutil_la-ntapp.lo libutil_la-regerror.lo \
libutil_la-regexp.lo libutil_la-regsub.lo libutil_la-rtrim.lo \
- libutil_la-setext.lo libutil_la-sslengine.lo \
- libutil_la-startup.lo libutil_la-stpcpy.lo \
- libutil_la-strcpyin.lo libutil_la-strerror.lo \
- libutil_la-stricmp.lo libutil_la-strindex.lo \
- libutil_la-strinsrt.lo libutil_la-strlwr.lo \
- libutil_la-strnicmp.lo libutil_la-strquote.lo \
- libutil_la-strtok_r.lo libutil_la-strupr.lo \
- libutil_la-strxpect.lo libutil_la-terminat.lo \
- libutil_la-usage.lo libutil_la-uuid.lo libutil_la-wcslen.lo \
- libutil_la-virt_mbrlen.lo libutil_la-virt_mbrtowc.lo \
+ libutil_la-setext.lo libutil_la-startup.lo \
+ libutil_la-stpcpy.lo libutil_la-strcpyin.lo \
+ libutil_la-strerror.lo libutil_la-stricmp.lo \
+ libutil_la-strindex.lo libutil_la-strinsrt.lo \
+ libutil_la-strlwr.lo libutil_la-strnicmp.lo \
+ libutil_la-strquote.lo libutil_la-strtok_r.lo \
+ libutil_la-strupr.lo libutil_la-strxpect.lo \
+ libutil_la-terminat.lo libutil_la-usage.lo libutil_la-uuid.lo \
+ libutil_la-wcslen.lo libutil_la-virt_mbrtowc.lo \
libutil_la-virt_mbsnrtowcs.lo libutil_la-virt_wcrtomb.lo \
libutil_la-virt_wcs_mask.lo libutil_la-virt_wcsnrtombs.lo \
libutil_la-pcre_chartables.lo libutil_la-pcre_compile.lo \
@@ -157,7 +156,6 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -206,7 +204,6 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -258,7 +255,6 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_jdk2_path = @ac_jdk2_path@
@@ -305,6 +301,7 @@ libexecdir = @libexecdir@
libxml_file = @libxml_file@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -334,7 +331,7 @@ noinst_LTLIBRARIES = libutil.la
noinst_HEADERS = \
dbgmal.h dyntab.h fnmatch.h getdate.h getopt.h itypes.h listmac.h \
logmsg.h md5.h mpl.h ncfg.h oplthr.h regexp.h regmagic.h setext.h \
- startup.h strfuns.h utalloc.h utf8funs.h uuid.h uuidP.h sslengine.h
+ startup.h strfuns.h utalloc.h utf8funs.h uuid.h uuidP.h
libutil_la_CFLAGS = @VIRT_AM_CFLAGS@ -D_GNU_SOURCE -DIN_LIBUTIL \
-DGLOBALREF=extern -I$(top_srcdir)/libsrc \
@@ -371,7 +368,6 @@ libutil_la_SOURCES = \
regsub.c \
rtrim.c \
setext.c \
- sslengine.c \
startup.c \
stpcpy.c \
strcpyin.c \
@@ -389,7 +385,6 @@ libutil_la_SOURCES = \
usage.c \
uuid.c \
wcslen.c \
- virt_mbrlen.c \
virt_mbrtowc.c \
virt_mbsnrtowcs.c \
virt_wcrtomb.c \
@@ -535,7 +530,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-regsub.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-rtrim.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-setext.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-sslengine.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-startup.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-stpcpy.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-strcpyin.Plo at am__quote@
@@ -552,7 +546,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-terminat.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-usage.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-uuid.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-virt_mbrlen.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-virt_mbrtowc.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-virt_mbsnrtowcs.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libutil_la-virt_wcrtomb.Plo at am__quote@
@@ -791,13 +784,6 @@ libutil_la-setext.lo: setext.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutil_la_CFLAGS) $(CFLAGS) -c -o libutil_la-setext.lo `test -f 'setext.c' || echo '$(srcdir)/'`setext.c
-libutil_la-sslengine.lo: sslengine.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutil_la_CFLAGS) $(CFLAGS) -MT libutil_la-sslengine.lo -MD -MP -MF $(DEPDIR)/libutil_la-sslengine.Tpo -c -o libutil_la-sslengine.lo `test -f 'sslengine.c' || echo '$(srcdir)/'`sslengine.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-sslengine.Tpo $(DEPDIR)/libutil_la-sslengine.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sslengine.c' object='libutil_la-sslengine.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutil_la_CFLAGS) $(CFLAGS) -c -o libutil_la-sslengine.lo `test -f 'sslengine.c' || echo '$(srcdir)/'`sslengine.c
-
libutil_la-startup.lo: startup.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutil_la_CFLAGS) $(CFLAGS) -MT libutil_la-startup.lo -MD -MP -MF $(DEPDIR)/libutil_la-startup.Tpo -c -o libutil_la-startup.lo `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-startup.Tpo $(DEPDIR)/libutil_la-startup.Plo
@@ -917,13 +903,6 @@ libutil_la-wcslen.lo: wcslen.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutil_la_CFLAGS) $(CFLAGS) -c -o libutil_la-wcslen.lo `test -f 'wcslen.c' || echo '$(srcdir)/'`wcslen.c
-libutil_la-virt_mbrlen.lo: virt_mbrlen.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutil_la_CFLAGS) $(CFLAGS) -MT libutil_la-virt_mbrlen.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_mbrlen.Tpo -c -o libutil_la-virt_mbrlen.lo `test -f 'virt_mbrlen.c' || echo '$(srcdir)/'`virt_mbrlen.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-virt_mbrlen.Tpo $(DEPDIR)/libutil_la-virt_mbrlen.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='virt_mbrlen.c' object='libutil_la-virt_mbrlen.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutil_la_CFLAGS) $(CFLAGS) -c -o libutil_la-virt_mbrlen.lo `test -f 'virt_mbrlen.c' || echo '$(srcdir)/'`virt_mbrlen.c
-
libutil_la-virt_mbrtowc.lo: virt_mbrtowc.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutil_la_CFLAGS) $(CFLAGS) -MT libutil_la-virt_mbrtowc.lo -MD -MP -MF $(DEPDIR)/libutil_la-virt_mbrtowc.Tpo -c -o libutil_la-virt_mbrtowc.lo `test -f 'virt_mbrtowc.c' || echo '$(srcdir)/'`virt_mbrtowc.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libutil_la-virt_mbrtowc.Tpo $(DEPDIR)/libutil_la-virt_mbrtowc.Plo
diff --git a/libsrc/util/buildarg.c b/libsrc/util/buildarg.c
index 5f68f68..f4e976c 100644
--- a/libsrc/util/buildarg.c
+++ b/libsrc/util/buildarg.c
@@ -1,14 +1,14 @@
/*
* buildarg.c
*
- * $Id: buildarg.c,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: buildarg.c,v 1.2 2006/04/18 19:49:56 source Exp $
*
* Parse a string into argv[], argc
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/cfg2.c b/libsrc/util/cfg2.c
index 0a171b2..eb448d9 100644
--- a/libsrc/util/cfg2.c
+++ b/libsrc/util/cfg2.c
@@ -1,14 +1,14 @@
/*
* cfg2.c
*
- * $Id: cfg2.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: cfg2.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Configuration Management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/cslentry.c b/libsrc/util/cslentry.c
index b44c369..156907d 100644
--- a/libsrc/util/cslentry.c
+++ b/libsrc/util/cslentry.c
@@ -1,14 +1,14 @@
/*
* cslentry.c
*
- * $Id: cslentry.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: cslentry.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Return an entry from a comma seperated list
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/csllkup.c b/libsrc/util/csllkup.c
index ef7e150..c8cdf5c 100644
--- a/libsrc/util/csllkup.c
+++ b/libsrc/util/csllkup.c
@@ -1,14 +1,14 @@
/*
* csllkup.c
*
- * $Id: csllkup.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: csllkup.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Find an entry in a comma separated list
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/cslnment.c b/libsrc/util/cslnment.c
index 6a6caf6..7b7dd49 100644
--- a/libsrc/util/cslnment.c
+++ b/libsrc/util/cslnment.c
@@ -1,14 +1,14 @@
/*
* cslnment.c
*
- * $Id: cslnment.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: cslnment.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Return # entries in comma seperated list
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/dbgmal.c b/libsrc/util/dbgmal.c
index 9d774f3..0f74893 100644
--- a/libsrc/util/dbgmal.c
+++ b/libsrc/util/dbgmal.c
@@ -1,14 +1,14 @@
/*
* dbgmal.c
*
- * $Id: dbgmal.c,v 1.4.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: dbgmal.c,v 1.4 2008/11/25 12:35:44 source Exp $
*
* Debugging malloc package
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/dbgmal.h b/libsrc/util/dbgmal.h
index 340dbe9..460c0f7 100644
--- a/libsrc/util/dbgmal.h
+++ b/libsrc/util/dbgmal.h
@@ -1,14 +1,14 @@
/*
* dbgmal.h
*
- * $Id: dbgmal.h,v 1.4.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: dbgmal.h,v 1.4 2008/11/25 12:35:44 source Exp $
*
* Debugging malloc package
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/debug.c b/libsrc/util/debug.c
index 23f1d01..36b72b9 100644
--- a/libsrc/util/debug.c
+++ b/libsrc/util/debug.c
@@ -1,14 +1,14 @@
/*
* debug.c
*
- * $Id: debug.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: debug.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Code for debugging
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/dyntab.c b/libsrc/util/dyntab.c
index 011b0e1..102a32d 100644
--- a/libsrc/util/dyntab.c
+++ b/libsrc/util/dyntab.c
@@ -1,14 +1,14 @@
/*
* dyntab.c
*
- * $Id: dyntab.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: dyntab.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Dynamic Tables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/dyntab.h b/libsrc/util/dyntab.h
index f1a15f9..fbde14e 100644
--- a/libsrc/util/dyntab.h
+++ b/libsrc/util/dyntab.h
@@ -1,14 +1,14 @@
/*
* dyntab.h
*
- * $Id: dyntab.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: dyntab.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Dynamic Tables
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/expandav.c b/libsrc/util/expandav.c
index 85dcaac..8adfc5c 100644
--- a/libsrc/util/expandav.c
+++ b/libsrc/util/expandav.c
@@ -1,14 +1,14 @@
/*
* expandav.c
*
- * $Id: expandav.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: expandav.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Commandline expansion
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/fnqual.c b/libsrc/util/fnqual.c
index 14c33b5..7f37f4d 100644
--- a/libsrc/util/fnqual.c
+++ b/libsrc/util/fnqual.c
@@ -1,14 +1,14 @@
/*
* fnqual.c
*
- * $Id: fnqual.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: fnqual.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Filename qualification
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/fnsearch.c b/libsrc/util/fnsearch.c
index aabaf82..f64b336 100644
--- a/libsrc/util/fnsearch.c
+++ b/libsrc/util/fnsearch.c
@@ -1,14 +1,14 @@
/*
* fnsearch.c
*
- * $Id: fnsearch.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: fnsearch.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Search a file in a search path
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/fntodos.c b/libsrc/util/fntodos.c
index 1babd6b..eeb2ab0 100644
--- a/libsrc/util/fntodos.c
+++ b/libsrc/util/fntodos.c
@@ -1,14 +1,14 @@
/*
* fntodos.c
*
- * $Id: fntodos.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: fntodos.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Convert unix filenames to dos filenames
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/fnundos.c b/libsrc/util/fnundos.c
index bf6128d..22d9bc9 100644
--- a/libsrc/util/fnundos.c
+++ b/libsrc/util/fnundos.c
@@ -1,14 +1,14 @@
/*
* fnundos.c
*
- * $Id: fnundos.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: fnundos.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Convert dos filenames to unix filenames
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/getdate.c b/libsrc/util/getdate.c
index 1bb359e..729fd76 100644
--- a/libsrc/util/getdate.c
+++ b/libsrc/util/getdate.c
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
+
+ This program 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, either version 3 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
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, see <http://www.gnu.org/licenses/>. */
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -46,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -54,20 +55,57 @@
/* Pure parsers. */
#define YYPURE 1
-/* Push parsers. */
-#define YYPUSH 0
-
-/* Pull parsers. */
-#define YYPULL 1
-
/* Using locations. */
#define YYLSP_NEEDED 0
-/* Copy the first part of user declarations. */
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ tAGO = 258,
+ tDAY = 259,
+ tDAY_UNIT = 260,
+ tDAYZONE = 261,
+ tDST = 262,
+ tHOUR_UNIT = 263,
+ tID = 264,
+ tMERIDIAN = 265,
+ tMINUTE_UNIT = 266,
+ tMONTH = 267,
+ tMONTH_UNIT = 268,
+ tSEC_UNIT = 269,
+ tSNUMBER = 270,
+ tUNUMBER = 271,
+ tYEAR_UNIT = 272,
+ tZONE = 273
+ };
+#endif
+/* Tokens. */
+#define tAGO 258
+#define tDAY 259
+#define tDAY_UNIT 260
+#define tDAYZONE 261
+#define tDST 262
+#define tHOUR_UNIT 263
+#define tID 264
+#define tMERIDIAN 265
+#define tMINUTE_UNIT 266
+#define tMONTH 267
+#define tMONTH_UNIT 268
+#define tSEC_UNIT 269
+#define tSNUMBER 270
+#define tUNUMBER 271
+#define tYEAR_UNIT 272
+#define tZONE 273
+
-/* Line 189 of yacc.c */
+
+
+/* Copy the first part of user declarations. */
#line 1 "../../libsrc/util/getdate.y"
/*
@@ -240,9 +278,6 @@ typedef struct _CONTEXT {
#define context ((CONTEXT *) cookie)
-/* Line 189 of yacc.c */
-#line 245 "getdate.c"
-
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
@@ -261,78 +296,28 @@ typedef struct _CONTEXT {
# define YYTOKEN_TABLE 0
#endif
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- tAGO = 258,
- tDAY = 259,
- tDAY_UNIT = 260,
- tDAYZONE = 261,
- tDST = 262,
- tHOUR_UNIT = 263,
- tID = 264,
- tMERIDIAN = 265,
- tMINUTE_UNIT = 266,
- tMONTH = 267,
- tMONTH_UNIT = 268,
- tSEC_UNIT = 269,
- tSNUMBER = 270,
- tUNUMBER = 271,
- tYEAR_UNIT = 272,
- tZONE = 273
- };
-#endif
-/* Tokens. */
-#define tAGO 258
-#define tDAY 259
-#define tDAY_UNIT 260
-#define tDAYZONE 261
-#define tDST 262
-#define tHOUR_UNIT 263
-#define tID 264
-#define tMERIDIAN 265
-#define tMINUTE_UNIT 266
-#define tMONTH 267
-#define tMONTH_UNIT 268
-#define tSEC_UNIT 269
-#define tSNUMBER 270
-#define tUNUMBER 271
-#define tYEAR_UNIT 272
-#define tZONE 273
-
-
-
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c */
#line 180 "../../libsrc/util/getdate.y"
-
+{
int Number;
enum _MERIDIAN Meridian;
-
-
-
-/* Line 214 of yacc.c */
-#line 324 "getdate.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 187 of yacc.c. */
+#line 308 "getdate.c"
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
+
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 336 "getdate.c"
+/* Line 216 of yacc.c. */
+#line 321 "getdate.c"
#ifdef short
# undef short
@@ -407,14 +392,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -495,9 +480,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss_alloc;
- YYSTYPE yyvs_alloc;
-};
+ yytype_int16 yyss;
+ YYSTYPE yyvs;
+ };
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -531,12 +516,12 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -952,20 +937,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -999,11 +981,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- YYFPRINTF (stderr, "\n");
+ fprintf (stderr, "\n");
}
}
@@ -1283,8 +1265,10 @@ yydestruct (yymsg, yytype, yyvaluep)
break;
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
+
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -1303,9 +1287,10 @@ int yyparse ();
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1329,46 +1314,22 @@ yyparse ()
#endif
#endif
{
-/* The lookahead symbol. */
+ /* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
- /* Number of syntax errors so far. */
- int yynerrs;
-
- int yystate;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-
- /* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss;
- yytype_int16 *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs;
- YYSTYPE *yyvsp;
-
- YYSIZE_T yystacksize;
+/* Number of syntax errors so far. */
+int yynerrs;
+ int yystate;
int yyn;
int yyresult;
- /* Lookahead token as an internal (translated) token number. */
- int yytoken;
- /* The variables used to return semantic value and location from the
- action routines. */
- YYSTYPE yyval;
-
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Look-ahead token as an internal (translated) token number. */
+ int yytoken = 0;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
@@ -1376,28 +1337,51 @@ YYSTYPE yylval;
YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss = yyssa;
+ yytype_int16 *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ YYSTYPE *yyvsp;
+
+
+
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ YYSIZE_T yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
+
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
- yystacksize = YYINITDEPTH;
-
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
+
yyssp = yyss;
yyvsp = yyvs;
@@ -1427,6 +1411,7 @@ YYSTYPE yylval;
YYSTYPE *yyvs1 = yyvs;
yytype_int16 *yyss1 = yyss;
+
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
@@ -1434,6 +1419,7 @@ YYSTYPE yylval;
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
+
&yystacksize);
yyss = yyss1;
@@ -1456,8 +1442,9 @@ YYSTYPE yylval;
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -1468,6 +1455,7 @@ YYSTYPE yylval;
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
+
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -1477,9 +1465,6 @@ YYSTYPE yylval;
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
- if (yystate == YYFINAL)
- YYACCEPT;
-
goto yybackup;
/*-----------.
@@ -1488,16 +1473,16 @@ YYSTYPE yylval;
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
+ look-ahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1529,16 +1514,20 @@ yybackup:
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1578,8 +1567,6 @@ yyreduce:
switch (yyn)
{
case 4:
-
-/* Line 1455 of yacc.c */
#line 200 "../../libsrc/util/getdate.y"
{
context->yyHaveTime++;
@@ -1587,8 +1574,6 @@ yyreduce:
break;
case 5:
-
-/* Line 1455 of yacc.c */
#line 203 "../../libsrc/util/getdate.y"
{
context->yyHaveZone++;
@@ -1596,8 +1581,6 @@ yyreduce:
break;
case 6:
-
-/* Line 1455 of yacc.c */
#line 206 "../../libsrc/util/getdate.y"
{
context->yyHaveDate++;
@@ -1605,8 +1588,6 @@ yyreduce:
break;
case 7:
-
-/* Line 1455 of yacc.c */
#line 209 "../../libsrc/util/getdate.y"
{
context->yyHaveDay++;
@@ -1614,8 +1595,6 @@ yyreduce:
break;
case 8:
-
-/* Line 1455 of yacc.c */
#line 212 "../../libsrc/util/getdate.y"
{
context->yyHaveRel++;
@@ -1623,8 +1602,6 @@ yyreduce:
break;
case 10:
-
-/* Line 1455 of yacc.c */
#line 218 "../../libsrc/util/getdate.y"
{
context->yyHour = (yyvsp[(1) - (2)].Number);
@@ -1635,8 +1612,6 @@ yyreduce:
break;
case 11:
-
-/* Line 1455 of yacc.c */
#line 224 "../../libsrc/util/getdate.y"
{
context->yyHour = (yyvsp[(1) - (4)].Number);
@@ -1647,8 +1622,6 @@ yyreduce:
break;
case 12:
-
-/* Line 1455 of yacc.c */
#line 230 "../../libsrc/util/getdate.y"
{
context->yyHour = (yyvsp[(1) - (4)].Number);
@@ -1662,8 +1635,6 @@ yyreduce:
break;
case 13:
-
-/* Line 1455 of yacc.c */
#line 239 "../../libsrc/util/getdate.y"
{
context->yyHour = (yyvsp[(1) - (6)].Number);
@@ -1674,8 +1645,6 @@ yyreduce:
break;
case 14:
-
-/* Line 1455 of yacc.c */
#line 245 "../../libsrc/util/getdate.y"
{
context->yyHour = (yyvsp[(1) - (6)].Number);
@@ -1690,8 +1659,6 @@ yyreduce:
break;
case 15:
-
-/* Line 1455 of yacc.c */
#line 257 "../../libsrc/util/getdate.y"
{
context->yyTimezone = (yyvsp[(1) - (1)].Number);
@@ -1699,8 +1666,6 @@ yyreduce:
break;
case 16:
-
-/* Line 1455 of yacc.c */
#line 260 "../../libsrc/util/getdate.y"
{
context->yyTimezone = (yyvsp[(1) - (1)].Number) - 60;
@@ -1708,8 +1673,6 @@ yyreduce:
break;
case 17:
-
-/* Line 1455 of yacc.c */
#line 264 "../../libsrc/util/getdate.y"
{
context->yyTimezone = (yyvsp[(1) - (2)].Number) - 60;
@@ -1717,8 +1680,6 @@ yyreduce:
break;
case 18:
-
-/* Line 1455 of yacc.c */
#line 269 "../../libsrc/util/getdate.y"
{
context->yyDayOrdinal = 1;
@@ -1727,8 +1688,6 @@ yyreduce:
break;
case 19:
-
-/* Line 1455 of yacc.c */
#line 273 "../../libsrc/util/getdate.y"
{
context->yyDayOrdinal = 1;
@@ -1737,8 +1696,6 @@ yyreduce:
break;
case 20:
-
-/* Line 1455 of yacc.c */
#line 277 "../../libsrc/util/getdate.y"
{
context->yyDayOrdinal = (yyvsp[(1) - (2)].Number);
@@ -1747,8 +1704,6 @@ yyreduce:
break;
case 21:
-
-/* Line 1455 of yacc.c */
#line 283 "../../libsrc/util/getdate.y"
{
context->yyMonth = (yyvsp[(1) - (3)].Number);
@@ -1757,8 +1712,6 @@ yyreduce:
break;
case 22:
-
-/* Line 1455 of yacc.c */
#line 287 "../../libsrc/util/getdate.y"
{
/* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
@@ -1781,8 +1734,6 @@ yyreduce:
break;
case 23:
-
-/* Line 1455 of yacc.c */
#line 305 "../../libsrc/util/getdate.y"
{
/* ISO 8601 format. yyyy-mm-dd. */
@@ -1793,8 +1744,6 @@ yyreduce:
break;
case 24:
-
-/* Line 1455 of yacc.c */
#line 311 "../../libsrc/util/getdate.y"
{
/* e.g. 17-JUN-1992. */
@@ -1805,8 +1754,6 @@ yyreduce:
break;
case 25:
-
-/* Line 1455 of yacc.c */
#line 317 "../../libsrc/util/getdate.y"
{
context->yyMonth = (yyvsp[(1) - (2)].Number);
@@ -1815,8 +1762,6 @@ yyreduce:
break;
case 26:
-
-/* Line 1455 of yacc.c */
#line 321 "../../libsrc/util/getdate.y"
{
context->yyMonth = (yyvsp[(1) - (4)].Number);
@@ -1826,8 +1771,6 @@ yyreduce:
break;
case 27:
-
-/* Line 1455 of yacc.c */
#line 326 "../../libsrc/util/getdate.y"
{
context->yyMonth = (yyvsp[(2) - (2)].Number);
@@ -1836,8 +1779,6 @@ yyreduce:
break;
case 28:
-
-/* Line 1455 of yacc.c */
#line 330 "../../libsrc/util/getdate.y"
{
context->yyMonth = (yyvsp[(2) - (3)].Number);
@@ -1847,8 +1788,6 @@ yyreduce:
break;
case 29:
-
-/* Line 1455 of yacc.c */
#line 337 "../../libsrc/util/getdate.y"
{
context->yyRelSeconds = -context->yyRelSeconds;
@@ -1861,8 +1800,6 @@ yyreduce:
break;
case 31:
-
-/* Line 1455 of yacc.c */
#line 348 "../../libsrc/util/getdate.y"
{
context->yyRelYear += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1870,8 +1807,6 @@ yyreduce:
break;
case 32:
-
-/* Line 1455 of yacc.c */
#line 351 "../../libsrc/util/getdate.y"
{
context->yyRelYear += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1879,8 +1814,6 @@ yyreduce:
break;
case 33:
-
-/* Line 1455 of yacc.c */
#line 354 "../../libsrc/util/getdate.y"
{
context->yyRelYear += (yyvsp[(1) - (1)].Number);
@@ -1888,8 +1821,6 @@ yyreduce:
break;
case 34:
-
-/* Line 1455 of yacc.c */
#line 357 "../../libsrc/util/getdate.y"
{
context->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1897,8 +1828,6 @@ yyreduce:
break;
case 35:
-
-/* Line 1455 of yacc.c */
#line 360 "../../libsrc/util/getdate.y"
{
context->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1906,8 +1835,6 @@ yyreduce:
break;
case 36:
-
-/* Line 1455 of yacc.c */
#line 363 "../../libsrc/util/getdate.y"
{
context->yyRelMonth += (yyvsp[(1) - (1)].Number);
@@ -1915,8 +1842,6 @@ yyreduce:
break;
case 37:
-
-/* Line 1455 of yacc.c */
#line 366 "../../libsrc/util/getdate.y"
{
context->yyRelDay += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1924,8 +1849,6 @@ yyreduce:
break;
case 38:
-
-/* Line 1455 of yacc.c */
#line 369 "../../libsrc/util/getdate.y"
{
context->yyRelDay += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1933,8 +1856,6 @@ yyreduce:
break;
case 39:
-
-/* Line 1455 of yacc.c */
#line 372 "../../libsrc/util/getdate.y"
{
context->yyRelDay += (yyvsp[(1) - (1)].Number);
@@ -1942,8 +1863,6 @@ yyreduce:
break;
case 40:
-
-/* Line 1455 of yacc.c */
#line 375 "../../libsrc/util/getdate.y"
{
context->yyRelHour += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1951,8 +1870,6 @@ yyreduce:
break;
case 41:
-
-/* Line 1455 of yacc.c */
#line 378 "../../libsrc/util/getdate.y"
{
context->yyRelHour += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1960,8 +1877,6 @@ yyreduce:
break;
case 42:
-
-/* Line 1455 of yacc.c */
#line 381 "../../libsrc/util/getdate.y"
{
context->yyRelHour += (yyvsp[(1) - (1)].Number);
@@ -1969,8 +1884,6 @@ yyreduce:
break;
case 43:
-
-/* Line 1455 of yacc.c */
#line 384 "../../libsrc/util/getdate.y"
{
context->yyRelMinutes += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1978,8 +1891,6 @@ yyreduce:
break;
case 44:
-
-/* Line 1455 of yacc.c */
#line 387 "../../libsrc/util/getdate.y"
{
context->yyRelMinutes += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -1987,8 +1898,6 @@ yyreduce:
break;
case 45:
-
-/* Line 1455 of yacc.c */
#line 390 "../../libsrc/util/getdate.y"
{
context->yyRelMinutes += (yyvsp[(1) - (1)].Number);
@@ -1996,8 +1905,6 @@ yyreduce:
break;
case 46:
-
-/* Line 1455 of yacc.c */
#line 393 "../../libsrc/util/getdate.y"
{
context->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -2005,8 +1912,6 @@ yyreduce:
break;
case 47:
-
-/* Line 1455 of yacc.c */
#line 396 "../../libsrc/util/getdate.y"
{
context->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
@@ -2014,8 +1919,6 @@ yyreduce:
break;
case 48:
-
-/* Line 1455 of yacc.c */
#line 399 "../../libsrc/util/getdate.y"
{
context->yyRelSeconds += (yyvsp[(1) - (1)].Number);
@@ -2023,8 +1926,6 @@ yyreduce:
break;
case 49:
-
-/* Line 1455 of yacc.c */
#line 405 "../../libsrc/util/getdate.y"
{
if (context->yyHaveTime && context->yyHaveDate &&
@@ -2060,8 +1961,6 @@ yyreduce:
break;
case 50:
-
-/* Line 1455 of yacc.c */
#line 439 "../../libsrc/util/getdate.y"
{
(yyval.Meridian) = MER24;
@@ -2069,8 +1968,6 @@ yyreduce:
break;
case 51:
-
-/* Line 1455 of yacc.c */
#line 443 "../../libsrc/util/getdate.y"
{
(yyval.Meridian) = (yyvsp[(1) - (1)].Meridian);
@@ -2078,9 +1975,8 @@ yyreduce:
break;
-
-/* Line 1455 of yacc.c */
-#line 2084 "getdate.c"
+/* Line 1267 of yacc.c. */
+#line 1980 "getdate.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2091,6 +1987,7 @@ yyreduce:
*++yyvsp = yyval;
+
/* Now `shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -2155,7 +2052,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -2172,7 +2069,7 @@ yyerrlab:
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -2229,6 +2126,9 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -2253,7 +2153,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2264,7 +2164,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
@@ -2290,8 +2190,6 @@ yyreturn:
}
-
-/* Line 1675 of yacc.c */
#line 448 "../../libsrc/util/getdate.y"
diff --git a/libsrc/util/getdate.h b/libsrc/util/getdate.h
index e954c78..c80df88 100644
--- a/libsrc/util/getdate.h
+++ b/libsrc/util/getdate.h
@@ -1,12 +1,12 @@
/*
* getdate.h
*
- * $Id: getdate.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: getdate.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/gettimeofday.c b/libsrc/util/gettimeofday.c
index 4723b1f..c047699 100644
--- a/libsrc/util/gettimeofday.c
+++ b/libsrc/util/gettimeofday.c
@@ -1,14 +1,14 @@
/*
* gettimeofday.c
*
- * $Id: gettimeofday.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: gettimeofday.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* gettimeofday emulation
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/itypes.h b/libsrc/util/itypes.h
index 1105136..89b9b42 100644
--- a/libsrc/util/itypes.h
+++ b/libsrc/util/itypes.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/listmac.h b/libsrc/util/listmac.h
index c3d9159..6685f48 100644
--- a/libsrc/util/listmac.h
+++ b/libsrc/util/listmac.h
@@ -1,14 +1,14 @@
/*
* listmac.h
*
- * $Id: listmac.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: listmac.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* List macros
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/login_digest.c b/libsrc/util/login_digest.c
index 4f58f81..298ea52 100644
--- a/libsrc/util/login_digest.c
+++ b/libsrc/util/login_digest.c
@@ -1,14 +1,14 @@
/*
* login_digest.c
*
- * $Id: login_digest.c,v 1.2.2.2 2012/03/08 12:55:39 source Exp $
+ * $Id: login_digest.c,v 1.2.2.1 2010/01/29 02:02:54 source Exp $
*
* login digest calculator
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/logmsg.c b/libsrc/util/logmsg.c
index 4ff414b..d408b5b 100644
--- a/libsrc/util/logmsg.c
+++ b/libsrc/util/logmsg.c
@@ -1,14 +1,14 @@
/*
* logmsg.c
*
- * $Id: logmsg.c,v 1.5.2.2 2012/03/08 12:55:39 source Exp $
+ * $Id: logmsg.c,v 1.5 2007/09/26 15:25:02 source Exp $
*
* Logfile routines
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -671,10 +671,7 @@ log_open_file (char *filename, int level, int mask, int style)
log = log_open_callback (file_emit, file_close, level, mask, style);
if (log == NULL)
- {
- fclose (fp);
- return NULL;
- }
+ return NULL;
log->user_data = fp;
diff --git a/libsrc/util/logmsg.h b/libsrc/util/logmsg.h
index e3f3933..2ffc6e4 100644
--- a/libsrc/util/logmsg.h
+++ b/libsrc/util/logmsg.h
@@ -1,14 +1,14 @@
/*
* logmsg.h
*
- * $Id: logmsg.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: logmsg.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Alternate logging module
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/ltrim.c b/libsrc/util/ltrim.c
index e38d5bc..35a1b56 100644
--- a/libsrc/util/ltrim.c
+++ b/libsrc/util/ltrim.c
@@ -1,7 +1,7 @@
/*
* ltrim.c
*
- * $Id: ltrim.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: ltrim.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* usage:
* char *ltrim (const char *s);
@@ -11,7 +11,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/make_env.c b/libsrc/util/make_env.c
index def6e00..e4f6e3f 100644
--- a/libsrc/util/make_env.c
+++ b/libsrc/util/make_env.c
@@ -1,14 +1,14 @@
/*
* make_env.c
*
- * $Id: make_env.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: make_env.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Add a variable to the environment
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/md5.h b/libsrc/util/md5.h
index edb2f47..1ec0f70 100644
--- a/libsrc/util/md5.h
+++ b/libsrc/util/md5.h
@@ -1,10 +1,10 @@
/*
- * $Id: md5.h,v 1.1.1.1.2.2 2012/03/08 12:55:39 source Exp $
+ * $Id: md5.h,v 1.1.1.1.2.1 2010/01/29 02:02:54 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2010 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
diff --git a/libsrc/util/mpl.c b/libsrc/util/mpl.c
index ae39306..f6d617f 100644
--- a/libsrc/util/mpl.c
+++ b/libsrc/util/mpl.c
@@ -1,7 +1,7 @@
/*
* mpl.c
*
- * $Id: mpl.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: mpl.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Mempory Pool Primitives
* Derived from obstack
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/mpl.h b/libsrc/util/mpl.h
index c4651a3..0b08d8d 100644
--- a/libsrc/util/mpl.h
+++ b/libsrc/util/mpl.h
@@ -1,7 +1,7 @@
/*
* mpl.h
*
- * $Id: mpl.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: mpl.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Mempory Pool Primitives
* Derived from obstack
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/ncfg.c b/libsrc/util/ncfg.c
index b309562..5286be2 100644
--- a/libsrc/util/ncfg.c
+++ b/libsrc/util/ncfg.c
@@ -1,14 +1,14 @@
/*
* ncfg.c
*
- * $Id: ncfg.c,v 1.1.1.1.2.2 2012/03/08 12:55:39 source Exp $
+ * $Id: ncfg.c,v 1.1.1.1.2.1 2010/01/29 02:02:54 source Exp $
*
* New Configuration File Management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/ncfg.h b/libsrc/util/ncfg.h
index 23daf83..6fdaaf7 100644
--- a/libsrc/util/ncfg.h
+++ b/libsrc/util/ncfg.h
@@ -1,14 +1,14 @@
/*
* ncfg.h
*
- * $Id: ncfg.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: ncfg.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* New Configuration File Management
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/ntapp.c b/libsrc/util/ntapp.c
index 6d73566..e2589d6 100644
--- a/libsrc/util/ntapp.c
+++ b/libsrc/util/ntapp.c
@@ -1,7 +1,7 @@
/*
* ntapp.c
*
- * $Id: ntapp.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: ntapp.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* NT Application specific code
* This function is a stub, if none is defined in the application
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/oplthr.h b/libsrc/util/oplthr.h
index e04b863..fbae650 100644
--- a/libsrc/util/oplthr.h
+++ b/libsrc/util/oplthr.h
@@ -1,14 +1,14 @@
/*
* oplthr.h
*
- * $Id: oplthr.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: oplthr.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Macros for locking & multihreading
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/regerror.c b/libsrc/util/regerror.c
index 17f2d11..c077b83 100644
--- a/libsrc/util/regerror.c
+++ b/libsrc/util/regerror.c
@@ -1,12 +1,12 @@
/*
* regerror.c
*
- * $Id: regerror.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: regerror.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/regexp.c b/libsrc/util/regexp.c
index c4c8c42..157e82c 100644
--- a/libsrc/util/regexp.c
+++ b/libsrc/util/regexp.c
@@ -239,10 +239,7 @@ regcomp (const char *exp)
regcode = r->program;
regc (MAGIC);
if (reg (0, &flags) == NULL)
- {
- free (r);
- return (NULL);
- }
+ return (NULL);
/* Dig out information for optimizations. */
r->regstart = '\0'; /* Worst-case defaults. */
diff --git a/libsrc/util/regexp.h b/libsrc/util/regexp.h
index a45bb1f..564b13b 100644
--- a/libsrc/util/regexp.h
+++ b/libsrc/util/regexp.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/regmagic.h b/libsrc/util/regmagic.h
index 665dd07..9c84185 100644
--- a/libsrc/util/regmagic.h
+++ b/libsrc/util/regmagic.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/rtrim.c b/libsrc/util/rtrim.c
index 14764dc..3efd496 100644
--- a/libsrc/util/rtrim.c
+++ b/libsrc/util/rtrim.c
@@ -1,7 +1,7 @@
/*
* rtrim.c
*
- * $Id: rtrim.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: rtrim.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* rtrim () -- Remove spaces & tabs from the right end of a string
*
@@ -14,7 +14,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/setext.c b/libsrc/util/setext.c
index d17b86d..58f2bee 100644
--- a/libsrc/util/setext.c
+++ b/libsrc/util/setext.c
@@ -1,7 +1,7 @@
/*
* setext.c
*
- * $Id: setext.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: setext.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* usage:
* char *setext (char *path, char *ext, int mode);
@@ -16,7 +16,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/setext.h b/libsrc/util/setext.h
index b4c810f..49f4c4f 100644
--- a/libsrc/util/setext.h
+++ b/libsrc/util/setext.h
@@ -1,12 +1,12 @@
/*
* setext.h
*
- * $Id: setext.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: setext.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/sslengine.c b/libsrc/util/sslengine.c
deleted file mode 100644
index e6031f8..0000000
--- a/libsrc/util/sslengine.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * sslengine.c
- *
- * $Id: sslengine.c,v 1.1.2.1 2012/03/14 13:58:52 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- */
-
-#include "libutil.h"
-#include "util/sslengine.h"
-#include <openssl/err.h>
-
-int
-ssl_engine_startup (void)
-{
- CRYPTO_malloc_init ();
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
- return 0;
-}
-
-
-int
-ssl_engine_configure (const char *settings)
-{
- return 0;
-}
-
-
-EVP_PKEY *
-ssl_load_privkey (const char *keyname, const void *keypass)
-{
- EVP_PKEY *pkey = NULL;
- BIO *bio_in;
- char *s;
-
- if ((bio_in = BIO_new_file (keyname, "r")) != NULL)
- {
- pkey = PEM_read_bio_PrivateKey (bio_in, NULL, NULL, NULL);
- BIO_free (bio_in);
- }
-
- return pkey;
-}
-
-
-/******************************************************************************/
-
-X509 *
-ssl_load_x509 (const char *filename)
-{
- X509 *x509 = NULL;
- BIO *bio_in;
-
- if ((bio_in = BIO_new_file (filename, "r")) != NULL)
- {
- x509 = PEM_read_bio_X509 (bio_in, NULL, NULL, NULL);
-
- /* attempt binary certificates too, it's a native format on Windows */
- if (x509 == NULL &&
- (ERR_GET_REASON (ERR_peek_last_error ()) == PEM_R_NO_START_LINE))
- {
- ERR_clear_error ();
- BIO_seek (bio_in, 0);
- x509 = d2i_X509_bio (bio_in, NULL);
- }
-
- BIO_free (bio_in);
- }
-
- return x509;
-}
diff --git a/libsrc/util/sslengine.h b/libsrc/util/sslengine.h
deleted file mode 100644
index 9f9a659..0000000
--- a/libsrc/util/sslengine.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * sslengine.c
- *
- * $Id: sslengine.h,v 1.1.2.1 2012/03/14 13:58:52 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- */
-#ifndef _SSLENGINE_H
-#define _SSLENGINE_H
-
-#include <openssl/ssl.h>
-
-BEGIN_CPLUSPLUS
-
-int ssl_engine_startup (void);
-int ssl_engine_configure (const char *settings);
-EVP_PKEY *ssl_load_privkey (const char *keyname, const void *keypass);
-X509 *ssl_load_x509 (const char *filename);
-
-END_CPLUSPLUS
-
-#endif
diff --git a/libsrc/util/startup.c b/libsrc/util/startup.c
index 1190049..36673a0 100644
--- a/libsrc/util/startup.c
+++ b/libsrc/util/startup.c
@@ -1,14 +1,14 @@
/*
* startup.c
*
- * $Id: startup.c,v 1.1.1.1.2.2 2012/03/08 12:55:39 source Exp $
+ * $Id: startup.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Provides default program initialization
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -251,8 +251,6 @@ default_usage (void)
for (opt = program_info.program_options; opt->long_opt; opt++)
{
int i = (int) strlen (opt->long_opt);
- if (!opt->help)
- continue;
if (!strcmp (opt->long_opt, "internal"))
continue;
if (i > fmtlen)
@@ -315,8 +313,6 @@ default_usage (void)
fmtlen = -(fmtlen + 2);
for (opt = program_info.program_options; opt->long_opt; opt++)
{
- if (!opt->help)
- continue;
#ifdef BROKEN_PRINTF
int i = strlen (opt->long_opt);
if (!strcmp (opt->long_opt, "internal"))
diff --git a/libsrc/util/startup.h b/libsrc/util/startup.h
index ba3e481..2608146 100644
--- a/libsrc/util/startup.h
+++ b/libsrc/util/startup.h
@@ -1,14 +1,14 @@
/*
* startup.h
*
- * $Id: startup.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: startup.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Includes for startup.c
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/stpcpy.c b/libsrc/util/stpcpy.c
index 7ab3d4a..80b835f 100644
--- a/libsrc/util/stpcpy.c
+++ b/libsrc/util/stpcpy.c
@@ -1,14 +1,14 @@
/*
* stpcpy.c
*
- * $Id: stpcpy.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: stpcpy.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Like strcpy, but returns a ptr to \0
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strcpyin.c b/libsrc/util/strcpyin.c
index 7e30999..72d97a7 100644
--- a/libsrc/util/strcpyin.c
+++ b/libsrc/util/strcpyin.c
@@ -1,12 +1,12 @@
/*
* strcpyin.c
*
- * $Id: strcpyin.c,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strcpyin.c,v 1.2 2006/04/18 19:49:56 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strerror.c b/libsrc/util/strerror.c
index 6f6edb8..553ed3e 100644
--- a/libsrc/util/strerror.c
+++ b/libsrc/util/strerror.c
@@ -1,14 +1,14 @@
/*
* strerror.c
*
- * $Id: strerror.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strerror.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Return error string
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strfuns.h b/libsrc/util/strfuns.h
index 5d27390..41ecf54 100644
--- a/libsrc/util/strfuns.h
+++ b/libsrc/util/strfuns.h
@@ -1,12 +1,12 @@
/*
* strfuns.h
*
- * $Id: strfuns.h,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strfuns.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/stricmp.c b/libsrc/util/stricmp.c
index 5ea7995..69b3eec 100644
--- a/libsrc/util/stricmp.c
+++ b/libsrc/util/stricmp.c
@@ -1,12 +1,12 @@
/*
* stricmp.c
*
- * $Id: stricmp.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: stricmp.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strindex.c b/libsrc/util/strindex.c
index ffe678f..532c352 100644
--- a/libsrc/util/strindex.c
+++ b/libsrc/util/strindex.c
@@ -1,12 +1,12 @@
/*
* strindex.c
*
- * $Id: strindex.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strindex.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strinsrt.c b/libsrc/util/strinsrt.c
index e976ebb..6a3ff85 100644
--- a/libsrc/util/strinsrt.c
+++ b/libsrc/util/strinsrt.c
@@ -1,12 +1,12 @@
/*
* strinsert.c
*
- * $Id: strinsrt.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strinsrt.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strlwr.c b/libsrc/util/strlwr.c
index 6910c02..ec201cb 100644
--- a/libsrc/util/strlwr.c
+++ b/libsrc/util/strlwr.c
@@ -1,12 +1,12 @@
/*
* strlwr.c
*
- * $Id: strlwr.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strlwr.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strnicmp.c b/libsrc/util/strnicmp.c
index 851a91d..1d0db76 100644
--- a/libsrc/util/strnicmp.c
+++ b/libsrc/util/strnicmp.c
@@ -1,12 +1,12 @@
/*
* stricmp.c
*
- * $Id: strnicmp.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strnicmp.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strquote.c b/libsrc/util/strquote.c
index 99bf73d..75ecd3d 100644
--- a/libsrc/util/strquote.c
+++ b/libsrc/util/strquote.c
@@ -1,7 +1,7 @@
/*
* strquote.c
*
- * $Id: strquote.c,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strquote.c,v 1.2 2006/04/18 19:49:56 source Exp $
*
* strquote - strdup's a string, adding quotes.
* strunquote - strdup's a string, stripping off quotes.
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strupr.c b/libsrc/util/strupr.c
index 3bf9f98..c02ccc1 100644
--- a/libsrc/util/strupr.c
+++ b/libsrc/util/strupr.c
@@ -1,12 +1,12 @@
/*
* strupr.c
*
- * $Id: strupr.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strupr.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/strxpect.c b/libsrc/util/strxpect.c
index b580f7c..b726075 100644
--- a/libsrc/util/strxpect.c
+++ b/libsrc/util/strxpect.c
@@ -1,7 +1,7 @@
/*
* strxpect.c
*
- * $Id: strxpect.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: strxpect.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Performs a keyword compare
* This functions tests if the second string (which is usually longer than
@@ -20,7 +20,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/terminat.c b/libsrc/util/terminat.c
index ca95d79..4593788 100644
--- a/libsrc/util/terminat.c
+++ b/libsrc/util/terminat.c
@@ -1,7 +1,7 @@
/*
* terminat.c
*
- * $Id: terminat.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: terminat.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Terminate a program
* This function is a stub, if none is defined in the application
@@ -9,7 +9,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/usage.c b/libsrc/util/usage.c
index c1c486b..9a9c02c 100644
--- a/libsrc/util/usage.c
+++ b/libsrc/util/usage.c
@@ -1,14 +1,14 @@
/*
* usage.c
*
- * $Id: usage.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: usage.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* Stub for startup.c
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/utalloc.h b/libsrc/util/utalloc.h
index 98e15a0..6e0d093 100644
--- a/libsrc/util/utalloc.h
+++ b/libsrc/util/utalloc.h
@@ -1,12 +1,12 @@
/*
* utalloc.h
*
- * $Id: utalloc.h,v 1.2.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: utalloc.h,v 1.2 2006/04/18 19:49:56 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/utf8funs.h b/libsrc/util/utf8funs.h
index a56a285..ff534d6 100644
--- a/libsrc/util/utf8funs.h
+++ b/libsrc/util/utf8funs.h
@@ -1,12 +1,12 @@
/*
* utf8funs.h
*
- * $Id: utf8funs.h,v 1.1.1.1.2.2 2012/03/08 12:55:39 source Exp $
+ * $Id: utf8funs.h,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
@@ -45,7 +45,6 @@ typedef struct
extern const wchar_t virt_utf8_encoding_mask[];
extern const unsigned char virt_utf8_encoding_byte[];
-size_t virt_mbrlen (const char *s, size_t n, virt_mbstate_t *ps);
size_t virt_mbrtowc (wchar_t *pwc, const unsigned char *s, size_t n, virt_mbstate_t *ps);
size_t virt_mbsnrtowcs (wchar_t *dst, unsigned char **src, size_t nmc, size_t len, virt_mbstate_t *ps);
size_t virt_wcsnrtombs (unsigned char *dst, wchar_t **src, size_t nwc, size_t len, virt_mbstate_t *ps);
diff --git a/libsrc/util/virt_mbrlen.c b/libsrc/util/virt_mbrlen.c
deleted file mode 100644
index d675948..0000000
--- a/libsrc/util/virt_mbrlen.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * virt_mbrlen.c
- *
- * Platform-intependent clone of mbrlen - determine number of bytes in next multibyte character
- *
- * $Id: virt_mbrlen.c,v 1.1.2.1 2012/03/03 02:09:07 source Exp $
- *
- * This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
- * project.
- *
- * Copyright (C) 1998-2012 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
- *
- */
-
-#include "libutil.h"
-
-size_t
-virt_mbrlen (const char *s, size_t n, virt_mbstate_t *ps)
-{
- size_t used = 0;
- static virt_mbstate_t internal;
-
- if (ps == NULL)
- ps = &internal;
-
- if (s == NULL)
- {
- s = (unsigned char *) "";
- n = 1;
- }
-
- if (n > 0)
- {
- if (ps->count == 0)
- {
- unsigned char byte = (unsigned char) *s++;
- ++used;
-
- /* We must look for a possible first byte of a UTF8 sequence. */
- if (!(byte & 0x80))
- return byte ? used : 0;
- if ((byte & 0xc0) == 0x80 || (byte & 0xfe) == 0xfe)
- return (size_t) -1;
- if ((byte & 0xe0) == 0xc0)
- {
- /* We expect two bytes. */
- ps->count = 1;
- ps->value = byte & 0x1f;
- }
- else if ((byte & 0xf0) == 0xe0)
- {
- /* We expect three bytes. */
- ps->count = 2;
- ps->value = byte & 0x0f;
- }
- else if ((byte & 0xf8) == 0xf0)
- {
- /* We expect four bytes. */
- ps->count = 3;
- ps->value = byte & 0x07;
- }
- else if ((byte & 0xfc) == 0xf8)
- {
- /* We expect five bytes. */
- ps->count = 4;
- ps->value = byte & 0x03;
- }
- else
- {
- /* We expect six bytes. */
- ps->count = 5;
- ps->value = byte & 0x01;
- }
- }
- /* We know we have to handle a multibyte character and there are
- some more bytes to read. */
- while (used < n)
- {
- /* The second to sixths byte must be of the form 10xxxxxx. */
- unsigned char byte = (unsigned char) *s++;
- ++used;
-
- if ((byte & 0xc0) != 0x80)
- {
- return (size_t) -1;
- }
- ps->value <<= 6;
- ps->value |= byte & 0x3f;
- if (--ps->count == 0)
- {
- return ps->value ? used : 0;
- }
- }
- }
- return (size_t) -2;
-}
diff --git a/libsrc/util/virt_mbrtowc.c b/libsrc/util/virt_mbrtowc.c
index e0b4da0..c6ebb31 100644
--- a/libsrc/util/virt_mbrtowc.c
+++ b/libsrc/util/virt_mbrtowc.c
@@ -1,12 +1,12 @@
/*
* virt_mbrtowc.c
*
- * $Id: virt_mbrtowc.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: virt_mbrtowc.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/virt_mbsnrtowcs.c b/libsrc/util/virt_mbsnrtowcs.c
index d5a81e6..d0f90b8 100644
--- a/libsrc/util/virt_mbsnrtowcs.c
+++ b/libsrc/util/virt_mbsnrtowcs.c
@@ -1,12 +1,12 @@
/*
* virt_mbsnrtowcs.c
*
- * $Id: virt_mbsnrtowcs.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: virt_mbsnrtowcs.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/virt_wcrtomb.c b/libsrc/util/virt_wcrtomb.c
index dc9350a..9d61385 100644
--- a/libsrc/util/virt_wcrtomb.c
+++ b/libsrc/util/virt_wcrtomb.c
@@ -1,12 +1,12 @@
/*
* virt_wcrtomb.c
*
- * $Id: virt_wcrtomb.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: virt_wcrtomb.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/virt_wcs_mask.c b/libsrc/util/virt_wcs_mask.c
index 11a4d75..29238ee 100644
--- a/libsrc/util/virt_wcs_mask.c
+++ b/libsrc/util/virt_wcs_mask.c
@@ -1,12 +1,12 @@
/*
* virt_wcs_mask.c
*
- * $Id: virt_wcs_mask.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: virt_wcs_mask.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/virt_wcsnrtombs.c b/libsrc/util/virt_wcsnrtombs.c
index 5b2d5d1..d5b92e7 100644
--- a/libsrc/util/virt_wcsnrtombs.c
+++ b/libsrc/util/virt_wcsnrtombs.c
@@ -1,12 +1,12 @@
/*
* virt_wcsnrtombs.c
*
- * $Id: virt_wcsnrtombs.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: virt_wcsnrtombs.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/wcslen.c b/libsrc/util/wcslen.c
index 37e1391..5717bac 100644
--- a/libsrc/util/wcslen.c
+++ b/libsrc/util/wcslen.c
@@ -1,12 +1,12 @@
/*
* wsclen.c
*
- * $Id: wcslen.c,v 1.1.1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: wcslen.c,v 1.1.1.1 2006/04/11 17:56:16 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/win32/ptrlong.h b/libsrc/util/win32/ptrlong.h
index 8249e0c..77e7b3c 100644
--- a/libsrc/util/win32/ptrlong.h
+++ b/libsrc/util/win32/ptrlong.h
@@ -3,7 +3,7 @@
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/win32/syslog.c b/libsrc/util/win32/syslog.c
index 56aab49..f169ccc 100644
--- a/libsrc/util/win32/syslog.c
+++ b/libsrc/util/win32/syslog.c
@@ -1,12 +1,12 @@
/*
* syslog.c
*
- * $Id: syslog.c,v 1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: syslog.c,v 1.1 2006/04/13 18:48:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/libsrc/util/win32/syslog.h b/libsrc/util/win32/syslog.h
index 15955d4..2709e05 100644
--- a/libsrc/util/win32/syslog.h
+++ b/libsrc/util/win32/syslog.h
@@ -1,12 +1,12 @@
/*
* syslog.h
*
- * $Id: syslog.h,v 1.1.2.1 2012/03/08 12:55:39 source Exp $
+ * $Id: syslog.h,v 1.1 2006/04/13 18:48:10 source Exp $
*
* This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
* project.
*
- * Copyright (C) 1998-2012 OpenLink Software
+ * Copyright (C) 1998-2006 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
diff --git a/win32/ab_vad.vcproj b/win32/ab_vad.vcproj
new file mode 100644
index 0000000..c883103
--- /dev/null
+++ b/win32/ab_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_adressbook_vad"
+ ProjectGUID="{20D26EE8-E1BA-11DB-930B-CD6B662399AA}"
+ RootNamespace="ods_adressbook_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_adressbook_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_adressbook_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_adressbook_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_adressbook_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Addressbook\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_addressbook_dav.vad;$(InputDir)\ods_addressbook_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_addressbook_dav.vad;$(InputDir)\ods_addressbook_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/blobs.vcproj b/win32/blobs.vcproj
new file mode 100644
index 0000000..7181ae1
--- /dev/null
+++ b/win32/blobs.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="blobs"
+ ProjectGUID="{72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\blobs"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/blobs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\blobs/blobs.pch"
+ AssemblerListingLocation="$(ConfigurationName)\blobs/"
+ ObjectFile="$(ConfigurationName)\blobs/"
+ ProgramDataBaseFileName="$(ConfigurationName)\blobs/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/blobs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/blobs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\blobs"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/blobs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\blobs/blobs.pch"
+ AssemblerListingLocation="$(ConfigurationName)\blobs/"
+ ObjectFile="$(ConfigurationName)\blobs/"
+ ProgramDataBaseFileName="$(ConfigurationName)\blobs/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/blobs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/blobs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\blobs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/blog_vad.vcproj b/win32/blog_vad.vcproj
new file mode 100644
index 0000000..16d022b
--- /dev/null
+++ b/win32/blog_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_blog_vad"
+ ProjectGUID="{8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}"
+ RootNamespace="ods_blog_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_blog_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_blog_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_blog_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_blog_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Blog\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_blog_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_blog_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/bookmark_vad.vcproj b/win32/bookmark_vad.vcproj
new file mode 100644
index 0000000..bbf73cb
--- /dev/null
+++ b/win32/bookmark_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_bookmark_vad"
+ ProjectGUID="{8A49554A-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_bookmark_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_bookmark_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_bookmark_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_bookmark_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_bookmark_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Bookmark\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_bookmark_dav.vad;$(InputDir)\ods_bookmark_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_bookmark_dav.vad;$(InputDir)\ods_bookmark_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/bpel_vad.vcproj b/win32/bpel_vad.vcproj
new file mode 100644
index 0000000..cbe9868
--- /dev/null
+++ b/win32/bpel_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="bpel_vad"
+ ProjectGUID="{3A2B317A-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="bpel_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\bpel_vad"
+ IntermediateDirectory="$(ConfigurationName)\bpel_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\bpel_vad"
+ IntermediateDirectory="$(ConfigurationName)\bpel_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\bpel\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\bpel_dav.vad;$(InputDir)\bpel_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\bpel_dav.vad;$(InputDir)\bpel_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/briefcase_vad.vcproj b/win32/briefcase_vad.vcproj
new file mode 100644
index 0000000..f972f0b
--- /dev/null
+++ b/win32/briefcase_vad.vcproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_briefcase_vad"
+ ProjectGUID="{55215A1C-EFE2-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_briefcase_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_briefcase_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_briefcase_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_briefcase_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_briefcase_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Briefcase\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\ods_briefcase_dav.vad;$(InputDir)\ods_briefcase_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_briefcase_dav.vad;$(InputDir)\ods_briefcase_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/burstoff.vcproj b/win32/burstoff.vcproj
new file mode 100644
index 0000000..7cecbe0
--- /dev/null
+++ b/win32/burstoff.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="burstoff"
+ ProjectGUID="{7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\burstoff"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/burstoff.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\burstoff/burstoff.pch"
+ AssemblerListingLocation="$(ConfigurationName)\burstoff/"
+ ObjectFile="$(ConfigurationName)\burstoff/"
+ ProgramDataBaseFileName="$(ConfigurationName)\burstoff/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/burstoff.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/burstoff.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\burstoff"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/burstoff.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\burstoff/burstoff.pch"
+ AssemblerListingLocation="$(ConfigurationName)\burstoff/"
+ ObjectFile="$(ConfigurationName)\burstoff/"
+ ProgramDataBaseFileName="$(ConfigurationName)\burstoff/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/burstoff.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/burstoff.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\burstoff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/calendar_vad.vcproj b/win32/calendar_vad.vcproj
new file mode 100644
index 0000000..00e6c1e
--- /dev/null
+++ b/win32/calendar_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_calendar_vad"
+ ProjectGUID="{351A8882-FD57-11DB-B29C-A18F012B09DC}"
+ RootNamespace="ods_calendar_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_calendar_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_calendar_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_calendar_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_calendar_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Calendar\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_calendar_dav.vad;$(InputDir)\ods_calendar_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_calendar_dav.vad;$(InputDir)\ods_calendar_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/community_vad.vcproj b/win32/community_vad.vcproj
new file mode 100644
index 0000000..b12cbd5
--- /dev/null
+++ b/win32/community_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_community_vad"
+ ProjectGUID="{C0990F5A-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_community_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_community_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_community_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_community_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_community_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Community\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_community_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_community_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/conductor_vad.vcproj b/win32/conductor_vad.vcproj
new file mode 100644
index 0000000..26c5168
--- /dev/null
+++ b/win32/conductor_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="conductor_vad"
+ ProjectGUID="{828BB6BA-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="conductor_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\conductor_vad"
+ IntermediateDirectory="$(ConfigurationName)\conductor_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\conductor_vad"
+ IntermediateDirectory="$(ConfigurationName)\conductor_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\yacutia\mkvad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash mkvad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\conductor_dav.vad;$(InputDir)\conductor_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash mkvad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\conductor_dav.vad;$(InputDir)\conductor_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/creolewiki.vcproj b/win32/creolewiki.vcproj
new file mode 100644
index 0000000..444f9a9
--- /dev/null
+++ b/win32/creolewiki.vcproj
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="creolewiki"
+ ProjectGUID="{ABE43C46-E1C4-11DB-930B-CD6B662399AA}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/creolewiki.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\creolewiki/creolewiki.pch"
+ AssemblerListingLocation="$(ConfigurationName)\creolewiki/"
+ ObjectFile="$(ConfigurationName)\creolewiki/"
+ ProgramDataBaseFileName="$(ConfigurationName)\creolewiki/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/creolewiki.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\creolewiki.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/creolewiki.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/creolewiki.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/creolewiki.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\creolewiki/creolewiki.pch"
+ AssemblerListingLocation="$(ConfigurationName)\creolewiki/"
+ ObjectFile="$(ConfigurationName)\creolewiki/"
+ ProgramDataBaseFileName="$(ConfigurationName)\creolewiki/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/creolewiki.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\creolewiki.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/creolewiki.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/creolewiki.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\creole_maclex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\creole_wikilex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\creolewiki.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ <Filter
+ Name="LexFiles"
+ >
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\creole_maclex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f creole_maclex.c
flex -8 -Pcreolemacyy -ocreole_maclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\creole_maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f creole_maclex.c
flex -8 -Pcreolemacyy -ocreole_maclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\creole_maclex.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\creole_wikilex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f creole_wikilex.c
flex -8 -Pcreolewikiyy -ocreole_wikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\creole_wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f creole_wikilex.c
flex -8 -Pcreolewikiyy -ocreole_wikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\creole_wikilex.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/cursor.vcproj b/win32/cursor.vcproj
new file mode 100644
index 0000000..a2d4d21
--- /dev/null
+++ b/win32/cursor.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="cursor"
+ ProjectGUID="{97D467CE-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\cursor"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/cursor.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\cursor/cursor.pch"
+ AssemblerListingLocation="$(ConfigurationName)\cursor/"
+ ObjectFile="$(ConfigurationName)\cursor/"
+ ProgramDataBaseFileName="$(ConfigurationName)\cursor/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/cursor.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cursor.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\cursor"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/cursor.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\cursor/cursor.pch"
+ AssemblerListingLocation="$(ConfigurationName)\cursor/"
+ ObjectFile="$(ConfigurationName)\cursor/"
+ ProgramDataBaseFileName="$(ConfigurationName)\cursor/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/cursor.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cursor.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\cursor.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/cutter.vcproj b/win32/cutter.vcproj
new file mode 100644
index 0000000..a5f9685
--- /dev/null
+++ b/win32/cutter.vcproj
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="cutter"
+ ProjectGUID="{6E10B655-C324-491F-B202-73565D6B30FB}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\cutter"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/cutter.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_CONSOLE,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\cutter/cutter.pch"
+ AssemblerListingLocation="$(ConfigurationName)\cutter/"
+ ObjectFile="$(ConfigurationName)\cutter/"
+ ProgramDataBaseFileName="$(ConfigurationName)\cutter/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ OutputFile="$(ConfigurationName)/cutter.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cutter.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\cutter"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/cutter.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\cutter/isql.pch"
+ AssemblerListingLocation="$(ConfigurationName)\cutter/"
+ ObjectFile="$(ConfigurationName)\cutter/"
+ ProgramDataBaseFileName="$(ConfigurationName)\cutter/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ OutputFile="$(ConfigurationName)/cutter.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cutter.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\sqldoc\cutter.c"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/demodb.vcproj b/win32/demodb.vcproj
new file mode 100644
index 0000000..b491099
--- /dev/null
+++ b/win32/demodb.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="demodb"
+ ProjectGUID="{CA03DBF1-2C7E-4732-8F41-65030876DDE7}"
+ RootNamespace="demodb"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\demodb"
+ IntermediateDirectory="$(ConfigurationName)\demodb"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\demodb"
+ IntermediateDirectory="$(ConfigurationName)\demodb"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\samples\demo\mkdemo.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set BINDIR=$(TargetDir)\..
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
rmdir /S /Q docsrc
bash make_vad.sh
bash mkdemo.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe;..\binsrc\bpel\bpel_dav.vad;..\binsrc\yacutia\conductor_dav.vad;..\binsrc\samples\demo\doc_dav.vad;..\binsrc\tutorial\tutorial_dav.vad"
+ Outputs="$(InputDir)\demo.db;$(InputDir)\demo_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set BINDIR=$(TargetDir)\..
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
rmdir /S /Q docsrc
bash make_vad.sh
bash mkdemo.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe;..\binsrc\bpel\bpel_dav.vad;..\binsrc\yacutia\conductor_dav.vad;..\binsrc\samples\demo\doc_dav.vad;..\binsrc\tutorial\tutorial_dav.vad"
+ Outputs="$(InputDir)\demo.db;$(InputDir)\demo_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/dk1t.vcproj b/win32/dk1t.vcproj
new file mode 100644
index 0000000..10c97ec
--- /dev/null
+++ b/win32/dk1t.vcproj
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="dk1t"
+ ProjectGUID="{58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}"
+ RootNamespace="dk1t"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\dk1t"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(ConfigurationName)\dk1t/"
+ ObjectFile="$(ConfigurationName)\dk1t/"
+ ProgramDataBaseFileName="$(ConfigurationName)\dk1t/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dk1t.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\dk1t"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\dk1t\dk1t.pch"
+ AssemblerListingLocation="$(ConfigurationName)\dk1t/"
+ ObjectFile="$(ConfigurationName)\dk1t/"
+ ProgramDataBaseFileName="$(ConfigurationName)\dk1t/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dk1t.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Dk\config.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkalloc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbasket.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbox.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkdevice.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhashext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkmarshal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkpool.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkresource.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkrusage.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkses2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksesinp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksession.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksesstr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksestcp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksets.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkstkern.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkstubs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkutil.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Dk\Dkstubs.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/dksrv.vcproj b/win32/dksrv.vcproj
new file mode 100644
index 0000000..cdc6d81
--- /dev/null
+++ b/win32/dksrv.vcproj
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="dksrv"
+ ProjectGUID="{58867EBA-CA07-4F41-A966-6245FF14773E}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\dksrv"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(ConfigurationName)\dksrv/"
+ ObjectFile="$(ConfigurationName)\dksrv/"
+ ProgramDataBaseFileName="$(ConfigurationName)\dksrv/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dksrv.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\dksrv"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\dksrv/dksrv.pch"
+ AssemblerListingLocation="$(ConfigurationName)\dksrv/"
+ ObjectFile="$(ConfigurationName)\dksrv/"
+ ProgramDataBaseFileName="$(ConfigurationName)\dksrv/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dksrv.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Dk\Dkalloc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbasket.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbox.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkdevice.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkernel.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhashext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkmarshal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkpool.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkresource.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkrusage.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkses2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksesinp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksession.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksesstr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksestcp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksets.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkstubs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkutil.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Dk\Dkalloc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbasket.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbox.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkconfig.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkdevice.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkernel.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhash.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhashext.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkmarshal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkparam.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkpool.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkresource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksession.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksets.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkstubs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksystem.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dktrace.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dktypes.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkutil.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/doc_vad.vcproj b/win32/doc_vad.vcproj
new file mode 100644
index 0000000..6910133
--- /dev/null
+++ b/win32/doc_vad.vcproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="doc_vad"
+ ProjectGUID="{A9B1A466-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="doc_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\doc_vad"
+ IntermediateDirectory="$(ConfigurationName)\doc_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\doc_vad"
+ IntermediateDirectory="$(ConfigurationName)\doc_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\samples\demo\mkdoc.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
set CUTTER=cutter.exe
bash mkdoc.sh
cd $(ProjectDir)

"
+ Outputs="$(InputDir)\doc_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
set CUTTER=cutter.exe
bash mkdoc.sh
cd $(ProjectDir)

"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\doc_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/feeds_vad.vcproj b/win32/feeds_vad.vcproj
new file mode 100644
index 0000000..2890130
--- /dev/null
+++ b/win32/feeds_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_feedmanager_vad"
+ ProjectGUID="{441F1D0C-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_feedmanager_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_feedmanager_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_feedmanager_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_feedmanager_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_feedmanager_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-FeedManager\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_feedmanager_dav.vad;$(InputDir)\ods_feedmanager_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_feedmanager_dav.vad;$(InputDir)\ods_feedmanager_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/gallery_vad.vcproj b/win32/gallery_vad.vcproj
new file mode 100644
index 0000000..0864d85
--- /dev/null
+++ b/win32/gallery_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_gallery_vad"
+ ProjectGUID="{BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_gallery_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_gallery_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_gallery_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_gallery_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_gallery_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Gallery\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_gallery_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_gallery_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/getdata.vcproj b/win32/getdata.vcproj
new file mode 100644
index 0000000..182f9a3
--- /dev/null
+++ b/win32/getdata.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="getdata"
+ ProjectGUID="{AFB15514-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\getdata"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/getdata.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\getdata/getdata.pch"
+ AssemblerListingLocation="$(ConfigurationName)\getdata/"
+ ObjectFile="$(ConfigurationName)\getdata/"
+ ProgramDataBaseFileName="$(ConfigurationName)\getdata/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/getdata.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/getdata.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\getdata"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/getdata.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\getdata/getdata.pch"
+ AssemblerListingLocation="$(ConfigurationName)\getdata/"
+ ObjectFile="$(ConfigurationName)\getdata/"
+ ProgramDataBaseFileName="$(ConfigurationName)\getdata/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/getdata.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/getdata.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\getdata.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/hosting_perl.vcproj b/win32/hosting_perl.vcproj
new file mode 100644
index 0000000..912d701
--- /dev/null
+++ b/win32/hosting_perl.vcproj
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="hosting_perl"
+ ProjectGUID="{354809B6-CF7B-11DA-85E2-A4E5714C712A}"
+ RootNamespace="hosting_perl"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hosting_perl"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_perl.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PERL_CFLAGS)"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_perl/hosting_perl.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_perl/"
+ ObjectFile="$(ConfigurationName)\hosting_perl/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_perl/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PERL_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_perl.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\perl\hosting_perl.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_perl.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_perl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hosting_perl"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_perl.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PERL_CFLAGS)"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_perl/hosting_perl.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_perl/"
+ ObjectFile="$(ConfigurationName)\hosting_perl/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_perl/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PERL_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_perl.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\perl\hosting_perl.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_perl.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_perl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\perl\hosting_perl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\perl\virt_handler.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="SqlFiles"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\perl\pl_to_c.awk"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/hosting_php.vcproj b/win32/hosting_php.vcproj
new file mode 100644
index 0000000..fccc61c
--- /dev/null
+++ b/win32/hosting_php.vcproj
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="hosting_php"
+ ProjectGUID="{9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}"
+ RootNamespace="hosting_php"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hosting_php"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_php.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;php5;php5\main;php5\Zend;php5\ext;php5\regex;php5\TSRM;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;_PHP;_PHP_WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;ZTS;ZEND_DEBUG=1;MSVC5;ZEND_WIN32;_USE_32BIT_TIME_T"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_php/hosting_php.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_php/"
+ ObjectFile="$(ConfigurationName)\hosting_php/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_php/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib php5ts.lib"
+ OutputFile="$(ConfigurationName)/hosting_php.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl,.\php5"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\php\hosting_php.def"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_php.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_php.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hosting_php"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_php.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;php5;php5\main;php5\Zend;php5\ext;php5\regex;php5\TSRM;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;_PHP;_PHP_WIN32;_MBCS;WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;_MBCS;WIN32;ZTS;ZEND_DEBUG=1;MSVC5;ZEND_WIN32;_MBCS;WIN32"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_php/hosting_php.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_php/"
+ ObjectFile="$(ConfigurationName)\hosting_php/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_php/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib php5ts.lib"
+ OutputFile="$(ConfigurationName)/hosting_php.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl,.\php5"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\php\hosting_php.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_php.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_php.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\php\hosting_php.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/hosting_python.vcproj b/win32/hosting_python.vcproj
new file mode 100644
index 0000000..0859afb
--- /dev/null
+++ b/win32/hosting_python.vcproj
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="hosting_python"
+ ProjectGUID="{B525A234-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="hosting_python"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hosting_python"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_python.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PYTHON_CFLAGS)"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_python/hosting_python.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_python/"
+ ObjectFile="$(ConfigurationName)\hosting_python/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_python/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PYTHON_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_python.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\python\hosting_python.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_python.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_python.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hosting_python"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_python.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PYTHON_CFLAGS)"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_python/hosting_python.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_python/"
+ ObjectFile="$(ConfigurationName)\hosting_python/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_python/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PYTHON_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_python.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\python\hosting_python.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_python.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_python.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\python\hosting_python.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\python\virt_handler.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="SqlFiles"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\python\py_to_c.awk"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f py_to_c.awk virt_handler.py > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f py_to_c.awk virt_handler.py > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/hslookup.vcproj b/win32/hslookup.vcproj
new file mode 100644
index 0000000..5b5f3a0
--- /dev/null
+++ b/win32/hslookup.vcproj
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="hslookup"
+ ProjectGUID="{14ECED18-FB38-11DC-8216-8B38A5565D8C}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hslookup"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hslookup.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;.;hcc5\"
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hslookup/hslookup.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hslookup/"
+ ObjectFile="$(ConfigurationName)\hslookup/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hslookup/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib handle.lib"
+ OutputFile="$(ConfigurationName)/hslookup.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl,hcc5"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\hslookup\hslookup.def"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(ConfigurationName)/hslookup.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hslookup.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hslookup"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hslookup.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,.;hcc5\"
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hslookup/hslookup.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hslookup/"
+ ObjectFile="$(ConfigurationName)\hslookup/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hslookup/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib handle.lib"
+ OutputFile="$(ConfigurationName)/hslookup.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl;hcc5\"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\hslookup\hslookup.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hslookup.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hslookup.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\samples\hslookup\hslookup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/im.vcproj b/win32/im.vcproj
new file mode 100644
index 0000000..389a89c
--- /dev/null
+++ b/win32/im.vcproj
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="im"
+ ProjectGUID="{C152ADCC-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="im"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\im"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/im.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;.;.\ImageMagick"
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\im/im.pch"
+ AssemblerListingLocation="$(ConfigurationName)\im/"
+ ObjectFile="$(ConfigurationName)\im/"
+ ProgramDataBaseFileName="$(ConfigurationName)\im/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib CORE_RL_wand_.lib CORE_RL_coders_.lib CORE_RL_magick_.lib CORE_RL_ttf_.lib CORE_RL_xlib_.lib CORE_RL_bzlib_.lib CORE_RL_zlib_.lib CORE_RL_lcms_.lib CORE_RL_tiff_.lib CORE_RL_filters_.lib CORE_RL_jpeg_.lib CORE_RL_jbig_.lib CORE_RL_jp2_.lib CORE_RL_png_.lib CORE_RL_wmf_.lib CORE_RL_libxml_.lib"
+ OutputFile="$(ConfigurationName)/im.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl;.\ImageMagick"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\image_magick\im.def"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(ConfigurationName)/im.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/im.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\im"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/im.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\plugin;..\binsrc\driver\include..\libsrc\Dk;..\libsrc\util\win32;..\libsrc;..\libsrc\Xml.new;openssl;.;.\ImageMagick"
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\im/im.pch"
+ AssemblerListingLocation="$(ConfigurationName)\im/"
+ ObjectFile="$(ConfigurationName)\im/"
+ ProgramDataBaseFileName="$(ConfigurationName)\im/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib CORE_RL_wand_.lib CORE_RL_coders_.lib CORE_RL_magick_.lib CORE_RL_ttf_.lib CORE_RL_xlib_.lib CORE_RL_bzlib_.lib CORE_RL_zlib_.lib CORE_RL_lcms_.lib CORE_RL_tiff_.lib CORE_RL_filters_.lib CORE_RL_jpeg_.lib CORE_RL_jbig_.lib CORE_RL_jp2_.lib CORE_RL_png_.lib CORE_RL_wmf_.lib CORE_RL_libxml_.lib"
+ OutputFile="$(ConfigurationName)/im.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl;.\ImageMagick"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\image_magick\im.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/im.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/im.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\samples\image_magick\im.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/ins.vcproj b/win32/ins.vcproj
new file mode 100644
index 0000000..20d529d
--- /dev/null
+++ b/win32/ins.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ins"
+ ProjectGUID="{C6C66924-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\ins"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/ins.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\ins/ins.pch"
+ AssemblerListingLocation="$(ConfigurationName)\ins/"
+ ObjectFile="$(ConfigurationName)\ins/"
+ ProgramDataBaseFileName="$(ConfigurationName)\ins/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/ins.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/ins.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\ins"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/ins.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\ins/ins.pch"
+ AssemblerListingLocation="$(ConfigurationName)\ins/"
+ ObjectFile="$(ConfigurationName)\ins/"
+ ProgramDataBaseFileName="$(ConfigurationName)\ins/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/ins.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/ins.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\ins.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/isparql_vad.vcproj b/win32/isparql_vad.vcproj
new file mode 100644
index 0000000..092881c
--- /dev/null
+++ b/win32/isparql_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="isparql_vad"
+ ProjectGUID="{6260E42E-239D-11DB-9594-FD7021681415}"
+ RootNamespace="isparql_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\isparql_vad"
+ IntermediateDirectory="$(ConfigurationName)\isparql_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\isparql_vad"
+ IntermediateDirectory="$(ConfigurationName)\isparql_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\isparql\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\isparql_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\isparql_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/isql.vcproj b/win32/isql.vcproj
new file mode 100644
index 0000000..5bc78c9
--- /dev/null
+++ b/win32/isql.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="isqlo"
+ ProjectGUID="{9FF2579E-CF7B-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\isql"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/isql.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\isql/isql.pch"
+ AssemblerListingLocation="$(ConfigurationName)\isql/"
+ ObjectFile="$(ConfigurationName)\isql/"
+ ProgramDataBaseFileName="$(ConfigurationName)\isql/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="Ws2_32.lib odbc32.lib odbccp32.lib"
+ OutputFile="$(ConfigurationName)/isqlo.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),..\libsrc\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\isql"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/isql.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\isql/isql.pch"
+ AssemblerListingLocation="$(ConfigurationName)\isql/"
+ ObjectFile="$(ConfigurationName)\isql/"
+ ProgramDataBaseFileName="$(ConfigurationName)\isql/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="Ws2_32.lib odbc32.lib odbccp32.lib"
+ OutputFile="$(ConfigurationName)/isqlo.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\isql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/isql_native.vcproj b/win32/isql_native.vcproj
new file mode 100644
index 0000000..d980674
--- /dev/null
+++ b/win32/isql_native.vcproj
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="isql"
+ ProjectGUID="{AFB1D909-86D0-49DE-8BD8-DF89349F934E}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\isql_native"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/isql_native.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Wi;..\libsrc\util\win32;."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\isql_native/isql_native.pch"
+ AssemblerListingLocation="$(ConfigurationName)\isql_native/"
+ ObjectFile="$(ConfigurationName)\isql_native/"
+ ProgramDataBaseFileName="$(ConfigurationName)\isql_native/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/isql.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql_native.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\isql_native"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/isql_native.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Wi;..\libsrc\util\win32;."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\isql_native/isql_native.pch"
+ AssemblerListingLocation="$(ConfigurationName)\isql_native/"
+ ObjectFile="$(ConfigurationName)\isql_native/"
+ ProgramDataBaseFileName="$(ConfigurationName)\isql_native/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/isql.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql_native.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\isql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/libvirtuoso_odbc_t.vcproj b/win32/libvirtuoso_odbc_t.vcproj
new file mode 100644
index 0000000..c811e43
--- /dev/null
+++ b/win32/libvirtuoso_odbc_t.vcproj
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libvirtuoso_t"
+ ProjectGUID="{FB836C59-41E1-48EA-A59B-460AB56587EE}"
+ RootNamespace="libvirtuoso_t"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\libvirtuoso_t"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;SHARED_OBJECT;PACKAGE_VERSION=\"6.1.3\""
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib tidy.lib"
+ OutputFile="$(OutDir)/libvirtuoso-t.dll"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtuoso\libviwin32.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/libvirtuoso_t.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ FixedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\libvirtuoso_t"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="PACKAGE_VERSION=\"6.1.3\";_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;SHARED_OBJECT;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib tidy.lib"
+ OutputFile="$(OutDir)/libvirtuoso-t.dll"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtuoso\libviwin32.def"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(OutDir)/libvirtuoso_t.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ FixedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\binsrc\virtuoso\viconfig.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtuoso\viwin32.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/mail_vad.vcproj b/win32/mail_vad.vcproj
new file mode 100644
index 0000000..9998a42
--- /dev/null
+++ b/win32/mail_vad.vcproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_webmail_vad"
+ ProjectGUID="{B0058FA6-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_webmail_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_webmail_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_webmail_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_webmail_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_webmail_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-WebMail\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\ods_webmail_dav.vad;$(InputDir)\ods_webmail_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_webmail_dav.vad;$(InputDir)\ods_webmail_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/maildrop.vcproj b/win32/maildrop.vcproj
new file mode 100644
index 0000000..5f97225
--- /dev/null
+++ b/win32/maildrop.vcproj
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="maildrop"
+ ProjectGUID="{C5F98602-E5B9-11DA-85E2-A4E5714C712A}"
+ RootNamespace="maildrop"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\maildrop"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" mailmsg.idl
midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" smtpevent.idl
midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" cdosys.idl
midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" seo.idl
midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" msado15.idl
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/maildrop.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\plugin;..\binsrc\driver\include..\libsrc\Dk;..\libsrc\util\win32;..\libsrc;..\binsrc\maildrop\win32\gen;..\binsrc\maildrop;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\maildrop/maildrop.pch"
+ AssemblerListingLocation="$(ConfigurationName)\maildrop/"
+ ObjectFile="$(ConfigurationName)\maildrop/"
+ ProgramDataBaseFileName="$(ConfigurationName)\maildrop/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/maildrop.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\maildrop\win32\maildrop.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/maildrop.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/maildrop.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\maildrop"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ UseOfATL="1"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" mailmsg.idl
midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" smtpevent.idl
midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" cdosys.idl
midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" seo.idl
midl /nologo /env win32 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" msado15.idl
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="false"
+ SuppressStartupBanner="true"
+ TargetEnvironment="0"
+ TypeLibraryName=""
+ HeaderFileName=""
+ DLLDataFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\plugin;..\binsrc\driver\include..\libsrc\Dk;..\libsrc\util\win32;..\libsrc;..\binsrc\maildrop\win32\gen;..\binsrc\maildrop;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\maildrop/maildrop.pch"
+ AssemblerListingLocation="$(ConfigurationName)\maildrop/"
+ ObjectFile="$(ConfigurationName)\maildrop/"
+ ProgramDataBaseFileName="$(ConfigurationName)\maildrop/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/maildrop.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\maildrop\win32\maildrop.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/maildrop.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/maildrop.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\maildrop\win32\maildrop.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\maildrop\win32\maildrop.idl"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ MkTypLibCompatible="false"
+ TargetEnvironment="1"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(InputDir)\gen\"
+ HeaderFileName="$(InputName).h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ MkTypLibCompatible="false"
+ TargetEnvironment="1"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(InputDir)\gen\"
+ HeaderFileName="$(InputName).h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\maildrop\win32\mpl.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\binsrc\maildrop\win32\maildrop.rc"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="..\libsrc\Wi;..\binsrc\maildrop\win32\gen"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="..\libsrc\Wi;..\binsrc\maildrop\win32\gen"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/mediawiki.vcproj b/win32/mediawiki.vcproj
new file mode 100644
index 0000000..a31453e
--- /dev/null
+++ b/win32/mediawiki.vcproj
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="mediawiki"
+ ProjectGUID="{408E2482-2623-11DB-9BB9-97600548391D}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\mediawiki"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/mediawiki.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\mediawiki/mediawiki.pch"
+ AssemblerListingLocation="$(ConfigurationName)\mediawiki/"
+ ObjectFile="$(ConfigurationName)\mediawiki/"
+ ProgramDataBaseFileName="$(ConfigurationName)\mediawiki/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/mediawiki.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\mediawiki.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/mediawiki.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/mediawiki.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\mediawiki"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/mediawiki.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\mediawiki/mediawiki.pch"
+ AssemblerListingLocation="$(ConfigurationName)\mediawiki/"
+ ObjectFile="$(ConfigurationName)\mediawiki/"
+ ProgramDataBaseFileName="$(ConfigurationName)\mediawiki/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/mediawiki.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\mediawiki.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/mediawiki.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/mediawiki.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\media_maclex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\media_wikilex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\mediawiki.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ <Filter
+ Name="LexFiles"
+ >
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\media_maclex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_maclex.c
flex -8 -Pmediamacyy -omedia_maclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_maclex.c
flex -8 -Pmediamacyy -omedia_maclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_maclex.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\media_wikilex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_wikilex.c
flex -8 -Pmediawikiyy -omedia_wikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_wikilex.c
flex -8 -Pmediawikiyy -omedia_wikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_wikilex.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/mkperlenv.pl b/win32/mkperlenv.pl
new file mode 100644
index 0000000..2ef8da0
--- /dev/null
+++ b/win32/mkperlenv.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+#
+# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+# project.
+#
+# Copyright (C) 1998-2006 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
+#
+#
+#used to generate the appropriate parts of dirs.prj for perl/win32 embedding
+
+use strict;
+use ExtUtils::Embed;
+
+print "\nPERL_CFLAGS=",ccopts,"\n";
+print "\nPERL_LDFLAGS=",ldopts,"\n";
diff --git a/win32/mkpythonenv.py b/win32/mkpythonenv.py
new file mode 100644
index 0000000..501fd71
--- /dev/null
+++ b/win32/mkpythonenv.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+#
+# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
+# project.
+#
+# Copyright (C) 1998-2006 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
+#
+#
+import distutils.sysconfig
+
+print "PYTHON_CFLAGS=-I" + distutils.sysconfig.get_config_var ("INCLUDEPY")
+
+print "PYTHON_LDFLAGS=/LIBPATH:" + distutils.sysconfig.get_config_var ("exec_prefix") + "/libs"
diff --git a/win32/nntpf_vad.vcproj b/win32/nntpf_vad.vcproj
new file mode 100644
index 0000000..d2bbf0a
--- /dev/null
+++ b/win32/nntpf_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_discussion_vad"
+ ProjectGUID="{607116BE-F168-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_discussion_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_discussion_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_discussion_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_discussion_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_discussion_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Discussion\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_discussion_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_discussion_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/odbcmail.vcproj b/win32/odbcmail.vcproj
new file mode 100644
index 0000000..22e96d1
--- /dev/null
+++ b/win32/odbcmail.vcproj
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtmail"
+ ProjectGUID="{4C517D78-E5B9-11DA-85E2-A4E5714C712A}"
+ RootNamespace="odbcmail"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\odbcmail"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ Description="Making the version file"
+ CommandLine="bash $(InputDir)\..\bin\makever -o $(InputDir)\..\binsrc\maildrop\odbcmail.vers.c -p "OpenLink ODBC Mail Interface" -v "2.01"
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/odbcmail.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\binsrc\maildrop;..\libsrc\zlib;..\binsrc\driver;..\binsrc\maildrop\win32\gen;.\openssl"
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\odbcmail/odbcmail.pch"
+ AssemblerListingLocation="$(ConfigurationName)\odbcmail/"
+ ObjectFile="$(ConfigurationName)\odbcmail/"
+ ProgramDataBaseFileName="$(ConfigurationName)\odbcmail/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="util.lib wic.lib dk1t.lib threads.lib libeay32.lib gdi32.lib advapi32.lib ssleay32.lib ws2_32.lib user32.lib kernel32.lib"
+ OutputFile="$(ConfigurationName)/virt_mail.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/odbcmail.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\odbcmail"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(IntDir)
bash $(InputDir)\..\bin\makever -o odbcmail.vers.c -p "OpenLink ODBC Mail Interface" -v "2.01"
cd $(InputDir)
"
+ AdditionalDependencies="$(IntDir)\odbc_mail.obj"
+ Outputs="$(IntDir)\odbcmail.vers.c"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/odbcmail.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl"
+ PreprocessorDefinitions="_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\odbcmail/odbcmail.pch"
+ AssemblerListingLocation="$(ConfigurationName)\odbcmail/"
+ ObjectFile="$(ConfigurationName)\odbcmail/"
+ ProgramDataBaseFileName="$(ConfigurationName)\odbcmail/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="util.lib wic.lib dk1t.lib threads.lib libeay32.lib gdi32.lib advapi32.lib ssleay32.lib ws2_32.lib user32.lib kernel32.lib"
+ OutputFile="$(ConfigurationName)/virt_mail.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/odbcmail.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\maildrop\odbc_mail.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\maildrop\odbcmail.vers.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/ods_vad.vcproj b/win32/ods_vad.vcproj
new file mode 100644
index 0000000..a70ce8c
--- /dev/null
+++ b/win32/ods_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_framework_vad"
+ ProjectGUID="{7DF920B2-EFDA-11DA-988C-EBAD6065650A}"
+ RootNamespace="ods_framework_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_framework_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_framework_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_framework_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_framework_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Framework\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_framework_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_framework_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/polls_vad.vcproj b/win32/polls_vad.vcproj
new file mode 100644
index 0000000..ad835ce
--- /dev/null
+++ b/win32/polls_vad.vcproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_polls_vad"
+ ProjectGUID="{FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}"
+ RootNamespace="ods_polls_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_polls_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_polls_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_polls_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_polls_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Polls\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\ods_polls_dav.vad;$(InputDir)\ods_polls_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_polls_dav.vad;$(InputDir)\ods_polls_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/rdf_mappers.vcproj b/win32/rdf_mappers.vcproj
new file mode 100644
index 0000000..e31a71e
--- /dev/null
+++ b/win32/rdf_mappers.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="rdf_mappers_vad"
+ ProjectGUID="{C6451C76-DC57-11DB-930B-CD6B662399AA}"
+ RootNamespace="rdf_mappers_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\rdf_mappers_vad"
+ IntermediateDirectory="$(ConfigurationName)\rdf_mappers_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\rdf_mappers_vad"
+ IntermediateDirectory="$(ConfigurationName)\rdf_mappers_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\rdf_mappers\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\rdf_mappers_dav.vad;$(InputDir)\rdf_mappers_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\rdf_mappers_dav.vad;$(InputDir)\rdf_mappers_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/scroll.vcproj b/win32/scroll.vcproj
new file mode 100644
index 0000000..99b1713
--- /dev/null
+++ b/win32/scroll.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="scroll"
+ ProjectGUID="{C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\scroll"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/scroll.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\scroll/scroll.pch"
+ AssemblerListingLocation="$(ConfigurationName)\scroll/"
+ ObjectFile="$(ConfigurationName)\scroll/"
+ ProgramDataBaseFileName="$(ConfigurationName)\scroll/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/scroll.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/scroll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\scroll"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/scroll.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\scroll/scroll.pch"
+ AssemblerListingLocation="$(ConfigurationName)\scroll/"
+ ObjectFile="$(ConfigurationName)\scroll/"
+ ProgramDataBaseFileName="$(ConfigurationName)\scroll/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/scroll.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/scroll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\scroll.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/setcurs.vcproj b/win32/setcurs.vcproj
new file mode 100644
index 0000000..2419b02
--- /dev/null
+++ b/win32/setcurs.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="setcurs"
+ ProjectGUID="{DCA407C4-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\setcurs"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/setcurs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\setcurs/setcurs.pch"
+ AssemblerListingLocation="$(ConfigurationName)\setcurs/"
+ ObjectFile="$(ConfigurationName)\setcurs/"
+ ProgramDataBaseFileName="$(ConfigurationName)\setcurs/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/setcurs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/setcurs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\setcurs"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/setcurs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\setcurs/setcurs.pch"
+ AssemblerListingLocation="$(ConfigurationName)\setcurs/"
+ ObjectFile="$(ConfigurationName)\setcurs/"
+ ProgramDataBaseFileName="$(ConfigurationName)\setcurs/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/setcurs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/setcurs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\setcurs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/sparql_demo_vad.vcproj b/win32/sparql_demo_vad.vcproj
new file mode 100644
index 0000000..e02f05b
--- /dev/null
+++ b/win32/sparql_demo_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="sparql_demo_vad"
+ ProjectGUID="{CDFD5FAC-FD70-11DB-B29C-A18F012B09DC}"
+ RootNamespace="sparql_demo_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\sparql_demo_vad"
+ IntermediateDirectory="$(ConfigurationName)\sparql_demo_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\sparql_demo_vad"
+ IntermediateDirectory="$(ConfigurationName)\sparql_demo_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\samples\sparql_demo\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\sparql_demo_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\sparql_demo_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/sqlcode.bat b/win32/sqlcode.bat
new file mode 100644
index 0000000..1efa355
--- /dev/null
+++ b/win32/sqlcode.bat
@@ -0,0 +1,60 @@
+set SQL_FILES=system.sql system2.sql odbccat.sql useraggr.sql vt_text.sql phrasematch.sql hosting.sql
+set SQL_FILES_1=oledb.sql information_schema.sql
+set SQL_FILES_WS=../../binsrc/vsp/vsp_auth.sql soap.sql wsrp_ultim.xsl wsrp_resp.xsl wsrp_interm.xsl wsrp_error.xsl soap_sch.xsl soap_import_sch.xsl wsdl_expand.xsl wsdl_parts.xsl wsdl_import.xsl wsdl2rdf.xsl xmlrpc_soap.xsl soap_xmlrpc.xsl soap12_router.xsl ../../binsrc/ws/wsrm/wsrm_ddl.sql ../../binsrc/ws/wsrm/wsrm_xsd.sql ../../binsrc/ws/wsrm/wsrmcli.sql ../../binsrc/ws/wsrm/wsrmsrv.sql ../../binsrc/ws/wstr/wstr_ddl.sql ../../binsrc/ws/wstr/wstrcli.sql ../../binsrc/ws/wstr/wstrsrv.sql ../../binsrc/ws/wsrm/wsrmcall.xsl rdf_net.sql simile.sql http_auth.sql xmla.sql openxml.sql ../../binsrc/vspx/vspx.sql ../../binsrc/vspx/vspx_add_locations.xsl ../../binsrc/vspx/vspx_expand.xsl ../../binsrc/vspx/vspx_pre_xsd.xsl ../../binsrc/vspx/vspx_pre_sql.xsl ../../binsrc/vspx/vspx_log_format.xsl ../../binsrc/vspx/vspx.xsd ../../binsrc/vspx/vspx.xsl
+set SQL_FILES_REPL=snapshot_repl.sql repl.sql
+set SQL_FILES_DAV=../../binsrc/dav/dav.sql ../../binsrc/dav/dav_api.sql ../../binsrc/dav/dav_meta.sql ../../binsrc/dav/dav_acct.sql ../../binsrc/dav/dav_rdf_quad.sql ../../binsrc/vsp/admin/admin_dav/vfs.sql ../../binsrc/dav/davxml2rdfxml.xsl ../../binsrc/dav/davxml2n3xml.xsl ../../binsrc/dav/rdfxml2n3xml.xsl ../../binsrc/dav/n3xml2uriqahtml.xsl ../../binsrc/dav/uriqa.sql ../../binsrc/dav/DET_CatFilter.sql ../../binsrc/dav/DET_HostFs.sql ../../binsrc/dav/DET_ResFilter.sql ../../binsrc/dav/DET_PropFilter.sql ../../binsrc/dav/DET_RDFData.sql ../../binsrc/dav/Versioning/DET_Versioning.sql xml_view.sql ../../binsrc/dav/DET_S3.sql
+set SQL_FILES_DDK=replddk.sql ../../binsrc/dav/davddk.sql mail_cli.sql ../../binsrc/vsp/admin/admin_ddl.sql ../../binsrc/vsp/admin/admin_dav/vfsddk.sql virtual_dir.sql url_rewrite.sql
+set SQL_FILES_SYS=users.sql
+set SQL_FILES_UDDI=uddi.sql
+set SQL_FILES_IMSG=pop3_svr.sql ftp.sql nn_svr.sql ../../binsrc/vsp/admin/admin_news/admin_news.sql
+set SQL_FILES_AUTO=autoexec.sql
+set SQL_FILES_ADM=../../binsrc/vsp/admin/admin.sql ../../binsrc/vspx/browser/admin_dav_browser.sql
+set SQL_FILES_2PC=2pc.sql
+ at rem set SQL_FILES_BLOG=../../binsrc/weblog2/widgets/rss2rdf.xsl
+set SQL_FILES_VDB=vdb.sql
+set SQL_FILES_PLDBG=cov_report.xsl cov_time.xsl
+set SQL_FILES_VAD=../../binsrc/vad/vad_root.sql ../../binsrc/vad/vad_misc.sql ../../binsrc/vad/oper_pars.sql ../../binsrc/vad/pars_init.sql ../../binsrc/vad/vad_make.sql
+set SQL_FILES_DBP=../../binsrc/vsp/admin/dbpump/dbpump_root.sql ../../binsrc/vsp/admin/dbpump/oper_pars.sql ../../binsrc/vsp/admin/dbpump/components.sql ../../binsrc/vsp/admin/dbpump/comp_html.sql ../../binsrc/vsp/admin/dbpump/comp_misc.sql ../../binsrc/vsp/admin/dbpump/comp_rpath.sql ../../binsrc/vsp/admin/dbpump/comp_tables.sql ../../binsrc/vsp/admin/dbpump/pars_init.sql
+set SQL_FILES_SPARQL=sparql.sql sparql_io.sql rdf_sponge.sql rdf_schema_objects.sql rdf_void.sql rdflddir2.sql
+
+rm -f sql_code.c sql_code_1.c sql_code_ws.c sql_code_repl.c sql_code_dav.c sql_code_ddk.c sql_code_sys.c sql_code_uddi.c
+rm -f sql_code_imsg.c sql_code_auto.c sql_code_adm.c sql_code_2pc.c sql_code_vdb.c sql_code_pldbg.c
+rm -f sql_code_vad.c sql_code_dbp.c sql_code_sparql.c
+
+gawk -f sql_to_c.awk -v pl_stats=PLDBG %SQL_FILES% > sql_code.c
+gawk -f sql_to_c.awk -v init_name=_1 -v pl_stats=PLDBG %SQL_FILES_1% > sql_code_1.c
+gawk -f sql_to_c.awk -v init_name=_ws -v pl_stats=PLDBG %SQL_FILES_WS% > sql_code_ws.c
+gawk -f sql_to_c.awk -v init_name=_repl -v pl_stats=PLDBG %SQL_FILES_REPL% > sql_code_repl.c
+gawk -f sql_to_c.awk -v init_name=_dav -v pl_stats=PLDBG %SQL_FILES_DAV% > sql_code_dav.c
+gawk -f sql_to_c.awk -v init_name=_ddk -v pl_stats=PLDBG %SQL_FILES_DDK% > sql_code_ddk.c
+gawk -f sql_to_c.awk -v init_name=_sys -v pl_stats=PLDBG %SQL_FILES_SYS% > sql_code_sys.c
+gawk -f sql_to_c.awk -v init_name=_uddi -v pl_stats=PLDBG %SQL_FILES_UDDI% > sql_code_uddi.c
+gawk -f sql_to_c.awk -v init_name=_imsg -v pl_stats=PLDBG %SQL_FILES_IMSG% > sql_code_imsg.c
+gawk -f sql_to_c.awk -v init_name=_auto -v pl_stats=PLDBG %SQL_FILES_AUTO% > sql_code_auto.c
+gawk -f sql_to_c.awk -v init_name=_adm -v pl_stats=PLDBG %SQL_FILES_ADM% > sql_code_adm.c
+gawk -f sql_to_c.awk -v init_name=_2pc -v pl_stats=PLDBG %SQL_FILES_2PC% > sql_code_2pc.c
+ at rem gawk -f sql_to_c.awk -v init_name=_blog -v pl_stats=PLDBG %SQL_FILES_BLOG% > sql_code_blog.c
+gawk -f sql_to_c.awk -v init_name=_vdb -v pl_stats=PLDBG %SQL_FILES_VDB% > sql_code_vdb.c
+gawk -f sql_to_c.awk -v init_name=_pldbg -v pl_stats=PLDBG %SQL_FILES_PLDBG% > sql_code_pldbg.c
+gawk -f sql_to_c.awk -v init_name=_vad -v pl_stats=PLDBG %SQL_FILES_VAD% > sql_code_vad.c
+gawk -f sql_to_c.awk -v init_name=_dbp -v pl_stats=PLDBG %SQL_FILES_DBP% > sql_code_dbp.c
+gawk -f sql_to_c.awk -v init_name=_sparql -v pl_stats=PLDBG %SQL_FILES_SPARQL% > sql_code_sparql.c
+
+gawk -f "jso_reformat.awk" -v "output_mode=h" -v "h_wrapper=__RDF_MAPPING_JSO_H" -v "init_name=rdf_mapping" rdf_mapping.jso > rdf_mapping_jso.h
+
+gawk -f "jso_reformat.awk" -v "output_mode=c" -v "init_name=rdf_mapping" rdf_mapping.jso > rdf_mapping_jso.c
+
+gawk -f "jso_reformat.awk" -v "output_mode=ttl" -v "init_name=rdf_mapping" rdf_mapping.jso > rdf_mapping_jso.ttl
+
+gawk -f "jso_reformat.awk" -v "output_mode=ttl-sample" -v "init_name=rdf_mapping" rdf_mapping.jso > rdf_mapping_jso.ttl-sample
+
+cd ../../binsrc/cached_resources
+bash cache_gen.sh > cached_resources.c
+cd ../../libsrc/Wi
+
+ at echo #include "sql_code_cache_impl.c" > sql_code_cache.c
+ at echo #include "../../binsrc/cached_resources/cached_resources.c" >> sql_code_cache.c
+
+bash list_lex_props.sh sparql_p.y sparql_lex_props.c
+bash list_lex_props.sh turtle_p.y turtle_lex_props.c
+
diff --git a/win32/threads.vcproj b/win32/threads.vcproj
new file mode 100644
index 0000000..c56c1e9
--- /dev/null
+++ b/win32/threads.vcproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="threads"
+ ProjectGUID="{B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\threads"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\threads/threads.pch"
+ AssemblerListingLocation="$(ConfigurationName)\threads/"
+ ObjectFile="$(ConfigurationName)\threads/"
+ ProgramDataBaseFileName="$(ConfigurationName)\threads/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threads.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\threads"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\threads/threads.pch"
+ AssemblerListingLocation="$(ConfigurationName)\threads/"
+ ObjectFile="$(ConfigurationName)\threads/"
+ ProgramDataBaseFileName="$(ConfigurationName)\threads/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threads.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Thread\sched_single.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_attr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_queue.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\timer_queue.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/threadw.vcproj b/win32/threadw.vcproj
new file mode 100644
index 0000000..e9a1971
--- /dev/null
+++ b/win32/threadw.vcproj
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="threadw"
+ ProjectGUID="{D3A2882C-410A-4F58-8ACE-A771888073E8}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\threadw"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\threadw/threadw.pch"
+ AssemblerListingLocation="$(ConfigurationName)\threadw/"
+ ObjectFile="$(ConfigurationName)\threadw/"
+ ProgramDataBaseFileName="$(ConfigurationName)\threadw/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threadw.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\threadw"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\threadw/threadw.pch"
+ AssemblerListingLocation="$(ConfigurationName)\threadw/"
+ ObjectFile="$(ConfigurationName)\threadw/"
+ ProgramDataBaseFileName="$(ConfigurationName)\threadw/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threadw.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Thread\io_unix.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\sched_winthread.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_attr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_queue.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_rwlock.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\timer_queue.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/tidy.vcproj b/win32/tidy.vcproj
new file mode 100644
index 0000000..220f8e6
--- /dev/null
+++ b/win32/tidy.vcproj
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="tidy"
+ ProjectGUID="{D9E130E1-7734-43DF-A7EF-15CD95E467EE}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\tidy"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin"
+ PreprocessorDefinitions="_SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\tidy/tidy.pch"
+ AssemblerListingLocation="$(ConfigurationName)\tidy/"
+ ObjectFile="$(ConfigurationName)\tidy/"
+ ProgramDataBaseFileName="$(ConfigurationName)\tidy/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\tidy.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\tidy"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc\Dk;..\libsrc;..\libsrc\util;..\libsrc\util\win32"
+ PreprocessorDefinitions="_SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(ConfigurationName)\tidy/"
+ ObjectFile="$(ConfigurationName)\tidy/"
+ ProgramDataBaseFileName="$(ConfigurationName)\tidy/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\tidy.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Tidy\attrs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\clean.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\config.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\entities.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\istack.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\lexer.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\localize.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\parser.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\pprint.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\tab2space.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\tags.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\tidy.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Tidy\html.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\platform.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/tpcc.vcproj b/win32/tpcc.vcproj
new file mode 100644
index 0000000..da994a0
--- /dev/null
+++ b/win32/tpcc.vcproj
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="tpcc"
+ ProjectGUID="{E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\tpcc"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/tpcc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\tpcc/tpcc.pch"
+ AssemblerListingLocation="$(ConfigurationName)\tpcc/"
+ ObjectFile="$(ConfigurationName)\tpcc/"
+ ProgramDataBaseFileName="$(ConfigurationName)\tpcc/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/tpcc.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/tpcc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\tpcc"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/tpcc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\tpcc/tpcc.pch"
+ AssemblerListingLocation="$(ConfigurationName)\tpcc/"
+ ObjectFile="$(ConfigurationName)\tpcc/"
+ ProgramDataBaseFileName="$(ConfigurationName)\tpcc/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/tpcc.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/tpcc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\tpcc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\tpccodbc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\tpcctrx.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\binsrc\tests\tpcc.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/tutorial_vad.vcproj b/win32/tutorial_vad.vcproj
new file mode 100644
index 0000000..3f63bf3
--- /dev/null
+++ b/win32/tutorial_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="tutorial_vad"
+ ProjectGUID="{EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="tutorial_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\tutorial_vad"
+ IntermediateDirectory="$(ConfigurationName)\tutorial_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\tutorial_vad"
+ IntermediateDirectory="$(ConfigurationName)\tutorial_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\tutorial\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\tutorial_dav.vad;$(InputDir)\tutorial_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\tutorial_dav.vad;$(InputDir)\tutorial_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/urlsimu.vcproj b/win32/urlsimu.vcproj
new file mode 100644
index 0000000..334ae51
--- /dev/null
+++ b/win32/urlsimu.vcproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="urlsimu"
+ ProjectGUID="{EF98F42A-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\urlsimu"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/urlsimu.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\urlsimu/urlsimu.pch"
+ AssemblerListingLocation="$(ConfigurationName)\urlsimu/"
+ ObjectFile="$(ConfigurationName)\urlsimu/"
+ ProgramDataBaseFileName="$(ConfigurationName)\urlsimu/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/urlsimu.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/urlsimu.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\urlsimu"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/urlsimu.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\urlsimu/urlsimu.pch"
+ AssemblerListingLocation="$(ConfigurationName)\urlsimu/"
+ ObjectFile="$(ConfigurationName)\urlsimu/"
+ ProgramDataBaseFileName="$(ConfigurationName)\urlsimu/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/urlsimu.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/urlsimu.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\urlsimu.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/util.vcproj b/win32/util.vcproj
new file mode 100644
index 0000000..c16fc90
--- /dev/null
+++ b/win32/util.vcproj
@@ -0,0 +1,631 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="util"
+ ProjectGUID="{031DB868-5294-4738-90BA-F80BB2CEA9DC}"
+ RootNamespace="util"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\util"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc\Xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\langfunc;..\libsrc\plugin,."
+ PreprocessorDefinitions="DLDAPI_WINDOWS;_SSL;YYTOKENTYPE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK;PCRE_STATIC"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\util/util.pch"
+ AssemblerListingLocation="$(ConfigurationName)\util/"
+ ObjectFile="$(ConfigurationName)\util/"
+ ProgramDataBaseFileName="$(ConfigurationName)\util/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\util.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\util"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\zlib;..\binsrc\driver;..\libsrc\langfunc;..\libsrc\plugin,."
+ PreprocessorDefinitions="DLDAPI_WINDOWS;_SSL;BIF_XML;_IMSG;VAD;YYTOKENTYPE;WINDOWS;INPROCESS_CLIENT;_MBCS;WIN32;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK;PCRE_STATIC"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\util/util.pch"
+ AssemblerListingLocation="$(ConfigurationName)\util/"
+ ObjectFile="$(ConfigurationName)\util/"
+ ProgramDataBaseFileName="$(ConfigurationName)\util/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\util.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\util\buildarg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\cfg2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\cslentry.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\csllkup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\cslnment.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\dbgmal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\debug.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\dyntab.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_ucm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\expandav.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fnmatch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fnqual.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fnsearch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fntodos.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fnundos.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\getopt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\getopt1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\latin1ctype.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\login_digest.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\logmsg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\ltrim.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\make_env.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\mpl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\ncfg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\ntapp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\regerror.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\regexp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\regsub.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\rtrim.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\setext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\startup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\stpcpy.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strcpyin.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strerror.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\stricmp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strindex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strinsrt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strlwr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strnicmp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strquote.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strtok_r.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strupr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strxpect.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\win32\syslog.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\terminat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\ucm2enc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\usage.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\uuid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_mbrtowc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_mbsnrtowcs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_wcrtomb.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_wcs_mask.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_wcsnrtombs.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\libutil.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\uuid.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\uuidP.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="RegExp"
+ >
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_chartables.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_compile.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_config.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_dfa_exec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_exec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_fullinfo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_get.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_globals.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_newline.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_ord2utf8.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_study.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_tables.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_try_flipped.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_ucd.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_valid_utf8.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_version.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_xclass.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Langfunc sources"
+ >
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_basic.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_charsets.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_html.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_wide.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\langfunc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\langfunc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\langman.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\language__en_US.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\language__ru_RU.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\language__x_ViAny.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\language__x_ViDoc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3_all_chars.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3_lowers.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3_spaces.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3_uppers.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Plugin sources"
+ >
+ <File
+ RelativePath="..\libsrc\plugin\dlf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\exe_export.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\export_gate_virtuoso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\gate_virtuoso_stubs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\gate_virtuoso_stubs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\gen_all_gates.sh"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
bash gen_all_gates.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\export_gate_virtuoso.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
bash gen_all_gates.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\export_gate_virtuoso.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\plugin.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\plugin.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\plugin_win32.c"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/virtodbc.vcproj b/win32/virtodbc.vcproj
new file mode 100644
index 0000000..7410dd7
--- /dev/null
+++ b/win32/virtodbc.vcproj
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtodbc"
+ ProjectGUID="{3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtodbc"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/virtodbc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\virtodbc/virtodbc.pch"
+ AssemblerListingLocation="$(ConfigurationName)\virtodbc/"
+ ObjectFile="$(ConfigurationName)\virtodbc/"
+ ProgramDataBaseFileName="$(ConfigurationName)\virtodbc/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtodbc.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\virtodbc\virtodbc.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtodbc.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtodbc.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtodbc"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/virtodbc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\virtodbc/virtodbc.pch"
+ AssemblerListingLocation="$(ConfigurationName)\virtodbc/"
+ ObjectFile="$(ConfigurationName)\virtodbc/"
+ ProgramDataBaseFileName="$(ConfigurationName)\virtodbc/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtodbc.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtodbc\virtodbc.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtodbc.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtodbc.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\blobio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIodbc3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\CLIsql3_w32.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIuti.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\dialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\dlf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\kvlist.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\plugin_gate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.def"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\winctl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\wizard.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\zcbrowser.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\zcbrowsercombo.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.rc"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/virtoledb.vcproj b/win32/virtoledb.vcproj
new file mode 100644
index 0000000..0428c52
--- /dev/null
+++ b/win32/virtoledb.vcproj
@@ -0,0 +1,536 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtoledb"
+ ProjectGUID="{F357CF96-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtoledb"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/virtoledb.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;VIRTOLEDB_CLI"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\virtoledb/virtoledb.pch"
+ AssemblerListingLocation="$(ConfigurationName)\virtoledb/"
+ ObjectFile="$(ConfigurationName)\virtoledb/"
+ ProgramDataBaseFileName="$(ConfigurationName)\virtoledb/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="ole32.lib oleaut32.lib odbccp32.lib rpcrt4.lib gdi32.lib comdlg32.lib threads.lib dk1t.lib util.lib odbc32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtoledb.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\virtoledb\virtoledb.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtoledb.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtoledb.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtoledb"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/virtoledb.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;VIRTOLEDB_CLI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\virtoledb/virtoledb.pch"
+ AssemblerListingLocation="$(ConfigurationName)\virtoledb/"
+ ObjectFile="$(ConfigurationName)\virtoledb/"
+ ProgramDataBaseFileName="$(ConfigurationName)\virtoledb/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="ole32.lib oleaut32.lib odbccp32.lib rpcrt4.lib gdi32.lib comdlg32.lib threads.lib dk1t.lib util.lib odbc32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtoledb.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\virtoledb\virtoledb.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtoledb.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtoledb.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\virtoledb\asserts.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\baseobj.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\blobio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIodbc3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\CLIsql3_w32.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIuti.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\command.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\connobj.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\data.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\datalink.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\dataobj.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\datasource.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\db.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\dialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\dlf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\dllmodule.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\error.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\filedsn.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\globals.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\kvlist.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\lobdata.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\mresults.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\paramdata.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\plugin_gate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\properties.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\refcounted.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowset.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowsetdata.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowsetprops.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\session.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\syncobj.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\util.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.def"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\winctl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\wizard.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\zcbrowser.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\zcbrowsercombo.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\binsrc\virtoledb\asserts.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\baseobj.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\command.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\connobj.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\data.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\datalink.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\dataobj.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\db.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\dllmodule.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\error.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\filedsn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\headers.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\lobdata.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\os.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\paramdata.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\properties.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\refcounted.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\resource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowset.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowsetdata.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowsetprops.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\session.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\util.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\virtoledb.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\binsrc\virtoledb\virtoledb.rc"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/virtuoso-opensource.sln b/win32/virtuoso-opensource.sln
new file mode 100644
index 0000000..7478643
--- /dev/null
+++ b/win32/virtuoso-opensource.sln
@@ -0,0 +1,607 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blobs", "blobs.vcproj", "{72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bpel_vad", "bpel_vad.vcproj", "{3A2B317A-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "burstoff", "burstoff.vcproj", "{7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conductor_vad", "conductor_vad.vcproj", "{828BB6BA-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cursor", "cursor.vcproj", "{97D467CE-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cutter", "cutter.vcproj", "{6E10B655-C324-491F-B202-73565D6B30FB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demodb", "demodb.vcproj", "{CA03DBF1-2C7E-4732-8F41-65030876DDE7}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A} = {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A} = {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A} = {55215A1C-EFE2-11DA-85E2-A4E5714C712A}
+ {D3A2882C-410A-4F58-8ACE-A771888073E8} = {D3A2882C-410A-4F58-8ACE-A771888073E8}
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {6260E42E-239D-11DB-9594-FD7021681415} = {6260E42E-239D-11DB-9594-FD7021681415}
+ {40062448-EFE0-11DA-85E2-A4E5714C712A} = {40062448-EFE0-11DA-85E2-A4E5714C712A}
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A} = {8A49554A-EFE3-11DA-85E2-A4E5714C712A}
+ {6E10B655-C324-491F-B202-73565D6B30FB} = {6E10B655-C324-491F-B202-73565D6B30FB}
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A} = {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6} = {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A} = {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {C6451C76-DC57-11DB-930B-CD6B662399AA} = {C6451C76-DC57-11DB-930B-CD6B662399AA}
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A} = {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}
+ {408E2482-2623-11DB-9BB9-97600548391D} = {408E2482-2623-11DB-9BB9-97600548391D}
+ {408E2482-2623-11DB-9BB9-97600548391D} = {408E2482-2623-11DB-9BB9-97600548391D}
+ {408E2482-2623-11DB-9BB9-97600548391D} = {408E2482-2623-11DB-9BB9-97600548391D}
+ {351A8882-FD57-11DB-B29C-A18F012B09DC} = {351A8882-FD57-11DB-B29C-A18F012B09DC}
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64} = {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A} = {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}
+ {CDFD5FAC-FD70-11DB-B29C-A18F012B09DC} = {CDFD5FAC-FD70-11DB-B29C-A18F012B09DC}
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A} = {7DF920B2-EFDA-11DA-988C-EBAD6065650A}
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A} = {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}
+ {58867EBA-CA07-4F41-A966-6245FF14773E} = {58867EBA-CA07-4F41-A966-6245FF14773E}
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A} = {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}
+ {607116BE-F168-11DA-85E2-A4E5714C712A} = {607116BE-F168-11DA-85E2-A4E5714C712A}
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A} = {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A} = {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA} = {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F} = {A326A0DF-4F93-4DF6-813D-0B64F98B389F}
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE} = {D9E130E1-7734-43DF-A7EF-15CD95E467EE}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA} = {20D26EE8-E1BA-11DB-930B-CD6B662399AA}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837} = {0C234EF0-7725-4BDA-A1C3-47F5835A3837}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dk1t", "dk1t.vcproj", "{58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dksrv", "dksrv.vcproj", "{58867EBA-CA07-4F41-A966-6245FF14773E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc_vad", "doc_vad.vcproj", "{A9B1A466-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {6E10B655-C324-491F-B202-73565D6B30FB} = {6E10B655-C324-491F-B202-73565D6B30FB}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getdata", "getdata.vcproj", "{AFB15514-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_perl", "hosting_perl.vcproj", "{354809B6-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_python", "hosting_python.vcproj", "{B525A234-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "im", "im.vcproj", "{C152ADCC-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ins", "ins.vcproj", "{C6C66924-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql_native.vcproj", "{AFB1D909-86D0-49DE-8BD8-DF89349F934E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvirtuoso_t", "libvirtuoso_odbc_t.vcproj", "{FB836C59-41E1-48EA-A59B-460AB56587EE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D3A2882C-410A-4F58-8ACE-A771888073E8} = {D3A2882C-410A-4F58-8ACE-A771888073E8}
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64} = {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}
+ {58867EBA-CA07-4F41-A966-6245FF14773E} = {58867EBA-CA07-4F41-A966-6245FF14773E}
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE} = {D9E130E1-7734-43DF-A7EF-15CD95E467EE}
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837} = {0C234EF0-7725-4BDA-A1C3-47F5835A3837}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isqlo", "isql.vcproj", "{9FF2579E-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scroll", "scroll.vcproj", "{C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setcurs", "setcurs.vcproj", "{DCA407C4-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threads", "threads.vcproj", "{B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadw", "threadw.vcproj", "{D3A2882C-410A-4F58-8ACE-A771888073E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tidy", "tidy.vcproj", "{D9E130E1-7734-43DF-A7EF-15CD95E467EE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpcc", "tpcc.vcproj", "{E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_vad", "tutorial_vad.vcproj", "{EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A} = {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "urlsimu", "urlsimu.vcproj", "{EF98F42A-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{031DB868-5294-4738-90BA-F80BB2CEA9DC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtodbc", "virtodbc.vcproj", "{3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtoledb", "virtoledb.vcproj", "{F357CF96-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso_clr_t", "virtuoso_odbc_clr_t.vcproj", "{8D07389F-F48A-49B9-BED9-F71FCBACC4A8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso_javavm_t", "virtuoso_odbc_javavm_t.vcproj", "{02AD88A0-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso_sample_t", "virtuoso_odbc_sample_t.vcproj", "{0E838FA8-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso_t", "virtuoso_odbc_t.vcproj", "{F4E88BFA-FC96-439D-9E67-0A92AB541EE0}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D3A2882C-410A-4F58-8ACE-A771888073E8} = {D3A2882C-410A-4F58-8ACE-A771888073E8}
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64} = {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}
+ {58867EBA-CA07-4F41-A966-6245FF14773E} = {58867EBA-CA07-4F41-A966-6245FF14773E}
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE} = {D9E130E1-7734-43DF-A7EF-15CD95E467EE}
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837} = {0C234EF0-7725-4BDA-A1C3-47F5835A3837}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wi", "wi.vcproj", "{93051962-7797-49F0-8958-BB1CE60FFE6F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wic", "wic.vcproj", "{A66E395B-18EE-4877-8F0D-386A7BBAB370}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wikiv", "wikiv.vcproj", "{A326A0DF-4F93-4DF6-813D-0B64F98B389F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "xml.vcproj", "{0C234EF0-7725-4BDA-A1C3-47F5835A3837}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtmail", "odbcmail.vcproj", "{4C517D78-E5B9-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maildrop", "maildrop.vcproj", "{C5F98602-E5B9-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_framework_vad", "ods_vad.vcproj", "{7DF920B2-EFDA-11DA-988C-EBAD6065650A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_blog_vad", "blog_vad.vcproj", "{8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_wiki_vad", "wiki_vad.vcproj", "{40062448-EFE0-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {408E2482-2623-11DB-9BB9-97600548391D} = {408E2482-2623-11DB-9BB9-97600548391D}
+ {408E2482-2623-11DB-9BB9-97600548391D} = {408E2482-2623-11DB-9BB9-97600548391D}
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F} = {A326A0DF-4F93-4DF6-813D-0B64F98B389F}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_briefcase_vad", "briefcase_vad.vcproj", "{55215A1C-EFE2-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_feedmanager_vad", "feeds_vad.vcproj", "{441F1D0C-EFE3-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_bookmark_vad", "bookmark_vad.vcproj", "{8A49554A-EFE3-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_webmail_vad", "mail_vad.vcproj", "{B0058FA6-EFE3-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_gallery_vad", "gallery_vad.vcproj", "{BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_community_vad", "community_vad.vcproj", "{C0990F5A-EFE3-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_discussion_vad", "nntpf_vad.vcproj", "{607116BE-F168-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isparql_vad", "isparql_vad.vcproj", "{6260E42E-239D-11DB-9594-FD7021681415}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediawiki", "mediawiki.vcproj", "{408E2482-2623-11DB-9BB9-97600548391D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_polls_vad", "polls_vad.vcproj", "{FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A} = {7DF920B2-EFDA-11DA-988C-EBAD6065650A}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wbxml2", "wbxml2.vcproj", "{5582D8D0-DB93-11DB-930B-CD6B662399AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rdf_mappers_vad", "rdf_mappers.vcproj", "{C6451C76-DC57-11DB-930B-CD6B662399AA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "creolewiki", "creolewiki.vcproj", "{ABE43C46-E1C4-11DB-930B-CD6B662399AA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_calendar_vad", "calendar_vad.vcproj", "{351A8882-FD57-11DB-B29C-A18F012B09DC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_adressbook_vad", "ab_vad.vcproj", "{20D26EE8-E1BA-11DB-930B-CD6B662399AA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparql_demo_vad", "sparql_demo_vad.vcproj", "{CDFD5FAC-FD70-11DB-B29C-A18F012B09DC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_php", "hosting_php.vcproj", "{9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58867EBA-CA07-4F41-A966-6245FF14773E} = {58867EBA-CA07-4F41-A966-6245FF14773E}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hslookup", "hslookup.vcproj", "{14ECED18-FB38-11DC-8216-8B38A5565D8C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Win32.Build.0 = Debug|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Win32.ActiveCfg = Release|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Win32.Build.0 = Release|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Release|Win32.ActiveCfg = Release|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Win32.Build.0 = Debug|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Win32.ActiveCfg = Release|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Win32.Build.0 = Release|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Win32.Build.0 = Debug|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Win32.ActiveCfg = Release|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Win32.Build.0 = Release|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Win32.Build.0 = Debug|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Win32.ActiveCfg = Release|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Win32.Build.0 = Release|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Win32.Build.0 = Debug|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Win32.ActiveCfg = Release|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Win32.Build.0 = Release|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Win32.Build.0 = Debug|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Win32.ActiveCfg = Release|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Win32.Build.0 = Release|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Win32.Build.0 = Debug|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Win32.ActiveCfg = Release|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Win32.Build.0 = Release|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Win32.Build.0 = Debug|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Win32.ActiveCfg = Release|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Win32.Build.0 = Release|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Win32.Build.0 = Debug|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Win32.ActiveCfg = Release|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Win32.Build.0 = Release|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Win32.Build.0 = Debug|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Win32.ActiveCfg = Release|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Win32.Build.0 = Release|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Win32.Build.0 = Debug|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Win32.ActiveCfg = Release|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Win32.Build.0 = Release|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Win32.Build.0 = Debug|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Win32.ActiveCfg = Release|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Win32.Build.0 = Release|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Win32.Build.0 = Debug|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Win32.ActiveCfg = Release|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Win32.Build.0 = Release|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Win32.Build.0 = Debug|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Win32.ActiveCfg = Release|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Win32.Build.0 = Release|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Win32.Build.0 = Debug|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Win32.ActiveCfg = Release|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Win32.Build.0 = Release|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Win32.ActiveCfg = Debug|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Win32.Build.0 = Debug|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Win32.ActiveCfg = Release|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Win32.Build.0 = Release|Win32
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Release|Win32.ActiveCfg = Release|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Release|Win32.ActiveCfg = Release|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {6260E42E-239D-11DB-9594-FD7021681415}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6260E42E-239D-11DB-9594-FD7021681415}.Release|Win32.ActiveCfg = Release|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|Win32.ActiveCfg = Release|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|Win32.Build.0 = Release|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Win32.Build.0 = Release|Win32
+ {C6451C76-DC57-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C6451C76-DC57-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Win32.Build.0 = Release|Win32
+ {351A8882-FD57-11DB-B29C-A18F012B09DC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {351A8882-FD57-11DB-B29C-A18F012B09DC}.Release|Win32.ActiveCfg = Release|Win32
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {20D26EE8-E1BA-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
+ {CDFD5FAC-FD70-11DB-B29C-A18F012B09DC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CDFD5FAC-FD70-11DB-B29C-A18F012B09DC}.Release|Win32.ActiveCfg = Release|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Win32.ActiveCfg = Release|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Win32.Build.0 = Release|Win32
+ {14ECED18-FB38-11DC-8216-8B38A5565D8C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {14ECED18-FB38-11DC-8216-8B38A5565D8C}.Debug|Win32.Build.0 = Debug|Win32
+ {14ECED18-FB38-11DC-8216-8B38A5565D8C}.Release|Win32.ActiveCfg = Release|Win32
+ {14ECED18-FB38-11DC-8216-8B38A5565D8C}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/win32/virtuoso_odbc_clr_t.vcproj b/win32/virtuoso_odbc_clr_t.vcproj
new file mode 100644
index 0000000..8fed7c2
--- /dev/null
+++ b/win32/virtuoso_odbc_clr_t.vcproj
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtuoso_clr_t"
+ ProjectGUID="{8D07389F-F48A-49B9-BED9-F71FCBACC4A8}"
+ RootNamespace="virtuoso_clr_t"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtuoso_clr_t"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/STACK:100000,50000"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib advapi32.lib Mscoree.lib"
+ OutputFile="$(OutDir)/virtuoso-clr-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ ModuleDefinitionFile="..\binsrc\hosting\mono\clr.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_clr_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtuoso_clr_t"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/STACK:100000,50000"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib advapi32.lib Mscoree.lib"
+ OutputFile="$(OutDir)/virtuoso-clr-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ ModuleDefinitionFile="..\binsrc\hosting\mono\clr.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_clr_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\mono\basec.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\dotnet.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\sql_code_clr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\sql_code_xslt.c"
+ >
+ </File>
+ <File
+ RelativePath=".\virtuoso_t.rc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <Filter
+ Name="PreBuild"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\mono\import_clr.sql"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG import_clr.sql > sql_code_clr.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG import_clr.sql > sql_code_clr.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\mono_type.xsl"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG mono_type.xsl > sql_code_xslt.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG mono_type.xsl > sql_code_xslt.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\virtclr.cs"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

csc /t:library /out:$(TargetDir)/virtclr.dll $(InputFileName)
csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
gacutil -u virt_http
gacutil -i $(TargetDir)/virt_http.dll

cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\virt_http.cs"
+ Outputs="$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

csc /t:library /out:$(TargetDir)/virtclr.dll $(InputFileName)
csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
gacutil -u virt_http
gacutil -i $(TargetDir)/virt_http.dll

cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\virt_http.cs"
+ Outputs="$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/virtuoso_odbc_javavm_t.vcproj b/win32/virtuoso_odbc_javavm_t.vcproj
new file mode 100644
index 0000000..e97a780
--- /dev/null
+++ b/win32/virtuoso_odbc_javavm_t.vcproj
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtuoso_javavm_t"
+ ProjectGUID="{02AD88A0-CF7B-11DA-85E2-A4E5714C712A}"
+ RootNamespace="virtuoso_javavm_t"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtuoso_javavm_t"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(JDK_PATH_I386)\include";..\libsrc\xml.new;..\libsrc;"$(JDK_PATH)\include\win32";..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib "$(JDK_PATH_I386)\lib\jvm.lib""
+ OutputFile="$(OutDir)/virtuoso-javavm-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_javavm_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtuoso_javavm_t"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories=""$(JDK_PATH_I386)\include";..\libsrc\xml.new;..\libsrc;"$(JDK_PATH)\include\win32";..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib "$(JDK_PATH_I386)\lib\jvm.lib""
+ OutputFile="$(OutDir)/virtuoso-javavm-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_javavm_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\binsrc\tests\biftest\java_code.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\javavm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\sql_code_clr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\sql_code_javavm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\sql_code_xslt.c"
+ >
+ </File>
+ <File
+ RelativePath=".\virtuoso_t.rc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <Filter
+ Name="PreBuild"
+ >
+ <File
+ RelativePath="..\binsrc\tests\biftest\import_clr.sql"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG import_clr.sql > sql_code_clr.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG import_clr.sql > sql_code_clr.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\javavm_type.xsl"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG javavm_type.xsl > sql_code_xslt.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG javavm_type.xsl > sql_code_xslt.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\javavm_xml.sql"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_javavm.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_javavm.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_javavm.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_javavm.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/virtuoso_odbc_sample_t.vcproj b/win32/virtuoso_odbc_sample_t.vcproj
new file mode 100644
index 0000000..85e2c37
--- /dev/null
+++ b/win32/virtuoso_odbc_sample_t.vcproj
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtuoso_sample_t"
+ ProjectGUID="{0E838FA8-CF7B-11DA-85E2-A4E5714C712A}"
+ RootNamespace="virtuoso_sample_t"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtuoso_sample_t"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(OutDir)/virtuoso-sample-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_sample_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtuoso_sample_t"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(OutDir)/virtuoso-sample-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_sample_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\binsrc\tests\biftest\bif_sample.c"
+ >
+ </File>
+ <File
+ RelativePath=".\virtuoso_t.rc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/virtuoso_odbc_t.vcproj b/win32/virtuoso_odbc_t.vcproj
new file mode 100644
index 0000000..fb41750
--- /dev/null
+++ b/win32/virtuoso_odbc_t.vcproj
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtuoso_t"
+ ProjectGUID="{F4E88BFA-FC96-439D-9E67-0A92AB541EE0}"
+ RootNamespace="virtuoso_t"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtuoso_t"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/virtuoso_t.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;PACKAGE_VERSION=\"6.1.3\""
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\virtuoso_t/virtuoso_t.pch"
+ AssemblerListingLocation="$(ConfigurationName)\virtuoso_t/"
+ ObjectFile="$(ConfigurationName)\virtuoso_t/"
+ ProgramDataBaseFileName="$(ConfigurationName)\virtuoso_t/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ AdditionalIncludeDirectories="..\openlink\include;..\xOs\stubs"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtuoso-t.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtuoso_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\virtuoso_t"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/virtuoso_t.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="PACKAGE_VERSION=\"6.1.3\";_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\virtuoso_t/virtuoso_t.pch"
+ AssemblerListingLocation="$(ConfigurationName)\virtuoso_t/"
+ ObjectFile="$(ConfigurationName)\virtuoso_t/"
+ ProgramDataBaseFileName="$(ConfigurationName)\virtuoso_t/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ AdditionalIncludeDirectories="..\openlink\include;..\xOs\stubs"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtuoso-t.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtuoso_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\virtuoso\viconfig.c"
+ >
+ </File>
+ <File
+ RelativePath=".\virtuoso_t.rc"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1033"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\virtuoso\viwin32.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath=".\resource.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\binsrc\virtuoso\viwin32.ico"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/wbxml2.vcproj b/win32/wbxml2.vcproj
new file mode 100644
index 0000000..5b35679
--- /dev/null
+++ b/win32/wbxml2.vcproj
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wbxml2"
+ ProjectGUID="{5582D8D0-DB93-11DB-930B-CD6B662399AA}"
+ RootNamespace="wbxml2"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wbxml2"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/wbxml2.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;.;.\wbxml2\src;.\wbxml2\win32\expat"
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;LIBWBXML2_EXPORTS;WBXML_LIB_VERBOSE;WBXML_SUPPORT_WML;WBXML_SUPPORT_WTA;WBXML_SUPPORT_SI;WBXML_SUPPORT_SL;WBXML_SUPPORT_CO;WBXML_SUPPORT_PROV;WBXML_SUPPORT_EMN;WBXML_SUPPORT_DRMREL;WBXML_SUPPORT_OTA_SETTINGS;WBXML_SUPPORT_SYNCML;WBXML_SUPPORT_WV;WBXML_ENCODER_USE_STRTBL;HAVE_EXPAT;WBXML_WRAPPERS"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\wbxml2/wbxml2.pch"
+ AssemblerListingLocation="$(ConfigurationName)\wbxml2/"
+ ObjectFile="$(ConfigurationName)\wbxml2/"
+ ProgramDataBaseFileName="$(ConfigurationName)\wbxml2/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib libwbxml2.lib"
+ OutputFile="$(ConfigurationName)/wbxml2.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl;.\wbxml2\win32\expat\;.\wbxml2\win32\libwbxml2\Release\"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\wbxml2\wbxml2.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/wbxml2.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/wbxml2.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wbxml2"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/wbxml2.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,.;$(WBXML2_PATH)\src;$(WBXML2_PATH)\win32\expat"
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;LIBWBXML2_EXPORTS;WBXML_LIB_VERBOSE;WBXML_SUPPORT_WML;WBXML_SUPPORT_WTA;WBXML_SUPPORT_SI;WBXML_SUPPORT_SL;WBXML_SUPPORT_CO;WBXML_SUPPORT_PROV;WBXML_SUPPORT_EMN;WBXML_SUPPORT_DRMREL;WBXML_SUPPORT_OTA_SETTINGS;WBXML_SUPPORT_SYNCML;WBXML_SUPPORT_WV;WBXML_ENCODER_USE_STRTBL;HAVE_EXPAT;WBXML_WRAPPERS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\wbxml2/wbxml2.pch"
+ AssemblerListingLocation="$(ConfigurationName)\wbxml2/"
+ ObjectFile="$(ConfigurationName)\wbxml2/"
+ ProgramDataBaseFileName="$(ConfigurationName)\wbxml2/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib libwbxml2.lib"
+ OutputFile="$(ConfigurationName)/wbxml2.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl;"$(WBXML2_PATH)\win32\expat\";"$(WBXML2_PATH)\win32\libwbxml2\Debug\""
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\wbxml2\wbxml2.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/wbxml2.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/wbxml2.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\samples\wbxml2\wbxml2.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/wi.vcproj b/win32/wi.vcproj
new file mode 100644
index 0000000..24fecfa
--- /dev/null
+++ b/win32/wi.vcproj
@@ -0,0 +1,1792 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wi"
+ ProjectGUID="{93051962-7797-49F0-8958-BB1CE60FFE6F}"
+ RootNamespace="wi"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wi"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\zlib;..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\tidy;..\binsrc\driver;."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;YY_NO_UNISTD_H;PCRE_STATIC;OLD_TIDY"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\wi/wi.pch"
+ AssemblerListingLocation="$(ConfigurationName)\wi/"
+ ObjectFile="$(ConfigurationName)\wi/"
+ ProgramDataBaseFileName="$(ConfigurationName)\wi/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="YYDEBUG"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wi.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wi"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\zlib;..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\tidy;..\binsrc\driver;."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;YY_NO_UNISTD_H;PCRE_STATIC"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\wi/wi.pch"
+ AssemblerListingLocation="$(ConfigurationName)\wi/"
+ ObjectFile="$(ConfigurationName)\wi/"
+ ProgramDataBaseFileName="$(ConfigurationName)\wi/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="YYDEBUG"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wi.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\2pc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\aqueue.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\arith.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\auxfiles.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_audio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_crypto.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_date.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_dav.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_diff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_explain.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_file.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_gnw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_imap.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_intl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_json.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_kerberoscli.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_ldapcli.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_mts.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_nntp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_phrasematch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_pop3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_regexp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_repl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_smtp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_soap.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_text.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_tidy.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_uuencode.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_xml.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_xper.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bitmap.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\blob.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\blobio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\cl_stubs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\crypt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\ddlrun.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\disk.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\dks_esc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\eqlcomp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\extent.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\gate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\hash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\hosting.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\http.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\http_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\insert.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\inxop.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\jso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\json_l.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\json_p.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\lisprdr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\lock.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\log.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\map_schema.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\map_schema.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\meta.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mtwrite.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\neodisk.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\nquad_p.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\obackup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\odbccat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\page.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\pldebug.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\plugin_loader.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdf_core.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdf_mapping_jso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdfbox.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdfinf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdfxml_parser.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\recovery.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\regist.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rltrx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\row.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\schspace.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\scn3_vsnet.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\search.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\search_in.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\security.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\shcompo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\shuric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sort.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\space.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql2sql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql2sqltext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_core.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_l.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_p.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_qm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_rdb2rdf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_sff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_tree.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparqld.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparul2sql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql3_vc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_1.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_2pc.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_adm.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_auto.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_blog.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_cache.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_cache_impl.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_dav.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_dbp.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_ddk.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_imsg.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_pldbg.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_repl.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_sparql.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_sys.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_uddi.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_vad.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_vdb.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_ws.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlbif.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlbif2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcomp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcomp2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcost.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqldf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlexp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlgen.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlhash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlintrp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlinx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloby.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlocr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloinv.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloinx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloprt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlorder.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlovdb.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlpfn.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlprocc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlprt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrbuf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrcomp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrrun.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrun.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlsrv.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlstmts.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqltrig.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqltype.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlver.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlview.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvmultibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvstat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\string.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\subseq.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\text.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\trans.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_l.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_p.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\uname_const_decl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\update.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\uuencode.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wiservic.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc-dec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc_algos.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmllazy.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlschema.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlsearch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlsql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmltree.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpath.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpathp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpscn_vsnet.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xqf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xslt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xslt_fmt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xslt_opt.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\2pc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\2pc_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\arith.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_text.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_xper.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\blobio.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLI.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\crsr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\date.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\eqlcomp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\http.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\iodbcinst.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\ksrvext.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\license.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\lisprdr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\list2.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\log.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\ltrx.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_com.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\odbcinc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\remote.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\repl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\replsr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\security.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_p.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql3.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlbif.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcmps.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcomp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlfn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlintrp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlnode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlo.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlocr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlofn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlopcod.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlpar.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlparext.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlpfn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrcomp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqltype.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqltype_c.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlver.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlwords.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvmultibyte.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\text.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_p.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\uuencode_impl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\virtext.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\widd.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\widisk.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\widv.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wifn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wiservic.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xml.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlgen.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlnode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlres.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmltree.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpath.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpathp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpathp_impl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xqf.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="PreBuild"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\json.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f json_l.c
flex -Pjsonyy -ojson_l.c $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)json_p.h"
+ Outputs="$(InputDir)json_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f json_l.c
flex -Pjsonyy -ojson_l.c $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)json_p.h"
+ Outputs="$(InputDir)json_l.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\json.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f json_p.c
rm -f json_p.h
bison -y -vd -pjsonyy json.y -ojson_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)json_p.c;$(InputDir)json_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f json_p.c
rm -f json_p.h
bison -y -vd -pjsonyy json.y -ojson_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)json_p.c;$(InputDir)json_p.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\nquad_p.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f nquad_p.c
rm -f nquad_p.h
bison -y -vd -pnqyy nquad_p.y -onquad_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)nquad_p.c;$(InputDir)nquad_p.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\scn3.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f scn3_vsnet.c
flex -oscn3_vsnet.c $(InputPath)
flex -Pscn3splityy -oscn3split.c $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)sql3.h"
+ Outputs="$(InputDir)scn3_vsnet.c;$(InputDir)scn3split.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f scn3_vsnet.c
flex -oscn3_vsnet.c $(InputPath)
flex -Pscn3splityy -oscn3split.c $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)sql3.h"
+ Outputs="$(InputDir)scn3_vsnet.c;$(InputDir)scn3split.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_l.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_l.c
flex -8 -Psparyy -osparql_l.c $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)sparql_p.h"
+ Outputs="$(InputDir)sparql_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_l.c
flex -8 -Psparyy -osparql_l.c $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)sparql_p.h"
+ Outputs="$(InputDir)sparql_l.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_p.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_p.c
rm -f sparql_p.h
bison -y -vd -psparyy sparql_p.y -osparql_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_p.c;$(InputDir)sparql_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_p.c
rm -f sparql_p.h
bison -y -vd -psparyy sparql_p.y -osparql_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_p.c;$(InputDir)sparql_p.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql3.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sql3.c
rm -f sql3.h
bison -y -vd sql3.y -osql3.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sql3.c;$(InputDir)sql3.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sql3.c
rm -f sql3.h
bison -y -vd sql3.y -osql3.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sql3.c;$(InputDir)sql3.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_to_c.awk"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
$(ProjectDir)\sqlcode.bat
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\..\..\binsrc\vspx\vspx.xsl"
+ Outputs="$(InputDir)\sql_code.c;$(InputDir)\sql_code_1.c;$(InputDir)\sql_code_ddk.c;$(InputDir)\sql_code_adm.c;$(InputDir)\sql_code_dav.c;$(InputDir)\sql_code_vad.c;$(InputDir)\sql_code_dbp.c;$(InputDir)\sql_code_uddi.c;$(InputDir)\sql_code_imsg.c;$(InputDir)\sql_code_auto.c;$(InputDir)\sql_code_2pc.c;$(InputDir)\rdf_mapping_jso.h;$(InputDir)\rdf_mapping_jso.c;$(InputDir)\rdf_mapping_jso.ttl;$(InputDir)\rdf_mapping_jso.ttl-sample"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
$(ProjectDir)\sqlcode.bat
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\..\..\binsrc\vspx\vspx.xsl"
+ Outputs="$(InputDir)\sql_code.c;$(InputDir)\sql_code_1.c;$(InputDir)\sql_code_ddk.c;$(InputDir)\sql_code_adm.c;$(InputDir)\sql_code_dav.c;$(InputDir)\sql_code_vad.c;$(InputDir)\sql_code_dbp.c;$(InputDir)\sql_code_uddi.c;$(InputDir)\sql_code_imsg.c;$(InputDir)\sql_code_auto.c;$(InputDir)\sql_code_2pc.c;$(InputDir)\rdf_mapping_jso.h;$(InputDir)\rdf_mapping_jso.c;$(InputDir)\rdf_mapping_jso.ttl;$(InputDir)\rdf_mapping_jso.ttl-sample"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlwords.gperf"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sqlwords.h
gperf -aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$ sqlwords.gperf -Nlex_hash_kw | sed -e 's/char \*keyword/char *keiiyword/g' >sqlwords.h
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sqlwords.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sqlwords.h
gperf -aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$ sqlwords.gperf -Nlex_hash_kw | sed -e 's/char \*keyword/char *keiiyword/g' >sqlwords.h
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sqlwords.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_l.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_l.c
flex -8 -Pttlyy -oturtle_l.c $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)turtle_p.h"
+ Outputs="$(InputDir)turtle_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_l.c
flex -8 -Pttlyy -oturtle_l.c $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)turtle_p.h"
+ Outputs="$(InputDir)turtle_l.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_p.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_p.c
rm -f turtle_p.h
bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_p.c;$(InputDir)turtle_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_p.c
rm -f turtle_p.h
bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_p.c;$(InputDir)turtle_p.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpathp.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpathp.c
rm -f xpathp.h
bison -y -vd -pxpyy xpathp.y -oxpathp.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpathp.c;$(InputDir)xpathp.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpathp.c
rm -f xpathp.h
bison -y -vd -pxpyy xpathp.y -oxpathp.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpathp.c;$(InputDir)xpathp.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpscn.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpscn_vsnet.c
flex -i -oxpscn_vsnet.c -Pxpyy $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)xpathp.h"
+ Outputs="$(InputDir)xpscn_vsnet.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpscn_vsnet.c
flex -i -oxpscn_vsnet.c -Pxpyy $(InputPath)
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)xpathp.h"
+ Outputs="$(InputDir)xpscn_vsnet.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/wic.vcproj b/win32/wic.vcproj
new file mode 100644
index 0000000..6af1d08
--- /dev/null
+++ b/win32/wic.vcproj
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wic"
+ ProjectGUID="{A66E395B-18EE-4877-8F0D-386A7BBAB370}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wic"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\wic/wic.pch"
+ AssemblerListingLocation="$(ConfigurationName)\wic/"
+ ObjectFile="$(ConfigurationName)\wic/"
+ ProgramDataBaseFileName="$(ConfigurationName)\wic/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wic.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wic"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\wic/wic.pch"
+ AssemblerListingLocation="$(ConfigurationName)\wic/"
+ ObjectFile="$(ConfigurationName)\wic/"
+ ProgramDataBaseFileName="$(ConfigurationName)\wic/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wic.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\blobio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIodbc3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql3W.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIuti.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\dlf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\pldbgcli.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\plugin_gate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpc.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\wirpce.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/wiki_vad.vcproj b/win32/wiki_vad.vcproj
new file mode 100644
index 0000000..a210a78
--- /dev/null
+++ b/win32/wiki_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_wiki_vad"
+ ProjectGUID="{40062448-EFE0-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_wiki_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_wiki_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_wiki_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_wiki_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_wiki_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_wiki_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_wiki_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/wikiv.vcproj b/win32/wikiv.vcproj
new file mode 100644
index 0000000..a28e44a
--- /dev/null
+++ b/win32/wikiv.vcproj
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wikiv"
+ ProjectGUID="{A326A0DF-4F93-4DF6-813D-0B64F98B389F}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wikiv"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/wikiv.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\wikiv/wikiv.pch"
+ AssemblerListingLocation="$(ConfigurationName)\wikiv/"
+ ObjectFile="$(ConfigurationName)\wikiv/"
+ ProgramDataBaseFileName="$(ConfigurationName)\wikiv/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/wikiv.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\wikiv.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/wikiv.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/wikiv.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wikiv"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/wikiv.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\wikiv/wikiv.pch"
+ AssemblerListingLocation="$(ConfigurationName)\wikiv/"
+ ObjectFile="$(ConfigurationName)\wikiv/"
+ ProgramDataBaseFileName="$(ConfigurationName)\wikiv/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/wikiv.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\wikiv.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/wikiv.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/wikiv.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\maclex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\wikilex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\wikiv.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ <Filter
+ Name="LexFiles"
+ >
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\maclex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f maclex.c
flex -8 -Pmacyy -omaclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f maclex.c
flex -8 -Pmacyy -omaclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\maclex.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\wikilex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f wikilex.c
flex -8 -Pwikiyy -owikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f wikilex.c
flex -8 -Pwikiyy -owikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\wikilex.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/xml.vcproj b/win32/xml.vcproj
new file mode 100644
index 0000000..ce536f9
--- /dev/null
+++ b/win32/xml.vcproj
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="xml"
+ ProjectGUID="{0C234EF0-7725-4BDA-A1C3-47F5835A3837}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\xml"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,..\libsrc\util\pcrelib"
+ PreprocessorDefinitions="_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\xml/xml.pch"
+ AssemblerListingLocation="$(ConfigurationName)\xml/"
+ ObjectFile="$(ConfigurationName)\xml/"
+ ProgramDataBaseFileName="$(ConfigurationName)\xml/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="XML_NS"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\xml.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\xml"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\libsrc\langfunc,..\libsrc\plugin,..\libsrc\util\pcrelib"
+ PreprocessorDefinitions="_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\xml/xml.pch"
+ AssemblerListingLocation="$(ConfigurationName)\xml/"
+ ObjectFile="$(ConfigurationName)\xml/"
+ ProgramDataBaseFileName="$(ConfigurationName)\xml/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="XML_NS"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\xml.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Xml.new\charclasses.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\datatypes.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\dtd.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\encodings.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\html_mode.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\schema.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\schema_fsm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xml_ecm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlgram.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlparser.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlread.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Xml.new\charclasses.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\encodings.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\html_mode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\schema.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xml_ecm.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlparser.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlparser_impl.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/zlib.vcproj b/win32/zlib.vcproj
new file mode 100644
index 0000000..6190f12
--- /dev/null
+++ b/win32/zlib.vcproj
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="zlib"
+ ProjectGUID="{86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\zlib"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\zlib/zlib.pch"
+ AssemblerListingLocation="$(ConfigurationName)\zlib/"
+ ObjectFile="$(ConfigurationName)\zlib/"
+ ProgramDataBaseFileName="$(ConfigurationName)\zlib/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\zlib.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\zlib"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\zlib"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\zlib/zlib.pch"
+ AssemblerListingLocation="$(ConfigurationName)\zlib/"
+ ObjectFile="$(ConfigurationName)\zlib/"
+ ProgramDataBaseFileName="$(ConfigurationName)\zlib/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\zlib.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\zlib\adler32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\compress.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\crc32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\deflate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\gzio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\infback.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\inffast.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\inflate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\inftrees.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\trees.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\uncompr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\zutil.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/blobs.vcproj b/win64/blobs.vcproj
new file mode 100644
index 0000000..b05f1ca
--- /dev/null
+++ b/win64/blobs.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="blobs"
+ ProjectGUID="{72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/blobs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/blobs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/blobs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/blobs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/blobs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/blobs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/blobs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/blobs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/blobs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/blobs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/blobs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/blobs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\blobs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/blog_vad.vcproj b/win64/blog_vad.vcproj
new file mode 100644
index 0000000..ecd391b
--- /dev/null
+++ b/win64/blog_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="blog_vad"
+ ProjectGUID="{8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}"
+ RootNamespace="ods_blog_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_blog_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_blog_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_blog_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_blog_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Blog\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_blog_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_blog_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/bookmark_vad.vcproj b/win64/bookmark_vad.vcproj
new file mode 100644
index 0000000..fde6f65
--- /dev/null
+++ b/win64/bookmark_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="bookmark_vad"
+ ProjectGUID="{8A49554A-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_bookmark_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_bookmark_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_bookmark_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_bookmark_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_bookmark_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Bookmark\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_bookmark_dav.vad;$(InputDir)\ods_bookmark_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_bookmark_dav.vad;$(InputDir)\ods_bookmark_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/bpel_vad.vcproj b/win64/bpel_vad.vcproj
new file mode 100644
index 0000000..4f8a71d
--- /dev/null
+++ b/win64/bpel_vad.vcproj
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="bpel_vad"
+ ProjectGUID="{3A2B317A-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="bpel_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\bpel\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\bpel_dav.vad;$(InputDir)\bpel_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\bpel_dav.vad;$(InputDir)\bpel_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\bpel_dav.vad;$(InputDir)\bpel_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\bpel_dav.vad;$(InputDir)\bpel_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/briefcase_vad.vcproj b/win64/briefcase_vad.vcproj
new file mode 100644
index 0000000..76399a0
--- /dev/null
+++ b/win64/briefcase_vad.vcproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="briefcase_vad"
+ ProjectGUID="{55215A1C-EFE2-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_briefcase_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_briefcase_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_briefcase_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_briefcase_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_briefcase_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Briefcase\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\ods_briefcase_dav.vad;$(InputDir)\ods_briefcase_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_briefcase_dav.vad;$(InputDir)\ods_briefcase_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/burstoff.vcproj b/win64/burstoff.vcproj
new file mode 100644
index 0000000..e78e75a
--- /dev/null
+++ b/win64/burstoff.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="burstoff"
+ ProjectGUID="{7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/burstoff.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/burstoff.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/burstoff.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/burstoff.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/burstoff.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/burstoff.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/burstoff.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/burstoff.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/burstoff.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/burstoff.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/burstoff.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/burstoff.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\burstoff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/community_vad.vcproj b/win64/community_vad.vcproj
new file mode 100644
index 0000000..0af624b
--- /dev/null
+++ b/win64/community_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="community_vad"
+ ProjectGUID="{C0990F5A-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_community_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_community_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_community_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_community_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_community_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Community\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_community_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_community_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/conductor_vad.vcproj b/win64/conductor_vad.vcproj
new file mode 100644
index 0000000..dcb3d73
--- /dev/null
+++ b/win64/conductor_vad.vcproj
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="conductor_vad"
+ ProjectGUID="{828BB6BA-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="conductor_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\yacutia\mkvad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash mkvad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\conductor_dav.vad;$(InputDir)\conductor_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash mkvad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\conductor_dav.vad;$(InputDir)\conductor_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash mkvad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\conductor_dav.vad;$(InputDir)\conductor_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash mkvad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\conductor_dav.vad;$(InputDir)\conductor_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/cursor.vcproj b/win64/cursor.vcproj
new file mode 100644
index 0000000..5b33a93
--- /dev/null
+++ b/win64/cursor.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="cursor"
+ ProjectGUID="{97D467CE-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/cursor.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/cursor.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cursor.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/cursor.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/cursor.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cursor.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/cursor.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/cursor.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cursor.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/cursor.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/cursor.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cursor.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\cursor.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/cutter.vcproj b/win64/cutter.vcproj
new file mode 100644
index 0000000..30c00af
--- /dev/null
+++ b/win64/cutter.vcproj
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="cutter"
+ ProjectGUID="{6E10B655-C324-491F-B202-73565D6B30FB}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/cutter.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_CONSOLE,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ OutputFile="$(ConfigurationName)/cutter.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cutter.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/cutter.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_CONSOLE,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)/cutter.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cutter.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/cutter.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ OutputFile="$(ConfigurationName)/cutter.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cutter.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/cutter.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)/cutter.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/cutter.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\sqldoc\cutter.c"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/demodb.vcproj b/win64/demodb.vcproj
new file mode 100644
index 0000000..8909889
--- /dev/null
+++ b/win64/demodb.vcproj
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="demodb"
+ ProjectGUID="{CA03DBF1-2C7E-4732-8F41-65030876DDE7}"
+ RootNamespace="demodb"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\samples\demo\mkdemo.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set SRC=$(ProjectDir)\..\
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
rmdir /S /Q docsrc
bash mkdemo.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe;..\binsrc\bpel\bpel_dav.vad;..\binsrc\yacutia\conductor_dav.vad;..\binsrc\samples\demo\doc_dav.vad;..\binsrc\tutorial\tutorial_dav.vad"
+ Outputs="$(InputDir)\demo.db"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set SRC=$(ProjectDir)\..\
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
rmdir /S /Q docsrc
bash mkdemo.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe;..\binsrc\bpel\bpel_dav.vad;..\binsrc\yacutia\conductor_dav.vad;..\binsrc\samples\demo\doc_dav.vad;..\binsrc\tutorial\tutorial_dav.vad"
+ Outputs="$(InputDir)\demo.db"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set SRC=$(ProjectDir)\..\
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
rmdir /S /Q docsrc
bash mkdemo.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe;..\binsrc\bpel\bpel_dav.vad;..\binsrc\yacutia\conductor_dav.vad;..\binsrc\samples\demo\doc_dav.vad;..\binsrc\tutorial\tutorial_dav.vad"
+ Outputs="$(InputDir)\demo.db"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set SRC=$(ProjectDir)\..\
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
rmdir /S /Q docsrc
bash mkdemo.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe;..\binsrc\bpel\bpel_dav.vad;..\binsrc\yacutia\conductor_dav.vad;..\binsrc\samples\demo\doc_dav.vad;..\binsrc\tutorial\tutorial_dav.vad"
+ Outputs="$(InputDir)\demo.db"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/dk1t.vcproj b/win64/dk1t.vcproj
new file mode 100644
index 0000000..78ddae4
--- /dev/null
+++ b/win64/dk1t.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="dk1t"
+ ProjectGUID="{58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}"
+ RootNamespace="dk1t"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dk1t.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dk1t.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;INPROCESS_CLIENT"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dk1t.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;INPROCESS_CLIENT"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\dk1t.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Dk\config.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkalloc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbasket.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbox.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkdevice.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhashext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkmarshal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkpool.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkresource.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkrusage.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkses2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksesinp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksession.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksesstr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksestcp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksets.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkstkern.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkstubs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkutil.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Dk\Dkstubs.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/dksrv.vcproj b/win64/dksrv.vcproj
new file mode 100644
index 0000000..f482554
--- /dev/null
+++ b/win64/dksrv.vcproj
@@ -0,0 +1,493 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="dksrv"
+ ProjectGUID="{58867EBA-CA07-4F41-A966-6245FF14773E}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dksrv.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dksrv.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;INPROCESS_CLIENT"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\dksrv.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;INPROCESS_CLIENT"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\dksrv.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Dk\Dkalloc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbasket.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbox.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkdevice.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkernel.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhashext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkmarshal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkpool.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkresource.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkrusage.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkses2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksesinp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksession.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksesstr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksestcp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksets.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkstubs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkutil.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Dk\Dkalloc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbasket.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkbox.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkconfig.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkdevice.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkernel.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhash.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkhashext.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkmarshal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkparam.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkpool.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkresource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksession.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksets.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkstubs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dksystem.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dktrace.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dktypes.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Dk\Dkutil.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/doc_vad.vcproj b/win64/doc_vad.vcproj
new file mode 100644
index 0000000..e58f3cb
--- /dev/null
+++ b/win64/doc_vad.vcproj
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="doc_vad"
+ ProjectGUID="{A9B1A466-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="doc_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\samples\demo\mkdoc.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
set CUTTER=cutter.exe
bash mkdoc.sh
cd $(ProjectDir)

"
+ Outputs="$(InputDir)\doc_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
set CUTTER=cutter.exe
bash mkdoc.sh
cd $(ProjectDir)

"
+ Outputs="$(InputDir)\doc_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
set CUTTER=cutter.exe
bash mkdoc.sh
cd $(ProjectDir)

"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\doc_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
set CUTTER=cutter.exe
bash mkdoc.sh
cd $(ProjectDir)

"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\doc_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/feeds_vad.vcproj b/win64/feeds_vad.vcproj
new file mode 100644
index 0000000..5374c9b
--- /dev/null
+++ b/win64/feeds_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="feeds_vad"
+ ProjectGUID="{441F1D0C-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_feedmanager_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_feedmanager_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_feedmanager_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_feedmanager_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_feedmanager_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-FeedManager\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_feedmanager_dav.vad;$(InputDir)\ods_feedmanager_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_feedmanager_dav.vad;$(InputDir)\ods_feedmanager_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/gallery_vad.vcproj b/win64/gallery_vad.vcproj
new file mode 100644
index 0000000..c6ba6dd
--- /dev/null
+++ b/win64/gallery_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="gallery_vad"
+ ProjectGUID="{BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_gallery_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_gallery_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_gallery_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_gallery_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_gallery_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Gallery\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_gallery_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_gallery_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/getdata.vcproj b/win64/getdata.vcproj
new file mode 100644
index 0000000..07a2f87
--- /dev/null
+++ b/win64/getdata.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="getdata"
+ ProjectGUID="{AFB15514-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/getdata.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/getdata.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/getdata.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/getdata.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/getdata.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/getdata.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/getdata.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/getdata.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/getdata.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/getdata.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/getdata.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/getdata.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\getdata.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/hosting_perl.vcproj b/win64/hosting_perl.vcproj
new file mode 100644
index 0000000..b3c1394
--- /dev/null
+++ b/win64/hosting_perl.vcproj
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="hosting_perl"
+ ProjectGUID="{354809B6-CF7B-11DA-85E2-A4E5714C712A}"
+ RootNamespace="hosting_perl"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_perl.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PERL_CFLAGS)"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PERL_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_perl.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\perl\hosting_perl.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_perl.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_perl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/hosting_perl.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PERL_CFLAGS)"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PERL_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_perl.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\perl\hosting_perl.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_perl.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_perl.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_perl.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PERL_CFLAGS)"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PERL_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_perl.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\perl\hosting_perl.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_perl.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_perl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/hosting_perl.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PERL_CFLAGS)"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PERL_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_perl.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\perl\hosting_perl.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_perl.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_perl.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\perl\hosting_perl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\perl\virt_handler.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="SqlFiles"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\perl\pl_to_c.awk"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/hosting_php.vcproj b/win64/hosting_php.vcproj
new file mode 100644
index 0000000..2e53634
--- /dev/null
+++ b/win64/hosting_php.vcproj
@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="hosting_php"
+ ProjectGUID="{9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}"
+ RootNamespace="hosting_php"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hosting_php"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_php.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;php5;php5\main;php5\Zend;php5\ext;php5\regex;php5\TSRM;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;_PHP;_PHP_WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;ZTS;ZEND_DEBUG=1;MSVC5;ZEND_WIN32"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_php/hosting_php.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_php/"
+ ObjectFile="$(ConfigurationName)\hosting_php/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_php/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib php5ts.lib"
+ OutputFile="$(ConfigurationName)/hosting_php.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl,.\php5"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\php\hosting_php.def"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_php.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_php.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/hosting_php.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;php5;php5\main;php5\Zend;php5\ext;php5\regex;php5\TSRM;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;_PHP;_PHP_WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;ZTS;ZEND_DEBUG=1;MSVC5;ZEND_WIN32"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_php/hosting_php.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_php/"
+ ObjectFile="$(ConfigurationName)\hosting_php/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_php/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib php5ts.lib"
+ OutputFile="$(ConfigurationName)/hosting_php.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl,.\php5"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\php\hosting_php.def"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_php.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_php.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\hosting_php"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_php.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;php5;php5\main;php5\Zend;php5\ext;php5\regex;php5\TSRM;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;_PHP;_PHP_WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;ZTS;ZEND_DEBUG=1;MSVC5;ZEND_WIN32"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_php/hosting_php.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_php/"
+ ObjectFile="$(ConfigurationName)\hosting_php/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_php/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib php5ts.lib"
+ OutputFile="$(ConfigurationName)/hosting_php.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl,.\php5"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\php\hosting_php.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_php.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_php.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/hosting_php.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;php5;php5\main;php5\Zend;php5\ext;php5\regex;php5\TSRM;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;_PHP;_PHP_WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;ZTS;ZEND_DEBUG=1;MSVC5;ZEND_WIN32"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\hosting_php/hosting_php.pch"
+ AssemblerListingLocation="$(ConfigurationName)\hosting_php/"
+ ObjectFile="$(ConfigurationName)\hosting_php/"
+ ProgramDataBaseFileName="$(ConfigurationName)\hosting_php/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib php5ts.lib"
+ OutputFile="$(ConfigurationName)/hosting_php.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl,.\php5"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\php\hosting_php.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_php.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_php.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\php\hosting_php.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/hosting_python.vcproj b/win64/hosting_python.vcproj
new file mode 100644
index 0000000..cd1eb59
--- /dev/null
+++ b/win64/hosting_python.vcproj
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="hosting_python"
+ ProjectGUID="{B525A234-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="hosting_python"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_python.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PYTHON_CFLAGS)"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PYTHON_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_python.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\python\hosting_python.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_python.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_python.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/hosting_python.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PYTHON_CFLAGS)"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PYTHON_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_python.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\python\hosting_python.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_python.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_python.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/hosting_python.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PYTHON_CFLAGS)"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PYTHON_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_python.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\python\hosting_python.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_python.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_python.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/hosting_python.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="$(PYTHON_CFLAGS)"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386 $(PYTHON_LDFLAGS)"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/hosting_python.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\hosting\python\hosting_python.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/hosting_python.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/hosting_python.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\python\hosting_python.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\python\virt_handler.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="SqlFiles"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\python\py_to_c.awk"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f py_to_c.awk virt_handler.py > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f py_to_c.awk virt_handler.py > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f py_to_c.awk virt_handler.py > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
gawk -f py_to_c.awk virt_handler.py > virt_handler.c
cd $(ProjectDir)

"
+ AdditionalDependencies="$(InputDir)\virt_handler.pm"
+ Outputs="$(InputDir)\virt_handler.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/im.vcproj b/win64/im.vcproj
new file mode 100644
index 0000000..7a29637
--- /dev/null
+++ b/win64/im.vcproj
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="im"
+ ProjectGUID="{C152ADCC-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="im"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/im.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;.;$(IM_PATH)"
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib CORE_RL_wand_.lib CORE_RL_coders_.lib CORE_RL_magick_.lib CORE_RL_ttf_.lib CORE_RL_xlib_.lib CORE_RL_bzlib_.lib CORE_RL_zlib_.lib CORE_RL_lcms_.lib CORE_RL_tiff_.lib CORE_RL_filters_.lib CORE_RL_jpeg_.lib CORE_RL_jbig_.lib CORE_RL_jp2_.lib CORE_RL_png_.lib CORE_RL_wmf_.lib CORE_RL_libxml_.lib"
+ OutputFile="$(ConfigurationName)/im.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl,$(IM_PATH)"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\image_magick\im.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/im.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/im.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/im.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;.;"$(ProjectDir)ImageMagick""
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib CORE_RL_wand_.lib CORE_RL_coders_.lib CORE_RL_magick_.lib CORE_RL_ttf_.lib CORE_RL_xlib_.lib CORE_RL_bzlib_.lib CORE_RL_zlib_.lib CORE_RL_lcms_.lib CORE_RL_tiff_.lib CORE_RL_filters_.lib CORE_RL_jpeg_.lib CORE_RL_jbig_.lib CORE_RL_jp2_.lib CORE_RL_png_.lib CORE_RL_wmf_.lib CORE_RL_libxml_.lib"
+ OutputFile="$(ConfigurationName)/im.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl;"$(ProjectDir)ImageMagick""
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\image_magick\im.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/im.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/im.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/im.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\plugin;..\binsrc\driver\include..\libsrc\Dk;..\libsrc\util\win32;..\libsrc;..\libsrc\Xml.new;openssl;.;"$(IM_PATH)""
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib CORE_RL_wand_.lib CORE_RL_coders_.lib CORE_RL_magick_.lib CORE_RL_ttf_.lib CORE_RL_xlib_.lib CORE_RL_bzlib_.lib CORE_RL_zlib_.lib CORE_RL_lcms_.lib CORE_RL_tiff_.lib CORE_RL_filters_.lib CORE_RL_jpeg_.lib CORE_RL_jbig_.lib CORE_RL_jp2_.lib CORE_RL_png_.lib CORE_RL_wmf_.lib CORE_RL_libxml_.lib"
+ OutputFile="$(ConfigurationName)/im.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl;$(IM_PATH)"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\image_magick\im.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/im.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/im.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/im.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,.;$(IM_PATH)"
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib CORE_RL_wand_.lib CORE_RL_coders_.lib CORE_RL_magick_.lib CORE_RL_ttf_.lib CORE_RL_xlib_.lib CORE_RL_bzlib_.lib CORE_RL_zlib_.lib CORE_RL_lcms_.lib CORE_RL_tiff_.lib CORE_RL_filters_.lib CORE_RL_jpeg_.lib CORE_RL_jbig_.lib CORE_RL_jp2_.lib CORE_RL_png_.lib CORE_RL_wmf_.lib CORE_RL_libxml_.lib"
+ OutputFile="$(ConfigurationName)/im.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl;$(IM_PATH)"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\samples\image_magick\im.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/im.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/im.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\samples\image_magick\im.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/ins.vcproj b/win64/ins.vcproj
new file mode 100644
index 0000000..f52cfa7
--- /dev/null
+++ b/win64/ins.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ins"
+ ProjectGUID="{C6C66924-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/ins.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/ins.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/ins.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/ins.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/ins.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/ins.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/ins.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/ins.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/ins.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/ins.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/ins.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/ins.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\ins.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/isparql_vad.vcproj b/win64/isparql_vad.vcproj
new file mode 100644
index 0000000..a43cf2b
--- /dev/null
+++ b/win64/isparql_vad.vcproj
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="sparql_demo_vad"
+ ProjectGUID="{6260E42E-239D-11DB-9594-FD7021681415}"
+ RootNamespace="sparql_demo_vad"
+ Keyword="MakeFileProj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\sparql_demo_vad"
+ IntermediateDirectory="$(ConfigurationName)\sparql_demo_vad"
+ ConfigurationType="1">
+ <Tool
+ Name="VCCLCompilerTool"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\sparql_demo_vad"
+ IntermediateDirectory="$(ConfigurationName)\sparql_demo_vad"
+ ConfigurationType="1">
+ <Tool
+ Name="VCCLCompilerTool"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\samples\sparql_demo\make_vad.sh">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
+set PATH=$(InputDir);$(TargetDir)\..;%PATH%
+set HOME=$(ProjectDir)\..\
+set PORT=5555
+set ISQL=isql.exe
+set SERVER=virtuoso-t.exe
+bash make_vad.sh
+cd $(ProjectDir)
+"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\sparql_demo_dav.vad"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
+set PATH=$(InputDir);$(TargetDir)\..;%PATH%
+set HOME=$(ProjectDir)\..\
+set PORT=5555
+set ISQL=isql.exe
+set SERVER=virtuoso-t.exe
+bash make_vad.sh
+cd $(ProjectDir)
+"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\sparql_demo_dav.vad"/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/isql.vcproj b/win64/isql.vcproj
new file mode 100644
index 0000000..5bc30a0
--- /dev/null
+++ b/win64/isql.vcproj
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="isqlo"
+ ProjectGUID="{9FF2579E-CF7B-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/isql.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="Ws2_32.lib odbc32.lib odbccp32.lib"
+ OutputFile="$(ConfigurationName)/isqlo.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),..\libsrc\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/isql_native.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/isqlo.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql_native.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/isql.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="Ws2_32.lib odbc32.lib odbccp32.lib"
+ OutputFile="$(ConfigurationName)/isqlo.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/isql_native.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/isqlo.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql_native.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\isql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/isql_native.vcproj b/win64/isql_native.vcproj
new file mode 100644
index 0000000..d7064c0
--- /dev/null
+++ b/win64/isql_native.vcproj
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="isql"
+ ProjectGUID="{AFB1D909-86D0-49DE-8BD8-DF89349F934E}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/isql_native.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Wi;..\libsrc\util\win32;."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/isql.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql_native.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/isql_native.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Wi;..\libsrc\util\win32;."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/isql.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql_native.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/isql_native.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Wi;..\libsrc\util\win32;."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/isql.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql_native.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/isql_native.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Wi;..\libsrc\util\win32;."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/isql.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/isql_native.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\isql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/libvirtuoso_odbc_t.vcproj b/win64/libvirtuoso_odbc_t.vcproj
new file mode 100644
index 0000000..f815ee9
--- /dev/null
+++ b/win64/libvirtuoso_odbc_t.vcproj
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libvirtuoso_t"
+ ProjectGUID="{FB836C59-41E1-48EA-A59B-460AB56587EE}"
+ RootNamespace="libvirtuoso_t"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;SHARED_OBJECT;PACKAGE_VERSION="6.1.3""
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib tidy.lib"
+ OutputFile="$(OutDir)/libvirtuoso-t.dll"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtuoso\libviwin32.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/libvirtuoso_t.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ FixedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;SHARED_OBJECT;PACKAGE_VERSION=\"6.1.3\""
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib tidy.lib"
+ OutputFile="$(OutDir)/libvirtuoso-t.dll"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtuoso\libviwin32.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/libvirtuoso_t.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ FixedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;SHARED_OBJECT;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib tidy.lib"
+ OutputFile="$(OutDir)/libvirtuoso-t.dll"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtuoso\libviwin32.def"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(OutDir)/libvirtuoso_t.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ FixedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="PACKAGE_VERSION=\"6.1.3\";_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;SHARED_OBJECT;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib tidy.lib"
+ OutputFile="$(OutDir)/libvirtuoso-t.dll"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl;"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtuoso\libviwin32.def"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(OutDir)/libvirtuoso_t.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ FixedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\shcompo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtuoso\viconfig.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtuoso\viwin32.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/mail_vad.vcproj b/win64/mail_vad.vcproj
new file mode 100644
index 0000000..14c8858
--- /dev/null
+++ b/win64/mail_vad.vcproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="mail_vad"
+ ProjectGUID="{B0058FA6-EFE3-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_webmail_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_webmail_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_webmail_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_webmail_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_webmail_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-WebMail\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\ods_webmail_dav.vad;$(InputDir)\ods_webmail_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_webmail_dav.vad;$(InputDir)\ods_webmail_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/maildrop.vcproj b/win64/maildrop.vcproj
new file mode 100644
index 0000000..b232b27
--- /dev/null
+++ b/win64/maildrop.vcproj
@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="maildrop"
+ ProjectGUID="{C5F98602-E5B9-11DA-85E2-A4E5714C712A}"
+ RootNamespace="maildrop"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\maildrop"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/maildrop.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\maildrop/maildrop.pch"
+ AssemblerListingLocation="$(ConfigurationName)\maildrop/"
+ ObjectFile="$(ConfigurationName)\maildrop/"
+ ProgramDataBaseFileName="$(ConfigurationName)\maildrop/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/maildrop.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\maildrop\win32\maildrop.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/maildrop.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/maildrop.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\maildrop"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/maildrop.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\maildrop/maildrop.pch"
+ AssemblerListingLocation="$(ConfigurationName)\maildrop/"
+ ObjectFile="$(ConfigurationName)\maildrop/"
+ ProgramDataBaseFileName="$(ConfigurationName)\maildrop/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/maildrop.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\maildrop\win32\maildrop.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/maildrop.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/maildrop.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\maildrop"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine=""
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="..\binsrc\maildrop\win32\gen\maildrop.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\plugin;..\binsrc\driver\include..\libsrc\Dk;..\libsrc\util\win32;..\libsrc;..\binsrc\maildrop\win32\gen;..\binsrc\maildrop;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\maildrop/maildrop.pch"
+ AssemblerListingLocation="$(ConfigurationName)\maildrop/"
+ ObjectFile="$(ConfigurationName)\maildrop/"
+ ProgramDataBaseFileName="$(ConfigurationName)\maildrop/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/maildrop.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\maildrop\win32\maildrop.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/maildrop.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/maildrop.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\maildrop"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ UseOfATL="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="midl /nologo /env x64 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" mailmsg.idl
midl /nologo /env x64 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" smtpevent.idl
midl /nologo /env x64 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" msado15.idl
midl /nologo /env x64 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" seo.idl
midl /nologo /env x64 /out "$(InputDir)\..\binsrc\maildrop\win32\gen" cdosys.idl
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="..\binsrc\maildrop\win32\gen\maildrop.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\plugin;..\binsrc\driver\include..\libsrc\Dk;..\libsrc\util\win32;..\libsrc;..\binsrc\maildrop\win32\gen;..\binsrc\maildrop;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\maildrop/maildrop.pch"
+ AssemblerListingLocation="$(ConfigurationName)\maildrop/"
+ ObjectFile="$(ConfigurationName)\maildrop/"
+ ProgramDataBaseFileName="$(ConfigurationName)\maildrop/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/maildrop.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\maildrop\win32\maildrop.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/maildrop.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/maildrop.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\maildrop\win32\maildrop.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\maildrop\win32\maildrop.idl"
+ >
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ MkTypLibCompatible="false"
+ TargetEnvironment="3"
+ OutputDirectory="$(InputDir)\gen"
+ HeaderFileName="$(InputName).h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\maildrop\win32\mpl.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\binsrc\maildrop\win32\maildrop.rc"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="..\libsrc\Wi;..\binsrc\maildrop\win32\gen"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/mediawiki.vcproj b/win64/mediawiki.vcproj
new file mode 100644
index 0000000..94f4a1b
--- /dev/null
+++ b/win64/mediawiki.vcproj
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="mediawiki"
+ ProjectGUID="{408E2482-2623-11DB-9BB9-97600548391D}"
+ RootNamespace="mediawiki"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\mediawiki"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/mediawiki.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\mediawiki/mediawiki.pch"
+ AssemblerListingLocation="$(ConfigurationName)\mediawiki/"
+ ObjectFile="$(ConfigurationName)\mediawiki/"
+ ProgramDataBaseFileName="$(ConfigurationName)\mediawiki/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/mediawiki.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\mediawiki.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/mediawiki.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/mediawiki.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\mediawiki"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/mediawiki.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\mediawiki/mediawiki.pch"
+ AssemblerListingLocation="$(ConfigurationName)\mediawiki/"
+ ObjectFile="$(ConfigurationName)\mediawiki/"
+ ProgramDataBaseFileName="$(ConfigurationName)\mediawiki/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/mediawiki.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\mediawiki.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/mediawiki.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/mediawiki.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\mediawiki"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/mediawiki.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\mediawiki/mediawiki.pch"
+ AssemblerListingLocation="$(ConfigurationName)\mediawiki/"
+ ObjectFile="$(ConfigurationName)\mediawiki/"
+ ProgramDataBaseFileName="$(ConfigurationName)\mediawiki/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/mediawiki.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\mediawiki.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/mediawiki.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/mediawiki.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/mediawiki.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\mediawiki/mediawiki.pch"
+ AssemblerListingLocation="$(ConfigurationName)\mediawiki/"
+ ObjectFile="$(ConfigurationName)\mediawiki/"
+ ProgramDataBaseFileName="$(ConfigurationName)\mediawiki/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/mediawiki.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\mediawiki.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/mediawiki.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/mediawiki.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\media_maclex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\media_wikilex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\mediawiki.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ <Filter
+ Name="LexFiles"
+ >
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\media_maclex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_maclex.c
flex -8 -Pmediamacyy -omedia_maclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_maclex.c
flex -8 -Pmediamacyy -omedia_maclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_maclex.c
flex -8 -Pmediamacyy -omedia_maclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_maclex.c
flex -8 -Pmediamacyy -omedia_maclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_maclex.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\media_wikilex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_wikilex.c
flex -8 -Pmediawikiyy -omedia_wikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_wikilex.c
flex -8 -Pmediawikiyy -omedia_wikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_wikilex.c
flex -8 -Pmediawikiyy -omedia_wikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f media_wikilex.c
flex -8 -Pmediawikiyy -omedia_wikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\media_wikilex.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/nntpf_vad.vcproj b/win64/nntpf_vad.vcproj
new file mode 100644
index 0000000..c899efa
--- /dev/null
+++ b/win64/nntpf_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="nntpf_vad"
+ ProjectGUID="{607116BE-F168-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_discussion_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_discussion_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_discussion_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_discussion_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_discussion_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Discussion\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_discussion_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_discussion_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/odbcmail.vcproj b/win64/odbcmail.vcproj
new file mode 100644
index 0000000..2fd4f85
--- /dev/null
+++ b/win64/odbcmail.vcproj
@@ -0,0 +1,442 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtmail"
+ ProjectGUID="{4C517D78-E5B9-11DA-85E2-A4E5714C712A}"
+ RootNamespace="odbcmail"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\odbcmail"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ Description="Making the version file"
+ CommandLine="bash $(InputDir)\..\bin\makever -o $(InputDir)\..\binsrc\maildrop\odbcmail.vers.c -p "OpenLink ODBC Mail Interface" -v "2.01"
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/odbcmail.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\binsrc\maildrop;..\libsrc\zlib;..\binsrc\driver;..\binsrc\maildrop\win32\gen;.\openssl"
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\odbcmail/odbcmail.pch"
+ AssemblerListingLocation="$(ConfigurationName)\odbcmail/"
+ ObjectFile="$(ConfigurationName)\odbcmail/"
+ ProgramDataBaseFileName="$(ConfigurationName)\odbcmail/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="util.lib wic.lib dk1t.lib threads.lib libeay32.lib gdi32.lib advapi32.lib ssleay32.lib ws2_32.lib user32.lib kernel32.lib"
+ OutputFile="$(ConfigurationName)/virt_mail.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/odbcmail.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\odbcmail"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ Description="Making the version file"
+ CommandLine="bash $(InputDir)\..\bin\makever -o $(InputDir)\..\binsrc\maildrop\odbcmail.vers.c -p "OpenLink ODBC Mail Interface" -v "2.01"
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/odbcmail.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\binsrc\maildrop;..\libsrc\zlib;..\binsrc\driver;..\binsrc\maildrop\win32\gen;.\openssl"
+ PreprocessorDefinitions="_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\odbcmail/odbcmail.pch"
+ AssemblerListingLocation="$(ConfigurationName)\odbcmail/"
+ ObjectFile="$(ConfigurationName)\odbcmail/"
+ ProgramDataBaseFileName="$(ConfigurationName)\odbcmail/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="util.lib wic.lib dk1t.lib threads.lib libeay32.lib gdi32.lib advapi32.lib ssleay32.lib ws2_32.lib user32.lib kernel32.lib"
+ OutputFile="$(ConfigurationName)/virt_mail.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/odbcmail.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\odbcmail"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(IntDir)
bash $(InputDir)\..\bin\makever -o odbcmail.vers.c -p "OpenLink ODBC Mail Interface" -v "2.01"
cd $(InputDir)
"
+ AdditionalDependencies="$(IntDir)\odbc_mail.obj"
+ Outputs="$(IntDir)\odbcmail.vers.c"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/odbcmail.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl"
+ PreprocessorDefinitions="_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\odbcmail/odbcmail.pch"
+ AssemblerListingLocation="$(ConfigurationName)\odbcmail/"
+ ObjectFile="$(ConfigurationName)\odbcmail/"
+ ProgramDataBaseFileName="$(ConfigurationName)\odbcmail/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="util.lib wic.lib dk1t.lib threads.lib libeay32.lib gdi32.lib advapi32.lib ssleay32.lib ws2_32.lib user32.lib kernel32.lib"
+ OutputFile="$(ConfigurationName)/virt_mail.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/odbcmail.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\odbcmail"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(IntDir)
bash $(InputDir)\..\bin\makever -o odbcmail.vers.c -p "OpenLink ODBC Mail Interface" -v "2.01"
cd $(InputDir)
"
+ AdditionalDependencies="$(IntDir)\odbc_mail.obj"
+ Outputs="$(IntDir)\odbcmail.vers.c"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/odbcmail.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl"
+ PreprocessorDefinitions="_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_WIN32_DCOM;FULL_WINDOWS"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(ConfigurationName)\odbcmail/odbcmail.pch"
+ AssemblerListingLocation="$(ConfigurationName)\odbcmail/"
+ ObjectFile="$(ConfigurationName)\odbcmail/"
+ ProgramDataBaseFileName="$(ConfigurationName)\odbcmail/"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="util.lib wic.lib dk1t.lib threads.lib libeay32.lib gdi32.lib advapi32.lib ssleay32.lib ws2_32.lib user32.lib kernel32.lib"
+ OutputFile="$(ConfigurationName)/virt_mail.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/odbcmail.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\maildrop\odbc_mail.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\maildrop\odbcmail.vers.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/ods_vad.vcproj b/win64/ods_vad.vcproj
new file mode 100644
index 0000000..4e03eab
--- /dev/null
+++ b/win64/ods_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ods_vad"
+ ProjectGUID="{7DF920B2-EFDA-11DA-988C-EBAD6065650A}"
+ RootNamespace="ods_framework_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_framework_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_framework_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_framework_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_framework_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Framework\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_framework_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_framework_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/polls_vad.vcproj b/win64/polls_vad.vcproj
new file mode 100644
index 0000000..39cb587
--- /dev/null
+++ b/win64/polls_vad.vcproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="polls_vad"
+ ProjectGUID="{FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}"
+ RootNamespace="ods_polls_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_polls_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_polls_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_polls_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_polls_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Polls\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\ods_polls_dav.vad;$(InputDir)\ods_polls_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_polls_dav.vad;$(InputDir)\ods_polls_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/scroll.vcproj b/win64/scroll.vcproj
new file mode 100644
index 0000000..ffff7f7
--- /dev/null
+++ b/win64/scroll.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="scroll"
+ ProjectGUID="{C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/scroll.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/scroll.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/scroll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/scroll.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/scroll.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/scroll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/scroll.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/scroll.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/scroll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/scroll.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/scroll.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/scroll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\scroll.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/setcurs.vcproj b/win64/setcurs.vcproj
new file mode 100644
index 0000000..0df012e
--- /dev/null
+++ b/win64/setcurs.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="setcurs"
+ ProjectGUID="{DCA407C4-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/setcurs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/setcurs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/setcurs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/setcurs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/setcurs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/setcurs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/setcurs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/setcurs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/setcurs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/setcurs.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/setcurs.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/setcurs.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\setcurs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/threads.vcproj b/win64/threads.vcproj
new file mode 100644
index 0000000..fbdacfd
--- /dev/null
+++ b/win64/threads.vcproj
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="threads"
+ ProjectGUID="{B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threads.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threads.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threads.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\threads.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Thread\sched_single.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_attr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_queue.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\timer_queue.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/threadw.vcproj b/win64/threadw.vcproj
new file mode 100644
index 0000000..692e39d
--- /dev/null
+++ b/win64/threadw.vcproj
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="threadw"
+ ProjectGUID="{D3A2882C-410A-4F58-8ACE-A771888073E8}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threadw.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threadw.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\threadw.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\threadw.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Thread\io_unix.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\sched_winthread.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_attr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_queue.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\thread_rwlock.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Thread\timer_queue.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/tidy.vcproj b/win64/tidy.vcproj
new file mode 100644
index 0000000..cc65d40
--- /dev/null
+++ b/win64/tidy.vcproj
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="tidy"
+ ProjectGUID="{D9E130E1-7734-43DF-A7EF-15CD95E467EE}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin"
+ PreprocessorDefinitions="_SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\tidy.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin"
+ PreprocessorDefinitions="_SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\tidy.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc\Dk;..\libsrc;..\libsrc\util;..\libsrc\util\win32"
+ PreprocessorDefinitions="_SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\tidy.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc\Dk;..\libsrc;..\libsrc\util;..\libsrc\util\win32"
+ PreprocessorDefinitions="_SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\tidy.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Tidy\attrs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\clean.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\config.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\entities.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\istack.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\lexer.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\localize.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\parser.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\pprint.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\tab2space.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\tags.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\tidy.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Tidy\html.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Tidy\platform.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/tpcc.vcproj b/win64/tpcc.vcproj
new file mode 100644
index 0000000..f8c95df
--- /dev/null
+++ b/win64/tpcc.vcproj
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="tpcc"
+ ProjectGUID="{E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/tpcc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/tpcc.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/tpcc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/tpcc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/tpcc.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/tpcc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/tpcc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/tpcc.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/tpcc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/tpcc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/tpcc.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/tpcc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\tpcc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\tpccodbc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\tpcctrx.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\binsrc\tests\tpcc.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/tutorial_vad.vcproj b/win64/tutorial_vad.vcproj
new file mode 100644
index 0000000..745786c
--- /dev/null
+++ b/win64/tutorial_vad.vcproj
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="tutorial_vad"
+ ProjectGUID="{EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}"
+ RootNamespace="tutorial_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\binsrc\tutorial\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\tutorial_dav.vad;$(InputDir)\tutorial_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\tutorial_dav.vad;$(InputDir)\tutorial_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\tutorial_dav.vad;$(InputDir)\tutorial_filesystem.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(InputDir);$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\isql.exe;$(TargetDir)\virtuoso-t.exe"
+ Outputs="$(InputDir)\tutorial_dav.vad;$(InputDir)\tutorial_filesystem.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/urlsimu.vcproj b/win64/urlsimu.vcproj
new file mode 100644
index 0000000..2518e57
--- /dev/null
+++ b/win64/urlsimu.vcproj
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="urlsimu"
+ ProjectGUID="{EF98F42A-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/urlsimu.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/urlsimu.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/urlsimu.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/urlsimu.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/urlsimu.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/urlsimu.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/urlsimu.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/urlsimu.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/urlsimu.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/urlsimu.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,.\openssl"
+ PreprocessorDefinitions="_SSL,_CONSOLE,ODBC_ONLY,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="wic.lib threads.lib dk1t.lib ws2_32.lib libeay32.lib util.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/urlsimu.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/urlsimu.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\tests\time.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\urlsimu.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/util.vcproj b/win64/util.vcproj
new file mode 100644
index 0000000..08a2784
--- /dev/null
+++ b/win64/util.vcproj
@@ -0,0 +1,814 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="util"
+ ProjectGUID="{031DB868-5294-4738-90BA-F80BB2CEA9DC}"
+ RootNamespace="util"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc\Xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\langfunc;..\libsrc\plugin,."
+ PreprocessorDefinitions="DLDAPI_WINDOWS;_SSL;YYTOKENTYPE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\util.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc\Xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\langfunc;..\libsrc\plugin,."
+ PreprocessorDefinitions="DLDAPI_WINDOWS;_SSL;YYTOKENTYPE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK;PCRE_STATIC"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\util.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\zlib;..\binsrc\driver;..\libsrc\langfunc;..\libsrc\plugin,."
+ PreprocessorDefinitions="DLDAPI_WINDOWS;_SSL;BIF_XML;_IMSG;VAD;YYTOKENTYPE;WINDOWS;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\util.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\zlib;..\binsrc\driver;..\libsrc\langfunc;..\libsrc\plugin,."
+ PreprocessorDefinitions="DLDAPI_WINDOWS;_SSL;BIF_XML;_IMSG;VAD;YYTOKENTYPE;WINDOWS;INPROCESS_CLIENT;_MBCS;WIN32;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK;PCRE_STATIC"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\util.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\util\buildarg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\cfg2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\cslentry.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\csllkup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\cslnment.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\dbgmal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\debug.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\dyntab.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_ucm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\expandav.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fnmatch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fnqual.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fnsearch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fntodos.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\fnundos.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\getopt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\getopt1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\latin1ctype.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\login_digest.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\logmsg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\ltrim.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\make_env.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\mpl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\ncfg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\ntapp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\regerror.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\regexp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\regsub.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\rtrim.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\setext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\startup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\stpcpy.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strcpyin.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strerror.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\stricmp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strindex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strinsrt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strlwr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strnicmp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strquote.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strtok_r.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strupr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\strxpect.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\win32\syslog.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\terminat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\ucm2enc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\usage.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\uuid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_mbrtowc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_mbsnrtowcs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_wcrtomb.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_wcs_mask.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\virt_wcsnrtombs.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\libutil.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\uuid.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\uuidP.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="RegExp"
+ >
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_chartables.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_compile.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_config.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_dfa_exec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_exec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_fullinfo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_get.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_globals.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_newline.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_ord2utf8.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_study.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_tables.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_try_flipped.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_ucd.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_valid_utf8.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_version.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\util\pcrelib\pcre_xclass.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Langfunc sources"
+ >
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_basic.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_charsets.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_html.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\encoding_wide.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\langfunc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\langfunc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\langman.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\language__en_US.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\language__ru_RU.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\language__x_ViAny.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\language__x_ViDoc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3_all_chars.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3_lowers.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3_spaces.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\langfunc\unicode3_uppers.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Plugin sources"
+ >
+ <File
+ RelativePath="..\libsrc\plugin\dlf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\exe_export.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\export_gate_virtuoso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\gate_virtuoso_stubs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\gate_virtuoso_stubs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\gen_all_gates.sh"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
bash gen_all_gates.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\export_gate_virtuoso.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
bash gen_all_gates.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\export_gate_virtuoso.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
bash gen_all_gates.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\export_gate_virtuoso.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
bash gen_all_gates.sh
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\export_gate_virtuoso.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\plugin.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\plugin.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\plugin_win32.c"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/virtodbc.vcproj b/win64/virtodbc.vcproj
new file mode 100644
index 0000000..19c3d01
--- /dev/null
+++ b/win64/virtodbc.vcproj
@@ -0,0 +1,534 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtodbc"
+ ProjectGUID="{3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/virtodbc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtodbc.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\virtodbc\virtodbc.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtodbc.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtodbc.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/virtodbc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtodbc.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\virtodbc\virtodbc.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtodbc.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtodbc.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/virtodbc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtodbc.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtodbc\virtodbc.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtodbc.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtodbc.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/virtodbc.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtodbc.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ ModuleDefinitionFile="..\binsrc\virtodbc\virtodbc.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtodbc.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtodbc.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\blobio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIodbc3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\CLIsql3_w32.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIuti.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\dialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\dlf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\kvlist.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\plugin_gate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.def"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\winctl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\wizard.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\zcbrowser.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\zcbrowsercombo.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.rc"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/virtoledb.vcproj b/win64/virtoledb.vcproj
new file mode 100644
index 0000000..4f61221
--- /dev/null
+++ b/win64/virtoledb.vcproj
@@ -0,0 +1,727 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtoledb"
+ ProjectGUID="{F357CF96-CF7A-11DA-85E2-A4E5714C712A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/virtoledb.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;VIRTOLEDB_CLI"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="ole32.lib oleaut32.lib odbccp32.lib rpcrt4.lib gdi32.lib comdlg32.lib threads.lib dk1t.lib util.lib odbc32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtoledb.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\virtoledb\virtoledb.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtoledb.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtoledb.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/virtoledb.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;VIRTOLEDB_CLI"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="ole32.lib oleaut32.lib odbccp32.lib rpcrt4.lib gdi32.lib comdlg32.lib threads.lib dk1t.lib util.lib odbc32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtoledb.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\virtoledb\virtoledb.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtoledb.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtoledb.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/virtoledb.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;VIRTOLEDB_CLI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="ole32.lib oleaut32.lib odbccp32.lib rpcrt4.lib gdi32.lib comdlg32.lib threads.lib dk1t.lib util.lib odbc32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtoledb.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\binsrc\virtoledb\virtoledb.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtoledb.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtoledb.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/virtoledb.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;VIRTOLEDB_CLI"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="ole32.lib oleaut32.lib odbccp32.lib rpcrt4.lib gdi32.lib comdlg32.lib threads.lib dk1t.lib util.lib odbc32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtoledb.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib;LIBCMT.lib"
+ ModuleDefinitionFile="..\binsrc\virtoledb\virtoledb.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtoledb.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/virtoledb.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\binsrc\virtoledb\asserts.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\baseobj.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\blobio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIodbc3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\CLIsql3_w32.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIuti.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\command.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\connobj.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\data.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\datalink.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\dataobj.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\datasource.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\db.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\dialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\dlf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\dllmodule.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\error.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\filedsn.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\globals.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\kvlist.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\lobdata.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\mresults.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\paramdata.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\plugin_gate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\properties.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\refcounted.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowset.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowsetdata.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowsetprops.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\session.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\syncobj.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\util.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\virtodbc.def"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\winctl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\wizard.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\zcbrowser.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtodbc\zcbrowsercombo.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\binsrc\virtoledb\asserts.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\baseobj.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\command.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\connobj.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\data.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\datalink.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\dataobj.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\db.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\dllmodule.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\error.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\filedsn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\headers.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\lobdata.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\os.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\paramdata.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\properties.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\refcounted.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\resource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowset.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowsetdata.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\rowsetprops.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\session.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\util.h"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtoledb\virtoledb.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\binsrc\virtoledb\virtoledb.rc"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/virtuoso-opensource.sln b/win64/virtuoso-opensource.sln
new file mode 100644
index 0000000..ae614ea
--- /dev/null
+++ b/win64/virtuoso-opensource.sln
@@ -0,0 +1,1132 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blobs", "blobs.vcproj", "{72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bpel_vad", "bpel_vad.vcproj", "{3A2B317A-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "burstoff", "burstoff.vcproj", "{7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conductor_vad", "conductor_vad.vcproj", "{828BB6BA-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cursor", "cursor.vcproj", "{97D467CE-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cutter", "cutter.vcproj", "{6E10B655-C324-491F-B202-73565D6B30FB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demodb", "demodb.vcproj", "{CA03DBF1-2C7E-4732-8F41-65030876DDE7}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7} = {50E2DD3F-5B5E-4E62-9206-A41824905CD7}
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A} = {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A} = {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A} = {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A} = {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dk1t", "dk1t.vcproj", "{58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dksrv", "dksrv.vcproj", "{58867EBA-CA07-4F41-A966-6245FF14773E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc_vad", "doc_vad.vcproj", "{A9B1A466-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {6E10B655-C324-491F-B202-73565D6B30FB} = {6E10B655-C324-491F-B202-73565D6B30FB}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getdata", "getdata.vcproj", "{AFB15514-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_perl", "hosting_perl.vcproj", "{354809B6-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_python", "hosting_python.vcproj", "{B525A234-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "im", "im.vcproj", "{C152ADCC-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ins", "ins.vcproj", "{C6C66924-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql_native.vcproj", "{AFB1D909-86D0-49DE-8BD8-DF89349F934E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvirtuoso_t", "libvirtuoso_odbc_t.vcproj", "{FB836C59-41E1-48EA-A59B-460AB56587EE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D3A2882C-410A-4F58-8ACE-A771888073E8} = {D3A2882C-410A-4F58-8ACE-A771888073E8}
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64} = {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}
+ {58867EBA-CA07-4F41-A966-6245FF14773E} = {58867EBA-CA07-4F41-A966-6245FF14773E}
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837} = {0C234EF0-7725-4BDA-A1C3-47F5835A3837}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isqlo", "isql.vcproj", "{9FF2579E-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scroll", "scroll.vcproj", "{C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setcurs", "setcurs.vcproj", "{DCA407C4-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threads", "threads.vcproj", "{B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadw", "threadw.vcproj", "{D3A2882C-410A-4F58-8ACE-A771888073E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tidy", "tidy.vcproj", "{D9E130E1-7734-43DF-A7EF-15CD95E467EE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpcc", "tpcc.vcproj", "{E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_vad", "tutorial_vad.vcproj", "{EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E} = {AFB1D909-86D0-49DE-8BD8-DF89349F934E}
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7} = {50E2DD3F-5B5E-4E62-9206-A41824905CD7}
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} = {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "urlsimu", "urlsimu.vcproj", "{EF98F42A-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{031DB868-5294-4738-90BA-F80BB2CEA9DC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtodbc", "virtodbc.vcproj", "{3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtoledb", "virtoledb.vcproj", "{F357CF96-CF7A-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso_clr_t", "virtuoso_odbc_clr_t.vcproj", "{8D07389F-F48A-49B9-BED9-F71FCBACC4A8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso_javavm_t", "virtuoso_odbc_javavm_t.vcproj", "{02AD88A0-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso_sample_t", "virtuoso_odbc_sample_t.vcproj", "{0E838FA8-CF7B-11DA-85E2-A4E5714C712A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB836C59-41E1-48EA-A59B-460AB56587EE} = {FB836C59-41E1-48EA-A59B-460AB56587EE}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso_t", "virtuoso_odbc_t.vcproj", "{F4E88BFA-FC96-439D-9E67-0A92AB541EE0}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D3A2882C-410A-4F58-8ACE-A771888073E8} = {D3A2882C-410A-4F58-8ACE-A771888073E8}
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64} = {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}
+ {58867EBA-CA07-4F41-A966-6245FF14773E} = {58867EBA-CA07-4F41-A966-6245FF14773E}
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837} = {0C234EF0-7725-4BDA-A1C3-47F5835A3837}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wi", "wi.vcproj", "{93051962-7797-49F0-8958-BB1CE60FFE6F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wic", "wic.vcproj", "{A66E395B-18EE-4877-8F0D-386A7BBAB370}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wikiv", "wikiv.vcproj", "{A326A0DF-4F93-4DF6-813D-0B64F98B389F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "xml.vcproj", "{0C234EF0-7725-4BDA-A1C3-47F5835A3837}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtuosoClient.NET.vc2005", "..\binsrc\VirtuosoClient.Net\VirtuosoClient.NET.vc2005.csproj", "{50E2DD3F-5B5E-4E62-9206-A41824905CD7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maildrop", "maildrop.vcproj", "{C5F98602-E5B9-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtmail", "odbcmail.vcproj", "{4C517D78-E5B9-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ods_vad", "ods_vad.vcproj", "{7DF920B2-EFDA-11DA-988C-EBAD6065650A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blog_vad", "blog_vad.vcproj", "{8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bookmark_vad", "bookmark_vad.vcproj", "{8A49554A-EFE3-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "briefcase_vad", "briefcase_vad.vcproj", "{55215A1C-EFE2-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "community_vad", "community_vad.vcproj", "{C0990F5A-EFE3-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "feeds_vad", "feeds_vad.vcproj", "{441F1D0C-EFE3-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gallery_vad", "gallery_vad.vcproj", "{BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mail_vad", "mail_vad.vcproj", "{B0058FA6-EFE3-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nntpf_vad", "nntpf_vad.vcproj", "{607116BE-F168-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polls_vad", "polls_vad.vcproj", "{FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wiki_vad", "wiki_vad.vcproj", "{40062448-EFE0-11DA-85E2-A4E5714C712A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_php", "hosting_php.vcproj", "{9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
+ {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
+ {58867EBA-CA07-4F41-A966-6245FF14773E} = {58867EBA-CA07-4F41-A966-6245FF14773E}
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "creolewiki", "creolewiki.vcproj", "{ABE43C46-E1C4-11DB-930B-CD6B662399AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediawiki", "mediawiki.vcproj", "{408E2482-2623-11DB-9BB9-97600548391D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wbxml2", "wbxml2.vcproj", "{5582D8D0-DB93-11DB-930B-CD6B662399AA}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {3A2B317A-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {828BB6BA-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Win32.Build.0 = Debug|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|x64.ActiveCfg = Debug|x64
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|x64.Build.0 = Debug|x64
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|x86.ActiveCfg = Debug|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Any CPU.ActiveCfg = Release|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Win32.ActiveCfg = Release|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Win32.Build.0 = Release|Win32
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|x64.ActiveCfg = Release|x64
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|x64.Build.0 = Release|x64
+ {6E10B655-C324-491F-B202-73565D6B30FB}.Release|x86.ActiveCfg = Release|x64
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Debug|Win32.Build.0 = Debug|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Debug|x64.ActiveCfg = Debug|x64
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Debug|x86.ActiveCfg = Debug|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Release|Any CPU.ActiveCfg = Release|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Release|Win32.ActiveCfg = Release|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Release|Win32.Build.0 = Release|Win32
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Release|x64.ActiveCfg = Release|x64
+ {CA03DBF1-2C7E-4732-8F41-65030876DDE7}.Release|x86.ActiveCfg = Release|x64
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Win32.Build.0 = Debug|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|x64.ActiveCfg = Debug|x64
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|x64.Build.0 = Debug|x64
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|x86.ActiveCfg = Debug|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Any CPU.ActiveCfg = Release|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Win32.ActiveCfg = Release|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Win32.Build.0 = Release|Win32
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|x64.ActiveCfg = Release|x64
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|x64.Build.0 = Release|x64
+ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|x86.ActiveCfg = Release|x64
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Win32.Build.0 = Debug|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|x64.ActiveCfg = Debug|x64
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|x64.Build.0 = Debug|x64
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|x86.ActiveCfg = Debug|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Any CPU.ActiveCfg = Release|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Win32.ActiveCfg = Release|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Win32.Build.0 = Release|Win32
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|x64.ActiveCfg = Release|x64
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|x64.Build.0 = Release|x64
+ {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|x86.ActiveCfg = Release|x64
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {A9B1A466-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Win32.Build.0 = Debug|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|x64.ActiveCfg = Debug|x64
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|x64.Build.0 = Debug|x64
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|x86.ActiveCfg = Debug|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Any CPU.ActiveCfg = Release|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Win32.ActiveCfg = Release|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Win32.Build.0 = Release|Win32
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|x64.ActiveCfg = Release|x64
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|x64.Build.0 = Release|x64
+ {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|x86.ActiveCfg = Release|x64
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Win32.Build.0 = Debug|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|x64.ActiveCfg = Debug|x64
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|x64.Build.0 = Debug|x64
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|x86.ActiveCfg = Debug|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Any CPU.ActiveCfg = Release|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Win32.ActiveCfg = Release|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Win32.Build.0 = Release|Win32
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|x64.ActiveCfg = Release|x64
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|x64.Build.0 = Release|x64
+ {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|x86.ActiveCfg = Release|x64
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Win32.Build.0 = Debug|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|x64.ActiveCfg = Debug|x64
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|x64.Build.0 = Debug|x64
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|x86.ActiveCfg = Debug|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Any CPU.ActiveCfg = Release|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Win32.ActiveCfg = Release|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Win32.Build.0 = Release|Win32
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|x64.ActiveCfg = Release|x64
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|x64.Build.0 = Release|x64
+ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|x86.ActiveCfg = Release|x64
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Win32.Build.0 = Debug|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|x64.ActiveCfg = Debug|x64
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|x64.Build.0 = Debug|x64
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|x86.ActiveCfg = Debug|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Any CPU.ActiveCfg = Release|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Win32.ActiveCfg = Release|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Win32.Build.0 = Release|Win32
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|x64.ActiveCfg = Release|x64
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|x64.Build.0 = Release|x64
+ {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|x86.ActiveCfg = Release|x64
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Win32.Build.0 = Debug|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|x64.ActiveCfg = Debug|x64
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|x64.Build.0 = Debug|x64
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|x86.ActiveCfg = Debug|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Any CPU.ActiveCfg = Release|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Win32.ActiveCfg = Release|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Win32.Build.0 = Release|Win32
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|x64.ActiveCfg = Release|x64
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|x64.Build.0 = Release|x64
+ {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|x86.ActiveCfg = Release|x64
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {EB22A6B6-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Win32.Build.0 = Debug|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|x64.ActiveCfg = Debug|x64
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|x64.Build.0 = Debug|x64
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|x86.ActiveCfg = Debug|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Any CPU.ActiveCfg = Release|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Win32.ActiveCfg = Release|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Win32.Build.0 = Release|Win32
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|x64.ActiveCfg = Release|x64
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|x64.Build.0 = Release|x64
+ {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|x86.ActiveCfg = Release|x64
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Win32.Build.0 = Debug|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|x64.ActiveCfg = Debug|x64
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|x64.Build.0 = Debug|x64
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|x86.ActiveCfg = Debug|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Any CPU.ActiveCfg = Release|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Win32.ActiveCfg = Release|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Win32.Build.0 = Release|Win32
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x64.ActiveCfg = Release|x64
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x64.Build.0 = Release|x64
+ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x86.ActiveCfg = Release|x64
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Debug|x64
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
+ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Win32.Build.0 = Debug|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|x64.ActiveCfg = Debug|x64
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|x64.Build.0 = Debug|x64
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|x86.ActiveCfg = Debug|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Any CPU.ActiveCfg = Release|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Win32.ActiveCfg = Release|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Win32.Build.0 = Release|Win32
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|x64.ActiveCfg = Release|x64
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|x64.Build.0 = Release|x64
+ {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|x86.ActiveCfg = Release|x64
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Win32.Build.0 = Debug|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|x64.ActiveCfg = Debug|x64
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|x64.Build.0 = Debug|x64
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|x86.ActiveCfg = Debug|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Any CPU.ActiveCfg = Release|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Win32.ActiveCfg = Release|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Win32.Build.0 = Release|Win32
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|x64.ActiveCfg = Release|x64
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|x64.Build.0 = Release|x64
+ {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|x86.ActiveCfg = Release|x64
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Win32.Build.0 = Debug|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|x64.ActiveCfg = Debug|x64
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|x64.Build.0 = Debug|x64
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|x86.ActiveCfg = Debug|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Any CPU.ActiveCfg = Release|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Win32.ActiveCfg = Release|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Win32.Build.0 = Release|Win32
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|x64.ActiveCfg = Release|x64
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|x64.Build.0 = Release|x64
+ {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|x86.ActiveCfg = Release|x64
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Win32.Build.0 = Debug|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|x64.ActiveCfg = Debug|x64
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|x64.Build.0 = Debug|x64
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|x86.ActiveCfg = Debug|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Any CPU.ActiveCfg = Release|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Win32.ActiveCfg = Release|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Win32.Build.0 = Release|Win32
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|x64.ActiveCfg = Release|x64
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|x64.Build.0 = Release|x64
+ {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|x86.ActiveCfg = Release|x64
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Win32.Build.0 = Debug|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|x64.ActiveCfg = Debug|x64
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|x64.Build.0 = Debug|x64
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|x86.ActiveCfg = Debug|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Any CPU.ActiveCfg = Release|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Win32.ActiveCfg = Release|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Win32.Build.0 = Release|Win32
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|x64.ActiveCfg = Release|x64
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|x64.Build.0 = Release|x64
+ {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|x86.ActiveCfg = Release|x64
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Win32.ActiveCfg = Debug|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Win32.Build.0 = Debug|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|x64.ActiveCfg = Debug|x64
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|x64.Build.0 = Debug|x64
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|x86.ActiveCfg = Debug|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Any CPU.ActiveCfg = Release|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Win32.ActiveCfg = Release|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Win32.Build.0 = Release|Win32
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|x64.ActiveCfg = Release|x64
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|x64.Build.0 = Release|x64
+ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|x86.ActiveCfg = Release|x64
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|Win32.ActiveCfg = Debug|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|x64.Build.0 = Debug|Any CPU
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|x86.ActiveCfg = Debug|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|x86.Build.0 = Debug|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Mixed Platforms.Build.0 = Release|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Win32.ActiveCfg = Release|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|x64.ActiveCfg = Release|Any CPU
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|x64.Build.0 = Release|Any CPU
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|x86.ActiveCfg = Release|x86
+ {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|x86.Build.0 = Release|x86
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
+ {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Debug|Win32.Build.0 = Debug|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Debug|x64.ActiveCfg = Debug|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Debug|x86.ActiveCfg = Debug|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Release|Win32.ActiveCfg = Release|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Release|Win32.Build.0 = Release|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Release|x64.ActiveCfg = Release|Win32
+ {7DF920B2-EFDA-11DA-988C-EBAD6065650A}.Release|x86.ActiveCfg = Release|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Debug|Win32.Build.0 = Debug|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Debug|x64.ActiveCfg = Debug|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Debug|x86.ActiveCfg = Debug|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Release|Any CPU.ActiveCfg = Release|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Release|Win32.ActiveCfg = Release|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Release|Win32.Build.0 = Release|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Release|x64.ActiveCfg = Release|Win32
+ {8CF9FC64-EFDD-11DA-986F-EA05CA2469B6}.Release|x86.ActiveCfg = Release|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {8A49554A-EFE3-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {55215A1C-EFE2-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {C0990F5A-EFE3-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {441F1D0C-EFE3-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {BFCB4C14-EFE3-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {B0058FA6-EFE3-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {607116BE-F168-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Debug|Win32.Build.0 = Debug|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Debug|x64.ActiveCfg = Debug|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Debug|x86.ActiveCfg = Debug|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Release|Any CPU.ActiveCfg = Release|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Release|Win32.Build.0 = Release|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Release|x64.ActiveCfg = Release|Win32
+ {FAB7D8D8-C7DD-11DB-930B-CD6B662399AA}.Release|x86.ActiveCfg = Release|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Debug|Win32.Build.0 = Debug|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Debug|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Debug|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|Win32
+ {40062448-EFE0-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|Win32.Build.0 = Debug|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|x64.ActiveCfg = Debug|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|x86.ActiveCfg = Debug|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Win32.ActiveCfg = Release|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Win32.Build.0 = Release|Win32
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|x64.ActiveCfg = Release|x64
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|x64.Build.0 = Release|x64
+ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|x86.ActiveCfg = Release|Win32
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|Mixed Platforms.Build.0 = Debug|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|Win32.Build.0 = Debug|Win32
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|x64.ActiveCfg = Debug|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|x64.Build.0 = Debug|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|x86.ActiveCfg = Debug|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Any CPU.ActiveCfg = Release|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Mixed Platforms.ActiveCfg = Release|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Mixed Platforms.Build.0 = Release|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Win32.Build.0 = Release|Win32
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|x64.ActiveCfg = Release|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|x64.Build.0 = Release|x64
+ {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|x86.ActiveCfg = Release|x64
+ {408E2482-2623-11DB-9BB9-97600548391D}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Debug|Win32.Build.0 = Debug|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Debug|x64.ActiveCfg = Debug|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Debug|x86.ActiveCfg = Debug|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|Any CPU.ActiveCfg = Release|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|Win32.ActiveCfg = Release|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|Win32.Build.0 = Release|Win32
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|x64.ActiveCfg = Release|x64
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|x64.Build.0 = Release|x64
+ {408E2482-2623-11DB-9BB9-97600548391D}.Release|x86.ActiveCfg = Release|Win32
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|Mixed Platforms.Build.0 = Debug|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|Win32.Build.0 = Debug|Win32
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|x64.ActiveCfg = Debug|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|x64.Build.0 = Debug|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|x86.ActiveCfg = Debug|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Any CPU.ActiveCfg = Release|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Mixed Platforms.ActiveCfg = Release|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Mixed Platforms.Build.0 = Release|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Win32.Build.0 = Release|Win32
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|x64.ActiveCfg = Release|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|x64.Build.0 = Release|x64
+ {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|x86.ActiveCfg = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/win64/virtuoso_odbc_clr_t.vcproj b/win64/virtuoso_odbc_clr_t.vcproj
new file mode 100644
index 0000000..6f005d9
--- /dev/null
+++ b/win64/virtuoso_odbc_clr_t.vcproj
@@ -0,0 +1,527 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtuoso_clr_t"
+ ProjectGUID="{8D07389F-F48A-49B9-BED9-F71FCBACC4A8}"
+ RootNamespace="virtuoso_clr_t"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib advapi32.lib Mscoree.lib"
+ OutputFile="$(OutDir)/virtuoso-clr-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_clr_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib advapi32.lib Mscoree.lib"
+ OutputFile="$(OutDir)/virtuoso-clr-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_clr_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib advapi32.lib Mscoree.lib"
+ OutputFile="$(OutDir)/virtuoso-clr-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_clr_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib advapi32.lib Mscoree.lib"
+ OutputFile="$(OutDir)/virtuoso-clr-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_clr_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\mono\basec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\dotnet.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\sql_code_clr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\sql_code_xslt.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ <File
+ RelativePath="..\win32\virtuoso_t.rc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="PreBuild"
+ >
+ <File
+ RelativePath="..\binsrc\hosting\mono\import_clr.sql"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_clr.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_clr.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_clr.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_clr.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\mono_type.xsl"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_xslt.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_xslt.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG $(InputFileName) > sql_code_xslt.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_xslt.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sql_code_xslt.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG $(InputFileName) > sql_code_xslt.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\hosting\mono\virtclr.cs"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

csc /t:library /out:$(TargetDir)/virtclr.dll $(InputFileName)
csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
gacutil -u virt_http
gacutil -i $(TargetDir)/virt_http.dll

cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\virt_http.cs"
+ Outputs="$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

csc /t:library /out:$(TargetDir)/virtclr.dll $(InputFileName)
csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
gacutil -u virt_http
gacutil -i $(TargetDir)/virt_http.dll

cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\virt_http.cs"
+ Outputs="$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

csc /t:library /out:$(TargetDir)/virtclr.dll $(InputFileName)
csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
gacutil -u virt_http
gacutil -i $(TargetDir)/virt_http.dll

cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\virt_http.cs"
+ Outputs="$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

csc /t:library /out:$(TargetDir)/virtclr.dll $(InputFileName)
csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
gacutil -u virt_http
gacutil -i $(TargetDir)/virt_http.dll

cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\virt_http.cs"
+ Outputs="$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/virtuoso_odbc_javavm_t.vcproj b/win64/virtuoso_odbc_javavm_t.vcproj
new file mode 100644
index 0000000..d37cf62
--- /dev/null
+++ b/win64/virtuoso_odbc_javavm_t.vcproj
@@ -0,0 +1,525 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtuoso_javavm_t"
+ ProjectGUID="{02AD88A0-CF7B-11DA-85E2-A4E5714C712A}"
+ RootNamespace="virtuoso_javavm_t"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories=""$(JDK_PATH)\include";..\libsrc\xml.new;..\libsrc;"$(JDK_PATH)\include\win32";..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib "$(JDK_PATH)\lib\jvm.lib""
+ OutputFile="$(OutDir)/virtuoso-javavm-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_javavm_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories=""$(JDK_PATH)\include";..\libsrc\xml.new;..\libsrc;"$(JDK_PATH)\include\win32";..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib "$(JDK_PATH)\lib\jvm.lib""
+ OutputFile="$(OutDir)/virtuoso-javavm-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_javavm_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories=""$(JDK_PATH)\include";..\libsrc\xml.new;..\libsrc;"$(JDK_PATH)\include\win32";..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib "$(JDK_PATH)\lib\jvm.lib""
+ OutputFile="$(OutDir)/virtuoso-javavm-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_javavm_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories=""$(JDK_PATH)\include";..\libsrc\xml.new;..\libsrc;"$(JDK_PATH)\include\win32";..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib "$(JDK_PATH)\lib\jvm.lib""
+ OutputFile="$(OutDir)/virtuoso-javavm-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_javavm_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\binsrc\tests\biftest\java_code.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\javavm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\sql_code_clr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\sql_code_javavm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\sql_code_xslt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\win32\virtuoso_t.rc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <Filter
+ Name="PreBuild"
+ >
+ <File
+ RelativePath="..\binsrc\tests\biftest\import_clr.sql"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_clr.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_clr.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_clr.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_clr.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_clr.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\javavm_type.xsl"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_xslt.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_xslt.c 
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG $(InputFileName) > sql_code_xslt.c

cd $(ProjectDir)"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_clr.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG $(InputPath) > sql_code_xslt.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_xslt.c 
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG $(InputFileName) > sql_code_xslt.c

cd $(ProjectDir)"
+ Outputs="$(InputDir)\sql_code_xslt.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\binsrc\tests\biftest\javavm_xml.sql"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_javavm.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_javavm.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_javavm.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_javavm.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_javavm.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_javavm.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)

rm -f sql_code_javavm.c
gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c

cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sql_code_javavm.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/virtuoso_odbc_sample_t.vcproj b/win64/virtuoso_odbc_sample_t.vcproj
new file mode 100644
index 0000000..7e96e89
--- /dev/null
+++ b/win64/virtuoso_odbc_sample_t.vcproj
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtuoso_sample_t"
+ ProjectGUID="{0E838FA8-CF7B-11DA-85E2-A4E5714C712A}"
+ RootNamespace="virtuoso_sample_t"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(OutDir)/virtuoso-sample-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_sample_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(OutDir)/virtuoso-sample-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_sample_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(OutDir)/virtuoso-sample-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_sample_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;."
+ PreprocessorDefinitions="INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="libvirtuoso-t.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(OutDir)/virtuoso-sample-t.exe"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/virtuoso_sample_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\binsrc\tests\biftest\bif_sample.c"
+ >
+ </File>
+ <File
+ RelativePath="..\win32\virtuoso_t.rc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/virtuoso_odbc_t.vcproj b/win64/virtuoso_odbc_t.vcproj
new file mode 100644
index 0000000..02e2073
--- /dev/null
+++ b/win64/virtuoso_odbc_t.vcproj
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="virtuoso_t"
+ ProjectGUID="{F4E88BFA-FC96-439D-9E67-0A92AB541EE0}"
+ RootNamespace="virtuoso_t"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/virtuoso_t.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;PACKAGE_VERSION="6.1.3""
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ AdditionalIncludeDirectories="..\openlink\include;..\xOs\stubs"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtuoso-t.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtuoso_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/virtuoso_t.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;PACKAGE_VERSION=\"6.1.3\""
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ AdditionalIncludeDirectories="..\openlink\include;..\xOs\stubs"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtuoso-t.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtuoso_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(ConfigurationName)/virtuoso_t.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ AdditionalIncludeDirectories="..\openlink\include;..\xOs\stubs"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/virtuoso-t.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName);.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtuoso_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/virtuoso_t.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\plugin,..\libsrc\langfunc,..\libsrc\openssl, ."
+ PreprocessorDefinitions="PACKAGE_VERSION=\"6.1.3\";_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1049"
+ AdditionalIncludeDirectories="..\openlink\include;..\xOs\stubs"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="threadw.lib wi.lib dksrv.lib util.lib xml.lib zlib.lib ws2_32.lib libeay32.lib ssleay32.lib tidy.lib"
+ OutputFile="$(ConfigurationName)/virtuoso-t.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=""$(ConfigurationName)";.\openssl;..\libsrc\openssl"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/virtuoso_t.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\shcompo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtuoso\viconfig.c"
+ >
+ </File>
+ <File
+ RelativePath="..\win32\virtuoso_t.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\binsrc\virtuoso\viwin32.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/wi.vcproj b/win64/wi.vcproj
new file mode 100644
index 0000000..56e6fd2
--- /dev/null
+++ b/win64/wi.vcproj
@@ -0,0 +1,2495 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wi"
+ ProjectGUID="{93051962-7797-49F0-8958-BB1CE60FFE6F}"
+ RootNamespace="wi"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\zlib;..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\tidy;..\binsrc\driver;."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;YY_NO_UNISTD_H"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="YYDEBUG"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wi.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\zlib;..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\plugin;..\libsrc\langfunc;"$(InputDir)\tidy";..\binsrc\driver;.;..\libsrc\Tidy"
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;YY_NO_UNISTD_H;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;OLD_TIDY"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="YYDEBUG"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wi.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\zlib;..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\tidy;..\binsrc\driver;."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;YY_NO_UNISTD_H"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="YYDEBUG"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wi.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\zlib;..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\tidy;..\binsrc\driver;."
+ PreprocessorDefinitions="_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;YY_NO_UNISTD_H;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="YYDEBUG"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\wi.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\2pc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\aqueue.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\arith.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\auxfiles.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_audio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_crypto.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_date.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_dav.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_diff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_explain.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_file.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_gnw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_imap.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_intl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_json.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_kerberoscli.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_ldapcli.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_mts.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_nntp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_phrasematch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_pop3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_regexp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_repl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_smtp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_soap.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_text.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_tidy.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_uuencode.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_xml.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_xper.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bitmap.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\blob.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\blobio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\cl_stubs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\crypt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\ddlrun.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\disk.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\dks_esc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\eqlcomp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\extent.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\gate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\hash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\hosting.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\http.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\http_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\insert.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\inxop.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\jso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\json_l.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\json_p.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\lisprdr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\lock.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\log.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\map_schema.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\map_schema.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\meta.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mtwrite.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\neodisk.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\nquad_p.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\obackup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\odbccat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\page.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\pldebug.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\plugin_loader.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdf_core.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdf_mapping_jso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdfbox.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdfinf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdfxml_parser.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\recovery.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\regist.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rltrx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\row.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\schspace.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\scn3_vsnet.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\search.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\search_in.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\security.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\shuric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sort.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\space.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql2sql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql2sqltext.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_core.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_l.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_p.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_qm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_rdb2rdf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_sff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_tree.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparqld.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparul2sql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql3_vc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_1.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_2pc.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_adm.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_auto.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_blog.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_cache.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_cache_impl.c"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_dav.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_dbp.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_ddk.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_imsg.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_pldbg.c"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_repl.c"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_sparql.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_sys.c"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_uddi.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_vad.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_vdb.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_code_ws.c"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlbif.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlbif2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcomp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcomp2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcost.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqldf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlexp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlgen.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlhash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlintrp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlinx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloby.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlocr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloinv.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloinx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloprt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlorder.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlovdb.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlpfn.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlprocc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlprt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrbuf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrcomp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrrun.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrun.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlsrv.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlstmts.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqltrig.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqltype.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlver.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlview.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvmultibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvstat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\string.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\subseq.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\text.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\trans.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_l.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_p.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\uname_const_decl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\update.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\uuencode.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wiservic.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc-dec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc_algos.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmllazy.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlschema.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlsearch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlsql.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmltree.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpath.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpathp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpscn_vsnet.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xqf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xslt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xslt_fmt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xslt_opt.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\2pc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\2pc_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\arith.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_text.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\bif_xper.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\blobio.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLI.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\crsr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\date.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\eqlcomp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\hosting.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\http.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\http_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\iodbcinst.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\ksrvext.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\ksrvextphp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\license.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\lisprdr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\list2.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\log.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\ltrx.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\msdtc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_com.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\odbcinc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\pldebug.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rdf_core.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\recovery.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\remote.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\rendezvous.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\repl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\replsr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\schspace.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\security.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sha.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\shuric.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\soap.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql2sql.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_p.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql3.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlbif.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcmps.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcomp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlcstate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlfn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlintrp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlnode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlo.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlocr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlofn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqloinv.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlopcod.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlpar.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlparext.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlpfn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlrcomp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqltype.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqltype_c.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlver.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlwords.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvmultibyte.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\srvstat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\statuslog.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\strlike.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\subseq.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\text.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_p.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\uuencode_impl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\virtext.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\virtpwd.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\widd.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\widisk.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\widv.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wifn.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpce.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wiservic.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xml.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc_algos.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlenc_test.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlgen.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlnode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmlres.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xmltree.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpath.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpathp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpathp_impl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xqf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xslt_impl.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="PreBuild"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\json.l"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f json_l.c
flex -8 -Pjsonyy -ojson_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)json_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f json_l.c
flex -8 -Pjsonyy -ojson_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)json_l.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\json.y"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f json_p.c
rm -f json_p.h
bison -y -vd -pjsonyy json.y -ojson_p.c
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)json_p.c;$(InputDir)json_p.h"
+ Outputs="$(InputDir)json_p.c;$(InputDir)json_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f json_p.c
rm -f json_p.h
bison -y -vd -pjsonyy json.y -ojson_p.c
cd $(ProjectDir)
"
+ AdditionalDependencies=""
+ Outputs="$(InputDir)json_p.c;$(InputDir)json_p.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\nquad_p.y"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f nquad_p.c
rm -f nquad_p.h
bison -y -vd -pnqyy nquad_p.y -onquad_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)nquad_p.c;$(InputDir)nquad_p.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\scn3.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f scn3_vsnet.c
flex -oscn3_vsnet.c $(InputPath)
flex -Pscn3splityy -oscn3split.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)scn3_vsnet.c;$(InputDir)scn3split.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f scn3_vsnet.c
flex -oscn3_vsnet.c $(InputPath)
flex -Pscn3splityy -oscn3split.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)scn3_vsnet.c;$(InputDir)scn3split.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f scn3_vsnet.c
flex -oscn3_vsnet.c $(InputPath)
flex -Pscn3splityy -oscn3split.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)scn3_vsnet.c;$(InputDir)scn3split.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f scn3_vsnet.c
flex -oscn3_vsnet.c $(InputPath)
flex -Pscn3splityy -oscn3split.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)scn3_vsnet.c;$(InputDir)scn3split.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_l.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_l.c
flex -8 -Psparyy -osparql_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_l.c
flex -8 -Psparyy -osparql_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_l.c
flex -8 -Psparyy -osparql_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_l.c
flex -8 -Psparyy -osparql_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_l.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sparql_p.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_p.c
rm -f sparql_p.h
bison -y -vd -psparyy sparql_p.y -osparql_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_p.c;$(InputDir)sparql_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_p.c
rm -f sparql_p.h
bison -y -vd -psparyy sparql_p.y -osparql_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_p.c;$(InputDir)sparql_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_p.c
rm -f sparql_p.h
bison -y -vd -psparyy sparql_p.y -osparql_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_p.c;$(InputDir)sparql_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sparql_p.c
rm -f sparql_p.h
bison -y -vd -psparyy sparql_p.y -osparql_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sparql_p.c;$(InputDir)sparql_p.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql3.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sql3.c
rm -f sql3.h
bison -y -vd sql3.y -osql3.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sql3.c;$(InputDir)sql3.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sql3.c
rm -f sql3.h
bison -y -vd sql3.y -osql3.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sql3.c;$(InputDir)sql3.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sql3.c
rm -f sql3.h
bison -y -vd sql3.y -osql3.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sql3.c;$(InputDir)sql3.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f sql3.c
rm -f sql3.h
bison -y -vd sql3.y -osql3.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)sql3.c;$(InputDir)sql3.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sql_to_c.awk"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
$(ProjectDir)\sqlcode.bat
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\..\..\binsrc\vspx\vspx.xsl"
+ Outputs="$(InputDir)\sql_code.c;$(InputDir)\sql_code_1.c;$(InputDir)\sql_code_ddk.c;$(InputDir)\sql_code_adm.c;$(InputDir)\sql_code_dav.c;$(InputDir)\sql_code_vad.c;$(InputDir)\sql_code_dbp.c;$(InputDir)\sql_code_uddi.c;$(InputDir)\sql_code_imsg.c;$(InputDir)\sql_code_auto.c;$(InputDir)\sql_code_2pc.c;$(InputDir)\rdf_mapping_jso.h;$(InputDir)\rdf_mapping_jso.c;$(InputDir)\rdf_mapping_jso.ttl;$(InputDir)\rdf_mapping_jso.ttl-sample"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
$(ProjectDir)\sqlcode.bat
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\..\..\binsrc\vspx\vspx.xsl"
+ Outputs="$(InputDir)\sql_code.c;$(InputDir)\sql_code_1.c;$(InputDir)\sql_code_ddk.c;$(InputDir)\sql_code_adm.c;$(InputDir)\sql_code_dav.c;$(InputDir)\sql_code_vad.c;$(InputDir)\sql_code_dbp.c;$(InputDir)\sql_code_uddi.c;$(InputDir)\sql_code_imsg.c;$(InputDir)\sql_code_auto.c;$(InputDir)\sql_code_2pc.c;$(InputDir)\rdf_mapping_jso.h;$(InputDir)\rdf_mapping_jso.c;$(InputDir)\rdf_mapping_jso.ttl;$(InputDir)\rdf_mapping_jso.ttl-sample"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
$(ProjectDir)\sqlcode.bat
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\..\..\binsrc\vspx\vspx.xsl"
+ Outputs="$(InputDir)\sql_code.c;$(InputDir)\sql_code_1.c;$(InputDir)\sql_code_ddk.c;$(InputDir)\sql_code_adm.c;$(InputDir)\sql_code_dav.c;$(InputDir)\sql_code_vad.c;$(InputDir)\sql_code_dbp.c;$(InputDir)\sql_code_uddi.c;$(InputDir)\sql_code_imsg.c;$(InputDir)\sql_code_auto.c;$(InputDir)\sql_code_2pc.c;$(InputDir)\rdf_mapping_jso.h;$(InputDir)\rdf_mapping_jso.c;$(InputDir)\rdf_mapping_jso.ttl;$(InputDir)\rdf_mapping_jso.ttl-sample"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
$(ProjectDir)\sqlcode.bat
cd $(ProjectDir)
"
+ AdditionalDependencies="$(InputDir)\..\..\binsrc\vspx\vspx.xsl"
+ Outputs="$(InputDir)\sql_code.c;$(InputDir)\sql_code_1.c;$(InputDir)\sql_code_ddk.c;$(InputDir)\sql_code_adm.c;$(InputDir)\sql_code_dav.c;$(InputDir)\sql_code_vad.c;$(InputDir)\sql_code_dbp.c;$(InputDir)\sql_code_uddi.c;$(InputDir)\sql_code_imsg.c;$(InputDir)\sql_code_auto.c;$(InputDir)\sql_code_2pc.c;$(InputDir)\rdf_mapping_jso.h;$(InputDir)\rdf_mapping_jso.c;$(InputDir)\rdf_mapping_jso.ttl;$(InputDir)\rdf_mapping_jso.ttl-sample"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\sqlwords.gperf"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sqlwords.h
gperf -aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$ sqlwords.gperf -Nlex_hash_kw | sed -e 's/char \*keyword/char *keiiyword/g' >sqlwords.h
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sqlwords.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
rm -f sqlwords.h
gperf -aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$ sqlwords.gperf -Nlex_hash_kw | sed -e 's/char \*keyword/char *keiiyword/g' >sqlwords.h
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\sqlwords.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_l.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_l.c
flex -8 -Pttlyy -oturtle_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_l.c
flex -8 -Pttlyy -oturtle_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_l.c
flex -8 -Pttlyy -oturtle_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_l.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_l.c
flex -8 -Pttlyy -oturtle_l.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_l.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\turtle_p.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_p.c
rm -f turtle_p.h
bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_p.c;$(InputDir)turtle_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_p.c
rm -f turtle_p.h
bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_p.c;$(InputDir)turtle_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_p.c
rm -f turtle_p.h
bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)turtle_p.c;$(InputDir)turtle_p.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f turtle_p.c
rm -f turtle_p.h
bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\turtle_p.c;$(InputDir)\turtle_p.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpathp.y"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpathp.c
rm -f xpathp.h
bison -y -vd -pxpyy xpathp.y -oxpathp.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpathp.c;$(InputDir)xpathp.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpathp.c
rm -f xpathp.h
bison -y -vd -pxpyy xpathp.y -oxpathp.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpathp.c;$(InputDir)xpathp.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpathp.c
rm -f xpathp.h
bison -y -vd -pxpyy xpathp.y -oxpathp.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpathp.c;$(InputDir)xpathp.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpathp.c
rm -f xpathp.h
bison -y -vd -pxpyy xpathp.y -oxpathp.c
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpathp.c;$(InputDir)xpathp.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\xpscn.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpscn_vsnet.c
flex -i -oxpscn_vsnet.c -Pxpyy $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpscn_vsnet.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpscn_vsnet.c
flex -i -oxpscn_vsnet.c -Pxpyy $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpscn_vsnet.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpscn_vsnet.c
flex -i -oxpscn_vsnet.c -Pxpyy $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpscn_vsnet.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f xpscn_vsnet.c
flex -i -oxpscn_vsnet.c -Pxpyy $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)xpscn_vsnet.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/wic.vcproj b/win64/wic.vcproj
new file mode 100644
index 0000000..1ef37b2
--- /dev/null
+++ b/win64/wic.vcproj
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wic"
+ ProjectGUID="{A66E395B-18EE-4877-8F0D-386A7BBAB370}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wic.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wic.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\wic.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,."
+ PreprocessorDefinitions="_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\wic.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\blobio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIcr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIodbc3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql3.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIsql3W.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIuti.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\CLIw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\datesupp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\plugin\dlf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\mts_client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\multibyte.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\numeric.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\pldbgcli.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\plugin_gate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wi_xid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Wi\wirpc.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Wi\wirpce.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/wiki_vad.vcproj b/win64/wiki_vad.vcproj
new file mode 100644
index 0000000..5a8b4b6
--- /dev/null
+++ b/win64/wiki_vad.vcproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wiki_vad"
+ ProjectGUID="{40062448-EFE0-11DA-85E2-A4E5714C712A}"
+ RootNamespace="ods_wiki_vad"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_wiki_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_wiki_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)\ods_wiki_vad"
+ IntermediateDirectory="$(ConfigurationName)\ods_wiki_vad"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=""
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\make_vad.sh"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_wiki_dav.vad"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="cd $(InputDir)
set PATH=$(TargetDir)\..;%PATH%
set HOME=$(ProjectDir)\..\
set PORT=5555
set ISQL=isql.exe
set SERVER=virtuoso-t.exe
bash make_vad.sh
cd $(ProjectDir)
"
+ AdditionalDependencies="$(TargetDir)\..\isql.exe;$(TargetDir)\..\virtuoso-t.exe"
+ Outputs="$(InputDir)\ods_wiki_dav.vad"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/wikiv.vcproj b/win64/wikiv.vcproj
new file mode 100644
index 0000000..b1bb03c
--- /dev/null
+++ b/win64/wikiv.vcproj
@@ -0,0 +1,534 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wikiv"
+ ProjectGUID="{A326A0DF-4F93-4DF6-813D-0B64F98B389F}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/wikiv.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/wikiv.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\wikiv.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/wikiv.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/wikiv.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/wikiv.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/wikiv.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\wikiv.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/wikiv.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/wikiv.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(ConfigurationName)/wikiv.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/wikiv.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\wikiv.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/wikiv.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/wikiv.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(ConfigurationName)/wikiv.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\binsrc\driver,..\libsrc\Wi,..\libsrc\langfunc,..\libsrc\plugin,..\binsrc\driver\include..\libsrc\Dk,..\libsrc\util\win32,..\libsrc;..\libsrc\Xml.new;openssl,."
+ PreprocessorDefinitions="_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1049"
+ AdditionalIncludeDirectories="..\libsrc\Wi"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ AdditionalDependencies="dk1t.lib threadw.lib util.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib ssleay32.lib"
+ OutputFile="$(ConfigurationName)/wikiv.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ConfigurationName),.\openssl"
+ IgnoreDefaultLibraryNames="LIBCD.lib"
+ ModuleDefinitionFile="..\appsrc\ODS-Wiki\plugin\wikiv.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(ConfigurationName)/wikiv.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(ConfigurationName)/wikiv.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\plugin\import_gate_virtuoso.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\maclex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\wikilex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\wikiv.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ <Filter
+ Name="LexFiles"
+ >
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\maclex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f maclex.c
flex -8 -Pmacyy -omaclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f maclex.c
flex -8 -Pmacyy -omaclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f maclex.c
flex -8 -Pmacyy -omaclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\maclex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f maclex.c
flex -8 -Pmacyy -omaclex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\maclex.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\appsrc\ODS-Wiki\plugin\wikilex.l"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f wikilex.c
flex -8 -Pwikiyy -owikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f wikilex.c
flex -8 -Pwikiyy -owikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f wikilex.c
flex -8 -Pwikiyy -owikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\wikilex.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="
cd $(InputDir)
rm -f wikilex.c
flex -8 -Pwikiyy -owikilex.c $(InputPath)
cd $(ProjectDir)
"
+ Outputs="$(InputDir)\wikilex.c"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/xml.vcproj b/win64/xml.vcproj
new file mode 100644
index 0000000..683c6e9
--- /dev/null
+++ b/win64/xml.vcproj
@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="xml"
+ ProjectGUID="{0C234EF0-7725-4BDA-A1C3-47F5835A3837}"
+ RootNamespace="xml"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,..\libsrc\util\pcrelib"
+ PreprocessorDefinitions="_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="XML_NS"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\xml.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver,..\libsrc\langfunc,..\libsrc\plugin,..\libsrc\util\pcrelib"
+ PreprocessorDefinitions="_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="XML_NS"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\xml.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\libsrc\langfunc,..\libsrc\plugin,..\libsrc\util\pcrelib"
+ PreprocessorDefinitions="_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="XML_NS"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\xml.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\libsrc\langfunc,..\libsrc\plugin,..\libsrc\util\pcrelib"
+ PreprocessorDefinitions="_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ UndefinePreprocessorDefinitions="XML_NS"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\xml.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\Xml.new\charclasses.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\datatypes.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\dtd.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\encodings.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\html_mode.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\schema.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\schema_fsm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xhtml_ent.gperf"
+ >
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="gperf -aCDGptr -Kentity -k1,2,3,4,5,$ $(InputDir)xhtml_ent.gperf -Nxhtml_ent_gperf > $(InputDir)xhtml_ent.h

"
+ Outputs="xhtml_ent.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xml_ecm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlgram.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlparser.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlread.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\libsrc\Xml.new\charclasses.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\encodings.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\html_mode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\schema.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xml_ecm.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlparser.h"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\Xml.new\xmlparser_impl.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win64/zlib.vcproj b/win64/zlib.vcproj
new file mode 100644
index 0000000..ef2d75d
--- /dev/null
+++ b/win64/zlib.vcproj
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="zlib"
+ ProjectGUID="{86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}"
+ RootNamespace="zlib"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\zlib.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/Zm200 "
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libsrc\xml.new,..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\Wi,..\libsrc\zlib,..\binsrc\driver"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="/MACHINE:AMD64"
+ OutputFile="$(ConfigurationName)\zlib.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\zlib"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\zlib.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions=""
+ Optimization="3"
+ OmitFramePointers="false"
+ AdditionalIncludeDirectories="..\libsrc,..\libsrc\Dk,..\libsrc\util\win32,..\libsrc\zlib"
+ PreprocessorDefinitions="_LIBC,INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ UsePrecompiledHeader="0"
+ BrowseInformation="0"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(ConfigurationName)\zlib.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\libsrc\zlib\adler32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\compress.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\crc32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\deflate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\gzio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\infback.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\inffast.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\inflate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\inftrees.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\trees.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\uncompr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libsrc\zlib\zutil.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/windows/blobs.vcxproj b/windows/blobs.vcxproj
deleted file mode 100644
index a16c5eb..0000000
--- a/windows/blobs.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>blobs</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/blobs.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)blobs.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/blobs.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/blobs.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)blobs.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/blobs.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\blobs.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/burstoff.vcxproj b/windows/burstoff.vcxproj
deleted file mode 100644
index 18d61d5..0000000
--- a/windows/burstoff.vcxproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>burstoff</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/burstoff.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)burstoff.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/burstoff.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/burstoff.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)burstoff.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/burstoff.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\burstoff.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/creolewiki.vcxproj b/windows/creolewiki.vcxproj
deleted file mode 100644
index b1f1877..0000000
--- a/windows/creolewiki.vcxproj
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{ABE43C46-E1C4-11DB-930B-CD6B662399AA}</ProjectGuid>
- <RootNamespace>creolewiki</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/creolewiki.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)creolewiki.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\appsrc\ODS-Wiki\plugin\creolewiki.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/creolewiki.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)creolewiki.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\appsrc\ODS-Wiki\plugin\creolewiki.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <AdditionalOptions>
- </AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\creole_maclex.c" />
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\creole_wikilex.c" />
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\creolewiki.c" />
- <ClCompile Include="..\libsrc\plugin\import_gate_virtuoso.c" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\appsrc\ODS-Wiki\plugin\creole_maclex.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f creole_maclex.c
-flex -8 -Pcreolemacyy -ocreole_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\creole_maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f creole_maclex.c
-flex -8 -Pcreolemacyy -ocreole_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f creole_maclex.c
-flex -8 -Pcreolemacyy -ocreole_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\creole_maclex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\creole_maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f creole_maclex.c
-flex -8 -Pcreolemacyy -ocreole_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\creole_maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f creole_maclex.c
-flex -8 -Pcreolemacyy -ocreole_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f creole_maclex.c
-flex -8 -Pcreolemacyy -ocreole_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\creole_maclex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\creole_maclex.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\appsrc\ODS-Wiki\plugin\creole_wikilex.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f creole_wikilex.c
-flex -8 -Pcreolewikiyy -ocreole_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\creole_wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f creole_wikilex.c
-flex -8 -Pcreolewikiyy -ocreole_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f creole_wikilex.c
-flex -8 -Pcreolewikiyy -ocreole_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\creole_wikilex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\creole_wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f creole_wikilex.c
-flex -8 -Pcreolewikiyy -ocreole_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\creole_wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f creole_wikilex.c
-flex -8 -Pcreolewikiyy -ocreole_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f creole_wikilex.c
-flex -8 -Pcreolewikiyy -ocreole_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\creole_wikilex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\creole_wikilex.c;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/cursor.vcxproj b/windows/cursor.vcxproj
deleted file mode 100644
index 538c0cd..0000000
--- a/windows/cursor.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{97D467CE-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>cursor</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/cursor.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)cursor.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/cursor.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/cursor.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)cursor.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/cursor.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\cursor.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/cutter.vcxproj b/windows/cutter.vcxproj
deleted file mode 100644
index 3191383..0000000
--- a/windows/cutter.vcxproj
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{6E10B655-C324-491F-B202-73565D6B30FB}</ProjectGuid>
- <RootNamespace>cutter</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/cutter.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <OutputFile>$(OutDir)cutter.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/cutter.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <OutputFile>$(OutDir)cutter.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\sqldoc\cutter.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/dk1t.vcxproj b/windows/dk1t.vcxproj
deleted file mode 100644
index 4367d51..0000000
--- a/windows/dk1t.vcxproj
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}</ProjectGuid>
- <RootNamespace>dk1t</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>0</PrecompiledHeaderOutputFile>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)dk1t.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>0</PrecompiledHeaderOutputFile>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)dk1t.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="..\libsrc\Dk\config.h" />
- <ClInclude Include="..\libsrc\Dk\Dkstubs.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Dk\Dkalloc.c" />
- <ClCompile Include="..\libsrc\Dk\Dkbasket.c" />
- <ClCompile Include="..\libsrc\Dk\Dkbox.c" />
- <ClCompile Include="..\libsrc\Dk\Dkdevice.c" />
- <ClCompile Include="..\libsrc\Dk\Dkhash.c" />
- <ClCompile Include="..\libsrc\Dk\Dkhashext.c" />
- <ClCompile Include="..\libsrc\Dk\Dkmarshal.c" />
- <ClCompile Include="..\libsrc\Dk\Dkpool.c" />
- <ClCompile Include="..\libsrc\Dk\Dkresource.c" />
- <ClCompile Include="..\libsrc\Dk\Dkrusage.c" />
- <ClCompile Include="..\libsrc\Dk\Dkses2.c" />
- <ClCompile Include="..\libsrc\Dk\Dksesinp.c" />
- <ClCompile Include="..\libsrc\Dk\Dksession.c" />
- <ClCompile Include="..\libsrc\Dk\Dksesstr.c" />
- <ClCompile Include="..\libsrc\Dk\Dksestcp.c" />
- <ClCompile Include="..\libsrc\Dk\Dksets.c" />
- <ClCompile Include="..\libsrc\Dk\Dkstkern.c" />
- <ClCompile Include="..\libsrc\Dk\Dkstubs.c" />
- <ClCompile Include="..\libsrc\Dk\Dkutil.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/dksrv.vcxproj b/windows/dksrv.vcxproj
deleted file mode 100644
index 0c30a3f..0000000
--- a/windows/dksrv.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{58867EBA-CA07-4F41-A966-6245FF14773E}</ProjectGuid>
- <RootNamespace>dksrv</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)dksrv.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)dksrv.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Dk\Dkalloc.c" />
- <ClCompile Include="..\libsrc\Dk\Dkbasket.c" />
- <ClCompile Include="..\libsrc\Dk\Dkbox.c" />
- <ClCompile Include="..\libsrc\Dk\Dkdevice.c" />
- <ClCompile Include="..\libsrc\Dk\Dkernel.c" />
- <ClCompile Include="..\libsrc\Dk\Dkhash.c" />
- <ClCompile Include="..\libsrc\Dk\Dkhashext.c" />
- <ClCompile Include="..\libsrc\Dk\Dkmarshal.c" />
- <ClCompile Include="..\libsrc\Dk\Dkpool.c" />
- <ClCompile Include="..\libsrc\Dk\Dkresource.c" />
- <ClCompile Include="..\libsrc\Dk\Dkrusage.c" />
- <ClCompile Include="..\libsrc\Dk\Dkses2.c" />
- <ClCompile Include="..\libsrc\Dk\Dksesinp.c" />
- <ClCompile Include="..\libsrc\Dk\Dksession.c" />
- <ClCompile Include="..\libsrc\Dk\Dksesstr.c" />
- <ClCompile Include="..\libsrc\Dk\Dksestcp.c" />
- <ClCompile Include="..\libsrc\Dk\Dksets.c" />
- <ClCompile Include="..\libsrc\Dk\Dkstubs.c" />
- <ClCompile Include="..\libsrc\Dk\Dkutil.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\libsrc\Dk\Dkalloc.h" />
- <ClInclude Include="..\libsrc\Dk\Dkbasket.h" />
- <ClInclude Include="..\libsrc\Dk\Dkbox.h" />
- <ClInclude Include="..\libsrc\Dk\Dkconfig.h" />
- <ClInclude Include="..\libsrc\Dk\Dkdevice.h" />
- <ClInclude Include="..\libsrc\Dk\Dkernel.h" />
- <ClInclude Include="..\libsrc\Dk\Dkhash.h" />
- <ClInclude Include="..\libsrc\Dk\Dkhashext.h" />
- <ClInclude Include="..\libsrc\Dk\Dkmarshal.h" />
- <ClInclude Include="..\libsrc\Dk\Dkparam.h" />
- <ClInclude Include="..\libsrc\Dk\Dkpool.h" />
- <ClInclude Include="..\libsrc\Dk\Dkresource.h" />
- <ClInclude Include="..\libsrc\Dk\Dksession.h" />
- <ClInclude Include="..\libsrc\Dk\Dksets.h" />
- <ClInclude Include="..\libsrc\Dk\Dkstubs.h" />
- <ClInclude Include="..\libsrc\Dk\Dksystem.h" />
- <ClInclude Include="..\libsrc\Dk\Dktrace.h" />
- <ClInclude Include="..\libsrc\Dk\Dktypes.h" />
- <ClInclude Include="..\libsrc\Dk\Dkutil.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/getdata.vcxproj b/windows/getdata.vcxproj
deleted file mode 100644
index f8085f1..0000000
--- a/windows/getdata.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{AFB15514-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>getdata</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/getdata.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)getdata.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/getdata.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/getdata.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)getdata.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/getdata.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\getdata.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/hosting_perl.vcxproj b/windows/hosting_perl.vcxproj
deleted file mode 100644
index eba81f2..0000000
--- a/windows/hosting_perl.vcxproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{354809B6-CF7B-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>hosting_perl</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/hosting_perl.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>$(PERL_CFLAGS) %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:I386 $(PERL_LDFLAGS) %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)hosting_perl.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\hosting\perl\hosting_perl.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/hosting_perl.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(Configuration)/hosting_perl.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/hosting_perl.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>$(PERL_CFLAGS) %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)hosting_perl.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\hosting\perl\hosting_perl.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/hosting_perl.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(Configuration)/hosting_perl.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\hosting\perl\hosting_perl.c" />
- <ClCompile Include="..\binsrc\hosting\perl\virt_handler.c" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\binsrc\hosting\perl\pl_to_c.awk">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-gawk -f pl_to_c.awk virt_handler.pm > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wi.vcxproj">
- <Project>{93051962-7797-49f0-8958-bb1ce60ffe6f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/hosting_php.vcxproj b/windows/hosting_php.vcxproj
deleted file mode 100644
index abcc806..0000000
--- a/windows/hosting_php.vcxproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}</ProjectGuid>
- <RootNamespace>hosting_php</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/hosting_php.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\SDK\$(ShortPlatform)\php53\;..\SDK\$(ShortPlatform)\php53\main;..\SDK\$(ShortPlatform)\php53\Zend;..\SDK\$(ShortPlatform)\php53\ext;..\SDK\$(ShortPlatform)\php53\regex;..\SDK\$(ShortPlatform)\php53\TSRM;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;YYTOKENTYPE;_PHP;_PHP_WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;ZTS;ZEND_DEBUG=0;MSVC5;ZEND_WIN32;_WIN32_WINNT=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)hosting_php.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;../SDK/$(ShortPlatform)/php53;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\hosting\php\hosting_php.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/hosting_php.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/hosting_php.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\SDK\$(ShortPlatform)\php53\;..\SDK\$(ShortPlatform)\php53\main;..\SDK\$(ShortPlatform)\php53\Zend;..\SDK\$(ShortPlatform)\php53\ext;..\SDK\$(ShortPlatform)\php53\regex;..\SDK\$(ShortPlatform)\php53\TSRM;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;YYTOKENTYPE;_PHP;_PHP_WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;ZTS;ZEND_DEBUG=0;MSVC5;ZEND_WIN32;_WIN32_WINNT=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)hosting_php.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;../SDK/$(ShortPlatform)/php53;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\hosting\php\hosting_php.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/hosting_php.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <AdditionalOptions>
- </AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\hosting\php\hosting_php.c" />
- <ClCompile Include="..\libsrc\plugin\import_gate_virtuoso.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="dksrv.vcxproj">
- <Project>{58867eba-ca07-4f41-a966-6245ff14773e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wi.vcxproj">
- <Project>{93051962-7797-49f0-8958-bb1ce60ffe6f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/hosting_python.vcxproj b/windows/hosting_python.vcxproj
deleted file mode 100644
index 564c8ee..0000000
--- a/windows/hosting_python.vcxproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B525A234-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>hosting_python</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/hosting_python.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>$(PYTHON_CFLAGS) %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:I386 $(PYTHON_LDFLAGS) %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)hosting_python.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\hosting\python\hosting_python.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/hosting_python.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(Configuration)/hosting_python.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/hosting_python.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>$(PYTHON_CFLAGS) %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)hosting_python.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\hosting\python\hosting_python.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/hosting_python.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(Configuration)/hosting_python.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\hosting\python\hosting_python.c" />
- <ClCompile Include="..\binsrc\hosting\python\virt_handler.c" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\binsrc\hosting\python\py_to_c.awk">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-gawk -f py_to_c.awk virt_handler.py > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-gawk -f py_to_c.awk virt_handler.py > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-gawk -f py_to_c.awk virt_handler.py > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-gawk -f py_to_c.awk virt_handler.py > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-gawk -f py_to_c.awk virt_handler.py > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-gawk -f py_to_c.awk virt_handler.py > virt_handler.c
-cd $(ProjectDir)
-
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_handler.pm;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_handler.c;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wi.vcxproj">
- <Project>{93051962-7797-49f0-8958-bb1ce60ffe6f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/im.vcxproj b/windows/im.vcxproj
deleted file mode 100644
index 1b89f33..0000000
--- a/windows/im.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C152ADCC-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>im</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/im.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;..\SDK\$(ShortPlatform)\ImageMagick;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_LIB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;CORE_RL_wand_.lib;CORE_RL_coders_.lib;CORE_RL_magick_.lib;CORE_RL_magick++_.lib;CORE_RL_ttf_.lib;CORE_RL_xlib_.lib;CORE_RL_bzlib_.lib;CORE_RL_zlib_.lib;CORE_RL_lcms_.lib;CORE_RL_tiff_.lib;CORE_RL_filters_.lib;CORE_RL_jpeg_.lib;CORE_RL_jbig_.lib;CORE_RL_jp2_.lib;CORE_RL_png_.lib;CORE_RL_wmf_.lib;CORE_RL_libxml_.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)im.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;../SDK/$(ShortPlatform)/ImageMagick;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\samples\image_magick\im.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/im.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/im.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;..\SDK\$(ShortPlatform)\ImageMagick;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_LIB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;CORE_RL_wand_.lib;CORE_RL_coders_.lib;CORE_RL_magick_.lib;CORE_RL_magick++_.lib;CORE_RL_ttf_.lib;CORE_RL_xlib_.lib;CORE_RL_bzlib_.lib;CORE_RL_zlib_.lib;CORE_RL_lcms_.lib;CORE_RL_tiff_.lib;CORE_RL_filters_.lib;CORE_RL_jpeg_.lib;CORE_RL_jbig_.lib;CORE_RL_jp2_.lib;CORE_RL_png_.lib;CORE_RL_wmf_.lib;CORE_RL_libxml_.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)im.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;../SDK/$(ShortPlatform)/ImageMagick;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\samples\image_magick\im.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/im.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <AdditionalOptions>
- </AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\samples\image_magick\im.c" />
- <ClCompile Include="..\libsrc\plugin\import_gate_virtuoso.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wi.vcxproj">
- <Project>{93051962-7797-49f0-8958-bb1ce60ffe6f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/ins.vcxproj b/windows/ins.vcxproj
deleted file mode 100644
index 29cc8cc..0000000
--- a/windows/ins.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C6C66924-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>ins</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/ins.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)ins.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/ins.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/ins.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)ins.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/ins.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\ins.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/isql.vcxproj b/windows/isql.vcxproj
deleted file mode 100644
index 8a61c83..0000000
--- a/windows/isql.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>isqlo</ProjectName>
- <ProjectGuid>{9FF2579E-CF7B-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>isqlo</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/isql_native.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)isqlo.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/isql_native.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/isql_native.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)isqlo.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/isql_native.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\isql.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/isql_native.vcxproj b/windows/isql_native.vcxproj
deleted file mode 100644
index 95c44af..0000000
--- a/windows/isql_native.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>isql</ProjectName>
- <ProjectGuid>{AFB1D909-86D0-49DE-8BD8-DF89349F934E}</ProjectGuid>
- <RootNamespace>isql</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/isql_native.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc;..\libsrc\Wi;..\libsrc\util\win32;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)isql.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/isql_native.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/isql_native.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc;..\libsrc\Wi;..\libsrc\util\win32;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;PLDBG;YYTOKENTYPE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)isql.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/isql_native.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\isql.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/libvirtuoso_odbc_t.vcxproj b/windows/libvirtuoso_odbc_t.vcxproj
deleted file mode 100644
index 47d0baf..0000000
--- a/windows/libvirtuoso_odbc_t.vcxproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>libvirtuoso-t</ProjectName>
- <ProjectGuid>{FB836C59-41E1-48EA-A59B-460AB56587EE}</ProjectGuid>
- <RootNamespace>libvirtuoso_t</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\SDK\$(ShortPlatform)\sslsdk\inc32; .;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>PACKAGE_VERSION="6.1.5";_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;SHARED_OBJECT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>threadw.lib;wi.lib;dksrv.lib;util.lib;xml.lib;zlib.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;tidy.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)libvirtuoso-t.dll</OutputFile>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\virtuoso\libviwin32.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)libvirtuoso_t.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <FixedBaseAddress>false</FixedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\SDK\$(ShortPlatform)\sslsdk\inc32; .;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>PACKAGE_VERSION="6.1.5";_SSL;_CONSOLE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;SHARED_OBJECT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>threadw.lib;wi.lib;dksrv.lib;util.lib;xml.lib;zlib.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;tidy.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)libvirtuoso-t.dll</OutputFile>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\virtuoso\libviwin32.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)libvirtuoso_t.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <FixedBaseAddress>false</FixedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Wi\shcompo.c" />
- <ClCompile Include="..\binsrc\virtuoso\viconfig.c" />
- <ClCompile Include="..\binsrc\virtuoso\viwin32.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dksrv.vcxproj">
- <Project>{58867eba-ca07-4f41-a966-6245ff14773e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threadw.vcxproj">
- <Project>{d3a2882c-410a-4f58-8ace-a771888073e8}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wi.vcxproj">
- <Project>{93051962-7797-49f0-8958-bb1ce60ffe6f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="xml.vcxproj">
- <Project>{0c234ef0-7725-4bda-a1c3-47f5835a3837}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="zlib.vcxproj">
- <Project>{86645c8e-3bbe-4e1e-a8ae-c6990b4ecc64}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/windows/maildrop.vcxproj b/windows/maildrop.vcxproj
deleted file mode 100644
index d314329..0000000
--- a/windows/maildrop.vcxproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C5F98602-E5B9-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>maildrop</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/maildrop.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_WIN32_DCOM;FULL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(Configuration)\maildrop/</AssemblerListingLocation>
- <ObjectFileName>$(Configuration)\maildrop/</ObjectFileName>
- <ProgramDataBaseFileName>$(Configuration)\maildrop/</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)maildrop.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\maildrop\win32\maildrop.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/maildrop.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(Configuration)/maildrop.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/maildrop.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;_WIN32_DCOM;FULL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(Configuration)\maildrop/</AssemblerListingLocation>
- <ObjectFileName>$(Configuration)\maildrop/</ObjectFileName>
- <ProgramDataBaseFileName>$(Configuration)\maildrop/</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)maildrop.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\maildrop\win32\maildrop.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/maildrop.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(Configuration)/maildrop.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\maildrop\win32\maildrop.cpp" />
- <ClCompile Include="..\binsrc\maildrop\win32\mpl.c" />
- </ItemGroup>
- <ItemGroup>
- <Midl Include="..\binsrc\maildrop\win32\maildrop.idl">
- <MkTypLibCompatible Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</MkTypLibCompatible>
- <MkTypLibCompatible Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</MkTypLibCompatible>
- <TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">X64</TargetEnvironment>
- <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\gen</OutputDirectory>
- <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\gen</OutputDirectory>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).h</HeaderFileName>
- <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).h</HeaderFileName>
- </Midl>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\binsrc\maildrop\win32\maildrop.rc">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\libsrc\Wi;..\binsrc\maildrop\win32\gen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/mediawiki.vcxproj b/windows/mediawiki.vcxproj
deleted file mode 100644
index 68fdee1..0000000
--- a/windows/mediawiki.vcxproj
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{408E2482-2623-11DB-9BB9-97600548391D}</ProjectGuid>
- <RootNamespace>mediawiki</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/mediawiki.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)mediawiki.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\appsrc\ODS-Wiki\plugin\mediawiki.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/mediawiki.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/mediawiki.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)mediawiki.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\appsrc\ODS-Wiki\plugin\mediawiki.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/mediawiki.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <AdditionalOptions>
- </AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\plugin\import_gate_virtuoso.c" />
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\media_maclex.c" />
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\media_wikilex.c" />
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\mediawiki.c" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\appsrc\ODS-Wiki\plugin\media_maclex.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f media_maclex.c
-flex -8 -Pmediamacyy -omedia_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\media_maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f media_maclex.c
-flex -8 -Pmediamacyy -omedia_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f media_maclex.c
-flex -8 -Pmediamacyy -omedia_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\media_maclex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\media_maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f media_maclex.c
-flex -8 -Pmediamacyy -omedia_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\media_maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f media_maclex.c
-flex -8 -Pmediamacyy -omedia_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f media_maclex.c
-flex -8 -Pmediamacyy -omedia_maclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\media_maclex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\media_maclex.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\appsrc\ODS-Wiki\plugin\media_wikilex.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f media_wikilex.c
-flex -8 -Pmediawikiyy -omedia_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\media_wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f media_wikilex.c
-flex -8 -Pmediawikiyy -omedia_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f media_wikilex.c
-flex -8 -Pmediawikiyy -omedia_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\media_wikilex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\media_wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f media_wikilex.c
-flex -8 -Pmediawikiyy -omedia_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\media_wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f media_wikilex.c
-flex -8 -Pmediawikiyy -omedia_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f media_wikilex.c
-flex -8 -Pmediawikiyy -omedia_wikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\media_wikilex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\media_wikilex.c;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/odbcmail.vcxproj b/windows/odbcmail.vcxproj
deleted file mode 100644
index f477789..0000000
--- a/windows/odbcmail.vcxproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>virtmail</ProjectName>
- <ProjectGuid>{4C517D78-E5B9-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>odbcmail</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <CustomBuildStep>
- <Command>cd $(IntDir)
-bash $(ProjectDir)\..\bin\makever -o odbcmail.vers.c -p "OpenLink ODBC Mail Interface" -v "2.01"
-cd $(ProjectDir)
-</Command>
- <Inputs>$(IntDir)odbc_mail.obj;%(Inputs)</Inputs>
- <Outputs>$(IntDir)odbcmail.vers.c;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
- <TypeLibraryName>$(Configuration)/odbcmail.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_WIN32_DCOM;FULL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(Configuration)\odbcmail/</AssemblerListingLocation>
- <ObjectFileName>$(Configuration)\odbcmail/</ObjectFileName>
- <ProgramDataBaseFileName>$(Configuration)\odbcmail/</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>util.lib;wic.lib;dk1t.lib;threads.lib;libeay32.lib;gdi32.lib;advapi32.lib;ssleay32.lib;ws2_32.lib;user32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virt_mail.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/odbcmail.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <CustomBuildStep>
- <Command>cd $(IntDir)
-bash $(ProjectDir)\..\bin\makever -o odbcmail.vers.c -p "OpenLink ODBC Mail Interface" -v "2.01"
-cd $(ProjectDir)
-</Command>
- <Inputs>$(IntDir)odbc_mail.obj;%(Inputs)</Inputs>
- <Outputs>$(IntDir)odbcmail.vers.c;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
- <TypeLibraryName>$(Configuration)/odbcmail.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_WIN32_DCOM;FULL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(Configuration)\odbcmail/</AssemblerListingLocation>
- <ObjectFileName>$(Configuration)\odbcmail/</ObjectFileName>
- <ProgramDataBaseFileName>$(Configuration)\odbcmail/</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>util.lib;wic.lib;dk1t.lib;threads.lib;libeay32.lib;gdi32.lib;advapi32.lib;ssleay32.lib;ws2_32.lib;user32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virt_mail.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/odbcmail.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <AdditionalOptions>
- </AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\maildrop\odbc_mail.c" />
- <ClCompile Include="..\binsrc\maildrop\odbcmail.vers.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/scroll.vcxproj b/windows/scroll.vcxproj
deleted file mode 100644
index 69327a4..0000000
--- a/windows/scroll.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>scroll</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/scroll.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)scroll.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/scroll.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/scroll.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)scroll.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/scroll.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\scroll.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/setcurs.vcxproj b/windows/setcurs.vcxproj
deleted file mode 100644
index c3206b0..0000000
--- a/windows/setcurs.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{DCA407C4-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>setcurs</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/setcurs.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)setcurs.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/setcurs.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/setcurs.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)setcurs.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/setcurs.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\setcurs.c" />
- <ClCompile Include="..\binsrc\tests\time.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/sqlcode.bat b/windows/sqlcode.bat
deleted file mode 100644
index 2037645..0000000
--- a/windows/sqlcode.bat
+++ /dev/null
@@ -1,62 +0,0 @@
-set SQL_FILES=system.sql system2.sql odbccat.sql vt_text.sql phrasematch.sql hosting.sql
-set SQL_FILES_1=oledb.sql information_schema.sql
-set SQL_FILES_WS=../../binsrc/vsp/vsp_auth.sql soap.sql wsrp_ultim.xsl wsrp_resp.xsl wsrp_interm.xsl wsrp_error.xsl soap_sch.xsl soap_import_sch.xsl wsdl_expand.xsl wsdl_parts.xsl wsdl_import.xsl wsdl2rdf.xsl xmlrpc_soap.xsl soap_xmlrpc.xsl soap12_router.xsl ../../binsrc/ws/wsrm/wsrm_ddl.sql ../../binsrc/ws/wsrm/wsrm_xsd.sql ../../binsrc/ws/wsrm/wsrmcli.sql ../../binsrc/ws/wsrm/wsrmsrv.sql ../../binsrc/ws/wstr/wstr_ddl.sql ../../binsrc/ws/wstr/wstrcli.sql ../../binsrc/ws/wstr/wstrsrv.sql ../../binsrc/ws/wsrm/wsrmcall.xsl rdf_net.sql simile.sql http_auth.sql xmla.sql openxml.sql ../../binsrc/vspx/vspx.sql ../../binsrc/vspx/vspx_add_locations.xsl ../../binsrc/vspx/vspx_expand.xsl ../../binsrc/vspx/vspx_pre_xsd.xsl ../../binsrc/vspx/vspx_pre_sql.xsl ../../binsrc/vspx/vspx_log_format.xsl ../../binsrc/vspx/vspx.xsd ../../binsrc/vspx/vspx.xsl
-set SQL_FILES_REPL=snapshot_repl.sql repl.sql
-set SQL_FILES_DAV=../../binsrc/dav/dav.sql ../../binsrc/dav/dav_api.sql ../../binsrc/dav/dav_meta.sql ../../binsrc/dav/dav_acct.sql ../../binsrc/dav/dav_rdf_quad.sql ../../binsrc/vsp/admin/admin_dav/vfs.sql ../../binsrc/dav/davxml2rdfxml.xsl ../../binsrc/dav/davxml2n3xml.xsl ../../binsrc/dav/rdfxml2n3xml.xsl ../../binsrc/dav/n3xml2uriqahtml.xsl ../../binsrc/dav/uriqa.sql ../../binsrc/dav/DET_CatFilter.sql ../../binsrc/dav/DET_HostFs.sql ../../binsrc/dav/DET_ResFilter.sql ../../binsrc/dav/DET_PropFilter.sql ../../binsrc/dav/DET_RDFData.sql ../../binsrc/dav/Versioning/DET_Versioning.sql xml_view.sql ../../binsrc/dav/DET_S3.sql
-set SQL_FILES_DDK=replddk.sql ../../binsrc/dav/davddk.sql mail_cli.sql ../../binsrc/vsp/admin/admin_ddl.sql ../../binsrc/vsp/admin/admin_dav/vfsddk.sql virtual_dir.sql url_rewrite.sql
-set SQL_FILES_SYS=users.sql
-set SQL_FILES_UDDI=uddi.sql
-set SQL_FILES_IMSG=pop3_svr.sql ftp.sql nn_svr.sql ../../binsrc/vsp/admin/admin_news/admin_news.sql
-set SQL_FILES_AUTO=autoexec.sql
-set SQL_FILES_ADM=../../binsrc/vsp/admin/admin.sql ../../binsrc/vspx/browser/admin_dav_browser.sql
-set SQL_FILES_2PC=2pc.sql
- at rem set SQL_FILES_BLOG=../../binsrc/weblog2/widgets/rss2rdf.xsl
-set SQL_FILES_VDB=vdb.sql
-set SQL_FILES_PLDBG=cov_report.xsl cov_time.xsl
-set SQL_FILES_VAD=../../binsrc/vad/vad_root.sql ../../binsrc/vad/vad_misc.sql ../../binsrc/vad/oper_pars.sql ../../binsrc/vad/pars_init.sql ../../binsrc/vad/vad_make.sql
-set SQL_FILES_DBP=../../binsrc/vsp/admin/dbpump/dbpump_root.sql ../../binsrc/vsp/admin/dbpump/oper_pars.sql ../../binsrc/vsp/admin/dbpump/components.sql ../../binsrc/vsp/admin/dbpump/comp_html.sql ../../binsrc/vsp/admin/dbpump/comp_misc.sql ../../binsrc/vsp/admin/dbpump/comp_rpath.sql ../../binsrc/vsp/admin/dbpump/comp_tables.sql ../../binsrc/vsp/admin/dbpump/pars_init.sql
-set SQL_FILES_SPARQL=sparql.sql sparql_io.sql rdf_sponge.sql rdf_schema_objects.sql rdf_void.sql rdflddir2.sql
-set SQL_FILES_SPARQL_INIT=useraggr.sql sparql_init.sql
-
-rm -f sql_code.c sql_code_1.c sql_code_ws.c sql_code_repl.c sql_code_dav.c sql_code_ddk.c sql_code_sys.c sql_code_uddi.c
-rm -f sql_code_imsg.c sql_code_auto.c sql_code_adm.c sql_code_2pc.c sql_code_vdb.c sql_code_pldbg.c
-rm -f sql_code_vad.c sql_code_dbp.c sql_code_sparql.c
-
-gawk -f sql_to_c.awk -v pl_stats=PLDBG %SQL_FILES% > sql_code.c
-gawk -f sql_to_c.awk -v init_name=_1 -v pl_stats=PLDBG %SQL_FILES_1% > sql_code_1.c
-gawk -f sql_to_c.awk -v init_name=_ws -v pl_stats=PLDBG %SQL_FILES_WS% > sql_code_ws.c
-gawk -f sql_to_c.awk -v init_name=_repl -v pl_stats=PLDBG %SQL_FILES_REPL% > sql_code_repl.c
-gawk -f sql_to_c.awk -v init_name=_dav -v pl_stats=PLDBG %SQL_FILES_DAV% > sql_code_dav.c
-gawk -f sql_to_c.awk -v init_name=_ddk -v pl_stats=PLDBG %SQL_FILES_DDK% > sql_code_ddk.c
-gawk -f sql_to_c.awk -v init_name=_sys -v pl_stats=PLDBG %SQL_FILES_SYS% > sql_code_sys.c
-gawk -f sql_to_c.awk -v init_name=_uddi -v pl_stats=PLDBG %SQL_FILES_UDDI% > sql_code_uddi.c
-gawk -f sql_to_c.awk -v init_name=_imsg -v pl_stats=PLDBG %SQL_FILES_IMSG% > sql_code_imsg.c
-gawk -f sql_to_c.awk -v init_name=_auto -v pl_stats=PLDBG %SQL_FILES_AUTO% > sql_code_auto.c
-gawk -f sql_to_c.awk -v init_name=_adm -v pl_stats=PLDBG %SQL_FILES_ADM% > sql_code_adm.c
-gawk -f sql_to_c.awk -v init_name=_2pc -v pl_stats=PLDBG %SQL_FILES_2PC% > sql_code_2pc.c
- at rem gawk -f sql_to_c.awk -v init_name=_blog -v pl_stats=PLDBG %SQL_FILES_BLOG% > sql_code_blog.c
-gawk -f sql_to_c.awk -v init_name=_vdb -v pl_stats=PLDBG %SQL_FILES_VDB% > sql_code_vdb.c
-gawk -f sql_to_c.awk -v init_name=_pldbg -v pl_stats=PLDBG %SQL_FILES_PLDBG% > sql_code_pldbg.c
-gawk -f sql_to_c.awk -v init_name=_vad -v pl_stats=PLDBG %SQL_FILES_VAD% > sql_code_vad.c
-gawk -f sql_to_c.awk -v init_name=_dbp -v pl_stats=PLDBG %SQL_FILES_DBP% > sql_code_dbp.c
-gawk -f sql_to_c.awk -v init_name=_sparql -v pl_stats=PLDBG %SQL_FILES_SPARQL% > sql_code_sparql.c
-gawk -f sql_to_c.awk -v init_name=_sparql_init -v pl_stats=PLDBG %SQL_FILES_SPARQL_INIT% > sql_code_sparql_init.c
-
-gawk -f "jso_reformat.awk" -v "output_mode=h" -v "h_wrapper=__RDF_MAPPING_JSO_H" -v "init_name=rdf_mapping" rdf_mapping.jso > rdf_mapping_jso.h
-
-gawk -f "jso_reformat.awk" -v "output_mode=c" -v "init_name=rdf_mapping" rdf_mapping.jso > rdf_mapping_jso.c
-
-gawk -f "jso_reformat.awk" -v "output_mode=ttl" -v "init_name=rdf_mapping" rdf_mapping.jso > rdf_mapping_jso.ttl
-
-gawk -f "jso_reformat.awk" -v "output_mode=ttl-sample" -v "init_name=rdf_mapping" rdf_mapping.jso > rdf_mapping_jso.ttl-sample
-
-cd ../../binsrc/cached_resources
-bash cache_gen.sh > cached_resources.c
-cd ../../libsrc/Wi
-
- at echo #include "sql_code_cache_impl.c" > sql_code_cache.c
- at echo #include "../../binsrc/cached_resources/cached_resources.c" >> sql_code_cache.c
-
-bash list_lex_props.sh sparql_p.y sparql_lex_props.c
-bash list_lex_props.sh turtle_p.y turtle_lex_props.c
-
diff --git a/windows/threads.vcxproj b/windows/threads.vcxproj
deleted file mode 100644
index c312c74..0000000
--- a/windows/threads.vcxproj
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}</ProjectGuid>
- <RootNamespace>threads</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)threads.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)threads.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Thread\sched_single.c" />
- <ClCompile Include="..\libsrc\Thread\thread_attr.c" />
- <ClCompile Include="..\libsrc\Thread\thread_queue.c" />
- <ClCompile Include="..\libsrc\Thread\timer_queue.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/threadw.vcxproj b/windows/threadw.vcxproj
deleted file mode 100644
index 0d73e7b..0000000
--- a/windows/threadw.vcxproj
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D3A2882C-410A-4F58-8ACE-A771888073E8}</ProjectGuid>
- <RootNamespace>threadw</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)threadw.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)threadw.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Thread\io_unix.c" />
- <ClCompile Include="..\libsrc\Thread\sched_winthread.c" />
- <ClCompile Include="..\libsrc\Thread\thread_attr.c" />
- <ClCompile Include="..\libsrc\Thread\thread_queue.c" />
- <ClCompile Include="..\libsrc\Thread\thread_rwlock.c" />
- <ClCompile Include="..\libsrc\Thread\timer_queue.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/tidy.vcxproj b/windows/tidy.vcxproj
deleted file mode 100644
index 1aeb0fa..0000000
--- a/windows/tidy.vcxproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D9E130E1-7734-43DF-A7EF-15CD95E467EE}</ProjectGuid>
- <RootNamespace>tidy</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc\Dk;..\libsrc;..\libsrc\util;..\libsrc\util\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)tidy.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc\Dk;..\libsrc;..\libsrc\util;..\libsrc\util\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)tidy.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Tidy\attrs.c" />
- <ClCompile Include="..\libsrc\Tidy\clean.c" />
- <ClCompile Include="..\libsrc\Tidy\config.c" />
- <ClCompile Include="..\libsrc\Tidy\entities.c" />
- <ClCompile Include="..\libsrc\Tidy\istack.c" />
- <ClCompile Include="..\libsrc\Tidy\lexer.c" />
- <ClCompile Include="..\libsrc\Tidy\localize.c" />
- <ClCompile Include="..\libsrc\Tidy\parser.c" />
- <ClCompile Include="..\libsrc\Tidy\pprint.c" />
- <ClCompile Include="..\libsrc\Tidy\tab2space.c" />
- <ClCompile Include="..\libsrc\Tidy\tags.c" />
- <ClCompile Include="..\libsrc\Tidy\tidy.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\libsrc\Tidy\html.h" />
- <ClInclude Include="..\libsrc\Tidy\platform.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/tpcc.vcxproj b/windows/tpcc.vcxproj
deleted file mode 100644
index b4ac393..0000000
--- a/windows/tpcc.vcxproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>tpcc</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/tpcc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)tpcc.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/tpcc.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/tpcc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)tpcc.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/tpcc.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\time.c" />
- <ClCompile Include="..\binsrc\tests\tpcc.c" />
- <ClCompile Include="..\binsrc\tests\tpccodbc.c" />
- <ClCompile Include="..\binsrc\tests\tpcctrx.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\binsrc\tests\tpcc.h" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/urlsimu.vcxproj b/windows/urlsimu.vcxproj
deleted file mode 100644
index 237f0bb..0000000
--- a/windows/urlsimu.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{EF98F42A-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>urlsimu</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/urlsimu.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)urlsimu.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/urlsimu.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/urlsimu.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;.\openssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_CONSOLE;ODBC_ONLY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>wic.lib;threads.lib;dk1t.lib;ws2_32.lib;libeay32.lib;util.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)urlsimu.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/urlsimu.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\time.c" />
- <ClCompile Include="..\binsrc\tests\urlsimu.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/util.vcxproj b/windows/util.vcxproj
deleted file mode 100644
index e032f08..0000000
--- a/windows/util.vcxproj
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{031DB868-5294-4738-90BA-F80BB2CEA9DC}</ProjectGuid>
- <RootNamespace>util</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc\Xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\langfunc;..\libsrc\plugin;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DLDAPI_WINDOWS;_SSL;YYTOKENTYPE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)util.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc\Xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\langfunc;..\libsrc\plugin;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DLDAPI_WINDOWS;_SSL;YYTOKENTYPE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)util.lib</OutputFile>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\util\buildarg.c" />
- <ClCompile Include="..\libsrc\util\cfg2.c" />
- <ClCompile Include="..\libsrc\util\cslentry.c" />
- <ClCompile Include="..\libsrc\util\csllkup.c" />
- <ClCompile Include="..\libsrc\util\cslnment.c" />
- <ClCompile Include="..\libsrc\util\dbgmal.c" />
- <ClCompile Include="..\libsrc\util\debug.c" />
- <ClCompile Include="..\libsrc\util\dyntab.c" />
- <ClCompile Include="..\libsrc\langfunc\encoding_ucm.c" />
- <ClCompile Include="..\libsrc\util\expandav.c" />
- <ClCompile Include="..\libsrc\util\fnmatch.c" />
- <ClCompile Include="..\libsrc\util\fnqual.c" />
- <ClCompile Include="..\libsrc\util\fnsearch.c" />
- <ClCompile Include="..\libsrc\util\fntodos.c" />
- <ClCompile Include="..\libsrc\util\fnundos.c" />
- <ClCompile Include="..\libsrc\util\getopt.c" />
- <ClCompile Include="..\libsrc\util\getopt1.c" />
- <ClCompile Include="..\libsrc\langfunc\latin1ctype.c" />
- <ClCompile Include="..\libsrc\util\login_digest.c" />
- <ClCompile Include="..\libsrc\util\logmsg.c" />
- <ClCompile Include="..\libsrc\util\ltrim.c" />
- <ClCompile Include="..\libsrc\util\make_env.c" />
- <ClCompile Include="..\libsrc\util\mpl.c" />
- <ClCompile Include="..\libsrc\util\ncfg.c" />
- <ClCompile Include="..\libsrc\util\ntapp.c" />
- <ClCompile Include="..\libsrc\util\regerror.c" />
- <ClCompile Include="..\libsrc\util\regexp.c" />
- <ClCompile Include="..\libsrc\util\regsub.c" />
- <ClCompile Include="..\libsrc\util\rtrim.c" />
- <ClCompile Include="..\libsrc\util\setext.c" />
- <ClCompile Include="..\libsrc\util\sslengine.c" />
- <ClCompile Include="..\libsrc\util\startup.c" />
- <ClCompile Include="..\libsrc\util\stpcpy.c" />
- <ClCompile Include="..\libsrc\util\strcpyin.c" />
- <ClCompile Include="..\libsrc\util\strerror.c" />
- <ClCompile Include="..\libsrc\util\stricmp.c" />
- <ClCompile Include="..\libsrc\util\strindex.c" />
- <ClCompile Include="..\libsrc\util\strinsrt.c" />
- <ClCompile Include="..\libsrc\util\strlwr.c" />
- <ClCompile Include="..\libsrc\util\strnicmp.c" />
- <ClCompile Include="..\libsrc\util\strquote.c" />
- <ClCompile Include="..\libsrc\util\strtok_r.c" />
- <ClCompile Include="..\libsrc\util\strupr.c" />
- <ClCompile Include="..\libsrc\util\strxpect.c" />
- <ClCompile Include="..\libsrc\util\virt_mbrlen.c" />
- <ClCompile Include="..\libsrc\util\win32\syslog.c" />
- <ClCompile Include="..\libsrc\util\terminat.c" />
- <ClCompile Include="..\libsrc\langfunc\ucm2enc.c" />
- <ClCompile Include="..\libsrc\util\usage.c" />
- <ClCompile Include="..\libsrc\util\uuid.c" />
- <ClCompile Include="..\libsrc\util\virt_mbrtowc.c" />
- <ClCompile Include="..\libsrc\util\virt_mbsnrtowcs.c" />
- <ClCompile Include="..\libsrc\util\virt_wcrtomb.c" />
- <ClCompile Include="..\libsrc\util\virt_wcs_mask.c" />
- <ClCompile Include="..\libsrc\util\virt_wcsnrtombs.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_chartables.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_compile.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_config.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_dfa_exec.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_exec.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_fullinfo.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_get.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_globals.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_newline.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_ord2utf8.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_study.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_tables.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_try_flipped.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_ucd.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_valid_utf8.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_version.c" />
- <ClCompile Include="..\libsrc\util\pcrelib\pcre_xclass.c" />
- <ClCompile Include="..\libsrc\langfunc\encoding_basic.c" />
- <ClCompile Include="..\libsrc\langfunc\encoding_charsets.c" />
- <ClCompile Include="..\libsrc\langfunc\encoding_html.c" />
- <ClCompile Include="..\libsrc\langfunc\encoding_wide.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\libsrc\langfunc\langfunc.c" />
- <ClCompile Include="..\libsrc\langfunc\langman.c" />
- <ClCompile Include="..\libsrc\langfunc\language__en_US.c" />
- <ClCompile Include="..\libsrc\langfunc\language__ru_RU.c" />
- <ClCompile Include="..\libsrc\langfunc\language__x_ViAny.c" />
- <ClCompile Include="..\libsrc\langfunc\language__x_ViDoc.c" />
- <ClCompile Include="..\libsrc\langfunc\unicode3.c" />
- <ClCompile Include="..\libsrc\plugin\dlf.c" />
- <ClCompile Include="..\libsrc\plugin\export_gate_virtuoso.c" />
- <ClCompile Include="..\libsrc\plugin\gate_virtuoso_stubs.c" />
- <ClCompile Include="..\libsrc\plugin\plugin.c" />
- <ClCompile Include="..\libsrc\plugin\plugin_win32.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\libsrc\libutil.h" />
- <ClInclude Include="..\libsrc\util\uuid.h" />
- <ClInclude Include="..\libsrc\util\uuidP.h" />
- <ClInclude Include="..\libsrc\langfunc\langfunc.h" />
- <ClInclude Include="..\libsrc\langfunc\unicode3_all_chars.h" />
- <ClInclude Include="..\libsrc\langfunc\unicode3_lowers.h" />
- <ClInclude Include="..\libsrc\langfunc\unicode3_spaces.h" />
- <ClInclude Include="..\libsrc\langfunc\unicode3_uppers.h" />
- <ClInclude Include="..\libsrc\plugin\exe_export.h" />
- <ClInclude Include="..\libsrc\plugin\gate_virtuoso_stubs.h" />
- <ClInclude Include="..\libsrc\plugin\plugin.h" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\libsrc\plugin\gen_all_gates.sh">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-bash gen_all_gates.sh
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\export_gate_virtuoso.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-bash gen_all_gates.sh
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-bash gen_all_gates.sh
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\export_gate_virtuoso.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\export_gate_virtuoso.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-bash gen_all_gates.sh
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\export_gate_virtuoso.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-bash gen_all_gates.sh
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-bash gen_all_gates.sh
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\export_gate_virtuoso.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\export_gate_virtuoso.c;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="wi.vcxproj">
- <Project>{93051962-7797-49f0-8958-bb1ce60ffe6f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/windows/virtodbc.vcxproj b/windows/virtodbc.vcxproj
deleted file mode 100644
index 7e61b88..0000000
--- a/windows/virtodbc.vcxproj
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>virtodbc</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/virtodbc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtodbc.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\virtodbc\virtodbc.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>
- </ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/virtodbc.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/virtodbc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtodbc.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\virtodbc\virtodbc.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>
- </ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/virtodbc.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Wi\blobio.c" />
- <ClCompile Include="..\libsrc\Wi\CLIcr.c" />
- <ClCompile Include="..\libsrc\Wi\CLIodbc3.c" />
- <ClCompile Include="..\libsrc\Wi\CLIsql1.c" />
- <ClCompile Include="..\libsrc\Wi\CLIsql2.c" />
- <ClCompile Include="..\binsrc\virtodbc\CLIsql3_w32.cpp" />
- <ClCompile Include="..\libsrc\Wi\CLIuti.c" />
- <ClCompile Include="..\libsrc\Wi\CLIw.c" />
- <ClCompile Include="..\libsrc\Wi\datesupp.c" />
- <ClCompile Include="..\binsrc\virtodbc\dialog.cpp" />
- <ClCompile Include="..\libsrc\plugin\dlf.c" />
- <ClCompile Include="..\binsrc\virtodbc\kvlist.cpp" />
- <ClCompile Include="..\libsrc\Wi\mts_client.c" />
- <ClCompile Include="..\libsrc\Wi\multibyte.c" />
- <ClCompile Include="..\libsrc\Wi\numeric.c" />
- <ClCompile Include="..\libsrc\Wi\plugin_gate.c" />
- <ClCompile Include="..\binsrc\virtodbc\virtodbc.cpp" />
- <ClCompile Include="..\libsrc\Wi\wi_xid.c" />
- <ClCompile Include="..\binsrc\virtodbc\winctl.cpp" />
- <ClCompile Include="..\libsrc\Wi\wirpc.c" />
- <ClCompile Include="..\binsrc\virtodbc\wizard.cpp" />
- <ClCompile Include="..\binsrc\virtodbc\zcbrowser.cpp" />
- <ClCompile Include="..\binsrc\virtodbc\zcbrowsercombo.cpp" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\binsrc\virtodbc\virtodbc.def" />
- <None Include="..\binsrc\virtodbc\virtodbc.bmp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\binsrc\virtodbc\resource.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\binsrc\virtodbc\virtodbc.rc" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/virtoledb.vcxproj b/windows/virtoledb.vcxproj
deleted file mode 100644
index a9de723..0000000
--- a/windows/virtoledb.vcxproj
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{F357CF96-CF7A-11DA-85E2-A4E5714C712A}</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/virtoledb.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;VIRTOLEDB_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>ole32.lib;oleaut32.lib;odbccp32.lib;rpcrt4.lib;gdi32.lib;comdlg32.lib;threads.lib;dk1t.lib;util.lib;odbc32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtoledb.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\virtoledb\virtoledb.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/virtoledb.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(Configuration)/virtoledb.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/virtoledb.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;BIF_XML;NDEBUG;VIRTOLEDB_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>ole32.lib;oleaut32.lib;odbccp32.lib;rpcrt4.lib;gdi32.lib;comdlg32.lib;threads.lib;dk1t.lib;util.lib;odbc32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtoledb.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\virtoledb\virtoledb.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/virtoledb.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(Configuration)/virtoledb.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\virtoledb\asserts.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\baseobj.cpp" />
- <ClCompile Include="..\libsrc\Wi\blobio.c" />
- <ClCompile Include="..\libsrc\Wi\CLIcr.c" />
- <ClCompile Include="..\libsrc\Wi\CLIodbc3.c" />
- <ClCompile Include="..\libsrc\Wi\CLIsql1.c" />
- <ClCompile Include="..\libsrc\Wi\CLIsql2.c" />
- <ClCompile Include="..\binsrc\virtodbc\CLIsql3_w32.cpp" />
- <ClCompile Include="..\libsrc\Wi\CLIuti.c" />
- <ClCompile Include="..\libsrc\Wi\CLIw.c" />
- <ClCompile Include="..\binsrc\virtoledb\command.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\connobj.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\data.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\datalink.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\dataobj.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\datasource.cpp" />
- <ClCompile Include="..\libsrc\Wi\datesupp.c" />
- <ClCompile Include="..\binsrc\virtoledb\db.cpp" />
- <ClCompile Include="..\binsrc\virtodbc\dialog.cpp" />
- <ClCompile Include="..\libsrc\plugin\dlf.c" />
- <ClCompile Include="..\binsrc\virtoledb\dllmodule.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\error.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\filedsn.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\globals.cpp" />
- <ClCompile Include="..\binsrc\virtodbc\kvlist.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\lobdata.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\mresults.cpp" />
- <ClCompile Include="..\libsrc\Wi\mts_client.c" />
- <ClCompile Include="..\libsrc\Wi\multibyte.c" />
- <ClCompile Include="..\libsrc\Wi\numeric.c" />
- <ClCompile Include="..\binsrc\virtoledb\paramdata.cpp" />
- <ClCompile Include="..\libsrc\Wi\plugin_gate.c" />
- <ClCompile Include="..\binsrc\virtoledb\properties.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\refcounted.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\rowset.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\rowsetdata.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\rowsetprops.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\session.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\syncobj.cpp" />
- <ClCompile Include="..\binsrc\virtoledb\util.cpp" />
- <ClCompile Include="..\binsrc\virtodbc\virtodbc.cpp" />
- <ClCompile Include="..\libsrc\Wi\wi_xid.c" />
- <ClCompile Include="..\binsrc\virtodbc\winctl.cpp" />
- <ClCompile Include="..\libsrc\Wi\wirpc.c" />
- <ClCompile Include="..\binsrc\virtodbc\wizard.cpp" />
- <ClCompile Include="..\binsrc\virtodbc\zcbrowser.cpp" />
- <ClCompile Include="..\binsrc\virtodbc\zcbrowsercombo.cpp" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\binsrc\virtodbc\virtodbc.def" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\binsrc\virtoledb\asserts.h" />
- <ClInclude Include="..\binsrc\virtoledb\baseobj.h" />
- <ClInclude Include="..\binsrc\virtoledb\command.h" />
- <ClInclude Include="..\binsrc\virtoledb\connobj.h" />
- <ClInclude Include="..\binsrc\virtoledb\data.h" />
- <ClInclude Include="..\binsrc\virtoledb\datalink.h" />
- <ClInclude Include="..\binsrc\virtoledb\dataobj.h" />
- <ClInclude Include="..\binsrc\virtoledb\db.h" />
- <ClInclude Include="..\binsrc\virtoledb\dllmodule.h" />
- <ClInclude Include="..\binsrc\virtoledb\error.h" />
- <ClInclude Include="..\binsrc\virtoledb\filedsn.h" />
- <ClInclude Include="..\binsrc\virtoledb\headers.h" />
- <ClInclude Include="..\binsrc\virtoledb\lobdata.h" />
- <ClInclude Include="..\binsrc\virtoledb\os.h" />
- <ClInclude Include="..\binsrc\virtoledb\paramdata.h" />
- <ClInclude Include="..\binsrc\virtoledb\properties.h" />
- <ClInclude Include="..\binsrc\virtoledb\refcounted.h" />
- <ClInclude Include="..\binsrc\virtoledb\resource.h" />
- <ClInclude Include="..\binsrc\virtoledb\rowset.h" />
- <ClInclude Include="..\binsrc\virtoledb\rowsetdata.h" />
- <ClInclude Include="..\binsrc\virtoledb\rowsetprops.h" />
- <ClInclude Include="..\binsrc\virtoledb\session.h" />
- <ClInclude Include="..\binsrc\virtoledb\util.h" />
- <ClInclude Include="..\binsrc\virtoledb\virtoledb.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\binsrc\virtoledb\virtoledb.rc" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dk1t.vcxproj">
- <Project>{58f7dcef-d5de-402d-8f50-39b67c8b9e9e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threads.vcxproj">
- <Project>{b619bb2c-a9ac-453d-ba98-3a8f3217b1ab}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wic.vcxproj">
- <Project>{a66e395b-18ee-4877-8f0d-386a7bbab370}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/virtuoso-opensource.sln b/windows/virtuoso-opensource.sln
deleted file mode 100644
index 51630c6..0000000
--- a/windows/virtuoso-opensource.sln
+++ /dev/null
@@ -1,552 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blobs", "blobs.vcxproj", "{72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "burstoff", "burstoff.vcxproj", "{7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cursor", "cursor.vcxproj", "{97D467CE-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cutter", "cutter.vcxproj", "{6E10B655-C324-491F-B202-73565D6B30FB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dk1t", "dk1t.vcxproj", "{58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dksrv", "dksrv.vcxproj", "{58867EBA-CA07-4F41-A966-6245FF14773E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getdata", "getdata.vcxproj", "{AFB15514-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_perl", "hosting_perl.vcxproj", "{354809B6-CF7B-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_python", "hosting_python.vcxproj", "{B525A234-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "im", "im.vcxproj", "{C152ADCC-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ins", "ins.vcxproj", "{C6C66924-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql_native.vcxproj", "{AFB1D909-86D0-49DE-8BD8-DF89349F934E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvirtuoso-t", "libvirtuoso_odbc_t.vcxproj", "{FB836C59-41E1-48EA-A59B-460AB56587EE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isqlo", "isql.vcxproj", "{9FF2579E-CF7B-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scroll", "scroll.vcxproj", "{C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setcurs", "setcurs.vcxproj", "{DCA407C4-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threads", "threads.vcxproj", "{B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadw", "threadw.vcxproj", "{D3A2882C-410A-4F58-8ACE-A771888073E8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tidy", "tidy.vcxproj", "{D9E130E1-7734-43DF-A7EF-15CD95E467EE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpcc", "tpcc.vcxproj", "{E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "urlsimu", "urlsimu.vcxproj", "{EF98F42A-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcxproj", "{031DB868-5294-4738-90BA-F80BB2CEA9DC}"
- ProjectSection(ProjectDependencies) = postProject
- {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64} = {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837} = {0C234EF0-7725-4BDA-A1C3-47F5835A3837}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtodbc", "virtodbc.vcxproj", "{3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtoledb", "virtoledb.vcxproj", "{F357CF96-CF7A-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso-clr-t", "virtuoso_odbc_clr_t.vcxproj", "{8D07389F-F48A-49B9-BED9-F71FCBACC4A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso-javavm-t", "virtuoso_odbc_javavm_t.vcxproj", "{02AD88A0-CF7B-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso-sample-t", "virtuoso_odbc_sample_t.vcxproj", "{0E838FA8-CF7B-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtuoso-t", "virtuoso_odbc_t.vcxproj", "{F4E88BFA-FC96-439D-9E67-0A92AB541EE0}"
- ProjectSection(ProjectDependencies) = postProject
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
- {A66E395B-18EE-4877-8F0D-386A7BBAB370} = {A66E395B-18EE-4877-8F0D-386A7BBAB370}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wi", "wi.vcxproj", "{93051962-7797-49F0-8958-BB1CE60FFE6F}"
- ProjectSection(ProjectDependencies) = postProject
- {D3A2882C-410A-4F58-8ACE-A771888073E8} = {D3A2882C-410A-4F58-8ACE-A771888073E8}
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} = {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64} = {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}
- {58867EBA-CA07-4F41-A966-6245FF14773E} = {58867EBA-CA07-4F41-A966-6245FF14773E}
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE} = {D9E130E1-7734-43DF-A7EF-15CD95E467EE}
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} = {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837} = {0C234EF0-7725-4BDA-A1C3-47F5835A3837}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wic", "wic.vcxproj", "{A66E395B-18EE-4877-8F0D-386A7BBAB370}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wikiv", "wikiv.vcxproj", "{A326A0DF-4F93-4DF6-813D-0B64F98B389F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "xml.vcxproj", "{0C234EF0-7725-4BDA-A1C3-47F5835A3837}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maildrop", "maildrop.vcxproj", "{C5F98602-E5B9-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virtmail", "odbcmail.vcxproj", "{4C517D78-E5B9-11DA-85E2-A4E5714C712A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hosting_php", "hosting_php.vcxproj", "{9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "creolewiki", "creolewiki.vcxproj", "{ABE43C46-E1C4-11DB-930B-CD6B662399AA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediawiki", "mediawiki.vcxproj", "{408E2482-2623-11DB-9BB9-97600548391D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wbxml2", "wbxml2.vcxproj", "{5582D8D0-DB93-11DB-930B-CD6B662399AA}"
- ProjectSection(ProjectDependencies) = postProject
- {93051962-7797-49F0-8958-BB1CE60FFE6F} = {93051962-7797-49F0-8958-BB1CE60FFE6F}
- {031DB868-5294-4738-90BA-F80BB2CEA9DC} = {031DB868-5294-4738-90BA-F80BB2CEA9DC}
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtuosoClient.NET.vc2005", "..\binsrc\VirtuosoClient.Net\VirtuosoClient.NET.vc2005.csproj", "{50E2DD3F-5B5E-4E62-9206-A41824905CD7}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {97D467CE-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Any CPU.ActiveCfg = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|Win32.ActiveCfg = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|x64.ActiveCfg = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|x64.Build.0 = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Debug|x86.ActiveCfg = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Any CPU.ActiveCfg = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Win32.ActiveCfg = Release|Win32
- {6E10B655-C324-491F-B202-73565D6B30FB}.Release|Win32.Build.0 = Release|Win32
- {6E10B655-C324-491F-B202-73565D6B30FB}.Release|x64.ActiveCfg = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Release|x64.Build.0 = Release|x64
- {6E10B655-C324-491F-B202-73565D6B30FB}.Release|x86.ActiveCfg = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Any CPU.ActiveCfg = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|Win32.ActiveCfg = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|x64.ActiveCfg = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|x64.Build.0 = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Debug|x86.ActiveCfg = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Any CPU.ActiveCfg = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Win32.ActiveCfg = Release|Win32
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|Win32.Build.0 = Release|Win32
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|x64.ActiveCfg = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|x64.Build.0 = Release|x64
- {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E}.Release|x86.ActiveCfg = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Any CPU.ActiveCfg = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|Win32.ActiveCfg = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|x64.ActiveCfg = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|x64.Build.0 = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Debug|x86.ActiveCfg = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Any CPU.ActiveCfg = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Win32.ActiveCfg = Release|Win32
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|Win32.Build.0 = Release|Win32
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|x64.ActiveCfg = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|x64.Build.0 = Release|x64
- {58867EBA-CA07-4F41-A966-6245FF14773E}.Release|x86.ActiveCfg = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {AFB15514-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {354809B6-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {B525A234-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {C152ADCC-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {C6C66924-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Any CPU.ActiveCfg = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|Win32.ActiveCfg = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|x64.ActiveCfg = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|x64.Build.0 = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Debug|x86.ActiveCfg = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Any CPU.ActiveCfg = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Win32.ActiveCfg = Release|Win32
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|Win32.Build.0 = Release|Win32
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|x64.ActiveCfg = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|x64.Build.0 = Release|x64
- {AFB1D909-86D0-49DE-8BD8-DF89349F934E}.Release|x86.ActiveCfg = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Any CPU.ActiveCfg = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|Win32.ActiveCfg = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|x64.ActiveCfg = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|x64.Build.0 = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Debug|x86.ActiveCfg = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Any CPU.ActiveCfg = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Win32.ActiveCfg = Release|Win32
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|Win32.Build.0 = Release|Win32
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|x64.ActiveCfg = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|x64.Build.0 = Release|x64
- {FB836C59-41E1-48EA-A59B-460AB56587EE}.Release|x86.ActiveCfg = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {9FF2579E-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {DCA407C4-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Any CPU.ActiveCfg = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|Win32.ActiveCfg = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|x64.ActiveCfg = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|x64.Build.0 = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Debug|x86.ActiveCfg = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Any CPU.ActiveCfg = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Win32.ActiveCfg = Release|Win32
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|Win32.Build.0 = Release|Win32
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|x64.ActiveCfg = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|x64.Build.0 = Release|x64
- {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB}.Release|x86.ActiveCfg = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Any CPU.ActiveCfg = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|Win32.ActiveCfg = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|x64.ActiveCfg = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|x64.Build.0 = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Debug|x86.ActiveCfg = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Any CPU.ActiveCfg = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Win32.ActiveCfg = Release|Win32
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|Win32.Build.0 = Release|Win32
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|x64.ActiveCfg = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|x64.Build.0 = Release|x64
- {D3A2882C-410A-4F58-8ACE-A771888073E8}.Release|x86.ActiveCfg = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Any CPU.ActiveCfg = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|Win32.ActiveCfg = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|x64.ActiveCfg = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|x64.Build.0 = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Debug|x86.ActiveCfg = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Any CPU.ActiveCfg = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Win32.ActiveCfg = Release|Win32
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|Win32.Build.0 = Release|Win32
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|x64.ActiveCfg = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|x64.Build.0 = Release|x64
- {D9E130E1-7734-43DF-A7EF-15CD95E467EE}.Release|x86.ActiveCfg = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {EF98F42A-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Any CPU.ActiveCfg = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|Win32.ActiveCfg = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|x64.ActiveCfg = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|x64.Build.0 = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Debug|x86.ActiveCfg = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Any CPU.ActiveCfg = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Win32.ActiveCfg = Release|Win32
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|Win32.Build.0 = Release|Win32
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|x64.ActiveCfg = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|x64.Build.0 = Release|x64
- {031DB868-5294-4738-90BA-F80BB2CEA9DC}.Release|x86.ActiveCfg = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {F357CF96-CF7A-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Any CPU.ActiveCfg = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|Win32.ActiveCfg = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|x64.ActiveCfg = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|x64.Build.0 = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Debug|x86.ActiveCfg = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Any CPU.ActiveCfg = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Win32.ActiveCfg = Release|Win32
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Win32.Build.0 = Release|Win32
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x64.ActiveCfg = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x64.Build.0 = Release|x64
- {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x86.ActiveCfg = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.Build.0 = Release|Win32
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64
- {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Any CPU.ActiveCfg = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|Win32.ActiveCfg = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|x64.ActiveCfg = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|x64.Build.0 = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Debug|x86.ActiveCfg = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Any CPU.ActiveCfg = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Win32.ActiveCfg = Release|Win32
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|Win32.Build.0 = Release|Win32
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|x64.ActiveCfg = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|x64.Build.0 = Release|x64
- {F4E88BFA-FC96-439D-9E67-0A92AB541EE0}.Release|x86.ActiveCfg = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Any CPU.ActiveCfg = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|Win32.ActiveCfg = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|x64.ActiveCfg = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|x64.Build.0 = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Debug|x86.ActiveCfg = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Any CPU.ActiveCfg = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Win32.ActiveCfg = Release|Win32
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|Win32.Build.0 = Release|Win32
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|x64.ActiveCfg = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|x64.Build.0 = Release|x64
- {93051962-7797-49F0-8958-BB1CE60FFE6F}.Release|x86.ActiveCfg = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Any CPU.ActiveCfg = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|Win32.ActiveCfg = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|x64.ActiveCfg = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|x64.Build.0 = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Debug|x86.ActiveCfg = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Any CPU.ActiveCfg = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Win32.ActiveCfg = Release|Win32
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|Win32.Build.0 = Release|Win32
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|x64.ActiveCfg = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|x64.Build.0 = Release|x64
- {A66E395B-18EE-4877-8F0D-386A7BBAB370}.Release|x86.ActiveCfg = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Any CPU.ActiveCfg = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|Win32.ActiveCfg = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|x64.ActiveCfg = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|x64.Build.0 = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Debug|x86.ActiveCfg = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Any CPU.ActiveCfg = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Win32.ActiveCfg = Release|Win32
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|Win32.Build.0 = Release|Win32
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|x64.ActiveCfg = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|x64.Build.0 = Release|x64
- {A326A0DF-4F93-4DF6-813D-0B64F98B389F}.Release|x86.ActiveCfg = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Any CPU.ActiveCfg = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|Win32.ActiveCfg = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|x64.ActiveCfg = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|x64.Build.0 = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Debug|x86.ActiveCfg = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Any CPU.ActiveCfg = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Win32.ActiveCfg = Release|Win32
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|Win32.Build.0 = Release|Win32
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|x64.ActiveCfg = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|x64.Build.0 = Release|x64
- {0C234EF0-7725-4BDA-A1C3-47F5835A3837}.Release|x86.ActiveCfg = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Any CPU.ActiveCfg = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|Win32.ActiveCfg = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|x64.ActiveCfg = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|x64.Build.0 = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Debug|x86.ActiveCfg = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Any CPU.ActiveCfg = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Win32.ActiveCfg = Release|Win32
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|Win32.Build.0 = Release|Win32
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|x64.ActiveCfg = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|x64.Build.0 = Release|x64
- {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}.Release|x86.ActiveCfg = Release|x64
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {C5F98602-E5B9-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|x64.ActiveCfg = Release|x64
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|x64.Build.0 = Release|x64
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Debug|x86.ActiveCfg = Release|x64
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64
- {4C517D78-E5B9-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|Any CPU.ActiveCfg = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|Win32.ActiveCfg = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|x64.ActiveCfg = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|x64.Build.0 = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Debug|x86.ActiveCfg = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Any CPU.ActiveCfg = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Win32.ActiveCfg = Release|Win32
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|Win32.Build.0 = Release|Win32
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|x64.ActiveCfg = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|x64.Build.0 = Release|x64
- {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A}.Release|x86.ActiveCfg = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|Any CPU.ActiveCfg = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|x64.ActiveCfg = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|x64.Build.0 = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Debug|x86.ActiveCfg = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Any CPU.ActiveCfg = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|Win32.Build.0 = Release|Win32
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|x64.ActiveCfg = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|x64.Build.0 = Release|x64
- {ABE43C46-E1C4-11DB-930B-CD6B662399AA}.Release|x86.ActiveCfg = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Debug|Any CPU.ActiveCfg = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Debug|Win32.ActiveCfg = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Debug|x64.ActiveCfg = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Debug|x64.Build.0 = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Debug|x86.ActiveCfg = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Release|Any CPU.ActiveCfg = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Release|Win32.ActiveCfg = Release|Win32
- {408E2482-2623-11DB-9BB9-97600548391D}.Release|Win32.Build.0 = Release|Win32
- {408E2482-2623-11DB-9BB9-97600548391D}.Release|x64.ActiveCfg = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Release|x64.Build.0 = Release|x64
- {408E2482-2623-11DB-9BB9-97600548391D}.Release|x86.ActiveCfg = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|Any CPU.ActiveCfg = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|Win32.ActiveCfg = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|x64.ActiveCfg = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|x64.Build.0 = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Debug|x86.ActiveCfg = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Any CPU.ActiveCfg = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|Win32.ActiveCfg = Release|Win32
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|x64.ActiveCfg = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|x64.Build.0 = Release|x64
- {5582D8D0-DB93-11DB-930B-CD6B662399AA}.Release|x86.ActiveCfg = Release|x64
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|Win32.ActiveCfg = Debug|x86
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|x64.ActiveCfg = Debug|x64
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|x64.Build.0 = Debug|x64
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|x86.ActiveCfg = Debug|x86
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Debug|x86.Build.0 = Debug|x86
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Any CPU.Build.0 = Release|Any CPU
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Win32.ActiveCfg = Release|Any CPU
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|Win32.Build.0 = Release|Any CPU
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|x64.ActiveCfg = Release|Any CPU
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|x86.ActiveCfg = Release|x86
- {50E2DD3F-5B5E-4E62-9206-A41824905CD7}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/windows/virtuoso_odbc_clr_t.vcxproj b/windows/virtuoso_odbc_clr_t.vcxproj
deleted file mode 100644
index 8016d14..0000000
--- a/windows/virtuoso_odbc_clr_t.vcxproj
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>virtuoso-clr-t</ProjectName>
- <ProjectGuid>{8D07389F-F48A-49B9-BED9-F71FCBACC4A8}</ProjectGuid>
- <RootNamespace>virtuoso_clr_t</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderFile>
- </PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>libvirtuoso-t.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;advapi32.lib;Mscoree.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtuoso-clr-t.exe</OutputFile>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)virtuoso_clr_t.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderFile>
- </PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>libvirtuoso-t.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;advapi32.lib;Mscoree.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtuoso-clr-t.exe</OutputFile>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)virtuoso_clr_t.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\hosting\mono\basec.c" />
- <ClCompile Include="..\binsrc\hosting\mono\dotnet.cpp" />
- <ClCompile Include="..\binsrc\hosting\mono\sql_code_clr.c" />
- <ClCompile Include="..\binsrc\hosting\mono\sql_code_xslt.c" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\binsrc\virtuoso\virtuoso_t.rc" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\binsrc\hosting\mono\import_clr.sql">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\binsrc\hosting\mono\mono_type.xsl">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_xslt.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-rm -f sql_code_xslt.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(Filename)%(Extension) > sql_code_xslt.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f sql_code_xslt.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(Filename)%(Extension) > sql_code_xslt.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_xslt.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-rm -f sql_code_xslt.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(Filename)%(Extension) > sql_code_xslt.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f sql_code_xslt.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(Filename)%(Extension) > sql_code_xslt.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\binsrc\hosting\mono\virtclr.cs">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-
-csc /t:library /out:$(TargetDir)/virtclr.dll %(Filename)%(Extension)
-csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
-gacutil -u virt_http
-gacutil -i $(TargetDir)/virt_http.dll
-
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_http.cs;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-
-csc /t:library /out:$(TargetDir)/virtclr.dll %(Filename)%(Extension)
-csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
-gacutil -u virt_http
-gacutil -i $(TargetDir)/virt_http.dll
-
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-
-csc /t:library /out:$(TargetDir)/virtclr.dll %(Filename)%(Extension)
-csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
-gacutil -u virt_http
-gacutil -i $(TargetDir)/virt_http.dll
-
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\virt_http.cs;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\virt_http.cs;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-
-csc /t:library /out:$(TargetDir)/virtclr.dll %(Filename)%(Extension)
-csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
-gacutil -u virt_http
-gacutil -i $(TargetDir)/virt_http.dll
-
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_http.cs;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-
-csc /t:library /out:$(TargetDir)/virtclr.dll %(Filename)%(Extension)
-csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
-gacutil -u virt_http
-gacutil -i $(TargetDir)/virt_http.dll
-
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-
-csc /t:library /out:$(TargetDir)/virtclr.dll %(Filename)%(Extension)
-csc /t:library /out:$(TargetDir)/virt_http.dll virt_http.cs
-gacutil -u virt_http
-gacutil -i $(TargetDir)/virt_http.dll
-
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\virt_http.cs;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\virt_http.cs;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)\virtclr.dll;$(TargetDir)\virt_http.dll;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libvirtuoso_odbc_t.vcxproj">
- <Project>{fb836c59-41e1-48ea-a59b-460ab56587ee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/virtuoso_odbc_javavm_t.vcxproj b/windows/virtuoso_odbc_javavm_t.vcxproj
deleted file mode 100644
index 5a67453..0000000
--- a/windows/virtuoso_odbc_javavm_t.vcxproj
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>virtuoso-javavm-t</ProjectName>
- <ProjectGuid>{02AD88A0-CF7B-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>virtuoso_javavm_t</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>$(JDK_PATH)\include;..\libsrc\xml.new;..\libsrc;$(JDK_PATH)\include\win32;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderFile>
- </PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>libvirtuoso-t.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;$(JDK_PATH)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtuoso-javavm-t.exe</OutputFile>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)virtuoso_javavm_t.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>$(JDK_PATH)\include;..\libsrc\xml.new;..\libsrc;$(JDK_PATH)\include\win32;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;YYTOKENTYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderFile>
- </PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>libvirtuoso-t.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;$(JDK_PATH)\lib\jvm.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtuoso-javavm-t.exe</OutputFile>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)virtuoso_javavm_t.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\biftest\java_code.c" />
- <ClCompile Include="..\binsrc\tests\biftest\javavm.c" />
- <ClCompile Include="..\binsrc\tests\biftest\sql_code_clr.c" />
- <ClCompile Include="..\binsrc\tests\biftest\sql_code_javavm.c" />
- <ClCompile Include="..\binsrc\tests\biftest\sql_code_xslt.c" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\binsrc\virtuoso\virtuoso_t.rc" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\binsrc\tests\biftest\import_clr.sql">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_clr pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_clr.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_clr.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\binsrc\tests\biftest\javavm_type.xsl">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_xslt.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_xslt.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(Filename)%(Extension) > sql_code_xslt.c
-
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_xslt.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(Filename)%(Extension) > sql_code_xslt.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_clr.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(FullPath) > sql_code_xslt.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_xslt.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(Filename)%(Extension) > sql_code_xslt.c
-
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_xslt.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_xslt pass_bootstrap_cli=1 pl_stats=PLDBG %(Filename)%(Extension) > sql_code_xslt.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_xslt.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\binsrc\tests\biftest\javavm_xml.sql">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_javavm.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_javavm.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_javavm.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c
-
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_javavm.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\sql_code_javavm.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code_javavm.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_javavm.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_javavm.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_javavm.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c
-
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-
-rm -f sql_code_javavm.c
-gawk -f ../../../libsrc/Wi/sql_to_c.awk -v init_name=_javavm pass_bootstrap_cli=1 pl_stats=PLDBG javavm_xml.sql > sql_code_javavm.c
-
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\sql_code_javavm.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code_javavm.c;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libvirtuoso_odbc_t.vcxproj">
- <Project>{fb836c59-41e1-48ea-a59b-460ab56587ee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/virtuoso_odbc_sample_t.vcxproj b/windows/virtuoso_odbc_sample_t.vcxproj
deleted file mode 100644
index cf422f2..0000000
--- a/windows/virtuoso_odbc_sample_t.vcxproj
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>virtuoso-sample-t</ProjectName>
- <ProjectGuid>{0E838FA8-CF7B-11DA-85E2-A4E5714C712A}</ProjectGuid>
- <RootNamespace>virtuoso_sample_t</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderFile>
- </PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>libvirtuoso-t.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtuoso-sample-t.exe</OutputFile>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)virtuoso_sample_t.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\libsrc\openssl;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderFile>
- </PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>libvirtuoso-t.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtuoso-sample-t.exe</OutputFile>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)virtuoso_sample_t.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\binsrc\tests\biftest\bif_sample.c" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\binsrc\virtuoso\virtuoso_t.rc" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="libvirtuoso_odbc_t.vcxproj">
- <Project>{fb836c59-41e1-48ea-a59b-460ab56587ee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/virtuoso_odbc_t.vcxproj b/windows/virtuoso_odbc_t.vcxproj
deleted file mode 100644
index 5336b94..0000000
--- a/windows/virtuoso_odbc_t.vcxproj
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>virtuoso-t</ProjectName>
- <ProjectGuid>{F4E88BFA-FC96-439D-9E67-0A92AB541EE0}</ProjectGuid>
- <RootNamespace>virtuoso_t</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/virtuoso_t.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\SDK\$(ShortPlatform)\sslsdk\inc32;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>PACKAGE_VERSION="6.1.5";_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- <DebugInformationFormat>
- </DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\openlink\include;..\xOs\stubs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>threadw.lib;wi.lib;dksrv.lib;util.lib;xml.lib;zlib.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;tidy.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtuoso-t.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/virtuoso_t.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <TypeLibraryName>$(Configuration)/virtuoso_t.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\SDK\$(ShortPlatform)\sslsdk\inc32;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>PACKAGE_VERSION="6.1.5";_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\openlink\include;..\xOs\stubs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>threadw.lib;wi.lib;dksrv.lib;util.lib;xml.lib;zlib.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;tidy.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)virtuoso-t.exe</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/virtuoso_t.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <AdditionalOptions>
- </AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Wi\shcompo.c" />
- <ClCompile Include="..\binsrc\virtuoso\viconfig.c" />
- <ClCompile Include="..\binsrc\virtuoso\viwin32.c" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\binsrc\virtuoso\virtuoso_t.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\binsrc\virtuoso\viwin32.ico" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="dksrv.vcxproj">
- <Project>{58867eba-ca07-4f41-a966-6245ff14773e}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="threadw.vcxproj">
- <Project>{d3a2882c-410a-4f58-8ace-a771888073e8}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="util.vcxproj">
- <Project>{031db868-5294-4738-90ba-f80bb2cea9dc}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="wi.vcxproj">
- <Project>{93051962-7797-49f0-8958-bb1ce60ffe6f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="xml.vcxproj">
- <Project>{0c234ef0-7725-4bda-a1c3-47f5835a3837}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="zlib.vcxproj">
- <Project>{86645c8e-3bbe-4e1e-a8ae-c6990b4ecc64}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/wbxml2.vcxproj b/windows/wbxml2.vcxproj
deleted file mode 100644
index 2a91561..0000000
--- a/windows/wbxml2.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{5582D8D0-DB93-11DB-930B-CD6B662399AA}</ProjectGuid>
- <RootNamespace>wbxml2</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/wbxml2.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;..\SDK\$(ShortPlatform)\wbxml2;..\SDK\$(ShortPlatform)\wbxml2\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;LIBWBXML2_EXPORTS;WBXML_LIB_VERBOSE;WBXML_SUPPORT_WML;WBXML_SUPPORT_WTA;WBXML_SUPPORT_SI;WBXML_SUPPORT_SL;WBXML_SUPPORT_CO;WBXML_SUPPORT_PROV;WBXML_SUPPORT_EMN;WBXML_SUPPORT_DRMREL;WBXML_SUPPORT_OTA_SETTINGS;WBXML_SUPPORT_SYNCML;WBXML_SUPPORT_WV;WBXML_ENCODER_USE_STRTBL;WBXML_WRAPPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;libwbxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)wbxml2.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;../SDK/$(ShortPlatform)/wbxml2/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\samples\wbxml2\wbxml2.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/wbxml2.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/wbxml2.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;..\SDK\$(ShortPlatform)\wbxml2;..\SDK\$(ShortPlatform)\wbxml2\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;LIBWBXML2_EXPORTS;WBXML_LIB_VERBOSE;WBXML_SUPPORT_WML;WBXML_SUPPORT_WTA;WBXML_SUPPORT_SI;WBXML_SUPPORT_SL;WBXML_SUPPORT_CO;WBXML_SUPPORT_PROV;WBXML_SUPPORT_EMN;WBXML_SUPPORT_DRMREL;WBXML_SUPPORT_OTA_SETTINGS;WBXML_SUPPORT_SYNCML;WBXML_SUPPORT_WV;WBXML_ENCODER_USE_STRTBL;WBXML_WRAPPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;libwbxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)wbxml2.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;../SDK/$(ShortPlatform)/wbxml2/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\binsrc\samples\wbxml2\wbxml2.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/wbxml2.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <AdditionalOptions>
- </AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\plugin\import_gate_virtuoso.c" />
- <ClCompile Include="..\binsrc\samples\wbxml2\wbxml2.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/wi.vcxproj b/windows/wi.vcxproj
deleted file mode 100644
index a6b26cf..0000000
--- a/windows/wi.vcxproj
+++ /dev/null
@@ -1,1080 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{93051962-7797-49F0-8958-BB1CE60FFE6F}</ProjectGuid>
- <RootNamespace>wi</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\zlib;..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\plugin;..\libsrc\langfunc;%(RootDir)%(Directory)\tidy;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;..\libsrc\Tidy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;YY_NO_UNISTD_H;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;OLD_TIDY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <UndefinePreprocessorDefinitions>YYDEBUG;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)wi.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\zlib;..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\plugin;..\libsrc\langfunc;%(RootDir)%(Directory)\tidy;..\binsrc\driver;..\SDK\$(ShortPlatform)\sslsdk\inc32;..\libsrc\Tidy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_IMSG;_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;BIF_XML;REPLICATION_SUPPORT=1;REPLICATION_SUPPORT2=1;VIRTUAL_DIR;BIF_XPER;BIF_TIDY;VIRTTP;INC_BACKUP;VAD;_LDAP;YYTOKENTYPE;PLDBG;NDEBUG;YY_NO_UNISTD_H;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC;OLD_TIDY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <UndefinePreprocessorDefinitions>YYDEBUG;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)wi.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Wi\2pc.c" />
- <ClCompile Include="..\libsrc\Wi\aqueue.c" />
- <ClCompile Include="..\libsrc\Wi\arith.c" />
- <ClCompile Include="..\libsrc\Wi\auxfiles.c" />
- <ClCompile Include="..\libsrc\Wi\bif_audio.c" />
- <ClCompile Include="..\libsrc\Wi\bif_crypto.c" />
- <ClCompile Include="..\libsrc\Wi\bif_date.c" />
- <ClCompile Include="..\libsrc\Wi\bif_dav.c" />
- <ClCompile Include="..\libsrc\Wi\bif_diff.c" />
- <ClCompile Include="..\libsrc\Wi\bif_explain.c" />
- <ClCompile Include="..\libsrc\Wi\bif_file.c" />
- <ClCompile Include="..\libsrc\Wi\bif_gnw.c" />
- <ClCompile Include="..\libsrc\Wi\bif_imap.c" />
- <ClCompile Include="..\libsrc\Wi\bif_intl.c" />
- <ClCompile Include="..\libsrc\Wi\bif_json.c" />
- <ClCompile Include="..\libsrc\Wi\bif_kerberoscli.c" />
- <ClCompile Include="..\libsrc\Wi\bif_ldapcli.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\bif_mts.c" />
- <ClCompile Include="..\libsrc\Wi\bif_nntp.c" />
- <ClCompile Include="..\libsrc\Wi\bif_phrasematch.c" />
- <ClCompile Include="..\libsrc\Wi\bif_pop3.c" />
- <ClCompile Include="..\libsrc\Wi\bif_regexp.c" />
- <ClCompile Include="..\libsrc\Wi\bif_repl.c" />
- <ClCompile Include="..\libsrc\Wi\bif_search_excerpt.c" />
- <ClCompile Include="..\libsrc\Wi\bif_smtp.c" />
- <ClCompile Include="..\libsrc\Wi\bif_soap.c" />
- <ClCompile Include="..\libsrc\Wi\bif_text.c" />
- <ClCompile Include="..\libsrc\Wi\bif_tidy.c" />
- <ClCompile Include="..\libsrc\Wi\bif_uuencode.c" />
- <ClCompile Include="..\libsrc\Wi\bif_xml.c" />
- <ClCompile Include="..\libsrc\Wi\bif_xper.c" />
- <ClCompile Include="..\libsrc\Wi\bitmap.c" />
- <ClCompile Include="..\libsrc\Wi\blob.c" />
- <ClCompile Include="..\libsrc\Wi\blobio.c" />
- <ClCompile Include="..\libsrc\Wi\cl_stubs.c" />
- <ClCompile Include="..\libsrc\Wi\crypt.c" />
- <ClCompile Include="..\libsrc\Wi\datesupp.c" />
- <ClCompile Include="..\libsrc\Wi\ddlrun.c" />
- <ClCompile Include="..\libsrc\Wi\disk.c" />
- <ClCompile Include="..\libsrc\Wi\dks_esc.c" />
- <ClCompile Include="..\libsrc\Wi\eqlcomp.c" />
- <ClCompile Include="..\libsrc\Wi\extent.c" />
- <ClCompile Include="..\libsrc\Wi\gate.c" />
- <ClCompile Include="..\libsrc\Wi\hash.c" />
- <ClCompile Include="..\libsrc\Wi\hosting.c" />
- <ClCompile Include="..\libsrc\Wi\http.c" />
- <ClCompile Include="..\libsrc\Wi\http_client.c" />
- <ClCompile Include="..\libsrc\Wi\insert.c" />
- <ClCompile Include="..\libsrc\Wi\inxop.c" />
- <ClCompile Include="..\libsrc\Wi\jso.c" />
- <ClCompile Include="..\libsrc\Wi\json_l.c" />
- <ClCompile Include="..\libsrc\Wi\json_p.c" />
- <ClCompile Include="..\libsrc\Wi\lisprdr.c" />
- <ClCompile Include="..\libsrc\Wi\lock.c" />
- <ClCompile Include="..\libsrc\Wi\log.c" />
- <ClCompile Include="..\libsrc\Wi\map_schema.c" />
- <ClCompile Include="..\libsrc\Wi\meta.c" />
- <ClCompile Include="..\libsrc\Wi\mtwrite.c" />
- <ClCompile Include="..\libsrc\Wi\multibyte.c" />
- <ClCompile Include="..\libsrc\Wi\neodisk.c" />
- <ClCompile Include="..\libsrc\Wi\nquad_p.c" />
- <ClCompile Include="..\libsrc\Wi\numeric.c" />
- <ClCompile Include="..\libsrc\Wi\obackup.c" />
- <ClCompile Include="..\libsrc\Wi\odbccat.c" />
- <ClCompile Include="..\libsrc\Wi\page.c" />
- <ClCompile Include="..\libsrc\Wi\pldebug.c" />
- <ClCompile Include="..\libsrc\Wi\plugin_loader.c" />
- <ClCompile Include="..\libsrc\Wi\rdf_core.c" />
- <ClCompile Include="..\libsrc\Wi\rdf_mapping_jso.c" />
- <ClCompile Include="..\libsrc\Wi\rdfbox.c" />
- <ClCompile Include="..\libsrc\Wi\rdfinf.c" />
- <ClCompile Include="..\libsrc\Wi\rdfxml_parser.c" />
- <ClCompile Include="..\libsrc\Wi\recovery.c" />
- <ClCompile Include="..\libsrc\Wi\regist.c" />
- <ClCompile Include="..\libsrc\Wi\rltrx.c" />
- <ClCompile Include="..\libsrc\Wi\row.c" />
- <ClCompile Include="..\libsrc\Wi\schspace.c" />
- <ClCompile Include="..\libsrc\Wi\scn3_vsnet.c" />
- <ClCompile Include="..\libsrc\Wi\search.c" />
- <ClCompile Include="..\libsrc\Wi\search_in.c" />
- <ClCompile Include="..\libsrc\Wi\security.c" />
- <ClCompile Include="..\libsrc\Wi\shuric.c" />
- <ClCompile Include="..\libsrc\Wi\sort.c" />
- <ClCompile Include="..\libsrc\Wi\space.c" />
- <ClCompile Include="..\libsrc\Wi\sparql2sql.c" />
- <ClCompile Include="..\libsrc\Wi\sparql2sqltext.c" />
- <ClCompile Include="..\libsrc\Wi\sparql_core.c" />
- <ClCompile Include="..\libsrc\Wi\sparql_l.c" />
- <ClCompile Include="..\libsrc\Wi\sparql_p.c" />
- <ClCompile Include="..\libsrc\Wi\sparql_qm.c" />
- <ClCompile Include="..\libsrc\Wi\sparql_rdb2rdf.c" />
- <ClCompile Include="..\libsrc\Wi\sparql_sff.c" />
- <ClCompile Include="..\libsrc\Wi\sparql_tree.c" />
- <ClCompile Include="..\libsrc\Wi\sparqld.c" />
- <ClCompile Include="..\libsrc\Wi\sparul2sql.c" />
- <ClCompile Include="..\libsrc\Wi\sql3_vc.c" />
- <ClCompile Include="..\libsrc\Wi\sql_code.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_1.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_2pc.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_adm.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_auto.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_blog.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_cache.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_cache_impl.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_dav.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_dbp.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_ddk.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_imsg.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_pldbg.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_repl.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_sparql.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_sparql_init.c" />
- <ClCompile Include="..\libsrc\Wi\sql_code_sys.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_uddi.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_vad.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_vdb.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sql_code_ws.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
- </ClCompile>
- <ClCompile Include="..\libsrc\Wi\sqlbif.c" />
- <ClCompile Include="..\libsrc\Wi\sqlbif2.c" />
- <ClCompile Include="..\libsrc\Wi\sqlcomp.c" />
- <ClCompile Include="..\libsrc\Wi\sqlcomp2.c" />
- <ClCompile Include="..\libsrc\Wi\sqlcost.c" />
- <ClCompile Include="..\libsrc\Wi\sqlcr.c" />
- <ClCompile Include="..\libsrc\Wi\sqldf.c" />
- <ClCompile Include="..\libsrc\Wi\sqlexp.c" />
- <ClCompile Include="..\libsrc\Wi\sqlgen.c" />
- <ClCompile Include="..\libsrc\Wi\sqlhash.c" />
- <ClCompile Include="..\libsrc\Wi\sqlintrp.c" />
- <ClCompile Include="..\libsrc\Wi\sqlinx.c" />
- <ClCompile Include="..\libsrc\Wi\sqlo.c" />
- <ClCompile Include="..\libsrc\Wi\sqloby.c" />
- <ClCompile Include="..\libsrc\Wi\sqlocr.c" />
- <ClCompile Include="..\libsrc\Wi\sqloinv.c" />
- <ClCompile Include="..\libsrc\Wi\sqloinx.c" />
- <ClCompile Include="..\libsrc\Wi\sqloprt.c" />
- <ClCompile Include="..\libsrc\Wi\sqlorder.c" />
- <ClCompile Include="..\libsrc\Wi\sqlovdb.c" />
- <ClCompile Include="..\libsrc\Wi\sqlpfn.c" />
- <ClCompile Include="..\libsrc\Wi\sqlprocc.c" />
- <ClCompile Include="..\libsrc\Wi\sqlprt.c" />
- <ClCompile Include="..\libsrc\Wi\sqlrbuf.c" />
- <ClCompile Include="..\libsrc\Wi\sqlrcomp.c" />
- <ClCompile Include="..\libsrc\Wi\sqlrrun.c" />
- <ClCompile Include="..\libsrc\Wi\sqlrun.c" />
- <ClCompile Include="..\libsrc\Wi\sqlsrv.c" />
- <ClCompile Include="..\libsrc\Wi\sqlstmts.c" />
- <ClCompile Include="..\libsrc\Wi\sqltrig.c" />
- <ClCompile Include="..\libsrc\Wi\sqltype.c" />
- <ClCompile Include="..\libsrc\Wi\sqlver.c" />
- <ClCompile Include="..\libsrc\Wi\sqlview.c" />
- <ClCompile Include="..\libsrc\Wi\srvcr.c" />
- <ClCompile Include="..\libsrc\Wi\srvmultibyte.c" />
- <ClCompile Include="..\libsrc\Wi\srvstat.c" />
- <ClCompile Include="..\libsrc\Wi\string.c" />
- <ClCompile Include="..\libsrc\Wi\subseq.c" />
- <ClCompile Include="..\libsrc\Wi\text.c" />
- <ClCompile Include="..\libsrc\Wi\trans.c" />
- <ClCompile Include="..\libsrc\Wi\turtle_l.c" />
- <ClCompile Include="..\libsrc\Wi\turtle_p.c" />
- <ClCompile Include="..\libsrc\Wi\uname_const_decl.c" />
- <ClCompile Include="..\libsrc\Wi\update.c" />
- <ClCompile Include="..\libsrc\Wi\uuencode.c" />
- <ClCompile Include="..\libsrc\Wi\wi_xid.c" />
- <ClCompile Include="..\libsrc\Wi\wirpc.c" />
- <ClCompile Include="..\libsrc\Wi\wiservic.c" />
- <ClCompile Include="..\libsrc\Wi\xmlenc-dec.c" />
- <ClCompile Include="..\libsrc\Wi\xmlenc.c" />
- <ClCompile Include="..\libsrc\Wi\xmlenc_algos.c" />
- <ClCompile Include="..\libsrc\Wi\xmllazy.c" />
- <ClCompile Include="..\libsrc\Wi\xmlschema.c" />
- <ClCompile Include="..\libsrc\Wi\xmlsearch.c" />
- <ClCompile Include="..\libsrc\Wi\xmlsql.c" />
- <ClCompile Include="..\libsrc\Wi\xmltree.c" />
- <ClCompile Include="..\libsrc\Wi\xpath.c" />
- <ClCompile Include="..\libsrc\Wi\xpathp.c" />
- <ClCompile Include="..\libsrc\Wi\xpf.c" />
- <ClCompile Include="..\libsrc\Wi\xpscn_vsnet.c" />
- <ClCompile Include="..\libsrc\Wi\xqf.c" />
- <ClCompile Include="..\libsrc\Wi\xslt.c" />
- <ClCompile Include="..\libsrc\Wi\xslt_fmt.c" />
- <ClCompile Include="..\libsrc\Wi\xslt_opt.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\libsrc\Wi\map_schema.h" />
- <ClInclude Include="..\libsrc\Wi\2pc.h" />
- <ClInclude Include="..\libsrc\Wi\2pc_client.h" />
- <ClInclude Include="..\libsrc\Wi\arith.h" />
- <ClInclude Include="..\libsrc\Wi\bif_text.h" />
- <ClInclude Include="..\libsrc\Wi\bif_xper.h" />
- <ClInclude Include="..\libsrc\Wi\blobio.h" />
- <ClInclude Include="..\libsrc\Wi\CLI.h" />
- <ClInclude Include="..\libsrc\Wi\crsr.h" />
- <ClInclude Include="..\libsrc\Wi\date.h" />
- <ClInclude Include="..\libsrc\Wi\datesupp.h" />
- <ClInclude Include="..\libsrc\Wi\eqlcomp.h" />
- <ClInclude Include="..\libsrc\Wi\hosting.h" />
- <ClInclude Include="..\libsrc\Wi\http.h" />
- <ClInclude Include="..\libsrc\Wi\http_client.h" />
- <ClInclude Include="..\libsrc\Wi\iodbcinst.h" />
- <ClInclude Include="..\libsrc\Wi\ksrvext.h" />
- <ClInclude Include="..\libsrc\Wi\ksrvextphp.h" />
- <ClInclude Include="..\libsrc\Wi\license.h" />
- <ClInclude Include="..\libsrc\Wi\lisprdr.h" />
- <ClInclude Include="..\libsrc\Wi\list2.h" />
- <ClInclude Include="..\libsrc\Wi\log.h" />
- <ClInclude Include="..\libsrc\Wi\ltrx.h" />
- <ClInclude Include="..\libsrc\Wi\msdtc.h" />
- <ClInclude Include="..\libsrc\Wi\mts.h" />
- <ClInclude Include="..\libsrc\Wi\mts_client.h" />
- <ClInclude Include="..\libsrc\Wi\mts_com.h" />
- <ClInclude Include="..\libsrc\Wi\multibyte.h" />
- <ClInclude Include="..\libsrc\Wi\numeric.h" />
- <ClInclude Include="..\libsrc\Wi\odbcinc.h" />
- <ClInclude Include="..\libsrc\Wi\pldebug.h" />
- <ClInclude Include="..\libsrc\Wi\rdf_core.h" />
- <ClInclude Include="..\libsrc\Wi\recovery.h" />
- <ClInclude Include="..\libsrc\Wi\remote.h" />
- <ClInclude Include="..\libsrc\Wi\rendezvous.h" />
- <ClInclude Include="..\libsrc\Wi\repl.h" />
- <ClInclude Include="..\libsrc\Wi\replsr.h" />
- <ClInclude Include="..\libsrc\Wi\schspace.h" />
- <ClInclude Include="..\libsrc\Wi\security.h" />
- <ClInclude Include="..\libsrc\Wi\sha.h" />
- <ClInclude Include="..\libsrc\Wi\shuric.h" />
- <ClInclude Include="..\libsrc\Wi\soap.h" />
- <ClInclude Include="..\libsrc\Wi\sparql.h" />
- <ClInclude Include="..\libsrc\Wi\sparql2sql.h" />
- <ClInclude Include="..\libsrc\Wi\sparql_p.h" />
- <ClInclude Include="..\libsrc\Wi\sql3.h" />
- <ClInclude Include="..\libsrc\Wi\sqlbif.h" />
- <ClInclude Include="..\libsrc\Wi\sqlcmps.h" />
- <ClInclude Include="..\libsrc\Wi\sqlcomp.h" />
- <ClInclude Include="..\libsrc\Wi\sqlcstate.h" />
- <ClInclude Include="..\libsrc\Wi\sqlfn.h" />
- <ClInclude Include="..\libsrc\Wi\sqlintrp.h" />
- <ClInclude Include="..\libsrc\Wi\sqlnode.h" />
- <ClInclude Include="..\libsrc\Wi\sqlo.h" />
- <ClInclude Include="..\libsrc\Wi\sqlocr.h" />
- <ClInclude Include="..\libsrc\Wi\sqlofn.h" />
- <ClInclude Include="..\libsrc\Wi\sqloinv.h" />
- <ClInclude Include="..\libsrc\Wi\sqlopcod.h" />
- <ClInclude Include="..\libsrc\Wi\sqlpar.h" />
- <ClInclude Include="..\libsrc\Wi\sqlparext.h" />
- <ClInclude Include="..\libsrc\Wi\sqlpfn.h" />
- <ClInclude Include="..\libsrc\Wi\sqlrcomp.h" />
- <ClInclude Include="..\libsrc\Wi\sqltype.h" />
- <ClInclude Include="..\libsrc\Wi\sqltype_c.h" />
- <ClInclude Include="..\libsrc\Wi\sqlver.h" />
- <ClInclude Include="..\libsrc\Wi\sqlwords.h" />
- <ClInclude Include="..\libsrc\Wi\srvmultibyte.h" />
- <ClInclude Include="..\libsrc\Wi\srvstat.h" />
- <ClInclude Include="..\libsrc\Wi\statuslog.h" />
- <ClInclude Include="..\libsrc\Wi\strlike.h" />
- <ClInclude Include="..\libsrc\Wi\subseq.h" />
- <ClInclude Include="..\libsrc\Wi\text.h" />
- <ClInclude Include="..\libsrc\Wi\turtle_p.h" />
- <ClInclude Include="..\libsrc\Wi\uuencode_impl.h" />
- <ClInclude Include="..\libsrc\Wi\virtext.h" />
- <ClInclude Include="..\libsrc\Wi\virtpwd.h" />
- <ClInclude Include="..\libsrc\Wi\wi.h" />
- <ClInclude Include="..\libsrc\Wi\wi_xid.h" />
- <ClInclude Include="..\libsrc\Wi\widd.h" />
- <ClInclude Include="..\libsrc\Wi\widisk.h" />
- <ClInclude Include="..\libsrc\Wi\widv.h" />
- <ClInclude Include="..\libsrc\Wi\wifn.h" />
- <ClInclude Include="..\libsrc\Wi\wirpce.h" />
- <ClInclude Include="..\libsrc\Wi\wiservic.h" />
- <ClInclude Include="..\libsrc\Wi\xml.h" />
- <ClInclude Include="..\libsrc\Wi\xmlenc.h" />
- <ClInclude Include="..\libsrc\Wi\xmlenc_algos.h" />
- <ClInclude Include="..\libsrc\Wi\xmlenc_test.h" />
- <ClInclude Include="..\libsrc\Wi\xmlgen.h" />
- <ClInclude Include="..\libsrc\Wi\xmlnode.h" />
- <ClInclude Include="..\libsrc\Wi\xmlres.h" />
- <ClInclude Include="..\libsrc\Wi\xmltree.h" />
- <ClInclude Include="..\libsrc\Wi\xpath.h" />
- <ClInclude Include="..\libsrc\Wi\xpathp.h" />
- <ClInclude Include="..\libsrc\Wi\xpathp_impl.h" />
- <ClInclude Include="..\libsrc\Wi\xpf.h" />
- <ClInclude Include="..\libsrc\Wi\xqf.h" />
- <ClInclude Include="..\libsrc\Wi\xslt_impl.h" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\libsrc\Wi\json.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-rm -f json_l.c
-flex -8 -Pjsonyy -ojson_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f json_l.c
-flex -8 -Pjsonyy -ojson_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)json_l.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)json_l.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-rm -f json_l.c
-flex -8 -Pjsonyy -ojson_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f json_l.c
-flex -8 -Pjsonyy -ojson_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)json_l.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)json_l.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\json.y">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-rm -f json_p.c
-rm -f json_p.h
-bison -y -vd -pjsonyy json.y -ojson_p.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f json_p.c
-rm -f json_p.h
-bison -y -vd -pjsonyy json.y -ojson_p.c
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)json_p.c;%(RootDir)%(Directory)json_p.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)json_p.c;%(RootDir)%(Directory)json_p.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-rm -f json_p.c
-rm -f json_p.h
-bison -y -vd -pjsonyy json.y -ojson_p.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f json_p.c
-rm -f json_p.h
-bison -y -vd -pjsonyy json.y -ojson_p.c
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)json_p.c;%(RootDir)%(Directory)json_p.h;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)json_p.c;%(RootDir)%(Directory)json_p.h;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)json_p.c;%(RootDir)%(Directory)json_p.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)json_p.c;%(RootDir)%(Directory)json_p.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\nquad_p.y">
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-rm -f nquad_p.c
-rm -f nquad_p.h
-bison -y -vd -pnqyy nquad_p.y -onquad_p.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f nquad_p.c
-rm -f nquad_p.h
-bison -y -vd -pnqyy nquad_p.y -onquad_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)nquad_p.c;%(RootDir)%(Directory)nquad_p.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)nquad_p.c;%(RootDir)%(Directory)nquad_p.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\scn3.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f scn3_vsnet.c
-flex -oscn3_vsnet.c %(FullPath)
-flex -Pscn3splityy -oscn3split.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)scn3_vsnet.c;%(RootDir)%(Directory)scn3split.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-rm -f scn3_vsnet.c
-flex -oscn3_vsnet.c %(FullPath)
-flex -Pscn3splityy -oscn3split.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f scn3_vsnet.c
-flex -oscn3_vsnet.c %(FullPath)
-flex -Pscn3splityy -oscn3split.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)scn3_vsnet.c;%(RootDir)%(Directory)scn3split.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)scn3_vsnet.c;%(RootDir)%(Directory)scn3split.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f scn3_vsnet.c
-flex -oscn3_vsnet.c %(FullPath)
-flex -Pscn3splityy -oscn3split.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)scn3_vsnet.c;%(RootDir)%(Directory)scn3split.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-rm -f scn3_vsnet.c
-flex -oscn3_vsnet.c %(FullPath)
-flex -Pscn3splityy -oscn3split.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f scn3_vsnet.c
-flex -oscn3_vsnet.c %(FullPath)
-flex -Pscn3splityy -oscn3split.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)scn3_vsnet.c;%(RootDir)%(Directory)scn3split.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)scn3_vsnet.c;%(RootDir)%(Directory)scn3split.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\sparql_l.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sparql_l.c
-flex -8 -Psparyy -osparql_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)sparql_l.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f sparql_l.c
-flex -8 -Psparyy -osparql_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sparql_l.c
-flex -8 -Psparyy -osparql_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)sparql_l.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)sparql_l.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sparql_l.c
-flex -8 -Psparyy -osparql_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)sparql_l.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f sparql_l.c
-flex -8 -Psparyy -osparql_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sparql_l.c
-flex -8 -Psparyy -osparql_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)sparql_l.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)sparql_l.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\sparql_p.y">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sparql_p.c
-rm -f sparql_p.h
-bison -y -vd -psparyy sparql_p.y -osparql_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)sparql_p.c;%(RootDir)%(Directory)sparql_p.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f sparql_p.c
-rm -f sparql_p.h
-bison -y -vd -psparyy sparql_p.y -osparql_p.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sparql_p.c
-rm -f sparql_p.h
-bison -y -vd -psparyy sparql_p.y -osparql_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)sparql_p.c;%(RootDir)%(Directory)sparql_p.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)sparql_p.c;%(RootDir)%(Directory)sparql_p.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sparql_p.c
-rm -f sparql_p.h
-bison -y -vd -psparyy sparql_p.y -osparql_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)sparql_p.c;%(RootDir)%(Directory)sparql_p.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f sparql_p.c
-rm -f sparql_p.h
-bison -y -vd -psparyy sparql_p.y -osparql_p.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sparql_p.c
-rm -f sparql_p.h
-bison -y -vd -psparyy sparql_p.y -osparql_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)sparql_p.c;%(RootDir)%(Directory)sparql_p.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)sparql_p.c;%(RootDir)%(Directory)sparql_p.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\sql3.y">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sql3.c
-rm -f sql3.h
-bison -y -vd sql3.y -osql3.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)sql3.c;%(RootDir)%(Directory)sql3.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f sql3.c
-rm -f sql3.h
-bison -y -vd sql3.y -osql3.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sql3.c
-rm -f sql3.h
-bison -y -vd sql3.y -osql3.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)sql3.c;%(RootDir)%(Directory)sql3.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)sql3.c;%(RootDir)%(Directory)sql3.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sql3.c
-rm -f sql3.h
-bison -y -vd sql3.y -osql3.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)sql3.c;%(RootDir)%(Directory)sql3.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f sql3.c
-rm -f sql3.h
-bison -y -vd sql3.y -osql3.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f sql3.c
-rm -f sql3.h
-bison -y -vd sql3.y -osql3.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)sql3.c;%(RootDir)%(Directory)sql3.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)sql3.c;%(RootDir)%(Directory)sql3.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\sql_to_c.awk">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-$(ProjectDir)\sqlcode.bat
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\..\..\binsrc\vspx\vspx.xsl;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code.c;%(RootDir)%(Directory)\sql_code_1.c;%(RootDir)%(Directory)\sql_code_ddk.c;%(RootDir)%(Directory)\sql_code_adm.c;%(RootDir)%(Directory)\sql_code_dav.c;%(RootDir)%(Directory)\sql_code_vad.c;%(RootDir)%(Directory)\sql_code_dbp.c;%(RootDir)%(Directory)\sql_code_uddi.c;%(RootDir)%(Directory)\sql_code_imsg.c;%(RootDir)%(Directory)\sql_code_auto.c;%(RootDir)%(Directory)\sql_code_2pc.c;%(RootDir)%(Directory)\rdf_mapping_jso.h;%(RootDir)%(Directory)\rdf_mapping_jso.c;%(RootDir)%(Directory)\rdf_mapping_jso.ttl;%(RootDir)%(Directory)\rdf_mapping_jso.ttl-sample;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-$(ProjectDir)\sqlcode.bat
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-$(ProjectDir)\sqlcode.bat
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\..\..\binsrc\vspx\vspx.xsl;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\..\..\binsrc\vspx\vspx.xsl;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\sql_code.c;%(RootDir)%(Directory)\sql_code_1.c;%(RootDir)%(Directory)\sql_code_ddk.c;%(RootDir)%(Directory)\sql_code_adm.c;%(RootDir)%(Directory)\sql_code_dav.c;%(RootDir)%(Directory)\sql_code_vad.c;%(RootDir)%(Directory)\sql_code_dbp.c;%(RootDir)%(Directory)\sql_code_uddi.c;%(RootDir)%(Directory)\sql_code_imsg.c;%(RootDir)%(Directory)\sql_code_auto.c;%(RootDir)%(Directory)\sql_code_2pc.c;%(RootDir)%(Directory)\rdf_mapping_jso.h;%(RootDir)%(Directory)\rdf_mapping_jso.c;%(RootDir)%(Directory)\rdf_mapping_jso.ttl;%(RootDir)%(Directory)\rdf_mapping_jso.ttl-sample;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sql_code.c;%(RootDir)%(Directory)\sql_code_1.c;%(RootDir)%(Directory)\sql_code_ddk.c;%(RootDir)%(Directory)\sql_code_adm.c;%(RootDir)%(Directory)\sql_code_dav.c;%(RootDir)%(Directory)\sql_code_vad.c;%(RootDir)%(Directory)\sql_code_dbp.c;%(RootDir)%(Directory)\sql_code_uddi.c;%(RootDir)%(Directory)\sql_code_imsg.c;%(RootDir)%(Directory)\sql_code_auto.c;%(RootDir)%(Directory)\sql_code_2pc.c;%(RootDir)%(Directory)\rdf_mapping_jso.h;%(RootDir)%(Directory)\rdf_mapping_jso.c;%(RootDir)%(Directory)\rdf_mapping_jso.ttl;%(RootDir)%(Directory)\rdf_mapping_jso.ttl-sample;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-$(ProjectDir)\sqlcode.bat
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\..\..\binsrc\vspx\vspx.xsl;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code.c;%(RootDir)%(Directory)\sql_code_1.c;%(RootDir)%(Directory)\sql_code_ddk.c;%(RootDir)%(Directory)\sql_code_adm.c;%(RootDir)%(Directory)\sql_code_dav.c;%(RootDir)%(Directory)\sql_code_vad.c;%(RootDir)%(Directory)\sql_code_dbp.c;%(RootDir)%(Directory)\sql_code_uddi.c;%(RootDir)%(Directory)\sql_code_imsg.c;%(RootDir)%(Directory)\sql_code_auto.c;%(RootDir)%(Directory)\sql_code_2pc.c;%(RootDir)%(Directory)\rdf_mapping_jso.h;%(RootDir)%(Directory)\rdf_mapping_jso.c;%(RootDir)%(Directory)\rdf_mapping_jso.ttl;%(RootDir)%(Directory)\rdf_mapping_jso.ttl-sample;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-$(ProjectDir)\sqlcode.bat
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-$(ProjectDir)\sqlcode.bat
-cd $(ProjectDir)
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\..\..\binsrc\vspx\vspx.xsl;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\..\..\binsrc\vspx\vspx.xsl;%(AdditionalInputs)</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\sql_code.c;%(RootDir)%(Directory)\sql_code_1.c;%(RootDir)%(Directory)\sql_code_ddk.c;%(RootDir)%(Directory)\sql_code_adm.c;%(RootDir)%(Directory)\sql_code_dav.c;%(RootDir)%(Directory)\sql_code_vad.c;%(RootDir)%(Directory)\sql_code_dbp.c;%(RootDir)%(Directory)\sql_code_uddi.c;%(RootDir)%(Directory)\sql_code_imsg.c;%(RootDir)%(Directory)\sql_code_auto.c;%(RootDir)%(Directory)\sql_code_2pc.c;%(RootDir)%(Directory)\rdf_mapping_jso.h;%(RootDir)%(Directory)\rdf_mapping_jso.c;%(RootDir)%(Directory)\rdf_mapping_jso.ttl;%(RootDir)%(Directory)\rdf_mapping_jso.ttl-sample;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sql_code.c;%(RootDir)%(Directory)\sql_code_1.c;%(RootDir)%(Directory)\sql_code_ddk.c;%(RootDir)%(Directory)\sql_code_adm.c;%(RootDir)%(Directory)\sql_code_dav.c;%(RootDir)%(Directory)\sql_code_vad.c;%(RootDir)%(Directory)\sql_code_dbp.c;%(RootDir)%(Directory)\sql_code_uddi.c;%(RootDir)%(Directory)\sql_code_imsg.c;%(RootDir)%(Directory)\sql_code_auto.c;%(RootDir)%(Directory)\sql_code_2pc.c;%(RootDir)%(Directory)\rdf_mapping_jso.h;%(RootDir)%(Directory)\rdf_mapping_jso.c;%(RootDir)%(Directory)\rdf_mapping_jso.ttl;%(RootDir)%(Directory)\rdf_mapping_jso.ttl-sample;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\sqlwords.gperf">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd %(RootDir)%(Directory)
-rm -f sqlwords.h
-gperf -aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$ sqlwords.gperf -Nlex_hash_kw | sed -e %27s/char \*keyword/char *keiiyword/g%27 >sqlwords.h
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)
-rm -f sqlwords.h
-gperf -aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$ sqlwords.gperf -Nlex_hash_kw | sed -e %27s/char \*keyword/char *keiiyword/g%27 >sqlwords.h
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\sqlwords.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\sqlwords.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-rm -f sqlwords.h
-gperf -aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$ sqlwords.gperf -Nlex_hash_kw | sed -e %27s/char \*keyword/char *keiiyword/g%27 >sqlwords.h
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f sqlwords.h
-gperf -aCDGptr -Kkeiiyword -L ANSI-C -k1,2,3,6,9,$ sqlwords.gperf -Nlex_hash_kw | sed -e %27s/char \*keyword/char *keiiyword/g%27 >sqlwords.h
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\sqlwords.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sqlwords.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\turtle_l.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f turtle_l.c
-flex -8 -Pttlyy -oturtle_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)turtle_l.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f turtle_l.c
-flex -8 -Pttlyy -oturtle_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f turtle_l.c
-flex -8 -Pttlyy -oturtle_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)turtle_l.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)turtle_l.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f turtle_l.c
-flex -8 -Pttlyy -oturtle_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)turtle_l.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f turtle_l.c
-flex -8 -Pttlyy -oturtle_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f turtle_l.c
-flex -8 -Pttlyy -oturtle_l.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)turtle_l.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)turtle_l.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\turtle_p.y">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f turtle_p.c
-rm -f turtle_p.h
-bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)turtle_p.c;%(RootDir)%(Directory)turtle_p.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f turtle_p.c
-rm -f turtle_p.h
-bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f turtle_p.c
-rm -f turtle_p.h
-bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\turtle_p.c;%(RootDir)%(Directory)\turtle_p.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\turtle_p.c;%(RootDir)%(Directory)\turtle_p.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f turtle_p.c
-rm -f turtle_p.h
-bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)turtle_p.c;%(RootDir)%(Directory)turtle_p.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f turtle_p.c
-rm -f turtle_p.h
-bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f turtle_p.c
-rm -f turtle_p.h
-bison -y -vd -pttlyy turtle_p.y -oturtle_p.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)turtle_p.c;%(RootDir)%(Directory)turtle_p.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)turtle_p.c;%(RootDir)%(Directory)turtle_p.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\xpathp.y">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f xpathp.c
-rm -f xpathp.h
-bison -y -vd -pxpyy xpathp.y -oxpathp.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)xpathp.c;%(RootDir)%(Directory)xpathp.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f xpathp.c
-rm -f xpathp.h
-bison -y -vd -pxpyy xpathp.y -oxpathp.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f xpathp.c
-rm -f xpathp.h
-bison -y -vd -pxpyy xpathp.y -oxpathp.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)xpathp.c;%(RootDir)%(Directory)xpathp.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)xpathp.c;%(RootDir)%(Directory)xpathp.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f xpathp.c
-rm -f xpathp.h
-bison -y -vd -pxpyy xpathp.y -oxpathp.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)xpathp.c;%(RootDir)%(Directory)xpathp.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f xpathp.c
-rm -f xpathp.h
-bison -y -vd -pxpyy xpathp.y -oxpathp.c
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f xpathp.c
-rm -f xpathp.h
-bison -y -vd -pxpyy xpathp.y -oxpathp.c
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)xpathp.c;%(RootDir)%(Directory)xpathp.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)xpathp.c;%(RootDir)%(Directory)xpathp.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\libsrc\Wi\xpscn.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f xpscn_vsnet.c
-flex -i -oxpscn_vsnet.c -Pxpyy %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)xpscn_vsnet.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f xpscn_vsnet.c
-flex -i -oxpscn_vsnet.c -Pxpyy %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f xpscn_vsnet.c
-flex -i -oxpscn_vsnet.c -Pxpyy %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)xpscn_vsnet.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)xpscn_vsnet.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f xpscn_vsnet.c
-flex -i -oxpscn_vsnet.c -Pxpyy %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)xpscn_vsnet.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f xpscn_vsnet.c
-flex -i -oxpscn_vsnet.c -Pxpyy %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f xpscn_vsnet.c
-flex -i -oxpscn_vsnet.c -Pxpyy %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)xpscn_vsnet.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)xpscn_vsnet.c;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\libsrc\Wi\sparqlwords.gperf">
- <FileType>Document</FileType>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd %(RootDir)%(Directory)
-rm -f sparqlwords.h
-gperf -aCDGptr -Kkwd -L ANSI-C -k1,2,3,5,7,$ sparqlwords.gperf --ignore-case -Nsparql_lex_hash_kw >sparqlwords.h
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\sparqlwords.h;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)
-rm -f sparqlwords.h
-gperf -aCDGptr -Kkwd -L ANSI-C -k1,2,3,5,7,$ sparqlwords.gperf --ignore-case -Nsparql_lex_hash_kw >sparqlwords.h
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\sparqlwords.h;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/windows/wic.vcxproj b/windows/wic.vcxproj
deleted file mode 100644
index 83d9a8d..0000000
--- a/windows/wic.vcxproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{A66E395B-18EE-4877-8F0D-386A7BBAB370}</ProjectGuid>
- <RootNamespace>wic</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\langfunc;..\libsrc\plugin;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)wic.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\langfunc;..\libsrc\plugin;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)wic.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Wi\blobio.c" />
- <ClCompile Include="..\libsrc\Wi\CLIcr.c" />
- <ClCompile Include="..\libsrc\Wi\CLIodbc3.c" />
- <ClCompile Include="..\libsrc\Wi\CLIsql1.c" />
- <ClCompile Include="..\libsrc\Wi\CLIsql2.c" />
- <ClCompile Include="..\libsrc\Wi\CLIsql3.c" />
- <ClCompile Include="..\libsrc\Wi\CLIsql3W.c" />
- <ClCompile Include="..\libsrc\Wi\CLIuti.c" />
- <ClCompile Include="..\libsrc\Wi\CLIw.c" />
- <ClCompile Include="..\libsrc\Wi\datesupp.c" />
- <ClCompile Include="..\libsrc\plugin\dlf.c" />
- <ClCompile Include="..\libsrc\Wi\mts_client.c" />
- <ClCompile Include="..\libsrc\Wi\multibyte.c" />
- <ClCompile Include="..\libsrc\Wi\numeric.c" />
- <ClCompile Include="..\libsrc\Wi\pldbgcli.c" />
- <ClCompile Include="..\libsrc\Wi\plugin_gate.c" />
- <ClCompile Include="..\libsrc\Wi\wi_xid.c" />
- <ClCompile Include="..\libsrc\Wi\wirpc.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\libsrc\Wi\wirpce.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/wikiv.vcxproj b/windows/wikiv.vcxproj
deleted file mode 100644
index 0aab809..0000000
--- a/windows/wikiv.vcxproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{A326A0DF-4F93-4DF6-813D-0B64F98B389F}</ProjectGuid>
- <RootNamespace>wikiv</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(Configuration)/wikiv.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:AMD64 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)wikiv.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\appsrc\ODS-Wiki\plugin\wikiv.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/wikiv.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>$(Configuration)/wikiv.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\Xml.new;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- <AdditionalIncludeDirectories>..\libsrc\Wi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>
- </AdditionalOptions>
- <AdditionalDependencies>dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)wikiv.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ModuleDefinitionFile>..\appsrc\ODS-Wiki\plugin\wikiv.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <ProgramDatabaseFile>$(Configuration)/wikiv.pdb</ProgramDatabaseFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(ShortPlatform)/$(Configuration)/$(ProjectName).lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\plugin\import_gate_virtuoso.c" />
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\maclex.c" />
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\wikilex.c" />
- <ClCompile Include="..\appsrc\ODS-Wiki\plugin\wikiv.c" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\appsrc\ODS-Wiki\plugin\maclex.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f maclex.c
-flex -8 -Pmacyy -omaclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f maclex.c
-flex -8 -Pmacyy -omaclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f maclex.c
-flex -8 -Pmacyy -omaclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\maclex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f maclex.c
-flex -8 -Pmacyy -omaclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\maclex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f maclex.c
-flex -8 -Pmacyy -omaclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f maclex.c
-flex -8 -Pmacyy -omaclex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\maclex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\maclex.c;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\appsrc\ODS-Wiki\plugin\wikilex.l">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f wikilex.c
-flex -8 -Pwikiyy -owikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-cd %(RootDir)%(Directory)
-rm -f wikilex.c
-flex -8 -Pwikiyy -owikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-cd %(RootDir)%(Directory)
-rm -f wikilex.c
-flex -8 -Pwikiyy -owikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\wikilex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)\wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f wikilex.c
-flex -8 -Pwikiyy -owikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\wikilex.c;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-cd %(RootDir)%(Directory)
-rm -f wikilex.c
-flex -8 -Pwikiyy -owikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-cd %(RootDir)%(Directory)
-rm -f wikilex.c
-flex -8 -Pwikiyy -owikilex.c %(FullPath)
-cd $(ProjectDir)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\wikilex.c;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\wikilex.c;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="wi.vcxproj">
- <Project>{93051962-7797-49f0-8958-bb1ce60ffe6f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/windows/xml.vcxproj b/windows/xml.vcxproj
deleted file mode 100644
index 432887b..0000000
--- a/windows/xml.vcxproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{0C234EF0-7725-4BDA-A1C3-47F5835A3837}</ProjectGuid>
- <RootNamespace>xml</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\libsrc\langfunc;..\libsrc\plugin;..\libsrc\util\pcrelib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <UndefinePreprocessorDefinitions>XML_NS;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)xml.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\libsrc\langfunc;..\libsrc\plugin;..\libsrc\util\pcrelib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <UndefinePreprocessorDefinitions>XML_NS;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)xml.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\Xml.new\charclasses.c" />
- <ClCompile Include="..\libsrc\Xml.new\datatypes.c" />
- <ClCompile Include="..\libsrc\Xml.new\dtd.c" />
- <ClCompile Include="..\libsrc\Xml.new\encodings.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\libsrc\Xml.new\html_mode.c" />
- <ClCompile Include="..\libsrc\Xml.new\schema.c" />
- <ClCompile Include="..\libsrc\Xml.new\schema_fsm.c" />
- <ClCompile Include="..\libsrc\Xml.new\xml_ecm.c" />
- <ClCompile Include="..\libsrc\Xml.new\xmlgram.c" />
- <ClCompile Include="..\libsrc\Xml.new\xmlparser.c" />
- <ClCompile Include="..\libsrc\Xml.new\xmlread.c" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\libsrc\Xml.new\xhtml_ent.gperf">
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gperf -aCDGptr -Kentity -k1,2,3,4,5,$ %(RootDir)%(Directory)xhtml_ent.gperf -Nxhtml_ent_gperf > %(RootDir)%(Directory)xhtml_ent.h
-
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gperf -aCDGptr -Kentity -k1,2,3,4,5,$ %(RootDir)%(Directory)xhtml_ent.gperf -Nxhtml_ent_gperf > %(RootDir)%(Directory)xhtml_ent.h
-
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)xhtml_ent.h</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xhtml_ent.h;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\libsrc\Xml.new\charclasses.h" />
- <ClInclude Include="..\libsrc\Xml.new\encodings.h" />
- <ClInclude Include="..\libsrc\Xml.new\html_mode.h" />
- <ClInclude Include="..\libsrc\Xml.new\schema.h" />
- <ClInclude Include="..\libsrc\Xml.new\xml_ecm.h" />
- <ClInclude Include="..\libsrc\Xml.new\xmlparser.h" />
- <ClInclude Include="..\libsrc\Xml.new\xmlparser_impl.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/windows/zlib.vcxproj b/windows/zlib.vcxproj
deleted file mode 100644
index 7310240..0000000
--- a/windows/zlib.vcxproj
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64}</ProjectGuid>
- <RootNamespace>zlib</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros">
- <ShortPlatform Condition="'$(Platform)' == 'Win32'">x86</ShortPlatform>
- <ShortPlatform Condition="'$(Platform)' == 'x64'">x64</ShortPlatform>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ShortPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)zlib.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl />
- <ClCompile>
- <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <ExceptionHandling>
- </ExceptionHandling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>
- </DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0419</Culture>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)zlib.lib</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libsrc\zlib\adler32.c" />
- <ClCompile Include="..\libsrc\zlib\compress.c" />
- <ClCompile Include="..\libsrc\zlib\crc32.c" />
- <ClCompile Include="..\libsrc\zlib\deflate.c" />
- <ClCompile Include="..\libsrc\zlib\gzclose.c" />
- <ClCompile Include="..\libsrc\zlib\gzlib.c" />
- <ClCompile Include="..\libsrc\zlib\gzread.c" />
- <ClCompile Include="..\libsrc\zlib\gzwrite.c" />
- <ClCompile Include="..\libsrc\zlib\infback.c" />
- <ClCompile Include="..\libsrc\zlib\inffast.c" />
- <ClCompile Include="..\libsrc\zlib\inflate.c" />
- <ClCompile Include="..\libsrc\zlib\inftrees.c" />
- <ClCompile Include="..\libsrc\zlib\trees.c" />
- <ClCompile Include="..\libsrc\zlib\uncompr.c" />
- <ClCompile Include="..\libsrc\zlib\zutil.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
--
Git repository for pkg-virtuoso
More information about the Pkg-virtuoso-commits
mailing list